Repository: phoenix Updated Branches: refs/heads/master 27722998c -> 850b02c6d
PHOENIX-3250 Remove static member variables to enable method-level parallelization Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/850b02c6 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/850b02c6 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/850b02c6 Branch: refs/heads/master Commit: 850b02c6d7798a7ed466af3de4256da3aaa1616e Parents: 2772299 Author: James Taylor <jamestay...@apache.org> Authored: Tue Sep 13 23:48:34 2016 -0700 Committer: James Taylor <jamestay...@apache.org> Committed: Tue Sep 13 23:48:34 2016 -0700 ---------------------------------------------------------------------- .../end2end/ArrayToStringFunctionIT.java | 78 ++++++++++---------- .../apache/phoenix/end2end/PrimitiveTypeIT.java | 60 ++++++++++----- .../phoenix/end2end/RegexpSplitFunctionIT.java | 52 ++++++------- .../apache/phoenix/end2end/StoreNullsIT.java | 56 +++++++------- .../phoenix/end2end/ToCharFunctionIT.java | 11 +-- 5 files changed, 135 insertions(+), 122 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/phoenix/blob/850b02c6/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArrayToStringFunctionIT.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArrayToStringFunctionIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArrayToStringFunctionIT.java index 0439033..86ff7b6 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArrayToStringFunctionIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArrayToStringFunctionIT.java @@ -21,22 +21,26 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; -import java.sql.*; +import java.sql.Connection; +import java.sql.DriverManager; +import java.sql.PreparedStatement; +import java.sql.ResultSet; -import org.junit.BeforeClass; +import org.junit.Before; import org.junit.Test; public class ArrayToStringFunctionIT extends BaseHBaseManagedTimeTableReuseIT { - private static final String REGIONS = generateRandomString(); - private static Connection conn = null; + private String tableName; + private Connection conn; - @BeforeClass - public static void initTables() throws Exception { + @Before + public void initTables() throws Exception { conn = DriverManager.getConnection(getUrl()); - String ddl = "CREATE TABLE " + REGIONS + tableName = generateRandomString(); + String ddl = "CREATE TABLE " + tableName + " (region_name VARCHAR PRIMARY KEY,varchars VARCHAR[],integers INTEGER[],doubles DOUBLE[],bigints BIGINT[],chars CHAR(15)[],double1 DOUBLE,varchar1 VARCHAR,nullcheck INTEGER,chars2 CHAR(15)[])"; conn.createStatement().execute(ddl); - String dml = "UPSERT INTO " + REGIONS + String dml = "UPSERT INTO " + tableName + "(region_name,varchars,integers,doubles,bigints,chars,double1,varchar1,nullcheck,chars2) VALUES('SF Bay Area'," + "ARRAY['2345','46345','23234']," + @@ -58,7 +62,7 @@ public class ArrayToStringFunctionIT extends BaseHBaseManagedTimeTableReuseIT { public void testArrayToStringFunctionVarchar1() throws Exception { ResultSet rs; rs = conn.createStatement().executeQuery( - "SELECT ARRAY_TO_STRING(varchars, ',','*') FROM " + REGIONS + "SELECT ARRAY_TO_STRING(varchars, ',','*') FROM " + tableName + " WHERE region_name = 'SF Bay Area'"); assertTrue(rs.next()); @@ -72,7 +76,7 @@ public class ArrayToStringFunctionIT extends BaseHBaseManagedTimeTableReuseIT { public void testArrayToStringFunctionVarchar2() throws Exception { ResultSet rs; rs = conn.createStatement().executeQuery( - "SELECT ARRAY_TO_STRING(varchars, ',') FROM " + REGIONS + "SELECT ARRAY_TO_STRING(varchars, ',') FROM " + tableName + " WHERE region_name = 'SF Bay Area'"); assertTrue(rs.next()); @@ -86,7 +90,7 @@ public class ArrayToStringFunctionIT extends BaseHBaseManagedTimeTableReuseIT { public void testArrayToStringFunctionVarchar3() throws Exception { ResultSet rs; rs = conn.createStatement().executeQuery( - "SELECT ARRAY_TO_STRING(ARRAY['hello', 'hello'], ',') FROM " + REGIONS + "SELECT ARRAY_TO_STRING(ARRAY['hello', 'hello'], ',') FROM " + tableName + " WHERE region_name = 'SF Bay Area'"); assertTrue(rs.next()); @@ -100,7 +104,7 @@ public class ArrayToStringFunctionIT extends BaseHBaseManagedTimeTableReuseIT { public void testArrayToStringFunctionInt() throws Exception { ResultSet rs; rs = conn.createStatement().executeQuery( - "SELECT ARRAY_TO_STRING(integers, ',') FROM " + REGIONS + "SELECT ARRAY_TO_STRING(integers, ',') FROM " + tableName + " WHERE region_name = 'SF Bay Area'"); assertTrue(rs.next()); @@ -114,7 +118,7 @@ public class ArrayToStringFunctionIT extends BaseHBaseManagedTimeTableReuseIT { public void testArrayToStringFunctionDouble1() throws Exception { ResultSet rs; rs = conn.createStatement().executeQuery( - "SELECT ARRAY_TO_STRING(doubles, ', ') FROM " + REGIONS + "SELECT ARRAY_TO_STRING(doubles, ', ') FROM " + tableName + " WHERE region_name = 'SF Bay Area'"); assertTrue(rs.next()); @@ -128,7 +132,7 @@ public class ArrayToStringFunctionIT extends BaseHBaseManagedTimeTableReuseIT { public void testArrayToStringFunctionDouble2() throws Exception { ResultSet rs; rs = conn.createStatement().executeQuery( - "SELECT ARRAY_TO_STRING(ARRAY[2.3, 4.5], ', ') FROM " + REGIONS + "SELECT ARRAY_TO_STRING(ARRAY[2.3, 4.5], ', ') FROM " + tableName + " WHERE region_name = 'SF Bay Area'"); assertTrue(rs.next()); @@ -142,7 +146,7 @@ public class ArrayToStringFunctionIT extends BaseHBaseManagedTimeTableReuseIT { public void testArrayToStringFunctionBigint() throws Exception { ResultSet rs; rs = conn.createStatement().executeQuery( - "SELECT ARRAY_TO_STRING(bigints, ', ') FROM " + REGIONS + "SELECT ARRAY_TO_STRING(bigints, ', ') FROM " + tableName + " WHERE region_name = 'SF Bay Area'"); assertTrue(rs.next()); @@ -156,7 +160,7 @@ public class ArrayToStringFunctionIT extends BaseHBaseManagedTimeTableReuseIT { public void testArrayToStringFunctionChar1() throws Exception { ResultSet rs; rs = conn.createStatement().executeQuery( - "SELECT ARRAY_TO_STRING(chars, ', ') FROM " + REGIONS + "SELECT ARRAY_TO_STRING(chars, ', ') FROM " + tableName + " WHERE region_name = 'SF Bay Area'"); assertTrue(rs.next()); @@ -170,7 +174,7 @@ public class ArrayToStringFunctionIT extends BaseHBaseManagedTimeTableReuseIT { public void testArrayToStringFunctionChar2() throws Exception { ResultSet rs; rs = conn.createStatement().executeQuery( - "SELECT ARRAY_TO_STRING(chars2, ', ') FROM " + REGIONS + "SELECT ARRAY_TO_STRING(chars2, ', ') FROM " + tableName + " WHERE region_name = 'SF Bay Area'"); assertTrue(rs.next()); @@ -184,7 +188,7 @@ public class ArrayToStringFunctionIT extends BaseHBaseManagedTimeTableReuseIT { public void testArrayToStringFunctionChar3() throws Exception { ResultSet rs; rs = conn.createStatement().executeQuery( - "SELECT ARRAY_TO_STRING(chars2, varchar1) FROM " + REGIONS + "SELECT ARRAY_TO_STRING(chars2, varchar1) FROM " + tableName + " WHERE region_name = 'SF Bay Area'"); assertTrue(rs.next()); @@ -198,7 +202,7 @@ public class ArrayToStringFunctionIT extends BaseHBaseManagedTimeTableReuseIT { public void testArrayToStringFunctionWithNestedFunctions1() throws Exception { ResultSet rs; rs = conn.createStatement().executeQuery( - "SELECT ARRAY_TO_STRING(ARRAY[integers[1],integers[1]], ', ') FROM " + REGIONS + "SELECT ARRAY_TO_STRING(ARRAY[integers[1],integers[1]], ', ') FROM " + tableName + " WHERE region_name = 'SF Bay Area'"); assertTrue(rs.next()); @@ -213,7 +217,7 @@ public class ArrayToStringFunctionIT extends BaseHBaseManagedTimeTableReuseIT { ResultSet rs; rs = conn.createStatement().executeQuery( "SELECT ARRAY_TO_STRING(ARRAY[ARRAY_ELEM(ARRAY[2,4],1),ARRAY_ELEM(ARRAY[2,4],2)], ', ') FROM " - + REGIONS + " WHERE region_name = 'SF Bay Area'"); + + tableName + " WHERE region_name = 'SF Bay Area'"); assertTrue(rs.next()); String expected = "2, 4"; @@ -227,7 +231,7 @@ public class ArrayToStringFunctionIT extends BaseHBaseManagedTimeTableReuseIT { ResultSet rs; rs = conn.createStatement().executeQuery( "SELECT ARRAY_TO_STRING(ARRAY[ARRAY_ELEM(doubles, 1), ARRAY_ELEM(doubles, 1)], ', ') FROM " - + REGIONS + " WHERE region_name = 'SF Bay Area'"); + + tableName + " WHERE region_name = 'SF Bay Area'"); assertTrue(rs.next()); String expected = "23.45, 23.45"; @@ -241,7 +245,7 @@ public class ArrayToStringFunctionIT extends BaseHBaseManagedTimeTableReuseIT { ResultSet rs; rs = conn.createStatement().executeQuery( "SELECT ARRAY_ELEM(ARRAY_APPEND(ARRAY['abc','bcd'], ARRAY_TO_STRING(ARRAY['a','b'], 'c')), 3) FROM " - + REGIONS + " WHERE region_name = 'SF Bay Area'"); + + tableName + " WHERE region_name = 'SF Bay Area'"); assertTrue(rs.next()); String expected = "acb"; @@ -465,7 +469,7 @@ public class ArrayToStringFunctionIT extends BaseHBaseManagedTimeTableReuseIT { @Test public void testArrayToStringFunctionInWhere1() throws Exception { ResultSet rs; - rs = conn.createStatement().executeQuery("SELECT region_name FROM " + REGIONS + rs = conn.createStatement().executeQuery("SELECT region_name FROM " + tableName + " WHERE '2345,46345,23234,456' = ARRAY_TO_STRING(integers,',')"); assertTrue(rs.next()); @@ -476,7 +480,7 @@ public class ArrayToStringFunctionIT extends BaseHBaseManagedTimeTableReuseIT { @Test public void testArrayToStringFunctionInWhere2() throws Exception { ResultSet rs; - rs = conn.createStatement().executeQuery("SELECT region_name FROM " + REGIONS + rs = conn.createStatement().executeQuery("SELECT region_name FROM " + tableName + " WHERE 'a,b,c' = ARRAY_TO_STRING(ARRAY['a', 'b', 'c'], ',')"); assertTrue(rs.next()); @@ -487,7 +491,7 @@ public class ArrayToStringFunctionIT extends BaseHBaseManagedTimeTableReuseIT { @Test public void testArrayToStringFunctionInWhere3() throws Exception { ResultSet rs; - rs = conn.createStatement().executeQuery("SELECT region_name FROM " + REGIONS + rs = conn.createStatement().executeQuery("SELECT region_name FROM " + tableName + " WHERE '1.1,2.2,3.3' = ARRAY_TO_STRING(ARRAY[1.1, 2.2, 3.3], ',')"); assertTrue(rs.next()); @@ -498,7 +502,7 @@ public class ArrayToStringFunctionIT extends BaseHBaseManagedTimeTableReuseIT { @Test public void testArrayToStringFunctionInWhere4() throws Exception { ResultSet rs; - rs = conn.createStatement().executeQuery("SELECT region_name FROM " + REGIONS + rs = conn.createStatement().executeQuery("SELECT region_name FROM " + tableName + " WHERE 'true,true,true' = ARRAY_TO_STRING(ARRAY[true, true, true], ',')"); assertTrue(rs.next()); @@ -510,7 +514,7 @@ public class ArrayToStringFunctionIT extends BaseHBaseManagedTimeTableReuseIT { public void testArrayToStringFunctionInWhere5() throws Exception { ResultSet rs; - rs = conn.createStatement().executeQuery("SELECT region_name FROM " + REGIONS + rs = conn.createStatement().executeQuery("SELECT region_name FROM " + tableName + " WHERE 'a, bbbb, c, ddd, e' = ARRAY_TO_STRING(ARRAY['a', 'bbbb', 'c' , 'ddd', 'e'], ', ')"); assertTrue(rs.next()); @@ -521,7 +525,7 @@ public class ArrayToStringFunctionIT extends BaseHBaseManagedTimeTableReuseIT { @Test public void testArrayToStringFunctionInWhere6() throws Exception { ResultSet rs; - rs = conn.createStatement().executeQuery("SELECT region_name FROM " + REGIONS + rs = conn.createStatement().executeQuery("SELECT region_name FROM " + tableName + " WHERE ARRAY_TO_STRING(ARRAY[1,2,3], varchar1) = '1, 2, 3'"); assertTrue(rs.next()); @@ -532,7 +536,7 @@ public class ArrayToStringFunctionIT extends BaseHBaseManagedTimeTableReuseIT { @Test public void testArrayToStringFunctionInWhere7() throws Exception { ResultSet rs; - rs = conn.createStatement().executeQuery("SELECT region_name FROM " + REGIONS + rs = conn.createStatement().executeQuery("SELECT region_name FROM " + tableName + " WHERE ARRAY_TO_STRING(varchars, varchar1) = '2345, 46345, 23234'"); assertTrue(rs.next()); @@ -544,7 +548,7 @@ public class ArrayToStringFunctionIT extends BaseHBaseManagedTimeTableReuseIT { public void testArrayToStringFunctionWithNulls1() throws Exception { ResultSet rs; rs = conn.createStatement().executeQuery( - "SELECT ARRAY_TO_STRING(ARRAY['a', NULL, 'b'], ', ','*') FROM " + REGIONS + "SELECT ARRAY_TO_STRING(ARRAY['a', NULL, 'b'], ', ','*') FROM " + tableName + " WHERE region_name = 'SF Bay Area'"); assertTrue(rs.next()); @@ -558,7 +562,7 @@ public class ArrayToStringFunctionIT extends BaseHBaseManagedTimeTableReuseIT { public void testArrayToStringFunctionWithNulls2() throws Exception { ResultSet rs; rs = conn.createStatement().executeQuery( - "SELECT ARRAY_TO_STRING(ARRAY['a', NULL, 'b'], ', ') FROM " + REGIONS + "SELECT ARRAY_TO_STRING(ARRAY['a', NULL, 'b'], ', ') FROM " + tableName + " WHERE region_name = 'SF Bay Area'"); assertTrue(rs.next()); @@ -572,7 +576,7 @@ public class ArrayToStringFunctionIT extends BaseHBaseManagedTimeTableReuseIT { public void testArrayToStringFunctionWithNulls3() throws Exception { ResultSet rs; rs = conn.createStatement().executeQuery( - "SELECT ARRAY_TO_STRING(ARRAY[NULL, 'a', 'b'], ', ', '*') FROM " + REGIONS + "SELECT ARRAY_TO_STRING(ARRAY[NULL, 'a', 'b'], ', ', '*') FROM " + tableName + " WHERE region_name = 'SF Bay Area'"); assertTrue(rs.next()); @@ -586,7 +590,7 @@ public class ArrayToStringFunctionIT extends BaseHBaseManagedTimeTableReuseIT { public void testArrayToStringFunctionWithNulls4() throws Exception { ResultSet rs; rs = conn.createStatement().executeQuery( - "SELECT ARRAY_TO_STRING(ARRAY[NULL, 'a', 'b'], ', ') FROM " + REGIONS + "SELECT ARRAY_TO_STRING(ARRAY[NULL, 'a', 'b'], ', ') FROM " + tableName + " WHERE region_name = 'SF Bay Area'"); assertTrue(rs.next()); @@ -600,7 +604,7 @@ public class ArrayToStringFunctionIT extends BaseHBaseManagedTimeTableReuseIT { public void testArrayToStringFunctionWithNulls5() throws Exception { ResultSet rs; rs = conn.createStatement().executeQuery( - "SELECT ARRAY_TO_STRING(ARRAY['a', 'b', NULL], ', ', '*') FROM " + REGIONS + "SELECT ARRAY_TO_STRING(ARRAY['a', 'b', NULL], ', ', '*') FROM " + tableName + " WHERE region_name = 'SF Bay Area'"); assertTrue(rs.next()); @@ -614,7 +618,7 @@ public class ArrayToStringFunctionIT extends BaseHBaseManagedTimeTableReuseIT { public void testArrayToStringFunctionWithNulls6() throws Exception { ResultSet rs; rs = conn.createStatement().executeQuery( - "SELECT ARRAY_TO_STRING(ARRAY['a', 'b', NULL], ', ') FROM " + REGIONS + "SELECT ARRAY_TO_STRING(ARRAY['a', 'b', NULL], ', ') FROM " + tableName + " WHERE region_name = 'SF Bay Area'"); assertTrue(rs.next()); @@ -629,7 +633,7 @@ public class ArrayToStringFunctionIT extends BaseHBaseManagedTimeTableReuseIT { ResultSet rs; rs = conn.createStatement().executeQuery( "SELECT ARRAY_TO_STRING(ARRAY[NULL, NULL, 'a', 'b', NULL, 'c', 'd', NULL, 'e', NULL, NULL], ', ', '*') FROM " - + REGIONS + " WHERE region_name = 'SF Bay Area'"); + + tableName + " WHERE region_name = 'SF Bay Area'"); assertTrue(rs.next()); String expected = "*, *, a, b, *, c, d, *, e, *, *"; @@ -643,7 +647,7 @@ public class ArrayToStringFunctionIT extends BaseHBaseManagedTimeTableReuseIT { ResultSet rs; rs = conn.createStatement().executeQuery( "SELECT ARRAY_TO_STRING(ARRAY[NULL, NULL, 'a', 'b', NULL, 'c', 'd', NULL, 'e', NULL, NULL], ', ') FROM " - + REGIONS + " WHERE region_name = 'SF Bay Area'"); + + tableName + " WHERE region_name = 'SF Bay Area'"); assertTrue(rs.next()); String expected = "a, b, c, d, e"; http://git-wip-us.apache.org/repos/asf/phoenix/blob/850b02c6/phoenix-core/src/it/java/org/apache/phoenix/end2end/PrimitiveTypeIT.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/PrimitiveTypeIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/PrimitiveTypeIT.java index b78d144..5891a62 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/PrimitiveTypeIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/PrimitiveTypeIT.java @@ -29,23 +29,18 @@ import java.util.Properties; import org.apache.phoenix.util.PropertiesUtil; import org.apache.phoenix.util.TestUtil; -import org.junit.BeforeClass; import org.junit.Test; public class PrimitiveTypeIT extends BaseHBaseManagedTimeTableReuseIT { - private static final String TABLE_NAME = generateRandomString(); private static final Properties PROPS = PropertiesUtil.deepCopy(TestUtil.TEST_PROPERTIES); - private static Connection conn; - @BeforeClass - public static void initTableValues() throws Exception { - conn = DriverManager.getConnection(getUrl(), PROPS); + public static void initTableValues(Connection conn, String tableName) throws Exception { conn.createStatement().execute( - "create table " + TABLE_NAME + " (l bigint not null primary key, b boolean)"); + "create table " + tableName + " (l bigint not null primary key, b boolean)"); PreparedStatement stmt = conn.prepareStatement( - "upsert into " + TABLE_NAME + " VALUES(?)"); + "upsert into " + tableName + " VALUES(?)"); stmt.setLong(1, 2); stmt.execute(); conn.commit(); @@ -53,7 +48,10 @@ public class PrimitiveTypeIT extends BaseHBaseManagedTimeTableReuseIT { @Test public void testCompareLongGTDecimal() throws Exception { - String query = "SELECT l FROM " + TABLE_NAME + " where l > 1.5"; + String tableName = generateRandomString(); + Connection conn = DriverManager.getConnection(getUrl(), PROPS); + initTableValues(conn, tableName); + String query = "SELECT l FROM " + tableName + " where l > 1.5"; try { PreparedStatement statement = conn.prepareStatement(query); ResultSet rs = statement.executeQuery(); @@ -67,7 +65,10 @@ public class PrimitiveTypeIT extends BaseHBaseManagedTimeTableReuseIT { @Test public void testCompareLongGTEDecimal() throws Exception { - String query = "SELECT l FROM " + TABLE_NAME + " where l >= 1.5"; + String tableName = generateRandomString(); + Connection conn = DriverManager.getConnection(getUrl(), PROPS); + initTableValues(conn, tableName); + String query = "SELECT l FROM " + tableName + " where l >= 1.5"; try { PreparedStatement statement = conn.prepareStatement(query); ResultSet rs = statement.executeQuery(); @@ -88,7 +89,10 @@ public class PrimitiveTypeIT extends BaseHBaseManagedTimeTableReuseIT { @Test public void testCompareLongLTDecimal() throws Exception { - String query = "SELECT l FROM " + TABLE_NAME + " where l < 1.5"; + String tableName = generateRandomString(); + Connection conn = DriverManager.getConnection(getUrl(), PROPS); + initTableValues(conn, tableName); + String query = "SELECT l FROM " + tableName + " where l < 1.5"; try { PreparedStatement statement = conn.prepareStatement(query); ResultSet rs = statement.executeQuery(); @@ -107,7 +111,10 @@ public class PrimitiveTypeIT extends BaseHBaseManagedTimeTableReuseIT { @Test public void testCompareLongLTEDecimal() throws Exception { - String query = "SELECT l FROM " + TABLE_NAME + " where l <= 1.5"; + String tableName = generateRandomString(); + Connection conn = DriverManager.getConnection(getUrl(), PROPS); + initTableValues(conn, tableName); + String query = "SELECT l FROM " + tableName + " where l <= 1.5"; try { PreparedStatement statement = conn.prepareStatement(query); ResultSet rs = statement.executeQuery(); @@ -125,7 +132,10 @@ public class PrimitiveTypeIT extends BaseHBaseManagedTimeTableReuseIT { } @Test public void testCompareLongGTDecimal2() throws Exception { - String query = "SELECT l FROM " + TABLE_NAME + " where l > 2.5"; + String tableName = generateRandomString(); + Connection conn = DriverManager.getConnection(getUrl(), PROPS); + initTableValues(conn, tableName); + String query = "SELECT l FROM " + tableName + " where l > 2.5"; try { PreparedStatement statement = conn.prepareStatement(query); ResultSet rs = statement.executeQuery(); @@ -144,7 +154,10 @@ public class PrimitiveTypeIT extends BaseHBaseManagedTimeTableReuseIT { @Test public void testCompareLongGTEDecimal2() throws Exception { - String query = "SELECT l FROM " + TABLE_NAME + " where l >= 2.5"; + String tableName = generateRandomString(); + Connection conn = DriverManager.getConnection(getUrl(), PROPS); + initTableValues(conn, tableName); + String query = "SELECT l FROM " + tableName + " where l >= 2.5"; try { PreparedStatement statement = conn.prepareStatement(query); ResultSet rs = statement.executeQuery(); @@ -163,7 +176,10 @@ public class PrimitiveTypeIT extends BaseHBaseManagedTimeTableReuseIT { @Test public void testCompareLongLTDecimal2() throws Exception { - String query = "SELECT l FROM " + TABLE_NAME + " where l < 2.5"; + String tableName = generateRandomString(); + Connection conn = DriverManager.getConnection(getUrl(), PROPS); + initTableValues(conn, tableName); + String query = "SELECT l FROM " + tableName + " where l < 2.5"; try { PreparedStatement statement = conn.prepareStatement(query); ResultSet rs = statement.executeQuery(); @@ -184,9 +200,10 @@ public class PrimitiveTypeIT extends BaseHBaseManagedTimeTableReuseIT { @Test public void testCompareLongLTEDecimal2() throws Exception { - Properties props = PropertiesUtil.deepCopy(TestUtil.TEST_PROPERTIES); - Connection conn = DriverManager.getConnection(getUrl(), props); - String query = "SELECT l FROM " + TABLE_NAME + " where l <= 2.5"; + String tableName = generateRandomString(); + Connection conn = DriverManager.getConnection(getUrl(), PROPS); + initTableValues(conn, tableName); + String query = "SELECT l FROM " + tableName + " where l <= 2.5"; try { PreparedStatement statement = conn.prepareStatement(query); ResultSet rs = statement.executeQuery(); @@ -207,13 +224,16 @@ public class PrimitiveTypeIT extends BaseHBaseManagedTimeTableReuseIT { @Test public void testBooleanAsObject() throws Exception { - String query = "upsert into " + TABLE_NAME + " values (2, ?)"; + String tableName = generateRandomString(); + Connection conn = DriverManager.getConnection(getUrl(), PROPS); + initTableValues(conn, tableName); + String query = "upsert into " + tableName + " values (2, ?)"; try { PreparedStatement statement = conn.prepareStatement(query); statement.setObject(1, new Boolean("false")); statement.execute(); conn.commit(); - statement = conn.prepareStatement("SELECT l,b,? FROM " + TABLE_NAME); + statement = conn.prepareStatement("SELECT l,b,? FROM " + tableName); statement.setObject(1, new Boolean("false")); ResultSet rs = statement.executeQuery(); assertTrue(rs.next()); http://git-wip-us.apache.org/repos/asf/phoenix/blob/850b02c6/phoenix-core/src/it/java/org/apache/phoenix/end2end/RegexpSplitFunctionIT.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/RegexpSplitFunctionIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/RegexpSplitFunctionIT.java index 6df4829..806d589 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/RegexpSplitFunctionIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/RegexpSplitFunctionIT.java @@ -31,32 +31,26 @@ import java.sql.ResultSet; import java.sql.SQLException; import java.sql.Types; -import org.junit.Before; -import org.junit.BeforeClass; import org.junit.Test; public class RegexpSplitFunctionIT extends BaseHBaseManagedTimeTableReuseIT { - private static final String SPLIT_TEST = generateRandomString(); - - @BeforeClass - public static void setup() throws Exception { - Connection conn = DriverManager.getConnection(getUrl()); - String ddl = "CREATE TABLE " + SPLIT_TEST + " (" + - "ID INTEGER NOT NULL PRIMARY KEY," + - "VAL VARCHAR," + - "SEP VARCHAR," + - "ARR VARCHAR ARRAY)"; - conn.createStatement().execute(ddl); - } + private String tableName; private void initTable(Connection conn, String val) throws SQLException { initTable(conn, val, ","); } private void initTable(Connection conn, String val, String separator) throws SQLException { - String dml = "UPSERT INTO " + SPLIT_TEST + " (ID, SEP, VAL) VALUES (?, ?, ?)"; + tableName = generateRandomString(); + String ddl = "CREATE TABLE " + tableName + " (" + + "ID INTEGER NOT NULL PRIMARY KEY," + + "VAL VARCHAR," + + "SEP VARCHAR," + + "ARR VARCHAR ARRAY)"; + conn.createStatement().execute(ddl); + String dml = "UPSERT INTO " + tableName + " (ID, SEP, VAL) VALUES (?, ?, ?)"; PreparedStatement stmt = conn.prepareStatement(dml); stmt.setInt(1, 1); if (separator == null) { @@ -79,7 +73,7 @@ public class RegexpSplitFunctionIT extends BaseHBaseManagedTimeTableReuseIT { initTable(conn, "ONE,TWO,THREE"); ResultSet rs = conn.createStatement().executeQuery( - "SELECT REGEXP_SPLIT(VAL, ',')[1] FROM " + SPLIT_TEST); + "SELECT REGEXP_SPLIT(VAL, ',')[1] FROM " + tableName); assertTrue(rs.next()); assertEquals("ONE", rs.getString(1)); assertFalse(rs.next()); @@ -96,7 +90,7 @@ public class RegexpSplitFunctionIT extends BaseHBaseManagedTimeTableReuseIT { initTable(conn, val); ResultSet rs = conn.createStatement().executeQuery( - "SELECT array_length(REGEXP_SPLIT(VAL, ',')) FROM " + SPLIT_TEST); + "SELECT array_length(REGEXP_SPLIT(VAL, ',')) FROM " + tableName); assertTrue(rs.next()); assertEquals(33267, rs.getInt(1)); assertFalse(rs.next()); @@ -108,7 +102,7 @@ public class RegexpSplitFunctionIT extends BaseHBaseManagedTimeTableReuseIT { initTable(conn, "ONE,TWO,THREE"); ResultSet rs = conn.createStatement().executeQuery( - "SELECT ID FROM " + SPLIT_TEST + " WHERE (REGEXP_SPLIT(VAL, ','))[1] = 'ONE'"); + "SELECT ID FROM " + tableName + " WHERE (REGEXP_SPLIT(VAL, ','))[1] = 'ONE'"); assertTrue(rs.next()); assertEquals(1, rs.getInt(1)); assertFalse(rs.next()); @@ -120,11 +114,11 @@ public class RegexpSplitFunctionIT extends BaseHBaseManagedTimeTableReuseIT { initTable(conn, "ONE,TWO,THREE"); conn.createStatement().executeUpdate( - "UPSERT INTO " + SPLIT_TEST + " (ID, ARR) SELECT ID, " + "REGEXP_SPLIT(VAL, ',') FROM " - + SPLIT_TEST); + "UPSERT INTO " + tableName + " (ID, ARR) SELECT ID, " + "REGEXP_SPLIT(VAL, ',') FROM " + + tableName); conn.commit(); - ResultSet rs = conn.createStatement().executeQuery("SELECT ARR FROM " + SPLIT_TEST); + ResultSet rs = conn.createStatement().executeQuery("SELECT ARR FROM " + tableName); assertTrue(rs.next()); Array array = rs.getArray(1); String[] values = (String[]) array.getArray(); @@ -137,7 +131,7 @@ public class RegexpSplitFunctionIT extends BaseHBaseManagedTimeTableReuseIT { initTable(conn, "ONE:TWO:THREE"); ResultSet rs = conn.createStatement().executeQuery( - "SELECT REGEXP_SPLIT(VAL, ':') FROM " + SPLIT_TEST); + "SELECT REGEXP_SPLIT(VAL, ':') FROM " + tableName); assertTrue(rs.next()); Array array = rs.getArray(1); String[] values = (String[]) array.getArray(); @@ -150,7 +144,7 @@ public class RegexpSplitFunctionIT extends BaseHBaseManagedTimeTableReuseIT { initTable(conn, "ONE,TWO,THREE"); ResultSet rs = conn.createStatement().executeQuery( - "SELECT REGEXP_SPLIT(VAL, SEP) FROM " + SPLIT_TEST); + "SELECT REGEXP_SPLIT(VAL, SEP) FROM " + tableName); assertTrue(rs.next()); Array array = rs.getArray(1); String[] values = (String[]) array.getArray(); @@ -163,7 +157,7 @@ public class RegexpSplitFunctionIT extends BaseHBaseManagedTimeTableReuseIT { initTable(conn, "CANNOT BE SPLIT"); ResultSet rs = conn.createStatement().executeQuery( - "SELECT REGEXP_SPLIT(VAL, ',') FROM " + SPLIT_TEST); + "SELECT REGEXP_SPLIT(VAL, ',') FROM " + tableName); assertTrue(rs.next()); Array array = rs.getArray(1); String[] values = (String[]) array.getArray(); @@ -176,7 +170,7 @@ public class RegexpSplitFunctionIT extends BaseHBaseManagedTimeTableReuseIT { initTable(conn, "ONE!:TWO:::!THREE::!:FOUR"); ResultSet rs = conn.createStatement().executeQuery( - "SELECT REGEXP_SPLIT(VAL, '[:!]+') FROM " + SPLIT_TEST); + "SELECT REGEXP_SPLIT(VAL, '[:!]+') FROM " + tableName); assertTrue(rs.next()); Array array = rs.getArray(1); String[] values = (String[]) array.getArray(); @@ -189,7 +183,7 @@ public class RegexpSplitFunctionIT extends BaseHBaseManagedTimeTableReuseIT { initTable(conn, "ONE|TWO|THREE"); ResultSet rs = conn.createStatement().executeQuery( - "SELECT REGEXP_SPLIT(VAL, '\\\\|') FROM " + SPLIT_TEST); + "SELECT REGEXP_SPLIT(VAL, '\\\\|') FROM " + tableName); assertTrue(rs.next()); Array array = rs.getArray(1); String[] values = (String[]) array.getArray(); @@ -202,7 +196,7 @@ public class RegexpSplitFunctionIT extends BaseHBaseManagedTimeTableReuseIT { initTable(conn, null); ResultSet rs = conn.createStatement().executeQuery( - "SELECT REGEXP_SPLIT(VAL, ',') FROM " + SPLIT_TEST); + "SELECT REGEXP_SPLIT(VAL, ',') FROM " + tableName); assertTrue(rs.next()); assertNull(rs.getString(1)); assertFalse(rs.next()); @@ -214,7 +208,7 @@ public class RegexpSplitFunctionIT extends BaseHBaseManagedTimeTableReuseIT { initTable(conn, "ONE,TWO,THREE"); ResultSet rs = conn.createStatement().executeQuery( - "SELECT REGEXP_SPLIT(VAL, NULL) FROM " + SPLIT_TEST); + "SELECT REGEXP_SPLIT(VAL, NULL) FROM " + tableName); assertTrue(rs.next()); assertNull(rs.getString(1)); assertFalse(rs.next()); @@ -226,7 +220,7 @@ public class RegexpSplitFunctionIT extends BaseHBaseManagedTimeTableReuseIT { initTable(conn, "ONE,TWO,THREE", null); ResultSet rs = conn.createStatement().executeQuery( - "SELECT REGEXP_SPLIT(VAL, SEP) FROM " + SPLIT_TEST); + "SELECT REGEXP_SPLIT(VAL, SEP) FROM " + tableName); assertTrue(rs.next()); assertNull(rs.getString(1)); assertFalse(rs.next()); http://git-wip-us.apache.org/repos/asf/phoenix/blob/850b02c6/phoenix-core/src/it/java/org/apache/phoenix/end2end/StoreNullsIT.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/StoreNullsIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/StoreNullsIT.java index 836418c..363198c 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/StoreNullsIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/StoreNullsIT.java @@ -17,7 +17,20 @@ */ package org.apache.phoenix.end2end; -import com.google.common.collect.Lists; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; + +import java.io.IOException; +import java.sql.Connection; +import java.sql.DriverManager; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.sql.Statement; +import java.util.List; +import java.util.Properties; + import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.hbase.HConstants; @@ -34,22 +47,10 @@ import org.apache.phoenix.query.QueryServices; import org.apache.phoenix.util.PhoenixRuntime; import org.apache.phoenix.util.SchemaUtil; import org.junit.After; -import org.junit.BeforeClass; +import org.junit.Before; import org.junit.Test; -import java.io.IOException; -import java.sql.Connection; -import java.sql.DriverManager; -import java.sql.ResultSet; -import java.sql.SQLException; -import java.sql.Statement; -import java.util.List; -import java.util.Properties; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; +import com.google.common.collect.Lists; /** * Tests to demonstrate and verify the STORE_NULLS option on a table, @@ -58,18 +59,21 @@ import static org.junit.Assert.assertTrue; * also allows permanently deleting a row. */ public class StoreNullsIT extends BaseHBaseManagedTimeTableReuseIT { - private static final Log LOG = LogFactory.getLog(StoreNullsIT.class); - private static final String WITH_NULLS = generateRandomString(); - private static final String WITHOUT_NULLS = generateRandomString(); - private static final String IMMUTABLE_WITH_NULLS = generateRandomString(); - private static final String IMMUTABLE_WITHOUT_NULLS = generateRandomString(); - - private static Connection conn; - private static Statement stmt; - - @BeforeClass - public static void setUp() throws SQLException { + + private String WITH_NULLS; + private String WITHOUT_NULLS; + private String IMMUTABLE_WITH_NULLS; + private String IMMUTABLE_WITHOUT_NULLS; + private Connection conn; + private Statement stmt; + + @Before + public void setUp() throws SQLException { + WITH_NULLS = generateRandomString(); + WITHOUT_NULLS = generateRandomString(); + IMMUTABLE_WITH_NULLS = generateRandomString(); + IMMUTABLE_WITHOUT_NULLS = generateRandomString(); conn = DriverManager.getConnection(getUrl()); conn.setAutoCommit(true); http://git-wip-us.apache.org/repos/asf/phoenix/blob/850b02c6/phoenix-core/src/it/java/org/apache/phoenix/end2end/ToCharFunctionIT.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ToCharFunctionIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ToCharFunctionIT.java index e976517..27d593a 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ToCharFunctionIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ToCharFunctionIT.java @@ -49,7 +49,7 @@ import org.junit.Test; public class ToCharFunctionIT extends BaseHBaseManagedTimeTableReuseIT { - private static String TO_CHAR_TABLE_NAME; + private String TO_CHAR_TABLE_NAME; private Date row1Date; private Time row1Time; @@ -62,15 +62,6 @@ public class ToCharFunctionIT extends BaseHBaseManagedTimeTableReuseIT { private Integer row2Integer; private BigDecimal row2Decimal; - public static final String TO_CHAR_TABLE_DDL = "create table " + TO_CHAR_TABLE_NAME + - "(pk integer not null, \n" + - "col_date date, \n" + - "col_time date, \n" + - "col_timestamp timestamp, \n" + - "col_integer integer, \n" + - "col_decimal decimal\n" + - "CONSTRAINT my_pk PRIMARY KEY (pk))"; - @Before @edu.umd.cs.findbugs.annotations.SuppressWarnings( value="DMI_BIGDECIMAL_CONSTRUCTED_FROM_DOUBLE",