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 2014/11/25 22:45:07 UTC
[1/5] phoenix git commit: Revert "Upgrade to 4.12 Junit and update
tests by removing @Category (Samarth Jain)"
Repository: phoenix
Updated Branches:
refs/heads/master 039817861 -> e5033aec1
http://git-wip-us.apache.org/repos/asf/phoenix/blob/83b5bb4f/phoenix-core/src/main/java/org/apache/phoenix/schema/DelegateColumn.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/main/java/org/apache/phoenix/schema/DelegateColumn.java b/phoenix-core/src/main/java/org/apache/phoenix/schema/DelegateColumn.java
index a4901cf..be85635 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/schema/DelegateColumn.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/schema/DelegateColumn.java
@@ -17,6 +17,10 @@
*/
package org.apache.phoenix.schema;
+import java.io.DataInput;
+import java.io.DataOutput;
+import java.io.IOException;
+
import org.apache.phoenix.util.SizedUtil;
public class DelegateColumn extends DelegateDatum implements PColumn {
http://git-wip-us.apache.org/repos/asf/phoenix/blob/83b5bb4f/phoenix-core/src/main/java/org/apache/phoenix/trace/PhoenixMetricsSink.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/main/java/org/apache/phoenix/trace/PhoenixMetricsSink.java b/phoenix-core/src/main/java/org/apache/phoenix/trace/PhoenixMetricsSink.java
index 159e0c9..265fc78 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/trace/PhoenixMetricsSink.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/trace/PhoenixMetricsSink.java
@@ -17,23 +17,12 @@
*/
package org.apache.phoenix.trace;
-import static org.apache.phoenix.metrics.MetricInfo.ANNOTATION;
-import static org.apache.phoenix.metrics.MetricInfo.DESCRIPTION;
-import static org.apache.phoenix.metrics.MetricInfo.END;
-import static org.apache.phoenix.metrics.MetricInfo.HOSTNAME;
-import static org.apache.phoenix.metrics.MetricInfo.PARENT;
-import static org.apache.phoenix.metrics.MetricInfo.SPAN;
-import static org.apache.phoenix.metrics.MetricInfo.START;
-import static org.apache.phoenix.metrics.MetricInfo.TAG;
-import static org.apache.phoenix.metrics.MetricInfo.TRACE;
-
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.SQLException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Properties;
-
+import com.google.common.annotations.VisibleForTesting;
+import com.google.common.base.Function;
+import com.google.common.base.Joiner;
+import com.google.common.base.Preconditions;
+import com.google.common.collect.Iterators;
+import org.apache.commons.configuration.Configuration;
import org.apache.commons.configuration.SubsetConfiguration;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -42,15 +31,20 @@ import org.apache.hadoop.metrics2.AbstractMetric;
import org.apache.hadoop.metrics2.MetricsRecord;
import org.apache.hadoop.metrics2.MetricsSink;
import org.apache.hadoop.metrics2.MetricsTag;
-import org.apache.phoenix.metrics.MetricInfo;
-import org.apache.phoenix.metrics.Metrics;
+import org.apache.phoenix.metrics.*;
import org.apache.phoenix.query.QueryServices;
import org.apache.phoenix.query.QueryServicesOptions;
import org.apache.phoenix.trace.util.Tracing;
import org.apache.phoenix.util.QueryUtil;
-import com.google.common.annotations.VisibleForTesting;
-import com.google.common.base.Joiner;
+import javax.annotation.Nullable;
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.SQLException;
+import java.util.*;
+
+import static org.apache.phoenix.metrics.MetricInfo.*;
+import static org.apache.phoenix.metrics.MetricInfo.HOSTNAME;
/**
* Write the metrics to a phoenix table.
http://git-wip-us.apache.org/repos/asf/phoenix/blob/83b5bb4f/phoenix-core/src/test/java/org/apache/phoenix/hbase/index/write/TestWALRecoveryCaching.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/test/java/org/apache/phoenix/hbase/index/write/TestWALRecoveryCaching.java b/phoenix-core/src/test/java/org/apache/phoenix/hbase/index/write/TestWALRecoveryCaching.java
index 375b754..3c8a6df 100644
--- a/phoenix-core/src/test/java/org/apache/phoenix/hbase/index/write/TestWALRecoveryCaching.java
+++ b/phoenix-core/src/test/java/org/apache/phoenix/hbase/index/write/TestWALRecoveryCaching.java
@@ -56,6 +56,7 @@ import org.apache.hadoop.hbase.regionserver.wal.HLogKey;
import org.apache.hadoop.hbase.regionserver.wal.WALEdit;
import org.apache.hadoop.hbase.util.Bytes;
import org.apache.hadoop.hbase.util.JVMClusterUtil.RegionServerThread;
+import org.apache.phoenix.end2end.NeedsOwnMiniClusterTest;
import org.apache.phoenix.hbase.index.IndexTestingUtils;
import org.apache.phoenix.hbase.index.Indexer;
import org.apache.phoenix.hbase.index.TableName;
@@ -71,6 +72,7 @@ import org.junit.Assert;
import org.junit.Ignore;
import org.junit.Rule;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import com.google.common.collect.Multimap;
@@ -79,7 +81,7 @@ import com.google.common.collect.Multimap;
* region was present on the same server, we have to make a best effort to not kill the server for
* not succeeding on index writes while the index region is coming up.
*/
-
+@Category(NeedsOwnMiniClusterTest.class)
public class TestWALRecoveryCaching {
private static final Log LOG = LogFactory.getLog(TestWALRecoveryCaching.class);
http://git-wip-us.apache.org/repos/asf/phoenix/blob/83b5bb4f/phoenix-core/src/test/java/org/apache/phoenix/iterate/AggregateResultScannerTest.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/test/java/org/apache/phoenix/iterate/AggregateResultScannerTest.java b/phoenix-core/src/test/java/org/apache/phoenix/iterate/AggregateResultScannerTest.java
index 1c3e650..3197676 100644
--- a/phoenix-core/src/test/java/org/apache/phoenix/iterate/AggregateResultScannerTest.java
+++ b/phoenix-core/src/test/java/org/apache/phoenix/iterate/AggregateResultScannerTest.java
@@ -23,6 +23,9 @@ import static org.apache.phoenix.query.QueryConstants.SINGLE_COLUMN_FAMILY_NAME;
import static org.apache.phoenix.query.QueryConstants.SINGLE_COLUMN_NAME;
import static org.apache.phoenix.util.TestUtil.TEST_PROPERTIES;
+import java.io.DataInput;
+import java.io.DataOutput;
+import java.io.IOException;
import java.sql.DriverManager;
import java.sql.SQLException;
import java.util.ArrayList;
http://git-wip-us.apache.org/repos/asf/phoenix/blob/83b5bb4f/phoenix-core/src/test/java/org/apache/phoenix/iterate/SpooledTmpFileDeleteTest.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/test/java/org/apache/phoenix/iterate/SpooledTmpFileDeleteTest.java b/phoenix-core/src/test/java/org/apache/phoenix/iterate/SpooledTmpFileDeleteTest.java
new file mode 100644
index 0000000..4a205f9
--- /dev/null
+++ b/phoenix-core/src/test/java/org/apache/phoenix/iterate/SpooledTmpFileDeleteTest.java
@@ -0,0 +1,127 @@
+/*
+ * 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.iterate;
+
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertFalse;
+
+import java.io.File;
+import java.io.FileFilter;
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Properties;
+
+import org.apache.phoenix.end2end.BaseClientManagedTimeIT;
+import org.apache.phoenix.end2end.ClientManagedTimeTest;
+import org.apache.phoenix.query.QueryServices;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+
+@Category(ClientManagedTimeTest.class)
+public class SpooledTmpFileDeleteTest extends BaseClientManagedTimeIT {
+ private Connection conn = null;
+ private Properties props = null;
+
+ @Before
+ public void setup() throws SQLException {
+ props = new Properties();
+ props.put(QueryServices.SPOOL_DIRECTORY, "/tmp");
+ props.setProperty(QueryServices.SPOOL_THRESHOLD_BYTES_ATTRIB, Integer.toString(1));
+ conn = DriverManager.getConnection(getUrl(), props);
+ Statement stmt = conn.createStatement();
+ stmt.execute("CREATE TABLE test (ID varchar NOT NULL PRIMARY KEY) SPLIT ON ('EA','EZ')");
+ stmt.execute("UPSERT INTO test VALUES ('AA')");
+ stmt.execute("UPSERT INTO test VALUES ('EB')");
+ stmt.execute("UPSERT INTO test VALUES ('FA')");
+ stmt.close();
+ conn.commit();
+ }
+
+ @Test
+ public void testDeleteAllSpooledTmpFiles() throws SQLException, Throwable {
+ File dir = new File("/tmp");
+ File[] files = null;
+
+ class FilenameFilter implements FileFilter {
+ @Override
+ public boolean accept(File dir) {
+ return dir.getName().toLowerCase().endsWith(".bin") &&
+ dir.getName().startsWith("ResultSpooler");
+ }
+ }
+
+ FilenameFilter fnameFilter = new FilenameFilter();
+
+ // clean up first
+ files = dir.listFiles(fnameFilter);
+ for (File file : files) {
+ file.delete();
+ }
+
+ String query = "select * from TEST";
+ Statement statement = conn.createStatement();
+ ResultSet rs = statement.executeQuery(query);
+ assertTrue(rs.next());
+ files = dir.listFiles(fnameFilter);
+ assertTrue(files.length > 0);
+ List<String> fileNames = new ArrayList<String>();
+ for (File file : files) {
+ fileNames.add(file.getName());
+ }
+
+ String preparedQuery = "select * from test where id = ?";
+ PreparedStatement pstmt = conn.prepareStatement(preparedQuery);
+ pstmt.setString(1, "EB");
+ ResultSet prs = pstmt.executeQuery(preparedQuery);
+ assertTrue(prs.next());
+ files = dir.listFiles(fnameFilter);
+ assertTrue(files.length > 0);
+ for (File file : files) {
+ fileNames.add(file.getName());
+ }
+
+ Connection conn2 = DriverManager.getConnection(getUrl(), props);
+ String query2 = "select * from TEST";
+ Statement statement2 = conn2.createStatement();
+ ResultSet rs2 = statement2.executeQuery(query2);
+ assertTrue(rs2.next());
+ files = dir.listFiles(fnameFilter);
+ assertTrue(files.length > 0);
+
+ String preparedQuery2 = "select * from test where id = ?";
+ PreparedStatement pstmt2 = conn2.prepareStatement(preparedQuery2);
+ pstmt2.setString(1, "EB");
+ ResultSet prs2 = pstmt2.executeQuery(preparedQuery2);
+ assertTrue(prs2.next());
+ files = dir.listFiles(fnameFilter);
+ assertTrue(files.length > 0);
+
+ conn.close();
+
+ files = dir.listFiles(fnameFilter);
+
+ for (File file : files) {
+ assertFalse(fileNames.contains(file.getName()));
+ }
+ conn2.close();
+ files = dir.listFiles(fnameFilter);
+ assertTrue(files.length == 0);
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/phoenix/blob/83b5bb4f/phoenix-core/src/test/java/org/apache/phoenix/trace/TraceMetricsSourceTest.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/test/java/org/apache/phoenix/trace/TraceMetricsSourceTest.java b/phoenix-core/src/test/java/org/apache/phoenix/trace/TraceMetricsSourceTest.java
index 4622959..5cb34b8 100644
--- a/phoenix-core/src/test/java/org/apache/phoenix/trace/TraceMetricsSourceTest.java
+++ b/phoenix-core/src/test/java/org/apache/phoenix/trace/TraceMetricsSourceTest.java
@@ -17,8 +17,6 @@
*/
package org.apache.phoenix.trace;
-import static org.junit.Assert.assertTrue;
-
import org.apache.hadoop.hbase.util.Bytes;
import org.apache.hadoop.metrics2.MetricsCollector;
import org.apache.hadoop.metrics2.MetricsRecordBuilder;
@@ -30,6 +28,9 @@ import org.junit.BeforeClass;
import org.junit.Test;
import org.mockito.Mockito;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
/**
* Test that the @{link TraceMetricSource} correctly handles different kinds of traces
*/
http://git-wip-us.apache.org/repos/asf/phoenix/blob/83b5bb4f/phoenix-core/src/test/java/org/apache/phoenix/util/QueryUtilTest.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/test/java/org/apache/phoenix/util/QueryUtilTest.java b/phoenix-core/src/test/java/org/apache/phoenix/util/QueryUtilTest.java
index 182eb56..48929ed 100644
--- a/phoenix-core/src/test/java/org/apache/phoenix/util/QueryUtilTest.java
+++ b/phoenix-core/src/test/java/org/apache/phoenix/util/QueryUtilTest.java
@@ -21,6 +21,7 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
+import java.sql.Connection;
import java.sql.Types;
import java.util.Properties;
@@ -30,6 +31,8 @@ import org.junit.Test;
import com.google.common.collect.ImmutableList;
+import javax.management.Query;
+
public class QueryUtilTest {
private static final ColumnInfo ID_COLUMN = new ColumnInfo("ID", Types.BIGINT);
http://git-wip-us.apache.org/repos/asf/phoenix/blob/83b5bb4f/phoenix-flume/src/it/java/org/apache/phoenix/flume/PhoenixSinkIT.java
----------------------------------------------------------------------
diff --git a/phoenix-flume/src/it/java/org/apache/phoenix/flume/PhoenixSinkIT.java b/phoenix-flume/src/it/java/org/apache/phoenix/flume/PhoenixSinkIT.java
index 7d4f7af..a4b3655 100644
--- a/phoenix-flume/src/it/java/org/apache/phoenix/flume/PhoenixSinkIT.java
+++ b/phoenix-flume/src/it/java/org/apache/phoenix/flume/PhoenixSinkIT.java
@@ -30,13 +30,15 @@ import org.apache.flume.lifecycle.LifecycleState;
import org.apache.flume.sink.DefaultSinkFactory;
import org.apache.hadoop.hbase.client.HBaseAdmin;
import org.apache.phoenix.end2end.BaseHBaseManagedTimeIT;
+import org.apache.phoenix.end2end.HBaseManagedTimeTest;
import org.apache.phoenix.flume.serializer.EventSerializers;
import org.apache.phoenix.flume.sink.PhoenixSink;
import org.apache.phoenix.util.TestUtil;
import org.junit.Assert;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
-
+@Category(HBaseManagedTimeTest.class)
public class PhoenixSinkIT extends BaseHBaseManagedTimeIT {
private Context sinkContext;
http://git-wip-us.apache.org/repos/asf/phoenix/blob/83b5bb4f/phoenix-flume/src/it/java/org/apache/phoenix/flume/RegexEventSerializerIT.java
----------------------------------------------------------------------
diff --git a/phoenix-flume/src/it/java/org/apache/phoenix/flume/RegexEventSerializerIT.java b/phoenix-flume/src/it/java/org/apache/phoenix/flume/RegexEventSerializerIT.java
index 0952747..f86f039 100644
--- a/phoenix-flume/src/it/java/org/apache/phoenix/flume/RegexEventSerializerIT.java
+++ b/phoenix-flume/src/it/java/org/apache/phoenix/flume/RegexEventSerializerIT.java
@@ -41,16 +41,18 @@ import org.apache.flume.event.EventBuilder;
import org.apache.flume.lifecycle.LifecycleState;
import org.apache.hadoop.hbase.util.Bytes;
import org.apache.phoenix.end2end.BaseHBaseManagedTimeIT;
+import org.apache.phoenix.end2end.HBaseManagedTimeTest;
import org.apache.phoenix.flume.serializer.EventSerializers;
import org.apache.phoenix.flume.sink.PhoenixSink;
import org.apache.phoenix.util.PropertiesUtil;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import com.google.common.base.Preconditions;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
-
+@Category(HBaseManagedTimeTest.class)
public class RegexEventSerializerIT extends BaseHBaseManagedTimeIT {
private Context sinkContext;
http://git-wip-us.apache.org/repos/asf/phoenix/blob/83b5bb4f/phoenix-pig/src/it/java/org/apache/phoenix/pig/PhoenixHBaseLoaderIT.java
----------------------------------------------------------------------
diff --git a/phoenix-pig/src/it/java/org/apache/phoenix/pig/PhoenixHBaseLoaderIT.java b/phoenix-pig/src/it/java/org/apache/phoenix/pig/PhoenixHBaseLoaderIT.java
index 0762c01..51b2478 100644
--- a/phoenix-pig/src/it/java/org/apache/phoenix/pig/PhoenixHBaseLoaderIT.java
+++ b/phoenix-pig/src/it/java/org/apache/phoenix/pig/PhoenixHBaseLoaderIT.java
@@ -37,6 +37,7 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hbase.HBaseTestingUtility;
+import org.apache.phoenix.end2end.NeedsOwnMiniClusterTest;
import org.apache.phoenix.jdbc.PhoenixDriver;
import org.apache.phoenix.query.QueryServices;
import org.apache.phoenix.util.PhoenixRuntime;
@@ -57,6 +58,7 @@ import org.junit.AfterClass;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import com.google.common.base.Preconditions;
@@ -64,7 +66,7 @@ import com.google.common.base.Preconditions;
*
* Test class to run all the integration tests against a virtual map reduce cluster.
*/
-
+@Category(NeedsOwnMiniClusterTest.class)
public class PhoenixHBaseLoaderIT {
private static final Log LOG = LogFactory.getLog(PhoenixHBaseLoaderIT.class);
http://git-wip-us.apache.org/repos/asf/phoenix/blob/83b5bb4f/phoenix-pig/src/it/java/org/apache/phoenix/pig/PhoenixHBaseStorerIT.java
----------------------------------------------------------------------
diff --git a/phoenix-pig/src/it/java/org/apache/phoenix/pig/PhoenixHBaseStorerIT.java b/phoenix-pig/src/it/java/org/apache/phoenix/pig/PhoenixHBaseStorerIT.java
index 67abf62..e0021d9 100644
--- a/phoenix-pig/src/it/java/org/apache/phoenix/pig/PhoenixHBaseStorerIT.java
+++ b/phoenix-pig/src/it/java/org/apache/phoenix/pig/PhoenixHBaseStorerIT.java
@@ -21,9 +21,9 @@ package org.apache.phoenix.pig;
import static org.apache.phoenix.util.PhoenixRuntime.JDBC_PROTOCOL_SEPARATOR;
import static org.apache.phoenix.util.TestUtil.LOCALHOST;
-import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertArrayEquals;
import java.sql.Connection;
import java.sql.DriverManager;
@@ -33,6 +33,7 @@ import java.util.Collection;
import org.apache.hadoop.hbase.util.Bytes;
import org.apache.phoenix.end2end.BaseHBaseManagedTimeIT;
+import org.apache.phoenix.end2end.HBaseManagedTimeTest;
import org.apache.pig.ExecType;
import org.apache.pig.PigServer;
import org.apache.pig.backend.executionengine.ExecJob.JOB_STATUS;
@@ -47,10 +48,11 @@ import org.junit.AfterClass;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import com.google.common.collect.Lists;
-
+@Category(HBaseManagedTimeTest.class)
public class PhoenixHBaseStorerIT extends BaseHBaseManagedTimeIT {
private static TupleFactory tupleFactory;
http://git-wip-us.apache.org/repos/asf/phoenix/blob/83b5bb4f/phoenix-pig/src/it/java/org/apache/phoenix/pig/PhoenixPigConfigurationIT.java
----------------------------------------------------------------------
diff --git a/phoenix-pig/src/it/java/org/apache/phoenix/pig/PhoenixPigConfigurationIT.java b/phoenix-pig/src/it/java/org/apache/phoenix/pig/PhoenixPigConfigurationIT.java
index efbfbf8..a6f6efd 100644
--- a/phoenix-pig/src/it/java/org/apache/phoenix/pig/PhoenixPigConfigurationIT.java
+++ b/phoenix-pig/src/it/java/org/apache/phoenix/pig/PhoenixPigConfigurationIT.java
@@ -30,12 +30,14 @@ import java.util.Properties;
import org.apache.hadoop.conf.Configuration;
import org.apache.phoenix.end2end.BaseHBaseManagedTimeIT;
+import org.apache.phoenix.end2end.HBaseManagedTimeTest;
import org.apache.phoenix.util.PropertiesUtil;
import org.apache.phoenix.util.SchemaUtil;
import org.apache.phoenix.util.TestUtil;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
-
+@Category(HBaseManagedTimeTest.class)
public class PhoenixPigConfigurationIT extends BaseHBaseManagedTimeIT {
private static final String zkQuorum = TestUtil.LOCALHOST + JDBC_PROTOCOL_TERMINATOR + PHOENIX_TEST_DRIVER_URL_PARAM;
http://git-wip-us.apache.org/repos/asf/phoenix/blob/83b5bb4f/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index a8d1f10..9d39f1e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -106,16 +106,16 @@
<!-- Test Dependencies -->
<mockito-all.version>1.8.5</mockito-all.version>
- <junit.version>4.12-beta-3</junit.version>
+ <junit.version>4.11</junit.version>
<!-- Plugin versions -->
- <maven-eclipse-plugin.version>2.9</maven-eclipse-plugin.version>
- <maven-build-helper-plugin.version>1.9.1</maven-build-helper-plugin.version>
- <maven-surefire-plugin.version>2.18</maven-surefire-plugin.version>
- <maven-failsafe-plugin.version>2.18</maven-failsafe-plugin.version>
+ <maven-eclipse-plugin.version>2.8</maven-eclipse-plugin.version>
+ <maven-build-helper-plugin.version>1.7</maven-build-helper-plugin.version>
+ <maven-surefire-plugin.version>2.16</maven-surefire-plugin.version>
+ <maven-failsafe-plugin.version>2.17</maven-failsafe-plugin.version>
<maven-dependency-plugin.version>2.1</maven-dependency-plugin.version>
- <maven.assembly.version>2.5.2</maven.assembly.version>
+ <maven.assembly.version>2.4</maven.assembly.version>
<maven.rat.version>0.8</maven.rat.version>
<!-- Plugin options -->
[2/5] phoenix git commit: Revert "Upgrade to 4.12 Junit and update
tests by removing @Category (Samarth Jain)"
Posted by ja...@apache.org.
http://git-wip-us.apache.org/repos/asf/phoenix/blob/83b5bb4f/phoenix-core/src/it/java/org/apache/phoenix/end2end/SpooledOrderByIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SpooledOrderByIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SpooledOrderByIT.java
index bb09793..c35ecab 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SpooledOrderByIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SpooledOrderByIT.java
@@ -22,8 +22,9 @@ import java.util.Map;
import org.apache.phoenix.query.QueryServices;
import org.apache.phoenix.util.ReadOnlyProps;
import org.junit.BeforeClass;
+import org.junit.experimental.categories.Category;
-
+@Category(ClientManagedTimeTest.class)
public class SpooledOrderByIT extends OrderByIT {
@BeforeClass
http://git-wip-us.apache.org/repos/asf/phoenix/blob/83b5bb4f/phoenix-core/src/it/java/org/apache/phoenix/end2end/SpooledSortMergeJoinIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SpooledSortMergeJoinIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SpooledSortMergeJoinIT.java
index c646622..d602423 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SpooledSortMergeJoinIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SpooledSortMergeJoinIT.java
@@ -22,10 +22,11 @@ import java.util.Map;
import org.apache.phoenix.query.QueryServices;
import org.apache.phoenix.util.ReadOnlyProps;
import org.junit.BeforeClass;
+import org.junit.experimental.categories.Category;
import com.google.common.collect.Maps;
-
+@Category(HBaseManagedTimeTest.class)
public class SpooledSortMergeJoinIT extends SortMergeJoinIT {
public SpooledSortMergeJoinIT(String[] indexDDL, String[] plans) {
http://git-wip-us.apache.org/repos/asf/phoenix/blob/83b5bb4f/phoenix-core/src/it/java/org/apache/phoenix/end2end/SpooledTmpFileDeleteIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SpooledTmpFileDeleteIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SpooledTmpFileDeleteIT.java
deleted file mode 100644
index 4e3f54f..0000000
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SpooledTmpFileDeleteIT.java
+++ /dev/null
@@ -1,124 +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 static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
-import java.io.File;
-import java.io.FileFilter;
-import java.sql.Connection;
-import java.sql.DriverManager;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Statement;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Properties;
-
-import org.apache.phoenix.query.QueryServices;
-import org.junit.Before;
-import org.junit.Test;
-
-
-
-public class SpooledTmpFileDeleteIT extends BaseClientManagedTimeIT {
- private Connection conn = null;
- private Properties props = null;
-
- @Before
- public void setup() throws SQLException {
- props = new Properties();
- props.put(QueryServices.SPOOL_DIRECTORY, "/tmp");
- props.setProperty(QueryServices.SPOOL_THRESHOLD_BYTES_ATTRIB, Integer.toString(1));
- conn = DriverManager.getConnection(getUrl(), props);
- Statement stmt = conn.createStatement();
- stmt.execute("CREATE TABLE test (ID varchar NOT NULL PRIMARY KEY) SPLIT ON ('EA','EZ')");
- stmt.execute("UPSERT INTO test VALUES ('AA')");
- stmt.execute("UPSERT INTO test VALUES ('EB')");
- stmt.execute("UPSERT INTO test VALUES ('FA')");
- stmt.close();
- conn.commit();
- }
-
- @Test
- public void testDeleteAllSpooledTmpFiles() throws SQLException, Throwable {
- File dir = new File("/tmp");
- File[] files = null;
-
- class FilenameFilter implements FileFilter {
- @Override
- public boolean accept(File dir) {
- return dir.getName().toLowerCase().endsWith(".bin") &&
- dir.getName().startsWith("ResultSpooler");
- }
- }
-
- FilenameFilter fnameFilter = new FilenameFilter();
-
- // clean up first
- files = dir.listFiles(fnameFilter);
- for (File file : files) {
- file.delete();
- }
-
- String query = "select * from TEST";
- Statement statement = conn.createStatement();
- ResultSet rs = statement.executeQuery(query);
- assertTrue(rs.next());
- files = dir.listFiles(fnameFilter);
- assertTrue(files.length > 0);
- List<String> fileNames = new ArrayList<String>();
- for (File file : files) {
- fileNames.add(file.getName());
- }
-
- String preparedQuery = "select * from test where id = ?";
- PreparedStatement pstmt = conn.prepareStatement(preparedQuery);
- pstmt.setString(1, "EB");
- ResultSet prs = pstmt.executeQuery(preparedQuery);
- assertTrue(prs.next());
- files = dir.listFiles(fnameFilter);
- assertTrue(files.length > 0);
- for (File file : files) {
- fileNames.add(file.getName());
- }
-
- Connection conn2 = DriverManager.getConnection(getUrl(), props);
- String query2 = "select * from TEST";
- Statement statement2 = conn2.createStatement();
- ResultSet rs2 = statement2.executeQuery(query2);
- assertTrue(rs2.next());
- files = dir.listFiles(fnameFilter);
- assertTrue(files.length > 0);
-
- String preparedQuery2 = "select * from test where id = ?";
- PreparedStatement pstmt2 = conn2.prepareStatement(preparedQuery2);
- pstmt2.setString(1, "EB");
- ResultSet prs2 = pstmt2.executeQuery(preparedQuery2);
- assertTrue(prs2.next());
- files = dir.listFiles(fnameFilter);
- assertTrue(files.length > 0);
-
- conn.close();
-
- files = dir.listFiles(fnameFilter);
-
- for (File file : files) {
- assertFalse(fileNames.contains(file.getName()));
- }
- conn2.close();
- files = dir.listFiles(fnameFilter);
- assertTrue(files.length == 0);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/phoenix/blob/83b5bb4f/phoenix-core/src/it/java/org/apache/phoenix/end2end/StatementHintsIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/StatementHintsIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/StatementHintsIT.java
index 70246f9..9c9f2c6 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/StatementHintsIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/StatementHintsIT.java
@@ -30,13 +30,14 @@ import java.util.Properties;
import org.apache.phoenix.util.PropertiesUtil;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
/**
* End-to-End tests on various statement hints.
*/
-
+@Category(HBaseManagedTimeTest.class)
public class StatementHintsIT extends BaseHBaseManagedTimeIT {
private static void initTableValues() throws Exception {
http://git-wip-us.apache.org/repos/asf/phoenix/blob/83b5bb4f/phoenix-core/src/it/java/org/apache/phoenix/end2end/StatsCollectorIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/StatsCollectorIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/StatsCollectorIT.java
index 2986bf4..7c0c553 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/StatsCollectorIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/StatsCollectorIT.java
@@ -32,10 +32,11 @@ import org.apache.phoenix.util.ReadOnlyProps;
import org.apache.phoenix.util.TestUtil;
import org.junit.BeforeClass;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import com.google.common.collect.Maps;
-
+@Category(NeedsOwnMiniClusterTest.class)
public class StatsCollectorIT extends BaseOwnClusterHBaseManagedTimeIT {
private static final String STATS_TEST_TABLE_NAME = "S";
private static final byte[] STATS_TEST_TABLE_BYTES = Bytes.toBytes(STATS_TEST_TABLE_NAME);
http://git-wip-us.apache.org/repos/asf/phoenix/blob/83b5bb4f/phoenix-core/src/it/java/org/apache/phoenix/end2end/StddevIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/StddevIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/StddevIT.java
index c00b770..f3fef4b 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/StddevIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/StddevIT.java
@@ -29,7 +29,8 @@ import java.sql.PreparedStatement;
import java.sql.ResultSet;
import org.junit.Test;
-
+import org.junit.experimental.categories.Category;
+@Category(HBaseManagedTimeTest.class)
public class StddevIT extends BaseHBaseManagedTimeIT {
@Test
http://git-wip-us.apache.org/repos/asf/phoenix/blob/83b5bb4f/phoenix-core/src/it/java/org/apache/phoenix/end2end/SubqueryIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SubqueryIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SubqueryIT.java
index 0e5dcc0..4f3ca16 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SubqueryIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SubqueryIT.java
@@ -57,13 +57,14 @@ import org.apache.phoenix.util.ReadOnlyProps;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameters;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
-
+@Category(HBaseManagedTimeTest.class)
@RunWith(Parameterized.class)
public class SubqueryIT extends BaseHBaseManagedTimeIT {
http://git-wip-us.apache.org/repos/asf/phoenix/blob/83b5bb4f/phoenix-core/src/it/java/org/apache/phoenix/end2end/TenantSpecificTablesDDLIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/TenantSpecificTablesDDLIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/TenantSpecificTablesDDLIT.java
index 4d0b45d..42fe5b8 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/TenantSpecificTablesDDLIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/TenantSpecificTablesDDLIT.java
@@ -56,8 +56,9 @@ import org.apache.phoenix.util.PropertiesUtil;
import org.apache.phoenix.util.SchemaUtil;
import org.apache.phoenix.util.StringUtil;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
-
+@Category(NeedsOwnMiniClusterTest.class)
public class TenantSpecificTablesDDLIT extends BaseTenantSpecificTablesIT {
@Test
http://git-wip-us.apache.org/repos/asf/phoenix/blob/83b5bb4f/phoenix-core/src/it/java/org/apache/phoenix/end2end/TenantSpecificTablesDMLIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/TenantSpecificTablesDMLIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/TenantSpecificTablesDMLIT.java
index dbe767b..248de0f 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/TenantSpecificTablesDMLIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/TenantSpecificTablesDMLIT.java
@@ -37,8 +37,9 @@ import org.apache.phoenix.schema.TableNotFoundException;
import org.apache.phoenix.util.PhoenixRuntime;
import org.apache.phoenix.util.PropertiesUtil;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
-
+@Category(NeedsOwnMiniClusterTest.class)
public class TenantSpecificTablesDMLIT extends BaseTenantSpecificTablesIT {
@Test
http://git-wip-us.apache.org/repos/asf/phoenix/blob/83b5bb4f/phoenix-core/src/it/java/org/apache/phoenix/end2end/TenantSpecificViewIndexIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/TenantSpecificViewIndexIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/TenantSpecificViewIndexIT.java
index 83f2e4d..094222b 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/TenantSpecificViewIndexIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/TenantSpecificViewIndexIT.java
@@ -32,8 +32,9 @@ import org.apache.phoenix.schema.ColumnNotFoundException;
import org.apache.phoenix.util.PhoenixRuntime;
import org.apache.phoenix.util.QueryUtil;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
-
+@Category(HBaseManagedTimeTest.class)
public class TenantSpecificViewIndexIT extends BaseTenantSpecificViewIndexIT {
@Test
http://git-wip-us.apache.org/repos/asf/phoenix/blob/83b5bb4f/phoenix-core/src/it/java/org/apache/phoenix/end2end/TenantSpecificViewIndexSaltedIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/TenantSpecificViewIndexSaltedIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/TenantSpecificViewIndexSaltedIT.java
index 76d7fa2..56fa8b6 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/TenantSpecificViewIndexSaltedIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/TenantSpecificViewIndexSaltedIT.java
@@ -18,8 +18,9 @@
package org.apache.phoenix.end2end;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
-
+@Category(HBaseManagedTimeTest.class)
public class TenantSpecificViewIndexSaltedIT extends BaseTenantSpecificViewIndexIT {
private static final Integer SALT_BUCKETS = 3;
http://git-wip-us.apache.org/repos/asf/phoenix/blob/83b5bb4f/phoenix-core/src/it/java/org/apache/phoenix/end2end/TimezoneOffsetFunctionIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/TimezoneOffsetFunctionIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/TimezoneOffsetFunctionIT.java
index 54bbe9c..e3c4776 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/TimezoneOffsetFunctionIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/TimezoneOffsetFunctionIT.java
@@ -17,18 +17,17 @@
*/
package org.apache.phoenix.end2end;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
import java.sql.Connection;
import java.sql.DriverManager;
import java.sql.ResultSet;
-
import org.apache.phoenix.schema.IllegalDataException;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
-
+@Category(HBaseManagedTimeTest.class)
public class TimezoneOffsetFunctionIT extends BaseHBaseManagedTimeIT {
@Test
http://git-wip-us.apache.org/repos/asf/phoenix/blob/83b5bb4f/phoenix-core/src/it/java/org/apache/phoenix/end2end/ToCharFunctionIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ToCharFunctionIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ToCharFunctionIT.java
index 52b5207..1fa88f5 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ToCharFunctionIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ToCharFunctionIT.java
@@ -41,6 +41,7 @@ import org.apache.phoenix.util.PhoenixRuntime;
import org.apache.phoenix.util.PropertiesUtil;
import org.junit.Before;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
/**
* Tests for the TO_CHAR built-in function.
@@ -49,7 +50,7 @@ import org.junit.Test;
*
* @since 0.1
*/
-
+@Category(ClientManagedTimeTest.class)
public class ToCharFunctionIT extends BaseClientManagedTimeIT {
public static final String TO_CHAR_TABLE_NAME = "TO_CHAR_TABLE";
http://git-wip-us.apache.org/repos/asf/phoenix/blob/83b5bb4f/phoenix-core/src/it/java/org/apache/phoenix/end2end/ToNumberFunctionIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ToNumberFunctionIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ToNumberFunctionIT.java
index daf2c63..431cbda 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ToNumberFunctionIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ToNumberFunctionIT.java
@@ -41,6 +41,7 @@ import org.junit.AfterClass;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
/**
* Tests for the TO_NUMBER built-in function.
@@ -49,7 +50,7 @@ import org.junit.Test;
*
* @since 0.1
*/
-
+@Category(ClientManagedTimeTest.class)
public class ToNumberFunctionIT extends BaseClientManagedTimeIT {
// This test changes to locale to en_US, and saves the previous locale here
http://git-wip-us.apache.org/repos/asf/phoenix/blob/83b5bb4f/phoenix-core/src/it/java/org/apache/phoenix/end2end/TopNIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/TopNIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/TopNIT.java
index 618680d..8d3a706 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/TopNIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/TopNIT.java
@@ -40,8 +40,9 @@ import java.util.Properties;
import org.apache.phoenix.util.PhoenixRuntime;
import org.apache.phoenix.util.PropertiesUtil;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
-
+@Category(ClientManagedTimeTest.class)
public class TopNIT extends BaseClientManagedTimeIT {
@Test
http://git-wip-us.apache.org/repos/asf/phoenix/blob/83b5bb4f/phoenix-core/src/it/java/org/apache/phoenix/end2end/TruncateFunctionIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/TruncateFunctionIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/TruncateFunctionIT.java
index 4cd263e..bed5146 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/TruncateFunctionIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/TruncateFunctionIT.java
@@ -39,8 +39,9 @@ import java.util.Properties;
import org.apache.phoenix.query.QueryConstants;
import org.apache.phoenix.util.DateUtil;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
-
+@Category(ClientManagedTimeTest.class)
public class TruncateFunctionIT extends BaseClientManagedTimeIT {
private static Format format = DateUtil.getDateParser(DateUtil.DEFAULT_MS_DATE_FORMAT);
private static final String DS1 = "1970-01-10 00:58:01.587";
http://git-wip-us.apache.org/repos/asf/phoenix/blob/83b5bb4f/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpsertBigValuesIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpsertBigValuesIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpsertBigValuesIT.java
index 3d1bb4a..e1ce962 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpsertBigValuesIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpsertBigValuesIT.java
@@ -28,8 +28,9 @@ import java.sql.ResultSet;
import java.util.Properties;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
-
+@Category(HBaseManagedTimeTest.class)
public class UpsertBigValuesIT extends BaseHBaseManagedTimeIT {
private static final long INTEGER_MIN_MINUS_ONE = (long)Integer.MIN_VALUE - 1;
http://git-wip-us.apache.org/repos/asf/phoenix/blob/83b5bb4f/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpsertSelectAutoCommitIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpsertSelectAutoCommitIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpsertSelectAutoCommitIT.java
index 4b4f215..e39619c 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpsertSelectAutoCommitIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpsertSelectAutoCommitIT.java
@@ -35,8 +35,9 @@ import java.util.Properties;
import org.apache.phoenix.query.QueryServices;
import org.apache.phoenix.util.PropertiesUtil;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
-
+@Category(HBaseManagedTimeTest.class)
public class UpsertSelectAutoCommitIT extends BaseHBaseManagedTimeIT {
public UpsertSelectAutoCommitIT() {
http://git-wip-us.apache.org/repos/asf/phoenix/blob/83b5bb4f/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpsertSelectIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpsertSelectIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpsertSelectIT.java
index c1a960f..ac54fe4 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpsertSelectIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpsertSelectIT.java
@@ -53,8 +53,9 @@ import org.apache.phoenix.util.ReadOnlyProps;
import org.apache.phoenix.util.TestUtil;
import org.junit.BeforeClass;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
-
+@Category(ClientManagedTimeTest.class)
public class UpsertSelectIT extends BaseClientManagedTimeIT {
http://git-wip-us.apache.org/repos/asf/phoenix/blob/83b5bb4f/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpsertValuesIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpsertValuesIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpsertValuesIT.java
index 6389088..043bba9 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpsertValuesIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpsertValuesIT.java
@@ -43,8 +43,9 @@ import org.apache.phoenix.util.DateUtil;
import org.apache.phoenix.util.PhoenixRuntime;
import org.apache.phoenix.util.TestUtil;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
-
+@Category(ClientManagedTimeTest.class)
public class UpsertValuesIT extends BaseClientManagedTimeIT {
@Test
public void testGroupByWithLimitOverRowKey() throws Exception {
http://git-wip-us.apache.org/repos/asf/phoenix/blob/83b5bb4f/phoenix-core/src/it/java/org/apache/phoenix/end2end/VariableLengthPKIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/VariableLengthPKIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/VariableLengthPKIT.java
index 07d6b32..6800379 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/VariableLengthPKIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/VariableLengthPKIT.java
@@ -47,9 +47,10 @@ import org.apache.phoenix.util.DateUtil;
import org.apache.phoenix.util.PhoenixRuntime;
import org.apache.phoenix.util.PropertiesUtil;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
-
+@Category(ClientManagedTimeTest.class)
public class VariableLengthPKIT extends BaseClientManagedTimeIT {
private static Format format = DateUtil.getDateParser(DateUtil.DEFAULT_DATE_FORMAT);
private static final String DS1 = "1970-01-01 00:58:00";
http://git-wip-us.apache.org/repos/asf/phoenix/blob/83b5bb4f/phoenix-core/src/it/java/org/apache/phoenix/end2end/ViewIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ViewIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ViewIT.java
index bc6f20d..63beeed 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ViewIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ViewIT.java
@@ -35,8 +35,9 @@ import org.apache.phoenix.query.KeyRange;
import org.apache.phoenix.schema.ReadOnlyTableException;
import org.apache.phoenix.schema.TableNotFoundException;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
-
+@Category(NeedsOwnMiniClusterTest.class)
public class ViewIT extends BaseViewIT {
@Test
http://git-wip-us.apache.org/repos/asf/phoenix/blob/83b5bb4f/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/BaseIndexIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/BaseIndexIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/BaseIndexIT.java
index d77ee2a..88c88bd 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/BaseIndexIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/BaseIndexIT.java
@@ -18,9 +18,11 @@
package org.apache.phoenix.end2end.index;
import org.apache.phoenix.end2end.BaseHBaseManagedTimeIT;
+import org.apache.phoenix.end2end.HBaseManagedTimeTest;
import org.apache.phoenix.util.SchemaUtil;
+import org.junit.experimental.categories.Category;
-
+@Category(HBaseManagedTimeTest.class)
public class BaseIndexIT extends BaseHBaseManagedTimeIT {
public static final String SCHEMA_NAME = "";
public static final String DATA_TABLE_NAME = "T";
http://git-wip-us.apache.org/repos/asf/phoenix/blob/83b5bb4f/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/BaseMutableIndexIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/BaseMutableIndexIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/BaseMutableIndexIT.java
index 279baa1..f2a3578 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/BaseMutableIndexIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/BaseMutableIndexIT.java
@@ -27,10 +27,12 @@ import java.sql.PreparedStatement;
import java.sql.SQLException;
import java.util.Properties;
+import org.apache.phoenix.end2end.HBaseManagedTimeTest;
import org.apache.phoenix.util.PropertiesUtil;
import org.apache.phoenix.util.TestUtil;
+import org.junit.experimental.categories.Category;
-
+@Category(HBaseManagedTimeTest.class)
public class BaseMutableIndexIT extends BaseIndexIT {
public BaseMutableIndexIT() {
}
http://git-wip-us.apache.org/repos/asf/phoenix/blob/83b5bb4f/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/DropViewIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/DropViewIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/DropViewIT.java
index 4451a0f..2218e0b 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/DropViewIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/DropViewIT.java
@@ -33,6 +33,7 @@ import org.apache.hadoop.hbase.client.HBaseAdmin;
import org.apache.hadoop.hbase.io.encoding.DataBlockEncoding;
import org.apache.hadoop.hbase.util.Bytes;
import org.apache.phoenix.end2end.BaseHBaseManagedTimeIT;
+import org.apache.phoenix.end2end.HBaseManagedTimeTest;
import org.apache.phoenix.end2end.Shadower;
import org.apache.phoenix.query.QueryServices;
import org.apache.phoenix.util.PropertiesUtil;
@@ -40,10 +41,11 @@ import org.apache.phoenix.util.ReadOnlyProps;
import org.apache.phoenix.util.SchemaUtil;
import org.junit.BeforeClass;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import com.google.common.collect.Maps;
-
+@Category(HBaseManagedTimeTest.class)
public class DropViewIT extends BaseMutableIndexIT {
private static final byte[] HBASE_NATIVE_BYTES = SchemaUtil.getTableNameAsBytes(HBASE_NATIVE_SCHEMA_NAME, HBASE_NATIVE);
private static final byte[] FAMILY_NAME = Bytes.toBytes(SchemaUtil.normalizeIdentifier("1"));
@@ -67,7 +69,6 @@ public class DropViewIT extends BaseMutableIndexIT {
admin.deleteTable(HBASE_NATIVE_BYTES);
} catch (org.apache.hadoop.hbase.TableNotFoundException e) {
}
- @SuppressWarnings("deprecation")
HTableDescriptor descriptor = new HTableDescriptor(HBASE_NATIVE_BYTES);
HColumnDescriptor columnDescriptor = new HColumnDescriptor(FAMILY_NAME);
columnDescriptor.setKeepDeletedCells(true);
http://git-wip-us.apache.org/repos/asf/phoenix/blob/83b5bb4f/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/ImmutableIndexIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/ImmutableIndexIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/ImmutableIndexIT.java
index 3be3bcf..811aee8 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/ImmutableIndexIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/ImmutableIndexIT.java
@@ -34,6 +34,7 @@ import java.sql.SQLException;
import java.util.Properties;
import org.apache.phoenix.end2end.BaseHBaseManagedTimeIT;
+import org.apache.phoenix.end2end.HBaseManagedTimeTest;
import org.apache.phoenix.exception.SQLExceptionCode;
import org.apache.phoenix.jdbc.PhoenixConnection;
import org.apache.phoenix.query.QueryConstants;
@@ -41,8 +42,9 @@ import org.apache.phoenix.schema.PTableKey;
import org.apache.phoenix.util.PropertiesUtil;
import org.apache.phoenix.util.QueryUtil;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
-
+@Category(HBaseManagedTimeTest.class)
public class ImmutableIndexIT extends BaseHBaseManagedTimeIT {
// Populate the test table with data.
private static void populateTestTable() throws SQLException {
http://git-wip-us.apache.org/repos/asf/phoenix/blob/83b5bb4f/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexMetadataIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexMetadataIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexMetadataIT.java
index 26878f8..fb4b827 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexMetadataIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexMetadataIT.java
@@ -37,6 +37,7 @@ import java.util.Properties;
import org.apache.hadoop.hbase.io.ImmutableBytesWritable;
import org.apache.phoenix.end2end.BaseHBaseManagedTimeIT;
+import org.apache.phoenix.end2end.HBaseManagedTimeTest;
import org.apache.phoenix.exception.SQLExceptionCode;
import org.apache.phoenix.jdbc.PhoenixConnection;
import org.apache.phoenix.query.QueryConstants;
@@ -50,8 +51,9 @@ import org.apache.phoenix.util.SchemaUtil;
import org.apache.phoenix.util.StringUtil;
import org.apache.phoenix.util.TestUtil;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
-
+@Category(HBaseManagedTimeTest.class)
public class IndexMetadataIT extends BaseHBaseManagedTimeIT {
private enum Order {ASC, DESC};
http://git-wip-us.apache.org/repos/asf/phoenix/blob/83b5bb4f/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexTestUtil.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexTestUtil.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexTestUtil.java
index 825c09b..bee67b4 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexTestUtil.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexTestUtil.java
@@ -133,7 +133,6 @@ public class IndexTestUtil {
for (Map.Entry<byte[],List<Cell>> entry : dataMutation.getFamilyCellMap().entrySet()) {
PColumnFamily family = dataTable.getColumnFamily(entry.getKey());
for (Cell kv : entry.getValue()) {
- @SuppressWarnings("deprecation")
byte[] cq = kv.getQualifier();
if (Bytes.compareTo(QueryConstants.EMPTY_COLUMN_BYTES, cq) != 0) {
try {
http://git-wip-us.apache.org/repos/asf/phoenix/blob/83b5bb4f/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/LocalIndexIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/LocalIndexIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/LocalIndexIT.java
index b1f4a3c..f03d053 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/LocalIndexIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/LocalIndexIT.java
@@ -58,9 +58,9 @@ import org.apache.phoenix.jdbc.PhoenixConnection;
import org.apache.phoenix.jdbc.PhoenixDatabaseMetaData;
import org.apache.phoenix.jdbc.PhoenixPreparedStatement;
import org.apache.phoenix.query.QueryServices;
-import org.apache.phoenix.schema.PIndexState;
import org.apache.phoenix.schema.PTable;
import org.apache.phoenix.schema.PTable.IndexType;
+import org.apache.phoenix.schema.PIndexState;
import org.apache.phoenix.schema.PTableKey;
import org.apache.phoenix.schema.PTableType;
import org.apache.phoenix.schema.TableNotFoundException;
@@ -156,11 +156,9 @@ public class LocalIndexIT extends BaseIndexIT {
HBaseAdmin admin = driver.getConnectionQueryServices(getUrl(), TestUtil.TEST_PROPERTIES).getAdmin();
HTableDescriptor htd = admin.getTableDescriptor(TableName.valueOf(MetaDataUtil.getLocalIndexTableName(DATA_TABLE_NAME)));
assertEquals(IndexRegionSplitPolicy.class.getName(), htd.getValue(HTableDescriptor.SPLIT_POLICY));
- try (HTable userTable = new HTable(admin.getConfiguration(),TableName.valueOf(DATA_TABLE_NAME))) {
- try (HTable indexTable = new HTable(admin.getConfiguration(),TableName.valueOf(MetaDataUtil.getLocalIndexTableName(DATA_TABLE_NAME)))) {
- assertArrayEquals("Both user table and index table should have same split keys.", userTable.getStartKeys(), indexTable.getStartKeys());
- }
- }
+ HTable userTable = new HTable(admin.getConfiguration(),TableName.valueOf(DATA_TABLE_NAME));
+ HTable indexTable = new HTable(admin.getConfiguration(),TableName.valueOf(MetaDataUtil.getLocalIndexTableName(DATA_TABLE_NAME)));
+ assertArrayEquals("Both user table and index table should have same split keys.", userTable.getStartKeys(), indexTable.getStartKeys());
}
@Test
http://git-wip-us.apache.org/repos/asf/phoenix/blob/83b5bb4f/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/MutableIndexFailureIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/MutableIndexFailureIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/MutableIndexFailureIT.java
index d11c059..acece20 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/MutableIndexFailureIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/MutableIndexFailureIT.java
@@ -82,7 +82,6 @@ import org.junit.experimental.categories.Category;
*
* @since 2.1
*/
-
@Category(NeedsOwnMiniClusterTest.class)
public class MutableIndexFailureIT extends BaseTest {
private static final int NUM_SLAVES = 4;
http://git-wip-us.apache.org/repos/asf/phoenix/blob/83b5bb4f/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/MutableIndexIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/MutableIndexIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/MutableIndexIT.java
index d3d8322..b4cbf9b 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/MutableIndexIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/MutableIndexIT.java
@@ -37,6 +37,7 @@ import org.apache.hadoop.hbase.HTableDescriptor;
import org.apache.phoenix.compile.ColumnResolver;
import org.apache.phoenix.compile.FromCompiler;
import org.apache.phoenix.end2end.BaseHBaseManagedTimeIT;
+import org.apache.phoenix.end2end.HBaseManagedTimeTest;
import org.apache.phoenix.end2end.Shadower;
import org.apache.phoenix.jdbc.PhoenixConnection;
import org.apache.phoenix.parse.NamedTableNode;
@@ -50,11 +51,12 @@ import org.apache.phoenix.util.ReadOnlyProps;
import org.apache.phoenix.util.TestUtil;
import org.junit.BeforeClass;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import com.google.common.collect.Maps;
import com.google.common.primitives.Doubles;
-
+@Category(HBaseManagedTimeTest.class)
public class MutableIndexIT extends BaseMutableIndexIT {
@BeforeClass
http://git-wip-us.apache.org/repos/asf/phoenix/blob/83b5bb4f/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/MutableIndexReplicationIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/MutableIndexReplicationIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/MutableIndexReplicationIT.java
index a4f4682..15465d1 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/MutableIndexReplicationIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/MutableIndexReplicationIT.java
@@ -72,7 +72,6 @@ import com.google.common.collect.Maps;
* HBase 0.98.5
* </p>
*/
-
@Category(NeedsOwnMiniClusterTest.class)
public class MutableIndexReplicationIT extends BaseTest {
http://git-wip-us.apache.org/repos/asf/phoenix/blob/83b5bb4f/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/SaltedIndexIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/SaltedIndexIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/SaltedIndexIT.java
index 112e4d3..0279283 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/SaltedIndexIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/SaltedIndexIT.java
@@ -30,6 +30,7 @@ import java.util.Map;
import java.util.Properties;
import org.apache.phoenix.end2end.BaseHBaseManagedTimeIT;
+import org.apache.phoenix.end2end.HBaseManagedTimeTest;
import org.apache.phoenix.end2end.Shadower;
import org.apache.phoenix.jdbc.PhoenixConnection;
import org.apache.phoenix.query.QueryServices;
@@ -39,10 +40,11 @@ import org.apache.phoenix.util.QueryUtil;
import org.apache.phoenix.util.ReadOnlyProps;
import org.junit.BeforeClass;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import com.google.common.collect.Maps;
-
+@Category(HBaseManagedTimeTest.class)
public class SaltedIndexIT extends BaseIndexIT {
private static final int TABLE_SPLITS = 3;
private static final int INDEX_SPLITS = 4;
http://git-wip-us.apache.org/repos/asf/phoenix/blob/83b5bb4f/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/ViewIndexIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/ViewIndexIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/ViewIndexIT.java
index da6eb16..d4ceff4 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/ViewIndexIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/ViewIndexIT.java
@@ -27,6 +27,7 @@ import java.util.Map;
import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.client.HBaseAdmin;
+import org.apache.phoenix.end2end.HBaseManagedTimeTest;
import org.apache.phoenix.jdbc.PhoenixDatabaseMetaData;
import org.apache.phoenix.query.QueryServices;
import org.apache.phoenix.util.MetaDataUtil;
@@ -34,10 +35,11 @@ import org.apache.phoenix.util.ReadOnlyProps;
import org.apache.phoenix.util.TestUtil;
import org.junit.BeforeClass;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import com.google.common.collect.Maps;
-
+@Category(HBaseManagedTimeTest.class)
public class ViewIndexIT extends BaseIndexIT {
private String VIEW_NAME = "MY_VIEW";
http://git-wip-us.apache.org/repos/asf/phoenix/blob/83b5bb4f/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 06e63b2..a1cf5d1 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
@@ -32,16 +32,18 @@ import java.sql.SQLException;
import java.util.Properties;
import org.apache.phoenix.end2end.BaseClientManagedTimeIT;
+import org.apache.phoenix.end2end.ClientManagedTimeTest;
import org.apache.phoenix.util.PhoenixRuntime;
import org.apache.phoenix.util.PropertiesUtil;
import org.apache.phoenix.util.QueryUtil;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
/**
* Tests for table with transparent salting.
*/
-
+@Category(ClientManagedTimeTest.class)
public class SaltedTableIT extends BaseClientManagedTimeIT {
private static void initTableValues(byte[][] splits, long ts) throws Exception {
http://git-wip-us.apache.org/repos/asf/phoenix/blob/83b5bb4f/phoenix-core/src/it/java/org/apache/phoenix/end2end/salted/SaltedTableUpsertSelectIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/salted/SaltedTableUpsertSelectIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/salted/SaltedTableUpsertSelectIT.java
index 0a11ec7..8015cbc 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/salted/SaltedTableUpsertSelectIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/salted/SaltedTableUpsertSelectIT.java
@@ -32,10 +32,12 @@ import java.sql.SQLException;
import java.util.Properties;
import org.apache.phoenix.end2end.BaseHBaseManagedTimeIT;
+import org.apache.phoenix.end2end.HBaseManagedTimeTest;
import org.apache.phoenix.util.PropertiesUtil;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
-
+@Category(HBaseManagedTimeTest.class)
public class SaltedTableUpsertSelectIT extends BaseHBaseManagedTimeIT {
@Test
http://git-wip-us.apache.org/repos/asf/phoenix/blob/83b5bb4f/phoenix-core/src/it/java/org/apache/phoenix/end2end/salted/SaltedTableVarLengthRowKeyIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/salted/SaltedTableVarLengthRowKeyIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/salted/SaltedTableVarLengthRowKeyIT.java
index 53b267c..db517a6 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/salted/SaltedTableVarLengthRowKeyIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/salted/SaltedTableVarLengthRowKeyIT.java
@@ -30,10 +30,12 @@ import java.sql.ResultSet;
import java.util.Properties;
import org.apache.phoenix.end2end.BaseHBaseManagedTimeIT;
+import org.apache.phoenix.end2end.HBaseManagedTimeTest;
import org.apache.phoenix.util.PropertiesUtil;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
-
+@Category(HBaseManagedTimeTest.class)
public class SaltedTableVarLengthRowKeyIT extends BaseHBaseManagedTimeIT {
private static void initTableValues() throws Exception {
http://git-wip-us.apache.org/repos/asf/phoenix/blob/83b5bb4f/phoenix-core/src/it/java/org/apache/phoenix/hbase/index/FailForUnsupportedHBaseVersionsIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/hbase/index/FailForUnsupportedHBaseVersionsIT.java b/phoenix-core/src/it/java/org/apache/phoenix/hbase/index/FailForUnsupportedHBaseVersionsIT.java
index 3601aaa..1d0dbfd 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/hbase/index/FailForUnsupportedHBaseVersionsIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/hbase/index/FailForUnsupportedHBaseVersionsIT.java
@@ -34,15 +34,17 @@ import org.apache.hadoop.hbase.client.HBaseAdmin;
import org.apache.hadoop.hbase.regionserver.HRegionServer;
import org.apache.hadoop.hbase.util.Bytes;
import org.apache.hadoop.hbase.util.VersionInfo;
+import org.apache.phoenix.end2end.NeedsOwnMiniClusterTest;
import org.apache.phoenix.hbase.index.covered.example.ColumnGroup;
import org.apache.phoenix.hbase.index.covered.example.CoveredColumn;
import org.apache.phoenix.hbase.index.covered.example.CoveredColumnIndexSpecifierBuilder;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
/**
* Test that we correctly fail for versions of HBase that don't support current properties
*/
-
+@Category(NeedsOwnMiniClusterTest.class)
public class FailForUnsupportedHBaseVersionsIT {
private static final Log LOG = LogFactory.getLog(FailForUnsupportedHBaseVersionsIT.class);
@@ -120,7 +122,6 @@ public class FailForUnsupportedHBaseVersionsIT {
try {
// setup the primary table
- @SuppressWarnings("deprecation")
HTableDescriptor desc = new HTableDescriptor(
"testDoesNotStartRegionServerForUnsupportedCompressionAndVersion");
byte[] family = Bytes.toBytes("f");
http://git-wip-us.apache.org/repos/asf/phoenix/blob/83b5bb4f/phoenix-core/src/it/java/org/apache/phoenix/hbase/index/balancer/IndexLoadBalancerIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/hbase/index/balancer/IndexLoadBalancerIT.java b/phoenix-core/src/it/java/org/apache/phoenix/hbase/index/balancer/IndexLoadBalancerIT.java
index 92c21c6..d534b6a 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/hbase/index/balancer/IndexLoadBalancerIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/hbase/index/balancer/IndexLoadBalancerIT.java
@@ -47,6 +47,7 @@ import org.apache.hadoop.hbase.util.Pair;
import org.apache.hadoop.hbase.util.Threads;
import org.apache.hadoop.hbase.zookeeper.ZKAssign;
import org.apache.hadoop.hbase.zookeeper.ZooKeeperWatcher;
+import org.apache.phoenix.end2end.NeedsOwnMiniClusterTest;
import org.apache.phoenix.hbase.index.IndexTestingUtils;
import org.apache.phoenix.hbase.index.Indexer;
import org.apache.phoenix.hbase.index.master.IndexMasterObserver;
@@ -54,8 +55,9 @@ import org.apache.phoenix.util.ConfigUtil;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
-
+@Category(NeedsOwnMiniClusterTest.class)
public class IndexLoadBalancerIT {
private static HBaseTestingUtility UTIL = new HBaseTestingUtility();
http://git-wip-us.apache.org/repos/asf/phoenix/blob/83b5bb4f/phoenix-core/src/it/java/org/apache/phoenix/hbase/index/covered/EndToEndCoveredColumnsIndexBuilderIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/hbase/index/covered/EndToEndCoveredColumnsIndexBuilderIT.java b/phoenix-core/src/it/java/org/apache/phoenix/hbase/index/covered/EndToEndCoveredColumnsIndexBuilderIT.java
index eafa416..f635dff 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/hbase/index/covered/EndToEndCoveredColumnsIndexBuilderIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/hbase/index/covered/EndToEndCoveredColumnsIndexBuilderIT.java
@@ -45,6 +45,7 @@ import org.apache.hadoop.hbase.regionserver.HRegion;
import org.apache.hadoop.hbase.util.Bytes;
import org.apache.hadoop.hbase.util.EnvironmentEdge;
import org.apache.hadoop.hbase.util.EnvironmentEdgeManager;
+import org.apache.phoenix.end2end.NeedsOwnMiniClusterTest;
import org.apache.phoenix.hbase.index.IndexTestingUtils;
import org.apache.phoenix.hbase.index.Indexer;
import org.apache.phoenix.hbase.index.TableName;
@@ -55,12 +56,13 @@ import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Rule;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
/**
* End-to-End test of just the {@link CoveredColumnsIndexBuilder}, but with a simple
* {@link IndexCodec} and BatchCache implementation.
*/
-
+@Category(NeedsOwnMiniClusterTest.class)
public class EndToEndCoveredColumnsIndexBuilderIT {
public class TestState {
@@ -293,7 +295,6 @@ public class EndToEndCoveredColumnsIndexBuilderIT {
*/
private TestState setupTest(String tableName) throws IOException {
byte[] tableNameBytes = Bytes.toBytes(tableName);
- @SuppressWarnings("deprecation")
HTableDescriptor desc = new HTableDescriptor(tableNameBytes);
desc.addFamily(FAM1);
// add the necessary simple options to create the builder
http://git-wip-us.apache.org/repos/asf/phoenix/blob/83b5bb4f/phoenix-core/src/it/java/org/apache/phoenix/hbase/index/covered/example/EndToEndCoveredIndexingIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/hbase/index/covered/example/EndToEndCoveredIndexingIT.java b/phoenix-core/src/it/java/org/apache/phoenix/hbase/index/covered/example/EndToEndCoveredIndexingIT.java
index bdc9049..5196031 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/hbase/index/covered/example/EndToEndCoveredIndexingIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/hbase/index/covered/example/EndToEndCoveredIndexingIT.java
@@ -43,6 +43,7 @@ import org.apache.hadoop.hbase.client.ResultScanner;
import org.apache.hadoop.hbase.client.Scan;
import org.apache.hadoop.hbase.util.Bytes;
import org.apache.hadoop.hbase.util.Pair;
+import org.apache.phoenix.end2end.NeedsOwnMiniClusterTest;
import org.apache.phoenix.hbase.index.IndexTestingUtils;
import org.apache.phoenix.hbase.index.Indexer;
import org.apache.phoenix.hbase.index.TableName;
@@ -51,13 +52,14 @@ import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Rule;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
/**
* Test Covered Column indexing in an 'end-to-end' manner on a minicluster. This covers cases where
* we manage custom timestamped updates that arrive in and out of order as well as just using the
* generically timestamped updates.
*/
-
+@Category(NeedsOwnMiniClusterTest.class)
public class EndToEndCoveredIndexingIT {
private static final Log LOG = LogFactory.getLog(EndToEndCoveredIndexingIT.class);
protected static final HBaseTestingUtility UTIL = new HBaseTestingUtility();
@@ -855,7 +857,6 @@ public class EndToEndCoveredIndexingIT {
// setup the primary table
String indexedTableName = Bytes.toString(TestTable.getTableName());
- @SuppressWarnings("deprecation")
HTableDescriptor pTable = new HTableDescriptor(indexedTableName);
pTable.addFamily(new HColumnDescriptor(FAM));
pTable.addFamily(new HColumnDescriptor(FAM2));
http://git-wip-us.apache.org/repos/asf/phoenix/blob/83b5bb4f/phoenix-core/src/it/java/org/apache/phoenix/hbase/index/covered/example/EndtoEndIndexingWithCompressionIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/hbase/index/covered/example/EndtoEndIndexingWithCompressionIT.java b/phoenix-core/src/it/java/org/apache/phoenix/hbase/index/covered/example/EndtoEndIndexingWithCompressionIT.java
index 016c59e..38aeb88 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/hbase/index/covered/example/EndtoEndIndexingWithCompressionIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/hbase/index/covered/example/EndtoEndIndexingWithCompressionIT.java
@@ -23,15 +23,17 @@ import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hbase.HConstants;
import org.apache.hadoop.hbase.regionserver.wal.IndexedWALEditCodec;
import org.apache.hadoop.hbase.regionserver.wal.WALCellCodec;
+import org.apache.phoenix.end2end.NeedsOwnMiniClusterTest;
import org.apache.phoenix.hbase.index.IndexTestingUtils;
import org.apache.phoenix.hbase.index.Indexer;
import org.junit.BeforeClass;
+import org.junit.experimental.categories.Category;
/**
* Test secondary indexing from an end-to-end perspective (client to server to index table).
*/
-
+@Category(NeedsOwnMiniClusterTest.class)
public class EndtoEndIndexingWithCompressionIT extends EndToEndCoveredIndexingIT {
@BeforeClass
http://git-wip-us.apache.org/repos/asf/phoenix/blob/83b5bb4f/phoenix-core/src/it/java/org/apache/phoenix/hbase/index/covered/example/FailWithoutRetriesIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/hbase/index/covered/example/FailWithoutRetriesIT.java b/phoenix-core/src/it/java/org/apache/phoenix/hbase/index/covered/example/FailWithoutRetriesIT.java
index bf6543e..6a79e31 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/hbase/index/covered/example/FailWithoutRetriesIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/hbase/index/covered/example/FailWithoutRetriesIT.java
@@ -35,6 +35,7 @@ import org.apache.hadoop.hbase.client.HTable;
import org.apache.hadoop.hbase.client.Put;
import org.apache.hadoop.hbase.client.RetriesExhaustedWithDetailsException;
import org.apache.hadoop.hbase.util.Bytes;
+import org.apache.phoenix.end2end.NeedsOwnMiniClusterTest;
import org.apache.phoenix.hbase.index.IndexTestingUtils;
import org.apache.phoenix.hbase.index.Indexer;
import org.apache.phoenix.hbase.index.TableName;
@@ -46,14 +47,14 @@ import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Rule;
import org.junit.Test;
-
+import org.junit.experimental.categories.Category;
/**
* If {@link DoNotRetryIOException} is not subclassed correctly (with the {@link String}
* constructor), {@link MultiResponse#readFields(java.io.DataInput)} will not correctly deserialize
* the exception, and just return <tt>null</tt> to the client, which then just goes and retries.
*/
-
+@Category(NeedsOwnMiniClusterTest.class)
public class FailWithoutRetriesIT {
private static final Log LOG = LogFactory.getLog(FailWithoutRetriesIT.class);
@@ -120,7 +121,6 @@ public class FailWithoutRetriesIT {
// setup the primary table
String primaryTable = Bytes.toString(table.getTableName());
- @SuppressWarnings("deprecation")
HTableDescriptor pTable = new HTableDescriptor(primaryTable);
pTable.addFamily(new HColumnDescriptor(family));
// override the codec so we can use our test one
http://git-wip-us.apache.org/repos/asf/phoenix/blob/83b5bb4f/phoenix-core/src/it/java/org/apache/phoenix/mapreduce/CsvBulkLoadToolIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/mapreduce/CsvBulkLoadToolIT.java b/phoenix-core/src/it/java/org/apache/phoenix/mapreduce/CsvBulkLoadToolIT.java
index 5425e1c..4373f47 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/mapreduce/CsvBulkLoadToolIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/mapreduce/CsvBulkLoadToolIT.java
@@ -34,13 +34,15 @@ import org.apache.hadoop.fs.FSDataOutputStream;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.hbase.HBaseTestingUtility;
+import org.apache.phoenix.end2end.NeedsOwnMiniClusterTest;
import org.apache.phoenix.jdbc.PhoenixDriver;
import org.apache.phoenix.util.PhoenixRuntime;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
-
+@Category(NeedsOwnMiniClusterTest.class)
public class CsvBulkLoadToolIT {
// We use HBaseTestUtil because we need to start up a MapReduce cluster as well
http://git-wip-us.apache.org/repos/asf/phoenix/blob/83b5bb4f/phoenix-core/src/it/java/org/apache/phoenix/trace/BaseTracingTestIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/trace/BaseTracingTestIT.java b/phoenix-core/src/it/java/org/apache/phoenix/trace/BaseTracingTestIT.java
index 96e1646..99c8bc3 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/trace/BaseTracingTestIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/trace/BaseTracingTestIT.java
@@ -37,6 +37,7 @@ import org.apache.hadoop.metrics2.impl.ExposedMetricCounterLong;
import org.apache.hadoop.metrics2.impl.ExposedMetricsRecordImpl;
import org.apache.hadoop.metrics2.lib.ExposedMetricsInfoImpl;
import org.apache.phoenix.end2end.BaseHBaseManagedTimeIT;
+import org.apache.phoenix.end2end.HBaseManagedTimeTest;
import org.apache.phoenix.metrics.MetricInfo;
import org.apache.phoenix.query.QueryServicesOptions;
import org.apache.phoenix.schema.TableNotFoundException;
@@ -45,12 +46,13 @@ import org.apache.phoenix.trace.util.Tracing.Frequency;
import org.apache.phoenix.util.PhoenixRuntime;
import org.apache.phoenix.util.PropertiesUtil;
import org.junit.Before;
+import org.junit.experimental.categories.Category;
/**
* Base test for tracing tests - helps manage getting tracing/non-tracing
* connections, as well as any supporting utils.
*/
-
+@Category(HBaseManagedTimeTest.class)
public class BaseTracingTestIT extends BaseHBaseManagedTimeIT {
@Before
public void resetTracingTableIfExists() throws Exception {
http://git-wip-us.apache.org/repos/asf/phoenix/blob/83b5bb4f/phoenix-core/src/it/java/org/apache/phoenix/trace/PhoenixTraceReaderIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/trace/PhoenixTraceReaderIT.java b/phoenix-core/src/it/java/org/apache/phoenix/trace/PhoenixTraceReaderIT.java
index 1308c13..d75e281 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/trace/PhoenixTraceReaderIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/trace/PhoenixTraceReaderIT.java
@@ -17,35 +17,32 @@
*/
package org.apache.phoenix.trace;
-import static org.apache.phoenix.util.TestUtil.TEST_PROPERTIES;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-
-import java.sql.Connection;
-import java.sql.DriverManager;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Properties;
-
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.metrics2.AbstractMetric;
import org.apache.hadoop.metrics2.MetricsRecord;
import org.apache.hadoop.metrics2.MetricsTag;
+import org.apache.phoenix.end2end.HBaseManagedTimeTest;
import org.apache.phoenix.metrics.MetricInfo;
import org.apache.phoenix.trace.TraceReader.SpanInfo;
import org.apache.phoenix.trace.TraceReader.TraceHolder;
import org.cloudera.htrace.Span;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.util.*;
+
+import static org.apache.phoenix.util.TestUtil.TEST_PROPERTIES;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
/**
* Test that the {@link TraceReader} will correctly read traces written by the
* {@link org.apache.phoenix.trace.PhoenixMetricsSink}
*/
-
+@Category(HBaseManagedTimeTest.class)
public class PhoenixTraceReaderIT extends BaseTracingTestIT {
private static final Log LOG = LogFactory.getLog(PhoenixTraceReaderIT.class);
http://git-wip-us.apache.org/repos/asf/phoenix/blob/83b5bb4f/phoenix-core/src/it/java/org/apache/phoenix/trace/PhoenixTracingEndToEndIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/trace/PhoenixTracingEndToEndIT.java b/phoenix-core/src/it/java/org/apache/phoenix/trace/PhoenixTracingEndToEndIT.java
index 201de38..f4cf0d1 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/trace/PhoenixTracingEndToEndIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/trace/PhoenixTracingEndToEndIT.java
@@ -17,41 +17,38 @@
*/
package org.apache.phoenix.trace;
-import static org.apache.phoenix.util.PhoenixRuntime.TENANT_ID_ATTRIB;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.util.Collection;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.TimeUnit;
-
+import com.google.common.collect.ImmutableMap;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.metrics2.MetricsSource;
import org.apache.phoenix.coprocessor.BaseScannerRegionObserver;
+import org.apache.phoenix.end2end.HBaseManagedTimeTest;
import org.apache.phoenix.metrics.Metrics;
import org.apache.phoenix.query.QueryServicesOptions;
import org.apache.phoenix.trace.TraceReader.SpanInfo;
import org.apache.phoenix.trace.TraceReader.TraceHolder;
-import org.cloudera.htrace.Sampler;
-import org.cloudera.htrace.Span;
-import org.cloudera.htrace.SpanReceiver;
-import org.cloudera.htrace.Trace;
-import org.cloudera.htrace.TraceScope;
+import org.cloudera.htrace.*;
import org.junit.After;
import org.junit.BeforeClass;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
-import com.google.common.collect.ImmutableMap;
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.Collection;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
+import static org.apache.phoenix.util.PhoenixRuntime.TENANT_ID_ATTRIB;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
/**
* Test that the logging sink stores the expected metrics/stats
*/
-
+@Category(HBaseManagedTimeTest.class)
public class PhoenixTracingEndToEndIT extends BaseTracingTestIT {
private static final Log LOG = LogFactory.getLog(PhoenixTracingEndToEndIT.class);
http://git-wip-us.apache.org/repos/asf/phoenix/blob/83b5bb4f/phoenix-core/src/main/java/org/apache/phoenix/cache/aggcache/SpillFile.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/main/java/org/apache/phoenix/cache/aggcache/SpillFile.java b/phoenix-core/src/main/java/org/apache/phoenix/cache/aggcache/SpillFile.java
index 22174f8..51aef98 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/cache/aggcache/SpillFile.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/cache/aggcache/SpillFile.java
@@ -18,6 +18,12 @@
package org.apache.phoenix.cache.aggcache;
+import com.google.common.collect.Maps;
+import org.apache.hadoop.conf.Configuration;
+import org.apache.phoenix.util.Closeables;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import java.io.Closeable;
import java.io.File;
import java.io.IOException;
@@ -28,12 +34,6 @@ import java.nio.channels.FileChannel.MapMode;
import java.util.Map;
import java.util.UUID;
-import org.apache.phoenix.util.Closeables;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.google.common.collect.Maps;
-
/**
* This class abstracts a SpillFile It is a accessible on a per page basis
* For every SpillFile object a single spill file is always created.
http://git-wip-us.apache.org/repos/asf/phoenix/blob/83b5bb4f/phoenix-core/src/main/java/org/apache/phoenix/compile/CreateIndexCompiler.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/main/java/org/apache/phoenix/compile/CreateIndexCompiler.java b/phoenix-core/src/main/java/org/apache/phoenix/compile/CreateIndexCompiler.java
index d882515..07d9f56 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/compile/CreateIndexCompiler.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/compile/CreateIndexCompiler.java
@@ -33,6 +33,7 @@ import org.apache.phoenix.jdbc.PhoenixDatabaseMetaData;
import org.apache.phoenix.jdbc.PhoenixStatement;
import org.apache.phoenix.parse.CreateIndexStatement;
import org.apache.phoenix.parse.ParseNode;
+import org.apache.phoenix.parse.PropertyName;
import org.apache.phoenix.schema.MetaDataClient;
import org.apache.phoenix.schema.PTable.IndexType;
http://git-wip-us.apache.org/repos/asf/phoenix/blob/83b5bb4f/phoenix-core/src/main/java/org/apache/phoenix/compile/CreateSequenceCompiler.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/main/java/org/apache/phoenix/compile/CreateSequenceCompiler.java b/phoenix-core/src/main/java/org/apache/phoenix/compile/CreateSequenceCompiler.java
index 6a92ecd..d31a8f1 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/compile/CreateSequenceCompiler.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/compile/CreateSequenceCompiler.java
@@ -23,6 +23,7 @@ import java.util.Collections;
import org.apache.hadoop.hbase.io.ImmutableBytesWritable;
import org.apache.phoenix.exception.SQLExceptionCode;
+import org.apache.phoenix.exception.SQLExceptionInfo;
import org.apache.phoenix.execute.MutationState;
import org.apache.phoenix.expression.Expression;
import org.apache.phoenix.jdbc.PhoenixConnection;
@@ -30,13 +31,14 @@ import org.apache.phoenix.jdbc.PhoenixStatement;
import org.apache.phoenix.parse.BindParseNode;
import org.apache.phoenix.parse.CreateSequenceStatement;
import org.apache.phoenix.parse.ParseNode;
-import org.apache.phoenix.parse.TableName;
import org.apache.phoenix.query.QueryServices;
+import org.apache.phoenix.parse.TableName;
import org.apache.phoenix.query.QueryServicesOptions;
import org.apache.phoenix.schema.MetaDataClient;
import org.apache.phoenix.schema.PDataType;
import org.apache.phoenix.schema.PDatum;
import org.apache.phoenix.schema.SortOrder;
+
import org.apache.phoenix.util.SequenceUtil;
public class CreateSequenceCompiler {
http://git-wip-us.apache.org/repos/asf/phoenix/blob/83b5bb4f/phoenix-core/src/main/java/org/apache/phoenix/compile/UpsertCompiler.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/main/java/org/apache/phoenix/compile/UpsertCompiler.java b/phoenix-core/src/main/java/org/apache/phoenix/compile/UpsertCompiler.java
index ab5ab75..796f368 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/compile/UpsertCompiler.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/compile/UpsertCompiler.java
@@ -130,45 +130,44 @@ public class UpsertCompiler {
int rowCount = 0;
Map<ImmutableBytesPtr,Map<PColumn,byte[]>> mutation = Maps.newHashMapWithExpectedSize(batchSize);
PTable table = tableRef.getTable();
- try (ResultSet rs = new PhoenixResultSet(iterator, projector, statement)) {
- ImmutableBytesWritable ptr = new ImmutableBytesWritable();
- while (rs.next()) {
- for (int i = 0; i < values.length; i++) {
- PColumn column = table.getColumns().get(columnIndexes[i]);
- byte[] bytes = rs.getBytes(i+1);
- ptr.set(bytes == null ? ByteUtil.EMPTY_BYTE_ARRAY : bytes);
- Object value = rs.getObject(i+1);
- int rsPrecision = rs.getMetaData().getPrecision(i+1);
- Integer precision = rsPrecision == 0 ? null : rsPrecision;
- int rsScale = rs.getMetaData().getScale(i+1);
- Integer scale = rsScale == 0 ? null : rsScale;
- // We are guaranteed that the two column will have compatible types,
- // as we checked that before.
- if (!column.getDataType().isSizeCompatible(ptr, value, column.getDataType(),
- precision, scale,
- column.getMaxLength(),column.getScale())) {
- throw new SQLExceptionInfo.Builder(SQLExceptionCode.DATA_EXCEEDS_MAX_CAPACITY)
+ ResultSet rs = new PhoenixResultSet(iterator, projector, statement);
+ ImmutableBytesWritable ptr = new ImmutableBytesWritable();
+ while (rs.next()) {
+ for (int i = 0; i < values.length; i++) {
+ PColumn column = table.getColumns().get(columnIndexes[i]);
+ byte[] bytes = rs.getBytes(i+1);
+ ptr.set(bytes == null ? ByteUtil.EMPTY_BYTE_ARRAY : bytes);
+ Object value = rs.getObject(i+1);
+ int rsPrecision = rs.getMetaData().getPrecision(i+1);
+ Integer precision = rsPrecision == 0 ? null : rsPrecision;
+ int rsScale = rs.getMetaData().getScale(i+1);
+ Integer scale = rsScale == 0 ? null : rsScale;
+ // We are guaranteed that the two column will have compatible types,
+ // as we checked that before.
+ if (!column.getDataType().isSizeCompatible(ptr, value, column.getDataType(),
+ precision, scale,
+ column.getMaxLength(),column.getScale())) {
+ throw new SQLExceptionInfo.Builder(SQLExceptionCode.DATA_EXCEEDS_MAX_CAPACITY)
.setColumnName(column.getName().getString())
.setMessage("value=" + column.getDataType().toStringLiteral(ptr, null)).build().buildException();
- }
- column.getDataType().coerceBytes(ptr, value, column.getDataType(),
- precision, scale, SortOrder.getDefault(),
- column.getMaxLength(), column.getScale(), column.getSortOrder());
- values[i] = ByteUtil.copyKeyBytesIfNecessary(ptr);
- }
- setValues(values, pkSlotIndexes, columnIndexes, table, mutation);
- rowCount++;
- // Commit a batch if auto commit is true and we're at our batch size
- if (isAutoCommit && rowCount % batchSize == 0) {
- MutationState state = new MutationState(tableRef, mutation, 0, maxSize, connection);
- connection.getMutationState().join(state);
- connection.commit();
- mutation.clear();
}
+ column.getDataType().coerceBytes(ptr, value, column.getDataType(),
+ precision, scale, SortOrder.getDefault(),
+ column.getMaxLength(), column.getScale(), column.getSortOrder());
+ values[i] = ByteUtil.copyKeyBytesIfNecessary(ptr);
+ }
+ setValues(values, pkSlotIndexes, columnIndexes, table, mutation);
+ rowCount++;
+ // Commit a batch if auto commit is true and we're at our batch size
+ if (isAutoCommit && rowCount % batchSize == 0) {
+ MutationState state = new MutationState(tableRef, mutation, 0, maxSize, connection);
+ connection.getMutationState().join(state);
+ connection.commit();
+ mutation.clear();
}
- // If auto commit is true, this last batch will be committed upon return
- return new MutationState(tableRef, mutation, rowCount / batchSize * batchSize, maxSize, connection);
}
+ // If auto commit is true, this last batch will be committed upon return
+ return new MutationState(tableRef, mutation, rowCount / batchSize * batchSize, maxSize, connection);
} finally {
iterator.close();
}
http://git-wip-us.apache.org/repos/asf/phoenix/blob/83b5bb4f/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/BaseRegionScanner.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/BaseRegionScanner.java b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/BaseRegionScanner.java
index 981e8cb..ff9ac76 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/BaseRegionScanner.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/BaseRegionScanner.java
@@ -22,6 +22,7 @@ import java.util.List;
import org.apache.hadoop.hbase.Cell;
import org.apache.hadoop.hbase.DoNotRetryIOException;
+import org.apache.hadoop.hbase.KeyValue;
import org.apache.hadoop.hbase.regionserver.RegionScanner;
public abstract class BaseRegionScanner implements RegionScanner {
http://git-wip-us.apache.org/repos/asf/phoenix/blob/83b5bb4f/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/MetaDataRegionObserver.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/MetaDataRegionObserver.java b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/MetaDataRegionObserver.java
index e9b943c..822ced8 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/MetaDataRegionObserver.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/MetaDataRegionObserver.java
@@ -18,11 +18,17 @@
package org.apache.phoenix.coprocessor;
import java.io.IOException;
+
+import org.apache.log4j.Level;
+import org.apache.log4j.Logger;
+import org.apache.phoenix.jdbc.PhoenixDriver;
import java.sql.DriverManager;
import java.sql.SQLException;
import java.util.ArrayList;
import java.util.List;
+import java.util.Timer;
import java.util.TimerTask;
+import java.util.concurrent.ScheduledFuture;
import java.util.concurrent.ScheduledThreadPoolExecutor;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;
@@ -37,16 +43,13 @@ import org.apache.hadoop.hbase.client.Scan;
import org.apache.hadoop.hbase.coprocessor.BaseRegionObserver;
import org.apache.hadoop.hbase.coprocessor.ObserverContext;
import org.apache.hadoop.hbase.coprocessor.RegionCoprocessorEnvironment;
-import org.apache.hadoop.hbase.filter.CompareFilter;
import org.apache.hadoop.hbase.filter.SingleColumnValueFilter;
+import org.apache.hadoop.hbase.filter.CompareFilter;
import org.apache.hadoop.hbase.regionserver.RegionScanner;
import org.apache.hadoop.hbase.util.Bytes;
-import org.apache.log4j.Level;
-import org.apache.log4j.Logger;
import org.apache.phoenix.cache.GlobalCache;
import org.apache.phoenix.jdbc.PhoenixConnection;
import org.apache.phoenix.jdbc.PhoenixDatabaseMetaData;
-import org.apache.phoenix.jdbc.PhoenixDriver;
import org.apache.phoenix.query.QueryServices;
import org.apache.phoenix.query.QueryServicesOptions;
import org.apache.phoenix.schema.MetaDataClient;
http://git-wip-us.apache.org/repos/asf/phoenix/blob/83b5bb4f/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/SequenceRegionObserver.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/SequenceRegionObserver.java b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/SequenceRegionObserver.java
index dc0b951..9754d00 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/SequenceRegionObserver.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/SequenceRegionObserver.java
@@ -19,9 +19,12 @@
package org.apache.phoenix.coprocessor;
import java.io.IOException;
+import java.sql.SQLException;
import java.util.Collections;
import java.util.List;
import java.util.Map;
+import java.util.NavigableMap;
+import java.util.Set;
import org.apache.hadoop.hbase.Cell;
import org.apache.hadoop.hbase.CellUtil;
@@ -53,6 +56,8 @@ import org.apache.phoenix.util.KeyValueUtil;
import org.apache.phoenix.util.MetaDataUtil;
import org.apache.phoenix.util.SequenceUtil;
import org.apache.phoenix.util.ServerUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import com.google.common.collect.Lists;
http://git-wip-us.apache.org/repos/asf/phoenix/blob/83b5bb4f/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/UngroupedAggregateRegionObserver.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/UngroupedAggregateRegionObserver.java b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/UngroupedAggregateRegionObserver.java
index e3767cf..e0ff5b3 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/UngroupedAggregateRegionObserver.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/UngroupedAggregateRegionObserver.java
@@ -49,6 +49,7 @@ import org.apache.hadoop.hbase.coprocessor.RegionCoprocessorEnvironment;
import org.apache.hadoop.hbase.io.ImmutableBytesWritable;
import org.apache.hadoop.hbase.regionserver.HRegion;
import org.apache.hadoop.hbase.regionserver.InternalScanner;
+import org.apache.hadoop.hbase.regionserver.KeyValueScanner;
import org.apache.hadoop.hbase.regionserver.RegionScanner;
import org.apache.hadoop.hbase.regionserver.ScanType;
import org.apache.hadoop.hbase.regionserver.Store;
@@ -68,6 +69,7 @@ import org.apache.phoenix.hbase.index.util.GenericKeyValueBuilder;
import org.apache.phoenix.hbase.index.util.KeyValueBuilder;
import org.apache.phoenix.index.IndexMaintainer;
import org.apache.phoenix.index.PhoenixIndexCodec;
+import org.apache.phoenix.jdbc.PhoenixDatabaseMetaData;
import org.apache.phoenix.join.HashJoinInfo;
import org.apache.phoenix.query.QueryConstants;
import org.apache.phoenix.query.QueryServices;
http://git-wip-us.apache.org/repos/asf/phoenix/blob/83b5bb4f/phoenix-core/src/main/java/org/apache/phoenix/expression/ModulusExpression.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/main/java/org/apache/phoenix/expression/ModulusExpression.java b/phoenix-core/src/main/java/org/apache/phoenix/expression/ModulusExpression.java
index 5ca2140..c8dfe93 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/expression/ModulusExpression.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/expression/ModulusExpression.java
@@ -21,6 +21,10 @@ import java.sql.SQLException;
import java.util.List;
import org.apache.hadoop.hbase.io.ImmutableBytesWritable;
+import org.apache.phoenix.expression.Expression;
+import org.apache.phoenix.expression.function.ScalarFunction;
+import org.apache.phoenix.parse.FunctionParseNode.Argument;
+import org.apache.phoenix.parse.FunctionParseNode.BuiltInFunction;
import org.apache.phoenix.schema.PDataType;
import org.apache.phoenix.schema.tuple.Tuple;
http://git-wip-us.apache.org/repos/asf/phoenix/blob/83b5bb4f/phoenix-core/src/main/java/org/apache/phoenix/expression/function/SubstrFunction.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/main/java/org/apache/phoenix/expression/function/SubstrFunction.java b/phoenix-core/src/main/java/org/apache/phoenix/expression/function/SubstrFunction.java
index f2ad764..a7f15ac 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/expression/function/SubstrFunction.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/expression/function/SubstrFunction.java
@@ -19,6 +19,7 @@ package org.apache.phoenix.expression.function;
import java.io.DataInput;
import java.io.IOException;
+import java.io.UnsupportedEncodingException;
import java.util.List;
import org.apache.hadoop.hbase.io.ImmutableBytesWritable;
http://git-wip-us.apache.org/repos/asf/phoenix/blob/83b5bb4f/phoenix-core/src/main/java/org/apache/phoenix/filter/ColumnProjectionFilter.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/main/java/org/apache/phoenix/filter/ColumnProjectionFilter.java b/phoenix-core/src/main/java/org/apache/phoenix/filter/ColumnProjectionFilter.java
index 4e2561d..a238e8e 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/filter/ColumnProjectionFilter.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/filter/ColumnProjectionFilter.java
@@ -33,6 +33,7 @@ import org.apache.hadoop.hbase.Cell;
import org.apache.hadoop.hbase.HConstants;
import org.apache.hadoop.hbase.KeyValue;
import org.apache.hadoop.hbase.KeyValue.Type;
+import org.apache.hadoop.hbase.KeyValueUtil;
import org.apache.hadoop.hbase.exceptions.DeserializationException;
import org.apache.hadoop.hbase.filter.FilterBase;
import org.apache.hadoop.hbase.util.Bytes;
http://git-wip-us.apache.org/repos/asf/phoenix/blob/83b5bb4f/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/covered/data/LocalTable.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/covered/data/LocalTable.java b/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/covered/data/LocalTable.java
index d7db618..3469042 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/covered/data/LocalTable.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/covered/data/LocalTable.java
@@ -24,12 +24,14 @@ import java.util.Collections;
import java.util.List;
import org.apache.hadoop.hbase.Cell;
+import org.apache.hadoop.hbase.KeyValue;
import org.apache.hadoop.hbase.client.Mutation;
import org.apache.hadoop.hbase.client.Result;
import org.apache.hadoop.hbase.client.Scan;
import org.apache.hadoop.hbase.coprocessor.RegionCoprocessorEnvironment;
import org.apache.hadoop.hbase.regionserver.HRegion;
import org.apache.hadoop.hbase.regionserver.RegionScanner;
+
import org.apache.phoenix.hbase.index.covered.update.ColumnReference;
import org.apache.phoenix.hbase.index.util.IndexManagementUtil;
http://git-wip-us.apache.org/repos/asf/phoenix/blob/83b5bb4f/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/covered/example/CoveredColumnIndexer.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/covered/example/CoveredColumnIndexer.java b/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/covered/example/CoveredColumnIndexer.java
index af87752..f80cf41 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/covered/example/CoveredColumnIndexer.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/covered/example/CoveredColumnIndexer.java
@@ -98,8 +98,7 @@ public class CoveredColumnIndexer extends CoveredColumnsIndexBuilder {
* @param indexTable name of the index table.
* @throws IOException
*/
- @SuppressWarnings("deprecation")
-public static void createIndexTable(HBaseAdmin admin, String indexTable) throws IOException {
+ public static void createIndexTable(HBaseAdmin admin, String indexTable) throws IOException {
createIndexTable(admin, new HTableDescriptor(indexTable));
}
http://git-wip-us.apache.org/repos/asf/phoenix/blob/83b5bb4f/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/table/CoprocessorHTableFactory.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/table/CoprocessorHTableFactory.java b/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/table/CoprocessorHTableFactory.java
index 6c98507..72a28be 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/table/CoprocessorHTableFactory.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/table/CoprocessorHTableFactory.java
@@ -23,11 +23,13 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hbase.CoprocessorEnvironment;
+import org.apache.hadoop.hbase.HConstants;
import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.client.HTableInterface;
import org.apache.hadoop.hbase.util.Bytes;
import org.apache.phoenix.hbase.index.IndexQosCompat;
import org.apache.phoenix.hbase.index.util.ImmutableBytesPtr;
+import org.apache.phoenix.hbase.index.util.IndexManagementUtil;
public class CoprocessorHTableFactory implements HTableFactory {
http://git-wip-us.apache.org/repos/asf/phoenix/blob/83b5bb4f/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/wal/KeyValueCodec.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/wal/KeyValueCodec.java b/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/wal/KeyValueCodec.java
index 2ae89fb..682a504 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/wal/KeyValueCodec.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/wal/KeyValueCodec.java
@@ -25,6 +25,7 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
+import org.apache.hadoop.hbase.Cell;
import org.apache.hadoop.hbase.KeyValue;
import org.apache.hadoop.hbase.regionserver.wal.WALEdit;
http://git-wip-us.apache.org/repos/asf/phoenix/blob/83b5bb4f/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/write/KillServerOnFailurePolicy.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/write/KillServerOnFailurePolicy.java b/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/write/KillServerOnFailurePolicy.java
index 1ce09a3..2fb43b5 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/write/KillServerOnFailurePolicy.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/write/KillServerOnFailurePolicy.java
@@ -17,16 +17,19 @@
*/
package org.apache.phoenix.hbase.index.write;
+import java.io.IOException;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.hbase.Abortable;
import org.apache.hadoop.hbase.Stoppable;
import org.apache.hadoop.hbase.client.Mutation;
import org.apache.hadoop.hbase.coprocessor.RegionCoprocessorEnvironment;
-import org.apache.phoenix.hbase.index.table.HTableInterfaceReference;
import com.google.common.collect.Multimap;
+import org.apache.phoenix.hbase.index.table.HTableInterfaceReference;
+
/**
* Naive failure policy - kills the server on which it resides
*/
http://git-wip-us.apache.org/repos/asf/phoenix/blob/83b5bb4f/phoenix-core/src/main/java/org/apache/phoenix/index/PhoenixIndexCodec.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/main/java/org/apache/phoenix/index/PhoenixIndexCodec.java b/phoenix-core/src/main/java/org/apache/phoenix/index/PhoenixIndexCodec.java
index b3662bb..48a7868 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/index/PhoenixIndexCodec.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/index/PhoenixIndexCodec.java
@@ -24,7 +24,9 @@ import java.util.List;
import java.util.Map;
import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.hbase.client.Delete;
import org.apache.hadoop.hbase.client.Mutation;
+import org.apache.hadoop.hbase.client.Put;
import org.apache.hadoop.hbase.coprocessor.RegionCoprocessorEnvironment;
import org.apache.hadoop.hbase.io.ImmutableBytesWritable;
import org.apache.hadoop.hbase.util.Pair;
[3/5] phoenix git commit: Revert "Upgrade to 4.12 Junit and update
tests by removing @Category (Samarth Jain)"
Posted by ja...@apache.org.
Revert "Upgrade to 4.12 Junit and update tests by removing @Category (Samarth Jain)"
This reverts commit 0398178617cb2aeac3661510395635b9d00f814d.
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/83b5bb4f
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/83b5bb4f
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/83b5bb4f
Branch: refs/heads/master
Commit: 83b5bb4fa4b41510510e5be45142670ed01ec71b
Parents: 0398178
Author: James Taylor <jt...@salesforce.com>
Authored: Tue Nov 25 13:42:15 2014 -0800
Committer: James Taylor <jt...@salesforce.com>
Committed: Tue Nov 25 13:42:15 2014 -0800
----------------------------------------------------------------------
...ReplayWithIndexWritesAndCompressedWALIT.java | 3 -
.../apache/phoenix/end2end/AlterTableIT.java | 3 +-
.../phoenix/end2end/ArithmeticQueryIT.java | 3 +-
.../org/apache/phoenix/end2end/ArrayIT.java | 2 +
.../apache/phoenix/end2end/AutoCommitIT.java | 3 +-
.../BaseOwnClusterClientManagedTimeIT.java | 3 +-
.../BaseOwnClusterHBaseManagedTimeIT.java | 3 +-
.../org/apache/phoenix/end2end/BaseQueryIT.java | 2 +
.../end2end/BaseTenantSpecificTablesIT.java | 3 +-
.../end2end/BaseTenantSpecificViewIndexIT.java | 1 -
.../org/apache/phoenix/end2end/BaseViewIT.java | 3 +-
.../apache/phoenix/end2end/BinaryRowKeyIT.java | 3 +-
.../phoenix/end2end/CSVCommonsLoaderIT.java | 3 +-
.../apache/phoenix/end2end/CaseStatementIT.java | 2 +
.../apache/phoenix/end2end/CastAndCoerceIT.java | 2 +
.../end2end/ClientTimeArithmeticQueryIT.java | 3 +-
.../phoenix/end2end/CoalesceFunctionIT.java | 3 +-
.../end2end/ColumnProjectionOptimizationIT.java | 4 +-
.../phoenix/end2end/CompareDecimalToLongIT.java | 3 +-
.../end2end/ConvertTimezoneFunctionIT.java | 3 +-
.../end2end/CountDistinctCompressionIT.java | 3 +-
.../apache/phoenix/end2end/CreateTableIT.java | 3 +-
.../phoenix/end2end/CustomEntityDataIT.java | 3 +-
.../phoenix/end2end/DecodeFunctionIT.java | 3 +-
.../org/apache/phoenix/end2end/DeleteIT.java | 3 +-
.../apache/phoenix/end2end/DerivedTableIT.java | 3 +-
.../apache/phoenix/end2end/DistinctCountIT.java | 3 +-
.../apache/phoenix/end2end/DynamicColumnIT.java | 4 +-
.../apache/phoenix/end2end/DynamicFamilyIT.java | 4 +-
.../apache/phoenix/end2end/DynamicUpsertIT.java | 3 +-
.../phoenix/end2end/EvaluationOfORIT.java | 3 +-
.../phoenix/end2end/ExecuteStatementsIT.java | 3 +-
.../phoenix/end2end/ExtendedQueryExecIT.java | 3 +-
.../phoenix/end2end/FirstValueFunctionIT.java | 11 +-
.../apache/phoenix/end2end/FunkyNamesIT.java | 3 +-
.../apache/phoenix/end2end/GroupByCaseIT.java | 3 +-
.../org/apache/phoenix/end2end/GroupByIT.java | 3 +-
.../org/apache/phoenix/end2end/HashJoinIT.java | 3 +-
.../org/apache/phoenix/end2end/InListIT.java | 4 +-
.../phoenix/end2end/InMemoryOrderByIT.java | 3 +-
.../org/apache/phoenix/end2end/IsNullIT.java | 3 +-
.../org/apache/phoenix/end2end/KeyOnlyIT.java | 3 +-
.../phoenix/end2end/LastValueFunctionIT.java | 3 +-
.../apache/phoenix/end2end/LpadFunctionIT.java | 3 +-
.../apache/phoenix/end2end/MD5FunctionIT.java | 3 +-
.../phoenix/end2end/MappingTableDataTypeIT.java | 3 +-
.../phoenix/end2end/ModulusExpressionIT.java | 5 +-
.../phoenix/end2end/MultiCfQueryExecIT.java | 3 +-
.../phoenix/end2end/NativeHBaseTypesIT.java | 3 +-
.../org/apache/phoenix/end2end/NotQueryIT.java | 3 +-
.../phoenix/end2end/NthValueFunctionIT.java | 3 +-
.../org/apache/phoenix/end2end/OrderByIT.java | 3 +-
.../phoenix/end2end/ParallelIteratorsIT.java | 3 +-
.../apache/phoenix/end2end/PercentileIT.java | 3 +-
.../phoenix/end2end/ProductMetricsIT.java | 3 +-
.../end2end/QueryDatabaseMetaDataIT.java | 3 +-
.../phoenix/end2end/QueryExecWithoutSCNIT.java | 3 +-
.../org/apache/phoenix/end2end/QueryIT.java | 3 +-
.../org/apache/phoenix/end2end/QueryMoreIT.java | 3 +-
.../phoenix/end2end/QueryWithLimitIT.java | 3 +-
.../phoenix/end2end/ReadIsolationLevelIT.java | 3 +-
.../org/apache/phoenix/end2end/ReadOnlyIT.java | 3 +-
.../phoenix/end2end/RegexpSplitFunctionIT.java | 3 +-
.../phoenix/end2end/RegexpSubstrFunctionIT.java | 3 +-
.../phoenix/end2end/ReverseFunctionIT.java | 3 +-
.../apache/phoenix/end2end/ReverseScanIT.java | 3 +-
.../RoundFloorCeilFunctionsEnd2EndIT.java | 3 +-
.../phoenix/end2end/RowValueConstructorIT.java | 3 +-
.../apache/phoenix/end2end/SaltedViewIT.java | 3 +-
.../org/apache/phoenix/end2end/ScanQueryIT.java | 3 +-
.../org/apache/phoenix/end2end/SequenceIT.java | 3 +-
.../phoenix/end2end/ServerExceptionIT.java | 3 +-
.../end2end/SkipScanAfterManualSplitIT.java | 3 +-
.../apache/phoenix/end2end/SkipScanQueryIT.java | 3 +-
.../apache/phoenix/end2end/SortMergeJoinIT.java | 3 +-
.../apache/phoenix/end2end/SortOrderFIT.java | 3 +-
.../phoenix/end2end/SpillableGroupByIT.java | 3 +-
.../phoenix/end2end/SpooledOrderByIT.java | 3 +-
.../phoenix/end2end/SpooledSortMergeJoinIT.java | 3 +-
.../phoenix/end2end/SpooledTmpFileDeleteIT.java | 124 ------------------
.../phoenix/end2end/StatementHintsIT.java | 3 +-
.../phoenix/end2end/StatsCollectorIT.java | 3 +-
.../org/apache/phoenix/end2end/StddevIT.java | 3 +-
.../org/apache/phoenix/end2end/SubqueryIT.java | 3 +-
.../end2end/TenantSpecificTablesDDLIT.java | 3 +-
.../end2end/TenantSpecificTablesDMLIT.java | 3 +-
.../end2end/TenantSpecificViewIndexIT.java | 3 +-
.../TenantSpecificViewIndexSaltedIT.java | 3 +-
.../end2end/TimezoneOffsetFunctionIT.java | 11 +-
.../phoenix/end2end/ToCharFunctionIT.java | 3 +-
.../phoenix/end2end/ToNumberFunctionIT.java | 3 +-
.../java/org/apache/phoenix/end2end/TopNIT.java | 3 +-
.../phoenix/end2end/TruncateFunctionIT.java | 3 +-
.../phoenix/end2end/UpsertBigValuesIT.java | 3 +-
.../end2end/UpsertSelectAutoCommitIT.java | 3 +-
.../apache/phoenix/end2end/UpsertSelectIT.java | 3 +-
.../apache/phoenix/end2end/UpsertValuesIT.java | 3 +-
.../phoenix/end2end/VariableLengthPKIT.java | 3 +-
.../java/org/apache/phoenix/end2end/ViewIT.java | 3 +-
.../phoenix/end2end/index/BaseIndexIT.java | 4 +-
.../end2end/index/BaseMutableIndexIT.java | 4 +-
.../phoenix/end2end/index/DropViewIT.java | 5 +-
.../phoenix/end2end/index/ImmutableIndexIT.java | 4 +-
.../phoenix/end2end/index/IndexMetadataIT.java | 4 +-
.../phoenix/end2end/index/IndexTestUtil.java | 1 -
.../phoenix/end2end/index/LocalIndexIT.java | 10 +-
.../end2end/index/MutableIndexFailureIT.java | 1 -
.../phoenix/end2end/index/MutableIndexIT.java | 4 +-
.../index/MutableIndexReplicationIT.java | 1 -
.../phoenix/end2end/index/SaltedIndexIT.java | 4 +-
.../phoenix/end2end/index/ViewIndexIT.java | 4 +-
.../phoenix/end2end/salted/SaltedTableIT.java | 4 +-
.../salted/SaltedTableUpsertSelectIT.java | 4 +-
.../salted/SaltedTableVarLengthRowKeyIT.java | 4 +-
.../FailForUnsupportedHBaseVersionsIT.java | 5 +-
.../index/balancer/IndexLoadBalancerIT.java | 4 +-
.../EndToEndCoveredColumnsIndexBuilderIT.java | 5 +-
.../example/EndToEndCoveredIndexingIT.java | 5 +-
.../EndtoEndIndexingWithCompressionIT.java | 4 +-
.../covered/example/FailWithoutRetriesIT.java | 6 +-
.../phoenix/mapreduce/CsvBulkLoadToolIT.java | 4 +-
.../apache/phoenix/trace/BaseTracingTestIT.java | 4 +-
.../phoenix/trace/PhoenixTraceReaderIT.java | 25 ++--
.../phoenix/trace/PhoenixTracingEndToEndIT.java | 35 +++--
.../phoenix/cache/aggcache/SpillFile.java | 12 +-
.../phoenix/compile/CreateIndexCompiler.java | 1 +
.../phoenix/compile/CreateSequenceCompiler.java | 4 +-
.../apache/phoenix/compile/UpsertCompiler.java | 67 +++++-----
.../phoenix/coprocessor/BaseRegionScanner.java | 1 +
.../coprocessor/MetaDataRegionObserver.java | 11 +-
.../coprocessor/SequenceRegionObserver.java | 5 +
.../UngroupedAggregateRegionObserver.java | 2 +
.../phoenix/expression/ModulusExpression.java | 4 +
.../expression/function/SubstrFunction.java | 1 +
.../phoenix/filter/ColumnProjectionFilter.java | 1 +
.../hbase/index/covered/data/LocalTable.java | 2 +
.../covered/example/CoveredColumnIndexer.java | 3 +-
.../index/table/CoprocessorHTableFactory.java | 2 +
.../phoenix/hbase/index/wal/KeyValueCodec.java | 1 +
.../index/write/KillServerOnFailurePolicy.java | 5 +-
.../apache/phoenix/index/PhoenixIndexCodec.java | 2 +
.../apache/phoenix/schema/DelegateColumn.java | 4 +
.../phoenix/trace/PhoenixMetricsSink.java | 36 +++---
.../index/write/TestWALRecoveryCaching.java | 4 +-
.../iterate/AggregateResultScannerTest.java | 3 +
.../iterate/SpooledTmpFileDeleteTest.java | 127 +++++++++++++++++++
.../phoenix/trace/TraceMetricsSourceTest.java | 5 +-
.../org/apache/phoenix/util/QueryUtilTest.java | 3 +
.../org/apache/phoenix/flume/PhoenixSinkIT.java | 4 +-
.../phoenix/flume/RegexEventSerializerIT.java | 4 +-
.../phoenix/pig/PhoenixHBaseLoaderIT.java | 4 +-
.../phoenix/pig/PhoenixHBaseStorerIT.java | 6 +-
.../phoenix/pig/PhoenixPigConfigurationIT.java | 4 +-
pom.xml | 12 +-
154 files changed, 542 insertions(+), 387 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/phoenix/blob/83b5bb4f/phoenix-core/src/it/java/org/apache/hadoop/hbase/regionserver/wal/WALReplayWithIndexWritesAndCompressedWALIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/hadoop/hbase/regionserver/wal/WALReplayWithIndexWritesAndCompressedWALIT.java b/phoenix-core/src/it/java/org/apache/hadoop/hbase/regionserver/wal/WALReplayWithIndexWritesAndCompressedWALIT.java
index b3a980e..5fd780a 100644
--- a/phoenix-core/src/it/java/org/apache/hadoop/hbase/regionserver/wal/WALReplayWithIndexWritesAndCompressedWALIT.java
+++ b/phoenix-core/src/it/java/org/apache/hadoop/hbase/regionserver/wal/WALReplayWithIndexWritesAndCompressedWALIT.java
@@ -48,7 +48,6 @@ import org.apache.hadoop.hbase.regionserver.RegionServerAccounting;
import org.apache.hadoop.hbase.regionserver.RegionServerServices;
import org.apache.hadoop.hbase.util.Bytes;
import org.apache.hadoop.hbase.util.FSUtils;
-import org.apache.phoenix.end2end.NeedsOwnMiniClusterTest;
import org.apache.phoenix.hbase.index.IndexTestingUtils;
import org.apache.phoenix.hbase.index.TableName;
import org.apache.phoenix.hbase.index.covered.example.ColumnGroup;
@@ -60,7 +59,6 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.mockito.Mockito;
/**
@@ -75,7 +73,6 @@ import org.mockito.Mockito;
* This test should only have a single test - otherwise we will start/stop the minicluster multiple
* times, which is probably not what you want to do (mostly because its so much effort).
*/
-@Category(NeedsOwnMiniClusterTest.class)
public class WALReplayWithIndexWritesAndCompressedWALIT {
public static final Log LOG = LogFactory.getLog(TestWALReplay.class);
http://git-wip-us.apache.org/repos/asf/phoenix/blob/83b5bb4f/phoenix-core/src/it/java/org/apache/phoenix/end2end/AlterTableIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/AlterTableIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/AlterTableIT.java
index f711bd4..5745bf0 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/AlterTableIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/AlterTableIT.java
@@ -51,8 +51,9 @@ import org.apache.phoenix.util.PhoenixRuntime;
import org.apache.phoenix.util.PropertiesUtil;
import org.apache.phoenix.util.SchemaUtil;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
-
+@Category(HBaseManagedTimeTest.class)
public class AlterTableIT extends BaseHBaseManagedTimeIT {
public static final String SCHEMA_NAME = "";
public static final String DATA_TABLE_NAME = "T";
http://git-wip-us.apache.org/repos/asf/phoenix/blob/83b5bb4f/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 21af737..52c76a9 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
@@ -35,11 +35,12 @@ import java.util.Properties;
import org.apache.phoenix.exception.SQLExceptionCode;
import org.apache.phoenix.util.PropertiesUtil;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import com.google.common.primitives.Doubles;
import com.google.common.primitives.Floats;
-
+@Category(HBaseManagedTimeTest.class)
public class ArithmeticQueryIT extends BaseHBaseManagedTimeIT {
@Test
http://git-wip-us.apache.org/repos/asf/phoenix/blob/83b5bb4f/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 e7221e9..803f150 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
@@ -45,9 +45,11 @@ import org.apache.phoenix.util.PropertiesUtil;
import org.apache.phoenix.util.SchemaUtil;
import org.apache.phoenix.util.StringUtil;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import com.google.common.primitives.Floats;
+@Category(ClientManagedTimeTest.class)
public class ArrayIT extends BaseClientManagedTimeIT {
private static final String SIMPLE_TABLE_WITH_ARRAY = "SIMPLE_TABLE_WITH_ARRAY";
http://git-wip-us.apache.org/repos/asf/phoenix/blob/83b5bb4f/phoenix-core/src/it/java/org/apache/phoenix/end2end/AutoCommitIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/AutoCommitIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/AutoCommitIT.java
index aa92c5e..b6aa056 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/AutoCommitIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/AutoCommitIT.java
@@ -30,8 +30,9 @@ import java.util.Properties;
import org.apache.phoenix.util.PropertiesUtil;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
-
+@Category(HBaseManagedTimeTest.class)
public class AutoCommitIT extends BaseHBaseManagedTimeIT {
@Test
http://git-wip-us.apache.org/repos/asf/phoenix/blob/83b5bb4f/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseOwnClusterClientManagedTimeIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseOwnClusterClientManagedTimeIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseOwnClusterClientManagedTimeIT.java
index 01d8538..3920c7d 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseOwnClusterClientManagedTimeIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseOwnClusterClientManagedTimeIT.java
@@ -20,8 +20,9 @@
package org.apache.phoenix.end2end;
import org.junit.After;
+import org.junit.experimental.categories.Category;
-
+@Category(NeedsOwnMiniClusterTest.class)
public class BaseOwnClusterClientManagedTimeIT extends BaseOwnClusterIT {
@After
public void cleanUpAfterTest() throws Exception {
http://git-wip-us.apache.org/repos/asf/phoenix/blob/83b5bb4f/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseOwnClusterHBaseManagedTimeIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseOwnClusterHBaseManagedTimeIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseOwnClusterHBaseManagedTimeIT.java
index d4096f9..c420473 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseOwnClusterHBaseManagedTimeIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseOwnClusterHBaseManagedTimeIT.java
@@ -21,8 +21,9 @@ package org.apache.phoenix.end2end;
import org.apache.hadoop.hbase.HConstants;
import org.junit.After;
+import org.junit.experimental.categories.Category;
-
+@Category(NeedsOwnMiniClusterTest.class)
public class BaseOwnClusterHBaseManagedTimeIT extends BaseOwnClusterIT {
@After
public void cleanUpAfterTest() throws Exception {
http://git-wip-us.apache.org/repos/asf/phoenix/blob/83b5bb4f/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseQueryIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseQueryIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseQueryIT.java
index e404c17..f3031f4 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseQueryIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseQueryIT.java
@@ -42,6 +42,7 @@ import org.apache.phoenix.util.PropertiesUtil;
import org.apache.phoenix.util.ReadOnlyProps;
import org.junit.Before;
import org.junit.BeforeClass;
+import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameters;
@@ -58,6 +59,7 @@ import com.google.common.collect.Lists;
* @since 0.1
*/
+@Category(ClientManagedTimeTest.class)
@RunWith(Parameterized.class)
public abstract class BaseQueryIT extends BaseClientManagedTimeIT {
protected static final String tenantId = getOrganizationId();
http://git-wip-us.apache.org/repos/asf/phoenix/blob/83b5bb4f/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseTenantSpecificTablesIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseTenantSpecificTablesIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseTenantSpecificTablesIT.java
index 1e87b8f..6d6bffc 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseTenantSpecificTablesIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseTenantSpecificTablesIT.java
@@ -26,10 +26,11 @@ import org.apache.phoenix.query.QueryServices;
import org.apache.phoenix.util.ReadOnlyProps;
import org.junit.Before;
import org.junit.BeforeClass;
+import org.junit.experimental.categories.Category;
import com.google.common.collect.Maps;
-
+@Category(NeedsOwnMiniClusterTest.class)
public abstract class BaseTenantSpecificTablesIT extends BaseOwnClusterClientManagedTimeIT {
protected static final String TENANT_ID = "ZZTop";
protected static final String TENANT_TYPE_ID = "abc";
http://git-wip-us.apache.org/repos/asf/phoenix/blob/83b5bb4f/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseTenantSpecificViewIndexIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseTenantSpecificViewIndexIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseTenantSpecificViewIndexIT.java
index e89a04f..be05b4c 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseTenantSpecificViewIndexIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseTenantSpecificViewIndexIT.java
@@ -136,7 +136,6 @@ public class BaseTenantSpecificViewIndexIT extends BaseHBaseManagedTimeIT {
return DriverManager.getConnection(getUrl(), props);
}
- @SuppressWarnings("unchecked")
private void verifyViewData(Connection conn, String valuePrefix) throws SQLException {
String query = "SELECT k1, k2, v2 FROM v WHERE v2='" + valuePrefix + "v2-1'";
ResultSet rs = conn.createStatement().executeQuery(query);
http://git-wip-us.apache.org/repos/asf/phoenix/blob/83b5bb4f/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseViewIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseViewIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseViewIT.java
index d07687a..c5a3b26 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseViewIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseViewIT.java
@@ -35,10 +35,11 @@ import org.apache.phoenix.query.QueryServices;
import org.apache.phoenix.util.QueryUtil;
import org.apache.phoenix.util.ReadOnlyProps;
import org.junit.BeforeClass;
+import org.junit.experimental.categories.Category;
import com.google.common.collect.Maps;
-
+@Category(NeedsOwnMiniClusterTest.class)
public abstract class BaseViewIT extends BaseOwnClusterHBaseManagedTimeIT {
@BeforeClass
http://git-wip-us.apache.org/repos/asf/phoenix/blob/83b5bb4f/phoenix-core/src/it/java/org/apache/phoenix/end2end/BinaryRowKeyIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/BinaryRowKeyIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/BinaryRowKeyIT.java
index 544284d..e4aa070 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/BinaryRowKeyIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/BinaryRowKeyIT.java
@@ -32,8 +32,9 @@ import java.util.Properties;
import org.apache.phoenix.util.PropertiesUtil;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
-
+@Category(HBaseManagedTimeTest.class)
public class BinaryRowKeyIT extends BaseHBaseManagedTimeIT {
private static void initTableValues() throws SQLException {
http://git-wip-us.apache.org/repos/asf/phoenix/blob/83b5bb4f/phoenix-core/src/it/java/org/apache/phoenix/end2end/CSVCommonsLoaderIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/CSVCommonsLoaderIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/CSVCommonsLoaderIT.java
index 71616d2..7e83f5f 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/CSVCommonsLoaderIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/CSVCommonsLoaderIT.java
@@ -42,7 +42,8 @@ import org.apache.phoenix.util.CSVCommonsLoader;
import org.apache.phoenix.util.DateUtil;
import org.apache.phoenix.util.PhoenixRuntime;
import org.junit.Test;
-
+import org.junit.experimental.categories.Category;
+@Category(HBaseManagedTimeTest.class)
public class CSVCommonsLoaderIT extends BaseHBaseManagedTimeIT {
private static final String DATATYPE_TABLE = "DATATYPE";
http://git-wip-us.apache.org/repos/asf/phoenix/blob/83b5bb4f/phoenix-core/src/it/java/org/apache/phoenix/end2end/CaseStatementIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/CaseStatementIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/CaseStatementIT.java
index 079ca50..6354de3 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/CaseStatementIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/CaseStatementIT.java
@@ -47,12 +47,14 @@ import java.util.Properties;
import org.apache.phoenix.util.PhoenixRuntime;
import org.apache.phoenix.util.PropertiesUtil;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameters;
import com.google.common.collect.Lists;
+@Category(ClientManagedTimeTest.class)
@RunWith(Parameterized.class)
public class CaseStatementIT extends BaseQueryIT {
http://git-wip-us.apache.org/repos/asf/phoenix/blob/83b5bb4f/phoenix-core/src/it/java/org/apache/phoenix/end2end/CastAndCoerceIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/CastAndCoerceIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/CastAndCoerceIT.java
index ce040b9..7a0c3e3 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/CastAndCoerceIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/CastAndCoerceIT.java
@@ -38,10 +38,12 @@ import java.util.Properties;
import org.apache.phoenix.util.PhoenixRuntime;
import org.apache.phoenix.util.PropertiesUtil;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameters;
+@Category(ClientManagedTimeTest.class)
@RunWith(Parameterized.class)
public class CastAndCoerceIT extends BaseQueryIT {
http://git-wip-us.apache.org/repos/asf/phoenix/blob/83b5bb4f/phoenix-core/src/it/java/org/apache/phoenix/end2end/ClientTimeArithmeticQueryIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ClientTimeArithmeticQueryIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ClientTimeArithmeticQueryIT.java
index 17ed19d..d709b9c 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ClientTimeArithmeticQueryIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ClientTimeArithmeticQueryIT.java
@@ -51,13 +51,14 @@ import org.apache.phoenix.util.PhoenixRuntime;
import org.apache.phoenix.util.PropertiesUtil;
import org.apache.phoenix.util.TestUtil;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameters;
import com.google.common.collect.Lists;
-
+@Category(ClientManagedTimeTest.class)
@RunWith(Parameterized.class)
public class ClientTimeArithmeticQueryIT extends BaseQueryIT {
http://git-wip-us.apache.org/repos/asf/phoenix/blob/83b5bb4f/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 1ad647b..2a037fa 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,8 +36,9 @@ import org.apache.phoenix.exception.SQLExceptionCode;
import org.apache.phoenix.util.PropertiesUtil;
import org.junit.Assert;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
-
+@Category(HBaseManagedTimeTest.class)
public class CoalesceFunctionIT extends BaseHBaseManagedTimeIT {
@Test
http://git-wip-us.apache.org/repos/asf/phoenix/blob/83b5bb4f/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 775bb46..fee2420 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ColumnProjectionOptimizationIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ColumnProjectionOptimizationIT.java
@@ -57,8 +57,9 @@ import org.apache.phoenix.util.PhoenixRuntime;
import org.apache.phoenix.util.PropertiesUtil;
import org.apache.phoenix.util.SchemaUtil;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
-
+@Category(ClientManagedTimeTest.class)
public class ColumnProjectionOptimizationIT extends BaseClientManagedTimeIT {
@Test
@@ -221,7 +222,6 @@ public class ColumnProjectionOptimizationIT extends BaseClientManagedTimeIT {
byte[] htableName = SchemaUtil.getTableNameAsBytes(MDTEST_SCHEMA_NAME, MDTEST_NAME);
HBaseAdmin admin = pconn.getQueryServices().getAdmin();
- @SuppressWarnings("deprecation")
HTableDescriptor descriptor = new HTableDescriptor(htableName);
for (byte[] familyName : familyNames) {
HColumnDescriptor columnDescriptor = new HColumnDescriptor(familyName);
http://git-wip-us.apache.org/repos/asf/phoenix/blob/83b5bb4f/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 3a358c4..d67dbb9 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
@@ -29,8 +29,9 @@ import java.util.Properties;
import org.apache.phoenix.util.PhoenixRuntime;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
-
+@Category(ClientManagedTimeTest.class)
public class CompareDecimalToLongIT extends BaseClientManagedTimeIT {
protected static void initTableValues(byte[][] splits, long ts) throws Exception {
ensureTableCreated(getUrl(),"LongInKeyTest",splits, ts-2);
http://git-wip-us.apache.org/repos/asf/phoenix/blob/83b5bb4f/phoenix-core/src/it/java/org/apache/phoenix/end2end/ConvertTimezoneFunctionIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ConvertTimezoneFunctionIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ConvertTimezoneFunctionIT.java
index e390548..d39e37a 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ConvertTimezoneFunctionIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ConvertTimezoneFunctionIT.java
@@ -24,12 +24,13 @@ import java.sql.ResultSet;
import org.apache.phoenix.schema.IllegalDataException;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
/**
* CONVERT_TZ(date, 'from_timezone', 'to_timezone') tests
*
*/
-
+@Category(HBaseManagedTimeTest.class)
public class ConvertTimezoneFunctionIT extends BaseHBaseManagedTimeIT {
@Test
http://git-wip-us.apache.org/repos/asf/phoenix/blob/83b5bb4f/phoenix-core/src/it/java/org/apache/phoenix/end2end/CountDistinctCompressionIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/CountDistinctCompressionIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/CountDistinctCompressionIT.java
index b4c84b0..97703f5 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/CountDistinctCompressionIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/CountDistinctCompressionIT.java
@@ -35,10 +35,11 @@ import org.apache.phoenix.util.PropertiesUtil;
import org.apache.phoenix.util.ReadOnlyProps;
import org.junit.BeforeClass;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import com.google.common.collect.Maps;
-
+@Category(NeedsOwnMiniClusterTest.class)
public class CountDistinctCompressionIT extends BaseOwnClusterHBaseManagedTimeIT {
@BeforeClass
public static void doSetup() throws Exception {
http://git-wip-us.apache.org/repos/asf/phoenix/blob/83b5bb4f/phoenix-core/src/it/java/org/apache/phoenix/end2end/CreateTableIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/CreateTableIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/CreateTableIT.java
index e3bec28..0b5c105 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/CreateTableIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/CreateTableIT.java
@@ -38,8 +38,9 @@ import org.apache.phoenix.query.KeyRange;
import org.apache.phoenix.schema.TableAlreadyExistsException;
import org.apache.phoenix.util.PhoenixRuntime;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
-
+@Category(ClientManagedTimeTest.class)
public class CreateTableIT extends BaseClientManagedTimeIT {
@Test
http://git-wip-us.apache.org/repos/asf/phoenix/blob/83b5bb4f/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 3717396..8209e5c 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/CustomEntityDataIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/CustomEntityDataIT.java
@@ -37,9 +37,10 @@ import java.util.Properties;
import org.apache.phoenix.util.PhoenixRuntime;
import org.apache.phoenix.util.PropertiesUtil;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
-
+@Category(ClientManagedTimeTest.class)
public class CustomEntityDataIT extends BaseClientManagedTimeIT {
protected static void initTableValues(String tenantId, byte[][] splits, long ts) throws Exception {
http://git-wip-us.apache.org/repos/asf/phoenix/blob/83b5bb4f/phoenix-core/src/it/java/org/apache/phoenix/end2end/DecodeFunctionIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/DecodeFunctionIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/DecodeFunctionIT.java
index ae259bc..6852f74 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/DecodeFunctionIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/DecodeFunctionIT.java
@@ -31,8 +31,9 @@ import org.apache.hadoop.hbase.util.Bytes;
import org.apache.phoenix.exception.SQLExceptionCode;
import org.apache.phoenix.schema.PDataType;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
-
+@Category(HBaseManagedTimeTest.class)
public class DecodeFunctionIT extends BaseHBaseManagedTimeIT {
@Test
http://git-wip-us.apache.org/repos/asf/phoenix/blob/83b5bb4f/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 36dff6f..677fb53 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
@@ -35,8 +35,9 @@ import java.util.List;
import org.apache.phoenix.util.MetaDataUtil;
import org.apache.phoenix.util.QueryUtil;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
-
+@Category(HBaseManagedTimeTest.class)
public class DeleteIT extends BaseHBaseManagedTimeIT {
private static final int NUMBER_OF_ROWS = 20;
private static final int NTH_ROW_NULL = 5;
http://git-wip-us.apache.org/repos/asf/phoenix/blob/83b5bb4f/phoenix-core/src/it/java/org/apache/phoenix/end2end/DerivedTableIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/DerivedTableIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/DerivedTableIT.java
index 727293f..8ef542a 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/DerivedTableIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/DerivedTableIT.java
@@ -50,13 +50,14 @@ import org.apache.phoenix.util.PropertiesUtil;
import org.apache.phoenix.util.QueryUtil;
import org.junit.Before;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameters;
import com.google.common.collect.Lists;
-
+@Category(ClientManagedTimeTest.class)
@RunWith(Parameterized.class)
public class DerivedTableIT extends BaseClientManagedTimeIT {
private static final String tenantId = getOrganizationId();
http://git-wip-us.apache.org/repos/asf/phoenix/blob/83b5bb4f/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 b1daacc..4b76d29 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
@@ -49,8 +49,9 @@ import org.apache.phoenix.schema.TableAlreadyExistsException;
import org.apache.phoenix.util.PhoenixRuntime;
import org.apache.phoenix.util.PropertiesUtil;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
-
+@Category(ClientManagedTimeTest.class)
public class DistinctCountIT extends BaseClientManagedTimeIT {
@Test
http://git-wip-us.apache.org/repos/asf/phoenix/blob/83b5bb4f/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 263a6ea..35b8509 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
@@ -46,6 +46,7 @@ import org.apache.phoenix.util.PropertiesUtil;
import org.apache.phoenix.util.SchemaUtil;
import org.junit.BeforeClass;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
/**
* Basic tests for Phoenix dynamic upserting
@@ -54,7 +55,7 @@ import org.junit.Test;
* @since 1.3
*/
-
+@Category(ClientManagedTimeTest.class)
public class DynamicColumnIT extends BaseClientManagedTimeIT {
private static final byte[] HBASE_DYNAMIC_COLUMNS_BYTES = SchemaUtil.getTableNameAsBytes(null, HBASE_DYNAMIC_COLUMNS);
private static final byte[] FAMILY_NAME = Bytes.toBytes(SchemaUtil.normalizeIdentifier("A"));
@@ -75,7 +76,6 @@ public class DynamicColumnIT extends BaseClientManagedTimeIT {
}
}
- @SuppressWarnings("deprecation")
private static void initTableValues() throws Exception {
ConnectionQueryServices services = driver.getConnectionQueryServices(getUrl(), PropertiesUtil.deepCopy(TEST_PROPERTIES));
HTableInterface hTable = services.getTable(SchemaUtil.getTableNameAsBytes(HBASE_DYNAMIC_COLUMNS_SCHEMA_NAME,HBASE_DYNAMIC_COLUMNS));
http://git-wip-us.apache.org/repos/asf/phoenix/blob/83b5bb4f/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 cb795c9..88ef0b3 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
@@ -49,6 +49,7 @@ import org.apache.phoenix.util.PropertiesUtil;
import org.apache.phoenix.util.SchemaUtil;
import org.junit.Before;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
/**
* Basic tests for Phoenix dynamic family querying "cf.*"
@@ -60,7 +61,7 @@ import org.junit.Test;
@edu.umd.cs.findbugs.annotations.SuppressWarnings(
value="RV_RETURN_VALUE_IGNORED",
justification="Designed to ignore.")
-
+@Category(HBaseManagedTimeTest.class)
public class DynamicFamilyIT extends BaseHBaseManagedTimeIT {
private static final String WEB_STATS = "WEB_STATS";
private static final String WEB_STATS_SCHEMA_NAME = "";
@@ -105,7 +106,6 @@ public class DynamicFamilyIT extends BaseHBaseManagedTimeIT {
initTableValues();
}
- @SuppressWarnings("deprecation")
private static void initTableValues() throws Exception {
ConnectionQueryServices services = driver.getConnectionQueryServices(getUrl(), PropertiesUtil.deepCopy(TEST_PROPERTIES));
HTableInterface hTable = services.getTable(SchemaUtil.getTableNameAsBytes(WEB_STATS_SCHEMA_NAME,WEB_STATS));
http://git-wip-us.apache.org/repos/asf/phoenix/blob/83b5bb4f/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 fe0d8b1..b236f10 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
@@ -36,6 +36,7 @@ import org.apache.phoenix.schema.ColumnFamilyNotFoundException;
import org.apache.phoenix.util.PropertiesUtil;
import org.junit.BeforeClass;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
/**
* Basic tests for Phoenix dynamic upserting
@@ -44,7 +45,7 @@ import org.junit.Test;
* @since 1.3
*/
-
+@Category(ClientManagedTimeTest.class)
public class DynamicUpsertIT extends BaseClientManagedTimeIT {
private static final String TABLE = "DynamicUpserts";
http://git-wip-us.apache.org/repos/asf/phoenix/blob/83b5bb4f/phoenix-core/src/it/java/org/apache/phoenix/end2end/EvaluationOfORIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/EvaluationOfORIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/EvaluationOfORIT.java
index c9cc1e2..0e59542 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/EvaluationOfORIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/EvaluationOfORIT.java
@@ -30,8 +30,9 @@ import java.util.Properties;
import org.apache.phoenix.util.PropertiesUtil;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
-
+@Category(HBaseManagedTimeTest.class)
public class EvaluationOfORIT extends BaseHBaseManagedTimeIT{
@Test
http://git-wip-us.apache.org/repos/asf/phoenix/blob/83b5bb4f/phoenix-core/src/it/java/org/apache/phoenix/end2end/ExecuteStatementsIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ExecuteStatementsIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ExecuteStatementsIT.java
index 1b41bdd..0d64f2e 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ExecuteStatementsIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ExecuteStatementsIT.java
@@ -46,8 +46,9 @@ import org.apache.phoenix.exception.SQLExceptionCode;
import org.apache.phoenix.query.QueryConstants;
import org.apache.phoenix.util.PhoenixRuntime;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
-
+@Category(HBaseManagedTimeTest.class)
public class ExecuteStatementsIT extends BaseHBaseManagedTimeIT {
@Test
http://git-wip-us.apache.org/repos/asf/phoenix/blob/83b5bb4f/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 377f6d6..9d15e32 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
@@ -34,6 +34,7 @@ import java.util.Properties;
import org.apache.phoenix.util.PhoenixRuntime;
import org.apache.phoenix.util.PropertiesUtil;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
@@ -42,7 +43,7 @@ import org.junit.Test;
* Extended tests for Phoenix JDBC implementation
*
*/
-
+@Category(ClientManagedTimeTest.class)
public class ExtendedQueryExecIT extends BaseClientManagedTimeIT {
@Test
http://git-wip-us.apache.org/repos/asf/phoenix/blob/83b5bb4f/phoenix-core/src/it/java/org/apache/phoenix/end2end/FirstValueFunctionIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/FirstValueFunctionIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/FirstValueFunctionIT.java
index 6c080d3..de19cec 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/FirstValueFunctionIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/FirstValueFunctionIT.java
@@ -17,14 +17,9 @@
*/
package org.apache.phoenix.end2end;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
-import java.sql.Connection;
-import java.sql.DriverManager;
-import java.sql.ResultSet;
-
+import static org.junit.Assert.*;
+import java.sql.*;
+import static org.apache.hadoop.hbase.util.VersionInfo.getUrl;
import org.junit.Test;
public class FirstValueFunctionIT extends BaseHBaseManagedTimeIT {
http://git-wip-us.apache.org/repos/asf/phoenix/blob/83b5bb4f/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 11f91cd..b66f221 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,8 +34,9 @@ import org.apache.phoenix.schema.ColumnNotFoundException;
import org.apache.phoenix.util.PhoenixRuntime;
import org.apache.phoenix.util.PropertiesUtil;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
-
+@Category(ClientManagedTimeTest.class)
public class FunkyNamesIT extends BaseClientManagedTimeIT {
protected static void initTableValues(byte[][] splits, long ts) throws Exception {
http://git-wip-us.apache.org/repos/asf/phoenix/blob/83b5bb4f/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 2b43337..b811865 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
@@ -35,8 +35,9 @@ import java.util.Properties;
import org.apache.phoenix.util.PhoenixRuntime;
import org.apache.phoenix.util.PropertiesUtil;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
-
+@Category(ClientManagedTimeTest.class)
public class GroupByCaseIT extends BaseClientManagedTimeIT {
private static String GROUPBY1 = "select " +
http://git-wip-us.apache.org/repos/asf/phoenix/blob/83b5bb4f/phoenix-core/src/it/java/org/apache/phoenix/end2end/GroupByIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/GroupByIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/GroupByIT.java
index 55bce01..6002d58 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/GroupByIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/GroupByIT.java
@@ -45,13 +45,14 @@ import java.util.Properties;
import org.apache.phoenix.util.PhoenixRuntime;
import org.apache.phoenix.util.PropertiesUtil;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameters;
import com.google.common.collect.Lists;
-
+@Category(ClientManagedTimeTest.class)
@RunWith(Parameterized.class)
public class GroupByIT extends BaseQueryIT {
http://git-wip-us.apache.org/repos/asf/phoenix/blob/83b5bb4f/phoenix-core/src/it/java/org/apache/phoenix/end2end/HashJoinIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/HashJoinIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/HashJoinIT.java
index 910ea88..ec22360 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/HashJoinIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/HashJoinIT.java
@@ -58,13 +58,14 @@ import org.apache.phoenix.util.ReadOnlyProps;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameters;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
-
+@Category(HBaseManagedTimeTest.class)
@RunWith(Parameterized.class)
public class HashJoinIT extends BaseHBaseManagedTimeIT {
http://git-wip-us.apache.org/repos/asf/phoenix/blob/83b5bb4f/phoenix-core/src/it/java/org/apache/phoenix/end2end/InListIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/InListIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/InListIT.java
index 315a18f..b248fb3 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/InListIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/InListIT.java
@@ -19,12 +19,13 @@ import org.apache.phoenix.schema.PDataType;
import org.apache.phoenix.util.PhoenixRuntime;
import org.apache.phoenix.util.PropertiesUtil;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import com.google.common.base.Function;
import com.google.common.base.Joiner;
import com.google.common.collect.Lists;
-
+@Category(HBaseManagedTimeTest.class)
public class InListIT extends BaseHBaseManagedTimeIT {
@Test
@@ -203,6 +204,7 @@ public class InListIT extends BaseHBaseManagedTimeIT {
}
}
+ @SuppressWarnings("unchecked")
List<List<Object>> DEFAULT_UPSERTS = Arrays.asList(Arrays.<Object>asList(1, 2, 4, 5, 6, "row1"),
Arrays.<Object>asList(2, 3, 4, 5, 6, "row2"),
Arrays.<Object>asList(2, 3, 6, 4, 5, "row3"),
http://git-wip-us.apache.org/repos/asf/phoenix/blob/83b5bb4f/phoenix-core/src/it/java/org/apache/phoenix/end2end/InMemoryOrderByIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/InMemoryOrderByIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/InMemoryOrderByIT.java
index cc3b45f..533143c 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/InMemoryOrderByIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/InMemoryOrderByIT.java
@@ -22,8 +22,9 @@ import java.util.Map;
import org.apache.phoenix.query.QueryServices;
import org.apache.phoenix.util.ReadOnlyProps;
import org.junit.BeforeClass;
+import org.junit.experimental.categories.Category;
-
+@Category(ClientManagedTimeTest.class)
public class InMemoryOrderByIT extends OrderByIT {
public InMemoryOrderByIT() {
http://git-wip-us.apache.org/repos/asf/phoenix/blob/83b5bb4f/phoenix-core/src/it/java/org/apache/phoenix/end2end/IsNullIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/IsNullIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/IsNullIT.java
index 9c60914..cb9516c 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/IsNullIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/IsNullIT.java
@@ -29,8 +29,9 @@ import java.util.Properties;
import org.apache.phoenix.util.PhoenixRuntime;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
-
+@Category(ClientManagedTimeTest.class)
public class IsNullIT extends BaseClientManagedTimeIT {
@Test
public void testIsNullInPk() throws Exception {
http://git-wip-us.apache.org/repos/asf/phoenix/blob/83b5bb4f/phoenix-core/src/it/java/org/apache/phoenix/end2end/KeyOnlyIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/KeyOnlyIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/KeyOnlyIT.java
index 55d88cc..42ee5ad 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/KeyOnlyIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/KeyOnlyIT.java
@@ -42,10 +42,11 @@ import org.apache.phoenix.util.ReadOnlyProps;
import org.apache.phoenix.util.TestUtil;
import org.junit.BeforeClass;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import com.google.common.collect.Maps;
-
+@Category(NeedsOwnMiniClusterTest.class)
public class KeyOnlyIT extends BaseOwnClusterClientManagedTimeIT {
@BeforeClass
http://git-wip-us.apache.org/repos/asf/phoenix/blob/83b5bb4f/phoenix-core/src/it/java/org/apache/phoenix/end2end/LastValueFunctionIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/LastValueFunctionIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/LastValueFunctionIT.java
index cbadc35..ff1751a 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/LastValueFunctionIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/LastValueFunctionIT.java
@@ -26,8 +26,9 @@ import java.sql.DriverManager;
import java.sql.ResultSet;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
-
+@Category(HBaseManagedTimeTest.class)
public class LastValueFunctionIT extends BaseHBaseManagedTimeIT {
@Test
http://git-wip-us.apache.org/repos/asf/phoenix/blob/83b5bb4f/phoenix-core/src/it/java/org/apache/phoenix/end2end/LpadFunctionIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/LpadFunctionIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/LpadFunctionIT.java
index 0a9bedf..2716f5e 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/LpadFunctionIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/LpadFunctionIT.java
@@ -29,13 +29,14 @@ import java.util.List;
import org.apache.phoenix.util.TestUtil;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import com.google.common.collect.Lists;
/**
* Tests for the LPAD built-in function.
*/
-
+@Category(HBaseManagedTimeTest.class)
public class LpadFunctionIT extends BaseHBaseManagedTimeIT {
/**
http://git-wip-us.apache.org/repos/asf/phoenix/blob/83b5bb4f/phoenix-core/src/it/java/org/apache/phoenix/end2end/MD5FunctionIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/MD5FunctionIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/MD5FunctionIT.java
index ff7ebdb..bec5b65 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/MD5FunctionIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/MD5FunctionIT.java
@@ -28,8 +28,9 @@ import java.sql.PreparedStatement;
import java.sql.ResultSet;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
-
+@Category(HBaseManagedTimeTest.class)
public class MD5FunctionIT extends BaseHBaseManagedTimeIT {
@Test
http://git-wip-us.apache.org/repos/asf/phoenix/blob/83b5bb4f/phoenix-core/src/it/java/org/apache/phoenix/end2end/MappingTableDataTypeIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/MappingTableDataTypeIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/MappingTableDataTypeIT.java
index 98e536e..3c789e3 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/MappingTableDataTypeIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/MappingTableDataTypeIT.java
@@ -39,8 +39,9 @@ import org.apache.phoenix.exception.SQLExceptionCode;
import org.apache.phoenix.jdbc.PhoenixConnection;
import org.apache.phoenix.util.PropertiesUtil;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
-
+@Category(HBaseManagedTimeTest.class)
public class MappingTableDataTypeIT extends BaseHBaseManagedTimeIT {
@Test
public void testMappingHbaseTableToPhoenixTable() throws Exception {
http://git-wip-us.apache.org/repos/asf/phoenix/blob/83b5bb4f/phoenix-core/src/it/java/org/apache/phoenix/end2end/ModulusExpressionIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ModulusExpressionIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ModulusExpressionIT.java
index 7de85ea..5055793 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ModulusExpressionIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ModulusExpressionIT.java
@@ -21,17 +21,18 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
import java.sql.Connection;
import java.sql.DriverManager;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
+import static org.junit.Assert.fail;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
-
+@Category(HBaseManagedTimeTest.class)
public class ModulusExpressionIT extends BaseHBaseManagedTimeIT {
private static final long SMALL_VALUE = 31L;
http://git-wip-us.apache.org/repos/asf/phoenix/blob/83b5bb4f/phoenix-core/src/it/java/org/apache/phoenix/end2end/MultiCfQueryExecIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/MultiCfQueryExecIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/MultiCfQueryExecIT.java
index 2edf189..a28d346 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/MultiCfQueryExecIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/MultiCfQueryExecIT.java
@@ -40,10 +40,11 @@ import org.apache.phoenix.util.PropertiesUtil;
import org.apache.phoenix.util.ReadOnlyProps;
import org.junit.BeforeClass;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import com.google.common.collect.Maps;
-
+@Category(NeedsOwnMiniClusterTest.class)
public class MultiCfQueryExecIT extends BaseOwnClusterClientManagedTimeIT {
private static final String MULTI_CF = "MULTI_CF";
http://git-wip-us.apache.org/repos/asf/phoenix/blob/83b5bb4f/phoenix-core/src/it/java/org/apache/phoenix/end2end/NativeHBaseTypesIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/NativeHBaseTypesIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/NativeHBaseTypesIT.java
index 2c5de02..ec0ccbe 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/NativeHBaseTypesIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/NativeHBaseTypesIT.java
@@ -53,6 +53,7 @@ import org.apache.phoenix.util.PropertiesUtil;
import org.apache.phoenix.util.SchemaUtil;
import org.junit.BeforeClass;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
/**
@@ -64,7 +65,7 @@ import org.junit.Test;
*
* @since 0.1
*/
-
+@Category(ClientManagedTimeTest.class)
public class NativeHBaseTypesIT extends BaseClientManagedTimeIT {
private static final byte[] HBASE_NATIVE_BYTES = SchemaUtil.getTableNameAsBytes(HBASE_NATIVE_SCHEMA_NAME, HBASE_NATIVE);
private static final byte[] FAMILY_NAME = Bytes.toBytes(SchemaUtil.normalizeIdentifier("1"));
http://git-wip-us.apache.org/repos/asf/phoenix/blob/83b5bb4f/phoenix-core/src/it/java/org/apache/phoenix/end2end/NotQueryIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/NotQueryIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/NotQueryIT.java
index 21074fc..d6f0c13 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/NotQueryIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/NotQueryIT.java
@@ -43,6 +43,7 @@ import java.util.Properties;
import org.apache.phoenix.util.PhoenixRuntime;
import org.apache.phoenix.util.PropertiesUtil;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameters;
@@ -50,7 +51,7 @@ import org.junit.runners.Parameterized.Parameters;
import com.google.common.primitives.Doubles;
import com.google.common.primitives.Floats;
-
+@Category(ClientManagedTimeTest.class)
@RunWith(Parameterized.class)
public class NotQueryIT extends BaseQueryIT {
http://git-wip-us.apache.org/repos/asf/phoenix/blob/83b5bb4f/phoenix-core/src/it/java/org/apache/phoenix/end2end/NthValueFunctionIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/NthValueFunctionIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/NthValueFunctionIT.java
index 11ecc0d..ec5bf96 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/NthValueFunctionIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/NthValueFunctionIT.java
@@ -27,8 +27,9 @@ import java.sql.ResultSet;
import java.util.ArrayList;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
-
+@Category(HBaseManagedTimeTest.class)
public class NthValueFunctionIT extends BaseHBaseManagedTimeIT {
@Test
http://git-wip-us.apache.org/repos/asf/phoenix/blob/83b5bb4f/phoenix-core/src/it/java/org/apache/phoenix/end2end/OrderByIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/OrderByIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/OrderByIT.java
index a8beb1e..1c1a949 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/OrderByIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/OrderByIT.java
@@ -40,8 +40,9 @@ import java.util.Properties;
import org.apache.phoenix.util.PhoenixRuntime;
import org.apache.phoenix.util.PropertiesUtil;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
-
+@Category(ClientManagedTimeTest.class)
public class OrderByIT extends BaseClientManagedTimeIT {
@Test
http://git-wip-us.apache.org/repos/asf/phoenix/blob/83b5bb4f/phoenix-core/src/it/java/org/apache/phoenix/end2end/ParallelIteratorsIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ParallelIteratorsIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ParallelIteratorsIT.java
index 509ca90..a1c6217 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ParallelIteratorsIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ParallelIteratorsIT.java
@@ -38,10 +38,11 @@ import org.apache.phoenix.schema.PDataType;
import org.apache.phoenix.util.ReadOnlyProps;
import org.junit.BeforeClass;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import com.google.common.collect.Maps;
-
+@Category(NeedsOwnMiniClusterTest.class)
public class ParallelIteratorsIT extends BaseOwnClusterHBaseManagedTimeIT {
private static final String STABLE_INDEX = "STABLE_INDEX";
http://git-wip-us.apache.org/repos/asf/phoenix/blob/83b5bb4f/phoenix-core/src/it/java/org/apache/phoenix/end2end/PercentileIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/PercentileIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/PercentileIT.java
index 685daeb..b15a3e5 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/PercentileIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/PercentileIT.java
@@ -53,8 +53,9 @@ import org.apache.phoenix.query.QueryConstants;
import org.apache.phoenix.util.PhoenixRuntime;
import org.apache.phoenix.util.PropertiesUtil;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
-
+@Category(ClientManagedTimeTest.class)
public class PercentileIT extends BaseClientManagedTimeIT {
@Test
http://git-wip-us.apache.org/repos/asf/phoenix/blob/83b5bb4f/phoenix-core/src/it/java/org/apache/phoenix/end2end/ProductMetricsIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ProductMetricsIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ProductMetricsIT.java
index 3d8c470..1daabb0 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ProductMetricsIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ProductMetricsIT.java
@@ -51,11 +51,12 @@ import org.apache.phoenix.util.PropertiesUtil;
import org.apache.phoenix.util.SchemaUtil;
import org.apache.phoenix.util.TestUtil;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import com.google.common.collect.Lists;
import com.google.common.collect.Ordering;
-
+@Category(ClientManagedTimeTest.class)
public class ProductMetricsIT extends BaseClientManagedTimeIT {
private static Format format = DateUtil.getDateParser(DateUtil.DEFAULT_DATE_FORMAT);
private static final String PRODUCT_METRICS_NAME = "PRODUCT_METRICS";
http://git-wip-us.apache.org/repos/asf/phoenix/blob/83b5bb4f/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryDatabaseMetaDataIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryDatabaseMetaDataIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryDatabaseMetaDataIT.java
index e78b812..ed6300e 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryDatabaseMetaDataIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryDatabaseMetaDataIT.java
@@ -77,8 +77,9 @@ import org.apache.phoenix.util.SchemaUtil;
import org.apache.phoenix.util.StringUtil;
import org.apache.phoenix.util.TestUtil;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
-
+@Category(ClientManagedTimeTest.class)
public class QueryDatabaseMetaDataIT extends BaseClientManagedTimeIT {
@Test
http://git-wip-us.apache.org/repos/asf/phoenix/blob/83b5bb4f/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryExecWithoutSCNIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryExecWithoutSCNIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryExecWithoutSCNIT.java
index 534f77d..99060dd 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryExecWithoutSCNIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryExecWithoutSCNIT.java
@@ -30,8 +30,9 @@ import java.sql.ResultSet;
import java.util.Properties;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
-
+@Category(HBaseManagedTimeTest.class)
public class QueryExecWithoutSCNIT extends BaseHBaseManagedTimeIT {
@Test
public void testScanNoSCN() throws Exception {
http://git-wip-us.apache.org/repos/asf/phoenix/blob/83b5bb4f/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryIT.java
index 4628b43..fe65e10 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryIT.java
@@ -65,6 +65,7 @@ import org.apache.phoenix.util.MetaDataUtil;
import org.apache.phoenix.util.PhoenixRuntime;
import org.apache.phoenix.util.PropertiesUtil;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
@@ -76,7 +77,7 @@ import org.junit.Test;
* @since 0.1
*/
-
+@Category(ClientManagedTimeTest.class)
public class QueryIT extends BaseQueryIT {
public QueryIT(String indexDDL) {
http://git-wip-us.apache.org/repos/asf/phoenix/blob/83b5bb4f/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryMoreIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryMoreIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryMoreIT.java
index af5e6fa..e82abbb 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryMoreIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryMoreIT.java
@@ -34,10 +34,11 @@ import org.apache.hadoop.hbase.util.Base64;
import org.apache.hadoop.hbase.util.Pair;
import org.apache.phoenix.util.PhoenixRuntime;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import com.google.common.collect.Lists;
-
+@Category(HBaseManagedTimeTest.class)
public class QueryMoreIT extends BaseHBaseManagedTimeIT {
private String dataTableName;
http://git-wip-us.apache.org/repos/asf/phoenix/blob/83b5bb4f/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryWithLimitIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryWithLimitIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryWithLimitIT.java
index 3198194..2df9514 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryWithLimitIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryWithLimitIT.java
@@ -41,10 +41,11 @@ import org.apache.phoenix.util.ReadOnlyProps;
import org.apache.phoenix.util.TestUtil;
import org.junit.BeforeClass;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import com.google.common.collect.Maps;
-
+@Category(NeedsOwnMiniClusterTest.class)
public class QueryWithLimitIT extends BaseOwnClusterHBaseManagedTimeIT {
@BeforeClass
http://git-wip-us.apache.org/repos/asf/phoenix/blob/83b5bb4f/phoenix-core/src/it/java/org/apache/phoenix/end2end/ReadIsolationLevelIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ReadIsolationLevelIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ReadIsolationLevelIT.java
index caebcb5..62a1e2b 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ReadIsolationLevelIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ReadIsolationLevelIT.java
@@ -32,8 +32,9 @@ import java.util.Properties;
import org.apache.phoenix.util.PhoenixRuntime;
import org.apache.phoenix.util.PropertiesUtil;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
-
+@Category(ClientManagedTimeTest.class)
public class ReadIsolationLevelIT extends BaseClientManagedTimeIT {
private static final String ENTITY_ID1= "000000000000001";
private static final String ENTITY_ID2= "000000000000002";
http://git-wip-us.apache.org/repos/asf/phoenix/blob/83b5bb4f/phoenix-core/src/it/java/org/apache/phoenix/end2end/ReadOnlyIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ReadOnlyIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ReadOnlyIT.java
index fbebe08..a425d3a 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ReadOnlyIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ReadOnlyIT.java
@@ -30,8 +30,9 @@ import java.util.Properties;
import org.apache.phoenix.util.PropertiesUtil;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
-
+@Category(HBaseManagedTimeTest.class)
public class ReadOnlyIT extends BaseHBaseManagedTimeIT {
@Test
http://git-wip-us.apache.org/repos/asf/phoenix/blob/83b5bb4f/phoenix-core/src/it/java/org/apache/phoenix/end2end/RegexpSplitFunctionIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/RegexpSplitFunctionIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/RegexpSplitFunctionIT.java
index 5170089..0bda438 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/RegexpSplitFunctionIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/RegexpSplitFunctionIT.java
@@ -32,8 +32,9 @@ import java.sql.SQLException;
import java.sql.Types;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
-
+@Category(HBaseManagedTimeTest.class)
public class RegexpSplitFunctionIT extends BaseHBaseManagedTimeIT {
private void initTable(Connection conn, String val) throws SQLException {
http://git-wip-us.apache.org/repos/asf/phoenix/blob/83b5bb4f/phoenix-core/src/it/java/org/apache/phoenix/end2end/RegexpSubstrFunctionIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/RegexpSubstrFunctionIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/RegexpSubstrFunctionIT.java
index ff4b95e..be4646b 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/RegexpSubstrFunctionIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/RegexpSubstrFunctionIT.java
@@ -31,8 +31,9 @@ import java.sql.Statement;
import org.junit.Before;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
-
+@Category(HBaseManagedTimeTest.class)
public class RegexpSubstrFunctionIT extends BaseHBaseManagedTimeIT {
private int id;
http://git-wip-us.apache.org/repos/asf/phoenix/blob/83b5bb4f/phoenix-core/src/it/java/org/apache/phoenix/end2end/ReverseFunctionIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ReverseFunctionIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ReverseFunctionIT.java
index f384d3a..7dc58ab 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ReverseFunctionIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ReverseFunctionIT.java
@@ -28,8 +28,9 @@ import java.sql.PreparedStatement;
import java.sql.ResultSet;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
-
+@Category(HBaseManagedTimeTest.class)
public class ReverseFunctionIT extends BaseHBaseManagedTimeIT {
private void initTable(Connection conn, String sortOrder, String s) throws Exception {
String ddl = "CREATE TABLE REVERSE_TEST (pk VARCHAR NOT NULL PRIMARY KEY " + sortOrder + ", kv VARCHAR)";
http://git-wip-us.apache.org/repos/asf/phoenix/blob/83b5bb4f/phoenix-core/src/it/java/org/apache/phoenix/end2end/ReverseScanIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ReverseScanIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ReverseScanIT.java
index 5481d80..e279710 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ReverseScanIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ReverseScanIT.java
@@ -43,10 +43,11 @@ import org.apache.phoenix.util.ReadOnlyProps;
import org.apache.phoenix.util.TestUtil;
import org.junit.BeforeClass;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import com.google.common.collect.Maps;
-
+@Category(HBaseManagedTimeTest.class)
public class ReverseScanIT extends BaseHBaseManagedTimeIT {
@BeforeClass
@Shadower(classBeingShadowed = BaseHBaseManagedTimeIT.class)
http://git-wip-us.apache.org/repos/asf/phoenix/blob/83b5bb4f/phoenix-core/src/it/java/org/apache/phoenix/end2end/RoundFloorCeilFunctionsEnd2EndIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/RoundFloorCeilFunctionsEnd2EndIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/RoundFloorCeilFunctionsEnd2EndIT.java
index 2cf08e9..c38f4d6 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/RoundFloorCeilFunctionsEnd2EndIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/RoundFloorCeilFunctionsEnd2EndIT.java
@@ -36,6 +36,7 @@ import org.apache.phoenix.expression.function.RoundFunction;
import org.apache.phoenix.util.DateUtil;
import org.junit.Before;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import com.google.common.primitives.Doubles;
import com.google.common.primitives.Floats;
@@ -48,7 +49,7 @@ import com.google.common.primitives.Floats;
* @since 3.0.0
*/
-
+@Category(HBaseManagedTimeTest.class)
public class RoundFloorCeilFunctionsEnd2EndIT extends BaseHBaseManagedTimeIT {
private static long millisPart = 660;
http://git-wip-us.apache.org/repos/asf/phoenix/blob/83b5bb4f/phoenix-core/src/it/java/org/apache/phoenix/end2end/RowValueConstructorIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/RowValueConstructorIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/RowValueConstructorIT.java
index be91eab..9e3a5b0 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/RowValueConstructorIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/RowValueConstructorIT.java
@@ -56,8 +56,9 @@ import org.apache.phoenix.util.PropertiesUtil;
import org.apache.phoenix.util.QueryUtil;
import org.apache.phoenix.util.TestUtil;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
-
+@Category(ClientManagedTimeTest.class)
public class RowValueConstructorIT extends BaseClientManagedTimeIT {
@Test
http://git-wip-us.apache.org/repos/asf/phoenix/blob/83b5bb4f/phoenix-core/src/it/java/org/apache/phoenix/end2end/SaltedViewIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SaltedViewIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SaltedViewIT.java
index 19f0a4a..a492d4f 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SaltedViewIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SaltedViewIT.java
@@ -18,8 +18,9 @@
package org.apache.phoenix.end2end;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
-
+@Category(NeedsOwnMiniClusterTest.class)
public class SaltedViewIT extends BaseViewIT {
/**
http://git-wip-us.apache.org/repos/asf/phoenix/blob/83b5bb4f/phoenix-core/src/it/java/org/apache/phoenix/end2end/ScanQueryIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ScanQueryIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ScanQueryIT.java
index c376f89..f817c2b 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ScanQueryIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ScanQueryIT.java
@@ -51,6 +51,7 @@ import java.util.Set;
import org.apache.phoenix.util.PhoenixRuntime;
import org.apache.phoenix.util.PropertiesUtil;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameters;
@@ -59,7 +60,7 @@ import com.google.common.collect.Lists;
import com.google.common.primitives.Doubles;
import com.google.common.primitives.Floats;
-
+@Category(ClientManagedTimeTest.class)
@RunWith(Parameterized.class)
public class ScanQueryIT extends BaseQueryIT {
http://git-wip-us.apache.org/repos/asf/phoenix/blob/83b5bb4f/phoenix-core/src/it/java/org/apache/phoenix/end2end/SequenceIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SequenceIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SequenceIT.java
index a08b511..b4b0b2e 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SequenceIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SequenceIT.java
@@ -48,10 +48,11 @@ import org.junit.After;
import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import com.google.common.collect.Lists;
-
+@Category(ClientManagedTimeTest.class)
public class SequenceIT extends BaseClientManagedTimeIT {
private static final String NEXT_VAL_SQL = "SELECT NEXT VALUE FOR foo.bar FROM SYSTEM.\"SEQUENCE\"";
private static final long BATCH_SIZE = 3;
http://git-wip-us.apache.org/repos/asf/phoenix/blob/83b5bb4f/phoenix-core/src/it/java/org/apache/phoenix/end2end/ServerExceptionIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ServerExceptionIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ServerExceptionIT.java
index 5c8679d..d101fe3 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ServerExceptionIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ServerExceptionIT.java
@@ -30,8 +30,9 @@ import java.util.Properties;
import org.apache.phoenix.util.PropertiesUtil;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
-
+@Category(HBaseManagedTimeTest.class)
public class ServerExceptionIT extends BaseHBaseManagedTimeIT {
@Test
http://git-wip-us.apache.org/repos/asf/phoenix/blob/83b5bb4f/phoenix-core/src/it/java/org/apache/phoenix/end2end/SkipScanAfterManualSplitIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SkipScanAfterManualSplitIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SkipScanAfterManualSplitIT.java
index 1c82274..3c0344c 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SkipScanAfterManualSplitIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SkipScanAfterManualSplitIT.java
@@ -39,10 +39,11 @@ import org.apache.phoenix.query.QueryServices;
import org.apache.phoenix.util.ReadOnlyProps;
import org.junit.BeforeClass;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import com.google.common.collect.Maps;
-
+@Category(HBaseManagedTimeTest.class)
public class SkipScanAfterManualSplitIT extends BaseHBaseManagedTimeIT {
private static final int BATCH_SIZE = 25;
http://git-wip-us.apache.org/repos/asf/phoenix/blob/83b5bb4f/phoenix-core/src/it/java/org/apache/phoenix/end2end/SkipScanQueryIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SkipScanQueryIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SkipScanQueryIT.java
index 7c509bb..db5d15b 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SkipScanQueryIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SkipScanQueryIT.java
@@ -33,8 +33,9 @@ import java.util.List;
import org.apache.phoenix.util.PhoenixRuntime;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
-
+@Category(HBaseManagedTimeTest.class)
public class SkipScanQueryIT extends BaseHBaseManagedTimeIT {
private void initIntInTable(Connection conn, List<Integer> data) throws SQLException {
http://git-wip-us.apache.org/repos/asf/phoenix/blob/83b5bb4f/phoenix-core/src/it/java/org/apache/phoenix/end2end/SortMergeJoinIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SortMergeJoinIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SortMergeJoinIT.java
index c75d49a..469388b 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SortMergeJoinIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SortMergeJoinIT.java
@@ -57,13 +57,14 @@ import org.apache.phoenix.util.ReadOnlyProps;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameters;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
-
+@Category(HBaseManagedTimeTest.class)
@RunWith(Parameterized.class)
public class SortMergeJoinIT extends BaseHBaseManagedTimeIT {
http://git-wip-us.apache.org/repos/asf/phoenix/blob/83b5bb4f/phoenix-core/src/it/java/org/apache/phoenix/end2end/SortOrderFIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SortOrderFIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SortOrderFIT.java
index 9fb7ea3..8c8bbcc 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SortOrderFIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SortOrderFIT.java
@@ -35,6 +35,7 @@ import org.apache.commons.lang.ArrayUtils;
import org.apache.phoenix.util.PropertiesUtil;
import org.junit.Assert;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import com.google.common.collect.Lists;
@@ -42,7 +43,7 @@ import com.google.common.collect.Lists;
* @since 1.2
*/
-
+@Category(HBaseManagedTimeTest.class)
public class SortOrderFIT extends BaseHBaseManagedTimeIT {
private static final String TABLE = "DescColumnSortOrderTest";
http://git-wip-us.apache.org/repos/asf/phoenix/blob/83b5bb4f/phoenix-core/src/it/java/org/apache/phoenix/end2end/SpillableGroupByIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SpillableGroupByIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SpillableGroupByIT.java
index 70d5f1d..36bbca8 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SpillableGroupByIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SpillableGroupByIT.java
@@ -38,6 +38,7 @@ import org.apache.phoenix.util.PropertiesUtil;
import org.apache.phoenix.util.ReadOnlyProps;
import org.junit.BeforeClass;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import com.google.common.collect.Maps;
@@ -46,7 +47,7 @@ import com.google.common.collect.Maps;
* and we wouldn't want that to be set for other tests sharing the same
* cluster.
*/
-
+@Category(NeedsOwnMiniClusterTest.class)
public class SpillableGroupByIT extends BaseOwnClusterHBaseManagedTimeIT {
private static final int NUM_ROWS_INSERTED = 1000;
[5/5] phoenix git commit: PHOENIX-1467 Upgrade to 4.12 Junit and
update tests by removing @Category annotation (Samarth Jain)
Posted by ja...@apache.org.
PHOENIX-1467 Upgrade to 4.12 Junit and update tests by removing @Category annotation (Samarth Jain)
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/e5033aec
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/e5033aec
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/e5033aec
Branch: refs/heads/master
Commit: e5033aec18849a305c06bdeb5dcf6eda9b369f49
Parents: 83b5bb4
Author: James Taylor <jt...@salesforce.com>
Authored: Tue Nov 25 13:43:55 2014 -0800
Committer: James Taylor <jt...@salesforce.com>
Committed: Tue Nov 25 13:43:55 2014 -0800
----------------------------------------------------------------------
...ReplayWithIndexWritesAndCompressedWALIT.java | 3 +
.../apache/phoenix/end2end/AlterTableIT.java | 3 +-
.../phoenix/end2end/ArithmeticQueryIT.java | 3 +-
.../org/apache/phoenix/end2end/ArrayIT.java | 2 -
.../apache/phoenix/end2end/AutoCommitIT.java | 3 +-
.../BaseOwnClusterClientManagedTimeIT.java | 3 +-
.../BaseOwnClusterHBaseManagedTimeIT.java | 3 +-
.../org/apache/phoenix/end2end/BaseQueryIT.java | 2 -
.../end2end/BaseTenantSpecificTablesIT.java | 3 +-
.../end2end/BaseTenantSpecificViewIndexIT.java | 1 +
.../org/apache/phoenix/end2end/BaseViewIT.java | 3 +-
.../apache/phoenix/end2end/BinaryRowKeyIT.java | 3 +-
.../phoenix/end2end/CSVCommonsLoaderIT.java | 3 +-
.../apache/phoenix/end2end/CaseStatementIT.java | 2 -
.../apache/phoenix/end2end/CastAndCoerceIT.java | 2 -
.../end2end/ClientTimeArithmeticQueryIT.java | 3 +-
.../phoenix/end2end/CoalesceFunctionIT.java | 3 +-
.../end2end/ColumnProjectionOptimizationIT.java | 4 +-
.../phoenix/end2end/CompareDecimalToLongIT.java | 3 +-
.../end2end/ConvertTimezoneFunctionIT.java | 3 +-
.../end2end/CountDistinctCompressionIT.java | 3 +-
.../apache/phoenix/end2end/CreateTableIT.java | 3 +-
.../phoenix/end2end/CustomEntityDataIT.java | 3 +-
.../phoenix/end2end/DecodeFunctionIT.java | 3 +-
.../org/apache/phoenix/end2end/DeleteIT.java | 3 +-
.../apache/phoenix/end2end/DerivedTableIT.java | 3 +-
.../apache/phoenix/end2end/DistinctCountIT.java | 3 +-
.../apache/phoenix/end2end/DynamicColumnIT.java | 4 +-
.../apache/phoenix/end2end/DynamicFamilyIT.java | 4 +-
.../apache/phoenix/end2end/DynamicUpsertIT.java | 3 +-
.../phoenix/end2end/EvaluationOfORIT.java | 3 +-
.../phoenix/end2end/ExecuteStatementsIT.java | 3 +-
.../phoenix/end2end/ExtendedQueryExecIT.java | 3 +-
.../phoenix/end2end/FirstValueFunctionIT.java | 11 +-
.../apache/phoenix/end2end/FunkyNamesIT.java | 3 +-
.../apache/phoenix/end2end/GroupByCaseIT.java | 3 +-
.../org/apache/phoenix/end2end/GroupByIT.java | 3 +-
.../org/apache/phoenix/end2end/HashJoinIT.java | 3 +-
.../org/apache/phoenix/end2end/InListIT.java | 4 +-
.../phoenix/end2end/InMemoryOrderByIT.java | 3 +-
.../org/apache/phoenix/end2end/IsNullIT.java | 3 +-
.../org/apache/phoenix/end2end/KeyOnlyIT.java | 3 +-
.../phoenix/end2end/LastValueFunctionIT.java | 3 +-
.../apache/phoenix/end2end/LpadFunctionIT.java | 3 +-
.../apache/phoenix/end2end/MD5FunctionIT.java | 3 +-
.../phoenix/end2end/MappingTableDataTypeIT.java | 3 +-
.../phoenix/end2end/ModulusExpressionIT.java | 5 +-
.../phoenix/end2end/MultiCfQueryExecIT.java | 3 +-
.../phoenix/end2end/NativeHBaseTypesIT.java | 3 +-
.../org/apache/phoenix/end2end/NotQueryIT.java | 3 +-
.../phoenix/end2end/NthValueFunctionIT.java | 3 +-
.../org/apache/phoenix/end2end/OrderByIT.java | 3 +-
.../phoenix/end2end/ParallelIteratorsIT.java | 3 +-
.../apache/phoenix/end2end/PercentileIT.java | 3 +-
.../phoenix/end2end/ProductMetricsIT.java | 3 +-
.../end2end/QueryDatabaseMetaDataIT.java | 3 +-
.../phoenix/end2end/QueryExecWithoutSCNIT.java | 3 +-
.../org/apache/phoenix/end2end/QueryIT.java | 3 +-
.../org/apache/phoenix/end2end/QueryMoreIT.java | 3 +-
.../phoenix/end2end/QueryWithLimitIT.java | 3 +-
.../phoenix/end2end/ReadIsolationLevelIT.java | 3 +-
.../org/apache/phoenix/end2end/ReadOnlyIT.java | 3 +-
.../phoenix/end2end/RegexpSplitFunctionIT.java | 3 +-
.../phoenix/end2end/RegexpSubstrFunctionIT.java | 3 +-
.../phoenix/end2end/ReverseFunctionIT.java | 3 +-
.../apache/phoenix/end2end/ReverseScanIT.java | 3 +-
.../RoundFloorCeilFunctionsEnd2EndIT.java | 3 +-
.../phoenix/end2end/RowValueConstructorIT.java | 3 +-
.../apache/phoenix/end2end/SaltedViewIT.java | 3 +-
.../org/apache/phoenix/end2end/ScanQueryIT.java | 3 +-
.../org/apache/phoenix/end2end/SequenceIT.java | 3 +-
.../phoenix/end2end/ServerExceptionIT.java | 3 +-
.../end2end/SkipScanAfterManualSplitIT.java | 3 +-
.../apache/phoenix/end2end/SkipScanQueryIT.java | 3 +-
.../apache/phoenix/end2end/SortMergeJoinIT.java | 3 +-
.../apache/phoenix/end2end/SortOrderFIT.java | 3 +-
.../phoenix/end2end/SpillableGroupByIT.java | 3 +-
.../phoenix/end2end/SpooledOrderByIT.java | 3 +-
.../phoenix/end2end/SpooledSortMergeJoinIT.java | 3 +-
.../phoenix/end2end/SpooledTmpFileDeleteIT.java | 124 ++++++++++++++++++
.../phoenix/end2end/StatementHintsIT.java | 3 +-
.../phoenix/end2end/StatsCollectorIT.java | 3 +-
.../org/apache/phoenix/end2end/StddevIT.java | 3 +-
.../org/apache/phoenix/end2end/SubqueryIT.java | 3 +-
.../end2end/TenantSpecificTablesDDLIT.java | 3 +-
.../end2end/TenantSpecificTablesDMLIT.java | 3 +-
.../end2end/TenantSpecificViewIndexIT.java | 3 +-
.../TenantSpecificViewIndexSaltedIT.java | 3 +-
.../end2end/TimezoneOffsetFunctionIT.java | 11 +-
.../phoenix/end2end/ToCharFunctionIT.java | 3 +-
.../phoenix/end2end/ToNumberFunctionIT.java | 3 +-
.../java/org/apache/phoenix/end2end/TopNIT.java | 3 +-
.../phoenix/end2end/TruncateFunctionIT.java | 3 +-
.../phoenix/end2end/UpsertBigValuesIT.java | 3 +-
.../end2end/UpsertSelectAutoCommitIT.java | 3 +-
.../apache/phoenix/end2end/UpsertSelectIT.java | 3 +-
.../apache/phoenix/end2end/UpsertValuesIT.java | 3 +-
.../phoenix/end2end/VariableLengthPKIT.java | 3 +-
.../java/org/apache/phoenix/end2end/ViewIT.java | 3 +-
.../phoenix/end2end/index/BaseIndexIT.java | 4 +-
.../end2end/index/BaseMutableIndexIT.java | 4 +-
.../phoenix/end2end/index/DropViewIT.java | 5 +-
.../phoenix/end2end/index/ImmutableIndexIT.java | 4 +-
.../phoenix/end2end/index/IndexMetadataIT.java | 4 +-
.../phoenix/end2end/index/IndexTestUtil.java | 1 +
.../phoenix/end2end/index/LocalIndexIT.java | 10 +-
.../end2end/index/MutableIndexFailureIT.java | 1 +
.../phoenix/end2end/index/MutableIndexIT.java | 4 +-
.../index/MutableIndexReplicationIT.java | 1 +
.../phoenix/end2end/index/SaltedIndexIT.java | 4 +-
.../phoenix/end2end/index/ViewIndexIT.java | 4 +-
.../phoenix/end2end/salted/SaltedTableIT.java | 4 +-
.../salted/SaltedTableUpsertSelectIT.java | 4 +-
.../salted/SaltedTableVarLengthRowKeyIT.java | 4 +-
.../FailForUnsupportedHBaseVersionsIT.java | 1 +
.../EndToEndCoveredColumnsIndexBuilderIT.java | 1 +
.../example/EndToEndCoveredIndexingIT.java | 1 +
.../EndtoEndIndexingWithCompressionIT.java | 4 +-
.../covered/example/FailWithoutRetriesIT.java | 2 +
.../apache/phoenix/trace/BaseTracingTestIT.java | 4 +-
.../phoenix/trace/PhoenixTraceReaderIT.java | 25 ++--
.../phoenix/trace/PhoenixTracingEndToEndIT.java | 35 ++---
.../index/write/TestWALRecoveryCaching.java | 4 +-
.../iterate/AggregateResultScannerTest.java | 3 -
.../iterate/SpooledTmpFileDeleteTest.java | 127 -------------------
.../phoenix/trace/TraceMetricsSourceTest.java | 5 +-
.../org/apache/phoenix/util/QueryUtilTest.java | 3 -
.../org/apache/phoenix/flume/PhoenixSinkIT.java | 4 +-
.../phoenix/flume/RegexEventSerializerIT.java | 4 +-
.../phoenix/pig/PhoenixHBaseStorerIT.java | 6 +-
.../phoenix/pig/PhoenixPigConfigurationIT.java | 4 +-
pom.xml | 12 +-
132 files changed, 311 insertions(+), 426 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/phoenix/blob/e5033aec/phoenix-core/src/it/java/org/apache/hadoop/hbase/regionserver/wal/WALReplayWithIndexWritesAndCompressedWALIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/hadoop/hbase/regionserver/wal/WALReplayWithIndexWritesAndCompressedWALIT.java b/phoenix-core/src/it/java/org/apache/hadoop/hbase/regionserver/wal/WALReplayWithIndexWritesAndCompressedWALIT.java
index 5fd780a..b3a980e 100644
--- a/phoenix-core/src/it/java/org/apache/hadoop/hbase/regionserver/wal/WALReplayWithIndexWritesAndCompressedWALIT.java
+++ b/phoenix-core/src/it/java/org/apache/hadoop/hbase/regionserver/wal/WALReplayWithIndexWritesAndCompressedWALIT.java
@@ -48,6 +48,7 @@ import org.apache.hadoop.hbase.regionserver.RegionServerAccounting;
import org.apache.hadoop.hbase.regionserver.RegionServerServices;
import org.apache.hadoop.hbase.util.Bytes;
import org.apache.hadoop.hbase.util.FSUtils;
+import org.apache.phoenix.end2end.NeedsOwnMiniClusterTest;
import org.apache.phoenix.hbase.index.IndexTestingUtils;
import org.apache.phoenix.hbase.index.TableName;
import org.apache.phoenix.hbase.index.covered.example.ColumnGroup;
@@ -59,6 +60,7 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import org.mockito.Mockito;
/**
@@ -73,6 +75,7 @@ import org.mockito.Mockito;
* This test should only have a single test - otherwise we will start/stop the minicluster multiple
* times, which is probably not what you want to do (mostly because its so much effort).
*/
+@Category(NeedsOwnMiniClusterTest.class)
public class WALReplayWithIndexWritesAndCompressedWALIT {
public static final Log LOG = LogFactory.getLog(TestWALReplay.class);
http://git-wip-us.apache.org/repos/asf/phoenix/blob/e5033aec/phoenix-core/src/it/java/org/apache/phoenix/end2end/AlterTableIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/AlterTableIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/AlterTableIT.java
index 5745bf0..f711bd4 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/AlterTableIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/AlterTableIT.java
@@ -51,9 +51,8 @@ import org.apache.phoenix.util.PhoenixRuntime;
import org.apache.phoenix.util.PropertiesUtil;
import org.apache.phoenix.util.SchemaUtil;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-@Category(HBaseManagedTimeTest.class)
+
public class AlterTableIT extends BaseHBaseManagedTimeIT {
public static final String SCHEMA_NAME = "";
public static final String DATA_TABLE_NAME = "T";
http://git-wip-us.apache.org/repos/asf/phoenix/blob/e5033aec/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 52c76a9..21af737 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
@@ -35,12 +35,11 @@ import java.util.Properties;
import org.apache.phoenix.exception.SQLExceptionCode;
import org.apache.phoenix.util.PropertiesUtil;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import com.google.common.primitives.Doubles;
import com.google.common.primitives.Floats;
-@Category(HBaseManagedTimeTest.class)
+
public class ArithmeticQueryIT extends BaseHBaseManagedTimeIT {
@Test
http://git-wip-us.apache.org/repos/asf/phoenix/blob/e5033aec/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 803f150..e7221e9 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
@@ -45,11 +45,9 @@ import org.apache.phoenix.util.PropertiesUtil;
import org.apache.phoenix.util.SchemaUtil;
import org.apache.phoenix.util.StringUtil;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import com.google.common.primitives.Floats;
-@Category(ClientManagedTimeTest.class)
public class ArrayIT extends BaseClientManagedTimeIT {
private static final String SIMPLE_TABLE_WITH_ARRAY = "SIMPLE_TABLE_WITH_ARRAY";
http://git-wip-us.apache.org/repos/asf/phoenix/blob/e5033aec/phoenix-core/src/it/java/org/apache/phoenix/end2end/AutoCommitIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/AutoCommitIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/AutoCommitIT.java
index b6aa056..aa92c5e 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/AutoCommitIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/AutoCommitIT.java
@@ -30,9 +30,8 @@ import java.util.Properties;
import org.apache.phoenix.util.PropertiesUtil;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-@Category(HBaseManagedTimeTest.class)
+
public class AutoCommitIT extends BaseHBaseManagedTimeIT {
@Test
http://git-wip-us.apache.org/repos/asf/phoenix/blob/e5033aec/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseOwnClusterClientManagedTimeIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseOwnClusterClientManagedTimeIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseOwnClusterClientManagedTimeIT.java
index 3920c7d..01d8538 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseOwnClusterClientManagedTimeIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseOwnClusterClientManagedTimeIT.java
@@ -20,9 +20,8 @@
package org.apache.phoenix.end2end;
import org.junit.After;
-import org.junit.experimental.categories.Category;
-@Category(NeedsOwnMiniClusterTest.class)
+
public class BaseOwnClusterClientManagedTimeIT extends BaseOwnClusterIT {
@After
public void cleanUpAfterTest() throws Exception {
http://git-wip-us.apache.org/repos/asf/phoenix/blob/e5033aec/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseOwnClusterHBaseManagedTimeIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseOwnClusterHBaseManagedTimeIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseOwnClusterHBaseManagedTimeIT.java
index c420473..d4096f9 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseOwnClusterHBaseManagedTimeIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseOwnClusterHBaseManagedTimeIT.java
@@ -21,9 +21,8 @@ package org.apache.phoenix.end2end;
import org.apache.hadoop.hbase.HConstants;
import org.junit.After;
-import org.junit.experimental.categories.Category;
-@Category(NeedsOwnMiniClusterTest.class)
+
public class BaseOwnClusterHBaseManagedTimeIT extends BaseOwnClusterIT {
@After
public void cleanUpAfterTest() throws Exception {
http://git-wip-us.apache.org/repos/asf/phoenix/blob/e5033aec/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseQueryIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseQueryIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseQueryIT.java
index f3031f4..e404c17 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseQueryIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseQueryIT.java
@@ -42,7 +42,6 @@ import org.apache.phoenix.util.PropertiesUtil;
import org.apache.phoenix.util.ReadOnlyProps;
import org.junit.Before;
import org.junit.BeforeClass;
-import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameters;
@@ -59,7 +58,6 @@ import com.google.common.collect.Lists;
* @since 0.1
*/
-@Category(ClientManagedTimeTest.class)
@RunWith(Parameterized.class)
public abstract class BaseQueryIT extends BaseClientManagedTimeIT {
protected static final String tenantId = getOrganizationId();
http://git-wip-us.apache.org/repos/asf/phoenix/blob/e5033aec/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseTenantSpecificTablesIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseTenantSpecificTablesIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseTenantSpecificTablesIT.java
index 6d6bffc..1e87b8f 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseTenantSpecificTablesIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseTenantSpecificTablesIT.java
@@ -26,11 +26,10 @@ import org.apache.phoenix.query.QueryServices;
import org.apache.phoenix.util.ReadOnlyProps;
import org.junit.Before;
import org.junit.BeforeClass;
-import org.junit.experimental.categories.Category;
import com.google.common.collect.Maps;
-@Category(NeedsOwnMiniClusterTest.class)
+
public abstract class BaseTenantSpecificTablesIT extends BaseOwnClusterClientManagedTimeIT {
protected static final String TENANT_ID = "ZZTop";
protected static final String TENANT_TYPE_ID = "abc";
http://git-wip-us.apache.org/repos/asf/phoenix/blob/e5033aec/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseTenantSpecificViewIndexIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseTenantSpecificViewIndexIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseTenantSpecificViewIndexIT.java
index be05b4c..e89a04f 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseTenantSpecificViewIndexIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseTenantSpecificViewIndexIT.java
@@ -136,6 +136,7 @@ public class BaseTenantSpecificViewIndexIT extends BaseHBaseManagedTimeIT {
return DriverManager.getConnection(getUrl(), props);
}
+ @SuppressWarnings("unchecked")
private void verifyViewData(Connection conn, String valuePrefix) throws SQLException {
String query = "SELECT k1, k2, v2 FROM v WHERE v2='" + valuePrefix + "v2-1'";
ResultSet rs = conn.createStatement().executeQuery(query);
http://git-wip-us.apache.org/repos/asf/phoenix/blob/e5033aec/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseViewIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseViewIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseViewIT.java
index c5a3b26..d07687a 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseViewIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseViewIT.java
@@ -35,11 +35,10 @@ import org.apache.phoenix.query.QueryServices;
import org.apache.phoenix.util.QueryUtil;
import org.apache.phoenix.util.ReadOnlyProps;
import org.junit.BeforeClass;
-import org.junit.experimental.categories.Category;
import com.google.common.collect.Maps;
-@Category(NeedsOwnMiniClusterTest.class)
+
public abstract class BaseViewIT extends BaseOwnClusterHBaseManagedTimeIT {
@BeforeClass
http://git-wip-us.apache.org/repos/asf/phoenix/blob/e5033aec/phoenix-core/src/it/java/org/apache/phoenix/end2end/BinaryRowKeyIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/BinaryRowKeyIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/BinaryRowKeyIT.java
index e4aa070..544284d 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/BinaryRowKeyIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/BinaryRowKeyIT.java
@@ -32,9 +32,8 @@ import java.util.Properties;
import org.apache.phoenix.util.PropertiesUtil;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-@Category(HBaseManagedTimeTest.class)
+
public class BinaryRowKeyIT extends BaseHBaseManagedTimeIT {
private static void initTableValues() throws SQLException {
http://git-wip-us.apache.org/repos/asf/phoenix/blob/e5033aec/phoenix-core/src/it/java/org/apache/phoenix/end2end/CSVCommonsLoaderIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/CSVCommonsLoaderIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/CSVCommonsLoaderIT.java
index 7e83f5f..71616d2 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/CSVCommonsLoaderIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/CSVCommonsLoaderIT.java
@@ -42,8 +42,7 @@ import org.apache.phoenix.util.CSVCommonsLoader;
import org.apache.phoenix.util.DateUtil;
import org.apache.phoenix.util.PhoenixRuntime;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-@Category(HBaseManagedTimeTest.class)
+
public class CSVCommonsLoaderIT extends BaseHBaseManagedTimeIT {
private static final String DATATYPE_TABLE = "DATATYPE";
http://git-wip-us.apache.org/repos/asf/phoenix/blob/e5033aec/phoenix-core/src/it/java/org/apache/phoenix/end2end/CaseStatementIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/CaseStatementIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/CaseStatementIT.java
index 6354de3..079ca50 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/CaseStatementIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/CaseStatementIT.java
@@ -47,14 +47,12 @@ import java.util.Properties;
import org.apache.phoenix.util.PhoenixRuntime;
import org.apache.phoenix.util.PropertiesUtil;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameters;
import com.google.common.collect.Lists;
-@Category(ClientManagedTimeTest.class)
@RunWith(Parameterized.class)
public class CaseStatementIT extends BaseQueryIT {
http://git-wip-us.apache.org/repos/asf/phoenix/blob/e5033aec/phoenix-core/src/it/java/org/apache/phoenix/end2end/CastAndCoerceIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/CastAndCoerceIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/CastAndCoerceIT.java
index 7a0c3e3..ce040b9 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/CastAndCoerceIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/CastAndCoerceIT.java
@@ -38,12 +38,10 @@ import java.util.Properties;
import org.apache.phoenix.util.PhoenixRuntime;
import org.apache.phoenix.util.PropertiesUtil;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameters;
-@Category(ClientManagedTimeTest.class)
@RunWith(Parameterized.class)
public class CastAndCoerceIT extends BaseQueryIT {
http://git-wip-us.apache.org/repos/asf/phoenix/blob/e5033aec/phoenix-core/src/it/java/org/apache/phoenix/end2end/ClientTimeArithmeticQueryIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ClientTimeArithmeticQueryIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ClientTimeArithmeticQueryIT.java
index d709b9c..17ed19d 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ClientTimeArithmeticQueryIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ClientTimeArithmeticQueryIT.java
@@ -51,14 +51,13 @@ import org.apache.phoenix.util.PhoenixRuntime;
import org.apache.phoenix.util.PropertiesUtil;
import org.apache.phoenix.util.TestUtil;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameters;
import com.google.common.collect.Lists;
-@Category(ClientManagedTimeTest.class)
+
@RunWith(Parameterized.class)
public class ClientTimeArithmeticQueryIT extends BaseQueryIT {
http://git-wip-us.apache.org/repos/asf/phoenix/blob/e5033aec/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 2a037fa..1ad647b 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,9 +36,8 @@ import org.apache.phoenix.exception.SQLExceptionCode;
import org.apache.phoenix.util.PropertiesUtil;
import org.junit.Assert;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-@Category(HBaseManagedTimeTest.class)
+
public class CoalesceFunctionIT extends BaseHBaseManagedTimeIT {
@Test
http://git-wip-us.apache.org/repos/asf/phoenix/blob/e5033aec/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 fee2420..775bb46 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
@@ -57,9 +57,8 @@ import org.apache.phoenix.util.PhoenixRuntime;
import org.apache.phoenix.util.PropertiesUtil;
import org.apache.phoenix.util.SchemaUtil;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-@Category(ClientManagedTimeTest.class)
+
public class ColumnProjectionOptimizationIT extends BaseClientManagedTimeIT {
@Test
@@ -222,6 +221,7 @@ public class ColumnProjectionOptimizationIT extends BaseClientManagedTimeIT {
byte[] htableName = SchemaUtil.getTableNameAsBytes(MDTEST_SCHEMA_NAME, MDTEST_NAME);
HBaseAdmin admin = pconn.getQueryServices().getAdmin();
+ @SuppressWarnings("deprecation")
HTableDescriptor descriptor = new HTableDescriptor(htableName);
for (byte[] familyName : familyNames) {
HColumnDescriptor columnDescriptor = new HColumnDescriptor(familyName);
http://git-wip-us.apache.org/repos/asf/phoenix/blob/e5033aec/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 d67dbb9..3a358c4 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
@@ -29,9 +29,8 @@ import java.util.Properties;
import org.apache.phoenix.util.PhoenixRuntime;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-@Category(ClientManagedTimeTest.class)
+
public class CompareDecimalToLongIT extends BaseClientManagedTimeIT {
protected static void initTableValues(byte[][] splits, long ts) throws Exception {
ensureTableCreated(getUrl(),"LongInKeyTest",splits, ts-2);
http://git-wip-us.apache.org/repos/asf/phoenix/blob/e5033aec/phoenix-core/src/it/java/org/apache/phoenix/end2end/ConvertTimezoneFunctionIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ConvertTimezoneFunctionIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ConvertTimezoneFunctionIT.java
index d39e37a..e390548 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ConvertTimezoneFunctionIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ConvertTimezoneFunctionIT.java
@@ -24,13 +24,12 @@ import java.sql.ResultSet;
import org.apache.phoenix.schema.IllegalDataException;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
/**
* CONVERT_TZ(date, 'from_timezone', 'to_timezone') tests
*
*/
-@Category(HBaseManagedTimeTest.class)
+
public class ConvertTimezoneFunctionIT extends BaseHBaseManagedTimeIT {
@Test
http://git-wip-us.apache.org/repos/asf/phoenix/blob/e5033aec/phoenix-core/src/it/java/org/apache/phoenix/end2end/CountDistinctCompressionIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/CountDistinctCompressionIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/CountDistinctCompressionIT.java
index 97703f5..b4c84b0 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/CountDistinctCompressionIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/CountDistinctCompressionIT.java
@@ -35,11 +35,10 @@ import org.apache.phoenix.util.PropertiesUtil;
import org.apache.phoenix.util.ReadOnlyProps;
import org.junit.BeforeClass;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import com.google.common.collect.Maps;
-@Category(NeedsOwnMiniClusterTest.class)
+
public class CountDistinctCompressionIT extends BaseOwnClusterHBaseManagedTimeIT {
@BeforeClass
public static void doSetup() throws Exception {
http://git-wip-us.apache.org/repos/asf/phoenix/blob/e5033aec/phoenix-core/src/it/java/org/apache/phoenix/end2end/CreateTableIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/CreateTableIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/CreateTableIT.java
index 0b5c105..e3bec28 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/CreateTableIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/CreateTableIT.java
@@ -38,9 +38,8 @@ import org.apache.phoenix.query.KeyRange;
import org.apache.phoenix.schema.TableAlreadyExistsException;
import org.apache.phoenix.util.PhoenixRuntime;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-@Category(ClientManagedTimeTest.class)
+
public class CreateTableIT extends BaseClientManagedTimeIT {
@Test
http://git-wip-us.apache.org/repos/asf/phoenix/blob/e5033aec/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 8209e5c..3717396 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
@@ -37,10 +37,9 @@ import java.util.Properties;
import org.apache.phoenix.util.PhoenixRuntime;
import org.apache.phoenix.util.PropertiesUtil;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-@Category(ClientManagedTimeTest.class)
+
public class CustomEntityDataIT extends BaseClientManagedTimeIT {
protected static void initTableValues(String tenantId, byte[][] splits, long ts) throws Exception {
http://git-wip-us.apache.org/repos/asf/phoenix/blob/e5033aec/phoenix-core/src/it/java/org/apache/phoenix/end2end/DecodeFunctionIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/DecodeFunctionIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/DecodeFunctionIT.java
index 6852f74..ae259bc 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/DecodeFunctionIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/DecodeFunctionIT.java
@@ -31,9 +31,8 @@ import org.apache.hadoop.hbase.util.Bytes;
import org.apache.phoenix.exception.SQLExceptionCode;
import org.apache.phoenix.schema.PDataType;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-@Category(HBaseManagedTimeTest.class)
+
public class DecodeFunctionIT extends BaseHBaseManagedTimeIT {
@Test
http://git-wip-us.apache.org/repos/asf/phoenix/blob/e5033aec/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 677fb53..36dff6f 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
@@ -35,9 +35,8 @@ import java.util.List;
import org.apache.phoenix.util.MetaDataUtil;
import org.apache.phoenix.util.QueryUtil;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-@Category(HBaseManagedTimeTest.class)
+
public class DeleteIT extends BaseHBaseManagedTimeIT {
private static final int NUMBER_OF_ROWS = 20;
private static final int NTH_ROW_NULL = 5;
http://git-wip-us.apache.org/repos/asf/phoenix/blob/e5033aec/phoenix-core/src/it/java/org/apache/phoenix/end2end/DerivedTableIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/DerivedTableIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/DerivedTableIT.java
index 8ef542a..727293f 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/DerivedTableIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/DerivedTableIT.java
@@ -50,14 +50,13 @@ import org.apache.phoenix.util.PropertiesUtil;
import org.apache.phoenix.util.QueryUtil;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameters;
import com.google.common.collect.Lists;
-@Category(ClientManagedTimeTest.class)
+
@RunWith(Parameterized.class)
public class DerivedTableIT extends BaseClientManagedTimeIT {
private static final String tenantId = getOrganizationId();
http://git-wip-us.apache.org/repos/asf/phoenix/blob/e5033aec/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 4b76d29..b1daacc 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
@@ -49,9 +49,8 @@ import org.apache.phoenix.schema.TableAlreadyExistsException;
import org.apache.phoenix.util.PhoenixRuntime;
import org.apache.phoenix.util.PropertiesUtil;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-@Category(ClientManagedTimeTest.class)
+
public class DistinctCountIT extends BaseClientManagedTimeIT {
@Test
http://git-wip-us.apache.org/repos/asf/phoenix/blob/e5033aec/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 35b8509..263a6ea 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
@@ -46,7 +46,6 @@ import org.apache.phoenix.util.PropertiesUtil;
import org.apache.phoenix.util.SchemaUtil;
import org.junit.BeforeClass;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
/**
* Basic tests for Phoenix dynamic upserting
@@ -55,7 +54,7 @@ import org.junit.experimental.categories.Category;
* @since 1.3
*/
-@Category(ClientManagedTimeTest.class)
+
public class DynamicColumnIT extends BaseClientManagedTimeIT {
private static final byte[] HBASE_DYNAMIC_COLUMNS_BYTES = SchemaUtil.getTableNameAsBytes(null, HBASE_DYNAMIC_COLUMNS);
private static final byte[] FAMILY_NAME = Bytes.toBytes(SchemaUtil.normalizeIdentifier("A"));
@@ -76,6 +75,7 @@ public class DynamicColumnIT extends BaseClientManagedTimeIT {
}
}
+ @SuppressWarnings("deprecation")
private static void initTableValues() throws Exception {
ConnectionQueryServices services = driver.getConnectionQueryServices(getUrl(), PropertiesUtil.deepCopy(TEST_PROPERTIES));
HTableInterface hTable = services.getTable(SchemaUtil.getTableNameAsBytes(HBASE_DYNAMIC_COLUMNS_SCHEMA_NAME,HBASE_DYNAMIC_COLUMNS));
http://git-wip-us.apache.org/repos/asf/phoenix/blob/e5033aec/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 88ef0b3..cb795c9 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
@@ -49,7 +49,6 @@ import org.apache.phoenix.util.PropertiesUtil;
import org.apache.phoenix.util.SchemaUtil;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
/**
* Basic tests for Phoenix dynamic family querying "cf.*"
@@ -61,7 +60,7 @@ import org.junit.experimental.categories.Category;
@edu.umd.cs.findbugs.annotations.SuppressWarnings(
value="RV_RETURN_VALUE_IGNORED",
justification="Designed to ignore.")
-@Category(HBaseManagedTimeTest.class)
+
public class DynamicFamilyIT extends BaseHBaseManagedTimeIT {
private static final String WEB_STATS = "WEB_STATS";
private static final String WEB_STATS_SCHEMA_NAME = "";
@@ -106,6 +105,7 @@ public class DynamicFamilyIT extends BaseHBaseManagedTimeIT {
initTableValues();
}
+ @SuppressWarnings("deprecation")
private static void initTableValues() throws Exception {
ConnectionQueryServices services = driver.getConnectionQueryServices(getUrl(), PropertiesUtil.deepCopy(TEST_PROPERTIES));
HTableInterface hTable = services.getTable(SchemaUtil.getTableNameAsBytes(WEB_STATS_SCHEMA_NAME,WEB_STATS));
http://git-wip-us.apache.org/repos/asf/phoenix/blob/e5033aec/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 b236f10..fe0d8b1 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
@@ -36,7 +36,6 @@ import org.apache.phoenix.schema.ColumnFamilyNotFoundException;
import org.apache.phoenix.util.PropertiesUtil;
import org.junit.BeforeClass;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
/**
* Basic tests for Phoenix dynamic upserting
@@ -45,7 +44,7 @@ import org.junit.experimental.categories.Category;
* @since 1.3
*/
-@Category(ClientManagedTimeTest.class)
+
public class DynamicUpsertIT extends BaseClientManagedTimeIT {
private static final String TABLE = "DynamicUpserts";
http://git-wip-us.apache.org/repos/asf/phoenix/blob/e5033aec/phoenix-core/src/it/java/org/apache/phoenix/end2end/EvaluationOfORIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/EvaluationOfORIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/EvaluationOfORIT.java
index 0e59542..c9cc1e2 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/EvaluationOfORIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/EvaluationOfORIT.java
@@ -30,9 +30,8 @@ import java.util.Properties;
import org.apache.phoenix.util.PropertiesUtil;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-@Category(HBaseManagedTimeTest.class)
+
public class EvaluationOfORIT extends BaseHBaseManagedTimeIT{
@Test
http://git-wip-us.apache.org/repos/asf/phoenix/blob/e5033aec/phoenix-core/src/it/java/org/apache/phoenix/end2end/ExecuteStatementsIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ExecuteStatementsIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ExecuteStatementsIT.java
index 0d64f2e..1b41bdd 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ExecuteStatementsIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ExecuteStatementsIT.java
@@ -46,9 +46,8 @@ import org.apache.phoenix.exception.SQLExceptionCode;
import org.apache.phoenix.query.QueryConstants;
import org.apache.phoenix.util.PhoenixRuntime;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-@Category(HBaseManagedTimeTest.class)
+
public class ExecuteStatementsIT extends BaseHBaseManagedTimeIT {
@Test
http://git-wip-us.apache.org/repos/asf/phoenix/blob/e5033aec/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 9d15e32..377f6d6 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
@@ -34,7 +34,6 @@ import java.util.Properties;
import org.apache.phoenix.util.PhoenixRuntime;
import org.apache.phoenix.util.PropertiesUtil;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
@@ -43,7 +42,7 @@ import org.junit.experimental.categories.Category;
* Extended tests for Phoenix JDBC implementation
*
*/
-@Category(ClientManagedTimeTest.class)
+
public class ExtendedQueryExecIT extends BaseClientManagedTimeIT {
@Test
http://git-wip-us.apache.org/repos/asf/phoenix/blob/e5033aec/phoenix-core/src/it/java/org/apache/phoenix/end2end/FirstValueFunctionIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/FirstValueFunctionIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/FirstValueFunctionIT.java
index de19cec..6c080d3 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/FirstValueFunctionIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/FirstValueFunctionIT.java
@@ -17,9 +17,14 @@
*/
package org.apache.phoenix.end2end;
-import static org.junit.Assert.*;
-import java.sql.*;
-import static org.apache.hadoop.hbase.util.VersionInfo.getUrl;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.ResultSet;
+
import org.junit.Test;
public class FirstValueFunctionIT extends BaseHBaseManagedTimeIT {
http://git-wip-us.apache.org/repos/asf/phoenix/blob/e5033aec/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 b66f221..11f91cd 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,9 +34,8 @@ import org.apache.phoenix.schema.ColumnNotFoundException;
import org.apache.phoenix.util.PhoenixRuntime;
import org.apache.phoenix.util.PropertiesUtil;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-@Category(ClientManagedTimeTest.class)
+
public class FunkyNamesIT extends BaseClientManagedTimeIT {
protected static void initTableValues(byte[][] splits, long ts) throws Exception {
http://git-wip-us.apache.org/repos/asf/phoenix/blob/e5033aec/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 b811865..2b43337 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
@@ -35,9 +35,8 @@ import java.util.Properties;
import org.apache.phoenix.util.PhoenixRuntime;
import org.apache.phoenix.util.PropertiesUtil;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-@Category(ClientManagedTimeTest.class)
+
public class GroupByCaseIT extends BaseClientManagedTimeIT {
private static String GROUPBY1 = "select " +
http://git-wip-us.apache.org/repos/asf/phoenix/blob/e5033aec/phoenix-core/src/it/java/org/apache/phoenix/end2end/GroupByIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/GroupByIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/GroupByIT.java
index 6002d58..55bce01 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/GroupByIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/GroupByIT.java
@@ -45,14 +45,13 @@ import java.util.Properties;
import org.apache.phoenix.util.PhoenixRuntime;
import org.apache.phoenix.util.PropertiesUtil;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameters;
import com.google.common.collect.Lists;
-@Category(ClientManagedTimeTest.class)
+
@RunWith(Parameterized.class)
public class GroupByIT extends BaseQueryIT {
http://git-wip-us.apache.org/repos/asf/phoenix/blob/e5033aec/phoenix-core/src/it/java/org/apache/phoenix/end2end/HashJoinIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/HashJoinIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/HashJoinIT.java
index ec22360..910ea88 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/HashJoinIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/HashJoinIT.java
@@ -58,14 +58,13 @@ import org.apache.phoenix.util.ReadOnlyProps;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameters;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
-@Category(HBaseManagedTimeTest.class)
+
@RunWith(Parameterized.class)
public class HashJoinIT extends BaseHBaseManagedTimeIT {
http://git-wip-us.apache.org/repos/asf/phoenix/blob/e5033aec/phoenix-core/src/it/java/org/apache/phoenix/end2end/InListIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/InListIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/InListIT.java
index b248fb3..315a18f 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/InListIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/InListIT.java
@@ -19,13 +19,12 @@ import org.apache.phoenix.schema.PDataType;
import org.apache.phoenix.util.PhoenixRuntime;
import org.apache.phoenix.util.PropertiesUtil;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import com.google.common.base.Function;
import com.google.common.base.Joiner;
import com.google.common.collect.Lists;
-@Category(HBaseManagedTimeTest.class)
+
public class InListIT extends BaseHBaseManagedTimeIT {
@Test
@@ -204,7 +203,6 @@ public class InListIT extends BaseHBaseManagedTimeIT {
}
}
- @SuppressWarnings("unchecked")
List<List<Object>> DEFAULT_UPSERTS = Arrays.asList(Arrays.<Object>asList(1, 2, 4, 5, 6, "row1"),
Arrays.<Object>asList(2, 3, 4, 5, 6, "row2"),
Arrays.<Object>asList(2, 3, 6, 4, 5, "row3"),
http://git-wip-us.apache.org/repos/asf/phoenix/blob/e5033aec/phoenix-core/src/it/java/org/apache/phoenix/end2end/InMemoryOrderByIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/InMemoryOrderByIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/InMemoryOrderByIT.java
index 533143c..cc3b45f 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/InMemoryOrderByIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/InMemoryOrderByIT.java
@@ -22,9 +22,8 @@ import java.util.Map;
import org.apache.phoenix.query.QueryServices;
import org.apache.phoenix.util.ReadOnlyProps;
import org.junit.BeforeClass;
-import org.junit.experimental.categories.Category;
-@Category(ClientManagedTimeTest.class)
+
public class InMemoryOrderByIT extends OrderByIT {
public InMemoryOrderByIT() {
http://git-wip-us.apache.org/repos/asf/phoenix/blob/e5033aec/phoenix-core/src/it/java/org/apache/phoenix/end2end/IsNullIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/IsNullIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/IsNullIT.java
index cb9516c..9c60914 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/IsNullIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/IsNullIT.java
@@ -29,9 +29,8 @@ import java.util.Properties;
import org.apache.phoenix.util.PhoenixRuntime;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-@Category(ClientManagedTimeTest.class)
+
public class IsNullIT extends BaseClientManagedTimeIT {
@Test
public void testIsNullInPk() throws Exception {
http://git-wip-us.apache.org/repos/asf/phoenix/blob/e5033aec/phoenix-core/src/it/java/org/apache/phoenix/end2end/KeyOnlyIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/KeyOnlyIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/KeyOnlyIT.java
index 42ee5ad..55d88cc 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/KeyOnlyIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/KeyOnlyIT.java
@@ -42,11 +42,10 @@ import org.apache.phoenix.util.ReadOnlyProps;
import org.apache.phoenix.util.TestUtil;
import org.junit.BeforeClass;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import com.google.common.collect.Maps;
-@Category(NeedsOwnMiniClusterTest.class)
+
public class KeyOnlyIT extends BaseOwnClusterClientManagedTimeIT {
@BeforeClass
http://git-wip-us.apache.org/repos/asf/phoenix/blob/e5033aec/phoenix-core/src/it/java/org/apache/phoenix/end2end/LastValueFunctionIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/LastValueFunctionIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/LastValueFunctionIT.java
index ff1751a..cbadc35 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/LastValueFunctionIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/LastValueFunctionIT.java
@@ -26,9 +26,8 @@ import java.sql.DriverManager;
import java.sql.ResultSet;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-@Category(HBaseManagedTimeTest.class)
+
public class LastValueFunctionIT extends BaseHBaseManagedTimeIT {
@Test
http://git-wip-us.apache.org/repos/asf/phoenix/blob/e5033aec/phoenix-core/src/it/java/org/apache/phoenix/end2end/LpadFunctionIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/LpadFunctionIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/LpadFunctionIT.java
index 2716f5e..0a9bedf 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/LpadFunctionIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/LpadFunctionIT.java
@@ -29,14 +29,13 @@ import java.util.List;
import org.apache.phoenix.util.TestUtil;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import com.google.common.collect.Lists;
/**
* Tests for the LPAD built-in function.
*/
-@Category(HBaseManagedTimeTest.class)
+
public class LpadFunctionIT extends BaseHBaseManagedTimeIT {
/**
http://git-wip-us.apache.org/repos/asf/phoenix/blob/e5033aec/phoenix-core/src/it/java/org/apache/phoenix/end2end/MD5FunctionIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/MD5FunctionIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/MD5FunctionIT.java
index bec5b65..ff7ebdb 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/MD5FunctionIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/MD5FunctionIT.java
@@ -28,9 +28,8 @@ import java.sql.PreparedStatement;
import java.sql.ResultSet;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-@Category(HBaseManagedTimeTest.class)
+
public class MD5FunctionIT extends BaseHBaseManagedTimeIT {
@Test
http://git-wip-us.apache.org/repos/asf/phoenix/blob/e5033aec/phoenix-core/src/it/java/org/apache/phoenix/end2end/MappingTableDataTypeIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/MappingTableDataTypeIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/MappingTableDataTypeIT.java
index 3c789e3..98e536e 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/MappingTableDataTypeIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/MappingTableDataTypeIT.java
@@ -39,9 +39,8 @@ import org.apache.phoenix.exception.SQLExceptionCode;
import org.apache.phoenix.jdbc.PhoenixConnection;
import org.apache.phoenix.util.PropertiesUtil;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-@Category(HBaseManagedTimeTest.class)
+
public class MappingTableDataTypeIT extends BaseHBaseManagedTimeIT {
@Test
public void testMappingHbaseTableToPhoenixTable() throws Exception {
http://git-wip-us.apache.org/repos/asf/phoenix/blob/e5033aec/phoenix-core/src/it/java/org/apache/phoenix/end2end/ModulusExpressionIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ModulusExpressionIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ModulusExpressionIT.java
index 5055793..7de85ea 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ModulusExpressionIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ModulusExpressionIT.java
@@ -21,18 +21,17 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
import java.sql.Connection;
import java.sql.DriverManager;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
-import static org.junit.Assert.fail;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-@Category(HBaseManagedTimeTest.class)
+
public class ModulusExpressionIT extends BaseHBaseManagedTimeIT {
private static final long SMALL_VALUE = 31L;
http://git-wip-us.apache.org/repos/asf/phoenix/blob/e5033aec/phoenix-core/src/it/java/org/apache/phoenix/end2end/MultiCfQueryExecIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/MultiCfQueryExecIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/MultiCfQueryExecIT.java
index a28d346..2edf189 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/MultiCfQueryExecIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/MultiCfQueryExecIT.java
@@ -40,11 +40,10 @@ import org.apache.phoenix.util.PropertiesUtil;
import org.apache.phoenix.util.ReadOnlyProps;
import org.junit.BeforeClass;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import com.google.common.collect.Maps;
-@Category(NeedsOwnMiniClusterTest.class)
+
public class MultiCfQueryExecIT extends BaseOwnClusterClientManagedTimeIT {
private static final String MULTI_CF = "MULTI_CF";
http://git-wip-us.apache.org/repos/asf/phoenix/blob/e5033aec/phoenix-core/src/it/java/org/apache/phoenix/end2end/NativeHBaseTypesIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/NativeHBaseTypesIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/NativeHBaseTypesIT.java
index ec0ccbe..2c5de02 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/NativeHBaseTypesIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/NativeHBaseTypesIT.java
@@ -53,7 +53,6 @@ import org.apache.phoenix.util.PropertiesUtil;
import org.apache.phoenix.util.SchemaUtil;
import org.junit.BeforeClass;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
/**
@@ -65,7 +64,7 @@ import org.junit.experimental.categories.Category;
*
* @since 0.1
*/
-@Category(ClientManagedTimeTest.class)
+
public class NativeHBaseTypesIT extends BaseClientManagedTimeIT {
private static final byte[] HBASE_NATIVE_BYTES = SchemaUtil.getTableNameAsBytes(HBASE_NATIVE_SCHEMA_NAME, HBASE_NATIVE);
private static final byte[] FAMILY_NAME = Bytes.toBytes(SchemaUtil.normalizeIdentifier("1"));
http://git-wip-us.apache.org/repos/asf/phoenix/blob/e5033aec/phoenix-core/src/it/java/org/apache/phoenix/end2end/NotQueryIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/NotQueryIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/NotQueryIT.java
index d6f0c13..21074fc 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/NotQueryIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/NotQueryIT.java
@@ -43,7 +43,6 @@ import java.util.Properties;
import org.apache.phoenix.util.PhoenixRuntime;
import org.apache.phoenix.util.PropertiesUtil;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameters;
@@ -51,7 +50,7 @@ import org.junit.runners.Parameterized.Parameters;
import com.google.common.primitives.Doubles;
import com.google.common.primitives.Floats;
-@Category(ClientManagedTimeTest.class)
+
@RunWith(Parameterized.class)
public class NotQueryIT extends BaseQueryIT {
http://git-wip-us.apache.org/repos/asf/phoenix/blob/e5033aec/phoenix-core/src/it/java/org/apache/phoenix/end2end/NthValueFunctionIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/NthValueFunctionIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/NthValueFunctionIT.java
index ec5bf96..11ecc0d 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/NthValueFunctionIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/NthValueFunctionIT.java
@@ -27,9 +27,8 @@ import java.sql.ResultSet;
import java.util.ArrayList;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-@Category(HBaseManagedTimeTest.class)
+
public class NthValueFunctionIT extends BaseHBaseManagedTimeIT {
@Test
http://git-wip-us.apache.org/repos/asf/phoenix/blob/e5033aec/phoenix-core/src/it/java/org/apache/phoenix/end2end/OrderByIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/OrderByIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/OrderByIT.java
index 1c1a949..a8beb1e 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/OrderByIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/OrderByIT.java
@@ -40,9 +40,8 @@ import java.util.Properties;
import org.apache.phoenix.util.PhoenixRuntime;
import org.apache.phoenix.util.PropertiesUtil;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-@Category(ClientManagedTimeTest.class)
+
public class OrderByIT extends BaseClientManagedTimeIT {
@Test
http://git-wip-us.apache.org/repos/asf/phoenix/blob/e5033aec/phoenix-core/src/it/java/org/apache/phoenix/end2end/ParallelIteratorsIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ParallelIteratorsIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ParallelIteratorsIT.java
index a1c6217..509ca90 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ParallelIteratorsIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ParallelIteratorsIT.java
@@ -38,11 +38,10 @@ import org.apache.phoenix.schema.PDataType;
import org.apache.phoenix.util.ReadOnlyProps;
import org.junit.BeforeClass;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import com.google.common.collect.Maps;
-@Category(NeedsOwnMiniClusterTest.class)
+
public class ParallelIteratorsIT extends BaseOwnClusterHBaseManagedTimeIT {
private static final String STABLE_INDEX = "STABLE_INDEX";
http://git-wip-us.apache.org/repos/asf/phoenix/blob/e5033aec/phoenix-core/src/it/java/org/apache/phoenix/end2end/PercentileIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/PercentileIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/PercentileIT.java
index b15a3e5..685daeb 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/PercentileIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/PercentileIT.java
@@ -53,9 +53,8 @@ import org.apache.phoenix.query.QueryConstants;
import org.apache.phoenix.util.PhoenixRuntime;
import org.apache.phoenix.util.PropertiesUtil;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-@Category(ClientManagedTimeTest.class)
+
public class PercentileIT extends BaseClientManagedTimeIT {
@Test
http://git-wip-us.apache.org/repos/asf/phoenix/blob/e5033aec/phoenix-core/src/it/java/org/apache/phoenix/end2end/ProductMetricsIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ProductMetricsIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ProductMetricsIT.java
index 1daabb0..3d8c470 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ProductMetricsIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ProductMetricsIT.java
@@ -51,12 +51,11 @@ import org.apache.phoenix.util.PropertiesUtil;
import org.apache.phoenix.util.SchemaUtil;
import org.apache.phoenix.util.TestUtil;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import com.google.common.collect.Lists;
import com.google.common.collect.Ordering;
-@Category(ClientManagedTimeTest.class)
+
public class ProductMetricsIT extends BaseClientManagedTimeIT {
private static Format format = DateUtil.getDateParser(DateUtil.DEFAULT_DATE_FORMAT);
private static final String PRODUCT_METRICS_NAME = "PRODUCT_METRICS";
http://git-wip-us.apache.org/repos/asf/phoenix/blob/e5033aec/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryDatabaseMetaDataIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryDatabaseMetaDataIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryDatabaseMetaDataIT.java
index ed6300e..e78b812 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryDatabaseMetaDataIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryDatabaseMetaDataIT.java
@@ -77,9 +77,8 @@ import org.apache.phoenix.util.SchemaUtil;
import org.apache.phoenix.util.StringUtil;
import org.apache.phoenix.util.TestUtil;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-@Category(ClientManagedTimeTest.class)
+
public class QueryDatabaseMetaDataIT extends BaseClientManagedTimeIT {
@Test
http://git-wip-us.apache.org/repos/asf/phoenix/blob/e5033aec/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryExecWithoutSCNIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryExecWithoutSCNIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryExecWithoutSCNIT.java
index 99060dd..534f77d 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryExecWithoutSCNIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryExecWithoutSCNIT.java
@@ -30,9 +30,8 @@ import java.sql.ResultSet;
import java.util.Properties;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-@Category(HBaseManagedTimeTest.class)
+
public class QueryExecWithoutSCNIT extends BaseHBaseManagedTimeIT {
@Test
public void testScanNoSCN() throws Exception {
http://git-wip-us.apache.org/repos/asf/phoenix/blob/e5033aec/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryIT.java
index fe65e10..4628b43 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryIT.java
@@ -65,7 +65,6 @@ import org.apache.phoenix.util.MetaDataUtil;
import org.apache.phoenix.util.PhoenixRuntime;
import org.apache.phoenix.util.PropertiesUtil;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
@@ -77,7 +76,7 @@ import org.junit.experimental.categories.Category;
* @since 0.1
*/
-@Category(ClientManagedTimeTest.class)
+
public class QueryIT extends BaseQueryIT {
public QueryIT(String indexDDL) {
http://git-wip-us.apache.org/repos/asf/phoenix/blob/e5033aec/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryMoreIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryMoreIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryMoreIT.java
index e82abbb..af5e6fa 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryMoreIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryMoreIT.java
@@ -34,11 +34,10 @@ import org.apache.hadoop.hbase.util.Base64;
import org.apache.hadoop.hbase.util.Pair;
import org.apache.phoenix.util.PhoenixRuntime;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import com.google.common.collect.Lists;
-@Category(HBaseManagedTimeTest.class)
+
public class QueryMoreIT extends BaseHBaseManagedTimeIT {
private String dataTableName;
http://git-wip-us.apache.org/repos/asf/phoenix/blob/e5033aec/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryWithLimitIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryWithLimitIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryWithLimitIT.java
index 2df9514..3198194 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryWithLimitIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryWithLimitIT.java
@@ -41,11 +41,10 @@ import org.apache.phoenix.util.ReadOnlyProps;
import org.apache.phoenix.util.TestUtil;
import org.junit.BeforeClass;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import com.google.common.collect.Maps;
-@Category(NeedsOwnMiniClusterTest.class)
+
public class QueryWithLimitIT extends BaseOwnClusterHBaseManagedTimeIT {
@BeforeClass
http://git-wip-us.apache.org/repos/asf/phoenix/blob/e5033aec/phoenix-core/src/it/java/org/apache/phoenix/end2end/ReadIsolationLevelIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ReadIsolationLevelIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ReadIsolationLevelIT.java
index 62a1e2b..caebcb5 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ReadIsolationLevelIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ReadIsolationLevelIT.java
@@ -32,9 +32,8 @@ import java.util.Properties;
import org.apache.phoenix.util.PhoenixRuntime;
import org.apache.phoenix.util.PropertiesUtil;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-@Category(ClientManagedTimeTest.class)
+
public class ReadIsolationLevelIT extends BaseClientManagedTimeIT {
private static final String ENTITY_ID1= "000000000000001";
private static final String ENTITY_ID2= "000000000000002";
http://git-wip-us.apache.org/repos/asf/phoenix/blob/e5033aec/phoenix-core/src/it/java/org/apache/phoenix/end2end/ReadOnlyIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ReadOnlyIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ReadOnlyIT.java
index a425d3a..fbebe08 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ReadOnlyIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ReadOnlyIT.java
@@ -30,9 +30,8 @@ import java.util.Properties;
import org.apache.phoenix.util.PropertiesUtil;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-@Category(HBaseManagedTimeTest.class)
+
public class ReadOnlyIT extends BaseHBaseManagedTimeIT {
@Test
http://git-wip-us.apache.org/repos/asf/phoenix/blob/e5033aec/phoenix-core/src/it/java/org/apache/phoenix/end2end/RegexpSplitFunctionIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/RegexpSplitFunctionIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/RegexpSplitFunctionIT.java
index 0bda438..5170089 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/RegexpSplitFunctionIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/RegexpSplitFunctionIT.java
@@ -32,9 +32,8 @@ import java.sql.SQLException;
import java.sql.Types;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-@Category(HBaseManagedTimeTest.class)
+
public class RegexpSplitFunctionIT extends BaseHBaseManagedTimeIT {
private void initTable(Connection conn, String val) throws SQLException {
http://git-wip-us.apache.org/repos/asf/phoenix/blob/e5033aec/phoenix-core/src/it/java/org/apache/phoenix/end2end/RegexpSubstrFunctionIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/RegexpSubstrFunctionIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/RegexpSubstrFunctionIT.java
index be4646b..ff4b95e 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/RegexpSubstrFunctionIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/RegexpSubstrFunctionIT.java
@@ -31,9 +31,8 @@ import java.sql.Statement;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-@Category(HBaseManagedTimeTest.class)
+
public class RegexpSubstrFunctionIT extends BaseHBaseManagedTimeIT {
private int id;
http://git-wip-us.apache.org/repos/asf/phoenix/blob/e5033aec/phoenix-core/src/it/java/org/apache/phoenix/end2end/ReverseFunctionIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ReverseFunctionIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ReverseFunctionIT.java
index 7dc58ab..f384d3a 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ReverseFunctionIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ReverseFunctionIT.java
@@ -28,9 +28,8 @@ import java.sql.PreparedStatement;
import java.sql.ResultSet;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-@Category(HBaseManagedTimeTest.class)
+
public class ReverseFunctionIT extends BaseHBaseManagedTimeIT {
private void initTable(Connection conn, String sortOrder, String s) throws Exception {
String ddl = "CREATE TABLE REVERSE_TEST (pk VARCHAR NOT NULL PRIMARY KEY " + sortOrder + ", kv VARCHAR)";
http://git-wip-us.apache.org/repos/asf/phoenix/blob/e5033aec/phoenix-core/src/it/java/org/apache/phoenix/end2end/ReverseScanIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ReverseScanIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ReverseScanIT.java
index e279710..5481d80 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ReverseScanIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ReverseScanIT.java
@@ -43,11 +43,10 @@ import org.apache.phoenix.util.ReadOnlyProps;
import org.apache.phoenix.util.TestUtil;
import org.junit.BeforeClass;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import com.google.common.collect.Maps;
-@Category(HBaseManagedTimeTest.class)
+
public class ReverseScanIT extends BaseHBaseManagedTimeIT {
@BeforeClass
@Shadower(classBeingShadowed = BaseHBaseManagedTimeIT.class)
http://git-wip-us.apache.org/repos/asf/phoenix/blob/e5033aec/phoenix-core/src/it/java/org/apache/phoenix/end2end/RoundFloorCeilFunctionsEnd2EndIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/RoundFloorCeilFunctionsEnd2EndIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/RoundFloorCeilFunctionsEnd2EndIT.java
index c38f4d6..2cf08e9 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/RoundFloorCeilFunctionsEnd2EndIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/RoundFloorCeilFunctionsEnd2EndIT.java
@@ -36,7 +36,6 @@ import org.apache.phoenix.expression.function.RoundFunction;
import org.apache.phoenix.util.DateUtil;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import com.google.common.primitives.Doubles;
import com.google.common.primitives.Floats;
@@ -49,7 +48,7 @@ import com.google.common.primitives.Floats;
* @since 3.0.0
*/
-@Category(HBaseManagedTimeTest.class)
+
public class RoundFloorCeilFunctionsEnd2EndIT extends BaseHBaseManagedTimeIT {
private static long millisPart = 660;
http://git-wip-us.apache.org/repos/asf/phoenix/blob/e5033aec/phoenix-core/src/it/java/org/apache/phoenix/end2end/RowValueConstructorIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/RowValueConstructorIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/RowValueConstructorIT.java
index 9e3a5b0..be91eab 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/RowValueConstructorIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/RowValueConstructorIT.java
@@ -56,9 +56,8 @@ import org.apache.phoenix.util.PropertiesUtil;
import org.apache.phoenix.util.QueryUtil;
import org.apache.phoenix.util.TestUtil;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-@Category(ClientManagedTimeTest.class)
+
public class RowValueConstructorIT extends BaseClientManagedTimeIT {
@Test
http://git-wip-us.apache.org/repos/asf/phoenix/blob/e5033aec/phoenix-core/src/it/java/org/apache/phoenix/end2end/SaltedViewIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SaltedViewIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SaltedViewIT.java
index a492d4f..19f0a4a 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SaltedViewIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SaltedViewIT.java
@@ -18,9 +18,8 @@
package org.apache.phoenix.end2end;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-@Category(NeedsOwnMiniClusterTest.class)
+
public class SaltedViewIT extends BaseViewIT {
/**
http://git-wip-us.apache.org/repos/asf/phoenix/blob/e5033aec/phoenix-core/src/it/java/org/apache/phoenix/end2end/ScanQueryIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ScanQueryIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ScanQueryIT.java
index f817c2b..c376f89 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ScanQueryIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ScanQueryIT.java
@@ -51,7 +51,6 @@ import java.util.Set;
import org.apache.phoenix.util.PhoenixRuntime;
import org.apache.phoenix.util.PropertiesUtil;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameters;
@@ -60,7 +59,7 @@ import com.google.common.collect.Lists;
import com.google.common.primitives.Doubles;
import com.google.common.primitives.Floats;
-@Category(ClientManagedTimeTest.class)
+
@RunWith(Parameterized.class)
public class ScanQueryIT extends BaseQueryIT {
http://git-wip-us.apache.org/repos/asf/phoenix/blob/e5033aec/phoenix-core/src/it/java/org/apache/phoenix/end2end/SequenceIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SequenceIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SequenceIT.java
index b4b0b2e..a08b511 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SequenceIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SequenceIT.java
@@ -48,11 +48,10 @@ import org.junit.After;
import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import com.google.common.collect.Lists;
-@Category(ClientManagedTimeTest.class)
+
public class SequenceIT extends BaseClientManagedTimeIT {
private static final String NEXT_VAL_SQL = "SELECT NEXT VALUE FOR foo.bar FROM SYSTEM.\"SEQUENCE\"";
private static final long BATCH_SIZE = 3;
http://git-wip-us.apache.org/repos/asf/phoenix/blob/e5033aec/phoenix-core/src/it/java/org/apache/phoenix/end2end/ServerExceptionIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ServerExceptionIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ServerExceptionIT.java
index d101fe3..5c8679d 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ServerExceptionIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ServerExceptionIT.java
@@ -30,9 +30,8 @@ import java.util.Properties;
import org.apache.phoenix.util.PropertiesUtil;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-@Category(HBaseManagedTimeTest.class)
+
public class ServerExceptionIT extends BaseHBaseManagedTimeIT {
@Test
http://git-wip-us.apache.org/repos/asf/phoenix/blob/e5033aec/phoenix-core/src/it/java/org/apache/phoenix/end2end/SkipScanAfterManualSplitIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SkipScanAfterManualSplitIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SkipScanAfterManualSplitIT.java
index 3c0344c..1c82274 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SkipScanAfterManualSplitIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SkipScanAfterManualSplitIT.java
@@ -39,11 +39,10 @@ import org.apache.phoenix.query.QueryServices;
import org.apache.phoenix.util.ReadOnlyProps;
import org.junit.BeforeClass;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import com.google.common.collect.Maps;
-@Category(HBaseManagedTimeTest.class)
+
public class SkipScanAfterManualSplitIT extends BaseHBaseManagedTimeIT {
private static final int BATCH_SIZE = 25;
http://git-wip-us.apache.org/repos/asf/phoenix/blob/e5033aec/phoenix-core/src/it/java/org/apache/phoenix/end2end/SkipScanQueryIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SkipScanQueryIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SkipScanQueryIT.java
index db5d15b..7c509bb 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SkipScanQueryIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SkipScanQueryIT.java
@@ -33,9 +33,8 @@ import java.util.List;
import org.apache.phoenix.util.PhoenixRuntime;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-@Category(HBaseManagedTimeTest.class)
+
public class SkipScanQueryIT extends BaseHBaseManagedTimeIT {
private void initIntInTable(Connection conn, List<Integer> data) throws SQLException {
http://git-wip-us.apache.org/repos/asf/phoenix/blob/e5033aec/phoenix-core/src/it/java/org/apache/phoenix/end2end/SortMergeJoinIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SortMergeJoinIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SortMergeJoinIT.java
index 469388b..c75d49a 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SortMergeJoinIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SortMergeJoinIT.java
@@ -57,14 +57,13 @@ import org.apache.phoenix.util.ReadOnlyProps;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameters;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
-@Category(HBaseManagedTimeTest.class)
+
@RunWith(Parameterized.class)
public class SortMergeJoinIT extends BaseHBaseManagedTimeIT {
http://git-wip-us.apache.org/repos/asf/phoenix/blob/e5033aec/phoenix-core/src/it/java/org/apache/phoenix/end2end/SortOrderFIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SortOrderFIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SortOrderFIT.java
index 8c8bbcc..9fb7ea3 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SortOrderFIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SortOrderFIT.java
@@ -35,7 +35,6 @@ import org.apache.commons.lang.ArrayUtils;
import org.apache.phoenix.util.PropertiesUtil;
import org.junit.Assert;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import com.google.common.collect.Lists;
@@ -43,7 +42,7 @@ import com.google.common.collect.Lists;
* @since 1.2
*/
-@Category(HBaseManagedTimeTest.class)
+
public class SortOrderFIT extends BaseHBaseManagedTimeIT {
private static final String TABLE = "DescColumnSortOrderTest";
http://git-wip-us.apache.org/repos/asf/phoenix/blob/e5033aec/phoenix-core/src/it/java/org/apache/phoenix/end2end/SpillableGroupByIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SpillableGroupByIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SpillableGroupByIT.java
index 36bbca8..70d5f1d 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SpillableGroupByIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SpillableGroupByIT.java
@@ -38,7 +38,6 @@ import org.apache.phoenix.util.PropertiesUtil;
import org.apache.phoenix.util.ReadOnlyProps;
import org.junit.BeforeClass;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import com.google.common.collect.Maps;
@@ -47,7 +46,7 @@ import com.google.common.collect.Maps;
* and we wouldn't want that to be set for other tests sharing the same
* cluster.
*/
-@Category(NeedsOwnMiniClusterTest.class)
+
public class SpillableGroupByIT extends BaseOwnClusterHBaseManagedTimeIT {
private static final int NUM_ROWS_INSERTED = 1000;
http://git-wip-us.apache.org/repos/asf/phoenix/blob/e5033aec/phoenix-core/src/it/java/org/apache/phoenix/end2end/SpooledOrderByIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SpooledOrderByIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SpooledOrderByIT.java
index c35ecab..bb09793 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SpooledOrderByIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SpooledOrderByIT.java
@@ -22,9 +22,8 @@ import java.util.Map;
import org.apache.phoenix.query.QueryServices;
import org.apache.phoenix.util.ReadOnlyProps;
import org.junit.BeforeClass;
-import org.junit.experimental.categories.Category;
-@Category(ClientManagedTimeTest.class)
+
public class SpooledOrderByIT extends OrderByIT {
@BeforeClass
[4/5] phoenix git commit: PHOENIX-1467 Upgrade to 4.12 Junit and
update tests by removing @Category annotation (Samarth Jain)
Posted by ja...@apache.org.
http://git-wip-us.apache.org/repos/asf/phoenix/blob/e5033aec/phoenix-core/src/it/java/org/apache/phoenix/end2end/SpooledSortMergeJoinIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SpooledSortMergeJoinIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SpooledSortMergeJoinIT.java
index d602423..c646622 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SpooledSortMergeJoinIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SpooledSortMergeJoinIT.java
@@ -22,11 +22,10 @@ import java.util.Map;
import org.apache.phoenix.query.QueryServices;
import org.apache.phoenix.util.ReadOnlyProps;
import org.junit.BeforeClass;
-import org.junit.experimental.categories.Category;
import com.google.common.collect.Maps;
-@Category(HBaseManagedTimeTest.class)
+
public class SpooledSortMergeJoinIT extends SortMergeJoinIT {
public SpooledSortMergeJoinIT(String[] indexDDL, String[] plans) {
http://git-wip-us.apache.org/repos/asf/phoenix/blob/e5033aec/phoenix-core/src/it/java/org/apache/phoenix/end2end/SpooledTmpFileDeleteIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SpooledTmpFileDeleteIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SpooledTmpFileDeleteIT.java
new file mode 100644
index 0000000..a117c51
--- /dev/null
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SpooledTmpFileDeleteIT.java
@@ -0,0 +1,124 @@
+/*
+ * 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 static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import java.io.File;
+import java.io.FileFilter;
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Properties;
+
+import org.apache.phoenix.query.QueryServices;
+import org.junit.Before;
+import org.junit.Test;
+
+
+
+public class SpooledTmpFileDeleteIT extends BaseHBaseManagedTimeIT {
+ private Connection conn = null;
+ private Properties props = null;
+
+ @Before
+ public void setup() throws SQLException {
+ props = new Properties();
+ props.put(QueryServices.SPOOL_DIRECTORY, "/tmp");
+ props.setProperty(QueryServices.SPOOL_THRESHOLD_BYTES_ATTRIB, Integer.toString(1));
+ conn = DriverManager.getConnection(getUrl(), props);
+ Statement stmt = conn.createStatement();
+ stmt.execute("CREATE TABLE test (ID varchar NOT NULL PRIMARY KEY) SPLIT ON ('EA','EZ')");
+ stmt.execute("UPSERT INTO test VALUES ('AA')");
+ stmt.execute("UPSERT INTO test VALUES ('EB')");
+ stmt.execute("UPSERT INTO test VALUES ('FA')");
+ stmt.close();
+ conn.commit();
+ }
+
+ @Test
+ public void testDeleteAllSpooledTmpFiles() throws SQLException, Throwable {
+ File dir = new File("/tmp");
+ File[] files = null;
+
+ class FilenameFilter implements FileFilter {
+ @Override
+ public boolean accept(File dir) {
+ return dir.getName().toLowerCase().endsWith(".bin") &&
+ dir.getName().startsWith("ResultSpooler");
+ }
+ }
+
+ FilenameFilter fnameFilter = new FilenameFilter();
+
+ // clean up first
+ files = dir.listFiles(fnameFilter);
+ for (File file : files) {
+ file.delete();
+ }
+
+ String query = "select * from TEST";
+ Statement statement = conn.createStatement();
+ ResultSet rs = statement.executeQuery(query);
+ assertTrue(rs.next());
+ files = dir.listFiles(fnameFilter);
+ assertTrue(files.length > 0);
+ List<String> fileNames = new ArrayList<String>();
+ for (File file : files) {
+ fileNames.add(file.getName());
+ }
+
+ String preparedQuery = "select * from test where id = ?";
+ PreparedStatement pstmt = conn.prepareStatement(preparedQuery);
+ pstmt.setString(1, "EB");
+ ResultSet prs = pstmt.executeQuery(preparedQuery);
+ assertTrue(prs.next());
+ files = dir.listFiles(fnameFilter);
+ assertTrue(files.length > 0);
+ for (File file : files) {
+ fileNames.add(file.getName());
+ }
+
+ Connection conn2 = DriverManager.getConnection(getUrl(), props);
+ String query2 = "select * from TEST";
+ Statement statement2 = conn2.createStatement();
+ ResultSet rs2 = statement2.executeQuery(query2);
+ assertTrue(rs2.next());
+ files = dir.listFiles(fnameFilter);
+ assertTrue(files.length > 0);
+
+ String preparedQuery2 = "select * from test where id = ?";
+ PreparedStatement pstmt2 = conn2.prepareStatement(preparedQuery2);
+ pstmt2.setString(1, "EB");
+ ResultSet prs2 = pstmt2.executeQuery(preparedQuery2);
+ assertTrue(prs2.next());
+ files = dir.listFiles(fnameFilter);
+ assertTrue(files.length > 0);
+
+ conn.close();
+
+ files = dir.listFiles(fnameFilter);
+
+ for (File file : files) {
+ assertFalse(fileNames.contains(file.getName()));
+ }
+ conn2.close();
+ files = dir.listFiles(fnameFilter);
+ assertTrue(files.length == 0);
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/phoenix/blob/e5033aec/phoenix-core/src/it/java/org/apache/phoenix/end2end/StatementHintsIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/StatementHintsIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/StatementHintsIT.java
index 9c9f2c6..70246f9 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/StatementHintsIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/StatementHintsIT.java
@@ -30,14 +30,13 @@ import java.util.Properties;
import org.apache.phoenix.util.PropertiesUtil;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
/**
* End-to-End tests on various statement hints.
*/
-@Category(HBaseManagedTimeTest.class)
+
public class StatementHintsIT extends BaseHBaseManagedTimeIT {
private static void initTableValues() throws Exception {
http://git-wip-us.apache.org/repos/asf/phoenix/blob/e5033aec/phoenix-core/src/it/java/org/apache/phoenix/end2end/StatsCollectorIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/StatsCollectorIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/StatsCollectorIT.java
index 7c0c553..2986bf4 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/StatsCollectorIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/StatsCollectorIT.java
@@ -32,11 +32,10 @@ import org.apache.phoenix.util.ReadOnlyProps;
import org.apache.phoenix.util.TestUtil;
import org.junit.BeforeClass;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import com.google.common.collect.Maps;
-@Category(NeedsOwnMiniClusterTest.class)
+
public class StatsCollectorIT extends BaseOwnClusterHBaseManagedTimeIT {
private static final String STATS_TEST_TABLE_NAME = "S";
private static final byte[] STATS_TEST_TABLE_BYTES = Bytes.toBytes(STATS_TEST_TABLE_NAME);
http://git-wip-us.apache.org/repos/asf/phoenix/blob/e5033aec/phoenix-core/src/it/java/org/apache/phoenix/end2end/StddevIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/StddevIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/StddevIT.java
index f3fef4b..c00b770 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/StddevIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/StddevIT.java
@@ -29,8 +29,7 @@ import java.sql.PreparedStatement;
import java.sql.ResultSet;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-@Category(HBaseManagedTimeTest.class)
+
public class StddevIT extends BaseHBaseManagedTimeIT {
@Test
http://git-wip-us.apache.org/repos/asf/phoenix/blob/e5033aec/phoenix-core/src/it/java/org/apache/phoenix/end2end/SubqueryIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SubqueryIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SubqueryIT.java
index 4f3ca16..0e5dcc0 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SubqueryIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SubqueryIT.java
@@ -57,14 +57,13 @@ import org.apache.phoenix.util.ReadOnlyProps;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameters;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
-@Category(HBaseManagedTimeTest.class)
+
@RunWith(Parameterized.class)
public class SubqueryIT extends BaseHBaseManagedTimeIT {
http://git-wip-us.apache.org/repos/asf/phoenix/blob/e5033aec/phoenix-core/src/it/java/org/apache/phoenix/end2end/TenantSpecificTablesDDLIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/TenantSpecificTablesDDLIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/TenantSpecificTablesDDLIT.java
index 42fe5b8..4d0b45d 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/TenantSpecificTablesDDLIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/TenantSpecificTablesDDLIT.java
@@ -56,9 +56,8 @@ import org.apache.phoenix.util.PropertiesUtil;
import org.apache.phoenix.util.SchemaUtil;
import org.apache.phoenix.util.StringUtil;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-@Category(NeedsOwnMiniClusterTest.class)
+
public class TenantSpecificTablesDDLIT extends BaseTenantSpecificTablesIT {
@Test
http://git-wip-us.apache.org/repos/asf/phoenix/blob/e5033aec/phoenix-core/src/it/java/org/apache/phoenix/end2end/TenantSpecificTablesDMLIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/TenantSpecificTablesDMLIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/TenantSpecificTablesDMLIT.java
index 248de0f..dbe767b 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/TenantSpecificTablesDMLIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/TenantSpecificTablesDMLIT.java
@@ -37,9 +37,8 @@ import org.apache.phoenix.schema.TableNotFoundException;
import org.apache.phoenix.util.PhoenixRuntime;
import org.apache.phoenix.util.PropertiesUtil;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-@Category(NeedsOwnMiniClusterTest.class)
+
public class TenantSpecificTablesDMLIT extends BaseTenantSpecificTablesIT {
@Test
http://git-wip-us.apache.org/repos/asf/phoenix/blob/e5033aec/phoenix-core/src/it/java/org/apache/phoenix/end2end/TenantSpecificViewIndexIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/TenantSpecificViewIndexIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/TenantSpecificViewIndexIT.java
index 094222b..83f2e4d 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/TenantSpecificViewIndexIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/TenantSpecificViewIndexIT.java
@@ -32,9 +32,8 @@ import org.apache.phoenix.schema.ColumnNotFoundException;
import org.apache.phoenix.util.PhoenixRuntime;
import org.apache.phoenix.util.QueryUtil;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-@Category(HBaseManagedTimeTest.class)
+
public class TenantSpecificViewIndexIT extends BaseTenantSpecificViewIndexIT {
@Test
http://git-wip-us.apache.org/repos/asf/phoenix/blob/e5033aec/phoenix-core/src/it/java/org/apache/phoenix/end2end/TenantSpecificViewIndexSaltedIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/TenantSpecificViewIndexSaltedIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/TenantSpecificViewIndexSaltedIT.java
index 56fa8b6..76d7fa2 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/TenantSpecificViewIndexSaltedIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/TenantSpecificViewIndexSaltedIT.java
@@ -18,9 +18,8 @@
package org.apache.phoenix.end2end;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-@Category(HBaseManagedTimeTest.class)
+
public class TenantSpecificViewIndexSaltedIT extends BaseTenantSpecificViewIndexIT {
private static final Integer SALT_BUCKETS = 3;
http://git-wip-us.apache.org/repos/asf/phoenix/blob/e5033aec/phoenix-core/src/it/java/org/apache/phoenix/end2end/TimezoneOffsetFunctionIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/TimezoneOffsetFunctionIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/TimezoneOffsetFunctionIT.java
index e3c4776..54bbe9c 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/TimezoneOffsetFunctionIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/TimezoneOffsetFunctionIT.java
@@ -17,17 +17,18 @@
*/
package org.apache.phoenix.end2end;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
import java.sql.Connection;
import java.sql.DriverManager;
import java.sql.ResultSet;
+
import org.apache.phoenix.schema.IllegalDataException;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-@Category(HBaseManagedTimeTest.class)
+
public class TimezoneOffsetFunctionIT extends BaseHBaseManagedTimeIT {
@Test
http://git-wip-us.apache.org/repos/asf/phoenix/blob/e5033aec/phoenix-core/src/it/java/org/apache/phoenix/end2end/ToCharFunctionIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ToCharFunctionIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ToCharFunctionIT.java
index 1fa88f5..52b5207 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ToCharFunctionIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ToCharFunctionIT.java
@@ -41,7 +41,6 @@ import org.apache.phoenix.util.PhoenixRuntime;
import org.apache.phoenix.util.PropertiesUtil;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
/**
* Tests for the TO_CHAR built-in function.
@@ -50,7 +49,7 @@ import org.junit.experimental.categories.Category;
*
* @since 0.1
*/
-@Category(ClientManagedTimeTest.class)
+
public class ToCharFunctionIT extends BaseClientManagedTimeIT {
public static final String TO_CHAR_TABLE_NAME = "TO_CHAR_TABLE";
http://git-wip-us.apache.org/repos/asf/phoenix/blob/e5033aec/phoenix-core/src/it/java/org/apache/phoenix/end2end/ToNumberFunctionIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ToNumberFunctionIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ToNumberFunctionIT.java
index 431cbda..daf2c63 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ToNumberFunctionIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ToNumberFunctionIT.java
@@ -41,7 +41,6 @@ import org.junit.AfterClass;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
/**
* Tests for the TO_NUMBER built-in function.
@@ -50,7 +49,7 @@ import org.junit.experimental.categories.Category;
*
* @since 0.1
*/
-@Category(ClientManagedTimeTest.class)
+
public class ToNumberFunctionIT extends BaseClientManagedTimeIT {
// This test changes to locale to en_US, and saves the previous locale here
http://git-wip-us.apache.org/repos/asf/phoenix/blob/e5033aec/phoenix-core/src/it/java/org/apache/phoenix/end2end/TopNIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/TopNIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/TopNIT.java
index 8d3a706..618680d 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/TopNIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/TopNIT.java
@@ -40,9 +40,8 @@ import java.util.Properties;
import org.apache.phoenix.util.PhoenixRuntime;
import org.apache.phoenix.util.PropertiesUtil;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-@Category(ClientManagedTimeTest.class)
+
public class TopNIT extends BaseClientManagedTimeIT {
@Test
http://git-wip-us.apache.org/repos/asf/phoenix/blob/e5033aec/phoenix-core/src/it/java/org/apache/phoenix/end2end/TruncateFunctionIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/TruncateFunctionIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/TruncateFunctionIT.java
index bed5146..4cd263e 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/TruncateFunctionIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/TruncateFunctionIT.java
@@ -39,9 +39,8 @@ import java.util.Properties;
import org.apache.phoenix.query.QueryConstants;
import org.apache.phoenix.util.DateUtil;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-@Category(ClientManagedTimeTest.class)
+
public class TruncateFunctionIT extends BaseClientManagedTimeIT {
private static Format format = DateUtil.getDateParser(DateUtil.DEFAULT_MS_DATE_FORMAT);
private static final String DS1 = "1970-01-10 00:58:01.587";
http://git-wip-us.apache.org/repos/asf/phoenix/blob/e5033aec/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpsertBigValuesIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpsertBigValuesIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpsertBigValuesIT.java
index e1ce962..3d1bb4a 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpsertBigValuesIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpsertBigValuesIT.java
@@ -28,9 +28,8 @@ import java.sql.ResultSet;
import java.util.Properties;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-@Category(HBaseManagedTimeTest.class)
+
public class UpsertBigValuesIT extends BaseHBaseManagedTimeIT {
private static final long INTEGER_MIN_MINUS_ONE = (long)Integer.MIN_VALUE - 1;
http://git-wip-us.apache.org/repos/asf/phoenix/blob/e5033aec/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpsertSelectAutoCommitIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpsertSelectAutoCommitIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpsertSelectAutoCommitIT.java
index e39619c..4b4f215 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpsertSelectAutoCommitIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpsertSelectAutoCommitIT.java
@@ -35,9 +35,8 @@ import java.util.Properties;
import org.apache.phoenix.query.QueryServices;
import org.apache.phoenix.util.PropertiesUtil;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-@Category(HBaseManagedTimeTest.class)
+
public class UpsertSelectAutoCommitIT extends BaseHBaseManagedTimeIT {
public UpsertSelectAutoCommitIT() {
http://git-wip-us.apache.org/repos/asf/phoenix/blob/e5033aec/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpsertSelectIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpsertSelectIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpsertSelectIT.java
index ac54fe4..c1a960f 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpsertSelectIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpsertSelectIT.java
@@ -53,9 +53,8 @@ import org.apache.phoenix.util.ReadOnlyProps;
import org.apache.phoenix.util.TestUtil;
import org.junit.BeforeClass;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-@Category(ClientManagedTimeTest.class)
+
public class UpsertSelectIT extends BaseClientManagedTimeIT {
http://git-wip-us.apache.org/repos/asf/phoenix/blob/e5033aec/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpsertValuesIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpsertValuesIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpsertValuesIT.java
index 043bba9..6389088 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpsertValuesIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpsertValuesIT.java
@@ -43,9 +43,8 @@ import org.apache.phoenix.util.DateUtil;
import org.apache.phoenix.util.PhoenixRuntime;
import org.apache.phoenix.util.TestUtil;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-@Category(ClientManagedTimeTest.class)
+
public class UpsertValuesIT extends BaseClientManagedTimeIT {
@Test
public void testGroupByWithLimitOverRowKey() throws Exception {
http://git-wip-us.apache.org/repos/asf/phoenix/blob/e5033aec/phoenix-core/src/it/java/org/apache/phoenix/end2end/VariableLengthPKIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/VariableLengthPKIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/VariableLengthPKIT.java
index 6800379..07d6b32 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/VariableLengthPKIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/VariableLengthPKIT.java
@@ -47,10 +47,9 @@ import org.apache.phoenix.util.DateUtil;
import org.apache.phoenix.util.PhoenixRuntime;
import org.apache.phoenix.util.PropertiesUtil;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-@Category(ClientManagedTimeTest.class)
+
public class VariableLengthPKIT extends BaseClientManagedTimeIT {
private static Format format = DateUtil.getDateParser(DateUtil.DEFAULT_DATE_FORMAT);
private static final String DS1 = "1970-01-01 00:58:00";
http://git-wip-us.apache.org/repos/asf/phoenix/blob/e5033aec/phoenix-core/src/it/java/org/apache/phoenix/end2end/ViewIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ViewIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ViewIT.java
index 63beeed..bc6f20d 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ViewIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ViewIT.java
@@ -35,9 +35,8 @@ import org.apache.phoenix.query.KeyRange;
import org.apache.phoenix.schema.ReadOnlyTableException;
import org.apache.phoenix.schema.TableNotFoundException;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-@Category(NeedsOwnMiniClusterTest.class)
+
public class ViewIT extends BaseViewIT {
@Test
http://git-wip-us.apache.org/repos/asf/phoenix/blob/e5033aec/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/BaseIndexIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/BaseIndexIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/BaseIndexIT.java
index 88c88bd..d77ee2a 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/BaseIndexIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/BaseIndexIT.java
@@ -18,11 +18,9 @@
package org.apache.phoenix.end2end.index;
import org.apache.phoenix.end2end.BaseHBaseManagedTimeIT;
-import org.apache.phoenix.end2end.HBaseManagedTimeTest;
import org.apache.phoenix.util.SchemaUtil;
-import org.junit.experimental.categories.Category;
-@Category(HBaseManagedTimeTest.class)
+
public class BaseIndexIT extends BaseHBaseManagedTimeIT {
public static final String SCHEMA_NAME = "";
public static final String DATA_TABLE_NAME = "T";
http://git-wip-us.apache.org/repos/asf/phoenix/blob/e5033aec/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/BaseMutableIndexIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/BaseMutableIndexIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/BaseMutableIndexIT.java
index f2a3578..279baa1 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/BaseMutableIndexIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/BaseMutableIndexIT.java
@@ -27,12 +27,10 @@ import java.sql.PreparedStatement;
import java.sql.SQLException;
import java.util.Properties;
-import org.apache.phoenix.end2end.HBaseManagedTimeTest;
import org.apache.phoenix.util.PropertiesUtil;
import org.apache.phoenix.util.TestUtil;
-import org.junit.experimental.categories.Category;
-@Category(HBaseManagedTimeTest.class)
+
public class BaseMutableIndexIT extends BaseIndexIT {
public BaseMutableIndexIT() {
}
http://git-wip-us.apache.org/repos/asf/phoenix/blob/e5033aec/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/DropViewIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/DropViewIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/DropViewIT.java
index 2218e0b..4451a0f 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/DropViewIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/DropViewIT.java
@@ -33,7 +33,6 @@ import org.apache.hadoop.hbase.client.HBaseAdmin;
import org.apache.hadoop.hbase.io.encoding.DataBlockEncoding;
import org.apache.hadoop.hbase.util.Bytes;
import org.apache.phoenix.end2end.BaseHBaseManagedTimeIT;
-import org.apache.phoenix.end2end.HBaseManagedTimeTest;
import org.apache.phoenix.end2end.Shadower;
import org.apache.phoenix.query.QueryServices;
import org.apache.phoenix.util.PropertiesUtil;
@@ -41,11 +40,10 @@ import org.apache.phoenix.util.ReadOnlyProps;
import org.apache.phoenix.util.SchemaUtil;
import org.junit.BeforeClass;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import com.google.common.collect.Maps;
-@Category(HBaseManagedTimeTest.class)
+
public class DropViewIT extends BaseMutableIndexIT {
private static final byte[] HBASE_NATIVE_BYTES = SchemaUtil.getTableNameAsBytes(HBASE_NATIVE_SCHEMA_NAME, HBASE_NATIVE);
private static final byte[] FAMILY_NAME = Bytes.toBytes(SchemaUtil.normalizeIdentifier("1"));
@@ -69,6 +67,7 @@ public class DropViewIT extends BaseMutableIndexIT {
admin.deleteTable(HBASE_NATIVE_BYTES);
} catch (org.apache.hadoop.hbase.TableNotFoundException e) {
}
+ @SuppressWarnings("deprecation")
HTableDescriptor descriptor = new HTableDescriptor(HBASE_NATIVE_BYTES);
HColumnDescriptor columnDescriptor = new HColumnDescriptor(FAMILY_NAME);
columnDescriptor.setKeepDeletedCells(true);
http://git-wip-us.apache.org/repos/asf/phoenix/blob/e5033aec/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/ImmutableIndexIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/ImmutableIndexIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/ImmutableIndexIT.java
index 811aee8..3be3bcf 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/ImmutableIndexIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/ImmutableIndexIT.java
@@ -34,7 +34,6 @@ import java.sql.SQLException;
import java.util.Properties;
import org.apache.phoenix.end2end.BaseHBaseManagedTimeIT;
-import org.apache.phoenix.end2end.HBaseManagedTimeTest;
import org.apache.phoenix.exception.SQLExceptionCode;
import org.apache.phoenix.jdbc.PhoenixConnection;
import org.apache.phoenix.query.QueryConstants;
@@ -42,9 +41,8 @@ import org.apache.phoenix.schema.PTableKey;
import org.apache.phoenix.util.PropertiesUtil;
import org.apache.phoenix.util.QueryUtil;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-@Category(HBaseManagedTimeTest.class)
+
public class ImmutableIndexIT extends BaseHBaseManagedTimeIT {
// Populate the test table with data.
private static void populateTestTable() throws SQLException {
http://git-wip-us.apache.org/repos/asf/phoenix/blob/e5033aec/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexMetadataIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexMetadataIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexMetadataIT.java
index fb4b827..26878f8 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexMetadataIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexMetadataIT.java
@@ -37,7 +37,6 @@ import java.util.Properties;
import org.apache.hadoop.hbase.io.ImmutableBytesWritable;
import org.apache.phoenix.end2end.BaseHBaseManagedTimeIT;
-import org.apache.phoenix.end2end.HBaseManagedTimeTest;
import org.apache.phoenix.exception.SQLExceptionCode;
import org.apache.phoenix.jdbc.PhoenixConnection;
import org.apache.phoenix.query.QueryConstants;
@@ -51,9 +50,8 @@ import org.apache.phoenix.util.SchemaUtil;
import org.apache.phoenix.util.StringUtil;
import org.apache.phoenix.util.TestUtil;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-@Category(HBaseManagedTimeTest.class)
+
public class IndexMetadataIT extends BaseHBaseManagedTimeIT {
private enum Order {ASC, DESC};
http://git-wip-us.apache.org/repos/asf/phoenix/blob/e5033aec/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexTestUtil.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexTestUtil.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexTestUtil.java
index bee67b4..825c09b 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexTestUtil.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexTestUtil.java
@@ -133,6 +133,7 @@ public class IndexTestUtil {
for (Map.Entry<byte[],List<Cell>> entry : dataMutation.getFamilyCellMap().entrySet()) {
PColumnFamily family = dataTable.getColumnFamily(entry.getKey());
for (Cell kv : entry.getValue()) {
+ @SuppressWarnings("deprecation")
byte[] cq = kv.getQualifier();
if (Bytes.compareTo(QueryConstants.EMPTY_COLUMN_BYTES, cq) != 0) {
try {
http://git-wip-us.apache.org/repos/asf/phoenix/blob/e5033aec/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/LocalIndexIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/LocalIndexIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/LocalIndexIT.java
index f03d053..b1f4a3c 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/LocalIndexIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/LocalIndexIT.java
@@ -58,9 +58,9 @@ import org.apache.phoenix.jdbc.PhoenixConnection;
import org.apache.phoenix.jdbc.PhoenixDatabaseMetaData;
import org.apache.phoenix.jdbc.PhoenixPreparedStatement;
import org.apache.phoenix.query.QueryServices;
+import org.apache.phoenix.schema.PIndexState;
import org.apache.phoenix.schema.PTable;
import org.apache.phoenix.schema.PTable.IndexType;
-import org.apache.phoenix.schema.PIndexState;
import org.apache.phoenix.schema.PTableKey;
import org.apache.phoenix.schema.PTableType;
import org.apache.phoenix.schema.TableNotFoundException;
@@ -156,9 +156,11 @@ public class LocalIndexIT extends BaseIndexIT {
HBaseAdmin admin = driver.getConnectionQueryServices(getUrl(), TestUtil.TEST_PROPERTIES).getAdmin();
HTableDescriptor htd = admin.getTableDescriptor(TableName.valueOf(MetaDataUtil.getLocalIndexTableName(DATA_TABLE_NAME)));
assertEquals(IndexRegionSplitPolicy.class.getName(), htd.getValue(HTableDescriptor.SPLIT_POLICY));
- HTable userTable = new HTable(admin.getConfiguration(),TableName.valueOf(DATA_TABLE_NAME));
- HTable indexTable = new HTable(admin.getConfiguration(),TableName.valueOf(MetaDataUtil.getLocalIndexTableName(DATA_TABLE_NAME)));
- assertArrayEquals("Both user table and index table should have same split keys.", userTable.getStartKeys(), indexTable.getStartKeys());
+ try (HTable userTable = new HTable(admin.getConfiguration(),TableName.valueOf(DATA_TABLE_NAME))) {
+ try (HTable indexTable = new HTable(admin.getConfiguration(),TableName.valueOf(MetaDataUtil.getLocalIndexTableName(DATA_TABLE_NAME)))) {
+ assertArrayEquals("Both user table and index table should have same split keys.", userTable.getStartKeys(), indexTable.getStartKeys());
+ }
+ }
}
@Test
http://git-wip-us.apache.org/repos/asf/phoenix/blob/e5033aec/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/MutableIndexFailureIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/MutableIndexFailureIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/MutableIndexFailureIT.java
index acece20..d11c059 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/MutableIndexFailureIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/MutableIndexFailureIT.java
@@ -82,6 +82,7 @@ import org.junit.experimental.categories.Category;
*
* @since 2.1
*/
+
@Category(NeedsOwnMiniClusterTest.class)
public class MutableIndexFailureIT extends BaseTest {
private static final int NUM_SLAVES = 4;
http://git-wip-us.apache.org/repos/asf/phoenix/blob/e5033aec/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/MutableIndexIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/MutableIndexIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/MutableIndexIT.java
index b4cbf9b..d3d8322 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/MutableIndexIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/MutableIndexIT.java
@@ -37,7 +37,6 @@ import org.apache.hadoop.hbase.HTableDescriptor;
import org.apache.phoenix.compile.ColumnResolver;
import org.apache.phoenix.compile.FromCompiler;
import org.apache.phoenix.end2end.BaseHBaseManagedTimeIT;
-import org.apache.phoenix.end2end.HBaseManagedTimeTest;
import org.apache.phoenix.end2end.Shadower;
import org.apache.phoenix.jdbc.PhoenixConnection;
import org.apache.phoenix.parse.NamedTableNode;
@@ -51,12 +50,11 @@ import org.apache.phoenix.util.ReadOnlyProps;
import org.apache.phoenix.util.TestUtil;
import org.junit.BeforeClass;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import com.google.common.collect.Maps;
import com.google.common.primitives.Doubles;
-@Category(HBaseManagedTimeTest.class)
+
public class MutableIndexIT extends BaseMutableIndexIT {
@BeforeClass
http://git-wip-us.apache.org/repos/asf/phoenix/blob/e5033aec/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/MutableIndexReplicationIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/MutableIndexReplicationIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/MutableIndexReplicationIT.java
index 15465d1..a4f4682 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/MutableIndexReplicationIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/MutableIndexReplicationIT.java
@@ -72,6 +72,7 @@ import com.google.common.collect.Maps;
* HBase 0.98.5
* </p>
*/
+
@Category(NeedsOwnMiniClusterTest.class)
public class MutableIndexReplicationIT extends BaseTest {
http://git-wip-us.apache.org/repos/asf/phoenix/blob/e5033aec/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/SaltedIndexIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/SaltedIndexIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/SaltedIndexIT.java
index 0279283..112e4d3 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/SaltedIndexIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/SaltedIndexIT.java
@@ -30,7 +30,6 @@ import java.util.Map;
import java.util.Properties;
import org.apache.phoenix.end2end.BaseHBaseManagedTimeIT;
-import org.apache.phoenix.end2end.HBaseManagedTimeTest;
import org.apache.phoenix.end2end.Shadower;
import org.apache.phoenix.jdbc.PhoenixConnection;
import org.apache.phoenix.query.QueryServices;
@@ -40,11 +39,10 @@ import org.apache.phoenix.util.QueryUtil;
import org.apache.phoenix.util.ReadOnlyProps;
import org.junit.BeforeClass;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import com.google.common.collect.Maps;
-@Category(HBaseManagedTimeTest.class)
+
public class SaltedIndexIT extends BaseIndexIT {
private static final int TABLE_SPLITS = 3;
private static final int INDEX_SPLITS = 4;
http://git-wip-us.apache.org/repos/asf/phoenix/blob/e5033aec/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/ViewIndexIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/ViewIndexIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/ViewIndexIT.java
index d4ceff4..da6eb16 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/ViewIndexIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/ViewIndexIT.java
@@ -27,7 +27,6 @@ import java.util.Map;
import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.client.HBaseAdmin;
-import org.apache.phoenix.end2end.HBaseManagedTimeTest;
import org.apache.phoenix.jdbc.PhoenixDatabaseMetaData;
import org.apache.phoenix.query.QueryServices;
import org.apache.phoenix.util.MetaDataUtil;
@@ -35,11 +34,10 @@ import org.apache.phoenix.util.ReadOnlyProps;
import org.apache.phoenix.util.TestUtil;
import org.junit.BeforeClass;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import com.google.common.collect.Maps;
-@Category(HBaseManagedTimeTest.class)
+
public class ViewIndexIT extends BaseIndexIT {
private String VIEW_NAME = "MY_VIEW";
http://git-wip-us.apache.org/repos/asf/phoenix/blob/e5033aec/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 a1cf5d1..06e63b2 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
@@ -32,18 +32,16 @@ import java.sql.SQLException;
import java.util.Properties;
import org.apache.phoenix.end2end.BaseClientManagedTimeIT;
-import org.apache.phoenix.end2end.ClientManagedTimeTest;
import org.apache.phoenix.util.PhoenixRuntime;
import org.apache.phoenix.util.PropertiesUtil;
import org.apache.phoenix.util.QueryUtil;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
/**
* Tests for table with transparent salting.
*/
-@Category(ClientManagedTimeTest.class)
+
public class SaltedTableIT extends BaseClientManagedTimeIT {
private static void initTableValues(byte[][] splits, long ts) throws Exception {
http://git-wip-us.apache.org/repos/asf/phoenix/blob/e5033aec/phoenix-core/src/it/java/org/apache/phoenix/end2end/salted/SaltedTableUpsertSelectIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/salted/SaltedTableUpsertSelectIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/salted/SaltedTableUpsertSelectIT.java
index 8015cbc..0a11ec7 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/salted/SaltedTableUpsertSelectIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/salted/SaltedTableUpsertSelectIT.java
@@ -32,12 +32,10 @@ import java.sql.SQLException;
import java.util.Properties;
import org.apache.phoenix.end2end.BaseHBaseManagedTimeIT;
-import org.apache.phoenix.end2end.HBaseManagedTimeTest;
import org.apache.phoenix.util.PropertiesUtil;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-@Category(HBaseManagedTimeTest.class)
+
public class SaltedTableUpsertSelectIT extends BaseHBaseManagedTimeIT {
@Test
http://git-wip-us.apache.org/repos/asf/phoenix/blob/e5033aec/phoenix-core/src/it/java/org/apache/phoenix/end2end/salted/SaltedTableVarLengthRowKeyIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/salted/SaltedTableVarLengthRowKeyIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/salted/SaltedTableVarLengthRowKeyIT.java
index db517a6..53b267c 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/salted/SaltedTableVarLengthRowKeyIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/salted/SaltedTableVarLengthRowKeyIT.java
@@ -30,12 +30,10 @@ import java.sql.ResultSet;
import java.util.Properties;
import org.apache.phoenix.end2end.BaseHBaseManagedTimeIT;
-import org.apache.phoenix.end2end.HBaseManagedTimeTest;
import org.apache.phoenix.util.PropertiesUtil;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-@Category(HBaseManagedTimeTest.class)
+
public class SaltedTableVarLengthRowKeyIT extends BaseHBaseManagedTimeIT {
private static void initTableValues() throws Exception {
http://git-wip-us.apache.org/repos/asf/phoenix/blob/e5033aec/phoenix-core/src/it/java/org/apache/phoenix/hbase/index/FailForUnsupportedHBaseVersionsIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/hbase/index/FailForUnsupportedHBaseVersionsIT.java b/phoenix-core/src/it/java/org/apache/phoenix/hbase/index/FailForUnsupportedHBaseVersionsIT.java
index 1d0dbfd..9c4b57f 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/hbase/index/FailForUnsupportedHBaseVersionsIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/hbase/index/FailForUnsupportedHBaseVersionsIT.java
@@ -122,6 +122,7 @@ public class FailForUnsupportedHBaseVersionsIT {
try {
// setup the primary table
+ @SuppressWarnings("deprecation")
HTableDescriptor desc = new HTableDescriptor(
"testDoesNotStartRegionServerForUnsupportedCompressionAndVersion");
byte[] family = Bytes.toBytes("f");
http://git-wip-us.apache.org/repos/asf/phoenix/blob/e5033aec/phoenix-core/src/it/java/org/apache/phoenix/hbase/index/covered/EndToEndCoveredColumnsIndexBuilderIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/hbase/index/covered/EndToEndCoveredColumnsIndexBuilderIT.java b/phoenix-core/src/it/java/org/apache/phoenix/hbase/index/covered/EndToEndCoveredColumnsIndexBuilderIT.java
index f635dff..84c6827 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/hbase/index/covered/EndToEndCoveredColumnsIndexBuilderIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/hbase/index/covered/EndToEndCoveredColumnsIndexBuilderIT.java
@@ -295,6 +295,7 @@ public class EndToEndCoveredColumnsIndexBuilderIT {
*/
private TestState setupTest(String tableName) throws IOException {
byte[] tableNameBytes = Bytes.toBytes(tableName);
+ @SuppressWarnings("deprecation")
HTableDescriptor desc = new HTableDescriptor(tableNameBytes);
desc.addFamily(FAM1);
// add the necessary simple options to create the builder
http://git-wip-us.apache.org/repos/asf/phoenix/blob/e5033aec/phoenix-core/src/it/java/org/apache/phoenix/hbase/index/covered/example/EndToEndCoveredIndexingIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/hbase/index/covered/example/EndToEndCoveredIndexingIT.java b/phoenix-core/src/it/java/org/apache/phoenix/hbase/index/covered/example/EndToEndCoveredIndexingIT.java
index 5196031..88bcb2a 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/hbase/index/covered/example/EndToEndCoveredIndexingIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/hbase/index/covered/example/EndToEndCoveredIndexingIT.java
@@ -857,6 +857,7 @@ public class EndToEndCoveredIndexingIT {
// setup the primary table
String indexedTableName = Bytes.toString(TestTable.getTableName());
+ @SuppressWarnings("deprecation")
HTableDescriptor pTable = new HTableDescriptor(indexedTableName);
pTable.addFamily(new HColumnDescriptor(FAM));
pTable.addFamily(new HColumnDescriptor(FAM2));
http://git-wip-us.apache.org/repos/asf/phoenix/blob/e5033aec/phoenix-core/src/it/java/org/apache/phoenix/hbase/index/covered/example/EndtoEndIndexingWithCompressionIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/hbase/index/covered/example/EndtoEndIndexingWithCompressionIT.java b/phoenix-core/src/it/java/org/apache/phoenix/hbase/index/covered/example/EndtoEndIndexingWithCompressionIT.java
index 38aeb88..016c59e 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/hbase/index/covered/example/EndtoEndIndexingWithCompressionIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/hbase/index/covered/example/EndtoEndIndexingWithCompressionIT.java
@@ -23,17 +23,15 @@ import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hbase.HConstants;
import org.apache.hadoop.hbase.regionserver.wal.IndexedWALEditCodec;
import org.apache.hadoop.hbase.regionserver.wal.WALCellCodec;
-import org.apache.phoenix.end2end.NeedsOwnMiniClusterTest;
import org.apache.phoenix.hbase.index.IndexTestingUtils;
import org.apache.phoenix.hbase.index.Indexer;
import org.junit.BeforeClass;
-import org.junit.experimental.categories.Category;
/**
* Test secondary indexing from an end-to-end perspective (client to server to index table).
*/
-@Category(NeedsOwnMiniClusterTest.class)
+
public class EndtoEndIndexingWithCompressionIT extends EndToEndCoveredIndexingIT {
@BeforeClass
http://git-wip-us.apache.org/repos/asf/phoenix/blob/e5033aec/phoenix-core/src/it/java/org/apache/phoenix/hbase/index/covered/example/FailWithoutRetriesIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/hbase/index/covered/example/FailWithoutRetriesIT.java b/phoenix-core/src/it/java/org/apache/phoenix/hbase/index/covered/example/FailWithoutRetriesIT.java
index 6a79e31..dbe78e7 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/hbase/index/covered/example/FailWithoutRetriesIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/hbase/index/covered/example/FailWithoutRetriesIT.java
@@ -49,6 +49,7 @@ import org.junit.Rule;
import org.junit.Test;
import org.junit.experimental.categories.Category;
+
/**
* If {@link DoNotRetryIOException} is not subclassed correctly (with the {@link String}
* constructor), {@link MultiResponse#readFields(java.io.DataInput)} will not correctly deserialize
@@ -121,6 +122,7 @@ public class FailWithoutRetriesIT {
// setup the primary table
String primaryTable = Bytes.toString(table.getTableName());
+ @SuppressWarnings("deprecation")
HTableDescriptor pTable = new HTableDescriptor(primaryTable);
pTable.addFamily(new HColumnDescriptor(family));
// override the codec so we can use our test one
http://git-wip-us.apache.org/repos/asf/phoenix/blob/e5033aec/phoenix-core/src/it/java/org/apache/phoenix/trace/BaseTracingTestIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/trace/BaseTracingTestIT.java b/phoenix-core/src/it/java/org/apache/phoenix/trace/BaseTracingTestIT.java
index 99c8bc3..96e1646 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/trace/BaseTracingTestIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/trace/BaseTracingTestIT.java
@@ -37,7 +37,6 @@ import org.apache.hadoop.metrics2.impl.ExposedMetricCounterLong;
import org.apache.hadoop.metrics2.impl.ExposedMetricsRecordImpl;
import org.apache.hadoop.metrics2.lib.ExposedMetricsInfoImpl;
import org.apache.phoenix.end2end.BaseHBaseManagedTimeIT;
-import org.apache.phoenix.end2end.HBaseManagedTimeTest;
import org.apache.phoenix.metrics.MetricInfo;
import org.apache.phoenix.query.QueryServicesOptions;
import org.apache.phoenix.schema.TableNotFoundException;
@@ -46,13 +45,12 @@ import org.apache.phoenix.trace.util.Tracing.Frequency;
import org.apache.phoenix.util.PhoenixRuntime;
import org.apache.phoenix.util.PropertiesUtil;
import org.junit.Before;
-import org.junit.experimental.categories.Category;
/**
* Base test for tracing tests - helps manage getting tracing/non-tracing
* connections, as well as any supporting utils.
*/
-@Category(HBaseManagedTimeTest.class)
+
public class BaseTracingTestIT extends BaseHBaseManagedTimeIT {
@Before
public void resetTracingTableIfExists() throws Exception {
http://git-wip-us.apache.org/repos/asf/phoenix/blob/e5033aec/phoenix-core/src/it/java/org/apache/phoenix/trace/PhoenixTraceReaderIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/trace/PhoenixTraceReaderIT.java b/phoenix-core/src/it/java/org/apache/phoenix/trace/PhoenixTraceReaderIT.java
index d75e281..1308c13 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/trace/PhoenixTraceReaderIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/trace/PhoenixTraceReaderIT.java
@@ -17,32 +17,35 @@
*/
package org.apache.phoenix.trace;
+import static org.apache.phoenix.util.TestUtil.TEST_PROPERTIES;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Properties;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.metrics2.AbstractMetric;
import org.apache.hadoop.metrics2.MetricsRecord;
import org.apache.hadoop.metrics2.MetricsTag;
-import org.apache.phoenix.end2end.HBaseManagedTimeTest;
import org.apache.phoenix.metrics.MetricInfo;
import org.apache.phoenix.trace.TraceReader.SpanInfo;
import org.apache.phoenix.trace.TraceReader.TraceHolder;
import org.cloudera.htrace.Span;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import java.sql.Connection;
-import java.sql.DriverManager;
-import java.util.*;
-
-import static org.apache.phoenix.util.TestUtil.TEST_PROPERTIES;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
/**
* Test that the {@link TraceReader} will correctly read traces written by the
* {@link org.apache.phoenix.trace.PhoenixMetricsSink}
*/
-@Category(HBaseManagedTimeTest.class)
+
public class PhoenixTraceReaderIT extends BaseTracingTestIT {
private static final Log LOG = LogFactory.getLog(PhoenixTraceReaderIT.class);
http://git-wip-us.apache.org/repos/asf/phoenix/blob/e5033aec/phoenix-core/src/it/java/org/apache/phoenix/trace/PhoenixTracingEndToEndIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/trace/PhoenixTracingEndToEndIT.java b/phoenix-core/src/it/java/org/apache/phoenix/trace/PhoenixTracingEndToEndIT.java
index f4cf0d1..201de38 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/trace/PhoenixTracingEndToEndIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/trace/PhoenixTracingEndToEndIT.java
@@ -17,38 +17,41 @@
*/
package org.apache.phoenix.trace;
-import com.google.common.collect.ImmutableMap;
+import static org.apache.phoenix.util.PhoenixRuntime.TENANT_ID_ATTRIB;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.Collection;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.metrics2.MetricsSource;
import org.apache.phoenix.coprocessor.BaseScannerRegionObserver;
-import org.apache.phoenix.end2end.HBaseManagedTimeTest;
import org.apache.phoenix.metrics.Metrics;
import org.apache.phoenix.query.QueryServicesOptions;
import org.apache.phoenix.trace.TraceReader.SpanInfo;
import org.apache.phoenix.trace.TraceReader.TraceHolder;
-import org.cloudera.htrace.*;
+import org.cloudera.htrace.Sampler;
+import org.cloudera.htrace.Span;
+import org.cloudera.htrace.SpanReceiver;
+import org.cloudera.htrace.Trace;
+import org.cloudera.htrace.TraceScope;
import org.junit.After;
import org.junit.BeforeClass;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.util.Collection;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.TimeUnit;
-
-import static org.apache.phoenix.util.PhoenixRuntime.TENANT_ID_ATTRIB;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import com.google.common.collect.ImmutableMap;
/**
* Test that the logging sink stores the expected metrics/stats
*/
-@Category(HBaseManagedTimeTest.class)
+
public class PhoenixTracingEndToEndIT extends BaseTracingTestIT {
private static final Log LOG = LogFactory.getLog(PhoenixTracingEndToEndIT.class);
http://git-wip-us.apache.org/repos/asf/phoenix/blob/e5033aec/phoenix-core/src/test/java/org/apache/phoenix/hbase/index/write/TestWALRecoveryCaching.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/test/java/org/apache/phoenix/hbase/index/write/TestWALRecoveryCaching.java b/phoenix-core/src/test/java/org/apache/phoenix/hbase/index/write/TestWALRecoveryCaching.java
index 3c8a6df..375b754 100644
--- a/phoenix-core/src/test/java/org/apache/phoenix/hbase/index/write/TestWALRecoveryCaching.java
+++ b/phoenix-core/src/test/java/org/apache/phoenix/hbase/index/write/TestWALRecoveryCaching.java
@@ -56,7 +56,6 @@ import org.apache.hadoop.hbase.regionserver.wal.HLogKey;
import org.apache.hadoop.hbase.regionserver.wal.WALEdit;
import org.apache.hadoop.hbase.util.Bytes;
import org.apache.hadoop.hbase.util.JVMClusterUtil.RegionServerThread;
-import org.apache.phoenix.end2end.NeedsOwnMiniClusterTest;
import org.apache.phoenix.hbase.index.IndexTestingUtils;
import org.apache.phoenix.hbase.index.Indexer;
import org.apache.phoenix.hbase.index.TableName;
@@ -72,7 +71,6 @@ import org.junit.Assert;
import org.junit.Ignore;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import com.google.common.collect.Multimap;
@@ -81,7 +79,7 @@ import com.google.common.collect.Multimap;
* region was present on the same server, we have to make a best effort to not kill the server for
* not succeeding on index writes while the index region is coming up.
*/
-@Category(NeedsOwnMiniClusterTest.class)
+
public class TestWALRecoveryCaching {
private static final Log LOG = LogFactory.getLog(TestWALRecoveryCaching.class);
http://git-wip-us.apache.org/repos/asf/phoenix/blob/e5033aec/phoenix-core/src/test/java/org/apache/phoenix/iterate/AggregateResultScannerTest.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/test/java/org/apache/phoenix/iterate/AggregateResultScannerTest.java b/phoenix-core/src/test/java/org/apache/phoenix/iterate/AggregateResultScannerTest.java
index 3197676..1c3e650 100644
--- a/phoenix-core/src/test/java/org/apache/phoenix/iterate/AggregateResultScannerTest.java
+++ b/phoenix-core/src/test/java/org/apache/phoenix/iterate/AggregateResultScannerTest.java
@@ -23,9 +23,6 @@ import static org.apache.phoenix.query.QueryConstants.SINGLE_COLUMN_FAMILY_NAME;
import static org.apache.phoenix.query.QueryConstants.SINGLE_COLUMN_NAME;
import static org.apache.phoenix.util.TestUtil.TEST_PROPERTIES;
-import java.io.DataInput;
-import java.io.DataOutput;
-import java.io.IOException;
import java.sql.DriverManager;
import java.sql.SQLException;
import java.util.ArrayList;
http://git-wip-us.apache.org/repos/asf/phoenix/blob/e5033aec/phoenix-core/src/test/java/org/apache/phoenix/iterate/SpooledTmpFileDeleteTest.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/test/java/org/apache/phoenix/iterate/SpooledTmpFileDeleteTest.java b/phoenix-core/src/test/java/org/apache/phoenix/iterate/SpooledTmpFileDeleteTest.java
deleted file mode 100644
index 4a205f9..0000000
--- a/phoenix-core/src/test/java/org/apache/phoenix/iterate/SpooledTmpFileDeleteTest.java
+++ /dev/null
@@ -1,127 +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.iterate;
-
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.assertFalse;
-
-import java.io.File;
-import java.io.FileFilter;
-import java.sql.Connection;
-import java.sql.DriverManager;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Statement;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Properties;
-
-import org.apache.phoenix.end2end.BaseClientManagedTimeIT;
-import org.apache.phoenix.end2end.ClientManagedTimeTest;
-import org.apache.phoenix.query.QueryServices;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-
-@Category(ClientManagedTimeTest.class)
-public class SpooledTmpFileDeleteTest extends BaseClientManagedTimeIT {
- private Connection conn = null;
- private Properties props = null;
-
- @Before
- public void setup() throws SQLException {
- props = new Properties();
- props.put(QueryServices.SPOOL_DIRECTORY, "/tmp");
- props.setProperty(QueryServices.SPOOL_THRESHOLD_BYTES_ATTRIB, Integer.toString(1));
- conn = DriverManager.getConnection(getUrl(), props);
- Statement stmt = conn.createStatement();
- stmt.execute("CREATE TABLE test (ID varchar NOT NULL PRIMARY KEY) SPLIT ON ('EA','EZ')");
- stmt.execute("UPSERT INTO test VALUES ('AA')");
- stmt.execute("UPSERT INTO test VALUES ('EB')");
- stmt.execute("UPSERT INTO test VALUES ('FA')");
- stmt.close();
- conn.commit();
- }
-
- @Test
- public void testDeleteAllSpooledTmpFiles() throws SQLException, Throwable {
- File dir = new File("/tmp");
- File[] files = null;
-
- class FilenameFilter implements FileFilter {
- @Override
- public boolean accept(File dir) {
- return dir.getName().toLowerCase().endsWith(".bin") &&
- dir.getName().startsWith("ResultSpooler");
- }
- }
-
- FilenameFilter fnameFilter = new FilenameFilter();
-
- // clean up first
- files = dir.listFiles(fnameFilter);
- for (File file : files) {
- file.delete();
- }
-
- String query = "select * from TEST";
- Statement statement = conn.createStatement();
- ResultSet rs = statement.executeQuery(query);
- assertTrue(rs.next());
- files = dir.listFiles(fnameFilter);
- assertTrue(files.length > 0);
- List<String> fileNames = new ArrayList<String>();
- for (File file : files) {
- fileNames.add(file.getName());
- }
-
- String preparedQuery = "select * from test where id = ?";
- PreparedStatement pstmt = conn.prepareStatement(preparedQuery);
- pstmt.setString(1, "EB");
- ResultSet prs = pstmt.executeQuery(preparedQuery);
- assertTrue(prs.next());
- files = dir.listFiles(fnameFilter);
- assertTrue(files.length > 0);
- for (File file : files) {
- fileNames.add(file.getName());
- }
-
- Connection conn2 = DriverManager.getConnection(getUrl(), props);
- String query2 = "select * from TEST";
- Statement statement2 = conn2.createStatement();
- ResultSet rs2 = statement2.executeQuery(query2);
- assertTrue(rs2.next());
- files = dir.listFiles(fnameFilter);
- assertTrue(files.length > 0);
-
- String preparedQuery2 = "select * from test where id = ?";
- PreparedStatement pstmt2 = conn2.prepareStatement(preparedQuery2);
- pstmt2.setString(1, "EB");
- ResultSet prs2 = pstmt2.executeQuery(preparedQuery2);
- assertTrue(prs2.next());
- files = dir.listFiles(fnameFilter);
- assertTrue(files.length > 0);
-
- conn.close();
-
- files = dir.listFiles(fnameFilter);
-
- for (File file : files) {
- assertFalse(fileNames.contains(file.getName()));
- }
- conn2.close();
- files = dir.listFiles(fnameFilter);
- assertTrue(files.length == 0);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/phoenix/blob/e5033aec/phoenix-core/src/test/java/org/apache/phoenix/trace/TraceMetricsSourceTest.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/test/java/org/apache/phoenix/trace/TraceMetricsSourceTest.java b/phoenix-core/src/test/java/org/apache/phoenix/trace/TraceMetricsSourceTest.java
index 5cb34b8..4622959 100644
--- a/phoenix-core/src/test/java/org/apache/phoenix/trace/TraceMetricsSourceTest.java
+++ b/phoenix-core/src/test/java/org/apache/phoenix/trace/TraceMetricsSourceTest.java
@@ -17,6 +17,8 @@
*/
package org.apache.phoenix.trace;
+import static org.junit.Assert.assertTrue;
+
import org.apache.hadoop.hbase.util.Bytes;
import org.apache.hadoop.metrics2.MetricsCollector;
import org.apache.hadoop.metrics2.MetricsRecordBuilder;
@@ -28,9 +30,6 @@ import org.junit.BeforeClass;
import org.junit.Test;
import org.mockito.Mockito;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
/**
* Test that the @{link TraceMetricSource} correctly handles different kinds of traces
*/
http://git-wip-us.apache.org/repos/asf/phoenix/blob/e5033aec/phoenix-core/src/test/java/org/apache/phoenix/util/QueryUtilTest.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/test/java/org/apache/phoenix/util/QueryUtilTest.java b/phoenix-core/src/test/java/org/apache/phoenix/util/QueryUtilTest.java
index 48929ed..182eb56 100644
--- a/phoenix-core/src/test/java/org/apache/phoenix/util/QueryUtilTest.java
+++ b/phoenix-core/src/test/java/org/apache/phoenix/util/QueryUtilTest.java
@@ -21,7 +21,6 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
-import java.sql.Connection;
import java.sql.Types;
import java.util.Properties;
@@ -31,8 +30,6 @@ import org.junit.Test;
import com.google.common.collect.ImmutableList;
-import javax.management.Query;
-
public class QueryUtilTest {
private static final ColumnInfo ID_COLUMN = new ColumnInfo("ID", Types.BIGINT);
http://git-wip-us.apache.org/repos/asf/phoenix/blob/e5033aec/phoenix-flume/src/it/java/org/apache/phoenix/flume/PhoenixSinkIT.java
----------------------------------------------------------------------
diff --git a/phoenix-flume/src/it/java/org/apache/phoenix/flume/PhoenixSinkIT.java b/phoenix-flume/src/it/java/org/apache/phoenix/flume/PhoenixSinkIT.java
index a4b3655..7d4f7af 100644
--- a/phoenix-flume/src/it/java/org/apache/phoenix/flume/PhoenixSinkIT.java
+++ b/phoenix-flume/src/it/java/org/apache/phoenix/flume/PhoenixSinkIT.java
@@ -30,15 +30,13 @@ import org.apache.flume.lifecycle.LifecycleState;
import org.apache.flume.sink.DefaultSinkFactory;
import org.apache.hadoop.hbase.client.HBaseAdmin;
import org.apache.phoenix.end2end.BaseHBaseManagedTimeIT;
-import org.apache.phoenix.end2end.HBaseManagedTimeTest;
import org.apache.phoenix.flume.serializer.EventSerializers;
import org.apache.phoenix.flume.sink.PhoenixSink;
import org.apache.phoenix.util.TestUtil;
import org.junit.Assert;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-@Category(HBaseManagedTimeTest.class)
+
public class PhoenixSinkIT extends BaseHBaseManagedTimeIT {
private Context sinkContext;
http://git-wip-us.apache.org/repos/asf/phoenix/blob/e5033aec/phoenix-flume/src/it/java/org/apache/phoenix/flume/RegexEventSerializerIT.java
----------------------------------------------------------------------
diff --git a/phoenix-flume/src/it/java/org/apache/phoenix/flume/RegexEventSerializerIT.java b/phoenix-flume/src/it/java/org/apache/phoenix/flume/RegexEventSerializerIT.java
index f86f039..0952747 100644
--- a/phoenix-flume/src/it/java/org/apache/phoenix/flume/RegexEventSerializerIT.java
+++ b/phoenix-flume/src/it/java/org/apache/phoenix/flume/RegexEventSerializerIT.java
@@ -41,18 +41,16 @@ import org.apache.flume.event.EventBuilder;
import org.apache.flume.lifecycle.LifecycleState;
import org.apache.hadoop.hbase.util.Bytes;
import org.apache.phoenix.end2end.BaseHBaseManagedTimeIT;
-import org.apache.phoenix.end2end.HBaseManagedTimeTest;
import org.apache.phoenix.flume.serializer.EventSerializers;
import org.apache.phoenix.flume.sink.PhoenixSink;
import org.apache.phoenix.util.PropertiesUtil;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import com.google.common.base.Preconditions;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
-@Category(HBaseManagedTimeTest.class)
+
public class RegexEventSerializerIT extends BaseHBaseManagedTimeIT {
private Context sinkContext;
http://git-wip-us.apache.org/repos/asf/phoenix/blob/e5033aec/phoenix-pig/src/it/java/org/apache/phoenix/pig/PhoenixHBaseStorerIT.java
----------------------------------------------------------------------
diff --git a/phoenix-pig/src/it/java/org/apache/phoenix/pig/PhoenixHBaseStorerIT.java b/phoenix-pig/src/it/java/org/apache/phoenix/pig/PhoenixHBaseStorerIT.java
index e0021d9..67abf62 100644
--- a/phoenix-pig/src/it/java/org/apache/phoenix/pig/PhoenixHBaseStorerIT.java
+++ b/phoenix-pig/src/it/java/org/apache/phoenix/pig/PhoenixHBaseStorerIT.java
@@ -21,9 +21,9 @@ package org.apache.phoenix.pig;
import static org.apache.phoenix.util.PhoenixRuntime.JDBC_PROTOCOL_SEPARATOR;
import static org.apache.phoenix.util.TestUtil.LOCALHOST;
+import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.assertArrayEquals;
import java.sql.Connection;
import java.sql.DriverManager;
@@ -33,7 +33,6 @@ import java.util.Collection;
import org.apache.hadoop.hbase.util.Bytes;
import org.apache.phoenix.end2end.BaseHBaseManagedTimeIT;
-import org.apache.phoenix.end2end.HBaseManagedTimeTest;
import org.apache.pig.ExecType;
import org.apache.pig.PigServer;
import org.apache.pig.backend.executionengine.ExecJob.JOB_STATUS;
@@ -48,11 +47,10 @@ import org.junit.AfterClass;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import com.google.common.collect.Lists;
-@Category(HBaseManagedTimeTest.class)
+
public class PhoenixHBaseStorerIT extends BaseHBaseManagedTimeIT {
private static TupleFactory tupleFactory;
http://git-wip-us.apache.org/repos/asf/phoenix/blob/e5033aec/phoenix-pig/src/it/java/org/apache/phoenix/pig/PhoenixPigConfigurationIT.java
----------------------------------------------------------------------
diff --git a/phoenix-pig/src/it/java/org/apache/phoenix/pig/PhoenixPigConfigurationIT.java b/phoenix-pig/src/it/java/org/apache/phoenix/pig/PhoenixPigConfigurationIT.java
index a6f6efd..efbfbf8 100644
--- a/phoenix-pig/src/it/java/org/apache/phoenix/pig/PhoenixPigConfigurationIT.java
+++ b/phoenix-pig/src/it/java/org/apache/phoenix/pig/PhoenixPigConfigurationIT.java
@@ -30,14 +30,12 @@ import java.util.Properties;
import org.apache.hadoop.conf.Configuration;
import org.apache.phoenix.end2end.BaseHBaseManagedTimeIT;
-import org.apache.phoenix.end2end.HBaseManagedTimeTest;
import org.apache.phoenix.util.PropertiesUtil;
import org.apache.phoenix.util.SchemaUtil;
import org.apache.phoenix.util.TestUtil;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-@Category(HBaseManagedTimeTest.class)
+
public class PhoenixPigConfigurationIT extends BaseHBaseManagedTimeIT {
private static final String zkQuorum = TestUtil.LOCALHOST + JDBC_PROTOCOL_TERMINATOR + PHOENIX_TEST_DRIVER_URL_PARAM;
http://git-wip-us.apache.org/repos/asf/phoenix/blob/e5033aec/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 9d39f1e..a8d1f10 100644
--- a/pom.xml
+++ b/pom.xml
@@ -106,16 +106,16 @@
<!-- Test Dependencies -->
<mockito-all.version>1.8.5</mockito-all.version>
- <junit.version>4.11</junit.version>
+ <junit.version>4.12-beta-3</junit.version>
<!-- Plugin versions -->
- <maven-eclipse-plugin.version>2.8</maven-eclipse-plugin.version>
- <maven-build-helper-plugin.version>1.7</maven-build-helper-plugin.version>
- <maven-surefire-plugin.version>2.16</maven-surefire-plugin.version>
- <maven-failsafe-plugin.version>2.17</maven-failsafe-plugin.version>
+ <maven-eclipse-plugin.version>2.9</maven-eclipse-plugin.version>
+ <maven-build-helper-plugin.version>1.9.1</maven-build-helper-plugin.version>
+ <maven-surefire-plugin.version>2.18</maven-surefire-plugin.version>
+ <maven-failsafe-plugin.version>2.18</maven-failsafe-plugin.version>
<maven-dependency-plugin.version>2.1</maven-dependency-plugin.version>
- <maven.assembly.version>2.4</maven.assembly.version>
+ <maven.assembly.version>2.5.2</maven.assembly.version>
<maven.rat.version>0.8</maven.rat.version>
<!-- Plugin options -->