Switched to using framework-BSM mode for Bentley-Saxe benchmarks

2 files changed, 70 insertions, 28 deletions

diff --git a/benchmarks/vldb/ts_bsm_bench.cpp b/benchmarks/vldb/ts_bsm_bench.cpp
index 049fd35..4511350 100644
--- a/benchmarks/vldb/ts_bsm_bench.cpp
+++ b/benchmarks/vldb/ts_bsm_bench.cpp
@@ -3,23 +3,27 @@
  */
 
 #define ENABLE_TIMER
+#define TS_TEST
 
 #include <thread>
 
-#include "triespline_bsm.h"
-#include "psu-util/bentley-saxe.h"
+#include "framework/DynamicExtension.h"
+#include "shard/TrieSpline.h"
+#include "query/rangecount.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<uint64_t, uint64_t> Rec;
-typedef de::Record<uint64_t, uint64_t> FRec;
+#include <gsl/gsl_rng.h>
 
-typedef BSMTrieSpline<uint64_t, uint64_t> Shard;
-typedef de::rc::Parms<FRec> QP;
-typedef psudb::bsm::BentleySaxe<Rec, Shard> Ext;
+#include "psu-util/timer.h"
+
+
+typedef de::Record<uint64_t, uint64_t> Rec;
+typedef de::TrieSpline<Rec> Shard;
+typedef de::rc::Query<Rec, Shard> Q;
+typedef de::DynamicExtension<Rec, Shard, Q, de::LayoutPolicy::BSM, de::DeletePolicy::TOMBSTONE, de::SerialScheduler> Ext;
+typedef de::rc::Parms<Rec> QP;
 
 void usage(char *progname) {
     fprintf(stderr, "%s reccnt datafile queryfile\n", progname);
@@ -36,11 +40,10 @@ int main(int argc, char **argv) {
     std::string d_fname = std::string(argv[2]);
     std::string q_fname = std::string(argv[3]);
 
-    auto extension = new psudb::bsm::BentleySaxe<Rec, Shard>();
-    auto ghost = new psudb::bsm::BentleySaxe<Rec, Shard>();
-    gsl_rng *rng = gsl_rng_alloc(gsl_rng_mt19937);
+    auto extension = new Ext(1, 12001, 2, 0, 64);
+    gsl_rng * rng = gsl_rng_alloc(gsl_rng_mt19937);
     
-    auto data = read_sosd_file_pair<uint64_t, uint64_t>(d_fname, n);
+    auto data = read_sosd_file<Rec>(d_fname, n);
     std::vector<size_t> to_delete(n * delete_proportion);
     size_t j=0;
     for (size_t i=0; i<data.size() && j<to_delete.size(); i++) {
@@ -53,26 +56,37 @@ int main(int argc, char **argv) {
     /* warmup structure w/ 10% of records */
     size_t warmup = .1 * n;
     size_t delete_idx = 0;
-    insert_records<Shard, Rec>(extension, ghost, 0, warmup, data, to_delete,
-                               delete_idx, rng);
+    insert_records<Ext, Rec>(extension, 0, warmup, data, to_delete, delete_idx, false, rng);
+
+    extension->await_next_epoch();
 
     TIMER_INIT();
 
     TIMER_START();
-    insert_records<Shard, Rec>(extension, ghost, warmup, data.size(), data,
-                               to_delete, delete_idx, rng);
+    insert_records<Ext, Rec>(extension, warmup, data.size(), data, to_delete, delete_idx, true, rng);
     TIMER_STOP();
 
     auto insert_latency = TIMER_RESULT();
     size_t insert_throughput = (size_t) ((double) (n - warmup) / (double) insert_latency * 1e9);
 
     TIMER_START();
-    run_queries<Ext, QP, Rec>(extension, ghost, queries);
+    run_queries<Ext, QP>(extension, queries);
     TIMER_STOP();
 
     auto query_latency = TIMER_RESULT() / queries.size();
 
-    fprintf(stdout, "%ld\t%ld\n", insert_throughput, query_latency);
+    auto shard = extension->create_static_structure();
+
+    TIMER_START();
+    run_static_queries<Shard, QP, Q>(shard, queries);
+    TIMER_STOP();
+
+    auto static_latency = TIMER_RESULT() / queries.size();
+
+    auto ext_size = extension->get_memory_usage() + extension->get_aux_memory_usage();
+    auto static_size = shard->get_memory_usage(); //+ shard->get_aux_memory_usage();
+
+    fprintf(stdout, "%ld\t%ld\t%ld\t%ld\t%ld\n", insert_throughput, query_latency, ext_size, static_latency, static_size);
 
     gsl_rng_free(rng);
     delete extension;
diff --git a/benchmarks/vldb/vptree_bsm_bench.cpp b/benchmarks/vldb/vptree_bsm_bench.cpp
index 0798ec2..8e6f795 100644
--- a/benchmarks/vldb/vptree_bsm_bench.cpp
+++ b/benchmarks/vldb/vptree_bsm_bench.cpp
@@ -4,10 +4,12 @@
 
 #define ENABLE_TIMER
 
-#include "vptree_bsm.h"
+#include "framework/DynamicExtension.h"
+#include "shard/VPTree.h"
+#include "query/knn.h"
+#include "framework/interface/Record.h"
 #include "file_util.h"
 #include "standard_benchmarks.h"
-#include "query/knn.h"
 
 #include <gsl/gsl_rng.h>
 
@@ -16,9 +18,10 @@
 
 typedef Word2VecRec Rec;
 
-typedef BSMVPTree<Rec, 100> Shard;
+typedef de::VPTree<Rec, 100, true> Shard;
+typedef de::knn::Query<Rec, Shard> Q;
+typedef de::DynamicExtension<Rec, Shard, Q, de::LayoutPolicy::BSM, de::DeletePolicy::TAGGING, de::SerialScheduler> Ext;
 typedef de::knn::Parms<Rec> QP;
-typedef psudb::bsm::BentleySaxe<Rec, Shard> Ext;
 
 void usage(char *progname) {
     fprintf(stderr, "%s reccnt datafile queryfile\n", progname);
@@ -35,23 +38,36 @@ int main(int argc, char **argv) {
     std::string d_fname = std::string(argv[2]);
     std::string q_fname = std::string(argv[3]);
 
-    auto extension = new Ext();
+    auto extension = new Ext(1, 1400, 2, 0, 64);
     gsl_rng * rng = gsl_rng_alloc(gsl_rng_mt19937);
     
     fprintf(stderr, "[I] Reading data file...\n");
     auto data = read_vector_file<Rec, 300>(d_fname, n);
+
+    fprintf(stderr, "[I] Generating delete vector\n");
+    std::vector<size_t> to_delete(n * delete_proportion);
+    size_t j=0;
+    for (size_t i=0; i<data.size() && j<to_delete.size(); i++) {
+        if (gsl_rng_uniform(rng) <= delete_proportion) {
+            to_delete[j++] = i;
+        } 
+    }
+    fprintf(stderr, "[I] Reading Queries\n");
     auto queries = read_knn_queries<QP>(q_fname, 1000);
 
     fprintf(stderr, "[I] Warming up structure...\n");
     /* warmup structure w/ 10% of records */
     size_t warmup = .1 * n;
-    insert_records<Shard, Rec>(extension, 0, warmup, data);
+    size_t delete_idx = 0;
+    insert_records<Ext, Rec>(extension, 0, warmup, data, to_delete, delete_idx, false, rng);
+
+    extension->await_next_epoch();
 
     TIMER_INIT();
 
     fprintf(stderr, "[I] Running Insertion Benchmark\n");
     TIMER_START();
-    insert_records<Shard, Rec>(extension, warmup, data.size(), data);
+    insert_records<Ext, Rec>(extension, warmup, data.size(), data, to_delete, delete_idx, true, rng);
     TIMER_STOP();
 
     auto insert_latency = TIMER_RESULT();
@@ -59,12 +75,24 @@ int main(int argc, char **argv) {
 
     fprintf(stderr, "[I] Running Query Benchmark\n");
     TIMER_START();
-    run_queries<Ext, QP, true>(extension, queries);
+    run_queries<Ext, QP>(extension, queries);
     TIMER_STOP();
 
     auto query_latency = TIMER_RESULT() / queries.size();
 
-    fprintf(stdout, "%ld\t%ld\n", insert_throughput, query_latency);
+    auto shard = extension->create_static_structure();
+
+    fprintf(stderr, "Running Static query tests\n\n");
+    TIMER_START();
+    run_static_queries<Shard, QP, Q>(shard, queries);
+    TIMER_STOP();
+
+    auto static_latency = TIMER_RESULT() / queries.size();
+
+    auto ext_size = extension->get_memory_usage() + extension->get_aux_memory_usage();
+    auto static_size = shard->get_memory_usage(); // + shard->get_aux_memory_usage();
+
+    fprintf(stdout, "%ld\t%ld\t%ld\t%ld\t%ld\n", insert_throughput, query_latency, ext_size, static_latency, static_size);
 
     gsl_rng_free(rng);
     delete extension;