[FLINK-3367] Add PublicEvolving and Internal annotations to flink-core
Project: http://git-wip-us.apache.org/repos/asf/flink/repo Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/53f8d773 Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/53f8d773 Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/53f8d773 Branch: refs/heads/master Commit: 53f8d773be5e1fd36e8675c2ca2520b6153febf3 Parents: e5f33b6 Author: Fabian Hueske <[email protected]> Authored: Mon Feb 8 16:57:08 2016 +0100 Committer: Fabian Hueske <[email protected]> Committed: Sun Feb 14 20:49:18 2016 +0100 ---------------------------------------------------------------------- .../main/java/org/apache/flink/api/common/ApplicationID.java | 2 ++ .../main/java/org/apache/flink/api/common/CodeAnalysisMode.java | 4 ++-- .../org/apache/flink/api/common/InvalidProgramException.java | 3 +++ .../flink/api/common/NonSerializableUserCodeException.java | 3 +++ flink-core/src/main/java/org/apache/flink/api/common/Plan.java | 2 ++ .../src/main/java/org/apache/flink/api/common/PlanExecutor.java | 2 ++ .../src/main/java/org/apache/flink/api/common/Program.java | 3 +++ .../java/org/apache/flink/api/common/ProgramDescription.java | 3 +++ .../src/main/java/org/apache/flink/api/common/TaskInfo.java | 3 +++ .../apache/flink/api/common/accumulators/AccumulatorHelper.java | 2 ++ .../org/apache/flink/api/common/accumulators/DoubleCounter.java | 3 +++ .../org/apache/flink/api/common/accumulators/IntCounter.java | 3 +++ .../org/apache/flink/api/common/accumulators/LongCounter.java | 3 +++ .../api/common/accumulators/SerializedListAccumulator.java | 2 ++ .../org/apache/flink/api/common/aggregators/Aggregator.java | 2 ++ .../apache/flink/api/common/aggregators/AggregatorRegistry.java | 2 ++ .../apache/flink/api/common/aggregators/AggregatorWithName.java | 2 ++ .../flink/api/common/aggregators/ConvergenceCriterion.java | 2 ++ .../flink/api/common/aggregators/DoubleSumAggregator.java | 2 ++ .../flink/api/common/aggregators/DoubleZeroConvergence.java | 2 ++ .../apache/flink/api/common/aggregators/LongSumAggregator.java | 2 ++ .../flink/api/common/aggregators/LongZeroConvergence.java | 2 ++ .../flink/api/common/distributions/CommonRangeBoundaries.java | 2 ++ .../apache/flink/api/common/distributions/DataDistribution.java | 2 ++ .../apache/flink/api/common/distributions/RangeBoundaries.java | 3 +++ .../flink/api/common/distributions/SimpleDistribution.java | 2 ++ .../api/common/distributions/SimpleIntegerDistribution.java | 2 ++ .../api/common/distributions/UniformDoubleDistribution.java | 3 ++- .../api/common/distributions/UniformIntegerDistribution.java | 3 ++- .../api/common/functions/util/AbstractRuntimeUDFContext.java | 1 + .../apache/flink/api/common/functions/util/CopyingIterator.java | 2 ++ .../flink/api/common/functions/util/CopyingListCollector.java | 2 ++ .../apache/flink/api/common/functions/util/FunctionUtils.java | 2 ++ .../apache/flink/api/common/functions/util/ListCollector.java | 2 ++ .../apache/flink/api/common/functions/util/NoOpFunction.java | 3 ++- .../flink/api/common/functions/util/RuntimeUDFContext.java | 2 ++ .../apache/flink/api/common/io/DefaultInputSplitAssigner.java | 2 ++ .../org/apache/flink/api/common/io/GenericCsvInputFormat.java | 2 ++ .../java/org/apache/flink/api/common/io/ParseException.java | 3 +++ .../org/apache/flink/api/common/io/ReplicatingInputFormat.java | 2 ++ .../flink/api/common/io/ReplicatingInputSplitAssigner.java | 2 ++ .../org/apache/flink/api/common/io/StrictlyLocalAssignment.java | 2 ++ .../io/compression/DeflateInflaterInputStreamFactory.java | 3 +++ .../common/io/compression/GzipInflaterInputStreamFactory.java | 3 +++ .../api/common/io/compression/InflaterInputStreamFactory.java | 3 +++ .../apache/flink/api/common/operators/AbstractUdfOperator.java | 2 ++ .../flink/api/common/operators/BinaryOperatorInformation.java | 2 ++ .../apache/flink/api/common/operators/CollectionExecutor.java | 2 ++ .../org/apache/flink/api/common/operators/CompilerHints.java | 2 ++ .../apache/flink/api/common/operators/DualInputOperator.java | 2 ++ .../flink/api/common/operators/DualInputSemanticProperties.java | 2 ++ .../apache/flink/api/common/operators/GenericDataSinkBase.java | 2 ++ .../flink/api/common/operators/GenericDataSourceBase.java | 2 ++ .../apache/flink/api/common/operators/IterationOperator.java | 2 ++ .../main/java/org/apache/flink/api/common/operators/Keys.java | 2 ++ .../java/org/apache/flink/api/common/operators/Operator.java | 2 ++ .../apache/flink/api/common/operators/OperatorInformation.java | 2 ++ .../java/org/apache/flink/api/common/operators/Ordering.java | 2 ++ .../apache/flink/api/common/operators/SemanticProperties.java | 2 ++ .../apache/flink/api/common/operators/SingleInputOperator.java | 2 ++ .../api/common/operators/SingleInputSemanticProperties.java | 2 ++ .../flink/api/common/operators/UnaryOperatorInformation.java | 2 ++ .../main/java/org/apache/flink/api/common/operators/Union.java | 2 ++ .../flink/api/common/operators/base/BulkIterationBase.java | 2 ++ .../flink/api/common/operators/base/CoGroupOperatorBase.java | 2 ++ .../flink/api/common/operators/base/CoGroupRawOperatorBase.java | 2 ++ .../flink/api/common/operators/base/CrossOperatorBase.java | 2 ++ .../flink/api/common/operators/base/DeltaIterationBase.java | 2 ++ .../flink/api/common/operators/base/FilterOperatorBase.java | 2 ++ .../flink/api/common/operators/base/FlatMapOperatorBase.java | 2 ++ .../api/common/operators/base/GroupCombineOperatorBase.java | 2 ++ .../api/common/operators/base/GroupReduceOperatorBase.java | 2 ++ .../flink/api/common/operators/base/InnerJoinOperatorBase.java | 2 ++ .../flink/api/common/operators/base/JoinOperatorBase.java | 4 ++++ .../apache/flink/api/common/operators/base/MapOperatorBase.java | 2 ++ .../api/common/operators/base/MapPartitionOperatorBase.java | 2 ++ .../flink/api/common/operators/base/OuterJoinOperatorBase.java | 2 ++ .../flink/api/common/operators/base/PartitionOperatorBase.java | 4 +++- .../flink/api/common/operators/base/ReduceOperatorBase.java | 2 ++ .../api/common/operators/base/SortPartitionOperatorBase.java | 2 ++ .../org/apache/flink/api/common/operators/util/FieldList.java | 2 ++ .../org/apache/flink/api/common/operators/util/FieldSet.java | 3 +++ .../org/apache/flink/api/common/operators/util/JoinHashMap.java | 2 ++ .../flink/api/common/operators/util/ListKeyGroupedIterator.java | 2 ++ .../apache/flink/api/common/operators/util/TypeComparable.java | 2 ++ .../flink/api/common/operators/util/UserCodeClassWrapper.java | 2 ++ .../flink/api/common/operators/util/UserCodeObjectWrapper.java | 2 ++ .../apache/flink/api/common/operators/util/UserCodeWrapper.java | 3 +++ .../java/org/apache/flink/api/common/state/FoldingState.java | 3 +++ .../apache/flink/api/common/state/FoldingStateDescriptor.java | 2 ++ .../main/java/org/apache/flink/api/common/state/ListState.java | 3 +++ .../org/apache/flink/api/common/state/ListStateDescriptor.java | 2 ++ .../java/org/apache/flink/api/common/state/MergingState.java | 3 +++ .../java/org/apache/flink/api/common/state/OperatorState.java | 5 ++++- .../java/org/apache/flink/api/common/state/ReducingState.java | 3 +++ .../apache/flink/api/common/state/ReducingStateDescriptor.java | 2 ++ .../src/main/java/org/apache/flink/api/common/state/State.java | 3 +++ .../java/org/apache/flink/api/common/state/StateBackend.java | 3 +++ .../java/org/apache/flink/api/common/state/StateDescriptor.java | 2 ++ .../main/java/org/apache/flink/api/common/state/ValueState.java | 4 ++-- .../org/apache/flink/api/common/state/ValueStateDescriptor.java | 2 ++ .../flink/api/common/typeutils/CompositeTypeComparator.java | 3 +++ .../flink/api/common/typeutils/GenericPairComparator.java | 4 +++- .../org/apache/flink/api/common/typeutils/TypeComparator.java | 2 ++ .../flink/api/common/typeutils/TypeComparatorFactory.java | 2 ++ .../apache/flink/api/common/typeutils/TypePairComparator.java | 3 +++ .../flink/api/common/typeutils/TypePairComparatorFactory.java | 3 +++ .../org/apache/flink/api/common/typeutils/TypeSerializer.java | 2 ++ .../flink/api/common/typeutils/TypeSerializerFactory.java | 3 ++- .../flink/api/common/typeutils/base/BasicTypeComparator.java | 3 ++- .../flink/api/common/typeutils/base/BooleanComparator.java | 4 ++-- .../flink/api/common/typeutils/base/BooleanSerializer.java | 2 ++ .../flink/api/common/typeutils/base/BooleanValueSerializer.java | 3 ++- .../apache/flink/api/common/typeutils/base/ByteComparator.java | 4 ++-- .../apache/flink/api/common/typeutils/base/ByteSerializer.java | 3 ++- .../flink/api/common/typeutils/base/ByteValueSerializer.java | 3 ++- .../apache/flink/api/common/typeutils/base/CharComparator.java | 4 ++-- .../apache/flink/api/common/typeutils/base/CharSerializer.java | 3 ++- .../flink/api/common/typeutils/base/CharValueSerializer.java | 2 ++ .../apache/flink/api/common/typeutils/base/DateComparator.java | 3 ++- .../apache/flink/api/common/typeutils/base/DateSerializer.java | 3 ++- .../flink/api/common/typeutils/base/DoubleComparator.java | 4 ++-- .../flink/api/common/typeutils/base/DoubleSerializer.java | 2 ++ .../flink/api/common/typeutils/base/DoubleValueSerializer.java | 3 ++- .../apache/flink/api/common/typeutils/base/EnumComparator.java | 2 ++ .../apache/flink/api/common/typeutils/base/EnumSerializer.java | 5 +++-- .../apache/flink/api/common/typeutils/base/FloatComparator.java | 4 ++-- .../apache/flink/api/common/typeutils/base/FloatSerializer.java | 2 ++ .../flink/api/common/typeutils/base/FloatValueSerializer.java | 3 ++- .../flink/api/common/typeutils/base/GenericArraySerializer.java | 2 ++ .../apache/flink/api/common/typeutils/base/IntComparator.java | 4 ++-- .../apache/flink/api/common/typeutils/base/IntSerializer.java | 3 ++- .../flink/api/common/typeutils/base/IntValueSerializer.java | 3 ++- .../apache/flink/api/common/typeutils/base/LongComparator.java | 4 ++-- .../apache/flink/api/common/typeutils/base/LongSerializer.java | 3 ++- .../flink/api/common/typeutils/base/LongValueSerializer.java | 3 ++- .../apache/flink/api/common/typeutils/base/ShortComparator.java | 4 ++-- .../apache/flink/api/common/typeutils/base/ShortSerializer.java | 3 ++- .../flink/api/common/typeutils/base/ShortValueSerializer.java | 3 ++- .../flink/api/common/typeutils/base/StringComparator.java | 4 ++-- .../flink/api/common/typeutils/base/StringSerializer.java | 3 ++- .../flink/api/common/typeutils/base/StringValueSerializer.java | 3 ++- .../api/common/typeutils/base/TypeSerializerSingleton.java | 2 ++ .../apache/flink/api/common/typeutils/base/VoidSerializer.java | 2 ++ .../typeutils/base/array/BooleanPrimitiveArrayComparator.java | 3 +++ .../typeutils/base/array/BooleanPrimitiveArraySerializer.java | 2 ++ .../typeutils/base/array/BytePrimitiveArrayComparator.java | 3 +++ .../typeutils/base/array/BytePrimitiveArraySerializer.java | 2 ++ .../typeutils/base/array/CharPrimitiveArrayComparator.java | 3 +++ .../typeutils/base/array/CharPrimitiveArraySerializer.java | 2 ++ .../typeutils/base/array/DoublePrimitiveArrayComparator.java | 3 +++ .../typeutils/base/array/DoublePrimitiveArraySerializer.java | 2 ++ .../typeutils/base/array/FloatPrimitiveArrayComparator.java | 3 +++ .../typeutils/base/array/FloatPrimitiveArraySerializer.java | 2 ++ .../typeutils/base/array/IntPrimitiveArrayComparator.java | 3 +++ .../typeutils/base/array/IntPrimitiveArraySerializer.java | 2 ++ .../typeutils/base/array/LongPrimitiveArrayComparator.java | 3 +++ .../typeutils/base/array/LongPrimitiveArraySerializer.java | 2 ++ .../common/typeutils/base/array/PrimitiveArrayComparator.java | 3 +++ .../typeutils/base/array/ShortPrimitiveArrayComparator.java | 3 +++ .../typeutils/base/array/ShortPrimitiveArraySerializer.java | 2 ++ .../api/common/typeutils/base/array/StringArraySerializer.java | 2 ++ .../java/org/apache/flink/api/java/typeutils/PojoField.java | 4 +++- .../org/apache/flink/api/java/typeutils/runtime/KryoUtils.java | 2 ++ .../flink/api/java/typeutils/runtime/kryo/Serializers.java | 2 ++ .../org/apache/flink/configuration/GlobalConfiguration.java | 2 ++ .../flink/configuration/IllegalConfigurationException.java | 3 +++ .../java/org/apache/flink/core/fs/HadoopFileSystemWrapper.java | 3 +++ .../java/org/apache/flink/core/fs/local/LocalBlockLocation.java | 2 ++ .../org/apache/flink/core/fs/local/LocalDataInputStream.java | 2 ++ .../org/apache/flink/core/fs/local/LocalDataOutputStream.java | 2 ++ .../java/org/apache/flink/core/fs/local/LocalFileStatus.java | 2 ++ .../java/org/apache/flink/core/fs/local/LocalFileSystem.java | 2 ++ .../main/java/org/apache/flink/core/io/InputSplitAssigner.java | 3 +++ .../apache/flink/core/memory/DataInputViewStreamWrapper.java | 3 +++ .../apache/flink/core/memory/DataOutputViewStreamWrapper.java | 3 +++ .../java/org/apache/flink/core/memory/HeapMemorySegment.java | 3 +++ .../java/org/apache/flink/core/memory/HybridMemorySegment.java | 3 +++ .../main/java/org/apache/flink/core/memory/MemorySegment.java | 3 +++ .../java/org/apache/flink/core/memory/MemorySegmentFactory.java | 3 +++ .../java/org/apache/flink/core/memory/MemorySegmentSource.java | 3 +++ .../src/main/java/org/apache/flink/core/memory/MemoryType.java | 3 +++ .../src/main/java/org/apache/flink/core/memory/MemoryUtils.java | 3 +++ .../org/apache/flink/core/memory/SeekableDataInputView.java | 3 +++ .../org/apache/flink/core/memory/SeekableDataOutputView.java | 3 +++ .../main/java/org/apache/flink/types/JavaToValueConverter.java | 3 +++ flink-core/src/main/java/org/apache/flink/types/Key.java | 3 +++ .../main/java/org/apache/flink/types/NullKeyFieldException.java | 3 +++ flink-core/src/main/java/org/apache/flink/types/Pair.java | 2 ++ .../main/java/org/apache/flink/types/parser/BooleanParser.java | 3 +++ .../java/org/apache/flink/types/parser/BooleanValueParser.java | 2 ++ .../src/main/java/org/apache/flink/types/parser/ByteParser.java | 2 ++ .../java/org/apache/flink/types/parser/ByteValueParser.java | 2 ++ .../main/java/org/apache/flink/types/parser/DoubleParser.java | 3 +++ .../java/org/apache/flink/types/parser/DoubleValueParser.java | 2 ++ .../main/java/org/apache/flink/types/parser/FieldParser.java | 2 ++ .../main/java/org/apache/flink/types/parser/FloatParser.java | 3 +++ .../java/org/apache/flink/types/parser/FloatValueParser.java | 2 ++ .../src/main/java/org/apache/flink/types/parser/IntParser.java | 3 +++ .../main/java/org/apache/flink/types/parser/IntValueParser.java | 2 ++ .../src/main/java/org/apache/flink/types/parser/LongParser.java | 3 +++ .../java/org/apache/flink/types/parser/LongValueParser.java | 2 ++ .../main/java/org/apache/flink/types/parser/ShortParser.java | 3 +++ .../java/org/apache/flink/types/parser/ShortValueParser.java | 2 ++ .../main/java/org/apache/flink/types/parser/StringParser.java | 3 +++ .../java/org/apache/flink/types/parser/StringValueParser.java | 2 ++ flink-core/src/main/java/org/apache/flink/util/AbstractID.java | 2 ++ .../src/main/java/org/apache/flink/util/ExceptionUtils.java | 3 +++ .../main/java/org/apache/flink/util/ExternalProcessRunner.java | 3 +++ .../src/main/java/org/apache/flink/util/InstantiationUtil.java | 2 ++ .../src/main/java/org/apache/flink/util/IterableIterator.java | 3 +++ .../java/org/apache/flink/util/MavenForkNumberPrefixLayout.java | 2 ++ .../main/java/org/apache/flink/util/MutableObjectIterator.java | 3 +++ flink-core/src/main/java/org/apache/flink/util/NetUtils.java | 2 ++ .../src/main/java/org/apache/flink/util/OperatingSystem.java | 3 +++ .../src/main/java/org/apache/flink/util/ReflectionUtil.java | 3 +++ .../src/main/java/org/apache/flink/util/SerializedValue.java | 3 +++ .../src/main/java/org/apache/flink/util/SimpleStringUtils.java | 2 ++ flink-core/src/main/java/org/apache/flink/util/StringUtils.java | 2 ++ flink-core/src/main/java/org/apache/flink/util/Visitable.java | 3 +++ flink-core/src/main/java/org/apache/flink/util/Visitor.java | 3 +++ 221 files changed, 515 insertions(+), 49 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flink/blob/53f8d773/flink-core/src/main/java/org/apache/flink/api/common/ApplicationID.java ---------------------------------------------------------------------- diff --git a/flink-core/src/main/java/org/apache/flink/api/common/ApplicationID.java b/flink-core/src/main/java/org/apache/flink/api/common/ApplicationID.java index 0de93a7..c047dfe 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/ApplicationID.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/ApplicationID.java @@ -18,6 +18,7 @@ package org.apache.flink.api.common; +import org.apache.flink.annotation.PublicEvolving; import org.apache.flink.util.AbstractID; /** @@ -26,6 +27,7 @@ import org.apache.flink.util.AbstractID; * <p>This is used to as a identifier across job submissions, which have changing job IDs (for * example after resuming an application). This is set for the execution graph. */ +@PublicEvolving public final class ApplicationID extends AbstractID { private static final long serialVersionUID = 1L; http://git-wip-us.apache.org/repos/asf/flink/blob/53f8d773/flink-core/src/main/java/org/apache/flink/api/common/CodeAnalysisMode.java ---------------------------------------------------------------------- diff --git a/flink-core/src/main/java/org/apache/flink/api/common/CodeAnalysisMode.java b/flink-core/src/main/java/org/apache/flink/api/common/CodeAnalysisMode.java index a13b653..028cfef 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/CodeAnalysisMode.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/CodeAnalysisMode.java @@ -18,7 +18,7 @@ package org.apache.flink.api.common; -import org.apache.flink.annotation.Public; +import org.apache.flink.annotation.PublicEvolving; /** * Specifies to which extent user-defined functions are analyzed in order @@ -33,7 +33,7 @@ import org.apache.flink.annotation.Public; * - Warnings if a tuple access uses a wrong index * - Information about the number of object creations (for manual optimization) */ -@Public +@PublicEvolving public enum CodeAnalysisMode { /** http://git-wip-us.apache.org/repos/asf/flink/blob/53f8d773/flink-core/src/main/java/org/apache/flink/api/common/InvalidProgramException.java ---------------------------------------------------------------------- diff --git a/flink-core/src/main/java/org/apache/flink/api/common/InvalidProgramException.java b/flink-core/src/main/java/org/apache/flink/api/common/InvalidProgramException.java index e707709..710f136 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/InvalidProgramException.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/InvalidProgramException.java @@ -18,11 +18,14 @@ package org.apache.flink.api.common; +import org.apache.flink.annotation.Public; + /** * An exception thrown to indicate that the composed program is invalid. Examples of invalid programs are * operations where crucial parameters are omitted, or functions where the input type and the type signature * do not match. */ +@Public public class InvalidProgramException extends RuntimeException { private static final long serialVersionUID = 3119881934024032887L; http://git-wip-us.apache.org/repos/asf/flink/blob/53f8d773/flink-core/src/main/java/org/apache/flink/api/common/NonSerializableUserCodeException.java ---------------------------------------------------------------------- diff --git a/flink-core/src/main/java/org/apache/flink/api/common/NonSerializableUserCodeException.java b/flink-core/src/main/java/org/apache/flink/api/common/NonSerializableUserCodeException.java index 971df23..e49bd84 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/NonSerializableUserCodeException.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/NonSerializableUserCodeException.java @@ -19,10 +19,13 @@ package org.apache.flink.api.common; +import org.apache.flink.annotation.Public; + /** * An special case of the {@link InvalidProgramException}, indicating that a part of the program * that needs to be serializable (for shipping) is not serializable. */ +@Public public class NonSerializableUserCodeException extends InvalidProgramException { private static final long serialVersionUID = 2L; http://git-wip-us.apache.org/repos/asf/flink/blob/53f8d773/flink-core/src/main/java/org/apache/flink/api/common/Plan.java ---------------------------------------------------------------------- diff --git a/flink-core/src/main/java/org/apache/flink/api/common/Plan.java b/flink-core/src/main/java/org/apache/flink/api/common/Plan.java index f70bb42..899b9d6 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/Plan.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/Plan.java @@ -34,6 +34,7 @@ import java.io.IOException; import java.net.URI; import java.net.URISyntaxException; +import org.apache.flink.annotation.Internal; import org.apache.flink.api.common.cache.DistributedCache.DistributedCacheEntry; import org.apache.flink.api.common.operators.GenericDataSinkBase; import org.apache.flink.api.common.operators.Operator; @@ -48,6 +49,7 @@ import org.apache.flink.util.Visitor; * <p>The dataflow is referenced by the data sinks, from which all connected * operators of the data flow can be reached via backwards traversal</p>. */ +@Internal public class Plan implements Visitable<Operator<?>> { /** The default parallelism indicates to use the cluster's default */ http://git-wip-us.apache.org/repos/asf/flink/blob/53f8d773/flink-core/src/main/java/org/apache/flink/api/common/PlanExecutor.java ---------------------------------------------------------------------- diff --git a/flink-core/src/main/java/org/apache/flink/api/common/PlanExecutor.java b/flink-core/src/main/java/org/apache/flink/api/common/PlanExecutor.java index cbdf137..add8b80 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/PlanExecutor.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/PlanExecutor.java @@ -18,6 +18,7 @@ package org.apache.flink.api.common; +import org.apache.flink.annotation.Internal; import org.apache.flink.configuration.Configuration; import java.net.URL; @@ -38,6 +39,7 @@ import java.util.List; * a program is submitted to a plan executor that is not running, it will start up for that * program, and shut down afterwards.</p> */ +@Internal public abstract class PlanExecutor { private static final String LOCAL_EXECUTOR_CLASS = "org.apache.flink.client.LocalExecutor"; http://git-wip-us.apache.org/repos/asf/flink/blob/53f8d773/flink-core/src/main/java/org/apache/flink/api/common/Program.java ---------------------------------------------------------------------- diff --git a/flink-core/src/main/java/org/apache/flink/api/common/Program.java b/flink-core/src/main/java/org/apache/flink/api/common/Program.java index 62632d1..248f88b 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/Program.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/Program.java @@ -19,12 +19,15 @@ package org.apache.flink.api.common; +import org.apache.flink.annotation.PublicEvolving; + import java.io.Serializable; /** * A Program represents and end-to-end Flink program. The Program creates the {@link Plan}, which describes * the data flow to be executed. */ +@PublicEvolving public interface Program extends Serializable { /** http://git-wip-us.apache.org/repos/asf/flink/blob/53f8d773/flink-core/src/main/java/org/apache/flink/api/common/ProgramDescription.java ---------------------------------------------------------------------- diff --git a/flink-core/src/main/java/org/apache/flink/api/common/ProgramDescription.java b/flink-core/src/main/java/org/apache/flink/api/common/ProgramDescription.java index dd4df2c..8171b71 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/ProgramDescription.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/ProgramDescription.java @@ -19,11 +19,14 @@ package org.apache.flink.api.common; +import org.apache.flink.annotation.PublicEvolving; + /** * Implementing this interface allows a Program to have a description * of the plan which can be shown to the user. For a more detailed description * of what should be included in the description see getDescription(). */ +@PublicEvolving public interface ProgramDescription { /** http://git-wip-us.apache.org/repos/asf/flink/blob/53f8d773/flink-core/src/main/java/org/apache/flink/api/common/TaskInfo.java ---------------------------------------------------------------------- diff --git a/flink-core/src/main/java/org/apache/flink/api/common/TaskInfo.java b/flink-core/src/main/java/org/apache/flink/api/common/TaskInfo.java index d7cfb95..6482cde 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/TaskInfo.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/TaskInfo.java @@ -18,12 +18,15 @@ package org.apache.flink.api.common; +import org.apache.flink.annotation.Internal; + import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkNotNull; /** * Encapsulates task-specific information: name, index of subtask, parallelism and attempt number. */ +@Internal public class TaskInfo { private final String taskName; http://git-wip-us.apache.org/repos/asf/flink/blob/53f8d773/flink-core/src/main/java/org/apache/flink/api/common/accumulators/AccumulatorHelper.java ---------------------------------------------------------------------- diff --git a/flink-core/src/main/java/org/apache/flink/api/common/accumulators/AccumulatorHelper.java b/flink-core/src/main/java/org/apache/flink/api/common/accumulators/AccumulatorHelper.java index 72670bf..bcae504 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/accumulators/AccumulatorHelper.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/accumulators/AccumulatorHelper.java @@ -18,6 +18,7 @@ package org.apache.flink.api.common.accumulators; +import org.apache.flink.annotation.Internal; import org.apache.flink.util.SerializedValue; import java.io.IOException; @@ -26,6 +27,7 @@ import java.util.Collections; import java.util.HashMap; import java.util.Map; +@Internal public class AccumulatorHelper { /** http://git-wip-us.apache.org/repos/asf/flink/blob/53f8d773/flink-core/src/main/java/org/apache/flink/api/common/accumulators/DoubleCounter.java ---------------------------------------------------------------------- diff --git a/flink-core/src/main/java/org/apache/flink/api/common/accumulators/DoubleCounter.java b/flink-core/src/main/java/org/apache/flink/api/common/accumulators/DoubleCounter.java index 3e6a5dd..8d52970 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/accumulators/DoubleCounter.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/accumulators/DoubleCounter.java @@ -19,9 +19,12 @@ package org.apache.flink.api.common.accumulators; +import org.apache.flink.annotation.PublicEvolving; + /** * An accumulator that sums up {@code double} values. */ +@PublicEvolving public class DoubleCounter implements SimpleAccumulator<Double> { private static final long serialVersionUID = 1L; http://git-wip-us.apache.org/repos/asf/flink/blob/53f8d773/flink-core/src/main/java/org/apache/flink/api/common/accumulators/IntCounter.java ---------------------------------------------------------------------- diff --git a/flink-core/src/main/java/org/apache/flink/api/common/accumulators/IntCounter.java b/flink-core/src/main/java/org/apache/flink/api/common/accumulators/IntCounter.java index 133eb5c..54c0f15 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/accumulators/IntCounter.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/accumulators/IntCounter.java @@ -20,9 +20,12 @@ package org.apache.flink.api.common.accumulators; +import org.apache.flink.annotation.PublicEvolving; + /** * An accumulator that sums up {@code Integer} values. */ +@PublicEvolving public class IntCounter implements SimpleAccumulator<Integer> { private static final long serialVersionUID = 1L; http://git-wip-us.apache.org/repos/asf/flink/blob/53f8d773/flink-core/src/main/java/org/apache/flink/api/common/accumulators/LongCounter.java ---------------------------------------------------------------------- diff --git a/flink-core/src/main/java/org/apache/flink/api/common/accumulators/LongCounter.java b/flink-core/src/main/java/org/apache/flink/api/common/accumulators/LongCounter.java index fa7f1ac..1329d13 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/accumulators/LongCounter.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/accumulators/LongCounter.java @@ -18,9 +18,12 @@ package org.apache.flink.api.common.accumulators; +import org.apache.flink.annotation.PublicEvolving; + /** * An accumulator that sums up {@code long} values. */ +@PublicEvolving public class LongCounter implements SimpleAccumulator<Long> { private static final long serialVersionUID = 1L; http://git-wip-us.apache.org/repos/asf/flink/blob/53f8d773/flink-core/src/main/java/org/apache/flink/api/common/accumulators/SerializedListAccumulator.java ---------------------------------------------------------------------- diff --git a/flink-core/src/main/java/org/apache/flink/api/common/accumulators/SerializedListAccumulator.java b/flink-core/src/main/java/org/apache/flink/api/common/accumulators/SerializedListAccumulator.java index 41df3bf..a88ea39 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/accumulators/SerializedListAccumulator.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/accumulators/SerializedListAccumulator.java @@ -18,6 +18,7 @@ package org.apache.flink.api.common.accumulators; +import org.apache.flink.annotation.PublicEvolving; import org.apache.flink.api.common.typeutils.TypeSerializer; import org.apache.flink.core.memory.DataInputViewStreamWrapper; import org.apache.flink.core.memory.DataOutputViewStreamWrapper; @@ -36,6 +37,7 @@ import java.util.List; * * @param <T> The type of the accumulated objects */ +@PublicEvolving public class SerializedListAccumulator<T> implements Accumulator<T, ArrayList<byte[]>> { private static final long serialVersionUID = 1L; http://git-wip-us.apache.org/repos/asf/flink/blob/53f8d773/flink-core/src/main/java/org/apache/flink/api/common/aggregators/Aggregator.java ---------------------------------------------------------------------- diff --git a/flink-core/src/main/java/org/apache/flink/api/common/aggregators/Aggregator.java b/flink-core/src/main/java/org/apache/flink/api/common/aggregators/Aggregator.java index aabb82f..1ee2893 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/aggregators/Aggregator.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/aggregators/Aggregator.java @@ -21,6 +21,7 @@ package org.apache.flink.api.common.aggregators; import java.io.Serializable; +import org.apache.flink.annotation.PublicEvolving; import org.apache.flink.types.Value; /** @@ -73,6 +74,7 @@ import org.apache.flink.types.Value; * * @param <T> The type of the aggregated value. */ +@PublicEvolving public interface Aggregator<T extends Value> extends Serializable { /** http://git-wip-us.apache.org/repos/asf/flink/blob/53f8d773/flink-core/src/main/java/org/apache/flink/api/common/aggregators/AggregatorRegistry.java ---------------------------------------------------------------------- diff --git a/flink-core/src/main/java/org/apache/flink/api/common/aggregators/AggregatorRegistry.java b/flink-core/src/main/java/org/apache/flink/api/common/aggregators/AggregatorRegistry.java index 1aae1a9..1d5c358 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/aggregators/AggregatorRegistry.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/aggregators/AggregatorRegistry.java @@ -23,11 +23,13 @@ import java.util.Collection; import java.util.HashMap; import java.util.Map; +import org.apache.flink.annotation.Internal; import org.apache.flink.types.Value; /** * A registry for iteration {@link Aggregator}s. */ +@Internal public class AggregatorRegistry { private final Map<String, Aggregator<?>> registry = new HashMap<String, Aggregator<?>>(); http://git-wip-us.apache.org/repos/asf/flink/blob/53f8d773/flink-core/src/main/java/org/apache/flink/api/common/aggregators/AggregatorWithName.java ---------------------------------------------------------------------- diff --git a/flink-core/src/main/java/org/apache/flink/api/common/aggregators/AggregatorWithName.java b/flink-core/src/main/java/org/apache/flink/api/common/aggregators/AggregatorWithName.java index e87e136..c5254a0 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/aggregators/AggregatorWithName.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/aggregators/AggregatorWithName.java @@ -18,11 +18,13 @@ package org.apache.flink.api.common.aggregators; +import org.apache.flink.annotation.PublicEvolving; import org.apache.flink.types.Value; /** * Simple utility class holding an {@link Aggregator} with the name it is registered under. */ +@PublicEvolving public class AggregatorWithName<T extends Value> { private final String name; http://git-wip-us.apache.org/repos/asf/flink/blob/53f8d773/flink-core/src/main/java/org/apache/flink/api/common/aggregators/ConvergenceCriterion.java ---------------------------------------------------------------------- diff --git a/flink-core/src/main/java/org/apache/flink/api/common/aggregators/ConvergenceCriterion.java b/flink-core/src/main/java/org/apache/flink/api/common/aggregators/ConvergenceCriterion.java index 47588a2..d512d02 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/aggregators/ConvergenceCriterion.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/aggregators/ConvergenceCriterion.java @@ -21,11 +21,13 @@ package org.apache.flink.api.common.aggregators; import java.io.Serializable; +import org.apache.flink.annotation.PublicEvolving; import org.apache.flink.types.Value; /** * Used to check for convergence. */ +@PublicEvolving public interface ConvergenceCriterion<T extends Value> extends Serializable { /** http://git-wip-us.apache.org/repos/asf/flink/blob/53f8d773/flink-core/src/main/java/org/apache/flink/api/common/aggregators/DoubleSumAggregator.java ---------------------------------------------------------------------- diff --git a/flink-core/src/main/java/org/apache/flink/api/common/aggregators/DoubleSumAggregator.java b/flink-core/src/main/java/org/apache/flink/api/common/aggregators/DoubleSumAggregator.java index e3c8b86..01472d2 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/aggregators/DoubleSumAggregator.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/aggregators/DoubleSumAggregator.java @@ -18,6 +18,7 @@ package org.apache.flink.api.common.aggregators; +import org.apache.flink.annotation.PublicEvolving; import org.apache.flink.types.DoubleValue; @@ -25,6 +26,7 @@ import org.apache.flink.types.DoubleValue; * An {@link Aggregator} that sums up {@link DoubleValue} values. */ @SuppressWarnings("serial") +@PublicEvolving public class DoubleSumAggregator implements Aggregator<DoubleValue> { private DoubleValue wrapper = new DoubleValue(); http://git-wip-us.apache.org/repos/asf/flink/blob/53f8d773/flink-core/src/main/java/org/apache/flink/api/common/aggregators/DoubleZeroConvergence.java ---------------------------------------------------------------------- diff --git a/flink-core/src/main/java/org/apache/flink/api/common/aggregators/DoubleZeroConvergence.java b/flink-core/src/main/java/org/apache/flink/api/common/aggregators/DoubleZeroConvergence.java index 77c09fd..7fe2da1 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/aggregators/DoubleZeroConvergence.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/aggregators/DoubleZeroConvergence.java @@ -18,6 +18,7 @@ package org.apache.flink.api.common.aggregators; +import org.apache.flink.annotation.PublicEvolving; import org.apache.flink.types.DoubleValue; /** @@ -25,6 +26,7 @@ import org.apache.flink.types.DoubleValue; * holds the value zero. The aggregated data type is a {@link DoubleValue}. */ @SuppressWarnings("serial") +@PublicEvolving public class DoubleZeroConvergence implements ConvergenceCriterion<DoubleValue> { /** http://git-wip-us.apache.org/repos/asf/flink/blob/53f8d773/flink-core/src/main/java/org/apache/flink/api/common/aggregators/LongSumAggregator.java ---------------------------------------------------------------------- diff --git a/flink-core/src/main/java/org/apache/flink/api/common/aggregators/LongSumAggregator.java b/flink-core/src/main/java/org/apache/flink/api/common/aggregators/LongSumAggregator.java index 8412837..a786d46 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/aggregators/LongSumAggregator.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/aggregators/LongSumAggregator.java @@ -18,12 +18,14 @@ package org.apache.flink.api.common.aggregators; +import org.apache.flink.annotation.PublicEvolving; import org.apache.flink.types.LongValue; /** * An {@link Aggregator} that sums up long values. */ @SuppressWarnings("serial") +@PublicEvolving public class LongSumAggregator implements Aggregator<LongValue> { private long sum; // the sum http://git-wip-us.apache.org/repos/asf/flink/blob/53f8d773/flink-core/src/main/java/org/apache/flink/api/common/aggregators/LongZeroConvergence.java ---------------------------------------------------------------------- diff --git a/flink-core/src/main/java/org/apache/flink/api/common/aggregators/LongZeroConvergence.java b/flink-core/src/main/java/org/apache/flink/api/common/aggregators/LongZeroConvergence.java index a1d4389..20b7386 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/aggregators/LongZeroConvergence.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/aggregators/LongZeroConvergence.java @@ -18,6 +18,7 @@ package org.apache.flink.api.common.aggregators; +import org.apache.flink.annotation.PublicEvolving; import org.apache.flink.types.LongValue; /** @@ -25,6 +26,7 @@ import org.apache.flink.types.LongValue; * holds the value zero. The aggregated data type is a {@link LongValue}. */ @SuppressWarnings("serial") +@PublicEvolving public class LongZeroConvergence implements ConvergenceCriterion<LongValue> { /** http://git-wip-us.apache.org/repos/asf/flink/blob/53f8d773/flink-core/src/main/java/org/apache/flink/api/common/distributions/CommonRangeBoundaries.java ---------------------------------------------------------------------- diff --git a/flink-core/src/main/java/org/apache/flink/api/common/distributions/CommonRangeBoundaries.java b/flink-core/src/main/java/org/apache/flink/api/common/distributions/CommonRangeBoundaries.java index 2b1daff..70e51cb 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/distributions/CommonRangeBoundaries.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/distributions/CommonRangeBoundaries.java @@ -17,8 +17,10 @@ */ package org.apache.flink.api.common.distributions; +import org.apache.flink.annotation.Internal; import org.apache.flink.api.common.typeutils.TypeComparator; +@Internal public class CommonRangeBoundaries<T> implements RangeBoundaries<T> { private final TypeComparator<T> typeComparator; private final Object[][] boundaries; http://git-wip-us.apache.org/repos/asf/flink/blob/53f8d773/flink-core/src/main/java/org/apache/flink/api/common/distributions/DataDistribution.java ---------------------------------------------------------------------- diff --git a/flink-core/src/main/java/org/apache/flink/api/common/distributions/DataDistribution.java b/flink-core/src/main/java/org/apache/flink/api/common/distributions/DataDistribution.java index e04299e..321948d 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/distributions/DataDistribution.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/distributions/DataDistribution.java @@ -21,8 +21,10 @@ package org.apache.flink.api.common.distributions; import java.io.Serializable; +import org.apache.flink.annotation.PublicEvolving; import org.apache.flink.core.io.IOReadableWritable; +@PublicEvolving public interface DataDistribution extends IOReadableWritable, Serializable { /** http://git-wip-us.apache.org/repos/asf/flink/blob/53f8d773/flink-core/src/main/java/org/apache/flink/api/common/distributions/RangeBoundaries.java ---------------------------------------------------------------------- diff --git a/flink-core/src/main/java/org/apache/flink/api/common/distributions/RangeBoundaries.java b/flink-core/src/main/java/org/apache/flink/api/common/distributions/RangeBoundaries.java index b7f6042..22c36f6 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/distributions/RangeBoundaries.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/distributions/RangeBoundaries.java @@ -17,6 +17,8 @@ */ package org.apache.flink.api.common.distributions; +import org.apache.flink.annotation.PublicEvolving; + import java.io.Serializable; /** @@ -24,6 +26,7 @@ import java.io.Serializable; * * @param <T> The boundary type. */ +@PublicEvolving public interface RangeBoundaries<T> extends Serializable { /** http://git-wip-us.apache.org/repos/asf/flink/blob/53f8d773/flink-core/src/main/java/org/apache/flink/api/common/distributions/SimpleDistribution.java ---------------------------------------------------------------------- diff --git a/flink-core/src/main/java/org/apache/flink/api/common/distributions/SimpleDistribution.java b/flink-core/src/main/java/org/apache/flink/api/common/distributions/SimpleDistribution.java index d534775..bf759d9 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/distributions/SimpleDistribution.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/distributions/SimpleDistribution.java @@ -20,11 +20,13 @@ package org.apache.flink.api.common.distributions; import java.io.IOException; +import org.apache.flink.annotation.PublicEvolving; import org.apache.flink.core.memory.DataInputView; import org.apache.flink.core.memory.DataOutputView; import org.apache.flink.types.Key; import org.apache.flink.util.InstantiationUtil; +@PublicEvolving public class SimpleDistribution implements DataDistribution { private static final long serialVersionUID = 1L; http://git-wip-us.apache.org/repos/asf/flink/blob/53f8d773/flink-core/src/main/java/org/apache/flink/api/common/distributions/SimpleIntegerDistribution.java ---------------------------------------------------------------------- diff --git a/flink-core/src/main/java/org/apache/flink/api/common/distributions/SimpleIntegerDistribution.java b/flink-core/src/main/java/org/apache/flink/api/common/distributions/SimpleIntegerDistribution.java index d1415f8..cd1a8c5 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/distributions/SimpleIntegerDistribution.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/distributions/SimpleIntegerDistribution.java @@ -20,10 +20,12 @@ package org.apache.flink.api.common.distributions; import java.io.IOException; +import org.apache.flink.annotation.PublicEvolving; import org.apache.flink.core.memory.DataInputView; import org.apache.flink.core.memory.DataOutputView; import org.apache.flink.types.IntValue; +@PublicEvolving public class SimpleIntegerDistribution extends SimpleDistribution { private static final long serialVersionUID = 1L; http://git-wip-us.apache.org/repos/asf/flink/blob/53f8d773/flink-core/src/main/java/org/apache/flink/api/common/distributions/UniformDoubleDistribution.java ---------------------------------------------------------------------- diff --git a/flink-core/src/main/java/org/apache/flink/api/common/distributions/UniformDoubleDistribution.java b/flink-core/src/main/java/org/apache/flink/api/common/distributions/UniformDoubleDistribution.java index b9c4367..df1f095 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/distributions/UniformDoubleDistribution.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/distributions/UniformDoubleDistribution.java @@ -20,11 +20,12 @@ package org.apache.flink.api.common.distributions; import java.io.IOException; +import org.apache.flink.annotation.PublicEvolving; import org.apache.flink.core.memory.DataInputView; import org.apache.flink.core.memory.DataOutputView; import org.apache.flink.types.DoubleValue; - +@PublicEvolving public class UniformDoubleDistribution implements DataDistribution { private static final long serialVersionUID = 1L; http://git-wip-us.apache.org/repos/asf/flink/blob/53f8d773/flink-core/src/main/java/org/apache/flink/api/common/distributions/UniformIntegerDistribution.java ---------------------------------------------------------------------- diff --git a/flink-core/src/main/java/org/apache/flink/api/common/distributions/UniformIntegerDistribution.java b/flink-core/src/main/java/org/apache/flink/api/common/distributions/UniformIntegerDistribution.java index 33a4cbb..504f65b 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/distributions/UniformIntegerDistribution.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/distributions/UniformIntegerDistribution.java @@ -20,11 +20,12 @@ package org.apache.flink.api.common.distributions; import java.io.IOException; +import org.apache.flink.annotation.PublicEvolving; import org.apache.flink.core.memory.DataInputView; import org.apache.flink.core.memory.DataOutputView; import org.apache.flink.types.IntValue; - +@PublicEvolving public class UniformIntegerDistribution implements DataDistribution { private static final long serialVersionUID = 1L; http://git-wip-us.apache.org/repos/asf/flink/blob/53f8d773/flink-core/src/main/java/org/apache/flink/api/common/functions/util/AbstractRuntimeUDFContext.java ---------------------------------------------------------------------- diff --git a/flink-core/src/main/java/org/apache/flink/api/common/functions/util/AbstractRuntimeUDFContext.java b/flink-core/src/main/java/org/apache/flink/api/common/functions/util/AbstractRuntimeUDFContext.java index a300f38..afe9f77 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/functions/util/AbstractRuntimeUDFContext.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/functions/util/AbstractRuntimeUDFContext.java @@ -48,6 +48,7 @@ import org.apache.flink.core.fs.Path; /** * A standalone implementation of the {@link RuntimeContext}, created by runtime UDF operators. */ +@PublicEvolving public abstract class AbstractRuntimeUDFContext implements RuntimeContext { private final TaskInfo taskInfo; http://git-wip-us.apache.org/repos/asf/flink/blob/53f8d773/flink-core/src/main/java/org/apache/flink/api/common/functions/util/CopyingIterator.java ---------------------------------------------------------------------- diff --git a/flink-core/src/main/java/org/apache/flink/api/common/functions/util/CopyingIterator.java b/flink-core/src/main/java/org/apache/flink/api/common/functions/util/CopyingIterator.java index b7a8dc9..c5adb2e 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/functions/util/CopyingIterator.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/functions/util/CopyingIterator.java @@ -20,9 +20,11 @@ package org.apache.flink.api.common.functions.util; import java.util.Iterator; +import org.apache.flink.annotation.Internal; import org.apache.flink.api.common.typeutils.TypeSerializer; import org.apache.flink.util.TraversableOnceException; +@Internal public class CopyingIterator<E> implements Iterator<E>, Iterable<E> { private final Iterator<E> source; http://git-wip-us.apache.org/repos/asf/flink/blob/53f8d773/flink-core/src/main/java/org/apache/flink/api/common/functions/util/CopyingListCollector.java ---------------------------------------------------------------------- diff --git a/flink-core/src/main/java/org/apache/flink/api/common/functions/util/CopyingListCollector.java b/flink-core/src/main/java/org/apache/flink/api/common/functions/util/CopyingListCollector.java index 1573ef9..16b7bf3 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/functions/util/CopyingListCollector.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/functions/util/CopyingListCollector.java @@ -20,9 +20,11 @@ package org.apache.flink.api.common.functions.util; import java.util.List; +import org.apache.flink.annotation.Internal; import org.apache.flink.api.common.typeutils.TypeSerializer; import org.apache.flink.util.Collector; +@Internal public class CopyingListCollector<T> implements Collector<T> { private final List<T> list; http://git-wip-us.apache.org/repos/asf/flink/blob/53f8d773/flink-core/src/main/java/org/apache/flink/api/common/functions/util/FunctionUtils.java ---------------------------------------------------------------------- diff --git a/flink-core/src/main/java/org/apache/flink/api/common/functions/util/FunctionUtils.java b/flink-core/src/main/java/org/apache/flink/api/common/functions/util/FunctionUtils.java index e59626b..ffd885b 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/functions/util/FunctionUtils.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/functions/util/FunctionUtils.java @@ -20,6 +20,7 @@ package org.apache.flink.api.common.functions.util; import java.lang.reflect.Method; +import org.apache.flink.annotation.Internal; import org.apache.flink.api.common.functions.Function; import org.apache.flink.api.common.functions.RichFunction; import org.apache.flink.api.common.functions.RuntimeContext; @@ -28,6 +29,7 @@ import org.apache.flink.configuration.Configuration; /** * Utility class that contains helper methods to work with Flink {@link Function} class. */ +@Internal public final class FunctionUtils { public static void openFunction(Function function, Configuration parameters) throws Exception{ http://git-wip-us.apache.org/repos/asf/flink/blob/53f8d773/flink-core/src/main/java/org/apache/flink/api/common/functions/util/ListCollector.java ---------------------------------------------------------------------- diff --git a/flink-core/src/main/java/org/apache/flink/api/common/functions/util/ListCollector.java b/flink-core/src/main/java/org/apache/flink/api/common/functions/util/ListCollector.java index 12d9fda..c820640 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/functions/util/ListCollector.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/functions/util/ListCollector.java @@ -20,6 +20,7 @@ package org.apache.flink.api.common.functions.util; import java.util.List; +import org.apache.flink.annotation.Internal; import org.apache.flink.util.Collector; /** @@ -27,6 +28,7 @@ import org.apache.flink.util.Collector; * * @param <T> The type of the collected elements. */ +@Internal public class ListCollector<T> implements Collector<T> { private final List<T> list; http://git-wip-us.apache.org/repos/asf/flink/blob/53f8d773/flink-core/src/main/java/org/apache/flink/api/common/functions/util/NoOpFunction.java ---------------------------------------------------------------------- diff --git a/flink-core/src/main/java/org/apache/flink/api/common/functions/util/NoOpFunction.java b/flink-core/src/main/java/org/apache/flink/api/common/functions/util/NoOpFunction.java index 1cc3ebd..6351365 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/functions/util/NoOpFunction.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/functions/util/NoOpFunction.java @@ -18,9 +18,10 @@ package org.apache.flink.api.common.functions.util; +import org.apache.flink.annotation.Internal; import org.apache.flink.api.common.functions.AbstractRichFunction; - +@Internal public class NoOpFunction extends AbstractRichFunction { private static final long serialVersionUID = 1L; } http://git-wip-us.apache.org/repos/asf/flink/blob/53f8d773/flink-core/src/main/java/org/apache/flink/api/common/functions/util/RuntimeUDFContext.java ---------------------------------------------------------------------- diff --git a/flink-core/src/main/java/org/apache/flink/api/common/functions/util/RuntimeUDFContext.java b/flink-core/src/main/java/org/apache/flink/api/common/functions/util/RuntimeUDFContext.java index 5558c21..2337afa 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/functions/util/RuntimeUDFContext.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/functions/util/RuntimeUDFContext.java @@ -23,6 +23,7 @@ import java.util.List; import java.util.Map; import java.util.concurrent.Future; +import org.apache.flink.annotation.Internal; import org.apache.flink.api.common.ExecutionConfig; import org.apache.flink.api.common.TaskInfo; import org.apache.flink.api.common.accumulators.Accumulator; @@ -33,6 +34,7 @@ import org.apache.flink.core.fs.Path; /** * A standalone implementation of the {@link RuntimeContext}, created by runtime UDF operators. */ +@Internal public class RuntimeUDFContext extends AbstractRuntimeUDFContext { private final HashMap<String, Object> initializedBroadcastVars = new HashMap<String, Object>(); http://git-wip-us.apache.org/repos/asf/flink/blob/53f8d773/flink-core/src/main/java/org/apache/flink/api/common/io/DefaultInputSplitAssigner.java ---------------------------------------------------------------------- diff --git a/flink-core/src/main/java/org/apache/flink/api/common/io/DefaultInputSplitAssigner.java b/flink-core/src/main/java/org/apache/flink/api/common/io/DefaultInputSplitAssigner.java index d69aa4f..25acc42 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/io/DefaultInputSplitAssigner.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/io/DefaultInputSplitAssigner.java @@ -23,6 +23,7 @@ import java.util.Collection; import java.util.Collections; import java.util.List; +import org.apache.flink.annotation.Internal; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.apache.flink.core.io.InputSplit; @@ -32,6 +33,7 @@ import org.apache.flink.core.io.InputSplitAssigner; * This is the default implementation of the {@link InputSplitAssigner} interface. The default input split assigner * simply returns all input splits of an input vertex in the order they were originally computed. */ +@Internal public class DefaultInputSplitAssigner implements InputSplitAssigner { /** The logging object used to report information and errors. */ http://git-wip-us.apache.org/repos/asf/flink/blob/53f8d773/flink-core/src/main/java/org/apache/flink/api/common/io/GenericCsvInputFormat.java ---------------------------------------------------------------------- diff --git a/flink-core/src/main/java/org/apache/flink/api/common/io/GenericCsvInputFormat.java b/flink-core/src/main/java/org/apache/flink/api/common/io/GenericCsvInputFormat.java index 89caf2f..cb20f81 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/io/GenericCsvInputFormat.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/io/GenericCsvInputFormat.java @@ -23,6 +23,7 @@ import com.google.common.base.Charsets; import com.google.common.base.Preconditions; import com.google.common.primitives.Ints; +import org.apache.flink.annotation.Internal; import org.apache.flink.core.fs.FileInputSplit; import org.apache.flink.core.fs.Path; import org.apache.flink.types.parser.FieldParser; @@ -40,6 +41,7 @@ import java.util.ArrayList; import java.util.Map; import java.util.TreeMap; +@Internal public abstract class GenericCsvInputFormat<OT> extends DelimitedInputFormat<OT> { private static final Logger LOG = LoggerFactory.getLogger(GenericCsvInputFormat.class); http://git-wip-us.apache.org/repos/asf/flink/blob/53f8d773/flink-core/src/main/java/org/apache/flink/api/common/io/ParseException.java ---------------------------------------------------------------------- diff --git a/flink-core/src/main/java/org/apache/flink/api/common/io/ParseException.java b/flink-core/src/main/java/org/apache/flink/api/common/io/ParseException.java index 2e24308..9bc129b 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/io/ParseException.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/io/ParseException.java @@ -18,10 +18,13 @@ package org.apache.flink.api.common.io; +import org.apache.flink.annotation.PublicEvolving; + /** * Exception indicating that the parsing of input contents has failed because the data * does not match the configured parser. */ +@PublicEvolving public class ParseException extends RuntimeException { private static final long serialVersionUID = -6721968786653128017L; http://git-wip-us.apache.org/repos/asf/flink/blob/53f8d773/flink-core/src/main/java/org/apache/flink/api/common/io/ReplicatingInputFormat.java ---------------------------------------------------------------------- diff --git a/flink-core/src/main/java/org/apache/flink/api/common/io/ReplicatingInputFormat.java b/flink-core/src/main/java/org/apache/flink/api/common/io/ReplicatingInputFormat.java index 5c8eb27..a084f64 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/io/ReplicatingInputFormat.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/io/ReplicatingInputFormat.java @@ -19,6 +19,7 @@ package org.apache.flink.api.common.io; +import org.apache.flink.annotation.PublicEvolving; import org.apache.flink.api.common.functions.RuntimeContext; import org.apache.flink.api.common.io.statistics.BaseStatistics; import org.apache.flink.api.common.operators.base.InnerJoinOperatorBase; @@ -62,6 +63,7 @@ import java.io.IOException; * @see org.apache.flink.api.common.operators.base.FilterOperatorBase * @see org.apache.flink.api.common.operators.base.MapPartitionOperatorBase */ +@PublicEvolving public final class ReplicatingInputFormat<OT, S extends InputSplit> extends RichInputFormat<OT, S> { private static final long serialVersionUID = 1L; http://git-wip-us.apache.org/repos/asf/flink/blob/53f8d773/flink-core/src/main/java/org/apache/flink/api/common/io/ReplicatingInputSplitAssigner.java ---------------------------------------------------------------------- diff --git a/flink-core/src/main/java/org/apache/flink/api/common/io/ReplicatingInputSplitAssigner.java b/flink-core/src/main/java/org/apache/flink/api/common/io/ReplicatingInputSplitAssigner.java index 315fbcd..e7dda94 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/io/ReplicatingInputSplitAssigner.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/io/ReplicatingInputSplitAssigner.java @@ -18,6 +18,7 @@ package org.apache.flink.api.common.io; +import org.apache.flink.annotation.Internal; import org.apache.flink.core.io.InputSplit; import org.apache.flink.core.io.InputSplitAssigner; @@ -28,6 +29,7 @@ import java.util.Collection; * Assigns each InputSplit to each requesting parallel instance. * This causes the input to be fully replicated, i.e., each parallel instance consumes the full input. */ +@Internal public class ReplicatingInputSplitAssigner implements InputSplitAssigner { private InputSplit[] inputSplits; http://git-wip-us.apache.org/repos/asf/flink/blob/53f8d773/flink-core/src/main/java/org/apache/flink/api/common/io/StrictlyLocalAssignment.java ---------------------------------------------------------------------- diff --git a/flink-core/src/main/java/org/apache/flink/api/common/io/StrictlyLocalAssignment.java b/flink-core/src/main/java/org/apache/flink/api/common/io/StrictlyLocalAssignment.java index 1869e60..e20107b 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/io/StrictlyLocalAssignment.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/io/StrictlyLocalAssignment.java @@ -18,5 +18,7 @@ package org.apache.flink.api.common.io; +import org.apache.flink.annotation.PublicEvolving; +@PublicEvolving public interface StrictlyLocalAssignment {} http://git-wip-us.apache.org/repos/asf/flink/blob/53f8d773/flink-core/src/main/java/org/apache/flink/api/common/io/compression/DeflateInflaterInputStreamFactory.java ---------------------------------------------------------------------- diff --git a/flink-core/src/main/java/org/apache/flink/api/common/io/compression/DeflateInflaterInputStreamFactory.java b/flink-core/src/main/java/org/apache/flink/api/common/io/compression/DeflateInflaterInputStreamFactory.java index 20c79db..b5051e6 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/io/compression/DeflateInflaterInputStreamFactory.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/io/compression/DeflateInflaterInputStreamFactory.java @@ -17,6 +17,8 @@ */ package org.apache.flink.api.common.io.compression; +import org.apache.flink.annotation.Internal; + import java.io.IOException; import java.io.InputStream; import java.util.Collection; @@ -26,6 +28,7 @@ import java.util.zip.InflaterInputStream; /** * Factory for input streams that decompress the "deflate" compression format. */ +@Internal public class DeflateInflaterInputStreamFactory implements InflaterInputStreamFactory<InflaterInputStream> { private static DeflateInflaterInputStreamFactory INSTANCE = null; http://git-wip-us.apache.org/repos/asf/flink/blob/53f8d773/flink-core/src/main/java/org/apache/flink/api/common/io/compression/GzipInflaterInputStreamFactory.java ---------------------------------------------------------------------- diff --git a/flink-core/src/main/java/org/apache/flink/api/common/io/compression/GzipInflaterInputStreamFactory.java b/flink-core/src/main/java/org/apache/flink/api/common/io/compression/GzipInflaterInputStreamFactory.java index aebbac3..478eb2d 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/io/compression/GzipInflaterInputStreamFactory.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/io/compression/GzipInflaterInputStreamFactory.java @@ -17,6 +17,8 @@ */ package org.apache.flink.api.common.io.compression; +import org.apache.flink.annotation.Internal; + import java.io.IOException; import java.io.InputStream; import java.util.Arrays; @@ -26,6 +28,7 @@ import java.util.zip.GZIPInputStream; /** * Factory for input streams that decompress the GZIP compression format. */ +@Internal public class GzipInflaterInputStreamFactory implements InflaterInputStreamFactory<GZIPInputStream> { private static GzipInflaterInputStreamFactory INSTANCE = null; http://git-wip-us.apache.org/repos/asf/flink/blob/53f8d773/flink-core/src/main/java/org/apache/flink/api/common/io/compression/InflaterInputStreamFactory.java ---------------------------------------------------------------------- diff --git a/flink-core/src/main/java/org/apache/flink/api/common/io/compression/InflaterInputStreamFactory.java b/flink-core/src/main/java/org/apache/flink/api/common/io/compression/InflaterInputStreamFactory.java index a6787c5..7fbc50d 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/io/compression/InflaterInputStreamFactory.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/io/compression/InflaterInputStreamFactory.java @@ -18,6 +18,8 @@ package org.apache.flink.api.common.io.compression; +import org.apache.flink.annotation.Internal; + import java.io.IOException; import java.io.InputStream; import java.util.Collection; @@ -26,6 +28,7 @@ import java.util.zip.InflaterInputStream; /** * Creates a new instance of a certain subclass of {@link java.util.zip.InflaterInputStream}. */ +@Internal public interface InflaterInputStreamFactory<T extends InflaterInputStream> { /** http://git-wip-us.apache.org/repos/asf/flink/blob/53f8d773/flink-core/src/main/java/org/apache/flink/api/common/operators/AbstractUdfOperator.java ---------------------------------------------------------------------- diff --git a/flink-core/src/main/java/org/apache/flink/api/common/operators/AbstractUdfOperator.java b/flink-core/src/main/java/org/apache/flink/api/common/operators/AbstractUdfOperator.java index 1ee6848..7ac357f 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/operators/AbstractUdfOperator.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/operators/AbstractUdfOperator.java @@ -22,6 +22,7 @@ package org.apache.flink.api.common.operators; import java.util.HashMap; import java.util.Map; +import org.apache.flink.annotation.Internal; import org.apache.flink.api.common.functions.Function; import org.apache.flink.api.common.operators.util.UserCodeWrapper; @@ -30,6 +31,7 @@ import org.apache.flink.api.common.operators.util.UserCodeWrapper; * * @param <FT> Type of the user function */ +@Internal public abstract class AbstractUdfOperator<OUT, FT extends Function> extends Operator<OUT> { /** http://git-wip-us.apache.org/repos/asf/flink/blob/53f8d773/flink-core/src/main/java/org/apache/flink/api/common/operators/BinaryOperatorInformation.java ---------------------------------------------------------------------- diff --git a/flink-core/src/main/java/org/apache/flink/api/common/operators/BinaryOperatorInformation.java b/flink-core/src/main/java/org/apache/flink/api/common/operators/BinaryOperatorInformation.java index 27d6e7a..cdf81f2 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/operators/BinaryOperatorInformation.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/operators/BinaryOperatorInformation.java @@ -19,6 +19,7 @@ package org.apache.flink.api.common.operators; +import org.apache.flink.annotation.Internal; import org.apache.flink.api.common.typeinfo.TypeInformation; /** @@ -28,6 +29,7 @@ import org.apache.flink.api.common.typeinfo.TypeInformation; * @param <IN2> Output type of second input operator * @param <OUT> Output type of the records output by the operator described by this information */ +@Internal public class BinaryOperatorInformation<IN1, IN2, OUT> extends OperatorInformation<OUT> { /** http://git-wip-us.apache.org/repos/asf/flink/blob/53f8d773/flink-core/src/main/java/org/apache/flink/api/common/operators/CollectionExecutor.java ---------------------------------------------------------------------- diff --git a/flink-core/src/main/java/org/apache/flink/api/common/operators/CollectionExecutor.java b/flink-core/src/main/java/org/apache/flink/api/common/operators/CollectionExecutor.java index 719414f..44042c4 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/operators/CollectionExecutor.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/operators/CollectionExecutor.java @@ -32,6 +32,7 @@ import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; +import org.apache.flink.annotation.Internal; import org.apache.flink.api.common.ExecutionConfig; import org.apache.flink.api.common.InvalidProgramException; import org.apache.flink.api.common.JobExecutionResult; @@ -65,6 +66,7 @@ import org.apache.flink.util.Visitor; /** * Execution utility for serial, local, collection-based executions of Flink programs. */ +@Internal public class CollectionExecutor { private static final boolean DEFAULT_MUTABLE_OBJECT_SAFE_MODE = true; http://git-wip-us.apache.org/repos/asf/flink/blob/53f8d773/flink-core/src/main/java/org/apache/flink/api/common/operators/CompilerHints.java ---------------------------------------------------------------------- diff --git a/flink-core/src/main/java/org/apache/flink/api/common/operators/CompilerHints.java b/flink-core/src/main/java/org/apache/flink/api/common/operators/CompilerHints.java index 56ba3bf..1973b49 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/operators/CompilerHints.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/operators/CompilerHints.java @@ -22,6 +22,7 @@ package org.apache.flink.api.common.operators; import java.util.HashSet; import java.util.Set; +import org.apache.flink.annotation.Internal; import org.apache.flink.api.common.operators.util.FieldSet; /** @@ -30,6 +31,7 @@ import org.apache.flink.api.common.operators.util.FieldSet; * Note that these values are optional hints, the optimizer will always generate a valid plan without * them as well. The hints may help, however, to improve the plan choice. */ +@Internal public class CompilerHints { private long outputSize = -1; http://git-wip-us.apache.org/repos/asf/flink/blob/53f8d773/flink-core/src/main/java/org/apache/flink/api/common/operators/DualInputOperator.java ---------------------------------------------------------------------- diff --git a/flink-core/src/main/java/org/apache/flink/api/common/operators/DualInputOperator.java b/flink-core/src/main/java/org/apache/flink/api/common/operators/DualInputOperator.java index f43f847..d21160e 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/operators/DualInputOperator.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/operators/DualInputOperator.java @@ -21,6 +21,7 @@ package org.apache.flink.api.common.operators; import java.util.List; +import org.apache.flink.annotation.Internal; import org.apache.flink.api.common.ExecutionConfig; import org.apache.flink.api.common.functions.Function; import org.apache.flink.api.common.functions.RuntimeContext; @@ -35,6 +36,7 @@ import org.apache.flink.util.Visitor; * @param <OUT> Output type of the user function * @param <FT> Type of the user function */ +@Internal public abstract class DualInputOperator<IN1, IN2, OUT, FT extends Function> extends AbstractUdfOperator<OUT, FT> { /** http://git-wip-us.apache.org/repos/asf/flink/blob/53f8d773/flink-core/src/main/java/org/apache/flink/api/common/operators/DualInputSemanticProperties.java ---------------------------------------------------------------------- diff --git a/flink-core/src/main/java/org/apache/flink/api/common/operators/DualInputSemanticProperties.java b/flink-core/src/main/java/org/apache/flink/api/common/operators/DualInputSemanticProperties.java index d4aa383..875bff8 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/operators/DualInputSemanticProperties.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/operators/DualInputSemanticProperties.java @@ -22,11 +22,13 @@ package org.apache.flink.api.common.operators; import java.util.HashMap; import java.util.Map; +import org.apache.flink.annotation.Internal; import org.apache.flink.api.common.operators.util.FieldSet; /** * Container for the semantic properties associated to a dual input operator. */ +@Internal public class DualInputSemanticProperties implements SemanticProperties { private static final long serialVersionUID = 1L; http://git-wip-us.apache.org/repos/asf/flink/blob/53f8d773/flink-core/src/main/java/org/apache/flink/api/common/operators/GenericDataSinkBase.java ---------------------------------------------------------------------- diff --git a/flink-core/src/main/java/org/apache/flink/api/common/operators/GenericDataSinkBase.java b/flink-core/src/main/java/org/apache/flink/api/common/operators/GenericDataSinkBase.java index f23a9f2..33f11f3 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/operators/GenericDataSinkBase.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/operators/GenericDataSinkBase.java @@ -23,6 +23,7 @@ import java.util.List; import java.util.Collections; import java.util.Comparator; +import org.apache.flink.annotation.Internal; import org.apache.flink.api.common.ExecutionConfig; import org.apache.flink.api.common.functions.RuntimeContext; import org.apache.flink.api.common.io.OutputFormat; @@ -44,6 +45,7 @@ import com.google.common.base.Preconditions; * Operator for nodes that act as data sinks, storing the data they receive. * The way the data is stored is handled by the {@link org.apache.flink.api.common.io.OutputFormat}. */ +@Internal public class GenericDataSinkBase<IN> extends Operator<Nothing> { protected final UserCodeWrapper<? extends OutputFormat<IN>> formatWrapper; http://git-wip-us.apache.org/repos/asf/flink/blob/53f8d773/flink-core/src/main/java/org/apache/flink/api/common/operators/GenericDataSourceBase.java ---------------------------------------------------------------------- diff --git a/flink-core/src/main/java/org/apache/flink/api/common/operators/GenericDataSourceBase.java b/flink-core/src/main/java/org/apache/flink/api/common/operators/GenericDataSourceBase.java index d9a3a08..0794cc8 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/operators/GenericDataSourceBase.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/operators/GenericDataSourceBase.java @@ -22,6 +22,7 @@ package org.apache.flink.api.common.operators; import java.util.ArrayList; import java.util.List; +import org.apache.flink.annotation.Internal; import org.apache.flink.api.common.ExecutionConfig; import org.apache.flink.api.common.functions.Partitioner; import org.apache.flink.api.common.functions.RuntimeContext; @@ -40,6 +41,7 @@ import org.apache.flink.util.Visitor; * @param <OUT> The output type of the data source * @param <T> The type of input format invoked by instances of this data source. */ +@Internal public class GenericDataSourceBase<OUT, T extends InputFormat<OUT, ?>> extends Operator<OUT> { private static final String DEFAULT_NAME = "<Unnamed Generic Data Source>"; http://git-wip-us.apache.org/repos/asf/flink/blob/53f8d773/flink-core/src/main/java/org/apache/flink/api/common/operators/IterationOperator.java ---------------------------------------------------------------------- diff --git a/flink-core/src/main/java/org/apache/flink/api/common/operators/IterationOperator.java b/flink-core/src/main/java/org/apache/flink/api/common/operators/IterationOperator.java index b4469e1..d45b1a8 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/operators/IterationOperator.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/operators/IterationOperator.java @@ -18,8 +18,10 @@ package org.apache.flink.api.common.operators; +import org.apache.flink.annotation.Internal; import org.apache.flink.api.common.aggregators.AggregatorRegistry; +@Internal public interface IterationOperator { AggregatorRegistry getAggregators(); http://git-wip-us.apache.org/repos/asf/flink/blob/53f8d773/flink-core/src/main/java/org/apache/flink/api/common/operators/Keys.java ---------------------------------------------------------------------- diff --git a/flink-core/src/main/java/org/apache/flink/api/common/operators/Keys.java b/flink-core/src/main/java/org/apache/flink/api/common/operators/Keys.java index 6d681de..ad21c47 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/operators/Keys.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/operators/Keys.java @@ -23,6 +23,7 @@ import java.util.List; import com.google.common.base.Joiner; +import org.apache.flink.annotation.Internal; import org.apache.flink.api.common.InvalidProgramException; import org.apache.flink.api.common.functions.Partitioner; import org.apache.flink.api.common.typeinfo.TypeInformation; @@ -34,6 +35,7 @@ import org.apache.flink.api.java.typeutils.TypeExtractor; import com.google.common.base.Preconditions; +@Internal public abstract class Keys<T> { public abstract int getNumberOfKeyFields(); http://git-wip-us.apache.org/repos/asf/flink/blob/53f8d773/flink-core/src/main/java/org/apache/flink/api/common/operators/Operator.java ---------------------------------------------------------------------- diff --git a/flink-core/src/main/java/org/apache/flink/api/common/operators/Operator.java b/flink-core/src/main/java/org/apache/flink/api/common/operators/Operator.java index 19294d2..36f1f85 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/operators/Operator.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/operators/Operator.java @@ -21,6 +21,7 @@ package org.apache.flink.api.common.operators; import java.util.List; +import org.apache.flink.annotation.Internal; import org.apache.flink.api.common.operators.util.UserCodeWrapper; import org.apache.flink.api.common.typeinfo.TypeInformation; import org.apache.flink.configuration.Configuration; @@ -32,6 +33,7 @@ import org.apache.flink.util.Visitable; * * @param <OUT> Output type of the records output by this operator */ +@Internal public abstract class Operator<OUT> implements Visitable<Operator<?>> { protected final Configuration parameters; // the parameters to parameterize the UDF http://git-wip-us.apache.org/repos/asf/flink/blob/53f8d773/flink-core/src/main/java/org/apache/flink/api/common/operators/OperatorInformation.java ---------------------------------------------------------------------- diff --git a/flink-core/src/main/java/org/apache/flink/api/common/operators/OperatorInformation.java b/flink-core/src/main/java/org/apache/flink/api/common/operators/OperatorInformation.java index a3c4792..25dc184 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/operators/OperatorInformation.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/operators/OperatorInformation.java @@ -19,6 +19,7 @@ package org.apache.flink.api.common.operators; +import org.apache.flink.annotation.Internal; import org.apache.flink.api.common.typeinfo.TypeInformation; /** @@ -26,6 +27,7 @@ import org.apache.flink.api.common.typeinfo.TypeInformation; * * @param <OUT> Output type of the records output by the operator described by this information */ +@Internal public class OperatorInformation<OUT> { /** * Output type of the operator http://git-wip-us.apache.org/repos/asf/flink/blob/53f8d773/flink-core/src/main/java/org/apache/flink/api/common/operators/Ordering.java ---------------------------------------------------------------------- diff --git a/flink-core/src/main/java/org/apache/flink/api/common/operators/Ordering.java b/flink-core/src/main/java/org/apache/flink/api/common/operators/Ordering.java index f75b797..23928b3 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/operators/Ordering.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/operators/Ordering.java @@ -20,6 +20,7 @@ package org.apache.flink.api.common.operators; import java.util.ArrayList; +import org.apache.flink.annotation.Internal; import org.apache.flink.api.common.operators.util.FieldList; import org.apache.flink.api.common.operators.util.FieldSet; import org.apache.flink.types.Key; @@ -28,6 +29,7 @@ import org.apache.flink.types.Key; * This class represents an ordering on a set of fields. It specifies the fields and order direction * (ascending, descending). */ +@Internal public class Ordering implements Cloneable { protected FieldList indexes = new FieldList(); http://git-wip-us.apache.org/repos/asf/flink/blob/53f8d773/flink-core/src/main/java/org/apache/flink/api/common/operators/SemanticProperties.java ---------------------------------------------------------------------- diff --git a/flink-core/src/main/java/org/apache/flink/api/common/operators/SemanticProperties.java b/flink-core/src/main/java/org/apache/flink/api/common/operators/SemanticProperties.java index b5c1191..fa49496 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/operators/SemanticProperties.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/operators/SemanticProperties.java @@ -21,12 +21,14 @@ package org.apache.flink.api.common.operators; import java.io.Serializable; +import org.apache.flink.annotation.Internal; import org.apache.flink.api.common.InvalidProgramException; import org.apache.flink.api.common.operators.util.FieldSet; /** * Container for the semantic properties associated to an operator. */ +@Internal public interface SemanticProperties extends Serializable { /** http://git-wip-us.apache.org/repos/asf/flink/blob/53f8d773/flink-core/src/main/java/org/apache/flink/api/common/operators/SingleInputOperator.java ---------------------------------------------------------------------- diff --git a/flink-core/src/main/java/org/apache/flink/api/common/operators/SingleInputOperator.java b/flink-core/src/main/java/org/apache/flink/api/common/operators/SingleInputOperator.java index ada4ab0..12887f2 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/operators/SingleInputOperator.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/operators/SingleInputOperator.java @@ -21,6 +21,7 @@ package org.apache.flink.api.common.operators; import java.util.List; +import org.apache.flink.annotation.Internal; import org.apache.flink.api.common.ExecutionConfig; import org.apache.flink.api.common.functions.Function; import org.apache.flink.api.common.functions.RuntimeContext; @@ -34,6 +35,7 @@ import org.apache.flink.util.Visitor; * @param <OUT> Output type of the user function * @param <FT> Type of the user function */ +@Internal public abstract class SingleInputOperator<IN, OUT, FT extends Function> extends AbstractUdfOperator<OUT, FT> { /** The input which produces the data consumed by this operator. */ http://git-wip-us.apache.org/repos/asf/flink/blob/53f8d773/flink-core/src/main/java/org/apache/flink/api/common/operators/SingleInputSemanticProperties.java ---------------------------------------------------------------------- diff --git a/flink-core/src/main/java/org/apache/flink/api/common/operators/SingleInputSemanticProperties.java b/flink-core/src/main/java/org/apache/flink/api/common/operators/SingleInputSemanticProperties.java index 23bbc8b..9d4f115 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/operators/SingleInputSemanticProperties.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/operators/SingleInputSemanticProperties.java @@ -21,11 +21,13 @@ package org.apache.flink.api.common.operators; import java.util.HashMap; import java.util.Map; +import org.apache.flink.annotation.Internal; import org.apache.flink.api.common.operators.util.FieldSet; /** * Container for the semantic properties associated to a single input operator. */ +@Internal public class SingleInputSemanticProperties implements SemanticProperties { private static final long serialVersionUID = 1L; http://git-wip-us.apache.org/repos/asf/flink/blob/53f8d773/flink-core/src/main/java/org/apache/flink/api/common/operators/UnaryOperatorInformation.java ---------------------------------------------------------------------- diff --git a/flink-core/src/main/java/org/apache/flink/api/common/operators/UnaryOperatorInformation.java b/flink-core/src/main/java/org/apache/flink/api/common/operators/UnaryOperatorInformation.java index fff406f..2593953 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/operators/UnaryOperatorInformation.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/operators/UnaryOperatorInformation.java @@ -19,6 +19,7 @@ package org.apache.flink.api.common.operators; +import org.apache.flink.annotation.Internal; import org.apache.flink.api.common.typeinfo.TypeInformation; /** @@ -27,6 +28,7 @@ import org.apache.flink.api.common.typeinfo.TypeInformation; * @param <IN> Output type of the input operator * @param <OUT> Output type of the records output by the operator described by this information */ +@Internal public class UnaryOperatorInformation<IN, OUT> extends OperatorInformation<OUT> { /** http://git-wip-us.apache.org/repos/asf/flink/blob/53f8d773/flink-core/src/main/java/org/apache/flink/api/common/operators/Union.java ---------------------------------------------------------------------- diff --git a/flink-core/src/main/java/org/apache/flink/api/common/operators/Union.java b/flink-core/src/main/java/org/apache/flink/api/common/operators/Union.java index 9586c5d..18fed76 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/operators/Union.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/operators/Union.java @@ -21,6 +21,7 @@ package org.apache.flink.api.common.operators; import java.util.ArrayList; import java.util.List; +import org.apache.flink.annotation.Internal; import org.apache.flink.api.common.ExecutionConfig; import org.apache.flink.api.common.functions.AbstractRichFunction; import org.apache.flink.api.common.functions.RuntimeContext; @@ -29,6 +30,7 @@ import org.apache.flink.api.common.operators.util.UserCodeClassWrapper; /** * This operator represents a Union between two inputs. */ +@Internal public class Union<T> extends DualInputOperator<T, T, T, AbstractRichFunction> { http://git-wip-us.apache.org/repos/asf/flink/blob/53f8d773/flink-core/src/main/java/org/apache/flink/api/common/operators/base/BulkIterationBase.java ---------------------------------------------------------------------- diff --git a/flink-core/src/main/java/org/apache/flink/api/common/operators/base/BulkIterationBase.java b/flink-core/src/main/java/org/apache/flink/api/common/operators/base/BulkIterationBase.java index 4fd4de6..250cafa 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/operators/base/BulkIterationBase.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/operators/base/BulkIterationBase.java @@ -22,6 +22,7 @@ import java.util.Collections; import java.util.List; import java.util.Map; +import org.apache.flink.annotation.Internal; import org.apache.flink.api.common.ExecutionConfig; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -48,6 +49,7 @@ import org.apache.flink.util.Visitor; /** * */ +@Internal public class BulkIterationBase<T> extends SingleInputOperator<T, T, AbstractRichFunction> implements IterationOperator { private static final String DEFAULT_NAME = "<Unnamed Bulk Iteration>"; http://git-wip-us.apache.org/repos/asf/flink/blob/53f8d773/flink-core/src/main/java/org/apache/flink/api/common/operators/base/CoGroupOperatorBase.java ---------------------------------------------------------------------- diff --git a/flink-core/src/main/java/org/apache/flink/api/common/operators/base/CoGroupOperatorBase.java b/flink-core/src/main/java/org/apache/flink/api/common/operators/base/CoGroupOperatorBase.java index 7be5650..e94d512 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/operators/base/CoGroupOperatorBase.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/operators/base/CoGroupOperatorBase.java @@ -18,6 +18,7 @@ package org.apache.flink.api.common.operators.base; +import org.apache.flink.annotation.Internal; import org.apache.flink.api.common.ExecutionConfig; import org.apache.flink.api.common.InvalidProgramException; import org.apache.flink.api.common.functions.CoGroupFunction; @@ -51,6 +52,7 @@ import java.util.List; /** * @see org.apache.flink.api.common.functions.CoGroupFunction */ +@Internal public class CoGroupOperatorBase<IN1, IN2, OUT, FT extends CoGroupFunction<IN1, IN2, OUT>> extends DualInputOperator<IN1, IN2, OUT, FT> { /** The ordering for the order inside a group from input one. */ http://git-wip-us.apache.org/repos/asf/flink/blob/53f8d773/flink-core/src/main/java/org/apache/flink/api/common/operators/base/CoGroupRawOperatorBase.java ---------------------------------------------------------------------- diff --git a/flink-core/src/main/java/org/apache/flink/api/common/operators/base/CoGroupRawOperatorBase.java b/flink-core/src/main/java/org/apache/flink/api/common/operators/base/CoGroupRawOperatorBase.java index 2c81e02..98a478c 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/operators/base/CoGroupRawOperatorBase.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/operators/base/CoGroupRawOperatorBase.java @@ -17,6 +17,7 @@ */ package org.apache.flink.api.common.operators.base; +import org.apache.flink.annotation.Internal; import org.apache.flink.api.common.InvalidProgramException; import org.apache.flink.api.common.functions.CoGroupFunction; import org.apache.flink.api.common.functions.RuntimeContext; @@ -46,6 +47,7 @@ import org.apache.flink.api.common.ExecutionConfig; /** * @see org.apache.flink.api.common.functions.CoGroupFunction */ +@Internal public class CoGroupRawOperatorBase<IN1, IN2, OUT, FT extends CoGroupFunction<IN1, IN2, OUT>> extends DualInputOperator<IN1, IN2, OUT, FT> { /**
