[1/6] phoenix git commit: PHOENIX-3253 Make changes to tests to support method level parallelization

2016-09-22 Thread jamestaylor 
Repository: phoenix
Updated Branches:
  refs/heads/4.x-HBase-0.98 39d236110 -> 26109c4fa


http://git-wip-us.apache.org/repos/asf/phoenix/blob/26109c4f/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 f013341..87b660a 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
@@ -103,8 +103,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);
 
@@ -201,8 +201,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)) {
@@ -311,8 +311,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)) {
@@ -430,8 +430,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)) {
@@ -514,8 +514,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)) {
@@ -600,7 +600,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 =

[1/6] phoenix git commit: PHOENIX-3253 Make changes to tests to support method level parallelization

2016-09-22 Thread jamestaylor 
Repository: phoenix
Updated Branches:
  refs/heads/4.x-HBase-1.1 92499e722 -> 44e43d7c2


http://git-wip-us.apache.org/repos/asf/phoenix/blob/44e43d7c/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 6ae45bb..3c5ba22 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
@@ -100,8 +100,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);
 
@@ -198,8 +198,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)) {
@@ -308,8 +308,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)) {
@@ -427,8 +427,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)) {
@@ -511,8 +511,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)) {
@@ -597,7 +597,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 =

[1/6] phoenix git commit: PHOENIX-3253 Make changes to tests to support method level parallelization

2016-09-22 Thread jamestaylor 
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 =