You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by sa...@apache.org on 2015/08/14 15:39:37 UTC
[2/6] cassandra git commit: Ninja fix SelectionColumnMappingTest
broken by CASSANDRA-9771
Ninja fix SelectionColumnMappingTest broken by CASSANDRA-9771
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2d8ccf07
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2d8ccf07
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2d8ccf07
Branch: refs/heads/cassandra-3.0
Commit: 2d8ccf077e0143ed2d25f244b53be54d215f7c42
Parents: ab14336
Author: Sam Tunnicliffe <sa...@beobal.com>
Authored: Fri Aug 14 14:32:27 2015 +0100
Committer: Sam Tunnicliffe <sa...@beobal.com>
Committed: Fri Aug 14 14:32:27 2015 +0100
----------------------------------------------------------------------
.../cql3/selection/SelectionColumnMappingTest.java | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2d8ccf07/test/unit/org/apache/cassandra/cql3/selection/SelectionColumnMappingTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/cql3/selection/SelectionColumnMappingTest.java b/test/unit/org/apache/cassandra/cql3/selection/SelectionColumnMappingTest.java
index 0cebb03..7aaf9c9 100644
--- a/test/unit/org/apache/cassandra/cql3/selection/SelectionColumnMappingTest.java
+++ b/test/unit/org/apache/cassandra/cql3/selection/SelectionColumnMappingTest.java
@@ -415,12 +415,12 @@ public class SelectionColumnMappingTest extends CQLTester
private void testUserDefinedAggregate() throws Throwable
{
- String sFunc = createFunction(KEYSPACE, "int",
- " CREATE FUNCTION %s (a int, b int)" +
- " RETURNS NULL ON NULL INPUT" +
- " RETURNS int" +
- " LANGUAGE javascript" +
- " AS 'a + b'");
+ String sFunc = parseFunctionName(createFunction(KEYSPACE, "int",
+ " CREATE FUNCTION %s (a int, b int)" +
+ " RETURNS NULL ON NULL INPUT" +
+ " RETURNS int" +
+ " LANGUAGE javascript" +
+ " AS 'a + b'")).name;
String aFunc = createAggregate(KEYSPACE, "int, int",
" CREATE AGGREGATE %s (int)" +