You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by ch...@apache.org on 2017/06/25 06:44:54 UTC
[11/21] flink git commit: [FLINK-6769] Replace usage of deprecated
FileSystem#create(Path, boolean)
[FLINK-6769] Replace usage of deprecated FileSystem#create(Path, boolean)
This closes #4116.
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/d7bf7eeb
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/d7bf7eeb
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/d7bf7eeb
Branch: refs/heads/master
Commit: d7bf7eebed29f35c797bd3e21bafd0eb071f9f34
Parents: 3424924
Author: zentol <ch...@apache.org>
Authored: Tue May 30 09:23:05 2017 +0200
Committer: zentol <ch...@apache.org>
Committed: Fri Jun 23 14:14:29 2017 +0200
----------------------------------------------------------------------
.../java/org/apache/flink/core/fs/InitOutputPathTest.java | 2 +-
.../apache/flink/core/fs/SafetyNetCloseableRegistryTest.java | 4 ++--
.../java/org/apache/flink/examples/java/distcp/DistCp.java | 2 +-
.../src/test/java/org/apache/flink/hdfstests/HDFSTest.java | 2 +-
.../org/apache/flink/runtime/blob/FileSystemBlobStore.java | 2 +-
.../java/org/apache/flink/runtime/filecache/FileCache.java | 2 +-
.../runtime/state/filesystem/FsCheckpointStreamFactory.java | 2 +-
.../zookeeper/filesystem/FileSystemStateStorageHelper.java | 2 +-
.../runtime/checkpoint/savepoint/MigrationV0ToV1Test.java | 2 +-
.../runtime/checkpoint/savepoint/SavepointStoreTest.java | 2 +-
.../state/filesystem/FsCheckpointStateOutputStreamTest.java | 8 ++++----
11 files changed, 15 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/d7bf7eeb/flink-core/src/test/java/org/apache/flink/core/fs/InitOutputPathTest.java
----------------------------------------------------------------------
diff --git a/flink-core/src/test/java/org/apache/flink/core/fs/InitOutputPathTest.java b/flink-core/src/test/java/org/apache/flink/core/fs/InitOutputPathTest.java
index c332324..9b67388 100644
--- a/flink-core/src/test/java/org/apache/flink/core/fs/InitOutputPathTest.java
+++ b/flink-core/src/test/java/org/apache/flink/core/fs/InitOutputPathTest.java
@@ -191,7 +191,7 @@ public class InitOutputPathTest {
@Override
public void go() throws Exception {
fs.initOutPathLocalFS(path.getParent(), WriteMode.OVERWRITE, true);
- try (FSDataOutputStream out = fs.create(path, true)) {
+ try (FSDataOutputStream out = fs.create(path, WriteMode.OVERWRITE)) {
out.write(11);
}
}
http://git-wip-us.apache.org/repos/asf/flink/blob/d7bf7eeb/flink-core/src/test/java/org/apache/flink/core/fs/SafetyNetCloseableRegistryTest.java
----------------------------------------------------------------------
diff --git a/flink-core/src/test/java/org/apache/flink/core/fs/SafetyNetCloseableRegistryTest.java b/flink-core/src/test/java/org/apache/flink/core/fs/SafetyNetCloseableRegistryTest.java
index 7973c69..05ee894 100644
--- a/flink-core/src/test/java/org/apache/flink/core/fs/SafetyNetCloseableRegistryTest.java
+++ b/flink-core/src/test/java/org/apache/flink/core/fs/SafetyNetCloseableRegistryTest.java
@@ -84,7 +84,7 @@ public class SafetyNetCloseableRegistryTest {
Path tmp = new Path(tmpFolder.newFolder().toURI().toString(), "test_file");
- try (FSDataOutputStream stream = fs1.create(tmp, false)) {
+ try (FSDataOutputStream stream = fs1.create(tmp, FileSystem.WriteMode.NO_OVERWRITE)) {
CheckedThread t2 = new CheckedThread() {
@Override
public void go() {
@@ -285,4 +285,4 @@ public class SafetyNetCloseableRegistryTest {
}
}
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/flink/blob/d7bf7eeb/flink-examples/flink-examples-batch/src/main/java/org/apache/flink/examples/java/distcp/DistCp.java
----------------------------------------------------------------------
diff --git a/flink-examples/flink-examples-batch/src/main/java/org/apache/flink/examples/java/distcp/DistCp.java b/flink-examples/flink-examples-batch/src/main/java/org/apache/flink/examples/java/distcp/DistCp.java
index a358490..3e66241 100644
--- a/flink-examples/flink-examples-batch/src/main/java/org/apache/flink/examples/java/distcp/DistCp.java
+++ b/flink-examples/flink-examples-batch/src/main/java/org/apache/flink/examples/java/distcp/DistCp.java
@@ -129,7 +129,7 @@ public class DistCp {
FSDataOutputStream outputStream = null;
FSDataInputStream inputStream = null;
try {
- outputStream = targetFs.create(outPath, true);
+ outputStream = targetFs.create(outPath, FileSystem.WriteMode.OVERWRITE);
inputStream = task.getPath().getFileSystem().open(task.getPath());
int bytes = IOUtils.copy(inputStream, outputStream);
bytesCounter.add(bytes);
http://git-wip-us.apache.org/repos/asf/flink/blob/d7bf7eeb/flink-fs-tests/src/test/java/org/apache/flink/hdfstests/HDFSTest.java
----------------------------------------------------------------------
diff --git a/flink-fs-tests/src/test/java/org/apache/flink/hdfstests/HDFSTest.java b/flink-fs-tests/src/test/java/org/apache/flink/hdfstests/HDFSTest.java
index 5f778f2..950f20f 100644
--- a/flink-fs-tests/src/test/java/org/apache/flink/hdfstests/HDFSTest.java
+++ b/flink-fs-tests/src/test/java/org/apache/flink/hdfstests/HDFSTest.java
@@ -199,7 +199,7 @@ public class HDFSTest {
byte[] data = "HDFSTest#testDeletePathIfEmpty".getBytes(ConfigConstants.DEFAULT_CHARSET);
for (Path file: Arrays.asList(singleFile, directoryFile)) {
- org.apache.flink.core.fs.FSDataOutputStream outputStream = fs.create(file, true);
+ org.apache.flink.core.fs.FSDataOutputStream outputStream = fs.create(file, FileSystem.WriteMode.OVERWRITE);
outputStream.write(data);
outputStream.close();
}
http://git-wip-us.apache.org/repos/asf/flink/blob/d7bf7eeb/flink-runtime/src/main/java/org/apache/flink/runtime/blob/FileSystemBlobStore.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/blob/FileSystemBlobStore.java b/flink-runtime/src/main/java/org/apache/flink/runtime/blob/FileSystemBlobStore.java
index b54756c..f3607d8 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/blob/FileSystemBlobStore.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/blob/FileSystemBlobStore.java
@@ -74,7 +74,7 @@ public class FileSystemBlobStore implements BlobStoreService {
}
private void put(File fromFile, String toBlobPath) throws IOException {
- try (OutputStream os = fileSystem.create(new Path(toBlobPath), true)) {
+ try (OutputStream os = fileSystem.create(new Path(toBlobPath), FileSystem.WriteMode.OVERWRITE)) {
LOG.debug("Copying from {} to {}.", fromFile, toBlobPath);
Files.copy(fromFile, os);
}
http://git-wip-us.apache.org/repos/asf/flink/blob/d7bf7eeb/flink-runtime/src/main/java/org/apache/flink/runtime/filecache/FileCache.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/filecache/FileCache.java b/flink-runtime/src/main/java/org/apache/flink/runtime/filecache/FileCache.java
index 84b8feb..d78801d 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/filecache/FileCache.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/filecache/FileCache.java
@@ -252,7 +252,7 @@ public class FileCache {
copy(content.getPath(), new Path(localPath), executable);
}
} else {
- try (FSDataOutputStream lfsOutput = tFS.create(targetPath, false); FSDataInputStream fsInput = sFS.open(sourcePath)) {
+ try (FSDataOutputStream lfsOutput = tFS.create(targetPath, FileSystem.WriteMode.NO_OVERWRITE); FSDataInputStream fsInput = sFS.open(sourcePath)) {
IOUtils.copyBytes(fsInput, lfsOutput);
//noinspection ResultOfMethodCallIgnored
new File(targetPath.toString()).setExecutable(executable);
http://git-wip-us.apache.org/repos/asf/flink/blob/d7bf7eeb/flink-runtime/src/main/java/org/apache/flink/runtime/state/filesystem/FsCheckpointStreamFactory.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/state/filesystem/FsCheckpointStreamFactory.java b/flink-runtime/src/main/java/org/apache/flink/runtime/state/filesystem/FsCheckpointStreamFactory.java
index 8455d84..a824651 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/state/filesystem/FsCheckpointStreamFactory.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/state/filesystem/FsCheckpointStreamFactory.java
@@ -359,7 +359,7 @@ public class FsCheckpointStreamFactory implements CheckpointStreamFactory {
for (int attempt = 0; attempt < 10; attempt++) {
try {
statePath = createStatePath();
- outStream = fs.create(statePath, false);
+ outStream = fs.create(statePath, FileSystem.WriteMode.NO_OVERWRITE);
break;
}
catch (Exception e) {
http://git-wip-us.apache.org/repos/asf/flink/blob/d7bf7eeb/flink-runtime/src/main/java/org/apache/flink/runtime/zookeeper/filesystem/FileSystemStateStorageHelper.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/zookeeper/filesystem/FileSystemStateStorageHelper.java b/flink-runtime/src/main/java/org/apache/flink/runtime/zookeeper/filesystem/FileSystemStateStorageHelper.java
index 7658afb..fcad617 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/zookeeper/filesystem/FileSystemStateStorageHelper.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/zookeeper/filesystem/FileSystemStateStorageHelper.java
@@ -62,7 +62,7 @@ public class FileSystemStateStorageHelper<T extends Serializable> implements Ret
for (int attempt = 0; attempt < 10; attempt++) {
Path filePath = getNewFilePath();
- try (FSDataOutputStream outStream = fs.create(filePath, false)) {
+ try (FSDataOutputStream outStream = fs.create(filePath, FileSystem.WriteMode.NO_OVERWRITE)) {
InstantiationUtil.serializeObject(outStream, state);
return new RetrievableStreamStateHandle<T>(filePath, outStream.getPos());
}
http://git-wip-us.apache.org/repos/asf/flink/blob/d7bf7eeb/flink-runtime/src/test/java/org/apache/flink/runtime/checkpoint/savepoint/MigrationV0ToV1Test.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/checkpoint/savepoint/MigrationV0ToV1Test.java b/flink-runtime/src/test/java/org/apache/flink/runtime/checkpoint/savepoint/MigrationV0ToV1Test.java
index 1ecb2e3..16f3769 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/checkpoint/savepoint/MigrationV0ToV1Test.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/checkpoint/savepoint/MigrationV0ToV1Test.java
@@ -109,7 +109,7 @@ public class MigrationV0ToV1Test {
}
try {
- fdos = fs.create(path, false);
+ fdos = fs.create(path, FileSystem.WriteMode.NO_OVERWRITE);
break;
} catch (Exception e) {
latestException = e;
http://git-wip-us.apache.org/repos/asf/flink/blob/d7bf7eeb/flink-runtime/src/test/java/org/apache/flink/runtime/checkpoint/savepoint/SavepointStoreTest.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/checkpoint/savepoint/SavepointStoreTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/checkpoint/savepoint/SavepointStoreTest.java
index 391102c..0444936 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/checkpoint/savepoint/SavepointStoreTest.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/checkpoint/savepoint/SavepointStoreTest.java
@@ -104,7 +104,7 @@ public class SavepointStoreTest {
public void testUnexpectedSavepoint() throws Exception {
// Random file
Path filePath = new Path(tmp.getRoot().getPath(), UUID.randomUUID().toString());
- FSDataOutputStream fdos = FileSystem.get(filePath.toUri()).create(filePath, false);
+ FSDataOutputStream fdos = FileSystem.get(filePath.toUri()).create(filePath, FileSystem.WriteMode.NO_OVERWRITE);
DataOutputStream dos = new DataOutputStream(fdos);
for (int i = 0; i < 10; i++) {
dos.writeLong(ThreadLocalRandom.current().nextLong());
http://git-wip-us.apache.org/repos/asf/flink/blob/d7bf7eeb/flink-runtime/src/test/java/org/apache/flink/runtime/state/filesystem/FsCheckpointStateOutputStreamTest.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/state/filesystem/FsCheckpointStateOutputStreamTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/state/filesystem/FsCheckpointStateOutputStreamTest.java
index 980075d..95d00a9 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/state/filesystem/FsCheckpointStateOutputStreamTest.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/state/filesystem/FsCheckpointStateOutputStreamTest.java
@@ -130,7 +130,7 @@ public class FsCheckpointStateOutputStreamTest {
final ArgumentCaptor<Path> pathCaptor = ArgumentCaptor.forClass(Path.class);
- when(fs.create(pathCaptor.capture(), anyBoolean())).thenReturn(outputStream);
+ when(fs.create(pathCaptor.capture(), any(FileSystem.WriteMode.class))).thenReturn(outputStream);
CheckpointStreamFactory.CheckpointStateOutputStream stream = new FsCheckpointStreamFactory.FsCheckpointStateOutputStream(
TEMP_DIR_PATH,
@@ -141,7 +141,7 @@ public class FsCheckpointStateOutputStreamTest {
// this should create the underlying file stream
stream.write(new byte[]{1,2,3,4,5});
- verify(fs).create(any(Path.class), anyBoolean());
+ verify(fs).create(any(Path.class), any(FileSystem.WriteMode.class));
stream.close();
@@ -158,7 +158,7 @@ public class FsCheckpointStateOutputStreamTest {
final ArgumentCaptor<Path> pathCaptor = ArgumentCaptor.forClass(Path.class);
- when(fs.create(pathCaptor.capture(), anyBoolean())).thenReturn(outputStream);
+ when(fs.create(pathCaptor.capture(), any(FileSystem.WriteMode.class))).thenReturn(outputStream);
doThrow(new IOException("Test IOException.")).when(outputStream).close();
CheckpointStreamFactory.CheckpointStateOutputStream stream = new FsCheckpointStreamFactory.FsCheckpointStateOutputStream(
@@ -170,7 +170,7 @@ public class FsCheckpointStateOutputStreamTest {
// this should create the underlying file stream
stream.write(new byte[]{1,2,3,4,5});
- verify(fs).create(any(Path.class), anyBoolean());
+ verify(fs).create(any(Path.class), any(FileSystem.WriteMode.class));
try {
stream.closeAndGetHandle();