Repository: cassandra Updated Branches: refs/heads/trunk b2ef56478 -> 7d7610fdb
http://git-wip-us.apache.org/repos/asf/cassandra/blob/8541cca7/test/unit/org/apache/cassandra/repair/ValidatorTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/repair/ValidatorTest.java b/test/unit/org/apache/cassandra/repair/ValidatorTest.java index 8da900a..48b8ac9 100644 --- a/test/unit/org/apache/cassandra/repair/ValidatorTest.java +++ b/test/unit/org/apache/cassandra/repair/ValidatorTest.java @@ -26,6 +26,7 @@ import org.junit.After; import org.junit.Test; import org.apache.cassandra.SchemaLoader; +import org.apache.cassandra.db.BufferDecoratedKey; import org.apache.cassandra.db.ColumnFamilyStore; import org.apache.cassandra.db.DecoratedKey; import org.apache.cassandra.db.Keyspace; @@ -109,7 +110,7 @@ public class ValidatorTest extends SchemaLoader // add a row Token mid = partitioner.midpoint(range.left, range.right); - validator.add(new CompactedRowStub(new DecoratedKey(mid, ByteBufferUtil.bytes("inconceivable!")))); + validator.add(new CompactedRowStub(new BufferDecoratedKey(mid, ByteBufferUtil.bytes("inconceivable!")))); validator.complete(); // confirm that the tree was validated http://git-wip-us.apache.org/repos/asf/cassandra/blob/8541cca7/test/unit/org/apache/cassandra/service/QueryPagerTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/service/QueryPagerTest.java b/test/unit/org/apache/cassandra/service/QueryPagerTest.java index 26295af..ad70eff 100644 --- a/test/unit/org/apache/cassandra/service/QueryPagerTest.java +++ b/test/unit/org/apache/cassandra/service/QueryPagerTest.java @@ -100,7 +100,7 @@ public class QueryPagerTest extends SchemaLoader { StringBuilder sb = new StringBuilder(); for (Row row : rows) - sb.append(string(row.key.key)).append(":").append(toString(row.cf)).append("\n"); + sb.append(string(row.key.getKey())).append(":").append(toString(row.cf)).append("\n"); return sb.toString(); } @@ -159,7 +159,7 @@ public class QueryPagerTest extends SchemaLoader private static void assertRow(Row r, String key, ByteBuffer... names) { - assertEquals(key, string(r.key.key)); + assertEquals(key, string(r.key.getKey())); assertNotNull(r.cf); int i = 0; for (Cell c : r.cf) http://git-wip-us.apache.org/repos/asf/cassandra/blob/8541cca7/test/unit/org/apache/cassandra/service/pager/AbstractQueryPagerTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/service/pager/AbstractQueryPagerTest.java b/test/unit/org/apache/cassandra/service/pager/AbstractQueryPagerTest.java index 0bb1660..cc03e5d 100644 --- a/test/unit/org/apache/cassandra/service/pager/AbstractQueryPagerTest.java +++ b/test/unit/org/apache/cassandra/service/pager/AbstractQueryPagerTest.java @@ -105,7 +105,7 @@ public class AbstractQueryPagerTest private void assertRow(Row row, String name, int... values) { - assertEquals(row.key.key, ByteBufferUtil.bytes(name)); + assertEquals(row.key.getKey(), ByteBufferUtil.bytes(name)); assertEquals(values.length, row.cf.getColumnCount()); int i = 0; http://git-wip-us.apache.org/repos/asf/cassandra/blob/8541cca7/test/unit/org/apache/cassandra/streaming/StreamingTransferTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/streaming/StreamingTransferTest.java b/test/unit/org/apache/cassandra/streaming/StreamingTransferTest.java index 55b6f77..7d3b274 100644 --- a/test/unit/org/apache/cassandra/streaming/StreamingTransferTest.java +++ b/test/unit/org/apache/cassandra/streaming/StreamingTransferTest.java @@ -167,7 +167,7 @@ public class StreamingTransferTest extends SchemaLoader String key = "key" + offs[i]; String col = "col" + offs[i]; assert cfs.getColumnFamily(QueryFilter.getIdentityFilter(Util.dk(key), cfs.name, System.currentTimeMillis())) != null; - assert rows.get(i).key.key.equals(ByteBufferUtil.bytes(key)); + assert rows.get(i).key.getKey().equals(ByteBufferUtil.bytes(key)); assert rows.get(i).cf.getColumn(cellname(col)) != null; } @@ -229,7 +229,7 @@ public class StreamingTransferTest extends SchemaLoader long val = key.hashCode(); ColumnFamily cf = ArrayBackedSortedColumns.factory.create(keyspace.getName(), cfs.name); cf.addColumn(column(col, "v", timestamp)); - cf.addColumn(new Cell(cellname("birthdate"), ByteBufferUtil.bytes(val), timestamp)); + cf.addColumn(new BufferCell(cellname("birthdate"), ByteBufferUtil.bytes(val), timestamp)); Mutation rm = new Mutation("Keyspace1", ByteBufferUtil.bytes(key), cf); logger.debug("Applying row to transfer " + rm); rm.apply(); @@ -248,7 +248,7 @@ public class StreamingTransferTest extends SchemaLoader Range<RowPosition> range = Util.range("", ""); List<Row> rows = cfs.search(range, clause, filter, 100); assertEquals(1, rows.size()); - assert rows.get(0).key.key.equals(ByteBufferUtil.bytes(key)); + assert rows.get(0).key.getKey().equals(ByteBufferUtil.bytes(key)); } } @@ -320,8 +320,8 @@ public class StreamingTransferTest extends SchemaLoader state.writeRemote(CounterId.fromInt(4), 4L, 2L); state.writeRemote(CounterId.fromInt(6), 3L, 3L); state.writeRemote(CounterId.fromInt(8), 2L, 4L); - cf.addColumn(new CounterCell(cellname(col), state.context, timestamp)); - cfCleaned.addColumn(new CounterCell(cellname(col), cc.clearAllLocal(state.context), timestamp)); + cf.addColumn(new BufferCounterCell(cellname(col), state.context, timestamp)); + cfCleaned.addColumn(new BufferCounterCell(cellname(col), cc.clearAllLocal(state.context), timestamp)); entries.put(key, cf); cleanedEntries.put(key, cfCleaned); @@ -382,8 +382,8 @@ public class StreamingTransferTest extends SchemaLoader ColumnFamilyStore cfstore = Keyspace.open(keyspaceName).getColumnFamilyStore(cfname); List<Row> rows = Util.getRangeSlice(cfstore); assertEquals(2, rows.size()); - assert rows.get(0).key.key.equals(ByteBufferUtil.bytes("test")); - assert rows.get(1).key.key.equals(ByteBufferUtil.bytes("transfer3")); + assert rows.get(0).key.getKey().equals(ByteBufferUtil.bytes("test")); + assert rows.get(1).key.getKey().equals(ByteBufferUtil.bytes("transfer3")); assert rows.get(0).cf.getColumnCount() == 1; assert rows.get(1).cf.getColumnCount() == 1; @@ -422,9 +422,9 @@ public class StreamingTransferTest extends SchemaLoader Map.Entry<DecoratedKey,String> last = keys.lastEntry(); Map.Entry<DecoratedKey,String> secondtolast = keys.lowerEntry(last.getKey()); List<Range<Token>> ranges = new ArrayList<>(); - ranges.add(new Range<>(p.getMinimumToken(), first.getKey().token)); + ranges.add(new Range<>(p.getMinimumToken(), first.getKey().getToken())); // the left hand side of the range is exclusive, so we transfer from the second-to-last token - ranges.add(new Range<>(secondtolast.getKey().token, p.getMinimumToken())); + ranges.add(new Range<>(secondtolast.getKey().getToken(), p.getMinimumToken())); // Acquiring references, transferSSTables needs it if (!SSTableReader.acquireReferences(ssTableReaders)) @@ -453,7 +453,7 @@ public class StreamingTransferTest extends SchemaLoader { ColumnFamily cf = ArrayBackedSortedColumns.factory.create(keyspace.getName(), cfs.name); cf.addColumn(column(colName, "value", timestamp)); - cf.addColumn(new Cell(cellname("birthdate"), ByteBufferUtil.bytes(new Date(timestamp).toString()), timestamp)); + cf.addColumn(new BufferCell(cellname("birthdate"), ByteBufferUtil.bytes(new Date(timestamp).toString()), timestamp)); Mutation rm = new Mutation("Keyspace1", ByteBufferUtil.bytes(key), cf); logger.debug("Applying row to transfer " + rm); rm.apply(); http://git-wip-us.apache.org/repos/asf/cassandra/blob/8541cca7/test/unit/org/apache/cassandra/tools/SSTableExportTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/tools/SSTableExportTest.java b/test/unit/org/apache/cassandra/tools/SSTableExportTest.java index 9e2014d..d9133f6 100644 --- a/test/unit/org/apache/cassandra/tools/SSTableExportTest.java +++ b/test/unit/org/apache/cassandra/tools/SSTableExportTest.java @@ -101,7 +101,7 @@ public class SSTableExportTest extends SchemaLoader int nowInSec = (int)(System.currentTimeMillis() / 1000) + 42; //live for 42 seconds // Add rowA cfamily.addColumn(Util.cellname("colA"), ByteBufferUtil.bytes("valA"), System.currentTimeMillis()); - cfamily.addColumn(new ExpiringCell(Util.cellname("colExp"), ByteBufferUtil.bytes("valExp"), System.currentTimeMillis(), 42, nowInSec)); + cfamily.addColumn(new BufferExpiringCell(Util.cellname("colExp"), ByteBufferUtil.bytes("valExp"), System.currentTimeMillis(), 42, nowInSec)); writer.append(Util.dk("rowA"), cfamily); cfamily.clear(); @@ -194,7 +194,7 @@ public class SSTableExportTest extends SchemaLoader SSTableWriter writer = new SSTableWriter(tempSS.getPath(), 2, ActiveRepairService.UNREPAIRED_SSTABLE); // Add rowA - cfamily.addColumn(CounterCell.createLocal(Util.cellname("colA"), 42, System.currentTimeMillis(), Long.MIN_VALUE)); + cfamily.addColumn(BufferCounterCell.createLocal(Util.cellname("colA"), 42, System.currentTimeMillis(), Long.MIN_VALUE)); writer.append(Util.dk("rowA"), cfamily); cfamily.clear(); @@ -225,7 +225,7 @@ public class SSTableExportTest extends SchemaLoader SSTableWriter writer = new SSTableWriter(tempSS.getPath(), 2, ActiveRepairService.UNREPAIRED_SSTABLE); // Add rowA - cfamily.addColumn(new Cell(Util.cellname("data"), UTF8Type.instance.fromString("{\"foo\":\"bar\"}"))); + cfamily.addColumn(new BufferCell(Util.cellname("data"), UTF8Type.instance.fromString("{\"foo\":\"bar\"}"))); writer.append(Util.dk("rowA"), cfamily); cfamily.clear(); http://git-wip-us.apache.org/repos/asf/cassandra/blob/8541cca7/test/unit/org/apache/cassandra/tools/SSTableImportTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/tools/SSTableImportTest.java b/test/unit/org/apache/cassandra/tools/SSTableImportTest.java index 3befc44..2fdeaf4 100644 --- a/test/unit/org/apache/cassandra/tools/SSTableImportTest.java +++ b/test/unit/org/apache/cassandra/tools/SSTableImportTest.java @@ -55,7 +55,7 @@ public class SSTableImportTest extends SchemaLoader ColumnFamily cf = cloneForAdditions(iter); while (iter.hasNext()) cf.addAtom(iter.next()); assert cf.getColumn(Util.cellname("colAA")).value().equals(hexToBytes("76616c4141")); - assert !(cf.getColumn(Util.cellname("colAA")) instanceof DeletedCell); + assert !(cf.getColumn(Util.cellname("colAA")) instanceof BufferDeletedCell); Cell expCol = cf.getColumn(Util.cellname("colAC")); assert expCol.value().equals(hexToBytes("76616c4143")); assert expCol instanceof ExpiringCell; @@ -89,7 +89,7 @@ public class SSTableImportTest extends SchemaLoader while (iter.hasNext()) cf.addAtom(iter.next()); assert cf.getColumn(Util.cellname("colAA")).value().equals(hexToBytes("76616c4141")); - assert !(cf.getColumn(Util.cellname("colAA")) instanceof DeletedCell); + assert !(cf.getColumn(Util.cellname("colAA")) instanceof BufferDeletedCell); Cell expCol = cf.getColumn(Util.cellname("colAC")); assert expCol.value().equals(hexToBytes("76616c4143")); assert expCol instanceof ExpiringCell; @@ -113,7 +113,7 @@ public class SSTableImportTest extends SchemaLoader while (iter.hasNext()) cf.addAtom(iter.next()); assert cf.getColumn(Util.cellname("colAA")).value().equals(hexToBytes("76616c4141")); - assert !(cf.getColumn(Util.cellname("colAA")) instanceof DeletedCell); + assert !(cf.getColumn(Util.cellname("colAA")) instanceof BufferDeletedCell); Cell expCol = cf.getColumn(Util.cellname("colAC")); assert expCol.value().equals(hexToBytes("76616c4143")); assert expCol instanceof ExpiringCell; http://git-wip-us.apache.org/repos/asf/cassandra/blob/8541cca7/test/unit/org/apache/cassandra/triggers/TriggerExecutorTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/triggers/TriggerExecutorTest.java b/test/unit/org/apache/cassandra/triggers/TriggerExecutorTest.java index b0c45b9..7d009c1 100644 --- a/test/unit/org/apache/cassandra/triggers/TriggerExecutorTest.java +++ b/test/unit/org/apache/cassandra/triggers/TriggerExecutorTest.java @@ -243,10 +243,10 @@ public class TriggerExecutorTest ColumnFamily cf = ArrayBackedSortedColumns.factory.create(metadata); if (columnValue1 != null) - cf.addColumn(new Cell(getColumnName(metadata, "c1"), bytes(columnValue1))); + cf.addColumn(new BufferCell(getColumnName(metadata, "c1"), bytes(columnValue1))); if (columnValue2 != null) - cf.addColumn(new Cell(getColumnName(metadata, "c2"), bytes(columnValue2))); + cf.addColumn(new BufferCell(getColumnName(metadata, "c2"), bytes(columnValue2))); return cf; } @@ -269,7 +269,7 @@ public class TriggerExecutorTest public Collection<Mutation> augment(ByteBuffer key, ColumnFamily update) { ColumnFamily cf = ArrayBackedSortedColumns.factory.create(update.metadata()); - cf.addColumn(new Cell(getColumnName(update.metadata(), "c2"), bytes("trigger"))); + cf.addColumn(new BufferCell(getColumnName(update.metadata(), "c2"), bytes("trigger"))); return Collections.singletonList(new Mutation(update.metadata().ksName, key, cf)); } } @@ -282,7 +282,7 @@ public class TriggerExecutorTest return null; ColumnFamily cf = ArrayBackedSortedColumns.factory.create(update.metadata()); - cf.addColumn(new Cell(getColumnName(update.metadata(), "c2"), bytes("trigger"))); + cf.addColumn(new BufferCell(getColumnName(update.metadata(), "c2"), bytes("trigger"))); return Collections.singletonList(new Mutation(update.metadata().ksName, key, cf)); } } @@ -292,7 +292,7 @@ public class TriggerExecutorTest public Collection<Mutation> augment(ByteBuffer key, ColumnFamily update) { ColumnFamily cf = ArrayBackedSortedColumns.factory.create(makeCfMetaData(update.metadata().ksName, "otherCf", null)); - cf.addColumn(new Cell(getColumnName(update.metadata(), "c2"), bytes("trigger"))); + cf.addColumn(new BufferCell(getColumnName(update.metadata(), "c2"), bytes("trigger"))); return Collections.singletonList(new Mutation(cf.metadata().ksName, key, cf)); } } @@ -302,7 +302,7 @@ public class TriggerExecutorTest public Collection<Mutation> augment(ByteBuffer key, ColumnFamily update) { ColumnFamily cf = ArrayBackedSortedColumns.factory.create(makeCfMetaData("otherKs", "otherCf", null)); - cf.addColumn(new Cell(getColumnName(update.metadata(), "c2"), bytes("trigger"))); + cf.addColumn(new BufferCell(getColumnName(update.metadata(), "c2"), bytes("trigger"))); return Collections.singletonList(new Mutation(cf.metadata().ksName, key, cf)); } } @@ -312,7 +312,7 @@ public class TriggerExecutorTest public Collection<Mutation> augment(ByteBuffer key, ColumnFamily update) { ColumnFamily cf = ArrayBackedSortedColumns.factory.create(update.metadata()); - cf.addColumn(new Cell(getColumnName(update.metadata(), "c2"), bytes("trigger"))); + cf.addColumn(new BufferCell(getColumnName(update.metadata(), "c2"), bytes("trigger"))); return Collections.singletonList(new Mutation(cf.metadata().ksName, bytes("otherKey"), cf)); } } http://git-wip-us.apache.org/repos/asf/cassandra/blob/8541cca7/test/unit/org/apache/cassandra/triggers/TriggersTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/triggers/TriggersTest.java b/test/unit/org/apache/cassandra/triggers/TriggersTest.java index 28464e5..ee97d8a 100644 --- a/test/unit/org/apache/cassandra/triggers/TriggersTest.java +++ b/test/unit/org/apache/cassandra/triggers/TriggersTest.java @@ -31,7 +31,7 @@ import org.apache.cassandra.config.Schema; import org.apache.cassandra.cql3.QueryProcessor; import org.apache.cassandra.cql3.UntypedResultSet; import org.apache.cassandra.db.ArrayBackedSortedColumns; -import org.apache.cassandra.db.Cell; +import org.apache.cassandra.db.BufferCell; import org.apache.cassandra.db.ColumnFamily; import org.apache.cassandra.db.ConsistencyLevel; import org.apache.cassandra.db.Mutation; @@ -316,7 +316,7 @@ public class TriggersTest extends SchemaLoader public Collection<Mutation> augment(ByteBuffer key, ColumnFamily update) { ColumnFamily extraUpdate = update.cloneMeShallow(ArrayBackedSortedColumns.factory, false); - extraUpdate.addColumn(new Cell(update.metadata().comparator.makeCellName(bytes("v2")), bytes(999))); + extraUpdate.addColumn(new BufferCell(update.metadata().comparator.makeCellName(bytes("v2")), bytes(999))); return Collections.singletonList(new Mutation(ksName, key, extraUpdate)); } } @@ -326,7 +326,7 @@ public class TriggersTest extends SchemaLoader public Collection<Mutation> augment(ByteBuffer key, ColumnFamily update) { ColumnFamily extraUpdate = update.cloneMeShallow(ArrayBackedSortedColumns.factory, false); - extraUpdate.addColumn(new Cell(update.metadata().comparator.makeCellName(bytes("v2")), bytes(999))); + extraUpdate.addColumn(new BufferCell(update.metadata().comparator.makeCellName(bytes("v2")), bytes(999))); int newKey = toInt(key) + 1000; return Collections.singletonList(new Mutation(ksName, bytes(newKey), extraUpdate)); @@ -338,7 +338,7 @@ public class TriggersTest extends SchemaLoader public Collection<Mutation> augment(ByteBuffer key, ColumnFamily update) { ColumnFamily extraUpdate = ArrayBackedSortedColumns.factory.create(ksName, otherCf); - extraUpdate.addColumn(new Cell(extraUpdate.metadata().comparator.makeCellName(bytes("v2")), bytes(999))); + extraUpdate.addColumn(new BufferCell(extraUpdate.metadata().comparator.makeCellName(bytes("v2")), bytes(999))); return Collections.singletonList(new Mutation(ksName, key, extraUpdate)); } }
