Stats tweaks and KNN benchmark

1 files changed, 9 insertions, 7 deletions

diff --git a/benchmarks/tail-latency/query_parm_sweep.cpp b/benchmarks/tail-latency/query_parm_sweep.cpp
index a91db8c..36665a6 100644
--- a/benchmarks/tail-latency/query_parm_sweep.cpp
+++ b/benchmarks/tail-latency/query_parm_sweep.cpp
@@ -29,11 +29,11 @@ typedef de::Record<uint64_t, uint64_t> Rec;
 typedef de::ISAMTree<Rec> Shard;
 typedef de::pl::Query<Shard> Q;
 typedef de::DynamicExtension<Shard, Q, de::DeletePolicy::TOMBSTONE,
-                             de::FIFOScheduler>
+                             de::SerialScheduler>
     Ext;
 typedef Q::Parameters QP;
 typedef de::DEConfiguration<Shard, Q, de::DeletePolicy::TOMBSTONE,
-                            de::FIFOScheduler>
+                            de::SerialScheduler>
     Conf;
 
 std::atomic<size_t> idx;
@@ -100,14 +100,14 @@ int main(int argc, char **argv) {
 
   auto data = read_sosd_file<Rec>(d_fname, n);
   //auto queries = read_range_queries<QP>(q_fname, .0001);
-  auto queries =read_sosd_point_lookups<QP>(q_fname, 100);
+  auto queries =read_sosd_point_lookups<QP>(q_fname, 1);
 
   size_t buffer_size = 8000;
-  std::vector<size_t> policies = {0};
+  std::vector<size_t> policies = {1};
 
   std::vector<size_t> thread_counts = {8};
   std::vector<double> modifiers = {0};
-  std::vector<size_t> scale_factors = {8, 8, 8, 8, 8}; 
+  std::vector<size_t> scale_factors = {4, 4, 4, 4}; 
 
   size_t insert_threads = 1;
   size_t query_threads = 1;
@@ -122,7 +122,7 @@ int main(int argc, char **argv) {
           auto config = Conf(std::move(policy));
           config.recon_enable_maint_on_flush = true;
           config.recon_maint_disabled = false;
-          // config.buffer_flush_trigger = 4000;
+          config.buffer_flush_trigger = config.buffer_size;
           config.maximum_threads = internal_thread_cnt;
 
           g_thrd_cnt = internal_thread_cnt;
@@ -173,7 +173,7 @@ int main(int argc, char **argv) {
             total_res.fetch_add(res.size());
           }
 
-          total_query_count.store(50000);
+          total_query_count.store(100000);
           TIMER_INIT();
           TIMER_START();
           for (size_t i=0; i<total_query_count; i++) {
@@ -196,6 +196,8 @@ int main(int argc, char **argv) {
                   mod, extension->get_height(), extension->get_shard_count(),
                   insert_tput, query_lat);
           extension->print_scheduler_statistics();
+          extension->print_scheduler_query_data();
+          //extension->print_structure();
           fflush(stdout);
 
           total_res.store(0);