cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alek...@apache.org
Subject [5/7] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0
Date Mon, 11 Aug 2014 10:46:22 GMT
Merge branch 'cassandra-2.0' into cassandra-2.1.0

Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/thrift/CassandraServer.java


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

Branch: refs/heads/trunk
Commit: ef08f949fed2fb428259c8a3e73b4a804390e57b
Parents: 228f0ad f732a8b
Author: Aleksey Yeschenko <aleksey@apache.org>
Authored: Mon Aug 11 13:45:11 2014 +0300
Committer: Aleksey Yeschenko <aleksey@apache.org>
Committed: Mon Aug 11 13:45:11 2014 +0300

----------------------------------------------------------------------
 CHANGES.txt                                               | 1 +
 src/java/org/apache/cassandra/thrift/CassandraServer.java | 2 +-
 test/system/test_thrift_server.py                         | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/ef08f949/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 3174466,723b978..910feb4
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,11 -1,8 +1,12 @@@
 -2.0.11
 +2.1.0-rc6
 + * Include stress yaml example in release and deb (CASSANDRA-7717)
 + * workaround for netty issue causing corrupted data off the wire (CASSANDRA-7695)
 + * cqlsh DESC CLUSTER fails retrieving ring information (CASSANDRA-7687)
 + * Fix binding null values inside UDT (CASSANDRA-7685)
 + * Fix UDT field selection with empty fields (CASSANDRA-7670)
 + * Bogus deserialization of static cells from sstable (CASSANDRA-7684)
 +Merged from 2.0:
+  * (Thrift) fix range deletion of supercolumns (CASSANDRA-7733)
 -
 -
 -2.0.10
   * Fix potential AssertionError in RangeTombstoneList (CASSANDRA-7700)
   * Validate arguments of blobAs* functions (CASSANDRA-7707)
   * Fix potential AssertionError with 2ndary indexes (CASSANDRA-6612)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/ef08f949/src/java/org/apache/cassandra/thrift/CassandraServer.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/thrift/CassandraServer.java
index 4edb64d,cfb0e80..191c7ad
--- a/src/java/org/apache/cassandra/thrift/CassandraServer.java
+++ b/src/java/org/apache/cassandra/thrift/CassandraServer.java
@@@ -922,21 -908,18 +922,21 @@@ public class CassandraServer implement
          }
          else if (del.predicate != null && del.predicate.slice_range != null)
          {
 -            if (del.super_column == null && Schema.instance.getColumnFamilyType(rm.getKeyspaceName(),
cfName) == ColumnFamilyType.Super)
 -                rm.deleteRange(cfName,
 -                               SuperColumns.startOf(del.predicate.getSlice_range().start),
 -                               SuperColumns.endOf(del.predicate.getSlice_range().finish),
 -                               del.timestamp);
 +            if (del.super_column == null && cfm.isSuper())
 +                mutation.deleteRange(cfm.cfName,
 +                                     SuperColumns.startOf(del.predicate.getSlice_range().start),
-                                      SuperColumns.startOf(del.predicate.getSlice_range().finish),
++                                     SuperColumns.endOf(del.predicate.getSlice_range().finish),
 +                                     del.timestamp);
              else if (del.super_column != null)
 -                rm.deleteRange(cfName,
 -                               CompositeType.build(del.super_column, del.predicate.getSlice_range().start),
 -                               CompositeType.build(del.super_column, del.predicate.getSlice_range().finish),
 -                               del.timestamp);
 +                mutation.deleteRange(cfm.cfName,
 +                                     cfm.comparator.makeCellName(del.super_column, del.predicate.getSlice_range().start),
 +                                     cfm.comparator.makeCellName(del.super_column, del.predicate.getSlice_range().finish),
 +                                     del.timestamp);
              else
 -                rm.deleteRange(cfName, del.predicate.getSlice_range().start, del.predicate.getSlice_range().finish,
del.timestamp);
 +                mutation.deleteRange(cfm.cfName,
 +                                     cfm.comparator.cellFromByteBuffer(del.predicate.getSlice_range().start),
 +                                     cfm.comparator.cellFromByteBuffer(del.predicate.getSlice_range().finish),
 +                                     del.timestamp);
          }
          else
          {


Mime
View raw message