8000 Merge branch 'devel' of https://github.com/arangodb/arangodb into bug… · arangodb/arangodb@4d6e3ff · GitHub
[go: up one dir, main page]
Skip to content

Commit 4d6e3ff

Browse files
KVS85KVS85
committed
Merge branch 'devel' of https://github.com/arangodb/arangodb into bug-fix/views-web-ui
2 parents c3722d7 + 29dcd14 commit 4d6e3ff

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+1180
-484
lines changed

‎arangod/Aql/AqlItemBlock.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -150,6 +150,7 @@ class AqlItemBlock {
150150
// construct the AqlValue in place
151151
AqlValue* value;
152152
try {
153+
// cppcheck-suppress uninitvar
153154
value = new (p) AqlValue(std::forward<Args>(args)...);
154155
} catch (...) {
155156
// clean up the cell

‎arangod/Aql/ExecutionBlockImpl.cpp‎

Lines changed: 66 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -639,26 +639,34 @@ static SkipRowsRangeVariant constexpr skipRowsType() {
639639
ModificationExecutor<SingleRowFetcher<BlockPassthrough::Disable>, UpsertModifier>, TraversalExecutor,
640640
EnumerateListExecutor, SubqueryStartExecutor, SubqueryEndExecutor, SortedCollectExecutor,
641641
LimitExecutor, UnsortedGatherExecutor, SortingGatherExecutor, SortExecutor,
642-
IResearchViewExecutor<false, arangodb::iresearch::MaterializeType::NotMaterialize>,
643-
IResearchViewExecutor<false, arangodb::iresearch::MaterializeType::LateMaterialize>,
644-
IResearchViewExecutor<false, arangodb::iresearch::MaterializeType::Materialize>,
645-
IResearchViewExecutor<false, arangodb::iresearch::MaterializeType::NotMate D95F rialize | arangodb::iresearch::MaterializeType::UseStoredValues>,
646-
IResearchViewExecutor<false, arangodb::iresearch::MaterializeType::LateMaterialize | arangodb::iresearch::MaterializeType::UseStoredValues>,
647-
IResearchViewExecutor<true, arangodb::iresearch::MaterializeType::NotMaterialize>,
648-
IResearchViewExecutor<true, arangodb::iresearch::MaterializeType::LateMaterialize>,
649-
IResearchViewExecutor<true, arangodb::iresearch::MaterializeType::Materialize>,
650-
IResearchViewExecutor<true, arangodb::iresearch::MaterializeType::NotMaterialize | arangodb::iresearch::MaterializeType::UseStoredValues>,
651-
IResearchViewExecutor<true, arangodb::iresearch::MaterializeType::LateMaterialize | arangodb::iresearch::MaterializeType::UseStoredValues>,
652-
IResearchViewMergeExecutor<false, arangodb::iresearch::MaterializeType::NotMaterialize>,
653-
IResearchViewMergeExecutor<false, arangodb::iresearch::MaterializeType::LateMaterialize>,
654-
IResearchViewMergeExecutor<false, arangodb::iresearch::MaterializeType::Materialize>,
655-
IResearchViewMergeExecutor<false, arangodb::iresearch::MaterializeType::NotMaterialize | arangodb::iresearch::MaterializeType::UseStoredValues>,
656-
IResearchViewMergeExecutor<false, arangodb::iresearch::MaterializeType::LateMaterialize | arangodb::iresearch::MaterializeType::UseStoredValues>,
657-
IResearchViewMergeExecutor<true, arangodb::iresearch::MaterializeType::NotMaterialize>,
658-
IResearchViewMergeExecutor<true, arangodb::iresearch::MaterializeType::LateMaterialize>,
659-
IResearchViewMergeExecutor<true, arangodb::iresearch::MaterializeType::Materialize>,
660-
IResearchViewMergeExecutor<true, arangodb::iresearch::MaterializeType::NotMaterialize | arangodb::iresearch::MaterializeType::UseStoredValues>,
661-
IResearchViewMergeExecutor<true, arangodb::iresearch::MaterializeType::LateMaterialize | arangodb::iresearch::MaterializeType::UseStoredValues>,
642+
IResearchViewExecutor<false, false, arangodb::iresearch::MaterializeType::NotMaterialize>,
643+
IResearchViewExecutor<false, false, arangodb::iresearch::MaterializeType::LateMaterialize>,
644+
IResearchViewExecutor<false, false, arangodb::iresearch::MaterializeType::Materialize>,
645+
IResearchViewExecutor<false, false, arangodb::iresearch::MaterializeType::NotMaterialize | arangodb::iresearch::MaterializeType::UseStoredValues>,
646+
IResearchViewExecutor<false, false, arangodb::iresearch::MaterializeType::LateMaterialize | arangodb::iresearch::MaterializeType::UseStoredValues>,
647+
IResearchViewExecutor<true, false, arangodb::iresearch::MaterializeType::NotMaterialize | arangodb::iresearch::MaterializeType::UseStoredValues>,
648+
IResearchViewExecutor<true, false, arangodb::iresearch::MaterializeType::LateMaterialize | arangodb::iresearch::MaterializeType::UseStoredValues>,
649+
IResearchViewExecutor<false, true, arangodb::iresearch::MaterializeType::NotMaterialize>,
650+
IResearchViewExecutor<false, true, arangodb::iresearch::MaterializeType::LateMaterialize>,
651+
IResearchViewExecutor<false, true, arangodb::iresearch::MaterializeType::Materialize>,
652+
IResearchViewExecutor<false, true, arangodb::iresearch::MaterializeType::NotMaterialize | arangodb::iresearch::MaterializeType::UseStoredValues>,
653+
IResearchViewExecutor<false, true, arangodb::iresearch::MaterializeType::LateMaterialize | arangodb::iresearch::MaterializeType::UseStoredValues>,
654+
IResearchViewExecutor<true, true, arangodb::iresearch::MaterializeType::NotMaterialize | arangodb::iresearch::MaterializeType::UseStoredValues>,
655+
IResearchViewExecutor<true, true, arangodb::iresearch::MaterializeType::LateMaterialize | arangodb::iresearch::MaterializeType::UseStoredValues>,
656+
IResearchViewMergeExecutor<false, false, arangodb::iresearch::MaterializeType::NotMaterialize>,
657+
IResearchViewMergeExecutor<false, false, arangodb::iresearch::MaterializeType::LateMaterialize>,
658+
IResearchViewMergeExecutor<false, false, arangodb::iresearch::MaterializeType::Materialize>,
659+
IResearchViewMergeExecutor<false, false, arangodb::iresearch::MaterializeType::NotMaterialize | arangodb::iresearch::MaterializeType::UseStoredValues>,
660+
IResearchViewMergeExecutor<false, false, arangodb::iresearch::MaterializeType::LateMaterialize | arangodb::iresearch::MaterializeType::UseStoredValues>,
661+
IResearchViewMergeExecutor<true, false, arangodb::iresearch::MaterializeType::NotMaterialize | arangodb::iresearch::MaterializeType::UseStoredValues>,
662+
IResearchViewMergeExecutor<true, false, arangodb::iresearch::MaterializeType::LateMaterialize | arangodb::iresearch::MaterializeType::UseStoredValues>,
663+
IResearchViewMergeExecutor<false, true, arangodb::iresearch::MaterializeType::NotMaterialize>,
664+
IResearchViewMergeExecutor<false, true, arangodb::iresearch::MaterializeType::LateMaterialize>,
665+
IResearchViewMergeExecutor<false, true, arangodb::iresearch::MaterializeType::Materialize>,
666+
IResearchViewMergeExecutor<false, true, arangodb::iresearch::MaterializeType::NotMaterialize | arangodb::iresearch::MaterializeType::UseStoredValues>,
667+
IResearchViewMergeExecutor<false, true, arangodb::iresearch::MaterializeType::LateMaterialize | arangodb::iresearch::MaterializeType::UseStoredValues>,
668+
IResearchViewMergeExecutor<true, true, arangodb::iresearch::MaterializeType::NotMaterialize | arangodb::iresearch::MaterializeType::UseStoredValues>,
669+
IResearchViewMergeExecutor<true, true, arangodb::iresearch::MaterializeType::LateMaterialize | arangodb::iresearch::Mat D95F erializeType::UseStoredValues>,
662670
TraversalExecutor, EnumerateListExecutor, SubqueryStartExecutor, SubqueryEndExecutor, SortedCollectExecutor,
663671
LimitExecutor, NoResultsExecutor, SingleRemoteModificationExecutor<IndexTag>, SingleRemoteModificationExecutor<Insert>,
664672
SingleRemoteModificationExecutor<Remove>, SingleRemoteModificationExecutor<Update>,
@@ -2194,34 +2202,52 @@ template class ::arangodb::aql::ExecutionBlockImpl<HashedCollectExecutor>;
21942202
template class ::arangodb::aql::ExecutionBlockImpl<AccuWindowExecutor>;
21952203
template class ::arangodb::aql::ExecutionBlockImpl<WindowExecutor>;
21962204

2197-
template class ::arangodb::aql::ExecutionBlockImpl<IResearchViewExecutor<false, arangodb::iresearch::MaterializeType::NotMaterialize>>;
2198-
template class ::arangodb::aql::ExecutionBlockImpl<IResearchViewExecutor<false, arangodb::iresearch::MaterializeType::LateMaterialize>>;
2199-
template class ::arangodb::aql::ExecutionBlockImpl<IResearchViewExecutor<false, arangodb::iresearch::MaterializeType::Materialize>>;
2205+
template class ::arangodb::aql::ExecutionBlockImpl<IResearchViewExecutor<false, false, arangodb::iresearch::MaterializeType::NotMaterialize>>;
2206+
template class ::arangodb::aql::ExecutionBlockImpl<IResearchViewExecutor<false, false, arangodb::iresearch::MaterializeType::LateMaterialize>>;
2207+
template class ::arangodb::aql::ExecutionBlockImpl<IResearchViewExecutor<false, false, arangodb::iresearch::MaterializeType::Materialize>>;
22002208
template class ::arangodb::aql::ExecutionBlockImpl<
2201-
IResearchViewExecutor<false, arangodb::iresearch::MaterializeType::NotMaterialize | arangodb::iresearch::MaterializeType::UseStoredValues>>;
2209+
IResearchViewExecutor<false, false, arangodb::iresearch::MaterializeType::NotMaterialize | arangodb::iresearch::MaterializeType::UseStoredValues>>;
22022210
template class ::arangodb::aql::ExecutionBlockImpl<
2203-
IResearchViewExecutor<false, arangodb::iresearch::MaterializeType::LateMaterialize | arangodb::iresearch::MaterializeType::UseStoredValues>>;
2204-
template class ::arangodb::aql::ExecutionBlockImpl<IResearchViewExecutor<true, arangodb::iresearch::MaterializeType::NotMaterialize>>;
2205-
template class ::arangodb::aql::ExecutionBlockImpl<IResearchViewExecutor<true, arangodb::iresearch::MaterializeType::LateMaterialize>>;
2206-
template class ::arangodb::aql::ExecutionBlockImpl<IResearchViewExecutor<true, arangodb::iresearch::MaterializeType::Materialize>>;
2211+
IResearchViewExecutor<false, false, arangodb::iresearch::MaterializeType::LateMaterialize | arangodb::iresearch::MaterializeType::UseStoredValues>>;
22072212
template class ::arangodb::aql::ExecutionBlockImpl<
2208-
IResearchViewExecutor<true, arangodb::iresearch::MaterializeType::NotMaterialize | arangodb::iresearch::MaterializeType::UseStoredValues>>;
2213+
IResearchViewExecutor<true, false, arangodb::iresearch::MaterializeType::NotMaterialize | arangodb::iresearch::MaterializeType::UseStoredValues>>;
22092214
template class ::arangodb::aql::ExecutionBlockImpl<
2210-
IResearchViewExecutor<true, arangodb::iresearch::MaterializeType::LateMaterialize | arangodb::iresearch::MaterializeType::UseStoredValues>>;
2211-
template class ::arangodb::aql::ExecutionBlockImpl<IResearchViewMergeExecutor<false, arangodb::iresearch::MaterializeType::NotMaterialize>>;
2212-
template class ::arangodb::aql::ExecutionBlockImpl<IResearchViewMergeExecutor<false, arangodb::iresearch::MaterializeType::LateMaterialize>>;
2213-
template class ::arangodb::aql::ExecutionBlockImpl<IResearchViewMergeExecutor<false, arangodb::iresearch::MaterializeType::Materialize>>;
2215+
IResearchViewExecutor<true, false, arangodb::iresearch::MaterializeType::LateMaterialize | arangodb::iresearch::MaterializeType::UseStoredValues>>;
2216+
2217+
template class ::arangodb::aql::ExecutionBlockImpl<IResearchViewExecutor<false, true, arangodb::iresearch::MaterializeType::NotMaterialize>>;
2218+
template class ::arangodb::aql::ExecutionBlockImpl<IResearchViewExecutor<false, true, arangodb::iresearch::MaterializeType::LateMaterialize>>;
2219+
template class ::arangodb::aql::ExecutionBlockImpl<IResearchViewExecutor<false, true, arangodb::iresearch::MaterializeType::Materialize>>;
2220+
template class ::arangodb::aql::ExecutionBlockImpl<
2221+
IResearchViewExecutor<false, true, arangodb::iresearch::MaterializeType::NotMaterialize | arangodb::iresearch::MaterializeType::UseStoredValues>>;
2222+
template class ::arangodb::aql::ExecutionBlockImpl<
2223+
IResearchViewExecutor<false, true, arangodb::iresearch::MaterializeType::LateMaterialize | arangodb::iresearch::MaterializeType::UseStoredValues>>;
2224+
template class ::arangodb::aql::ExecutionBlockImpl<
2225+
IResearchViewExecutor<true, true, arangodb::iresearch::MaterializeType::NotMaterialize | arangodb::iresearch::MaterializeType::UseStoredValues>>;
2226+
template class ::arangodb::aql::ExecutionBlockImpl<
2227+
IResearchViewExecutor<true, true, arangodb::iresearch::MaterializeType::LateMaterialize | arangodb::iresearch::MaterializeType::UseStoredValues>>;
2228+
2229+
template class ::arangodb::aql::ExecutionBlockImpl<IResearchViewMergeExecutor<false, false, arangodb::iresearch::MaterializeType::NotMaterialize>>;
2230+
template class ::arangodb::aql::ExecutionBlockImpl<IResearchViewMergeExecutor<false, false, arangodb::iresearch::MaterializeType::LateMaterialize>>;
2231+
template class ::arangodb::aql::ExecutionBlockImpl<IResearchViewMergeExecutor<false, false, arangodb::iresearch::MaterializeType::Materialize>>;
2232+
template class ::arangodb::aql::ExecutionBlockImpl<IResearchViewMergeExecutor<
2233+
false, false, arangodb::iresearch::MaterializeType::NotMaterialize | arangodb::iresearch::MaterializeType::UseStoredValues>>;
2234+
template class ::arangodb::aql::ExecutionBlockImpl<IResearchViewMergeExecutor<
2235+
false, false, arangodb::iresearch::MaterializeType::LateMaterialize | arangodb::iresearch::MaterializeType::UseStoredValues>>;
2236+
template class ::arangodb::aql::ExecutionBlockImpl<IResearchViewMergeExecutor<
2237+
true, false, arangodb::iresearch::MaterializeType::NotMaterialize | arangodb::iresearch::MaterializeType::UseStoredValues>>;
2238+
template class ::arangodb::aql::ExecutionBlockImpl<IResearchViewMergeExecutor<
2239+
true, false, arangodb::iresearch::MaterializeType::LateMaterialize | arangodb::iresearch::MaterializeType::UseStoredValues>>;
2240+
template class ::arangodb::aql::ExecutionBlockImpl<IResearchViewMergeExecutor<false, true, arangodb::iresearch::MaterializeType::NotMaterialize>>;
2241+
template class ::arangodb::aql::ExecutionBlockImpl<IResearchViewMergeExecutor<false, true, arangodb::iresearch::MaterializeType::LateMaterialize>>;
2242+
template class ::arangodb::aql::ExecutionBlockImpl<IResearchViewMergeExecutor<false, true, arangodb::iresearch::MaterializeType::Materialize>>;
22142243
template class ::arangodb::aql::ExecutionBlockImpl<IResearchViewMergeExecutor<
2215-
false, arangodb::iresearch::MaterializeType::NotMaterialize | arangodb::iresearch::MaterializeType::UseStoredValues>>;
2244+
false, true, arangodb::iresearch::MaterializeType::NotMaterialize | arangodb::iresearch::MaterializeType::UseStoredValues>>;
22162245
template class ::arangodb::aql::ExecutionBlockImpl<IResearchViewMergeExecutor<
2217-
false, arangodb::iresearch::MaterializeType::LateMaterialize | arangodb::iresearch::MaterializeType::UseStoredValues>>;
2218-
template class ::arangodb::aql::ExecutionBlockImpl<IResearchViewMergeExecutor<true, arangodb::iresearch::MaterializeType::NotMaterialize>>;
2219-
template class ::arangodb::aql::ExecutionBlockImpl<IResearchViewMergeExecutor<true, arangodb::iresearch::MaterializeType::LateMaterialize>>;
2220-
template class ::arangodb::aql::ExecutionBlockImpl<IResearchViewMergeExecutor<true, arangodb::iresearch::MaterializeType::Materialize>>;
2246+
false, true, arangodb::iresearch::MaterializeType::LateMaterialize | arangodb::iresearch::MaterializeType::UseStoredValues>>;
22212247
template class ::arangodb::aql::ExecutionBlockImpl<IResearchViewMergeExecutor<
2222-
true, arangodb::iresearch::MaterializeType::NotMaterialize | arangodb::iresearch::MaterializeType::UseStoredValues>>;
2248+
true, true, arangodb::iresearch::MaterializeType::NotMaterialize | arangodb::iresearch::MaterializeType::UseStoredValues>>;
22232249
template class ::arangodb::aql::ExecutionBlockImpl<IResearchViewMergeExecutor<
2224-
true, arangodb::iresearch::MaterializeType::LateMaterialize | arangodb::iresearch::MaterializeType::UseStoredValues>>;
2250+
true, true, arangodb::iresearch::MaterializeType::LateMaterialize | arangodb::iresearch::MaterializeType::UseStoredValues>>;
22252251

22262252
template class ::arangodb::aql::ExecutionBlockImpl<IdExecutor<ConstFetcher>>;
22272253
template class ::arangodb::aql::ExecutionBlockImpl<IdExecutor<SingleRowFetcher<BlockPassthrough::Enable>>>;

0 commit comments

Comments
 (0)
0