From c26981d51b34ccba0f92ddd6b4c2878fb90a25c3 Mon Sep 17 00:00:00 2001
From: Andrew Lamb <alamb@influxdata.com>
Date: Fri, 14 Apr 2023 13:37:00 -0400
Subject: [PATCH] chore: Update datafusion again (#7557)

* chore: Update datafusion again

* 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>
---
 Cargo.lock                | 41 +++++++++++++++------------------------
 Cargo.toml                |  4 ++--
 workspace-hack/Cargo.toml |  6 +++---
 3 files changed, 21 insertions(+), 30 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 7a747c617f..5ff874a231 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1444,7 +1444,7 @@ dependencies = [
 [[package]]
 name = "datafusion"
 version = "22.0.0"
-source = "git+https://github.com/apache/arrow-datafusion.git?rev=6e819d6c2b9280198c67fa16df3e54c79ce46ca2#6e819d6c2b9280198c67fa16df3e54c79ce46ca2"
+source = "git+https://github.com/apache/arrow-datafusion.git?rev=ebb839068b9d99d3a3fea0a50a1e4baf4f1a5fca#ebb839068b9d99d3a3fea0a50a1e4baf4f1a5fca"
 dependencies = [
  "ahash 0.8.3",
  "arrow",
@@ -1479,7 +1479,7 @@ dependencies = [
  "pin-project-lite",
  "rand",
  "smallvec",
- "sqlparser 0.32.0",
+ "sqlparser",
  "tempfile",
  "tokio",
  "tokio-stream",
@@ -1493,7 +1493,7 @@ dependencies = [
 [[package]]
 name = "datafusion-common"
 version = "22.0.0"
-source = "git+https://github.com/apache/arrow-datafusion.git?rev=6e819d6c2b9280198c67fa16df3e54c79ce46ca2#6e819d6c2b9280198c67fa16df3e54c79ce46ca2"
+source = "git+https://github.com/apache/arrow-datafusion.git?rev=ebb839068b9d99d3a3fea0a50a1e4baf4f1a5fca#ebb839068b9d99d3a3fea0a50a1e4baf4f1a5fca"
 dependencies = [
  "arrow",
  "arrow-array",
@@ -1501,13 +1501,13 @@ dependencies = [
  "num_cpus",
  "object_store",
  "parquet",
- "sqlparser 0.32.0",
+ "sqlparser",
 ]
 
 [[package]]
 name = "datafusion-execution"
 version = "22.0.0"
-source = "git+https://github.com/apache/arrow-datafusion.git?rev=6e819d6c2b9280198c67fa16df3e54c79ce46ca2#6e819d6c2b9280198c67fa16df3e54c79ce46ca2"
+source = "git+https://github.com/apache/arrow-datafusion.git?rev=ebb839068b9d99d3a3fea0a50a1e4baf4f1a5fca#ebb839068b9d99d3a3fea0a50a1e4baf4f1a5fca"
 dependencies = [
  "dashmap",
  "datafusion-common",
@@ -1524,18 +1524,18 @@ dependencies = [
 [[package]]
 name = "datafusion-expr"
 version = "22.0.0"
-source = "git+https://github.com/apache/arrow-datafusion.git?rev=6e819d6c2b9280198c67fa16df3e54c79ce46ca2#6e819d6c2b9280198c67fa16df3e54c79ce46ca2"
+source = "git+https://github.com/apache/arrow-datafusion.git?rev=ebb839068b9d99d3a3fea0a50a1e4baf4f1a5fca#ebb839068b9d99d3a3fea0a50a1e4baf4f1a5fca"
 dependencies = [
  "ahash 0.8.3",
  "arrow",
  "datafusion-common",
- "sqlparser 0.32.0",
+ "sqlparser",
 ]
 
 [[package]]
 name = "datafusion-optimizer"
 version = "22.0.0"
-source = "git+https://github.com/apache/arrow-datafusion.git?rev=6e819d6c2b9280198c67fa16df3e54c79ce46ca2#6e819d6c2b9280198c67fa16df3e54c79ce46ca2"
+source = "git+https://github.com/apache/arrow-datafusion.git?rev=ebb839068b9d99d3a3fea0a50a1e4baf4f1a5fca#ebb839068b9d99d3a3fea0a50a1e4baf4f1a5fca"
 dependencies = [
  "arrow",
  "async-trait",
@@ -1552,7 +1552,7 @@ dependencies = [
 [[package]]
 name = "datafusion-physical-expr"
 version = "22.0.0"
-source = "git+https://github.com/apache/arrow-datafusion.git?rev=6e819d6c2b9280198c67fa16df3e54c79ce46ca2#6e819d6c2b9280198c67fa16df3e54c79ce46ca2"
+source = "git+https://github.com/apache/arrow-datafusion.git?rev=ebb839068b9d99d3a3fea0a50a1e4baf4f1a5fca#ebb839068b9d99d3a3fea0a50a1e4baf4f1a5fca"
 dependencies = [
  "ahash 0.8.3",
  "arrow",
@@ -1583,7 +1583,7 @@ dependencies = [
 [[package]]
 name = "datafusion-proto"
 version = "22.0.0"
-source = "git+https://github.com/apache/arrow-datafusion.git?rev=6e819d6c2b9280198c67fa16df3e54c79ce46ca2#6e819d6c2b9280198c67fa16df3e54c79ce46ca2"
+source = "git+https://github.com/apache/arrow-datafusion.git?rev=ebb839068b9d99d3a3fea0a50a1e4baf4f1a5fca#ebb839068b9d99d3a3fea0a50a1e4baf4f1a5fca"
 dependencies = [
  "arrow",
  "chrono",
@@ -1597,7 +1597,7 @@ dependencies = [
 [[package]]
 name = "datafusion-row"
 version = "22.0.0"
-source = "git+https://github.com/apache/arrow-datafusion.git?rev=6e819d6c2b9280198c67fa16df3e54c79ce46ca2#6e819d6c2b9280198c67fa16df3e54c79ce46ca2"
+source = "git+https://github.com/apache/arrow-datafusion.git?rev=ebb839068b9d99d3a3fea0a50a1e4baf4f1a5fca#ebb839068b9d99d3a3fea0a50a1e4baf4f1a5fca"
 dependencies = [
  "arrow",
  "datafusion-common",
@@ -1608,14 +1608,14 @@ dependencies = [
 [[package]]
 name = "datafusion-sql"
 version = "22.0.0"
-source = "git+https://github.com/apache/arrow-datafusion.git?rev=6e819d6c2b9280198c67fa16df3e54c79ce46ca2#6e819d6c2b9280198c67fa16df3e54c79ce46ca2"
+source = "git+https://github.com/apache/arrow-datafusion.git?rev=ebb839068b9d99d3a3fea0a50a1e4baf4f1a5fca#ebb839068b9d99d3a3fea0a50a1e4baf4f1a5fca"
 dependencies = [
  "arrow",
  "arrow-schema",
  "datafusion-common",
  "datafusion-expr",
  "log",
- "sqlparser 0.32.0",
+ "sqlparser",
 ]
 
 [[package]]
@@ -2694,7 +2694,7 @@ version = "0.1.0"
 dependencies = [
  "generated_types",
  "snafu",
- "sqlparser 0.33.0",
+ "sqlparser",
  "workspace-hack",
 ]
 
@@ -4254,7 +4254,7 @@ dependencies = [
  "query_functions",
  "schema",
  "snafu",
- "sqlparser 0.33.0",
+ "sqlparser",
  "test_helpers",
  "workspace-hack",
 ]
@@ -5324,16 +5324,6 @@ dependencies = [
  "unicode_categories",
 ]
 
-[[package]]
-name = "sqlparser"
-version = "0.32.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0366f270dbabb5cc2e4c88427dc4c08bba144f81e32fbd459a013f26a4d16aa0"
-dependencies = [
- "log",
- "sqlparser_derive",
-]
-
 [[package]]
 name = "sqlparser"
 version = "0.33.0"
@@ -5341,6 +5331,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "355dc4d4b6207ca8a3434fc587db0a8016130a574dbcdbfb93d7f7b5bc5b211a"
 dependencies = [
  "log",
+ "sqlparser_derive",
 ]
 
 [[package]]
diff --git a/Cargo.toml b/Cargo.toml
index cef1cf8e88..df83d3414c 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -116,8 +116,8 @@ license = "MIT OR Apache-2.0"
 [workspace.dependencies]
 arrow = { version = "37.0.0" }
 arrow-flight = { version = "37.0.0" }
-datafusion = { git = "https://github.com/apache/arrow-datafusion.git", rev="6e819d6c2b9280198c67fa16df3e54c79ce46ca2", default-features = false }
-datafusion-proto = { git = "https://github.com/apache/arrow-datafusion.git", rev="6e819d6c2b9280198c67fa16df3e54c79ce46ca2" }
+datafusion = { git = "https://github.com/apache/arrow-datafusion.git", rev="ebb839068b9d99d3a3fea0a50a1e4baf4f1a5fca", default-features = false }
+datafusion-proto = { git = "https://github.com/apache/arrow-datafusion.git", rev="ebb839068b9d99d3a3fea0a50a1e4baf4f1a5fca" }
 hashbrown = { version = "0.13.2" }
 parquet = { version = "37.0.0" }
 tonic = { version = "0.9.1", features = ["tls", "tls-webpki-roots"] }
diff --git a/workspace-hack/Cargo.toml b/workspace-hack/Cargo.toml
index 698220f022..4d862599cf 100644
--- a/workspace-hack/Cargo.toml
+++ b/workspace-hack/Cargo.toml
@@ -30,9 +30,9 @@ bytes = { version = "1" }
 chrono = { version = "0.4", default-features = false, features = ["alloc", "clock", "serde"] }
 crossbeam-utils = { version = "0.8" }
 crypto-common = { version = "0.1", default-features = false, features = ["std"] }
-datafusion = { git = "https://github.com/apache/arrow-datafusion.git", rev = "6e819d6c2b9280198c67fa16df3e54c79ce46ca2" }
-datafusion-optimizer = { git = "https://github.com/apache/arrow-datafusion.git", rev = "6e819d6c2b9280198c67fa16df3e54c79ce46ca2", default-features = false, features = ["crypto_expressions", "regex_expressions", "unicode_expressions"] }
-datafusion-physical-expr = { git = "https://github.com/apache/arrow-datafusion.git", rev = "6e819d6c2b9280198c67fa16df3e54c79ce46ca2", default-features = false, features = ["crypto_expressions", "regex_expressions", "unicode_expressions"] }
+datafusion = { git = "https://github.com/apache/arrow-datafusion.git", rev = "ebb839068b9d99d3a3fea0a50a1e4baf4f1a5fca" }
+datafusion-optimizer = { git = "https://github.com/apache/arrow-datafusion.git", rev = "ebb839068b9d99d3a3fea0a50a1e4baf4f1a5fca", default-features = false, features = ["crypto_expressions", "regex_expressions", "unicode_expressions"] }
+datafusion-physical-expr = { git = "https://github.com/apache/arrow-datafusion.git", rev = "ebb839068b9d99d3a3fea0a50a1e4baf4f1a5fca", default-features = false, features = ["crypto_expressions", "regex_expressions", "unicode_expressions"] }
 digest = { version = "0.10", features = ["mac", "std"] }
 either = { version = "1" }
 fixedbitset = { version = "0.4" }