You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by sl...@apache.org on 2013/12/17 17:03:38 UTC
[02/13] Push composites support in the storage engine
http://git-wip-us.apache.org/repos/asf/cassandra/blob/362cc053/test/unit/org/apache/cassandra/db/KeyspaceTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/db/KeyspaceTest.java b/test/unit/org/apache/cassandra/db/KeyspaceTest.java
index f1fcb29..1c392c9 100644
--- a/test/unit/org/apache/cassandra/db/KeyspaceTest.java
+++ b/test/unit/org/apache/cassandra/db/KeyspaceTest.java
@@ -32,6 +32,7 @@ import org.junit.Test;
import static org.junit.Assert.*;
import org.apache.cassandra.SchemaLoader;
import org.apache.cassandra.config.DatabaseDescriptor;
+import org.apache.cassandra.db.composites.*;
import org.apache.cassandra.db.compaction.CompactionManager;
import org.apache.cassandra.db.filter.QueryFilter;
import org.apache.cassandra.db.marshal.BytesType;
@@ -40,6 +41,8 @@ import org.apache.cassandra.db.marshal.IntegerType;
import org.apache.cassandra.utils.WrappedRunnable;
import static org.apache.cassandra.Util.column;
import static org.apache.cassandra.Util.expiringColumn;
+import static org.apache.cassandra.Util.getBytes;
+import static org.apache.cassandra.Util.cellname;
import org.apache.cassandra.Util;
import org.apache.cassandra.io.sstable.SSTableReader;
import org.apache.cassandra.utils.ByteBufferUtil;
@@ -74,25 +77,13 @@ public class KeyspaceTest extends SchemaLoader
{
ColumnFamily cf;
- cf = cfStore.getColumnFamily(QueryFilter.getNamesFilter(TEST_KEY,
- "Standard3",
- new TreeSet<ByteBuffer>(),
- System.currentTimeMillis()));
+ cf = cfStore.getColumnFamily(Util.namesQueryFilter(cfStore, TEST_KEY));
assertColumns(cf);
- cf = cfStore.getColumnFamily(QueryFilter.getSliceFilter(TEST_KEY,
- "Standard3",
- ByteBufferUtil.EMPTY_BYTE_BUFFER,
- ByteBufferUtil.EMPTY_BYTE_BUFFER,
- false,
- 0,
- System.currentTimeMillis()));
+ cf = cfStore.getColumnFamily(QueryFilter.getSliceFilter(TEST_KEY, "Standard3", Composites.EMPTY, Composites.EMPTY, false, 0, System.currentTimeMillis()));
assertColumns(cf);
- cf = cfStore.getColumnFamily(QueryFilter.getNamesFilter(TEST_KEY,
- "Standard3",
- ByteBufferUtil.bytes("col99"),
- System.currentTimeMillis()));
+ cf = cfStore.getColumnFamily(Util.namesQueryFilter(cfStore, TEST_KEY, "col99"));
assertColumns(cf);
}
};
@@ -118,16 +109,10 @@ public class KeyspaceTest extends SchemaLoader
{
ColumnFamily cf;
- cf = cfStore.getColumnFamily(QueryFilter.getNamesFilter(TEST_KEY,
- "Standard1",
- ByteBufferUtil.bytes("col1"),
- System.currentTimeMillis()));
+ cf = cfStore.getColumnFamily(Util.namesQueryFilter(cfStore, TEST_KEY, "col1"));
assertColumns(cf, "col1");
- cf = cfStore.getColumnFamily(QueryFilter.getNamesFilter(TEST_KEY,
- "Standard1",
- ByteBufferUtil.bytes("col3"),
- System.currentTimeMillis()));
+ cf = cfStore.getColumnFamily(Util.namesQueryFilter(cfStore, TEST_KEY, "col3"));
assertColumns(cf, "col3");
}
};
@@ -148,13 +133,13 @@ public class KeyspaceTest extends SchemaLoader
RowMutation rm = new RowMutation("Keyspace1", key.key, cf);
rm.apply();
- cf = cfStore.getColumnFamily(key, ByteBufferUtil.bytes("b"), ByteBufferUtil.bytes("c"), false, 100, System.currentTimeMillis());
+ cf = cfStore.getColumnFamily(key, cellname("b"), cellname("c"), false, 100, System.currentTimeMillis());
assertEquals(2, cf.getColumnCount());
- cf = cfStore.getColumnFamily(key, ByteBufferUtil.bytes("b"), ByteBufferUtil.bytes("b"), false, 100, System.currentTimeMillis());
+ cf = cfStore.getColumnFamily(key, cellname("b"), cellname("b"), false, 100, System.currentTimeMillis());
assertEquals(1, cf.getColumnCount());
- cf = cfStore.getColumnFamily(key, ByteBufferUtil.bytes("b"), ByteBufferUtil.bytes("c"), false, 1, System.currentTimeMillis());
+ cf = cfStore.getColumnFamily(key, cellname("b"), cellname("c"), false, 1, System.currentTimeMillis());
assertEquals(1, cf.getColumnCount());
}
@@ -204,30 +189,30 @@ public class KeyspaceTest extends SchemaLoader
assert DatabaseDescriptor.getColumnIndexSize() == 4096 : "Unexpected column index size, block boundaries won't be where tests expect them.";
// test forward, spanning a segment.
- cf = cfStore.getColumnFamily(ROW, ByteBufferUtil.bytes("col096"), ByteBufferUtil.bytes("col099"), false, 4, System.currentTimeMillis());
+ cf = cfStore.getColumnFamily(ROW, cellname("col096"), cellname("col099"), false, 4, System.currentTimeMillis());
assertColumns(cf, "col096", "col097", "col098", "col099");
// test reversed, spanning a segment.
- cf = cfStore.getColumnFamily(ROW, ByteBufferUtil.bytes("col099"), ByteBufferUtil.bytes("col096"), true, 4, System.currentTimeMillis());
+ cf = cfStore.getColumnFamily(ROW, cellname("col099"), cellname("col096"), true, 4, System.currentTimeMillis());
assertColumns(cf, "col096", "col097", "col098", "col099");
// test forward, within a segment.
- cf = cfStore.getColumnFamily(ROW, ByteBufferUtil.bytes("col100"), ByteBufferUtil.bytes("col103"), false, 4, System.currentTimeMillis());
+ cf = cfStore.getColumnFamily(ROW, cellname("col100"), cellname("col103"), false, 4, System.currentTimeMillis());
assertColumns(cf, "col100", "col101", "col102", "col103");
// test reversed, within a segment.
- cf = cfStore.getColumnFamily(ROW, ByteBufferUtil.bytes("col103"), ByteBufferUtil.bytes("col100"), true, 4, System.currentTimeMillis());
+ cf = cfStore.getColumnFamily(ROW, cellname("col103"), cellname("col100"), true, 4, System.currentTimeMillis());
assertColumns(cf, "col100", "col101", "col102", "col103");
// test forward from beginning, spanning a segment.
String[] strCols = new String[100]; // col000-col099
for (int i = 0; i < 100; i++)
strCols[i] = "col" + fmt.format(i);
- cf = cfStore.getColumnFamily(ROW, ByteBufferUtil.EMPTY_BYTE_BUFFER, ByteBufferUtil.bytes("col099"), false, 100, System.currentTimeMillis());
+ cf = cfStore.getColumnFamily(ROW, Composites.EMPTY, cellname("col099"), false, 100, System.currentTimeMillis());
assertColumns(cf, strCols);
// test reversed, from end, spanning a segment.
- cf = cfStore.getColumnFamily(ROW, ByteBufferUtil.EMPTY_BYTE_BUFFER, ByteBufferUtil.bytes("col288"), true, 12, System.currentTimeMillis());
+ cf = cfStore.getColumnFamily(ROW, Composites.EMPTY, cellname("col288"), true, 12, System.currentTimeMillis());
assertColumns(cf, "col288", "col289", "col290", "col291", "col292", "col293", "col294", "col295", "col296", "col297", "col298", "col299");
}
};
@@ -245,7 +230,7 @@ public class KeyspaceTest extends SchemaLoader
for (int i = 0; i < 10; i++)
{
ColumnFamily cf = TreeMapBackedSortedColumns.factory.create("Keyspace1", "StandardLong1");
- cf.addColumn(new Column(ByteBufferUtil.bytes((long)i), ByteBufferUtil.EMPTY_BYTE_BUFFER, 0));
+ cf.addColumn(new Column(cellname((long)i), ByteBufferUtil.EMPTY_BYTE_BUFFER, 0));
RowMutation rm = new RowMutation("Keyspace1", ROW.key, cf);
rm.apply();
}
@@ -255,13 +240,13 @@ public class KeyspaceTest extends SchemaLoader
for (int i = 10; i < 20; i++)
{
ColumnFamily cf = TreeMapBackedSortedColumns.factory.create("Keyspace1", "StandardLong1");
- cf.addColumn(new Column(ByteBufferUtil.bytes((long)i), ByteBufferUtil.EMPTY_BYTE_BUFFER, 0));
+ cf.addColumn(new Column(cellname((long)i), ByteBufferUtil.EMPTY_BYTE_BUFFER, 0));
RowMutation rm = new RowMutation("Keyspace1", ROW.key, cf);
rm.apply();
- cf = cfs.getColumnFamily(ROW, ByteBufferUtil.EMPTY_BYTE_BUFFER, ByteBufferUtil.EMPTY_BYTE_BUFFER, true, 1, System.currentTimeMillis());
+ cf = cfs.getColumnFamily(ROW, Composites.EMPTY, Composites.EMPTY, true, 1, System.currentTimeMillis());
assertEquals(1, Iterables.size(cf.getColumnNames()));
- assertEquals(i, cf.getColumnNames().iterator().next().getLong());
+ assertEquals(i, cf.getColumnNames().iterator().next().toByteBuffer().getLong());
}
}
@@ -271,11 +256,11 @@ public class KeyspaceTest extends SchemaLoader
ColumnFamily cf;
// key before the rows that exists
- cf = cfStore.getColumnFamily(Util.dk("a"), ByteBufferUtil.EMPTY_BYTE_BUFFER, ByteBufferUtil.EMPTY_BYTE_BUFFER, false, 1, System.currentTimeMillis());
+ cf = cfStore.getColumnFamily(Util.dk("a"), Composites.EMPTY, Composites.EMPTY, false, 1, System.currentTimeMillis());
assertColumns(cf);
// key after the rows that exist
- cf = cfStore.getColumnFamily(Util.dk("z"), ByteBufferUtil.EMPTY_BYTE_BUFFER, ByteBufferUtil.EMPTY_BYTE_BUFFER, false, 1, System.currentTimeMillis());
+ cf = cfStore.getColumnFamily(Util.dk("z"), Composites.EMPTY, Composites.EMPTY, false, 1, System.currentTimeMillis());
assertColumns(cf);
}
@@ -298,7 +283,7 @@ public class KeyspaceTest extends SchemaLoader
rm.apply();
rm = new RowMutation("Keyspace1", ROW.key);
- rm.delete("Standard1", ByteBufferUtil.bytes("col4"), 2L);
+ rm.delete("Standard1", cellname("col4"), 2L);
rm.apply();
Runnable verify = new WrappedRunnable()
@@ -307,26 +292,26 @@ public class KeyspaceTest extends SchemaLoader
{
ColumnFamily cf;
- cf = cfStore.getColumnFamily(ROW, ByteBufferUtil.bytes("col5"), ByteBufferUtil.EMPTY_BYTE_BUFFER, false, 2, System.currentTimeMillis());
+ cf = cfStore.getColumnFamily(ROW, cellname("col5"), Composites.EMPTY, false, 2, System.currentTimeMillis());
assertColumns(cf, "col5", "col7");
- cf = cfStore.getColumnFamily(ROW, ByteBufferUtil.bytes("col4"), ByteBufferUtil.EMPTY_BYTE_BUFFER, false, 2, System.currentTimeMillis());
+ cf = cfStore.getColumnFamily(ROW, cellname("col4"), Composites.EMPTY, false, 2, System.currentTimeMillis());
assertColumns(cf, "col4", "col5", "col7");
assertColumns(ColumnFamilyStore.removeDeleted(cf, Integer.MAX_VALUE), "col5", "col7");
- cf = cfStore.getColumnFamily(ROW, ByteBufferUtil.bytes("col5"), ByteBufferUtil.EMPTY_BYTE_BUFFER, true, 2, System.currentTimeMillis());
+ cf = cfStore.getColumnFamily(ROW, cellname("col5"), Composites.EMPTY, true, 2, System.currentTimeMillis());
assertColumns(cf, "col3", "col4", "col5");
- cf = cfStore.getColumnFamily(ROW, ByteBufferUtil.bytes("col6"), ByteBufferUtil.EMPTY_BYTE_BUFFER, true, 2, System.currentTimeMillis());
+ cf = cfStore.getColumnFamily(ROW, cellname("col6"), Composites.EMPTY, true, 2, System.currentTimeMillis());
assertColumns(cf, "col3", "col4", "col5");
- cf = cfStore.getColumnFamily(ROW, ByteBufferUtil.EMPTY_BYTE_BUFFER, ByteBufferUtil.EMPTY_BYTE_BUFFER, true, 2, System.currentTimeMillis());
+ cf = cfStore.getColumnFamily(ROW, Composites.EMPTY, Composites.EMPTY, true, 2, System.currentTimeMillis());
assertColumns(cf, "col7", "col9");
- cf = cfStore.getColumnFamily(ROW, ByteBufferUtil.bytes("col95"), ByteBufferUtil.EMPTY_BYTE_BUFFER, false, 2, System.currentTimeMillis());
+ cf = cfStore.getColumnFamily(ROW, cellname("col95"), Composites.EMPTY, false, 2, System.currentTimeMillis());
assertColumns(cf);
- cf = cfStore.getColumnFamily(ROW, ByteBufferUtil.bytes("col0"), ByteBufferUtil.EMPTY_BYTE_BUFFER, true, 2, System.currentTimeMillis());
+ cf = cfStore.getColumnFamily(ROW, cellname("col0"), Composites.EMPTY, true, 2, System.currentTimeMillis());
assertColumns(cf);
}
};
@@ -355,11 +340,11 @@ public class KeyspaceTest extends SchemaLoader
{
ColumnFamily cf;
- cf = cfStore.getColumnFamily(ROW, ByteBufferUtil.EMPTY_BYTE_BUFFER, ByteBufferUtil.EMPTY_BYTE_BUFFER, false, 2, System.currentTimeMillis());
+ cf = cfStore.getColumnFamily(ROW, Composites.EMPTY, Composites.EMPTY, false, 2, System.currentTimeMillis());
assertColumns(cf, "col1", "col2");
assertColumns(ColumnFamilyStore.removeDeleted(cf, Integer.MAX_VALUE), "col1");
- cf = cfStore.getColumnFamily(ROW, ByteBufferUtil.bytes("col2"), ByteBufferUtil.EMPTY_BYTE_BUFFER, false, 1, System.currentTimeMillis());
+ cf = cfStore.getColumnFamily(ROW, cellname("col2"), Composites.EMPTY, false, 1, System.currentTimeMillis());
assertColumns(cf, "col2");
assertColumns(ColumnFamilyStore.removeDeleted(cf, Integer.MAX_VALUE));
}
@@ -400,16 +385,16 @@ public class KeyspaceTest extends SchemaLoader
{
ColumnFamily cf;
- cf = cfStore.getColumnFamily(ROW, ByteBufferUtil.bytes("col2"), ByteBufferUtil.EMPTY_BYTE_BUFFER, false, 3, System.currentTimeMillis());
+ cf = cfStore.getColumnFamily(ROW, cellname("col2"), Composites.EMPTY, false, 3, System.currentTimeMillis());
assertColumns(cf, "col2", "col3", "col4");
- ByteBuffer col = cf.getColumn(ByteBufferUtil.bytes("col2")).value();
+ ByteBuffer col = cf.getColumn(cellname("col2")).value();
assertEquals(ByteBufferUtil.string(col), "valx");
- col = cf.getColumn(ByteBufferUtil.bytes("col3")).value();
+ col = cf.getColumn(cellname("col3")).value();
assertEquals(ByteBufferUtil.string(col), "valx");
- col = cf.getColumn(ByteBufferUtil.bytes("col4")).value();
+ col = cf.getColumn(cellname("col4")).value();
assertEquals(ByteBufferUtil.string(col), "val4");
}
};
@@ -465,32 +450,32 @@ public class KeyspaceTest extends SchemaLoader
cfStore.forceBlockingFlush();
}
cfStore.metric.sstablesPerReadHistogram.clear();
- ColumnFamily cf = cfStore.getColumnFamily(key, ByteBufferUtil.bytes(""), ByteBufferUtil.bytes("col1499"), false, 1000, System.currentTimeMillis());
+ ColumnFamily cf = cfStore.getColumnFamily(key, Composites.EMPTY, cellname("col1499"), false, 1000, System.currentTimeMillis());
assertEquals(cfStore.metric.sstablesPerReadHistogram.max(), 5, 0.1);
int i = 0;
for (Column c : cf.getSortedColumns())
{
- assertEquals(ByteBufferUtil.string(c.name), "col" + (1000 + i++));
+ assertEquals(ByteBufferUtil.string(c.name.toByteBuffer()), "col" + (1000 + i++));
}
assertEquals(i, 500);
cfStore.metric.sstablesPerReadHistogram.clear();
- cf = cfStore.getColumnFamily(key, ByteBufferUtil.bytes("col1500"), ByteBufferUtil.bytes("col2000"), false, 1000, System.currentTimeMillis());
+ cf = cfStore.getColumnFamily(key, cellname("col1500"), cellname("col2000"), false, 1000, System.currentTimeMillis());
assertEquals(cfStore.metric.sstablesPerReadHistogram.max(), 5, 0.1);
for (Column c : cf.getSortedColumns())
{
- assertEquals(ByteBufferUtil.string(c.name), "col"+(1000 + i++));
+ assertEquals(ByteBufferUtil.string(c.name.toByteBuffer()), "col"+(1000 + i++));
}
assertEquals(i, 1000);
// reverse
cfStore.metric.sstablesPerReadHistogram.clear();
- cf = cfStore.getColumnFamily(key, ByteBufferUtil.bytes("col2000"), ByteBufferUtil.bytes("col1500"), true, 1000, System.currentTimeMillis());
+ cf = cfStore.getColumnFamily(key, cellname("col2000"), cellname("col1500"), true, 1000, System.currentTimeMillis());
assertEquals(cfStore.metric.sstablesPerReadHistogram.max(), 5, 0.1);
i = 500;
for (Column c : cf.getSortedColumns())
{
- assertEquals(ByteBufferUtil.string(c.name), "col"+(1000 + i++));
+ assertEquals(ByteBufferUtil.string(c.name.toByteBuffer()), "col"+(1000 + i++));
}
assertEquals(i, 1000);
@@ -518,21 +503,21 @@ public class KeyspaceTest extends SchemaLoader
ColumnFamilyStore cfs = keyspace.getColumnFamilyStore("StandardComposite2");
cfs.disableAutoCompaction();
- CompositeType ct = CompositeType.getInstance(BytesType.instance, IntegerType.instance);
+ CellNameType type = cfs.getComparator();
DecoratedKey key = Util.dk("k");
for (int j = 0; j < 10; j++)
{
for (int i = 0; i < 10; i++)
{
RowMutation rm = new RowMutation("Keyspace1", key.key);
- ByteBuffer colName = ct.builder().add(ByteBufferUtil.bytes("a" + i)).add(ByteBufferUtil.bytes(j*10 + i)).build();
+ CellName colName = type.makeCellName(ByteBufferUtil.bytes("a" + i), ByteBufferUtil.bytes(j*10 + i));
rm.add("StandardComposite2", colName, ByteBufferUtil.EMPTY_BYTE_BUFFER, 0);
rm.apply();
}
cfs.forceBlockingFlush();
}
- ByteBuffer start = ct.builder().add(ByteBufferUtil.bytes("a5")).add(ByteBufferUtil.bytes(85)).build();
- ByteBuffer finish = ct.builder().add(ByteBufferUtil.bytes("a5")).buildAsEndOfRange();
+ Composite start = type.builder().add(ByteBufferUtil.bytes("a5")).add(ByteBufferUtil.bytes(85)).build();
+ Composite finish = type.builder().add(ByteBufferUtil.bytes("a5")).build().end();
cfs.metric.sstablesPerReadHistogram.clear();
ColumnFamily cf = cfs.getColumnFamily(key, start, finish, false, 1000, System.currentTimeMillis());
int colCount = 0;
@@ -546,60 +531,60 @@ public class KeyspaceTest extends SchemaLoader
{
DecoratedKey key = Util.dk("row3");
ColumnFamily cf;
- cf = cfStore.getColumnFamily(key, ByteBufferUtil.bytes("col1000"), ByteBufferUtil.EMPTY_BYTE_BUFFER, false, 3, System.currentTimeMillis());
+ cf = cfStore.getColumnFamily(key, cellname("col1000"), Composites.EMPTY, false, 3, System.currentTimeMillis());
assertColumns(cf, "col1000", "col1001", "col1002");
ByteBuffer col;
- col = cf.getColumn(ByteBufferUtil.bytes("col1000")).value();
+ col = cf.getColumn(cellname("col1000")).value();
assertEquals(ByteBufferUtil.string(col), "v1000");
- col = cf.getColumn(ByteBufferUtil.bytes("col1001")).value();
+ col = cf.getColumn(cellname("col1001")).value();
assertEquals(ByteBufferUtil.string(col), "v1001");
- col = cf.getColumn(ByteBufferUtil.bytes("col1002")).value();
+ col = cf.getColumn(cellname("col1002")).value();
assertEquals(ByteBufferUtil.string(col), "v1002");
- cf = cfStore.getColumnFamily(key, ByteBufferUtil.bytes("col1195"), ByteBufferUtil.EMPTY_BYTE_BUFFER, false, 3, System.currentTimeMillis());
+ cf = cfStore.getColumnFamily(key, cellname("col1195"), Composites.EMPTY, false, 3, System.currentTimeMillis());
assertColumns(cf, "col1195", "col1196", "col1197");
- col = cf.getColumn(ByteBufferUtil.bytes("col1195")).value();
+ col = cf.getColumn(cellname("col1195")).value();
assertEquals(ByteBufferUtil.string(col), "v1195");
- col = cf.getColumn(ByteBufferUtil.bytes("col1196")).value();
+ col = cf.getColumn(cellname("col1196")).value();
assertEquals(ByteBufferUtil.string(col), "v1196");
- col = cf.getColumn(ByteBufferUtil.bytes("col1197")).value();
+ col = cf.getColumn(cellname("col1197")).value();
assertEquals(ByteBufferUtil.string(col), "v1197");
- cf = cfStore.getColumnFamily(key, ByteBufferUtil.bytes("col1996"), ByteBufferUtil.EMPTY_BYTE_BUFFER, true, 1000, System.currentTimeMillis());
+ cf = cfStore.getColumnFamily(key, cellname("col1996"), Composites.EMPTY, true, 1000, System.currentTimeMillis());
Column[] columns = cf.getSortedColumns().toArray(new Column[0]);
for (int i = 1000; i < 1996; i++)
{
String expectedName = "col" + i;
Column column = columns[i - 1000];
- assertEquals(ByteBufferUtil.string(column.name()), expectedName);
+ assertEquals(ByteBufferUtil.string(column.name().toByteBuffer()), expectedName);
assertEquals(ByteBufferUtil.string(column.value()), ("v" + i));
}
- cf = cfStore.getColumnFamily(key, ByteBufferUtil.bytes("col1990"), ByteBufferUtil.EMPTY_BYTE_BUFFER, false, 3, System.currentTimeMillis());
+ cf = cfStore.getColumnFamily(key, cellname("col1990"), Composites.EMPTY, false, 3, System.currentTimeMillis());
assertColumns(cf, "col1990", "col1991", "col1992");
- col = cf.getColumn(ByteBufferUtil.bytes("col1990")).value();
+ col = cf.getColumn(cellname("col1990")).value();
assertEquals(ByteBufferUtil.string(col), "v1990");
- col = cf.getColumn(ByteBufferUtil.bytes("col1991")).value();
+ col = cf.getColumn(cellname("col1991")).value();
assertEquals(ByteBufferUtil.string(col), "v1991");
- col = cf.getColumn(ByteBufferUtil.bytes("col1992")).value();
+ col = cf.getColumn(cellname("col1992")).value();
assertEquals(ByteBufferUtil.string(col), "v1992");
- cf = cfStore.getColumnFamily(key, ByteBufferUtil.EMPTY_BYTE_BUFFER, ByteBufferUtil.EMPTY_BYTE_BUFFER, true, 3, System.currentTimeMillis());
+ cf = cfStore.getColumnFamily(key, Composites.EMPTY, Composites.EMPTY, true, 3, System.currentTimeMillis());
assertColumns(cf, "col1997", "col1998", "col1999");
- col = cf.getColumn(ByteBufferUtil.bytes("col1997")).value();
+ col = cf.getColumn(cellname("col1997")).value();
assertEquals(ByteBufferUtil.string(col), "v1997");
- col = cf.getColumn(ByteBufferUtil.bytes("col1998")).value();
+ col = cf.getColumn(cellname("col1998")).value();
assertEquals(ByteBufferUtil.string(col), "v1998");
- col = cf.getColumn(ByteBufferUtil.bytes("col1999")).value();
+ col = cf.getColumn(cellname("col1999")).value();
assertEquals(ByteBufferUtil.string(col), "v1999");
- cf = cfStore.getColumnFamily(key, ByteBufferUtil.bytes("col9000"), ByteBufferUtil.EMPTY_BYTE_BUFFER, true, 3, System.currentTimeMillis());
+ cf = cfStore.getColumnFamily(key, cellname("col9000"), Composites.EMPTY, true, 3, System.currentTimeMillis());
assertColumns(cf, "col1997", "col1998", "col1999");
- cf = cfStore.getColumnFamily(key, ByteBufferUtil.bytes("col9000"), ByteBufferUtil.EMPTY_BYTE_BUFFER, false, 3, System.currentTimeMillis());
+ cf = cfStore.getColumnFamily(key, cellname("col9000"), Composites.EMPTY, false, 3, System.currentTimeMillis());
assertColumns(cf);
}
@@ -609,14 +594,7 @@ public class KeyspaceTest extends SchemaLoader
List<String> L = new ArrayList<String>();
for (Column column : columns)
{
- try
- {
- L.add(ByteBufferUtil.string(column.name()));
- }
- catch (CharacterCodingException e)
- {
- throw new AssertionError(e);
- }
+ L.add(Util.string(column.name().toByteBuffer()));
}
List<String> names = new ArrayList<String>(columnNames.length);
@@ -628,13 +606,13 @@ public class KeyspaceTest extends SchemaLoader
assert Arrays.equals(la, columnNames1)
: String.format("Columns [%s])] is not expected [%s]",
- ((container == null) ? "" : container.getComparator().getColumnsString(columns)),
+ ((container == null) ? "" : CellNames.getColumnsString(container.getComparator(), columns)),
StringUtils.join(columnNames1, ","));
}
public static void assertColumn(ColumnFamily cf, String name, String value, long timestamp)
{
- assertColumn(cf.getColumn(ByteBufferUtil.bytes(name)), value, timestamp);
+ assertColumn(cf.getColumn(cellname(name)), value, timestamp);
}
public static void assertColumn(Column column, String value, long timestamp)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/362cc053/test/unit/org/apache/cassandra/db/NameSortTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/db/NameSortTest.java b/test/unit/org/apache/cassandra/db/NameSortTest.java
index 1a8905e..523a33a 100644
--- a/test/unit/org/apache/cassandra/db/NameSortTest.java
+++ b/test/unit/org/apache/cassandra/db/NameSortTest.java
@@ -67,7 +67,7 @@ public class NameSortTest extends SchemaLoader
{
ByteBuffer bytes = j % 2 == 0 ? ByteBufferUtil.bytes("a") : ByteBufferUtil.bytes("b");
rm = new RowMutation("Keyspace1", key);
- rm.add("Standard1", ByteBufferUtil.bytes(("Column-" + j)), bytes, j);
+ rm.add("Standard1", Util.cellname("Column-" + j), bytes, j);
rm.applyUnsafe();
}
@@ -102,7 +102,7 @@ public class NameSortTest extends SchemaLoader
Collection<Column> columns = cf.getSortedColumns();
for (Column column : columns)
{
- String name = ByteBufferUtil.string(column.name());
+ String name = ByteBufferUtil.string(column.name().toByteBuffer());
int j = Integer.valueOf(name.substring(name.length() - 1));
byte[] bytes = j % 2 == 0 ? "a".getBytes() : "b".getBytes();
assertEquals(new String(bytes), ByteBufferUtil.string(column.value()));
http://git-wip-us.apache.org/repos/asf/cassandra/blob/362cc053/test/unit/org/apache/cassandra/db/RangeTombstoneListTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/db/RangeTombstoneListTest.java b/test/unit/org/apache/cassandra/db/RangeTombstoneListTest.java
index dc9f9c4..92a0b4a 100644
--- a/test/unit/org/apache/cassandra/db/RangeTombstoneListTest.java
+++ b/test/unit/org/apache/cassandra/db/RangeTombstoneListTest.java
@@ -24,12 +24,15 @@ import java.util.*;
import org.junit.Test;
import static org.junit.Assert.*;
+import org.apache.cassandra.Util;
+import org.apache.cassandra.db.*;
+import org.apache.cassandra.db.composites.*;
import org.apache.cassandra.db.marshal.IntegerType;
import org.apache.cassandra.utils.ByteBufferUtil;
public class RangeTombstoneListTest
{
- private static final Comparator<ByteBuffer> cmp = IntegerType.instance;
+ private static final Comparator<Composite> cmp = new SimpleDenseCellNameType(IntegerType.instance);
@Test
public void sortedAdditionTest()
@@ -305,14 +308,14 @@ public class RangeTombstoneListTest
return String.format("[%d, %d]@%d", i(rt.min), i(rt.max), rt.data.markedForDeleteAt);
}
- private static ByteBuffer b(int i)
+ private static Composite b(int i)
{
- return ByteBufferUtil.bytes(i);
+ return Util.cellname(i);
}
- private static int i(ByteBuffer bb)
+ private static int i(Composite c)
{
- return ByteBufferUtil.toInt(bb);
+ return ByteBufferUtil.toInt(c.toByteBuffer());
}
private static RangeTombstone rt(int start, int end, long tstamp)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/362cc053/test/unit/org/apache/cassandra/db/RangeTombstoneTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/db/RangeTombstoneTest.java b/test/unit/org/apache/cassandra/db/RangeTombstoneTest.java
index e324dd2..740eee4 100644
--- a/test/unit/org/apache/cassandra/db/RangeTombstoneTest.java
+++ b/test/unit/org/apache/cassandra/db/RangeTombstoneTest.java
@@ -28,6 +28,7 @@ import org.apache.cassandra.SchemaLoader;
import org.apache.cassandra.config.ColumnDefinition;
import org.apache.cassandra.config.DatabaseDescriptor;
import org.apache.cassandra.config.IndexType;
+import org.apache.cassandra.db.composites.*;
import org.apache.cassandra.db.columniterator.OnDiskAtomIterator;
import org.apache.cassandra.db.compaction.CompactionManager;
import org.apache.cassandra.db.compaction.SizeTieredCompactionStrategy;
@@ -85,7 +86,7 @@ public class RangeTombstoneTest extends SchemaLoader
// Queries by name
int[] live = new int[]{ 4, 9, 11, 17, 28 };
int[] dead = new int[]{ 12, 19, 21, 24, 27 };
- SortedSet<ByteBuffer> columns = new TreeSet<>(cfs.getComparator());
+ SortedSet<CellName> columns = new TreeSet<CellName>(cfs.getComparator());
for (int i : live)
columns.add(b(i));
for (int i : dead)
@@ -187,7 +188,7 @@ public class RangeTombstoneTest extends SchemaLoader
cfs.forceBlockingFlush();
// Get the last value of the row
- cf = cfs.getColumnFamily(QueryFilter.getSliceFilter(dk(key), CFNAME, ByteBufferUtil.EMPTY_BYTE_BUFFER, ByteBufferUtil.EMPTY_BYTE_BUFFER, true, 1, System.currentTimeMillis()));
+ cf = cfs.getColumnFamily(QueryFilter.getSliceFilter(dk(key), CFNAME, Composites.EMPTY, Composites.EMPTY, true, 1, System.currentTimeMillis()));
assert !cf.isEmpty();
int last = i(cf.getSortedColumns().iterator().next().name());
@@ -271,7 +272,7 @@ public class RangeTombstoneTest extends SchemaLoader
cfs.setCompactionStrategyClass(SizeTieredCompactionStrategy.class.getCanonicalName());
if (cfs.indexManager.getIndexForColumn(indexedColumnName) == null)
{
- ColumnDefinition cd = ColumnDefinition.regularDef(cfs.metadata, indexedColumnName, cfs.getComparator(), 0)
+ ColumnDefinition cd = ColumnDefinition.regularDef(cfs.metadata, indexedColumnName, cfs.getComparator().asAbstractType(), 0)
.setIndex("test_index", IndexType.CUSTOM, ImmutableMap.of(SecondaryIndex.CUSTOM_INDEX_OPTION_NAME, TestIndex.class.getName()));
cfs.indexManager.addIndexedColumn(cd);
}
@@ -310,7 +311,7 @@ public class RangeTombstoneTest extends SchemaLoader
cfs.setCompactionStrategyClass(SizeTieredCompactionStrategy.class.getCanonicalName());
if (cfs.indexManager.getIndexForColumn(indexedColumnName) == null)
{
- ColumnDefinition cd = ColumnDefinition.regularDef(cfs.metadata, indexedColumnName, cfs.getComparator(), 0)
+ ColumnDefinition cd = ColumnDefinition.regularDef(cfs.metadata, indexedColumnName, cfs.getComparator().asAbstractType(), 0)
.setIndex("test_index", IndexType.CUSTOM, ImmutableMap.of(SecondaryIndex.CUSTOM_INDEX_OPTION_NAME, TestIndex.class.getName()));
cfs.indexManager.addIndexedColumn(cd);
}
@@ -349,19 +350,19 @@ public class RangeTombstoneTest extends SchemaLoader
return c != null && !c.isMarkedForDelete(System.currentTimeMillis()) && !cf.deletionInfo().isDeleted(c);
}
- private static ByteBuffer b(int i)
+ private static CellName b(int i)
{
- return ByteBufferUtil.bytes(i);
+ return CellNames.simpleDense(ByteBufferUtil.bytes(i));
}
- private static int i(ByteBuffer i)
+ private static int i(CellName i)
{
- return ByteBufferUtil.toInt(i);
+ return ByteBufferUtil.toInt(i.toByteBuffer());
}
private static void add(RowMutation rm, int value, long timestamp)
{
- rm.add(CFNAME, b(value), b(value), timestamp);
+ rm.add(CFNAME, b(value), ByteBufferUtil.bytes(value), timestamp);
}
private static void delete(ColumnFamily cf, int from, int to, long timestamp)
@@ -417,5 +418,7 @@ public class RangeTombstoneTest extends SchemaLoader
public void invalidate(){}
public void truncateBlocking(long truncatedAt) { }
+
+ public boolean indexes(CellName name) { return name.toByteBuffer().equals(ByteBufferUtil.bytes(1)); }
}
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/362cc053/test/unit/org/apache/cassandra/db/ReadMessageTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/db/ReadMessageTest.java b/test/unit/org/apache/cassandra/db/ReadMessageTest.java
index d829dae..7af4256 100644
--- a/test/unit/org/apache/cassandra/db/ReadMessageTest.java
+++ b/test/unit/org/apache/cassandra/db/ReadMessageTest.java
@@ -30,11 +30,13 @@ import org.junit.Test;
import org.apache.cassandra.SchemaLoader;
import org.apache.cassandra.Util;
import org.apache.cassandra.config.DatabaseDescriptor;
+import org.apache.cassandra.db.composites.*;
import org.apache.cassandra.db.filter.NamesQueryFilter;
import org.apache.cassandra.db.filter.SliceQueryFilter;
import org.apache.cassandra.io.util.DataOutputBuffer;
import org.apache.cassandra.net.MessagingService;
import org.apache.cassandra.utils.ByteBufferUtil;
+import org.apache.cassandra.utils.FBUtilities;
public class ReadMessageTest extends SchemaLoader
@@ -42,9 +44,11 @@ public class ReadMessageTest extends SchemaLoader
@Test
public void testMakeReadMessage() throws IOException
{
- SortedSet<ByteBuffer> colList = new TreeSet<ByteBuffer>();
- colList.add(ByteBufferUtil.bytes("col1"));
- colList.add(ByteBufferUtil.bytes("col2"));
+ CellNameType type = Keyspace.open("Keyspace1").getColumnFamilyStore("Standard1").getComparator();
+
+ SortedSet<CellName> colList = new TreeSet<CellName>(type);
+ colList.add(Util.cellname("col1"));
+ colList.add(Util.cellname("col2"));
ReadCommand rm, rm2;
DecoratedKey dk = Util.dk("row1");
@@ -54,21 +58,13 @@ public class ReadMessageTest extends SchemaLoader
rm2 = serializeAndDeserializeReadMessage(rm);
assert rm2.toString().equals(rm.toString());
- rm = new SliceFromReadCommand("Keyspace1", dk.key, "Standard1", ts, new SliceQueryFilter(ByteBufferUtil.EMPTY_BYTE_BUFFER, ByteBufferUtil.EMPTY_BYTE_BUFFER, true, 2));
+ rm = new SliceFromReadCommand("Keyspace1", dk.key, "Standard1", ts, new SliceQueryFilter(Composites.EMPTY, Composites.EMPTY, true, 2));
rm2 = serializeAndDeserializeReadMessage(rm);
assert rm2.toString().equals(rm.toString());
- rm = new SliceFromReadCommand("Keyspace1", dk.key, "Standard1", ts, new SliceQueryFilter(ByteBufferUtil.bytes("a"), ByteBufferUtil.bytes("z"), true, 5));
- rm2 = serializeAndDeserializeReadMessage(rm);
- assertEquals(rm2.toString(), rm.toString());
-
- rm = new SliceFromReadCommand("Keyspace1", dk.key, "Standard1", ts, new SliceQueryFilter(ByteBufferUtil.EMPTY_BYTE_BUFFER, ByteBufferUtil.EMPTY_BYTE_BUFFER, true, 2));
+ rm = new SliceFromReadCommand("Keyspace1", dk.key, "Standard1", ts, new SliceQueryFilter(Util.cellname("a"), Util.cellname("z"), true, 5));
rm2 = serializeAndDeserializeReadMessage(rm);
assert rm2.toString().equals(rm.toString());
-
- rm = new SliceFromReadCommand("Keyspace1", dk.key, "Standard1", ts, new SliceQueryFilter(ByteBufferUtil.bytes("a"), ByteBufferUtil.bytes("z"), true, 5));
- rm2 = serializeAndDeserializeReadMessage(rm);
- assertEquals(rm2.toString(), rm.toString());
}
private ReadCommand serializeAndDeserializeReadMessage(ReadCommand rm) throws IOException
@@ -86,30 +82,30 @@ public class ReadMessageTest extends SchemaLoader
public void testGetColumn() throws IOException, ColumnFamilyNotDefinedException
{
Keyspace keyspace = Keyspace.open("Keyspace1");
+ CellNameType type = keyspace.getColumnFamilyStore("Standard1").getComparator();
RowMutation rm;
DecoratedKey dk = Util.dk("key1");
// add data
rm = new RowMutation("Keyspace1", dk.key);
- rm.add("Standard1", ByteBufferUtil.bytes("Column1"), ByteBufferUtil.bytes("abcd"), 0);
+ rm.add("Standard1", Util.cellname("Column1"), ByteBufferUtil.bytes("abcd"), 0);
rm.apply();
- ReadCommand command = new SliceByNamesReadCommand("Keyspace1", dk.key, "Standard1", System.currentTimeMillis(), new NamesQueryFilter(ByteBufferUtil.bytes("Column1")));
+ ReadCommand command = new SliceByNamesReadCommand("Keyspace1", dk.key, "Standard1", System.currentTimeMillis(), new NamesQueryFilter(FBUtilities.singleton(Util.cellname("Column1"), type)));
Row row = command.getRow(keyspace);
- Column col = row.cf.getColumn(ByteBufferUtil.bytes("Column1"));
+ Column col = row.cf.getColumn(Util.cellname("Column1"));
assertEquals(col.value(), ByteBuffer.wrap("abcd".getBytes()));
}
@Test
public void testNoCommitLog() throws Exception
{
-
RowMutation rm = new RowMutation("Keyspace1", ByteBufferUtil.bytes("row"));
- rm.add("Standard1", ByteBufferUtil.bytes("commit1"), ByteBufferUtil.bytes("abcd"), 0);
+ rm.add("Standard1", Util.cellname("commit1"), ByteBufferUtil.bytes("abcd"), 0);
rm.apply();
rm = new RowMutation("NoCommitlogSpace", ByteBufferUtil.bytes("row"));
- rm.add("Standard1", ByteBufferUtil.bytes("commit2"), ByteBufferUtil.bytes("abcd"), 0);
+ rm.add("Standard1", Util.cellname("commit2"), ByteBufferUtil.bytes("abcd"), 0);
rm.apply();
boolean commitLogMessageFound = false;
http://git-wip-us.apache.org/repos/asf/cassandra/blob/362cc053/test/unit/org/apache/cassandra/db/RecoveryManagerTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/db/RecoveryManagerTest.java b/test/unit/org/apache/cassandra/db/RecoveryManagerTest.java
index c053211..323da7c 100644
--- a/test/unit/org/apache/cassandra/db/RecoveryManagerTest.java
+++ b/test/unit/org/apache/cassandra/db/RecoveryManagerTest.java
@@ -34,6 +34,7 @@ import org.apache.cassandra.utils.ByteBufferUtil;
import static org.apache.cassandra.Util.column;
import static org.apache.cassandra.db.KeyspaceTest.assertColumns;
+import static org.apache.cassandra.Util.cellname;
public class RecoveryManagerTest extends SchemaLoader
{
@@ -84,7 +85,7 @@ public class RecoveryManagerTest extends SchemaLoader
for (int i = 0; i < 10; ++i)
{
cf = TreeMapBackedSortedColumns.factory.create("Keyspace1", "Counter1");
- cf.addColumn(new CounterColumn(ByteBufferUtil.bytes("col"), 1L, 1L));
+ cf.addColumn(new CounterColumn(cellname("col"), 1L, 1L));
rm = new RowMutation("Keyspace1", dk.key, cf);
rm.apply();
}
@@ -97,7 +98,7 @@ public class RecoveryManagerTest extends SchemaLoader
cf = Util.getColumnFamily(keyspace1, dk, "Counter1");
assert cf.getColumnCount() == 1;
- Column c = cf.getColumn(ByteBufferUtil.bytes("col"));
+ Column c = cf.getColumn(cellname("col"));
assert c != null;
assert ((CounterColumn)c).total() == 10L;
http://git-wip-us.apache.org/repos/asf/cassandra/blob/362cc053/test/unit/org/apache/cassandra/db/RecoveryManagerTruncateTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/db/RecoveryManagerTruncateTest.java b/test/unit/org/apache/cassandra/db/RecoveryManagerTruncateTest.java
index b98a8b0..28868ad 100644
--- a/test/unit/org/apache/cassandra/db/RecoveryManagerTruncateTest.java
+++ b/test/unit/org/apache/cassandra/db/RecoveryManagerTruncateTest.java
@@ -72,14 +72,11 @@ public class RecoveryManagerTruncateTest extends SchemaLoader
{
return null;
}
- cf = cfStore.getColumnFamily(QueryFilter.getNamesFilter(Util.dk(keyName),
- cfName,
- ByteBufferUtil.bytes(columnName),
- System.currentTimeMillis()));
+ cf = cfStore.getColumnFamily(Util.namesQueryFilter(cfStore, Util.dk(keyName), columnName));
if (cf == null)
{
return null;
}
- return cf.getColumn(ByteBufferUtil.bytes(columnName));
+ return cf.getColumn(Util.cellname(columnName));
}
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/362cc053/test/unit/org/apache/cassandra/db/RemoveColumnFamilyTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/db/RemoveColumnFamilyTest.java b/test/unit/org/apache/cassandra/db/RemoveColumnFamilyTest.java
index e3db863..236ba10 100644
--- a/test/unit/org/apache/cassandra/db/RemoveColumnFamilyTest.java
+++ b/test/unit/org/apache/cassandra/db/RemoveColumnFamilyTest.java
@@ -40,7 +40,7 @@ public class RemoveColumnFamilyTest extends SchemaLoader
// add data
rm = new RowMutation("Keyspace1", dk.key);
- rm.add("Standard1", ByteBufferUtil.bytes("Column1"), ByteBufferUtil.bytes("asdf"), 0);
+ rm.add("Standard1", Util.cellname("Column1"), ByteBufferUtil.bytes("asdf"), 0);
rm.apply();
// remove
@@ -50,7 +50,7 @@ public class RemoveColumnFamilyTest extends SchemaLoader
ColumnFamily retrieved = store.getColumnFamily(QueryFilter.getIdentityFilter(dk, "Standard1", System.currentTimeMillis()));
assert retrieved.isMarkedForDelete();
- assertNull(retrieved.getColumn(ByteBufferUtil.bytes("Column1")));
+ assertNull(retrieved.getColumn(Util.cellname("Column1")));
assertNull(Util.cloneAndRemoveDeleted(retrieved, Integer.MAX_VALUE));
}
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/362cc053/test/unit/org/apache/cassandra/db/RemoveColumnFamilyWithFlush1Test.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/db/RemoveColumnFamilyWithFlush1Test.java b/test/unit/org/apache/cassandra/db/RemoveColumnFamilyWithFlush1Test.java
index 7c71dc9..1bfb140 100644
--- a/test/unit/org/apache/cassandra/db/RemoveColumnFamilyWithFlush1Test.java
+++ b/test/unit/org/apache/cassandra/db/RemoveColumnFamilyWithFlush1Test.java
@@ -40,8 +40,8 @@ public class RemoveColumnFamilyWithFlush1Test extends SchemaLoader
// add data
rm = new RowMutation("Keyspace1", dk.key);
- rm.add("Standard1", ByteBufferUtil.bytes("Column1"), ByteBufferUtil.bytes("asdf"), 0);
- rm.add("Standard1", ByteBufferUtil.bytes("Column2"), ByteBufferUtil.bytes("asdf"), 0);
+ rm.add("Standard1", Util.cellname("Column1"), ByteBufferUtil.bytes("asdf"), 0);
+ rm.add("Standard1", Util.cellname("Column2"), ByteBufferUtil.bytes("asdf"), 0);
rm.apply();
store.forceBlockingFlush();
@@ -52,7 +52,7 @@ public class RemoveColumnFamilyWithFlush1Test extends SchemaLoader
ColumnFamily retrieved = store.getColumnFamily(QueryFilter.getIdentityFilter(dk, "Standard1", System.currentTimeMillis()));
assert retrieved.isMarkedForDelete();
- assertNull(retrieved.getColumn(ByteBufferUtil.bytes("Column1")));
+ assertNull(retrieved.getColumn(Util.cellname("Column1")));
assertNull(Util.cloneAndRemoveDeleted(retrieved, Integer.MAX_VALUE));
}
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/362cc053/test/unit/org/apache/cassandra/db/RemoveColumnFamilyWithFlush2Test.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/db/RemoveColumnFamilyWithFlush2Test.java b/test/unit/org/apache/cassandra/db/RemoveColumnFamilyWithFlush2Test.java
index f6fae5a..9c8aba1 100644
--- a/test/unit/org/apache/cassandra/db/RemoveColumnFamilyWithFlush2Test.java
+++ b/test/unit/org/apache/cassandra/db/RemoveColumnFamilyWithFlush2Test.java
@@ -40,7 +40,7 @@ public class RemoveColumnFamilyWithFlush2Test extends SchemaLoader
// add data
rm = new RowMutation("Keyspace1", dk.key);
- rm.add("Standard1", ByteBufferUtil.bytes("Column1"), ByteBufferUtil.bytes("asdf"), 0);
+ rm.add("Standard1", Util.cellname("Column1"), ByteBufferUtil.bytes("asdf"), 0);
rm.apply();
// remove
rm = new RowMutation("Keyspace1", dk.key);
@@ -50,7 +50,7 @@ public class RemoveColumnFamilyWithFlush2Test extends SchemaLoader
ColumnFamily retrieved = store.getColumnFamily(QueryFilter.getIdentityFilter(dk, "Standard1", System.currentTimeMillis()));
assert retrieved.isMarkedForDelete();
- assertNull(retrieved.getColumn(ByteBufferUtil.bytes("Column1")));
+ assertNull(retrieved.getColumn(Util.cellname("Column1")));
assertNull(Util.cloneAndRemoveDeleted(retrieved, Integer.MAX_VALUE));
}
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/362cc053/test/unit/org/apache/cassandra/db/RemoveColumnTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/db/RemoveColumnTest.java b/test/unit/org/apache/cassandra/db/RemoveColumnTest.java
index dfbf513..7ac66e6 100644
--- a/test/unit/org/apache/cassandra/db/RemoveColumnTest.java
+++ b/test/unit/org/apache/cassandra/db/RemoveColumnTest.java
@@ -42,20 +42,17 @@ public class RemoveColumnTest extends SchemaLoader
// add data
rm = new RowMutation("Keyspace1", dk.key);
- rm.add("Standard1", ByteBufferUtil.bytes("Column1"), ByteBufferUtil.bytes("asdf"), 0);
+ rm.add("Standard1", Util.cellname("Column1"), ByteBufferUtil.bytes("asdf"), 0);
rm.apply();
store.forceBlockingFlush();
// remove
rm = new RowMutation("Keyspace1", dk.key);
- rm.delete("Standard1", ByteBufferUtil.bytes("Column1"), 1);
+ rm.delete("Standard1", Util.cellname("Column1"), 1);
rm.apply();
- ColumnFamily retrieved = store.getColumnFamily(QueryFilter.getNamesFilter(dk,
- "Standard1",
- ByteBufferUtil.bytes("Column1"),
- System.currentTimeMillis()));
- assert retrieved.getColumn(ByteBufferUtil.bytes("Column1")).isMarkedForDelete(System.currentTimeMillis());
+ ColumnFamily retrieved = store.getColumnFamily(Util.namesQueryFilter(store, dk, "Column1"));
+ assert retrieved.getColumn(Util.cellname("Column1")).isMarkedForDelete(System.currentTimeMillis());
assertNull(Util.cloneAndRemoveDeleted(retrieved, Integer.MAX_VALUE));
assertNull(Util.cloneAndRemoveDeleted(store.getColumnFamily(QueryFilter.getIdentityFilter(dk,
"Standard1",
@@ -63,21 +60,26 @@ public class RemoveColumnTest extends SchemaLoader
Integer.MAX_VALUE));
}
+ private static DeletedColumn dc(String name, int ldt, long timestamp)
+ {
+ return new DeletedColumn(Util.cellname(name), ldt, timestamp);
+ }
+
@Test
public void deletedColumnShouldAlwaysBeMarkedForDelete()
{
// Check for bug in #4307
long timestamp = System.currentTimeMillis();
int localDeletionTime = (int) (timestamp / 1000);
- Column c = DeletedColumn.create(localDeletionTime, timestamp, "dc1");
+ Column c = dc("dc1", localDeletionTime, timestamp);
assertTrue("DeletedColumn was not marked for delete", c.isMarkedForDelete(timestamp));
// Simulate a node that is 30 seconds behind
- c = DeletedColumn.create(localDeletionTime + 30, timestamp + 30000, "dc2");
+ c = dc("dc2", localDeletionTime + 30, timestamp + 30000);
assertTrue("DeletedColumn was not marked for delete", c.isMarkedForDelete(timestamp));
// Simulate a node that is 30 ahead behind
- c = DeletedColumn.create(localDeletionTime - 30, timestamp - 30000, "dc3");
+ c = dc("dc3", localDeletionTime - 30, timestamp - 30000);
assertTrue("DeletedColumn was not marked for delete", c.isMarkedForDelete(timestamp));
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/362cc053/test/unit/org/apache/cassandra/db/RemoveSubColumnTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/db/RemoveSubColumnTest.java b/test/unit/org/apache/cassandra/db/RemoveSubColumnTest.java
index 6d2be75..e112b1b 100644
--- a/test/unit/org/apache/cassandra/db/RemoveSubColumnTest.java
+++ b/test/unit/org/apache/cassandra/db/RemoveSubColumnTest.java
@@ -24,6 +24,7 @@ import java.util.concurrent.TimeUnit;
import org.junit.Test;
import static org.junit.Assert.assertNull;
+import org.apache.cassandra.db.composites.*;
import org.apache.cassandra.db.filter.QueryFilter;
import org.apache.cassandra.db.marshal.CompositeType;
import static org.apache.cassandra.Util.getBytes;
@@ -50,7 +51,7 @@ public class RemoveSubColumnTest extends SchemaLoader
rm.apply();
store.forceBlockingFlush();
- ByteBuffer cname = CompositeType.build(ByteBufferUtil.bytes("SC1"), getBytes(1L));
+ CellName cname = CellNames.compositeDense(ByteBufferUtil.bytes("SC1"), getBytes(1L));
// remove
rm = new RowMutation("Keyspace1", dk.key);
rm.delete("Super1", cname, 1);
@@ -77,7 +78,7 @@ public class RemoveSubColumnTest extends SchemaLoader
// remove the SC
ByteBuffer scName = ByteBufferUtil.bytes("SC1");
- ByteBuffer cname = CompositeType.build(scName, getBytes(1L));
+ CellName cname = CellNames.compositeDense(scName, getBytes(1L));
rm = new RowMutation("Keyspace1", dk.key);
rm.deleteRange("Super1", SuperColumns.startOf(scName), SuperColumns.endOf(scName), 1);
rm.apply();
http://git-wip-us.apache.org/repos/asf/cassandra/blob/362cc053/test/unit/org/apache/cassandra/db/RowCacheTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/db/RowCacheTest.java b/test/unit/org/apache/cassandra/db/RowCacheTest.java
index 8934a27..6c3a620 100644
--- a/test/unit/org/apache/cassandra/db/RowCacheTest.java
+++ b/test/unit/org/apache/cassandra/db/RowCacheTest.java
@@ -26,6 +26,7 @@ import org.junit.Test;
import org.apache.cassandra.SchemaLoader;
import org.apache.cassandra.Util;
+import org.apache.cassandra.db.composites.*;
import org.apache.cassandra.db.compaction.CompactionManager;
import org.apache.cassandra.dht.BytesToken;
import org.apache.cassandra.locator.TokenMetadata;
@@ -67,28 +68,18 @@ public class RowCacheTest extends SchemaLoader
{
DecoratedKey key = Util.dk("key" + i);
- cachedStore.getColumnFamily(key,
- ByteBufferUtil.EMPTY_BYTE_BUFFER,
- ByteBufferUtil.EMPTY_BYTE_BUFFER,
- false,
- 1,
- System.currentTimeMillis());
+ cachedStore.getColumnFamily(key, Composites.EMPTY, Composites.EMPTY, false, 1, System.currentTimeMillis());
assert CacheService.instance.rowCache.size() == i + 1;
assert cachedStore.containsCachedRow(key); // current key should be stored in the cache
// checking if column is read correctly after cache
- ColumnFamily cf = cachedStore.getColumnFamily(key,
- ByteBufferUtil.EMPTY_BYTE_BUFFER,
- ByteBufferUtil.EMPTY_BYTE_BUFFER,
- false,
- 1,
- System.currentTimeMillis());
+ ColumnFamily cf = cachedStore.getColumnFamily(key, Composites.EMPTY, Composites.EMPTY, false, 1, System.currentTimeMillis());
Collection<Column> columns = cf.getSortedColumns();
Column column = columns.iterator().next();
assert columns.size() == 1;
- assert column.name().equals(ByteBufferUtil.bytes("col" + i));
+ assert column.name().toByteBuffer().equals(ByteBufferUtil.bytes("col" + i));
assert column.value().equals(ByteBufferUtil.bytes("val" + i));
}
@@ -99,27 +90,17 @@ public class RowCacheTest extends SchemaLoader
{
DecoratedKey key = Util.dk("key" + i);
- cachedStore.getColumnFamily(key,
- ByteBufferUtil.EMPTY_BYTE_BUFFER,
- ByteBufferUtil.EMPTY_BYTE_BUFFER,
- false,
- 1,
- System.currentTimeMillis());
+ cachedStore.getColumnFamily(key, Composites.EMPTY, Composites.EMPTY, false, 1, System.currentTimeMillis());
assert cachedStore.containsCachedRow(key); // cache should be populated with the latest rows read (old ones should be popped)
// checking if column is read correctly after cache
- ColumnFamily cf = cachedStore.getColumnFamily(key,
- ByteBufferUtil.EMPTY_BYTE_BUFFER,
- ByteBufferUtil.EMPTY_BYTE_BUFFER,
- false,
- 1,
- System.currentTimeMillis());
+ ColumnFamily cf = cachedStore.getColumnFamily(key, Composites.EMPTY, Composites.EMPTY, false, 1, System.currentTimeMillis());
Collection<Column> columns = cf.getSortedColumns();
Column column = columns.iterator().next();
assert columns.size() == 1;
- assert column.name().equals(ByteBufferUtil.bytes("col" + i));
+ assert column.name().toByteBuffer().equals(ByteBufferUtil.bytes("col" + i));
assert column.value().equals(ByteBufferUtil.bytes("val" + i));
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/362cc053/test/unit/org/apache/cassandra/db/RowIterationTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/db/RowIterationTest.java b/test/unit/org/apache/cassandra/db/RowIterationTest.java
index 6353a8c..9ec7bec 100644
--- a/test/unit/org/apache/cassandra/db/RowIterationTest.java
+++ b/test/unit/org/apache/cassandra/db/RowIterationTest.java
@@ -30,6 +30,7 @@ import org.apache.cassandra.Util;
import org.junit.Test;
import org.apache.cassandra.SchemaLoader;
+import org.apache.cassandra.db.composites.*;
import org.apache.cassandra.db.marshal.CompositeType;
import org.apache.cassandra.utils.FBUtilities;
import static org.junit.Assert.assertEquals;
@@ -52,7 +53,7 @@ public class RowIterationTest extends SchemaLoader
for (int i = 0; i < ROWS_PER_SSTABLE; i++) {
DecoratedKey key = Util.dk(String.valueOf(i));
RowMutation rm = new RowMutation(KEYSPACE1, key.key);
- rm.add("Super3", CompositeType.build(ByteBufferUtil.bytes("sc"), ByteBufferUtil.bytes(String.valueOf(i))), ByteBuffer.wrap(new byte[ROWS_PER_SSTABLE * 10 - i * 2]), i);
+ rm.add("Super3", CellNames.compositeDense(ByteBufferUtil.bytes("sc"), ByteBufferUtil.bytes(String.valueOf(i))), ByteBuffer.wrap(new byte[ROWS_PER_SSTABLE * 10 - i * 2]), i);
rm.apply();
inserted.add(key);
}
@@ -71,7 +72,7 @@ public class RowIterationTest extends SchemaLoader
// Delete row in first sstable
RowMutation rm = new RowMutation(KEYSPACE1, key.key);
rm.delete(CF_NAME, 0);
- rm.add(CF_NAME, ByteBufferUtil.bytes("c"), ByteBufferUtil.bytes("values"), 0L);
+ rm.add(CF_NAME, Util.cellname("c"), ByteBufferUtil.bytes("values"), 0L);
DeletionInfo delInfo1 = rm.getColumnFamilies().iterator().next().deletionInfo();
rm.apply();
store.forceBlockingFlush();
@@ -79,7 +80,7 @@ public class RowIterationTest extends SchemaLoader
// Delete row in second sstable with higher timestamp
rm = new RowMutation(KEYSPACE1, key.key);
rm.delete(CF_NAME, 1);
- rm.add(CF_NAME, ByteBufferUtil.bytes("c"), ByteBufferUtil.bytes("values"), 1L);
+ rm.add(CF_NAME, Util.cellname("c"), ByteBufferUtil.bytes("values"), 1L);
DeletionInfo delInfo2 = rm.getColumnFamilies().iterator().next().deletionInfo();
assert delInfo2.getTopLevelDeletion().markedForDeleteAt == 1L;
rm.apply();
http://git-wip-us.apache.org/repos/asf/cassandra/blob/362cc053/test/unit/org/apache/cassandra/db/RowTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/db/RowTest.java b/test/unit/org/apache/cassandra/db/RowTest.java
index 2571fa5..d770a6c 100644
--- a/test/unit/org/apache/cassandra/db/RowTest.java
+++ b/test/unit/org/apache/cassandra/db/RowTest.java
@@ -26,6 +26,7 @@ import org.junit.Test;
import static org.junit.Assert.assertEquals;
import static org.apache.cassandra.Util.column;
+import org.apache.cassandra.db.composites.*;
import org.apache.cassandra.utils.ByteBufferUtil;
import com.google.common.util.concurrent.Uninterruptibles;
@@ -59,14 +60,14 @@ public class RowTest extends SchemaLoader
cf2.addColumn(column("two", "C", 1));
cf1.resolve(cf2);
- assert Arrays.equals(cf1.getColumn(ByteBufferUtil.bytes("one")).value().array(), "B".getBytes());
- assert Arrays.equals(cf1.getColumn(ByteBufferUtil.bytes("two")).value().array(), "C".getBytes());
+ assert Arrays.equals(cf1.getColumn(CellNames.simpleDense(ByteBufferUtil.bytes("one"))).value().array(), "B".getBytes());
+ assert Arrays.equals(cf1.getColumn(CellNames.simpleDense(ByteBufferUtil.bytes("two"))).value().array(), "C".getBytes());
}
@Test
public void testExpiringColumnExpiration()
{
- Column c = new ExpiringColumn(ByteBufferUtil.bytes("one"), ByteBufferUtil.bytes("A"), 0, 1);
+ Column c = new ExpiringColumn(CellNames.simpleDense(ByteBufferUtil.bytes("one")), ByteBufferUtil.bytes("A"), 0, 1);
assert !c.isMarkedForDelete(System.currentTimeMillis());
// Because we keep the local deletion time with a precision of a
http://git-wip-us.apache.org/repos/asf/cassandra/blob/362cc053/test/unit/org/apache/cassandra/db/SecondaryIndexColumnSizeTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/db/SecondaryIndexColumnSizeTest.java b/test/unit/org/apache/cassandra/db/SecondaryIndexColumnSizeTest.java
index 51d9ee8..0dbc12a 100644
--- a/test/unit/org/apache/cassandra/db/SecondaryIndexColumnSizeTest.java
+++ b/test/unit/org/apache/cassandra/db/SecondaryIndexColumnSizeTest.java
@@ -24,6 +24,7 @@ import java.util.Set;
import org.junit.Test;
import org.apache.cassandra.exceptions.ConfigurationException;
+import org.apache.cassandra.db.composites.*;
import org.apache.cassandra.db.index.PerColumnSecondaryIndex;
import org.apache.cassandra.db.index.PerRowSecondaryIndex;
import org.apache.cassandra.db.index.SecondaryIndexSearcher;
@@ -47,7 +48,7 @@ public class SecondaryIndexColumnSizeTest
// for read
buffer.flip();
- Column column = new Column(ByteBufferUtil.bytes("test"), buffer, 0);
+ Column column = new Column(CellNames.simpleDense(ByteBufferUtil.bytes("test")), buffer, 0);
SecondaryIndexColumnSizeTest.MockRowIndex mockRowIndex = new SecondaryIndexColumnSizeTest.MockRowIndex();
SecondaryIndexColumnSizeTest.MockColumnIndex mockColumnIndex = new SecondaryIndexColumnSizeTest.MockColumnIndex();
@@ -137,6 +138,11 @@ public class SecondaryIndexColumnSizeTest
public void reload()
{
}
+
+ public boolean indexes(CellName name)
+ {
+ return true;
+ }
}
@@ -215,5 +221,10 @@ public class SecondaryIndexColumnSizeTest
public void reload()
{
}
+
+ public boolean indexes(CellName name)
+ {
+ return true;
+ }
}
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/362cc053/test/unit/org/apache/cassandra/db/SerializationsTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/db/SerializationsTest.java b/test/unit/org/apache/cassandra/db/SerializationsTest.java
index 119b47a..7b7edfa 100644
--- a/test/unit/org/apache/cassandra/db/SerializationsTest.java
+++ b/test/unit/org/apache/cassandra/db/SerializationsTest.java
@@ -20,7 +20,9 @@ package org.apache.cassandra.db;
import org.apache.cassandra.AbstractSerializationsTester;
import org.apache.cassandra.Util;
+import org.apache.cassandra.db.composites.*;
import org.apache.cassandra.db.filter.*;
+import org.apache.cassandra.db.marshal.AbstractType;
import org.apache.cassandra.db.marshal.BytesType;
import org.apache.cassandra.db.marshal.CompositeType;
import org.apache.cassandra.dht.AbstractBounds;
@@ -56,12 +58,12 @@ public class SerializationsTest extends AbstractSerializationsTester
private ByteBuffer startCol = ByteBufferUtil.bytes("Start");
private ByteBuffer stopCol = ByteBufferUtil.bytes("Stop");
- private ByteBuffer emptyCol = ByteBufferUtil.bytes("");
+ private Composite emptyCol = Composites.EMPTY;
public NamesQueryFilter namesPred = new NamesQueryFilter(statics.NamedCols);
public NamesQueryFilter namesSCPred = new NamesQueryFilter(statics.NamedSCCols);
public SliceQueryFilter emptyRangePred = new SliceQueryFilter(emptyCol, emptyCol, false, 100);
- public SliceQueryFilter nonEmptyRangePred = new SliceQueryFilter(startCol, stopCol, true, 100);
- public SliceQueryFilter nonEmptyRangeSCPred = new SliceQueryFilter(CompositeType.build(statics.SC, startCol), CompositeType.build(statics.SC, stopCol), true, 100);
+ public SliceQueryFilter nonEmptyRangePred = new SliceQueryFilter(CellNames.simpleDense(startCol), CellNames.simpleDense(stopCol), true, 100);
+ public SliceQueryFilter nonEmptyRangeSCPred = new SliceQueryFilter(CellNames.compositeDense(statics.SC, startCol), CellNames.compositeDense(statics.SC, stopCol), true, 100);
private void testRangeSliceCommandWrite() throws IOException
{
@@ -334,26 +336,32 @@ public class SerializationsTest extends AbstractSerializationsTester
in.close();
}
- private static ByteBuffer bb(String s) {
+ private static ByteBuffer bb(String s)
+ {
return ByteBufferUtil.bytes(s);
}
+ private static CellName cn(String s)
+ {
+ return CellNames.simpleDense(ByteBufferUtil.bytes(s));
+ }
+
private static class Statics
{
private final String KS = "Keyspace1";
private final ByteBuffer Key = ByteBufferUtil.bytes("Key01");
- private final SortedSet<ByteBuffer> NamedCols = new TreeSet<ByteBuffer>(BytesType.instance)
+ private final SortedSet<CellName> NamedCols = new TreeSet<CellName>(new SimpleDenseCellNameType(BytesType.instance))
{{
- add(ByteBufferUtil.bytes("AAA"));
- add(ByteBufferUtil.bytes("BBB"));
- add(ByteBufferUtil.bytes("CCC"));
+ add(CellNames.simpleDense(ByteBufferUtil.bytes("AAA")));
+ add(CellNames.simpleDense(ByteBufferUtil.bytes("BBB")));
+ add(CellNames.simpleDense(ByteBufferUtil.bytes("CCC")));
}};
private final ByteBuffer SC = ByteBufferUtil.bytes("SCName");
- private final SortedSet<ByteBuffer> NamedSCCols = new TreeSet<ByteBuffer>(BytesType.instance)
+ private final SortedSet<CellName> NamedSCCols = new TreeSet<CellName>(new CompoundDenseCellNameType(Arrays.<AbstractType<?>>asList(BytesType.instance, BytesType.instance)))
{{
- add(CompositeType.build(SC, ByteBufferUtil.bytes("AAA")));
- add(CompositeType.build(SC, ByteBufferUtil.bytes("BBB")));
- add(CompositeType.build(SC, ByteBufferUtil.bytes("CCC")));
+ add(CellNames.compositeDense(SC, ByteBufferUtil.bytes("AAA")));
+ add(CellNames.compositeDense(SC, ByteBufferUtil.bytes("BBB")));
+ add(CellNames.compositeDense(SC, ByteBufferUtil.bytes("CCC")));
}};
private final String StandardCF = "Standard1";
private final String SuperCF = "Super1";
@@ -369,21 +377,21 @@ public class SerializationsTest extends AbstractSerializationsTester
private Statics()
{
- StandardCf.addColumn(new Column(bb("aaaa")));
- StandardCf.addColumn(new Column(bb("bbbb"), bb("bbbbb-value")));
- StandardCf.addColumn(new Column(bb("cccc"), bb("ccccc-value"), 1000L));
- StandardCf.addColumn(new DeletedColumn(bb("dddd"), 500, 1000));
- StandardCf.addColumn(new DeletedColumn(bb("eeee"), bb("eeee-value"), 1001));
- StandardCf.addColumn(new ExpiringColumn(bb("ffff"), bb("ffff-value"), 2000, 1000));
- StandardCf.addColumn(new ExpiringColumn(bb("gggg"), bb("gggg-value"), 2001, 1000, 2002));
-
- SuperCf.addColumn(new Column(CompositeType.build(SC, bb("aaaa"))));
- SuperCf.addColumn(new Column(CompositeType.build(SC, bb("bbbb")), bb("bbbbb-value")));
- SuperCf.addColumn(new Column(CompositeType.build(SC, bb("cccc")), bb("ccccc-value"), 1000L));
- SuperCf.addColumn(new DeletedColumn(CompositeType.build(SC, bb("dddd")), 500, 1000));
- SuperCf.addColumn(new DeletedColumn(CompositeType.build(SC, bb("eeee")), bb("eeee-value"), 1001));
- SuperCf.addColumn(new ExpiringColumn(CompositeType.build(SC, bb("ffff")), bb("ffff-value"), 2000, 1000));
- SuperCf.addColumn(new ExpiringColumn(CompositeType.build(SC, bb("gggg")), bb("gggg-value"), 2001, 1000, 2002));
+ StandardCf.addColumn(new Column(cn("aaaa")));
+ StandardCf.addColumn(new Column(cn("bbbb"), bb("bbbbb-value")));
+ StandardCf.addColumn(new Column(cn("cccc"), bb("ccccc-value"), 1000L));
+ StandardCf.addColumn(new DeletedColumn(cn("dddd"), 500, 1000));
+ StandardCf.addColumn(new DeletedColumn(cn("eeee"), bb("eeee-value"), 1001));
+ StandardCf.addColumn(new ExpiringColumn(cn("ffff"), bb("ffff-value"), 2000, 1000));
+ StandardCf.addColumn(new ExpiringColumn(cn("gggg"), bb("gggg-value"), 2001, 1000, 2002));
+
+ SuperCf.addColumn(new Column(CellNames.compositeDense(SC, bb("aaaa"))));
+ SuperCf.addColumn(new Column(CellNames.compositeDense(SC, bb("bbbb")), bb("bbbbb-value")));
+ SuperCf.addColumn(new Column(CellNames.compositeDense(SC, bb("cccc")), bb("ccccc-value"), 1000L));
+ SuperCf.addColumn(new DeletedColumn(CellNames.compositeDense(SC, bb("dddd")), 500, 1000));
+ SuperCf.addColumn(new DeletedColumn(CellNames.compositeDense(SC, bb("eeee")), bb("eeee-value"), 1001));
+ SuperCf.addColumn(new ExpiringColumn(CellNames.compositeDense(SC, bb("ffff")), bb("ffff-value"), 2000, 1000));
+ SuperCf.addColumn(new ExpiringColumn(CellNames.compositeDense(SC, bb("gggg")), bb("gggg-value"), 2001, 1000, 2002));
}
}
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/362cc053/test/unit/org/apache/cassandra/db/TimeSortTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/db/TimeSortTest.java b/test/unit/org/apache/cassandra/db/TimeSortTest.java
index 37966de..a4daf4f 100644
--- a/test/unit/org/apache/cassandra/db/TimeSortTest.java
+++ b/test/unit/org/apache/cassandra/db/TimeSortTest.java
@@ -27,9 +27,11 @@ import org.junit.Test;
import static org.junit.Assert.assertEquals;
import org.apache.cassandra.SchemaLoader;
+import static org.apache.cassandra.Util.cellname;
import static org.apache.cassandra.Util.getBytes;
import org.apache.cassandra.Util;
+import org.apache.cassandra.db.composites.*;
import org.apache.cassandra.db.filter.QueryFilter;
import org.apache.cassandra.db.marshal.LongType;
import org.apache.cassandra.utils.ByteBufferUtil;
@@ -46,15 +48,15 @@ public class TimeSortTest extends SchemaLoader
DecoratedKey key = Util.dk("key0");
rm = new RowMutation("Keyspace1", key.key);
- rm.add("StandardLong1", getBytes(100), ByteBufferUtil.bytes("a"), 100);
+ rm.add("StandardLong1", cellname(100), ByteBufferUtil.bytes("a"), 100);
rm.apply();
cfStore.forceBlockingFlush();
rm = new RowMutation("Keyspace1", key.key);
- rm.add("StandardLong1", getBytes(0), ByteBufferUtil.bytes("b"), 0);
+ rm.add("StandardLong1", cellname(0), ByteBufferUtil.bytes("b"), 0);
rm.apply();
- ColumnFamily cf = cfStore.getColumnFamily(key, getBytes(10), ByteBufferUtil.EMPTY_BYTE_BUFFER, false, 1000, System.currentTimeMillis());
+ ColumnFamily cf = cfStore.getColumnFamily(key, cellname(10), Composites.EMPTY, false, 1000, System.currentTimeMillis());
Collection<Column> columns = cf.getSortedColumns();
assert columns.size() == 1;
}
@@ -70,7 +72,7 @@ public class TimeSortTest extends SchemaLoader
RowMutation rm = new RowMutation("Keyspace1", ByteBufferUtil.bytes(Integer.toString(i)));
for (int j = 0; j < 8; ++j)
{
- rm.add("StandardLong1", getBytes(j * 2), ByteBufferUtil.bytes("a"), j * 2);
+ rm.add("StandardLong1", cellname(j * 2), ByteBufferUtil.bytes("a"), j * 2);
}
rm.apply();
}
@@ -85,17 +87,17 @@ public class TimeSortTest extends SchemaLoader
RowMutation rm = new RowMutation("Keyspace1", key.key);
for (int j = 0; j < 4; ++j)
{
- rm.add("StandardLong1", getBytes(j * 2 + 1), ByteBufferUtil.bytes("b"), j * 2 + 1);
+ rm.add("StandardLong1", cellname(j * 2 + 1), ByteBufferUtil.bytes("b"), j * 2 + 1);
}
rm.apply();
// and some overwrites
rm = new RowMutation("Keyspace1", key.key);
- rm.add("StandardLong1", getBytes(0), ByteBufferUtil.bytes("c"), 100);
- rm.add("StandardLong1", getBytes(10), ByteBufferUtil.bytes("c"), 100);
+ rm.add("StandardLong1", cellname(0), ByteBufferUtil.bytes("c"), 100);
+ rm.add("StandardLong1", cellname(10), ByteBufferUtil.bytes("c"), 100);
rm.apply();
// verify
- ColumnFamily cf = cfStore.getColumnFamily(key, getBytes(0), ByteBufferUtil.EMPTY_BYTE_BUFFER, false, 1000, System.currentTimeMillis());
+ ColumnFamily cf = cfStore.getColumnFamily(key, cellname(0), Composites.EMPTY, false, 1000, System.currentTimeMillis());
Collection<Column> columns = cf.getSortedColumns();
assertEquals(12, columns.size());
Iterator<Column> iter = columns.iterator();
@@ -103,14 +105,14 @@ public class TimeSortTest extends SchemaLoader
for (int j = 0; j < 8; j++)
{
column = iter.next();
- assert column.name().equals(getBytes(j));
+ assert column.name().toByteBuffer().equals(getBytes(j));
}
- TreeSet<ByteBuffer> columnNames = new TreeSet<ByteBuffer>(LongType.instance);
- columnNames.add(getBytes(10));
- columnNames.add(getBytes(0));
+ TreeSet<CellName> columnNames = new TreeSet<CellName>(cfStore.getComparator());
+ columnNames.add(cellname(10));
+ columnNames.add(cellname(0));
cf = cfStore.getColumnFamily(QueryFilter.getNamesFilter(Util.dk("900"), "StandardLong1", columnNames, System.currentTimeMillis()));
- assert "c".equals(ByteBufferUtil.string(cf.getColumn(getBytes(0)).value()));
- assert "c".equals(ByteBufferUtil.string(cf.getColumn(getBytes(10)).value()));
+ assert "c".equals(ByteBufferUtil.string(cf.getColumn(cellname(0)).value()));
+ assert "c".equals(ByteBufferUtil.string(cf.getColumn(cellname(10)).value()));
}
private void validateTimeSort(Keyspace keyspace) throws IOException
@@ -120,12 +122,8 @@ public class TimeSortTest extends SchemaLoader
DecoratedKey key = Util.dk(Integer.toString(i));
for (int j = 0; j < 8; j += 3)
{
- ColumnFamily cf = keyspace.getColumnFamilyStore("StandardLong1").getColumnFamily(key,
- getBytes(j * 2),
- ByteBufferUtil.EMPTY_BYTE_BUFFER,
- false,
- 1000,
- System.currentTimeMillis());
+ ColumnFamilyStore cfs = keyspace.getColumnFamilyStore("StandardLong1");
+ ColumnFamily cf = cfs.getColumnFamily(key, cellname(j * 2), Composites.EMPTY, false, 1000, System.currentTimeMillis());
Collection<Column> columns = cf.getSortedColumns();
assert columns.size() == 8 - j;
int k = j;
http://git-wip-us.apache.org/repos/asf/cassandra/blob/362cc053/test/unit/org/apache/cassandra/db/compaction/BlacklistingCompactionsTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/db/compaction/BlacklistingCompactionsTest.java b/test/unit/org/apache/cassandra/db/compaction/BlacklistingCompactionsTest.java
index e392a4b..d73ccfd 100644
--- a/test/unit/org/apache/cassandra/db/compaction/BlacklistingCompactionsTest.java
+++ b/test/unit/org/apache/cassandra/db/compaction/BlacklistingCompactionsTest.java
@@ -41,6 +41,7 @@ import org.apache.cassandra.utils.ByteBufferUtil;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
+import static org.apache.cassandra.Util.cellname;
public class BlacklistingCompactionsTest extends SchemaLoader
{
@@ -93,9 +94,7 @@ public class BlacklistingCompactionsTest extends SchemaLoader
DecoratedKey key = Util.dk(String.valueOf(i % 2));
RowMutation rm = new RowMutation(KEYSPACE, key.key);
long timestamp = j * ROWS_PER_SSTABLE + i;
- rm.add("Standard1", ByteBufferUtil.bytes(String.valueOf(i / 2)),
- ByteBufferUtil.EMPTY_BYTE_BUFFER,
- timestamp);
+ rm.add("Standard1", cellname(i / 2), ByteBufferUtil.EMPTY_BYTE_BUFFER, timestamp);
maxTimestampExpected = Math.max(timestamp, maxTimestampExpected);
rm.apply();
inserted.add(key);
http://git-wip-us.apache.org/repos/asf/cassandra/blob/362cc053/test/unit/org/apache/cassandra/db/compaction/CompactionsPurgeTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/db/compaction/CompactionsPurgeTest.java b/test/unit/org/apache/cassandra/db/compaction/CompactionsPurgeTest.java
index bd814d0..c5f5483 100644
--- a/test/unit/org/apache/cassandra/db/compaction/CompactionsPurgeTest.java
+++ b/test/unit/org/apache/cassandra/db/compaction/CompactionsPurgeTest.java
@@ -44,6 +44,7 @@ import static org.junit.Assert.assertTrue;
import static org.apache.cassandra.cql3.QueryProcessor.processInternal;
+import static org.apache.cassandra.Util.cellname;
import org.apache.cassandra.utils.ByteBufferUtil;
@@ -68,7 +69,7 @@ public class CompactionsPurgeTest extends SchemaLoader
rm = new RowMutation(KEYSPACE1, key.key);
for (int i = 0; i < 10; i++)
{
- rm.add(cfName, ByteBufferUtil.bytes(String.valueOf(i)), ByteBufferUtil.EMPTY_BYTE_BUFFER, 0);
+ rm.add(cfName, cellname(String.valueOf(i)), ByteBufferUtil.EMPTY_BYTE_BUFFER, 0);
}
rm.apply();
cfs.forceBlockingFlush();
@@ -77,14 +78,14 @@ public class CompactionsPurgeTest extends SchemaLoader
for (int i = 0; i < 10; i++)
{
rm = new RowMutation(KEYSPACE1, key.key);
- rm.delete(cfName, ByteBufferUtil.bytes(String.valueOf(i)), 1);
+ rm.delete(cfName, cellname(String.valueOf(i)), 1);
rm.apply();
}
cfs.forceBlockingFlush();
// resurrect one column
rm = new RowMutation(KEYSPACE1, key.key);
- rm.add(cfName, ByteBufferUtil.bytes(String.valueOf(5)), ByteBufferUtil.EMPTY_BYTE_BUFFER, 2);
+ rm.add(cfName, cellname(String.valueOf(5)), ByteBufferUtil.EMPTY_BYTE_BUFFER, 2);
rm.apply();
cfs.forceBlockingFlush();
@@ -93,7 +94,7 @@ public class CompactionsPurgeTest extends SchemaLoader
cfs.invalidateCachedRow(key);
ColumnFamily cf = cfs.getColumnFamily(QueryFilter.getIdentityFilter(key, cfName, System.currentTimeMillis()));
assertColumns(cf, "5");
- assert cf.getColumn(ByteBufferUtil.bytes(String.valueOf(5))) != null;
+ assert cf.getColumn(cellname(String.valueOf(5))) != null;
}
@Test
@@ -113,7 +114,7 @@ public class CompactionsPurgeTest extends SchemaLoader
rm = new RowMutation(KEYSPACE2, key.key);
for (int i = 0; i < 10; i++)
{
- rm.add(cfName, ByteBufferUtil.bytes(String.valueOf(i)), ByteBufferUtil.EMPTY_BYTE_BUFFER, 0);
+ rm.add(cfName, cellname(String.valueOf(i)), ByteBufferUtil.EMPTY_BYTE_BUFFER, 0);
}
rm.apply();
cfs.forceBlockingFlush();
@@ -122,7 +123,7 @@ public class CompactionsPurgeTest extends SchemaLoader
for (int i = 0; i < 10; i++)
{
rm = new RowMutation(KEYSPACE2, key.key);
- rm.delete(cfName, ByteBufferUtil.bytes(String.valueOf(i)), 1);
+ rm.delete(cfName, cellname(String.valueOf(i)), 1);
rm.apply();
}
cfs.forceBlockingFlush();
@@ -136,7 +137,7 @@ public class CompactionsPurgeTest extends SchemaLoader
cfs.forceBlockingFlush();
Collection<SSTableReader> sstablesIncomplete = cfs.getSSTables();
rm = new RowMutation(KEYSPACE2, key1.key);
- rm.add(cfName, ByteBufferUtil.bytes(String.valueOf(5)), ByteBufferUtil.EMPTY_BYTE_BUFFER, 2);
+ rm.add(cfName, cellname(String.valueOf(5)), ByteBufferUtil.EMPTY_BYTE_BUFFER, 2);
rm.apply();
cfs.forceBlockingFlush();
cfs.getCompactionStrategy().getUserDefinedTask(sstablesIncomplete, Integer.MAX_VALUE).execute(null);
@@ -168,20 +169,20 @@ public class CompactionsPurgeTest extends SchemaLoader
// inserts
rm = new RowMutation(KEYSPACE2, key3.key);
- rm.add(cfName, ByteBufferUtil.bytes("c1"), ByteBufferUtil.EMPTY_BYTE_BUFFER, 8);
- rm.add(cfName, ByteBufferUtil.bytes("c2"), ByteBufferUtil.EMPTY_BYTE_BUFFER, 8);
+ rm.add(cfName, cellname("c1"), ByteBufferUtil.EMPTY_BYTE_BUFFER, 8);
+ rm.add(cfName, cellname("c2"), ByteBufferUtil.EMPTY_BYTE_BUFFER, 8);
rm.apply();
cfs.forceBlockingFlush();
// delete c1
rm = new RowMutation(KEYSPACE2, key3.key);
- rm.delete(cfName, ByteBufferUtil.bytes("c1"), 10);
+ rm.delete(cfName, cellname("c1"), 10);
rm.apply();
cfs.forceBlockingFlush();
Collection<SSTableReader> sstablesIncomplete = cfs.getSSTables();
// delete c2 so we have new delete in a diffrent SSTable
rm = new RowMutation(KEYSPACE2, key3.key);
- rm.delete(cfName, ByteBufferUtil.bytes("c2"), 9);
+ rm.delete(cfName, cellname("c2"), 9);
rm.apply();
cfs.forceBlockingFlush();
@@ -191,7 +192,7 @@ public class CompactionsPurgeTest extends SchemaLoader
// We should have both the c1 and c2 tombstones still. Since the min timestamp in the c2 tombstone
// sstable is older than the c1 tombstone, it is invalid to throw out the c1 tombstone.
ColumnFamily cf = cfs.getColumnFamily(QueryFilter.getIdentityFilter(key3, cfName, System.currentTimeMillis()));
- assertFalse(cf.getColumn(ByteBufferUtil.bytes("c2")).isLive(System.currentTimeMillis()));
+ assertFalse(cf.getColumn(cellname("c2")).isLive(System.currentTimeMillis()));
assertEquals(2, cf.getColumnCount());
}
@@ -211,7 +212,7 @@ public class CompactionsPurgeTest extends SchemaLoader
rm = new RowMutation(KEYSPACE1, key.key);
for (int i = 0; i < 5; i++)
{
- rm.add(cfName, ByteBufferUtil.bytes(String.valueOf(i)), ByteBufferUtil.EMPTY_BYTE_BUFFER, 0);
+ rm.add(cfName, cellname(String.valueOf(i)), ByteBufferUtil.EMPTY_BYTE_BUFFER, 0);
}
rm.apply();
@@ -219,7 +220,7 @@ public class CompactionsPurgeTest extends SchemaLoader
for (int i = 0; i < 5; i++)
{
rm = new RowMutation(KEYSPACE1, key.key);
- rm.delete(cfName, ByteBufferUtil.bytes(String.valueOf(i)), 1);
+ rm.delete(cfName, cellname(String.valueOf(i)), 1);
rm.apply();
}
cfs.forceBlockingFlush();
@@ -249,7 +250,7 @@ public class CompactionsPurgeTest extends SchemaLoader
rm = new RowMutation(keyspaceName, key.key);
for (int i = 0; i < 10; i++)
{
- rm.add(cfName, ByteBufferUtil.bytes(String.valueOf(i)), ByteBufferUtil.EMPTY_BYTE_BUFFER, 0);
+ rm.add(cfName, cellname(String.valueOf(i)), ByteBufferUtil.EMPTY_BYTE_BUFFER, 0);
}
rm.apply();
@@ -269,7 +270,7 @@ public class CompactionsPurgeTest extends SchemaLoader
rm = new RowMutation(keyspaceName, key.key);
for (int i = 0; i < 10; i++)
{
- rm.add(cfName, ByteBufferUtil.bytes(String.valueOf(i)), ByteBufferUtil.EMPTY_BYTE_BUFFER, 0);
+ rm.add(cfName, cellname(String.valueOf(i)), ByteBufferUtil.EMPTY_BYTE_BUFFER, 0);
}
rm.apply();
@@ -296,7 +297,7 @@ public class CompactionsPurgeTest extends SchemaLoader
// inserts
rm = new RowMutation(keyspaceName, key.key);
for (int i = 0; i < 10; i++)
- rm.add(cfName, ByteBufferUtil.bytes(String.valueOf(i)), ByteBufferUtil.EMPTY_BYTE_BUFFER, i);
+ rm.add(cfName, cellname(String.valueOf(i)), ByteBufferUtil.EMPTY_BYTE_BUFFER, i);
rm.apply();
// deletes row with timestamp such that not all columns are deleted
@@ -314,7 +315,7 @@ public class CompactionsPurgeTest extends SchemaLoader
// re-inserts with timestamp lower than delete
rm = new RowMutation(keyspaceName, key.key);
for (int i = 0; i < 5; i++)
- rm.add(cfName, ByteBufferUtil.bytes(String.valueOf(i)), ByteBufferUtil.EMPTY_BYTE_BUFFER, i);
+ rm.add(cfName, cellname(String.valueOf(i)), ByteBufferUtil.EMPTY_BYTE_BUFFER, i);
rm.apply();
// Check that the second insert went in
@@ -379,4 +380,4 @@ public class CompactionsPurgeTest extends SchemaLoader
result = processInternal(String.format("SELECT * FROM %s.%s WHERE k = %d", keyspace, table, 1));
assertEquals(0, result.size());
}
-}
\ No newline at end of file
+}