Repository: cassandra Updated Branches: refs/heads/trunk c9a6d7ce0 -> ac3062188
ninja-fix UFTest/CQLTester Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ac306218 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ac306218 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ac306218 Branch: refs/heads/trunk Commit: ac306218848f62be71db8cea5ce90c4835c626c6 Parents: c9a6d7c Author: Robert Stupp <sn...@snazy.de> Authored: Tue Mar 17 16:24:57 2015 +0100 Committer: Robert Stupp <sn...@snazy.de> Committed: Tue Mar 17 16:24:57 2015 +0100 ---------------------------------------------------------------------- .../org/apache/cassandra/cql3/CQLTester.java | 27 ++++++++++++++++---- test/unit/org/apache/cassandra/cql3/UFTest.java | 20 +++++++-------- 2 files changed, 32 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/ac306218/test/unit/org/apache/cassandra/cql3/CQLTester.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/cql3/CQLTester.java b/test/unit/org/apache/cassandra/cql3/CQLTester.java index 831a8d7..d8914a9 100644 --- a/test/unit/org/apache/cassandra/cql3/CQLTester.java +++ b/test/unit/org/apache/cassandra/cql3/CQLTester.java @@ -75,11 +75,28 @@ public abstract class CQLTester private static org.apache.cassandra.transport.Server server; private static final int nativePort; private static final InetAddress nativeAddr; - private static final Cluster cluster[] = new Cluster[Server.CURRENT_VERSION]; - private static final Session session[] = new Session[Server.CURRENT_VERSION]; + private static final Cluster[] cluster; + private static final Session[] session; + + static int maxProtocolVersion; + static { + int version; + for (version = 1; version <= Server.CURRENT_VERSION; version++) + { + try + { + ProtocolVersion.fromInt(version); + } + catch (IllegalArgumentException e) + { + version--; + break; + } + } + maxProtocolVersion = version; + cluster = new Cluster[maxProtocolVersion]; + session = new Session[maxProtocolVersion]; - static - { // Once per-JVM is enough SchemaLoader.prepareServer(); @@ -210,7 +227,7 @@ public abstract class CQLTester server = new org.apache.cassandra.transport.Server(nativeAddr, nativePort); server.start(); - for (int version = 1; version <= Server.CURRENT_VERSION; version++) + for (int version = 1; version <= maxProtocolVersion; version++) { if (cluster[version-1] != null) continue; http://git-wip-us.apache.org/repos/asf/cassandra/blob/ac306218/test/unit/org/apache/cassandra/cql3/UFTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/cql3/UFTest.java b/test/unit/org/apache/cassandra/cql3/UFTest.java index 84a7dd9..b3cc545 100644 --- a/test/unit/org/apache/cassandra/cql3/UFTest.java +++ b/test/unit/org/apache/cassandra/cql3/UFTest.java @@ -670,7 +670,7 @@ public class UFTest extends CQLTester row(list, set, map)); // same test - but via native protocol - for (int version = Server.VERSION_2; version <= Server.CURRENT_VERSION; version++) + for (int version = Server.VERSION_2; version <= maxProtocolVersion; version++) assertRowsNet(version, executeNet(version, "SELECT " + fList + "(lst), " + fSet + "(st), " + fMap + "(mp) FROM %s WHERE key = 1"), row(list, set, map)); @@ -751,7 +751,7 @@ public class UFTest extends CQLTester Assert.assertNull(row.getBytes("t")); Assert.assertNull(row.getBytes("u")); - for (int version = Server.VERSION_2; version <= Server.CURRENT_VERSION; version++) + for (int version = Server.VERSION_2; version <= maxProtocolVersion; version++) { Row r = executeNet(version, "SELECT " + fList + "(lst) as l, " + @@ -867,7 +867,7 @@ public class UFTest extends CQLTester DataType.set(DataType.text()), DataType.map(DataType.cint(), DataType.cboolean())); TupleValue tup = tType.newValue(1d, list, set, map); - for (int version = Server.VERSION_2; version <= Server.CURRENT_VERSION; version++) + for (int version = Server.VERSION_2; version <= maxProtocolVersion; version++) { assertRowsNet(version, executeNet(version, "SELECT " + fTup0 + "(tup) FROM %s WHERE key = 1"), @@ -894,7 +894,7 @@ public class UFTest extends CQLTester createTable("CREATE TABLE %s (key int primary key, udt frozen<" + KEYSPACE + "." + type + ">)"); execute("INSERT INTO %s (key, udt) VALUES (1, {txt: 'one', i:1})"); - for (int version = Server.VERSION_2; version <= Server.CURRENT_VERSION; version++) + for (int version = Server.VERSION_2; version <= maxProtocolVersion; version++) { executeNet(version, "USE " + KEYSPACE); @@ -969,7 +969,7 @@ public class UFTest extends CQLTester assertRows(execute("SELECT " + fUdt2 + "(udt) FROM %s WHERE key = 1"), row(1)); - for (int version = Server.VERSION_2; version <= Server.CURRENT_VERSION; version++) + for (int version = Server.VERSION_2; version <= maxProtocolVersion; version++) { List<Row> rowsNet = executeNet(version, "SELECT " + fUdt0 + "(udt) FROM %s WHERE key = 1").all(); Assert.assertEquals(1, rowsNet.size()); @@ -1198,7 +1198,7 @@ public class UFTest extends CQLTester assertRows(execute("SELECT " + fName1 + "(lst), " + fName2 + "(st), " + fName3 + "(mp) FROM %s WHERE key = 1"), row("three", "one", "two")); - for (int version = Server.VERSION_2; version <= Server.CURRENT_VERSION; version++) + for (int version = Server.VERSION_2; version <= maxProtocolVersion; version++) assertRowsNet(version, executeNet(version, "SELECT " + fName1 + "(lst), " + fName2 + "(st), " + fName3 + "(mp) FROM %s WHERE key = 1"), row("three", "one", "two")); @@ -1240,7 +1240,7 @@ public class UFTest extends CQLTester assertRows(execute("SELECT " + fName1 + "(lst), " + fName2 + "(st), " + fName3 + "(mp) FROM %s WHERE key = 1"), row(list, set, map)); - for (int version = Server.VERSION_2; version <= Server.CURRENT_VERSION; version++) + for (int version = Server.VERSION_2; version <= maxProtocolVersion; version++) assertRowsNet(version, executeNet(version, "SELECT " + fName1 + "(lst), " + fName2 + "(st), " + fName3 + "(mp) FROM %s WHERE key = 1"), row(list, set, map)); @@ -1333,7 +1333,7 @@ public class UFTest extends CQLTester DataType.set(DataType.text()), DataType.map(DataType.cint(), DataType.cboolean())); TupleValue tup = tType.newValue(1d, list, set, map); - for (int version = Server.VERSION_2; version <= Server.CURRENT_VERSION; version++) + for (int version = Server.VERSION_2; version <= maxProtocolVersion; version++) { assertRowsNet(version, executeNet(version, "SELECT " + fTup1 + "(tup) FROM %s WHERE key = 1"), @@ -1437,7 +1437,7 @@ public class UFTest extends CQLTester row("three", "one", "two")); // same test - but via native protocol - for (int version = Server.VERSION_2; version <= Server.CURRENT_VERSION; version++) + for (int version = Server.VERSION_2; version <= maxProtocolVersion; version++) assertRowsNet(version, executeNet(version, cqlSelect), row("three", "one", "two")); @@ -1633,7 +1633,7 @@ public class UFTest extends CQLTester "CREATE OR REPLACE FUNCTION %s(val double) RETURNS double LANGUAGE JAVA\n" + "AS 'throw new RuntimeException()';"); - for (int version = Server.VERSION_2; version <= Server.CURRENT_VERSION; version++) + for (int version = Server.VERSION_2; version <= maxProtocolVersion; version++) { // TODO replace with appropiate code assertRowsNet(version,
