You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by be...@apache.org on 2015/05/06 18:20:45 UTC

cassandra git commit: ninja fix LongBTreeTest

Repository: cassandra
Updated Branches:
  refs/heads/trunk 6b1276791 -> 4dbe1e0c7


ninja fix LongBTreeTest


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4dbe1e0c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4dbe1e0c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4dbe1e0c

Branch: refs/heads/trunk
Commit: 4dbe1e0c72763a2eeda66bee2f11487034566108
Parents: 6b12767
Author: Benedict Elliott Smith <be...@apache.org>
Authored: Wed May 6 17:20:28 2015 +0100
Committer: Benedict Elliott Smith <be...@apache.org>
Committed: Wed May 6 17:20:28 2015 +0100

----------------------------------------------------------------------
 test/long/org/apache/cassandra/utils/LongBTreeTest.java | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/4dbe1e0c/test/long/org/apache/cassandra/utils/LongBTreeTest.java
----------------------------------------------------------------------
diff --git a/test/long/org/apache/cassandra/utils/LongBTreeTest.java b/test/long/org/apache/cassandra/utils/LongBTreeTest.java
index 133c6c5..9641930 100644
--- a/test/long/org/apache/cassandra/utils/LongBTreeTest.java
+++ b/test/long/org/apache/cassandra/utils/LongBTreeTest.java
@@ -148,6 +148,7 @@ public class LongBTreeTest
                             for (Integer key : randomSelection(tree, random))
                                 if (key != searchIterator.next(key))
                                     errors.incrementAndGet();
+                            searchIterator = new BTreeSearchIterator<Integer, Integer, Integer>(tree, ICMP);
                             for (Integer key : randomMix(tree, random))
                                 if (key != searchIterator.next(key))
                                     if (BTree.find(tree, ICMP, key) == key)
@@ -455,13 +456,15 @@ public class LongBTreeTest
         final float proportion = rnd.nextFloat();
         return Iterables.transform(new BTreeSet<>(iter, ICMP), new Function<Integer, Integer>()
         {
-            int last = Integer.MIN_VALUE;
+            long last = Integer.MIN_VALUE;
 
             public Integer apply(Integer v)
             {
+                long last = this.last;
+                this.last = v;
                 if (rnd.nextFloat() < proportion)
-                    return last = v;
-                return last = (v - last) / 2;
+                    return v;
+                return (int)((v - last) / 2);
             }
         });
     }