Build failed in Jenkins: Phoenix | Master #1166

2016-03-02 Thread Apache Jenkins Server 
See 

Changes:

[jtaylor] PHOENIX-2100 Indicate in explain plan when round robin iterator is 
being

--
[...truncated 564 lines...]
Tests run: 23, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 118.285 sec - 
in org.apache.phoenix.end2end.UpsertValuesIT
Tests run: 20, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 152.099 sec - 
in org.apache.phoenix.end2end.UpsertSelectIT

Results :

Tests run: 1399, Failures: 0, Errors: 0, Skipped: 1

[INFO] 
[INFO] --- maven-failsafe-plugin:2.19.1:integration-test 
(HBaseManagedTimeTests) @ phoenix-core ---

---
 T E S T S
---
Running org.apache.phoenix.end2end.ArrayAppendFunctionIT
Running org.apache.phoenix.end2end.AlterSessionIT
Running org.apache.phoenix.end2end.ArithmeticQueryIT
Running org.apache.phoenix.end2end.AbsFunctionEnd2EndIT
Running org.apache.phoenix.end2end.AlterTableWithViewsIT
Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 8.841 sec - in 
org.apache.phoenix.end2end.AlterSessionIT
Running org.apache.phoenix.end2end.ArrayConcatFunctionIT
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 6.665 sec - in 
org.apache.phoenix.end2end.AbsFunctionEnd2EndIT
Running org.apache.phoenix.end2end.ArrayFillFunctionIT
Tests run: 34, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 28.846 sec - 
in org.apache.phoenix.end2end.ArrayAppendFunctionIT
Running org.apache.phoenix.end2end.ArrayPrependFunctionIT
Tests run: 30, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 25.313 sec - 
in org.apache.phoenix.end2end.ArrayConcatFunctionIT
Running org.apache.phoenix.end2end.ArrayToStringFunctionIT
Tests run: 26, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 24.811 sec - 
in org.apache.phoenix.end2end.ArrayFillFunctionIT
Running org.apache.phoenix.end2end.ArraysWithNullsIT
Tests run: 34, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 31.546 sec - 
in org.apache.phoenix.end2end.ArrayPrependFunctionIT
Running org.apache.phoenix.end2end.AutoCommitIT
Tests run: 26, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 61.123 sec - 
in org.apache.phoenix.end2end.ArithmeticQueryIT
Running org.apache.phoenix.end2end.BinaryRowKeyIT
Tests run: 36, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 30.565 sec - 
in org.apache.phoenix.end2end.ArrayToStringFunctionIT
Running org.apache.phoenix.end2end.CSVCommonsLoaderIT
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 6.108 sec - in 
org.apache.phoenix.end2end.AutoCommitIT
Running org.apache.phoenix.end2end.CbrtFunctionEnd2EndIT
Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 8.629 sec - in 
org.apache.phoenix.end2end.BinaryRowKeyIT
Running org.apache.phoenix.end2end.CoalesceFunctionIT
Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 12.668 sec - in 
org.apache.phoenix.end2end.CbrtFunctionEnd2EndIT
Running org.apache.phoenix.end2end.ConvertTimezoneFunctionIT
Tests run: 7, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 9.336 sec - in 
org.apache.phoenix.end2end.ConvertTimezoneFunctionIT
Running org.apache.phoenix.end2end.DateTimeIT
Tests run: 10, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 24.846 sec - 
in org.apache.phoenix.end2end.CoalesceFunctionIT
Running org.apache.phoenix.end2end.DecodeFunctionIT
Tests run: 6, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 7.969 sec - in 
org.apache.phoenix.end2end.DecodeFunctionIT
Running org.apache.phoenix.end2end.DeleteIT
Tests run: 21, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 18.61 sec - in 
org.apache.phoenix.end2end.DateTimeIT
Running org.apache.phoenix.end2end.DisableLocalIndexIT
Tests run: 16, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 49.414 sec - 
in org.apache.phoenix.end2end.CSVCommonsLoaderIT
Running org.apache.phoenix.end2end.DynamicFamilyIT
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 12.236 sec - in 
org.apache.phoenix.end2end.DisableLocalIndexIT
Running org.apache.phoenix.end2end.EncodeFunctionIT
Tests run: 4, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 12.754 sec - in 
org.apache.phoenix.end2end.DynamicFamilyIT
Running org.apache.phoenix.end2end.EvaluationOfORIT
Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 7.227 sec - in 
org.apache.phoenix.end2end.EvaluationOfORIT
Running org.apache.phoenix.end2end.ExecuteStatementsIT
Tests run: 6, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 20.382 sec - in 
org.apache.phoenix.end2end.EncodeFunctionIT
Running org.apache.phoenix.end2end.ExpFunctionEnd2EndIT
Tests run: 16, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 107.034 sec - 
in org.apache.phoenix.end2end.ArraysWithNullsIT
Running org.apache.phoenix.end2end.FirstValueFunctionIT
Tests run: 7, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 8.415 sec - in 
org.apache.phoenix.end2end.FirstValueFunctionIT
Running

Jenkins build is back to normal : Phoenix | 4.x-HBase-0.98 #1093

2016-03-02 Thread Apache Jenkins Server 
See

svn commit: r12600 - in /dev/phoenix: phoenix-4.7.0-HBase-0.98-rc5/bin/ phoenix-4.7.0-HBase-0.98-rc5/src/ phoenix-4.7.0-HBase-1.0-rc5/bin/ phoenix-4.7.0-HBase-1.0-rc5/src/ phoenix-4.7.0-HBase-1.1-rc5/

2016-03-02 Thread mujtaba 
Author: mujtaba
Date: Thu Mar  3 01:07:14 2016
New Revision: 12600

Log:
Phoenix 4.7.0-RC5

Modified:

dev/phoenix/phoenix-4.7.0-HBase-0.98-rc5/bin/phoenix-4.7.0-HBase-0.98-bin.tar.gz

dev/phoenix/phoenix-4.7.0-HBase-0.98-rc5/bin/phoenix-4.7.0-HBase-0.98-bin.tar.gz.asc

dev/phoenix/phoenix-4.7.0-HBase-0.98-rc5/bin/phoenix-4.7.0-HBase-0.98-bin.tar.gz.md5

dev/phoenix/phoenix-4.7.0-HBase-0.98-rc5/bin/phoenix-4.7.0-HBase-0.98-bin.tar.gz.sha

dev/phoenix/phoenix-4.7.0-HBase-0.98-rc5/src/phoenix-4.7.0-HBase-0.98-src.tar.gz

dev/phoenix/phoenix-4.7.0-HBase-0.98-rc5/src/phoenix-4.7.0-HBase-0.98-src.tar.gz.asc

dev/phoenix/phoenix-4.7.0-HBase-0.98-rc5/src/phoenix-4.7.0-HBase-0.98-src.tar.gz.md5

dev/phoenix/phoenix-4.7.0-HBase-0.98-rc5/src/phoenix-4.7.0-HBase-0.98-src.tar.gz.sha

dev/phoenix/phoenix-4.7.0-HBase-1.0-rc5/bin/phoenix-4.7.0-HBase-1.0-bin.tar.gz

dev/phoenix/phoenix-4.7.0-HBase-1.0-rc5/bin/phoenix-4.7.0-HBase-1.0-bin.tar.gz.asc

dev/phoenix/phoenix-4.7.0-HBase-1.0-rc5/bin/phoenix-4.7.0-HBase-1.0-bin.tar.gz.md5

dev/phoenix/phoenix-4.7.0-HBase-1.0-rc5/bin/phoenix-4.7.0-HBase-1.0-bin.tar.gz.sha

dev/phoenix/phoenix-4.7.0-HBase-1.0-rc5/src/phoenix-4.7.0-HBase-1.0-src.tar.gz

dev/phoenix/phoenix-4.7.0-HBase-1.0-rc5/src/phoenix-4.7.0-HBase-1.0-src.tar.gz.asc

dev/phoenix/phoenix-4.7.0-HBase-1.0-rc5/src/phoenix-4.7.0-HBase-1.0-src.tar.gz.md5

dev/phoenix/phoenix-4.7.0-HBase-1.0-rc5/src/phoenix-4.7.0-HBase-1.0-src.tar.gz.sha

dev/phoenix/phoenix-4.7.0-HBase-1.1-rc5/bin/phoenix-4.7.0-HBase-1.1-bin.tar.gz

dev/phoenix/phoenix-4.7.0-HBase-1.1-rc5/bin/phoenix-4.7.0-HBase-1.1-bin.tar.gz.asc

dev/phoenix/phoenix-4.7.0-HBase-1.1-rc5/bin/phoenix-4.7.0-HBase-1.1-bin.tar.gz.md5

dev/phoenix/phoenix-4.7.0-HBase-1.1-rc5/bin/phoenix-4.7.0-HBase-1.1-bin.tar.gz.sha

dev/phoenix/phoenix-4.7.0-HBase-1.1-rc5/src/phoenix-4.7.0-HBase-1.1-src.tar.gz

dev/phoenix/phoenix-4.7.0-HBase-1.1-rc5/src/phoenix-4.7.0-HBase-1.1-src.tar.gz.asc

dev/phoenix/phoenix-4.7.0-HBase-1.1-rc5/src/phoenix-4.7.0-HBase-1.1-src.tar.gz.md5

dev/phoenix/phoenix-4.7.0-HBase-1.1-rc5/src/phoenix-4.7.0-HBase-1.1-src.tar.gz.sha

Modified: 
dev/phoenix/phoenix-4.7.0-HBase-0.98-rc5/bin/phoenix-4.7.0-HBase-0.98-bin.tar.gz
==
Binary files - no diff available.

Modified: 
dev/phoenix/phoenix-4.7.0-HBase-0.98-rc5/bin/phoenix-4.7.0-HBase-0.98-bin.tar.gz.asc
==
--- 
dev/phoenix/phoenix-4.7.0-HBase-0.98-rc5/bin/phoenix-4.7.0-HBase-0.98-bin.tar.gz.asc
 (original)
+++ 
dev/phoenix/phoenix-4.7.0-HBase-0.98-rc5/bin/phoenix-4.7.0-HBase-0.98-bin.tar.gz.asc
 Thu Mar  3 01:07:14 2016
@@ -1,17 +1,17 @@
 -BEGIN PGP SIGNATURE-
 Version: GnuPG v1.4.11 (GNU/Linux)
 
-iQIcBAABAgAGBQJW12ZOAAoJEDv8s5KUYReO6/cQALLm9/+7zX0bgZM55P9Ywl/I
-T/gALnGMn4cDYE9TjJQ1KcUOngZ6rn2FWaPHOst+dG6paAPC5N/w2cN/e+ULMnS1
-P7BNMc17UHbWVx0l9ATBbmRTOBz3gd9dNHfD6+Nd8UzRr4VBvnwrsFu9cV2rgUuU
-3A9jZpMrvhLEu00kMUAcKqj+M3nZj7O29EKMxGv4MIWP6liOMdnKA1PztzfPCm7f
-JsHvuG1svc/3Cs84IZL92+G5aGky13mSB4LJRTAMQfvPNIwYx1C+xT9A6gnu1d+y
-X1gratdau1l6Y1H+KGDFXhy69Ll1Y9VwQs0j9lj5xsRbxSVW2zVvoVesa21/io7v
-+0wCgbSQ+FmL+wpv25PtUZe3ZEuQ7ptkYMVqAt0j6Gml+k8hve/Qx9QgyqrWwcdj
-rQ3UeZiv+5bQyuC83t6lzp4ufFp1VAOP3f+BqaFrxzBlySEjM6PEXsyHUApA0qUr
-ZOp72rcjyxm5+fetxhWEG/YjRaEPjEgEwxOg46e8feVpi6TPr/ovihTbH40KBePZ
-iZZSDcR9MnKUySJyxYbXNgGoZA0zJx2cX8iQXnmAt60Fwgm68EJLqN1DVFpXORom
-HT0j5hmHRxIaA4Z/NKh4O3/Ns08B8FGyBfOPIICbhwd3ANwOQJpTSaTkrpbAPLxD
-EHUXvC12k2G1+6WeXS25
-=q99X
+iQIcBAABAgAGBQJW14xSAAoJEDv8s5KUYReORU0QAK/Yj3N4sxva4HUR1NXUgvw1
+lUSxQplbZBprzLTyterTvcNsutSHTHhhX+AtocmJOgXN/VKZHet+J85ug/BOxXXs
+VsPBJf/Vr9H1ZMZKDptY6x64HtOff+fJ6ArdVHbOHErxibt9Iz2EO4LVXFi83Kn4
+q1ftUnPmPvaIziabqQQESEGyFCU47Ve6vFX57LwjP3UhKT//HjDfq/p2DVj8lpU2
+TUut4T6LsFARUjeZl0W/ZrYI22IEJ6H4EEdsXcVHWXon0HsrytASqW5u7uL4Bf+f
+klErh5w5u7j28fgBaBDvA243a+t8vUa4MUFVTvMSVQ43b1yu3gnk7FVaAwY0igi9
+ZpjN9RhIvZI8yLCZOayUNDmzb2Z5qC6KwD799KZDwgv4BQeYoNq3mBn7QCqc7+O9
+1wPir/nDnryXNGEV/alFjwaBcFvJqOTj7XeLwUkZewjB/qz6yoy+OOuMriGZEKTq
+bvCib06PPngap3ARSN5IdxqXONR7YeRPxoOT/6DbEdS16Zk9d7Di+Q/gss70D1z5
+7u7xAJU8JqWWf6vQvHTUQyg/i5uPDk93IxTHdAChHwOk8oPuTdRpVdCwTI1L40kD
+t/AZ4BhaOUYZdPlF/3TTogvy6ZaMdvwS5LthZsUSKNEIgE1s6/dZazIC/uVITzZu
+gQ3WW4f7oHdg44xP+pj0
+=FC7L
 -END PGP SIGNATURE-

Modified: 
dev/phoenix/phoenix-4.7.0-HBase-0.98-rc5/bin/phoenix-4.7.0-HBase-0.98-bin.tar.gz.md5
==
--- 
dev/phoenix/phoenix-4.7.0-HBase-0.98-rc5/bin/phoenix-4.7.0-HBase-0.98-bin.tar.gz.md5
 (original)
+++ 
dev/phoenix/phoenix-4.7.0-HBase-0.98-rc5/bin/phoenix-4.7.0-HBase-0.98-bin.tar.gz.md5
 Thu Mar  3 01:07:14 2016
@@ -1 +1 @@
-d38e6a092b9e1ed655cf10746c98e9fd *phoenix-4.7.0-HBase-0.98-bin.tar.gz
+261b16175d4b714ed3d471d0f5abd472 *phoenix-4.7.0-HBase-0.98-bin.tar.gz

Modified:

[phoenix] Git Push Summary

2016-03-02 Thread mujtaba 
Repository: phoenix
Updated Tags:  refs/tags/v4.7.0-HBase-1.1-rc5 [created] 29989a51d

[phoenix] Git Push Summary

2016-03-02 Thread mujtaba 
Repository: phoenix
Updated Tags:  refs/tags/v4.7.0-HBase-1.0-rc5 [created] ef18a0f1a

Build failed in Jenkins: Phoenix | Master #1165

2016-03-02 Thread Apache Jenkins Server 
See 

Changes:

[jtaylor] PHOENIX-2728 Remove usage of usage of

[jtaylor] PHOENIX-1973 Improve CsvBulkLoadTool performance by moving keyvalue

[jtaylor] PHOENIX-2731 Ensure upgrade from 4.7.0 RCx to 4.7.0 RC5 works

[samarth] PHOENIX-2100 Indicate in explain plan when round robin iterator is

[jtaylor] PHOENIX-2733 Minor cleanup for improvements to CSV Bulk Loader

--
[...truncated 2017 lines...]
Tests run: 1, Failures: 0, Errors: 1, Skipped: 0, Time elapsed: 0.006 sec <<< 
FAILURE! - in org.apache.phoenix.end2end.index.ImmutableIndexWithStatsIT
org.apache.phoenix.end2end.index.ImmutableIndexWithStatsIT  Time elapsed: 0.006 
sec  <<< ERROR!
java.lang.RuntimeException: java.io.IOException: Shutting down
at 
org.apache.phoenix.end2end.index.ImmutableIndexWithStatsIT.doSetup(ImmutableIndexWithStatsIT.java:52)
Caused by: java.io.IOException: Shutting down
at 
org.apache.phoenix.end2end.index.ImmutableIndexWithStatsIT.doSetup(ImmutableIndexWithStatsIT.java:52)
Caused by: java.lang.RuntimeException: Master not initialized after 20ms 
seconds
at 
org.apache.phoenix.end2end.index.ImmutableIndexWithStatsIT.doSetup(ImmutableIndexWithStatsIT.java:52)

Running org.apache.phoenix.end2end.index.MutableIndexFailureIT
Running org.apache.phoenix.end2end.index.MutableIndexReplicationIT
Tests run: 1, Failures: 0, Errors: 1, Skipped: 0, Time elapsed: 0.004 sec <<< 
FAILURE! - in org.apache.phoenix.end2end.index.MutableIndexReplicationIT
org.apache.phoenix.end2end.index.MutableIndexReplicationIT  Time elapsed: 0.003 
sec  <<< ERROR!
java.io.IOException: Shutting down
at 
org.apache.phoenix.end2end.index.MutableIndexReplicationIT.setupConfigsAndStartCluster(MutableIndexReplicationIT.java:170)
at 
org.apache.phoenix.end2end.index.MutableIndexReplicationIT.setUpBeforeClass(MutableIndexReplicationIT.java:108)
Caused by: java.lang.RuntimeException: Master not initialized after 20ms 
seconds
at 
org.apache.phoenix.end2end.index.MutableIndexReplicationIT.setupConfigsAndStartCluster(MutableIndexReplicationIT.java:170)
at 
org.apache.phoenix.end2end.index.MutableIndexReplicationIT.setUpBeforeClass(MutableIndexReplicationIT.java:108)

Tests run: 1, Failures: 0, Errors: 1, Skipped: 0, Time elapsed: 0.006 sec <<< 
FAILURE! - in org.apache.phoenix.end2end.index.MutableIndexFailureIT
org.apache.phoenix.end2end.index.MutableIndexFailureIT  Time elapsed: 0.005 sec 
 <<< ERROR!
java.lang.RuntimeException: java.io.IOException: Shutting down
at 
org.apache.phoenix.end2end.index.MutableIndexFailureIT.doSetup(MutableIndexFailureIT.java:108)
Caused by: java.io.IOException: Shutting down
at 
org.apache.phoenix.end2end.index.MutableIndexFailureIT.doSetup(MutableIndexFailureIT.java:108)
Caused by: java.lang.RuntimeException: Master not initialized after 20ms 
seconds
at 
org.apache.phoenix.end2end.index.MutableIndexFailureIT.doSetup(MutableIndexFailureIT.java:108)

Running org.apache.phoenix.end2end.index.ReadOnlyIndexFailureIT
Running org.apache.phoenix.hbase.index.FailForUnsupportedHBaseVersionsIT
Tests run: 1, Failures: 0, Errors: 1, Skipped: 0, Time elapsed: 0.004 sec <<< 
FAILURE! - in org.apache.phoenix.end2end.index.ReadOnlyIndexFailureIT
org.apache.phoenix.end2end.index.ReadOnlyIndexFailureIT  Time elapsed: 0.003 
sec  <<< ERROR!
java.lang.RuntimeException: java.io.IOException: Shutting down
at 
org.apache.phoenix.end2end.index.ReadOnlyIndexFailureIT.doSetup(ReadOnlyIndexFailureIT.java:116)
Caused by: java.io.IOException: Shutting down
at 
org.apache.phoenix.end2end.index.ReadOnlyIndexFailureIT.doSetup(ReadOnlyIndexFailureIT.java:116)
Caused by: java.lang.RuntimeException: Master not initialized after 20ms 
seconds
at 
org.apache.phoenix.end2end.index.ReadOnlyIndexFailureIT.doSetup(ReadOnlyIndexFailureIT.java:116)

Running org.apache.phoenix.end2end.index.txn.TxWriteFailureIT
Tests run: 1, Failures: 0, Errors: 1, Skipped: 0, Time elapsed: 0.003 sec <<< 
FAILURE! - in org.apache.phoenix.end2end.index.txn.TxWriteFailureIT
org.apache.phoenix.end2end.index.txn.TxWriteFailureIT  Time elapsed: 0.003 sec  
<<< ERROR!
java.lang.RuntimeException: java.io.IOException: Shutting down
at 
org.apache.phoenix.end2end.index.txn.TxWriteFailureIT.doSetup(TxWriteFailureIT.java:86)
Caused by: java.io.IOException: Shutting down
at 
org.apache.phoenix.end2end.index.txn.TxWriteFailureIT.doSetup(TxWriteFailureIT.java:86)
Caused by: java.lang.RuntimeException: Master not initialized after 20ms 
seconds
at 
org.apache.phoenix.end2end.index.txn.TxWriteFailureIT.doSetup(TxWriteFailureIT.java:86)

Running org.apache.phoenix.execute.PartialCommitIT
Tests run: 1, Failures: 0, Errors: 1, Skipped: 0, Time elapsed: 0.004 sec <<< 
FAILURE! - in org.apache.phoenix.execute.PartialCommitIT
org.apache.phoenix.execute.PartialCommitIT

[phoenix] Git Push Summary

2016-03-02 Thread mujtaba 
Repository: phoenix
Updated Tags:  refs/tags/v4.7.0-HBase-1.0-rc5 [deleted] 8853ece36

[phoenix] Git Push Summary

2016-03-02 Thread mujtaba 
Repository: phoenix
Updated Tags:  refs/tags/v4.7.0-HBase-0.98-rc5 [deleted] ffbc9a29f

[phoenix] Git Push Summary

2016-03-02 Thread mujtaba 
Repository: phoenix
Updated Tags:  refs/tags/v4.7.0-HBase-1.1-rc5 [created] fc8436d17

phoenix git commit: PHOENIX-2733 Minor cleanup for improvements to CSV Bulk Loader performance (Sergey Soldatov)

2016-03-02 Thread jamestaylor 
Repository: phoenix
Updated Branches:
  refs/heads/4.x-HBase-1.0 3877b9db0 -> a68295384


PHOENIX-2733 Minor cleanup for improvements to CSV Bulk Loader performance 
(Sergey Soldatov)


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

Branch: refs/heads/4.x-HBase-1.0
Commit: a6829538466aee1227c7ad8f8d44eb94e709e41c
Parents: 3877b9d
Author: James Taylor 
Authored: Wed Mar 2 13:54:05 2016 -0800
Committer: James Taylor 
Committed: Wed Mar 2 13:57:49 2016 -0800

--
 .../phoenix/mapreduce/AbstractBulkLoadTool.java |  12 +-
 .../phoenix/mapreduce/CsvToKeyValueMapper.java  |   2 +-
 .../mapreduce/FormatToBytesWritableMapper.java  | 385 +++
 .../mapreduce/FormatToKeyValueMapper.java   | 378 --
 .../mapreduce/FormatToKeyValueReducer.java  |  28 +-
 .../phoenix/mapreduce/JsonToKeyValueMapper.java |   2 +-
 .../bulkload/TargetTableRefFunctions.java   |   2 +-
 .../util/PhoenixConfigurationUtil.java  |   4 +-
 .../FormatToBytesWritableMapperTest.java| 102 +
 .../mapreduce/FormatToKeyValueMapperTest.java   | 102 -
 10 files changed, 516 insertions(+), 501 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/a6829538/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/AbstractBulkLoadTool.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/AbstractBulkLoadTool.java
 
b/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/AbstractBulkLoadTool.java
index ab2848f..ff73530 100644
--- 
a/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/AbstractBulkLoadTool.java
+++ 
b/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/AbstractBulkLoadTool.java
@@ -209,10 +209,10 @@ public abstract class AbstractBulkLoadTool extends 
Configured implements Tool {
 List importColumns = buildImportColumns(conn, cmdLine, 
qualifiedTableName);
 Preconditions.checkNotNull(importColumns);
 Preconditions.checkArgument(!importColumns.isEmpty(), "Column info 
list is empty");
-FormatToKeyValueMapper.configureColumnInfoList(conf, importColumns);
+FormatToBytesWritableMapper.configureColumnInfoList(conf, 
importColumns);
 boolean ignoreInvalidRows = 
cmdLine.hasOption(IGNORE_ERRORS_OPT.getOpt());
-conf.setBoolean(FormatToKeyValueMapper.IGNORE_INVALID_ROW_CONFKEY, 
ignoreInvalidRows);
-conf.set(FormatToKeyValueMapper.TABLE_NAME_CONFKEY, 
qualifiedTableName);
+
conf.setBoolean(FormatToBytesWritableMapper.IGNORE_INVALID_ROW_CONFKEY, 
ignoreInvalidRows);
+conf.set(FormatToBytesWritableMapper.TABLE_NAME_CONFKEY, 
qualifiedTableName);
 
 // give subclasses their hook
 configureOptions(cmdLine, importColumns, conf);
@@ -277,10 +277,10 @@ public abstract class AbstractBulkLoadTool extends 
Configured implements Tool {
 MultiHfileOutputFormat.configureIncrementalLoad(job, tablesToBeLoaded);
 
 final String tableNamesAsJson = 
TargetTableRefFunctions.NAMES_TO_JSON.apply(tablesToBeLoaded);
-final String logicalNamesAsJson = 
TargetTableRefFunctions.LOGICAN_NAMES_TO_JSON.apply(tablesToBeLoaded);
+final String logicalNamesAsJson = 
TargetTableRefFunctions.LOGICAL_NAMES_TO_JSON.apply(tablesToBeLoaded);
 
-
job.getConfiguration().set(FormatToKeyValueMapper.TABLE_NAMES_CONFKEY,tableNamesAsJson);
-
job.getConfiguration().set(FormatToKeyValueMapper.LOGICAL_NAMES_CONFKEY,logicalNamesAsJson);
+
job.getConfiguration().set(FormatToBytesWritableMapper.TABLE_NAMES_CONFKEY,tableNamesAsJson);
+
job.getConfiguration().set(FormatToBytesWritableMapper.LOGICAL_NAMES_CONFKEY,logicalNamesAsJson);
 
 // give subclasses their hook
 setupJob(job);

http://git-wip-us.apache.org/repos/asf/phoenix/blob/a6829538/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/CsvToKeyValueMapper.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/CsvToKeyValueMapper.java
 
b/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/CsvToKeyValueMapper.java
index 2cb1ac7..e5a6e5b 100644
--- 
a/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/CsvToKeyValueMapper.java
+++ 
b/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/CsvToKeyValueMapper.java
@@ -41,7 +41,7 @@ import com.google.common.collect.Iterables;
  * extracting the created KeyValues and rolling back the statement execution 
before it is
  * committed to HBase.
  */
-public

phoenix git commit: PHOENIX-2733 Minor cleanup for improvements to CSV Bulk Loader performance (Sergey Soldatov)

2016-03-02 Thread jamestaylor 
Repository: phoenix
Updated Branches:
  refs/heads/4.x-HBase-0.98 34baf80db -> d03a96f57


PHOENIX-2733 Minor cleanup for improvements to CSV Bulk Loader performance 
(Sergey Soldatov)


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

Branch: refs/heads/4.x-HBase-0.98
Commit: d03a96f5766d54faf8e45326023b6d8d04cf285c
Parents: 34baf80
Author: James Taylor 
Authored: Wed Mar 2 13:54:05 2016 -0800
Committer: James Taylor 
Committed: Wed Mar 2 13:55:44 2016 -0800

--
 .../phoenix/mapreduce/AbstractBulkLoadTool.java |  12 +-
 .../phoenix/mapreduce/CsvToKeyValueMapper.java  |   2 +-
 .../mapreduce/FormatToBytesWritableMapper.java  | 385 +++
 .../mapreduce/FormatToKeyValueMapper.java   | 378 --
 .../mapreduce/FormatToKeyValueReducer.java  |  28 +-
 .../phoenix/mapreduce/JsonToKeyValueMapper.java |   2 +-
 .../bulkload/TargetTableRefFunctions.java   |   2 +-
 .../util/PhoenixConfigurationUtil.java  |   4 +-
 .../FormatToBytesWritableMapperTest.java| 102 +
 .../mapreduce/FormatToKeyValueMapperTest.java   | 102 -
 10 files changed, 516 insertions(+), 501 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/d03a96f5/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/AbstractBulkLoadTool.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/AbstractBulkLoadTool.java
 
b/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/AbstractBulkLoadTool.java
index ab2848f..ff73530 100644
--- 
a/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/AbstractBulkLoadTool.java
+++ 
b/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/AbstractBulkLoadTool.java
@@ -209,10 +209,10 @@ public abstract class AbstractBulkLoadTool extends 
Configured implements Tool {
 List importColumns = buildImportColumns(conn, cmdLine, 
qualifiedTableName);
 Preconditions.checkNotNull(importColumns);
 Preconditions.checkArgument(!importColumns.isEmpty(), "Column info 
list is empty");
-FormatToKeyValueMapper.configureColumnInfoList(conf, importColumns);
+FormatToBytesWritableMapper.configureColumnInfoList(conf, 
importColumns);
 boolean ignoreInvalidRows = 
cmdLine.hasOption(IGNORE_ERRORS_OPT.getOpt());
-conf.setBoolean(FormatToKeyValueMapper.IGNORE_INVALID_ROW_CONFKEY, 
ignoreInvalidRows);
-conf.set(FormatToKeyValueMapper.TABLE_NAME_CONFKEY, 
qualifiedTableName);
+
conf.setBoolean(FormatToBytesWritableMapper.IGNORE_INVALID_ROW_CONFKEY, 
ignoreInvalidRows);
+conf.set(FormatToBytesWritableMapper.TABLE_NAME_CONFKEY, 
qualifiedTableName);
 
 // give subclasses their hook
 configureOptions(cmdLine, importColumns, conf);
@@ -277,10 +277,10 @@ public abstract class AbstractBulkLoadTool extends 
Configured implements Tool {
 MultiHfileOutputFormat.configureIncrementalLoad(job, tablesToBeLoaded);
 
 final String tableNamesAsJson = 
TargetTableRefFunctions.NAMES_TO_JSON.apply(tablesToBeLoaded);
-final String logicalNamesAsJson = 
TargetTableRefFunctions.LOGICAN_NAMES_TO_JSON.apply(tablesToBeLoaded);
+final String logicalNamesAsJson = 
TargetTableRefFunctions.LOGICAL_NAMES_TO_JSON.apply(tablesToBeLoaded);
 
-
job.getConfiguration().set(FormatToKeyValueMapper.TABLE_NAMES_CONFKEY,tableNamesAsJson);
-
job.getConfiguration().set(FormatToKeyValueMapper.LOGICAL_NAMES_CONFKEY,logicalNamesAsJson);
+
job.getConfiguration().set(FormatToBytesWritableMapper.TABLE_NAMES_CONFKEY,tableNamesAsJson);
+
job.getConfiguration().set(FormatToBytesWritableMapper.LOGICAL_NAMES_CONFKEY,logicalNamesAsJson);
 
 // give subclasses their hook
 setupJob(job);

http://git-wip-us.apache.org/repos/asf/phoenix/blob/d03a96f5/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/CsvToKeyValueMapper.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/CsvToKeyValueMapper.java
 
b/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/CsvToKeyValueMapper.java
index 2cb1ac7..e5a6e5b 100644
--- 
a/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/CsvToKeyValueMapper.java
+++ 
b/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/CsvToKeyValueMapper.java
@@ -41,7 +41,7 @@ import com.google.common.collect.Iterables;
  * extracting the created KeyValues and rolling back the statement execution 
before it is
  * committed to HBase.
  */
-public

Build failed in Jenkins: Phoenix | Master #1164

2016-03-02 Thread Apache Jenkins Server 
See 

Changes:

[samarth] PHOENIX-2732 Update HBase versions in pom

--
[...truncated 5850 lines...]
Tests run: 119, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 97.659 sec - 
in org.apache.phoenix.end2end.ScanQueryIT
Running org.apache.phoenix.end2end.ToCharFunctionIT
Tests run: 17, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 123.913 sec - 
in org.apache.phoenix.end2end.QueryDatabaseMetaDataIT
Running org.apache.phoenix.end2end.ToNumberFunctionIT
Tests run: 53, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 54.007 sec - 
in org.apache.phoenix.end2end.SequenceIT
Running org.apache.phoenix.end2end.TopNIT
Tests run: 10, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 8.542 sec - in 
org.apache.phoenix.end2end.ToCharFunctionIT
Running org.apache.phoenix.end2end.TruncateFunctionIT
Tests run: 18, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 9.438 sec - in 
org.apache.phoenix.end2end.ToNumberFunctionIT
Running org.apache.phoenix.end2end.UnnestArrayIT
Tests run: 1, Failures: 0, Errors: 0, Skipped: 1, Time elapsed: 0.002 sec - in 
org.apache.phoenix.end2end.UnnestArrayIT
Running org.apache.phoenix.end2end.UpsertSelectIT
Tests run: 4, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 7.017 sec - in 
org.apache.phoenix.end2end.TopNIT
Running org.apache.phoenix.end2end.UpsertValuesIT
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 6.255 sec - in 
org.apache.phoenix.end2end.TruncateFunctionIT
Running org.apache.phoenix.end2end.VariableLengthPKIT
Tests run: 7, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 39.463 sec - in 
org.apache.phoenix.end2end.SpooledOrderByIT
Running org.apache.phoenix.end2end.salted.SaltedTableIT
Tests run: 45, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 133.015 sec - 
in org.apache.phoenix.end2end.RowValueConstructorIT
Running org.apache.phoenix.rpc.UpdateCacheWithScnIT
Tests run: 8, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 7.674 sec - in 
org.apache.phoenix.end2end.salted.SaltedTableIT
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 6.475 sec - in 
org.apache.phoenix.rpc.UpdateCacheWithScnIT
Tests run: 50, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 58.281 sec - 
in org.apache.phoenix.end2end.VariableLengthPKIT
Tests run: 23, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 121.089 sec - 
in org.apache.phoenix.end2end.UpsertValuesIT
Tests run: 20, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 147.44 sec - 
in org.apache.phoenix.end2end.UpsertSelectIT

Results :

Tests run: 1399, Failures: 0, Errors: 0, Skipped: 1

[INFO] 
[INFO] --- maven-failsafe-plugin:2.19.1:integration-test 
(HBaseManagedTimeTests) @ phoenix-core ---

---
 T E S T S
---
Running org.apache.phoenix.end2end.AlterSessionIT
Running org.apache.phoenix.end2end.ArrayAppendFunctionIT
Running org.apache.phoenix.end2end.AbsFunctionEnd2EndIT
Running org.apache.phoenix.end2end.ArithmeticQueryIT
Running org.apache.phoenix.end2end.AlterTableWithViewsIT
Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 9.755 sec - in 
org.apache.phoenix.end2end.AlterSessionIT
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 7.713 sec - in 
org.apache.phoenix.end2end.AbsFunctionEnd2EndIT
Running org.apache.phoenix.end2end.ArrayConcatFunctionIT
Running org.apache.phoenix.end2end.ArrayFillFunctionIT
Tests run: 34, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 33.486 sec - 
in org.apache.phoenix.end2end.ArrayAppendFunctionIT
Tests run: 30, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 25.346 sec - 
in org.apache.phoenix.end2end.ArrayConcatFunctionIT
Running org.apache.phoenix.end2end.ArrayPrependFunctionIT
Tests run: 26, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 25.386 sec - 
in org.apache.phoenix.end2end.ArrayFillFunctionIT
Running org.apache.phoenix.end2end.ArrayToStringFunctionIT
Running org.apache.phoenix.end2end.ArraysWithNullsIT
Tests run: 36, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 25.981 sec - 
in org.apache.phoenix.end2end.ArrayToStringFunctionIT
Running org.apache.phoenix.end2end.AutoCommitIT
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 6.223 sec - in 
org.apache.phoenix.end2end.AutoCommitIT
Running org.apache.phoenix.end2end.BinaryRowKeyIT
Tests run: 34, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 38.059 sec - 
in org.apache.phoenix.end2end.ArrayPrependFunctionIT
Running org.apache.phoenix.end2end.CSVCommonsLoaderIT
Tests run: 26, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 72.107 sec - 
in org.apache.phoenix.end2end.ArithmeticQueryIT
Running org.apache.phoenix.end2end.CbrtFunctionEnd2EndIT
Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 7.426 sec - in 
org.apache.phoenix.end2end.BinaryRowKeyIT
Running org.apache.phoenix.end2end.CoalesceFunctionIT
Tests run: 2,

phoenix git commit: PHOENIX-2100 Indicate in explain plan when round robin iterator is being used

2016-03-02 Thread samarth 
Repository: phoenix
Updated Branches:
  refs/heads/4.x-HBase-1.0 10903c812 -> 3877b9db0


PHOENIX-2100 Indicate in explain plan when round robin iterator is being used


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

Branch: refs/heads/4.x-HBase-1.0
Commit: 3877b9db05f0851b138e9ea0d42186ee0548415a
Parents: 10903c8
Author: Samarth 
Authored: Wed Mar 2 13:36:52 2016 -0800
Committer: Samarth 
Committed: Wed Mar 2 13:36:52 2016 -0800

--
 .../phoenix/iterate/BaseResultIterators.java|  7 ++
 .../org/apache/phoenix/query/QueryPlanTest.java | 25 
 2 files changed, 32 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/3877b9db/phoenix-core/src/main/java/org/apache/phoenix/iterate/BaseResultIterators.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/iterate/BaseResultIterators.java
 
b/phoenix-core/src/main/java/org/apache/phoenix/iterate/BaseResultIterators.java
index 9f3b3e6..c36a72b 100644
--- 
a/phoenix-core/src/main/java/org/apache/phoenix/iterate/BaseResultIterators.java
+++ 
b/phoenix-core/src/main/java/org/apache/phoenix/iterate/BaseResultIterators.java
@@ -882,6 +882,13 @@ public abstract class BaseResultIterators extends 
ExplainTable implements Result
 }
 }
 buf.append(getName()).append(" ").append(size()).append("-WAY ");
+try {
+if (plan.useRoundRobinIterator()) {
+buf.append("ROUND ROBIN ");
+}
+} catch (SQLException e) {
+throw new RuntimeException(e);
+}
 explain(buf.toString(),planSteps);
 }
 

http://git-wip-us.apache.org/repos/asf/phoenix/blob/3877b9db/phoenix-core/src/test/java/org/apache/phoenix/query/QueryPlanTest.java
--
diff --git 
a/phoenix-core/src/test/java/org/apache/phoenix/query/QueryPlanTest.java 
b/phoenix-core/src/test/java/org/apache/phoenix/query/QueryPlanTest.java
index 4ba4d16..b00ccc0 100644
--- a/phoenix-core/src/test/java/org/apache/phoenix/query/QueryPlanTest.java
+++ b/phoenix-core/src/test/java/org/apache/phoenix/query/QueryPlanTest.java
@@ -252,5 +252,30 @@ public class QueryPlanTest extends 
BaseConnectionlessQueryTest {
 conn.close();
 }
 }
+
+@Test
+public void testUseOfRoundRobinIteratorSurfaced() throws Exception {
+Properties props = PropertiesUtil.deepCopy(new Properties());
+props.put(QueryServices.FORCE_ROW_KEY_ORDER_ATTRIB, 
Boolean.toString(false));
+Connection conn = DriverManager.getConnection(getUrl(), props);
+String tableName = "testUseOfRoundRobinIteratorSurfaced".toUpperCase();
+try {
+conn.createStatement().execute("CREATE TABLE " + tableName + "(\n" 
+
+"a VARCHAR NOT NULL,\n" +
+"b TIMESTAMP NOT NULL,\n" +
+"c VARCHAR,\n" +
+"CONSTRAINT pk PRIMARY KEY (a, b DESC, 
c)\n" +
+"  ) IMMUTABLE_ROWS=true\n" +
+",SALT_BUCKETS=20");
+String query = "select * from " + tableName + " where a = 'a' and 
b >= timestamp '2016-01-28 00:00:00' and b < timestamp '2016-01-29 00:00:00'";
+ResultSet rs = conn.createStatement().executeQuery("EXPLAIN " + 
query);
+String queryPlan = QueryUtil.getExplainPlan(rs);
+assertEquals(
+"CLIENT PARALLEL 20-WAY ROUND ROBIN RANGE SCAN OVER " + 
tableName + " [0,'a',~'2016-01-28 23:59:59.999'] - [0,'a',~'2016-01-28 
00:00:00.000']\n" + 
+"SERVER FILTER BY FIRST KEY ONLY", queryPlan);
+} finally {
+conn.close();
+}
+}
 
 }

phoenix git commit: PHOENIX-2100 Indicate in explain plan when round robin iterator is being used

2016-03-02 Thread samarth 
Repository: phoenix
Updated Branches:
  refs/heads/master f9c8fe8df -> 1d03e02f0


PHOENIX-2100 Indicate in explain plan when round robin iterator is being used


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

Branch: refs/heads/master
Commit: 1d03e02f06dac97dafe6254bd8d9b75efcccd9a7
Parents: f9c8fe8
Author: Samarth 
Authored: Wed Mar 2 13:33:27 2016 -0800
Committer: Samarth 
Committed: Wed Mar 2 13:33:27 2016 -0800

--
 .../phoenix/iterate/BaseResultIterators.java|  7 ++
 .../org/apache/phoenix/query/QueryPlanTest.java | 25 
 2 files changed, 32 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/1d03e02f/phoenix-core/src/main/java/org/apache/phoenix/iterate/BaseResultIterators.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/iterate/BaseResultIterators.java
 
b/phoenix-core/src/main/java/org/apache/phoenix/iterate/BaseResultIterators.java
index 9f3b3e6..c36a72b 100644
--- 
a/phoenix-core/src/main/java/org/apache/phoenix/iterate/BaseResultIterators.java
+++ 
b/phoenix-core/src/main/java/org/apache/phoenix/iterate/BaseResultIterators.java
@@ -882,6 +882,13 @@ public abstract class BaseResultIterators extends 
ExplainTable implements Result
 }
 }
 buf.append(getName()).append(" ").append(size()).append("-WAY ");
+try {
+if (plan.useRoundRobinIterator()) {
+buf.append("ROUND ROBIN ");
+}
+} catch (SQLException e) {
+throw new RuntimeException(e);
+}
 explain(buf.toString(),planSteps);
 }
 

http://git-wip-us.apache.org/repos/asf/phoenix/blob/1d03e02f/phoenix-core/src/test/java/org/apache/phoenix/query/QueryPlanTest.java
--
diff --git 
a/phoenix-core/src/test/java/org/apache/phoenix/query/QueryPlanTest.java 
b/phoenix-core/src/test/java/org/apache/phoenix/query/QueryPlanTest.java
index 4ba4d16..b00ccc0 100644
--- a/phoenix-core/src/test/java/org/apache/phoenix/query/QueryPlanTest.java
+++ b/phoenix-core/src/test/java/org/apache/phoenix/query/QueryPlanTest.java
@@ -252,5 +252,30 @@ public class QueryPlanTest extends 
BaseConnectionlessQueryTest {
 conn.close();
 }
 }
+
+@Test
+public void testUseOfRoundRobinIteratorSurfaced() throws Exception {
+Properties props = PropertiesUtil.deepCopy(new Properties());
+props.put(QueryServices.FORCE_ROW_KEY_ORDER_ATTRIB, 
Boolean.toString(false));
+Connection conn = DriverManager.getConnection(getUrl(), props);
+String tableName = "testUseOfRoundRobinIteratorSurfaced".toUpperCase();
+try {
+conn.createStatement().execute("CREATE TABLE " + tableName + "(\n" 
+
+"a VARCHAR NOT NULL,\n" +
+"b TIMESTAMP NOT NULL,\n" +
+"c VARCHAR,\n" +
+"CONSTRAINT pk PRIMARY KEY (a, b DESC, 
c)\n" +
+"  ) IMMUTABLE_ROWS=true\n" +
+",SALT_BUCKETS=20");
+String query = "select * from " + tableName + " where a = 'a' and 
b >= timestamp '2016-01-28 00:00:00' and b < timestamp '2016-01-29 00:00:00'";
+ResultSet rs = conn.createStatement().executeQuery("EXPLAIN " + 
query);
+String queryPlan = QueryUtil.getExplainPlan(rs);
+assertEquals(
+"CLIENT PARALLEL 20-WAY ROUND ROBIN RANGE SCAN OVER " + 
tableName + " [0,'a',~'2016-01-28 23:59:59.999'] - [0,'a',~'2016-01-28 
00:00:00.000']\n" + 
+"SERVER FILTER BY FIRST KEY ONLY", queryPlan);
+} finally {
+conn.close();
+}
+}
 
 }

phoenix git commit: PHOENIX-2100 Indicate in explain plan when round robin iterator is being used

2016-03-02 Thread samarth 
Repository: phoenix
Updated Branches:
  refs/heads/4.x-HBase-0.98 1956f8147 -> 34baf80db


PHOENIX-2100 Indicate in explain plan when round robin iterator is being used


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

Branch: refs/heads/4.x-HBase-0.98
Commit: 34baf80db13d11f8fea764e494d769be2a158fb9
Parents: 1956f81
Author: Samarth 
Authored: Wed Mar 2 13:28:55 2016 -0800
Committer: Samarth 
Committed: Wed Mar 2 13:28:55 2016 -0800

--
 .../phoenix/iterate/BaseResultIterators.java|  7 ++
 .../org/apache/phoenix/query/QueryPlanTest.java | 25 
 2 files changed, 32 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/34baf80d/phoenix-core/src/main/java/org/apache/phoenix/iterate/BaseResultIterators.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/iterate/BaseResultIterators.java
 
b/phoenix-core/src/main/java/org/apache/phoenix/iterate/BaseResultIterators.java
index 9f3b3e6..c36a72b 100644
--- 
a/phoenix-core/src/main/java/org/apache/phoenix/iterate/BaseResultIterators.java
+++ 
b/phoenix-core/src/main/java/org/apache/phoenix/iterate/BaseResultIterators.java
@@ -882,6 +882,13 @@ public abstract class BaseResultIterators extends 
ExplainTable implements Result
 }
 }
 buf.append(getName()).append(" ").append(size()).append("-WAY ");
+try {
+if (plan.useRoundRobinIterator()) {
+buf.append("ROUND ROBIN ");
+}
+} catch (SQLException e) {
+throw new RuntimeException(e);
+}
 explain(buf.toString(),planSteps);
 }
 

http://git-wip-us.apache.org/repos/asf/phoenix/blob/34baf80d/phoenix-core/src/test/java/org/apache/phoenix/query/QueryPlanTest.java
--
diff --git 
a/phoenix-core/src/test/java/org/apache/phoenix/query/QueryPlanTest.java 
b/phoenix-core/src/test/java/org/apache/phoenix/query/QueryPlanTest.java
index 4ba4d16..b00ccc0 100644
--- a/phoenix-core/src/test/java/org/apache/phoenix/query/QueryPlanTest.java
+++ b/phoenix-core/src/test/java/org/apache/phoenix/query/QueryPlanTest.java
@@ -252,5 +252,30 @@ public class QueryPlanTest extends 
BaseConnectionlessQueryTest {
 conn.close();
 }
 }
+
+@Test
+public void testUseOfRoundRobinIteratorSurfaced() throws Exception {
+Properties props = PropertiesUtil.deepCopy(new Properties());
+props.put(QueryServices.FORCE_ROW_KEY_ORDER_ATTRIB, 
Boolean.toString(false));
+Connection conn = DriverManager.getConnection(getUrl(), props);
+String tableName = "testUseOfRoundRobinIteratorSurfaced".toUpperCase();
+try {
+conn.createStatement().execute("CREATE TABLE " + tableName + "(\n" 
+
+"a VARCHAR NOT NULL,\n" +
+"b TIMESTAMP NOT NULL,\n" +
+"c VARCHAR,\n" +
+"CONSTRAINT pk PRIMARY KEY (a, b DESC, 
c)\n" +
+"  ) IMMUTABLE_ROWS=true\n" +
+",SALT_BUCKETS=20");
+String query = "select * from " + tableName + " where a = 'a' and 
b >= timestamp '2016-01-28 00:00:00' and b < timestamp '2016-01-29 00:00:00'";
+ResultSet rs = conn.createStatement().executeQuery("EXPLAIN " + 
query);
+String queryPlan = QueryUtil.getExplainPlan(rs);
+assertEquals(
+"CLIENT PARALLEL 20-WAY ROUND ROBIN RANGE SCAN OVER " + 
tableName + " [0,'a',~'2016-01-28 23:59:59.999'] - [0,'a',~'2016-01-28 
00:00:00.000']\n" + 
+"SERVER FILTER BY FIRST KEY ONLY", queryPlan);
+} finally {
+conn.close();
+}
+}
 
 }

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

2016-03-02 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
[samarth] PHOENIX-2732 Addendum to fix test failure



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

phoenix git commit: PHOENIX-2732 Addendum to fix test failure

2016-03-02 Thread samarth 
Repository: phoenix
Updated Branches:
  refs/heads/4.x-HBase-0.98 59089ddf0 -> 1956f8147


PHOENIX-2732 Addendum to fix test failure


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

Branch: refs/heads/4.x-HBase-0.98
Commit: 1956f81470fb69e47d2166b84063ca17a85da6fc
Parents: 59089dd
Author: Samarth 
Authored: Wed Mar 2 12:06:32 2016 -0800
Committer: Samarth 
Committed: Wed Mar 2 12:06:32 2016 -0800

--
 .../org/apache/hadoop/hbase/ipc/PhoenixIndexRpcSchedulerTest.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/1956f814/phoenix-core/src/test/java/org/apache/hadoop/hbase/ipc/PhoenixIndexRpcSchedulerTest.java
--
diff --git 
a/phoenix-core/src/test/java/org/apache/hadoop/hbase/ipc/PhoenixIndexRpcSchedulerTest.java
 
b/phoenix-core/src/test/java/org/apache/hadoop/hbase/ipc/PhoenixIndexRpcSchedulerTest.java
index 06a0e07..aea9313 100644
--- 
a/phoenix-core/src/test/java/org/apache/hadoop/hbase/ipc/PhoenixIndexRpcSchedulerTest.java
+++ 
b/phoenix-core/src/test/java/org/apache/hadoop/hbase/ipc/PhoenixIndexRpcSchedulerTest.java
@@ -88,8 +88,9 @@ public class PhoenixIndexRpcSchedulerTest {
 CallRunner task = Mockito.mock(CallRunner.class);
 RequestHeader header = 
RequestHeader.newBuilder().setPriority(priority).build();
 RpcServer server = new RpcServer(null, "test-rpcserver", null, null, 
conf, scheduler);
+RpcServer.Connection connection = 
Mockito.mock(RpcServer.Connection.class);
 RpcServer.Call call =
-server.new Call(0, null, null, header, null, null, null, null, 
10, null);
+server.new Call(0, null, null, header, null, null, connection, 
null, 10, null);
 Mockito.when(task.getCall()).thenReturn(call);
 
 scheduler.dispatch(task);

phoenix git commit: Remove unused imports

2016-03-02 Thread samarth 
Repository: phoenix
Updated Branches:
  refs/heads/4.x-HBase-1.0 7cff6b076 -> 10903c812


Remove unused imports


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

Branch: refs/heads/4.x-HBase-1.0
Commit: 10903c8120e6101f41e81816612ca532e68d895d
Parents: 7cff6b0
Author: Samarth 
Authored: Wed Mar 2 11:43:09 2016 -0800
Committer: Samarth 
Committed: Wed Mar 2 11:43:09 2016 -0800

--
 .../apache/hadoop/hbase/ipc/PhoenixIndexRpcSchedulerTest.java | 7 ---
 1 file changed, 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/10903c81/phoenix-core/src/test/java/org/apache/hadoop/hbase/ipc/PhoenixIndexRpcSchedulerTest.java
--
diff --git 
a/phoenix-core/src/test/java/org/apache/hadoop/hbase/ipc/PhoenixIndexRpcSchedulerTest.java
 
b/phoenix-core/src/test/java/org/apache/hadoop/hbase/ipc/PhoenixIndexRpcSchedulerTest.java
index a17c7fb..14fdf21 100644
--- 
a/phoenix-core/src/test/java/org/apache/hadoop/hbase/ipc/PhoenixIndexRpcSchedulerTest.java
+++ 
b/phoenix-core/src/test/java/org/apache/hadoop/hbase/ipc/PhoenixIndexRpcSchedulerTest.java
@@ -19,15 +19,8 @@ package org.apache.hadoop.hbase.ipc;
 
 import static org.junit.Assert.assertEquals;
 
-import java.io.IOException;
 import java.net.InetSocketAddress;
-import java.net.Socket;
-import java.net.SocketAddress;
-import java.net.SocketOption;
-import java.nio.ByteBuffer;
-import java.nio.channels.SocketChannel;
 import java.util.List;
-import java.util.Set;
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.TimeUnit;

Build failed in Jenkins: Phoenix-4.x-HBase-1.0 #414

2016-03-02 Thread Apache Jenkins Server 
See 

Changes:

[jtaylor] PHOENIX-2728 Remove usage of usage of

[jtaylor] PHOENIX-1973 Improve CsvBulkLoadTool performance by moving keyvalue

[jtaylor] PHOENIX-2731 Ensure upgrade from 4.7.0 RCx to 4.7.0 RC5 works

--
[...truncated 239 lines...]
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.001 sec - in 
org.apache.phoenix.expression.DeterminismTest
Running org.apache.phoenix.expression.NullValueTest
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.146 sec - in 
org.apache.phoenix.expression.RegexpReplaceFunctionTest
Running org.apache.phoenix.expression.CoerceExpressionTest
Tests run: 5, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.008 sec - in 
org.apache.phoenix.expression.CoerceExpressionTest
Running org.apache.phoenix.expression.OctetLengthFunctionTest
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.031 sec - in 
org.apache.phoenix.expression.OctetLengthFunctionTest
Running org.apache.phoenix.expression.ArrayToStringFunctionTest
Tests run: 24, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.044 sec - in 
org.apache.phoenix.expression.ArrayToStringFunctionTest
Running org.apache.phoenix.expression.util.regex.PatternPerformanceTest
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.002 sec - in 
org.apache.phoenix.expression.util.regex.PatternPerformanceTest
Running org.apache.phoenix.expression.function.InstrFunctionTest
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.003 sec - in 
org.apache.phoenix.expression.function.InstrFunctionTest
Running org.apache.phoenix.expression.function.BuiltinFunctionConstructorTest
Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.085 sec - in 
org.apache.phoenix.expression.function.BuiltinFunctionConstructorTest
Running org.apache.phoenix.expression.function.ExternalSqlTypeIdFunctionTest
Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.003 sec - in 
org.apache.phoenix.expression.function.ExternalSqlTypeIdFunctionTest
Running org.apache.phoenix.expression.RegexpSubstrFunctionTest
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.005 sec - in 
org.apache.phoenix.expression.RegexpSubstrFunctionTest
Running org.apache.phoenix.expression.SignFunctionTest
Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.335 sec - in 
org.apache.phoenix.expression.NullValueTest
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.014 sec - in 
org.apache.phoenix.expression.SignFunctionTest
Running org.apache.phoenix.expression.SqrtFunctionTest
Running org.apache.phoenix.expression.SortOrderExpressionTest
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.011 sec - in 
org.apache.phoenix.expression.SqrtFunctionTest
Running org.apache.phoenix.expression.ArrayFillFunctionTest
Tests run: 14, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.014 sec - in 
org.apache.phoenix.expression.ArrayFillFunctionTest
Running org.apache.phoenix.expression.ArrayPrependFunctionTest
Tests run: 11, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 1.189 sec - in 
org.apache.phoenix.util.PhoenixRuntimeTest
Running org.apache.phoenix.expression.RoundFloorCeilExpressionsTest
Tests run: 24, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.198 sec - in 
org.apache.phoenix.expression.SortOrderExpressionTest
Running org.apache.phoenix.expression.PowerFunctionTest
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.031 sec - in 
org.apache.phoenix.expression.PowerFunctionTest
Running org.apache.phoenix.expression.GetSetByteBitFunctionTest
Tests run: 37, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.288 sec - in 
org.apache.phoenix.expression.ArrayPrependFunctionTest
Running org.apache.phoenix.expression.ColumnExpressionTest
Tests run: 4, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.003 sec - in 
org.apache.phoenix.expression.ColumnExpressionTest
Running org.apache.phoenix.expression.RegexpSplitFunctionTest
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.009 sec - in 
org.apache.phoenix.expression.RegexpSplitFunctionTest
Running org.apache.phoenix.expression.LnLogFunctionTest
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.021 sec - in 
org.apache.phoenix.expression.LnLogFunctionTest
Running org.apache.phoenix.expression.AbsFunctionTest
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.015 sec - in 
org.apache.phoenix.expression.AbsFunctionTest
Running org.apache.phoenix.expression.LikeExpressionTest
Tests run: 4, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.008 sec - in 
org.apache.phoenix.expression.LikeExpressionTest
Running org.apache.phoenix.expression.ExpFunctionTest
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.009 sec - in 
org.apache.phoenix.expression.ExpFunctionTest
Running

[2/3] phoenix git commit: PHOENIX-1973 Improve CsvBulkLoadTool performance by moving keyvalue construction from map phase to reduce phase (Sergey Soldatov)

2016-03-02 Thread jamestaylor 
PHOENIX-1973 Improve CsvBulkLoadTool performance by moving keyvalue 
construction from map phase to reduce phase (Sergey Soldatov)


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

Branch: refs/heads/4.x-HBase-1.0
Commit: 586d3034e62c75ab6c7a7bfde413715815ca3d4f
Parents: b9fdb72
Author: James Taylor 
Authored: Wed Mar 2 00:38:05 2016 -0800
Committer: James Taylor 
Committed: Wed Mar 2 10:45:41 2016 -0800

--
 .../phoenix/mapreduce/AbstractBulkLoadTool.java |   6 +-
 .../mapreduce/FormatToKeyValueMapper.java   | 164 ---
 .../mapreduce/FormatToKeyValueReducer.java  | 126 --
 .../bulkload/TargetTableRefFunctions.java   |  22 ++-
 4 files changed, 280 insertions(+), 38 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/586d3034/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/AbstractBulkLoadTool.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/AbstractBulkLoadTool.java
 
b/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/AbstractBulkLoadTool.java
index 39ee4b1..ab2848f 100644
--- 
a/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/AbstractBulkLoadTool.java
+++ 
b/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/AbstractBulkLoadTool.java
@@ -41,6 +41,7 @@ import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.hbase.HBaseConfiguration;
 import org.apache.hadoop.hbase.KeyValue;
 import org.apache.hadoop.hbase.client.HTable;
+import org.apache.hadoop.hbase.io.ImmutableBytesWritable;
 import org.apache.hadoop.hbase.mapreduce.LoadIncrementalHFiles;
 import org.apache.hadoop.mapreduce.Job;
 import org.apache.hadoop.mapreduce.lib.input.FileInputFormat;
@@ -268,7 +269,7 @@ public abstract class AbstractBulkLoadTool extends 
Configured implements Tool {
 
 job.setInputFormatClass(TextInputFormat.class);
 job.setMapOutputKeyClass(TableRowkeyPair.class);
-job.setMapOutputValueClass(KeyValue.class);
+job.setMapOutputValueClass(ImmutableBytesWritable.class);
 job.setOutputKeyClass(TableRowkeyPair.class);
 job.setOutputValueClass(KeyValue.class);
 job.setReducerClass(FormatToKeyValueReducer.class);
@@ -276,7 +277,10 @@ public abstract class AbstractBulkLoadTool extends 
Configured implements Tool {
 MultiHfileOutputFormat.configureIncrementalLoad(job, tablesToBeLoaded);
 
 final String tableNamesAsJson = 
TargetTableRefFunctions.NAMES_TO_JSON.apply(tablesToBeLoaded);
+final String logicalNamesAsJson = 
TargetTableRefFunctions.LOGICAN_NAMES_TO_JSON.apply(tablesToBeLoaded);
+
 
job.getConfiguration().set(FormatToKeyValueMapper.TABLE_NAMES_CONFKEY,tableNamesAsJson);
+
job.getConfiguration().set(FormatToKeyValueMapper.LOGICAL_NAMES_CONFKEY,logicalNamesAsJson);
 
 // give subclasses their hook
 setupJob(job);

http://git-wip-us.apache.org/repos/asf/phoenix/blob/586d3034/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/FormatToKeyValueMapper.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/FormatToKeyValueMapper.java
 
b/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/FormatToKeyValueMapper.java
index 7e115e5..8dbb4aa 100644
--- 
a/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/FormatToKeyValueMapper.java
+++ 
b/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/FormatToKeyValueMapper.java
@@ -17,30 +17,30 @@
  */
 package org.apache.phoenix.mapreduce;
 
+import java.io.DataOutputStream;
 import java.io.IOException;
 import java.sql.SQLException;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
+import java.util.*;
 import javax.annotation.Nullable;
 
 import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.hbase.Cell;
 import org.apache.hadoop.hbase.KeyValue;
 import org.apache.hadoop.hbase.io.ImmutableBytesWritable;
 import org.apache.hadoop.hbase.util.Bytes;
 import org.apache.hadoop.hbase.util.Pair;
 import org.apache.hadoop.io.LongWritable;
 import org.apache.hadoop.io.Text;
+import org.apache.hadoop.io.WritableUtils;
 import org.apache.hadoop.mapreduce.Mapper;
 import org.apache.phoenix.jdbc.PhoenixConnection;
 import org.apache.phoenix.mapreduce.bulkload.TableRowkeyPair;
 import org.apache.phoenix.mapreduce.bulkload.TargetTableRefFunctions;
 import org.apache.phoenix.mapreduce.util.PhoenixConfigurationUtil;
-import

[3/3] phoenix git commit: PHOENIX-2731 Ensure upgrade from 4.7.0 RCx to 4.7.0 RC5 works

2016-03-02 Thread jamestaylor 
PHOENIX-2731 Ensure upgrade from 4.7.0 RCx to 4.7.0 RC5 works


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

Branch: refs/heads/4.x-HBase-1.0
Commit: e564d50b25c41fc2fc7f0c49acd8e32f29324fa9
Parents: 586d303
Author: James Taylor 
Authored: Wed Mar 2 10:28:34 2016 -0800
Committer: James Taylor 
Committed: Wed Mar 2 10:45:47 2016 -0800

--
 .../java/org/apache/phoenix/coprocessor/MetaDataProtocol.java | 2 +-
 .../org/apache/phoenix/query/ConnectionQueryServicesImpl.java | 7 +--
 2 files changed, 6 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/e564d50b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/MetaDataProtocol.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/MetaDataProtocol.java
 
b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/MetaDataProtocol.java
index fb9d228..7a7cf31 100644
--- 
a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/MetaDataProtocol.java
+++ 
b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/MetaDataProtocol.java
@@ -73,7 +73,7 @@ public abstract class MetaDataProtocol extends 
MetaDataService {
 public static final long MIN_SYSTEM_TABLE_TIMESTAMP_4_3_0 = 
MIN_TABLE_TIMESTAMP + 7;
 public static final long MIN_SYSTEM_TABLE_TIMESTAMP_4_5_0 = 
MIN_TABLE_TIMESTAMP + 8;
 public static final long MIN_SYSTEM_TABLE_TIMESTAMP_4_6_0 = 
MIN_TABLE_TIMESTAMP + 9;
-public static final long MIN_SYSTEM_TABLE_TIMESTAMP_4_7_0 = 
MIN_TABLE_TIMESTAMP + 14;
+public static final long MIN_SYSTEM_TABLE_TIMESTAMP_4_7_0 = 
MIN_TABLE_TIMESTAMP + 15;
 // MIN_SYSTEM_TABLE_TIMESTAMP needs to be set to the max of all the 
MIN_SYSTEM_TABLE_TIMESTAMP_* constants
 public static final long MIN_SYSTEM_TABLE_TIMESTAMP = 
MIN_SYSTEM_TABLE_TIMESTAMP_4_7_0;
 // TODO: pare this down to minimum, as we don't need duplicates for both 
table and column errors, nor should we need

http://git-wip-us.apache.org/repos/asf/phoenix/blob/e564d50b/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java
 
b/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java
index 488926d..df3bc13 100644
--- 
a/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java
+++ 
b/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java
@@ -2432,13 +2432,16 @@ public class ConnectionQueryServicesImpl extends 
DelegateQueryServices implement
 metaConnection.createStatement().executeUpdate(
 
QueryConstants.CREATE_STATS_TABLE_METADATA);
 } catch (NewerTableAlreadyExistsException ignore) {
-} catch(TableAlreadyExistsException ignore) {
-metaConnection = addColumnsIfNotExists(
+} catch(TableAlreadyExistsException e) {
+long currentServerSideTableTimeStamp = 
e.getTable().getTimeStamp();
+if (currentServerSideTableTimeStamp < 
MetaDataProtocol.MIN_SYSTEM_TABLE_TIMESTAMP_4_3_0) {
+metaConnection = addColumnsIfNotExists(
 metaConnection,
 
PhoenixDatabaseMetaData.SYSTEM_STATS_NAME,
 
MetaDataProtocol.MIN_SYSTEM_TABLE_TIMESTAMP,
 
PhoenixDatabaseMetaData.GUIDE_POSTS_ROW_COUNT + " "
 + 
PLong.INSTANCE.getSqlTypeName());
+}
 }
 try {
 metaConnection.createStatement().executeUpdate(

[3/3] phoenix git commit: PHOENIX-2731 Ensure upgrade from 4.7.0 RCx to 4.7.0 RC5 works

2016-03-02 Thread jamestaylor 
PHOENIX-2731 Ensure upgrade from 4.7.0 RCx to 4.7.0 RC5 works


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

Branch: refs/heads/4.x-HBase-0.98
Commit: 59089ddf0823d43e6be28d7cd580ed37f659bf60
Parents: 10c6ad3
Author: James Taylor 
Authored: Wed Mar 2 10:28:34 2016 -0800
Committer: James Taylor 
Committed: Wed Mar 2 10:42:16 2016 -0800

--
 .../java/org/apache/phoenix/coprocessor/MetaDataProtocol.java | 2 +-
 .../org/apache/phoenix/query/ConnectionQueryServicesImpl.java | 7 +--
 2 files changed, 6 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/59089ddf/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/MetaDataProtocol.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/MetaDataProtocol.java
 
b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/MetaDataProtocol.java
index fb9d228..7a7cf31 100644
--- 
a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/MetaDataProtocol.java
+++ 
b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/MetaDataProtocol.java
@@ -73,7 +73,7 @@ public abstract class MetaDataProtocol extends 
MetaDataService {
 public static final long MIN_SYSTEM_TABLE_TIMESTAMP_4_3_0 = 
MIN_TABLE_TIMESTAMP + 7;
 public static final long MIN_SYSTEM_TABLE_TIMESTAMP_4_5_0 = 
MIN_TABLE_TIMESTAMP + 8;
 public static final long MIN_SYSTEM_TABLE_TIMESTAMP_4_6_0 = 
MIN_TABLE_TIMESTAMP + 9;
-public static final long MIN_SYSTEM_TABLE_TIMESTAMP_4_7_0 = 
MIN_TABLE_TIMESTAMP + 14;
+public static final long MIN_SYSTEM_TABLE_TIMESTAMP_4_7_0 = 
MIN_TABLE_TIMESTAMP + 15;
 // MIN_SYSTEM_TABLE_TIMESTAMP needs to be set to the max of all the 
MIN_SYSTEM_TABLE_TIMESTAMP_* constants
 public static final long MIN_SYSTEM_TABLE_TIMESTAMP = 
MIN_SYSTEM_TABLE_TIMESTAMP_4_7_0;
 // TODO: pare this down to minimum, as we don't need duplicates for both 
table and column errors, nor should we need

http://git-wip-us.apache.org/repos/asf/phoenix/blob/59089ddf/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java
 
b/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java
index 5c0c3e0..a8595e9 100644
--- 
a/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java
+++ 
b/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java
@@ -2432,13 +2432,16 @@ public class ConnectionQueryServicesImpl extends 
DelegateQueryServices implement
 metaConnection.createStatement().executeUpdate(
 
QueryConstants.CREATE_STATS_TABLE_METADATA);
 } catch (NewerTableAlreadyExistsException ignore) {
-} catch(TableAlreadyExistsException ignore) {
-metaConnection = addColumnsIfNotExists(
+} catch(TableAlreadyExistsException e) {
+long currentServerSideTableTimeStamp = 
e.getTable().getTimeStamp();
+if (currentServerSideTableTimeStamp < 
MetaDataProtocol.MIN_SYSTEM_TABLE_TIMESTAMP_4_3_0) {
+metaConnection = addColumnsIfNotExists(
 metaConnection,
 
PhoenixDatabaseMetaData.SYSTEM_STATS_NAME,
 
MetaDataProtocol.MIN_SYSTEM_TABLE_TIMESTAMP,
 
PhoenixDatabaseMetaData.GUIDE_POSTS_ROW_COUNT + " "
 + 
PLong.INSTANCE.getSqlTypeName());
+}
 }
 try {
 metaConnection.createStatement().executeUpdate(

[1/3] phoenix git commit: PHOENIX-2728 Remove usage of usage of com.google.common.io.Closeables.closeQuietly(Closeable)

2016-03-02 Thread jamestaylor 
Repository: phoenix
Updated Branches:
  refs/heads/4.x-HBase-0.98 998ae6a32 -> 59089ddf0


PHOENIX-2728 Remove usage of usage of 
com.google.common.io.Closeables.closeQuietly(Closeable)


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

Branch: refs/heads/4.x-HBase-0.98
Commit: 677968198fc275062b8f90a60733d915e3e6d7ce
Parents: 998ae6a
Author: James Taylor 
Authored: Tue Mar 1 22:24:46 2016 -0800
Committer: James Taylor 
Committed: Wed Mar 2 10:41:45 2016 -0800

--
 .../main/java/org/apache/phoenix/iterate/BaseResultIterators.java  | 2 +-
 .../main/java/org/apache/phoenix/schema/stats/PTableStatsImpl.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/67796819/phoenix-core/src/main/java/org/apache/phoenix/iterate/BaseResultIterators.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/iterate/BaseResultIterators.java
 
b/phoenix-core/src/main/java/org/apache/phoenix/iterate/BaseResultIterators.java
index a48de13..9f3b3e6 100644
--- 
a/phoenix-core/src/main/java/org/apache/phoenix/iterate/BaseResultIterators.java
+++ 
b/phoenix-core/src/main/java/org/apache/phoenix/iterate/BaseResultIterators.java
@@ -82,6 +82,7 @@ import org.apache.phoenix.schema.TableRef;
 import org.apache.phoenix.schema.stats.GuidePostsInfo;
 import org.apache.phoenix.schema.stats.PTableStats;
 import org.apache.phoenix.util.ByteUtil;
+import org.apache.phoenix.util.Closeables;
 import org.apache.phoenix.util.LogUtil;
 import org.apache.phoenix.util.PrefixByteCodec;
 import org.apache.phoenix.util.PrefixByteDecoder;
@@ -95,7 +96,6 @@ import org.slf4j.LoggerFactory;
 import com.google.common.base.Function;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Lists;
-import com.google.common.io.Closeables;
 
 
 /**

http://git-wip-us.apache.org/repos/asf/phoenix/blob/67796819/phoenix-core/src/main/java/org/apache/phoenix/schema/stats/PTableStatsImpl.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/schema/stats/PTableStatsImpl.java
 
b/phoenix-core/src/main/java/org/apache/phoenix/schema/stats/PTableStatsImpl.java
index 42e7bed..5eb02fd 100644
--- 
a/phoenix-core/src/main/java/org/apache/phoenix/schema/stats/PTableStatsImpl.java
+++ 
b/phoenix-core/src/main/java/org/apache/phoenix/schema/stats/PTableStatsImpl.java
@@ -28,11 +28,11 @@ import java.util.TreeMap;
 import org.apache.hadoop.hbase.io.ImmutableBytesWritable;
 import org.apache.hadoop.hbase.util.Bytes;
 import org.apache.phoenix.coprocessor.MetaDataProtocol;
+import org.apache.phoenix.util.Closeables;
 import org.apache.phoenix.util.PrefixByteCodec;
 import org.apache.phoenix.util.PrefixByteDecoder;
 import org.apache.phoenix.util.SizedUtil;
 
-import com.google.common.io.Closeables;
 import com.sun.istack.NotNull;
  
  /**

[1/3] phoenix git commit: PHOENIX-2731 Ensure upgrade from 4.7.0 RCx to 4.7.0 RC5 works

2016-03-02 Thread jamestaylor 
Repository: phoenix
Updated Branches:
  refs/heads/master db4e5cda5 -> f9c8fe8df


PHOENIX-2731 Ensure upgrade from 4.7.0 RCx to 4.7.0 RC5 works


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

Branch: refs/heads/master
Commit: f9c8fe8df68bfd3b60b2a9d4ab83ff74b1fbd3de
Parents: 1c06c5d
Author: James Taylor 
Authored: Wed Mar 2 10:28:34 2016 -0800
Committer: James Taylor 
Committed: Wed Mar 2 10:40:30 2016 -0800

--
 .../java/org/apache/phoenix/coprocessor/MetaDataProtocol.java | 2 +-
 .../org/apache/phoenix/query/ConnectionQueryServicesImpl.java | 7 +--
 2 files changed, 6 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/f9c8fe8d/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/MetaDataProtocol.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/MetaDataProtocol.java
 
b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/MetaDataProtocol.java
index fb9d228..7a7cf31 100644
--- 
a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/MetaDataProtocol.java
+++ 
b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/MetaDataProtocol.java
@@ -73,7 +73,7 @@ public abstract class MetaDataProtocol extends 
MetaDataService {
 public static final long MIN_SYSTEM_TABLE_TIMESTAMP_4_3_0 = 
MIN_TABLE_TIMESTAMP + 7;
 public static final long MIN_SYSTEM_TABLE_TIMESTAMP_4_5_0 = 
MIN_TABLE_TIMESTAMP + 8;
 public static final long MIN_SYSTEM_TABLE_TIMESTAMP_4_6_0 = 
MIN_TABLE_TIMESTAMP + 9;
-public static final long MIN_SYSTEM_TABLE_TIMESTAMP_4_7_0 = 
MIN_TABLE_TIMESTAMP + 14;
+public static final long MIN_SYSTEM_TABLE_TIMESTAMP_4_7_0 = 
MIN_TABLE_TIMESTAMP + 15;
 // MIN_SYSTEM_TABLE_TIMESTAMP needs to be set to the max of all the 
MIN_SYSTEM_TABLE_TIMESTAMP_* constants
 public static final long MIN_SYSTEM_TABLE_TIMESTAMP = 
MIN_SYSTEM_TABLE_TIMESTAMP_4_7_0;
 // TODO: pare this down to minimum, as we don't need duplicates for both 
table and column errors, nor should we need

http://git-wip-us.apache.org/repos/asf/phoenix/blob/f9c8fe8d/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java
 
b/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java
index 39118a3..a473cde 100644
--- 
a/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java
+++ 
b/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java
@@ -2436,13 +2436,16 @@ public class ConnectionQueryServicesImpl extends 
DelegateQueryServices implement
 metaConnection.createStatement().executeUpdate(
 
QueryConstants.CREATE_STATS_TABLE_METADATA);
 } catch (NewerTableAlreadyExistsException ignore) {
-} catch(TableAlreadyExistsException ignore) {
-metaConnection = addColumnsIfNotExists(
+} catch(TableAlreadyExistsException e) {
+long currentServerSideTableTimeStamp = 
e.getTable().getTimeStamp();
+if (currentServerSideTableTimeStamp < 
MetaDataProtocol.MIN_SYSTEM_TABLE_TIMESTAMP_4_3_0) {
+metaConnection = addColumnsIfNotExists(
 metaConnection,
 
PhoenixDatabaseMetaData.SYSTEM_STATS_NAME,
 
MetaDataProtocol.MIN_SYSTEM_TABLE_TIMESTAMP,
 
PhoenixDatabaseMetaData.GUIDE_POSTS_ROW_COUNT + " "
 + 
PLong.INSTANCE.getSqlTypeName());
+}
 }
 try {
 metaConnection.createStatement().executeUpdate(

[3/3] phoenix git commit: PHOENIX-2728 Remove usage of usage of com.google.common.io.Closeables.closeQuietly(Closeable)

2016-03-02 Thread jamestaylor 
PHOENIX-2728 Remove usage of usage of 
com.google.common.io.Closeables.closeQuietly(Closeable)


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

Branch: refs/heads/master
Commit: 42e2b85e391893ba033272bc42e9a0ebad1caca1
Parents: db4e5cd
Author: James Taylor 
Authored: Tue Mar 1 22:24:46 2016 -0800
Committer: James Taylor 
Committed: Wed Mar 2 10:40:30 2016 -0800

--
 .../main/java/org/apache/phoenix/iterate/BaseResultIterators.java  | 2 +-
 .../main/java/org/apache/phoenix/schema/stats/PTableStatsImpl.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/42e2b85e/phoenix-core/src/main/java/org/apache/phoenix/iterate/BaseResultIterators.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/iterate/BaseResultIterators.java
 
b/phoenix-core/src/main/java/org/apache/phoenix/iterate/BaseResultIterators.java
index a48de13..9f3b3e6 100644
--- 
a/phoenix-core/src/main/java/org/apache/phoenix/iterate/BaseResultIterators.java
+++ 
b/phoenix-core/src/main/java/org/apache/phoenix/iterate/BaseResultIterators.java
@@ -82,6 +82,7 @@ import org.apache.phoenix.schema.TableRef;
 import org.apache.phoenix.schema.stats.GuidePostsInfo;
 import org.apache.phoenix.schema.stats.PTableStats;
 import org.apache.phoenix.util.ByteUtil;
+import org.apache.phoenix.util.Closeables;
 import org.apache.phoenix.util.LogUtil;
 import org.apache.phoenix.util.PrefixByteCodec;
 import org.apache.phoenix.util.PrefixByteDecoder;
@@ -95,7 +96,6 @@ import org.slf4j.LoggerFactory;
 import com.google.common.base.Function;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Lists;
-import com.google.common.io.Closeables;
 
 
 /**

http://git-wip-us.apache.org/repos/asf/phoenix/blob/42e2b85e/phoenix-core/src/main/java/org/apache/phoenix/schema/stats/PTableStatsImpl.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/schema/stats/PTableStatsImpl.java
 
b/phoenix-core/src/main/java/org/apache/phoenix/schema/stats/PTableStatsImpl.java
index 42e7bed..5eb02fd 100644
--- 
a/phoenix-core/src/main/java/org/apache/phoenix/schema/stats/PTableStatsImpl.java
+++ 
b/phoenix-core/src/main/java/org/apache/phoenix/schema/stats/PTableStatsImpl.java
@@ -28,11 +28,11 @@ import java.util.TreeMap;
 import org.apache.hadoop.hbase.io.ImmutableBytesWritable;
 import org.apache.hadoop.hbase.util.Bytes;
 import org.apache.phoenix.coprocessor.MetaDataProtocol;
+import org.apache.phoenix.util.Closeables;
 import org.apache.phoenix.util.PrefixByteCodec;
 import org.apache.phoenix.util.PrefixByteDecoder;
 import org.apache.phoenix.util.SizedUtil;
 
-import com.google.common.io.Closeables;
 import com.sun.istack.NotNull;
  
  /**

Apache-Phoenix | Master | Build Successful

2016-03-02 Thread Apache Jenkins Server 
Master branch build status Successful
Source repository https://git-wip-us.apache.org/repos/asf?p=phoenix.git;a=shortlog;h=refs/heads/master

Last Successful Compiled Artifacts https://builds.apache.org/job/Phoenix-master/lastSuccessfulBuild/artifact/

Last Complete Test Report https://builds.apache.org/job/Phoenix-master/lastCompletedBuild/testReport/

Changes
[samarth] PHOENIX-2730 Fix min hbase versions for scanner lease renewal



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

phoenix git commit: PHOENIX-2732 Update HBase versions in pom

2016-03-02 Thread samarth 
Repository: phoenix
Updated Branches:
  refs/heads/master f97b4af89 -> db4e5cda5


PHOENIX-2732 Update HBase versions in pom


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

Branch: refs/heads/master
Commit: db4e5cda53988da05f6ec28666cf664bd5dd43f4
Parents: f97b4af
Author: Samarth 
Authored: Wed Mar 2 09:55:24 2016 -0800
Committer: Samarth 
Committed: Wed Mar 2 09:55:24 2016 -0800

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


http://git-wip-us.apache.org/repos/asf/phoenix/blob/db4e5cda/pom.xml
--
diff --git a/pom.xml b/pom.xml
index b27c3b9..d9e5ff9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -80,7 +80,7 @@
 ${project.basedir}
 
 
-1.1.2
+1.1.3
 2.5.1

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

2016-03-02 Thread Apache Jenkins Server 
4.x-HBase-1.0 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-1.0

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

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

Changes
[samarth] PHOENIX-2730 Fix min hbase versions for scanner lease renewal.



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

phoenix git commit: PHOENIX-2730 Fix min hbase versions for scanner lease renewal

2016-03-02 Thread samarth 
Repository: phoenix
Updated Branches:
  refs/heads/master 58cf5fa2d -> f97b4af89


PHOENIX-2730 Fix min hbase versions for scanner lease renewal


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

Branch: refs/heads/master
Commit: f97b4af8982d2e9c1dbe56a14eb3a9cc90b84a98
Parents: 58cf5fa
Author: Samarth 
Authored: Wed Mar 2 08:51:23 2016 -0800
Committer: Samarth 
Committed: Wed Mar 2 08:51:23 2016 -0800

--
 .../main/java/org/apache/phoenix/jdbc/PhoenixDatabaseMetaData.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/f97b4af8/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixDatabaseMetaData.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixDatabaseMetaData.java
 
b/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixDatabaseMetaData.java
index 26d57fa..67814e8 100644
--- 
a/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixDatabaseMetaData.java
+++ 
b/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixDatabaseMetaData.java
@@ -295,7 +295,7 @@ public class PhoenixDatabaseMetaData implements 
DatabaseMetaData {
 private final ResultSet emptyResultSet;
 public static final int MAX_LOCAL_SI_VERSION_DISALLOW = 
VersionUtil.encodeVersion("0", "98", "8");
 public static final int MIN_LOCAL_SI_VERSION_DISALLOW = 
VersionUtil.encodeVersion("0", "98", "6");
-public static final int MIN_RENEW_LEASE_VERSION = 
VersionUtil.encodeVersion("1", "1", "4");
+public static final int MIN_RENEW_LEASE_VERSION = 
VersionUtil.encodeVersion("1", "1", "3");
 
 // Version below which we should turn off essential column family.
 public static final int ESSENTIAL_FAMILY_VERSION_THRESHOLD = 
VersionUtil.encodeVersion("0", "94", "7");