You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@arrow.apache.org by ag...@apache.org on 2022/05/21 15:19:02 UTC
[arrow-ballista] branch master updated: use datafusion rev cb84504fed4e613c9ed18c4e2a2022c701add2d9 (#31)
This is an automated email from the ASF dual-hosted git repository.
agrove pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/arrow-ballista.git
The following commit(s) were added to refs/heads/master by this push:
new a3a44cf9 use datafusion rev cb84504fed4e613c9ed18c4e2a2022c701add2d9 (#31)
a3a44cf9 is described below
commit a3a44cf93b91d1327f1ecc1899d45fe6c4f0d855
Author: Andy Grove <an...@gmail.com>
AuthorDate: Sat May 21 09:18:58 2022 -0600
use datafusion rev cb84504fed4e613c9ed18c4e2a2022c701add2d9 (#31)
---
ballista-cli/Cargo.toml | 4 ++--
ballista-examples/Cargo.toml | 2 +-
ballista/rust/client/Cargo.toml | 2 +-
ballista/rust/core/Cargo.toml | 4 ++--
ballista/rust/core/src/serde/logical_plan/mod.rs | 8 ++++----
ballista/rust/executor/Cargo.toml | 2 +-
ballista/rust/scheduler/Cargo.toml | 2 +-
benchmarks/Cargo.toml | 2 +-
8 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/ballista-cli/Cargo.toml b/ballista-cli/Cargo.toml
index b30f5ca2..77467ff1 100644
--- a/ballista-cli/Cargo.toml
+++ b/ballista-cli/Cargo.toml
@@ -32,8 +32,8 @@ readme = "README.md"
arrow = { version = "14.0.0" }
ballista = { path = "../ballista/rust/client", version = "0.7.0" }
clap = { version = "3", features = ["derive", "cargo"] }
-datafusion = { git = "https://github.com/apache/arrow-datafusion", rev = "a08d26eef39bcb2adac527e5c260d31f473fca79" }
-datafusion-cli = { git = "https://github.com/apache/arrow-datafusion", rev = "a08d26eef39bcb2adac527e5c260d31f473fca79" }
+datafusion = { git = "https://github.com/apache/arrow-datafusion", rev = "cb84504fed4e613c9ed18c4e2a2022c701add2d9" }
+datafusion-cli = { git = "https://github.com/apache/arrow-datafusion", rev = "cb84504fed4e613c9ed18c4e2a2022c701add2d9" }
dirs = "4.0.0"
env_logger = "0.9"
mimalloc = { version = "0.1", default-features = false }
diff --git a/ballista-examples/Cargo.toml b/ballista-examples/Cargo.toml
index 9780820d..2c63b446 100644
--- a/ballista-examples/Cargo.toml
+++ b/ballista-examples/Cargo.toml
@@ -36,7 +36,7 @@ required-features = ["ballista/standalone"]
[dependencies]
ballista = { path = "../ballista/rust/client", version = "0.7.0" }
-datafusion = { git = "https://github.com/apache/arrow-datafusion", rev = "a08d26eef39bcb2adac527e5c260d31f473fca79" }
+datafusion = { git = "https://github.com/apache/arrow-datafusion", rev = "cb84504fed4e613c9ed18c4e2a2022c701add2d9" }
futures = "0.3"
num_cpus = "1.13.0"
prost = "0.10"
diff --git a/ballista/rust/client/Cargo.toml b/ballista/rust/client/Cargo.toml
index fa35418c..f8d0c834 100644
--- a/ballista/rust/client/Cargo.toml
+++ b/ballista/rust/client/Cargo.toml
@@ -32,7 +32,7 @@ ballista-core = { path = "../core", version = "0.7.0" }
ballista-executor = { path = "../executor", version = "0.7.0", optional = true }
ballista-scheduler = { path = "../scheduler", version = "0.7.0", optional = true }
-datafusion = { git = "https://github.com/apache/arrow-datafusion", rev = "a08d26eef39bcb2adac527e5c260d31f473fca79" }
+datafusion = { git = "https://github.com/apache/arrow-datafusion", rev = "cb84504fed4e613c9ed18c4e2a2022c701add2d9" }
futures = "0.3"
log = "0.4"
parking_lot = "0.12"
diff --git a/ballista/rust/core/Cargo.toml b/ballista/rust/core/Cargo.toml
index 2d50e79d..9535c2ae 100644
--- a/ballista/rust/core/Cargo.toml
+++ b/ballista/rust/core/Cargo.toml
@@ -39,8 +39,8 @@ arrow-flight = { version = "14.0.0" }
async-trait = "0.1.41"
chrono = { version = "0.4", default-features = false }
clap = { version = "3", features = ["derive", "cargo"] }
-datafusion = { git = "https://github.com/apache/arrow-datafusion", rev = "a08d26eef39bcb2adac527e5c260d31f473fca79" }
-datafusion-proto = { git = "https://github.com/apache/arrow-datafusion", rev = "a08d26eef39bcb2adac527e5c260d31f473fca79" }
+datafusion = { git = "https://github.com/apache/arrow-datafusion", rev = "cb84504fed4e613c9ed18c4e2a2022c701add2d9" }
+datafusion-proto = { git = "https://github.com/apache/arrow-datafusion", rev = "cb84504fed4e613c9ed18c4e2a2022c701add2d9" }
futures = "0.3"
hashbrown = "0.12"
diff --git a/ballista/rust/core/src/serde/logical_plan/mod.rs b/ballista/rust/core/src/serde/logical_plan/mod.rs
index 070dad98..f088f2f1 100644
--- a/ballista/rust/core/src/serde/logical_plan/mod.rs
+++ b/ballista/rust/core/src/serde/logical_plan/mod.rs
@@ -32,9 +32,9 @@ use datafusion::logical_plan::plan::{
Aggregate, EmptyRelation, Filter, Join, Projection, Sort, SubqueryAlias, Window,
};
use datafusion::logical_plan::{
- source_as_provider, Column, CreateCatalog, CreateCatalogSchema, CreateExternalTable,
- CreateView, CrossJoin, Expr, JoinConstraint, Limit, LogicalPlan, LogicalPlanBuilder,
- Offset, Repartition, TableScan, Values,
+ provider_as_source, source_as_provider, Column, CreateCatalog, CreateCatalogSchema,
+ CreateExternalTable, CreateView, CrossJoin, Expr, JoinConstraint, Limit, LogicalPlan,
+ LogicalPlanBuilder, Offset, Repartition, TableScan, Values,
};
use datafusion::prelude::SessionContext;
@@ -252,7 +252,7 @@ impl AsLogicalPlan for LogicalPlanNode {
LogicalPlanBuilder::scan_with_filters(
&scan.table_name,
- Arc::new(provider),
+ provider_as_source(Arc::new(provider)),
projection,
filters,
)?
diff --git a/ballista/rust/executor/Cargo.toml b/ballista/rust/executor/Cargo.toml
index fb406e80..5ee3da26 100644
--- a/ballista/rust/executor/Cargo.toml
+++ b/ballista/rust/executor/Cargo.toml
@@ -40,7 +40,7 @@ async-trait = "0.1.41"
ballista-core = { path = "../core", version = "0.7.0" }
chrono = { version = "0.4", default-features = false }
configure_me = "0.4.0"
-datafusion = { git = "https://github.com/apache/arrow-datafusion", rev = "a08d26eef39bcb2adac527e5c260d31f473fca79" }
+datafusion = { git = "https://github.com/apache/arrow-datafusion", rev = "cb84504fed4e613c9ed18c4e2a2022c701add2d9" }
env_logger = "0.9"
futures = "0.3"
hyper = "0.14.4"
diff --git a/ballista/rust/scheduler/Cargo.toml b/ballista/rust/scheduler/Cargo.toml
index c1ac3e17..39523a4f 100644
--- a/ballista/rust/scheduler/Cargo.toml
+++ b/ballista/rust/scheduler/Cargo.toml
@@ -41,7 +41,7 @@ async-trait = "0.1.41"
ballista-core = { path = "../core", version = "0.7.0" }
clap = { version = "3", features = ["derive", "cargo"] }
configure_me = "0.4.0"
-datafusion = { git = "https://github.com/apache/arrow-datafusion", rev = "a08d26eef39bcb2adac527e5c260d31f473fca79" }
+datafusion = { git = "https://github.com/apache/arrow-datafusion", rev = "cb84504fed4e613c9ed18c4e2a2022c701add2d9" }
env_logger = "0.9"
etcd-client = { version = "0.9", optional = true }
futures = "0.3"
diff --git a/benchmarks/Cargo.toml b/benchmarks/Cargo.toml
index d5782196..f98912a5 100644
--- a/benchmarks/Cargo.toml
+++ b/benchmarks/Cargo.toml
@@ -33,7 +33,7 @@ snmalloc = ["snmalloc-rs"]
[dependencies]
ballista = { path = "../ballista/rust/client" }
-datafusion = { git = "https://github.com/apache/arrow-datafusion", rev = "a08d26eef39bcb2adac527e5c260d31f473fca79" }
+datafusion = { git = "https://github.com/apache/arrow-datafusion", rev = "cb84504fed4e613c9ed18c4e2a2022c701add2d9" }
env_logger = "0.9"
futures = "0.3"
mimalloc = { version = "0.1", optional = true, default-features = false }