From 9fe305c7d28e993e55c55427f377ae7e3251ea4f Mon Sep 17 00:00:00 2001 From: "Douglas B. Rumbaugh" Date: Fri, 6 Dec 2024 13:13:51 -0500 Subject: Interface update (#5) * Query Interface Adjustments/Refactoring Began the process of adjusting the query interface (and also the shard interface, to a lesser degree) to better accommodate the user. In particular the following changes have been made, 1. The number of necessary template arguments for the query type has been drastically reduced, while also removing the void pointers and manual delete functions from the interface. This was accomplished by requiring many of the sub-types associated with a query (parameters, etc.) to be nested inside the main query class, and by forcing the SHARD type to expose its associated record type. 2. User-defined query return types are now supported. Queries no longer are required to return strictly sets of records. Instead, the query now has LocalResultType and ResultType template parameters (which can be defaulted using a typedef in the Query type itself), allowing much more flexibility. Note that, at least for the short term, the LocalResultType must still expose the same is_deleted/is_tombstone interface as a Wrapped used to, as this is currently needed for delete filtering. A better approach to this is, hopefully, forthcoming. 3. Updated the ISAMTree.h shard and rangequery.h query to use the new interfaces, and adjusted the associated unit tests as well. 4. Dropped the unnecessary "get_data()" function from the ShardInterface concept. 5. Dropped the need to specify a record type in the ShardInterface concept. This is now handled using a required Shard::RECORD member of the Shard class itself, which should expose the name of the record type. * Updates to framework to support new Query/Shard interfaces Pretty extensive adjustments to the framework, particularly to the templates themselves, along with some type-renaming work, to support the new query and shard interfaces. Adjusted the external query interface to take an rvalue reference, rather than a pointer, to the query parameters. * Removed framework-level delete filtering This was causing some issues with the new query interface, and should probably be reworked anyway, so I'm temporarily (TM) removing the feature. * Updated benchmarks + remaining code for new interface --- benchmarks/vldb/alex_bench.cpp | 1 - benchmarks/vldb/btree_bench.cpp | 6 +-- benchmarks/vldb/btree_thread_scaling_bench.cpp | 7 ++- benchmarks/vldb/dynamic_pgm_bench.cpp | 8 +-- benchmarks/vldb/fst_bench.cpp | 10 ++-- benchmarks/vldb/fst_bsm_bench.cpp | 10 ++-- benchmarks/vldb/irs_bench.cpp | 10 ++-- benchmarks/vldb/mtree_bench.cpp | 7 ++- benchmarks/vldb/mtree_bench_alt.cpp | 7 ++- benchmarks/vldb/pgm_bench.cpp | 10 ++-- benchmarks/vldb/thread_scaling_bench.cpp | 8 +-- benchmarks/vldb/ts_bench.cpp | 10 ++-- benchmarks/vldb/ts_bsm_bench.cpp | 10 ++-- benchmarks/vldb/ts_mdsp_bench.cpp | 70 -------------------------- benchmarks/vldb/ts_parmsweep.cpp | 12 ++--- benchmarks/vldb/vptree_bench.cpp | 10 ++-- benchmarks/vldb/vptree_bench_alt.cpp | 10 ++-- benchmarks/vldb/vptree_bsm_bench.cpp | 11 ++-- benchmarks/vldb/vptree_bsm_bench_alt.cpp | 8 +-- benchmarks/vldb/vptree_parmsweep.cpp | 12 ++--- 20 files changed, 89 insertions(+), 148 deletions(-) delete mode 100644 benchmarks/vldb/ts_mdsp_bench.cpp (limited to 'benchmarks/vldb') diff --git a/benchmarks/vldb/alex_bench.cpp b/benchmarks/vldb/alex_bench.cpp index ba687f3..636f576 100644 --- a/benchmarks/vldb/alex_bench.cpp +++ b/benchmarks/vldb/alex_bench.cpp @@ -33,7 +33,6 @@ static void insert_records(Alex *structure, size_t start, size_t stop, size_t &delete_idx, bool delete_records, gsl_rng *rng) { psudb::progress_update(0, "Insert Progress"); - size_t reccnt = 0; for (size_t i=start; iinsert(records[i].key, records[i].value); diff --git a/benchmarks/vldb/btree_bench.cpp b/benchmarks/vldb/btree_bench.cpp index fa72831..dc5142a 100644 --- a/benchmarks/vldb/btree_bench.cpp +++ b/benchmarks/vldb/btree_bench.cpp @@ -19,8 +19,8 @@ typedef btree_record Rec; typedef de::ISAMTree Shard; -typedef de::irs::Query Q; -typedef de::irs::Parms QP; +typedef de::irs::Query Q; +typedef Q::Parameters QP; void usage(char *progname) { fprintf(stderr, "%s reccnt datafile queryfile\n", progname); @@ -71,7 +71,7 @@ int main(int argc, char **argv) { size_t insert_throughput = (size_t) ((double) (n - warmup) / (double) insert_latency * 1e9); TIMER_START(); - run_btree_queries(&btree, queries); + run_btree_queries(&btree, queries); TIMER_STOP(); auto query_latency = TIMER_RESULT() / queries.size(); diff --git a/benchmarks/vldb/btree_thread_scaling_bench.cpp b/benchmarks/vldb/btree_thread_scaling_bench.cpp index 557e966..d33a1f8 100644 --- a/benchmarks/vldb/btree_thread_scaling_bench.cpp +++ b/benchmarks/vldb/btree_thread_scaling_bench.cpp @@ -7,6 +7,7 @@ #include #include "query/irs.h" +#include "shard/ISAMTree.h" #include "benchmark_types.h" #include "file_util.h" #include @@ -17,7 +18,10 @@ typedef btree_record Rec; -typedef de::irs::Parms QP; + +typedef de::ISAMTree Shard; +typedef de::irs::Query Q; +typedef Q::Parameters QP; std::atomic inserts_done = false; @@ -47,7 +51,6 @@ void query_thread(BenchBTree *tree, std::vector *queries) { } void insert_thread(BenchBTree *tree, size_t start, std::vector *records) { - size_t reccnt = 0; for (size_t i=start; isize(); i++) { btree_record r; r.key = (*records)[i].key; diff --git a/benchmarks/vldb/dynamic_pgm_bench.cpp b/benchmarks/vldb/dynamic_pgm_bench.cpp index 15b130f..9206e40 100644 --- a/benchmarks/vldb/dynamic_pgm_bench.cpp +++ b/benchmarks/vldb/dynamic_pgm_bench.cpp @@ -14,9 +14,11 @@ #include "psu-util/timer.h" - typedef de::Record Rec; -typedef de::rc::Parms QP; + +typedef de::ISAMTree Shard; +typedef de::rc::Query Q; +typedef Q::Parameters QP; void usage(char *progname) { fprintf(stderr, "%s reccnt datafile queryfile\n", progname); @@ -62,7 +64,7 @@ int main(int argc, char **argv) { size_t insert_throughput = (size_t) ((double) (n - warmup) / (double) insert_latency * 1e9); TIMER_START(); - run_queries(&pgm, queries); + run_queries(&pgm, queries); TIMER_STOP(); auto query_latency = TIMER_RESULT() / queries.size(); diff --git a/benchmarks/vldb/fst_bench.cpp b/benchmarks/vldb/fst_bench.cpp index 276a922..e4b5bf6 100644 --- a/benchmarks/vldb/fst_bench.cpp +++ b/benchmarks/vldb/fst_bench.cpp @@ -21,9 +21,9 @@ typedef de::Record Rec; typedef de::FSTrie Shard; -typedef de::pl::Query Q; -typedef de::DynamicExtension Ext; -typedef de::pl::Parms QP; +typedef de::pl::Query Q; +typedef de::DynamicExtension Ext; +typedef Q::Parameters QP; void usage(char *progname) { fprintf(stderr, "%s reccnt datafile\n", progname); @@ -75,7 +75,7 @@ int main(int argc, char **argv) { size_t insert_throughput = (size_t) ((double) (n - warmup) / (double) insert_latency * 1e9); TIMER_START(); - run_queries(extension, queries); + run_queries(extension, queries); TIMER_STOP(); auto query_latency = TIMER_RESULT() / queries.size(); @@ -83,7 +83,7 @@ int main(int argc, char **argv) { auto shard = extension->create_static_structure(); TIMER_START(); - run_static_queries(shard, queries); + run_static_queries(shard, queries); TIMER_STOP(); auto static_latency = TIMER_RESULT() / queries.size(); diff --git a/benchmarks/vldb/fst_bsm_bench.cpp b/benchmarks/vldb/fst_bsm_bench.cpp index 15a441a..b0be115 100644 --- a/benchmarks/vldb/fst_bsm_bench.cpp +++ b/benchmarks/vldb/fst_bsm_bench.cpp @@ -21,9 +21,9 @@ typedef de::Record Rec; typedef de::FSTrie Shard; -typedef de::pl::Query Q; -typedef de::DynamicExtension Ext; -typedef de::pl::Parms QP; +typedef de::pl::Query Q; +typedef de::DynamicExtension Ext; +typedef Q::Parameters QP; void usage(char *progname) { fprintf(stderr, "%s reccnt datafile\n", progname); @@ -75,7 +75,7 @@ int main(int argc, char **argv) { size_t insert_throughput = (size_t) ((double) (n - warmup) / (double) insert_latency * 1e9); TIMER_START(); - run_queries(extension, queries); + run_queries(extension, queries); TIMER_STOP(); auto query_latency = TIMER_RESULT() / queries.size(); @@ -83,7 +83,7 @@ int main(int argc, char **argv) { auto shard = extension->create_static_structure(); TIMER_START(); - run_static_queries(shard, queries); + run_static_queries(shard, queries); TIMER_STOP(); auto static_latency = TIMER_RESULT() / queries.size(); diff --git a/benchmarks/vldb/irs_bench.cpp b/benchmarks/vldb/irs_bench.cpp index e062e80..a772326 100644 --- a/benchmarks/vldb/irs_bench.cpp +++ b/benchmarks/vldb/irs_bench.cpp @@ -18,9 +18,9 @@ typedef de::Record Rec; typedef de::ISAMTree Shard; -typedef de::irs::Query Q; -typedef de::DynamicExtension Ext; -typedef de::irs::Parms QP; +typedef de::irs::Query Q; +typedef de::DynamicExtension Ext; +typedef Q::Parameters QP; void usage(char *progname) { fprintf(stderr, "%s reccnt datafile queryfile\n", progname); @@ -72,7 +72,7 @@ int main(int argc, char **argv) { size_t insert_throughput = (size_t) ((double) (n - warmup) / (double) insert_latency * 1e9); TIMER_START(); - run_queries(extension, queries); + run_queries(extension, queries); TIMER_STOP(); auto query_latency = TIMER_RESULT() / queries.size(); @@ -80,7 +80,7 @@ int main(int argc, char **argv) { auto shard = extension->create_static_structure(); TIMER_START(); - run_static_queries(shard, queries); + run_static_queries(shard, queries); TIMER_STOP(); auto static_latency = TIMER_RESULT() / queries.size(); diff --git a/benchmarks/vldb/mtree_bench.cpp b/benchmarks/vldb/mtree_bench.cpp index cc2f41f..ed107b5 100644 --- a/benchmarks/vldb/mtree_bench.cpp +++ b/benchmarks/vldb/mtree_bench.cpp @@ -5,6 +5,7 @@ #define ENABLE_TIMER #include "query/knn.h" +#include "shard/VPTree.h" #include "file_util.h" #include "standard_benchmarks.h" @@ -14,7 +15,9 @@ typedef Word2VecRec Rec; -typedef de::knn::Parms QP; +typedef de::VPTree Shard; +typedef de::knn::Query Q; +typedef Q::Parameters QP; void usage(char *progname) { fprintf(stderr, "%s reccnt datafile queryfile\n", progname); @@ -66,7 +69,7 @@ int main(int argc, char **argv) { fprintf(stderr, "[I] Running Query Benchmark\n"); TIMER_START(); - run_queries(mtree, queries); + run_queries(mtree, queries); TIMER_STOP(); auto query_latency = TIMER_RESULT() / queries.size(); diff --git a/benchmarks/vldb/mtree_bench_alt.cpp b/benchmarks/vldb/mtree_bench_alt.cpp index 50c6117..c5ab283 100644 --- a/benchmarks/vldb/mtree_bench_alt.cpp +++ b/benchmarks/vldb/mtree_bench_alt.cpp @@ -5,6 +5,7 @@ #define ENABLE_TIMER #include "query/knn.h" +#include "shard/VPTree.h" #include "file_util.h" #include "standard_benchmarks.h" @@ -14,7 +15,9 @@ typedef ANNRec Rec; -typedef de::knn::Parms QP; +typedef de::VPTree Shard; +typedef de::knn::Query Q; +typedef Q::Parameters QP; void usage(char *progname) { fprintf(stderr, "%s reccnt datafile queryfile\n", progname); @@ -66,7 +69,7 @@ int main(int argc, char **argv) { fprintf(stderr, "[I] Running Query Benchmark\n"); TIMER_START(); - run_queries(mtree, queries); + run_queries(mtree, queries); TIMER_STOP(); auto query_latency = TIMER_RESULT() / queries.size(); diff --git a/benchmarks/vldb/pgm_bench.cpp b/benchmarks/vldb/pgm_bench.cpp index cec95df..3b4340b 100644 --- a/benchmarks/vldb/pgm_bench.cpp +++ b/benchmarks/vldb/pgm_bench.cpp @@ -20,9 +20,9 @@ typedef de::Record Rec; typedef de::PGM Shard; -typedef de::rc::Query Q; -typedef de::DynamicExtension Ext; -typedef de::rc::Parms QP; +typedef de::rc::Query Q; +typedef de::DynamicExtension Ext; +typedef Q::Parameters QP; void usage(char *progname) { fprintf(stderr, "%s reccnt datafile queryfile\n", progname); @@ -69,7 +69,7 @@ int main(int argc, char **argv) { size_t insert_throughput = (size_t) ((double) (n - warmup) / (double) insert_latency * 1e9); TIMER_START(); - run_queries(extension, queries); + run_queries(extension, queries); TIMER_STOP(); auto query_latency = TIMER_RESULT() / queries.size(); @@ -77,7 +77,7 @@ int main(int argc, char **argv) { auto shard = extension->create_static_structure(); TIMER_START(); - run_static_queries(shard, queries); + run_static_queries(shard, queries); TIMER_STOP(); auto static_latency = TIMER_RESULT() / queries.size(); diff --git a/benchmarks/vldb/thread_scaling_bench.cpp b/benchmarks/vldb/thread_scaling_bench.cpp index b679e92..3b9311b 100644 --- a/benchmarks/vldb/thread_scaling_bench.cpp +++ b/benchmarks/vldb/thread_scaling_bench.cpp @@ -20,9 +20,9 @@ typedef de::Record Rec; typedef de::ISAMTree ISAM; -typedef de::irs::Query Q; -typedef de::DynamicExtension Ext; -typedef de::irs::Parms QP; +typedef de::irs::Query Q; +typedef de::DynamicExtension Ext; +typedef Q::Parameters QP; std::atomic inserts_done = false; @@ -39,7 +39,7 @@ void query_thread(Ext *extension, std::vector *queries) { q.rng = rng; q.sample_size = 1000; - auto res = extension->query(&q); + auto res = extension->query(std::move(q)); auto r = res.get(); total += r.size(); nanosleep(&delay, nullptr); diff --git a/benchmarks/vldb/ts_bench.cpp b/benchmarks/vldb/ts_bench.cpp index 81a430a..1bc75b6 100644 --- a/benchmarks/vldb/ts_bench.cpp +++ b/benchmarks/vldb/ts_bench.cpp @@ -21,9 +21,9 @@ typedef de::Record Rec; typedef de::TrieSpline Shard; -typedef de::rc::Query Q; -typedef de::DynamicExtension Ext; -typedef de::rc::Parms QP; +typedef de::rc::Query Q; +typedef de::DynamicExtension Ext; +typedef Q::Parameters QP; void usage(char *progname) { fprintf(stderr, "%s reccnt datafile queryfile\n", progname); @@ -70,7 +70,7 @@ int main(int argc, char **argv) { size_t insert_throughput = (size_t) ((double) (n - warmup) / (double) insert_latency * 1e9); TIMER_START(); - run_queries(extension, queries); + run_queries(extension, queries); TIMER_STOP(); auto query_latency = TIMER_RESULT() / queries.size(); @@ -78,7 +78,7 @@ int main(int argc, char **argv) { auto shard = extension->create_static_structure(); TIMER_START(); - run_static_queries(shard, queries); + run_static_queries(shard, queries); TIMER_STOP(); auto static_latency = TIMER_RESULT() / queries.size(); diff --git a/benchmarks/vldb/ts_bsm_bench.cpp b/benchmarks/vldb/ts_bsm_bench.cpp index 4511350..5bcfb5d 100644 --- a/benchmarks/vldb/ts_bsm_bench.cpp +++ b/benchmarks/vldb/ts_bsm_bench.cpp @@ -21,9 +21,9 @@ typedef de::Record Rec; typedef de::TrieSpline Shard; -typedef de::rc::Query Q; -typedef de::DynamicExtension Ext; -typedef de::rc::Parms QP; +typedef de::rc::Query Q; +typedef de::DynamicExtension Ext; +typedef Q::Parameters QP; void usage(char *progname) { fprintf(stderr, "%s reccnt datafile queryfile\n", progname); @@ -70,7 +70,7 @@ int main(int argc, char **argv) { size_t insert_throughput = (size_t) ((double) (n - warmup) / (double) insert_latency * 1e9); TIMER_START(); - run_queries(extension, queries); + run_queries(extension, queries); TIMER_STOP(); auto query_latency = TIMER_RESULT() / queries.size(); @@ -78,7 +78,7 @@ int main(int argc, char **argv) { auto shard = extension->create_static_structure(); TIMER_START(); - run_static_queries(shard, queries); + run_static_queries(shard, queries); TIMER_STOP(); auto static_latency = TIMER_RESULT() / queries.size(); diff --git a/benchmarks/vldb/ts_mdsp_bench.cpp b/benchmarks/vldb/ts_mdsp_bench.cpp deleted file mode 100644 index cc0cd99..0000000 --- a/benchmarks/vldb/ts_mdsp_bench.cpp +++ /dev/null @@ -1,70 +0,0 @@ -/* - * - */ - -#define ENABLE_TIMER - -#include - -#include "triespline_bsm.h" -#include "psu-util/bentley-saxe.h" -#include "framework/interface/Record.h" -#include "file_util.h" -#include "query/rangecount.h" -#include "psu-util/timer.h" -#include "standard_benchmarks.h" - -typedef std::pair Rec; -typedef de::Record FRec; - -typedef BSMTrieSpline Shard; -typedef de::rc::Parms QP; -typedef psudb::bsm::BentleySaxe Ext; - -void usage(char *progname) { - fprintf(stderr, "%s reccnt datafile queryfile\n", progname); -} - -int main(int argc, char **argv) { - - if (argc < 4) { - usage(argv[0]); - exit(EXIT_FAILURE); - } - - size_t n = atol(argv[1]); - std::string d_fname = std::string(argv[2]); - std::string q_fname = std::string(argv[3]); - - auto extension = new psudb::bsm::BentleySaxe(); - gsl_rng *rng = gsl_rng_alloc(gsl_rng_mt19937); - - auto data = read_sosd_file_pair(d_fname, n); - auto queries = read_range_queries(q_fname, .0001); - - /* warmup structure w/ 10% of records */ - size_t warmup = .1 * n; - insert_records(extension, 0, warmup, data); - - TIMER_INIT(); - - TIMER_START(); - insert_records(extension, warmup, data.size(), data); - TIMER_STOP(); - - auto insert_latency = TIMER_RESULT(); - size_t insert_throughput = (size_t) ((double) (n - warmup) / (double) insert_latency * 1e9); - - TIMER_START(); - run_queries(extension, queries); - TIMER_STOP(); - - auto query_latency = TIMER_RESULT() / queries.size(); - - fprintf(stdout, "%ld\t%ld\n", insert_throughput, query_latency); - - gsl_rng_free(rng); - delete extension; - fflush(stderr); -} - diff --git a/benchmarks/vldb/ts_parmsweep.cpp b/benchmarks/vldb/ts_parmsweep.cpp index 2c9412a..a9203ab 100644 --- a/benchmarks/vldb/ts_parmsweep.cpp +++ b/benchmarks/vldb/ts_parmsweep.cpp @@ -18,10 +18,10 @@ typedef de::Record Rec; typedef de::TrieSpline Shard; -typedef de::rc::Query Q; -typedef de::DynamicExtension Ext; -typedef de::DynamicExtension Ext2; -typedef de::rc::Parms QP; +typedef de::rc::Query Q; +typedef de::DynamicExtension Ext; +typedef de::DynamicExtension Ext2; +typedef Q::Parameters QP; void usage(char *progname) { fprintf(stderr, "%s reccnt datafile queryfile\n", progname); @@ -74,7 +74,7 @@ int main(int argc, char **argv) { size_t insert_throughput = (size_t) ((double) (n - warmup) / (double) insert_latency * 1e9); TIMER_START(); - run_queries(extension, queries); + run_queries(extension, queries); TIMER_STOP(); auto query_latency = TIMER_RESULT() / queries.size(); @@ -106,7 +106,7 @@ int main(int argc, char **argv) { size_t insert_throughput = (size_t) ((double) (n - warmup) / (double) insert_latency * 1e9); TIMER_START(); - run_queries(extension, queries); + run_queries(extension, queries); TIMER_STOP(); auto query_latency = TIMER_RESULT() / queries.size(); diff --git a/benchmarks/vldb/vptree_bench.cpp b/benchmarks/vldb/vptree_bench.cpp index 0b98a52..417e3af 100644 --- a/benchmarks/vldb/vptree_bench.cpp +++ b/benchmarks/vldb/vptree_bench.cpp @@ -19,9 +19,9 @@ typedef Word2VecRec Rec; typedef de::VPTree Shard; -typedef de::knn::Query Q; -typedef de::DynamicExtension Ext; -typedef de::knn::Parms QP; +typedef de::knn::Query Q; +typedef de::DynamicExtension Ext; +typedef Q::Parameters QP; void usage(char *progname) { fprintf(stderr, "%s reccnt datafile queryfile\n", progname); @@ -75,7 +75,7 @@ int main(int argc, char **argv) { fprintf(stderr, "[I] Running Query Benchmark\n"); TIMER_START(); - run_queries(extension, queries); + run_queries(extension, queries); TIMER_STOP(); auto query_latency = TIMER_RESULT() / queries.size(); @@ -84,7 +84,7 @@ int main(int argc, char **argv) { fprintf(stderr, "Running Static query tests\n\n"); TIMER_START(); - run_static_queries(shard, queries); + run_static_queries(shard, queries); TIMER_STOP(); auto static_latency = TIMER_RESULT() / queries.size(); diff --git a/benchmarks/vldb/vptree_bench_alt.cpp b/benchmarks/vldb/vptree_bench_alt.cpp index b09ee7d..5279f68 100644 --- a/benchmarks/vldb/vptree_bench_alt.cpp +++ b/benchmarks/vldb/vptree_bench_alt.cpp @@ -19,9 +19,9 @@ typedef ANNRec Rec; typedef de::VPTree Shard; -typedef de::knn::Query Q; -typedef de::DynamicExtension Ext; -typedef de::knn::Parms QP; +typedef de::knn::Query Q; +typedef de::DynamicExtension Ext; +typedef Q::Parameters QP; void usage(char *progname) { fprintf(stderr, "%s reccnt datafile queryfile\n", progname); @@ -75,7 +75,7 @@ int main(int argc, char **argv) { fprintf(stderr, "[I] Running Query Benchmark\n"); TIMER_START(); - run_queries(extension, queries); + run_queries(extension, queries); TIMER_STOP(); auto query_latency = TIMER_RESULT() / queries.size(); @@ -84,7 +84,7 @@ int main(int argc, char **argv) { fprintf(stderr, "Running Static query tests\n\n"); TIMER_START(); - run_static_queries(shard, queries); + run_static_queries(shard, queries); TIMER_STOP(); auto static_latency = TIMER_RESULT() / queries.size(); diff --git a/benchmarks/vldb/vptree_bsm_bench.cpp b/benchmarks/vldb/vptree_bsm_bench.cpp index 4a7fcb6..d0d963c 100644 --- a/benchmarks/vldb/vptree_bsm_bench.cpp +++ b/benchmarks/vldb/vptree_bsm_bench.cpp @@ -18,10 +18,11 @@ typedef Word2VecRec Rec; + typedef de::VPTree Shard; -typedef de::knn::Query Q; -typedef de::DynamicExtension Ext; -typedef de::knn::Parms QP; +typedef de::knn::Query Q; +typedef de::DynamicExtension Ext; +typedef Q::Parameters QP; void usage(char *progname) { fprintf(stderr, "%s reccnt datafile queryfile\n", progname); @@ -75,7 +76,7 @@ int main(int argc, char **argv) { fprintf(stderr, "[I] Running Query Benchmark\n"); TIMER_START(); - run_queries(extension, queries); + run_queries(extension, queries); TIMER_STOP(); auto query_latency = TIMER_RESULT() / queries.size(); @@ -84,7 +85,7 @@ int main(int argc, char **argv) { fprintf(stderr, "Running Static query tests\n\n"); TIMER_START(); - run_static_queries(shard, queries); + run_static_queries(shard, queries); TIMER_STOP(); auto static_latency = TIMER_RESULT() / queries.size(); diff --git a/benchmarks/vldb/vptree_bsm_bench_alt.cpp b/benchmarks/vldb/vptree_bsm_bench_alt.cpp index 63baf8b..b4956a2 100644 --- a/benchmarks/vldb/vptree_bsm_bench_alt.cpp +++ b/benchmarks/vldb/vptree_bsm_bench_alt.cpp @@ -19,9 +19,9 @@ typedef ANNRec Rec; typedef de::VPTree Shard; -typedef de::knn::Query Q; -typedef de::DynamicExtension Ext; -typedef de::knn::Parms QP; +typedef de::knn::Query Q; +typedef de::DynamicExtension Ext; +typedef Q::Parameters QP; void usage(char *progname) { fprintf(stderr, "%s reccnt datafile queryfile\n", progname); @@ -75,7 +75,7 @@ int main(int argc, char **argv) { fprintf(stderr, "[I] Running Query Benchmark\n"); TIMER_START(); - run_queries(extension, queries); + run_queries(extension, queries); TIMER_STOP(); auto query_latency = TIMER_RESULT() / queries.size(); diff --git a/benchmarks/vldb/vptree_parmsweep.cpp b/benchmarks/vldb/vptree_parmsweep.cpp index 2cbd521..5e496d4 100644 --- a/benchmarks/vldb/vptree_parmsweep.cpp +++ b/benchmarks/vldb/vptree_parmsweep.cpp @@ -19,10 +19,10 @@ typedef Word2VecRec Rec; typedef de::VPTree Shard; -typedef de::knn::Query Q; -typedef de::DynamicExtension Ext; -typedef de::DynamicExtension Ext2; -typedef de::knn::Parms QP; +typedef de::knn::Query Q; +typedef de::DynamicExtension Ext; +typedef de::DynamicExtension Ext2; +typedef Q::Parameters QP; void usage(char *progname) { fprintf(stderr, "%s reccnt datafile queryfile\n", progname); @@ -78,7 +78,7 @@ int main(int argc, char **argv) { size_t insert_throughput = (size_t) ((double) (n - warmup) / (double) insert_latency * 1e9); TIMER_START(); - run_queries(extension, queries); + run_queries(extension, queries); TIMER_STOP(); auto query_latency = TIMER_RESULT() / queries.size(); @@ -111,7 +111,7 @@ int main(int argc, char **argv) { size_t insert_throughput = (size_t) ((double) (n - warmup) / (double) insert_latency * 1e9); TIMER_START(); - run_queries(extension, queries); + run_queries(extension, queries); TIMER_STOP(); auto query_latency = TIMER_RESULT() / queries.size(); -- cgit v1.2.3