8000 Feature/parallel aql phase one 2 by jsteemann · Pull Request #10408 · arangodb/arangodb · GitHub
[go: up one dir, main page]
Skip to content

Feature/parallel aql phase one 2 #10408

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 14 commits into from
Nov 12, 2019
Merged

Feature/parallel aql phase one 2 #10408

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
36d186b
Enable subqueries
graetzer Nov 7, 2019
c2ebd5a
fix stuff
graetzer Nov 7, 2019
36614e2
some fixes
graetzer Nov 11, 2019
37196f8
remove logging
graetzer Nov 11, 2019
9ec2e74
Merge branch 'devel' of github.com:arangodb/arangodb into feature/par…
graetzer Nov 11, 2019
3c2a0a4
fix warning
graetzer Nov 11, 2019
92769d4
fix error
graetzer Nov 11, 2019
8f6e7e9
fix unused it warning
graetzer Nov 11, 2019
646ff60
fix some stufg
graetzer Nov 11, 2019
6f970e6
fix stuff
graetzer Nov 11, 2019
9b814d3
make stuff more robust
graetzer Nov 11, 2019
cd15533
revert last change
graetzer Nov 12, 2019
1ff884b
Merge branch 'devel' of github.com:arangodb/arangodb into feature/par…
jsteemann Nov 12, 2019
95f207e
remove debug logging, added assertions
jsteemann Nov 12, 2019
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
remove debug logging, added assertions
  • Loading branch information
@jsteemann
jsteemann committed Nov 12, 2019
commit 95f207e53abd771d617ba6c42f2102b3cb28c054
2 changes: 0 additions & 2 deletions arangod/Aql/RemoteExecutor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -514,10 +514,8 @@ Result ExecutionBlockImpl<RemoteExecutor>::sendAsyncRequest(fuerte::RestVerb typ
_lastResponse = std::move(res);
}
_requestInFlight = false;
// LOG_DEVEL << "notifying " << sqs.get();
return true;
}
// LOG_DEVEL << "skipping " << sqs.get();
return false;
});
});
Expand Down
14 changes: 1 addition & 13 deletions arangod/Aql/SharedQueryState.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,6 @@ void SharedQueryState::invalidate() {

/// this has to stay for a backwards-compatible AQL HTTP API (hasMore).
void SharedQueryState::waitForAsyncWakeup() {
// LOG_DEVEL << "waiting " << _numWakeups << " " << this;

std::unique_lock<std::mutex> guard(_mutex);
if (!_valid) {
return;
Expand All @@ -52,8 +50,6 @@ void SharedQueryState::waitForAsyncWakeup() {
_cv.wait(guard, [&] { return _numWakeups > 0 || !_valid; });
TRI_ASSERT(_numWakeups > 0 || !_valid);
_numWakeups--;

// LOG_DEVEL << "wakeup " << _numWakeups << " " << this;;
}

/// @brief setter for the continue handler:
Expand All @@ -63,14 +59,10 @@ void SharedQueryState::setWakeupHandler(std::function<bool()> const& cb) {
_wakeupCb = cb;
_numWakeups = 0;
_cbVersion++;
LOG_DEVEL << "setting wakeup handler " << this;
}

void SharedQueryState::resetWakeupHandler() {
std::lock_guard<std::mutex> guard(_mutex);
if (_wakeupCb) {
LOG_DEVEL << "resetting wakeup handler " << this;
}
_wakeupCb = nullptr;
_numWakeups = 0;
_cbVersion++;
Expand All @@ -82,13 +74,11 @@ void SharedQueryState::execute() {
uint32_t n = _numWakeups++;

if (!_wakeupCb) {
LOG_DEVEL << "notify_one() " << this;
_cv.notify_one();
return;
}

if (n > 0) {
LOG_DEVEL << "other handler already running " << this;
return;
}

Expand All @@ -98,8 +88,6 @@ void SharedQueryState::execute() {
void SharedQueryState::queueHandler() {

if (_numWakeups == 0 || !_wakeupCb || !_valid) {
bool c = !_wakeupCb;
LOG_DEVEL << "queueHandler leave, numWakeups" << _numWakeups << " wakeup cb: " << (!c) << " valid: " << _valid << " " << this;
return;
}

Expand Down Expand Up @@ -129,11 +117,11 @@ void SharedQueryState::queueHandler() {
lck.lock();
if (v == self->_cbVersion) {
uint32_t c = self->_numWakeups--;
TRI_ASSERT(c > 0);
if (c == 1 || !cntn || !self->_valid) {
break;
}
} else {
LOG_DEVEL << "outdated handler";
return;
}
lck.unlock();
Expand Down
0