cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ble...@apache.org
Subject [5/5] cassandra git commit: Merge branch cassandra-3.0 into trunk
Date Fri, 16 Oct 2015 12:53:02 GMT
Merge branch cassandra-3.0 into trunk


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

Branch: refs/heads/trunk
Commit: 737a3385ce7aea275a4c8234a4ff43d360c57a84
Parents: 6f2b855 1b93eb4
Author: blerer <benjamin.lerer@datastax.com>
Authored: Fri Oct 16 14:51:02 2015 +0200
Committer: blerer <benjamin.lerer@datastax.com>
Committed: Fri Oct 16 14:51:54 2015 +0200

----------------------------------------------------------------------
 CHANGES.txt                                     |  1 +
 .../org/apache/cassandra/cql3/ResultSet.java    |  5 ++
 .../apache/cassandra/cql3/UntypedResultSet.java |  6 +--
 .../cassandra/cql3/selection/Selection.java     | 57 +++++++++++++-------
 .../cassandra/cql3/selection/Selector.java      | 12 +++++
 .../cql3/selection/SelectorFactories.java       | 20 +++++++
 .../cql3/selection/SimpleSelector.java          |  6 +++
 .../cql3/statements/SelectStatement.java        |  2 +-
 .../cassandra/db/filter/ColumnFilter.java       |  9 +++-
 .../operations/SelectOrderByTest.java           | 52 ++++++++++++++++++
 10 files changed, 146 insertions(+), 24 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/737a3385/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index b1feeab,a53a299..eb59885
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,9 -1,5 +1,10 @@@
 +3.2
 + * Abort in-progress queries that time out (CASSANDRA-7392)
 + * Add transparent data encryption core classes (CASSANDRA-9945)
 +
 +
  3.0-rc2
+  * Support empty ColumnFilter for backward compatility on empty IN (CASSANDRA-10471)
   * Remove Pig support (CASSANDRA-10542)
   * Fix LogFile throws Exception when assertion is disabled (CASSANDRA-10522)
   * Revert CASSANDRA-7486, make CMS default GC, move GC config to

http://git-wip-us.apache.org/repos/asf/cassandra/blob/737a3385/src/java/org/apache/cassandra/cql3/UntypedResultSet.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/737a3385/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/737a3385/src/java/org/apache/cassandra/db/filter/ColumnFilter.java
----------------------------------------------------------------------


Mime
View raw message