refactor: repo structure and unify crates (#1426)

Author: dotansimha

.cargo/config.toml

@@ -3,9 +3,9 @@
 router = "run --package hive-router"
 dev = "run --package qp-dev-cli"
 subgraphs = "run --package subgraphs"
-test_qp = "nextest run --package hive-router-query-planner"
+test_qp = "nextest run --package hive-router query_planner::"
 test_all = "nextest run --workspace --exclude e2e"
 test_e2e = "nextest run --package e2e --test-threads 5"
-test_qpe = "nextest run --package hive-router-plan-executor"
+test_qpe = "nextest run --package hive-router executor::"
 "clippy:fix" = "clippy --all --fix --allow-dirty --allow-staged"
-"router-config" = "run --release -p hive-router-config router-config.schema.json"
+"router-config" = "run --release -p hive-router --bin config_schema_generator router-config.schema.json"

.changeset/unify-crates-into-hive-router.md

@@ -0,0 +1,22 @@
+---
+hive-router: major
+---
+
+Merge the `hive-router-query-planner`, `hive-router-plan-executor`, `hive-router-config`, and `hive-router-internal` crates into the main `hive-router` crate. They are no longer published as separate crates on crates.io.
+
+**If you just run the router (binary or Docker image), or write plugins against the `hive-router` crate: nothing changes for you.** The plugin API (`hive_router::plugins::*`, `RouterPlugin`, hooks, and everything re-exported at the crate root) is unaffected.
+
+**If you depend directly on one of the four merged crates**, you'll need to switch to depending on `hive-router` instead and update your imports:
+
+| Before                                    | After                              |
+| ------------------------------------------ | ----------------------------------- |
+| `hive-router-query-planner` (Cargo dep)    | `hive-router`                       |
+| `hive_router_query_planner::...`           | `hive_router::query_planner::...`   |
+| `hive-router-plan-executor` (Cargo dep)    | `hive-router`                       |
+| `hive_router_plan_executor::...`           | `hive_router::executor::...`        |
+| `hive-router-config` (Cargo dep)           | `hive-router`                       |
+| `hive_router_config::...`                  | `hive_router::config::...`          |
+
+`hive-router-internal` has no public replacement — it was never meant for use outside of the router itself, and is now a private module.
+
+The four crates' existing published versions on crates.io are untouched, but they won't receive any further releases.

.github/workflows/build-router.yaml

@@ -90,7 +90,7 @@ jobs:
         uses: actions-rust-lang/setup-rust-toolchain@166cdcfd11aee3cb47222f9ddb555ce30ddb9659 # v1
         with:
           target: ${{ matrix.rust_target }}
-          cache-key: ${{ matrix.name }}
+          cache-key: cache_v2_${{ matrix.name }}
 
       # Only if using Zigbuild
       - uses: mlugg/setup-zig@d1434d08867e3ee9daa34448df10607b98908d29 # v2
@@ -125,7 +125,7 @@ jobs:
       - name: node-addon build (${{ matrix.rust_target }})
         working-directory: lib/node-addon
         env:
-          CROSS_COMPILE: ${{ matrix.zigbuild }}
+          USE_CROSS_COMPILE: ${{ matrix.zigbuild }}
           TARGET: ${{ matrix.rust_target }}
         run: npm run build
       - uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1

.github/workflows/ci.yaml

@@ -134,12 +134,16 @@ jobs:
         include:
           - name: "graphql-tools"
             package: "./lib/graphql-tools"
+            bench_args: ""
           - name: "query-planner"
-            package: "./lib/query-planner"
+            package: "./bin/router"
+            bench_args: "--bench qp_benches"
           - name: "executor"
-            package: "./lib/executor"
+            package: "./bin/router"
+            bench_args: "--bench executor_benches --bench demand_control_benches --bench coprocessor_benches"
           - name: "router"
             package: "./bin/router"
+            bench_args: "--features testing --bench persisted_documents_matcher_benches --bench router_benches"
     name: benchmark / ${{ matrix.name }}
     runs-on: ubuntu-latest
     steps:
@@ -153,7 +157,7 @@ jobs:
         name: Run subgraphs
         run: ./target/release/subgraphs & sleep 5
       - name: Run benchmarks
-        run: cargo bench
+        run: cargo bench ${{ matrix.bench_args }}
         working-directory: ${{ matrix.package }}
       - name: Upload benchmark results
         if: always() # Upload results even if benchmarks fail

.github/workflows/release.yaml

@@ -35,10 +35,6 @@ jobs:
       - check
     env:
       CRATES_PUBLISH_JSON: ${{ needs.check.outputs.crates_to_publish }}
-      PUBLISH_CONFIG_CRATE: ${{ contains(needs.check.outputs.crates_to_publish, '"hive-router-config"') }}
-      PUBLISH_INTERNAL_CRATE: ${{ contains(needs.check.outputs.crates_to_publish, '"hive-router-internal"') }}
-      PUBLISH_QUERY_PLANNER_CRATE: ${{ contains(needs.check.outputs.crates_to_publish, '"hive-router-query-planner"') }}
-      PUBLISH_EXECUTOR_CRATE: ${{ contains(needs.check.outputs.crates_to_publish, '"hive-router-plan-executor"') }}
       PUBLISH_ROUTER_CRATE: ${{ contains(needs.check.outputs.crates_to_publish, '"hive-router"') }}
       PUBLISH_GRAPHQL_TOOLS_CRATE: ${{ contains(needs.check.outputs.crates_to_publish, '"graphql-tools"') }}
       PUBLISH_CONSOLE_SDK_CRATE: ${{ contains(needs.check.outputs.crates_to_publish, '"hive-console-sdk"') }}
@@ -82,34 +78,6 @@ jobs:
         run: |
           cargo publish --manifest-path ${{ fromJson(needs.check.outputs.crates_to_publish).hive-apollo-router-plugin }}
 
-      - name: publish config lib
-        if: env.PUBLISH_CONFIG_CRATE == 'true'
-        env:
-          CARGO_REGISTRY_TOKEN: ${{ steps.auth.outputs.token }}
-        run: |
-          cargo publish --manifest-path ${{ fromJson(needs.check.outputs.crates_to_publish).hive-router-config }}
-
-      - name: publish internal lib
-        if: env.PUBLISH_INTERNAL_CRATE == 'true'
-        env:
-          CARGO_REGISTRY_TOKEN: ${{ steps.auth.outputs.token }}
-        run: |
-          cargo publish --manifest-path ${{ fromJson(needs.check.outputs.crates_to_publish).hive-router-internal }}
-
-      - name: publish query-planner lib
-        if: env.PUBLISH_QUERY_PLANNER_CRATE == 'true'
-        env:
-          CARGO_REGISTRY_TOKEN: ${{ steps.auth.outputs.token }}
-        run: |
-          cargo publish --manifest-path ${{ fromJson(needs.check.outputs.crates_to_publish).hive-router-query-planner }}
-
-      - name: publish executor lib
-        if: env.PUBLISH_EXECUTOR_CRATE == 'true'
-        env:
-          CARGO_REGISTRY_TOKEN: ${{ steps.auth.outputs.token }}
-        run: |
-          cargo publish --manifest-path ${{ fromJson(needs.check.outputs.crates_to_publish).hive-router-plan-executor }}
-
       - name: publish router lib
         if: env.PUBLISH_ROUTER_CRATE == 'true'
         env: