[2/3] phoenix git commit: PHOENIX-4175 Convert tests using CURRENT_SCN to not use it when possible

[jamestaylor]

PHOENIX-4175 Convert tests using CURRENT_SCN to not use it when possible


Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/bdbfc852
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/bdbfc852
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/bdbfc852

Branch: refs/heads/4.x-HBase-1.1
Commit: bdbfc8525031c5ed372c7bd5d539b2ff312d7448
Parents: ed99412
Author: James Taylor 
Authored: Wed Sep 6 18:05:42 2017 -0700
Committer: James Taylor 
Committed: Thu Sep 7 11:36:21 2017 -0700

--
 .../apache/phoenix/end2end/CreateSchemaIT.java  | 26 +++
 .../phoenix/end2end/CustomEntityDataIT.java | 75 
 .../apache/phoenix/end2end/UpsertSelectIT.java  | 42 +--
 3 files changed, 90 insertions(+), 53 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/bdbfc852/phoenix-core/src/it/java/org/apache/phoenix/end2end/CreateSchemaIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/CreateSchemaIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/CreateSchemaIT.java
index 09cd810..fe09dcd 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/CreateSchemaIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/CreateSchemaIT.java
@@ -30,41 +30,31 @@ import org.apache.hadoop.hbase.client.HBaseAdmin;
 import org.apache.phoenix.exception.SQLExceptionCode;
 import org.apache.phoenix.jdbc.PhoenixConnection;
 import org.apache.phoenix.query.QueryServices;
-import org.apache.phoenix.schema.NewerSchemaAlreadyExistsException;
 import org.apache.phoenix.schema.SchemaAlreadyExistsException;
-import org.apache.phoenix.util.PhoenixRuntime;
+import org.apache.phoenix.util.PropertiesUtil;
 import org.apache.phoenix.util.SchemaUtil;
+import org.apache.phoenix.util.TestUtil;
 import org.junit.Test;
 
-public class CreateSchemaIT extends BaseClientManagedTimeIT {
+public class CreateSchemaIT extends ParallelStatsDisabledIT {
 
 @Test
 public void testCreateSchema() throws Exception {
-long ts = nextTimestamp();
-Properties props = new Properties();
-props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, 
Long.toString(ts));
+Properties props = PropertiesUtil.deepCopy(TestUtil.TEST_PROPERTIES);
 props.setProperty(QueryServices.IS_NAMESPACE_MAPPING_ENABLED, 
Boolean.toString(true));
-String ddl = "CREATE SCHEMA TEST_SCHEMA";
+String schemaName = generateUniqueName();
+String ddl = "CREATE SCHEMA " + schemaName;
 try (Connection conn = DriverManager.getConnection(getUrl(), props);
 HBaseAdmin admin = 
conn.unwrap(PhoenixConnection.class).getQueryServices().getAdmin();) {
 conn.createStatement().execute(ddl);
-assertNotNull(admin.getNamespaceDescriptor("TEST_SCHEMA"));
+assertNotNull(admin.getNamespaceDescriptor(schemaName));
 }
-props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts 
+ 10));
-try (Connection conn = DriverManager.getConnection(getUrl(), props);) {
-conn.createStatement().execute(ddl);
-fail();
-} catch (SchemaAlreadyExistsException e) {
-// expected
-}
-props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts 
- 20));
 try (Connection conn = DriverManager.getConnection(getUrl(), props)) {
 conn.createStatement().execute(ddl);
 fail();
-} catch (NewerSchemaAlreadyExistsException e) {
+} catch (SchemaAlreadyExistsException e) {
 // expected
 }
-props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts 
+ 50));
 Connection conn = DriverManager.getConnection(getUrl(), props);
 try {
 conn.createStatement().execute("CREATE SCHEMA " + 
SchemaUtil.SCHEMA_FOR_DEFAULT_NAMESPACE);

http://git-wip-us.apache.org/repos/asf/phoenix/blob/bdbfc852/phoenix-core/src/it/java/org/apache/phoenix/end2end/CustomEntityDataIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/CustomEntityDataIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/CustomEntityDataIT.java
index ad0f308..4af2c5c 100644
--- 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/CustomEntityDataIT.java
+++ 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/CustomEntityDataIT.java
@@ -17,7 +17,6 @@
  */
 package org.apache.phoenix.end2end;
 
-import static org.apache.phoenix.util.TestUtil.CUSTOM_ENTITY_DATA_FULL_NAME;
 import static org.apache.phoenix.util.TestUtil.ROW2;
 import static 

[2/3] phoenix git commit: PHOENIX-4175 Convert tests using CURRENT_SCN to not use it when possible

[jamestaylor]

PHOENIX-4175 Convert tests using CURRENT_SCN to not use it when possible


Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/aea61062
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/aea61062
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/aea61062

Branch: refs/heads/4.x-HBase-1.2
Commit: aea6106284bbf565a521e4e211b090525dec5129
Parents: 3c5e48d
Author: James Taylor 
Authored: Wed Sep 6 18:05:42 2017 -0700
Committer: James Taylor 
Committed: Thu Sep 7 11:34:35 2017 -0700

--
 .../apache/phoenix/end2end/CreateSchemaIT.java  | 26 +++
 .../phoenix/end2end/CustomEntityDataIT.java | 75 
 .../apache/phoenix/end2end/UpsertSelectIT.java  | 42 +--
 3 files changed, 90 insertions(+), 53 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/aea61062/phoenix-core/src/it/java/org/apache/phoenix/end2end/CreateSchemaIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/CreateSchemaIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/CreateSchemaIT.java
index 09cd810..fe09dcd 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/CreateSchemaIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/CreateSchemaIT.java
@@ -30,41 +30,31 @@ import org.apache.hadoop.hbase.client.HBaseAdmin;
 import org.apache.phoenix.exception.SQLExceptionCode;
 import org.apache.phoenix.jdbc.PhoenixConnection;
 import org.apache.phoenix.query.QueryServices;
-import org.apache.phoenix.schema.NewerSchemaAlreadyExistsException;
 import org.apache.phoenix.schema.SchemaAlreadyExistsException;
-import org.apache.phoenix.util.PhoenixRuntime;
+import org.apache.phoenix.util.PropertiesUtil;
 import org.apache.phoenix.util.SchemaUtil;
+import org.apache.phoenix.util.TestUtil;
 import org.junit.Test;
 
-public class CreateSchemaIT extends BaseClientManagedTimeIT {
+public class CreateSchemaIT extends ParallelStatsDisabledIT {
 
 @Test
 public void testCreateSchema() throws Exception {
-long ts = nextTimestamp();
-Properties props = new Properties();
-props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, 
Long.toString(ts));
+Properties props = PropertiesUtil.deepCopy(TestUtil.TEST_PROPERTIES);
 props.setProperty(QueryServices.IS_NAMESPACE_MAPPING_ENABLED, 
Boolean.toString(true));
-String ddl = "CREATE SCHEMA TEST_SCHEMA";
+String schemaName = generateUniqueName();
+String ddl = "CREATE SCHEMA " + schemaName;
 try (Connection conn = DriverManager.getConnection(getUrl(), props);
 HBaseAdmin admin = 
conn.unwrap(PhoenixConnection.class).getQueryServices().getAdmin();) {
 conn.createStatement().execute(ddl);
-assertNotNull(admin.getNamespaceDescriptor("TEST_SCHEMA"));
+assertNotNull(admin.getNamespaceDescriptor(schemaName));
 }
-props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts 
+ 10));
-try (Connection conn = DriverManager.getConnection(getUrl(), props);) {
-conn.createStatement().execute(ddl);
-fail();
-} catch (SchemaAlreadyExistsException e) {
-// expected
-}
-props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts 
- 20));
 try (Connection conn = DriverManager.getConnection(getUrl(), props)) {
 conn.createStatement().execute(ddl);
 fail();
-} catch (NewerSchemaAlreadyExistsException e) {
+} catch (SchemaAlreadyExistsException e) {
 // expected
 }
-props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts 
+ 50));
 Connection conn = DriverManager.getConnection(getUrl(), props);
 try {
 conn.createStatement().execute("CREATE SCHEMA " + 
SchemaUtil.SCHEMA_FOR_DEFAULT_NAMESPACE);

http://git-wip-us.apache.org/repos/asf/phoenix/blob/aea61062/phoenix-core/src/it/java/org/apache/phoenix/end2end/CustomEntityDataIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/CustomEntityDataIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/CustomEntityDataIT.java
index ad0f308..4af2c5c 100644
--- 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/CustomEntityDataIT.java
+++ 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/CustomEntityDataIT.java
@@ -17,7 +17,6 @@
  */
 package org.apache.phoenix.end2end;
 
-import static org.apache.phoenix.util.TestUtil.CUSTOM_ENTITY_DATA_FULL_NAME;
 import static org.apache.phoenix.util.TestUtil.ROW2;
 import static