You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@phoenix.apache.org by ap...@apache.org on 2014/08/20 21:39:49 UTC

[1/2] git commit: PHOENIX-1184 Phoenix 4.0 will not compile agaist CDH HBase 5.1

Repository: phoenix
Updated Branches:
  refs/heads/4.0.1 70ac68380 -> a169e1ba4 (forced update)


PHOENIX-1184 Phoenix 4.0 will not compile agaist CDH HBase 5.1


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

Branch: refs/heads/4.0.1
Commit: f09f103497d58a5459668dfcca42b6b74d1f4719
Parents: 4d90a49
Author: Andrew Purtell <ap...@apache.org>
Authored: Tue Aug 19 19:38:54 2014 -0700
Committer: Andrew Purtell <ap...@apache.org>
Committed: Wed Aug 20 12:38:45 2014 -0700

----------------------------------------------------------------------
 .../query/ConnectionlessQueryServicesImpl.java      | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/phoenix/blob/f09f1034/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 b616356..74cdf52 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
@@ -19,6 +19,7 @@ package org.apache.phoenix.query;
 
 import static org.apache.phoenix.jdbc.PhoenixDatabaseMetaData.INDEX_STATE_BYTES;
 
+import java.lang.reflect.Constructor;
 import java.sql.SQLException;
 import java.util.Collections;
 import java.util.List;
@@ -138,9 +139,22 @@ public class ConnectionlessQueryServicesImpl extends DelegateQueryServices imple
 
     @Override
     public List<HRegionLocation> getAllTableRegions(byte[] tableName) throws SQLException {
+        // HBase hides the ServerName constructors and provides static valueOf helper methods
+        // for obtaining ServerName objects instead. However some commercial Hadoop distributions
+        // have patched their HBase to remove the valueOf static methods, leaving no common way
+        // to construct ServerNames except by way of reflection.
+        ServerName fakeServerName;
+        try {
+          Constructor<ServerName> c = ServerName.class.getDeclaredConstructor(String.class,
+              int.class, long.class);
+          c.setAccessible(true);
+          fakeServerName = c.newInstance("localhost", HConstants.DEFAULT_REGIONSERVER_PORT, 0L);
+        } catch (Exception e) {
+          throw new SQLException(e);
+        }
         return Collections.singletonList(new HRegionLocation(
             new HRegionInfo(TableName.valueOf(tableName), HConstants.EMPTY_START_ROW, HConstants.EMPTY_END_ROW),
-            	ServerName.valueOf("localhost", HConstants.DEFAULT_REGIONSERVER_PORT,0), -1));
+                fakeServerName, -1));
     }
 
     @Override


[2/2] git commit: Update CHANGES and versions in POM for release 4.0.1

Posted by ap...@apache.org.
Update CHANGES and versions in POM for release 4.0.1


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

Branch: refs/heads/4.0.1
Commit: a169e1ba46cd1200511b9647ec1a932e1abadb0d
Parents: f09f103
Author: Andrew Purtell <ap...@apache.org>
Authored: Wed Aug 20 12:39:27 2014 -0700
Committer: Andrew Purtell <ap...@apache.org>
Committed: Wed Aug 20 12:39:27 2014 -0700

----------------------------------------------------------------------
 CHANGES                        | 5 +++++
 phoenix-assembly/pom.xml       | 2 +-
 phoenix-core/pom.xml           | 2 +-
 phoenix-flume/pom.xml          | 2 +-
 phoenix-hadoop-compat/pom.xml  | 2 +-
 phoenix-hadoop1-compat/pom.xml | 2 +-
 phoenix-hadoop2-compat/pom.xml | 2 +-
 phoenix-pig/pom.xml            | 2 +-
 pom.xml                        | 2 +-
 9 files changed, 13 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/phoenix/blob/a169e1ba/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index 2f18b78..32fa279 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,8 @@
+Release Notes - Phoenix - Version 4.0.1
+
+** Bug
+    * [PHOENIX-1184] - Phoenix 4.0 will not compile agaist CDH HBase 5.1
+
 
 Release Notes - Phoenix - Version 4.0.0-incubating
 

http://git-wip-us.apache.org/repos/asf/phoenix/blob/a169e1ba/phoenix-assembly/pom.xml
----------------------------------------------------------------------
diff --git a/phoenix-assembly/pom.xml b/phoenix-assembly/pom.xml
index f4e6b49..ae9740a 100644
--- a/phoenix-assembly/pom.xml
+++ b/phoenix-assembly/pom.xml
@@ -26,7 +26,7 @@
   <parent>
     <groupId>org.apache.phoenix</groupId>
     <artifactId>phoenix</artifactId>
-    <version>4.0.0-incubating</version>
+    <version>4.0.1</version>
   </parent>
   <artifactId>phoenix-assembly</artifactId>
   <name>Phoenix Assembly</name>

http://git-wip-us.apache.org/repos/asf/phoenix/blob/a169e1ba/phoenix-core/pom.xml
----------------------------------------------------------------------
diff --git a/phoenix-core/pom.xml b/phoenix-core/pom.xml
index 84ed8a0..bfc989d 100644
--- a/phoenix-core/pom.xml
+++ b/phoenix-core/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.apache.phoenix</groupId>
     <artifactId>phoenix</artifactId>
-    <version>4.0.0-incubating</version>
+    <version>4.0.1</version>
   </parent>
   <artifactId>phoenix-core</artifactId>
   <name>Phoenix Core</name>

http://git-wip-us.apache.org/repos/asf/phoenix/blob/a169e1ba/phoenix-flume/pom.xml
----------------------------------------------------------------------
diff --git a/phoenix-flume/pom.xml b/phoenix-flume/pom.xml
index e65470e..ec5b227 100644
--- a/phoenix-flume/pom.xml
+++ b/phoenix-flume/pom.xml
@@ -26,7 +26,7 @@
   <parent>
     <groupId>org.apache.phoenix</groupId>
     <artifactId>phoenix</artifactId>
-    <version>4.0.0-incubating</version>
+    <version>4.0.1</version>
   </parent>
   <artifactId>phoenix-flume</artifactId>
   <name>Phoenix - Flume</name>

http://git-wip-us.apache.org/repos/asf/phoenix/blob/a169e1ba/phoenix-hadoop-compat/pom.xml
----------------------------------------------------------------------
diff --git a/phoenix-hadoop-compat/pom.xml b/phoenix-hadoop-compat/pom.xml
index a4ff347..8949506 100644
--- a/phoenix-hadoop-compat/pom.xml
+++ b/phoenix-hadoop-compat/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.phoenix</groupId>
     <artifactId>phoenix</artifactId>
-    <version>4.0.0-incubating</version>
+    <version>4.0.1</version>
   </parent>
   <artifactId>phoenix-hadoop-compat</artifactId>
   <name>Phoenix Hadoop Compatibility</name>

http://git-wip-us.apache.org/repos/asf/phoenix/blob/a169e1ba/phoenix-hadoop1-compat/pom.xml
----------------------------------------------------------------------
diff --git a/phoenix-hadoop1-compat/pom.xml b/phoenix-hadoop1-compat/pom.xml
index f3d3b04..1269c7a 100644
--- a/phoenix-hadoop1-compat/pom.xml
+++ b/phoenix-hadoop1-compat/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.phoenix</groupId>
     <artifactId>phoenix</artifactId>
-    <version>4.0.0-incubating</version>
+    <version>4.0.1</version>
   </parent>
   <artifactId>phoenix-hadoop1-compat</artifactId>
   <name>Phoenix Hadoop1 Compatibility</name>

http://git-wip-us.apache.org/repos/asf/phoenix/blob/a169e1ba/phoenix-hadoop2-compat/pom.xml
----------------------------------------------------------------------
diff --git a/phoenix-hadoop2-compat/pom.xml b/phoenix-hadoop2-compat/pom.xml
index d936a6f..5f5b2b7 100644
--- a/phoenix-hadoop2-compat/pom.xml
+++ b/phoenix-hadoop2-compat/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.phoenix</groupId>
     <artifactId>phoenix</artifactId>
-    <version>4.0.0-incubating</version>
+    <version>4.0.1</version>
   </parent>
   <artifactId>phoenix-hadoop2-compat</artifactId>
   <name>Phoenix Hadoop2 Compatibility</name>

http://git-wip-us.apache.org/repos/asf/phoenix/blob/a169e1ba/phoenix-pig/pom.xml
----------------------------------------------------------------------
diff --git a/phoenix-pig/pom.xml b/phoenix-pig/pom.xml
index edaa1f0..c669a0f 100644
--- a/phoenix-pig/pom.xml
+++ b/phoenix-pig/pom.xml
@@ -26,7 +26,7 @@
   <parent>
     <groupId>org.apache.phoenix</groupId>
     <artifactId>phoenix</artifactId>
-    <version>4.0.0-incubating</version>
+    <version>4.0.1</version>
   </parent>
   <artifactId>phoenix-pig</artifactId>
   <name>Phoenix - Pig</name>

http://git-wip-us.apache.org/repos/asf/phoenix/blob/a169e1ba/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 4249912..9d98694 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.phoenix</groupId>
   <artifactId>phoenix</artifactId>
-  <version>4.0.0-incubating</version>
+  <version>4.0.1</version>
   <packaging>pom</packaging>
   <name>Apache Phoenix</name>
   <description>A SQL layer over HBase</description>