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-datafusion.git
The following commit(s) were added to refs/heads/master by this push:
new 101671e0c Move `data-access` crate into `datafusion` directory (#2479)
101671e0c is described below
commit 101671e0c2cc69055bca7c1df6b53b4b6fcd0c8d
Author: Andy Grove <[email protected]>
AuthorDate: Tue May 10 20:30:22 2022 -0600
Move `data-access` crate into `datafusion` directory (#2479)
* move data-access crate
* update references
---
CONTRIBUTING.md | 2 +-
Cargo.toml | 2 +-
datafusion/core/Cargo.toml | 2 +-
{data-access => datafusion/data-access}/Cargo.toml | 2 +-
{data-access => datafusion/data-access}/README.md | 0
{data-access => datafusion/data-access}/src/lib.rs | 0
{data-access => datafusion/data-access}/src/object_store/local.rs | 0
{data-access => datafusion/data-access}/src/object_store/mod.rs | 0
dev/docker/ballista.dockerfile | 3 ---
dev/release/README.md | 2 +-
dev/update_datafusion_versions.py | 2 +-
11 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 24fdbb90b..40fefb77b 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -263,5 +263,5 @@ $ prettier --version
After you've confirmed your prettier version, you can format all the `.md`
files:
```bash
-prettier -w
{ballista,datafusion,data-access,datafusion-cli,datafusion-examples,dev,docs}/**/*.md
+prettier -w
{ballista,datafusion,datafusion-cli,datafusion-examples,dev,docs}/**/*.md
```
diff --git a/Cargo.toml b/Cargo.toml
index 297b394b4..3567a4cea 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -19,6 +19,7 @@
members = [
"datafusion/common",
"datafusion/core",
+ "datafusion/data-access",
"datafusion/expr",
"datafusion/jit",
"datafusion/physical-expr",
@@ -31,7 +32,6 @@ members = [
"ballista/rust/executor",
"ballista/rust/scheduler",
"ballista-examples",
- "data-access",
]
exclude = ["datafusion-cli"]
diff --git a/datafusion/core/Cargo.toml b/datafusion/core/Cargo.toml
index 65d450b9a..ef1592b85 100644
--- a/datafusion/core/Cargo.toml
+++ b/datafusion/core/Cargo.toml
@@ -60,7 +60,7 @@ async-trait = "0.1.41"
avro-rs = { version = "0.13", features = ["snappy"], optional = true }
chrono = { version = "0.4", default-features = false }
datafusion-common = { path = "../common", version = "7.0.0", features =
["parquet"] }
-datafusion-data-access = { path = "../../data-access", version = "1.0.0" }
+datafusion-data-access = { path = "../data-access", version = "7.0.0" }
datafusion-expr = { path = "../expr", version = "7.0.0" }
datafusion-jit = { path = "../jit", version = "7.0.0", optional = true }
datafusion-physical-expr = { path = "../physical-expr", version = "7.0.0" }
diff --git a/data-access/Cargo.toml b/datafusion/data-access/Cargo.toml
similarity index 98%
rename from data-access/Cargo.toml
rename to datafusion/data-access/Cargo.toml
index 83b2ae883..4a68ca486 100644
--- a/data-access/Cargo.toml
+++ b/datafusion/data-access/Cargo.toml
@@ -18,7 +18,7 @@
[package]
name = "datafusion-data-access"
description = "General data access layer currently mainly based on the object
store interfaces"
-version = "1.0.0"
+version = "7.0.0"
homepage = "https://github.com/apache/arrow-datafusion";
repository = "https://github.com/apache/arrow-datafusion";
readme = "README.md"
diff --git a/data-access/README.md b/datafusion/data-access/README.md
similarity index 100%
rename from data-access/README.md
rename to datafusion/data-access/README.md
diff --git a/data-access/src/lib.rs b/datafusion/data-access/src/lib.rs
similarity index 100%
rename from data-access/src/lib.rs
rename to datafusion/data-access/src/lib.rs
diff --git a/data-access/src/object_store/local.rs
b/datafusion/data-access/src/object_store/local.rs
similarity index 100%
rename from data-access/src/object_store/local.rs
rename to datafusion/data-access/src/object_store/local.rs
diff --git a/data-access/src/object_store/mod.rs
b/datafusion/data-access/src/object_store/mod.rs
similarity index 100%
rename from data-access/src/object_store/mod.rs
rename to datafusion/data-access/src/object_store/mod.rs
diff --git a/dev/docker/ballista.dockerfile b/dev/docker/ballista.dockerfile
index c56bfecf0..7fdb0d4bc 100644
--- a/dev/docker/ballista.dockerfile
+++ b/dev/docker/ballista.dockerfile
@@ -32,7 +32,6 @@ ADD Cargo.toml .
COPY ballista ./ballista/
COPY ballista-examples ./ballista-examples/
COPY benchmarks ./benchmarks/
-COPY data-access ./data-access/
COPY datafusion ./datafusion/
COPY datafusion-cli ./datafusion-cli/
COPY datafusion-examples ./datafusion-examples/
@@ -46,7 +45,6 @@ FROM base as builder
RUN mkdir /tmp/ballista/ballista
RUN mkdir /tmp/ballista/ballista-examples
RUN mkdir /tmp/ballista/benchmarks
-RUN mkdir /tmp/ballista/data-access
RUN mkdir /tmp/ballista/datafusion
RUN mkdir /tmp/ballista/datafusion-cli
RUN mkdir /tmp/ballista/datafusion-examples
@@ -54,7 +52,6 @@ ADD Cargo.toml .
COPY ballista ./ballista/
COPY ballista-examples ./ballista-examples/
COPY benchmarks ./benchmarks/
-COPY data-access ./data-access/
COPY datafusion ./datafusion/
COPY datafusion-cli ./datafusion-cli/
COPY datafusion-examples ./datafusion-examples/
diff --git a/dev/release/README.md b/dev/release/README.md
index e3bcbed09..d6f481ebf 100644
--- a/dev/release/README.md
+++ b/dev/release/README.md
@@ -304,7 +304,7 @@ dot -Tsvg dev/release/crate-deps.dot >
dev/release/crate-deps.svg
```
```shell
-(cd data-access && cargo publish)
+(cd datafusion/data-access && cargo publish)
(cd datafusion/common && cargo publish)
(cd datafusion/expr && cargo publish)
(cd datafusion/physical-expr && cargo publish)
diff --git a/dev/update_datafusion_versions.py
b/dev/update_datafusion_versions.py
index 09b84bfc1..2b40c186a 100755
--- a/dev/update_datafusion_versions.py
+++ b/dev/update_datafusion_versions.py
@@ -32,7 +32,7 @@ crates = {
'datafusion': 'datafusion/core/Cargo.toml',
'datafusion-cli': 'datafusion-cli/Cargo.toml',
'datafusion-common': 'datafusion/common/Cargo.toml',
- 'datafusion-data-access': 'data-access/Cargo.toml',
+ 'datafusion-data-access': 'datafusion/data-access/Cargo.toml',
'datafusion-expr': 'datafusion/expr/Cargo.toml',
'datafusion-jit': 'datafusion/jit/Cargo.toml',
'datafusion-physical-expr': 'datafusion/physical-expr/Cargo.toml',
