phoenix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From an...@apache.org
Subject phoenix git commit: PHOENIX-4403 Workaround Tephra issues and fix all left over compilation issues in phoenix-core(addendum)
Date Mon, 27 Nov 2017 13:47:44 GMT
Repository: phoenix
Updated Branches:
  refs/heads/5.x-HBase-2.0 372006816 -> 309ef0b1a


PHOENIX-4403 Workaround Tephra issues and fix all left over compilation issues in phoenix-core(addendum)


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

Branch: refs/heads/5.x-HBase-2.0
Commit: 309ef0b1a008643a58ce20c2c5db38fc6b2b6eed
Parents: 3720068
Author: Ankit Singhal <ankitsinghal59@gmail.com>
Authored: Mon Nov 27 19:17:31 2017 +0530
Committer: Ankit Singhal <ankitsinghal59@gmail.com>
Committed: Mon Nov 27 19:17:31 2017 +0530

----------------------------------------------------------------------
 .../src/it/java/org/apache/phoenix/end2end/UpgradeIT.java    | 3 ++-
 .../apache/phoenix/hive/mapreduce/PhoenixInputFormat.java    | 8 ++++----
 pom.xml                                                      | 2 +-
 3 files changed, 7 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/phoenix/blob/309ef0b1/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpgradeIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpgradeIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpgradeIT.java
index 3481169..a558c21 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpgradeIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpgradeIT.java
@@ -46,7 +46,6 @@ import java.util.concurrent.FutureTask;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import org.apache.curator.shaded.com.google.common.collect.Sets;
 import org.apache.hadoop.hbase.HConstants;
 import org.apache.hadoop.hbase.TableName;
 import org.apache.hadoop.hbase.client.Admin;
@@ -81,6 +80,8 @@ import org.apache.phoenix.util.UpgradeUtil;
 import org.junit.Before;
 import org.junit.Test;
 
+import com.google.common.collect.Sets;
+
 public class UpgradeIT extends ParallelStatsDisabledIT {
 
     private String tenantId;

http://git-wip-us.apache.org/repos/asf/phoenix/blob/309ef0b1/phoenix-hive/src/main/java/org/apache/phoenix/hive/mapreduce/PhoenixInputFormat.java
----------------------------------------------------------------------
diff --git a/phoenix-hive/src/main/java/org/apache/phoenix/hive/mapreduce/PhoenixInputFormat.java
b/phoenix-hive/src/main/java/org/apache/phoenix/hive/mapreduce/PhoenixInputFormat.java
index f9330ef..ff15972 100644
--- a/phoenix-hive/src/main/java/org/apache/phoenix/hive/mapreduce/PhoenixInputFormat.java
+++ b/phoenix-hive/src/main/java/org/apache/phoenix/hive/mapreduce/PhoenixInputFormat.java
@@ -17,9 +17,6 @@
  */
 package org.apache.phoenix.hive.mapreduce;
 
-import com.google.common.base.Preconditions;
-import com.google.common.collect.Lists;
-
 import java.io.IOException;
 import java.sql.Connection;
 import java.sql.Statement;
@@ -38,8 +35,8 @@ import org.apache.hadoop.hbase.TableName;
 import org.apache.hadoop.hbase.client.ConnectionFactory;
 import org.apache.hadoop.hbase.client.RegionLocator;
 import org.apache.hadoop.hbase.client.Scan;
+import org.apache.hadoop.hbase.mapreduce.RegionSizeCalculator;
 import org.apache.hadoop.hbase.util.Bytes;
-import org.apache.hadoop.hbase.util.RegionSizeCalculator;
 import org.apache.hadoop.hive.conf.HiveConf;
 import org.apache.hadoop.hive.ql.exec.Utilities;
 import org.apache.hadoop.hive.ql.plan.ExprNodeGenericFuncDesc;
@@ -70,6 +67,9 @@ import org.apache.phoenix.mapreduce.util.PhoenixConfigurationUtil;
 import org.apache.phoenix.query.KeyRange;
 import org.apache.phoenix.util.PhoenixRuntime;
 
+import com.google.common.base.Preconditions;
+import com.google.common.collect.Lists;
+
 /**
  * Custom InputFormat to feed into Hive
  */

http://git-wip-us.apache.org/repos/asf/phoenix/blob/309ef0b1/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index e96eb7e..bef97db 100644
--- a/pom.xml
+++ b/pom.xml
@@ -100,7 +100,7 @@
     <joni.version>2.1.2</joni.version>
     <avatica.version>1.10.0</avatica.version>
     <jettyVersion>8.1.7.v20120910</jettyVersion>
-    <tephra.version>0.14.0-incubating-SNAPSHOT</tephra.version>
+    <tephra.version>0.13.0-incubating</tephra.version>
     <spark.version>2.0.2</spark.version>
     <scala.version>2.11.8</scala.version>
     <scala.binary.version>2.11</scala.binary.version>


Mime
View raw message