PHOENIX-1122 Ensure TEST_PROPERTIES is not updated to prevent test flapping


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

Branch: refs/heads/3.0
Commit: a411c7b238e735037b63e67561e3d23ab0b35c4f
Parents: 41d7afc
Author: James Taylor <jtay...@salesforce.com>
Authored: Fri Jul 25 22:32:21 2014 -0700
Committer: James Taylor <jtay...@salesforce.com>
Committed: Fri Jul 25 22:32:21 2014 -0700

----------------------------------------------------------------------
 .../apache/phoenix/end2end/AlterTableIT.java    |  29 ++--
 .../phoenix/end2end/ArithmeticQueryIT.java      |  17 +--
 .../org/apache/phoenix/end2end/ArrayIT.java     | 107 +++++++--------
 .../apache/phoenix/end2end/AutoCommitIT.java    |   3 +-
 .../BaseParallelIteratorsRegionSplitterIT.java  |   3 +-
 .../apache/phoenix/end2end/BinaryRowKeyIT.java  |   9 +-
 .../apache/phoenix/end2end/CaseStatementIT.java |  19 +--
 .../apache/phoenix/end2end/CastAndCoerceIT.java |  13 +-
 .../end2end/ClientTimeArithmeticQueryIT.java    |  57 ++++----
 .../end2end/ColumnProjectionOptimizationIT.java |   5 +-
 .../phoenix/end2end/CustomEntityDataIT.java     |   7 +-
 ...efaultParallelIteratorsRegionSplitterIT.java |   7 +-
 .../apache/phoenix/end2end/DerivedTableIT.java  |  19 +--
 .../apache/phoenix/end2end/DistinctCountIT.java |  19 +--
 .../apache/phoenix/end2end/DynamicColumnIT.java |  15 ++-
 .../apache/phoenix/end2end/DynamicFamilyIT.java |  19 +--
 .../apache/phoenix/end2end/DynamicUpsertIT.java |  17 +--
 .../phoenix/end2end/ExtendedQueryExecIT.java    |   9 +-
 .../apache/phoenix/end2end/FunkyNamesIT.java    |   9 +-
 .../apache/phoenix/end2end/GroupByCaseIT.java   |  11 +-
 .../org/apache/phoenix/end2end/GroupByIT.java   |  27 ++--
 .../org/apache/phoenix/end2end/HashJoinIT.java  |  67 +++++-----
 .../org/apache/phoenix/end2end/InListIT.java    |   5 +-
 .../org/apache/phoenix/end2end/KeyOnlyIT.java   |   3 +-
 .../phoenix/end2end/MultiCfQueryExecIT.java     |  15 ++-
 .../phoenix/end2end/NativeHBaseTypesIT.java     |  26 ++--
 .../org/apache/phoenix/end2end/NotQueryIT.java  |  23 ++--
 .../org/apache/phoenix/end2end/OrderByIT.java   |   7 +-
 .../apache/phoenix/end2end/PercentileIT.java    |  31 ++---
 .../phoenix/end2end/ProductMetricsIT.java       | 131 ++++++++++---------
 .../end2end/QueryDatabaseMetaDataIT.java        |   5 +-
 .../org/apache/phoenix/end2end/QueryIT.java     |  49 +++----
 .../phoenix/end2end/ReadIsolationLevelIT.java   |   3 +-
 .../phoenix/end2end/RowValueConstructorIT.java  |  49 +++----
 .../org/apache/phoenix/end2end/ScanQueryIT.java |  35 ++---
 .../org/apache/phoenix/end2end/SequenceIT.java  |   5 +-
 .../phoenix/end2end/ServerExceptionIT.java      |   3 +-
 ...ipRangeParallelIteratorRegionSplitterIT.java |   7 +-
 .../apache/phoenix/end2end/SortOrderFIT.java    |   3 +-
 .../phoenix/end2end/SpillableGroupByIT.java     |   5 +-
 .../phoenix/end2end/StatementHintsIT.java       |   7 +-
 .../apache/phoenix/end2end/StatsManagerIT.java  |   7 +-
 .../org/apache/phoenix/end2end/StddevIT.java    |   9 +-
 .../end2end/TenantSpecificTablesDDLIT.java      |   3 +-
 .../end2end/TenantSpecificTablesDMLIT.java      |   5 +-
 .../phoenix/end2end/ToCharFunctionIT.java       |   3 +-
 .../phoenix/end2end/ToNumberFunctionIT.java     |   3 +-
 .../java/org/apache/phoenix/end2end/TopNIT.java |   7 +-
 .../end2end/UpsertSelectAutoCommitIT.java       |   3 +-
 .../apache/phoenix/end2end/UpsertSelectIT.java  |   4 +-
 .../phoenix/end2end/VariableLengthPKIT.java     | 103 +++++++--------
 .../end2end/index/BaseMutableIndexIT.java       |   5 +-
 .../phoenix/end2end/index/DropViewIT.java       |   5 +-
 .../phoenix/end2end/index/ImmutableIndexIT.java |  17 +--
 .../phoenix/end2end/index/IndexMetadataIT.java  |   9 +-
 .../end2end/index/MutableIndexFailureIT.java    |   5 +-
 .../phoenix/end2end/index/MutableIndexIT.java   |  29 ++--
 .../phoenix/end2end/index/SaltedIndexIT.java    |   5 +-
 .../phoenix/end2end/salted/SaltedTableIT.java   |  17 +--
 .../salted/SaltedTableUpsertSelectIT.java       |  11 +-
 .../salted/SaltedTableVarLengthRowKeyIT.java    |   5 +-
 .../phoenix/compile/HavingCompilerTest.java     |   3 +-
 .../phoenix/compile/JoinQueryCompilerTest.java  |   3 +-
 .../phoenix/compile/LimitCompilerTest.java      |   3 +-
 .../phoenix/compile/QueryCompilerTest.java      |  50 +++----
 .../phoenix/compile/QueryMetaDataTest.java      |  70 +++++-----
 .../compile/SelectStatementRewriterTest.java    |   3 +-
 .../compile/StatementHintsCompilationTest.java  |   3 +-
 .../phoenix/compile/ViewCompilerTest.java       |   9 +-
 .../phoenix/compile/WhereCompilerTest.java      |  75 +++++------
 .../phoenix/compile/WhereOptimizerTest.java     |   3 +-
 .../iterate/AggregateResultScannerTest.java     |   3 +-
 .../query/BaseConnectionlessQueryTest.java      |   4 +-
 .../java/org/apache/phoenix/query/BaseTest.java |   5 +-
 .../java/org/apache/phoenix/util/TestUtil.java  |  18 ++-
 .../phoenix/flume/RegexEventSerializerIT.java   |   7 +-
 .../phoenix/pig/PhoenixPigConfigurationIT.java  |   7 +-
 77 files changed, 756 insertions(+), 665 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/phoenix/blob/a411c7b2/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 4a6c970..2af697b 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
@@ -48,6 +48,7 @@ import org.apache.phoenix.schema.PTableKey;
 import org.apache.phoenix.schema.TableNotFoundException;
 import org.apache.phoenix.util.IndexUtil;
 import org.apache.phoenix.util.PhoenixRuntime;
+import org.apache.phoenix.util.PropertiesUtil;
 import org.apache.phoenix.util.SchemaUtil;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
@@ -63,7 +64,7 @@ public class AlterTableIT extends BaseHBaseManagedTimeIT {
 
     @Test
     public void testAlterTableWithVarBinaryKey() throws Exception {
-        Properties props = new Properties(TEST_PROPERTIES);
+        Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
         Connection conn = DriverManager.getConnection(getUrl(), props);
         conn.setAutoCommit(false);
         
@@ -86,7 +87,7 @@ public class AlterTableIT extends BaseHBaseManagedTimeIT {
     
     @Test
     public void testAddColsIntoSystemTable() throws Exception {
-        Properties props = new Properties(TEST_PROPERTIES);
+        Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
         props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB,
                 Long.toString(MetaDataProtocol.MIN_SYSTEM_TABLE_TIMESTAMP + 
1));
         Connection conn = DriverManager.getConnection(getUrl(), props);
@@ -108,7 +109,7 @@ public class AlterTableIT extends BaseHBaseManagedTimeIT {
 
     @Test
     public void testAddVarCharColToPK() throws Exception {
-        Properties props = new Properties(TEST_PROPERTIES);
+        Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
         Connection conn = DriverManager.getConnection(getUrl(), props);
         conn.setAutoCommit(false);
         
@@ -179,7 +180,7 @@ public class AlterTableIT extends BaseHBaseManagedTimeIT {
     @Test
     public void testAlterColumnFamilyProperty() throws Exception {
 
-        Properties props = new Properties(TEST_PROPERTIES);
+        Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
         Connection conn = DriverManager.getConnection(getUrl(), props);
         
         String ddl = "CREATE TABLE test_table " +
@@ -219,7 +220,7 @@ public class AlterTableIT extends BaseHBaseManagedTimeIT {
         ResultSet rs;
         PreparedStatement stmt;
     
-        Properties props = new Properties(TEST_PROPERTIES);
+        Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
         Connection conn = DriverManager.getConnection(getUrl(), props);
         conn.setAutoCommit(false);
     
@@ -277,7 +278,7 @@ public class AlterTableIT extends BaseHBaseManagedTimeIT {
         ResultSet rs;
         PreparedStatement stmt;
     
-        Properties props = new Properties(TEST_PROPERTIES);
+        Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
         Connection conn = DriverManager.getConnection(getUrl(), props);
         conn.setAutoCommit(false);
     
@@ -340,7 +341,7 @@ public class AlterTableIT extends BaseHBaseManagedTimeIT {
         ResultSet rs;
         PreparedStatement stmt;
     
-        Properties props = new Properties(TEST_PROPERTIES);
+        Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
         Connection conn = DriverManager.getConnection(getUrl(), props);
         conn.setAutoCommit(false);
     
@@ -417,7 +418,7 @@ public class AlterTableIT extends BaseHBaseManagedTimeIT {
     
     @Test
     public void testSetSaltedTableAsImmutable() throws Exception {
-        Properties props = new Properties(TEST_PROPERTIES);
+        Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
         Connection conn = DriverManager.getConnection(getUrl(), props);
         conn.setAutoCommit(false);
         
@@ -451,7 +452,7 @@ public class AlterTableIT extends BaseHBaseManagedTimeIT {
     
     @Test
     public void testDropColumnFromSaltedTable() throws Exception {
-        Properties props = new Properties(TEST_PROPERTIES);
+        Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
         Connection conn = DriverManager.getConnection(getUrl(), props);
         conn.setAutoCommit(false);
         
@@ -485,7 +486,7 @@ public class AlterTableIT extends BaseHBaseManagedTimeIT {
     
     @Test
     public void testAddVarCols() throws Exception {
-        Properties props = new Properties(TEST_PROPERTIES);
+        Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
         Connection conn = DriverManager.getConnection(getUrl(), props);
         conn.setAutoCommit(false);
         
@@ -594,7 +595,7 @@ public class AlterTableIT extends BaseHBaseManagedTimeIT {
 
     @Test
     public void testDropVarCols() throws Exception {
-        Properties props = new Properties(TEST_PROPERTIES);
+        Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
         Connection conn = DriverManager.getConnection(getUrl(), props);
         conn.setAutoCommit(false);
         try {
@@ -614,7 +615,7 @@ public class AlterTableIT extends BaseHBaseManagedTimeIT {
     
     @Test
     public void 
testDisallowAddingNotNullableColumnNotPartOfPkForExistingTable() throws 
Exception {
-        Properties props = new Properties(TEST_PROPERTIES);
+        Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
         Connection conn = null;
         PreparedStatement stmt = null;
         try {
@@ -651,7 +652,7 @@ public class AlterTableIT extends BaseHBaseManagedTimeIT {
     public void testDisableWAL() throws Exception {
         String fullTableName = "TEST_TABLE";
         String fullIndexName = "I";
-        Properties props = new Properties(TEST_PROPERTIES);
+        Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
         Connection conn = DriverManager.getConnection(getUrl(), props);
 
         try {
@@ -745,7 +746,7 @@ public class AlterTableIT extends BaseHBaseManagedTimeIT {
     @Test
     public void testDropColumnsWithImutability() throws Exception {
 
-        Properties props = new Properties(TEST_PROPERTIES);
+        Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
         Connection conn = DriverManager.getConnection(getUrl(), props);
         conn.setAutoCommit(false);
 

http://git-wip-us.apache.org/repos/asf/phoenix/blob/a411c7b2/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 33545a4..ddc3f79 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
@@ -33,6 +33,7 @@ import java.sql.SQLException;
 import java.util.Properties;
 
 import org.apache.phoenix.exception.SQLExceptionCode;
+import org.apache.phoenix.util.PropertiesUtil;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
@@ -44,7 +45,7 @@ public class ArithmeticQueryIT extends BaseHBaseManagedTimeIT 
{
 
     @Test
     public void testDecimalUpsertValue() throws Exception {
-        Properties props = new Properties(TEST_PROPERTIES);
+        Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
         Connection conn = DriverManager.getConnection(getUrl(), props);
         conn.setAutoCommit(false);
         try {
@@ -128,7 +129,7 @@ public class ArithmeticQueryIT extends 
BaseHBaseManagedTimeIT {
 
     @Test
     public void testDecimalUpsertSelect() throws Exception {
-        Properties props = new Properties(TEST_PROPERTIES);
+        Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
         Connection conn = DriverManager.getConnection(getUrl(), props);
         conn.setAutoCommit(false);
         try {
@@ -236,7 +237,7 @@ public class ArithmeticQueryIT extends 
BaseHBaseManagedTimeIT {
 
     @Test
     public void testDecimalAveraging() throws Exception {
-        Properties props = new Properties(TEST_PROPERTIES);
+        Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
         Connection conn = DriverManager.getConnection(getUrl(), props);
         conn.setAutoCommit(false);
         try {
@@ -296,7 +297,7 @@ public class ArithmeticQueryIT extends 
BaseHBaseManagedTimeIT {
 
     @Test
     public void testDecimalArithmeticWithIntAndLong() throws Exception {
-        Properties props = new Properties(TEST_PROPERTIES);
+        Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
         Connection conn = DriverManager.getConnection(getUrl(), props);
         conn.setAutoCommit(false);
         try {
@@ -527,7 +528,7 @@ public class ArithmeticQueryIT extends 
BaseHBaseManagedTimeIT {
     public void testSumDouble() throws Exception {
         initSumDoubleValues(null, getUrl());
         String query = "SELECT SUM(d) FROM SumDoubleTest";
-        Properties props = new Properties(TEST_PROPERTIES);
+        Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
         Connection conn = DriverManager.getConnection(getUrl(), props);
         try {
             PreparedStatement statement = conn.prepareStatement(query);
@@ -544,7 +545,7 @@ public class ArithmeticQueryIT extends 
BaseHBaseManagedTimeIT {
     public void testSumUnsignedDouble() throws Exception {
         initSumDoubleValues(null, getUrl());
         String query = "SELECT SUM(ud) FROM SumDoubleTest";
-        Properties props = new Properties(TEST_PROPERTIES);
+        Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
         Connection conn = DriverManager.getConnection(getUrl(), props);
         try {
             PreparedStatement statement = conn.prepareStatement(query);
@@ -561,7 +562,7 @@ public class ArithmeticQueryIT extends 
BaseHBaseManagedTimeIT {
     public void testSumFloat() throws Exception {
         initSumDoubleValues(null, getUrl());
         String query = "SELECT SUM(f) FROM SumDoubleTest";
-        Properties props = new Properties(TEST_PROPERTIES);
+        Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
         Connection conn = DriverManager.getConnection(getUrl(), props);
         try {
             PreparedStatement statement = conn.prepareStatement(query);
@@ -578,7 +579,7 @@ public class ArithmeticQueryIT extends 
BaseHBaseManagedTimeIT {
     public void testSumUnsignedFloat() throws Exception {
         initSumDoubleValues(null, getUrl());
         String query = "SELECT SUM(uf) FROM SumDoubleTest";
-        Properties props = new Properties(TEST_PROPERTIES);
+        Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
         Connection conn = DriverManager.getConnection(getUrl(), props);
         try {
             PreparedStatement statement = conn.prepareStatement(query);

http://git-wip-us.apache.org/repos/asf/phoenix/blob/a411c7b2/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArrayIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArrayIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArrayIT.java
index 47d7265..a43cfb1 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArrayIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArrayIT.java
@@ -40,6 +40,7 @@ import java.util.Properties;
 import org.apache.phoenix.query.BaseTest;
 import org.apache.phoenix.schema.PhoenixArray;
 import org.apache.phoenix.util.PhoenixRuntime;
+import org.apache.phoenix.util.PropertiesUtil;
 import org.apache.phoenix.util.SchemaUtil;
 import org.apache.phoenix.util.StringUtil;
 import org.junit.Assert;
@@ -61,7 +62,7 @@ public class ArrayIT extends BaseClientManagedTimeIT {
                                getDefaultSplits(tenantId), null, ts - 2);
                initTablesWithArrays(tenantId, null, ts, false, getUrl());
                String query = "SELECT a_double_array, /* comment ok? */ 
b_string, a_float FROM table_with_array WHERE ?=organization_id and ?=a_float";
-               Properties props = new Properties(TEST_PROPERTIES);
+               Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
                props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB,
                                Long.toString(ts + 2)); // Execute at timestamp 
2
                Connection conn = DriverManager.getConnection(getUrl(), props);
@@ -97,7 +98,7 @@ public class ArrayIT extends BaseClientManagedTimeIT {
                                getDefaultSplits(tenantId), null, ts - 2);
                initTablesWithArrays(tenantId, null, ts, false, getUrl());
                String query = "SELECT a_double_array, /* comment ok? */ 
b_string, a_float FROM table_with_array WHERE ?=organization_id and 
?=a_byte_array";
-               Properties props = new Properties(TEST_PROPERTIES);
+               Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
                props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB,
                                Long.toString(ts + 2)); // Execute at timestamp 
2
                Connection conn = DriverManager.getConnection(getUrl(), props);
@@ -137,7 +138,7 @@ public class ArrayIT extends BaseClientManagedTimeIT {
                                getDefaultSplits(tenantId), null, ts - 2);
                initTablesWithArrays(tenantId, null, ts, false, getUrl());
                String query = "SELECT a_double_array, /* comment ok? */ 
b_string, a_float FROM table_with_array WHERE ?=organization_id and 
?=a_string_array";
-               Properties props = new Properties(TEST_PROPERTIES);
+               Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
                props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB,
                                Long.toString(ts + 2)); // Execute at timestamp 
2
                Connection conn = DriverManager.getConnection(getUrl(), props);
@@ -179,7 +180,7 @@ public class ArrayIT extends BaseClientManagedTimeIT {
                                getDefaultSplits(tenantId), null, ts - 2);
                initTablesWithArrays(tenantId, null, ts, false, getUrl());
                String query = "SELECT a_string_array FROM table_with_array";
-               Properties props = new Properties(TEST_PROPERTIES);
+               Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
                props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB,
                                Long.toString(ts + 2)); // Execute at timestamp 
2
                Connection conn = DriverManager.getConnection(getUrl(), props);
@@ -210,7 +211,7 @@ public class ArrayIT extends BaseClientManagedTimeIT {
                                getDefaultSplits(tenantId), null, ts - 2);
                initTablesWithArrays(tenantId, null, ts, false, getUrl());
                String query = "SELECT ARRAY_ELEM(a_double_array,2) FROM 
table_with_array";
-               Properties props = new Properties(TEST_PROPERTIES);
+               Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
                props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB,
                                Long.toString(ts + 2)); // Execute at timestamp 
2
                Connection conn = DriverManager.getConnection(getUrl(), props);
@@ -238,7 +239,7 @@ public class ArrayIT extends BaseClientManagedTimeIT {
                                getDefaultSplits(tenantId), null, ts - 2);
                initTablesWithArrays(tenantId, null, ts, false, getUrl());
                String query = "SELECT a_double_array[3] FROM table_with_array";
-               Properties props = new Properties(TEST_PROPERTIES);
+               Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
                props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB,
                                Long.toString(ts + 2)); // Execute at timestamp 
2
                Connection conn = DriverManager.getConnection(getUrl(), props);
@@ -265,7 +266,7 @@ public class ArrayIT extends BaseClientManagedTimeIT {
                 getDefaultSplits(tenantId), null, ts - 2);
         initTablesWithArrays(tenantId, null, ts, false, getUrl());
         String query = "SELECT CASE WHEN A_INTEGER = 1 THEN a_double_array 
ELSE null END [3] FROM table_with_array";
-        Properties props = new Properties(TEST_PROPERTIES);
+        Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
         props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB,
                 Long.toString(ts + 2)); // Execute at timestamp 2
         Connection conn = DriverManager.getConnection(getUrl(), props);
@@ -291,7 +292,7 @@ public class ArrayIT extends BaseClientManagedTimeIT {
         createTableWithArray(getUrl(), getDefaultSplits(tenantId), null, ts - 
2);
         String query = "upsert into 
table_with_array(ORGANIZATION_ID,ENTITY_ID,a_double_array) values('" + tenantId
                 + "','00A123122312312',ARRAY[2.0,345.8])";
-        Properties props = new Properties(TEST_PROPERTIES);
+        Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
         props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, 
Long.toString(ts)); // Execute
                                                                                
  // at
         Connection conn = DriverManager.getConnection(getUrl(), props);
@@ -303,7 +304,7 @@ public class ArrayIT extends BaseClientManagedTimeIT {
             statement.close();
             conn.close();
             // create another connection
-            props = new Properties(TEST_PROPERTIES);
+            props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
             props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, 
Long.toString(ts + 2)); // Execute at timestamp 2
             conn = DriverManager.getConnection(getUrl(), props);
             query = "SELECT ARRAY_ELEM(a_double_array,2) FROM 
table_with_array";
@@ -331,7 +332,7 @@ public class ArrayIT extends BaseClientManagedTimeIT {
         try {
             createSimpleTableWithArray(getUrl(), getDefaultSplits(tenantId), 
null, ts - 2);
             initSimpleArrayTable(tenantId, null, ts, false);
-            Properties props = new Properties(TEST_PROPERTIES);
+            Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
             props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, 
Long.toString(ts + 2)); // Execute at timestamp 2
             conn = DriverManager.getConnection(getUrl(), props);
             String query = "upsert into 
table_with_array(ORGANIZATION_ID,ENTITY_ID,a_double_array) "
@@ -344,7 +345,7 @@ public class ArrayIT extends BaseClientManagedTimeIT {
             statement.close();
             conn.close();
             // create another connection
-            props = new Properties(TEST_PROPERTIES);
+            props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
             props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, 
Long.toString(ts + 4));
             conn = DriverManager.getConnection(getUrl(), props);
             query = "SELECT ARRAY_ELEM(a_double_array,2) FROM 
table_with_array";
@@ -374,7 +375,7 @@ public class ArrayIT extends BaseClientManagedTimeIT {
         try {
             createSimpleTableWithArray(getUrl(), getDefaultSplits(tenantId), 
null, ts - 2);
             initSimpleArrayTable(tenantId, null, ts, false);
-            Properties props = new Properties(TEST_PROPERTIES);
+            Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
             props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, 
Long.toString(ts + 2)); // Execute at timestamp 2
             conn = DriverManager.getConnection(getUrl(), props);
             String query = "SELECT a_double_array[1]  FROM " + 
SIMPLE_TABLE_WITH_ARRAY
@@ -404,7 +405,7 @@ public class ArrayIT extends BaseClientManagedTimeIT {
         try {
             createSimpleTableWithArray(getUrl(), getDefaultSplits(tenantId), 
null, ts - 2);
             initSimpleArrayTable(tenantId, null, ts, false);
-            Properties props = new Properties(TEST_PROPERTIES);
+            Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
             props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, 
Long.toString(ts + 2)); // Execute at timestamp 2
             conn = DriverManager.getConnection(getUrl(), props);
             String query = "SELECT a_double_array[1]  FROM " + 
SIMPLE_TABLE_WITH_ARRAY
@@ -433,7 +434,7 @@ public class ArrayIT extends BaseClientManagedTimeIT {
         try {
             createSimpleTableWithArray(getUrl(), getDefaultSplits(tenantId), 
null, ts - 2);
             initSimpleArrayTable(tenantId, null, ts, false);
-            Properties props = new Properties(TEST_PROPERTIES);
+            Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
             props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, 
Long.toString(ts + 2)); // Execute at timestamp 2
             conn = DriverManager.getConnection(getUrl(), props);
             String query = "SELECT a_double_array[1]  FROM " + 
SIMPLE_TABLE_WITH_ARRAY
@@ -457,7 +458,7 @@ public class ArrayIT extends BaseClientManagedTimeIT {
         try {
             createSimpleTableWithArray(getUrl(), getDefaultSplits(tenantId), 
null, ts - 2);
             initSimpleArrayTable(tenantId, null, ts, false);
-            Properties props = new Properties(TEST_PROPERTIES);
+            Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
             props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, 
Long.toString(ts + 2)); // Execute at timestamp 2
             conn = DriverManager.getConnection(getUrl(), props);
             String query = "SELECT a_double_array[1]  FROM " + 
SIMPLE_TABLE_WITH_ARRAY
@@ -486,7 +487,7 @@ public class ArrayIT extends BaseClientManagedTimeIT {
         try {
             createSimpleTableWithArray(getUrl(), getDefaultSplits(tenantId), 
null, ts - 2);
             initSimpleArrayTable(tenantId, null, ts, false);
-            Properties props = new Properties(TEST_PROPERTIES);
+            Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
             props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, 
Long.toString(ts + 2)); // Execute at timestamp 2
             conn = DriverManager.getConnection(getUrl(), props);
             String query = "SELECT a_double_array[1], a_double_array[2]  FROM 
" + SIMPLE_TABLE_WITH_ARRAY
@@ -517,7 +518,7 @@ public class ArrayIT extends BaseClientManagedTimeIT {
             String tenantId = getOrganizationId();
             createTableWithArray(getUrl(), getDefaultSplits(tenantId), null, 
ts - 2);
             initTablesWithArrays(tenantId, null, ts, false, getUrl());
-            Properties props = new Properties(TEST_PROPERTIES);
+            Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
             props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, 
Long.toString(ts + 2)); // Execute at timestamp 2
             conn = DriverManager.getConnection(getUrl(), props);
             String query = "SELECT a_string_array[1]  FROM " + TABLE_WITH_ARRAY
@@ -552,7 +553,7 @@ public class ArrayIT extends BaseClientManagedTimeIT {
         initTablesWithArrays(tenantId, null, ts, false, getUrl());
         String query = "SELECT a_integer,ARRAY[1,2,a_integer] FROM 
table_with_array where organization_id =  '"
                 + tenantId + "'";
-        Properties props = new Properties(TEST_PROPERTIES);
+        Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
         props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts 
+ 2)); // Execute at timestamp 2
         Connection conn = DriverManager.getConnection(getUrl(), props);
         try {
@@ -583,7 +584,7 @@ public class ArrayIT extends BaseClientManagedTimeIT {
         initTablesWithArrays(tenantId, null, ts, false, getUrl());
         String query = "SELECT b_string,ARRAY['abc','defgh',b_string] FROM 
table_with_array where organization_id =  '"
                 + tenantId + "'";
-        Properties props = new Properties(TEST_PROPERTIES);
+        Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
         props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts 
+ 2)); // Execute at timestamp 2
         Connection conn = DriverManager.getConnection(getUrl(), props);
         try {
@@ -614,7 +615,7 @@ public class ArrayIT extends BaseClientManagedTimeIT {
         initTablesWithArrays(tenantId, null, ts, false, getUrl());
         String query = "SELECT 
b_string,ARRAY['abc',null,'bcd',null,null,b_string] FROM table_with_array where 
organization_id =  '"
                 + tenantId + "'";
-        Properties props = new Properties(TEST_PROPERTIES);
+        Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
         props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts 
+ 2)); // Execute at timestamp 2
         Connection conn = DriverManager.getConnection(getUrl(), props);
         try {
@@ -649,7 +650,7 @@ public class ArrayIT extends BaseClientManagedTimeIT {
         try {
             createSimpleTableWithArray(getUrl(), getDefaultSplits(tenantId), 
null, ts - 2);
             initSimpleArrayTable(tenantId, null, ts, false);
-            Properties props = new Properties(TEST_PROPERTIES);
+            Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
             props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, 
Long.toString(ts + 2)); // Execute at timestamp 2
             conn = DriverManager.getConnection(getUrl(), props);
             String query = "upsert into 
table_with_array(ORGANIZATION_ID,ENTITY_ID, a_unsigned_double, a_double_array) "
@@ -662,7 +663,7 @@ public class ArrayIT extends BaseClientManagedTimeIT {
             statement.close();
             conn.close();
             // create another connection
-            props = new Properties(TEST_PROPERTIES);
+            props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
             props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, 
Long.toString(ts + 4));
             conn = DriverManager.getConnection(getUrl(), props);
             query = "SELECT ARRAY_ELEM(a_double_array,2) FROM 
table_with_array";
@@ -690,7 +691,7 @@ public class ArrayIT extends BaseClientManagedTimeIT {
         createSimpleTableWithArray(getUrl(), getDefaultSplits(tenantId), null, 
ts - 2);
         initSimpleArrayTable(tenantId, null, ts, false);
         String query = "SELECT a_char_array[2] FROM SIMPLE_TABLE_WITH_ARRAY";
-        Properties props = new Properties(TEST_PROPERTIES);
+        Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
         props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts 
+ 2)); // Execute at timestamp 2
         Connection conn = DriverManager.getConnection(getUrl(), props);
         try {
@@ -712,7 +713,7 @@ public class ArrayIT extends BaseClientManagedTimeIT {
         PreparedStatement stmt;
         ResultSet rs;
         long ts = nextTimestamp();
-        Properties props = new Properties(TEST_PROPERTIES);
+        Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
         props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts 
+ 10));
         conn = DriverManager.getConnection(getUrl(), props);
         conn.createStatement().execute(
@@ -748,7 +749,7 @@ public class ArrayIT extends BaseClientManagedTimeIT {
         PreparedStatement stmt;
         ResultSet rs;
         long ts = nextTimestamp();
-        Properties props = new Properties(TEST_PROPERTIES);
+        Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
         props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts 
+ 10));
         conn = DriverManager.getConnection(getUrl(), props);
         conn.createStatement().execute("CREATE TABLE t ( k VARCHAR PRIMARY 
KEY, a Float ARRAY[])");
@@ -776,7 +777,7 @@ public class ArrayIT extends BaseClientManagedTimeIT {
         PreparedStatement stmt;
         ResultSet rs;
         long ts = nextTimestamp();
-        Properties props = new Properties(TEST_PROPERTIES);
+        Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
         props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts 
+ 10));
         conn = DriverManager.getConnection(getUrl(), props);
         conn.createStatement().execute("CREATE TABLE t ( k VARCHAR PRIMARY 
KEY, a bigint ARRAY[])");
@@ -808,7 +809,7 @@ public class ArrayIT extends BaseClientManagedTimeIT {
         PreparedStatement stmt;
         ResultSet rs;
         long ts = nextTimestamp();
-        Properties props = new Properties(TEST_PROPERTIES);
+        Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
         props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts 
+ 10));
         conn = DriverManager.getConnection(getUrl(), props);
         conn.createStatement().execute("CREATE TABLE t ( k VARCHAR PRIMARY 
KEY, a bigint ARRAY[])");
@@ -841,7 +842,7 @@ public class ArrayIT extends BaseClientManagedTimeIT {
         PreparedStatement stmt;
         ResultSet rs;
         long ts = nextTimestamp();
-        Properties props = new Properties(TEST_PROPERTIES);
+        Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
         props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts 
+ 10));
         conn = DriverManager.getConnection(getUrl(), props);
         conn.createStatement().execute("CREATE TABLE t ( k VARCHAR PRIMARY 
KEY, a VARCHAR(5) ARRAY)");
@@ -876,7 +877,7 @@ public class ArrayIT extends BaseClientManagedTimeIT {
         ResultSet rs;
         
         long ts = nextTimestamp();
-        Properties props = new Properties(TEST_PROPERTIES);
+        Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
         props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts 
+ 10));
         conn = DriverManager.getConnection(getUrl(), props);
         conn.createStatement().execute("CREATE TABLE t ( k VARCHAR PRIMARY 
KEY, a CHAR(5) ARRAY)");
@@ -917,7 +918,7 @@ public class ArrayIT extends BaseClientManagedTimeIT {
                                getDefaultSplits(tenantId), null, ts - 2);
                initTablesWithArrays(tenantId, null, ts, false, getUrl());
                String query = "SELECT a_double_array FROM TABLE_WITH_ARRAY 
WHERE a_double_array = ARRAY [ 25.343d, 36.763d, 37.56d,386.63d]";
-               Properties props = new Properties(TEST_PROPERTIES);
+               Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
                props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB,
                                Long.toString(ts + 2)); // Execute at timestamp 
2
                Connection conn = DriverManager.getConnection(getUrl(), props);
@@ -948,7 +949,7 @@ public class ArrayIT extends BaseClientManagedTimeIT {
                initTablesWithArrays(tenantId, null, ts, false, getUrl());
                int a_index = 0;
                String query = "SELECT a_double_array[2] FROM table_with_array 
where a_double_array["+a_index+"2]<?";
-               Properties props = new Properties(TEST_PROPERTIES);
+               Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
                props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB,
                                Long.toString(ts + 2)); // Execute at timestamp 
2
                Connection conn = DriverManager.getConnection(getUrl(), props);
@@ -979,7 +980,7 @@ public class ArrayIT extends BaseClientManagedTimeIT {
                                getDefaultSplits(tenantId), null, ts - 2);
                initTablesWithArrays(tenantId, null, ts, false, getUrl());
                String query = "SELECT a_double_array[2] FROM table_with_array  
GROUP BY a_double_array[2]";
-               Properties props = new Properties(TEST_PROPERTIES);
+               Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
                props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB,
                                Long.toString(ts + 2)); // Execute at timestamp 
2
                Connection conn = DriverManager.getConnection(getUrl(), props);
@@ -1008,7 +1009,7 @@ public class ArrayIT extends BaseClientManagedTimeIT {
                                getDefaultSplits(tenantId), null, ts - 2);
                initTablesWithArrays(tenantId, null, ts, true, getUrl());
                String query = "SELECT a_string_array[2] FROM table_with_array";
-               Properties props = new Properties(TEST_PROPERTIES);
+               Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
                props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB,
                                Long.toString(ts + 2)); // Execute at timestamp 
2
                Connection conn = DriverManager.getConnection(getUrl(), props);
@@ -1033,7 +1034,7 @@ public class ArrayIT extends BaseClientManagedTimeIT {
                 getDefaultSplits(tenantId), null, ts - 2);
         initTablesWithArrays(tenantId, null, ts, false, getUrl());
         String query = "SELECT a_string_array[3],A_INTEGER FROM 
table_with_array";
-        Properties props = new Properties(TEST_PROPERTIES);
+        Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
         props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB,
                 Long.toString(ts + 2)); // Execute at timestamp 2
         Connection conn = DriverManager.getConnection(getUrl(), props);
@@ -1061,7 +1062,7 @@ public class ArrayIT extends BaseClientManagedTimeIT {
                 getDefaultSplits(tenantId), null, ts - 2);
         initTablesWithArrays(tenantId, null, ts, false, getUrl());
         String query = "SELECT A_INTEGER, a_string_array[3] FROM 
table_with_array";
-        Properties props = new Properties(TEST_PROPERTIES);
+        Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
         props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB,
                 Long.toString(ts + 2)); // Execute at timestamp 2
         Connection conn = DriverManager.getConnection(getUrl(), props);
@@ -1089,7 +1090,7 @@ public class ArrayIT extends BaseClientManagedTimeIT {
                 getDefaultSplits(tenantId), null, ts - 2);
         initTablesWithArrays(tenantId, null, ts, false, getUrl());
         String query = "SELECT  a_string_array[3], a_double_array[2] FROM 
table_with_array";
-        Properties props = new Properties(TEST_PROPERTIES);
+        Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
         props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB,
                 Long.toString(ts + 2)); // Execute at timestamp 2
         Connection conn = DriverManager.getConnection(getUrl(), props);
@@ -1119,7 +1120,7 @@ public class ArrayIT extends BaseClientManagedTimeIT {
                 getDefaultSplits(tenantId), null, ts - 2);
         initTablesWithArrays(tenantId, null, ts, false, getUrl());
         String query = "SELECT a_string_array[1], a_string_array[3] FROM 
table_with_array";
-        Properties props = new Properties(TEST_PROPERTIES);
+        Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
         props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB,
                 Long.toString(ts + 2)); // Execute at timestamp 2
         Connection conn = DriverManager.getConnection(getUrl(), props);
@@ -1148,7 +1149,7 @@ public class ArrayIT extends BaseClientManagedTimeIT {
                 getDefaultSplits(tenantId), null, ts - 2);
         initTablesWithArrays(tenantId, null, ts, false, getUrl());
         String query = "SELECT a_string_array[3], a_string_array[3] FROM 
table_with_array";
-        Properties props = new Properties(TEST_PROPERTIES);
+        Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
         props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB,
                 Long.toString(ts + 2)); // Execute at timestamp 2
         Connection conn = DriverManager.getConnection(getUrl(), props);
@@ -1176,7 +1177,7 @@ public class ArrayIT extends BaseClientManagedTimeIT {
                                getDefaultSplits(tenantId), null, ts - 2);
                initTablesWithArrays(tenantId, null, ts, false, getUrl());
                String query = "SELECT a_string_array[3] FROM table_with_array";
-               Properties props = new Properties(TEST_PROPERTIES);
+               Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
                props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB,
                                Long.toString(ts + 2)); // Execute at timestamp 
2
                Connection conn = DriverManager.getConnection(getUrl(), props);
@@ -1202,7 +1203,7 @@ public class ArrayIT extends BaseClientManagedTimeIT {
                                getDefaultSplits(tenantId), null, ts - 2);
                initTablesWithArrays(tenantId, null, ts, false, getUrl());
                String query = "SELECT a_double_array[100] FROM 
table_with_array";
-               Properties props = new Properties(TEST_PROPERTIES);
+               Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
                props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB,
                                Long.toString(ts + 2)); // Execute at timestamp 
2
                Connection conn = DriverManager.getConnection(getUrl(), props);
@@ -1230,7 +1231,7 @@ public class ArrayIT extends BaseClientManagedTimeIT {
                                getDefaultSplits(tenantId), null, ts - 2);
                initTablesWithArrays(tenantId, null, ts, false, getUrl());
                String query = "SELECT ARRAY_LENGTH(a_string_array) FROM 
table_with_array";
-               Properties props = new Properties(TEST_PROPERTIES);
+               Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
                props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB,
                                Long.toString(ts + 2)); // Execute at timestamp 
2
                Connection conn = DriverManager.getConnection(getUrl(), props);
@@ -1255,7 +1256,7 @@ public class ArrayIT extends BaseClientManagedTimeIT {
                                getDefaultSplits(tenantId), null, ts - 2);
                initTablesWithArrays(tenantId, null, ts, false, getUrl());
                String query = "SELECT ARRAY_LENGTH(a_double_array) FROM 
table_with_array";
-               Properties props = new Properties(TEST_PROPERTIES);
+               Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
                props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB,
                                Long.toString(ts + 2)); // Execute at timestamp 
2
                Connection conn = DriverManager.getConnection(getUrl(), props);
@@ -1277,7 +1278,7 @@ public class ArrayIT extends BaseClientManagedTimeIT {
         String tenantId = getOrganizationId();
         createTableWithArray(getUrl(),
                 getDefaultSplits(tenantId), null, ts - 2);
-        Properties props = new Properties(TEST_PROPERTIES);
+        Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
         props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB,
                 Long.toString(ts + 2)); // Execute at timestamp 2
         Connection conn = DriverManager.getConnection(getUrl(), props);
@@ -1309,7 +1310,7 @@ public class ArrayIT extends BaseClientManagedTimeIT {
         ResultSet rs;
         
         long ts = nextTimestamp();
-        Properties props = new Properties(TEST_PROPERTIES);
+        Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
         props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts 
+ 10));
         conn = DriverManager.getConnection(getUrl(), props);
         conn.createStatement()
@@ -1347,7 +1348,7 @@ public class ArrayIT extends BaseClientManagedTimeIT {
         ResultSet rs;
 
         long ts = nextTimestamp();
-        Properties props = new Properties(TEST_PROPERTIES);
+        Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
         props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts 
+ 10));
         conn = DriverManager.getConnection(getUrl(), props);
         conn.createStatement()
@@ -1385,7 +1386,7 @@ public class ArrayIT extends BaseClientManagedTimeIT {
         ResultSet rs;
 
         long ts = nextTimestamp();
-        Properties props = new Properties(TEST_PROPERTIES);
+        Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
         props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts 
+ 10));
         conn = DriverManager.getConnection(getUrl(), props);
         conn.createStatement()
@@ -1423,7 +1424,7 @@ public class ArrayIT extends BaseClientManagedTimeIT {
         createTableWithArray(getUrl(), getDefaultSplits(tenantId), null, ts - 
2);
         String query = "upsert into 
table_with_array(ORGANIZATION_ID,ENTITY_ID,a_double_array) values('" + tenantId
                 + "','00A123122312312',null)";
-        Properties props = new Properties(TEST_PROPERTIES);
+        Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
         props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, 
Long.toString(ts)); // Execute
                                                                                
  // at
         Connection conn = DriverManager.getConnection(getUrl(), props);
@@ -1435,7 +1436,7 @@ public class ArrayIT extends BaseClientManagedTimeIT {
             statement.close();
             conn.close();
             // create another connection
-            props = new Properties(TEST_PROPERTIES);
+            props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
             props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, 
Long.toString(ts + 2)); // Execute at timestamp 2
             conn = DriverManager.getConnection(getUrl(), props);
             query = "SELECT ARRAY_ELEM(a_double_array,2) FROM 
table_with_array";
@@ -1460,7 +1461,7 @@ public class ArrayIT extends BaseClientManagedTimeIT {
         String tenantId = getOrganizationId();
         createTableWithArray(getUrl(), getDefaultSplits(tenantId), null, ts - 
2);
         String query = "upsert into 
table_with_array(ORGANIZATION_ID,ENTITY_ID,a_string_array) values(?, ?, ?)";
-        Properties props = new Properties(TEST_PROPERTIES);
+        Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
         props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, 
Long.toString(ts)); // Execute
                                                                                
  // at
         Connection conn = DriverManager.getConnection(getUrl(), props);
@@ -1475,7 +1476,7 @@ public class ArrayIT extends BaseClientManagedTimeIT {
             statement.close();
             conn.close();
             // create another connection
-            props = new Properties(TEST_PROPERTIES);
+            props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
             props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, 
Long.toString(ts + 2)); // Execute at timestamp 2
             conn = DriverManager.getConnection(getUrl(), props);
             query = "SELECT ARRAY_ELEM(a_string_array,1) FROM 
table_with_array";
@@ -1499,7 +1500,7 @@ public class ArrayIT extends BaseClientManagedTimeIT {
         PreparedStatement stmt;
         ResultSet rs;
         long ts = nextTimestamp();
-        Properties props = new Properties(TEST_PROPERTIES);
+        Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
         props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts 
+ 10));
         conn = DriverManager.getConnection(getUrl(), props);
         conn.createStatement()
@@ -1535,7 +1536,7 @@ public class ArrayIT extends BaseClientManagedTimeIT {
     public void testPKWithArrayNotInEnd() throws Exception {
         Connection conn;
         long ts = nextTimestamp();
-        Properties props = new Properties(TEST_PROPERTIES);
+        Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
         props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts 
+ 10));
         conn = DriverManager.getConnection(getUrl(), props);
         try {
@@ -1557,7 +1558,7 @@ public class ArrayIT extends BaseClientManagedTimeIT {
     public void testArrayRefToLiteral() throws Exception {
         Connection conn;
         long ts = nextTimestamp();
-        Properties props = new Properties(TEST_PROPERTIES);
+        Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
         props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts 
+ 10));
         conn = DriverManager.getConnection(getUrl(), props);
         try {

http://git-wip-us.apache.org/repos/asf/phoenix/blob/a411c7b2/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 b117ced..b6aa056 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
@@ -28,6 +28,7 @@ import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.util.Properties;
 
+import org.apache.phoenix.util.PropertiesUtil;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
@@ -37,7 +38,7 @@ public class AutoCommitIT extends BaseHBaseManagedTimeIT {
     @Test
     public void testMutationJoin() throws Exception {
         
-        Properties props = new Properties(TEST_PROPERTIES);
+        Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
         Connection conn = DriverManager.getConnection(getUrl(), props);
         conn.setAutoCommit(true);
         

http://git-wip-us.apache.org/repos/asf/phoenix/blob/a411c7b2/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseParallelIteratorsRegionSplitterIT.java
----------------------------------------------------------------------
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseParallelIteratorsRegionSplitterIT.java
 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseParallelIteratorsRegionSplitterIT.java
index 0bc3324..d2d3c7e 100644
--- 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseParallelIteratorsRegionSplitterIT.java
+++ 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseParallelIteratorsRegionSplitterIT.java
@@ -32,6 +32,7 @@ import org.apache.phoenix.query.QueryServices;
 import org.apache.phoenix.schema.PTableKey;
 import org.apache.phoenix.schema.TableRef;
 import org.apache.phoenix.util.PhoenixRuntime;
+import org.apache.phoenix.util.PropertiesUtil;
 import org.apache.phoenix.util.ReadOnlyProps;
 import org.junit.BeforeClass;
 import org.junit.experimental.categories.Category;
@@ -71,7 +72,7 @@ public class BaseParallelIteratorsRegionSplitterIT extends 
BaseClientManagedTime
         byte[][] splits = new byte[][] {K3,K4,K9,K11};
         ensureTableCreated(getUrl(),STABLE_NAME,splits, ts-2);
         String url = getUrl() + ";" + PhoenixRuntime.CURRENT_SCN_ATTRIB + "=" 
+ ts;
-        Properties props = new Properties(TEST_PROPERTIES);
+        Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
         Connection conn = DriverManager.getConnection(url, props);
         PreparedStatement stmt = conn.prepareStatement(
                 "upsert into " + STABLE_NAME + " VALUES (?, ?)");

http://git-wip-us.apache.org/repos/asf/phoenix/blob/a411c7b2/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 d55cfd0..e4aa070 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
@@ -30,6 +30,7 @@ import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.Properties;
 
+import org.apache.phoenix.util.PropertiesUtil;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
@@ -37,7 +38,7 @@ import org.junit.experimental.categories.Category;
 public class BinaryRowKeyIT extends BaseHBaseManagedTimeIT {
 
     private static void initTableValues() throws SQLException {
-        Properties props = new Properties(TEST_PROPERTIES);
+        Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
         Connection conn = DriverManager.getConnection(getUrl(), props);
         conn.setAutoCommit(false);
         
@@ -73,7 +74,7 @@ public class BinaryRowKeyIT extends BaseHBaseManagedTimeIT {
 
     @Test
     public void testInsertPaddedBinaryValue() throws SQLException {
-        Properties props = new Properties(TEST_PROPERTIES);
+        Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
         Connection conn = DriverManager.getConnection(getUrl(), props);
         try {
             initTableValues();
@@ -99,7 +100,7 @@ public class BinaryRowKeyIT extends BaseHBaseManagedTimeIT {
 
     @Test
     public void testSelectValues() throws SQLException {
-        Properties props = new Properties(TEST_PROPERTIES);
+        Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
         Connection conn = DriverManager.getConnection(getUrl(), props);
         
         try {
@@ -125,7 +126,7 @@ public class BinaryRowKeyIT extends BaseHBaseManagedTimeIT {
 
     @Test
     public void testUpsertSelectValues() throws SQLException {
-        Properties props = new Properties(TEST_PROPERTIES);
+        Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
         Connection conn = DriverManager.getConnection(getUrl(), props);
         
         try {

http://git-wip-us.apache.org/repos/asf/phoenix/blob/a411c7b2/phoenix-core/src/it/java/org/apache/phoenix/end2end/CaseStatementIT.java
----------------------------------------------------------------------
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/CaseStatementIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/CaseStatementIT.java
index 7babfb9..57838a0 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/CaseStatementIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/CaseStatementIT.java
@@ -45,6 +45,7 @@ import java.util.List;
 import java.util.Properties;
 
 import org.apache.phoenix.util.PhoenixRuntime;
+import org.apache.phoenix.util.PropertiesUtil;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 import org.junit.runner.RunWith;
@@ -70,7 +71,7 @@ public class CaseStatementIT extends QueryIT {
     public void testSimpleCaseStatement() throws Exception {
         String query = "SELECT CASE a_integer WHEN 1 THEN 'a' WHEN 2 THEN 'b' 
WHEN 3 THEN 'c' ELSE 'd' END, entity_id AS a FROM ATABLE WHERE 
organization_id=? AND a_integer < 6";
         String url = getUrl() + ";" + PhoenixRuntime.CURRENT_SCN_ATTRIB + "=" 
+ (ts + 5); // Run query at timestamp 5
-        Properties props = new Properties(TEST_PROPERTIES);
+        Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
         Connection conn = DriverManager.getConnection(url, props);
         try {
             PreparedStatement statement = conn.prepareStatement(query);
@@ -93,7 +94,7 @@ public class CaseStatementIT extends QueryIT {
     public void testMultiCondCaseStatement() throws Exception {
         String query = "SELECT CASE WHEN a_integer <= 2 THEN 1.5 WHEN 
a_integer = 3 THEN 2 WHEN a_integer <= 6 THEN 4.5 ELSE 5 END AS a FROM ATABLE 
WHERE organization_id=?";
         String url = getUrl() + ";" + PhoenixRuntime.CURRENT_SCN_ATTRIB + "=" 
+ (ts + 5); // Run query at timestamp 5
-        Properties props = new Properties(TEST_PROPERTIES);
+        Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
         Connection conn = DriverManager.getConnection(url, props);
         try {
             PreparedStatement statement = conn.prepareStatement(query);
@@ -127,7 +128,7 @@ public class CaseStatementIT extends QueryIT {
     public void testPartialEvalCaseStatement() throws Exception {
         String query = "SELECT entity_id FROM ATABLE WHERE organization_id=? 
and CASE WHEN 1234 = a_integer THEN 1 WHEN x_integer = 5 THEN 2 ELSE 3 END = 2";
         String url = getUrl() + ";" + PhoenixRuntime.CURRENT_SCN_ATTRIB + "=" 
+ (ts + 5); // Run query at timestamp 5
-        Properties props = new Properties(TEST_PROPERTIES);
+        Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
         Connection conn = DriverManager.getConnection(url, props);
         try {
             PreparedStatement statement = conn.prepareStatement(query);
@@ -145,7 +146,7 @@ public class CaseStatementIT extends QueryIT {
     public void testFoundIndexOnPartialEvalCaseStatement() throws Exception {
         String query = "SELECT entity_id FROM ATABLE WHERE organization_id=? 
and CASE WHEN a_integer = 1234 THEN 1 WHEN x_integer = 3 THEN y_integer ELSE 3 
END = 300";
         String url = getUrl() + ";" + PhoenixRuntime.CURRENT_SCN_ATTRIB + "=" 
+ (ts + 5); // Run query at timestamp 5
-        Properties props = new Properties(TEST_PROPERTIES);
+        Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
         Connection conn = DriverManager.getConnection(url, props);
         try {
             PreparedStatement statement = conn.prepareStatement(query);
@@ -164,7 +165,7 @@ public class CaseStatementIT extends QueryIT {
     public void testUnfoundMultiColumnCaseStatement() throws Exception {
         String query = "SELECT entity_id, b_string FROM ATABLE WHERE 
organization_id=? and CASE WHEN a_integer = 1234 THEN 1 WHEN a_date < ? THEN 
y_integer WHEN x_integer = 4 THEN 4 ELSE 3 END = 4";
         String url = getUrl() + ";" + PhoenixRuntime.CURRENT_SCN_ATTRIB + "=" 
+ (ts + 5); // Run query at timestamp 5
-        Properties props = new Properties(TEST_PROPERTIES);
+        Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
         Connection conn = DriverManager.getConnection(url, props);
         try {
             PreparedStatement statement = conn.prepareStatement(query);
@@ -183,7 +184,7 @@ public class CaseStatementIT extends QueryIT {
     public void testUnfoundSingleColumnCaseStatement() throws Exception {
         String query = "SELECT entity_id, b_string FROM ATABLE WHERE 
organization_id=? and CASE WHEN a_integer = 0 or a_integer != 0 THEN 1 ELSE 0 
END = 0";
         String url = getUrl() + ";" + PhoenixRuntime.CURRENT_SCN_ATTRIB + "=" 
+ (ts + 5); // Run query at timestamp 5
-        Properties props = new Properties(TEST_PROPERTIES);
+        Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
         Connection conn = DriverManager.getConnection(url, props);
         // Set ROW5.A_INTEGER to null so that we have one row
         // where the else clause of the CASE statement will
@@ -216,7 +217,7 @@ public class CaseStatementIT extends QueryIT {
     public void testNonNullMultiCondCaseStatement() throws Exception {
         String query = "SELECT CASE WHEN entity_id = '000000000000000' THEN 1 
WHEN entity_id = '000000000000001' THEN 2 ELSE 3 END FROM ATABLE WHERE 
organization_id=?";
         String url = getUrl() + ";" + PhoenixRuntime.CURRENT_SCN_ATTRIB + "=" 
+ (ts + 5); // Run query at timestamp 5
-        Properties props = new Properties(TEST_PROPERTIES);
+        Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
         Connection conn = DriverManager.getConnection(url, props);
         try {
             PreparedStatement statement = conn.prepareStatement(query);
@@ -233,7 +234,7 @@ public class CaseStatementIT extends QueryIT {
     public void testNullMultiCondCaseStatement() throws Exception {
         String query = "SELECT CASE WHEN entity_id = '000000000000000' THEN 1 
WHEN entity_id = '000000000000001' THEN 2 END FROM ATABLE WHERE 
organization_id=?";
         String url = getUrl() + ";" + PhoenixRuntime.CURRENT_SCN_ATTRIB + "=" 
+ (ts + 5); // Run query at timestamp 5
-        Properties props = new Properties(TEST_PROPERTIES);
+        Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
         Connection conn = DriverManager.getConnection(url, props);
         try {
             PreparedStatement statement = conn.prepareStatement(query);
@@ -250,7 +251,7 @@ public class CaseStatementIT extends QueryIT {
     public void testNullabilityMultiCondCaseStatement() throws Exception {
         String query = "SELECT CASE WHEN a_integer <= 2 THEN ? WHEN a_integer 
= 3 THEN ? WHEN a_integer <= ? THEN ? ELSE 5 END AS a FROM ATABLE WHERE 
organization_id=?";
         String url = getUrl() + ";" + PhoenixRuntime.CURRENT_SCN_ATTRIB + "=" 
+ (ts + 5); // Run query at timestamp 5
-        Properties props = new Properties(TEST_PROPERTIES);
+        Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
         Connection conn = DriverManager.getConnection(url, props);
         try {
             PreparedStatement statement = conn.prepareStatement(query);

http://git-wip-us.apache.org/repos/asf/phoenix/blob/a411c7b2/phoenix-core/src/it/java/org/apache/phoenix/end2end/CastAndCoerceIT.java
----------------------------------------------------------------------
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/CastAndCoerceIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/CastAndCoerceIT.java
index a1ad306..5f1fa7b 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/CastAndCoerceIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/CastAndCoerceIT.java
@@ -35,6 +35,7 @@ import java.util.Collection;
 import java.util.Properties;
 
 import org.apache.phoenix.util.PhoenixRuntime;
+import org.apache.phoenix.util.PropertiesUtil;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 import org.junit.runner.RunWith;
@@ -57,7 +58,7 @@ public class CastAndCoerceIT extends QueryIT {
     @Test
     public void testCastOperatorInSelect() throws Exception {
         String query = "SELECT CAST(a_integer AS decimal)/2 FROM aTable WHERE 
?=organization_id and 5=a_integer";
-        Properties props = new Properties(TEST_PROPERTIES);
+        Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
         props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts 
+ 2)); // Execute at timestamp 2
         Connection conn = DriverManager.getConnection(getUrl(), props);
         try {
@@ -75,7 +76,7 @@ public class CastAndCoerceIT extends QueryIT {
     @Test
     public void testCastOperatorInWhere() throws Exception {
         String query = "SELECT a_integer FROM aTable WHERE ?=organization_id 
and 2.5 = CAST(a_integer AS DECIMAL)/2 ";
-        Properties props = new Properties(TEST_PROPERTIES);
+        Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
         props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts 
+ 2)); // Execute at timestamp 2
         Connection conn = DriverManager.getConnection(getUrl(), props);
         try {
@@ -94,7 +95,7 @@ public class CastAndCoerceIT extends QueryIT {
     public void testCoerceIntegerToLong() throws Exception {
         String query = "SELECT entity_id FROM ATABLE WHERE organization_id=? 
AND x_long >= x_integer";
         String url = getUrl() + ";" + PhoenixRuntime.CURRENT_SCN_ATTRIB + "=" 
+ (ts + 5); // Run query at timestamp 5
-        Properties props = new Properties(TEST_PROPERTIES);
+        Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
         Connection conn = DriverManager.getConnection(url, props);
         try {
             PreparedStatement statement = conn.prepareStatement(query);
@@ -114,7 +115,7 @@ public class CastAndCoerceIT extends QueryIT {
     public void testCoerceLongToDecimal1() throws Exception {
         String query = "SELECT entity_id FROM ATABLE WHERE organization_id=? 
AND x_decimal > x_integer";
         String url = getUrl() + ";" + PhoenixRuntime.CURRENT_SCN_ATTRIB + "=" 
+ (ts + 5); // Run query at timestamp 5
-        Properties props = new Properties(TEST_PROPERTIES);
+        Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
         Connection conn = DriverManager.getConnection(url, props);
         try {
             PreparedStatement statement = conn.prepareStatement(query);
@@ -132,7 +133,7 @@ public class CastAndCoerceIT extends QueryIT {
     public void testCoerceLongToDecimal2() throws Exception {
         String query = "SELECT entity_id FROM ATABLE WHERE organization_id=? 
AND x_integer <= x_decimal";
         String url = getUrl() + ";" + PhoenixRuntime.CURRENT_SCN_ATTRIB + "=" 
+ (ts + 5); // Run query at timestamp 5
-        Properties props = new Properties(TEST_PROPERTIES);
+        Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
         Connection conn = DriverManager.getConnection(url, props);
         try {
             PreparedStatement statement = conn.prepareStatement(query);
@@ -150,7 +151,7 @@ public class CastAndCoerceIT extends QueryIT {
     public void testCoerceTinyIntToSmallInt() throws Exception {
         String query = "SELECT entity_id FROM ATABLE WHERE organization_id=? 
AND a_byte >= a_short";
         String url = getUrl() + ";" + PhoenixRuntime.CURRENT_SCN_ATTRIB + "=" 
+ (ts + 5); // Run query at timestamp 5
-        Properties props = new Properties(TEST_PROPERTIES);
+        Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
         Connection conn = DriverManager.getConnection(url, props);
         try {
             PreparedStatement statement = conn.prepareStatement(query);

http://git-wip-us.apache.org/repos/asf/phoenix/blob/a411c7b2/phoenix-core/src/it/java/org/apache/phoenix/end2end/ClientTimeArithmeticQueryIT.java
----------------------------------------------------------------------
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ClientTimeArithmeticQueryIT.java
 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ClientTimeArithmeticQueryIT.java
index 4b7e66e..f5eb7d6 100644
--- 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ClientTimeArithmeticQueryIT.java
+++ 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ClientTimeArithmeticQueryIT.java
@@ -48,6 +48,7 @@ import java.util.List;
 import java.util.Properties;
 
 import org.apache.phoenix.util.PhoenixRuntime;
+import org.apache.phoenix.util.PropertiesUtil;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 import org.junit.runner.RunWith;
@@ -73,7 +74,7 @@ public class ClientTimeArithmeticQueryIT extends QueryIT {
     public void testDateAdd() throws Exception {
         String query = "SELECT entity_id, b_string FROM ATABLE WHERE a_date + 
0.5d < ?";
         String url = getUrl() + ";" + PhoenixRuntime.CURRENT_SCN_ATTRIB + "=" 
+ (ts + 5); // Run query at timestamp 5
-        Properties props = new Properties(TEST_PROPERTIES);
+        Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
         Connection conn = DriverManager.getConnection(url, props);
         try {
             PreparedStatement statement = conn.prepareStatement(query);
@@ -93,7 +94,7 @@ public class ClientTimeArithmeticQueryIT extends QueryIT {
     @Test
     public void testDecimalAddExpression() throws Exception {
         String query = "SELECT entity_id FROM aTable where A_INTEGER + 
X_DECIMAL > 11";
-        Properties props = new Properties(TEST_PROPERTIES);
+        Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
         props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts 
+ 2)); // Execute at timestamp 2
         Connection conn = DriverManager.getConnection(getUrl(), props);
         try {
@@ -112,7 +113,7 @@ public class ClientTimeArithmeticQueryIT extends QueryIT {
     @Test
     public void testDoubleAddExpression() throws Exception {
         String query = "SELECT entity_id FROM aTable where a_double + a_float 
> 0.08";
-        Properties props = new Properties(TEST_PROPERTIES);
+        Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
         props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts 
+ 2)); // Execute at timestamp 2
         Connection conn = DriverManager.getConnection(getUrl(), props);
         try {
@@ -131,7 +132,7 @@ public class ClientTimeArithmeticQueryIT extends QueryIT {
     @Test
     public void testUnsignedDoubleAddExpression() throws Exception {
         String query = "SELECT entity_id FROM aTable where a_unsigned_double + 
a_unsigned_float > 0.08";
-        Properties props = new Properties(TEST_PROPERTIES);
+        Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
         props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts 
+ 2)); // Execute at timestamp 2
         Connection conn = DriverManager.getConnection(getUrl(), props);
         try {
@@ -176,7 +177,7 @@ public class ClientTimeArithmeticQueryIT extends QueryIT {
     @Test
     public void testIntSubtractionExpression() throws Exception {
         String query = "SELECT entity_id FROM aTable where A_INTEGER - 4  <= 
0";
-        Properties props = new Properties(TEST_PROPERTIES);
+        Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
         props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts 
+ 2)); // Execute at timestamp 2
         Connection conn = DriverManager.getConnection(getUrl(), props);
         try {
@@ -190,7 +191,7 @@ public class ClientTimeArithmeticQueryIT extends QueryIT {
     @Test
     public void testDecimalSubtraction1Expression() throws Exception {
         String query = "SELECT entity_id FROM aTable where A_INTEGER - 3.5  <= 
0";
-        Properties props = new Properties(TEST_PROPERTIES);
+        Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
         props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts 
+ 2)); // Execute at timestamp 2
         Connection conn = DriverManager.getConnection(getUrl(), props);
         try {
@@ -204,7 +205,7 @@ public class ClientTimeArithmeticQueryIT extends QueryIT {
     @Test
     public void testDecimalSubtraction2Expression() throws Exception {// check 
if decimal part makes a difference
         String query = "SELECT entity_id FROM aTable where X_DECIMAL - 3.5  > 
0";
-        Properties props = new Properties(TEST_PROPERTIES);
+        Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
         props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts 
+ 2)); // Execute at timestamp 2
         Connection conn = DriverManager.getConnection(getUrl(), props);
         try {
@@ -220,7 +221,7 @@ public class ClientTimeArithmeticQueryIT extends QueryIT {
     @Test
     public void testLongSubtractionExpression() throws Exception {
         String query = "SELECT entity_id FROM aTable where X_LONG - 1  < 0";
-        Properties props = new Properties(TEST_PROPERTIES);
+        Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
         props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts 
+ 2)); // Execute at timestamp 2
         Connection conn = DriverManager.getConnection(getUrl(), props);
         try {
@@ -236,7 +237,7 @@ public class ClientTimeArithmeticQueryIT extends QueryIT {
     @Test
     public void testDoubleSubtractionExpression() throws Exception {
         String query = "SELECT entity_id FROM aTable where a_double - 0.0002d  
< 0";
-        Properties props = new Properties(TEST_PROPERTIES);
+        Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
         props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts 
+ 2)); // Execute at timestamp 2
         Connection conn = DriverManager.getConnection(getUrl(), props);
         try {
@@ -252,7 +253,7 @@ public class ClientTimeArithmeticQueryIT extends QueryIT {
     @Test
     public void testSmallIntSubtractionExpression() throws Exception {
         String query = "SELECT entity_id FROM aTable where a_short - 129  = 0";
-        Properties props = new Properties(TEST_PROPERTIES);
+        Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
         props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts 
+ 2)); // Execute at timestamp 2
         Connection conn = DriverManager.getConnection(getUrl(), props);
         try {
@@ -269,7 +270,7 @@ public class ClientTimeArithmeticQueryIT extends QueryIT {
     @Test
     public void testTernarySubtractionExpression() throws Exception {
         String query = "SELECT entity_id FROM aTable where  X_INTEGER - X_LONG 
- 10  < 0";
-        Properties props = new Properties(TEST_PROPERTIES);
+        Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
         props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts 
+ 2)); // Execute at timestamp 2
         Connection conn = DriverManager.getConnection(getUrl(), props);
         try {
@@ -287,7 +288,7 @@ public class ClientTimeArithmeticQueryIT extends QueryIT {
     @Test
     public void testSelectWithSubtractionExpression() throws Exception {
         String query = "SELECT entity_id, x_integer - 4 FROM aTable where  
x_integer - 4 = 0";
-        Properties props = new Properties(TEST_PROPERTIES);
+        Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
         props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts 
+ 2)); // Execute at timestamp 2
         Connection conn = DriverManager.getConnection(getUrl(), props);
         try {
@@ -304,7 +305,7 @@ public class ClientTimeArithmeticQueryIT extends QueryIT {
     @Test
     public void testConstantSubtractionExpression() throws Exception {
         String query = "SELECT entity_id FROM aTable where A_INTEGER = 5 - 1 - 
2";
-        Properties props = new Properties(TEST_PROPERTIES);
+        Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
         props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts 
+ 2)); // Execute at timestamp 2
         Connection conn = DriverManager.getConnection(getUrl(), props);
         try {
@@ -321,7 +322,7 @@ public class ClientTimeArithmeticQueryIT extends QueryIT {
     @Test
     public void testIntDivideExpression() throws Exception {
         String query = "SELECT entity_id FROM aTable where A_INTEGER / 3 > 2";
-        Properties props = new Properties(TEST_PROPERTIES);
+        Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
         props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts 
+ 2)); // Execute at timestamp 2
         Connection conn = DriverManager.getConnection(getUrl(), props);
         try {
@@ -338,7 +339,7 @@ public class ClientTimeArithmeticQueryIT extends QueryIT {
     @Test
     public void testDoubleDivideExpression() throws Exception {
         String query = "SELECT entity_id FROM aTable where a_double / 3.0d = 
0.0003";
-        Properties props = new Properties(TEST_PROPERTIES);
+        Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
         props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts 
+ 2)); // Execute at timestamp 2
         Connection conn = DriverManager.getConnection(getUrl(), props);
         try {
@@ -355,7 +356,7 @@ public class ClientTimeArithmeticQueryIT extends QueryIT {
     @Test
     public void testSmallIntDivideExpression() throws Exception {
         String query = "SELECT entity_id FROM aTable where a_short / 135 = 1";
-        Properties props = new Properties(TEST_PROPERTIES);
+        Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
         props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts 
+ 2)); // Execute at timestamp 2
         Connection conn = DriverManager.getConnection(getUrl(), props);
         try {
@@ -372,7 +373,7 @@ public class ClientTimeArithmeticQueryIT extends QueryIT {
     @Test
     public void testIntToDecimalDivideExpression() throws Exception {
         String query = "SELECT entity_id FROM aTable where A_INTEGER / 3.0 > 
2";
-        Properties props = new Properties(TEST_PROPERTIES);
+        Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
         props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts 
+ 2)); // Execute at timestamp 2
         Connection conn = DriverManager.getConnection(getUrl(), props);
         try {
@@ -387,7 +388,7 @@ public class ClientTimeArithmeticQueryIT extends QueryIT {
     @Test
     public void testConstantDivideExpression() throws Exception {
         String query = "SELECT entity_id FROM aTable where A_INTEGER = 9 / 3 / 
3";
-        Properties props = new Properties(TEST_PROPERTIES);
+        Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
         props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts 
+ 2)); // Execute at timestamp 2
         Connection conn = DriverManager.getConnection(getUrl(), props);
         try {
@@ -403,7 +404,7 @@ public class ClientTimeArithmeticQueryIT extends QueryIT {
     @Test
     public void testSelectWithDivideExpression() throws Exception {
         String query = "SELECT entity_id, a_integer/3 FROM aTable where  
a_integer = 9";
-        Properties props = new Properties(TEST_PROPERTIES);
+        Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
         props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts 
+ 2)); // Execute at timestamp 2
         Connection conn = DriverManager.getConnection(getUrl(), props);
         try {
@@ -421,7 +422,7 @@ public class ClientTimeArithmeticQueryIT extends QueryIT {
     @Test
     public void testNegateExpression() throws Exception {
         String query = "SELECT entity_id FROM aTable where A_INTEGER - 4 = -1";
-        Properties props = new Properties(TEST_PROPERTIES);
+        Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
         props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts 
+ 2)); // Execute at timestamp 2
         Connection conn = DriverManager.getConnection(getUrl(), props);
         try {
@@ -438,7 +439,7 @@ public class ClientTimeArithmeticQueryIT extends QueryIT {
     @Test
     public void testIntMultiplyExpression() throws Exception {
         String query = "SELECT entity_id FROM aTable where A_INTEGER * 2 = 16";
-        Properties props = new Properties(TEST_PROPERTIES);
+        Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
         props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts 
+ 2)); // Execute at timestamp 2
         Connection conn = DriverManager.getConnection(getUrl(), props);
         try {
@@ -455,7 +456,7 @@ public class ClientTimeArithmeticQueryIT extends QueryIT {
     @Test
     public void testDoubleMultiplyExpression() throws Exception {
         String query = "SELECT entity_id FROM aTable where A_DOUBLE * 2.0d = 
0.0002";
-        Properties props = new Properties(TEST_PROPERTIES);
+        Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
         props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts 
+ 2)); // Execute at timestamp 2
         Connection conn = DriverManager.getConnection(getUrl(), props);
         try {
@@ -472,7 +473,7 @@ public class ClientTimeArithmeticQueryIT extends QueryIT {
     @Test
     public void testLongMultiplyExpression() throws Exception {
         String query = "SELECT entity_id FROM aTable where X_LONG * 2 * 2 = 
20";
-        Properties props = new Properties(TEST_PROPERTIES);
+        Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
         props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts 
+ 2)); // Execute at timestamp 2
         Connection conn = DriverManager.getConnection(getUrl(), props);
         try {
@@ -489,7 +490,7 @@ public class ClientTimeArithmeticQueryIT extends QueryIT {
     @Test
     public void testIntToDecimalMultiplyExpression() throws Exception {
         String query = "SELECT entity_id FROM aTable where A_INTEGER * 1.5 > 
9";
-        Properties props = new Properties(TEST_PROPERTIES);
+        Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
         props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts 
+ 2)); // Execute at timestamp 2
         Connection conn = DriverManager.getConnection(getUrl(), props);
         try {
@@ -505,7 +506,7 @@ public class ClientTimeArithmeticQueryIT extends QueryIT {
     @Test
     public void testDecimalMultiplyExpression() throws Exception {
         String query = "SELECT entity_id FROM aTable where X_DECIMAL * 
A_INTEGER > 29.5";
-        Properties props = new Properties(TEST_PROPERTIES);
+        Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
         props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts 
+ 2)); // Execute at timestamp 2
         Connection conn = DriverManager.getConnection(getUrl(), props);
         try {
@@ -520,7 +521,7 @@ public class ClientTimeArithmeticQueryIT extends QueryIT {
     @Test
     public void testIntAddExpression() throws Exception {
         String query = "SELECT entity_id FROM aTable where A_INTEGER + 2 = 4";
-        Properties props = new Properties(TEST_PROPERTIES);
+        Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
         props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts 
+ 2)); // Execute at timestamp 2
         Connection conn = DriverManager.getConnection(getUrl(), props);
         try {
@@ -537,7 +538,7 @@ public class ClientTimeArithmeticQueryIT extends QueryIT {
     @Test
     public void testCoalesceFunction() throws Exception {
         String query = "SELECT entity_id FROM aTable WHERE a_integer > 0 and 
coalesce(X_DECIMAL,0.0) = 0.0";
-        Properties props = new Properties(TEST_PROPERTIES);
+        Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
         props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts 
+ 10)); // Execute at timestamp 2
         Connection conn = DriverManager.getConnection(getUrl(), props);
         PreparedStatement stmt = conn.prepareStatement("UPSERT INTO 
aTable(organization_id,entity_id,x_decimal) values(?,?,?)");
@@ -578,7 +579,7 @@ public class ClientTimeArithmeticQueryIT extends QueryIT {
     public void testDateSubtract() throws Exception {
         String query = "SELECT entity_id, b_string FROM ATABLE WHERE a_date - 
0.5d > ?";
         String url = getUrl() + ";" + PhoenixRuntime.CURRENT_SCN_ATTRIB + "=" 
+ (ts + 5); // Run query at timestamp 5
-        Properties props = new Properties(TEST_PROPERTIES);
+        Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
         Connection conn = DriverManager.getConnection(url, props);
         try {
             PreparedStatement statement = conn.prepareStatement(query);

http://git-wip-us.apache.org/repos/asf/phoenix/blob/a411c7b2/phoenix-core/src/it/java/org/apache/phoenix/end2end/ColumnProjectionOptimizationIT.java
----------------------------------------------------------------------
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ColumnProjectionOptimizationIT.java
 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ColumnProjectionOptimizationIT.java
index f0f8a65..fee2420 100644
--- 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ColumnProjectionOptimizationIT.java
+++ 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ColumnProjectionOptimizationIT.java
@@ -54,6 +54,7 @@ import org.apache.hadoop.hbase.util.Bytes;
 import org.apache.phoenix.jdbc.PhoenixConnection;
 import org.apache.phoenix.schema.PDataType;
 import org.apache.phoenix.util.PhoenixRuntime;
+import org.apache.phoenix.util.PropertiesUtil;
 import org.apache.phoenix.util.SchemaUtil;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
@@ -67,7 +68,7 @@ public class ColumnProjectionOptimizationIT extends 
BaseClientManagedTimeIT {
         String tenantId = getOrganizationId();
         initATableValues(tenantId, getDefaultSplits(tenantId), null, ts);
 
-        Properties props = new Properties(TEST_PROPERTIES);
+        Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
         props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts 
+ 2));
         Connection conn = DriverManager.getConnection(getUrl(), props);
 
@@ -213,7 +214,7 @@ public class ColumnProjectionOptimizationIT extends 
BaseClientManagedTimeIT {
 
     @Test
     public void testSelectFromViewOnExistingTable() throws Exception {
-        PhoenixConnection pconn = DriverManager.getConnection(getUrl(), 
TEST_PROPERTIES).unwrap(
+        PhoenixConnection pconn = DriverManager.getConnection(getUrl(), 
PropertiesUtil.deepCopy(TEST_PROPERTIES)).unwrap(
                 PhoenixConnection.class);
         byte[] cfB = Bytes.toBytes(SchemaUtil.normalizeIdentifier("b"));
         byte[] cfC = Bytes.toBytes(SchemaUtil.normalizeIdentifier("c"));

http://git-wip-us.apache.org/repos/asf/phoenix/blob/a411c7b2/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 7a0a2fb..8209e5c 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
@@ -35,6 +35,7 @@ import java.sql.ResultSet;
 import java.util.Properties;
 
 import org.apache.phoenix.util.PhoenixRuntime;
+import org.apache.phoenix.util.PropertiesUtil;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
@@ -46,7 +47,7 @@ public class CustomEntityDataIT extends 
BaseClientManagedTimeIT {
         ensureTableCreated(getUrl(),CUSTOM_ENTITY_DATA_FULL_NAME,null, ts-2);
             
         String url = getUrl() + ";" + PhoenixRuntime.CURRENT_SCN_ATTRIB + "=" 
+ ts;
-        Properties props = new Properties(TEST_PROPERTIES);
+        Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
         Connection conn = DriverManager.getConnection(url, props);
         // Insert all rows at ts
         PreparedStatement stmt = conn.prepareStatement(
@@ -163,7 +164,7 @@ public class CustomEntityDataIT extends 
BaseClientManagedTimeIT {
         String tenantId = getOrganizationId();
         String query = "SELECT count(1) FROM CORE.CUSTOM_ENTITY_DATA WHERE 
organization_id=?";
         String url = getUrl() + ";" + PhoenixRuntime.CURRENT_SCN_ATTRIB + "=" 
+ (ts + 5); // Run query at timestamp 5
-        Connection conn = DriverManager.getConnection(url, TEST_PROPERTIES);
+        Connection conn = DriverManager.getConnection(url, 
PropertiesUtil.deepCopy(TEST_PROPERTIES));
         try {
             initTableValues(tenantId, getDefaultSplits(getOrganizationId()), 
ts);
             PreparedStatement statement = conn.prepareStatement(query);
@@ -183,7 +184,7 @@ public class CustomEntityDataIT extends 
BaseClientManagedTimeIT {
         String tenantId = getOrganizationId();
         String query = "SELECT 
CREATED_BY,CREATED_DATE,CURRENCY_ISO_CODE,DELETED,DIVISION,LAST_UPDATE,LAST_UPDATE_BY,NAME,OWNER,SYSTEM_MODSTAMP,VAL0,VAL1,VAL2,VAL3,VAL4,VAL5,VAL6,VAL7,VAL8,VAL9
 FROM CORE.CUSTOM_ENTITY_DATA WHERE organization_id=?";
         String url = getUrl() + ";" + PhoenixRuntime.CURRENT_SCN_ATTRIB + "=" 
+ (ts + 5); // Run query at timestamp 5
-        Connection conn = DriverManager.getConnection(url, TEST_PROPERTIES);
+        Connection conn = DriverManager.getConnection(url, 
PropertiesUtil.deepCopy(TEST_PROPERTIES));
         try {
             initTableValues(tenantId, getDefaultSplits(getOrganizationId()), 
ts);
             PreparedStatement statement = conn.prepareStatement(query);

Reply via email to