Return-Path: X-Original-To: apmail-asterixdb-commits-archive@minotaur.apache.org Delivered-To: apmail-asterixdb-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 5436B18D2D for ; Thu, 25 Feb 2016 07:10:25 +0000 (UTC) Received: (qmail 4079 invoked by uid 500); 25 Feb 2016 07:10:25 -0000 Delivered-To: apmail-asterixdb-commits-archive@asterixdb.apache.org Received: (qmail 4043 invoked by uid 500); 25 Feb 2016 07:10:25 -0000 Mailing-List: contact commits-help@asterixdb.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@asterixdb.incubator.apache.org Delivered-To: mailing list commits@asterixdb.incubator.apache.org Received: (qmail 4034 invoked by uid 99); 25 Feb 2016 07:10:25 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd2-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 25 Feb 2016 07:10:25 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd2-us-west.apache.org (ASF Mail Server at spamd2-us-west.apache.org) with ESMTP id A0D631A0096 for ; Thu, 25 Feb 2016 07:10:24 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd2-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -3.549 X-Spam-Level: X-Spam-Status: No, score=-3.549 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RCVD_IN_DNSWL_HI=-5, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, RP_MATCHES_RCVD=-0.329] autolearn=disabled Received: from mx2-lw-us.apache.org ([10.40.0.8]) by localhost (spamd2-us-west.apache.org [10.40.0.9]) (amavisd-new, port 10024) with ESMTP id OsCdC6rzej-k for ; Thu, 25 Feb 2016 07:10:23 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx2-lw-us.apache.org (ASF Mail Server at mx2-lw-us.apache.org) with SMTP id 067E25F1E3 for ; Thu, 25 Feb 2016 07:10:22 +0000 (UTC) Received: (qmail 4024 invoked by uid 99); 25 Feb 2016 07:10:22 -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; Thu, 25 Feb 2016 07:10:22 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 50309DFD86; Thu, 25 Feb 2016 07:10:22 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: amoudi@apache.org To: commits@asterixdb.incubator.apache.org Message-Id: <5d19aeb8ab9e4799b56705c0b69c8bbe@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: incubator-asterixdb-hyracks git commit: Fix Remove File Operator Date: Thu, 25 Feb 2016 07:10:22 +0000 (UTC) Repository: incubator-asterixdb-hyracks Updated Branches: refs/heads/master d7135572e -> c20aa64af Fix Remove File Operator The operator didn't get the correct path of the folder to be deleted. After the fix, the operator gets the correct path from the IO manager. Change-Id: I5910409d79e9c1f8e7192a1050b2be0f823e912f Reviewed-on: https://asterix-gerrit.ics.uci.edu/659 Tested-by: Jenkins Reviewed-by: Murtadha Hubail Project: http://git-wip-us.apache.org/repos/asf/incubator-asterixdb-hyracks/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-asterixdb-hyracks/commit/c20aa64a Tree: http://git-wip-us.apache.org/repos/asf/incubator-asterixdb-hyracks/tree/c20aa64a Diff: http://git-wip-us.apache.org/repos/asf/incubator-asterixdb-hyracks/diff/c20aa64a Branch: refs/heads/master Commit: c20aa64af7e850d6c2c791d3a2aa05b8cb634759 Parents: d713557 Author: Abdullah Alamoudi Authored: Wed Feb 24 18:18:18 2016 +0300 Committer: abdullah alamoudi Committed: Wed Feb 24 23:05:17 2016 -0800 ---------------------------------------------------------------------- .../dataflow/std/file/FileRemoveOperatorDescriptor.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-asterixdb-hyracks/blob/c20aa64a/hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/file/FileRemoveOperatorDescriptor.java ---------------------------------------------------------------------- diff --git a/hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/file/FileRemoveOperatorDescriptor.java b/hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/file/FileRemoveOperatorDescriptor.java index 6e274d5..cf2008c 100644 --- a/hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/file/FileRemoveOperatorDescriptor.java +++ b/hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/file/FileRemoveOperatorDescriptor.java @@ -23,13 +23,13 @@ import java.io.File; import java.io.IOException; import org.apache.commons.io.FileUtils; - import org.apache.hyracks.api.comm.IFrameWriter; import org.apache.hyracks.api.context.IHyracksTaskContext; import org.apache.hyracks.api.dataflow.IOperatorNodePushable; import org.apache.hyracks.api.dataflow.value.IRecordDescriptorProvider; import org.apache.hyracks.api.dataflow.value.RecordDescriptor; import org.apache.hyracks.api.exceptions.HyracksDataException; +import org.apache.hyracks.api.io.IIOManager; import org.apache.hyracks.api.job.IOperatorDescriptorRegistry; import org.apache.hyracks.dataflow.std.base.AbstractOperatorNodePushable; import org.apache.hyracks.dataflow.std.base.AbstractSingleActivityOperatorDescriptor; @@ -49,6 +49,9 @@ public class FileRemoveOperatorDescriptor extends AbstractSingleActivityOperator public IOperatorNodePushable createPushRuntime(IHyracksTaskContext ctx, IRecordDescriptorProvider recordDescProvider, int partition, int nPartitions) throws HyracksDataException { final FileSplit split = fileSplitProvider.getFileSplits()[partition]; + final String path = split.getLocalFile().getFile().getPath(); + final int deviceId = split.getIODeviceId(); + final IIOManager ioManager = ctx.getIOManager(); return new AbstractOperatorNodePushable() { @Override @@ -58,7 +61,7 @@ public class FileRemoveOperatorDescriptor extends AbstractSingleActivityOperator @Override public void initialize() throws HyracksDataException { - File f = split.getLocalFile().getFile(); + File f = ioManager.getAbsoluteFileRef(deviceId, path).getFile(); try { FileUtils.deleteDirectory(f); } catch (IOException e) {