cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alek...@apache.org
Subject [2/3] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0.0
Date Sat, 17 Aug 2013 15:48:02 GMT
Merge branch 'cassandra-1.2' into cassandra-2.0.0

Conflicts:
	CHANGES.txt
	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/21771dfb
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/21771dfb
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/21771dfb

Branch: refs/heads/cassandra-2.0
Commit: 21771dfbd441afe855887b573001d9433b7f9b5c
Parents: 0ad0031 3529ac7
Author: Aleksey Yeschenko <aleksey@apache.org>
Authored: Sat Aug 17 18:47:14 2013 +0300
Committer: Aleksey Yeschenko <aleksey@apache.org>
Committed: Sat Aug 17 18:47:14 2013 +0300

----------------------------------------------------------------------
 CHANGES.txt                                     |  2 ++
 .../cql3/statements/SelectStatement.java        | 32 ++++++++------------
 2 files changed, 14 insertions(+), 20 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/21771dfb/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 8aed84e,60e5cdc..5c2b924
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,27 -1,7 +1,29 @@@
 -1.2.9
 - * migrate 1.1 schema_columnfamilies.key_alias column to key_aliases
 -   (CASSANDRA-5800)
 - * add --migrate option to sstableupgrade and sstablescrub (CASSANDRA-5831)
 +2.0.0-rc2
 + * enable vnodes by default (CASSANDRA-5869)
 + * fix CAS contention timeout (CASSANDRA-5830)
 + * fix HsHa to respect max frame size (CASSANDRA-4573)
 + * Fix (some) 2i on composite components omissions (CASSANDRA-5851)
 + * cqlsh: add DESCRIBE FULL SCHEMA variant (CASSANDRA-5880)
 +Merged from 1.2:
 + * Correctly validate sparse composite cells in scrub (CASSANDRA-5855)
 + * Add KeyCacheHitRate metric to CF metrics (CASSANDRA-5868)
 + * cqlsh: add support for multiline comments (CASSANDRA-5798)
++ * Handle CQL3 SELECT duplicate IN restrictions on clustering columns
++   (CASSANDRA-5856)
 +
 +
 +2.0.0-rc1
 + * improve DecimalSerializer performance (CASSANDRA-5837)
 + * fix potential spurious wakeup in AsyncOneResponse (CASSANDRA-5690)
 + * fix schema-related trigger issues (CASSANDRA-5774)
 + * Better validation when accessing CQL3 table from thrift (CASSANDRA-5138)
 + * Fix assertion error during repair (CASSANDRA-5801)
 + * Fix range tombstone bug (CASSANDRA-5805)
 + * DC-local CAS (CASSANDRA-5797)
 + * Add a native_protocol_version column to the system.local table (CASSANRDA-5819)
 + * Use index_interval from cassandra.yaml when upgraded (CASSANDRA-5822)
 + * Fix buffer underflow on socket close (CASSANDRA-5792)
 +Merged from 1.2:
   * fix bulk-loading compressed sstables (CASSANDRA-5820)
   * (Hadoop) fix quoting in CqlPagingRecordReader and CqlRecordWriter 
     (CASSANDRA-5824)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/21771dfb/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
index 5aced28,44a1e64..2ac94df
--- a/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
+++ b/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
@@@ -409,11 -362,7 +403,7 @@@ public class SelectStatement implement
                  slices = l.toArray(new ColumnSlice[l.size()]);
              }
  
-             SliceQueryFilter filter = new SliceQueryFilter(slices,
-                                                            isReversed,
-                                                            limit,
-                                                            toGroup);
-             return filter;
 -            return new SliceQueryFilter(slices, isReversed, getLimit(), toGroup, multiplier);
++            return new SliceQueryFilter(slices, isReversed, limit, toGroup);
          }
          else
          {


Mime
View raw message