Jenkins build is back to normal : Phoenix | Master | Hadoop1 #319

2014-08-06 Thread Apache Jenkins Server 
See

Apache-Phoenix | 3.0 | Hadoop1 | Build Successful

2014-08-06 Thread Apache Jenkins Server 
3.0 branch build status Successful
Source repository https://git-wip-us.apache.org/repos/asf/phoenix.git

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

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

Changes
[jtaylor] PHOENIX-1136 Add Integration Tests to verify the fix for PHOENIX-1133 (Kyle Buzsaki)

Jenkins build is back to normal : Phoenix | 4.0 | Hadoop1 #253

2014-08-06 Thread Apache Jenkins Server 
See

git commit: PHOENIX-1136 Add Integration Tests to verify the fix for PHOENIX-1133 (Kyle Buzsaki)

2014-08-06 Thread jamestaylor 
Repository: phoenix
Updated Branches:
  refs/heads/4.0 358043649 -> 276921b65


PHOENIX-1136 Add Integration Tests to verify the fix for PHOENIX-1133 (Kyle 
Buzsaki)


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

Branch: refs/heads/4.0
Commit: 276921b65ec60dc3aae25ac892f4442934ec93b9
Parents: 3580436
Author: James Taylor 
Authored: Wed Aug 6 15:48:16 2014 -0700
Committer: James Taylor 
Committed: Wed Aug 6 15:49:23 2014 -0700

--
 .../org/apache/phoenix/end2end/SkipScanAfterManualSplitIT.java   | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/276921b6/phoenix-core/src/it/java/org/apache/phoenix/end2end/SkipScanAfterManualSplitIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SkipScanAfterManualSplitIT.java
 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SkipScanAfterManualSplitIT.java
index 1731917..f09a88e 100644
--- 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SkipScanAfterManualSplitIT.java
+++ 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SkipScanAfterManualSplitIT.java
@@ -38,7 +38,6 @@ import org.apache.phoenix.query.ConnectionQueryServices;
 import org.apache.phoenix.query.QueryServices;
 import org.apache.phoenix.util.ReadOnlyProps;
 import org.junit.BeforeClass;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
@@ -71,7 +70,7 @@ public class SkipScanAfterManualSplitIT extends 
BaseHBaseManagedTimeIT {
 // props.put(QueryServices.THREAD_POOL_SIZE_ATTRIB, 
Integer.toString(64));
 props.put(QueryServices.THREAD_POOL_SIZE_ATTRIB, Integer.toString(32));
 // enables manual splitting on salted tables
-// props.put(QueryServices.ROW_KEY_ORDER_SALTED_TABLE_ATTRIB, 
Boolean.toString(false));
+props.put(QueryServices.ROW_KEY_ORDER_SALTED_TABLE_ATTRIB, 
Boolean.toString(false));
 props.put(QueryServices.QUEUE_SIZE_ATTRIB, Integer.toString(1000));
 setUpTestDriver(getUrl(), new 
ReadOnlyProps(props.entrySet().iterator()));
 }
@@ -277,7 +276,6 @@ public class SkipScanAfterManualSplitIT extends 
BaseHBaseManagedTimeIT {
  * See PHOENIX-1133 and PHOENIX-1136 on apache JIRA for more details.
  * @throws java.sql.SQLException  from Connection
  */
-@Ignore
 @Test
 public void testSkipScanInListOfRVCAfterManualSplit() throws SQLException {
 Connection conn = DriverManager.getConnection(getUrl());

git commit: PHOENIX-1136 Add Integration Tests to verify the fix for PHOENIX-1133 (Kyle Buzsaki)

2014-08-06 Thread jamestaylor 
Repository: phoenix
Updated Branches:
  refs/heads/master e626f47d4 -> 26fc3223d


PHOENIX-1136 Add Integration Tests to verify the fix for PHOENIX-1133 (Kyle 
Buzsaki)


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

Branch: refs/heads/master
Commit: 26fc3223deaa41e1f1fafda3b82dd8535f625af8
Parents: e626f47
Author: James Taylor 
Authored: Wed Aug 6 15:48:16 2014 -0700
Committer: James Taylor 
Committed: Wed Aug 6 15:49:44 2014 -0700

--
 .../org/apache/phoenix/end2end/SkipScanAfterManualSplitIT.java   | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/26fc3223/phoenix-core/src/it/java/org/apache/phoenix/end2end/SkipScanAfterManualSplitIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SkipScanAfterManualSplitIT.java
 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SkipScanAfterManualSplitIT.java
index 1731917..f09a88e 100644
--- 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SkipScanAfterManualSplitIT.java
+++ 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SkipScanAfterManualSplitIT.java
@@ -38,7 +38,6 @@ import org.apache.phoenix.query.ConnectionQueryServices;
 import org.apache.phoenix.query.QueryServices;
 import org.apache.phoenix.util.ReadOnlyProps;
 import org.junit.BeforeClass;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
@@ -71,7 +70,7 @@ public class SkipScanAfterManualSplitIT extends 
BaseHBaseManagedTimeIT {
 // props.put(QueryServices.THREAD_POOL_SIZE_ATTRIB, 
Integer.toString(64));
 props.put(QueryServices.THREAD_POOL_SIZE_ATTRIB, Integer.toString(32));
 // enables manual splitting on salted tables
-// props.put(QueryServices.ROW_KEY_ORDER_SALTED_TABLE_ATTRIB, 
Boolean.toString(false));
+props.put(QueryServices.ROW_KEY_ORDER_SALTED_TABLE_ATTRIB, 
Boolean.toString(false));
 props.put(QueryServices.QUEUE_SIZE_ATTRIB, Integer.toString(1000));
 setUpTestDriver(getUrl(), new 
ReadOnlyProps(props.entrySet().iterator()));
 }
@@ -277,7 +276,6 @@ public class SkipScanAfterManualSplitIT extends 
BaseHBaseManagedTimeIT {
  * See PHOENIX-1133 and PHOENIX-1136 on apache JIRA for more details.
  * @throws java.sql.SQLException  from Connection
  */
-@Ignore
 @Test
 public void testSkipScanInListOfRVCAfterManualSplit() throws SQLException {
 Connection conn = DriverManager.getConnection(getUrl());

git commit: PHOENIX-1136 Add Integration Tests to verify the fix for PHOENIX-1133 (Kyle Buzsaki)

2014-08-06 Thread jamestaylor 
Repository: phoenix
Updated Branches:
  refs/heads/3.0 997919401 -> fa72e44a6


PHOENIX-1136 Add Integration Tests to verify the fix for PHOENIX-1133 (Kyle 
Buzsaki)


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

Branch: refs/heads/3.0
Commit: fa72e44a612846b99759da3efcdb70484e2f2c6f
Parents: 9979194
Author: James Taylor 
Authored: Wed Aug 6 15:48:16 2014 -0700
Committer: James Taylor 
Committed: Wed Aug 6 15:48:16 2014 -0700

--
 .../org/apache/phoenix/end2end/SkipScanAfterManualSplitIT.java   | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/fa72e44a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SkipScanAfterManualSplitIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SkipScanAfterManualSplitIT.java
 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SkipScanAfterManualSplitIT.java
index 1731917..f09a88e 100644
--- 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SkipScanAfterManualSplitIT.java
+++ 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SkipScanAfterManualSplitIT.java
@@ -38,7 +38,6 @@ import org.apache.phoenix.query.ConnectionQueryServices;
 import org.apache.phoenix.query.QueryServices;
 import org.apache.phoenix.util.ReadOnlyProps;
 import org.junit.BeforeClass;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
@@ -71,7 +70,7 @@ public class SkipScanAfterManualSplitIT extends 
BaseHBaseManagedTimeIT {
 // props.put(QueryServices.THREAD_POOL_SIZE_ATTRIB, 
Integer.toString(64));
 props.put(QueryServices.THREAD_POOL_SIZE_ATTRIB, Integer.toString(32));
 // enables manual splitting on salted tables
-// props.put(QueryServices.ROW_KEY_ORDER_SALTED_TABLE_ATTRIB, 
Boolean.toString(false));
+props.put(QueryServices.ROW_KEY_ORDER_SALTED_TABLE_ATTRIB, 
Boolean.toString(false));
 props.put(QueryServices.QUEUE_SIZE_ATTRIB, Integer.toString(1000));
 setUpTestDriver(getUrl(), new 
ReadOnlyProps(props.entrySet().iterator()));
 }
@@ -277,7 +276,6 @@ public class SkipScanAfterManualSplitIT extends 
BaseHBaseManagedTimeIT {
  * See PHOENIX-1133 and PHOENIX-1136 on apache JIRA for more details.
  * @throws java.sql.SQLException  from Connection
  */
-@Ignore
 @Test
 public void testSkipScanInListOfRVCAfterManualSplit() throws SQLException {
 Connection conn = DriverManager.getConnection(getUrl());

git commit: PHOENIX-1150 scan on local index(index of view) for queries with no where condition should not read other indexes data stored in the shared index table (Rajeshbabu)

2014-08-06 Thread jamestaylor 
Repository: phoenix
Updated Branches:
  refs/heads/master 0d8c04cf8 -> e626f47d4


PHOENIX-1150 scan on local index(index of view) for queries with no where 
condition should not read other indexes data stored in the shared index table 
(Rajeshbabu)


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

Branch: refs/heads/master
Commit: e626f47d458560181f52796598abb14e146cf991
Parents: 0d8c04c
Author: James Taylor 
Authored: Wed Aug 6 15:21:26 2014 -0700
Committer: James Taylor 
Committed: Wed Aug 6 15:22:13 2014 -0700

--
 .../org/apache/phoenix/end2end/HashJoinIT.java  | 40 ++--
 .../phoenix/end2end/index/LocalIndexIT.java | 26 -
 .../phoenix/end2end/index/MutableIndexIT.java   | 28 +++---
 .../apache/phoenix/compile/WhereOptimizer.java  | 26 ++---
 4 files changed, 71 insertions(+), 49 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/e626f47d/phoenix-core/src/it/java/org/apache/phoenix/end2end/HashJoinIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/HashJoinIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/HashJoinIT.java
index e4e0736..e880253 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/HashJoinIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/HashJoinIT.java
@@ -797,7 +797,7 @@ public class HashJoinIT extends BaseHBaseManagedTimeIT {
 "CLIENT SORTED BY [I.0:NAME]\n" +
 "PARALLEL EQUI-JOIN 1 HASH TABLES:\n" +
 "BUILD HASH TABLE 0\n" +
-"CLIENT PARALLEL 1-WAY FULL SCAN OVER " + 
MetaDataUtil.LOCAL_INDEX_TABLE_PREFIX + "" + JOIN_ITEM_TABLE_DISPLAY_NAME +"\n" 
+
+"CLIENT PARALLEL 1-WAY RANGE SCAN OVER " + 
MetaDataUtil.LOCAL_INDEX_TABLE_PREFIX + "" + JOIN_ITEM_TABLE_DISPLAY_NAME +" 
[-32768]\n" +
 "SERVER FILTER BY FIRST KEY ONLY\n" +
 "CLIENT MERGE SORT",
 /* 
@@ -812,7 +812,7 @@ public class HashJoinIT extends BaseHBaseManagedTimeIT {
 "CLIENT SORTED BY [SUM(O.QUANTITY) DESC]\n" +
 "PARALLEL EQUI-JOIN 1 HASH TABLES:\n" +
 "BUILD HASH TABLE 0\n" +
-"CLIENT PARALLEL 1-WAY FULL SCAN OVER " + 
MetaDataUtil.LOCAL_INDEX_TABLE_PREFIX + "" + JOIN_ITEM_TABLE_DISPLAY_NAME +"\n" 
+
+"CLIENT PARALLEL 1-WAY RANGE SCAN OVER " + 
MetaDataUtil.LOCAL_INDEX_TABLE_PREFIX + "" + JOIN_ITEM_TABLE_DISPLAY_NAME +" 
[-32768]\n" +
 "SERVER FILTER BY FIRST KEY ONLY\n" +
 "CLIENT MERGE SORT",  
 /* 
@@ -835,7 +835,7 @@ public class HashJoinIT extends BaseHBaseManagedTimeIT {
  * RIGHT JOIN joinItemTable i ON o.item_id = i.item_id 
  * GROUP BY i.name ORDER BY i.name
  */
-"CLIENT PARALLEL 1-WAY FULL SCAN OVER " + 
MetaDataUtil.LOCAL_INDEX_TABLE_PREFIX + "" + JOIN_ITEM_TABLE_DISPLAY_NAME+"\n" +
+"CLIENT PARALLEL 1-WAY RANGE SCAN OVER " + 
MetaDataUtil.LOCAL_INDEX_TABLE_PREFIX + "" + JOIN_ITEM_TABLE_DISPLAY_NAME+" 
[-32768]\n" +
 "SERVER FILTER BY FIRST KEY ONLY\n" +
 "SERVER AGGREGATE INTO DISTINCT ROWS BY [I.0:NAME]\n" +
 "CLIENT MERGE SORT\n" +
@@ -902,14 +902,14 @@ public class HashJoinIT extends BaseHBaseManagedTimeIT {
  * JOIN joinOrderTable o ON o.item_id = i.item_id AND 
quantity < 5000 
  * JOIN joinSupplierTable s ON i.supplier_id = 
s.supplier_id
  */
-"CLIENT PARALLEL 1-WAY FULL SCAN OVER " + 
MetaDataUtil.LOCAL_INDEX_TABLE_PREFIX + "" + JOIN_ITEM_TABLE_DISPLAY_NAME + 
"\n" +
+"CLIENT PARALLEL 1-WAY RANGE SCAN OVER " + 
MetaDataUtil.LOCAL_INDEX_TABLE_PREFIX + "" + JOIN_ITEM_TABLE_DISPLAY_NAME + " 
[-32768]\n" +
 "CLIENT MERGE SORT\n" + 
 "PARALLEL EQUI-JOIN 2 HASH TABLES:\n" +
 "BUILD HASH TABLE 0 (SKIP MERGE)\n" +
 "CLIENT PARALLEL 1-WAY FULL SCAN OVER " + 
JOIN_ORDER_TABLE_DISPLAY_NAME + "\n" +
 "SERVER FILTER BY QUANTITY < 5000\n" +
 "BUILD HASH TABLE 1\n" +
-"CLIENT PARALLEL 1-WAY FULL SCAN OVER " + 
MetaDataUtil.LOCAL_INDEX_TABLE_PREFIX + "" + JOIN_SUPPLIER_TABLE_DISPLAY_NAME + 
"\n" +
+"CLIENT PARALLEL 1-WAY RANGE

git commit: PHOENIX-1150 scan on local index(index of view) for queries with no where condition should not read other indexes data stored in the shared index table (Rajeshbabu)

2014-08-06 Thread jamestaylor 
Repository: phoenix
Updated Branches:
  refs/heads/4.0 9cd0b494e -> 358043649


PHOENIX-1150 scan on local index(index of view) for queries with no where 
condition should not read other indexes data stored in the shared index table 
(Rajeshbabu)


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

Branch: refs/heads/4.0
Commit: 358043649cde8669baeddf088dd9e197a3e03aac
Parents: 9cd0b49
Author: James Taylor 
Authored: Wed Aug 6 15:21:26 2014 -0700
Committer: James Taylor 
Committed: Wed Aug 6 15:21:26 2014 -0700

--
 .../org/apache/phoenix/end2end/HashJoinIT.java  | 40 ++--
 .../phoenix/end2end/index/LocalIndexIT.java | 26 -
 .../phoenix/end2end/index/MutableIndexIT.java   | 28 +++---
 .../apache/phoenix/compile/WhereOptimizer.java  | 26 ++---
 4 files changed, 71 insertions(+), 49 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/35804364/phoenix-core/src/it/java/org/apache/phoenix/end2end/HashJoinIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/HashJoinIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/HashJoinIT.java
index e4e0736..e880253 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/HashJoinIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/HashJoinIT.java
@@ -797,7 +797,7 @@ public class HashJoinIT extends BaseHBaseManagedTimeIT {
 "CLIENT SORTED BY [I.0:NAME]\n" +
 "PARALLEL EQUI-JOIN 1 HASH TABLES:\n" +
 "BUILD HASH TABLE 0\n" +
-"CLIENT PARALLEL 1-WAY FULL SCAN OVER " + 
MetaDataUtil.LOCAL_INDEX_TABLE_PREFIX + "" + JOIN_ITEM_TABLE_DISPLAY_NAME +"\n" 
+
+"CLIENT PARALLEL 1-WAY RANGE SCAN OVER " + 
MetaDataUtil.LOCAL_INDEX_TABLE_PREFIX + "" + JOIN_ITEM_TABLE_DISPLAY_NAME +" 
[-32768]\n" +
 "SERVER FILTER BY FIRST KEY ONLY\n" +
 "CLIENT MERGE SORT",
 /* 
@@ -812,7 +812,7 @@ public class HashJoinIT extends BaseHBaseManagedTimeIT {
 "CLIENT SORTED BY [SUM(O.QUANTITY) DESC]\n" +
 "PARALLEL EQUI-JOIN 1 HASH TABLES:\n" +
 "BUILD HASH TABLE 0\n" +
-"CLIENT PARALLEL 1-WAY FULL SCAN OVER " + 
MetaDataUtil.LOCAL_INDEX_TABLE_PREFIX + "" + JOIN_ITEM_TABLE_DISPLAY_NAME +"\n" 
+
+"CLIENT PARALLEL 1-WAY RANGE SCAN OVER " + 
MetaDataUtil.LOCAL_INDEX_TABLE_PREFIX + "" + JOIN_ITEM_TABLE_DISPLAY_NAME +" 
[-32768]\n" +
 "SERVER FILTER BY FIRST KEY ONLY\n" +
 "CLIENT MERGE SORT",  
 /* 
@@ -835,7 +835,7 @@ public class HashJoinIT extends BaseHBaseManagedTimeIT {
  * RIGHT JOIN joinItemTable i ON o.item_id = i.item_id 
  * GROUP BY i.name ORDER BY i.name
  */
-"CLIENT PARALLEL 1-WAY FULL SCAN OVER " + 
MetaDataUtil.LOCAL_INDEX_TABLE_PREFIX + "" + JOIN_ITEM_TABLE_DISPLAY_NAME+"\n" +
+"CLIENT PARALLEL 1-WAY RANGE SCAN OVER " + 
MetaDataUtil.LOCAL_INDEX_TABLE_PREFIX + "" + JOIN_ITEM_TABLE_DISPLAY_NAME+" 
[-32768]\n" +
 "SERVER FILTER BY FIRST KEY ONLY\n" +
 "SERVER AGGREGATE INTO DISTINCT ROWS BY [I.0:NAME]\n" +
 "CLIENT MERGE SORT\n" +
@@ -902,14 +902,14 @@ public class HashJoinIT extends BaseHBaseManagedTimeIT {
  * JOIN joinOrderTable o ON o.item_id = i.item_id AND 
quantity < 5000 
  * JOIN joinSupplierTable s ON i.supplier_id = 
s.supplier_id
  */
-"CLIENT PARALLEL 1-WAY FULL SCAN OVER " + 
MetaDataUtil.LOCAL_INDEX_TABLE_PREFIX + "" + JOIN_ITEM_TABLE_DISPLAY_NAME + 
"\n" +
+"CLIENT PARALLEL 1-WAY RANGE SCAN OVER " + 
MetaDataUtil.LOCAL_INDEX_TABLE_PREFIX + "" + JOIN_ITEM_TABLE_DISPLAY_NAME + " 
[-32768]\n" +
 "CLIENT MERGE SORT\n" + 
 "PARALLEL EQUI-JOIN 2 HASH TABLES:\n" +
 "BUILD HASH TABLE 0 (SKIP MERGE)\n" +
 "CLIENT PARALLEL 1-WAY FULL SCAN OVER " + 
JOIN_ORDER_TABLE_DISPLAY_NAME + "\n" +
 "SERVER FILTER BY QUANTITY < 5000\n" +
 "BUILD HASH TABLE 1\n" +
-"CLIENT PARALLEL 1-WAY FULL SCAN OVER " + 
MetaDataUtil.LOCAL_INDEX_TABLE_PREFIX + "" + JOIN_SUPPLIER_TABLE_DISPLAY_NAME + 
"\n" +
+"CLIENT PARALLEL 1-WAY RANGE SCAN O

Build failed in Jenkins: Phoenix | Master | Hadoop1 #318

2014-08-06 Thread Apache Jenkins Server 
See 

Changes:

[jtaylor] PHOENIX-1149 Index mutations should be committed as batches while 
building local index (Rajeshbabu)

--
[...truncated 4125 lines...]
testMultipleUpdatesAcrossRegionsWithLocalIndex(org.apache.phoenix.end2end.index.MutableIndexIT)
  Time elapsed: 6.005 sec  <<< FAILURE!
org.junit.ComparisonFailure: expected:<...IENT PARALLEL 2-WAY [FULL SCAN OVER 
_LOCAL_IDX_T]
CLIENT MERGE SORT> but was:<...IENT PARALLEL 2-WAY [RANGE SCAN OVER 
_LOCAL_IDX_T [-32768]]
CLIENT MERGE SORT>
at org.junit.Assert.assertEquals(Assert.java:115)
at org.junit.Assert.assertEquals(Assert.java:144)
at 
org.apache.phoenix.end2end.index.MutableIndexIT.testMultipleUpdatesAcrossRegions(MutableIndexIT.java:922)
at 
org.apache.phoenix.end2end.index.MutableIndexIT.testMultipleUpdatesAcrossRegionsWithLocalIndex(MutableIndexIT.java:854)

testSelectCFWithLocalIndex(org.apache.phoenix.end2end.index.MutableIndexIT)  
Time elapsed: 5.289 sec  <<< FAILURE!
org.junit.ComparisonFailure: expected:<...IENT PARALLEL 1-WAY [FULL SCAN OVER 
_LOCAL_IDX_T]
CLIENT MERGE SORT> but was:<...IENT PARALLEL 1-WAY [RANGE SCAN OVER 
_LOCAL_IDX_T [-32768]]
CLIENT MERGE SORT>
at org.junit.Assert.assertEquals(Assert.java:115)
at org.junit.Assert.assertEquals(Assert.java:144)
at 
org.apache.phoenix.end2end.index.MutableIndexIT.testSelectCF(MutableIndexIT.java:431)
at 
org.apache.phoenix.end2end.index.MutableIndexIT.testSelectCFWithLocalIndex(MutableIndexIT.java:388)

testLocalIndexWithCaseSensitiveCols(org.apache.phoenix.end2end.index.MutableIndexIT)
  Time elapsed: 5.395 sec  <<< FAILURE!
org.junit.ComparisonFailure: expected:<...IENT PARALLEL 1-WAY [FULL SCAN OVER 
_LOCAL_IDX_CS]
CLIENT MERGE SORT> but was:<...IENT PARALLEL 1-WAY [RANGE SCAN OVER 
_LOCAL_IDX_CS [-32768]]
CLIENT MERGE SORT>
at org.junit.Assert.assertEquals(Assert.java:115)
at org.junit.Assert.assertEquals(Assert.java:144)
at 
org.apache.phoenix.end2end.index.MutableIndexIT.testIndexWithCaseSensitiveCols(MutableIndexIT.java:1009)
at 
org.apache.phoenix.end2end.index.MutableIndexIT.testLocalIndexWithCaseSensitiveCols(MutableIndexIT.java:953)

testLocalIndexWithNullableDateCol(org.apache.phoenix.end2end.index.MutableIndexIT)
  Time elapsed: 5.428 sec  <<< FAILURE!
org.junit.ComparisonFailure: expected:<...IENT PARALLEL 1-WAY [FULL SCAN OVER 
_LOCAL_IDX_T]
CLIENT MERGE SORT> but was:<...IENT PARALLEL 1-WAY [RANGE SCAN OVER 
_LOCAL_IDX_T [-32768]]
CLIENT MERGE SORT>
at org.junit.Assert.assertEquals(Assert.java:115)
at org.junit.Assert.assertEquals(Assert.java:144)
at 
org.apache.phoenix.end2end.index.MutableIndexIT.testIndexWithNullableDateCol(MutableIndexIT.java:156)
at 
org.apache.phoenix.end2end.index.MutableIndexIT.testLocalIndexWithNullableDateCol(MutableIndexIT.java:132)

testSelectAllAndAliasWithLocalIndex(org.apache.phoenix.end2end.index.MutableIndexIT)
  Time elapsed: 4.679 sec  <<< FAILURE!
org.junit.ComparisonFailure: expected:<...IENT PARALLEL 1-WAY [FULL SCAN OVER 
_LOCAL_IDX_T]
CLIENT MERGE SORT> but was:<...IENT PARALLEL 1-WAY [RANGE SCAN OVER 
_LOCAL_IDX_T [-32768]]
CLIENT MERGE SORT>
at org.junit.Assert.assertEquals(Assert.java:115)
at org.junit.Assert.assertEquals(Assert.java:144)
at 
org.apache.phoenix.end2end.index.MutableIndexIT.testSelectAllAndAliasWithIndex(MutableIndexIT.java:340)
at 
org.apache.phoenix.end2end.index.MutableIndexIT.testSelectAllAndAliasWithLocalIndex(MutableIndexIT.java:302)

testCompoundIndexKeyWithLocalIndex(org.apache.phoenix.end2end.index.MutableIndexIT)
  Time elapsed: 4.7 sec  <<< FAILURE!
org.junit.ComparisonFailure: expected:<...IENT PARALLEL 1-WAY [FULL SCAN OVER 
_LOCAL_IDX_T]
CLIENT MERGE SORT> but was:<...IENT PARALLEL 1-WAY [RANGE SCAN OVER 
_LOCAL_IDX_T [-32768]]
CLIENT MERGE SORT>
at org.junit.Assert.assertEquals(Assert.java:115)
at org.junit.Assert.assertEquals(Assert.java:144)
at 
org.apache.phoenix.end2end.index.MutableIndexIT.testCompoundIndexKey(MutableIndexIT.java:633)
at 
org.apache.phoenix.end2end.index.MutableIndexIT.testCompoundIndexKeyWithLocalIndex(MutableIndexIT.java:574)

testCoveredColumnsWithLocalIndex(org.apache.phoenix.end2end.index.MutableIndexIT)
  Time elapsed: 5.19 sec  <<< FAILURE!
org.junit.ComparisonFailure: expected:<...IENT PARALLEL 1-WAY [FULL SCAN OVER 
_LOCAL_IDX_T]
CLIENT MERGE SORT> but was:<...IENT PARALLEL 1-WAY [RANGE SCAN OVER 
_LOCAL_IDX_T [-32768]]
CLIENT MERGE SORT>
at org.junit.Assert.assertEquals(Assert.java:115)
at org.junit.Assert.assertEquals(Assert.java:144)
at 
org.apache.phoenix.end2end.index.MutableIndexIT.testCoveredColumns(MutableIndexIT.java:512)
at 
org.apache.phoenix.end2end.index.MutableIndexIT.testCoveredColumnsWithLocalIndex(MutableIndexIT.java:456)

Build failed in Jenkins: Phoenix | 4.0 | Hadoop1 #252

2014-08-06 Thread Apache Jenkins Server 
See 

Changes:

[jtaylor] PHOENIX-1149 Index mutations should be committed as batches while 
building local index (Rajeshbabu)

--
[...truncated 719 lines...]
testMultipleUpdatesAcrossRegionsWithLocalIndex(org.apache.phoenix.end2end.index.MutableIndexIT)
  Time elapsed: 5.666 sec  <<< FAILURE!
org.junit.ComparisonFailure: expected:<...IENT PARALLEL 2-WAY [FULL SCAN OVER 
_LOCAL_IDX_T]
CLIENT MERGE SORT> but was:<...IENT PARALLEL 2-WAY [RANGE SCAN OVER 
_LOCAL_IDX_T [-32768]]
CLIENT MERGE SORT>
at org.junit.Assert.assertEquals(Assert.java:115)
at org.junit.Assert.assertEquals(Assert.java:144)
at 
org.apache.phoenix.end2end.index.MutableIndexIT.testMultipleUpdatesAcrossRegions(MutableIndexIT.java:922)
at 
org.apache.phoenix.end2end.index.MutableIndexIT.testMultipleUpdatesAcrossRegionsWithLocalIndex(MutableIndexIT.java:854)

testSelectCFWithLocalIndex(org.apache.phoenix.end2end.index.MutableIndexIT)  
Time elapsed: 5.734 sec  <<< FAILURE!
org.junit.ComparisonFailure: expected:<...IENT PARALLEL 1-WAY [FULL SCAN OVER 
_LOCAL_IDX_T]
CLIENT MERGE SORT> but was:<...IENT PARALLEL 1-WAY [RANGE SCAN OVER 
_LOCAL_IDX_T [-32768]]
CLIENT MERGE SORT>
at org.junit.Assert.assertEquals(Assert.java:115)
at org.junit.Assert.assertEquals(Assert.java:144)
at 
org.apache.phoenix.end2end.index.MutableIndexIT.testSelectCF(MutableIndexIT.java:431)
at 
org.apache.phoenix.end2end.index.MutableIndexIT.testSelectCFWithLocalIndex(MutableIndexIT.java:388)

testLocalIndexWithCaseSensitiveCols(org.apache.phoenix.end2end.index.MutableIndexIT)
  Time elapsed: 5.107 sec  <<< FAILURE!
org.junit.ComparisonFailure: expected:<...IENT PARALLEL 1-WAY [FULL SCAN OVER 
_LOCAL_IDX_CS]
CLIENT MERGE SORT> but was:<...IENT PARALLEL 1-WAY [RANGE SCAN OVER 
_LOCAL_IDX_CS [-32768]]
CLIENT MERGE SORT>
at org.junit.Assert.assertEquals(Assert.java:115)
at org.junit.Assert.assertEquals(Assert.java:144)
at 
org.apache.phoenix.end2end.index.MutableIndexIT.testIndexWithCaseSensitiveCols(MutableIndexIT.java:1009)
at 
org.apache.phoenix.end2end.index.MutableIndexIT.testLocalIndexWithCaseSensitiveCols(MutableIndexIT.java:953)

testLocalIndexWithNullableDateCol(org.apache.phoenix.end2end.index.MutableIndexIT)
  Time elapsed: 5.162 sec  <<< FAILURE!
org.junit.ComparisonFailure: expected:<...IENT PARALLEL 1-WAY [FULL SCAN OVER 
_LOCAL_IDX_T]
CLIENT MERGE SORT> but was:<...IENT PARALLEL 1-WAY [RANGE SCAN OVER 
_LOCAL_IDX_T [-32768]]
CLIENT MERGE SORT>
at org.junit.Assert.assertEquals(Assert.java:115)
at org.junit.Assert.assertEquals(Assert.java:144)
at 
org.apache.phoenix.end2end.index.MutableIndexIT.testIndexWithNullableDateCol(MutableIndexIT.java:156)
at 
org.apache.phoenix.end2end.index.MutableIndexIT.testLocalIndexWithNullableDateCol(MutableIndexIT.java:132)

testSelectAllAndAliasWithLocalIndex(org.apache.phoenix.end2end.index.MutableIndexIT)
  Time elapsed: 4.804 sec  <<< FAILURE!
org.junit.ComparisonFailure: expected:<...IENT PARALLEL 1-WAY [FULL SCAN OVER 
_LOCAL_IDX_T]
CLIENT MERGE SORT> but was:<...IENT PARALLEL 1-WAY [RANGE SCAN OVER 
_LOCAL_IDX_T [-32768]]
CLIENT MERGE SORT>
at org.junit.Assert.assertEquals(Assert.java:115)
at org.junit.Assert.assertEquals(Assert.java:144)
at 
org.apache.phoenix.end2end.index.MutableIndexIT.testSelectAllAndAliasWithIndex(MutableIndexIT.java:340)
at 
org.apache.phoenix.end2end.index.MutableIndexIT.testSelectAllAndAliasWithLocalIndex(MutableIndexIT.java:302)

testCompoundIndexKeyWithLocalIndex(org.apache.phoenix.end2end.index.MutableIndexIT)
  Time elapsed: 5.344 sec  <<< FAILURE!
org.junit.ComparisonFailure: expected:<...IENT PARALLEL 1-WAY [FULL SCAN OVER 
_LOCAL_IDX_T]
CLIENT MERGE SORT> but was:<...IENT PARALLEL 1-WAY [RANGE SCAN OVER 
_LOCAL_IDX_T [-32768]]
CLIENT MERGE SORT>
at org.junit.Assert.assertEquals(Assert.java:115)
at org.junit.Assert.assertEquals(Assert.java:144)
at 
org.apache.phoenix.end2end.index.MutableIndexIT.testCompoundIndexKey(MutableIndexIT.java:633)
at 
org.apache.phoenix.end2end.index.MutableIndexIT.testCompoundIndexKeyWithLocalIndex(MutableIndexIT.java:574)

testCoveredColumnsWithLocalIndex(org.apache.phoenix.end2end.index.MutableIndexIT)
  Time elapsed: 5.305 sec  <<< FAILURE!
org.junit.ComparisonFailure: expected:<...IENT PARALLEL 1-WAY [FULL SCAN OVER 
_LOCAL_IDX_T]
CLIENT MERGE SORT> but was:<...IENT PARALLEL 1-WAY [RANGE SCAN OVER 
_LOCAL_IDX_T [-32768]]
CLIENT MERGE SORT>
at org.junit.Assert.assertEquals(Assert.java:115)
at org.junit.Assert.assertEquals(Assert.java:144)
at 
org.apache.phoenix.end2end.index.MutableIndexIT.testCoveredColumns(MutableIndexIT.java:512)
at 
org.apache.phoenix.end2end.index.MutableIndexIT.testCoveredColumnsWithLocalIndex(MutableIndexIT.java:456)

t

Jenkins build is back to stable : Phoenix | Master | Hadoop1 #317

2014-08-06 Thread Apache Jenkins Server 
See

Apache-Phoenix | 4.0 | Hadoop1 | Build Successful

2014-08-06 Thread Apache Jenkins Server 
4.0 branch build status Successful

Source repository https://git-wip-us.apache.org/repos/asf/incubator-phoenix.git

Compiled Artifacts https://builds.apache.org/job/Phoenix-4.0-hadoop1/lastSuccessfulBuild/artifact/

Test Report https://builds.apache.org/job/Phoenix-4.0-hadoop1/lastCompletedBuild/testReport/

Changes
[jtaylor] PHOENIX-1146 Detect stale client region cache on server and retry scans in split regions

git commit: PHOENIX-1149 Index mutations should be committed as batches while building local index (Rajeshbabu)

2014-08-06 Thread jamestaylor 
Repository: phoenix
Updated Branches:
  refs/heads/master 1d6f072cd -> 0d8c04cf8


PHOENIX-1149 Index mutations should be committed as batches while building 
local index (Rajeshbabu)


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

Branch: refs/heads/master
Commit: 0d8c04cf8061bf658afab0241453fea662c1d22b
Parents: 1d6f072
Author: James Taylor 
Authored: Wed Aug 6 09:45:40 2014 -0700
Committer: James Taylor 
Committed: Wed Aug 6 09:46:25 2014 -0700

--
 .../main/java/org/apache/phoenix/compile/WhereOptimizer.java   | 4 ++--
 .../phoenix/coprocessor/UngroupedAggregateRegionObserver.java  | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/0d8c04cf/phoenix-core/src/main/java/org/apache/phoenix/compile/WhereOptimizer.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/compile/WhereOptimizer.java 
b/phoenix-core/src/main/java/org/apache/phoenix/compile/WhereOptimizer.java
index 9c20610..b48838d 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/compile/WhereOptimizer.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/compile/WhereOptimizer.java
@@ -100,7 +100,7 @@ public class WhereOptimizer {
 Expression whereClause, Set extractNodes) {
 PName tenantId = context.getConnection().getTenantId();
 PTable table = context.getResolver().getTables().get(0).getTable();
-if (whereClause == null && (tenantId == null || 
!table.isMultiTenant())) {
+if (whereClause == null && (tenantId == null || 
!table.isMultiTenant()) && table.getViewIndexId() == null) {
 context.setScanRanges(ScanRanges.EVERYTHING);
 return whereClause;
 }
@@ -116,7 +116,7 @@ public class WhereOptimizer {
 // becomes consistent.
 keySlots = whereClause.accept(visitor);
 
-if (keySlots == null && (tenantId == null || 
!table.isMultiTenant())) {
+if (keySlots == null && (tenantId == null || 
!table.isMultiTenant()) && table.getViewIndexId() == null) {
 context.setScanRanges(ScanRanges.EVERYTHING);
 return whereClause;
 }

http://git-wip-us.apache.org/repos/asf/phoenix/blob/0d8c04cf/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 782d2fc..95b095e 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
@@ -201,7 +201,8 @@ public class UngroupedAggregateRegionObserver extends 
BaseScannerRegionObserver
 long ts = scan.getTimeRange().getMax();
 HRegion region = c.getEnvironment().getRegion();
 List mutations = Collections.emptyList();
-if (isDelete || isUpsert || (deleteCQ != null && deleteCF != null) || 
emptyCF != null) {
+boolean buildLocalIndex = indexMaintainers != null && 
dataColumns==null && !localIndexScan;
+if (isDelete || isUpsert || (deleteCQ != null && deleteCF != null) || 
emptyCF != null || buildLocalIndex) {
 // TODO: size better
 mutations = Lists.newArrayListWithExpectedSize(1024);
 batchSize = 
c.getEnvironment().getConfiguration().getInt(MUTATE_BATCH_SIZE_ATTRIB, 
QueryServicesOptions.DEFAULT_MUTATE_BATCH_SIZE);
@@ -235,8 +236,7 @@ public class UngroupedAggregateRegionObserver extends 
BaseScannerRegionObserver
 rowCount++;
 result.setKeyValues(results);
 try {
-if (indexMaintainers != null && dataColumns==null && 
!localIndexScan) {
-// TODO: join back to data row here if scan 
attribute set
+if (buildLocalIndex) {
 for (IndexMaintainer maintainer : 
indexMaintainers) {
 if (!results.isEmpty()) {
 result.getKey(ptr);

git commit: PHOENIX-1149 Index mutations should be committed as batches while building local index (Rajeshbabu)

2014-08-06 Thread jamestaylor 
Repository: phoenix
Updated Branches:
  refs/heads/4.0 8ad954bec -> 9cd0b494e


PHOENIX-1149 Index mutations should be committed as batches while building 
local index (Rajeshbabu)


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

Branch: refs/heads/4.0
Commit: 9cd0b494ea8074d6d22b54a76f607fc796e4909b
Parents: 8ad954b
Author: James Taylor 
Authored: Wed Aug 6 09:45:40 2014 -0700
Committer: James Taylor 
Committed: Wed Aug 6 09:45:40 2014 -0700

--
 .../main/java/org/apache/phoenix/compile/WhereOptimizer.java   | 4 ++--
 .../phoenix/coprocessor/UngroupedAggregateRegionObserver.java  | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/9cd0b494/phoenix-core/src/main/java/org/apache/phoenix/compile/WhereOptimizer.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/compile/WhereOptimizer.java 
b/phoenix-core/src/main/java/org/apache/phoenix/compile/WhereOptimizer.java
index 9c20610..b48838d 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/compile/WhereOptimizer.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/compile/WhereOptimizer.java
@@ -100,7 +100,7 @@ public class WhereOptimizer {
 Expression whereClause, Set extractNodes) {
 PName tenantId = context.getConnection().getTenantId();
 PTable table = context.getResolver().getTables().get(0).getTable();
-if (whereClause == null && (tenantId == null || 
!table.isMultiTenant())) {
+if (whereClause == null && (tenantId == null || 
!table.isMultiTenant()) && table.getViewIndexId() == null) {
 context.setScanRanges(ScanRanges.EVERYTHING);
 return whereClause;
 }
@@ -116,7 +116,7 @@ public class WhereOptimizer {
 // becomes consistent.
 keySlots = whereClause.accept(visitor);
 
-if (keySlots == null && (tenantId == null || 
!table.isMultiTenant())) {
+if (keySlots == null && (tenantId == null || 
!table.isMultiTenant()) && table.getViewIndexId() == null) {
 context.setScanRanges(ScanRanges.EVERYTHING);
 return whereClause;
 }

http://git-wip-us.apache.org/repos/asf/phoenix/blob/9cd0b494/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 53647a3..9878777 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
@@ -201,7 +201,8 @@ public class UngroupedAggregateRegionObserver extends 
BaseScannerRegionObserver
 long ts = scan.getTimeRange().getMax();
 HRegion region = c.getEnvironment().getRegion();
 List mutations = Collections.emptyList();
-if (isDelete || isUpsert || (deleteCQ != null && deleteCF != null) || 
emptyCF != null) {
+boolean buildLocalIndex = indexMaintainers != null && 
dataColumns==null && !localIndexScan;
+if (isDelete || isUpsert || (deleteCQ != null && deleteCF != null) || 
emptyCF != null || buildLocalIndex) {
 // TODO: size better
 mutations = Lists.newArrayListWithExpectedSize(1024);
 batchSize = 
c.getEnvironment().getConfiguration().getInt(MUTATE_BATCH_SIZE_ATTRIB, 
QueryServicesOptions.DEFAULT_MUTATE_BATCH_SIZE);
@@ -235,8 +236,7 @@ public class UngroupedAggregateRegionObserver extends 
BaseScannerRegionObserver
 rowCount++;
 result.setKeyValues(results);
 try {
-if (indexMaintainers != null && dataColumns==null && 
!localIndexScan) {
-// TODO: join back to data row here if scan 
attribute set
+if (buildLocalIndex) {
 for (IndexMaintainer maintainer : 
indexMaintainers) {
 if (!results.isEmpty()) {
 result.getKey(ptr);

git commit: PHOENIX-1146 Detect stale client region cache on server and retry scans in split regions

2014-08-06 Thread jamestaylor 
Repository: phoenix
Updated Branches:
  refs/heads/master b2fb7b41f -> 1d6f072cd


PHOENIX-1146 Detect stale client region cache on server and retry scans in 
split regions


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

Branch: refs/heads/master
Commit: 1d6f072cd135bb7f96f7342934f364258a79e867
Parents: b2fb7b4
Author: James Taylor 
Authored: Wed Aug 6 08:22:57 2014 -0700
Committer: James Taylor 
Committed: Wed Aug 6 09:24:12 2014 -0700

--
 .../end2end/SkipScanAfterManualSplitIT.java |  21 +-
 .../coprocessor/BaseScannerRegionObserver.java  |  34 ++-
 .../GroupedAggregateRegionObserver.java |   9 +-
 .../phoenix/coprocessor/ScanRegionObserver.java |  12 +-
 .../UngroupedAggregateRegionObserver.java   |   9 +-
 .../phoenix/exception/SQLExceptionCode.java |  11 +-
 .../phoenix/iterate/ParallelIterators.java  | 208 ---
 .../StaleRegionBoundaryCacheException.java  |  46 
 .../org/apache/phoenix/util/SchemaUtil.java |  33 ++-
 .../org/apache/phoenix/util/ServerUtil.java |  13 +-
 10 files changed, 284 insertions(+), 112 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/1d6f072c/phoenix-core/src/it/java/org/apache/phoenix/end2end/SkipScanAfterManualSplitIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SkipScanAfterManualSplitIT.java
 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SkipScanAfterManualSplitIT.java
index 764d1e2..1731917 100644
--- 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SkipScanAfterManualSplitIT.java
+++ 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SkipScanAfterManualSplitIT.java
@@ -28,10 +28,8 @@ import java.sql.DriverManager;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
-import java.util.List;
 import java.util.Map;
 
-import org.apache.hadoop.hbase.HRegionLocation;
 import org.apache.hadoop.hbase.HTableDescriptor;
 import org.apache.hadoop.hbase.client.HBaseAdmin;
 import org.apache.hadoop.hbase.util.Bytes;
@@ -44,7 +42,6 @@ import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
-import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 
 @Category(HBaseManagedTimeTest.class)
@@ -71,9 +68,10 @@ public class SkipScanAfterManualSplitIT extends 
BaseHBaseManagedTimeIT {
 public static void doSetup() throws Exception {
 Map props = Maps.newHashMapWithExpectedSize(2);
 // needed for 64 region parallelization due to splitting
-props.put(QueryServices.THREAD_POOL_SIZE_ATTRIB, Integer.toString(64));
+// props.put(QueryServices.THREAD_POOL_SIZE_ATTRIB, 
Integer.toString(64));
+props.put(QueryServices.THREAD_POOL_SIZE_ATTRIB, Integer.toString(32));
 // enables manual splitting on salted tables
-props.put(QueryServices.ROW_KEY_ORDER_SALTED_TABLE_ATTRIB, 
Boolean.toString(false));
+// props.put(QueryServices.ROW_KEY_ORDER_SALTED_TABLE_ATTRIB, 
Boolean.toString(false));
 props.put(QueryServices.QUEUE_SIZE_ATTRIB, Integer.toString(1000));
 setUpTestDriver(getUrl(), new 
ReadOnlyProps(props.entrySet().iterator()));
 }
@@ -109,22 +107,11 @@ public class SkipScanAfterManualSplitIT extends 
BaseHBaseManagedTimeIT {
 conn.close();
 }
 
-private static void traceRegionBoundaries(ConnectionQueryServices 
services) throws Exception {
-List boundaries = Lists.newArrayList();
-List regions = 
services.getAllTableRegions(TABLE_NAME_BYTES);
-for (HRegionLocation region : regions.subList(1, regions.size())) {
-
boundaries.add(Bytes.toStringBinary(region.getRegionInfo().getStartKey()));
-}
-System.out.println("Region boundaries:\n" + boundaries);
-}
-
-@Ignore
 @Test
 public void testManualSplit() throws Exception {
 initTable();
 Connection conn = DriverManager.getConnection(getUrl());
 ConnectionQueryServices services = 
conn.unwrap(PhoenixConnection.class).getQueryServices();
-traceRegionBoundaries(services);
 int nRegions = services.getAllTableRegions(TABLE_NAME_BYTES).size();
 int nInitialRegions = nRegions;
 HBaseAdmin admin = services.getAdmin();
@@ -144,7 +131,6 @@ public class SkipScanAfterManualSplitIT extends 
BaseHBaseManagedTimeIT {
 String query = "SELECT /*+ NO_INTRA_REGION_PARALLELIZATION */ 
count(*) FROM S WHERE a IN ('tl','jt')";
 ResultSet rs1 = conn.createStatement().executeQuer

git commit: PHOENIX-1146 Detect stale client region cache on server and retry scans in split regions

2014-08-06 Thread jamestaylor 
Repository: phoenix
Updated Branches:
  refs/heads/4.0 e33155eae -> 8ad954bec


PHOENIX-1146 Detect stale client region cache on server and retry scans in 
split regions


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

Branch: refs/heads/4.0
Commit: 8ad954bec041dc3fd48fc51ed34e4b3e378330dc
Parents: e33155e
Author: James Taylor 
Authored: Wed Aug 6 08:22:57 2014 -0700
Committer: James Taylor 
Committed: Wed Aug 6 09:23:26 2014 -0700

--
 .../end2end/SkipScanAfterManualSplitIT.java |  21 +-
 .../coprocessor/BaseScannerRegionObserver.java  |  34 ++-
 .../GroupedAggregateRegionObserver.java |   9 +-
 .../phoenix/coprocessor/ScanRegionObserver.java |  12 +-
 .../UngroupedAggregateRegionObserver.java   |   9 +-
 .../phoenix/exception/SQLExceptionCode.java |  11 +-
 .../phoenix/iterate/ParallelIterators.java  | 208 ---
 .../StaleRegionBoundaryCacheException.java  |  46 
 .../org/apache/phoenix/util/SchemaUtil.java |  33 ++-
 .../org/apache/phoenix/util/ServerUtil.java |  13 +-
 10 files changed, 284 insertions(+), 112 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/8ad954be/phoenix-core/src/it/java/org/apache/phoenix/end2end/SkipScanAfterManualSplitIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SkipScanAfterManualSplitIT.java
 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SkipScanAfterManualSplitIT.java
index 764d1e2..1731917 100644
--- 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SkipScanAfterManualSplitIT.java
+++ 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SkipScanAfterManualSplitIT.java
@@ -28,10 +28,8 @@ import java.sql.DriverManager;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
-import java.util.List;
 import java.util.Map;
 
-import org.apache.hadoop.hbase.HRegionLocation;
 import org.apache.hadoop.hbase.HTableDescriptor;
 import org.apache.hadoop.hbase.client.HBaseAdmin;
 import org.apache.hadoop.hbase.util.Bytes;
@@ -44,7 +42,6 @@ import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
-import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 
 @Category(HBaseManagedTimeTest.class)
@@ -71,9 +68,10 @@ public class SkipScanAfterManualSplitIT extends 
BaseHBaseManagedTimeIT {
 public static void doSetup() throws Exception {
 Map props = Maps.newHashMapWithExpectedSize(2);
 // needed for 64 region parallelization due to splitting
-props.put(QueryServices.THREAD_POOL_SIZE_ATTRIB, Integer.toString(64));
+// props.put(QueryServices.THREAD_POOL_SIZE_ATTRIB, 
Integer.toString(64));
+props.put(QueryServices.THREAD_POOL_SIZE_ATTRIB, Integer.toString(32));
 // enables manual splitting on salted tables
-props.put(QueryServices.ROW_KEY_ORDER_SALTED_TABLE_ATTRIB, 
Boolean.toString(false));
+// props.put(QueryServices.ROW_KEY_ORDER_SALTED_TABLE_ATTRIB, 
Boolean.toString(false));
 props.put(QueryServices.QUEUE_SIZE_ATTRIB, Integer.toString(1000));
 setUpTestDriver(getUrl(), new 
ReadOnlyProps(props.entrySet().iterator()));
 }
@@ -109,22 +107,11 @@ public class SkipScanAfterManualSplitIT extends 
BaseHBaseManagedTimeIT {
 conn.close();
 }
 
-private static void traceRegionBoundaries(ConnectionQueryServices 
services) throws Exception {
-List boundaries = Lists.newArrayList();
-List regions = 
services.getAllTableRegions(TABLE_NAME_BYTES);
-for (HRegionLocation region : regions.subList(1, regions.size())) {
-
boundaries.add(Bytes.toStringBinary(region.getRegionInfo().getStartKey()));
-}
-System.out.println("Region boundaries:\n" + boundaries);
-}
-
-@Ignore
 @Test
 public void testManualSplit() throws Exception {
 initTable();
 Connection conn = DriverManager.getConnection(getUrl());
 ConnectionQueryServices services = 
conn.unwrap(PhoenixConnection.class).getQueryServices();
-traceRegionBoundaries(services);
 int nRegions = services.getAllTableRegions(TABLE_NAME_BYTES).size();
 int nInitialRegions = nRegions;
 HBaseAdmin admin = services.getAdmin();
@@ -144,7 +131,6 @@ public class SkipScanAfterManualSplitIT extends 
BaseHBaseManagedTimeIT {
 String query = "SELECT /*+ NO_INTRA_REGION_PARALLELIZATION */ 
count(*) FROM S WHERE a IN ('tl','jt')";
 ResultSet rs1 = conn.createStatement().executeQuery(quer

Apache-Phoenix | 3.0 | Hadoop1 | Build Successful

2014-08-06 Thread Apache Jenkins Server 
3.0 branch build status Successful
Source repository https://git-wip-us.apache.org/repos/asf/phoenix.git

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

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

Changes
[jtaylor] PHOENIX-1146 Detect stale client region cache on server and retry scans in split regions

git commit: PHOENIX-1146 Detect stale client region cache on server and retry scans in split regions

2014-08-06 Thread jamestaylor 
Repository: phoenix
Updated Branches:
  refs/heads/3.0 b951f85bd -> 997919401


PHOENIX-1146 Detect stale client region cache on server and retry scans in 
split regions


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

Branch: refs/heads/3.0
Commit: 997919401e92a749029776a3677f5ef3b74bbb7e
Parents: b951f85
Author: James Taylor 
Authored: Wed Aug 6 08:22:57 2014 -0700
Committer: James Taylor 
Committed: Wed Aug 6 08:22:57 2014 -0700

--
 .../end2end/SkipScanAfterManualSplitIT.java |  21 +--
 .../coprocessor/BaseScannerRegionObserver.java  |  25 ++-
 .../GroupedAggregateRegionObserver.java |   9 +-
 .../phoenix/coprocessor/ScanRegionObserver.java |  12 +-
 .../UngroupedAggregateRegionObserver.java   |  10 +-
 .../phoenix/exception/SQLExceptionCode.java |   7 +
 .../phoenix/iterate/ParallelIterators.java  | 156 ---
 .../StaleRegionBoundaryCacheException.java  |  46 ++
 .../org/apache/phoenix/util/SchemaUtil.java |  33 +++-
 .../org/apache/phoenix/util/ServerUtil.java |  13 +-
 10 files changed, 238 insertions(+), 94 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/99791940/phoenix-core/src/it/java/org/apache/phoenix/end2end/SkipScanAfterManualSplitIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SkipScanAfterManualSplitIT.java
 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SkipScanAfterManualSplitIT.java
index 764d1e2..1731917 100644
--- 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SkipScanAfterManualSplitIT.java
+++ 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SkipScanAfterManualSplitIT.java
@@ -28,10 +28,8 @@ import java.sql.DriverManager;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
-import java.util.List;
 import java.util.Map;
 
-import org.apache.hadoop.hbase.HRegionLocation;
 import org.apache.hadoop.hbase.HTableDescriptor;
 import org.apache.hadoop.hbase.client.HBaseAdmin;
 import org.apache.hadoop.hbase.util.Bytes;
@@ -44,7 +42,6 @@ import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
-import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 
 @Category(HBaseManagedTimeTest.class)
@@ -71,9 +68,10 @@ public class SkipScanAfterManualSplitIT extends 
BaseHBaseManagedTimeIT {
 public static void doSetup() throws Exception {
 Map props = Maps.newHashMapWithExpectedSize(2);
 // needed for 64 region parallelization due to splitting
-props.put(QueryServices.THREAD_POOL_SIZE_ATTRIB, Integer.toString(64));
+// props.put(QueryServices.THREAD_POOL_SIZE_ATTRIB, 
Integer.toString(64));
+props.put(QueryServices.THREAD_POOL_SIZE_ATTRIB, Integer.toString(32));
 // enables manual splitting on salted tables
-props.put(QueryServices.ROW_KEY_ORDER_SALTED_TABLE_ATTRIB, 
Boolean.toString(false));
+// props.put(QueryServices.ROW_KEY_ORDER_SALTED_TABLE_ATTRIB, 
Boolean.toString(false));
 props.put(QueryServices.QUEUE_SIZE_ATTRIB, Integer.toString(1000));
 setUpTestDriver(getUrl(), new 
ReadOnlyProps(props.entrySet().iterator()));
 }
@@ -109,22 +107,11 @@ public class SkipScanAfterManualSplitIT extends 
BaseHBaseManagedTimeIT {
 conn.close();
 }
 
-private static void traceRegionBoundaries(ConnectionQueryServices 
services) throws Exception {
-List boundaries = Lists.newArrayList();
-List regions = 
services.getAllTableRegions(TABLE_NAME_BYTES);
-for (HRegionLocation region : regions.subList(1, regions.size())) {
-
boundaries.add(Bytes.toStringBinary(region.getRegionInfo().getStartKey()));
-}
-System.out.println("Region boundaries:\n" + boundaries);
-}
-
-@Ignore
 @Test
 public void testManualSplit() throws Exception {
 initTable();
 Connection conn = DriverManager.getConnection(getUrl());
 ConnectionQueryServices services = 
conn.unwrap(PhoenixConnection.class).getQueryServices();
-traceRegionBoundaries(services);
 int nRegions = services.getAllTableRegions(TABLE_NAME_BYTES).size();
 int nInitialRegions = nRegions;
 HBaseAdmin admin = services.getAdmin();
@@ -144,7 +131,6 @@ public class SkipScanAfterManualSplitIT extends 
BaseHBaseManagedTimeIT {
 String query = "SELECT /*+ NO_INTRA_REGION_PARALLELIZATION */ 
count(*) FROM S WHERE a IN ('tl','jt')";
 ResultSet rs1 = conn.createStatement().executeQuery(qu