Git Push Summary

2015-08-14 Thread mujtaba 
Repository: phoenix
Updated Tags:  refs/tags/v4.5.1-HBase-1.1-rc1 [created] 04789a3bc

Git Push Summary

2015-08-14 Thread mujtaba 
Repository: phoenix
Updated Tags:  refs/tags/v4.5.1-HBase-1.0-rc1 [created] 243cc6f01

Git Push Summary

2015-08-14 Thread mujtaba 
Repository: phoenix
Updated Tags:  refs/tags/v4.5.1-HBase-0.98-rc1 [created] 043f1d14a

Git Push Summary

2015-08-14 Thread mujtaba 
Repository: phoenix
Updated Tags:  refs/tags/v4.5.0-HBase-0.98-rc1 [deleted] 2e9da4e77

Git Push Summary

2015-08-14 Thread mujtaba 
Repository: phoenix
Updated Tags:  refs/tags/v4.5.0-HBase-1.0-rc1 [deleted] 688bb13a0

Git Push Summary

2015-08-14 Thread mujtaba 
Repository: phoenix
Updated Tags:  refs/tags/v4.5.0-HBase-1.1-rc1 [deleted] a510b0a25

svn commit: r10180 - in /dev/phoenix: phoenix-4.5.1-HBase-0.98-rc1/ phoenix-4.5.1-HBase-0.98-rc1/bin/ phoenix-4.5.1-HBase-0.98-rc1/src/ phoenix-4.5.1-HBase-1.0-rc1/ phoenix-4.5.1-HBase-1.0-rc1/bin/ ph

2015-08-14 Thread mujtaba 
Author: mujtaba
Date: Fri Aug 14 23:55:25 2015
New Revision: 10180

Log:
Phoenix 4.5.1-rc1

Added:
dev/phoenix/phoenix-4.5.1-HBase-0.98-rc1/
dev/phoenix/phoenix-4.5.1-HBase-0.98-rc1/bin/

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

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

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

dev/phoenix/phoenix-4.5.1-HBase-0.98-rc1/bin/phoenix-4.5.1-HBase-0.98-bin.tar.gz.sha
dev/phoenix/phoenix-4.5.1-HBase-0.98-rc1/src/

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

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

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

dev/phoenix/phoenix-4.5.1-HBase-0.98-rc1/src/phoenix-4.5.1-HBase-0.98-src.tar.gz.sha
dev/phoenix/phoenix-4.5.1-HBase-1.0-rc1/
dev/phoenix/phoenix-4.5.1-HBase-1.0-rc1/bin/

dev/phoenix/phoenix-4.5.1-HBase-1.0-rc1/bin/phoenix-4.5.1-HBase-1.0-bin.tar.gz  
 (with props)

dev/phoenix/phoenix-4.5.1-HBase-1.0-rc1/bin/phoenix-4.5.1-HBase-1.0-bin.tar.gz.asc

dev/phoenix/phoenix-4.5.1-HBase-1.0-rc1/bin/phoenix-4.5.1-HBase-1.0-bin.tar.gz.md5

dev/phoenix/phoenix-4.5.1-HBase-1.0-rc1/bin/phoenix-4.5.1-HBase-1.0-bin.tar.gz.sha
dev/phoenix/phoenix-4.5.1-HBase-1.0-rc1/src/

dev/phoenix/phoenix-4.5.1-HBase-1.0-rc1/src/phoenix-4.5.1-HBase-1.0-src.tar.gz  
 (with props)

dev/phoenix/phoenix-4.5.1-HBase-1.0-rc1/src/phoenix-4.5.1-HBase-1.0-src.tar.gz.asc

dev/phoenix/phoenix-4.5.1-HBase-1.0-rc1/src/phoenix-4.5.1-HBase-1.0-src.tar.gz.md5

dev/phoenix/phoenix-4.5.1-HBase-1.0-rc1/src/phoenix-4.5.1-HBase-1.0-src.tar.gz.sha
dev/phoenix/phoenix-4.5.1-HBase-1.1-rc1/
dev/phoenix/phoenix-4.5.1-HBase-1.1-rc1/bin/

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

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

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

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

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

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

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

dev/phoenix/phoenix-4.5.1-HBase-1.1-rc1/src/phoenix-4.5.1-HBase-1.1-src.tar.gz.sha

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

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

Added: 
dev/phoenix/phoenix-4.5.1-HBase-0.98-rc1/bin/phoenix-4.5.1-HBase-0.98-bin.tar.gz.asc
==
--- 
dev/phoenix/phoenix-4.5.1-HBase-0.98-rc1/bin/phoenix-4.5.1-HBase-0.98-bin.tar.gz.asc
 (added)
+++ 
dev/phoenix/phoenix-4.5.1-HBase-0.98-rc1/bin/phoenix-4.5.1-HBase-0.98-bin.tar.gz.asc
 Fri Aug 14 23:55:25 2015
@@ -0,0 +1,17 @@
+-BEGIN PGP SIGNATURE-
+Version: GnuPG v1.4.11 (GNU/Linux)
+
+iQIcBAABAgAGBQJVzncEAAoJEDv8s5KUYReOt0cQAMRC6QaU5vOok2y2zPmahMLB
+9SDDnvajg9rtH3+CLaPQGBx0YylIXougJQrCODMVJjGv3rDCHFQeawKjRphmf4MZ
+xreha1smOyNVWkOzscbuBtxqq9mc7Zsbpic2xp2QtNvq0aLsnj95qIYONeqOQO/j
+c2u85++HSCJA5NZ+b+uYjOtN/B/5b401aUIZXvOouxNQMLm8wn4dWiHdR0Rvs9nO
+0mUIwJs1MP5Q8igR/LuhgT8TaYaVic54nNmhlqGucii163WpkT8HagxcEZ9e187M
+Mnclhpc3MY7fiK4118xutA2KwrL3cJcTGHSfrHyWlZ4bXmACVtpyXPqW2gL7ohSo
+iFidYCr/l5/Kz2aswmyFIJ+7h6HnYbOYHhjogrx9lMn+EkTmMrYpYEoPznvNxRFB
+m4uFE+jO3/u8v/6jeMQF6nbVjWh5BOqdQdvhNMOfYjxXJvbQhmLFwr9B889mZ/NU
+XrNH4R0qJxdrPtL0eUwPcBS5ncGthoGsKH3CY31wuSX6x/3U9xqP767MjffNIYvt
+ZCQ7S2tWjqAK7kn8f65RgHbBD4mS1UvD15tQOiqs1BjQKxJcNfybwdcVCEbnmu67
+SR4yCfk7LjL4isv6znUWvl2qrWFevpn9GDxPudwvbekyYcBPU70I7SP7aU40Oqq+
+W2NWJ+DcROK9MRfPTjQn
+=EnrX
+-END PGP SIGNATURE-

Added: 
dev/phoenix/phoenix-4.5.1-HBase-0.98-rc1/bin/phoenix-4.5.1-HBase-0.98-bin.tar.gz.md5
==
--- 
dev/phoenix/phoenix-4.5.1-HBase-0.98-rc1/bin/phoenix-4.5.1-HBase-0.98-bin.tar.gz.md5
 (added)
+++ 
dev/phoenix/phoenix-4.5.1-HBase-0.98-rc1/bin/phoenix-4.5.1-HBase-0.98-bin.tar.gz.md5
 Fri Aug 14 23:55:25 2015
@@ -0,0 +1 @@
+ef516822f37656e49687402b59c9e723 *phoenix-4.5.1-HBase-0.98-bin.tar.gz

Added: 
dev/phoenix/phoenix-4.5.1-HBase-0.98-rc1/bin/phoenix-4.5.1-HBase-0.98-bin.tar.gz.sha
==

Apache-Phoenix | 4.5-HBase-0.98 | Build Successful

2015-08-14 Thread Apache Jenkins Server 
4.5-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.5-HBase-0.98

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

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

Changes
[mujtaba] Prepare for release - remove changes file as change URL is used in voting email



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

Git Push Summary

2015-08-14 Thread mujtaba 
Repository: phoenix
Updated Tags:  refs/tags/v4.5.0-HBase-1.1-rc1 [created] a510b0a25

Git Push Summary

2015-08-14 Thread mujtaba 
Repository: phoenix
Updated Tags:  refs/tags/v4.5.0-HBase-1.0-rc1 [created] 688bb13a0

Git Push Summary

2015-08-14 Thread mujtaba 
Repository: phoenix
Updated Tags:  refs/tags/v4.5.0-HBase-0.98-rc1 [created] 2e9da4e77

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

2015-08-14 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
[ravi.magham] PHOENIX-2181: PhoenixHBaseLoader doesn't work with salted tables



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 #876

2015-08-14 Thread Apache Jenkins Server 
See 

Changes:

[ravi.magham] PHOENIX-2181: PhoenixHBaseLoader doesn't work with salted tables

--
[...truncated 119264 lines...]
Tests run: 6, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 130.199 sec - 
in org.apache.phoenix.end2end.index.IndexMetadataIT
Running org.apache.phoenix.end2end.index.DropViewIT
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 14.514 sec - in 
org.apache.phoenix.end2end.index.DropViewIT
Running org.apache.phoenix.end2end.index.LocalMutableIndexIT
Tests run: 15, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 304.023 sec - 
in org.apache.phoenix.end2end.index.GlobalMutableIndexIT
Running org.apache.phoenix.end2end.index.ViewIndexIT
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 19.158 sec - in 
org.apache.phoenix.end2end.index.ViewIndexIT
Running org.apache.phoenix.end2end.index.ImmutableIndexIT
Tests run: 108, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 746.59 sec - 
in org.apache.phoenix.end2end.SpooledSortMergeJoinIT
Running org.apache.phoenix.end2end.ServerExceptionIT
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 10.382 sec - in 
org.apache.phoenix.end2end.ServerExceptionIT
Running org.apache.phoenix.end2end.CSVCommonsLoaderIT
Tests run: 13, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 65.544 sec - 
in org.apache.phoenix.end2end.index.ImmutableIndexIT
Running org.apache.phoenix.end2end.ReverseFunctionIT
Tests run: 5, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 10.657 sec - in 
org.apache.phoenix.end2end.ReverseFunctionIT
Running org.apache.phoenix.end2end.GetSetByteBitFunctionEnd2EndIT
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 9.34 sec - in 
org.apache.phoenix.end2end.GetSetByteBitFunctionEnd2EndIT
Running org.apache.phoenix.end2end.ArrayAppendFunctionIT
Tests run: 20, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 478.732 sec - 
in org.apache.phoenix.end2end.index.LocalIndexIT
Running org.apache.phoenix.end2end.LnLogFunctionEnd2EndIT
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 17.005 sec - in 
org.apache.phoenix.end2end.LnLogFunctionEnd2EndIT
Running org.apache.phoenix.end2end.AutoCommitIT
Tests run: 15, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 79.219 sec - 
in org.apache.phoenix.end2end.CSVCommonsLoaderIT
Running org.apache.phoenix.end2end.TenantIdTypeIT
Tests run: 34, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 39.109 sec - 
in org.apache.phoenix.end2end.ArrayAppendFunctionIT
Running org.apache.phoenix.end2end.PowerFunctionEnd2EndIT
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 9.373 sec - in 
org.apache.phoenix.end2end.AutoCommitIT
Running org.apache.phoenix.end2end.TenantSpecificViewIndexSaltedIT
Tests run: 58, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 308.342 sec - 
in org.apache.phoenix.end2end.index.IndexExpressionIT
Running org.apache.phoenix.end2end.DateTimeIT
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 19.067 sec - in 
org.apache.phoenix.end2end.PowerFunctionEnd2EndIT
Running org.apache.phoenix.end2end.SpooledTmpFileDeleteIT
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 9.664 sec - in 
org.apache.phoenix.end2end.SpooledTmpFileDeleteIT
Running org.apache.phoenix.end2end.CbrtFunctionEnd2EndIT
Tests run: 4, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 31.545 sec - in 
org.apache.phoenix.end2end.TenantSpecificViewIndexSaltedIT
Running org.apache.phoenix.end2end.DecodeFunctionIT
Tests run: 19, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 27.459 sec - 
in org.apache.phoenix.end2end.DateTimeIT
Running org.apache.phoenix.end2end.ModulusExpressionIT
Tests run: 6, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 10.924 sec - in 
org.apache.phoenix.end2end.DecodeFunctionIT
Running org.apache.phoenix.end2end.OctetLengthFunctionEnd2EndIT
Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 19.296 sec - in 
org.apache.phoenix.end2end.CbrtFunctionEnd2EndIT
Running org.apache.phoenix.end2end.LastValueFunctionIT
Tests run: 15, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 284.611 sec - 
in org.apache.phoenix.end2end.index.LocalMutableIndexIT
Running org.apache.phoenix.end2end.UpgradeIT
Tests run: 11, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 13.417 sec - 
in org.apache.phoenix.end2end.ModulusExpressionIT
Running org.apache.phoenix.end2end.FirstValueFunctionIT
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 9.683 sec - in 
org.apache.phoenix.end2end.OctetLengthFunctionEnd2EndIT
Running org.apache.phoenix.end2end.DisableLocalIndexIT
Tests run: 7, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 11.65 sec - in 
org.apache.phoenix.end2end.FirstValueFunctionIT
Running org.apache.phoenix.end2end.HashJoinLocalIndexIT
Tests run: 11, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 21.269 sec - 
in org.apache.phoenix.end2end.LastValueFunctionIT
Runn

Apache-Phoenix | 4.5-HBase-0.98 | Build Successful

2015-08-14 Thread Apache Jenkins Server 
4.5-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.5-HBase-0.98

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

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

Changes
[ravi.magham] PHOENIX-2181: PhoenixHBaseLoader doesn't work with salted tables



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

phoenix git commit: Prepare for release - remove changes file as change URL is used in voting email

2015-08-14 Thread mujtaba 
Repository: phoenix
Updated Branches:
  refs/heads/4.5-HBase-0.98 2b63d07fa -> 7352ce573


Prepare for release - remove changes file as change URL is used in voting email


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

Branch: refs/heads/4.5-HBase-0.98
Commit: 7352ce573830a91fd3751ded0f8db78c8bc62867
Parents: 2b63d07
Author: Mujtaba 
Authored: Fri Aug 14 15:46:24 2015 -0700
Committer: Mujtaba 
Committed: Fri Aug 14 15:46:24 2015 -0700

--
 CHANGES| 673 
 dev/make_rc.sh |   1 -
 2 files changed, 674 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/7352ce57/CHANGES
--
diff --git a/CHANGES b/CHANGES
deleted file mode 100644
index 916d3d7..000
--- a/CHANGES
+++ /dev/null
@@ -1,673 +0,0 @@
-Release Notes - Phoenix - Version 4.5.1
-
-** Bug
-* [PHOENIX-1791] - Pherf - Support data creation to multi-tenant views
-* [PHOENIX-1994] - 
TestIndexWriter#testFailureOnRunningUpdateAbortsPending() deadlocks on JDK 8
-* [PHOENIX-2132] - Pherf - Drop all command line argument does not work
-* [PHOENIX-2137] - Range query on DECIMAL DESC sometimes incorrect
-* [PHOENIX-2138] - Non equality comparisons don't work for ARRAY type 
columns that are DESC in row key
-* [PHOENIX-2145] - Pherf - Fix threads not exiting after performance run
-* [PHOENIX-2149] - MAX Value of Sequences not honored when closing 
Connection between calls to NEXT VALUE FOR
-* [PHOENIX-2155] - Add gpg signing to release profile
-* [PHOENIX-2171] - DOUBLE and FLOAT DESC are stored as ASC
-* [PHOENIX-2177] - Adding a column to the view shouldn't call 
admin.modifyTable() for the base table.
-
-Release Notes - Phoenix - Version 4.5.0
-
-** Improvement
-* [PHOENIX-1660] - Implement missing math built-in functions
-* [PHOENIX-1763] - Support building with HBase-1.1.0 
-* [PHOENIX-1934] - queryserver support for Windows service descriptor
-* [PHOENIX-1965] - Upgrade Pig to version 0.13
-* [PHOENIX-1968] - Phoenix-Spark: Should support saving arrays
-* [PHOENIX-1975] - Detect and use HBASE_HOME when set
-* [PHOENIX-1996] - Use BytesStringer instead of ZeroCopyByteString
-* [PHOENIX-2012] - RowKeyComparisonFilter logs unencoded data at DEBUG 
level
-* [PHOENIX-2033] - PQS log environment details on launch
-* [PHOENIX-2095] - Lower the default for phoenix.sequence.saltBuckets
-* [PHOENIX-2110] - Primary key changes should be pushed to diverged views
-* [PHOENIX-2115] - Simplify Pherf generated dependency jar and pom.xml 
-* [PHOENIX-2120] - Padding character is not inverted as required for DESC 
CHAR columns
-* [PHOENIX-2126] - Improving performance of merge sort by multi-threaded 
and minheap implementation
-
-** New Feature
-* [PHOENIX-922] - Support SELECT without a from clause
-* [PHOENIX-1819] - Build a framework to capture and report phoenix client 
side request level metrics
-* [PHOENIX-1920] - Pherf - Add support for mixed r/w workloads
-* [PHOENIX-1954] - Reserve chunks of numbers for a sequence
-* [PHOENIX-2098] - Pig Udf that given a count Reserve chunks of numbers 
for a sequence
-
-** Sub-task
-* [PHOENIX-978] - Allow views to extend base table's PK (only if last PK 
column is fixed length)
-* [PHOENIX-1504] - Support adding column to a table that has views
-* [PHOENIX-1611] - Support ABS function 
-* [PHOENIX-1687] - Implement missing math built-in POWER function
-* [PHOENIX-1889] - Support alter/replace and drop functions
-* [PHOENIX-1890] - Provide queries for adding/deleting jars to/from common 
place in hdfs which is used by dynamic class loader
-* [PHOENIX-1984] - Return value of INSTR should be one-based instead of 
zero-based
-* [PHOENIX-1987] - SIGN built-in function should be order preserving
-* [PHOENIX-2015] - Implement Build-in math function CBRT
-* [PHOENIX-2018] - Implement math build-in function SQRT
-* [PHOENIX-2019] - Implement Build-in math function ln and log
-* [PHOENIX-2020] - Implement build-in math function EXP
-* [PHOENIX-2021] - Implement ARRAY_CAT built in function
-* [PHOENIX-2049] - Change ArraysWithNullsIT to be derived from 
BaseHBaseManagedTimeIT
-* [PHOENIX-2060] - Implement ARRAY_FILL built in function
-* [PHOENIX-2101] - Implement ARRAY_TO_STRING built in function
-
-** Bug
-* [PHOENIX-1277] - CSVCommonsLoader not allowing null CHAR values (non PK)
-* [PHOENIX-1659] - PhoenixDatabaseMetaData.getColumns does not return 
REMARKS colum

phoenix git commit: PHOENIX-2181: PhoenixHBaseLoader doesn't work with salted tables

2015-08-14 Thread ravimagham 
Repository: phoenix
Updated Branches:
  refs/heads/4.5-HBase-0.98 cbf13010d -> 2b63d07fa


PHOENIX-2181: PhoenixHBaseLoader doesn't work with salted tables


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

Branch: refs/heads/4.5-HBase-0.98
Commit: 2b63d07fad2a8b1fc8815422771e1f39bf9856c9
Parents: cbf1301
Author: Ravi Magham 
Authored: Fri Aug 14 14:24:14 2015 -0700
Committer: Ravi Magham 
Committed: Fri Aug 14 14:24:14 2015 -0700

--
 .../org/apache/phoenix/util/PhoenixRuntime.java |  4 +-
 .../phoenix/pig/PhoenixHBaseLoaderIT.java   | 47 
 2 files changed, 50 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/2b63d07f/phoenix-core/src/main/java/org/apache/phoenix/util/PhoenixRuntime.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/util/PhoenixRuntime.java 
b/phoenix-core/src/main/java/org/apache/phoenix/util/PhoenixRuntime.java
index fe451b5..95f9af0 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/util/PhoenixRuntime.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/util/PhoenixRuntime.java
@@ -381,7 +381,9 @@ public class PhoenixRuntime {
 Set unresolvedColumnNames = new TreeSet();
 if (columns == null || columns.isEmpty()) {
 // use all columns in the table
-for(PColumn pColumn : table.getColumns()) {
+   int offset = (table.getBucketNum() == null ? 0 : 1);
+   for (int i = offset; i < table.getColumns().size(); i++) {
+  PColumn pColumn = table.getColumns().get(i);
int sqlType = pColumn.getDataType().getSqlType();
columnInfoList.add(new ColumnInfo(pColumn.toString(), 
sqlType)); 
 }

http://git-wip-us.apache.org/repos/asf/phoenix/blob/2b63d07f/phoenix-pig/src/it/java/org/apache/phoenix/pig/PhoenixHBaseLoaderIT.java
--
diff --git 
a/phoenix-pig/src/it/java/org/apache/phoenix/pig/PhoenixHBaseLoaderIT.java 
b/phoenix-pig/src/it/java/org/apache/phoenix/pig/PhoenixHBaseLoaderIT.java
index 5b06eed..4f57f27 100644
--- a/phoenix-pig/src/it/java/org/apache/phoenix/pig/PhoenixHBaseLoaderIT.java
+++ b/phoenix-pig/src/it/java/org/apache/phoenix/pig/PhoenixHBaseLoaderIT.java
@@ -584,6 +584,53 @@ public class PhoenixHBaseLoaderIT extends 
BaseHBaseManagedTimeIT {
   dropTable(INDEX_NAME);
 }
 }
+
+   @Test 
+   public void testLoadOfSaltTable() throws Exception {
+   final String TABLE = "TABLE11";
+final String sourceTableddl = "CREATE TABLE  " + TABLE
++ "  (ID  INTEGER NOT NULL PRIMARY KEY, NAME VARCHAR, AGE 
INTEGER, SAL INTEGER) SALT_BUCKETS=2  ";
+ 
+conn.createStatement().execute(sourceTableddl);
+
+//prepare data with 10 rows having age 25 and the other 30.
+final String dml = "UPSERT INTO " + TABLE + " VALUES(?,?,?,?)";
+PreparedStatement stmt = conn.prepareStatement(dml);
+int rows = 20;
+int j = 0, k = 0;
+for(int i = 0 ; i < rows; i++) {
+stmt.setInt(1, i);
+stmt.setString(2, "a"+i);
+if(i % 2 == 0) {
+stmt.setInt(3, 25);
+stmt.setInt(4, 10 * 2 * j++);
+} else {
+stmt.setInt(3, 30);
+stmt.setInt(4, 10 * 3 * k++);
+}
+
+stmt.execute();
+}
+conn.commit();
+
+final Data data = Storage.resetData(pigServer);
+List expectedList = new ArrayList();
+expectedList.add(Storage.tuple(25,10));
+expectedList.add(Storage.tuple(30,10));
+
+pigServer.setBatchOn();
+pigServer.registerQuery(String.format(
+"A = load 'hbase://table/%s' using " + 
PhoenixHBaseLoader.class.getName() + "('%s');", TABLE,
+zkQuorum));
+
+pigServer.registerQuery("B = GROUP A BY AGE;");
+pigServer.registerQuery("C = FOREACH B GENERATE group,COUNT(A);");
+pigServer.registerQuery("STORE C INTO 'out' using mock.Storage();");
+pigServer.executeBatch();
+
+List actualList = data.get("out");
+assertEquals(expectedList.size(), actualList.size());
+   }
 
 @After
 public void tearDown() throws Exception {

[5/5] phoenix git commit: PHOENIX-2181: PhoenixHBaseLoader doesn't work with salted tables

2015-08-14 Thread ravimagham 
PHOENIX-2181: PhoenixHBaseLoader doesn't work with salted tables


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

Branch: refs/heads/4.5-HBase-1.0
Commit: 715e0451dccc2452a6f5e61b5ff09d27702dc045
Parents: 163c84e
Author: Ravi Magham 
Authored: Fri Aug 14 14:23:37 2015 -0700
Committer: Ravi Magham 
Committed: Fri Aug 14 14:23:37 2015 -0700

--
 .../org/apache/phoenix/util/PhoenixRuntime.java |  4 +-
 .../phoenix/pig/PhoenixHBaseLoaderIT.java   | 47 
 2 files changed, 50 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/715e0451/phoenix-core/src/main/java/org/apache/phoenix/util/PhoenixRuntime.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/util/PhoenixRuntime.java 
b/phoenix-core/src/main/java/org/apache/phoenix/util/PhoenixRuntime.java
index 586cedd..4f87765 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/util/PhoenixRuntime.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/util/PhoenixRuntime.java
@@ -386,7 +386,9 @@ public class PhoenixRuntime {
 Set unresolvedColumnNames = new TreeSet();
 if (columns == null || columns.isEmpty()) {
 // use all columns in the table
-for(PColumn pColumn : table.getColumns()) {
+   int offset = (table.getBucketNum() == null ? 0 : 1);
+   for (int i = offset; i < table.getColumns().size(); i++) {
+  PColumn pColumn = table.getColumns().get(i);
int sqlType = pColumn.getDataType().getSqlType();
columnInfoList.add(new ColumnInfo(pColumn.toString(), 
sqlType)); 
 }

http://git-wip-us.apache.org/repos/asf/phoenix/blob/715e0451/phoenix-pig/src/it/java/org/apache/phoenix/pig/PhoenixHBaseLoaderIT.java
--
diff --git 
a/phoenix-pig/src/it/java/org/apache/phoenix/pig/PhoenixHBaseLoaderIT.java 
b/phoenix-pig/src/it/java/org/apache/phoenix/pig/PhoenixHBaseLoaderIT.java
index 53a62ee..25458d6 100644
--- a/phoenix-pig/src/it/java/org/apache/phoenix/pig/PhoenixHBaseLoaderIT.java
+++ b/phoenix-pig/src/it/java/org/apache/phoenix/pig/PhoenixHBaseLoaderIT.java
@@ -582,6 +582,53 @@ public class PhoenixHBaseLoaderIT extends 
BaseHBaseManagedTimeIT {
   dropTable(INDEX_NAME);
 }
 }
+
+   @Test 
+   public void testLoadOfSaltTable() throws Exception {
+   final String TABLE = "TABLE11";
+final String sourceTableddl = "CREATE TABLE  " + TABLE
++ "  (ID  INTEGER NOT NULL PRIMARY KEY, NAME VARCHAR, AGE 
INTEGER, SAL INTEGER) SALT_BUCKETS=2  ";
+ 
+conn.createStatement().execute(sourceTableddl);
+
+//prepare data with 10 rows having age 25 and the other 30.
+final String dml = "UPSERT INTO " + TABLE + " VALUES(?,?,?,?)";
+PreparedStatement stmt = conn.prepareStatement(dml);
+int rows = 20;
+int j = 0, k = 0;
+for(int i = 0 ; i < rows; i++) {
+stmt.setInt(1, i);
+stmt.setString(2, "a"+i);
+if(i % 2 == 0) {
+stmt.setInt(3, 25);
+stmt.setInt(4, 10 * 2 * j++);
+} else {
+stmt.setInt(3, 30);
+stmt.setInt(4, 10 * 3 * k++);
+}
+
+stmt.execute();
+}
+conn.commit();
+
+final Data data = Storage.resetData(pigServer);
+List expectedList = new ArrayList();
+expectedList.add(Storage.tuple(25,10));
+expectedList.add(Storage.tuple(30,10));
+
+pigServer.setBatchOn();
+pigServer.registerQuery(String.format(
+"A = load 'hbase://table/%s' using " + 
PhoenixHBaseLoader.class.getName() + "('%s');", TABLE,
+zkQuorum));
+
+pigServer.registerQuery("B = GROUP A BY AGE;");
+pigServer.registerQuery("C = FOREACH B GENERATE group,COUNT(A);");
+pigServer.registerQuery("STORE C INTO 'out' using mock.Storage();");
+pigServer.executeBatch();
+
+List actualList = data.get("out");
+assertEquals(expectedList.size(), actualList.size());
+   }
 
 @After
 public void tearDown() throws Exception {

[1/5] phoenix git commit: PHOENIX-2181: PhoenixHBaseLoader doesn't work with salted tables

2015-08-14 Thread ravimagham 
Repository: phoenix
Updated Branches:
  refs/heads/4.5-HBase-1.0 163c84e5f -> 715e0451d
  refs/heads/4.5-HBase-1.1 11f569d53 -> 42c22647e
  refs/heads/4.x-HBase-0.98 25cc14e09 -> 918c0bc0d
  refs/heads/4.x-HBase-1.0 d6f9c678b -> 608cb5be6
  refs/heads/master 8a1566c03 -> c6a3d6f9c


PHOENIX-2181: PhoenixHBaseLoader doesn't work with salted tables


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

Branch: refs/heads/master
Commit: c6a3d6f9ced2aeb6dadb44b899368d3da1a3b6ae
Parents: 8a1566c
Author: Ravi Magham 
Authored: Fri Aug 14 14:19:16 2015 -0700
Committer: Ravi Magham 
Committed: Fri Aug 14 14:19:16 2015 -0700

--
 .../org/apache/phoenix/util/PhoenixRuntime.java |  4 +-
 .../phoenix/pig/PhoenixHBaseLoaderIT.java   | 47 
 2 files changed, 50 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/c6a3d6f9/phoenix-core/src/main/java/org/apache/phoenix/util/PhoenixRuntime.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/util/PhoenixRuntime.java 
b/phoenix-core/src/main/java/org/apache/phoenix/util/PhoenixRuntime.java
index 586cedd..4f87765 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/util/PhoenixRuntime.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/util/PhoenixRuntime.java
@@ -386,7 +386,9 @@ public class PhoenixRuntime {
 Set unresolvedColumnNames = new TreeSet();
 if (columns == null || columns.isEmpty()) {
 // use all columns in the table
-for(PColumn pColumn : table.getColumns()) {
+   int offset = (table.getBucketNum() == null ? 0 : 1);
+   for (int i = offset; i < table.getColumns().size(); i++) {
+  PColumn pColumn = table.getColumns().get(i);
int sqlType = pColumn.getDataType().getSqlType();
columnInfoList.add(new ColumnInfo(pColumn.toString(), 
sqlType)); 
 }

http://git-wip-us.apache.org/repos/asf/phoenix/blob/c6a3d6f9/phoenix-pig/src/it/java/org/apache/phoenix/pig/PhoenixHBaseLoaderIT.java
--
diff --git 
a/phoenix-pig/src/it/java/org/apache/phoenix/pig/PhoenixHBaseLoaderIT.java 
b/phoenix-pig/src/it/java/org/apache/phoenix/pig/PhoenixHBaseLoaderIT.java
index 53a62ee..25458d6 100644
--- a/phoenix-pig/src/it/java/org/apache/phoenix/pig/PhoenixHBaseLoaderIT.java
+++ b/phoenix-pig/src/it/java/org/apache/phoenix/pig/PhoenixHBaseLoaderIT.java
@@ -582,6 +582,53 @@ public class PhoenixHBaseLoaderIT extends 
BaseHBaseManagedTimeIT {
   dropTable(INDEX_NAME);
 }
 }
+
+   @Test 
+   public void testLoadOfSaltTable() throws Exception {
+   final String TABLE = "TABLE11";
+final String sourceTableddl = "CREATE TABLE  " + TABLE
++ "  (ID  INTEGER NOT NULL PRIMARY KEY, NAME VARCHAR, AGE 
INTEGER, SAL INTEGER) SALT_BUCKETS=2  ";
+ 
+conn.createStatement().execute(sourceTableddl);
+
+//prepare data with 10 rows having age 25 and the other 30.
+final String dml = "UPSERT INTO " + TABLE + " VALUES(?,?,?,?)";
+PreparedStatement stmt = conn.prepareStatement(dml);
+int rows = 20;
+int j = 0, k = 0;
+for(int i = 0 ; i < rows; i++) {
+stmt.setInt(1, i);
+stmt.setString(2, "a"+i);
+if(i % 2 == 0) {
+stmt.setInt(3, 25);
+stmt.setInt(4, 10 * 2 * j++);
+} else {
+stmt.setInt(3, 30);
+stmt.setInt(4, 10 * 3 * k++);
+}
+
+stmt.execute();
+}
+conn.commit();
+
+final Data data = Storage.resetData(pigServer);
+List expectedList = new ArrayList();
+expectedList.add(Storage.tuple(25,10));
+expectedList.add(Storage.tuple(30,10));
+
+pigServer.setBatchOn();
+pigServer.registerQuery(String.format(
+"A = load 'hbase://table/%s' using " + 
PhoenixHBaseLoader.class.getName() + "('%s');", TABLE,
+zkQuorum));
+
+pigServer.registerQuery("B = GROUP A BY AGE;");
+pigServer.registerQuery("C = FOREACH B GENERATE group,COUNT(A);");
+pigServer.registerQuery("STORE C INTO 'out' using mock.Storage();");
+pigServer.executeBatch();
+
+List actualList = data.get("out");
+assertEquals(expectedList.size(), actualList.size());
+   }
 
 @After
 public void tearDown() throws

[3/5] phoenix git commit: PHOENIX-2181: PhoenixHBaseLoader doesn't work with salted tables

2015-08-14 Thread ravimagham 
PHOENIX-2181: PhoenixHBaseLoader doesn't work with salted tables


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

Branch: refs/heads/4.x-HBase-0.98
Commit: 918c0bc0d20fd02db957e04b54456464c760329c
Parents: 25cc14e
Author: Ravi Magham 
Authored: Fri Aug 14 14:22:09 2015 -0700
Committer: Ravi Magham 
Committed: Fri Aug 14 14:22:09 2015 -0700

--
 .../org/apache/phoenix/util/PhoenixRuntime.java |  4 +-
 .../phoenix/pig/PhoenixHBaseLoaderIT.java   | 47 
 2 files changed, 50 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/918c0bc0/phoenix-core/src/main/java/org/apache/phoenix/util/PhoenixRuntime.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/util/PhoenixRuntime.java 
b/phoenix-core/src/main/java/org/apache/phoenix/util/PhoenixRuntime.java
index fe451b5..95f9af0 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/util/PhoenixRuntime.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/util/PhoenixRuntime.java
@@ -381,7 +381,9 @@ public class PhoenixRuntime {
 Set unresolvedColumnNames = new TreeSet();
 if (columns == null || columns.isEmpty()) {
 // use all columns in the table
-for(PColumn pColumn : table.getColumns()) {
+   int offset = (table.getBucketNum() == null ? 0 : 1);
+   for (int i = offset; i < table.getColumns().size(); i++) {
+  PColumn pColumn = table.getColumns().get(i);
int sqlType = pColumn.getDataType().getSqlType();
columnInfoList.add(new ColumnInfo(pColumn.toString(), 
sqlType)); 
 }

http://git-wip-us.apache.org/repos/asf/phoenix/blob/918c0bc0/phoenix-pig/src/it/java/org/apache/phoenix/pig/PhoenixHBaseLoaderIT.java
--
diff --git 
a/phoenix-pig/src/it/java/org/apache/phoenix/pig/PhoenixHBaseLoaderIT.java 
b/phoenix-pig/src/it/java/org/apache/phoenix/pig/PhoenixHBaseLoaderIT.java
index 5b06eed..4f57f27 100644
--- a/phoenix-pig/src/it/java/org/apache/phoenix/pig/PhoenixHBaseLoaderIT.java
+++ b/phoenix-pig/src/it/java/org/apache/phoenix/pig/PhoenixHBaseLoaderIT.java
@@ -584,6 +584,53 @@ public class PhoenixHBaseLoaderIT extends 
BaseHBaseManagedTimeIT {
   dropTable(INDEX_NAME);
 }
 }
+
+   @Test 
+   public void testLoadOfSaltTable() throws Exception {
+   final String TABLE = "TABLE11";
+final String sourceTableddl = "CREATE TABLE  " + TABLE
++ "  (ID  INTEGER NOT NULL PRIMARY KEY, NAME VARCHAR, AGE 
INTEGER, SAL INTEGER) SALT_BUCKETS=2  ";
+ 
+conn.createStatement().execute(sourceTableddl);
+
+//prepare data with 10 rows having age 25 and the other 30.
+final String dml = "UPSERT INTO " + TABLE + " VALUES(?,?,?,?)";
+PreparedStatement stmt = conn.prepareStatement(dml);
+int rows = 20;
+int j = 0, k = 0;
+for(int i = 0 ; i < rows; i++) {
+stmt.setInt(1, i);
+stmt.setString(2, "a"+i);
+if(i % 2 == 0) {
+stmt.setInt(3, 25);
+stmt.setInt(4, 10 * 2 * j++);
+} else {
+stmt.setInt(3, 30);
+stmt.setInt(4, 10 * 3 * k++);
+}
+
+stmt.execute();
+}
+conn.commit();
+
+final Data data = Storage.resetData(pigServer);
+List expectedList = new ArrayList();
+expectedList.add(Storage.tuple(25,10));
+expectedList.add(Storage.tuple(30,10));
+
+pigServer.setBatchOn();
+pigServer.registerQuery(String.format(
+"A = load 'hbase://table/%s' using " + 
PhoenixHBaseLoader.class.getName() + "('%s');", TABLE,
+zkQuorum));
+
+pigServer.registerQuery("B = GROUP A BY AGE;");
+pigServer.registerQuery("C = FOREACH B GENERATE group,COUNT(A);");
+pigServer.registerQuery("STORE C INTO 'out' using mock.Storage();");
+pigServer.executeBatch();
+
+List actualList = data.get("out");
+assertEquals(expectedList.size(), actualList.size());
+   }
 
 @After
 public void tearDown() throws Exception {

[2/5] phoenix git commit: PHOENIX-2181: PhoenixHBaseLoader doesn't work with salted tables

2015-08-14 Thread ravimagham 
PHOENIX-2181: PhoenixHBaseLoader doesn't work with salted tables


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

Branch: refs/heads/4.x-HBase-1.0
Commit: 608cb5be66994f2ebfb07c6df90f51bb4c91638e
Parents: d6f9c67
Author: Ravi Magham 
Authored: Fri Aug 14 14:21:30 2015 -0700
Committer: Ravi Magham 
Committed: Fri Aug 14 14:21:30 2015 -0700

--
 .../org/apache/phoenix/util/PhoenixRuntime.java |  4 +-
 .../phoenix/pig/PhoenixHBaseLoaderIT.java   | 47 
 2 files changed, 50 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/608cb5be/phoenix-core/src/main/java/org/apache/phoenix/util/PhoenixRuntime.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/util/PhoenixRuntime.java 
b/phoenix-core/src/main/java/org/apache/phoenix/util/PhoenixRuntime.java
index 586cedd..4f87765 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/util/PhoenixRuntime.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/util/PhoenixRuntime.java
@@ -386,7 +386,9 @@ public class PhoenixRuntime {
 Set unresolvedColumnNames = new TreeSet();
 if (columns == null || columns.isEmpty()) {
 // use all columns in the table
-for(PColumn pColumn : table.getColumns()) {
+   int offset = (table.getBucketNum() == null ? 0 : 1);
+   for (int i = offset; i < table.getColumns().size(); i++) {
+  PColumn pColumn = table.getColumns().get(i);
int sqlType = pColumn.getDataType().getSqlType();
columnInfoList.add(new ColumnInfo(pColumn.toString(), 
sqlType)); 
 }

http://git-wip-us.apache.org/repos/asf/phoenix/blob/608cb5be/phoenix-pig/src/it/java/org/apache/phoenix/pig/PhoenixHBaseLoaderIT.java
--
diff --git 
a/phoenix-pig/src/it/java/org/apache/phoenix/pig/PhoenixHBaseLoaderIT.java 
b/phoenix-pig/src/it/java/org/apache/phoenix/pig/PhoenixHBaseLoaderIT.java
index 53a62ee..25458d6 100644
--- a/phoenix-pig/src/it/java/org/apache/phoenix/pig/PhoenixHBaseLoaderIT.java
+++ b/phoenix-pig/src/it/java/org/apache/phoenix/pig/PhoenixHBaseLoaderIT.java
@@ -582,6 +582,53 @@ public class PhoenixHBaseLoaderIT extends 
BaseHBaseManagedTimeIT {
   dropTable(INDEX_NAME);
 }
 }
+
+   @Test 
+   public void testLoadOfSaltTable() throws Exception {
+   final String TABLE = "TABLE11";
+final String sourceTableddl = "CREATE TABLE  " + TABLE
++ "  (ID  INTEGER NOT NULL PRIMARY KEY, NAME VARCHAR, AGE 
INTEGER, SAL INTEGER) SALT_BUCKETS=2  ";
+ 
+conn.createStatement().execute(sourceTableddl);
+
+//prepare data with 10 rows having age 25 and the other 30.
+final String dml = "UPSERT INTO " + TABLE + " VALUES(?,?,?,?)";
+PreparedStatement stmt = conn.prepareStatement(dml);
+int rows = 20;
+int j = 0, k = 0;
+for(int i = 0 ; i < rows; i++) {
+stmt.setInt(1, i);
+stmt.setString(2, "a"+i);
+if(i % 2 == 0) {
+stmt.setInt(3, 25);
+stmt.setInt(4, 10 * 2 * j++);
+} else {
+stmt.setInt(3, 30);
+stmt.setInt(4, 10 * 3 * k++);
+}
+
+stmt.execute();
+}
+conn.commit();
+
+final Data data = Storage.resetData(pigServer);
+List expectedList = new ArrayList();
+expectedList.add(Storage.tuple(25,10));
+expectedList.add(Storage.tuple(30,10));
+
+pigServer.setBatchOn();
+pigServer.registerQuery(String.format(
+"A = load 'hbase://table/%s' using " + 
PhoenixHBaseLoader.class.getName() + "('%s');", TABLE,
+zkQuorum));
+
+pigServer.registerQuery("B = GROUP A BY AGE;");
+pigServer.registerQuery("C = FOREACH B GENERATE group,COUNT(A);");
+pigServer.registerQuery("STORE C INTO 'out' using mock.Storage();");
+pigServer.executeBatch();
+
+List actualList = data.get("out");
+assertEquals(expectedList.size(), actualList.size());
+   }
 
 @After
 public void tearDown() throws Exception {

[4/5] phoenix git commit: PHOENIX-2181: PhoenixHBaseLoader doesn't work with salted tables

2015-08-14 Thread ravimagham 
PHOENIX-2181: PhoenixHBaseLoader doesn't work with salted tables


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

Branch: refs/heads/4.5-HBase-1.1
Commit: 42c22647ee5c335f2b36805b0222d3523a2b9f1e
Parents: 11f569d
Author: Ravi Magham 
Authored: Fri Aug 14 14:22:49 2015 -0700
Committer: Ravi Magham 
Committed: Fri Aug 14 14:22:49 2015 -0700

--
 .../org/apache/phoenix/util/PhoenixRuntime.java |  4 +-
 .../phoenix/pig/PhoenixHBaseLoaderIT.java   | 47 
 2 files changed, 50 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/42c22647/phoenix-core/src/main/java/org/apache/phoenix/util/PhoenixRuntime.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/util/PhoenixRuntime.java 
b/phoenix-core/src/main/java/org/apache/phoenix/util/PhoenixRuntime.java
index 586cedd..4f87765 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/util/PhoenixRuntime.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/util/PhoenixRuntime.java
@@ -386,7 +386,9 @@ public class PhoenixRuntime {
 Set unresolvedColumnNames = new TreeSet();
 if (columns == null || columns.isEmpty()) {
 // use all columns in the table
-for(PColumn pColumn : table.getColumns()) {
+   int offset = (table.getBucketNum() == null ? 0 : 1);
+   for (int i = offset; i < table.getColumns().size(); i++) {
+  PColumn pColumn = table.getColumns().get(i);
int sqlType = pColumn.getDataType().getSqlType();
columnInfoList.add(new ColumnInfo(pColumn.toString(), 
sqlType)); 
 }

http://git-wip-us.apache.org/repos/asf/phoenix/blob/42c22647/phoenix-pig/src/it/java/org/apache/phoenix/pig/PhoenixHBaseLoaderIT.java
--
diff --git 
a/phoenix-pig/src/it/java/org/apache/phoenix/pig/PhoenixHBaseLoaderIT.java 
b/phoenix-pig/src/it/java/org/apache/phoenix/pig/PhoenixHBaseLoaderIT.java
index 53a62ee..25458d6 100644
--- a/phoenix-pig/src/it/java/org/apache/phoenix/pig/PhoenixHBaseLoaderIT.java
+++ b/phoenix-pig/src/it/java/org/apache/phoenix/pig/PhoenixHBaseLoaderIT.java
@@ -582,6 +582,53 @@ public class PhoenixHBaseLoaderIT extends 
BaseHBaseManagedTimeIT {
   dropTable(INDEX_NAME);
 }
 }
+
+   @Test 
+   public void testLoadOfSaltTable() throws Exception {
+   final String TABLE = "TABLE11";
+final String sourceTableddl = "CREATE TABLE  " + TABLE
++ "  (ID  INTEGER NOT NULL PRIMARY KEY, NAME VARCHAR, AGE 
INTEGER, SAL INTEGER) SALT_BUCKETS=2  ";
+ 
+conn.createStatement().execute(sourceTableddl);
+
+//prepare data with 10 rows having age 25 and the other 30.
+final String dml = "UPSERT INTO " + TABLE + " VALUES(?,?,?,?)";
+PreparedStatement stmt = conn.prepareStatement(dml);
+int rows = 20;
+int j = 0, k = 0;
+for(int i = 0 ; i < rows; i++) {
+stmt.setInt(1, i);
+stmt.setString(2, "a"+i);
+if(i % 2 == 0) {
+stmt.setInt(3, 25);
+stmt.setInt(4, 10 * 2 * j++);
+} else {
+stmt.setInt(3, 30);
+stmt.setInt(4, 10 * 3 * k++);
+}
+
+stmt.execute();
+}
+conn.commit();
+
+final Data data = Storage.resetData(pigServer);
+List expectedList = new ArrayList();
+expectedList.add(Storage.tuple(25,10));
+expectedList.add(Storage.tuple(30,10));
+
+pigServer.setBatchOn();
+pigServer.registerQuery(String.format(
+"A = load 'hbase://table/%s' using " + 
PhoenixHBaseLoader.class.getName() + "('%s');", TABLE,
+zkQuorum));
+
+pigServer.registerQuery("B = GROUP A BY AGE;");
+pigServer.registerQuery("C = FOREACH B GENERATE group,COUNT(A);");
+pigServer.registerQuery("STORE C INTO 'out' using mock.Storage();");
+pigServer.executeBatch();
+
+List actualList = data.get("out");
+assertEquals(expectedList.size(), actualList.size());
+   }
 
 @After
 public void tearDown() throws Exception {

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

2015-08-14 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
[elilevine] PHOENIX-1673 Allow TenantId to be of any integral data type



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-1673 Allow TenantId to be of any integral data type

2015-08-14 Thread elilevine 
Repository: phoenix
Updated Branches:
  refs/heads/4.x-HBase-1.0 71c19099d -> d6f9c678b


PHOENIX-1673 Allow TenantId to be of any integral data type


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

Branch: refs/heads/4.x-HBase-1.0
Commit: d6f9c678b98f2bbf88c9494749535abef412a4d2
Parents: 71c1909
Author: Jeffrey Lyons 
Authored: Thu Jul 9 10:07:40 2015 -0400
Committer: Eli Levine 
Committed: Fri Aug 14 13:07:52 2015 -0700

--
 .../end2end/BaseTenantSpecificViewIndexIT.java  |  33 ++-
 .../apache/phoenix/end2end/CreateTableIT.java   |  25 ++
 .../apache/phoenix/end2end/TenantIdTypeIT.java  | 226 ++
 .../end2end/TenantSpecificTablesDDLIT.java  |  12 -
 .../end2end/TenantSpecificViewIndexIT.java  |   5 +
 .../apache/phoenix/compile/DeleteCompiler.java  |   3 +-
 .../apache/phoenix/compile/UpsertCompiler.java  |   3 +-
 .../apache/phoenix/compile/WhereOptimizer.java  |  11 +-
 .../phoenix/exception/SQLExceptionCode.java |   3 +-
 .../apache/phoenix/execute/BaseQueryPlan.java   |  14 +-
 .../apache/phoenix/execute/MutationState.java   |  24 +-
 .../apache/phoenix/schema/MetaDataClient.java   |   4 +-
 .../java/org/apache/phoenix/util/ScanUtil.java  |  34 ++-
 .../util/TenantIdByteConversionTest.java| 294 +++
 14 files changed, 632 insertions(+), 59 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/d6f9c678/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseTenantSpecificViewIndexIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseTenantSpecificViewIndexIT.java
 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseTenantSpecificViewIndexIT.java
index 93fc222..b450643 100644
--- 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseTenantSpecificViewIndexIT.java
+++ 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseTenantSpecificViewIndexIT.java
@@ -40,6 +40,7 @@ public class BaseTenantSpecificViewIndexIT extends 
BaseHBaseManagedTimeIT {
 
 public static final String TENANT1_ID = "tenant1";
 public static final String TENANT2_ID = "tenant2";
+public static final String NON_STRING_TENANT_ID = "1234";
 
 protected Set> tenantViewsToDelete = newHashSet();
 
@@ -48,7 +49,7 @@ public class BaseTenantSpecificViewIndexIT extends 
BaseHBaseManagedTimeIT {
 }
 
 protected void testUpdatableView(Integer saltBuckets, boolean localIndex) 
throws Exception {
-createBaseTable("t", saltBuckets);
+createBaseTable("t", saltBuckets, true);
 Connection conn = createTenantConnection(TENANT1_ID);
 try {
 createAndPopulateTenantView(conn, TENANT1_ID, "t", "");
@@ -58,13 +59,25 @@ public class BaseTenantSpecificViewIndexIT extends 
BaseHBaseManagedTimeIT {
 try { conn.close();} catch (Exception ignored) {}
 }
 }
+
+protected void testUpdatableViewNonString(Integer saltBuckets, boolean 
localIndex) throws Exception {
+createBaseTable("t", saltBuckets, false);
+Connection conn = createTenantConnection(NON_STRING_TENANT_ID);
+try {
+createAndPopulateTenantView(conn, NON_STRING_TENANT_ID, "t", "");
+createAndVerifyIndexNonStringTenantId(conn, NON_STRING_TENANT_ID, 
"");
+verifyViewData(conn, "");
+} finally {
+try { conn.close();} catch (Exception ignored) {}
+}
+}
 
 protected void testUpdatableViewsWithSameNameDifferentTenants(Integer 
saltBuckets) throws Exception {
 testUpdatableViewsWithSameNameDifferentTenants(saltBuckets, false);
 }
 
 protected void testUpdatableViewsWithSameNameDifferentTenants(Integer 
saltBuckets, boolean localIndex) throws Exception {
-createBaseTable("t", saltBuckets);
+createBaseTable("t", saltBuckets, true);
 Connection conn1 = createTenantConnection(TENANT1_ID);
 Connection conn2 = createTenantConnection(TENANT2_ID);
 try {
@@ -86,9 +99,10 @@ public class BaseTenantSpecificViewIndexIT extends 
BaseHBaseManagedTimeIT {
 }
 }
 
-private void createBaseTable(String tableName, Integer saltBuckets) throws 
SQLException {
+private void createBaseTable(String tableName, Integer saltBuckets, 
boolean hasStringTenantId) throws SQLException {
 Connection conn = DriverManager.getConnection(getUrl());
-String ddl = "CREATE TABLE " + tableName + " (t_id VARCHAR NOT 
NULL,\n" +
+String tenantIdType = hasStringTenantId ? "VARCHAR" : "BIGINT";
+String ddl = "CREATE TAB