cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From slebre...@apache.org
Subject [4/6] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.3
Date Tue, 12 Jan 2016 15:52:21 GMT
Merge branch 'cassandra-3.0' into cassandra-3.3


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2318f76c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2318f76c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2318f76c

Branch: refs/heads/trunk
Commit: 2318f76c8ea739b484e77ff3d2d52d279b084e8b
Parents: 2d0863c 4c7b06b
Author: Sylvain Lebresne <sylvain@datastax.com>
Authored: Tue Jan 12 16:51:50 2016 +0100
Committer: Sylvain Lebresne <sylvain@datastax.com>
Committed: Tue Jan 12 16:51:50 2016 +0100

----------------------------------------------------------------------
 CHANGES.txt                                             |  1 +
 src/java/org/apache/cassandra/cql3/Lists.java           |  2 +-
 .../cql3/validation/entities/CollectionsTest.java       | 12 ++++++++++++
 3 files changed, 14 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/2318f76c/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 2a13ef6,6daf7f9..50dc106
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,5 -1,5 +1,6 @@@
 -3.0.3
 +3.3
 +Merged from 3.0:
+  * Fix AssertionError when removing from list using UPDATE (CASSANDRA-10954)
   * Fix UnsupportedOperationException when reading old sstable with range
     tombstone (CASSANDRA-10743)
   * MV should use the maximum timestamp of the primary key (CASSANDRA-10910)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/2318f76c/src/java/org/apache/cassandra/cql3/Lists.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/cql3/Lists.java
index 43a97ae,18b382b..17c1575
--- a/src/java/org/apache/cassandra/cql3/Lists.java
+++ b/src/java/org/apache/cassandra/cql3/Lists.java
@@@ -356,9 -356,10 +356,9 @@@ public abstract class List
              if (idx < 0 || idx >= existingSize)
                  throw new InvalidRequestException(String.format("List index %d out of bound,
list has size %d", idx, existingSize));
  
 -            CellPath elementPath = existingRow.getComplexColumnData(column).getCellByIndex(idx).path();
              if (value == null)
              {
-                 params.addTombstone(column);
+                 params.addTombstone(column, elementPath);
              }
              else if (value != ByteBufferUtil.UNSET_BYTE_BUFFER)
              {


Mime
View raw message