You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by sn...@apache.org on 2015/05/15 19:37:13 UTC
[5/5] cassandra git commit: Merge branch 'cassandra-2.2' into trunk
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/081b0de6
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/081b0de6
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/081b0de6
Branch: refs/heads/trunk
Commit: 081b0de67d50404f53f89d627faef8ba11b1b34c
Parents: ccebac5 1937bed
Author: Robert Stupp <sn...@snazy.de>
Authored: Fri May 15 19:36:23 2015 +0200
Committer: Robert Stupp <sn...@snazy.de>
Committed: Fri May 15 19:36:23 2015 +0200
----------------------------------------------------------------------
CHANGES.txt | 3 +-
doc/cql3/CQL.textile | 26 +-
pylib/cqlshlib/cql3handling.py | 1 +
src/java/org/apache/cassandra/cql3/Cql.g | 9 +-
.../cql3/functions/JavaSourceUDFFactory.java | 14 +-
.../cql3/functions/NativeScalarFunction.java | 5 +
.../cql3/functions/ScalarFunction.java | 2 +
.../cql3/functions/ScriptBasedUDF.java | 5 +-
.../cassandra/cql3/functions/UDAggregate.java | 20 +-
.../cassandra/cql3/functions/UDFunction.java | 68 ++-
.../cassandra/cql3/functions/UDHelper.java | 39 +-
.../statements/CreateAggregateStatement.java | 5 +-
.../statements/CreateFunctionStatement.java | 8 +-
.../cassandra/schema/LegacySchemaTables.java | 7 +-
.../cassandra/cql3/functions/JavaSourceUDF.txt | 6 +-
.../apache/cassandra/cql3/AggregationTest.java | 196 ++++++-
.../org/apache/cassandra/cql3/JsonTest.java | 4 +-
.../org/apache/cassandra/cql3/PgStringTest.java | 4 +-
.../org/apache/cassandra/cql3/UFAuthTest.java | 6 +
.../cassandra/cql3/UFIdentificationTest.java | 1 +
test/unit/org/apache/cassandra/cql3/UFTest.java | 527 ++++++++++++++++---
21 files changed, 821 insertions(+), 135 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/081b0de6/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index d670571,c5c505a..c08d322
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,5 -1,6 +1,6 @@@
-2.2.0-beta1
+2.2
- * Use ecj instead of javassist for UDFs
+ * Better support of null for UDF (CASSANDRA-8374)
+ * Use ecj instead of javassist for UDFs (CASSANDRA-8241)
* faster async logback configuration for tests (CASSANDRA-9376)
* Add `smallint` and `tinyint` data types (CASSANDRA-8951)
* Avoid thrift schema creation when native driver is used in stress tool (CASSANDRA-9374)