Mass rename

AdamGS · AdamGS · commit 18923690a827 · 2025-12-17T17:32:17.000Z
Signed-off-by: Adam Gutglick &lt;adam@spiraldb.com&gt;
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -399,8 +399,8 @@ jobs:
         if: ${{ matrix.suite == 'tpc-h' }}
         # We use i2 to ensure that restarting the duckdb connection succeeds
         run: |
-          cargo run --bin df-bench -- tpch -i2 --formats "vortex,vortex-compact" --options scale-factor=0.1
-          cargo run --bin ddb-bench -- tpch -i2 --formats "vortex,vortex-compact" --options scale-factor=0.1
+          cargo run --bin datafusion-bench -- tpch -i2 --formats "vortex,vortex-compact" --options scale-factor=0.1
+          cargo run --bin duckdb-bench -- tpch -i2 --formats "vortex,vortex-compact" --options scale-factor=0.1
       - name: Run FFI Example
         if: ${{ matrix.suite == 'ffi' }}
         run: |
diff --git a/.github/workflows/sql-benchmarks.yml b/.github/workflows/sql-benchmarks.yml
@@ -129,7 +129,7 @@ jobs:
         env:
           RUSTFLAGS: "-C target-cpu=native -C force-frame-pointers=yes"
         run: |
-          packages="--bin data-gen --bin df-bench --bin ddb-bench"
+          packages="--bin data-gen --bin datafusion-bench --bin duckdb-bench"
           if [ "${{ matrix.build_lance }}" = "true" ]; then
             packages="$packages --bin lance-bench"
           fi
@@ -203,9 +203,9 @@ jobs:
 
           touch results.json
 
-          # Run df-bench
+          # Run datafusion-bench
           if [ -n "$df_formats" ]; then
-            target/release_debug/df-bench ${{ matrix.subcommand }} \
+            target/release_debug/datafusion-bench ${{ matrix.subcommand }} \
               -d gh-json \
               --formats "$df_formats" \
               $opts \
@@ -214,9 +214,9 @@ jobs:
             cat df-results.json >> results.json
           fi
 
-          # Run ddb-bench
+          # Run duckdb-bench
           if [ -n "$ddb_formats" ]; then
-            target/release_debug/ddb-bench ${{ matrix.subcommand }} \
+            target/release_debug/duckdb-bench ${{ matrix.subcommand }} \
               -d gh-json \
               --formats "$ddb_formats" \
               $opts \
@@ -259,9 +259,9 @@ jobs:
 
           touch results.json
 
-          # Run df-bench with remote storage
+          # Run datafusion-bench with remote storage
           if [ -n "$df_formats" ]; then
-            target/release_debug/df-bench ${{ matrix.subcommand }} \
+            target/release_debug/datafusion-bench ${{ matrix.subcommand }} \
               -d gh-json \
               --formats "$df_formats" \
               $opts \
@@ -270,9 +270,9 @@ jobs:
             cat df-results.json >> results.json
           fi
 
-          # Run ddb-bench with remote storage
+          # Run duckdb-bench with remote storage
           if [ -n "$ddb_formats" ]; then
-            target/release_debug/ddb-bench ${{ matrix.subcommand }} \
+            target/release_debug/duckdb-bench ${{ matrix.subcommand }} \
               -d gh-json \
               --formats "$ddb_formats" \
               $opts \
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/bench-orchestrator/bench_orchestrator/config.py b/bench-orchestrator/bench_orchestrator/config.py
@@ -19,8 +19,8 @@ class Engine(str, Enum):
     def binary_name(self) -> str:
         """Return the cargo binary name for this engine."""
         return {
-            Engine.DUCKDB: "ddb-bench",
-            Engine.DATAFUSION: "df-bench",
+            Engine.DUCKDB: "duckdb-bench",
+            Engine.DATAFUSION: "datafusion-bench",
             Engine.LANCE: "lance-bench",
         }[self]
 
diff --git a/benchmarks/datafusion-bench/Cargo.toml b/benchmarks/datafusion-bench/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "df-bench"
+name = "datafusion-bench"
 description = "Datafusion benchmarks"
 authors = { workspace = true }
 categories = { workspace = true }
diff --git a/benchmarks/datafusion-bench/src/lib.rs b/benchmarks/datafusion-bench/src/lib.rs
diff --git a/benchmarks/datafusion-bench/src/main.rs b/benchmarks/datafusion-bench/src/main.rs
@@ -14,8 +14,8 @@ use datafusion::datasource::listing::ListingTableConfig;
 use datafusion::datasource::listing::ListingTableUrl;
 use datafusion::parquet::arrow::ParquetRecordBatchStreamBuilder;
 use datafusion::prelude::SessionContext;
+use datafusion_bench::format_to_df_format;
 use datafusion_physical_plan::ExecutionPlan;
-use df_bench::format_to_df_format;
 use futures::StreamExt;
 use tokio::fs::File;
 use vortex_bench::Benchmark;
@@ -146,8 +146,8 @@ async fn main() -> anyhow::Result<()> {
             |format| {
                 let benchmark = &*benchmark;
                 async move {
-                    let session = df_bench::get_session_context();
-                    df_bench::make_object_store(&session, benchmark.data_url())?;
+                    let session = datafusion_bench::get_session_context();
+                    datafusion_bench::make_object_store(&session, benchmark.data_url())?;
                     register_benchmark_tables(&session, benchmark, format).await?;
                     Ok(session)
                 }
diff --git a/benchmarks/datafusion-bench/src/metrics.rs b/benchmarks/datafusion-bench/src/metrics.rs
diff --git a/benchmarks/duckdb-bench/Cargo.toml b/benchmarks/duckdb-bench/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "ddb-bench"
+name = "duckdb-bench"
 description = "DuckDB benchmarks tool"
 authors.workspace = true
 categories.workspace = true
diff --git a/benchmarks/duckdb-bench/build.rs b/benchmarks/duckdb-bench/build.rs
diff --git a/benchmarks/duckdb-bench/src/lib.rs b/benchmarks/duckdb-bench/src/lib.rs
@@ -119,7 +119,7 @@ impl DuckClient {
 
     pub fn new_in_memory() -> Result<Self> {
         let dir = std::env::temp_dir()
-            .join("vortex-ddb-bench")
+            .join("vortex-duckdb-bench")
             .join("in-memory");
         std::fs::create_dir_all(&dir)?;
         let db_path = dir.join("duckdb.db");
diff --git a/benchmarks/duckdb-bench/src/main.rs b/benchmarks/duckdb-bench/src/main.rs
@@ -7,7 +7,7 @@ use std::path::PathBuf;
 
 use clap::Parser;
 use clap::value_parser;
-use ddb_bench::DuckClient;
+use duckdb_bench::DuckClient;
 use tokio::runtime::Runtime;
 use vortex_bench::BenchmarkArg;
 use vortex_bench::CompactionStrategy;
diff --git a/benchmarks/duckdb-bench/src/validation.rs b/benchmarks/duckdb-bench/src/validation.rs
@@ -8,7 +8,7 @@ use std::fs;
 use std::path::Path;
 use std::path::PathBuf;
 
-use ddb_bench::DuckClient;
+use duckdb_bench::DuckClient;
 use similar::ChangeTag;
 use similar::TextDiff;
 use vortex_bench::Format;
diff --git a/vortex-bench/src/benchmark.rs b/vortex-bench/src/benchmark.rs
@@ -36,7 +36,7 @@ pub trait Benchmark: Send + Sync {
     /// This is the canonical source data that can be converted to other formats.
     /// This should be idempotent - safe to call multiple times.
     ///
-    /// Format-specific benchmark binaries (like lance-bench, df-bench, ddb-bench) should
+    /// Format-specific benchmark binaries (like lance-bench, datafusion-bench, duckdb-bench) should
     /// call this method to ensure base data exists, then perform their own format conversion.
     async fn generate_base_data(&self) -> anyhow::Result<()>;
 
diff --git a/vortex-bench/src/bin/data-gen.rs b/vortex-bench/src/bin/data-gen.rs
@@ -4,7 +4,7 @@
 //! Benchmark data generation binary.
 //!
 //! This binary generates benchmark data for all formats needed, consolidating
-//! data generation that was previously duplicated across df-bench and ddb-bench.
+//! data generation that was previously duplicated across datafusion-bench and duckdb-bench.
 
 use std::path::Path;
 use std::process::Command;
