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

fix: Try to convert a static list into a set in Rust #184

Merged
merged 3 commits into from
Mar 12, 2024
Merged

fix: Try to convert a static list into a set in Rust #184

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
20c67df
fix: Try to convert a static list into set in rust
advancedxy Mar 10, 2024
5868b25
fallback to the previous if the in_list fails
advancedxy Mar 10, 2024
1e496c6
address comment
advancedxy Mar 12, 2024
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
31 changes: 20 additions & 11 deletions core/src/execution/datafusion/planner.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,14 @@ use datafusion::{
common::DataFusionError,
logical_expr::{BuiltinScalarFunction, Operator as DataFusionOperator},
physical_expr::{
expressions::{BinaryExpr, Column, IsNotNullExpr, Literal as DataFusionLiteral},
execution_props::ExecutionProps,
expressions::{
in_list, BinaryExpr, CaseExpr, CastExpr, Column, Count, FirstValue, InListExpr,
IsNotNullExpr, IsNullExpr, LastValue, Literal as DataFusionLiteral, Max, Min,
NegativeExpr, NotExpr, Sum, UnKnownColumn,
},
functions::create_physical_expr,
PhysicalExpr, PhysicalSortExpr,
AggregateExpr, PhysicalExpr, PhysicalSortExpr, ScalarFunctionExpr,
},
physical_plan::{
aggregates::{AggregateMode as DFAggregateMode, PhysicalGroupBy},
Expand All @@ -39,14 +44,6 @@ use datafusion::{
},
};
use datafusion_common::ScalarValue;
use datafusion_physical_expr::{
execution_props::ExecutionProps,
expressions::{
CaseExpr, CastExpr, Count, FirstValue, InListExpr, IsNullExpr, LastValue, Max, Min,
NegativeExpr, NotExpr, Sum, UnKnownColumn,
},
AggregateExpr, ScalarFunctionExpr,
};
use itertools::Itertools;
use jni::objects::GlobalRef;
use num::{BigInt, ToPrimitive};
Expand Down Expand Up @@ -496,7 +493,19 @@ impl PhysicalPlanner {
.iter()
.map(|x| self.create_expr(x, input_schema.clone()).unwrap())
.collect::<Vec<_>>();
Ok(Arc::new(InListExpr::new(value, list, expr.negated, None)))

// if schema contains any dictionary type, we should use InListExpr instead of
// in_list as it doesn't handle value being dictionary type correctly
let contains_dict_type = input_schema
.fields()
.iter()
.any(|f| matches!(f.data_type(), DataType::Dictionary(_, _)));
if contains_dict_type {
// TODO: remove the fallback when https://github.com/apache/arrow-datafusion/issues/9530 is fixed
Ok(Arc::new(InListExpr::new(value, list, expr.negated, None)))
} else {
in_list(value, list, &expr.negated, input_schema.as_ref()).map_err(|e| e.into())
}
}
ExprStruct::If(expr) => {
let if_expr =
Expand Down
Loading