date:20180525

Build failed in Jenkins: Phoenix | Master #2036

2018-05-25 Thread Apache Jenkins Server

See 


Changes:

[ankitsinghal59] PHOENIX-2715 Query Log (addendum 2)

--
[...truncated 123.30 KB...]
[INFO] Tests run: 13, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 393.034 
s - in org.apache.phoenix.end2end.UpgradeIT
[INFO] Running org.apache.phoenix.end2end.index.DropColumnIT
[INFO] Running org.apache.phoenix.end2end.index.DropMetadataIT
[INFO] Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 9.473 s 
- in org.apache.phoenix.end2end.index.DropMetadataIT
[INFO] Running org.apache.phoenix.end2end.index.GlobalImmutableTxIndexIT
[INFO] Running org.apache.phoenix.end2end.index.GlobalImmutableNonTxIndexIT
[INFO] Tests run: 50, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 229.278 
s - in org.apache.phoenix.end2end.VariableLengthPKIT
[INFO] Running org.apache.phoenix.end2end.index.GlobalIndexOptimizationIT
[INFO] Tests run: 6, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 64.09 s 
- in org.apache.phoenix.end2end.index.GlobalIndexOptimizationIT
[INFO] Running org.apache.phoenix.end2end.index.GlobalMutableNonTxIndexIT
[INFO] Tests run: 40, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 327.918 
s - in org.apache.phoenix.end2end.index.GlobalImmutableNonTxIndexIT
[INFO] Tests run: 40, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 352.056 
s - in org.apache.phoenix.end2end.index.GlobalImmutableTxIndexIT
[INFO] Running org.apache.phoenix.end2end.index.GlobalMutableTxIndexIT
[INFO] Tests run: 16, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 397.271 
s - in org.apache.phoenix.end2end.index.DropColumnIT
[INFO] Running org.apache.phoenix.end2end.index.IndexMaintenanceIT
[INFO] Running org.apache.phoenix.end2end.index.IndexMetadataIT
[INFO] Tests run: 14, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 139.556 
s - in org.apache.phoenix.end2end.index.IndexMaintenanceIT
[INFO] Running org.apache.phoenix.end2end.index.IndexUsageIT
[INFO] Tests run: 40, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 316.499 
s - in org.apache.phoenix.end2end.index.GlobalMutableNonTxIndexIT
[INFO] Tests run: 16, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 153.408 
s - in org.apache.phoenix.end2end.index.IndexMetadataIT
[INFO] Running org.apache.phoenix.end2end.index.LocalImmutableNonTxIndexIT
[INFO] Running org.apache.phoenix.end2end.index.IndexWithTableSchemaChangeIT
[INFO] Tests run: 40, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 340.81 
s - in org.apache.phoenix.end2end.index.GlobalMutableTxIndexIT
[INFO] Running org.apache.phoenix.end2end.index.LocalImmutableTxIndexIT
[INFO] Tests run: 18, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 236.777 
s - in org.apache.phoenix.end2end.index.IndexWithTableSchemaChangeIT
[INFO] Tests run: 37, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 367.821 
s - in org.apache.phoenix.end2end.index.IndexUsageIT
[INFO] Running org.apache.phoenix.end2end.index.LocalMutableNonTxIndexIT
[INFO] Running org.apache.phoenix.end2end.index.LocalMutableTxIndexIT
[INFO] Tests run: 40, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 448.916 
s - in org.apache.phoenix.end2end.index.LocalImmutableNonTxIndexIT
[INFO] Running org.apache.phoenix.end2end.index.MutableIndexIT
[INFO] Tests run: 40, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 474.249 
s - in org.apache.phoenix.end2end.index.LocalImmutableTxIndexIT
[INFO] Running org.apache.phoenix.end2end.index.SaltedIndexIT
[INFO] Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 24.968 s 
- in org.apache.phoenix.end2end.index.SaltedIndexIT
[INFO] Running org.apache.phoenix.end2end.index.ViewIndexIT
[INFO] Tests run: 40, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 438.61 
s - in org.apache.phoenix.end2end.index.LocalMutableNonTxIndexIT
[INFO] Running org.apache.phoenix.end2end.index.txn.MutableRollbackIT
[INFO] Tests run: 40, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 471.091 
s - in org.apache.phoenix.end2end.index.LocalMutableTxIndexIT
[WARNING] Tests run: 14, Failures: 0, Errors: 0, Skipped: 2, Time elapsed: 
142.515 s - in org.apache.phoenix.end2end.index.ViewIndexIT
[INFO] Running org.apache.phoenix.end2end.index.txn.RollbackIT
[INFO] Tests run: 6, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 99.508 s 
- in org.apache.phoenix.end2end.index.txn.MutableRollbackIT
[INFO] Running org.apache.phoenix.end2end.join.HashJoinGlobalIndexIT
[INFO] Running org.apache.phoenix.end2end.join.HashJoinCacheIT
[INFO] Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 13.165 s 
- in org.apache.phoenix.end2end.join.HashJoinCacheIT
[INFO] Running org.apache.phoenix.end2end.join.HashJoinLocalIndexIT
[INFO] Tests run: 8, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 80.123 s 
- in org.apache.phoenix.end2end.index.txn.RollbackIT
[INFO] Running org.apache.phoenix.end2end.join.HashJoinMoreIT
[INFO] Tests run: 8, Failures: 0, Errors: 0, Skipped: 0, Time

Build failed in Jenkins: Phoenix Compile Compatibility with HBase #647

2018-05-25 Thread Apache Jenkins Server

See 


--
[...truncated 37.18 KB...]
  symbol:   class HBaseRpcController
  location: class 
org.apache.hadoop.hbase.ipc.controller.ClientRpcControllerFactory
[ERROR] 
:[52,9]
 cannot find symbol
  symbol:   class HBaseRpcController
  location: class 
org.apache.hadoop.hbase.ipc.controller.ClientRpcControllerFactory
[ERROR] 
:[180,14]
 cannot find symbol
  symbol: class MetricRegistry
[ERROR] 
:[179,7]
 method does not override or implement a method from a supertype
[ERROR] 
:[454,78]
 cannot find symbol
  symbol: class HBaseRpcController
[ERROR] 
:[432,17]
 cannot find symbol
  symbol: class HBaseRpcController
[ERROR] Failed to execute goal 
org.apache.maven.plugins:maven-compiler-plugin:3.0:compile (default-compile) on 
project phoenix-core: Compilation failure: Compilation failure: 
[ERROR] 
:[34,39]
 cannot find symbol
[ERROR]   symbol:   class MetricRegistry
[ERROR]   location: package org.apache.hadoop.hbase.metrics
[ERROR] 
:[144,16]
 cannot find symbol
[ERROR]   symbol:   class MetricRegistry
[ERROR]   location: class 
org.apache.phoenix.coprocessor.PhoenixMetaDataCoprocessorHost.PhoenixMetaDataControllerEnvironment
[ERROR] 
:[24,35]
 cannot find symbol
[ERROR]   symbol:   class DelegatingHBaseRpcController
[ERROR]   location: package org.apache.hadoop.hbase.ipc
[ERROR] 
:[25,35]
 cannot find symbol
[ERROR]   symbol:   class HBaseRpcController
[ERROR]   location: package org.apache.hadoop.hbase.ipc
[ERROR] 
:[37,37]
 cannot find symbol
[ERROR]   symbol: class DelegatingHBaseRpcController
[ERROR] 
:[56,38]
 cannot find symbol
[ERROR]   symbol:   class HBaseRpcController
[ERROR]   location: class 
org.apache.hadoop.hbase.ipc.controller.MetadataRpcController
[ERROR] 
:[26,35]
 cannot find symbol
[ERROR]   symbol:   class HBaseRpcController
[ERROR]   location: package org.apache.hadoop.hbase.ipc
[ERROR] 
:[40,12]
 cannot find symbol
[ERROR]   symbol:   class HBaseRpcController
[ERROR]   location: class 
org.apache.hadoop.hbase.ipc.controller.InterRegionServerMetadataRpcControllerFactory
[ERROR] 
:[46,12]
 cannot find symbol
[ERROR]   symbol:   class HBaseRpcController
[ERROR]   location: class 
org.apache.hadoop.hbase.ipc.controller.InterRegionServerMetadataRpcControllerFactory
[ERROR]

[6/6] phoenix git commit: Changes for CDH 5.14.x

2018-05-25 Thread pboado

Changes for CDH 5.14.x


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

Branch: refs/heads/4.x-cdh5.14
Commit: c7e9c195566b15e6704a16e568abcb413770fdfa
Parents: cbca731
Author: Pedro Boado 
Authored: Sat Mar 10 17:54:04 2018 +
Committer: Pedro Boado 
Committed: Fri May 25 12:36:40 2018 +0100

--
 phoenix-assembly/pom.xml|  2 +-
 phoenix-client/pom.xml  |  2 +-
 phoenix-core/pom.xml|  2 +-
 .../hadoop/hbase/ipc/PhoenixRpcScheduler.java   | 34 ++--
 phoenix-flume/pom.xml   |  2 +-
 phoenix-hive/pom.xml|  2 +-
 phoenix-kafka/pom.xml   |  2 +-
 phoenix-load-balancer/pom.xml   |  2 +-
 phoenix-parcel/pom.xml  |  2 +-
 phoenix-pherf/pom.xml   |  2 +-
 phoenix-pig/pom.xml |  2 +-
 phoenix-queryserver-client/pom.xml  |  2 +-
 phoenix-queryserver/pom.xml |  2 +-
 phoenix-server/pom.xml  |  2 +-
 phoenix-spark/pom.xml   |  2 +-
 phoenix-tracing-webapp/pom.xml  |  2 +-
 pom.xml |  4 +--
 17 files changed, 49 insertions(+), 19 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/c7e9c195/phoenix-assembly/pom.xml
--
diff --git a/phoenix-assembly/pom.xml b/phoenix-assembly/pom.xml
index 7d98c25..c013cf0 100644
--- a/phoenix-assembly/pom.xml
+++ b/phoenix-assembly/pom.xml
@@ -27,7 +27,7 @@
   
 org.apache.phoenix
 phoenix
-4.14.0-cdh5.11.2
+4.14.0-cdh5.14.2-SNAPSHOT
   
   phoenix-assembly
   Phoenix Assembly

http://git-wip-us.apache.org/repos/asf/phoenix/blob/c7e9c195/phoenix-client/pom.xml
--
diff --git a/phoenix-client/pom.xml b/phoenix-client/pom.xml
index fef18c2..6de0f65 100644
--- a/phoenix-client/pom.xml
+++ b/phoenix-client/pom.xml
@@ -27,7 +27,7 @@
   
 org.apache.phoenix
 phoenix
-4.14.0-cdh5.11.2
+4.14.0-cdh5.14.2-SNAPSHOT
   
   phoenix-client
   Phoenix Client

http://git-wip-us.apache.org/repos/asf/phoenix/blob/c7e9c195/phoenix-core/pom.xml
--
diff --git a/phoenix-core/pom.xml b/phoenix-core/pom.xml
index 8b09c67..0764e9a 100644
--- a/phoenix-core/pom.xml
+++ b/phoenix-core/pom.xml
@@ -4,7 +4,7 @@
   
 org.apache.phoenix
 phoenix
-4.14.0-cdh5.11.2
+4.14.0-cdh5.14.2-SNAPSHOT
   
   phoenix-core
   Phoenix Core

http://git-wip-us.apache.org/repos/asf/phoenix/blob/c7e9c195/phoenix-core/src/main/java/org/apache/hadoop/hbase/ipc/PhoenixRpcScheduler.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/hadoop/hbase/ipc/PhoenixRpcScheduler.java
 
b/phoenix-core/src/main/java/org/apache/hadoop/hbase/ipc/PhoenixRpcScheduler.java
index 4fdddf5..d1f05f8 100644
--- 
a/phoenix-core/src/main/java/org/apache/hadoop/hbase/ipc/PhoenixRpcScheduler.java
+++ 
b/phoenix-core/src/main/java/org/apache/hadoop/hbase/ipc/PhoenixRpcScheduler.java
@@ -124,6 +124,36 @@ public class PhoenixRpcScheduler extends RpcScheduler {
 public void setMetadataExecutorForTesting(RpcExecutor executor) {
 this.metadataCallExecutor = executor;
 }
-
-
+
+@Override
+public int getReadQueueLength() {
+return delegate.getReadQueueLength();
+}
+
+@Override
+public int getWriteQueueLength() {
+return delegate.getWriteQueueLength();
+}
+
+@Override
+public int getScanQueueLength() {
+return delegate.getScanQueueLength();
+}
+
+@Override
+public int getActiveReadRpcHandlerCount() {
+return delegate.getActiveReadRpcHandlerCount();
+}
+
+@Override
+public int getActiveWriteRpcHandlerCount() {
+return delegate.getActiveWriteRpcHandlerCount();
+}
+
+@Override
+public int getActiveScanRpcHandlerCount() {
+return delegate.getActiveScanRpcHandlerCount();
+}
+
+
 }

http://git-wip-us.apache.org/repos/asf/phoenix/blob/c7e9c195/phoenix-flume/pom.xml
--
diff --git a/phoenix-flume/pom.xml b/phoenix-flume/pom.xml
index e400589..e0532cb 100644
--- a/phoenix-flume/pom.xml
+++ b/phoenix-flume/pom.xml
@@ -26,7 +26,7 @@
   
 org.apache.phoenix

[6/6] phoenix git commit: Changes for CDH 5.13.x

2018-05-25 Thread pboado

Changes for CDH 5.13.x


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

Branch: refs/heads/4.x-cdh5.13
Commit: 79c8a6637a7b94e57aa6ee52478b8a352713626f
Parents: cbca731
Author: Pedro Boado 
Authored: Sat Mar 10 17:54:04 2018 +
Committer: Pedro Boado 
Committed: Fri May 25 12:36:03 2018 +0100

--
 phoenix-assembly/pom.xml|  2 +-
 phoenix-client/pom.xml  |  2 +-
 phoenix-core/pom.xml|  2 +-
 .../hadoop/hbase/ipc/PhoenixRpcScheduler.java   | 34 ++--
 phoenix-flume/pom.xml   |  2 +-
 phoenix-hive/pom.xml|  2 +-
 phoenix-kafka/pom.xml   |  2 +-
 phoenix-load-balancer/pom.xml   |  2 +-
 phoenix-parcel/pom.xml  |  2 +-
 phoenix-pherf/pom.xml   |  2 +-
 phoenix-pig/pom.xml |  2 +-
 phoenix-queryserver-client/pom.xml  |  2 +-
 phoenix-queryserver/pom.xml |  2 +-
 phoenix-server/pom.xml  |  2 +-
 phoenix-spark/pom.xml   |  2 +-
 phoenix-tracing-webapp/pom.xml  |  2 +-
 pom.xml |  4 +--
 17 files changed, 49 insertions(+), 19 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/79c8a663/phoenix-assembly/pom.xml
--
diff --git a/phoenix-assembly/pom.xml b/phoenix-assembly/pom.xml
index 7d98c25..f0cd238 100644
--- a/phoenix-assembly/pom.xml
+++ b/phoenix-assembly/pom.xml
@@ -27,7 +27,7 @@
   
 org.apache.phoenix
 phoenix
-4.14.0-cdh5.11.2
+4.14.0-cdh5.13.2-SNAPSHOT
   
   phoenix-assembly
   Phoenix Assembly

http://git-wip-us.apache.org/repos/asf/phoenix/blob/79c8a663/phoenix-client/pom.xml
--
diff --git a/phoenix-client/pom.xml b/phoenix-client/pom.xml
index fef18c2..b4da311 100644
--- a/phoenix-client/pom.xml
+++ b/phoenix-client/pom.xml
@@ -27,7 +27,7 @@
   
 org.apache.phoenix
 phoenix
-4.14.0-cdh5.11.2
+4.14.0-cdh5.13.2-SNAPSHOT
   
   phoenix-client
   Phoenix Client

http://git-wip-us.apache.org/repos/asf/phoenix/blob/79c8a663/phoenix-core/pom.xml
--
diff --git a/phoenix-core/pom.xml b/phoenix-core/pom.xml
index 8b09c67..0e33bf5 100644
--- a/phoenix-core/pom.xml
+++ b/phoenix-core/pom.xml
@@ -4,7 +4,7 @@
   
 org.apache.phoenix
 phoenix
-4.14.0-cdh5.11.2
+4.14.0-cdh5.13.2-SNAPSHOT
   
   phoenix-core
   Phoenix Core

http://git-wip-us.apache.org/repos/asf/phoenix/blob/79c8a663/phoenix-core/src/main/java/org/apache/hadoop/hbase/ipc/PhoenixRpcScheduler.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/hadoop/hbase/ipc/PhoenixRpcScheduler.java
 
b/phoenix-core/src/main/java/org/apache/hadoop/hbase/ipc/PhoenixRpcScheduler.java
index 4fdddf5..d1f05f8 100644
--- 
a/phoenix-core/src/main/java/org/apache/hadoop/hbase/ipc/PhoenixRpcScheduler.java
+++ 
b/phoenix-core/src/main/java/org/apache/hadoop/hbase/ipc/PhoenixRpcScheduler.java
@@ -124,6 +124,36 @@ public class PhoenixRpcScheduler extends RpcScheduler {
 public void setMetadataExecutorForTesting(RpcExecutor executor) {
 this.metadataCallExecutor = executor;
 }
-
-
+
+@Override
+public int getReadQueueLength() {
+return delegate.getReadQueueLength();
+}
+
+@Override
+public int getWriteQueueLength() {
+return delegate.getWriteQueueLength();
+}
+
+@Override
+public int getScanQueueLength() {
+return delegate.getScanQueueLength();
+}
+
+@Override
+public int getActiveReadRpcHandlerCount() {
+return delegate.getActiveReadRpcHandlerCount();
+}
+
+@Override
+public int getActiveWriteRpcHandlerCount() {
+return delegate.getActiveWriteRpcHandlerCount();
+}
+
+@Override
+public int getActiveScanRpcHandlerCount() {
+return delegate.getActiveScanRpcHandlerCount();
+}
+
+
 }

http://git-wip-us.apache.org/repos/asf/phoenix/blob/79c8a663/phoenix-flume/pom.xml
--
diff --git a/phoenix-flume/pom.xml b/phoenix-flume/pom.xml
index e400589..bcc037c 100644
--- a/phoenix-flume/pom.xml
+++ b/phoenix-flume/pom.xml
@@ -26,7 +26,7 @@
   
 org.apache.phoenix

[2/6] phoenix git commit: PHOENIX-4745 Update Tephra version to 0.14.0-incubating

2018-05-25 Thread pboado

PHOENIX-4745 Update Tephra version to 0.14.0-incubating


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

Branch: refs/heads/4.x-cdh5.13
Commit: df2a7e69808ed0be53afea3734aab6ea0149d1ad
Parents: 574d818
Author: James Taylor 
Authored: Thu May 24 16:10:52 2018 -0700
Committer: James Taylor 
Committed: Thu May 24 18:01:45 2018 -0700

--
 .../phoenix/query/QueryServicesOptions.java |  5 +-
 .../transaction/TephraTransactionContext.java   | 74 +++-
 pom.xml |  2 +-
 3 files changed, 78 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/df2a7e69/phoenix-core/src/main/java/org/apache/phoenix/query/QueryServicesOptions.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/query/QueryServicesOptions.java 
b/phoenix-core/src/main/java/org/apache/phoenix/query/QueryServicesOptions.java
index d708785..307c5dd 100644
--- 
a/phoenix-core/src/main/java/org/apache/phoenix/query/QueryServicesOptions.java
+++ 
b/phoenix-core/src/main/java/org/apache/phoenix/query/QueryServicesOptions.java
@@ -117,6 +117,7 @@ import org.apache.phoenix.trace.util.Tracing;
 import org.apache.phoenix.transaction.TransactionFactory;
 import org.apache.phoenix.util.DateUtil;
 import org.apache.phoenix.util.ReadOnlyProps;
+import org.apache.tephra.TxConstants;
 
 
 
@@ -440,7 +441,9 @@ public class QueryServicesOptions {
 .setIfUnset(UPLOAD_BINARY_DATA_TYPE_ENCODING, 
DEFAULT_UPLOAD_BINARY_DATA_TYPE_ENCODING)
 .setIfUnset(PHOENIX_ACLS_ENABLED,  DEFAULT_PHOENIX_ACLS_ENABLED)
 .setIfUnset(LOG_LEVEL,  DEFAULT_LOGGING_LEVEL)
-.setIfUnset(LOG_SAMPLE_RATE,  DEFAULT_LOG_SAMPLE_RATE);
+.setIfUnset(LOG_SAMPLE_RATE,  DEFAULT_LOG_SAMPLE_RATE)
+.setIfUnset(TxConstants.TX_PRE_014_CHANGESET_KEY, 
Boolean.FALSE.toString())
+;
 // HBase sets this to 1, so we reset it to something more appropriate.
 // Hopefully HBase will change this, because we can't know if a user 
set
 // it to 1, so we'll change it.

http://git-wip-us.apache.org/repos/asf/phoenix/blob/df2a7e69/phoenix-core/src/main/java/org/apache/phoenix/transaction/TephraTransactionContext.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/transaction/TephraTransactionContext.java
 
b/phoenix-core/src/main/java/org/apache/phoenix/transaction/TephraTransactionContext.java
index 8b16210..9c6af63 100644
--- 
a/phoenix-core/src/main/java/org/apache/phoenix/transaction/TephraTransactionContext.java
+++ 
b/phoenix-core/src/main/java/org/apache/phoenix/transaction/TephraTransactionContext.java
@@ -26,7 +26,9 @@ import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 
 import org.apache.hadoop.hbase.HConstants;
+import org.apache.hadoop.hbase.client.Get;
 import org.apache.hadoop.hbase.client.HTableInterface;
+import org.apache.hadoop.hbase.client.Result;
 import org.apache.hadoop.hbase.util.Bytes;
 import org.apache.phoenix.exception.SQLExceptionCode;
 import org.apache.phoenix.exception.SQLExceptionInfo;
@@ -391,9 +393,79 @@ public class TephraTransactionContext implements 
PhoenixTransactionContext {
 return new TephraTransactionContext(context, subTask);
 }
 
+public static class TransactionAwareHTableDelegate extends 
TransactionAwareHTable implements HTableInterface  {
+private final HTableInterface delegate;
+
+public TransactionAwareHTableDelegate(HTableInterface hTable, 
TxConstants.ConflictDetection conflictLevel) {
+super(hTable, conflictLevel);
+delegate = hTable;
+}
+
+@Override
+public long incrementColumnValue(byte[] row, byte[] family, byte[] 
qualifier, long amount, boolean writeToWAL)
+throws IOException {
+return delegate.incrementColumnValue(row, family, qualifier, 
amount, writeToWAL);
+}
+
+@Override
+public Boolean[] exists(List gets) throws IOException {
+return delegate.exists(gets);
+}
+
+@Override
+public void setAutoFlush(boolean autoFlush) {
+delegate.setAutoFlush(autoFlush);
+}
+
+@Override
+public void setAutoFlush(boolean autoFlush, boolean clearBufferOnFail) 
{
+delegate.setAutoFlush(autoFlush, clearBufferOnFail);
+}
+
+@Override
+public

[3/6] phoenix git commit: PHOENIX-2314 Cannot prepare parameterized statement with a 'like' predicate

2018-05-25 Thread pboado

PHOENIX-2314 Cannot prepare parameterized statement with a 'like' predicate


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

Branch: refs/heads/4.x-cdh5.14
Commit: 5fb85b5fcd575552c4952e1d48164820e3a66c8d
Parents: df2a7e6
Author: kliewkliew 
Authored: Fri Sep 1 22:28:44 2017 +0100
Committer: Pedro Boado 
Committed: Fri May 25 09:24:04 2018 +0100

--
 .../phoenix/end2end/LikeExpressionIT.java   | 16 +++
 .../phoenix/compile/ExpressionCompiler.java |  2 +-
 .../phoenix/end2end/QueryServerBasicsIT.java| 28 
 3 files changed, 45 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/5fb85b5f/phoenix-core/src/it/java/org/apache/phoenix/end2end/LikeExpressionIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/LikeExpressionIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/LikeExpressionIT.java
index c2198cc..0b061d5 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/LikeExpressionIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/LikeExpressionIT.java
@@ -414,4 +414,20 @@ public class LikeExpressionIT extends 
ParallelStatsDisabledIT {
 assertEquals(expectedCount, i);
 }
 }
+
+@Test
+public void testParameterizedLikeExpression() throws Exception {
+final Connection conn = DriverManager.getConnection(getUrl());
+final PreparedStatement select = conn.prepareStatement(
+"select k from " + tableName + " where k like ?");
+select.setString(1, "12%");
+ResultSet rs = select.executeQuery();
+assertTrue(rs.next());
+assertEquals("123n7-app-2-", rs.getString(1));
+assertFalse(rs.next());
+
+select.setString(1, null);
+rs = select.executeQuery();
+assertFalse(rs.next());
+}
 }

http://git-wip-us.apache.org/repos/asf/phoenix/blob/5fb85b5f/phoenix-core/src/main/java/org/apache/phoenix/compile/ExpressionCompiler.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/compile/ExpressionCompiler.java 
b/phoenix-core/src/main/java/org/apache/phoenix/compile/ExpressionCompiler.java
index fb4c542..9daa744 100644
--- 
a/phoenix-core/src/main/java/org/apache/phoenix/compile/ExpressionCompiler.java
+++ 
b/phoenix-core/src/main/java/org/apache/phoenix/compile/ExpressionCompiler.java
@@ -498,7 +498,7 @@ public class ExpressionCompiler extends 
UnsupportedAllParseNodeVisitor 0
 // We can't use lhs IS NOT NULL b/c if lhs is NULL we need

http://git-wip-us.apache.org/repos/asf/phoenix/blob/5fb85b5f/phoenix-queryserver/src/it/java/org/apache/phoenix/end2end/QueryServerBasicsIT.java
--
diff --git 
a/phoenix-queryserver/src/it/java/org/apache/phoenix/end2end/QueryServerBasicsIT.java
 
b/phoenix-queryserver/src/it/java/org/apache/phoenix/end2end/QueryServerBasicsIT.java
index ca4cf0b..ceb0a78 100644
--- 
a/phoenix-queryserver/src/it/java/org/apache/phoenix/end2end/QueryServerBasicsIT.java
+++ 
b/phoenix-queryserver/src/it/java/org/apache/phoenix/end2end/QueryServerBasicsIT.java
@@ -315,4 +315,32 @@ public class QueryServerBasicsIT extends 
BaseHBaseManagedTimeIT {
   private int getArrayValueForOffset(int arrayOffset) {
   return arrayOffset * 2 + 1;
   }
+
+  @Test
+  public void testParameterizedLikeExpression() throws Exception {
+final Connection conn = DriverManager.getConnection(CONN_STRING);
+final String tableName = generateUniqueName();
+conn.createStatement().execute(
+"CREATE TABLE " + tableName + " (k VARCHAR NOT NULL PRIMARY KEY, i 
INTEGER)");
+conn.commit();
+
+final PreparedStatement upsert = conn.prepareStatement(
+"UPSERT INTO " + tableName + " VALUES (?, ?)");
+upsert.setString(1, "123n7-app-2-");
+upsert.setInt(2, 1);
+upsert.executeUpdate();
+conn.commit();
+
+final PreparedStatement select = conn.prepareStatement(
+"select k from " + tableName + " where k like ?");
+select.setString(1, "12%");
+ResultSet rs = select.executeQuery();
+assertTrue(rs.next());
+assertEquals("123n7-app-2-", rs.getString(1));
+assertFalse(rs.next());
+
+select.setString(1, null);
+rs = select.executeQuery();
+assertFalse(rs.next());
+  }
 }

[5/6] phoenix git commit: Increase parcel patch count for rc1

2018-05-25 Thread pboado

Increase parcel patch count for rc1


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

Branch: refs/heads/4.x-cdh5.14
Commit: cbca73177ce98985a88dc9e8ecc8e14c2c70931e
Parents: 40d04cb
Author: Pedro Boado 
Authored: Fri May 25 09:25:31 2018 +0100
Committer: Pedro Boado 
Committed: Fri May 25 09:26:21 2018 +0100

--
 phoenix-parcel/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/cbca7317/phoenix-parcel/pom.xml
--
diff --git a/phoenix-parcel/pom.xml b/phoenix-parcel/pom.xml
index 7f6df27..5bfa9b5 100644
--- a/phoenix-parcel/pom.xml
+++ b/phoenix-parcel/pom.xml
@@ -38,7 +38,7 @@
 true
 ${project.basedir}/..
 true
-0
+1
 0.${parcel.patch.count}
 
APACHE_PHOENIX-${phoenix.version}-${cdh.version}.p${parcel.release}
 ${parcel.folder}.parcel

[5/6] phoenix git commit: Increase parcel patch count for rc1

2018-05-25 Thread pboado

Increase parcel patch count for rc1


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

Branch: refs/heads/4.x-cdh5.13
Commit: cbca73177ce98985a88dc9e8ecc8e14c2c70931e
Parents: 40d04cb
Author: Pedro Boado 
Authored: Fri May 25 09:25:31 2018 +0100
Committer: Pedro Boado 
Committed: Fri May 25 09:26:21 2018 +0100

--
 phoenix-parcel/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/cbca7317/phoenix-parcel/pom.xml
--
diff --git a/phoenix-parcel/pom.xml b/phoenix-parcel/pom.xml
index 7f6df27..5bfa9b5 100644
--- a/phoenix-parcel/pom.xml
+++ b/phoenix-parcel/pom.xml
@@ -38,7 +38,7 @@
 true
 ${project.basedir}/..
 true
-0
+1
 0.${parcel.patch.count}
 
APACHE_PHOENIX-${phoenix.version}-${cdh.version}.p${parcel.release}
 ${parcel.folder}.parcel

[2/6] phoenix git commit: PHOENIX-4745 Update Tephra version to 0.14.0-incubating

2018-05-25 Thread pboado

PHOENIX-4745 Update Tephra version to 0.14.0-incubating


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

Branch: refs/heads/4.x-cdh5.14
Commit: df2a7e69808ed0be53afea3734aab6ea0149d1ad
Parents: 574d818
Author: James Taylor 
Authored: Thu May 24 16:10:52 2018 -0700
Committer: James Taylor 
Committed: Thu May 24 18:01:45 2018 -0700

--
 .../phoenix/query/QueryServicesOptions.java |  5 +-
 .../transaction/TephraTransactionContext.java   | 74 +++-
 pom.xml |  2 +-
 3 files changed, 78 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/df2a7e69/phoenix-core/src/main/java/org/apache/phoenix/query/QueryServicesOptions.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/query/QueryServicesOptions.java 
b/phoenix-core/src/main/java/org/apache/phoenix/query/QueryServicesOptions.java
index d708785..307c5dd 100644
--- 
a/phoenix-core/src/main/java/org/apache/phoenix/query/QueryServicesOptions.java
+++ 
b/phoenix-core/src/main/java/org/apache/phoenix/query/QueryServicesOptions.java
@@ -117,6 +117,7 @@ import org.apache.phoenix.trace.util.Tracing;
 import org.apache.phoenix.transaction.TransactionFactory;
 import org.apache.phoenix.util.DateUtil;
 import org.apache.phoenix.util.ReadOnlyProps;
+import org.apache.tephra.TxConstants;
 
 
 
@@ -440,7 +441,9 @@ public class QueryServicesOptions {
 .setIfUnset(UPLOAD_BINARY_DATA_TYPE_ENCODING, 
DEFAULT_UPLOAD_BINARY_DATA_TYPE_ENCODING)
 .setIfUnset(PHOENIX_ACLS_ENABLED,  DEFAULT_PHOENIX_ACLS_ENABLED)
 .setIfUnset(LOG_LEVEL,  DEFAULT_LOGGING_LEVEL)
-.setIfUnset(LOG_SAMPLE_RATE,  DEFAULT_LOG_SAMPLE_RATE);
+.setIfUnset(LOG_SAMPLE_RATE,  DEFAULT_LOG_SAMPLE_RATE)
+.setIfUnset(TxConstants.TX_PRE_014_CHANGESET_KEY, 
Boolean.FALSE.toString())
+;
 // HBase sets this to 1, so we reset it to something more appropriate.
 // Hopefully HBase will change this, because we can't know if a user 
set
 // it to 1, so we'll change it.

http://git-wip-us.apache.org/repos/asf/phoenix/blob/df2a7e69/phoenix-core/src/main/java/org/apache/phoenix/transaction/TephraTransactionContext.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/transaction/TephraTransactionContext.java
 
b/phoenix-core/src/main/java/org/apache/phoenix/transaction/TephraTransactionContext.java
index 8b16210..9c6af63 100644
--- 
a/phoenix-core/src/main/java/org/apache/phoenix/transaction/TephraTransactionContext.java
+++ 
b/phoenix-core/src/main/java/org/apache/phoenix/transaction/TephraTransactionContext.java
@@ -26,7 +26,9 @@ import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 
 import org.apache.hadoop.hbase.HConstants;
+import org.apache.hadoop.hbase.client.Get;
 import org.apache.hadoop.hbase.client.HTableInterface;
+import org.apache.hadoop.hbase.client.Result;
 import org.apache.hadoop.hbase.util.Bytes;
 import org.apache.phoenix.exception.SQLExceptionCode;
 import org.apache.phoenix.exception.SQLExceptionInfo;
@@ -391,9 +393,79 @@ public class TephraTransactionContext implements 
PhoenixTransactionContext {
 return new TephraTransactionContext(context, subTask);
 }
 
+public static class TransactionAwareHTableDelegate extends 
TransactionAwareHTable implements HTableInterface  {
+private final HTableInterface delegate;
+
+public TransactionAwareHTableDelegate(HTableInterface hTable, 
TxConstants.ConflictDetection conflictLevel) {
+super(hTable, conflictLevel);
+delegate = hTable;
+}
+
+@Override
+public long incrementColumnValue(byte[] row, byte[] family, byte[] 
qualifier, long amount, boolean writeToWAL)
+throws IOException {
+return delegate.incrementColumnValue(row, family, qualifier, 
amount, writeToWAL);
+}
+
+@Override
+public Boolean[] exists(List gets) throws IOException {
+return delegate.exists(gets);
+}
+
+@Override
+public void setAutoFlush(boolean autoFlush) {
+delegate.setAutoFlush(autoFlush);
+}
+
+@Override
+public void setAutoFlush(boolean autoFlush, boolean clearBufferOnFail) 
{
+delegate.setAutoFlush(autoFlush, clearBufferOnFail);
+}
+
+@Override
+public

[4/6] phoenix git commit: PHOENIX-4706 Remove bundling dependencies into phoenix-core

2018-05-25 Thread pboado

PHOENIX-4706 Remove bundling dependencies into phoenix-core


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

Branch: refs/heads/4.x-cdh5.14
Commit: 40d04cbab498fa127f4f453ee8a6a0888ba7d01d
Parents: 5fb85b5
Author: Josh Elser 
Authored: Tue May 8 04:01:35 2018 +0100
Committer: Pedro Boado 
Committed: Fri May 25 09:24:13 2018 +0100

--
 phoenix-core/pom.xml | 28 
 1 file changed, 28 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/40d04cba/phoenix-core/pom.xml
--
diff --git a/phoenix-core/pom.xml b/phoenix-core/pom.xml
index 60c04d4..8b09c67 100644
--- a/phoenix-core/pom.xml
+++ b/phoenix-core/pom.xml
@@ -170,34 +170,6 @@
 
   
   
-
-maven-assembly-plugin
-
-  
-core
-package
-
-  single
-
-
-  false
-  phoenix
-  
-true
-
-  true
-  
true
-  
true
-
-  
-  
-src/build/phoenix-core.xml
-  
-
-  
-  
-  
-  
 org.apache.maven.plugins
 maven-failsafe-plugin

[3/6] phoenix git commit: PHOENIX-2314 Cannot prepare parameterized statement with a 'like' predicate

2018-05-25 Thread pboado

PHOENIX-2314 Cannot prepare parameterized statement with a 'like' predicate


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

Branch: refs/heads/4.x-cdh5.13
Commit: 5fb85b5fcd575552c4952e1d48164820e3a66c8d
Parents: df2a7e6
Author: kliewkliew 
Authored: Fri Sep 1 22:28:44 2017 +0100
Committer: Pedro Boado 
Committed: Fri May 25 09:24:04 2018 +0100

--
 .../phoenix/end2end/LikeExpressionIT.java   | 16 +++
 .../phoenix/compile/ExpressionCompiler.java |  2 +-
 .../phoenix/end2end/QueryServerBasicsIT.java| 28 
 3 files changed, 45 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/5fb85b5f/phoenix-core/src/it/java/org/apache/phoenix/end2end/LikeExpressionIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/LikeExpressionIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/LikeExpressionIT.java
index c2198cc..0b061d5 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/LikeExpressionIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/LikeExpressionIT.java
@@ -414,4 +414,20 @@ public class LikeExpressionIT extends 
ParallelStatsDisabledIT {
 assertEquals(expectedCount, i);
 }
 }
+
+@Test
+public void testParameterizedLikeExpression() throws Exception {
+final Connection conn = DriverManager.getConnection(getUrl());
+final PreparedStatement select = conn.prepareStatement(
+"select k from " + tableName + " where k like ?");
+select.setString(1, "12%");
+ResultSet rs = select.executeQuery();
+assertTrue(rs.next());
+assertEquals("123n7-app-2-", rs.getString(1));
+assertFalse(rs.next());
+
+select.setString(1, null);
+rs = select.executeQuery();
+assertFalse(rs.next());
+}
 }

http://git-wip-us.apache.org/repos/asf/phoenix/blob/5fb85b5f/phoenix-core/src/main/java/org/apache/phoenix/compile/ExpressionCompiler.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/compile/ExpressionCompiler.java 
b/phoenix-core/src/main/java/org/apache/phoenix/compile/ExpressionCompiler.java
index fb4c542..9daa744 100644
--- 
a/phoenix-core/src/main/java/org/apache/phoenix/compile/ExpressionCompiler.java
+++ 
b/phoenix-core/src/main/java/org/apache/phoenix/compile/ExpressionCompiler.java
@@ -498,7 +498,7 @@ public class ExpressionCompiler extends 
UnsupportedAllParseNodeVisitor 0
 // We can't use lhs IS NOT NULL b/c if lhs is NULL we need

http://git-wip-us.apache.org/repos/asf/phoenix/blob/5fb85b5f/phoenix-queryserver/src/it/java/org/apache/phoenix/end2end/QueryServerBasicsIT.java
--
diff --git 
a/phoenix-queryserver/src/it/java/org/apache/phoenix/end2end/QueryServerBasicsIT.java
 
b/phoenix-queryserver/src/it/java/org/apache/phoenix/end2end/QueryServerBasicsIT.java
index ca4cf0b..ceb0a78 100644
--- 
a/phoenix-queryserver/src/it/java/org/apache/phoenix/end2end/QueryServerBasicsIT.java
+++ 
b/phoenix-queryserver/src/it/java/org/apache/phoenix/end2end/QueryServerBasicsIT.java
@@ -315,4 +315,32 @@ public class QueryServerBasicsIT extends 
BaseHBaseManagedTimeIT {
   private int getArrayValueForOffset(int arrayOffset) {
   return arrayOffset * 2 + 1;
   }
+
+  @Test
+  public void testParameterizedLikeExpression() throws Exception {
+final Connection conn = DriverManager.getConnection(CONN_STRING);
+final String tableName = generateUniqueName();
+conn.createStatement().execute(
+"CREATE TABLE " + tableName + " (k VARCHAR NOT NULL PRIMARY KEY, i 
INTEGER)");
+conn.commit();
+
+final PreparedStatement upsert = conn.prepareStatement(
+"UPSERT INTO " + tableName + " VALUES (?, ?)");
+upsert.setString(1, "123n7-app-2-");
+upsert.setInt(2, 1);
+upsert.executeUpdate();
+conn.commit();
+
+final PreparedStatement select = conn.prepareStatement(
+"select k from " + tableName + " where k like ?");
+select.setString(1, "12%");
+ResultSet rs = select.executeQuery();
+assertTrue(rs.next());
+assertEquals("123n7-app-2-", rs.getString(1));
+assertFalse(rs.next());
+
+select.setString(1, null);
+rs = select.executeQuery();
+assertFalse(rs.next());
+  }
 }

[2/3] phoenix git commit: PHOENIX-4706 Remove bundling dependencies into phoenix-core

2018-05-25 Thread pboado

PHOENIX-4706 Remove bundling dependencies into phoenix-core


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

Branch: refs/heads/4.x-cdh5.11
Commit: 40d04cbab498fa127f4f453ee8a6a0888ba7d01d
Parents: 5fb85b5
Author: Josh Elser 
Authored: Tue May 8 04:01:35 2018 +0100
Committer: Pedro Boado 
Committed: Fri May 25 09:24:13 2018 +0100

--
 phoenix-core/pom.xml | 28 
 1 file changed, 28 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/40d04cba/phoenix-core/pom.xml
--
diff --git a/phoenix-core/pom.xml b/phoenix-core/pom.xml
index 60c04d4..8b09c67 100644
--- a/phoenix-core/pom.xml
+++ b/phoenix-core/pom.xml
@@ -170,34 +170,6 @@
 
   
   
-
-maven-assembly-plugin
-
-  
-core
-package
-
-  single
-
-
-  false
-  phoenix
-  
-true
-
-  true
-  
true
-  
true
-
-  
-  
-src/build/phoenix-core.xml
-  
-
-  
-  
-  
-  
 org.apache.maven.plugins
 maven-failsafe-plugin

[3/3] phoenix git commit: Increase parcel patch count for rc1

2018-05-25 Thread pboado

Increase parcel patch count for rc1


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

Branch: refs/heads/4.x-cdh5.11
Commit: cbca73177ce98985a88dc9e8ecc8e14c2c70931e
Parents: 40d04cb
Author: Pedro Boado 
Authored: Fri May 25 09:25:31 2018 +0100
Committer: Pedro Boado 
Committed: Fri May 25 09:26:21 2018 +0100

--
 phoenix-parcel/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/cbca7317/phoenix-parcel/pom.xml
--
diff --git a/phoenix-parcel/pom.xml b/phoenix-parcel/pom.xml
index 7f6df27..5bfa9b5 100644
--- a/phoenix-parcel/pom.xml
+++ b/phoenix-parcel/pom.xml
@@ -38,7 +38,7 @@
 true
 ${project.basedir}/..
 true
-0
+1
 0.${parcel.patch.count}
 
APACHE_PHOENIX-${phoenix.version}-${cdh.version}.p${parcel.release}
 ${parcel.folder}.parcel

[1/3] phoenix git commit: PHOENIX-2314 Cannot prepare parameterized statement with a 'like' predicate

2018-05-25 Thread pboado

Repository: phoenix
Updated Branches:
  refs/heads/4.x-cdh5.11 df2a7e698 -> cbca73177


PHOENIX-2314 Cannot prepare parameterized statement with a 'like' predicate


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

Branch: refs/heads/4.x-cdh5.11
Commit: 5fb85b5fcd575552c4952e1d48164820e3a66c8d
Parents: df2a7e6
Author: kliewkliew 
Authored: Fri Sep 1 22:28:44 2017 +0100
Committer: Pedro Boado 
Committed: Fri May 25 09:24:04 2018 +0100

--
 .../phoenix/end2end/LikeExpressionIT.java   | 16 +++
 .../phoenix/compile/ExpressionCompiler.java |  2 +-
 .../phoenix/end2end/QueryServerBasicsIT.java| 28 
 3 files changed, 45 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/5fb85b5f/phoenix-core/src/it/java/org/apache/phoenix/end2end/LikeExpressionIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/LikeExpressionIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/LikeExpressionIT.java
index c2198cc..0b061d5 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/LikeExpressionIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/LikeExpressionIT.java
@@ -414,4 +414,20 @@ public class LikeExpressionIT extends 
ParallelStatsDisabledIT {
 assertEquals(expectedCount, i);
 }
 }
+
+@Test
+public void testParameterizedLikeExpression() throws Exception {
+final Connection conn = DriverManager.getConnection(getUrl());
+final PreparedStatement select = conn.prepareStatement(
+"select k from " + tableName + " where k like ?");
+select.setString(1, "12%");
+ResultSet rs = select.executeQuery();
+assertTrue(rs.next());
+assertEquals("123n7-app-2-", rs.getString(1));
+assertFalse(rs.next());
+
+select.setString(1, null);
+rs = select.executeQuery();
+assertFalse(rs.next());
+}
 }

http://git-wip-us.apache.org/repos/asf/phoenix/blob/5fb85b5f/phoenix-core/src/main/java/org/apache/phoenix/compile/ExpressionCompiler.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/compile/ExpressionCompiler.java 
b/phoenix-core/src/main/java/org/apache/phoenix/compile/ExpressionCompiler.java
index fb4c542..9daa744 100644
--- 
a/phoenix-core/src/main/java/org/apache/phoenix/compile/ExpressionCompiler.java
+++ 
b/phoenix-core/src/main/java/org/apache/phoenix/compile/ExpressionCompiler.java
@@ -498,7 +498,7 @@ public class ExpressionCompiler extends 
UnsupportedAllParseNodeVisitor 0
 // We can't use lhs IS NOT NULL b/c if lhs is NULL we need

http://git-wip-us.apache.org/repos/asf/phoenix/blob/5fb85b5f/phoenix-queryserver/src/it/java/org/apache/phoenix/end2end/QueryServerBasicsIT.java
--
diff --git 
a/phoenix-queryserver/src/it/java/org/apache/phoenix/end2end/QueryServerBasicsIT.java
 
b/phoenix-queryserver/src/it/java/org/apache/phoenix/end2end/QueryServerBasicsIT.java
index ca4cf0b..ceb0a78 100644
--- 
a/phoenix-queryserver/src/it/java/org/apache/phoenix/end2end/QueryServerBasicsIT.java
+++ 
b/phoenix-queryserver/src/it/java/org/apache/phoenix/end2end/QueryServerBasicsIT.java
@@ -315,4 +315,32 @@ public class QueryServerBasicsIT extends 
BaseHBaseManagedTimeIT {
   private int getArrayValueForOffset(int arrayOffset) {
   return arrayOffset * 2 + 1;
   }
+
+  @Test
+  public void testParameterizedLikeExpression() throws Exception {
+final Connection conn = DriverManager.getConnection(CONN_STRING);
+final String tableName = generateUniqueName();
+conn.createStatement().execute(
+"CREATE TABLE " + tableName + " (k VARCHAR NOT NULL PRIMARY KEY, i 
INTEGER)");
+conn.commit();
+
+final PreparedStatement upsert = conn.prepareStatement(
+"UPSERT INTO " + tableName + " VALUES (?, ?)");
+upsert.setString(1, "123n7-app-2-");
+upsert.setInt(2, 1);
+upsert.executeUpdate();
+conn.commit();
+
+final PreparedStatement select = conn.prepareStatement(
+"select k from " + tableName + " where k like ?");
+select.setString(1, "12%");
+ResultSet rs = select.executeQuery();
+assertTrue(rs.next());
+assertEquals("123n7-app-2-", rs.getString(1));
+assertFalse(rs.next());
+
+select.setString(1, null);
+rs = select.executeQuery();
+assertFalse(rs.next());
+  }
 }

[4/6] phoenix git commit: PHOENIX-4706 Remove bundling dependencies into phoenix-core

2018-05-25 Thread pboado

PHOENIX-4706 Remove bundling dependencies into phoenix-core


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

Branch: refs/heads/4.x-cdh5.12
Commit: 40d04cbab498fa127f4f453ee8a6a0888ba7d01d
Parents: 5fb85b5
Author: Josh Elser 
Authored: Tue May 8 04:01:35 2018 +0100
Committer: Pedro Boado 
Committed: Fri May 25 09:24:13 2018 +0100

--
 phoenix-core/pom.xml | 28 
 1 file changed, 28 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/40d04cba/phoenix-core/pom.xml
--
diff --git a/phoenix-core/pom.xml b/phoenix-core/pom.xml
index 60c04d4..8b09c67 100644
--- a/phoenix-core/pom.xml
+++ b/phoenix-core/pom.xml
@@ -170,34 +170,6 @@
 
   
   
-
-maven-assembly-plugin
-
-  
-core
-package
-
-  single
-
-
-  false
-  phoenix
-  
-true
-
-  true
-  
true
-  
true
-
-  
-  
-src/build/phoenix-core.xml
-  
-
-  
-  
-  
-  
 org.apache.maven.plugins
 maven-failsafe-plugin

[3/6] phoenix git commit: PHOENIX-2314 Cannot prepare parameterized statement with a 'like' predicate

2018-05-25 Thread pboado

PHOENIX-2314 Cannot prepare parameterized statement with a 'like' predicate


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

Branch: refs/heads/4.x-cdh5.12
Commit: 5fb85b5fcd575552c4952e1d48164820e3a66c8d
Parents: df2a7e6
Author: kliewkliew 
Authored: Fri Sep 1 22:28:44 2017 +0100
Committer: Pedro Boado 
Committed: Fri May 25 09:24:04 2018 +0100

--
 .../phoenix/end2end/LikeExpressionIT.java   | 16 +++
 .../phoenix/compile/ExpressionCompiler.java |  2 +-
 .../phoenix/end2end/QueryServerBasicsIT.java| 28 
 3 files changed, 45 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/5fb85b5f/phoenix-core/src/it/java/org/apache/phoenix/end2end/LikeExpressionIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/LikeExpressionIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/LikeExpressionIT.java
index c2198cc..0b061d5 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/LikeExpressionIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/LikeExpressionIT.java
@@ -414,4 +414,20 @@ public class LikeExpressionIT extends 
ParallelStatsDisabledIT {
 assertEquals(expectedCount, i);
 }
 }
+
+@Test
+public void testParameterizedLikeExpression() throws Exception {
+final Connection conn = DriverManager.getConnection(getUrl());
+final PreparedStatement select = conn.prepareStatement(
+"select k from " + tableName + " where k like ?");
+select.setString(1, "12%");
+ResultSet rs = select.executeQuery();
+assertTrue(rs.next());
+assertEquals("123n7-app-2-", rs.getString(1));
+assertFalse(rs.next());
+
+select.setString(1, null);
+rs = select.executeQuery();
+assertFalse(rs.next());
+}
 }

http://git-wip-us.apache.org/repos/asf/phoenix/blob/5fb85b5f/phoenix-core/src/main/java/org/apache/phoenix/compile/ExpressionCompiler.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/compile/ExpressionCompiler.java 
b/phoenix-core/src/main/java/org/apache/phoenix/compile/ExpressionCompiler.java
index fb4c542..9daa744 100644
--- 
a/phoenix-core/src/main/java/org/apache/phoenix/compile/ExpressionCompiler.java
+++ 
b/phoenix-core/src/main/java/org/apache/phoenix/compile/ExpressionCompiler.java
@@ -498,7 +498,7 @@ public class ExpressionCompiler extends 
UnsupportedAllParseNodeVisitor 0
 // We can't use lhs IS NOT NULL b/c if lhs is NULL we need

http://git-wip-us.apache.org/repos/asf/phoenix/blob/5fb85b5f/phoenix-queryserver/src/it/java/org/apache/phoenix/end2end/QueryServerBasicsIT.java
--
diff --git 
a/phoenix-queryserver/src/it/java/org/apache/phoenix/end2end/QueryServerBasicsIT.java
 
b/phoenix-queryserver/src/it/java/org/apache/phoenix/end2end/QueryServerBasicsIT.java
index ca4cf0b..ceb0a78 100644
--- 
a/phoenix-queryserver/src/it/java/org/apache/phoenix/end2end/QueryServerBasicsIT.java
+++ 
b/phoenix-queryserver/src/it/java/org/apache/phoenix/end2end/QueryServerBasicsIT.java
@@ -315,4 +315,32 @@ public class QueryServerBasicsIT extends 
BaseHBaseManagedTimeIT {
   private int getArrayValueForOffset(int arrayOffset) {
   return arrayOffset * 2 + 1;
   }
+
+  @Test
+  public void testParameterizedLikeExpression() throws Exception {
+final Connection conn = DriverManager.getConnection(CONN_STRING);
+final String tableName = generateUniqueName();
+conn.createStatement().execute(
+"CREATE TABLE " + tableName + " (k VARCHAR NOT NULL PRIMARY KEY, i 
INTEGER)");
+conn.commit();
+
+final PreparedStatement upsert = conn.prepareStatement(
+"UPSERT INTO " + tableName + " VALUES (?, ?)");
+upsert.setString(1, "123n7-app-2-");
+upsert.setInt(2, 1);
+upsert.executeUpdate();
+conn.commit();
+
+final PreparedStatement select = conn.prepareStatement(
+"select k from " + tableName + " where k like ?");
+select.setString(1, "12%");
+ResultSet rs = select.executeQuery();
+assertTrue(rs.next());
+assertEquals("123n7-app-2-", rs.getString(1));
+assertFalse(rs.next());
+
+select.setString(1, null);
+rs = select.executeQuery();
+assertFalse(rs.next());
+  }
 }

[5/6] phoenix git commit: Increase parcel patch count for rc1

2018-05-25 Thread pboado

Increase parcel patch count for rc1


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

Branch: refs/heads/4.x-cdh5.12
Commit: cbca73177ce98985a88dc9e8ecc8e14c2c70931e
Parents: 40d04cb
Author: Pedro Boado 
Authored: Fri May 25 09:25:31 2018 +0100
Committer: Pedro Boado 
Committed: Fri May 25 09:26:21 2018 +0100

--
 phoenix-parcel/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/cbca7317/phoenix-parcel/pom.xml
--
diff --git a/phoenix-parcel/pom.xml b/phoenix-parcel/pom.xml
index 7f6df27..5bfa9b5 100644
--- a/phoenix-parcel/pom.xml
+++ b/phoenix-parcel/pom.xml
@@ -38,7 +38,7 @@
 true
 ${project.basedir}/..
 true
-0
+1
 0.${parcel.patch.count}
 
APACHE_PHOENIX-${phoenix.version}-${cdh.version}.p${parcel.release}
 ${parcel.folder}.parcel

[6/6] phoenix git commit: Changes for CDH 5.12.x

2018-05-25 Thread pboado

Changes for CDH 5.12.x


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

Branch: refs/heads/4.x-cdh5.12
Commit: 4e3295017d2407683255aca0c3340a2642191ff8
Parents: cbca731
Author: Pedro Boado 
Authored: Sat Mar 10 17:54:04 2018 +
Committer: Pedro Boado 
Committed: Fri May 25 12:35:12 2018 +0100

--
 phoenix-assembly/pom.xml|  2 +-
 phoenix-client/pom.xml  |  2 +-
 phoenix-core/pom.xml|  2 +-
 .../hadoop/hbase/ipc/PhoenixRpcScheduler.java   | 34 ++--
 phoenix-flume/pom.xml   |  2 +-
 phoenix-hive/pom.xml|  2 +-
 phoenix-kafka/pom.xml   |  2 +-
 phoenix-load-balancer/pom.xml   |  2 +-
 phoenix-parcel/pom.xml  |  2 +-
 phoenix-pherf/pom.xml   |  2 +-
 phoenix-pig/pom.xml |  2 +-
 phoenix-queryserver-client/pom.xml  |  2 +-
 phoenix-queryserver/pom.xml |  2 +-
 phoenix-server/pom.xml  |  2 +-
 phoenix-spark/pom.xml   |  2 +-
 phoenix-tracing-webapp/pom.xml  |  2 +-
 pom.xml |  4 +--
 17 files changed, 49 insertions(+), 19 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/4e329501/phoenix-assembly/pom.xml
--
diff --git a/phoenix-assembly/pom.xml b/phoenix-assembly/pom.xml
index 7d98c25..14225ee 100644
--- a/phoenix-assembly/pom.xml
+++ b/phoenix-assembly/pom.xml
@@ -27,7 +27,7 @@
   
 org.apache.phoenix
 phoenix
-4.14.0-cdh5.11.2
+4.14.0-cdh5.12.2-SNAPSHOT
   
   phoenix-assembly
   Phoenix Assembly

http://git-wip-us.apache.org/repos/asf/phoenix/blob/4e329501/phoenix-client/pom.xml
--
diff --git a/phoenix-client/pom.xml b/phoenix-client/pom.xml
index fef18c2..e211008 100644
--- a/phoenix-client/pom.xml
+++ b/phoenix-client/pom.xml
@@ -27,7 +27,7 @@
   
 org.apache.phoenix
 phoenix
-4.14.0-cdh5.11.2
+4.14.0-cdh5.12.2-SNAPSHOT
   
   phoenix-client
   Phoenix Client

http://git-wip-us.apache.org/repos/asf/phoenix/blob/4e329501/phoenix-core/pom.xml
--
diff --git a/phoenix-core/pom.xml b/phoenix-core/pom.xml
index 8b09c67..7d5b784 100644
--- a/phoenix-core/pom.xml
+++ b/phoenix-core/pom.xml
@@ -4,7 +4,7 @@
   
 org.apache.phoenix
 phoenix
-4.14.0-cdh5.11.2
+4.14.0-cdh5.12.2-SNAPSHOT
   
   phoenix-core
   Phoenix Core

http://git-wip-us.apache.org/repos/asf/phoenix/blob/4e329501/phoenix-core/src/main/java/org/apache/hadoop/hbase/ipc/PhoenixRpcScheduler.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/hadoop/hbase/ipc/PhoenixRpcScheduler.java
 
b/phoenix-core/src/main/java/org/apache/hadoop/hbase/ipc/PhoenixRpcScheduler.java
index 4fdddf5..d1f05f8 100644
--- 
a/phoenix-core/src/main/java/org/apache/hadoop/hbase/ipc/PhoenixRpcScheduler.java
+++ 
b/phoenix-core/src/main/java/org/apache/hadoop/hbase/ipc/PhoenixRpcScheduler.java
@@ -124,6 +124,36 @@ public class PhoenixRpcScheduler extends RpcScheduler {
 public void setMetadataExecutorForTesting(RpcExecutor executor) {
 this.metadataCallExecutor = executor;
 }
-
-
+
+@Override
+public int getReadQueueLength() {
+return delegate.getReadQueueLength();
+}
+
+@Override
+public int getWriteQueueLength() {
+return delegate.getWriteQueueLength();
+}
+
+@Override
+public int getScanQueueLength() {
+return delegate.getScanQueueLength();
+}
+
+@Override
+public int getActiveReadRpcHandlerCount() {
+return delegate.getActiveReadRpcHandlerCount();
+}
+
+@Override
+public int getActiveWriteRpcHandlerCount() {
+return delegate.getActiveWriteRpcHandlerCount();
+}
+
+@Override
+public int getActiveScanRpcHandlerCount() {
+return delegate.getActiveScanRpcHandlerCount();
+}
+
+
 }

http://git-wip-us.apache.org/repos/asf/phoenix/blob/4e329501/phoenix-flume/pom.xml
--
diff --git a/phoenix-flume/pom.xml b/phoenix-flume/pom.xml
index e400589..8a78010 100644
--- a/phoenix-flume/pom.xml
+++ b/phoenix-flume/pom.xml
@@ -26,7 +26,7 @@
   
 org.apache.phoenix

[2/6] phoenix git commit: PHOENIX-4745 Update Tephra version to 0.14.0-incubating

2018-05-25 Thread pboado

PHOENIX-4745 Update Tephra version to 0.14.0-incubating


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

Branch: refs/heads/4.x-cdh5.12
Commit: df2a7e69808ed0be53afea3734aab6ea0149d1ad
Parents: 574d818
Author: James Taylor 
Authored: Thu May 24 16:10:52 2018 -0700
Committer: James Taylor 
Committed: Thu May 24 18:01:45 2018 -0700

--
 .../phoenix/query/QueryServicesOptions.java |  5 +-
 .../transaction/TephraTransactionContext.java   | 74 +++-
 pom.xml |  2 +-
 3 files changed, 78 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/df2a7e69/phoenix-core/src/main/java/org/apache/phoenix/query/QueryServicesOptions.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/query/QueryServicesOptions.java 
b/phoenix-core/src/main/java/org/apache/phoenix/query/QueryServicesOptions.java
index d708785..307c5dd 100644
--- 
a/phoenix-core/src/main/java/org/apache/phoenix/query/QueryServicesOptions.java
+++ 
b/phoenix-core/src/main/java/org/apache/phoenix/query/QueryServicesOptions.java
@@ -117,6 +117,7 @@ import org.apache.phoenix.trace.util.Tracing;
 import org.apache.phoenix.transaction.TransactionFactory;
 import org.apache.phoenix.util.DateUtil;
 import org.apache.phoenix.util.ReadOnlyProps;
+import org.apache.tephra.TxConstants;
 
 
 
@@ -440,7 +441,9 @@ public class QueryServicesOptions {
 .setIfUnset(UPLOAD_BINARY_DATA_TYPE_ENCODING, 
DEFAULT_UPLOAD_BINARY_DATA_TYPE_ENCODING)
 .setIfUnset(PHOENIX_ACLS_ENABLED,  DEFAULT_PHOENIX_ACLS_ENABLED)
 .setIfUnset(LOG_LEVEL,  DEFAULT_LOGGING_LEVEL)
-.setIfUnset(LOG_SAMPLE_RATE,  DEFAULT_LOG_SAMPLE_RATE);
+.setIfUnset(LOG_SAMPLE_RATE,  DEFAULT_LOG_SAMPLE_RATE)
+.setIfUnset(TxConstants.TX_PRE_014_CHANGESET_KEY, 
Boolean.FALSE.toString())
+;
 // HBase sets this to 1, so we reset it to something more appropriate.
 // Hopefully HBase will change this, because we can't know if a user 
set
 // it to 1, so we'll change it.

http://git-wip-us.apache.org/repos/asf/phoenix/blob/df2a7e69/phoenix-core/src/main/java/org/apache/phoenix/transaction/TephraTransactionContext.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/transaction/TephraTransactionContext.java
 
b/phoenix-core/src/main/java/org/apache/phoenix/transaction/TephraTransactionContext.java
index 8b16210..9c6af63 100644
--- 
a/phoenix-core/src/main/java/org/apache/phoenix/transaction/TephraTransactionContext.java
+++ 
b/phoenix-core/src/main/java/org/apache/phoenix/transaction/TephraTransactionContext.java
@@ -26,7 +26,9 @@ import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 
 import org.apache.hadoop.hbase.HConstants;
+import org.apache.hadoop.hbase.client.Get;
 import org.apache.hadoop.hbase.client.HTableInterface;
+import org.apache.hadoop.hbase.client.Result;
 import org.apache.hadoop.hbase.util.Bytes;
 import org.apache.phoenix.exception.SQLExceptionCode;
 import org.apache.phoenix.exception.SQLExceptionInfo;
@@ -391,9 +393,79 @@ public class TephraTransactionContext implements 
PhoenixTransactionContext {
 return new TephraTransactionContext(context, subTask);
 }
 
+public static class TransactionAwareHTableDelegate extends 
TransactionAwareHTable implements HTableInterface  {
+private final HTableInterface delegate;
+
+public TransactionAwareHTableDelegate(HTableInterface hTable, 
TxConstants.ConflictDetection conflictLevel) {
+super(hTable, conflictLevel);
+delegate = hTable;
+}
+
+@Override
+public long incrementColumnValue(byte[] row, byte[] family, byte[] 
qualifier, long amount, boolean writeToWAL)
+throws IOException {
+return delegate.incrementColumnValue(row, family, qualifier, 
amount, writeToWAL);
+}
+
+@Override
+public Boolean[] exists(List gets) throws IOException {
+return delegate.exists(gets);
+}
+
+@Override
+public void setAutoFlush(boolean autoFlush) {
+delegate.setAutoFlush(autoFlush);
+}
+
+@Override
+public void setAutoFlush(boolean autoFlush, boolean clearBufferOnFail) 
{
+delegate.setAutoFlush(autoFlush, clearBufferOnFail);
+}
+
+@Override
+public

[1/6] phoenix git commit: PHOENIX-4692 ArrayIndexOutOfBoundsException in ScanRanges.intersectScan [Forced Update!]

2018-05-25 Thread pboado

Repository: phoenix
Updated Branches:
  refs/heads/4.x-cdh5.12 ef5e6112a -> 4e3295017 (forced update)


PHOENIX-4692 ArrayIndexOutOfBoundsException in ScanRanges.intersectScan


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

Branch: refs/heads/4.x-cdh5.12
Commit: 574d8188af859dc2d0467b681c7b88bd83f27dda
Parents: c2d6bc1
Author: maryannxue 
Authored: Mon May 21 11:17:46 2018 -0700
Committer: maryannxue 
Committed: Mon May 21 11:17:46 2018 -0700

--
 .../apache/phoenix/end2end/SkipScanQueryIT.java | 21 
 .../apache/phoenix/compile/WhereCompiler.java   | 12 +--
 .../apache/phoenix/execute/BaseQueryPlan.java   |  2 +-
 .../apache/phoenix/execute/HashJoinPlan.java|  5 -
 4 files changed, 32 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/574d8188/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 d98bbe2..fb0b568 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
@@ -563,4 +563,25 @@ public class SkipScanQueryIT extends 
ParallelStatsDisabledIT {
 assertFalse(rs.next());
 }
 }
+
+@Test
+public void testSkipScanJoinOptimization() throws Exception {
+try (Connection conn = DriverManager.getConnection(getUrl())) {
+String tableName = generateUniqueName();
+String viewName = generateUniqueName();
+String idxName = "IDX_" + tableName;
+conn.setAutoCommit(true);
+conn.createStatement().execute(
+"create table " + tableName + " (PK1 INTEGER NOT NULL, PK2 
INTEGER NOT NULL, " +
+" ID1 INTEGER, ID2 INTEGER CONSTRAINT PK PRIMARY 
KEY(PK1 , PK2))SALT_BUCKETS = 4");
+conn.createStatement().execute("upsert into " + tableName + " 
values (1,1,1,1)");
+conn.createStatement().execute("upsert into " + tableName + " 
values (2,2,2,2)");
+conn.createStatement().execute("upsert into " + tableName + " 
values (2,3,1,2)");
+conn.createStatement().execute("create view " + viewName + " as 
select * from " +
+tableName + " where PK1 in (1,2)");
+conn.createStatement().execute("create index " + idxName + " on " 
+ viewName + " (ID1)");
+ResultSet rs = conn.createStatement().executeQuery("select /*+ 
INDEX(" + viewName + " " + idxName + ") */ * from " + viewName + " where ID1 = 
1 ");
+assertTrue(rs.next());
+}
+}
 }

http://git-wip-us.apache.org/repos/asf/phoenix/blob/574d8188/phoenix-core/src/main/java/org/apache/phoenix/compile/WhereCompiler.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/compile/WhereCompiler.java 
b/phoenix-core/src/main/java/org/apache/phoenix/compile/WhereCompiler.java
index 2cf5857..832b1f0 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/compile/WhereCompiler.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/compile/WhereCompiler.java
@@ -105,9 +105,9 @@ public class WhereCompiler {
  * @throws AmbiguousColumnException if an unaliased column name is 
ambiguous across multiple tables
  */
 public static Expression compile(StatementContext context, 
FilterableStatement statement, ParseNode viewWhere, Set 
subqueryNodes) throws SQLException {
-return compile(context, statement, viewWhere, 
Collections.emptyList(), false, subqueryNodes);
+return compile(context, statement, viewWhere, 
Collections.emptyList(), subqueryNodes);
 }
-
+
 /**
  * Optimize scan ranges by applying dynamically generated filter 
expressions.
  * @param context the shared context during query compilation
@@ -118,7 +118,7 @@ public class WhereCompiler {
  * @throws ColumnNotFoundException if column name could not be resolved
  * @throws AmbiguousColumnException if an unaliased column name is 
ambiguous across multiple tables
  */
-public static Expression compile(StatementContext context, 
FilterableStatement statement, ParseNode viewWhere, List 
dynamicFilters, boolean hashJoinOptimization, Set 
subqueryNodes) throws SQLException {
+public static Expression

[1/6] phoenix git commit: PHOENIX-4692 ArrayIndexOutOfBoundsException in ScanRanges.intersectScan [Forced Update!]

2018-05-25 Thread pboado

Repository: phoenix
Updated Branches:
  refs/heads/4.x-cdh5.13 f7211eaf7 -> 79c8a6637 (forced update)


PHOENIX-4692 ArrayIndexOutOfBoundsException in ScanRanges.intersectScan


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

Branch: refs/heads/4.x-cdh5.13
Commit: 574d8188af859dc2d0467b681c7b88bd83f27dda
Parents: c2d6bc1
Author: maryannxue 
Authored: Mon May 21 11:17:46 2018 -0700
Committer: maryannxue 
Committed: Mon May 21 11:17:46 2018 -0700

--
 .../apache/phoenix/end2end/SkipScanQueryIT.java | 21 
 .../apache/phoenix/compile/WhereCompiler.java   | 12 +--
 .../apache/phoenix/execute/BaseQueryPlan.java   |  2 +-
 .../apache/phoenix/execute/HashJoinPlan.java|  5 -
 4 files changed, 32 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/574d8188/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 d98bbe2..fb0b568 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
@@ -563,4 +563,25 @@ public class SkipScanQueryIT extends 
ParallelStatsDisabledIT {
 assertFalse(rs.next());
 }
 }
+
+@Test
+public void testSkipScanJoinOptimization() throws Exception {
+try (Connection conn = DriverManager.getConnection(getUrl())) {
+String tableName = generateUniqueName();
+String viewName = generateUniqueName();
+String idxName = "IDX_" + tableName;
+conn.setAutoCommit(true);
+conn.createStatement().execute(
+"create table " + tableName + " (PK1 INTEGER NOT NULL, PK2 
INTEGER NOT NULL, " +
+" ID1 INTEGER, ID2 INTEGER CONSTRAINT PK PRIMARY 
KEY(PK1 , PK2))SALT_BUCKETS = 4");
+conn.createStatement().execute("upsert into " + tableName + " 
values (1,1,1,1)");
+conn.createStatement().execute("upsert into " + tableName + " 
values (2,2,2,2)");
+conn.createStatement().execute("upsert into " + tableName + " 
values (2,3,1,2)");
+conn.createStatement().execute("create view " + viewName + " as 
select * from " +
+tableName + " where PK1 in (1,2)");
+conn.createStatement().execute("create index " + idxName + " on " 
+ viewName + " (ID1)");
+ResultSet rs = conn.createStatement().executeQuery("select /*+ 
INDEX(" + viewName + " " + idxName + ") */ * from " + viewName + " where ID1 = 
1 ");
+assertTrue(rs.next());
+}
+}
 }

http://git-wip-us.apache.org/repos/asf/phoenix/blob/574d8188/phoenix-core/src/main/java/org/apache/phoenix/compile/WhereCompiler.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/compile/WhereCompiler.java 
b/phoenix-core/src/main/java/org/apache/phoenix/compile/WhereCompiler.java
index 2cf5857..832b1f0 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/compile/WhereCompiler.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/compile/WhereCompiler.java
@@ -105,9 +105,9 @@ public class WhereCompiler {
  * @throws AmbiguousColumnException if an unaliased column name is 
ambiguous across multiple tables
  */
 public static Expression compile(StatementContext context, 
FilterableStatement statement, ParseNode viewWhere, Set 
subqueryNodes) throws SQLException {
-return compile(context, statement, viewWhere, 
Collections.emptyList(), false, subqueryNodes);
+return compile(context, statement, viewWhere, 
Collections.emptyList(), subqueryNodes);
 }
-
+
 /**
  * Optimize scan ranges by applying dynamically generated filter 
expressions.
  * @param context the shared context during query compilation
@@ -118,7 +118,7 @@ public class WhereCompiler {
  * @throws ColumnNotFoundException if column name could not be resolved
  * @throws AmbiguousColumnException if an unaliased column name is 
ambiguous across multiple tables
  */
-public static Expression compile(StatementContext context, 
FilterableStatement statement, ParseNode viewWhere, List 
dynamicFilters, boolean hashJoinOptimization, Set 
subqueryNodes) throws SQLException {
+public static Expression

[4/6] phoenix git commit: PHOENIX-4706 Remove bundling dependencies into phoenix-core

2018-05-25 Thread pboado

PHOENIX-4706 Remove bundling dependencies into phoenix-core


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

Branch: refs/heads/4.x-cdh5.13
Commit: 40d04cbab498fa127f4f453ee8a6a0888ba7d01d
Parents: 5fb85b5
Author: Josh Elser 
Authored: Tue May 8 04:01:35 2018 +0100
Committer: Pedro Boado 
Committed: Fri May 25 09:24:13 2018 +0100

--
 phoenix-core/pom.xml | 28 
 1 file changed, 28 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/40d04cba/phoenix-core/pom.xml
--
diff --git a/phoenix-core/pom.xml b/phoenix-core/pom.xml
index 60c04d4..8b09c67 100644
--- a/phoenix-core/pom.xml
+++ b/phoenix-core/pom.xml
@@ -170,34 +170,6 @@
 
   
   
-
-maven-assembly-plugin
-
-  
-core
-package
-
-  single
-
-
-  false
-  phoenix
-  
-true
-
-  true
-  
true
-  
true
-
-  
-  
-src/build/phoenix-core.xml
-  
-
-  
-  
-  
-  
 org.apache.maven.plugins
 maven-failsafe-plugin

phoenix git commit: PHOENIX-4728 ARRAY_APPEND and ARRAY_REMOVE should work with null column value (Xavier Jodoin)

2018-05-25 Thread jamestaylor

Repository: phoenix
Updated Branches:
  refs/heads/4.x-cdh5.11 cbca73177 -> 53f37ef05


PHOENIX-4728 ARRAY_APPEND and ARRAY_REMOVE should work with null column value 
(Xavier Jodoin)


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

Branch: refs/heads/4.x-cdh5.11
Commit: 53f37ef05ea9af232bf34ba80f03b44da18156ac
Parents: cbca731
Author: James Taylor 
Authored: Fri May 25 09:36:41 2018 -0700
Committer: James Taylor 
Committed: Fri May 25 09:42:04 2018 -0700

--
 .../phoenix/end2end/ArrayAppendFunctionIT.java  | 38 
 .../apache/phoenix/compile/UpsertCompiler.java  |  2 +-
 2 files changed, 39 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/53f37ef0/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArrayAppendFunctionIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArrayAppendFunctionIT.java
 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArrayAppendFunctionIT.java
index caa17fe..7962a7a 100644
--- 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArrayAppendFunctionIT.java
+++ 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArrayAppendFunctionIT.java
@@ -132,6 +132,24 @@ public class ArrayAppendFunctionIT extends 
ParallelStatsDisabledIT {
 }
 
 @Test
+public void testUpsertEmptyArrayModification() throws Exception {
+Connection conn = DriverManager.getConnection(getUrl());
+String tableName = initTables(conn);
+
+ResultSet rs;
+String[] strings = new String[]{"34567"};
+Array array = conn.createArrayOf("VARCHAR", strings);
+
+conn.createStatement().execute("UPSERT INTO " + tableName + " 
(region_name,nullVarChar) SELECT region_name,ARRAY_APPEND(nullVarChar,'34567') 
FROM " + tableName);
+conn.commit();
+
+rs = conn.createStatement().executeQuery("SELECT nullVarChar FROM " + 
tableName + " LIMIT 1");
+assertTrue(rs.next());
+assertEquals(array, rs.getArray(1));
+assertFalse(rs.next());
+}
+
+@Test
 public void testArrayAppendFunctionVarchar() throws Exception {
 Connection conn = DriverManager.getConnection(getUrl());
 String tableName = initTables(conn);
@@ -147,6 +165,26 @@ public class ArrayAppendFunctionIT extends 
ParallelStatsDisabledIT {
 assertEquals(array, rs.getArray(1));
 assertFalse(rs.next());
 }
+
+@Test
+public void testUpsertArrayAppendFunctionVarchar() throws Exception {
+Connection conn = DriverManager.getConnection(getUrl());
+String tableName = initTables(conn);
+
+conn.createStatement().execute("UPSERT INTO " + tableName + " 
(region_name,varchars) SELECT region_name,ARRAY_APPEND(varchars,'34567') as 
varchars FROM " + tableName+ " WHERE region_name = 'SF Bay Area'");
+conn.commit();
+
+ResultSet rs;
+rs = conn.createStatement().executeQuery("SELECT varchars FROM " + 
tableName + " WHERE region_name = 'SF Bay Area'");
+assertTrue(rs.next());
+
+String[] strings = new String[]{"2345", "46345", "23234", "34567"};
+
+Array array = conn.createArrayOf("VARCHAR", strings);
+
+assertEquals(array, rs.getArray(1));
+assertFalse(rs.next());
+}
 
 @Test
 public void testArrayAppendFunctionInteger() throws Exception {

http://git-wip-us.apache.org/repos/asf/phoenix/blob/53f37ef0/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 30f0c18..c3cfa10 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
@@ -549,7 +549,7 @@ public class UpsertCompiler {
 select = SelectStatement.create(select, hint);
 // Pass scan through if same table in upsert and select so that 
projection is computed correctly
 // Use optimizer to choose the best plan
-QueryCompiler compiler = new QueryCompiler(statement, select, 
selectResolver, targetColumns, parallelIteratorFactoryToBe, new 
SequenceManager(statement), false, false, null);
+QueryCompiler compiler = new QueryCompiler(statement, select, 
selectResolver, targetColumns,

phoenix git commit: PHOENIX-4728 ARRAY_APPEND and ARRAY_REMOVE should work with null column value (Xavier Jodoin)

2018-05-25 Thread jamestaylor

Repository: phoenix
Updated Branches:
  refs/heads/4.x-HBase-1.2 629a9175b -> 2e8498295


PHOENIX-4728 ARRAY_APPEND and ARRAY_REMOVE should work with null column value 
(Xavier Jodoin)


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

Branch: refs/heads/4.x-HBase-1.2
Commit: 2e849829505b4359d7311d6a17938ba7ffc19459
Parents: 629a917
Author: James Taylor 
Authored: Fri May 25 09:36:41 2018 -0700
Committer: James Taylor 
Committed: Fri May 25 09:40:05 2018 -0700

--
 .../phoenix/end2end/ArrayAppendFunctionIT.java  | 38 
 .../apache/phoenix/compile/UpsertCompiler.java  |  2 +-
 2 files changed, 39 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/2e849829/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArrayAppendFunctionIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArrayAppendFunctionIT.java
 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArrayAppendFunctionIT.java
index caa17fe..7962a7a 100644
--- 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArrayAppendFunctionIT.java
+++ 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArrayAppendFunctionIT.java
@@ -132,6 +132,24 @@ public class ArrayAppendFunctionIT extends 
ParallelStatsDisabledIT {
 }
 
 @Test
+public void testUpsertEmptyArrayModification() throws Exception {
+Connection conn = DriverManager.getConnection(getUrl());
+String tableName = initTables(conn);
+
+ResultSet rs;
+String[] strings = new String[]{"34567"};
+Array array = conn.createArrayOf("VARCHAR", strings);
+
+conn.createStatement().execute("UPSERT INTO " + tableName + " 
(region_name,nullVarChar) SELECT region_name,ARRAY_APPEND(nullVarChar,'34567') 
FROM " + tableName);
+conn.commit();
+
+rs = conn.createStatement().executeQuery("SELECT nullVarChar FROM " + 
tableName + " LIMIT 1");
+assertTrue(rs.next());
+assertEquals(array, rs.getArray(1));
+assertFalse(rs.next());
+}
+
+@Test
 public void testArrayAppendFunctionVarchar() throws Exception {
 Connection conn = DriverManager.getConnection(getUrl());
 String tableName = initTables(conn);
@@ -147,6 +165,26 @@ public class ArrayAppendFunctionIT extends 
ParallelStatsDisabledIT {
 assertEquals(array, rs.getArray(1));
 assertFalse(rs.next());
 }
+
+@Test
+public void testUpsertArrayAppendFunctionVarchar() throws Exception {
+Connection conn = DriverManager.getConnection(getUrl());
+String tableName = initTables(conn);
+
+conn.createStatement().execute("UPSERT INTO " + tableName + " 
(region_name,varchars) SELECT region_name,ARRAY_APPEND(varchars,'34567') as 
varchars FROM " + tableName+ " WHERE region_name = 'SF Bay Area'");
+conn.commit();
+
+ResultSet rs;
+rs = conn.createStatement().executeQuery("SELECT varchars FROM " + 
tableName + " WHERE region_name = 'SF Bay Area'");
+assertTrue(rs.next());
+
+String[] strings = new String[]{"2345", "46345", "23234", "34567"};
+
+Array array = conn.createArrayOf("VARCHAR", strings);
+
+assertEquals(array, rs.getArray(1));
+assertFalse(rs.next());
+}
 
 @Test
 public void testArrayAppendFunctionInteger() throws Exception {

http://git-wip-us.apache.org/repos/asf/phoenix/blob/2e849829/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 30f0c18..c3cfa10 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
@@ -549,7 +549,7 @@ public class UpsertCompiler {
 select = SelectStatement.create(select, hint);
 // Pass scan through if same table in upsert and select so that 
projection is computed correctly
 // Use optimizer to choose the best plan
-QueryCompiler compiler = new QueryCompiler(statement, select, 
selectResolver, targetColumns, parallelIteratorFactoryToBe, new 
SequenceManager(statement), false, false, null);
+QueryCompiler compiler = new QueryCompiler(statement, select, 
selectResolver, targetColumns,

phoenix git commit: PHOENIX-4728 ARRAY_APPEND and ARRAY_REMOVE should work with null column value (Xavier Jodoin)

2018-05-25 Thread jamestaylor

Repository: phoenix
Updated Branches:
  refs/heads/master 8d80d5a98 -> 9335972fb


PHOENIX-4728 ARRAY_APPEND and ARRAY_REMOVE should work with null column value 
(Xavier Jodoin)


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

Branch: refs/heads/master
Commit: 9335972fb1d231f9ff1cce8b55ca5753149cba2c
Parents: 8d80d5a
Author: James Taylor 
Authored: Fri May 25 09:36:41 2018 -0700
Committer: James Taylor 
Committed: Fri May 25 09:39:35 2018 -0700

--
 .../phoenix/end2end/ArrayAppendFunctionIT.java  | 38 
 .../apache/phoenix/compile/UpsertCompiler.java  |  2 +-
 2 files changed, 39 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/9335972f/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArrayAppendFunctionIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArrayAppendFunctionIT.java
 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArrayAppendFunctionIT.java
index caa17fe..7962a7a 100644
--- 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArrayAppendFunctionIT.java
+++ 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArrayAppendFunctionIT.java
@@ -132,6 +132,24 @@ public class ArrayAppendFunctionIT extends 
ParallelStatsDisabledIT {
 }
 
 @Test
+public void testUpsertEmptyArrayModification() throws Exception {
+Connection conn = DriverManager.getConnection(getUrl());
+String tableName = initTables(conn);
+
+ResultSet rs;
+String[] strings = new String[]{"34567"};
+Array array = conn.createArrayOf("VARCHAR", strings);
+
+conn.createStatement().execute("UPSERT INTO " + tableName + " 
(region_name,nullVarChar) SELECT region_name,ARRAY_APPEND(nullVarChar,'34567') 
FROM " + tableName);
+conn.commit();
+
+rs = conn.createStatement().executeQuery("SELECT nullVarChar FROM " + 
tableName + " LIMIT 1");
+assertTrue(rs.next());
+assertEquals(array, rs.getArray(1));
+assertFalse(rs.next());
+}
+
+@Test
 public void testArrayAppendFunctionVarchar() throws Exception {
 Connection conn = DriverManager.getConnection(getUrl());
 String tableName = initTables(conn);
@@ -147,6 +165,26 @@ public class ArrayAppendFunctionIT extends 
ParallelStatsDisabledIT {
 assertEquals(array, rs.getArray(1));
 assertFalse(rs.next());
 }
+
+@Test
+public void testUpsertArrayAppendFunctionVarchar() throws Exception {
+Connection conn = DriverManager.getConnection(getUrl());
+String tableName = initTables(conn);
+
+conn.createStatement().execute("UPSERT INTO " + tableName + " 
(region_name,varchars) SELECT region_name,ARRAY_APPEND(varchars,'34567') as 
varchars FROM " + tableName+ " WHERE region_name = 'SF Bay Area'");
+conn.commit();
+
+ResultSet rs;
+rs = conn.createStatement().executeQuery("SELECT varchars FROM " + 
tableName + " WHERE region_name = 'SF Bay Area'");
+assertTrue(rs.next());
+
+String[] strings = new String[]{"2345", "46345", "23234", "34567"};
+
+Array array = conn.createArrayOf("VARCHAR", strings);
+
+assertEquals(array, rs.getArray(1));
+assertFalse(rs.next());
+}
 
 @Test
 public void testArrayAppendFunctionInteger() throws Exception {

http://git-wip-us.apache.org/repos/asf/phoenix/blob/9335972f/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 30f0c18..c3cfa10 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
@@ -549,7 +549,7 @@ public class UpsertCompiler {
 select = SelectStatement.create(select, hint);
 // Pass scan through if same table in upsert and select so that 
projection is computed correctly
 // Use optimizer to choose the best plan
-QueryCompiler compiler = new QueryCompiler(statement, select, 
selectResolver, targetColumns, parallelIteratorFactoryToBe, new 
SequenceManager(statement), false, false, null);
+QueryCompiler compiler = new QueryCompiler(statement, select, 
selectResolver, targetColumns, parallelIteratorFactoryToBe, new

phoenix git commit: PHOENIX-4728 ARRAY_APPEND and ARRAY_REMOVE should work with null column value (Xavier Jodoin)

2018-05-25 Thread jamestaylor

Repository: phoenix
Updated Branches:
  refs/heads/4.x-HBase-1.1 6a69a255c -> 43163c8f3


PHOENIX-4728 ARRAY_APPEND and ARRAY_REMOVE should work with null column value 
(Xavier Jodoin)


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

Branch: refs/heads/4.x-HBase-1.1
Commit: 43163c8f39c725d279863ccec12676f6cf4c673b
Parents: 6a69a25
Author: James Taylor 
Authored: Fri May 25 09:36:41 2018 -0700
Committer: James Taylor 
Committed: Fri May 25 09:44:05 2018 -0700

--
 .../phoenix/end2end/ArrayAppendFunctionIT.java  | 38 
 .../apache/phoenix/compile/UpsertCompiler.java  |  2 +-
 2 files changed, 39 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/43163c8f/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArrayAppendFunctionIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArrayAppendFunctionIT.java
 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArrayAppendFunctionIT.java
index caa17fe..7962a7a 100644
--- 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArrayAppendFunctionIT.java
+++ 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArrayAppendFunctionIT.java
@@ -132,6 +132,24 @@ public class ArrayAppendFunctionIT extends 
ParallelStatsDisabledIT {
 }
 
 @Test
+public void testUpsertEmptyArrayModification() throws Exception {
+Connection conn = DriverManager.getConnection(getUrl());
+String tableName = initTables(conn);
+
+ResultSet rs;
+String[] strings = new String[]{"34567"};
+Array array = conn.createArrayOf("VARCHAR", strings);
+
+conn.createStatement().execute("UPSERT INTO " + tableName + " 
(region_name,nullVarChar) SELECT region_name,ARRAY_APPEND(nullVarChar,'34567') 
FROM " + tableName);
+conn.commit();
+
+rs = conn.createStatement().executeQuery("SELECT nullVarChar FROM " + 
tableName + " LIMIT 1");
+assertTrue(rs.next());
+assertEquals(array, rs.getArray(1));
+assertFalse(rs.next());
+}
+
+@Test
 public void testArrayAppendFunctionVarchar() throws Exception {
 Connection conn = DriverManager.getConnection(getUrl());
 String tableName = initTables(conn);
@@ -147,6 +165,26 @@ public class ArrayAppendFunctionIT extends 
ParallelStatsDisabledIT {
 assertEquals(array, rs.getArray(1));
 assertFalse(rs.next());
 }
+
+@Test
+public void testUpsertArrayAppendFunctionVarchar() throws Exception {
+Connection conn = DriverManager.getConnection(getUrl());
+String tableName = initTables(conn);
+
+conn.createStatement().execute("UPSERT INTO " + tableName + " 
(region_name,varchars) SELECT region_name,ARRAY_APPEND(varchars,'34567') as 
varchars FROM " + tableName+ " WHERE region_name = 'SF Bay Area'");
+conn.commit();
+
+ResultSet rs;
+rs = conn.createStatement().executeQuery("SELECT varchars FROM " + 
tableName + " WHERE region_name = 'SF Bay Area'");
+assertTrue(rs.next());
+
+String[] strings = new String[]{"2345", "46345", "23234", "34567"};
+
+Array array = conn.createArrayOf("VARCHAR", strings);
+
+assertEquals(array, rs.getArray(1));
+assertFalse(rs.next());
+}
 
 @Test
 public void testArrayAppendFunctionInteger() throws Exception {

http://git-wip-us.apache.org/repos/asf/phoenix/blob/43163c8f/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 30f0c18..c3cfa10 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
@@ -549,7 +549,7 @@ public class UpsertCompiler {
 select = SelectStatement.create(select, hint);
 // Pass scan through if same table in upsert and select so that 
projection is computed correctly
 // Use optimizer to choose the best plan
-QueryCompiler compiler = new QueryCompiler(statement, select, 
selectResolver, targetColumns, parallelIteratorFactoryToBe, new 
SequenceManager(statement), false, false, null);
+QueryCompiler compiler = new QueryCompiler(statement, select, 
selectResolver, targetColumns,

phoenix git commit: PHOENIX-4728 ARRAY_APPEND and ARRAY_REMOVE should work with null column value (Xavier Jodoin)

2018-05-25 Thread jamestaylor

Repository: phoenix
Updated Branches:
  refs/heads/4.x-HBase-1.3 81f887584 -> ffc380aad


PHOENIX-4728 ARRAY_APPEND and ARRAY_REMOVE should work with null column value 
(Xavier Jodoin)


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

Branch: refs/heads/4.x-HBase-1.3
Commit: ffc380aad453497020109b855b2668bb026fe5cf
Parents: 81f8875
Author: James Taylor 
Authored: Fri May 25 09:36:41 2018 -0700
Committer: James Taylor 
Committed: Fri May 25 09:36:41 2018 -0700

--
 .../phoenix/end2end/ArrayAppendFunctionIT.java  | 38 
 .../apache/phoenix/compile/UpsertCompiler.java  |  2 +-
 2 files changed, 39 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/ffc380aa/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArrayAppendFunctionIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArrayAppendFunctionIT.java
 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArrayAppendFunctionIT.java
index caa17fe..7962a7a 100644
--- 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArrayAppendFunctionIT.java
+++ 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArrayAppendFunctionIT.java
@@ -132,6 +132,24 @@ public class ArrayAppendFunctionIT extends 
ParallelStatsDisabledIT {
 }
 
 @Test
+public void testUpsertEmptyArrayModification() throws Exception {
+Connection conn = DriverManager.getConnection(getUrl());
+String tableName = initTables(conn);
+
+ResultSet rs;
+String[] strings = new String[]{"34567"};
+Array array = conn.createArrayOf("VARCHAR", strings);
+
+conn.createStatement().execute("UPSERT INTO " + tableName + " 
(region_name,nullVarChar) SELECT region_name,ARRAY_APPEND(nullVarChar,'34567') 
FROM " + tableName);
+conn.commit();
+
+rs = conn.createStatement().executeQuery("SELECT nullVarChar FROM " + 
tableName + " LIMIT 1");
+assertTrue(rs.next());
+assertEquals(array, rs.getArray(1));
+assertFalse(rs.next());
+}
+
+@Test
 public void testArrayAppendFunctionVarchar() throws Exception {
 Connection conn = DriverManager.getConnection(getUrl());
 String tableName = initTables(conn);
@@ -147,6 +165,26 @@ public class ArrayAppendFunctionIT extends 
ParallelStatsDisabledIT {
 assertEquals(array, rs.getArray(1));
 assertFalse(rs.next());
 }
+
+@Test
+public void testUpsertArrayAppendFunctionVarchar() throws Exception {
+Connection conn = DriverManager.getConnection(getUrl());
+String tableName = initTables(conn);
+
+conn.createStatement().execute("UPSERT INTO " + tableName + " 
(region_name,varchars) SELECT region_name,ARRAY_APPEND(varchars,'34567') as 
varchars FROM " + tableName+ " WHERE region_name = 'SF Bay Area'");
+conn.commit();
+
+ResultSet rs;
+rs = conn.createStatement().executeQuery("SELECT varchars FROM " + 
tableName + " WHERE region_name = 'SF Bay Area'");
+assertTrue(rs.next());
+
+String[] strings = new String[]{"2345", "46345", "23234", "34567"};
+
+Array array = conn.createArrayOf("VARCHAR", strings);
+
+assertEquals(array, rs.getArray(1));
+assertFalse(rs.next());
+}
 
 @Test
 public void testArrayAppendFunctionInteger() throws Exception {

http://git-wip-us.apache.org/repos/asf/phoenix/blob/ffc380aa/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 30f0c18..c3cfa10 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
@@ -549,7 +549,7 @@ public class UpsertCompiler {
 select = SelectStatement.create(select, hint);
 // Pass scan through if same table in upsert and select so that 
projection is computed correctly
 // Use optimizer to choose the best plan
-QueryCompiler compiler = new QueryCompiler(statement, select, 
selectResolver, targetColumns, parallelIteratorFactoryToBe, new 
SequenceManager(statement), false, false, null);
+QueryCompiler compiler = new QueryCompiler(statement, select, 
selectResolver, targetColumns,

Build failed in Jenkins: Phoenix | Master #2037

2018-05-25 Thread Apache Jenkins Server

See 


Changes:

[jtaylor] PHOENIX-4728 ARRAY_APPEND and ARRAY_REMOVE should work with null 
column

--
[...truncated 95.17 KB...]
[INFO] Tests run: 56, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 14.923 
s - in org.apache.phoenix.end2end.SequenceBulkAllocationIT
[INFO] Running org.apache.phoenix.end2end.SequenceIT
[INFO] Tests run: 42, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 248.107 
s - in org.apache.phoenix.end2end.QueryIT
[INFO] Running org.apache.phoenix.end2end.SerialIteratorsIT
[INFO] Tests run: 55, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 38.03 s 
- in org.apache.phoenix.end2end.SequenceIT
[INFO] Running org.apache.phoenix.end2end.ServerExceptionIT
[INFO] Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 2.259 s 
- in org.apache.phoenix.end2end.SerialIteratorsIT
[INFO] Running org.apache.phoenix.end2end.SetPropertyOnEncodedTableIT
[INFO] Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 2.242 s 
- in org.apache.phoenix.end2end.ServerExceptionIT
[INFO] Running org.apache.phoenix.end2end.SetPropertyOnNonEncodedTableIT
[INFO] Tests run: 47, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 125.009 
s - in org.apache.phoenix.end2end.RowValueConstructorIT
[INFO] Running org.apache.phoenix.end2end.SignFunctionEnd2EndIT
[INFO] Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 9.027 s 
- in org.apache.phoenix.end2end.SignFunctionEnd2EndIT
[INFO] Running org.apache.phoenix.end2end.SkipScanAfterManualSplitIT
[INFO] Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 25.151 s 
- in org.apache.phoenix.end2end.SkipScanAfterManualSplitIT
[INFO] Running org.apache.phoenix.end2end.SkipScanQueryIT
[INFO] Tests run: 14, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 34.23 s 
- in org.apache.phoenix.end2end.SkipScanQueryIT
[INFO] Running org.apache.phoenix.end2end.SortMergeJoinMoreIT
[INFO] Tests run: 32, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 194.684 
s - in org.apache.phoenix.end2end.SetPropertyOnEncodedTableIT
[INFO] Tests run: 32, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 195.01 
s - in org.apache.phoenix.end2end.SetPropertyOnNonEncodedTableIT
[INFO] Running org.apache.phoenix.end2end.SpooledTmpFileDeleteIT
[INFO] Running org.apache.phoenix.end2end.SortOrderIT
[INFO] Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 2.387 s 
- in org.apache.phoenix.end2end.SpooledTmpFileDeleteIT
[INFO] Running org.apache.phoenix.end2end.SqrtFunctionEnd2EndIT
[INFO] Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 8.987 s 
- in org.apache.phoenix.end2end.SqrtFunctionEnd2EndIT
[INFO] Running org.apache.phoenix.end2end.StatementHintsIT
[INFO] Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 2.251 s 
- in org.apache.phoenix.end2end.StatementHintsIT
[INFO] Running org.apache.phoenix.end2end.StddevIT
[INFO] Tests run: 4, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 8.998 s 
- in org.apache.phoenix.end2end.StddevIT
[INFO] Running org.apache.phoenix.end2end.StoreNullsIT
[INFO] Tests run: 46, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 152.56 
s - in org.apache.phoenix.end2end.SortOrderIT
[INFO] Running org.apache.phoenix.end2end.StoreNullsPropIT
[INFO] Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 2.234 s 
- in org.apache.phoenix.end2end.StoreNullsPropIT
[INFO] Running org.apache.phoenix.end2end.StringIT
[INFO] Tests run: 15, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 60.886 
s - in org.apache.phoenix.end2end.StringIT
[INFO] Running org.apache.phoenix.end2end.StringToArrayFunctionIT
[INFO] Tests run: 32, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 233.606 
s - in org.apache.phoenix.end2end.StoreNullsIT
[ERROR] Tests run: 6, Failures: 0, Errors: 1, Skipped: 0, Time elapsed: 342.153 
s <<< FAILURE! - in org.apache.phoenix.end2end.SortMergeJoinMoreIT
[ERROR] testBug4508(org.apache.phoenix.end2end.SortMergeJoinMoreIT)  Time 
elapsed: 302.236 s  <<< ERROR!
java.sql.SQLTimeoutException: Operation timed out.
at 
org.apache.phoenix.end2end.SortMergeJoinMoreIT.testBug4508(SortMergeJoinMoreIT.java:649)

[INFO] Running org.apache.phoenix.end2end.TenantIdTypeIT
[INFO] Running org.apache.phoenix.end2end.TenantSpecificViewIndexIT
[INFO] Tests run: 22, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 63.199 
s - in org.apache.phoenix.end2end.StringToArrayFunctionIT
[INFO] Running org.apache.phoenix.end2end.TenantSpecificViewIndexSaltedIT
[INFO] Tests run: 15, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 66.524 
s - in org.apache.phoenix.end2end.TenantIdTypeIT
[INFO] Running org.apache.phoenix.end2end.TimezoneOffsetFunctionIT
[INFO] Tests run: 7, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 15.67 s 
- in org.apache.phoenix.end2end.TimezoneOffsetFunctionIT
[INFO] Running org.apache.phoenix.end2end.ToCharFunctionIT
[INFO] Tests run:

phoenix git commit: PHOENIX-4728 ARRAY_APPEND and ARRAY_REMOVE should work with null column value (Xavier Jodoin)

2018-05-25 Thread jamestaylor

Repository: phoenix
Updated Branches:
  refs/heads/5.x-HBase-2.0 824860ca7 -> bac88a6d4


PHOENIX-4728 ARRAY_APPEND and ARRAY_REMOVE should work with null column value 
(Xavier Jodoin)


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

Branch: refs/heads/5.x-HBase-2.0
Commit: bac88a6d4382b5302186b8d95f6034bdd749ac48
Parents: 824860c
Author: James Taylor 
Authored: Fri May 25 09:36:41 2018 -0700
Committer: James Taylor 
Committed: Fri May 25 09:48:26 2018 -0700

--
 .../phoenix/end2end/ArrayAppendFunctionIT.java  | 38 
 .../apache/phoenix/compile/UpsertCompiler.java  |  2 +-
 2 files changed, 39 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/bac88a6d/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArrayAppendFunctionIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArrayAppendFunctionIT.java
 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArrayAppendFunctionIT.java
index caa17fe..7962a7a 100644
--- 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArrayAppendFunctionIT.java
+++ 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArrayAppendFunctionIT.java
@@ -132,6 +132,24 @@ public class ArrayAppendFunctionIT extends 
ParallelStatsDisabledIT {
 }
 
 @Test
+public void testUpsertEmptyArrayModification() throws Exception {
+Connection conn = DriverManager.getConnection(getUrl());
+String tableName = initTables(conn);
+
+ResultSet rs;
+String[] strings = new String[]{"34567"};
+Array array = conn.createArrayOf("VARCHAR", strings);
+
+conn.createStatement().execute("UPSERT INTO " + tableName + " 
(region_name,nullVarChar) SELECT region_name,ARRAY_APPEND(nullVarChar,'34567') 
FROM " + tableName);
+conn.commit();
+
+rs = conn.createStatement().executeQuery("SELECT nullVarChar FROM " + 
tableName + " LIMIT 1");
+assertTrue(rs.next());
+assertEquals(array, rs.getArray(1));
+assertFalse(rs.next());
+}
+
+@Test
 public void testArrayAppendFunctionVarchar() throws Exception {
 Connection conn = DriverManager.getConnection(getUrl());
 String tableName = initTables(conn);
@@ -147,6 +165,26 @@ public class ArrayAppendFunctionIT extends 
ParallelStatsDisabledIT {
 assertEquals(array, rs.getArray(1));
 assertFalse(rs.next());
 }
+
+@Test
+public void testUpsertArrayAppendFunctionVarchar() throws Exception {
+Connection conn = DriverManager.getConnection(getUrl());
+String tableName = initTables(conn);
+
+conn.createStatement().execute("UPSERT INTO " + tableName + " 
(region_name,varchars) SELECT region_name,ARRAY_APPEND(varchars,'34567') as 
varchars FROM " + tableName+ " WHERE region_name = 'SF Bay Area'");
+conn.commit();
+
+ResultSet rs;
+rs = conn.createStatement().executeQuery("SELECT varchars FROM " + 
tableName + " WHERE region_name = 'SF Bay Area'");
+assertTrue(rs.next());
+
+String[] strings = new String[]{"2345", "46345", "23234", "34567"};
+
+Array array = conn.createArrayOf("VARCHAR", strings);
+
+assertEquals(array, rs.getArray(1));
+assertFalse(rs.next());
+}
 
 @Test
 public void testArrayAppendFunctionInteger() throws Exception {

http://git-wip-us.apache.org/repos/asf/phoenix/blob/bac88a6d/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 0cf977e..6fd6e72 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
@@ -549,7 +549,7 @@ public class UpsertCompiler {
 select = SelectStatement.create(select, hint);
 // Pass scan through if same table in upsert and select so that 
projection is computed correctly
 // Use optimizer to choose the best plan
-QueryCompiler compiler = new QueryCompiler(statement, select, 
selectResolver, targetColumns, parallelIteratorFactoryToBe, new 
SequenceManager(statement), false, false, null);
+QueryCompiler compiler = new QueryCompiler(statement, select, 
selectResolver, targetColumns,

phoenix git commit: PHOENIX-1567 Publish Phoenix-Client & Phoenix-Server jars into Maven Repo

2018-05-25 Thread ankit

Repository: phoenix
Updated Branches:
  refs/heads/4.x-HBase-1.2 2e8498295 -> 11b43bcf7


PHOENIX-1567 Publish Phoenix-Client & Phoenix-Server jars into Maven Repo


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

Branch: refs/heads/4.x-HBase-1.2
Commit: 11b43bcf725dd8dd8dc9750362d5d69b2b302149
Parents: 2e84982
Author: Ankit Singhal 
Authored: Fri May 25 11:32:27 2018 -0700
Committer: Ankit Singhal 
Committed: Fri May 25 11:32:27 2018 -0700

--
 phoenix-client/pom.xml | 1 +
 phoenix-server/pom.xml | 1 +
 2 files changed, 2 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/11b43bcf/phoenix-client/pom.xml
--
diff --git a/phoenix-client/pom.xml b/phoenix-client/pom.xml
index 5c579e3..96e5e09 100644
--- a/phoenix-client/pom.xml
+++ b/phoenix-client/pom.xml
@@ -81,6 +81,7 @@
 
 
   ${basedir}/target/phoenix-${project.version}-client.jar
+ ${basedir}/pom.xml
 
   
   

http://git-wip-us.apache.org/repos/asf/phoenix/blob/11b43bcf/phoenix-server/pom.xml
--
diff --git a/phoenix-server/pom.xml b/phoenix-server/pom.xml
index dc1ce89..c4cb303 100644
--- a/phoenix-server/pom.xml
+++ b/phoenix-server/pom.xml
@@ -85,6 +85,7 @@
 
 
   ${basedir}/target/phoenix-${project.version}-server.jar
+ ${basedir}/pom.xml

phoenix git commit: PHOENIX-1567 Publish Phoenix-Client & Phoenix-Server jars into Maven Repo

2018-05-25 Thread ankit

Repository: phoenix
Updated Branches:
  refs/heads/4.x-HBase-1.1 43163c8f3 -> add7dd05e


PHOENIX-1567 Publish Phoenix-Client & Phoenix-Server jars into Maven Repo


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

Branch: refs/heads/4.x-HBase-1.1
Commit: add7dd05ec343b34f4fe10181450a2b2b068b5ff
Parents: 43163c8
Author: Ankit Singhal 
Authored: Fri May 25 11:32:47 2018 -0700
Committer: Ankit Singhal 
Committed: Fri May 25 11:32:47 2018 -0700

--
 phoenix-client/pom.xml | 1 +
 phoenix-server/pom.xml | 1 +
 2 files changed, 2 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/add7dd05/phoenix-client/pom.xml
--
diff --git a/phoenix-client/pom.xml b/phoenix-client/pom.xml
index 22e4e64..7a75d71 100644
--- a/phoenix-client/pom.xml
+++ b/phoenix-client/pom.xml
@@ -81,6 +81,7 @@
 
 
   ${basedir}/target/phoenix-${project.version}-client.jar
+ ${basedir}/pom.xml
 
   
   

http://git-wip-us.apache.org/repos/asf/phoenix/blob/add7dd05/phoenix-server/pom.xml
--
diff --git a/phoenix-server/pom.xml b/phoenix-server/pom.xml
index 79a1be2..25b2d8a 100644
--- a/phoenix-server/pom.xml
+++ b/phoenix-server/pom.xml
@@ -85,6 +85,7 @@
 
 
   ${basedir}/target/phoenix-${project.version}-server.jar
+ ${basedir}/pom.xml

phoenix git commit: PHOENIX-1567 Publish Phoenix-Client & Phoenix-Server jars into Maven Repo

2018-05-25 Thread ankit

Repository: phoenix
Updated Branches:
  refs/heads/4.x-HBase-0.98 3de69287c -> 137ed5ee0


PHOENIX-1567 Publish Phoenix-Client & Phoenix-Server jars into Maven Repo


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

Branch: refs/heads/4.x-HBase-0.98
Commit: 137ed5ee0545b92f5f67d95edbeb38662d98e914
Parents: 3de6928
Author: Ankit Singhal 
Authored: Fri May 25 11:33:06 2018 -0700
Committer: Ankit Singhal 
Committed: Fri May 25 11:33:06 2018 -0700

--
 phoenix-client/pom.xml | 1 +
 phoenix-server/pom.xml | 1 +
 2 files changed, 2 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/137ed5ee/phoenix-client/pom.xml
--
diff --git a/phoenix-client/pom.xml b/phoenix-client/pom.xml
index f0aa89c..d4560c0 100644
--- a/phoenix-client/pom.xml
+++ b/phoenix-client/pom.xml
@@ -81,6 +81,7 @@
 
 
   ${basedir}/target/phoenix-${project.version}-client.jar
+ ${basedir}/pom.xml
 
   
   

http://git-wip-us.apache.org/repos/asf/phoenix/blob/137ed5ee/phoenix-server/pom.xml
--
diff --git a/phoenix-server/pom.xml b/phoenix-server/pom.xml
index e45acbd..2b9be90 100644
--- a/phoenix-server/pom.xml
+++ b/phoenix-server/pom.xml
@@ -85,6 +85,7 @@
 
 
   ${basedir}/target/phoenix-${project.version}-server.jar
+ ${basedir}/pom.xml

phoenix git commit: PHOENIX-1567 Publish Phoenix-Client & Phoenix-Server jars into Maven Repo

2018-05-25 Thread ankit

Repository: phoenix
Updated Branches:
  refs/heads/master 9335972fb -> 0c53d601a


PHOENIX-1567 Publish Phoenix-Client & Phoenix-Server jars into Maven Repo


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

Branch: refs/heads/master
Commit: 0c53d601a4851cceac284d500fa21ec9c2730ea6
Parents: 9335972
Author: Ankit Singhal 
Authored: Fri May 25 11:31:37 2018 -0700
Committer: Ankit Singhal 
Committed: Fri May 25 11:31:37 2018 -0700

--
 phoenix-client/pom.xml | 1 +
 phoenix-server/pom.xml | 1 +
 2 files changed, 2 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/0c53d601/phoenix-client/pom.xml
--
diff --git a/phoenix-client/pom.xml b/phoenix-client/pom.xml
index 8d78d6b..d65da69 100644
--- a/phoenix-client/pom.xml
+++ b/phoenix-client/pom.xml
@@ -81,6 +81,7 @@
 
 
   ${basedir}/target/phoenix-${project.version}-client.jar
+ ${basedir}/pom.xml
 
   
   

http://git-wip-us.apache.org/repos/asf/phoenix/blob/0c53d601/phoenix-server/pom.xml
--
diff --git a/phoenix-server/pom.xml b/phoenix-server/pom.xml
index ba05953..de9d95b 100644
--- a/phoenix-server/pom.xml
+++ b/phoenix-server/pom.xml
@@ -85,6 +85,7 @@
 
 
   ${basedir}/target/phoenix-${project.version}-server.jar
+ ${basedir}/pom.xml

phoenix git commit: PHOENIX-4728 ARRAY_APPEND and ARRAY_REMOVE should work with null column value (Xavier Jodoin)

2018-05-25 Thread jamestaylor

Repository: phoenix
Updated Branches:
  refs/heads/4.x-HBase-0.98 b0b5456ff -> 3de69287c


PHOENIX-4728 ARRAY_APPEND and ARRAY_REMOVE should work with null column value 
(Xavier Jodoin)


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

Branch: refs/heads/4.x-HBase-0.98
Commit: 3de69287c62ffaeca27861a52abe52d322792854
Parents: b0b5456
Author: James Taylor 
Authored: Fri May 25 09:36:41 2018 -0700
Committer: James Taylor 
Committed: Fri May 25 09:46:12 2018 -0700

--
 .../phoenix/end2end/ArrayAppendFunctionIT.java  | 38 
 .../apache/phoenix/compile/UpsertCompiler.java  |  2 +-
 2 files changed, 39 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/3de69287/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArrayAppendFunctionIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArrayAppendFunctionIT.java
 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArrayAppendFunctionIT.java
index caa17fe..7962a7a 100644
--- 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArrayAppendFunctionIT.java
+++ 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArrayAppendFunctionIT.java
@@ -132,6 +132,24 @@ public class ArrayAppendFunctionIT extends 
ParallelStatsDisabledIT {
 }
 
 @Test
+public void testUpsertEmptyArrayModification() throws Exception {
+Connection conn = DriverManager.getConnection(getUrl());
+String tableName = initTables(conn);
+
+ResultSet rs;
+String[] strings = new String[]{"34567"};
+Array array = conn.createArrayOf("VARCHAR", strings);
+
+conn.createStatement().execute("UPSERT INTO " + tableName + " 
(region_name,nullVarChar) SELECT region_name,ARRAY_APPEND(nullVarChar,'34567') 
FROM " + tableName);
+conn.commit();
+
+rs = conn.createStatement().executeQuery("SELECT nullVarChar FROM " + 
tableName + " LIMIT 1");
+assertTrue(rs.next());
+assertEquals(array, rs.getArray(1));
+assertFalse(rs.next());
+}
+
+@Test
 public void testArrayAppendFunctionVarchar() throws Exception {
 Connection conn = DriverManager.getConnection(getUrl());
 String tableName = initTables(conn);
@@ -147,6 +165,26 @@ public class ArrayAppendFunctionIT extends 
ParallelStatsDisabledIT {
 assertEquals(array, rs.getArray(1));
 assertFalse(rs.next());
 }
+
+@Test
+public void testUpsertArrayAppendFunctionVarchar() throws Exception {
+Connection conn = DriverManager.getConnection(getUrl());
+String tableName = initTables(conn);
+
+conn.createStatement().execute("UPSERT INTO " + tableName + " 
(region_name,varchars) SELECT region_name,ARRAY_APPEND(varchars,'34567') as 
varchars FROM " + tableName+ " WHERE region_name = 'SF Bay Area'");
+conn.commit();
+
+ResultSet rs;
+rs = conn.createStatement().executeQuery("SELECT varchars FROM " + 
tableName + " WHERE region_name = 'SF Bay Area'");
+assertTrue(rs.next());
+
+String[] strings = new String[]{"2345", "46345", "23234", "34567"};
+
+Array array = conn.createArrayOf("VARCHAR", strings);
+
+assertEquals(array, rs.getArray(1));
+assertFalse(rs.next());
+}
 
 @Test
 public void testArrayAppendFunctionInteger() throws Exception {

http://git-wip-us.apache.org/repos/asf/phoenix/blob/3de69287/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 9d22e30..03db29c 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
@@ -548,7 +548,7 @@ public class UpsertCompiler {
 select = SelectStatement.create(select, hint);
 // Pass scan through if same table in upsert and select so that 
projection is computed correctly
 // Use optimizer to choose the best plan
-QueryCompiler compiler = new QueryCompiler(statement, select, 
selectResolver, targetColumns, parallelIteratorFactoryToBe, new 
SequenceManager(statement), false, false, null);
+QueryCompiler compiler = new QueryCompiler(statement, select, 
selectResolver, targetColumns,

phoenix git commit: PHOENIX-1567 Publish Phoenix-Client & Phoenix-Server jars into Maven Repo

2018-05-25 Thread ankit

Repository: phoenix
Updated Branches:
  refs/heads/5.x-HBase-2.0 bac88a6d4 -> c8db63adc


PHOENIX-1567 Publish Phoenix-Client & Phoenix-Server jars into Maven Repo


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

Branch: refs/heads/5.x-HBase-2.0
Commit: c8db63adc3067f509fa820a5ed22588229ec165f
Parents: bac88a6
Author: Ankit Singhal 
Authored: Fri May 25 11:31:06 2018 -0700
Committer: Ankit Singhal 
Committed: Fri May 25 11:31:06 2018 -0700

--
 phoenix-client/pom.xml | 1 +
 phoenix-server/pom.xml | 1 +
 2 files changed, 2 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/c8db63ad/phoenix-client/pom.xml
--
diff --git a/phoenix-client/pom.xml b/phoenix-client/pom.xml
index a58e56c..ca95e62 100644
--- a/phoenix-client/pom.xml
+++ b/phoenix-client/pom.xml
@@ -81,6 +81,7 @@
 
 
   ${basedir}/target/phoenix-${project.version}-client.jar
+ ${basedir}/pom.xml
 
   
   

http://git-wip-us.apache.org/repos/asf/phoenix/blob/c8db63ad/phoenix-server/pom.xml
--
diff --git a/phoenix-server/pom.xml b/phoenix-server/pom.xml
index 1eed4c2..e06eba9 100644
--- a/phoenix-server/pom.xml
+++ b/phoenix-server/pom.xml
@@ -85,6 +85,7 @@
 
 
   ${basedir}/target/phoenix-${project.version}-server.jar
+ ${basedir}/pom.xml

phoenix git commit: PHOENIX-1567 Publish Phoenix-Client & Phoenix-Server jars into Maven Repo

2018-05-25 Thread ankit

Repository: phoenix
Updated Branches:
  refs/heads/4.x-HBase-1.3 ffc380aad -> 7eaac1caa


PHOENIX-1567 Publish Phoenix-Client & Phoenix-Server jars into Maven Repo


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

Branch: refs/heads/4.x-HBase-1.3
Commit: 7eaac1caa5c04801c39548403c758a68bfa278c7
Parents: ffc380a
Author: Ankit Singhal 
Authored: Fri May 25 11:32:02 2018 -0700
Committer: Ankit Singhal 
Committed: Fri May 25 11:32:02 2018 -0700

--
 phoenix-client/pom.xml | 1 +
 phoenix-server/pom.xml | 1 +
 2 files changed, 2 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/7eaac1ca/phoenix-client/pom.xml
--
diff --git a/phoenix-client/pom.xml b/phoenix-client/pom.xml
index 2c60fc6..c8fb6aa 100644
--- a/phoenix-client/pom.xml
+++ b/phoenix-client/pom.xml
@@ -81,6 +81,7 @@
 
 
   ${basedir}/target/phoenix-${project.version}-client.jar
+ ${basedir}/pom.xml
 
   
   

http://git-wip-us.apache.org/repos/asf/phoenix/blob/7eaac1ca/phoenix-server/pom.xml
--
diff --git a/phoenix-server/pom.xml b/phoenix-server/pom.xml
index dcda799..f5ba7f7 100644
--- a/phoenix-server/pom.xml
+++ b/phoenix-server/pom.xml
@@ -85,6 +85,7 @@
 
 
   ${basedir}/target/phoenix-${project.version}-server.jar
+ ${basedir}/pom.xml

Apache-Phoenix | 4.x-HBase-0.98 | Build Successful

2018-05-25 Thread Apache Jenkins Server

4.x-HBase-0.98 branch build status Successful

Source repository https://git-wip-us.apache.org/repos/asf?p=phoenix.git;a=shortlog;h=refs/heads/4.x-HBase-0.98

Compiled Artifacts https://builds.apache.org/job/Phoenix-4.x-HBase-0.98/lastSuccessfulBuild/artifact/

Test Report https://builds.apache.org/job/Phoenix-4.x-HBase-0.98/lastCompletedBuild/testReport/

Changes
[jtaylor] PHOENIX-4728 ARRAY_APPEND and ARRAY_REMOVE should work with null column



Build times for last couple of runsLatest build time is the right most | Legend blue: normal, red: test failure, gray: timeout

Build failed in Jenkins: Phoenix-4.x-HBase-1.1 #757

2018-05-25 Thread Apache Jenkins Server

See 


Changes:

[jtaylor] PHOENIX-4728 ARRAY_APPEND and ARRAY_REMOVE should work with null 
column

--
[...truncated 106.89 KB...]
[INFO] Tests run: 40, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 201.237 
s - in org.apache.phoenix.end2end.index.GlobalMutableTxIndexIT
[INFO] Tests run: 16, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 91.373 
s - in org.apache.phoenix.end2end.index.IndexMetadataIT
[INFO] Running org.apache.phoenix.end2end.index.LocalImmutableTxIndexIT
[INFO] Running org.apache.phoenix.end2end.index.LocalImmutableNonTxIndexIT
[INFO] Tests run: 18, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 193.017 
s - in org.apache.phoenix.end2end.index.IndexWithTableSchemaChangeIT
[INFO] Running org.apache.phoenix.end2end.index.LocalMutableNonTxIndexIT
[INFO] Tests run: 37, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 247.696 
s - in org.apache.phoenix.end2end.index.IndexUsageIT
[INFO] Running org.apache.phoenix.end2end.index.LocalMutableTxIndexIT
[INFO] Tests run: 40, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 386.808 
s - in org.apache.phoenix.end2end.index.LocalImmutableTxIndexIT
[INFO] Tests run: 40, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 372.424 
s - in org.apache.phoenix.end2end.index.LocalImmutableNonTxIndexIT
[INFO] Running org.apache.phoenix.end2end.index.MutableIndexIT
[INFO] Running org.apache.phoenix.end2end.index.SaltedIndexIT
[INFO] Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 13.986 s 
- in org.apache.phoenix.end2end.index.SaltedIndexIT
[INFO] Running org.apache.phoenix.end2end.index.ViewIndexIT
[INFO] Tests run: 40, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 352.377 
s - in org.apache.phoenix.end2end.index.LocalMutableNonTxIndexIT
[INFO] Running org.apache.phoenix.end2end.index.txn.MutableRollbackIT
[WARNING] Tests run: 14, Failures: 0, Errors: 0, Skipped: 2, Time elapsed: 
78.355 s - in org.apache.phoenix.end2end.index.ViewIndexIT
[INFO] Running org.apache.phoenix.end2end.index.txn.RollbackIT
[INFO] Tests run: 40, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 375.729 
s - in org.apache.phoenix.end2end.index.LocalMutableTxIndexIT
[INFO] Tests run: 6, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 68.275 s 
- in org.apache.phoenix.end2end.index.txn.MutableRollbackIT
[INFO] Running org.apache.phoenix.end2end.join.HashJoinGlobalIndexIT
[INFO] Tests run: 8, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 53.4 s - 
in org.apache.phoenix.end2end.index.txn.RollbackIT
[INFO] Running org.apache.phoenix.end2end.join.HashJoinLocalIndexIT
[INFO] Running org.apache.phoenix.end2end.join.HashJoinCacheIT
[INFO] Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 7.521 s 
- in org.apache.phoenix.end2end.join.HashJoinCacheIT
[INFO] Running org.apache.phoenix.end2end.join.HashJoinMoreIT
[INFO] Tests run: 8, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 52.239 s 
- in org.apache.phoenix.end2end.join.HashJoinMoreIT
[INFO] Running org.apache.phoenix.end2end.join.HashJoinNoIndexIT
[INFO] Tests run: 33, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 198.569 
s - in org.apache.phoenix.end2end.join.HashJoinNoIndexIT
[INFO] Running org.apache.phoenix.end2end.join.SortMergeJoinGlobalIndexIT
[INFO] Tests run: 33, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 332.958 
s - in org.apache.phoenix.end2end.join.HashJoinGlobalIndexIT
[INFO] Running org.apache.phoenix.end2end.join.SortMergeJoinLocalIndexIT
[INFO] Tests run: 80, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 579.765 
s - in org.apache.phoenix.end2end.index.MutableIndexIT
[INFO] Running org.apache.phoenix.end2end.join.SortMergeJoinNoIndexIT
[INFO] Tests run: 34, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 579.096 
s - in org.apache.phoenix.end2end.join.HashJoinLocalIndexIT
[INFO] Tests run: 34, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 288.039 
s - in org.apache.phoenix.end2end.join.SortMergeJoinGlobalIndexIT
[INFO] Tests run: 34, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 167.198 
s - in org.apache.phoenix.end2end.join.SortMergeJoinNoIndexIT
[INFO] Running org.apache.phoenix.end2end.join.SubqueryIT
[INFO] Running org.apache.phoenix.end2end.join.SubqueryUsingSortMergeJoinIT
[INFO] Running org.apache.phoenix.end2end.salted.SaltedTableIT
[INFO] Tests run: 8, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 13.78 s 
- in org.apache.phoenix.end2end.salted.SaltedTableIT
[INFO] Running org.apache.phoenix.end2end.salted.SaltedTableUpsertSelectIT
[INFO] Tests run: 6, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 26.927 s 
- in org.apache.phoenix.end2end.salted.SaltedTableUpsertSelectIT
[INFO] Running org.apache.phoenix.end2end.salted.SaltedTableVarLengthRowKeyIT
[INFO] Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 2.306 s 
- in org.apache.phoenix.end2end.salted.SaltedTableVarLengthRowKeyIT
[INFO]

[9/9] phoenix git commit: PHOENIX-4749 Allow impersonation when SPNEGO is disabled

2018-05-25 Thread elserj

PHOENIX-4749 Allow impersonation when SPNEGO is disabled

Client impersonation is no longer tied to SPNEGO auth.

Signed-off-by: Josh Elser 


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

Branch: refs/heads/4.x-HBase-1.3
Commit: e2212e2abbe2fd5dd04a10ac0b3a064dc1c9c2f5
Parents: 7eaac1c
Author: Alex Araujo 
Authored: Wed May 23 10:28:48 2018 -0500
Committer: Josh Elser 
Committed: Fri May 25 17:32:43 2018 -0400

--
 .../phoenix/queryserver/server/QueryServer.java | 90 +++-
 .../server/QueryServerConfigurationTest.java| 72 
 2 files changed, 121 insertions(+), 41 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/e2212e2a/phoenix-queryserver/src/main/java/org/apache/phoenix/queryserver/server/QueryServer.java
--
diff --git 
a/phoenix-queryserver/src/main/java/org/apache/phoenix/queryserver/server/QueryServer.java
 
b/phoenix-queryserver/src/main/java/org/apache/phoenix/queryserver/server/QueryServer.java
index 8436086..e3f0f52 100644
--- 
a/phoenix-queryserver/src/main/java/org/apache/phoenix/queryserver/server/QueryServer.java
+++ 
b/phoenix-queryserver/src/main/java/org/apache/phoenix/queryserver/server/QueryServer.java
@@ -54,6 +54,7 @@ import org.apache.phoenix.queryserver.register.Registry;
 import org.apache.phoenix.util.InstanceResolver;
 
 import java.io.File;
+import java.io.IOException;
 import java.lang.management.ManagementFactory;
 import java.lang.management.RuntimeMXBean;
 import java.net.InetAddress;
@@ -197,7 +198,7 @@ public final class QueryServer extends Configured 
implements Tool, Runnable {
   
QueryServicesOptions.DEFAULT_QUERY_SERVER_DISABLE_KERBEROS_LOGIN);
 
   // handle secure cluster credentials
-  if (isKerberos && !disableSpnego && !disableLogin) {
+  if (isKerberos && !disableLogin) {
 hostname = Strings.domainNamePointerToHostName(DNS.getDefaultHost(
 getConf().get(QueryServices.QUERY_SERVER_DNS_INTERFACE_ATTRIB, 
"default"),
 getConf().get(QueryServices.QUERY_SERVER_DNS_NAMESERVER_ATTRIB, 
"default")));
@@ -230,47 +231,9 @@ public final class QueryServer extends Configured 
implements Tool, Runnable {
   final HttpServer.Builder builder = new 
HttpServer.Builder().withPort(port)
   .withHandler(service, getSerialization(getConf()));
 
-  // Enable SPNEGO and Impersonation when using Kerberos
+  // Enable client auth when using Kerberos auth for HBase
   if (isKerberos) {
-UserGroupInformation ugi = UserGroupInformation.getCurrentUser();
-LOG.debug("Current user is " + ugi);
-if (!ugi.hasKerberosCredentials()) {
-  ugi = UserGroupInformation.getLoginUser();
-  LOG.debug("Current user does not have Kerberos credentials, using 
instead " + ugi);
-}
-
-// Make sure the proxyuser configuration is up to date
-ProxyUsers.refreshSuperUserGroupsConfiguration(getConf());
-
-String keytabPath = 
getConf().get(QueryServices.QUERY_SERVER_KEYTAB_FILENAME_ATTRIB);
-File keytab = new File(keytabPath);
-String httpKeytabPath = 
getConf().get(QueryServices.QUERY_SERVER_HTTP_KEYTAB_FILENAME_ATTRIB, null);
-String httpPrincipal = 
getConf().get(QueryServices.QUERY_SERVER_KERBEROS_HTTP_PRINCIPAL_ATTRIB, null);
-// Backwards compat for a configuration key change
-if (httpPrincipal == null) {
-  httpPrincipal = 
getConf().get(QueryServices.QUERY_SERVER_KERBEROS_HTTP_PRINCIPAL_ATTRIB_LEGACY, 
null);
-}
-File httpKeytab = null;
-if (null != httpKeytabPath)
-  httpKeytab = new File(httpKeytabPath);
-
-String realmsString = 
getConf().get(QueryServices.QUERY_SERVER_KERBEROS_ALLOWED_REALMS, null);
-String[] additionalAllowedRealms = null;
-if (null != realmsString) {
-additionalAllowedRealms = StringUtils.split(realmsString, ',');
-}
-
-// Enable SPNEGO and impersonation (through standard Hadoop 
configuration means)
-if ((null != httpKeytabPath) && (null != httpPrincipal))
-  builder.withSpnego(httpPrincipal, additionalAllowedRealms)
-  .withAutomaticLogin(httpKeytab)
-  .withImpersonation(new PhoenixDoAsCallback(ugi, getConf()));
-else
-  builder.withSpnego(ugi.getUserName(), additionalAllowedRealms)
-  .withAutomaticLogin(keytab)
-  .withImpersonation(new PhoenixDoAsCallback(ugi, getConf()));
-
-
+

[1/9] phoenix git commit: PHOENIX-4749 Allow impersonation when SPNEGO is disabled

2018-05-25 Thread elserj

Repository: phoenix
Updated Branches:
  refs/heads/4.x-HBase-0.98 137ed5ee0 -> 5b3fd4041
  refs/heads/4.x-HBase-1.1 add7dd05e -> e71e76780
  refs/heads/4.x-HBase-1.2 11b43bcf7 -> d4a545626
  refs/heads/4.x-HBase-1.3 7eaac1caa -> e2212e2ab
  refs/heads/5.x-HBase-2.0 c8db63adc -> 8a955d47d
  refs/heads/master 0c53d601a -> c35daba32


PHOENIX-4749 Allow impersonation when SPNEGO is disabled

Client impersonation is no longer tied to SPNEGO auth.

Signed-off-by: Josh Elser 


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

Branch: refs/heads/4.x-HBase-1.2
Commit: d4a5456269f10c78accf300305ce915e4e5ce8bf
Parents: 11b43bc
Author: Alex Araujo 
Authored: Wed May 23 10:28:48 2018 -0500
Committer: Josh Elser 
Committed: Fri May 25 14:46:34 2018 -0400

--
 .../phoenix/queryserver/server/QueryServer.java | 90 +++-
 .../server/QueryServerConfigurationTest.java| 72 
 2 files changed, 121 insertions(+), 41 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/d4a54562/phoenix-queryserver/src/main/java/org/apache/phoenix/queryserver/server/QueryServer.java
--
diff --git 
a/phoenix-queryserver/src/main/java/org/apache/phoenix/queryserver/server/QueryServer.java
 
b/phoenix-queryserver/src/main/java/org/apache/phoenix/queryserver/server/QueryServer.java
index 8436086..e3f0f52 100644
--- 
a/phoenix-queryserver/src/main/java/org/apache/phoenix/queryserver/server/QueryServer.java
+++ 
b/phoenix-queryserver/src/main/java/org/apache/phoenix/queryserver/server/QueryServer.java
@@ -54,6 +54,7 @@ import org.apache.phoenix.queryserver.register.Registry;
 import org.apache.phoenix.util.InstanceResolver;
 
 import java.io.File;
+import java.io.IOException;
 import java.lang.management.ManagementFactory;
 import java.lang.management.RuntimeMXBean;
 import java.net.InetAddress;
@@ -197,7 +198,7 @@ public final class QueryServer extends Configured 
implements Tool, Runnable {
   
QueryServicesOptions.DEFAULT_QUERY_SERVER_DISABLE_KERBEROS_LOGIN);
 
   // handle secure cluster credentials
-  if (isKerberos && !disableSpnego && !disableLogin) {
+  if (isKerberos && !disableLogin) {
 hostname = Strings.domainNamePointerToHostName(DNS.getDefaultHost(
 getConf().get(QueryServices.QUERY_SERVER_DNS_INTERFACE_ATTRIB, 
"default"),
 getConf().get(QueryServices.QUERY_SERVER_DNS_NAMESERVER_ATTRIB, 
"default")));
@@ -230,47 +231,9 @@ public final class QueryServer extends Configured 
implements Tool, Runnable {
   final HttpServer.Builder builder = new 
HttpServer.Builder().withPort(port)
   .withHandler(service, getSerialization(getConf()));
 
-  // Enable SPNEGO and Impersonation when using Kerberos
+  // Enable client auth when using Kerberos auth for HBase
   if (isKerberos) {
-UserGroupInformation ugi = UserGroupInformation.getCurrentUser();
-LOG.debug("Current user is " + ugi);
-if (!ugi.hasKerberosCredentials()) {
-  ugi = UserGroupInformation.getLoginUser();
-  LOG.debug("Current user does not have Kerberos credentials, using 
instead " + ugi);
-}
-
-// Make sure the proxyuser configuration is up to date
-ProxyUsers.refreshSuperUserGroupsConfiguration(getConf());
-
-String keytabPath = 
getConf().get(QueryServices.QUERY_SERVER_KEYTAB_FILENAME_ATTRIB);
-File keytab = new File(keytabPath);
-String httpKeytabPath = 
getConf().get(QueryServices.QUERY_SERVER_HTTP_KEYTAB_FILENAME_ATTRIB, null);
-String httpPrincipal = 
getConf().get(QueryServices.QUERY_SERVER_KERBEROS_HTTP_PRINCIPAL_ATTRIB, null);
-// Backwards compat for a configuration key change
-if (httpPrincipal == null) {
-  httpPrincipal = 
getConf().get(QueryServices.QUERY_SERVER_KERBEROS_HTTP_PRINCIPAL_ATTRIB_LEGACY, 
null);
-}
-File httpKeytab = null;
-if (null != httpKeytabPath)
-  httpKeytab = new File(httpKeytabPath);
-
-String realmsString = 
getConf().get(QueryServices.QUERY_SERVER_KERBEROS_ALLOWED_REALMS, null);
-String[] additionalAllowedRealms = null;
-if (null != realmsString) {
-additionalAllowedRealms = StringUtils.split(realmsString, ',');
-}
-
-// Enable SPNEGO and impersonation (through standard Hadoop 
configuration means)
-if ((null != httpKeytabPath) && (null != httpPrincipal))
-  builder.withSpnego(httpPrincipal, additionalAllowedRealms)
-

Apache-Phoenix | 4.x-HBase-0.98 | Build Successful

2018-05-25 Thread Apache Jenkins Server

4.x-HBase-0.98 branch build status Successful

Source repository https://git-wip-us.apache.org/repos/asf?p=phoenix.git;a=shortlog;h=refs/heads/4.x-HBase-0.98

Compiled Artifacts https://builds.apache.org/job/Phoenix-4.x-HBase-0.98/lastSuccessfulBuild/artifact/

Test Report https://builds.apache.org/job/Phoenix-4.x-HBase-0.98/lastCompletedBuild/testReport/

Changes
[ankitsinghal59] PHOENIX-1567 Publish Phoenix-Client & Phoenix-Server jars into Maven



Build times for last couple of runsLatest build time is the right most | Legend blue: normal, red: test failure, gray: timeout

[phoenix] Git Push Summary

2018-05-25 Thread mujtaba

Repository: phoenix
Updated Tags:  refs/tags/v4.14.0-HBase-0.98-rc1 [created] f64624ec4

[phoenix] Git Push Summary

2018-05-25 Thread mujtaba

Repository: phoenix
Updated Tags:  refs/tags/v4.14.0-HBase-1.1-rc1 [created] 1fad6b492

[phoenix] Git Push Summary

2018-05-25 Thread mujtaba

Repository: phoenix
Updated Tags:  refs/tags/v4.14.0-HBase-1.4-rc1 [created] 98c0808f1

phoenix git commit: Fix Apache RAT warnings

2018-05-25 Thread mujtaba

Repository: phoenix
Updated Branches:
  refs/heads/master d6012ca19 -> b19fde2c5


Fix Apache RAT warnings


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

Branch: refs/heads/master
Commit: b19fde2c5f2b4df957b9d880a1a7a7036f45453a
Parents: d6012ca
Author: Mujtaba 
Authored: Fri May 25 16:43:51 2018 -0700
Committer: Mujtaba 
Committed: Fri May 25 16:43:51 2018 -0700

--
 .../end2end/index/MutableIndexRebuilderIT.java| 18 ++
 1 file changed, 18 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/b19fde2c/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/MutableIndexRebuilderIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/MutableIndexRebuilderIT.java
 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/MutableIndexRebuilderIT.java
index 8420f16..a3af20d 100644
--- 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/MutableIndexRebuilderIT.java
+++ 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/MutableIndexRebuilderIT.java
@@ -1,3 +1,21 @@
+/*
+ * 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.index;
 
 import static org.junit.Assert.assertEquals;

svn commit: r27113 - in /dev/phoenix: apache-phoenix-4.14.0-HBase-0.98-rc1/ apache-phoenix-4.14.0-HBase-0.98-rc1/bin/ apache-phoenix-4.14.0-HBase-0.98-rc1/src/ apache-phoenix-4.14.0-HBase-1.1-rc1/ apa

2018-05-25 Thread mujtaba

Author: mujtaba
Date: Fri May 25 23:54:02 2018
New Revision: 27113

Log:
apache-phoenix-4.14.0-HBase-rc1 part 1/2

Added:
dev/phoenix/apache-phoenix-4.14.0-HBase-0.98-rc1/
dev/phoenix/apache-phoenix-4.14.0-HBase-0.98-rc1/bin/

dev/phoenix/apache-phoenix-4.14.0-HBase-0.98-rc1/bin/apache-phoenix-4.14.0-HBase-0.98-bin.tar.gz
   (with props)

dev/phoenix/apache-phoenix-4.14.0-HBase-0.98-rc1/bin/apache-phoenix-4.14.0-HBase-0.98-bin.tar.gz.asc

dev/phoenix/apache-phoenix-4.14.0-HBase-0.98-rc1/bin/apache-phoenix-4.14.0-HBase-0.98-bin.tar.gz.md5

dev/phoenix/apache-phoenix-4.14.0-HBase-0.98-rc1/bin/apache-phoenix-4.14.0-HBase-0.98-bin.tar.gz.sha256

dev/phoenix/apache-phoenix-4.14.0-HBase-0.98-rc1/bin/apache-phoenix-4.14.0-HBase-0.98-bin.tar.gz.sha512
dev/phoenix/apache-phoenix-4.14.0-HBase-0.98-rc1/src/

dev/phoenix/apache-phoenix-4.14.0-HBase-0.98-rc1/src/apache-phoenix-4.14.0-HBase-0.98-src.tar.gz
   (with props)

dev/phoenix/apache-phoenix-4.14.0-HBase-0.98-rc1/src/apache-phoenix-4.14.0-HBase-0.98-src.tar.gz.asc

dev/phoenix/apache-phoenix-4.14.0-HBase-0.98-rc1/src/apache-phoenix-4.14.0-HBase-0.98-src.tar.gz.md5

dev/phoenix/apache-phoenix-4.14.0-HBase-0.98-rc1/src/apache-phoenix-4.14.0-HBase-0.98-src.tar.gz.sha256

dev/phoenix/apache-phoenix-4.14.0-HBase-0.98-rc1/src/apache-phoenix-4.14.0-HBase-0.98-src.tar.gz.sha512
dev/phoenix/apache-phoenix-4.14.0-HBase-1.1-rc1/
dev/phoenix/apache-phoenix-4.14.0-HBase-1.1-rc1/bin/

dev/phoenix/apache-phoenix-4.14.0-HBase-1.1-rc1/bin/apache-phoenix-4.14.0-HBase-1.1-bin.tar.gz
   (with props)

dev/phoenix/apache-phoenix-4.14.0-HBase-1.1-rc1/bin/apache-phoenix-4.14.0-HBase-1.1-bin.tar.gz.asc

dev/phoenix/apache-phoenix-4.14.0-HBase-1.1-rc1/bin/apache-phoenix-4.14.0-HBase-1.1-bin.tar.gz.md5

dev/phoenix/apache-phoenix-4.14.0-HBase-1.1-rc1/bin/apache-phoenix-4.14.0-HBase-1.1-bin.tar.gz.sha
dev/phoenix/apache-phoenix-4.14.0-HBase-1.1-rc1/src/

dev/phoenix/apache-phoenix-4.14.0-HBase-1.1-rc1/src/apache-phoenix-4.14.0-HBase-1.1-src.tar.gz
   (with props)

dev/phoenix/apache-phoenix-4.14.0-HBase-1.1-rc1/src/apache-phoenix-4.14.0-HBase-1.1-src.tar.gz.asc

dev/phoenix/apache-phoenix-4.14.0-HBase-1.1-rc1/src/apache-phoenix-4.14.0-HBase-1.1-src.tar.gz.md5

dev/phoenix/apache-phoenix-4.14.0-HBase-1.1-rc1/src/apache-phoenix-4.14.0-HBase-1.1-src.tar.gz.sha
dev/phoenix/apache-phoenix-4.14.0-HBase-1.2-rc1/
dev/phoenix/apache-phoenix-4.14.0-HBase-1.2-rc1/bin/

dev/phoenix/apache-phoenix-4.14.0-HBase-1.2-rc1/bin/apache-phoenix-4.14.0-HBase-1.2-bin.tar.gz
   (with props)

dev/phoenix/apache-phoenix-4.14.0-HBase-1.2-rc1/bin/apache-phoenix-4.14.0-HBase-1.2-bin.tar.gz.asc

dev/phoenix/apache-phoenix-4.14.0-HBase-1.2-rc1/bin/apache-phoenix-4.14.0-HBase-1.2-bin.tar.gz.md5

dev/phoenix/apache-phoenix-4.14.0-HBase-1.2-rc1/bin/apache-phoenix-4.14.0-HBase-1.2-bin.tar.gz.sha256

dev/phoenix/apache-phoenix-4.14.0-HBase-1.2-rc1/bin/apache-phoenix-4.14.0-HBase-1.2-bin.tar.gz.sha512
dev/phoenix/apache-phoenix-4.14.0-HBase-1.2-rc1/src/

dev/phoenix/apache-phoenix-4.14.0-HBase-1.2-rc1/src/apache-phoenix-4.14.0-HBase-1.2-src.tar.gz
   (with props)

dev/phoenix/apache-phoenix-4.14.0-HBase-1.2-rc1/src/apache-phoenix-4.14.0-HBase-1.2-src.tar.gz.asc

dev/phoenix/apache-phoenix-4.14.0-HBase-1.2-rc1/src/apache-phoenix-4.14.0-HBase-1.2-src.tar.gz.md5

dev/phoenix/apache-phoenix-4.14.0-HBase-1.2-rc1/src/apache-phoenix-4.14.0-HBase-1.2-src.tar.gz.sha256

dev/phoenix/apache-phoenix-4.14.0-HBase-1.2-rc1/src/apache-phoenix-4.14.0-HBase-1.2-src.tar.gz.sha512

Added: 
dev/phoenix/apache-phoenix-4.14.0-HBase-0.98-rc1/bin/apache-phoenix-4.14.0-HBase-0.98-bin.tar.gz
==
Binary file - no diff available.

Propchange: 
dev/phoenix/apache-phoenix-4.14.0-HBase-0.98-rc1/bin/apache-phoenix-4.14.0-HBase-0.98-bin.tar.gz
--
svn:mime-type = application/octet-stream

Added: 
dev/phoenix/apache-phoenix-4.14.0-HBase-0.98-rc1/bin/apache-phoenix-4.14.0-HBase-0.98-bin.tar.gz.asc
==
--- 
dev/phoenix/apache-phoenix-4.14.0-HBase-0.98-rc1/bin/apache-phoenix-4.14.0-HBase-0.98-bin.tar.gz.asc
 (added)
+++ 
dev/phoenix/apache-phoenix-4.14.0-HBase-0.98-rc1/bin/apache-phoenix-4.14.0-HBase-0.98-bin.tar.gz.asc
 Fri May 25 23:54:02 2018
@@ -0,0 +1,17 @@
+-BEGIN PGP SIGNATURE-
+Version: GnuPG v1.4.11 (GNU/Linux)
+
+iQIcBAABAgAGBQJbCJ85AAoJEDv8s5KUYReOIHUP/i9estQsRfmquXKHHDyrhxQ5
+oyUPIeBNUZsczwklB/W+YsU+XY2gYpIZ9Zva9oOZoJtcSnmnrnqWlhkDl31+wLvN
+12gJfvhUno9ygO+yv1KsDOX6YemG4F+cThpsPtmtNzwobTI00K1eUjopVWWVaB2C
+UFcklupozU6Ttrh0L5F8/h5i/SLfLyxDvJBS0okfIcje6wAsxt7jRHiSegEqIhye
+2hfZD6ghQvIyfm1nu0ZoIECNtMQqaMxN1tb9HJfmqRQqqsICzwfXZOtaXh3ekgdb

[6/9] phoenix git commit: PHOENIX-4672 Align the kerberos principal config keys

2018-05-25 Thread elserj

PHOENIX-4672 Align the kerberos principal config keys

Fix the configuration keys in a manner that won't break users
who are using the 'old' name.


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

Branch: refs/heads/4.x-HBase-0.98
Commit: 5b3fd404184cc6291bb2d3773e5e0b40c193cf01
Parents: 9a7bf33
Author: Josh Elser 
Authored: Tue Apr 10 14:08:57 2018 -0400
Committer: Josh Elser 
Committed: Fri May 25 17:07:13 2018 -0400

--
 .../src/main/java/org/apache/phoenix/query/QueryServices.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/5b3fd404/phoenix-core/src/main/java/org/apache/phoenix/query/QueryServices.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/query/QueryServices.java 
b/phoenix-core/src/main/java/org/apache/phoenix/query/QueryServices.java
index add756e..0a506ac 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/query/QueryServices.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/query/QueryServices.java
@@ -234,7 +234,8 @@ public interface QueryServices extends SQLCloseable {
 public static final String QUERY_SERVER_KEYTAB_FILENAME_ATTRIB = 
"phoenix.queryserver.keytab.file";
 public static final String QUERY_SERVER_HTTP_KEYTAB_FILENAME_ATTRIB = 
"phoenix.queryserver.http.keytab.file";
 public static final String QUERY_SERVER_KERBEROS_PRINCIPAL_ATTRIB = 
"phoenix.queryserver.kerberos.principal";
-public static final String QUERY_SERVER_KERBEROS_HTTP_PRINCIPAL_ATTRIB = 
"phoenix.queryserver.kerberos.http.principal";
+public static final String 
QUERY_SERVER_KERBEROS_HTTP_PRINCIPAL_ATTRIB_LEGACY = 
"phoenix.queryserver.kerberos.http.principal";
+public static final String QUERY_SERVER_KERBEROS_HTTP_PRINCIPAL_ATTRIB = 
"phoenix.queryserver.http.kerberos.principal";
 public static final String QUERY_SERVER_DNS_NAMESERVER_ATTRIB = 
"phoenix.queryserver.dns.nameserver";
 public static final String QUERY_SERVER_DNS_INTERFACE_ATTRIB = 
"phoenix.queryserver.dns.interface";
 public static final String QUERY_SERVER_HBASE_SECURITY_CONF_ATTRIB = 
"hbase.security.authentication";

[8/9] phoenix git commit: PHOENIX-4749 Allow impersonation when SPNEGO is disabled

2018-05-25 Thread elserj

PHOENIX-4749 Allow impersonation when SPNEGO is disabled

Client impersonation is no longer tied to SPNEGO auth.

Signed-off-by: Josh Elser 


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

Branch: refs/heads/master
Commit: c35daba3210ae013f4091e669d4f5831c1d19a81
Parents: 0c53d60
Author: Alex Araujo 
Authored: Wed May 23 10:28:48 2018 -0500
Committer: Josh Elser 
Committed: Fri May 25 17:32:32 2018 -0400

--
 .../phoenix/queryserver/server/QueryServer.java | 90 +++-
 .../server/QueryServerConfigurationTest.java| 72 
 2 files changed, 121 insertions(+), 41 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/c35daba3/phoenix-queryserver/src/main/java/org/apache/phoenix/queryserver/server/QueryServer.java
--
diff --git 
a/phoenix-queryserver/src/main/java/org/apache/phoenix/queryserver/server/QueryServer.java
 
b/phoenix-queryserver/src/main/java/org/apache/phoenix/queryserver/server/QueryServer.java
index 8436086..e3f0f52 100644
--- 
a/phoenix-queryserver/src/main/java/org/apache/phoenix/queryserver/server/QueryServer.java
+++ 
b/phoenix-queryserver/src/main/java/org/apache/phoenix/queryserver/server/QueryServer.java
@@ -54,6 +54,7 @@ import org.apache.phoenix.queryserver.register.Registry;
 import org.apache.phoenix.util.InstanceResolver;
 
 import java.io.File;
+import java.io.IOException;
 import java.lang.management.ManagementFactory;
 import java.lang.management.RuntimeMXBean;
 import java.net.InetAddress;
@@ -197,7 +198,7 @@ public final class QueryServer extends Configured 
implements Tool, Runnable {
   
QueryServicesOptions.DEFAULT_QUERY_SERVER_DISABLE_KERBEROS_LOGIN);
 
   // handle secure cluster credentials
-  if (isKerberos && !disableSpnego && !disableLogin) {
+  if (isKerberos && !disableLogin) {
 hostname = Strings.domainNamePointerToHostName(DNS.getDefaultHost(
 getConf().get(QueryServices.QUERY_SERVER_DNS_INTERFACE_ATTRIB, 
"default"),
 getConf().get(QueryServices.QUERY_SERVER_DNS_NAMESERVER_ATTRIB, 
"default")));
@@ -230,47 +231,9 @@ public final class QueryServer extends Configured 
implements Tool, Runnable {
   final HttpServer.Builder builder = new 
HttpServer.Builder().withPort(port)
   .withHandler(service, getSerialization(getConf()));
 
-  // Enable SPNEGO and Impersonation when using Kerberos
+  // Enable client auth when using Kerberos auth for HBase
   if (isKerberos) {
-UserGroupInformation ugi = UserGroupInformation.getCurrentUser();
-LOG.debug("Current user is " + ugi);
-if (!ugi.hasKerberosCredentials()) {
-  ugi = UserGroupInformation.getLoginUser();
-  LOG.debug("Current user does not have Kerberos credentials, using 
instead " + ugi);
-}
-
-// Make sure the proxyuser configuration is up to date
-ProxyUsers.refreshSuperUserGroupsConfiguration(getConf());
-
-String keytabPath = 
getConf().get(QueryServices.QUERY_SERVER_KEYTAB_FILENAME_ATTRIB);
-File keytab = new File(keytabPath);
-String httpKeytabPath = 
getConf().get(QueryServices.QUERY_SERVER_HTTP_KEYTAB_FILENAME_ATTRIB, null);
-String httpPrincipal = 
getConf().get(QueryServices.QUERY_SERVER_KERBEROS_HTTP_PRINCIPAL_ATTRIB, null);
-// Backwards compat for a configuration key change
-if (httpPrincipal == null) {
-  httpPrincipal = 
getConf().get(QueryServices.QUERY_SERVER_KERBEROS_HTTP_PRINCIPAL_ATTRIB_LEGACY, 
null);
-}
-File httpKeytab = null;
-if (null != httpKeytabPath)
-  httpKeytab = new File(httpKeytabPath);
-
-String realmsString = 
getConf().get(QueryServices.QUERY_SERVER_KERBEROS_ALLOWED_REALMS, null);
-String[] additionalAllowedRealms = null;
-if (null != realmsString) {
-additionalAllowedRealms = StringUtils.split(realmsString, ',');
-}
-
-// Enable SPNEGO and impersonation (through standard Hadoop 
configuration means)
-if ((null != httpKeytabPath) && (null != httpPrincipal))
-  builder.withSpnego(httpPrincipal, additionalAllowedRealms)
-  .withAutomaticLogin(httpKeytab)
-  .withImpersonation(new PhoenixDoAsCallback(ugi, getConf()));
-else
-  builder.withSpnego(ugi.getUserName(), additionalAllowedRealms)
-  .withAutomaticLogin(keytab)
-  .withImpersonation(new PhoenixDoAsCallback(ugi, getConf()));
-
-
+

[4/9] phoenix git commit: PHOENIX-4672 Align the kerberos principal config keys

2018-05-25 Thread elserj

PHOENIX-4672 Align the kerberos principal config keys

Fix the configuration keys in a manner that won't break users
who are using the 'old' name.


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

Branch: refs/heads/4.x-HBase-1.1
Commit: e71e76780ddb30bca8ca227019a298094ba0cd68
Parents: 838914e
Author: Josh Elser 
Authored: Tue Apr 10 14:08:57 2018 -0400
Committer: Josh Elser 
Committed: Fri May 25 16:37:50 2018 -0400

--
 .../src/main/java/org/apache/phoenix/query/QueryServices.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/e71e7678/phoenix-core/src/main/java/org/apache/phoenix/query/QueryServices.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/query/QueryServices.java 
b/phoenix-core/src/main/java/org/apache/phoenix/query/QueryServices.java
index 5e0a8f1..cbc9a72 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/query/QueryServices.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/query/QueryServices.java
@@ -239,7 +239,8 @@ public interface QueryServices extends SQLCloseable {
 public static final String QUERY_SERVER_KEYTAB_FILENAME_ATTRIB = 
"phoenix.queryserver.keytab.file";
 public static final String QUERY_SERVER_HTTP_KEYTAB_FILENAME_ATTRIB = 
"phoenix.queryserver.http.keytab.file";
 public static final String QUERY_SERVER_KERBEROS_PRINCIPAL_ATTRIB = 
"phoenix.queryserver.kerberos.principal";
-public static final String QUERY_SERVER_KERBEROS_HTTP_PRINCIPAL_ATTRIB = 
"phoenix.queryserver.kerberos.http.principal";
+public static final String 
QUERY_SERVER_KERBEROS_HTTP_PRINCIPAL_ATTRIB_LEGACY = 
"phoenix.queryserver.kerberos.http.principal";
+public static final String QUERY_SERVER_KERBEROS_HTTP_PRINCIPAL_ATTRIB = 
"phoenix.queryserver.http.kerberos.principal";
 public static final String QUERY_SERVER_DNS_NAMESERVER_ATTRIB = 
"phoenix.queryserver.dns.nameserver";
 public static final String QUERY_SERVER_DNS_INTERFACE_ATTRIB = 
"phoenix.queryserver.dns.interface";
 public static final String QUERY_SERVER_HBASE_SECURITY_CONF_ATTRIB = 
"hbase.security.authentication";

[2/9] phoenix git commit: PHOENIX-4533 Modified Query Server to use two sets of Kerberos credentials

2018-05-25 Thread elserj

PHOENIX-4533 Modified Query Server to use two sets of Kerberos credentials

Signed-off-by: Josh Elser 


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

Branch: refs/heads/4.x-HBase-1.1
Commit: 0132bf684966dbffd08bfcd8ede5fc4f31d08ca5
Parents: add7dd0
Author: Lev Bronshtein 
Authored: Wed Jan 31 22:37:50 2018 -0500
Committer: Josh Elser 
Committed: Fri May 25 15:16:41 2018 -0400

--
 .../org/apache/phoenix/query/QueryServices.java|  2 ++
 .../phoenix/queryserver/server/QueryServer.java| 17 ++---
 2 files changed, 16 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/0132bf68/phoenix-core/src/main/java/org/apache/phoenix/query/QueryServices.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/query/QueryServices.java 
b/phoenix-core/src/main/java/org/apache/phoenix/query/QueryServices.java
index bbd88f3..5e0a8f1 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/query/QueryServices.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/query/QueryServices.java
@@ -237,7 +237,9 @@ public interface QueryServices extends SQLCloseable {
 public static final String QUERY_SERVER_ENV_LOGGING_ATTRIB = 
"phoenix.queryserver.envvars.logging.disabled";
 public static final String QUERY_SERVER_ENV_LOGGING_SKIPWORDS_ATTRIB = 
"phoenix.queryserver.envvars.logging.skipwords";
 public static final String QUERY_SERVER_KEYTAB_FILENAME_ATTRIB = 
"phoenix.queryserver.keytab.file";
+public static final String QUERY_SERVER_HTTP_KEYTAB_FILENAME_ATTRIB = 
"phoenix.queryserver.http.keytab.file";
 public static final String QUERY_SERVER_KERBEROS_PRINCIPAL_ATTRIB = 
"phoenix.queryserver.kerberos.principal";
+public static final String QUERY_SERVER_KERBEROS_HTTP_PRINCIPAL_ATTRIB = 
"phoenix.queryserver.kerberos.http.principal";
 public static final String QUERY_SERVER_DNS_NAMESERVER_ATTRIB = 
"phoenix.queryserver.dns.nameserver";
 public static final String QUERY_SERVER_DNS_INTERFACE_ATTRIB = 
"phoenix.queryserver.dns.interface";
 public static final String QUERY_SERVER_HBASE_SECURITY_CONF_ATTRIB = 
"hbase.security.authentication";

http://git-wip-us.apache.org/repos/asf/phoenix/blob/0132bf68/phoenix-queryserver/src/main/java/org/apache/phoenix/queryserver/server/QueryServer.java
--
diff --git 
a/phoenix-queryserver/src/main/java/org/apache/phoenix/queryserver/server/QueryServer.java
 
b/phoenix-queryserver/src/main/java/org/apache/phoenix/queryserver/server/QueryServer.java
index 288e4f5..6b1fcfe 100644
--- 
a/phoenix-queryserver/src/main/java/org/apache/phoenix/queryserver/server/QueryServer.java
+++ 
b/phoenix-queryserver/src/main/java/org/apache/phoenix/queryserver/server/QueryServer.java
@@ -244,6 +244,11 @@ public final class QueryServer extends Configured 
implements Tool, Runnable {
 
 String keytabPath = 
getConf().get(QueryServices.QUERY_SERVER_KEYTAB_FILENAME_ATTRIB);
 File keytab = new File(keytabPath);
+String httpKeytabPath = 
getConf().get(QueryServices.QUERY_SERVER_HTTP_KEYTAB_FILENAME_ATTRIB, null);
+String httpPrincipal = 
getConf().get(QueryServices.QUERY_SERVER_KERBEROS_HTTP_PRINCIPAL_ATTRIB, null);
+File httpKeytab = null;
+if (null != httpKeytabPath)
+  httpKeytab = new File(httpKeytabPath);
 
 String realmsString = 
getConf().get(QueryServices.QUERY_SERVER_KERBEROS_ALLOWED_REALMS, null);
 String[] additionalAllowedRealms = null;
@@ -252,9 +257,15 @@ public final class QueryServer extends Configured 
implements Tool, Runnable {
 }
 
 // Enable SPNEGO and impersonation (through standard Hadoop 
configuration means)
-builder.withSpnego(ugi.getUserName(), additionalAllowedRealms)
-.withAutomaticLogin(keytab)
-.withImpersonation(new PhoenixDoAsCallback(ugi, getConf()));
+if ((null != httpKeytabPath) && (null != httpPrincipal))
+  builder.withSpnego(httpPrincipal, additionalAllowedRealms)
+  .withAutomaticLogin(httpKeytab)
+  .withImpersonation(new PhoenixDoAsCallback(ugi, getConf()));
+else
+  builder.withSpnego(ugi.getUserName(), additionalAllowedRealms)
+  .withAutomaticLogin(keytab)
+  .withImpersonation(new PhoenixDoAsCallback(ugi, getConf()));
+
 
   }
   setRemoteUserExtractorIfNecessary(builder, getConf());

[3/9] phoenix git commit: PHOENIX-4749 Allow impersonation when SPNEGO is disabled

2018-05-25 Thread elserj

PHOENIX-4749 Allow impersonation when SPNEGO is disabled

Client impersonation is no longer tied to SPNEGO auth.

Signed-off-by: Josh Elser 


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

Branch: refs/heads/4.x-HBase-1.1
Commit: 838914e07a53f89586d35763466332e40b6533e8
Parents: 0132bf6
Author: Alex Araujo 
Authored: Wed May 23 10:28:48 2018 -0500
Committer: Josh Elser 
Committed: Fri May 25 16:21:42 2018 -0400

--
 .../phoenix/queryserver/server/QueryServer.java | 86 +++-
 .../server/QueryServerConfigurationTest.java| 72 
 2 files changed, 121 insertions(+), 37 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/838914e0/phoenix-queryserver/src/main/java/org/apache/phoenix/queryserver/server/QueryServer.java
--
diff --git 
a/phoenix-queryserver/src/main/java/org/apache/phoenix/queryserver/server/QueryServer.java
 
b/phoenix-queryserver/src/main/java/org/apache/phoenix/queryserver/server/QueryServer.java
index 6b1fcfe..e3f0f52 100644
--- 
a/phoenix-queryserver/src/main/java/org/apache/phoenix/queryserver/server/QueryServer.java
+++ 
b/phoenix-queryserver/src/main/java/org/apache/phoenix/queryserver/server/QueryServer.java
@@ -54,6 +54,7 @@ import org.apache.phoenix.queryserver.register.Registry;
 import org.apache.phoenix.util.InstanceResolver;
 
 import java.io.File;
+import java.io.IOException;
 import java.lang.management.ManagementFactory;
 import java.lang.management.RuntimeMXBean;
 import java.net.InetAddress;
@@ -197,7 +198,7 @@ public final class QueryServer extends Configured 
implements Tool, Runnable {
   
QueryServicesOptions.DEFAULT_QUERY_SERVER_DISABLE_KERBEROS_LOGIN);
 
   // handle secure cluster credentials
-  if (isKerberos && !disableSpnego && !disableLogin) {
+  if (isKerberos && !disableLogin) {
 hostname = Strings.domainNamePointerToHostName(DNS.getDefaultHost(
 getConf().get(QueryServices.QUERY_SERVER_DNS_INTERFACE_ATTRIB, 
"default"),
 getConf().get(QueryServices.QUERY_SERVER_DNS_NAMESERVER_ATTRIB, 
"default")));
@@ -230,43 +231,9 @@ public final class QueryServer extends Configured 
implements Tool, Runnable {
   final HttpServer.Builder builder = new 
HttpServer.Builder().withPort(port)
   .withHandler(service, getSerialization(getConf()));
 
-  // Enable SPNEGO and Impersonation when using Kerberos
+  // Enable client auth when using Kerberos auth for HBase
   if (isKerberos) {
-UserGroupInformation ugi = UserGroupInformation.getCurrentUser();
-LOG.debug("Current user is " + ugi);
-if (!ugi.hasKerberosCredentials()) {
-  ugi = UserGroupInformation.getLoginUser();
-  LOG.debug("Current user does not have Kerberos credentials, using 
instead " + ugi);
-}
-
-// Make sure the proxyuser configuration is up to date
-ProxyUsers.refreshSuperUserGroupsConfiguration(getConf());
-
-String keytabPath = 
getConf().get(QueryServices.QUERY_SERVER_KEYTAB_FILENAME_ATTRIB);
-File keytab = new File(keytabPath);
-String httpKeytabPath = 
getConf().get(QueryServices.QUERY_SERVER_HTTP_KEYTAB_FILENAME_ATTRIB, null);
-String httpPrincipal = 
getConf().get(QueryServices.QUERY_SERVER_KERBEROS_HTTP_PRINCIPAL_ATTRIB, null);
-File httpKeytab = null;
-if (null != httpKeytabPath)
-  httpKeytab = new File(httpKeytabPath);
-
-String realmsString = 
getConf().get(QueryServices.QUERY_SERVER_KERBEROS_ALLOWED_REALMS, null);
-String[] additionalAllowedRealms = null;
-if (null != realmsString) {
-additionalAllowedRealms = StringUtils.split(realmsString, ',');
-}
-
-// Enable SPNEGO and impersonation (through standard Hadoop 
configuration means)
-if ((null != httpKeytabPath) && (null != httpPrincipal))
-  builder.withSpnego(httpPrincipal, additionalAllowedRealms)
-  .withAutomaticLogin(httpKeytab)
-  .withImpersonation(new PhoenixDoAsCallback(ugi, getConf()));
-else
-  builder.withSpnego(ugi.getUserName(), additionalAllowedRealms)
-  .withAutomaticLogin(keytab)
-  .withImpersonation(new PhoenixDoAsCallback(ugi, getConf()));
-
-
+configureClientAuthentication(builder, disableSpnego);
   }
   setRemoteUserExtractorIfNecessary(builder, getConf());
 
@@ -290,6 +257,51 @@ public final class QueryServer extends Configured 
implements Tool, Runnable {

[5/9] phoenix git commit: PHOENIX-4749 Allow impersonation when SPNEGO is disabled

2018-05-25 Thread elserj

PHOENIX-4749 Allow impersonation when SPNEGO is disabled

Client impersonation is no longer tied to SPNEGO auth.

Signed-off-by: Josh Elser 


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

Branch: refs/heads/4.x-HBase-0.98
Commit: 9a7bf33a9a0dd4e1c63a23e11e99079d1aed6ee9
Parents: 137ed5e
Author: Alex Araujo 
Authored: Wed May 23 10:28:48 2018 -0500
Committer: Josh Elser 
Committed: Fri May 25 17:01:27 2018 -0400

--
 .../phoenix/queryserver/server/QueryServer.java | 86 +++-
 .../server/QueryServerConfigurationTest.java| 72 
 2 files changed, 121 insertions(+), 37 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/9a7bf33a/phoenix-queryserver/src/main/java/org/apache/phoenix/queryserver/server/QueryServer.java
--
diff --git 
a/phoenix-queryserver/src/main/java/org/apache/phoenix/queryserver/server/QueryServer.java
 
b/phoenix-queryserver/src/main/java/org/apache/phoenix/queryserver/server/QueryServer.java
index 6b1fcfe..e3f0f52 100644
--- 
a/phoenix-queryserver/src/main/java/org/apache/phoenix/queryserver/server/QueryServer.java
+++ 
b/phoenix-queryserver/src/main/java/org/apache/phoenix/queryserver/server/QueryServer.java
@@ -54,6 +54,7 @@ import org.apache.phoenix.queryserver.register.Registry;
 import org.apache.phoenix.util.InstanceResolver;
 
 import java.io.File;
+import java.io.IOException;
 import java.lang.management.ManagementFactory;
 import java.lang.management.RuntimeMXBean;
 import java.net.InetAddress;
@@ -197,7 +198,7 @@ public final class QueryServer extends Configured 
implements Tool, Runnable {
   
QueryServicesOptions.DEFAULT_QUERY_SERVER_DISABLE_KERBEROS_LOGIN);
 
   // handle secure cluster credentials
-  if (isKerberos && !disableSpnego && !disableLogin) {
+  if (isKerberos && !disableLogin) {
 hostname = Strings.domainNamePointerToHostName(DNS.getDefaultHost(
 getConf().get(QueryServices.QUERY_SERVER_DNS_INTERFACE_ATTRIB, 
"default"),
 getConf().get(QueryServices.QUERY_SERVER_DNS_NAMESERVER_ATTRIB, 
"default")));
@@ -230,43 +231,9 @@ public final class QueryServer extends Configured 
implements Tool, Runnable {
   final HttpServer.Builder builder = new 
HttpServer.Builder().withPort(port)
   .withHandler(service, getSerialization(getConf()));
 
-  // Enable SPNEGO and Impersonation when using Kerberos
+  // Enable client auth when using Kerberos auth for HBase
   if (isKerberos) {
-UserGroupInformation ugi = UserGroupInformation.getCurrentUser();
-LOG.debug("Current user is " + ugi);
-if (!ugi.hasKerberosCredentials()) {
-  ugi = UserGroupInformation.getLoginUser();
-  LOG.debug("Current user does not have Kerberos credentials, using 
instead " + ugi);
-}
-
-// Make sure the proxyuser configuration is up to date
-ProxyUsers.refreshSuperUserGroupsConfiguration(getConf());
-
-String keytabPath = 
getConf().get(QueryServices.QUERY_SERVER_KEYTAB_FILENAME_ATTRIB);
-File keytab = new File(keytabPath);
-String httpKeytabPath = 
getConf().get(QueryServices.QUERY_SERVER_HTTP_KEYTAB_FILENAME_ATTRIB, null);
-String httpPrincipal = 
getConf().get(QueryServices.QUERY_SERVER_KERBEROS_HTTP_PRINCIPAL_ATTRIB, null);
-File httpKeytab = null;
-if (null != httpKeytabPath)
-  httpKeytab = new File(httpKeytabPath);
-
-String realmsString = 
getConf().get(QueryServices.QUERY_SERVER_KERBEROS_ALLOWED_REALMS, null);
-String[] additionalAllowedRealms = null;
-if (null != realmsString) {
-additionalAllowedRealms = StringUtils.split(realmsString, ',');
-}
-
-// Enable SPNEGO and impersonation (through standard Hadoop 
configuration means)
-if ((null != httpKeytabPath) && (null != httpPrincipal))
-  builder.withSpnego(httpPrincipal, additionalAllowedRealms)
-  .withAutomaticLogin(httpKeytab)
-  .withImpersonation(new PhoenixDoAsCallback(ugi, getConf()));
-else
-  builder.withSpnego(ugi.getUserName(), additionalAllowedRealms)
-  .withAutomaticLogin(keytab)
-  .withImpersonation(new PhoenixDoAsCallback(ugi, getConf()));
-
-
+configureClientAuthentication(builder, disableSpnego);
   }
   setRemoteUserExtractorIfNecessary(builder, getConf());
 
@@ -290,6 +257,51 @@ public final class QueryServer extends Configured 
implements Tool, Runnable {

[7/9] phoenix git commit: PHOENIX-4749 Allow impersonation when SPNEGO is disabled

2018-05-25 Thread elserj

PHOENIX-4749 Allow impersonation when SPNEGO is disabled

Client impersonation is no longer tied to SPNEGO auth.

Signed-off-by: Josh Elser 


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

Branch: refs/heads/5.x-HBase-2.0
Commit: 8a955d47dd15e52fa423cff1df09499818307b01
Parents: c8db63a
Author: Alex Araujo 
Authored: Wed May 23 10:28:48 2018 -0500
Committer: Josh Elser 
Committed: Fri May 25 17:24:07 2018 -0400

--
 .../phoenix/queryserver/server/QueryServer.java | 90 +++-
 .../server/QueryServerConfigurationTest.java| 72 
 2 files changed, 121 insertions(+), 41 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/8a955d47/phoenix-queryserver/src/main/java/org/apache/phoenix/queryserver/server/QueryServer.java
--
diff --git 
a/phoenix-queryserver/src/main/java/org/apache/phoenix/queryserver/server/QueryServer.java
 
b/phoenix-queryserver/src/main/java/org/apache/phoenix/queryserver/server/QueryServer.java
index 8436086..e3f0f52 100644
--- 
a/phoenix-queryserver/src/main/java/org/apache/phoenix/queryserver/server/QueryServer.java
+++ 
b/phoenix-queryserver/src/main/java/org/apache/phoenix/queryserver/server/QueryServer.java
@@ -54,6 +54,7 @@ import org.apache.phoenix.queryserver.register.Registry;
 import org.apache.phoenix.util.InstanceResolver;
 
 import java.io.File;
+import java.io.IOException;
 import java.lang.management.ManagementFactory;
 import java.lang.management.RuntimeMXBean;
 import java.net.InetAddress;
@@ -197,7 +198,7 @@ public final class QueryServer extends Configured 
implements Tool, Runnable {
   
QueryServicesOptions.DEFAULT_QUERY_SERVER_DISABLE_KERBEROS_LOGIN);
 
   // handle secure cluster credentials
-  if (isKerberos && !disableSpnego && !disableLogin) {
+  if (isKerberos && !disableLogin) {
 hostname = Strings.domainNamePointerToHostName(DNS.getDefaultHost(
 getConf().get(QueryServices.QUERY_SERVER_DNS_INTERFACE_ATTRIB, 
"default"),
 getConf().get(QueryServices.QUERY_SERVER_DNS_NAMESERVER_ATTRIB, 
"default")));
@@ -230,47 +231,9 @@ public final class QueryServer extends Configured 
implements Tool, Runnable {
   final HttpServer.Builder builder = new 
HttpServer.Builder().withPort(port)
   .withHandler(service, getSerialization(getConf()));
 
-  // Enable SPNEGO and Impersonation when using Kerberos
+  // Enable client auth when using Kerberos auth for HBase
   if (isKerberos) {
-UserGroupInformation ugi = UserGroupInformation.getCurrentUser();
-LOG.debug("Current user is " + ugi);
-if (!ugi.hasKerberosCredentials()) {
-  ugi = UserGroupInformation.getLoginUser();
-  LOG.debug("Current user does not have Kerberos credentials, using 
instead " + ugi);
-}
-
-// Make sure the proxyuser configuration is up to date
-ProxyUsers.refreshSuperUserGroupsConfiguration(getConf());
-
-String keytabPath = 
getConf().get(QueryServices.QUERY_SERVER_KEYTAB_FILENAME_ATTRIB);
-File keytab = new File(keytabPath);
-String httpKeytabPath = 
getConf().get(QueryServices.QUERY_SERVER_HTTP_KEYTAB_FILENAME_ATTRIB, null);
-String httpPrincipal = 
getConf().get(QueryServices.QUERY_SERVER_KERBEROS_HTTP_PRINCIPAL_ATTRIB, null);
-// Backwards compat for a configuration key change
-if (httpPrincipal == null) {
-  httpPrincipal = 
getConf().get(QueryServices.QUERY_SERVER_KERBEROS_HTTP_PRINCIPAL_ATTRIB_LEGACY, 
null);
-}
-File httpKeytab = null;
-if (null != httpKeytabPath)
-  httpKeytab = new File(httpKeytabPath);
-
-String realmsString = 
getConf().get(QueryServices.QUERY_SERVER_KERBEROS_ALLOWED_REALMS, null);
-String[] additionalAllowedRealms = null;
-if (null != realmsString) {
-additionalAllowedRealms = StringUtils.split(realmsString, ',');
-}
-
-// Enable SPNEGO and impersonation (through standard Hadoop 
configuration means)
-if ((null != httpKeytabPath) && (null != httpPrincipal))
-  builder.withSpnego(httpPrincipal, additionalAllowedRealms)
-  .withAutomaticLogin(httpKeytab)
-  .withImpersonation(new PhoenixDoAsCallback(ugi, getConf()));
-else
-  builder.withSpnego(ugi.getUserName(), additionalAllowedRealms)
-  .withAutomaticLogin(keytab)
-  .withImpersonation(new PhoenixDoAsCallback(ugi, getConf()));
-
-
+

[4/4] phoenix git commit: Changes for CDH 5.13.x

2018-05-25 Thread pboado

Changes for CDH 5.13.x


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

Branch: refs/heads/4.x-cdh5.13
Commit: 522256646dde19ebad112dea8a8d9ded9c5d0e26
Parents: 58082f8
Author: Pedro Boado 
Authored: Sat Mar 10 17:54:04 2018 +
Committer: Pedro Boado 
Committed: Fri May 25 23:11:18 2018 +0100

--
 phoenix-assembly/pom.xml|  2 +-
 phoenix-client/pom.xml  |  2 +-
 phoenix-core/pom.xml|  2 +-
 .../hadoop/hbase/ipc/PhoenixRpcScheduler.java   | 34 ++--
 phoenix-flume/pom.xml   |  2 +-
 phoenix-hive/pom.xml|  2 +-
 phoenix-kafka/pom.xml   |  2 +-
 phoenix-load-balancer/pom.xml   |  2 +-
 phoenix-parcel/pom.xml  |  2 +-
 phoenix-pherf/pom.xml   |  2 +-
 phoenix-pig/pom.xml |  2 +-
 phoenix-queryserver-client/pom.xml  |  2 +-
 phoenix-queryserver/pom.xml |  2 +-
 phoenix-server/pom.xml  |  2 +-
 phoenix-spark/pom.xml   |  2 +-
 phoenix-tracing-webapp/pom.xml  |  2 +-
 pom.xml |  4 +--
 17 files changed, 49 insertions(+), 19 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/52225664/phoenix-assembly/pom.xml
--
diff --git a/phoenix-assembly/pom.xml b/phoenix-assembly/pom.xml
index 7d98c25..f0cd238 100644
--- a/phoenix-assembly/pom.xml
+++ b/phoenix-assembly/pom.xml
@@ -27,7 +27,7 @@
   
 org.apache.phoenix
 phoenix
-4.14.0-cdh5.11.2
+4.14.0-cdh5.13.2-SNAPSHOT
   
   phoenix-assembly
   Phoenix Assembly

http://git-wip-us.apache.org/repos/asf/phoenix/blob/52225664/phoenix-client/pom.xml
--
diff --git a/phoenix-client/pom.xml b/phoenix-client/pom.xml
index fe5836b..25593c5 100644
--- a/phoenix-client/pom.xml
+++ b/phoenix-client/pom.xml
@@ -27,7 +27,7 @@
   
 org.apache.phoenix
 phoenix
-4.14.0-cdh5.11.2
+4.14.0-cdh5.13.2-SNAPSHOT
   
   phoenix-client
   Phoenix Client

http://git-wip-us.apache.org/repos/asf/phoenix/blob/52225664/phoenix-core/pom.xml
--
diff --git a/phoenix-core/pom.xml b/phoenix-core/pom.xml
index 8b09c67..0e33bf5 100644
--- a/phoenix-core/pom.xml
+++ b/phoenix-core/pom.xml
@@ -4,7 +4,7 @@
   
 org.apache.phoenix
 phoenix
-4.14.0-cdh5.11.2
+4.14.0-cdh5.13.2-SNAPSHOT
   
   phoenix-core
   Phoenix Core

http://git-wip-us.apache.org/repos/asf/phoenix/blob/52225664/phoenix-core/src/main/java/org/apache/hadoop/hbase/ipc/PhoenixRpcScheduler.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/hadoop/hbase/ipc/PhoenixRpcScheduler.java
 
b/phoenix-core/src/main/java/org/apache/hadoop/hbase/ipc/PhoenixRpcScheduler.java
index 4fdddf5..d1f05f8 100644
--- 
a/phoenix-core/src/main/java/org/apache/hadoop/hbase/ipc/PhoenixRpcScheduler.java
+++ 
b/phoenix-core/src/main/java/org/apache/hadoop/hbase/ipc/PhoenixRpcScheduler.java
@@ -124,6 +124,36 @@ public class PhoenixRpcScheduler extends RpcScheduler {
 public void setMetadataExecutorForTesting(RpcExecutor executor) {
 this.metadataCallExecutor = executor;
 }
-
-
+
+@Override
+public int getReadQueueLength() {
+return delegate.getReadQueueLength();
+}
+
+@Override
+public int getWriteQueueLength() {
+return delegate.getWriteQueueLength();
+}
+
+@Override
+public int getScanQueueLength() {
+return delegate.getScanQueueLength();
+}
+
+@Override
+public int getActiveReadRpcHandlerCount() {
+return delegate.getActiveReadRpcHandlerCount();
+}
+
+@Override
+public int getActiveWriteRpcHandlerCount() {
+return delegate.getActiveWriteRpcHandlerCount();
+}
+
+@Override
+public int getActiveScanRpcHandlerCount() {
+return delegate.getActiveScanRpcHandlerCount();
+}
+
+
 }

http://git-wip-us.apache.org/repos/asf/phoenix/blob/52225664/phoenix-flume/pom.xml
--
diff --git a/phoenix-flume/pom.xml b/phoenix-flume/pom.xml
index e400589..bcc037c 100644
--- a/phoenix-flume/pom.xml
+++ b/phoenix-flume/pom.xml
@@ -26,7 +26,7 @@
   
 org.apache.phoenix

[1/4] phoenix git commit: PHOENIX-4728 ARRAY_APPEND and ARRAY_REMOVE should work with null column value (Xavier Jodoin) [Forced Update!]

2018-05-25 Thread pboado

Repository: phoenix
Updated Branches:
  refs/heads/4.x-cdh5.12 4e3295017 -> 2bb92cca8 (forced update)


PHOENIX-4728 ARRAY_APPEND and ARRAY_REMOVE should work with null column value 
(Xavier Jodoin)


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

Branch: refs/heads/4.x-cdh5.12
Commit: 53f37ef05ea9af232bf34ba80f03b44da18156ac
Parents: cbca731
Author: James Taylor 
Authored: Fri May 25 09:36:41 2018 -0700
Committer: James Taylor 
Committed: Fri May 25 09:42:04 2018 -0700

--
 .../phoenix/end2end/ArrayAppendFunctionIT.java  | 38 
 .../apache/phoenix/compile/UpsertCompiler.java  |  2 +-
 2 files changed, 39 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/53f37ef0/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArrayAppendFunctionIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArrayAppendFunctionIT.java
 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArrayAppendFunctionIT.java
index caa17fe..7962a7a 100644
--- 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArrayAppendFunctionIT.java
+++ 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArrayAppendFunctionIT.java
@@ -132,6 +132,24 @@ public class ArrayAppendFunctionIT extends 
ParallelStatsDisabledIT {
 }
 
 @Test
+public void testUpsertEmptyArrayModification() throws Exception {
+Connection conn = DriverManager.getConnection(getUrl());
+String tableName = initTables(conn);
+
+ResultSet rs;
+String[] strings = new String[]{"34567"};
+Array array = conn.createArrayOf("VARCHAR", strings);
+
+conn.createStatement().execute("UPSERT INTO " + tableName + " 
(region_name,nullVarChar) SELECT region_name,ARRAY_APPEND(nullVarChar,'34567') 
FROM " + tableName);
+conn.commit();
+
+rs = conn.createStatement().executeQuery("SELECT nullVarChar FROM " + 
tableName + " LIMIT 1");
+assertTrue(rs.next());
+assertEquals(array, rs.getArray(1));
+assertFalse(rs.next());
+}
+
+@Test
 public void testArrayAppendFunctionVarchar() throws Exception {
 Connection conn = DriverManager.getConnection(getUrl());
 String tableName = initTables(conn);
@@ -147,6 +165,26 @@ public class ArrayAppendFunctionIT extends 
ParallelStatsDisabledIT {
 assertEquals(array, rs.getArray(1));
 assertFalse(rs.next());
 }
+
+@Test
+public void testUpsertArrayAppendFunctionVarchar() throws Exception {
+Connection conn = DriverManager.getConnection(getUrl());
+String tableName = initTables(conn);
+
+conn.createStatement().execute("UPSERT INTO " + tableName + " 
(region_name,varchars) SELECT region_name,ARRAY_APPEND(varchars,'34567') as 
varchars FROM " + tableName+ " WHERE region_name = 'SF Bay Area'");
+conn.commit();
+
+ResultSet rs;
+rs = conn.createStatement().executeQuery("SELECT varchars FROM " + 
tableName + " WHERE region_name = 'SF Bay Area'");
+assertTrue(rs.next());
+
+String[] strings = new String[]{"2345", "46345", "23234", "34567"};
+
+Array array = conn.createArrayOf("VARCHAR", strings);
+
+assertEquals(array, rs.getArray(1));
+assertFalse(rs.next());
+}
 
 @Test
 public void testArrayAppendFunctionInteger() throws Exception {

http://git-wip-us.apache.org/repos/asf/phoenix/blob/53f37ef0/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 30f0c18..c3cfa10 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
@@ -549,7 +549,7 @@ public class UpsertCompiler {
 select = SelectStatement.create(select, hint);
 // Pass scan through if same table in upsert and select so that 
projection is computed correctly
 // Use optimizer to choose the best plan
-QueryCompiler compiler = new QueryCompiler(statement, select, 
selectResolver, targetColumns, parallelIteratorFactoryToBe, new 
SequenceManager(statement), false, false, null);
+QueryCompiler compiler = new QueryCompiler(statement, select, 
selectResolver, targetColumns,

[2/4] phoenix git commit: PHOENIX-1567 Publish Phoenix-Client & Phoenix-Server jars into Maven Repo

2018-05-25 Thread pboado

PHOENIX-1567 Publish Phoenix-Client & Phoenix-Server jars into Maven Repo


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

Branch: refs/heads/4.x-cdh5.12
Commit: f7a27e26d8c49a6737cdd56afce142b7b29b6f6c
Parents: 53f37ef
Author: Ankit Singhal 
Authored: Fri May 25 19:32:27 2018 +0100
Committer: Pedro Boado 
Committed: Fri May 25 22:58:10 2018 +0100

--
 phoenix-client/pom.xml | 1 +
 phoenix-server/pom.xml | 1 +
 2 files changed, 2 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/f7a27e26/phoenix-client/pom.xml
--
diff --git a/phoenix-client/pom.xml b/phoenix-client/pom.xml
index fef18c2..fe5836b 100644
--- a/phoenix-client/pom.xml
+++ b/phoenix-client/pom.xml
@@ -81,6 +81,7 @@
 
 
   ${basedir}/target/phoenix-${project.version}-client.jar
+ ${basedir}/pom.xml
 
   
   

http://git-wip-us.apache.org/repos/asf/phoenix/blob/f7a27e26/phoenix-server/pom.xml
--
diff --git a/phoenix-server/pom.xml b/phoenix-server/pom.xml
index 982270e..98719fb 100644
--- a/phoenix-server/pom.xml
+++ b/phoenix-server/pom.xml
@@ -85,6 +85,7 @@
 
 
   ${basedir}/target/phoenix-${project.version}-server.jar
+ ${basedir}/pom.xml

[4/4] phoenix git commit: Changes for CDH 5.12.x

2018-05-25 Thread pboado

Changes for CDH 5.12.x


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

Branch: refs/heads/4.x-cdh5.12
Commit: 2bb92cca83e59a4effc4e32740de4e1527316c08
Parents: 58082f8
Author: Pedro Boado 
Authored: Sat Mar 10 17:54:04 2018 +
Committer: Pedro Boado 
Committed: Fri May 25 23:10:20 2018 +0100

--
 phoenix-assembly/pom.xml|  2 +-
 phoenix-client/pom.xml  |  2 +-
 phoenix-core/pom.xml|  2 +-
 .../hadoop/hbase/ipc/PhoenixRpcScheduler.java   | 34 ++--
 phoenix-flume/pom.xml   |  2 +-
 phoenix-hive/pom.xml|  2 +-
 phoenix-kafka/pom.xml   |  2 +-
 phoenix-load-balancer/pom.xml   |  2 +-
 phoenix-parcel/pom.xml  |  2 +-
 phoenix-pherf/pom.xml   |  2 +-
 phoenix-pig/pom.xml |  2 +-
 phoenix-queryserver-client/pom.xml  |  2 +-
 phoenix-queryserver/pom.xml |  2 +-
 phoenix-server/pom.xml  |  2 +-
 phoenix-spark/pom.xml   |  2 +-
 phoenix-tracing-webapp/pom.xml  |  2 +-
 pom.xml |  4 +--
 17 files changed, 49 insertions(+), 19 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/2bb92cca/phoenix-assembly/pom.xml
--
diff --git a/phoenix-assembly/pom.xml b/phoenix-assembly/pom.xml
index 7d98c25..14225ee 100644
--- a/phoenix-assembly/pom.xml
+++ b/phoenix-assembly/pom.xml
@@ -27,7 +27,7 @@
   
 org.apache.phoenix
 phoenix
-4.14.0-cdh5.11.2
+4.14.0-cdh5.12.2-SNAPSHOT
   
   phoenix-assembly
   Phoenix Assembly

http://git-wip-us.apache.org/repos/asf/phoenix/blob/2bb92cca/phoenix-client/pom.xml
--
diff --git a/phoenix-client/pom.xml b/phoenix-client/pom.xml
index fe5836b..ffad100 100644
--- a/phoenix-client/pom.xml
+++ b/phoenix-client/pom.xml
@@ -27,7 +27,7 @@
   
 org.apache.phoenix
 phoenix
-4.14.0-cdh5.11.2
+4.14.0-cdh5.12.2-SNAPSHOT
   
   phoenix-client
   Phoenix Client

http://git-wip-us.apache.org/repos/asf/phoenix/blob/2bb92cca/phoenix-core/pom.xml
--
diff --git a/phoenix-core/pom.xml b/phoenix-core/pom.xml
index 8b09c67..7d5b784 100644
--- a/phoenix-core/pom.xml
+++ b/phoenix-core/pom.xml
@@ -4,7 +4,7 @@
   
 org.apache.phoenix
 phoenix
-4.14.0-cdh5.11.2
+4.14.0-cdh5.12.2-SNAPSHOT
   
   phoenix-core
   Phoenix Core

http://git-wip-us.apache.org/repos/asf/phoenix/blob/2bb92cca/phoenix-core/src/main/java/org/apache/hadoop/hbase/ipc/PhoenixRpcScheduler.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/hadoop/hbase/ipc/PhoenixRpcScheduler.java
 
b/phoenix-core/src/main/java/org/apache/hadoop/hbase/ipc/PhoenixRpcScheduler.java
index 4fdddf5..d1f05f8 100644
--- 
a/phoenix-core/src/main/java/org/apache/hadoop/hbase/ipc/PhoenixRpcScheduler.java
+++ 
b/phoenix-core/src/main/java/org/apache/hadoop/hbase/ipc/PhoenixRpcScheduler.java
@@ -124,6 +124,36 @@ public class PhoenixRpcScheduler extends RpcScheduler {
 public void setMetadataExecutorForTesting(RpcExecutor executor) {
 this.metadataCallExecutor = executor;
 }
-
-
+
+@Override
+public int getReadQueueLength() {
+return delegate.getReadQueueLength();
+}
+
+@Override
+public int getWriteQueueLength() {
+return delegate.getWriteQueueLength();
+}
+
+@Override
+public int getScanQueueLength() {
+return delegate.getScanQueueLength();
+}
+
+@Override
+public int getActiveReadRpcHandlerCount() {
+return delegate.getActiveReadRpcHandlerCount();
+}
+
+@Override
+public int getActiveWriteRpcHandlerCount() {
+return delegate.getActiveWriteRpcHandlerCount();
+}
+
+@Override
+public int getActiveScanRpcHandlerCount() {
+return delegate.getActiveScanRpcHandlerCount();
+}
+
+
 }

http://git-wip-us.apache.org/repos/asf/phoenix/blob/2bb92cca/phoenix-flume/pom.xml
--
diff --git a/phoenix-flume/pom.xml b/phoenix-flume/pom.xml
index e400589..8a78010 100644
--- a/phoenix-flume/pom.xml
+++ b/phoenix-flume/pom.xml
@@ -26,7 +26,7 @@
   
 org.apache.phoenix

[1/4] phoenix git commit: PHOENIX-4728 ARRAY_APPEND and ARRAY_REMOVE should work with null column value (Xavier Jodoin) [Forced Update!]

2018-05-25 Thread pboado

Repository: phoenix
Updated Branches:
  refs/heads/4.x-cdh5.13 79c8a6637 -> 522256646 (forced update)


PHOENIX-4728 ARRAY_APPEND and ARRAY_REMOVE should work with null column value 
(Xavier Jodoin)


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

Branch: refs/heads/4.x-cdh5.13
Commit: 53f37ef05ea9af232bf34ba80f03b44da18156ac
Parents: cbca731
Author: James Taylor 
Authored: Fri May 25 09:36:41 2018 -0700
Committer: James Taylor 
Committed: Fri May 25 09:42:04 2018 -0700

--
 .../phoenix/end2end/ArrayAppendFunctionIT.java  | 38 
 .../apache/phoenix/compile/UpsertCompiler.java  |  2 +-
 2 files changed, 39 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/53f37ef0/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArrayAppendFunctionIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArrayAppendFunctionIT.java
 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArrayAppendFunctionIT.java
index caa17fe..7962a7a 100644
--- 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArrayAppendFunctionIT.java
+++ 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArrayAppendFunctionIT.java
@@ -132,6 +132,24 @@ public class ArrayAppendFunctionIT extends 
ParallelStatsDisabledIT {
 }
 
 @Test
+public void testUpsertEmptyArrayModification() throws Exception {
+Connection conn = DriverManager.getConnection(getUrl());
+String tableName = initTables(conn);
+
+ResultSet rs;
+String[] strings = new String[]{"34567"};
+Array array = conn.createArrayOf("VARCHAR", strings);
+
+conn.createStatement().execute("UPSERT INTO " + tableName + " 
(region_name,nullVarChar) SELECT region_name,ARRAY_APPEND(nullVarChar,'34567') 
FROM " + tableName);
+conn.commit();
+
+rs = conn.createStatement().executeQuery("SELECT nullVarChar FROM " + 
tableName + " LIMIT 1");
+assertTrue(rs.next());
+assertEquals(array, rs.getArray(1));
+assertFalse(rs.next());
+}
+
+@Test
 public void testArrayAppendFunctionVarchar() throws Exception {
 Connection conn = DriverManager.getConnection(getUrl());
 String tableName = initTables(conn);
@@ -147,6 +165,26 @@ public class ArrayAppendFunctionIT extends 
ParallelStatsDisabledIT {
 assertEquals(array, rs.getArray(1));
 assertFalse(rs.next());
 }
+
+@Test
+public void testUpsertArrayAppendFunctionVarchar() throws Exception {
+Connection conn = DriverManager.getConnection(getUrl());
+String tableName = initTables(conn);
+
+conn.createStatement().execute("UPSERT INTO " + tableName + " 
(region_name,varchars) SELECT region_name,ARRAY_APPEND(varchars,'34567') as 
varchars FROM " + tableName+ " WHERE region_name = 'SF Bay Area'");
+conn.commit();
+
+ResultSet rs;
+rs = conn.createStatement().executeQuery("SELECT varchars FROM " + 
tableName + " WHERE region_name = 'SF Bay Area'");
+assertTrue(rs.next());
+
+String[] strings = new String[]{"2345", "46345", "23234", "34567"};
+
+Array array = conn.createArrayOf("VARCHAR", strings);
+
+assertEquals(array, rs.getArray(1));
+assertFalse(rs.next());
+}
 
 @Test
 public void testArrayAppendFunctionInteger() throws Exception {

http://git-wip-us.apache.org/repos/asf/phoenix/blob/53f37ef0/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 30f0c18..c3cfa10 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
@@ -549,7 +549,7 @@ public class UpsertCompiler {
 select = SelectStatement.create(select, hint);
 // Pass scan through if same table in upsert and select so that 
projection is computed correctly
 // Use optimizer to choose the best plan
-QueryCompiler compiler = new QueryCompiler(statement, select, 
selectResolver, targetColumns, parallelIteratorFactoryToBe, new 
SequenceManager(statement), false, false, null);
+QueryCompiler compiler = new QueryCompiler(statement, select, 
selectResolver, targetColumns,

[3/4] phoenix git commit: PHOENIX-4749 Allow impersonation when SPNEGO is disabled

2018-05-25 Thread pboado

PHOENIX-4749 Allow impersonation when SPNEGO is disabled

Client impersonation is no longer tied to SPNEGO auth.

Signed-off-by: Josh Elser 


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

Branch: refs/heads/4.x-cdh5.12
Commit: 58082f8100a82d637c8f5102e16204e51b7cf86d
Parents: f7a27e2
Author: Alex Araujo 
Authored: Wed May 23 16:28:48 2018 +0100
Committer: Pedro Boado 
Committed: Fri May 25 22:58:29 2018 +0100

--
 .../phoenix/queryserver/server/QueryServer.java | 90 +++-
 .../server/QueryServerConfigurationTest.java| 72 
 2 files changed, 121 insertions(+), 41 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/58082f81/phoenix-queryserver/src/main/java/org/apache/phoenix/queryserver/server/QueryServer.java
--
diff --git 
a/phoenix-queryserver/src/main/java/org/apache/phoenix/queryserver/server/QueryServer.java
 
b/phoenix-queryserver/src/main/java/org/apache/phoenix/queryserver/server/QueryServer.java
index 8436086..e3f0f52 100644
--- 
a/phoenix-queryserver/src/main/java/org/apache/phoenix/queryserver/server/QueryServer.java
+++ 
b/phoenix-queryserver/src/main/java/org/apache/phoenix/queryserver/server/QueryServer.java
@@ -54,6 +54,7 @@ import org.apache.phoenix.queryserver.register.Registry;
 import org.apache.phoenix.util.InstanceResolver;
 
 import java.io.File;
+import java.io.IOException;
 import java.lang.management.ManagementFactory;
 import java.lang.management.RuntimeMXBean;
 import java.net.InetAddress;
@@ -197,7 +198,7 @@ public final class QueryServer extends Configured 
implements Tool, Runnable {
   
QueryServicesOptions.DEFAULT_QUERY_SERVER_DISABLE_KERBEROS_LOGIN);
 
   // handle secure cluster credentials
-  if (isKerberos && !disableSpnego && !disableLogin) {
+  if (isKerberos && !disableLogin) {
 hostname = Strings.domainNamePointerToHostName(DNS.getDefaultHost(
 getConf().get(QueryServices.QUERY_SERVER_DNS_INTERFACE_ATTRIB, 
"default"),
 getConf().get(QueryServices.QUERY_SERVER_DNS_NAMESERVER_ATTRIB, 
"default")));
@@ -230,47 +231,9 @@ public final class QueryServer extends Configured 
implements Tool, Runnable {
   final HttpServer.Builder builder = new 
HttpServer.Builder().withPort(port)
   .withHandler(service, getSerialization(getConf()));
 
-  // Enable SPNEGO and Impersonation when using Kerberos
+  // Enable client auth when using Kerberos auth for HBase
   if (isKerberos) {
-UserGroupInformation ugi = UserGroupInformation.getCurrentUser();
-LOG.debug("Current user is " + ugi);
-if (!ugi.hasKerberosCredentials()) {
-  ugi = UserGroupInformation.getLoginUser();
-  LOG.debug("Current user does not have Kerberos credentials, using 
instead " + ugi);
-}
-
-// Make sure the proxyuser configuration is up to date
-ProxyUsers.refreshSuperUserGroupsConfiguration(getConf());
-
-String keytabPath = 
getConf().get(QueryServices.QUERY_SERVER_KEYTAB_FILENAME_ATTRIB);
-File keytab = new File(keytabPath);
-String httpKeytabPath = 
getConf().get(QueryServices.QUERY_SERVER_HTTP_KEYTAB_FILENAME_ATTRIB, null);
-String httpPrincipal = 
getConf().get(QueryServices.QUERY_SERVER_KERBEROS_HTTP_PRINCIPAL_ATTRIB, null);
-// Backwards compat for a configuration key change
-if (httpPrincipal == null) {
-  httpPrincipal = 
getConf().get(QueryServices.QUERY_SERVER_KERBEROS_HTTP_PRINCIPAL_ATTRIB_LEGACY, 
null);
-}
-File httpKeytab = null;
-if (null != httpKeytabPath)
-  httpKeytab = new File(httpKeytabPath);
-
-String realmsString = 
getConf().get(QueryServices.QUERY_SERVER_KERBEROS_ALLOWED_REALMS, null);
-String[] additionalAllowedRealms = null;
-if (null != realmsString) {
-additionalAllowedRealms = StringUtils.split(realmsString, ',');
-}
-
-// Enable SPNEGO and impersonation (through standard Hadoop 
configuration means)
-if ((null != httpKeytabPath) && (null != httpPrincipal))
-  builder.withSpnego(httpPrincipal, additionalAllowedRealms)
-  .withAutomaticLogin(httpKeytab)
-  .withImpersonation(new PhoenixDoAsCallback(ugi, getConf()));
-else
-  builder.withSpnego(ugi.getUserName(), additionalAllowedRealms)
-  .withAutomaticLogin(keytab)
-  .withImpersonation(new PhoenixDoAsCallback(ugi, getConf()));
-
-
+

[2/2] phoenix git commit: PHOENIX-4749 Allow impersonation when SPNEGO is disabled

2018-05-25 Thread pboado

PHOENIX-4749 Allow impersonation when SPNEGO is disabled

Client impersonation is no longer tied to SPNEGO auth.

Signed-off-by: Josh Elser 


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

Branch: refs/heads/4.x-cdh5.11
Commit: 58082f8100a82d637c8f5102e16204e51b7cf86d
Parents: f7a27e2
Author: Alex Araujo 
Authored: Wed May 23 16:28:48 2018 +0100
Committer: Pedro Boado 
Committed: Fri May 25 22:58:29 2018 +0100

--
 .../phoenix/queryserver/server/QueryServer.java | 90 +++-
 .../server/QueryServerConfigurationTest.java| 72 
 2 files changed, 121 insertions(+), 41 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/58082f81/phoenix-queryserver/src/main/java/org/apache/phoenix/queryserver/server/QueryServer.java
--
diff --git 
a/phoenix-queryserver/src/main/java/org/apache/phoenix/queryserver/server/QueryServer.java
 
b/phoenix-queryserver/src/main/java/org/apache/phoenix/queryserver/server/QueryServer.java
index 8436086..e3f0f52 100644
--- 
a/phoenix-queryserver/src/main/java/org/apache/phoenix/queryserver/server/QueryServer.java
+++ 
b/phoenix-queryserver/src/main/java/org/apache/phoenix/queryserver/server/QueryServer.java
@@ -54,6 +54,7 @@ import org.apache.phoenix.queryserver.register.Registry;
 import org.apache.phoenix.util.InstanceResolver;
 
 import java.io.File;
+import java.io.IOException;
 import java.lang.management.ManagementFactory;
 import java.lang.management.RuntimeMXBean;
 import java.net.InetAddress;
@@ -197,7 +198,7 @@ public final class QueryServer extends Configured 
implements Tool, Runnable {
   
QueryServicesOptions.DEFAULT_QUERY_SERVER_DISABLE_KERBEROS_LOGIN);
 
   // handle secure cluster credentials
-  if (isKerberos && !disableSpnego && !disableLogin) {
+  if (isKerberos && !disableLogin) {
 hostname = Strings.domainNamePointerToHostName(DNS.getDefaultHost(
 getConf().get(QueryServices.QUERY_SERVER_DNS_INTERFACE_ATTRIB, 
"default"),
 getConf().get(QueryServices.QUERY_SERVER_DNS_NAMESERVER_ATTRIB, 
"default")));
@@ -230,47 +231,9 @@ public final class QueryServer extends Configured 
implements Tool, Runnable {
   final HttpServer.Builder builder = new 
HttpServer.Builder().withPort(port)
   .withHandler(service, getSerialization(getConf()));
 
-  // Enable SPNEGO and Impersonation when using Kerberos
+  // Enable client auth when using Kerberos auth for HBase
   if (isKerberos) {
-UserGroupInformation ugi = UserGroupInformation.getCurrentUser();
-LOG.debug("Current user is " + ugi);
-if (!ugi.hasKerberosCredentials()) {
-  ugi = UserGroupInformation.getLoginUser();
-  LOG.debug("Current user does not have Kerberos credentials, using 
instead " + ugi);
-}
-
-// Make sure the proxyuser configuration is up to date
-ProxyUsers.refreshSuperUserGroupsConfiguration(getConf());
-
-String keytabPath = 
getConf().get(QueryServices.QUERY_SERVER_KEYTAB_FILENAME_ATTRIB);
-File keytab = new File(keytabPath);
-String httpKeytabPath = 
getConf().get(QueryServices.QUERY_SERVER_HTTP_KEYTAB_FILENAME_ATTRIB, null);
-String httpPrincipal = 
getConf().get(QueryServices.QUERY_SERVER_KERBEROS_HTTP_PRINCIPAL_ATTRIB, null);
-// Backwards compat for a configuration key change
-if (httpPrincipal == null) {
-  httpPrincipal = 
getConf().get(QueryServices.QUERY_SERVER_KERBEROS_HTTP_PRINCIPAL_ATTRIB_LEGACY, 
null);
-}
-File httpKeytab = null;
-if (null != httpKeytabPath)
-  httpKeytab = new File(httpKeytabPath);
-
-String realmsString = 
getConf().get(QueryServices.QUERY_SERVER_KERBEROS_ALLOWED_REALMS, null);
-String[] additionalAllowedRealms = null;
-if (null != realmsString) {
-additionalAllowedRealms = StringUtils.split(realmsString, ',');
-}
-
-// Enable SPNEGO and impersonation (through standard Hadoop 
configuration means)
-if ((null != httpKeytabPath) && (null != httpPrincipal))
-  builder.withSpnego(httpPrincipal, additionalAllowedRealms)
-  .withAutomaticLogin(httpKeytab)
-  .withImpersonation(new PhoenixDoAsCallback(ugi, getConf()));
-else
-  builder.withSpnego(ugi.getUserName(), additionalAllowedRealms)
-  .withAutomaticLogin(keytab)
-  .withImpersonation(new PhoenixDoAsCallback(ugi, getConf()));
-
-
+

phoenix git commit: Set version to 4.14.0-HBase-1.4 for release

2018-05-25 Thread mujtaba

Repository: phoenix
Updated Branches:
  refs/heads/master c35daba32 -> d6012ca19


Set version to 4.14.0-HBase-1.4 for release


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

Branch: refs/heads/master
Commit: d6012ca19fee70ed20269d6cca0cd43cdc39b612
Parents: c35daba
Author: Mujtaba 
Authored: Fri May 25 16:40:04 2018 -0700
Committer: Mujtaba 
Committed: Fri May 25 16:40:04 2018 -0700

--
 phoenix-assembly/pom.xml   | 2 +-
 phoenix-client/pom.xml | 2 +-
 phoenix-core/pom.xml   | 2 +-
 phoenix-flume/pom.xml  | 2 +-
 phoenix-hive/pom.xml   | 2 +-
 phoenix-kafka/pom.xml  | 2 +-
 phoenix-load-balancer/pom.xml  | 2 +-
 phoenix-pherf/pom.xml  | 2 +-
 phoenix-pig/pom.xml| 2 +-
 phoenix-queryserver-client/pom.xml | 2 +-
 phoenix-queryserver/pom.xml| 2 +-
 phoenix-server/pom.xml | 2 +-
 phoenix-spark/pom.xml  | 2 +-
 phoenix-tracing-webapp/pom.xml | 2 +-
 pom.xml| 2 +-
 15 files changed, 15 insertions(+), 15 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/d6012ca1/phoenix-assembly/pom.xml
--
diff --git a/phoenix-assembly/pom.xml b/phoenix-assembly/pom.xml
index b7fb04c..9850420 100644
--- a/phoenix-assembly/pom.xml
+++ b/phoenix-assembly/pom.xml
@@ -27,7 +27,7 @@
   
 org.apache.phoenix
 phoenix
-4.14.0-HBase-1.4-SNAPSHOT
+4.14.0-HBase-1.4
   
   phoenix-assembly
   Phoenix Assembly

http://git-wip-us.apache.org/repos/asf/phoenix/blob/d6012ca1/phoenix-client/pom.xml
--
diff --git a/phoenix-client/pom.xml b/phoenix-client/pom.xml
index d65da69..56cdfbf 100644
--- a/phoenix-client/pom.xml
+++ b/phoenix-client/pom.xml
@@ -27,7 +27,7 @@
   
 org.apache.phoenix
 phoenix
-4.14.0-HBase-1.4-SNAPSHOT
+4.14.0-HBase-1.4
   
   phoenix-client
   Phoenix Client

http://git-wip-us.apache.org/repos/asf/phoenix/blob/d6012ca1/phoenix-core/pom.xml
--
diff --git a/phoenix-core/pom.xml b/phoenix-core/pom.xml
index 2bb7293..9e9fed9 100644
--- a/phoenix-core/pom.xml
+++ b/phoenix-core/pom.xml
@@ -4,7 +4,7 @@
   
 org.apache.phoenix
 phoenix
-4.14.0-HBase-1.4-SNAPSHOT
+4.14.0-HBase-1.4
   
   phoenix-core
   Phoenix Core

http://git-wip-us.apache.org/repos/asf/phoenix/blob/d6012ca1/phoenix-flume/pom.xml
--
diff --git a/phoenix-flume/pom.xml b/phoenix-flume/pom.xml
index 3780d8d..6da777a 100644
--- a/phoenix-flume/pom.xml
+++ b/phoenix-flume/pom.xml
@@ -26,7 +26,7 @@
   
 org.apache.phoenix
 phoenix
-4.14.0-HBase-1.4-SNAPSHOT
+4.14.0-HBase-1.4
   
   phoenix-flume
   Phoenix - Flume

http://git-wip-us.apache.org/repos/asf/phoenix/blob/d6012ca1/phoenix-hive/pom.xml
--
diff --git a/phoenix-hive/pom.xml b/phoenix-hive/pom.xml
index 8fbc447..6bb4f02 100644
--- a/phoenix-hive/pom.xml
+++ b/phoenix-hive/pom.xml
@@ -27,7 +27,7 @@
   
 org.apache.phoenix
 phoenix
-4.14.0-HBase-1.4-SNAPSHOT
+4.14.0-HBase-1.4
   
   phoenix-hive
   Phoenix - Hive

http://git-wip-us.apache.org/repos/asf/phoenix/blob/d6012ca1/phoenix-kafka/pom.xml
--
diff --git a/phoenix-kafka/pom.xml b/phoenix-kafka/pom.xml
index 09547c5..b104cfb 100644
--- a/phoenix-kafka/pom.xml
+++ b/phoenix-kafka/pom.xml
@@ -26,7 +26,7 @@

org.apache.phoenix
phoenix
-   4.14.0-HBase-1.4-SNAPSHOT
+   4.14.0-HBase-1.4

phoenix-kafka
Phoenix - Kafka

http://git-wip-us.apache.org/repos/asf/phoenix/blob/d6012ca1/phoenix-load-balancer/pom.xml
--
diff --git a/phoenix-load-balancer/pom.xml b/phoenix-load-balancer/pom.xml
index ec4a1ad..388f66f 100644
--- a/phoenix-load-balancer/pom.xml
+++ b/phoenix-load-balancer/pom.xml
@@ -27,7 +27,7 @@
   
 org.apache.phoenix
 phoenix
-4.14.0-HBase-1.4-SNAPSHOT
+4.14.0-HBase-1.4
   
   phoenix-load-balancer
   Phoenix Load Balancer

http://git-wip-us.apache.org/repos/asf/phoenix/blob/d6012ca1/phoenix-pherf/pom.xml
--
diff --git a/phoenix-pherf/pom.xml b/phoenix-pherf/pom.xml
index

Build failed in Jenkins: Phoenix | Master #2038

2018-05-25 Thread Apache Jenkins Server

See 


Changes:

[ankitsinghal59] PHOENIX-1567 Publish Phoenix-Client & Phoenix-Server jars into 
Maven

--
[...truncated 118.33 KB...]
[INFO] Tests run: 16, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 49.388 
s - in org.apache.phoenix.end2end.RowTimestampIT
[INFO] Running org.apache.phoenix.end2end.RowValueConstructorIT
[INFO] Tests run: 33, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 76.907 
s - in org.apache.phoenix.end2end.RoundFloorCeilFuncIT
[INFO] Tests run: 42, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 273.092 
s - in org.apache.phoenix.end2end.QueryIT
[INFO] Running org.apache.phoenix.end2end.SequenceIT
[INFO] Running org.apache.phoenix.end2end.SequenceBulkAllocationIT
[INFO] Tests run: 56, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 30.016 
s - in org.apache.phoenix.end2end.SequenceBulkAllocationIT
[INFO] Running org.apache.phoenix.end2end.SerialIteratorsIT
[INFO] Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 4.544 s 
- in org.apache.phoenix.end2end.SerialIteratorsIT
[INFO] Running org.apache.phoenix.end2end.ServerExceptionIT
[INFO] Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 5.817 s 
- in org.apache.phoenix.end2end.ServerExceptionIT
[INFO] Running org.apache.phoenix.end2end.SetPropertyOnEncodedTableIT
[INFO] Tests run: 55, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 43.935 
s - in org.apache.phoenix.end2end.SequenceIT
[INFO] Running org.apache.phoenix.end2end.SetPropertyOnNonEncodedTableIT
[INFO] Tests run: 47, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 176.123 
s - in org.apache.phoenix.end2end.RowValueConstructorIT
[INFO] Running org.apache.phoenix.end2end.SignFunctionEnd2EndIT
[INFO] Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 12.181 s 
- in org.apache.phoenix.end2end.SignFunctionEnd2EndIT
[INFO] Running org.apache.phoenix.end2end.SkipScanAfterManualSplitIT
[INFO] Tests run: 56, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 381.094 
s - in org.apache.phoenix.end2end.RangeScanIT
[INFO] Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 47.235 s 
- in org.apache.phoenix.end2end.SkipScanAfterManualSplitIT
[INFO] Running org.apache.phoenix.end2end.SortMergeJoinMoreIT
[INFO] Running org.apache.phoenix.end2end.SkipScanQueryIT
[INFO] Tests run: 6, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 70.126 s 
- in org.apache.phoenix.end2end.SortMergeJoinMoreIT
[INFO] Running org.apache.phoenix.end2end.SortOrderIT
[INFO] Tests run: 32, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 246.343 
s - in org.apache.phoenix.end2end.SetPropertyOnNonEncodedTableIT
[INFO] Tests run: 14, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 56.53 s 
- in org.apache.phoenix.end2end.SkipScanQueryIT
[INFO] Running org.apache.phoenix.end2end.SqrtFunctionEnd2EndIT
[INFO] Tests run: 32, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 265.805 
s - in org.apache.phoenix.end2end.SetPropertyOnEncodedTableIT
[INFO] Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 14.407 s 
- in org.apache.phoenix.end2end.SqrtFunctionEnd2EndIT
[INFO] Running org.apache.phoenix.end2end.StddevIT
[INFO] Tests run: 4, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 22.389 s 
- in org.apache.phoenix.end2end.StddevIT
[INFO] Running org.apache.phoenix.end2end.StoreNullsIT
[INFO] Running org.apache.phoenix.end2end.SpooledTmpFileDeleteIT
[INFO] Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 5.596 s 
- in org.apache.phoenix.end2end.SpooledTmpFileDeleteIT
[INFO] Running org.apache.phoenix.end2end.StoreNullsPropIT
[INFO] Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 2.32 s - 
in org.apache.phoenix.end2end.StoreNullsPropIT
[INFO] Running org.apache.phoenix.end2end.StringIT
[INFO] Running org.apache.phoenix.end2end.StatementHintsIT
[INFO] Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 4.653 s 
- in org.apache.phoenix.end2end.StatementHintsIT
[INFO] Running org.apache.phoenix.end2end.StringToArrayFunctionIT
[INFO] Tests run: 15, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 87.009 
s - in org.apache.phoenix.end2end.StringIT
[INFO] Running org.apache.phoenix.end2end.TenantIdTypeIT
[INFO] Tests run: 22, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 88.576 
s - in org.apache.phoenix.end2end.StringToArrayFunctionIT
[INFO] Running org.apache.phoenix.end2end.TenantSpecificViewIndexIT
[INFO] Tests run: 46, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 225.144 
s - in org.apache.phoenix.end2end.SortOrderIT
[INFO] Tests run: 15, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 82.884 
s - in org.apache.phoenix.end2end.TenantIdTypeIT
[INFO] Running org.apache.phoenix.end2end.TenantSpecificViewIndexSaltedIT
[INFO] Tests run: 10, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 107.458 
s - in org.apache.phoenix.end2end.TenantSpecificViewIndexIT
[INFO]

svn commit: r27114 - in /dev/phoenix: apache-phoenix-4.14.0-HBase-1.3-rc1/ apache-phoenix-4.14.0-HBase-1.3-rc1/bin/ apache-phoenix-4.14.0-HBase-1.3-rc1/src/ apache-phoenix-4.14.0-HBase-1.4-rc1/ apache

2018-05-25 Thread mujtaba

Author: mujtaba
Date: Sat May 26 00:07:48 2018
New Revision: 27114

Log:
apache-phoenix-4.14.0-HBase-rc1 part 2/2

Added:
dev/phoenix/apache-phoenix-4.14.0-HBase-1.3-rc1/
dev/phoenix/apache-phoenix-4.14.0-HBase-1.3-rc1/bin/

dev/phoenix/apache-phoenix-4.14.0-HBase-1.3-rc1/bin/apache-phoenix-4.14.0-HBase-1.3-bin.tar.gz
   (with props)

dev/phoenix/apache-phoenix-4.14.0-HBase-1.3-rc1/bin/apache-phoenix-4.14.0-HBase-1.3-bin.tar.gz.asc

dev/phoenix/apache-phoenix-4.14.0-HBase-1.3-rc1/bin/apache-phoenix-4.14.0-HBase-1.3-bin.tar.gz.md5

dev/phoenix/apache-phoenix-4.14.0-HBase-1.3-rc1/bin/apache-phoenix-4.14.0-HBase-1.3-bin.tar.gz.sha256

dev/phoenix/apache-phoenix-4.14.0-HBase-1.3-rc1/bin/apache-phoenix-4.14.0-HBase-1.3-bin.tar.gz.sha512
dev/phoenix/apache-phoenix-4.14.0-HBase-1.3-rc1/src/

dev/phoenix/apache-phoenix-4.14.0-HBase-1.3-rc1/src/apache-phoenix-4.14.0-HBase-1.3-src.tar.gz
   (with props)

dev/phoenix/apache-phoenix-4.14.0-HBase-1.3-rc1/src/apache-phoenix-4.14.0-HBase-1.3-src.tar.gz.asc

dev/phoenix/apache-phoenix-4.14.0-HBase-1.3-rc1/src/apache-phoenix-4.14.0-HBase-1.3-src.tar.gz.md5

dev/phoenix/apache-phoenix-4.14.0-HBase-1.3-rc1/src/apache-phoenix-4.14.0-HBase-1.3-src.tar.gz.sha256

dev/phoenix/apache-phoenix-4.14.0-HBase-1.3-rc1/src/apache-phoenix-4.14.0-HBase-1.3-src.tar.gz.sha512
dev/phoenix/apache-phoenix-4.14.0-HBase-1.4-rc1/
dev/phoenix/apache-phoenix-4.14.0-HBase-1.4-rc1/bin/

dev/phoenix/apache-phoenix-4.14.0-HBase-1.4-rc1/bin/apache-phoenix-4.14.0-HBase-1.4-bin.tar.gz
   (with props)

dev/phoenix/apache-phoenix-4.14.0-HBase-1.4-rc1/bin/apache-phoenix-4.14.0-HBase-1.4-bin.tar.gz.asc

dev/phoenix/apache-phoenix-4.14.0-HBase-1.4-rc1/bin/apache-phoenix-4.14.0-HBase-1.4-bin.tar.gz.md5

dev/phoenix/apache-phoenix-4.14.0-HBase-1.4-rc1/bin/apache-phoenix-4.14.0-HBase-1.4-bin.tar.gz.sha256

dev/phoenix/apache-phoenix-4.14.0-HBase-1.4-rc1/bin/apache-phoenix-4.14.0-HBase-1.4-bin.tar.gz.sha512
dev/phoenix/apache-phoenix-4.14.0-HBase-1.4-rc1/src/

dev/phoenix/apache-phoenix-4.14.0-HBase-1.4-rc1/src/apache-phoenix-4.14.0-HBase-1.4-src.tar.gz
   (with props)

dev/phoenix/apache-phoenix-4.14.0-HBase-1.4-rc1/src/apache-phoenix-4.14.0-HBase-1.4-src.tar.gz.asc

dev/phoenix/apache-phoenix-4.14.0-HBase-1.4-rc1/src/apache-phoenix-4.14.0-HBase-1.4-src.tar.gz.md5

dev/phoenix/apache-phoenix-4.14.0-HBase-1.4-rc1/src/apache-phoenix-4.14.0-HBase-1.4-src.tar.gz.sha256

dev/phoenix/apache-phoenix-4.14.0-HBase-1.4-rc1/src/apache-phoenix-4.14.0-HBase-1.4-src.tar.gz.sha512

Added: 
dev/phoenix/apache-phoenix-4.14.0-HBase-1.3-rc1/bin/apache-phoenix-4.14.0-HBase-1.3-bin.tar.gz
==
Binary file - no diff available.

Propchange: 
dev/phoenix/apache-phoenix-4.14.0-HBase-1.3-rc1/bin/apache-phoenix-4.14.0-HBase-1.3-bin.tar.gz
--
svn:mime-type = application/octet-stream

Added: 
dev/phoenix/apache-phoenix-4.14.0-HBase-1.3-rc1/bin/apache-phoenix-4.14.0-HBase-1.3-bin.tar.gz.asc
==
--- 
dev/phoenix/apache-phoenix-4.14.0-HBase-1.3-rc1/bin/apache-phoenix-4.14.0-HBase-1.3-bin.tar.gz.asc
 (added)
+++ 
dev/phoenix/apache-phoenix-4.14.0-HBase-1.3-rc1/bin/apache-phoenix-4.14.0-HBase-1.3-bin.tar.gz.asc
 Sat May 26 00:07:48 2018
@@ -0,0 +1,17 @@
+-BEGIN PGP SIGNATURE-
+Version: GnuPG v1.4.11 (GNU/Linux)
+
+iQIcBAABAgAGBQJbCKIlAAoJEDv8s5KUYReO5gYQAIKJeVO8h0m6cpTL/PndV/o7
+tziHsR/dUHuO803zPkzSY8Ugx3SPS1lXzilpjYqThb0FqV1NhcLCpsZWBwGSxVZw
+t6kwIhJapVIt8b0hDRfUq7KQ7SgvRi+y6mOSEsSwAGCjJkrt4drFH/XoWpK9xXFB
+v8yOIBiaPBzuO6jLJ2CFdE/+j2NWdeofWKNtQRS/DDKhPr1cw6OswnV9CmN3fru4
+1qwRTWHr+c09k98dnccOr3DWwLMdaONgDn9Gnb+MCx19PrgMGk1Yzm7v6nTUguo6
+0FXGO2N2Y2mYRoVSjiAagl/72fC8J0e+CqVSTRIM9zROj3Xx269wPbiHD8AVgrt5
+vJOXy7PSgSIrP95MYOx9hEaHRd9fM3FGQIlR/zyRM9Vu8oV+F7gH2xpXgn2Vh17p
+tsA4uE5W4HUKwSOI3/F/HYdSZxbNwDRVVVhWWGlXjDG33JbV/aVE8OCD3APwZX0r
+VQ3FUZnbRuyJLG+A/+V5gjC20d6DqQeSOKZq9pBD4F9RTnjKnExMdV2tbaC+tv7W
+SDjMd3uTtAtZOPUaAEx0wYWa/46KLgk7PaCW5yGOw5L7LuHUB/o9oU4dDBXQmX3g
+fkyhBKgEzQ2wWBhJAa62dKsbGXkajELdLLYdLUUiIrc+UF2x4CF+F1wRofhzwFoT
+E6GwcY9xh9S1o2Kyt59X
+=762Z
+-END PGP SIGNATURE-

Added: 
dev/phoenix/apache-phoenix-4.14.0-HBase-1.3-rc1/bin/apache-phoenix-4.14.0-HBase-1.3-bin.tar.gz.md5
==
--- 
dev/phoenix/apache-phoenix-4.14.0-HBase-1.3-rc1/bin/apache-phoenix-4.14.0-HBase-1.3-bin.tar.gz.md5
 (added)
+++ 
dev/phoenix/apache-phoenix-4.14.0-HBase-1.3-rc1/bin/apache-phoenix-4.14.0-HBase-1.3-bin.tar.gz.md5
 Sat May 26 00:07:48 2018
@@ -0,0 +1 @@
+c3ac11c7d73c7d621b833531fa5733a5 *apache-phoenix-4.14.0-HBase-1.3-bin.tar.gz

Added: 
dev/phoenix/apache-phoenix-4.14.0-HBase-1.3-rc1/bin/apache-phoenix-4.14.0-HBase-1.3-bin.tar.gz.sha256

[1/2] phoenix git commit: PHOENIX-1567 Publish Phoenix-Client & Phoenix-Server jars into Maven Repo

2018-05-25 Thread pboado

Repository: phoenix
Updated Branches:
  refs/heads/4.x-cdh5.11 53f37ef05 -> 58082f810


PHOENIX-1567 Publish Phoenix-Client & Phoenix-Server jars into Maven Repo


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

Branch: refs/heads/4.x-cdh5.11
Commit: f7a27e26d8c49a6737cdd56afce142b7b29b6f6c
Parents: 53f37ef
Author: Ankit Singhal 
Authored: Fri May 25 19:32:27 2018 +0100
Committer: Pedro Boado 
Committed: Fri May 25 22:58:10 2018 +0100

--
 phoenix-client/pom.xml | 1 +
 phoenix-server/pom.xml | 1 +
 2 files changed, 2 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/f7a27e26/phoenix-client/pom.xml
--
diff --git a/phoenix-client/pom.xml b/phoenix-client/pom.xml
index fef18c2..fe5836b 100644
--- a/phoenix-client/pom.xml
+++ b/phoenix-client/pom.xml
@@ -81,6 +81,7 @@
 
 
   ${basedir}/target/phoenix-${project.version}-client.jar
+ ${basedir}/pom.xml
 
   
   

http://git-wip-us.apache.org/repos/asf/phoenix/blob/f7a27e26/phoenix-server/pom.xml
--
diff --git a/phoenix-server/pom.xml b/phoenix-server/pom.xml
index 982270e..98719fb 100644
--- a/phoenix-server/pom.xml
+++ b/phoenix-server/pom.xml
@@ -85,6 +85,7 @@
 
 
   ${basedir}/target/phoenix-${project.version}-server.jar
+ ${basedir}/pom.xml

Build failed in Jenkins: Phoenix-4.x-HBase-1.1 #758

2018-05-25 Thread Apache Jenkins Server

See 


Changes:

[ankitsinghal59] PHOENIX-1567 Publish Phoenix-Client & Phoenix-Server jars into 
Maven

--
[...truncated 462.57 KB...]
[INFO] Running org.apache.phoenix.end2end.index.LocalImmutableNonTxIndexIT
[INFO] Tests run: 40, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 191.693 
s - in org.apache.phoenix.end2end.index.GlobalMutableTxIndexIT
[INFO] Running org.apache.phoenix.end2end.index.LocalImmutableTxIndexIT
[INFO] Tests run: 18, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 172.99 
s - in org.apache.phoenix.end2end.index.IndexWithTableSchemaChangeIT
[INFO] Running org.apache.phoenix.end2end.index.LocalMutableNonTxIndexIT
[INFO] Tests run: 37, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 234.582 
s - in org.apache.phoenix.end2end.index.IndexUsageIT
[INFO] Running org.apache.phoenix.end2end.index.LocalMutableTxIndexIT
[INFO] Tests run: 40, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 339.373 
s - in org.apache.phoenix.end2end.index.LocalImmutableNonTxIndexIT
[INFO] Running org.apache.phoenix.end2end.index.MutableIndexIT
[INFO] Tests run: 40, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 358.892 
s - in org.apache.phoenix.end2end.index.LocalImmutableTxIndexIT
[INFO] Running org.apache.phoenix.end2end.index.SaltedIndexIT
[INFO] Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 14.544 s 
- in org.apache.phoenix.end2end.index.SaltedIndexIT
[INFO] Running org.apache.phoenix.end2end.index.ViewIndexIT
[INFO] Tests run: 40, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 338.237 
s - in org.apache.phoenix.end2end.index.LocalMutableNonTxIndexIT
[INFO] Running org.apache.phoenix.end2end.index.txn.MutableRollbackIT
[WARNING] Tests run: 14, Failures: 0, Errors: 0, Skipped: 2, Time elapsed: 
77.469 s - in org.apache.phoenix.end2end.index.ViewIndexIT
[INFO] Running org.apache.phoenix.end2end.index.txn.RollbackIT
[INFO] Tests run: 40, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 360.859 
s - in org.apache.phoenix.end2end.index.LocalMutableTxIndexIT
[INFO] Tests run: 6, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 69.146 s 
- in org.apache.phoenix.end2end.index.txn.MutableRollbackIT
[INFO] Running org.apache.phoenix.end2end.join.HashJoinGlobalIndexIT
[INFO] Running org.apache.phoenix.end2end.join.HashJoinCacheIT
[INFO] Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 7.597 s 
- in org.apache.phoenix.end2end.join.HashJoinCacheIT
[INFO] Running org.apache.phoenix.end2end.join.HashJoinLocalIndexIT
[INFO] Tests run: 8, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 54.475 s 
- in org.apache.phoenix.end2end.index.txn.RollbackIT
[INFO] Running org.apache.phoenix.end2end.join.HashJoinMoreIT
[INFO] Tests run: 8, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 53.609 s 
- in org.apache.phoenix.end2end.join.HashJoinMoreIT
[INFO] Running org.apache.phoenix.end2end.join.HashJoinNoIndexIT
[INFO] Tests run: 33, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 186.676 
s - in org.apache.phoenix.end2end.join.HashJoinNoIndexIT
[INFO] Running org.apache.phoenix.end2end.join.SortMergeJoinGlobalIndexIT
[INFO] Tests run: 33, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 318.821 
s - in org.apache.phoenix.end2end.join.HashJoinGlobalIndexIT
[INFO] Running org.apache.phoenix.end2end.join.SortMergeJoinLocalIndexIT
[INFO] Tests run: 80, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 590.098 
s - in org.apache.phoenix.end2end.index.MutableIndexIT
[INFO] Running org.apache.phoenix.end2end.join.SortMergeJoinNoIndexIT
[INFO] Tests run: 34, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 584.461 
s - in org.apache.phoenix.end2end.join.HashJoinLocalIndexIT
[INFO] Tests run: 34, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 190.961 
s - in org.apache.phoenix.end2end.join.SortMergeJoinNoIndexIT
[INFO] Running org.apache.phoenix.end2end.join.SubqueryIT
[INFO] Tests run: 34, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 329.475 
s - in org.apache.phoenix.end2end.join.SortMergeJoinGlobalIndexIT
[INFO] Running org.apache.phoenix.end2end.join.SubqueryUsingSortMergeJoinIT
[INFO] Running org.apache.phoenix.end2end.salted.SaltedTableIT
[INFO] Tests run: 8, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 14.009 s 
- in org.apache.phoenix.end2end.salted.SaltedTableIT
[INFO] Running org.apache.phoenix.end2end.salted.SaltedTableUpsertSelectIT
[INFO] Tests run: 6, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 25.978 s 
- in org.apache.phoenix.end2end.salted.SaltedTableUpsertSelectIT
[INFO] Running org.apache.phoenix.end2end.salted.SaltedTableVarLengthRowKeyIT
[INFO] Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 2.265 s 
- in org.apache.phoenix.end2end.salted.SaltedTableVarLengthRowKeyIT
[INFO] Running org.apache.phoenix.iterate.PhoenixQueryTimeoutIT
[INFO] Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 4.751

[3/4] phoenix git commit: PHOENIX-4749 Allow impersonation when SPNEGO is disabled

2018-05-25 Thread pboado

PHOENIX-4749 Allow impersonation when SPNEGO is disabled

Client impersonation is no longer tied to SPNEGO auth.

Signed-off-by: Josh Elser 


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

Branch: refs/heads/4.x-cdh5.13
Commit: 58082f8100a82d637c8f5102e16204e51b7cf86d
Parents: f7a27e2
Author: Alex Araujo 
Authored: Wed May 23 16:28:48 2018 +0100
Committer: Pedro Boado 
Committed: Fri May 25 22:58:29 2018 +0100

--
 .../phoenix/queryserver/server/QueryServer.java | 90 +++-
 .../server/QueryServerConfigurationTest.java| 72 
 2 files changed, 121 insertions(+), 41 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/58082f81/phoenix-queryserver/src/main/java/org/apache/phoenix/queryserver/server/QueryServer.java
--
diff --git 
a/phoenix-queryserver/src/main/java/org/apache/phoenix/queryserver/server/QueryServer.java
 
b/phoenix-queryserver/src/main/java/org/apache/phoenix/queryserver/server/QueryServer.java
index 8436086..e3f0f52 100644
--- 
a/phoenix-queryserver/src/main/java/org/apache/phoenix/queryserver/server/QueryServer.java
+++ 
b/phoenix-queryserver/src/main/java/org/apache/phoenix/queryserver/server/QueryServer.java
@@ -54,6 +54,7 @@ import org.apache.phoenix.queryserver.register.Registry;
 import org.apache.phoenix.util.InstanceResolver;
 
 import java.io.File;
+import java.io.IOException;
 import java.lang.management.ManagementFactory;
 import java.lang.management.RuntimeMXBean;
 import java.net.InetAddress;
@@ -197,7 +198,7 @@ public final class QueryServer extends Configured 
implements Tool, Runnable {
   
QueryServicesOptions.DEFAULT_QUERY_SERVER_DISABLE_KERBEROS_LOGIN);
 
   // handle secure cluster credentials
-  if (isKerberos && !disableSpnego && !disableLogin) {
+  if (isKerberos && !disableLogin) {
 hostname = Strings.domainNamePointerToHostName(DNS.getDefaultHost(
 getConf().get(QueryServices.QUERY_SERVER_DNS_INTERFACE_ATTRIB, 
"default"),
 getConf().get(QueryServices.QUERY_SERVER_DNS_NAMESERVER_ATTRIB, 
"default")));
@@ -230,47 +231,9 @@ public final class QueryServer extends Configured 
implements Tool, Runnable {
   final HttpServer.Builder builder = new 
HttpServer.Builder().withPort(port)
   .withHandler(service, getSerialization(getConf()));
 
-  // Enable SPNEGO and Impersonation when using Kerberos
+  // Enable client auth when using Kerberos auth for HBase
   if (isKerberos) {
-UserGroupInformation ugi = UserGroupInformation.getCurrentUser();
-LOG.debug("Current user is " + ugi);
-if (!ugi.hasKerberosCredentials()) {
-  ugi = UserGroupInformation.getLoginUser();
-  LOG.debug("Current user does not have Kerberos credentials, using 
instead " + ugi);
-}
-
-// Make sure the proxyuser configuration is up to date
-ProxyUsers.refreshSuperUserGroupsConfiguration(getConf());
-
-String keytabPath = 
getConf().get(QueryServices.QUERY_SERVER_KEYTAB_FILENAME_ATTRIB);
-File keytab = new File(keytabPath);
-String httpKeytabPath = 
getConf().get(QueryServices.QUERY_SERVER_HTTP_KEYTAB_FILENAME_ATTRIB, null);
-String httpPrincipal = 
getConf().get(QueryServices.QUERY_SERVER_KERBEROS_HTTP_PRINCIPAL_ATTRIB, null);
-// Backwards compat for a configuration key change
-if (httpPrincipal == null) {
-  httpPrincipal = 
getConf().get(QueryServices.QUERY_SERVER_KERBEROS_HTTP_PRINCIPAL_ATTRIB_LEGACY, 
null);
-}
-File httpKeytab = null;
-if (null != httpKeytabPath)
-  httpKeytab = new File(httpKeytabPath);
-
-String realmsString = 
getConf().get(QueryServices.QUERY_SERVER_KERBEROS_ALLOWED_REALMS, null);
-String[] additionalAllowedRealms = null;
-if (null != realmsString) {
-additionalAllowedRealms = StringUtils.split(realmsString, ',');
-}
-
-// Enable SPNEGO and impersonation (through standard Hadoop 
configuration means)
-if ((null != httpKeytabPath) && (null != httpPrincipal))
-  builder.withSpnego(httpPrincipal, additionalAllowedRealms)
-  .withAutomaticLogin(httpKeytab)
-  .withImpersonation(new PhoenixDoAsCallback(ugi, getConf()));
-else
-  builder.withSpnego(ugi.getUserName(), additionalAllowedRealms)
-  .withAutomaticLogin(keytab)
-  .withImpersonation(new PhoenixDoAsCallback(ugi, getConf()));
-
-
+

[3/4] phoenix git commit: PHOENIX-4749 Allow impersonation when SPNEGO is disabled

2018-05-25 Thread pboado

PHOENIX-4749 Allow impersonation when SPNEGO is disabled

Client impersonation is no longer tied to SPNEGO auth.

Signed-off-by: Josh Elser 


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

Branch: refs/heads/4.x-cdh5.14
Commit: 58082f8100a82d637c8f5102e16204e51b7cf86d
Parents: f7a27e2
Author: Alex Araujo 
Authored: Wed May 23 16:28:48 2018 +0100
Committer: Pedro Boado 
Committed: Fri May 25 22:58:29 2018 +0100

--
 .../phoenix/queryserver/server/QueryServer.java | 90 +++-
 .../server/QueryServerConfigurationTest.java| 72 
 2 files changed, 121 insertions(+), 41 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/58082f81/phoenix-queryserver/src/main/java/org/apache/phoenix/queryserver/server/QueryServer.java
--
diff --git 
a/phoenix-queryserver/src/main/java/org/apache/phoenix/queryserver/server/QueryServer.java
 
b/phoenix-queryserver/src/main/java/org/apache/phoenix/queryserver/server/QueryServer.java
index 8436086..e3f0f52 100644
--- 
a/phoenix-queryserver/src/main/java/org/apache/phoenix/queryserver/server/QueryServer.java
+++ 
b/phoenix-queryserver/src/main/java/org/apache/phoenix/queryserver/server/QueryServer.java
@@ -54,6 +54,7 @@ import org.apache.phoenix.queryserver.register.Registry;
 import org.apache.phoenix.util.InstanceResolver;
 
 import java.io.File;
+import java.io.IOException;
 import java.lang.management.ManagementFactory;
 import java.lang.management.RuntimeMXBean;
 import java.net.InetAddress;
@@ -197,7 +198,7 @@ public final class QueryServer extends Configured 
implements Tool, Runnable {
   
QueryServicesOptions.DEFAULT_QUERY_SERVER_DISABLE_KERBEROS_LOGIN);
 
   // handle secure cluster credentials
-  if (isKerberos && !disableSpnego && !disableLogin) {
+  if (isKerberos && !disableLogin) {
 hostname = Strings.domainNamePointerToHostName(DNS.getDefaultHost(
 getConf().get(QueryServices.QUERY_SERVER_DNS_INTERFACE_ATTRIB, 
"default"),
 getConf().get(QueryServices.QUERY_SERVER_DNS_NAMESERVER_ATTRIB, 
"default")));
@@ -230,47 +231,9 @@ public final class QueryServer extends Configured 
implements Tool, Runnable {
   final HttpServer.Builder builder = new 
HttpServer.Builder().withPort(port)
   .withHandler(service, getSerialization(getConf()));
 
-  // Enable SPNEGO and Impersonation when using Kerberos
+  // Enable client auth when using Kerberos auth for HBase
   if (isKerberos) {
-UserGroupInformation ugi = UserGroupInformation.getCurrentUser();
-LOG.debug("Current user is " + ugi);
-if (!ugi.hasKerberosCredentials()) {
-  ugi = UserGroupInformation.getLoginUser();
-  LOG.debug("Current user does not have Kerberos credentials, using 
instead " + ugi);
-}
-
-// Make sure the proxyuser configuration is up to date
-ProxyUsers.refreshSuperUserGroupsConfiguration(getConf());
-
-String keytabPath = 
getConf().get(QueryServices.QUERY_SERVER_KEYTAB_FILENAME_ATTRIB);
-File keytab = new File(keytabPath);
-String httpKeytabPath = 
getConf().get(QueryServices.QUERY_SERVER_HTTP_KEYTAB_FILENAME_ATTRIB, null);
-String httpPrincipal = 
getConf().get(QueryServices.QUERY_SERVER_KERBEROS_HTTP_PRINCIPAL_ATTRIB, null);
-// Backwards compat for a configuration key change
-if (httpPrincipal == null) {
-  httpPrincipal = 
getConf().get(QueryServices.QUERY_SERVER_KERBEROS_HTTP_PRINCIPAL_ATTRIB_LEGACY, 
null);
-}
-File httpKeytab = null;
-if (null != httpKeytabPath)
-  httpKeytab = new File(httpKeytabPath);
-
-String realmsString = 
getConf().get(QueryServices.QUERY_SERVER_KERBEROS_ALLOWED_REALMS, null);
-String[] additionalAllowedRealms = null;
-if (null != realmsString) {
-additionalAllowedRealms = StringUtils.split(realmsString, ',');
-}
-
-// Enable SPNEGO and impersonation (through standard Hadoop 
configuration means)
-if ((null != httpKeytabPath) && (null != httpPrincipal))
-  builder.withSpnego(httpPrincipal, additionalAllowedRealms)
-  .withAutomaticLogin(httpKeytab)
-  .withImpersonation(new PhoenixDoAsCallback(ugi, getConf()));
-else
-  builder.withSpnego(ugi.getUserName(), additionalAllowedRealms)
-  .withAutomaticLogin(keytab)
-  .withImpersonation(new PhoenixDoAsCallback(ugi, getConf()));
-
-
+

[2/4] phoenix git commit: PHOENIX-1567 Publish Phoenix-Client & Phoenix-Server jars into Maven Repo

2018-05-25 Thread pboado

PHOENIX-1567 Publish Phoenix-Client & Phoenix-Server jars into Maven Repo


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

Branch: refs/heads/4.x-cdh5.13
Commit: f7a27e26d8c49a6737cdd56afce142b7b29b6f6c
Parents: 53f37ef
Author: Ankit Singhal 
Authored: Fri May 25 19:32:27 2018 +0100
Committer: Pedro Boado 
Committed: Fri May 25 22:58:10 2018 +0100

--
 phoenix-client/pom.xml | 1 +
 phoenix-server/pom.xml | 1 +
 2 files changed, 2 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/f7a27e26/phoenix-client/pom.xml
--
diff --git a/phoenix-client/pom.xml b/phoenix-client/pom.xml
index fef18c2..fe5836b 100644
--- a/phoenix-client/pom.xml
+++ b/phoenix-client/pom.xml
@@ -81,6 +81,7 @@
 
 
   ${basedir}/target/phoenix-${project.version}-client.jar
+ ${basedir}/pom.xml
 
   
   

http://git-wip-us.apache.org/repos/asf/phoenix/blob/f7a27e26/phoenix-server/pom.xml
--
diff --git a/phoenix-server/pom.xml b/phoenix-server/pom.xml
index 982270e..98719fb 100644
--- a/phoenix-server/pom.xml
+++ b/phoenix-server/pom.xml
@@ -85,6 +85,7 @@
 
 
   ${basedir}/target/phoenix-${project.version}-server.jar
+ ${basedir}/pom.xml

[2/4] phoenix git commit: PHOENIX-1567 Publish Phoenix-Client & Phoenix-Server jars into Maven Repo

2018-05-25 Thread pboado

PHOENIX-1567 Publish Phoenix-Client & Phoenix-Server jars into Maven Repo


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

Branch: refs/heads/4.x-cdh5.14
Commit: f7a27e26d8c49a6737cdd56afce142b7b29b6f6c
Parents: 53f37ef
Author: Ankit Singhal 
Authored: Fri May 25 19:32:27 2018 +0100
Committer: Pedro Boado 
Committed: Fri May 25 22:58:10 2018 +0100

--
 phoenix-client/pom.xml | 1 +
 phoenix-server/pom.xml | 1 +
 2 files changed, 2 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/f7a27e26/phoenix-client/pom.xml
--
diff --git a/phoenix-client/pom.xml b/phoenix-client/pom.xml
index fef18c2..fe5836b 100644
--- a/phoenix-client/pom.xml
+++ b/phoenix-client/pom.xml
@@ -81,6 +81,7 @@
 
 
   ${basedir}/target/phoenix-${project.version}-client.jar
+ ${basedir}/pom.xml
 
   
   

http://git-wip-us.apache.org/repos/asf/phoenix/blob/f7a27e26/phoenix-server/pom.xml
--
diff --git a/phoenix-server/pom.xml b/phoenix-server/pom.xml
index 982270e..98719fb 100644
--- a/phoenix-server/pom.xml
+++ b/phoenix-server/pom.xml
@@ -85,6 +85,7 @@
 
 
   ${basedir}/target/phoenix-${project.version}-server.jar
+ ${basedir}/pom.xml

[4/4] phoenix git commit: Changes for CDH 5.14.x

2018-05-25 Thread pboado

Changes for CDH 5.14.x


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

Branch: refs/heads/4.x-cdh5.14
Commit: 758ab6d72c9faa7efb331662aab99f435704566d
Parents: 58082f8
Author: Pedro Boado 
Authored: Sat Mar 10 17:54:04 2018 +
Committer: Pedro Boado 
Committed: Fri May 25 23:12:02 2018 +0100

--
 phoenix-assembly/pom.xml|  2 +-
 phoenix-client/pom.xml  |  2 +-
 phoenix-core/pom.xml|  2 +-
 .../hadoop/hbase/ipc/PhoenixRpcScheduler.java   | 34 ++--
 phoenix-flume/pom.xml   |  2 +-
 phoenix-hive/pom.xml|  2 +-
 phoenix-kafka/pom.xml   |  2 +-
 phoenix-load-balancer/pom.xml   |  2 +-
 phoenix-parcel/pom.xml  |  2 +-
 phoenix-pherf/pom.xml   |  2 +-
 phoenix-pig/pom.xml |  2 +-
 phoenix-queryserver-client/pom.xml  |  2 +-
 phoenix-queryserver/pom.xml |  2 +-
 phoenix-server/pom.xml  |  2 +-
 phoenix-spark/pom.xml   |  2 +-
 phoenix-tracing-webapp/pom.xml  |  2 +-
 pom.xml |  4 +--
 17 files changed, 49 insertions(+), 19 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/758ab6d7/phoenix-assembly/pom.xml
--
diff --git a/phoenix-assembly/pom.xml b/phoenix-assembly/pom.xml
index 7d98c25..c013cf0 100644
--- a/phoenix-assembly/pom.xml
+++ b/phoenix-assembly/pom.xml
@@ -27,7 +27,7 @@
   
 org.apache.phoenix
 phoenix
-4.14.0-cdh5.11.2
+4.14.0-cdh5.14.2-SNAPSHOT
   
   phoenix-assembly
   Phoenix Assembly

http://git-wip-us.apache.org/repos/asf/phoenix/blob/758ab6d7/phoenix-client/pom.xml
--
diff --git a/phoenix-client/pom.xml b/phoenix-client/pom.xml
index fe5836b..6552c4b 100644
--- a/phoenix-client/pom.xml
+++ b/phoenix-client/pom.xml
@@ -27,7 +27,7 @@
   
 org.apache.phoenix
 phoenix
-4.14.0-cdh5.11.2
+4.14.0-cdh5.14.2-SNAPSHOT
   
   phoenix-client
   Phoenix Client

http://git-wip-us.apache.org/repos/asf/phoenix/blob/758ab6d7/phoenix-core/pom.xml
--
diff --git a/phoenix-core/pom.xml b/phoenix-core/pom.xml
index 8b09c67..0764e9a 100644
--- a/phoenix-core/pom.xml
+++ b/phoenix-core/pom.xml
@@ -4,7 +4,7 @@
   
 org.apache.phoenix
 phoenix
-4.14.0-cdh5.11.2
+4.14.0-cdh5.14.2-SNAPSHOT
   
   phoenix-core
   Phoenix Core

http://git-wip-us.apache.org/repos/asf/phoenix/blob/758ab6d7/phoenix-core/src/main/java/org/apache/hadoop/hbase/ipc/PhoenixRpcScheduler.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/hadoop/hbase/ipc/PhoenixRpcScheduler.java
 
b/phoenix-core/src/main/java/org/apache/hadoop/hbase/ipc/PhoenixRpcScheduler.java
index 4fdddf5..d1f05f8 100644
--- 
a/phoenix-core/src/main/java/org/apache/hadoop/hbase/ipc/PhoenixRpcScheduler.java
+++ 
b/phoenix-core/src/main/java/org/apache/hadoop/hbase/ipc/PhoenixRpcScheduler.java
@@ -124,6 +124,36 @@ public class PhoenixRpcScheduler extends RpcScheduler {
 public void setMetadataExecutorForTesting(RpcExecutor executor) {
 this.metadataCallExecutor = executor;
 }
-
-
+
+@Override
+public int getReadQueueLength() {
+return delegate.getReadQueueLength();
+}
+
+@Override
+public int getWriteQueueLength() {
+return delegate.getWriteQueueLength();
+}
+
+@Override
+public int getScanQueueLength() {
+return delegate.getScanQueueLength();
+}
+
+@Override
+public int getActiveReadRpcHandlerCount() {
+return delegate.getActiveReadRpcHandlerCount();
+}
+
+@Override
+public int getActiveWriteRpcHandlerCount() {
+return delegate.getActiveWriteRpcHandlerCount();
+}
+
+@Override
+public int getActiveScanRpcHandlerCount() {
+return delegate.getActiveScanRpcHandlerCount();
+}
+
+
 }

http://git-wip-us.apache.org/repos/asf/phoenix/blob/758ab6d7/phoenix-flume/pom.xml
--
diff --git a/phoenix-flume/pom.xml b/phoenix-flume/pom.xml
index e400589..e0532cb 100644
--- a/phoenix-flume/pom.xml
+++ b/phoenix-flume/pom.xml
@@ -26,7 +26,7 @@
   
 org.apache.phoenix

[1/4] phoenix git commit: PHOENIX-4728 ARRAY_APPEND and ARRAY_REMOVE should work with null column value (Xavier Jodoin) [Forced Update!]

2018-05-25 Thread pboado

Repository: phoenix
Updated Branches:
  refs/heads/4.x-cdh5.14 c7e9c1955 -> 758ab6d72 (forced update)


PHOENIX-4728 ARRAY_APPEND and ARRAY_REMOVE should work with null column value 
(Xavier Jodoin)


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

Branch: refs/heads/4.x-cdh5.14
Commit: 53f37ef05ea9af232bf34ba80f03b44da18156ac
Parents: cbca731
Author: James Taylor 
Authored: Fri May 25 09:36:41 2018 -0700
Committer: James Taylor 
Committed: Fri May 25 09:42:04 2018 -0700

--
 .../phoenix/end2end/ArrayAppendFunctionIT.java  | 38 
 .../apache/phoenix/compile/UpsertCompiler.java  |  2 +-
 2 files changed, 39 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/53f37ef0/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArrayAppendFunctionIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArrayAppendFunctionIT.java
 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArrayAppendFunctionIT.java
index caa17fe..7962a7a 100644
--- 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArrayAppendFunctionIT.java
+++ 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArrayAppendFunctionIT.java
@@ -132,6 +132,24 @@ public class ArrayAppendFunctionIT extends 
ParallelStatsDisabledIT {
 }
 
 @Test
+public void testUpsertEmptyArrayModification() throws Exception {
+Connection conn = DriverManager.getConnection(getUrl());
+String tableName = initTables(conn);
+
+ResultSet rs;
+String[] strings = new String[]{"34567"};
+Array array = conn.createArrayOf("VARCHAR", strings);
+
+conn.createStatement().execute("UPSERT INTO " + tableName + " 
(region_name,nullVarChar) SELECT region_name,ARRAY_APPEND(nullVarChar,'34567') 
FROM " + tableName);
+conn.commit();
+
+rs = conn.createStatement().executeQuery("SELECT nullVarChar FROM " + 
tableName + " LIMIT 1");
+assertTrue(rs.next());
+assertEquals(array, rs.getArray(1));
+assertFalse(rs.next());
+}
+
+@Test
 public void testArrayAppendFunctionVarchar() throws Exception {
 Connection conn = DriverManager.getConnection(getUrl());
 String tableName = initTables(conn);
@@ -147,6 +165,26 @@ public class ArrayAppendFunctionIT extends 
ParallelStatsDisabledIT {
 assertEquals(array, rs.getArray(1));
 assertFalse(rs.next());
 }
+
+@Test
+public void testUpsertArrayAppendFunctionVarchar() throws Exception {
+Connection conn = DriverManager.getConnection(getUrl());
+String tableName = initTables(conn);
+
+conn.createStatement().execute("UPSERT INTO " + tableName + " 
(region_name,varchars) SELECT region_name,ARRAY_APPEND(varchars,'34567') as 
varchars FROM " + tableName+ " WHERE region_name = 'SF Bay Area'");
+conn.commit();
+
+ResultSet rs;
+rs = conn.createStatement().executeQuery("SELECT varchars FROM " + 
tableName + " WHERE region_name = 'SF Bay Area'");
+assertTrue(rs.next());
+
+String[] strings = new String[]{"2345", "46345", "23234", "34567"};
+
+Array array = conn.createArrayOf("VARCHAR", strings);
+
+assertEquals(array, rs.getArray(1));
+assertFalse(rs.next());
+}
 
 @Test
 public void testArrayAppendFunctionInteger() throws Exception {

http://git-wip-us.apache.org/repos/asf/phoenix/blob/53f37ef0/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 30f0c18..c3cfa10 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
@@ -549,7 +549,7 @@ public class UpsertCompiler {
 select = SelectStatement.create(select, hint);
 // Pass scan through if same table in upsert and select so that 
projection is computed correctly
 // Use optimizer to choose the best plan
-QueryCompiler compiler = new QueryCompiler(statement, select, 
selectResolver, targetColumns, parallelIteratorFactoryToBe, new 
SequenceManager(statement), false, false, null);
+QueryCompiler compiler = new QueryCompiler(statement, select, 
selectResolver, targetColumns,

[phoenix] Git Push Summary

2018-05-25 Thread mujtaba

Repository: phoenix
Updated Tags:  refs/tags/v4.14.0-HBase-1.2-rc1 [created] 012eceea0

Build failed in Jenkins: Phoenix-4.x-HBase-1.1 #759

2018-05-25 Thread Apache Jenkins Server

See 


Changes:

[elserj] PHOENIX-4533 Modified Query Server to use two sets of Kerberos

[elserj] PHOENIX-4749 Allow impersonation when SPNEGO is disabled

[elserj] PHOENIX-4672 Align the kerberos principal config keys

--
[...truncated 478.40 KB...]
[INFO] Running org.apache.phoenix.end2end.index.LocalImmutableNonTxIndexIT
[INFO] Tests run: 18, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 172.516 
s - in org.apache.phoenix.end2end.index.IndexWithTableSchemaChangeIT
[INFO] Tests run: 37, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 231.765 
s - in org.apache.phoenix.end2end.index.IndexUsageIT
[INFO] Running org.apache.phoenix.end2end.index.LocalMutableNonTxIndexIT
[INFO] Running org.apache.phoenix.end2end.index.LocalMutableTxIndexIT
[INFO] Tests run: 40, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 357.405 
s - in org.apache.phoenix.end2end.index.LocalImmutableTxIndexIT
[INFO] Tests run: 40, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 338.704 
s - in org.apache.phoenix.end2end.index.LocalImmutableNonTxIndexIT
[INFO] Running org.apache.phoenix.end2end.index.MutableIndexIT
[INFO] Running org.apache.phoenix.end2end.index.SaltedIndexIT
[INFO] Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 14.264 s 
- in org.apache.phoenix.end2end.index.SaltedIndexIT
[INFO] Running org.apache.phoenix.end2end.index.ViewIndexIT
[WARNING] Tests run: 14, Failures: 0, Errors: 0, Skipped: 2, Time elapsed: 
79.352 s - in org.apache.phoenix.end2end.index.ViewIndexIT
[INFO] Tests run: 40, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 342.62 
s - in org.apache.phoenix.end2end.index.LocalMutableNonTxIndexIT
[INFO] Running org.apache.phoenix.end2end.index.txn.MutableRollbackIT
[INFO] Running org.apache.phoenix.end2end.index.txn.RollbackIT
[INFO] Tests run: 40, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 360.471 
s - in org.apache.phoenix.end2end.index.LocalMutableTxIndexIT
[INFO] Running org.apache.phoenix.end2end.join.HashJoinCacheIT
[INFO] Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 7.585 s 
- in org.apache.phoenix.end2end.join.HashJoinCacheIT
[INFO] Running org.apache.phoenix.end2end.join.HashJoinGlobalIndexIT
[INFO] Tests run: 6, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 69.098 s 
- in org.apache.phoenix.end2end.index.txn.MutableRollbackIT
[INFO] Running org.apache.phoenix.end2end.join.HashJoinLocalIndexIT
[INFO] Tests run: 8, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 55.084 s 
- in org.apache.phoenix.end2end.index.txn.RollbackIT
[INFO] Running org.apache.phoenix.end2end.join.HashJoinMoreIT
[INFO] Tests run: 8, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 52.071 s 
- in org.apache.phoenix.end2end.join.HashJoinMoreIT
[INFO] Running org.apache.phoenix.end2end.join.HashJoinNoIndexIT
[INFO] Tests run: 33, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 187.056 
s - in org.apache.phoenix.end2end.join.HashJoinNoIndexIT
[INFO] Running org.apache.phoenix.end2end.join.SortMergeJoinGlobalIndexIT
[INFO] Tests run: 33, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 322.923 
s - in org.apache.phoenix.end2end.join.HashJoinGlobalIndexIT
[INFO] Running org.apache.phoenix.end2end.join.SortMergeJoinLocalIndexIT
[INFO] Tests run: 80, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 580.11 
s - in org.apache.phoenix.end2end.index.MutableIndexIT
[INFO] Running org.apache.phoenix.end2end.join.SortMergeJoinNoIndexIT
[INFO] Tests run: 34, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 589.712 
s - in org.apache.phoenix.end2end.join.HashJoinLocalIndexIT
[INFO] Tests run: 34, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 334.17 
s - in org.apache.phoenix.end2end.join.SortMergeJoinGlobalIndexIT
[INFO] Tests run: 34, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 190.487 
s - in org.apache.phoenix.end2end.join.SortMergeJoinNoIndexIT
[INFO] Running org.apache.phoenix.end2end.join.SubqueryIT
[INFO] Running org.apache.phoenix.end2end.join.SubqueryUsingSortMergeJoinIT
[INFO] Running org.apache.phoenix.end2end.salted.SaltedTableIT
[INFO] Tests run: 8, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 13.936 s 
- in org.apache.phoenix.end2end.salted.SaltedTableIT
[INFO] Running org.apache.phoenix.end2end.salted.SaltedTableUpsertSelectIT
[INFO] Tests run: 6, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 26.11 s 
- in org.apache.phoenix.end2end.salted.SaltedTableUpsertSelectIT
[INFO] Running org.apache.phoenix.end2end.salted.SaltedTableVarLengthRowKeyIT
[INFO] Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 2.284 s 
- in org.apache.phoenix.end2end.salted.SaltedTableVarLengthRowKeyIT
[INFO] Running org.apache.phoenix.iterate.PhoenixQueryTimeoutIT
[INFO] Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 4.781 s 
- in org.apache.phoenix.iterate.PhoenixQueryTimeoutIT
[INFO] Running

svn commit: r1832293 - in /phoenix/site: publish/language/datatypes.html publish/language/functions.html publish/language/index.html publish/release.html source/src/site/markdown/release.md

2018-05-25 Thread ankit

Author: ankit
Date: Sat May 26 05:30:28 2018
New Revision: 1832293

URL: http://svn.apache.org/viewvc?rev=1832293=rev
Log:
PHOENIX-1567 Publish Phoenix-Client & Phoenix-Server jars into Maven Repo

Modified:
phoenix/site/publish/language/datatypes.html
phoenix/site/publish/language/functions.html
phoenix/site/publish/language/index.html
phoenix/site/publish/release.html
phoenix/site/source/src/site/markdown/release.md

Modified: phoenix/site/publish/language/datatypes.html
URL: 
http://svn.apache.org/viewvc/phoenix/site/publish/language/datatypes.html?rev=1832293=1832292=1832293=diff
==
--- phoenix/site/publish/language/datatypes.html (original)
+++ phoenix/site/publish/language/datatypes.html Sat May 26 05:30:28 2018
@@ -1,7 +1,7 @@
 
 
 
 

Modified: phoenix/site/publish/language/functions.html
URL: 
http://svn.apache.org/viewvc/phoenix/site/publish/language/functions.html?rev=1832293=1832292=1832293=diff
==
--- phoenix/site/publish/language/functions.html (original)
+++ phoenix/site/publish/language/functions.html Sat May 26 05:30:28 2018
@@ -1,7 +1,7 @@
 
 
 
 

Modified: phoenix/site/publish/language/index.html
URL: 
http://svn.apache.org/viewvc/phoenix/site/publish/language/index.html?rev=1832293=1832292=1832293=diff
==
--- phoenix/site/publish/language/index.html (original)
+++ phoenix/site/publish/language/index.html Sat May 26 05:30:28 2018
@@ -1,7 +1,7 @@
 
 
 
 

Modified: phoenix/site/publish/release.html
URL: 
http://svn.apache.org/viewvc/phoenix/site/publish/release.html?rev=1832293=1832292=1832293=diff
==
--- phoenix/site/publish/release.html (original)
+++ phoenix/site/publish/release.html Sat May 26 05:30:28 2018
@@ -1,7 +1,7 @@
 
 
 
 
@@ -217,7 +217,7 @@ git tag -a v4.11.0-HBase-0.98 v4.11.0-HB
 
 mvn clean deploy gpg:sign -DperformRelease=true 
-Dgpg.passphrase=[your_pass_phrase_here]
 -Dgpg.keyname=[your_key_here] -DskipTests -P release -pl 
phoenix-core,phoenix-pig,phoenix-tracing-webapp,
-phoenix-queryserver,phoenix-spark,phoenix-flume,phoenix-pherf,phoenix-queryserver-client,phoenix-hive
 -am
+phoenix-queryserver,phoenix-spark,phoenix-flume,phoenix-pherf,phoenix-queryserver-client,phoenix-hive,phoenix-client,phoenix-server
 -am
  
 
   Go to https://repository.apache.org/#stagingRepositories;>https://repository.apache.org/#stagingRepositories
 and close - release the staged artifacts. 

Modified: phoenix/site/source/src/site/markdown/release.md
URL: 
http://svn.apache.org/viewvc/phoenix/site/source/src/site/markdown/release.md?rev=1832293=1832292=1832293=diff
==
--- phoenix/site/source/src/site/markdown/release.md (original)
+++ phoenix/site/source/src/site/markdown/release.md Sat May 26 05:30:28 2018
@@ -40,7 +40,7 @@ Follow the instructions. Signed binary a
 
 mvn clean deploy gpg:sign -DperformRelease=true 
-Dgpg.passphrase=[your_pass_phrase_here]
 -Dgpg.keyname=[your_key_here] -DskipTests -P release -pl 
phoenix-core,phoenix-pig,phoenix-tracing-webapp,
-
phoenix-queryserver,phoenix-spark,phoenix-flume,phoenix-pherf,phoenix-queryserver-client,phoenix-hive
 -am
+
phoenix-queryserver,phoenix-spark,phoenix-flume,phoenix-pherf,phoenix-queryserver-client,phoenix-hive,phoenix-client,phoenix-server
 -am
 
 5. Go to https://repository.apache.org/#stagingRepositories and 
close -> release the staged artifacts.
 6. Set version back to upcoming SNAPSHOT and commit:

Build failed in Jenkins: Phoenix | Master #2039

2018-05-25 Thread Apache Jenkins Server

See 


Changes:

[elserj] PHOENIX-4749 Allow impersonation when SPNEGO is disabled

[mujtaba] Set version to 4.14.0-HBase-1.4 for release

[mujtaba] Fix Apache RAT warnings

--
[...truncated 110.04 KB...]
[INFO] Running org.apache.phoenix.end2end.index.LocalMutableTxIndexIT
[INFO] Tests run: 40, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 336.989 
s - in org.apache.phoenix.end2end.index.LocalImmutableNonTxIndexIT
[INFO] Running org.apache.phoenix.end2end.index.MutableIndexIT
[INFO] Tests run: 40, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 338.686 
s - in org.apache.phoenix.end2end.index.LocalMutableNonTxIndexIT
[INFO] Tests run: 40, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 357.907 
s - in org.apache.phoenix.end2end.index.LocalImmutableTxIndexIT
[INFO] Running org.apache.phoenix.end2end.index.SaltedIndexIT
[INFO] Running org.apache.phoenix.end2end.index.ViewIndexIT
[INFO] Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 14.026 s 
- in org.apache.phoenix.end2end.index.SaltedIndexIT
[INFO] Running org.apache.phoenix.end2end.index.txn.MutableRollbackIT
[WARNING] Tests run: 14, Failures: 0, Errors: 0, Skipped: 2, Time elapsed: 
80.977 s - in org.apache.phoenix.end2end.index.ViewIndexIT
[INFO] Tests run: 6, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 68.551 s 
- in org.apache.phoenix.end2end.index.txn.MutableRollbackIT
[INFO] Running org.apache.phoenix.end2end.join.HashJoinCacheIT
[INFO] Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 7.554 s 
- in org.apache.phoenix.end2end.join.HashJoinCacheIT
[INFO] Running org.apache.phoenix.end2end.join.HashJoinGlobalIndexIT
[INFO] Tests run: 40, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 359.959 
s - in org.apache.phoenix.end2end.index.LocalMutableTxIndexIT
[INFO] Running org.apache.phoenix.end2end.index.txn.RollbackIT
[INFO] Running org.apache.phoenix.end2end.join.HashJoinLocalIndexIT
[INFO] Tests run: 8, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 53.953 s 
- in org.apache.phoenix.end2end.index.txn.RollbackIT
[INFO] Running org.apache.phoenix.end2end.join.HashJoinMoreIT
[INFO] Tests run: 8, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 51.877 s 
- in org.apache.phoenix.end2end.join.HashJoinMoreIT
[INFO] Running org.apache.phoenix.end2end.join.HashJoinNoIndexIT
[INFO] Tests run: 33, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 186.755 
s - in org.apache.phoenix.end2end.join.HashJoinNoIndexIT
[INFO] Tests run: 33, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 319.189 
s - in org.apache.phoenix.end2end.join.HashJoinGlobalIndexIT
[INFO] Running org.apache.phoenix.end2end.join.SortMergeJoinGlobalIndexIT
[INFO] Running org.apache.phoenix.end2end.join.SortMergeJoinLocalIndexIT
[INFO] Tests run: 96, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 650.688 
s - in org.apache.phoenix.end2end.index.MutableIndexIT
[INFO] Running org.apache.phoenix.end2end.join.SortMergeJoinNoIndexIT
[INFO] Tests run: 34, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 191.633 
s - in org.apache.phoenix.end2end.join.SortMergeJoinNoIndexIT
[INFO] Running org.apache.phoenix.end2end.join.SubqueryIT
[INFO] Tests run: 34, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 591.292 
s - in org.apache.phoenix.end2end.join.HashJoinLocalIndexIT
[INFO] Running org.apache.phoenix.end2end.join.SubqueryUsingSortMergeJoinIT
[INFO] Tests run: 34, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 334.56 
s - in org.apache.phoenix.end2end.join.SortMergeJoinGlobalIndexIT
[INFO] Running org.apache.phoenix.end2end.salted.SaltedTableIT
[INFO] Tests run: 8, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 13.798 s 
- in org.apache.phoenix.end2end.salted.SaltedTableIT
[INFO] Running org.apache.phoenix.end2end.salted.SaltedTableUpsertSelectIT
[INFO] Tests run: 6, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 26.112 s 
- in org.apache.phoenix.end2end.salted.SaltedTableUpsertSelectIT
[INFO] Running org.apache.phoenix.end2end.salted.SaltedTableVarLengthRowKeyIT
[INFO] Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 2.272 s 
- in org.apache.phoenix.end2end.salted.SaltedTableVarLengthRowKeyIT
[INFO] Running org.apache.phoenix.iterate.PhoenixQueryTimeoutIT
[INFO] Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 4.813 s 
- in org.apache.phoenix.iterate.PhoenixQueryTimeoutIT
[INFO] Running org.apache.phoenix.iterate.RoundRobinResultIteratorIT
[INFO] Tests run: 9, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 50.301 s 
- in org.apache.phoenix.iterate.RoundRobinResultIteratorIT
[INFO] Tests run: 15, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 165.574 
s - in org.apache.phoenix.end2end.join.SubqueryUsingSortMergeJoinIT
[INFO] Running org.apache.phoenix.replication.SystemCatalogWALEntryFilterIT
[INFO] Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.078 s 
- in

phoenix git commit: PHOENIX-4580 Upgrade to Tephra 0.14.0-incubating for HBase 2.0 support

2018-05-25 Thread ankit

Repository: phoenix
Updated Branches:
  refs/heads/5.x-HBase-2.0 e3257489c -> 824860ca7


PHOENIX-4580 Upgrade to Tephra 0.14.0-incubating for HBase 2.0 support


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

Branch: refs/heads/5.x-HBase-2.0
Commit: 824860ca7a9de83cbc2d2f257cd5dc9646ed97f9
Parents: e325748
Author: Ankit Singhal 
Authored: Fri May 25 00:39:50 2018 -0700
Committer: Ankit Singhal 
Committed: Fri May 25 00:39:50 2018 -0700

--
 phoenix-core/pom.xml|   2 +-
 .../org/apache/phoenix/end2end/BaseViewIT.java  |   3 +-
 .../end2end/index/GlobalImmutableTxIndexIT.java |   2 -
 .../end2end/index/GlobalMutableTxIndexIT.java   |   2 -
 .../phoenix/end2end/index/ImmutableIndexIT.java |   6 +-
 .../end2end/index/LocalImmutableTxIndexIT.java  |   2 -
 .../end2end/index/LocalMutableTxIndexIT.java|   2 -
 .../phoenix/end2end/index/MutableIndexIT.java   |  13 +-
 .../end2end/index/txn/MutableRollbackIT.java|   2 -
 .../phoenix/tx/FlappingTransactionIT.java   |   2 -
 .../phoenix/tx/ParameterizedTransactionIT.java  |   1 -
 .../org/apache/phoenix/tx/TxCheckpointIT.java   |   2 -
 .../transaction/TephraTransactionContext.java   |   1 +
 .../transaction/TransactionAwareHTable.java | 689 ---
 pom.xml |   4 +-
 15 files changed, 13 insertions(+), 720 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/824860ca/phoenix-core/pom.xml
--
diff --git a/phoenix-core/pom.xml b/phoenix-core/pom.xml
index a06e33c..24e34f3 100644
--- a/phoenix-core/pom.xml
+++ b/phoenix-core/pom.xml
@@ -221,7 +221,7 @@
 
 
   org.apache.tephra
-  tephra-hbase-compat-1.3
+  tephra-hbase-compat-2.0
 
   
 

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

http://git-wip-us.apache.org/repos/asf/phoenix/blob/824860ca/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/GlobalImmutableTxIndexIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/GlobalImmutableTxIndexIT.java
 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/GlobalImmutableTxIndexIT.java
index b5a2f6c..1ba498c 100644
--- 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/GlobalImmutableTxIndexIT.java
+++ 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/GlobalImmutableTxIndexIT.java
@@ -20,10 +20,8 @@ package org.apache.phoenix.end2end.index;
 import java.util.Arrays;
 import java.util.Collection;
 
-import org.junit.Ignore;
 import org.junit.runners.Parameterized.Parameters;
 
-@Ignore
 public class GlobalImmutableTxIndexIT extends BaseIndexIT {
 
 public GlobalImmutableTxIndexIT(boolean localIndex, boolean mutable, 
boolean transactional, boolean columnEncoded) {

http://git-wip-us.apache.org/repos/asf/phoenix/blob/824860ca/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/GlobalMutableTxIndexIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/GlobalMutableTxIndexIT.java
 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/GlobalMutableTxIndexIT.java
index 6e1f6bd..65ca2c5 100644
--- 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/GlobalMutableTxIndexIT.java
+++ 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/GlobalMutableTxIndexIT.java
@@ -20,10 +20,8 @@ package org.apache.phoenix.end2end.index;
 import java.util.Arrays;
 import

76 matches

Mail list logo