Update to DataFusion 28 (#858)

* Update to datafusion 28 * Update sqlparser * Fix --------- Co-authored-by: Daniël Heres <[email protected]>
apache · Jul 26, 2023 · 175fc11 · 175fc11
1 parent 643b4cd
commit 175fc11
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 14 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -33,9 +33,9 @@ arrow-flight = {version = "43.0.0", features = ["flight-sql-experimental"]}
 arrow-schema = {version = "43.0.0", default-features = false}
 configure_me = {version = "0.4.0"}
 configure_me_codegen = {version = "0.4.4"}
-datafusion = "27.0.0"
-datafusion-cli = "27.0.0"
-datafusion-proto = "27.0.0"
+datafusion = "28.0.0"
+datafusion-cli = "28.0.0"
+datafusion-proto = "28.0.0"
 object_store = "0.6.1"
 sqlparser = "0.35.0"
 tonic = {version = "0.9"}
@@ -63,10 +63,3 @@ opt-level = 3
 overflow-checks = false
 panic = 'unwind'
 rpath = false
-
-[patch.crates-io]
-# TODO remove on upgrade to DataFusion 28.0.0
-# fix for https://github.com/apache/arrow-datafusion/issues/6819 and https://github.com/apache/arrow-datafusion/issues/6898
-datafusion = {git = "https://github.com/apache/arrow-datafusion.git", rev = "4e2a72f6c7109d40a4986e3d05360524be078dd4"}
-datafusion-cli = {git = "https://github.com/apache/arrow-datafusion.git", rev = "4e2a72f6c7109d40a4986e3d05360524be078dd4"}
-datafusion-proto = {git = "https://github.com/apache/arrow-datafusion.git", rev = "4e2a72f6c7109d40a4986e3d05360524be078dd4"}
diff --git a/ballista/client/README.md b/ballista/client/README.md
@@ -85,7 +85,7 @@ To build a simple ballista example, add the following dependencies to your `Carg
 ```toml
 [dependencies]
 ballista = "0.11"
-datafusion = "27.0.0"
+datafusion = "28.0.0"
 tokio = "1.0"
 ```
 

diff --git a/ballista/client/src/context.rs b/ballista/client/src/context.rs
@@ -326,9 +326,8 @@ impl BallistaContext {
             ));
         }
 
-        if let DFStatement::Statement(s) = &statements[0] {
-            let st: &Statement = s;
-            match st {
+        if let DFStatement::Statement(st) = &statements[0] {
+            match **st {
                 Statement::ShowVariable { .. } => {
                     is_show_variable = true;
                 }