Set up tombstone deletes properly

2 files changed, 20 insertions, 13 deletions

diff --git a/tests/include/rangecount.h b/tests/include/rangecount.h
index 83bf4d4..e09ab12 100644
--- a/tests/include/rangecount.h
+++ b/tests/include/rangecount.h
@@ -33,6 +33,7 @@
 
 START_TEST(t_range_count)
 {
+    
     auto buffer = create_sequential_mbuffer<Rec>(100, 1000);
     auto shard = Shard(buffer->get_buffer_view());
 
@@ -60,12 +61,15 @@ START_TEST(t_buffer_range_count)
     parms.lower_bound = 300;
     parms.upper_bound = 500;
 
-    auto state = rc::Query<Shard, Rec>::get_buffer_query_state(buffer->get_buffer_view(), &parms);
-    auto result = rc::Query<Shard, Rec>::buffer_query(state, &parms);
-    rc::Query<Shard, Rec>::delete_buffer_query_state(state);
+    {
+        auto view = buffer->get_buffer_view();
+        auto state = rc::Query<Shard, Rec>::get_buffer_query_state(&view, &parms);
+        auto result = rc::Query<Shard, Rec>::buffer_query(state, &parms);
+        rc::Query<Shard, Rec>::delete_buffer_query_state(state);
 
-    ck_assert_int_eq(result.size(), 1);
-    ck_assert_int_eq(result[0].rec.key, parms.upper_bound - parms.lower_bound + 1);
+        ck_assert_int_eq(result.size(), 1);
+        ck_assert_int_eq(result[0].rec.key, parms.upper_bound - parms.lower_bound + 1);
+    }
 
     delete buffer;
 }
diff --git a/tests/include/rangequery.h b/tests/include/rangequery.h
index 1ac0891..b9694a4 100644
--- a/tests/include/rangequery.h
+++ b/tests/include/rangequery.h
@@ -64,14 +64,17 @@ START_TEST(t_buffer_range_query)
     parms.lower_bound = 300;
     parms.upper_bound = 500;
 
-    auto state = rq::Query<Shard, Rec>::get_buffer_query_state(buffer->get_buffer_view(), &parms);
-    auto result = rq::Query<Shard, Rec>::buffer_query(state, &parms);
-    rq::Query<Shard, Rec>::delete_buffer_query_state(state);
-
-    ck_assert_int_eq(result.size(), parms.upper_bound - parms.lower_bound + 1);
-    for (size_t i=0; i<result.size(); i++) {
-        ck_assert_int_le(result[i].rec.key, parms.upper_bound);
-        ck_assert_int_ge(result[i].rec.key, parms.lower_bound);
+    {
+        auto view = buffer->get_buffer_view();
+        auto state = rq::Query<Shard, Rec>::get_buffer_query_state(&view, &parms);
+        auto result = rq::Query<Shard, Rec>::buffer_query(state, &parms);
+        rq::Query<Shard, Rec>::delete_buffer_query_state(state);
+
+        ck_assert_int_eq(result.size(), parms.upper_bound - parms.lower_bound + 1);
+        for (size_t i=0; i<result.size(); i++) {
+            ck_assert_int_le(result[i].rec.key, parms.upper_bound);
+            ck_assert_int_ge(result[i].rec.key, parms.lower_bound);
+        }
     }
 
     delete buffer;