cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From slebre...@apache.org
Subject [1/2] git commit: Merge branch 'cassandra-1.1' into trunk
Date Thu, 04 Oct 2012 15:03:56 GMT
Updated Branches:
  refs/heads/trunk db36acbf1 -> 038aa6bca


Merge branch 'cassandra-1.1' into trunk

Conflicts:
	src/java/org/apache/cassandra/cql3/statements/SelectStatement.java


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

Branch: refs/heads/trunk
Commit: 038aa6bca3d1857d929764e18be71d19e6573bdc
Parents: db36acb eff4b68
Author: Sylvain Lebresne <sylvain@datastax.com>
Authored: Thu Oct 4 17:03:34 2012 +0200
Committer: Sylvain Lebresne <sylvain@datastax.com>
Committed: Thu Oct 4 17:03:34 2012 +0200

----------------------------------------------------------------------
 CHANGES.txt                                        |    2 +-
 .../cassandra/cql3/statements/SelectStatement.java |   17 +++++++++-----
 2 files changed, 12 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/038aa6bc/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 32d76b4,c0a252e..85ca018
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -105,9 -13,10 +105,9 @@@
   * fix re-created keyspace disappering after 1.1.5 upgrade (CASSANDRA-4698)
   * (CLI) display elapsed time in 2 fraction digits (CASSANDRA-3460)
   * add authentication support to sstableloader (CASSANDRA-4712)
-  * Fix CQL3 'is reversed' logic (CASSANDRA-4716)
+  * Fix CQL3 'is reversed' logic (CASSANDRA-4716, 4759)
   * (CQL3) Don't return ReversedType in result set metadata (CASSANDRA-4717)
   * Pluggable Thrift transport factories for CLI (CASSANDRA-4609)
 - * Backport adding AlterKeyspace statement (CASSANDRA-4611)
  Merged from 1.0:
   * Switch from NBHM to CHM in MessagingService's callback map, which
     prevents OOM in long-running instances (CASSANDRA-4708)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/038aa6bc/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
index 08b8211,92a8d67..301c7c4
--- a/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
+++ b/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
@@@ -499,8 -491,16 +499,13 @@@ public class SelectStatement implement
          }
      }
  
 -    private ByteBuffer getRequestedBound(Bound bound, List<ByteBuffer> variables)
throws InvalidRequestException
 +    private ByteBuffer buildBound(Bound bound, Restriction[] restrictions, ColumnNameBuilder
builder, List<ByteBuffer> variables) throws InvalidRequestException
      {
 -        assert isColumnRange();
 -
+         // The end-of-component of composite doesn't depend on whether the
+         // component type is reversed or not (i.e. the ReversedType is applied
+         // to the component comparator but not to the end-of-component itself),
+         // it only depends on whether the slice is reversed
+         Bound eocBound = isReversed ? Bound.reverse(bound) : bound;
 -        ColumnNameBuilder builder = cfDef.getColumnNameBuilder();
          for (CFDefinition.Name name : cfDef.columns.values())
          {
              // In a restriction, we always have Bound.START < Bound.END for the "base"
comparator.


Mime
View raw message