You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apex.apache.org by pr...@apache.org on 2015/09/24 08:05:47 UTC

[3/4] incubator-apex-malhar git commit: Removed delimiter

Removed delimiter


Project: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/commit/a3f1b3ca
Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/tree/a3f1b3ca
Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/diff/a3f1b3ca

Branch: refs/heads/devel-3
Commit: a3f1b3cac46e1821f0fcbdb0adc276a56cb447ef
Parents: f99696a
Author: Chandni Singh <cs...@apache.org>
Authored: Wed Sep 23 18:18:26 2015 -0700
Committer: Chandni Singh <cs...@apache.org>
Committed: Wed Sep 23 18:18:26 2015 -0700

----------------------------------------------------------------------
 .../java/com/datatorrent/lib/io/fs/FileSplitterInput.java     | 7 -------
 1 file changed, 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/a3f1b3ca/library/src/main/java/com/datatorrent/lib/io/fs/FileSplitterInput.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/io/fs/FileSplitterInput.java b/library/src/main/java/com/datatorrent/lib/io/fs/FileSplitterInput.java
index 2560191..92cb97a 100644
--- a/library/src/main/java/com/datatorrent/lib/io/fs/FileSplitterInput.java
+++ b/library/src/main/java/com/datatorrent/lib/io/fs/FileSplitterInput.java
@@ -176,9 +176,6 @@ public class FileSplitterInput extends AbstractFileSplitter implements InputOper
   protected boolean processFileInfo(FileInfo fileInfo)
   {
     ScannedFileInfo scannedFileInfo = (ScannedFileInfo)fileInfo;
-    if (scannedFileInfo ==  TimeBasedDirectoryScanner.DELIMITER) {
-      return false;
-    }
     currentWindowRecoveryState.add(scannedFileInfo);
     updateReferenceTimes(scannedFileInfo);
     return super.processFileInfo(fileInfo);
@@ -258,7 +255,6 @@ public class FileSplitterInput extends AbstractFileSplitter implements InputOper
   public static class TimeBasedDirectoryScanner implements Runnable, Component<Context.OperatorContext>
   {
     private static long DEF_SCAN_INTERVAL_MILLIS = 5000;
-    private static ScannedFileInfo DELIMITER = new ScannedFileInfo();
 
     private boolean recursive;
 
@@ -368,9 +364,6 @@ public class FileSplitterInput extends AbstractFileSplitter implements InputOper
     protected void scanIterationComplete()
     {
       LOG.debug("scan complete {} {}", lastScanMillis, numDiscoveredPerIteration);
-      if (numDiscoveredPerIteration > 0) {
-        discoveredFiles.add(DELIMITER);
-      }
       lastScanMillis = System.currentTimeMillis();
     }