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

2016-07-24 Thread Apache Jenkins Server
See 

Changes:

[jamestaylor] PHOENIX-2900 Unable to find hash cache once a salted table 's 
first

[jamestaylor] PHOENIX-3075 Phoenix-hive module is writing under ./build instead 
of

--
[...truncated 2125 lines...]

Running org.apache.phoenix.end2end.index.MutableIndexReplicationIT
Tests run: 1, Failures: 0, Errors: 1, Skipped: 0, Time elapsed: 0.006 sec <<< 
FAILURE! - in org.apache.phoenix.end2end.index.MutableIndexReplicationIT
org.apache.phoenix.end2end.index.MutableIndexReplicationIT  Time elapsed: 0.005 
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)

Running org.apache.phoenix.hbase.index.FailForUnsupportedHBaseVersionsIT
Running org.apache.phoenix.end2end.index.ReadOnlyIndexFailureIT
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.004 
sec  <<< ERROR!
java.lang.RuntimeException: java.io.IOException: Shutting down
at 
org.apache.phoenix.end2end.index.ReadOnlyIndexFailureIT.doSetup(ReadOnlyIndexFailureIT.java:119)
Caused by: java.io.IOException: Shutting down
at 
org.apache.phoenix.end2end.index.ReadOnlyIndexFailureIT.doSetup(ReadOnlyIndexFailureIT.java:119)
Caused by: java.lang.RuntimeException: Master not initialized after 20ms 
seconds
at 
org.apache.phoenix.end2end.index.ReadOnlyIndexFailureIT.doSetup(ReadOnlyIndexFailureIT.java:119)

Running org.apache.phoenix.end2end.index.txn.TxWriteFailureIT
Tests run: 1, Failures: 0, Errors: 1, Skipped: 0, Time elapsed: 0.007 sec <<< 
FAILURE! - in org.apache.phoenix.end2end.index.txn.TxWriteFailureIT
org.apache.phoenix.end2end.index.txn.TxWriteFailureIT  Time elapsed: 0.006 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: 2, Failures: 0, Errors: 1, Skipped: 0, Time elapsed: 208.292 sec <<< 
FAILURE! - in org.apache.phoenix.hbase.index.FailForUnsupportedHBaseVersionsIT
testDoesNotStartRegionServerForUnsupportedCompressionAndVersion(org.apache.phoenix.hbase.index.FailForUnsupportedHBaseVersionsIT)
  Time elapsed: 207.873 sec  <<< ERROR!
java.io.IOException: Shutting down
at 
org.apache.phoenix.hbase.index.FailForUnsupportedHBaseVersionsIT.testDoesNotStartRegionServerForUnsupportedCompressionAndVersion(FailForUnsupportedHBaseVersionsIT.java:121)
Caused by: java.lang.RuntimeException: Master not initialized after 20ms 
seconds
at 
org.apache.phoenix.hbase.index.FailForUnsupportedHBaseVersionsIT.testDoesNotStartRegionServerForUnsupportedCompressionAndVersion(FailForUnsupportedHBaseVersionsIT.java:121)

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

Running 
org.apache.phoenix.hbase.index.covered.EndToEndCoveredColumnsIndexBuilderIT
Tests run: 1, Failures: 0, Errors: 1, Skipped: 0, Time elapsed: 0.005 sec <<< 
FAILURE! - in 
org.apache.phoenix.hbase.index.covered.EndToEndCoveredColumnsIndexBuilderIT
org.apache.phoenix.hbase.index.covered.EndToEndCoveredColumnsIndexBuilderIT  
Time elapsed: 0.005 sec  <<< ERROR!
java.io.IOException: Shutting down
at 
org.apache.phoenix.hbase.index.covered.EndToEndCoveredC

Jenkins build is back to normal : Phoenix | Master #1338

2016-07-24 Thread Apache Jenkins Server
See 



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

2016-07-24 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
[jamestaylor] PHOENIX-2900 Unable to find hash cache once a salted table 's first

[jamestaylor] PHOENIX-3075 Phoenix-hive module is writing under ./build instead of



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


Build failed in Jenkins: Phoenix | 4.x-HBase-0.98 #1243

2016-07-24 Thread Apache Jenkins Server
See 

Changes:

[jamestaylor] PHOENIX-2900 Unable to find hash cache once a salted table 's 
first

[jamestaylor] PHOENIX-3075 Phoenix-hive module is writing under ./build instead 
of

--
[...truncated 695 lines...]
Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 2.281 sec - in 
org.apache.phoenix.trace.PhoenixTableMetricsWriterIT
Running org.apache.phoenix.trace.PhoenixTraceReaderIT
Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.744 sec - in 
org.apache.phoenix.trace.PhoenixTraceReaderIT
Running org.apache.phoenix.trace.PhoenixTracingEndToEndIT
Tests run: 9, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 71.68 sec - in 
org.apache.phoenix.iterate.RoundRobinResultIteratorIT
Running org.apache.phoenix.tx.TransactionIT
Tests run: 6, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 87.105 sec - in 
org.apache.phoenix.trace.PhoenixTracingEndToEndIT
Running org.apache.phoenix.tx.TxCheckpointIT
Tests run: 40, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 372.939 sec - 
in org.apache.phoenix.end2end.index.LocalIndexIT
Tests run: 21, Failures: 0, Errors: 0, Skipped: 1, Time elapsed: 162.699 sec - 
in org.apache.phoenix.tx.TransactionIT
Tests run: 20, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 98.478 sec - 
in org.apache.phoenix.tx.TxCheckpointIT
Tests run: 128, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 513.693 sec - 
in org.apache.phoenix.end2end.index.IndexIT
Tests run: 40, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 605.535 sec - 
in org.apache.phoenix.end2end.index.MutableIndexIT

Results :

Tests run: 1198, Failures: 0, Errors: 0, Skipped: 5

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

---
 T E S T S
---
Running org.apache.phoenix.end2end.ArithmeticQueryIT
Running org.apache.phoenix.end2end.ArrayToStringFunctionIT
Running org.apache.phoenix.end2end.ArraysWithNullsIT
Running org.apache.phoenix.end2end.AbsFunctionEnd2EndIT
Running org.apache.phoenix.end2end.ArrayFillFunctionIT
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 1.73 sec - in 
org.apache.phoenix.end2end.AbsFunctionEnd2EndIT
Running org.apache.phoenix.end2end.AutoCommitIT
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 1.73 sec - in 
org.apache.phoenix.end2end.AutoCommitIT
Running org.apache.phoenix.end2end.CbrtFunctionEnd2EndIT
Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.413 sec - in 
org.apache.phoenix.end2end.CbrtFunctionEnd2EndIT
Running org.apache.phoenix.end2end.ConvertTimezoneFunctionIT
Tests run: 26, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 9.421 sec - in 
org.apache.phoenix.end2end.ArrayFillFunctionIT
Running org.apache.phoenix.end2end.DecodeFunctionIT
Tests run: 36, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 12.96 sec - in 
org.apache.phoenix.end2end.ArrayToStringFunctionIT
Tests run: 7, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 9.147 sec - in 
org.apache.phoenix.end2end.ConvertTimezoneFunctionIT
Tests run: 6, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 6.889 sec - in 
org.apache.phoenix.end2end.DecodeFunctionIT
Running org.apache.phoenix.end2end.DynamicFamilyIT
Running org.apache.phoenix.end2end.DynamicUpsertIT
Tests run: 7, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.199 sec - in 
org.apache.phoenix.end2end.DynamicUpsertIT
Running org.apache.phoenix.end2end.FirstValueFunctionIT
Tests run: 4, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 2.807 sec - in 
org.apache.phoenix.end2end.DynamicFamilyIT
Tests run: 16, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 21.221 sec - 
in org.apache.phoenix.end2end.ArraysWithNullsIT
Running org.apache.phoenix.end2end.GetSetByteBitFunctionEnd2EndIT
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.191 sec - in 
org.apache.phoenix.end2end.GetSetByteBitFunctionEnd2EndIT
Running org.apache.phoenix.end2end.MD5FunctionIT
Running org.apache.phoenix.end2end.LikeExpressionIT
Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 2.488 sec - in 
org.apache.phoenix.end2end.LikeExpressionIT
Running org.apache.phoenix.end2end.MinMaxAggregateFunctionIT
Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 4.089 sec - in 
org.apache.phoenix.end2end.MD5FunctionIT
Running org.apache.phoenix.end2end.NthValueFunctionIT
Running org.apache.phoenix.end2end.DistinctPrefixFilterIT
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 1.696 sec - in 
org.apache.phoenix.end2end.MinMaxAggregateFunctionIT
Running org.apache.phoenix.end2end.OctetLengthFunctionEnd2EndIT
Tests run: 26, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 32.346 sec - 
in org.apache.phoenix.end2end.ArithmeticQueryIT
Tests run: 7, Failures: 0, Errors: 0, Skipped: 0, Time el

[1/2] phoenix git commit: PHOENIX-2900 Unable to find hash cache once a salted table 's first region has split

2016-07-24 Thread jamestaylor
Repository: phoenix
Updated Branches:
  refs/heads/4.x-HBase-0.98 0b39a5209 -> fb65258fa


PHOENIX-2900 Unable to find hash cache once a salted table 's first region has 
split


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

Branch: refs/heads/4.x-HBase-0.98
Commit: 5369c3d781762e177217bd24a30cf2e9b7fb9bdd
Parents: 0b39a52
Author: James Taylor 
Authored: Sun Jul 24 09:30:31 2016 -0700
Committer: James Taylor 
Committed: Sun Jul 24 09:57:37 2016 -0700

--
 .../org/apache/phoenix/compile/ScanRanges.java  |  5 ++-
 .../phoenix/compile/QueryCompilerTest.java  | 42 
 .../phoenix/compile/SaltedScanRangesTest.java   |  8 
 3 files changed, 54 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/5369c3d7/phoenix-core/src/main/java/org/apache/phoenix/compile/ScanRanges.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/compile/ScanRanges.java 
b/phoenix-core/src/main/java/org/apache/phoenix/compile/ScanRanges.java
index f3d5bba..95eee60 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/compile/ScanRanges.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/compile/ScanRanges.java
@@ -419,7 +419,10 @@ public class ScanRanges {
 return true;
 }
 
-return intersectScan(null, regionStartKey, regionEndKey, 0, false) == 
HAS_INTERSECTION;
+boolean crossesSaltBoundary = isSalted && 
ScanUtil.crossesPrefixBoundary(regionEndKey,
+ScanUtil.getPrefix(regionStartKey, 
SaltingUtil.NUM_SALTING_BYTES), 
+SaltingUtil.NUM_SALTING_BYTES);
+return intersectScan(null, regionStartKey, regionEndKey, 0, 
crossesSaltBoundary) == HAS_INTERSECTION;
 }
 
 public SkipScanFilter getSkipScanFilter() {

http://git-wip-us.apache.org/repos/asf/phoenix/blob/5369c3d7/phoenix-core/src/test/java/org/apache/phoenix/compile/QueryCompilerTest.java
--
diff --git 
a/phoenix-core/src/test/java/org/apache/phoenix/compile/QueryCompilerTest.java 
b/phoenix-core/src/test/java/org/apache/phoenix/compile/QueryCompilerTest.java
index 7aab048..c91b855 100644
--- 
a/phoenix-core/src/test/java/org/apache/phoenix/compile/QueryCompilerTest.java
+++ 
b/phoenix-core/src/test/java/org/apache/phoenix/compile/QueryCompilerTest.java
@@ -41,6 +41,7 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Properties;
 
+import org.apache.hadoop.hbase.HRegionLocation;
 import org.apache.hadoop.hbase.client.Scan;
 import org.apache.hadoop.hbase.filter.Filter;
 import org.apache.hadoop.hbase.filter.FirstKeyOnlyFilter;
@@ -48,6 +49,7 @@ import org.apache.hadoop.hbase.util.Bytes;
 import org.apache.phoenix.compile.OrderByCompiler.OrderBy;
 import org.apache.phoenix.coprocessor.BaseScannerRegionObserver;
 import org.apache.phoenix.exception.SQLExceptionCode;
+import org.apache.phoenix.execute.HashJoinPlan;
 import org.apache.phoenix.expression.Expression;
 import org.apache.phoenix.expression.LiteralExpression;
 import org.apache.phoenix.expression.aggregator.Aggregator;
@@ -2385,4 +2387,44 @@ public class QueryCompilerTest extends 
BaseConnectionlessQueryTest {
 conn.close();
 }
 }
+
+@Test
+public void testSaltTableJoin() throws Exception{
+
+PhoenixConnection conn = 
(PhoenixConnection)DriverManager.getConnection(getUrl());
+try {
+conn.createStatement().execute("drop table if exists 
SALT_TEST2900");
+
+conn.createStatement().execute(
+"create table SALT_TEST2900"+
+"("+
+"id UNSIGNED_INT not null primary key,"+
+"appId VARCHAR"+
+")SALT_BUCKETS=2");
+
+
+
+conn.createStatement().execute("drop table if exists 
RIGHT_TEST2900 ");
+conn.createStatement().execute(
+"create table RIGHT_TEST2900"+
+"("+
+"appId VARCHAR not null primary key,"+
+"createTime VARCHAR"+
+")");
+
+
+String sql="select * from SALT_TEST2900 a inner join 
RIGHT_TEST2900 b on a.appId=b.appId where a.id>=3 and a.id<=5";
+HashJoinPlan plan = (HashJoinPlan)getQueryPlan(sql, 
Collections.emptyList());
+ScanRanges ranges=plan.getContext().getScanRanges();
+
+List regionLocations=
+
conn.getQueryServices().getAllTableRegions(Bytes.toBytes

[2/2] phoenix git commit: PHOENIX-3075 Phoenix-hive module is writing under ./build instead of ./target (Sergey Soldatov)

2016-07-24 Thread jamestaylor
PHOENIX-3075 Phoenix-hive module is writing under ./build instead of ./target 
(Sergey Soldatov)


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

Branch: refs/heads/4.x-HBase-0.98
Commit: fb65258fa7c8a0ea78d88c38d5fca16253ae4603
Parents: 5369c3d
Author: James Taylor 
Authored: Sun Jul 24 09:50:11 2016 -0700
Committer: James Taylor 
Committed: Sun Jul 24 09:57:40 2016 -0700

--
 .../src/it/java/org/apache/phoenix/hive/HiveTestUtil.java   | 5 +
 1 file changed, 5 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/fb65258f/phoenix-hive/src/it/java/org/apache/phoenix/hive/HiveTestUtil.java
--
diff --git a/phoenix-hive/src/it/java/org/apache/phoenix/hive/HiveTestUtil.java 
b/phoenix-hive/src/it/java/org/apache/phoenix/hive/HiveTestUtil.java
index 57722f8..a234d24 100644
--- a/phoenix-hive/src/it/java/org/apache/phoenix/hive/HiveTestUtil.java
+++ b/phoenix-hive/src/it/java/org/apache/phoenix/hive/HiveTestUtil.java
@@ -81,6 +81,7 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.Set;
 import java.util.TreeMap;
+import java.util.UUID;
 import java.util.concurrent.TimeUnit;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -293,6 +294,10 @@ public class HiveTestUtil {
 qJavaVersionSpecificOutput = new HashSet();
 this.clusterType = clusterType;
 
+// Using randomUUID for dfs cluster
+System.setProperty("test.build.data", "target/test-data/hive-" + 
UUID.randomUUID().toString
+());
+
 HadoopShims shims = ShimLoader.getHadoopShims();
 int numberOfDataNodes = 4;
 



[1/2] phoenix git commit: PHOENIX-2900 Unable to find hash cache once a salted table 's first region has split

2016-07-24 Thread jamestaylor
Repository: phoenix
Updated Branches:
  refs/heads/4.x-HBase-1.0 a05e798c3 -> be74b73fd


PHOENIX-2900 Unable to find hash cache once a salted table 's first region has 
split


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

Branch: refs/heads/4.x-HBase-1.0
Commit: 37fe5d223670b716a475a123d8abdd279252a163
Parents: a05e798
Author: James Taylor 
Authored: Sun Jul 24 09:30:31 2016 -0700
Committer: James Taylor 
Committed: Sun Jul 24 09:55:50 2016 -0700

--
 .../org/apache/phoenix/compile/ScanRanges.java  |  5 ++-
 .../phoenix/compile/QueryCompilerTest.java  | 42 
 .../phoenix/compile/SaltedScanRangesTest.java   |  8 
 3 files changed, 54 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/37fe5d22/phoenix-core/src/main/java/org/apache/phoenix/compile/ScanRanges.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/compile/ScanRanges.java 
b/phoenix-core/src/main/java/org/apache/phoenix/compile/ScanRanges.java
index f3d5bba..95eee60 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/compile/ScanRanges.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/compile/ScanRanges.java
@@ -419,7 +419,10 @@ public class ScanRanges {
 return true;
 }
 
-return intersectScan(null, regionStartKey, regionEndKey, 0, false) == 
HAS_INTERSECTION;
+boolean crossesSaltBoundary = isSalted && 
ScanUtil.crossesPrefixBoundary(regionEndKey,
+ScanUtil.getPrefix(regionStartKey, 
SaltingUtil.NUM_SALTING_BYTES), 
+SaltingUtil.NUM_SALTING_BYTES);
+return intersectScan(null, regionStartKey, regionEndKey, 0, 
crossesSaltBoundary) == HAS_INTERSECTION;
 }
 
 public SkipScanFilter getSkipScanFilter() {

http://git-wip-us.apache.org/repos/asf/phoenix/blob/37fe5d22/phoenix-core/src/test/java/org/apache/phoenix/compile/QueryCompilerTest.java
--
diff --git 
a/phoenix-core/src/test/java/org/apache/phoenix/compile/QueryCompilerTest.java 
b/phoenix-core/src/test/java/org/apache/phoenix/compile/QueryCompilerTest.java
index 7aab048..c91b855 100644
--- 
a/phoenix-core/src/test/java/org/apache/phoenix/compile/QueryCompilerTest.java
+++ 
b/phoenix-core/src/test/java/org/apache/phoenix/compile/QueryCompilerTest.java
@@ -41,6 +41,7 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Properties;
 
+import org.apache.hadoop.hbase.HRegionLocation;
 import org.apache.hadoop.hbase.client.Scan;
 import org.apache.hadoop.hbase.filter.Filter;
 import org.apache.hadoop.hbase.filter.FirstKeyOnlyFilter;
@@ -48,6 +49,7 @@ import org.apache.hadoop.hbase.util.Bytes;
 import org.apache.phoenix.compile.OrderByCompiler.OrderBy;
 import org.apache.phoenix.coprocessor.BaseScannerRegionObserver;
 import org.apache.phoenix.exception.SQLExceptionCode;
+import org.apache.phoenix.execute.HashJoinPlan;
 import org.apache.phoenix.expression.Expression;
 import org.apache.phoenix.expression.LiteralExpression;
 import org.apache.phoenix.expression.aggregator.Aggregator;
@@ -2385,4 +2387,44 @@ public class QueryCompilerTest extends 
BaseConnectionlessQueryTest {
 conn.close();
 }
 }
+
+@Test
+public void testSaltTableJoin() throws Exception{
+
+PhoenixConnection conn = 
(PhoenixConnection)DriverManager.getConnection(getUrl());
+try {
+conn.createStatement().execute("drop table if exists 
SALT_TEST2900");
+
+conn.createStatement().execute(
+"create table SALT_TEST2900"+
+"("+
+"id UNSIGNED_INT not null primary key,"+
+"appId VARCHAR"+
+")SALT_BUCKETS=2");
+
+
+
+conn.createStatement().execute("drop table if exists 
RIGHT_TEST2900 ");
+conn.createStatement().execute(
+"create table RIGHT_TEST2900"+
+"("+
+"appId VARCHAR not null primary key,"+
+"createTime VARCHAR"+
+")");
+
+
+String sql="select * from SALT_TEST2900 a inner join 
RIGHT_TEST2900 b on a.appId=b.appId where a.id>=3 and a.id<=5";
+HashJoinPlan plan = (HashJoinPlan)getQueryPlan(sql, 
Collections.emptyList());
+ScanRanges ranges=plan.getContext().getScanRanges();
+
+List regionLocations=
+
conn.getQueryServices().getAllTableRegions(Bytes.toBytes("

[2/2] phoenix git commit: PHOENIX-3075 Phoenix-hive module is writing under ./build instead of ./target (Sergey Soldatov)

2016-07-24 Thread jamestaylor
PHOENIX-3075 Phoenix-hive module is writing under ./build instead of ./target 
(Sergey Soldatov)


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

Branch: refs/heads/4.x-HBase-1.0
Commit: be74b73fdc7d726e37f13587bcce9ce44316de58
Parents: 37fe5d2
Author: James Taylor 
Authored: Sun Jul 24 09:50:11 2016 -0700
Committer: James Taylor 
Committed: Sun Jul 24 09:55:56 2016 -0700

--
 .../src/it/java/org/apache/phoenix/hive/HiveTestUtil.java   | 5 +
 1 file changed, 5 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/be74b73f/phoenix-hive/src/it/java/org/apache/phoenix/hive/HiveTestUtil.java
--
diff --git a/phoenix-hive/src/it/java/org/apache/phoenix/hive/HiveTestUtil.java 
b/phoenix-hive/src/it/java/org/apache/phoenix/hive/HiveTestUtil.java
index 57722f8..a234d24 100644
--- a/phoenix-hive/src/it/java/org/apache/phoenix/hive/HiveTestUtil.java
+++ b/phoenix-hive/src/it/java/org/apache/phoenix/hive/HiveTestUtil.java
@@ -81,6 +81,7 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.Set;
 import java.util.TreeMap;
+import java.util.UUID;
 import java.util.concurrent.TimeUnit;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -293,6 +294,10 @@ public class HiveTestUtil {
 qJavaVersionSpecificOutput = new HashSet();
 this.clusterType = clusterType;
 
+// Using randomUUID for dfs cluster
+System.setProperty("test.build.data", "target/test-data/hive-" + 
UUID.randomUUID().toString
+());
+
 HadoopShims shims = ShimLoader.getHadoopShims();
 int numberOfDataNodes = 4;
 



[1/2] phoenix git commit: PHOENIX-2900 Unable to find hash cache once a salted table 's first region has split

2016-07-24 Thread jamestaylor
Repository: phoenix
Updated Branches:
  refs/heads/4.x-HBase-1.1 dc818cbf7 -> 91638018e


PHOENIX-2900 Unable to find hash cache once a salted table 's first region has 
split


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

Branch: refs/heads/4.x-HBase-1.1
Commit: 04b89360e4165ba507418b879ec7076fbb5409de
Parents: dc818cb
Author: James Taylor 
Authored: Sun Jul 24 09:30:31 2016 -0700
Committer: James Taylor 
Committed: Sun Jul 24 09:51:59 2016 -0700

--
 .../org/apache/phoenix/compile/ScanRanges.java  |  5 ++-
 .../phoenix/compile/QueryCompilerTest.java  | 42 
 .../phoenix/compile/SaltedScanRangesTest.java   |  8 
 3 files changed, 54 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/04b89360/phoenix-core/src/main/java/org/apache/phoenix/compile/ScanRanges.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/compile/ScanRanges.java 
b/phoenix-core/src/main/java/org/apache/phoenix/compile/ScanRanges.java
index f3d5bba..95eee60 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/compile/ScanRanges.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/compile/ScanRanges.java
@@ -419,7 +419,10 @@ public class ScanRanges {
 return true;
 }
 
-return intersectScan(null, regionStartKey, regionEndKey, 0, false) == 
HAS_INTERSECTION;
+boolean crossesSaltBoundary = isSalted && 
ScanUtil.crossesPrefixBoundary(regionEndKey,
+ScanUtil.getPrefix(regionStartKey, 
SaltingUtil.NUM_SALTING_BYTES), 
+SaltingUtil.NUM_SALTING_BYTES);
+return intersectScan(null, regionStartKey, regionEndKey, 0, 
crossesSaltBoundary) == HAS_INTERSECTION;
 }
 
 public SkipScanFilter getSkipScanFilter() {

http://git-wip-us.apache.org/repos/asf/phoenix/blob/04b89360/phoenix-core/src/test/java/org/apache/phoenix/compile/QueryCompilerTest.java
--
diff --git 
a/phoenix-core/src/test/java/org/apache/phoenix/compile/QueryCompilerTest.java 
b/phoenix-core/src/test/java/org/apache/phoenix/compile/QueryCompilerTest.java
index 7aab048..c91b855 100644
--- 
a/phoenix-core/src/test/java/org/apache/phoenix/compile/QueryCompilerTest.java
+++ 
b/phoenix-core/src/test/java/org/apache/phoenix/compile/QueryCompilerTest.java
@@ -41,6 +41,7 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Properties;
 
+import org.apache.hadoop.hbase.HRegionLocation;
 import org.apache.hadoop.hbase.client.Scan;
 import org.apache.hadoop.hbase.filter.Filter;
 import org.apache.hadoop.hbase.filter.FirstKeyOnlyFilter;
@@ -48,6 +49,7 @@ import org.apache.hadoop.hbase.util.Bytes;
 import org.apache.phoenix.compile.OrderByCompiler.OrderBy;
 import org.apache.phoenix.coprocessor.BaseScannerRegionObserver;
 import org.apache.phoenix.exception.SQLExceptionCode;
+import org.apache.phoenix.execute.HashJoinPlan;
 import org.apache.phoenix.expression.Expression;
 import org.apache.phoenix.expression.LiteralExpression;
 import org.apache.phoenix.expression.aggregator.Aggregator;
@@ -2385,4 +2387,44 @@ public class QueryCompilerTest extends 
BaseConnectionlessQueryTest {
 conn.close();
 }
 }
+
+@Test
+public void testSaltTableJoin() throws Exception{
+
+PhoenixConnection conn = 
(PhoenixConnection)DriverManager.getConnection(getUrl());
+try {
+conn.createStatement().execute("drop table if exists 
SALT_TEST2900");
+
+conn.createStatement().execute(
+"create table SALT_TEST2900"+
+"("+
+"id UNSIGNED_INT not null primary key,"+
+"appId VARCHAR"+
+")SALT_BUCKETS=2");
+
+
+
+conn.createStatement().execute("drop table if exists 
RIGHT_TEST2900 ");
+conn.createStatement().execute(
+"create table RIGHT_TEST2900"+
+"("+
+"appId VARCHAR not null primary key,"+
+"createTime VARCHAR"+
+")");
+
+
+String sql="select * from SALT_TEST2900 a inner join 
RIGHT_TEST2900 b on a.appId=b.appId where a.id>=3 and a.id<=5";
+HashJoinPlan plan = (HashJoinPlan)getQueryPlan(sql, 
Collections.emptyList());
+ScanRanges ranges=plan.getContext().getScanRanges();
+
+List regionLocations=
+
conn.getQueryServices().getAllTableRegions(Bytes.toBytes("

[2/2] phoenix git commit: PHOENIX-3075 Phoenix-hive module is writing under ./build instead of ./target (Sergey Soldatov)

2016-07-24 Thread jamestaylor
PHOENIX-3075 Phoenix-hive module is writing under ./build instead of ./target 
(Sergey Soldatov)


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

Branch: refs/heads/4.x-HBase-1.1
Commit: 91638018eccad73f30bfdd7b0b14e533effbdeb2
Parents: 04b8936
Author: James Taylor 
Authored: Sun Jul 24 09:50:11 2016 -0700
Committer: James Taylor 
Committed: Sun Jul 24 09:52:14 2016 -0700

--
 .../src/it/java/org/apache/phoenix/hive/HiveTestUtil.java   | 5 +
 1 file changed, 5 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/91638018/phoenix-hive/src/it/java/org/apache/phoenix/hive/HiveTestUtil.java
--
diff --git a/phoenix-hive/src/it/java/org/apache/phoenix/hive/HiveTestUtil.java 
b/phoenix-hive/src/it/java/org/apache/phoenix/hive/HiveTestUtil.java
index 57722f8..a234d24 100644
--- a/phoenix-hive/src/it/java/org/apache/phoenix/hive/HiveTestUtil.java
+++ b/phoenix-hive/src/it/java/org/apache/phoenix/hive/HiveTestUtil.java
@@ -81,6 +81,7 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.Set;
 import java.util.TreeMap;
+import java.util.UUID;
 import java.util.concurrent.TimeUnit;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -293,6 +294,10 @@ public class HiveTestUtil {
 qJavaVersionSpecificOutput = new HashSet();
 this.clusterType = clusterType;
 
+// Using randomUUID for dfs cluster
+System.setProperty("test.build.data", "target/test-data/hive-" + 
UUID.randomUUID().toString
+());
+
 HadoopShims shims = ShimLoader.getHadoopShims();
 int numberOfDataNodes = 4;
 



[1/2] phoenix git commit: PHOENIX-2900 Unable to find hash cache once a salted table 's first region has split

2016-07-24 Thread jamestaylor
Repository: phoenix
Updated Branches:
  refs/heads/master 59497d525 -> c307daa5e


PHOENIX-2900 Unable to find hash cache once a salted table 's first region has 
split


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

Branch: refs/heads/master
Commit: 96c0f9f7537d218a0848d24965d7dc3ec3140a4c
Parents: 59497d5
Author: James Taylor 
Authored: Sun Jul 24 09:30:31 2016 -0700
Committer: James Taylor 
Committed: Sun Jul 24 09:30:31 2016 -0700

--
 .../org/apache/phoenix/compile/ScanRanges.java  |  5 ++-
 .../phoenix/compile/QueryCompilerTest.java  | 42 
 .../phoenix/compile/SaltedScanRangesTest.java   |  8 
 3 files changed, 54 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/96c0f9f7/phoenix-core/src/main/java/org/apache/phoenix/compile/ScanRanges.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/compile/ScanRanges.java 
b/phoenix-core/src/main/java/org/apache/phoenix/compile/ScanRanges.java
index f3d5bba..95eee60 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/compile/ScanRanges.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/compile/ScanRanges.java
@@ -419,7 +419,10 @@ public class ScanRanges {
 return true;
 }
 
-return intersectScan(null, regionStartKey, regionEndKey, 0, false) == 
HAS_INTERSECTION;
+boolean crossesSaltBoundary = isSalted && 
ScanUtil.crossesPrefixBoundary(regionEndKey,
+ScanUtil.getPrefix(regionStartKey, 
SaltingUtil.NUM_SALTING_BYTES), 
+SaltingUtil.NUM_SALTING_BYTES);
+return intersectScan(null, regionStartKey, regionEndKey, 0, 
crossesSaltBoundary) == HAS_INTERSECTION;
 }
 
 public SkipScanFilter getSkipScanFilter() {

http://git-wip-us.apache.org/repos/asf/phoenix/blob/96c0f9f7/phoenix-core/src/test/java/org/apache/phoenix/compile/QueryCompilerTest.java
--
diff --git 
a/phoenix-core/src/test/java/org/apache/phoenix/compile/QueryCompilerTest.java 
b/phoenix-core/src/test/java/org/apache/phoenix/compile/QueryCompilerTest.java
index 7aab048..c91b855 100644
--- 
a/phoenix-core/src/test/java/org/apache/phoenix/compile/QueryCompilerTest.java
+++ 
b/phoenix-core/src/test/java/org/apache/phoenix/compile/QueryCompilerTest.java
@@ -41,6 +41,7 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Properties;
 
+import org.apache.hadoop.hbase.HRegionLocation;
 import org.apache.hadoop.hbase.client.Scan;
 import org.apache.hadoop.hbase.filter.Filter;
 import org.apache.hadoop.hbase.filter.FirstKeyOnlyFilter;
@@ -48,6 +49,7 @@ import org.apache.hadoop.hbase.util.Bytes;
 import org.apache.phoenix.compile.OrderByCompiler.OrderBy;
 import org.apache.phoenix.coprocessor.BaseScannerRegionObserver;
 import org.apache.phoenix.exception.SQLExceptionCode;
+import org.apache.phoenix.execute.HashJoinPlan;
 import org.apache.phoenix.expression.Expression;
 import org.apache.phoenix.expression.LiteralExpression;
 import org.apache.phoenix.expression.aggregator.Aggregator;
@@ -2385,4 +2387,44 @@ public class QueryCompilerTest extends 
BaseConnectionlessQueryTest {
 conn.close();
 }
 }
+
+@Test
+public void testSaltTableJoin() throws Exception{
+
+PhoenixConnection conn = 
(PhoenixConnection)DriverManager.getConnection(getUrl());
+try {
+conn.createStatement().execute("drop table if exists 
SALT_TEST2900");
+
+conn.createStatement().execute(
+"create table SALT_TEST2900"+
+"("+
+"id UNSIGNED_INT not null primary key,"+
+"appId VARCHAR"+
+")SALT_BUCKETS=2");
+
+
+
+conn.createStatement().execute("drop table if exists 
RIGHT_TEST2900 ");
+conn.createStatement().execute(
+"create table RIGHT_TEST2900"+
+"("+
+"appId VARCHAR not null primary key,"+
+"createTime VARCHAR"+
+")");
+
+
+String sql="select * from SALT_TEST2900 a inner join 
RIGHT_TEST2900 b on a.appId=b.appId where a.id>=3 and a.id<=5";
+HashJoinPlan plan = (HashJoinPlan)getQueryPlan(sql, 
Collections.emptyList());
+ScanRanges ranges=plan.getContext().getScanRanges();
+
+List regionLocations=
+
conn.getQueryServices().getAllTableRegions(Bytes.toBytes("SALT_TEST2900"

[2/2] phoenix git commit: PHOENIX-3075 Phoenix-hive module is writing under ./build instead of ./target (Sergey Soldatov)

2016-07-24 Thread jamestaylor
PHOENIX-3075 Phoenix-hive module is writing under ./build instead of ./target 
(Sergey Soldatov)


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

Branch: refs/heads/master
Commit: c307daa5e3233b44221eeff930cb78854c8be515
Parents: 96c0f9f
Author: James Taylor 
Authored: Sun Jul 24 09:50:11 2016 -0700
Committer: James Taylor 
Committed: Sun Jul 24 09:50:11 2016 -0700

--
 .../src/it/java/org/apache/phoenix/hive/HiveTestUtil.java   | 5 +
 1 file changed, 5 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/c307daa5/phoenix-hive/src/it/java/org/apache/phoenix/hive/HiveTestUtil.java
--
diff --git a/phoenix-hive/src/it/java/org/apache/phoenix/hive/HiveTestUtil.java 
b/phoenix-hive/src/it/java/org/apache/phoenix/hive/HiveTestUtil.java
index 57722f8..a234d24 100644
--- a/phoenix-hive/src/it/java/org/apache/phoenix/hive/HiveTestUtil.java
+++ b/phoenix-hive/src/it/java/org/apache/phoenix/hive/HiveTestUtil.java
@@ -81,6 +81,7 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.Set;
 import java.util.TreeMap;
+import java.util.UUID;
 import java.util.concurrent.TimeUnit;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -293,6 +294,10 @@ public class HiveTestUtil {
 qJavaVersionSpecificOutput = new HashSet();
 this.clusterType = clusterType;
 
+// Using randomUUID for dfs cluster
+System.setProperty("test.build.data", "target/test-data/hive-" + 
UUID.randomUUID().toString
+());
+
 HadoopShims shims = ShimLoader.getHadoopShims();
 int numberOfDataNodes = 4;