Skip to content

Commit

Permalink
Remove our special duckdb installing (#73)
Browse files Browse the repository at this point in the history
  • Loading branch information
jonkeane authored Jun 1, 2022
1 parent ea4f403 commit 9b4521e
Show file tree
Hide file tree
Showing 4 changed files with 0 additions and 18 deletions.
1 change: 0 additions & 1 deletion buildkite/benchmark/run.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@
"Python": ["create_data_dir"],
"R": [
"build_arrow_r",
"install_duckdb_r_with_tpch",
"install_arrowbench",
"create_data_dir",
],
Expand Down
15 changes: 0 additions & 15 deletions buildkite/benchmark/utils.sh
Original file line number Diff line number Diff line change
Expand Up @@ -106,21 +106,6 @@ install_arrowbench() {
R -e "remotes::install_local('./arrowbench')"
}

install_duckdb_r_with_tpch() {
git clone https://github.com/duckdb/duckdb.git

# now fetch the latest tag to install
cd duckdb
git fetch --tags
latestTag=$(git describe --tags `git rev-list --tags --max-count=1`)
git checkout $latestTag

# and then do the install
cd tools/rpkg
R -e "remotes::install_deps()"
DUCKDB_R_EXTENSIONS=tpch R CMD INSTALL .
}

install_java_script_project_dependencies() {
pushd $REPO_DIR
source dev/conbench_envs/hooks.sh install_java_script_project_dependencies
Expand Down
1 change: 0 additions & 1 deletion docs/how-to-add-new-benchmarkable-repo.md
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@ Examples of `benchmarks.json` in repos with benchmarks integrated with Conbench:
"setup_commands_for_lang_benchmarks": {
"R": [
"build_arrow_r",
"install_duckdb_r_with_tpch",
"install_arrowbench",
"create_data_dir",
]
Expand Down
1 change: 0 additions & 1 deletion tests/buildkite/benchmark/test_run_benchmarks.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@

expected_setup_commands_for_r_benchmarks = [
("source buildkite/benchmark/utils.sh build_arrow_r", ".", True),
("source buildkite/benchmark/utils.sh install_duckdb_r_with_tpch", ".", True),
("source buildkite/benchmark/utils.sh install_arrowbench", ".", True),
("source buildkite/benchmark/utils.sh create_data_dir", ".", True),
]
Expand Down

0 comments on commit 9b4521e

Please sign in to comment.