update references

Author: andygrove

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
 ```

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"]
 

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" }

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"

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,15 +45,13 @@ 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
 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/

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)

dev/update_datafusion_versions.py

@@ -32,7 +32,7 @@
     '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',