From commits-return-22511-archive-asf-public=cust-asf.ponee.io@phoenix.apache.org Sat Aug 4 00:20:27 2018 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id DD79B18067B for ; Sat, 4 Aug 2018 00:20:26 +0200 (CEST) Received: (qmail 33632 invoked by uid 500); 3 Aug 2018 22:20:26 -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 33613 invoked by uid 99); 3 Aug 2018 22:20:26 -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; Fri, 03 Aug 2018 22:20:26 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 7B19CE0A44; Fri, 3 Aug 2018 22:20:25 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: vincentpoon@apache.org To: commits@phoenix.apache.org Date: Fri, 03 Aug 2018 22:20:26 -0000 Message-Id: <6f43e61d496f4666ab2eebc68fe27ac0@git.apache.org> In-Reply-To: <81f4c30c23e0419585b6eadc8c849f20@git.apache.org> References: <81f4c30c23e0419585b6eadc8c849f20@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/3] phoenix git commit: PHOENIX-4797 file not found or file exist exception when create global index use -snapshot option PHOENIX-4797 file not found or file exist exception when create global index use -snapshot option Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/4c9d7f9f Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/4c9d7f9f Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/4c9d7f9f Branch: refs/heads/4.14-HBase-1.4 Commit: 4c9d7f9fcda01cf6f167d0a075193d5c9f4b70c8 Parents: 4eac3ae Author: 492066199 <492066199@qq.com> Authored: Fri Jul 6 10:45:38 2018 +0800 Committer: Vincent Poon Committed: Fri Aug 3 18:19:32 2018 -0400 ---------------------------------------------------------------------- .../org/apache/phoenix/iterate/TableSnapshotResultIterator.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/phoenix/blob/4c9d7f9f/phoenix-core/src/main/java/org/apache/phoenix/iterate/TableSnapshotResultIterator.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/iterate/TableSnapshotResultIterator.java b/phoenix-core/src/main/java/org/apache/phoenix/iterate/TableSnapshotResultIterator.java index df60339..016d3be 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/iterate/TableSnapshotResultIterator.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/iterate/TableSnapshotResultIterator.java @@ -39,6 +39,7 @@ import java.util.ArrayList; import java.util.Collections; import java.util.Iterator; import java.util.List; +import java.util.UUID; public class TableSnapshotResultIterator implements ResultIterator { @@ -65,7 +66,8 @@ public class TableSnapshotResultIterator implements ResultIterator { this.scan = scan; this.scanMetricsHolder = scanMetricsHolder; this.scanIterator = UNINITIALIZED_SCANNER; - this.restoreDir = new Path(configuration.get(PhoenixConfigurationUtil.RESTORE_DIR_KEY)); + this.restoreDir = new Path(configuration.get(PhoenixConfigurationUtil.RESTORE_DIR_KEY), + UUID.randomUUID().toString()); this.snapshotName = configuration.get( PhoenixConfigurationUtil.SNAPSHOT_NAME_KEY); this.rootDir = FSUtils.getRootDir(configuration);