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

Simplify InListExpr ~20-70% Faster #4057

Merged
merged 8 commits into from
Nov 2, 2022
Merged

Simplify InListExpr ~20-70% Faster #4057

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
b9ca3d9
Simplify InList expression
tustvold Nov 1, 2022
997b32f
Simplify
tustvold Nov 1, 2022
ae03183
Hash floats as integers
tustvold Nov 1, 2022
97d78d3
Fix tests
tustvold Nov 1, 2022
5b28405
Format
tustvold Nov 1, 2022
d3097f7
Update datafusion-cli lockfile
tustvold Nov 1, 2022
b3a4665
Sort Cargo.toml
tustvold Nov 1, 2022
86f0346
Update datafusion/physical-expr/src/expressions/in_list.rs
tustvold Nov 2, 2022
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
6 changes: 3 additions & 3 deletions datafusion-cli/Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 1 addition & 3 deletions datafusion/core/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,7 @@ unicode_expressions = ["datafusion-physical-expr/regex_expressions", "datafusion
ahash = { version = "0.8", default-features = false, features = ["runtime-rng"] }
apache-avro = { version = "0.14", optional = true }
arrow = { version = "25.0.0", features = ["prettyprint"] }
arrow-buffer = "25.0.0"
arrow-schema = "25.0.0"

async-compression = { version = "0.3.14", features = ["bzip2", "gzip", "futures-io", "tokio"] }
async-trait = "0.1.41"
bytes = "1.1"
Expand All @@ -74,7 +73,6 @@ datafusion-sql = { path = "../sql", version = "13.0.0" }
flate2 = "1.0.24"
futures = "0.3"
glob = "0.3.0"
half = { version = "2.1", default-features = false }
hashbrown = { version = "0.12", features = ["raw"] }
itertools = "0.10"
lazy_static = { version = "^1.4.0" }
Expand Down
5 changes: 3 additions & 2 deletions datafusion/core/src/physical_plan/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -525,7 +525,6 @@ pub mod empty;
pub mod explain;
pub mod file_format;
pub mod filter;
pub mod hash_utils;
pub mod joins;
pub mod limit;
pub mod memory;
Expand All @@ -541,4 +540,6 @@ pub mod values;
pub mod windows;

use crate::execution::context::TaskContext;
pub use datafusion_physical_expr::{expressions, functions, type_coercion, udf};
pub use datafusion_physical_expr::{
expressions, functions, hash_utils, type_coercion, udf,
};
49 changes: 3 additions & 46 deletions datafusion/core/src/physical_plan/planner.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2035,8 +2035,9 @@ mod tests {
.build()?;
let execution_plan = plan(&logical_plan).await?;
// verify that the plan correctly adds cast from Int64(1) to Utf8, and the const will be evaluated.
let expected = "expr: [(InListExpr { expr: Column { name: \"c1\", index: 0 }, list: [Literal { value: Utf8(\"a\") }, Literal { value: Utf8(\"1\") }], negated: false, set: None }";
assert!(format!("{:?}", execution_plan).contains(expected));
let expected = "expr: [(InListExpr { expr: Column { name: \"c1\", index: 0 }, list: [Literal { value: Utf8(\"a\") }, Literal { value: Utf8(\"1\") }], negated: false }";
let actual = format!("{:?}", execution_plan);
assert!(actual.contains(expected), "{}", actual);

Ok(())
}
Expand Down Expand Up @@ -2068,50 +2069,6 @@ mod tests {
lit(struct_literal)
}

#[tokio::test]
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We now always use a HashSet see below

async fn in_set_test() -> Result<()> {
// OPTIMIZER_INSET_THRESHOLD = 10
// expression: "a in ('a', 1, 2, ..30)"
let mut list = vec![Expr::Literal(ScalarValue::Utf8(Some("a".to_string())))];
for i in 1..31 {
list.push(Expr::Literal(ScalarValue::Int64(Some(i))));
}
let logical_plan = test_csv_scan()
.await?
.filter(col("c12").lt(lit(0.05)))?
.project(vec![col("c1").in_list(list, false)])?
.build()?;
let execution_plan = plan(&logical_plan).await?;
let expected = "expr: [(InListExpr { expr: Column { name: \"c1\", index: 0 }, list: [Literal { value: Utf8(\"a\") }, Literal { value: Utf8(\"1\") }, Literal { value: Utf8(\"2\") },";
assert!(format!("{:?}", execution_plan).contains(expected));
let expected =
"Literal { value: Utf8(\"30\") }], negated: false, set: Some(InSet { set: ";
assert!(format!("{:?}", execution_plan).contains(expected));
Ok(())
}

#[tokio::test]
async fn in_set_null_test() -> Result<()> {
// test NULL
let mut list = vec![Expr::Literal(ScalarValue::Int64(None))];
for i in 1..31 {
list.push(Expr::Literal(ScalarValue::Int64(Some(i))));
}

let logical_plan = test_csv_scan()
.await?
.filter(col("c12").lt(lit(0.05)))?
.project(vec![col("c1").in_list(list, false)])?
.build()?;
let execution_plan = plan(&logical_plan).await?;
let expected = "expr: [(InListExpr { expr: Column { name: \"c1\", index: 0 }, list: [Literal { value: Utf8(NULL) }, Literal { value: Utf8(\"1\") }, Literal { value: Utf8(\"2\") }";
assert!(format!("{:?}", execution_plan).contains(expected));
let expected =
"Literal { value: Utf8(\"30\") }], negated: false, set: Some(InSet";
assert!(format!("{:?}", execution_plan).contains(expected));
Ok(())
}

#[tokio::test]
async fn hash_agg_input_schema() -> Result<()> {
let logical_plan = test_csv_scan_with_name("aggregate_test_100")
Expand Down
3 changes: 3 additions & 0 deletions datafusion/physical-expr/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,12 +41,15 @@ unicode_expressions = ["unicode-segmentation"]
[dependencies]
ahash = { version = "0.8", default-features = false, features = ["runtime-rng"] }
arrow = { version = "25.0.0", features = ["prettyprint"] }
arrow-buffer = "25.0.0"
arrow-schema = "25.0.0"
blake2 = { version = "^0.10.2", optional = true }
blake3 = { version = "1.0", optional = true }
chrono = { version = "0.4.22", default-features = false }
datafusion-common = { path = "../common", version = "13.0.0" }
datafusion-expr = { path = "../expr", version = "13.0.0" }
datafusion-row = { path = "../row", version = "13.0.0" }
half = { version = "2.1", default-features = false }
hashbrown = { version = "0.12", features = ["raw"] }
itertools = { version = "0.10", features = ["use_std"] }
lazy_static = { version = "^1.4.0" }
Expand Down
Loading