phoenix git commit: PHOENIX-4213 Modify ExtendedQueryExecIT and FunkyNamesIT to not use currentSCN

[mujtaba]

Repository: phoenix
Updated Branches:
  refs/heads/4.x-HBase-1.2 7fabb75ba -> 13bb73031


PHOENIX-4213 Modify ExtendedQueryExecIT and FunkyNamesIT to not use currentSCN


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

Branch: refs/heads/4.x-HBase-1.2
Commit: 13bb730317b7d75498a46b8dfb4ab2d4c4b09b5a
Parents: 7fabb75
Author: Mujtaba 
Authored: Fri Sep 15 10:39:50 2017 -0700
Committer: Mujtaba 
Committed: Fri Sep 15 10:39:50 2017 -0700

--
 .../phoenix/end2end/ExtendedQueryExecIT.java| 30 +
 .../apache/phoenix/end2end/FunkyNamesIT.java| 47 +---
 2 files changed, 30 insertions(+), 47 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/13bb7303/phoenix-core/src/it/java/org/apache/phoenix/end2end/ExtendedQueryExecIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ExtendedQueryExecIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ExtendedQueryExecIT.java
index f46b3e4..f894725 100644
--- 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ExtendedQueryExecIT.java
+++ 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ExtendedQueryExecIT.java
@@ -22,7 +22,6 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
-import static org.apache.phoenix.util.TestUtil.ATABLE_NAME;
 
 import java.sql.Connection;
 import java.sql.Date;
@@ -32,33 +31,28 @@ import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.Properties;
 
-import org.apache.phoenix.util.PhoenixRuntime;
 import org.apache.phoenix.util.PropertiesUtil;
 import org.junit.Test;
 
-
-
 /**
  * 
  * Extended tests for Phoenix JDBC implementation
  * 
  */
 
-public class ExtendedQueryExecIT extends BaseClientManagedTimeIT {
+public class ExtendedQueryExecIT extends ParallelStatsDisabledIT {
 
 @Test
 public void testToDateFunctionBind() throws Exception {
-long ts = nextTimestamp();
 Date date = new Date(1);
 String tenantId = getOrganizationId();
 
-initATableValues(ATABLE_NAME, tenantId, 
getDefaultSplits(tenantId),date, ts, getUrl(), null);
+String tableName = initATableValues(null, tenantId, 
getDefaultSplits(tenantId),date, null, getUrl(), null);
 
 Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
-props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, 
Long.toString(ts+1));
 Connection conn = DriverManager.getConnection(getUrl(), props);
 try {
-String query = "SELECT a_date FROM atable WHERE organization_id='" 
+ tenantId + "' and a_date < TO_DATE(?)";
+String query = "SELECT a_date FROM " + tableName + " WHERE 
organization_id='" + tenantId + "' and a_date < TO_DATE(?)";
 PreparedStatement statement = conn.prepareStatement(query);
 statement.setString(1, "1970-1-1 12:00:00");
 ResultSet rs = statement.executeQuery();
@@ -73,14 +67,13 @@ public class ExtendedQueryExecIT extends 
BaseClientManagedTimeIT {
 justification="Test code.")
 @Test
 public void testTypeMismatchToDateFunctionBind() throws Exception {
-long ts = nextTimestamp();
 String tenantId = getOrganizationId();
-initATableValues(ATABLE_NAME, tenantId, 
getDefaultSplits(tenantId),null, ts, getUrl(), null);
+String tableName = initATableValues(null, tenantId, 
getDefaultSplits(tenantId),null, null, getUrl(), null);
 
 Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
 Connection conn = DriverManager.getConnection(getUrl(), props);
 try {
-String query = "SELECT a_date FROM atable WHERE organization_id='" 
+ tenantId + "' and a_date < TO_DATE(?)";
+String query = "SELECT a_date FROM " + tableName + " WHERE 
organization_id='" + tenantId + "' and a_date < TO_DATE(?)";
 PreparedStatement statement = conn.prepareStatement(query);
 statement.setDate(1, new Date(2));
 statement.executeQuery();
@@ -99,17 +92,15 @@ public class ExtendedQueryExecIT extends 
BaseClientManagedTimeIT {
  */
 @Test
 public void testDateFunctions() throws Exception {
-long ts = nextTimestamp();
 Date date = new Date(1);
 String tenantId = getOrganizationId();
 
-initATableValues(ATABLE_NAME, tenantId, 
getDefaultSplits(tenantId),date, ts, getUrl(), null);
+String tableName = 

phoenix git commit: PHOENIX-4213 Modify ExtendedQueryExecIT and FunkyNamesIT to not use currentSCN

[mujtaba]

Repository: phoenix
Updated Branches:
  refs/heads/master 6c3bcb6a9 -> b2153ef52


PHOENIX-4213 Modify ExtendedQueryExecIT and FunkyNamesIT to not use currentSCN


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

Branch: refs/heads/master
Commit: b2153ef52a8de60501fad964062b7f7f9b86654a
Parents: 6c3bcb6
Author: Mujtaba 
Authored: Fri Sep 15 10:38:53 2017 -0700
Committer: Mujtaba 
Committed: Fri Sep 15 10:38:53 2017 -0700

--
 .../phoenix/end2end/ExtendedQueryExecIT.java| 30 +
 .../apache/phoenix/end2end/FunkyNamesIT.java| 47 +---
 2 files changed, 30 insertions(+), 47 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/b2153ef5/phoenix-core/src/it/java/org/apache/phoenix/end2end/ExtendedQueryExecIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ExtendedQueryExecIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ExtendedQueryExecIT.java
index f46b3e4..f894725 100644
--- 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ExtendedQueryExecIT.java
+++ 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ExtendedQueryExecIT.java
@@ -22,7 +22,6 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
-import static org.apache.phoenix.util.TestUtil.ATABLE_NAME;
 
 import java.sql.Connection;
 import java.sql.Date;
@@ -32,33 +31,28 @@ import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.Properties;
 
-import org.apache.phoenix.util.PhoenixRuntime;
 import org.apache.phoenix.util.PropertiesUtil;
 import org.junit.Test;
 
-
-
 /**
  * 
  * Extended tests for Phoenix JDBC implementation
  * 
  */
 
-public class ExtendedQueryExecIT extends BaseClientManagedTimeIT {
+public class ExtendedQueryExecIT extends ParallelStatsDisabledIT {
 
 @Test
 public void testToDateFunctionBind() throws Exception {
-long ts = nextTimestamp();
 Date date = new Date(1);
 String tenantId = getOrganizationId();
 
-initATableValues(ATABLE_NAME, tenantId, 
getDefaultSplits(tenantId),date, ts, getUrl(), null);
+String tableName = initATableValues(null, tenantId, 
getDefaultSplits(tenantId),date, null, getUrl(), null);
 
 Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
-props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, 
Long.toString(ts+1));
 Connection conn = DriverManager.getConnection(getUrl(), props);
 try {
-String query = "SELECT a_date FROM atable WHERE organization_id='" 
+ tenantId + "' and a_date < TO_DATE(?)";
+String query = "SELECT a_date FROM " + tableName + " WHERE 
organization_id='" + tenantId + "' and a_date < TO_DATE(?)";
 PreparedStatement statement = conn.prepareStatement(query);
 statement.setString(1, "1970-1-1 12:00:00");
 ResultSet rs = statement.executeQuery();
@@ -73,14 +67,13 @@ public class ExtendedQueryExecIT extends 
BaseClientManagedTimeIT {
 justification="Test code.")
 @Test
 public void testTypeMismatchToDateFunctionBind() throws Exception {
-long ts = nextTimestamp();
 String tenantId = getOrganizationId();
-initATableValues(ATABLE_NAME, tenantId, 
getDefaultSplits(tenantId),null, ts, getUrl(), null);
+String tableName = initATableValues(null, tenantId, 
getDefaultSplits(tenantId),null, null, getUrl(), null);
 
 Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
 Connection conn = DriverManager.getConnection(getUrl(), props);
 try {
-String query = "SELECT a_date FROM atable WHERE organization_id='" 
+ tenantId + "' and a_date < TO_DATE(?)";
+String query = "SELECT a_date FROM " + tableName + " WHERE 
organization_id='" + tenantId + "' and a_date < TO_DATE(?)";
 PreparedStatement statement = conn.prepareStatement(query);
 statement.setDate(1, new Date(2));
 statement.executeQuery();
@@ -99,17 +92,15 @@ public class ExtendedQueryExecIT extends 
BaseClientManagedTimeIT {
  */
 @Test
 public void testDateFunctions() throws Exception {
-long ts = nextTimestamp();
 Date date = new Date(1);
 String tenantId = getOrganizationId();
 
-initATableValues(ATABLE_NAME, tenantId, 
getDefaultSplits(tenantId),date, ts, getUrl(), null);
+String tableName = initATableValues(null, 

phoenix git commit: PHOENIX-4213 Modify ExtendedQueryExecIT and FunkyNamesIT to not use currentSCN

[mujtaba]

Repository: phoenix
Updated Branches:
  refs/heads/4.x-HBase-1.1 f2e137007 -> c629d7989


PHOENIX-4213 Modify ExtendedQueryExecIT and FunkyNamesIT to not use currentSCN


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

Branch: refs/heads/4.x-HBase-1.1
Commit: c629d7989eebbd11cb52fef42c77dc8646b7250c
Parents: f2e1370
Author: Mujtaba 
Authored: Fri Sep 15 10:39:37 2017 -0700
Committer: Mujtaba 
Committed: Fri Sep 15 10:39:37 2017 -0700

--
 .../phoenix/end2end/ExtendedQueryExecIT.java| 30 +
 .../apache/phoenix/end2end/FunkyNamesIT.java| 47 +---
 2 files changed, 30 insertions(+), 47 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/c629d798/phoenix-core/src/it/java/org/apache/phoenix/end2end/ExtendedQueryExecIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ExtendedQueryExecIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ExtendedQueryExecIT.java
index f46b3e4..f894725 100644
--- 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ExtendedQueryExecIT.java
+++ 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ExtendedQueryExecIT.java
@@ -22,7 +22,6 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
-import static org.apache.phoenix.util.TestUtil.ATABLE_NAME;
 
 import java.sql.Connection;
 import java.sql.Date;
@@ -32,33 +31,28 @@ import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.Properties;
 
-import org.apache.phoenix.util.PhoenixRuntime;
 import org.apache.phoenix.util.PropertiesUtil;
 import org.junit.Test;
 
-
-
 /**
  * 
  * Extended tests for Phoenix JDBC implementation
  * 
  */
 
-public class ExtendedQueryExecIT extends BaseClientManagedTimeIT {
+public class ExtendedQueryExecIT extends ParallelStatsDisabledIT {
 
 @Test
 public void testToDateFunctionBind() throws Exception {
-long ts = nextTimestamp();
 Date date = new Date(1);
 String tenantId = getOrganizationId();
 
-initATableValues(ATABLE_NAME, tenantId, 
getDefaultSplits(tenantId),date, ts, getUrl(), null);
+String tableName = initATableValues(null, tenantId, 
getDefaultSplits(tenantId),date, null, getUrl(), null);
 
 Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
-props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, 
Long.toString(ts+1));
 Connection conn = DriverManager.getConnection(getUrl(), props);
 try {
-String query = "SELECT a_date FROM atable WHERE organization_id='" 
+ tenantId + "' and a_date < TO_DATE(?)";
+String query = "SELECT a_date FROM " + tableName + " WHERE 
organization_id='" + tenantId + "' and a_date < TO_DATE(?)";
 PreparedStatement statement = conn.prepareStatement(query);
 statement.setString(1, "1970-1-1 12:00:00");
 ResultSet rs = statement.executeQuery();
@@ -73,14 +67,13 @@ public class ExtendedQueryExecIT extends 
BaseClientManagedTimeIT {
 justification="Test code.")
 @Test
 public void testTypeMismatchToDateFunctionBind() throws Exception {
-long ts = nextTimestamp();
 String tenantId = getOrganizationId();
-initATableValues(ATABLE_NAME, tenantId, 
getDefaultSplits(tenantId),null, ts, getUrl(), null);
+String tableName = initATableValues(null, tenantId, 
getDefaultSplits(tenantId),null, null, getUrl(), null);
 
 Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
 Connection conn = DriverManager.getConnection(getUrl(), props);
 try {
-String query = "SELECT a_date FROM atable WHERE organization_id='" 
+ tenantId + "' and a_date < TO_DATE(?)";
+String query = "SELECT a_date FROM " + tableName + " WHERE 
organization_id='" + tenantId + "' and a_date < TO_DATE(?)";
 PreparedStatement statement = conn.prepareStatement(query);
 statement.setDate(1, new Date(2));
 statement.executeQuery();
@@ -99,17 +92,15 @@ public class ExtendedQueryExecIT extends 
BaseClientManagedTimeIT {
  */
 @Test
 public void testDateFunctions() throws Exception {
-long ts = nextTimestamp();
 Date date = new Date(1);
 String tenantId = getOrganizationId();
 
-initATableValues(ATABLE_NAME, tenantId, 
getDefaultSplits(tenantId),date, ts, getUrl(), null);
+String tableName = 

phoenix git commit: PHOENIX-4213 Modify ExtendedQueryExecIT and FunkyNamesIT to not use currentSCN

[mujtaba]

Repository: phoenix
Updated Branches:
  refs/heads/4.x-HBase-0.98 083a32830 -> 149a9b931


PHOENIX-4213 Modify ExtendedQueryExecIT and FunkyNamesIT to not use currentSCN


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

Branch: refs/heads/4.x-HBase-0.98
Commit: 149a9b931f2e8b4ff981f62d74418b378b741f50
Parents: 083a328
Author: Mujtaba 
Authored: Fri Sep 15 10:38:25 2017 -0700
Committer: Mujtaba 
Committed: Fri Sep 15 10:38:25 2017 -0700

--
 .../phoenix/end2end/ExtendedQueryExecIT.java| 30 +
 .../apache/phoenix/end2end/FunkyNamesIT.java| 47 +---
 2 files changed, 30 insertions(+), 47 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/149a9b93/phoenix-core/src/it/java/org/apache/phoenix/end2end/ExtendedQueryExecIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ExtendedQueryExecIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ExtendedQueryExecIT.java
index f46b3e4..f894725 100644
--- 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ExtendedQueryExecIT.java
+++ 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ExtendedQueryExecIT.java
@@ -22,7 +22,6 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
-import static org.apache.phoenix.util.TestUtil.ATABLE_NAME;
 
 import java.sql.Connection;
 import java.sql.Date;
@@ -32,33 +31,28 @@ import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.Properties;
 
-import org.apache.phoenix.util.PhoenixRuntime;
 import org.apache.phoenix.util.PropertiesUtil;
 import org.junit.Test;
 
-
-
 /**
  * 
  * Extended tests for Phoenix JDBC implementation
  * 
  */
 
-public class ExtendedQueryExecIT extends BaseClientManagedTimeIT {
+public class ExtendedQueryExecIT extends ParallelStatsDisabledIT {
 
 @Test
 public void testToDateFunctionBind() throws Exception {
-long ts = nextTimestamp();
 Date date = new Date(1);
 String tenantId = getOrganizationId();
 
-initATableValues(ATABLE_NAME, tenantId, 
getDefaultSplits(tenantId),date, ts, getUrl(), null);
+String tableName = initATableValues(null, tenantId, 
getDefaultSplits(tenantId),date, null, getUrl(), null);
 
 Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
-props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, 
Long.toString(ts+1));
 Connection conn = DriverManager.getConnection(getUrl(), props);
 try {
-String query = "SELECT a_date FROM atable WHERE organization_id='" 
+ tenantId + "' and a_date < TO_DATE(?)";
+String query = "SELECT a_date FROM " + tableName + " WHERE 
organization_id='" + tenantId + "' and a_date < TO_DATE(?)";
 PreparedStatement statement = conn.prepareStatement(query);
 statement.setString(1, "1970-1-1 12:00:00");
 ResultSet rs = statement.executeQuery();
@@ -73,14 +67,13 @@ public class ExtendedQueryExecIT extends 
BaseClientManagedTimeIT {
 justification="Test code.")
 @Test
 public void testTypeMismatchToDateFunctionBind() throws Exception {
-long ts = nextTimestamp();
 String tenantId = getOrganizationId();
-initATableValues(ATABLE_NAME, tenantId, 
getDefaultSplits(tenantId),null, ts, getUrl(), null);
+String tableName = initATableValues(null, tenantId, 
getDefaultSplits(tenantId),null, null, getUrl(), null);
 
 Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
 Connection conn = DriverManager.getConnection(getUrl(), props);
 try {
-String query = "SELECT a_date FROM atable WHERE organization_id='" 
+ tenantId + "' and a_date < TO_DATE(?)";
+String query = "SELECT a_date FROM " + tableName + " WHERE 
organization_id='" + tenantId + "' and a_date < TO_DATE(?)";
 PreparedStatement statement = conn.prepareStatement(query);
 statement.setDate(1, new Date(2));
 statement.executeQuery();
@@ -99,17 +92,15 @@ public class ExtendedQueryExecIT extends 
BaseClientManagedTimeIT {
  */
 @Test
 public void testDateFunctions() throws Exception {
-long ts = nextTimestamp();
 Date date = new Date(1);
 String tenantId = getOrganizationId();
 
-initATableValues(ATABLE_NAME, tenantId, 
getDefaultSplits(tenantId),date, ts, getUrl(), null);
+String tableName =