-
Notifications
You must be signed in to change notification settings - Fork 752
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(storage): Improve optimize table compact #6373
Merged
Merged
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,73 @@ | ||
| // Copyright 2022 Datafuse Labs. | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
| // | ||
|
|
||
| use std::sync::Arc; | ||
|
|
||
| use common_exception::Result; | ||
| use common_meta_app::schema::TableStatistics; | ||
| use common_planners::OptimizeTablePlan; | ||
|
|
||
| use super::mutation::CompactMutator; | ||
| use crate::sessions::QueryContext; | ||
| use crate::storages::fuse::FuseTable; | ||
| use crate::storages::fuse::DEFAULT_BLOCK_PER_SEGMENT; | ||
| use crate::storages::fuse::DEFAULT_ROW_PER_BLOCK; | ||
| use crate::storages::fuse::FUSE_OPT_KEY_BLOCK_PER_SEGMENT; | ||
| use crate::storages::fuse::FUSE_OPT_KEY_ROW_PER_BLOCK; | ||
| use crate::storages::storage_table::Table; | ||
|
|
||
| impl FuseTable { | ||
| pub async fn do_compact(&self, ctx: Arc<QueryContext>, plan: &OptimizeTablePlan) -> Result<()> { | ||
| let snapshot_opt = self.read_table_snapshot(ctx.as_ref()).await?; | ||
| let snapshot = if let Some(val) = snapshot_opt { | ||
| val | ||
| } else { | ||
| // no snapshot, no compaction. | ||
| return Ok(()); | ||
| }; | ||
|
|
||
| if snapshot.summary.block_count <= 1 { | ||
| return Ok(()); | ||
| } | ||
|
|
||
| let row_per_block = self.get_option(FUSE_OPT_KEY_ROW_PER_BLOCK, DEFAULT_ROW_PER_BLOCK); | ||
| let block_per_seg = | ||
| self.get_option(FUSE_OPT_KEY_BLOCK_PER_SEGMENT, DEFAULT_BLOCK_PER_SEGMENT); | ||
|
|
||
| let mut mutator = CompactMutator::try_create( | ||
| &ctx, | ||
| &self.meta_location_generator, | ||
| &snapshot, | ||
| row_per_block, | ||
| block_per_seg, | ||
| )?; | ||
|
|
||
| let new_snapshot = mutator.compact(self).await?; | ||
| let mut new_table_meta = self.get_table_info().meta.clone(); // update statistics | ||
| new_table_meta.statistics = TableStatistics { | ||
| number_of_rows: new_snapshot.summary.row_count, | ||
| data_bytes: new_snapshot.summary.uncompressed_byte_size, | ||
| compressed_data_bytes: new_snapshot.summary.compressed_byte_size, | ||
| index_data_bytes: 0, // TODO we do not have it yet | ||
| }; | ||
| self.update_table_meta( | ||
| ctx.as_ref(), | ||
| &plan.catalog, | ||
| &new_snapshot, | ||
| &mut new_table_meta, | ||
| ) | ||
| .await | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -14,6 +14,7 @@ | |
|
|
||
| mod append; | ||
| mod commit; | ||
| mod compact; | ||
| mod delete; | ||
| mod fuse_sink; | ||
| mod gc; | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
152 changes: 152 additions & 0 deletions
152
query/src/storages/fuse/operations/mutation/compact_mutator.rs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,152 @@ | ||
| // Copyright 2022 Datafuse Labs. | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
|
|
||
| use std::sync::Arc; | ||
|
|
||
| use common_datablocks::DataBlock; | ||
| use common_exception::Result; | ||
| use opendal::Operator; | ||
|
|
||
| use super::block_filter::all_the_columns_ids; | ||
| use crate::sessions::QueryContext; | ||
| use crate::storages::fuse::io::BlockCompactor; | ||
| use crate::storages::fuse::io::BlockWriter; | ||
| use crate::storages::fuse::io::MetaReaders; | ||
| use crate::storages::fuse::io::SegmentWriter; | ||
| use crate::storages::fuse::io::TableMetaLocationGenerator; | ||
| use crate::storages::fuse::meta::BlockMeta; | ||
| use crate::storages::fuse::meta::SegmentInfo; | ||
| use crate::storages::fuse::meta::TableSnapshot; | ||
| use crate::storages::fuse::statistics::reducers::reduce_block_metas; | ||
| use crate::storages::fuse::statistics::reducers::reduce_statistics; | ||
| use crate::storages::fuse::FuseTable; | ||
|
|
||
| pub struct CompactMutator<'a> { | ||
| ctx: &'a Arc<QueryContext>, | ||
| location_generator: &'a TableMetaLocationGenerator, | ||
| base_snapshot: &'a TableSnapshot, | ||
| data_accessor: Operator, | ||
| row_per_block: usize, | ||
| block_per_seg: usize, | ||
| } | ||
|
|
||
| impl<'a> CompactMutator<'a> { | ||
| pub fn try_create( | ||
| ctx: &'a Arc<QueryContext>, | ||
| location_generator: &'a TableMetaLocationGenerator, | ||
| base_snapshot: &'a TableSnapshot, | ||
| row_per_block: usize, | ||
| block_per_seg: usize, | ||
| ) -> Result<Self> { | ||
| let data_accessor = ctx.get_storage_operator()?; | ||
| Ok(Self { | ||
| ctx, | ||
| location_generator, | ||
| base_snapshot, | ||
| data_accessor, | ||
| row_per_block, | ||
| block_per_seg, | ||
| }) | ||
| } | ||
|
|
||
| pub async fn compact(&mut self, table: &FuseTable) -> Result<TableSnapshot> { | ||
| let snapshot = self.base_snapshot; | ||
| // Blocks that need to be reorganized into new segments. | ||
| let mut remain_blocks = Vec::new(); | ||
| // Blocks that need to be compacted. | ||
| let mut merged_blocks = Vec::new(); | ||
| // The new segments. | ||
| let mut segments = Vec::new(); | ||
| let mut summarys = Vec::new(); | ||
| let reader = MetaReaders::segment_info_reader(self.ctx); | ||
| for segment_location in &snapshot.segments { | ||
| let (x, ver) = (segment_location.0.clone(), segment_location.1); | ||
| let mut need_merge = false; | ||
| let mut remains = Vec::new(); | ||
| let segment = reader.read(x, None, ver).await?; | ||
| segment.blocks.iter().for_each(|b| { | ||
| if b.row_count != self.row_per_block as u64 { | ||
| merged_blocks.push(b.clone()); | ||
| need_merge = true; | ||
| } else { | ||
| remains.push(b.clone()); | ||
| } | ||
| }); | ||
|
|
||
| // If the number of blocks of segment meets block_per_seg, and the blocks in segments donot need to be compacted, | ||
| // then record the segment information. | ||
| if !need_merge && segment.blocks.len() == self.block_per_seg { | ||
| segments.push(segment_location.clone()); | ||
| summarys.push(segment.summary.clone()); | ||
| continue; | ||
| } | ||
|
|
||
| remain_blocks.append(&mut remains); | ||
| } | ||
|
|
||
| // Compact the blocks. | ||
| let col_ids = all_the_columns_ids(table); | ||
| let mut compactor = BlockCompactor::new(self.row_per_block); | ||
| let block_writer = BlockWriter::new(&self.data_accessor, self.location_generator); | ||
| for block_meta in &merged_blocks { | ||
| let block_reader = table.create_block_reader(self.ctx, col_ids.clone())?; | ||
| let data_block = block_reader.read_with_block_meta(block_meta).await?; | ||
|
|
||
| let res = compactor.compact(data_block)?; | ||
| Self::write_block(&block_writer, res, &mut remain_blocks).await?; | ||
| } | ||
| let remains = compactor.finish()?; | ||
| Self::write_block(&block_writer, remains, &mut remain_blocks).await?; | ||
|
|
||
| // Create new segments. | ||
| let segment_info_cache = self | ||
| .ctx | ||
| .get_storage_cache_manager() | ||
| .get_table_segment_cache(); | ||
| let seg_writer = SegmentWriter::new( | ||
| &self.data_accessor, | ||
| self.location_generator, | ||
| &segment_info_cache, | ||
| ); | ||
| let chunks = remain_blocks.chunks(self.block_per_seg); | ||
| for chunk in chunks { | ||
| let new_summary = reduce_block_metas(chunk)?; | ||
| let new_segment = SegmentInfo::new(chunk.to_vec(), new_summary.clone()); | ||
| let new_segment_location = seg_writer.write_segment(new_segment).await?; | ||
| segments.push(new_segment_location); | ||
| summarys.push(new_summary); | ||
| } | ||
|
|
||
| let mut new_snapshot = TableSnapshot::from_previous(snapshot); | ||
| new_snapshot.segments = segments; | ||
| // update the summary of new snapshot | ||
| let new_summary = reduce_statistics(&summarys)?; | ||
| new_snapshot.summary = new_summary; | ||
| Ok(new_snapshot) | ||
| } | ||
|
|
||
| async fn write_block( | ||
| writer: &BlockWriter<'_>, | ||
| blocks: Option<Vec<DataBlock>>, | ||
| metas: &mut Vec<BlockMeta>, | ||
| ) -> Result<()> { | ||
| if let Some(blocks) = blocks { | ||
| for block in blocks { | ||
| let new_block_meta = writer.write(block).await?; | ||
| metas.push(new_block_meta); | ||
| } | ||
| } | ||
| Ok(()) | ||
| } | ||
| } | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Naming is much better than
DeletionCollector👍