Merge pull request #4 from dbrumbaugh/master

Updates for VLDB revision

1 files changed, 3 insertions, 12 deletions

diff --git a/tests/include/concurrent_extension.h b/tests/include/concurrent_extension.h
index 0993fac..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 {
@@ -170,10 +168,8 @@ START_TEST(t_range_query)
     p.lower_bound = lower_key;
     p.upper_bound = upper_key;
 
-    //fprintf(stderr, "query start\n");
     auto result = test_de->query(&p);
     auto r = result.get();
-    //fprintf(stderr, "query stop\n");
     std::sort(r.begin(), r.end());
 
     ck_assert_int_eq(r.size(), 251);
@@ -349,12 +345,7 @@ START_TEST(t_static_structure)
     uint64_t prev_key = 0;
     for (size_t i=0; i<flat->get_record_count(); i++) {
         auto k = flat->get_record_at(i)->rec.key;
-        if (flat->get_record_at(i)->is_tombstone()) {
-            fprintf(stderr, "%ld %ld %ld\n", flat->get_record_at(i-1)->rec.key,
-                    flat->get_record_at(i)->rec.key, 
-                    flat->get_record_at(i+1)->rec.key);
-        }
-     //   ck_assert(!flat->get_record_at(i)->is_tombstone());
+        //ck_assert(!flat->get_record_at(i)->is_tombstone());
         ck_assert_int_ge(k, prev_key);
         prev_key = k;
     }