You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@phoenix.apache.org by ja...@apache.org on 2016/09/23 00:17:19 UTC
[1/6] phoenix git commit: PHOENIX-3253 Make changes to tests to
support method level parallelization
Repository: phoenix
Updated Branches:
refs/heads/master 16f0da3d9 -> bebb5cedf
http://git-wip-us.apache.org/repos/asf/phoenix/blob/bebb5ced/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/MutableIndexIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/MutableIndexIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/MutableIndexIT.java
index e5dfb0d..0a89eff 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/MutableIndexIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/MutableIndexIT.java
@@ -102,8 +102,8 @@ public class MutableIndexIT extends ParallelStatsDisabledIT {
Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
try (Connection conn = DriverManager.getConnection(getUrl(), props)) {
conn.setAutoCommit(false);
- String tableName = "TBL_" + generateRandomString();
- String indexName = "IDX_" + generateRandomString();
+ String tableName = "TBL_" + generateUniqueName();
+ String indexName = "IDX_" + generateUniqueName();
String fullTableName = SchemaUtil.getTableName(TestUtil.DEFAULT_SCHEMA_NAME, tableName);
String fullIndexName = SchemaUtil.getTableName(TestUtil.DEFAULT_SCHEMA_NAME, indexName);
@@ -200,8 +200,8 @@ public class MutableIndexIT extends ParallelStatsDisabledIT {
@Test
public void testCoveredColumns() throws Exception {
Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
- String tableName = "TBL_" + generateRandomString();
- String indexName = "IDX_" + generateRandomString();
+ String tableName = "TBL_" + generateUniqueName();
+ String indexName = "IDX_" + generateUniqueName();
String fullTableName = SchemaUtil.getTableName(TestUtil.DEFAULT_SCHEMA_NAME, tableName);
String fullIndexName = SchemaUtil.getTableName(TestUtil.DEFAULT_SCHEMA_NAME, indexName);
try (Connection conn = DriverManager.getConnection(getUrl(), props)) {
@@ -310,8 +310,8 @@ public class MutableIndexIT extends ParallelStatsDisabledIT {
@Test
public void testCompoundIndexKey() throws Exception {
Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
- String tableName = "TBL_" + generateRandomString();
- String indexName = "IDX_" + generateRandomString();
+ String tableName = "TBL_" + generateUniqueName();
+ String indexName = "IDX_" + generateUniqueName();
String fullTableName = SchemaUtil.getTableName(TestUtil.DEFAULT_SCHEMA_NAME, tableName);
String fullIndexName = SchemaUtil.getTableName(TestUtil.DEFAULT_SCHEMA_NAME, indexName);
try (Connection conn = DriverManager.getConnection(getUrl(), props)) {
@@ -429,8 +429,8 @@ public class MutableIndexIT extends ParallelStatsDisabledIT {
@Test
public void testMultipleUpdatesToSingleRow() throws Exception {
Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
- String tableName = "TBL_" + generateRandomString();
- String indexName = "IDX_" + generateRandomString();
+ String tableName = "TBL_" + generateUniqueName();
+ String indexName = "IDX_" + generateUniqueName();
String fullTableName = SchemaUtil.getTableName(TestUtil.DEFAULT_SCHEMA_NAME, tableName);
String fullIndexName = SchemaUtil.getTableName(TestUtil.DEFAULT_SCHEMA_NAME, indexName);
try (Connection conn = DriverManager.getConnection(getUrl(), props)) {
@@ -513,8 +513,8 @@ public class MutableIndexIT extends ParallelStatsDisabledIT {
@Test
public void testUpsertingNullForIndexedColumns() throws Exception {
Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
- String tableName = "TBL_" + generateRandomString();
- String indexName = "IDX_" + generateRandomString();
+ String tableName = "TBL_" + generateUniqueName();
+ String indexName = "IDX_" + generateUniqueName();
String fullIndexName = SchemaUtil.getTableName(TestUtil.DEFAULT_SCHEMA_NAME, indexName);
String testTableName = tableName + "_" + System.currentTimeMillis();
try (Connection conn = DriverManager.getConnection(getUrl(), props)) {
@@ -599,7 +599,7 @@ public class MutableIndexIT extends ParallelStatsDisabledIT {
public void testAlterTableWithImmutability() throws Exception {
String query;
ResultSet rs;
- String tableName = "TBL_" + generateRandomString();
+ String tableName = "TBL_" + generateUniqueName();
String fullTableName = SchemaUtil.getTableName(TestUtil.DEFAULT_SCHEMA_NAME, tableName);
@@ -638,8 +638,8 @@ public class MutableIndexIT extends ParallelStatsDisabledIT {
props.setProperty(QueryServices.SCAN_CACHE_SIZE_ATTRIB, Integer.toString(2));
props.put(QueryServices.FORCE_ROW_KEY_ORDER_ATTRIB, Boolean.toString(false));
Connection conn1 = DriverManager.getConnection(getUrl());
- String tableName = "TBL_" + generateRandomString();
- String indexName = "IDX_" + generateRandomString();
+ String tableName = "TBL_" + generateUniqueName();
+ String indexName = "IDX_" + generateUniqueName();
HBaseAdmin admin = driver.getConnectionQueryServices(getUrl(), TestUtil.TEST_PROPERTIES).getAdmin();
dropTable(admin, conn1);
try{
@@ -660,8 +660,8 @@ public class MutableIndexIT extends ParallelStatsDisabledIT {
private void dropTable(HBaseAdmin admin, Connection conn) throws SQLException, IOException {
- String tableName = "TBL_" + generateRandomString();
- String indexName = "IDX_" + generateRandomString();
+ String tableName = "TBL_" + generateUniqueName();
+ String indexName = "IDX_" + generateUniqueName();
conn.createStatement().execute("DROP TABLE IF EXISTS "+ tableName);
if(admin.tableExists(tableName)) {
admin.disableTable(TableName.valueOf(tableName));
@@ -690,8 +690,8 @@ public class MutableIndexIT extends ParallelStatsDisabledIT {
public void testIndexHalfStoreFileReader() throws Exception {
Connection conn1 = DriverManager.getConnection(getUrl());
HBaseAdmin admin = driver.getConnectionQueryServices(getUrl(), TestUtil.TEST_PROPERTIES).getAdmin();
- String tableName = "TBL_" + generateRandomString();
- String indexName = "IDX_" + generateRandomString();
+ String tableName = "TBL_" + generateUniqueName();
+ String indexName = "IDX_" + generateUniqueName();
try {
dropTable(admin, conn1);
createBaseTable(conn1, tableName, "('e')");
@@ -836,8 +836,8 @@ public class MutableIndexIT extends ParallelStatsDisabledIT {
@Test
public void testTenantSpecificConnection() throws Exception {
- String tableName = "TBL_" + generateRandomString();
- String indexName = "IDX_" + generateRandomString();
+ String tableName = "TBL_" + generateUniqueName();
+ String indexName = "IDX_" + generateUniqueName();
String fullTableName = SchemaUtil.getTableName(TestUtil.DEFAULT_SCHEMA_NAME, tableName);
Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
try (Connection conn = DriverManager.getConnection(getUrl(), props)) {
http://git-wip-us.apache.org/repos/asf/phoenix/blob/bebb5ced/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/SaltedIndexIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/SaltedIndexIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/SaltedIndexIT.java
index ebdd565..5bf0c58 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/SaltedIndexIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/SaltedIndexIT.java
@@ -73,8 +73,8 @@ public class SaltedIndexIT extends ParallelStatsDisabledIT {
@Test
public void testMutableTableIndexMaintanenceSaltedSalted() throws Exception {
- String tableName = "TBL_" + generateRandomString();
- String indexName = "IND_" + generateRandomString();
+ String tableName = "TBL_" + generateUniqueName();
+ String indexName = "IND_" + generateUniqueName();
String fullTableName = SchemaUtil.getTableName(TestUtil.DEFAULT_SCHEMA_NAME, tableName);
String fullIndexName = SchemaUtil.getTableName(TestUtil.DEFAULT_SCHEMA_NAME, indexName);
testMutableTableIndexMaintanence(tableName, fullTableName, indexName, fullIndexName, TABLE_SPLITS, INDEX_SPLITS);
@@ -84,8 +84,8 @@ public class SaltedIndexIT extends ParallelStatsDisabledIT {
@Test
public void testMutableTableIndexMaintanenceSalted() throws Exception {
- String tableName = "TBL_" + generateRandomString();
- String indexName = "IND_" + generateRandomString();
+ String tableName = "TBL_" + generateUniqueName();
+ String indexName = "IND_" + generateUniqueName();
String fullTableName = SchemaUtil.getTableName(TestUtil.DEFAULT_SCHEMA_NAME, tableName);
String fullIndexName = SchemaUtil.getTableName(TestUtil.DEFAULT_SCHEMA_NAME, indexName);
testMutableTableIndexMaintanence(tableName, fullTableName, indexName, fullIndexName, null, INDEX_SPLITS);
@@ -95,8 +95,8 @@ public class SaltedIndexIT extends ParallelStatsDisabledIT {
@Test
public void testMutableTableIndexMaintanenceUnsalted() throws Exception {
- String tableName = "TBL_" + generateRandomString();
- String indexName = "IND_" + generateRandomString();
+ String tableName = "TBL_" + generateUniqueName();
+ String indexName = "IND_" + generateUniqueName();
String fullTableName = SchemaUtil.getTableName(TestUtil.DEFAULT_SCHEMA_NAME, tableName);
String fullIndexName = SchemaUtil.getTableName(TestUtil.DEFAULT_SCHEMA_NAME, indexName);
testMutableTableIndexMaintanence(tableName, fullTableName, indexName, fullIndexName, null, null);
http://git-wip-us.apache.org/repos/asf/phoenix/blob/bebb5ced/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/ViewIndexIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/ViewIndexIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/ViewIndexIT.java
index 7bd1478..99a8b4d 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/ViewIndexIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/ViewIndexIT.java
@@ -92,10 +92,10 @@ public class ViewIndexIT extends ParallelStatsDisabledIT {
@Test
public void testDeleteViewIndexSequences() throws Exception {
- String schemaName = generateRandomString();
- String tableName = schemaName + "." + generateRandomString();
- String indexName = "IND_" + generateRandomString();
- String VIEW_NAME = "VIEW_" + generateRandomString();
+ String schemaName = generateUniqueName();
+ String tableName = schemaName + "." + generateUniqueName();
+ String indexName = "IND_" + generateUniqueName();
+ String VIEW_NAME = "VIEW_" + generateUniqueName();
String viewName = schemaName + "." + VIEW_NAME;
createBaseTable(schemaName, tableName, false, null, null);
@@ -120,10 +120,10 @@ public class ViewIndexIT extends ParallelStatsDisabledIT {
@Test
public void testMultiTenantViewLocalIndex() throws Exception {
- String schemaName = generateRandomString();
- String tableName = generateRandomString();
- String indexName = "IND_" + generateRandomString();
- String VIEW_NAME = "VIEW_" + generateRandomString();
+ String schemaName = generateUniqueName();
+ String tableName = generateUniqueName();
+ String indexName = "IND_" + generateUniqueName();
+ String VIEW_NAME = "VIEW_" + generateUniqueName();
createBaseTable(schemaName, tableName, true, null, null);
Connection conn = DriverManager.getConnection(getUrl());
PreparedStatement stmt = conn.prepareStatement(
@@ -167,9 +167,9 @@ public class ViewIndexIT extends ParallelStatsDisabledIT {
@Test
public void testCreatingIndexOnGlobalView() throws Exception {
- String baseTable = generateRandomString();
- String globalView = generateRandomString();
- String globalViewIdx = generateRandomString();
+ String baseTable = generateUniqueName();
+ String globalView = generateUniqueName();
+ String globalViewIdx = generateUniqueName();
try (Connection conn = DriverManager.getConnection(getUrl())) {
conn.createStatement().execute("CREATE TABLE " + baseTable + " (TENANT_ID CHAR(15) NOT NULL, PK2 DATE NOT NULL, PK3 INTEGER NOT NULL, KV1 VARCHAR, KV2 VARCHAR, KV3 CHAR(15) CONSTRAINT PK PRIMARY KEY(TENANT_ID, PK2 ROW_TIMESTAMP, PK3)) MULTI_TENANT=true");
conn.createStatement().execute("CREATE VIEW " + globalView + " AS SELECT * FROM " + baseTable);
http://git-wip-us.apache.org/repos/asf/phoenix/blob/bebb5ced/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/txn/MutableRollbackIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/txn/MutableRollbackIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/txn/MutableRollbackIT.java
index 44ec7a5..3ffade0 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/txn/MutableRollbackIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/txn/MutableRollbackIT.java
@@ -77,11 +77,11 @@ public class MutableRollbackIT extends ParallelStatsDisabledIT {
public void testRollbackOfUncommittedExistingKeyValueIndexUpdate() throws Exception {
Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
Connection conn = DriverManager.getConnection(getUrl(), props);
- String tableName1 = "TBL1_" + generateRandomString();
- String indexName1 = "IDX1_" + generateRandomString();
+ String tableName1 = "TBL1_" + generateUniqueName();
+ String indexName1 = "IDX1_" + generateUniqueName();
String fullTableName1 = SchemaUtil.getTableName(TestUtil.DEFAULT_SCHEMA_NAME, tableName1);
- String tableName2 = "TBL2_" + generateRandomString();
- String indexName2 = "IDX2_" + generateRandomString();
+ String tableName2 = "TBL2_" + generateUniqueName();
+ String indexName2 = "IDX2_" + generateUniqueName();
String fullTableName2 = SchemaUtil.getTableName(TestUtil.DEFAULT_SCHEMA_NAME, tableName2);
conn.setAutoCommit(false);
try {
@@ -209,11 +209,11 @@ public class MutableRollbackIT extends ParallelStatsDisabledIT {
@Test
public void testRollbackOfUncommittedExistingRowKeyIndexUpdate() throws Exception {
- String tableName1 = "TBL1_" + generateRandomString();
- String indexName1 = "IDX1_" + generateRandomString();
+ String tableName1 = "TBL1_" + generateUniqueName();
+ String indexName1 = "IDX1_" + generateUniqueName();
String fullTableName1 = SchemaUtil.getTableName(TestUtil.DEFAULT_SCHEMA_NAME, tableName1);
- String tableName2 = "TBL2_" + generateRandomString();
- String indexName2 = "IDX2_" + generateRandomString();
+ String tableName2 = "TBL2_" + generateUniqueName();
+ String indexName2 = "IDX2_" + generateUniqueName();
String fullTableName2 = SchemaUtil.getTableName(TestUtil.DEFAULT_SCHEMA_NAME, tableName2);
Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
Connection conn = DriverManager.getConnection(getUrl(), props);
@@ -352,10 +352,10 @@ public class MutableRollbackIT extends ParallelStatsDisabledIT {
public void testMultiRollbackOfUncommittedExistingRowKeyIndexUpdate() throws Exception {
Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
Connection conn = DriverManager.getConnection(getUrl(), props);
- String tableName1 = "TBL1_" + generateRandomString();
- String indexName1 = "IDX1_" + generateRandomString();
+ String tableName1 = "TBL1_" + generateUniqueName();
+ String indexName1 = "IDX1_" + generateUniqueName();
String fullTableName1 = SchemaUtil.getTableName(TestUtil.DEFAULT_SCHEMA_NAME, tableName1);
- String tableName2 = "TBL2_" + generateRandomString();
+ String tableName2 = "TBL2_" + generateUniqueName();
conn.setAutoCommit(false);
try {
Statement stmt = conn.createStatement();
@@ -458,10 +458,10 @@ public class MutableRollbackIT extends ParallelStatsDisabledIT {
public void testCheckpointAndRollback() throws Exception {
Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
Connection conn = DriverManager.getConnection(getUrl(), props);
- String tableName1 = "TBL1_" + generateRandomString();
- String indexName1 = "IDX1_" + generateRandomString();
+ String tableName1 = "TBL1_" + generateUniqueName();
+ String indexName1 = "IDX1_" + generateUniqueName();
String fullTableName1 = SchemaUtil.getTableName(TestUtil.DEFAULT_SCHEMA_NAME, tableName1);
- String tableName2 = "TBL2_" + generateRandomString();
+ String tableName2 = "TBL2_" + generateUniqueName();
conn.setAutoCommit(false);
try {
Statement stmt = conn.createStatement();
http://git-wip-us.apache.org/repos/asf/phoenix/blob/bebb5ced/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/txn/RollbackIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/txn/RollbackIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/txn/RollbackIT.java
index fb50548..5153a68 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/txn/RollbackIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/txn/RollbackIT.java
@@ -76,8 +76,8 @@ public class RollbackIT extends ParallelStatsDisabledIT {
@Test
public void testRollbackOfUncommittedKeyValueIndexInsert() throws Exception {
- String tableName = "TBL_" + generateRandomString();
- String indexName = "IDX_" + generateRandomString();
+ String tableName = "TBL_" + generateUniqueName();
+ String indexName = "IDX_" + generateUniqueName();
String fullTableName = SchemaUtil.getTableName(TestUtil.DEFAULT_SCHEMA_NAME, tableName);
Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
Connection conn = DriverManager.getConnection(getUrl(), props);
@@ -124,8 +124,8 @@ public class RollbackIT extends ParallelStatsDisabledIT {
Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
Connection conn = DriverManager.getConnection(getUrl(), props);
conn.setAutoCommit(false);
- String tableName = "TBL_" + generateRandomString();
- String indexName = "IDX_" + generateRandomString();
+ String tableName = "TBL_" + generateUniqueName();
+ String indexName = "IDX_" + generateUniqueName();
String fullTableName = SchemaUtil.getTableName(TestUtil.DEFAULT_SCHEMA_NAME, tableName);
try {
Statement stmt = conn.createStatement();
http://git-wip-us.apache.org/repos/asf/phoenix/blob/bebb5ced/phoenix-core/src/it/java/org/apache/phoenix/end2end/salted/SaltedTableUpsertSelectIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/salted/SaltedTableUpsertSelectIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/salted/SaltedTableUpsertSelectIT.java
index d680954..0b805c6 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/salted/SaltedTableUpsertSelectIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/salted/SaltedTableUpsertSelectIT.java
@@ -44,11 +44,11 @@ public class SaltedTableUpsertSelectIT extends ParallelStatsDisabledIT {
Connection conn = DriverManager.getConnection(getUrl(), props);
conn.setAutoCommit(false);
try {
- String source = generateRandomString();
+ String source = generateUniqueName();
String ddl = "CREATE TABLE IF NOT EXISTS " + source +
" (pk VARCHAR NOT NULL PRIMARY KEY, col INTEGER)";
createTestTable(getUrl(), ddl);
- String target = generateRandomString();
+ String target = generateUniqueName();
ddl = "CREATE TABLE IF NOT EXISTS " + target +
" (pk VARCHAR NOT NULL PRIMARY KEY, col INTEGER) SALT_BUCKETS=4";
createTestTable(getUrl(), ddl);
@@ -83,11 +83,11 @@ public class SaltedTableUpsertSelectIT extends ParallelStatsDisabledIT {
Connection conn = DriverManager.getConnection(getUrl(), props);
conn.setAutoCommit(false);
try {
- String source = generateRandomString();
+ String source = generateUniqueName();
String ddl = "CREATE TABLE IF NOT EXISTS " + source +
" (pk VARCHAR NOT NULL PRIMARY KEY, col INTEGER) SALT_BUCKETS=4";
createTestTable(getUrl(), ddl);
- String target = generateRandomString();
+ String target = generateUniqueName();
ddl = "CREATE TABLE IF NOT EXISTS " + target +
" (pk VARCHAR NOT NULL PRIMARY KEY, col INTEGER)";
createTestTable(getUrl(), ddl);
@@ -127,11 +127,11 @@ public class SaltedTableUpsertSelectIT extends ParallelStatsDisabledIT {
Connection conn = DriverManager.getConnection(getUrl(), props);
conn.setAutoCommit(false);
try {
- String source = generateRandomString();
+ String source = generateUniqueName();
String ddl = "CREATE TABLE IF NOT EXISTS " + source +
" (pk VARCHAR NOT NULL PRIMARY KEY, col INTEGER) SALT_BUCKETS=4";
createTestTable(getUrl(), ddl);
- String target = generateRandomString();
+ String target = generateUniqueName();
ddl = "CREATE TABLE IF NOT EXISTS " + target +
" (pk VARCHAR NOT NULL PRIMARY KEY, col INTEGER) SALT_BUCKETS=4";
createTestTable(getUrl(), ddl);
@@ -166,7 +166,7 @@ public class SaltedTableUpsertSelectIT extends ParallelStatsDisabledIT {
Connection conn = DriverManager.getConnection(getUrl(), props);
conn.setAutoCommit(false);
try {
- String source = generateRandomString();
+ String source = generateUniqueName();
String ddl = "CREATE TABLE IF NOT EXISTS " + source +
" (pk VARCHAR NOT NULL PRIMARY KEY, col1 INTEGER, col2 INTEGER) SALT_BUCKETS=4";
createTestTable(getUrl(), ddl);
@@ -200,7 +200,7 @@ public class SaltedTableUpsertSelectIT extends ParallelStatsDisabledIT {
Connection conn = DriverManager.getConnection(getUrl(), props);
conn.setAutoCommit(false);
try {
- String source1 = generateRandomString();
+ String source1 = generateUniqueName();
String ddl = "CREATE TABLE IF NOT EXISTS " + source1 +
" (pk1 varchar NULL, pk2 varchar NULL, pk3 integer NOT NULL, col1 INTEGER" +
" CONSTRAINT pk PRIMARY KEY (pk1, pk2, pk3)) SALT_BUCKETS=4";
@@ -241,7 +241,7 @@ public class SaltedTableUpsertSelectIT extends ParallelStatsDisabledIT {
Connection conn = DriverManager.getConnection(getUrl(), props);
conn.setAutoCommit(false);
try {
- String source1 = generateRandomString();
+ String source1 = generateUniqueName();
String ddl = "CREATE TABLE IF NOT EXISTS " + source1 +
" (pk1 varchar NULL, pk2 varchar NULL, pk3 integer NOT NULL, col1 INTEGER" +
" CONSTRAINT pk PRIMARY KEY (pk1, pk2, pk3)) SALT_BUCKETS=4";
@@ -258,7 +258,7 @@ public class SaltedTableUpsertSelectIT extends ParallelStatsDisabledIT {
}
conn.commit();
- String source2 = generateRandomString();
+ String source2 = generateUniqueName();
String ddl2 = "CREATE TABLE IF NOT EXISTS " + source2 +
" (pk1 varchar NULL, pk2 varchar NULL, pk3 integer NOT NULL, col1 INTEGER" +
" CONSTRAINT pk PRIMARY KEY (pk1, pk2, pk3)) SALT_BUCKETS=4";
@@ -275,7 +275,7 @@ public class SaltedTableUpsertSelectIT extends ParallelStatsDisabledIT {
}
conn.commit();
- String dest = generateRandomString();
+ String dest = generateUniqueName();
String ddl3 = "CREATE TABLE IF NOT EXISTS " + dest +
" (pk1 varchar NULL, pk2 varchar NULL, pk3 integer NOT NULL, col1 INTEGER" +
" CONSTRAINT pk PRIMARY KEY (pk1, pk2, pk3)) SALT_BUCKETS=4";
http://git-wip-us.apache.org/repos/asf/phoenix/blob/bebb5ced/phoenix-core/src/it/java/org/apache/phoenix/end2end/salted/SaltedTableVarLengthRowKeyIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/salted/SaltedTableVarLengthRowKeyIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/salted/SaltedTableVarLengthRowKeyIT.java
index c3f331b..fa43876 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/salted/SaltedTableVarLengthRowKeyIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/salted/SaltedTableVarLengthRowKeyIT.java
@@ -36,7 +36,7 @@ import org.junit.Test;
public class SaltedTableVarLengthRowKeyIT extends ParallelStatsDisabledIT {
- private static final String TEST_TABLE = generateRandomString();
+ private static final String TEST_TABLE = generateUniqueName();
private static void initTableValues() throws Exception {
Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
http://git-wip-us.apache.org/repos/asf/phoenix/blob/bebb5ced/phoenix-core/src/it/java/org/apache/phoenix/iterate/PhoenixQueryTimeoutIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/iterate/PhoenixQueryTimeoutIT.java b/phoenix-core/src/it/java/org/apache/phoenix/iterate/PhoenixQueryTimeoutIT.java
index 7b3b286..8fcdebb 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/iterate/PhoenixQueryTimeoutIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/iterate/PhoenixQueryTimeoutIT.java
@@ -37,7 +37,7 @@ import org.junit.Test;
*/
public class PhoenixQueryTimeoutIT extends ParallelStatsDisabledIT {
- private static final String QUERY_TIMEOUT_TEST = generateRandomString();
+ private static final String QUERY_TIMEOUT_TEST = generateUniqueName();
@Test
/**
http://git-wip-us.apache.org/repos/asf/phoenix/blob/bebb5ced/phoenix-core/src/it/java/org/apache/phoenix/iterate/RoundRobinResultIteratorIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/iterate/RoundRobinResultIteratorIT.java b/phoenix-core/src/it/java/org/apache/phoenix/iterate/RoundRobinResultIteratorIT.java
index ba35f4e..47261ac 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/iterate/RoundRobinResultIteratorIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/iterate/RoundRobinResultIteratorIT.java
@@ -78,7 +78,7 @@ public class RoundRobinResultIteratorIT extends ParallelStatsDisabledIT {
@Test
public void testRoundRobinAfterTableSplit() throws Exception {
- String tableName = generateRandomString();
+ String tableName = generateUniqueName();
byte[] tableNameBytes = Bytes.toBytes(tableName);
int numRows = setupTableForSplit(tableName);
Connection conn = DriverManager.getConnection(getUrl());
@@ -128,7 +128,7 @@ public class RoundRobinResultIteratorIT extends ParallelStatsDisabledIT {
}
private void testSelectAllRowsWithDifferentFetchSizes(boolean salted) throws Exception {
- String tableName = generateRandomString();
+ String tableName = generateUniqueName();
int numRows = 9;
Set<String> expectedKeys = Collections.unmodifiableSet(createTableAndInsertRows(tableName, numRows, salted, false));
Connection conn = DriverManager.getConnection(getUrl());
@@ -152,7 +152,7 @@ public class RoundRobinResultIteratorIT extends ParallelStatsDisabledIT {
}
private void testSelectRowsWithFilterAndDifferentFetchSizes(boolean salted) throws Exception {
- String tableName = generateRandomString();
+ String tableName = generateUniqueName();
int numRows = 6;
Set<String> insertedKeys = createTableAndInsertRows(tableName, numRows, salted, false);
Connection conn = DriverManager.getConnection(getUrl());
@@ -205,7 +205,7 @@ public class RoundRobinResultIteratorIT extends ParallelStatsDisabledIT {
@Test
public void testFetchSizesAndRVCExpression() throws Exception {
- String tableName = generateRandomString();
+ String tableName = generateUniqueName();
Set<String> insertedKeys = Collections.unmodifiableSet(createTableAndInsertRows(tableName, 4, false, false));
Connection conn = DriverManager.getConnection(getUrl());
PreparedStatement stmt = conn.prepareStatement("SELECT K FROM " + tableName + " WHERE (K, V) > (?, ?)");
@@ -280,7 +280,7 @@ public class RoundRobinResultIteratorIT extends ParallelStatsDisabledIT {
int insertedRowsA = 10;
int insertedRowsB = 5;
int insertedRowsC = 7;
- String baseTableName = generateRandomString();
+ String baseTableName = generateUniqueName();
String tableA = "TABLEA" + baseTableName;
String tableB = "TABLEB" + baseTableName;
String tableC = "TABLEC" + baseTableName;
http://git-wip-us.apache.org/repos/asf/phoenix/blob/bebb5ced/phoenix-core/src/it/java/org/apache/phoenix/rpc/UpdateCacheIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/rpc/UpdateCacheIT.java b/phoenix-core/src/it/java/org/apache/phoenix/rpc/UpdateCacheIT.java
index 56f9f4b..930f454 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/rpc/UpdateCacheIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/rpc/UpdateCacheIT.java
@@ -76,7 +76,7 @@ public class UpdateCacheIT extends ParallelStatsDisabledIT {
Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
try (Connection conn = DriverManager.getConnection(getUrl(), props)) {
conn.createStatement().execute(
- "create table " + fullTableName + TEST_TABLE_SCHEMA);
+ "create table " + fullTableName + TestUtil.TEST_TABLE_SCHEMA);
}
}
@@ -84,33 +84,33 @@ public class UpdateCacheIT extends ParallelStatsDisabledIT {
public void testUpdateCacheForTxnTable() throws Exception {
String fullTableName = INDEX_DATA_SCHEMA + QueryConstants.NAME_SEPARATOR + TRANSACTIONAL_DATA_TABLE;
Connection conn = DriverManager.getConnection(getUrl(), PropertiesUtil.deepCopy(TEST_PROPERTIES));
- conn.createStatement().execute("create table " + fullTableName + TEST_TABLE_SCHEMA + "TRANSACTIONAL=true");
+ conn.createStatement().execute("create table " + fullTableName + TestUtil.TEST_TABLE_SCHEMA + "TRANSACTIONAL=true");
helpTestUpdateCache(fullTableName, null, new int[] {1, 1});
}
@Test
public void testUpdateCacheForNonTxnTable() throws Exception {
- String tableName = generateRandomString();
+ String tableName = generateUniqueName();
String fullTableName = INDEX_DATA_SCHEMA + QueryConstants.NAME_SEPARATOR + tableName;
Connection conn = DriverManager.getConnection(getUrl(), PropertiesUtil.deepCopy(TEST_PROPERTIES));
- conn.createStatement().execute("create table " + fullTableName + TEST_TABLE_SCHEMA);
+ conn.createStatement().execute("create table " + fullTableName + TestUtil.TEST_TABLE_SCHEMA);
helpTestUpdateCache(fullTableName, null, new int[] {1, 3});
}
@Test
public void testUpdateCacheForNonTxnSystemTable() throws Exception {
- String fullTableName = QueryConstants.SYSTEM_SCHEMA_NAME + QueryConstants.NAME_SEPARATOR + generateRandomString();
+ String fullTableName = QueryConstants.SYSTEM_SCHEMA_NAME + QueryConstants.NAME_SEPARATOR + generateUniqueName();
setupSystemTable(fullTableName);
helpTestUpdateCache(fullTableName, null, new int[] {0, 0});
}
@Test
public void testUpdateCacheForNeverUpdatedTable() throws Exception {
- String tableName = generateRandomString();
+ String tableName = generateUniqueName();
String fullTableName = INDEX_DATA_SCHEMA + QueryConstants.NAME_SEPARATOR + tableName;
Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
try (Connection conn = DriverManager.getConnection(getUrl(), props)) {
- conn.createStatement().execute("create table " + fullTableName + TEST_TABLE_SCHEMA);
+ conn.createStatement().execute("create table " + fullTableName + TestUtil.TEST_TABLE_SCHEMA);
conn.createStatement().execute(
"alter table " + fullTableName + " SET UPDATE_CACHE_FREQUENCY=NEVER");
}
@@ -119,20 +119,20 @@ public class UpdateCacheIT extends ParallelStatsDisabledIT {
@Test
public void testUpdateCacheForAlwaysUpdatedTable() throws Exception {
- String fullTableName = INDEX_DATA_SCHEMA + QueryConstants.NAME_SEPARATOR + generateRandomString();
+ String fullTableName = INDEX_DATA_SCHEMA + QueryConstants.NAME_SEPARATOR + generateUniqueName();
Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
try (Connection conn = DriverManager.getConnection(getUrl(), props)) {
- conn.createStatement().execute("CREATE TABLE " + fullTableName + TEST_TABLE_SCHEMA + " UPDATE_CACHE_FREQUENCY=always");
+ conn.createStatement().execute("CREATE TABLE " + fullTableName + TestUtil.TEST_TABLE_SCHEMA + " UPDATE_CACHE_FREQUENCY=always");
}
helpTestUpdateCache(fullTableName, null, new int[] {1, 3});
}
@Test
public void testUpdateCacheForTimeLimitedUpdateTable() throws Exception {
- String fullTableName = INDEX_DATA_SCHEMA + QueryConstants.NAME_SEPARATOR + generateRandomString();
+ String fullTableName = INDEX_DATA_SCHEMA + QueryConstants.NAME_SEPARATOR + generateUniqueName();
Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
try (Connection conn = DriverManager.getConnection(getUrl(), props)) {
- conn.createStatement().execute("CREATE TABLE " + fullTableName + TEST_TABLE_SCHEMA + " UPDATE_CACHE_FREQUENCY=" + 10000);
+ conn.createStatement().execute("CREATE TABLE " + fullTableName + TestUtil.TEST_TABLE_SCHEMA + " UPDATE_CACHE_FREQUENCY=" + 10000);
}
helpTestUpdateCache(fullTableName, null, new int[] {0, 0});
Thread.sleep(10000);
@@ -141,10 +141,10 @@ public class UpdateCacheIT extends ParallelStatsDisabledIT {
@Test
public void testUpdateCacheForChangingUpdateTable() throws Exception {
- String fullTableName = INDEX_DATA_SCHEMA + QueryConstants.NAME_SEPARATOR + generateRandomString();
+ String fullTableName = INDEX_DATA_SCHEMA + QueryConstants.NAME_SEPARATOR + generateUniqueName();
Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
try (Connection conn = DriverManager.getConnection(getUrl(), props)) {
- conn.createStatement().execute("CREATE TABLE " + fullTableName + TEST_TABLE_SCHEMA + " UPDATE_CACHE_FREQUENCY=never");
+ conn.createStatement().execute("CREATE TABLE " + fullTableName + TestUtil.TEST_TABLE_SCHEMA + " UPDATE_CACHE_FREQUENCY=never");
}
helpTestUpdateCache(fullTableName, null, new int[] {0, 0});
try (Connection conn = DriverManager.getConnection(getUrl(), props)) {
http://git-wip-us.apache.org/repos/asf/phoenix/blob/bebb5ced/phoenix-core/src/it/java/org/apache/phoenix/rpc/UpdateCacheWithScnIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/rpc/UpdateCacheWithScnIT.java b/phoenix-core/src/it/java/org/apache/phoenix/rpc/UpdateCacheWithScnIT.java
index 75f67b3..b0d672d 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/rpc/UpdateCacheWithScnIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/rpc/UpdateCacheWithScnIT.java
@@ -29,6 +29,7 @@ import org.apache.phoenix.end2end.BaseClientManagedTimeIT;
import org.apache.phoenix.query.QueryConstants;
import org.apache.phoenix.util.PhoenixRuntime;
import org.apache.phoenix.util.PropertiesUtil;
+import org.apache.phoenix.util.TestUtil;
import org.junit.Test;
public class UpdateCacheWithScnIT extends BaseClientManagedTimeIT {
@@ -40,7 +41,7 @@ public class UpdateCacheWithScnIT extends BaseClientManagedTimeIT {
Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts));
Connection conn = DriverManager.getConnection(getUrl(), props);
- conn.createStatement().execute("create table " + fullTableName + TEST_TABLE_SCHEMA);
+ conn.createStatement().execute("create table " + fullTableName + TestUtil.TEST_TABLE_SCHEMA);
// FIXME: given that the scn is advancing in the test, why aren't there more RPCs?
UpdateCacheIT.helpTestUpdateCache(fullTableName, ts+2, new int[] {1, 1});
}
http://git-wip-us.apache.org/repos/asf/phoenix/blob/bebb5ced/phoenix-core/src/it/java/org/apache/phoenix/trace/PhoenixTableMetricsWriterIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/trace/PhoenixTableMetricsWriterIT.java b/phoenix-core/src/it/java/org/apache/phoenix/trace/PhoenixTableMetricsWriterIT.java
index f0319c0..dbb34ba 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/trace/PhoenixTableMetricsWriterIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/trace/PhoenixTableMetricsWriterIT.java
@@ -43,7 +43,7 @@ public class PhoenixTableMetricsWriterIT extends BaseTracingTestIT {
public void testCreatesTable() throws Exception {
PhoenixMetricsSink sink = new PhoenixMetricsSink();
Connection conn = getConnectionWithoutTracing();
- String tableName = generateRandomString();
+ String tableName = generateUniqueName();
sink.initForTesting(conn, tableName);
// check for existence of the tracing table
@@ -74,7 +74,7 @@ public class PhoenixTableMetricsWriterIT extends BaseTracingTestIT {
// hook up a phoenix sink
PhoenixMetricsSink sink = new PhoenixMetricsSink();
Connection conn = getConnectionWithoutTracing();
- String tableName = generateRandomString();
+ String tableName = generateUniqueName();
sink.initForTesting(conn, tableName);
// create a simple metrics record
http://git-wip-us.apache.org/repos/asf/phoenix/blob/bebb5ced/phoenix-core/src/it/java/org/apache/phoenix/trace/PhoenixTraceReaderIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/trace/PhoenixTraceReaderIT.java b/phoenix-core/src/it/java/org/apache/phoenix/trace/PhoenixTraceReaderIT.java
index a7bd730..723810f 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/trace/PhoenixTraceReaderIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/trace/PhoenixTraceReaderIT.java
@@ -55,7 +55,7 @@ public class PhoenixTraceReaderIT extends BaseTracingTestIT {
PhoenixMetricsSink sink = new PhoenixMetricsSink();
Properties props = new Properties(TEST_PROPERTIES);
Connection conn = DriverManager.getConnection(getUrl(), props);
- String tableName = generateRandomString();
+ String tableName = generateUniqueName();
sink.initForTesting(conn, tableName);
// create a simple metrics record
@@ -88,7 +88,7 @@ public class PhoenixTraceReaderIT extends BaseTracingTestIT {
// hook up a phoenix sink
PhoenixMetricsSink sink = new PhoenixMetricsSink();
Connection conn = getConnectionWithoutTracing();
- String tableName = generateRandomString();
+ String tableName = generateUniqueName();
sink.initForTesting(conn, tableName);
// create a simple metrics record
http://git-wip-us.apache.org/repos/asf/phoenix/blob/bebb5ced/phoenix-core/src/it/java/org/apache/phoenix/trace/PhoenixTracingEndToEndIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/trace/PhoenixTracingEndToEndIT.java b/phoenix-core/src/it/java/org/apache/phoenix/trace/PhoenixTracingEndToEndIT.java
index 8097cc9..19fc75f 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/trace/PhoenixTracingEndToEndIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/trace/PhoenixTracingEndToEndIT.java
@@ -70,11 +70,11 @@ public class PhoenixTracingEndToEndIT extends BaseTracingTestIT {
public void setupMetrics() throws Exception {
PhoenixMetricsSink pWriter = new PhoenixMetricsSink();
Connection conn = getConnectionWithoutTracing();
- tracingTableName = "TRACING_" + generateRandomString();
+ tracingTableName = "TRACING_" + generateUniqueName();
pWriter.initForTesting(conn, tracingTableName);
sink = new DisableableMetricsWriter(pWriter);
- enabledForLoggingTable = "ENABLED_FOR_LOGGING_" + generateRandomString();
- enableForLoggingIndex = "ENABALED_FOR_LOGGING_INDEX_" + generateRandomString();
+ enabledForLoggingTable = "ENABLED_FOR_LOGGING_" + generateUniqueName();
+ enableForLoggingIndex = "ENABALED_FOR_LOGGING_INDEX_" + generateUniqueName();
TracingTestUtil.registerSink(sink, tracingTableName);
}
http://git-wip-us.apache.org/repos/asf/phoenix/blob/bebb5ced/phoenix-core/src/it/java/org/apache/phoenix/tx/NotThreadSafeTransactionIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/tx/NotThreadSafeTransactionIT.java b/phoenix-core/src/it/java/org/apache/phoenix/tx/NotThreadSafeTransactionIT.java
new file mode 100644
index 0000000..6fea975
--- /dev/null
+++ b/phoenix-core/src/it/java/org/apache/phoenix/tx/NotThreadSafeTransactionIT.java
@@ -0,0 +1,163 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.phoenix.tx;
+
+import static org.apache.phoenix.util.TestUtil.INDEX_DATA_SCHEMA;
+import static org.apache.phoenix.util.TestUtil.createTransactionalTable;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.util.Map;
+
+import javax.annotation.concurrent.NotThreadSafe;
+
+import org.apache.phoenix.end2end.ParallelStatsDisabledIT;
+import org.apache.phoenix.end2end.Shadower;
+import org.apache.phoenix.query.QueryConstants;
+import org.apache.phoenix.query.QueryServices;
+import org.apache.phoenix.util.ReadOnlyProps;
+import org.apache.phoenix.util.TestUtil;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+import com.google.common.collect.Maps;
+
+@NotThreadSafe
+public class NotThreadSafeTransactionIT extends ParallelStatsDisabledIT {
+
+ @BeforeClass
+ @Shadower(classBeingShadowed = ParallelStatsDisabledIT.class)
+ public static void doSetup() throws Exception {
+ Map<String,String> props = Maps.newHashMapWithExpectedSize(1);
+ props.put(QueryServices.TRANSACTIONS_ENABLED, Boolean.toString(true));
+ setUpTestDriver(new ReadOnlyProps(props.entrySet().iterator()));
+ }
+
+ @Test
+ public void testInflightUpdateNotSeen() throws Exception {
+ String transTableName = generateUniqueName();
+ String fullTableName = INDEX_DATA_SCHEMA + QueryConstants.NAME_SEPARATOR + transTableName;
+ String selectSQL = "SELECT * FROM " + fullTableName;
+ try (Connection conn = DriverManager.getConnection(getUrl());
+ Connection conn1 = DriverManager.getConnection(getUrl());
+ Connection conn2 = DriverManager.getConnection(getUrl())) {
+ createTransactionalTable(conn, fullTableName);
+ conn1.setAutoCommit(false);
+ conn2.setAutoCommit(true);
+ ResultSet rs = conn1.createStatement().executeQuery(selectSQL);
+ assertFalse(rs.next());
+
+ String upsert = "UPSERT INTO " + fullTableName + "(varchar_pk, char_pk, int_pk, long_pk, decimal_pk, date_pk) VALUES(?, ?, ?, ?, ?, ?)";
+ PreparedStatement stmt = conn1.prepareStatement(upsert);
+ // upsert two rows
+ TestUtil.setRowKeyColumns(stmt, 1);
+ stmt.execute();
+ conn1.commit();
+
+ TestUtil.setRowKeyColumns(stmt, 2);
+ stmt.execute();
+
+ rs = conn1.createStatement().executeQuery("SELECT count(*) FROM " + fullTableName + " WHERE int_col1 IS NULL");
+ assertTrue(rs.next());
+ assertEquals(2, rs.getInt(1));
+
+ upsert = "UPSERT INTO " + fullTableName + "(varchar_pk, char_pk, int_pk, long_pk, decimal_pk, date_pk, int_col1) VALUES(?, ?, ?, ?, ?, ?, 1)";
+ stmt = conn1.prepareStatement(upsert);
+ TestUtil.setRowKeyColumns(stmt, 1);
+ stmt.execute();
+
+ rs = conn1.createStatement().executeQuery("SELECT int_col1 FROM " + fullTableName + " WHERE int_col1 = 1");
+ assertTrue(rs.next());
+ assertEquals(1, rs.getInt(1));
+ assertFalse(rs.next());
+
+ rs = conn2.createStatement().executeQuery("SELECT count(*) FROM " + fullTableName + " WHERE int_col1 = 1");
+ assertTrue(rs.next());
+ assertEquals(0, rs.getInt(1));
+ rs = conn2.createStatement().executeQuery("SELECT * FROM " + fullTableName + " WHERE int_col1 = 1");
+ assertFalse(rs.next());
+
+ conn1.commit();
+
+ rs = conn2.createStatement().executeQuery("SELECT count(*) FROM " + fullTableName + " WHERE int_col1 = 1");
+ assertTrue(rs.next());
+ assertEquals(1, rs.getInt(1));
+ rs = conn2.createStatement().executeQuery("SELECT * FROM " + fullTableName + " WHERE int_col1 = 1");
+ assertTrue(rs.next());
+ assertFalse(rs.next());
+ }
+ }
+
+ @Test
+ public void testInflightDeleteNotSeen() throws Exception {
+ String transTableName = generateUniqueName();
+ String fullTableName = INDEX_DATA_SCHEMA + QueryConstants.NAME_SEPARATOR + transTableName;
+ String selectSQL = "SELECT * FROM " + fullTableName;
+ try (Connection conn = DriverManager.getConnection(getUrl());
+ Connection conn1 = DriverManager.getConnection(getUrl());
+ Connection conn2 = DriverManager.getConnection(getUrl())) {
+ createTransactionalTable(conn, fullTableName);
+ conn1.setAutoCommit(false);
+ conn2.setAutoCommit(true);
+ ResultSet rs = conn1.createStatement().executeQuery(selectSQL);
+ assertFalse(rs.next());
+
+ String upsert = "UPSERT INTO " + fullTableName + "(varchar_pk, char_pk, int_pk, long_pk, decimal_pk, date_pk) VALUES(?, ?, ?, ?, ?, ?)";
+ PreparedStatement stmt = conn1.prepareStatement(upsert);
+ // upsert two rows
+ TestUtil.setRowKeyColumns(stmt, 1);
+ stmt.execute();
+ TestUtil.setRowKeyColumns(stmt, 2);
+ stmt.execute();
+
+ conn1.commit();
+
+ rs = conn1.createStatement().executeQuery("SELECT count(*) FROM " + fullTableName);
+ assertTrue(rs.next());
+ assertEquals(2, rs.getInt(1));
+
+ String delete = "DELETE FROM " + fullTableName + " WHERE varchar_pk = 'varchar1'";
+ stmt = conn1.prepareStatement(delete);
+ int count = stmt.executeUpdate();
+ assertEquals(1,count);
+
+ rs = conn1.createStatement().executeQuery("SELECT count(*) FROM " + fullTableName);
+ assertTrue(rs.next());
+ assertEquals(1, rs.getInt(1));
+ assertFalse(rs.next());
+
+ rs = conn2.createStatement().executeQuery("SELECT count(*) FROM " + fullTableName);
+ assertTrue(rs.next());
+ assertEquals(2, rs.getInt(1));
+ assertFalse(rs.next());
+
+ conn1.commit();
+
+ rs = conn2.createStatement().executeQuery("SELECT count(*) FROM " + fullTableName);
+ assertTrue(rs.next());
+ assertEquals(1, rs.getInt(1));
+ assertFalse(rs.next());
+ }
+ }
+
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/phoenix/blob/bebb5ced/phoenix-core/src/it/java/org/apache/phoenix/tx/TransactionIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/tx/TransactionIT.java b/phoenix-core/src/it/java/org/apache/phoenix/tx/TransactionIT.java
index c219158..bf99c4b 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/tx/TransactionIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/tx/TransactionIT.java
@@ -60,6 +60,7 @@ import org.apache.phoenix.schema.types.PInteger;
import org.apache.phoenix.util.ByteUtil;
import org.apache.phoenix.util.PropertiesUtil;
import org.apache.phoenix.util.ReadOnlyProps;
+import org.apache.phoenix.util.StringUtil;
import org.apache.phoenix.util.TestUtil;
import org.apache.tephra.TransactionContext;
import org.apache.tephra.TransactionSystemClient;
@@ -83,17 +84,13 @@ public class TransactionIT extends ParallelStatsDisabledIT {
setUpTestDriver(new ReadOnlyProps(props.entrySet().iterator()));
}
- private static void createTable(Connection conn, String tableName) throws SQLException {
- conn.createStatement().execute("create table " + tableName + TEST_TABLE_SCHEMA + "TRANSACTIONAL=true");
- }
-
@Test
public void testReadOwnWrites() throws Exception {
- String transTableName = generateRandomString();
+ String transTableName = generateUniqueName();
String fullTableName = INDEX_DATA_SCHEMA + QueryConstants.NAME_SEPARATOR + transTableName;
String selectSql = "SELECT * FROM "+ fullTableName;
try (Connection conn = DriverManager.getConnection(getUrl())) {
- createTable(conn, fullTableName);
+ TestUtil.createTransactionalTable(conn, fullTableName);
conn.setAutoCommit(false);
ResultSet rs = conn.createStatement().executeQuery(selectSql);
assertFalse(rs.next());
@@ -124,11 +121,11 @@ public class TransactionIT extends ParallelStatsDisabledIT {
@Test
public void testTxnClosedCorrecty() throws Exception {
- String transTableName = generateRandomString();
+ String transTableName = generateUniqueName();
String fullTableName = INDEX_DATA_SCHEMA + QueryConstants.NAME_SEPARATOR + transTableName;
String selectSql = "SELECT * FROM "+fullTableName;
try (Connection conn = DriverManager.getConnection(getUrl())) {
- createTable(conn, fullTableName);
+ TestUtil.createTransactionalTable(conn, fullTableName);
conn.setAutoCommit(false);
ResultSet rs = conn.createStatement().executeQuery(selectSql);
assertFalse(rs.next());
@@ -158,13 +155,13 @@ public class TransactionIT extends ParallelStatsDisabledIT {
@Test
public void testDelete() throws Exception {
- String transTableName = generateRandomString();
+ String transTableName = generateUniqueName();
String fullTableName = INDEX_DATA_SCHEMA + QueryConstants.NAME_SEPARATOR + transTableName;
String selectSQL = "SELECT * FROM " + fullTableName;
try (Connection conn = DriverManager.getConnection(getUrl());
Connection conn1 = DriverManager.getConnection(getUrl());
Connection conn2 = DriverManager.getConnection(getUrl())) {
- createTable(conn, fullTableName);
+ TestUtil.createTransactionalTable(conn, fullTableName);
conn1.setAutoCommit(false);
ResultSet rs = conn1.createStatement().executeQuery(selectSQL);
assertFalse(rs.next());
@@ -198,10 +195,10 @@ public class TransactionIT extends ParallelStatsDisabledIT {
@Test
public void testAutoCommitQuerySingleTable() throws Exception {
- String transTableName = generateRandomString();
+ String transTableName = generateUniqueName();
String fullTableName = INDEX_DATA_SCHEMA + QueryConstants.NAME_SEPARATOR + transTableName;
try (Connection conn = DriverManager.getConnection(getUrl())) {
- createTable(conn, fullTableName);
+ TestUtil.createTransactionalTable(conn, fullTableName);
conn.setAutoCommit(true);
// verify no rows returned
ResultSet rs = conn.createStatement().executeQuery("SELECT * FROM " + fullTableName);
@@ -211,10 +208,10 @@ public class TransactionIT extends ParallelStatsDisabledIT {
@Test
public void testAutoCommitQueryMultiTables() throws Exception {
- String transTableName = generateRandomString();
+ String transTableName = generateUniqueName();
String fullTableName = INDEX_DATA_SCHEMA + QueryConstants.NAME_SEPARATOR + transTableName;
try (Connection conn = DriverManager.getConnection(getUrl())) {
- createTable(conn, fullTableName);
+ TestUtil.createTransactionalTable(conn, fullTableName);
conn.setAutoCommit(true);
// verify no rows returned
ResultSet rs = conn.createStatement().executeQuery("SELECT * FROM " + fullTableName + " a JOIN " + fullTableName + " b ON (a.long_pk = b.int_pk)");
@@ -224,11 +221,11 @@ public class TransactionIT extends ParallelStatsDisabledIT {
@Test
public void testColConflicts() throws Exception {
- String transTableName = generateRandomString();
+ String transTableName = generateUniqueName();
String fullTableName = INDEX_DATA_SCHEMA + QueryConstants.NAME_SEPARATOR + transTableName;
try (Connection conn1 = DriverManager.getConnection(getUrl());
Connection conn2 = DriverManager.getConnection(getUrl())) {
- createTable(conn1, fullTableName);
+ TestUtil.createTransactionalTable(conn1, fullTableName);
conn1.setAutoCommit(false);
conn2.setAutoCommit(false);
String selectSql = "SELECT * FROM "+fullTableName;
@@ -297,26 +294,26 @@ public class TransactionIT extends ParallelStatsDisabledIT {
@Test
public void testRowConflictDetected() throws Exception {
- String transTableName = generateRandomString();
+ String transTableName = generateUniqueName();
String fullTableName = INDEX_DATA_SCHEMA + QueryConstants.NAME_SEPARATOR + transTableName;
Connection conn = DriverManager.getConnection(getUrl());
- createTable(conn, fullTableName);
+ TestUtil.createTransactionalTable(conn, fullTableName);
testRowConflicts(fullTableName);
}
@Test
public void testNoConflictDetectionForImmutableRows() throws Exception {
- String transTableName = generateRandomString();
+ String transTableName = generateUniqueName();
String fullTableName = INDEX_DATA_SCHEMA + QueryConstants.NAME_SEPARATOR + transTableName;
Connection conn = DriverManager.getConnection(getUrl());
- createTable(conn, fullTableName);
+ TestUtil.createTransactionalTable(conn, fullTableName);
conn.createStatement().execute("ALTER TABLE " + fullTableName + " SET IMMUTABLE_ROWS=true");
testRowConflicts(fullTableName);
}
@Test
public void testNonTxToTxTable() throws Exception {
- String nonTxTableName = generateRandomString();
+ String nonTxTableName = generateUniqueName();
Connection conn = DriverManager.getConnection(getUrl());
conn.createStatement().execute("CREATE TABLE " + nonTxTableName + "(k INTEGER PRIMARY KEY, v VARCHAR)");
@@ -380,7 +377,7 @@ public class TransactionIT extends ParallelStatsDisabledIT {
@Ignore
@Test
public void testNonTxToTxTableFailure() throws Exception {
- String nonTxTableName = generateRandomString();
+ String nonTxTableName = generateUniqueName();
Connection conn = DriverManager.getConnection(getUrl());
// Put table in SYSTEM schema to prevent attempts to update the cache after we disable SYSTEM.CATALOG
@@ -422,7 +419,7 @@ public class TransactionIT extends ParallelStatsDisabledIT {
@Test
public void testProperties() throws Exception {
- String nonTxTableName = generateRandomString();
+ String nonTxTableName = generateUniqueName();
Connection conn = DriverManager.getConnection(getUrl());
conn.createStatement().execute("CREATE TABLE " + nonTxTableName + "1(k INTEGER PRIMARY KEY, a.v VARCHAR, b.v VARCHAR, c.v VARCHAR) TTL=1000");
@@ -503,8 +500,8 @@ public class TransactionIT extends ParallelStatsDisabledIT {
public void testCreateTableToBeTransactional() throws Exception {
Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
Connection conn = DriverManager.getConnection(getUrl(), props);
- String t1 = generateRandomString();
- String t2 = generateRandomString();
+ String t1 = generateUniqueName();
+ String t2 = generateUniqueName();
String ddl = "CREATE TABLE " + t1 + " (k varchar primary key) transactional=true";
conn.createStatement().execute(ddl);
PhoenixConnection pconn = conn.unwrap(PhoenixConnection.class);
@@ -547,11 +544,11 @@ public class TransactionIT extends ParallelStatsDisabledIT {
@Test
public void testCurrentDate() throws Exception {
- String transTableName = generateRandomString();
+ String transTableName = generateUniqueName();
String fullTableName = INDEX_DATA_SCHEMA + QueryConstants.NAME_SEPARATOR + transTableName;
String selectSql = "SELECT current_date() FROM "+fullTableName;
try (Connection conn = DriverManager.getConnection(getUrl())) {
- createTable(conn, fullTableName);
+ TestUtil.createTransactionalTable(conn, fullTableName);
conn.setAutoCommit(false);
ResultSet rs = conn.createStatement().executeQuery(selectSql);
assertFalse(rs.next());
@@ -580,7 +577,7 @@ public class TransactionIT extends ParallelStatsDisabledIT {
@Test
public void testReCreateTxnTableAfterDroppingExistingNonTxnTable() throws SQLException {
- String tableName = generateRandomString();
+ String tableName = generateUniqueName();
Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
Connection conn = DriverManager.getConnection(getUrl(), props);
conn.setAutoCommit(false);
@@ -595,7 +592,7 @@ public class TransactionIT extends ParallelStatsDisabledIT {
@Test
public void testRowTimestampDisabled() throws SQLException {
- String tableName = generateRandomString();
+ String tableName = generateUniqueName();
Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
try (Connection conn = DriverManager.getConnection(getUrl(), props)) {
conn.setAutoCommit(false);
@@ -624,7 +621,7 @@ public class TransactionIT extends ParallelStatsDisabledIT {
Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
Connection conn = DriverManager.getConnection(getUrl(), props);
conn.setAutoCommit(false);
- String fullTableName = generateRandomString();
+ String fullTableName = generateUniqueName();
PhoenixConnection pconn = conn.unwrap(PhoenixConnection.class);
TransactionSystemClient txServiceClient = pconn.getQueryServices().getTransactionSystemClient();
@@ -743,7 +740,7 @@ public class TransactionIT extends ParallelStatsDisabledIT {
public void testCheckpointAndRollback() throws Exception {
Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
Connection conn = DriverManager.getConnection(getUrl(), props);
- String fullTableName = generateRandomString();
+ String fullTableName = generateUniqueName();
conn.setAutoCommit(false);
try {
Statement stmt = conn.createStatement();
@@ -784,113 +781,6 @@ public class TransactionIT extends ParallelStatsDisabledIT {
}
@Test
- public void testInflightUpdateNotSeen() throws Exception {
- String transTableName = generateRandomString();
- String fullTableName = INDEX_DATA_SCHEMA + QueryConstants.NAME_SEPARATOR + transTableName;
- String selectSQL = "SELECT * FROM " + fullTableName;
- try (Connection conn = DriverManager.getConnection(getUrl());
- Connection conn1 = DriverManager.getConnection(getUrl());
- Connection conn2 = DriverManager.getConnection(getUrl())) {
- createTable(conn, fullTableName);
- conn1.setAutoCommit(false);
- conn2.setAutoCommit(true);
- ResultSet rs = conn1.createStatement().executeQuery(selectSQL);
- assertFalse(rs.next());
-
- String upsert = "UPSERT INTO " + fullTableName + "(varchar_pk, char_pk, int_pk, long_pk, decimal_pk, date_pk) VALUES(?, ?, ?, ?, ?, ?)";
- PreparedStatement stmt = conn1.prepareStatement(upsert);
- // upsert two rows
- TestUtil.setRowKeyColumns(stmt, 1);
- stmt.execute();
- conn1.commit();
-
- TestUtil.setRowKeyColumns(stmt, 2);
- stmt.execute();
-
- rs = conn1.createStatement().executeQuery("SELECT count(*) FROM " + fullTableName + " WHERE int_col1 IS NULL");
- assertTrue(rs.next());
- assertEquals(2, rs.getInt(1));
-
- upsert = "UPSERT INTO " + fullTableName + "(varchar_pk, char_pk, int_pk, long_pk, decimal_pk, date_pk, int_col1) VALUES(?, ?, ?, ?, ?, ?, 1)";
- stmt = conn1.prepareStatement(upsert);
- TestUtil.setRowKeyColumns(stmt, 1);
- stmt.execute();
-
- rs = conn1.createStatement().executeQuery("SELECT int_col1 FROM " + fullTableName + " WHERE int_col1 = 1");
- assertTrue(rs.next());
- assertEquals(1, rs.getInt(1));
- assertFalse(rs.next());
-
- rs = conn2.createStatement().executeQuery("SELECT count(*) FROM " + fullTableName + " WHERE int_col1 = 1");
- assertTrue(rs.next());
- assertEquals(0, rs.getInt(1));
- rs = conn2.createStatement().executeQuery("SELECT * FROM " + fullTableName + " WHERE int_col1 = 1");
- assertFalse(rs.next());
-
- conn1.commit();
-
- rs = conn2.createStatement().executeQuery("SELECT count(*) FROM " + fullTableName + " WHERE int_col1 = 1");
- assertTrue(rs.next());
- assertEquals(1, rs.getInt(1));
- rs = conn2.createStatement().executeQuery("SELECT * FROM " + fullTableName + " WHERE int_col1 = 1");
- assertTrue(rs.next());
- assertFalse(rs.next());
- }
- }
-
- @Test
- public void testInflightDeleteNotSeen() throws Exception {
- String transTableName = generateRandomString();
- String fullTableName = INDEX_DATA_SCHEMA + QueryConstants.NAME_SEPARATOR + transTableName;
- String selectSQL = "SELECT * FROM " + fullTableName;
- try (Connection conn = DriverManager.getConnection(getUrl());
- Connection conn1 = DriverManager.getConnection(getUrl());
- Connection conn2 = DriverManager.getConnection(getUrl())) {
- createTable(conn, fullTableName);
- conn1.setAutoCommit(false);
- conn2.setAutoCommit(true);
- ResultSet rs = conn1.createStatement().executeQuery(selectSQL);
- assertFalse(rs.next());
-
- String upsert = "UPSERT INTO " + fullTableName + "(varchar_pk, char_pk, int_pk, long_pk, decimal_pk, date_pk) VALUES(?, ?, ?, ?, ?, ?)";
- PreparedStatement stmt = conn1.prepareStatement(upsert);
- // upsert two rows
- TestUtil.setRowKeyColumns(stmt, 1);
- stmt.execute();
- TestUtil.setRowKeyColumns(stmt, 2);
- stmt.execute();
-
- conn1.commit();
-
- rs = conn1.createStatement().executeQuery("SELECT count(*) FROM " + fullTableName);
- assertTrue(rs.next());
- assertEquals(2, rs.getInt(1));
-
- String delete = "DELETE FROM " + fullTableName + " WHERE varchar_pk = 'varchar1'";
- stmt = conn1.prepareStatement(delete);
- int count = stmt.executeUpdate();
- assertEquals(1,count);
-
- rs = conn1.createStatement().executeQuery("SELECT count(*) FROM " + fullTableName);
- assertTrue(rs.next());
- assertEquals(1, rs.getInt(1));
- assertFalse(rs.next());
-
- rs = conn2.createStatement().executeQuery("SELECT count(*) FROM " + fullTableName);
- assertTrue(rs.next());
- assertEquals(2, rs.getInt(1));
- assertFalse(rs.next());
-
- conn1.commit();
-
- rs = conn2.createStatement().executeQuery("SELECT count(*) FROM " + fullTableName);
- assertTrue(rs.next());
- assertEquals(1, rs.getInt(1));
- assertFalse(rs.next());
- }
- }
-
- @Test
public void testParallelUpsertSelect() throws Exception {
Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
props.setProperty(QueryServices.MUTATE_BATCH_SIZE_ATTRIB, Integer.toString(3));
@@ -898,16 +788,19 @@ public class TransactionIT extends ParallelStatsDisabledIT {
props.setProperty(QueryServices.SCAN_RESULT_CHUNK_SIZE, Integer.toString(3));
Connection conn = DriverManager.getConnection(getUrl(), props);
conn.setAutoCommit(false);
- conn.createStatement().execute("CREATE SEQUENCE S1");
- conn.createStatement().execute("CREATE TABLE SALTEDT1 (pk INTEGER PRIMARY KEY, val INTEGER) SALT_BUCKETS=4,TRANSACTIONAL=true");
- conn.createStatement().execute("CREATE TABLE T2 (pk INTEGER PRIMARY KEY, val INTEGER) TRANSACTIONAL=true");
+ String fullTableName1 = generateUniqueName();
+ String fullTableName2 = generateUniqueName();
+ String sequenceName = "S_" + generateUniqueName();
+ conn.createStatement().execute("CREATE SEQUENCE " + sequenceName);
+ conn.createStatement().execute("CREATE TABLE " + fullTableName1 + " (pk INTEGER PRIMARY KEY, val INTEGER) SALT_BUCKETS=4,TRANSACTIONAL=true");
+ conn.createStatement().execute("CREATE TABLE " + fullTableName2 + " (pk INTEGER PRIMARY KEY, val INTEGER) TRANSACTIONAL=true");
for (int i = 0; i < 100; i++) {
- conn.createStatement().execute("UPSERT INTO SALTEDT1 VALUES (NEXT VALUE FOR S1, " + (i%10) + ")");
+ conn.createStatement().execute("UPSERT INTO " + fullTableName1 + " VALUES (NEXT VALUE FOR " + sequenceName + ", " + (i%10) + ")");
}
conn.commit();
conn.setAutoCommit(true);
- int upsertCount = conn.createStatement().executeUpdate("UPSERT INTO T2 SELECT pk, val FROM SALTEDT1");
+ int upsertCount = conn.createStatement().executeUpdate("UPSERT INTO " + fullTableName2 + " SELECT pk, val FROM " + fullTableName1);
assertEquals(100,upsertCount);
conn.close();
}
@@ -916,24 +809,24 @@ public class TransactionIT extends ParallelStatsDisabledIT {
public void testTransactionalTableMetadata() throws SQLException {
try (Connection conn = DriverManager.getConnection(getUrl())) {
- String transactTableName = "TR";
+ String transactTableName = generateUniqueName();
Statement stmt = conn.createStatement();
stmt.execute("CREATE TABLE " + transactTableName + " (k VARCHAR PRIMARY KEY, v1 VARCHAR, v2 VARCHAR) " +
"TRANSACTIONAL=true");
conn.commit();
DatabaseMetaData dbmd = conn.getMetaData();
- ResultSet rs = dbmd.getTables(null, null, transactTableName, null);
+ ResultSet rs = dbmd.getTables(null, null, StringUtil.escapeLike(transactTableName), null);
assertTrue(rs.next());
assertEquals("Transactional table was not marked as transactional in JDBC API.",
"true", rs.getString(PhoenixDatabaseMetaData.TRANSACTIONAL));
- String nonTransactTableName = "NOTR";
+ String nonTransactTableName = generateUniqueName();
Statement stmt2 = conn.createStatement();
stmt2.execute("CREATE TABLE " + nonTransactTableName + "(k VARCHAR PRIMARY KEY, v1 VARCHAR, v2 VARCHAR) ");
conn.commit();
- ResultSet rs2 = dbmd.getTables(null, null, nonTransactTableName, null);
+ ResultSet rs2 = dbmd.getTables(null, null, StringUtil.escapeLike(nonTransactTableName), null);
assertTrue(rs2.next());
assertEquals("Non-transactional table was marked as transactional in JDBC API.",
"false", rs2.getString(PhoenixDatabaseMetaData.TRANSACTIONAL));
@@ -944,7 +837,7 @@ public class TransactionIT extends ParallelStatsDisabledIT {
public void testInflightPartialEval() throws SQLException {
try (Connection conn = DriverManager.getConnection(getUrl())) {
- String transactTableName = "TR" + generateRandomString();
+ String transactTableName = generateUniqueName();
Statement stmt = conn.createStatement();
stmt.execute("CREATE TABLE " + transactTableName + " (k VARCHAR PRIMARY KEY, v1 VARCHAR, v2 VARCHAR) " +
"TRANSACTIONAL=true");
http://git-wip-us.apache.org/repos/asf/phoenix/blob/bebb5ced/phoenix-core/src/it/java/org/apache/phoenix/tx/TxCheckpointIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/tx/TxCheckpointIT.java b/phoenix-core/src/it/java/org/apache/phoenix/tx/TxCheckpointIT.java
index 5a42a97..21ea072 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/tx/TxCheckpointIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/tx/TxCheckpointIT.java
@@ -80,9 +80,9 @@ public class TxCheckpointIT extends ParallelStatsDisabledIT {
@Test
public void testUpsertSelectDoesntSeeUpsertedData() throws Exception {
- String tableName = "TBL_" + generateRandomString();
- String indexName = "IDX_" + generateRandomString();
- String seqName = "SEQ_" + generateRandomString();
+ String tableName = "TBL_" + generateUniqueName();
+ String indexName = "IDX_" + generateUniqueName();
+ String seqName = "SEQ_" + generateUniqueName();
String fullTableName = SchemaUtil.getTableName(tableName, tableName);
Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
props.setProperty(QueryServices.MUTATE_BATCH_SIZE_ATTRIB, Integer.toString(3));
@@ -105,8 +105,8 @@ public class TxCheckpointIT extends ParallelStatsDisabledIT {
@Test
public void testRollbackOfUncommittedDeleteSingleCol() throws Exception {
- String tableName = "TBL_" + generateRandomString();
- String indexName = "IDX_" + generateRandomString();
+ String tableName = "TBL_" + generateUniqueName();
+ String indexName = "IDX_" + generateUniqueName();
String fullTableName = SchemaUtil.getTableName(tableName, tableName);
String indexDDL = "CREATE "+(localIndex? "LOCAL " : "")+"INDEX " + indexName + " ON " + fullTableName + " (v1) INCLUDE(v2)";
testRollbackOfUncommittedDelete(indexDDL, fullTableName);
@@ -114,8 +114,8 @@ public class TxCheckpointIT extends ParallelStatsDisabledIT {
@Test
public void testRollbackOfUncommittedDeleteMultiCol() throws Exception {
- String tableName = "TBL_" + generateRandomString();
- String indexName = "IDX_" + generateRandomString();
+ String tableName = "TBL_" + generateUniqueName();
+ String indexName = "IDX_" + generateUniqueName();
String fullTableName = SchemaUtil.getTableName(tableName, tableName);
String indexDDL = "CREATE "+(localIndex? "LOCAL " : "")+"INDEX " + indexName + " ON " + fullTableName + " (v1, v2)";
testRollbackOfUncommittedDelete(indexDDL, fullTableName);
@@ -208,8 +208,8 @@ public class TxCheckpointIT extends ParallelStatsDisabledIT {
@Test
public void testCheckpointForUpsertSelect() throws Exception {
- String tableName = "TBL_" + generateRandomString();
- String indexName = "IDX_" + generateRandomString();
+ String tableName = "TBL_" + generateUniqueName();
+ String indexName = "IDX_" + generateUniqueName();
String fullTableName = SchemaUtil.getTableName(tableName, tableName);
Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
try (Connection conn = DriverManager.getConnection(getUrl(), props);) {
@@ -298,8 +298,8 @@ public class TxCheckpointIT extends ParallelStatsDisabledIT {
@Test
public void testCheckpointForDeleteAndUpsert() throws Exception {
- String tableName = "TBL_" + generateRandomString();
- String indexName = "IDX_" + generateRandomString();
+ String tableName = "TBL_" + generateUniqueName();
+ String indexName = "IDX_" + generateUniqueName();
String fullTableName = SchemaUtil.getTableName(tableName, tableName);
Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
ResultSet rs;
http://git-wip-us.apache.org/repos/asf/phoenix/blob/bebb5ced/phoenix-core/src/test/java/org/apache/phoenix/query/BaseTest.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/test/java/org/apache/phoenix/query/BaseTest.java b/phoenix-core/src/test/java/org/apache/phoenix/query/BaseTest.java
index 7d7abef..7008911 100644
--- a/phoenix-core/src/test/java/org/apache/phoenix/query/BaseTest.java
+++ b/phoenix-core/src/test/java/org/apache/phoenix/query/BaseTest.java
@@ -111,10 +111,10 @@ import java.util.concurrent.Future;
import java.util.concurrent.ThreadFactory;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
+import java.util.concurrent.atomic.AtomicInteger;
import javax.annotation.Nonnull;
-import org.apache.commons.lang.RandomStringUtils;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hbase.HBaseConfiguration;
import org.apache.hadoop.hbase.HBaseTestingUtility;
@@ -189,26 +189,6 @@ import com.google.inject.util.Providers;
*/
public abstract class BaseTest {
- protected static final String TEST_TABLE_SCHEMA = "(" +
- " varchar_pk VARCHAR NOT NULL, " +
- " char_pk CHAR(10) NOT NULL, " +
- " int_pk INTEGER NOT NULL, "+
- " long_pk BIGINT NOT NULL, " +
- " decimal_pk DECIMAL(31, 10) NOT NULL, " +
- " date_pk DATE NOT NULL, " +
- " a.varchar_col1 VARCHAR, " +
- " a.char_col1 CHAR(10), " +
- " a.int_col1 INTEGER, " +
- " a.long_col1 BIGINT, " +
- " a.decimal_col1 DECIMAL(31, 10), " +
- " a.date1 DATE, " +
- " b.varchar_col2 VARCHAR, " +
- " b.char_col2 CHAR(10), " +
- " b.int_col2 INTEGER, " +
- " b.long_col2 BIGINT, " +
- " b.decimal_col2 DECIMAL(31, 10), " +
- " b.date2 DATE " +
- " CONSTRAINT pk PRIMARY KEY (varchar_pk, char_pk, int_pk, long_pk DESC, decimal_pk, date_pk)) ";
private static final Map<String,String> tableDDLMap;
private static final Logger logger = LoggerFactory.getLogger(BaseTest.class);
protected static final int DEFAULT_TXN_TIMEOUT_SECONDS = 30;
@@ -801,8 +781,16 @@ public abstract class BaseTest {
createTestTable(url, ddl, splits, ts);
}
- public static String generateRandomString() {
- return RandomStringUtils.randomAlphabetic(20).toUpperCase();
+ private static AtomicInteger NAME_SUFFIX = new AtomicInteger(0);
+ private static final int MAX_SUFFIX_VALUE = 1000000;
+
+ public static String generateUniqueName() {
+ int nextName = NAME_SUFFIX.incrementAndGet();
+ if (nextName >= MAX_SUFFIX_VALUE) {
+ throw new IllegalStateException("Used up all unique names");
+ }
+ return "T" + Integer.toString(MAX_SUFFIX_VALUE + nextName).substring(1);
+ //return RandomStringUtils.randomAlphabetic(20).toUpperCase();
}
protected static void createTestTable(String url, String ddl) throws SQLException {
@@ -1112,7 +1100,7 @@ public abstract class BaseTest {
protected static String initATableValues(String tableName, String tenantId, byte[][] splits, Date date, Long ts, String url) throws Exception {
if(tableName == null) {
- tableName = generateRandomString();
+ tableName = generateUniqueName();
}
String tableDDLType = ATABLE_NAME;
if (ts == null) {
http://git-wip-us.apache.org/repos/asf/phoenix/blob/bebb5ced/phoenix-core/src/test/java/org/apache/phoenix/util/TestUtil.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/test/java/org/apache/phoenix/util/TestUtil.java b/phoenix-core/src/test/java/org/apache/phoenix/util/TestUtil.java
index 50180d1..de5af46 100644
--- a/phoenix-core/src/test/java/org/apache/phoenix/util/TestUtil.java
+++ b/phoenix-core/src/test/java/org/apache/phoenix/util/TestUtil.java
@@ -17,7 +17,7 @@
*/
package org.apache.phoenix.util;
-import static org.apache.phoenix.query.BaseTest.generateRandomString;
+import static org.apache.phoenix.query.BaseTest.generateUniqueName;
import static org.apache.phoenix.query.QueryConstants.MILLIS_IN_DAY;
import static org.apache.phoenix.query.QueryConstants.SINGLE_COLUMN_FAMILY_NAME;
import static org.apache.phoenix.query.QueryConstants.SINGLE_COLUMN_NAME;
@@ -125,6 +125,27 @@ public class TestUtil {
public static final String DEFAULT_INDEX_TABLE_NAME = "I";
public static final String DEFAULT_DATA_TABLE_FULL_NAME = SchemaUtil.getTableName(DEFAULT_SCHEMA_NAME, "T");
public static final String DEFAULT_INDEX_TABLE_FULL_NAME = SchemaUtil.getTableName(DEFAULT_SCHEMA_NAME, "I");
+
+ public static final String TEST_TABLE_SCHEMA = "(" +
+ " varchar_pk VARCHAR NOT NULL, " +
+ " char_pk CHAR(10) NOT NULL, " +
+ " int_pk INTEGER NOT NULL, "+
+ " long_pk BIGINT NOT NULL, " +
+ " decimal_pk DECIMAL(31, 10) NOT NULL, " +
+ " date_pk DATE NOT NULL, " +
+ " a.varchar_col1 VARCHAR, " +
+ " a.char_col1 CHAR(10), " +
+ " a.int_col1 INTEGER, " +
+ " a.long_col1 BIGINT, " +
+ " a.decimal_col1 DECIMAL(31, 10), " +
+ " a.date1 DATE, " +
+ " b.varchar_col2 VARCHAR, " +
+ " b.char_col2 CHAR(10), " +
+ " b.int_col2 INTEGER, " +
+ " b.long_col2 BIGINT, " +
+ " b.decimal_col2 DECIMAL(31, 10), " +
+ " b.date2 DATE " +
+ " CONSTRAINT pk PRIMARY KEY (varchar_pk, char_pk, int_pk, long_pk DESC, decimal_pk, date_pk)) ";
private TestUtil() {
}
@@ -509,7 +530,7 @@ public class TestUtil {
* list of values to be inserted into the pk column
*/
public static String initTables(Connection conn, String inputSqlType, List<Object> inputList) throws Exception {
- String tableName = generateRandomString();
+ String tableName = generateUniqueName();
createTable(conn, inputSqlType, tableName, "ASC");
createTable(conn, inputSqlType, tableName, "DESC");
for (int i = 0; i < inputList.size(); ++i) {
@@ -768,5 +789,9 @@ public class TestUtil {
}
}
}
+
+ public static void createTransactionalTable(Connection conn, String tableName) throws SQLException {
+ conn.createStatement().execute("create table " + tableName + TestUtil.TEST_TABLE_SCHEMA + "TRANSACTIONAL=true");
+ }
}
http://git-wip-us.apache.org/repos/asf/phoenix/blob/bebb5ced/phoenix-flume/src/it/java/org/apache/phoenix/flume/PhoenixSinkIT.java
----------------------------------------------------------------------
diff --git a/phoenix-flume/src/it/java/org/apache/phoenix/flume/PhoenixSinkIT.java b/phoenix-flume/src/it/java/org/apache/phoenix/flume/PhoenixSinkIT.java
index 2d52fc2..e78a964 100644
--- a/phoenix-flume/src/it/java/org/apache/phoenix/flume/PhoenixSinkIT.java
+++ b/phoenix-flume/src/it/java/org/apache/phoenix/flume/PhoenixSinkIT.java
@@ -131,7 +131,7 @@ public class PhoenixSinkIT extends BaseHBaseManagedTimeIT {
@Test
public void testSinkLifecycle () {
- String tableName = generateRandomString();
+ String tableName = generateUniqueName();
String ddl = "CREATE TABLE " + tableName +
" (flume_time timestamp not null, col1 varchar , col2 varchar" +
@@ -162,7 +162,7 @@ public class PhoenixSinkIT extends BaseHBaseManagedTimeIT {
@Test
public void testCreateTable () throws Exception {
- String tableName = generateRandomString();
+ String tableName = generateUniqueName();
String ddl = "CREATE TABLE " + tableName + " " +
" (flume_time timestamp not null, col1 varchar , col2 varchar" +
" CONSTRAINT pk PRIMARY KEY (flume_time))\n";
http://git-wip-us.apache.org/repos/asf/phoenix/blob/bebb5ced/phoenix-flume/src/it/java/org/apache/phoenix/flume/RegexEventSerializerIT.java
----------------------------------------------------------------------
diff --git a/phoenix-flume/src/it/java/org/apache/phoenix/flume/RegexEventSerializerIT.java b/phoenix-flume/src/it/java/org/apache/phoenix/flume/RegexEventSerializerIT.java
index 7348a65..9548e65 100644
--- a/phoenix-flume/src/it/java/org/apache/phoenix/flume/RegexEventSerializerIT.java
+++ b/phoenix-flume/src/it/java/org/apache/phoenix/flume/RegexEventSerializerIT.java
@@ -59,7 +59,7 @@ public class RegexEventSerializerIT extends BaseHBaseManagedTimeIT {
@Test
public void testKeyGenerator() throws EventDeliveryException, SQLException {
- final String fullTableName = generateRandomString();
+ final String fullTableName = generateUniqueName();
initSinkContextWithDefaults(fullTableName);
sink = new PhoenixSink();
@@ -94,7 +94,7 @@ public class RegexEventSerializerIT extends BaseHBaseManagedTimeIT {
@Test
public void testMismatchKeyGenerator() throws EventDeliveryException, SQLException {
- final String fullTableName = generateRandomString();
+ final String fullTableName = generateUniqueName();
initSinkContextWithDefaults(fullTableName);
setConfig(FlumeConstants.CONFIG_SERIALIZER_PREFIX + FlumeConstants.CONFIG_ROWKEY_TYPE_GENERATOR,DefaultKeyGenerator.UUID.name());
@@ -127,7 +127,7 @@ public class RegexEventSerializerIT extends BaseHBaseManagedTimeIT {
@Test
public void testMissingColumnsInEvent() throws EventDeliveryException, SQLException {
- final String fullTableName = generateRandomString();
+ final String fullTableName = generateUniqueName();
initSinkContextWithDefaults(fullTableName);
sink = new PhoenixSink();
@@ -160,7 +160,7 @@ public class RegexEventSerializerIT extends BaseHBaseManagedTimeIT {
@Test
public void testBatchEvents() throws EventDeliveryException, SQLException {
- final String fullTableName = generateRandomString();
+ final String fullTableName = generateUniqueName();
initSinkContextWithDefaults(fullTableName);
sink = new PhoenixSink();
@@ -205,7 +205,7 @@ public class RegexEventSerializerIT extends BaseHBaseManagedTimeIT {
public void testApacheLogRegex() throws Exception {
sinkContext = new Context ();
- final String fullTableName = generateRandomString();
+ final String fullTableName = generateUniqueName();
final String logRegex = "([^ ]*) ([^ ]*) ([^ ]*) (-|\\[[^\\]]*\\]) \"([^ ]+) ([^ ]+)" +
" ([^\"]+)\" (-|[0-9]*) (-|[0-9]*)(?: ([^ \"]*|\"[^\"]*\")" +
" ([^ \"]*|\"[^\"]*\"))?";
@@ -280,7 +280,7 @@ public class RegexEventSerializerIT extends BaseHBaseManagedTimeIT {
public void testEventsWithHeaders() throws Exception {
sinkContext = new Context ();
- final String fullTableName = generateRandomString();
+ final String fullTableName = generateUniqueName();
final String ddl = "CREATE TABLE " + fullTableName +
" (rowkey VARCHAR not null, col1 varchar , cf1.col2 varchar , host varchar , source varchar \n" +
" CONSTRAINT pk PRIMARY KEY (rowkey))\n";
[2/6] phoenix git commit: PHOENIX-3253 Make changes to tests to
support method level parallelization
Posted by ja...@apache.org.
http://git-wip-us.apache.org/repos/asf/phoenix/blob/bebb5ced/phoenix-core/src/it/java/org/apache/phoenix/end2end/UseSchemaIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/UseSchemaIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/UseSchemaIT.java
index ec84282..c43fb0e 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/UseSchemaIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/UseSchemaIT.java
@@ -45,13 +45,13 @@ public class UseSchemaIT extends ParallelStatsDisabledIT {
@Test
public void testUseSchemaCaseInsensitive() throws Exception {
- String schemaName = generateRandomString();
+ String schemaName = generateUniqueName();
testUseSchema(schemaName);
}
@Test
public void testUseSchemaCaseSensitive() throws Exception {
- String schemaName = generateRandomString();
+ String schemaName = generateUniqueName();
testUseSchema("\"" + schemaName + "\"");
}
@@ -61,7 +61,7 @@ public class UseSchemaIT extends ParallelStatsDisabledIT {
Connection conn = DriverManager.getConnection(getUrl(), props);
String ddl = "CREATE SCHEMA IF NOT EXISTS "+schema;
conn.createStatement().execute(ddl);
- String testTable = generateRandomString();
+ String testTable = generateUniqueName();
ddl = "create table "+schema+"." + testTable + "(id varchar primary key)";
conn.createStatement().execute(ddl);
conn.createStatement().execute("use "+schema);
@@ -89,14 +89,14 @@ public class UseSchemaIT extends ParallelStatsDisabledIT {
@Test
public void testSchemaInJdbcUrl() throws Exception {
Properties props = new Properties();
- String schema = generateRandomString();
+ String schema = generateUniqueName();
props.setProperty(QueryServices.SCHEMA_ATTRIB, schema);
props.setProperty(QueryServices.IS_NAMESPACE_MAPPING_ENABLED, Boolean.toString(true));
Connection conn = DriverManager.getConnection(getUrl(), props);
conn.setAutoCommit(true);
String ddl = "CREATE SCHEMA IF NOT EXISTS " + schema;
conn.createStatement().execute(ddl);
- String testTable = generateRandomString();
+ String testTable = generateUniqueName();
ddl = "create table IF NOT EXISTS " + schema + "." + testTable + " (schema_name varchar primary key)";
conn.createStatement().execute(ddl);
conn.createStatement().executeUpdate("upsert into " + schema + "." + testTable + " values('" + schema + "')");
@@ -105,7 +105,7 @@ public class UseSchemaIT extends ParallelStatsDisabledIT {
assertTrue(rs.next());
assertEquals(schema, rs.getString(1));
- schema = generateRandomString();
+ schema = generateUniqueName();
ddl = "CREATE SCHEMA " + schema;
conn.createStatement().execute(ddl);
conn.createStatement().execute("use " + schema);
@@ -121,8 +121,8 @@ public class UseSchemaIT extends ParallelStatsDisabledIT {
@Test
public void testMappedView() throws Exception {
Properties props = new Properties();
- String schema = generateRandomString();
- String tableName = generateRandomString();
+ String schema = generateUniqueName();
+ String tableName = generateUniqueName();
String fullTablename = schema + QueryConstants.NAME_SEPARATOR + tableName;
props.setProperty(QueryServices.SCHEMA_ATTRIB, schema);
Connection conn = DriverManager.getConnection(getUrl(), props);
http://git-wip-us.apache.org/repos/asf/phoenix/blob/bebb5ced/phoenix-core/src/it/java/org/apache/phoenix/end2end/ViewIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ViewIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ViewIT.java
index 425e84c..512841a 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ViewIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ViewIT.java
@@ -64,7 +64,7 @@ public class ViewIT extends BaseViewIT {
Connection conn = DriverManager.getConnection(getUrl());
String ddl = "CREATE TABLE " + fullTableName + " (k INTEGER NOT NULL PRIMARY KEY, v1 DATE) "+ tableDDLOptions;
conn.createStatement().execute(ddl);
- String fullParentViewName = "V_" + generateRandomString();
+ String fullParentViewName = "V_" + generateUniqueName();
ddl = "CREATE VIEW " + fullParentViewName + " (v2 VARCHAR) AS SELECT * FROM " + tableName + " WHERE k > 5";
conn.createStatement().execute(ddl);
try {
@@ -104,7 +104,7 @@ public class ViewIT extends BaseViewIT {
assertEquals(count + 5, rs.getInt(1));
}
assertEquals(4, count);
- String fullViewName = "V_" + generateRandomString();
+ String fullViewName = "V_" + generateUniqueName();
ddl = "CREATE VIEW " + fullViewName + " AS SELECT * FROM " + fullParentViewName + " WHERE k < 9";
conn.createStatement().execute(ddl);
try {
@@ -140,7 +140,7 @@ public class ViewIT extends BaseViewIT {
public void testUpdatableOnUpdatableView() throws Exception {
String viewName = testUpdatableView(null);
Connection conn = DriverManager.getConnection(getUrl());
- String fullViewName = "V_" + generateRandomString();
+ String fullViewName = "V_" + generateUniqueName();
String ddl = "CREATE VIEW " + fullViewName + " AS SELECT * FROM " + viewName + " WHERE k3 = 2";
conn.createStatement().execute(ddl);
ResultSet rs = conn.createStatement().executeQuery("SELECT k1, k2, k3 FROM " + fullViewName);
@@ -178,7 +178,7 @@ public class ViewIT extends BaseViewIT {
public void testReadOnlyOnUpdatableView() throws Exception {
String viewName = testUpdatableView(null);
Connection conn = DriverManager.getConnection(getUrl());
- String fullViewName = "V_" + generateRandomString();
+ String fullViewName = "V_" + generateUniqueName();
String ddl = "CREATE VIEW " + fullViewName + " AS SELECT * FROM " + viewName + " WHERE k3 > 1 and k3 < 50";
conn.createStatement().execute(ddl);
ResultSet rs = conn.createStatement().executeQuery("SELECT k1, k2, k3 FROM " + fullViewName);
@@ -210,7 +210,7 @@ public class ViewIT extends BaseViewIT {
Connection conn = DriverManager.getConnection(getUrl());
String ddl = "CREATE TABLE " + fullTableName + " (k1 INTEGER NOT NULL, k2 INTEGER NOT NULL, v1 DECIMAL, CONSTRAINT pk PRIMARY KEY (k1, k2))" + tableDDLOptions;
conn.createStatement().execute(ddl);
- String fullViewName1 = "V_" + generateRandomString();
+ String fullViewName1 = "V_" + generateUniqueName();
ddl = "CREATE VIEW " + fullViewName1 + "(v2 VARCHAR, v3 VARCHAR) AS SELECT * FROM " + fullTableName + " WHERE v1 = 1.0";
conn.createStatement().execute(ddl);
@@ -221,7 +221,7 @@ public class ViewIT extends BaseViewIT {
assertEquals(SQLExceptionCode.CANNOT_MUTATE_TABLE.getErrorCode(), e.getErrorCode());
}
- String fullViewName2 = "V_" + generateRandomString();
+ String fullViewName2 = "V_" + generateUniqueName();
ddl = "CREATE VIEW " + fullViewName2 + " AS SELECT * FROM " + fullViewName1 + " WHERE v2 != 'foo'";
conn.createStatement().execute(ddl);
@@ -245,10 +245,10 @@ public class ViewIT extends BaseViewIT {
public void testReadOnlyViewWithCaseSensitiveTableNames() throws Exception {
Connection earlierCon = DriverManager.getConnection(getUrl());
Connection conn = DriverManager.getConnection(getUrl());
- String caseSensitiveTableName = "\"t_" + generateRandomString() + "\"" ;
+ String caseSensitiveTableName = "\"t_" + generateUniqueName() + "\"" ;
String ddl = "CREATE TABLE " + caseSensitiveTableName + " (k INTEGER NOT NULL PRIMARY KEY, v1 DATE)" + tableDDLOptions;
conn.createStatement().execute(ddl);
- String caseSensitiveViewName = "\"v_" + generateRandomString() + "\"" ;
+ String caseSensitiveViewName = "\"v_" + generateUniqueName() + "\"" ;
ddl = "CREATE VIEW " + caseSensitiveViewName + " (v2 VARCHAR) AS SELECT * FROM " + caseSensitiveTableName + " WHERE k > 5";
conn.createStatement().execute(ddl);
try {
@@ -283,7 +283,7 @@ public class ViewIT extends BaseViewIT {
Connection conn = DriverManager.getConnection(getUrl());
String ddl = "CREATE TABLE " + fullTableName + " (\"k\" INTEGER NOT NULL PRIMARY KEY, \"v1\" INTEGER, \"a\".v2 VARCHAR)" + tableDDLOptions;
conn.createStatement().execute(ddl);
- String viewName = "V_" + generateRandomString();
+ String viewName = "V_" + generateUniqueName();
ddl = "CREATE VIEW " + viewName + " (v VARCHAR) AS SELECT * FROM " + fullTableName + " WHERE \"k\" > 5 and \"v1\" > 1";
conn.createStatement().execute(ddl);
try {
@@ -311,7 +311,7 @@ public class ViewIT extends BaseViewIT {
Connection conn = DriverManager.getConnection(getUrl());
String ddl = "CREATE TABLE " + fullTableName + " (k INTEGER NOT NULL PRIMARY KEY, v1 INTEGER, v2 DATE)" + tableDDLOptions;
conn.createStatement().execute(ddl);
- String viewName = "V_" + generateRandomString();
+ String viewName = "V_" + generateUniqueName();
ddl = "CREATE VIEW " + viewName + " (v VARCHAR) AS SELECT * FROM " + fullTableName + " WHERE v2 > CURRENT_DATE()-5 AND v2 > DATE '2010-01-01'";
conn.createStatement().execute(ddl);
try {
@@ -350,7 +350,7 @@ public class ViewIT extends BaseViewIT {
Properties props = new Properties();
props.setProperty(QueryServices.IS_NAMESPACE_MAPPING_ENABLED, Boolean.toString(isNamespaceMapped));
Connection conn = DriverManager.getConnection(getUrl(),props);
- String schemaName1 = "S_" + generateRandomString();
+ String schemaName1 = "S_" + generateUniqueName();
String fullTableName1 = SchemaUtil.getTableName(schemaName1, tableName);
if (isNamespaceMapped) {
conn.createStatement().execute("CREATE SCHEMA IF NOT EXISTS " + schemaName1);
@@ -360,12 +360,12 @@ public class ViewIT extends BaseViewIT {
conn.createStatement().execute(ddl);
assertTrue(admin.tableExists(SchemaUtil.getPhysicalTableName(SchemaUtil.normalizeIdentifier(fullTableName1),
conn.unwrap(PhoenixConnection.class).getQueryServices().getProps())));
- String viewName = "V_" + generateRandomString();
- String viewSchemaName = "S_" + generateRandomString();
+ String viewName = "V_" + generateUniqueName();
+ String viewSchemaName = "S_" + generateUniqueName();
String fullViewName1 = SchemaUtil.getTableName(viewSchemaName, viewName);
ddl = "CREATE VIEW " + fullViewName1 + " (v2 VARCHAR) AS SELECT * FROM " + fullTableName1 + " WHERE k > 5";
conn.createStatement().execute(ddl);
- String fullViewName2 = "V_" + generateRandomString();
+ String fullViewName2 = "V_" + generateUniqueName();
ddl = "CREATE VIEW " + fullViewName2 + " (v2 VARCHAR) AS SELECT * FROM " + fullTableName1 + " WHERE k > 5";
conn.createStatement().execute(ddl);
conn.createStatement().executeQuery("SELECT * FROM " + fullViewName1);
@@ -378,7 +378,7 @@ public class ViewIT extends BaseViewIT {
}
ddl = "DROP VIEW " + fullViewName1;
conn.createStatement().execute(ddl);
- ddl = "DROP VIEW " + SchemaUtil.getTableName(viewSchemaName, generateRandomString());
+ ddl = "DROP VIEW " + SchemaUtil.getTableName(viewSchemaName, generateUniqueName());
try {
conn.createStatement().execute(ddl);
fail();
@@ -398,7 +398,7 @@ public class ViewIT extends BaseViewIT {
Connection conn = DriverManager.getConnection(getUrl());
String ddl = "CREATE TABLE " + fullTableName + " (k1 INTEGER NOT NULL, k2 INTEGER NOT NULL, v1 DECIMAL, CONSTRAINT pk PRIMARY KEY (k1, k2))" + tableDDLOptions;
conn.createStatement().execute(ddl);
- String viewName = "V_" + generateRandomString();
+ String viewName = "V_" + generateUniqueName();
ddl = "CREATE VIEW " + viewName + "(v2 VARCHAR, v3 VARCHAR) AS SELECT * FROM " + fullTableName + " WHERE v1 = 1.0";
conn.createStatement().execute(ddl);
@@ -416,14 +416,14 @@ public class ViewIT extends BaseViewIT {
Connection conn = DriverManager.getConnection(getUrl());
String ddl = "CREATE TABLE " + fullTableName + " (k INTEGER NOT NULL PRIMARY KEY, v1 DATE)" + tableDDLOptions;
conn.createStatement().execute(ddl);
- String viewName = "V_" + generateRandomString();
- String viewSchemaName = "S_" + generateRandomString();
+ String viewName = "V_" + generateUniqueName();
+ String viewSchemaName = "S_" + generateUniqueName();
String fullViewName1 = SchemaUtil.getTableName(viewSchemaName, viewName);
ddl = "CREATE VIEW " + fullViewName1 + " (v2 VARCHAR) AS SELECT * FROM " + fullTableName + " WHERE k > 5";
conn.createStatement().execute(ddl);
ddl = "CREATE LOCAL INDEX idx on " + fullViewName1 + "(v2)";
conn.createStatement().execute(ddl);
- String fullViewName2 = SchemaUtil.getTableName(viewSchemaName, "V_" + generateRandomString());
+ String fullViewName2 = SchemaUtil.getTableName(viewSchemaName, "V_" + generateUniqueName());
ddl = "CREATE VIEW " + fullViewName2 + "(v2 VARCHAR) AS SELECT * FROM " + fullTableName + " WHERE k > 10";
conn.createStatement().execute(ddl);
@@ -446,12 +446,12 @@ public class ViewIT extends BaseViewIT {
tableDDLOptions+="IMMUTABLE_ROWS=true";
String ddl = "CREATE TABLE " + fullTableName + " (k INTEGER NOT NULL PRIMARY KEY, v1 DATE)" + tableDDLOptions;
conn.createStatement().execute(ddl);
- String viewSchemaName = "S_" + generateRandomString();
- String fullViewName1 = SchemaUtil.getTableName(viewSchemaName, "V_" + generateRandomString());
- String fullViewName2 = SchemaUtil.getTableName(viewSchemaName, "V_" + generateRandomString());
- String indexName1 = "I_" + generateRandomString();
- String indexName2 = "I_" + generateRandomString();
- String indexName3 = "I_" + generateRandomString();
+ String viewSchemaName = "S_" + generateUniqueName();
+ String fullViewName1 = SchemaUtil.getTableName(viewSchemaName, "V_" + generateUniqueName());
+ String fullViewName2 = SchemaUtil.getTableName(viewSchemaName, "V_" + generateUniqueName());
+ String indexName1 = "I_" + generateUniqueName();
+ String indexName2 = "I_" + generateUniqueName();
+ String indexName3 = "I_" + generateUniqueName();
ddl = "CREATE INDEX " + indexName1 + " ON " + fullTableName + " (v1)";
conn.createStatement().execute(ddl);
ddl = "CREATE VIEW " + fullViewName1 + " (v2 VARCHAR) AS SELECT * FROM " + fullTableName + " WHERE k > 5";
@@ -515,13 +515,13 @@ public class ViewIT extends BaseViewIT {
Connection conn = DriverManager.getConnection(getUrl());
String ddl = "CREATE TABLE " + fullTableName + " (k1 INTEGER NOT NULL, k2 INTEGER NOT NULL, k3 DECIMAL, s1 VARCHAR, s2 VARCHAR CONSTRAINT pk PRIMARY KEY (k1, k2, k3))" + tableDDLOptions;
conn.createStatement().execute(ddl);
- String indexName1 = "I_" + generateRandomString();
+ String indexName1 = "I_" + generateUniqueName();
String fullIndexName1 = SchemaUtil.getTableName(schemaName, indexName1);
conn.createStatement().execute("CREATE " + (localIndex ? "LOCAL " : "") + " INDEX " + indexName1 + " ON " + fullTableName + "(k3, k2) INCLUDE(s1, s2)");
- String indexName2 = "I_" + generateRandomString();
+ String indexName2 = "I_" + generateUniqueName();
conn.createStatement().execute("CREATE INDEX " + indexName2 + " ON " + fullTableName + "(k3, k2, s2)");
- String fullViewName = "V_" + generateRandomString();
+ String fullViewName = "V_" + generateUniqueName();
ddl = "CREATE VIEW " + fullViewName + " AS SELECT * FROM " + fullTableName + " WHERE s1 = 'foo'";
conn.createStatement().execute(ddl);
String[] s1Values = {"foo","bar"};
@@ -535,7 +535,7 @@ public class ViewIT extends BaseViewIT {
assertEquals(5, rs.getLong(1));
assertFalse(rs.next());
- String viewIndexName = "I_" + generateRandomString();
+ String viewIndexName = "I_" + generateUniqueName();
conn.createStatement().execute("CREATE INDEX " + viewIndexName + " on " + fullViewName + "(k2)");
String query = "SELECT k2 FROM " + fullViewName + " WHERE k2 IN (100,109) AND k3 IN (1,2) AND s2='bas'";
@@ -562,7 +562,7 @@ public class ViewIT extends BaseViewIT {
Connection conn = DriverManager.getConnection(getUrl());
String ddl = "CREATE TABLE " + fullTableName + " (k1 INTEGER NOT NULL, k2 INTEGER NOT NULL, v1 DECIMAL, CONSTRAINT pk PRIMARY KEY (k1, k2))" + tableDDLOptions;
conn.createStatement().execute(ddl);
- String fullViewName = "V_" + generateRandomString();
+ String fullViewName = "V_" + generateUniqueName();
ddl = "CREATE VIEW " + fullViewName + "(v2 VARCHAR, k3 VARCHAR PRIMARY KEY) AS SELECT * FROM " + fullTableName + " WHERE K1 = 1";
conn.createStatement().execute(ddl);
@@ -591,7 +591,7 @@ public class ViewIT extends BaseViewIT {
Connection conn = DriverManager.getConnection(getUrl());
String ddl = "CREATE TABLE " + fullTableName + " (k1 INTEGER NOT NULL, k2 INTEGER NOT NULL, v1 DECIMAL, CONSTRAINT pk PRIMARY KEY (k1, k2))" + tableDDLOptions;
conn.createStatement().execute(ddl);
- String fullViewName = "V_" + generateRandomString();
+ String fullViewName = "V_" + generateUniqueName();
ddl = "CREATE VIEW " + fullViewName + "(v2 VARCHAR, k3 VARCHAR, k4 INTEGER NOT NULL, CONSTRAINT PKVEW PRIMARY KEY (k3, k4)) AS SELECT * FROM " + fullTableName + " WHERE K1 = 1";
conn.createStatement().execute(ddl);
@@ -606,7 +606,7 @@ public class ViewIT extends BaseViewIT {
String fullTableName2 = fullTableName;
String ddl = "CREATE TABLE " + fullTableName2 + " (k1 INTEGER NOT NULL, k2 INTEGER NOT NULL, v1 DECIMAL, CONSTRAINT pk PRIMARY KEY (k1, k2))" + tableDDLOptions;
conn.createStatement().execute(ddl);
- String fullViewName = "V_" + generateRandomString();
+ String fullViewName = "V_" + generateUniqueName();
ddl = "CREATE VIEW " + fullViewName + " AS SELECT * FROM " + fullTableName + " WHERE v1 = 1.0";
conn.createStatement().execute(ddl);
ddl = "ALTER VIEW " + fullViewName + " ADD k3 VARCHAR PRIMARY KEY, k4 VARCHAR PRIMARY KEY, v2 INTEGER";
@@ -622,7 +622,7 @@ public class ViewIT extends BaseViewIT {
Connection conn = DriverManager.getConnection(getUrl());
String ddl = "CREATE TABLE " + fullTableName + " (k1 INTEGER NOT NULL, k2 VARCHAR NOT NULL, v1 DECIMAL, CONSTRAINT pk PRIMARY KEY (k1, k2))" + tableDDLOptions;
conn.createStatement().execute(ddl);
- String fullViewName1 = "V_" + generateRandomString();
+ String fullViewName1 = "V_" + generateUniqueName();
ddl = "CREATE VIEW " + fullViewName1 + " AS SELECT * FROM " + fullTableName + " WHERE v1 = 1.0";
conn.createStatement().execute(ddl);
ddl = "ALTER VIEW " + fullViewName1 + " ADD k3 VARCHAR PRIMARY KEY, k4 VARCHAR PRIMARY KEY, v2 INTEGER";
@@ -632,7 +632,7 @@ public class ViewIT extends BaseViewIT {
} catch (SQLException e) {
assertEquals(CANNOT_MODIFY_VIEW_PK.getErrorCode(), e.getErrorCode());
}
- String fullViewName2 = "V_" + generateRandomString();
+ String fullViewName2 = "V_" + generateUniqueName();
ddl = "CREATE VIEW " + fullViewName2 + " (k3 VARCHAR PRIMARY KEY) AS SELECT * FROM " + fullTableName + " WHERE v1 = 1.0";
try {
conn.createStatement().execute(ddl);
@@ -646,7 +646,7 @@ public class ViewIT extends BaseViewIT {
Connection conn = DriverManager.getConnection(getUrl());
String ddl = "CREATE TABLE " + fullTableName + " (k1 INTEGER NOT NULL, k2 INTEGER NOT NULL, v1 DECIMAL, CONSTRAINT pk PRIMARY KEY (k1, k2))" + tableDDLOptions;
conn.createStatement().execute(ddl);
- String fullViewName = "V_" + generateRandomString();
+ String fullViewName = "V_" + generateUniqueName();
ddl = "CREATE VIEW " + fullViewName + " AS SELECT * FROM " + fullTableName + " WHERE v1 = 1.0";
conn.createStatement().execute(ddl);
ddl = "ALTER VIEW " + fullViewName + " ADD k3 VARCHAR PRIMARY KEY, k2 VARCHAR PRIMARY KEY, v2 INTEGER";
@@ -658,7 +658,7 @@ public class ViewIT extends BaseViewIT {
Connection conn = DriverManager.getConnection(getUrl());
String ddl = "CREATE TABLE " + fullTableName + " (k1 INTEGER NOT NULL, k2 INTEGER NOT NULL, v1 DECIMAL, CONSTRAINT pk PRIMARY KEY (k1, k2))" + tableDDLOptions;
conn.createStatement().execute(ddl);
- String fullViewName = "V_" + generateRandomString();
+ String fullViewName = "V_" + generateUniqueName();
ddl = "CREATE VIEW " + fullViewName + " AS SELECT * FROM " + fullTableName + " WHERE v1 = 1.0";
conn.createStatement().execute(ddl);
try {
@@ -675,10 +675,10 @@ public class ViewIT extends BaseViewIT {
Connection conn = DriverManager.getConnection(getUrl());
String sql = "CREATE TABLE " + fullTableName + " (k1 INTEGER NOT NULL, k2 INTEGER NOT NULL, v1 DECIMAL, CONSTRAINT pk PRIMARY KEY (k1, k2))" + tableDDLOptions;
conn.createStatement().execute(sql);
- String fullViewName1 = "V_" + generateRandomString();
+ String fullViewName1 = "V_" + generateUniqueName();
sql = "CREATE VIEW " + fullViewName1 + " AS SELECT * FROM " + fullTableName;
conn.createStatement().execute(sql);
- String fullViewName2 = "V_" + generateRandomString();
+ String fullViewName2 = "V_" + generateUniqueName();
sql = "CREATE VIEW " + fullViewName2 + " AS SELECT * FROM " + fullTableName + " WHERE k1 = 1.0";
conn.createStatement().execute(sql);
http://git-wip-us.apache.org/repos/asf/phoenix/blob/bebb5ced/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/AsyncIndexDisabledIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/AsyncIndexDisabledIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/AsyncIndexDisabledIT.java
index a6228e7..5f02790 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/AsyncIndexDisabledIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/AsyncIndexDisabledIT.java
@@ -52,8 +52,8 @@ public class AsyncIndexDisabledIT extends ParallelStatsDisabledIT {
try (Connection conn = DriverManager.getConnection(getUrl())) {
conn.setAutoCommit(true);
Statement stmt = conn.createStatement();
- String tableName = "TBL_" + generateRandomString();
- String indexName = "IND_" + generateRandomString();
+ String tableName = "TBL_" + generateUniqueName();
+ String indexName = "IND_" + generateUniqueName();
String ddl = "CREATE TABLE " + tableName + " (pk INTEGER NOT NULL PRIMARY KEY, val VARCHAR)";
stmt.execute(ddl);
http://git-wip-us.apache.org/repos/asf/phoenix/blob/bebb5ced/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/ChildViewsUseParentViewIndexIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/ChildViewsUseParentViewIndexIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/ChildViewsUseParentViewIndexIT.java
index a0efd52..29ff183 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/ChildViewsUseParentViewIndexIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/ChildViewsUseParentViewIndexIT.java
@@ -20,11 +20,11 @@ public class ChildViewsUseParentViewIndexIT extends ParallelStatsDisabledIT {
@Test
public void testIndexOnParentViewWithTenantSpecificConnection() throws Exception {
- final String baseTableName = generateRandomString();
- final String globalViewName = generateRandomString();
- final String globalViewIdxName = generateRandomString();
- final String tenantViewName1 = generateRandomString();
- final String tenantViewName2 = generateRandomString();
+ final String baseTableName = generateUniqueName();
+ final String globalViewName = generateUniqueName();
+ final String globalViewIdxName = generateUniqueName();
+ final String tenantViewName1 = generateUniqueName();
+ final String tenantViewName2 = generateUniqueName();
// Set up props with TenantId
Properties props = new Properties();
@@ -68,11 +68,11 @@ public class ChildViewsUseParentViewIndexIT extends ParallelStatsDisabledIT {
@Test
public void testParentViewIndexWithSpecializedChildViews() throws Exception {
- final String baseTableName = generateRandomString();
- final String parentViewName = generateRandomString();
- final String parentViewIdxName = generateRandomString();
- final String childViewName1 = generateRandomString();
- final String childViewName2 = generateRandomString();
+ final String baseTableName = generateUniqueName();
+ final String parentViewName = generateUniqueName();
+ final String parentViewIdxName = generateUniqueName();
+ final String childViewName1 = generateUniqueName();
+ final String childViewName2 = generateUniqueName();
try (Connection conn = DriverManager.getConnection(getUrl())) {
// create base table
http://git-wip-us.apache.org/repos/asf/phoenix/blob/bebb5ced/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/DropMetadataIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/DropMetadataIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/DropMetadataIT.java
index 9ee00d2..8b3c111 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/DropMetadataIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/DropMetadataIT.java
@@ -77,7 +77,7 @@ public class DropMetadataIT extends ParallelStatsDisabledIT {
@Test
public void testDropViewKeepsHTable() throws Exception {
HBaseAdmin admin = driver.getConnectionQueryServices(getUrl(), TEST_PROPERTIES).getAdmin();
- String hbaseNativeViewName = generateRandomString();
+ String hbaseNativeViewName = generateUniqueName();
byte[] hbaseNativeBytes = SchemaUtil.getTableNameAsBytes(HBASE_NATIVE_SCHEMA_NAME, hbaseNativeViewName);
try {
@@ -108,8 +108,8 @@ public class DropMetadataIT extends ParallelStatsDisabledIT {
@Test
public void testDroppingIndexedColDropsIndex() throws Exception {
Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
- String indexTableName = generateRandomString();
- String dataTableFullName = SchemaUtil.getTableName(SCHEMA_NAME, generateRandomString());
+ String indexTableName = generateUniqueName();
+ String dataTableFullName = SchemaUtil.getTableName(SCHEMA_NAME, generateUniqueName());
String localIndexTableName1 = "LOCAL_" + indexTableName + "_1";
String localIndexTableName2 = "LOCAL_" + indexTableName + "_2";
try (Connection conn = DriverManager.getConnection(getUrl(), props)) {
@@ -202,10 +202,10 @@ public class DropMetadataIT extends ParallelStatsDisabledIT {
public void helpTestDroppingIndexedColDropsViewIndex(boolean isMultiTenant) throws Exception {
try (Connection conn = DriverManager.getConnection(getUrl());
Connection viewConn = isMultiTenant ? DriverManager.getConnection(TENANT_SPECIFIC_URL) : conn ) {
- String tableWithView = generateRandomString();
- String viewOfTable = generateRandomString();
- String viewIndex1 = generateRandomString();
- String viewIndex2 = generateRandomString();
+ String tableWithView = generateUniqueName();
+ String viewOfTable = generateUniqueName();
+ String viewIndex1 = generateUniqueName();
+ String viewIndex2 = generateUniqueName();
conn.setAutoCommit(false);
viewConn.setAutoCommit(false);
http://git-wip-us.apache.org/repos/asf/phoenix/blob/bebb5ced/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/GlobalIndexOptimizationIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/GlobalIndexOptimizationIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/GlobalIndexOptimizationIT.java
index af2ddaa..d3c3085 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/GlobalIndexOptimizationIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/GlobalIndexOptimizationIT.java
@@ -73,16 +73,16 @@ public class GlobalIndexOptimizationIT extends ParallelStatsDisabledIT {
@Test
public void testGlobalIndexOptimization() throws Exception {
- String dataTableName = generateRandomString();
- String indexTableName = generateRandomString();
+ String dataTableName = generateUniqueName();
+ String indexTableName = generateUniqueName();
String dataTableFullName = SchemaUtil.getTableName("", dataTableName);
testOptimization(dataTableName, dataTableFullName, indexTableName, 4);
}
@Test
public void testGlobalIndexOptimizationWithSalting() throws Exception {
- String dataTableName = generateRandomString();
- String indexTableName = generateRandomString();
+ String dataTableName = generateUniqueName();
+ String indexTableName = generateUniqueName();
String dataTableFullName = SchemaUtil.getTableName("", dataTableName);
testOptimization(dataTableName, dataTableFullName, indexTableName, 4);
@@ -90,15 +90,15 @@ public class GlobalIndexOptimizationIT extends ParallelStatsDisabledIT {
@Test
public void testGlobalIndexOptimizationTenantSpecific() throws Exception {
- String dataTableName = generateRandomString();
- String indexTableName = generateRandomString();
+ String dataTableName = generateUniqueName();
+ String indexTableName = generateUniqueName();
testOptimizationTenantSpecific(dataTableName, indexTableName, null);
}
@Test
public void testGlobalIndexOptimizationWithSaltingTenantSpecific() throws Exception {
- String dataTableName = generateRandomString();
- String indexTableName = generateRandomString();
+ String dataTableName = generateUniqueName();
+ String indexTableName = generateUniqueName();
testOptimizationTenantSpecific(dataTableName, indexTableName, 4);
}
@@ -330,11 +330,11 @@ public class GlobalIndexOptimizationIT extends ParallelStatsDisabledIT {
@Test
public void testGlobalIndexOptimizationOnSharedIndex() throws Exception {
- String dataTableName = generateRandomString();
+ String dataTableName = generateUniqueName();
createBaseTable(dataTableName, null, "('e','i','o')", false);
Connection conn1 = DriverManager.getConnection(getUrl());
- String viewName = generateRandomString();
- String indexOnDataTable = generateRandomString();
+ String viewName = generateUniqueName();
+ String indexOnDataTable = generateUniqueName();
try{
conn1.createStatement().execute("CREATE INDEX " + indexOnDataTable + " ON " + dataTableName + "(k2,k1) INCLUDE (v1)");
conn1.createStatement().execute("CREATE VIEW " + viewName + " AS SELECT * FROM " + dataTableName + " WHERE v1 = 'a'");
@@ -347,7 +347,7 @@ public class GlobalIndexOptimizationIT extends ParallelStatsDisabledIT {
assertTrue(rs.next());
assertEquals(2, rs.getInt(1));
assertFalse(rs.next());
- String viewIndex = generateRandomString();
+ String viewIndex = generateUniqueName();
conn1.createStatement().execute("CREATE INDEX " + viewIndex + " ON " + viewName + " (k1)");
String query = "SELECT /*+ INDEX(" + viewName + " " + viewIndex + ")*/ t_id,k1,k2,k3,v1 FROM " + viewName + " where k1 IN (1,2) and k2 IN (3,4)";
@@ -378,8 +378,8 @@ public class GlobalIndexOptimizationIT extends ParallelStatsDisabledIT {
@Test
public void testNoGlobalIndexOptimization() throws Exception {
- String dataTableName = generateRandomString();
- String indexTableName = generateRandomString();
+ String dataTableName = generateUniqueName();
+ String indexTableName = generateUniqueName();
String dataTableFullName = SchemaUtil.getTableName("", dataTableName);
createBaseTable(dataTableName, null, "('e','i','o')", false);
Connection conn1 = DriverManager.getConnection(getUrl());
http://git-wip-us.apache.org/repos/asf/phoenix/blob/bebb5ced/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/ImmutableIndexIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/ImmutableIndexIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/ImmutableIndexIT.java
index ba342eb..e677878 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/ImmutableIndexIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/ImmutableIndexIT.java
@@ -108,14 +108,14 @@ public class ImmutableIndexIT extends BaseOwnClusterIT {
@Test
public void testDropIfImmutableKeyValueColumn() throws Exception {
Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
- String tableName = "TBL_" + generateRandomString();
- String indexName = "IND_" + generateRandomString();
+ String tableName = "TBL_" + generateUniqueName();
+ String indexName = "IND_" + generateUniqueName();
String fullTableName = SchemaUtil.getTableName(TestUtil.DEFAULT_SCHEMA_NAME, tableName);
String fullIndexName = SchemaUtil.getTableName(TestUtil.DEFAULT_SCHEMA_NAME, indexName);
try (Connection conn = DriverManager.getConnection(getUrl(), props)) {
conn.setAutoCommit(false);
String ddl =
- "CREATE TABLE " + fullTableName + BaseTest.TEST_TABLE_SCHEMA + tableDDLOptions;
+ "CREATE TABLE " + fullTableName + TestUtil.TEST_TABLE_SCHEMA + tableDDLOptions;
Statement stmt = conn.createStatement();
stmt.execute(ddl);
populateTestTable(fullTableName);
@@ -155,11 +155,11 @@ public class ImmutableIndexIT extends BaseOwnClusterIT {
}
Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
props.setProperty(QueryServices.MUTATE_BATCH_SIZE_ATTRIB, Integer.toString(100));
- String tableName = "TBL_" + generateRandomString();
- String indexName = "IND_" + generateRandomString();
+ String tableName = "TBL_" + generateUniqueName();
+ String indexName = "IND_" + generateUniqueName();
String fullTableName = SchemaUtil.getTableName(TestUtil.DEFAULT_SCHEMA_NAME, tableName);
TABLE_NAME = fullTableName;
- String ddl ="CREATE TABLE " + TABLE_NAME + BaseTest.TEST_TABLE_SCHEMA + tableDDLOptions;
+ String ddl ="CREATE TABLE " + TABLE_NAME + TestUtil.TEST_TABLE_SCHEMA + tableDDLOptions;
INDEX_DDL = "CREATE " + (localIndex ? "LOCAL" : "") + " INDEX IF NOT EXISTS " + indexName + " ON " + TABLE_NAME
+ " (long_pk, varchar_pk)"
+ " INCLUDE (long_col1, long_col2)";
@@ -242,11 +242,11 @@ public class ImmutableIndexIT extends BaseOwnClusterIT {
@Test
public void testCreateIndexWhileUpsertingData() throws Exception {
Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
- String tableName = "TBL_" + generateRandomString();
- String indexName = "IND_" + generateRandomString();
+ String tableName = "TBL_" + generateUniqueName();
+ String indexName = "IND_" + generateUniqueName();
String fullTableName = SchemaUtil.getTableName(TestUtil.DEFAULT_SCHEMA_NAME, tableName);
String fullIndexName = SchemaUtil.getTableName(TestUtil.DEFAULT_SCHEMA_NAME, indexName);
- String ddl ="CREATE TABLE " + fullTableName + BaseTest.TEST_TABLE_SCHEMA + tableDDLOptions;
+ String ddl ="CREATE TABLE " + fullTableName + TestUtil.TEST_TABLE_SCHEMA + tableDDLOptions;
String indexDDL = "CREATE " + (localIndex ? "LOCAL" : "") + " INDEX " + indexName + " ON " + fullTableName
+ " (long_pk, varchar_pk)"
+ " INCLUDE (long_col1, long_col2)";
http://git-wip-us.apache.org/repos/asf/phoenix/blob/bebb5ced/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/ImmutableIndexWithStatsIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/ImmutableIndexWithStatsIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/ImmutableIndexWithStatsIT.java
index d03b6fa..2ff823a 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/ImmutableIndexWithStatsIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/ImmutableIndexWithStatsIT.java
@@ -40,7 +40,7 @@ public class ImmutableIndexWithStatsIT extends ParallelStatsEnabledIT {
String query;
ResultSet rs;
- String tableName = generateRandomString();
+ String tableName = generateUniqueName();
Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
Connection conn = DriverManager.getConnection(getUrl(), props);
conn.setAutoCommit(false);
@@ -62,7 +62,7 @@ public class ImmutableIndexWithStatsIT extends ParallelStatsEnabledIT {
rs = conn.createStatement().executeQuery("EXPLAIN " + query);
assertTrue(QueryUtil.getExplainPlan(rs).startsWith("CLIENT PARALLEL 1-WAY FULL SCAN"));
- String indexName = "I_" + generateRandomString();
+ String indexName = "I_" + generateUniqueName();
conn.createStatement().execute("CREATE INDEX " + indexName + " ON " + tableName + " (v)");
query = "SELECT * FROM " + indexName;
http://git-wip-us.apache.org/repos/asf/phoenix/blob/bebb5ced/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexExpressionIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexExpressionIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexExpressionIT.java
index 3235c52..50548bd 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexExpressionIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexExpressionIT.java
@@ -36,6 +36,7 @@ import org.apache.phoenix.util.DateUtil;
import org.apache.phoenix.util.IndexUtil;
import org.apache.phoenix.util.PropertiesUtil;
import org.apache.phoenix.util.QueryUtil;
+import org.apache.phoenix.util.TestUtil;
import org.junit.Test;
public class IndexExpressionIT extends ParallelStatsDisabledIT {
@@ -110,14 +111,14 @@ public class IndexExpressionIT extends ParallelStatsDisabledIT {
}
private void createDataTable(Connection conn, String dataTableName, String tableProps) throws SQLException {
- String tableDDL = "create table " + dataTableName + TEST_TABLE_SCHEMA + tableProps;
+ String tableDDL = "create table " + dataTableName + TestUtil.TEST_TABLE_SCHEMA + tableProps;
conn.createStatement().execute(tableDDL);
}
protected void helpTestCreateAndUpdate(boolean mutable, boolean localIndex) throws Exception {
- String dataTableName = generateRandomString();
+ String dataTableName = generateUniqueName();
String fullDataTableName = INDEX_DATA_SCHEMA + QueryConstants.NAME_SEPARATOR + dataTableName;
- String indexName = generateRandomString();
+ String indexName = generateUniqueName();
Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
Connection conn = DriverManager.getConnection(getUrl(), props);
try {
@@ -208,17 +209,17 @@ public class IndexExpressionIT extends ParallelStatsDisabledIT {
@Test
public void testMutableIndexUpdate() throws Exception {
- String dataTableName = generateRandomString();
+ String dataTableName = generateUniqueName();
String fullDataTableName = INDEX_DATA_SCHEMA + QueryConstants.NAME_SEPARATOR + dataTableName;
- String indexName = generateRandomString();
+ String indexName = generateUniqueName();
helpTestUpdate(fullDataTableName, indexName, false);
}
@Test
public void testMutableLocalIndexUpdate() throws Exception {
- String dataTableName = generateRandomString();
+ String dataTableName = generateUniqueName();
String fullDataTableName = INDEX_DATA_SCHEMA + QueryConstants.NAME_SEPARATOR + dataTableName;
- String indexName = generateRandomString();
+ String indexName = generateUniqueName();
helpTestUpdate(fullDataTableName, indexName, true);
}
@@ -316,9 +317,9 @@ public class IndexExpressionIT extends ParallelStatsDisabledIT {
}
protected void helpTestDeleteIndexedExpression(boolean mutable, boolean localIndex) throws Exception {
- String dataTableName = generateRandomString();
+ String dataTableName = generateUniqueName();
String fullDataTableName = INDEX_DATA_SCHEMA + QueryConstants.NAME_SEPARATOR + dataTableName;
- String indexName = generateRandomString();
+ String indexName = generateUniqueName();
String fullIndexTableName = INDEX_DATA_SCHEMA + QueryConstants.NAME_SEPARATOR + indexName;
Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
Connection conn = DriverManager.getConnection(getUrl(), props);
@@ -390,9 +391,9 @@ public class IndexExpressionIT extends ParallelStatsDisabledIT {
}
protected void helpTestDeleteCoveredCol(boolean mutable, boolean localIndex) throws Exception {
- String dataTableName = generateRandomString();
+ String dataTableName = generateUniqueName();
String fullDataTableName = INDEX_DATA_SCHEMA + QueryConstants.NAME_SEPARATOR + dataTableName;
- String indexName = generateRandomString();
+ String indexName = generateUniqueName();
String fullIndexTableName = INDEX_DATA_SCHEMA + QueryConstants.NAME_SEPARATOR + indexName;
Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
Connection conn = DriverManager.getConnection(getUrl(), props);
@@ -472,9 +473,9 @@ public class IndexExpressionIT extends ParallelStatsDisabledIT {
}
protected void helpTestGroupByCount(boolean mutable, boolean localIndex) throws Exception {
- String dataTableName = generateRandomString();
+ String dataTableName = generateUniqueName();
String fullDataTableName = INDEX_DATA_SCHEMA + QueryConstants.NAME_SEPARATOR + dataTableName;
- String indexName = generateRandomString();
+ String indexName = generateUniqueName();
Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
Connection conn = DriverManager.getConnection(getUrl(), props);
try {
@@ -528,9 +529,9 @@ public class IndexExpressionIT extends ParallelStatsDisabledIT {
}
protected void helpTestSelectDistinct(boolean mutable, boolean localIndex) throws Exception {
- String dataTableName = generateRandomString();
+ String dataTableName = generateUniqueName();
String fullDataTableName = INDEX_DATA_SCHEMA + QueryConstants.NAME_SEPARATOR + dataTableName;
- String indexName = generateRandomString();
+ String indexName = generateUniqueName();
Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
Connection conn = DriverManager.getConnection(getUrl(), props);
try {
@@ -582,9 +583,9 @@ public class IndexExpressionIT extends ParallelStatsDisabledIT {
}
protected void helpTestInClauseWithIndex(boolean mutable, boolean localIndex) throws Exception {
- String dataTableName = generateRandomString();
+ String dataTableName = generateUniqueName();
String fullDataTableName = INDEX_DATA_SCHEMA + QueryConstants.NAME_SEPARATOR + dataTableName;
- String indexName = generateRandomString();
+ String indexName = generateUniqueName();
Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
Connection conn = DriverManager.getConnection(getUrl(), props);
@@ -633,9 +634,9 @@ public class IndexExpressionIT extends ParallelStatsDisabledIT {
}
protected void helpTestSelectAliasAndOrderByWithIndex(boolean mutable, boolean localIndex) throws Exception {
- String dataTableName = generateRandomString();
+ String dataTableName = generateUniqueName();
String fullDataTableName = INDEX_DATA_SCHEMA + QueryConstants.NAME_SEPARATOR + dataTableName;
- String indexName = generateRandomString();
+ String indexName = generateUniqueName();
Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
Connection conn = DriverManager.getConnection(getUrl(), props);
@@ -688,8 +689,8 @@ public class IndexExpressionIT extends ParallelStatsDisabledIT {
}
protected void helpTestIndexWithCaseSensitiveCols(boolean mutable, boolean localIndex) throws Exception {
- String dataTableName = generateRandomString();
- String indexName = generateRandomString();
+ String dataTableName = generateUniqueName();
+ String indexName = generateUniqueName();
Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
Connection conn = DriverManager.getConnection(getUrl(), props);
@@ -798,9 +799,9 @@ public class IndexExpressionIT extends ParallelStatsDisabledIT {
}
protected void helpTestSelectColOnlyInDataTable(boolean mutable, boolean localIndex) throws Exception {
- String dataTableName = generateRandomString();
+ String dataTableName = generateUniqueName();
String fullDataTableName = INDEX_DATA_SCHEMA + QueryConstants.NAME_SEPARATOR + dataTableName;
- String indexName = generateRandomString();
+ String indexName = generateUniqueName();
Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
Connection conn = DriverManager.getConnection(getUrl(), props);
@@ -861,9 +862,9 @@ public class IndexExpressionIT extends ParallelStatsDisabledIT {
Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
Connection conn = DriverManager.getConnection(getUrl(), props);
- String dataTableName = generateRandomString();
+ String dataTableName = generateUniqueName();
String fullDataTableName = INDEX_DATA_SCHEMA + QueryConstants.NAME_SEPARATOR + dataTableName;
- String indexName = generateRandomString();
+ String indexName = generateUniqueName();
try {
conn.setAutoCommit(false);
@@ -946,9 +947,9 @@ public class IndexExpressionIT extends ParallelStatsDisabledIT {
public void helpTestDropCoveredColumn(boolean mutable, boolean local) throws Exception {
ResultSet rs;
PreparedStatement stmt;
- String dataTableName = generateRandomString();
+ String dataTableName = generateUniqueName();
String fullDataTableName = INDEX_DATA_SCHEMA + QueryConstants.NAME_SEPARATOR + dataTableName;
- String indexName = generateRandomString();
+ String indexName = generateUniqueName();
Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
Connection conn = DriverManager.getConnection(getUrl(), props);
@@ -1058,9 +1059,9 @@ public class IndexExpressionIT extends ParallelStatsDisabledIT {
ResultSet rs;
PreparedStatement stmt;
- String dataTableName = generateRandomString();
+ String dataTableName = generateUniqueName();
String fullDataTableName = INDEX_DATA_SCHEMA + QueryConstants.NAME_SEPARATOR + dataTableName;
- String indexName = generateRandomString();
+ String indexName = generateUniqueName();
Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
Connection conn = DriverManager.getConnection(getUrl(), props);
@@ -1181,11 +1182,11 @@ public class IndexExpressionIT extends ParallelStatsDisabledIT {
private void helpTestUpdatableViewIndex(boolean local) throws Exception {
Connection conn = DriverManager.getConnection(getUrl());
- String dataTableName = generateRandomString();
+ String dataTableName = generateUniqueName();
String fullDataTableName = INDEX_DATA_SCHEMA + QueryConstants.NAME_SEPARATOR + dataTableName;
- String indexName1 = generateRandomString();
- String viewName = generateRandomString();
- String indexName2 = generateRandomString();
+ String indexName1 = generateUniqueName();
+ String viewName = generateUniqueName();
+ String indexName2 = generateUniqueName();
try {
String ddl = "CREATE TABLE " + dataTableName + " (k1 INTEGER NOT NULL, k2 INTEGER NOT NULL, k3 DECIMAL, s1 VARCHAR, s2 VARCHAR CONSTRAINT pk PRIMARY KEY (k1, k2, k3))";
conn.createStatement().execute(ddl);
@@ -1247,10 +1248,10 @@ public class IndexExpressionIT extends ParallelStatsDisabledIT {
Connection conn = DriverManager.getConnection(getUrl());
try
{
- String dataTableName = generateRandomString();
- String indexName1 = generateRandomString();
- String viewName = generateRandomString();
- String indexName2 = generateRandomString();
+ String dataTableName = generateUniqueName();
+ String indexName1 = generateUniqueName();
+ String viewName = generateUniqueName();
+ String indexName2 = generateUniqueName();
ResultSet rs;
String ddl = "CREATE TABLE " + dataTableName + " (k1 INTEGER NOT NULL, k2 INTEGER NOT NULL, s1 VARCHAR, s2 VARCHAR, s3 VARCHAR, s4 VARCHAR CONSTRAINT pk PRIMARY KEY (k1, k2))";
conn.createStatement().execute(ddl);
@@ -1300,8 +1301,8 @@ public class IndexExpressionIT extends ParallelStatsDisabledIT {
@Test
public void testExpressionThrowsException() throws Exception {
Connection conn = DriverManager.getConnection(getUrl());
- String dataTableName = generateRandomString();
- String indexName = generateRandomString();
+ String dataTableName = generateUniqueName();
+ String indexName = generateUniqueName();
try {
String ddl = "CREATE TABLE " + dataTableName + " (k1 INTEGER PRIMARY KEY, k2 INTEGER)";
conn.createStatement().execute(ddl);
@@ -1344,8 +1345,8 @@ public class IndexExpressionIT extends ParallelStatsDisabledIT {
boolean localIndex) throws Exception {
Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
Connection conn = DriverManager.getConnection(getUrl(), props);
- String dataTableName = generateRandomString();
- String indexName = generateRandomString();
+ String dataTableName = generateUniqueName();
+ String indexName = generateUniqueName();
try {
conn.createStatement().execute(
"CREATE TABLE " + dataTableName + " (k VARCHAR NOT NULL PRIMARY KEY, v VARCHAR) "
@@ -1417,8 +1418,8 @@ public class IndexExpressionIT extends ParallelStatsDisabledIT {
boolean localIndex) throws Exception {
Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
Connection conn = DriverManager.getConnection(getUrl(), props);
- String dataTableName = generateRandomString();
- String indexName = generateRandomString();
+ String dataTableName = generateUniqueName();
+ String indexName = generateUniqueName();
try {
conn.createStatement().execute(
"CREATE TABLE " + dataTableName + " ("
http://git-wip-us.apache.org/repos/asf/phoenix/blob/bebb5ced/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexIT.java
index 2e07aef..e2bc873 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexIT.java
@@ -124,13 +124,13 @@ public class IndexIT extends ParallelStatsDisabledIT {
@Test
public void testIndexWithNullableFixedWithCols() throws Exception {
Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
- String tableName = "TBL_" + generateRandomString();
- String indexName = "IND_" + generateRandomString();
+ String tableName = "TBL_" + generateUniqueName();
+ String indexName = "IND_" + generateUniqueName();
String fullTableName = SchemaUtil.getTableName(TestUtil.DEFAULT_SCHEMA_NAME, tableName);
try (Connection conn = DriverManager.getConnection(getUrl(), props)) {
conn.setAutoCommit(false);
- String ddl ="CREATE TABLE " + fullTableName + BaseTest.TEST_TABLE_SCHEMA + tableDDLOptions;
+ String ddl ="CREATE TABLE " + fullTableName + TestUtil.TEST_TABLE_SCHEMA + tableDDLOptions;
Statement stmt = conn.createStatement();
stmt.execute(ddl);
BaseTest.populateTestTable(fullTableName);
@@ -184,13 +184,13 @@ public class IndexIT extends ParallelStatsDisabledIT {
@Test
public void testDeleteFromAllPKColumnIndex() throws Exception {
Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
- String tableName = "TBL_" + generateRandomString();
- String indexName = "IND_" + generateRandomString();
+ String tableName = "TBL_" + generateUniqueName();
+ String indexName = "IND_" + generateUniqueName();
String fullTableName = SchemaUtil.getTableName(TestUtil.DEFAULT_SCHEMA_NAME, tableName);
String fullIndexName = SchemaUtil.getTableName(TestUtil.DEFAULT_SCHEMA_NAME, indexName);
try (Connection conn = DriverManager.getConnection(getUrl(), props)) {
conn.setAutoCommit(false);
- String ddl ="CREATE TABLE " + fullTableName + BaseTest.TEST_TABLE_SCHEMA + tableDDLOptions;
+ String ddl ="CREATE TABLE " + fullTableName + TestUtil.TEST_TABLE_SCHEMA + tableDDLOptions;
Statement stmt = conn.createStatement();
stmt.execute(ddl);
BaseTest.populateTestTable(fullTableName);
@@ -242,8 +242,8 @@ public class IndexIT extends ParallelStatsDisabledIT {
@Test
public void testCreateIndexAfterUpsertStarted() throws Exception {
- String tableName = "TBL_" + generateRandomString();
- String indexName = "IND_" + generateRandomString();
+ String tableName = "TBL_" + generateUniqueName();
+ String indexName = "IND_" + generateUniqueName();
String fullTableName = SchemaUtil.getTableName(TestUtil.DEFAULT_SCHEMA_NAME, tableName);
String fullIndexName = SchemaUtil.getTableName(TestUtil.DEFAULT_SCHEMA_NAME, indexName);
testCreateIndexAfterUpsertStarted(false, fullTableName + "1", fullIndexName + "1");
@@ -256,7 +256,7 @@ public class IndexIT extends ParallelStatsDisabledIT {
Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
try (Connection conn1 = DriverManager.getConnection(getUrl(), props)) {
conn1.setAutoCommit(true);
- String ddl ="CREATE TABLE " + fullTableName + BaseTest.TEST_TABLE_SCHEMA + tableDDLOptions;
+ String ddl ="CREATE TABLE " + fullTableName + TestUtil.TEST_TABLE_SCHEMA + tableDDLOptions;
Statement stmt1 = conn1.createStatement();
stmt1.execute(ddl);
BaseTest.populateTestTable(fullTableName);
@@ -343,12 +343,12 @@ public class IndexIT extends ParallelStatsDisabledIT {
@Test
public void testDeleteFromNonPKColumnIndex() throws Exception {
Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
- String tableName = "TBL_" + generateRandomString();
- String indexName = "IND_" + generateRandomString();
+ String tableName = "TBL_" + generateUniqueName();
+ String indexName = "IND_" + generateUniqueName();
String fullTableName = SchemaUtil.getTableName(TestUtil.DEFAULT_SCHEMA_NAME, tableName);
String fullIndexName = SchemaUtil.getTableName(TestUtil.DEFAULT_SCHEMA_NAME, indexName);
- String ddl ="CREATE TABLE " + fullTableName + BaseTest.TEST_TABLE_SCHEMA + tableDDLOptions;
+ String ddl ="CREATE TABLE " + fullTableName + TestUtil.TEST_TABLE_SCHEMA + tableDDLOptions;
try (Connection conn = DriverManager.getConnection(getUrl(), props)) {
conn.setAutoCommit(false);
Statement stmt = conn.createStatement();
@@ -398,12 +398,12 @@ public class IndexIT extends ParallelStatsDisabledIT {
@Test
public void testGroupByCount() throws Exception {
Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
- String tableName = "TBL_" + generateRandomString();
- String indexName = "IND_" + generateRandomString();
+ String tableName = "TBL_" + generateUniqueName();
+ String indexName = "IND_" + generateUniqueName();
String fullTableName = SchemaUtil.getTableName(TestUtil.DEFAULT_SCHEMA_NAME, tableName);
try (Connection conn = DriverManager.getConnection(getUrl(), props)) {
conn.setAutoCommit(false);
- String ddl ="CREATE TABLE " + fullTableName + BaseTest.TEST_TABLE_SCHEMA + tableDDLOptions;
+ String ddl ="CREATE TABLE " + fullTableName + TestUtil.TEST_TABLE_SCHEMA + tableDDLOptions;
Statement stmt = conn.createStatement();
stmt.execute(ddl);
BaseTest.populateTestTable(fullTableName);
@@ -419,12 +419,12 @@ public class IndexIT extends ParallelStatsDisabledIT {
@Test
public void testSelectDistinctOnTableWithSecondaryImmutableIndex() throws Exception {
Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
- String tableName = "TBL_" + generateRandomString();
- String indexName = "IND_" + generateRandomString();
+ String tableName = "TBL_" + generateUniqueName();
+ String indexName = "IND_" + generateUniqueName();
String fullTableName = SchemaUtil.getTableName(TestUtil.DEFAULT_SCHEMA_NAME, tableName);
try (Connection conn = DriverManager.getConnection(getUrl(), props)) {
conn.setAutoCommit(false);
- String ddl ="CREATE TABLE " + fullTableName + BaseTest.TEST_TABLE_SCHEMA + tableDDLOptions;
+ String ddl ="CREATE TABLE " + fullTableName + TestUtil.TEST_TABLE_SCHEMA + tableDDLOptions;
Statement stmt = conn.createStatement();
stmt.execute(ddl);
BaseTest.populateTestTable(fullTableName);
@@ -445,12 +445,12 @@ public class IndexIT extends ParallelStatsDisabledIT {
@Test
public void testInClauseWithIndexOnColumnOfUsignedIntType() throws Exception {
Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
- String tableName = "TBL_" + generateRandomString();
- String indexName = "IND_" + generateRandomString();
+ String tableName = "TBL_" + generateUniqueName();
+ String indexName = "IND_" + generateUniqueName();
String fullTableName = SchemaUtil.getTableName(TestUtil.DEFAULT_SCHEMA_NAME, tableName);
try (Connection conn = DriverManager.getConnection(getUrl(), props)) {
conn.setAutoCommit(false);
- String ddl ="CREATE TABLE " + fullTableName + BaseTest.TEST_TABLE_SCHEMA + tableDDLOptions;
+ String ddl ="CREATE TABLE " + fullTableName + TestUtil.TEST_TABLE_SCHEMA + tableDDLOptions;
Statement stmt = conn.createStatement();
stmt.execute(ddl);
BaseTest.populateTestTable(fullTableName);
@@ -470,8 +470,8 @@ public class IndexIT extends ParallelStatsDisabledIT {
@Test
public void createIndexOnTableWithSpecifiedDefaultCF() throws Exception {
Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
- String tableName = "TBL_" + generateRandomString();
- String indexName = "IND_" + generateRandomString();
+ String tableName = "TBL_" + generateUniqueName();
+ String indexName = "IND_" + generateUniqueName();
String fullTableName = SchemaUtil.getTableName(TestUtil.DEFAULT_SCHEMA_NAME, tableName);
String fullIndexName = SchemaUtil.getTableName(TestUtil.DEFAULT_SCHEMA_NAME, indexName);
try (Connection conn = DriverManager.getConnection(getUrl(), props)) {
@@ -512,8 +512,8 @@ public class IndexIT extends ParallelStatsDisabledIT {
@Test
public void testIndexWithNullableDateCol() throws Exception {
- String tableName = "TBL_" + generateRandomString();
- String indexName = "IND_" + generateRandomString();
+ String tableName = "TBL_" + generateUniqueName();
+ String indexName = "IND_" + generateUniqueName();
String fullTableName = SchemaUtil.getTableName(TestUtil.DEFAULT_SCHEMA_NAME, tableName);
String fullIndexName = SchemaUtil.getTableName(TestUtil.DEFAULT_SCHEMA_NAME, indexName);
Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
@@ -572,8 +572,8 @@ public class IndexIT extends ParallelStatsDisabledIT {
@Test
public void testSelectAllAndAliasWithIndex() throws Exception {
Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
- String tableName = "TBL_" + generateRandomString();
- String indexName = "IND_" + generateRandomString();
+ String tableName = "TBL_" + generateUniqueName();
+ String indexName = "IND_" + generateUniqueName();
String fullTableName = SchemaUtil.getTableName(TestUtil.DEFAULT_SCHEMA_NAME, tableName);
String fullIndexName = SchemaUtil.getTableName(TestUtil.DEFAULT_SCHEMA_NAME, indexName);
try (Connection conn = DriverManager.getConnection(getUrl(), props)) {
@@ -651,8 +651,8 @@ public class IndexIT extends ParallelStatsDisabledIT {
@Test
public void testSelectCF() throws Exception {
Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
- String tableName = "TBL_" + generateRandomString();
- String indexName = "IND_" + generateRandomString();
+ String tableName = "TBL_" + generateUniqueName();
+ String indexName = "IND_" + generateUniqueName();
String fullTableName = SchemaUtil.getTableName(TestUtil.DEFAULT_SCHEMA_NAME, tableName);
String fullIndexName = SchemaUtil.getTableName(TestUtil.DEFAULT_SCHEMA_NAME, indexName);
try (Connection conn = DriverManager.getConnection(getUrl(), props)) {
@@ -712,8 +712,8 @@ public class IndexIT extends ParallelStatsDisabledIT {
@Test
public void testUpsertAfterIndexDrop() throws Exception {
Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
- String tableName = "TBL_" + generateRandomString();
- String indexName = "IND_" + generateRandomString();
+ String tableName = "TBL_" + generateUniqueName();
+ String indexName = "IND_" + generateUniqueName();
String fullTableName = SchemaUtil.getTableName(TestUtil.DEFAULT_SCHEMA_NAME, tableName);
String fullIndexName = SchemaUtil.getTableName(TestUtil.DEFAULT_SCHEMA_NAME, indexName);
try (Connection conn = DriverManager.getConnection(getUrl(), props)) {
@@ -776,8 +776,8 @@ public class IndexIT extends ParallelStatsDisabledIT {
@Test
public void testMultipleUpdatesAcrossRegions() throws Exception {
Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
- String tableName = "TBL_" + generateRandomString();
- String indexName = "IND_" + generateRandomString();
+ String tableName = "TBL_" + generateUniqueName();
+ String indexName = "IND_" + generateUniqueName();
String fullTableName = SchemaUtil.getTableName(TestUtil.DEFAULT_SCHEMA_NAME, tableName);
String fullIndexName = SchemaUtil.getTableName(TestUtil.DEFAULT_SCHEMA_NAME, indexName);
@@ -869,8 +869,8 @@ public class IndexIT extends ParallelStatsDisabledIT {
@Test
public void testIndexWithCaseSensitiveCols() throws Exception {
Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
- String tableName = "TBL_" + generateRandomString();
- String indexName = "IND_" + generateRandomString();
+ String tableName = "TBL_" + generateUniqueName();
+ String indexName = "IND_" + generateUniqueName();
String fullTableName = SchemaUtil.getTableName(TestUtil.DEFAULT_SCHEMA_NAME, tableName);
String fullIndexName = SchemaUtil.getTableName(TestUtil.DEFAULT_SCHEMA_NAME, indexName);
try (Connection conn = DriverManager.getConnection(getUrl(), props)) {
@@ -984,8 +984,8 @@ public class IndexIT extends ParallelStatsDisabledIT {
@Test
public void testInFilterOnIndexedTable() throws Exception {
Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
- String tableName = "TBL_" + generateRandomString();
- String indexName = "IND_" + generateRandomString();
+ String tableName = "TBL_" + generateUniqueName();
+ String indexName = "IND_" + generateUniqueName();
String fullTableName = SchemaUtil.getTableName(TestUtil.DEFAULT_SCHEMA_NAME, tableName);
try (Connection conn = DriverManager.getConnection(getUrl(), props)) {
conn.setAutoCommit(false);
@@ -1005,8 +1005,8 @@ public class IndexIT extends ParallelStatsDisabledIT {
@Test
public void testIndexWithDecimalCol() throws Exception {
Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
- String tableName = "TBL_" + generateRandomString();
- String indexName = "IND_" + generateRandomString();
+ String tableName = "TBL_" + generateUniqueName();
+ String indexName = "IND_" + generateUniqueName();
String fullTableName = SchemaUtil.getTableName(TestUtil.DEFAULT_SCHEMA_NAME, tableName);
String fullIndexName = SchemaUtil.getTableName(TestUtil.DEFAULT_SCHEMA_NAME, indexName);
try (Connection conn = DriverManager.getConnection(getUrl(), props)) {
@@ -1052,8 +1052,8 @@ public class IndexIT extends ParallelStatsDisabledIT {
*/
@Test
public void testTableDescriptorPriority() throws SQLException, IOException {
- String tableName = "TBL_" + generateRandomString();
- String indexName = "IND_" + generateRandomString();
+ String tableName = "TBL_" + generateUniqueName();
+ String indexName = "IND_" + generateUniqueName();
String fullTableName = SchemaUtil.getTableName(TestUtil.DEFAULT_SCHEMA_NAME, tableName);
// Check system tables priorities.
try (HBaseAdmin admin = driver.getConnectionQueryServices(null, null).getAdmin()) {
@@ -1067,7 +1067,7 @@ public class IndexIT extends ParallelStatsDisabledIT {
}
Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
- String ddl ="CREATE TABLE " + fullTableName + BaseTest.TEST_TABLE_SCHEMA + tableDDLOptions;
+ String ddl ="CREATE TABLE " + fullTableName + TestUtil.TEST_TABLE_SCHEMA + tableDDLOptions;
try (Connection conn = DriverManager.getConnection(getUrl(), props)) {
conn.setAutoCommit(false);
Statement stmt = conn.createStatement();
http://git-wip-us.apache.org/repos/asf/phoenix/blob/bebb5ced/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexMetadataIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexMetadataIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexMetadataIT.java
index 3372b6a..f0c670b 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexMetadataIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexMetadataIT.java
@@ -50,6 +50,7 @@ import org.apache.phoenix.schema.types.PDate;
import org.apache.phoenix.util.PropertiesUtil;
import org.apache.phoenix.util.SchemaUtil;
import org.apache.phoenix.util.StringUtil;
+import org.apache.phoenix.util.TestUtil;
import org.junit.Test;
@@ -119,11 +120,11 @@ public class IndexMetadataIT extends ParallelStatsDisabledIT {
Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
Connection conn = DriverManager.getConnection(getUrl(), props);
conn.setAutoCommit(false);
- String indexDataTable = generateRandomString();
+ String indexDataTable = generateUniqueName();
String fullIndexDataTable = INDEX_DATA_SCHEMA + QueryConstants.NAME_SEPARATOR + indexDataTable;
- String indexName = generateRandomString();
+ String indexName = generateUniqueName();
try {
- String tableDDL = "create table " + fullIndexDataTable + TEST_TABLE_SCHEMA;
+ String tableDDL = "create table " + fullIndexDataTable + TestUtil.TEST_TABLE_SCHEMA;
conn.createStatement().execute(tableDDL);
String ddl = "CREATE INDEX " + indexName + " ON " + fullIndexDataTable
+ " (varchar_col1 ASC, varchar_col2 ASC, int_pk DESC)"
@@ -296,12 +297,12 @@ public class IndexMetadataIT extends ParallelStatsDisabledIT {
// column. The definition is defined in IndexUtil.getIndexColumnDataType.
Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
Connection conn = DriverManager.getConnection(getUrl(), props);
- String indexDataTable = generateRandomString();
- String indexName = generateRandomString();
+ String indexDataTable = generateUniqueName();
+ String indexName = generateUniqueName();
conn.setAutoCommit(false);
try {
String fullTableName = INDEX_DATA_SCHEMA + QueryConstants.NAME_SEPARATOR + indexDataTable;
- conn.createStatement().execute("create table " + fullTableName + TEST_TABLE_SCHEMA + "IMMUTABLE_ROWS=true");
+ conn.createStatement().execute("create table " + fullTableName + TestUtil.TEST_TABLE_SCHEMA + "IMMUTABLE_ROWS=true");
String ddl = "CREATE INDEX " + indexName + " ON " + fullTableName
+ " (char_col1 ASC, int_col2 ASC, long_col2 DESC)"
+ " INCLUDE (int_col1)";
@@ -359,10 +360,10 @@ public class IndexMetadataIT extends ParallelStatsDisabledIT {
Connection conn = DriverManager.getConnection(getUrl(), props);
conn.setAutoCommit(false);
String indexName = "\"lowerCaseIndex\"";
- String indexDataTable = generateRandomString();
+ String indexDataTable = generateUniqueName();
try {
String fullTableName = INDEX_DATA_SCHEMA + QueryConstants.NAME_SEPARATOR + indexDataTable;
- conn.createStatement().execute("create table " + fullTableName + TEST_TABLE_SCHEMA + "IMMUTABLE_ROWS=true");
+ conn.createStatement().execute("create table " + fullTableName + TestUtil.TEST_TABLE_SCHEMA + "IMMUTABLE_ROWS=true");
String ddl = "CREATE INDEX " + indexName + " ON " + fullTableName
+ " (char_col1 ASC, int_col2 ASC, long_col2 DESC)"
+ " INCLUDE (int_col1)";
@@ -394,11 +395,11 @@ public class IndexMetadataIT extends ParallelStatsDisabledIT {
Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
Connection conn = DriverManager.getConnection(getUrl(), props);
conn.setAutoCommit(false);
- String indexDataTable = generateRandomString();
- String indexName = generateRandomString();
+ String indexDataTable = generateUniqueName();
+ String indexName = generateUniqueName();
try {
String fullTableName = INDEX_DATA_SCHEMA + QueryConstants.NAME_SEPARATOR + indexDataTable;
- conn.createStatement().execute("create table " + fullTableName + TEST_TABLE_SCHEMA + "IMMUTABLE_ROWS=true");
+ conn.createStatement().execute("create table " + fullTableName + TestUtil.TEST_TABLE_SCHEMA + "IMMUTABLE_ROWS=true");
String ddl = "CREATE INDEX " + indexName + " ON " + fullTableName
+ " (a.int_col1, a.long_col1, b.int_col2, b.long_col2)"
+ " INCLUDE(int_col1, int_col2)";
@@ -456,8 +457,8 @@ public class IndexMetadataIT extends ParallelStatsDisabledIT {
Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
Connection conn = DriverManager.getConnection(getUrl(), props);
conn.setAutoCommit(false);
- String testTable = generateRandomString();
- String indexName = generateRandomString();
+ String testTable = generateUniqueName();
+ String indexName = generateUniqueName();
String ddl = "create table " + testTable + " (char_pk varchar not null,"
+ " a.int_col integer, a.long_col integer,"
+ " b.int_col integer, b.long_col integer"
@@ -483,8 +484,8 @@ public class IndexMetadataIT extends ParallelStatsDisabledIT {
@Test
public void testBinaryNonnullableIndex() throws Exception {
Connection conn = DriverManager.getConnection(getUrl());
- String testTable = generateRandomString();
- String indexName = generateRandomString();
+ String testTable = generateUniqueName();
+ String indexName = generateUniqueName();
try {
String ddl =
"CREATE TABLE " + testTable + " ( "
@@ -533,13 +534,13 @@ public class IndexMetadataIT extends ParallelStatsDisabledIT {
Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
Connection conn = DriverManager.getConnection(getUrl(), props);
conn.setAutoCommit(false);
- String testTable = generateRandomString();
+ String testTable = generateUniqueName();
String ddl = "create table " + testTable + " (k varchar primary key, v1 varchar, v2 varchar, v3 varchar)";
PreparedStatement stmt = conn.prepareStatement(ddl);
stmt.execute();
- String indexName = "ASYNCIND_" + generateRandomString();
+ String indexName = "ASYNCIND_" + generateUniqueName();
ddl = "CREATE INDEX " + indexName + "1 ON " + testTable + " (v1) ASYNC";
stmt = conn.prepareStatement(ddl);
http://git-wip-us.apache.org/repos/asf/phoenix/blob/bebb5ced/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/LocalIndexIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/LocalIndexIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/LocalIndexIT.java
index 9a279bb..214b7ba 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/LocalIndexIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/LocalIndexIT.java
@@ -80,7 +80,7 @@ public class LocalIndexIT extends ParallelStatsDisabledIT {
@Before
public void setup() {
- schemaName = BaseTest.generateRandomString();
+ schemaName = BaseTest.generateUniqueName();
}
private void createBaseTable(String tableName, Integer saltBuckets, String splits) throws SQLException {
@@ -107,8 +107,8 @@ public class LocalIndexIT extends ParallelStatsDisabledIT {
@Test
public void testLocalIndexRoundTrip() throws Exception {
- String tableName = schemaName + "." + generateRandomString();
- String indexName = "IDX_" + generateRandomString();
+ String tableName = schemaName + "." + generateUniqueName();
+ String indexName = "IDX_" + generateUniqueName();
String indexTableName = schemaName + "." + indexName;
createBaseTable(tableName, null, null);
@@ -131,8 +131,8 @@ public class LocalIndexIT extends ParallelStatsDisabledIT {
@Test
public void testLocalIndexCreationWithSplitsShouldFail() throws Exception {
- String tableName = schemaName + "." + generateRandomString();
- String indexName = "IDX_" + generateRandomString();
+ String tableName = schemaName + "." + generateUniqueName();
+ String indexName = "IDX_" + generateUniqueName();
createBaseTable(tableName, null, null);
Connection conn1 = getConnection();
@@ -150,8 +150,8 @@ public class LocalIndexIT extends ParallelStatsDisabledIT {
@Test
public void testLocalIndexCreationWithSaltingShouldFail() throws Exception {
- String tableName = schemaName + "." + generateRandomString();
- String indexName = "IDX_" + generateRandomString();
+ String tableName = schemaName + "." + generateUniqueName();
+ String indexName = "IDX_" + generateUniqueName();
createBaseTable(tableName, null, null);
Connection conn1 = getConnection();
@@ -169,8 +169,8 @@ public class LocalIndexIT extends ParallelStatsDisabledIT {
@Test
public void testLocalIndexTableRegionSplitPolicyAndSplitKeys() throws Exception {
- String tableName = schemaName + "." + generateRandomString();
- String indexName = "IDX_" + generateRandomString();
+ String tableName = schemaName + "." + generateUniqueName();
+ String indexName = "IDX_" + generateUniqueName();
TableName physicalTableName = SchemaUtil.getPhysicalTableName(tableName.getBytes(), isNamespaceMapped);
String indexPhysicalTableName = physicalTableName.getNameAsString();
@@ -200,8 +200,8 @@ public class LocalIndexIT extends ParallelStatsDisabledIT {
@Test
public void testDropLocalIndexTable() throws Exception {
- String tableName = schemaName + "." + generateRandomString();
- String indexName = "IDX_" + generateRandomString();
+ String tableName = schemaName + "." + generateUniqueName();
+ String indexName = "IDX_" + generateUniqueName();
createBaseTable(tableName, null, null);
String sequenceName = getViewIndexSequenceName(PNameFactory.newName(tableName), null, isNamespaceMapped);
@@ -219,8 +219,8 @@ public class LocalIndexIT extends ParallelStatsDisabledIT {
@Test
public void testPutsToLocalIndexTable() throws Exception {
- String tableName = schemaName + "." + generateRandomString();
- String indexName = "IDX_" + generateRandomString();
+ String tableName = schemaName + "." + generateUniqueName();
+ String indexName = "IDX_" + generateUniqueName();
String indexTableName = schemaName + "." + indexName;
TableName physicalTableName = SchemaUtil.getPhysicalTableName(tableName.getBytes(), isNamespaceMapped);
String indexPhysicalTableName = physicalTableName.getNameAsString();
@@ -259,8 +259,8 @@ public class LocalIndexIT extends ParallelStatsDisabledIT {
@Test
public void testBuildIndexWhenUserTableAlreadyHasData() throws Exception {
- String tableName = schemaName + "." + generateRandomString();
- String indexName = "IDX_" + generateRandomString();
+ String tableName = schemaName + "." + generateUniqueName();
+ String indexName = "IDX_" + generateUniqueName();
String indexTableName = schemaName + "." + indexName;
TableName physicalTableName = SchemaUtil.getPhysicalTableName(tableName.getBytes(), isNamespaceMapped);
String indexPhysicalTableName = physicalTableName.getNameAsString();
@@ -299,8 +299,8 @@ public class LocalIndexIT extends ParallelStatsDisabledIT {
@Test
public void testLocalIndexScan() throws Exception {
- String tableName = schemaName + "." + generateRandomString();
- String indexName = "IDX_" + generateRandomString();
+ String tableName = schemaName + "." + generateUniqueName();
+ String indexName = "IDX_" + generateUniqueName();
String indexTableName = schemaName + "." + indexName;
TableName physicalTableName = SchemaUtil.getPhysicalTableName(tableName.getBytes(), isNamespaceMapped);
String indexPhysicalTableName = physicalTableName.getNameAsString();
@@ -437,8 +437,8 @@ public class LocalIndexIT extends ParallelStatsDisabledIT {
@Test
public void testLocalIndexScanJoinColumnsFromDataTable() throws Exception {
- String tableName = schemaName + "." + generateRandomString();
- String indexName = "IDX_" + generateRandomString();
+ String tableName = schemaName + "." + generateUniqueName();
+ String indexName = "IDX_" + generateUniqueName();
String indexTableName = schemaName + "." + indexName;
TableName physicalTableName = SchemaUtil.getPhysicalTableName(tableName.getBytes(), isNamespaceMapped);
String indexPhysicalTableName = physicalTableName.getNameAsString();
@@ -577,8 +577,8 @@ public class LocalIndexIT extends ParallelStatsDisabledIT {
@Test
public void testIndexPlanSelectionIfBothGlobalAndLocalIndexesHasSameColumnsAndOrder() throws Exception {
- String tableName = schemaName + "." + generateRandomString();
- String indexName = "IDX_" + generateRandomString();
+ String tableName = schemaName + "." + generateUniqueName();
+ String indexName = "IDX_" + generateUniqueName();
String indexTableName = schemaName + "." + indexName;
createBaseTable(tableName, null, "('e','i','o')");
@@ -601,8 +601,8 @@ public class LocalIndexIT extends ParallelStatsDisabledIT {
@Test
public void testDropLocalIndexShouldDeleteDataFromLocalIndexTable() throws Exception {
- String tableName = schemaName + "." + generateRandomString();
- String indexName = "IDX_" + generateRandomString();
+ String tableName = schemaName + "." + generateUniqueName();
+ String indexName = "IDX_" + generateUniqueName();
createBaseTable(tableName, null, "('e','i','o')");
Connection conn1 = DriverManager.getConnection(getUrl());
@@ -646,8 +646,8 @@ public class LocalIndexIT extends ParallelStatsDisabledIT {
@Test
public void testLocalIndexRowsShouldBeDeletedWhenUserTableRowsDeleted() throws Exception {
- String tableName = schemaName + "." + generateRandomString();
- String indexName = "IDX_" + generateRandomString();
+ String tableName = schemaName + "." + generateUniqueName();
+ String indexName = "IDX_" + generateUniqueName();
String indexTableName = schemaName + "." + indexName;
createBaseTable(tableName, null, "('e','i','o')");
@@ -672,8 +672,8 @@ public class LocalIndexIT extends ParallelStatsDisabledIT {
@Test
public void testScanWhenATableHasMultipleLocalIndexes() throws Exception {
- String tableName = schemaName + "." + generateRandomString();
- String indexName = "IDX_" + generateRandomString();
+ String tableName = schemaName + "." + generateUniqueName();
+ String indexName = "IDX_" + generateUniqueName();
createBaseTable(tableName, null, "('e','i','o')");
Connection conn1 = DriverManager.getConnection(getUrl());
@@ -697,8 +697,8 @@ public class LocalIndexIT extends ParallelStatsDisabledIT {
@Test
public void testLocalIndexesOnTableWithImmutableRows() throws Exception {
- String tableName = schemaName + "." + generateRandomString();
- String indexName = "IDX_" + generateRandomString();
+ String tableName = schemaName + "." + generateUniqueName();
+ String indexName = "IDX_" + generateUniqueName();
createBaseTable(tableName, null, "('e','i','o')");
Connection conn1 = getConnection();
@@ -743,8 +743,8 @@ public class LocalIndexIT extends ParallelStatsDisabledIT {
@Test
public void testLocalIndexScanWithInList() throws Exception {
- String tableName = schemaName + "." + generateRandomString();
- String indexName = "IDX_" + generateRandomString();
+ String tableName = schemaName + "." + generateUniqueName();
+ String indexName = "IDX_" + generateUniqueName();
String indexTableName = schemaName + "." + indexName;
createBaseTable(tableName, null, "('e','i','o')");
@@ -777,8 +777,8 @@ public class LocalIndexIT extends ParallelStatsDisabledIT {
Connection conn1 = DriverManager.getConnection(getUrl());
try{
Statement statement = conn1.createStatement();
- String tableName = generateRandomString();
- String indexName = generateRandomString();
+ String tableName = generateUniqueName();
+ String indexName = generateUniqueName();
statement.execute("create table " + tableName + " (id integer not null,fn varchar,"
+ "ln varchar constraint pk primary key(id)) DEFAULT_COLUMN_FAMILY='F'");
statement.execute("upsert into " + tableName + " values(1,'fn','ln')");
@@ -794,8 +794,8 @@ public class LocalIndexIT extends ParallelStatsDisabledIT {
@Test
public void testLocalIndexScanWithSmallChunks() throws Exception {
- String tableName = schemaName + "." + generateRandomString();
- String indexName = "IDX_" + generateRandomString();
+ String tableName = schemaName + "." + generateUniqueName();
+ String indexName = "IDX_" + generateUniqueName();
createBaseTable(tableName, 3, null);
Properties props = new Properties();
[5/6] phoenix git commit: PHOENIX-3253 Make changes to tests to
support method level parallelization
Posted by ja...@apache.org.
http://git-wip-us.apache.org/repos/asf/phoenix/blob/bebb5ced/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseTenantSpecificViewIndexIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseTenantSpecificViewIndexIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseTenantSpecificViewIndexIT.java
index 6b53cd5..c61d970 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseTenantSpecificViewIndexIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseTenantSpecificViewIndexIT.java
@@ -48,7 +48,7 @@ public class BaseTenantSpecificViewIndexIT extends ParallelStatsDisabledIT {
}
protected void testUpdatableView(Integer saltBuckets, boolean localIndex) throws Exception {
- String tableName = generateRandomString();
+ String tableName = generateUniqueName();
createBaseTable(tableName, saltBuckets, true);
Connection conn = createTenantConnection(TENANT1_ID);
try {
@@ -61,7 +61,7 @@ public class BaseTenantSpecificViewIndexIT extends ParallelStatsDisabledIT {
}
protected void testUpdatableViewNonString(Integer saltBuckets, boolean localIndex) throws Exception {
- String tableName = generateRandomString();
+ String tableName = generateUniqueName();
createBaseTable(tableName, saltBuckets, false);
Connection conn = createTenantConnection(NON_STRING_TENANT_ID);
try {
@@ -78,7 +78,7 @@ public class BaseTenantSpecificViewIndexIT extends ParallelStatsDisabledIT {
}
protected void testUpdatableViewsWithSameNameDifferentTenants(Integer saltBuckets, boolean localIndex) throws Exception {
- String tableName = generateRandomString();
+ String tableName = generateUniqueName();
createBaseTable(tableName, saltBuckets, true);
Connection conn1 = createTenantConnection(TENANT1_ID);
Connection conn2 = createTenantConnection(TENANT2_ID);
@@ -115,7 +115,7 @@ public class BaseTenantSpecificViewIndexIT extends ParallelStatsDisabledIT {
}
private String createAndPopulateTenantView(Connection conn, String tenantId, String baseTable, String valuePrefix) throws SQLException {
- String viewName = generateRandomString();
+ String viewName = generateUniqueName();
String ddl = "CREATE VIEW " + viewName + "(v2 VARCHAR) AS SELECT * FROM " + baseTable + " WHERE k1 = 1";
conn.createStatement().execute(ddl);
tenantViewsToDelete.add(new Pair<String, String>(tenantId, viewName ));
@@ -127,7 +127,7 @@ public class BaseTenantSpecificViewIndexIT extends ParallelStatsDisabledIT {
}
private void createAndVerifyIndex(Connection conn, String viewName, String tableName, Integer saltBuckets, String tenantId, String valuePrefix, boolean localIndex) throws SQLException {
- String indexName = generateRandomString();
+ String indexName = generateUniqueName();
if(localIndex){
conn.createStatement().execute("CREATE LOCAL INDEX " + indexName + " ON " + viewName + "(v2)");
} else {
@@ -157,7 +157,7 @@ public class BaseTenantSpecificViewIndexIT extends ParallelStatsDisabledIT {
}
private void createAndVerifyIndexNonStringTenantId(Connection conn, String viewName, String tableName, String tenantId, String valuePrefix) throws SQLException {
- String indexName = generateRandomString();
+ String indexName = generateUniqueName();
conn.createStatement().execute("CREATE LOCAL INDEX " + indexName + " ON " + viewName + "(v2)");
conn.createStatement().execute("UPSERT INTO " + viewName + "(k2,v1,v2) VALUES (-1, 'blah', 'superblah')"); // sanity check that we can upsert after index is there
conn.commit();
http://git-wip-us.apache.org/repos/asf/phoenix/blob/bebb5ced/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseViewIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseViewIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseViewIT.java
index 559c000..686b39f 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseViewIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseViewIT.java
@@ -83,7 +83,7 @@ public abstract class BaseViewIT extends ParallelStatsEnabledIT {
}
this.schemaName = TestUtil.DEFAULT_SCHEMA_NAME;
this.tableDDLOptions = optionBuilder.toString();
- this.tableName = "T_" + generateRandomString();
+ this.tableName = "T_" + generateUniqueName();
this.fullTableName = SchemaUtil.getTableName(schemaName, tableName);
}
@@ -126,7 +126,7 @@ public abstract class BaseViewIT extends ParallelStatsEnabledIT {
tableDDLOptions+=",";
tableDDLOptions+=(" SALT_BUCKETS="+saltBuckets);
}
- String viewName = "V_" + generateRandomString();
+ String viewName = "V_" + generateUniqueName();
String ddl = "CREATE TABLE " + fullTableName + " (k1 INTEGER NOT NULL, k2 INTEGER NOT NULL, k3 DECIMAL, s VARCHAR CONSTRAINT pk PRIMARY KEY (k1, k2, k3))" + tableDDLOptions;
conn.createStatement().execute(ddl);
ddl = "CREATE VIEW " + viewName + " AS SELECT * FROM " + fullTableName + " WHERE k1 = 1";
@@ -180,7 +180,7 @@ public abstract class BaseViewIT extends ParallelStatsEnabledIT {
protected Pair<String,Scan> testUpdatableViewIndex(Integer saltBuckets, boolean localIndex, String viewName) throws Exception {
ResultSet rs;
Connection conn = DriverManager.getConnection(getUrl());
- String viewIndexName1 = "I_" + generateRandomString();
+ String viewIndexName1 = "I_" + generateUniqueName();
String viewIndexPhysicalName = MetaDataUtil.getViewIndexName(schemaName, tableName);
if (localIndex) {
conn.createStatement().execute("CREATE LOCAL INDEX " + viewIndexName1 + " on " + viewName + "(k3)");
@@ -217,7 +217,7 @@ public abstract class BaseViewIT extends ParallelStatsEnabledIT {
queryPlan);
}
- String viewIndexName2 = "I_" + generateRandomString();
+ String viewIndexName2 = "I_" + generateUniqueName();
if (localIndex) {
conn.createStatement().execute("CREATE LOCAL INDEX " + viewIndexName2 + " on " + viewName + "(s)");
} else {
http://git-wip-us.apache.org/repos/asf/phoenix/blob/bebb5ced/phoenix-core/src/it/java/org/apache/phoenix/end2end/BinaryRowKeyIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/BinaryRowKeyIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/BinaryRowKeyIT.java
index 02c27cd..cc43df5 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/BinaryRowKeyIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/BinaryRowKeyIT.java
@@ -77,7 +77,7 @@ public class BinaryRowKeyIT extends ParallelStatsDisabledIT {
Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
Connection conn = DriverManager.getConnection(getUrl(), props);
try {
- String tableName = generateRandomString();
+ String tableName = generateUniqueName();
initTableValues(tableName);
conn.setAutoCommit(true);
conn.createStatement().execute("DELETE FROM " + tableName );
@@ -105,7 +105,7 @@ public class BinaryRowKeyIT extends ParallelStatsDisabledIT {
Connection conn = DriverManager.getConnection(getUrl(), props);
try {
- String tableName = generateRandomString();
+ String tableName = generateUniqueName();
initTableValues(tableName);
String query = "SELECT * FROM " + tableName;
PreparedStatement stmt = conn.prepareStatement(query);
@@ -131,7 +131,7 @@ public class BinaryRowKeyIT extends ParallelStatsDisabledIT {
Connection conn = DriverManager.getConnection(getUrl(), props);
try {
- String tableName = generateRandomString();
+ String tableName = generateUniqueName();
initTableValues(tableName);
String query = "UPSERT INTO " + tableName + " (a_binary, a_string, b_binary) "
http://git-wip-us.apache.org/repos/asf/phoenix/blob/bebb5ced/phoenix-core/src/it/java/org/apache/phoenix/end2end/CSVCommonsLoaderIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/CSVCommonsLoaderIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/CSVCommonsLoaderIT.java
index 8de2eda..9b5581d 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/CSVCommonsLoaderIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/CSVCommonsLoaderIT.java
@@ -103,7 +103,7 @@ public class CSVCommonsLoaderIT extends ParallelStatsDisabledIT {
CSVParser parser = null;
PhoenixConnection conn = null;
try {
- String stockTableName = generateRandomString();
+ String stockTableName = generateUniqueName();
// Create table
String statements = "CREATE TABLE IF NOT EXISTS " + stockTableName
+ "(SYMBOL VARCHAR NOT NULL PRIMARY KEY, COMPANY VARCHAR);";
@@ -147,7 +147,7 @@ public class CSVCommonsLoaderIT extends ParallelStatsDisabledIT {
PhoenixConnection globalConn = null;
PhoenixConnection tenantConn = null;
try {
- String stockTableMultiName = generateRandomString();
+ String stockTableMultiName = generateUniqueName();
// Create table using the global connection
String statements = "CREATE TABLE IF NOT EXISTS " + stockTableMultiName
@@ -196,7 +196,7 @@ public class CSVCommonsLoaderIT extends ParallelStatsDisabledIT {
CSVParser parser = null;
PhoenixConnection conn = null;
try {
- String stockTableName = generateRandomString();
+ String stockTableName = generateUniqueName();
// Create table
String statements = "CREATE TABLE IF NOT EXISTS " + stockTableName
@@ -240,7 +240,7 @@ public class CSVCommonsLoaderIT extends ParallelStatsDisabledIT {
CSVParser parser = null;
PhoenixConnection conn = null;
try {
- String stockTableName = generateRandomString();
+ String stockTableName = generateUniqueName();
// Create table
String statements = "CREATE TABLE IF NOT EXISTS " + stockTableName
@@ -285,7 +285,7 @@ public class CSVCommonsLoaderIT extends ParallelStatsDisabledIT {
CSVParser parser = null;
PhoenixConnection conn = null;
try {
- String stockTableName = generateRandomString();
+ String stockTableName = generateUniqueName();
// Create table
String statements = "CREATE TABLE IF NOT EXISTS " + stockTableName
@@ -331,7 +331,7 @@ public class CSVCommonsLoaderIT extends ParallelStatsDisabledIT {
CSVParser parser = null;
PhoenixConnection conn = null;
try {
- String stockTableName = generateRandomString();
+ String stockTableName = generateUniqueName();
// Create table
String statements = "CREATE TABLE IF NOT EXISTS " + stockTableName
@@ -376,7 +376,7 @@ public class CSVCommonsLoaderIT extends ParallelStatsDisabledIT {
CSVParser parser = null;
PhoenixConnection conn = null;
try {
- String stockTableName = generateRandomString();
+ String stockTableName = generateUniqueName();
// Create table
String statements = "CREATE TABLE IF NOT EXISTS " + stockTableName
@@ -420,7 +420,7 @@ public class CSVCommonsLoaderIT extends ParallelStatsDisabledIT {
CSVParser parser = null;
PhoenixConnection conn = null;
try {
- String stockTableName = generateRandomString();
+ String stockTableName = generateUniqueName();
// Create table
String statements = "CREATE TABLE IF NOT EXISTS " + stockTableName
@@ -454,7 +454,7 @@ public class CSVCommonsLoaderIT extends ParallelStatsDisabledIT {
CSVParser parser = null;
PhoenixConnection conn = null;
try {
- String stockTableName = generateRandomString();
+ String stockTableName = generateUniqueName();
// Create table
String statements = "CREATE TABLE IF NOT EXISTS " + stockTableName
@@ -491,7 +491,7 @@ public class CSVCommonsLoaderIT extends ParallelStatsDisabledIT {
CSVParser parser = null;
PhoenixConnection conn = null;
try {
- String stockTableName = generateRandomString();
+ String stockTableName = generateUniqueName();
// Create table
String statements = "CREATE TABLE IF NOT EXISTS " + stockTableName
http://git-wip-us.apache.org/repos/asf/phoenix/blob/bebb5ced/phoenix-core/src/it/java/org/apache/phoenix/end2end/CbrtFunctionEnd2EndIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/CbrtFunctionEnd2EndIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/CbrtFunctionEnd2EndIT.java
index 6c5d209..98aa819 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/CbrtFunctionEnd2EndIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/CbrtFunctionEnd2EndIT.java
@@ -38,8 +38,8 @@ public class CbrtFunctionEnd2EndIT extends ParallelStatsDisabledIT {
private static final String KEY = "key";
private static final double ZERO = 1e-8;
- private static final String TEST_SIGNED = generateRandomString();
- private static final String TEST_UNSIGNED = generateRandomString();
+ private static final String TEST_SIGNED = generateUniqueName();
+ private static final String TEST_UNSIGNED = generateUniqueName();
@BeforeClass
public static void initTable() throws Exception {
http://git-wip-us.apache.org/repos/asf/phoenix/blob/bebb5ced/phoenix-core/src/it/java/org/apache/phoenix/end2end/CoalesceFunctionIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/CoalesceFunctionIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/CoalesceFunctionIT.java
index 89a5fc9..0666f77 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/CoalesceFunctionIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/CoalesceFunctionIT.java
@@ -66,7 +66,7 @@ public class CoalesceFunctionIT extends ParallelStatsDisabledIT {
@Test
public void coalesceWithSumExplicitLong() throws Exception {
Connection conn = DriverManager.getConnection(getUrl());
- String tableName = generateRandomString();
+ String tableName = generateUniqueName();
String ddl = "CREATE TABLE " + tableName + "("
+ " ID BIGINT NOT NULL, "
+ " COUNT BIGINT "
@@ -90,7 +90,7 @@ public class CoalesceFunctionIT extends ParallelStatsDisabledIT {
@Test
public void coalesceWithSumImplicitLong() throws Exception {
Connection conn = DriverManager.getConnection(getUrl());
- String tableName = generateRandomString();
+ String tableName = generateUniqueName();
String ddl = "CREATE TABLE " + tableName + "("
+ " ID BIGINT NOT NULL, "
+ " COUNT BIGINT "
@@ -114,7 +114,7 @@ public class CoalesceFunctionIT extends ParallelStatsDisabledIT {
@Test
public void coalesceWithSecondParamAsExpression() throws Exception {
Connection conn = DriverManager.getConnection(getUrl());
- String tableName = generateRandomString();
+ String tableName = generateUniqueName();
String ddl = "CREATE TABLE " + tableName + "("
+ " ID BIGINT NOT NULL, "
+ " COUNT BIGINT "
@@ -138,7 +138,7 @@ public class CoalesceFunctionIT extends ParallelStatsDisabledIT {
@Test
public void nonTypedSecondParameterLong() throws Exception {
Connection conn = DriverManager.getConnection(getUrl());
- String tableName = generateRandomString();
+ String tableName = generateUniqueName();
String ddl = "CREATE TABLE " + tableName + "("
+ " ID BIGINT NOT NULL, "
@@ -163,7 +163,7 @@ public class CoalesceFunctionIT extends ParallelStatsDisabledIT {
@Test
public void nonTypedSecondParameterUnsignedDataTypes() throws Exception {
Connection conn = DriverManager.getConnection(getUrl());
- String tableName = generateRandomString();
+ String tableName = generateUniqueName();
String ddl = "CREATE TABLE " + tableName + "("
+ " ID BIGINT NOT NULL, "
+ " COUNT UNSIGNED_INT " //first parameter to coalesce
@@ -188,7 +188,7 @@ public class CoalesceFunctionIT extends ParallelStatsDisabledIT {
@Test
public void testWithNthValueAggregationFunction() throws Exception {
Connection conn = DriverManager.getConnection(getUrl());
- String tableName = generateRandomString();
+ String tableName = generateUniqueName();
String ddl = "CREATE TABLE " + tableName + "("
+ " ID BIGINT NOT NULL, "
@@ -220,7 +220,7 @@ public class CoalesceFunctionIT extends ParallelStatsDisabledIT {
@Test
public void wrongDataTypeOfSecondParameter() throws Exception {
Connection conn = DriverManager.getConnection(getUrl());
- String tableName = generateRandomString();
+ String tableName = generateUniqueName();
String ddl = "CREATE TABLE " + tableName + "("
+ " ID UNSIGNED_INT NOT NULL, "
@@ -247,7 +247,7 @@ public class CoalesceFunctionIT extends ParallelStatsDisabledIT {
@Test
public void testImplicitSecondArgCastingException() throws Exception {
Connection conn = DriverManager.getConnection(getUrl());
- String tableName = generateRandomString();
+ String tableName = generateUniqueName();
String ddl = "CREATE TABLE " + tableName + "("
+ " ID INTEGER NOT NULL, "
@@ -276,7 +276,7 @@ public class CoalesceFunctionIT extends ParallelStatsDisabledIT {
@Test
public void testImplicitSecondArgCasting() throws Exception {
Connection conn = DriverManager.getConnection(getUrl());
- String tableName = generateRandomString();
+ String tableName = generateUniqueName();
String ddl = "CREATE TABLE " + tableName + "("
+ " ID DOUBLE NOT NULL, "
@@ -302,7 +302,7 @@ public class CoalesceFunctionIT extends ParallelStatsDisabledIT {
public void testCoalesceInRowKeyColumn() throws Exception {
Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
Connection conn = DriverManager.getConnection(getUrl(), props);
- String tableName = generateRandomString();
+ String tableName = generateUniqueName();
conn.createStatement().execute("CREATE TABLE " + tableName + "(k1 decimal, k2 decimal, constraint pk primary key (k1,k2))");
conn.createStatement().execute("UPSERT INTO " + tableName + "(k2) VALUES (1)");
conn.createStatement().execute("UPSERT INTO " + tableName + " VALUES (2,2)");
http://git-wip-us.apache.org/repos/asf/phoenix/blob/bebb5ced/phoenix-core/src/it/java/org/apache/phoenix/end2end/ConvertTimezoneFunctionIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ConvertTimezoneFunctionIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ConvertTimezoneFunctionIT.java
index be5470e..229e705 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ConvertTimezoneFunctionIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ConvertTimezoneFunctionIT.java
@@ -41,7 +41,7 @@ public class ConvertTimezoneFunctionIT extends ParallelStatsDisabledIT {
@Test
public void testConvertTimezoneEurope() throws Exception {
Connection conn = DriverManager.getConnection(getUrl());
- String timezone_offset_test = generateRandomString();
+ String timezone_offset_test = generateUniqueName();
String ddl = "CREATE TABLE IF NOT EXISTS " + timezone_offset_test
+ " (k1 INTEGER NOT NULL, dates DATE CONSTRAINT pk PRIMARY KEY (k1))";
conn.createStatement().execute(ddl);
@@ -61,7 +61,7 @@ public class ConvertTimezoneFunctionIT extends ParallelStatsDisabledIT {
@Test
public void testConvertTimezoneAmerica() throws Exception {
Connection conn = DriverManager.getConnection(getUrl());
- String timezone_offset_test = generateRandomString();
+ String timezone_offset_test = generateUniqueName();
String ddl = "CREATE TABLE IF NOT EXISTS " + timezone_offset_test
+ " (k1 INTEGER NOT NULL, dates DATE CONSTRAINT pk PRIMARY KEY (k1))";
conn.createStatement().execute(ddl);
@@ -81,7 +81,7 @@ public class ConvertTimezoneFunctionIT extends ParallelStatsDisabledIT {
@Test
public void nullInDateParameter() throws Exception {
Connection conn = DriverManager.getConnection(getUrl());
- String timezone_offset_test = generateRandomString();
+ String timezone_offset_test = generateUniqueName();
String ddl = "CREATE TABLE IF NOT EXISTS " + timezone_offset_test
+ " (k1 INTEGER NOT NULL, dates DATE CONSTRAINT pk PRIMARY KEY (k1))";
conn.createStatement().execute(ddl);
@@ -101,7 +101,7 @@ public class ConvertTimezoneFunctionIT extends ParallelStatsDisabledIT {
@Test
public void nullInFirstTimezoneParameter() throws Exception {
Connection conn = DriverManager.getConnection(getUrl());
- String timezone_offset_test = generateRandomString();
+ String timezone_offset_test = generateUniqueName();
String ddl = "CREATE TABLE IF NOT EXISTS " + timezone_offset_test
+ " (k1 INTEGER NOT NULL, dates DATE, tz VARCHAR, CONSTRAINT pk PRIMARY KEY (k1))";
conn.createStatement().execute(ddl);
@@ -121,7 +121,7 @@ public class ConvertTimezoneFunctionIT extends ParallelStatsDisabledIT {
@Test
public void nullInSecondTimezoneParameter() throws Exception {
Connection conn = DriverManager.getConnection(getUrl());
- String timezone_offset_test = generateRandomString();
+ String timezone_offset_test = generateUniqueName();
String ddl = "CREATE TABLE IF NOT EXISTS " + timezone_offset_test
+ " (k1 INTEGER NOT NULL, dates DATE, tz VARCHAR, CONSTRAINT pk PRIMARY KEY (k1))";
conn.createStatement().execute(ddl);
@@ -141,7 +141,7 @@ public class ConvertTimezoneFunctionIT extends ParallelStatsDisabledIT {
@Test
public void unknownTimezone() throws Exception {
Connection conn = DriverManager.getConnection(getUrl());
- String timezone_offset_test = generateRandomString();
+ String timezone_offset_test = generateUniqueName();
String ddl = "CREATE TABLE IF NOT EXISTS " + timezone_offset_test
+ " (k1 INTEGER NOT NULL, dates DATE CONSTRAINT pk PRIMARY KEY (k1))";
conn.createStatement().execute(ddl);
@@ -166,7 +166,7 @@ public class ConvertTimezoneFunctionIT extends ParallelStatsDisabledIT {
@Test
public void testConvertMultipleRecords() throws Exception {
Connection conn = DriverManager.getConnection(getUrl());
- String timezone_offset_test = generateRandomString();
+ String timezone_offset_test = generateUniqueName();
String ddl = "CREATE TABLE IF NOT EXISTS " + timezone_offset_test
+ " (k1 INTEGER NOT NULL, dates DATE CONSTRAINT pk PRIMARY KEY (k1))";
Statement stmt = conn.createStatement();
http://git-wip-us.apache.org/repos/asf/phoenix/blob/bebb5ced/phoenix-core/src/it/java/org/apache/phoenix/end2end/DateTimeIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/DateTimeIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/DateTimeIT.java
index 97fbaf4..ffcb472 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/DateTimeIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/DateTimeIT.java
@@ -75,7 +75,7 @@ public class DateTimeIT extends ParallelStatsDisabledIT {
}
private String initAtable() throws SQLException {
- String tableName = generateRandomString();
+ String tableName = generateUniqueName();
ensureTableCreated(getUrl(), tableName, ATABLE_NAME, (byte[][])null);
PreparedStatement stmt = conn.prepareStatement(
"upsert into " + tableName +
@@ -295,7 +295,7 @@ public class DateTimeIT extends ParallelStatsDisabledIT {
java.util.Date dateToday = cal.getTime();
cal.add(Calendar.DAY_OF_YEAR, 1);
java.util.Date dateTomorrow = cal.getTime();
- String tableName = generateRandomString();
+ String tableName = generateUniqueName();
String today = formatter.format(dateToday);
String tomorrow = formatter.format(dateTomorrow);
String query = "SELECT entity_id FROM " + this.tableName + " WHERE a_integer < 4 AND a_date BETWEEN date '" + today + "' AND date '" + tomorrow + "' ";
@@ -454,7 +454,7 @@ public class DateTimeIT extends ParallelStatsDisabledIT {
@Test
public void testYearFuncAgainstColumns() throws Exception {
- String tableName = generateRandomString();
+ String tableName = generateUniqueName();
String ddl =
"CREATE TABLE IF NOT EXISTS " + tableName + " (k1 INTEGER NOT NULL, dates DATE, timestamps TIMESTAMP, times TIME, " +
"unsignedDates UNSIGNED_DATE, unsignedTimestamps UNSIGNED_TIMESTAMP, unsignedTimes UNSIGNED_TIME CONSTRAINT pk PRIMARY KEY (k1))";
@@ -484,7 +484,7 @@ public class DateTimeIT extends ParallelStatsDisabledIT {
@Test
public void testMonthFuncAgainstColumns() throws Exception {
- String tableName = generateRandomString();
+ String tableName = generateUniqueName();
String ddl =
"CREATE TABLE IF NOT EXISTS " + tableName + " (k1 INTEGER NOT NULL, dates DATE, timestamps TIMESTAMP, times TIME, " +
"unsignedDates UNSIGNED_DATE, unsignedTimestamps UNSIGNED_TIMESTAMP, unsignedTimes UNSIGNED_TIME CONSTRAINT pk PRIMARY KEY (k1))";
@@ -514,7 +514,7 @@ public class DateTimeIT extends ParallelStatsDisabledIT {
@Test
public void testUnsignedTimeDateWithLiteral() throws Exception {
- String tableName = generateRandomString();
+ String tableName = generateUniqueName();
String ddl =
"CREATE TABLE IF NOT EXISTS " + tableName + " (k1 INTEGER NOT NULL," +
"unsignedDates UNSIGNED_DATE, unsignedTimestamps UNSIGNED_TIMESTAMP, unsignedTimes UNSIGNED_TIME CONSTRAINT pk PRIMARY KEY (k1))";
@@ -535,7 +535,7 @@ public class DateTimeIT extends ParallelStatsDisabledIT {
@Test
public void testSecondFuncAgainstColumns() throws Exception {
- String tableName = generateRandomString();
+ String tableName = generateUniqueName();
String ddl =
"CREATE TABLE IF NOT EXISTS " + tableName + " (k1 INTEGER NOT NULL, dates DATE, timestamps TIMESTAMP, times TIME, " +
"unsignedDates UNSIGNED_DATE, unsignedTimestamps UNSIGNED_TIMESTAMP, unsignedTimes UNSIGNED_TIME CONSTRAINT pk PRIMARY KEY (k1))";
@@ -565,7 +565,7 @@ public class DateTimeIT extends ParallelStatsDisabledIT {
@Test
public void testWeekFuncAgainstColumns() throws Exception {
- String tableName = generateRandomString();
+ String tableName = generateUniqueName();
String ddl =
"CREATE TABLE IF NOT EXISTS " + tableName + " (k1 INTEGER NOT NULL, dates DATE, timestamps TIMESTAMP, times TIME CONSTRAINT pk PRIMARY KEY (k1))";
conn.createStatement().execute(ddl);
@@ -587,7 +587,7 @@ public class DateTimeIT extends ParallelStatsDisabledIT {
@Test
public void testHourFuncAgainstColumns() throws Exception {
- String tableName = generateRandomString();
+ String tableName = generateUniqueName();
String ddl =
"CREATE TABLE IF NOT EXISTS " + tableName + " (k1 INTEGER NOT NULL, dates DATE, timestamps TIMESTAMP, times TIME CONSTRAINT pk PRIMARY KEY (k1))";
conn.createStatement().execute(ddl);
@@ -612,7 +612,7 @@ public class DateTimeIT extends ParallelStatsDisabledIT {
@Test
public void testNowFunction() throws Exception {
- String tableName = generateRandomString();
+ String tableName = generateUniqueName();
Date date = new Date(System.currentTimeMillis());
String ddl =
"CREATE TABLE IF NOT EXISTS " + tableName + " (k1 INTEGER NOT NULL, timestamps TIMESTAMP CONSTRAINT pk PRIMARY KEY (k1))";
@@ -636,7 +636,7 @@ public class DateTimeIT extends ParallelStatsDisabledIT {
@Test
public void testMinuteFuncAgainstColumns() throws Exception {
- String tableName = generateRandomString();
+ String tableName = generateUniqueName();
String ddl =
"CREATE TABLE IF NOT EXISTS " + tableName + " (k1 INTEGER NOT NULL, dates DATE, timestamps TIMESTAMP, times TIME, " +
"unsignedDates UNSIGNED_DATE, unsignedTimestamps UNSIGNED_TIMESTAMP, unsignedTimes UNSIGNED_TIME CONSTRAINT pk PRIMARY KEY (k1))";
@@ -663,7 +663,7 @@ public class DateTimeIT extends ParallelStatsDisabledIT {
@Test
public void testDayOfMonthFuncAgainstColumns() throws Exception {
- String tableName = generateRandomString();
+ String tableName = generateUniqueName();
String ddl =
"CREATE TABLE IF NOT EXISTS " + tableName + " (k1 INTEGER NOT NULL, dates DATE, timestamps TIMESTAMP, times TIME CONSTRAINT pk PRIMARY KEY (k1))";
conn.createStatement().execute(ddl);
@@ -689,7 +689,7 @@ public class DateTimeIT extends ParallelStatsDisabledIT {
*/
@Test
public void testDayOfWeekFuncAgainstColumns() throws Exception {
- String tableName = generateRandomString();
+ String tableName = generateUniqueName();
String ddl = "CREATE TABLE IF NOT EXISTS " + tableName + " (k1 INTEGER NOT NULL, dates DATE, timestamps TIMESTAMP, times TIME CONSTRAINT pk PRIMARY KEY (k1))";
conn.createStatement().execute(ddl);
String dml = "UPSERT INTO " + tableName + " VALUES (1, TO_DATE('2012-03-08 11:01:10'), TO_TIMESTAMP('2013-06-16 12:02:20'), TO_TIME('2014-09-23 13:03:30'))";
@@ -708,7 +708,7 @@ public class DateTimeIT extends ParallelStatsDisabledIT {
@Test
public void testDayOfYearFuncAgainstColumns() throws Exception {
- String tableName = generateRandomString();
+ String tableName = generateUniqueName();
String ddl = "CREATE TABLE IF NOT EXISTS " + tableName + " (k1 INTEGER NOT NULL, dates DATE, timestamps TIMESTAMP, times TIME CONSTRAINT pk PRIMARY KEY (k1))";
conn.createStatement().execute(ddl);
String dml = "UPSERT INTO " + tableName + " VALUES (1, TO_DATE('2012-03-01 11:01:10'), TO_TIMESTAMP('2013-02-01 12:02:20'), TO_TIME('2014-01-15 13:03:30'))";
@@ -748,7 +748,7 @@ public class DateTimeIT extends ParallelStatsDisabledIT {
}
@Test
public void testSelectBetweenNanos() throws Exception {
- String tableName = generateRandomString();
+ String tableName = generateUniqueName();
String ddl =
"CREATE TABLE IF NOT EXISTS " + tableName + " (k1 INTEGER NOT NULL PRIMARY KEY, ts " +
"TIMESTAMP(3))";
@@ -772,8 +772,8 @@ public class DateTimeIT extends ParallelStatsDisabledIT {
@Test
public void testCurrentTimeWithProjectedTable () throws Exception {
- String tableName1 = generateRandomString();
- String tableName2 = generateRandomString();
+ String tableName1 = generateUniqueName();
+ String tableName2 = generateUniqueName();
String ddl = "CREATE TABLE " + tableName1 + " ( ID integer primary key)";
conn.createStatement().execute(ddl);
ddl = "CREATE TABLE " + tableName2 + " ( ID integer primary key)";
@@ -846,7 +846,7 @@ public class DateTimeIT extends ParallelStatsDisabledIT {
@Test
public void testProjectedDateTimestampUnequal() throws Exception {
- String tableName = generateRandomString();
+ String tableName = generateUniqueName();
String ddl =
"CREATE TABLE IF NOT EXISTS " + tableName + " (k1 INTEGER PRIMARY KEY, dates DATE, timestamps TIMESTAMP)";
conn.createStatement().execute(ddl);
@@ -889,7 +889,7 @@ public class DateTimeIT extends ParallelStatsDisabledIT {
@Test
public void testProjectedTimeTimestampCompare() throws Exception {
- String tableName = generateRandomString();
+ String tableName = generateUniqueName();
String ddl =
"CREATE TABLE IF NOT EXISTS " + tableName + " (k1 INTEGER PRIMARY KEY, times TIME, timestamps TIMESTAMP)";
conn.createStatement().execute(ddl);
@@ -932,7 +932,7 @@ public class DateTimeIT extends ParallelStatsDisabledIT {
@Test
public void testProjectedDateTimeCompare() throws Exception {
- String tableName = generateRandomString();
+ String tableName = generateUniqueName();
String ddl =
"CREATE TABLE IF NOT EXISTS " + tableName + " (k1 INTEGER PRIMARY KEY, dates DATE, times TIME)";
conn.createStatement().execute(ddl);
@@ -965,7 +965,7 @@ public class DateTimeIT extends ParallelStatsDisabledIT {
@Test
public void testProjectedDateUnsignedTimestampCompare() throws Exception {
- String tableName = generateRandomString();
+ String tableName = generateUniqueName();
String ddl =
"CREATE TABLE IF NOT EXISTS " + tableName + " (k1 INTEGER PRIMARY KEY, dates DATE, timestamps UNSIGNED_TIMESTAMP)";
conn.createStatement().execute(ddl);
@@ -1008,7 +1008,7 @@ public class DateTimeIT extends ParallelStatsDisabledIT {
@Test
public void testProjectedTimeUnsignedTimestampCompare() throws Exception {
- String tableName = generateRandomString();
+ String tableName = generateUniqueName();
String ddl =
"CREATE TABLE IF NOT EXISTS " + tableName + " (k1 INTEGER PRIMARY KEY, times TIME, timestamps UNSIGNED_TIMESTAMP)";
conn.createStatement().execute(ddl);
@@ -1051,7 +1051,7 @@ public class DateTimeIT extends ParallelStatsDisabledIT {
@Test
public void testProjectedDateUnsignedTimeCompare() throws Exception {
- String tableName = generateRandomString();
+ String tableName = generateUniqueName();
String ddl =
"CREATE TABLE IF NOT EXISTS " + tableName + " (k1 INTEGER PRIMARY KEY, dates DATE, times UNSIGNED_TIME)";
conn.createStatement().execute(ddl);
@@ -1084,7 +1084,7 @@ public class DateTimeIT extends ParallelStatsDisabledIT {
@Test
public void testProjectedUnsignedDateTimestampCompare() throws Exception {
- String tableName = generateRandomString();
+ String tableName = generateUniqueName();
String ddl =
"CREATE TABLE IF NOT EXISTS " + tableName + " (k1 INTEGER PRIMARY KEY, dates UNSIGNED_DATE, timestamps TIMESTAMP)";
conn.createStatement().execute(ddl);
@@ -1127,7 +1127,7 @@ public class DateTimeIT extends ParallelStatsDisabledIT {
@Test
public void testProjectedUnsignedTimeTimestampCompare() throws Exception {
- String tableName = generateRandomString();
+ String tableName = generateUniqueName();
String ddl =
"CREATE TABLE IF NOT EXISTS " + tableName + " (k1 INTEGER PRIMARY KEY, times UNSIGNED_TIME, timestamps TIMESTAMP)";
conn.createStatement().execute(ddl);
@@ -1170,7 +1170,7 @@ public class DateTimeIT extends ParallelStatsDisabledIT {
@Test
public void testProjectedUnsignedDateTimeCompare() throws Exception {
- String tableName = generateRandomString();
+ String tableName = generateUniqueName();
String ddl =
"CREATE TABLE IF NOT EXISTS " + tableName + " (k1 INTEGER PRIMARY KEY, dates UNSIGNED_DATE, times TIME)";
conn.createStatement().execute(ddl);
@@ -1203,7 +1203,7 @@ public class DateTimeIT extends ParallelStatsDisabledIT {
@Test
public void testProjectedUnsignedDateUnsignedTimestampCompare() throws Exception {
- String tableName = generateRandomString();
+ String tableName = generateUniqueName();
String ddl =
"CREATE TABLE IF NOT EXISTS " + tableName + " (k1 INTEGER PRIMARY KEY, dates UNSIGNED_DATE, timestamps UNSIGNED_TIMESTAMP)";
conn.createStatement().execute(ddl);
@@ -1246,7 +1246,7 @@ public class DateTimeIT extends ParallelStatsDisabledIT {
@Test
public void testProjectedUnsignedTimeUnsignedTimestampCompare() throws Exception {
- String tableName = generateRandomString();
+ String tableName = generateUniqueName();
String ddl =
"CREATE TABLE IF NOT EXISTS " + tableName + " (k1 INTEGER PRIMARY KEY, times UNSIGNED_TIME, timestamps UNSIGNED_TIMESTAMP)";
conn.createStatement().execute(ddl);
@@ -1289,7 +1289,7 @@ public class DateTimeIT extends ParallelStatsDisabledIT {
@Test
public void testProjectedUnsignedDateUnsignedTimeCompare() throws Exception {
- String tableName = generateRandomString();
+ String tableName = generateUniqueName();
String ddl =
"CREATE TABLE IF NOT EXISTS " + tableName + " (k1 INTEGER PRIMARY KEY, dates UNSIGNED_DATE, times UNSIGNED_TIME)";
conn.createStatement().execute(ddl);
@@ -1322,7 +1322,7 @@ public class DateTimeIT extends ParallelStatsDisabledIT {
@Test
public void testProjectedDateDateCompare() throws Exception {
- String tableName = generateRandomString();
+ String tableName = generateUniqueName();
String ddl =
"CREATE TABLE IF NOT EXISTS " + tableName + " (k1 INTEGER PRIMARY KEY, date1 DATE, date2 DATE)";
conn.createStatement().execute(ddl);
@@ -1355,7 +1355,7 @@ public class DateTimeIT extends ParallelStatsDisabledIT {
@Test
public void testProjectedUnsignedDateUnsignedDateCompare() throws Exception {
- String tableName = generateRandomString();
+ String tableName = generateUniqueName();
String ddl =
"CREATE TABLE IF NOT EXISTS " + tableName + " (k1 INTEGER PRIMARY KEY, date1 UNSIGNED_DATE, date2 UNSIGNED_DATE)";
conn.createStatement().execute(ddl);
@@ -1388,7 +1388,7 @@ public class DateTimeIT extends ParallelStatsDisabledIT {
@Test
public void testProjectedTimeTimeCompare() throws Exception {
- String tableName = generateRandomString();
+ String tableName = generateUniqueName();
String ddl =
"CREATE TABLE IF NOT EXISTS " + tableName + " (k1 INTEGER PRIMARY KEY, time1 TIME, time2 TIME)";
conn.createStatement().execute(ddl);
@@ -1421,7 +1421,7 @@ public class DateTimeIT extends ParallelStatsDisabledIT {
@Test
public void testProjectedUnsignedTimeUnsignedTimeCompare() throws Exception {
- String tableName = generateRandomString();
+ String tableName = generateUniqueName();
String ddl =
"CREATE TABLE IF NOT EXISTS " + tableName + " (k1 INTEGER PRIMARY KEY, time1 UNSIGNED_TIME, time2 UNSIGNED_TIME)";
conn.createStatement().execute(ddl);
@@ -1454,7 +1454,7 @@ public class DateTimeIT extends ParallelStatsDisabledIT {
@Test
public void testProjectedTimeStampTimeStampCompare() throws Exception {
- String tableName = generateRandomString();
+ String tableName = generateUniqueName();
String ddl =
"CREATE TABLE IF NOT EXISTS " + tableName + " (k1 INTEGER PRIMARY KEY, timestamp1 TIMESTAMP, timestamp2 TIMESTAMP)";
conn.createStatement().execute(ddl);
@@ -1497,7 +1497,7 @@ public class DateTimeIT extends ParallelStatsDisabledIT {
@Test
public void testProjectedUnsignedTimeStampUnsignedTimeStampCompare() throws Exception {
- String tableName = generateRandomString();
+ String tableName = generateUniqueName();
String ddl =
"CREATE TABLE IF NOT EXISTS " + tableName + " (k1 INTEGER PRIMARY KEY, timestamp1 UNSIGNED_TIMESTAMP, timestamp2 UNSIGNED_TIMESTAMP)";
conn.createStatement().execute(ddl);
http://git-wip-us.apache.org/repos/asf/phoenix/blob/bebb5ced/phoenix-core/src/it/java/org/apache/phoenix/end2end/DecodeFunctionIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/DecodeFunctionIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/DecodeFunctionIT.java
index 424aa7b..a2fc59b 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/DecodeFunctionIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/DecodeFunctionIT.java
@@ -41,7 +41,7 @@ public class DecodeFunctionIT extends ParallelStatsDisabledIT {
public void shouldPass() throws Exception {
Connection conn = DriverManager.getConnection(getUrl());
- String testTable = generateRandomString();
+ String testTable = generateUniqueName();
String ddl = "CREATE TABLE " + testTable
+ " ( some_column BINARY(12) NOT NULL CONSTRAINT PK PRIMARY KEY (some_column))";
@@ -64,7 +64,7 @@ public class DecodeFunctionIT extends ParallelStatsDisabledIT {
public void upperCaseHexEncoding() throws Exception {
Connection conn = DriverManager.getConnection(getUrl());
- String testTable = generateRandomString();
+ String testTable = generateUniqueName();
String ddl = "CREATE TABLE " + testTable
+ " ( some_column BINARY(12) NOT NULL CONSTRAINT PK PRIMARY KEY (some_column))";
@@ -86,7 +86,7 @@ public class DecodeFunctionIT extends ParallelStatsDisabledIT {
@Test
public void invalidCharacters() throws Exception {
Connection conn = DriverManager.getConnection(getUrl());
- String testTable = generateRandomString();
+ String testTable = generateUniqueName();
String ddl = "CREATE TABLE " + testTable
+ " ( some_column BINARY(12) NOT NULL CONSTRAINT PK PRIMARY KEY (some_column))";
@@ -104,7 +104,7 @@ public class DecodeFunctionIT extends ParallelStatsDisabledIT {
@Test
public void invalidLength() throws Exception {
Connection conn = DriverManager.getConnection(getUrl());
- String testTable = generateRandomString();
+ String testTable = generateUniqueName();
String ddl = "CREATE TABLE " + testTable
+ " ( some_column BINARY(12) NOT NULL CONSTRAINT PK PRIMARY KEY (some_column))";
@@ -122,7 +122,7 @@ public class DecodeFunctionIT extends ParallelStatsDisabledIT {
@Test
public void nullEncoding() throws Exception {
Connection conn = DriverManager.getConnection(getUrl());
- String testTable = generateRandomString();
+ String testTable = generateUniqueName();
String ddl = "CREATE TABLE " + testTable
+ " ( some_column BINARY(12) NOT NULL CONSTRAINT PK PRIMARY KEY (some_column))";
@@ -136,7 +136,7 @@ public class DecodeFunctionIT extends ParallelStatsDisabledIT {
@Test
public void invalidEncoding() throws Exception {
Connection conn = DriverManager.getConnection(getUrl());
- String testTable = generateRandomString();
+ String testTable = generateUniqueName();
String ddl = "CREATE TABLE " + testTable
+ " ( some_column BINARY(12) NOT NULL CONSTRAINT PK PRIMARY KEY (some_column))";
http://git-wip-us.apache.org/repos/asf/phoenix/blob/bebb5ced/phoenix-core/src/it/java/org/apache/phoenix/end2end/DeleteIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/DeleteIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/DeleteIT.java
index a289634..9f514b3 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/DeleteIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/DeleteIT.java
@@ -42,7 +42,7 @@ public class DeleteIT extends ParallelStatsDisabledIT {
private static final int NTH_ROW_NULL = 5;
private static String initTableValues(Connection conn) throws SQLException {
- String tableName = generateRandomString();
+ String tableName = generateUniqueName();
ensureTableCreated(getUrl(), tableName, "IntIntKeyTest");
String upsertStmt = "UPSERT INTO " + tableName + " VALUES(?,?)";
PreparedStatement stmt = conn.prepareStatement(upsertStmt);
@@ -157,8 +157,8 @@ public class DeleteIT extends ParallelStatsDisabledIT {
private void testDeleteRange(boolean autoCommit, boolean createIndex, boolean local) throws Exception {
Connection conn = DriverManager.getConnection(getUrl());
String tableName = initTableValues(conn);
- String indexName = generateRandomString();
- String localIndexName = generateRandomString();
+ String indexName = generateUniqueName();
+ String localIndexName = generateUniqueName();
String indexInUse = indexName;
if (createIndex) {
@@ -294,7 +294,7 @@ public class DeleteIT extends ParallelStatsDisabledIT {
con.setAutoCommit(autoCommit);
Statement stm = con.createStatement();
- String tableName = generateRandomString();
+ String tableName = generateUniqueName();
String s = "CREATE TABLE IF NOT EXISTS " + tableName + "(" +
"HOST CHAR(2) NOT NULL," +
"DOMAIN VARCHAR NOT NULL, " +
@@ -305,8 +305,8 @@ public class DeleteIT extends ParallelStatsDisabledIT {
"STATS.ACTIVE_VISITOR INTEGER " +
"CONSTRAINT PK PRIMARY KEY (HOST, DOMAIN, FEATURE, DATE))" + (isSalted ? " SALT_BUCKETS=3" : "");
stm.execute(s);
- String localIndexName = generateRandomString();
- String indexName = generateRandomString();
+ String localIndexName = generateUniqueName();
+ String indexName = generateUniqueName();
if (localIndex) {
stm.execute("CREATE LOCAL INDEX " + localIndexName + " ON " + tableName + " (CORE,DB,ACTIVE_VISITOR)");
} else {
@@ -372,9 +372,9 @@ public class DeleteIT extends ParallelStatsDisabledIT {
Statement stm = con.createStatement();
- String tableName = generateRandomString();
- String indexName1 = generateRandomString();
- String indexName2 = generateRandomString();
+ String tableName = generateUniqueName();
+ String indexName1 = generateUniqueName();
+ String indexName2 = generateUniqueName();
stm.execute("CREATE TABLE IF NOT EXISTS " + tableName + " (" +
"HOST CHAR(2) NOT NULL," +
@@ -458,7 +458,7 @@ public class DeleteIT extends ParallelStatsDisabledIT {
con = DriverManager.getConnection(getUrl());
con.setAutoCommit(autoCommit);
- String tableName = generateRandomString();
+ String tableName = generateUniqueName();
Statement stm = con.createStatement();
stm.execute("CREATE TABLE IF NOT EXISTS " + tableName + "(" +
@@ -505,13 +505,13 @@ public class DeleteIT extends ParallelStatsDisabledIT {
@Test
public void testDeleteForTableWithRowTimestampColServer() throws Exception {
- String tableName = generateRandomString();
+ String tableName = generateUniqueName();
testDeleteForTableWithRowTimestampCol(true, tableName);
}
@Test
public void testDeleteForTableWithRowTimestampColClient() throws Exception {
- String tableName = generateRandomString();
+ String tableName = generateUniqueName();
testDeleteForTableWithRowTimestampCol(false, tableName);
}
@@ -583,7 +583,7 @@ public class DeleteIT extends ParallelStatsDisabledIT {
}
private void testDeleteCount(boolean autoCommit, Integer limit) throws Exception {
- String tableName = generateRandomString();
+ String tableName = generateUniqueName();
String ddl = "CREATE TABLE IF NOT EXISTS " + tableName + " (pk1 DECIMAL NOT NULL, v1 VARCHAR CONSTRAINT PK PRIMARY KEY (pk1))";
int numRecords = 1010;
http://git-wip-us.apache.org/repos/asf/phoenix/blob/bebb5ced/phoenix-core/src/it/java/org/apache/phoenix/end2end/DisableLocalIndexIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/DisableLocalIndexIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/DisableLocalIndexIT.java
index b34c61d..10f970f 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/DisableLocalIndexIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/DisableLocalIndexIT.java
@@ -57,7 +57,7 @@ public class DisableLocalIndexIT extends ParallelStatsDisabledIT {
public void testDisabledLocalIndexes() throws Exception {
Connection conn = DriverManager.getConnection(getUrl());
conn.setAutoCommit(true);
- String baseName = generateRandomString();
+ String baseName = generateUniqueName();
String tableName = baseName+ "_TABLE";
String viewName = baseName + "_VIEW";
String indexName1 = baseName + "_INDEX1";
http://git-wip-us.apache.org/repos/asf/phoenix/blob/bebb5ced/phoenix-core/src/it/java/org/apache/phoenix/end2end/DistinctPrefixFilterIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/DistinctPrefixFilterIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/DistinctPrefixFilterIT.java
index df10c84..87edc25 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/DistinctPrefixFilterIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/DistinctPrefixFilterIT.java
@@ -36,8 +36,8 @@ import org.junit.BeforeClass;
import org.junit.Test;
public class DistinctPrefixFilterIT extends ParallelStatsDisabledIT {
- private static final String testTableF = generateRandomString();
- private static final String testTableV = generateRandomString();
+ private static final String testTableF = generateUniqueName();
+ private static final String testTableV = generateUniqueName();
private static final String testSeq = testTableF + "_seq";
private static final String PREFIX = "SERVER DISTINCT PREFIX";
private static Connection conn;
@@ -110,7 +110,7 @@ public class DistinctPrefixFilterIT extends ParallelStatsDisabledIT {
@Test
public void testCornerCases() throws Exception {
- String testTable = generateRandomString();
+ String testTable = generateUniqueName();
String ddl = "CREATE TABLE " + testTable +
" (prefix1 INTEGER NOT NULL, prefix2 SMALLINT NOT NULL, prefix3 INTEGER NOT NULL, " +
"col1 FLOAT, CONSTRAINT pk PRIMARY KEY(prefix1, prefix2, prefix3))";
http://git-wip-us.apache.org/repos/asf/phoenix/blob/bebb5ced/phoenix-core/src/it/java/org/apache/phoenix/end2end/DynamicFamilyIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/DynamicFamilyIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/DynamicFamilyIT.java
index 0b6a728..866a8d2 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/DynamicFamilyIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/DynamicFamilyIT.java
@@ -63,7 +63,7 @@ import org.junit.Test;
justification="Designed to ignore.")
public class DynamicFamilyIT extends ParallelStatsDisabledIT {
- private static final String WEB_STATS = generateRandomString();
+ private static final String WEB_STATS = generateUniqueName();
private static final String WEB_STATS_SCHEMA_NAME = "";
private static final byte[] A_CF = Bytes.toBytes(SchemaUtil.normalizeIdentifier("A"));
private static final byte[] B_CF = Bytes.toBytes(SchemaUtil.normalizeIdentifier("B"));
@@ -339,7 +339,7 @@ public class DynamicFamilyIT extends ParallelStatsDisabledIT {
ResultSet rs;
Connection conn = DriverManager.getConnection(getUrl());
conn.setAutoCommit(true);
- String tableName = generateRandomString();
+ String tableName = generateUniqueName();
conn.createStatement().execute("CREATE TABLE " + tableName
+ " (Id VARCHAR NOT NULL PRIMARY KEY, COLFAM1.A VARCHAR, COLFAM1.B VARCHAR, COLFAM2.A VARCHAR )");
conn.createStatement().execute("UPSERT INTO " + tableName
http://git-wip-us.apache.org/repos/asf/phoenix/blob/bebb5ced/phoenix-core/src/it/java/org/apache/phoenix/end2end/DynamicUpsertIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/DynamicUpsertIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/DynamicUpsertIT.java
index 4cd2c6b..66ff35a 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/DynamicUpsertIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/DynamicUpsertIT.java
@@ -51,7 +51,7 @@ public class DynamicUpsertIT extends ParallelStatsDisabledIT {
@Before
public void doBeforeTestSetup() throws Exception {
- tableName = BaseTest.generateRandomString();
+ tableName = BaseTest.generateUniqueName();
Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
Connection conn = DriverManager.getConnection(getUrl(), props);
String ddl = "create table " + tableName + " (entry varchar not null primary key,"
http://git-wip-us.apache.org/repos/asf/phoenix/blob/bebb5ced/phoenix-core/src/it/java/org/apache/phoenix/end2end/EncodeFunctionIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/EncodeFunctionIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/EncodeFunctionIT.java
index b61ac73..7517dd6 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/EncodeFunctionIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/EncodeFunctionIT.java
@@ -97,7 +97,7 @@ public class EncodeFunctionIT extends ParallelStatsDisabledIT {
@Test
public void testUpperCaseEncodingType() throws Exception {
Connection conn = DriverManager.getConnection(getUrl());
- String tableName = generateRandomString();
+ String tableName = generateUniqueName();
String ddl = "CREATE TABLE " + tableName + " ( pk VARCHAR(10) NOT NULL CONSTRAINT PK PRIMARY KEY (pk))";
conn.createStatement().execute(ddl);
@@ -114,7 +114,7 @@ public class EncodeFunctionIT extends ParallelStatsDisabledIT {
@Test
public void testNullEncodingType() throws Exception {
Connection conn = DriverManager.getConnection(getUrl());
- String tableName = generateRandomString();
+ String tableName = generateUniqueName();
String ddl = "CREATE TABLE " + tableName + " ( pk VARCHAR(10) NOT NULL CONSTRAINT PK PRIMARY KEY (pk))";
conn.createStatement().execute(ddl);
@@ -125,7 +125,7 @@ public class EncodeFunctionIT extends ParallelStatsDisabledIT {
@Test
public void testUnsupportedEncodingType() throws Exception {
Connection conn = DriverManager.getConnection(getUrl());
- String tableName = generateRandomString();
+ String tableName = generateUniqueName();
String ddl = "CREATE TABLE " + tableName + " ( pk VARCHAR(10) NOT NULL CONSTRAINT PK PRIMARY KEY (pk))";
conn.createStatement().execute(ddl);
@@ -140,7 +140,7 @@ public class EncodeFunctionIT extends ParallelStatsDisabledIT {
@Test
public void testInvalidEncodingType() throws Exception {
Connection conn = DriverManager.getConnection(getUrl());
- String tableName = generateRandomString();
+ String tableName = generateUniqueName();
String ddl =
"CREATE TABLE " + tableName + " ( some_column BINARY(12) NOT NULL CONSTRAINT PK PRIMARY KEY (some_column))";
conn.createStatement().execute(ddl);
http://git-wip-us.apache.org/repos/asf/phoenix/blob/bebb5ced/phoenix-core/src/it/java/org/apache/phoenix/end2end/EvaluationOfORIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/EvaluationOfORIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/EvaluationOfORIT.java
index d976d23..1e450de 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/EvaluationOfORIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/EvaluationOfORIT.java
@@ -49,7 +49,7 @@ public class EvaluationOfORIT extends ParallelStatsDisabledIT{
public void testPKOrNotPKInOREvaluation() throws SQLException {
Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
Connection conn = DriverManager.getConnection(getUrl(), props);
- String tableName = generateRandomString();
+ String tableName = generateUniqueName();
conn.setAutoCommit(false);
String create = "CREATE TABLE " + tableName + " ( ID INTEGER NOT NULL PRIMARY KEY,NAME VARCHAR(50))";
http://git-wip-us.apache.org/repos/asf/phoenix/blob/bebb5ced/phoenix-core/src/it/java/org/apache/phoenix/end2end/ExecuteStatementsIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ExecuteStatementsIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ExecuteStatementsIT.java
index f82fffe..bc21af0 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ExecuteStatementsIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ExecuteStatementsIT.java
@@ -54,7 +54,7 @@ public class ExecuteStatementsIT extends ParallelStatsDisabledIT {
public void testExecuteStatements() throws Exception {
String tenantId = getOrganizationId();
String tableName = initATableValues(tenantId, getDefaultSplits(tenantId), getUrl());
- String ptsdbTableName = generateRandomString();
+ String ptsdbTableName = generateUniqueName();
String statements =
"create table if not exists " + tableName + // Shouldn't error out b/c of if not exists clause
" (organization_id char(15) not null, \n" +
@@ -120,7 +120,7 @@ public class ExecuteStatementsIT extends ParallelStatsDisabledIT {
@Test
public void testCharPadding() throws Exception {
Connection conn = DriverManager.getConnection(getUrl());
- String tableName = generateRandomString();
+ String tableName = generateUniqueName();
String rowKey = "hello";
String testString = "world";
String query = "create table " + tableName +
@@ -144,7 +144,7 @@ public class ExecuteStatementsIT extends ParallelStatsDisabledIT {
statement.execute();
conn.commit();
- String btableName = generateRandomString();
+ String btableName = generateUniqueName();
ensureTableCreated(getUrl(),btableName, BTABLE_NAME, nextTimestamp()-2);
statement = conn.prepareStatement(
"upsert into " + btableName + " VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)");
http://git-wip-us.apache.org/repos/asf/phoenix/blob/bebb5ced/phoenix-core/src/it/java/org/apache/phoenix/end2end/ExpFunctionEnd2EndIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ExpFunctionEnd2EndIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ExpFunctionEnd2EndIT.java
index 40b0637..4b61bdb 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ExpFunctionEnd2EndIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ExpFunctionEnd2EndIT.java
@@ -45,8 +45,8 @@ public class ExpFunctionEnd2EndIT extends ParallelStatsDisabledIT {
public void initTable() throws Exception {
Connection conn = null;
PreparedStatement stmt = null;
- signedTableName = generateRandomString();
- unsignedTableName = generateRandomString();
+ signedTableName = generateUniqueName();
+ unsignedTableName = generateUniqueName();
try {
conn = DriverManager.getConnection(getUrl());
http://git-wip-us.apache.org/repos/asf/phoenix/blob/bebb5ced/phoenix-core/src/it/java/org/apache/phoenix/end2end/FirstValueFunctionIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/FirstValueFunctionIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/FirstValueFunctionIT.java
index e78c130..a2fa244 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/FirstValueFunctionIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/FirstValueFunctionIT.java
@@ -33,7 +33,7 @@ public class FirstValueFunctionIT extends ParallelStatsDisabledIT {
public void signedLongAsBigInt() throws Exception {
Connection conn = DriverManager.getConnection(getUrl());
- String tableName = generateRandomString();
+ String tableName = generateUniqueName();
String ddl = "CREATE TABLE IF NOT EXISTS " + tableName + " "
+ "(id INTEGER NOT NULL PRIMARY KEY, page_id UNSIGNED_LONG,"
+ " date BIGINT, \"value\" BIGINT)";
@@ -64,7 +64,7 @@ public class FirstValueFunctionIT extends ParallelStatsDisabledIT {
public void testSortOrderInSortCol() throws Exception {
Connection conn = DriverManager.getConnection(getUrl());
- String tableName = generateRandomString();
+ String tableName = generateUniqueName();
String ddl = "CREATE TABLE IF NOT EXISTS " + tableName + " "
+ "(id INTEGER NOT NULL, page_id UNSIGNED_LONG,"
+ " dates BIGINT NOT NULL, \"value\" BIGINT CONSTRAINT pk PRIMARY KEY (id, dates DESC))";
@@ -95,7 +95,7 @@ public class FirstValueFunctionIT extends ParallelStatsDisabledIT {
public void testSortOrderInDataCol() throws Exception {
Connection conn = DriverManager.getConnection(getUrl());
- String tableName = generateRandomString();
+ String tableName = generateUniqueName();
String ddl = "CREATE TABLE IF NOT EXISTS " + tableName + " "
+ "(id INTEGER NOT NULL, page_id UNSIGNED_LONG,"
+ " dates BIGINT NOT NULL, \"value\" BIGINT NOT NULL CONSTRAINT pk PRIMARY KEY (id, dates, \"value\" DESC))";
@@ -126,7 +126,7 @@ public class FirstValueFunctionIT extends ParallelStatsDisabledIT {
public void doubleDataType() throws Exception {
Connection conn = DriverManager.getConnection(getUrl());
- String tableName = generateRandomString();
+ String tableName = generateUniqueName();
String ddl = "CREATE TABLE IF NOT EXISTS " + tableName + " "
+ "(id INTEGER NOT NULL PRIMARY KEY, page_id UNSIGNED_LONG, "
+ "date DOUBLE, \"value\" DOUBLE)";
@@ -157,7 +157,7 @@ public class FirstValueFunctionIT extends ParallelStatsDisabledIT {
public void varcharFixedLenghtDatatype() throws Exception {
Connection conn = DriverManager.getConnection(getUrl());
- String table_name = generateRandomString();
+ String table_name = generateUniqueName();
String ddl = "CREATE TABLE IF NOT EXISTS " + table_name + " "
+ "(id INTEGER NOT NULL PRIMARY KEY, page_id UNSIGNED_LONG, "
+ "date VARCHAR(3), \"value\" VARCHAR(3))";
@@ -188,7 +188,7 @@ public class FirstValueFunctionIT extends ParallelStatsDisabledIT {
public void floatDataType() throws Exception {
Connection conn = DriverManager.getConnection(getUrl());
- String tableName = generateRandomString();
+ String tableName = generateUniqueName();
String ddl = "CREATE TABLE IF NOT EXISTS " + tableName + " "
+ "(id INTEGER NOT NULL PRIMARY KEY, page_id UNSIGNED_LONG,"
+ " date FLOAT, \"value\" FLOAT)";
@@ -220,7 +220,7 @@ public class FirstValueFunctionIT extends ParallelStatsDisabledIT {
public void allColumnsNull() throws Exception {
Connection conn = DriverManager.getConnection(getUrl());
- String tableName = generateRandomString();
+ String tableName = generateUniqueName();
String ddl = "CREATE TABLE IF NOT EXISTS " + tableName + " "
+ "(id INTEGER NOT NULL PRIMARY KEY, page_id UNSIGNED_LONG,"
+ " date FLOAT, \"value\" FLOAT)";
http://git-wip-us.apache.org/repos/asf/phoenix/blob/bebb5ced/phoenix-core/src/it/java/org/apache/phoenix/end2end/GetSetByteBitFunctionEnd2EndIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/GetSetByteBitFunctionEnd2EndIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/GetSetByteBitFunctionEnd2EndIT.java
index e95ca4c..98d1478 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/GetSetByteBitFunctionEnd2EndIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/GetSetByteBitFunctionEnd2EndIT.java
@@ -42,7 +42,7 @@ import org.junit.Test;
public class GetSetByteBitFunctionEnd2EndIT extends ParallelStatsDisabledIT {
private static final String KEY = "key";
- private static final String TABLE_NAME = generateRandomString();
+ private static final String TABLE_NAME = generateUniqueName();
@BeforeClass
public static void initTable() throws Exception {
http://git-wip-us.apache.org/repos/asf/phoenix/blob/bebb5ced/phoenix-core/src/it/java/org/apache/phoenix/end2end/GroupByCaseIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/GroupByCaseIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/GroupByCaseIT.java
index 0acfe02..48b926a 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/GroupByCaseIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/GroupByCaseIT.java
@@ -69,7 +69,7 @@ public class GroupByCaseIT extends ParallelStatsDisabledIT {
public void testExpressionInGroupBy() throws Exception {
Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
Connection conn = DriverManager.getConnection(getUrl(), props);
- String tableName = generateRandomString();
+ String tableName = generateUniqueName();
String ddl = " create table " + tableName + "(tgb_id integer NOT NULL,utc_date_epoch integer NOT NULL,tgb_name varchar(40),ack_success_count integer" +
",ack_success_one_ack_count integer, CONSTRAINT pk_tgb_counter PRIMARY KEY(tgb_id, utc_date_epoch))";
String query = "SELECT tgb_id, tgb_name, (utc_date_epoch/10)*10 AS utc_epoch_hour,SUM(ack_success_count + ack_success_one_ack_count) AS ack_tx_sum" +
@@ -112,7 +112,7 @@ public class GroupByCaseIT extends ParallelStatsDisabledIT {
public void testBooleanInGroupBy() throws Exception {
Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
Connection conn = DriverManager.getConnection(getUrl(), props);
- String tableName = generateRandomString();
+ String tableName = generateUniqueName();
String ddl = " create table " + tableName + "(id varchar primary key,v1 boolean, v2 integer, v3 integer)";
createTestTable(getUrl(), ddl);
@@ -162,7 +162,7 @@ public class GroupByCaseIT extends ParallelStatsDisabledIT {
public void testScanUri() throws Exception {
Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
Connection conn = DriverManager.getConnection(getUrl(), props);
- String tableName = generateRandomString();
+ String tableName = generateUniqueName();
initData(conn, tableName);
Statement stmt = conn.createStatement();
ResultSet rs = stmt.executeQuery("select uri from " + tableName);
@@ -190,7 +190,7 @@ public class GroupByCaseIT extends ParallelStatsDisabledIT {
public void testCount() throws Exception {
Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
Connection conn = DriverManager.getConnection(getUrl(), props);
- String tableName = generateRandomString();
+ String tableName = generateUniqueName();
initData(conn, tableName);
Statement stmt = conn.createStatement();
ResultSet rs = stmt.executeQuery("select count(1) from " + tableName);
@@ -204,7 +204,7 @@ public class GroupByCaseIT extends ParallelStatsDisabledIT {
public void testGroupByCase() throws Exception {
Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
Connection conn = DriverManager.getConnection(getUrl(), props);
- String tableName = generateRandomString();
+ String tableName = generateUniqueName();
String groupBy1 = "select " +
"case when uri LIKE 'Report%' then 'Reports' else 'Other' END category" +
", avg(appcpu) from " + tableName +
@@ -238,7 +238,7 @@ public class GroupByCaseIT extends ParallelStatsDisabledIT {
Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
Connection conn = DriverManager.getConnection(getUrl(), props);
- String tableName = generateRandomString();
+ String tableName = generateUniqueName();
conn.createStatement().execute("CREATE TABLE " + tableName + "(\n" +
" a VARCHAR NOT NULL,\n" +
" b VARCHAR,\n" +
@@ -274,7 +274,7 @@ public class GroupByCaseIT extends ParallelStatsDisabledIT {
public void testGroupByOrderPreserving() throws Exception {
Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
Connection conn = DriverManager.getConnection(getUrl(), props);
- String tableName = generateRandomString();
+ String tableName = generateUniqueName();
conn.createStatement().execute("CREATE TABLE " + tableName + "(ORGANIZATION_ID char(15) not null, \n" +
"JOURNEY_ID char(15) not null, \n" +
@@ -319,7 +319,7 @@ public class GroupByCaseIT extends ParallelStatsDisabledIT {
public void testGroupByOrderPreservingDescSort() throws Exception {
Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
Connection conn = DriverManager.getConnection(getUrl(), props);
- String tableName = generateRandomString();
+ String tableName = generateUniqueName();
conn.createStatement().execute("CREATE TABLE " + tableName + " (k1 char(1) not null, k2 char(1) not null, constraint pk primary key (k1,k2)) split on ('ac','jc','nc')");
conn.createStatement().execute("UPSERT INTO " + tableName + " VALUES('a', 'a')");
conn.createStatement().execute("UPSERT INTO " + tableName + " VALUES('a', 'b')");
@@ -357,7 +357,7 @@ public class GroupByCaseIT extends ParallelStatsDisabledIT {
public void testSumGroupByOrderPreservingDesc() throws Exception {
Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
Connection conn = DriverManager.getConnection(getUrl(), props);
- String tableName = generateRandomString();
+ String tableName = generateUniqueName();
PreparedStatement stmt = conn.prepareStatement("CREATE TABLE " + tableName + " (k1 char(1) not null, k2 integer not null, constraint pk primary key (k1,k2)) split on (?,?,?)");
stmt.setBytes(1, ByteUtil.concat(PChar.INSTANCE.toBytes("a"), PInteger.INSTANCE.toBytes(3)));
@@ -404,7 +404,7 @@ public class GroupByCaseIT extends ParallelStatsDisabledIT {
public void testAvgGroupByOrderPreserving() throws Exception {
Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
Connection conn = DriverManager.getConnection(getUrl(), props);
- String tableName = generateRandomString();
+ String tableName = generateUniqueName();
PreparedStatement stmt = conn.prepareStatement("CREATE TABLE " + tableName + " (k1 char(1) not null, k2 integer not null, constraint pk primary key (k1,k2)) split on (?,?,?)");
stmt.setBytes(1, ByteUtil.concat(PChar.INSTANCE.toBytes("a"), PInteger.INSTANCE.toBytes(3)));
http://git-wip-us.apache.org/repos/asf/phoenix/blob/bebb5ced/phoenix-core/src/it/java/org/apache/phoenix/end2end/HashJoinMoreIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/HashJoinMoreIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/HashJoinMoreIT.java
index c9530a8..5f04ead 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/HashJoinMoreIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/HashJoinMoreIT.java
@@ -103,8 +103,8 @@ public class HashJoinMoreIT extends ParallelStatsDisabledIT {
@Test
public void testJoinOverSaltedTables() throws Exception {
- String tempTableNoSalting = generateRandomString();
- String tempTableWithSalting = generateRandomString();
+ String tempTableNoSalting = generateUniqueName();
+ String tempTableWithSalting = generateUniqueName();
Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
Connection conn = DriverManager.getConnection(getUrl(), props);
try {
@@ -241,8 +241,8 @@ public class HashJoinMoreIT extends ParallelStatsDisabledIT {
@Test
public void testJoinOnDynamicColumns() throws Exception {
- String tableA = generateRandomString();
- String tableB = generateRandomString();
+ String tableA = generateUniqueName();
+ String tableB = generateUniqueName();
Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
Connection conn = null;
PreparedStatement stmt = null;
@@ -272,7 +272,7 @@ public class HashJoinMoreIT extends ParallelStatsDisabledIT {
conn.commit();
stmt.close();
- String sequenceB = generateRandomString();
+ String sequenceB = generateUniqueName();
// upsert select dynamic columns in tableB
conn.createStatement().execute("CREATE SEQUENCE " + sequenceB );
String upsertBSelectA = "UPSERT INTO " + tableB + " (pkB, pkA INTEGER)"
@@ -311,7 +311,7 @@ public class HashJoinMoreIT extends ParallelStatsDisabledIT {
@Test
public void testJoinWithKeyRangeOptimization() throws Exception {
- String tempTableWithCompositePK = generateRandomString();
+ String tempTableWithCompositePK = generateUniqueName();
Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
Connection conn = DriverManager.getConnection(getUrl(), props);
try {
http://git-wip-us.apache.org/repos/asf/phoenix/blob/bebb5ced/phoenix-core/src/it/java/org/apache/phoenix/end2end/InListIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/InListIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/InListIT.java
index b0c661e..fe88dc8 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/InListIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/InListIT.java
@@ -51,7 +51,7 @@ public class InListIT extends ParallelStatsDisabledIT {
public void testLeadingPKWithTrailingRVC() throws Exception {
Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
Connection conn = DriverManager.getConnection(getUrl(), props);
- String tableName = generateRandomString();
+ String tableName = generateUniqueName();
conn.createStatement().execute("CREATE TABLE " + tableName
+ "( col1 VARCHAR NOT NULL,"
+ " col2 VARCHAR NOT NULL, "
@@ -74,7 +74,7 @@ public class InListIT extends ParallelStatsDisabledIT {
public void testLeadingPKWithTrailingRVC2() throws Exception {
Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
Connection conn = DriverManager.getConnection(getUrl(), props);
- String tableName = generateRandomString();
+ String tableName = generateUniqueName();
conn.createStatement().execute("CREATE TABLE " + tableName + " ( user VARCHAR, tenant_id VARCHAR(5) NOT NULL,tenant_type_id VARCHAR(3) NOT NULL, id INTEGER NOT NULL CONSTRAINT pk PRIMARY KEY (tenant_id, tenant_type_id, id))");
conn.createStatement().execute("upsert into " + tableName + " (tenant_id, tenant_type_id, id, user) values ('a', 'a', 1, 'BonA')");
@@ -144,7 +144,7 @@ public class InListIT extends ParallelStatsDisabledIT {
* @return the table or view name that should be used to access the created table
*/
private static String initializeAndGetTable(Connection baseConn, Connection conn, boolean isMultiTenant, PDataType pkType, int saltBuckets) throws SQLException {
- String tableName = generateRandomString() + "in_test" + pkType.getSqlTypeName() + saltBuckets + (isMultiTenant ? "_multi" : "_single");
+ String tableName = generateUniqueName() + "in_test" + pkType.getSqlTypeName() + saltBuckets + (isMultiTenant ? "_multi" : "_single");
String tableDDL = createTableDDL(tableName, pkType, saltBuckets, isMultiTenant);
baseConn.createStatement().execute(tableDDL);
@@ -445,7 +445,7 @@ public class InListIT extends ParallelStatsDisabledIT {
public void testWithFixedLengthKV() throws Exception {
Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
Connection conn = DriverManager.getConnection(getUrl(), props);
- String tableName = generateRandomString();
+ String tableName = generateUniqueName();
conn.createStatement().execute("CREATE TABLE " + tableName + " ( id INTEGER PRIMARY KEY, k CHAR(3))");
conn.createStatement().execute("upsert into " + tableName + " values (1, 'aa')");
@@ -465,7 +465,7 @@ public class InListIT extends ParallelStatsDisabledIT {
private void testWithFixedLengthPK(SortOrder sortOrder) throws Exception {
Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
Connection conn = DriverManager.getConnection(getUrl(), props);
- String tableName = generateRandomString();
+ String tableName = generateUniqueName();
conn.createStatement().execute("CREATE TABLE " + tableName + " ( k CHAR(3) PRIMARY KEY " + (sortOrder == SortOrder.DESC ? "DESC" : "") + ")");
conn.createStatement().execute("upsert into " + tableName + " (k) values ('aa')");
http://git-wip-us.apache.org/repos/asf/phoenix/blob/bebb5ced/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexExtendedIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexExtendedIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexExtendedIT.java
index 8314850..e3a541d 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexExtendedIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexExtendedIT.java
@@ -120,10 +120,10 @@ public class IndexExtendedIT extends BaseOwnClusterIT {
if (!mutable || transactional) {
return;
}
- String schemaName = generateRandomString();
- String dataTableName = generateRandomString();
+ String schemaName = generateUniqueName();
+ String dataTableName = generateUniqueName();
String dataTableFullName = SchemaUtil.getTableName(schemaName, dataTableName);
- String indexTableName = generateRandomString();
+ String indexTableName = generateUniqueName();
String indexTableFullName = SchemaUtil.getTableName(schemaName, indexTableName);
Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
Connection conn = DriverManager.getConnection(getUrl(), props);
@@ -192,10 +192,10 @@ public class IndexExtendedIT extends BaseOwnClusterIT {
@Test
public void testSecondaryIndex() throws Exception {
- String schemaName = generateRandomString();
- String dataTableName = generateRandomString();
+ String schemaName = generateUniqueName();
+ String dataTableName = generateUniqueName();
String dataTableFullName = SchemaUtil.getTableName(schemaName, dataTableName);
- String indexTableName = generateRandomString();
+ String indexTableName = generateUniqueName();
String indexTableFullName = SchemaUtil.getTableName(schemaName, indexTableName);
Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
Connection conn = DriverManager.getConnection(getUrl(), props);
@@ -318,10 +318,10 @@ public class IndexExtendedIT extends BaseOwnClusterIT {
if (localIndex) { // TODO: remove this return once PHOENIX-3292 is fixed
return;
}
- String schemaName = generateRandomString();
- String dataTableName = generateRandomString();
+ String schemaName = generateUniqueName();
+ String dataTableName = generateUniqueName();
String dataTableFullName = SchemaUtil.getTableName(schemaName, dataTableName);
- String indexTableName = generateRandomString();
+ String indexTableName = generateUniqueName();
String indexTableFullName = SchemaUtil.getTableName(schemaName, indexTableName);
Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
try (Connection conn = DriverManager.getConnection(getUrl(), props)) {
@@ -400,9 +400,9 @@ public class IndexExtendedIT extends BaseOwnClusterIT {
if (!localIndex || transactional || mutable || directApi) {
return;
}
- String schemaName = generateRandomString();
- String tableName = schemaName + "." + generateRandomString();
- String indexName = "IDX_" + generateRandomString();
+ String schemaName = generateUniqueName();
+ String tableName = schemaName + "." + generateUniqueName();
+ String indexName = "IDX_" + generateUniqueName();
TableName physicalTableName = SchemaUtil.getPhysicalTableName(tableName.getBytes(), false);
String indexPhysicalTableName = physicalTableName.getNameAsString();
@@ -502,9 +502,9 @@ public class IndexExtendedIT extends BaseOwnClusterIT {
if (!localIndex || transactional || mutable || directApi) {
return;
}
- String schemaName = generateRandomString();
- String tableName = schemaName + "." + generateRandomString();
- String indexName = "IDX_" + generateRandomString();
+ String schemaName = generateUniqueName();
+ String tableName = schemaName + "." + generateUniqueName();
+ String indexName = "IDX_" + generateUniqueName();
TableName physicalTableName = SchemaUtil.getPhysicalTableName(tableName.getBytes(), false);
String indexPhysicalTableName = physicalTableName.getNameAsString();
http://git-wip-us.apache.org/repos/asf/phoenix/blob/bebb5ced/phoenix-core/src/it/java/org/apache/phoenix/end2end/InstrFunctionIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/InstrFunctionIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/InstrFunctionIT.java
index e77499a..270b1ec 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/InstrFunctionIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/InstrFunctionIT.java
@@ -61,7 +61,7 @@ public class InstrFunctionIT extends ParallelStatsDisabledIT {
@Test
public void testSingleByteInstrAscending() throws Exception {
Connection conn = DriverManager.getConnection(getUrl());
- String tableName = generateRandomString();
+ String tableName = generateUniqueName();
initTable(conn, tableName, "ASC", "abcdefghijkl","fgh");
String queryToExecute = "SELECT INSTR(name, 'fgh') FROM " + tableName;
testInstr(conn, queryToExecute, 6);
@@ -70,7 +70,7 @@ public class InstrFunctionIT extends ParallelStatsDisabledIT {
@Test
public void testSingleByteInstrDescending() throws Exception {
Connection conn = DriverManager.getConnection(getUrl());
- String tableName = generateRandomString();
+ String tableName = generateUniqueName();
initTable(conn, tableName, "DESC", "abcdefghijkl","fgh");
String queryToExecute = "SELECT INSTR(name, 'fgh') FROM " + tableName;
testInstr(conn, queryToExecute, 6);
@@ -79,7 +79,7 @@ public class InstrFunctionIT extends ParallelStatsDisabledIT {
@Test
public void testSingleByteInstrAscendingNoString() throws Exception {
Connection conn = DriverManager.getConnection(getUrl());
- String tableName = generateRandomString();
+ String tableName = generateUniqueName();
initTable(conn, tableName, "ASC", "abcde fghijkl","lmn");
String queryToExecute = "SELECT INSTR(name, 'lmn') FROM " + tableName;
testInstr(conn, queryToExecute, 0);
@@ -88,7 +88,7 @@ public class InstrFunctionIT extends ParallelStatsDisabledIT {
@Test
public void testSingleByteInstrDescendingNoString() throws Exception {
Connection conn = DriverManager.getConnection(getUrl());
- String tableName = generateRandomString();
+ String tableName = generateUniqueName();
initTable(conn, tableName, "DESC", "abcde fghijkl","lmn");
String queryToExecute = "SELECT INSTR(name, 'lmn') FROM " + tableName;
testInstr(conn, queryToExecute, 0);
@@ -97,7 +97,7 @@ public class InstrFunctionIT extends ParallelStatsDisabledIT {
@Test
public void testMultiByteInstrAscending() throws Exception {
Connection conn = DriverManager.getConnection(getUrl());
- String tableName = generateRandomString();
+ String tableName = generateUniqueName();
initTable(conn, tableName, "ASC", "A\u025a\u0266FGH","\u025a\u0266");
String queryToExecute = "SELECT INSTR(name, '\u025a\u0266') FROM " + tableName;
testInstr(conn, queryToExecute, 2);
@@ -106,7 +106,7 @@ public class InstrFunctionIT extends ParallelStatsDisabledIT {
@Test
public void testMultiByteInstrDecending() throws Exception {
Connection conn = DriverManager.getConnection(getUrl());
- String tableName = generateRandomString();
+ String tableName = generateUniqueName();
initTable(conn, tableName, "DESC", "A\u025a\u0266FGH","\u025a\u0266");
String queryToExecute = "SELECT INSTR(name, '\u025a\u0266') FROM " + tableName;
testInstr(conn, queryToExecute, 2);
@@ -115,7 +115,7 @@ public class InstrFunctionIT extends ParallelStatsDisabledIT {
@Test
public void testByteInstrAscendingFilter() throws Exception {
Connection conn = DriverManager.getConnection(getUrl());
- String tableName = generateRandomString();
+ String tableName = generateUniqueName();
initTable(conn, tableName, "ASC", "abcdefghijkl","fgh");
String queryToExecute = "select NAME from " + tableName + " where instr(name, 'fgh') > 0";
testInstrFilter(conn, queryToExecute,"abcdefghijkl");
@@ -125,7 +125,7 @@ public class InstrFunctionIT extends ParallelStatsDisabledIT {
@Test
public void testByteInstrDecendingFilter() throws Exception {
Connection conn = DriverManager.getConnection(getUrl());
- String tableName = generateRandomString();
+ String tableName = generateUniqueName();
initTable(conn, tableName, "DESC", "abcdefghijkl","fgh");
String queryToExecute = "select NAME from " + tableName + " where instr(name, 'fgh') > 0";
testInstrFilter(conn, queryToExecute,"abcdefghijkl");
[4/6] phoenix git commit: PHOENIX-3253 Make changes to tests to
support method level parallelization
Posted by ja...@apache.org.
http://git-wip-us.apache.org/repos/asf/phoenix/blob/bebb5ced/phoenix-core/src/it/java/org/apache/phoenix/end2end/IsNullIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/IsNullIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/IsNullIT.java
index fb12fc4..10a5baa 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/IsNullIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/IsNullIT.java
@@ -33,7 +33,7 @@ import org.junit.Test;
public class IsNullIT extends ParallelStatsDisabledIT {
@Test
public void testIsNullInPk() throws Exception {
- String tableName = generateRandomString();
+ String tableName = generateUniqueName();
ensureTableCreated(getUrl(), tableName, "IntIntKeyTest");
Connection conn = DriverManager.getConnection(getUrl());
String upsert = "UPSERT INTO " + tableName + " VALUES(4,2)";
@@ -62,7 +62,7 @@ public class IsNullIT extends ParallelStatsDisabledIT {
@Test
public void testIsNullWithLastPKColDesc() throws Exception {
- String tableName = generateRandomString();
+ String tableName = generateUniqueName();
Connection conn = DriverManager.getConnection(getUrl());
conn.createStatement().execute("CREATE TABLE " + tableName + "(k1 VARCHAR NOT NULL, k2 VARCHAR, k3 VARCHAR, CONSTRAINT pk PRIMARY KEY (k1, k2, k3 DESC))");
conn.createStatement().execute("UPSERT INTO " + tableName + " VALUES ('a')");
@@ -89,7 +89,7 @@ public class IsNullIT extends ParallelStatsDisabledIT {
@Test
public void testIsNullInCompositeKey() throws Exception {
Connection conn = DriverManager.getConnection(getUrl());
- String tableName = generateRandomString();
+ String tableName = generateUniqueName();
conn.createStatement().execute("CREATE TABLE " + tableName + "(k1 VARCHAR, k2 VARCHAR, CONSTRAINT pk PRIMARY KEY (k1,k2))");
conn.createStatement().execute("UPSERT INTO " + tableName + " VALUES (null,'a')");
conn.createStatement().execute("UPSERT INTO " + tableName + " VALUES ('a','a')");
http://git-wip-us.apache.org/repos/asf/phoenix/blob/bebb5ced/phoenix-core/src/it/java/org/apache/phoenix/end2end/KeyOnlyIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/KeyOnlyIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/KeyOnlyIT.java
index 7ec37ce..b682c1a 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/KeyOnlyIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/KeyOnlyIT.java
@@ -45,7 +45,7 @@ public class KeyOnlyIT extends ParallelStatsEnabledIT {
@Before
public void createTable() throws SQLException {
- tableName = generateRandomString();
+ tableName = generateUniqueName();
Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
try (Connection conn = DriverManager.getConnection(getUrl(), props)) {
conn.createStatement().execute("create table " + tableName +
http://git-wip-us.apache.org/repos/asf/phoenix/blob/bebb5ced/phoenix-core/src/it/java/org/apache/phoenix/end2end/LastValueFunctionIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/LastValueFunctionIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/LastValueFunctionIT.java
index e28f510..2a3ebf7 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/LastValueFunctionIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/LastValueFunctionIT.java
@@ -33,7 +33,7 @@ public class LastValueFunctionIT extends ParallelStatsDisabledIT {
@Test
public void unsignedLong() throws Exception {
Connection conn = DriverManager.getConnection(getUrl());
- String tableName = generateRandomString();
+ String tableName = generateUniqueName();
String ddl = "CREATE TABLE IF NOT EXISTS " + tableName
+ "(id INTEGER NOT NULL PRIMARY KEY, page_id UNSIGNED_LONG,"
+ " date DATE, \"value\" UNSIGNED_LONG)";
@@ -65,7 +65,7 @@ public class LastValueFunctionIT extends ParallelStatsDisabledIT {
@Test
public void signedInteger() throws Exception {
Connection conn = DriverManager.getConnection(getUrl());
- String tableName = generateRandomString();
+ String tableName = generateUniqueName();
String ddl = "CREATE TABLE IF NOT EXISTS " + tableName
+ "(id INTEGER NOT NULL PRIMARY KEY, page_id UNSIGNED_LONG, date INTEGER, \"value\" INTEGER)";
@@ -90,7 +90,7 @@ public class LastValueFunctionIT extends ParallelStatsDisabledIT {
@Test
public void unsignedInteger() throws Exception {
Connection conn = DriverManager.getConnection(getUrl());
- String tableName = generateRandomString();
+ String tableName = generateUniqueName();
String ddl = "CREATE TABLE IF NOT EXISTS " + tableName
+ "(id INTEGER NOT NULL PRIMARY KEY, page_id UNSIGNED_LONG,"
@@ -115,7 +115,7 @@ public class LastValueFunctionIT extends ParallelStatsDisabledIT {
@Test
public void simpleTestDescOrder() throws Exception {
Connection conn = DriverManager.getConnection(getUrl());
- String tableName = generateRandomString();
+ String tableName = generateUniqueName();
String ddl = "CREATE TABLE IF NOT EXISTS " + tableName
+ "(id INTEGER NOT NULL PRIMARY KEY, page_id UNSIGNED_LONG,"
@@ -141,7 +141,7 @@ public class LastValueFunctionIT extends ParallelStatsDisabledIT {
@Test
public void simpleTestAscOrder() throws Exception {
Connection conn = DriverManager.getConnection(getUrl());
- String tableName = generateRandomString();
+ String tableName = generateUniqueName();
String ddl = "CREATE TABLE IF NOT EXISTS " + tableName
+ "(id INTEGER NOT NULL PRIMARY KEY, page_id UNSIGNED_LONG,"
@@ -167,7 +167,7 @@ public class LastValueFunctionIT extends ParallelStatsDisabledIT {
@Test
public void charDatatype() throws Exception {
Connection conn = DriverManager.getConnection(getUrl());
- String tableName = generateRandomString();
+ String tableName = generateUniqueName();
String ddl = "CREATE TABLE IF NOT EXISTS " + tableName
+ "(id INTEGER NOT NULL PRIMARY KEY, page_id UNSIGNED_LONG, "
@@ -192,7 +192,7 @@ public class LastValueFunctionIT extends ParallelStatsDisabledIT {
@Test
public void varcharVariableLenghtDatatype() throws Exception {
Connection conn = DriverManager.getConnection(getUrl());
- String tableName = generateRandomString();
+ String tableName = generateUniqueName();
String ddl = "CREATE TABLE IF NOT EXISTS " + tableName
+ "(id INTEGER NOT NULL PRIMARY KEY, page_id UNSIGNED_LONG,"
@@ -217,7 +217,7 @@ public class LastValueFunctionIT extends ParallelStatsDisabledIT {
@Test
public void groupMultipleValues() throws Exception {
Connection conn = DriverManager.getConnection(getUrl());
- String tableName = generateRandomString();
+ String tableName = generateUniqueName();
String ddl = "CREATE TABLE IF NOT EXISTS " + tableName
+ "(id INTEGER NOT NULL PRIMARY KEY, page_id UNSIGNED_LONG,"
@@ -254,7 +254,7 @@ public class LastValueFunctionIT extends ParallelStatsDisabledIT {
@Test
public void nullValuesInAggregatingColumns() throws Exception {
Connection conn = DriverManager.getConnection(getUrl());
- String tableName = generateRandomString();
+ String tableName = generateUniqueName();
String ddl = "CREATE TABLE IF NOT EXISTS " + tableName
+ "(id INTEGER NOT NULL PRIMARY KEY, page_id UNSIGNED_LONG,"
@@ -279,7 +279,7 @@ public class LastValueFunctionIT extends ParallelStatsDisabledIT {
@Test
public void nullValuesInAggregatingColumnsSecond() throws Exception {
Connection conn = DriverManager.getConnection(getUrl());
- String tableName = generateRandomString();
+ String tableName = generateUniqueName();
String ddl = "CREATE TABLE IF NOT EXISTS " + tableName
+ "(id INTEGER NOT NULL PRIMARY KEY, page_id UNSIGNED_LONG,"
@@ -305,7 +305,7 @@ public class LastValueFunctionIT extends ParallelStatsDisabledIT {
@Test
public void inOrderByClausule() throws Exception {
Connection conn = DriverManager.getConnection(getUrl());
- String tableName = generateRandomString();
+ String tableName = generateUniqueName();
String ddl = "CREATE TABLE IF NOT EXISTS " + tableName
+ "(id INTEGER NOT NULL PRIMARY KEY, page_id UNSIGNED_INT,"
http://git-wip-us.apache.org/repos/asf/phoenix/blob/bebb5ced/phoenix-core/src/it/java/org/apache/phoenix/end2end/LikeExpressionIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/LikeExpressionIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/LikeExpressionIT.java
index 2d6b2cb..f522817 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/LikeExpressionIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/LikeExpressionIT.java
@@ -35,7 +35,7 @@ import org.junit.Test;
public class LikeExpressionIT extends ParallelStatsDisabledIT {
- private static final String TEST_TABLE = generateRandomString();
+ private static final String TEST_TABLE = generateUniqueName();
@BeforeClass
public static void doBeforeTestSetup() throws Exception {
@@ -94,7 +94,7 @@ public class LikeExpressionIT extends ParallelStatsDisabledIT {
@Test
public void testLikeEverythingExpression() throws Exception {
Connection conn = DriverManager.getConnection(getUrl());
- String table = generateRandomString();
+ String table = generateUniqueName();
String ddl = "CREATE TABLE " + table
+ " (k1 VARCHAR, k2 VARCHAR, CONSTRAINT pk PRIMARY KEY (k1,k2))";
conn.createStatement().execute(ddl);
@@ -153,7 +153,7 @@ public class LikeExpressionIT extends ParallelStatsDisabledIT {
@Test
public void testLikeWithEscapenLParen() throws Exception {
Connection conn = DriverManager.getConnection(getUrl());
- String t = generateRandomString();
+ String t = generateUniqueName();
String ddl = "CREATE TABLE " + t + " (k VARCHAR, v VARCHAR, CONSTRAINT pk PRIMARY KEY (k))";
conn.createStatement().execute(ddl);
conn.createStatement().execute("UPSERT INTO " + t + " VALUES('aa','bb')");
@@ -175,7 +175,7 @@ public class LikeExpressionIT extends ParallelStatsDisabledIT {
@Test
public void testNewLine() throws Exception {
Connection conn = DriverManager.getConnection(getUrl());
- String t = generateRandomString();
+ String t = generateUniqueName();
String ddl = "CREATE TABLE " + t + " (k VARCHAR NOT NULL PRIMARY KEY)";
conn.createStatement().execute(ddl);
conn.createStatement().execute("UPSERT INTO " + t + " VALUES('AA\nA')");
@@ -204,7 +204,7 @@ public class LikeExpressionIT extends ParallelStatsDisabledIT {
@Test
public void testOneChar() throws Exception {
Connection conn = DriverManager.getConnection(getUrl());
- String t = generateRandomString();
+ String t = generateUniqueName();
String ddl = "CREATE TABLE " + t + " (k VARCHAR NOT NULL PRIMARY KEY)";
conn.createStatement().execute(ddl);
conn.createStatement().execute("UPSERT INTO " + t + " VALUES('A')");
@@ -227,7 +227,7 @@ public class LikeExpressionIT extends ParallelStatsDisabledIT {
@Test
public void testNull() throws Exception {
Connection conn = DriverManager.getConnection(getUrl());
- String table = generateRandomString();
+ String table = generateUniqueName();
String ddl = "CREATE TABLE " + table
+ " (pk INTEGER PRIMARY KEY, str VARCHAR)";
conn.createStatement().execute(ddl);
http://git-wip-us.apache.org/repos/asf/phoenix/blob/bebb5ced/phoenix-core/src/it/java/org/apache/phoenix/end2end/LnLogFunctionEnd2EndIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/LnLogFunctionEnd2EndIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/LnLogFunctionEnd2EndIT.java
index ad4efbc..ddbe2ad 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/LnLogFunctionEnd2EndIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/LnLogFunctionEnd2EndIT.java
@@ -59,8 +59,8 @@ public class LnLogFunctionEnd2EndIT extends ParallelStatsDisabledIT {
public void initTable() throws Exception {
Connection conn = null;
PreparedStatement stmt = null;
- signedTableName = generateRandomString();
- unsignedTableName = generateRandomString();
+ signedTableName = generateUniqueName();
+ unsignedTableName = generateUniqueName();
try {
conn = DriverManager.getConnection(getUrl());
http://git-wip-us.apache.org/repos/asf/phoenix/blob/bebb5ced/phoenix-core/src/it/java/org/apache/phoenix/end2end/MD5FunctionIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/MD5FunctionIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/MD5FunctionIT.java
index b5fc2e9..1768b10 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/MD5FunctionIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/MD5FunctionIT.java
@@ -37,7 +37,7 @@ public class MD5FunctionIT extends ParallelStatsDisabledIT {
String testString = "mwalsh";
Connection conn = DriverManager.getConnection(getUrl());
- String md5_retrieve_test = generateRandomString();
+ String md5_retrieve_test = generateUniqueName();
String ddl =
"CREATE TABLE IF NOT EXISTS " + md5_retrieve_test + " (pk VARCHAR NOT NULL PRIMARY KEY)";
conn.createStatement().execute(ddl);
@@ -58,7 +58,7 @@ public class MD5FunctionIT extends ParallelStatsDisabledIT {
String testString = "FOOBAR";
Connection conn = DriverManager.getConnection(getUrl());
- String md5_retrieve_test = generateRandomString();
+ String md5_retrieve_test = generateUniqueName();
String ddl = "CREATE TABLE IF NOT EXISTS " + md5_retrieve_test
+ " (k1 CHAR(3) NOT NULL, k2 CHAR(3) NOT NULL, CONSTRAINT PK PRIMARY KEY (K1,K2))";
conn.createStatement().execute(ddl);
@@ -81,7 +81,7 @@ public class MD5FunctionIT extends ParallelStatsDisabledIT {
String testString2 = "mwalsh2";
Connection conn = DriverManager.getConnection(getUrl());
- String md5_upsert_test = generateRandomString();
+ String md5_upsert_test = generateUniqueName();
String ddl = "CREATE TABLE IF NOT EXISTS " + md5_upsert_test
+ " (k1 binary(16) NOT NULL,k2 binary(16) NOT NULL CONSTRAINT pk PRIMARY KEY (k1, k2))";
conn.createStatement().execute(ddl);
http://git-wip-us.apache.org/repos/asf/phoenix/blob/bebb5ced/phoenix-core/src/it/java/org/apache/phoenix/end2end/MapReduceIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/MapReduceIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/MapReduceIT.java
index 0b42a1f..68d9c9c 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/MapReduceIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/MapReduceIT.java
@@ -64,8 +64,8 @@ public class MapReduceIT extends ParallelStatsDisabledIT {
@Test
public void testNoConditionsOnSelect() throws Exception {
Connection conn = DriverManager.getConnection(getUrl());
- String stockTableName = generateRandomString();
- String stockStatsTableName = generateRandomString();
+ String stockTableName = generateUniqueName();
+ String stockStatsTableName = generateUniqueName();
conn.createStatement().execute(String.format(CREATE_STOCK_TABLE, stockTableName));
conn.createStatement().execute(String.format(CREATE_STOCK_STATS_TABLE, stockStatsTableName));
conn.commit();
@@ -79,8 +79,8 @@ public class MapReduceIT extends ParallelStatsDisabledIT {
@Test
public void testConditionsOnSelect() throws Exception {
Connection conn = DriverManager.getConnection(getUrl());
- String stockTableName = generateRandomString();
- String stockStatsTableName = generateRandomString();
+ String stockTableName = generateUniqueName();
+ String stockStatsTableName = generateUniqueName();
conn.createStatement().execute(String.format(CREATE_STOCK_TABLE, stockTableName));
conn.createStatement().execute(String.format(CREATE_STOCK_STATS_TABLE, stockStatsTableName));
conn.commit();
http://git-wip-us.apache.org/repos/asf/phoenix/blob/bebb5ced/phoenix-core/src/it/java/org/apache/phoenix/end2end/MappingTableDataTypeIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/MappingTableDataTypeIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/MappingTableDataTypeIT.java
index 4bbbd03..768b005 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/MappingTableDataTypeIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/MappingTableDataTypeIT.java
@@ -52,7 +52,7 @@ import org.junit.Test;
public class MappingTableDataTypeIT extends ParallelStatsDisabledIT {
@Test
public void testMappingHbaseTableToPhoenixTable() throws Exception {
- String mtest = generateRandomString();
+ String mtest = generateUniqueName();
final TableName tableName = TableName.valueOf(mtest);
Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
PhoenixConnection conn = DriverManager.getConnection(getUrl(), props).unwrap(PhoenixConnection.class);
http://git-wip-us.apache.org/repos/asf/phoenix/blob/bebb5ced/phoenix-core/src/it/java/org/apache/phoenix/end2end/MinMaxAggregateFunctionIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/MinMaxAggregateFunctionIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/MinMaxAggregateFunctionIT.java
index c2228ff..c2429ab 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/MinMaxAggregateFunctionIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/MinMaxAggregateFunctionIT.java
@@ -25,7 +25,7 @@ import org.junit.Test;
public class MinMaxAggregateFunctionIT extends ParallelStatsDisabledIT {
- private static final String TABLE_NAME = generateRandomString();
+ private static final String TABLE_NAME = generateUniqueName();
@Test
public void testMinMaxAggregateFunctions() throws SQLException {
http://git-wip-us.apache.org/repos/asf/phoenix/blob/bebb5ced/phoenix-core/src/it/java/org/apache/phoenix/end2end/ModulusExpressionIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ModulusExpressionIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ModulusExpressionIT.java
index 06ffb16..54cdba6 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ModulusExpressionIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ModulusExpressionIT.java
@@ -53,7 +53,7 @@ public class ModulusExpressionIT extends ParallelStatsDisabledIT {
private void testDividend(long dividend) throws SQLException {
Connection conn = DriverManager.getConnection(getUrl());
- String tableName = generateRandomString();
+ String tableName = generateUniqueName();
initTable(conn, dividend, tableName);
for(long divisor : DIVISORS) {
@@ -105,7 +105,7 @@ public class ModulusExpressionIT extends ParallelStatsDisabledIT {
@Test
public void testZeroDivisor() throws SQLException {
Connection conn = DriverManager.getConnection(getUrl());
- String tableName = generateRandomString();
+ String tableName = generateUniqueName();
initTable(conn, 0, tableName);
for(long dividend : DIVIDENDS) {
@@ -132,7 +132,7 @@ public class ModulusExpressionIT extends ParallelStatsDisabledIT {
@Test
public void testNullDividend() throws SQLException {
Connection conn = DriverManager.getConnection(getUrl());
- String tableName = generateRandomString();
+ String tableName = generateUniqueName();
initTable(conn, SMALL_VALUE, tableName);
for(long divisor : DIVISORS) {
@@ -148,7 +148,7 @@ public class ModulusExpressionIT extends ParallelStatsDisabledIT {
@Test
public void testNullDivisor() throws SQLException {
Connection conn = DriverManager.getConnection(getUrl());
- String tableName = generateRandomString();
+ String tableName = generateUniqueName();
initTable(conn, SMALL_VALUE, tableName);
for(long dividend : DIVIDENDS) {
@@ -170,7 +170,7 @@ public class ModulusExpressionIT extends ParallelStatsDisabledIT {
@Test
public void testNullEverything() throws SQLException {
Connection conn = DriverManager.getConnection(getUrl());
- String tableName = generateRandomString();
+ String tableName = generateUniqueName();
initTable(conn, SMALL_VALUE, tableName);
String sql = "SELECT null % kv FROM " + tableName;
http://git-wip-us.apache.org/repos/asf/phoenix/blob/bebb5ced/phoenix-core/src/it/java/org/apache/phoenix/end2end/MultiCfQueryExecIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/MultiCfQueryExecIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/MultiCfQueryExecIT.java
index 4a0bb01..ed87cb6 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/MultiCfQueryExecIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/MultiCfQueryExecIT.java
@@ -47,7 +47,7 @@ public class MultiCfQueryExecIT extends ParallelStatsEnabledIT {
@Before
public void generateTableNames() throws SQLException {
String schemaName = TestUtil.DEFAULT_SCHEMA_NAME;
- String tableName = "T_" + generateRandomString();
+ String tableName = "T_" + generateUniqueName();
fullTableName = SchemaUtil.getTableName(schemaName, tableName);
}
http://git-wip-us.apache.org/repos/asf/phoenix/blob/bebb5ced/phoenix-core/src/it/java/org/apache/phoenix/end2end/NamespaceSchemaMappingIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/NamespaceSchemaMappingIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/NamespaceSchemaMappingIT.java
index d092b08..0dfd550 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/NamespaceSchemaMappingIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/NamespaceSchemaMappingIT.java
@@ -57,7 +57,7 @@ public class NamespaceSchemaMappingIT extends ParallelStatsDisabledIT {
String namespace = "TEST_SCHEMA";
String schemaName = namespace;
- String tableName = generateRandomString();
+ String tableName = generateUniqueName();
String phoenixFullTableName = schemaName + "." + tableName;
String hbaseFullTableName = schemaName + ":" + tableName;
http://git-wip-us.apache.org/repos/asf/phoenix/blob/bebb5ced/phoenix-core/src/it/java/org/apache/phoenix/end2end/NthValueFunctionIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/NthValueFunctionIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/NthValueFunctionIT.java
index 4538cd0..c5cdf89 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/NthValueFunctionIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/NthValueFunctionIT.java
@@ -35,7 +35,7 @@ public class NthValueFunctionIT extends ParallelStatsDisabledIT {
public void simpleTest() throws Exception {
Connection conn = DriverManager.getConnection(getUrl());
- String nthValue = generateRandomString();
+ String nthValue = generateUniqueName();
String ddl = "CREATE TABLE IF NOT EXISTS " + nthValue + " "
+ "(id INTEGER NOT NULL PRIMARY KEY, page_id UNSIGNED_LONG,"
+ " dates INTEGER, val INTEGER)";
@@ -64,7 +64,7 @@ public class NthValueFunctionIT extends ParallelStatsDisabledIT {
public void offsetValueAscOrder() throws Exception {
Connection conn = DriverManager.getConnection(getUrl());
- String nth_test_table = generateRandomString();
+ String nth_test_table = generateUniqueName();
String ddl = "CREATE TABLE IF NOT EXISTS " + nth_test_table + " "
+ "(id INTEGER NOT NULL PRIMARY KEY, page_id UNSIGNED_LONG,"
@@ -98,7 +98,7 @@ public class NthValueFunctionIT extends ParallelStatsDisabledIT {
public void offsetValueDescOrder() throws Exception {
Connection conn = DriverManager.getConnection(getUrl());
- String nth_test_table = generateRandomString();
+ String nth_test_table = generateUniqueName();
String ddl = "CREATE TABLE IF NOT EXISTS " + nth_test_table + " "
+ "(id INTEGER NOT NULL PRIMARY KEY, page_id UNSIGNED_LONG,"
+ " date INTEGER, \"value\" UNSIGNED_LONG)";
@@ -131,7 +131,7 @@ public class NthValueFunctionIT extends ParallelStatsDisabledIT {
public void offsetValueLastMismatchByColumn() throws Exception {
Connection conn = DriverManager.getConnection(getUrl());
- String nth_test_table = generateRandomString();
+ String nth_test_table = generateUniqueName();
String ddl = "CREATE TABLE IF NOT EXISTS " + nth_test_table + " "
+ "(id INTEGER NOT NULL PRIMARY KEY, page_id UNSIGNED_LONG,"
+ " date INTEGER, \"value\" UNSIGNED_LONG)";
@@ -164,7 +164,7 @@ public class NthValueFunctionIT extends ParallelStatsDisabledIT {
public void testSortOrderInDataColWithOffset() throws Exception {
Connection conn = DriverManager.getConnection(getUrl());
- String nth_test_table = generateRandomString();
+ String nth_test_table = generateUniqueName();
String ddl = "CREATE TABLE IF NOT EXISTS " + nth_test_table + " "
+ "(id INTEGER NOT NULL, page_id UNSIGNED_LONG,"
+ " dates BIGINT NOT NULL, \"value\" BIGINT NOT NULL CONSTRAINT pk PRIMARY KEY (id, dates, \"value\" DESC))";
@@ -195,7 +195,7 @@ public class NthValueFunctionIT extends ParallelStatsDisabledIT {
public void nonUniqueValuesInOrderByAsc() throws Exception {
Connection conn = DriverManager.getConnection(getUrl());
- String nthValue = generateRandomString();
+ String nthValue = generateUniqueName();
String ddl = "CREATE TABLE IF NOT EXISTS " + nthValue + " "
+ "(id INTEGER NOT NULL PRIMARY KEY, page_id UNSIGNED_LONG,"
+ " dates INTEGER, val INTEGER)";
@@ -226,7 +226,7 @@ public class NthValueFunctionIT extends ParallelStatsDisabledIT {
public void nonUniqueValuesInOrderByAscSkipDuplicit() throws Exception {
Connection conn = DriverManager.getConnection(getUrl());
- String nthValue = generateRandomString();
+ String nthValue = generateUniqueName();
String ddl = "CREATE TABLE IF NOT EXISTS " + nthValue + " "
+ "(id INTEGER NOT NULL PRIMARY KEY, page_id UNSIGNED_LONG,"
+ " dates INTEGER, val INTEGER)";
@@ -257,7 +257,7 @@ public class NthValueFunctionIT extends ParallelStatsDisabledIT {
public void nonUniqueValuesInOrderByDesc() throws Exception {
Connection conn = DriverManager.getConnection(getUrl());
- String nthValue = generateRandomString();
+ String nthValue = generateUniqueName();
String ddl = "CREATE TABLE IF NOT EXISTS " + nthValue + " "
+ "(id INTEGER NOT NULL PRIMARY KEY, page_id UNSIGNED_LONG,"
+ " dates INTEGER, val INTEGER)";
@@ -288,7 +288,7 @@ public class NthValueFunctionIT extends ParallelStatsDisabledIT {
public void nonUniqueValuesInOrderNextValueDesc() throws Exception {
Connection conn = DriverManager.getConnection(getUrl());
- String nthValue = generateRandomString();
+ String nthValue = generateUniqueName();
String ddl = "CREATE TABLE IF NOT EXISTS " + nthValue + " "
+ "(id INTEGER NOT NULL PRIMARY KEY, page_id UNSIGNED_LONG,"
+ " dates INTEGER, val INTEGER)";
@@ -321,7 +321,7 @@ public class NthValueFunctionIT extends ParallelStatsDisabledIT {
public void nonUniqueValuesInOrderNextValueAsc() throws Exception {
Connection conn = DriverManager.getConnection(getUrl());
- String nthValue = generateRandomString();
+ String nthValue = generateUniqueName();
String ddl = "CREATE TABLE IF NOT EXISTS " + nthValue + " "
+ "(id INTEGER NOT NULL PRIMARY KEY, page_id UNSIGNED_LONG,"
+ " dates INTEGER, val INTEGER)";
@@ -354,7 +354,7 @@ public class NthValueFunctionIT extends ParallelStatsDisabledIT {
public void ignoreNullValues() throws Exception {
Connection conn = DriverManager.getConnection(getUrl());
- String nth_test_table = generateRandomString();
+ String nth_test_table = generateUniqueName();
String ddl = "CREATE TABLE IF NOT EXISTS " + nth_test_table + " "
+ "(id INTEGER NOT NULL, page_id UNSIGNED_LONG,"
+ " dates BIGINT NOT NULL, \"value\" BIGINT NULL CONSTRAINT pk PRIMARY KEY (id, dates))";
http://git-wip-us.apache.org/repos/asf/phoenix/blob/bebb5ced/phoenix-core/src/it/java/org/apache/phoenix/end2end/OctetLengthFunctionEnd2EndIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/OctetLengthFunctionEnd2EndIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/OctetLengthFunctionEnd2EndIT.java
index 0554814..78ebfaa 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/OctetLengthFunctionEnd2EndIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/OctetLengthFunctionEnd2EndIT.java
@@ -36,7 +36,7 @@ import org.junit.Test;
public class OctetLengthFunctionEnd2EndIT extends ParallelStatsDisabledIT {
private static final String KEY = "key";
- private static final String TABLE_NAME = generateRandomString();
+ private static final String TABLE_NAME = generateUniqueName();
@Before
public void initTable() throws Exception {
http://git-wip-us.apache.org/repos/asf/phoenix/blob/bebb5ced/phoenix-core/src/it/java/org/apache/phoenix/end2end/OrderByIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/OrderByIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/OrderByIT.java
index 0f6641c..457b38e 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/OrderByIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/OrderByIT.java
@@ -123,7 +123,7 @@ public class OrderByIT extends ParallelStatsDisabledIT {
conn.setAutoCommit(false);
try {
- String tableName = generateRandomString();
+ String tableName = generateUniqueName();
String ddl = "CREATE TABLE " + tableName +
" (a_string varchar not null, col1 integer" +
" CONSTRAINT pk PRIMARY KEY (a_string))\n";
@@ -190,7 +190,7 @@ public class OrderByIT extends ParallelStatsDisabledIT {
conn.setAutoCommit(false);
try {
- String tableName = generateRandomString();
+ String tableName = generateUniqueName();
String ddl = "CREATE TABLE " + tableName +
" (a_string varchar not null, cf1.a integer, cf1.b varchar, col1 integer, cf2.c varchar, cf2.d integer, col2 integer" +
" CONSTRAINT pk PRIMARY KEY (a_string))\n";
@@ -290,7 +290,7 @@ public class OrderByIT extends ParallelStatsDisabledIT {
conn.setAutoCommit(false);
try {
- String tableName1 = generateRandomString();
+ String tableName1 = generateUniqueName();
String ddl = "CREATE TABLE " + tableName1 +
" (a_string varchar not null, cf1.a integer, cf1.b varchar, col1 integer, cf2.c varchar, cf2.d integer " +
" CONSTRAINT pk PRIMARY KEY (a_string))\n";
@@ -320,7 +320,7 @@ public class OrderByIT extends ParallelStatsDisabledIT {
stmt.execute();
conn.commit();
- String tableName2 = generateRandomString();
+ String tableName2 = generateUniqueName();
ddl = "CREATE TABLE " + tableName2 +
" (a_string varchar not null, col1 integer" +
" CONSTRAINT pk PRIMARY KEY (a_string))\n";
@@ -389,7 +389,7 @@ public class OrderByIT extends ParallelStatsDisabledIT {
conn.setAutoCommit(false);
try {
- String tableName1 = generateRandomString();
+ String tableName1 = generateUniqueName();
String ddl = "CREATE TABLE " + tableName1 +
" (a_string varchar not null, cf1.a integer, cf1.b varchar, col1 integer, cf2.c varchar, cf2.d integer " +
" CONSTRAINT pk PRIMARY KEY (a_string))\n";
@@ -419,7 +419,7 @@ public class OrderByIT extends ParallelStatsDisabledIT {
stmt.execute();
conn.commit();
- String tableName2 = generateRandomString();
+ String tableName2 = generateUniqueName();
ddl = "CREATE TABLE " + tableName2 +
" (a_string varchar not null, col1 integer" +
" CONSTRAINT pk PRIMARY KEY (a_string))\n";
@@ -471,7 +471,7 @@ public class OrderByIT extends ParallelStatsDisabledIT {
conn.setAutoCommit(false);
try {
- String tableName = generateRandomString();
+ String tableName = generateUniqueName();
String ddl = "CREATE TABLE " + tableName +
" (a_string varchar not null, col1 integer, col2 integer, col3 timestamp, col4 varchar" +
" CONSTRAINT pk PRIMARY KEY (a_string))\n";
@@ -519,7 +519,7 @@ public class OrderByIT extends ParallelStatsDisabledIT {
public void testOrderByRVC() throws Exception {
Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
Connection conn = DriverManager.getConnection(getUrl(), props);
- String tableName = generateRandomString();
+ String tableName = generateUniqueName();
String ddl = "create table " + tableName + " (testpk varchar not null primary key, l_quantity decimal(15,2), l_discount decimal(15,2))";
conn.createStatement().execute(ddl);
http://git-wip-us.apache.org/repos/asf/phoenix/blob/bebb5ced/phoenix-core/src/it/java/org/apache/phoenix/end2end/ParallelIteratorsIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ParallelIteratorsIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ParallelIteratorsIT.java
index dfcf68c..5fc7d9e 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ParallelIteratorsIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ParallelIteratorsIT.java
@@ -70,8 +70,8 @@ public class ParallelIteratorsIT extends ParallelStatsEnabledIT {
@Before
public void generateTableNames() {
- tableName = "T_" + generateRandomString();
- indexName = "I_" + generateRandomString();
+ tableName = "T_" + generateUniqueName();
+ indexName = "I_" + generateUniqueName();
}
private List<KeyRange> getSplits(Connection conn, byte[] lowerRange, byte[] upperRange) throws SQLException {
http://git-wip-us.apache.org/repos/asf/phoenix/blob/bebb5ced/phoenix-core/src/it/java/org/apache/phoenix/end2end/PercentileIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/PercentileIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/PercentileIT.java
index 31423db..af5a905 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/PercentileIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/PercentileIT.java
@@ -52,6 +52,7 @@ import org.apache.phoenix.query.QueryConstants;
import org.apache.phoenix.util.DateUtil;
import org.apache.phoenix.util.PhoenixRuntime;
import org.apache.phoenix.util.PropertiesUtil;
+import org.apache.phoenix.util.TestUtil;
import org.junit.Test;
@@ -406,13 +407,13 @@ public class PercentileIT extends ParallelStatsDisabledIT {
@Test
public void testPercentileContOnDescPKColumn() throws Exception {
- String indexDataTableName = generateRandomString();
+ String indexDataTableName = generateUniqueName();
String fullTableName = INDEX_DATA_SCHEMA + QueryConstants.NAME_SEPARATOR + indexDataTableName;
String query = "SELECT PERCENTILE_CONT(1) WITHIN GROUP (ORDER BY long_pk ASC) FROM " + fullTableName;
Connection conn = DriverManager.getConnection(getUrl());
try {
- conn.createStatement().execute("create table " + fullTableName + TEST_TABLE_SCHEMA + "IMMUTABLE_ROWS=true");
+ conn.createStatement().execute("create table " + fullTableName + TestUtil.TEST_TABLE_SCHEMA + "IMMUTABLE_ROWS=true");
populateINDEX_DATA_TABLETable(indexDataTableName);
PreparedStatement statement = conn.prepareStatement(query);
ResultSet rs = statement.executeQuery();
@@ -428,12 +429,12 @@ public class PercentileIT extends ParallelStatsDisabledIT {
@Test
public void testPercentRankOnDescPKColumn() throws Exception {
- String indexDataTableName = generateRandomString();
+ String indexDataTableName = generateUniqueName();
Connection conn = DriverManager.getConnection(getUrl());
try {
String fullTableName = INDEX_DATA_SCHEMA + QueryConstants.NAME_SEPARATOR + indexDataTableName;
String query = "SELECT PERCENT_RANK(2) WITHIN GROUP (ORDER BY long_pk ASC) FROM " + fullTableName;
- conn.createStatement().execute("create table " + fullTableName + TEST_TABLE_SCHEMA + "IMMUTABLE_ROWS=true");
+ conn.createStatement().execute("create table " + fullTableName + TestUtil.TEST_TABLE_SCHEMA + "IMMUTABLE_ROWS=true");
populateINDEX_DATA_TABLETable(indexDataTableName);
PreparedStatement statement = conn.prepareStatement(query);
ResultSet rs = statement.executeQuery();
@@ -449,13 +450,13 @@ public class PercentileIT extends ParallelStatsDisabledIT {
@Test
public void testPercentileDiscOnDescPKColumn() throws Exception {
- String indexDataTableName = generateRandomString();
+ String indexDataTableName = generateUniqueName();
Connection conn = DriverManager.getConnection(getUrl());
try {
String fullTableName = INDEX_DATA_SCHEMA + QueryConstants.NAME_SEPARATOR + indexDataTableName;
String query = "SELECT PERCENTILE_DISC(0.4) WITHIN GROUP (ORDER BY long_pk DESC) FROM " + fullTableName;
- conn.createStatement().execute("create table " + fullTableName + TEST_TABLE_SCHEMA + "IMMUTABLE_ROWS=true");
+ conn.createStatement().execute("create table " + fullTableName + TestUtil.TEST_TABLE_SCHEMA + "IMMUTABLE_ROWS=true");
populateINDEX_DATA_TABLETable(indexDataTableName);
PreparedStatement statement = conn.prepareStatement(query);
ResultSet rs = statement.executeQuery();
@@ -508,7 +509,7 @@ public class PercentileIT extends ParallelStatsDisabledIT {
private static String initATableValues(String tenantId1, String tenantId2, byte[][] splits,
Date date, Long ts) throws Exception {
- String tableName = generateRandomString();
+ String tableName = generateUniqueName();
if (ts == null) {
ensureTableCreated(getUrl(), tableName, ATABLE_NAME, splits);
} else {
http://git-wip-us.apache.org/repos/asf/phoenix/blob/bebb5ced/phoenix-core/src/it/java/org/apache/phoenix/end2end/PhoenixRuntimeIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/PhoenixRuntimeIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/PhoenixRuntimeIT.java
index 1d48944..cddca04 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/PhoenixRuntimeIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/PhoenixRuntimeIT.java
@@ -95,10 +95,10 @@ public class PhoenixRuntimeIT extends ParallelStatsDisabledIT {
private void testGetTenantIdExpression(boolean isSalted) throws Exception {
Connection conn = DriverManager.getConnection(getUrl());
conn.setAutoCommit(true);
- String tableName = generateRandomString() ;
- String sequenceName = generateRandomString();
- String t1 = generateRandomString();
- String t2 = t1 + generateRandomString(); // ensure bigger
+ String tableName = generateUniqueName() ;
+ String sequenceName = generateUniqueName();
+ String t1 = generateUniqueName();
+ String t2 = t1 + generateUniqueName(); // ensure bigger
conn.createStatement().execute("CREATE TABLE " + tableName + " (k1 VARCHAR NOT NULL, k2 VARCHAR, CONSTRAINT PK PRIMARY KEY(K1,K2)) MULTI_TENANT=true" + (isSalted ? ",SALT_BUCKETS=3" : ""));
conn.createStatement().execute("CREATE SEQUENCE " + sequenceName);
conn.createStatement().execute("UPSERT INTO " + tableName + " VALUES('" + t1 + "','x')");
@@ -112,7 +112,7 @@ public class PhoenixRuntimeIT extends ParallelStatsDisabledIT {
HTableInterface htable1 = tsconn.unwrap(PhoenixConnection.class).getQueryServices().getTable(PhoenixDatabaseMetaData.SYSTEM_SEQUENCE_NAME_BYTES);
assertTenantIds(e1, htable1, new FirstKeyOnlyFilter(), new String[] {"", t1} );
- String viewName = generateRandomString();
+ String viewName = generateUniqueName();
tsconn.createStatement().execute("CREATE VIEW " + viewName + "(V1 VARCHAR) AS SELECT * FROM " + tableName);
Expression e2 = PhoenixRuntime.getTenantIdExpression(tsconn, PhoenixDatabaseMetaData.SYSTEM_CATALOG_NAME);
HTableInterface htable2 = conn.unwrap(PhoenixConnection.class).getQueryServices().getTable(PhoenixDatabaseMetaData.SYSTEM_CATALOG_NAME_BYTES);
@@ -122,24 +122,24 @@ public class PhoenixRuntimeIT extends ParallelStatsDisabledIT {
HTableInterface htable3 = conn.unwrap(PhoenixConnection.class).getQueryServices().getTable(Bytes.toBytes(tableName));
assertTenantIds(e3, htable3, new FirstKeyOnlyFilter(), new String[] {t1, t2} );
- String basTableName = generateRandomString();
+ String basTableName = generateUniqueName();
conn.createStatement().execute("CREATE TABLE " + basTableName + " (k1 VARCHAR PRIMARY KEY)");
Expression e4 = PhoenixRuntime.getTenantIdExpression(conn, basTableName);
assertNull(e4);
- String indexName1 = generateRandomString();
+ String indexName1 = generateUniqueName();
tsconn.createStatement().execute("CREATE INDEX " + indexName1 + " ON " + viewName + "(V1)");
Expression e5 = PhoenixRuntime.getTenantIdExpression(tsconn, indexName1);
HTableInterface htable5 = tsconn.unwrap(PhoenixConnection.class).getQueryServices().getTable(Bytes.toBytes(MetaDataUtil.VIEW_INDEX_TABLE_PREFIX + tableName));
assertTenantIds(e5, htable5, new FirstKeyOnlyFilter(), new String[] {t1} );
- String indexName2 = generateRandomString();
+ String indexName2 = generateUniqueName();
conn.createStatement().execute("CREATE INDEX " + indexName2 + " ON " + tableName + "(k2)");
Expression e6 = PhoenixRuntime.getTenantIdExpression(conn, indexName2);
HTableInterface htable6 = conn.unwrap(PhoenixConnection.class).getQueryServices().getTable(Bytes.toBytes(indexName2));
assertTenantIds(e6, htable6, new FirstKeyOnlyFilter(), new String[] {t1, t2} );
- tableName = generateRandomString() + "BAR_" + (isSalted ? "SALTED" : "UNSALTED");
+ tableName = generateUniqueName() + "BAR_" + (isSalted ? "SALTED" : "UNSALTED");
conn.createStatement().execute("CREATE TABLE " + tableName + " (k1 VARCHAR NOT NULL, k2 VARCHAR, CONSTRAINT PK PRIMARY KEY(K1,K2)) " + (isSalted ? "SALT_BUCKETS=3" : ""));
conn.createStatement().execute("UPSERT INTO " + tableName + " VALUES('" + t1 + "','x')");
conn.createStatement().execute("UPSERT INTO " + tableName + " VALUES('" + t2 + "','y')");
http://git-wip-us.apache.org/repos/asf/phoenix/blob/bebb5ced/phoenix-core/src/it/java/org/apache/phoenix/end2end/PowerFunctionEnd2EndIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/PowerFunctionEnd2EndIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/PowerFunctionEnd2EndIT.java
index 3535ec0..1fb45c7 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/PowerFunctionEnd2EndIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/PowerFunctionEnd2EndIT.java
@@ -37,8 +37,8 @@ public class PowerFunctionEnd2EndIT extends ParallelStatsDisabledIT {
private static final String KEY = "key";
private static final double ZERO = 1e-9;
- private static final String TEST_SIGNED = generateRandomString();
- private static final String TEST_UNSIGNED = generateRandomString();
+ private static final String TEST_SIGNED = generateUniqueName();
+ private static final String TEST_UNSIGNED = generateUniqueName();
private static boolean twoDoubleEquals(double a, double b) {
if (Double.isNaN(a) ^ Double.isNaN(b)) return false;
http://git-wip-us.apache.org/repos/asf/phoenix/blob/bebb5ced/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 2b66118..6fbedcf 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
@@ -48,7 +48,7 @@ public class PrimitiveTypeIT extends ParallelStatsDisabledIT {
@Test
public void testCompareLongGTDecimal() throws Exception {
- String tableName = generateRandomString();
+ String tableName = generateUniqueName();
Connection conn = DriverManager.getConnection(getUrl(), PROPS);
initTableValues(conn, tableName);
String query = "SELECT l FROM " + tableName + " where l > 1.5";
@@ -65,7 +65,7 @@ public class PrimitiveTypeIT extends ParallelStatsDisabledIT {
@Test
public void testCompareLongGTEDecimal() throws Exception {
- String tableName = generateRandomString();
+ String tableName = generateUniqueName();
Connection conn = DriverManager.getConnection(getUrl(), PROPS);
initTableValues(conn, tableName);
String query = "SELECT l FROM " + tableName + " where l >= 1.5";
@@ -89,7 +89,7 @@ public class PrimitiveTypeIT extends ParallelStatsDisabledIT {
@Test
public void testCompareLongLTDecimal() throws Exception {
- String tableName = generateRandomString();
+ String tableName = generateUniqueName();
Connection conn = DriverManager.getConnection(getUrl(), PROPS);
initTableValues(conn, tableName);
String query = "SELECT l FROM " + tableName + " where l < 1.5";
@@ -111,7 +111,7 @@ public class PrimitiveTypeIT extends ParallelStatsDisabledIT {
@Test
public void testCompareLongLTEDecimal() throws Exception {
- String tableName = generateRandomString();
+ String tableName = generateUniqueName();
Connection conn = DriverManager.getConnection(getUrl(), PROPS);
initTableValues(conn, tableName);
String query = "SELECT l FROM " + tableName + " where l <= 1.5";
@@ -132,7 +132,7 @@ public class PrimitiveTypeIT extends ParallelStatsDisabledIT {
}
@Test
public void testCompareLongGTDecimal2() throws Exception {
- String tableName = generateRandomString();
+ String tableName = generateUniqueName();
Connection conn = DriverManager.getConnection(getUrl(), PROPS);
initTableValues(conn, tableName);
String query = "SELECT l FROM " + tableName + " where l > 2.5";
@@ -154,7 +154,7 @@ public class PrimitiveTypeIT extends ParallelStatsDisabledIT {
@Test
public void testCompareLongGTEDecimal2() throws Exception {
- String tableName = generateRandomString();
+ String tableName = generateUniqueName();
Connection conn = DriverManager.getConnection(getUrl(), PROPS);
initTableValues(conn, tableName);
String query = "SELECT l FROM " + tableName + " where l >= 2.5";
@@ -176,7 +176,7 @@ public class PrimitiveTypeIT extends ParallelStatsDisabledIT {
@Test
public void testCompareLongLTDecimal2() throws Exception {
- String tableName = generateRandomString();
+ String tableName = generateUniqueName();
Connection conn = DriverManager.getConnection(getUrl(), PROPS);
initTableValues(conn, tableName);
String query = "SELECT l FROM " + tableName + " where l < 2.5";
@@ -200,7 +200,7 @@ public class PrimitiveTypeIT extends ParallelStatsDisabledIT {
@Test
public void testCompareLongLTEDecimal2() throws Exception {
- String tableName = generateRandomString();
+ String tableName = generateUniqueName();
Connection conn = DriverManager.getConnection(getUrl(), PROPS);
initTableValues(conn, tableName);
String query = "SELECT l FROM " + tableName + " where l <= 2.5";
@@ -224,7 +224,7 @@ public class PrimitiveTypeIT extends ParallelStatsDisabledIT {
@Test
public void testBooleanAsObject() throws Exception {
- String tableName = generateRandomString();
+ String tableName = generateUniqueName();
Connection conn = DriverManager.getConnection(getUrl(), PROPS);
initTableValues(conn, tableName);
String query = "upsert into " + tableName + " values (2, ?)";
http://git-wip-us.apache.org/repos/asf/phoenix/blob/bebb5ced/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryMoreIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryMoreIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryMoreIT.java
index d87b954..9399900 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryMoreIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryMoreIT.java
@@ -72,10 +72,10 @@ public class QueryMoreIT extends ParallelStatsDisabledIT {
}
private void testQueryMore(boolean queryAgainstTenantSpecificView, boolean dataTableSalted) throws Exception {
- String[] tenantIds = new String[] {"T1_" + generateRandomString(), "T2_" + generateRandomString(), "T3_" + generateRandomString()};
+ String[] tenantIds = new String[] {"T1_" + generateUniqueName(), "T2_" + generateUniqueName(), "T3_" + generateUniqueName()};
int numRowsPerTenant = 10;
- String cursorTableName = generateRandomString();
- String base_history_table = generateRandomString();
+ String cursorTableName = generateUniqueName();
+ String base_history_table = generateUniqueName();
this.dataTableName = base_history_table + (dataTableSalted ? "_SALTED" : "");
String cursorTableDDL = "CREATE TABLE IF NOT EXISTS " +
cursorTableName + " (\n" +
@@ -342,7 +342,7 @@ public class QueryMoreIT extends ParallelStatsDisabledIT {
@SuppressWarnings("deprecation")
@Test
public void testNullBigDecimalWithScale() throws Exception {
- final String table = generateRandomString();
+ final String table = generateUniqueName();
final Connection conn = DriverManager.getConnection(getUrl());
conn.setAutoCommit(true);
try (Statement stmt = conn.createStatement()) {
http://git-wip-us.apache.org/repos/asf/phoenix/blob/bebb5ced/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryWithOffsetIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryWithOffsetIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryWithOffsetIT.java
index 6f190b6..c60b403 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryWithOffsetIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryWithOffsetIT.java
@@ -73,7 +73,7 @@ public class QueryWithOffsetIT extends ParallelStatsDisabledIT {
@Before
public void initTest() {
- tableName = "T_" + generateRandomString();
+ tableName = "T_" + generateUniqueName();
ddl = "CREATE TABLE " + tableName + " (t_id VARCHAR NOT NULL,\n" + "k1 INTEGER NOT NULL,\n"
+ "k2 INTEGER NOT NULL,\n" + "C3.k3 INTEGER,\n" + "C2.v1 VARCHAR,\n"
+ "CONSTRAINT pk PRIMARY KEY (t_id, k1, k2)) " + preSplit;
http://git-wip-us.apache.org/repos/asf/phoenix/blob/bebb5ced/phoenix-core/src/it/java/org/apache/phoenix/end2end/RTrimFunctionIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/RTrimFunctionIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/RTrimFunctionIT.java
index b425476..4a1610a 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/RTrimFunctionIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/RTrimFunctionIT.java
@@ -48,7 +48,7 @@ public class RTrimFunctionIT extends ParallelStatsDisabledIT {
private void testWithFixedLengthPK(SortOrder sortOrder, List<Object> expectedResults) throws Exception {
Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
Connection conn = DriverManager.getConnection(getUrl(), props);
- String tableName = generateRandomString();
+ String tableName = generateUniqueName();
conn.createStatement().execute(
"CREATE TABLE " + tableName + " ( k VARCHAR PRIMARY KEY " + (sortOrder == SortOrder.DESC ? "DESC" : "") + ")");
http://git-wip-us.apache.org/repos/asf/phoenix/blob/bebb5ced/phoenix-core/src/it/java/org/apache/phoenix/end2end/ReadOnlyIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ReadOnlyIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ReadOnlyIT.java
index ed3c4f9..2b38b07 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ReadOnlyIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ReadOnlyIT.java
@@ -39,7 +39,7 @@ public class ReadOnlyIT extends ParallelStatsDisabledIT {
Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
Connection conn = DriverManager.getConnection(getUrl(), props);
- String testTable = generateRandomString();
+ String testTable = generateUniqueName();
String ddl = "CREATE TABLE " + testTable + " " +
" (r varchar not null, col1 integer" +
" CONSTRAINT pk PRIMARY KEY (r))\n";
http://git-wip-us.apache.org/repos/asf/phoenix/blob/bebb5ced/phoenix-core/src/it/java/org/apache/phoenix/end2end/RegexpReplaceFunctionIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/RegexpReplaceFunctionIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/RegexpReplaceFunctionIT.java
index 037d48d..c7f52ff 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/RegexpReplaceFunctionIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/RegexpReplaceFunctionIT.java
@@ -40,7 +40,7 @@ public class RegexpReplaceFunctionIT extends ParallelStatsDisabledIT {
@Before
public void doBeforeTestSetup() throws Exception {
- this.tableName = generateRandomString();
+ this.tableName = generateUniqueName();
Connection conn = DriverManager.getConnection(getUrl());
createGroupByTestTable(conn, tableName);
insertRow(conn, "Report11", 10);
http://git-wip-us.apache.org/repos/asf/phoenix/blob/bebb5ced/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 f9a0873..289c545 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
@@ -43,7 +43,7 @@ public class RegexpSplitFunctionIT extends ParallelStatsDisabledIT {
}
private void initTable(Connection conn, String val, String separator) throws SQLException {
- tableName = generateRandomString();
+ tableName = generateUniqueName();
String ddl = "CREATE TABLE " + tableName + " (" +
"ID INTEGER NOT NULL PRIMARY KEY," +
"VAL VARCHAR," +
http://git-wip-us.apache.org/repos/asf/phoenix/blob/bebb5ced/phoenix-core/src/it/java/org/apache/phoenix/end2end/RegexpSubstrFunctionIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/RegexpSubstrFunctionIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/RegexpSubstrFunctionIT.java
index 889451e..f2808bd 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/RegexpSubstrFunctionIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/RegexpSubstrFunctionIT.java
@@ -40,7 +40,7 @@ public class RegexpSubstrFunctionIT extends ParallelStatsDisabledIT {
@Before
public void doBeforeTestSetup() throws Exception {
- tableName = generateRandomString();
+ tableName = generateUniqueName();
Connection conn = DriverManager.getConnection(getUrl());
createGroupByTestTable(conn, tableName);
insertRow(conn, "Report1?1", 10);
http://git-wip-us.apache.org/repos/asf/phoenix/blob/bebb5ced/phoenix-core/src/it/java/org/apache/phoenix/end2end/ReverseFunctionIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ReverseFunctionIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ReverseFunctionIT.java
index d2c89dc..2fedb78 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ReverseFunctionIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ReverseFunctionIT.java
@@ -33,7 +33,7 @@ import org.junit.Test;
public class ReverseFunctionIT extends ParallelStatsDisabledIT {
private String initTable(Connection conn, String sortOrder, String s) throws Exception {
- String reverseTest = generateRandomString();
+ String reverseTest = generateUniqueName();
String ddl = "CREATE TABLE " + reverseTest + " (pk VARCHAR NOT NULL PRIMARY KEY " + sortOrder + ", kv VARCHAR)";
conn.createStatement().execute(ddl);
String dml = "UPSERT INTO " + reverseTest + " VALUES(?)";
http://git-wip-us.apache.org/repos/asf/phoenix/blob/bebb5ced/phoenix-core/src/it/java/org/apache/phoenix/end2end/ReverseScanIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ReverseScanIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ReverseScanIT.java
index 16ccc53..f172d00 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ReverseScanIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ReverseScanIT.java
@@ -153,7 +153,7 @@ public class ReverseScanIT extends ParallelStatsDisabledIT {
ResultSet rs;
Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
conn = DriverManager.getConnection(getUrl(), props);
- String tableName = generateRandomString();
+ String tableName = generateUniqueName();
conn.createStatement()
.execute("CREATE TABLE " + tableName + " ( k VARCHAR, c1.a bigint,c2.b bigint CONSTRAINT pk PRIMARY KEY (k)) ");
conn.createStatement().execute("upsert into " + tableName + " values ('a',1,3)");
@@ -171,7 +171,7 @@ public class ReverseScanIT extends ParallelStatsDisabledIT {
@Test
public void testReverseScanIndex() throws Exception {
- String indexName = generateRandomString();
+ String indexName = generateUniqueName();
String tenantId = getOrganizationId();
String tableName = initATableValues(tenantId, getSplitsAtRowKeys(tenantId), getUrl());
http://git-wip-us.apache.org/repos/asf/phoenix/blob/bebb5ced/phoenix-core/src/it/java/org/apache/phoenix/end2end/RoundFloorCeilFuncIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/RoundFloorCeilFuncIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/RoundFloorCeilFuncIT.java
index c94cf50..c247bc9 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/RoundFloorCeilFuncIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/RoundFloorCeilFuncIT.java
@@ -64,7 +64,7 @@ public class RoundFloorCeilFuncIT extends ParallelStatsDisabledIT {
@Before
public void initTable() throws Exception {
- tableName = generateRandomString();
+ tableName = generateUniqueName();
String testString = "abc";
Connection conn = null;
PreparedStatement stmt = null;
http://git-wip-us.apache.org/repos/asf/phoenix/blob/bebb5ced/phoenix-core/src/it/java/org/apache/phoenix/end2end/SerialIteratorsIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SerialIteratorsIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SerialIteratorsIT.java
index 0494342..37da39e 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SerialIteratorsIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SerialIteratorsIT.java
@@ -38,7 +38,7 @@ import org.junit.Test;
import com.google.common.collect.Maps;
public class SerialIteratorsIT extends ParallelStatsDisabledIT {
- private String tableName = generateRandomString();
+ private String tableName = generateUniqueName();
private final String[] strings = { "a", "b", "c", "d", "e", "f", "g", "h", "i", "j", "k", "l", "m", "n", "o", "p",
"q", "r", "s", "t", "u", "v", "w", "x", "y", "z" };
private final String ddl = "CREATE TABLE " + tableName + " (t_id VARCHAR NOT NULL,\n" + "k1 INTEGER NOT NULL,\n"
http://git-wip-us.apache.org/repos/asf/phoenix/blob/bebb5ced/phoenix-core/src/it/java/org/apache/phoenix/end2end/ServerExceptionIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ServerExceptionIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ServerExceptionIT.java
index bf2e933..0bf5f18 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ServerExceptionIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ServerExceptionIT.java
@@ -40,7 +40,7 @@ public class ServerExceptionIT extends ParallelStatsDisabledIT {
Connection conn = DriverManager.getConnection(getUrl(), props);
conn.setAutoCommit(false);
try {
- String t1 = generateRandomString();
+ String t1 = generateUniqueName();
String ddl = "CREATE TABLE IF NOT EXISTS " + t1 + "(pk VARCHAR NOT NULL PRIMARY KEY, " +
"col1 INTEGER, col2 INTEGER)";
createTestTable(getUrl(), ddl);
http://git-wip-us.apache.org/repos/asf/phoenix/blob/bebb5ced/phoenix-core/src/it/java/org/apache/phoenix/end2end/SignFunctionEnd2EndIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SignFunctionEnd2EndIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SignFunctionEnd2EndIT.java
index 3cc8041..34ccdde 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SignFunctionEnd2EndIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SignFunctionEnd2EndIT.java
@@ -39,8 +39,8 @@ import org.junit.Test;
public class SignFunctionEnd2EndIT extends ParallelStatsDisabledIT {
private static final String KEY = "key";
- private static final String TEST_SIGNED = generateRandomString();
- private static final String TEST_UNSIGNED = generateRandomString();
+ private static final String TEST_SIGNED = generateUniqueName();
+ private static final String TEST_UNSIGNED = generateUniqueName();
@BeforeClass
public static void initTable() throws Exception {
http://git-wip-us.apache.org/repos/asf/phoenix/blob/bebb5ced/phoenix-core/src/it/java/org/apache/phoenix/end2end/SkipScanAfterManualSplitIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SkipScanAfterManualSplitIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SkipScanAfterManualSplitIT.java
index d4dd088..efb662b 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SkipScanAfterManualSplitIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SkipScanAfterManualSplitIT.java
@@ -106,7 +106,7 @@ public class SkipScanAfterManualSplitIT extends ParallelStatsDisabledIT {
@Test
public void testManualSplit() throws Exception {
- String tableName = generateRandomString();
+ String tableName = generateUniqueName();
byte[] tableNameBytes = Bytes.toBytes(tableName);
initTable(tableName);
Connection conn = DriverManager.getConnection(getUrl());
@@ -281,7 +281,7 @@ public class SkipScanAfterManualSplitIT extends ParallelStatsDisabledIT {
@Test
public void testSkipScanInListOfRVCAfterManualSplit() throws SQLException {
Connection conn = DriverManager.getConnection(getUrl());
- String tableName = generateRandomString();
+ String tableName = generateUniqueName();
String ddl = "CREATE TABLE " + tableName + " ( "
+ "organization_id CHAR(15) NOT NULL, "
+ "parent_id CHAR(15) NOT NULL, "
@@ -350,7 +350,7 @@ public class SkipScanAfterManualSplitIT extends ParallelStatsDisabledIT {
@Test
public void testMinMaxRangeIntersection() throws Exception {
Connection conn = DriverManager.getConnection(getUrl());
- String tableName = generateRandomString();
+ String tableName = generateUniqueName();
PreparedStatement stmt = conn.prepareStatement("create table " + tableName
+ "(pk1 UNSIGNED_TINYINT NOT NULL, pk2 UNSIGNED_TINYINT NOT NULL, kv VARCHAR "
+ "CONSTRAINT pk PRIMARY KEY (pk1, pk2)) SALT_BUCKETS=4 SPLIT ON (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)");
http://git-wip-us.apache.org/repos/asf/phoenix/blob/bebb5ced/phoenix-core/src/it/java/org/apache/phoenix/end2end/SkipScanQueryIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SkipScanQueryIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SkipScanQueryIT.java
index 17df5ba..0c5e3aa 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SkipScanQueryIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SkipScanQueryIT.java
@@ -44,7 +44,7 @@ import org.junit.Test;
public class SkipScanQueryIT extends ParallelStatsDisabledIT {
private String initIntInTable(Connection conn, List<Integer> data) throws SQLException {
- String tableName = generateRandomString();
+ String tableName = generateUniqueName();
String ddl = "CREATE TABLE IF NOT EXISTS " + tableName + " (" +
" i INTEGER NOT NULL PRIMARY KEY)";
conn.createStatement().executeUpdate(ddl);
@@ -61,7 +61,7 @@ public class SkipScanQueryIT extends ParallelStatsDisabledIT {
}
private String initVarCharCrossProductInTable(Connection conn, List<String> c1, List<String> c2) throws SQLException {
- String tableName = generateRandomString();
+ String tableName = generateUniqueName();
String ddl = "CREATE TABLE IF NOT EXISTS " + tableName + " (" +
" s1 VARCHAR, s2 VARCHAR CONSTRAINT pk PRIMARY KEY (s1,s2))";
conn.createStatement().executeUpdate(ddl);
@@ -81,7 +81,7 @@ public class SkipScanQueryIT extends ParallelStatsDisabledIT {
}
private String initVarCharParallelListInTable(Connection conn, List<String> c1, List<String> c2) throws SQLException {
- String tableName = generateRandomString();
+ String tableName = generateUniqueName();
String ddl = "CREATE TABLE IF NOT EXISTS " + tableName + " (" +
" s1 VARCHAR, s2 VARCHAR CONSTRAINT pk PRIMARY KEY (s1,s2))";
conn.createStatement().executeUpdate(ddl);
@@ -102,7 +102,7 @@ public class SkipScanQueryIT extends ParallelStatsDisabledIT {
"upsert into %s(c1, c2, c3, c4, v1, v2) values('1001', '91', 's1', '2013-09-26', 28397, 23541);\n" +
"upsert into %s(c1, c2, c3, c4, v1, v2) values('1001', '91', 's2', '2013-09-23', 3369, null);\n";
private String initSelectAfterUpsertTable(Connection conn) throws Exception {
- String tableName = generateRandomString();
+ String tableName = generateUniqueName();
String ddl = "create table if not exists " + tableName + " ("
+ "c1 VARCHAR NOT NULL," + "c2 VARCHAR NOT NULL,"
+ "c3 VARCHAR NOT NULL," + "c4 VARCHAR NOT NULL,"
@@ -120,7 +120,7 @@ public class SkipScanQueryIT extends ParallelStatsDisabledIT {
@Test
public void testSkipScanFilterQuery() throws Exception {
- String tableName = generateRandomString();
+ String tableName = generateUniqueName();
String createTableDDL = "CREATE TABLE " + tableName + "(col1 VARCHAR," + "col2 VARCHAR," + "col3 VARCHAR,"
+ "col4 VARCHAR," + "CONSTRAINT pk " + "PRIMARY KEY (col1,col2,col3,col4))";
String upsertQuery = "upsert into " + tableName + " values(?,?,?,?)";
@@ -254,7 +254,7 @@ public class SkipScanQueryIT extends ParallelStatsDisabledIT {
@Test
public void testPreSplitCompositeFixedKey() throws Exception {
- String tableName = generateRandomString();
+ String tableName = generateUniqueName();
Connection conn = DriverManager.getConnection(getUrl());
try {
conn.createStatement().execute("create table " + tableName + "(key_1 char(3) not null, key_2 char(4) not null, v varchar(8) CONSTRAINT pk PRIMARY KEY (key_1,key_2)) split on('000','100','200')");
@@ -284,7 +284,7 @@ public class SkipScanQueryIT extends ParallelStatsDisabledIT {
@Test
public void testInWithDescKey() throws Exception {
Connection conn = DriverManager.getConnection(getUrl());
- String tableName = generateRandomString();
+ String tableName = generateUniqueName();
try {
conn.createStatement().execute("create table " + tableName + "(key_1 char(3) not null, key_2 char(4) not null, v varchar(8) CONSTRAINT pk PRIMARY KEY (key_1,key_2 desc))");
conn.setAutoCommit(true);
@@ -324,7 +324,7 @@ public class SkipScanQueryIT extends ParallelStatsDisabledIT {
@Test
public void testSkipScanIntersectionAtEnd() throws Exception {
Connection conn = DriverManager.getConnection(getUrl());
- String tableName = generateRandomString();
+ String tableName = generateUniqueName();
PreparedStatement stmt = conn.prepareStatement("create table " + tableName
+ "(pk1 UNSIGNED_TINYINT NOT NULL, pk2 UNSIGNED_TINYINT NOT NULL, pk3 UNSIGNED_TINYINT NOT NULL, kv VARCHAR "
+ "CONSTRAINT pk PRIMARY KEY (pk1, pk2, pk3)) SPLIT ON (?, ?, ?)");
@@ -350,7 +350,7 @@ public class SkipScanQueryIT extends ParallelStatsDisabledIT {
Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
Connection conn = DriverManager.getConnection(getUrl(), props);
conn.setAutoCommit(false);
- String tableName = generateRandomString();
+ String tableName = generateUniqueName();
String fullTableName = SchemaUtil.getTableName(TestUtil.DEFAULT_SCHEMA_NAME, tableName);
try {
TestUtil.createMultiCFTestTable(conn , fullTableName, null);
@@ -432,7 +432,7 @@ public class SkipScanQueryIT extends ParallelStatsDisabledIT {
@Test
public void testOrPKWithAndNonPK() throws Exception {
Connection conn = DriverManager.getConnection(getUrl());
- String tableName = generateRandomString();
+ String tableName = generateUniqueName();
try {
conn.createStatement().execute("create table " + tableName + "(ID varchar primary key,company varchar)");
conn.setAutoCommit(true);
@@ -453,7 +453,7 @@ public class SkipScanQueryIT extends ParallelStatsDisabledIT {
@Test
public void testNullInfiniteLoop() throws Exception {
try (Connection conn = DriverManager.getConnection(getUrl())) {
- String tableName = generateRandomString();
+ String tableName = generateUniqueName();
conn.setAutoCommit(true);
conn.createStatement().execute(
"create table " + tableName +
http://git-wip-us.apache.org/repos/asf/phoenix/blob/bebb5ced/phoenix-core/src/it/java/org/apache/phoenix/end2end/SortMergeJoinMoreIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SortMergeJoinMoreIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SortMergeJoinMoreIT.java
index 9570021..df18093 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SortMergeJoinMoreIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SortMergeJoinMoreIT.java
@@ -53,8 +53,8 @@ public class SortMergeJoinMoreIT extends ParallelStatsDisabledIT {
@Test
public void testJoinOverSaltedTables() throws Exception {
- String tempTableNoSalting = "TEMP_TABLE_NO_SALTING" + generateRandomString();
- String tempTableWithSalting = "TEMP_TABLE_WITH_SALTING" + generateRandomString();
+ String tempTableNoSalting = "TEMP_TABLE_NO_SALTING" + generateUniqueName();
+ String tempTableWithSalting = "TEMP_TABLE_WITH_SALTING" + generateUniqueName();
Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
Connection conn = DriverManager.getConnection(getUrl(), props);
try {
@@ -191,8 +191,8 @@ public class SortMergeJoinMoreIT extends ParallelStatsDisabledIT {
@Test
public void testJoinOnDynamicColumns() throws Exception {
- String tableA = generateRandomString();
- String tableB = generateRandomString();
+ String tableA = generateUniqueName();
+ String tableB = generateUniqueName();
Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
Connection conn = null;
PreparedStatement stmt = null;
@@ -221,7 +221,7 @@ public class SortMergeJoinMoreIT extends ParallelStatsDisabledIT {
}
conn.commit();
stmt.close();
- String seqBName = generateRandomString();
+ String seqBName = generateUniqueName();
// upsert select dynamic columns in tableB
conn.createStatement().execute("CREATE SEQUENCE " + seqBName);
@@ -264,9 +264,9 @@ public class SortMergeJoinMoreIT extends ParallelStatsDisabledIT {
Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
Connection conn = DriverManager.getConnection(getUrl(), props);
conn.setAutoCommit(false);
- String gTableName = generateRandomString();
- String lTableName = generateRandomString();
- String slTableName = generateRandomString();
+ String gTableName = generateUniqueName();
+ String lTableName = generateUniqueName();
+ String slTableName = generateUniqueName();
try {
@@ -323,7 +323,7 @@ public class SortMergeJoinMoreIT extends ParallelStatsDisabledIT {
Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
Connection conn = DriverManager.getConnection(getUrl(), props);
conn.setAutoCommit(true);
- String eventCountTableName = generateRandomString();
+ String eventCountTableName = generateUniqueName();
try {
conn.createStatement().execute(
"CREATE TABLE IF NOT EXISTS " + eventCountTableName + " (\n" +
@@ -384,7 +384,7 @@ public class SortMergeJoinMoreIT extends ParallelStatsDisabledIT {
// We'll test the original version of the user table as well as a slightly modified
// version, in order to verify that sort-merge join works for columns both having
// DESC sort order as well as one having ASC order and the other having DESC order.
- String[] t = new String[] {"EVENT_LATENCY" + generateRandomString(), "EVENT_LATENCY_2" + generateRandomString()};
+ String[] t = new String[] {"EVENT_LATENCY" + generateUniqueName(), "EVENT_LATENCY_2" + generateUniqueName()};
for (int i = 0; i < 2; i++) {
conn.createStatement().execute(
"CREATE TABLE IF NOT EXISTS " + t[i] + " (\n" +
[3/6] phoenix git commit: PHOENIX-3253 Make changes to tests to
support method level parallelization
Posted by ja...@apache.org.
http://git-wip-us.apache.org/repos/asf/phoenix/blob/bebb5ced/phoenix-core/src/it/java/org/apache/phoenix/end2end/SortOrderIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SortOrderIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SortOrderIT.java
index dc22ff8..e9c0c55 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SortOrderIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SortOrderIT.java
@@ -60,12 +60,12 @@ public class SortOrderIT extends ParallelStatsDisabledIT {
@Before
public void generateTableName() {
- baseTableName = generateRandomString();
+ baseTableName = generateUniqueName();
}
@Test
public void noOrder() throws Exception {
- String table = generateRandomString();
+ String table = generateUniqueName();
String ddl = "CREATE table " + table + " (pk VARCHAR NOT NULL PRIMARY KEY)";
runQueryTest(ddl, "pk", new Object[][]{{"a"}, {"b"}, {"c"}}, new Object[][]{{"a"}, {"b"}, {"c"}},
table);
@@ -73,7 +73,7 @@ public class SortOrderIT extends ParallelStatsDisabledIT {
@Test
public void noOrderCompositePK() throws Exception {
- String table = generateRandomString();
+ String table = generateUniqueName();
String ddl = "CREATE table " + table + " (oid CHAR(2) NOT NULL, code INTEGER NOT NULL constraint pk primary key (oid, code))";
Object[][] rows = new Object[][]{{"o1", 1}, {"o2", 2}, {"o3", 3}};
runQueryTest(ddl, upsert("oid", "code"), rows, rows, table);
@@ -81,7 +81,7 @@ public class SortOrderIT extends ParallelStatsDisabledIT {
@Test
public void ascOrderInlinePK() throws Exception {
- String table = generateRandomString();
+ String table = generateUniqueName();
String ddl = "CREATE table " + table + " (pk VARCHAR NOT NULL PRIMARY KEY ASC)";
runQueryTest(ddl, "pk", new Object[][]{{"a"}, {"b"}, {"c"}}, new Object[][]{{"a"}, {"b"}, {"c"}},
table);
@@ -89,7 +89,7 @@ public class SortOrderIT extends ParallelStatsDisabledIT {
@Test
public void ascOrderCompositePK() throws Exception {
- String table = generateRandomString();
+ String table = generateUniqueName();
String ddl = "CREATE table " + table + " (oid CHAR(2) NOT NULL, code INTEGER NOT NULL constraint pk primary key (oid ASC, code DESC))";
Object[][] insertedRows = new Object[][]{{"o1", 1}, {"o1", 2}, {"o1", 3}};
Object[][] expectedRows = new Object[][]{{"o1", 3}, {"o1", 2}, {"o1", 1}};
@@ -98,7 +98,7 @@ public class SortOrderIT extends ParallelStatsDisabledIT {
@Test
public void descOrderInlinePK() throws Exception {
- String table = generateRandomString();
+ String table = generateUniqueName();
for (String type : new String[]{"CHAR(2)", "VARCHAR"}) {
String ddl = "CREATE table " + table + " (pk ${type} NOT NULL PRIMARY KEY DESC)".replace("${type}", type);
runQueryTest(ddl, "pk", new Object[][]{{"aa"}, {"bb"}, {"cc"}}, new Object[][]{{"cc"}, {"bb"}, {"aa"}},
@@ -108,7 +108,7 @@ public class SortOrderIT extends ParallelStatsDisabledIT {
@Test
public void descOrderCompositePK1() throws Exception {
- String table = generateRandomString();
+ String table = generateUniqueName();
String ddl = "CREATE table " + table + " (oid CHAR(2) NOT NULL, code INTEGER NOT NULL constraint pk primary key (oid DESC, code))";
Object[][] insertedRows = new Object[][]{{"o1", 1}, {"o2", 2}, {"o3", 3}};
Object[][] expectedRows = new Object[][]{{"o3", 3}, {"o2", 2}, {"o1", 1}};
@@ -117,7 +117,7 @@ public class SortOrderIT extends ParallelStatsDisabledIT {
@Test
public void descOrderCompositePK2() throws Exception {
- String table = generateRandomString();
+ String table = generateUniqueName();
String ddl = "CREATE table " + table + " (oid CHAR(2) NOT NULL, code INTEGER NOT NULL constraint pk primary key (oid DESC, code DESC))";
Object[][] insertedRows = new Object[][]{{"o1", 1}, {"o1", 2}, {"o1", 3}};
Object[][] expectedRows = new Object[][]{{"o1", 3}, {"o1", 2}, {"o1", 1}};
@@ -126,7 +126,7 @@ public class SortOrderIT extends ParallelStatsDisabledIT {
@Test
public void equalityDescInlinePK() throws Exception {
- String table = generateRandomString();
+ String table = generateUniqueName();
String ddl = "CREATE table " + table + " (pk VARCHAR NOT NULL PRIMARY KEY DESC)";
runQueryTest(ddl, upsert("pk"), new Object[][]{{"a"}, {"b"}, {"c"}}, new Object[][]{{"b"}}, new WhereCondition("pk", "=", "'b'"),
table);
@@ -134,7 +134,7 @@ public class SortOrderIT extends ParallelStatsDisabledIT {
@Test
public void equalityDescCompositePK1() throws Exception {
- String table = generateRandomString();
+ String table = generateUniqueName();
String ddl = "CREATE table " + table + " (oid CHAR(2) NOT NULL, code INTEGER NOT NULL constraint pk primary key (oid DESC, code DESC))";
Object[][] insertedRows = new Object[][]{{"o1", 1}, {"o2", 2}, {"o3", 3}};
runQueryTest(ddl, upsert("oid", "code"), insertedRows, new Object[][]{{"o2", 2}}, new WhereCondition("oid", "=", "'o2'"),
@@ -143,7 +143,7 @@ public class SortOrderIT extends ParallelStatsDisabledIT {
@Test
public void equalityDescCompositePK2() throws Exception {
- String table = generateRandomString();
+ String table = generateUniqueName();
String ddl = "CREATE table " + table + " (oid CHAR(2) NOT NULL, code INTEGER NOT NULL constraint pk primary key (oid DESC, code DESC))";
Object[][] insertedRows = new Object[][]{{"o1", 1}, {"o1", 2}, {"o1", 3}};
runQueryTest(ddl, upsert("oid", "code"), insertedRows, new Object[][]{{"o1", 2}}, new WhereCondition("code", "=", "2"),
@@ -152,7 +152,7 @@ public class SortOrderIT extends ParallelStatsDisabledIT {
@Test
public void inDescCompositePK1() throws Exception {
- String table = generateRandomString();
+ String table = generateUniqueName();
String ddl = "CREATE table " + table + " (oid CHAR(2) NOT NULL, code INTEGER NOT NULL constraint pk primary key (oid DESC, code DESC))";
Object[][] insertedRows = new Object[][]{{"o1", 1}, {"o1", 2}, {"o1", 3}};
runQueryTest(ddl, upsert("oid", "code"), insertedRows, new Object[][]{{"o1", 2}}, new WhereCondition("code", "IN", "(2)"),
@@ -161,7 +161,7 @@ public class SortOrderIT extends ParallelStatsDisabledIT {
@Test
public void inDescCompositePK2() throws Exception {
- String table = generateRandomString();
+ String table = generateUniqueName();
String ddl = "CREATE table " + table + " (oid CHAR(2) NOT NULL, code INTEGER NOT NULL constraint pk primary key (oid DESC, code DESC))";
Object[][] insertedRows = new Object[][]{{"o1", 1}, {"o2", 2}, {"o3", 3}};
runQueryTest(ddl, upsert("oid", "code"), insertedRows, new Object[][]{{"o2", 2}}, new WhereCondition("oid", "IN", "('o2')"),
@@ -170,7 +170,7 @@ public class SortOrderIT extends ParallelStatsDisabledIT {
@Test
public void likeDescCompositePK1() throws Exception {
- String table = generateRandomString();
+ String table = generateUniqueName();
String ddl = "CREATE table " + table + " (oid CHAR(2) NOT NULL, code INTEGER NOT NULL constraint pk primary key (oid DESC, code DESC))";
Object[][] insertedRows = new Object[][]{{"a1", 1}, {"b2", 2}, {"c3", 3}};
runQueryTest(ddl, upsert("oid", "code"), insertedRows, new Object[][]{{"b2", 2}}, new WhereCondition("oid", "LIKE", "('b%')"),
@@ -179,7 +179,7 @@ public class SortOrderIT extends ParallelStatsDisabledIT {
@Test
public void likeDescCompositePK2() throws Exception {
- String table = generateRandomString();
+ String table = generateUniqueName();
String ddl = "CREATE table " + table + " (oid CHAR(2) NOT NULL, code CHAR(2) NOT NULL constraint pk primary key (oid DESC, code DESC))";
Object[][] insertedRows = new Object[][]{{"a1", "11"}, {"b2", "22"}, {"c3", "33"}};
runQueryTest(ddl, upsert("oid", "code"), insertedRows, new Object[][]{{"b2", "22"}}, new WhereCondition("code", "LIKE", "('2%')"),
@@ -188,7 +188,7 @@ public class SortOrderIT extends ParallelStatsDisabledIT {
@Test
public void greaterThanDescCompositePK3() throws Exception {
- String table = generateRandomString();
+ String table = generateUniqueName();
String ddl = "CREATE table " + table + " (oid CHAR(2) NOT NULL, code INTEGER NOT NULL constraint pk primary key (oid DESC, code DESC))";
Object[][] insertedRows = new Object[][]{{"o1", 1}, {"o1", 2}, {"o1", 3}};
Object[][] expectedRows = new Object[][]{{"o1", 2}, {"o1", 1}};
@@ -198,7 +198,7 @@ public class SortOrderIT extends ParallelStatsDisabledIT {
@Test
public void substrDescCompositePK1() throws Exception {
- String table = generateRandomString();
+ String table = generateUniqueName();
String ddl = "CREATE table " + table + " (oid CHAR(3) NOT NULL, code INTEGER NOT NULL constraint pk primary key (oid DESC, code ASC))";
Object[][] insertedRows = new Object[][]{{"ao1", 1}, {"bo2", 2}, {"co3", 3}};
Object[][] expectedRows = new Object[][]{{"co3", 3}, {"bo2", 2}};
@@ -208,7 +208,7 @@ public class SortOrderIT extends ParallelStatsDisabledIT {
@Test
public void substrDescCompositePK2() throws Exception {
- String table = generateRandomString();
+ String table = generateUniqueName();
String ddl = "CREATE table " + table + " (oid CHAR(4) NOT NULL, code INTEGER NOT NULL constraint pk primary key (oid DESC, code ASC))";
Object[][] insertedRows = new Object[][]{{"aaaa", 1}, {"bbbb", 2}, {"cccd", 3}};
Object[][] expectedRows = new Object[][]{{"cccd", 3}};
@@ -218,7 +218,7 @@ public class SortOrderIT extends ParallelStatsDisabledIT {
@Test
public void substrFixedLengthDescPK1() throws Exception {
- String table = generateRandomString();
+ String table = generateUniqueName();
String ddl = "CREATE table " + table + " (oid CHAR(3) PRIMARY KEY DESC)";
Object[][] insertedRows = new Object[][]{{"a"}, {"ab"}};
Object[][] expectedRows = new Object[][]{{"ab"}, {"a"} };
@@ -228,7 +228,7 @@ public class SortOrderIT extends ParallelStatsDisabledIT {
@Test
public void substrVarLengthDescPK1() throws Exception {
- String table = generateRandomString();
+ String table = generateUniqueName();
String ddl = "CREATE table " + table + " (oid VARCHAR PRIMARY KEY DESC)";
Object[][] insertedRows = new Object[][]{{"a"}, {"ab"}};
Object[][] expectedRows = new Object[][]{{"ab"}, {"a"} };
@@ -238,7 +238,7 @@ public class SortOrderIT extends ParallelStatsDisabledIT {
@Test
public void likeVarLengthDescPK1() throws Exception {
- String table = generateRandomString();
+ String table = generateUniqueName();
String ddl = "CREATE table " + table + " (oid VARCHAR PRIMARY KEY DESC)";
Object[][] insertedRows = new Object[][]{{"a"}, {"ab"}};
Object[][] expectedRows = new Object[][]{{"ab"}, {"a"} };
@@ -248,7 +248,7 @@ public class SortOrderIT extends ParallelStatsDisabledIT {
@Test
public void likeFixedLengthDescPK1() throws Exception {
- String table = generateRandomString();
+ String table = generateUniqueName();
String ddl = "CREATE table " + table + " (oid CHAR(3) PRIMARY KEY DESC)";
Object[][] insertedRows = new Object[][]{{"a"}, {"ab"}};
Object[][] expectedRows = new Object[][]{{"ab"}, {"a"} };
@@ -258,7 +258,7 @@ public class SortOrderIT extends ParallelStatsDisabledIT {
@Test
public void decimalRangeDescPK1() throws Exception {
- String table = generateRandomString();
+ String table = generateUniqueName();
String ddl = "CREATE table " + table + " (oid DECIMAL PRIMARY KEY DESC)";
Connection conn = DriverManager.getConnection(getUrl());
conn.createStatement().execute(ddl);
@@ -284,7 +284,7 @@ public class SortOrderIT extends ParallelStatsDisabledIT {
@Test
public void lTrimDescCompositePK() throws Exception {
- String table = generateRandomString();
+ String table = generateUniqueName();
String ddl = "CREATE table " + table + " (oid VARCHAR NOT NULL, code INTEGER NOT NULL constraint pk primary key (oid DESC, code DESC))";
Object[][] insertedRows = new Object[][]{{" o1 ", 1}, {" o2", 2}, {" o3", 3}};
Object[][] expectedRows = new Object[][]{{" o2", 2}};
@@ -294,7 +294,7 @@ public class SortOrderIT extends ParallelStatsDisabledIT {
@Test
public void lPadDescCompositePK() throws Exception {
- String table = generateRandomString();
+ String table = generateUniqueName();
String ddl = "CREATE table " + table + " (oid VARCHAR NOT NULL, code INTEGER NOT NULL constraint pk primary key (oid DESC, code DESC))";
Object[][] insertedRows = new Object[][]{{"aaaa", 1}, {"bbbb", 2}, {"cccc", 3}};
Object[][] expectedRows = new Object[][]{{"bbbb", 2}};
@@ -304,7 +304,7 @@ public class SortOrderIT extends ParallelStatsDisabledIT {
@Test
public void countDescCompositePK() throws Exception {
- String table = generateRandomString();
+ String table = generateUniqueName();
String ddl = "CREATE table " + table + " (oid CHAR(2) NOT NULL, code INTEGER NOT NULL constraint pk primary key (oid DESC, code ASC))";
Object[][] insertedRows = new Object[][]{{"o1", 1}, {"o2", 2}, {"o3", 3}};
Object[][] expectedRows = new Object[][]{{3l}};
@@ -314,7 +314,7 @@ public class SortOrderIT extends ParallelStatsDisabledIT {
@Test
public void sumDescCompositePK() throws Exception {
- String table = generateRandomString();
+ String table = generateUniqueName();
String ddl = "CREATE table " + table + " (n1 INTEGER NOT NULL, n2 DECIMAL(10, 2) NOT NULL, n3 BIGINT NOT NULL " +
"constraint pk primary key (n1 DESC, n2 DESC, n3 DESC))";
Object[][] insertedRows = new Object[][]{{10, bdec(10.2), 21l}, {20, bdec(20.2), 32l}, {30, bdec(30.2), 43l}};
@@ -325,7 +325,7 @@ public class SortOrderIT extends ParallelStatsDisabledIT {
@Test
public void avgDescCompositePK() throws Exception {
- String table = generateRandomString();
+ String table = generateUniqueName();
String ddl = "CREATE table " + table + " (n1 INTEGER NOT NULL, n2 DECIMAL(10, 2) NOT NULL, n3 BIGINT NOT NULL " +
"constraint pk primary key (n1 DESC, n2 DESC, n3 DESC))";
Object[][] insertedRows = new Object[][]{{10, bdec(10.2), 21l}, {20, bdec(20.2), 32l}, {30, bdec(30.2), 43l}};
@@ -336,7 +336,7 @@ public class SortOrderIT extends ParallelStatsDisabledIT {
@Test
public void minDescCompositePK() throws Exception {
- String table = generateRandomString();
+ String table = generateUniqueName();
String ddl = "CREATE table " + table + " (n1 INTEGER NOT NULL, n2 DECIMAL(10, 2) NOT NULL, n3 BIGINT NOT NULL " +
"constraint pk primary key (n1 DESC, n2 DESC, n3 DESC))";
Object[][] insertedRows = new Object[][]{{10, bdec(10.2), 21l}, {20, bdec(20.2), 32l}, {30, bdec(30.2), 43l}};
@@ -347,7 +347,7 @@ public class SortOrderIT extends ParallelStatsDisabledIT {
@Test
public void maxDescCompositePK() throws Exception {
- String table = generateRandomString();
+ String table = generateUniqueName();
String ddl = "CREATE table " + table + " (n1 INTEGER NOT NULL, n2 DECIMAL(10, 2) NOT NULL, n3 BIGINT NOT NULL " +
"constraint pk primary key (n1 DESC, n2 DESC, n3 DESC))";
Object[][] insertedRows = new Object[][]{{10, bdec(10.2), 21l}, {20, bdec(20.2), 32l}, {30, bdec(30.2), 43l}};
@@ -358,7 +358,7 @@ public class SortOrderIT extends ParallelStatsDisabledIT {
@Test
public void havingSumDescCompositePK() throws Exception {
- String table = generateRandomString();
+ String table = generateUniqueName();
String ddl = "CREATE table " + table + " (name CHAR(1) NOT NULL, code INTEGER NOT NULL " +
"constraint pk primary key (name DESC, code DESC))";
Object[][] insertedRows = new Object[][]{{"a", 10}, {"a", 20}, {"b", 100}};
@@ -369,7 +369,7 @@ public class SortOrderIT extends ParallelStatsDisabledIT {
@Test
public void queryDescDateWithExplicitOrderBy() throws Exception {
- String table = generateRandomString();
+ String table = generateUniqueName();
String ddl = "CREATE table " + table + " (c1 CHAR(1) NOT NULL, c2 CHAR(1) NOT NULL, d1 DATE NOT NULL, c3 CHAR(1) NOT NULL " +
"constraint pk primary key (c1, c2, d1 DESC, c3))";
Object[] row1 = {"1", "2", date(10, 11, 2001), "3"};
@@ -381,7 +381,7 @@ public class SortOrderIT extends ParallelStatsDisabledIT {
@Test
public void additionOnDescCompositePK() throws Exception {
- String table = generateRandomString();
+ String table = generateUniqueName();
String ddl = "CREATE table " + table + " (n1 INTEGER NOT NULL, n2 DECIMAL(10, 2) NOT NULL, n3 BIGINT NOT NULL, d1 DATE NOT NULL " +
"constraint pk primary key (n1 DESC, n2 DESC, n3 DESC, d1 DESC))";
Object[][] insertedRows = new Object[][]{
@@ -394,7 +394,7 @@ public class SortOrderIT extends ParallelStatsDisabledIT {
@Test
public void subtractionOnDescCompositePK() throws Exception {
- String table = generateRandomString();
+ String table = generateUniqueName();
String ddl = "CREATE table " + table + " (n1 INTEGER NOT NULL, n2 DECIMAL(10, 2) NOT NULL, n3 BIGINT NOT NULL, d1 DATE NOT NULL " +
"constraint pk primary key (n1 DESC, n2 DESC, n3 DESC, d1 DESC))";
Object[][] insertedRows = new Object[][]{
@@ -407,7 +407,7 @@ public class SortOrderIT extends ParallelStatsDisabledIT {
@Test
public void lessThanLeadingDescCompositePK() throws Exception {
- String table = generateRandomString();
+ String table = generateUniqueName();
String ddl = "CREATE table " + table + " (id INTEGER NOT NULL, date DATE NOT NULL constraint pk primary key (id DESC, date))";
Object[][] insertedRows = new Object[][]{{1, date(1, 1, 2012)}, {3, date(1, 1, 2013)}, {2, date(1, 1, 2011)}};
Object[][] expectedRows = new Object[][]{{1, date(1, 1, 2012)}};
@@ -417,7 +417,7 @@ public class SortOrderIT extends ParallelStatsDisabledIT {
@Test
public void lessThanTrailingDescCompositePK() throws Exception {
- String table = generateRandomString();
+ String table = generateUniqueName();
String ddl = "CREATE table " + table + " (id INTEGER NOT NULL, date DATE NOT NULL constraint pk primary key (id DESC, date))";
Object[][] insertedRows = new Object[][]{{1, date(1, 1, 2002)}, {3, date(1, 1, 2003)}, {2, date(1, 1, 2001)}};
Object[][] expectedRows = new Object[][]{{2, date(1, 1, 2001)}};
@@ -427,7 +427,7 @@ public class SortOrderIT extends ParallelStatsDisabledIT {
@Test
public void descVarLengthPK() throws Exception {
- String table = generateRandomString();
+ String table = generateUniqueName();
String ddl = "CREATE table " + table + " (id VARCHAR PRIMARY KEY DESC)";
Object[][] insertedRows = new Object[][]{{"a"}, {"ab"}, {"abc"}};
Object[][] expectedRows = new Object[][]{{"abc"}, {"ab"}, {"a"}};
@@ -437,7 +437,7 @@ public class SortOrderIT extends ParallelStatsDisabledIT {
@Test
public void descVarLengthAscPKGT() throws Exception {
- String table = generateRandomString();
+ String table = generateUniqueName();
String ddl = "CREATE table " + table + " (k1 INTEGER NOT NULL, k2 VARCHAR, CONSTRAINT pk PRIMARY KEY (k1, k2))";
Object[][] insertedRows = new Object[][]{{0, null}, {1, "a"}, {2, "b"}, {3, "ba"}, {4, "baa"}, {5, "c"}, {6, "d"}};
Object[][] expectedRows = new Object[][]{{3}, {4}, {5}, {6}};
@@ -447,7 +447,7 @@ public class SortOrderIT extends ParallelStatsDisabledIT {
@Test
public void descVarLengthDescPKGT() throws Exception {
- String table = generateRandomString();
+ String table = generateUniqueName();
String ddl = "CREATE table " + table + " (k1 INTEGER NOT NULL, k2 VARCHAR, CONSTRAINT pk PRIMARY KEY (k1, k2 desc))";
Object[][] insertedRows = new Object[][]{{0, null}, {1, "a"}, {2, "b"}, {3, "ba"}, {4, "baa"}, {5, "c"}, {6, "d"}};
Object[][] expectedRows = new Object[][]{{3}, {4}, {5}, {6}};
@@ -457,7 +457,7 @@ public class SortOrderIT extends ParallelStatsDisabledIT {
@Test
public void descVarLengthDescPKLTE() throws Exception {
- String table = generateRandomString();
+ String table = generateUniqueName();
String ddl = "CREATE table " + table + " (k1 INTEGER NOT NULL, k2 VARCHAR, CONSTRAINT pk PRIMARY KEY (k1, k2 desc))";
Object[][] insertedRows = new Object[][]{{0, null}, {1, "a"}, {2, "b"}, {3, "ba"}, {4, "bb"}, {5, "bc"}, {6, "bba"}, {7, "c"}};
Object[][] expectedRows = new Object[][]{{1}, {2}, {3}, {4}};
@@ -467,7 +467,7 @@ public class SortOrderIT extends ParallelStatsDisabledIT {
@Test
public void descVarLengthAscPKLTE() throws Exception {
- String table = generateRandomString();
+ String table = generateUniqueName();
String ddl = "CREATE table " + table + " (k1 INTEGER NOT NULL, k2 VARCHAR, CONSTRAINT pk PRIMARY KEY (k1, k2))";
Object[][] insertedRows = new Object[][]{{0, null}, {1, "a"}, {2, "b"}, {3, "ba"}, {4, "bb"}, {5, "bc"}, {6, "bba"}, {7, "c"}};
Object[][] expectedRows = new Object[][]{{1}, {2}, {3}, {4}};
@@ -477,7 +477,7 @@ public class SortOrderIT extends ParallelStatsDisabledIT {
@Test
public void varLengthAscLT() throws Exception {
- String table = generateRandomString();
+ String table = generateUniqueName();
String ddl = "CREATE table " + table + " (k1 VARCHAR NOT NULL, k2 VARCHAR, CONSTRAINT pk PRIMARY KEY (k1, k2))";
Object[][] insertedRows = new Object[][]{{"a", ""}, {"b",""}, {"b","a"}};
Object[][] expectedRows = new Object[][]{{"a"}};
@@ -487,7 +487,7 @@ public class SortOrderIT extends ParallelStatsDisabledIT {
@Test
public void varLengthDescLT() throws Exception {
- String table = generateRandomString();
+ String table = generateUniqueName();
String ddl = "CREATE table " + table + " (k1 VARCHAR NOT NULL, k2 VARCHAR, CONSTRAINT pk PRIMARY KEY (k1 desc, k2))";
Object[][] insertedRows = new Object[][]{{"a", ""}, {"b",""}, {"b","a"}};
Object[][] expectedRows = new Object[][]{{"a"}};
@@ -497,7 +497,7 @@ public class SortOrderIT extends ParallelStatsDisabledIT {
@Test
public void varLengthDescGT() throws Exception {
- String table = generateRandomString();
+ String table = generateUniqueName();
String ddl = "CREATE table " + table + " (k1 VARCHAR NOT NULL, k2 VARCHAR, CONSTRAINT pk PRIMARY KEY (k1 desc, k2))";
Object[][] insertedRows = new Object[][]{{"a", ""}, {"b",""}, {"b","a"}, {"ba","a"}};
Object[][] expectedRows = new Object[][]{{"ba"}};
http://git-wip-us.apache.org/repos/asf/phoenix/blob/bebb5ced/phoenix-core/src/it/java/org/apache/phoenix/end2end/SpooledTmpFileDeleteIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SpooledTmpFileDeleteIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SpooledTmpFileDeleteIT.java
index 02a5d71..51bcb31 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SpooledTmpFileDeleteIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SpooledTmpFileDeleteIT.java
@@ -57,7 +57,7 @@ public class SpooledTmpFileDeleteIT extends ParallelStatsDisabledIT {
@Before
public void setup() throws SQLException {
- tableName = generateRandomString();
+ tableName = generateUniqueName();
props = new Properties();
spoolDir = Files.createTempDir();
props.put(QueryServices.SPOOL_DIRECTORY, spoolDir.getPath());
http://git-wip-us.apache.org/repos/asf/phoenix/blob/bebb5ced/phoenix-core/src/it/java/org/apache/phoenix/end2end/SqrtFunctionEnd2EndIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SqrtFunctionEnd2EndIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SqrtFunctionEnd2EndIT.java
index 1426564..657c3fd 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SqrtFunctionEnd2EndIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SqrtFunctionEnd2EndIT.java
@@ -45,8 +45,8 @@ public class SqrtFunctionEnd2EndIT extends ParallelStatsDisabledIT {
public void initTable() throws Exception {
Connection conn = null;
PreparedStatement stmt = null;
- testUnsignedTable = generateRandomString();
- testSignedTable = generateRandomString();
+ testUnsignedTable = generateUniqueName();
+ testSignedTable = generateUniqueName();
try {
conn = DriverManager.getConnection(getUrl());
String ddl;
http://git-wip-us.apache.org/repos/asf/phoenix/blob/bebb5ced/phoenix-core/src/it/java/org/apache/phoenix/end2end/StatementHintsIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/StatementHintsIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/StatementHintsIT.java
index a0960e5..d740ae4 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/StatementHintsIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/StatementHintsIT.java
@@ -39,7 +39,7 @@ import org.junit.Test;
public class StatementHintsIT extends ParallelStatsDisabledIT {
- private static final String TABLE_NAME = generateRandomString();
+ private static final String TABLE_NAME = generateUniqueName();
private static void initTableValues() throws Exception {
Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
http://git-wip-us.apache.org/repos/asf/phoenix/blob/bebb5ced/phoenix-core/src/it/java/org/apache/phoenix/end2end/StatsCollectorIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/StatsCollectorIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/StatsCollectorIT.java
index 9a1ea26..0b5a92d 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/StatsCollectorIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/StatsCollectorIT.java
@@ -89,7 +89,7 @@ public class StatsCollectorIT extends ParallelStatsEnabledIT {
@Before
public void generateTableNames() {
schemaName = TestUtil.DEFAULT_SCHEMA_NAME;
- tableName = "T_" + generateRandomString();
+ tableName = "T_" + generateUniqueName();
fullTableName = SchemaUtil.getTableName(schemaName, tableName);
}
@@ -224,7 +224,7 @@ public class StatsCollectorIT extends ParallelStatsEnabledIT {
@Test
public void testUpdateStatsWithMultipleTables() throws Throwable {
- String fullTableName2 = SchemaUtil.getTableName(schemaName, "T_" + generateRandomString());
+ String fullTableName2 = SchemaUtil.getTableName(schemaName, "T_" + generateUniqueName());
Connection conn;
PreparedStatement stmt;
ResultSet rs;
http://git-wip-us.apache.org/repos/asf/phoenix/blob/bebb5ced/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 c14cf39..bb13f1b 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
@@ -64,10 +64,10 @@ public class StoreNullsIT extends ParallelStatsDisabledIT {
@Before
public void setUp() throws SQLException {
- WITH_NULLS = generateRandomString();
- WITHOUT_NULLS = generateRandomString();
- IMMUTABLE_WITH_NULLS = generateRandomString();
- IMMUTABLE_WITHOUT_NULLS = generateRandomString();
+ WITH_NULLS = generateUniqueName();
+ WITHOUT_NULLS = generateUniqueName();
+ IMMUTABLE_WITH_NULLS = generateUniqueName();
+ IMMUTABLE_WITHOUT_NULLS = generateUniqueName();
conn = DriverManager.getConnection(getUrl());
conn.setAutoCommit(true);
http://git-wip-us.apache.org/repos/asf/phoenix/blob/bebb5ced/phoenix-core/src/it/java/org/apache/phoenix/end2end/StringIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/StringIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/StringIT.java
index bcf31ca..680935b 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/StringIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/StringIT.java
@@ -116,7 +116,7 @@ public class StringIT extends ParallelStatsDisabledIT {
public void testCharPadding() throws Exception {
ResultSet rs;
Connection conn = DriverManager.getConnection(getUrl());
- String tableName = generateRandomString();
+ String tableName = generateUniqueName();
conn.createStatement().execute("CREATE TABLE " + tableName + " (k CHAR(3) PRIMARY KEY)");
conn.createStatement().execute("UPSERT INTO " + tableName + " VALUES('a')");
conn.createStatement().execute("UPSERT INTO " + tableName + " VALUES('ab')");
@@ -127,7 +127,7 @@ public class StringIT extends ParallelStatsDisabledIT {
assertTrue(rs.next());
assertEquals("ab", rs.getString(1));
assertFalse(rs.next());
- String tableNameDesc = generateRandomString();
+ String tableNameDesc = generateUniqueName();
conn.createStatement().execute("CREATE TABLE " + tableNameDesc + " (k CHAR(3) PRIMARY KEY DESC)");
conn.createStatement().execute("UPSERT INTO " + tableNameDesc + " VALUES('a')");
conn.createStatement().execute("UPSERT INTO " + tableNameDesc + " VALUES('ab')");
@@ -144,7 +144,7 @@ public class StringIT extends ParallelStatsDisabledIT {
public void testBinaryPadding() throws Exception {
ResultSet rs;
Connection conn = DriverManager.getConnection(getUrl());
- String tableName = generateRandomString();
+ String tableName = generateUniqueName();
conn.createStatement().execute("CREATE TABLE " + tableName + " (k BINARY(3) PRIMARY KEY)");
conn.createStatement().execute("UPSERT INTO " + tableName + " VALUES('a')");
conn.createStatement().execute("UPSERT INTO " + tableName + " VALUES('ab')");
@@ -156,7 +156,7 @@ public class StringIT extends ParallelStatsDisabledIT {
assertArrayEquals(ByteUtil.concat(Bytes.toBytes("ab"), QueryConstants.SEPARATOR_BYTE_ARRAY), rs.getBytes(1));
assertFalse(rs.next());
- String tableNameDesc = generateRandomString();
+ String tableNameDesc = generateUniqueName();
conn.createStatement().execute("CREATE TABLE " + tableNameDesc + " (k BINARY(3) PRIMARY KEY DESC)");
conn.createStatement().execute("UPSERT INTO " + tableNameDesc + " VALUES('a')");
conn.createStatement().execute("UPSERT INTO " + tableNameDesc + " VALUES('ab')");
@@ -245,7 +245,7 @@ public class StringIT extends ParallelStatsDisabledIT {
@Test
public void testStrConcat() throws Exception {
Connection conn = DriverManager.getConnection(getUrl());
- String tableName = generateRandomString();
+ String tableName = generateUniqueName();
conn.createStatement().execute("create table " + tableName + " (PK1 integer, F1 varchar, F2 varchar, F3 varchar, F4 varchar, constraint PK primary key (PK1))");
conn.createStatement().execute("upsert into " + tableName + "(PK1, F1,F3) values(0, 'tortilla', 'chip')");
conn.commit();
http://git-wip-us.apache.org/repos/asf/phoenix/blob/bebb5ced/phoenix-core/src/it/java/org/apache/phoenix/end2end/StringToArrayFunctionIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/StringToArrayFunctionIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/StringToArrayFunctionIT.java
index d0f45c7..c11d765 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/StringToArrayFunctionIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/StringToArrayFunctionIT.java
@@ -30,7 +30,7 @@ import org.junit.Test;
public class StringToArrayFunctionIT extends ParallelStatsDisabledIT {
- private static final String TABLE_NAME = generateRandomString();
+ private static final String TABLE_NAME = generateUniqueName();
@BeforeClass
public static void initTables() throws Exception {
@@ -295,7 +295,7 @@ public class StringToArrayFunctionIT extends ParallelStatsDisabledIT {
public void testStringToArrayFunctionWithUpsert1() throws Exception {
Connection conn = DriverManager.getConnection(getUrl());
- String tableName = generateRandomString();
+ String tableName = generateUniqueName();
String ddl =
"CREATE TABLE " + tableName + " (region_name VARCHAR PRIMARY KEY,varchars VARCHAR[])";
conn.createStatement().execute(ddl);
@@ -320,7 +320,7 @@ public class StringToArrayFunctionIT extends ParallelStatsDisabledIT {
public void testStringToArrayFunctionWithUpsert2() throws Exception {
Connection conn = DriverManager.getConnection(getUrl());
- String tableName = generateRandomString();
+ String tableName = generateUniqueName();
String ddl =
"CREATE TABLE " + tableName + " (region_name VARCHAR PRIMARY KEY,varchars VARCHAR[])";
conn.createStatement().execute(ddl);
@@ -345,12 +345,12 @@ public class StringToArrayFunctionIT extends ParallelStatsDisabledIT {
public void testStringToArrayFunctionWithUpsertSelect1() throws Exception {
Connection conn = DriverManager.getConnection(getUrl());
- String table1 = generateRandomString();
+ String table1 = generateUniqueName();
String ddl =
"CREATE TABLE " + table1 + " (region_name VARCHAR PRIMARY KEY, varchar VARCHAR)";
conn.createStatement().execute(ddl);
- String table2 = generateRandomString();
+ String table2 = generateUniqueName();
ddl = "CREATE TABLE " + table2 + " (region_name VARCHAR PRIMARY KEY, varchars VARCHAR[])";
conn.createStatement().execute(ddl);
@@ -388,13 +388,13 @@ public class StringToArrayFunctionIT extends ParallelStatsDisabledIT {
public void testStringToArrayFunctionWithUpsertSelect2() throws Exception {
Connection conn = DriverManager.getConnection(getUrl());
- String sourceTable = generateRandomString();
+ String sourceTable = generateUniqueName();
String ddl =
"CREATE TABLE " + sourceTable + " (region_name VARCHAR PRIMARY KEY, varchar VARCHAR)";
conn.createStatement().execute(ddl);
- String targetTable = generateRandomString();
+ String targetTable = generateUniqueName();
ddl = "CREATE TABLE " + targetTable
+ " (region_name VARCHAR PRIMARY KEY, varchars VARCHAR[])";
conn.createStatement().execute(ddl);
http://git-wip-us.apache.org/repos/asf/phoenix/blob/bebb5ced/phoenix-core/src/it/java/org/apache/phoenix/end2end/TenantIdTypeIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/TenantIdTypeIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/TenantIdTypeIT.java
index 22b3655..73b3212 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/TenantIdTypeIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/TenantIdTypeIT.java
@@ -78,7 +78,7 @@ public class TenantIdTypeIT extends ParallelStatsDisabledIT {
this.dataType = dataType;
this.tenantId = tenantId;
this.otherTenantId = otherTenantId;
- String tbl = generateRandomString();
+ String tbl = generateUniqueName();
if(tbl.contains("(")){
tbl = tbl.substring(0, tbl.indexOf("("));
}
http://git-wip-us.apache.org/repos/asf/phoenix/blob/bebb5ced/phoenix-core/src/it/java/org/apache/phoenix/end2end/TenantSpecificTablesDDLIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/TenantSpecificTablesDDLIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/TenantSpecificTablesDDLIT.java
index 11eb40e..b8f8177 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/TenantSpecificTablesDDLIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/TenantSpecificTablesDDLIT.java
@@ -84,10 +84,10 @@ public class TenantSpecificTablesDDLIT extends BaseTenantSpecificTablesIT {
@Test
public void testCreateTenantViewFromNonMultiTenant() throws Exception {
- String tableName = generateRandomString();
+ String tableName = generateUniqueName();
createTestTable(getUrl(), "CREATE TABLE " + tableName + " (K VARCHAR PRIMARY KEY)");
try {
- String viewName = generateRandomString();
+ String viewName = generateUniqueName();
// Only way to get this exception is to attempt to derive from a global, multi-type table, as we won't find
// a tenant-specific table when we attempt to resolve the base table.
createTestTable(PHOENIX_JDBC_TENANT_SPECIFIC_URL, "CREATE VIEW " + viewName + " (COL VARCHAR) AS SELECT * FROM " + tableName);
@@ -99,8 +99,8 @@ public class TenantSpecificTablesDDLIT extends BaseTenantSpecificTablesIT {
@Test
public void testAlteringMultiTenancyForTableWithViewsNotAllowed() throws Exception {
Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
- String multiTenantTable = "MT_" + generateRandomString();
- String globalTable = "G_" + generateRandomString();
+ String multiTenantTable = "MT_" + generateUniqueName();
+ String globalTable = "G_" + generateUniqueName();
// create the two base tables
try (Connection conn = DriverManager.getConnection(getUrl(), props)) {
String ddl = "CREATE TABLE " + multiTenantTable + " (TENANT_ID VARCHAR NOT NULL, PK1 VARCHAR NOT NULL, V1 VARCHAR, V2 VARCHAR, V3 VARCHAR CONSTRAINT NAME_PK PRIMARY KEY(TENANT_ID, PK1)) MULTI_TENANT = true ";
@@ -108,18 +108,18 @@ public class TenantSpecificTablesDDLIT extends BaseTenantSpecificTablesIT {
ddl = "CREATE TABLE " + globalTable + " (TENANT_ID VARCHAR NOT NULL, PK1 VARCHAR NOT NULL, V1 VARCHAR, V2 VARCHAR, V3 VARCHAR CONSTRAINT NAME_PK PRIMARY KEY(TENANT_ID, PK1)) ";
conn.createStatement().execute(ddl);
}
- String t1 = generateRandomString();
+ String t1 = generateUniqueName();
props.setProperty(PhoenixRuntime.TENANT_ID_ATTRIB, t1);
// create view on multi-tenant table
try (Connection tenantConn = DriverManager.getConnection(getUrl(), props)) {
- String viewName = "V_" + generateRandomString();
+ String viewName = "V_" + generateUniqueName();
String viewDDL = "CREATE VIEW " + viewName + " AS SELECT * FROM " + multiTenantTable;
tenantConn.createStatement().execute(viewDDL);
}
props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
// create view on global table
try (Connection conn = DriverManager.getConnection(getUrl(), props)) {
- String viewName = "V_" + generateRandomString();
+ String viewName = "V_" + generateUniqueName();
conn.createStatement().execute("CREATE VIEW " + viewName + " AS SELECT * FROM " + globalTable);
}
props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
@@ -151,7 +151,7 @@ public class TenantSpecificTablesDDLIT extends BaseTenantSpecificTablesIT {
public void testCreationOfParentTableFailsOnTenantSpecificConnection() throws Exception {
try {
- createTestTable(PHOENIX_JDBC_TENANT_SPECIFIC_URL, "CREATE TABLE " + generateRandomString() + "( \n" +
+ createTestTable(PHOENIX_JDBC_TENANT_SPECIFIC_URL, "CREATE TABLE " + generateUniqueName() + "( \n" +
" user VARCHAR ,\n" +
" id INTEGER not null primary key desc\n" +
" ) ");
@@ -163,7 +163,7 @@ public class TenantSpecificTablesDDLIT extends BaseTenantSpecificTablesIT {
@Test
public void testTenantSpecificAndParentTablesMayBeInDifferentSchemas() throws SQLException {
- String fullTableName = "DIFFSCHEMA." + generateRandomString();
+ String fullTableName = "DIFFSCHEMA." + generateUniqueName();
createTestTable(PHOENIX_JDBC_TENANT_SPECIFIC_URL, "CREATE VIEW " + fullTableName + " ( \n" +
" tenant_col VARCHAR) AS SELECT * \n" +
" FROM " + PARENT_TABLE_NAME + " WHERE tenant_type_id = 'aaa'");
@@ -191,14 +191,14 @@ public class TenantSpecificTablesDDLIT extends BaseTenantSpecificTablesIT {
@Test
public void testTenantSpecificTableCanDeclarePK() throws SQLException {
- createTestTable(PHOENIX_JDBC_TENANT_SPECIFIC_URL, "CREATE VIEW " + generateRandomString() + "( \n" +
+ createTestTable(PHOENIX_JDBC_TENANT_SPECIFIC_URL, "CREATE VIEW " + generateUniqueName() + "( \n" +
" tenant_col VARCHAR PRIMARY KEY) AS SELECT *\n" +
" FROM " + PARENT_TABLE_NAME);
}
@Test(expected=ColumnAlreadyExistsException.class)
public void testTenantSpecificTableCannotOverrideParentCol() throws SQLException {
- createTestTable(PHOENIX_JDBC_TENANT_SPECIFIC_URL, "CREATE VIEW " + generateRandomString() + " ( \n" +
+ createTestTable(PHOENIX_JDBC_TENANT_SPECIFIC_URL, "CREATE VIEW " + generateUniqueName() + " ( \n" +
" user INTEGER) AS SELECT *\n" +
" FROM " + PARENT_TABLE_NAME);
}
@@ -208,7 +208,7 @@ public class TenantSpecificTablesDDLIT extends BaseTenantSpecificTablesIT {
// only two PK columns for multi_tenant, multi_type
try {
createTestTable(getUrl(),
- "CREATE TABLE " + generateRandomString() +
+ "CREATE TABLE " + generateUniqueName() +
"(TENANT_ID VARCHAR NOT NULL PRIMARY KEY, ID VARCHAR, A INTEGER) MULTI_TENANT=true");
fail();
}
@@ -338,7 +338,7 @@ public class TenantSpecificTablesDDLIT extends BaseTenantSpecificTablesIT {
@Test
public void testAllDropParentTableWithCascadeWithMultipleTenantTablesAndIndexes() throws Exception {
// Create a second tenant table
- String tenantTable2 = "V_" + generateRandomString();
+ String tenantTable2 = "V_" + generateUniqueName();
createTestTable(PHOENIX_JDBC_TENANT_SPECIFIC_URL2, TENANT_TABLE_DDL.replace(TENANT_TABLE_NAME, tenantTable2));
//TODO Create some tenant specific table indexes
@@ -418,9 +418,9 @@ public class TenantSpecificTablesDDLIT extends BaseTenantSpecificTablesIT {
@Test
public void testTableMetadataScan() throws Exception {
// create a tenant table with same name for a different tenant to make sure we are not picking it up in metadata scans for TENANT_ID
- String tenantId2 = "T_" + generateRandomString();
+ String tenantId2 = "T_" + generateUniqueName();
String secondTenatConnectionURL = PHOENIX_JDBC_TENANT_SPECIFIC_URL.replace(TENANT_ID, tenantId2);
- String tenantTable2 = "V_" + generateRandomString();
+ String tenantTable2 = "V_" + generateUniqueName();
createTestTable(secondTenatConnectionURL, TENANT_TABLE_DDL.replace(TENANT_TABLE_NAME, tenantTable2));
Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
http://git-wip-us.apache.org/repos/asf/phoenix/blob/bebb5ced/phoenix-core/src/it/java/org/apache/phoenix/end2end/TenantSpecificTablesDMLIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/TenantSpecificTablesDMLIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/TenantSpecificTablesDMLIT.java
index f26e6dd..76625c0 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/TenantSpecificTablesDMLIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/TenantSpecificTablesDMLIT.java
@@ -361,7 +361,7 @@ public class TenantSpecificTablesDMLIT extends BaseTenantSpecificTablesIT {
@Test
public void testUpsertSelectOnlyUpsertsTenantDataWithDifferentTenantTable() throws Exception {
- String anotherTableName = "V_" + generateRandomString();
+ String anotherTableName = "V_" + generateUniqueName();
createTestTable(PHOENIX_JDBC_TENANT_SPECIFIC_URL, "CREATE VIEW " + anotherTableName + " ( " +
"tenant_col VARCHAR) AS SELECT * FROM " + PARENT_TABLE_NAME + " WHERE tenant_type_id = 'def'");
http://git-wip-us.apache.org/repos/asf/phoenix/blob/bebb5ced/phoenix-core/src/it/java/org/apache/phoenix/end2end/TenantSpecificViewIndexIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/TenantSpecificViewIndexIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/TenantSpecificViewIndexIT.java
index c99c95f..f47e078 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/TenantSpecificViewIndexIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/TenantSpecificViewIndexIT.java
@@ -117,8 +117,8 @@ public class TenantSpecificViewIndexIT extends BaseTenantSpecificViewIndexIT {
}
private void testMultiCFViewIndex(boolean localIndex, boolean isNamespaceEnabled) throws Exception {
- String tableName = "XYZ." + generateRandomString();
- String baseViewName = generateRandomString() ;
+ String tableName = "XYZ." + generateUniqueName();
+ String baseViewName = generateUniqueName() ;
createTableAndValidate(tableName, isNamespaceEnabled);
createViewAndIndexesWithTenantId(tableName, baseViewName, localIndex, "b", isNamespaceEnabled);
createViewAndIndexesWithTenantId(tableName, baseViewName, localIndex, "a", isNamespaceEnabled);
@@ -248,8 +248,8 @@ public class TenantSpecificViewIndexIT extends BaseTenantSpecificViewIndexIT {
public void testNonPaddedTenantId() throws Exception {
String tenantId1 = "org1";
String tenantId2 = "org2";
- String tableName = generateRandomString();
- String viewName = generateRandomString();
+ String tableName = generateUniqueName();
+ String viewName = generateUniqueName();
String ddl = "CREATE TABLE " + tableName + " (tenantId char(15) NOT NULL, pk1 varchar NOT NULL, pk2 INTEGER NOT NULL, val1 VARCHAR CONSTRAINT pk primary key (tenantId,pk1,pk2)) MULTI_TENANT = true";
Connection conn = DriverManager.getConnection(getUrl());
conn.createStatement().execute(ddl);
http://git-wip-us.apache.org/repos/asf/phoenix/blob/bebb5ced/phoenix-core/src/it/java/org/apache/phoenix/end2end/TimezoneOffsetFunctionIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/TimezoneOffsetFunctionIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/TimezoneOffsetFunctionIT.java
index 48eb87e..65d47be 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/TimezoneOffsetFunctionIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/TimezoneOffsetFunctionIT.java
@@ -39,7 +39,7 @@ public class TimezoneOffsetFunctionIT extends ParallelStatsDisabledIT {
@Test
public void testTimezoneOffset() throws Exception {
Connection conn = DriverManager.getConnection(getUrl());
- String timezone_offset_test = generateRandomString();
+ String timezone_offset_test = generateUniqueName();
String ddl = "CREATE TABLE IF NOT EXISTS " + timezone_offset_test
+ " (k1 INTEGER NOT NULL, dates DATE CONSTRAINT pk PRIMARY KEY (k1))";
conn.createStatement().execute(ddl);
@@ -64,7 +64,7 @@ public class TimezoneOffsetFunctionIT extends ParallelStatsDisabledIT {
@Test
public void testUnknownTimezone() throws Exception {
Connection conn = DriverManager.getConnection(getUrl());
- String timezone_offset_test = generateRandomString();
+ String timezone_offset_test = generateUniqueName();
String ddl = "CREATE TABLE IF NOT EXISTS " + timezone_offset_test
+ " (k1 INTEGER NOT NULL, dates DATE CONSTRAINT pk PRIMARY KEY (k1))";
conn.createStatement().execute(ddl);
@@ -89,7 +89,7 @@ public class TimezoneOffsetFunctionIT extends ParallelStatsDisabledIT {
@Test
public void testInRowKeyDSTTimezoneDesc() throws Exception {
Connection conn = DriverManager.getConnection(getUrl());
- String timezone_offset_test = generateRandomString();
+ String timezone_offset_test = generateUniqueName();
String ddl = "CREATE TABLE IF NOT EXISTS " + timezone_offset_test + " "
+ "(k1 INTEGER NOT NULL, dates DATE NOT NULL CONSTRAINT pk PRIMARY KEY (k1, dates DESC))";
conn.createStatement().execute(ddl);
@@ -114,7 +114,7 @@ public class TimezoneOffsetFunctionIT extends ParallelStatsDisabledIT {
@Test
public void testBothParametersNull() throws Exception {
Connection conn = DriverManager.getConnection(getUrl());
- String timezone_offset_test = generateRandomString();
+ String timezone_offset_test = generateUniqueName();
String ddl = "CREATE TABLE IF NOT EXISTS " + timezone_offset_test + " "
+ "(k1 INTEGER NOT NULL, dates DATE, v1 VARCHAR CONSTRAINT pk PRIMARY KEY (k1))";
conn.createStatement().execute(ddl);
@@ -134,7 +134,7 @@ public class TimezoneOffsetFunctionIT extends ParallelStatsDisabledIT {
@Test
public void timezoneParameterNull() throws Exception {
Connection conn = DriverManager.getConnection(getUrl());
- String timezone_offset_test = generateRandomString();
+ String timezone_offset_test = generateUniqueName();
String ddl = "CREATE TABLE IF NOT EXISTS " + timezone_offset_test + " "
+ "(k1 INTEGER NOT NULL, dates DATE, v1 VARCHAR CONSTRAINT pk PRIMARY KEY (k1))";
conn.createStatement().execute(ddl);
@@ -155,7 +155,7 @@ public class TimezoneOffsetFunctionIT extends ParallelStatsDisabledIT {
@Test
public void dateParameterNull() throws Exception {
Connection conn = DriverManager.getConnection(getUrl());
- String timezone_offset_test = generateRandomString();
+ String timezone_offset_test = generateUniqueName();
String ddl = "CREATE TABLE IF NOT EXISTS " + timezone_offset_test + " "
+ "(k1 INTEGER NOT NULL, dates DATE, v1 VARCHAR CONSTRAINT pk PRIMARY KEY (k1))";
conn.createStatement().execute(ddl);
@@ -176,7 +176,7 @@ public class TimezoneOffsetFunctionIT extends ParallelStatsDisabledIT {
@Test
public void testInsertingRetrivingTimestamp() throws Exception {
Connection conn = DriverManager.getConnection(getUrl());
- String t = generateRandomString();
+ String t = generateUniqueName();
String ddl = "CREATE TABLE " + t + " (K INTEGER NOT NULL PRIMARY KEY, V TIMESTAMP)";
conn.createStatement().execute(ddl);
String dml = "UPSERT INTO " + t + " VALUES (?, ?)";
http://git-wip-us.apache.org/repos/asf/phoenix/blob/bebb5ced/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 7181918..022197c 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
@@ -67,7 +67,7 @@ public class ToCharFunctionIT extends ParallelStatsDisabledIT {
value="DMI_BIGDECIMAL_CONSTRUCTED_FROM_DOUBLE",
justification="Test code.")
public void initTable() throws Exception {
- TO_CHAR_TABLE_NAME = generateRandomString();
+ TO_CHAR_TABLE_NAME = generateUniqueName();
String ddl = "create table " + TO_CHAR_TABLE_NAME +
"(pk integer not null, \n" +
"col_date date, \n" +
@@ -236,7 +236,7 @@ public class ToCharFunctionIT extends ParallelStatsDisabledIT {
@Test
public void testToCharWithCloneMethod() throws SQLException {
Connection conn = DriverManager.getConnection(getUrl());
- String tableName = generateRandomString();
+ String tableName = generateUniqueName();
String ddl = "create table " + tableName + " (k varchar primary key, v integer[])";
conn.createStatement().execute(ddl);
conn.createStatement().execute("UPSERT INTO " + tableName + " VALUES('x',ARRAY[1234])");
@@ -250,7 +250,7 @@ public class ToCharFunctionIT extends ParallelStatsDisabledIT {
@Test
public void testIndexedNull() throws SQLException {
- final String tableName = generateRandomString();
+ final String tableName = generateUniqueName();
Connection conn = DriverManager.getConnection(getUrl());
conn.createStatement().execute("create table " + tableName +
" (id integer primary key, ts1 timestamp, ts2 timestamp)");
http://git-wip-us.apache.org/repos/asf/phoenix/blob/bebb5ced/phoenix-core/src/it/java/org/apache/phoenix/end2end/ToDateFunctionIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ToDateFunctionIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ToDateFunctionIT.java
index 3b11419..6053ef5 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ToDateFunctionIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ToDateFunctionIT.java
@@ -255,7 +255,7 @@ public class ToDateFunctionIT extends ParallelStatsDisabledIT {
@Test
public void testToDateWithCloneMethod() throws SQLException {
Connection conn = DriverManager.getConnection(getUrl());
- String tableName = generateRandomString();
+ String tableName = generateUniqueName();
String ddl = "create table " + tableName + " (k varchar primary key, v varchar[])";
conn.createStatement().execute(ddl);
String dateStr = "2100-01-01";
http://git-wip-us.apache.org/repos/asf/phoenix/blob/bebb5ced/phoenix-core/src/it/java/org/apache/phoenix/end2end/TransactionalViewIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/TransactionalViewIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/TransactionalViewIT.java
index 95e7266..18e6e5a 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/TransactionalViewIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/TransactionalViewIT.java
@@ -55,9 +55,9 @@ public class TransactionalViewIT extends ParallelStatsEnabledIT {
@Before
public void generateTableNames() {
String schemaName = TestUtil.DEFAULT_SCHEMA_NAME;
- String tableName = "T_" + generateRandomString();
+ String tableName = "T_" + generateUniqueName();
fullTableName = SchemaUtil.getTableName(schemaName, tableName);
- String viewName = "V_" + generateRandomString();
+ String viewName = "V_" + generateUniqueName();
fullViewName = SchemaUtil.getTableName(schemaName, viewName);
}
http://git-wip-us.apache.org/repos/asf/phoenix/blob/bebb5ced/phoenix-core/src/it/java/org/apache/phoenix/end2end/UnionAllIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/UnionAllIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/UnionAllIT.java
index 8f9a294..419459a 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/UnionAllIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/UnionAllIT.java
@@ -41,8 +41,8 @@ public class UnionAllIT extends ParallelStatsDisabledIT {
@Test
public void testUnionAllSelects() throws Exception {
- String tableName1 = generateRandomString();
- String tableName2 = generateRandomString();
+ String tableName1 = generateUniqueName();
+ String tableName2 = generateUniqueName();
Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
Connection conn = DriverManager.getConnection(getUrl(), props);
conn.setAutoCommit(false);
@@ -96,8 +96,8 @@ public class UnionAllIT extends ParallelStatsDisabledIT {
@Test
public void testAggregate() throws Exception {
- String tableName1 = generateRandomString();
- String tableName2 = generateRandomString();
+ String tableName1 = generateUniqueName();
+ String tableName2 = generateUniqueName();
Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
Connection conn = DriverManager.getConnection(getUrl(), props);
conn.setAutoCommit(false);
@@ -151,8 +151,8 @@ public class UnionAllIT extends ParallelStatsDisabledIT {
@Test
public void testGroupBy() throws Exception {
- String tableName1 = generateRandomString();
- String tableName2 = generateRandomString();
+ String tableName1 = generateUniqueName();
+ String tableName2 = generateUniqueName();
Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
Connection conn = DriverManager.getConnection(getUrl(), props);
conn.setAutoCommit(false);
@@ -200,8 +200,8 @@ public class UnionAllIT extends ParallelStatsDisabledIT {
@Test
public void testOrderByLimit() throws Exception {
- String tableName1 = generateRandomString();
- String tableName2 = generateRandomString();
+ String tableName1 = generateUniqueName();
+ String tableName2 = generateUniqueName();
Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
Connection conn = DriverManager.getConnection(getUrl(), props);
conn.setAutoCommit(false);
@@ -276,8 +276,8 @@ public class UnionAllIT extends ParallelStatsDisabledIT {
@Test
public void testSelectDiff() throws Exception {
- String tableName1 = generateRandomString();
- String tableName2 = generateRandomString();
+ String tableName1 = generateUniqueName();
+ String tableName2 = generateUniqueName();
Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
Connection conn = DriverManager.getConnection(getUrl(), props);
conn.setAutoCommit(false);
@@ -305,8 +305,8 @@ public class UnionAllIT extends ParallelStatsDisabledIT {
@Test
public void testJoinInUnionAll() throws Exception {
- String tableName1 = generateRandomString();
- String tableName2 = generateRandomString();
+ String tableName1 = generateUniqueName();
+ String tableName2 = generateUniqueName();
Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
Connection conn = DriverManager.getConnection(getUrl(), props);
conn.setAutoCommit(false);
@@ -380,8 +380,8 @@ public class UnionAllIT extends ParallelStatsDisabledIT {
@Test
public void testDerivedTable() throws Exception {
- String tableName1 = generateRandomString();
- String tableName2 = generateRandomString();
+ String tableName1 = generateUniqueName();
+ String tableName2 = generateUniqueName();
Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
Connection conn = DriverManager.getConnection(getUrl(), props);
conn.setAutoCommit(false);
@@ -428,8 +428,8 @@ public class UnionAllIT extends ParallelStatsDisabledIT {
@Test
public void testUnionAllInDerivedTable() throws Exception {
- String tableName1 = generateRandomString();
- String tableName2 = generateRandomString();
+ String tableName1 = generateUniqueName();
+ String tableName2 = generateUniqueName();
Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
Connection conn = DriverManager.getConnection(getUrl(), props);
conn.setAutoCommit(false);
@@ -497,8 +497,8 @@ public class UnionAllIT extends ParallelStatsDisabledIT {
@Test
public void testUnionAllInSubquery() throws Exception {
- String tableName1 = generateRandomString();
- String tableName2 = generateRandomString();
+ String tableName1 = generateUniqueName();
+ String tableName2 = generateUniqueName();
Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
Connection conn = DriverManager.getConnection(getUrl(), props);
conn.setAutoCommit(false);
@@ -553,8 +553,8 @@ public class UnionAllIT extends ParallelStatsDisabledIT {
@Test
public void testUnionAllWithBindParam() throws Exception {
- String tableName1 = generateRandomString();
- String tableName2 = generateRandomString();
+ String tableName1 = generateUniqueName();
+ String tableName2 = generateUniqueName();
Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
Connection conn = DriverManager.getConnection(getUrl(), props);
conn.setAutoCommit(false);
@@ -601,8 +601,8 @@ public class UnionAllIT extends ParallelStatsDisabledIT {
@Test
public void testExplainUnionAll() throws Exception {
- String tableName1 = generateRandomString();
- String tableName2 = generateRandomString();
+ String tableName1 = generateUniqueName();
+ String tableName2 = generateUniqueName();
Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
Connection conn = DriverManager.getConnection(getUrl(), props);
conn.setAutoCommit(false);
@@ -660,10 +660,10 @@ public class UnionAllIT extends ParallelStatsDisabledIT {
@Test
public void testBug2295() throws Exception {
- String tableName1 = generateRandomString();
- String tableName2 = generateRandomString();
- String itableName1 = generateRandomString();
- String itableName2 = generateRandomString();
+ String tableName1 = generateUniqueName();
+ String tableName2 = generateUniqueName();
+ String itableName1 = generateUniqueName();
+ String itableName2 = generateUniqueName();
Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
Connection conn = DriverManager.getConnection(getUrl(), props);
conn.setAutoCommit(false);
@@ -694,8 +694,8 @@ public class UnionAllIT extends ParallelStatsDisabledIT {
@Test
public void testParameterMetaDataNotNull() throws Exception {
- String tableName1 = generateRandomString();
- String tableName2 = generateRandomString();
+ String tableName1 = generateUniqueName();
+ String tableName2 = generateUniqueName();
Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
Connection conn = DriverManager.getConnection(getUrl(), props);
@@ -741,10 +741,10 @@ public class UnionAllIT extends ParallelStatsDisabledIT {
@Test
public void testDiffDataTypes() throws Exception {
- String tableName1 = generateRandomString();
- String tableName2 = generateRandomString();
- String tableName3 = generateRandomString();
- String tableName4 = generateRandomString();
+ String tableName1 = generateUniqueName();
+ String tableName2 = generateUniqueName();
+ String tableName3 = generateUniqueName();
+ String tableName4 = generateUniqueName();
Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
Connection conn = DriverManager.getConnection(getUrl(), props);
@@ -827,10 +827,10 @@ public class UnionAllIT extends ParallelStatsDisabledIT {
@Test
public void testDiffScaleSortOrder() throws Exception {
- String tableName1 = generateRandomString();
- String tableName2 = generateRandomString();
- String tableName3 = generateRandomString();
- String tableName4 = generateRandomString();
+ String tableName1 = generateUniqueName();
+ String tableName2 = generateUniqueName();
+ String tableName3 = generateUniqueName();
+ String tableName4 = generateUniqueName();
Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
Connection conn = DriverManager.getConnection(getUrl(), props);
@@ -915,8 +915,8 @@ public class UnionAllIT extends ParallelStatsDisabledIT {
@Test
public void testVarcharChar() throws Exception {
- String tableName1 = generateRandomString();
- String tableName2 = generateRandomString();
+ String tableName1 = generateUniqueName();
+ String tableName2 = generateUniqueName();
Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
Connection conn = DriverManager.getConnection(getUrl(), props);
@@ -979,8 +979,8 @@ public class UnionAllIT extends ParallelStatsDisabledIT {
@Test
public void testCoerceExpr() throws Exception {
- String tableName1 = generateRandomString();
- String tableName2 = generateRandomString();
+ String tableName1 = generateUniqueName();
+ String tableName2 = generateUniqueName();
Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
Connection conn = DriverManager.getConnection(getUrl(), props);
http://git-wip-us.apache.org/repos/asf/phoenix/blob/bebb5ced/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpgradeIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpgradeIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpgradeIT.java
index 84fa217..d37419b 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpgradeIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpgradeIT.java
@@ -73,13 +73,13 @@ public class UpgradeIT extends ParallelStatsDisabledIT {
@Before
public void generateTenantId() {
- tenantId = "T_" + generateRandomString();
+ tenantId = "T_" + generateUniqueName();
}
@Test
public void testUpgradeForTenantViewWithSameColumnsAsBaseTable() throws Exception {
- String tableWithViewName = generateRandomString();
- String viewTableName = generateRandomString();
+ String tableWithViewName = generateUniqueName();
+ String viewTableName = generateUniqueName();
testViewUpgrade(true, tenantId, null, tableWithViewName + "1", null, viewTableName + "1", ColumnDiff.EQUAL);
testViewUpgrade(true, tenantId, "TABLESCHEMA", tableWithViewName + "", null, viewTableName + "2",
ColumnDiff.EQUAL);
@@ -93,8 +93,8 @@ public class UpgradeIT extends ParallelStatsDisabledIT {
@Test
public void testUpgradeForTenantViewWithMoreColumnsThanBaseTable() throws Exception {
- String tableWithViewName = generateRandomString();
- String viewTableName = generateRandomString();
+ String tableWithViewName = generateUniqueName();
+ String viewTableName = generateUniqueName();
testViewUpgrade(true, tenantId, null, tableWithViewName + "1", null, viewTableName + "1", ColumnDiff.MORE);
testViewUpgrade(true, tenantId, "TABLESCHEMA", tableWithViewName + "", null, viewTableName + "2",
ColumnDiff.MORE);
@@ -108,8 +108,8 @@ public class UpgradeIT extends ParallelStatsDisabledIT {
@Test
public void testUpgradeForViewWithSameColumnsAsBaseTable() throws Exception {
- String tableWithViewName = generateRandomString();
- String viewTableName = generateRandomString();
+ String tableWithViewName = generateUniqueName();
+ String viewTableName = generateUniqueName();
testViewUpgrade(false, null, null, tableWithViewName + "1", null, viewTableName + "1", ColumnDiff.EQUAL);
testViewUpgrade(false, null, "TABLESCHEMA", tableWithViewName + "", null, viewTableName + "2",
ColumnDiff.EQUAL);
@@ -123,8 +123,8 @@ public class UpgradeIT extends ParallelStatsDisabledIT {
@Test
public void testUpgradeForViewWithMoreColumnsThanBaseTable() throws Exception {
- String tableWithViewName = generateRandomString();
- String viewTableName = generateRandomString();
+ String tableWithViewName = generateUniqueName();
+ String viewTableName = generateUniqueName();
testViewUpgrade(false, null, null, tableWithViewName + "1", null, viewTableName + "1", ColumnDiff.MORE);
testViewUpgrade(false, null, "TABLESCHEMA", tableWithViewName + "", null, viewTableName + "2", ColumnDiff.MORE);
testViewUpgrade(false, null, null, tableWithViewName + "3", "VIEWSCHEMA", viewTableName + "3", ColumnDiff.MORE);
@@ -136,8 +136,8 @@ public class UpgradeIT extends ParallelStatsDisabledIT {
@Test
public void testSettingBaseColumnCountWhenBaseTableColumnDropped() throws Exception {
- String tableWithViewName = generateRandomString();
- String viewTableName = generateRandomString();
+ String tableWithViewName = generateUniqueName();
+ String viewTableName = generateUniqueName();
testViewUpgrade(true, tenantId, null, tableWithViewName + "1", null, viewTableName + "1", ColumnDiff.MORE);
testViewUpgrade(true, tenantId, "TABLESCHEMA", tableWithViewName + "", null, viewTableName + "2",
ColumnDiff.LESS);
@@ -156,12 +156,12 @@ public class UpgradeIT extends ParallelStatsDisabledIT {
try (Connection conn = DriverManager.getConnection(getUrl())) {
String schemaName = "TEST";
- String phoenixFullTableName = schemaName + "." + generateRandomString();
- String indexName = "IDX_" + generateRandomString();
- String localIndexName = "LIDX_" + generateRandomString();
+ String phoenixFullTableName = schemaName + "." + generateUniqueName();
+ String indexName = "IDX_" + generateUniqueName();
+ String localIndexName = "LIDX_" + generateUniqueName();
- String viewName = "VIEW_" + generateRandomString();
- String viewIndexName = "VIDX_" + generateRandomString();
+ String viewName = "VIEW_" + generateUniqueName();
+ String viewIndexName = "VIDX_" + generateUniqueName();
String[] tableNames = new String[] { phoenixFullTableName, schemaName + "." + indexName,
schemaName + "." + localIndexName, "diff." + viewName, "test." + viewName, viewName};
@@ -275,19 +275,20 @@ public class UpgradeIT extends ParallelStatsDisabledIT {
public void testMapMultiTenantTableToNamespaceDuringUpgrade() throws SQLException, SnapshotCreationException,
IllegalArgumentException, IOException, InterruptedException {
String[] strings = new String[] { "a", "b", "c", "d" };
- String schemaName = "TEST";
- String phoenixFullTableName = schemaName + "." + generateRandomString();
+ String schemaName1 = "S_" +generateUniqueName(); // TEST
+ String schemaName2 = "S_" +generateUniqueName(); // DIFF
+ String phoenixFullTableName = schemaName1 + "." + generateUniqueName();
String hbaseTableName = SchemaUtil.getPhysicalTableName(Bytes.toBytes(phoenixFullTableName), true)
.getNameAsString();
- String indexName = "IDX_" + generateRandomString();
- String viewName = "V_" + generateRandomString();
- String viewName1 = "V1_" + generateRandomString();
- String viewIndexName = "V_IDX_" + generateRandomString();
- String tenantViewIndexName = "V1_IDX_" + generateRandomString();
-
- String[] tableNames = new String[] { phoenixFullTableName, "diff." + viewName1, "test." + viewName1, viewName1 };
- String[] viewIndexes = new String[] { "test." + viewIndexName, "diff." + viewIndexName };
- String[] tenantViewIndexes = new String[] { "test." + tenantViewIndexName, "diff." + tenantViewIndexName };
+ String indexName = "IDX_" + generateUniqueName();
+ String viewName = "V_" + generateUniqueName();
+ String viewName1 = "V1_" + generateUniqueName();
+ String viewIndexName = "V_IDX_" + generateUniqueName();
+ String tenantViewIndexName = "V1_IDX_" + generateUniqueName();
+
+ String[] tableNames = new String[] { phoenixFullTableName, schemaName2 + "." + viewName1, schemaName1 + "." + viewName1, viewName1 };
+ String[] viewIndexes = new String[] { schemaName1 + "." + viewIndexName, schemaName2 + "." + viewIndexName };
+ String[] tenantViewIndexes = new String[] { schemaName1 + "." + tenantViewIndexName, schemaName2 + "." + tenantViewIndexName };
try (Connection conn = DriverManager.getConnection(getUrl())) {
conn.createStatement().execute("CREATE TABLE " + phoenixFullTableName
+ "(k VARCHAR not null, v INTEGER not null, f INTEGER, g INTEGER NULL, h INTEGER NULL CONSTRAINT pk PRIMARY KEY(k,v)) MULTI_TENANT=true");
@@ -304,16 +305,16 @@ public class UpgradeIT extends ParallelStatsDisabledIT {
// creating global index
conn.createStatement().execute("create index " + indexName + " on " + phoenixFullTableName + "(f)");
// creating view in schema 'diff'
- conn.createStatement().execute("CREATE VIEW diff." + viewName + " (col VARCHAR) AS SELECT * FROM " + phoenixFullTableName);
+ conn.createStatement().execute("CREATE VIEW " + schemaName2 + "." + viewName + " (col VARCHAR) AS SELECT * FROM " + phoenixFullTableName);
// creating view in schema 'test'
- conn.createStatement().execute("CREATE VIEW test." + viewName + " (col VARCHAR) AS SELECT * FROM " + phoenixFullTableName);
+ conn.createStatement().execute("CREATE VIEW " + schemaName1 + "." + viewName + " (col VARCHAR) AS SELECT * FROM " + phoenixFullTableName);
conn.createStatement().execute("CREATE VIEW " + viewName + " (col VARCHAR) AS SELECT * FROM " + phoenixFullTableName);
// Creating index on views
- conn.createStatement().execute("create local index " + viewIndexName + " on diff." + viewName + "(col)");
- conn.createStatement().execute("create local index " + viewIndexName + " on test." + viewName + "(col)");
+ conn.createStatement().execute("create local index " + viewIndexName + " on " + schemaName2 + "." + viewName + "(col)");
+ conn.createStatement().execute("create local index " + viewIndexName + " on " + schemaName1 + "." + viewName + "(col)");
}
Properties props = new Properties();
- String tenantId = "a";
+ String tenantId = strings[0];
props.setProperty(PhoenixRuntime.TENANT_ID_ATTRIB, tenantId);
try (Connection conn = DriverManager.getConnection(getUrl(), props)) {
PreparedStatement upsertStmt = conn
@@ -327,14 +328,14 @@ public class UpgradeIT extends ParallelStatsDisabledIT {
conn.commit();
// creating view in schema 'diff'
conn.createStatement()
- .execute("CREATE VIEW diff." + viewName1 + " (col VARCHAR) AS SELECT * FROM " + phoenixFullTableName);
+ .execute("CREATE VIEW " + schemaName2 + "." + viewName1 + " (col VARCHAR) AS SELECT * FROM " + phoenixFullTableName);
// creating view in schema 'test'
conn.createStatement()
- .execute("CREATE VIEW test." + viewName1 + " (col VARCHAR) AS SELECT * FROM " + phoenixFullTableName);
+ .execute("CREATE VIEW " + schemaName1 + "." + viewName1 + " (col VARCHAR) AS SELECT * FROM " + phoenixFullTableName);
conn.createStatement().execute("CREATE VIEW " + viewName1 + " (col VARCHAR) AS SELECT * FROM " + phoenixFullTableName);
// Creating index on views
- conn.createStatement().execute("create index " + tenantViewIndexName + " on diff." + viewName1 + "(col)");
- conn.createStatement().execute("create index " + tenantViewIndexName + " on test." + viewName1 + "(col)");
+ conn.createStatement().execute("create index " + tenantViewIndexName + " on " + schemaName2 + "." + viewName1 + "(col)");
+ conn.createStatement().execute("create index " + tenantViewIndexName + " on " + schemaName1 + "." + viewName1 + "(col)");
}
props = new Properties();
@@ -393,18 +394,18 @@ public class UpgradeIT extends ParallelStatsDisabledIT {
@Test
public void testSettingBaseColumnCountForMultipleViewsOnTable() throws Exception {
- String baseSchema = "S_" + generateRandomString();
- String baseTable = "T_" + generateRandomString();
+ String baseSchema = "S_" + generateUniqueName();
+ String baseTable = "T_" + generateUniqueName();
String fullBaseTableName = SchemaUtil.getTableName(baseSchema, baseTable);
try (Connection conn = DriverManager.getConnection(getUrl())) {
String baseTableDDL = "CREATE TABLE " + fullBaseTableName + " (TENANT_ID VARCHAR NOT NULL, PK1 VARCHAR NOT NULL, V1 INTEGER, V2 INTEGER CONSTRAINT NAME_PK PRIMARY KEY(TENANT_ID, PK1)) MULTI_TENANT = true";
conn.createStatement().execute(baseTableDDL);
- String[] tenants = new String[] {"T_" + generateRandomString(), "T_" + generateRandomString()};
+ String[] tenants = new String[] {"T_" + generateUniqueName(), "T_" + generateUniqueName()};
Collections.sort(Arrays.asList(tenants));
- String[] tenantViews = new String[] {"V_" + generateRandomString(), "V_" + generateRandomString(), "V_" + generateRandomString()};
+ String[] tenantViews = new String[] {"V_" + generateUniqueName(), "V_" + generateUniqueName(), "V_" + generateUniqueName()};
Collections.sort(Arrays.asList(tenantViews));
- String[] globalViews = new String[] {"G_" + generateRandomString(), "G_" + generateRandomString(), "G_" + generateRandomString()};
+ String[] globalViews = new String[] {"G_" + generateUniqueName(), "G_" + generateUniqueName(), "G_" + generateUniqueName()};
Collections.sort(Arrays.asList(globalViews));
for (int i = 0; i < 2; i++) {
// Create views for tenants;
@@ -601,7 +602,7 @@ public class UpgradeIT extends ParallelStatsDisabledIT {
@Test
public void testUpgradeRequiredPreventsSQL() throws SQLException {
- String tableName = generateRandomString();
+ String tableName = generateUniqueName();
try (Connection conn = getConnection(false, null)) {
conn.createStatement().execute(
"CREATE TABLE " + tableName
@@ -617,7 +618,7 @@ public class UpgradeIT extends ParallelStatsDisabledIT {
conn.unwrap(PhoenixConnection.class), HConstants.LATEST_TIMESTAMP)) {
try {
phxConn.createStatement().execute(
- "CREATE TABLE " + generateRandomString()
+ "CREATE TABLE " + generateUniqueName()
+ " (k1 VARCHAR NOT NULL, k2 VARCHAR, CONSTRAINT PK PRIMARY KEY(K1,K2))");
fail("CREATE TABLE should have failed with UpgradeRequiredException");
} catch (UpgradeRequiredException expected) {
@@ -655,7 +656,7 @@ public class UpgradeIT extends ParallelStatsDisabledIT {
@Test
public void testUpgradingConnectionBypassesUpgradeRequiredCheck() throws Exception {
- String tableName = generateRandomString();
+ String tableName = generateUniqueName();
try (Connection conn = getConnection(false, null)) {
conn.createStatement()
.execute(
http://git-wip-us.apache.org/repos/asf/phoenix/blob/bebb5ced/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpsertBigValuesIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpsertBigValuesIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpsertBigValuesIT.java
index 132c0ae..0f97a94 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpsertBigValuesIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpsertBigValuesIT.java
@@ -39,7 +39,7 @@ public class UpsertBigValuesIT extends ParallelStatsDisabledIT {
public void testIntegerPK() throws Exception {
int[] testNumbers = {Integer.MIN_VALUE, Integer.MIN_VALUE + 1,
-2, -1, 0, 1, 2, Integer.MAX_VALUE - 1, Integer.MAX_VALUE};
- String tableName = generateRandomString();
+ String tableName = generateUniqueName();
ensureTableCreated(getUrl(), tableName,"PKIntValueTest");
Properties props = new Properties();
Connection conn = DriverManager.getConnection(getUrl(), props);
@@ -124,7 +124,7 @@ public class UpsertBigValuesIT extends ParallelStatsDisabledIT {
// NOTE: Due to how we parse negative long, -9223372036854775808L, the minimum value of
// bigint is not recognizable in the current version. As a result, we start with
// Long.MIN_VALUE+1 as the smallest value.
- String tableName = generateRandomString();
+ String tableName = generateUniqueName();
long[] testNumbers = {Long.MIN_VALUE+1 , Long.MIN_VALUE+2 ,
-2L, -1L, 0L, 1L, 2L, Long.MAX_VALUE-1, Long.MAX_VALUE};
ensureTableCreated(getUrl(), tableName, "PKBigIntValueTest" );
@@ -208,7 +208,7 @@ public class UpsertBigValuesIT extends ParallelStatsDisabledIT {
@Test
public void testIntegerKV() throws Exception {
- String tableName = generateRandomString();
+ String tableName = generateUniqueName();
int[] testNumbers = {Integer.MIN_VALUE, Integer.MIN_VALUE + 1,
-2, -1, 0, 1, 2, Integer.MAX_VALUE - 1, Integer.MAX_VALUE};
ensureTableCreated(getUrl(), tableName, "KVIntValueTest" );
@@ -292,7 +292,7 @@ public class UpsertBigValuesIT extends ParallelStatsDisabledIT {
// NOTE: Due to how we parse negative long, -9223372036854775808L, the minimum value of
// bigint is not recognizable in the current version. As a result, we start with
// Long.MIN_VALUE+1 as the smallest value.
- String tableName = generateRandomString();
+ String tableName = generateUniqueName();
long[] testNumbers = {Long.MIN_VALUE+1, Long.MIN_VALUE+2,
-2L, -1L, 0L, 1L, 2L, Long.MAX_VALUE-1, Long.MAX_VALUE};
ensureTableCreated(getUrl(), tableName, "KVBigIntValueTest" );
http://git-wip-us.apache.org/repos/asf/phoenix/blob/bebb5ced/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpsertSelectAutoCommitIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpsertSelectAutoCommitIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpsertSelectAutoCommitIT.java
index 3fbe5d7..37482de 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpsertSelectAutoCommitIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpsertSelectAutoCommitIT.java
@@ -47,7 +47,7 @@ public class UpsertSelectAutoCommitIT extends ParallelStatsDisabledIT {
Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
Connection conn = DriverManager.getConnection(getUrl(), props);
conn.setAutoCommit(true);
- String atable = generateRandomString();
+ String atable = generateUniqueName();
conn.createStatement().execute("CREATE TABLE " + atable
+ " (ORGANIZATION_ID CHAR(15) NOT NULL, ENTITY_ID CHAR(15) NOT NULL, A_STRING VARCHAR\n"
+
@@ -77,7 +77,7 @@ public class UpsertSelectAutoCommitIT extends ParallelStatsDisabledIT {
assertEquals(A_VALUE, rs.getString(2));
assertFalse(rs.next());
- String atable2 = generateRandomString();
+ String atable2 = generateUniqueName();
conn.createStatement().execute("CREATE TABLE " + atable2
+ " (ORGANIZATION_ID CHAR(15) NOT NULL, ENTITY_ID CHAR(15) NOT NULL, A_STRING VARCHAR\n"
+
@@ -98,7 +98,7 @@ public class UpsertSelectAutoCommitIT extends ParallelStatsDisabledIT {
@Test
public void testDynamicUpsertSelect() throws Exception {
Connection conn = DriverManager.getConnection(getUrl());
- String tableName = generateRandomString();
+ String tableName = generateUniqueName();
String cursorDDL = " CREATE TABLE IF NOT EXISTS " + tableName
+ " (ORGANIZATION_ID VARCHAR(15) NOT NULL, \n"
+ "QUERY_ID VARCHAR(15) NOT NULL, \n"
@@ -107,7 +107,7 @@ public class UpsertSelectAutoCommitIT extends ParallelStatsDisabledIT {
+ "SALT_BUCKETS = 4";
conn.createStatement().execute(cursorDDL);
- String tableName2 = generateRandomString();
+ String tableName2 = generateUniqueName();
String dataTableDDL = "CREATE TABLE IF NOT EXISTS " + tableName2 +
"(" +
"ORGANIZATION_ID CHAR(15) NOT NULL, " +
@@ -158,7 +158,7 @@ public class UpsertSelectAutoCommitIT extends ParallelStatsDisabledIT {
Connection conn = DriverManager.getConnection(getUrl(), props);
conn.setAutoCommit(true);
conn.createStatement().execute("CREATE SEQUENCE keys");
- String tableName = generateRandomString();
+ String tableName = generateUniqueName();
conn.createStatement().execute(
"CREATE TABLE " + tableName + " (pk INTEGER PRIMARY KEY, val INTEGER)");
http://git-wip-us.apache.org/repos/asf/phoenix/blob/bebb5ced/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpsertValuesIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpsertValuesIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpsertValuesIT.java
index 9725175..21ccbf4 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpsertValuesIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpsertValuesIT.java
@@ -471,7 +471,7 @@ public class UpsertValuesIT extends BaseClientManagedTimeIT {
props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts));
Connection conn = null;
PreparedStatement pstmt = null;
- String tableName = BaseTest.generateRandomString();
+ String tableName = BaseTest.generateUniqueName();
try {
conn = DriverManager.getConnection(getUrl(), props);
pstmt = conn.prepareStatement("create table " + tableName + " (k varchar primary key, v integer)");
[6/6] phoenix git commit: PHOENIX-3253 Make changes to tests to
support method level parallelization
Posted by ja...@apache.org.
PHOENIX-3253 Make changes to tests to support 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/bebb5ced
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/bebb5ced
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/bebb5ced
Branch: refs/heads/master
Commit: bebb5cedf761b132b78db675a19ede5849f6ea94
Parents: 16f0da3
Author: James Taylor <ja...@apache.org>
Authored: Thu Sep 22 17:16:43 2016 -0700
Committer: James Taylor <ja...@apache.org>
Committed: Thu Sep 22 17:16:43 2016 -0700
----------------------------------------------------------------------
.../StatisticsCollectionRunTrackerIT.java | 2 +-
.../phoenix/end2end/AbsFunctionEnd2EndIT.java | 2 +-
.../AlterMultiTenantTableWithViewsIT.java | 16 +-
.../apache/phoenix/end2end/AlterSessionIT.java | 2 +-
.../apache/phoenix/end2end/AlterTableIT.java | 10 +-
.../phoenix/end2end/AlterTableWithViewsIT.java | 16 +-
.../phoenix/end2end/AppendOnlySchemaIT.java | 22 +--
.../phoenix/end2end/ArithmeticQueryIT.java | 36 ++--
.../phoenix/end2end/ArrayAppendFunctionIT.java | 18 +-
.../phoenix/end2end/ArrayConcatFunctionIT.java | 16 +-
.../phoenix/end2end/ArrayFillFunctionIT.java | 12 +-
.../phoenix/end2end/ArrayPrependFunctionIT.java | 68 +++----
.../end2end/ArrayToStringFunctionIT.java | 22 +--
.../phoenix/end2end/ArraysWithNullsIT.java | 32 ++--
.../apache/phoenix/end2end/AutoCommitIT.java | 2 +-
.../phoenix/end2end/AutoPartitionViewsIT.java | 18 +-
.../end2end/BaseTenantSpecificTablesIT.java | 12 +-
.../end2end/BaseTenantSpecificViewIndexIT.java | 12 +-
.../org/apache/phoenix/end2end/BaseViewIT.java | 8 +-
.../apache/phoenix/end2end/BinaryRowKeyIT.java | 6 +-
.../phoenix/end2end/CSVCommonsLoaderIT.java | 20 +-
.../phoenix/end2end/CbrtFunctionEnd2EndIT.java | 4 +-
.../phoenix/end2end/CoalesceFunctionIT.java | 20 +-
.../end2end/ConvertTimezoneFunctionIT.java | 14 +-
.../org/apache/phoenix/end2end/DateTimeIT.java | 68 +++----
.../phoenix/end2end/DecodeFunctionIT.java | 12 +-
.../org/apache/phoenix/end2end/DeleteIT.java | 26 +--
.../phoenix/end2end/DisableLocalIndexIT.java | 2 +-
.../phoenix/end2end/DistinctPrefixFilterIT.java | 6 +-
.../apache/phoenix/end2end/DynamicFamilyIT.java | 4 +-
.../apache/phoenix/end2end/DynamicUpsertIT.java | 2 +-
.../phoenix/end2end/EncodeFunctionIT.java | 8 +-
.../phoenix/end2end/EvaluationOfORIT.java | 2 +-
.../phoenix/end2end/ExecuteStatementsIT.java | 6 +-
.../phoenix/end2end/ExpFunctionEnd2EndIT.java | 4 +-
.../phoenix/end2end/FirstValueFunctionIT.java | 14 +-
.../end2end/GetSetByteBitFunctionEnd2EndIT.java | 2 +-
.../apache/phoenix/end2end/GroupByCaseIT.java | 20 +-
.../apache/phoenix/end2end/HashJoinMoreIT.java | 12 +-
.../org/apache/phoenix/end2end/InListIT.java | 10 +-
.../apache/phoenix/end2end/IndexExtendedIT.java | 30 +--
.../apache/phoenix/end2end/InstrFunctionIT.java | 16 +-
.../org/apache/phoenix/end2end/IsNullIT.java | 6 +-
.../org/apache/phoenix/end2end/KeyOnlyIT.java | 2 +-
.../phoenix/end2end/LastValueFunctionIT.java | 22 +--
.../phoenix/end2end/LikeExpressionIT.java | 12 +-
.../phoenix/end2end/LnLogFunctionEnd2EndIT.java | 4 +-
.../apache/phoenix/end2end/MD5FunctionIT.java | 6 +-
.../org/apache/phoenix/end2end/MapReduceIT.java | 8 +-
.../phoenix/end2end/MappingTableDataTypeIT.java | 2 +-
.../end2end/MinMaxAggregateFunctionIT.java | 2 +-
.../phoenix/end2end/ModulusExpressionIT.java | 10 +-
.../phoenix/end2end/MultiCfQueryExecIT.java | 2 +-
.../end2end/NamespaceSchemaMappingIT.java | 2 +-
.../phoenix/end2end/NthValueFunctionIT.java | 22 +--
.../end2end/OctetLengthFunctionEnd2EndIT.java | 2 +-
.../org/apache/phoenix/end2end/OrderByIT.java | 16 +-
.../phoenix/end2end/ParallelIteratorsIT.java | 4 +-
.../apache/phoenix/end2end/PercentileIT.java | 15 +-
.../phoenix/end2end/PhoenixRuntimeIT.java | 18 +-
.../phoenix/end2end/PowerFunctionEnd2EndIT.java | 4 +-
.../apache/phoenix/end2end/PrimitiveTypeIT.java | 18 +-
.../org/apache/phoenix/end2end/QueryMoreIT.java | 8 +-
.../phoenix/end2end/QueryWithOffsetIT.java | 2 +-
.../apache/phoenix/end2end/RTrimFunctionIT.java | 2 +-
.../org/apache/phoenix/end2end/ReadOnlyIT.java | 2 +-
.../end2end/RegexpReplaceFunctionIT.java | 2 +-
.../phoenix/end2end/RegexpSplitFunctionIT.java | 2 +-
.../phoenix/end2end/RegexpSubstrFunctionIT.java | 2 +-
.../phoenix/end2end/ReverseFunctionIT.java | 2 +-
.../apache/phoenix/end2end/ReverseScanIT.java | 4 +-
.../phoenix/end2end/RoundFloorCeilFuncIT.java | 2 +-
.../phoenix/end2end/SerialIteratorsIT.java | 2 +-
.../phoenix/end2end/ServerExceptionIT.java | 2 +-
.../phoenix/end2end/SignFunctionEnd2EndIT.java | 4 +-
.../end2end/SkipScanAfterManualSplitIT.java | 6 +-
.../apache/phoenix/end2end/SkipScanQueryIT.java | 22 +--
.../phoenix/end2end/SortMergeJoinMoreIT.java | 20 +-
.../org/apache/phoenix/end2end/SortOrderIT.java | 88 ++++-----
.../phoenix/end2end/SpooledTmpFileDeleteIT.java | 2 +-
.../phoenix/end2end/SqrtFunctionEnd2EndIT.java | 4 +-
.../phoenix/end2end/StatementHintsIT.java | 2 +-
.../phoenix/end2end/StatsCollectorIT.java | 4 +-
.../apache/phoenix/end2end/StoreNullsIT.java | 8 +-
.../org/apache/phoenix/end2end/StringIT.java | 10 +-
.../end2end/StringToArrayFunctionIT.java | 14 +-
.../apache/phoenix/end2end/TenantIdTypeIT.java | 2 +-
.../end2end/TenantSpecificTablesDDLIT.java | 30 +--
.../end2end/TenantSpecificTablesDMLIT.java | 2 +-
.../end2end/TenantSpecificViewIndexIT.java | 8 +-
.../end2end/TimezoneOffsetFunctionIT.java | 14 +-
.../phoenix/end2end/ToCharFunctionIT.java | 6 +-
.../phoenix/end2end/ToDateFunctionIT.java | 2 +-
.../phoenix/end2end/TransactionalViewIT.java | 4 +-
.../org/apache/phoenix/end2end/UnionAllIT.java | 80 ++++----
.../org/apache/phoenix/end2end/UpgradeIT.java | 89 ++++-----
.../phoenix/end2end/UpsertBigValuesIT.java | 8 +-
.../end2end/UpsertSelectAutoCommitIT.java | 10 +-
.../apache/phoenix/end2end/UpsertValuesIT.java | 2 +-
.../org/apache/phoenix/end2end/UseSchemaIT.java | 16 +-
.../java/org/apache/phoenix/end2end/ViewIT.java | 76 ++++----
.../end2end/index/AsyncIndexDisabledIT.java | 4 +-
.../index/ChildViewsUseParentViewIndexIT.java | 20 +-
.../phoenix/end2end/index/DropMetadataIT.java | 14 +-
.../index/GlobalIndexOptimizationIT.java | 28 +--
.../phoenix/end2end/index/ImmutableIndexIT.java | 18 +-
.../index/ImmutableIndexWithStatsIT.java | 4 +-
.../end2end/index/IndexExpressionIT.java | 87 ++++-----
.../apache/phoenix/end2end/index/IndexIT.java | 84 ++++-----
.../phoenix/end2end/index/IndexMetadataIT.java | 35 ++--
.../phoenix/end2end/index/LocalIndexIT.java | 70 +++----
.../phoenix/end2end/index/MutableIndexIT.java | 38 ++--
.../phoenix/end2end/index/SaltedIndexIT.java | 12 +-
.../phoenix/end2end/index/ViewIndexIT.java | 22 +--
.../end2end/index/txn/MutableRollbackIT.java | 28 +--
.../phoenix/end2end/index/txn/RollbackIT.java | 8 +-
.../salted/SaltedTableUpsertSelectIT.java | 22 +--
.../salted/SaltedTableVarLengthRowKeyIT.java | 2 +-
.../phoenix/iterate/PhoenixQueryTimeoutIT.java | 2 +-
.../iterate/RoundRobinResultIteratorIT.java | 10 +-
.../org/apache/phoenix/rpc/UpdateCacheIT.java | 26 +--
.../phoenix/rpc/UpdateCacheWithScnIT.java | 3 +-
.../trace/PhoenixTableMetricsWriterIT.java | 4 +-
.../phoenix/trace/PhoenixTraceReaderIT.java | 4 +-
.../phoenix/trace/PhoenixTracingEndToEndIT.java | 6 +-
.../phoenix/tx/NotThreadSafeTransactionIT.java | 163 ++++++++++++++++
.../org/apache/phoenix/tx/TransactionIT.java | 189 ++++---------------
.../org/apache/phoenix/tx/TxCheckpointIT.java | 22 +--
.../java/org/apache/phoenix/query/BaseTest.java | 36 ++--
.../java/org/apache/phoenix/util/TestUtil.java | 29 ++-
.../org/apache/phoenix/flume/PhoenixSinkIT.java | 4 +-
.../phoenix/flume/RegexEventSerializerIT.java | 12 +-
132 files changed, 1228 insertions(+), 1154 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/phoenix/blob/bebb5ced/phoenix-core/src/it/java/org/apache/phoenix/coprocessor/StatisticsCollectionRunTrackerIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/coprocessor/StatisticsCollectionRunTrackerIT.java b/phoenix-core/src/it/java/org/apache/phoenix/coprocessor/StatisticsCollectionRunTrackerIT.java
index bd88922..759ad4f 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/coprocessor/StatisticsCollectionRunTrackerIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/coprocessor/StatisticsCollectionRunTrackerIT.java
@@ -65,7 +65,7 @@ public class StatisticsCollectionRunTrackerIT extends ParallelStatsEnabledIT {
@Before
public void generateTableNames() {
String schemaName = TestUtil.DEFAULT_SCHEMA_NAME;
- String tableName = "T_" + generateRandomString();
+ String tableName = "T_" + generateUniqueName();
fullTableName = SchemaUtil.getTableName(schemaName, tableName);
}
http://git-wip-us.apache.org/repos/asf/phoenix/blob/bebb5ced/phoenix-core/src/it/java/org/apache/phoenix/end2end/AbsFunctionEnd2EndIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/AbsFunctionEnd2EndIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/AbsFunctionEnd2EndIT.java
index c70bed2..8447286 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/AbsFunctionEnd2EndIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/AbsFunctionEnd2EndIT.java
@@ -36,7 +36,7 @@ import org.junit.Test;
*/
public class AbsFunctionEnd2EndIT extends ParallelStatsDisabledIT {
- private static final String TABLE_NAME = generateRandomString();
+ private static final String TABLE_NAME = generateUniqueName();
private static final String KEY = "key";
@Before
http://git-wip-us.apache.org/repos/asf/phoenix/blob/bebb5ced/phoenix-core/src/it/java/org/apache/phoenix/end2end/AlterMultiTenantTableWithViewsIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/AlterMultiTenantTableWithViewsIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/AlterMultiTenantTableWithViewsIT.java
index 7a4e391..adadca7 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/AlterMultiTenantTableWithViewsIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/AlterMultiTenantTableWithViewsIT.java
@@ -85,7 +85,7 @@ public class AlterMultiTenantTableWithViewsIT extends ParallelStatsDisabledIT {
@Test
public void testAddDropColumnToBaseTablePropagatesToEntireViewHierarchy() throws Exception {
String baseTable = "testViewHierarchy";
- String baseViewName = generateRandomString();
+ String baseViewName = generateUniqueName();
String view1 = baseViewName + "_VIEW1";
String view2 = baseViewName + "_VIEW2";
String view3 = baseViewName + "_VIEW3";
@@ -171,7 +171,7 @@ public class AlterMultiTenantTableWithViewsIT extends ParallelStatsDisabledIT {
@Test
public void testChangingPKOfBaseTableChangesPKForAllViews() throws Exception {
String baseTable = "testChangePKOfBaseTable";
- String baseViewName = generateRandomString();
+ String baseViewName = generateUniqueName();
String view1 = baseViewName + "_VIEW1";
String view2 = baseViewName + "_VIEW2";
String view3 = baseViewName + "_VIEW3";
@@ -269,7 +269,7 @@ public class AlterMultiTenantTableWithViewsIT extends ParallelStatsDisabledIT {
@Test
public void testAddPKColumnToBaseTableWhoseViewsHaveIndices() throws Exception {
String baseTable = "testAddPKColumnToBaseTableWhoseViewsHaveIndices";
- String baseViewName = generateRandomString();
+ String baseViewName = generateUniqueName();
String view1 = baseViewName + "_VIEW1";
String view2 = baseViewName + "_VIEW2";
String view3 = baseViewName + "_VIEW3";
@@ -410,8 +410,8 @@ public class AlterMultiTenantTableWithViewsIT extends ParallelStatsDisabledIT {
@Test
public void testAddingPkAndKeyValueColumnsToBaseTableWithDivergedView() throws Exception {
String baseTable = "testAlteringPkOfBaseTableWithDivergedView".toUpperCase();
- String view1 = generateRandomString();
- String divergedView = generateRandomString();
+ String view1 = generateUniqueName();
+ String divergedView = generateUniqueName();
String divergedViewIndex = divergedView + "_IDX";
/* baseTable
/ |
@@ -490,7 +490,7 @@ public class AlterMultiTenantTableWithViewsIT extends ParallelStatsDisabledIT {
@Test
public void testAddColumnsToSaltedBaseTableWithViews() throws Exception {
String baseTable = "testAddColumnsToSaltedBaseTableWithViews".toUpperCase();
- String view1 = generateRandomString();
+ String view1 = generateUniqueName();
try (Connection conn = DriverManager.getConnection(getUrl())) {
String baseTableDDL = "CREATE TABLE " + baseTable + " (TENANT_ID VARCHAR NOT NULL, PK1 VARCHAR NOT NULL, V1 VARCHAR, V2 VARCHAR, V3 VARCHAR CONSTRAINT NAME_PK PRIMARY KEY(TENANT_ID, PK1)) MULTI_TENANT = true ";
conn.createStatement().execute(baseTableDDL);
@@ -520,7 +520,7 @@ public class AlterMultiTenantTableWithViewsIT extends ParallelStatsDisabledIT {
@Test
public void testDropColumnsFromSaltedBaseTableWithViews() throws Exception {
String baseTable = "testDropColumnsFromSaltedBaseTableWithViews".toUpperCase();
- String view1 = generateRandomString();
+ String view1 = generateUniqueName();
try (Connection conn = DriverManager.getConnection(getUrl())) {
String baseTableDDL = "CREATE TABLE " + baseTable + " (TENANT_ID VARCHAR NOT NULL, PK1 VARCHAR NOT NULL, V1 VARCHAR, V2 VARCHAR, V3 VARCHAR CONSTRAINT NAME_PK PRIMARY KEY(TENANT_ID, PK1)) MULTI_TENANT = true ";
conn.createStatement().execute(baseTableDDL);
@@ -560,7 +560,7 @@ public class AlterMultiTenantTableWithViewsIT extends ParallelStatsDisabledIT {
@Test
public void testAlteringViewConditionallyModifiesHTableMetadata() throws Exception {
String baseTable = "testAlteringViewConditionallyModifiesBaseTable".toUpperCase();
- String view1 = generateRandomString();
+ String view1 = generateUniqueName();
try (Connection conn = DriverManager.getConnection(getUrl())) {
String baseTableDDL = "CREATE TABLE " + baseTable + " (TENANT_ID VARCHAR NOT NULL, PK1 VARCHAR NOT NULL, V1 VARCHAR, V2 VARCHAR, V3 VARCHAR CONSTRAINT NAME_PK PRIMARY KEY(TENANT_ID, PK1)) MULTI_TENANT = true ";
conn.createStatement().execute(baseTableDDL);
http://git-wip-us.apache.org/repos/asf/phoenix/blob/bebb5ced/phoenix-core/src/it/java/org/apache/phoenix/end2end/AlterSessionIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/AlterSessionIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/AlterSessionIT.java
index 6e0cdd5..ffd9656 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/AlterSessionIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/AlterSessionIT.java
@@ -42,7 +42,7 @@ import static org.junit.Assert.assertTrue;
*/
public class AlterSessionIT extends ParallelStatsDisabledIT {
- private static final String TABLE_NAME = generateRandomString();
+ private static final String TABLE_NAME = generateUniqueName();
private static Connection testConn;
@BeforeClass
http://git-wip-us.apache.org/repos/asf/phoenix/blob/bebb5ced/phoenix-core/src/it/java/org/apache/phoenix/end2end/AlterTableIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/AlterTableIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/AlterTableIT.java
index 2634335..031fd5c 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/AlterTableIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/AlterTableIT.java
@@ -83,9 +83,9 @@ public class AlterTableIT extends ParallelStatsDisabledIT {
@Before
public void setupTableNames() throws Exception {
schemaName = "";
- dataTableName = generateRandomString();
- indexTableName = "I_" + generateRandomString();
- localIndexTableName = "LI_" + generateRandomString();
+ dataTableName = generateUniqueName();
+ indexTableName = "I_" + generateUniqueName();
+ localIndexTableName = "LI_" + generateUniqueName();
dataTableFullName = SchemaUtil.getTableName(schemaName, dataTableName);
indexTableFullName = SchemaUtil.getTableName(schemaName, indexTableName);
localIndexTableFullName = SchemaUtil.getTableName(schemaName, localIndexTableName);
@@ -1364,7 +1364,7 @@ public class AlterTableIT extends ParallelStatsDisabledIT {
+"CONSTRAINT PK PRIMARY KEY (ID1, ID2)) SALT_BUCKETS = 8";
Connection conn1 = DriverManager.getConnection(getUrl(), props);
conn1.createStatement().execute(ddl);
- String viewFullName = SchemaUtil.getTableName(schemaName, generateRandomString());
+ String viewFullName = SchemaUtil.getTableName(schemaName, generateUniqueName());
ddl = "CREATE VIEW " + viewFullName + " AS SELECT * FROM " + dataTableFullName + " WHERE CREATION_TIME = 1";
conn1.createStatement().execute(ddl);
ddl = "ALTER VIEW " + viewFullName + " SET IMMUTABLE_ROWS = TRUE";
@@ -2170,7 +2170,7 @@ public class AlterTableIT extends ParallelStatsDisabledIT {
assertFalse(table.getColumn("PK2").isRowTimestamp());
assertIsRowTimestampSet(schemaName, dataTableName, "PK1");
- String dataTableName2 = BaseTest.generateRandomString();
+ String dataTableName2 = BaseTest.generateUniqueName();
String dataTableFullName2 = SchemaUtil.getTableName(schemaName, dataTableName2);
conn.createStatement().execute("CREATE TABLE " + dataTableFullName2 + " (PK1 VARCHAR, PK2 DATE PRIMARY KEY ROW_TIMESTAMP, KV1 VARCHAR, KV2 INTEGER)");
table = phxConn.getTable(new PTableKey(phxConn.getTenantId(), dataTableFullName2));
http://git-wip-us.apache.org/repos/asf/phoenix/blob/bebb5ced/phoenix-core/src/it/java/org/apache/phoenix/end2end/AlterTableWithViewsIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/AlterTableWithViewsIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/AlterTableWithViewsIT.java
index 64627f1..c9e2f26 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/AlterTableWithViewsIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/AlterTableWithViewsIT.java
@@ -89,7 +89,7 @@ public class AlterTableWithViewsIT extends ParallelStatsDisabledIT {
public void testAddNewColumnsToBaseTableWithViews() throws Exception {
try (Connection conn = DriverManager.getConnection(getUrl());
Connection viewConn = isMultiTenant ? DriverManager.getConnection(TENANT_SPECIFIC_URL1) : conn ) {
- String tableName = generateRandomString();
+ String tableName = generateUniqueName();
String viewOfTable = tableName + "_VIEW";
String ddlFormat = "CREATE TABLE IF NOT EXISTS " + tableName + " ("
+ " %s ID char(1) NOT NULL,"
@@ -114,7 +114,7 @@ public class AlterTableWithViewsIT extends ParallelStatsDisabledIT {
public void testDropColumnsFromBaseTableWithView() throws Exception {
try (Connection conn = DriverManager.getConnection(getUrl());
Connection viewConn = isMultiTenant ? DriverManager.getConnection(TENANT_SPECIFIC_URL1) : conn ) {
- String tableName = generateRandomString();
+ String tableName = generateUniqueName();
String viewOfTable = tableName + "_VIEW";
String ddlFormat = "CREATE TABLE IF NOT EXISTS " + tableName + " (" + " %s ID char(1) NOT NULL,"
+ " COL1 integer NOT NULL," + " COL2 bigint NOT NULL,"
@@ -146,7 +146,7 @@ public class AlterTableWithViewsIT extends ParallelStatsDisabledIT {
Connection viewConn = isMultiTenant ? DriverManager.getConnection(TENANT_SPECIFIC_URL1) : conn ) {
conn.setAutoCommit(false);
viewConn.setAutoCommit(false);
- String tableName = generateRandomString();
+ String tableName = generateUniqueName();
String viewOfTable = tableName + "_VIEW";
String ddlFormat = "CREATE TABLE IF NOT EXISTS " + tableName + " ("
@@ -253,7 +253,7 @@ public class AlterTableWithViewsIT extends ParallelStatsDisabledIT {
Connection viewConn = isMultiTenant ? DriverManager.getConnection(TENANT_SPECIFIC_URL1) : conn ) {
conn.setAutoCommit(false);
viewConn.setAutoCommit(false);
- String tableName = generateRandomString();
+ String tableName = generateUniqueName();
String viewOfTable = tableName + "_VIEW";
String ddlFormat = "CREATE TABLE IF NOT EXISTS " + tableName + " ("
@@ -364,7 +364,7 @@ public class AlterTableWithViewsIT extends ParallelStatsDisabledIT {
public void testAddExistingViewPkColumnToBaseTableWithMultipleViews() throws Exception {
try (Connection conn = DriverManager.getConnection(getUrl());
Connection viewConn = isMultiTenant ? DriverManager.getConnection(TENANT_SPECIFIC_URL1) : conn ) {
- String tableName = generateRandomString();
+ String tableName = generateUniqueName();
String viewOfTable1 = tableName + "_VIEW1";
String viewOfTable2 = tableName + "_VIEW2";
String ddlFormat = "CREATE TABLE IF NOT EXISTS " + tableName + "("
@@ -428,7 +428,7 @@ public class AlterTableWithViewsIT extends ParallelStatsDisabledIT {
conn.setAutoCommit(false);
viewConn.setAutoCommit(false);
viewConn2.setAutoCommit(false);
- String tableName = generateRandomString();
+ String tableName = generateUniqueName();
String viewOfTable1 = tableName + "_VIEW1";
String viewOfTable2 = tableName + "_VIEW2";
String ddlFormat = "CREATE TABLE IF NOT EXISTS " + tableName + "("
@@ -618,7 +618,7 @@ public class AlterTableWithViewsIT extends ParallelStatsDisabledIT {
@Test
public void testDivergedViewsStayDiverged() throws Exception {
- String baseTable = generateRandomString();
+ String baseTable = generateUniqueName();
String view1 = baseTable + "_VIEW1";
String view2 = baseTable + "_VIEW2";
try (Connection conn = DriverManager.getConnection(getUrl());
@@ -661,7 +661,7 @@ public class AlterTableWithViewsIT extends ParallelStatsDisabledIT {
public void testMakeBaseTableTransactional() throws Exception {
try (Connection conn = DriverManager.getConnection(getUrl());
Connection viewConn = isMultiTenant ? DriverManager.getConnection(TENANT_SPECIFIC_URL1) : conn ) {
- String baseTableName = "NONTXNTBL_" + generateRandomString() + (isMultiTenant ? "0":"1");
+ String baseTableName = "NONTXNTBL_" + generateUniqueName() + (isMultiTenant ? "0":"1");
String viewOfTable = baseTableName + "_VIEW";
String ddlFormat = "CREATE TABLE IF NOT EXISTS " + baseTableName + " ("
+ " %s ID char(1) NOT NULL,"
http://git-wip-us.apache.org/repos/asf/phoenix/blob/bebb5ced/phoenix-core/src/it/java/org/apache/phoenix/end2end/AppendOnlySchemaIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/AppendOnlySchemaIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/AppendOnlySchemaIT.java
index 1aedc0d..ed9fa74 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/AppendOnlySchemaIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/AppendOnlySchemaIT.java
@@ -75,9 +75,9 @@ public class AppendOnlySchemaIT extends ParallelStatsDisabledIT {
try (Connection conn1 = connectionQueryServices.connect(getUrl(), props);
Connection conn2 = sameClient ? conn1 : connectionQueryServices.connect(getUrl(), props)) {
- String metricTableName = generateRandomString();
- String viewName = generateRandomString();
- String metricIdSeqTableName = generateRandomString();
+ String metricTableName = generateUniqueName();
+ String viewName = generateUniqueName();
+ String metricIdSeqTableName = generateUniqueName();
// create sequence for auto partition
conn1.createStatement().execute("CREATE SEQUENCE " + metricIdSeqTableName + " CACHE 1");
// create base table
@@ -186,9 +186,9 @@ public class AppendOnlySchemaIT extends ParallelStatsDisabledIT {
try (Connection conn1 = DriverManager.getConnection(getUrl(), props);
Connection conn2 = sameClient ? conn1 : DriverManager.getConnection(getUrl(), props)) {
- String metricTableName = generateRandomString();
- String viewName = generateRandomString();
- String metricIdSeqTableName = generateRandomString();
+ String metricTableName = generateUniqueName();
+ String viewName = generateUniqueName();
+ String metricIdSeqTableName = generateUniqueName();
// create sequence for auto partition
conn1.createStatement().execute("CREATE SEQUENCE " + metricIdSeqTableName + " CACHE 1");
@@ -289,8 +289,8 @@ public class AppendOnlySchemaIT extends ParallelStatsDisabledIT {
public void testValidateAttributes() throws Exception {
Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
try (Connection conn = DriverManager.getConnection(getUrl(), props)) {
- String tableName = generateRandomString();
- String viewName = generateRandomString();
+ String tableName = generateUniqueName();
+ String viewName = generateUniqueName();
try {
conn.createStatement().execute(
"create table IF NOT EXISTS " + tableName + " ( id char(1) NOT NULL,"
@@ -326,9 +326,9 @@ public class AppendOnlySchemaIT extends ParallelStatsDisabledIT {
Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
try (Connection conn1 = DriverManager.getConnection(getUrl(), props);
Connection conn2 = DriverManager.getConnection(getUrl(), props)) {
- String metricTableName = generateRandomString();
- String viewName = generateRandomString();
- String metricIdSeqTableName = generateRandomString();
+ String metricTableName = generateUniqueName();
+ String viewName = generateUniqueName();
+ String metricIdSeqTableName = generateUniqueName();
// create sequence for auto partition
conn1.createStatement().execute("CREATE SEQUENCE " + metricIdSeqTableName + " CACHE 1");
// create base table
http://git-wip-us.apache.org/repos/asf/phoenix/blob/bebb5ced/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArithmeticQueryIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArithmeticQueryIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArithmeticQueryIT.java
index 87fdee6..5ad356b 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArithmeticQueryIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArithmeticQueryIT.java
@@ -48,7 +48,7 @@ public class ArithmeticQueryIT extends ParallelStatsDisabledIT {
Connection conn = DriverManager.getConnection(getUrl(), props);
conn.setAutoCommit(false);
try {
- String testDecimalArithmetic = generateRandomString();
+ String testDecimalArithmetic = generateUniqueName();
String ddl = "CREATE TABLE " + testDecimalArithmetic +
" (pk VARCHAR NOT NULL PRIMARY KEY, " +
"col1 DECIMAL(31,0), col2 DECIMAL(5), col3 DECIMAL(5,2), col4 DECIMAL)";
@@ -139,11 +139,11 @@ public class ArithmeticQueryIT extends ParallelStatsDisabledIT {
Connection conn = DriverManager.getConnection(getUrl(), props);
conn.setAutoCommit(false);
try {
- String source = generateRandomString();
+ String source = generateUniqueName();
String ddl = "CREATE TABLE " + source +
" (pk VARCHAR NOT NULL PRIMARY KEY, col1 DECIMAL(5,2), col2 DECIMAL(5,1), col3 DECIMAL(5,2), col4 DECIMAL(4,4))";
createTestTable(getUrl(), ddl);
- String target = generateRandomString();
+ String target = generateUniqueName();
ddl = "CREATE TABLE " + target +
" (pk VARCHAR NOT NULL PRIMARY KEY, col1 DECIMAL(5,1), col2 DECIMAL(5,2), col3 DECIMAL(4,4))";
createTestTable(getUrl(), ddl);
@@ -249,7 +249,7 @@ public class ArithmeticQueryIT extends ParallelStatsDisabledIT {
Connection conn = DriverManager.getConnection(getUrl(), props);
conn.setAutoCommit(false);
try {
- String testDecimalArithmetic = generateRandomString();
+ String testDecimalArithmetic = generateUniqueName();
String ddl = "CREATE TABLE " + testDecimalArithmetic +
" (pk VARCHAR NOT NULL PRIMARY KEY, col1 DECIMAL(31, 11), col2 DECIMAL(31,1), col3 DECIMAL(38,1))";
createTestTable(getUrl(), ddl);
@@ -311,7 +311,7 @@ public class ArithmeticQueryIT extends ParallelStatsDisabledIT {
Connection conn = DriverManager.getConnection(getUrl(), props);
conn.setAutoCommit(false);
try {
- String testRandomFunction = generateRandomString();
+ String testRandomFunction = generateUniqueName();
String ddl =
"CREATE TABLE " + testRandomFunction + " (pk VARCHAR NOT NULL PRIMARY KEY)";
createTestTable(getUrl(), ddl);
@@ -368,7 +368,7 @@ public class ArithmeticQueryIT extends ParallelStatsDisabledIT {
assertTrue(rs.next());
assertTrue(rand12 == rs.getDouble(3));
- String testRandomFunction1 = generateRandomString();
+ String testRandomFunction1 = generateUniqueName();
ddl = "CREATE TABLE " + testRandomFunction1
+ " (pk VARCHAR NOT NULL PRIMARY KEY, v1 UNSIGNED_DOUBLE)";
createTestTable(getUrl(), ddl);
@@ -427,7 +427,7 @@ public class ArithmeticQueryIT extends ParallelStatsDisabledIT {
Connection conn = DriverManager.getConnection(getUrl(), props);
conn.setAutoCommit(false);
try {
- String testDecimalArithmetic = generateRandomString();
+ String testDecimalArithmetic = generateUniqueName();
String ddl = "CREATE TABLE " + testDecimalArithmetic +
" (pk VARCHAR NOT NULL PRIMARY KEY, " +
"col1 DECIMAL(38,0), col2 DECIMAL(5, 2), col3 INTEGER, col4 BIGINT, col5 DECIMAL)";
@@ -656,7 +656,7 @@ public class ArithmeticQueryIT extends ParallelStatsDisabledIT {
}
@Test
public void testSumDouble() throws Exception {
- String tableName = "TBL_" + generateRandomString();
+ String tableName = "TBL_" + generateUniqueName();
initSumDoubleValues(tableName, null, getUrl());
String query = "SELECT SUM(d) FROM " + tableName ;
Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
@@ -674,7 +674,7 @@ public class ArithmeticQueryIT extends ParallelStatsDisabledIT {
@Test
public void testSumUnsignedDouble() throws Exception {
- String tableName = "TBL_" + generateRandomString();
+ String tableName = "TBL_" + generateUniqueName();
initSumDoubleValues(tableName, null, getUrl());
String query = "SELECT SUM(ud) FROM " + tableName ;
Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
@@ -692,7 +692,7 @@ public class ArithmeticQueryIT extends ParallelStatsDisabledIT {
@Test
public void testSumFloat() throws Exception {
- String tableName = "TBL_" + generateRandomString();
+ String tableName = "TBL_" + generateUniqueName();
initSumDoubleValues(tableName, null, getUrl());
String query = "SELECT SUM(f) FROM " + tableName ;
Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
@@ -710,7 +710,7 @@ public class ArithmeticQueryIT extends ParallelStatsDisabledIT {
@Test
public void testSumUnsignedFloat() throws Exception {
- String tableName = "TBL_" + generateRandomString();
+ String tableName = "TBL_" + generateUniqueName();
initSumDoubleValues(tableName, null, getUrl());
String query = "SELECT SUM(uf) FROM " + tableName;
Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
@@ -727,7 +727,7 @@ public class ArithmeticQueryIT extends ParallelStatsDisabledIT {
}
private String initIntegerTable(Connection conn) throws SQLException {
- String arithmetic_test = generateRandomString();
+ String arithmetic_test = generateUniqueName();
String ddl = "CREATE TABLE " + arithmetic_test
+ " (six INTEGER PRIMARY KEY, four INTEGER, three INTEGER)";
conn.createStatement().execute(ddl);
@@ -970,7 +970,7 @@ public class ArithmeticQueryIT extends ParallelStatsDisabledIT {
@Test
public void testCastingOnConstantAddInArithmeticEvaluation() throws Exception {
Connection conn = DriverManager.getConnection(getUrl());
- String testTable = generateRandomString();
+ String testTable = generateUniqueName();
String ddl = "CREATE TABLE IF NOT EXISTS " + testTable
+ " (k1 INTEGER NOT NULL, v1 INTEGER CONSTRAINT pk PRIMARY KEY (k1))";
conn.createStatement().execute(ddl);
@@ -988,7 +988,7 @@ public class ArithmeticQueryIT extends ParallelStatsDisabledIT {
@Test
public void testCastingOnConstantSubInArithmeticEvaluation() throws Exception {
Connection conn = DriverManager.getConnection(getUrl());
- String testTable = generateRandomString();
+ String testTable = generateUniqueName();
String ddl = "CREATE TABLE IF NOT EXISTS " + testTable
+ " (k1 INTEGER NOT NULL, v1 INTEGER CONSTRAINT pk PRIMARY KEY (k1))";
conn.createStatement().execute(ddl);
@@ -1005,7 +1005,7 @@ public class ArithmeticQueryIT extends ParallelStatsDisabledIT {
@Test
public void testFloatingPointUpsert() throws Exception {
Connection conn = DriverManager.getConnection(getUrl());
- String test = generateRandomString();
+ String test = generateUniqueName();
String ddl =
"CREATE TABLE " + test + " (id VARCHAR not null primary key, name VARCHAR, lat FLOAT)";
conn.createStatement().execute(ddl);
@@ -1021,7 +1021,7 @@ public class ArithmeticQueryIT extends ParallelStatsDisabledIT {
@Test
public void testFloatingPointMultiplicationUpsert() throws Exception {
Connection conn = DriverManager.getConnection(getUrl());
- String test = generateRandomString();
+ String test = generateUniqueName();
String ddl =
"CREATE TABLE " + test + " (id VARCHAR not null primary key, name VARCHAR, lat FLOAT)";
conn.createStatement().execute(ddl);
@@ -1038,7 +1038,7 @@ public class ArithmeticQueryIT extends ParallelStatsDisabledIT {
@Test
public void testSystemTableHasDoubleForExponentialNumber() throws Exception {
Connection conn = DriverManager.getConnection(getUrl());
- String test = generateRandomString();
+ String test = generateUniqueName();
String ddl = "CREATE TABLE " + test + " (id VARCHAR not null primary key, num FLOAT)";
conn.createStatement().execute(ddl);
String dml = "UPSERT INTO " + test + "(id,num) VALUES ('testid', 1.2E3)";
@@ -1072,7 +1072,7 @@ public class ArithmeticQueryIT extends ParallelStatsDisabledIT {
private ResultSet createTableWithValues(String[] values, String valueType) throws SQLException {
Connection conn = DriverManager.getConnection(getUrl());
- String test = generateRandomString();
+ String test = generateUniqueName();
StringBuilder ddl = new StringBuilder(
"CREATE TABLE " + test + " (id VARCHAR not null primary key");
StringBuilder dmll = new StringBuilder("UPSERT INTO " + test + "(id,");
http://git-wip-us.apache.org/repos/asf/phoenix/blob/bebb5ced/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArrayAppendFunctionIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArrayAppendFunctionIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArrayAppendFunctionIT.java
index de42af1..e83b395 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArrayAppendFunctionIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArrayAppendFunctionIT.java
@@ -28,7 +28,7 @@ import org.junit.Test;
public class ArrayAppendFunctionIT extends ParallelStatsDisabledIT {
private String initTables(Connection conn) throws Exception {
- String tableName = generateRandomString();
+ String tableName = generateUniqueName();
String ddl = "CREATE TABLE " + tableName + " (region_name VARCHAR PRIMARY KEY,varchars VARCHAR[],integers INTEGER[],doubles DOUBLE[],bigints BIGINT[],chars CHAR(15)[],double1 DOUBLE,char1 CHAR(17),nullcheck INTEGER,chars2 CHAR(15)[])";
conn.createStatement().execute(ddl);
String dml = "UPSERT INTO " + tableName + "(region_name,varchars,integers,doubles,bigints,chars,double1,char1,nullcheck,chars2) VALUES('SF Bay Area'," +
@@ -49,7 +49,7 @@ public class ArrayAppendFunctionIT extends ParallelStatsDisabledIT {
}
private String initTablesDesc(Connection conn, String type, String val) throws Exception {
- String tableName = generateRandomString();
+ String tableName = generateUniqueName();
String ddl = "CREATE TABLE " + tableName + " (pk " + type + " PRIMARY KEY DESC,varchars VARCHAR[],integers INTEGER[],doubles DOUBLE[],bigints BIGINT[],chars CHAR(15)[],chars2 CHAR(15)[], bools BOOLEAN[])";
conn.createStatement().execute(ddl);
String dml = "UPSERT INTO " + tableName + "(pk,varchars,integers,doubles,bigints,chars,chars2,bools) VALUES(" + val + "," +
@@ -268,7 +268,7 @@ public class ArrayAppendFunctionIT extends ParallelStatsDisabledIT {
@Test
public void testArrayAppendFunctionWithUpsert1() throws Exception {
Connection conn = DriverManager.getConnection(getUrl());
- String tableName = generateRandomString();
+ String tableName = generateUniqueName();
String ddl = "CREATE TABLE " + tableName + " (region_name VARCHAR PRIMARY KEY,varchars VARCHAR[])";
conn.createStatement().execute(ddl);
@@ -292,7 +292,7 @@ public class ArrayAppendFunctionIT extends ParallelStatsDisabledIT {
public void testArrayAppendFunctionWithUpsert2() throws Exception {
Connection conn = DriverManager.getConnection(getUrl());
- String tableName = generateRandomString();
+ String tableName = generateUniqueName();
String ddl = "CREATE TABLE " + tableName + " (region_name VARCHAR PRIMARY KEY,integers INTEGER[])";
conn.createStatement().execute(ddl);
@@ -316,7 +316,7 @@ public class ArrayAppendFunctionIT extends ParallelStatsDisabledIT {
public void testArrayAppendFunctionWithUpsert3() throws Exception {
Connection conn = DriverManager.getConnection(getUrl());
- String tableName = generateRandomString();
+ String tableName = generateUniqueName();
String ddl = "CREATE TABLE " + tableName + " (region_name VARCHAR PRIMARY KEY,doubles DOUBLE[])";
conn.createStatement().execute(ddl);
@@ -340,8 +340,8 @@ public class ArrayAppendFunctionIT extends ParallelStatsDisabledIT {
public void testArrayAppendFunctionWithUpsertSelect1() throws Exception {
Connection conn = DriverManager.getConnection(getUrl());
- String sourceTableName = generateRandomString();
- String targetTableName = generateRandomString();
+ String sourceTableName = generateUniqueName();
+ String targetTableName = generateUniqueName();
String ddl = "CREATE TABLE " + sourceTableName + " (region_name VARCHAR PRIMARY KEY,doubles DOUBLE[])";
conn.createStatement().execute(ddl);
@@ -381,8 +381,8 @@ public class ArrayAppendFunctionIT extends ParallelStatsDisabledIT {
public void testArrayAppendFunctionWithUpsertSelect2() throws Exception {
Connection conn = DriverManager.getConnection(getUrl());
- String sourceTableName = generateRandomString();
- String targetTableName = generateRandomString();
+ String sourceTableName = generateUniqueName();
+ String targetTableName = generateUniqueName();
String ddl = "CREATE TABLE " + sourceTableName + " (region_name VARCHAR PRIMARY KEY,varchars VARCHAR[])";
conn.createStatement().execute(ddl);
http://git-wip-us.apache.org/repos/asf/phoenix/blob/bebb5ced/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArrayConcatFunctionIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArrayConcatFunctionIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArrayConcatFunctionIT.java
index d2c76bd..e8ca9dc 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArrayConcatFunctionIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArrayConcatFunctionIT.java
@@ -29,7 +29,7 @@ import static org.junit.Assert.assertTrue;
public class ArrayConcatFunctionIT extends ParallelStatsDisabledIT {
private String initTables(Connection conn) throws Exception {
- String tableName = generateRandomString();
+ String tableName = generateUniqueName();
String ddl = "CREATE TABLE " + tableName + " (region_name VARCHAR PRIMARY KEY,varchars VARCHAR[],integers INTEGER[],doubles DOUBLE[],bigints BIGINT[],chars CHAR(15)[],double1 DOUBLE,char1 CHAR(17),nullcheck INTEGER,chars2 CHAR(15)[])";
conn.createStatement().execute(ddl);
String dml = "UPSERT INTO " + tableName + "(region_name,varchars,integers,doubles,bigints,chars,double1,char1,nullcheck,chars2) VALUES('SF Bay Area'," +
@@ -265,7 +265,7 @@ public class ArrayConcatFunctionIT extends ParallelStatsDisabledIT {
@Test
public void testArrayConcatFunctionWithUpsert1() throws Exception {
Connection conn = DriverManager.getConnection(getUrl());
- String tableName = generateRandomString();
+ String tableName = generateUniqueName();
String ddl = "CREATE TABLE " + tableName + " (region_name VARCHAR PRIMARY KEY,varchars VARCHAR[])";
conn.createStatement().execute(ddl);
@@ -289,7 +289,7 @@ public class ArrayConcatFunctionIT extends ParallelStatsDisabledIT {
@Test
public void testArrayConcatFunctionWithUpsert2() throws Exception {
Connection conn = DriverManager.getConnection(getUrl());
- String tableName = generateRandomString();
+ String tableName = generateUniqueName();
String ddl = "CREATE TABLE " + tableName + " (region_name VARCHAR PRIMARY KEY,integers INTEGER[])";
conn.createStatement().execute(ddl);
@@ -313,7 +313,7 @@ public class ArrayConcatFunctionIT extends ParallelStatsDisabledIT {
@Test
public void testArrayConcatFunctionWithUpsert3() throws Exception {
Connection conn = DriverManager.getConnection(getUrl());
- String tableName = generateRandomString();
+ String tableName = generateUniqueName();
String ddl = "CREATE TABLE " + tableName + " (region_name VARCHAR PRIMARY KEY,doubles DOUBLE[])";
conn.createStatement().execute(ddl);
@@ -338,8 +338,8 @@ public class ArrayConcatFunctionIT extends ParallelStatsDisabledIT {
public void testArrayConcatFunctionWithUpsertSelect1() throws Exception {
Connection conn = DriverManager.getConnection(getUrl());
- String sourceTableName = generateRandomString();
- String targetTableName = generateRandomString();
+ String sourceTableName = generateUniqueName();
+ String targetTableName = generateUniqueName();
String ddl = "CREATE TABLE " + sourceTableName + " (region_name VARCHAR PRIMARY KEY,doubles DOUBLE[])";
conn.createStatement().execute(ddl);
@@ -377,8 +377,8 @@ public class ArrayConcatFunctionIT extends ParallelStatsDisabledIT {
@Test
public void testArrayConcatFunctionWithUpsertSelect2() throws Exception {
Connection conn = DriverManager.getConnection(getUrl());
- String sourceTableName = generateRandomString();
- String targetTableName = generateRandomString();
+ String sourceTableName = generateUniqueName();
+ String targetTableName = generateUniqueName();
String ddl = "CREATE TABLE " + sourceTableName + " (region_name VARCHAR PRIMARY KEY,varchars VARCHAR[])";
conn.createStatement().execute(ddl);
http://git-wip-us.apache.org/repos/asf/phoenix/blob/bebb5ced/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArrayFillFunctionIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArrayFillFunctionIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArrayFillFunctionIT.java
index 9eece23..4680998 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArrayFillFunctionIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArrayFillFunctionIT.java
@@ -30,7 +30,7 @@ import org.junit.Test;
public class ArrayFillFunctionIT extends ParallelStatsDisabledIT {
- private static final String REGIONS = generateRandomString();
+ private static final String REGIONS = generateUniqueName();
@BeforeClass
public static void initTables() throws Exception {
@@ -314,7 +314,7 @@ public class ArrayFillFunctionIT extends ParallelStatsDisabledIT {
public void testArrayFillFunctionWithUpsert1() throws Exception {
Connection conn = DriverManager.getConnection(getUrl());
- String regions = generateRandomString();
+ String regions = generateUniqueName();
String ddl =
"CREATE TABLE " + regions + " (region_name VARCHAR PRIMARY KEY,varchars VARCHAR[])";
conn.createStatement().execute(ddl);
@@ -341,7 +341,7 @@ public class ArrayFillFunctionIT extends ParallelStatsDisabledIT {
public void testArrayFillFunctionWithUpsert2() throws Exception {
Connection conn = DriverManager.getConnection(getUrl());
- String regions = generateRandomString();
+ String regions = generateUniqueName();
String ddl =
"CREATE TABLE " + regions + " (region_name VARCHAR PRIMARY KEY,integers INTEGER[])";
conn.createStatement().execute(ddl);
@@ -368,7 +368,7 @@ public class ArrayFillFunctionIT extends ParallelStatsDisabledIT {
public void testArrayFillFunctionWithUpsert3() throws Exception {
Connection conn = DriverManager.getConnection(getUrl());
- String regions = generateRandomString();
+ String regions = generateUniqueName();
String ddl =
"CREATE TABLE " + regions + " (region_name VARCHAR PRIMARY KEY,doubles DOUBLE[])";
conn.createStatement().execute(ddl);
@@ -437,12 +437,12 @@ public class ArrayFillFunctionIT extends ParallelStatsDisabledIT {
public void testArrayFillFunctionWithUpsertSelect2() throws Exception {
Connection conn = DriverManager.getConnection(getUrl());
- String source = generateRandomString();
+ String source = generateUniqueName();
String ddl =
"CREATE TABLE " + source + " (region_name VARCHAR PRIMARY KEY,varchars VARCHAR[])";
conn.createStatement().execute(ddl);
- String target = generateRandomString();
+ String target = generateUniqueName();
ddl = "CREATE TABLE " + target
+ " (region_name VARCHAR PRIMARY KEY,varchars VARCHAR[],varchars2 VARCHAR[])";
conn.createStatement().execute(ddl);
http://git-wip-us.apache.org/repos/asf/phoenix/blob/bebb5ced/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArrayPrependFunctionIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArrayPrependFunctionIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArrayPrependFunctionIT.java
index 1fc04e7..182e664 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArrayPrependFunctionIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArrayPrependFunctionIT.java
@@ -80,7 +80,7 @@ public class ArrayPrependFunctionIT extends ParallelStatsDisabledIT {
@Test
public void testArrayPrependFunctionInteger() throws Exception {
Connection conn = DriverManager.getConnection(getUrl());
- String tableName = generateRandomString();
+ String tableName = generateUniqueName();
initTables(conn, tableName);
ResultSet rs;
@@ -98,7 +98,7 @@ public class ArrayPrependFunctionIT extends ParallelStatsDisabledIT {
@Test
public void testArrayPrependFunctionVarchar() throws Exception {
Connection conn = DriverManager.getConnection(getUrl());
- String tableName = generateRandomString();
+ String tableName = generateUniqueName();
initTables(conn, tableName);
ResultSet rs;
@@ -117,7 +117,7 @@ public class ArrayPrependFunctionIT extends ParallelStatsDisabledIT {
public void testArrayPrependFunctionNulls1() throws Exception {
Connection conn = DriverManager.getConnection(getUrl());
String[] s = new String[]{null, null, "1", "2"};
- String tableName = generateRandomString();
+ String tableName = generateUniqueName();
initTableWithVarArray(conn, tableName, "VARCHAR", s, null);
String[] s2 = new String[]{null, null, null, "1", "2"};
PhoenixArray array2 = (PhoenixArray) conn.createArrayOf("VARCHAR", s2);
@@ -132,7 +132,7 @@ public class ArrayPrependFunctionIT extends ParallelStatsDisabledIT {
public void testArrayPrependFunctionNulls2() throws Exception {
Connection conn = DriverManager.getConnection(getUrl());
String[] s = new String[]{"1", "2"};
- String tableName = generateRandomString();
+ String tableName = generateUniqueName();
initTableWithVarArray(conn, tableName, "VARCHAR", s, null);
String[] s2 = new String[]{null, "1", "2"};
PhoenixArray array2 = (PhoenixArray) conn.createArrayOf("VARCHAR", s2);
@@ -147,7 +147,7 @@ public class ArrayPrependFunctionIT extends ParallelStatsDisabledIT {
public void testArrayPrependFunctionNulls3() throws Exception {
Connection conn = DriverManager.getConnection(getUrl());
String[] s = new String[]{"176", null, "212"};
- String tableName = generateRandomString();
+ String tableName = generateUniqueName();
initTableWithVarArray(conn, tableName, "VARCHAR", s, null);
String[] s2 = new String[]{null, "176", null, "212"};
PhoenixArray array2 = (PhoenixArray) conn.createArrayOf("VARCHAR", s2);
@@ -162,7 +162,7 @@ public class ArrayPrependFunctionIT extends ParallelStatsDisabledIT {
public void testArrayPrependFunctionNulls4() throws Exception {
Connection conn = DriverManager.getConnection(getUrl());
String[] s = new String[]{"176", null, "212"};
- String tableName = generateRandomString();
+ String tableName = generateUniqueName();
initTableWithVarArray(conn, tableName, "VARCHAR", s, "'foo'");
String[] s2 = new String[]{"foo", "176", null, "212"};
PhoenixArray array2 = (PhoenixArray) conn.createArrayOf("VARCHAR", s2);
@@ -176,7 +176,7 @@ public class ArrayPrependFunctionIT extends ParallelStatsDisabledIT {
@Test
public void testArrayPrependFunctionDouble() throws Exception {
Connection conn = DriverManager.getConnection(getUrl());
- String tableName = generateRandomString();
+ String tableName = generateUniqueName();
initTables(conn, tableName);
ResultSet rs;
@@ -194,7 +194,7 @@ public class ArrayPrependFunctionIT extends ParallelStatsDisabledIT {
@Test
public void testArrayPrependFunctionDouble2() throws Exception {
Connection conn = DriverManager.getConnection(getUrl());
- String tableName = generateRandomString();
+ String tableName = generateUniqueName();
initTables(conn, tableName);
ResultSet rs;
@@ -212,7 +212,7 @@ public class ArrayPrependFunctionIT extends ParallelStatsDisabledIT {
@Test
public void testArrayPrependFunctionBigint() throws Exception {
Connection conn = DriverManager.getConnection(getUrl());
- String tableName = generateRandomString();
+ String tableName = generateUniqueName();
initTables(conn, tableName);
ResultSet rs;
rs = conn.createStatement().executeQuery("SELECT ARRAY_PREPEND(1112,bigints) FROM " + tableName + " WHERE region_name = 'SF Bay Area'");
@@ -229,7 +229,7 @@ public class ArrayPrependFunctionIT extends ParallelStatsDisabledIT {
@Test
public void testArrayPrependFunctionChar() throws Exception {
Connection conn = DriverManager.getConnection(getUrl());
- String tableName = generateRandomString();
+ String tableName = generateUniqueName();
initTables(conn, tableName);
ResultSet rs;
rs = conn.createStatement().executeQuery("SELECT ARRAY_PREPEND('fac',chars) FROM " + tableName + " WHERE region_name = 'SF Bay Area'");
@@ -246,7 +246,7 @@ public class ArrayPrependFunctionIT extends ParallelStatsDisabledIT {
@Test(expected = TypeMismatchException.class)
public void testArrayPrependFunctionIntToCharArray() throws Exception {
Connection conn = DriverManager.getConnection(getUrl());
- String tableName = generateRandomString();
+ String tableName = generateUniqueName();
initTables(conn, tableName);
ResultSet rs;
@@ -256,7 +256,7 @@ public class ArrayPrependFunctionIT extends ParallelStatsDisabledIT {
@Test(expected = TypeMismatchException.class)
public void testArrayPrependFunctionVarcharToIntegerArray() throws Exception {
Connection conn = DriverManager.getConnection(getUrl());
- String tableName = generateRandomString();
+ String tableName = generateUniqueName();
initTables(conn, tableName);
ResultSet rs;
@@ -267,7 +267,7 @@ public class ArrayPrependFunctionIT extends ParallelStatsDisabledIT {
@Test(expected = SQLException.class)
public void testArrayPrependFunctionChar2() throws Exception {
Connection conn = DriverManager.getConnection(getUrl());
- String tableName = generateRandomString();
+ String tableName = generateUniqueName();
initTables(conn, tableName);
ResultSet rs;
rs = conn.createStatement().executeQuery("SELECT ARRAY_PREPEND('facfacfacfacfacfacfac',chars) FROM " + tableName + " WHERE region_name = 'SF Bay Area'");
@@ -278,7 +278,7 @@ public class ArrayPrependFunctionIT extends ParallelStatsDisabledIT {
@Test
public void testArrayPrependFunctionIntegerToDoubleArray() throws Exception {
Connection conn = DriverManager.getConnection(getUrl());
- String tableName = generateRandomString();
+ String tableName = generateUniqueName();
initTables(conn, tableName);
ResultSet rs;
@@ -296,7 +296,7 @@ public class ArrayPrependFunctionIT extends ParallelStatsDisabledIT {
@Test
public void testArrayPrependFunctionWithNestedFunctions1() throws Exception {
Connection conn = DriverManager.getConnection(getUrl());
- String tableName = generateRandomString();
+ String tableName = generateUniqueName();
initTables(conn, tableName);
ResultSet rs;
@@ -314,7 +314,7 @@ public class ArrayPrependFunctionIT extends ParallelStatsDisabledIT {
@Test
public void testArrayPrependFunctionWithNestedFunctions2() throws Exception {
Connection conn = DriverManager.getConnection(getUrl());
- String tableName = generateRandomString();
+ String tableName = generateUniqueName();
initTables(conn, tableName);
ResultSet rs;
@@ -332,7 +332,7 @@ public class ArrayPrependFunctionIT extends ParallelStatsDisabledIT {
@Test
public void testArrayPrependFunctionWithNestedFunctions3() throws Exception {
Connection conn = DriverManager.getConnection(getUrl());
- String tableName = generateRandomString();
+ String tableName = generateUniqueName();
initTables(conn, tableName);
ResultSet rs;
@@ -350,7 +350,7 @@ public class ArrayPrependFunctionIT extends ParallelStatsDisabledIT {
@Test
public void testArrayPrependFunctionWithUpsert1() throws Exception {
Connection conn = DriverManager.getConnection(getUrl());
- String tableName = generateRandomString();
+ String tableName = generateUniqueName();
String ddl = "CREATE TABLE " + tableName + " (region_name VARCHAR PRIMARY KEY,varchars VARCHAR[])";
conn.createStatement().execute(ddl);
@@ -373,7 +373,7 @@ public class ArrayPrependFunctionIT extends ParallelStatsDisabledIT {
@Test
public void testArrayPrependFunctionWithUpsert2() throws Exception {
Connection conn = DriverManager.getConnection(getUrl());
- String tableName = generateRandomString();
+ String tableName = generateUniqueName();
String ddl = "CREATE TABLE " + tableName + " (region_name VARCHAR PRIMARY KEY,integers INTEGER[])";
conn.createStatement().execute(ddl);
@@ -397,7 +397,7 @@ public class ArrayPrependFunctionIT extends ParallelStatsDisabledIT {
@Test
public void testArrayPrependFunctionWithUpsert3() throws Exception {
Connection conn = DriverManager.getConnection(getUrl());
- String tableName = generateRandomString();
+ String tableName = generateUniqueName();
String ddl = "CREATE TABLE " + tableName + "(region_name VARCHAR PRIMARY KEY,doubles DOUBLE[])";
conn.createStatement().execute(ddl);
@@ -420,7 +420,7 @@ public class ArrayPrependFunctionIT extends ParallelStatsDisabledIT {
@Test
public void testArrayPrependFunctionWithUpsertSelect1() throws Exception {
Connection conn = DriverManager.getConnection(getUrl());
- String baseTable = generateRandomString();
+ String baseTable = generateUniqueName();
String source = baseTable + "_SOURCE";
String target = baseTable + "_TARGET";
String ddl = "CREATE TABLE " + source + " (region_name VARCHAR PRIMARY KEY,doubles DOUBLE[])";
@@ -460,7 +460,7 @@ public class ArrayPrependFunctionIT extends ParallelStatsDisabledIT {
@Test
public void testArrayPrependFunctionWithUpsertSelect2() throws Exception {
Connection conn = DriverManager.getConnection(getUrl());
- String baseTable = generateRandomString();
+ String baseTable = generateUniqueName();
String source = baseTable + "_SOURCE";
String target = baseTable + "_TARGET";
String ddl = "CREATE TABLE " + source + " (region_name VARCHAR PRIMARY KEY,varchars VARCHAR[])";
@@ -500,7 +500,7 @@ public class ArrayPrependFunctionIT extends ParallelStatsDisabledIT {
@Test
public void testArrayPrependFunctionInWhere1() throws Exception {
Connection conn = DriverManager.getConnection(getUrl());
- String tableName = generateRandomString();
+ String tableName = generateUniqueName();
initTables(conn, tableName);
ResultSet rs;
@@ -514,7 +514,7 @@ public class ArrayPrependFunctionIT extends ParallelStatsDisabledIT {
@Test
public void testArrayPrependFunctionInWhere2() throws Exception {
Connection conn = DriverManager.getConnection(getUrl());
- String tableName = generateRandomString();
+ String tableName = generateUniqueName();
initTables(conn, tableName);
ResultSet rs;
@@ -528,7 +528,7 @@ public class ArrayPrependFunctionIT extends ParallelStatsDisabledIT {
@Test
public void testArrayPrependFunctionInWhere3() throws Exception {
Connection conn = DriverManager.getConnection(getUrl());
- String tableName = generateRandomString();
+ String tableName = generateUniqueName();
initTables(conn, tableName);
ResultSet rs;
@@ -542,7 +542,7 @@ public class ArrayPrependFunctionIT extends ParallelStatsDisabledIT {
@Test
public void testArrayPrependFunctionInWhere4() throws Exception {
Connection conn = DriverManager.getConnection(getUrl());
- String tableName = generateRandomString();
+ String tableName = generateUniqueName();
initTables(conn, tableName);
ResultSet rs;
@@ -556,7 +556,7 @@ public class ArrayPrependFunctionIT extends ParallelStatsDisabledIT {
@Test
public void testArrayPrependFunctionInWhere5() throws Exception {
Connection conn = DriverManager.getConnection(getUrl());
- String tableName = generateRandomString();
+ String tableName = generateUniqueName();
initTables(conn, tableName);
ResultSet rs;
@@ -570,7 +570,7 @@ public class ArrayPrependFunctionIT extends ParallelStatsDisabledIT {
@Test
public void testArrayPrependFunctionInWhere6() throws Exception {
Connection conn = DriverManager.getConnection(getUrl());
- String tableName = generateRandomString();
+ String tableName = generateUniqueName();
initTables(conn, tableName);
ResultSet rs;
@@ -584,7 +584,7 @@ public class ArrayPrependFunctionIT extends ParallelStatsDisabledIT {
@Test
public void testArrayPrependFunctionInWhere7() throws Exception {
Connection conn = DriverManager.getConnection(getUrl());
- String tableName = generateRandomString();
+ String tableName = generateUniqueName();
initTables(conn, tableName);
ResultSet rs;
@@ -598,7 +598,7 @@ public class ArrayPrependFunctionIT extends ParallelStatsDisabledIT {
@Test(expected = SQLException.class)
public void testArrayPrependFunctionCharLimitCheck() throws Exception {
Connection conn = DriverManager.getConnection(getUrl());
- String tableName = generateRandomString();
+ String tableName = generateUniqueName();
initTables(conn, tableName);
ResultSet rs;
@@ -616,7 +616,7 @@ public class ArrayPrependFunctionIT extends ParallelStatsDisabledIT {
@Test
public void testArrayPrependFunctionIntegerDesc() throws Exception {
Connection conn = DriverManager.getConnection(getUrl());
- String tableName = generateRandomString();
+ String tableName = generateUniqueName();
initTablesDesc(conn, tableName, "INTEGER", "23");
ResultSet rs;
@@ -635,7 +635,7 @@ public class ArrayPrependFunctionIT extends ParallelStatsDisabledIT {
@Test
public void testArrayPrependFunctionVarcharDesc() throws Exception {
Connection conn = DriverManager.getConnection(getUrl());
- String tableName = generateRandomString();
+ String tableName = generateUniqueName();
initTablesDesc(conn, tableName, "VARCHAR", "'e'");
ResultSet rs;
@@ -653,7 +653,7 @@ public class ArrayPrependFunctionIT extends ParallelStatsDisabledIT {
@Test
public void testArrayPrependFunctionBigIntDesc() throws Exception {
Connection conn = DriverManager.getConnection(getUrl());
- String tableName = generateRandomString();
+ String tableName = generateUniqueName();
initTablesDesc(conn, tableName, "BIGINT", "1112");
ResultSet rs;
rs = conn.createStatement().executeQuery("SELECT ARRAY_PREPEND(pk,bigints) FROM " + tableName);
@@ -670,7 +670,7 @@ public class ArrayPrependFunctionIT extends ParallelStatsDisabledIT {
@Test
public void testArrayPrependFunctionBooleanDesc() throws Exception {
Connection conn = DriverManager.getConnection(getUrl());
- String tableName = generateRandomString();
+ String tableName = generateUniqueName();
initTablesDesc(conn, tableName, "BOOLEAN", "false");
ResultSet rs;
rs = conn.createStatement().executeQuery("SELECT ARRAY_PREPEND(pk,bools) FROM " + tableName);
http://git-wip-us.apache.org/repos/asf/phoenix/blob/bebb5ced/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 39d6c77..8a3461c 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
@@ -36,7 +36,7 @@ public class ArrayToStringFunctionIT extends ParallelStatsDisabledIT {
@Before
public void initTables() throws Exception {
conn = DriverManager.getConnection(getUrl());
- tableName = generateRandomString();
+ tableName = generateUniqueName();
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);
@@ -256,7 +256,7 @@ public class ArrayToStringFunctionIT extends ParallelStatsDisabledIT {
@Test
public void testArrayToStringFunctionWithUpsert1() throws Exception {
- String table = generateRandomString();
+ String table = generateUniqueName();
String ddl =
"CREATE TABLE " + table + " (region_name VARCHAR PRIMARY KEY,varchar VARCHAR)";
conn.createStatement().execute(ddl);
@@ -279,7 +279,7 @@ public class ArrayToStringFunctionIT extends ParallelStatsDisabledIT {
@Test
public void testArrayToStringFunctionWithUpsert2() throws Exception {
- String tableName = generateRandomString();
+ String tableName = generateUniqueName();
String ddl =
"CREATE TABLE " + tableName + " (region_name VARCHAR PRIMARY KEY,varchar VARCHAR)";
conn.createStatement().execute(ddl);
@@ -302,7 +302,7 @@ public class ArrayToStringFunctionIT extends ParallelStatsDisabledIT {
@Test
public void testArrayToStringFunctionWithUpsert3() throws Exception {
- String tableName = generateRandomString();
+ String tableName = generateUniqueName();
String ddl =
"CREATE TABLE " + tableName + " (region_name VARCHAR PRIMARY KEY,varchar VARCHAR)";
conn.createStatement().execute(ddl);
@@ -325,7 +325,7 @@ public class ArrayToStringFunctionIT extends ParallelStatsDisabledIT {
@Test
public void testArrayToStringFunctionWithUpsert4() throws Exception {
- String tableName = generateRandomString();
+ String tableName = generateUniqueName();
String ddl =
"CREATE TABLE " + tableName + " (region_name VARCHAR PRIMARY KEY,varchar VARCHAR)";
conn.createStatement().execute(ddl);
@@ -348,12 +348,12 @@ public class ArrayToStringFunctionIT extends ParallelStatsDisabledIT {
@Test
public void testArrayToStringFunctionWithUpsertSelect1() throws Exception {
- String source = generateRandomString();
+ String source = generateUniqueName();
String ddl =
"CREATE TABLE " + source + " (region_name VARCHAR PRIMARY KEY,doubles DOUBLE[])";
conn.createStatement().execute(ddl);
- String target = generateRandomString();
+ String target = generateUniqueName();
ddl = "CREATE TABLE " + target + " (region_name VARCHAR PRIMARY KEY,varchar VARCHAR)";
conn.createStatement().execute(ddl);
@@ -388,12 +388,12 @@ public class ArrayToStringFunctionIT extends ParallelStatsDisabledIT {
@Test
public void testArrayToStringFunctionWithUpsertSelect2() throws Exception {
- String source = generateRandomString();
+ String source = generateUniqueName();
String ddl =
"CREATE TABLE " + source + " (region_name VARCHAR PRIMARY KEY,varchars VARCHAR[])";
conn.createStatement().execute(ddl);
- String target = generateRandomString();
+ String target = generateUniqueName();
ddl = "CREATE TABLE " + target + " (region_name VARCHAR PRIMARY KEY,varchar VARCHAR)";
conn.createStatement().execute(ddl);
@@ -428,12 +428,12 @@ public class ArrayToStringFunctionIT extends ParallelStatsDisabledIT {
@Test
public void testArrayToStringFunctionWithUpsertSelect3() throws Exception {
- String source = generateRandomString();
+ String source = generateUniqueName();
String ddl =
"CREATE TABLE " + source + " (region_name VARCHAR PRIMARY KEY,booleans BOOLEAN[])";
conn.createStatement().execute(ddl);
- String target = generateRandomString();
+ String target = generateUniqueName();
ddl = "CREATE TABLE " + target + " (region_name VARCHAR PRIMARY KEY,varchar VARCHAR)";
conn.createStatement().execute(ddl);
http://git-wip-us.apache.org/repos/asf/phoenix/blob/bebb5ced/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArraysWithNullsIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArraysWithNullsIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArraysWithNullsIT.java
index 4d487c5..4f78b3e 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArraysWithNullsIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArraysWithNullsIT.java
@@ -31,7 +31,7 @@ public class ArraysWithNullsIT extends ParallelStatsDisabledIT {
@Test
public void testArrayUpsertIntWithNulls() throws Exception {
Connection conn = DriverManager.getConnection(getUrl());
- String t1 = generateRandomString();
+ String t1 = generateUniqueName();
conn.createStatement().execute(
"CREATE TABLE " + t1 + " ( k VARCHAR PRIMARY KEY, a INTEGER[])");
@@ -54,7 +54,7 @@ public class ArraysWithNullsIT extends ParallelStatsDisabledIT {
@Test
public void testArrayUpsertVarcharWithNulls() throws Exception {
Connection conn = DriverManager.getConnection(getUrl());
- String t2 = generateRandomString();
+ String t2 = generateUniqueName();
conn.createStatement().execute(
"CREATE TABLE " + t2 + " ( k VARCHAR PRIMARY KEY, a VARCHAR[])");
@@ -75,7 +75,7 @@ public class ArraysWithNullsIT extends ParallelStatsDisabledIT {
@Test
public void testArrayUpsertBigIntWithNulls() throws Exception {
Connection conn = DriverManager.getConnection(getUrl());
- String t3 = generateRandomString();
+ String t3 = generateUniqueName();
conn.createStatement().execute(
"CREATE TABLE " + t3 + " ( k VARCHAR PRIMARY KEY, a BIGINT[])");
@@ -96,7 +96,7 @@ public class ArraysWithNullsIT extends ParallelStatsDisabledIT {
@Test
public void testArrayUpsertFloatWithNulls() throws Exception {
Connection conn = DriverManager.getConnection(getUrl());
- String t4 = generateRandomString();
+ String t4 = generateUniqueName();
conn.createStatement().execute(
"CREATE TABLE " + t4 + " ( k VARCHAR PRIMARY KEY, a FLOAT[])");
@@ -117,7 +117,7 @@ public class ArraysWithNullsIT extends ParallelStatsDisabledIT {
@Test
public void testArrayUpsertSmallIntWithNulls() throws Exception {
Connection conn = DriverManager.getConnection(getUrl());
- String t5 = generateRandomString();
+ String t5 = generateUniqueName();
conn.createStatement().execute(
"CREATE TABLE " + t5 + " ( k VARCHAR PRIMARY KEY, a SMALLINT[])");
@@ -138,7 +138,7 @@ public class ArraysWithNullsIT extends ParallelStatsDisabledIT {
@Test
public void testArrayUpsertTinyIntWithNulls() throws Exception {
Connection conn = DriverManager.getConnection(getUrl());
- String t6 = generateRandomString();
+ String t6 = generateUniqueName();
conn.createStatement().execute(
"CREATE TABLE " + t6 + " ( k VARCHAR PRIMARY KEY, a TINYINT[])");
@@ -159,7 +159,7 @@ public class ArraysWithNullsIT extends ParallelStatsDisabledIT {
@Test
public void testArrayUpsertBooleanWithNulls() throws Exception {
Connection conn = DriverManager.getConnection(getUrl());
- String t7 = generateRandomString();
+ String t7 = generateUniqueName();
conn.createStatement().execute(
"CREATE TABLE " + t7 + " ( k VARCHAR PRIMARY KEY, a BOOLEAN[])");
@@ -180,7 +180,7 @@ public class ArraysWithNullsIT extends ParallelStatsDisabledIT {
@Test
public void testArrayUpsertDoubleWithNulls() throws Exception {
Connection conn = DriverManager.getConnection(getUrl());
- String t8 = generateRandomString();
+ String t8 = generateUniqueName();
conn.createStatement().execute(
"CREATE TABLE " + t8 + " ( k VARCHAR PRIMARY KEY, a DOUBLE[])");
@@ -201,7 +201,7 @@ public class ArraysWithNullsIT extends ParallelStatsDisabledIT {
@Test
public void testArrayUpsertDateWithNulls1() throws Exception {
Connection conn = DriverManager.getConnection(getUrl());
- String t9 = generateRandomString();
+ String t9 = generateUniqueName();
conn.createStatement().execute("CREATE TABLE " + t9 + " ( k VARCHAR PRIMARY KEY, a DATE[])");
PreparedStatement stmt = conn.prepareStatement("UPSERT INTO " + t9
+ " VALUES('a',ARRAY[TO_DATE('2015-05-20 06:12:14.184'),null,TO_DATE('2015-05-20 06:12:14.184'),null])");
@@ -219,7 +219,7 @@ public class ArraysWithNullsIT extends ParallelStatsDisabledIT {
@Test
public void testArrayUpsertDateWithNulls2() throws Exception {
Connection conn = DriverManager.getConnection(getUrl());
- String t10 = generateRandomString();
+ String t10 = generateUniqueName();
conn.createStatement().execute(
"CREATE TABLE " + t10 + " ( k VARCHAR PRIMARY KEY, a DATE[])");
PreparedStatement stmt = conn.prepareStatement("UPSERT INTO " + t10
@@ -239,7 +239,7 @@ public class ArraysWithNullsIT extends ParallelStatsDisabledIT {
@Test
public void testArrayUpsertTimeWithNulls1() throws Exception {
Connection conn = DriverManager.getConnection(getUrl());
- String t11 = generateRandomString();
+ String t11 = generateUniqueName();
conn.createStatement().execute(
"CREATE TABLE " + t11 + " ( k VARCHAR PRIMARY KEY, a TIME[])");
PreparedStatement stmt = conn.prepareStatement("UPSERT INTO " + t11
@@ -259,7 +259,7 @@ public class ArraysWithNullsIT extends ParallelStatsDisabledIT {
@Test
public void testArrayUpsertTimeWithNulls2() throws Exception {
Connection conn = DriverManager.getConnection(getUrl());
- String t12 = generateRandomString();
+ String t12 = generateUniqueName();
conn.createStatement().execute(
"CREATE TABLE " + t12 + " ( k VARCHAR PRIMARY KEY, a TIME[])");
PreparedStatement stmt = conn.prepareStatement("UPSERT INTO " + t12
@@ -279,7 +279,7 @@ public class ArraysWithNullsIT extends ParallelStatsDisabledIT {
@Test
public void testArrayUpsertTimeStampWithNulls1() throws Exception {
Connection conn = DriverManager.getConnection(getUrl());
- String t13 = generateRandomString();
+ String t13 = generateUniqueName();
conn.createStatement().execute(
"CREATE TABLE " + t13 + " ( k VARCHAR PRIMARY KEY, a TIMESTAMP[])");
PreparedStatement stmt = conn.prepareStatement("UPSERT INTO " + t13
@@ -298,7 +298,7 @@ public class ArraysWithNullsIT extends ParallelStatsDisabledIT {
@Test
public void testArrayUpsertTimeStampWithNulls2() throws Exception {
Connection conn = DriverManager.getConnection(getUrl());
- String t14 = generateRandomString();
+ String t14 = generateUniqueName();
conn.createStatement().execute(
"CREATE TABLE " + t14 + " ( k VARCHAR PRIMARY KEY, a TIMESTAMP[])");
PreparedStatement stmt = conn.prepareStatement("UPSERT INTO " + t14
@@ -317,7 +317,7 @@ public class ArraysWithNullsIT extends ParallelStatsDisabledIT {
@Test
public void testArrayUpsertCharWithNulls1() throws Exception {
Connection conn = DriverManager.getConnection(getUrl());
- String t15 = generateRandomString();
+ String t15 = generateUniqueName();
conn.createStatement().execute(
"CREATE TABLE " + t15 + " ( k VARCHAR PRIMARY KEY, a CHAR(15)[])");
PreparedStatement stmt = conn.prepareStatement(
@@ -336,7 +336,7 @@ public class ArraysWithNullsIT extends ParallelStatsDisabledIT {
@Test
public void testArrayUpsertCharWithNulls2() throws Exception {
Connection conn = DriverManager.getConnection(getUrl());
- String t16 = generateRandomString();
+ String t16 = generateUniqueName();
conn.createStatement().execute(
"CREATE TABLE " + t16 + " ( k VARCHAR PRIMARY KEY, a CHAR(15)[])");
PreparedStatement stmt = conn.prepareStatement(
http://git-wip-us.apache.org/repos/asf/phoenix/blob/bebb5ced/phoenix-core/src/it/java/org/apache/phoenix/end2end/AutoCommitIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/AutoCommitIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/AutoCommitIT.java
index 8928248..5cc6691 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/AutoCommitIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/AutoCommitIT.java
@@ -41,7 +41,7 @@ public class AutoCommitIT extends ParallelStatsDisabledIT {
Connection conn = DriverManager.getConnection(getUrl(), props);
conn.setAutoCommit(true);
- String testTable = generateRandomString();
+ String testTable = generateUniqueName();
String ddl = "CREATE TABLE " + testTable + " " +
" (r varchar not null, col1 integer" +
" CONSTRAINT pk PRIMARY KEY (r))\n";
http://git-wip-us.apache.org/repos/asf/phoenix/blob/bebb5ced/phoenix-core/src/it/java/org/apache/phoenix/end2end/AutoPartitionViewsIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/AutoPartitionViewsIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/AutoPartitionViewsIT.java
index eb7bbdf..5de41bf 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/AutoPartitionViewsIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/AutoPartitionViewsIT.java
@@ -79,8 +79,8 @@ public class AutoPartitionViewsIT extends ParallelStatsDisabledIT {
Connection viewConn2 =
isMultiTenant ? DriverManager.getConnection(TENANT_SPECIFIC_URL1)
: DriverManager.getConnection(getUrl())) {
- String tableName = generateRandomString();
- String autoSeqName = generateRandomString();
+ String tableName = generateUniqueName();
+ String autoSeqName = generateUniqueName();
try {
@@ -107,7 +107,7 @@ public class AutoPartitionViewsIT extends ParallelStatsDisabledIT {
conn.createStatement().execute(ddl);
- String baseViewName = generateRandomString();
+ String baseViewName = generateUniqueName();
String metricView1 = baseViewName + "_VIEW1";
String metricView2 = baseViewName + "_VIEW2";
String metricView3 = baseViewName + "_VIEW3";
@@ -234,8 +234,8 @@ public class AutoPartitionViewsIT extends ParallelStatsDisabledIT {
Connection viewConn2 =
isMultiTenant ? DriverManager.getConnection(TENANT_SPECIFIC_URL2)
: DriverManager.getConnection(getUrl())) {
- String tableName = generateRandomString();
- String autoSeqName = generateRandomString();
+ String tableName = generateUniqueName();
+ String autoSeqName = generateUniqueName();
String ddl =
String.format(
@@ -246,7 +246,7 @@ public class AutoPartitionViewsIT extends ParallelStatsDisabledIT {
conn.createStatement().execute(ddl);
conn.createStatement().execute("CREATE SEQUENCE " + autoSeqName + " CACHE 1");
- String baseViewName = generateRandomString();
+ String baseViewName = generateUniqueName();
String metricView1 = baseViewName + "_VIEW1";
String metricView2 = baseViewName + "_VIEW2";
// create a view
@@ -315,8 +315,8 @@ public class AutoPartitionViewsIT extends ParallelStatsDisabledIT {
Connection viewConn1 =
isMultiTenant ? DriverManager.getConnection(TENANT_SPECIFIC_URL1)
: DriverManager.getConnection(getUrl())) {
- String tableName = generateRandomString();
- String autoSeqName = generateRandomString();
+ String tableName = generateUniqueName();
+ String autoSeqName = generateUniqueName();
String ddl =
String.format(
@@ -327,7 +327,7 @@ public class AutoPartitionViewsIT extends ParallelStatsDisabledIT {
conn.createStatement().execute(ddl);
conn.createStatement().execute("CREATE SEQUENCE " + autoSeqName + " CACHE 1");
- String metricView = generateRandomString() + "_VIEW";
+ String metricView = generateUniqueName() + "_VIEW";
// create a view
viewConn1.createStatement().execute(
"CREATE VIEW " + metricView + " AS SELECT * FROM " + tableName);
http://git-wip-us.apache.org/repos/asf/phoenix/blob/bebb5ced/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseTenantSpecificTablesIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseTenantSpecificTablesIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseTenantSpecificTablesIT.java
index 17918d6..0749a20 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseTenantSpecificTablesIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseTenantSpecificTablesIT.java
@@ -47,14 +47,14 @@ public abstract class BaseTenantSpecificTablesIT extends ParallelStatsEnabledIT
@Before
public void createTables() throws SQLException {
- TENANT_ID = "T_" + BaseTest.generateRandomString();
- TENANT_ID2 = "T_" + BaseTest.generateRandomString();
+ TENANT_ID = "T_" + BaseTest.generateUniqueName();
+ TENANT_ID2 = "T_" + BaseTest.generateUniqueName();
PHOENIX_JDBC_TENANT_SPECIFIC_URL = getUrl() + ';' + TENANT_ID_ATTRIB + '=' + TENANT_ID;
PHOENIX_JDBC_TENANT_SPECIFIC_URL2 = getUrl() + ';' + TENANT_ID_ATTRIB + '=' + TENANT_ID2;
- PARENT_TABLE_NAME = "P_" + BaseTest.generateRandomString();
- TENANT_TABLE_NAME = "V_" + BaseTest.generateRandomString();
- PARENT_TABLE_NAME_NO_TENANT_TYPE_ID = "P_" + BaseTest.generateRandomString();
- TENANT_TABLE_NAME_NO_TENANT_TYPE_ID = "V_" + BaseTest.generateRandomString();
+ PARENT_TABLE_NAME = "P_" + BaseTest.generateUniqueName();
+ TENANT_TABLE_NAME = "V_" + BaseTest.generateUniqueName();
+ PARENT_TABLE_NAME_NO_TENANT_TYPE_ID = "P_" + BaseTest.generateUniqueName();
+ TENANT_TABLE_NAME_NO_TENANT_TYPE_ID = "V_" + BaseTest.generateUniqueName();
PARENT_TABLE_DDL = "CREATE TABLE " + PARENT_TABLE_NAME + " ( \n" +
" user VARCHAR ,\n" +
" tenant_id VARCHAR NOT NULL,\n" +