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

r/m redundant name from addColumn(name, IColumn) 

git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@759203 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Jonathan Ellis 2009-03-27 16:32:14 +00:00
parent 574f8b563d
commit 7f8f72e25b
7 changed files with 25 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/org/apache/cassandra/db/ColumnFamily.java
View File

@ -184,12 +184,8 @@ public final class ColumnFamily implements Serializable
*/
void addColumns(ColumnFamily cf)
{
Map<String, IColumn> columns = cf.getColumns();
Set<String> cNames = columns.keySet();
for ( String cName : cNames )
{
addColumn(cName, columns.get(cName));
for (IColumn column : cf.getAllColumns()) {
addColumn(column);
}
}
@ -202,7 +198,7 @@ public final class ColumnFamily implements Serializable
public void createColumn(String name)
{
IColumn column = columnFactory_.createColumn(name);
addColumn(column.name(), column);
addColumn(column);
}
int getColumnCount()
@ -230,13 +226,13 @@ public final class ColumnFamily implements Serializable
public void createColumn(String name, byte[] value)
{
IColumn column = columnFactory_.createColumn(name, value);
addColumn(column.name(), column);
addColumn(column);
}
public void createColumn(String name, byte[] value, long timestamp)
{
IColumn column = columnFactory_.createColumn(name, value, timestamp);
addColumn(column.name(), column);
addColumn(column);
}
void clear()
@ -248,9 +244,10 @@ public final class ColumnFamily implements Serializable
* If we find an old column that has the same name
* the ask it to resolve itself else add the new column .
*/
void addColumn(String name, IColumn column)
void addColumn(IColumn column)
{
int newSize = 0;
String name = column.name();
IColumn oldColumn = columns_.get(name);
if ( oldColumn != null )
{
@ -377,14 +374,14 @@ public final class ColumnFamily implements Serializable
IColumn columnExternal = columns.get(cName);
if( columnInternal == null )
{
cfDiff.addColumn(cName, columnExternal);
cfDiff.addColumn(columnExternal);
}
else
{
IColumn columnDiff = columnInternal.diff(columnExternal);
if(columnDiff != null)
{
cfDiff.addColumn(cName, columnDiff);
cfDiff.addColumn(columnDiff);
}
}
}
@ -533,7 +530,7 @@ class ColumnFamilySerializer implements ICompactSerializer2<ColumnFamily>
column = cf.getColumnSerializer().deserialize(dis);
if(column != null)
{
cf.addColumn(column.name(), column);
cf.addColumn(column);
}
}
}
@ -562,7 +559,7 @@ class ColumnFamilySerializer implements ICompactSerializer2<ColumnFamily>
column = cf.getColumnSerializer().deserialize(dis, filter);
if(column != null)
{
cf.addColumn(column.name(), column);
cf.addColumn(column);
column = null;
if(filter.isDone())
{
@ -599,7 +596,7 @@ class ColumnFamilySerializer implements ICompactSerializer2<ColumnFamily>
IColumn column = cf.getColumnSerializer().deserialize(dis, columnName, filter);
if ( column != null )
{
cf.addColumn(column.name(), column);
cf.addColumn(column);
break;
}
}

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

@ -62,7 +62,7 @@ public class CountFilter implements IFilter
Collection<IColumn> columns = columnFamily.getAllColumns();
for(IColumn column : columns)
{
filteredCf.addColumn(column.name(), column);
filteredCf.addColumn(column);
countLimit_--;
if( countLimit_ <= 0 )
{
@ -78,7 +78,7 @@ public class CountFilter implements IFilter
{
SuperColumn superColumn = (SuperColumn)column;
SuperColumn filteredSuperColumn = new SuperColumn(superColumn.name());
filteredCf.addColumn(filteredSuperColumn.name(), filteredSuperColumn);
filteredCf.addColumn(filteredSuperColumn);
Collection<IColumn> subColumns = superColumn.getSubColumns();
for(IColumn subColumn : subColumns)
{

7
src/org/apache/cassandra/db/DBManager.java
View File

@ -175,8 +175,8 @@ public class DBManager
String key = FBUtilities.getHostName();
row = new Row(key);
ColumnFamily cf = new ColumnFamily(SystemTable.cfName_);
cf.addColumn(SystemTable.token_, new Column(SystemTable.token_, token.toByteArray()) );
cf.addColumn(SystemTable.generation_, new Column(SystemTable.generation_, BasicUtilities.intToByteArray(generation)) );
cf.addColumn(new Column(SystemTable.token_, token.toByteArray()));
cf.addColumn(new Column(SystemTable.generation_, BasicUtilities.intToByteArray(generation)));
row.addColumnFamily(cf);
sysTable.apply(row);
storageMetadata = new StorageMetadata( token, generation);
@ -197,8 +197,7 @@ public class DBManager
IColumn generation = columnFamily.getColumn(SystemTable.generation_);
int gen = BasicUtilities.byteArrayToInt(generation.value()) + 1;
Column generation2 = new Column("Generation", BasicUtilities.intToByteArray(gen), generation.timestamp() + 1);
columnFamily.addColumn("Generation", generation2);
columnFamily.addColumn(new Column("Generation", BasicUtilities.intToByteArray(gen), generation.timestamp() + 1));
storageMetadata = new StorageMetadata( bi, gen );
break;
}

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

@ -359,7 +359,7 @@ public class Memtable implements MemtableMBean, Comparable<Memtable>
if(column != null )
{
columnFamily = new ColumnFamily(cfName_);
columnFamily.addColumn(column.name(), column);
columnFamily.addColumn(column);
}
}
else

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

@ -56,7 +56,7 @@ public class NamesFilter implements IFilter
if ( names_.contains(column.name()) )
{
names_.remove(column.name());
filteredCf.addColumn(column.name(), column);
filteredCf.addColumn(column);
}
if( isDone() )
{
@ -70,8 +70,8 @@ public class NamesFilter implements IFilter
for(IColumn column : columns)
{
SuperColumn superColumn = (SuperColumn)column;
SuperColumn filteredSuperColumn = new SuperColumn(superColumn.name());
filteredCf.addColumn(filteredSuperColumn.name(), filteredSuperColumn);
SuperColumn filteredSuperColumn = new SuperColumn(superColumn.name());
filteredCf.addColumn(filteredSuperColumn);
Collection<IColumn> subColumns = superColumn.getSubColumns();
for(IColumn subColumn : subColumns)
{

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

@ -160,7 +160,7 @@ public class SystemTable
IColumn tokenColumn = new Column(SystemTable.token_, token.toByteArray(), oldTokenColumnTimestamp + 1);
/* replace the old "Token" column with this new one. */
logger_.debug("Replacing old token " + new BigInteger( columnFamily.getColumn(SystemTable.token_).value() ).toString() + " with token " + token.toString());
columnFamily.addColumn(SystemTable.token_, tokenColumn);
columnFamily.addColumn(tokenColumn);
reset(systemRow_);
}
}

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

@ -58,7 +58,7 @@ class TimeFilter implements IFilter
{
if ( column.timestamp() >= timeLimit_ )
{
filteredCf.addColumn(column.name(), column);
filteredCf.addColumn(column);
++i;
}
else
@ -82,8 +82,8 @@ class TimeFilter implements IFilter
for(IColumn column : columns)
{
SuperColumn superColumn = (SuperColumn)column;
SuperColumn filteredSuperColumn = new SuperColumn(superColumn.name());
filteredCf.addColumn(filteredSuperColumn.name(), filteredSuperColumn);
SuperColumn filteredSuperColumn = new SuperColumn(superColumn.name());
filteredCf.addColumn(filteredSuperColumn);
Collection<IColumn> subColumns = superColumn.getSubColumns();
int i = 0;
for(IColumn subColumn : subColumns)