8000 make sure all error code names are prefixed with ERROR_ @fceller @kvs85 by jsteemann · Pull Request #9384 · arangodb/arangodb · GitHub
[go: up one dir, main page]
Skip to content

make sure all error code names are prefixed with ERROR_ @fceller @kvs85 #9384

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 2 commits into from
Jul 2, 2019
Merged

make sure all error code names are prefixed with ERROR_ @fceller @kvs85 #9384

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d71625f
make sure all error code names are prefixed with ERROR_ @fceller @kvs85
jsteemann Jul 2, 2019
049b0a1
oops, this wasn't supposed to be in this commit
jsteemann Jul 2, 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
oops, this wasn't supposed to be in this commit
  • Loading branch information
@jsteemann
jsteemann committed Jul 2, 2019
commit 049b0a14f06a4ebcc1f7dface32b98567efdcbf5
21 changes: 6 additions & 15 deletions arangod/Aql/DistinctCollectExecutor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,11 +64,12 @@ DistinctCollectExecutor::DistinctCollectExecutor(Fetcher& fetcher, Infos& infos)
AqlValueGroupEqual(_infos.getTransaction())) {}

DistinctCollectExecutor::~DistinctCollectExecutor() {
destroyValues();
}

void DistinctCollectExecutor::initializeCursor() {
destroyValues();
// destroy all AqlValues captured
for (auto& it : _seen) {
for (auto& it2 : it) {
const_cast<AqlValue*>(&it2)->destroy();
}
}
}

std::pair<ExecutionState, NoStats> DistinctCollectExecutor::produceRows(OutputAqlItemRow& output) {
Expand Down Expand Up @@ -137,13 +138,3 @@ std::pair<ExecutionState, size_t> DistinctCollectExecutor::expectedNumberOfRows(
// but it is upper bounded by the input.
return _fetcher.preFetchNumberOfRows(atMost);
}

void DistinctCollectExecutor::destroyValues() {
// destroy all AqlValues captured
for (auto& it : _seen) {
for (auto& it2 : it) {
const_cast<AqlValue*>(&it2)->destroy();
}
}
_seen.clear();
}
3 changes: 0 additions & 3 deletions arangod/Aql/DistinctCollectExecutor.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,8 +95,6 @@ class DistinctCollectExecutor {
DistinctCollectExecutor(DistinctCollectExecutor const&) = delete;
DistinctCollectExecutor(Fetcher& fetcher, Infos&);
~DistinctCollectExecutor();

void initializeCursor();

/**
* @brief produce the next Row of Aql Values.
Expand All @@ -109,7 +107,6 @@ class DistinctCollectExecutor {

private:
Infos const& infos() const noexcept { return _infos; };
void destroyValues();

private:
Infos const& _infos;
Expand Down
0