Repository: flink Updated Branches: refs/heads/master f0d96e30d -> 19ef82cf3
[FLINK-5617] Mark some methods as PublicEvolving or Internal This closes #3195 Project: http://git-wip-us.apache.org/repos/asf/flink/repo Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/19ef82cf Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/19ef82cf Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/19ef82cf Branch: refs/heads/master Commit: 19ef82cf358da54bf204e678bf203f25147b11f9 Parents: 20c76a9 Author: Robert Metzger <rmetz...@apache.org> Authored: Mon Jan 23 16:28:48 2017 +0100 Committer: Robert Metzger <rmetz...@apache.org> Committed: Tue Jan 24 12:01:35 2017 +0100 ---------------------------------------------------------------------- .../main/java/org/apache/flink/api/common/ExecutionConfig.java | 2 ++ .../src/main/java/org/apache/flink/core/fs/FileSystem.java | 4 ++++ .../flink/streaming/api/datastream/AllWindowedStream.java | 5 ++++- .../apache/flink/streaming/api/datastream/WindowedStream.java | 4 ++++ 4 files changed, 14 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flink/blob/19ef82cf/flink-core/src/main/java/org/apache/flink/api/common/ExecutionConfig.java ---------------------------------------------------------------------- diff --git a/flink-core/src/main/java/org/apache/flink/api/common/ExecutionConfig.java b/flink-core/src/main/java/org/apache/flink/api/common/ExecutionConfig.java index 3cde5e7..32ea0a3 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/ExecutionConfig.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/ExecutionConfig.java @@ -19,6 +19,7 @@ package org.apache.flink.api.common; import com.esotericsoftware.kryo.Serializer; +import org.apache.flink.annotation.Internal; import org.apache.flink.annotation.Public; import org.apache.flink.annotation.PublicEvolving; import org.apache.flink.api.common.restartstrategy.RestartStrategies; @@ -848,6 +849,7 @@ public class ExecutionConfig implements Serializable, Archiveable<ArchivedExecut } @Override + @Internal public ArchivedExecutionConfig archive() { return new ArchivedExecutionConfig(this); } http://git-wip-us.apache.org/repos/asf/flink/blob/19ef82cf/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 e6313aa..33addbb 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 @@ -25,6 +25,7 @@ package org.apache.flink.core.fs; +import org.apache.flink.annotation.Internal; import org.apache.flink.annotation.Public; import org.apache.flink.configuration.ConfigConstants; import org.apache.flink.configuration.Configuration; @@ -97,6 +98,7 @@ public abstract class FileSystem { * Create a SafetyNetCloseableRegistry for a Task. This method should be called at the beginning of the task's * main thread. */ + @Internal public static void createFileSystemCloseableRegistryForTask() { SafetyNetCloseableRegistry oldRegistry = REGISTRIES.get(); if (null != oldRegistry) { @@ -111,6 +113,7 @@ public abstract class FileSystem { * Create a SafetyNetCloseableRegistry for a Task. This method should be called at the end of the task's * main thread or when the task should be canceled. */ + @Internal public static void disposeFileSystemCloseableRegistryForTask() { SafetyNetCloseableRegistry registry = REGISTRIES.get(); if (null != registry) { @@ -200,6 +203,7 @@ public abstract class FileSystem { } } + @Internal public static FileSystem getUnguardedFileSystem(URI uri) throws IOException { FileSystem fs; http://git-wip-us.apache.org/repos/asf/flink/blob/19ef82cf/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/datastream/AllWindowedStream.java ---------------------------------------------------------------------- diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/datastream/AllWindowedStream.java b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/datastream/AllWindowedStream.java index ae71ce5..31ea001 100644 --- a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/datastream/AllWindowedStream.java +++ b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/datastream/AllWindowedStream.java @@ -199,7 +199,7 @@ public class AllWindowedStream<T, W extends Window> { * @param function The window function. * @return The data stream that is the result of applying the window function to the window. */ - + @PublicEvolving public <R> SingleOutputStreamOperator<R> reduce(ReduceFunction<T> reduceFunction, AllWindowFunction<T, R, W> function) { TypeInformation<T> inType = input.getType(); TypeInformation<R> resultType = TypeExtractor.getUnaryOperatorReturnType( @@ -221,6 +221,7 @@ public class AllWindowedStream<T, W extends Window> { * @param resultType Type information for the result type of the window function * @return The data stream that is the result of applying the window function to the window. */ + @PublicEvolving public <R> SingleOutputStreamOperator<R> reduce(ReduceFunction<T> reduceFunction, AllWindowFunction<T, R, W> function, TypeInformation<R> resultType) { if (reduceFunction instanceof RichFunction) { throw new UnsupportedOperationException("ReduceFunction of reduce can not be a RichFunction."); @@ -330,6 +331,7 @@ public class AllWindowedStream<T, W extends Window> { * @param function The window function. * @return The data stream that is the result of applying the window function to the window. */ + @PublicEvolving public <ACC, R> SingleOutputStreamOperator<R> fold(ACC initialValue, FoldFunction<T, ACC> foldFunction, AllWindowFunction<ACC, R, W> function) { TypeInformation<ACC> foldAccumulatorType = TypeExtractor.getFoldReturnTypes(foldFunction, input.getType(), @@ -356,6 +358,7 @@ public class AllWindowedStream<T, W extends Window> { * @param resultType Type information for the result type of the window function * @return The data stream that is the result of applying the window function to the window. */ + @PublicEvolving public <ACC, R> SingleOutputStreamOperator<R> fold(ACC initialValue, FoldFunction<T, ACC> foldFunction, AllWindowFunction<ACC, R, W> function, http://git-wip-us.apache.org/repos/asf/flink/blob/19ef82cf/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/datastream/WindowedStream.java ---------------------------------------------------------------------- diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/datastream/WindowedStream.java b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/datastream/WindowedStream.java index 225d5cb..0a02885 100644 --- a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/datastream/WindowedStream.java +++ b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/datastream/WindowedStream.java @@ -231,6 +231,7 @@ public class WindowedStream<T, K, W extends Window> { * @param function The window function. * @return The data stream that is the result of applying the window function to the window. */ + @PublicEvolving public <R> SingleOutputStreamOperator<R> reduce(ReduceFunction<T> reduceFunction, WindowFunction<T, R, K, W> function) { return reduce(reduceFunction, function, LegacyWindowOperatorType.NONE); } @@ -248,6 +249,7 @@ public class WindowedStream<T, K, W extends Window> { * @param resultType Type information for the result type of the window function * @return The data stream that is the result of applying the window function to the window. */ + @PublicEvolving public <R> SingleOutputStreamOperator<R> reduce( ReduceFunction<T> reduceFunction, WindowFunction<T, R, K, W> function, @@ -415,6 +417,7 @@ public class WindowedStream<T, K, W extends Window> { * @param function The window function. * @return The data stream that is the result of applying the window function to the window. */ + @PublicEvolving public <ACC, R> SingleOutputStreamOperator<R> fold(ACC initialValue, FoldFunction<T, ACC> foldFunction, WindowFunction<ACC, R, K, W> function) { TypeInformation<ACC> foldAccumulatorType = TypeExtractor.getFoldReturnTypes(foldFunction, input.getType(), @@ -441,6 +444,7 @@ public class WindowedStream<T, K, W extends Window> { * @param resultType Type information for the result type of the window function * @return The data stream that is the result of applying the window function to the window. */ + @PublicEvolving public <ACC, R> SingleOutputStreamOperator<R> fold(ACC initialValue, FoldFunction<T, ACC> foldFunction, WindowFunction<ACC, R, K, W> function,
