From 630216178d058bb27d5516713e1e62f38682ef6f Mon Sep 17 00:00:00 2001
From: Nikhil Benesch <nikhil.benesch@gmail.com>
Date: Tue, 26 Jan 2016 22:34:36 -0500
Subject: [PATCH] Add failing iscan test

---
 kvtest.hh            | 62 ++++++++++++++++++++++++++++++++++++++++++++
 masstree_iterator.hh |  1 +
 mttest.cc            |  1 +
 3 files changed, 64 insertions(+)

diff --git a/kvtest.hh b/kvtest.hh
index 4296079..da6744c 100644
--- a/kvtest.hh
+++ b/kvtest.hh
@@ -1632,6 +1632,68 @@ void kvtest_iscan2(C &client)
 }
 
 
+// Test scans where nodes in a deeper layer are removed
+template <typename C>
+void kvtest_iscan3(C &client)
+{
+    Json report;
+
+    if (client.id() == 0) {
+        unsigned rounds = 0;
+
+        client.put_key8(1, 1);
+        client.put_key16(300000002, 1);
+
+        while (1) {
+            client.remove_key8(2);
+            client.put_key16(300000001, 1);
+
+            std::vector<Str> keys, values;
+            client.iscan_sync("", INT_MAX, keys, values);
+
+            // Valid key sequences:
+            //     - 00000001, 00000002, 0000000300000002
+            //     - 00000001, 00000002, 0000000300000001, 0000000300000002
+            //     - 00000001, 0000000300000001, 0000000300000002
+            //
+            // Invalid key sequences:
+            //     - 00000001, 0000000300000002
+
+            if (keys.size() <= 2) {
+                String seq;
+                for (size_t i = 0; i < keys.size(); ++i) {
+                    if (i != 0)
+                        seq += ", ";
+
+                    seq += String(keys[i]);
+                }
+                client.fail(("invalid key sequence detected: " + seq).c_str());
+            }
+
+            while (client.get_sync_key16(300000001) && !client.timeout(0))
+                ;
+            if (client.timeout(0))
+                break;
+
+            rounds++;
+        }
+
+        report.set("rounds", rounds);
+    } else if (client.id() == 1) {
+        while (1) {
+            while (!client.get_sync_key16(300000001) && !client.timeout(0))
+                client.rcu_quiesce();
+            if (client.timeout(0))
+                break;
+
+            client.put_key8(2, 1);
+            client.remove_key16(300000001);
+        }
+    }
+
+    client.report(report);
+}
+
 // test concurrent splits with removes in lower layers
 template <typename C>
 void kvtest_splitremove1(C &client)
diff --git a/masstree_iterator.hh b/masstree_iterator.hh
index 4b60208..f405f3b 100644
--- a/masstree_iterator.hh
+++ b/masstree_iterator.hh
@@ -145,6 +145,7 @@ basic_table<P>::iterator::advance(bool emit_equal) {
 
     ka_.assign_store_ikey(ikey);
     if (n->keylenx_is_layer(keylenx)) {
+        usleep(1);
         ka_.shift();
         root = entry.layer();
         n = root->reach_leaf(ka_, v, *ti_);
diff --git a/mttest.cc b/mttest.cc
index 22005d3..067a2a2 100644
--- a/mttest.cc
+++ b/mttest.cc
@@ -554,6 +554,7 @@ MAKE_TESTRUNNER(rscan1, kvtest_rscan1(client, 0));
 MAKE_TESTRUNNER(rscan1q80, kvtest_rscan1(client, 0.8));
 MAKE_TESTRUNNER(iscan1, kvtest_iscan1(client, 0));
 MAKE_TESTRUNNER(iscan2, kvtest_iscan2(client));
+MAKE_TESTRUNNER(iscan3, kvtest_iscan3(client));
 MAKE_TESTRUNNER(iscan1q80, kvtest_iscan1(client, 0.8));
 MAKE_TESTRUNNER(splitremove1, kvtest_splitremove1(client));
 MAKE_TESTRUNNER(url, kvtest_url(client));