From 451b0a60e9aee5a6cc9e5e6d1b1736ed956c4f97 Mon Sep 17 00:00:00 2001
From: Max Isom <hi@maxisom.me>
Date: Thu, 19 Sep 2024 16:05:09 -0700
Subject: [PATCH] Fixes for nextest

---
 .github/workflows/_rust-tests.yml     | 24 ++++++++++++++++++++++--
 rust/benchmark-datasets/src/util.rs   |  1 -
 rust/worker/benches/fulltext_index.rs |  4 ++--
 3 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/_rust-tests.yml b/.github/workflows/_rust-tests.yml
index 41849d62b58..1924e598cc5 100644
--- a/.github/workflows/_rust-tests.yml
+++ b/.github/workflows/_rust-tests.yml
@@ -19,8 +19,7 @@ jobs:
       - name: Build
         run: cargo build --verbose
       - name: Test
-        # --all-targets tests benchmarks
-        run: cargo nextest run --all-targets
+        run: cargo nextest run
   test-integration:
     strategy:
       matrix:
@@ -37,3 +36,24 @@ jobs:
         uses: ./.github/actions/tilt
       - name: Run tests
         run: cargo nextest run --profile k8s_integration
+  test-benches:
+    strategy:
+      matrix:
+        platform: [depot-ubuntu-22.04-16]
+    runs-on: ${{ matrix.platform }}
+    env:
+      CARGO_TERM_COLOR: always
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+      - name: Setup
+        uses: ./.github/actions/rust
+      - name: Cache test datasets
+        uses: actions/cache@v4
+        with:
+          path: /home/runner/.cache/chroma-test-datasets
+          key: chroma-test-datasets
+      - name: Build
+        run: cargo build --verbose
+      - name: Test benches
+        run: cargo nextest run --benches
diff --git a/rust/benchmark-datasets/src/util.rs b/rust/benchmark-datasets/src/util.rs
index f7edf602cc0..8f8732b93c6 100644
--- a/rust/benchmark-datasets/src/util.rs
+++ b/rust/benchmark-datasets/src/util.rs
@@ -35,7 +35,6 @@ where
     Fut: Future<Output = Result<()>>,
 {
     let dataset_dir = get_dataset_cache_path(dataset_name, cache_dir).await?;
-    println!("dataset_dir: {:?}", dataset_dir);
     let file_path = dataset_dir.join(file_name);
 
     if !file_path.exists() {
diff --git a/rust/worker/benches/fulltext_index.rs b/rust/worker/benches/fulltext_index.rs
index aef8626b413..e352b73eb00 100644
--- a/rust/worker/benches/fulltext_index.rs
+++ b/rust/worker/benches/fulltext_index.rs
@@ -136,6 +136,8 @@ fn bench_querying(c: &mut Criterion) {
     let mut querying_group = c.benchmark_group("querying");
     querying_group.throughput(Throughput::Elements(1));
 
+    let mut query_iter = query_subset.queries.iter().cycle();
+
     let segment_reader = runner.block_on(async {
         let metadata_segment = compact_log_to_storage(&blockfile_provider, log_chunk.clone())
             .await
@@ -147,8 +149,6 @@ fn bench_querying(c: &mut Criterion) {
         )
     });
 
-    let mut query_iter = query_subset.queries.iter().cycle();
-
     querying_group.bench_function(format!("scidocs ({} records)", log_chunk.len()), |b| {
         b.to_async(&runner).iter_batched(
             || (segment_reader.clone(), query_iter.next().unwrap().clone()),