Updated FSTrie to use const char * instead of std::string

Note: this requires the caller to manage the memory of the strings

7 files changed, 61 insertions, 98 deletions

diff --git a/tests/include/concurrent_extension.h b/tests/include/concurrent_extension.h
index 2948292..927a094 100644
--- a/tests/include/concurrent_extension.h
+++ b/tests/include/concurrent_extension.h
@@ -97,8 +97,7 @@ START_TEST(t_insert_with_mem_merges)
     R r = {key, val};
     for (size_t i=0; i<1000; i++) {
         ck_assert_int_eq(test_de->insert(r), 1);
-        r.key++;
-        r.value++;
+        r = R{r.key + 1, r.value + 1};
     }
 
     ck_assert_int_eq(test_de->get_record_count(), 1000);
@@ -114,8 +113,7 @@ START_TEST(t_insert_with_mem_merges)
     size_t cnt = 0;
     do {
         if (test_de->insert(r)) {
-            r.key++;
-            r.value++;
+            r = R{r.key + 1, r.value + 1};
             cnt++;
             ck_assert_int_eq(test_de->get_record_count(), cnt + 1000);
         } else {
diff --git a/tests/include/pointlookup.h b/tests/include/pointlookup.h
index bf4810b..84e71f2 100644
--- a/tests/include/pointlookup.h
+++ b/tests/include/pointlookup.h
@@ -40,24 +40,25 @@ START_TEST(t_point_lookup_query)
     auto buffer = create_test_mbuffer<R>(1000);
     auto shard = Shard(buffer->get_buffer_view());
 
-    pl::Parms<R> parms;
     {
         auto bv = buffer->get_buffer_view();
         for (size_t i=0; i<bv.get_record_count(); i++) {
             auto key = bv.get(i)->rec.key;
 
-            parms.search_key = key;
+            pl::Parms<R> parms = {key};
             auto state = pl::Query<R, Shard>::get_query_state(&shard, &parms);
             auto result = pl::Query<R, Shard>::query(&shard, state, &parms);
             pl::Query<R, Shard>::delete_query_state(state);
 
             ck_assert_int_eq(result.size(), 1);
-            ck_assert_str_eq(result[0].rec.key.c_str(), key.c_str());
+            ck_assert_str_eq(result[0].rec.key, key);
             ck_assert_int_eq(result[0].rec.value, bv.get(i)->rec.value);
         }
 
         /* point lookup miss; result size should be 0 */
-        parms.search_key = "computer";
+        const char *c = "computer";
+        pl::Parms<R> parms = {c};
+
         auto state = pl::Query<R, Shard>::get_query_state(&shard, &parms);
         auto result = pl::Query<R, Shard>::query(&shard, state, &parms);
         pl::Query<R, Shard>::delete_query_state(state);
@@ -74,23 +75,24 @@ START_TEST(t_buffer_point_lookup)
 {
 
     auto buffer = create_test_mbuffer<R>(1000);
-    pl::Parms<R> parms;
     {
         auto view = buffer->get_buffer_view();
         for (int i=view.get_record_count()-1; i>=0; i--) {
-            parms.search_key = view.get(i)->rec.key;
+            pl::Parms<R> parms = {view.get(i)->rec.key};
 
             auto state = pl::Query<R, Shard>::get_buffer_query_state(&view, &parms);
             auto result = pl::Query<R, Shard>::buffer_query(state, &parms);
             pl::Query<R, Shard>::delete_buffer_query_state(state);
 
             ck_assert_int_eq(result.size(), 1);
-            ck_assert_str_eq(result[0].rec.key.c_str(), view.get(i)->rec.key.c_str());
+            ck_assert_str_eq(result[0].rec.key, view.get(i)->rec.key);
             ck_assert_int_eq(result[0].rec.value, view.get(i)->rec.value);
         }
 
         /* point lookup miss; result size should be 0 */
-        parms.search_key = "computer";
+        const char *c = "computer";
+        pl::Parms<R> parms = {c};
+
         auto state = pl::Query<R, Shard>::get_buffer_query_state(&view, &parms);
         auto result = pl::Query<R, Shard>::buffer_query(state, &parms);
         pl::Query<R, Shard>::delete_buffer_query_state(state);
diff --git a/tests/include/rangecount.h b/tests/include/rangecount.h
index fdd66d9..c97d64c 100644
--- a/tests/include/rangecount.h
+++ b/tests/include/rangecount.h
@@ -40,9 +40,7 @@ START_TEST(t_range_count)
     auto buffer = create_sequential_mbuffer<R>(100, 1000);
     auto shard = Shard(buffer->get_buffer_view());
 
-    rc::Parms<R> parms;
-    parms.lower_bound = 300;
-    parms.upper_bound = 500;
+    rc::Parms<R> parms = {300, 500};
 
     auto state = rc::Query<R, Shard>::get_query_state(&shard, &parms);
     auto result = rc::Query<R, Shard>::query(&shard, state, &parms);
@@ -60,9 +58,7 @@ START_TEST(t_buffer_range_count)
 {
     auto buffer = create_sequential_mbuffer<R>(100, 1000);
 
-    rc::Parms<R> parms;
-    parms.lower_bound = 300;
-    parms.upper_bound = 500;
+    rc::Parms<R> parms = {300, 500};
 
     {
         auto view = buffer->get_buffer_view();
@@ -87,9 +83,7 @@ START_TEST(t_range_count_merge)
     auto shard1 = Shard(buffer1->get_buffer_view());
     auto shard2 = Shard(buffer2->get_buffer_view());
 
-    rc::Parms<R> parms;
-    parms.lower_bound = 150;
-    parms.upper_bound = 500;
+    rc::Parms<R> parms = {150, 500};
 
     size_t result_size = parms.upper_bound - parms.lower_bound + 1 - 200;
 
@@ -128,10 +122,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);
 
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);
 
diff --git a/tests/include/shard_standard.h b/tests/include/shard_standard.h
index 55e4c7b..2809d74 100644
--- a/tests/include/shard_standard.h
+++ b/tests/include/shard_standard.h
@@ -150,10 +150,8 @@ START_TEST(t_point_lookup)
         auto view = buffer->get_buffer_view();
 
         for (size_t i=0; i<n; i++) {
-            R r;
             auto rec = view.get(i);
-            r.key = rec->rec.key;
-            r.value = rec->rec.value;
+            R r = {rec->rec.key, rec->rec.value};
 
             auto result = isam.point_lookup(r);
             ck_assert_ptr_nonnull(result);
@@ -174,10 +172,8 @@ START_TEST(t_point_lookup_miss)
     auto buffer = create_double_seq_mbuffer<R>(n, false);
     auto isam = Shard(buffer->get_buffer_view());
 
-    for (size_t i=n + 100; i<2*n; i++) {
-        R r;
-        r.key = i;
-        r.value = i;
+    for (uint32_t i=n + 100; i<2*n; i++) {
+        R r = R{i, i};
 
         auto result = isam.point_lookup(r);
         ck_assert_ptr_null(result);
diff --git a/tests/include/shard_string.h b/tests/include/shard_string.h
index fa51630..2d7a72a 100644
--- a/tests/include/shard_string.h
+++ b/tests/include/shard_string.h
@@ -122,7 +122,7 @@ START_TEST(t_point_lookup)
 
             auto result = shard.point_lookup(r);
             ck_assert_ptr_nonnull(result);
-            ck_assert_str_eq(result->rec.key.c_str(), r.key.c_str());
+            ck_assert_str_eq(result->rec.key, r.key);
             ck_assert_int_eq(result->rec.value, r.value);
             //fprintf(stderr, "%ld\n", i);
         }
@@ -141,9 +141,8 @@ START_TEST(t_point_lookup_miss)
     auto shard = Shard(buffer->get_buffer_view());
 
     for (size_t i=n + 100; i<2*n; i++) {
-        R r;
-        r.key = std::string("computer");
-        r.value = 1234;
+        const char *c = "computer";
+        R r = {c, 1234, 8};
 
         auto result = shard.point_lookup(r);
         ck_assert_ptr_null(result);
diff --git a/tests/include/testing.h b/tests/include/testing.h
index 2315daa..d0bff2d 100644
--- a/tests/include/testing.h
+++ b/tests/include/testing.h
@@ -27,14 +27,17 @@ typedef de::WeightedRecord<uint64_t, uint32_t, uint64_t> WRec;
 typedef de::Record<uint64_t, uint32_t> Rec;
 typedef de::EuclidPoint<uint64_t> PRec;
 
-typedef de::Record<std::string, uint64_t> StringRec;
+typedef de::Record<const char*, uint64_t> StringRec;
 
-std::string kjv_wordlist = "tests/data/kjv-wordlist.txt";
-std::string summa_wordlist = "tests/data/summa-wordlist.txt";
+static std::string kjv_wordlist = "tests/data/kjv-wordlist.txt";
+static std::string summa_wordlist = "tests/data/summa-wordlist.txt";
+
+static std::vector<std::unique_ptr<char[]>> string_data;
 
 static std::vector<StringRec> read_string_data(std::string fname, size_t n) {
     std::vector<StringRec> vec;
     vec.reserve(n);
+    string_data.reserve(n);
 
     std::fstream file;
     file.open(fname, std::ios::in);
@@ -44,13 +47,17 @@ static std::vector<StringRec> read_string_data(std::string fname, size_t n) {
         if (!std::getline(file, line, '\n')) break;
 
         std::stringstream ls(line);
-        StringRec r;
         std::string field;
 
         std::getline(ls, field, '\t');
-        r.value = atol(field.c_str());
+        auto val = atol(field.c_str());
         std::getline(ls, field, '\n');
-        r.key = std::string(field);
+
+        char *c = strdup(field.c_str());
+
+        string_data.push_back(std::unique_ptr<char[]>(c));
+
+        StringRec r(string_data[string_data.size() -1].get(), val, field.size());
         
         vec.push_back(r);
     }
@@ -62,7 +69,7 @@ static std::vector<StringRec> read_string_data(std::string fname, size_t n) {
 template <de::RecordInterface R> 
 std::vector<R> strip_wrapping(std::vector<de::Wrapped<R>> vec) {
     std::vector<R> out(vec.size());
-    for (size_t i=0; i<vec.size(); i++) {
+    for (uint32_t i=0; i<vec.size(); i++) {
         out[i] = vec[i].rec;
     }
 
@@ -115,34 +122,24 @@ static de::MutableBuffer<R> *create_test_mbuffer(size_t cnt)
 {
     auto buffer = new de::MutableBuffer<R>(cnt/2, cnt);
 
-    R rec;
     if constexpr (de::KVPInterface<R>){
-        if constexpr (std::is_same_v<decltype(R::key), std::string>) {
+        if constexpr (std::is_same_v<decltype(R::key), const char*>){
             auto records = read_string_data(kjv_wordlist, cnt);
             for (size_t i=0; i<cnt; i++) {
-                if constexpr (de::WeightedRecordInterface<R>) {
-                    rec.weight = 1;
-                }
-
                 buffer->append(records[i]);
             }
         } else {
             for (size_t i = 0; i < cnt; i++) {
-                rec.key = rand();
-                rec.value = rand();
-
                 if constexpr (de::WeightedRecordInterface<R>) {
-                    rec.weight = 1;
+                    buffer->append({(uint64_t) rand(), (uint32_t) rand(), 1});
+                } else {
+                    buffer->append({(uint64_t) rand(), (uint32_t) rand()});
                 }
-
-                buffer->append(rec);
             }
         }
     } else if constexpr (de::NDRecordInterface<R>) {
         for (size_t i=0; i<cnt; i++) {
-            uint64_t a = rand();
-            uint64_t b = rand();
-            buffer->append({a, b});
+            buffer->append({(uint64_t) rand(), (uint64_t) rand()});
         }
     } 
 
@@ -155,25 +152,19 @@ static de::MutableBuffer<R> *create_sequential_mbuffer(size_t start, size_t stop
     size_t cnt = stop - start;
     auto buffer = new de::MutableBuffer<R>(cnt/2, cnt);
 
-    for (size_t i=start; i<stop; i++) {
-        R rec;
-        if constexpr (de::KVPInterface<R>) {
-            rec.key = i;
-            rec.value = i;
-        } else if constexpr (de::NDRecordInterface<R>) {
-            rec = {i, i};
-        }
+    for (uint32_t i=start; i<stop; i++) {
 
         if constexpr (de::WeightedRecordInterface<R>) {
-            rec.weight = 1;
+            buffer->append({i, i, 1});
+        } else {
+            buffer->append({i, i});
         }
-
-        buffer->append(rec);
     }
 
     return buffer;
 }
 
+/*
 template <de::KVPInterface R>
 static de::MutableBuffer<R> *create_test_mbuffer_tombstones(size_t cnt, size_t ts_cnt) 
 {
@@ -183,13 +174,13 @@ static de::MutableBuffer<R> *create_test_mbuffer_tombstones(size_t cnt, size_t t
 
     R rec;
     for (size_t i = 0; i < cnt; i++) {
-        rec.key = rand();
-        rec.value = rand();
-
         if constexpr (de::WeightedRecordInterface<R>) {
-            rec.weight = 1;
+            rec = {rand(), rand(), 1};
+        } else {
+            rec = {rand(), rand(), 1};
         }
 
+
         if (i < ts_cnt) {
             tombstones.push_back({rec.key, rec.value});
         }
@@ -204,6 +195,7 @@ static de::MutableBuffer<R> *create_test_mbuffer_tombstones(size_t cnt, size_t t
 
     return buffer;
 }
+*/
 
 template <typename R>
 requires de::WeightedRecordInterface<R> && de::KVPInterface<R>
@@ -234,20 +226,12 @@ static de::MutableBuffer<R> *create_double_seq_mbuffer(size_t cnt, bool ts=false
 {
     auto buffer = new de::MutableBuffer<R>(cnt/2, cnt);
 
-    for (size_t i = 0; i < cnt / 2; i++) { 
-        R rec;
-        rec.key = i;
-        rec.value = i;
-
-        buffer->append(rec, ts);
+    for (uint32_t i = 0; i < cnt / 2; i++) { 
+        buffer->append({i, i}, ts);
     }
 
-    for (size_t i = 0; i < cnt / 2; i++) {
-        R rec;
-        rec.key = i;
-        rec.value = i + 1;
-
-        buffer->append(rec, ts);
+    for (uint32_t i = 0; i < cnt / 2; i++) {
+        buffer->append({i, i+1}, ts);
     }
 
     return buffer;