Skip to content

Commit dcc482b

Browse files
authored
Remove tpch xtask (#2493)
Taking a dependency on bench-vortex means we cannot regenerate flatbuffers unless Vortex compiles. Which makes the workflow really annoying. Running the benchmarks already regenerates the data, may as well just use that.
1 parent b71412d commit dcc482b

File tree

3 files changed

+1
-62
lines changed

3 files changed

+1
-62
lines changed

Cargo.lock

-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

xtask/Cargo.toml

+1-4
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,9 @@ readme = "README.md"
1717

1818
[dependencies]
1919
anyhow = { workspace = true }
20-
clap = { workspace = true }
20+
clap = { workspace = true, features = ["derive"] }
2121
prost-build = { workspace = true }
2222
xshell = { workspace = true }
23-
bench-vortex = { path = "../bench-vortex" }
24-
tokio = { workspace = true }
25-
url = { workspace = true }
2623

2724
[lints]
2825
workspace = true

xtask/src/main.rs

-55
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,4 @@
1-
use std::path::PathBuf;
2-
3-
use bench_vortex::tpch::duckdb::{generate_tpch, DuckdbTpchOptions};
4-
use bench_vortex::tpch::load_datasets;
5-
use bench_vortex::Format;
61
use clap::Parser;
7-
use tokio::runtime::Builder;
8-
use url::Url;
92
use xshell::{cmd, Shell};
103

114
static FLATC_BIN: &str = "flatc";
@@ -22,15 +15,6 @@ enum Commands {
2215
GenerateFlatbuffers,
2316
#[command(name = "generate-proto")]
2417
GenerateProto,
25-
#[command(name = "generate-tpch-csvs")]
26-
GenerateTpchCsvs {
27-
scale_factor: Option<u8>,
28-
output_dir: Option<PathBuf>,
29-
},
30-
#[command(name = "tpch-csv-to-parquet")]
31-
TpchCsvToParquet { base_dir: Option<PathBuf> },
32-
#[command(name = "tpch-csv-to-vortex")]
33-
TpchCsvToVortex { base_dir: Option<PathBuf> },
3418
}
3519

3620
fn execute_generate_fbs() -> anyhow::Result<()> {
@@ -80,50 +64,11 @@ fn execute_generate_proto() -> anyhow::Result<()> {
8064
Ok(())
8165
}
8266

83-
fn execute_generate_tpch_csv(
84-
scale_factor: Option<u8>,
85-
base_dir: Option<PathBuf>,
86-
) -> anyhow::Result<()> {
87-
let default = DuckdbTpchOptions::default();
88-
let conf = DuckdbTpchOptions {
89-
scale_factor: scale_factor.unwrap_or(default.scale_factor),
90-
base_dir: base_dir.unwrap_or(default.base_dir),
91-
};
92-
generate_tpch(conf)?;
93-
Ok(())
94-
}
95-
96-
fn execute_from_tpch_csv(base_dir: Option<PathBuf>, format: Format) -> anyhow::Result<()> {
97-
let runtime = Builder::new_multi_thread().enable_all().build()?;
98-
let base_dir = base_dir.unwrap_or_else(|| DuckdbTpchOptions::default().csvs_dir());
99-
// add a trailing slash to bse_dir so path concat works as expected
100-
let base_url = Url::parse(
101-
("file:".to_owned()
102-
+ base_dir
103-
.to_str()
104-
.ok_or_else(|| anyhow::anyhow!("must be utf8"))?
105-
+ "/")
106-
.as_ref(),
107-
)?;
108-
runtime.block_on(load_datasets(&base_url, format, false))?;
109-
Ok(())
110-
}
111-
11267
fn main() -> anyhow::Result<()> {
11368
let cli = Xtask::parse();
11469
match cli.command {
11570
Commands::GenerateFlatbuffers => execute_generate_fbs()?,
11671
Commands::GenerateProto => execute_generate_proto()?,
117-
Commands::GenerateTpchCsvs {
118-
scale_factor,
119-
output_dir,
120-
} => execute_generate_tpch_csv(scale_factor, output_dir)?,
121-
Commands::TpchCsvToParquet { base_dir } => {
122-
execute_from_tpch_csv(base_dir, Format::Parquet)?
123-
}
124-
Commands::TpchCsvToVortex { base_dir } => {
125-
execute_from_tpch_csv(base_dir, Format::OnDiskVortex)?
126-
}
12772
}
12873
Ok(())
12974
}

0 commit comments

Comments
 (0)