You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@phoenix.apache.org by je...@apache.org on 2014/03/21 05:19:06 UTC
[6/6] git commit: PHOENIX-881: end2end test fails to run against a
live cluster using end2endtest.py
PHOENIX-881: end2end test fails to run against a live cluster using end2endtest.py
Project: http://git-wip-us.apache.org/repos/asf/incubator-phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-phoenix/commit/7cf7d400
Tree: http://git-wip-us.apache.org/repos/asf/incubator-phoenix/tree/7cf7d400
Diff: http://git-wip-us.apache.org/repos/asf/incubator-phoenix/diff/7cf7d400
Branch: refs/heads/4.0
Commit: 7cf7d4000aba3b5e796dc7321700f68f9e1c5884
Parents: c0ce092
Author: Jeffrey Zhong <jz...@JZhongs-MacBook-Pro.local>
Authored: Thu Mar 20 13:44:22 2014 -0700
Committer: Jeffrey Zhong <jz...@JZhongs-MacBook-Pro.local>
Committed: Thu Mar 20 18:24:33 2014 -0700
----------------------------------------------------------------------
.../phoenix/end2end/ArithmeticQueryIT.java | 9 +-
.../org/apache/phoenix/end2end/ArrayIT.java | 63 +++--
.../end2end/BaseClientManagedTimeIT.java | 3 +-
.../phoenix/end2end/BaseConnectedQueryIT.java | 29 ++-
.../phoenix/end2end/CoalesceFunctionIT.java | 2 +-
.../end2end/ColumnProjectionOptimizationIT.java | 10 +-
.../phoenix/end2end/CompareDecimalToLongIT.java | 19 +-
.../ConnectionQueryServicesTestImpl.java | 6 +
.../phoenix/end2end/CustomEntityDataIT.java | 8 +-
.../org/apache/phoenix/end2end/DeleteIT.java | 5 +-
.../apache/phoenix/end2end/DistinctCountIT.java | 18 +-
.../apache/phoenix/end2end/DynamicColumnIT.java | 11 +-
.../apache/phoenix/end2end/DynamicFamilyIT.java | 15 +-
.../apache/phoenix/end2end/DynamicUpsertIT.java | 15 +-
.../phoenix/end2end/ExtendedQueryExecIT.java | 9 +-
.../apache/phoenix/end2end/FunkyNamesIT.java | 8 +-
.../apache/phoenix/end2end/GroupByCaseIT.java | 15 +-
.../org/apache/phoenix/end2end/HashJoinIT.java | 51 ++--
.../org/apache/phoenix/end2end/IsNullIT.java | 11 +-
.../org/apache/phoenix/end2end/KeyOnlyIT.java | 3 +-
.../phoenix/end2end/MultiCfQueryExecIT.java | 21 +-
.../phoenix/end2end/NativeHBaseTypesIT.java | 15 +-
.../org/apache/phoenix/end2end/OrderByIT.java | 7 +-
.../apache/phoenix/end2end/PercentileIT.java | 34 +--
.../phoenix/end2end/ProductMetricsIT.java | 131 +++++-----
.../end2end/QueryDatabaseMetaDataIT.java | 91 ++++---
.../phoenix/end2end/QueryExecWithoutSCNIT.java | 2 +-
.../org/apache/phoenix/end2end/QueryIT.java | 255 +++++++++----------
.../org/apache/phoenix/end2end/QueryPlanIT.java | 3 +-
.../phoenix/end2end/ReadIsolationLevelIT.java | 10 +-
.../phoenix/end2end/RowValueConstructorIT.java | 49 ++--
.../phoenix/end2end/SpillableGroupByIT.java | 9 +-
.../apache/phoenix/end2end/StatsManagerIT.java | 3 +-
.../org/apache/phoenix/end2end/StddevIT.java | 9 +-
.../phoenix/end2end/ToCharFunctionIT.java | 5 +-
.../phoenix/end2end/ToNumberFunctionIT.java | 5 +-
.../java/org/apache/phoenix/end2end/TopNIT.java | 9 +-
.../phoenix/end2end/UpsertBigValuesIT.java | 9 +-
.../apache/phoenix/end2end/UpsertSelectIT.java | 85 +++----
.../apache/phoenix/end2end/UpsertValuesIT.java | 13 +-
.../phoenix/end2end/VariableLengthPKIT.java | 131 +++++-----
.../phoenix/end2end/salted/SaltedTableIT.java | 17 +-
.../org/apache/phoenix/flume/PhoenixSinkIT.java | 14 +-
.../phoenix/flume/RegexEventSerializerIT.java | 7 +-
pom.xml | 4 +-
45 files changed, 614 insertions(+), 634 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-phoenix/blob/7cf7d400/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 270ae67..84cdc2f 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
@@ -17,7 +17,6 @@
*/
package org.apache.phoenix.end2end;
-import static org.apache.phoenix.util.TestUtil.PHOENIX_JDBC_URL;
import static org.apache.phoenix.util.TestUtil.TEST_PROPERTIES;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
@@ -528,7 +527,7 @@ public class ArithmeticQueryIT extends BaseHBaseManagedTimeIT {
initSumDoubleValues(null);
String query = "SELECT SUM(d) FROM SumDoubleTest";
Properties props = new Properties(TEST_PROPERTIES);
- Connection conn = DriverManager.getConnection(PHOENIX_JDBC_URL, props);
+ Connection conn = DriverManager.getConnection(getUrl(), props);
try {
PreparedStatement statement = conn.prepareStatement(query);
ResultSet rs = statement.executeQuery();
@@ -545,7 +544,7 @@ public class ArithmeticQueryIT extends BaseHBaseManagedTimeIT {
initSumDoubleValues(null);
String query = "SELECT SUM(ud) FROM SumDoubleTest";
Properties props = new Properties(TEST_PROPERTIES);
- Connection conn = DriverManager.getConnection(PHOENIX_JDBC_URL, props);
+ Connection conn = DriverManager.getConnection(getUrl(), props);
try {
PreparedStatement statement = conn.prepareStatement(query);
ResultSet rs = statement.executeQuery();
@@ -562,7 +561,7 @@ public class ArithmeticQueryIT extends BaseHBaseManagedTimeIT {
initSumDoubleValues(null);
String query = "SELECT SUM(f) FROM SumDoubleTest";
Properties props = new Properties(TEST_PROPERTIES);
- Connection conn = DriverManager.getConnection(PHOENIX_JDBC_URL, props);
+ Connection conn = DriverManager.getConnection(getUrl(), props);
try {
PreparedStatement statement = conn.prepareStatement(query);
ResultSet rs = statement.executeQuery();
@@ -579,7 +578,7 @@ public class ArithmeticQueryIT extends BaseHBaseManagedTimeIT {
initSumDoubleValues(null);
String query = "SELECT SUM(uf) FROM SumDoubleTest";
Properties props = new Properties(TEST_PROPERTIES);
- Connection conn = DriverManager.getConnection(PHOENIX_JDBC_URL, props);
+ Connection conn = DriverManager.getConnection(getUrl(), props);
try {
PreparedStatement statement = conn.prepareStatement(query);
ResultSet rs = statement.executeQuery();
http://git-wip-us.apache.org/repos/asf/incubator-phoenix/blob/7cf7d400/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 f947a6d..2c44ec6 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
@@ -18,7 +18,6 @@
package org.apache.phoenix.end2end;
import static org.apache.phoenix.util.TestUtil.B_VALUE;
-import static org.apache.phoenix.util.TestUtil.PHOENIX_JDBC_URL;
import static org.apache.phoenix.util.TestUtil.ROW1;
import static org.apache.phoenix.util.TestUtil.TABLE_WITH_ARRAY;
import static org.apache.phoenix.util.TestUtil.TEST_PROPERTIES;
@@ -62,7 +61,7 @@ public class ArrayIT extends BaseClientManagedTimeIT {
Properties props = new Properties(TEST_PROPERTIES);
props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB,
Long.toString(ts + 2)); // Execute at timestamp 2
- Connection conn = DriverManager.getConnection(PHOENIX_JDBC_URL, props);
+ Connection conn = DriverManager.getConnection(getUrl(), props);
try {
PreparedStatement statement = conn.prepareStatement(query);
statement.setString(1, tenantId);
@@ -98,7 +97,7 @@ public class ArrayIT extends BaseClientManagedTimeIT {
Properties props = new Properties(TEST_PROPERTIES);
props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB,
Long.toString(ts + 2)); // Execute at timestamp 2
- Connection conn = DriverManager.getConnection(PHOENIX_JDBC_URL, props);
+ Connection conn = DriverManager.getConnection(getUrl(), props);
try {
PreparedStatement statement = conn.prepareStatement(query);
statement.setString(1, tenantId);
@@ -138,7 +137,7 @@ public class ArrayIT extends BaseClientManagedTimeIT {
Properties props = new Properties(TEST_PROPERTIES);
props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB,
Long.toString(ts + 2)); // Execute at timestamp 2
- Connection conn = DriverManager.getConnection(PHOENIX_JDBC_URL, props);
+ Connection conn = DriverManager.getConnection(getUrl(), props);
try {
PreparedStatement statement = conn.prepareStatement(query);
statement.setString(1, tenantId);
@@ -180,7 +179,7 @@ public class ArrayIT extends BaseClientManagedTimeIT {
Properties props = new Properties(TEST_PROPERTIES);
props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB,
Long.toString(ts + 2)); // Execute at timestamp 2
- Connection conn = DriverManager.getConnection(PHOENIX_JDBC_URL, props);
+ Connection conn = DriverManager.getConnection(getUrl(), props);
try {
PreparedStatement statement = conn.prepareStatement(query);
ResultSet rs = statement.executeQuery();
@@ -211,7 +210,7 @@ public class ArrayIT extends BaseClientManagedTimeIT {
Properties props = new Properties(TEST_PROPERTIES);
props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB,
Long.toString(ts + 2)); // Execute at timestamp 2
- Connection conn = DriverManager.getConnection(PHOENIX_JDBC_URL, props);
+ Connection conn = DriverManager.getConnection(getUrl(), props);
try {
PreparedStatement statement = conn.prepareStatement(query);
ResultSet rs = statement.executeQuery();
@@ -239,7 +238,7 @@ public class ArrayIT extends BaseClientManagedTimeIT {
Properties props = new Properties(TEST_PROPERTIES);
props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB,
Long.toString(ts + 2)); // Execute at timestamp 2
- Connection conn = DriverManager.getConnection(PHOENIX_JDBC_URL, props);
+ Connection conn = DriverManager.getConnection(getUrl(), props);
try {
PreparedStatement statement = conn.prepareStatement(query);
ResultSet rs = statement.executeQuery();
@@ -266,7 +265,7 @@ public class ArrayIT extends BaseClientManagedTimeIT {
Properties props = new Properties(TEST_PROPERTIES);
props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB,
Long.toString(ts + 2)); // Execute at timestamp 2
- Connection conn = DriverManager.getConnection(PHOENIX_JDBC_URL, props);
+ Connection conn = DriverManager.getConnection(getUrl(), props);
try {
PreparedStatement statement = conn.prepareStatement(query);
ResultSet rs = statement.executeQuery();
@@ -292,7 +291,7 @@ public class ArrayIT extends BaseClientManagedTimeIT {
Properties props = new Properties(TEST_PROPERTIES);
props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts)); // Execute
// at
- Connection conn = DriverManager.getConnection(PHOENIX_JDBC_URL, props);
+ Connection conn = DriverManager.getConnection(getUrl(), props);
try {
PreparedStatement statement = conn.prepareStatement(query);
int executeUpdate = statement.executeUpdate();
@@ -303,7 +302,7 @@ public class ArrayIT extends BaseClientManagedTimeIT {
// create another connection
props = new Properties(TEST_PROPERTIES);
props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts + 2)); // Execute at timestamp 2
- conn = DriverManager.getConnection(PHOENIX_JDBC_URL, props);
+ conn = DriverManager.getConnection(getUrl(), props);
query = "SELECT ARRAY_ELEM(a_double_array,2) FROM table_with_array";
statement = conn.prepareStatement(query);
ResultSet rs = statement.executeQuery();
@@ -331,7 +330,7 @@ public class ArrayIT extends BaseClientManagedTimeIT {
initSimpleArrayTable(tenantId, null, ts, false);
Properties props = new Properties(TEST_PROPERTIES);
props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts + 2)); // Execute at timestamp 2
- conn = DriverManager.getConnection(PHOENIX_JDBC_URL, props);
+ conn = DriverManager.getConnection(getUrl(), props);
String query = "upsert into table_with_array(ORGANIZATION_ID,ENTITY_ID,a_double_array) "
+ "SELECT organization_id, entity_id, a_double_array FROM " + SIMPLE_TABLE_WITH_ARRAY
+ " WHERE a_double_array[2] = 89.96d";
@@ -344,7 +343,7 @@ public class ArrayIT extends BaseClientManagedTimeIT {
// create another connection
props = new Properties(TEST_PROPERTIES);
props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts + 4));
- conn = DriverManager.getConnection(PHOENIX_JDBC_URL, props);
+ conn = DriverManager.getConnection(getUrl(), props);
query = "SELECT ARRAY_ELEM(a_double_array,2) FROM table_with_array";
statement = conn.prepareStatement(query);
ResultSet rs = statement.executeQuery();
@@ -373,7 +372,7 @@ public class ArrayIT extends BaseClientManagedTimeIT {
+ tenantId + "'";
Properties props = new Properties(TEST_PROPERTIES);
props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts + 2)); // Execute at timestamp 2
- Connection conn = DriverManager.getConnection(PHOENIX_JDBC_URL, props);
+ Connection conn = DriverManager.getConnection(getUrl(), props);
try {
PreparedStatement statement = conn.prepareStatement(query);
ResultSet rs = statement.executeQuery();
@@ -404,7 +403,7 @@ public class ArrayIT extends BaseClientManagedTimeIT {
+ tenantId + "'";
Properties props = new Properties(TEST_PROPERTIES);
props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts + 2)); // Execute at timestamp 2
- Connection conn = DriverManager.getConnection(PHOENIX_JDBC_URL, props);
+ Connection conn = DriverManager.getConnection(getUrl(), props);
try {
PreparedStatement statement = conn.prepareStatement(query);
ResultSet rs = statement.executeQuery();
@@ -435,7 +434,7 @@ public class ArrayIT extends BaseClientManagedTimeIT {
+ tenantId + "'";
Properties props = new Properties(TEST_PROPERTIES);
props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts + 2)); // Execute at timestamp 2
- Connection conn = DriverManager.getConnection(PHOENIX_JDBC_URL, props);
+ Connection conn = DriverManager.getConnection(getUrl(), props);
try {
PreparedStatement statement = conn.prepareStatement(query);
ResultSet rs = statement.executeQuery();
@@ -470,7 +469,7 @@ public class ArrayIT extends BaseClientManagedTimeIT {
initSimpleArrayTable(tenantId, null, ts, false);
Properties props = new Properties(TEST_PROPERTIES);
props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts + 2)); // Execute at timestamp 2
- conn = DriverManager.getConnection(PHOENIX_JDBC_URL, props);
+ conn = DriverManager.getConnection(getUrl(), props);
String query = "upsert into table_with_array(ORGANIZATION_ID,ENTITY_ID, a_unsigned_double, a_double_array) "
+ "SELECT organization_id, entity_id, x_double, ARRAY[23.4d, 22.1d, x_double] FROM " + SIMPLE_TABLE_WITH_ARRAY
+ " WHERE a_double_array[2] = 89.96d";
@@ -483,7 +482,7 @@ public class ArrayIT extends BaseClientManagedTimeIT {
// create another connection
props = new Properties(TEST_PROPERTIES);
props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts + 4));
- conn = DriverManager.getConnection(PHOENIX_JDBC_URL, props);
+ conn = DriverManager.getConnection(getUrl(), props);
query = "SELECT ARRAY_ELEM(a_double_array,2) FROM table_with_array";
statement = conn.prepareStatement(query);
ResultSet rs = statement.executeQuery();
@@ -511,7 +510,7 @@ public class ArrayIT extends BaseClientManagedTimeIT {
String query = "SELECT a_char_array[2] FROM SIMPLE_TABLE_WITH_ARRAY";
Properties props = new Properties(TEST_PROPERTIES);
props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts + 2)); // Execute at timestamp 2
- Connection conn = DriverManager.getConnection(PHOENIX_JDBC_URL, props);
+ Connection conn = DriverManager.getConnection(getUrl(), props);
try {
PreparedStatement statement = conn.prepareStatement(query);
ResultSet rs = statement.executeQuery();
@@ -711,7 +710,7 @@ public class ArrayIT extends BaseClientManagedTimeIT {
Properties props = new Properties(TEST_PROPERTIES);
props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB,
Long.toString(ts + 2)); // Execute at timestamp 2
- Connection conn = DriverManager.getConnection(PHOENIX_JDBC_URL, props);
+ Connection conn = DriverManager.getConnection(getUrl(), props);
try {
PreparedStatement statement = conn.prepareStatement(query);
ResultSet rs = statement.executeQuery();
@@ -742,7 +741,7 @@ public class ArrayIT extends BaseClientManagedTimeIT {
Properties props = new Properties(TEST_PROPERTIES);
props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB,
Long.toString(ts + 2)); // Execute at timestamp 2
- Connection conn = DriverManager.getConnection(PHOENIX_JDBC_URL, props);
+ Connection conn = DriverManager.getConnection(getUrl(), props);
try {
PreparedStatement statement = conn.prepareStatement(query);
Double[] doubleArr = new Double[1];
@@ -773,7 +772,7 @@ public class ArrayIT extends BaseClientManagedTimeIT {
Properties props = new Properties(TEST_PROPERTIES);
props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB,
Long.toString(ts + 2)); // Execute at timestamp 2
- Connection conn = DriverManager.getConnection(PHOENIX_JDBC_URL, props);
+ Connection conn = DriverManager.getConnection(getUrl(), props);
try {
PreparedStatement statement = conn.prepareStatement(query);
Double[] doubleArr = new Double[1];
@@ -802,7 +801,7 @@ public class ArrayIT extends BaseClientManagedTimeIT {
Properties props = new Properties(TEST_PROPERTIES);
props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB,
Long.toString(ts + 2)); // Execute at timestamp 2
- Connection conn = DriverManager.getConnection(PHOENIX_JDBC_URL, props);
+ Connection conn = DriverManager.getConnection(getUrl(), props);
try {
PreparedStatement statement = conn.prepareStatement(query);
ResultSet rs = statement.executeQuery();
@@ -827,7 +826,7 @@ public class ArrayIT extends BaseClientManagedTimeIT {
Properties props = new Properties(TEST_PROPERTIES);
props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB,
Long.toString(ts + 2)); // Execute at timestamp 2
- Connection conn = DriverManager.getConnection(PHOENIX_JDBC_URL, props);
+ Connection conn = DriverManager.getConnection(getUrl(), props);
try {
PreparedStatement statement = conn.prepareStatement(query);
ResultSet rs = statement.executeQuery();
@@ -855,7 +854,7 @@ public class ArrayIT extends BaseClientManagedTimeIT {
Properties props = new Properties(TEST_PROPERTIES);
props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB,
Long.toString(ts + 2)); // Execute at timestamp 2
- Connection conn = DriverManager.getConnection(PHOENIX_JDBC_URL, props);
+ Connection conn = DriverManager.getConnection(getUrl(), props);
try {
PreparedStatement statement = conn.prepareStatement(query);
ResultSet rs = statement.executeQuery();
@@ -883,7 +882,7 @@ public class ArrayIT extends BaseClientManagedTimeIT {
Properties props = new Properties(TEST_PROPERTIES);
props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB,
Long.toString(ts + 2)); // Execute at timestamp 2
- Connection conn = DriverManager.getConnection(PHOENIX_JDBC_URL, props);
+ Connection conn = DriverManager.getConnection(getUrl(), props);
try {
PreparedStatement statement = conn.prepareStatement(query);
ResultSet rs = statement.executeQuery();
@@ -913,7 +912,7 @@ public class ArrayIT extends BaseClientManagedTimeIT {
Properties props = new Properties(TEST_PROPERTIES);
props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB,
Long.toString(ts + 2)); // Execute at timestamp 2
- Connection conn = DriverManager.getConnection(PHOENIX_JDBC_URL, props);
+ Connection conn = DriverManager.getConnection(getUrl(), props);
try {
PreparedStatement statement = conn.prepareStatement(query);
ResultSet rs = statement.executeQuery();
@@ -942,7 +941,7 @@ public class ArrayIT extends BaseClientManagedTimeIT {
Properties props = new Properties(TEST_PROPERTIES);
props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB,
Long.toString(ts + 2)); // Execute at timestamp 2
- Connection conn = DriverManager.getConnection(PHOENIX_JDBC_URL, props);
+ Connection conn = DriverManager.getConnection(getUrl(), props);
try {
PreparedStatement statement = conn.prepareStatement(query);
ResultSet rs = statement.executeQuery();
@@ -970,7 +969,7 @@ public class ArrayIT extends BaseClientManagedTimeIT {
Properties props = new Properties(TEST_PROPERTIES);
props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB,
Long.toString(ts + 2)); // Execute at timestamp 2
- Connection conn = DriverManager.getConnection(PHOENIX_JDBC_URL, props);
+ Connection conn = DriverManager.getConnection(getUrl(), props);
try {
PreparedStatement statement = conn.prepareStatement(query);
ResultSet rs = statement.executeQuery();
@@ -996,7 +995,7 @@ public class ArrayIT extends BaseClientManagedTimeIT {
Properties props = new Properties(TEST_PROPERTIES);
props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB,
Long.toString(ts + 2)); // Execute at timestamp 2
- Connection conn = DriverManager.getConnection(PHOENIX_JDBC_URL, props);
+ Connection conn = DriverManager.getConnection(getUrl(), props);
try {
PreparedStatement statement = conn.prepareStatement(query);
ResultSet rs = statement.executeQuery();
@@ -1024,7 +1023,7 @@ public class ArrayIT extends BaseClientManagedTimeIT {
Properties props = new Properties(TEST_PROPERTIES);
props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB,
Long.toString(ts + 2)); // Execute at timestamp 2
- Connection conn = DriverManager.getConnection(PHOENIX_JDBC_URL, props);
+ Connection conn = DriverManager.getConnection(getUrl(), props);
try {
PreparedStatement statement = conn.prepareStatement(query);
ResultSet rs = statement.executeQuery();
@@ -1049,7 +1048,7 @@ public class ArrayIT extends BaseClientManagedTimeIT {
Properties props = new Properties(TEST_PROPERTIES);
props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB,
Long.toString(ts + 2)); // Execute at timestamp 2
- Connection conn = DriverManager.getConnection(PHOENIX_JDBC_URL, props);
+ Connection conn = DriverManager.getConnection(getUrl(), props);
try {
PreparedStatement statement = conn.prepareStatement(query);
ResultSet rs = statement.executeQuery();
@@ -1071,7 +1070,7 @@ public class ArrayIT extends BaseClientManagedTimeIT {
Properties props = new Properties(TEST_PROPERTIES);
props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB,
Long.toString(ts + 2)); // Execute at timestamp 2
- Connection conn = DriverManager.getConnection(PHOENIX_JDBC_URL, props);
+ Connection conn = DriverManager.getConnection(getUrl(), props);
try {
ResultSet rs = conn.getMetaData().getColumns(null, null, StringUtil.escapeLike(TABLE_WITH_ARRAY), StringUtil.escapeLike(SchemaUtil.normalizeIdentifier("x_long_array")));
assertTrue(rs.next());
http://git-wip-us.apache.org/repos/asf/incubator-phoenix/blob/7cf7d400/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseClientManagedTimeIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseClientManagedTimeIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseClientManagedTimeIT.java
index 2c5e400..9168588 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseClientManagedTimeIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseClientManagedTimeIT.java
@@ -17,6 +17,7 @@
*/
package org.apache.phoenix.end2end;
+import org.apache.hadoop.hbase.HConstants;
import org.junit.Before;
/**
@@ -36,6 +37,6 @@ public abstract class BaseClientManagedTimeIT extends BaseConnectedQueryIT {
@Before
public void doTestSetup() throws Exception {
long ts = nextTimestamp();
- deletePriorTables(ts-1);
+ deletePriorTables(ts-1);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-phoenix/blob/7cf7d400/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseConnectedQueryIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseConnectedQueryIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseConnectedQueryIT.java
index 9f94962..e22349d 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseConnectedQueryIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseConnectedQueryIT.java
@@ -19,7 +19,6 @@ package org.apache.phoenix.end2end;
import static org.apache.phoenix.util.PhoenixRuntime.CURRENT_SCN_ATTRIB;
import static org.apache.phoenix.util.PhoenixRuntime.JDBC_PROTOCOL;
-import static org.apache.phoenix.util.PhoenixRuntime.JDBC_PROTOCOL_SEPARATOR;
import static org.apache.phoenix.util.PhoenixRuntime.JDBC_PROTOCOL_TERMINATOR;
import static org.apache.phoenix.util.PhoenixRuntime.PHOENIX_TEST_DRIVER_URL_PARAM;
import static org.apache.phoenix.util.TestUtil.ATABLE_NAME;
@@ -38,7 +37,6 @@ import static org.apache.phoenix.util.TestUtil.ENTITYHISTID9;
import static org.apache.phoenix.util.TestUtil.ENTITY_HISTORY_SALTED_TABLE_NAME;
import static org.apache.phoenix.util.TestUtil.ENTITY_HISTORY_TABLE_NAME;
import static org.apache.phoenix.util.TestUtil.E_VALUE;
-import static org.apache.phoenix.util.TestUtil.LOCALHOST;
import static org.apache.phoenix.util.TestUtil.MILLIS_IN_DAY;
import static org.apache.phoenix.util.TestUtil.PARENTID1;
import static org.apache.phoenix.util.TestUtil.PARENTID2;
@@ -78,13 +76,17 @@ import org.apache.hadoop.hbase.IntegrationTestingUtility;
import org.apache.hadoop.hbase.util.Bytes;
import org.apache.phoenix.jdbc.PhoenixDatabaseMetaData;
import org.apache.phoenix.query.BaseTest;
+import org.apache.phoenix.query.ConnectionQueryServicesImpl;
import org.apache.phoenix.query.HBaseFactoryProvider;
import org.apache.phoenix.schema.PTableType;
import org.apache.phoenix.util.PhoenixRuntime;
import org.apache.phoenix.util.SchemaUtil;
import org.apache.phoenix.util.TestUtil;
import org.junit.BeforeClass;
-
+import org.apache.phoenix.jdbc.PhoenixTestDriver;
+import org.apache.phoenix.schema.NewerTableAlreadyExistsException;
+import org.apache.phoenix.schema.TableNotFoundException;
+import org.slf4j.LoggerFactory;
/**
*
@@ -94,6 +96,8 @@ import org.junit.BeforeClass;
* @since 0.1
*/
public abstract class BaseConnectedQueryIT extends BaseTest {
+ private static final org.slf4j.Logger logger = LoggerFactory.getLogger(BaseConnectedQueryIT.class);
+
protected static byte[][] getDefaultSplits(String tenantId) {
return new byte[][] {
Bytes.toBytes(tenantId + "00A"),
@@ -114,12 +118,8 @@ public abstract class BaseConnectedQueryIT extends BaseTest {
}
// reconstruct url when running against a live cluster
if (isDistributedCluster) {
- return JDBC_PROTOCOL + JDBC_PROTOCOL_SEPARATOR + conf.get(HConstants.ZOOKEEPER_QUORUM, LOCALHOST)
- + JDBC_PROTOCOL_SEPARATOR
- + conf.getInt(HConstants.ZOOKEEPER_CLIENT_PORT, HConstants.DEFAULT_ZOOKEPER_CLIENT_PORT)
- + JDBC_PROTOCOL_SEPARATOR
- + conf.get(HConstants.ZOOKEEPER_ZNODE_PARENT, HConstants.DEFAULT_ZOOKEEPER_ZNODE_PARENT)
- + JDBC_PROTOCOL_TERMINATOR + PHOENIX_TEST_DRIVER_URL_PARAM;
+ // Get all info from hbase-site.xml
+ return JDBC_PROTOCOL + JDBC_PROTOCOL_TERMINATOR + PHOENIX_TEST_DRIVER_URL_PARAM;
} else {
return TestUtil.PHOENIX_JDBC_URL;
}
@@ -139,8 +139,7 @@ public abstract class BaseConnectedQueryIT extends BaseTest {
if (ts != HConstants.LATEST_TIMESTAMP) {
props.setProperty(CURRENT_SCN_ATTRIB, Long.toString(ts));
}
- Connection conn = null;
- conn = DriverManager.getConnection(getUrl(), props);
+ Connection conn = DriverManager.getConnection(getUrl(), props);
try {
deletePriorTables(ts, conn);
deletePriorSequences(ts, conn);
@@ -175,7 +174,13 @@ public abstract class BaseConnectedQueryIT extends BaseTest {
conn = DriverManager.getConnection(getUrl(), props);
lastTenantId = tenantId;
}
- conn.createStatement().executeUpdate(ddl);
+ try {
+ conn.createStatement().executeUpdate(ddl);
+ } catch (NewerTableAlreadyExistsException ex) {
+ logger.info("Newer table " + fullTableName + " or its delete marker exists. Ignore current deletion");
+ } catch (TableNotFoundException ex) {
+ logger.info("Table " + fullTableName + " is already deleted.");
+ }
}
if (lastTenantId != null) {
conn.close();
http://git-wip-us.apache.org/repos/asf/incubator-phoenix/blob/7cf7d400/phoenix-core/src/it/java/org/apache/phoenix/end2end/CoalesceFunctionIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/CoalesceFunctionIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/CoalesceFunctionIT.java
index d594b47..b4289fa 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/CoalesceFunctionIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/CoalesceFunctionIT.java
@@ -36,7 +36,7 @@ public class CoalesceFunctionIT extends BaseClientManagedTimeIT {
initATableValues(tenantId, getDefaultSplits(tenantId), null, ts);
Properties props = new Properties();
props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts + 1)); // Execute at timestamp 1
- Connection conn = DriverManager.getConnection(PHOENIX_JDBC_URL, props);
+ Connection conn = DriverManager.getConnection(getUrl(), props);
String query = "SELECT entity_id, a_integer + COALESCE(x_integer,1) FROM ATABLE WHERE organization_id = ? AND a_integer >= 6 AND a_integer <= 7";
PreparedStatement statement = conn.prepareStatement(query);
statement.setString(1, tenantId);
http://git-wip-us.apache.org/repos/asf/incubator-phoenix/blob/7cf7d400/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 0157ffb..077538a 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
@@ -43,7 +43,7 @@ public class ColumnProjectionOptimizationIT extends BaseClientManagedTimeIT {
Properties props = new Properties(TEST_PROPERTIES);
props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts + 2));
- Connection conn = DriverManager.getConnection(PHOENIX_JDBC_URL, props);
+ Connection conn = DriverManager.getConnection(getUrl(), props);
// Table wildcard query
String query = "SELECT * FROM aTable";
@@ -187,7 +187,7 @@ public class ColumnProjectionOptimizationIT extends BaseClientManagedTimeIT {
@Test
public void testSelectFromViewOnExistingTable() throws Exception {
- PhoenixConnection pconn = DriverManager.getConnection(PHOENIX_JDBC_URL, TEST_PROPERTIES).unwrap(
+ PhoenixConnection pconn = DriverManager.getConnection(getUrl(), TEST_PROPERTIES).unwrap(
PhoenixConnection.class);
byte[] cfB = Bytes.toBytes(SchemaUtil.normalizeIdentifier("b"));
byte[] cfC = Bytes.toBytes(SchemaUtil.normalizeIdentifier("c"));
@@ -206,7 +206,7 @@ public class ColumnProjectionOptimizationIT extends BaseClientManagedTimeIT {
long ts = nextTimestamp();
Properties props = new Properties();
props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts + 5));
- Connection conn1 = DriverManager.getConnection(PHOENIX_JDBC_URL, props);
+ Connection conn1 = DriverManager.getConnection(getUrl(), props);
String createStmt = "create view " + MDTEST_NAME + " (id integer not null primary key,"
+ " b.col1 integer, c.col2 bigint, c.col3 varchar(20))";
@@ -214,7 +214,7 @@ public class ColumnProjectionOptimizationIT extends BaseClientManagedTimeIT {
conn1.close();
props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts + 6));
- PhoenixConnection conn2 = DriverManager.getConnection(PHOENIX_JDBC_URL, props).unwrap(PhoenixConnection.class);
+ PhoenixConnection conn2 = DriverManager.getConnection(getUrl(), props).unwrap(PhoenixConnection.class);
byte[] c1 = Bytes.toBytes("COL1");
byte[] c2 = Bytes.toBytes("COL2");
byte[] c3 = Bytes.toBytes("COL3");
@@ -240,7 +240,7 @@ public class ColumnProjectionOptimizationIT extends BaseClientManagedTimeIT {
conn2.close();
props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts + 10));
- Connection conn7 = DriverManager.getConnection(PHOENIX_JDBC_URL, props);
+ Connection conn7 = DriverManager.getConnection(getUrl(), props);
String select = "SELECT id, b.col1 FROM " + MDTEST_NAME + " WHERE c.col2=?";
PreparedStatement ps = conn7.prepareStatement(select);
ps.setInt(1, 10);
http://git-wip-us.apache.org/repos/asf/incubator-phoenix/blob/7cf7d400/phoenix-core/src/it/java/org/apache/phoenix/end2end/CompareDecimalToLongIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/CompareDecimalToLongIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/CompareDecimalToLongIT.java
index 220bdea..cd4da2c 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/CompareDecimalToLongIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/CompareDecimalToLongIT.java
@@ -17,7 +17,6 @@
*/
package org.apache.phoenix.end2end;
-import static org.apache.phoenix.util.TestUtil.PHOENIX_JDBC_URL;
import static org.junit.Assert.*;
import java.sql.*;
@@ -33,7 +32,7 @@ public class CompareDecimalToLongIT extends BaseClientManagedTimeIT {
ensureTableCreated(getUrl(),"LongInKeyTest",splits, ts-2);
// Insert all rows at ts
- String url = PHOENIX_JDBC_URL + ";" + PhoenixRuntime.CURRENT_SCN_ATTRIB + "=" + ts;
+ String url = getUrl() + ";" + PhoenixRuntime.CURRENT_SCN_ATTRIB + "=" + ts;
Connection conn = DriverManager.getConnection(url);
conn.setAutoCommit(true);
PreparedStatement stmt = conn.prepareStatement(
@@ -51,7 +50,7 @@ public class CompareDecimalToLongIT extends BaseClientManagedTimeIT {
String query = "SELECT l FROM LongInKeyTest where l > 1.5";
Properties props = new Properties();
props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts + 2)); // Execute at timestamp 2
- Connection conn = DriverManager.getConnection(PHOENIX_JDBC_URL, props);
+ Connection conn = DriverManager.getConnection(getUrl(), props);
try {
PreparedStatement statement = conn.prepareStatement(query);
ResultSet rs = statement.executeQuery();
@@ -70,7 +69,7 @@ public class CompareDecimalToLongIT extends BaseClientManagedTimeIT {
String query = "SELECT l FROM LongInKeyTest where l >= 1.5";
Properties props = new Properties();
props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts + 2)); // Execute at timestamp 2
- Connection conn = DriverManager.getConnection(PHOENIX_JDBC_URL, props);
+ Connection conn = DriverManager.getConnection(getUrl(), props);
try {
PreparedStatement statement = conn.prepareStatement(query);
ResultSet rs = statement.executeQuery();
@@ -96,7 +95,7 @@ public class CompareDecimalToLongIT extends BaseClientManagedTimeIT {
String query = "SELECT l FROM LongInKeyTest where l < 1.5";
Properties props = new Properties();
props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts + 2)); // Execute at timestamp 2
- Connection conn = DriverManager.getConnection(PHOENIX_JDBC_URL, props);
+ Connection conn = DriverManager.getConnection(getUrl(), props);
try {
PreparedStatement statement = conn.prepareStatement(query);
ResultSet rs = statement.executeQuery();
@@ -120,7 +119,7 @@ public class CompareDecimalToLongIT extends BaseClientManagedTimeIT {
String query = "SELECT l FROM LongInKeyTest where l <= 1.5";
Properties props = new Properties();
props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts + 2)); // Execute at timestamp 2
- Connection conn = DriverManager.getConnection(PHOENIX_JDBC_URL, props);
+ Connection conn = DriverManager.getConnection(getUrl(), props);
try {
PreparedStatement statement = conn.prepareStatement(query);
ResultSet rs = statement.executeQuery();
@@ -143,7 +142,7 @@ public class CompareDecimalToLongIT extends BaseClientManagedTimeIT {
String query = "SELECT l FROM LongInKeyTest where l > 2.5";
Properties props = new Properties();
props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts + 2)); // Execute at timestamp 2
- Connection conn = DriverManager.getConnection(PHOENIX_JDBC_URL, props);
+ Connection conn = DriverManager.getConnection(getUrl(), props);
try {
PreparedStatement statement = conn.prepareStatement(query);
ResultSet rs = statement.executeQuery();
@@ -167,7 +166,7 @@ public class CompareDecimalToLongIT extends BaseClientManagedTimeIT {
String query = "SELECT l FROM LongInKeyTest where l >= 2.5";
Properties props = new Properties();
props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts + 2)); // Execute at timestamp 2
- Connection conn = DriverManager.getConnection(PHOENIX_JDBC_URL, props);
+ Connection conn = DriverManager.getConnection(getUrl(), props);
try {
PreparedStatement statement = conn.prepareStatement(query);
ResultSet rs = statement.executeQuery();
@@ -191,7 +190,7 @@ public class CompareDecimalToLongIT extends BaseClientManagedTimeIT {
String query = "SELECT l FROM LongInKeyTest where l < 2.5";
Properties props = new Properties();
props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts + 2)); // Execute at timestamp 2
- Connection conn = DriverManager.getConnection(PHOENIX_JDBC_URL, props);
+ Connection conn = DriverManager.getConnection(getUrl(), props);
try {
PreparedStatement statement = conn.prepareStatement(query);
ResultSet rs = statement.executeQuery();
@@ -217,7 +216,7 @@ public class CompareDecimalToLongIT extends BaseClientManagedTimeIT {
String query = "SELECT l FROM LongInKeyTest where l <= 2.5";
Properties props = new Properties();
props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts + 2)); // Execute at timestamp 2
- Connection conn = DriverManager.getConnection(PHOENIX_JDBC_URL, props);
+ Connection conn = DriverManager.getConnection(getUrl(), props);
try {
PreparedStatement statement = conn.prepareStatement(query);
ResultSet rs = statement.executeQuery();
http://git-wip-us.apache.org/repos/asf/incubator-phoenix/blob/7cf7d400/phoenix-core/src/it/java/org/apache/phoenix/end2end/ConnectionQueryServicesTestImpl.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ConnectionQueryServicesTestImpl.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ConnectionQueryServicesTestImpl.java
index 8853903..5fb8e55 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ConnectionQueryServicesTestImpl.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ConnectionQueryServicesTestImpl.java
@@ -53,6 +53,12 @@ public class ConnectionQueryServicesTestImpl extends ConnectionQueryServicesImpl
IntegrationTestingUtility util = new IntegrationTestingUtility(config);
util.initializeCluster(this.NUM_SLAVES_BASE);
this.util = util;
+ // remove all hbase tables
+ HBaseAdmin admin = util.getHBaseAdmin();
+ HTableDescriptor[] tables = admin.listTables();
+ for(HTableDescriptor table : tables){
+ util.deleteTable(table.getName());
+ }
} else {
util = new HBaseTestingUtility(config);
util.startMiniCluster();
http://git-wip-us.apache.org/repos/asf/incubator-phoenix/blob/7cf7d400/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 a09f71b..ee49962 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,7 +35,7 @@ public class CustomEntityDataIT extends BaseClientManagedTimeIT {
protected static void initTableValues(String tenantId, byte[][] splits, long ts) throws Exception {
ensureTableCreated(getUrl(),CUSTOM_ENTITY_DATA_FULL_NAME,null, ts-2);
- String url = PHOENIX_JDBC_URL + ";" + PhoenixRuntime.CURRENT_SCN_ATTRIB + "=" + ts;
+ String url = getUrl() + ";" + PhoenixRuntime.CURRENT_SCN_ATTRIB + "=" + ts;
Properties props = new Properties(TEST_PROPERTIES);
Connection conn = DriverManager.getConnection(url, props);
// Insert all rows at ts
@@ -152,7 +152,7 @@ public class CustomEntityDataIT extends BaseClientManagedTimeIT {
long ts = nextTimestamp();
String tenantId = getOrganizationId();
String query = "SELECT count(1) FROM CORE.CUSTOM_ENTITY_DATA WHERE organization_id=?";
- String url = PHOENIX_JDBC_URL + ";" + PhoenixRuntime.CURRENT_SCN_ATTRIB + "=" + (ts + 5); // Run query at timestamp 5
+ String url = getUrl() + ";" + PhoenixRuntime.CURRENT_SCN_ATTRIB + "=" + (ts + 5); // Run query at timestamp 5
Connection conn = DriverManager.getConnection(url, TEST_PROPERTIES);
try {
initTableValues(tenantId, getDefaultSplits(getOrganizationId()), ts);
@@ -172,7 +172,7 @@ public class CustomEntityDataIT extends BaseClientManagedTimeIT {
long ts = nextTimestamp();
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 = PHOENIX_JDBC_URL + ";" + PhoenixRuntime.CURRENT_SCN_ATTRIB + "=" + (ts + 5); // Run query at timestamp 5
+ String url = getUrl() + ";" + PhoenixRuntime.CURRENT_SCN_ATTRIB + "=" + (ts + 5); // Run query at timestamp 5
Connection conn = DriverManager.getConnection(url, TEST_PROPERTIES);
try {
initTableValues(tenantId, getDefaultSplits(getOrganizationId()), ts);
@@ -199,7 +199,7 @@ public class CustomEntityDataIT extends BaseClientManagedTimeIT {
String query = "SELECT KEY_PREFIX||CUSTOM_ENTITY_DATA_ID FROM CORE.CUSTOM_ENTITY_DATA where '00A'||val0 LIKE '00A2%'";
Properties props = new Properties();
props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts + 2)); // Execute at timestamp 2
- Connection conn = DriverManager.getConnection(PHOENIX_JDBC_URL, props);
+ Connection conn = DriverManager.getConnection(getUrl(), props);
try {
PreparedStatement statement = conn.prepareStatement(query);
ResultSet rs=statement.executeQuery();
http://git-wip-us.apache.org/repos/asf/incubator-phoenix/blob/7cf7d400/phoenix-core/src/it/java/org/apache/phoenix/end2end/DeleteIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/DeleteIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/DeleteIT.java
index 6fa85d8..e606cf1 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/DeleteIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/DeleteIT.java
@@ -17,7 +17,6 @@
*/
package org.apache.phoenix.end2end;
-import static org.apache.phoenix.util.TestUtil.PHOENIX_JDBC_URL;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
@@ -67,7 +66,7 @@ public class DeleteIT extends BaseHBaseManagedTimeIT {
}
private void testDeleteFilter(boolean autoCommit) throws Exception {
- Connection conn = DriverManager.getConnection(PHOENIX_JDBC_URL);
+ Connection conn = DriverManager.getConnection(getUrl());
initTableValues(conn);
ResultSet rs;
@@ -104,7 +103,7 @@ public class DeleteIT extends BaseHBaseManagedTimeIT {
}
private void testDeleteRange(boolean autoCommit, boolean createIndex) throws Exception {
- Connection conn = DriverManager.getConnection(PHOENIX_JDBC_URL);
+ Connection conn = DriverManager.getConnection(getUrl());
initTableValues(conn);
String indexName = "IDX";
http://git-wip-us.apache.org/repos/asf/incubator-phoenix/blob/7cf7d400/phoenix-core/src/it/java/org/apache/phoenix/end2end/DistinctCountIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/DistinctCountIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/DistinctCountIT.java
index 8e77e71..41b99b6 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/DistinctCountIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/DistinctCountIT.java
@@ -40,7 +40,7 @@ public class DistinctCountIT extends BaseClientManagedTimeIT {
Properties props = new Properties(TEST_PROPERTIES);
props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts + 2)); // Execute at
// timestamp 2
- Connection conn = DriverManager.getConnection(PHOENIX_JDBC_URL, props);
+ Connection conn = DriverManager.getConnection(getUrl(), props);
try {
PreparedStatement statement = conn.prepareStatement(query);
ResultSet rs = statement.executeQuery();
@@ -63,7 +63,7 @@ public class DistinctCountIT extends BaseClientManagedTimeIT {
Properties props = new Properties(TEST_PROPERTIES);
props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts + 2)); // Execute at
// timestamp 2
- Connection conn = DriverManager.getConnection(PHOENIX_JDBC_URL, props);
+ Connection conn = DriverManager.getConnection(getUrl(), props);
try {
PreparedStatement statement = conn.prepareStatement(query);
ResultSet rs = statement.executeQuery();
@@ -86,7 +86,7 @@ public class DistinctCountIT extends BaseClientManagedTimeIT {
Properties props = new Properties(TEST_PROPERTIES);
props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts + 2)); // Execute at
// timestamp 2
- Connection conn = DriverManager.getConnection(PHOENIX_JDBC_URL, props);
+ Connection conn = DriverManager.getConnection(getUrl(), props);
try {
PreparedStatement statement = conn.prepareStatement(query);
ResultSet rs = statement.executeQuery();
@@ -116,7 +116,7 @@ public class DistinctCountIT extends BaseClientManagedTimeIT {
Properties props = new Properties(TEST_PROPERTIES);
props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts + 2)); // Execute at
// timestamp 2
- Connection conn = DriverManager.getConnection(PHOENIX_JDBC_URL, props);
+ Connection conn = DriverManager.getConnection(getUrl(), props);
try {
PreparedStatement statement = conn.prepareStatement(query);
ResultSet rs = statement.executeQuery();
@@ -146,7 +146,7 @@ public class DistinctCountIT extends BaseClientManagedTimeIT {
Properties props = new Properties(TEST_PROPERTIES);
props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts + 2)); // Execute at
// timestamp 2
- Connection conn = DriverManager.getConnection(PHOENIX_JDBC_URL, props);
+ Connection conn = DriverManager.getConnection(getUrl(), props);
try {
PreparedStatement statement = conn.prepareStatement(query);
ResultSet rs = statement.executeQuery();
@@ -177,7 +177,7 @@ public class DistinctCountIT extends BaseClientManagedTimeIT {
Properties props = new Properties(TEST_PROPERTIES);
props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts + 2)); // Execute at
// timestamp 2
- Connection conn = DriverManager.getConnection(PHOENIX_JDBC_URL, props);
+ Connection conn = DriverManager.getConnection(getUrl(), props);
try {
PreparedStatement statement = conn.prepareStatement(query);
ResultSet rs = statement.executeQuery();
@@ -204,7 +204,7 @@ public class DistinctCountIT extends BaseClientManagedTimeIT {
Properties props = new Properties(TEST_PROPERTIES);
props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts + 2)); // Execute at
// timestamp 2
- Connection conn = DriverManager.getConnection(PHOENIX_JDBC_URL, props);
+ Connection conn = DriverManager.getConnection(getUrl(), props);
try {
PreparedStatement statement = conn.prepareStatement(query);
ResultSet rs = statement.executeQuery();
@@ -228,7 +228,7 @@ public class DistinctCountIT extends BaseClientManagedTimeIT {
Properties props = new Properties(TEST_PROPERTIES);
props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts + 2)); // Execute at
// timestamp 2
- Connection conn = DriverManager.getConnection(PHOENIX_JDBC_URL, props);
+ Connection conn = DriverManager.getConnection(getUrl(), props);
try {
PreparedStatement statement = conn.prepareStatement(query);
ResultSet rs = statement.executeQuery();
@@ -251,7 +251,7 @@ public class DistinctCountIT extends BaseClientManagedTimeIT {
Properties props = new Properties(TEST_PROPERTIES);
props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts + 2)); // Execute at
// timestamp 2
- Connection conn = DriverManager.getConnection(PHOENIX_JDBC_URL, props);
+ Connection conn = DriverManager.getConnection(getUrl(), props);
try {
PreparedStatement statement = conn.prepareStatement(query);
ResultSet rs = statement.executeQuery();
http://git-wip-us.apache.org/repos/asf/incubator-phoenix/blob/7cf7d400/phoenix-core/src/it/java/org/apache/phoenix/end2end/DynamicColumnIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/DynamicColumnIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/DynamicColumnIT.java
index 6aa6eac..2f7fb9e 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/DynamicColumnIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/DynamicColumnIT.java
@@ -20,7 +20,6 @@ package org.apache.phoenix.end2end;
import static org.apache.phoenix.util.TestUtil.HBASE_DYNAMIC_COLUMNS;
import static org.apache.phoenix.util.TestUtil.HBASE_DYNAMIC_COLUMNS_SCHEMA_NAME;
-import static org.apache.phoenix.util.TestUtil.PHOENIX_JDBC_URL;
import static org.apache.phoenix.util.TestUtil.TEST_PROPERTIES;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
@@ -114,7 +113,7 @@ public class DynamicColumnIT extends BaseClientManagedTimeIT {
@Test
public void testDynamicColums() throws Exception {
String query = "SELECT * FROM HBASE_DYNAMIC_COLUMNS (DV varchar)";
- String url = PHOENIX_JDBC_URL + ";";
+ String url = getUrl() + ";";
Properties props = new Properties(TEST_PROPERTIES);
Connection conn = DriverManager.getConnection(url, props);
try {
@@ -139,7 +138,7 @@ public class DynamicColumnIT extends BaseClientManagedTimeIT {
@Test
public void testDynamicColumsFamily() throws Exception {
String query = "SELECT * FROM HBASE_DYNAMIC_COLUMNS (DV varchar,B.F2V2 varchar)";
- String url = PHOENIX_JDBC_URL + ";";
+ String url = getUrl() + ";";
Properties props = new Properties(TEST_PROPERTIES);
Connection conn = DriverManager.getConnection(url, props);
try {
@@ -166,7 +165,7 @@ public class DynamicColumnIT extends BaseClientManagedTimeIT {
@Test
public void testDynamicColumsSpecificQuery() throws Exception {
String query = "SELECT entry,F2V2 FROM HBASE_DYNAMIC_COLUMNS (DV varchar,B.F2V2 varchar)";
- String url = PHOENIX_JDBC_URL + ";";
+ String url = getUrl() + ";";
Properties props = new Properties(TEST_PROPERTIES);
Connection conn = DriverManager.getConnection(url, props);
try {
@@ -187,7 +186,7 @@ public class DynamicColumnIT extends BaseClientManagedTimeIT {
@Test(expected = ColumnAlreadyExistsException.class)
public void testAmbiguousStaticSelect() throws Exception {
String upsertquery = "Select * FROM HBASE_DYNAMIC_COLUMNS(A.F1V1 INTEGER)";
- String url = PHOENIX_JDBC_URL + ";";
+ String url = getUrl() + ";";
Properties props = new Properties(TEST_PROPERTIES);
Connection conn = DriverManager.getConnection(url, props);
try {
@@ -204,7 +203,7 @@ public class DynamicColumnIT extends BaseClientManagedTimeIT {
@Test(expected = ColumnFamilyNotFoundException.class)
public void testFakeCFDynamicUpsert() throws Exception {
String upsertquery = "Select * FROM HBASE_DYNAMIC_COLUMNS(fakecf.DynCol VARCHAR)";
- String url = PHOENIX_JDBC_URL + ";";
+ String url = getUrl() + ";";
Properties props = new Properties(TEST_PROPERTIES);
Connection conn = DriverManager.getConnection(url, props);
try {
http://git-wip-us.apache.org/repos/asf/incubator-phoenix/blob/7cf7d400/phoenix-core/src/it/java/org/apache/phoenix/end2end/DynamicFamilyIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/DynamicFamilyIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/DynamicFamilyIT.java
index b02d2ea..5332216 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/DynamicFamilyIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/DynamicFamilyIT.java
@@ -17,7 +17,6 @@
*/
package org.apache.phoenix.end2end;
-import static org.apache.phoenix.util.TestUtil.PHOENIX_JDBC_URL;
import static org.apache.phoenix.util.TestUtil.TEST_PROPERTIES;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
@@ -175,7 +174,7 @@ public class DynamicFamilyIT extends BaseHBaseManagedTimeIT {
// FIXME @Test
public void testGetAllDynColsInFamily() throws Exception {
String query = "SELECT A.* FROM WEB_STATS WHERE entry='entry1'";
- String url = PHOENIX_JDBC_URL + ";";
+ String url = getUrl() + ";";
Properties props = new Properties(TEST_PROPERTIES);
Connection conn = DriverManager.getConnection(url, props);
try {
@@ -203,7 +202,7 @@ public class DynamicFamilyIT extends BaseHBaseManagedTimeIT {
// FIXME @Test
public void testGetAllDynCols() throws Exception {
String query = "SELECT * FROM WEB_STATS WHERE entry='entry1'";
- String url = PHOENIX_JDBC_URL + ";";
+ String url = getUrl() + ";";
Properties props = new Properties(TEST_PROPERTIES);
Connection conn = DriverManager.getConnection(url, props);
try {
@@ -230,7 +229,7 @@ public class DynamicFamilyIT extends BaseHBaseManagedTimeIT {
String query = "SELECT B.* FROM WEB_STATS(" +
"B." + LAST_LOGIN_TIME_PREFIX + USER_ID2 + " TIME," +
"B." + LAST_LOGIN_TIME_PREFIX + USER_ID3 + " TIME) WHERE entry='entry2'";
- String url = PHOENIX_JDBC_URL + ";";
+ String url = getUrl() + ";";
Properties props = new Properties(TEST_PROPERTIES);
Connection conn = DriverManager.getConnection(url, props);
try {
@@ -255,7 +254,7 @@ public class DynamicFamilyIT extends BaseHBaseManagedTimeIT {
String query = "SELECT B.* FROM WEB_STATS(" +
"B.\"" + LAST_LOGIN_TIME_PREFIX + USER_ID2 + "\"" + " TIME," +
"B.\"" + LAST_LOGIN_TIME_PREFIX + USER_ID3 + "\"" + " TIME) WHERE entry='entry2'";
- String url = PHOENIX_JDBC_URL + ";";
+ String url = getUrl() + ";";
Properties props = new Properties(TEST_PROPERTIES);
Connection conn = DriverManager.getConnection(url, props);
try {
@@ -280,7 +279,7 @@ public class DynamicFamilyIT extends BaseHBaseManagedTimeIT {
// FIXME @Test
public void testProjectStaticAndDynamic() throws Exception {
String query = "SELECT ENTRY, A.DUMMY, B.DUMMY, A.*,B.* FROM WEB_STATS WHERE entry='entry3'";
- String url = PHOENIX_JDBC_URL + ";";
+ String url = getUrl() + ";";
Properties props = new Properties(TEST_PROPERTIES);
Connection conn = DriverManager.getConnection(url, props);
try {
@@ -307,7 +306,7 @@ public class DynamicFamilyIT extends BaseHBaseManagedTimeIT {
@Test(expected = ColumnFamilyNotFoundException.class)
public void testDynamicFamilyException() throws Exception {
String query = "SELECT C.* FROM WEB_STATS";
- String url = PHOENIX_JDBC_URL + ";";
+ String url = getUrl() + ";";
Properties props = new Properties(TEST_PROPERTIES);
Connection conn = DriverManager.getConnection(url, props);
try {
@@ -321,7 +320,7 @@ public class DynamicFamilyIT extends BaseHBaseManagedTimeIT {
@Test(expected = PhoenixParserException.class)
public void testDynamicFamilyFunctionException() throws Exception {
String query = "SELECT count(C.*) FROM WEB_STATS";
- String url = PHOENIX_JDBC_URL + ";";
+ String url = getUrl() + ";";
Properties props = new Properties(TEST_PROPERTIES);
Connection conn = DriverManager.getConnection(url, props);
try {
http://git-wip-us.apache.org/repos/asf/incubator-phoenix/blob/7cf7d400/phoenix-core/src/it/java/org/apache/phoenix/end2end/DynamicUpsertIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/DynamicUpsertIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/DynamicUpsertIT.java
index 2ca698c..3245ccd 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/DynamicUpsertIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/DynamicUpsertIT.java
@@ -17,7 +17,6 @@
*/
package org.apache.phoenix.end2end;
-import static org.apache.phoenix.util.TestUtil.PHOENIX_JDBC_URL;
import static org.apache.phoenix.util.TestUtil.TEST_PROPERTIES;
import static org.junit.Assert.*;
@@ -63,7 +62,7 @@ public class DynamicUpsertIT extends BaseClientManagedTimeIT {
String selectquery = "SELECT DynCol FROM " + TABLE + " (a.DynCol VARCHAR) where entry='dynEntry'";
// String selectquery = "SELECT * FROM "+TABLE;
- String url = PHOENIX_JDBC_URL + ";";
+ String url = getUrl() + ";";
Properties props = new Properties(TEST_PROPERTIES);
Connection conn = DriverManager.getConnection(url, props);
conn.setAutoCommit(true);
@@ -93,7 +92,7 @@ public class DynamicUpsertIT extends BaseClientManagedTimeIT {
String selectquery = "SELECT DynColA,entry,DynColB FROM " + TABLE
+ " (a.DynColA VARCHAR,b.DynColB VARCHAR) where entry='dynEntry'";
- String url = PHOENIX_JDBC_URL + ";";
+ String url = getUrl() + ";";
Properties props = new Properties(TEST_PROPERTIES);
Connection conn = DriverManager.getConnection(url, props);
conn.setAutoCommit(true);
@@ -126,7 +125,7 @@ public class DynamicUpsertIT extends BaseClientManagedTimeIT {
String selectquery = "SELECT entry,DynColA,a.dummy,DynColB,b.dummy FROM " + TABLE
+ " (a.DynColA VARCHAR,b.DynColB VARCHAR) where entry='dynEntry'";
- String url = PHOENIX_JDBC_URL + ";";
+ String url = getUrl() + ";";
Properties props = new Properties(TEST_PROPERTIES);
Connection conn = DriverManager.getConnection(url, props);
conn.setAutoCommit(true);
@@ -158,7 +157,7 @@ public class DynamicUpsertIT extends BaseClientManagedTimeIT {
String upsertquery = "UPSERT INTO " + TABLE
+ " (a.DynCol VARCHAR,b.DynCol varchar) VALUES('dynEntry','aValue','bValue','dyncola')";
- String url = PHOENIX_JDBC_URL + ";";
+ String url = getUrl() + ";";
Properties props = new Properties(TEST_PROPERTIES);
Connection conn = DriverManager.getConnection(url, props);
try {
@@ -178,7 +177,7 @@ public class DynamicUpsertIT extends BaseClientManagedTimeIT {
@Test(expected = ColumnAlreadyExistsException.class)
public void testAmbiguousStaticUpsert() throws Exception {
String upsertquery = "UPSERT INTO " + TABLE + " (a.dummy INTEGER,b.dummy INTEGER) VALUES(1,2)";
- String url = PHOENIX_JDBC_URL + ";";
+ String url = getUrl() + ";";
Properties props = new Properties(TEST_PROPERTIES);
Connection conn = DriverManager.getConnection(url, props);
try {
@@ -195,7 +194,7 @@ public class DynamicUpsertIT extends BaseClientManagedTimeIT {
@Test(expected = ColumnAlreadyExistsException.class)
public void testAmbiguousDynamicUpsert() throws Exception {
String upsertquery = "UPSERT INTO " + TABLE + " (a.DynCol VARCHAR,a.DynCol INTEGER) VALUES('dynCol',1)";
- String url = PHOENIX_JDBC_URL + ";";
+ String url = getUrl() + ";";
Properties props = new Properties(TEST_PROPERTIES);
Connection conn = DriverManager.getConnection(url, props);
try {
@@ -212,7 +211,7 @@ public class DynamicUpsertIT extends BaseClientManagedTimeIT {
@Test(expected = ColumnFamilyNotFoundException.class)
public void testFakeCFDynamicUpsert() throws Exception {
String upsertquery = "UPSERT INTO " + TABLE + " (fakecf.DynCol VARCHAR) VALUES('dynCol')";
- String url = PHOENIX_JDBC_URL + ";";
+ String url = getUrl() + ";";
Properties props = new Properties(TEST_PROPERTIES);
Connection conn = DriverManager.getConnection(url, props);
try {
http://git-wip-us.apache.org/repos/asf/incubator-phoenix/blob/7cf7d400/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 b463c74..5694969 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
@@ -17,7 +17,6 @@
*/
package org.apache.phoenix.end2end;
-import static org.apache.phoenix.util.TestUtil.PHOENIX_JDBC_URL;
import static org.apache.phoenix.util.TestUtil.TEST_PROPERTIES;
import static org.junit.Assert.*;
@@ -47,7 +46,7 @@ public class ExtendedQueryExecIT extends BaseClientManagedTimeIT {
Properties props = new Properties(TEST_PROPERTIES);
props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts+1));
- Connection conn = DriverManager.getConnection(PHOENIX_JDBC_URL, props);
+ Connection conn = DriverManager.getConnection(getUrl(), props);
try {
String query = "SELECT a_date FROM atable WHERE organization_id='" + tenantId + "' and a_date < TO_DATE(?)";
PreparedStatement statement = conn.prepareStatement(query);
@@ -68,7 +67,7 @@ public class ExtendedQueryExecIT extends BaseClientManagedTimeIT {
String tenantId = getOrganizationId();
initATableValues(tenantId, getDefaultSplits(tenantId),null, ts);
Properties props = new Properties(TEST_PROPERTIES);
- Connection conn = DriverManager.getConnection(PHOENIX_JDBC_URL, props);
+ Connection conn = DriverManager.getConnection(getUrl(), props);
try {
String query = "SELECT a_date FROM atable WHERE organization_id='" + tenantId + "' and a_date < TO_DATE(?)";
PreparedStatement statement = conn.prepareStatement(query);
@@ -97,7 +96,7 @@ public class ExtendedQueryExecIT extends BaseClientManagedTimeIT {
Properties props = new Properties(TEST_PROPERTIES);
props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts+1));
- Connection conn = DriverManager.getConnection(PHOENIX_JDBC_URL, props);
+ Connection conn = DriverManager.getConnection(getUrl(), props);
try {
ResultSet rs;
String queryPrefix = "SELECT a_date FROM atable WHERE organization_id='" + tenantId + "' and ";
@@ -143,7 +142,7 @@ public class ExtendedQueryExecIT extends BaseClientManagedTimeIT {
Properties props = new Properties(TEST_PROPERTIES);
props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts+1));
- Connection conn = DriverManager.getConnection(PHOENIX_JDBC_URL, props);
+ Connection conn = DriverManager.getConnection(getUrl(), props);
try {
ResultSet rs;
String query = "SELECT a_date, count(1) FROM atable WHERE organization_id='" + tenantId + "' group by a_date";
http://git-wip-us.apache.org/repos/asf/incubator-phoenix/blob/7cf7d400/phoenix-core/src/it/java/org/apache/phoenix/end2end/FunkyNamesIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/FunkyNamesIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/FunkyNamesIT.java
index ce33e36..8b1a052 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/FunkyNamesIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/FunkyNamesIT.java
@@ -34,7 +34,7 @@ public class FunkyNamesIT extends BaseClientManagedTimeIT {
protected static void initTableValues(byte[][] splits, long ts) throws Exception {
ensureTableCreated(getUrl(),FUNKY_NAME,splits, ts-2);
- String url = PHOENIX_JDBC_URL + ";" + PhoenixRuntime.CURRENT_SCN_ATTRIB + "=" + ts;
+ String url = getUrl() + ";" + PhoenixRuntime.CURRENT_SCN_ATTRIB + "=" + ts;
Properties props = new Properties(TEST_PROPERTIES);
Connection conn = DriverManager.getConnection(url, props);
conn.setAutoCommit(true);
@@ -65,7 +65,7 @@ public class FunkyNamesIT extends BaseClientManagedTimeIT {
public void testUnaliasedFunkyNames() throws Exception {
long ts = nextTimestamp();
String query = "SELECT \"foo!\",\"#@$\",\"foo.bar-bas\",\"_blah^\" FROM FUNKY_NAMES";
- String url = PHOENIX_JDBC_URL + ";" + PhoenixRuntime.CURRENT_SCN_ATTRIB + "=" + (ts + 5); // Run query at timestamp 5
+ String url = getUrl() + ";" + PhoenixRuntime.CURRENT_SCN_ATTRIB + "=" + (ts + 5); // Run query at timestamp 5
Properties props = new Properties(TEST_PROPERTIES);
Connection conn = DriverManager.getConnection(url, props);
try {
@@ -92,7 +92,7 @@ public class FunkyNamesIT extends BaseClientManagedTimeIT {
public void testCaseSensitive() throws Exception {
long ts = nextTimestamp();
String query = "SELECT \"Value\",\"VALUE\",\"value\" FROM FUNKY_NAMES";
- String url = PHOENIX_JDBC_URL + ";" + PhoenixRuntime.CURRENT_SCN_ATTRIB + "=" + (ts + 5); // Run query at timestamp 5
+ String url = getUrl() + ";" + PhoenixRuntime.CURRENT_SCN_ATTRIB + "=" + (ts + 5); // Run query at timestamp 5
Properties props = new Properties(TEST_PROPERTIES);
Connection conn = DriverManager.getConnection(url, props);
try {
@@ -122,7 +122,7 @@ public class FunkyNamesIT extends BaseClientManagedTimeIT {
public void testAliasedFunkyNames() throws Exception {
long ts = nextTimestamp();
String query = "SELECT \"1-3.4$\".\"foo!\" as \"1-2\",\"#@$\" as \"[3]\",\"foo.bar-bas\" as \"$$$\",\"_blah^\" \"0\" FROM FUNKY_NAMES \"1-3.4$\"";
- String url = PHOENIX_JDBC_URL + ";" + PhoenixRuntime.CURRENT_SCN_ATTRIB + "=" + (ts + 5); // Run query at timestamp 5
+ String url = getUrl() + ";" + PhoenixRuntime.CURRENT_SCN_ATTRIB + "=" + (ts + 5); // Run query at timestamp 5
Properties props = new Properties(TEST_PROPERTIES);
Connection conn = DriverManager.getConnection(url, props);
try {
http://git-wip-us.apache.org/repos/asf/incubator-phoenix/blob/7cf7d400/phoenix-core/src/it/java/org/apache/phoenix/end2end/GroupByCaseIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/GroupByCaseIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/GroupByCaseIT.java
index 91e12f5..8459516 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/GroupByCaseIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/GroupByCaseIT.java
@@ -18,7 +18,6 @@
package org.apache.phoenix.end2end;
import static org.apache.phoenix.util.TestUtil.GROUPBYTEST_NAME;
-import static org.apache.phoenix.util.TestUtil.PHOENIX_JDBC_URL;
import static org.apache.phoenix.util.TestUtil.TEST_PROPERTIES;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
@@ -66,7 +65,7 @@ public class GroupByCaseIT extends BaseClientManagedTimeIT {
private void loadData(long ts) throws SQLException {
Properties props = new Properties(TEST_PROPERTIES);
props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts));
- Connection conn = DriverManager.getConnection(PHOENIX_JDBC_URL, props);
+ Connection conn = DriverManager.getConnection(getUrl(), props);
insertRow(conn, "Report1", 10);
insertRow(conn, "Report2", 10);
insertRow(conn, "Report3", 30);
@@ -96,14 +95,14 @@ public class GroupByCaseIT extends BaseClientManagedTimeIT {
GroupByCaseIT gbt = new GroupByCaseIT();
long ts = gbt.createTable();
props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts + 10));
- conn = DriverManager.getConnection(PHOENIX_JDBC_URL, props);
+ conn = DriverManager.getConnection(getUrl(), props);
conn.createStatement().execute("ALTER TABLE " + GROUPBYTEST_NAME + " SET IMMUTABLE_ROWS=true");
props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts + 20));
- conn = DriverManager.getConnection(PHOENIX_JDBC_URL, props);
+ conn = DriverManager.getConnection(getUrl(), props);
conn.createStatement().execute("CREATE INDEX idx ON " + GROUPBYTEST_NAME + "(uri)");
gbt.loadData(ts);
props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts + 30));
- conn = DriverManager.getConnection(PHOENIX_JDBC_URL, props);
+ conn = DriverManager.getConnection(getUrl(), props);
gbt.executeQuery(conn,GROUPBY1);
gbt.executeQuery(conn,GROUPBY2);
// TODO: validate query results
@@ -124,7 +123,7 @@ public class GroupByCaseIT extends BaseClientManagedTimeIT {
gbt.loadData(ts);
Properties props = new Properties(TEST_PROPERTIES);
props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts + 1));
- Connection conn = DriverManager.getConnection(PHOENIX_JDBC_URL, props);
+ Connection conn = DriverManager.getConnection(getUrl(), props);
Statement stmt = conn.createStatement();
ResultSet rs = stmt.executeQuery("select uri from " + GROUPBYTEST_NAME);
assertTrue(rs.next());
@@ -154,7 +153,7 @@ public class GroupByCaseIT extends BaseClientManagedTimeIT {
gbt.loadData(ts);
Properties props = new Properties(TEST_PROPERTIES);
props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts + 1));
- Connection conn = DriverManager.getConnection(PHOENIX_JDBC_URL, props);
+ Connection conn = DriverManager.getConnection(getUrl(), props);
Statement stmt = conn.createStatement();
ResultSet rs = stmt.executeQuery("select count(1) from " + GROUPBYTEST_NAME);
assertTrue(rs.next());
@@ -178,7 +177,7 @@ public class GroupByCaseIT extends BaseClientManagedTimeIT {
gbt.loadData(ts);
Properties props = new Properties(TEST_PROPERTIES);
props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts + 1));
- Connection conn = DriverManager.getConnection(PHOENIX_JDBC_URL, props);
+ Connection conn = DriverManager.getConnection(getUrl(), props);
gbt.executeQuery(conn,GROUPBY1);
gbt.executeQuery(conn,GROUPBY2);
// TODO: validate query results