Add range reads to ServerBench

ServerBench.cpp

@@ -31,23 +31,38 @@ std::basic_string<uint8_t> numToKey(int64_t num) {
 
 void workload(weaselab::ConflictSet *cs) {
   int64_t version = kWindowSize;
+  cs->addWrites(nullptr, 0, version);
   for (;; transactions.fetch_add(1, std::memory_order_relaxed)) {
-    // Read
+    // Reads
     {
-      auto rv = version - kWindowSize + rand() % kWindowSize;
+      auto beginK = numToKey(version - kWindowSize);
-      auto k = numToKey(rv);
+      auto endK = numToKey(version - 1);
-      weaselab::ConflictSet::ReadRange r;
+      auto pointRv = version - kWindowSize + rand() % kWindowSize + 1;
-      r.begin.p = k.data();
+      auto pointK = numToKey(pointRv);
-      r.begin.len = k.size();
+      weaselab::ConflictSet::ReadRange reads[] = {
-      r.end.len = 0;
+          {
-      r.readVersion = rv;
+              {pointK.data(), int(pointK.size())},
-      weaselab::ConflictSet::Result result;
+              {nullptr, 0},
-      cs->check(&r, &result, 1);
+              pointRv,
-      if (result != weaselab::ConflictSet::Commit) {
+          },
-        abort();
+          {
-      }
+              {beginK.data(), int(beginK.size())},
+              {endK.data(), int(endK.size())},
+              version - 2,
+          },
+      };
+      weaselab::ConflictSet::Result result[sizeof(reads) / sizeof(reads[0])];
+      cs->check(reads, result, sizeof(reads) / sizeof(reads[0]));
+      // for (int i = 0; i < sizeof(reads) / sizeof(reads[0]); ++i) {
+      //   if (result[i] != weaselab::ConflictSet::Commit) {
+      //     fprintf(stderr, "Unexpected conflict: [%s, %s) @ %" PRId64 "\n",
+      //             printable(reads[i].begin).c_str(),
+      //             printable(reads[i].end).c_str(), reads[i].readVersion);
+      //     abort();
+      //   }
+      // }
     }
-    // Write
+    // Writes
     {
       weaselab::ConflictSet::WriteRange w;
       auto k = numToKey(version);