Fix RowIndexEntryTest so it don't use a primary key column for a cell
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9659a389 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9659a389 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9659a389 Branch: refs/heads/trunk Commit: 9659a389ca7fe8e96779a73448cb078375f0880a Parents: 7e3eac5 Author: Sylvain Lebresne <[email protected]> Authored: Tue Jul 19 10:03:01 2016 +0200 Committer: Sylvain Lebresne <[email protected]> Committed: Tue Jul 19 10:03:30 2016 +0200 ---------------------------------------------------------------------- src/java/org/apache/cassandra/db/rows/BufferCell.java | 1 + test/unit/org/apache/cassandra/db/RowIndexEntryTest.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/9659a389/src/java/org/apache/cassandra/db/rows/BufferCell.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/rows/BufferCell.java b/src/java/org/apache/cassandra/db/rows/BufferCell.java index 7bb1f4b..9b31c16 100644 --- a/src/java/org/apache/cassandra/db/rows/BufferCell.java +++ b/src/java/org/apache/cassandra/db/rows/BufferCell.java @@ -39,6 +39,7 @@ public class BufferCell extends AbstractCell public BufferCell(ColumnDefinition column, long timestamp, int ttl, int localDeletionTime, ByteBuffer value, CellPath path) { super(column); + assert !column.isPrimaryKeyColumn(); assert column.isComplex() == (path != null); this.timestamp = timestamp; this.ttl = ttl; http://git-wip-us.apache.org/repos/asf/cassandra/blob/9659a389/test/unit/org/apache/cassandra/db/RowIndexEntryTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/db/RowIndexEntryTest.java b/test/unit/org/apache/cassandra/db/RowIndexEntryTest.java index 79eb449..73f97fa 100644 --- a/test/unit/org/apache/cassandra/db/RowIndexEntryTest.java +++ b/test/unit/org/apache/cassandra/db/RowIndexEntryTest.java @@ -226,7 +226,7 @@ public class RowIndexEntryTest extends CQLTester private Unfiltered buildRow(Clustering clustering) { BTree.Builder<ColumnData> builder = BTree.builder(ColumnData.comparator); - builder.add(BufferCell.live(cfMeta.allColumns().iterator().next(), + builder.add(BufferCell.live(cfMeta.partitionColumns().iterator().next(), 1L, ByteBuffer.allocate(0))); return BTreeRow.create(clustering, primaryKeyLivenessInfo, deletion, builder.build());
