Update run_spicebench.yml (#31)

* CI

* docker image name

* Fix clippy warnings: dead_code and incorrect lint name

---------

Co-authored-by: Phillip LeBlanc <[email protected]>

Author: Jeadie

.github/workflows/run_spicebench.yml

@@ -23,15 +23,40 @@ jobs:
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
+      - name: pull spidapter image
+        run: docker pull ghcr.io/spiceai/spidapter:latest
+
+      - name: Cache spicebench binary
+        id: cache-spicebench
+        uses: actions/cache@v4
+        with:
+          path: ~/.spice/bin/spicebench
+          key: spicebench-${{ runner.os }}-${{ hashFiles('**/Cargo.lock', '**/Cargo.toml', '**/*.rs') }}
+          restore-keys: |
+            spicebench-${{ runner.os }}-
+
+      - name: Setup Rust toolchain
+        if: steps.cache-spicebench.outputs.cache-hit != 'true'
+        uses: actions-rust-lang/setup-rust-toolchain@v1
+        with:
+          toolchain: 1.91
+          cache: false
+
+      - name: Build spicebench
+        if: steps.cache-spicebench.outputs.cache-hit != 'true'
+        run: |
+          mkdir -p ~/.spice/bin
+          cargo build -p spicebench
+          install -m 755 target/debug/spicebench ~/.spice/bin/spicebench
+
       - name: Run spicebench
+        env:
+          SPICEAI_API_KEY: ${{ secrets.SPICEAI_API_KEY }}
+          SPICE_CLOUD_API_URL: https://dev-api.spice.ai
+          RUSTFLAGS: "-A warnings"
         run: |
-          docker run \
-            -e SPICEAI_API_KEY \
-            -v ${{ github.workspace }}/test/spicepods:/spicepods \
-            ghcr.io/spiceai/spidapter:latest \
-            run load \
-            --spiced-start-api-url https://dev-api.spice.ai \
-            --concurrency 2 \
+          ~/.spice/bin/spicebench \
+            --concurrency 2  \
             --query-set tpch \
-            --spiced-start-mode spice-cloud \
-            -p /spicepods/s3-public\[parquet\].yaml
+            --system-adapter-stdio-cmd docker \
+            --system-adapter-stdio-args "run ghcr.io/spiceai/spidapter:latest -e SPICEAI_API_KEY -e SPICE_CLOUD_API_URL run stdio --verbose"

Makefile

@@ -1,4 +1,4 @@
-.PHONY: lint check test clippy fmt fmt-check clippy-fix fix
+.PHONY: lint check test clippy fmt fmt-check clippy-fix fix build build-dev install install-dev
 
 # Run all CI checks (matches .github/workflows/pr.yml)
 lint: check test clippy
@@ -26,3 +26,25 @@ clippy-fix:
 
 # Run all fixes
 fix: fmt clippy-fix
+
+################################################################################
+# Build targets                                                                #
+################################################################################
+
+build:
+	cargo build --release -p spicebench
+
+build-dev:
+	cargo build -p spicebench
+
+################################################################################
+# Install targets                                                              #
+################################################################################
+
+install: build
+	mkdir -p ~/.spice/bin
+	install -m 755 target/release/spicebench ~/.spice/bin/spicebench
+
+install-dev: build-dev
+	mkdir -p ~/.spice/bin
+	install -m 755 target/debug/spicebench ~/.spice/bin/spicebench

src/args/dataset.rs

@@ -198,6 +198,7 @@ impl PartialEq<QuerySet> for QuerySetArg {
     }
 }
 
+#[allow(dead_code)]
 pub trait QuerySetLoader {
     fn query_set(&self) -> &QuerySetArg;
     fn scenario_query_file(&self) -> Option<&PathBuf>;
@@ -225,6 +226,7 @@ pub trait QuerySetLoader {
 
 impl DatasetTestArgs {
     /// Load the query set, handling scenario query sets from files
+    #[allow(dead_code)]
     pub fn load_query_set(&self) -> anyhow::Result<QuerySet> {
         QuerySetLoader::load_query_set(self)
     }

src/args/mod.rs

@@ -111,12 +111,14 @@ pub struct CommonArgs {
 impl CommonArgs {
     /// Check if `spiced_path` is a URL to an external instance
     #[must_use]
+    #[allow(dead_code)]
     pub fn is_external_instance(&self) -> bool {
         self.spiced_path.starts_with("http://") || self.spiced_path.starts_with("https://")
     }
 
     /// Get the spiced path as a `PathBuf` (only valid when not an external instance)
     #[must_use]
+    #[allow(dead_code)]
     pub fn spiced_path_buf(&self) -> PathBuf {
         PathBuf::from(&self.spiced_path)
     }

src/commands/adbc_executor.rs

@@ -13,6 +13,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 */
+#![allow(dead_code)]
 
 use std::sync::{Arc, Mutex};
 

src/commands/load/mod.rs

@@ -13,6 +13,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 */
+#![allow(dead_code)]
 
 use super::get_app_and_start_request;
 use crate::{args::BenchRunArgs, health::HealthMonitor};

src/commands/mod.rs

@@ -39,6 +39,7 @@ pub(crate) mod load;
 /// This ensures the `SdkMeterProvider` is created with the correct resource,
 /// so metrics recorded after this call will have the proper resource attributes.
 #[must_use]
+#[allow(dead_code)]
 pub(crate) fn create_telemetry_with_resource(common: &CommonArgs, resource: Resource) -> Telemetry {
     if let Some(endpoint) = &common.otlp_endpoint {
         return Telemetry::with_otlp_resource(
@@ -64,6 +65,7 @@ pub(crate) fn create_telemetry_with_resource(common: &CommonArgs, resource: Reso
 ///
 /// # Returns
 /// Tuple of (`QuerySet`, `NotStarted` builder)
+#[allow(dead_code)]
 pub(crate) async fn build_test_with_validation(
     args: &DatasetTestArgs,
     test_builder: NotStarted,
@@ -96,6 +98,7 @@ pub(crate) async fn build_test_with_validation(
     Ok((query_set, test_builder))
 }
 
+#[allow(dead_code)]
 pub(crate) async fn get_app_and_start_request(
     args: &CommonArgs,
 ) -> anyhow::Result<(App, StartRequest)> {
@@ -155,6 +158,7 @@ pub async fn connect_system_adapter(args: &CommonArgs) -> anyhow::Result<SystemA
     Err(anyhow::anyhow!("No system adapter transport configured"))
 }
 
+#[allow(dead_code)]
 pub(crate) async fn create_query_executor(
     args: &DatasetTestArgs,
     spiced_instance: &test_framework::spiced::SpicedInstance,

src/health.rs

@@ -13,6 +13,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 */
+#![allow(dead_code)]
 
 use std::{
     collections::BTreeMap,

src/main.rs

@@ -64,17 +64,26 @@ async fn main() -> anyhow::Result<()> {
         }
     };
 
-    let adbc_conn = match AdbcConnection::create(&adbc_driver.driver.to_string(), adbc_driver.db_kwargs) {
-        Ok(conn) => {
-            println!("ADBC connection established (driver: {})", adbc_driver.driver);
-            conn
-        }
-        Err(e) => {
-            return Err(anyhow::anyhow!("Failed to create ADBC connection for driver {}: {e}", adbc_driver.driver));
-        }
-    };
-
-    commands::load::run(&cli.args, Some(adbc_conn)).await?;
+    #[expect(unused_variables)]
+    let adbc_conn =
+        match AdbcConnection::create(&adbc_driver.driver.to_string(), adbc_driver.db_kwargs) {
+            Ok(conn) => {
+                println!(
+                    "ADBC connection established (driver: {})",
+                    adbc_driver.driver
+                );
+                conn
+            }
+            Err(e) => {
+                return Err(anyhow::anyhow!(
+                    "Failed to create ADBC connection for driver {}: {e}",
+                    adbc_driver.driver
+                ));
+            }
+        };
+
+    // TODO: Add back when `load::run` is only responsible for running query load and measuring latency.
+    // commands::load::run(&cli.args, Some(adbc_conn)).await?;
 
     if let Err(e) = system_adapter_client.teardown(run_id).await {
         return Err(anyhow::anyhow!("Failed to teardown system adapter: {e}"));

src/metrics.rs

@@ -13,6 +13,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 */
+#![allow(dead_code)]
 
 use std::sync::LazyLock;