This is an automated email from the ASF dual-hosted git repository. pnowojski pushed a commit to branch release-1.11 in repository https://gitbox.apache.org/repos/asf/flink.git
commit 1379548cf96b1f59aff21d7797390b805a599c08 Author: Roman Khachatryan <[email protected]> AuthorDate: Thu May 7 15:31:51 2020 +0200 [FLINK-17547][task][hotfix] Move RefCountedFile to flink-core to use it in SpanningWrapper --- .../src/main/java/org/apache/flink/core/fs}/RefCountedFile.java | 4 ++-- .../src/main/java/org/apache/flink/util}/RefCounted.java | 2 +- .../src/test/java/org/apache/flink/core/fs}/RefCountedFileTest.java | 2 +- .../org/apache/flink/fs/s3/common/utils/RefCountedFSOutputStream.java | 1 + .../org/apache/flink/fs/s3/common/utils/RefCountedFileWithStream.java | 1 + 5 files changed, 6 insertions(+), 4 deletions(-) diff --git a/flink-filesystems/flink-s3-fs-base/src/main/java/org/apache/flink/fs/s3/common/utils/RefCountedFile.java b/flink-core/src/main/java/org/apache/flink/core/fs/RefCountedFile.java similarity index 96% rename from flink-filesystems/flink-s3-fs-base/src/main/java/org/apache/flink/fs/s3/common/utils/RefCountedFile.java rename to flink-core/src/main/java/org/apache/flink/core/fs/RefCountedFile.java index 9675f09..7cbc47f 100644 --- a/flink-filesystems/flink-s3-fs-base/src/main/java/org/apache/flink/fs/s3/common/utils/RefCountedFile.java +++ b/flink-core/src/main/java/org/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-filesystems/flink-s3-fs-base/src/main/java/org/apache/flink/fs/s3/common/utils/RefCounted.java b/flink-core/src/main/java/org/apache/flink/util/RefCounted.java similarity index 96% rename from flink-filesystems/flink-s3-fs-base/src/main/java/org/apache/flink/fs/s3/common/utils/RefCounted.java rename to flink-core/src/main/java/org/apache/flink/util/RefCounted.java index 84b0fa0..33496a0 100644 --- a/flink-filesystems/flink-s3-fs-base/src/main/java/org/apache/flink/fs/s3/common/utils/RefCounted.java +++ b/flink-core/src/main/java/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/flink-filesystems/flink-s3-fs-base/src/test/java/org/apache/flink/fs/s3/common/utils/RefCountedFileTest.java b/flink-core/src/test/java/org/apache/flink/core/fs/RefCountedFileTest.java similarity index 98% rename from flink-filesystems/flink-s3-fs-base/src/test/java/org/apache/flink/fs/s3/common/utils/RefCountedFileTest.java rename to flink-core/src/test/java/org/apache/flink/core/fs/RefCountedFileTest.java index 217f4e1..58ca29a 100644 --- a/flink-filesystems/flink-s3-fs-base/src/test/java/org/apache/flink/fs/s3/common/utils/RefCountedFileTest.java +++ b/flink-core/src/test/java/org/apache/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/flink-filesystems/flink-s3-fs-base/src/main/java/org/apache/flink/fs/s3/common/utils/RefCountedFSOutputStream.java b/flink-filesystems/flink-s3-fs-base/src/main/java/org/apache/flink/fs/s3/common/utils/RefCountedFSOutputStream.java index d51e37e..a36175d 100644 --- a/flink-filesystems/flink-s3-fs-base/src/main/java/org/apache/flink/fs/s3/common/utils/RefCountedFSOutputStream.java +++ b/flink-filesystems/flink-s3-fs-base/src/main/java/org/apache/flink/fs/s3/common/utils/RefCountedFSOutputStream.java @@ -20,6 +20,7 @@ package org.apache.flink.fs.s3.common.utils; 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/flink-filesystems/flink-s3-fs-base/src/main/java/org/apache/flink/fs/s3/common/utils/RefCountedFileWithStream.java b/flink-filesystems/flink-s3-fs-base/src/main/java/org/apache/flink/fs/s3/common/utils/RefCountedFileWithStream.java index 94b8527..bcb0057 100644 --- a/flink-filesystems/flink-s3-fs-base/src/main/java/org/apache/flink/fs/s3/common/utils/RefCountedFileWithStream.java +++ b/flink-filesystems/flink-s3-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;
