phoenix git commit: PHOENIX-2715 Query Log (addendum 2)

2018-05-24 Thread ankit 
Repository: phoenix
Updated Branches:
  refs/heads/master f04306112 -> 8d80d5a98


PHOENIX-2715 Query Log (addendum 2)


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

Branch: refs/heads/master
Commit: 8d80d5a987376dfde822ea60be93618682a45d9c
Parents: f043061
Author: Ankit Singhal 
Authored: Thu May 24 22:36:03 2018 -0700
Committer: Ankit Singhal 
Committed: Thu May 24 22:36:03 2018 -0700

--
 bin/hbase-site.xml | 4 
 1 file changed, 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/8d80d5a9/bin/hbase-site.xml
--
diff --git a/bin/hbase-site.xml b/bin/hbase-site.xml
index 2f360e2..0ab9fd8 100644
--- a/bin/hbase-site.xml
+++ b/bin/hbase-site.xml
@@ -24,8 +24,4 @@
 hbase.regionserver.wal.codec
 org.apache.hadoop.hbase.regionserver.wal.IndexedWALEditCodec
   
-  
-phoenix.log.level
-DEBUG
-

phoenix git commit: PHOENIX-2715 Query Log (addendum 2)

2018-05-24 Thread ankit 
Repository: phoenix
Updated Branches:
  refs/heads/4.x-HBase-1.3 f3e49f38e -> 81f887584


PHOENIX-2715 Query Log (addendum 2)


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

Branch: refs/heads/4.x-HBase-1.3
Commit: 81f887584e3e4c86e487e0c3ed8f4729b1283f1f
Parents: f3e49f3
Author: Ankit Singhal 
Authored: Thu May 24 22:35:16 2018 -0700
Committer: Ankit Singhal 
Committed: Thu May 24 22:35:16 2018 -0700

--
 bin/hbase-site.xml | 4 
 1 file changed, 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/81f88758/bin/hbase-site.xml
--
diff --git a/bin/hbase-site.xml b/bin/hbase-site.xml
index 2f360e2..0ab9fd8 100644
--- a/bin/hbase-site.xml
+++ b/bin/hbase-site.xml
@@ -24,8 +24,4 @@
 hbase.regionserver.wal.codec
 org.apache.hadoop.hbase.regionserver.wal.IndexedWALEditCodec
   
-  
-phoenix.log.level
-DEBUG
-

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

2018-05-24 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-4745 Update Tephra version to 0.14.0-incubating



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 | Master #2035

2018-05-24 Thread Apache Jenkins Server 
See 


Changes:

[jtaylor] PHOENIX-4745 Update Tephra version to 0.14.0-incubating

--
[...truncated 116.11 KB...]
[INFO] Running org.apache.phoenix.end2end.RegexpSplitFunctionIT
[INFO] Running org.apache.phoenix.end2end.RangeScanIT
[INFO] Tests run: 12, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 33.885 
s - in org.apache.phoenix.end2end.RegexpSplitFunctionIT
[INFO] Running org.apache.phoenix.end2end.RegexpSubstrFunctionIT
[INFO] Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 12.355 s 
- in org.apache.phoenix.end2end.RegexpSubstrFunctionIT
[INFO] Running org.apache.phoenix.end2end.ReverseFunctionIT
[INFO] Tests run: 5, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 26.175 s 
- in org.apache.phoenix.end2end.ReverseFunctionIT
[INFO] Running org.apache.phoenix.end2end.ReverseScanIT
[INFO] Tests run: 5, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 13.603 s 
- in org.apache.phoenix.end2end.ReverseScanIT
[INFO] Running org.apache.phoenix.end2end.RoundFloorCeilFuncIT
[INFO] Tests run: 42, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 268.447 
s - in org.apache.phoenix.end2end.QueryIT
[INFO] Tests run: 33, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 74.746 
s - in org.apache.phoenix.end2end.RoundFloorCeilFuncIT
[INFO] Running org.apache.phoenix.end2end.RowTimestampIT
[INFO] Running org.apache.phoenix.end2end.RowValueConstructorIT
[INFO] Tests run: 16, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 47.523 
s - in org.apache.phoenix.end2end.RowTimestampIT
[INFO] Running org.apache.phoenix.end2end.SequenceBulkAllocationIT
[INFO] Tests run: 56, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 15.45 s 
- in org.apache.phoenix.end2end.SequenceBulkAllocationIT
[INFO] Running org.apache.phoenix.end2end.SequenceIT
[INFO] Tests run: 55, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 37.4 s 
- in org.apache.phoenix.end2end.SequenceIT
[INFO] Running org.apache.phoenix.end2end.SerialIteratorsIT
[INFO] Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 2.269 s 
- in org.apache.phoenix.end2end.SerialIteratorsIT
[INFO] Running org.apache.phoenix.end2end.ServerExceptionIT
[INFO] Tests run: 47, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 125.036 
s - in org.apache.phoenix.end2end.RowValueConstructorIT
[INFO] Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 1.25 s - 
in org.apache.phoenix.end2end.ServerExceptionIT
[INFO] Running org.apache.phoenix.end2end.SetPropertyOnNonEncodedTableIT
[INFO] Running org.apache.phoenix.end2end.SetPropertyOnEncodedTableIT
[INFO] Tests run: 56, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 351.063 
s - in org.apache.phoenix.end2end.RangeScanIT
[INFO] Running org.apache.phoenix.end2end.SignFunctionEnd2EndIT
[INFO] Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 8.05 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: 26.213 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: 33.059 
s - in org.apache.phoenix.end2end.SkipScanQueryIT
[INFO] Running org.apache.phoenix.end2end.SortMergeJoinMoreIT
[INFO] Tests run: 6, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 41.822 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: 189.736 
s - in org.apache.phoenix.end2end.SetPropertyOnEncodedTableIT
[INFO] Running org.apache.phoenix.end2end.SpooledTmpFileDeleteIT
[INFO] Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 2.516 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.066 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.296 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: 9.092 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: 139.534 
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: 1.238 s 
- in org.apache.phoenix.end2end.StoreNullsPropIT
[INFO] Running org.apache.phoenix.end2end.StringIT
[INFO] Tests run: 15,

Build failed in Jenkins: Phoenix-4.x-HBase-1.3 #142

2018-05-24 Thread Apache Jenkins Server 
See 


Changes:

[jtaylor] PHOENIX-4745 Update Tephra version to 0.14.0-incubating

--
[...truncated 538.85 KB...]
[INFO] Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 14.018 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: 370.588 
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: 
80.891 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: 69.639 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.545 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: 382.249 
s - in org.apache.phoenix.end2end.index.LocalMutableTxIndexIT
[INFO] Running org.apache.phoenix.end2end.join.HashJoinLocalIndexIT
[INFO] Tests run: 8, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 53.537 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.288 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: 188.008 
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: 321.45 
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.705 
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: 588.129 
s - in org.apache.phoenix.end2end.join.HashJoinLocalIndexIT
[INFO] Tests run: 34, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 193.091 
s - in org.apache.phoenix.end2end.join.SortMergeJoinNoIndexIT
[INFO] Tests run: 34, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 334.504 
s - in org.apache.phoenix.end2end.join.SortMergeJoinGlobalIndexIT
[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.607 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: 29.611 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.247 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.692 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: 49.95 s 
- in org.apache.phoenix.iterate.RoundRobinResultIteratorIT
[INFO] Running org.apache.phoenix.replication.SystemCatalogWALEntryFilterIT
[INFO] Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.089 s 
- in org.apache.phoenix.replication.SystemCatalogWALEntryFilterIT
[INFO] Running org.apache.phoenix.rpc.UpdateCacheIT
[INFO] Tests run: 15, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 170.526 
s - in org.apache.phoenix.end2end.join.SubqueryUsingSortMergeJoinIT
[INFO] Tests run: 7, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 27.439 s 
- in org.apache.phoenix.rpc.UpdateCacheIT
[INFO] Running org.apache.phoenix.trace.PhoenixTracingEndToEndIT
[INFO] Running org.apache.phoenix.trace.PhoenixTableMetricsWriterIT
[INFO] Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 12.289 s 
- in org.apache.phoenix.trace.PhoenixTableMetricsWriterIT
[INFO] Running org.apache.phoenix.tx.FlappingTransactionIT
[INFO] Tests

phoenix git commit: PHOENIX-4745 Update Tephra version to 0.14.0-incubating

2018-05-24 Thread jamestaylor 
Repository: phoenix
Updated Branches:
  refs/heads/4.x-cdh5.11 574d8188a -> df2a7e698


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.11
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) 
{
+

phoenix git commit: PHOENIX-4745 Update Tephra version to 0.14.0-incubating

2018-05-24 Thread jamestaylor 
Repository: phoenix
Updated Branches:
  refs/heads/4.x-HBase-0.98 fa18c8f09 -> b0b5456ff


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/b0b5456f
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/b0b5456f
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/b0b5456f

Branch: refs/heads/4.x-HBase-0.98
Commit: b0b5456ff449c16fe750cc90248798dbf47e647d
Parents: fa18c8f
Author: James Taylor 
Authored: Thu May 24 16:10:52 2018 -0700
Committer: James Taylor 
Committed: Thu May 24 18:05:37 2018 -0700

--
 .../java/org/apache/phoenix/query/QueryServicesOptions.java | 5 -
 pom.xml | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/b0b5456f/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 08ec0a6..5cb66cf 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
@@ -110,6 +110,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;
 
 
 
@@ -419,7 +420,9 @@ public class QueryServicesOptions {
 .setIfUnset(USE_STATS_FOR_PARALLELIZATION, 
DEFAULT_USE_STATS_FOR_PARALLELIZATION)
 .setIfUnset(COST_BASED_OPTIMIZER_ENABLED, 
DEFAULT_COST_BASED_OPTIMIZER_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/b0b5456f/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 541a3c9..ab9895d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -102,7 +102,7 @@
 2.1.2
 1.10.0
 8.1.7.v20120910
-0.13.0-incubating
+0.14.0-incubating
 2.0.2
 2.11.8
 2.11

phoenix git commit: PHOENIX-4745 Update Tephra version to 0.14.0-incubating

2018-05-24 Thread jamestaylor 
Repository: phoenix
Updated Branches:
  refs/heads/4.x-HBase-1.1 327a183d0 -> 6a69a255c


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/6a69a255
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/6a69a255
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/6a69a255

Branch: refs/heads/4.x-HBase-1.1
Commit: 6a69a255c5eaf6edeb4cf4014d2e3046b30608a7
Parents: 327a183
Author: James Taylor 
Authored: Thu May 24 16:10:52 2018 -0700
Committer: James Taylor 
Committed: Thu May 24 18:02:28 2018 -0700

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


http://git-wip-us.apache.org/repos/asf/phoenix/blob/6a69a255/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 3b53c2a..2b1ac71 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
@@ -116,6 +116,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;
 
 
 
@@ -434,7 +435,9 @@ public class QueryServicesOptions {
 .setIfUnset(USE_STATS_FOR_PARALLELIZATION, 
DEFAULT_USE_STATS_FOR_PARALLELIZATION)
 .setIfUnset(COST_BASED_OPTIMIZER_ENABLED, 
DEFAULT_COST_BASED_OPTIMIZER_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/6a69a255/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..7db54eb 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,60 @@ 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) 
{
+

phoenix git commit: PHOENIX-4745 Update Tephra version to 0.14.0-incubating

2018-05-24 Thread jamestaylor 
Repository: phoenix
Updated Branches:
  refs/heads/4.x-HBase-1.2 f312db350 -> 629a9175b


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/629a9175
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/629a9175
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/629a9175

Branch: refs/heads/4.x-HBase-1.2
Commit: 629a9175b2c4a1e86b329a0c1829ec52883e7040
Parents: f312db3
Author: James Taylor 
Authored: Thu May 24 16:10:52 2018 -0700
Committer: James Taylor 
Committed: Thu May 24 17:45:51 2018 -0700

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


http://git-wip-us.apache.org/repos/asf/phoenix/blob/629a9175/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/629a9175/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..7db54eb 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,60 @@ 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) 
{
+

phoenix git commit: PHOENIX-4745 Update Tephra version to 0.14.0-incubating

2018-05-24 Thread jamestaylor 
Repository: phoenix
Updated Branches:
  refs/heads/4.x-HBase-1.3 eb62c2040 -> f3e49f38e


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/f3e49f38
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/f3e49f38
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/f3e49f38

Branch: refs/heads/4.x-HBase-1.3
Commit: f3e49f38e91a00d94e7142739ecfea7fa38dd841
Parents: eb62c20
Author: James Taylor 
Authored: Thu May 24 16:10:52 2018 -0700
Committer: James Taylor 
Committed: Thu May 24 16:52:53 2018 -0700

--
 .../java/org/apache/phoenix/query/QueryServicesOptions.java | 5 -
 pom.xml | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/f3e49f38/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/f3e49f38/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 95654b0..76726f4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -100,7 +100,7 @@
 2.1.2
 1.10.0
 8.1.7.v20120910
-0.13.0-incubating
+0.14.0-incubating
 2.0.2
 2.11.8
 2.11

phoenix git commit: PHOENIX-4745 Update Tephra version to 0.14.0-incubating

2018-05-24 Thread jamestaylor 
Repository: phoenix
Updated Branches:
  refs/heads/master ea9495192 -> f04306112


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/f0430611
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/f0430611
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/f0430611

Branch: refs/heads/master
Commit: f04306112aaee4e7da2d492df70826bb9f806464
Parents: ea94951
Author: James Taylor 
Authored: Thu May 24 16:10:52 2018 -0700
Committer: James Taylor 
Committed: Thu May 24 16:10:52 2018 -0700

--
 phoenix-core/pom.xml| 2 +-
 .../java/org/apache/phoenix/query/QueryServicesOptions.java | 5 -
 pom.xml | 4 ++--
 3 files changed, 7 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/f0430611/phoenix-core/pom.xml
--
diff --git a/phoenix-core/pom.xml b/phoenix-core/pom.xml
index a29fb01..2bb7293 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-1.4
 
   
 

http://git-wip-us.apache.org/repos/asf/phoenix/blob/f0430611/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/f0430611/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 38c1c41..8ba338c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -100,7 +100,7 @@
 2.1.2
 1.10.0
 8.1.7.v20120910
-0.13.0-incubating
+0.14.0-incubating
 2.0.2
 2.11.8
 2.11
@@ -787,7 +787,7 @@
   
   
 org.apache.tephra
-tephra-hbase-compat-1.3
+tephra-hbase-compat-1.4
 ${tephra.version}

phoenix git commit: PHOENIX-4723 Fix UpsertSelectOverlappingBatchesIT#testSplitDuringUpsertSelect test

2018-05-24 Thread ankit 
Repository: phoenix
Updated Branches:
  refs/heads/5.x-HBase-2.0 1b2c95094 -> e3257489c


PHOENIX-4723 Fix UpsertSelectOverlappingBatchesIT#testSplitDuringUpsertSelect 
test


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

Branch: refs/heads/5.x-HBase-2.0
Commit: e3257489c986bc2b17cb9a2595916b006c37ff88
Parents: 1b2c950
Author: Ankit Singhal 
Authored: Thu May 24 10:46:14 2018 -0700
Committer: Ankit Singhal 
Committed: Thu May 24 10:46:14 2018 -0700

--
 .../phoenix/execute/UpsertSelectOverlappingBatchesIT.java   | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/e3257489/phoenix-core/src/it/java/org/apache/phoenix/execute/UpsertSelectOverlappingBatchesIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/execute/UpsertSelectOverlappingBatchesIT.java
 
b/phoenix-core/src/it/java/org/apache/phoenix/execute/UpsertSelectOverlappingBatchesIT.java
index e0c8484..0759caa 100644
--- 
a/phoenix-core/src/it/java/org/apache/phoenix/execute/UpsertSelectOverlappingBatchesIT.java
+++ 
b/phoenix-core/src/it/java/org/apache/phoenix/execute/UpsertSelectOverlappingBatchesIT.java
@@ -43,6 +43,7 @@ import org.apache.hadoop.hbase.NotServingRegionException;
 import org.apache.hadoop.hbase.TableName;
 import org.apache.hadoop.hbase.Waiter;
 import org.apache.hadoop.hbase.client.Admin;
+import org.apache.hadoop.hbase.client.DoNotRetryRegionException;
 import org.apache.hadoop.hbase.client.Mutation;
 import org.apache.hadoop.hbase.client.RegionInfo;
 import org.apache.hadoop.hbase.coprocessor.ObserverContext;
@@ -227,10 +228,10 @@ public class UpsertSelectOverlappingBatchesIT extends 
BaseUniqueNamesOwnClusterI
 logger.info("Attempting to split region");
 admin.splitRegionAsync(hRegion.getRegionName(), 
Bytes.toBytes(2));
 return false;
-} catch (NotServingRegionException nsre) {
+} catch (NotServingRegionException | 
DoNotRetryRegionException re) {
 // during split
 return false;
-}
+} 
 }
 });
 } finally {

svn commit: r1832178 - in /phoenix/site: publish/language/ publish/phoenixcon-2018/ publish/phoenixcon-2018/img/speakers/ source/src/site/resources/phoenixcon-2018/ source/src/site/resources/phoenixco

2018-05-24 Thread elserj 
Author: elserj
Date: Thu May 24 14:52:09 2018
New Revision: 1832178

URL: http://svn.apache.org/viewvc?rev=1832178=rev
Log:
Add Ohad's headshot

Added:
phoenix/site/publish/phoenixcon-2018/img/speakers/OhadShacham.jpg   (with 
props)

phoenix/site/source/src/site/resources/phoenixcon-2018/img/speakers/OhadShacham.jpg
   (with props)
Modified:
phoenix/site/publish/language/datatypes.html
phoenix/site/publish/language/functions.html
phoenix/site/publish/language/index.html
phoenix/site/publish/phoenixcon-2018/feed.xml
phoenix/site/publish/phoenixcon-2018/index.html
phoenix/site/source/src/site/resources/phoenixcon-2018/feed.xml
phoenix/site/source/src/site/resources/phoenixcon-2018/index.html

Modified: phoenix/site/publish/language/datatypes.html
URL: 
http://svn.apache.org/viewvc/phoenix/site/publish/language/datatypes.html?rev=1832178=1832177=1832178=diff
==
--- phoenix/site/publish/language/datatypes.html (original)
+++ phoenix/site/publish/language/datatypes.html Thu May 24 14:52:09 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=1832178=1832177=1832178=diff
==
--- phoenix/site/publish/language/functions.html (original)
+++ phoenix/site/publish/language/functions.html Thu May 24 14:52:09 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=1832178=1832177=1832178=diff
==
--- phoenix/site/publish/language/index.html (original)
+++ phoenix/site/publish/language/index.html Thu May 24 14:52:09 2018
@@ -1,7 +1,7 @@
 
 
 
 

Modified: phoenix/site/publish/phoenixcon-2018/feed.xml
URL: 
http://svn.apache.org/viewvc/phoenix/site/publish/phoenixcon-2018/feed.xml?rev=1832178=1832177=1832178=diff
==
--- phoenix/site/publish/phoenixcon-2018/feed.xml (original)
+++ phoenix/site/publish/phoenixcon-2018/feed.xml Thu May 24 14:52:09 2018
@@ -4,7 +4,7 @@
   https://jekyllrb.com/; version="3.7.3">Jekyll
   https://phoenix.apache.org/phoenixcon-2018//phoenixcon-2018/feed.xml; 
rel="self" type="application/atom+xml" />
   https://phoenix.apache.org/phoenixcon-2018//phoenixcon-2018/; 
rel="alternate" type="text/html" />
-  2018-05-23T13:50:20-04:00
+  2018-05-24T10:46:27-04:00
   https://phoenix.apache.org/phoenixcon-2018//phoenixcon-2018/
 
   

Added: phoenix/site/publish/phoenixcon-2018/img/speakers/OhadShacham.jpg
URL: 
http://svn.apache.org/viewvc/phoenix/site/publish/phoenixcon-2018/img/speakers/OhadShacham.jpg?rev=1832178=auto
==
Binary file - no diff available.

Propchange: phoenix/site/publish/phoenixcon-2018/img/speakers/OhadShacham.jpg
--
svn:mime-type = application/octet-stream

Modified: phoenix/site/publish/phoenixcon-2018/index.html
URL: 
http://svn.apache.org/viewvc/phoenix/site/publish/phoenixcon-2018/index.html?rev=1832178=1832177=1832178=diff
==
--- phoenix/site/publish/phoenixcon-2018/index.html (original)
+++ phoenix/site/publish/phoenixcon-2018/index.html Thu May 24 14:52:09 2018
@@ -259,7 +259,7 @@

  

- 
+ 


  

Modified: phoenix/site/source/src/site/resources/phoenixcon-2018/feed.xml
URL: 
http://svn.apache.org/viewvc/phoenix/site/source/src/site/resources/phoenixcon-2018/feed.xml?rev=1832178=1832177=1832178=diff
==
--- phoenix/site/source/src/site/resources/phoenixcon-2018/feed.xml (original)
+++ phoenix/site/source/src/site/resources/phoenixcon-2018/feed.xml Thu May 24 
14:52:09 2018
@@ -4,7 +4,7 @@
   https://jekyllrb.com/; version="3.7.3">Jekyll
   https://phoenix.apache.org/phoenixcon-2018//phoenixcon-2018/feed.xml; 
rel="self" type="application/atom+xml" />
   https://phoenix.apache.org/phoenixcon-2018//phoenixcon-2018/; 
rel="alternate" type="text/html" />
-  2018-05-23T13:50:20-04:00
+  2018-05-24T10:46:27-04:00
   https://phoenix.apache.org/phoenixcon-2018//phoenixcon-2018/
 
   

Added: 
phoenix/site/source/src/site/resources/phoenixcon-2018/img/speakers/OhadShacham.jpg
URL: 
http://svn.apache.org/viewvc/phoenix/site/source/src/site/resources/phoenixcon-2018/img/speakers/OhadShacham.jpg?rev=1832178=auto
==
Binary file - no diff available.

Propchange:

phoenix git commit: PHOENIX-4671 Fix minor size accounting bug for MutationSize(Lars Hofhansl)

2018-05-24 Thread rajeshbabu 
Repository: phoenix
Updated Branches:
  refs/heads/5.x-HBase-2.0 09bd6983c -> 1b2c95094


PHOENIX-4671 Fix minor size accounting bug for MutationSize(Lars Hofhansl)


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

Branch: refs/heads/5.x-HBase-2.0
Commit: 1b2c95094701bf62e1f646ba33d070aba0ac3d94
Parents: 09bd698
Author: Rajeshbabu Chintaguntla 
Authored: Thu May 24 16:33:15 2018 +0530
Committer: Rajeshbabu Chintaguntla 
Committed: Thu May 24 16:33:15 2018 +0530

--
 .../end2end/UpsertSelectAutoCommitIT.java   | 28 
 .../apache/phoenix/execute/MutationState.java   |  1 +
 2 files changed, 29 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/1b2c9509/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpsertSelectAutoCommitIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpsertSelectAutoCommitIT.java
 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpsertSelectAutoCommitIT.java
index 6b781a0..38d48d6 100644
--- 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpsertSelectAutoCommitIT.java
+++ 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpsertSelectAutoCommitIT.java
@@ -23,15 +23,19 @@ import static 
org.apache.phoenix.util.TestUtil.TEST_PROPERTIES;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
 
 import java.sql.Connection;
 import java.sql.Date;
 import java.sql.DriverManager;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
+import java.sql.SQLException;
 import java.sql.Statement;
 import java.util.Properties;
 
+import org.apache.phoenix.exception.SQLExceptionCode;
+import org.apache.phoenix.jdbc.PhoenixConnection;
 import org.apache.phoenix.query.QueryServices;
 import org.apache.phoenix.util.PropertiesUtil;
 import org.junit.Test;
@@ -173,4 +177,28 @@ public class UpsertSelectAutoCommitIT extends 
ParallelStatsDisabledIT {
 conn.close();
 }
 
+@Test
+public void testMaxMutationSize() throws Exception {
+Properties connectionProperties = new Properties();
+
connectionProperties.setProperty(QueryServices.MAX_MUTATION_SIZE_ATTRIB, "3");
+
connectionProperties.setProperty(QueryServices.MAX_MUTATION_SIZE_BYTES_ATTRIB, 
"5");
+PhoenixConnection connection =
+(PhoenixConnection) DriverManager.getConnection(getUrl(), 
connectionProperties);
+connection.setAutoCommit(true);
+String fullTableName = generateUniqueName();
+try (Statement stmt = connection.createStatement()) {
+stmt.execute(
+"CREATE TABLE " + fullTableName + " (pk INTEGER PRIMARY 
KEY, v1 INTEGER, v2 INTEGER)");
+stmt.execute(
+"CREATE SEQUENCE " + fullTableName + "_seq cache 1000");
+stmt.execute("UPSERT INTO " + fullTableName + " VALUES (NEXT VALUE 
FOR " + fullTableName + "_seq, rand(), rand())");
+}
+try (Statement stmt = connection.createStatement()) {
+for (int i=0; i<16; i++) {
+stmt.execute("UPSERT INTO " + fullTableName + " SELECT NEXT 
VALUE FOR " + fullTableName + "_seq, rand(), rand() FROM " + fullTableName);
+}
+}
+connection.close();
+}
+
 }

http://git-wip-us.apache.org/repos/asf/phoenix/blob/1b2c9509/phoenix-core/src/main/java/org/apache/phoenix/execute/MutationState.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/execute/MutationState.java 
b/phoenix-core/src/main/java/org/apache/phoenix/execute/MutationState.java
index 1d95f08..1d662ab 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/execute/MutationState.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/execute/MutationState.java
@@ -1581,6 +1581,7 @@ public class MutationState implements SQLCloseable {
 
 public void clear(){
 rowKeyToRowMutationState.clear();
+estimatedSize = 0;
 }
 
 public Collection values() {

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

2018-05-24 Thread Apache Jenkins Server 
See 


--
[...truncated 37.15 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]