diff --git a/src/java/org/apache/cassandra/db/Column.java b/src/java/org/apache/cassandra/db/Column.java index 3e1cede7cb..bb26c69b17 100644 --- a/src/java/org/apache/cassandra/db/Column.java +++ b/src/java/org/apache/cassandra/db/Column.java @@ -62,12 +62,12 @@ public final class Column implements IColumn this(name, value, 0); } - Column(String name, byte[] value, long timestamp) + public Column(String name, byte[] value, long timestamp) { this(name, value, timestamp, false); } - Column(String name, byte[] value, long timestamp, boolean isDeleted) + public Column(String name, byte[] value, long timestamp, boolean isDeleted) { assert name != null; assert value != null; diff --git a/test/unit/org/apache/cassandra/Util.java b/test/unit/org/apache/cassandra/Util.java new file mode 100644 index 0000000000..9e055b2842 --- /dev/null +++ b/test/unit/org/apache/cassandra/Util.java @@ -0,0 +1,11 @@ +package org.apache.cassandra; + +import org.apache.cassandra.db.Column; + +public class Util +{ + public static Column column(String name, String value, long timestamp) + { + return new Column(name, value.getBytes(), timestamp); + } +} diff --git a/test/unit/org/apache/cassandra/db/ColumnComparatorFactoryTest.java b/test/unit/org/apache/cassandra/db/ColumnComparatorFactoryTest.java index 42fad57904..bd7599a06c 100644 --- a/test/unit/org/apache/cassandra/db/ColumnComparatorFactoryTest.java +++ b/test/unit/org/apache/cassandra/db/ColumnComparatorFactoryTest.java @@ -22,20 +22,22 @@ import java.util.Comparator; import org.junit.Test; +import static org.apache.cassandra.Util.column; + public class ColumnComparatorFactoryTest { public Comparator nameComparator = ColumnComparatorFactory.getComparator(ColumnComparatorFactory.ComparatorType.NAME); @Test public void testLT() { - IColumn col1 = new Column("Column-8"); - IColumn col2 = new Column("Column-9"); + IColumn col1 = column("Column-8", "", 0); + IColumn col2 = column("Column-9", "", 0); assert nameComparator.compare(col1, col2) < 0; } @Test public void testGT() { - IColumn col1 = new Column("Column-9"); - IColumn col2 = new Column("Column-10"); + IColumn col1 = column("Column-9", "", 0); + IColumn col2 = column("Column-10", "", 0); // tricky -- remember we're comparing _lexically_ assert nameComparator.compare(col1, col2) > 0; } diff --git a/test/unit/org/apache/cassandra/db/ColumnFamilyTest.java b/test/unit/org/apache/cassandra/db/ColumnFamilyTest.java index 3aa72586ee..3a32cff12a 100644 --- a/test/unit/org/apache/cassandra/db/ColumnFamilyTest.java +++ b/test/unit/org/apache/cassandra/db/ColumnFamilyTest.java @@ -29,6 +29,7 @@ import org.junit.Test; import org.apache.cassandra.io.DataInputBuffer; import org.apache.cassandra.io.DataOutputBuffer; import org.apache.cassandra.db.filter.QueryPath; +import static org.apache.cassandra.Util.column; public class ColumnFamilyTest { @@ -90,11 +91,10 @@ public class ColumnFamilyTest public void testGetColumnCount() { ColumnFamily cf = ColumnFamily.create("Table1", "Standard1"); - byte val[] = "sample value".getBytes(); - cf.addColumn(QueryPath.column("col1"), val, 1); - cf.addColumn(QueryPath.column("col2"), val, 2); - cf.addColumn(QueryPath.column("col1"), val, 3); + cf.addColumn(column("col1", "", 1)); + cf.addColumn(column("col2", "", 2)); + cf.addColumn(column("col1", "", 3)); assert 2 == cf.getColumnCount(); assert 2 == cf.getAllColumns().size(); @@ -104,15 +104,12 @@ public class ColumnFamilyTest public void testTimestamp() { ColumnFamily cf = ColumnFamily.create("Table1", "Standard1"); - byte val1[] = "sample 1".getBytes(); - byte val2[] = "sample 2".getBytes(); - byte val3[] = "sample 3".getBytes(); - cf.addColumn(QueryPath.column("col1"), val1, 2); - cf.addColumn(QueryPath.column("col1"), val2, 2); // same timestamp, new value - cf.addColumn(QueryPath.column("col1"), val3, 1); // older timestamp -- should be ignored + cf.addColumn(column("col1", "val1", 2)); + cf.addColumn(column("col1", "val2", 2)); // same timestamp, new value + cf.addColumn(column("col1", "val3", 1)); // older timestamp -- should be ignored - assert Arrays.equals(val2, cf.getColumn("col1").value()); + assert Arrays.equals("val2".getBytes(), cf.getColumn("col1").value()); } @Test @@ -124,6 +121,7 @@ public class ColumnFamilyTest byte val[] = "sample value".getBytes(); byte val2[] = "x value ".getBytes(); + // exercise addColumn(QueryPath, ...) cf_new.addColumn(QueryPath.column("col1"), val, 3); cf_new.addColumn(QueryPath.column("col2"), val, 4); diff --git a/test/unit/org/apache/cassandra/db/MultitableTest.java b/test/unit/org/apache/cassandra/db/MultitableTest.java index b9223fdd0f..041fb62b98 100644 --- a/test/unit/org/apache/cassandra/db/MultitableTest.java +++ b/test/unit/org/apache/cassandra/db/MultitableTest.java @@ -7,6 +7,7 @@ import org.junit.Test; import static org.apache.cassandra.db.TableTest.assertColumns; import org.apache.cassandra.CleanupHelper; +import static org.apache.cassandra.Util.column; public class MultitableTest extends CleanupHelper { @@ -21,13 +22,13 @@ public class MultitableTest extends CleanupHelper rm = new RowMutation("Table1", "keymulti"); cf = ColumnFamily.create("Table1", "Standard1"); - cf.addColumn(new Column("col1", "val1".getBytes(), 1L)); + cf.addColumn(column("col1", "val1", 1L)); rm.add(cf); rm.apply(); rm = new RowMutation("Table2", "keymulti"); cf = ColumnFamily.create("Table2", "Standard1"); - cf.addColumn(new Column("col2", "val2".getBytes(), 1L)); + cf.addColumn(column("col2", "val2", 1L)); rm.add(cf); rm.apply(); diff --git a/test/unit/org/apache/cassandra/db/RecoveryManager2Test.java b/test/unit/org/apache/cassandra/db/RecoveryManager2Test.java index 446ede8dc1..166971308b 100644 --- a/test/unit/org/apache/cassandra/db/RecoveryManager2Test.java +++ b/test/unit/org/apache/cassandra/db/RecoveryManager2Test.java @@ -9,6 +9,7 @@ import java.util.Arrays; import org.junit.Test; import org.apache.cassandra.CleanupHelper; +import static org.apache.cassandra.Util.column; public class RecoveryManager2Test extends CleanupHelper { @@ -23,7 +24,7 @@ public class RecoveryManager2Test extends CleanupHelper String key = "key" + i; RowMutation rm = new RowMutation("Table1", key); ColumnFamily cf = ColumnFamily.create("Table1", "Standard1"); - cf.addColumn(new Column("col1", "val1".getBytes(), 1L)); + cf.addColumn(column("col1", "val1", 1L)); rm.add(cf); rm.apply(); keys.add(key); diff --git a/test/unit/org/apache/cassandra/db/RecoveryManagerTest.java b/test/unit/org/apache/cassandra/db/RecoveryManagerTest.java index 287a7fbbcb..ceda5da3bd 100644 --- a/test/unit/org/apache/cassandra/db/RecoveryManagerTest.java +++ b/test/unit/org/apache/cassandra/db/RecoveryManagerTest.java @@ -27,6 +27,7 @@ import java.util.HashSet; import org.junit.Test; import org.apache.cassandra.CleanupHelper; +import static org.apache.cassandra.Util.column; import static org.apache.cassandra.db.TableTest.assertColumns; public class RecoveryManagerTest extends CleanupHelper @@ -49,13 +50,13 @@ public class RecoveryManagerTest extends CleanupHelper rm = new RowMutation("Table1", "keymulti"); cf = ColumnFamily.create("Table1", "Standard1"); - cf.addColumn(new Column("col1", "val1".getBytes(), 1L)); + cf.addColumn(column("col1", "val1", 1L)); rm.add(cf); rm.apply(); rm = new RowMutation("Table2", "keymulti"); cf = ColumnFamily.create("Table2", "Standard3"); - cf.addColumn(new Column("col2", "val2".getBytes(), 1L)); + cf.addColumn(column("col2", "val2", 1L)); rm.add(cf); rm.apply(); diff --git a/test/unit/org/apache/cassandra/db/RowTest.java b/test/unit/org/apache/cassandra/db/RowTest.java index 3969105d06..0ae310e6a2 100644 --- a/test/unit/org/apache/cassandra/db/RowTest.java +++ b/test/unit/org/apache/cassandra/db/RowTest.java @@ -24,6 +24,7 @@ import org.junit.Test; import static junit.framework.Assert.assertEquals; import org.apache.cassandra.db.filter.QueryPath; +import static org.apache.cassandra.Util.column; public class RowTest { @@ -31,7 +32,7 @@ public class RowTest public void testDiffColumnFamily() { ColumnFamily cf1 = ColumnFamily.create("Table1", "Standard1"); - cf1.addColumn(QueryPath.column("one"), "onev".getBytes(), 0); + cf1.addColumn(column("one", "onev", 0)); ColumnFamily cf2 = ColumnFamily.create("Table1", "Standard1"); cf2.delete(0, 0); @@ -45,7 +46,7 @@ public class RowTest public void testDiffSuperColumn() { SuperColumn sc1 = new SuperColumn("one"); - sc1.addColumn(new Column("subcolumn", "A".getBytes(), 0)); + sc1.addColumn(column("subcolumn", "A", 0)); SuperColumn sc2 = new SuperColumn("one"); sc2.markForDeleteAt(0, 0); @@ -60,15 +61,15 @@ public class RowTest { Row row1 = new Row(); ColumnFamily cf1 = ColumnFamily.create("Table1", "Standard1"); - cf1.addColumn(QueryPath.column("one"), "A".getBytes(), 0); + cf1.addColumn(column("one", "A", 0)); row1.addColumnFamily(cf1); Row row2 = new Row(); ColumnFamily cf2 = ColumnFamily.create("Table1", "Standard1"); - cf2.addColumn(QueryPath.column("one"), "B".getBytes(), 1); - cf2.addColumn(QueryPath.column("two"), "C".getBytes(), 1); + cf2.addColumn(column("one", "B", 1)); + cf2.addColumn(column("two", "C", 1)); ColumnFamily cf3 = ColumnFamily.create("Table2", "Standard2"); - cf3.addColumn(QueryPath.column("three"), "D".getBytes(), 1); + cf3.addColumn(column("three", "D", 1)); row2.addColumnFamily(cf2); row2.addColumnFamily(cf3); diff --git a/test/unit/org/apache/cassandra/db/SuperColumnTest.java b/test/unit/org/apache/cassandra/db/SuperColumnTest.java index 2f0ccddfd6..3ecca5d563 100644 --- a/test/unit/org/apache/cassandra/db/SuperColumnTest.java +++ b/test/unit/org/apache/cassandra/db/SuperColumnTest.java @@ -22,14 +22,14 @@ import org.junit.Test; import static junit.framework.Assert.assertNotNull; import static junit.framework.Assert.assertNull; +import static org.apache.cassandra.Util.column; public class SuperColumnTest { @Test public void testMissingSubcolumn() { - byte[] val = "sample value".getBytes(); SuperColumn sc = new SuperColumn("sc1"); - sc.addColumn(new Column("col1",val,1L)); + sc.addColumn(column("col1","sample value",1L)); assertNotNull(sc.getSubColumn("col1")); assertNull(sc.getSubColumn("col2")); } diff --git a/test/unit/org/apache/cassandra/db/TableTest.java b/test/unit/org/apache/cassandra/db/TableTest.java index 4768accc18..3b56826734 100644 --- a/test/unit/org/apache/cassandra/db/TableTest.java +++ b/test/unit/org/apache/cassandra/db/TableTest.java @@ -26,6 +26,7 @@ import org.junit.Test; import static junit.framework.Assert.*; import org.apache.cassandra.CleanupHelper; +import static org.apache.cassandra.Util.column; import org.apache.cassandra.db.filter.NamesQueryFilter; import org.apache.cassandra.db.filter.QueryPath; import org.apache.cassandra.io.SSTableReader; @@ -94,9 +95,9 @@ public class TableTest extends CleanupHelper RowMutation rm = new RowMutation("Table1", key); ColumnFamily cf = ColumnFamily.create("Table1", "Standard1"); // First write "a", "b", "c" - cf.addColumn(new Column("a", "val1".getBytes(), 1L)); - cf.addColumn(new Column("b", "val2".getBytes(), 1L)); - cf.addColumn(new Column("c", "val3".getBytes(), 1L)); + cf.addColumn(column("a", "val1", 1L)); + cf.addColumn(column("b", "val2", 1L)); + cf.addColumn(column("c", "val3", 1L)); rm.add(cf); rm.apply(); @@ -117,9 +118,9 @@ public class TableTest extends CleanupHelper { RowMutation rm = new RowMutation("Table1",TEST_KEY); ColumnFamily cf = ColumnFamily.create("Table1", "Standard1"); - cf.addColumn(new Column("col1","val1".getBytes(), 1L)); - cf.addColumn(new Column("col2","val2".getBytes(), 1L)); - cf.addColumn(new Column("col3","val3".getBytes(), 1L)); + cf.addColumn(column("col1","val1", 1L)); + cf.addColumn(column("col2","val2", 1L)); + cf.addColumn(column("col3","val3", 1L)); rm.add(cf); return rm; } @@ -130,7 +131,7 @@ public class TableTest extends CleanupHelper Table table = Table.open("Table1"); RowMutation rm = new RowMutation("Table1", "row1000"); ColumnFamily cf = ColumnFamily.create("Table1", "Standard2"); - cf.addColumn(new Column("col1", "val1".getBytes(), 1)); + cf.addColumn(column("col1", "val1", 1)); rm.add(cf); rm.apply(); @@ -171,12 +172,12 @@ public class TableTest extends CleanupHelper { RowMutation rm = new RowMutation("Table1", ROW); ColumnFamily cf = ColumnFamily.create("Table1", "Standard1"); - cf.addColumn(new Column("col1", "val1".getBytes(), 1L)); - cf.addColumn(new Column("col3", "val3".getBytes(), 1L)); - cf.addColumn(new Column("col4", "val4".getBytes(), 1L)); - cf.addColumn(new Column("col5", "val5".getBytes(), 1L)); - cf.addColumn(new Column("col7", "val7".getBytes(), 1L)); - cf.addColumn(new Column("col9", "val9".getBytes(), 1L)); + cf.addColumn(column("col1", "val1", 1L)); + cf.addColumn(column("col3", "val3", 1L)); + cf.addColumn(column("col4", "val4", 1L)); + cf.addColumn(column("col5", "val5", 1L)); + cf.addColumn(column("col7", "val7", 1L)); + cf.addColumn(column("col9", "val9", 1L)); rm.add(cf); rm.apply(); @@ -230,21 +231,21 @@ public class TableTest extends CleanupHelper { RowMutation rm = new RowMutation("Table1", ROW); ColumnFamily cf = ColumnFamily.create("Table1", "Standard1"); - cf.addColumn(new Column("col1", "val1".getBytes(), 1L)); - cf.addColumn(new Column("col2", "val2".getBytes(), 1L)); - cf.addColumn(new Column("col3", "val3".getBytes(), 1L)); - cf.addColumn(new Column("col4", "val4".getBytes(), 1L)); - cf.addColumn(new Column("col5", "val5".getBytes(), 1L)); - cf.addColumn(new Column("col6", "val6".getBytes(), 1L)); + cf.addColumn(column("col1", "val1", 1L)); + cf.addColumn(column("col2", "val2", 1L)); + cf.addColumn(column("col3", "val3", 1L)); + cf.addColumn(column("col4", "val4", 1L)); + cf.addColumn(column("col5", "val5", 1L)); + cf.addColumn(column("col6", "val6", 1L)); rm.add(cf); rm.apply(); cfStore.forceBlockingFlush(); rm = new RowMutation("Table1", ROW); cf = ColumnFamily.create("Table1", "Standard1"); - cf.addColumn(new Column("col1", "valx".getBytes(), 2L)); - cf.addColumn(new Column("col2", "valx".getBytes(), 2L)); - cf.addColumn(new Column("col3", "valx".getBytes(), 2L)); + cf.addColumn(column("col1", "valx", 2L)); + cf.addColumn(column("col2", "valx", 2L)); + cf.addColumn(column("col3", "valx", 2L)); rm.add(cf); rm.apply(); } @@ -277,7 +278,7 @@ public class TableTest extends CleanupHelper RowMutation rm = new RowMutation("Table1", ROW); ColumnFamily cf = ColumnFamily.create("Table1", "Standard1"); for (int i = 1000; i < 2000; i++) - cf.addColumn(new Column("col" + i, ("vvvvvvvvvvvvvvvv" + i).getBytes(), 1L)); + cf.addColumn(column("col" + i, ("vvvvvvvvvvvvvvvv" + i), 1L)); rm.add(cf); rm.apply(); cfStore.forceBlockingFlush(); @@ -321,7 +322,7 @@ public class TableTest extends CleanupHelper RowMutation rm = new RowMutation("Table1", ROW); ColumnFamily cf = ColumnFamily.create("Table1", "Super1"); SuperColumn sc = new SuperColumn("sc1"); - sc.addColumn(new Column("col1", "val1".getBytes(), 1L)); + sc.addColumn(column("col1", "val1", 1L)); cf.addColumn(sc); rm.add(cf); rm.apply(); diff --git a/test/unit/org/apache/cassandra/service/CassandraServerTest.java b/test/unit/org/apache/cassandra/service/CassandraServerTest.java index 9a849d3a3c..4e4308fcc0 100644 --- a/test/unit/org/apache/cassandra/service/CassandraServerTest.java +++ b/test/unit/org/apache/cassandra/service/CassandraServerTest.java @@ -31,8 +31,8 @@ public class CassandraServerTest extends CleanupHelper server.start(); try { - Column c1 = new Column("c1", "0", 0L); - Column c2 = new Column("c2", "0", 0L); + Column c1 = column("c1", "0", 0L); + Column c2 = column("c2", "0", 0L); List columns = new ArrayList(); columns.add(c1); columns.add(c2);