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!: fix regression caused by unbalanced partitions and splitting ranges #5090

Merged
merged 20 commits into from
Dec 9, 2024

Conversation

evenyag
Copy link
Contributor

@evenyag evenyag commented Dec 3, 2024

I hereby agree to the terms of the GreptimeDB CLA.

Refer to a related PR or issue link (optional)

What's changed and what's your intention?

As mentioned in #5052 (comment), the SeqScan will push all row groups into the RangeMeta when building the StreamContext.

fn push_seq_file_ranges(
num_memtables: usize,
files: &[FileHandle],
ranges: &mut Vec<RangeMeta>,
) {
// For non append-only mode, each range only contains one file.
for (i, file) in files.iter().enumerate() {
let file_index = num_memtables + i;
if file.meta_ref().num_row_groups > 0 {
// All row groups share the same time range.
let row_group_indices = (0..file.meta_ref().num_row_groups)
.map(|row_group_index| RowGroupIndex {
index: file_index,
row_group_index: row_group_index as i64,
})
.collect();
ranges.push(RangeMeta {
time_range: file.time_range(),
indices: smallvec![file_index],
row_group_indices,
num_rows: file.meta_ref().num_rows as usize,
});
} else {

Then SeqScan builds a source for each row group index. This causes the merge reader to load all row groups of each file in build_sources() by iterating the row_group_indices.

fn build_sources(
stream_ctx: &Arc<StreamContext>,
part_range: &PartitionRange,
compaction: bool,
part_metrics: &PartitionMetrics,
range_builder_list: Arc<RangeBuilderList>,
sources: &mut Vec<Source>,
) {
// Gets range meta.
let range_meta = &stream_ctx.ranges[part_range.identifier];
sources.reserve(range_meta.row_group_indices.len());
for index in &range_meta.row_group_indices {

This PR fixes several issues in SeqScan related to #5052

  • Avoids pushing row group indices before split parts. It may cause the merge reader to merge all row groups of the same file, which is unexpected
  • Adds the number of row groups to the SourceIndex so we can know how to split the source without relying on the FileMeta.
  • Makes the number of rows in partitions close to each other if possible and doesn't always create target_partitions partitions so the query engine can repartition inputs.

After this PR, we store the row group number in SourceIndex so we can always set the row group index to ALL_ROW_GROUPS when building the StreamContext. Then build_sources() will read a source for the whole file instead of a list of sources for all row groups.

Checklist

  • I have written the necessary rustdoc comments.
  • I have added the necessary unit tests and integration tests.
  • This PR requires documentation updates.

Copy link
Contributor

coderabbitai bot commented Dec 3, 2024

Important

Review skipped

Auto reviews are disabled on this repository.

Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.


Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media?

❤️ Share
🪧 Tips

Chat

There are 3 ways to chat with CodeRabbit:

  • Review comments: Directly reply to a review comment made by CodeRabbit. Example:
    • I pushed a fix in commit <commit_id>, please review it.
    • Generate unit testing code for this file.
    • Open a follow-up GitHub issue for this discussion.
  • Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
    • @coderabbitai generate unit testing code for this file.
    • @coderabbitai modularize this function.
  • PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
    • @coderabbitai gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.
    • @coderabbitai read src/utils.ts and generate unit testing code.
    • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
    • @coderabbitai help me debug CodeRabbit configuration file.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (Invoked using PR comments)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai full review to do a full review from scratch and review all the files again.
  • @coderabbitai summary to regenerate the summary of the PR.
  • @coderabbitai generate docstrings to generate docstrings for this PR. (Experiment)
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
  • @coderabbitai help to get help.

Other keywords and placeholders

  • Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
  • Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
  • Add @coderabbitai anywhere in the PR title to generate the title automatically.

Documentation and Community

  • Visit our Documentation for detailed information on how to use CodeRabbit.
  • Join our Discord Community to get help, request features, and share feedback.
  • Follow us on X/Twitter for updates and announcements.

@github-actions github-actions bot added the docs-not-required This change does not impact docs. label Dec 3, 2024
@evenyag evenyag mentioned this pull request Dec 4, 2024
11 tasks
@evenyag evenyag marked this pull request as ready for review December 4, 2024 09:19
@evenyag evenyag requested review from v0y4g3r, waynexia and a team as code owners December 4, 2024 09:19
@waynexia waynexia requested a review from Copilot December 4, 2024 11:32

Choose a reason for hiding this comment

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

Copilot reviewed 19 out of 19 changed files in this pull request and generated no suggestions.

Copy link

codecov bot commented Dec 5, 2024

Codecov Report

Attention: Patch coverage is 70.92732% with 116 lines in your changes missing coverage. Please review.

Project coverage is 83.79%. Comparing base (dc83b0a) to head (51e8cae).
Report is 10 commits behind head on main.

Additional details and impacted files
@@            Coverage Diff             @@
##             main    #5090      +/-   ##
==========================================
- Coverage   84.03%   83.79%   -0.24%     
==========================================
  Files        1162     1167       +5     
  Lines      216767   217534     +767     
==========================================
+ Hits       182153   182292     +139     
- Misses      34614    35242     +628     

@evenyag evenyag changed the title fix: avoid creating many small partitions in SeqScan fix: fix regression caused by unbalanced partitions and splitting ranges Dec 5, 2024
@evenyag evenyag force-pushed the debug/seq-scan-log branch from ae6f2fe to 3066f55 Compare December 5, 2024 09:54
@evenyag evenyag mentioned this pull request Dec 5, 2024
9 tasks
@evenyag evenyag added A-storage Involves code in storage engines release-blocker Indicates a release-blocker labels Dec 5, 2024
@github-actions github-actions bot added docs-required This change requires docs update. and removed docs-not-required This change does not impact docs. labels Dec 5, 2024
config/datanode.example.toml Show resolved Hide resolved
src/query/src/optimizer/parallelize_scan.rs Show resolved Hide resolved
src/mito2/src/read/seq_scan.rs Outdated Show resolved Hide resolved
src/mito2/src/read/scan_region.rs Show resolved Hide resolved
@evenyag evenyag changed the title fix: fix regression caused by unbalanced partitions and splitting ranges fix!: fix regression caused by unbalanced partitions and splitting ranges Dec 6, 2024
@github-actions github-actions bot added the breaking-change This pull request contains breaking changes. label Dec 6, 2024
Copy link
Contributor

@killme2008 killme2008 left a comment

Choose a reason for hiding this comment

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

LGTM

Copy link
Contributor

@v0y4g3r v0y4g3r left a comment

Choose a reason for hiding this comment

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

LGTM

@v0y4g3r v0y4g3r added this pull request to the merge queue Dec 9, 2024
Merged via the queue into GreptimeTeam:main with commit 2fcb95f Dec 9, 2024
44 checks passed
@v0y4g3r v0y4g3r deleted the debug/seq-scan-log branch December 9, 2024 13:07
@github-actions github-actions bot added docs-not-required This change does not impact docs. and removed docs-required This change requires docs update. labels Dec 10, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-storage Involves code in storage engines breaking-change This pull request contains breaking changes. docs-not-required This change does not impact docs. release-blocker Indicates a release-blocker
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants