You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@phoenix.apache.org by ja...@apache.org on 2017/09/29 02:31:24 UTC
[26/26] phoenix git commit: PHOENIX-4252 Remove
BaseClientManagedTimeIT as it's no longer used
PHOENIX-4252 Remove BaseClientManagedTimeIT as it's no longer used
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/87284759
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/87284759
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/87284759
Branch: refs/heads/4.x-HBase-1.1
Commit: 872847599fe4a61c87f66859bd27cf78bba4a460
Parents: b6632e5
Author: James Taylor <jt...@salesforce.com>
Authored: Thu Sep 28 18:44:44 2017 -0700
Committer: James Taylor <jt...@salesforce.com>
Committed: Thu Sep 28 19:29:39 2017 -0700
----------------------------------------------------------------------
.../end2end/BaseClientManagedTimeIT.java | 79 ----------------
.../phoenix/end2end/ClientManagedTimeTest.java | 42 ---------
.../apache/phoenix/end2end/UnnestArrayIT.java | 99 ++++++--------------
.../phoenix/end2end/salted/SaltedTableIT.java | 2 -
.../java/org/apache/phoenix/query/BaseTest.java | 1 -
pom.xml | 18 ----
6 files changed, 30 insertions(+), 211 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/phoenix/blob/87284759/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
deleted file mode 100644
index dee7200..0000000
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseClientManagedTimeIT.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.phoenix.end2end;
-
-import java.util.Map;
-
-import javax.annotation.concurrent.NotThreadSafe;
-
-import org.apache.hadoop.conf.Configuration;
-import org.apache.phoenix.query.BaseTest;
-import org.apache.phoenix.query.QueryServices;
-import org.apache.phoenix.util.ReadOnlyProps;
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.experimental.categories.Category;
-
-import com.google.common.collect.Maps;
-
-/**
- * Base class for tests that manage their own time stamps
- * We need to separate these from tests that rely on hbase to set
- * timestamps, because we create/destroy the Phoenix tables
- * between tests and only allow a table time stamp to increase.
- * Without this separation table deletion/creation would fail.
- *
- * All tests extending this class use the mini cluster that is
- * different from the mini cluster used by test classes extending
- * {@link BaseHBaseManagedTimeIT}.
- *
- * @since 0.1
- */
-@NotThreadSafe
-@Category(ClientManagedTimeTest.class)
-public abstract class BaseClientManagedTimeIT extends BaseTest {
- protected static Configuration getTestClusterConfig() {
- // don't want callers to modify config.
- return new Configuration(config);
- }
-
- @After
- public void cleanUpAfterTest() throws Exception {
- long ts = nextTimestamp();
- deletePriorMetaData(ts - 1, getUrl());
- }
-
- public static Map<String,String> getDefaultProps() {
- Map<String,String> props = Maps.newHashMapWithExpectedSize(5);
- // Must update config before starting server
- props.put(QueryServices.STATS_USE_CURRENT_TIME_ATTRIB, Boolean.FALSE.toString());
- return props;
- }
-
- @BeforeClass
- public static void doSetup() throws Exception {
- Map<String,String> props = getDefaultProps();
- setUpTestDriver(new ReadOnlyProps(props.entrySet().iterator()));
- }
-
- @AfterClass
- public static void doTeardown() throws Exception {
- dropNonSystemTables();
- }
-}
http://git-wip-us.apache.org/repos/asf/phoenix/blob/87284759/phoenix-core/src/it/java/org/apache/phoenix/end2end/ClientManagedTimeTest.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ClientManagedTimeTest.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ClientManagedTimeTest.java
deleted file mode 100644
index eed90af..0000000
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ClientManagedTimeTest.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you maynot use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicablelaw or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.phoenix.end2end;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- *
- * Annotation to denote that the in the test client manages timestamps
- * itself and not HBase.
- *
- * Tests using a mini cluster need to be classified either
- * as {@link HBaseManagedTimeTest} or {@link ClientManagedTimeTest}
- * or {@link NeedsOwnMiniClusterTest} otherwise they won't be run
- * when one runs mvn verify or mvn install.
- *
- * @since 4.1
- */
-
-@Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.TYPE)
-public @interface ClientManagedTimeTest {
-
-}
http://git-wip-us.apache.org/repos/asf/phoenix/blob/87284759/phoenix-core/src/it/java/org/apache/phoenix/end2end/UnnestArrayIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/UnnestArrayIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/UnnestArrayIT.java
index 9c80cd5..414022e 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/UnnestArrayIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/UnnestArrayIT.java
@@ -28,39 +28,34 @@ import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.util.Properties;
-import org.apache.phoenix.util.PhoenixRuntime;
import org.apache.phoenix.util.PropertiesUtil;
+import org.junit.Before;
import org.junit.Test;
-public abstract class UnnestArrayIT extends BaseClientManagedTimeIT {
-
- private static long timestamp;
-
- public static long nextTimestamp() {
- timestamp += 100;
- return timestamp;
+public abstract class UnnestArrayIT extends ParallelStatsDisabledIT {
+ private String tableName;
+
+ @Before
+ public void setup() {
+ tableName = generateUniqueName();
}
-
+
@Test
public void testUnnestWithIntArray1() throws Exception {
- long ts = nextTimestamp();
Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
- props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts + 10));
Connection conn = DriverManager.getConnection(getUrl(), props);
- String ddl = "CREATE TABLE a (p INTEGER PRIMARY KEY, k INTEGER[])";
+ String ddl = "CREATE TABLE " + tableName + " (p INTEGER PRIMARY KEY, k INTEGER[])";
conn.createStatement().execute(ddl);
conn.close();
- props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts + 30));
conn = DriverManager.getConnection(getUrl(), props);
- PreparedStatement stmt = conn.prepareStatement("UPSERT INTO a VALUES (1, ARRAY[2, 3])");
+ PreparedStatement stmt = conn.prepareStatement("UPSERT INTO " + tableName + " VALUES (1, ARRAY[2, 3])");
stmt.execute();
conn.commit();
conn.close();
- props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts + 40));
conn = DriverManager.getConnection(getUrl(), props);
- stmt = conn.prepareStatement("SELECT t.k FROM UNNEST((SELECT k FROM a)) AS t(k)");
+ stmt = conn.prepareStatement("SELECT t.k FROM UNNEST((SELECT k FROM " + tableName + ")) AS t(k)");
ResultSet rs = stmt.executeQuery();
assertTrue(rs.next());
assertEquals(rs.getInt(1), 2);
@@ -71,26 +66,22 @@ public abstract class UnnestArrayIT extends BaseClientManagedTimeIT {
@Test
public void testUnnestWithIntArray2() throws Exception {
- long ts = nextTimestamp();
Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
- props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts + 10));
Connection conn = DriverManager.getConnection(getUrl(), props);
- String ddl = "CREATE TABLE a (p INTEGER PRIMARY KEY, k INTEGER[])";
+ String ddl = "CREATE TABLE " + tableName + " (p INTEGER PRIMARY KEY, k INTEGER[])";
conn.createStatement().execute(ddl);
conn.close();
- props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts + 30));
conn = DriverManager.getConnection(getUrl(), props);
- PreparedStatement stmt = conn.prepareStatement("UPSERT INTO a VALUES (1, ARRAY[2, 3])");
+ PreparedStatement stmt = conn.prepareStatement("UPSERT INTO " + tableName + " VALUES (1, ARRAY[2, 3])");
stmt.execute();
- stmt = conn.prepareStatement("UPSERT INTO a VALUES (2, ARRAY[4, 5])");
+ stmt = conn.prepareStatement("UPSERT INTO " + tableName + " VALUES (2, ARRAY[4, 5])");
stmt.execute();
conn.commit();
conn.close();
- props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts + 40));
conn = DriverManager.getConnection(getUrl(), props);
- stmt = conn.prepareStatement("SELECT t.k FROM UNNEST((SELECT k FROM a)) AS t(k)");
+ stmt = conn.prepareStatement("SELECT t.k FROM UNNEST((SELECT k FROM " + tableName + ")) AS t(k)");
ResultSet rs = stmt.executeQuery();
assertTrue(rs.next());
assertEquals(rs.getInt(1), 2);
@@ -105,24 +96,20 @@ public abstract class UnnestArrayIT extends BaseClientManagedTimeIT {
@Test
public void testUnnestWithVarcharArray1() throws Exception {
- long ts = nextTimestamp();
Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
- props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts + 10));
Connection conn = DriverManager.getConnection(getUrl(), props);
- String ddl = "CREATE TABLE a (p INTEGER PRIMARY KEY, k VARCHAR[])";
+ String ddl = "CREATE TABLE " + tableName + " (p INTEGER PRIMARY KEY, k VARCHAR[])";
conn.createStatement().execute(ddl);
conn.close();
- props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts + 30));
conn = DriverManager.getConnection(getUrl(), props);
- PreparedStatement stmt = conn.prepareStatement("UPSERT INTO a VALUES (1, ARRAY['a', 'b', 'c'])");
+ PreparedStatement stmt = conn.prepareStatement("UPSERT INTO " + tableName + " VALUES (1, ARRAY['a', 'b', 'c'])");
stmt.execute();
conn.commit();
conn.close();
- props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts + 40));
conn = DriverManager.getConnection(getUrl(), props);
- stmt = conn.prepareStatement("SELECT t.k FROM UNNEST((SELECT k FROM a)) AS t(k)");
+ stmt = conn.prepareStatement("SELECT t.k FROM UNNEST((SELECT k FROM " + tableName + ")) AS t(k)");
ResultSet rs = stmt.executeQuery();
assertTrue(rs.next());
assertEquals(rs.getString(1), "a");
@@ -135,24 +122,20 @@ public abstract class UnnestArrayIT extends BaseClientManagedTimeIT {
@Test
public void testUnnestWithDoubleArray1() throws Exception {
- long ts = nextTimestamp();
Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
- props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts + 10));
Connection conn = DriverManager.getConnection(getUrl(), props);
- String ddl = "CREATE TABLE a (p INTEGER PRIMARY KEY, k DOUBLE[])";
+ String ddl = "CREATE TABLE " + tableName + " (p INTEGER PRIMARY KEY, k DOUBLE[])";
conn.createStatement().execute(ddl);
conn.close();
- props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts + 30));
conn = DriverManager.getConnection(getUrl(), props);
- PreparedStatement stmt = conn.prepareStatement("UPSERT INTO a VALUES (1, ARRAY[2.3, 3.4, 4.5])");
+ PreparedStatement stmt = conn.prepareStatement("UPSERT INTO " + tableName + " VALUES (1, ARRAY[2.3, 3.4, 4.5])");
stmt.execute();
conn.commit();
conn.close();
- props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts + 40));
conn = DriverManager.getConnection(getUrl(), props);
- stmt = conn.prepareStatement("SELECT t.k FROM UNNEST((SELECT k FROM a)) AS t(k)");
+ stmt = conn.prepareStatement("SELECT t.k FROM UNNEST((SELECT k FROM " + tableName + ")) AS t(k)");
ResultSet rs = stmt.executeQuery();
assertTrue(rs.next());
assertEquals(rs.getDouble(1), 2.3);
@@ -165,24 +148,20 @@ public abstract class UnnestArrayIT extends BaseClientManagedTimeIT {
@Test
public void testUnnestWithBooleanArray1() throws Exception {
- long ts = nextTimestamp();
Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
- props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts + 10));
Connection conn = DriverManager.getConnection(getUrl(), props);
- String ddl = "CREATE TABLE a (p INTEGER PRIMARY KEY, k BOOLEAN[])";
+ String ddl = "CREATE TABLE " + tableName + " (p INTEGER PRIMARY KEY, k BOOLEAN[])";
conn.createStatement().execute(ddl);
conn.close();
- props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts + 30));
conn = DriverManager.getConnection(getUrl(), props);
- PreparedStatement stmt = conn.prepareStatement("UPSERT INTO a VALUES (1, ARRAY[true, true, false])");
+ PreparedStatement stmt = conn.prepareStatement("UPSERT INTO " + tableName + " VALUES (1, ARRAY[true, true, false])");
stmt.execute();
conn.commit();
conn.close();
- props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts + 40));
conn = DriverManager.getConnection(getUrl(), props);
- stmt = conn.prepareStatement("SELECT t.k FROM UNNEST((SELECT k FROM a)) AS t(k)");
+ stmt = conn.prepareStatement("SELECT t.k FROM UNNEST((SELECT k FROM " + tableName + ")) AS t(k)");
ResultSet rs = stmt.executeQuery();
assertTrue(rs.next());
assertEquals(rs.getBoolean(1), true);
@@ -195,9 +174,7 @@ public abstract class UnnestArrayIT extends BaseClientManagedTimeIT {
@Test
public void testUnnestWithOrdinality() throws Exception {
- long ts = nextTimestamp();
Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
- props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts + 40));
Connection conn = DriverManager.getConnection(getUrl(), props);
PreparedStatement stmt = conn.prepareStatement("SELECT ar1, ordinality FROM UNNEST(ARRAY['a','b','c']) WITH ORDINALITY AS t1(ar1, ordinality)");
ResultSet rs = stmt.executeQuery();
@@ -215,9 +192,7 @@ public abstract class UnnestArrayIT extends BaseClientManagedTimeIT {
@Test
public void testUnnestWithJoins1() throws Exception {
- long ts = nextTimestamp();
Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
- props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts + 40));
Connection conn = DriverManager.getConnection(getUrl(), props);
PreparedStatement stmt = conn.prepareStatement("SELECT ar1, ar2 FROM UNNEST(ARRAY[2,3,4]) WITH ORDINALITY AS t1(ar1, index) FULL OUTER JOIN UNNEST(ARRAY[5,6]) with ORDINALITY AS t2(ar2, index) ON t1.index=t2.index");
ResultSet rs = stmt.executeQuery();
@@ -235,9 +210,7 @@ public abstract class UnnestArrayIT extends BaseClientManagedTimeIT {
@Test
public void testUnnestWithJoins2() throws Exception {
- long ts = nextTimestamp();
Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
- props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts + 40));
Connection conn = DriverManager.getConnection(getUrl(), props);
PreparedStatement stmt = conn.prepareStatement("SELECT ar1, ar2 FROM UNNEST(ARRAY[2,3,4]) WITH ORDINALITY AS t1(ar1, index) INNER JOIN UNNEST(ARRAY[5,6]) with ORDINALITY AS t2(ar2, index) ON t1.index=t2.index");
ResultSet rs = stmt.executeQuery();
@@ -252,24 +225,20 @@ public abstract class UnnestArrayIT extends BaseClientManagedTimeIT {
@Test
public void testUnnestWithJoins3() throws Exception {
- long ts = nextTimestamp();
Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
- props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts + 10));
Connection conn = DriverManager.getConnection(getUrl(), props);
- String ddl = "CREATE TABLE a (p INTEGER PRIMARY KEY, k VARCHAR[])";
+ String ddl = "CREATE TABLE " + tableName + " (p INTEGER PRIMARY KEY, k VARCHAR[])";
conn.createStatement().execute(ddl);
conn.close();
- props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts + 20));
conn = DriverManager.getConnection(getUrl(), props);
- PreparedStatement stmt = conn.prepareStatement("UPSERT INTO a VALUES (1, ARRAY['a', 'b', 'c'])");
+ PreparedStatement stmt = conn.prepareStatement("UPSERT INTO " + tableName + " VALUES (1, ARRAY['a', 'b', 'c'])");
stmt.execute();
conn.commit();
conn.close();
- props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts + 30));
conn = DriverManager.getConnection(getUrl(), props);
- stmt = conn.prepareStatement("SELECT ar1, ar2 FROM UNNEST(ARRAY[2,3,4]) WITH ORDINALITY AS t1(ar1, index) FULL OUTER JOIN UNNEST((SELECT k FROM a)) with ORDINALITY AS t2(ar2, index) ON t1.index=t2.index");
+ stmt = conn.prepareStatement("SELECT ar1, ar2 FROM UNNEST(ARRAY[2,3,4]) WITH ORDINALITY AS t1(ar1, index) FULL OUTER JOIN UNNEST((SELECT k FROM " + tableName + ")) with ORDINALITY AS t2(ar2, index) ON t1.index=t2.index");
ResultSet rs = stmt.executeQuery();
assertTrue(rs.next());
assertEquals(rs.getInt(1), 2);
@@ -285,9 +254,7 @@ public abstract class UnnestArrayIT extends BaseClientManagedTimeIT {
@Test
public void testUnnestWithJoins4() throws Exception {
- long ts = nextTimestamp();
Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
- props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts + 10));
Connection conn = DriverManager.getConnection(getUrl(), props);
PreparedStatement stmt = conn.prepareStatement("SELECT ar1, ar2 FROM UNNEST(ARRAY[2,3,4]) WITH ORDINALITY AS t1(ar1, index) FULL OUTER JOIN UNNEST(ARRAY['a','b']) with ORDINALITY AS t2(ar2, index) ON t1.index=t2.index");
ResultSet rs = stmt.executeQuery();
@@ -305,9 +272,7 @@ public abstract class UnnestArrayIT extends BaseClientManagedTimeIT {
@Test
public void testUnnestWithJoins5() throws Exception {
- long ts = nextTimestamp();
Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
- props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts + 40));
Connection conn = DriverManager.getConnection(getUrl(), props);
PreparedStatement stmt = conn.prepareStatement("SELECT ar1, ar2 FROM UNNEST(ARRAY[1,2]) AS t1(ar1), UNNEST(ARRAY[2,3]) AS t2(ar2);");
ResultSet rs = stmt.executeQuery();
@@ -328,24 +293,20 @@ public abstract class UnnestArrayIT extends BaseClientManagedTimeIT {
@Test
public void testUnnestInWhere() throws Exception {
- long ts = nextTimestamp();
Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
- props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts + 10));
Connection conn = DriverManager.getConnection(getUrl(), props);
- String ddl = "CREATE TABLE a (p INTEGER PRIMARY KEY)";
+ String ddl = "CREATE TABLE " + tableName + " (p INTEGER PRIMARY KEY)";
conn.createStatement().execute(ddl);
conn.close();
- props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts + 20));
conn = DriverManager.getConnection(getUrl(), props);
- PreparedStatement stmt = conn.prepareStatement("UPSERT INTO a VALUES (2)");
+ PreparedStatement stmt = conn.prepareStatement("UPSERT INTO " + tableName + " VALUES (2)");
stmt.execute();
conn.commit();
conn.close();
- props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts + 30));
conn = DriverManager.getConnection(getUrl(), props);
- stmt = conn.prepareStatement("SELECT * FROM a WHERE p IN(SELECT t.a FROM UNNEST(ARRAY[2,3]) AS t(a))");
+ stmt = conn.prepareStatement("SELECT * FROM " + tableName + " WHERE p IN(SELECT t.a FROM UNNEST(ARRAY[2,3]) AS t(a))");
ResultSet rs = stmt.executeQuery();
assertTrue(rs.next());
assertEquals(rs.getInt(1), 2);
http://git-wip-us.apache.org/repos/asf/phoenix/blob/87284759/phoenix-core/src/it/java/org/apache/phoenix/end2end/salted/SaltedTableIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/salted/SaltedTableIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/salted/SaltedTableIT.java
index a9db576..c9168f1 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/salted/SaltedTableIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/salted/SaltedTableIT.java
@@ -31,9 +31,7 @@ import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.Properties;
-import org.apache.phoenix.end2end.BaseClientManagedTimeIT;
import org.apache.phoenix.end2end.ParallelStatsDisabledIT;
-import org.apache.phoenix.util.PhoenixRuntime;
import org.apache.phoenix.util.PropertiesUtil;
import org.apache.phoenix.util.QueryUtil;
import org.apache.phoenix.util.SchemaUtil;
http://git-wip-us.apache.org/repos/asf/phoenix/blob/87284759/phoenix-core/src/test/java/org/apache/phoenix/query/BaseTest.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/test/java/org/apache/phoenix/query/BaseTest.java b/phoenix-core/src/test/java/org/apache/phoenix/query/BaseTest.java
index 8883c54..5b09cad 100644
--- a/phoenix-core/src/test/java/org/apache/phoenix/query/BaseTest.java
+++ b/phoenix-core/src/test/java/org/apache/phoenix/query/BaseTest.java
@@ -118,7 +118,6 @@ import org.apache.hadoop.hbase.client.HBaseAdmin;
import org.apache.hadoop.hbase.ipc.PhoenixRpcSchedulerFactory;
import org.apache.hadoop.hbase.regionserver.RSRpcServices;
import org.apache.hadoop.hbase.util.Bytes;
-import org.apache.phoenix.end2end.BaseClientManagedTimeIT;
import org.apache.phoenix.end2end.BaseHBaseManagedTimeIT;
import org.apache.phoenix.exception.SQLExceptionCode;
import org.apache.phoenix.exception.SQLExceptionInfo;
http://git-wip-us.apache.org/repos/asf/phoenix/blob/87284759/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 48d5619..eb259eb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -284,24 +284,6 @@
</goals>
</execution>
<execution>
- <id>ClientManagedTimeTests</id>
- <configuration>
- <encoding>UTF-8</encoding>
- <forkCount>${numForkedIT}</forkCount>
- <runOrder>alphabetical</runOrder>
- <reuseForks>true</reuseForks>
- <argLine>-enableassertions -Xmx3000m -XX:MaxPermSize=300m -Djava.security.egd=file:/dev/./urandom "-Djava.library.path=${hadoop.library.path}${path.separator}${java.library.path}" -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=./target/</argLine>
- <redirectTestOutputToFile>${test.output.tofile}</redirectTestOutputToFile>
- <testSourceDirectory>${basedir}/src/it/java</testSourceDirectory>
- <groups>org.apache.phoenix.end2end.ClientManagedTimeTest</groups>
- <shutdown>kill</shutdown>
- </configuration>
- <goals>
- <goal>integration-test</goal>
- <goal>verify</goal>
- </goals>
- </execution>
- <execution>
<id>HBaseManagedTimeTests</id>
<configuration>
<encoding>UTF-8</encoding>