This is an automated email from the ASF dual-hosted git repository.
JingsongLi pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/paimon-rust.git
The following commit(s) were added to refs/heads/main by this push:
new d7ebfba4 fix(table): short-circuit empty global index ranges (#606)
d7ebfba4 is described below
commit d7ebfba4510c909ef73252caf3c21d5f4bd19ff4
Author: QuakeWang <[email protected]>
AuthorDate: Fri Jul 24 14:21:01 2026 +0800
fix(table): short-circuit empty global index ranges (#606)
---
.../src/table/btree_global_index_build_builder.rs | 79 +++++++++++++++++++++-
crates/paimon/src/table/table_scan.rs | 9 +++
2 files changed, 86 insertions(+), 2 deletions(-)
diff --git a/crates/paimon/src/table/btree_global_index_build_builder.rs
b/crates/paimon/src/table/btree_global_index_build_builder.rs
index f9ce468e..693a15dc 100644
--- a/crates/paimon/src/table/btree_global_index_build_builder.rs
+++ b/crates/paimon/src/table/btree_global_index_build_builder.rs
@@ -786,8 +786,8 @@ mod tests {
use crate::io::FileIOBuilder;
use crate::spec::stats::BinaryTableStats;
use crate::spec::{
- BinaryType, DoubleType, FloatType, GlobalIndexSearchMode,
IndexManifest, IntType,
- ManifestEntry, Predicate, PredicateBuilder, Schema, TableSchema,
VarBinaryType,
+ BinaryRowBuilder, BinaryType, DoubleType, FloatType,
GlobalIndexSearchMode, IndexManifest,
+ IntType, ManifestEntry, Predicate, PredicateBuilder, Schema,
TableSchema, VarBinaryType,
VarCharType,
};
use crate::table::global_index_scanner::{evaluate_global_index,
GlobalIndexEvaluation};
@@ -1432,6 +1432,81 @@ mod tests {
}
}
+ #[tokio::test]
+ async fn test_empty_global_index_ranges_skip_legacy_manifests() {
+ for search_mode in ["fast", "full"] {
+ let table_path =
format!("memory:/test_empty_global_index_ranges_{search_mode}");
+ let mut options = table_options("10");
+ options.insert(
+ "global-index.search-mode".to_string(),
+ search_mode.to_string(),
+ );
+ let table = test_table_with_path(&table_path, options);
+ setup_dirs(&table).await;
+
+ let mut table_write = TableWrite::new(&table,
"writer".to_string()).unwrap();
+ table_write
+ .write_arrow_batch(&data_batch(vec![1, 2], vec!["alice",
"bob"]))
+ .await
+ .unwrap();
+ TableCommit::new(table.clone(), "writer".to_string())
+ .commit(table_write.prepare_commit().await.unwrap())
+ .await
+ .unwrap();
+ table
+ .new_btree_global_index_build_builder()
+ .with_index_column("name")
+ .execute()
+ .await
+ .unwrap();
+
+ let mut legacy_file = data_file("legacy.parquet", None, 2);
+ legacy_file.level = 1;
+ legacy_file.file_source = Some(1); // FileSource.COMPACT
+ TableCommit::new(table.clone(), "legacy-writer".to_string())
+ .commit(vec![CommitMessage::new(
+ BinaryRowBuilder::new(0).build_serialized(),
+ 0,
+ vec![legacy_file],
+ )])
+ .await
+ .unwrap();
+
+ let snapshot = table
+ .snapshot_manager()
+ .get_latest_snapshot()
+ .await
+ .unwrap()
+ .unwrap();
+ assert_eq!(snapshot.next_row_id(), Some(2));
+
+ let predicate = PredicateBuilder::new(table.schema().fields())
+ .equal(
+ "name",
+ crate::spec::Datum::String("not-present".to_string()),
+ )
+ .unwrap();
+ let mut read_builder = table.new_read_builder();
+ read_builder.with_filter(predicate);
+
+ let plan = read_builder.new_scan().plan().await.unwrap();
+ assert!(plan.splits().is_empty());
+
+ let (traced_plan, trace) =
read_builder.new_scan().plan_with_trace().await.unwrap();
+ let delta_plan = read_builder
+ .new_scan()
+ .plan_snapshot_delta(&snapshot)
+ .await
+ .unwrap();
+
+ assert!(traced_plan.splits().is_empty());
+ assert_eq!(trace.manifest_entries_read, 0);
+ assert_eq!(trace.final_splits, 0);
+ assert_eq!(trace.final_files, 0);
+ assert!(delta_plan.splits().is_empty());
+ }
+ }
+
#[tokio::test]
async fn test_detail_mode_defers_manifest_pruning_for_unindexed_ranges() {
let table_path = "memory:/test_detail_manifest_pruning";
diff --git a/crates/paimon/src/table/table_scan.rs
b/crates/paimon/src/table/table_scan.rs
index a9da04e9..c8c0f199 100644
--- a/crates/paimon/src/table/table_scan.rs
+++ b/crates/paimon/src/table/table_scan.rs
@@ -1504,6 +1504,9 @@ impl<'a> PaimonTableScan<'a> {
let manifest_row_ranges = self
.manifest_row_ranges(snapshot, index_entries.as_deref(),
global_index_settings)
.await?;
+ if manifest_row_ranges.as_ref().is_some_and(Vec::is_empty) {
+ return Ok(Plan::new(Vec::new()));
+ }
let row_range_index = if data_evolution_enabled {
manifest_row_ranges.clone().map(RowRangeIndex::create)
} else {
@@ -1677,6 +1680,12 @@ impl<'a> PaimonTableScan<'a> {
let manifest_row_ranges = self
.manifest_row_ranges(&snapshot, index_entries.as_deref(),
global_index_settings)
.await?;
+ if manifest_row_ranges.as_ref().is_some_and(Vec::is_empty) {
+ if let Some(trace) = trace {
+ trace.record_final_plan(0, 0, 0);
+ }
+ return Ok(Plan::new(Vec::new()));
+ }
let row_range_index = if data_evolution_enabled {
manifest_row_ranges.clone().map(RowRangeIndex::create)
} else {
