grunt: remove rust/ folder and change core/ to crates/ (#81)

sjrusso8 · Oct 25, 2024 · 5b3dce0 · 5b3dce0
1 parent 8e622e8
commit 5b3dce0
Show file tree

Hide file tree

Showing 37 changed files with 12 additions and 57 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -95,4 +95,4 @@ jobs:
         run: docker compose up -d
 
       - name: Run tests
-        run: cargo test -p spark-connect-core --features polars,datafusion
+        run: cargo test -p spark-connect-rs --features polars,datafusion
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -18,7 +18,7 @@ jobs:
             echo "Cargo metadata has version set to ${CURR_VER}, but got pushed tag ${PUSHED_TAG}."
             exit 1
           fi
-        working-directory: ./core
+        working-directory: ./crates
 
   release-crate:
     needs: validate-release-tag
@@ -38,14 +38,6 @@ jobs:
         with:
           version: 23.x
 
-      - name: cargo publish core
-        uses: actions-rs/cargo@v1
-        env:
-          CARGO_REGISTRY_TOKEN: ${{ secrets.CARGO_REGISTRY_TOKEN }}
-        with:
-          command: publish
-          args: --token "${CARGO_REGISTRY_TOKEN}" --package spark-connect-core --manifest-path ./Cargo.toml
-
       - name: cargo publish rust
         uses: actions-rs/cargo@v1
         env:

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,5 +1,5 @@
 [workspace]
-members = ["core", "rust", "examples"]
+members = ["crates/*", "examples"]
 resolver = "2"
 
 [workspace.package]

diff --git a/README.md b/README.md
@@ -16,14 +16,14 @@ The `spark-connect-rs` aims to provide an entrypoint to [Spark Connect](https://
 ## Project Layout
 
 ```
-├── core         <- core implementation in Rust
-│   └─ protobuf  <- connect protobuf for apache/spark
-├── rust         <- shim for 'spark-connect-rs' from core
-├── examples     <- examples of using different aspects of the crate
-├── datasets     <- sample files from the main spark repo
+├── crates          <- crates for the implementation of the client side spark-connect bindings
+│   └─ connect      <- crate for 'spark-connect-rs'
+│      └─ protobuf  <- connect protobuf for apache/spark
+├── examples        <- examples of using different aspects of the crate
+├── datasets        <- sample files from the main spark repo
 ```
 
-Future state would be to have additional bindings for other languages along side the top level `rust` folder.
+Future state would be to have additional crates that allow for easier creation of other language bindings.
 
 ## Getting Started
 

diff --git a/core/Cargo.toml → crates/connect/Cargo.toml b/core/Cargo.toml → crates/connect/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "spark-connect-core"
+name = "spark-connect-rs"
 version = "0.0.1-beta.5"
 authors.workspace = true
 keywords.workspace = true

diff --git a/core/build.rs → crates/connect/build.rs b/core/build.rs → crates/connect/build.rs
diff --git a/core/protobuf/spark-3.5/buf.yaml → crates/connect/protobuf/spark-3.5/buf.yaml b/core/protobuf/spark-3.5/buf.yaml → crates/connect/protobuf/spark-3.5/buf.yaml
diff --git a/...otobuf/spark-3.5/spark/connect/base.proto → ...otobuf/spark-3.5/spark/connect/base.proto b/...otobuf/spark-3.5/spark/connect/base.proto → ...otobuf/spark-3.5/spark/connect/base.proto
diff --git a/...buf/spark-3.5/spark/connect/catalog.proto → ...buf/spark-3.5/spark/connect/catalog.proto b/...buf/spark-3.5/spark/connect/catalog.proto → ...buf/spark-3.5/spark/connect/catalog.proto
diff --git a/...uf/spark-3.5/spark/connect/commands.proto → ...uf/spark-3.5/spark/connect/commands.proto b/...uf/spark-3.5/spark/connect/commands.proto → ...uf/spark-3.5/spark/connect/commands.proto
diff --git a/...obuf/spark-3.5/spark/connect/common.proto → ...obuf/spark-3.5/spark/connect/common.proto b/...obuf/spark-3.5/spark/connect/common.proto → ...obuf/spark-3.5/spark/connect/common.proto
diff --git a/...spark-3.5/spark/connect/expressions.proto → ...spark-3.5/spark/connect/expressions.proto b/...spark-3.5/spark/connect/expressions.proto → ...spark-3.5/spark/connect/expressions.proto
diff --git a/...f/spark-3.5/spark/connect/relations.proto → ...f/spark-3.5/spark/connect/relations.proto b/...f/spark-3.5/spark/connect/relations.proto → ...f/spark-3.5/spark/connect/relations.proto
diff --git a/...tobuf/spark-3.5/spark/connect/types.proto → ...tobuf/spark-3.5/spark/connect/types.proto b/...tobuf/spark-3.5/spark/connect/types.proto → ...tobuf/spark-3.5/spark/connect/types.proto
diff --git a/core/src/catalog.rs → crates/connect/src/catalog.rs b/core/src/catalog.rs → crates/connect/src/catalog.rs
diff --git a/core/src/client/builder.rs → crates/connect/src/client/builder.rs b/core/src/client/builder.rs → crates/connect/src/client/builder.rs
diff --git a/core/src/client/middleware.rs → crates/connect/src/client/middleware.rs b/core/src/client/middleware.rs → crates/connect/src/client/middleware.rs
diff --git a/core/src/client/mod.rs → crates/connect/src/client/mod.rs b/core/src/client/mod.rs → crates/connect/src/client/mod.rs
diff --git a/core/src/column.rs → crates/connect/src/column.rs b/core/src/column.rs → crates/connect/src/column.rs
diff --git a/core/src/conf.rs → crates/connect/src/conf.rs b/core/src/conf.rs → crates/connect/src/conf.rs
diff --git a/core/src/dataframe.rs → crates/connect/src/dataframe.rs b/core/src/dataframe.rs → crates/connect/src/dataframe.rs
diff --git a/core/src/errors.rs → crates/connect/src/errors.rs b/core/src/errors.rs → crates/connect/src/errors.rs
diff --git a/core/src/expressions.rs → crates/connect/src/expressions.rs b/core/src/expressions.rs → crates/connect/src/expressions.rs
diff --git a/core/src/functions/mod.rs → crates/connect/src/functions/mod.rs b/core/src/functions/mod.rs → crates/connect/src/functions/mod.rs
diff --git a/core/src/group.rs → crates/connect/src/group.rs b/core/src/group.rs → crates/connect/src/group.rs
diff --git a/core/src/lib.rs → crates/connect/src/lib.rs b/core/src/lib.rs → crates/connect/src/lib.rs
diff --git a/core/src/plan.rs → crates/connect/src/plan.rs b/core/src/plan.rs → crates/connect/src/plan.rs
diff --git a/core/src/readwriter.rs → crates/connect/src/readwriter.rs b/core/src/readwriter.rs → crates/connect/src/readwriter.rs
diff --git a/core/src/session.rs → crates/connect/src/session.rs b/core/src/session.rs → crates/connect/src/session.rs
diff --git a/core/src/storage.rs → crates/connect/src/storage.rs b/core/src/storage.rs → crates/connect/src/storage.rs
diff --git a/core/src/streaming/mod.rs → crates/connect/src/streaming/mod.rs b/core/src/streaming/mod.rs → crates/connect/src/streaming/mod.rs
diff --git a/core/src/types.rs → crates/connect/src/types.rs b/core/src/types.rs → crates/connect/src/types.rs
diff --git a/core/src/window.rs → crates/connect/src/window.rs b/core/src/window.rs → crates/connect/src/window.rs
diff --git a/examples/Cargo.toml b/examples/Cargo.toml
@@ -32,7 +32,7 @@ path = "src/databricks.rs"
 required-feature = ["tls"]
 
 [dependencies]
-spark-connect-rs = { version = "0.0.1-beta.5", path = "../rust" }
+spark-connect-rs = { version = "0.0.1-beta.5", path = "../crates/connect" }
 tokio = { workspace = true, features = ["rt-multi-thread"] }
 
 [features]

diff --git a/rust/Cargo.toml b/rust/Cargo.toml
diff --git a/rust/src/lib.rs b/rust/src/lib.rs