[6/6] git commit: Merge branch 'cassandra-2.1' into trunk

[jake]

Merge branch 'cassandra-2.1' into trunk

Conflicts:
        interface/cassandra.thrift
        src/java/org/apache/cassandra/thrift/CassandraServer.java
        test/unit/org/apache/cassandra/thrift/MultiSliceTest.java


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

Branch: refs/heads/trunk
Commit: 235bae7b30154ad442510d448c8d826cdc287cb1
Parents: d151b40 e9e91d7
Author: Jake Luciani <j...@apache.org>
Authored: Wed May 28 13:55:32 2014 -0400
Committer: Jake Luciani <j...@apache.org>
Committed: Wed May 28 13:55:32 2014 -0400

----------------------------------------------------------------------
 CHANGES.txt                                     |   2 +
 .../org/apache/cassandra/thrift/CfDef.java      | 298 ++++++++++---------
 .../org/apache/cassandra/thrift/CqlRow.java     |   7 +-
 .../cql3/statements/CQL3CasConditions.java      |   1 +
 .../cql3/statements/SelectStatement.java        |   1 +
 .../cassandra/db/composites/AbstractCType.java  |   5 +
 .../apache/cassandra/db/filter/ColumnSlice.java |  97 ++++++
 .../cassandra/thrift/CassandraServer.java       |   5 +-
 .../cassandra/db/filter/ColumnSliceTest.java    | 137 ++++++++-
 .../apache/cassandra/thrift/MultiSliceTest.java |  20 +-
 10 files changed, 413 insertions(+), 160 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/235bae7b/CHANGES.txt
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/235bae7b/src/java/org/apache/cassandra/cql3/statements/CQL3CasConditions.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/235bae7b/src/java/org/apache/cassandra/thrift/CassandraServer.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/thrift/CassandraServer.java
index 4f54242,1a77ffa..868c701
--- a/src/java/org/apache/cassandra/thrift/CassandraServer.java
+++ b/src/java/org/apache/cassandra/thrift/CassandraServer.java
@@@ -2044,7 -2078,9 +2044,8 @@@ public class CassandraServer implement
                      throw new InvalidRequestException(String.format("Reversed 
column slice at index %d had start less than finish", i));
                  slices[i] = new ColumnSlice(start, finish);
              }
-             SliceQueryFilter filter = new SliceQueryFilter(slices, 
request.reversed, request.count);
 -
+             ColumnSlice[] deoverlapped = ColumnSlice.deoverlapSlices(slices, 
request.reversed ? metadata.comparator.reverseComparator() : 
metadata.comparator);
+             SliceQueryFilter filter = new SliceQueryFilter(deoverlapped, 
request.reversed, request.count);
              ThriftValidation.validateKey(metadata, request.key);
              commands.add(ReadCommand.create(keyspace, request.key, 
request.column_parent.getColumn_family(), System.currentTimeMillis(), filter));
              return getSlice(commands, 
request.column_parent.isSetSuper_column(), 
consistencyLevel).entrySet().iterator().next().getValue();