Merge branch cassandra-3.11 into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/753d004c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/753d004c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/753d004c Branch: refs/heads/trunk Commit: 753d004cda7ac4ed636b5e7f0b712ba0e987d368 Parents: 9e8e891 7b3415d Author: Benjamin Lerer <b.le...@gmail.com> Authored: Fri Mar 10 10:14:13 2017 +0100 Committer: Benjamin Lerer <b.le...@gmail.com> Committed: Fri Mar 10 10:15:07 2017 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../apache/cassandra/cql3/UpdateParameters.java | 24 ++++- .../org/apache/cassandra/db/rows/BTreeRow.java | 43 ++++++-- src/java/org/apache/cassandra/db/rows/Row.java | 6 ++ .../org/apache/cassandra/utils/btree/BTree.java | 20 ++++ .../validation/entities/CollectionsTest.java | 100 +++++++++++++++++++ .../apache/cassandra/db/rows/RowBuilder.java | 7 ++ 7 files changed, 192 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/753d004c/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/753d004c/src/java/org/apache/cassandra/cql3/UpdateParameters.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/753d004c/src/java/org/apache/cassandra/db/rows/BTreeRow.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/753d004c/src/java/org/apache/cassandra/db/rows/Row.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/753d004c/test/unit/org/apache/cassandra/cql3/validation/entities/CollectionsTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/753d004c/test/unit/org/apache/cassandra/db/rows/RowBuilder.java ---------------------------------------------------------------------- diff --cc test/unit/org/apache/cassandra/db/rows/RowBuilder.java index 5eed774,ede2ccd..21522a5 --- a/test/unit/org/apache/cassandra/db/rows/RowBuilder.java +++ b/test/unit/org/apache/cassandra/db/rows/RowBuilder.java @@@ -37,8 -38,14 +38,14 @@@ public class RowBuilder implements Row. public Clustering clustering = null; public LivenessInfo livenessInfo = null; public Row.Deletion deletionTime = null; - public List<Pair<ColumnDefinition, DeletionTime>> complexDeletions = new LinkedList<>(); + public List<Pair<ColumnMetadata, DeletionTime>> complexDeletions = new LinkedList<>(); + @Override + public Builder copy() + { + throw new UnsupportedOperationException(); + } + public void addCell(Cell cell) { cells.add(cell);
