8000 Feature/aql subquery operations stack materialize executor by hkernbach · Pull Request #11192 · arangodb/arangodb · GitHub
[go: up one dir, main page]
Skip to content

Feature/aql subquery operations stack materialize executor #11192

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 10 commits into from
Feb 29, 2020
Merged

Feature/aql subquery operations stack materialize executor #11192

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
3965364
removed obsolete comment, added produceRows and skipRowsRange, enabled
hkernbach Feb 28, 2020
f8391dd
forgot to use advanceRow, fetch input during skipRowsRange
hkernbach Feb 28, 2020
09fda5a
removed old implementations
hkernbach Feb 28, 2020
8eca56f
removed comment, fixed a logical loop error
hkernbach Feb 28, 2020
903d02c
skip could be simplified as well
hkernbach Feb 28, 2020
a296027
merge origin into feature branch
hkernbach Feb 28, 2020
f7bb7f4
Merge branch 'feature/AqlSubqueryExecutionBlockImplExecuteImplementat…
mchacki Feb 28, 2020
a9b4335
temp workaround
hkernbach Feb 28, 2020
4ec5919
Merge branch 'feature/AqlSubqueryOperationsStack-materializeExecutor-…
hkernbach Feb 28, 2020
61b3e0a
Merge branch 'feature/AqlSubqueryExecutionBlockImplExecuteImplementat…
mchacki Feb 29, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
removed comment, fixed a logical loop error
  • Loading branch information
@hkernbach
hkernbach committed Feb 28, 2020
commit 8eca56fa86ffd27a8acbf98c22e2da1fd49036d4
41 changes: 20 additions & 21 deletions arangod/Aql/MaterializeExecutor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,32 +104,32 @@ std::tuple<ExecutorState, NoStats, AqlCall> arangodb::aql::MaterializeExecutor<T

while (inputRange.hasDataRow() && !output.isFull()) {
bool written = false;

// some micro-optimization
auto& callback = _readDocumentContext._callback;
auto docRegId = _readDocumentContext._infos->inputNonMaterializedDocRegId();
T collectionSource = _readDocumentContext._infos->collectionSource();
auto* trx = _readDocumentContext._infos->trx();
do {
auto const [state, input] = inputRange.nextDataRow();

arangodb::LogicalCollection const* collection = nullptr;
if constexpr (std::is_same<T, std::string const&>::value) {
if (_collection == nullptr) {
_collection = trx->documentCollection(collectionSource);
}
collection = _collection;
} else {
collection = reinterpret_cast<arangodb::LogicalCollection const*>(
input.getValue(collectionSource).slice().getUInt());
auto const [state, input] = inputRange.nextDataRow();

arangodb::LogicalCollection const* collection = nullptr;
if constexpr (std::is_same<T, std::string const&>::value) {
if (_collection == nullptr) {
_collection = trx->documentCollection(collectionSource);
}
TRI_ASSERT(collection != nullptr);
_readDocumentContext._inputRow = &input;
_readDocumentContext._outputRow = &output;
written = collection->readDocumentWithCallback(
trx, LocalDocumentId(input.getValue(docRegId).slice().getUInt()), callback);
} while (!written);

output.advanceRow();
collection = _collection;
} else {
collection = reinterpret_cast<arangodb::LogicalCollection const*>(
input.getValue(collectionSource).slice().getUInt());
}
TRI_ASSERT(collection != nullptr);
_readDocumentContext._inputRow = &input;
_readDocumentContext._outputRow = &output;
written = collection->readDocumentWithCallback(
trx, LocalDocumentId(input.getValue(docRegId).slice().getUInt()), callback);
if (written) {
output.advanceRow();
}
}

return {inputRange.upstreamState(), NoStats{}, upstreamCall};
Expand All @@ -145,7 +145,6 @@ std::tuple<ExecutorState, NoStats, size_t, AqlCall> arangodb::aql::MaterializeEx
}

size_t skipped = 0;
// bool offsetPhase = (call.getOffset() > 0);

while (inputRange.hasDataRow() && call.shouldSkip()) {
auto const [unused, input] = inputRange.nextDataRow();
Expand Down
0