git commit: PHOENIX-1112: Atomically rebuild index partially when index update fails

2014-07-30 Thread jeffreyz 
Repository: phoenix
Updated Branches:
  refs/heads/3.0 0d28d50f5 -> ddf970a38


PHOENIX-1112: Atomically rebuild index partially when index update fails


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

Branch: refs/heads/3.0
Commit: ddf970a38ba0abeff197c68d77e25b8ea11fdd2e
Parents: 0d28d50
Author: Jeffrey Zhong 
Authored: Mon Jul 21 18:32:56 2014 -0700
Committer: Jeffrey Zhong 
Committed: Wed Jul 30 23:12:04 2014 -0700

--
 phoenix-core/pom.xml|  27 ++-
 phoenix-core/src/build/phoenix-core.xml |  53 +
 .../end2end/index/MutableIndexFailureIT.java|  71 --
 .../phoenix/compile/StatementContext.java   |  11 +
 .../coprocessor/MetaDataEndpointImpl.java   |  59 -
 .../coprocessor/MetaDataRegionObserver.java | 224 ++-
 .../apache/phoenix/execute/BasicQueryPlan.java  |  19 +-
 .../org/apache/phoenix/hbase/index/Indexer.java |   2 +-
 .../index/PhoenixIndexFailurePolicy.java|  32 ++-
 .../phoenix/jdbc/PhoenixDatabaseMetaData.java   |   3 +
 .../phoenix/mapreduce/CsvBulkLoadTool.java  |   2 +-
 .../query/ConnectionQueryServicesImpl.java  |  13 +-
 .../apache/phoenix/query/QueryConstants.java|   5 +-
 .../org/apache/phoenix/query/QueryServices.java |  11 +
 .../phoenix/query/QueryServicesOptions.java |   3 +
 .../apache/phoenix/schema/MetaDataClient.java   |  59 -
 .../org/apache/phoenix/schema/TableRef.java |  23 +-
 .../org/apache/phoenix/util/MetaDataUtil.java   |  52 +
 18 files changed, 593 insertions(+), 76 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/ddf970a3/phoenix-core/pom.xml
--
diff --git a/phoenix-core/pom.xml b/phoenix-core/pom.xml
index e7ff08e..19ffd09 100644
--- a/phoenix-core/pom.xml
+++ b/phoenix-core/pom.xml
@@ -168,9 +168,30 @@
   
 
 maven-assembly-plugin
-
-  true
-
+
+  
+core
+package
+
+  single
+
+
+  false
+  phoenix
+  
+true
+
+  true
+  
true
+  
true
+
+  
+  
+src/build/phoenix-core.xml
+  
+
+  
+  
   
   
 org.apache.maven.plugins

http://git-wip-us.apache.org/repos/asf/phoenix/blob/ddf970a3/phoenix-core/src/build/phoenix-core.xml
--
diff --git a/phoenix-core/src/build/phoenix-core.xml 
b/phoenix-core/src/build/phoenix-core.xml
new file mode 100644
index 000..7b8df1e
--- /dev/null
+++ b/phoenix-core/src/build/phoenix-core.xml
@@ -0,0 +1,53 @@
+
+
+
+http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0";
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+  
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0
 http://maven.apache.org/xsd/assembly-1.1.0.xsd";>
+  core-${parent.version}
+  
+  
+jar
+  
+  false
+  
+  
+
+  
+  true
+  
+  /
+  
+org.antlr:antlr-runtime
+  
+
+
+
+  /
+  true
+  
+org.apache.phoenix:phoenix-core*
+  
+
+  
+

http://git-wip-us.apache.org/repos/asf/phoenix/blob/ddf970a3/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/MutableIndexFailureIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/MutableIndexFailureIT.java
 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/MutableIndexFailureIT.java
index 0601c2b..bd9ec52 100644
--- 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/MutableIndexFailureIT.java
+++ 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/MutableIndexFailureIT.java
@@ -26,7 +26,6 @@ import static 
org.apache.phoenix.util.TestUtil.TEST_PROPERTIES;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
 
 import java.sql.Connection;
 import java.sql.PreparedStatement;
@@ -37,13 +36,13 @@ import java.util.Properties;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.hbase.HBaseConfiguration;
 import org.apache.hadoop.hbase.HBaseTestingUtility;
+import org.apache.hadoop.hbase.HTableDescriptor;
 import org.apache.hadoop.hbase.TableNotFoundException;

Apache-Phoenix | 3.0 | Hadoop1 | Build Successful

2014-07-30 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
[mujtaba] PHOENIX-1132 Merge jars required on server side

Apache-Phoenix | Master | Hadoop1 | Build Successful

2014-07-30 Thread Apache Jenkins Server 
Master branch build status Successful
Source repository https://git-wip-us.apache.org/repos/asf/incubator-phoenix.git

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

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

Changes
[jeffreyz] Phoenix-950: Improve Secondary Index Update Failure Handling - addendum

[mujtaba] PHOENIX-1132 Merge jars required on server side

Apache-Phoenix | 4.0 | Hadoop1 | Build Successful

2014-07-30 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
[jeffreyz] Phoenix-950: Improve Secondary Index Update Failure Handling

[jeffreyz] Phoenix-950: Improve Secondary Index Update Failure Handling - addendum

git commit: PHOENIX-1132 Merge jars required on server side

2014-07-30 Thread mujtaba 
Repository: phoenix
Updated Branches:
  refs/heads/3.0 9eb935cdf -> 0d28d50f5


PHOENIX-1132 Merge jars required on server side


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

Branch: refs/heads/3.0
Commit: 0d28d50f5fad1d7da4136ccbd9d624d51fa29569
Parents: 9eb935c
Author: Mujtaba 
Authored: Wed Jul 30 16:19:56 2014 -0700
Committer: Mujtaba 
Committed: Wed Jul 30 16:19:56 2014 -0700

--
 phoenix-assembly/pom.xml  |  2 ++
 phoenix-assembly/src/build/server.xml | 42 ++
 2 files changed, 44 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/0d28d50f/phoenix-assembly/pom.xml
--
diff --git a/phoenix-assembly/pom.xml b/phoenix-assembly/pom.xml
index a1ddfdd..26131a2 100644
--- a/phoenix-assembly/pom.xml
+++ b/phoenix-assembly/pom.xml
@@ -91,6 +91,8 @@
 src/build/client-without-hbase.xml

 src/build/client-minimal.xml
+   
+src/build/server.xml
   
 
   

http://git-wip-us.apache.org/repos/asf/phoenix/blob/0d28d50f/phoenix-assembly/src/build/server.xml
--
diff --git a/phoenix-assembly/src/build/server.xml 
b/phoenix-assembly/src/build/server.xml
new file mode 100644
index 000..3329975
--- /dev/null
+++ b/phoenix-assembly/src/build/server.xml
@@ -0,0 +1,42 @@
+
+
+
+http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0";
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+  
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0
 http://maven.apache.org/xsd/assembly-1.1.0.xsd";>
+  
+  server
+  
+jar
+  
+  false
+  
+
+  /
+  true
+  
+org.apache.phoenix:phoenix-core
+org.apache.phoenix:phoenix-hadoop*
+  
+
+  
+

git commit: PHOENIX-1132 Merge jars required on server side

2014-07-30 Thread mujtaba 
Repository: phoenix
Updated Branches:
  refs/heads/master a8113ac0d -> e463a22cb


PHOENIX-1132 Merge jars required on server side


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

Branch: refs/heads/master
Commit: e463a22cba2ae22a44bec3f7c3f2fb7ca89dd8b9
Parents: a8113ac
Author: Mujtaba 
Authored: Wed Jul 30 16:19:00 2014 -0700
Committer: Mujtaba 
Committed: Wed Jul 30 16:19:00 2014 -0700

--
 phoenix-assembly/pom.xml  |  2 ++
 phoenix-assembly/src/build/server.xml | 42 ++
 2 files changed, 44 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/e463a22c/phoenix-assembly/pom.xml
--
diff --git a/phoenix-assembly/pom.xml b/phoenix-assembly/pom.xml
index ac9949a..d8bd2d2 100644
--- a/phoenix-assembly/pom.xml
+++ b/phoenix-assembly/pom.xml
@@ -107,6 +107,8 @@
 src/build/client-without-hbase.xml

 src/build/client-minimal.xml
+   
+src/build/server.xml
   
 
   

http://git-wip-us.apache.org/repos/asf/phoenix/blob/e463a22c/phoenix-assembly/src/build/server.xml
--
diff --git a/phoenix-assembly/src/build/server.xml 
b/phoenix-assembly/src/build/server.xml
new file mode 100644
index 000..3329975
--- /dev/null
+++ b/phoenix-assembly/src/build/server.xml
@@ -0,0 +1,42 @@
+
+
+
+http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0";
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+  
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0
 http://maven.apache.org/xsd/assembly-1.1.0.xsd";>
+  
+  server
+  
+jar
+  
+  false
+  
+
+  /
+  true
+  
+org.apache.phoenix:phoenix-core
+org.apache.phoenix:phoenix-hadoop*
+  
+
+  
+

Apache-Phoenix | Master | Hadoop1 | Build Successful

2014-07-30 Thread Apache Jenkins Server 
Master branch build status Successful
Source repository https://git-wip-us.apache.org/repos/asf/incubator-phoenix.git

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

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

Changes
[jtaylor] PHOENIX-1133 Skip scan intersect method not reseting state correctly

[jeffreyz] Phoenix-950: Improve Secondary Index Update Failure Handling

git commit: Phoenix-950: Improve Secondary Index Update Failure Handling - addendum

2014-07-30 Thread jeffreyz 
Repository: phoenix
Updated Branches:
  refs/heads/4.0 b39e678a4 -> 00216d46c


Phoenix-950: Improve Secondary Index Update Failure Handling - addendum


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

Branch: refs/heads/4.0
Commit: 00216d46c189b8cf8b2e33607da196276e613ed6
Parents: b39e678
Author: Jeffrey Zhong 
Authored: Wed Jul 30 16:00:32 2014 -0700
Committer: Jeffrey Zhong 
Committed: Wed Jul 30 16:02:00 2014 -0700

--
 pom.xml | 5 +
 1 file changed, 5 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/00216d46/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 1cd3b48..cacf5a0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -695,6 +695,11 @@
   
   
 org.apache.hbase
+hbase-common
+${hbase-hadoop2.version}
+  
+  
+org.apache.hbase
 hbase-client
 ${hbase-hadoop2.version}

git commit: Phoenix-950: Improve Secondary Index Update Failure Handling - addendum

2014-07-30 Thread jeffreyz 
Repository: phoenix
Updated Branches:
  refs/heads/master 3d69fa211 -> a8113ac0d


Phoenix-950: Improve Secondary Index Update Failure Handling - addendum


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

Branch: refs/heads/master
Commit: a8113ac0def2ef7d76af35afab509dc6ce6b624d
Parents: 3d69fa2
Author: Jeffrey Zhong 
Authored: Wed Jul 30 16:00:32 2014 -0700
Committer: Jeffrey Zhong 
Committed: Wed Jul 30 16:00:32 2014 -0700

--
 pom.xml | 5 +
 1 file changed, 5 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/a8113ac0/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 4612d70..f8843af 100644
--- a/pom.xml
+++ b/pom.xml
@@ -695,6 +695,11 @@
   
   
 org.apache.hbase
+hbase-common
+${hbase-hadoop2.version}
+  
+  
+org.apache.hbase
 hbase-client
 ${hbase-hadoop2.version}

git commit: Phoenix-950: Improve Secondary Index Update Failure Handling

2014-07-30 Thread jeffreyz 
Repository: phoenix
Updated Branches:
  refs/heads/4.0 ac02df9b6 -> b39e678a4


Phoenix-950: Improve Secondary Index Update Failure Handling


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

Branch: refs/heads/4.0
Commit: b39e678a485ab4d0db186f76cdff7dd458254123
Parents: ac02df9
Author: Jeffrey Zhong 
Authored: Mon Jul 21 18:32:56 2014 -0700
Committer: Jeffrey Zhong 
Committed: Wed Jul 30 15:17:41 2014 -0700

--
 phoenix-core/pom.xml|  27 ++-
 phoenix-core/src/build/phoenix-core.xml |  53 +
 .../end2end/index/MutableIndexFailureIT.java|  71 --
 .../phoenix/compile/StatementContext.java   |  11 +
 .../coprocessor/MetaDataEndpointImpl.java   |  66 --
 .../coprocessor/MetaDataRegionObserver.java | 224 ++-
 .../apache/phoenix/execute/BasicQueryPlan.java  |  18 +-
 .../org/apache/phoenix/hbase/index/Indexer.java |   2 +-
 .../index/PhoenixIndexFailurePolicy.java|  28 ++-
 .../phoenix/jdbc/PhoenixDatabaseMetaData.java   |   3 +
 .../phoenix/mapreduce/CsvBulkLoadTool.java  |   2 +-
 .../query/ConnectionQueryServicesImpl.java  |  13 +-
 .../apache/phoenix/query/QueryConstants.java|   4 +-
 .../org/apache/phoenix/query/QueryServices.java |  11 +
 .../phoenix/query/QueryServicesOptions.java |   3 +
 .../apache/phoenix/schema/MetaDataClient.java   |  71 +-
 .../org/apache/phoenix/schema/TableRef.java |  23 +-
 .../org/apache/phoenix/util/MetaDataUtil.java   |  67 ++
 pom.xml |   5 -
 19 files changed, 615 insertions(+), 87 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/b39e678a/phoenix-core/pom.xml
--
diff --git a/phoenix-core/pom.xml b/phoenix-core/pom.xml
index 48e7fc2..31c0a7f 100644
--- a/phoenix-core/pom.xml
+++ b/phoenix-core/pom.xml
@@ -168,9 +168,30 @@
   
 
 maven-assembly-plugin
-
-  true
-
+
+  
+core
+package
+
+  single
+
+
+  false
+  phoenix
+  
+true
+
+  true
+  
true
+  
true
+
+  
+  
+src/build/phoenix-core.xml
+  
+
+  
+  
   
   
 org.apache.maven.plugins

http://git-wip-us.apache.org/repos/asf/phoenix/blob/b39e678a/phoenix-core/src/build/phoenix-core.xml
--
diff --git a/phoenix-core/src/build/phoenix-core.xml 
b/phoenix-core/src/build/phoenix-core.xml
new file mode 100644
index 000..7b8df1e
--- /dev/null
+++ b/phoenix-core/src/build/phoenix-core.xml
@@ -0,0 +1,53 @@
+
+
+
+http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0";
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+  
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0
 http://maven.apache.org/xsd/assembly-1.1.0.xsd";>
+  core-${parent.version}
+  
+  
+jar
+  
+  false
+  
+  
+
+  
+  true
+  
+  /
+  
+org.antlr:antlr-runtime
+  
+
+
+
+  /
+  true
+  
+org.apache.phoenix:phoenix-core*
+  
+
+  
+

http://git-wip-us.apache.org/repos/asf/phoenix/blob/b39e678a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/MutableIndexFailureIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/MutableIndexFailureIT.java
 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/MutableIndexFailureIT.java
index 0601c2b..47e62d3 100644
--- 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/MutableIndexFailureIT.java
+++ 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/MutableIndexFailureIT.java
@@ -26,7 +26,6 @@ import static 
org.apache.phoenix.util.TestUtil.TEST_PROPERTIES;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
 
 import java.sql.Connection;
 import java.sql.PreparedStatement;
@@ -37,13 +36,13 @@ import java.util.Properties;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.hbase.HBaseConfiguration;
 import org.apache.hadoop.hbase.HBaseTestingUtility;
+import org.apache.hadoop.hbase.HTableDescriptor;
+import o

git commit: Phoenix-950: Improve Secondary Index Update Failure Handling

2014-07-30 Thread jeffreyz 
Repository: phoenix
Updated Branches:
  refs/heads/master 63648fa5b -> 3d69fa211


Phoenix-950: Improve Secondary Index Update Failure Handling


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

Branch: refs/heads/master
Commit: 3d69fa21123d182577a58bbc517d40ea9dc5a2cd
Parents: 63648fa
Author: Jeffrey Zhong 
Authored: Mon Jul 21 18:32:56 2014 -0700
Committer: Jeffrey Zhong 
Committed: Wed Jul 30 14:21:49 2014 -0700

--
 phoenix-core/pom.xml|  27 ++-
 phoenix-core/src/build/phoenix-core.xml |  53 +
 .../end2end/index/MutableIndexFailureIT.java|  71 --
 .../phoenix/compile/StatementContext.java   |  11 +
 .../coprocessor/MetaDataEndpointImpl.java   |  66 --
 .../coprocessor/MetaDataRegionObserver.java | 224 ++-
 .../apache/phoenix/execute/BasicQueryPlan.java  |  18 +-
 .../org/apache/phoenix/hbase/index/Indexer.java |   2 +-
 .../index/PhoenixIndexFailurePolicy.java|  28 ++-
 .../phoenix/jdbc/PhoenixDatabaseMetaData.java   |   3 +
 .../phoenix/mapreduce/CsvBulkLoadTool.java  |   2 +-
 .../query/ConnectionQueryServicesImpl.java  |  13 +-
 .../apache/phoenix/query/QueryConstants.java|   4 +-
 .../org/apache/phoenix/query/QueryServices.java |  11 +
 .../phoenix/query/QueryServicesOptions.java |   3 +
 .../apache/phoenix/schema/MetaDataClient.java   |  71 +-
 .../org/apache/phoenix/schema/TableRef.java |  23 +-
 .../org/apache/phoenix/util/MetaDataUtil.java   |  67 ++
 pom.xml |   5 -
 19 files changed, 615 insertions(+), 87 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/3d69fa21/phoenix-core/pom.xml
--
diff --git a/phoenix-core/pom.xml b/phoenix-core/pom.xml
index 46125b6..73b27bf 100644
--- a/phoenix-core/pom.xml
+++ b/phoenix-core/pom.xml
@@ -168,9 +168,30 @@
   
 
 maven-assembly-plugin
-
-  true
-
+
+  
+core
+package
+
+  single
+
+
+  false
+  phoenix
+  
+true
+
+  true
+  
true
+  
true
+
+  
+  
+src/build/phoenix-core.xml
+  
+
+  
+  
   
   
 org.apache.maven.plugins

http://git-wip-us.apache.org/repos/asf/phoenix/blob/3d69fa21/phoenix-core/src/build/phoenix-core.xml
--
diff --git a/phoenix-core/src/build/phoenix-core.xml 
b/phoenix-core/src/build/phoenix-core.xml
new file mode 100644
index 000..7b8df1e
--- /dev/null
+++ b/phoenix-core/src/build/phoenix-core.xml
@@ -0,0 +1,53 @@
+
+
+
+http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0";
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+  
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0
 http://maven.apache.org/xsd/assembly-1.1.0.xsd";>
+  core-${parent.version}
+  
+  
+jar
+  
+  false
+  
+  
+
+  
+  true
+  
+  /
+  
+org.antlr:antlr-runtime
+  
+
+
+
+  /
+  true
+  
+org.apache.phoenix:phoenix-core*
+  
+
+  
+

http://git-wip-us.apache.org/repos/asf/phoenix/blob/3d69fa21/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/MutableIndexFailureIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/MutableIndexFailureIT.java
 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/MutableIndexFailureIT.java
index 0601c2b..47e62d3 100644
--- 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/MutableIndexFailureIT.java
+++ 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/MutableIndexFailureIT.java
@@ -26,7 +26,6 @@ import static 
org.apache.phoenix.util.TestUtil.TEST_PROPERTIES;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
 
 import java.sql.Connection;
 import java.sql.PreparedStatement;
@@ -37,13 +36,13 @@ import java.util.Properties;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.hbase.HBaseConfiguration;
 import org.apache.hadoop.hbase.HBaseTestingUtility;
+import org.apache.hadoop.hbase.HTableDescriptor;
+im

Apache-Phoenix | 3.0 | Hadoop1 | Build Successful

2014-07-30 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
[mujtaba] Fix apache-rat license warnings

[jtaylor] PHOENIX-1133 Skip scan intersect method not reseting state correctly

Apache-Phoenix | 4.0 | Hadoop1 | Build Successful

2014-07-30 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
[mujtaba] Fix apache-rat license warnings

[jtaylor] PHOENIX-1133 Skip scan intersect method not reseting state correctly

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

2014-07-30 Thread Apache Jenkins Server 
See 

Changes:

[jtaylor] PHOENIX-1133 Skip scan intersect method not reseting state correctly

--
[...truncated 283 lines...]
Tests run: 5, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.337 sec - in 
org.apache.phoenix.util.csv.CsvUpsertExecutorTest
Running org.apache.phoenix.index.IndexMaintainerTest
Tests run: 23, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.397 sec - in 
org.apache.phoenix.index.IndexMaintainerTest
Running org.apache.phoenix.filter.SkipScanFilterTest
Tests run: 13, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.051 sec - in 
org.apache.phoenix.filter.SkipScanFilterTest
Running org.apache.phoenix.filter.SkipScanFilterIntersectTest
Tests run: 17, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.017 sec - in 
org.apache.phoenix.filter.SkipScanFilterIntersectTest
Running org.apache.phoenix.iterate.AggregateResultScannerTest
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.071 sec - in 
org.apache.phoenix.iterate.AggregateResultScannerTest
Running org.apache.phoenix.iterate.ConcatResultIteratorTest
Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.003 sec - in 
org.apache.phoenix.iterate.ConcatResultIteratorTest
Running org.apache.phoenix.iterate.SpoolingResultIteratorTest
Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.089 sec - in 
org.apache.phoenix.iterate.SpoolingResultIteratorTest
Running org.apache.phoenix.iterate.MergeSortResultIteratorTest
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.002 sec - in 
org.apache.phoenix.iterate.MergeSortResultIteratorTest
Running org.apache.phoenix.arithmetic.ArithmeticOperationTest
Tests run: 5, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.008 sec - in 
org.apache.phoenix.arithmetic.ArithmeticOperationTest
Running org.apache.phoenix.schema.RowKeyValueAccessorTest
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.082 sec - in 
org.apache.phoenix.schema.RowKeyValueAccessorTest
Running org.apache.phoenix.schema.SchemaUtilTest
Tests run: 4, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.001 sec - in 
org.apache.phoenix.schema.SchemaUtilTest
Running org.apache.phoenix.schema.PDataTypeTest
Tests run: 23, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.022 sec - in 
org.apache.phoenix.schema.PDataTypeTest
Running org.apache.phoenix.schema.SortOrderTest
Tests run: 8, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.004 sec - in 
org.apache.phoenix.schema.SortOrderTest
Running org.apache.phoenix.schema.ValueBitSetTest
Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.003 sec - in 
org.apache.phoenix.schema.ValueBitSetTest
Running org.apache.phoenix.schema.PDataTypeForArraysTest
Tests run: 60, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.023 sec - in 
org.apache.phoenix.schema.PDataTypeForArraysTest
Running org.apache.phoenix.schema.RowKeySchemaTest
Tests run: 6, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.076 sec - in 
org.apache.phoenix.schema.RowKeySchemaTest
Running org.apache.phoenix.schema.PMetaDataImplTest
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.002 sec - in 
org.apache.phoenix.schema.PMetaDataImplTest
Running org.apache.phoenix.hbase.index.covered.TestCoveredColumns
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.001 sec - in 
org.apache.phoenix.hbase.index.covered.TestCoveredColumns
Running org.apache.phoenix.hbase.index.covered.data.TestIndexMemStore
Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.008 sec - in 
org.apache.phoenix.hbase.index.covered.data.TestIndexMemStore
Running org.apache.phoenix.hbase.index.covered.TestLocalTableState
Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.168 sec - in 
org.apache.phoenix.hbase.index.covered.TestLocalTableState
Running org.apache.phoenix.hbase.index.covered.filter.TestFamilyOnlyFilter
Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.003 sec - in 
org.apache.phoenix.hbase.index.covered.filter.TestFamilyOnlyFilter
Running 
org.apache.phoenix.hbase.index.covered.filter.TestApplyAndFilterDeletesFilter
Tests run: 6, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.004 sec - in 
org.apache.phoenix.hbase.index.covered.filter.TestApplyAndFilterDeletesFilter
Running org.apache.phoenix.hbase.index.covered.filter.TestNewerTimestampFilter
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.001 sec - in 
org.apache.phoenix.hbase.index.covered.filter.TestNewerTimestampFilter
Running org.apache.phoenix.hbase.index.covered.update.TestIndexUpdateManager
Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.205 sec - in 
org.apache.phoenix.hbase.index.covered.update.TestIndexUpdateManager
Running 
org.apache.phoenix.hbase.index.covered.example.TestCoveredColumnIndexCodec
Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.009

git commit: PHOENIX-1133 Skip scan intersect method not reseting state correctly

2014-07-30 Thread jamestaylor 
Repository: phoenix
Updated Branches:
  refs/heads/master 241bb3b44 -> 63648fa5b


PHOENIX-1133 Skip scan intersect method not reseting state correctly


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

Branch: refs/heads/master
Commit: 63648fa5b5c6d1e8a0d41aa4c20f4f3c4dbd9ecc
Parents: 241bb3b
Author: James Taylor 
Authored: Wed Jul 30 11:44:42 2014 -0700
Committer: James Taylor 
Committed: Wed Jul 30 12:34:58 2014 -0700

--
 .../main/java/org/apache/phoenix/filter/SkipScanFilter.java | 9 +++--
 1 file changed, 7 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/63648fa5/phoenix-core/src/main/java/org/apache/phoenix/filter/SkipScanFilter.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/filter/SkipScanFilter.java 
b/phoenix-core/src/main/java/org/apache/phoenix/filter/SkipScanFilter.java
index 13113c8..5cee0d7 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/filter/SkipScanFilter.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/filter/SkipScanFilter.java
@@ -156,10 +156,15 @@ public class SkipScanFilter extends FilterBase implements 
Writable {
 return true;
 }
 
+private void resetState() {
+isDone = false;
+endKeyLength = 0;
+Arrays.fill(position, 0);
+}
+
 private boolean intersect(byte[] lowerInclusiveKey, byte[] 
upperExclusiveKey, List> newSlots) {
+resetState();
 boolean lowerUnbound = (lowerInclusiveKey.length == 0);
-Arrays.fill(position, 0);
-isDone = false;
 int startPos = 0;
 int lastSlot = slots.size()-1;
 if (!lowerUnbound) {

git commit: PHOENIX-1133 Skip scan intersect method not reseting state correctly

2014-07-30 Thread jamestaylor 
Repository: phoenix
Updated Branches:
  refs/heads/4.0 b5e6ddcff -> ac02df9b6


PHOENIX-1133 Skip scan intersect method not reseting state correctly


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

Branch: refs/heads/4.0
Commit: ac02df9b689654030504bb285a3baa3f08b986d5
Parents: b5e6ddc
Author: James Taylor 
Authored: Wed Jul 30 11:44:42 2014 -0700
Committer: James Taylor 
Committed: Wed Jul 30 12:34:23 2014 -0700

--
 .../main/java/org/apache/phoenix/filter/SkipScanFilter.java | 9 +++--
 1 file changed, 7 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/ac02df9b/phoenix-core/src/main/java/org/apache/phoenix/filter/SkipScanFilter.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/filter/SkipScanFilter.java 
b/phoenix-core/src/main/java/org/apache/phoenix/filter/SkipScanFilter.java
index 13113c8..5cee0d7 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/filter/SkipScanFilter.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/filter/SkipScanFilter.java
@@ -156,10 +156,15 @@ public class SkipScanFilter extends FilterBase implements 
Writable {
 return true;
 }
 
+private void resetState() {
+isDone = false;
+endKeyLength = 0;
+Arrays.fill(position, 0);
+}
+
 private boolean intersect(byte[] lowerInclusiveKey, byte[] 
upperExclusiveKey, List> newSlots) {
+resetState();
 boolean lowerUnbound = (lowerInclusiveKey.length == 0);
-Arrays.fill(position, 0);
-isDone = false;
 int startPos = 0;
 int lastSlot = slots.size()-1;
 if (!lowerUnbound) {

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

2014-07-30 Thread jamestaylor 
Merge branch '3.0' of https://git-wip-us.apache.org/repos/asf/phoenix into 3.0


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

Branch: refs/heads/3.0
Commit: 9eb935cdf22995bbdb8f26f919fb01bbc5a73e0f
Parents: 8cde1d1 a16ef59
Author: James Taylor 
Authored: Wed Jul 30 12:22:34 2014 -0700
Committer: James Taylor 
Committed: Wed Jul 30 12:22:34 2014 -0700

--
 .../org/apache/phoenix/end2end/InListIT.java | 19 ++-
 1 file changed, 18 insertions(+), 1 deletion(-)
--

[1/2] git commit: PHOENIX-1133 Skip scan intersect method not reseting state correctly

2014-07-30 Thread jamestaylor 
Repository: phoenix
Updated Branches:
  refs/heads/3.0 a16ef59c1 -> 9eb935cdf


PHOENIX-1133 Skip scan intersect method not reseting state correctly


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

Branch: refs/heads/3.0
Commit: 8cde1d173b5b1a6e02d3c6e9caaae9d8ffcb4f28
Parents: 2f557ab
Author: James Taylor 
Authored: Wed Jul 30 11:44:42 2014 -0700
Committer: James Taylor 
Committed: Wed Jul 30 11:44:42 2014 -0700

--
 .../src/main/java/org/apache/phoenix/execute/ScanPlan.java  | 6 +++---
 .../main/java/org/apache/phoenix/filter/SkipScanFilter.java | 9 +++--
 2 files changed, 10 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/8cde1d17/phoenix-core/src/main/java/org/apache/phoenix/execute/ScanPlan.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/execute/ScanPlan.java 
b/phoenix-core/src/main/java/org/apache/phoenix/execute/ScanPlan.java
index a994067..03deca7 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/execute/ScanPlan.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/execute/ScanPlan.java
@@ -18,6 +18,9 @@
 package org.apache.phoenix.execute;
 
 
+import java.sql.SQLException;
+import java.util.List;
+
 import org.apache.phoenix.compile.GroupByCompiler.GroupBy;
 import org.apache.phoenix.compile.OrderByCompiler.OrderBy;
 import org.apache.phoenix.compile.RowProjector;
@@ -44,9 +47,6 @@ import org.apache.phoenix.schema.SaltingUtil;
 import org.apache.phoenix.schema.TableRef;
 import org.apache.phoenix.util.ScanUtil;
 
-import java.sql.SQLException;
-import java.util.List;
-
 
 
 /**

http://git-wip-us.apache.org/repos/asf/phoenix/blob/8cde1d17/phoenix-core/src/main/java/org/apache/phoenix/filter/SkipScanFilter.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/filter/SkipScanFilter.java 
b/phoenix-core/src/main/java/org/apache/phoenix/filter/SkipScanFilter.java
index 3245bc5..e3b8d22 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/filter/SkipScanFilter.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/filter/SkipScanFilter.java
@@ -147,10 +147,15 @@ public class SkipScanFilter extends FilterBase {
 return true;
 }
 
+private void resetState() {
+isDone = false;
+endKeyLength = 0;
+Arrays.fill(position, 0);
+}
+
 private boolean intersect(byte[] lowerInclusiveKey, byte[] 
upperExclusiveKey, List> newSlots) {
+resetState();
 boolean lowerUnbound = (lowerInclusiveKey.length == 0);
-Arrays.fill(position, 0);
-isDone = false;
 int startPos = 0;
 int lastSlot = slots.size()-1;
 if (!lowerUnbound) {

git commit: Fix apache-rat license warnings

2014-07-30 Thread mujtaba 
Repository: phoenix
Updated Branches:
  refs/heads/3.0 2f557ab5f -> a16ef59c1


Fix apache-rat license warnings


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

Branch: refs/heads/3.0
Commit: a16ef59c10d69245cb4397fc5cf83cd1183a443f
Parents: 2f557ab
Author: Mujtaba 
Authored: Wed Jul 30 11:43:07 2014 -0700
Committer: Mujtaba 
Committed: Wed Jul 30 11:43:07 2014 -0700

--
 .../org/apache/phoenix/end2end/InListIT.java | 19 ++-
 1 file changed, 18 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/a16ef59c/phoenix-core/src/it/java/org/apache/phoenix/end2end/InListIT.java
--
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/InListIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/InListIT.java
index c257ccb..524d494 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/InListIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/InListIT.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.apache.phoenix.end2end;
 
 import static java.util.Collections.singletonList;
@@ -404,4 +421,4 @@ public class InListIT extends BaseHBaseManagedTimeIT {
 
 testWithIntegerTypesWithVariedSaltingAndTenancy(DEFAULT_UPSERT_BODIES, 
whereClause, expecteds);
 }
-}
\ No newline at end of file
+}

git commit: Fix apache-rat license warnings

2014-07-30 Thread mujtaba 
Repository: phoenix
Updated Branches:
  refs/heads/4.0 32a4d4c2f -> b5e6ddcff


Fix apache-rat license warnings


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

Branch: refs/heads/4.0
Commit: b5e6ddcff18d438a67d5f82e0da421cc42368d2e
Parents: 32a4d4c
Author: Mujtaba 
Authored: Wed Jul 30 11:42:20 2014 -0700
Committer: Mujtaba 
Committed: Wed Jul 30 11:42:20 2014 -0700

--
 .../org/apache/phoenix/end2end/InListIT.java | 19 ++-
 .../phoenix/schema/LocalIndexDataColumnRef.java  | 17 +
 pom.xml  |  2 ++
 3 files changed, 37 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/b5e6ddcf/phoenix-core/src/it/java/org/apache/phoenix/end2end/InListIT.java
--
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/InListIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/InListIT.java
index c257ccb..524d494 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/InListIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/InListIT.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.apache.phoenix.end2end;
 
 import static java.util.Collections.singletonList;
@@ -404,4 +421,4 @@ public class InListIT extends BaseHBaseManagedTimeIT {
 
 testWithIntegerTypesWithVariedSaltingAndTenancy(DEFAULT_UPSERT_BODIES, 
whereClause, expecteds);
 }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/phoenix/blob/b5e6ddcf/phoenix-core/src/main/java/org/apache/phoenix/schema/LocalIndexDataColumnRef.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/schema/LocalIndexDataColumnRef.java
 
b/phoenix-core/src/main/java/org/apache/phoenix/schema/LocalIndexDataColumnRef.java
index 16fe1a5..362d59f 100644
--- 
a/phoenix-core/src/main/java/org/apache/phoenix/schema/LocalIndexDataColumnRef.java
+++ 
b/phoenix-core/src/main/java/org/apache/phoenix/schema/LocalIndexDataColumnRef.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.apache.phoenix.schema;
 
 import java.sql.SQLException;

http://git-wip-us.apache.org/repos/asf/phoenix/blob/b5e6ddcf/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 77765cc..5642ad6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -182,6 +182,8 @@
   dev/release_files/**
   **/target/**
   **/resources/*.Driver
+  **/META-INF/**
+  **/*.properties
   **/*.versionsBackup
   
   docs/**

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

2014-07-30 Thread Apache Jenkins Server 
See

Apache-Phoenix | 3.0 | Hadoop1 | Build Successful

2014-07-30 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] Remove unused imports

git commit: Remove unused imports

2014-07-30 Thread jamestaylor 
Repository: phoenix
Updated Branches:
  refs/heads/3.0 2fb39574a -> 2f557ab5f


Remove unused imports


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

Branch: refs/heads/3.0
Commit: 2f557ab5fdba790d54104fd6b2ddca22f2566025
Parents: 2fb3957
Author: James Taylor 
Authored: Wed Jul 30 09:05:03 2014 -0700
Committer: James Taylor 
Committed: Wed Jul 30 09:05:03 2014 -0700

--
 .../org/apache/phoenix/coprocessor/SequenceRegionObserver.java | 6 --
 .../apache/phoenix/query/ConnectionlessQueryServicesImpl.java  | 3 ---
 2 files changed, 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/2f557ab5/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/SequenceRegionObserver.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/SequenceRegionObserver.java
 
b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/SequenceRegionObserver.java
index 944c4e6..a29102a 100644
--- 
a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/SequenceRegionObserver.java
+++ 
b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/SequenceRegionObserver.java
@@ -19,12 +19,10 @@
 package org.apache.phoenix.coprocessor;
 
 import java.io.IOException;
-import java.sql.SQLException;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.NavigableMap;
-import java.util.Set;
 
 import org.apache.hadoop.hbase.HConstants;
 import org.apache.hadoop.hbase.KeyValue;
@@ -54,10 +52,6 @@ import org.apache.phoenix.util.KeyValueUtil;
 import org.apache.phoenix.util.MetaDataUtil;
 import org.apache.phoenix.util.SequenceUtil;
 import org.apache.phoenix.util.ServerUtil;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.google.common.collect.Lists;
 
 /**
  * 

http://git-wip-us.apache.org/repos/asf/phoenix/blob/2f557ab5/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionlessQueryServicesImpl.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionlessQueryServicesImpl.java
 
b/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionlessQueryServicesImpl.java
index ee4c577..2c41805 100644
--- 
a/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionlessQueryServicesImpl.java
+++ 
b/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionlessQueryServicesImpl.java
@@ -29,7 +29,6 @@ import org.apache.hadoop.hbase.HConstants;
 import org.apache.hadoop.hbase.HRegionInfo;
 import org.apache.hadoop.hbase.HRegionLocation;
 import org.apache.hadoop.hbase.HTableDescriptor;
-import org.apache.hadoop.hbase.KeyValue;
 import org.apache.hadoop.hbase.client.HBaseAdmin;
 import org.apache.hadoop.hbase.client.HTableInterface;
 import org.apache.hadoop.hbase.client.Mutation;
@@ -50,7 +49,6 @@ import org.apache.phoenix.jdbc.PhoenixDatabaseMetaData;
 import org.apache.phoenix.jdbc.PhoenixEmbeddedDriver.ConnectionInfo;
 import org.apache.phoenix.schema.NewerTableAlreadyExistsException;
 import org.apache.phoenix.schema.PColumn;
-import org.apache.phoenix.schema.PDataType;
 import org.apache.phoenix.schema.PIndexState;
 import org.apache.phoenix.schema.PMetaData;
 import org.apache.phoenix.schema.PMetaDataImpl;
@@ -65,7 +63,6 @@ import 
org.apache.phoenix.schema.SequenceAlreadyExistsException;
 import org.apache.phoenix.schema.SequenceInfo;
 import org.apache.phoenix.schema.SequenceKey;
 import org.apache.phoenix.schema.SequenceNotFoundException;
-import org.apache.phoenix.schema.SortOrder;
 import org.apache.phoenix.schema.TableAlreadyExistsException;
 import org.apache.phoenix.schema.TableNotFoundException;
 import org.apache.phoenix.schema.TableRef;

Apache-Phoenix | 3.0 | Hadoop1 | Build Successful

2014-07-30 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-1130 SkipScanFilter gets IndexOutOfBoundsException when intersecting salted tables (Kyle Buzsaki)

[jtaylor] PHOENIX-1131 PhoenixRuntime.encodePk needs to pad row key values to max column length (Samarth Jain)

[jtaylor] PHOENIX-1131 Fix NPE in PhoenixRuntime.encodePk padding of row key values to max column length

[jtaylor] PHOENIX-981 Joins using Phoenix client on v.3.0.0 and server 3.0 head of branch fails on backward compatibility

Apache-Phoenix | Master | Hadoop1 | Build Successful

2014-07-30 Thread Apache Jenkins Server 
Master branch build status Successful
Source repository https://git-wip-us.apache.org/repos/asf/incubator-phoenix.git

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

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

Changes
[jtaylor] PHOENIX-981 Joins using Phoenix client on v.3.0.0 and server 3.0 head of branch fails on backward compatibility

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

2014-07-30 Thread Apache Jenkins Server 
See 

Changes:

[jtaylor] PHOENIX-981 Joins using Phoenix client on v.3.0.0 and server 3.0 head 
of branch fails on backward compatibility

--
[...truncated 282 lines...]
Running org.apache.phoenix.trace.TraceReaderTest
Tests run: 5, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.407 sec - in 
org.apache.phoenix.util.csv.CsvUpsertExecutorTest
Running org.apache.phoenix.index.IndexMaintainerTest
Tests run: 23, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.496 sec - in 
org.apache.phoenix.index.IndexMaintainerTest
Running org.apache.phoenix.filter.SkipScanFilterTest
Tests run: 13, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.061 sec - in 
org.apache.phoenix.filter.SkipScanFilterTest
Running org.apache.phoenix.filter.SkipScanFilterIntersectTest
Tests run: 17, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.022 sec - in 
org.apache.phoenix.filter.SkipScanFilterIntersectTest
Running org.apache.phoenix.iterate.AggregateResultScannerTest
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.104 sec - in 
org.apache.phoenix.iterate.AggregateResultScannerTest
Running org.apache.phoenix.iterate.ConcatResultIteratorTest
Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.002 sec - in 
org.apache.phoenix.iterate.ConcatResultIteratorTest
Running org.apache.phoenix.iterate.SpoolingResultIteratorTest
Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.09 sec - in 
org.apache.phoenix.iterate.SpoolingResultIteratorTest
Running org.apache.phoenix.iterate.MergeSortResultIteratorTest
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.002 sec - in 
org.apache.phoenix.iterate.MergeSortResultIteratorTest
Running org.apache.phoenix.arithmetic.ArithmeticOperationTest
Tests run: 5, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.008 sec - in 
org.apache.phoenix.arithmetic.ArithmeticOperationTest
Running org.apache.phoenix.schema.RowKeyValueAccessorTest
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.096 sec - in 
org.apache.phoenix.schema.RowKeyValueAccessorTest
Running org.apache.phoenix.schema.SchemaUtilTest
Tests run: 4, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.002 sec - in 
org.apache.phoenix.schema.SchemaUtilTest
Running org.apache.phoenix.schema.PDataTypeTest
Tests run: 23, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.022 sec - in 
org.apache.phoenix.schema.PDataTypeTest
Running org.apache.phoenix.schema.SortOrderTest
Tests run: 8, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.004 sec - in 
org.apache.phoenix.schema.SortOrderTest
Running org.apache.phoenix.schema.ValueBitSetTest
Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.004 sec - in 
org.apache.phoenix.schema.ValueBitSetTest
Running org.apache.phoenix.schema.PDataTypeForArraysTest
Tests run: 60, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.033 sec - in 
org.apache.phoenix.schema.PDataTypeForArraysTest
Running org.apache.phoenix.schema.RowKeySchemaTest
Tests run: 6, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.08 sec - in 
org.apache.phoenix.schema.RowKeySchemaTest
Running org.apache.phoenix.schema.PMetaDataImplTest
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.003 sec - in 
org.apache.phoenix.schema.PMetaDataImplTest
Running org.apache.phoenix.hbase.index.covered.TestCoveredColumns
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.001 sec - in 
org.apache.phoenix.hbase.index.covered.TestCoveredColumns
Running org.apache.phoenix.hbase.index.covered.data.TestIndexMemStore
Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.008 sec - in 
org.apache.phoenix.hbase.index.covered.data.TestIndexMemStore
Running org.apache.phoenix.hbase.index.covered.TestLocalTableState
Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.14 sec - in 
org.apache.phoenix.hbase.index.covered.TestLocalTableState
Running org.apache.phoenix.hbase.index.covered.filter.TestFamilyOnlyFilter
Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.002 sec - in 
org.apache.phoenix.hbase.index.covered.filter.TestFamilyOnlyFilter
Running 
org.apache.phoenix.hbase.index.covered.filter.TestApplyAndFilterDeletesFilter
Tests run: 6, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.003 sec - in 
org.apache.phoenix.hbase.index.covered.filter.TestApplyAndFilterDeletesFilter
Running org.apache.phoenix.hbase.index.covered.filter.TestNewerTimestampFilter
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.001 sec - in 
org.apache.phoenix.hbase.index.covered.filter.TestNewerTimestampFilter
Running org.apache.phoenix.hbase.index.covered.update.TestIndexUpdateManager
Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.235 sec - in 
org.apache.phoenix.hbase.index.covered.update.TestIndexUpdateManager
Running 
org.apache.phoenix.hbase.index.covered.example.TestCovered

git commit: PHOENIX-981 Joins using Phoenix client on v.3.0.0 and server 3.0 head of branch fails on backward compatibility

2014-07-30 Thread jamestaylor 
Repository: phoenix
Updated Branches:
  refs/heads/master dd97d44e7 -> 241bb3b44


PHOENIX-981 Joins using Phoenix client on v.3.0.0 and server 3.0 head of branch 
fails on backward compatibility


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

Branch: refs/heads/master
Commit: 241bb3b44113a41d7c3cc1af12129ad33b26
Parents: dd97d44
Author: James Taylor 
Authored: Wed Jul 30 01:20:26 2014 -0700
Committer: James Taylor 
Committed: Wed Jul 30 01:24:10 2014 -0700

--
 .../org/apache/phoenix/join/HashJoinInfo.java   | 23 +++-
 1 file changed, 18 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/241bb3b4/phoenix-core/src/main/java/org/apache/phoenix/join/HashJoinInfo.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/join/HashJoinInfo.java 
b/phoenix-core/src/main/java/org/apache/phoenix/join/HashJoinInfo.java
index d00e802..ad96061 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/join/HashJoinInfo.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/join/HashJoinInfo.java
@@ -17,21 +17,25 @@
  */
 package org.apache.phoenix.join;
 
-import java.io.*;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.io.EOFException;
+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 
 import org.apache.hadoop.hbase.client.Scan;
 import org.apache.hadoop.io.WritableUtils;
-
 import org.apache.phoenix.expression.Expression;
 import org.apache.phoenix.expression.ExpressionType;
 import org.apache.phoenix.hbase.index.util.ImmutableBytesPtr;
 import org.apache.phoenix.parse.JoinTableNode.JoinType;
 import org.apache.phoenix.schema.KeyValueSchema;
+import org.apache.phoenix.schema.KeyValueSchema.KeyValueSchemaBuilder;
 import org.apache.phoenix.schema.PColumn;
 import org.apache.phoenix.schema.PTable;
-import org.apache.phoenix.schema.KeyValueSchema.KeyValueSchemaBuilder;
 import org.apache.phoenix.util.SchemaUtil;
 
 public class HashJoinInfo {
@@ -211,8 +215,17 @@ public class HashJoinInfo {
 postJoinFilterExpression = 
ExpressionType.values()[expressionOrdinal].newInstance();
 postJoinFilterExpression.readFields(input);
 }
-int limit = WritableUtils.readVInt(input);
-boolean forceProjection = input.readBoolean();
+int limit = -1;
+boolean forceProjection = false;
+// Read these and ignore if we don't find them as they were not
+// present in Apache Phoenix 3.0.0 release. This allows a newer
+// 3.1 server to work with an older 3.0 client without force
+// both to be upgraded in lock step.
+try {
+limit = WritableUtils.readVInt(input);
+forceProjection = input.readBoolean();
+} catch (EOFException ignore) {
+}
 return new HashJoinInfo(joinedSchema, joinIds, joinExpressions, 
joinTypes, earlyEvaluation, schemas, fieldPositions, postJoinFilterExpression, 
limit >= 0 ? limit : null, forceProjection);
 } catch (IOException e) {
 throw new RuntimeException(e);

git commit: PHOENIX-981 Joins using Phoenix client on v.3.0.0 and server 3.0 head of branch fails on backward compatibility

2014-07-30 Thread jamestaylor 
Repository: phoenix
Updated Branches:
  refs/heads/4.0 bafac4166 -> 32a4d4c2f


PHOENIX-981 Joins using Phoenix client on v.3.0.0 and server 3.0 head of branch 
fails on backward compatibility


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

Branch: refs/heads/4.0
Commit: 32a4d4c2f3f5c67ebdfdc94fb5ea935d58a6dc6b
Parents: bafac41
Author: James Taylor 
Authored: Wed Jul 30 01:20:26 2014 -0700
Committer: James Taylor 
Committed: Wed Jul 30 01:21:17 2014 -0700

--
 .../org/apache/phoenix/join/HashJoinInfo.java   | 23 +++-
 1 file changed, 18 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/32a4d4c2/phoenix-core/src/main/java/org/apache/phoenix/join/HashJoinInfo.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/join/HashJoinInfo.java 
b/phoenix-core/src/main/java/org/apache/phoenix/join/HashJoinInfo.java
index d00e802..ad96061 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/join/HashJoinInfo.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/join/HashJoinInfo.java
@@ -17,21 +17,25 @@
  */
 package org.apache.phoenix.join;
 
-import java.io.*;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.io.EOFException;
+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 
 import org.apache.hadoop.hbase.client.Scan;
 import org.apache.hadoop.io.WritableUtils;
-
 import org.apache.phoenix.expression.Expression;
 import org.apache.phoenix.expression.ExpressionType;
 import org.apache.phoenix.hbase.index.util.ImmutableBytesPtr;
 import org.apache.phoenix.parse.JoinTableNode.JoinType;
 import org.apache.phoenix.schema.KeyValueSchema;
+import org.apache.phoenix.schema.KeyValueSchema.KeyValueSchemaBuilder;
 import org.apache.phoenix.schema.PColumn;
 import org.apache.phoenix.schema.PTable;
-import org.apache.phoenix.schema.KeyValueSchema.KeyValueSchemaBuilder;
 import org.apache.phoenix.util.SchemaUtil;
 
 public class HashJoinInfo {
@@ -211,8 +215,17 @@ public class HashJoinInfo {
 postJoinFilterExpression = 
ExpressionType.values()[expressionOrdinal].newInstance();
 postJoinFilterExpression.readFields(input);
 }
-int limit = WritableUtils.readVInt(input);
-boolean forceProjection = input.readBoolean();
+int limit = -1;
+boolean forceProjection = false;
+// Read these and ignore if we don't find them as they were not
+// present in Apache Phoenix 3.0.0 release. This allows a newer
+// 3.1 server to work with an older 3.0 client without force
+// both to be upgraded in lock step.
+try {
+limit = WritableUtils.readVInt(input);
+forceProjection = input.readBoolean();
+} catch (EOFException ignore) {
+}
 return new HashJoinInfo(joinedSchema, joinIds, joinExpressions, 
joinTypes, earlyEvaluation, schemas, fieldPositions, postJoinFilterExpression, 
limit >= 0 ? limit : null, forceProjection);
 } catch (IOException e) {
 throw new RuntimeException(e);

git commit: PHOENIX-981 Joins using Phoenix client on v.3.0.0 and server 3.0 head of branch fails on backward compatibility

2014-07-30 Thread jamestaylor 
Repository: phoenix
Updated Branches:
  refs/heads/3.0 ab785b401 -> 2fb39574a


PHOENIX-981 Joins using Phoenix client on v.3.0.0 and server 3.0 head of branch 
fails on backward compatibility


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

Branch: refs/heads/3.0
Commit: 2fb39574ab80d83028612935c7c86b8906fb7472
Parents: ab785b4
Author: James Taylor 
Authored: Wed Jul 30 01:20:26 2014 -0700
Committer: James Taylor 
Committed: Wed Jul 30 01:20:26 2014 -0700

--
 .../org/apache/phoenix/join/HashJoinInfo.java   | 23 +++-
 1 file changed, 18 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/2fb39574/phoenix-core/src/main/java/org/apache/phoenix/join/HashJoinInfo.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/join/HashJoinInfo.java 
b/phoenix-core/src/main/java/org/apache/phoenix/join/HashJoinInfo.java
index d00e802..ad96061 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/join/HashJoinInfo.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/join/HashJoinInfo.java
@@ -17,21 +17,25 @@
  */
 package org.apache.phoenix.join;
 
-import java.io.*;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.io.EOFException;
+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 
 import org.apache.hadoop.hbase.client.Scan;
 import org.apache.hadoop.io.WritableUtils;
-
 import org.apache.phoenix.expression.Expression;
 import org.apache.phoenix.expression.ExpressionType;
 import org.apache.phoenix.hbase.index.util.ImmutableBytesPtr;
 import org.apache.phoenix.parse.JoinTableNode.JoinType;
 import org.apache.phoenix.schema.KeyValueSchema;
+import org.apache.phoenix.schema.KeyValueSchema.KeyValueSchemaBuilder;
 import org.apache.phoenix.schema.PColumn;
 import org.apache.phoenix.schema.PTable;
-import org.apache.phoenix.schema.KeyValueSchema.KeyValueSchemaBuilder;
 import org.apache.phoenix.util.SchemaUtil;
 
 public class HashJoinInfo {
@@ -211,8 +215,17 @@ public class HashJoinInfo {
 postJoinFilterExpression = 
ExpressionType.values()[expressionOrdinal].newInstance();
 postJoinFilterExpression.readFields(input);
 }
-int limit = WritableUtils.readVInt(input);
-boolean forceProjection = input.readBoolean();
+int limit = -1;
+boolean forceProjection = false;
+// Read these and ignore if we don't find them as they were not
+// present in Apache Phoenix 3.0.0 release. This allows a newer
+// 3.1 server to work with an older 3.0 client without force
+// both to be upgraded in lock step.
+try {
+limit = WritableUtils.readVInt(input);
+forceProjection = input.readBoolean();
+} catch (EOFException ignore) {
+}
 return new HashJoinInfo(joinedSchema, joinIds, joinExpressions, 
joinTypes, earlyEvaluation, schemas, fieldPositions, postJoinFilterExpression, 
limit >= 0 ? limit : null, forceProjection);
 } catch (IOException e) {
 throw new RuntimeException(e);

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

2014-07-30 Thread Apache Jenkins Server 
See

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

2014-07-30 Thread Apache Jenkins Server 
See