Skip to content

Commit 5c70d76

Browse files
committed
Remove Arrow engine
Signed-off-by: Adam Gutglick <adam@spiraldb.com>
1 parent b99d87c commit 5c70d76

5 files changed

Lines changed: 9 additions & 27 deletions

File tree

benchmarks/random-access-bench/src/main.rs

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -269,7 +269,7 @@ async fn benchmark_random_access(
269269
let timing = TimingMeasurement {
270270
name: measurement_name.to_string(),
271271
storage: storage.to_string(),
272-
target: Target::new(format_to_engine(format), format),
272+
target: Target::new(Engine::default(), format),
273273
runs,
274274
};
275275
Ok(RandomAccessRun {
@@ -326,17 +326,6 @@ fn push_v3_random_access_record(records: &mut Vec<v3::V3Record>, run: &RandomAcc
326326
records.push(v3::random_access_record(&run.timing, &dataset));
327327
}
328328

329-
/// Map format to the appropriate engine for random access benchmarks.
330-
fn format_to_engine(format: Format) -> Engine {
331-
match format {
332-
Format::OnDiskVortex | Format::VortexCompact => Engine::Vortex,
333-
Format::Parquet => Engine::Arrow,
334-
#[cfg(feature = "lance")]
335-
Format::Lance => Engine::Arrow, // Is this right here?
336-
_ => Engine::default(),
337-
}
338-
}
339-
340329
/// Open a random accessor for any supported format.
341330
///
342331
/// For Vortex and Parquet, the path comes from [`BenchDataset::path`].
@@ -528,7 +517,7 @@ mod tests {
528517
RandomAccessRun {
529518
timing: TimingMeasurement {
530519
name: format!("random-access/{dataset}/parquet-tokio-local-disk"),
531-
target: Target::new(Engine::Arrow, Format::Parquet),
520+
target: Target::new(Engine::Vortex, Format::Parquet),
532521
storage: STORAGE_NVME.to_string(),
533522
runs: vec![Duration::from_nanos(10)],
534523
},

benchmarks/random-access-bench/src/render.rs

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ mod tests {
198198
RandomAccessRun {
199199
timing: TimingMeasurement {
200200
name: format!("random-access/{dataset}/{}-tokio-local-disk", format.ext()),
201-
target: Target::new(Engine::Arrow, format),
201+
target: Target::new(Engine::Vortex, format),
202202
storage: "nvme".to_string(),
203203
runs: vec![Duration::from_micros(micros)],
204204
},
@@ -273,10 +273,6 @@ mod tests {
273273
rendered.contains("vortex-cached") && rendered.contains("vortex-reopen"),
274274
"expected ext-based column headers, got:\n{rendered}"
275275
);
276-
assert!(
277-
!rendered.contains("arrow"),
278-
"expected no engine header row, got:\n{rendered}"
279-
);
280276
assert!(
281277
rendered.contains("random-access/taxi")
282278
&& rendered.contains("random-access/taxi/uniform"),

vortex-bench/src/lib.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,6 @@ impl Format {
214214
pub enum Engine {
215215
#[default]
216216
Vortex,
217-
Arrow,
218217
#[clap(name = "datafusion")]
219218
#[serde(rename = "datafusion")]
220219
DataFusion,
@@ -229,7 +228,6 @@ impl Display for Engine {
229228
Engine::DataFusion => write!(f, "datafusion"),
230229
Engine::DuckDB => write!(f, "duckdb"),
231230
Engine::Vortex => write!(f, "vortex"),
232-
Engine::Arrow => write!(f, "arrow"),
233231
}
234232
}
235233
}

vortex-bench/src/measurements.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -352,8 +352,8 @@ impl ToJson for CompressionTimingMeasurement {
352352
fn to_json(&self) -> serde_json::Value {
353353
let (name, engine) = match self.format {
354354
Format::OnDiskVortex => (self.name.to_string(), Engine::Vortex),
355-
Format::Parquet => (format!("parquet_rs-zstd {}", self.name), Engine::Arrow),
356-
Format::Lance => (format!("lance {}", self.name), Engine::Arrow),
355+
Format::Parquet => (format!("parquet_rs-zstd {}", self.name), Engine::Vortex),
356+
Format::Lance => (format!("lance {}", self.name), Engine::Vortex),
357357
_ => vortex_panic!(
358358
"CompressionTimingMeasurement only supports vortex, lance, and parquet formats"
359359
),
@@ -397,8 +397,8 @@ impl ToJson for CustomUnitMeasurement {
397397
fn to_json(&self) -> serde_json::Value {
398398
let engine = match self.format {
399399
Format::OnDiskVortex | Format::VortexCompact => Engine::Vortex,
400-
Format::Parquet => Engine::Arrow,
401-
Format::Lance => Engine::Arrow,
400+
Format::Parquet => Engine::Vortex,
401+
Format::Lance => Engine::Vortex,
402402
_ => Engine::Vortex, // Default to Vortex for other formats.
403403
};
404404

vortex-bench/src/v3.rs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ pub struct QueryMeasurementRecord {
141141
pub query_idx: u32,
142142
/// Storage backend the run targeted (`nvme` or `s3`).
143143
pub storage: String,
144-
/// Query engine (`datafusion`, `duckdb`, `vortex`, `arrow`).
144+
/// Query engine (`datafusion`, `duckdb`, `vortex`).
145145
pub engine: String,
146146
/// On-disk format (`parquet`, `vortex-file-compressed`, `lance`, ...).
147147
pub format: String,
@@ -519,7 +519,6 @@ fn duration_as_ns(d: std::time::Duration) -> u64 {
519519
fn engine_label(engine: Engine) -> &'static str {
520520
match engine {
521521
Engine::Vortex => "vortex",
522-
Engine::Arrow => "arrow",
523522
Engine::DataFusion => "datafusion",
524523
Engine::DuckDB => "duckdb",
525524
}
@@ -663,7 +662,7 @@ mod tests {
663662
fn snapshot_random_access_time() -> anyhow::Result<()> {
664663
let timing = TimingMeasurement {
665664
name: "random-access/taxi/uniform/parquet-tokio-local-disk".to_string(),
666-
target: Target::new(Engine::Arrow, Format::Parquet),
665+
target: Target::new(Engine::Vortex, Format::Parquet),
667666
storage: "nvme".to_string(),
668667
runs: vec![
669668
Duration::from_nanos(800_000),

0 commit comments

Comments
 (0)