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

chore(storage): select compaction strategy using statistics #689

Merged
merged 1 commit into from
Sep 8, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
47 changes: 42 additions & 5 deletions src/storage/secondary/compactor.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ use std::sync::Arc;
use std::time::Duration;

use itertools::Itertools;
use risinglight_proto::rowset::block_statistics::BlockStatisticsType;
use tokio::sync::oneshot::Receiver;
use tracing::{info, warn};

Expand All @@ -14,9 +15,11 @@ use crate::storage::secondary::concat_iterator::ConcatIterator;
use crate::storage::secondary::manifest::{AddRowSetEntry, DeleteRowsetEntry};
use crate::storage::secondary::merge_iterator::MergeIterator;
use crate::storage::secondary::rowset::{DiskRowset, RowsetBuilder, RowsetWriter};
use crate::storage::secondary::statistics::create_statistics_global_aggregator;
use crate::storage::secondary::version_manager::EpochOp;
use crate::storage::secondary::{ColumnBuilderOptions, SecondaryIterator};
use crate::storage::secondary::{ColumnBuilderOptions, EncodeType, SecondaryIterator};
use crate::storage::{StorageColumnRef, StorageResult};
use crate::types::DataValue;

/// Manages all compactions happening in the storage engine.
pub struct Compactor {
Expand Down Expand Up @@ -97,10 +100,44 @@ impl Compactor {
ConcatIterator::new(iters).into()
};

let mut builder = RowsetBuilder::new(
table.columns.clone(),
ColumnBuilderOptions::from_storage_options(&table.storage_options),
);
let mut distinct_value = 0;
let mut row_count = 0;

{
let mut distinct_value_aggregator =
create_statistics_global_aggregator(BlockStatisticsType::DistinctValue);
let mut row_count_aggregator =
create_statistics_global_aggregator(BlockStatisticsType::RowCount);

for rowset in &selected_rowsets {
let columns = rowset.get_columns();
let column_indexs = columns.iter().map(|column| column.index()).collect_vec();
for column_index in column_indexs {
row_count_aggregator.apply_batch(column_index);
distinct_value_aggregator.apply_batch(column_index);
}
}

if let DataValue::Int64(dv) = distinct_value_aggregator.get_output() {
distinct_value = dv;
}

if let DataValue::Int64(rc) = row_count_aggregator.get_output() {
row_count = rc;
}
}

let mut builder = if distinct_value < row_count / 5 {
let mut column_options =
ColumnBuilderOptions::from_storage_options(&table.storage_options);
column_options.encode_type = EncodeType::RunLength;
chaixuqing marked this conversation as resolved.
Show resolved Hide resolved
RowsetBuilder::new(table.columns.clone(), column_options)
} else {
RowsetBuilder::new(
table.columns.clone(),
ColumnBuilderOptions::from_storage_options(&table.storage_options),
)
};

while let Some(batch) = iter.next_batch(None).await? {
builder.append(batch.to_data_chunk());
Expand Down
4 changes: 4 additions & 0 deletions src/storage/secondary/rowset/disk_rowset.rs
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,10 @@ impl DiskRowset {
self.columns[storage_column_id].clone()
}

pub fn get_columns(&self) -> &[Column] {
&self.columns
}

pub fn column_info(&self, storage_column_id: usize) -> &ColumnCatalog {
&self.column_infos[storage_column_id]
}
Expand Down