flink-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From m..@apache.org
Subject flink git commit: [bugfix] fix FileInputFormat for exclusively two level deep nested files
Date Tue, 26 May 2015 15:42:58 GMT
Repository: flink
Updated Branches:
  refs/heads/master baeedba5d -> f2891ab85


[bugfix] fix FileInputFormat for exclusively two level deep nested files


Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/f2891ab8
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/f2891ab8
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/f2891ab8

Branch: refs/heads/master
Commit: f2891ab857e00bc70eb025bb430f46f4f58355a5
Parents: baeedba
Author: Maximilian Michels <mxm@apache.org>
Authored: Tue May 26 17:32:06 2015 +0200
Committer: Maximilian Michels <mxm@apache.org>
Committed: Tue May 26 17:39:08 2015 +0200

----------------------------------------------------------------------
 .../main/java/org/apache/flink/api/common/io/FileInputFormat.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flink/blob/f2891ab8/flink-core/src/main/java/org/apache/flink/api/common/io/FileInputFormat.java
----------------------------------------------------------------------
diff --git a/flink-core/src/main/java/org/apache/flink/api/common/io/FileInputFormat.java
b/flink-core/src/main/java/org/apache/flink/api/common/io/FileInputFormat.java
index 6183778..efa5631 100644
--- a/flink-core/src/main/java/org/apache/flink/api/common/io/FileInputFormat.java
+++ b/flink-core/src/main/java/org/apache/flink/api/common/io/FileInputFormat.java
@@ -543,7 +543,7 @@ public abstract class FileInputFormat<OT> implements InputFormat<OT,
FileInputSp
 		for(FileStatus dir: fs.listStatus(path)) {
 			if (dir.isDir()) {
 				if (acceptFile(dir)) {
-					addNestedFiles(dir.getPath(), files, length, logExcludedFiles);
+					length += addNestedFiles(dir.getPath(), files, length, logExcludedFiles);
 				} else {
 					if (logExcludedFiles && LOG.isDebugEnabled()) {
 						LOG.debug("Directory "+dir.getPath().toString()+" did not pass the file-filter and
is excluded.");


Mime
View raw message