From f9b3a87a5ba67f5fa3652b31b74caf45ec09965e Mon Sep 17 00:00:00 2001 From: Agustin Gonzalez Date: Tue, 2 Feb 2021 17:45:47 -0700 Subject: [PATCH 1/2] Add log message when local input's filter does not match any files --- .../druid/data/input/impl/LocalInputSource.java | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/core/src/main/java/org/apache/druid/data/input/impl/LocalInputSource.java b/core/src/main/java/org/apache/druid/data/input/impl/LocalInputSource.java index 04b7dc7b2cd9..fcff9a3a0b14 100644 --- a/core/src/main/java/org/apache/druid/data/input/impl/LocalInputSource.java +++ b/core/src/main/java/org/apache/druid/data/input/impl/LocalInputSource.java @@ -40,6 +40,7 @@ import org.apache.druid.data.input.InputSplit; import org.apache.druid.data.input.SplitHintSpec; import org.apache.druid.java.util.common.IAE; +import org.apache.druid.java.util.common.logger.Logger; import org.apache.druid.utils.CollectionUtils; import org.apache.druid.utils.Streams; @@ -56,6 +57,8 @@ public class LocalInputSource extends AbstractInputSource implements SplittableInputSource> { + private static final Logger log = new Logger(LocalInputSource.class); + @Nullable private final File baseDir; @Nullable @@ -151,6 +154,16 @@ private Iterator getDirectoryListingIterator() ) ); } + Iterator fileIterator = FileUtils.iterateFiles( + baseDir.getAbsoluteFile(), + fileFilter, + TrueFileFilter.INSTANCE + ); + if (!fileIterator.hasNext()) { + // base dir & filter are guaranteed to be non-null here + // (by construction and non-null check of baseDir a few lines above): + log.info("Local inputSource filter [%s] for base dir [%s] did not match any files", filter, baseDir); + } return FileUtils.iterateFiles( baseDir.getAbsoluteFile(), fileFilter, From c2a09e43872d88e28e9176116e3502e062b6b7a6 Mon Sep 17 00:00:00 2001 From: Agustin Gonzalez Date: Tue, 2 Feb 2021 18:02:02 -0700 Subject: [PATCH 2/2] Re-use previously defined fileIterator --- .../org/apache/druid/data/input/impl/LocalInputSource.java | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/core/src/main/java/org/apache/druid/data/input/impl/LocalInputSource.java b/core/src/main/java/org/apache/druid/data/input/impl/LocalInputSource.java index fcff9a3a0b14..c765717b3a1a 100644 --- a/core/src/main/java/org/apache/druid/data/input/impl/LocalInputSource.java +++ b/core/src/main/java/org/apache/druid/data/input/impl/LocalInputSource.java @@ -164,11 +164,7 @@ private Iterator getDirectoryListingIterator() // (by construction and non-null check of baseDir a few lines above): log.info("Local inputSource filter [%s] for base dir [%s] did not match any files", filter, baseDir); } - return FileUtils.iterateFiles( - baseDir.getAbsoluteFile(), - fileFilter, - TrueFileFilter.INSTANCE - ); + return fileIterator; } }