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

2016-01-15 Thread Apache Jenkins Server
See 



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

2016-01-15 Thread Apache Jenkins Server
See 



Jenkins build is back to normal : Phoenix-4.x-HBase-1.0 #328

2016-01-15 Thread Apache Jenkins Server
See 



phoenix git commit: PHOENIX-2600 NPE on immutable index creation over transactional table

2016-01-15 Thread jamestaylor
Repository: phoenix
Updated Branches:
  refs/heads/4.x-HBase-1.0 95308df6b -> af1928c14


PHOENIX-2600 NPE on immutable index creation over transactional table


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

Branch: refs/heads/4.x-HBase-1.0
Commit: af1928c147b28f9faa09d2dc00cb4ed4d547a4a2
Parents: 95308df
Author: James Taylor 
Authored: Fri Jan 15 22:09:39 2016 -0800
Committer: James Taylor 
Committed: Fri Jan 15 22:19:14 2016 -0800

--
 .../java/org/apache/phoenix/end2end/UpsertSelectIT.java   | 10 +-
 1 file changed, 9 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/af1928c1/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpsertSelectIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpsertSelectIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpsertSelectIT.java
index 364b423..30de4de 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpsertSelectIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpsertSelectIT.java
@@ -1376,7 +1376,9 @@ public class UpsertSelectIT extends 
BaseClientManagedTimeIT {
 
 @Test
 public void testParallelUpsertSelect() throws Exception {
+long ts = nextTimestamp();
 Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
+props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, 
Long.toString(ts));
 props.setProperty(QueryServices.MUTATE_BATCH_SIZE_ATTRIB, 
Integer.toString(3));
 props.setProperty(QueryServices.SCAN_CACHE_SIZE_ATTRIB, 
Integer.toString(3));
 props.setProperty(QueryServices.SCAN_RESULT_CHUNK_SIZE, 
Integer.toString(3));
@@ -1385,11 +1387,17 @@ public class UpsertSelectIT extends 
BaseClientManagedTimeIT {
 conn.createStatement().execute("CREATE SEQUENCE S1");
 conn.createStatement().execute("CREATE TABLE SALTEDT1 (pk INTEGER 
PRIMARY KEY, val INTEGER) SALT_BUCKETS=4");
 conn.createStatement().execute("CREATE TABLE T2 (pk INTEGER PRIMARY 
KEY, val INTEGER)");
-
+conn.close();
+
+props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts 
+ 10));
+conn = DriverManager.getConnection(getUrl(), props);
 for (int i = 0; i < 100; i++) {
 conn.createStatement().execute("UPSERT INTO SALTEDT1 VALUES (NEXT 
VALUE FOR S1, " + (i%10) + ")");
 }
 conn.commit();
+conn.close();
+props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts 
+ 20));
+conn = DriverManager.getConnection(getUrl(), props);
 conn.setAutoCommit(true);
 int upsertCount = conn.createStatement().executeUpdate("UPSERT INTO T2 
SELECT pk, val FROM SALTEDT1");
 assertEquals(100,upsertCount);



phoenix git commit: PHOENIX-2600 NPE on immutable index creation over transactional table

2016-01-15 Thread jamestaylor
Repository: phoenix
Updated Branches:
  refs/heads/4.x-HBase-0.98 702ab7034 -> eb373391a


PHOENIX-2600 NPE on immutable index creation over transactional table


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

Branch: refs/heads/4.x-HBase-0.98
Commit: eb373391a16cbbe0ac4f936b511011502bd1cd34
Parents: 702ab70
Author: James Taylor 
Authored: Fri Jan 15 22:09:39 2016 -0800
Committer: James Taylor 
Committed: Fri Jan 15 22:17:37 2016 -0800

--
 .../java/org/apache/phoenix/end2end/UpsertSelectIT.java   | 10 +-
 1 file changed, 9 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/eb373391/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpsertSelectIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpsertSelectIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpsertSelectIT.java
index 364b423..30de4de 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpsertSelectIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpsertSelectIT.java
@@ -1376,7 +1376,9 @@ public class UpsertSelectIT extends 
BaseClientManagedTimeIT {
 
 @Test
 public void testParallelUpsertSelect() throws Exception {
+long ts = nextTimestamp();
 Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
+props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, 
Long.toString(ts));
 props.setProperty(QueryServices.MUTATE_BATCH_SIZE_ATTRIB, 
Integer.toString(3));
 props.setProperty(QueryServices.SCAN_CACHE_SIZE_ATTRIB, 
Integer.toString(3));
 props.setProperty(QueryServices.SCAN_RESULT_CHUNK_SIZE, 
Integer.toString(3));
@@ -1385,11 +1387,17 @@ public class UpsertSelectIT extends 
BaseClientManagedTimeIT {
 conn.createStatement().execute("CREATE SEQUENCE S1");
 conn.createStatement().execute("CREATE TABLE SALTEDT1 (pk INTEGER 
PRIMARY KEY, val INTEGER) SALT_BUCKETS=4");
 conn.createStatement().execute("CREATE TABLE T2 (pk INTEGER PRIMARY 
KEY, val INTEGER)");
-
+conn.close();
+
+props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts 
+ 10));
+conn = DriverManager.getConnection(getUrl(), props);
 for (int i = 0; i < 100; i++) {
 conn.createStatement().execute("UPSERT INTO SALTEDT1 VALUES (NEXT 
VALUE FOR S1, " + (i%10) + ")");
 }
 conn.commit();
+conn.close();
+props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts 
+ 20));
+conn = DriverManager.getConnection(getUrl(), props);
 conn.setAutoCommit(true);
 int upsertCount = conn.createStatement().executeUpdate("UPSERT INTO T2 
SELECT pk, val FROM SALTEDT1");
 assertEquals(100,upsertCount);



phoenix git commit: PHOENIX-2600 NPE on immutable index creation over transactional table

2016-01-15 Thread jamestaylor
Repository: phoenix
Updated Branches:
  refs/heads/master c2ee4f7fd -> c584029b9


PHOENIX-2600 NPE on immutable index creation over transactional table


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

Branch: refs/heads/master
Commit: c584029b9face0acb0513d328d68ec42b25fc011
Parents: c2ee4f7
Author: James Taylor 
Authored: Fri Jan 15 22:09:39 2016 -0800
Committer: James Taylor 
Committed: Fri Jan 15 22:09:39 2016 -0800

--
 .../java/org/apache/phoenix/end2end/UpsertSelectIT.java   | 10 +-
 1 file changed, 9 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/c584029b/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpsertSelectIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpsertSelectIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpsertSelectIT.java
index 364b423..30de4de 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpsertSelectIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpsertSelectIT.java
@@ -1376,7 +1376,9 @@ public class UpsertSelectIT extends 
BaseClientManagedTimeIT {
 
 @Test
 public void testParallelUpsertSelect() throws Exception {
+long ts = nextTimestamp();
 Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
+props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, 
Long.toString(ts));
 props.setProperty(QueryServices.MUTATE_BATCH_SIZE_ATTRIB, 
Integer.toString(3));
 props.setProperty(QueryServices.SCAN_CACHE_SIZE_ATTRIB, 
Integer.toString(3));
 props.setProperty(QueryServices.SCAN_RESULT_CHUNK_SIZE, 
Integer.toString(3));
@@ -1385,11 +1387,17 @@ public class UpsertSelectIT extends 
BaseClientManagedTimeIT {
 conn.createStatement().execute("CREATE SEQUENCE S1");
 conn.createStatement().execute("CREATE TABLE SALTEDT1 (pk INTEGER 
PRIMARY KEY, val INTEGER) SALT_BUCKETS=4");
 conn.createStatement().execute("CREATE TABLE T2 (pk INTEGER PRIMARY 
KEY, val INTEGER)");
-
+conn.close();
+
+props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts 
+ 10));
+conn = DriverManager.getConnection(getUrl(), props);
 for (int i = 0; i < 100; i++) {
 conn.createStatement().execute("UPSERT INTO SALTEDT1 VALUES (NEXT 
VALUE FOR S1, " + (i%10) + ")");
 }
 conn.commit();
+conn.close();
+props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts 
+ 20));
+conn = DriverManager.getConnection(getUrl(), props);
 conn.setAutoCommit(true);
 int upsertCount = conn.createStatement().executeUpdate("UPSERT INTO T2 
SELECT pk, val FROM SALTEDT1");
 assertEquals(100,upsertCount);



Build failed in Jenkins: Phoenix | Master #1082

2016-01-15 Thread Apache Jenkins Server
See 

Changes:

[samarth] PHOENIX-1261 Addendum to fix test failures

--
[...truncated 663 lines...]
Running org.apache.phoenix.end2end.QueryExecWithoutSCNIT
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 13.539 sec - in 
org.apache.phoenix.end2end.PowerFunctionEnd2EndIT
Running org.apache.phoenix.end2end.QueryMoreIT
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 9.858 sec - in 
org.apache.phoenix.end2end.QueryExecWithoutSCNIT
Running org.apache.phoenix.end2end.RTrimFunctionIT
Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 7.407 sec - in 
org.apache.phoenix.end2end.RTrimFunctionIT
Running org.apache.phoenix.end2end.ReadOnlyIT
Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 40.004 sec - in 
org.apache.phoenix.end2end.PhoenixRuntimeIT
Running org.apache.phoenix.end2end.RegexpReplaceFunctionIT
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 13.605 sec - in 
org.apache.phoenix.end2end.ReadOnlyIT
Running org.apache.phoenix.end2end.RegexpSplitFunctionIT
Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 6.565 sec - in 
org.apache.phoenix.end2end.RegexpReplaceFunctionIT
Running org.apache.phoenix.end2end.RegexpSubstrFunctionIT
Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 6.556 sec - in 
org.apache.phoenix.end2end.RegexpSubstrFunctionIT
Running org.apache.phoenix.end2end.ReverseFunctionIT
Tests run: 11, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 13.307 sec - 
in org.apache.phoenix.end2end.RegexpSplitFunctionIT
Running org.apache.phoenix.end2end.ReverseScanIT
Tests run: 5, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 10.198 sec - in 
org.apache.phoenix.end2end.ReverseFunctionIT
Running org.apache.phoenix.end2end.RoundFloorCeilFunctionsEnd2EndIT
Tests run: 6, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 53.777 sec - in 
org.apache.phoenix.end2end.QueryMoreIT
Running org.apache.phoenix.end2end.ServerExceptionIT
Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 18.443 sec - in 
org.apache.phoenix.end2end.ReverseScanIT
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 7.892 sec - in 
org.apache.phoenix.end2end.ServerExceptionIT
Running org.apache.phoenix.end2end.SignFunctionEnd2EndIT
Running org.apache.phoenix.end2end.SkipScanAfterManualSplitIT
Tests run: 33, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 28.948 sec - 
in org.apache.phoenix.end2end.RoundFloorCeilFunctionsEnd2EndIT
Tests run: 28, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 222.072 sec - 
in org.apache.phoenix.end2end.InListIT
Running org.apache.phoenix.end2end.SkipScanQueryIT
Running org.apache.phoenix.end2end.SortMergeJoinIT
Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 14.69 sec - in 
org.apache.phoenix.end2end.SignFunctionEnd2EndIT
Running org.apache.phoenix.end2end.SortMergeJoinMoreIT
Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 47.873 sec - in 
org.apache.phoenix.end2end.SkipScanAfterManualSplitIT
Running org.apache.phoenix.end2end.SortOrderIT
Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 45.177 sec - in 
org.apache.phoenix.end2end.SortMergeJoinMoreIT
Running org.apache.phoenix.end2end.SpooledSortMergeJoinIT
Tests run: 11, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 51.01 sec - in 
org.apache.phoenix.end2end.SkipScanQueryIT
Running org.apache.phoenix.end2end.SpooledTmpFileDeleteIT
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 7.474 sec - in 
org.apache.phoenix.end2end.SpooledTmpFileDeleteIT
Running org.apache.phoenix.end2end.SqrtFunctionEnd2EndIT
Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 13.741 sec - in 
org.apache.phoenix.end2end.SqrtFunctionEnd2EndIT
Running org.apache.phoenix.end2end.StatementHintsIT
Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 6.523 sec - in 
org.apache.phoenix.end2end.StatementHintsIT
Running org.apache.phoenix.end2end.StddevIT
Tests run: 4, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 12.054 sec - in 
org.apache.phoenix.end2end.StddevIT
Running org.apache.phoenix.end2end.StoreNullsIT
Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 34.195 sec - in 
org.apache.phoenix.end2end.StoreNullsIT
Running org.apache.phoenix.end2end.StringToArrayFunctionIT
Tests run: 22, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 24.472 sec - 
in org.apache.phoenix.end2end.StringToArrayFunctionIT
Running org.apache.phoenix.end2end.SubqueryIT
Tests run: 45, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 128.205 sec - 
in org.apache.phoenix.end2end.SortOrderIT
Tests run: 96, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 404.391 sec - 
in org.apache.phoenix.end2end.HashJoinIT
Running org.apache.phoenix.end2end.SubqueryUsingSortMergeJoinIT
Running org.apache.phoenix.end2end.TenantIdTypeIT
Tests run: 21, Failures: 0, Errors: 0, Skipped: 0, Time

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

2016-01-15 Thread Apache Jenkins Server
See 

Changes:

[samarth] PHOENIX-1261 Addendum to fix test failures

--
[...truncated 649 lines...]
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 2.243 sec - in 
org.apache.phoenix.end2end.OctetLengthFunctionEnd2EndIT
Running org.apache.phoenix.end2end.QueryExecWithoutSCNIT
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 3.621 sec - in 
org.apache.phoenix.end2end.QueryExecWithoutSCNIT
Running org.apache.phoenix.end2end.QueryMoreIT
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 5.73 sec - in 
org.apache.phoenix.end2end.PowerFunctionEnd2EndIT
Running org.apache.phoenix.end2end.RTrimFunctionIT
Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 3.613 sec - in 
org.apache.phoenix.end2end.RTrimFunctionIT
Running org.apache.phoenix.end2end.ReadOnlyIT
Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 17.03 sec - in 
org.apache.phoenix.end2end.PhoenixRuntimeIT
Running org.apache.phoenix.end2end.RegexpReplaceFunctionIT
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 8.451 sec - in 
org.apache.phoenix.end2end.ReadOnlyIT
Running org.apache.phoenix.end2end.RegexpSplitFunctionIT
Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 3.81 sec - in 
org.apache.phoenix.end2end.RegexpReplaceFunctionIT
Running org.apache.phoenix.end2end.RegexpSubstrFunctionIT
Tests run: 6, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 21.207 sec - in 
org.apache.phoenix.end2end.QueryMoreIT
Running org.apache.phoenix.end2end.ReverseFunctionIT
Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 4.398 sec - in 
org.apache.phoenix.end2end.RegexpSubstrFunctionIT
Running org.apache.phoenix.end2end.ReverseScanIT
Tests run: 5, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 3.631 sec - in 
org.apache.phoenix.end2end.ReverseFunctionIT
Running org.apache.phoenix.end2end.RoundFloorCeilFunctionsEnd2EndIT
Tests run: 11, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 10.94 sec - in 
org.apache.phoenix.end2end.RegexpSplitFunctionIT
Running org.apache.phoenix.end2end.ServerExceptionIT
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 3.338 sec - in 
org.apache.phoenix.end2end.ServerExceptionIT
Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 8.376 sec - in 
org.apache.phoenix.end2end.ReverseScanIT
Running org.apache.phoenix.end2end.SignFunctionEnd2EndIT
Running org.apache.phoenix.end2end.SkipScanAfterManualSplitIT
Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 6.256 sec - in 
org.apache.phoenix.end2end.SignFunctionEnd2EndIT
Running org.apache.phoenix.end2end.SkipScanQueryIT
Tests run: 33, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 13.668 sec - 
in org.apache.phoenix.end2end.RoundFloorCeilFunctionsEnd2EndIT
Running org.apache.phoenix.end2end.SortMergeJoinIT
Tests run: 11, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 24.123 sec - 
in org.apache.phoenix.end2end.SkipScanQueryIT
Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 31.024 sec - in 
org.apache.phoenix.end2end.SkipScanAfterManualSplitIT
Running org.apache.phoenix.end2end.SortMergeJoinMoreIT
Running org.apache.phoenix.end2end.SortOrderIT
Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 20.591 sec - in 
org.apache.phoenix.end2end.SortMergeJoinMoreIT
Running org.apache.phoenix.end2end.SpooledSortMergeJoinIT
Tests run: 28, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 189.583 sec - 
in org.apache.phoenix.end2end.InListIT
Running org.apache.phoenix.end2end.SpooledTmpFileDeleteIT
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 4.019 sec - in 
org.apache.phoenix.end2end.SpooledTmpFileDeleteIT
Running org.apache.phoenix.end2end.SqrtFunctionEnd2EndIT
Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 7.955 sec - in 
org.apache.phoenix.end2end.SqrtFunctionEnd2EndIT
Running org.apache.phoenix.end2end.StatementHintsIT
Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 3.748 sec - in 
org.apache.phoenix.end2end.StatementHintsIT
Running org.apache.phoenix.end2end.StddevIT
Tests run: 4, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 6.308 sec - in 
org.apache.phoenix.end2end.StddevIT
Running org.apache.phoenix.end2end.StoreNullsIT
Tests run: 45, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 84.659 sec - 
in org.apache.phoenix.end2end.SortOrderIT
Running org.apache.phoenix.end2end.StringToArrayFunctionIT
Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 23.265 sec - in 
org.apache.phoenix.end2end.StoreNullsIT
Running org.apache.phoenix.end2end.SubqueryIT
Tests run: 22, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 23.048 sec - 
in org.apache.phoenix.end2end.StringToArrayFunctionIT
Running org.apache.phoenix.end2end.SubqueryUsingSortMergeJoinIT
Tests run: 99, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 177.594 sec - 
in org.apache.

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

2016-01-15 Thread Apache Jenkins Server
See 

Changes:

[maryannxue] PHOENIX-2601 Query result is incorrect when both index hint and 
limit

[samarth] PHOENIX-1261 Addendum to fix test failures

--
[...truncated 680 lines...]
Tests run: 11, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 11.049 sec - 
in org.apache.phoenix.end2end.ModulusExpressionIT
Running org.apache.phoenix.end2end.QueryExecWithoutSCNIT
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 6.624 sec - in 
org.apache.phoenix.end2end.PowerFunctionEnd2EndIT
Running org.apache.phoenix.end2end.QueryMoreIT
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 5.114 sec - in 
org.apache.phoenix.end2end.QueryExecWithoutSCNIT
Running org.apache.phoenix.end2end.RTrimFunctionIT
Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 4.764 sec - in 
org.apache.phoenix.end2end.RTrimFunctionIT
Running org.apache.phoenix.end2end.ReadOnlyIT
Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 18.706 sec - in 
org.apache.phoenix.end2end.PhoenixRuntimeIT
Running org.apache.phoenix.end2end.RegexpReplaceFunctionIT
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 8.755 sec - in 
org.apache.phoenix.end2end.ReadOnlyIT
Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 4.603 sec - in 
org.apache.phoenix.end2end.RegexpReplaceFunctionIT
Running org.apache.phoenix.end2end.RegexpSplitFunctionIT
Running org.apache.phoenix.end2end.RegexpSubstrFunctionIT
Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 4.154 sec - in 
org.apache.phoenix.end2end.RegexpSubstrFunctionIT
Running org.apache.phoenix.end2end.ReverseFunctionIT
Tests run: 6, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 24.187 sec - in 
org.apache.phoenix.end2end.QueryMoreIT
Running org.apache.phoenix.end2end.ReverseScanIT
Tests run: 11, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 9.279 sec - in 
org.apache.phoenix.end2end.RegexpSplitFunctionIT
Running org.apache.phoenix.end2end.RoundFloorCeilFunctionsEnd2EndIT
Tests run: 5, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 5.861 sec - in 
org.apache.phoenix.end2end.ReverseFunctionIT
Running org.apache.phoenix.end2end.ServerExceptionIT
Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 6.904 sec - in 
org.apache.phoenix.end2end.ReverseScanIT
Running org.apache.phoenix.end2end.SignFunctionEnd2EndIT
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 3.06 sec - in 
org.apache.phoenix.end2end.ServerExceptionIT
Running org.apache.phoenix.end2end.SkipScanAfterManualSplitIT
Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 6.382 sec - in 
org.apache.phoenix.end2end.SignFunctionEnd2EndIT
Running org.apache.phoenix.end2end.SkipScanQueryIT
Tests run: 33, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 28.738 sec - 
in org.apache.phoenix.end2end.RoundFloorCeilFunctionsEnd2EndIT
Tests run: 11, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 18.725 sec - 
in org.apache.phoenix.end2end.SkipScanQueryIT
Running org.apache.phoenix.end2end.SortMergeJoinIT
Running org.apache.phoenix.end2end.SortMergeJoinMoreIT
Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 28.988 sec - in 
org.apache.phoenix.end2end.SkipScanAfterManualSplitIT
Running org.apache.phoenix.end2end.SortOrderIT
Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 18.268 sec - in 
org.apache.phoenix.end2end.SortMergeJoinMoreIT
Running org.apache.phoenix.end2end.SpooledSortMergeJoinIT
Tests run: 28, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 167.058 sec - 
in org.apache.phoenix.end2end.InListIT
Running org.apache.phoenix.end2end.SpooledTmpFileDeleteIT
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 5.342 sec - in 
org.apache.phoenix.end2end.SpooledTmpFileDeleteIT
Running org.apache.phoenix.end2end.SqrtFunctionEnd2EndIT
Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 7.39 sec - in 
org.apache.phoenix.end2end.SqrtFunctionEnd2EndIT
Running org.apache.phoenix.end2end.StatementHintsIT
Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 4.3 sec - in 
org.apache.phoenix.end2end.StatementHintsIT
Running org.apache.phoenix.end2end.StddevIT
Tests run: 4, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 6.638 sec - in 
org.apache.phoenix.end2end.StddevIT
Running org.apache.phoenix.end2end.StoreNullsIT
Tests run: 45, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 75.255 sec - 
in org.apache.phoenix.end2end.SortOrderIT
Running org.apache.phoenix.end2end.StringToArrayFunctionIT
Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 21.56 sec - in 
org.apache.phoenix.end2end.StoreNullsIT
Running org.apache.phoenix.end2end.SubqueryIT
Tests run: 22, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 23.849 sec - 
in org.apache.phoenix.end2end.StringToArrayFunctionIT
Running org.apache.phoenix.end2end.SubqueryUsingSortMergeJoinIT
Tests run: 15, F

Build failed in Jenkins: Phoenix | Master #1081

2016-01-15 Thread Apache Jenkins Server
See 

Changes:

[maryannxue] PHOENIX-2601 Query result is incorrect when both index hint and 
limit

--
[...truncated 696 lines...]
Tests run: 33, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 46.325 sec - 
in org.apache.phoenix.end2end.RoundFloorCeilFunctionsEnd2EndIT
Running org.apache.phoenix.end2end.SortMergeJoinIT
Tests run: 28, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 239.246 sec - 
in org.apache.phoenix.end2end.InListIT
Running org.apache.phoenix.end2end.SortMergeJoinMoreIT
Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 49.859 sec - in 
org.apache.phoenix.end2end.SkipScanAfterManualSplitIT
Running org.apache.phoenix.end2end.SortOrderIT
Tests run: 11, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 52.685 sec - 
in org.apache.phoenix.end2end.SkipScanQueryIT
Running org.apache.phoenix.end2end.SpooledSortMergeJoinIT
Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 61.102 sec - in 
org.apache.phoenix.end2end.SortMergeJoinMoreIT
Running org.apache.phoenix.end2end.SpooledTmpFileDeleteIT
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 9.394 sec - in 
org.apache.phoenix.end2end.SpooledTmpFileDeleteIT
Running org.apache.phoenix.end2end.SqrtFunctionEnd2EndIT
Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 19.533 sec - in 
org.apache.phoenix.end2end.SqrtFunctionEnd2EndIT
Running org.apache.phoenix.end2end.StatementHintsIT
Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 10.735 sec - in 
org.apache.phoenix.end2end.StatementHintsIT
Running org.apache.phoenix.end2end.StddevIT
Tests run: 4, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 14.161 sec - in 
org.apache.phoenix.end2end.StddevIT
Running org.apache.phoenix.end2end.StoreNullsIT
Tests run: 45, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 123.265 sec - 
in org.apache.phoenix.end2end.SortOrderIT
Running org.apache.phoenix.end2end.StringToArrayFunctionIT
Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 34.75 sec - in 
org.apache.phoenix.end2end.StoreNullsIT
Running org.apache.phoenix.end2end.SubqueryIT
Tests run: 22, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 25.03 sec - in 
org.apache.phoenix.end2end.StringToArrayFunctionIT
Running org.apache.phoenix.end2end.SubqueryUsingSortMergeJoinIT
Tests run: 96, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 437.896 sec - 
in org.apache.phoenix.end2end.HashJoinIT
Running org.apache.phoenix.end2end.TenantIdTypeIT
Tests run: 15, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 120.362 sec - 
in org.apache.phoenix.end2end.SubqueryUsingSortMergeJoinIT
Running org.apache.phoenix.end2end.TenantSpecificViewIndexIT
Tests run: 8, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 58.767 sec - in 
org.apache.phoenix.end2end.TenantSpecificViewIndexIT
Running org.apache.phoenix.end2end.TenantSpecificViewIndexSaltedIT
Tests run: 21, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 202.291 sec - 
in org.apache.phoenix.end2end.SubqueryIT
Running org.apache.phoenix.end2end.TimezoneOffsetFunctionIT
Tests run: 4, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 31.144 sec - in 
org.apache.phoenix.end2end.TenantSpecificViewIndexSaltedIT
Running org.apache.phoenix.end2end.ToDateFunctionIT
Tests run: 7, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 23.206 sec - in 
org.apache.phoenix.end2end.TimezoneOffsetFunctionIT
Running org.apache.phoenix.end2end.UpgradeIT
Tests run: 11, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 19.511 sec - 
in org.apache.phoenix.end2end.ToDateFunctionIT
Running org.apache.phoenix.end2end.UpsertBigValuesIT
Tests run: 4, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 39.349 sec - in 
org.apache.phoenix.end2end.UpsertBigValuesIT
Tests run: 99, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 442.405 sec - 
in org.apache.phoenix.end2end.SortMergeJoinIT
Running org.apache.phoenix.end2end.UpsertSelectAutoCommitIT
Running org.apache.phoenix.end2end.index.DropViewIT
Tests run: 15, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 271.893 sec - 
in org.apache.phoenix.end2end.TenantIdTypeIT
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 15.52 sec - in 
org.apache.phoenix.end2end.index.DropViewIT
Running org.apache.phoenix.end2end.index.GlobalIndexOptimizationIT
Running org.apache.phoenix.end2end.index.ImmutableIndexIT
Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 41.226 sec - in 
org.apache.phoenix.end2end.UpsertSelectAutoCommitIT
Running org.apache.phoenix.end2end.index.IndexExpressionIT
Tests run: 4, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 49.736 sec - in 
org.apache.phoenix.end2end.index.ImmutableIndexIT
Running org.apache.phoenix.end2end.index.IndexIT
Tests run: 6, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 123.049 sec - 
in org.apache.phoenix.end2end.UpgradeIT
Running org.apache.phoenix.end2end.index.IndexMetadataIT
Tests run: 6, Fa

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

2016-01-15 Thread Apache Jenkins Server
See 

Changes:

[maryannxue] PHOENIX-2601 Query result is incorrect when both index hint and 
limit

--
[...truncated 667 lines...]
Running org.apache.phoenix.end2end.ReverseScanIT
Tests run: 5, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 4.959 sec - in 
org.apache.phoenix.end2end.ReverseFunctionIT
Running org.apache.phoenix.end2end.RoundFloorCeilFunctionsEnd2EndIT
Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 4.631 sec - in 
org.apache.phoenix.end2end.ReverseScanIT
Running org.apache.phoenix.end2end.ServerExceptionIT
Tests run: 6, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 21.259 sec - in 
org.apache.phoenix.end2end.QueryMoreIT
Running org.apache.phoenix.end2end.SignFunctionEnd2EndIT
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 2.215 sec - in 
org.apache.phoenix.end2end.ServerExceptionIT
Running org.apache.phoenix.end2end.SkipScanAfterManualSplitIT
Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 5.112 sec - in 
org.apache.phoenix.end2end.SignFunctionEnd2EndIT
Running org.apache.phoenix.end2end.SkipScanQueryIT
Tests run: 33, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 23.821 sec - 
in org.apache.phoenix.end2end.RoundFloorCeilFunctionsEnd2EndIT
Running org.apache.phoenix.end2end.SortMergeJoinIT
Tests run: 11, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 19.071 sec - 
in org.apache.phoenix.end2end.SkipScanQueryIT
Running org.apache.phoenix.end2end.SortMergeJoinMoreIT
Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 25.402 sec - in 
org.apache.phoenix.end2end.SkipScanAfterManualSplitIT
Running org.apache.phoenix.end2end.SortOrderIT
Tests run: 28, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 127.308 sec - 
in org.apache.phoenix.end2end.InListIT
Running org.apache.phoenix.end2end.SpooledSortMergeJoinIT
Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 17.349 sec - in 
org.apache.phoenix.end2end.SortMergeJoinMoreIT
Running org.apache.phoenix.end2end.SpooledTmpFileDeleteIT
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 2.67 sec - in 
org.apache.phoenix.end2end.SpooledTmpFileDeleteIT
Running org.apache.phoenix.end2end.SqrtFunctionEnd2EndIT
Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 5.613 sec - in 
org.apache.phoenix.end2end.SqrtFunctionEnd2EndIT
Running org.apache.phoenix.end2end.StatementHintsIT
Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 3.595 sec - in 
org.apache.phoenix.end2end.StatementHintsIT
Running org.apache.phoenix.end2end.StddevIT
Tests run: 45, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 34.344 sec - 
in org.apache.phoenix.end2end.SortOrderIT
Running org.apache.phoenix.end2end.StoreNullsIT
Tests run: 4, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 4.183 sec - in 
org.apache.phoenix.end2end.StddevIT
Running org.apache.phoenix.end2end.StringToArrayFunctionIT
Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 16.741 sec - in 
org.apache.phoenix.end2end.StoreNullsIT
Running org.apache.phoenix.end2end.SubqueryIT
Tests run: 22, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 16.579 sec - 
in org.apache.phoenix.end2end.StringToArrayFunctionIT
Running org.apache.phoenix.end2end.SubqueryUsingSortMergeJoinIT
Tests run: 21, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 42.479 sec - 
in org.apache.phoenix.end2end.SubqueryIT
Running org.apache.phoenix.end2end.TenantIdTypeIT
Tests run: 15, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 63.845 sec - 
in org.apache.phoenix.end2end.SubqueryUsingSortMergeJoinIT
Running org.apache.phoenix.end2end.TenantSpecificViewIndexIT
Tests run: 96, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 242.628 sec - 
in org.apache.phoenix.end2end.HashJoinIT
Running org.apache.phoenix.end2end.TenantSpecificViewIndexSaltedIT
Tests run: 4, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 10.123 sec - in 
org.apache.phoenix.end2end.TenantSpecificViewIndexSaltedIT
Running org.apache.phoenix.end2end.TimezoneOffsetFunctionIT
Tests run: 8, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 18.092 sec - in 
org.apache.phoenix.end2end.TenantSpecificViewIndexIT
Running org.apache.phoenix.end2end.ToDateFunctionIT
Tests run: 7, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 6.483 sec - in 
org.apache.phoenix.end2end.TimezoneOffsetFunctionIT
Running org.apache.phoenix.end2end.UpgradeIT
Tests run: 11, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 6.854 sec - in 
org.apache.phoenix.end2end.ToDateFunctionIT
Running org.apache.phoenix.end2end.UpsertBigValuesIT
Tests run: 15, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 53.555 sec - 
in org.apache.phoenix.end2end.TenantIdTypeIT
Running org.apache.phoenix.end2end.UpsertSelectAutoCommitIT
Tests run: 4, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 10.193 sec - in 
org.apache.phoenix.end2end.UpsertBigValuesIT
Running org.apache.phoenix.end2en

phoenix git commit: PHOENIX-1261 Addendum to fix test failures

2016-01-15 Thread samarth
Repository: phoenix
Updated Branches:
  refs/heads/4.x-HBase-1.0 998d9d6de -> 95308df6b


PHOENIX-1261 Addendum to fix test failures


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

Branch: refs/heads/4.x-HBase-1.0
Commit: 95308df6b99f3e64aa2ac8b9d08598b654e5980d
Parents: 998d9d6
Author: Samarth 
Authored: Fri Jan 15 20:21:21 2016 -0800
Committer: Samarth 
Committed: Fri Jan 15 20:21:21 2016 -0800

--
 .../apache/phoenix/coprocessor/BaseScannerRegionObserver.java  | 2 +-
 .../phoenix/coprocessor/UngroupedAggregateRegionObserver.java  | 2 +-
 .../main/java/org/apache/phoenix/schema/MetaDataClient.java| 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/95308df6/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/BaseScannerRegionObserver.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/BaseScannerRegionObserver.java
 
b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/BaseScannerRegionObserver.java
index 5ab432c..8026e6e 100644
--- 
a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/BaseScannerRegionObserver.java
+++ 
b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/BaseScannerRegionObserver.java
@@ -92,7 +92,7 @@ abstract public class BaseScannerRegionObserver extends 
BaseRegionObserver {
 public static final String GUIDEPOST_PER_REGION = "_GUIDEPOST_PER_REGION";
 public static final String UPGRADE_DESC_ROW_KEY = "_UPGRADE_DESC_ROW_KEY";
 public static final String SCAN_REGION_SERVER = "_SCAN_REGION_SERVER";
-public static final String RUN_UPDATE_STATS_ASYNC = "_RunUpdateStatsAsync";
+public static final String RUN_UPDATE_STATS_ASYNC_ATTRIB = 
"_RunUpdateStatsAsync";
 
 /**
  * Attribute name used to pass custom annotations in Scans and Mutations 
(later). Custom annotations

http://git-wip-us.apache.org/repos/asf/phoenix/blob/95308df6/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/UngroupedAggregateRegionObserver.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/UngroupedAggregateRegionObserver.java
 
b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/UngroupedAggregateRegionObserver.java
index ddb833c..e40260b 100644
--- 
a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/UngroupedAggregateRegionObserver.java
+++ 
b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/UngroupedAggregateRegionObserver.java
@@ -663,7 +663,7 @@ public class UngroupedAggregateRegionObserver extends 
BaseScannerRegionObserver
 final HRegion region, final Scan scan, Configuration config) 
throws IOException {
 StatsCollectionCallable callable =
 new StatsCollectionCallable(stats, region, innerScanner, 
config);
-byte[] asyncBytes = 
scan.getAttribute(BaseScannerRegionObserver.RUN_UPDATE_STATS_ASYNC);
+byte[] asyncBytes = 
scan.getAttribute(BaseScannerRegionObserver.RUN_UPDATE_STATS_ASYNC_ATTRIB);
 boolean async = false;
 if (asyncBytes != null) {
 async = Bytes.toBoolean(asyncBytes);

http://git-wip-us.apache.org/repos/asf/phoenix/blob/95308df6/phoenix-core/src/main/java/org/apache/phoenix/schema/MetaDataClient.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/schema/MetaDataClient.java 
b/phoenix-core/src/main/java/org/apache/phoenix/schema/MetaDataClient.java
index 995be86..f1bb582 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/schema/MetaDataClient.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/schema/MetaDataClient.java
@@ -22,7 +22,7 @@ import static com.google.common.collect.Sets.newLinkedHashSet;
 import static com.google.common.collect.Sets.newLinkedHashSetWithExpectedSize;
 import static org.apache.hadoop.hbase.HColumnDescriptor.TTL;
 import static 
org.apache.phoenix.coprocessor.BaseScannerRegionObserver.ANALYZE_TABLE;
-import static 
org.apache.phoenix.coprocessor.BaseScannerRegionObserver.RUN_UPDATE_STATS_ASYNC;
+import static 
org.apache.phoenix.coprocessor.BaseScannerRegionObserver.RUN_UPDATE_STATS_ASYNC_ATTRIB;
 import static 
org.apache.phoenix.exception.SQLExceptionCode.INSUFFICIENT_MULTI_TENANT_COLUMNS;
 import static org.apache.phoenix.jdbc.PhoenixDatabaseMetaData.ARG_POSITION;
 import static org.apache.phoenix.jdbc.PhoenixDatabaseMetaData.ARRAY_SIZE;
@@ -955,8 +955,8 @@ public class MetaDataClient {
 

phoenix git commit: PHOENIX-1261 Addendum to fix test failures

2016-01-15 Thread samarth
Repository: phoenix
Updated Branches:
  refs/heads/master 26c138fec -> c2ee4f7fd


PHOENIX-1261 Addendum to fix test failures


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

Branch: refs/heads/master
Commit: c2ee4f7fd7dc80b511ba23e0431a3b8ffeae26a3
Parents: 26c138f
Author: Samarth 
Authored: Fri Jan 15 20:17:08 2016 -0800
Committer: Samarth 
Committed: Fri Jan 15 20:17:08 2016 -0800

--
 .../apache/phoenix/coprocessor/BaseScannerRegionObserver.java  | 2 +-
 .../phoenix/coprocessor/UngroupedAggregateRegionObserver.java  | 2 +-
 .../main/java/org/apache/phoenix/schema/MetaDataClient.java| 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/c2ee4f7f/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/BaseScannerRegionObserver.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/BaseScannerRegionObserver.java
 
b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/BaseScannerRegionObserver.java
index 236c2dc..034848b 100644
--- 
a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/BaseScannerRegionObserver.java
+++ 
b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/BaseScannerRegionObserver.java
@@ -93,7 +93,7 @@ abstract public class BaseScannerRegionObserver extends 
BaseRegionObserver {
 public static final String GUIDEPOST_PER_REGION = "_GUIDEPOST_PER_REGION";
 public static final String UPGRADE_DESC_ROW_KEY = "_UPGRADE_DESC_ROW_KEY";
 public static final String SCAN_REGION_SERVER = "_SCAN_REGION_SERVER";
-public static final String RUN_UPDATE_STATS_ASYNC = "_RunUpdateStatsAsync";
+public static final String RUN_UPDATE_STATS_ASYNC_ATTRIB = 
"_RunUpdateStatsAsync";
 
 /**
  * Attribute name used to pass custom annotations in Scans and Mutations 
(later). Custom annotations

http://git-wip-us.apache.org/repos/asf/phoenix/blob/c2ee4f7f/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/UngroupedAggregateRegionObserver.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/UngroupedAggregateRegionObserver.java
 
b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/UngroupedAggregateRegionObserver.java
index 1d67994..f332e60 100644
--- 
a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/UngroupedAggregateRegionObserver.java
+++ 
b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/UngroupedAggregateRegionObserver.java
@@ -666,7 +666,7 @@ public class UngroupedAggregateRegionObserver extends 
BaseScannerRegionObserver
 final Region region, final Scan scan, Configuration config) throws 
IOException {
 StatsCollectionCallable callable =
 new StatsCollectionCallable(stats, region, innerScanner, 
config);
-byte[] asyncBytes = 
scan.getAttribute(BaseScannerRegionObserver.RUN_UPDATE_STATS_ASYNC);
+byte[] asyncBytes = 
scan.getAttribute(BaseScannerRegionObserver.RUN_UPDATE_STATS_ASYNC_ATTRIB);
 boolean async = false;
 if (asyncBytes != null) {
 async = Bytes.toBoolean(asyncBytes);

http://git-wip-us.apache.org/repos/asf/phoenix/blob/c2ee4f7f/phoenix-core/src/main/java/org/apache/phoenix/schema/MetaDataClient.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/schema/MetaDataClient.java 
b/phoenix-core/src/main/java/org/apache/phoenix/schema/MetaDataClient.java
index 995be86..f1bb582 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/schema/MetaDataClient.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/schema/MetaDataClient.java
@@ -22,7 +22,7 @@ import static com.google.common.collect.Sets.newLinkedHashSet;
 import static com.google.common.collect.Sets.newLinkedHashSetWithExpectedSize;
 import static org.apache.hadoop.hbase.HColumnDescriptor.TTL;
 import static 
org.apache.phoenix.coprocessor.BaseScannerRegionObserver.ANALYZE_TABLE;
-import static 
org.apache.phoenix.coprocessor.BaseScannerRegionObserver.RUN_UPDATE_STATS_ASYNC;
+import static 
org.apache.phoenix.coprocessor.BaseScannerRegionObserver.RUN_UPDATE_STATS_ASYNC_ATTRIB;
 import static 
org.apache.phoenix.exception.SQLExceptionCode.INSUFFICIENT_MULTI_TENANT_COLUMNS;
 import static org.apache.phoenix.jdbc.PhoenixDatabaseMetaData.ARG_POSITION;
 import static org.apache.phoenix.jdbc.PhoenixDatabaseMetaData.ARRAY_SIZE;
@@ -955,8 +955,8 @@ public class MetaDataClient {
 Scan scan = pla

phoenix git commit: PHOENIX-1261 Addendum to fix test failures

2016-01-15 Thread samarth
Repository: phoenix
Updated Branches:
  refs/heads/4.x-HBase-0.98 9d7c328a2 -> 702ab7034


PHOENIX-1261 Addendum to fix test failures


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

Branch: refs/heads/4.x-HBase-0.98
Commit: 702ab703438ffdf16241d32298e1332582b4a737
Parents: 9d7c328
Author: Samarth 
Authored: Fri Jan 15 19:55:21 2016 -0800
Committer: Samarth 
Committed: Fri Jan 15 19:55:21 2016 -0800

--
 .../apache/phoenix/coprocessor/BaseScannerRegionObserver.java  | 2 +-
 .../phoenix/coprocessor/UngroupedAggregateRegionObserver.java  | 2 +-
 .../main/java/org/apache/phoenix/schema/MetaDataClient.java| 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/702ab703/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/BaseScannerRegionObserver.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/BaseScannerRegionObserver.java
 
b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/BaseScannerRegionObserver.java
index 5a86a39..fbaa020 100644
--- 
a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/BaseScannerRegionObserver.java
+++ 
b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/BaseScannerRegionObserver.java
@@ -92,7 +92,7 @@ abstract public class BaseScannerRegionObserver extends 
BaseRegionObserver {
 public static final String GUIDEPOST_PER_REGION = "_GUIDEPOST_PER_REGION";
 public static final String UPGRADE_DESC_ROW_KEY = "_UPGRADE_DESC_ROW_KEY";
 public static final String SCAN_REGION_SERVER = "_SCAN_REGION_SERVER";
-public static final String RUN_UPDATE_STATS_ASYNC = "_RunUpdateStatsAsync";
+public static final String RUN_UPDATE_STATS_ASYNC_ATTRIB = 
"_RunUpdateStatsAsync";
 
 /**
  * Attribute name used to pass custom annotations in Scans and Mutations 
(later). Custom annotations

http://git-wip-us.apache.org/repos/asf/phoenix/blob/702ab703/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/UngroupedAggregateRegionObserver.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/UngroupedAggregateRegionObserver.java
 
b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/UngroupedAggregateRegionObserver.java
index 841e557..1a52f8e 100644
--- 
a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/UngroupedAggregateRegionObserver.java
+++ 
b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/UngroupedAggregateRegionObserver.java
@@ -662,7 +662,7 @@ public class UngroupedAggregateRegionObserver extends 
BaseScannerRegionObserver
 final HRegion region, final Scan scan, Configuration config) 
throws IOException {
 StatsCollectionCallable callable =
 new StatsCollectionCallable(stats, region, innerScanner, 
config);
-byte[] asyncBytes = 
scan.getAttribute(BaseScannerRegionObserver.RUN_UPDATE_STATS_ASYNC);
+byte[] asyncBytes = 
scan.getAttribute(BaseScannerRegionObserver.RUN_UPDATE_STATS_ASYNC_ATTRIB);
 boolean async = false;
 if (asyncBytes != null) {
 async = Bytes.toBoolean(asyncBytes);

http://git-wip-us.apache.org/repos/asf/phoenix/blob/702ab703/phoenix-core/src/main/java/org/apache/phoenix/schema/MetaDataClient.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/schema/MetaDataClient.java 
b/phoenix-core/src/main/java/org/apache/phoenix/schema/MetaDataClient.java
index 995be86..f1bb582 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/schema/MetaDataClient.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/schema/MetaDataClient.java
@@ -22,7 +22,7 @@ import static com.google.common.collect.Sets.newLinkedHashSet;
 import static com.google.common.collect.Sets.newLinkedHashSetWithExpectedSize;
 import static org.apache.hadoop.hbase.HColumnDescriptor.TTL;
 import static 
org.apache.phoenix.coprocessor.BaseScannerRegionObserver.ANALYZE_TABLE;
-import static 
org.apache.phoenix.coprocessor.BaseScannerRegionObserver.RUN_UPDATE_STATS_ASYNC;
+import static 
org.apache.phoenix.coprocessor.BaseScannerRegionObserver.RUN_UPDATE_STATS_ASYNC_ATTRIB;
 import static 
org.apache.phoenix.exception.SQLExceptionCode.INSUFFICIENT_MULTI_TENANT_COLUMNS;
 import static org.apache.phoenix.jdbc.PhoenixDatabaseMetaData.ARG_POSITION;
 import static org.apache.phoenix.jdbc.PhoenixDatabaseMetaData.ARRAY_SIZE;
@@ -955,8 +955,8 @@ public class MetaDataClient {
   

phoenix git commit: PHOENIX-2601 Query result is incorrect when both index hint and limit are used

2016-01-15 Thread maryannxue
Repository: phoenix
Updated Branches:
  refs/heads/4.x-HBase-0.98 d85365618 -> 9d7c328a2


PHOENIX-2601 Query result is incorrect when both index hint and limit are used


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

Branch: refs/heads/4.x-HBase-0.98
Commit: 9d7c328a2d0089c0ec819c41a0a54fda1e8d3ff0
Parents: d853656
Author: maryannxue 
Authored: Fri Jan 15 22:38:58 2016 -0500
Committer: maryannxue 
Committed: Fri Jan 15 22:38:58 2016 -0500

--
 .../index/GlobalIndexOptimizationIT.java| 23 
 .../apache/phoenix/optimize/QueryOptimizer.java |  2 +-
 2 files changed, 24 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/9d7c328a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/GlobalIndexOptimizationIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/GlobalIndexOptimizationIT.java
 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/GlobalIndexOptimizationIT.java
index b97176f..10634b8 100644
--- 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/GlobalIndexOptimizationIT.java
+++ 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/GlobalIndexOptimizationIT.java
@@ -157,6 +157,29 @@ public class GlobalIndexOptimizationIT extends 
BaseHBaseManagedTimeIT {
 assertEquals("a", rs.getString("v1"));
 assertFalse(rs.next());
 
+query = "SELECT /*+ INDEX(" + TestUtil.DEFAULT_DATA_TABLE_NAME + " 
" + TestUtil.DEFAULT_INDEX_TABLE_NAME + ")*/ * FROM " + 
TestUtil.DEFAULT_DATA_TABLE_NAME +" where v1='a' limit 1";
+rs = conn1.createStatement().executeQuery("EXPLAIN "+ query);
+
+expected = 
+"CLIENT PARALLEL 1-WAY FULL SCAN OVER " + 
TestUtil.DEFAULT_DATA_TABLE_NAME + "\n" +
+"CLIENT 1 ROW LIMIT\n" +
+"SKIP-SCAN-JOIN TABLE 0\n" +
+"CLIENT PARALLEL 1-WAY RANGE SCAN OVER " + 
TestUtil.DEFAULT_INDEX_TABLE_NAME + " \\['a'\\]\n" +
+"SERVER FILTER BY FIRST KEY ONLY\n" +
+"DYNAMIC SERVER FILTER BY \\(\"T.T_ID\", \"T.K1\", 
\"T.K2\"\\) IN \\(\\(\\$\\d+.\\$\\d+, \\$\\d+.\\$\\d+, \\$\\d+.\\$\\d+\\)\\)\n" 
+
+"JOIN-SCANNER 1 ROW LIMIT";
+actual = QueryUtil.getExplainPlan(rs);
+assertTrue("Expected:\n" + expected + "\nbut got\n" + actual, 
Pattern.matches(expected, actual));
+
+rs = conn1.createStatement().executeQuery(query);
+assertTrue(rs.next());
+assertEquals("f", rs.getString("t_id"));
+assertEquals(1, rs.getInt("k1"));
+assertEquals(2, rs.getInt("k2"));
+assertEquals(3, rs.getInt("k3"));
+assertEquals("a", rs.getString("v1"));
+assertFalse(rs.next());
+
 query = "SELECT /*+ INDEX(" + TestUtil.DEFAULT_DATA_TABLE_NAME + " 
" + TestUtil.DEFAULT_INDEX_TABLE_NAME + ")*/ t_id, k1, k2, k3, V1 from " + 
TestUtil.DEFAULT_DATA_TABLE_FULL_NAME + "  where v1<='z' and k3 > 1 order by 
V1,t_id";
 rs = conn1.createStatement().executeQuery("EXPLAIN " + query);
 

http://git-wip-us.apache.org/repos/asf/phoenix/blob/9d7c328a/phoenix-core/src/main/java/org/apache/phoenix/optimize/QueryOptimizer.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/optimize/QueryOptimizer.java 
b/phoenix-core/src/main/java/org/apache/phoenix/optimize/QueryOptimizer.java
index c5ff3c6..adc3c2d 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/optimize/QueryOptimizer.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/optimize/QueryOptimizer.java
@@ -285,7 +285,7 @@ public class QueryOptimizer {
 aliasedNodes.add(FACTORY.aliasedNode(null, 
indexColNode));
 nodes.add(new ColumnParseNode(null, '"' + 
column.getName().getString() + '"'));
 }
-SelectStatement innerSelect = 
FACTORY.select(indexSelect.getFrom(), indexSelect.getHint(), false, 
aliasedNodes, where, null, null, null, indexSelect.getLimit(), 
indexSelect.getBindCount(), false, indexSelect.hasSequence(), 
Collections.emptyList(), indexSelect.getUdfParseNodes());
+SelectStatement innerSelect = 
FACTORY.select(indexSelect.getFrom(), indexSelect.getHint(), false, 
aliasedNodes, where, null, null, null, null, indexSelect

phoenix git commit: PHOENIX-2601 Query result is incorrect when both index hint and limit are used

2016-01-15 Thread maryannxue
Repository: phoenix
Updated Branches:
  refs/heads/4.x-HBase-1.0 c5c6fdcb7 -> 998d9d6de


PHOENIX-2601 Query result is incorrect when both index hint and limit are used


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

Branch: refs/heads/4.x-HBase-1.0
Commit: 998d9d6dec0fedc365c4729c8ac646a3fa926e0a
Parents: c5c6fdc
Author: maryannxue 
Authored: Fri Jan 15 22:34:45 2016 -0500
Committer: maryannxue 
Committed: Fri Jan 15 22:34:45 2016 -0500

--
 .../index/GlobalIndexOptimizationIT.java| 23 
 .../apache/phoenix/optimize/QueryOptimizer.java |  2 +-
 2 files changed, 24 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/998d9d6d/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/GlobalIndexOptimizationIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/GlobalIndexOptimizationIT.java
 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/GlobalIndexOptimizationIT.java
index b97176f..10634b8 100644
--- 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/GlobalIndexOptimizationIT.java
+++ 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/GlobalIndexOptimizationIT.java
@@ -157,6 +157,29 @@ public class GlobalIndexOptimizationIT extends 
BaseHBaseManagedTimeIT {
 assertEquals("a", rs.getString("v1"));
 assertFalse(rs.next());
 
+query = "SELECT /*+ INDEX(" + TestUtil.DEFAULT_DATA_TABLE_NAME + " 
" + TestUtil.DEFAULT_INDEX_TABLE_NAME + ")*/ * FROM " + 
TestUtil.DEFAULT_DATA_TABLE_NAME +" where v1='a' limit 1";
+rs = conn1.createStatement().executeQuery("EXPLAIN "+ query);
+
+expected = 
+"CLIENT PARALLEL 1-WAY FULL SCAN OVER " + 
TestUtil.DEFAULT_DATA_TABLE_NAME + "\n" +
+"CLIENT 1 ROW LIMIT\n" +
+"SKIP-SCAN-JOIN TABLE 0\n" +
+"CLIENT PARALLEL 1-WAY RANGE SCAN OVER " + 
TestUtil.DEFAULT_INDEX_TABLE_NAME + " \\['a'\\]\n" +
+"SERVER FILTER BY FIRST KEY ONLY\n" +
+"DYNAMIC SERVER FILTER BY \\(\"T.T_ID\", \"T.K1\", 
\"T.K2\"\\) IN \\(\\(\\$\\d+.\\$\\d+, \\$\\d+.\\$\\d+, \\$\\d+.\\$\\d+\\)\\)\n" 
+
+"JOIN-SCANNER 1 ROW LIMIT";
+actual = QueryUtil.getExplainPlan(rs);
+assertTrue("Expected:\n" + expected + "\nbut got\n" + actual, 
Pattern.matches(expected, actual));
+
+rs = conn1.createStatement().executeQuery(query);
+assertTrue(rs.next());
+assertEquals("f", rs.getString("t_id"));
+assertEquals(1, rs.getInt("k1"));
+assertEquals(2, rs.getInt("k2"));
+assertEquals(3, rs.getInt("k3"));
+assertEquals("a", rs.getString("v1"));
+assertFalse(rs.next());
+
 query = "SELECT /*+ INDEX(" + TestUtil.DEFAULT_DATA_TABLE_NAME + " 
" + TestUtil.DEFAULT_INDEX_TABLE_NAME + ")*/ t_id, k1, k2, k3, V1 from " + 
TestUtil.DEFAULT_DATA_TABLE_FULL_NAME + "  where v1<='z' and k3 > 1 order by 
V1,t_id";
 rs = conn1.createStatement().executeQuery("EXPLAIN " + query);
 

http://git-wip-us.apache.org/repos/asf/phoenix/blob/998d9d6d/phoenix-core/src/main/java/org/apache/phoenix/optimize/QueryOptimizer.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/optimize/QueryOptimizer.java 
b/phoenix-core/src/main/java/org/apache/phoenix/optimize/QueryOptimizer.java
index c5ff3c6..adc3c2d 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/optimize/QueryOptimizer.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/optimize/QueryOptimizer.java
@@ -285,7 +285,7 @@ public class QueryOptimizer {
 aliasedNodes.add(FACTORY.aliasedNode(null, 
indexColNode));
 nodes.add(new ColumnParseNode(null, '"' + 
column.getName().getString() + '"'));
 }
-SelectStatement innerSelect = 
FACTORY.select(indexSelect.getFrom(), indexSelect.getHint(), false, 
aliasedNodes, where, null, null, null, indexSelect.getLimit(), 
indexSelect.getBindCount(), false, indexSelect.hasSequence(), 
Collections.emptyList(), indexSelect.getUdfParseNodes());
+SelectStatement innerSelect = 
FACTORY.select(indexSelect.getFrom(), indexSelect.getHint(), false, 
aliasedNodes, where, null, null, null, null, indexSelect.g

[2/2] phoenix git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/phoenix

2016-01-15 Thread maryannxue
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/phoenix


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

Branch: refs/heads/master
Commit: 26c138fec4acffc53f1179f3bf6ebaf43e251880
Parents: 3c2ec56 04504c3
Author: maryannxue 
Authored: Fri Jan 15 22:27:55 2016 -0500
Committer: maryannxue 
Committed: Fri Jan 15 22:27:55 2016 -0500

--
 .../apache/phoenix/end2end/UpsertSelectIT.java  |  23 +
 .../org/apache/phoenix/tx/TransactionIT.java| 442 ++-
 .../apache/phoenix/compile/DeleteCompiler.java  |   1 -
 .../apache/phoenix/execute/MutationState.java   |  40 +-
 .../apache/phoenix/jdbc/PhoenixStatement.java   |   1 +
 5 files changed, 281 insertions(+), 226 deletions(-)
--




[1/2] phoenix git commit: PHOENIX-2601 Query result is incorrect when both index hint and limit are used

2016-01-15 Thread maryannxue
Repository: phoenix
Updated Branches:
  refs/heads/master 04504c34f -> 26c138fec


PHOENIX-2601 Query result is incorrect when both index hint and limit are used


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

Branch: refs/heads/master
Commit: 3c2ec562f6c347e5bfc0c1c9bc9981f8d84644ff
Parents: 763a356
Author: maryannxue 
Authored: Fri Jan 15 22:27:42 2016 -0500
Committer: maryannxue 
Committed: Fri Jan 15 22:27:42 2016 -0500

--
 .../index/GlobalIndexOptimizationIT.java| 23 
 .../apache/phoenix/optimize/QueryOptimizer.java |  2 +-
 2 files changed, 24 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/3c2ec562/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/GlobalIndexOptimizationIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/GlobalIndexOptimizationIT.java
 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/GlobalIndexOptimizationIT.java
index b97176f..10634b8 100644
--- 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/GlobalIndexOptimizationIT.java
+++ 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/GlobalIndexOptimizationIT.java
@@ -157,6 +157,29 @@ public class GlobalIndexOptimizationIT extends 
BaseHBaseManagedTimeIT {
 assertEquals("a", rs.getString("v1"));
 assertFalse(rs.next());
 
+query = "SELECT /*+ INDEX(" + TestUtil.DEFAULT_DATA_TABLE_NAME + " 
" + TestUtil.DEFAULT_INDEX_TABLE_NAME + ")*/ * FROM " + 
TestUtil.DEFAULT_DATA_TABLE_NAME +" where v1='a' limit 1";
+rs = conn1.createStatement().executeQuery("EXPLAIN "+ query);
+
+expected = 
+"CLIENT PARALLEL 1-WAY FULL SCAN OVER " + 
TestUtil.DEFAULT_DATA_TABLE_NAME + "\n" +
+"CLIENT 1 ROW LIMIT\n" +
+"SKIP-SCAN-JOIN TABLE 0\n" +
+"CLIENT PARALLEL 1-WAY RANGE SCAN OVER " + 
TestUtil.DEFAULT_INDEX_TABLE_NAME + " \\['a'\\]\n" +
+"SERVER FILTER BY FIRST KEY ONLY\n" +
+"DYNAMIC SERVER FILTER BY \\(\"T.T_ID\", \"T.K1\", 
\"T.K2\"\\) IN \\(\\(\\$\\d+.\\$\\d+, \\$\\d+.\\$\\d+, \\$\\d+.\\$\\d+\\)\\)\n" 
+
+"JOIN-SCANNER 1 ROW LIMIT";
+actual = QueryUtil.getExplainPlan(rs);
+assertTrue("Expected:\n" + expected + "\nbut got\n" + actual, 
Pattern.matches(expected, actual));
+
+rs = conn1.createStatement().executeQuery(query);
+assertTrue(rs.next());
+assertEquals("f", rs.getString("t_id"));
+assertEquals(1, rs.getInt("k1"));
+assertEquals(2, rs.getInt("k2"));
+assertEquals(3, rs.getInt("k3"));
+assertEquals("a", rs.getString("v1"));
+assertFalse(rs.next());
+
 query = "SELECT /*+ INDEX(" + TestUtil.DEFAULT_DATA_TABLE_NAME + " 
" + TestUtil.DEFAULT_INDEX_TABLE_NAME + ")*/ t_id, k1, k2, k3, V1 from " + 
TestUtil.DEFAULT_DATA_TABLE_FULL_NAME + "  where v1<='z' and k3 > 1 order by 
V1,t_id";
 rs = conn1.createStatement().executeQuery("EXPLAIN " + query);
 

http://git-wip-us.apache.org/repos/asf/phoenix/blob/3c2ec562/phoenix-core/src/main/java/org/apache/phoenix/optimize/QueryOptimizer.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/optimize/QueryOptimizer.java 
b/phoenix-core/src/main/java/org/apache/phoenix/optimize/QueryOptimizer.java
index c5ff3c6..adc3c2d 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/optimize/QueryOptimizer.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/optimize/QueryOptimizer.java
@@ -285,7 +285,7 @@ public class QueryOptimizer {
 aliasedNodes.add(FACTORY.aliasedNode(null, 
indexColNode));
 nodes.add(new ColumnParseNode(null, '"' + 
column.getName().getString() + '"'));
 }
-SelectStatement innerSelect = 
FACTORY.select(indexSelect.getFrom(), indexSelect.getHint(), false, 
aliasedNodes, where, null, null, null, indexSelect.getLimit(), 
indexSelect.getBindCount(), false, indexSelect.hasSequence(), 
Collections.emptyList(), indexSelect.getUdfParseNodes());
+SelectStatement innerSelect = 
FACTORY.select(indexSelect.getFrom(), indexSelect.getHint(), false, 
aliasedNodes, where, null, null, null, null, indexSelect.getBindCount(),

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

2016-01-15 Thread Apache Jenkins Server
See 

Changes:

[jamestaylor] PHOENIX-2600 NPE on immutable index creation over transactional 
table

--
[...truncated 678 lines...]
Running org.apache.phoenix.end2end.SortMergeJoinIT
Tests run: 11, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 18.233 sec - 
in org.apache.phoenix.end2end.SkipScanQueryIT
Running org.apache.phoenix.end2end.SortMergeJoinMoreIT
Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 37.025 sec - in 
org.apache.phoenix.end2end.SkipScanAfterManualSplitIT
Running org.apache.phoenix.end2end.SortOrderIT
Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 17.146 sec - in 
org.apache.phoenix.end2end.SortMergeJoinMoreIT
Running org.apache.phoenix.end2end.SpooledSortMergeJoinIT
Tests run: 28, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 168.393 sec - 
in org.apache.phoenix.end2end.InListIT
Running org.apache.phoenix.end2end.SpooledTmpFileDeleteIT
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 3.856 sec - in 
org.apache.phoenix.end2end.SpooledTmpFileDeleteIT
Running org.apache.phoenix.end2end.SqrtFunctionEnd2EndIT
Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 6.888 sec - in 
org.apache.phoenix.end2end.SqrtFunctionEnd2EndIT
Running org.apache.phoenix.end2end.StatementHintsIT
Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 3.421 sec - in 
org.apache.phoenix.end2end.StatementHintsIT
Running org.apache.phoenix.end2end.StddevIT
Tests run: 4, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 6.975 sec - in 
org.apache.phoenix.end2end.StddevIT
Running org.apache.phoenix.end2end.StoreNullsIT
Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 23.692 sec - in 
org.apache.phoenix.end2end.StoreNullsIT
Running org.apache.phoenix.end2end.StringToArrayFunctionIT
Tests run: 45, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 80.622 sec - 
in org.apache.phoenix.end2end.SortOrderIT
Running org.apache.phoenix.end2end.SubqueryIT
Tests run: 22, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 24.278 sec - 
in org.apache.phoenix.end2end.StringToArrayFunctionIT
Running org.apache.phoenix.end2end.SubqueryUsingSortMergeJoinIT
Tests run: 15, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 90.036 sec - 
in org.apache.phoenix.end2end.SubqueryUsingSortMergeJoinIT
Running org.apache.phoenix.end2end.TenantIdTypeIT
Tests run: 21, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 128.474 sec - 
in org.apache.phoenix.end2end.SubqueryIT
Running org.apache.phoenix.end2end.TenantSpecificViewIndexIT
Tests run: 96, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 375.84 sec - 
in org.apache.phoenix.end2end.HashJoinIT
Running org.apache.phoenix.end2end.TenantSpecificViewIndexSaltedIT
Tests run: 8, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 25.837 sec - in 
org.apache.phoenix.end2end.TenantSpecificViewIndexIT
Running org.apache.phoenix.end2end.TimezoneOffsetFunctionIT
Tests run: 4, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 14.976 sec - in 
org.apache.phoenix.end2end.TenantSpecificViewIndexSaltedIT
Running org.apache.phoenix.end2end.ToDateFunctionIT
Tests run: 7, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 9.865 sec - in 
org.apache.phoenix.end2end.TimezoneOffsetFunctionIT
Running org.apache.phoenix.end2end.UpgradeIT
Tests run: 11, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 7.207 sec - in 
org.apache.phoenix.end2end.ToDateFunctionIT
Running org.apache.phoenix.end2end.UpsertBigValuesIT
Tests run: 4, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 14.011 sec - in 
org.apache.phoenix.end2end.UpsertBigValuesIT
Running org.apache.phoenix.end2end.UpsertSelectAutoCommitIT
Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 14.826 sec - in 
org.apache.phoenix.end2end.UpsertSelectAutoCommitIT
Tests run: 15, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 84.055 sec - 
in org.apache.phoenix.end2end.TenantIdTypeIT
Running org.apache.phoenix.end2end.index.DropViewIT
Running org.apache.phoenix.end2end.index.GlobalIndexOptimizationIT
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 8.695 sec - in 
org.apache.phoenix.end2end.index.DropViewIT
Running org.apache.phoenix.end2end.index.ImmutableIndexIT
Tests run: 6, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 59.359 sec - in 
org.apache.phoenix.end2end.UpgradeIT
Running org.apache.phoenix.end2end.index.IndexExpressionIT
Tests run: 99, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 310.196 sec - 
in org.apache.phoenix.end2end.SpooledSortMergeJoinIT
Running org.apache.phoenix.end2end.index.IndexIT
Tests run: 4, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 24.182 sec - in 
org.apache.phoenix.end2end.index.ImmutableIndexIT
Running org.apache.phoenix.end2end.index.IndexMetadataIT
Tests run: 6, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 46.676 sec - in 
org.apache.phoenix.end2end.index.GlobalIndexOptimizationIT
Running org.

Build failed in Jenkins: Phoenix | Master #1080

2016-01-15 Thread Apache Jenkins Server
See 

Changes:

[jamestaylor] PHOENIX-2600 NPE on immutable index creation over transactional 
table

--
[...truncated 696 lines...]
Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 16.896 sec - in 
org.apache.phoenix.end2end.SignFunctionEnd2EndIT
Running org.apache.phoenix.end2end.SortMergeJoinIT
Tests run: 33, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 33.274 sec - 
in org.apache.phoenix.end2end.RoundFloorCeilFunctionsEnd2EndIT
Running org.apache.phoenix.end2end.SortMergeJoinMoreIT
Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 56.459 sec - in 
org.apache.phoenix.end2end.SkipScanAfterManualSplitIT
Running org.apache.phoenix.end2end.SortOrderIT
Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 50.976 sec - in 
org.apache.phoenix.end2end.SortMergeJoinMoreIT
Running org.apache.phoenix.end2end.SpooledSortMergeJoinIT
Tests run: 11, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 59.117 sec - 
in org.apache.phoenix.end2end.SkipScanQueryIT
Running org.apache.phoenix.end2end.SpooledTmpFileDeleteIT
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 10.144 sec - in 
org.apache.phoenix.end2end.SpooledTmpFileDeleteIT
Running org.apache.phoenix.end2end.SqrtFunctionEnd2EndIT
Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 20.898 sec - in 
org.apache.phoenix.end2end.SqrtFunctionEnd2EndIT
Running org.apache.phoenix.end2end.StatementHintsIT
Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 10.642 sec - in 
org.apache.phoenix.end2end.StatementHintsIT
Running org.apache.phoenix.end2end.StddevIT
Tests run: 4, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 10.418 sec - in 
org.apache.phoenix.end2end.StddevIT
Running org.apache.phoenix.end2end.StoreNullsIT
Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 41.955 sec - in 
org.apache.phoenix.end2end.StoreNullsIT
Running org.apache.phoenix.end2end.StringToArrayFunctionIT
Tests run: 96, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 438.8 sec - in 
org.apache.phoenix.end2end.HashJoinIT
Running org.apache.phoenix.end2end.SubqueryIT
Tests run: 22, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 42.272 sec - 
in org.apache.phoenix.end2end.StringToArrayFunctionIT
Running org.apache.phoenix.end2end.SubqueryUsingSortMergeJoinIT
Tests run: 45, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 156.082 sec - 
in org.apache.phoenix.end2end.SortOrderIT
Running org.apache.phoenix.end2end.TenantIdTypeIT
Tests run: 15, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 157.994 sec - 
in org.apache.phoenix.end2end.SubqueryUsingSortMergeJoinIT
Running org.apache.phoenix.end2end.TenantSpecificViewIndexIT
Tests run: 21, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 200.266 sec - 
in org.apache.phoenix.end2end.SubqueryIT
Running org.apache.phoenix.end2end.TenantSpecificViewIndexSaltedIT
Tests run: 99, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 351.205 sec - 
in org.apache.phoenix.end2end.SpooledSortMergeJoinIT
Running org.apache.phoenix.end2end.TimezoneOffsetFunctionIT
Tests run: 8, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 57.779 sec - in 
org.apache.phoenix.end2end.TenantSpecificViewIndexIT
Running org.apache.phoenix.end2end.ToDateFunctionIT
Tests run: 7, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 16.857 sec - in 
org.apache.phoenix.end2end.TimezoneOffsetFunctionIT
Running org.apache.phoenix.end2end.UpgradeIT
Tests run: 4, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 29.045 sec - in 
org.apache.phoenix.end2end.TenantSpecificViewIndexSaltedIT
Running org.apache.phoenix.end2end.UpsertBigValuesIT
Tests run: 11, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 19.231 sec - 
in org.apache.phoenix.end2end.ToDateFunctionIT
Tests run: 99, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 435.517 sec - 
in org.apache.phoenix.end2end.SortMergeJoinIT
Running org.apache.phoenix.end2end.UpsertSelectAutoCommitIT
Running org.apache.phoenix.end2end.index.DropViewIT
Tests run: 15, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 247.824 sec - 
in org.apache.phoenix.end2end.TenantIdTypeIT
Running org.apache.phoenix.end2end.index.GlobalIndexOptimizationIT
Tests run: 4, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 30.942 sec - in 
org.apache.phoenix.end2end.UpsertBigValuesIT
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 19.093 sec - in 
org.apache.phoenix.end2end.index.DropViewIT
Running org.apache.phoenix.end2end.index.ImmutableIndexIT
Running org.apache.phoenix.end2end.index.IndexExpressionIT
Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 51.236 sec - in 
org.apache.phoenix.end2end.UpsertSelectAutoCommitIT
Running org.apache.phoenix.end2end.index.IndexIT
Tests run: 4, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 62.003 sec - in 
org.apache.phoenix.end2end.index.ImmutableIndexIT
Running org.apache.phoenix.end2end.index.Inde

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

2016-01-15 Thread Apache Jenkins Server
See 

Changes:

[jamestaylor] PHOENIX-2600 NPE on immutable index creation over transactional 
table

--
[...truncated 664 lines...]
Running org.apache.phoenix.end2end.ReverseScanIT
Tests run: 11, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 8.74 sec - in 
org.apache.phoenix.end2end.RegexpSplitFunctionIT
Running org.apache.phoenix.end2end.RoundFloorCeilFunctionsEnd2EndIT
Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 5.527 sec - in 
org.apache.phoenix.end2end.ReverseScanIT
Tests run: 6, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 22.341 sec - in 
org.apache.phoenix.end2end.QueryMoreIT
Running org.apache.phoenix.end2end.ServerExceptionIT
Running org.apache.phoenix.end2end.SignFunctionEnd2EndIT
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 2.58 sec - in 
org.apache.phoenix.end2end.ServerExceptionIT
Running org.apache.phoenix.end2end.SkipScanAfterManualSplitIT
Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 6.381 sec - in 
org.apache.phoenix.end2end.SignFunctionEnd2EndIT
Running org.apache.phoenix.end2end.SkipScanQueryIT
Tests run: 33, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 25.286 sec - 
in org.apache.phoenix.end2end.RoundFloorCeilFunctionsEnd2EndIT
Running org.apache.phoenix.end2end.SortMergeJoinIT
Tests run: 11, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 21.404 sec - 
in org.apache.phoenix.end2end.SkipScanQueryIT
Running org.apache.phoenix.end2end.SortMergeJoinMoreIT
Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 31.489 sec - in 
org.apache.phoenix.end2end.SkipScanAfterManualSplitIT
Running org.apache.phoenix.end2end.SortOrderIT
Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 18.948 sec - in 
org.apache.phoenix.end2end.SortMergeJoinMoreIT
Running org.apache.phoenix.end2end.SpooledSortMergeJoinIT
Tests run: 28, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 155.895 sec - 
in org.apache.phoenix.end2end.InListIT
Running org.apache.phoenix.end2end.SpooledTmpFileDeleteIT
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 3.906 sec - in 
org.apache.phoenix.end2end.SpooledTmpFileDeleteIT
Running org.apache.phoenix.end2end.SqrtFunctionEnd2EndIT
Tests run: 45, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 43.42 sec - in 
org.apache.phoenix.end2end.SortOrderIT
Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 6.228 sec - in 
org.apache.phoenix.end2end.SqrtFunctionEnd2EndIT
Running org.apache.phoenix.end2end.StatementHintsIT
Running org.apache.phoenix.end2end.StddevIT
Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 3.862 sec - in 
org.apache.phoenix.end2end.StatementHintsIT
Running org.apache.phoenix.end2end.StoreNullsIT
Tests run: 4, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 5.716 sec - in 
org.apache.phoenix.end2end.StddevIT
Running org.apache.phoenix.end2end.StringToArrayFunctionIT
Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 17.423 sec - in 
org.apache.phoenix.end2end.StoreNullsIT
Running org.apache.phoenix.end2end.SubqueryIT
Tests run: 22, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 20.833 sec - 
in org.apache.phoenix.end2end.StringToArrayFunctionIT
Running org.apache.phoenix.end2end.SubqueryUsingSortMergeJoinIT
Tests run: 21, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 66.291 sec - 
in org.apache.phoenix.end2end.SubqueryIT
Running org.apache.phoenix.end2end.TenantIdTypeIT
Tests run: 15, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 77.823 sec - 
in org.apache.phoenix.end2end.SubqueryUsingSortMergeJoinIT
Running org.apache.phoenix.end2end.TenantSpecificViewIndexIT
Tests run: 8, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 22.708 sec - in 
org.apache.phoenix.end2end.TenantSpecificViewIndexIT
Running org.apache.phoenix.end2end.TenantSpecificViewIndexSaltedIT
Tests run: 4, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 14.947 sec - in 
org.apache.phoenix.end2end.TenantSpecificViewIndexSaltedIT
Running org.apache.phoenix.end2end.TimezoneOffsetFunctionIT
Tests run: 7, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 9.624 sec - in 
org.apache.phoenix.end2end.TimezoneOffsetFunctionIT
Running org.apache.phoenix.end2end.ToDateFunctionIT
Tests run: 96, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 338.619 sec - 
in org.apache.phoenix.end2end.HashJoinIT
Running org.apache.phoenix.end2end.UpgradeIT
Tests run: 15, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 75.95 sec - in 
org.apache.phoenix.end2end.TenantIdTypeIT
Running org.apache.phoenix.end2end.UpsertBigValuesIT
Tests run: 11, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 8.449 sec - in 
org.apache.phoenix.end2end.ToDateFunctionIT
Running org.apache.phoenix.end2end.UpsertSelectAutoCommitIT
Tests run: 4, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 10.957 sec - in 
org.apache.phoenix.end2end.UpsertBigValuesIT
Running org.apache.phoenix.e

phoenix git commit: PHOENIX-2600 NPE on immutable index creation over transactional table

2016-01-15 Thread jamestaylor
Repository: phoenix
Updated Branches:
  refs/heads/4.x-HBase-1.0 b07b91914 -> c5c6fdcb7


PHOENIX-2600 NPE on immutable index creation over transactional table

Conflicts:

phoenix-core/src/it/java/org/apache/phoenix/tx/TransactionIT.java
phoenix-core/src/main/java/org/apache/phoenix/execute/MutationState.java


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

Branch: refs/heads/4.x-HBase-1.0
Commit: c5c6fdcb727b466474a87d3dbcf127921d134e5e
Parents: b07b919
Author: James Taylor 
Authored: Fri Jan 15 18:04:07 2016 -0800
Committer: James Taylor 
Committed: Fri Jan 15 18:14:09 2016 -0800

--
 .../apache/phoenix/end2end/UpsertSelectIT.java  |  23 +
 .../org/apache/phoenix/tx/TransactionIT.java| 442 ++-
 .../apache/phoenix/compile/DeleteCompiler.java  |   1 -
 .../apache/phoenix/execute/MutationState.java   |  40 +-
 .../apache/phoenix/jdbc/PhoenixStatement.java   |   1 +
 5 files changed, 281 insertions(+), 226 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/c5c6fdcb/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpsertSelectIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpsertSelectIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpsertSelectIT.java
index b5252e0..364b423 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpsertSelectIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpsertSelectIT.java
@@ -1373,6 +1373,29 @@ public class UpsertSelectIT extends 
BaseClientManagedTimeIT {
 assertEquals("[[128,0,0,54], [128,0,4,0]]", rs.getArray(2).toString());
 }
 
+
+@Test
+public void testParallelUpsertSelect() throws Exception {
+Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
+props.setProperty(QueryServices.MUTATE_BATCH_SIZE_ATTRIB, 
Integer.toString(3));
+props.setProperty(QueryServices.SCAN_CACHE_SIZE_ATTRIB, 
Integer.toString(3));
+props.setProperty(QueryServices.SCAN_RESULT_CHUNK_SIZE, 
Integer.toString(3));
+Connection conn = DriverManager.getConnection(getUrl(), props);
+conn.setAutoCommit(false);
+conn.createStatement().execute("CREATE SEQUENCE S1");
+conn.createStatement().execute("CREATE TABLE SALTEDT1 (pk INTEGER 
PRIMARY KEY, val INTEGER) SALT_BUCKETS=4");
+conn.createStatement().execute("CREATE TABLE T2 (pk INTEGER PRIMARY 
KEY, val INTEGER)");
+
+for (int i = 0; i < 100; i++) {
+conn.createStatement().execute("UPSERT INTO SALTEDT1 VALUES (NEXT 
VALUE FOR S1, " + (i%10) + ")");
+}
+conn.commit();
+conn.setAutoCommit(true);
+int upsertCount = conn.createStatement().executeUpdate("UPSERT INTO T2 
SELECT pk, val FROM SALTEDT1");
+assertEquals(100,upsertCount);
+conn.close();
+}
+
 private static Connection getConnection(long ts) throws SQLException {
 Properties props = PropertiesUtil.deepCopy(TestUtil.TEST_PROPERTIES);
 props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, 
Long.toString(ts));

http://git-wip-us.apache.org/repos/asf/phoenix/blob/c5c6fdcb/phoenix-core/src/it/java/org/apache/phoenix/tx/TransactionIT.java
--
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/tx/TransactionIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/tx/TransactionIT.java
index 28ba53d..fe1f16c 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/tx/TransactionIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/tx/TransactionIT.java
@@ -36,6 +36,12 @@ import java.util.List;
 import java.util.Map;
 import java.util.Properties;
 
+import co.cask.tephra.TransactionContext;
+import co.cask.tephra.TransactionSystemClient;
+import co.cask.tephra.TxConstants;
+import co.cask.tephra.hbase10.TransactionAwareHTable;
+import co.cask.tephra.hbase10.coprocessor.TransactionProcessor;
+
 import org.apache.hadoop.hbase.HColumnDescriptor;
 import org.apache.hadoop.hbase.HTableDescriptor;
 import org.apache.hadoop.hbase.TableName;
@@ -68,16 +74,10 @@ import org.junit.Test;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 
-import co.cask.tephra.TransactionContext;
-import co.cask.tephra.TransactionSystemClient;
-import co.cask.tephra.TxConstants;
-import co.cask.tephra.hbase10.TransactionAwareHTable;
-import co.cask.tephra.hbase10.coprocessor.TransactionProcessor;
-
 public class TransactionIT extends BaseHBaseManagedTimeIT {
-   
-   private static final String

phoenix git commit: PHOENIX-2600 NPE on immutable index creation over transactional table

2016-01-15 Thread jamestaylor
Repository: phoenix
Updated Branches:
  refs/heads/4.x-HBase-0.98 d2c5761a3 -> d85365618


PHOENIX-2600 NPE on immutable index creation over transactional table

Conflicts:

phoenix-core/src/it/java/org/apache/phoenix/tx/TransactionIT.java
phoenix-core/src/main/java/org/apache/phoenix/execute/MutationState.java


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

Branch: refs/heads/4.x-HBase-0.98
Commit: d853656182efb38e74dd2aeed6465826a1cc8109
Parents: d2c5761
Author: James Taylor 
Authored: Fri Jan 15 18:04:07 2016 -0800
Committer: James Taylor 
Committed: Fri Jan 15 18:09:49 2016 -0800

--
 .../apache/phoenix/end2end/UpsertSelectIT.java  |  23 +
 .../org/apache/phoenix/tx/TransactionIT.java| 442 ++-
 .../apache/phoenix/compile/DeleteCompiler.java  |   1 -
 .../apache/phoenix/execute/MutationState.java   |  40 +-
 .../apache/phoenix/jdbc/PhoenixStatement.java   |   1 +
 5 files changed, 281 insertions(+), 226 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/d8536561/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpsertSelectIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpsertSelectIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpsertSelectIT.java
index b5252e0..364b423 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpsertSelectIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpsertSelectIT.java
@@ -1373,6 +1373,29 @@ public class UpsertSelectIT extends 
BaseClientManagedTimeIT {
 assertEquals("[[128,0,0,54], [128,0,4,0]]", rs.getArray(2).toString());
 }
 
+
+@Test
+public void testParallelUpsertSelect() throws Exception {
+Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
+props.setProperty(QueryServices.MUTATE_BATCH_SIZE_ATTRIB, 
Integer.toString(3));
+props.setProperty(QueryServices.SCAN_CACHE_SIZE_ATTRIB, 
Integer.toString(3));
+props.setProperty(QueryServices.SCAN_RESULT_CHUNK_SIZE, 
Integer.toString(3));
+Connection conn = DriverManager.getConnection(getUrl(), props);
+conn.setAutoCommit(false);
+conn.createStatement().execute("CREATE SEQUENCE S1");
+conn.createStatement().execute("CREATE TABLE SALTEDT1 (pk INTEGER 
PRIMARY KEY, val INTEGER) SALT_BUCKETS=4");
+conn.createStatement().execute("CREATE TABLE T2 (pk INTEGER PRIMARY 
KEY, val INTEGER)");
+
+for (int i = 0; i < 100; i++) {
+conn.createStatement().execute("UPSERT INTO SALTEDT1 VALUES (NEXT 
VALUE FOR S1, " + (i%10) + ")");
+}
+conn.commit();
+conn.setAutoCommit(true);
+int upsertCount = conn.createStatement().executeUpdate("UPSERT INTO T2 
SELECT pk, val FROM SALTEDT1");
+assertEquals(100,upsertCount);
+conn.close();
+}
+
 private static Connection getConnection(long ts) throws SQLException {
 Properties props = PropertiesUtil.deepCopy(TestUtil.TEST_PROPERTIES);
 props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, 
Long.toString(ts));

http://git-wip-us.apache.org/repos/asf/phoenix/blob/d8536561/phoenix-core/src/it/java/org/apache/phoenix/tx/TransactionIT.java
--
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/tx/TransactionIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/tx/TransactionIT.java
index 87bb394..0004be6 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/tx/TransactionIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/tx/TransactionIT.java
@@ -36,6 +36,12 @@ import java.util.List;
 import java.util.Map;
 import java.util.Properties;
 
+import co.cask.tephra.TransactionContext;
+import co.cask.tephra.TransactionSystemClient;
+import co.cask.tephra.TxConstants;
+import co.cask.tephra.hbase98.TransactionAwareHTable;
+import co.cask.tephra.hbase98.coprocessor.TransactionProcessor;
+
 import org.apache.hadoop.hbase.HColumnDescriptor;
 import org.apache.hadoop.hbase.HTableDescriptor;
 import org.apache.hadoop.hbase.TableName;
@@ -68,16 +74,10 @@ import org.junit.Test;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 
-import co.cask.tephra.TransactionContext;
-import co.cask.tephra.TransactionSystemClient;
-import co.cask.tephra.TxConstants;
-import co.cask.tephra.hbase98.TransactionAwareHTable;
-import co.cask.tephra.hbase98.coprocessor.TransactionProcessor;
-
 public class TransactionIT extends BaseHBaseManagedTimeIT {
-   
-   private static final Stri

phoenix git commit: PHOENIX-2600 NPE on immutable index creation over transactional table

2016-01-15 Thread jamestaylor
Repository: phoenix
Updated Branches:
  refs/heads/master 763a3566e -> 04504c34f


PHOENIX-2600 NPE on immutable index creation over transactional table


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

Branch: refs/heads/master
Commit: 04504c34ffb2e39f38e1b37ee0d7f8f909537616
Parents: 763a356
Author: James Taylor 
Authored: Fri Jan 15 18:04:07 2016 -0800
Committer: James Taylor 
Committed: Fri Jan 15 18:04:07 2016 -0800

--
 .../apache/phoenix/end2end/UpsertSelectIT.java  |  23 +
 .../org/apache/phoenix/tx/TransactionIT.java| 442 ++-
 .../apache/phoenix/compile/DeleteCompiler.java  |   1 -
 .../apache/phoenix/execute/MutationState.java   |  40 +-
 .../apache/phoenix/jdbc/PhoenixStatement.java   |   1 +
 5 files changed, 281 insertions(+), 226 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/04504c34/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpsertSelectIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpsertSelectIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpsertSelectIT.java
index b5252e0..364b423 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpsertSelectIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpsertSelectIT.java
@@ -1373,6 +1373,29 @@ public class UpsertSelectIT extends 
BaseClientManagedTimeIT {
 assertEquals("[[128,0,0,54], [128,0,4,0]]", rs.getArray(2).toString());
 }
 
+
+@Test
+public void testParallelUpsertSelect() throws Exception {
+Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
+props.setProperty(QueryServices.MUTATE_BATCH_SIZE_ATTRIB, 
Integer.toString(3));
+props.setProperty(QueryServices.SCAN_CACHE_SIZE_ATTRIB, 
Integer.toString(3));
+props.setProperty(QueryServices.SCAN_RESULT_CHUNK_SIZE, 
Integer.toString(3));
+Connection conn = DriverManager.getConnection(getUrl(), props);
+conn.setAutoCommit(false);
+conn.createStatement().execute("CREATE SEQUENCE S1");
+conn.createStatement().execute("CREATE TABLE SALTEDT1 (pk INTEGER 
PRIMARY KEY, val INTEGER) SALT_BUCKETS=4");
+conn.createStatement().execute("CREATE TABLE T2 (pk INTEGER PRIMARY 
KEY, val INTEGER)");
+
+for (int i = 0; i < 100; i++) {
+conn.createStatement().execute("UPSERT INTO SALTEDT1 VALUES (NEXT 
VALUE FOR S1, " + (i%10) + ")");
+}
+conn.commit();
+conn.setAutoCommit(true);
+int upsertCount = conn.createStatement().executeUpdate("UPSERT INTO T2 
SELECT pk, val FROM SALTEDT1");
+assertEquals(100,upsertCount);
+conn.close();
+}
+
 private static Connection getConnection(long ts) throws SQLException {
 Properties props = PropertiesUtil.deepCopy(TestUtil.TEST_PROPERTIES);
 props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, 
Long.toString(ts));

http://git-wip-us.apache.org/repos/asf/phoenix/blob/04504c34/phoenix-core/src/it/java/org/apache/phoenix/tx/TransactionIT.java
--
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/tx/TransactionIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/tx/TransactionIT.java
index e08225c..2794c47 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/tx/TransactionIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/tx/TransactionIT.java
@@ -36,6 +36,12 @@ import java.util.List;
 import java.util.Map;
 import java.util.Properties;
 
+import co.cask.tephra.TransactionContext;
+import co.cask.tephra.TransactionSystemClient;
+import co.cask.tephra.TxConstants;
+import co.cask.tephra.hbase11.TransactionAwareHTable;
+import co.cask.tephra.hbase11.coprocessor.TransactionProcessor;
+
 import org.apache.hadoop.hbase.HColumnDescriptor;
 import org.apache.hadoop.hbase.HTableDescriptor;
 import org.apache.hadoop.hbase.TableName;
@@ -68,16 +74,10 @@ import org.junit.Test;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 
-import co.cask.tephra.TransactionContext;
-import co.cask.tephra.TransactionSystemClient;
-import co.cask.tephra.TxConstants;
-import co.cask.tephra.hbase11.TransactionAwareHTable;
-import co.cask.tephra.hbase11.coprocessor.TransactionProcessor;
-
 public class TransactionIT extends BaseHBaseManagedTimeIT {
-   
-   private static final String FULL_TABLE_NAME = INDEX_DATA_SCHEMA + 
QueryConstants.NAME_SEPARATOR + TRANSACTIONAL_DATA_TABLE;
-   
+
+private static final String FULL_TABLE_NAME = INDEX_DATA_SCHEMA 

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

2016-01-15 Thread Apache Jenkins Server
See 

Changes:

[samarth] PHOENIX-1261 Addendum to set the async attribute on the scan

--
[...truncated 654 lines...]
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 3.719 sec - in 
org.apache.phoenix.end2end.ServerExceptionIT
Running org.apache.phoenix.end2end.SkipScanAfterManualSplitIT
Tests run: 33, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 15.166 sec - 
in org.apache.phoenix.end2end.RoundFloorCeilFunctionsEnd2EndIT
Running org.apache.phoenix.end2end.SkipScanQueryIT
Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 8.633 sec - in 
org.apache.phoenix.end2end.SignFunctionEnd2EndIT
Running org.apache.phoenix.end2end.SortMergeJoinIT
Tests run: 11, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 19.336 sec - 
in org.apache.phoenix.end2end.SkipScanQueryIT
Running org.apache.phoenix.end2end.SortMergeJoinMoreIT
Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 32.329 sec - in 
org.apache.phoenix.end2end.SkipScanAfterManualSplitIT
Running org.apache.phoenix.end2end.SortOrderIT
Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 20.871 sec - in 
org.apache.phoenix.end2end.SortMergeJoinMoreIT
Running org.apache.phoenix.end2end.SpooledSortMergeJoinIT
Tests run: 28, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 181.79 sec - 
in org.apache.phoenix.end2end.InListIT
Running org.apache.phoenix.end2end.SpooledTmpFileDeleteIT
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 3.383 sec - in 
org.apache.phoenix.end2end.SpooledTmpFileDeleteIT
Running org.apache.phoenix.end2end.SqrtFunctionEnd2EndIT
Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 9.09 sec - in 
org.apache.phoenix.end2end.SqrtFunctionEnd2EndIT
Running org.apache.phoenix.end2end.StatementHintsIT
Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 4.296 sec - in 
org.apache.phoenix.end2end.StatementHintsIT
Running org.apache.phoenix.end2end.StddevIT
Tests run: 4, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 6.425 sec - in 
org.apache.phoenix.end2end.StddevIT
Running org.apache.phoenix.end2end.StoreNullsIT
Tests run: 45, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 79.997 sec - 
in org.apache.phoenix.end2end.SortOrderIT
Running org.apache.phoenix.end2end.StringToArrayFunctionIT
Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 21.046 sec - in 
org.apache.phoenix.end2end.StoreNullsIT
Running org.apache.phoenix.end2end.SubqueryIT
Tests run: 22, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 23.128 sec - 
in org.apache.phoenix.end2end.StringToArrayFunctionIT
Running org.apache.phoenix.end2end.SubqueryUsingSortMergeJoinIT
Tests run: 15, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 89.571 sec - 
in org.apache.phoenix.end2end.SubqueryUsingSortMergeJoinIT
Running org.apache.phoenix.end2end.TenantIdTypeIT
Tests run: 99, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 199.901 sec - 
in org.apache.phoenix.end2end.SpooledSortMergeJoinIT
Running org.apache.phoenix.end2end.TenantSpecificViewIndexIT
Tests run: 21, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 125.299 sec - 
in org.apache.phoenix.end2end.SubqueryIT
Running org.apache.phoenix.end2end.TenantSpecificViewIndexSaltedIT
Tests run: 8, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 18.863 sec - in 
org.apache.phoenix.end2end.TenantSpecificViewIndexIT
Running org.apache.phoenix.end2end.TimezoneOffsetFunctionIT
Tests run: 96, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 385.643 sec - 
in org.apache.phoenix.end2end.HashJoinIT
Running org.apache.phoenix.end2end.ToDateFunctionIT
Tests run: 7, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 5.659 sec - in 
org.apache.phoenix.end2end.TimezoneOffsetFunctionIT
Running org.apache.phoenix.end2end.UpgradeIT
Tests run: 4, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 13.653 sec - in 
org.apache.phoenix.end2end.TenantSpecificViewIndexSaltedIT
Running org.apache.phoenix.end2end.UpsertBigValuesIT
Tests run: 11, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 6.551 sec - in 
org.apache.phoenix.end2end.ToDateFunctionIT
Running org.apache.phoenix.end2end.UpsertSelectAutoCommitIT
Tests run: 4, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 12.948 sec - in 
org.apache.phoenix.end2end.UpsertBigValuesIT
Running org.apache.phoenix.end2end.index.DropViewIT
Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 13.621 sec - in 
org.apache.phoenix.end2end.UpsertSelectAutoCommitIT
Running org.apache.phoenix.end2end.index.GlobalIndexOptimizationIT
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 8.034 sec - in 
org.apache.phoenix.end2end.index.DropViewIT
Running org.apache.phoenix.end2end.index.ImmutableIndexIT
Tests run: 6, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 43.305 sec - in 
org.apache.phoenix.end2end.UpgradeIT
Running org.apache.phoenix.end2end.index.IndexExpressionIT
Tests run: 15, Fa

Build failed in Jenkins: Phoenix | Master #1079

2016-01-15 Thread Apache Jenkins Server
See 

Changes:

[samarth] PHOENIX-1261 Addendum to set the async attribute on the scan

--
[...truncated 665 lines...]
Running org.apache.phoenix.end2end.SignFunctionEnd2EndIT
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 5.488 sec - in 
org.apache.phoenix.end2end.ServerExceptionIT
Running org.apache.phoenix.end2end.SkipScanAfterManualSplitIT
Tests run: 28, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 173.955 sec - 
in org.apache.phoenix.end2end.InListIT
Running org.apache.phoenix.end2end.SkipScanQueryIT
Tests run: 33, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 21.663 sec - 
in org.apache.phoenix.end2end.RoundFloorCeilFunctionsEnd2EndIT
Running org.apache.phoenix.end2end.SortMergeJoinIT
Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 12.563 sec - in 
org.apache.phoenix.end2end.SignFunctionEnd2EndIT
Running org.apache.phoenix.end2end.SortMergeJoinMoreIT
Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 36.61 sec - in 
org.apache.phoenix.end2end.SkipScanAfterManualSplitIT
Running org.apache.phoenix.end2end.SortOrderIT
Tests run: 11, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 41.502 sec - 
in org.apache.phoenix.end2end.SkipScanQueryIT
Running org.apache.phoenix.end2end.SpooledSortMergeJoinIT
Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 42.204 sec - in 
org.apache.phoenix.end2end.SortMergeJoinMoreIT
Running org.apache.phoenix.end2end.SpooledTmpFileDeleteIT
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 6.547 sec - in 
org.apache.phoenix.end2end.SpooledTmpFileDeleteIT
Running org.apache.phoenix.end2end.SqrtFunctionEnd2EndIT
Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 13.592 sec - in 
org.apache.phoenix.end2end.SqrtFunctionEnd2EndIT
Running org.apache.phoenix.end2end.StatementHintsIT
Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 5.999 sec - in 
org.apache.phoenix.end2end.StatementHintsIT
Running org.apache.phoenix.end2end.StddevIT
Tests run: 4, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 8.123 sec - in 
org.apache.phoenix.end2end.StddevIT
Running org.apache.phoenix.end2end.StoreNullsIT
Tests run: 96, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 290.775 sec - 
in org.apache.phoenix.end2end.HashJoinIT
Running org.apache.phoenix.end2end.StringToArrayFunctionIT
Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 31.46 sec - in 
org.apache.phoenix.end2end.StoreNullsIT
Running org.apache.phoenix.end2end.SubqueryIT
Tests run: 22, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 28.391 sec - 
in org.apache.phoenix.end2end.StringToArrayFunctionIT
Running org.apache.phoenix.end2end.SubqueryUsingSortMergeJoinIT
Tests run: 45, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 106.368 sec - 
in org.apache.phoenix.end2end.SortOrderIT
Running org.apache.phoenix.end2end.TenantIdTypeIT
Tests run: 99, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 137.617 sec - 
in org.apache.phoenix.end2end.SortMergeJoinIT
Running org.apache.phoenix.end2end.TenantSpecificViewIndexIT
Tests run: 8, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 35.603 sec - in 
org.apache.phoenix.end2end.TenantSpecificViewIndexIT
Running org.apache.phoenix.end2end.TenantSpecificViewIndexSaltedIT
Tests run: 4, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 18.667 sec - in 
org.apache.phoenix.end2end.TenantSpecificViewIndexSaltedIT
Running org.apache.phoenix.end2end.TimezoneOffsetFunctionIT
Tests run: 7, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 11.77 sec - in 
org.apache.phoenix.end2end.TimezoneOffsetFunctionIT
Running org.apache.phoenix.end2end.ToDateFunctionIT
Tests run: 11, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 13.282 sec - 
in org.apache.phoenix.end2end.ToDateFunctionIT
Running org.apache.phoenix.end2end.UpgradeIT
Tests run: 15, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 106.061 sec - 
in org.apache.phoenix.end2end.SubqueryUsingSortMergeJoinIT
Running org.apache.phoenix.end2end.UpsertBigValuesIT
Tests run: 21, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 130.749 sec - 
in org.apache.phoenix.end2end.SubqueryIT
Running org.apache.phoenix.end2end.UpsertSelectAutoCommitIT
Tests run: 4, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 23.149 sec - in 
org.apache.phoenix.end2end.UpsertBigValuesIT
Running org.apache.phoenix.end2end.index.DropViewIT
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 13.129 sec - in 
org.apache.phoenix.end2end.index.DropViewIT
Running org.apache.phoenix.end2end.index.GlobalIndexOptimizationIT
Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 31.073 sec - in 
org.apache.phoenix.end2end.UpsertSelectAutoCommitIT
Running org.apache.phoenix.end2end.index.ImmutableIndexIT
Tests run: 6, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 78.317 sec - in 
org.apache.phoenix.end2end.UpgradeIT
Running org.apache.phoenix.e

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

2016-01-15 Thread Apache Jenkins Server
See 

Changes:

[samarth] PHOENIX-1261 Addendum to set the async attribute on the scan

--
[...truncated 649 lines...]
Running org.apache.phoenix.end2end.ReverseScanIT
Tests run: 5, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 4.327 sec - in 
org.apache.phoenix.end2end.ReverseFunctionIT
Running org.apache.phoenix.end2end.RoundFloorCeilFunctionsEnd2EndIT
Tests run: 11, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 9.772 sec - in 
org.apache.phoenix.end2end.RegexpSplitFunctionIT
Running org.apache.phoenix.end2end.ServerExceptionIT
Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 7.06 sec - in 
org.apache.phoenix.end2end.ReverseScanIT
Running org.apache.phoenix.end2end.SignFunctionEnd2EndIT
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 2.755 sec - in 
org.apache.phoenix.end2end.ServerExceptionIT
Running org.apache.phoenix.end2end.SkipScanAfterManualSplitIT
Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 7.684 sec - in 
org.apache.phoenix.end2end.SignFunctionEnd2EndIT
Running org.apache.phoenix.end2end.SkipScanQueryIT
Tests run: 33, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 14.146 sec - 
in org.apache.phoenix.end2end.RoundFloorCeilFunctionsEnd2EndIT
Running org.apache.phoenix.end2end.SortMergeJoinIT
Tests run: 11, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 20.54 sec - in 
org.apache.phoenix.end2end.SkipScanQueryIT
Running org.apache.phoenix.end2end.SortMergeJoinMoreIT
Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 31.867 sec - in 
org.apache.phoenix.end2end.SkipScanAfterManualSplitIT
Running org.apache.phoenix.end2end.SortOrderIT
Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 19.265 sec - in 
org.apache.phoenix.end2end.SortMergeJoinMoreIT
Running org.apache.phoenix.end2end.SpooledSortMergeJoinIT
Tests run: 28, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 166.561 sec - 
in org.apache.phoenix.end2end.InListIT
Running org.apache.phoenix.end2end.SpooledTmpFileDeleteIT
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 3.806 sec - in 
org.apache.phoenix.end2end.SpooledTmpFileDeleteIT
Running org.apache.phoenix.end2end.SqrtFunctionEnd2EndIT
Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 7.39 sec - in 
org.apache.phoenix.end2end.SqrtFunctionEnd2EndIT
Running org.apache.phoenix.end2end.StatementHintsIT
Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 3.006 sec - in 
org.apache.phoenix.end2end.StatementHintsIT
Running org.apache.phoenix.end2end.StddevIT
Tests run: 4, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 5.656 sec - in 
org.apache.phoenix.end2end.StddevIT
Running org.apache.phoenix.end2end.StoreNullsIT
Tests run: 45, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 73.68 sec - in 
org.apache.phoenix.end2end.SortOrderIT
Running org.apache.phoenix.end2end.StringToArrayFunctionIT
Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 23.307 sec - in 
org.apache.phoenix.end2end.StoreNullsIT
Running org.apache.phoenix.end2end.SubqueryIT
Tests run: 22, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 21.587 sec - 
in org.apache.phoenix.end2end.StringToArrayFunctionIT
Running org.apache.phoenix.end2end.SubqueryUsingSortMergeJoinIT
Tests run: 99, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 125.659 sec - 
in org.apache.phoenix.end2end.SortMergeJoinIT
Running org.apache.phoenix.end2end.TenantIdTypeIT
Tests run: 15, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 66.271 sec - 
in org.apache.phoenix.end2end.TenantIdTypeIT
Running org.apache.phoenix.end2end.TenantSpecificViewIndexIT
Tests run: 15, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 82.145 sec - 
in org.apache.phoenix.end2end.SubqueryUsingSortMergeJoinIT
Running org.apache.phoenix.end2end.TenantSpecificViewIndexSaltedIT
Tests run: 8, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 15.97 sec - in 
org.apache.phoenix.end2end.TenantSpecificViewIndexIT
Running org.apache.phoenix.end2end.TimezoneOffsetFunctionIT
Tests run: 4, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 12.241 sec - in 
org.apache.phoenix.end2end.TenantSpecificViewIndexSaltedIT
Tests run: 7, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 8.373 sec - in 
org.apache.phoenix.end2end.TimezoneOffsetFunctionIT
Tests run: 21, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 108.526 sec - 
in org.apache.phoenix.end2end.SubqueryIT
Running org.apache.phoenix.end2end.UpgradeIT
Running org.apache.phoenix.end2end.ToDateFunctionIT
Running org.apache.phoenix.end2end.UpsertBigValuesIT
Tests run: 96, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 343.296 sec - 
in org.apache.phoenix.end2end.HashJoinIT
Running org.apache.phoenix.end2end.UpsertSelectAutoCommitIT
Tests run: 11, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 7.946 sec - in 
org.apache.phoenix.end2end.ToDateFunctionIT
Running org.apache.phoenix.end2end.inde

phoenix git commit: PHOENIX-1261 Addendum to set the async attribute on the scan

2016-01-15 Thread samarth
Repository: phoenix
Updated Branches:
  refs/heads/4.x-HBase-1.0 f0801ec39 -> b07b91914


PHOENIX-1261 Addendum to set the async attribute on the scan


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

Branch: refs/heads/4.x-HBase-1.0
Commit: b07b91914d2ea4d959bc4df0410ba89394220a47
Parents: f0801ec
Author: Samarth 
Authored: Fri Jan 15 16:23:50 2016 -0800
Committer: Samarth 
Committed: Fri Jan 15 16:23:50 2016 -0800

--
 .../org/apache/phoenix/schema/MetaDataClient.java | 13 ++---
 .../schema/stats/StatisticsCollectionRunTracker.java  | 14 ++
 2 files changed, 16 insertions(+), 11 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/b07b9191/phoenix-core/src/main/java/org/apache/phoenix/schema/MetaDataClient.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/schema/MetaDataClient.java 
b/phoenix-core/src/main/java/org/apache/phoenix/schema/MetaDataClient.java
index decc944..995be86 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/schema/MetaDataClient.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/schema/MetaDataClient.java
@@ -21,6 +21,8 @@ import static 
com.google.common.collect.Lists.newArrayListWithExpectedSize;
 import static com.google.common.collect.Sets.newLinkedHashSet;
 import static com.google.common.collect.Sets.newLinkedHashSetWithExpectedSize;
 import static org.apache.hadoop.hbase.HColumnDescriptor.TTL;
+import static 
org.apache.phoenix.coprocessor.BaseScannerRegionObserver.ANALYZE_TABLE;
+import static 
org.apache.phoenix.coprocessor.BaseScannerRegionObserver.RUN_UPDATE_STATS_ASYNC;
 import static 
org.apache.phoenix.exception.SQLExceptionCode.INSUFFICIENT_MULTI_TENANT_COLUMNS;
 import static org.apache.phoenix.jdbc.PhoenixDatabaseMetaData.ARG_POSITION;
 import static org.apache.phoenix.jdbc.PhoenixDatabaseMetaData.ARRAY_SIZE;
@@ -81,9 +83,12 @@ import static 
org.apache.phoenix.jdbc.PhoenixDatabaseMetaData.VIEW_TYPE;
 import static 
org.apache.phoenix.query.QueryConstants.BASE_TABLE_BASE_COLUMN_COUNT;
 import static org.apache.phoenix.query.QueryServices.DROP_METADATA_ATTRIB;
 import static 
org.apache.phoenix.query.QueryServicesOptions.DEFAULT_DROP_METADATA;
+import static 
org.apache.phoenix.query.QueryServicesOptions.DEFAULT_RUN_UPDATE_STATS_ASYNC;
 import static org.apache.phoenix.schema.PTable.ViewType.MAPPED;
 import static org.apache.phoenix.schema.PTableType.TABLE;
 import static org.apache.phoenix.schema.PTableType.VIEW;
+import static org.apache.phoenix.schema.types.PDataType.FALSE_BYTES;
+import static org.apache.phoenix.schema.types.PDataType.TRUE_BYTES;
 
 import java.io.IOException;
 import java.sql.Connection;
@@ -108,6 +113,8 @@ import java.util.Map;
 import java.util.Properties;
 import java.util.Set;
 
+import co.cask.tephra.TxConstants;
+
 import org.apache.hadoop.hbase.Cell;
 import org.apache.hadoop.hbase.HColumnDescriptor;
 import org.apache.hadoop.hbase.HConstants;
@@ -210,8 +217,6 @@ import com.google.common.collect.Maps;
 import com.google.common.collect.Sets;
 import com.google.common.primitives.Ints;
 
-import co.cask.tephra.TxConstants;
-
 public class MetaDataClient {
 private static final Logger logger = 
LoggerFactory.getLogger(MetaDataClient.class);
 
@@ -949,7 +954,9 @@ public class MetaDataClient {
 MutationPlan plan = 
compiler.compile(Collections.singletonList(tableRef), null, null, null, 
clientTimeStamp);
 Scan scan = plan.getContext().getScan();
 scan.setCacheBlocks(false);
-scan.setAttribute(BaseScannerRegionObserver.ANALYZE_TABLE, 
PDataType.TRUE_BYTES);
+scan.setAttribute(ANALYZE_TABLE, TRUE_BYTES);
+boolean runUpdateStatsAsync = 
props.getBoolean(RUN_UPDATE_STATS_ASYNC, DEFAULT_RUN_UPDATE_STATS_ASYNC);
+scan.setAttribute(RUN_UPDATE_STATS_ASYNC, runUpdateStatsAsync ? 
TRUE_BYTES : FALSE_BYTES);
 if (statsProps != null) {
 Object gp_width = 
statsProps.get(QueryServices.STATS_GUIDEPOST_WIDTH_BYTES_ATTRIB);
 if (gp_width != null) {

http://git-wip-us.apache.org/repos/asf/phoenix/blob/b07b9191/phoenix-core/src/main/java/org/apache/phoenix/schema/stats/StatisticsCollectionRunTracker.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/schema/stats/StatisticsCollectionRunTracker.java
 
b/phoenix-core/src/main/java/org/apache/phoenix/schema/stats/StatisticsCollectionRunTracker.java
index 5f6be3f..4ed3325 100644
--- 
a/phoenix-core/src/main/java/org/a

Apache-Phoenix | Master | Build Successful

2016-01-15 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-2119 Do not copy underlying HBase configuration properties when



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-1261 Addendum to set the async attribute on the scan

2016-01-15 Thread samarth
Repository: phoenix
Updated Branches:
  refs/heads/master 52ec0a7d7 -> 763a3566e


PHOENIX-1261 Addendum to set the async attribute on the scan


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

Branch: refs/heads/master
Commit: 763a3566ed7ade82b7ffbd56cf90ff264cdbe20a
Parents: 52ec0a7
Author: Samarth 
Authored: Fri Jan 15 16:21:26 2016 -0800
Committer: Samarth 
Committed: Fri Jan 15 16:21:26 2016 -0800

--
 .../org/apache/phoenix/schema/MetaDataClient.java | 13 ++---
 .../schema/stats/StatisticsCollectionRunTracker.java  | 14 ++
 2 files changed, 16 insertions(+), 11 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/763a3566/phoenix-core/src/main/java/org/apache/phoenix/schema/MetaDataClient.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/schema/MetaDataClient.java 
b/phoenix-core/src/main/java/org/apache/phoenix/schema/MetaDataClient.java
index decc944..995be86 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/schema/MetaDataClient.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/schema/MetaDataClient.java
@@ -21,6 +21,8 @@ import static 
com.google.common.collect.Lists.newArrayListWithExpectedSize;
 import static com.google.common.collect.Sets.newLinkedHashSet;
 import static com.google.common.collect.Sets.newLinkedHashSetWithExpectedSize;
 import static org.apache.hadoop.hbase.HColumnDescriptor.TTL;
+import static 
org.apache.phoenix.coprocessor.BaseScannerRegionObserver.ANALYZE_TABLE;
+import static 
org.apache.phoenix.coprocessor.BaseScannerRegionObserver.RUN_UPDATE_STATS_ASYNC;
 import static 
org.apache.phoenix.exception.SQLExceptionCode.INSUFFICIENT_MULTI_TENANT_COLUMNS;
 import static org.apache.phoenix.jdbc.PhoenixDatabaseMetaData.ARG_POSITION;
 import static org.apache.phoenix.jdbc.PhoenixDatabaseMetaData.ARRAY_SIZE;
@@ -81,9 +83,12 @@ import static 
org.apache.phoenix.jdbc.PhoenixDatabaseMetaData.VIEW_TYPE;
 import static 
org.apache.phoenix.query.QueryConstants.BASE_TABLE_BASE_COLUMN_COUNT;
 import static org.apache.phoenix.query.QueryServices.DROP_METADATA_ATTRIB;
 import static 
org.apache.phoenix.query.QueryServicesOptions.DEFAULT_DROP_METADATA;
+import static 
org.apache.phoenix.query.QueryServicesOptions.DEFAULT_RUN_UPDATE_STATS_ASYNC;
 import static org.apache.phoenix.schema.PTable.ViewType.MAPPED;
 import static org.apache.phoenix.schema.PTableType.TABLE;
 import static org.apache.phoenix.schema.PTableType.VIEW;
+import static org.apache.phoenix.schema.types.PDataType.FALSE_BYTES;
+import static org.apache.phoenix.schema.types.PDataType.TRUE_BYTES;
 
 import java.io.IOException;
 import java.sql.Connection;
@@ -108,6 +113,8 @@ import java.util.Map;
 import java.util.Properties;
 import java.util.Set;
 
+import co.cask.tephra.TxConstants;
+
 import org.apache.hadoop.hbase.Cell;
 import org.apache.hadoop.hbase.HColumnDescriptor;
 import org.apache.hadoop.hbase.HConstants;
@@ -210,8 +217,6 @@ import com.google.common.collect.Maps;
 import com.google.common.collect.Sets;
 import com.google.common.primitives.Ints;
 
-import co.cask.tephra.TxConstants;
-
 public class MetaDataClient {
 private static final Logger logger = 
LoggerFactory.getLogger(MetaDataClient.class);
 
@@ -949,7 +954,9 @@ public class MetaDataClient {
 MutationPlan plan = 
compiler.compile(Collections.singletonList(tableRef), null, null, null, 
clientTimeStamp);
 Scan scan = plan.getContext().getScan();
 scan.setCacheBlocks(false);
-scan.setAttribute(BaseScannerRegionObserver.ANALYZE_TABLE, 
PDataType.TRUE_BYTES);
+scan.setAttribute(ANALYZE_TABLE, TRUE_BYTES);
+boolean runUpdateStatsAsync = 
props.getBoolean(RUN_UPDATE_STATS_ASYNC, DEFAULT_RUN_UPDATE_STATS_ASYNC);
+scan.setAttribute(RUN_UPDATE_STATS_ASYNC, runUpdateStatsAsync ? 
TRUE_BYTES : FALSE_BYTES);
 if (statsProps != null) {
 Object gp_width = 
statsProps.get(QueryServices.STATS_GUIDEPOST_WIDTH_BYTES_ATTRIB);
 if (gp_width != null) {

http://git-wip-us.apache.org/repos/asf/phoenix/blob/763a3566/phoenix-core/src/main/java/org/apache/phoenix/schema/stats/StatisticsCollectionRunTracker.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/schema/stats/StatisticsCollectionRunTracker.java
 
b/phoenix-core/src/main/java/org/apache/phoenix/schema/stats/StatisticsCollectionRunTracker.java
index 5f6be3f..4ed3325 100644
--- 
a/phoenix-core/src/main/java/org/apache/phoenix/

phoenix git commit: PHOENIX-1261 Addendum to set the async attribute on the scan

2016-01-15 Thread samarth
Repository: phoenix
Updated Branches:
  refs/heads/4.x-HBase-0.98 e81a4cc8f -> d2c5761a3


PHOENIX-1261 Addendum to set the async attribute on the scan


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

Branch: refs/heads/4.x-HBase-0.98
Commit: d2c5761a3ee370c19e3164c277c19ea08fe2faef
Parents: e81a4cc
Author: Samarth 
Authored: Fri Jan 15 16:18:09 2016 -0800
Committer: Samarth 
Committed: Fri Jan 15 16:18:09 2016 -0800

--
 .../org/apache/phoenix/schema/MetaDataClient.java | 13 ++---
 .../schema/stats/StatisticsCollectionRunTracker.java  | 14 ++
 2 files changed, 16 insertions(+), 11 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/d2c5761a/phoenix-core/src/main/java/org/apache/phoenix/schema/MetaDataClient.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/schema/MetaDataClient.java 
b/phoenix-core/src/main/java/org/apache/phoenix/schema/MetaDataClient.java
index decc944..995be86 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/schema/MetaDataClient.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/schema/MetaDataClient.java
@@ -21,6 +21,8 @@ import static 
com.google.common.collect.Lists.newArrayListWithExpectedSize;
 import static com.google.common.collect.Sets.newLinkedHashSet;
 import static com.google.common.collect.Sets.newLinkedHashSetWithExpectedSize;
 import static org.apache.hadoop.hbase.HColumnDescriptor.TTL;
+import static 
org.apache.phoenix.coprocessor.BaseScannerRegionObserver.ANALYZE_TABLE;
+import static 
org.apache.phoenix.coprocessor.BaseScannerRegionObserver.RUN_UPDATE_STATS_ASYNC;
 import static 
org.apache.phoenix.exception.SQLExceptionCode.INSUFFICIENT_MULTI_TENANT_COLUMNS;
 import static org.apache.phoenix.jdbc.PhoenixDatabaseMetaData.ARG_POSITION;
 import static org.apache.phoenix.jdbc.PhoenixDatabaseMetaData.ARRAY_SIZE;
@@ -81,9 +83,12 @@ import static 
org.apache.phoenix.jdbc.PhoenixDatabaseMetaData.VIEW_TYPE;
 import static 
org.apache.phoenix.query.QueryConstants.BASE_TABLE_BASE_COLUMN_COUNT;
 import static org.apache.phoenix.query.QueryServices.DROP_METADATA_ATTRIB;
 import static 
org.apache.phoenix.query.QueryServicesOptions.DEFAULT_DROP_METADATA;
+import static 
org.apache.phoenix.query.QueryServicesOptions.DEFAULT_RUN_UPDATE_STATS_ASYNC;
 import static org.apache.phoenix.schema.PTable.ViewType.MAPPED;
 import static org.apache.phoenix.schema.PTableType.TABLE;
 import static org.apache.phoenix.schema.PTableType.VIEW;
+import static org.apache.phoenix.schema.types.PDataType.FALSE_BYTES;
+import static org.apache.phoenix.schema.types.PDataType.TRUE_BYTES;
 
 import java.io.IOException;
 import java.sql.Connection;
@@ -108,6 +113,8 @@ import java.util.Map;
 import java.util.Properties;
 import java.util.Set;
 
+import co.cask.tephra.TxConstants;
+
 import org.apache.hadoop.hbase.Cell;
 import org.apache.hadoop.hbase.HColumnDescriptor;
 import org.apache.hadoop.hbase.HConstants;
@@ -210,8 +217,6 @@ import com.google.common.collect.Maps;
 import com.google.common.collect.Sets;
 import com.google.common.primitives.Ints;
 
-import co.cask.tephra.TxConstants;
-
 public class MetaDataClient {
 private static final Logger logger = 
LoggerFactory.getLogger(MetaDataClient.class);
 
@@ -949,7 +954,9 @@ public class MetaDataClient {
 MutationPlan plan = 
compiler.compile(Collections.singletonList(tableRef), null, null, null, 
clientTimeStamp);
 Scan scan = plan.getContext().getScan();
 scan.setCacheBlocks(false);
-scan.setAttribute(BaseScannerRegionObserver.ANALYZE_TABLE, 
PDataType.TRUE_BYTES);
+scan.setAttribute(ANALYZE_TABLE, TRUE_BYTES);
+boolean runUpdateStatsAsync = 
props.getBoolean(RUN_UPDATE_STATS_ASYNC, DEFAULT_RUN_UPDATE_STATS_ASYNC);
+scan.setAttribute(RUN_UPDATE_STATS_ASYNC, runUpdateStatsAsync ? 
TRUE_BYTES : FALSE_BYTES);
 if (statsProps != null) {
 Object gp_width = 
statsProps.get(QueryServices.STATS_GUIDEPOST_WIDTH_BYTES_ATTRIB);
 if (gp_width != null) {

http://git-wip-us.apache.org/repos/asf/phoenix/blob/d2c5761a/phoenix-core/src/main/java/org/apache/phoenix/schema/stats/StatisticsCollectionRunTracker.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/schema/stats/StatisticsCollectionRunTracker.java
 
b/phoenix-core/src/main/java/org/apache/phoenix/schema/stats/StatisticsCollectionRunTracker.java
index 5f6be3f..4ed3325 100644
--- 
a/phoenix-core/src/main/java/org

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

2016-01-15 Thread Apache Jenkins Server
See 



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

2016-01-15 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-2119 Do not copy underlying HBase configuration properties when



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-2119 Do not copy underlying HBase configuration properties when connection properties are supplied

2016-01-15 Thread samarth
Repository: phoenix
Updated Branches:
  refs/heads/4.x-HBase-1.0 b4ac8c482 -> f0801ec39


PHOENIX-2119 Do not copy underlying HBase configuration properties when 
connection properties are supplied


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

Branch: refs/heads/4.x-HBase-1.0
Commit: f0801ec391960c1786aadc042747e8865eea15a3
Parents: b4ac8c4
Author: Samarth 
Authored: Fri Jan 15 15:18:32 2016 -0800
Committer: Samarth 
Committed: Fri Jan 15 15:18:40 2016 -0800

--
 .../org/apache/phoenix/util/ReadOnlyProps.java  | 40 +++---
 .../phoenix/jdbc/ReadOnlyPropertiesTest.java| 84 
 2 files changed, 111 insertions(+), 13 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/f0801ec3/phoenix-core/src/main/java/org/apache/phoenix/util/ReadOnlyProps.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/util/ReadOnlyProps.java 
b/phoenix-core/src/main/java/org/apache/phoenix/util/ReadOnlyProps.java
index a6fb7a5..d6950a2 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/util/ReadOnlyProps.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/util/ReadOnlyProps.java
@@ -18,7 +18,6 @@
 
 package org.apache.phoenix.util;
 
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
@@ -27,11 +26,14 @@ import java.util.Properties;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import javax.annotation.Nonnull;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import com.google.common.base.Objects;
 import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableMap.Builder;
 import com.google.common.collect.Maps;
 
 /**
@@ -39,13 +41,14 @@ import com.google.common.collect.Maps;
  * Read-only properties that avoids unnecessary synchronization in
  * java.util.Properties.
  *
- * 
- * @since 1.2.2
  */
 public class ReadOnlyProps implements Iterable> {
 private static final Logger logger = 
LoggerFactory.getLogger(ReadOnlyProps.class);
 public static final ReadOnlyProps EMPTY_PROPS = new ReadOnlyProps();
+@Nonnull
 private final Map props;
+@Nonnull
+private final Map overrideProps;
 
 public ReadOnlyProps(ReadOnlyProps defaultProps, Iterator> iterator) {
 Map map = new 
HashMap(defaultProps.asMap());
@@ -54,6 +57,7 @@ public class ReadOnlyProps implements Iterable> {
 map.put(entry.getKey(), entry.getValue());
 }
 this.props = ImmutableMap.copyOf(map);
+this.overrideProps = ImmutableMap.of();
 }
 
 public ReadOnlyProps(Iterator> iterator) {
@@ -61,22 +65,31 @@ public class ReadOnlyProps implements 
Iterable> {
 }
 
 private ReadOnlyProps() {
-this.props = Collections.emptyMap();
+this.props = ImmutableMap.of();
+this.overrideProps = ImmutableMap.of();
 }
 
 public ReadOnlyProps(Map props) {
 this.props = ImmutableMap.copyOf(props);
+this.overrideProps = ImmutableMap.of();
 }
 
-private ReadOnlyProps(ReadOnlyProps defaultProps, Properties overrides) {
-Map combinedProps = 
Maps.newHashMapWithExpectedSize(defaultProps.props.size() + overrides.size());
-combinedProps.putAll(defaultProps.props);
-for (Entry entry : overrides.entrySet()) {
-String key = entry.getKey().toString();
-String value = entry.getValue().toString();
-combinedProps.put(key, value);
+private ReadOnlyProps(ReadOnlyProps defaultProps, Properties overridesArg) 
{
+this.props = defaultProps.props;
+if (overridesArg == null || overridesArg.isEmpty()) {
+this.overrideProps = defaultProps.overrideProps;
+} else {
+Map combinedOverrides =
+
Maps.newHashMapWithExpectedSize(defaultProps.overrideProps.size()
++ overridesArg.size());
+if (!defaultProps.overrideProps.isEmpty()) {
+combinedOverrides.putAll(defaultProps.overrideProps);
+}
+for (Entry entry : overridesArg.entrySet()) {
+combinedOverrides.put(entry.getKey().toString(), 
entry.getValue().toString());
+}
+this.overrideProps = ImmutableMap.copyOf(combinedOverrides);
 }
-this.props = ImmutableMap.copyOf(combinedProps);
 }
 
 private static Pattern varPat = 
Pattern.compile("\\$\\{[^\\}\\$\u0020]+\\}");
@@ -122,7 +135,8 @@ public class ReadOnlyProps implements 
Iterable> {
  * or null if n

phoenix git commit: PHOENIX-2119 Do not copy underlying HBase configuration properties when connection properties are supplied

2016-01-15 Thread samarth
Repository: phoenix
Updated Branches:
  refs/heads/master 4f50257b5 -> 52ec0a7d7


PHOENIX-2119 Do not copy underlying HBase configuration properties when 
connection properties are supplied


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

Branch: refs/heads/master
Commit: 52ec0a7d7de2b71892884a25d6d1e5e18de176d9
Parents: 4f50257
Author: Samarth 
Authored: Fri Jan 15 15:17:53 2016 -0800
Committer: Samarth 
Committed: Fri Jan 15 15:17:53 2016 -0800

--
 .../org/apache/phoenix/util/ReadOnlyProps.java  | 40 +++---
 .../phoenix/jdbc/ReadOnlyPropertiesTest.java| 84 
 2 files changed, 111 insertions(+), 13 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/52ec0a7d/phoenix-core/src/main/java/org/apache/phoenix/util/ReadOnlyProps.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/util/ReadOnlyProps.java 
b/phoenix-core/src/main/java/org/apache/phoenix/util/ReadOnlyProps.java
index a6fb7a5..d6950a2 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/util/ReadOnlyProps.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/util/ReadOnlyProps.java
@@ -18,7 +18,6 @@
 
 package org.apache.phoenix.util;
 
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
@@ -27,11 +26,14 @@ import java.util.Properties;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import javax.annotation.Nonnull;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import com.google.common.base.Objects;
 import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableMap.Builder;
 import com.google.common.collect.Maps;
 
 /**
@@ -39,13 +41,14 @@ import com.google.common.collect.Maps;
  * Read-only properties that avoids unnecessary synchronization in
  * java.util.Properties.
  *
- * 
- * @since 1.2.2
  */
 public class ReadOnlyProps implements Iterable> {
 private static final Logger logger = 
LoggerFactory.getLogger(ReadOnlyProps.class);
 public static final ReadOnlyProps EMPTY_PROPS = new ReadOnlyProps();
+@Nonnull
 private final Map props;
+@Nonnull
+private final Map overrideProps;
 
 public ReadOnlyProps(ReadOnlyProps defaultProps, Iterator> iterator) {
 Map map = new 
HashMap(defaultProps.asMap());
@@ -54,6 +57,7 @@ public class ReadOnlyProps implements Iterable> {
 map.put(entry.getKey(), entry.getValue());
 }
 this.props = ImmutableMap.copyOf(map);
+this.overrideProps = ImmutableMap.of();
 }
 
 public ReadOnlyProps(Iterator> iterator) {
@@ -61,22 +65,31 @@ public class ReadOnlyProps implements 
Iterable> {
 }
 
 private ReadOnlyProps() {
-this.props = Collections.emptyMap();
+this.props = ImmutableMap.of();
+this.overrideProps = ImmutableMap.of();
 }
 
 public ReadOnlyProps(Map props) {
 this.props = ImmutableMap.copyOf(props);
+this.overrideProps = ImmutableMap.of();
 }
 
-private ReadOnlyProps(ReadOnlyProps defaultProps, Properties overrides) {
-Map combinedProps = 
Maps.newHashMapWithExpectedSize(defaultProps.props.size() + overrides.size());
-combinedProps.putAll(defaultProps.props);
-for (Entry entry : overrides.entrySet()) {
-String key = entry.getKey().toString();
-String value = entry.getValue().toString();
-combinedProps.put(key, value);
+private ReadOnlyProps(ReadOnlyProps defaultProps, Properties overridesArg) 
{
+this.props = defaultProps.props;
+if (overridesArg == null || overridesArg.isEmpty()) {
+this.overrideProps = defaultProps.overrideProps;
+} else {
+Map combinedOverrides =
+
Maps.newHashMapWithExpectedSize(defaultProps.overrideProps.size()
++ overridesArg.size());
+if (!defaultProps.overrideProps.isEmpty()) {
+combinedOverrides.putAll(defaultProps.overrideProps);
+}
+for (Entry entry : overridesArg.entrySet()) {
+combinedOverrides.put(entry.getKey().toString(), 
entry.getValue().toString());
+}
+this.overrideProps = ImmutableMap.copyOf(combinedOverrides);
 }
-this.props = ImmutableMap.copyOf(combinedProps);
 }
 
 private static Pattern varPat = 
Pattern.compile("\\$\\{[^\\}\\$\u0020]+\\}");
@@ -122,7 +135,8 @@ public class ReadOnlyProps implements 
Iterable> {
  * or null if no such propert

phoenix git commit: PHOENIX-2119 Do not copy underlying HBase configuration properties when connection properties are supplied

2016-01-15 Thread samarth
Repository: phoenix
Updated Branches:
  refs/heads/4.x-HBase-0.98 922966218 -> e81a4cc8f


PHOENIX-2119 Do not copy underlying HBase configuration properties when 
connection properties are supplied


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

Branch: refs/heads/4.x-HBase-0.98
Commit: e81a4cc8f00264fafe86dc78836cf1eb2008a33e
Parents: 9229662
Author: Samarth 
Authored: Fri Jan 15 15:09:28 2016 -0800
Committer: Samarth 
Committed: Fri Jan 15 15:09:28 2016 -0800

--
 .../org/apache/phoenix/util/ReadOnlyProps.java  | 40 +++---
 .../phoenix/jdbc/ReadOnlyPropertiesTest.java| 84 
 2 files changed, 111 insertions(+), 13 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/e81a4cc8/phoenix-core/src/main/java/org/apache/phoenix/util/ReadOnlyProps.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/util/ReadOnlyProps.java 
b/phoenix-core/src/main/java/org/apache/phoenix/util/ReadOnlyProps.java
index a6fb7a5..d6950a2 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/util/ReadOnlyProps.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/util/ReadOnlyProps.java
@@ -18,7 +18,6 @@
 
 package org.apache.phoenix.util;
 
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
@@ -27,11 +26,14 @@ import java.util.Properties;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import javax.annotation.Nonnull;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import com.google.common.base.Objects;
 import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableMap.Builder;
 import com.google.common.collect.Maps;
 
 /**
@@ -39,13 +41,14 @@ import com.google.common.collect.Maps;
  * Read-only properties that avoids unnecessary synchronization in
  * java.util.Properties.
  *
- * 
- * @since 1.2.2
  */
 public class ReadOnlyProps implements Iterable> {
 private static final Logger logger = 
LoggerFactory.getLogger(ReadOnlyProps.class);
 public static final ReadOnlyProps EMPTY_PROPS = new ReadOnlyProps();
+@Nonnull
 private final Map props;
+@Nonnull
+private final Map overrideProps;
 
 public ReadOnlyProps(ReadOnlyProps defaultProps, Iterator> iterator) {
 Map map = new 
HashMap(defaultProps.asMap());
@@ -54,6 +57,7 @@ public class ReadOnlyProps implements Iterable> {
 map.put(entry.getKey(), entry.getValue());
 }
 this.props = ImmutableMap.copyOf(map);
+this.overrideProps = ImmutableMap.of();
 }
 
 public ReadOnlyProps(Iterator> iterator) {
@@ -61,22 +65,31 @@ public class ReadOnlyProps implements 
Iterable> {
 }
 
 private ReadOnlyProps() {
-this.props = Collections.emptyMap();
+this.props = ImmutableMap.of();
+this.overrideProps = ImmutableMap.of();
 }
 
 public ReadOnlyProps(Map props) {
 this.props = ImmutableMap.copyOf(props);
+this.overrideProps = ImmutableMap.of();
 }
 
-private ReadOnlyProps(ReadOnlyProps defaultProps, Properties overrides) {
-Map combinedProps = 
Maps.newHashMapWithExpectedSize(defaultProps.props.size() + overrides.size());
-combinedProps.putAll(defaultProps.props);
-for (Entry entry : overrides.entrySet()) {
-String key = entry.getKey().toString();
-String value = entry.getValue().toString();
-combinedProps.put(key, value);
+private ReadOnlyProps(ReadOnlyProps defaultProps, Properties overridesArg) 
{
+this.props = defaultProps.props;
+if (overridesArg == null || overridesArg.isEmpty()) {
+this.overrideProps = defaultProps.overrideProps;
+} else {
+Map combinedOverrides =
+
Maps.newHashMapWithExpectedSize(defaultProps.overrideProps.size()
++ overridesArg.size());
+if (!defaultProps.overrideProps.isEmpty()) {
+combinedOverrides.putAll(defaultProps.overrideProps);
+}
+for (Entry entry : overridesArg.entrySet()) {
+combinedOverrides.put(entry.getKey().toString(), 
entry.getValue().toString());
+}
+this.overrideProps = ImmutableMap.copyOf(combinedOverrides);
 }
-this.props = ImmutableMap.copyOf(combinedProps);
 }
 
 private static Pattern varPat = 
Pattern.compile("\\$\\{[^\\}\\$\u0020]+\\}");
@@ -122,7 +135,8 @@ public class ReadOnlyProps implements 
Iterable> {
  * or null if

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

2016-01-15 Thread Apache Jenkins Server
See 



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

2016-01-15 Thread Apache Jenkins Server
See 

Changes:

[mujtaba] PHOENIX-2592 Pherf RuleGeneratorTest.testDateGenerator() is flapping

--
[...truncated 1183 lines...]
[INFO] 
[INFO] --- maven-assembly-plugin:2.5.2:single (runnable) @ phoenix-server ---
[INFO] Reading assembly descriptor: src/build/query-server-runnable.xml
[INFO] Building jar: 

[INFO] 
[INFO] --- maven-failsafe-plugin:2.19.1:integration-test 
(ClientManagedTimeTests) @ phoenix-server ---

---
 T E S T S
---

Results :

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

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

---
 T E S T S
---
Running org.apache.phoenix.end2end.QueryServerBasicsIT
Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 64.087 sec - in 
org.apache.phoenix.end2end.QueryServerBasicsIT

Results :

Tests run: 3, Failures: 0, Errors: 0, Skipped: 0

[INFO] 
[INFO] --- maven-failsafe-plugin:2.19.1:integration-test 
(NeedTheirOwnClusterTests) @ phoenix-server ---

---
 T E S T S
---

Results :

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

[INFO] 
[INFO] --- maven-failsafe-plugin:2.19.1:verify (ClientManagedTimeTests) @ 
phoenix-server ---
[INFO] 
[INFO] --- maven-failsafe-plugin:2.19.1:verify (HBaseManagedTimeTests) @ 
phoenix-server ---
[INFO] 
[INFO] --- maven-failsafe-plugin:2.19.1:verify (NeedTheirOwnClusterTests) @ 
phoenix-server ---
[INFO] 
[INFO] --- maven-install-plugin:2.5.1:install (default-install) @ 
phoenix-server ---
[INFO] Installing 

 to 
/home/jenkins/.m2/repository/org/apache/phoenix/phoenix-server/4.7.0-HBase-0.98-SNAPSHOT/phoenix-server-4.7.0-HBase-0.98-SNAPSHOT.jar
[INFO] Installing 

 to 
/home/jenkins/.m2/repository/org/apache/phoenix/phoenix-server/4.7.0-HBase-0.98-SNAPSHOT/phoenix-server-4.7.0-HBase-0.98-SNAPSHOT.pom
[INFO] Installing 

 to 
/home/jenkins/.m2/repository/org/apache/phoenix/phoenix-server/4.7.0-HBase-0.98-SNAPSHOT/phoenix-server-4.7.0-HBase-0.98-SNAPSHOT-sources.jar
[INFO] Installing 

 to 
/home/jenkins/.m2/repository/org/apache/phoenix/phoenix-server/4.7.0-HBase-0.98-SNAPSHOT/phoenix-server-4.7.0-HBase-0.98-SNAPSHOT-tests.jar
[INFO] 
[INFO] 
[INFO] Building Phoenix - Pherf 4.7.0-HBase-0.98-SNAPSHOT
[INFO] 
Downloading: 
https://repository.apache.org/content/repositories/snapshots/junit/junit-dep/maven-metadata.xml
Downloading: 
https://repository.apache.org/content/repositories/releases/junit/junit-dep/maven-metadata.xml
Downloading: http://conjars.org/repo/junit/junit-dep/maven-metadata.xml
Downloading: 
https://oss.sonatype.org/content/repositories/snapshots/junit/junit-dep/maven-metadata.xml

Downloading: 
http://repository.apache.org/snapshots/junit/junit-dep/maven-metadata.xml

Downloading: 
http://repo.maven.apache.org/maven2/junit/junit-dep/maven-metadata.xml
563/563 B   

Downloaded: 
http://repo.maven.apache.org/maven2/junit/junit-dep/maven-metadata.xml (563 B 
at 3.5 KB/sec)



Downloading: 
https://repository.apache.org/content/repositories/releases/commons-io/commons-io/maven-metadata.xml
Downloading: http://conjars.org/repo/commons-io/commons-io/maven-metadata.xml
Downloading: 
https://oss.sonatype.org/content/repositories/snapshots/commons-io/commons-io/maven-metadata.xml
Downloading: 
https://repository.apache.org/content/repositories/snapshots/commons-io/commons-io/maven-metadata.xml
374/374 B   
374/374 B   725/725 B   

Downloaded: 
https://repository.apache.org/content/repositories/snapshots/commons-io/commons-io/maven-metadata.xml
 (374 B at 3.4 KB/sec)

Downloaded: 
https://repository.apache.org/content/repositories/releases/commons-io/commons-io/maven-metadata.xml
 (725 B at

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

2016-01-15 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
[mujtaba] PHOENIX-2592 Pherf RuleGeneratorTest.testDateGenerator() is flapping



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-2592 Pherf RuleGeneratorTest.testDateGenerator() is flapping (karan.singhal)

2016-01-15 Thread mujtaba
Repository: phoenix
Updated Branches:
  refs/heads/4.x-HBase-0.98 ad91debaa -> 922966218


PHOENIX-2592 Pherf RuleGeneratorTest.testDateGenerator() is flapping 
(karan.singhal)


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

Branch: refs/heads/4.x-HBase-0.98
Commit: 922966218997042b130073b0dd97e2b7f1d95102
Parents: ad91deb
Author: Mujtaba 
Authored: Fri Jan 15 12:27:33 2016 -0800
Committer: Mujtaba 
Committed: Fri Jan 15 12:27:33 2016 -0800

--
 .../main/java/org/apache/phoenix/pherf/rules/RulesApplier.java| 3 ++-
 .../src/test/java/org/apache/phoenix/pherf/RuleGeneratorTest.java | 1 -
 2 files changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/92296621/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/rules/RulesApplier.java
--
diff --git 
a/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/rules/RulesApplier.java 
b/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/rules/RulesApplier.java
index 202c8b5..d270df6 100644
--- 
a/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/rules/RulesApplier.java
+++ 
b/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/rules/RulesApplier.java
@@ -238,7 +238,8 @@ public class RulesApplier {
 
 // Get Ms Date between min and max
 synchronized (randomDataGenerator) {
-long rndLong = randomDataGenerator.nextLong(minDt.getMillis(), 
maxDt.getMillis());
+//Make sure date generated is exactly between the passed limits
+long rndLong = randomDataGenerator.nextLong(minDt.getMillis()+1, 
maxDt.getMillis()-1);
 dt = new DateTime(rndLong, PherfConstants.DEFAULT_TIME_ZONE);
 }
 

http://git-wip-us.apache.org/repos/asf/phoenix/blob/92296621/phoenix-pherf/src/test/java/org/apache/phoenix/pherf/RuleGeneratorTest.java
--
diff --git 
a/phoenix-pherf/src/test/java/org/apache/phoenix/pherf/RuleGeneratorTest.java 
b/phoenix-pherf/src/test/java/org/apache/phoenix/pherf/RuleGeneratorTest.java
index 71b785b..c2eae86 100644
--- 
a/phoenix-pherf/src/test/java/org/apache/phoenix/pherf/RuleGeneratorTest.java
+++ 
b/phoenix-pherf/src/test/java/org/apache/phoenix/pherf/RuleGeneratorTest.java
@@ -49,7 +49,6 @@ import org.junit.Test;
 public class RuleGeneratorTest {
 private static final String matcherScenario = 
PherfConstants.SCENARIO_ROOT_PATTERN + ".xml";
 
-@Ignore("Flapping - see PHOENIX-2592")
 @Test
 public void testDateGenerator() throws Exception {
 XMLConfigParser parser = new XMLConfigParser(matcherScenario);



phoenix git commit: PHOENIX-2592 Pherf RuleGeneratorTest.testDateGenerator() is flapping (karan.singhal)

2016-01-15 Thread mujtaba
Repository: phoenix
Updated Branches:
  refs/heads/master 5818e2d57 -> 4f50257b5


PHOENIX-2592 Pherf RuleGeneratorTest.testDateGenerator() is flapping 
(karan.singhal)


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

Branch: refs/heads/master
Commit: 4f50257b569874209fe1b5988f0a256c22c6d0c1
Parents: 5818e2d
Author: Mujtaba 
Authored: Fri Jan 15 12:27:08 2016 -0800
Committer: Mujtaba 
Committed: Fri Jan 15 12:27:08 2016 -0800

--
 .../main/java/org/apache/phoenix/pherf/rules/RulesApplier.java| 3 ++-
 .../src/test/java/org/apache/phoenix/pherf/RuleGeneratorTest.java | 1 -
 2 files changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/4f50257b/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/rules/RulesApplier.java
--
diff --git 
a/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/rules/RulesApplier.java 
b/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/rules/RulesApplier.java
index 202c8b5..d270df6 100644
--- 
a/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/rules/RulesApplier.java
+++ 
b/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/rules/RulesApplier.java
@@ -238,7 +238,8 @@ public class RulesApplier {
 
 // Get Ms Date between min and max
 synchronized (randomDataGenerator) {
-long rndLong = randomDataGenerator.nextLong(minDt.getMillis(), 
maxDt.getMillis());
+//Make sure date generated is exactly between the passed limits
+long rndLong = randomDataGenerator.nextLong(minDt.getMillis()+1, 
maxDt.getMillis()-1);
 dt = new DateTime(rndLong, PherfConstants.DEFAULT_TIME_ZONE);
 }
 

http://git-wip-us.apache.org/repos/asf/phoenix/blob/4f50257b/phoenix-pherf/src/test/java/org/apache/phoenix/pherf/RuleGeneratorTest.java
--
diff --git 
a/phoenix-pherf/src/test/java/org/apache/phoenix/pherf/RuleGeneratorTest.java 
b/phoenix-pherf/src/test/java/org/apache/phoenix/pherf/RuleGeneratorTest.java
index 71b785b..c2eae86 100644
--- 
a/phoenix-pherf/src/test/java/org/apache/phoenix/pherf/RuleGeneratorTest.java
+++ 
b/phoenix-pherf/src/test/java/org/apache/phoenix/pherf/RuleGeneratorTest.java
@@ -49,7 +49,6 @@ import org.junit.Test;
 public class RuleGeneratorTest {
 private static final String matcherScenario = 
PherfConstants.SCENARIO_ROOT_PATTERN + ".xml";
 
-@Ignore("Flapping - see PHOENIX-2592")
 @Test
 public void testDateGenerator() throws Exception {
 XMLConfigParser parser = new XMLConfigParser(matcherScenario);



phoenix git commit: PHOENIX-2592 Pherf RuleGeneratorTest.testDateGenerator() is flapping (karan.singhal)

2016-01-15 Thread mujtaba
Repository: phoenix
Updated Branches:
  refs/heads/4.x-HBase-1.0 3e740cbc5 -> b4ac8c482


PHOENIX-2592 Pherf RuleGeneratorTest.testDateGenerator() is flapping 
(karan.singhal)


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

Branch: refs/heads/4.x-HBase-1.0
Commit: b4ac8c482c7819df7cab66e61fa1bbc548191858
Parents: 3e740cb
Author: Mujtaba 
Authored: Fri Jan 15 12:20:30 2016 -0800
Committer: Mujtaba 
Committed: Fri Jan 15 12:20:30 2016 -0800

--
 .../main/java/org/apache/phoenix/pherf/rules/RulesApplier.java| 3 ++-
 .../src/test/java/org/apache/phoenix/pherf/RuleGeneratorTest.java | 1 -
 2 files changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/b4ac8c48/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/rules/RulesApplier.java
--
diff --git 
a/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/rules/RulesApplier.java 
b/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/rules/RulesApplier.java
index 2b1689a..2ef4a7c 100644
--- 
a/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/rules/RulesApplier.java
+++ 
b/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/rules/RulesApplier.java
@@ -233,7 +233,8 @@ public class RulesApplier {
 DateTime dt;
 // Get Ms Date between min and max
 synchronized (randomDataGenerator) {
-long rndLong = randomDataGenerator.nextLong(minDt.getMillis(), 
maxDt.getMillis());
+//Make sure date generated is exactly between the passed limits
+long rndLong = randomDataGenerator.nextLong(minDt.getMillis()+1, 
maxDt.getMillis()-1);
 dt = new DateTime(rndLong, minDt.getZone());
 }
 

http://git-wip-us.apache.org/repos/asf/phoenix/blob/b4ac8c48/phoenix-pherf/src/test/java/org/apache/phoenix/pherf/RuleGeneratorTest.java
--
diff --git 
a/phoenix-pherf/src/test/java/org/apache/phoenix/pherf/RuleGeneratorTest.java 
b/phoenix-pherf/src/test/java/org/apache/phoenix/pherf/RuleGeneratorTest.java
index 2286739..c4e33f0 100644
--- 
a/phoenix-pherf/src/test/java/org/apache/phoenix/pherf/RuleGeneratorTest.java
+++ 
b/phoenix-pherf/src/test/java/org/apache/phoenix/pherf/RuleGeneratorTest.java
@@ -49,7 +49,6 @@ import org.junit.Test;
 public class RuleGeneratorTest {
 private static final String matcherScenario = 
PherfConstants.SCENARIO_ROOT_PATTERN + ".xml";
 
-@Ignore("Flapping - see PHOENIX-2592")
 @Test
 public void testDateGenerator() throws Exception {
 XMLConfigParser parser = new XMLConfigParser(matcherScenario);



phoenix git commit: PHOENIX-2595 Upgrade Calcite-Phoenix to Calcite 1.6

2016-01-15 Thread maryannxue
Repository: phoenix
Updated Branches:
  refs/heads/calcite b51319e14 -> 518356479


PHOENIX-2595 Upgrade Calcite-Phoenix to Calcite 1.6


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

Branch: refs/heads/calcite
Commit: 518356479ed2f7771331259c18194c76ba570d40
Parents: b51319e
Author: maryannxue 
Authored: Fri Jan 15 09:31:31 2016 -0500
Committer: maryannxue 
Committed: Fri Jan 15 09:31:31 2016 -0500

--
 .../org/apache/phoenix/calcite/CalciteIT.java   |  1 -
 .../calcite/jdbc/PhoenixPrepareImpl.java| 71 +---
 2 files changed, 1 insertion(+), 71 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/51835647/phoenix-core/src/it/java/org/apache/phoenix/calcite/CalciteIT.java
--
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/calcite/CalciteIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/calcite/CalciteIT.java
index 8594d22..acd040d 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/calcite/CalciteIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/calcite/CalciteIT.java
@@ -903,7 +903,6 @@ public class CalciteIT extends BaseCalciteIT {
 .close();
 }
 
-@Ignore // CALCITE-1055
 @Test public void testCorrelateAndDecorrelation() throws Exception {
 Properties correlProps = getConnectionProps(false);
 correlProps.setProperty("forceDecorrelate", Boolean.FALSE.toString());

http://git-wip-us.apache.org/repos/asf/phoenix/blob/51835647/phoenix-core/src/main/java/org/apache/phoenix/calcite/jdbc/PhoenixPrepareImpl.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/calcite/jdbc/PhoenixPrepareImpl.java
 
b/phoenix-core/src/main/java/org/apache/phoenix/calcite/jdbc/PhoenixPrepareImpl.java
index ca29701..ae09b42 100644
--- 
a/phoenix-core/src/main/java/org/apache/phoenix/calcite/jdbc/PhoenixPrepareImpl.java
+++ 
b/phoenix-core/src/main/java/org/apache/phoenix/calcite/jdbc/PhoenixPrepareImpl.java
@@ -3,32 +3,25 @@ package org.apache.phoenix.calcite.jdbc;
 import java.util.List;
 
 import org.apache.calcite.adapter.enumerable.EnumerableRules;
-import org.apache.calcite.config.CalciteConnectionConfig;
 import org.apache.calcite.jdbc.CalcitePrepare;
 import org.apache.calcite.jdbc.CalciteSchema;
 import org.apache.calcite.plan.RelOptCluster;
 import org.apache.calcite.plan.RelOptCostFactory;
 import org.apache.calcite.plan.RelOptPlanner;
 import org.apache.calcite.plan.RelOptRule;
-import org.apache.calcite.plan.RelTraitSet;
 import org.apache.calcite.prepare.CalcitePrepareImpl;
 import org.apache.calcite.prepare.Prepare.Materialization;
 import org.apache.calcite.rel.RelNode;
-import org.apache.calcite.rel.core.RelFactories;
 import org.apache.calcite.rel.logical.LogicalSort;
 import org.apache.calcite.rel.rules.JoinCommuteRule;
 import org.apache.calcite.rel.rules.SortProjectTransposeRule;
 import org.apache.calcite.rel.rules.SortUnionTransposeRule;
-import org.apache.calcite.rel.rules.SubQueryRemoveRule;
 import org.apache.calcite.rex.RexBuilder;
 import org.apache.calcite.runtime.Hook;
 import org.apache.calcite.sql.SqlNode;
 import org.apache.calcite.sql.parser.SqlParser;
-import org.apache.calcite.sql2rel.RelDecorrelator;
-import org.apache.calcite.sql2rel.RelFieldTrimmer;
 import org.apache.calcite.tools.Program;
 import org.apache.calcite.tools.Programs;
-import org.apache.calcite.tools.RelBuilder;
 import org.apache.calcite.util.Holder;
 import org.apache.calcite.util.Pair;
 import org.apache.phoenix.calcite.PhoenixSchema;
@@ -47,7 +40,6 @@ import 
org.apache.phoenix.calcite.rules.PhoenixReverseTableScanRule;
 import org.apache.phoenix.calcite.rules.PhoenixSortServerJoinTransposeRule;
 
 import com.google.common.base.Function;
-import com.google.common.collect.ImmutableList;
 
 public class PhoenixPrepareImpl extends CalcitePrepareImpl {
 public static final ThreadLocal THREAD_SQL_STRING =
@@ -137,39 +129,7 @@ public class PhoenixPrepareImpl extends CalcitePrepareImpl 
{
@Override
public Object apply(
Pair, 
Holder> input) {
-   final Program program1 =
-   new Program() {
-   public RelNode run(RelOptPlanner 
planner, RelNode rel,
-   RelTraitSet 
requiredOutputTraits) {
-   final RelNode rootRel2 =
-