adding range query execute

Author: JslYoon

script/bench.py

@@ -12,7 +12,7 @@
 WRITE_FACTOR = 0.4
 READ_FACTOR = 0.2
 MIXED_RATIO = 0.5
-SELECTIVITY_FACTOR = [0.01, 0.1, 0.25]
+SELECTIVITY_FACTOR = ["0.01", "0.1", "0.25"]
 RANGE_QUERY_FACTOR = 0.5
 PRELOAD = False
 

script/infra/db.py

@@ -25,7 +25,10 @@ def __init__(self, db_path: str) -> None:
                 preload_creation_time INT,
                 write_time INT,
                 mixed_time INT,
-                read_time INT
+                read_time INT,
+                range_read_time_short INT,
+                range_read_time_mid INT,
+                range_read_time_long INT,
             );
             """
         )
@@ -56,8 +59,11 @@ def log_row(
                    preload_creation_time,
                    write_time,
                    mixed_time,
-                   read_time
-               ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?);
+                   read_time,
+                   range_read_time_short,
+                   range_read_time_mid,
+                   range_read_time_long
+               ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?);
             """,
             (
                 datetime.now(timezone.utc),
@@ -75,6 +81,9 @@ def log_row(
                 stats.write_time,
                 stats.mixed_time,
                 stats.read_time,
+                stats.range_read_time_short,
+                stats.range_read_time_mid,
+                stats.range_read_time_long,
             ),
         )
         self.db_con.commit()

script/infra/pybliss.py

@@ -1,4 +1,5 @@
 from dataclasses import dataclass
+from typing import List
 import re
 import os
 import logging
@@ -14,6 +15,8 @@ class BlissArgs:
     write_factor: float
     read_factor: float
     mixed_ratio: float
+    range_query_factor: float
+    selectivity: List[str]
     seed: int = 0
     file_type: str = "binary"
     use_preload: bool = False
@@ -26,6 +29,9 @@ class BlissStats:
     write_time: int
     read_time: int
     mixed_time: int
+    range_read_time_short: int = 0
+    range_read_time_mid: int = 0
+    range_read_time_long: int = 0
 
 
 class PyBliss:
@@ -51,10 +57,13 @@ def __init__(
         self.preload_creation_time_regex = re.compile(
             r"\[[0-9 :.-]+\] \[info\] Preload Creation Time \(ns\): (\d+)"
         )
+        self.range_read_time_regex = re.compile(
+            r"\[[0-9 :.-]+\] \[info\] Range Query Times \(ns\) for selectivity \[([\d\., ]+)\]: ([\d\., ]+)"
+        )
 
     def run_single_bliss_bench(self, args: BlissArgs) -> BlissStats:
         if self.smoke_test:
-            return BlissStats(*(random.randint(0, 2 << 16) for _ in range(5)))
+            return BlissStats(*(random.randint(0, 2 << 16) for _ in range(8)))
 
         cmd = [
             self.bliss_execute_path,
@@ -67,8 +76,8 @@ def run_single_bliss_bench(self, args: BlissArgs) -> BlissStats:
             f"--seed {args.seed}",
             f"--file_type {'binary' if args.file_type else 'txt'}",
             "--use_preload" if args.use_preload else "",
-            f"--selectivity ${args.selectivity.join(",")}",
-            f"--range_query_factor ${args.range_query_factor}",
+            f"--selectivity " + ",".join(args.selectivity),
+            f"--range_query_factor {args.range_query_factor}",
         ]
         process = subprocess.Popen(
             " ".join(cmd),
@@ -95,6 +104,23 @@ def run_single_bliss_bench(self, args: BlissArgs) -> BlissStats:
         read_time = self.read_time_regex.search(proc_results)
         read_time = int(read_time.group(1)) if read_time else 0
 
+        # Extract range query times from the comma-separated list
+        range_times_match = self.range_read_time_regex.search(proc_results)
+        range_read_time_short = 0
+        range_read_time_mid = 0
+        range_read_time_long = 0
+        
+        if range_times_match:
+            range_times_str = range_times_match.group(2)
+            range_times = [int(x.strip()) for x in range_times_str.split(',')]
+            
+            if len(range_times) >= 1:
+                range_read_time_short = range_times[0]
+            if len(range_times) >= 2:
+                range_read_time_mid = range_times[1]
+            if len(range_times) >= 3:
+                range_read_time_long = range_times[2]
+
         os.makedirs("./run_logs", exist_ok=True)
         _, file_name = os.path.split(args.data_file)
         file_name, _ = os.path.splitext(file_name + f"_{args.index_type}")
@@ -107,4 +133,7 @@ def run_single_bliss_bench(self, args: BlissArgs) -> BlissStats:
             write_time=write_time,
             read_time=read_time,
             mixed_time=mixed_time,
+            range_read_time_short=range_read_time_short,
+            range_read_time_mid=range_read_time_mid,
+            range_read_time_long=range_read_time_long,
         )

src/bliss_bench.cpp

@@ -148,21 +148,39 @@ void workload_executor(bliss::BlissIndex<key_type, value_type> &tree,
     // Timing for range queries with configured amount
     if (num_ranges > 0) {
         spdlog::debug("Executing {} range queries", num_ranges);
+        std::vector<unsigned long long> range_times;
+        std::string selectivity_values;
+        
+        // Process all selectivity factors first
         for (const auto& selectivity : config.selectivity_factor) {
-            auto range_time = time_function([&]() {
-                executor::execute_range_queries(tree, data, num_ranges, selectivity);
-            });
+            auto range_time = 0ULL;
             try {
-                index->get(0, 0);
+                range_time = time_function([&]() {
+                    executor::execute_range_queries(tree, data, num_ranges, selectivity);
+                });
             } catch (const std::exception& e) {
                 if (std::string(e.what()) == "Not implemented") {
                     range_time = 0;
                 } else {
                     throw;
                 }
             }
-            spdlog::info("Range Query Time (ns) for selectivity {}: {}", selectivity, range_time);
+            
+            range_times.push_back(range_time);
+            if (!selectivity_values.empty()) {
+                selectivity_values += ", ";
+            }
+            selectivity_values += std::to_string(selectivity);
+        }
+        
+        std::string time_values;
+        for (size_t i = 0; i < range_times.size(); ++i) {
+            if (i > 0) time_values += ", ";
+            time_values += std::to_string(range_times[i]);
         }
+        
+        spdlog::info("Range Query Times (ns) for selectivity [{}]: {}", 
+                    selectivity_values, time_values);
     }
 }