Return-Path: X-Original-To: apmail-asterixdb-notifications-archive@minotaur.apache.org Delivered-To: apmail-asterixdb-notifications-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id B9D30194D8 for ; Sat, 2 Apr 2016 05:09:32 +0000 (UTC) Received: (qmail 74658 invoked by uid 500); 2 Apr 2016 05:09:32 -0000 Delivered-To: apmail-asterixdb-notifications-archive@asterixdb.apache.org Received: (qmail 74622 invoked by uid 500); 2 Apr 2016 05:09:32 -0000 Mailing-List: contact notifications-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 notifications@asterixdb.incubator.apache.org Received: (qmail 74613 invoked by uid 99); 2 Apr 2016 05:09:32 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd3-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 02 Apr 2016 05:09:32 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd3-us-west.apache.org (ASF Mail Server at spamd3-us-west.apache.org) with ESMTP id 079A21804D3 for ; Sat, 2 Apr 2016 05:09:31 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd3-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 0.919 X-Spam-Level: X-Spam-Status: No, score=0.919 tagged_above=-999 required=6.31 tests=[SPF_FAIL=0.919] autolearn=disabled Received: from mx1-lw-us.apache.org ([10.40.0.8]) by localhost (spamd3-us-west.apache.org [10.40.0.10]) (amavisd-new, port 10024) with ESMTP id 2bOi2amTZwk3 for ; Sat, 2 Apr 2016 05:09:30 +0000 (UTC) Received: from unhygienix.ics.uci.edu (unhygienix.ics.uci.edu [128.195.14.130]) by mx1-lw-us.apache.org (ASF Mail Server at mx1-lw-us.apache.org) with ESMTP id 93B515F23D for ; Sat, 2 Apr 2016 05:09:29 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by unhygienix.ics.uci.edu (Postfix) with ESMTP id 183F7240D34; Fri, 1 Apr 2016 22:04:25 -0700 (PDT) Date: Fri, 1 Apr 2016 22:04:25 -0700 From: "Till Westmann (Code Review)" Message-ID: Reply-To: tillw@apache.org X-Gerrit-MessageType: newchange Subject: Change in asterixdb[master]: ASTERIXDB-1356: report file not found X-Gerrit-Change-Id: Ia12bf84adfd8442103567df42ac22e5750e1360f X-Gerrit-ChangeURL: X-Gerrit-Commit: a6cba11200c09275612236c6fe63679fc4a0367f MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Content-Disposition: inline User-Agent: Gerrit/2.8.4 To: undisclosed-recipients:; Till Westmann has uploaded a new change for review. https://asterix-gerrit.ics.uci.edu/771 Change subject: ASTERIXDB-1356: report file not found ...................................................................... ASTERIXDB-1356: report file not found Change-Id: Ia12bf84adfd8442103567df42ac22e5750e1360f --- M asterix-external-data/src/main/java/org/apache/asterix/external/util/FileSystemWatcher.java M asterix-external-data/src/main/java/org/apache/asterix/external/util/LocalFileSystemUtils.java 2 files changed, 8 insertions(+), 3 deletions(-) git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb refs/changes/71/771/1 diff --git a/asterix-external-data/src/main/java/org/apache/asterix/external/util/FileSystemWatcher.java b/asterix-external-data/src/main/java/org/apache/asterix/external/util/FileSystemWatcher.java index 4eec348..71d8a5d 100644 --- a/asterix-external-data/src/main/java/org/apache/asterix/external/util/FileSystemWatcher.java +++ b/asterix-external-data/src/main/java/org/apache/asterix/external/util/FileSystemWatcher.java @@ -70,7 +70,9 @@ public void init() throws HyracksDataException { try { dirs.clear(); - LocalFileSystemUtils.traverse(files, path.toFile(), expression, dirs); + if (! LocalFileSystemUtils.traverse(files, path.toFile(), expression, dirs)) { + throw new HyracksDataException(path + ": file not found"); + } it = files.iterator(); if (isFeed) { keys.clear(); @@ -87,6 +89,8 @@ } resume(); } + } catch (HyracksDataException e) { + throw e; } catch (IOException e) { throw new HyracksDataException(e); } diff --git a/asterix-external-data/src/main/java/org/apache/asterix/external/util/LocalFileSystemUtils.java b/asterix-external-data/src/main/java/org/apache/asterix/external/util/LocalFileSystemUtils.java index d6e9463..d6fea4e 100644 --- a/asterix-external-data/src/main/java/org/apache/asterix/external/util/LocalFileSystemUtils.java +++ b/asterix-external-data/src/main/java/org/apache/asterix/external/util/LocalFileSystemUtils.java @@ -32,10 +32,10 @@ public class LocalFileSystemUtils { //TODO: replace this method by FileUtils.iterateFilesAndDirs(.) - public static void traverse(final LinkedList files, File root, final String expression, + public static boolean traverse(final LinkedList files, File root, final String expression, final LinkedList dirs) throws IOException { if (!Files.exists(root.toPath())) { - return; + return false; } if (!Files.isDirectory(root.toPath())) { validateAndAdd(root.toPath(), expression, files); @@ -65,6 +65,7 @@ return FileVisitResult.CONTINUE; } }); + return ! files.isEmpty(); } public static void validateAndAdd(Path path, String expression, LinkedList files) { -- To view, visit https://asterix-gerrit.ics.uci.edu/771 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia12bf84adfd8442103567df42ac22e5750e1360f Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Till Westmann