merge from 0.7

git-svn-id: https://svn.apache.org/repos/asf/cassandra/branches/cassandra-0.8@1094810 13f79535-47bb-0310-9956-ffa450edef68
apache · Apr 18, 2011 · ca988ef · ca988ef
1 parent d88fffd
commit ca988ef
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/src/java/org/apache/cassandra/service/AntiEntropyService.java b/src/java/org/apache/cassandra/service/AntiEntropyService.java
@@ -286,6 +286,7 @@ public static class Validator implements Runnable
         private transient long validated;
         private transient MerkleTree.TreeRange range;
         private transient MerkleTree.TreeRangeIterator ranges;
+        private transient DecoratedKey lastKey;
 
         public final static MerkleTree.RowHash EMPTY_ROW = new MerkleTree.RowHash(null, new byte[0]);
 
@@ -361,6 +362,9 @@ public void prepare(ColumnFamilyStore cfs)
         public void add(AbstractCompactedRow row)
         {
             assert request.range.contains(row.key.token) : row.key.token + " is not contained in " + request.range;
+            assert lastKey == null || lastKey.compareTo(row.key) < 0
+                   : "row " + row.key + " received out of order wrt " + lastKey;
+            lastKey = row.key;
 
             if (range == null)
                 range = ranges.next();