[4/6] phoenix git commit: PHOENIX-3290 Move and/or combine as many NeedsOwnCluster tests to bring down test run time

2016-09-22 Thread jamestaylor
PHOENIX-3290 Move and/or combine as many NeedsOwnCluster tests to bring down 
test run time


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

Branch: refs/heads/4.x-HBase-0.98
Commit: 29c61bb8402bf0f87941dfc1cb56802e5e2c00ba
Parents: 3b830a8
Author: James Taylor 
Authored: Tue Sep 20 18:39:05 2016 -0700
Committer: James Taylor 
Committed: Wed Sep 21 22:54:30 2016 -0700

--
 .../StatisticsCollectionRunTrackerIT.java   |  27 +-
 .../BaseOwnClusterClientManagedTimeIT.java  |  29 --
 .../BaseOwnClusterHBaseManagedTimeIT.java   |  29 --
 .../phoenix/end2end/BaseOwnClusterIT.java   |   7 +
 .../end2end/BaseTenantSpecificTablesIT.java |  87 +++---
 .../org/apache/phoenix/end2end/BaseViewIT.java  |  81 ++---
 .../end2end/CountDistinctCompressionIT.java |   2 +-
 .../phoenix/end2end/CsvBulkLoadToolIT.java  |   2 +-
 .../apache/phoenix/end2end/IndexExtendedIT.java |   2 +-
 .../org/apache/phoenix/end2end/KeyOnlyIT.java   | 127 +++-
 .../phoenix/end2end/MultiCfQueryExecIT.java | 306 ---
 .../phoenix/end2end/ParallelIteratorsIT.java| 112 +++
 .../phoenix/end2end/ParallelStatsEnabledIT.java |  16 +-
 .../apache/phoenix/end2end/QueryTimeoutIT.java  |   2 +-
 .../phoenix/end2end/QueryWithLimitIT.java   |  10 +-
 .../phoenix/end2end/QueryWithOffsetIT.java  |  79 ++---
 .../apache/phoenix/end2end/RenewLeaseIT.java|   2 +-
 .../phoenix/end2end/SpillableGroupByIT.java | 127 
 .../end2end/StatsCollectionDisabledIT.java  |  79 -
 .../end2end/StatsCollectorAbstractIT.java   |  77 -
 .../phoenix/end2end/StatsCollectorIT.java   | 161 +-
 .../StatsCollectorWithSplitsAndMultiCFIT.java   | 186 ---
 .../end2end/TenantSpecificTablesDDLIT.java  | 272 -
 .../end2end/TenantSpecificTablesDMLIT.java  | 269 ++--
 .../phoenix/end2end/TransactionalViewIT.java|  48 ++-
 .../org/apache/phoenix/end2end/UpgradeIT.java   | 104 ---
 .../phoenix/end2end/UserDefinedFunctionsIT.java |   7 +-
 .../java/org/apache/phoenix/end2end/ViewIT.java | 249 ---
 .../index/ImmutableIndexWithStatsIT.java|  26 +-
 .../end2end/index/MutableIndexFailureIT.java|   4 +-
 .../end2end/index/ReadOnlyIndexFailureIT.java   |   4 +-
 .../end2end/index/txn/TxWriteFailureIT.java |   4 +-
 .../apache/phoenix/execute/PartialCommitIT.java |   5 +
 .../RoundRobinResultIteratorWithStatsIT.java|   4 +-
 .../phoenix/monitoring/PhoenixMetricsIT.java|   4 +-
 .../apache/phoenix/rpc/PhoenixClientRpcIT.java  |   4 +-
 .../apache/phoenix/rpc/PhoenixServerRpcIT.java  |   4 +-
 .../org/apache/phoenix/util/MetaDataUtil.java   |   4 +
 .../java/org/apache/phoenix/query/BaseTest.java |   4 -
 .../java/org/apache/phoenix/util/TestUtil.java  |  17 +-
 pom.xml |   3 -
 41 files changed, 1108 insertions(+), 1478 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/29c61bb8/phoenix-core/src/it/java/org/apache/phoenix/coprocessor/StatisticsCollectionRunTrackerIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/coprocessor/StatisticsCollectionRunTrackerIT.java
 
b/phoenix-core/src/it/java/org/apache/phoenix/coprocessor/StatisticsCollectionRunTrackerIT.java
index c64038e..2d57592 100644
--- 
a/phoenix-core/src/it/java/org/apache/phoenix/coprocessor/StatisticsCollectionRunTrackerIT.java
+++ 
b/phoenix-core/src/it/java/org/apache/phoenix/coprocessor/StatisticsCollectionRunTrackerIT.java
@@ -32,18 +32,26 @@ import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.hbase.HRegionInfo;
 import org.apache.hadoop.hbase.client.HBaseAdmin;
 import org.apache.hadoop.hbase.util.Bytes;
-import org.apache.phoenix.end2end.BaseOwnClusterHBaseManagedTimeIT;
+import org.apache.phoenix.end2end.ParallelStatsEnabledIT;
 import org.apache.phoenix.jdbc.PhoenixConnection;
 import org.apache.phoenix.query.QueryServices;
 import org.apache.phoenix.schema.stats.StatisticsCollectionRunTracker;
 import org.apache.phoenix.util.ReadOnlyProps;
+import org.apache.phoenix.util.SchemaUtil;
+import org.apache.phoenix.util.TestUtil;
 import org.junit.Assert;
+import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
 import com.google.common.collect.Maps;
 
-public class StatisticsCollectionRunTrackerIT extends 
BaseOwnClusterHBaseManagedTimeIT {
+public class StatisticsCollectionRunTrackerIT extends ParallelStatsEnabledIT {
+private static final 

[4/6] phoenix git commit: PHOENIX-3290 Move and/or combine as many NeedsOwnCluster tests to bring down test run time

2016-09-21 Thread jamestaylor
PHOENIX-3290 Move and/or combine as many NeedsOwnCluster tests to bring down 
test run time


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

Branch: refs/heads/4.x-HBase-1.1
Commit: a92f304bcd33b96949815d58d456f790637ea4cf
Parents: d7c436b
Author: James Taylor 
Authored: Tue Sep 20 18:39:05 2016 -0700
Committer: James Taylor 
Committed: Wed Sep 21 22:39:05 2016 -0700

--
 .../StatisticsCollectionRunTrackerIT.java   |  25 +-
 .../BaseOwnClusterClientManagedTimeIT.java  |  29 --
 .../BaseOwnClusterHBaseManagedTimeIT.java   |  29 --
 .../phoenix/end2end/BaseOwnClusterIT.java   |   7 +
 .../end2end/BaseTenantSpecificTablesIT.java |  87 +++---
 .../org/apache/phoenix/end2end/BaseViewIT.java  |  81 ++---
 .../end2end/CountDistinctCompressionIT.java |   2 +-
 .../phoenix/end2end/CsvBulkLoadToolIT.java  |   2 +-
 .../apache/phoenix/end2end/IndexExtendedIT.java |   2 +-
 .../org/apache/phoenix/end2end/KeyOnlyIT.java   | 127 +++-
 .../phoenix/end2end/MultiCfQueryExecIT.java | 306 ---
 .../phoenix/end2end/ParallelIteratorsIT.java| 112 +++
 .../phoenix/end2end/ParallelStatsEnabledIT.java |  16 +-
 .../apache/phoenix/end2end/QueryTimeoutIT.java  |   2 +-
 .../phoenix/end2end/QueryWithLimitIT.java   |  10 +-
 .../phoenix/end2end/QueryWithOffsetIT.java  |  78 ++---
 .../apache/phoenix/end2end/RenewLeaseIT.java|   2 +-
 .../phoenix/end2end/SpillableGroupByIT.java | 127 
 .../end2end/StatsCollectionDisabledIT.java  |  79 -
 .../end2end/StatsCollectorAbstractIT.java   |  77 -
 .../phoenix/end2end/StatsCollectorIT.java   | 161 +-
 .../StatsCollectorWithSplitsAndMultiCFIT.java   | 186 ---
 .../end2end/TenantSpecificTablesDDLIT.java  | 272 -
 .../end2end/TenantSpecificTablesDMLIT.java  | 269 ++--
 .../phoenix/end2end/TransactionalViewIT.java|  48 ++-
 .../org/apache/phoenix/end2end/UpgradeIT.java   | 104 ---
 .../phoenix/end2end/UserDefinedFunctionsIT.java |   7 +-
 .../java/org/apache/phoenix/end2end/ViewIT.java | 249 ---
 .../index/ImmutableIndexWithStatsIT.java|  26 +-
 .../end2end/index/MutableIndexFailureIT.java|   4 +-
 .../end2end/index/ReadOnlyIndexFailureIT.java   |   4 +-
 .../end2end/index/txn/TxWriteFailureIT.java |   4 +-
 .../apache/phoenix/execute/PartialCommitIT.java |   5 +
 .../RoundRobinResultIteratorWithStatsIT.java|   4 +-
 .../phoenix/monitoring/PhoenixMetricsIT.java|   4 +-
 .../apache/phoenix/rpc/PhoenixClientRpcIT.java  |   4 +-
 .../apache/phoenix/rpc/PhoenixServerRpcIT.java  |   4 +-
 .../org/apache/phoenix/util/MetaDataUtil.java   |   4 +
 .../java/org/apache/phoenix/query/BaseTest.java |   4 -
 .../java/org/apache/phoenix/util/TestUtil.java  |  17 +-
 pom.xml |   3 -
 41 files changed, 1105 insertions(+), 1478 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/a92f304b/phoenix-core/src/it/java/org/apache/phoenix/coprocessor/StatisticsCollectionRunTrackerIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/coprocessor/StatisticsCollectionRunTrackerIT.java
 
b/phoenix-core/src/it/java/org/apache/phoenix/coprocessor/StatisticsCollectionRunTrackerIT.java
index bf567f0..bd88922 100644
--- 
a/phoenix-core/src/it/java/org/apache/phoenix/coprocessor/StatisticsCollectionRunTrackerIT.java
+++ 
b/phoenix-core/src/it/java/org/apache/phoenix/coprocessor/StatisticsCollectionRunTrackerIT.java
@@ -33,20 +33,26 @@ import org.apache.hadoop.hbase.HRegionInfo;
 import org.apache.hadoop.hbase.TableName;
 import org.apache.hadoop.hbase.client.HBaseAdmin;
 import org.apache.hadoop.hbase.util.Bytes;
-import org.apache.phoenix.end2end.BaseOwnClusterHBaseManagedTimeIT;
+import org.apache.phoenix.end2end.ParallelStatsEnabledIT;
 import org.apache.phoenix.jdbc.PhoenixConnection;
 import org.apache.phoenix.query.QueryServices;
 import org.apache.phoenix.schema.stats.StatisticsCollectionRunTracker;
 import org.apache.phoenix.util.ReadOnlyProps;
+import org.apache.phoenix.util.SchemaUtil;
+import org.apache.phoenix.util.TestUtil;
 import org.junit.Assert;
+import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
 import com.google.common.collect.Maps;
 
-public class StatisticsCollectionRunTrackerIT extends 
BaseOwnClusterHBaseManagedTimeIT {
+public class StatisticsCollectionRunTrackerIT extends ParallelStatsEnabledIT {
 private static final 

[4/6] phoenix git commit: PHOENIX-3290 Move and/or combine as many NeedsOwnCluster tests to bring down test run time

2016-09-17 Thread jamestaylor
http://git-wip-us.apache.org/repos/asf/phoenix/blob/faad4ad3/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 d9a59a9..a3c36fa 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
@@ -69,7 +69,6 @@ public abstract class BaseViewIT extends 
BaseOwnClusterHBaseManagedTimeIT {
 public static void doSetup() throws Exception {
 Map props = Maps.newHashMapWithExpectedSize(3);
 props.put(QueryServices.STATS_GUIDEPOST_WIDTH_BYTES_ATTRIB, 
Integer.toString(20));
-props.put(QueryServices.QUEUE_SIZE_ATTRIB, Integer.toString(1024));
 props.put(QueryServices.TRANSACTIONS_ENABLED, Boolean.toString(true));
 setUpTestDriver(new ReadOnlyProps(props.entrySet().iterator()));
 }

http://git-wip-us.apache.org/repos/asf/phoenix/blob/faad4ad3/phoenix-core/src/it/java/org/apache/phoenix/end2end/CsvBulkLoadToolIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/CsvBulkLoadToolIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/CsvBulkLoadToolIT.java
index 8968555..4971fc3 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/CsvBulkLoadToolIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/CsvBulkLoadToolIT.java
@@ -40,7 +40,9 @@ import org.apache.phoenix.mapreduce.CsvBulkLoadTool;
 import org.apache.phoenix.query.QueryServices;
 import org.apache.phoenix.query.QueryServicesOptions;
 import org.apache.phoenix.util.DateUtil;
+import org.apache.phoenix.util.PhoenixRuntime;
 import org.apache.phoenix.util.ReadOnlyProps;
+import org.apache.phoenix.util.TestUtil;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
@@ -57,8 +59,8 @@ public class CsvBulkLoadToolIT extends 
BaseOwnClusterHBaseManagedTimeIT {
 serverProps.put(QueryServices.EXTRA_JDBC_ARGUMENTS_ATTRIB, 
QueryServicesOptions.DEFAULT_EXTRA_JDBC_ARGUMENTS);
 Map clientProps = Maps.newHashMapWithExpectedSize(1);
 clientProps.put(QueryServices.TRANSACTIONS_ENABLED, "true");
-setUpRealDriver(new ReadOnlyProps(serverProps.entrySet().iterator()), 
new ReadOnlyProps(clientProps.entrySet().iterator()));
-zkQuorum = "localhost:" + getUtility().getZkCluster().getClientPort();
+setUpTestDriver(new ReadOnlyProps(serverProps.entrySet().iterator()), 
new ReadOnlyProps(clientProps.entrySet().iterator()));
+zkQuorum = TestUtil.LOCALHOST + PhoenixRuntime.JDBC_PROTOCOL_SEPARATOR 
+ getUtility().getZkCluster().getClientPort();
 conn = DriverManager.getConnection(getUrl());
 }
 

http://git-wip-us.apache.org/repos/asf/phoenix/blob/faad4ad3/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexExtendedIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexExtendedIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexExtendedIT.java
new file mode 100644
index 000..140888b
--- /dev/null
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexExtendedIT.java
@@ -0,0 +1,591 @@
+/*
+ * 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.apache.phoenix.util.TestUtil.TEST_PROPERTIES;
+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.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+import java.util.UUID;
+
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.hbase.HRegionInfo;
+import 

[4/6] phoenix git commit: PHOENIX-3290 Move and/or combine as many NeedsOwnCluster tests to bring down test run time

2016-09-17 Thread jamestaylor
http://git-wip-us.apache.org/repos/asf/phoenix/blob/925252cb/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 d9a59a9..a3c36fa 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
@@ -69,7 +69,6 @@ public abstract class BaseViewIT extends 
BaseOwnClusterHBaseManagedTimeIT {
 public static void doSetup() throws Exception {
 Map props = Maps.newHashMapWithExpectedSize(3);
 props.put(QueryServices.STATS_GUIDEPOST_WIDTH_BYTES_ATTRIB, 
Integer.toString(20));
-props.put(QueryServices.QUEUE_SIZE_ATTRIB, Integer.toString(1024));
 props.put(QueryServices.TRANSACTIONS_ENABLED, Boolean.toString(true));
 setUpTestDriver(new ReadOnlyProps(props.entrySet().iterator()));
 }

http://git-wip-us.apache.org/repos/asf/phoenix/blob/925252cb/phoenix-core/src/it/java/org/apache/phoenix/end2end/CsvBulkLoadToolIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/CsvBulkLoadToolIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/CsvBulkLoadToolIT.java
index 8968555..4971fc3 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/CsvBulkLoadToolIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/CsvBulkLoadToolIT.java
@@ -40,7 +40,9 @@ import org.apache.phoenix.mapreduce.CsvBulkLoadTool;
 import org.apache.phoenix.query.QueryServices;
 import org.apache.phoenix.query.QueryServicesOptions;
 import org.apache.phoenix.util.DateUtil;
+import org.apache.phoenix.util.PhoenixRuntime;
 import org.apache.phoenix.util.ReadOnlyProps;
+import org.apache.phoenix.util.TestUtil;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
@@ -57,8 +59,8 @@ public class CsvBulkLoadToolIT extends 
BaseOwnClusterHBaseManagedTimeIT {
 serverProps.put(QueryServices.EXTRA_JDBC_ARGUMENTS_ATTRIB, 
QueryServicesOptions.DEFAULT_EXTRA_JDBC_ARGUMENTS);
 Map clientProps = Maps.newHashMapWithExpectedSize(1);
 clientProps.put(QueryServices.TRANSACTIONS_ENABLED, "true");
-setUpRealDriver(new ReadOnlyProps(serverProps.entrySet().iterator()), 
new ReadOnlyProps(clientProps.entrySet().iterator()));
-zkQuorum = "localhost:" + getUtility().getZkCluster().getClientPort();
+setUpTestDriver(new ReadOnlyProps(serverProps.entrySet().iterator()), 
new ReadOnlyProps(clientProps.entrySet().iterator()));
+zkQuorum = TestUtil.LOCALHOST + PhoenixRuntime.JDBC_PROTOCOL_SEPARATOR 
+ getUtility().getZkCluster().getClientPort();
 conn = DriverManager.getConnection(getUrl());
 }
 

http://git-wip-us.apache.org/repos/asf/phoenix/blob/925252cb/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexExtendedIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexExtendedIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexExtendedIT.java
new file mode 100644
index 000..b23e342
--- /dev/null
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexExtendedIT.java
@@ -0,0 +1,578 @@
+/*
+ * 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.apache.phoenix.util.TestUtil.TEST_PROPERTIES;
+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.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+import java.util.UUID;
+
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.hbase.HRegionInfo;
+import