flink-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From se...@apache.org
Subject [2/2] flink git commit: [core] Miscellaneous cleanups in the FileInputFormat
Date Mon, 18 May 2015 20:38:16 GMT
[core] Miscellaneous cleanups in the FileInputFormat


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

Branch: refs/heads/master
Commit: ebc8d20795787de64f467bb20c8ccaeef26543d1
Parents: 390021e
Author: Stephan Ewen <sewen@apache.org>
Authored: Mon May 18 19:51:15 2015 +0200
Committer: Stephan Ewen <sewen@apache.org>
Committed: Mon May 18 22:37:34 2015 +0200

----------------------------------------------------------------------
 .../org/apache/flink/api/common/io/FileInputFormat.java     | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flink/blob/ebc8d207/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 82e4c54..9bce068 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
@@ -82,7 +82,7 @@ public abstract class FileInputFormat<OT> implements InputFormat<OT,
FileInputSp
 		initDefaultsFromConfiguration();
 	}
 	
-	private static final void initDefaultsFromConfiguration() {
+	private static void initDefaultsFromConfiguration() {
 		
 		final long to = GlobalConfiguration.getLong(ConfigConstants.FS_STREAM_OPENING_TIMEOUT_KEY,
 			ConfigConstants.DEFAULT_FS_STREAM_OPENING_TIMEOUT);
@@ -97,7 +97,7 @@ public abstract class FileInputFormat<OT> implements InputFormat<OT,
FileInputSp
 		}
 	}
 	
-	static final long getDefaultOpeningTimeout() {
+	static long getDefaultOpeningTimeout() {
 		return DEFAULT_OPENING_TIMEOUT;
 	}
 	
@@ -284,9 +284,8 @@ public abstract class FileInputFormat<OT> implements InputFormat<OT,
FileInputSp
 		else if (this.filePath == null) {
 			throw new IllegalArgumentException("File path was not specified in input format, or configuration.");

 		}
-
-		Boolean nestedFilesFlag = parameters.getBoolean(ENUMERATE_NESTED_FILES_FLAG, false);
-		this.enumerateNestedFiles = nestedFilesFlag;
+		
+		this.enumerateNestedFiles = parameters.getBoolean(ENUMERATE_NESTED_FILES_FLAG, false);
 	}
 	
 	/**


Mime
View raw message