Influxdata
/
influxdb
mirror of https://github.com/influxdata/influxdb.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

chore: Update datafusion again (#6722) 

* chore: Update datafusion

* fix: Update for API

* chore: Run cargo hakari tasks

---------

Co-authored-by: CircleCI[bot] <circleci@influxdata.com>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
pull/24376/head
Andrew Lamb 2023-01-27 19:59:27 +01:00 committed by GitHub
parent 6d5cfba76f
commit 0d32662eea
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Cargo.lock generated
View File

@ -1402,7 +1402,7 @@ dependencies = [
[[package]] [[package]]
name = "datafusion" name = "datafusion"
version = "16.0.0" version = "16.0.0"
source = "git+https://github.com/apache/arrow-datafusion.git?rev=350cb47289a76e579b221fe374e4cf09db332569#350cb47289a76e579b221fe374e4cf09db332569" source = "git+https://github.com/apache/arrow-datafusion.git?rev=4a33f2708fe8e30f5f9b062a097fc6155f2db2ce#4a33f2708fe8e30f5f9b062a097fc6155f2db2ce"
dependencies = [ dependencies = [
"ahash 0.8.3", "ahash 0.8.3",
"arrow", "arrow",
@ -1448,7 +1448,7 @@ dependencies = [
[[package]] [[package]]
name = "datafusion-common" name = "datafusion-common"
version = "16.0.0" version = "16.0.0"
source = "git+https://github.com/apache/arrow-datafusion.git?rev=350cb47289a76e579b221fe374e4cf09db332569#350cb47289a76e579b221fe374e4cf09db332569" source = "git+https://github.com/apache/arrow-datafusion.git?rev=4a33f2708fe8e30f5f9b062a097fc6155f2db2ce#4a33f2708fe8e30f5f9b062a097fc6155f2db2ce"
dependencies = [ dependencies = [
"arrow", "arrow",
"chrono", "chrono",
@ -1461,7 +1461,7 @@ dependencies = [
[[package]] [[package]]
name = "datafusion-expr" name = "datafusion-expr"
version = "16.0.0" version = "16.0.0"
source = "git+https://github.com/apache/arrow-datafusion.git?rev=350cb47289a76e579b221fe374e4cf09db332569#350cb47289a76e579b221fe374e4cf09db332569" source = "git+https://github.com/apache/arrow-datafusion.git?rev=4a33f2708fe8e30f5f9b062a097fc6155f2db2ce#4a33f2708fe8e30f5f9b062a097fc6155f2db2ce"
dependencies = [ dependencies = [
"ahash 0.8.3", "ahash 0.8.3",
"arrow", "arrow",
@ -1473,7 +1473,7 @@ dependencies = [
[[package]] [[package]]
name = "datafusion-optimizer" name = "datafusion-optimizer"
version = "16.0.0" version = "16.0.0"
source = "git+https://github.com/apache/arrow-datafusion.git?rev=350cb47289a76e579b221fe374e4cf09db332569#350cb47289a76e579b221fe374e4cf09db332569" source = "git+https://github.com/apache/arrow-datafusion.git?rev=4a33f2708fe8e30f5f9b062a097fc6155f2db2ce#4a33f2708fe8e30f5f9b062a097fc6155f2db2ce"
dependencies = [ dependencies = [
"arrow", "arrow",
"async-trait", "async-trait",
@ -1489,7 +1489,7 @@ dependencies = [
[[package]] [[package]]
name = "datafusion-physical-expr" name = "datafusion-physical-expr"
version = "16.0.0" version = "16.0.0"
source = "git+https://github.com/apache/arrow-datafusion.git?rev=350cb47289a76e579b221fe374e4cf09db332569#350cb47289a76e579b221fe374e4cf09db332569" source = "git+https://github.com/apache/arrow-datafusion.git?rev=4a33f2708fe8e30f5f9b062a097fc6155f2db2ce#4a33f2708fe8e30f5f9b062a097fc6155f2db2ce"
dependencies = [ dependencies = [
"ahash 0.8.3", "ahash 0.8.3",
"arrow", "arrow",
@ -1519,7 +1519,7 @@ dependencies = [
[[package]] [[package]]
name = "datafusion-proto" name = "datafusion-proto"
version = "16.0.0" version = "16.0.0"
source = "git+https://github.com/apache/arrow-datafusion.git?rev=350cb47289a76e579b221fe374e4cf09db332569#350cb47289a76e579b221fe374e4cf09db332569" source = "git+https://github.com/apache/arrow-datafusion.git?rev=4a33f2708fe8e30f5f9b062a097fc6155f2db2ce#4a33f2708fe8e30f5f9b062a097fc6155f2db2ce"
dependencies = [ dependencies = [
"arrow", "arrow",
"chrono", "chrono",
@ -1536,7 +1536,7 @@ dependencies = [
[[package]] [[package]]
name = "datafusion-row" name = "datafusion-row"
version = "16.0.0" version = "16.0.0"
source = "git+https://github.com/apache/arrow-datafusion.git?rev=350cb47289a76e579b221fe374e4cf09db332569#350cb47289a76e579b221fe374e4cf09db332569" source = "git+https://github.com/apache/arrow-datafusion.git?rev=4a33f2708fe8e30f5f9b062a097fc6155f2db2ce#4a33f2708fe8e30f5f9b062a097fc6155f2db2ce"
dependencies = [ dependencies = [
"arrow", "arrow",
"datafusion-common", "datafusion-common",
@ -1547,7 +1547,7 @@ dependencies = [
[[package]] [[package]]
name = "datafusion-sql" name = "datafusion-sql"
version = "16.0.0" version = "16.0.0"
source = "git+https://github.com/apache/arrow-datafusion.git?rev=350cb47289a76e579b221fe374e4cf09db332569#350cb47289a76e579b221fe374e4cf09db332569" source = "git+https://github.com/apache/arrow-datafusion.git?rev=4a33f2708fe8e30f5f9b062a097fc6155f2db2ce#4a33f2708fe8e30f5f9b062a097fc6155f2db2ce"
dependencies = [ dependencies = [
"arrow-schema", "arrow-schema",
"datafusion-common", "datafusion-common",

4
Cargo.toml
View File

@ -117,8 +117,8 @@ license = "MIT OR Apache-2.0"
[workspace.dependencies] [workspace.dependencies]
arrow = { version = "31.0.0" } arrow = { version = "31.0.0" }
arrow-flight = { version = "31.0.0" } arrow-flight = { version = "31.0.0" }
datafusion = { git = "https://github.com/apache/arrow-datafusion.git", rev="350cb47289a76e579b221fe374e4cf09db332569", default-features = false } datafusion = { git = "https://github.com/apache/arrow-datafusion.git", rev="4a33f2708fe8e30f5f9b062a097fc6155f2db2ce", default-features = false }
datafusion-proto = { git = "https://github.com/apache/arrow-datafusion.git", rev="350cb47289a76e579b221fe374e4cf09db332569" } datafusion-proto = { git = "https://github.com/apache/arrow-datafusion.git", rev="4a33f2708fe8e30f5f9b062a097fc6155f2db2ce" }
hashbrown = { version = "0.13.2" } hashbrown = { version = "0.13.2" }
parquet = { version = "31.0.0" } parquet = { version = "31.0.0" }

4
iox_query/src/exec/gapfill.rs
View File

@ -254,8 +254,8 @@ impl ExecutionPlan for GapFillExec {
vec![Some(&self.sort_expr)] vec![Some(&self.sort_expr)]
} }
fn maintains_input_order(&self) -> bool { fn maintains_input_order(&self) -> Vec<bool> {
true vec![true]
} }
fn children(&self) -> Vec<Arc<dyn ExecutionPlan>> { fn children(&self) -> Vec<Arc<dyn ExecutionPlan>> {

4
iox_query/src/provider/deduplicate.rs
View File

@ -161,8 +161,8 @@ impl ExecutionPlan for DeduplicateExec {
vec![self.output_ordering()] vec![self.output_ordering()]
} }
fn maintains_input_order(&self) -> bool { fn maintains_input_order(&self) -> Vec<bool> {
true vec![true]
} }
fn benefits_from_input_partitioning(&self) -> bool { fn benefits_from_input_partitioning(&self) -> bool {

2
workspace-hack/Cargo.toml
View File

@ -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"] } chrono = { version = "0.4", default-features = false, features = ["alloc", "clock", "iana-time-zone", "serde", "std", "winapi"] }
crossbeam-utils = { version = "0.8", features = ["std"] } crossbeam-utils = { version = "0.8", features = ["std"] }
crypto-common = { version = "0.1", default-features = false, features = ["std"] } crypto-common = { version = "0.1", default-features = false, features = ["std"] }
datafusion = { git = "https://github.com/apache/arrow-datafusion.git", rev = "350cb47289a76e579b221fe374e4cf09db332569", features = ["async-compression", "bzip2", "compression", "crypto_expressions", "flate2", "regex_expressions", "unicode_expressions", "xz2"] } datafusion = { git = "https://github.com/apache/arrow-datafusion.git", rev = "4a33f2708fe8e30f5f9b062a097fc6155f2db2ce", 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"] } digest = { version = "0.10", features = ["alloc", "block-buffer", "core-api", "mac", "std", "subtle"] }
either = { version = "1", features = ["use_std"] } either = { version = "1", features = ["use_std"] }
fixedbitset = { version = "0.4", features = ["std"] } fixedbitset = { version = "0.4", features = ["std"] }