From 2f4d901fbe42e4a8a7acb7f877a8f09c14659f15 Mon Sep 17 00:00:00 2001 From: Andrew Lamb Date: Wed, 8 Feb 2023 19:27:18 +0100 Subject: [PATCH] chore: Update datafusion (#6893) * chore: Update datafusion * chore: Run cargo hakari tasks * fix: update for api change --------- Co-authored-by: CircleCI[bot] Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com> --- Cargo.lock | 16 ++++++++-------- Cargo.toml | 4 ++-- iox_query/src/exec/gapfill.rs | 8 +++----- iox_query/src/exec/gapfill/algo.rs | 11 ++++------- workspace-hack/Cargo.toml | 2 +- 5 files changed, 18 insertions(+), 23 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 112dfd8c23..c83232b089 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1400,7 +1400,7 @@ dependencies = [ [[package]] name = "datafusion" version = "17.0.0" -source = "git+https://github.com/apache/arrow-datafusion.git?rev=a67ef9197a0d7242a8089be6324ba2e25e84f41e#a67ef9197a0d7242a8089be6324ba2e25e84f41e" +source = "git+https://github.com/apache/arrow-datafusion.git?rev=e222bd627b6e7974133364fed4600d74b4da6811#e222bd627b6e7974133364fed4600d74b4da6811" dependencies = [ "ahash 0.8.3", "arrow", @@ -1446,7 +1446,7 @@ dependencies = [ [[package]] name = "datafusion-common" version = "17.0.0" -source = "git+https://github.com/apache/arrow-datafusion.git?rev=a67ef9197a0d7242a8089be6324ba2e25e84f41e#a67ef9197a0d7242a8089be6324ba2e25e84f41e" +source = "git+https://github.com/apache/arrow-datafusion.git?rev=e222bd627b6e7974133364fed4600d74b4da6811#e222bd627b6e7974133364fed4600d74b4da6811" dependencies = [ "arrow", "chrono", @@ -1459,7 +1459,7 @@ dependencies = [ [[package]] name = "datafusion-expr" version = "17.0.0" -source = "git+https://github.com/apache/arrow-datafusion.git?rev=a67ef9197a0d7242a8089be6324ba2e25e84f41e#a67ef9197a0d7242a8089be6324ba2e25e84f41e" +source = "git+https://github.com/apache/arrow-datafusion.git?rev=e222bd627b6e7974133364fed4600d74b4da6811#e222bd627b6e7974133364fed4600d74b4da6811" dependencies = [ "ahash 0.8.3", "arrow", @@ -1471,7 +1471,7 @@ dependencies = [ [[package]] name = "datafusion-optimizer" version = "17.0.0" -source = "git+https://github.com/apache/arrow-datafusion.git?rev=a67ef9197a0d7242a8089be6324ba2e25e84f41e#a67ef9197a0d7242a8089be6324ba2e25e84f41e" +source = "git+https://github.com/apache/arrow-datafusion.git?rev=e222bd627b6e7974133364fed4600d74b4da6811#e222bd627b6e7974133364fed4600d74b4da6811" dependencies = [ "arrow", "async-trait", @@ -1487,7 +1487,7 @@ dependencies = [ [[package]] name = "datafusion-physical-expr" version = "17.0.0" -source = "git+https://github.com/apache/arrow-datafusion.git?rev=a67ef9197a0d7242a8089be6324ba2e25e84f41e#a67ef9197a0d7242a8089be6324ba2e25e84f41e" +source = "git+https://github.com/apache/arrow-datafusion.git?rev=e222bd627b6e7974133364fed4600d74b4da6811#e222bd627b6e7974133364fed4600d74b4da6811" dependencies = [ "ahash 0.8.3", "arrow", @@ -1517,7 +1517,7 @@ dependencies = [ [[package]] name = "datafusion-proto" version = "17.0.0" -source = "git+https://github.com/apache/arrow-datafusion.git?rev=a67ef9197a0d7242a8089be6324ba2e25e84f41e#a67ef9197a0d7242a8089be6324ba2e25e84f41e" +source = "git+https://github.com/apache/arrow-datafusion.git?rev=e222bd627b6e7974133364fed4600d74b4da6811#e222bd627b6e7974133364fed4600d74b4da6811" dependencies = [ "arrow", "chrono", @@ -1534,7 +1534,7 @@ dependencies = [ [[package]] name = "datafusion-row" version = "17.0.0" -source = "git+https://github.com/apache/arrow-datafusion.git?rev=a67ef9197a0d7242a8089be6324ba2e25e84f41e#a67ef9197a0d7242a8089be6324ba2e25e84f41e" +source = "git+https://github.com/apache/arrow-datafusion.git?rev=e222bd627b6e7974133364fed4600d74b4da6811#e222bd627b6e7974133364fed4600d74b4da6811" dependencies = [ "arrow", "datafusion-common", @@ -1545,7 +1545,7 @@ dependencies = [ [[package]] name = "datafusion-sql" version = "17.0.0" -source = "git+https://github.com/apache/arrow-datafusion.git?rev=a67ef9197a0d7242a8089be6324ba2e25e84f41e#a67ef9197a0d7242a8089be6324ba2e25e84f41e" +source = "git+https://github.com/apache/arrow-datafusion.git?rev=e222bd627b6e7974133364fed4600d74b4da6811#e222bd627b6e7974133364fed4600d74b4da6811" dependencies = [ "arrow-schema", "datafusion-common", diff --git a/Cargo.toml b/Cargo.toml index 90f8c8dcf2..1b040903dd 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -116,8 +116,8 @@ license = "MIT OR Apache-2.0" [workspace.dependencies] arrow = { version = "32.0.0" } arrow-flight = { version = "32.0.0" } -datafusion = { git = "https://github.com/apache/arrow-datafusion.git", rev="a67ef9197a0d7242a8089be6324ba2e25e84f41e", default-features = false } -datafusion-proto = { git = "https://github.com/apache/arrow-datafusion.git", rev="a67ef9197a0d7242a8089be6324ba2e25e84f41e" } +datafusion = { git = "https://github.com/apache/arrow-datafusion.git", rev="e222bd627b6e7974133364fed4600d74b4da6811", default-features = false } +datafusion-proto = { git = "https://github.com/apache/arrow-datafusion.git", rev="e222bd627b6e7974133364fed4600d74b4da6811" } hashbrown = { version = "0.13.2" } parquet = { version = "32.0.0" } diff --git a/iox_query/src/exec/gapfill.rs b/iox_query/src/exec/gapfill.rs index 38c1af9da4..9c87255f5b 100644 --- a/iox_query/src/exec/gapfill.rs +++ b/iox_query/src/exec/gapfill.rs @@ -464,7 +464,6 @@ mod test { physical_plan::displayable, prelude::{col, lit, lit_timestamp_nano}, scalar::ScalarValue, - sql::TableReference, }; fn schema() -> Schema { @@ -546,10 +545,9 @@ mod test { async fn assert_explain(sql: &str, expected: &str) -> Result<()> { let executor = Executor::new_testing(); let context = executor.new_context(ExecutorType::Query); - context.inner().register_table( - TableReference::Bare { table: "temps" }, - Arc::new(EmptyTable::new(Arc::new(schema()))), - )?; + context + .inner() + .register_table("temps", Arc::new(EmptyTable::new(Arc::new(schema()))))?; let physical_plan = context.prepare_sql(sql).await?; let actual_plan = displayable(physical_plan.as_ref()).indent().to_string(); let actual_iter = actual_plan.split('\n'); diff --git a/iox_query/src/exec/gapfill/algo.rs b/iox_query/src/exec/gapfill/algo.rs index 916e722833..19c9f0f72c 100644 --- a/iox_query/src/exec/gapfill/algo.rs +++ b/iox_query/src/exec/gapfill/algo.rs @@ -155,9 +155,7 @@ mod tests { error::Result as ArrowResult, record_batch::RecordBatch, }; - use datafusion::{ - datasource::empty::EmptyTable, error::Result, from_slice::FromSlice, sql::TableReference, - }; + use datafusion::{datasource::empty::EmptyTable, error::Result, from_slice::FromSlice}; use crate::exec::{gapfill::GapFillExec, Executor, ExecutorType}; @@ -193,10 +191,9 @@ mod tests { async fn plan_statement_and_get_params(sql: &str) -> Result { let executor = Executor::new_testing(); let context = executor.new_context(ExecutorType::Query); - context.inner().register_table( - TableReference::Bare { table: "t" }, - Arc::new(EmptyTable::new(Arc::new(schema()))), - )?; + context + .inner() + .register_table("t", Arc::new(EmptyTable::new(Arc::new(schema()))))?; let physical_plan = context.prepare_sql(sql).await?; let gapfill_node = &physical_plan.children()[0]; let gapfill_node = gapfill_node.as_any().downcast_ref::().unwrap(); diff --git a/workspace-hack/Cargo.toml b/workspace-hack/Cargo.toml index 20c32270f1..3d02258d01 100644 --- a/workspace-hack/Cargo.toml +++ b/workspace-hack/Cargo.toml @@ -29,7 +29,7 @@ bytes = { version = "1", features = ["std"] } chrono = { version = "0.4", default-features = false, features = ["alloc", "clock", "iana-time-zone", "serde", "std", "winapi"] } crossbeam-utils = { version = "0.8", features = ["std"] } crypto-common = { version = "0.1", default-features = false, features = ["std"] } -datafusion = { git = "https://github.com/apache/arrow-datafusion.git", rev = "a67ef9197a0d7242a8089be6324ba2e25e84f41e", features = ["async-compression", "bzip2", "compression", "crypto_expressions", "flate2", "regex_expressions", "unicode_expressions", "xz2"] } +datafusion = { git = "https://github.com/apache/arrow-datafusion.git", rev = "e222bd627b6e7974133364fed4600d74b4da6811", features = ["async-compression", "bzip2", "compression", "crypto_expressions", "flate2", "regex_expressions", "unicode_expressions", "xz2"] } digest = { version = "0.10", features = ["alloc", "block-buffer", "core-api", "mac", "std", "subtle"] } either = { version = "1", features = ["use_std"] } fixedbitset = { version = "0.4", features = ["std"] }