From b25beb13773072c3b143842b45a7c32a1108f347 Mon Sep 17 00:00:00 2001
From: Douglas Rumbaugh <dbr4@psu.edu>
Date: Mon, 15 Apr 2024 14:00:27 -0400
Subject: Updated FSTrie to use const char * instead of std::string

Note: this requires the caller to manage the memory of the strings
---
 tests/include/rangequery.h | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

(limited to 'tests/include/rangequery.h')

diff --git a/tests/include/rangequery.h b/tests/include/rangequery.h
index a8a73f7..a3b761e 100644
--- a/tests/include/rangequery.h
+++ b/tests/include/rangequery.h
@@ -39,9 +39,7 @@ START_TEST(t_range_query)
     auto buffer = create_sequential_mbuffer<R>(100, 1000);
     auto shard = Shard(buffer->get_buffer_view());
 
-    rq::Parms<R> parms;
-    parms.lower_bound = 300;
-    parms.upper_bound = 500;
+    rq::Parms<R> parms = {300, 500};
 
     auto state = rq::Query<R, Shard>::get_query_state(&shard, &parms);
     auto result = rq::Query<R, Shard>::query(&shard, state, &parms);
@@ -62,9 +60,7 @@ START_TEST(t_buffer_range_query)
 {
     auto buffer = create_sequential_mbuffer<R>(100, 1000);
 
-    rq::Parms<R> parms;
-    parms.lower_bound = 300;
-    parms.upper_bound = 500;
+    rq::Parms<R> parms = {300, 500};
 
     {
         auto view = buffer->get_buffer_view();
@@ -92,9 +88,7 @@ START_TEST(t_range_query_merge)
     auto shard1 = Shard(buffer1->get_buffer_view());
     auto shard2 = Shard(buffer2->get_buffer_view());
 
-    rq::Parms<R> parms;
-    parms.lower_bound = 150;
-    parms.upper_bound = 500;
+    rq::Parms<R> parms = {150, 500};
 
     size_t result_size = parms.upper_bound - parms.lower_bound + 1 - 200;
 
@@ -149,10 +143,8 @@ START_TEST(t_lower_bound)
 
     auto merged = Shard(shards);
 
-    for (size_t i=100; i<1000; i++) {
-        R r;
-        r.key = i;
-        r.value = i;
+    for (uint32_t i=100; i<1000; i++) {
+        R r = R{i, i};
 
         auto idx = merged.get_lower_bound(i);
 
-- 
cgit v1.2.3


From 438feac7e56fee425d9c6f1a43298ff9dc5b71d1 Mon Sep 17 00:00:00 2001
From: Douglas Rumbaugh <dbr4@psu.edu>
Date: Fri, 19 Apr 2024 17:38:16 -0400
Subject: Properly implemented support for iteratively decomposable problems

---
 tests/include/rangequery.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'tests/include/rangequery.h')

diff --git a/tests/include/rangequery.h b/tests/include/rangequery.h
index a3b761e..f90e107 100644
--- a/tests/include/rangequery.h
+++ b/tests/include/rangequery.h
@@ -113,7 +113,8 @@ START_TEST(t_range_query_merge)
         }
     }
 
-    auto result = rq::Query<R, Shard>::merge(proc_results, nullptr);
+    std::vector<R> result;
+    rq::Query<R, Shard>::merge(proc_results, nullptr, result);
     std::sort(result.begin(), result.end());
 
     ck_assert_int_eq(result.size(), result_size);
-- 
cgit v1.2.3