Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
29 changes: 15 additions & 14 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
6 changes: 3 additions & 3 deletions src/materialized/dependencies.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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,
)?))
)))
}
}

Expand Down Expand Up @@ -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)))
}
}

Expand Down
4 changes: 2 additions & 2 deletions src/materialized/file_metadata.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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<RecordBatch> {
Expand Down Expand Up @@ -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::<Vec<_>>().await).boxed(),
true => store.list(Some(&prefix)),
false => futures::stream::once(async move { store.head(&prefix).await }).boxed(),
};

Expand Down
1 change: 1 addition & 0 deletions src/rewrite/exploitation.rs
Original file line number Diff line number Diff line change
Expand Up @@ -457,6 +457,7 @@ impl DisplayAs for OneOfExec {
)
)
}
DisplayFormatType::TreeRender => Ok(()),
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/rewrite/normal_form.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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",
},
];

Expand Down