natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

use cloneMeShallow where appropriate. patch by jbellis for CASSANDRA-79 

git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@777583 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Jonathan Ellis 2009-05-22 15:37:19 +00:00
parent 4ac9118f7c
commit 56b499044b
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/java/org/apache/cassandra/db/CountFilter.java
View File

@ -55,9 +55,9 @@ public class CountFilter implements IFilter
{
String[] values = RowMutation.getColumnAndColumnFamily(cfNameParam);
if ( columnFamily == null )
return columnFamily;
return null;
ColumnFamily filteredCf = new ColumnFamily(columnFamily.name(), columnFamily.type());
ColumnFamily filteredCf = columnFamily.cloneMeShallow();
if( countLimit_ <= 0 )
{
isDone_ = true;

4
src/java/org/apache/cassandra/db/NamesFilter.java
View File

@ -43,10 +43,10 @@ public class NamesFilter implements IFilter
{
if ( columnFamily == null )
{
return columnFamily;
return null;
}
String[] values = RowMutation.getColumnAndColumnFamily(cf);
ColumnFamily filteredCf = new ColumnFamily(columnFamily.name(), columnFamily.type());
ColumnFamily filteredCf = columnFamily.cloneMeShallow();
if( values.length == 1 )
{
Collection<IColumn> columns = columnFamily.getAllColumns();

2
src/java/org/apache/cassandra/db/RangeFilter.java
View File

@ -63,7 +63,7 @@ public class RangeFilter implements IFilter
return null;
}
ColumnFamily filteredColumnFamily = new ColumnFamily(cfName, cf.type());
ColumnFamily filteredColumnFamily = cf.cloneMeShallow();
Collection<IColumn> columns = cf.getAllColumns();
for (IColumn c : columns)

4
src/java/org/apache/cassandra/db/TimeFilter.java
View File

@ -48,10 +48,10 @@ class TimeFilter implements IFilter
public ColumnFamily filter(String cf, ColumnFamily columnFamily)
{
if (columnFamily == null)
return columnFamily;
return null;
String[] values = RowMutation.getColumnAndColumnFamily(cf);
ColumnFamily filteredCf = new ColumnFamily(columnFamily.name(), columnFamily.type());
ColumnFamily filteredCf = columnFamily.cloneMeShallow();
if (values.length == 1 && !columnFamily.isSuper())
{
Collection<IColumn> columns = columnFamily.getAllColumns();