[1/2] phoenix git commit: PHOENIX-4975 Fix failing unit tests for Omid due to shadow cells and no local indexes

2018-10-16 Thread jamestaylor 
Repository: phoenix
Updated Branches:
  refs/heads/4.x-HBase-1.4 1b561ce85 -> 931aebcd8


PHOENIX-4975 Fix failing unit tests for Omid due to shadow cells and no local 
indexes


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

Branch: refs/heads/4.x-HBase-1.4
Commit: c96260d75bb4cffa1acdf8f9e0ca27e8a05e2b02
Parents: 1b561ce
Author: James Taylor 
Authored: Tue Oct 16 09:16:43 2018 -0700
Committer: James Taylor 
Committed: Tue Oct 16 14:42:06 2018 -0700

--
 .../org/apache/phoenix/end2end/IndexToolIT.java | 16 --
 .../StatsEnabledSplitSystemCatalogIT.java   | 34 +++-
 .../java/org/apache/phoenix/end2end/ViewIT.java | 18 +--
 .../phoenix/schema/stats/StatsCollectorIT.java  | 54 
 4 files changed, 82 insertions(+), 40 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/c96260d7/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexToolIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexToolIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexToolIT.java
index b8372c4..c99f145 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexToolIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexToolIT.java
@@ -49,6 +49,8 @@ import org.apache.phoenix.jdbc.PhoenixConnection;
 import org.apache.phoenix.mapreduce.index.IndexTool;
 import org.apache.phoenix.query.QueryServices;
 import org.apache.phoenix.query.QueryServicesOptions;
+import org.apache.phoenix.transaction.PhoenixTransactionProvider.Feature;
+import org.apache.phoenix.transaction.TransactionFactory;
 import org.apache.phoenix.util.PropertiesUtil;
 import org.apache.phoenix.util.QueryUtil;
 import org.apache.phoenix.util.ReadOnlyProps;
@@ -111,12 +113,18 @@ public class IndexToolIT extends ParallelStatsEnabledIT {
 public static Collection data() {
 List list = Lists.newArrayListWithExpectedSize(48);
 boolean[] Booleans = new boolean[] { false, true };
-for (Object transactionProvider : new String[] {"TEPHRA", "OMID", 
null}) {
+for (String transactionProvider : new String[] {"TEPHRA", "OMID", 
null}) {
 for (boolean mutable : Booleans) {
 for (boolean localIndex : Booleans) {
-for (boolean directApi : Booleans) {
-for (boolean useSnapshot : Booleans) {
-list.add(new Object[] { transactionProvider, 
mutable, localIndex, directApi, useSnapshot });
+if (!localIndex 
+|| transactionProvider == null 
+|| !TransactionFactory.getTransactionProvider(
+
TransactionFactory.Provider.valueOf(transactionProvider))
+.isUnsupported(Feature.ALLOW_LOCAL_INDEX)) {
+for (boolean directApi : Booleans) {
+for (boolean useSnapshot : Booleans) {
+list.add(new Object[] { transactionProvider, 
mutable, localIndex, directApi, useSnapshot });
+}
 }
 }
 }

http://git-wip-us.apache.org/repos/asf/phoenix/blob/c96260d7/phoenix-core/src/it/java/org/apache/phoenix/end2end/StatsEnabledSplitSystemCatalogIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/StatsEnabledSplitSystemCatalogIT.java
 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/StatsEnabledSplitSystemCatalogIT.java
index 197263f..0a0dd21 100644
--- 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/StatsEnabledSplitSystemCatalogIT.java
+++ 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/StatsEnabledSplitSystemCatalogIT.java
@@ -34,10 +34,10 @@ import java.util.List;
 import java.util.Map;
 
 import org.apache.hadoop.hbase.HConstants;
-import org.apache.hadoop.hbase.client.HTableInterface;
 import org.apache.hadoop.hbase.client.Result;
 import org.apache.hadoop.hbase.client.ResultScanner;
 import org.apache.hadoop.hbase.client.Scan;
+import org.apache.hadoop.hbase.client.Table;
 import org.apache.hadoop.hbase.util.Bytes;
 import org.apache.hadoop.hbase.util.Pair;
 import org.apache.phoenix.exception.SQLExceptionCode;
@@ -45,6 +45,8 @@ import org.apache.phoenix.jdbc.PhoenixConnection;
 import org.apache.phoenix.query.KeyRange;
 import org.apache.phoenix.query.QueryServices;
 import org.apache.phoenix.schema.ReadOnlyTableException;

[1/2] phoenix git commit: PHOENIX-4975 Fix failing unit tests for Omid due to shadow cells and no local indexes

2018-10-16 Thread jamestaylor 
Repository: phoenix
Updated Branches:
  refs/heads/4.x-HBase-1.2 280412183 -> ce16fcaef


PHOENIX-4975 Fix failing unit tests for Omid due to shadow cells and no local 
indexes


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

Branch: refs/heads/4.x-HBase-1.2
Commit: 9ec91f274e019066d312d60ac6f80f5abacf71c5
Parents: 2804121
Author: James Taylor 
Authored: Tue Oct 16 09:16:43 2018 -0700
Committer: James Taylor 
Committed: Tue Oct 16 14:38:57 2018 -0700

--
 .../org/apache/phoenix/end2end/IndexToolIT.java | 16 --
 .../StatsEnabledSplitSystemCatalogIT.java   | 34 +++-
 .../java/org/apache/phoenix/end2end/ViewIT.java | 18 +--
 .../phoenix/schema/stats/StatsCollectorIT.java  | 54 
 4 files changed, 82 insertions(+), 40 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/9ec91f27/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexToolIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexToolIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexToolIT.java
index b8372c4..c99f145 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexToolIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexToolIT.java
@@ -49,6 +49,8 @@ import org.apache.phoenix.jdbc.PhoenixConnection;
 import org.apache.phoenix.mapreduce.index.IndexTool;
 import org.apache.phoenix.query.QueryServices;
 import org.apache.phoenix.query.QueryServicesOptions;
+import org.apache.phoenix.transaction.PhoenixTransactionProvider.Feature;
+import org.apache.phoenix.transaction.TransactionFactory;
 import org.apache.phoenix.util.PropertiesUtil;
 import org.apache.phoenix.util.QueryUtil;
 import org.apache.phoenix.util.ReadOnlyProps;
@@ -111,12 +113,18 @@ public class IndexToolIT extends ParallelStatsEnabledIT {
 public static Collection data() {
 List list = Lists.newArrayListWithExpectedSize(48);
 boolean[] Booleans = new boolean[] { false, true };
-for (Object transactionProvider : new String[] {"TEPHRA", "OMID", 
null}) {
+for (String transactionProvider : new String[] {"TEPHRA", "OMID", 
null}) {
 for (boolean mutable : Booleans) {
 for (boolean localIndex : Booleans) {
-for (boolean directApi : Booleans) {
-for (boolean useSnapshot : Booleans) {
-list.add(new Object[] { transactionProvider, 
mutable, localIndex, directApi, useSnapshot });
+if (!localIndex 
+|| transactionProvider == null 
+|| !TransactionFactory.getTransactionProvider(
+
TransactionFactory.Provider.valueOf(transactionProvider))
+.isUnsupported(Feature.ALLOW_LOCAL_INDEX)) {
+for (boolean directApi : Booleans) {
+for (boolean useSnapshot : Booleans) {
+list.add(new Object[] { transactionProvider, 
mutable, localIndex, directApi, useSnapshot });
+}
 }
 }
 }

http://git-wip-us.apache.org/repos/asf/phoenix/blob/9ec91f27/phoenix-core/src/it/java/org/apache/phoenix/end2end/StatsEnabledSplitSystemCatalogIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/StatsEnabledSplitSystemCatalogIT.java
 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/StatsEnabledSplitSystemCatalogIT.java
index 197263f..0a0dd21 100644
--- 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/StatsEnabledSplitSystemCatalogIT.java
+++ 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/StatsEnabledSplitSystemCatalogIT.java
@@ -34,10 +34,10 @@ import java.util.List;
 import java.util.Map;
 
 import org.apache.hadoop.hbase.HConstants;
-import org.apache.hadoop.hbase.client.HTableInterface;
 import org.apache.hadoop.hbase.client.Result;
 import org.apache.hadoop.hbase.client.ResultScanner;
 import org.apache.hadoop.hbase.client.Scan;
+import org.apache.hadoop.hbase.client.Table;
 import org.apache.hadoop.hbase.util.Bytes;
 import org.apache.hadoop.hbase.util.Pair;
 import org.apache.phoenix.exception.SQLExceptionCode;
@@ -45,6 +45,8 @@ import org.apache.phoenix.jdbc.PhoenixConnection;
 import org.apache.phoenix.query.KeyRange;
 import org.apache.phoenix.query.QueryServices;
 import org.apache.phoenix.schema.ReadOnlyTableException;