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

rename createColumn overloads to addColumn to make clear that they are all ultimately doing the same thing 

git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@758968 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Jonathan Ellis 2009-03-27 02:18:39 +00:00
parent f4f3ca50d8
commit 76bc3cc838
4 changed files with 14 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -195,10 +195,9 @@ public final class ColumnFamily implements Serializable
return columnSerializer_;
}
public void createColumn(String name)
public void addColumn(String name)
{
IColumn column = columnFactory_.createColumn(name);
addColumn(column);
addColumn(columnFactory_.createColumn(name));
}
int getColumnCount()
@ -223,17 +222,15 @@ public final class ColumnFamily implements Serializable
return count;
}
public void createColumn(String name, byte[] value)
public void addColumn(String name, byte[] value)
{
IColumn column = columnFactory_.createColumn(name, value);
addColumn(column);
addColumn(name, value, 0);
}
public void createColumn(String name, byte[] value, long timestamp)
public void addColumn(String name, byte[] value, long timestamp)
{
IColumn column = columnFactory_.createColumn(name, value, timestamp);
addColumn(column);
}
addColumn(columnFactory_.createColumn(name, value, timestamp));
}
void clear()
{

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

@ -369,7 +369,7 @@ public class Memtable implements MemtableMBean, Comparable<Memtable>
if(subColumn != null)
{
columnFamily = new ColumnFamily(cfName_);
columnFamily.createColumn(values[1] + ":" + values[2], subColumn.value(), subColumn.timestamp());
columnFamily.addColumn(values[1] + ":" + values[2], subColumn.value(), subColumn.timestamp());
}
}
}

8
src/org/apache/cassandra/db/RowMutation.java
View File

@ -154,7 +154,7 @@ public class RowMutation implements Serializable
{
columnFamily = new ColumnFamily(values[0], ColumnFamily.getColumnType("Standard"));
}
columnFamily.createColumn(values[1], value, timestamp);
columnFamily.addColumn(values[1], value, timestamp);
}
if( values.length == 3 )
{
@ -162,7 +162,7 @@ public class RowMutation implements Serializable
{
columnFamily = new ColumnFamily(values[0], ColumnFamily.getColumnType("Super"));
}
columnFamily.createColumn(values[1]+ ":" + values[2], value, timestamp);
columnFamily.addColumn(values[1]+ ":" + values[2], value, timestamp);
}
modifications_.put(values[0], columnFamily);
}
@ -189,11 +189,11 @@ public class RowMutation implements Serializable
columnFamily = new ColumnFamily(values[0]);
if(values.length == 2 )
{
columnFamily.createColumn( values[1]);
columnFamily.addColumn( values[1]);
}
if(values.length == 3 )
{
columnFamily.createColumn( values[1] + ":" + values[2]);
columnFamily.addColumn( values[1] + ":" + values[2]);
}
deletions_.put(values[0], columnFamily);
}

4
src/org/apache/cassandra/test/SSTableTest.java
View File

@ -51,7 +51,7 @@ public class SSTableTest
ColumnFamily cf = new ColumnFamily("Test", "Standard");
bufOut.reset();
// random.nextBytes(bytes);
cf.createColumn("C", "Avinash Lakshman is a good man".getBytes(), i);
cf.addColumn("C", "Avinash Lakshman is a good man".getBytes(), i);
ColumnFamily.serializerWithIndexes().serialize(cf, bufOut);
ssTable.append(key, bufOut);
bf.fill(key);
@ -69,7 +69,7 @@ public class SSTableTest
String key = Integer.toString(i);
ColumnFamily cf = new ColumnFamily("Test", "Standard");
// random.nextBytes(bytes);
cf.createColumn("C", "Avinash Lakshman is a good man".getBytes(), i);
cf.addColumn("C", "Avinash Lakshman is a good man".getBytes(), i);
columnFamilies.put(key, cf);
}
flushForRandomPartitioner(columnFamilies);