svn commit: r1176371 - in /cassandra/branches/cassandra-1.0.0: CHANGES.txt src/java/org/apache/cassandra/utils/MergeIterator.java

[sl...@apache.org]

Author: slebresne
Date: Tue Sep 27 13:10:41 2011
New Revision: 1176371

URL: http://svn.apache.org/viewvc?rev=1176371&view=rev
Log:
Remove incorrect assertion in MergeIterator
patch by slebresne; reviewed by jbellis for CASSANDRA-3260

Modified:
    cassandra/branches/cassandra-1.0.0/CHANGES.txt
    cassandra/branches/cassandra-1.0.0/src/java/org/apache/cassandra/utils/MergeIterator.java

Modified: cassandra/branches/cassandra-1.0.0/CHANGES.txt
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-1.0.0/CHANGES.txt?rev=1176371&r1=1176370&r2=1176371&view=diff
==============================================================================
--- cassandra/branches/cassandra-1.0.0/CHANGES.txt (original)
+++ cassandra/branches/cassandra-1.0.0/CHANGES.txt Tue Sep 27 13:10:41 2011
@@ -3,6 +3,7 @@
    that don't exist anymore (CASSANDRA-3256)
  * test for NUMA policy support as well as numactl presence (CASSANDRA-3245)
  * Fix FD leak when internode encryption is enabled (CASSANDRA-3257)
+ * Remove incorrect assertion in mergeIterator (CASSANDRA-3260)
 
 
 1.0.0-rc1

Modified: cassandra/branches/cassandra-1.0.0/src/java/org/apache/cassandra/utils/MergeIterator.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-1.0.0/src/java/org/apache/cassandra/utils/MergeIterator.java?rev=1176371&r1=1176370&r2=1176371&view=diff
==============================================================================
--- cassandra/branches/cassandra-1.0.0/src/java/org/apache/cassandra/utils/MergeIterator.java (original)
+++ cassandra/branches/cassandra-1.0.0/src/java/org/apache/cassandra/utils/MergeIterator.java Tue Sep 27 13:10:41 2011
@@ -40,7 +40,6 @@ public abstract class MergeIterator<In,O
                                                     Comparator<In> comparator,
                                                     final Reducer<In, Out> reducer)
     {
-        assert !sources.isEmpty();
         if (sources.size() == 1)
             return reducer.trivialReduceIsTrivial()
                    ? new TrivialOneToOne<In, Out>(sources, reducer)