svn commit: r1291843 - /lucene/dev/trunk/solr/core/src/test/org/apache/solr/update/PeerSyncTest.java

[yo...@apache.org]

Author: yonik
Date: Tue Feb 21 15:07:39 2012
New Revision: 1291843

URL: http://svn.apache.org/viewvc?rev=1291843&view=rev
Log:
tests: more reorder testing in peersync

Modified:
    lucene/dev/trunk/solr/core/src/test/org/apache/solr/update/PeerSyncTest.java

Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/update/PeerSyncTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/update/PeerSyncTest.java?rev=1291843&r1=1291842&r2=1291843&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/update/PeerSyncTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/update/PeerSyncTest.java Tue Feb 21 15:07:39 2012
@@ -122,8 +122,6 @@ public class PeerSyncTest extends BaseDi
     assertSync(client1, numVersions, true, shardsArr[0]);
     client0.commit(); client1.commit(); queryAndCompare(params("q", "*:*", "sort","_version_ desc"), client0, client1);
 
-
-
     // test delete and deleteByQuery
     v=1000;
     add(client0, seenLeader, sdoc("id","1000","_version_",++v));
@@ -153,7 +151,31 @@ public class PeerSyncTest extends BaseDi
     add(client, seenLeader, sdoc("id","2002","_version_",++v));
     del(client, params("leader","true","_version_",Long.toString(-++v)), "2000");
 
-    // assertSync(client1, numVersions, true, shardsArr[0]);
+    assertSync(client1, numVersions, true, shardsArr[0]);
+    client0.commit(); client1.commit(); queryAndCompare(params("q", "*:*", "sort","_version_ desc"), client0, client1);
+
+
+    //
+    // Test that handling reorders work when applying docs retrieved from peer
+    //
+
+    // this should cause us to retrieve the delete (but not the following add)
+    // the reorder in application shouldn't affect anything
+    add(client0, seenLeader, sdoc("id","3000","_version_",3001));
+    add(client1, seenLeader, sdoc("id","3000","_version_",3001));
+    del(client0, params("leader","true","_version_","3000"),  "3000");
+
+    // this should cause us to retrieve an add tha was previously deleted
+    add(client0, seenLeader, sdoc("id","3001","_version_",3003));
+    del(client0, params("leader","true","_version_","3001"),  "3004");
+    del(client1, params("leader","true","_version_","3001"),  "3004");
+
+    // this should cause us to retrieve an older add that was overwritten
+    add(client0, seenLeader, sdoc("id","3002","_version_",3004));
+    add(client0, seenLeader, sdoc("id","3002","_version_",3005));
+    add(client1, seenLeader, sdoc("id","3002","_version_",3005));
+
+    assertSync(client1, numVersions, true, shardsArr[0]);
     client0.commit(); client1.commit(); queryAndCompare(params("q", "*:*", "sort","_version_ desc"), client0, client1);
   }