Skip to content

Commit 64e10f8

Browse files
committed
convert TPC-H to use Utf8View
1 parent 483dc8c commit 64e10f8

8 files changed

Lines changed: 120 additions & 119 deletions

File tree

Cargo.lock

Lines changed: 9 additions & 59 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 32 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -35,15 +35,15 @@ rust-version = "1.76"
3535
ahash = "0.8.11"
3636
allocator-api2 = "0.2.16"
3737
arrayref = "0.3.7"
38-
arrow = { version = "52.0.0", features = ["pyarrow"] }
39-
arrow-array = "52.0.0"
40-
arrow-buffer = "52.0.0"
41-
arrow-cast = "52.0.0"
42-
arrow-csv = "52.0.0"
43-
arrow-data = "52.0.0"
44-
arrow-ipc = "52.0.0"
45-
arrow-schema = "52.0.0"
46-
arrow-select = "52.0.0"
38+
arrow = { version = "52.1.0", features = ["pyarrow"] }
39+
arrow-array = "52.1.0"
40+
arrow-buffer = "52.1.0"
41+
arrow-cast = "52.1.0"
42+
arrow-csv = "52.1.0"
43+
arrow-data = "52.1.0"
44+
arrow-ipc = "52.1.0"
45+
arrow-schema = "52.1.0"
46+
arrow-select = "52.1.0"
4747
async-trait = "0.1"
4848
bindgen = "0.69.4"
4949
bytes = "1.6.0"
@@ -53,12 +53,14 @@ criterion = { version = "0.5.1", features = ["html_reports"] }
5353
croaring = "2.0.0"
5454
csv = "1.3.0"
5555
object_store = "0.10.1"
56-
datafusion = "40.0.0"
57-
datafusion-common = "40.0.0"
58-
datafusion-execution = "40.0.0"
59-
datafusion-expr = "40.0.0"
60-
datafusion-physical-expr = "40.0.0"
61-
datafusion-physical-plan = "40.0.0"
56+
57+
datafusion = { path = "/Volumes/Code/datafusion/datafusion/core" }
58+
datafusion-common = { path = "/Volumes/Code/datafusion/datafusion/common" }
59+
datafusion-execution = { path = "/Volumes/Code/datafusion/datafusion/execution" }
60+
datafusion-expr = { path = "/Volumes/Code/datafusion/datafusion/expr" }
61+
datafusion-physical-expr = { path = "/Volumes/Code/datafusion/datafusion/physical-expr" }
62+
datafusion-physical-plan = { path = "/Volumes/Code/datafusion/datafusion/physical-plan" }
63+
6264
divan = "0.1.14"
6365
duckdb = "1.0.0"
6466
enum-iterator = "2.0.0"
@@ -115,3 +117,18 @@ warnings = "deny"
115117
[workspace.lints.clippy]
116118
all = { level = "deny", priority = -1 }
117119
or_fun_call = "deny"
120+
121+
[patch.crates-io]
122+
arrow = { path = "/Volumes/Code/arrow-rs/arrow" }
123+
arrow-array = { path = "/Volumes/Code/arrow-rs/arrow-array" }
124+
arrow-buffer = { path = "/Volumes/Code/arrow-rs/arrow-buffer" }
125+
arrow-cast = { path = "/Volumes/Code/arrow-rs/arrow-cast" }
126+
arrow-csv = { path = "/Volumes/Code/arrow-rs/arrow-csv" }
127+
arrow-data = { path = "/Volumes/Code/arrow-rs/arrow-data" }
128+
arrow-ipc = { path = "/Volumes/Code/arrow-rs/arrow-ipc" }
129+
arrow-schema = { path = "/Volumes/Code/arrow-rs/arrow-schema" }
130+
arrow-select = { path = "/Volumes/Code/arrow-rs/arrow-select" }
131+
arrow-string = { path = "/Volumes/Code/arrow-rs/arrow-string" }
132+
arrow-ord = { path = "/Volumes/Code/arrow-rs/arrow-ord" }
133+
arrow-flight = { path = "/Volumes/Code/arrow-rs/arrow-flight" }
134+
parquet = { path = "/Volumes/Code/arrow-rs/parquet" }

bench-vortex/src/bin/tpch_benchmark.rs

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,13 @@ async fn main() {
1919
// The formats to run against (vs the baseline)
2020
let formats = [
2121
Format::Arrow,
22-
Format::Parquet,
23-
Format::Vortex {
24-
disable_pushdown: false,
25-
},
26-
Format::Vortex {
27-
disable_pushdown: true,
28-
},
22+
// Format::Parquet,
23+
// Format::Vortex {
24+
// disable_pushdown: false,
25+
// },
26+
// Format::Vortex {
27+
// disable_pushdown: true,
28+
// },
2929
];
3030

3131
// Load datasets
@@ -53,8 +53,8 @@ async fn main() {
5353
// Send back a channel with the results of Row.
5454
let (rows_tx, rows_rx) = sync::mpsc::channel();
5555
for i in 1..=22 {
56-
if i == 15 {
57-
continue;
56+
if vec![2, 7, 8, 9, 10, 15, 18, 21].contains(&i) {
57+
continue
5858
}
5959
let _ctxs = ctxs.clone();
6060
let _tx = rows_tx.clone();
@@ -123,6 +123,7 @@ async fn main() {
123123
.push(Cell::new(&format!("{} us", measure.as_micros())).style_spec(style_spec));
124124
}
125125

126+
println!("QUERY {i} complete");
126127
_tx.send((i, Row::new(cells))).unwrap();
127128
});
128129
}

0 commit comments

Comments
 (0)