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

fix: nulll handle&non-null filter

Browse Source 
Signed-off-by: discord9 <discord9@163.com>
This commit is contained in:
discord9
2026-03-05 19:30:12 +08:00
parent 22c0a8ffcc
commit 433b8219a5
2 changed files with 30 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -23,7 +23,7 @@ use api::v1::{OpType, SemanticType};
use common_telemetry::error;
use datafusion::physical_plan::PhysicalExpr;
use datafusion::physical_plan::expressions::DynamicFilterPhysicalExpr;
use datatypes::arrow::array::{ArrayRef, BooleanArray};
use datatypes::arrow::array::{Array as _, ArrayRef, BooleanArray};
use datatypes::arrow::buffer::BooleanBuffer;
use datatypes::arrow::record_batch::RecordBatch;
use datatypes::prelude::ConcreteDataType;
@@ -739,7 +739,12 @@ impl RangeBase {
reason: "Failed to downcast to BooleanArray".to_string(),
})?;
Ok(boolean_array.values().clone())
let mut mask = boolean_array.values().clone();
if let Some(nulls) = boolean_array.nulls() {
mask = mask.bitand(nulls.inner());
}
Ok(mask)
}
/// Builds a `RecordBatch` from the input `Batch` matching the given schema.

36
src/partition/src/expr.rs
View File

@@ -316,8 +316,14 @@ impl PartitionExpr {
.clone()
.lt_eq(other_expr)
.or(column_expr.is_null()),
RestrictedOp::Gt => column_expr.clone().gt(other_expr),
RestrictedOp::GtEq => column_expr.clone().gt_eq(other_expr),
RestrictedOp::Gt => column_expr
.clone()
.gt(other_expr)
.and(column_expr.is_not_null()),
RestrictedOp::GtEq => column_expr
.clone()
.gt_eq(other_expr)
.and(column_expr.is_not_null()),
_ => unreachable!(),
};
return Ok(base);
@@ -325,8 +331,12 @@ impl PartitionExpr {
let other_expr = self.lhs.try_as_logical_expr()?;
let column_expr = self.rhs.try_as_logical_expr()?;
let base = match self.op {
RestrictedOp::Lt => other_expr.lt(column_expr.clone()),
RestrictedOp::LtEq => other_expr.lt_eq(column_expr.clone()),
RestrictedOp::Lt => other_expr
.lt(column_expr.clone())
.and(column_expr.is_not_null()),
RestrictedOp::LtEq => other_expr
.lt_eq(column_expr.clone())
.and(column_expr.is_not_null()),
RestrictedOp::Gt => {
other_expr.gt(column_expr.clone()).or(column_expr.is_null())
}
@@ -565,7 +575,7 @@ mod tests {
.try_as_logical_expr()
.unwrap()
.to_string(),
"a > Int64(10)"
"a > Int64(10) AND a IS NOT NULL"
);
// Test Gt with column on LHS
@@ -576,7 +586,7 @@ mod tests {
);
assert_eq!(
gt_expr.try_as_logical_expr().unwrap().to_string(),
"a > Int64(10)"
"a > Int64(10) AND a IS NOT NULL"
);
// Test Gt with column on RHS
@@ -601,7 +611,7 @@ mod tests {
);
assert_eq!(
gteq_expr.try_as_logical_expr().unwrap().to_string(),
"a >= Int64(10)"
"a >= Int64(10) AND a IS NOT NULL"
);
// Test LtEq with column on LHS
@@ -638,7 +648,7 @@ mod tests {
.try_as_logical_expr()
.unwrap()
.to_string(),
"a >= Int64(10)"
"a >= Int64(10) AND a IS NOT NULL"
);
let and_expr = PartitionExpr::new(
@@ -656,7 +666,7 @@ mod tests {
);
assert_eq!(
and_expr.try_as_logical_expr().unwrap().to_string(),
"(a <= Int64(10) OR a IS NULL) AND b > Int64(5)"
"(a <= Int64(10) OR a IS NULL) AND b > Int64(5) AND b IS NOT NULL"
);
let and_expr = PartitionExpr::new(
@@ -674,7 +684,7 @@ mod tests {
);
assert_eq!(
and_expr.try_as_logical_expr().unwrap().to_string(),
"(a <= Int64(10) OR a IS NULL) AND a > Int64(5)"
"(a <= Int64(10) OR a IS NULL) AND a > Int64(5) AND a IS NOT NULL"
);
let and_expr_strict_lower = PartitionExpr::new(
@@ -695,7 +705,7 @@ mod tests {
.try_as_logical_expr()
.unwrap()
.to_string(),
"(a < Int64(10) OR a IS NULL) AND a >= Int64(5)"
"(a < Int64(10) OR a IS NULL) AND a >= Int64(5) AND a IS NOT NULL"
);
let and_expr_rhs_column = PartitionExpr::new(
@@ -716,7 +726,7 @@ mod tests {
.try_as_logical_expr()
.unwrap()
.to_string(),
"(a <= Int64(10) OR a IS NULL) AND a > Int64(5)"
"(a <= Int64(10) OR a IS NULL) AND a > Int64(5) AND a IS NOT NULL"
);
let or_expr_same_column = PartitionExpr::new(
@@ -737,7 +747,7 @@ mod tests {
.try_as_logical_expr()
.unwrap()
.to_string(),
"a <= Int64(10) OR a IS NULL OR a > Int64(5)"
"a <= Int64(10) OR a IS NULL OR a > Int64(5) AND a IS NOT NULL"
);
}