Author: jbellis Date: Thu Sep 22 22:56:47 2011 New Revision: 1174440 URL: http://svn.apache.org/viewvc?rev=1174440&view=rev Log: LazilyCompactedRow and QueryFilter incorrectly claimed their trivial reduce case was trivial
Modified: cassandra/branches/cassandra-1.0.0/src/java/org/apache/cassandra/db/RowIteratorFactory.java cassandra/branches/cassandra-1.0.0/src/java/org/apache/cassandra/db/compaction/CompactionIterable.java cassandra/branches/cassandra-1.0.0/src/java/org/apache/cassandra/db/compaction/LazilyCompactedRow.java cassandra/branches/cassandra-1.0.0/src/java/org/apache/cassandra/db/compaction/ParallelCompactionIterable.java cassandra/branches/cassandra-1.0.0/src/java/org/apache/cassandra/db/filter/QueryFilter.java cassandra/branches/cassandra-1.0.0/src/java/org/apache/cassandra/io/sstable/ReducingKeyIterator.java cassandra/branches/cassandra-1.0.0/src/java/org/apache/cassandra/service/RangeSliceResponseResolver.java cassandra/branches/cassandra-1.0.0/src/java/org/apache/cassandra/utils/MergeIterator.java cassandra/branches/cassandra-1.0.0/test/unit/org/apache/cassandra/utils/MergeIteratorTest.java Modified: cassandra/branches/cassandra-1.0.0/src/java/org/apache/cassandra/db/RowIteratorFactory.java URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-1.0.0/src/java/org/apache/cassandra/db/RowIteratorFactory.java?rev=1174440&r1=1174439&r2=1174440&view=diff ============================================================================== --- cassandra/branches/cassandra-1.0.0/src/java/org/apache/cassandra/db/RowIteratorFactory.java (original) +++ cassandra/branches/cassandra-1.0.0/src/java/org/apache/cassandra/db/RowIteratorFactory.java Thu Sep 22 22:56:47 2011 @@ -100,11 +100,6 @@ public class RowIteratorFactory private DecoratedKey key; private ColumnFamily returnCF; - public boolean trivialReduceIsTrivial() - { - return false; - } - @Override protected void onKeyChange() { Modified: cassandra/branches/cassandra-1.0.0/src/java/org/apache/cassandra/db/compaction/CompactionIterable.java URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-1.0.0/src/java/org/apache/cassandra/db/compaction/CompactionIterable.java?rev=1174440&r1=1174439&r2=1174440&view=diff ============================================================================== --- cassandra/branches/cassandra-1.0.0/src/java/org/apache/cassandra/db/compaction/CompactionIterable.java (original) +++ cassandra/branches/cassandra-1.0.0/src/java/org/apache/cassandra/db/compaction/CompactionIterable.java Thu Sep 22 22:56:47 2011 @@ -88,11 +88,6 @@ public class CompactionIterable extends { protected final List<SSTableIdentityIterator> rows = new ArrayList<SSTableIdentityIterator>(); - public boolean trivialReduceIsTrivial() - { - return false; - } - public void reduce(IColumnIterator current) { rows.add((SSTableIdentityIterator) current); Modified: cassandra/branches/cassandra-1.0.0/src/java/org/apache/cassandra/db/compaction/LazilyCompactedRow.java URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-1.0.0/src/java/org/apache/cassandra/db/compaction/LazilyCompactedRow.java?rev=1174440&r1=1174439&r2=1174440&view=diff ============================================================================== --- cassandra/branches/cassandra-1.0.0/src/java/org/apache/cassandra/db/compaction/LazilyCompactedRow.java (original) +++ cassandra/branches/cassandra-1.0.0/src/java/org/apache/cassandra/db/compaction/LazilyCompactedRow.java Thu Sep 22 22:56:47 2011 @@ -215,11 +215,6 @@ public class LazilyCompactedRow extends int size = 0; long maxTimestampSeen = Long.MIN_VALUE; - public boolean trivialReduceIsTrivial() - { - return true; - } - public void reduce(IColumn current) { container.addColumn(current); Modified: cassandra/branches/cassandra-1.0.0/src/java/org/apache/cassandra/db/compaction/ParallelCompactionIterable.java URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-1.0.0/src/java/org/apache/cassandra/db/compaction/ParallelCompactionIterable.java?rev=1174440&r1=1174439&r2=1174440&view=diff ============================================================================== --- cassandra/branches/cassandra-1.0.0/src/java/org/apache/cassandra/db/compaction/ParallelCompactionIterable.java (original) +++ cassandra/branches/cassandra-1.0.0/src/java/org/apache/cassandra/db/compaction/ParallelCompactionIterable.java Thu Sep 22 22:56:47 2011 @@ -148,11 +148,6 @@ public class ParallelCompactionIterable private final ThreadPoolExecutor executor; private int row = 0; - public boolean trivialReduceIsTrivial() - { - return false; - } - private Reducer() { super(); Modified: cassandra/branches/cassandra-1.0.0/src/java/org/apache/cassandra/db/filter/QueryFilter.java URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-1.0.0/src/java/org/apache/cassandra/db/filter/QueryFilter.java?rev=1174440&r1=1174439&r2=1174440&view=diff ============================================================================== --- cassandra/branches/cassandra-1.0.0/src/java/org/apache/cassandra/db/filter/QueryFilter.java (original) +++ cassandra/branches/cassandra-1.0.0/src/java/org/apache/cassandra/db/filter/QueryFilter.java Thu Sep 22 22:56:47 2011 @@ -97,11 +97,6 @@ public class QueryFilter { ColumnFamily curCF = returnCF.cloneMeShallow(); - public boolean trivialReduceIsTrivial() - { - return true; - } - protected boolean isEqual(IColumn o1, IColumn o2) { return o1.name().equals(o2.name()); Modified: cassandra/branches/cassandra-1.0.0/src/java/org/apache/cassandra/io/sstable/ReducingKeyIterator.java URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-1.0.0/src/java/org/apache/cassandra/io/sstable/ReducingKeyIterator.java?rev=1174440&r1=1174439&r2=1174440&view=diff ============================================================================== --- cassandra/branches/cassandra-1.0.0/src/java/org/apache/cassandra/io/sstable/ReducingKeyIterator.java (original) +++ cassandra/branches/cassandra-1.0.0/src/java/org/apache/cassandra/io/sstable/ReducingKeyIterator.java Thu Sep 22 22:56:47 2011 @@ -43,6 +43,7 @@ public class ReducingKeyIterator impleme { DecoratedKey<?> reduced = null; + @Override public boolean trivialReduceIsTrivial() { return true; Modified: cassandra/branches/cassandra-1.0.0/src/java/org/apache/cassandra/service/RangeSliceResponseResolver.java URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-1.0.0/src/java/org/apache/cassandra/service/RangeSliceResponseResolver.java?rev=1174440&r1=1174439&r2=1174440&view=diff ============================================================================== --- cassandra/branches/cassandra-1.0.0/src/java/org/apache/cassandra/service/RangeSliceResponseResolver.java (original) +++ cassandra/branches/cassandra-1.0.0/src/java/org/apache/cassandra/service/RangeSliceResponseResolver.java Thu Sep 22 22:56:47 2011 @@ -141,11 +141,6 @@ public class RangeSliceResponseResolver List<InetAddress> versionSources = new ArrayList<InetAddress>(sources.size()); DecoratedKey key; - public boolean trivialReduceIsTrivial() - { - return false; - } - public void reduce(Pair<Row,InetAddress> current) { key = current.left.key; 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=1174440&r1=1174439&r2=1174440&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 Thu Sep 22 22:56:47 2011 @@ -161,7 +161,10 @@ public abstract class MergeIterator<In,O /** * @return true if Out is the same as In for the case of a single source iterator */ - public abstract boolean trivialReduceIsTrivial(); + public boolean trivialReduceIsTrivial() + { + return false; + } /** * combine this object with the previous ones. Modified: cassandra/branches/cassandra-1.0.0/test/unit/org/apache/cassandra/utils/MergeIteratorTest.java URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-1.0.0/test/unit/org/apache/cassandra/utils/MergeIteratorTest.java?rev=1174440&r1=1174439&r2=1174440&view=diff ============================================================================== --- cassandra/branches/cassandra-1.0.0/test/unit/org/apache/cassandra/utils/MergeIteratorTest.java (original) +++ cassandra/branches/cassandra-1.0.0/test/unit/org/apache/cassandra/utils/MergeIteratorTest.java Thu Sep 22 22:56:47 2011 @@ -51,11 +51,6 @@ public class MergeIteratorTest { String concatted = ""; - public boolean trivialReduceIsTrivial() - { - return false; // technically true, but let's not optimize anything away here... - } - public void reduce(String value) { concatted += value;