cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sn...@apache.org
Subject [2/2] cassandra git commit: Merge branch 'cassandra-2.2' into trunk
Date Mon, 03 Aug 2015 19:55:15 GMT
Merge branch 'cassandra-2.2' into trunk


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

Branch: refs/heads/trunk
Commit: fcece2dc2b57ddc456af848293b9fd3cdb34710c
Parents: cc95bae 5a54d9a
Author: Robert Stupp <snazy@snazy.de>
Authored: Mon Aug 3 21:54:57 2015 +0200
Committer: Robert Stupp <snazy@snazy.de>
Committed: Mon Aug 3 21:54:57 2015 +0200

----------------------------------------------------------------------
 CHANGES.txt                                       | 18 ++++++++++++------
 .../cql3/restrictions/StatementRestrictions.java  |  5 +++++
 .../cql3/statements/SelectStatement.java          | 11 +++++++++++
 3 files changed, 28 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/fcece2dc/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 4b4f908,66e5a0c..4ad1052
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,36 -1,10 +1,42 @@@
- 3.0
 -2.2.1
++3.0.0-beta1
 + * Add transparent data encryption core classes (CASSANDRA-9945)
-  * Implement proper sandboxing for UDFs (CASSANDRA-9402, 9890)
++ * Bytecode inspection for Java-UDFs (CASSANDRA-9890)
++Merged from 2.2:
+  * Log warning when using an aggregate without partition key (CASSANDRA-9737)
++Merged from 2.1:
++ * Cannot replace token does not exist - DN node removed as Fat Client (CASSANDRA-9871)
++Merged from 2.0:
++ * Don't cast expected bf size to an int (CASSANDRA-9959)
++
++3.0.0-alpha1
++ * Implement proper sandboxing for UDFs (CASSANDRA-9402)
 + * Simplify (and unify) cleanup of compaction leftovers (CASSANDRA-7066)
 + * Allow extra schema definitions in cassandra-stress yaml (CASSANDRA-9850)
 + * Metrics should use up to date nomenclature (CASSANDRA-9448)
 + * Change CREATE/ALTER TABLE syntax for compression (CASSANDRA-8384)
 + * Cleanup crc and adler code for java 8 (CASSANDRA-9650)
 + * Storage engine refactor (CASSANDRA-8099, 9743, 9746, 9759, 9781, 9808, 9825,
 +   9848, 9705, 9859, 9867, 9874, 9828, 9801)
 + * Update Guava to 18.0 (CASSANDRA-9653)
 + * Bloom filter false positive ratio is not honoured (CASSANDRA-8413)
 + * New option for cassandra-stress to leave a ratio of columns null (CASSANDRA-9522)
 + * Change hinted_handoff_enabled yaml setting, JMX (CASSANDRA-9035)
 + * Add algorithmic token allocation (CASSANDRA-7032)
 + * Add nodetool command to replay batchlog (CASSANDRA-9547)
 + * Make file buffer cache independent of paths being read (CASSANDRA-8897)
 + * Remove deprecated legacy Hadoop code (CASSANDRA-9353)
 + * Decommissioned nodes will not rejoin the cluster (CASSANDRA-8801)
 + * Change gossip stabilization to use endpoit size (CASSANDRA-9401)
 + * Change default garbage collector to G1 (CASSANDRA-7486)
 + * Populate TokenMetadata early during startup (CASSANDRA-9317)
 + * Undeprecate cache recentHitRate (CASSANDRA-6591)
 + * Add support for selectively varint encoding fields (CASSANDRA-9499, 9865)
 + * Materialized Views (CASSANDRA-6477)
- 
- 
- 2.2.1
++Merged from 2.2:
   * Avoid grouping sstables for anticompaction with DTCS (CASSANDRA-9900)
   * UDF / UDA execution time in trace (CASSANDRA-9723)
   * Fix broken internode SSL (CASSANDRA-9884)
  Merged from 2.1:
-- * Cannot replace token does not exist - DN node removed as Fat Client (CASSANDRA-9871)
   * Fix handling of enable/disable autocompaction (CASSANDRA-9899)
   * Add consistency level to tracing ouput (CASSANDRA-9827)
   * Remove repair snapshot leftover on startup (CASSANDRA-7357)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/fcece2dc/src/java/org/apache/cassandra/cql3/restrictions/StatementRestrictions.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/fcece2dc/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
index 94f04b8,3edb7d0..9ac76d6
--- a/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
+++ b/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
@@@ -317,16 -245,30 +317,27 @@@ public class SelectStatement implement
          return msg;
      }
  
 -    private ResultMessage.Rows pageAggregateQuery(QueryPager pager, QueryOptions options,
int pageSize, long now)
 -            throws RequestValidationException, RequestExecutionException
 +    private ResultMessage.Rows pageAggregateQuery(Pager pager, QueryOptions options, int
pageSize, int nowInSec)
 +    throws RequestValidationException, RequestExecutionException
      {
+         if (!restrictions.hasPartitionKeyRestrictions())
+         {
+             logger.warn("Aggregation query used without partition key");
+             ClientWarn.warn("Aggregation query used without partition key");
+         }
+         else if (restrictions.keyIsInRelation())
+         {
+             logger.warn("Aggregation query used on multiple partition keys (IN restriction)");
+             ClientWarn.warn("Aggregation query used on multiple partition keys (IN restriction)");
+         }
+ 
 -        Selection.ResultSetBuilder result = selection.resultSetBuilder(now, parameters.isJson);
 +        Selection.ResultSetBuilder result = selection.resultSetBuilder(parameters.isJson);
          while (!pager.isExhausted())
          {
 -            for (Row row : pager.fetchPage(pageSize))
 +            try (PartitionIterator iter = pager.fetchPage(pageSize))
              {
 -                // Not columns match the query, skip
 -                if (row.cf == null)
 -                    continue;
 -
 -                processColumnFamily(row.key.getKey(), row.cf, options, now, result);
 +                while (iter.hasNext())
 +                    processPartition(iter.next(), options, result, nowInSec);
              }
          }
          return new ResultMessage.Rows(result.build(options.getProtocolVersion()));


Mime
View raw message