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 2016/03/23 14:49:08 UTC
cassandra git commit: Add auto import java.util for UDF code block
Repository: cassandra
Updated Branches:
refs/heads/trunk df1ff74e2 -> 03b42a299
Add auto import java.util for UDF code block
patch by DOAN DuyHai; reviewed by Robert Stupp for CASSANDRA-11392
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/03b42a29
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/03b42a29
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/03b42a29
Branch: refs/heads/trunk
Commit: 03b42a299b878264479068a3fae03aa2ca28d6b7
Parents: df1ff74
Author: DOAN DuyHai <do...@gmail.com>
Authored: Wed Mar 23 14:48:26 2016 +0100
Committer: Robert Stupp <sn...@snazy.de>
Committed: Wed Mar 23 14:48:26 2016 +0100
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../cassandra/cql3/functions/JavaSourceUDF.txt | 2 +-
.../cql3/validation/entities/UFTest.java | 20 ++++++++++++++++++++
3 files changed, 22 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/03b42a29/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 9051909..9ca76a7 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
3.6
+ * Add auto import java.util for UDF code block (CASSANDRA-11392)
* Add --hex-format option to nodetool getsstables (CASSANDRA-11337)
* sstablemetadata should print sstable min/max token (CASSANDRA-7159)
* Do not wrap CassandraException in TriggerExecutor (CASSANDRA-9421)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/03b42a29/src/resources/org/apache/cassandra/cql3/functions/JavaSourceUDF.txt
----------------------------------------------------------------------
diff --git a/src/resources/org/apache/cassandra/cql3/functions/JavaSourceUDF.txt b/src/resources/org/apache/cassandra/cql3/functions/JavaSourceUDF.txt
index 4bd3601..f0e9317 100644
--- a/src/resources/org/apache/cassandra/cql3/functions/JavaSourceUDF.txt
+++ b/src/resources/org/apache/cassandra/cql3/functions/JavaSourceUDF.txt
@@ -1,7 +1,7 @@
package #package_name#;
import java.nio.ByteBuffer;
-import java.util.List;
+import java.util.*;
import org.apache.cassandra.cql3.functions.JavaUDF;
http://git-wip-us.apache.org/repos/asf/cassandra/blob/03b42a29/test/unit/org/apache/cassandra/cql3/validation/entities/UFTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/cql3/validation/entities/UFTest.java b/test/unit/org/apache/cassandra/cql3/validation/entities/UFTest.java
index f482d54..90dedd4 100644
--- a/test/unit/org/apache/cassandra/cql3/validation/entities/UFTest.java
+++ b/test/unit/org/apache/cassandra/cql3/validation/entities/UFTest.java
@@ -2529,4 +2529,24 @@ public class UFTest extends CQLTester
"$$");
}
+
+ @Test
+ public void testImportJavaUtil() throws Throwable
+ {
+ createTable("CREATE TABLE %s (key int primary key, sval text)");
+
+ String f = createFunction(KEYSPACE, "text",
+ "CREATE OR REPLACE FUNCTION %s(listText list<text>) " +
+ "CALLED ON NULL INPUT " +
+ "RETURNS set<text> " +
+ "LANGUAGE JAVA\n" +
+ "AS $$\n" +
+ " Set<String> set = new HashSet<String>(); " +
+ " for (String s : listtext) {" +
+ " set.add(s);" +
+ " }" +
+ " return set;" +
+ "$$");
+
+ }
}