Skip to content
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

Fix the bloom filter synopsis deserialization #1216

Merged
merged 4 commits into from
Dec 10, 2020

Conversation

tobim
Copy link
Member

@tobim tobim commented Dec 8, 2020

📔 Description

📝 Checklist

  • All user-facing changes have changelog entries.
  • The changes are reflected on docs.tenzir.com/vast, if necessary.
  • The PR description contains instructions for the reviewer, if necessary.

🎯 Review Instructions

@tobim tobim added the feature New functionality label Dec 8, 2020
@tobim tobim requested a review from lava December 8, 2020 09:17
@tobim tobim force-pushed the story/ch21084/jemalloc-enable-profiling branch from 97fbe7a to 3e8f66b Compare December 9, 2020 14:46
@lava lava force-pushed the story/ch21084/jemalloc-enable-profiling branch from 3e8f66b to b1fd3f5 Compare December 9, 2020 15:47
@tobim tobim force-pushed the story/ch21084/jemalloc-enable-profiling branch from b1fd3f5 to 397c81a Compare December 9, 2020 15:54
libvast/vast/bloom_filter.hpp Outdated Show resolved Hide resolved
@tobim tobim changed the title Enable jemalloc profiling Fix the bloom filter synopsis deserialization Dec 9, 2020
@tobim tobim force-pushed the story/ch21084/jemalloc-enable-profiling branch from a28f068 to 12b87da Compare December 10, 2020 09:05
@tobim tobim marked this pull request as ready for review December 10, 2020 09:05
Copy link
Member

@dominiklohmann dominiklohmann left a comment

Choose a reason for hiding this comment

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

This looks alright to me, modulo a few wording issues, and please factor out the Nix changes into a separate PR. I did not review them.

@@ -73,7 +88,7 @@ class buffered_address_synopsis : public synopsis {
params.p = p_;
params.n = next_power_of_two;
VAST_DEBUG_ANON("shrinked address synopsis to", params.n, "elements");
auto& type = this->type();
auto type = detail::annotate_type(this->type(), params);
Copy link
Member

Choose a reason for hiding this comment

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

Please rename to annotated_type.

@@ -73,7 +88,7 @@ class buffered_address_synopsis : public synopsis {
params.p = p_;
params.n = next_power_of_two;
VAST_DEBUG_ANON("shrinked address synopsis to", params.n, "elements");
Copy link
Member

Choose a reason for hiding this comment

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

shrinked -> shrunk generally, and here to shrinks because it has yet to happen.

Copy link
Member

Choose a reason for hiding this comment

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

Everywhere please. :-)

lava and others added 4 commits December 10, 2020 14:10
Move the `annotate_type()` helper function into
a real namespace, since clang doesnt like functions
in unnamed namespaces that are never called, emitting
a warning that stops the build.
@tobim tobim force-pushed the story/ch21084/jemalloc-enable-profiling branch from 12b87da to e596221 Compare December 10, 2020 13:11
@lava
Copy link
Member

lava commented Dec 10, 2020

The CI on Mac fails with a known issue: https://app.clubhouse.io/tenzir/story/20882/race-condition-in-node-queries-unit-test

As discussed offline, I'm merging this now and will include the final style changes in a follow-up PR.

@lava lava merged commit 86a460d into master Dec 10, 2020
@lava lava deleted the story/ch21084/jemalloc-enable-profiling branch December 10, 2020 14:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
feature New functionality
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants