Skip to content

Commit bbf0fe8

Browse files
committed
fix?
1 parent e5408bd commit bbf0fe8

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

.github/workflows/sql-benchmarks.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,6 @@ jobs:
246246
OTEL_EXPORTER_OTLP_ENDPOINT: "${{ (inputs.mode != 'pr' || github.event.pull_request.head.repo.fork == false) && secrets.OTEL_EXPORTER_OTLP_ENDPOINT || '' }}"
247247
OTEL_EXPORTER_OTLP_HEADERS: "${{ (inputs.mode != 'pr' || github.event.pull_request.head.repo.fork == false) && secrets.OTEL_EXPORTER_OTLP_HEADERS || '' }}"
248248
OTEL_RESOURCE_ATTRIBUTES: "bench-name=${{ matrix.id }}"
249-
RUST_LOG: "RUST_LOG=debug,vortex_io=off,hyper=off,datafusion=info,sqlparser=off"
250249
run: |
251250
# Extract formats for each engine
252251
df_formats=$(echo "${{ matrix.targets }}" | tr ',' '\n' | grep '^datafusion:' | sed 's/datafusion://' | tr '\n' ',' | sed 's/,$//')

benchmarks/ddb-bench/src/lib.rs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ use std::time::Instant;
99

1010
use anyhow::Result;
1111
use tracing::trace;
12-
use url::Url;
1312
use vortex::error::VortexExpect;
1413
use vortex_bench::Benchmark;
1514
use vortex_bench::Format;
15+
use vortex_bench::IdempotentPath;
1616
use vortex_bench::generate_duckdb_registration_sql;
1717
use vortex_duckdb::duckdb::Config;
1818
use vortex_duckdb::duckdb::Connection;
@@ -30,17 +30,18 @@ pub struct DuckClient {
3030
impl DuckClient {
3131
/// Create a new DuckDB context with a database at `{data_url}/{format}/duckdb.db`.
3232
pub fn new(
33-
data_url: &Url,
33+
benchmark: &dyn Benchmark,
3434
format: Format,
3535
delete_database: bool,
3636
threads: Option<usize>,
3737
) -> Result<Self> {
38+
let data_url = benchmark.data_url();
3839
let base_path = if data_url.scheme() == "file" {
3940
data_url
4041
.to_file_path()
4142
.map_err(|_| anyhow::anyhow!("Invalid file URL: {}", data_url))?
4243
} else {
43-
std::env::temp_dir().join("vortex-ddb-bench")
44+
format!("{name}/{format}/", name = benchmark.dataset_name()).to_data_path()
4445
};
4546
let dir = base_path.join(format.name());
4647
std::fs::create_dir_all(&dir)?;

benchmarks/ddb-bench/src/main.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ async fn main() -> anyhow::Result<()> {
120120
args.iterations,
121121
|format| {
122122
let ctx = DuckClient::new(
123-
benchmark.data_url(),
123+
&*benchmark,
124124
format,
125125
args.delete_duckdb_database,
126126
args.threads,

0 commit comments

Comments
 (0)