From c08117f4cd496c2203aa01c7a3c66f7a39d1f3f9 Mon Sep 17 00:00:00 2001 From: Jonathan Ellis Date: Fri, 27 Mar 2009 02:18:28 +0000 Subject: [PATCH] r/m redundant name from addColumn(name, IColumn) git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@758966 13f79535-47bb-0310-9956-ffa450edef68 --- src/org/apache/cassandra/db/ColumnFamily.java | 27 +++++++++---------- src/org/apache/cassandra/db/CountFilter.java | 4 +-- src/org/apache/cassandra/db/DBManager.java | 7 +++-- src/org/apache/cassandra/db/Memtable.java | 2 +- src/org/apache/cassandra/db/NamesFilter.java | 6 ++--- src/org/apache/cassandra/db/SystemTable.java | 2 +- src/org/apache/cassandra/db/TimeFilter.java | 6 ++--- 7 files changed, 25 insertions(+), 29 deletions(-) diff --git a/src/org/apache/cassandra/db/ColumnFamily.java b/src/org/apache/cassandra/db/ColumnFamily.java index 591ebd6d50..8a205251db 100644 --- a/src/org/apache/cassandra/db/ColumnFamily.java +++ b/src/org/apache/cassandra/db/ColumnFamily.java @@ -184,12 +184,8 @@ public final class ColumnFamily implements Serializable */ void addColumns(ColumnFamily cf) { - Map columns = cf.getColumns(); - Set 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 column = cf.getColumnSerializer().deserialize(dis); if(column != null) { - cf.addColumn(column.name(), column); + cf.addColumn(column); } } } @@ -562,7 +559,7 @@ class ColumnFamilySerializer implements ICompactSerializer2 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 IColumn column = cf.getColumnSerializer().deserialize(dis, columnName, filter); if ( column != null ) { - cf.addColumn(column.name(), column); + cf.addColumn(column); break; } } diff --git a/src/org/apache/cassandra/db/CountFilter.java b/src/org/apache/cassandra/db/CountFilter.java index b1d201df28..a8ddc107a0 100644 --- a/src/org/apache/cassandra/db/CountFilter.java +++ b/src/org/apache/cassandra/db/CountFilter.java @@ -62,7 +62,7 @@ public class CountFilter implements IFilter Collection 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 subColumns = superColumn.getSubColumns(); for(IColumn subColumn : subColumns) { diff --git a/src/org/apache/cassandra/db/DBManager.java b/src/org/apache/cassandra/db/DBManager.java index 51e95fb44e..7ef718d7ec 100644 --- a/src/org/apache/cassandra/db/DBManager.java +++ b/src/org/apache/cassandra/db/DBManager.java @@ -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; } diff --git a/src/org/apache/cassandra/db/Memtable.java b/src/org/apache/cassandra/db/Memtable.java index 245d71eab1..27350f799e 100644 --- a/src/org/apache/cassandra/db/Memtable.java +++ b/src/org/apache/cassandra/db/Memtable.java @@ -359,7 +359,7 @@ public class Memtable implements MemtableMBean, Comparable if(column != null ) { columnFamily = new ColumnFamily(cfName_); - columnFamily.addColumn(column.name(), column); + columnFamily.addColumn(column); } } else diff --git a/src/org/apache/cassandra/db/NamesFilter.java b/src/org/apache/cassandra/db/NamesFilter.java index 13f2ca4adb..7c58f9ede3 100644 --- a/src/org/apache/cassandra/db/NamesFilter.java +++ b/src/org/apache/cassandra/db/NamesFilter.java @@ -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 subColumns = superColumn.getSubColumns(); for(IColumn subColumn : subColumns) { diff --git a/src/org/apache/cassandra/db/SystemTable.java b/src/org/apache/cassandra/db/SystemTable.java index 441aa405b3..50968c49cc 100644 --- a/src/org/apache/cassandra/db/SystemTable.java +++ b/src/org/apache/cassandra/db/SystemTable.java @@ -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_); } } diff --git a/src/org/apache/cassandra/db/TimeFilter.java b/src/org/apache/cassandra/db/TimeFilter.java index 0427ac563f..d92eb122a1 100644 --- a/src/org/apache/cassandra/db/TimeFilter.java +++ b/src/org/apache/cassandra/db/TimeFilter.java @@ -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 subColumns = superColumn.getSubColumns(); int i = 0; for(IColumn subColumn : subColumns)