From 968afb926ddc7615a09378cb2a5a1104fb5a5ff3 Mon Sep 17 00:00:00 2001 From: "Douglas B. Rumbaugh" Date: Mon, 23 Dec 2024 15:27:19 -0500 Subject: Fixed the reversed scale factor and buffer size on benchmarks --- .gitignore | 3 +++ CMakeLists.txt | 2 +- benchmarks/include/standard_benchmarks.h | 1 + benchmarks/vldb/irs_bench.cpp | 2 +- benchmarks/vldb/pgm_bench.cpp | 2 +- benchmarks/vldb/ts_bench.cpp | 2 +- benchmarks/vldb/ts_bsm_bench.cpp | 2 +- benchmarks/vldb/vptree_bench.cpp | 2 +- benchmarks/vldb/vptree_bench_alt.cpp | 2 +- benchmarks/vldb/vptree_bsm_bench.cpp | 2 +- benchmarks/vldb/vptree_bsm_bench_alt.cpp | 2 +- 11 files changed, 13 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index 5b0656b..cb46256 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,6 @@ data tests/data .vscode + +data/* +queries/* diff --git a/CMakeLists.txt b/CMakeLists.txt index b947860..3dac001 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -9,7 +9,7 @@ set(CMAKE_CXX_STANDARD_REQUIRED True) set(namespace "de") project("Practical Dynamic Extension" VERSION 0.1.0) -set(debug true) +set(debug false) set(tests True) set(bench false) set(vldb_bench true) diff --git a/benchmarks/include/standard_benchmarks.h b/benchmarks/include/standard_benchmarks.h index dfa6513..66911f3 100644 --- a/benchmarks/include/standard_benchmarks.h +++ b/benchmarks/include/standard_benchmarks.h @@ -179,6 +179,7 @@ static void insert_records(DE *structure, size_t start, size_t stop, delete_idx++; g_deleted_records++; } + psudb::progress_update((double) i / (double)(stop - start), "Insert Progress"); } psudb::progress_update(1, "Insert Progress"); diff --git a/benchmarks/vldb/irs_bench.cpp b/benchmarks/vldb/irs_bench.cpp index 7cbccd1..fc18b52 100644 --- a/benchmarks/vldb/irs_bench.cpp +++ b/benchmarks/vldb/irs_bench.cpp @@ -37,7 +37,7 @@ int main(int argc, char **argv) { std::string d_fname = std::string(argv[2]); std::string q_fname = std::string(argv[3]); - auto policy = get_policy(12000, 8); + auto policy = get_policy(8, 12000); auto extension = new Ext(policy, 12000); gsl_rng * rng = gsl_rng_alloc(gsl_rng_mt19937); diff --git a/benchmarks/vldb/pgm_bench.cpp b/benchmarks/vldb/pgm_bench.cpp index b5f9206..cd0b984 100644 --- a/benchmarks/vldb/pgm_bench.cpp +++ b/benchmarks/vldb/pgm_bench.cpp @@ -39,7 +39,7 @@ int main(int argc, char **argv) { std::string d_fname = std::string(argv[2]); std::string q_fname = std::string(argv[3]); - auto policy = get_policy(12000, 8); + auto policy = get_policy(8, 12000); auto extension = new Ext(policy, 12000); gsl_rng * rng = gsl_rng_alloc(gsl_rng_mt19937); diff --git a/benchmarks/vldb/ts_bench.cpp b/benchmarks/vldb/ts_bench.cpp index 61d813c..8b0ee35 100644 --- a/benchmarks/vldb/ts_bench.cpp +++ b/benchmarks/vldb/ts_bench.cpp @@ -40,7 +40,7 @@ int main(int argc, char **argv) { std::string d_fname = std::string(argv[2]); std::string q_fname = std::string(argv[3]); - auto policy = get_policy(8000, 8); + auto policy = get_policy(8, 8000); auto extension = new Ext(policy, 8000); gsl_rng * rng = gsl_rng_alloc(gsl_rng_mt19937); diff --git a/benchmarks/vldb/ts_bsm_bench.cpp b/benchmarks/vldb/ts_bsm_bench.cpp index f5ad931..01ff0f1 100644 --- a/benchmarks/vldb/ts_bsm_bench.cpp +++ b/benchmarks/vldb/ts_bsm_bench.cpp @@ -40,7 +40,7 @@ int main(int argc, char **argv) { std::string d_fname = std::string(argv[2]); std::string q_fname = std::string(argv[3]); - auto policy = get_policy(1, 2, 3); + auto policy = get_policy(2, 1, 3); auto extension = new Ext(policy, 1); gsl_rng * rng = gsl_rng_alloc(gsl_rng_mt19937); diff --git a/benchmarks/vldb/vptree_bench.cpp b/benchmarks/vldb/vptree_bench.cpp index b75b5c2..1e4df2e 100644 --- a/benchmarks/vldb/vptree_bench.cpp +++ b/benchmarks/vldb/vptree_bench.cpp @@ -38,7 +38,7 @@ int main(int argc, char **argv) { std::string d_fname = std::string(argv[2]); std::string q_fname = std::string(argv[3]); - auto policy = get_policy(1400, 8); + auto policy = get_policy(8, 1400); auto extension = new Ext(policy, 1400); gsl_rng * rng = gsl_rng_alloc(gsl_rng_mt19937); diff --git a/benchmarks/vldb/vptree_bench_alt.cpp b/benchmarks/vldb/vptree_bench_alt.cpp index 05c9720..43614f1 100644 --- a/benchmarks/vldb/vptree_bench_alt.cpp +++ b/benchmarks/vldb/vptree_bench_alt.cpp @@ -38,7 +38,7 @@ int main(int argc, char **argv) { std::string d_fname = std::string(argv[2]); std::string q_fname = std::string(argv[3]); - auto policy = get_policy(1400, 8); + auto policy = get_policy(8, 1400); auto extension = new Ext(policy, 1400); gsl_rng * rng = gsl_rng_alloc(gsl_rng_mt19937); diff --git a/benchmarks/vldb/vptree_bsm_bench.cpp b/benchmarks/vldb/vptree_bsm_bench.cpp index d366c46..77c6933 100644 --- a/benchmarks/vldb/vptree_bsm_bench.cpp +++ b/benchmarks/vldb/vptree_bsm_bench.cpp @@ -39,7 +39,7 @@ int main(int argc, char **argv) { std::string d_fname = std::string(argv[2]); std::string q_fname = std::string(argv[3]); - auto policy = get_policy(1, 2, 3); + auto policy = get_policy(2, 1, 3); auto extension = new Ext(policy, 1, 0, 64); gsl_rng * rng = gsl_rng_alloc(gsl_rng_mt19937); diff --git a/benchmarks/vldb/vptree_bsm_bench_alt.cpp b/benchmarks/vldb/vptree_bsm_bench_alt.cpp index cf79447..05619a6 100644 --- a/benchmarks/vldb/vptree_bsm_bench_alt.cpp +++ b/benchmarks/vldb/vptree_bsm_bench_alt.cpp @@ -38,7 +38,7 @@ int main(int argc, char **argv) { std::string d_fname = std::string(argv[2]); std::string q_fname = std::string(argv[3]); - auto policy = get_policy(1, 2, 3); + auto policy = get_policy(2, 1, 3); auto extension = new Ext(policy, 1); gsl_rng * rng = gsl_rng_alloc(gsl_rng_mt19937); -- cgit v1.2.3