Update datafusion server (#15)

datafusion-contrib · Jul 13, 2024 · 55221a1 · 55221a1
1 parent 64ed8c8
commit 55221a1
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 14 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -59,7 +59,7 @@ jobs:
       - name: Run DataFusion Server
         run: |
           cd src/sqlancer/datafusion/server/datafusion_server
-          cargo run --features "datafusion_stable" & sleep 300
+          cargo run & sleep 300
       - name: Set up JDK 11
         uses: actions/setup-java@v3
         with:

diff --git a/src/sqlancer/datafusion/server/datafusion_server/Cargo.toml b/src/sqlancer/datafusion/server/datafusion_server/Cargo.toml
@@ -18,7 +18,8 @@ async-trait = "0.1.73"
 bytes = "1.4"
 chrono = { version = "0.4.34", default-features = false }
 dashmap = "5.5.0"
-datafusion_stable = { package = "datafusion", git = "https://github.com/apache/datafusion.git", rev = "e693ed7", optional = true }
+datafusion = { version = "40.0.0" }
+# datafusion = { git = "https://github.com/apache/datafusion.git", branch = "main"}
 datafusion_dev = { package = "datafusion", git = "https://github.com/apache/datafusion.git", branch = "main", optional = true }
 env_logger = "0.11"
 futures = "0.3"
@@ -42,8 +43,3 @@ mimalloc = { version = "0.1", default-features = false }
 [[bin]]
 name = "datafusion-server"
 path = "src/main.rs"
-
-[features]
-default = ["datafusion_stable_feature"]
-datafusion_stable_feature = ["datafusion_stable"]
-datafusion_dev_feature = ["datafusion_dev"]
diff --git a/src/sqlancer/datafusion/server/datafusion_server/src/main.rs b/src/sqlancer/datafusion/server/datafusion_server/src/main.rs
@@ -1,8 +1,3 @@
-#[cfg(feature = "datafusion_dev")]
-extern crate datafusion_dev as datafusion;
-#[cfg(feature = "datafusion_stable")]
-extern crate datafusion_stable as datafusion;
-
 use arrow::array::{ArrayRef, StringArray};
 use arrow::ipc::writer::IpcWriteOptions;
 use arrow::record_batch::RecordBatch;
@@ -21,8 +16,8 @@ use arrow_flight::{
 };
 use arrow_schema::{DataType, Field, Schema};
 use dashmap::DashMap;
-use datafusion_stable::logical_expr::LogicalPlan;
-use datafusion_stable::prelude::{DataFrame, ParquetReadOptions, SessionConfig, SessionContext};
+use datafusion::logical_expr::LogicalPlan;
+use datafusion::prelude::{DataFrame, ParquetReadOptions, SessionConfig, SessionContext};
 use futures::{Stream, StreamExt, TryStreamExt};
 use log::info;
 use mimalloc::MiMalloc;