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

refactor(common): generalize LookupEntryState to EstimatedHashSet #15843

Merged
merged 2 commits into from
Mar 22, 2024

Conversation

stdrc
Copy link
Member

@stdrc stdrc commented Mar 21, 2024

I hereby agree to the terms of the RisingWave Labs, Inc. Contributor License Agreement.

What's changed and what's your intention?

Seems previously LookupEntryState is just a simple EstimateSize wrapper for HashSet, this PR generalize it to EstimatedHashSet so that other modules can reuse it in the future.

Checklist

  • I have written necessary rustdoc comments
  • I have added necessary unit tests and integration tests
  • I have added test labels as necessary. See details.
  • I have added fuzzing tests or opened an issue to track them. (Optional, recommended for new SQL features Sqlsmith: Sql feature generation #7934).
  • My PR contains breaking changes. (If it deprecates some features, please create a tracking issue to remove them in the future).
  • All checks passed in ./risedev check (or alias, ./risedev c)
  • My PR changes performance-critical code. (Please run macro/micro-benchmarks and show the results.)
  • My PR contains critical fixes that are necessary to be merged into the latest release. (Please check out the details)

Documentation

  • My PR needs documentation updates. (Please use the Release note section below to summarize the impact on users)

Release note

If this PR includes changes that directly affect users or other significant modifications relevant to the community, kindly draft a release note to provide a concise summary of these changes. Please prioritize highlighting the impact these changes will have on users.

@stdrc stdrc changed the title generalize LookupEntryState to EstimatedHashSet refactor(common): generalize LookupEntryState to EstimatedHashSet Mar 21, 2024
@stdrc stdrc marked this pull request as ready for review March 21, 2024 09:15
@stdrc stdrc requested review from BugenZhao, yuhao-su and xxchan March 21, 2024 09:15
@stdrc stdrc force-pushed the rc/estimated-hash-set branch from 749e1e5 to e21e7e1 Compare March 21, 2024 10:11
@stdrc stdrc force-pushed the rc/estimated-vec branch from fadaaa2 to 7cef375 Compare March 21, 2024 14:08
@stdrc stdrc requested a review from a team as a code owner March 21, 2024 14:08
@stdrc stdrc force-pushed the rc/estimated-hash-set branch from e21e7e1 to 492b386 Compare March 21, 2024 14:08
@stdrc stdrc force-pushed the rc/estimated-vec branch from 7cef375 to 302f3c9 Compare March 21, 2024 14:51
@stdrc stdrc force-pushed the rc/estimated-hash-set branch from 492b386 to 6554fa9 Compare March 21, 2024 14:52
Base automatically changed from rc/estimated-vec to main March 21, 2024 15:29
@stdrc stdrc force-pushed the rc/estimated-hash-set branch from 6554fa9 to 439649d Compare March 21, 2024 15:36
Copy link
Member

@BugenZhao BugenZhao left a comment

Choose a reason for hiding this comment

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

Looks good

#[derive(Default)]
pub struct EstimatedHashSet<T: EstimateSize> {
inner: HashSet<T>,
kv_heap_size: KvSize,
Copy link
Member

Choose a reason for hiding this comment

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

cc @yuhao-su May I ask what "kv" in the name is for? 😄

Copy link
Member Author

Choose a reason for hiding this comment

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

Just renamed the kv_heap_size field to heap_size. Maybe we should revisit the name of KvSize struct in the future, but let's keep it unchanged in this PR.

match op {
Op::Insert | Op::UpdateInsert => {
values.insert(row.into_owned_row());
if !values.insert(row) {
panic!("inserting a duplicated value");
Copy link
Member

Choose a reason for hiding this comment

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

It appears that we can now safely replace panic with inconsistency_panic after the refactoring.

Copy link
Member Author

Choose a reason for hiding this comment

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

Yes, exactly.

@stdrc stdrc enabled auto-merge March 22, 2024 07:31
@stdrc stdrc added this pull request to the merge queue Mar 22, 2024
Merged via the queue into main with commit ded3314 Mar 22, 2024
27 of 28 checks passed
@stdrc stdrc deleted the rc/estimated-hash-set branch March 22, 2024 08:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants