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:36 UTC
[1/6] cassandra git commit: Ninja fix SelectionColumnMappingTest
broken by CASSANDRA-9771
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.2 ab1433600 -> 2d8ccf077
refs/heads/cassandra-3.0 3413e557b -> 8b7caa136
refs/heads/trunk 1db386e46 -> f43663aaf
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-2.2
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)" +
[3/6] cassandra git commit: Ninja fix SelectionColumnMappingTest
broken by CASSANDRA-9771
Posted by sa...@apache.org.
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/trunk
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)" +
[5/6] cassandra git commit: Merge branch 'cassandra-2.2' into
cassandra-3.0
Posted by sa...@apache.org.
Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8b7caa13
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8b7caa13
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8b7caa13
Branch: refs/heads/cassandra-3.0
Commit: 8b7caa1361897aa387cde94f19ec7b24ab7a535e
Parents: 3413e55 2d8ccf0
Author: Sam Tunnicliffe <sa...@beobal.com>
Authored: Fri Aug 14 14:35:12 2015 +0100
Committer: Sam Tunnicliffe <sa...@beobal.com>
Committed: Fri Aug 14 14:35:12 2015 +0100
----------------------------------------------------------------------
.../cql3/selection/SelectionColumnMappingTest.java | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/8b7caa13/test/unit/org/apache/cassandra/cql3/selection/SelectionColumnMappingTest.java
----------------------------------------------------------------------
[4/6] cassandra git commit: Merge branch 'cassandra-2.2' into
cassandra-3.0
Posted by sa...@apache.org.
Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8b7caa13
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8b7caa13
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8b7caa13
Branch: refs/heads/trunk
Commit: 8b7caa1361897aa387cde94f19ec7b24ab7a535e
Parents: 3413e55 2d8ccf0
Author: Sam Tunnicliffe <sa...@beobal.com>
Authored: Fri Aug 14 14:35:12 2015 +0100
Committer: Sam Tunnicliffe <sa...@beobal.com>
Committed: Fri Aug 14 14:35:12 2015 +0100
----------------------------------------------------------------------
.../cql3/selection/SelectionColumnMappingTest.java | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/8b7caa13/test/unit/org/apache/cassandra/cql3/selection/SelectionColumnMappingTest.java
----------------------------------------------------------------------
[6/6] cassandra git commit: Merge branch 'cassandra-3.0' into trunk
Posted by sa...@apache.org.
Merge branch 'cassandra-3.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f43663aa
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f43663aa
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f43663aa
Branch: refs/heads/trunk
Commit: f43663aafbdb3eaf1fb05f6936376ae0df3faf2e
Parents: 1db386e 8b7caa1
Author: Sam Tunnicliffe <sa...@beobal.com>
Authored: Fri Aug 14 14:38:41 2015 +0100
Committer: Sam Tunnicliffe <sa...@beobal.com>
Committed: Fri Aug 14 14:38:41 2015 +0100
----------------------------------------------------------------------
.../cql3/selection/SelectionColumnMappingTest.java | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
[2/6] cassandra git commit: Ninja fix SelectionColumnMappingTest
broken by CASSANDRA-9771
Posted by sa...@apache.org.
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)" +