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

feat(compaction): per table vnode on compactor side #19059

Merged
merged 14 commits into from
Oct 31, 2024

Conversation

Li0k
Copy link
Contributor

@Li0k Li0k commented Oct 22, 2024

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

What's changed and what's your intention?

related to #18888

This PR refactors the FilterKeyExtractor and leverages the existing Catalog capability to provide the ability to extract key and get vnode count.

  1. Refactor FilterKeyExtractor to CompactionCatalogManager
  2. Remove the enum of FilterKeyExtractorManager(RpcXXX, StaticXXX), simplify code logic
  3. Introducing CompactionCatalogAgent to serve a compaction once, making it easier to test.
  4. In Multi Builder, it is supported to get the corresponding vnode by table_id (vnode is calculated by Table catalog).

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.

Copy link

gitguardian bot commented Oct 22, 2024

⚠️ GitGuardian has uncovered 3 secrets following the scan of your pull request.

Please consider investigating the findings and remediating the incidents. Failure to do so may lead to compromising the associated services or software components.

🔎 Detected hardcoded secrets in your pull request
GitGuardian id GitGuardian status Secret Commit Filename
9425213 Triggered Generic Password 8982c65 risedev.yml View secret
9425213 Triggered Generic Password 8982c65 e2e_test/source_inline/tvf/postgres_query.slt View secret
9425213 Triggered Generic Password 8982c65 e2e_test/source_inline/tvf/postgres_query.slt View secret
🛠 Guidelines to remediate hardcoded secrets
  1. Understand the implications of revoking this secret by investigating where it is used in your code.
  2. Replace and store your secrets safely. Learn here the best practices.
  3. Revoke and rotate these secrets.
  4. If possible, rewrite git history. Rewriting git history is not a trivial act. You might completely break other contributing developers' workflow and you risk accidentally deleting legitimate data.

To avoid such incidents in the future consider


🦉 GitGuardian detects secrets in your source code to help developers and security teams secure the modern development process. You are seeing this because you or someone else with access to this repository has authorized GitGuardian to scan your pull request.

@Li0k Li0k requested review from hzxa21, zwang28 and BugenZhao October 23, 2024 07:24
@Li0k Li0k marked this pull request as ready for review October 23, 2024 07:24
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.

The vnode-related section looks good to me. Could we also add some tests with customized vnode counts?

@Li0k
Copy link
Contributor Author

Li0k commented Oct 24, 2024

The vnode-related section looks good to me. Could we also add some tests with customized vnode counts?

Sure, I'm adding a UT for different table vnode counts, and since this logic only affects switch sst at the moment, the UT is only tested for this behaviour.

/// `CompactionCatalogManager` is a manager to manage all `Table` which used in compaction
pub struct CompactionCatalogManager {
// `table_id_to_catalog` is a map to store all `Table` which used in compaction
table_id_to_catalog: RwLock<HashMap<StateTableId, Arc<Table>>>,
Copy link
Collaborator

Choose a reason for hiding this comment

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

IIUC, there is no need to use Arc for Arc<Table>.

Copy link
Collaborator

Choose a reason for hiding this comment

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

This is not resolved?

src/storage/src/compaction_catalog_manager.rs Outdated Show resolved Hide resolved
src/storage/src/compaction_catalog_manager.rs Outdated Show resolved Hide resolved
src/storage/src/hummock/compactor/mod.rs Outdated Show resolved Hide resolved
Copy link
Collaborator

@hzxa21 hzxa21 left a comment

Choose a reason for hiding this comment

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

Rest LGTM

/// `CompactionCatalogManager` is a manager to manage all `Table` which used in compaction
pub struct CompactionCatalogManager {
// `table_id_to_catalog` is a map to store all `Table` which used in compaction
table_id_to_catalog: RwLock<HashMap<StateTableId, Arc<Table>>>,
Copy link
Collaborator

Choose a reason for hiding this comment

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

This is not resolved?

@Li0k Li0k added this pull request to the merge queue Oct 31, 2024
Merged via the queue into main with commit 6defe4c Oct 31, 2024
30 of 31 checks passed
@Li0k Li0k deleted the li0k/compaction_table_vnode branch October 31, 2024 07:01
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.

3 participants