cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sn...@apache.org
Subject cassandra git commit: Fix AggregationTest post-test error messages
Date Tue, 18 Aug 2015 12:41:00 GMT
Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.2 d61c026fd -> 6d9fa3755


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/cassandra-2.2
Commit: 6d9fa3755daf6b21b1a7b2043730bcd9fb2643c4
Parents: d61c026
Author: Robert Stupp <snazy@snazy.de>
Authored: Tue Aug 18 14:39:29 2015 +0200
Committer: Robert Stupp <snazy@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 " +


Mime
View raw message