You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jb...@apache.org on 2009/08/10 17:29:58 UTC
svn commit: r802826 - in
/incubator/cassandra/trunk/src/java/org/apache/cassandra/db:
ColumnFamilyStore.java filter/NamesQueryFilter.java filter/QueryFilter.java
filter/SliceQueryFilter.java
Author: jbellis
Date: Mon Aug 10 15:29:58 2009
New Revision: 802826
URL: http://svn.apache.org/viewvc?rev=802826&view=rev
Log:
rename, clean up collectColumns methods
patch by jbellis; reviewed by Evan Weaver for CASSANDRA-356
Modified:
incubator/cassandra/trunk/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
incubator/cassandra/trunk/src/java/org/apache/cassandra/db/filter/NamesQueryFilter.java
incubator/cassandra/trunk/src/java/org/apache/cassandra/db/filter/QueryFilter.java
incubator/cassandra/trunk/src/java/org/apache/cassandra/db/filter/SliceQueryFilter.java
Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/db/ColumnFamilyStore.java?rev=802826&r1=802825&r2=802826&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/db/ColumnFamilyStore.java (original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/db/ColumnFamilyStore.java Mon Aug 10 15:29:58 2009
@@ -33,7 +33,6 @@
import org.apache.cassandra.config.DatabaseDescriptor;
import org.apache.cassandra.dht.Range;
-import org.apache.cassandra.dht.IPartitioner;
import org.apache.cassandra.io.*;
import org.apache.cassandra.net.EndPoint;
import org.apache.cassandra.service.StorageService;
@@ -1437,7 +1436,7 @@
if (!collated.hasNext())
return null;
- filter.collectColumns(returnCF, collated, gcBefore);
+ filter.collectCollatedColumns(returnCF, collated, gcBefore);
return removeDeleted(returnCF, gcBefore); // collect does a first pass but doesn't try to recognize e.g. the entire CF being tombstoned
}
Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/db/filter/NamesQueryFilter.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/db/filter/NamesQueryFilter.java?rev=802826&r1=802825&r2=802826&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/db/filter/NamesQueryFilter.java (original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/db/filter/NamesQueryFilter.java Mon Aug 10 15:29:58 2009
@@ -1,10 +1,7 @@
package org.apache.cassandra.db.filter;
import java.io.IOException;
-import java.util.SortedSet;
-import java.util.Arrays;
-import java.util.TreeSet;
-import java.util.Comparator;
+import java.util.*;
import org.apache.cassandra.io.SSTableReader;
import org.apache.cassandra.utils.ReducingIterator;
@@ -64,10 +61,11 @@
}
}
- public void collectColumns(ColumnFamily returnCF, ReducingIterator<IColumn> reducedColumns, int gcBefore)
+ public void collectReducedColumns(ColumnFamily returnCF, Iterator<IColumn> reducedColumns, int gcBefore)
{
- for (IColumn column : reducedColumns)
+ while (reducedColumns.hasNext())
{
+ IColumn column = reducedColumns.next();
if (!column.isMarkedForDelete() || column.getLocalDeletionTime() > gcBefore)
returnCF.addColumn(column);
}
Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/db/filter/QueryFilter.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/db/filter/QueryFilter.java?rev=802826&r1=802825&r2=802826&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/db/filter/QueryFilter.java (original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/db/filter/QueryFilter.java Mon Aug 10 15:29:58 2009
@@ -38,7 +38,7 @@
* by the filter code, which should have some limit on the number of columns
* to avoid running out of memory on large rows.
*/
- public abstract void collectColumns(ColumnFamily returnCF, ReducingIterator<IColumn> reducedColumns, int gcBefore);
+ public abstract void collectReducedColumns(ColumnFamily returnCF, Iterator<IColumn> reducedColumns, int gcBefore);
/**
* subcolumns of a supercolumn are unindexed, so to pick out parts of those we operate in-memory.
@@ -57,7 +57,7 @@
};
}
- public void collectColumns(final ColumnFamily returnCF, Iterator collatedColumns, int gcBefore)
+ public void collectCollatedColumns(final ColumnFamily returnCF, Iterator<IColumn> collatedColumns, int gcBefore)
{
// define a 'reduced' iterator that merges columns w/ the same name, which
// greatly simplifies computing liveColumns in the presence of tombstones.
@@ -83,7 +83,7 @@
}
};
- collectColumns(returnCF, reduced, gcBefore);
+ collectReducedColumns(returnCF, reduced, gcBefore);
}
public String getColumnFamilyName()
Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/db/filter/SliceQueryFilter.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/db/filter/SliceQueryFilter.java?rev=802826&r1=802825&r2=802826&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/db/filter/SliceQueryFilter.java (original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/db/filter/SliceQueryFilter.java Mon Aug 10 15:29:58 2009
@@ -3,6 +3,7 @@
import java.io.IOException;
import java.util.Comparator;
import java.util.Arrays;
+import java.util.Iterator;
import org.apache.commons.collections.comparators.ReverseComparator;
@@ -66,13 +67,14 @@
return isAscending ? super.getColumnComparator(comparator) : new ReverseComparator(super.getColumnComparator(comparator));
}
- public void collectColumns(ColumnFamily returnCF, ReducingIterator<IColumn> reducedColumns, int gcBefore)
+ public void collectReducedColumns(ColumnFamily returnCF, Iterator<IColumn> reducedColumns, int gcBefore)
{
int liveColumns = 0;
AbstractType comparator = returnCF.getComparator();
- for (IColumn column : reducedColumns)
+ while (reducedColumns.hasNext())
{
+ IColumn column = reducedColumns.next();
if (liveColumns >= count)
break;
if (finish.length > 0