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

chore: Update datafusion (#6868) 

* chore: Update datafusion

* chore: Run cargo hakari tasks

* fix: Update error message

---------

Co-authored-by: CircleCI[bot] <circleci@influxdata.com>
pull/24376/head
Andrew Lamb 2023-02-06 15:22:45 +01:00 committed by GitHub
parent f83db0a52e
commit ae10b33f0c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Cargo.lock generated
View File

@ -1405,7 +1405,7 @@ dependencies = [
[[package]]
name = "datafusion"
version = "17.0.0"
source = "git+https://github.com/apache/arrow-datafusion.git?rev=bb699eb77a1b8423f0098cdb6e9d9bdbc67eb3b2#bb699eb77a1b8423f0098cdb6e9d9bdbc67eb3b2"
source = "git+https://github.com/apache/arrow-datafusion.git?rev=a67ef9197a0d7242a8089be6324ba2e25e84f41e#a67ef9197a0d7242a8089be6324ba2e25e84f41e"
dependencies = [
"ahash 0.8.3",
"arrow",
@ -1451,7 +1451,7 @@ dependencies = [
[[package]]
name = "datafusion-common"
version = "17.0.0"
source = "git+https://github.com/apache/arrow-datafusion.git?rev=bb699eb77a1b8423f0098cdb6e9d9bdbc67eb3b2#bb699eb77a1b8423f0098cdb6e9d9bdbc67eb3b2"
source = "git+https://github.com/apache/arrow-datafusion.git?rev=a67ef9197a0d7242a8089be6324ba2e25e84f41e#a67ef9197a0d7242a8089be6324ba2e25e84f41e"
dependencies = [
"arrow",
"chrono",
@ -1464,7 +1464,7 @@ dependencies = [
[[package]]
name = "datafusion-expr"
version = "17.0.0"
source = "git+https://github.com/apache/arrow-datafusion.git?rev=bb699eb77a1b8423f0098cdb6e9d9bdbc67eb3b2#bb699eb77a1b8423f0098cdb6e9d9bdbc67eb3b2"
source = "git+https://github.com/apache/arrow-datafusion.git?rev=a67ef9197a0d7242a8089be6324ba2e25e84f41e#a67ef9197a0d7242a8089be6324ba2e25e84f41e"
dependencies = [
"ahash 0.8.3",
"arrow",
@ -1476,7 +1476,7 @@ dependencies = [
[[package]]
name = "datafusion-optimizer"
version = "17.0.0"
source = "git+https://github.com/apache/arrow-datafusion.git?rev=bb699eb77a1b8423f0098cdb6e9d9bdbc67eb3b2#bb699eb77a1b8423f0098cdb6e9d9bdbc67eb3b2"
source = "git+https://github.com/apache/arrow-datafusion.git?rev=a67ef9197a0d7242a8089be6324ba2e25e84f41e#a67ef9197a0d7242a8089be6324ba2e25e84f41e"
dependencies = [
"arrow",
"async-trait",
@ -1492,7 +1492,7 @@ dependencies = [
[[package]]
name = "datafusion-physical-expr"
version = "17.0.0"
source = "git+https://github.com/apache/arrow-datafusion.git?rev=bb699eb77a1b8423f0098cdb6e9d9bdbc67eb3b2#bb699eb77a1b8423f0098cdb6e9d9bdbc67eb3b2"
source = "git+https://github.com/apache/arrow-datafusion.git?rev=a67ef9197a0d7242a8089be6324ba2e25e84f41e#a67ef9197a0d7242a8089be6324ba2e25e84f41e"
dependencies = [
"ahash 0.8.3",
"arrow",
@ -1522,7 +1522,7 @@ dependencies = [
[[package]]
name = "datafusion-proto"
version = "17.0.0"
source = "git+https://github.com/apache/arrow-datafusion.git?rev=bb699eb77a1b8423f0098cdb6e9d9bdbc67eb3b2#bb699eb77a1b8423f0098cdb6e9d9bdbc67eb3b2"
source = "git+https://github.com/apache/arrow-datafusion.git?rev=a67ef9197a0d7242a8089be6324ba2e25e84f41e#a67ef9197a0d7242a8089be6324ba2e25e84f41e"
dependencies = [
"arrow",
"chrono",
@ -1539,7 +1539,7 @@ dependencies = [
[[package]]
name = "datafusion-row"
version = "17.0.0"
source = "git+https://github.com/apache/arrow-datafusion.git?rev=bb699eb77a1b8423f0098cdb6e9d9bdbc67eb3b2#bb699eb77a1b8423f0098cdb6e9d9bdbc67eb3b2"
source = "git+https://github.com/apache/arrow-datafusion.git?rev=a67ef9197a0d7242a8089be6324ba2e25e84f41e#a67ef9197a0d7242a8089be6324ba2e25e84f41e"
dependencies = [
"arrow",
"datafusion-common",
@ -1550,7 +1550,7 @@ dependencies = [
[[package]]
name = "datafusion-sql"
version = "17.0.0"
source = "git+https://github.com/apache/arrow-datafusion.git?rev=bb699eb77a1b8423f0098cdb6e9d9bdbc67eb3b2#bb699eb77a1b8423f0098cdb6e9d9bdbc67eb3b2"
source = "git+https://github.com/apache/arrow-datafusion.git?rev=a67ef9197a0d7242a8089be6324ba2e25e84f41e#a67ef9197a0d7242a8089be6324ba2e25e84f41e"
dependencies = [
"arrow-schema",
"datafusion-common",

4
Cargo.toml
View File

@ -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="bb699eb77a1b8423f0098cdb6e9d9bdbc67eb3b2", default-features = false }
datafusion-proto = { git = "https://github.com/apache/arrow-datafusion.git", rev="bb699eb77a1b8423f0098cdb6e9d9bdbc67eb3b2" }
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" }
hashbrown = { version = "0.13.2" }
parquet = { version = "32.0.0" }

7
influxdb_iox/tests/query_tests2/sql_errors.rs
View File

@ -26,10 +26,9 @@ async fn create_external_table() {
// namespace needs to exist.
setup_name: "OneMeasurementWithTags",
sql: "CREATE EXTERNAL TABLE foo(ts TIMESTAMP) STORED AS CSV LOCATION '/tmp/foo.csv'",
expected_error_code: tonic::Code::Internal,
expected_message: "Error while planning query: Internal error: Unsupported logical plan: \
CreateExternalTable. This was likely caused by a bug in DataFusion's code and we would \
welcome that you file an bug report in our issue tracker",
expected_error_code: tonic::Code::InvalidArgument,
expected_message: "Error while planning query: This feature is not implemented: \
Unsupported logical plan: CreateExternalTable",
}
.run()
.await;

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"] }
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 = "bb699eb77a1b8423f0098cdb6e9d9bdbc67eb3b2", features = ["async-compression", "bzip2", "compression", "crypto_expressions", "flate2", "regex_expressions", "unicode_expressions", "xz2"] }
datafusion = { git = "https://github.com/apache/arrow-datafusion.git", rev = "a67ef9197a0d7242a8089be6324ba2e25e84f41e", 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"] }