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

refactor IColumn.addColumn to remove redundant name parameter. patch by Sandeep Tata; reviewed by jbellis for CASSANDRA-96 

git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@772000 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Jonathan Ellis 2009-05-05 22:47:22 +00:00
parent 8dcf76ab27
commit 362f287c84
13 changed files with 35 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -104,7 +104,7 @@ class SuperColumnFactory extends AbstractColumnFactory
if(values.length == 2)
{
IColumn subColumn = new Column(values[1]);
superColumn.addColumn(values[1], subColumn);
superColumn.addColumn(subColumn);
}
return superColumn;
}
@ -126,7 +126,7 @@ class SuperColumnFactory extends AbstractColumnFactory
throw new IllegalArgumentException("Super Column " + name + " in invalid format. Must be in <super column name>:<column name> format.");
IColumn superColumn = new SuperColumn(values[0]);
IColumn subColumn = new Column(values[1], value, timestamp, deleted);
superColumn.addColumn(values[1], subColumn);
superColumn.addColumn(subColumn);
return superColumn;
}

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

@ -157,7 +157,7 @@ public final class Column implements IColumn
return size();
}
public void addColumn(String name, IColumn column)
public void addColumn(IColumn column)
{
throw new UnsupportedOperationException("This operation is not supported for simple columns.");
}

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

@ -637,7 +637,7 @@ public class ColumnFamilyStore implements ColumnFamilyStoreMBean
{
if (!subColumn.isMarkedForDelete() || subColumn.getLocalDeletionTime() > gcBefore)
{
sc.addColumn(subColumn.name(), subColumn);
sc.addColumn(subColumn);
}
}
}

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

@ -92,7 +92,7 @@ public class CountFilter implements IFilter
for(IColumn subColumn : subColumns)
{
if (offset_ <=0 ){
filteredSuperColumn.addColumn(subColumn.name(), subColumn);
filteredSuperColumn.addColumn(subColumn);
countLimit_--;
} else
offset_--;

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

@ -39,7 +39,7 @@ public interface IColumn
public byte[] value(String key);
public Collection<IColumn> getSubColumns();
public IColumn getSubColumn(String columnName);
public void addColumn(String name, IColumn column);
public void addColumn(IColumn column);
public IColumn diff(IColumn column);
public int getObjectCount();
public byte[] digest();

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

@ -288,7 +288,7 @@ public class Memtable implements Comparable<Memtable>
columnFamily = cFamily.cloneMeShallow();
SuperColumn container = new SuperColumn(superColumn.name());
container.markForDeleteAt(superColumn.getLocalDeletionTime(), superColumn.getMarkedForDeleteAt());
container.addColumn(subColumn.name(), subColumn);
container.addColumn(subColumn);
columnFamily.addColumn(container);
}
}

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

@ -77,7 +77,7 @@ public class NamesFilter implements IFilter
if ( names_.contains(subColumn.name()) )
{
names_.remove(subColumn.name());
filteredSuperColumn.addColumn(subColumn.name(), subColumn);
filteredSuperColumn.addColumn(subColumn);
}
if( isDone() )
{

20
src/java/org/apache/cassandra/db/SuperColumn.java
View File

@ -174,21 +174,21 @@ public final class SuperColumn implements IColumn, Serializable
throw new IllegalArgumentException("Value was requested for a column that does not exist.");
}
public void addColumn(String name, IColumn column)
public void addColumn(IColumn column)
{
if (!(column instanceof Column))
throw new UnsupportedOperationException("A super column can only contain simple columns.");
IColumn oldColumn = columns_.get(name);
IColumn oldColumn = columns_.get(column.name());
if ( oldColumn == null )
{
columns_.put(name, column);
columns_.put(column.name(), column);
size_.addAndGet(column.size());
}
else
{
if (((Column)oldColumn).comparePriority((Column)column) <= 0)
{
columns_.put(name, column);
columns_.put(column.name(), column);
int delta = (-1)*oldColumn.size();
/* subtract the size of the oldColumn */
size_.addAndGet(delta);
@ -211,7 +211,7 @@ public final class SuperColumn implements IColumn, Serializable
for (IColumn subColumn : column.getSubColumns())
{
addColumn(subColumn.name(), subColumn);
addColumn(subColumn);
}
if (column.getMarkedForDeleteAt() > markedForDeleteAt)
{
@ -249,14 +249,14 @@ public final class SuperColumn implements IColumn, Serializable
IColumn columnInternal = columns_.get(subColumn.name());
if(columnInternal == null )
{
columnDiff.addColumn(subColumn.name(), subColumn);
columnDiff.addColumn(subColumn);
}
else
{
IColumn subColumnDiff = columnInternal.diff(subColumn);
if(subColumnDiff != null)
{
columnDiff.addColumn(subColumn.name(), subColumnDiff);
columnDiff.addColumn(subColumnDiff);
}
}
}
@ -371,7 +371,7 @@ class SuperColumnSerializer implements ICompactSerializer2<IColumn>
for ( int i = 0; i < size; ++i )
{
IColumn subColumn = Column.serializer().deserialize(dis);
superColumn.addColumn(subColumn.name(), subColumn);
superColumn.addColumn(subColumn);
}
}
@ -423,7 +423,7 @@ class SuperColumnSerializer implements ICompactSerializer2<IColumn>
column = Column.serializer().deserialize(dis, filter);
if(column != null)
{
superColumn.addColumn(column.name(), column);
superColumn.addColumn(column);
column = null;
if(filter.isDone())
{
@ -457,7 +457,7 @@ class SuperColumnSerializer implements ICompactSerializer2<IColumn>
IColumn subColumn = Column.serializer().deserialize(dis, names[1], filter);
if ( subColumn != null )
{
superColumn.addColumn(subColumn.name(), subColumn);
superColumn.addColumn(subColumn);
break;
}
}

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

@ -92,7 +92,7 @@ class TimeFilter implements IFilter
{
if ( subColumn.timestamp() >= timeLimit_ )
{
filteredSuperColumn.addColumn(subColumn.name(), subColumn);
filteredSuperColumn.addColumn(subColumn);
++i;
}
else

20
test/unit/org/apache/cassandra/db/RangeFilterTest.java
View File

@ -70,24 +70,24 @@ public class RangeFilterTest
byte[] val = "test value".getBytes();
SuperColumn sc = null;
sc = new SuperColumn("a");
sc.addColumn("a1", new Column("a1", val, System.currentTimeMillis()));
sc.addColumn("a2", new Column("a2", val, System.currentTimeMillis()));
sc.addColumn(new Column("a1", val, System.currentTimeMillis()));
sc.addColumn(new Column("a2", val, System.currentTimeMillis()));
cf.addColumn(sc);
sc = new SuperColumn("b");
sc.addColumn("b1", new Column("b1", val, System.currentTimeMillis()));
sc.addColumn("b2", new Column("b2", val, System.currentTimeMillis()));
sc.addColumn(new Column("b1", val, System.currentTimeMillis()));
sc.addColumn(new Column("b2", val, System.currentTimeMillis()));
cf.addColumn(sc);
sc = new SuperColumn("c");
sc.addColumn("c1", new Column("c1", val, System.currentTimeMillis()));
sc.addColumn("c2", new Column("c2", val, System.currentTimeMillis()));
sc.addColumn(new Column("c1", val, System.currentTimeMillis()));
sc.addColumn(new Column("c2", val, System.currentTimeMillis()));
cf.addColumn(sc);
sc = new SuperColumn("d");
sc.addColumn("d1", new Column("d1", val, System.currentTimeMillis()));
sc.addColumn("d2", new Column("d2", val, System.currentTimeMillis()));
sc.addColumn(new Column("d1", val, System.currentTimeMillis()));
sc.addColumn(new Column("d2", val, System.currentTimeMillis()));
cf.addColumn(sc);
sc = new SuperColumn("e");
sc.addColumn("e1", new Column("e1", val, System.currentTimeMillis()));
sc.addColumn("e2", new Column("e2", val, System.currentTimeMillis()));
sc.addColumn(new Column("e1", val, System.currentTimeMillis()));
sc.addColumn(new Column("e2", val, System.currentTimeMillis()));
cf.addColumn(sc);
IFilter f = new RangeFilter("b", "d");

2
test/unit/org/apache/cassandra/db/RowTest.java
View File

@ -25,7 +25,7 @@ public class RowTest
public void testDiffSuperColumn()
{
SuperColumn sc1 = new SuperColumn("one");
sc1.addColumn("subcolumn", new Column("subcolumn", "A".getBytes(), 0));
sc1.addColumn(new Column("subcolumn", "A".getBytes(), 0));
SuperColumn sc2 = new SuperColumn("one");
sc2.markForDeleteAt(0, 0);

2
test/unit/org/apache/cassandra/db/SuperColumnTest.java
View File

@ -10,7 +10,7 @@ public class SuperColumnTest
public void testMissingSubcolumn() {
byte[] val = "sample value".getBytes();
SuperColumn sc = new SuperColumn("sc1");
sc.addColumn("col1", new Column("col1",val,1L));
sc.addColumn(new Column("col1",val,1L));
assertNotNull(sc.getSubColumn("col1"));
assertNull(sc.getSubColumn("col2"));
}

8
test/unit/org/apache/cassandra/db/TableTest.java
View File

@ -129,11 +129,11 @@ public class TableTest extends ServerTest{
RowMutation rm = new RowMutation(TABLE_NAME,TEST_KEY);
ColumnFamily cf = new ColumnFamily("Super1","Super");
SuperColumn sc1 = new SuperColumn("sc1");
sc1.addColumn("col1", new Column("col1","val1".getBytes(), 1L));
sc1.addColumn("col2", new Column("col2","val2".getBytes(), 1L));
sc1.addColumn(new Column("col1","val1".getBytes(), 1L));
sc1.addColumn(new Column("col2","val2".getBytes(), 1L));
SuperColumn sc2 = new SuperColumn("sc2");
sc2.addColumn("col3", new Column("col3","val3".getBytes(), 1L));
sc2.addColumn("col4", new Column("col4","val4".getBytes(), 1L));
sc2.addColumn(new Column("col3","val3".getBytes(), 1L));
sc2.addColumn(new Column("col4","val4".getBytes(), 1L));
cf.addColumn(sc1);
cf.addColumn(sc2);
rm.add(cf);