Skip to content

Commit 476c443

Browse files
committed
Fixed dependencies.
Turns out we weren't pointing at main. We were pointing at some other commit. I've updated the dependencies and reverted any relevant changes.
1 parent 9f3997c commit 476c443

File tree

5 files changed

+22
-20
lines changed

5 files changed

+22
-20
lines changed

Cargo.toml

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -28,25 +28,26 @@ keywords = ["arrow", "arrow-rs", "datafusion"]
2828
rust-version = "1.80"
2929

3030
[dependencies]
31-
arrow = { version = "54.1.0" }
32-
arrow-schema = { version = "54.1.0" }
31+
32+
arrow = { version = "55.0.0" }
33+
arrow-schema = { version = "55.0.0" }
3334
async-trait = "0.1"
3435
chrono = "= 0.4.40"
3536
dashmap = "6"
36-
datafusion = { git = "https://github.com/polygon-io/arrow-datafusion", rev = "1c92803" }
37-
datafusion-common = { git = "https://github.com/polygon-io/arrow-datafusion", rev = "1c92803" }
38-
datafusion-expr = { git = "https://github.com/polygon-io/arrow-datafusion", rev = "1c92803" }
39-
datafusion-functions = { git = "https://github.com/polygon-io/arrow-datafusion", rev = "1c92803" }
40-
datafusion-functions-aggregate = { git = "https://github.com/polygon-io/arrow-datafusion", rev = "1c92803" }
41-
datafusion-optimizer = { git = "https://github.com/polygon-io/arrow-datafusion", rev = "1c92803" }
42-
datafusion-physical-expr = { git = "https://github.com/polygon-io/arrow-datafusion", rev = "1c92803" }
43-
datafusion-physical-plan = { git = "https://github.com/polygon-io/arrow-datafusion", rev = "1c92803" }
44-
datafusion-sql = { git = "https://github.com/polygon-io/arrow-datafusion", rev = "1c92803" }
37+
datafusion = { git = "https://github.com/polygon-io/arrow-datafusion", rev = "a13a6fe" }
38+
datafusion-common = { git = "https://github.com/polygon-io/arrow-datafusion", rev = "a13a6fe" }
39+
datafusion-expr = { git = "https://github.com/polygon-io/arrow-datafusion", rev = "a13a6fe" }
40+
datafusion-functions = { git = "https://github.com/polygon-io/arrow-datafusion", rev = "a13a6fe" }
41+
datafusion-functions-aggregate = { git = "https://github.com/polygon-io/arrow-datafusion", rev = "a13a6fe" }
42+
datafusion-optimizer = { git = "https://github.com/polygon-io/arrow-datafusion", rev = "a13a6fe" }
43+
datafusion-physical-expr = { git = "https://github.com/polygon-io/arrow-datafusion", rev = "a13a6fe" }
44+
datafusion-physical-plan = { git = "https://github.com/polygon-io/arrow-datafusion", rev = "a13a6fe" }
45+
datafusion-sql = { git = "https://github.com/polygon-io/arrow-datafusion", rev = "a13a6fe" }
4546
futures = "0.3"
46-
itertools = "0.13"
47+
itertools = "0.14"
4748
log = "0.4"
48-
object_store = "0.11"
49-
ordered-float = "4.6.0"
49+
object_store = "0.12"
50+
ordered-float = "5.0.0"
5051

5152
[dev-dependencies]
5253
anyhow = "1.0.95"

src/materialized/dependencies.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -110,14 +110,14 @@ impl TableFunctionImpl for FileDependenciesUdtf {
110110
"mv_dependencies: table '{table_name} is not a materialized view. (Materialized TableProviders must be registered using register_materialized"),
111111
))?;
112112

113-
Ok(Arc::new(ViewTable::try_new(
113+
Ok(Arc::new(ViewTable::new(
114114
mv_dependencies_plan(
115115
mv,
116116
self.row_metadata_registry.as_ref(),
117117
&self.config_options,
118118
)?,
119119
None,
120-
)?))
120+
)))
121121
}
122122
}
123123

@@ -224,7 +224,7 @@ impl TableFunctionImpl for StaleFilesUdtf {
224224
])?
225225
.build()?;
226226

227-
Ok(Arc::new(ViewTable::try_new(logical_plan, None)?))
227+
Ok(Arc::new(ViewTable::new(logical_plan, None)))
228228
}
229229
}
230230

src/materialized/file_metadata.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -702,7 +702,7 @@ impl FileMetadataBuilder {
702702
.append_value(format!("{store_url}{}", meta.location));
703703
self.last_modified
704704
.append_option(meta.last_modified.timestamp_nanos_opt());
705-
self.size.append_value(meta.size as u64); // this is not lossy assuming we're on a 64-bit platform
705+
self.size.append_value(meta.size); // this is not lossy assuming we're on a 64-bit platform
706706
}
707707

708708
fn finish(mut self) -> Result<RecordBatch> {
@@ -763,7 +763,7 @@ impl FileMetadataProvider for DefaultFileMetadataProvider {
763763
let prefix = url.prefix().clone();
764764

765765
let list = match is_dir {
766-
true => stream::iter(store.list(Some(&prefix)).collect::<Vec<_>>().await).boxed(),
766+
true => store.list(Some(&prefix)),
767767
false => futures::stream::once(async move { store.head(&prefix).await }).boxed(),
768768
};
769769

src/rewrite/exploitation.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -457,6 +457,7 @@ impl DisplayAs for OneOfExec {
457457
)
458458
)
459459
}
460+
DisplayFormatType::TreeRender => Ok(()),
460461
}
461462
}
462463
}

src/rewrite/normal_form.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1194,7 +1194,7 @@ mod test {
11941194
TestCase {
11951195
name: "naked table scan with pushed down filters",
11961196
base: "SELECT column1 FROM t1 WHERE column2 <= 3",
1197-
query: "SELECT column1 FROM t1 WHERE column2 <= 3",
1197+
query: "SELECT FROM t1 WHERE column2 <= 3",
11981198
},
11991199
];
12001200

0 commit comments

Comments
 (0)