phoenix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jamestay...@apache.org
Subject phoenix git commit: PHOENIX-2833 Upgrade HBase dependency to version 1.2.0 (Rob Leidle)
Date Fri, 22 Apr 2016 23:37:10 GMT
Repository: phoenix
Updated Branches:
  refs/heads/master 7404114e3 -> d698b6fe3


PHOENIX-2833 Upgrade HBase dependency to version 1.2.0 (Rob Leidle)


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

Branch: refs/heads/master
Commit: d698b6fe3d72d72568e202a3941f185f69c66cde
Parents: 7404114
Author: James Taylor <jamestaylor@apache.org>
Authored: Fri Apr 22 16:36:44 2016 -0700
Committer: James Taylor <jamestaylor@apache.org>
Committed: Fri Apr 22 16:36:44 2016 -0700

----------------------------------------------------------------------
 phoenix-assembly/pom.xml                            |  2 +-
 phoenix-core/pom.xml                                |  2 +-
 .../WALReplayWithIndexWritesAndCompressedWALIT.java | 16 +++++++++-------
 .../phoenix/end2end/QueryDatabaseMetaDataIT.java    |  5 +++--
 .../hadoop/hbase/ipc/PhoenixRpcScheduler.java       |  8 ++++----
 phoenix-flume/pom.xml                               |  2 +-
 phoenix-hive/pom.xml                                |  2 +-
 phoenix-pherf/pom.xml                               |  2 +-
 phoenix-pig/pom.xml                                 |  2 +-
 phoenix-server-client/pom.xml                       |  2 +-
 phoenix-server/pom.xml                              |  2 +-
 phoenix-spark/pom.xml                               |  2 +-
 phoenix-tracing-webapp/pom.xml                      |  2 +-
 pom.xml                                             |  4 ++--
 14 files changed, 28 insertions(+), 25 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/phoenix/blob/d698b6fe/phoenix-assembly/pom.xml
----------------------------------------------------------------------
diff --git a/phoenix-assembly/pom.xml b/phoenix-assembly/pom.xml
index 3e3e097..7ed432a 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.8.0-HBase-1.1-SNAPSHOT</version>
+    <version>4.8.0-HBase-1.2-SNAPSHOT</version>
   </parent>
   <artifactId>phoenix-assembly</artifactId>
   <name>Phoenix Assembly</name>

http://git-wip-us.apache.org/repos/asf/phoenix/blob/d698b6fe/phoenix-core/pom.xml
----------------------------------------------------------------------
diff --git a/phoenix-core/pom.xml b/phoenix-core/pom.xml
index 30a4875..6179b9c 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.8.0-HBase-1.1-SNAPSHOT</version>
+    <version>4.8.0-HBase-1.2-SNAPSHOT</version>
   </parent>
   <artifactId>phoenix-core</artifactId>
   <name>Phoenix Core</name>

http://git-wip-us.apache.org/repos/asf/phoenix/blob/d698b6fe/phoenix-core/src/it/java/org/apache/hadoop/hbase/regionserver/wal/WALReplayWithIndexWritesAndCompressedWALIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/hadoop/hbase/regionserver/wal/WALReplayWithIndexWritesAndCompressedWALIT.java
b/phoenix-core/src/it/java/org/apache/hadoop/hbase/regionserver/wal/WALReplayWithIndexWritesAndCompressedWALIT.java
index 611ba68..14b6fdf 100644
--- a/phoenix-core/src/it/java/org/apache/hadoop/hbase/regionserver/wal/WALReplayWithIndexWritesAndCompressedWALIT.java
+++ b/phoenix-core/src/it/java/org/apache/hadoop/hbase/regionserver/wal/WALReplayWithIndexWritesAndCompressedWALIT.java
@@ -20,6 +20,8 @@ package org.apache.hadoop.hbase.regionserver.wal;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.when;
 
 import java.io.IOException;
 import java.util.List;
@@ -192,15 +194,16 @@ public class WALReplayWithIndexWritesAndCompressedWALIT {
     WAL wal = createWAL(this.conf, walFactory);
     RegionServerServices mockRS = Mockito.mock(RegionServerServices.class);
     // mock out some of the internals of the RSS, so we can run CPs
-    Mockito.when(mockRS.getWAL(null)).thenReturn(wal);
+    when(mockRS.getWAL(null)).thenReturn(wal);
     RegionServerAccounting rsa = Mockito.mock(RegionServerAccounting.class);
-    Mockito.when(mockRS.getRegionServerAccounting()).thenReturn(rsa);
+    when(mockRS.getRegionServerAccounting()).thenReturn(rsa);
     ServerName mockServerName = Mockito.mock(ServerName.class);
-    Mockito.when(mockServerName.getServerName()).thenReturn(tableNameStr + ",1234");
-    Mockito.when(mockRS.getServerName()).thenReturn(mockServerName);
-    HRegion region = new HRegion(basedir, wal, this.fs, this.conf, hri, htd, mockRS);
+    when(mockServerName.getServerName()).thenReturn(tableNameStr + ",1234");
+    when(mockRS.getServerName()).thenReturn(mockServerName);
+    HRegion region = spy(new HRegion(basedir, wal, this.fs, this.conf, hri, htd, mockRS));
     region.initialize();
-    region.getSequenceId().set(0);
+    when(region.getSequenceId()).thenReturn(0l);
+
 
     //make an attempted write to the primary that should also be indexed
     byte[] rowkey = Bytes.toBytes("indexed_row_key");
@@ -304,4 +307,3 @@ private int getKeyValueCount(HTable table) throws IOException {
     return count;
   }
 }
-

http://git-wip-us.apache.org/repos/asf/phoenix/blob/d698b6fe/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryDatabaseMetaDataIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryDatabaseMetaDataIT.java
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryDatabaseMetaDataIT.java
index 62b7306..ccb5b5a 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryDatabaseMetaDataIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryDatabaseMetaDataIT.java
@@ -174,12 +174,13 @@ public class QueryDatabaseMetaDataIT extends BaseClientManagedTimeIT
{
 
     @Test
     public void testSchemaMetadataScan() throws SQLException {
+        long ts = nextTimestamp();
         Properties props = new Properties();
-        props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(1));
+        props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts));
         props.setProperty(QueryServices.IS_NAMESPACE_MAPPING_ENABLED, Boolean.toString(true));
         Connection conn = DriverManager.getConnection(getUrl(), props);
         conn.createStatement().execute("CREATE SCHEMA " + CUSTOM_ENTITY_DATA_SCHEMA_NAME);
-        props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(2));
+        props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts+10));
         conn = DriverManager.getConnection(getUrl(), props);
         DatabaseMetaData dbmd = conn.getMetaData();
         ResultSet rs;

http://git-wip-us.apache.org/repos/asf/phoenix/blob/d698b6fe/phoenix-core/src/main/java/org/apache/hadoop/hbase/ipc/PhoenixRpcScheduler.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/main/java/org/apache/hadoop/hbase/ipc/PhoenixRpcScheduler.java
b/phoenix-core/src/main/java/org/apache/hadoop/hbase/ipc/PhoenixRpcScheduler.java
index 362e2cc..4fdddf5 100644
--- a/phoenix-core/src/main/java/org/apache/hadoop/hbase/ipc/PhoenixRpcScheduler.java
+++ b/phoenix-core/src/main/java/org/apache/hadoop/hbase/ipc/PhoenixRpcScheduler.java
@@ -81,15 +81,15 @@ public class PhoenixRpcScheduler extends RpcScheduler {
     }
 
     @Override
-    public void dispatch(CallRunner callTask) throws InterruptedException, IOException {
+    public boolean dispatch(CallRunner callTask) throws InterruptedException, IOException
{
         RpcServer.Call call = callTask.getCall();
         int priority = call.header.getPriority();
         if (indexPriority == priority) {
-            indexCallExecutor.dispatch(callTask);
+            return indexCallExecutor.dispatch(callTask);
         } else if (metadataPriority == priority) {
-            metadataCallExecutor.dispatch(callTask);
+            return metadataCallExecutor.dispatch(callTask);
         } else {
-            delegate.dispatch(callTask);
+            return delegate.dispatch(callTask);
         }
     }
 

http://git-wip-us.apache.org/repos/asf/phoenix/blob/d698b6fe/phoenix-flume/pom.xml
----------------------------------------------------------------------
diff --git a/phoenix-flume/pom.xml b/phoenix-flume/pom.xml
index 75bc76d..f994a90 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.8.0-HBase-1.1-SNAPSHOT</version>
+    <version>4.8.0-HBase-1.2-SNAPSHOT</version>
   </parent>
   <artifactId>phoenix-flume</artifactId>
   <name>Phoenix - Flume</name>

http://git-wip-us.apache.org/repos/asf/phoenix/blob/d698b6fe/phoenix-hive/pom.xml
----------------------------------------------------------------------
diff --git a/phoenix-hive/pom.xml b/phoenix-hive/pom.xml
index e4b4a49..89adaa4 100644
--- a/phoenix-hive/pom.xml
+++ b/phoenix-hive/pom.xml
@@ -27,7 +27,7 @@
   <parent>
     <groupId>org.apache.phoenix</groupId>
     <artifactId>phoenix</artifactId>
-    <version>4.8.0-HBase-1.1-SNAPSHOT</version>
+    <version>4.8.0-HBase-1.2-SNAPSHOT</version>
   </parent>
   <artifactId>phoenix-hive</artifactId>
   <name>Phoenix - Hive</name>

http://git-wip-us.apache.org/repos/asf/phoenix/blob/d698b6fe/phoenix-pherf/pom.xml
----------------------------------------------------------------------
diff --git a/phoenix-pherf/pom.xml b/phoenix-pherf/pom.xml
index 3daf001..9c614f2 100644
--- a/phoenix-pherf/pom.xml
+++ b/phoenix-pherf/pom.xml
@@ -15,7 +15,7 @@
 	<parent>
 		<groupId>org.apache.phoenix</groupId>
 		<artifactId>phoenix</artifactId>
-		<version>4.8.0-HBase-1.1-SNAPSHOT</version>
+		<version>4.8.0-HBase-1.2-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>phoenix-pherf</artifactId>

http://git-wip-us.apache.org/repos/asf/phoenix/blob/d698b6fe/phoenix-pig/pom.xml
----------------------------------------------------------------------
diff --git a/phoenix-pig/pom.xml b/phoenix-pig/pom.xml
index c5f3cf0..e9aece5 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.8.0-HBase-1.1-SNAPSHOT</version>
+    <version>4.8.0-HBase-1.2-SNAPSHOT</version>
   </parent>
   <artifactId>phoenix-pig</artifactId>
   <name>Phoenix - Pig</name>

http://git-wip-us.apache.org/repos/asf/phoenix/blob/d698b6fe/phoenix-server-client/pom.xml
----------------------------------------------------------------------
diff --git a/phoenix-server-client/pom.xml b/phoenix-server-client/pom.xml
index 1270c46..3043384 100644
--- a/phoenix-server-client/pom.xml
+++ b/phoenix-server-client/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.apache.phoenix</groupId>
     <artifactId>phoenix</artifactId>
-    <version>4.8.0-HBase-1.1-SNAPSHOT</version>
+    <version>4.8.0-HBase-1.2-SNAPSHOT</version>
   </parent>
   <artifactId>phoenix-server-client</artifactId>
   <name>Phoenix Query Server Client</name>

http://git-wip-us.apache.org/repos/asf/phoenix/blob/d698b6fe/phoenix-server/pom.xml
----------------------------------------------------------------------
diff --git a/phoenix-server/pom.xml b/phoenix-server/pom.xml
index eda1653..7de5228 100644
--- a/phoenix-server/pom.xml
+++ b/phoenix-server/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.apache.phoenix</groupId>
     <artifactId>phoenix</artifactId>
-    <version>4.8.0-HBase-1.1-SNAPSHOT</version>
+    <version>4.8.0-HBase-1.2-SNAPSHOT</version>
   </parent>
   <artifactId>phoenix-server</artifactId>
   <name>Phoenix Query Server</name>

http://git-wip-us.apache.org/repos/asf/phoenix/blob/d698b6fe/phoenix-spark/pom.xml
----------------------------------------------------------------------
diff --git a/phoenix-spark/pom.xml b/phoenix-spark/pom.xml
index 219798b..6145b56 100644
--- a/phoenix-spark/pom.xml
+++ b/phoenix-spark/pom.xml
@@ -28,7 +28,7 @@
   <parent>
     <groupId>org.apache.phoenix</groupId>
     <artifactId>phoenix</artifactId>
-    <version>4.8.0-HBase-1.1-SNAPSHOT</version>
+    <version>4.8.0-HBase-1.2-SNAPSHOT</version>
   </parent>
   <artifactId>phoenix-spark</artifactId>
   <name>Phoenix - Spark</name>

http://git-wip-us.apache.org/repos/asf/phoenix/blob/d698b6fe/phoenix-tracing-webapp/pom.xml
----------------------------------------------------------------------
diff --git a/phoenix-tracing-webapp/pom.xml b/phoenix-tracing-webapp/pom.xml
index 438e6b4..00d8b81 100755
--- a/phoenix-tracing-webapp/pom.xml
+++ b/phoenix-tracing-webapp/pom.xml
@@ -27,7 +27,7 @@
     <parent>
       <groupId>org.apache.phoenix</groupId>
       <artifactId>phoenix</artifactId>
-      <version>4.8.0-HBase-1.1-SNAPSHOT</version>
+      <version>4.8.0-HBase-1.2-SNAPSHOT</version>
     </parent>
 
     <artifactId>phoenix-tracing-webapp</artifactId>

http://git-wip-us.apache.org/repos/asf/phoenix/blob/d698b6fe/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index e1f1e48..d10f840 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.8.0-HBase-1.1-SNAPSHOT</version>
+  <version>4.8.0-HBase-1.2-SNAPSHOT</version>
   <packaging>pom</packaging>
   <name>Apache Phoenix</name>
   <description>A SQL layer over HBase</description>
@@ -62,7 +62,7 @@
     <top.dir>${project.basedir}</top.dir>
 
     <!-- Hadoop Versions -->
-    <hbase.version>1.1.3</hbase.version>
+    <hbase.version>1.2.0</hbase.version>
     <hadoop-two.version>2.7.1</hadoop-two.version>
 
     <!-- Dependency versions -->


Mime
View raw message