8000 APM-209 by cpjulia · Pull Request #15067 · arangodb/arangodb · GitHub
[go: up one dir, main page]

Skip to content

APM-209 #15067

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.

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 22 commits into from
Nov 16, 2021
Merged

APM-209 #15067

Changes from 1 commit
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
07a7ca9
Added flag for displaying the histogram
cpjulia Nov 8, 2021
7608a9b
Merge branch 'devel' of github.com:arangodb/arangodb into feature/APM…
cpjulia Nov 8, 2021
3c00605
Updated CHANGELOG
cpjulia Nov 8, 2021
abcb7cd
Removed unused includes
cpjulia Nov 8, 2021
b15a152
Updated CHANGELOG
cpjulia Nov 8, 2021
90d8fca
Merge branch 'devel' of github.com:arangodb/arangodb into feature/APM…
cpjulia Nov 8, 2021
10cc803
Merge branch 'devel' of github.com:arangodb/arangodb into feature/APM…
cpjulia Nov 9, 2021
1b5d044
Removed merging markup
cpjulia Nov 9, 2021
24fdacc
Addressed suggestions
cpjulia Nov 9, 2021
f5fe39f
Complied to coding style and optimized vector sorting
cpjulia Nov 9, 2021
6edb68e
Merge branch 'devel' of github.com:arangodb/arangodb into feature/APM…
cpjulia Nov 9, 2021
359cc6f
Merge branch 'devel' of github.com:arangodb/arangodb into feature/APM…
cpjulia Nov 10, 2021
07d9d4e
Update CHANGELOG
KVS85 Nov 10, 2021
84e39c7
Fixed test failing
cpjulia Nov 10, 2021
c3dc32c
Merge branch 'feature/APM-209' of github.com:arangodb/arangodb into f…
cpjulia Nov 10, 2021
e825831
Merge branch 'devel' of github.com:arangodb/arangodb into feature/APM…
cpjulia Nov 10, 2021
4ee6fd9
Merge branch 'devel' of github.com:arangodb/arangodb into feature/APM…
cpjulia Nov 10, 2021
989832b
Addressed suggestions
cpjulia Nov 15, 2021
c378613
Merge branch 'devel' of github.com:arangodb/arangodb into feature/APM…
cpjulia Nov 15, 2021
e17e610
Fixed syntax
cpjulia Nov 15, 2021
ee0f45f
Addressed suggestions
cpjulia Nov 15, 2021
a4cd9f4
Merge branch 'devel' into feature/APM-209
jsteemann Nov 16, 2021
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
Complied to coding style and optimized vector sorting
  • Loading branch information
cpjulia committed Nov 9, 2021
commit f5fe39fbb6097c9136ff8bfc0aa5196d8c05bcb2
5 changes: 3 additions & 2 deletions arangosh/Benchmark/BenchFeature.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -526,7 +526,7 @@ void BenchFeature::start() {
*_result = ret;
}

void BenchFeature::report(ClientFeature& client, std::vector<BenchRunResult> &results,
void BenchFeature::report(ClientFeature& client, std::vector<BenchRunResult>& results,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd be in favor of passing std::vector<BenchRunResult>& results as std::vector<BenchRunResult> const& results and sort results in a caller. In BenchFeature::report we can add an assertion that results are sorted, like TRI_ASSERT(std::is_sorted(...))

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Addressed in latest commit, but can still have room for more optimization

BenchmarkStats const& stats,
std::string const& histogram, VPackBuilder& builder) {

Expand Down Expand Up @@ -561,7 +561,8 @@ void BenchFeature::report(ClientFeature& client, std::vector<BenchRunResult> &re
builder.add("collection", VPackValue(_collection));

std::sort(results.begin(), results.end(),
[](BenchRunResult a, BenchRunResult b) { return a._time < b._time; });
[](BenchRunResult const& a, BenchRunResult const& b)
{ return a._time < b._time; });

BenchRunResult output{0, 0, 0, 0};

Expand Down
0