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

chore: adjust fuse_time_travel_size() #16995

Merged
merged 1 commit into from
Dec 4, 2024
Merged

chore: adjust fuse_time_travel_size() #16995

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
28 changes: 21 additions & 7 deletions src/query/storages/fuse/src/table_functions/fuse_time_travel_size.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,8 +88,9 @@ impl SimpleArgFunc for FuseTimeTravelSize {
),
TableField::new(
"latest_snapshot_size",
TableDataType::Number(NumberDataType::UInt64),
TableDataType::Number(NumberDataType::UInt64).wrap_nullable(),
),
TableField::new("error", TableDataType::String.wrap_nullable()),
])
}

Expand All @@ -103,6 +104,7 @@ impl SimpleArgFunc for FuseTimeTravelSize {
let mut table_names = Vec::new();
let mut sizes = Vec::new();
let mut latest_snapshot_sizes = Vec::new();
let mut errors = Vec::new();
let catalog = ctx.get_default_catalog()?;
let dbs = match &args.database_name {
Some(db_name) => {
Expand Down Expand Up @@ -148,14 +150,24 @@ impl SimpleArgFunc for FuseTimeTravelSize {
database_names.push(db.name().to_string());
table_names.push(tbl.name().to_string());
sizes.push(time_travel_size);
latest_snapshot_sizes.push(latest_snapshot_size);
match latest_snapshot_size {
Ok(size) => {
latest_snapshot_sizes.push(Some(size));
errors.push(None);
}
Err(e) => {
latest_snapshot_sizes.push(None);
errors.push(Some(e.to_string()));
}
}
}
}
Ok(DataBlock::new_from_columns(vec![
StringType::from_data(database_names),
StringType::from_data(table_names),
UInt64Type::from_data(sizes),
UInt64Type::from_data(latest_snapshot_sizes),
UInt64Type::from_opt_data(latest_snapshot_sizes),
StringType::from_opt_data(errors),
]))
}
}
Expand All @@ -173,7 +185,7 @@ async fn get_time_travel_size(storage_prefix: &str, op: &Operator) -> Result<u64
Ok(size)
}

async fn calc_tbl_size(tbl: &FuseTable) -> Result<(u64, u64)> {
async fn calc_tbl_size(tbl: &FuseTable) -> Result<(u64, Result<u64>)> {
info!(
"fuse_time_travel_size start calc_tbl_size:{}",
tbl.get_table_info().desc
Expand All @@ -188,11 +200,13 @@ async fn calc_tbl_size(tbl: &FuseTable) -> Result<(u64, u64)> {
Some(snapshot_location) => {
let start = std::time::Instant::now();
info!("fuse_time_travel_size will read: {}", snapshot_location);
let (snapshot, _) = SnapshotsIO::read_snapshot(snapshot_location, operator).await?;
let snapshot = SnapshotsIO::read_snapshot(snapshot_location, operator).await;
info!("read_snapshot cost: {:?}", start.elapsed());
snapshot.summary.compressed_byte_size + snapshot.summary.index_size
snapshot.map(|(snapshot, _)| {
snapshot.summary.compressed_byte_size + snapshot.summary.index_size
})
}
None => 0,
None => Ok(0),
};
Ok((time_travel_size, latest_snapshot_size))
}
Loading