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

chore: Update datafusion (#6004) 

* chore: Update datafusion

* chore: change path

* 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 2022-10-31 12:16:28 -04:00 committed by GitHub
parent 71dd3b5fa5
commit ace3c11f12
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 21 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
Cargo.lock generated
View File

@ -1129,7 +1129,7 @@ dependencies = [
[[package]] [[package]]
name = "datafusion" name = "datafusion"
version = "13.0.0" version = "13.0.0"
source = "git+https://github.com/apache/arrow-datafusion.git?rev=48f73c6af3b0cc747c38b4a9c7a610f4630e8736#48f73c6af3b0cc747c38b4a9c7a610f4630e8736" source = "git+https://github.com/apache/arrow-datafusion.git?rev=ca42f4cdb9ce3cddd46447d289b3a89824b7e8d7#ca42f4cdb9ce3cddd46447d289b3a89824b7e8d7"
dependencies = [ dependencies = [
"ahash 0.8.0", "ahash 0.8.0",
"arrow", "arrow",
@ -1161,7 +1161,7 @@ dependencies = [
"pin-project-lite", "pin-project-lite",
"rand", "rand",
"smallvec", "smallvec",
"sqlparser 0.25.0", "sqlparser",
"tempfile", "tempfile",
"tokio", "tokio",
"tokio-stream", "tokio-stream",
@ -1173,31 +1173,32 @@ dependencies = [
[[package]] [[package]]
name = "datafusion-common" name = "datafusion-common"
version = "13.0.0" version = "13.0.0"
source = "git+https://github.com/apache/arrow-datafusion.git?rev=48f73c6af3b0cc747c38b4a9c7a610f4630e8736#48f73c6af3b0cc747c38b4a9c7a610f4630e8736" source = "git+https://github.com/apache/arrow-datafusion.git?rev=ca42f4cdb9ce3cddd46447d289b3a89824b7e8d7#ca42f4cdb9ce3cddd46447d289b3a89824b7e8d7"
dependencies = [ dependencies = [
"arrow", "arrow",
"chrono",
"object_store", "object_store",
"ordered-float 3.3.0", "ordered-float 3.3.0",
"parquet", "parquet",
"sqlparser 0.25.0", "sqlparser",
] ]
[[package]] [[package]]
name = "datafusion-expr" name = "datafusion-expr"
version = "13.0.0" version = "13.0.0"
source = "git+https://github.com/apache/arrow-datafusion.git?rev=48f73c6af3b0cc747c38b4a9c7a610f4630e8736#48f73c6af3b0cc747c38b4a9c7a610f4630e8736" source = "git+https://github.com/apache/arrow-datafusion.git?rev=ca42f4cdb9ce3cddd46447d289b3a89824b7e8d7#ca42f4cdb9ce3cddd46447d289b3a89824b7e8d7"
dependencies = [ dependencies = [
"ahash 0.8.0", "ahash 0.8.0",
"arrow", "arrow",
"datafusion-common", "datafusion-common",
"log", "log",
"sqlparser 0.25.0", "sqlparser",
] ]
[[package]] [[package]]
name = "datafusion-optimizer" name = "datafusion-optimizer"
version = "13.0.0" version = "13.0.0"
source = "git+https://github.com/apache/arrow-datafusion.git?rev=48f73c6af3b0cc747c38b4a9c7a610f4630e8736#48f73c6af3b0cc747c38b4a9c7a610f4630e8736" source = "git+https://github.com/apache/arrow-datafusion.git?rev=ca42f4cdb9ce3cddd46447d289b3a89824b7e8d7#ca42f4cdb9ce3cddd46447d289b3a89824b7e8d7"
dependencies = [ dependencies = [
"arrow", "arrow",
"async-trait", "async-trait",
@ -1212,7 +1213,7 @@ dependencies = [
[[package]] [[package]]
name = "datafusion-physical-expr" name = "datafusion-physical-expr"
version = "13.0.0" version = "13.0.0"
source = "git+https://github.com/apache/arrow-datafusion.git?rev=48f73c6af3b0cc747c38b4a9c7a610f4630e8736#48f73c6af3b0cc747c38b4a9c7a610f4630e8736" source = "git+https://github.com/apache/arrow-datafusion.git?rev=ca42f4cdb9ce3cddd46447d289b3a89824b7e8d7#ca42f4cdb9ce3cddd46447d289b3a89824b7e8d7"
dependencies = [ dependencies = [
"ahash 0.8.0", "ahash 0.8.0",
"arrow", "arrow",
@ -1236,13 +1237,13 @@ dependencies = [
[[package]] [[package]]
name = "datafusion-proto" name = "datafusion-proto"
version = "13.0.0" version = "13.0.0"
source = "git+https://github.com/apache/arrow-datafusion.git?rev=48f73c6af3b0cc747c38b4a9c7a610f4630e8736#48f73c6af3b0cc747c38b4a9c7a610f4630e8736" source = "git+https://github.com/apache/arrow-datafusion.git?rev=ca42f4cdb9ce3cddd46447d289b3a89824b7e8d7#ca42f4cdb9ce3cddd46447d289b3a89824b7e8d7"
dependencies = [ dependencies = [
"arrow", "arrow",
"async-trait",
"datafusion", "datafusion",
"datafusion-common", "datafusion-common",
"datafusion-expr", "datafusion-expr",
"pbjson-build",
"prost 0.11.0", "prost 0.11.0",
"prost-build 0.11.1", "prost-build 0.11.1",
] ]
@ -1250,7 +1251,7 @@ dependencies = [
[[package]] [[package]]
name = "datafusion-row" name = "datafusion-row"
version = "13.0.0" version = "13.0.0"
source = "git+https://github.com/apache/arrow-datafusion.git?rev=48f73c6af3b0cc747c38b4a9c7a610f4630e8736#48f73c6af3b0cc747c38b4a9c7a610f4630e8736" source = "git+https://github.com/apache/arrow-datafusion.git?rev=ca42f4cdb9ce3cddd46447d289b3a89824b7e8d7#ca42f4cdb9ce3cddd46447d289b3a89824b7e8d7"
dependencies = [ dependencies = [
"arrow", "arrow",
"datafusion-common", "datafusion-common",
@ -1261,12 +1262,12 @@ dependencies = [
[[package]] [[package]]
name = "datafusion-sql" name = "datafusion-sql"
version = "13.0.0" version = "13.0.0"
source = "git+https://github.com/apache/arrow-datafusion.git?rev=48f73c6af3b0cc747c38b4a9c7a610f4630e8736#48f73c6af3b0cc747c38b4a9c7a610f4630e8736" source = "git+https://github.com/apache/arrow-datafusion.git?rev=ca42f4cdb9ce3cddd46447d289b3a89824b7e8d7#ca42f4cdb9ce3cddd46447d289b3a89824b7e8d7"
dependencies = [ dependencies = [
"arrow", "arrow",
"datafusion-common", "datafusion-common",
"datafusion-expr", "datafusion-expr",
"sqlparser 0.25.0", "sqlparser",
] ]
[[package]] [[package]]
@ -2266,7 +2267,7 @@ version = "0.1.0"
dependencies = [ dependencies = [
"generated_types", "generated_types",
"snafu", "snafu",
"sqlparser 0.26.0", "sqlparser",
"workspace-hack", "workspace-hack",
] ]
@ -3655,7 +3656,7 @@ dependencies = [
"query_functions", "query_functions",
"schema", "schema",
"snafu", "snafu",
"sqlparser 0.26.0", "sqlparser",
"test_helpers", "test_helpers",
"workspace-hack", "workspace-hack",
] ]
@ -4764,15 +4765,6 @@ dependencies = [
"unicode_categories", "unicode_categories",
] ]
[[package]]
name = "sqlparser"
version = "0.25.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0781f2b6bd03e5adf065c8e772b49eaea9f640d06a1b9130330fe8bd2563f4fd"
dependencies = [
"log",
]
[[package]] [[package]]
name = "sqlparser" name = "sqlparser"
version = "0.26.0" version = "0.26.0"

4
Cargo.toml
View File

@ -110,8 +110,8 @@ license = "MIT OR Apache-2.0"
[workspace.dependencies] [workspace.dependencies]
arrow = { version = "25.0.0" } arrow = { version = "25.0.0" }
arrow-flight = { version = "25.0.0" } arrow-flight = { version = "25.0.0" }
datafusion = { git = "https://github.com/apache/arrow-datafusion.git", rev="48f73c6af3b0cc747c38b4a9c7a610f4630e8736", default-features = false } datafusion = { git = "https://github.com/apache/arrow-datafusion.git", rev="ca42f4cdb9ce3cddd46447d289b3a89824b7e8d7", default-features = false }
datafusion-proto = { git = "https://github.com/apache/arrow-datafusion.git", rev="48f73c6af3b0cc747c38b4a9c7a610f4630e8736" } datafusion-proto = { git = "https://github.com/apache/arrow-datafusion.git", rev="ca42f4cdb9ce3cddd46447d289b3a89824b7e8d7" }
parquet = { version = "25.0.0" } parquet = { version = "25.0.0" }
# This profile optimizes for runtime performance and small binary size at the expense of longer # This profile optimizes for runtime performance and small binary size at the expense of longer

2
iox_query/src/util.rs
View File

@ -25,7 +25,7 @@ use datafusion::{
logical_expr::{ logical_expr::{
expr_rewriter::ExprRewriter, BinaryExpr, ExprSchemable, LogicalPlan, LogicalPlanBuilder, expr_rewriter::ExprRewriter, BinaryExpr, ExprSchemable, LogicalPlan, LogicalPlanBuilder,
}, },
optimizer::expr_simplifier::{ExprSimplifier, SimplifyContext}, optimizer::simplify_expressions::{ExprSimplifier, SimplifyContext},
physical_expr::create_physical_expr, physical_expr::create_physical_expr,
physical_plan::{ physical_plan::{
expressions::{col as physical_col, PhysicalSortExpr}, expressions::{col as physical_col, PhysicalSortExpr},

2
predicate/src/rpc_predicate.rs
View File

@ -11,7 +11,7 @@ use datafusion::error::{DataFusionError, Result as DataFusionResult};
use datafusion::execution::context::ExecutionProps; use datafusion::execution::context::ExecutionProps;
use datafusion::logical_expr::expr_rewriter::ExprRewritable; use datafusion::logical_expr::expr_rewriter::ExprRewritable;
use datafusion::logical_expr::ExprSchemable; use datafusion::logical_expr::ExprSchemable;
use datafusion::optimizer::expr_simplifier::{ExprSimplifier, SimplifyInfo}; use datafusion::optimizer::simplify_expressions::{ExprSimplifier, SimplifyInfo};
use datafusion::prelude::{lit, Column, Expr}; use datafusion::prelude::{lit, Column, Expr};
use observability_deps::tracing::{debug, trace}; use observability_deps::tracing::{debug, trace};
use schema::Schema; use schema::Schema;

2
workspace-hack/Cargo.toml
View File

@ -25,7 +25,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 = "48f73c6af3b0cc747c38b4a9c7a610f4630e8736", features = ["crypto_expressions", "regex_expressions", "unicode_expressions"] } datafusion = { git = "https://github.com/apache/arrow-datafusion.git", rev = "ca42f4cdb9ce3cddd46447d289b3a89824b7e8d7", features = ["crypto_expressions", "regex_expressions", "unicode_expressions"] }
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"] }