cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sn...@apache.org
Subject [3/3] cassandra git commit: Merge branch 'cassandra-2.2' into trunk
Date Sat, 18 Jul 2015 16:06:47 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/030762aa
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/030762aa
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/030762aa

Branch: refs/heads/trunk
Commit: 030762aa29442f437988e8dd9828db0f164b9788
Parents: 2eda224 e651fdd
Author: Robert Stupp <snazy@snazy.de>
Authored: Sat Jul 18 17:54:00 2015 +0200
Committer: Robert Stupp <snazy@snazy.de>
Committed: Sat Jul 18 17:54:00 2015 +0200

----------------------------------------------------------------------
 CHANGES.txt                                          |  6 +++++-
 doc/cql3/CQL.textile                                 |  6 +++---
 .../apache/cassandra/cql3/functions/UDAggregate.java | 15 ++++++++++++++-
 .../apache/cassandra/cql3/functions/UDFunction.java  |  7 ++++++-
 4 files changed, 28 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/030762aa/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index e3eb5ff,bd70d19..1f33e6c
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,25 -1,7 +1,29 @@@
 +3.0
 + * 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)
 + * 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)
 +
 +
- 2.2.0-rc3
+ 2.2.1
+  * UDF / UDA execution time in trace (CASSANDRA-9723)
+ 
++
+ 2.2.0
   * Fix cqlsh copy methods and other windows specific issues (CASSANDRA-9795) 
   * Don't wrap byte arrays in SequentialWriter (CASSANDRA-9797)
   * sum() and avg() functions missing for smallint and tinyint types (CASSANDRA-9671)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/030762aa/doc/cql3/CQL.textile
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/030762aa/src/java/org/apache/cassandra/cql3/functions/UDAggregate.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/cql3/functions/UDAggregate.java
index 36aa3e3,5f4d107..c644191
--- a/src/java/org/apache/cassandra/cql3/functions/UDAggregate.java
+++ b/src/java/org/apache/cassandra/cql3/functions/UDAggregate.java
@@@ -25,10 -25,9 +25,11 @@@ import com.google.common.collect.Immuta
  import org.slf4j.Logger;
  import org.slf4j.LoggerFactory;
  
 +import org.apache.cassandra.config.Schema;
  import org.apache.cassandra.db.marshal.AbstractType;
  import org.apache.cassandra.exceptions.InvalidRequestException;
 +import org.apache.cassandra.schema.Functions;
+ import org.apache.cassandra.tracing.Tracing;
  
  /**
   * Base class for user-defined-aggregates.

http://git-wip-us.apache.org/repos/asf/cassandra/blob/030762aa/src/java/org/apache/cassandra/cql3/functions/UDFunction.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/cql3/functions/UDFunction.java
index a58ca3b,1e5cea6..bece106
--- a/src/java/org/apache/cassandra/cql3/functions/UDFunction.java
+++ b/src/java/org/apache/cassandra/cql3/functions/UDFunction.java
@@@ -32,9 -33,8 +32,10 @@@ import org.apache.cassandra.config.Sche
  import org.apache.cassandra.cql3.*;
  import org.apache.cassandra.db.marshal.AbstractType;
  import org.apache.cassandra.exceptions.*;
 +import org.apache.cassandra.schema.Functions;
 +import org.apache.cassandra.schema.KeyspaceMetadata;
  import org.apache.cassandra.service.MigrationManager;
+ import org.apache.cassandra.tracing.Tracing;
  import org.apache.cassandra.utils.ByteBufferUtil;
  
  /**


Mime
View raw message