[FLINK-17547][task][hotfix] Move RefCountedFile to flink-core

to use it in SpanningWrapper
tongcheng-elong · May 19, 2020 · 2fcc1fc · 2fcc1fc
1 parent 179de29
commit 2fcc1fc
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 4 deletions.
diff --git a/...nk/fs/s3/common/utils/RefCountedFile.java → .../apache/flink/core/fs/RefCountedFile.java b/...nk/fs/s3/common/utils/RefCountedFile.java → .../apache/flink/core/fs/RefCountedFile.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.apache.flink.fs.s3.common.utils;
+package org.apache.flink.core.fs;
 
 import org.apache.flink.annotation.Internal;
 import org.apache.flink.annotation.VisibleForTesting;
@@ -43,7 +43,7 @@ public class RefCountedFile implements RefCounted {
 
  protected boolean closed;
 
- protected RefCountedFile(final File file) {
+ public RefCountedFile(final File file) {
  this.file = checkNotNull(file);
  this.references = new AtomicInteger(1);
  this.closed = false;

diff --git a/.../flink/fs/s3/common/utils/RefCounted.java → ...ava/org/apache/flink/util/RefCounted.java b/.../flink/fs/s3/common/utils/RefCounted.java → ...ava/org/apache/flink/util/RefCounted.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.apache.flink.fs.s3.common.utils;
+package org.apache.flink.util;
 
 import org.apache.flink.annotation.Internal;
 

diff --git a/...s/s3/common/utils/RefCountedFileTest.java → ...che/flink/core/fs/RefCountedFileTest.java b/...s/s3/common/utils/RefCountedFileTest.java → ...che/flink/core/fs/RefCountedFileTest.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.apache.flink.fs.s3.common.utils;
+package org.apache.flink.core.fs;
 
 import org.junit.Assert;
 import org.junit.Rule;

diff --git a/...3-fs-base/src/main/java/org/apache/flink/fs/s3/common/utils/RefCountedFSOutputStream.java b/...3-fs-base/src/main/java/org/apache/flink/fs/s3/common/utils/RefCountedFSOutputStream.java
@@ -20,6 +20,7 @@
 
 import org.apache.flink.annotation.Internal;
 import org.apache.flink.core.fs.FSDataOutputStream;
+import org.apache.flink.util.RefCounted;
 
 import java.io.File;
 import java.io.IOException;

diff --git a/...3-fs-base/src/main/java/org/apache/flink/fs/s3/common/utils/RefCountedFileWithStream.java b/...3-fs-base/src/main/java/org/apache/flink/fs/s3/common/utils/RefCountedFileWithStream.java
@@ -19,6 +19,7 @@
 package org.apache.flink.fs.s3.common.utils;
 
 import org.apache.flink.annotation.Internal;
+import org.apache.flink.core.fs.RefCountedFile;
 import org.apache.flink.util.IOUtils;
 
 import java.io.File;