Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 6DC58200C36 for ; Fri, 10 Mar 2017 10:17:09 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 6C54D160B85; Fri, 10 Mar 2017 09:17:09 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id B94E4160B8B for ; Fri, 10 Mar 2017 10:17:08 +0100 (CET) Received: (qmail 70641 invoked by uid 500); 10 Mar 2017 09:17:06 -0000 Mailing-List: contact commits-help@cassandra.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cassandra.apache.org Delivered-To: mailing list commits@cassandra.apache.org Received: (qmail 70241 invoked by uid 99); 10 Mar 2017 09:17:06 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 10 Mar 2017 09:17:06 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 279E6E17C7; Fri, 10 Mar 2017 09:17:06 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: blerer@apache.org To: commits@cassandra.apache.org Date: Fri, 10 Mar 2017 09:17:14 -0000 Message-Id: <35a17f44f1d247529d9ecaab5e4a6857@git.apache.org> In-Reply-To: <218314af74a8467abbd1b65e330099b6@git.apache.org> References: <218314af74a8467abbd1b65e330099b6@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [10/10] cassandra git commit: Merge branch cassandra-3.11 into trunk archived-at: Fri, 10 Mar 2017 09:17:09 -0000 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 Authored: Fri Mar 10 10:14:13 2017 +0100 Committer: Benjamin Lerer 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> complexDeletions = new LinkedList<>(); + public List> complexDeletions = new LinkedList<>(); + @Override + public Builder copy() + { + throw new UnsupportedOperationException(); + } + public void addCell(Cell cell) { cells.add(cell);