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.

Sign up for GitHub

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(meta): support BTreeMapTransaction that avoids copying the whole BTreeMap #3680

Merged
merged 7 commits into from
Jul 13, 2022
Merged

feat(meta): support BTreeMapTransaction that avoids copying the whole BTreeMap #3680

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
5c66785
feat(meta): support BTreeMapTransaction that avoids copying the whole…
wenym1 Jul 5, 2022
ff0e019
Merge branch 'main' into yiming/btree-meta-transaction
wenym1 Jul 6, 2022
b959d2a
Merge branch 'main' into yiming/btree-meta-transaction
wenym1 Jul 6, 2022
e5725ca
add docs
wenym1 Jul 12, 2022
81d661b
Merge branch 'main' into yiming/btree-meta-transaction
wenym1 Jul 12, 2022
c3a8292
Merge branch 'main' into yiming/btree-meta-transaction
wenym1 Jul 12, 2022
384b2f7
Merge branch 'main' into yiming/btree-meta-transaction
mergify[bot] Jul 13, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions src/meta/src/hummock/compaction_group/manager.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ use crate::hummock::compaction::compaction_config::CompactionConfigBuilder;
use crate::hummock::compaction_group::CompactionGroup;
use crate::hummock::error::{Error, Result};
use crate::manager::{MetaSrvEnv, SourceId};
use crate::model::{MetadataModel, TableFragments, ValTransaction, VarTransaction};
use crate::model::{BTreeMapTransaction, MetadataModel, TableFragments, ValTransaction};
use crate::storage::{MetaStore, Transaction};

pub type CompactionGroupManagerRef<S> = Arc<CompactionGroupManager<S>>;
Expand Down Expand Up @@ -251,7 +251,7 @@ impl CompactionGroupManagerInner {
self.compaction_groups = loaded_compaction_groups;
} else {
let compaction_groups = &mut self.compaction_groups;
let mut new_compaction_groups = VarTransaction::new(compaction_groups);
let mut new_compaction_groups = BTreeMapTransaction::new(compaction_groups);
let static_compaction_groups = vec![
CompactionGroup::new(StaticCompactionGroupId::StateDefault.into(), config.clone()),
CompactionGroup::new(
Expand Down Expand Up @@ -284,10 +284,10 @@ impl CompactionGroupManagerInner {
pairs: &[(StateTableId, CompactionGroupId, TableOption)],
meta_store: &S,
) -> Result<Vec<StateTableId>> {
let mut compaction_groups = VarTransaction::new(&mut self.compaction_groups);
let mut compaction_groups = BTreeMapTransaction::new(&mut self.compaction_groups);
for (table_id, compaction_group_id, table_option) in pairs {
let compaction_group = compaction_groups
.get_mut(compaction_group_id)
let mut compaction_group = compaction_groups
.get_mut(*compaction_group_id)
.ok_or(Error::InvalidCompactionGroup(*compaction_group_id))?;
compaction_group.member_table_ids.insert(*table_id);
compaction_group
Expand All @@ -311,15 +311,15 @@ impl CompactionGroupManagerInner {
table_ids: &[StateTableId],
meta_store: &S,
) -> Result<()> {
let mut compaction_groups = VarTransaction::new(&mut self.compaction_groups);
let mut compaction_groups = BTreeMapTransaction::new(&mut self.compaction_groups);
for table_id in table_ids {
let compaction_group_id = self
.index
.get(table_id)
.cloned()
.ok_or(Error::InvalidCompactionGroupMember(*table_id))?;
let compaction_group = compaction_groups
.get_mut(&compaction_group_id)
let mut compaction_group = compaction_groups
.get_mut(compaction_group_id)
.ok_or(Error::InvalidCompactionGroup(compaction_group_id))?;
compaction_group.member_table_ids.remove(table_id);
compaction_group.table_id_to_options.remove(table_id);
Expand Down
Loading