rust/greptimedb
1
0
Fork 0
mirror of https://github.com/GreptimeTeam/greptimedb.git synced 2026-05-16 04:50:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: not ignore error now bug is fixed in #7579 (#7596)

Browse Source 
* chore: not ignore error now bug is fixed in #7579

Signed-off-by: discord9 <discord9@163.com>

* per review

Signed-off-by: discord9 <discord9@163.com>

* chor: test

Signed-off-by: discord9 <discord9@163.com>

---------

Signed-off-by: discord9 <discord9@163.com>
This commit is contained in:
discord9
2026-01-21 14:13:59 +08:00
committed by GitHub
parent 5916b51164
commit 576eb0aadc
2 changed files with 18 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/mito2/src/engine/staging_test.rs
View File

@@ -50,6 +50,12 @@ fn range_expr(col_name: &str, start: i64, end: i64) -> PartitionExpr {
.and(col(col_name).lt(Value::Int64(end)))
}
fn float_range_expr(col_name: &str, start: f64, end: f64) -> PartitionExpr {
col(col_name)
.gt_eq(Value::Float64(start.into()))
.and(col(col_name).lt(Value::Float64(end.into())))
}
#[tokio::test]
async fn test_staging_state_integration() {
test_staging_state_integration_with_format(false).await;
@@ -388,7 +394,7 @@ async fn test_staging_exit_success_with_manifests() {
async fn test_staging_exit_success_with_manifests_with_format(flat_format: bool) {
common_telemetry::init_default_ut_logging();
let partition_expr = range_expr("field_0", 0, 100).as_json_str().unwrap();
let partition_expr = float_range_expr("field_0", 0., 100.).as_json_str().unwrap();
let mut env = TestEnv::new().await;
let engine = env
.create_engine(MitoConfig {

47
src/mito2/src/sst/parquet/file_range.rs
View File

@@ -529,22 +529,10 @@ impl RangeBase {
// Apply partition filter
if let Some(partition_filter) = &self.partition_filter {
let partition_result = self
.build_record_batch_for_pruning(&mut input, &partition_filter.partition_schema)
.and_then(|record_batch| {
self.evaluate_partition_filter(&record_batch, partition_filter)
});
match partition_result {
Ok(partition_mask) => {
mask = mask.bitand(&partition_mask);
}
Err(err) => {
// FIXME(yingwen): due to a known bug, if partition expr include field column, and this field column is not in projection
// we will fail to evaluate partition filter since column is missing.
// we had to overlook the error for now.
error!(err; "Failed to evaluate partition filter, skip partition filtering");
}
}
let record_batch = self
.build_record_batch_for_pruning(&mut input, &partition_filter.partition_schema)?;
let partition_mask = self.evaluate_partition_filter(&record_batch, partition_filter)?;
mask = mask.bitand(&partition_mask);
}
if mask.count_set_bits() == 0 {
@@ -577,26 +565,13 @@ impl RangeBase {
// Apply partition filter
if let Some(partition_filter) = &self.partition_filter {
let partition_result = self
.project_record_batch_for_pruning_flat(
&input,
&partition_filter.partition_schema,
&mut tag_decode_state,
)
.and_then(|record_batch| {
self.evaluate_partition_filter(&record_batch, partition_filter)
});
match partition_result {
Ok(partition_mask) => {
mask = mask.bitand(&partition_mask);
}
Err(err) => {
// FIXME(yingwen): due to a known bug, if partition expr include field column, and this field column is not in projection
// we will fail to evaluate partition filter since column is missing.
// we had to overlook the error for now.
error!(err; "Failed to evaluate partition filter, skip partition filtering");
}
}
let record_batch = self.project_record_batch_for_pruning_flat(
&input,
&partition_filter.partition_schema,
&mut tag_decode_state,
)?;
let partition_mask = self.evaluate_partition_filter(&record_batch, partition_filter)?;
mask = mask.bitand(&partition_mask);
}
if mask.count_set_bits() == 0 {