Author: slebresne Date: Fri May 27 14:25:42 2011 New Revision: 1128319 URL: http://svn.apache.org/viewvc?rev=1128319&view=rev Log: Reverting buggy assertion from CASSANDRA-2641
Modified: cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/dht/AbstractBounds.java Modified: cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/dht/AbstractBounds.java URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/dht/AbstractBounds.java?rev=1128319&r1=1128318&r2=1128319&view=diff ============================================================================== --- cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/dht/AbstractBounds.java (original) +++ cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/dht/AbstractBounds.java Fri May 27 14:25:42 2011 @@ -96,15 +96,8 @@ public abstract class AbstractBounds imp { // unwrap all List<AbstractBounds> output = new ArrayList<AbstractBounds>(); - AbstractBounds previous = null; for (AbstractBounds bound : bounds) - { - List<AbstractBounds> unwrapped = bound.unwrap(); - assert previous == null || previous.right.compareTo(unwrapped.get(0).left) <= 0 : - "Overlapping ranges passed to normalize: see CASSANDRA-2641: " + previous + " and " + unwrapped; - output.addAll(unwrapped); - previous = unwrapped.get(unwrapped.size() - 1); - } + output.addAll(bound.unwrap()); // sort by left Collections.sort(output, new Comparator<AbstractBounds>()