Skip to content

Commit 8ba5f27

Browse files
authored
fix: Move bench bucket to eu (#2615)
1 parent 76bc8eb commit 8ba5f27

File tree

5 files changed

+11
-10
lines changed

5 files changed

+11
-10
lines changed

.github/workflows/generate-tpch-s3.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
- self-hosted
2121
- aws
2222
env:
23-
REMOTE_PATH: s3://vortex-bench-dev/tpch-sf1/
23+
REMOTE_PATH: s3://vortex-bench-dev-eu/tpch-sf1/
2424
TMPDIR: /work
2525
steps:
2626
- uses: actions/checkout@v4

.github/workflows/sql-benchmarks.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
- id: tpch-s3
2525
binary_name: tpch
2626
name: TPC-H on S3
27-
remote_storage: s3://vortex-bench-dev/tpch-sf1/
27+
remote_storage: s3://vortex-bench-dev-eu/tpch-sf1/
2828
runs-on:
2929
- runs-on=${{ github.run_id }}
3030
- family=c7i.8xlarge
@@ -61,6 +61,7 @@ jobs:
6161
shell: bash
6262
env:
6363
RUSTFLAGS: '-C target-cpu=native'
64+
AWS_REGION: 'eu-west-1'
6465
OTEL_SERVICE_NAME: 'vortex-bench'
6566
OTEL_EXPORTER_OTLP_PROTOCOL: 'http/protobuf'
6667
OTEL_EXPORTER_OTLP_ENDPOINT: '${{ secrets.OTEL_EXPORTER_OTLP_ENDPOINT }}'

bench-vortex/src/bin/tpch.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -135,14 +135,14 @@ fn main() -> ExitCode {
135135
.unwrap()
136136
}
137137
Some(tpch_benchmark_remote_data_dir) => {
138-
// e.g. "s3://vortex-bench-dev/parquet/"
138+
// e.g. "s3://vortex-bench-dev-eu/parquet/"
139139
//
140140
// The trailing slash is significant!
141141
//
142142
// The folder must already be populated with data!
143143
if !tpch_benchmark_remote_data_dir.ends_with("/") {
144144
warn!(
145-
"Supply a --use-remote-data-dir argument which ends in a slash e.g. s3://vortex-bench-dev/parquet/"
145+
"Supply a --use-remote-data-dir argument which ends in a slash e.g. s3://vortex-bench-dev-eu/parquet/"
146146
);
147147
}
148148
info!(

bench-vortex/src/tpch/mod.rs

+5-4
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ use datafusion::datasource::listing::{
1212
};
1313
use datafusion::prelude::{CsvReadOptions, ParquetReadOptions, SessionContext};
1414
use futures::StreamExt;
15+
use log::info;
1516
use named_locks::with_lock;
1617
use object_store::ObjectStore;
1718
use object_store::aws::AmazonS3Builder;
@@ -236,11 +237,11 @@ async fn register_parquet(
236237
let mut pq_file = file.clone();
237238
pq_file.set_path(&pq_file.path().to_owned().replace(".tbl", ".parquet"));
238239

239-
if object_store
240+
if let Err(e) = object_store
240241
.head(&ObjectStorePath::parse(pq_file.path())?)
241242
.await
242-
.is_err()
243243
{
244+
info!("File {} doesn't exist because {e}", pq_file);
244245
with_lock(pq_file.path().to_owned(), async || {
245246
let df = session
246247
.read_csv(
@@ -304,11 +305,11 @@ async fn register_vortex_file(
304305

305306
let vtx_file = &vortex_dir.join(vortex_basename.as_ref())?;
306307

307-
if object_store
308+
if let Err(e) = object_store
308309
.head(&ObjectStorePath::parse(vtx_file.path())?)
309310
.await
310-
.is_err()
311311
{
312+
info!("File {} doesn't exist because {e}", vtx_file);
312313
with_lock(vtx_file.path().to_owned(), async || {
313314
let record_batches = session
314315
.read_csv(

deny.toml

+1-2
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,7 @@ feature-depth = 1
1111

1212

1313
[advisories]
14-
# ring is unmaintained: https://github.com/briansmith/ring/discussions/2414
15-
ignore = ["RUSTSEC-2025-0007"]
14+
ignore = ["RUSTSEC-2025-0009"]
1615

1716
[licenses]
1817
# List of explicitly allowed licenses

0 commit comments

Comments
 (0)