Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id E37CB200D4B for ; Mon, 27 Nov 2017 14:47:45 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id E1BF4160C13; Mon, 27 Nov 2017 13:47:45 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 3D7C0160C02 for ; Mon, 27 Nov 2017 14:47:45 +0100 (CET) Received: (qmail 56574 invoked by uid 500); 27 Nov 2017 13:47:44 -0000 Mailing-List: contact commits-help@phoenix.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@phoenix.apache.org Delivered-To: mailing list commits@phoenix.apache.org Received: (qmail 56565 invoked by uid 99); 27 Nov 2017 13:47:44 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 27 Nov 2017 13:47:44 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 3F158DFD78; Mon, 27 Nov 2017 13:47:44 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ankit@apache.org To: commits@phoenix.apache.org Message-Id: <258a206ce40f439b86d9ae6f870141aa@git.apache.org> X-Mailer: ASF-Git Admin Mailer 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 +0000 (UTC) archived-at: Mon, 27 Nov 2017 13:47:46 -0000 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 Authored: Mon Nov 27 19:17:31 2017 +0530 Committer: Ankit Singhal 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 @@ 2.1.2 1.10.0 8.1.7.v20120910 - 0.14.0-incubating-SNAPSHOT + 0.13.0-incubating 2.0.2 2.11.8 2.11