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/08/18 14:41:16 UTC
[1/3] cassandra git commit: Fix AggregationTest post-test error
messages
Repository: cassandra
Updated Branches:
refs/heads/trunk 234a15aae -> e214567a8
Fix AggregationTest post-test error messages
patch by Robert Stupp; reviewed by Benjamin Lerer for CASSANDRA-10056
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6d9fa375
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6d9fa375
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6d9fa375
Branch: refs/heads/trunk
Commit: 6d9fa3755daf6b21b1a7b2043730bcd9fb2643c4
Parents: d61c026
Author: Robert Stupp <sn...@snazy.de>
Authored: Tue Aug 18 14:39:29 2015 +0200
Committer: Robert Stupp <sn...@snazy.de>
Committed: Tue Aug 18 14:39:29 2015 +0200
----------------------------------------------------------------------
.../cassandra/cql3/validation/operations/AggregationTest.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/6d9fa375/test/unit/org/apache/cassandra/cql3/validation/operations/AggregationTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/cql3/validation/operations/AggregationTest.java b/test/unit/org/apache/cassandra/cql3/validation/operations/AggregationTest.java
index 6a77368..9881d73 100644
--- a/test/unit/org/apache/cassandra/cql3/validation/operations/AggregationTest.java
+++ b/test/unit/org/apache/cassandra/cql3/validation/operations/AggregationTest.java
@@ -1465,7 +1465,7 @@ public class AggregationTest extends CQLTester
execute("INSERT INTO %s (a, b) VALUES (?, {f : ?})", 3, 7);
String fState = createFunction(KEYSPACE,
- "tuple<int, int>",
+ myType + ',' + myType,
"CREATE FUNCTION %s (state " + myType + ", values " + myType + ") " +
"CALLED ON NULL INPUT " +
"RETURNS " + myType + " " +
@@ -1535,7 +1535,7 @@ public class AggregationTest extends CQLTester
"INITCOND ''");
String fRNON = createFunction(KEYSPACE,
- "text",
+ "text, text",
"CREATE FUNCTION %s(a text, b text) " +
"RETURNS NULL ON NULL INPUT " +
"RETURNS text " +
@@ -1551,7 +1551,7 @@ public class AggregationTest extends CQLTester
"AS 'return \"fin\" + a;'");
String aRNON = createAggregate(KEYSPACE,
- "int",
+ "text",
"CREATE AGGREGATE %s(text) " +
"SFUNC " + shortFunctionName(fRNON) + ' ' +
"STYPE text " +
[3/3] cassandra git commit: Merge branch 'cassandra-3.0' into trunk
Posted by sn...@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/e214567a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e214567a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e214567a
Branch: refs/heads/trunk
Commit: e214567a8f400ea3a3479e318d48c312e9d04e8e
Parents: 234a15a 310378d
Author: Robert Stupp <sn...@snazy.de>
Authored: Tue Aug 18 14:39:49 2015 +0200
Committer: Robert Stupp <sn...@snazy.de>
Committed: Tue Aug 18 14:39:49 2015 +0200
----------------------------------------------------------------------
.../cassandra/cql3/validation/operations/AggregationTest.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
[2/3] cassandra git commit: Merge branch 'cassandra-2.2' into
cassandra-3.0
Posted by sn...@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/310378d5
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/310378d5
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/310378d5
Branch: refs/heads/trunk
Commit: 310378d56785fda211166b9d7a78daea0586ca9b
Parents: 2923011 6d9fa37
Author: Robert Stupp <sn...@snazy.de>
Authored: Tue Aug 18 14:39:41 2015 +0200
Committer: Robert Stupp <sn...@snazy.de>
Committed: Tue Aug 18 14:39:41 2015 +0200
----------------------------------------------------------------------
.../cassandra/cql3/validation/operations/AggregationTest.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/310378d5/test/unit/org/apache/cassandra/cql3/validation/operations/AggregationTest.java
----------------------------------------------------------------------