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: estimate size for topn cache extract_if #14564

Merged
merged 1 commit into from
Jan 15, 2024
Merged

Conversation

yuhao-su
Copy link
Contributor

@yuhao-su yuhao-su commented Jan 15, 2024

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

What's changed and what's your intention?

add estimate size for topn cache extract_if

close #14530

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.

@yuhao-su yuhao-su requested review from BugenZhao and xxchan January 15, 2024 05:18
@github-actions github-actions bot added the type/fix Bug fix label Jan 15, 2024
pub fn extract_if<F>(&mut self, pred: F) -> ExtractIf<'_, CacheKey, CompactedRow, F, Global>
pub fn extract_if<'a, F1>(
&'a mut self,
mut pred: F1,
Copy link
Member

Choose a reason for hiding this comment

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

Why mut here? And no need to change to F1

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Just learn form @BugenZhao, FnMut::call_mut accept &mut self. Calling pred will mutate itself.

xxchan
xxchan previously approved these changes Jan 15, 2024
Copy link
Member

@xxchan xxchan left a comment

Choose a reason for hiding this comment

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

Can you add some background to the PR description? Specifically how did you find the issue (what problem are you trying to solve)

@yuhao-su
Copy link
Contributor Author

Can you add some background to the PR description? Specifically how did you find the issue (what problem are you trying to solve)

Added a issue link.

@@ -108,18 +108,25 @@ impl TopNCacheState {
self.inner.range(range)
}

pub fn extract_if<F>(&mut self, pred: F) -> ExtractIf<'_, CacheKey, CompactedRow, F, Global>
pub fn extract_if<'a, F1>(
Copy link
Member

@xxchan xxchan Jan 15, 2024

Choose a reason for hiding this comment

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

This change makes me think:

  1. Are there any other places that the size is not correctly maintained?
  2. Why this kv_heap_size stuff is in TopNCacheState? It looks like a general BTreeMapWithEstimateSize or sth.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

There are some special usage of an estimated structure. For example https://github.com/singularity-data/risingwave/blob/9cd7f6486e659af72857aef7ac27247305e880c0/src/stream/src/executor/managed_state/join/join_entry_state.rs#L75. It can be hard to provide an EstimatedBtreeMap with an unified semantic.

@yuhao-su yuhao-su added this pull request to the merge queue Jan 15, 2024
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Jan 15, 2024
@yuhao-su yuhao-su added this pull request to the merge queue Jan 15, 2024
Merged via the queue into main with commit f5fdb36 Jan 15, 2024
30 of 31 checks passed
@yuhao-su yuhao-su deleted the yuhao/top_n_estimate_size branch January 15, 2024 07:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
type/fix Bug fix
Projects
None yet
Development

Successfully merging this pull request may close these issues.

bug(streaming): TopNCache::estimated_heap_size wrong
4 participants