You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@phoenix.apache.org by el...@apache.org on 2018/02/01 21:53:51 UTC

[01/10] phoenix git commit: PHOENIX-4571 Adds dependency on servlet-api for PQS

Repository: phoenix
Updated Branches:
  refs/heads/5.x-HBase-2.0 786741e3a -> 77b405d59


PHOENIX-4571 Adds dependency on servlet-api for PQS


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

Branch: refs/heads/5.x-HBase-2.0
Commit: e170feb0dc8ff51b2b48c638c5da077b2050189c
Parents: 786741e
Author: Josh Elser <el...@apache.org>
Authored: Tue Jan 30 16:06:08 2018 -0500
Committer: Josh Elser <el...@apache.org>
Committed: Tue Jan 30 16:08:17 2018 -0500

----------------------------------------------------------------------
 phoenix-queryserver/pom.xml | 4 ++++
 pom.xml                     | 6 ++++++
 2 files changed, 10 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/phoenix/blob/e170feb0/phoenix-queryserver/pom.xml
----------------------------------------------------------------------
diff --git a/phoenix-queryserver/pom.xml b/phoenix-queryserver/pom.xml
index ae61200..b8ded0e 100644
--- a/phoenix-queryserver/pom.xml
+++ b/phoenix-queryserver/pom.xml
@@ -147,6 +147,10 @@
       <groupId>commons-logging</groupId>
       <artifactId>commons-logging</artifactId>
     </dependency>
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>javax.servlet-api</artifactId>
+    </dependency>
     <!-- for tests -->
     <dependency>
       <groupId>org.mockito</groupId>

http://git-wip-us.apache.org/repos/asf/phoenix/blob/e170feb0/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index d9f6e7b..b289754 100644
--- a/pom.xml
+++ b/pom.xml
@@ -105,6 +105,7 @@
     <scala.binary.version>2.11</scala.binary.version>
     <stream.version>2.9.5</stream.version>
     <i18n-util.version>1.0.1</i18n-util.version>
+    <servlet.api.version>3.1.0</servlet.api.version>
     <!-- Test Dependencies -->
     <mockito-all.version>1.8.5</mockito-all.version>
     <junit.version>4.12</junit.version>
@@ -967,6 +968,11 @@
         <artifactId>jetty-webapp</artifactId>
         <version>${jetty.version}</version>
       </dependency>
+      <dependency>
+        <groupId>javax.servlet</groupId>
+        <artifactId>javax.servlet-api</artifactId>
+        <version>${servlet.api.version}</version>
+      </dependency>
     </dependencies>
   </dependencyManagement>
 


[10/10] phoenix git commit: PHOENIX-4494 Temporarily disable phoenix tracing tests

Posted by el...@apache.org.
PHOENIX-4494 Temporarily disable phoenix tracing tests


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

Branch: refs/heads/5.x-HBase-2.0
Commit: 77b405d59d4926fd7fb96747211c7e1fb43a3208
Parents: e27b702
Author: Josh Elser <el...@apache.org>
Authored: Thu Feb 1 15:10:54 2018 -0500
Committer: Josh Elser <el...@apache.org>
Committed: Thu Feb 1 15:10:54 2018 -0500

----------------------------------------------------------------------
 .../java/org/apache/phoenix/trace/PhoenixTracingEndToEndIT.java   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/phoenix/blob/77b405d5/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 03510dc..610195a 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
@@ -41,6 +41,7 @@ import org.apache.phoenix.jdbc.PhoenixConnection;
 import org.apache.phoenix.trace.TraceReader.SpanInfo;
 import org.apache.phoenix.trace.TraceReader.TraceHolder;
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 
 import com.google.common.collect.ImmutableMap;
@@ -48,7 +49,7 @@ import com.google.common.collect.ImmutableMap;
 /**
  * Test that the logging sink stores the expected metrics/stats
  */
-
+@Ignore("Will need to revisit for new HDFS/HBase/HTrace, broken on 5.x")
 public class PhoenixTracingEndToEndIT extends BaseTracingTestIT {
 
     private static final Log LOG = LogFactory.getLog(PhoenixTracingEndToEndIT.class);


[03/10] phoenix git commit: PHOENIX-4573 Temporarily disable Hive ITs

Posted by el...@apache.org.
PHOENIX-4573 Temporarily disable Hive ITs


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

Branch: refs/heads/5.x-HBase-2.0
Commit: 05c8b9aa05f58500a5002329856b61f78d82949d
Parents: e615fe1
Author: Josh Elser <el...@apache.org>
Authored: Wed Jan 31 12:26:30 2018 -0500
Committer: Josh Elser <el...@apache.org>
Committed: Wed Jan 31 12:26:30 2018 -0500

----------------------------------------------------------------------
 .../it/java/org/apache/phoenix/hive/BaseHivePhoenixStoreIT.java    | 2 ++
 .../src/it/java/org/apache/phoenix/hive/HiveMapReduceIT.java       | 1 +
 phoenix-hive/src/it/java/org/apache/phoenix/hive/HiveTezIT.java    | 1 +
 3 files changed, 4 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/phoenix/blob/05c8b9aa/phoenix-hive/src/it/java/org/apache/phoenix/hive/BaseHivePhoenixStoreIT.java
----------------------------------------------------------------------
diff --git a/phoenix-hive/src/it/java/org/apache/phoenix/hive/BaseHivePhoenixStoreIT.java b/phoenix-hive/src/it/java/org/apache/phoenix/hive/BaseHivePhoenixStoreIT.java
index c705e2d..bc25909 100644
--- a/phoenix-hive/src/it/java/org/apache/phoenix/hive/BaseHivePhoenixStoreIT.java
+++ b/phoenix-hive/src/it/java/org/apache/phoenix/hive/BaseHivePhoenixStoreIT.java
@@ -32,6 +32,7 @@ import org.apache.phoenix.util.PhoenixRuntime;
 import org.apache.phoenix.util.PropertiesUtil;
 import org.apache.phoenix.util.TestUtil;
 import org.junit.AfterClass;
+import org.junit.Ignore;
 import org.junit.experimental.categories.Category;
 
 import java.io.File;
@@ -47,6 +48,7 @@ import static org.junit.Assert.fail;
  * Base class for all Hive Phoenix integration tests that may be run with Tez or MR mini cluster
  */
 @Category(NeedsOwnMiniClusterTest.class)
+@Ignore
 public class BaseHivePhoenixStoreIT {
 
     private static final Log LOG = LogFactory.getLog(BaseHivePhoenixStoreIT.class);

http://git-wip-us.apache.org/repos/asf/phoenix/blob/05c8b9aa/phoenix-hive/src/it/java/org/apache/phoenix/hive/HiveMapReduceIT.java
----------------------------------------------------------------------
diff --git a/phoenix-hive/src/it/java/org/apache/phoenix/hive/HiveMapReduceIT.java b/phoenix-hive/src/it/java/org/apache/phoenix/hive/HiveMapReduceIT.java
index 644ff24..5150324 100644
--- a/phoenix-hive/src/it/java/org/apache/phoenix/hive/HiveMapReduceIT.java
+++ b/phoenix-hive/src/it/java/org/apache/phoenix/hive/HiveMapReduceIT.java
@@ -24,6 +24,7 @@ import org.junit.experimental.categories.Category;
 import org.junit.Ignore;
 
 @Category(NeedsOwnMiniClusterTest.class)
+@Ignore
 public class HiveMapReduceIT extends HivePhoenixStoreIT {
 
     @BeforeClass

http://git-wip-us.apache.org/repos/asf/phoenix/blob/05c8b9aa/phoenix-hive/src/it/java/org/apache/phoenix/hive/HiveTezIT.java
----------------------------------------------------------------------
diff --git a/phoenix-hive/src/it/java/org/apache/phoenix/hive/HiveTezIT.java b/phoenix-hive/src/it/java/org/apache/phoenix/hive/HiveTezIT.java
index 8dc3309..f6efe18 100644
--- a/phoenix-hive/src/it/java/org/apache/phoenix/hive/HiveTezIT.java
+++ b/phoenix-hive/src/it/java/org/apache/phoenix/hive/HiveTezIT.java
@@ -24,6 +24,7 @@ import org.junit.experimental.categories.Category;
 import org.junit.Ignore;
 
 @Category(NeedsOwnMiniClusterTest.class)
+@Ignore
 public class HiveTezIT extends HivePhoenixStoreIT {
 
     @BeforeClass


[08/10] phoenix git commit: PHOENIX-4574 Disable some failing local indexing tests

Posted by el...@apache.org.
PHOENIX-4574 Disable some failing local indexing tests


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

Branch: refs/heads/5.x-HBase-2.0
Commit: fcd8b99db118be7546500ef5afdc80fefb25fc9d
Parents: 11eec61
Author: Josh Elser <el...@apache.org>
Authored: Wed Jan 31 14:40:20 2018 -0500
Committer: Josh Elser <el...@apache.org>
Committed: Thu Feb 1 11:48:07 2018 -0500

----------------------------------------------------------------------
 .../it/java/org/apache/phoenix/end2end/LocalIndexSplitMergeIT.java | 2 ++
 .../src/it/java/org/apache/phoenix/end2end/index/LocalIndexIT.java | 2 ++
 .../it/java/org/apache/phoenix/end2end/index/MutableIndexIT.java   | 2 ++
 3 files changed, 6 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/phoenix/blob/fcd8b99d/phoenix-core/src/it/java/org/apache/phoenix/end2end/LocalIndexSplitMergeIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/LocalIndexSplitMergeIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/LocalIndexSplitMergeIT.java
index ee8063c..c27acee 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/LocalIndexSplitMergeIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/LocalIndexSplitMergeIT.java
@@ -45,12 +45,14 @@ import org.apache.phoenix.util.ReadOnlyProps;
 import org.apache.phoenix.util.SchemaUtil;
 import org.apache.phoenix.util.TestUtil;
 import org.junit.BeforeClass;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
 import com.google.common.collect.Maps;
 
 @Category(NeedsOwnMiniClusterTest.class)
+@Ignore
 public class LocalIndexSplitMergeIT extends BaseTest {
 
     @BeforeClass

http://git-wip-us.apache.org/repos/asf/phoenix/blob/fcd8b99d/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 41616f2..15d938c 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
@@ -71,6 +71,7 @@ import org.apache.phoenix.schema.TableNotFoundException;
 import org.apache.phoenix.util.QueryUtil;
 import org.apache.phoenix.util.SchemaUtil;
 import org.apache.phoenix.util.TestUtil;
+import org.junit.Ignore;
 import org.junit.Test;
 
 import com.google.common.collect.Lists;
@@ -586,6 +587,7 @@ public class LocalIndexIT extends BaseLocalIndexIT {
     }
     
     @Test
+    @Ignore
     public void testLocalIndexAutomaticRepair() throws Exception {
         if (isNamespaceMapped) { return; }
         PhoenixConnection conn = DriverManager.getConnection(getUrl()).unwrap(PhoenixConnection.class);

http://git-wip-us.apache.org/repos/asf/phoenix/blob/fcd8b99d/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 04b3618..a583e7b 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
@@ -52,6 +52,7 @@ import org.apache.phoenix.util.PropertiesUtil;
 import org.apache.phoenix.util.QueryUtil;
 import org.apache.phoenix.util.SchemaUtil;
 import org.apache.phoenix.util.TestUtil;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
@@ -619,6 +620,7 @@ public class MutableIndexIT extends ParallelStatsDisabledIT {
     }
 
     @Test
+    @Ignore
     public void testIndexHalfStoreFileReader() throws Exception {
         Connection conn1 = getConnection();
         ConnectionQueryServices connectionQueryServices = driver.getConnectionQueryServices(getUrl(), TestUtil.TEST_PROPERTIES);


[05/10] phoenix git commit: PHOENIX-4459 Temporarily disable failing tests

Posted by el...@apache.org.
PHOENIX-4459 Temporarily disable failing tests


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

Branch: refs/heads/5.x-HBase-2.0
Commit: 78753eba9172cdaecdbe7264275807fe996c64d0
Parents: 0838253
Author: Josh Elser <el...@apache.org>
Authored: Wed Jan 31 12:39:48 2018 -0500
Committer: Josh Elser <el...@apache.org>
Committed: Wed Jan 31 12:39:48 2018 -0500

----------------------------------------------------------------------
 .../it/java/org/apache/phoenix/end2end/ConcurrentMutationsIT.java  | 1 +
 .../org/apache/phoenix/end2end/ExplainPlanWithStatsEnabledIT.java  | 2 ++
 .../org/apache/phoenix/end2end/index/PartialIndexRebuilderIT.java  | 2 ++
 3 files changed, 5 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/phoenix/blob/78753eba/phoenix-core/src/it/java/org/apache/phoenix/end2end/ConcurrentMutationsIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ConcurrentMutationsIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ConcurrentMutationsIT.java
index d1f30c6..01133f1 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ConcurrentMutationsIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ConcurrentMutationsIT.java
@@ -55,6 +55,7 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 
 @RunWith(RunUntilFailure.class)
+@Ignore
 public class ConcurrentMutationsIT extends ParallelStatsDisabledIT {
     private static final Random RAND = new Random(5);
     private static final String MVCC_LOCK_TEST_TABLE_PREFIX = "MVCCLOCKTEST_";  

http://git-wip-us.apache.org/repos/asf/phoenix/blob/78753eba/phoenix-core/src/it/java/org/apache/phoenix/end2end/ExplainPlanWithStatsEnabledIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ExplainPlanWithStatsEnabledIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ExplainPlanWithStatsEnabledIT.java
index 1608d85..5fb0184 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ExplainPlanWithStatsEnabledIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ExplainPlanWithStatsEnabledIT.java
@@ -42,6 +42,7 @@ import org.apache.phoenix.util.EnvironmentEdge;
 import org.apache.phoenix.util.EnvironmentEdgeManager;
 import org.apache.phoenix.util.PhoenixRuntime;
 import org.junit.BeforeClass;
+import org.junit.Ignore;
 import org.junit.Test;
 
 import com.google.common.collect.Lists;
@@ -50,6 +51,7 @@ import com.google.common.collect.Lists;
  * This class has tests for asserting the bytes and rows information exposed in the explain plan
  * when statistics are enabled.
  */
+@Ignore
 public class ExplainPlanWithStatsEnabledIT extends ParallelStatsEnabledIT {
 
     private static String tableA;

http://git-wip-us.apache.org/repos/asf/phoenix/blob/78753eba/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/PartialIndexRebuilderIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/PartialIndexRebuilderIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/PartialIndexRebuilderIT.java
index 21d1ff0..767bb0a 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/PartialIndexRebuilderIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/PartialIndexRebuilderIT.java
@@ -68,6 +68,7 @@ import org.apache.phoenix.util.RunUntilFailure;
 import org.apache.phoenix.util.SchemaUtil;
 import org.apache.phoenix.util.TestUtil;
 import org.junit.BeforeClass;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.slf4j.Logger;
@@ -77,6 +78,7 @@ import com.google.common.collect.Maps;
 
 @SuppressWarnings("deprecation")
 @RunWith(RunUntilFailure.class)
+@Ignore
 public class PartialIndexRebuilderIT extends BaseUniqueNamesOwnClusterIT {
     private static final Logger LOG = LoggerFactory.getLogger(PartialIndexRebuilderIT.class);
     private static final Random RAND = new Random(5);


[06/10] phoenix git commit: PHOENIX-4561 (addendum) Disable some more transaction table tests

Posted by el...@apache.org.
PHOENIX-4561 (addendum) Disable some more transaction table tests

Includes BaseViewIT and MutableRollbackIT


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

Branch: refs/heads/5.x-HBase-2.0
Commit: f37b1202655bc98af8cc8afaff35360a110f7f3c
Parents: 78753eb
Author: Josh Elser <el...@apache.org>
Authored: Wed Jan 31 13:52:54 2018 -0500
Committer: Josh Elser <el...@apache.org>
Committed: Wed Jan 31 14:41:07 2018 -0500

----------------------------------------------------------------------
 .../src/it/java/org/apache/phoenix/end2end/BaseViewIT.java        | 3 ++-
 .../org/apache/phoenix/end2end/index/txn/MutableRollbackIT.java   | 2 ++
 2 files changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/phoenix/blob/f37b1202/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 b024d03..92966f1 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
@@ -74,7 +74,8 @@ public abstract class BaseViewIT extends ParallelStatsEnabledIT {
     
     @Parameters(name="transactional = {0}")
     public static Collection<Boolean> data() {
-        return Arrays.asList(new Boolean[] { false, true });
+        // return Arrays.asList(new Boolean[] { false, true });
+        return Arrays.asList(new Boolean[] { false });
     }
     
     protected void testUpdatableViewWithIndex(Integer saltBuckets, boolean localIndex) throws Exception {

http://git-wip-us.apache.org/repos/asf/phoenix/blob/f37b1202/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/txn/MutableRollbackIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/txn/MutableRollbackIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/txn/MutableRollbackIT.java
index 523e0d0..9ccf03a 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/txn/MutableRollbackIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/txn/MutableRollbackIT.java
@@ -40,12 +40,14 @@ import org.apache.phoenix.query.QueryServices;
 import org.apache.phoenix.util.PropertiesUtil;
 import org.apache.phoenix.util.SchemaUtil;
 import org.apache.phoenix.util.TestUtil;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 import org.junit.runners.Parameterized.Parameters;
 
 @RunWith(Parameterized.class)
+@Ignore
 public class MutableRollbackIT extends ParallelStatsDisabledIT {
 	
 	private final boolean localIndex;


[09/10] phoenix git commit: PHOENIX-4565 Temporarily disable IndexScrutinyToolIT

Posted by el...@apache.org.
PHOENIX-4565 Temporarily disable IndexScrutinyToolIT


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

Branch: refs/heads/5.x-HBase-2.0
Commit: e27b702438ec850530227fc6279f3469e94b3a8c
Parents: fcd8b99
Author: Josh Elser <el...@apache.org>
Authored: Wed Jan 31 14:42:43 2018 -0500
Committer: Josh Elser <el...@apache.org>
Committed: Thu Feb 1 12:10:50 2018 -0500

----------------------------------------------------------------------
 .../it/java/org/apache/phoenix/end2end/IndexScrutinyToolIT.java    | 2 ++
 1 file changed, 2 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/phoenix/blob/e27b7024/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexScrutinyToolIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexScrutinyToolIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexScrutinyToolIT.java
index cbce7b2..d5c50a1 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexScrutinyToolIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexScrutinyToolIT.java
@@ -68,6 +68,7 @@ import org.apache.phoenix.util.SchemaUtil;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.BeforeClass;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
@@ -81,6 +82,7 @@ import org.junit.runners.Parameterized;
  */
 @Category(NeedsOwnMiniClusterTest.class)
 @RunWith(Parameterized.class)
+@Ignore
 public class IndexScrutinyToolIT extends BaseTest {
 
     private String dataTableDdl;


[07/10] phoenix git commit: PHOENIX-4482 Disable failing test on HBase2

Posted by el...@apache.org.
PHOENIX-4482 Disable failing test on HBase2


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

Branch: refs/heads/5.x-HBase-2.0
Commit: 11eec618f36d56c349549175e5243ff729b0aaad
Parents: f37b120
Author: Josh Elser <el...@apache.org>
Authored: Wed Jan 31 14:24:04 2018 -0500
Committer: Josh Elser <el...@apache.org>
Committed: Wed Jan 31 14:41:34 2018 -0500

----------------------------------------------------------------------
 .../wal/WALReplayWithIndexWritesAndCompressedWALIT.java            | 2 ++
 1 file changed, 2 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/phoenix/blob/11eec618/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 c0e822f..e1101b0 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
@@ -69,6 +69,7 @@ import org.apache.phoenix.query.QueryServices;
 import org.apache.phoenix.util.ConfigUtil;
 import org.junit.After;
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
@@ -87,6 +88,7 @@ import org.mockito.Mockito;
  * times, which is probably not what you want to do (mostly because its so much effort).
  */
 @Category(NeedsOwnMiniClusterTest.class)
+@Ignore
 public class WALReplayWithIndexWritesAndCompressedWALIT {
 
   public static final Log LOG = LogFactory.getLog(WALReplayWithIndexWritesAndCompressedWALIT.class);


[04/10] phoenix git commit: PHOENIX-4570 Explicitly add test dependnecies to phoenix-pherf

Posted by el...@apache.org.
PHOENIX-4570 Explicitly add test dependnecies to phoenix-pherf

Maven does not provide test-jar dependencies transitively.


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

Branch: refs/heads/5.x-HBase-2.0
Commit: 08382538f0fc55d2a2beb08819dd2a1df9474c51
Parents: 05c8b9a
Author: Josh Elser <el...@apache.org>
Authored: Tue Jan 30 15:22:00 2018 -0500
Committer: Josh Elser <el...@apache.org>
Committed: Wed Jan 31 12:34:02 2018 -0500

----------------------------------------------------------------------
 phoenix-flume/pom.xml       |  2 +-
 phoenix-hive/pom.xml        |  2 +-
 phoenix-kafka/pom.xml       |  2 +-
 phoenix-pherf/pom.xml       | 12 +++++++++++-
 phoenix-pig/pom.xml         |  2 +-
 phoenix-queryserver/pom.xml |  2 +-
 phoenix-spark/pom.xml       |  2 +-
 pom.xml                     |  2 +-
 8 files changed, 18 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/phoenix/blob/08382538/phoenix-flume/pom.xml
----------------------------------------------------------------------
diff --git a/phoenix-flume/pom.xml b/phoenix-flume/pom.xml
index 806b6a3..3b9b6cd 100644
--- a/phoenix-flume/pom.xml
+++ b/phoenix-flume/pom.xml
@@ -43,7 +43,7 @@
     <dependency>
       <groupId>org.apache.phoenix</groupId>
       <artifactId>phoenix-core</artifactId>
-      <classifier>tests</classifier>
+      <type>test-jar</type>
       <scope>test</scope>
     </dependency>
 

http://git-wip-us.apache.org/repos/asf/phoenix/blob/08382538/phoenix-hive/pom.xml
----------------------------------------------------------------------
diff --git a/phoenix-hive/pom.xml b/phoenix-hive/pom.xml
index cd1f3fe..2e3fdac 100644
--- a/phoenix-hive/pom.xml
+++ b/phoenix-hive/pom.xml
@@ -63,7 +63,7 @@
     <dependency>
       <groupId>org.apache.phoenix</groupId>
       <artifactId>phoenix-core</artifactId>
-      <classifier>tests</classifier>
+      <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>

http://git-wip-us.apache.org/repos/asf/phoenix/blob/08382538/phoenix-kafka/pom.xml
----------------------------------------------------------------------
diff --git a/phoenix-kafka/pom.xml b/phoenix-kafka/pom.xml
index 27187f3..635c2f2 100644
--- a/phoenix-kafka/pom.xml
+++ b/phoenix-kafka/pom.xml
@@ -278,7 +278,7 @@
 		<dependency>
 			<groupId>org.apache.phoenix</groupId>
 			<artifactId>phoenix-core</artifactId>
-			<classifier>tests</classifier>
+			<type>test-jar</type>
 			<scope>test</scope>
 		</dependency>
 		<dependency>

http://git-wip-us.apache.org/repos/asf/phoenix/blob/08382538/phoenix-pherf/pom.xml
----------------------------------------------------------------------
diff --git a/phoenix-pherf/pom.xml b/phoenix-pherf/pom.xml
index a009a23..569e0c6 100644
--- a/phoenix-pherf/pom.xml
+++ b/phoenix-pherf/pom.xml
@@ -42,7 +42,7 @@
 		<dependency>
 			<groupId>org.apache.phoenix</groupId>
 			<artifactId>phoenix-core</artifactId>
-			<classifier>tests</classifier>
+			<type>test-jar</type>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
@@ -106,6 +106,16 @@
 			<artifactId>hadoop-minicluster</artifactId>
 			<scope>test</scope>
 		</dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-all</artifactId>
+      <scope>test</scope>
+    </dependency>
 	</dependencies>
 
 	<build>

http://git-wip-us.apache.org/repos/asf/phoenix/blob/08382538/phoenix-pig/pom.xml
----------------------------------------------------------------------
diff --git a/phoenix-pig/pom.xml b/phoenix-pig/pom.xml
index 1b9a0f7..6aaaeb9 100644
--- a/phoenix-pig/pom.xml
+++ b/phoenix-pig/pom.xml
@@ -44,7 +44,7 @@
     <dependency>
       <groupId>org.apache.phoenix</groupId>
       <artifactId>phoenix-core</artifactId>
-      <classifier>tests</classifier>
+      <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>

http://git-wip-us.apache.org/repos/asf/phoenix/blob/08382538/phoenix-queryserver/pom.xml
----------------------------------------------------------------------
diff --git a/phoenix-queryserver/pom.xml b/phoenix-queryserver/pom.xml
index 7201ce6..937753d 100644
--- a/phoenix-queryserver/pom.xml
+++ b/phoenix-queryserver/pom.xml
@@ -160,7 +160,7 @@
     <dependency>
       <groupId>org.apache.phoenix</groupId>
       <artifactId>phoenix-core</artifactId>
-      <classifier>tests</classifier>
+      <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>

http://git-wip-us.apache.org/repos/asf/phoenix/blob/08382538/phoenix-spark/pom.xml
----------------------------------------------------------------------
diff --git a/phoenix-spark/pom.xml b/phoenix-spark/pom.xml
index 18bd6b5..b2151d7 100644
--- a/phoenix-spark/pom.xml
+++ b/phoenix-spark/pom.xml
@@ -75,7 +75,7 @@
     <dependency>
       <groupId>org.apache.phoenix</groupId>
       <artifactId>phoenix-core</artifactId>
-      <classifier>tests</classifier>
+      <type>test-jar</type>
       <scope>test</scope>
     </dependency>
 

http://git-wip-us.apache.org/repos/asf/phoenix/blob/08382538/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index d8676d9..7408c7c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -502,7 +502,7 @@
         <groupId>org.apache.phoenix</groupId>
         <artifactId>phoenix-core</artifactId>
         <version>${project.version}</version>
-        <classifier>tests</classifier>
+        <type>test-jar</type>
         <scope>test</scope>
       </dependency>
       <dependency>


[02/10] phoenix git commit: PHOENIX-4572 Fix PQS dependencies with Hadoop3/HBase2

Posted by el...@apache.org.
PHOENIX-4572 Fix PQS dependencies with Hadoop3/HBase2

Add in required bouncycastle dep for tests

MiniDFSCluster is having issues with the dependencies we have
(primarily) coming from Avatica. There's a shaded test client
for Hadoop to fix some, but Jackson is also a problem.


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

Branch: refs/heads/5.x-HBase-2.0
Commit: e615fe11f1500500561e4a800f93c5ae15516812
Parents: e170feb
Author: Josh Elser <el...@apache.org>
Authored: Tue Jan 30 16:06:08 2018 -0500
Committer: Josh Elser <el...@apache.org>
Committed: Wed Jan 31 11:00:11 2018 -0500

----------------------------------------------------------------------
 phoenix-queryserver/pom.xml | 35 ++++++++++++++++++++++++++++++-----
 pom.xml                     | 15 ++++++++++++++-
 2 files changed, 44 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/phoenix/blob/e615fe11/phoenix-queryserver/pom.xml
----------------------------------------------------------------------
diff --git a/phoenix-queryserver/pom.xml b/phoenix-queryserver/pom.xml
index b8ded0e..7201ce6 100644
--- a/phoenix-queryserver/pom.xml
+++ b/phoenix-queryserver/pom.xml
@@ -170,14 +170,15 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-minicluster</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
       <groupId>org.apache.hbase</groupId>
       <artifactId>hbase-testing-util</artifactId>
       <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>org.apache.hadoop</groupId>
+          <artifactId>hadoop-minicluster</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.apache.tephra</groupId>
@@ -196,5 +197,29 @@
       <artifactId>hadoop-minikdc</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.bouncycastle</groupId>
+      <artifactId>bcprov-jdk16</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.hadoop</groupId>
+      <artifactId>hadoop-client-minicluster</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <!-- Overriding the version of Jackson that comes
+         in from Avatica so we don't clash with HDFS -->
+    <dependency>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-core</artifactId>
+      <version>2.9.2</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-databind</artifactId>
+      <version>2.9.2</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 </project>

http://git-wip-us.apache.org/repos/asf/phoenix/blob/e615fe11/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index b289754..d8676d9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -67,7 +67,7 @@
 
     <!-- Hadoop Versions -->
     <hbase.version>2.0.0-beta-1</hbase.version>
-    <hadoop.version>3.0.0-beta1</hadoop.version>
+    <hadoop.version>3.0.0</hadoop.version>
 
     <!-- Dependency versions -->
     <commons-cli.version>1.2</commons-cli.version>
@@ -109,6 +109,7 @@
     <!-- Test Dependencies -->
     <mockito-all.version>1.8.5</mockito-all.version>
     <junit.version>4.12</junit.version>
+    <bouncycastle.version>1.46</bouncycastle.version>
 
     <!-- Plugin versions -->
     <maven-eclipse-plugin.version>2.9</maven-eclipse-plugin.version>
@@ -683,6 +684,12 @@
         <optional>true</optional>
         <scope>test</scope>
       </dependency>
+      <dependency>
+        <groupId>org.apache.hadoop</groupId>
+        <artifactId>hadoop-client-minicluster</artifactId>
+        <version>${hadoop.version}</version>
+        <scope>test</scope>
+      </dependency>
 
       <!-- Required for mini-cluster since hbase built against old version of hadoop -->
       <dependency>
@@ -973,6 +980,12 @@
         <artifactId>javax.servlet-api</artifactId>
         <version>${servlet.api.version}</version>
       </dependency>
+      <dependency>
+        <groupId>org.bouncycastle</groupId>
+        <artifactId>bcprov-jdk16</artifactId>
+        <version>${bouncycastle.version}</version>
+        <scope>test</scope>
+      </dependency>
     </dependencies>
   </dependencyManagement>