diff --git a/Cargo.toml b/Cargo.toml index ed76eb4..1fad681 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -28,25 +28,26 @@ keywords = ["arrow", "arrow-rs", "datafusion"] rust-version = "1.80" [dependencies] -arrow = { version = "54.1.0" } -arrow-schema = { version = "54.1.0" } + +arrow = { version = "55.0.0" } +arrow-schema = { version = "55.0.0" } async-trait = "0.1" chrono = "= 0.4.40" dashmap = "6" -datafusion = { git = "https://github.com/polygon-io/arrow-datafusion", rev = "1c92803" } -datafusion-common = { git = "https://github.com/polygon-io/arrow-datafusion", rev = "1c92803" } -datafusion-expr = { git = "https://github.com/polygon-io/arrow-datafusion", rev = "1c92803" } -datafusion-functions = { git = "https://github.com/polygon-io/arrow-datafusion", rev = "1c92803" } -datafusion-functions-aggregate = { git = "https://github.com/polygon-io/arrow-datafusion", rev = "1c92803" } -datafusion-optimizer = { git = "https://github.com/polygon-io/arrow-datafusion", rev = "1c92803" } -datafusion-physical-expr = { git = "https://github.com/polygon-io/arrow-datafusion", rev = "1c92803" } -datafusion-physical-plan = { git = "https://github.com/polygon-io/arrow-datafusion", rev = "1c92803" } -datafusion-sql = { git = "https://github.com/polygon-io/arrow-datafusion", rev = "1c92803" } +datafusion = { git = "https://github.com/polygon-io/arrow-datafusion", rev = "a13a6fe" } +datafusion-common = { git = "https://github.com/polygon-io/arrow-datafusion", rev = "a13a6fe" } +datafusion-expr = { git = "https://github.com/polygon-io/arrow-datafusion", rev = "a13a6fe" } +datafusion-functions = { git = "https://github.com/polygon-io/arrow-datafusion", rev = "a13a6fe" } +datafusion-functions-aggregate = { git = "https://github.com/polygon-io/arrow-datafusion", rev = "a13a6fe" } +datafusion-optimizer = { git = "https://github.com/polygon-io/arrow-datafusion", rev = "a13a6fe" } +datafusion-physical-expr = { git = "https://github.com/polygon-io/arrow-datafusion", rev = "a13a6fe" } +datafusion-physical-plan = { git = "https://github.com/polygon-io/arrow-datafusion", rev = "a13a6fe" } +datafusion-sql = { git = "https://github.com/polygon-io/arrow-datafusion", rev = "a13a6fe" } futures = "0.3" -itertools = "0.13" +itertools = "0.14" log = "0.4" -object_store = "0.11" -ordered-float = "4.6.0" +object_store = "0.12" +ordered-float = "5.0.0" [dev-dependencies] anyhow = "1.0.95" diff --git a/src/materialized/dependencies.rs b/src/materialized/dependencies.rs index 26e1047..5b42692 100644 --- a/src/materialized/dependencies.rs +++ b/src/materialized/dependencies.rs @@ -110,14 +110,14 @@ impl TableFunctionImpl for FileDependenciesUdtf { "mv_dependencies: table '{table_name} is not a materialized view. (Materialized TableProviders must be registered using register_materialized"), ))?; - Ok(Arc::new(ViewTable::try_new( + Ok(Arc::new(ViewTable::new( mv_dependencies_plan( mv, self.row_metadata_registry.as_ref(), &self.config_options, )?, None, - )?)) + ))) } } @@ -224,7 +224,7 @@ impl TableFunctionImpl for StaleFilesUdtf { ])? .build()?; - Ok(Arc::new(ViewTable::try_new(logical_plan, None)?)) + Ok(Arc::new(ViewTable::new(logical_plan, None))) } } diff --git a/src/materialized/file_metadata.rs b/src/materialized/file_metadata.rs index 2cd2d63..d5a5c8e 100644 --- a/src/materialized/file_metadata.rs +++ b/src/materialized/file_metadata.rs @@ -702,7 +702,7 @@ impl FileMetadataBuilder { .append_value(format!("{store_url}{}", meta.location)); self.last_modified .append_option(meta.last_modified.timestamp_nanos_opt()); - self.size.append_value(meta.size as u64); // this is not lossy assuming we're on a 64-bit platform + self.size.append_value(meta.size); // this is not lossy assuming we're on a 64-bit platform } fn finish(mut self) -> Result { @@ -763,7 +763,7 @@ impl FileMetadataProvider for DefaultFileMetadataProvider { let prefix = url.prefix().clone(); let list = match is_dir { - true => stream::iter(store.list(Some(&prefix)).collect::>().await).boxed(), + true => store.list(Some(&prefix)), false => futures::stream::once(async move { store.head(&prefix).await }).boxed(), }; diff --git a/src/rewrite/exploitation.rs b/src/rewrite/exploitation.rs index 7ac5ced..b6fb761 100644 --- a/src/rewrite/exploitation.rs +++ b/src/rewrite/exploitation.rs @@ -457,6 +457,7 @@ impl DisplayAs for OneOfExec { ) ) } + DisplayFormatType::TreeRender => Ok(()), } } } diff --git a/src/rewrite/normal_form.rs b/src/rewrite/normal_form.rs index b84f8c0..0d6f7d0 100644 --- a/src/rewrite/normal_form.rs +++ b/src/rewrite/normal_form.rs @@ -1194,7 +1194,7 @@ mod test { TestCase { name: "naked table scan with pushed down filters", base: "SELECT column1 FROM t1 WHERE column2 <= 3", - query: "SELECT column1 FROM t1 WHERE column2 <= 3", + query: "SELECT FROM t1 WHERE column2 <= 3", }, ];