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 2016/07/19 08:03:54 UTC
[1/3] cassandra git commit: Fix RowIndexEntryTest so it don't use a
primary key column for a cell
Repository: cassandra
Updated Branches:
refs/heads/cassandra-3.9 7e3eac5f3 -> 9659a389c
refs/heads/trunk 7b7ca79a6 -> 249a155aa
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/cassandra-3.9
Commit: 9659a389ca7fe8e96779a73448cb078375f0880a
Parents: 7e3eac5
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Tue Jul 19 10:03:01 2016 +0200
Committer: Sylvain Lebresne <sy...@datastax.com>
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());
[3/3] cassandra git commit: Merge branch 'cassandra-3.9' into trunk
Posted by sl...@apache.org.
Merge branch 'cassandra-3.9' into trunk
* cassandra-3.9:
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/249a155a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/249a155a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/249a155a
Branch: refs/heads/trunk
Commit: 249a155aaa05224cafc0fdb17b09e9c0d9d803e9
Parents: 7b7ca79 9659a38
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Tue Jul 19 10:03:38 2016 +0200
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Tue Jul 19 10:03:38 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/249a155a/test/unit/org/apache/cassandra/db/RowIndexEntryTest.java
----------------------------------------------------------------------
[2/3] cassandra git commit: Fix RowIndexEntryTest so it don't use a
primary key column for a cell
Posted by sl...@apache.org.
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 <sy...@datastax.com>
Authored: Tue Jul 19 10:03:01 2016 +0200
Committer: Sylvain Lebresne <sy...@datastax.com>
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());