Remove redundant rust dir (apache#358)

* Remove rust folder * Update build scripts and docs * fix CI
pinarbayata · Oct 17, 2022 · cc3130e · cc3130e
1 parent e3f5820
commit cc3130e
Show file tree

Hide file tree

Showing 111 changed files with 35 additions and 37 deletions.
diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
@@ -178,7 +178,7 @@ jobs:
           export PATH=$PATH:$HOME/d/protoc/bin
           export ARROW_TEST_DATA=$(pwd)/testing/data
           export PARQUET_TEST_DATA=$(pwd)/parquet-testing/data
-          cd ballista/rust
+          cd ballista
           # snmalloc requires cmake so build without default features
           cargo test --no-default-features --features sled
           # Ensure also compiles in standalone mode

diff --git a/Cargo.toml b/Cargo.toml
@@ -18,10 +18,10 @@
 [workspace]
 members = [
     "benchmarks",
-    "ballista/rust/client",
-    "ballista/rust/core",
-    "ballista/rust/executor",
-    "ballista/rust/scheduler",
+    "ballista/client",
+    "ballista/core",
+    "ballista/executor",
+    "ballista/scheduler",
     "examples",
     "ballista-cli",
 ]

diff --git a/README.md b/README.md
@@ -53,7 +53,7 @@ Ballista implements a similar design to Apache Spark (particularly Spark SQL), b
 # Getting Started
 
 The easiest way to get started is to run one of the standalone or distributed [examples](./examples/README.md). After
-that, refer to the [Getting Started Guide](ballista/rust/client/README.md).
+that, refer to the [Getting Started Guide](ballista/client/README.md).
 
 ## Project Status
 

diff --git a/ballista-cli/Cargo.toml b/ballista-cli/Cargo.toml
@@ -29,7 +29,7 @@ rust-version = "1.59"
 readme = "README.md"
 
 [dependencies]
-ballista = { path = "../ballista/rust/client", version = "0.8.0", features = [
+ballista = { path = "../ballista/client", version = "0.8.0", features = [
     "standalone",
 ] }
 clap = { version = "3", features = ["derive", "cargo"] }

diff --git a/ballista/rust/client/Cargo.toml → ballista/client/Cargo.toml b/ballista/rust/client/Cargo.toml → ballista/client/Cargo.toml
diff --git a/ballista/rust/client/README.md → ballista/client/README.md b/ballista/rust/client/README.md → ballista/client/README.md
diff --git a/ballista/rust/client/src/columnar_batch.rs → ballista/client/src/columnar_batch.rs b/ballista/rust/client/src/columnar_batch.rs → ballista/client/src/columnar_batch.rs
diff --git a/ballista/rust/client/src/context.rs → ballista/client/src/context.rs b/ballista/rust/client/src/context.rs → ballista/client/src/context.rs
diff --git a/ballista/rust/client/src/lib.rs → ballista/client/src/lib.rs b/ballista/rust/client/src/lib.rs → ballista/client/src/lib.rs
diff --git a/ballista/rust/client/src/prelude.rs → ballista/client/src/prelude.rs b/ballista/rust/client/src/prelude.rs → ballista/client/src/prelude.rs
diff --git a/...st/client/testdata/alltypes_plain.parquet → ...ta/client/testdata/alltypes_plain.parquet b/...st/client/testdata/alltypes_plain.parquet → ...ta/client/testdata/alltypes_plain.parquet
diff --git a/...a/rust/client/testdata/single_nan.parquet → ballista/client/testdata/single_nan.parquet b/...a/rust/client/testdata/single_nan.parquet → ballista/client/testdata/single_nan.parquet
diff --git a/ballista/rust/core/Cargo.toml → ballista/core/Cargo.toml b/ballista/rust/core/Cargo.toml → ballista/core/Cargo.toml
diff --git a/ballista/rust/core/README.md → ballista/core/README.md b/ballista/rust/core/README.md → ballista/core/README.md
diff --git a/ballista/rust/core/build.rs → ballista/core/build.rs b/ballista/rust/core/build.rs → ballista/core/build.rs
diff --git a/ballista/rust/core/proto/ballista.proto → ballista/core/proto/ballista.proto b/ballista/rust/core/proto/ballista.proto → ballista/core/proto/ballista.proto
diff --git a/ballista/rust/core/proto/datafusion.proto → ballista/core/proto/datafusion.proto b/ballista/rust/core/proto/datafusion.proto → ballista/core/proto/datafusion.proto
diff --git a/ballista/rust/core/src/client.rs → ballista/core/src/client.rs b/ballista/rust/core/src/client.rs → ballista/core/src/client.rs
diff --git a/ballista/rust/core/src/config.rs → ballista/core/src/config.rs b/ballista/rust/core/src/config.rs → ballista/core/src/config.rs
diff --git a/ballista/rust/core/src/error.rs → ballista/core/src/error.rs b/ballista/rust/core/src/error.rs → ballista/core/src/error.rs
diff --git a/ballista/rust/core/src/event_loop.rs → ballista/core/src/event_loop.rs b/ballista/rust/core/src/event_loop.rs → ballista/core/src/event_loop.rs
diff --git a/.../src/execution_plans/distributed_query.rs → .../src/execution_plans/distributed_query.rs b/.../src/execution_plans/distributed_query.rs → .../src/execution_plans/distributed_query.rs
diff --git a/...ista/rust/core/src/execution_plans/mod.rs → ballista/core/src/execution_plans/mod.rs b/...ista/rust/core/src/execution_plans/mod.rs → ballista/core/src/execution_plans/mod.rs
diff --git a/...ore/src/execution_plans/shuffle_reader.rs → ...ore/src/execution_plans/shuffle_reader.rs b/...ore/src/execution_plans/shuffle_reader.rs → ...ore/src/execution_plans/shuffle_reader.rs
diff --git a/...ore/src/execution_plans/shuffle_writer.rs → ...ore/src/execution_plans/shuffle_writer.rs b/...ore/src/execution_plans/shuffle_writer.rs → ...ore/src/execution_plans/shuffle_writer.rs
diff --git a/...src/execution_plans/unresolved_shuffle.rs → ...src/execution_plans/unresolved_shuffle.rs b/...src/execution_plans/unresolved_shuffle.rs → ...src/execution_plans/unresolved_shuffle.rs
diff --git a/ballista/rust/core/src/lib.rs → ballista/core/src/lib.rs b/ballista/rust/core/src/lib.rs → ballista/core/src/lib.rs
diff --git a/ballista/rust/core/src/plugin/mod.rs → ballista/core/src/plugin/mod.rs b/ballista/rust/core/src/plugin/mod.rs → ballista/core/src/plugin/mod.rs
@@ -113,10 +113,10 @@ pub fn plugin_dir() -> String {
     };
 
     // If current_exe_dir contain `deps` the root dir is the parent dir
-    // eg: /Users/xxx/workspace/rust/rust_plugin_sty/target/debug/deps/plugins_app-067452b3ff2af70e
-    // the plugin dir is /Users/xxx/workspace/rust/rust_plugin_sty/target/debug/deps
-    // else eg: /Users/xxx/workspace/rust/rust_plugin_sty/target/debug/plugins_app
-    // the plugin dir is /Users/xxx/workspace/rust/rust_plugin_sty/target/debug/
+    // eg: /Users/xxx/workspace/rust_plugin_sty/target/debug/deps/plugins_app-067452b3ff2af70e
+    // the plugin dir is /Users/xxx/workspace/rust_plugin_sty/target/debug/deps
+    // else eg: /Users/xxx/workspace/rust_plugin_sty/target/debug/plugins_app
+    // the plugin dir is /Users/xxx/workspace/rust_plugin_sty/target/debug/
     if current_exe_dir.contains("/deps/") {
         let i = current_exe_dir.find("/deps/").unwrap();
         String::from(&current_exe_dir.as_str()[..i + 6])

diff --git a/...ta/rust/core/src/plugin/plugin_manager.rs → ballista/core/src/plugin/plugin_manager.rs b/...ta/rust/core/src/plugin/plugin_manager.rs → ballista/core/src/plugin/plugin_manager.rs
diff --git a/ballista/rust/core/src/plugin/udf.rs → ballista/core/src/plugin/udf.rs b/ballista/rust/core/src/plugin/udf.rs → ballista/core/src/plugin/udf.rs
diff --git a/.../rust/core/src/serde/generated/.gitignore → ballista/core/src/serde/generated/.gitignore b/.../rust/core/src/serde/generated/.gitignore → ballista/core/src/serde/generated/.gitignore
diff --git a/...ista/rust/core/src/serde/generated/mod.rs → ballista/core/src/serde/generated/mod.rs b/...ista/rust/core/src/serde/generated/mod.rs → ballista/core/src/serde/generated/mod.rs
diff --git a/ballista/rust/core/src/serde/mod.rs → ballista/core/src/serde/mod.rs b/ballista/rust/core/src/serde/mod.rs → ballista/core/src/serde/mod.rs
diff --git a/...ore/src/serde/physical_plan/from_proto.rs → ...ore/src/serde/physical_plan/from_proto.rs b/...ore/src/serde/physical_plan/from_proto.rs → ...ore/src/serde/physical_plan/from_proto.rs
diff --git a/.../rust/core/src/serde/physical_plan/mod.rs → ballista/core/src/serde/physical_plan/mod.rs b/.../rust/core/src/serde/physical_plan/mod.rs → ballista/core/src/serde/physical_plan/mod.rs
diff --git a/.../core/src/serde/physical_plan/to_proto.rs → .../core/src/serde/physical_plan/to_proto.rs b/.../core/src/serde/physical_plan/to_proto.rs → .../core/src/serde/physical_plan/to_proto.rs
diff --git a/...st/core/src/serde/scheduler/from_proto.rs → ...ta/core/src/serde/scheduler/from_proto.rs b/...st/core/src/serde/scheduler/from_proto.rs → ...ta/core/src/serde/scheduler/from_proto.rs
diff --git a/...ista/rust/core/src/serde/scheduler/mod.rs → ballista/core/src/serde/scheduler/mod.rs b/...ista/rust/core/src/serde/scheduler/mod.rs → ballista/core/src/serde/scheduler/mod.rs
diff --git a/...rust/core/src/serde/scheduler/to_proto.rs → ...ista/core/src/serde/scheduler/to_proto.rs b/...rust/core/src/serde/scheduler/to_proto.rs → ...ista/core/src/serde/scheduler/to_proto.rs
diff --git a/ballista/rust/core/src/utils.rs → ballista/core/src/utils.rs b/ballista/rust/core/src/utils.rs → ballista/core/src/utils.rs
diff --git a/ballista/rust/core/tests/customer.csv → ballista/core/tests/customer.csv b/ballista/rust/core/tests/customer.csv → ballista/core/tests/customer.csv
diff --git a/ballista/rust/executor/Cargo.toml → ballista/executor/Cargo.toml b/ballista/rust/executor/Cargo.toml → ballista/executor/Cargo.toml
diff --git a/ballista/rust/executor/README.md → ballista/executor/README.md b/ballista/rust/executor/README.md → ballista/executor/README.md
diff --git a/ballista/rust/executor/build.rs → ballista/executor/build.rs b/ballista/rust/executor/build.rs → ballista/executor/build.rs
diff --git a/...tor/examples/example_executor_config.toml → ...tor/examples/example_executor_config.toml b/...tor/examples/example_executor_config.toml → ...tor/examples/example_executor_config.toml
diff --git a/...a/rust/executor/executor_config_spec.toml → ballista/executor/executor_config_spec.toml b/...a/rust/executor/executor_config_spec.toml → ballista/executor/executor_config_spec.toml
diff --git a/ballista/rust/executor/src/collect.rs → ballista/executor/src/collect.rs b/ballista/rust/executor/src/collect.rs → ballista/executor/src/collect.rs
diff --git a/...a/rust/executor/src/cpu_bound_executor.rs → ballista/executor/src/cpu_bound_executor.rs b/...a/rust/executor/src/cpu_bound_executor.rs → ballista/executor/src/cpu_bound_executor.rs
diff --git a/ballista/rust/executor/src/execution_loop.rs → ballista/executor/src/execution_loop.rs b/ballista/rust/executor/src/execution_loop.rs → ballista/executor/src/execution_loop.rs
diff --git a/ballista/rust/executor/src/executor.rs → ballista/executor/src/executor.rs b/ballista/rust/executor/src/executor.rs → ballista/executor/src/executor.rs
diff --git a/...ista/rust/executor/src/executor_server.rs → ballista/executor/src/executor_server.rs b/...ista/rust/executor/src/executor_server.rs → ballista/executor/src/executor_server.rs
diff --git a/ballista/rust/executor/src/flight_service.rs → ballista/executor/src/flight_service.rs b/ballista/rust/executor/src/flight_service.rs → ballista/executor/src/flight_service.rs
diff --git a/ballista/rust/executor/src/lib.rs → ballista/executor/src/lib.rs b/ballista/rust/executor/src/lib.rs → ballista/executor/src/lib.rs
diff --git a/ballista/rust/executor/src/main.rs → ballista/executor/src/main.rs b/ballista/rust/executor/src/main.rs → ballista/executor/src/main.rs
diff --git a/ballista/rust/executor/src/metrics/mod.rs → ballista/executor/src/metrics/mod.rs b/ballista/rust/executor/src/metrics/mod.rs → ballista/executor/src/metrics/mod.rs
diff --git a/ballista/rust/executor/src/shutdown.rs → ballista/executor/src/shutdown.rs b/ballista/rust/executor/src/shutdown.rs → ballista/executor/src/shutdown.rs
diff --git a/ballista/rust/executor/src/standalone.rs → ballista/executor/src/standalone.rs b/ballista/rust/executor/src/standalone.rs → ballista/executor/src/standalone.rs
diff --git a/ballista/rust/executor/src/terminate.rs → ballista/executor/src/terminate.rs b/ballista/rust/executor/src/terminate.rs → ballista/executor/src/terminate.rs
diff --git a/ballista/rust/.gitignore b/ballista/rust/.gitignore
diff --git a/ballista/rust/scheduler/Cargo.toml → ballista/scheduler/Cargo.toml b/ballista/rust/scheduler/Cargo.toml → ballista/scheduler/Cargo.toml
diff --git a/ballista/rust/scheduler/README.md → ballista/scheduler/README.md b/ballista/rust/scheduler/README.md → ballista/scheduler/README.md
diff --git a/ballista/rust/scheduler/build.rs → ballista/scheduler/build.rs b/ballista/rust/scheduler/build.rs → ballista/scheduler/build.rs
diff --git a/ballista/rust/scheduler/proto/keda.proto → ballista/scheduler/proto/keda.proto b/ballista/rust/scheduler/proto/keda.proto → ballista/scheduler/proto/keda.proto
diff --git a/...rust/scheduler/scheduler_config_spec.toml → ...ista/scheduler/scheduler_config_spec.toml b/...rust/scheduler/scheduler_config_spec.toml → ...ista/scheduler/scheduler_config_spec.toml
diff --git a/ballista/rust/scheduler/src/api/handlers.rs → ballista/scheduler/src/api/handlers.rs b/ballista/rust/scheduler/src/api/handlers.rs → ballista/scheduler/src/api/handlers.rs
diff --git a/ballista/rust/scheduler/src/api/mod.rs → ballista/scheduler/src/api/mod.rs b/ballista/rust/scheduler/src/api/mod.rs → ballista/scheduler/src/api/mod.rs
diff --git a/ballista/rust/scheduler/src/display.rs → ballista/scheduler/src/display.rs b/ballista/rust/scheduler/src/display.rs → ballista/scheduler/src/display.rs
diff --git a/ballista/rust/scheduler/src/flight_sql.rs → ballista/scheduler/src/flight_sql.rs b/ballista/rust/scheduler/src/flight_sql.rs → ballista/scheduler/src/flight_sql.rs
diff --git a/ballista/rust/scheduler/src/lib.rs → ballista/scheduler/src/lib.rs b/ballista/rust/scheduler/src/lib.rs → ballista/scheduler/src/lib.rs
diff --git a/ballista/rust/scheduler/src/main.rs → ballista/scheduler/src/main.rs b/ballista/rust/scheduler/src/main.rs → ballista/scheduler/src/main.rs
diff --git a/ballista/rust/scheduler/src/planner.rs → ballista/scheduler/src/planner.rs b/ballista/rust/scheduler/src/planner.rs → ballista/scheduler/src/planner.rs
diff --git a/...t/scheduler/src/scheduler_server/event.rs → ...a/scheduler/src/scheduler_server/event.rs b/...t/scheduler/src/scheduler_server/event.rs → ...a/scheduler/src/scheduler_server/event.rs
diff --git a/...r/src/scheduler_server/external_scaler.rs → ...r/src/scheduler_server/external_scaler.rs b/...r/src/scheduler_server/external_scaler.rs → ...r/src/scheduler_server/external_scaler.rs
diff --git a/...st/scheduler/src/scheduler_server/grpc.rs → ...ta/scheduler/src/scheduler_server/grpc.rs b/...st/scheduler/src/scheduler_server/grpc.rs → ...ta/scheduler/src/scheduler_server/grpc.rs
diff --git a/...ust/scheduler/src/scheduler_server/mod.rs → ...sta/scheduler/src/scheduler_server/mod.rs b/...ust/scheduler/src/scheduler_server/mod.rs → ...sta/scheduler/src/scheduler_server/mod.rs
diff --git a/...scheduler_server/query_stage_scheduler.rs → ...scheduler_server/query_stage_scheduler.rs b/...scheduler_server/query_stage_scheduler.rs → ...scheduler_server/query_stage_scheduler.rs
diff --git a/ballista/rust/scheduler/src/standalone.rs → ballista/scheduler/src/standalone.rs b/ballista/rust/scheduler/src/standalone.rs → ballista/scheduler/src/standalone.rs
diff --git a/.../rust/scheduler/src/state/backend/etcd.rs → ballista/scheduler/src/state/backend/etcd.rs b/.../rust/scheduler/src/state/backend/etcd.rs → ballista/scheduler/src/state/backend/etcd.rs
diff --git a/...a/rust/scheduler/src/state/backend/mod.rs → ballista/scheduler/src/state/backend/mod.rs b/...a/rust/scheduler/src/state/backend/mod.rs → ballista/scheduler/src/state/backend/mod.rs
diff --git a/...scheduler/src/state/backend/standalone.rs → ...scheduler/src/state/backend/standalone.rs b/...scheduler/src/state/backend/standalone.rs → ...scheduler/src/state/backend/standalone.rs
diff --git a/...st/scheduler/src/state/execution_graph.rs → ...ta/scheduler/src/state/execution_graph.rs b/...st/scheduler/src/state/execution_graph.rs → ...ta/scheduler/src/state/execution_graph.rs
diff --git a/.../state/execution_graph/execution_stage.rs → .../state/execution_graph/execution_stage.rs b/.../state/execution_graph/execution_stage.rs → .../state/execution_graph/execution_stage.rs
diff --git a/...cheduler/src/state/execution_graph_dot.rs → ...cheduler/src/state/execution_graph_dot.rs b/...cheduler/src/state/execution_graph_dot.rs → ...cheduler/src/state/execution_graph_dot.rs
diff --git a/...t/scheduler/src/state/executor_manager.rs → ...a/scheduler/src/state/executor_manager.rs b/...t/scheduler/src/state/executor_manager.rs → ...a/scheduler/src/state/executor_manager.rs
diff --git a/ballista/rust/scheduler/src/state/mod.rs → ballista/scheduler/src/state/mod.rs b/ballista/rust/scheduler/src/state/mod.rs → ballista/scheduler/src/state/mod.rs
diff --git a/...st/scheduler/src/state/session_manager.rs → ...ta/scheduler/src/state/session_manager.rs b/...st/scheduler/src/state/session_manager.rs → ...ta/scheduler/src/state/session_manager.rs
diff --git a/...t/scheduler/src/state/session_registry.rs → ...a/scheduler/src/state/session_registry.rs b/...t/scheduler/src/state/session_registry.rs → ...a/scheduler/src/state/session_registry.rs
diff --git a/.../rust/scheduler/src/state/task_manager.rs → ballista/scheduler/src/state/task_manager.rs b/.../rust/scheduler/src/state/task_manager.rs → ballista/scheduler/src/state/task_manager.rs
diff --git a/ballista/rust/scheduler/src/test_utils.rs → ballista/scheduler/src/test_utils.rs b/ballista/rust/scheduler/src/test_utils.rs → ballista/scheduler/src/test_utils.rs
diff --git a/.../scheduler/testdata/customer/customer.tbl → .../scheduler/testdata/customer/customer.tbl b/.../scheduler/testdata/customer/customer.tbl → .../scheduler/testdata/customer/customer.tbl
diff --git a/...cheduler/testdata/lineitem/partition0.tbl → ...cheduler/testdata/lineitem/partition0.tbl b/...cheduler/testdata/lineitem/partition0.tbl → ...cheduler/testdata/lineitem/partition0.tbl
diff --git a/...cheduler/testdata/lineitem/partition1.tbl → ...cheduler/testdata/lineitem/partition1.tbl b/...cheduler/testdata/lineitem/partition1.tbl → ...cheduler/testdata/lineitem/partition1.tbl
diff --git a/...rust/scheduler/testdata/nation/nation.tbl → ...ista/scheduler/testdata/nation/nation.tbl b/...rust/scheduler/testdata/nation/nation.tbl → ...ista/scheduler/testdata/nation/nation.tbl
diff --git a/...rust/scheduler/testdata/orders/orders.tbl → ...ista/scheduler/testdata/orders/orders.tbl b/...rust/scheduler/testdata/orders/orders.tbl → ...ista/scheduler/testdata/orders/orders.tbl
diff --git a/...sta/rust/scheduler/testdata/part/part.tbl → ballista/scheduler/testdata/part/part.tbl b/...sta/rust/scheduler/testdata/part/part.tbl → ballista/scheduler/testdata/part/part.tbl
diff --git a/.../scheduler/testdata/partsupp/partsupp.tbl → .../scheduler/testdata/partsupp/partsupp.tbl b/.../scheduler/testdata/partsupp/partsupp.tbl → .../scheduler/testdata/partsupp/partsupp.tbl
diff --git a/...rust/scheduler/testdata/region/region.tbl → ...ista/scheduler/testdata/region/region.tbl b/...rust/scheduler/testdata/region/region.tbl → ...ista/scheduler/testdata/region/region.tbl
diff --git a/.../scheduler/testdata/supplier/supplier.tbl → .../scheduler/testdata/supplier/supplier.tbl b/.../scheduler/testdata/supplier/supplier.tbl → .../scheduler/testdata/supplier/supplier.tbl
diff --git a/benchmarks/Cargo.toml b/benchmarks/Cargo.toml
@@ -32,7 +32,7 @@ simd = ["datafusion/simd"]
 snmalloc = ["snmalloc-rs"]
 
 [dependencies]
-ballista = { path = "../ballista/rust/client", version = "0.8.0" }
+ballista = { path = "../ballista/client", version = "0.8.0" }
 datafusion = "13.0.0"
 datafusion-proto = "13.0.0"
 env_logger = "0.9"
@@ -47,4 +47,4 @@ structopt = { version = "0.3", default-features = false }
 tokio = { version = "^1.0", features = ["macros", "rt", "rt-multi-thread", "parking_lot"] }
 
 [dev-dependencies]
-ballista-core = { path = "../ballista/rust/core", version = "0.8.0" }
+ballista-core = { path = "../ballista/core", version = "0.8.0" }
diff --git a/benchmarks/README.md b/benchmarks/README.md
@@ -118,7 +118,7 @@ To run the benchmarks it is necessary to have at least one Ballista scheduler an
 To run the scheduler from source:
 
 ```bash
-cd $ARROW_HOME/ballista/rust/scheduler
+cd $ARROW_HOME/ballista/scheduler
 RUST_LOG=info cargo run --release
 ```
 
@@ -127,7 +127,7 @@ By default the scheduler will bind to `0.0.0.0` and listen on port 50050.
 To run the executor from source:
 
 ```bash
-cd $ARROW_HOME/ballista/rust/executor
+cd $ARROW_HOME/ballista/executor
 RUST_LOG=info cargo run --release
 ```
 

diff --git a/dev/build-set-env.sh b/dev/build-set-env.sh
@@ -17,6 +17,6 @@
 # specific language governing permissions and limitations
 # under the License.
 
-cd ballista/rust/core/
+cd ballista/core/
 export BALLISTA_VERSION=$(cargo pkgid | cut '-d@' -f2)
 cd -
diff --git a/dev/release/README.md b/dev/release/README.md
@@ -281,10 +281,10 @@ dot -Tsvg dev/release/crate-deps.dot > dev/release/crate-deps.svg
 ```
 
 ```shell
-(cd ballista/rust/core && cargo publish)
-(cd ballista/rust/executor && cargo publish)
-(cd ballista/rust/scheduler && cargo publish)
-(cd ballista/rust/client && cargo publish)
+(cd ballista/core && cargo publish)
+(cd ballista/executor && cargo publish)
+(cd ballista/scheduler && cargo publish)
+(cd ballista/client && cargo publish)
 (cd ballista-cli && cargo publish)
 ```
 

diff --git a/dev/release/rat_exclude_files.txt b/dev/release/rat_exclude_files.txt
@@ -111,7 +111,7 @@ requirements.txt
 .gitattributes
 rust-toolchain
 benchmarks/queries/q*.sql
-ballista/rust/scheduler/testdata/*
+ballista/scheduler/testdata/*
 **/yarn.lock
 python/rust-toolchain
 python/requirements*.txt

diff --git a/dev/release/verify-release-candidate.sh b/dev/release/verify-release-candidate.sh
@@ -138,7 +138,7 @@ test_source_distribution() {
 
   # Note can't verify other ballista crates as they depend
   # on ballista-core which isn't published yet
-  pushd ballista/rust/core
+  pushd ballista/core
     cargo publish --dry-run
   popd
 }

diff --git a/dev/update_ballista_versions.py b/dev/update_ballista_versions.py
@@ -79,10 +79,10 @@ def main():
         os.path.join(repo_root, rel_path, "Cargo.toml")
         for rel_path in [
             'ballista-cli',
-            'ballista/rust/core',
-            'ballista/rust/scheduler',
-            'ballista/rust/executor',
-            'ballista/rust/client',
+            'ballista/core',
+            'ballista/scheduler',
+            'ballista/executor',
+            'ballista/client',
             'benchmarks',
             'examples',
             'python',

diff --git a/dev/update_datafusion_versions.py b/dev/update_datafusion_versions.py
@@ -42,10 +42,10 @@
 
 ballista_crates = {
     'ballista-cli': 'ballista-cli/Cargo.toml',
-    'core': 'ballista/rust/core/Cargo.toml',
-    'client': 'ballista/rust/client/Cargo.toml',
-    'executor': 'ballista/rust/executor/Cargo.toml',
-    'scheduler': 'ballista/rust/scheduler/Cargo.toml',
+    'core': 'ballista/core/Cargo.toml',
+    'client': 'ballista/client/Cargo.toml',
+    'executor': 'ballista/executor/Cargo.toml',
+    'scheduler': 'ballista/scheduler/Cargo.toml',
 }
 
 def update_datafusion_version(cargo_toml: str, new_version: str):

diff --git a/docs/developer/architecture.md b/docs/developer/architecture.md
@@ -51,7 +51,7 @@ processes.
 ## Scheduler Process
 
 The scheduler process implements a gRPC interface (defined in
-[ballista.proto](../rust/core/proto/ballista.proto)). The interface provides the following methods:
+[ballista.proto](../core/proto/ballista.proto)). The interface provides the following methods:
 
 | Method               | Description                                                          |
 | -------------------- | -------------------------------------------------------------------- |

diff --git a/docs/developer/configuration.md b/docs/developer/configuration.md
@@ -25,7 +25,7 @@ Those files fully define Ballista's configuration. If there is a discrepancy bet
 
 To get a list of command line arguments, run the binary with `--help`
 
-There is an example config file at `ballista/rust/ballista/examples/example_executor_config.toml`
+There is an example config file at `ballista/ballista/examples/example_executor_config.toml`
 
 The order of precedence for arguments is: default config file < environment variables < specified config file < command line arguments.
 

diff --git a/examples/Cargo.toml b/examples/Cargo.toml
@@ -34,7 +34,7 @@ path = "examples/standalone-sql.rs"
 required-features = ["ballista/standalone"]
 
 [dependencies]
-ballista = { path = "../ballista/rust/client", version = "0.8.0" }
+ballista = { path = "../ballista/client", version = "0.8.0" }
 datafusion = "13.0.0"
 futures = "0.3"
 num_cpus = "1.13.0"

diff --git a/examples/README.md b/examples/README.md
@@ -59,7 +59,7 @@ async fn main() -> Result<()> {
 # Distributed Examples
 
 For background information on the Ballista architecture, refer to
-the [Ballista README](../ballista/rust/client/README.md).
+the [Ballista README](../ballista/client/README.md).
 
 ## Start a standalone cluster
 

diff --git a/python/Cargo.toml b/python/Cargo.toml
@@ -35,7 +35,7 @@ default = ["mimalloc"]
 
 [dependencies]
 async-trait = "0.1"
-ballista = { path = "../ballista/rust/client", version = "0.8.0" }
+ballista = { path = "../ballista/client", version = "0.8.0" }
 datafusion = { version = "13.0.0", features = ["pyarrow"] }
 futures = "0.3"
 mimalloc = { version = "*", optional = true, default-features = false }