[2/2] flink git commit: [FLINK-7265] [core] Introduce FileSystemKind to differentiate between FileSystem and ObjectStore

2017-11-17 Thread aljoscha 
[FLINK-7265] [core] Introduce FileSystemKind to differentiate between 
FileSystem and ObjectStore


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

Branch: refs/heads/release-1.4
Commit: a0dbe182fa677a87f601cbedc4115e63fff9fe4f
Parents: e784f3a
Author: Stephan Ewen 
Authored: Tue Jul 25 17:19:25 2017 +0200
Committer: Aljoscha Krettek 
Committed: Fri Nov 17 17:22:24 2017 +0100

--
 .../org/apache/flink/core/fs/FileSystem.java|   5 +
 .../apache/flink/core/fs/FileSystemKind.java|  40 
 .../core/fs/SafetyNetWrapperFileSystem.java |   5 +
 .../flink/core/fs/local/LocalFileSystem.java|  10 +-
 .../core/fs/local/LocalFileSystemTest.java  |   7 ++
 .../flink/runtime/fs/hdfs/HadoopFileSystem.java |  47 +
 .../flink/runtime/fs/maprfs/MapRFileSystem.java |   6 ++
 .../flink/runtime/fs/hdfs/HdfsKindTest.java | 101 +++
 8 files changed, 219 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/flink/blob/a0dbe182/flink-core/src/main/java/org/apache/flink/core/fs/FileSystem.java
--
diff --git a/flink-core/src/main/java/org/apache/flink/core/fs/FileSystem.java 
b/flink-core/src/main/java/org/apache/flink/core/fs/FileSystem.java
index d66a893..982e496 100644
--- a/flink-core/src/main/java/org/apache/flink/core/fs/FileSystem.java
+++ b/flink-core/src/main/java/org/apache/flink/core/fs/FileSystem.java
@@ -633,6 +633,11 @@ public abstract class FileSystem {
 */
public abstract boolean isDistributedFS();
 
+   /**
+* Gets a description of the characteristics of this file system.
+*/
+   public abstract FileSystemKind getKind();
+
// 

//  output directory initialization
// 


http://git-wip-us.apache.org/repos/asf/flink/blob/a0dbe182/flink-core/src/main/java/org/apache/flink/core/fs/FileSystemKind.java
--
diff --git 
a/flink-core/src/main/java/org/apache/flink/core/fs/FileSystemKind.java 
b/flink-core/src/main/java/org/apache/flink/core/fs/FileSystemKind.java
new file mode 100644
index 000..52f58ac
--- /dev/null
+++ b/flink-core/src/main/java/org/apache/flink/core/fs/FileSystemKind.java
@@ -0,0 +1,40 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.flink.core.fs;
+
+import org.apache.flink.annotation.PublicEvolving;
+
+/**
+ * An enumeration defining the kind and characteristics of a {@link 
FileSystem}.
+ */
+@PublicEvolving
+public enum FileSystemKind {
+
+   /**
+* An actual file system, with files and directories.
+*/
+   FILE_SYSTEM,
+
+   /**
+* An Object store. Files correspond to objects.
+* There are not really directories, but a directory-like structure may 
be mimicked
+* by hierarchical naming of files.
+*/
+   OBJECT_STORE
+}

http://git-wip-us.apache.org/repos/asf/flink/blob/a0dbe182/flink-core/src/main/java/org/apache/flink/core/fs/SafetyNetWrapperFileSystem.java
--
diff --git 
a/flink-core/src/main/java/org/apache/flink/core/fs/SafetyNetWrapperFileSystem.java
 
b/flink-core/src/main/java/org/apache/flink/core/fs/SafetyNetWrapperFileSystem.java
index a1167dd..e7f43a4 100644
--- 
a/flink-core/src/main/java/org/apache/flink/core/fs/SafetyNetWrapperFileSystem.java
+++ 
b/flink-core/src/main/java/org/apache/flink/core/fs/SafetyNetWrapperFileSystem.java
@@ -141,6 +141,11 @@ public class SafetyNetWrapperFileSystem extends FileSystem 
implements WrappingPr
}
 
@Override
+   public

[2/2] flink git commit: [FLINK-7265] [core] Introduce FileSystemKind to differentiate between FileSystem and ObjectStore

2017-11-17 Thread aljoscha 
[FLINK-7265] [core] Introduce FileSystemKind to differentiate between 
FileSystem and ObjectStore


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

Branch: refs/heads/master
Commit: f29f80575dac1c7e59dd7074118953b8be26520f
Parents: 3edbb7b
Author: Stephan Ewen 
Authored: Tue Jul 25 17:19:25 2017 +0200
Committer: Aljoscha Krettek 
Committed: Fri Nov 17 16:48:29 2017 +0100

--
 .../org/apache/flink/core/fs/FileSystem.java|   5 +
 .../apache/flink/core/fs/FileSystemKind.java|  40 
 .../core/fs/SafetyNetWrapperFileSystem.java |   5 +
 .../flink/core/fs/local/LocalFileSystem.java|  10 +-
 .../core/fs/local/LocalFileSystemTest.java  |   7 ++
 .../flink/runtime/fs/hdfs/HadoopFileSystem.java |  47 +
 .../flink/runtime/fs/maprfs/MapRFileSystem.java |   6 ++
 .../flink/runtime/fs/hdfs/HdfsKindTest.java | 101 +++
 8 files changed, 219 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/flink/blob/f29f8057/flink-core/src/main/java/org/apache/flink/core/fs/FileSystem.java
--
diff --git a/flink-core/src/main/java/org/apache/flink/core/fs/FileSystem.java 
b/flink-core/src/main/java/org/apache/flink/core/fs/FileSystem.java
index d66a893..982e496 100644
--- a/flink-core/src/main/java/org/apache/flink/core/fs/FileSystem.java
+++ b/flink-core/src/main/java/org/apache/flink/core/fs/FileSystem.java
@@ -633,6 +633,11 @@ public abstract class FileSystem {
 */
public abstract boolean isDistributedFS();
 
+   /**
+* Gets a description of the characteristics of this file system.
+*/
+   public abstract FileSystemKind getKind();
+
// 

//  output directory initialization
// 


http://git-wip-us.apache.org/repos/asf/flink/blob/f29f8057/flink-core/src/main/java/org/apache/flink/core/fs/FileSystemKind.java
--
diff --git 
a/flink-core/src/main/java/org/apache/flink/core/fs/FileSystemKind.java 
b/flink-core/src/main/java/org/apache/flink/core/fs/FileSystemKind.java
new file mode 100644
index 000..52f58ac
--- /dev/null
+++ b/flink-core/src/main/java/org/apache/flink/core/fs/FileSystemKind.java
@@ -0,0 +1,40 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.flink.core.fs;
+
+import org.apache.flink.annotation.PublicEvolving;
+
+/**
+ * An enumeration defining the kind and characteristics of a {@link 
FileSystem}.
+ */
+@PublicEvolving
+public enum FileSystemKind {
+
+   /**
+* An actual file system, with files and directories.
+*/
+   FILE_SYSTEM,
+
+   /**
+* An Object store. Files correspond to objects.
+* There are not really directories, but a directory-like structure may 
be mimicked
+* by hierarchical naming of files.
+*/
+   OBJECT_STORE
+}

http://git-wip-us.apache.org/repos/asf/flink/blob/f29f8057/flink-core/src/main/java/org/apache/flink/core/fs/SafetyNetWrapperFileSystem.java
--
diff --git 
a/flink-core/src/main/java/org/apache/flink/core/fs/SafetyNetWrapperFileSystem.java
 
b/flink-core/src/main/java/org/apache/flink/core/fs/SafetyNetWrapperFileSystem.java
index a1167dd..e7f43a4 100644
--- 
a/flink-core/src/main/java/org/apache/flink/core/fs/SafetyNetWrapperFileSystem.java
+++ 
b/flink-core/src/main/java/org/apache/flink/core/fs/SafetyNetWrapperFileSystem.java
@@ -141,6 +141,11 @@ public class SafetyNetWrapperFileSystem extends FileSystem 
implements WrappingPr
}
 
@Override
+   public