http://git-wip-us.apache.org/repos/asf/flink/blob/53f8d773/flink-core/src/main/java/org/apache/flink/api/common/operators/base/CrossOperatorBase.java ---------------------------------------------------------------------- diff --git a/flink-core/src/main/java/org/apache/flink/api/common/operators/base/CrossOperatorBase.java b/flink-core/src/main/java/org/apache/flink/api/common/operators/base/CrossOperatorBase.java index f2c75a5..95d5bc3 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/operators/base/CrossOperatorBase.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/operators/base/CrossOperatorBase.java @@ -21,6 +21,7 @@ package org.apache.flink.api.common.operators.base; 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.CrossFunction; import org.apache.flink.api.common.functions.RuntimeContext; @@ -35,6 +36,7 @@ import org.apache.flink.api.common.typeutils.TypeSerializer; /** * @see org.apache.flink.api.common.functions.CrossFunction */ +@Internal public class CrossOperatorBase<IN1, IN2, OUT, FT extends CrossFunction<IN1, IN2, OUT>> extends DualInputOperator<IN1, IN2, OUT, FT> { /**
http://git-wip-us.apache.org/repos/asf/flink/blob/53f8d773/flink-core/src/main/java/org/apache/flink/api/common/operators/base/DeltaIterationBase.java ---------------------------------------------------------------------- diff --git a/flink-core/src/main/java/org/apache/flink/api/common/operators/base/DeltaIterationBase.java b/flink-core/src/main/java/org/apache/flink/api/common/operators/base/DeltaIterationBase.java index 9a7674c..b3192dd 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/operators/base/DeltaIterationBase.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/operators/base/DeltaIterationBase.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.apache.flink.api.common.aggregators.AggregatorRegistry; import org.apache.flink.api.common.functions.AbstractRichFunction; @@ -53,6 +54,7 @@ import org.apache.flink.util.Visitor; * This class is a subclass of {@code DualInputOperator}. The solution set is considered the first input, the * workset is considered the second input. */ +@Internal public class DeltaIterationBase<ST, WT> extends DualInputOperator<ST, WT, ST, AbstractRichFunction> implements IterationOperator { private final Operator<ST> solutionSetPlaceholder; http://git-wip-us.apache.org/repos/asf/flink/blob/53f8d773/flink-core/src/main/java/org/apache/flink/api/common/operators/base/FilterOperatorBase.java ---------------------------------------------------------------------- diff --git a/flink-core/src/main/java/org/apache/flink/api/common/operators/base/FilterOperatorBase.java b/flink-core/src/main/java/org/apache/flink/api/common/operators/base/FilterOperatorBase.java index 8d4fce5..1b31bfb 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/operators/base/FilterOperatorBase.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/operators/base/FilterOperatorBase.java @@ -21,6 +21,7 @@ package org.apache.flink.api.common.operators.base; 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.FlatMapFunction; import org.apache.flink.api.common.functions.RuntimeContext; @@ -36,6 +37,7 @@ import org.apache.flink.api.common.operators.util.UserCodeWrapper; /** * @see org.apache.flink.api.common.functions.FlatMapFunction */ +@Internal public class FilterOperatorBase<T, FT extends FlatMapFunction<T, T>> extends SingleInputOperator<T, T, FT> { public FilterOperatorBase(UserCodeWrapper<FT> udf, UnaryOperatorInformation<T, T> operatorInfo, String name) { http://git-wip-us.apache.org/repos/asf/flink/blob/53f8d773/flink-core/src/main/java/org/apache/flink/api/common/operators/base/FlatMapOperatorBase.java ---------------------------------------------------------------------- diff --git a/flink-core/src/main/java/org/apache/flink/api/common/operators/base/FlatMapOperatorBase.java b/flink-core/src/main/java/org/apache/flink/api/common/operators/base/FlatMapOperatorBase.java index a356249..0733aa4 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/operators/base/FlatMapOperatorBase.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/operators/base/FlatMapOperatorBase.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.functions.FlatMapFunction; import org.apache.flink.api.common.functions.RuntimeContext; @@ -36,6 +37,7 @@ import java.util.List; /** * @see org.apache.flink.api.common.functions.FlatMapFunction */ +@Internal public class FlatMapOperatorBase<IN, OUT, FT extends FlatMapFunction<IN, OUT>> extends SingleInputOperator<IN, OUT, FT> { public FlatMapOperatorBase(UserCodeWrapper<FT> udf, UnaryOperatorInformation<IN, OUT> operatorInfo, String name) { http://git-wip-us.apache.org/repos/asf/flink/blob/53f8d773/flink-core/src/main/java/org/apache/flink/api/common/operators/base/GroupCombineOperatorBase.java ---------------------------------------------------------------------- diff --git a/flink-core/src/main/java/org/apache/flink/api/common/operators/base/GroupCombineOperatorBase.java b/flink-core/src/main/java/org/apache/flink/api/common/operators/base/GroupCombineOperatorBase.java index 549e311..b660506 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/operators/base/GroupCombineOperatorBase.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/operators/base/GroupCombineOperatorBase.java @@ -20,6 +20,7 @@ package org.apache.flink.api.common.operators.base; import com.google.common.base.Preconditions; import org.apache.commons.lang3.ArrayUtils; +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.GroupCombineFunction; @@ -47,6 +48,7 @@ import java.util.List; * This class is later processed by the compiler to generate the plan. * @see org.apache.flink.api.common.functions.CombineFunction */ +@Internal public class GroupCombineOperatorBase<IN, OUT, FT extends GroupCombineFunction<IN, OUT>> extends SingleInputOperator<IN, OUT, FT> { http://git-wip-us.apache.org/repos/asf/flink/blob/53f8d773/flink-core/src/main/java/org/apache/flink/api/common/operators/base/GroupReduceOperatorBase.java ---------------------------------------------------------------------- diff --git a/flink-core/src/main/java/org/apache/flink/api/common/operators/base/GroupReduceOperatorBase.java b/flink-core/src/main/java/org/apache/flink/api/common/operators/base/GroupReduceOperatorBase.java index fbb802d..0cc0209 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/operators/base/GroupReduceOperatorBase.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/operators/base/GroupReduceOperatorBase.java @@ -19,6 +19,7 @@ package org.apache.flink.api.common.operators.base; import org.apache.commons.lang3.ArrayUtils; +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.GroupCombineFunction; @@ -50,6 +51,7 @@ import java.util.List; /** * @see org.apache.flink.api.common.functions.GroupReduceFunction */ +@Internal public class GroupReduceOperatorBase<IN, OUT, FT extends GroupReduceFunction<IN, OUT>> extends SingleInputOperator<IN, OUT, FT> { /** The ordering for the order inside a reduce group. */ http://git-wip-us.apache.org/repos/asf/flink/blob/53f8d773/flink-core/src/main/java/org/apache/flink/api/common/operators/base/InnerJoinOperatorBase.java ---------------------------------------------------------------------- diff --git a/flink-core/src/main/java/org/apache/flink/api/common/operators/base/InnerJoinOperatorBase.java b/flink-core/src/main/java/org/apache/flink/api/common/operators/base/InnerJoinOperatorBase.java index 8ec0c9e..b3f1343 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/operators/base/InnerJoinOperatorBase.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/operators/base/InnerJoinOperatorBase.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.functions.FlatJoinFunction; import org.apache.flink.api.common.functions.RuntimeContext; @@ -45,6 +46,7 @@ import java.util.Map; /** * @see org.apache.flink.api.common.functions.FlatJoinFunction */ +@Internal public class InnerJoinOperatorBase<IN1, IN2, OUT, FT extends FlatJoinFunction<IN1, IN2, OUT>> extends JoinOperatorBase<IN1, IN2, OUT, FT> { public InnerJoinOperatorBase(UserCodeWrapper<FT> udf, BinaryOperatorInformation<IN1, IN2, OUT> operatorInfo, http://git-wip-us.apache.org/repos/asf/flink/blob/53f8d773/flink-core/src/main/java/org/apache/flink/api/common/operators/base/JoinOperatorBase.java ---------------------------------------------------------------------- diff --git a/flink-core/src/main/java/org/apache/flink/api/common/operators/base/JoinOperatorBase.java b/flink-core/src/main/java/org/apache/flink/api/common/operators/base/JoinOperatorBase.java index 98194e1..5a32eeb 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/operators/base/JoinOperatorBase.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/operators/base/JoinOperatorBase.java @@ -18,6 +18,8 @@ package org.apache.flink.api.common.operators.base; +import org.apache.flink.annotation.Internal; +import org.apache.flink.annotation.Public; import org.apache.flink.api.common.functions.FlatJoinFunction; import org.apache.flink.api.common.functions.Partitioner; import org.apache.flink.api.common.operators.BinaryOperatorInformation; @@ -26,11 +28,13 @@ import org.apache.flink.api.common.operators.util.UserCodeClassWrapper; import org.apache.flink.api.common.operators.util.UserCodeObjectWrapper; import org.apache.flink.api.common.operators.util.UserCodeWrapper; +@Internal public abstract class JoinOperatorBase<IN1, IN2, OUT, FT extends FlatJoinFunction<IN1, IN2, OUT>> extends DualInputOperator<IN1, IN2, OUT, FT> { /** * An enumeration of hints, optionally usable to tell the system how exactly execute the join. */ + @Public public static enum JoinHint { /** http://git-wip-us.apache.org/repos/asf/flink/blob/53f8d773/flink-core/src/main/java/org/apache/flink/api/common/operators/base/MapOperatorBase.java ---------------------------------------------------------------------- diff --git a/flink-core/src/main/java/org/apache/flink/api/common/operators/base/MapOperatorBase.java b/flink-core/src/main/java/org/apache/flink/api/common/operators/base/MapOperatorBase.java index 033f476..97cd45d 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/operators/base/MapOperatorBase.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/operators/base/MapOperatorBase.java @@ -21,6 +21,7 @@ package org.apache.flink.api.common.operators.base; 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.MapFunction; import org.apache.flink.api.common.functions.RuntimeContext; @@ -38,6 +39,7 @@ import org.apache.flink.api.common.typeutils.TypeSerializer; * @param <OUT> The result type. * @param <FT> The type of the user-defined function. */ +@Internal public class MapOperatorBase<IN, OUT, FT extends MapFunction<IN, OUT>> extends SingleInputOperator<IN, OUT, FT> { public MapOperatorBase(UserCodeWrapper<FT> udf, UnaryOperatorInformation<IN, OUT> operatorInfo, String name) { http://git-wip-us.apache.org/repos/asf/flink/blob/53f8d773/flink-core/src/main/java/org/apache/flink/api/common/operators/base/MapPartitionOperatorBase.java ---------------------------------------------------------------------- diff --git a/flink-core/src/main/java/org/apache/flink/api/common/operators/base/MapPartitionOperatorBase.java b/flink-core/src/main/java/org/apache/flink/api/common/operators/base/MapPartitionOperatorBase.java index 81c2ad4..a26f086 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/operators/base/MapPartitionOperatorBase.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/operators/base/MapPartitionOperatorBase.java @@ -21,6 +21,7 @@ package org.apache.flink.api.common.operators.base; 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.MapPartitionFunction; import org.apache.flink.api.common.functions.RuntimeContext; @@ -40,6 +41,7 @@ import org.apache.flink.api.common.typeutils.TypeSerializer; * @param <OUT> The result type. * @param <FT> The type of the user-defined function. */ +@Internal public class MapPartitionOperatorBase<IN, OUT, FT extends MapPartitionFunction<IN, OUT>> extends SingleInputOperator<IN, OUT, FT> { public MapPartitionOperatorBase(UserCodeWrapper<FT> udf, UnaryOperatorInformation<IN, OUT> operatorInfo, String name) { http://git-wip-us.apache.org/repos/asf/flink/blob/53f8d773/flink-core/src/main/java/org/apache/flink/api/common/operators/base/OuterJoinOperatorBase.java ---------------------------------------------------------------------- diff --git a/flink-core/src/main/java/org/apache/flink/api/common/operators/base/OuterJoinOperatorBase.java b/flink-core/src/main/java/org/apache/flink/api/common/operators/base/OuterJoinOperatorBase.java index 02c8981..a47a612 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/operators/base/OuterJoinOperatorBase.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/operators/base/OuterJoinOperatorBase.java @@ -20,6 +20,7 @@ package org.apache.flink.api.common.operators.base; import org.apache.commons.collections.ResettableIterator; import org.apache.commons.collections.iterators.ListIteratorWrapper; +import org.apache.flink.annotation.Internal; import org.apache.flink.api.common.ExecutionConfig; import org.apache.flink.api.common.functions.FlatJoinFunction; import org.apache.flink.api.common.functions.RuntimeContext; @@ -45,6 +46,7 @@ import java.util.Collections; import java.util.Comparator; import java.util.List; +@Internal public class OuterJoinOperatorBase<IN1, IN2, OUT, FT extends FlatJoinFunction<IN1, IN2, OUT>> extends JoinOperatorBase<IN1, IN2, OUT, FT> { public static enum OuterJoinType {LEFT, RIGHT, FULL} http://git-wip-us.apache.org/repos/asf/flink/blob/53f8d773/flink-core/src/main/java/org/apache/flink/api/common/operators/base/PartitionOperatorBase.java ---------------------------------------------------------------------- diff --git a/flink-core/src/main/java/org/apache/flink/api/common/operators/base/PartitionOperatorBase.java b/flink-core/src/main/java/org/apache/flink/api/common/operators/base/PartitionOperatorBase.java index f91d7d8..fd71fac 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/operators/base/PartitionOperatorBase.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/operators/base/PartitionOperatorBase.java @@ -20,6 +20,7 @@ package org.apache.flink.api.common.operators.base; 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; @@ -32,8 +33,9 @@ import org.apache.flink.api.common.operators.util.UserCodeObjectWrapper; /** * @param <IN> The input and result type. */ +@Internal public class PartitionOperatorBase<IN> extends SingleInputOperator<IN, IN, NoOpFunction> { - + public static enum PartitionMethod { REBALANCE, HASH, http://git-wip-us.apache.org/repos/asf/flink/blob/53f8d773/flink-core/src/main/java/org/apache/flink/api/common/operators/base/ReduceOperatorBase.java ---------------------------------------------------------------------- diff --git a/flink-core/src/main/java/org/apache/flink/api/common/operators/base/ReduceOperatorBase.java b/flink-core/src/main/java/org/apache/flink/api/common/operators/base/ReduceOperatorBase.java index e843ee6..349057e 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/operators/base/ReduceOperatorBase.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/operators/base/ReduceOperatorBase.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.Partitioner; @@ -50,6 +51,7 @@ import java.util.Map; * @param <T> The type (parameters and return type) of the reduce function. * @param <FT> The type of the reduce function. */ +@Internal public class ReduceOperatorBase<T, FT extends ReduceFunction<T>> extends SingleInputOperator<T, T, FT> { private Partitioner<?> customPartitioner; http://git-wip-us.apache.org/repos/asf/flink/blob/53f8d773/flink-core/src/main/java/org/apache/flink/api/common/operators/base/SortPartitionOperatorBase.java ---------------------------------------------------------------------- diff --git a/flink-core/src/main/java/org/apache/flink/api/common/operators/base/SortPartitionOperatorBase.java b/flink-core/src/main/java/org/apache/flink/api/common/operators/base/SortPartitionOperatorBase.java index 6fe237d..34a7498 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/operators/base/SortPartitionOperatorBase.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/operators/base/SortPartitionOperatorBase.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.functions.RuntimeContext; import org.apache.flink.api.common.functions.util.NoOpFunction; @@ -38,6 +39,7 @@ import java.util.List; /** * @param <IN> The input and result type. */ +@Internal public class SortPartitionOperatorBase<IN> extends SingleInputOperator<IN, IN, NoOpFunction> { private final Ordering partitionOrdering; http://git-wip-us.apache.org/repos/asf/flink/blob/53f8d773/flink-core/src/main/java/org/apache/flink/api/common/operators/util/FieldList.java ---------------------------------------------------------------------- diff --git a/flink-core/src/main/java/org/apache/flink/api/common/operators/util/FieldList.java b/flink-core/src/main/java/org/apache/flink/api/common/operators/util/FieldList.java index 531bbc5..c69c875 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/operators/util/FieldList.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/operators/util/FieldList.java @@ -24,10 +24,12 @@ import java.util.Collections; import java.util.List; import com.google.common.base.Preconditions; +import org.apache.flink.annotation.Internal; /** * Immutable ordered list of fields IDs. */ +@Internal public class FieldList extends FieldSet { public static final FieldList EMPTY_LIST = new FieldList(); http://git-wip-us.apache.org/repos/asf/flink/blob/53f8d773/flink-core/src/main/java/org/apache/flink/api/common/operators/util/FieldSet.java ---------------------------------------------------------------------- diff --git a/flink-core/src/main/java/org/apache/flink/api/common/operators/util/FieldSet.java b/flink-core/src/main/java/org/apache/flink/api/common/operators/util/FieldSet.java index 8d2f437..95c6885 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/operators/util/FieldSet.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/operators/util/FieldSet.java @@ -19,6 +19,8 @@ package org.apache.flink.api.common.operators.util; +import org.apache.flink.annotation.Internal; + import java.util.Arrays; import java.util.Collection; import java.util.Collections; @@ -28,6 +30,7 @@ import java.util.Iterator; /** * Immutable unordered collection of fields IDs. */ +@Internal public class FieldSet implements Iterable<Integer> { public static final FieldSet EMPTY_SET = new FieldSet(); http://git-wip-us.apache.org/repos/asf/flink/blob/53f8d773/flink-core/src/main/java/org/apache/flink/api/common/operators/util/JoinHashMap.java ---------------------------------------------------------------------- diff --git a/flink-core/src/main/java/org/apache/flink/api/common/operators/util/JoinHashMap.java b/flink-core/src/main/java/org/apache/flink/api/common/operators/util/JoinHashMap.java index ab7596e..5e9860a 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/operators/util/JoinHashMap.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/operators/util/JoinHashMap.java @@ -19,10 +19,12 @@ package org.apache.flink.api.common.operators.util; import org.apache.commons.collections.map.AbstractHashedMap; +import org.apache.flink.annotation.Internal; import org.apache.flink.api.common.typeutils.TypeComparator; import org.apache.flink.api.common.typeutils.TypePairComparator; import org.apache.flink.api.common.typeutils.TypeSerializer; +@Internal public class JoinHashMap<BT> extends AbstractHashedMap { private final TypeSerializer<BT> buildSerializer; http://git-wip-us.apache.org/repos/asf/flink/blob/53f8d773/flink-core/src/main/java/org/apache/flink/api/common/operators/util/ListKeyGroupedIterator.java ---------------------------------------------------------------------- diff --git a/flink-core/src/main/java/org/apache/flink/api/common/operators/util/ListKeyGroupedIterator.java b/flink-core/src/main/java/org/apache/flink/api/common/operators/util/ListKeyGroupedIterator.java index bb40c98..ece41a5 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/operators/util/ListKeyGroupedIterator.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/operators/util/ListKeyGroupedIterator.java @@ -18,6 +18,7 @@ package org.apache.flink.api.common.operators.util; +import org.apache.flink.annotation.Internal; import org.apache.flink.api.common.typeutils.TypeComparator; import org.apache.flink.api.common.typeutils.TypeSerializer; @@ -29,6 +30,7 @@ import java.util.NoSuchElementException; /** * The KeyValueIterator returns a key and all values that belong to the key (share the same key). */ +@Internal public final class ListKeyGroupedIterator<E> { private final List<E> input; http://git-wip-us.apache.org/repos/asf/flink/blob/53f8d773/flink-core/src/main/java/org/apache/flink/api/common/operators/util/TypeComparable.java ---------------------------------------------------------------------- diff --git a/flink-core/src/main/java/org/apache/flink/api/common/operators/util/TypeComparable.java b/flink-core/src/main/java/org/apache/flink/api/common/operators/util/TypeComparable.java index 5ee6276..049e642 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/operators/util/TypeComparable.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/operators/util/TypeComparable.java @@ -17,11 +17,13 @@ */ package org.apache.flink.api.common.operators.util; +import org.apache.flink.annotation.Internal; import org.apache.flink.api.common.typeutils.TypeComparator; /** * Wrapper that is used to store elements for which we have a TypeComparator in a Hash Map. */ +@Internal public class TypeComparable<T> { private final T elem; private final TypeComparator<T> comparator; http://git-wip-us.apache.org/repos/asf/flink/blob/53f8d773/flink-core/src/main/java/org/apache/flink/api/common/operators/util/UserCodeClassWrapper.java ---------------------------------------------------------------------- diff --git a/flink-core/src/main/java/org/apache/flink/api/common/operators/util/UserCodeClassWrapper.java b/flink-core/src/main/java/org/apache/flink/api/common/operators/util/UserCodeClassWrapper.java index 1b1d5ce..f67bffb 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/operators/util/UserCodeClassWrapper.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/operators/util/UserCodeClassWrapper.java @@ -20,11 +20,13 @@ package org.apache.flink.api.common.operators.util; import java.lang.annotation.Annotation; +import org.apache.flink.annotation.Internal; import org.apache.flink.util.InstantiationUtil; /** * This holds a class containing user defined code. */ +@Internal public class UserCodeClassWrapper<T> implements UserCodeWrapper<T> { 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/util/UserCodeObjectWrapper.java ---------------------------------------------------------------------- diff --git a/flink-core/src/main/java/org/apache/flink/api/common/operators/util/UserCodeObjectWrapper.java b/flink-core/src/main/java/org/apache/flink/api/common/operators/util/UserCodeObjectWrapper.java index f06de90..890caac 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/operators/util/UserCodeObjectWrapper.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/operators/util/UserCodeObjectWrapper.java @@ -24,6 +24,7 @@ import java.lang.reflect.Field; import java.lang.reflect.Method; import java.lang.reflect.Modifier; +import org.apache.flink.annotation.Internal; import org.apache.flink.api.common.NonSerializableUserCodeException; import com.google.common.base.Preconditions; @@ -31,6 +32,7 @@ import com.google.common.base.Preconditions; /** * This holds an actual object containing user defined code. */ +@Internal public class UserCodeObjectWrapper<T> implements UserCodeWrapper<T> { 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/util/UserCodeWrapper.java ---------------------------------------------------------------------- diff --git a/flink-core/src/main/java/org/apache/flink/api/common/operators/util/UserCodeWrapper.java b/flink-core/src/main/java/org/apache/flink/api/common/operators/util/UserCodeWrapper.java index 032c906..b293bde 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/operators/util/UserCodeWrapper.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/operators/util/UserCodeWrapper.java @@ -18,6 +18,8 @@ package org.apache.flink.api.common.operators.util; +import org.apache.flink.annotation.Internal; + import java.io.Serializable; import java.lang.annotation.Annotation; @@ -25,6 +27,7 @@ import java.lang.annotation.Annotation; * UDf operators can have either a class or an object containing the user * code, this is the common interface to access them. */ +@Internal public interface UserCodeWrapper<T> extends Serializable { /** http://git-wip-us.apache.org/repos/asf/flink/blob/53f8d773/flink-core/src/main/java/org/apache/flink/api/common/state/FoldingState.java ---------------------------------------------------------------------- diff --git a/flink-core/src/main/java/org/apache/flink/api/common/state/FoldingState.java b/flink-core/src/main/java/org/apache/flink/api/common/state/FoldingState.java index d328c2e..fa8eda8 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/state/FoldingState.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/state/FoldingState.java @@ -18,6 +18,8 @@ package org.apache.flink.api.common.state; +import org.apache.flink.annotation.PublicEvolving; + /** * {@link State} interface for folding state. Elements can be added to the state, they will * be successively added to the initial value using a @@ -34,4 +36,5 @@ package org.apache.flink.api.common.state; * @param <T> Type of the values folded into the state * @param <ACC> Type of the value in the state */ +@PublicEvolving public interface FoldingState<T, ACC> extends MergingState<T, ACC> {} http://git-wip-us.apache.org/repos/asf/flink/blob/53f8d773/flink-core/src/main/java/org/apache/flink/api/common/state/FoldingStateDescriptor.java ---------------------------------------------------------------------- diff --git a/flink-core/src/main/java/org/apache/flink/api/common/state/FoldingStateDescriptor.java b/flink-core/src/main/java/org/apache/flink/api/common/state/FoldingStateDescriptor.java index 52ad712..034e97a 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/state/FoldingStateDescriptor.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/state/FoldingStateDescriptor.java @@ -18,6 +18,7 @@ package org.apache.flink.api.common.state; +import org.apache.flink.annotation.PublicEvolving; import org.apache.flink.api.common.functions.FoldFunction; import org.apache.flink.api.common.functions.RichFunction; import org.apache.flink.api.common.typeinfo.TypeInformation; @@ -32,6 +33,7 @@ import static java.util.Objects.requireNonNull; * @param <T> Type of the values folded int othe state * @param <ACC> Type of the value in the state */ +@PublicEvolving public class FoldingStateDescriptor<T, ACC> extends StateDescriptor<FoldingState<T, ACC>, ACC> { 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/state/ListState.java ---------------------------------------------------------------------- diff --git a/flink-core/src/main/java/org/apache/flink/api/common/state/ListState.java b/flink-core/src/main/java/org/apache/flink/api/common/state/ListState.java index f803105..6073c6e 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/state/ListState.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/state/ListState.java @@ -18,6 +18,8 @@ package org.apache.flink.api.common.state; +import org.apache.flink.annotation.PublicEvolving; + /** * {@link State} interface for partitioned list state in Operations. * The state is accessed and modified by user functions, and checkpointed consistently @@ -30,4 +32,5 @@ package org.apache.flink.api.common.state; * * @param <T> Type of values that this list state keeps. */ +@PublicEvolving public interface ListState<T> extends MergingState<T, Iterable<T>> {} http://git-wip-us.apache.org/repos/asf/flink/blob/53f8d773/flink-core/src/main/java/org/apache/flink/api/common/state/ListStateDescriptor.java ---------------------------------------------------------------------- diff --git a/flink-core/src/main/java/org/apache/flink/api/common/state/ListStateDescriptor.java b/flink-core/src/main/java/org/apache/flink/api/common/state/ListStateDescriptor.java index 9f266d3..8807e8e 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/state/ListStateDescriptor.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/state/ListStateDescriptor.java @@ -18,6 +18,7 @@ package org.apache.flink.api.common.state; +import org.apache.flink.annotation.PublicEvolving; import org.apache.flink.api.common.typeinfo.TypeInformation; import org.apache.flink.api.common.typeutils.TypeSerializer; @@ -28,6 +29,7 @@ import org.apache.flink.api.common.typeutils.TypeSerializer; * * @param <T> The type of the values that can be added to the list state. */ +@PublicEvolving public class ListStateDescriptor<T> extends StateDescriptor<ListState<T>, T> { 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/state/MergingState.java ---------------------------------------------------------------------- diff --git a/flink-core/src/main/java/org/apache/flink/api/common/state/MergingState.java b/flink-core/src/main/java/org/apache/flink/api/common/state/MergingState.java index f6c0ecb..09abfd3 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/state/MergingState.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/state/MergingState.java @@ -18,6 +18,8 @@ package org.apache.flink.api.common.state; +import org.apache.flink.annotation.PublicEvolving; + import java.io.IOException; /** @@ -36,6 +38,7 @@ import java.io.IOException; * @param <IN> Type of the value that can be added to the state. * @param <OUT> Type of the value that can be retrieved from the state. */ +@PublicEvolving public interface MergingState<IN, OUT> extends State { /** http://git-wip-us.apache.org/repos/asf/flink/blob/53f8d773/flink-core/src/main/java/org/apache/flink/api/common/state/OperatorState.java ---------------------------------------------------------------------- diff --git a/flink-core/src/main/java/org/apache/flink/api/common/state/OperatorState.java b/flink-core/src/main/java/org/apache/flink/api/common/state/OperatorState.java index db563a0..ac4ed07 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/state/OperatorState.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/state/OperatorState.java @@ -18,6 +18,8 @@ package org.apache.flink.api.common.state; +import org.apache.flink.annotation.PublicEvolving; + import java.io.IOException; /** @@ -35,6 +37,7 @@ import java.io.IOException; * @deprecated OperatorState has been replaced by {@link ValueState}. */ @Deprecated +@PublicEvolving public interface OperatorState<T> extends State { /** @@ -64,4 +67,4 @@ public interface OperatorState<T> extends State { */ void update(T value) throws IOException; -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/flink/blob/53f8d773/flink-core/src/main/java/org/apache/flink/api/common/state/ReducingState.java ---------------------------------------------------------------------- diff --git a/flink-core/src/main/java/org/apache/flink/api/common/state/ReducingState.java b/flink-core/src/main/java/org/apache/flink/api/common/state/ReducingState.java index 3e2c543..8364fb3 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/state/ReducingState.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/state/ReducingState.java @@ -18,6 +18,8 @@ package org.apache.flink.api.common.state; +import org.apache.flink.annotation.PublicEvolving; + /** * {@link State} interface for reducing state. Elements can be added to the state, they will * be combined using a reduce function. The current state can be inspected. @@ -32,4 +34,5 @@ package org.apache.flink.api.common.state; * * @param <T> Type of the value in the operator state */ +@PublicEvolving public interface ReducingState<T> extends MergingState<T, T> {} http://git-wip-us.apache.org/repos/asf/flink/blob/53f8d773/flink-core/src/main/java/org/apache/flink/api/common/state/ReducingStateDescriptor.java ---------------------------------------------------------------------- diff --git a/flink-core/src/main/java/org/apache/flink/api/common/state/ReducingStateDescriptor.java b/flink-core/src/main/java/org/apache/flink/api/common/state/ReducingStateDescriptor.java index 1ef65a3..7bf1be9 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/state/ReducingStateDescriptor.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/state/ReducingStateDescriptor.java @@ -18,6 +18,7 @@ package org.apache.flink.api.common.state; +import org.apache.flink.annotation.PublicEvolving; import org.apache.flink.api.common.functions.ReduceFunction; import org.apache.flink.api.common.functions.RichFunction; import org.apache.flink.api.common.typeinfo.TypeInformation; @@ -32,6 +33,7 @@ import static java.util.Objects.requireNonNull; * * @param <T> The type of the values that can be added to the list state. */ +@PublicEvolving public class ReducingStateDescriptor<T> extends StateDescriptor<ReducingState<T>, T> { 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/state/State.java ---------------------------------------------------------------------- diff --git a/flink-core/src/main/java/org/apache/flink/api/common/state/State.java b/flink-core/src/main/java/org/apache/flink/api/common/state/State.java index b97658b..86e9ec8 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/state/State.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/state/State.java @@ -18,6 +18,8 @@ package org.apache.flink.api.common.state; +import org.apache.flink.annotation.PublicEvolving; + /** * Interface that different types of partitioned state must implement. * @@ -26,6 +28,7 @@ package org.apache.flink.api.common.state; * key of the current element. That way, the system can handle stream and state partitioning * consistently together. */ +@PublicEvolving public interface State { /** http://git-wip-us.apache.org/repos/asf/flink/blob/53f8d773/flink-core/src/main/java/org/apache/flink/api/common/state/StateBackend.java ---------------------------------------------------------------------- diff --git a/flink-core/src/main/java/org/apache/flink/api/common/state/StateBackend.java b/flink-core/src/main/java/org/apache/flink/api/common/state/StateBackend.java index a61433a..d396a31 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/state/StateBackend.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/state/StateBackend.java @@ -18,10 +18,13 @@ package org.apache.flink.api.common.state; +import org.apache.flink.annotation.PublicEvolving; + /** * The {@code StateBackend} is used by {@link StateDescriptor} instances to create actual state * representations. */ +@PublicEvolving public interface StateBackend { /** http://git-wip-us.apache.org/repos/asf/flink/blob/53f8d773/flink-core/src/main/java/org/apache/flink/api/common/state/StateDescriptor.java ---------------------------------------------------------------------- diff --git a/flink-core/src/main/java/org/apache/flink/api/common/state/StateDescriptor.java b/flink-core/src/main/java/org/apache/flink/api/common/state/StateDescriptor.java index 4cf2371..ab625cf 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/state/StateDescriptor.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/state/StateDescriptor.java @@ -18,6 +18,7 @@ package org.apache.flink.api.common.state; +import org.apache.flink.annotation.PublicEvolving; import org.apache.flink.api.common.ExecutionConfig; import org.apache.flink.api.common.typeinfo.TypeInformation; import org.apache.flink.api.common.typeutils.TypeSerializer; @@ -43,6 +44,7 @@ import static java.util.Objects.requireNonNull; * * @param <S> The type of the State objects created from this {@code StateDescriptor}. */ +@PublicEvolving public abstract class StateDescriptor<S extends State, T> implements Serializable { 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/state/ValueState.java ---------------------------------------------------------------------- diff --git a/flink-core/src/main/java/org/apache/flink/api/common/state/ValueState.java b/flink-core/src/main/java/org/apache/flink/api/common/state/ValueState.java index ddb048f..607cb32 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/state/ValueState.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/state/ValueState.java @@ -18,7 +18,7 @@ package org.apache.flink.api.common.state; -import org.apache.flink.annotation.Public; +import org.apache.flink.annotation.PublicEvolving; import java.io.IOException; @@ -36,7 +36,7 @@ import java.io.IOException; * * @param <T> Type of the value in the state. */ -@Public +@PublicEvolving public interface ValueState<T> extends State, OperatorState<T> { /** http://git-wip-us.apache.org/repos/asf/flink/blob/53f8d773/flink-core/src/main/java/org/apache/flink/api/common/state/ValueStateDescriptor.java ---------------------------------------------------------------------- diff --git a/flink-core/src/main/java/org/apache/flink/api/common/state/ValueStateDescriptor.java b/flink-core/src/main/java/org/apache/flink/api/common/state/ValueStateDescriptor.java index f949c57..0c61bb1 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/state/ValueStateDescriptor.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/state/ValueStateDescriptor.java @@ -18,6 +18,7 @@ package org.apache.flink.api.common.state; +import org.apache.flink.annotation.PublicEvolving; import org.apache.flink.api.common.typeinfo.TypeInformation; import org.apache.flink.api.common.typeutils.TypeSerializer; @@ -28,6 +29,7 @@ import org.apache.flink.api.common.typeutils.TypeSerializer; * * @param <T> The type of the values that the value state can hold. */ +@PublicEvolving public class ValueStateDescriptor<T> extends StateDescriptor<ValueState<T>, T> { 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/typeutils/CompositeTypeComparator.java ---------------------------------------------------------------------- diff --git a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/CompositeTypeComparator.java b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/CompositeTypeComparator.java index 6c9e33e..d7a987e 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/CompositeTypeComparator.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/CompositeTypeComparator.java @@ -18,10 +18,13 @@ package org.apache.flink.api.common.typeutils; +import org.apache.flink.annotation.PublicEvolving; + import java.util.LinkedList; import java.util.List; @SuppressWarnings("rawtypes") +@PublicEvolving public abstract class CompositeTypeComparator<T> extends TypeComparator<T> { 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/typeutils/GenericPairComparator.java ---------------------------------------------------------------------- diff --git a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/GenericPairComparator.java b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/GenericPairComparator.java index e3bf4ca..203fce9 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/GenericPairComparator.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/GenericPairComparator.java @@ -18,9 +18,11 @@ package org.apache.flink.api.common.typeutils; -import java.io.Serializable; +import org.apache.flink.annotation.Internal; +import java.io.Serializable; +@Internal public class GenericPairComparator<T1, T2> extends TypePairComparator<T1, T2> implements Serializable { http://git-wip-us.apache.org/repos/asf/flink/blob/53f8d773/flink-core/src/main/java/org/apache/flink/api/common/typeutils/TypeComparator.java ---------------------------------------------------------------------- diff --git a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/TypeComparator.java b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/TypeComparator.java index cd5da84..afacb9f 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/TypeComparator.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/TypeComparator.java @@ -21,6 +21,7 @@ package org.apache.flink.api.common.typeutils; import java.io.IOException; import java.io.Serializable; +import org.apache.flink.annotation.PublicEvolving; import org.apache.flink.core.memory.DataInputView; import org.apache.flink.core.memory.DataOutputView; import org.apache.flink.core.memory.MemorySegment; @@ -47,6 +48,7 @@ import org.apache.flink.core.memory.MemorySegment; * * @param <T> The data type that the comparator works on. */ +@PublicEvolving public abstract class TypeComparator<T> implements Serializable { 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/typeutils/TypeComparatorFactory.java ---------------------------------------------------------------------- diff --git a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/TypeComparatorFactory.java b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/TypeComparatorFactory.java index f5bc7d8..fbcdb61 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/TypeComparatorFactory.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/TypeComparatorFactory.java @@ -19,11 +19,13 @@ package org.apache.flink.api.common.typeutils; +import org.apache.flink.annotation.Internal; import org.apache.flink.configuration.Configuration; /** * */ +@Internal public interface TypeComparatorFactory<T> { void writeParametersToConfig(Configuration config); http://git-wip-us.apache.org/repos/asf/flink/blob/53f8d773/flink-core/src/main/java/org/apache/flink/api/common/typeutils/TypePairComparator.java ---------------------------------------------------------------------- diff --git a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/TypePairComparator.java b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/TypePairComparator.java index fe278fd..7ec0de9 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/TypePairComparator.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/TypePairComparator.java @@ -17,6 +17,8 @@ */ package org.apache.flink.api.common.typeutils; +import org.apache.flink.annotation.Internal; + /** * This interface defines the method required by the runtime to use data types in join-like operations. * In such operations, instances of different data types are compared for equality with respect to certain @@ -30,6 +32,7 @@ package org.apache.flink.api.common.typeutils; * @param <T1> The class of the first data type. * @param <T2> The class of the second data type. */ +@Internal public abstract class TypePairComparator<T1, T2> { /** http://git-wip-us.apache.org/repos/asf/flink/blob/53f8d773/flink-core/src/main/java/org/apache/flink/api/common/typeutils/TypePairComparatorFactory.java ---------------------------------------------------------------------- diff --git a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/TypePairComparatorFactory.java b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/TypePairComparatorFactory.java index d678060..75bea1c 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/TypePairComparatorFactory.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/TypePairComparatorFactory.java @@ -19,9 +19,12 @@ package org.apache.flink.api.common.typeutils; +import org.apache.flink.annotation.Internal; + /** * */ +@Internal public interface TypePairComparatorFactory<T1, T2> { TypePairComparator<T1, T2> createComparator12(TypeComparator<T1> comparator1, TypeComparator<T2> comparator2); http://git-wip-us.apache.org/repos/asf/flink/blob/53f8d773/flink-core/src/main/java/org/apache/flink/api/common/typeutils/TypeSerializer.java ---------------------------------------------------------------------- diff --git a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/TypeSerializer.java b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/TypeSerializer.java index 6d603d3..0d56743 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/TypeSerializer.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/TypeSerializer.java @@ -21,6 +21,7 @@ package org.apache.flink.api.common.typeutils; import java.io.IOException; import java.io.Serializable; +import org.apache.flink.annotation.PublicEvolving; import org.apache.flink.core.memory.DataInputView; import org.apache.flink.core.memory.DataOutputView; @@ -34,6 +35,7 @@ import org.apache.flink.core.memory.DataOutputView; * * @param <T> The data type that the serializer serializes. */ +@PublicEvolving public abstract class TypeSerializer<T> implements Serializable { 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/typeutils/TypeSerializerFactory.java ---------------------------------------------------------------------- diff --git a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/TypeSerializerFactory.java b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/TypeSerializerFactory.java index 102e76d..abfc4a0 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/TypeSerializerFactory.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/TypeSerializerFactory.java @@ -19,9 +19,10 @@ package org.apache.flink.api.common.typeutils; +import org.apache.flink.annotation.Internal; import org.apache.flink.configuration.Configuration; - +@Internal public interface TypeSerializerFactory<T> { void writeParametersToConfig(Configuration config); http://git-wip-us.apache.org/repos/asf/flink/blob/53f8d773/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/BasicTypeComparator.java ---------------------------------------------------------------------- diff --git a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/BasicTypeComparator.java b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/BasicTypeComparator.java index d1d8e0f..1221221 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/BasicTypeComparator.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/BasicTypeComparator.java @@ -20,11 +20,12 @@ package org.apache.flink.api.common.typeutils.base; import java.io.IOException; +import org.apache.flink.annotation.Internal; import org.apache.flink.api.common.typeutils.TypeComparator; import org.apache.flink.core.memory.DataInputView; import org.apache.flink.core.memory.DataOutputView; - +@Internal public abstract class BasicTypeComparator<T extends Comparable<T>> extends TypeComparator<T> implements java.io.Serializable { 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/typeutils/base/BooleanComparator.java ---------------------------------------------------------------------- diff --git a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/BooleanComparator.java b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/BooleanComparator.java index e8c53ce..290b8d0 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/BooleanComparator.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/BooleanComparator.java @@ -20,11 +20,11 @@ package org.apache.flink.api.common.typeutils.base; import java.io.IOException; +import org.apache.flink.annotation.Internal; import org.apache.flink.core.memory.DataInputView; import org.apache.flink.core.memory.MemorySegment; - - +@Internal public final class BooleanComparator extends BasicTypeComparator<Boolean> { 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/typeutils/base/BooleanSerializer.java ---------------------------------------------------------------------- diff --git a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/BooleanSerializer.java b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/BooleanSerializer.java index 5fe586b..609f184 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/BooleanSerializer.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/BooleanSerializer.java @@ -20,9 +20,11 @@ package org.apache.flink.api.common.typeutils.base; import java.io.IOException; +import org.apache.flink.annotation.Internal; import org.apache.flink.core.memory.DataInputView; import org.apache.flink.core.memory.DataOutputView; +@Internal public final class BooleanSerializer extends TypeSerializerSingleton<Boolean> { 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/typeutils/base/BooleanValueSerializer.java ---------------------------------------------------------------------- diff --git a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/BooleanValueSerializer.java b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/BooleanValueSerializer.java index a3d2c39..62c91df 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/BooleanValueSerializer.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/BooleanValueSerializer.java @@ -20,11 +20,12 @@ package org.apache.flink.api.common.typeutils.base; import java.io.IOException; +import org.apache.flink.annotation.Internal; import org.apache.flink.core.memory.DataInputView; import org.apache.flink.core.memory.DataOutputView; import org.apache.flink.types.BooleanValue; - +@Internal public final class BooleanValueSerializer extends TypeSerializerSingleton<BooleanValue> { 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/typeutils/base/ByteComparator.java ---------------------------------------------------------------------- diff --git a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/ByteComparator.java b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/ByteComparator.java index 54480fb..d98b1c7 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/ByteComparator.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/ByteComparator.java @@ -20,11 +20,11 @@ package org.apache.flink.api.common.typeutils.base; import java.io.IOException; +import org.apache.flink.annotation.Internal; import org.apache.flink.core.memory.DataInputView; import org.apache.flink.core.memory.MemorySegment; - - +@Internal public final class ByteComparator extends BasicTypeComparator<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/typeutils/base/ByteSerializer.java ---------------------------------------------------------------------- diff --git a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/ByteSerializer.java b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/ByteSerializer.java index abc816c..6ad7e4e 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/ByteSerializer.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/ByteSerializer.java @@ -20,10 +20,11 @@ package org.apache.flink.api.common.typeutils.base; import java.io.IOException; +import org.apache.flink.annotation.Internal; import org.apache.flink.core.memory.DataInputView; import org.apache.flink.core.memory.DataOutputView; - +@Internal public final class ByteSerializer extends TypeSerializerSingleton<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/typeutils/base/ByteValueSerializer.java ---------------------------------------------------------------------- diff --git a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/ByteValueSerializer.java b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/ByteValueSerializer.java index ff44c27..848b01e 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/ByteValueSerializer.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/ByteValueSerializer.java @@ -20,11 +20,12 @@ package org.apache.flink.api.common.typeutils.base; import java.io.IOException; +import org.apache.flink.annotation.Internal; import org.apache.flink.core.memory.DataInputView; import org.apache.flink.core.memory.DataOutputView; import org.apache.flink.types.ByteValue; - +@Internal public final class ByteValueSerializer extends TypeSerializerSingleton<ByteValue> { 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/typeutils/base/CharComparator.java ---------------------------------------------------------------------- diff --git a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/CharComparator.java b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/CharComparator.java index a2b5200..f9e186a 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/CharComparator.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/CharComparator.java @@ -20,11 +20,11 @@ package org.apache.flink.api.common.typeutils.base; import java.io.IOException; +import org.apache.flink.annotation.Internal; import org.apache.flink.core.memory.DataInputView; import org.apache.flink.core.memory.MemorySegment; - - +@Internal public final class CharComparator extends BasicTypeComparator<Character> { 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/typeutils/base/CharSerializer.java ---------------------------------------------------------------------- diff --git a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/CharSerializer.java b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/CharSerializer.java index 2734af7..21a32f1 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/CharSerializer.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/CharSerializer.java @@ -20,10 +20,11 @@ package org.apache.flink.api.common.typeutils.base; import java.io.IOException; +import org.apache.flink.annotation.Internal; import org.apache.flink.core.memory.DataInputView; import org.apache.flink.core.memory.DataOutputView; - +@Internal public final class CharSerializer extends TypeSerializerSingleton<Character> { 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/typeutils/base/CharValueSerializer.java ---------------------------------------------------------------------- diff --git a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/CharValueSerializer.java b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/CharValueSerializer.java index e14a861..84dc39a 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/CharValueSerializer.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/CharValueSerializer.java @@ -20,10 +20,12 @@ package org.apache.flink.api.common.typeutils.base; import java.io.IOException; +import org.apache.flink.annotation.Internal; import org.apache.flink.core.memory.DataInputView; import org.apache.flink.core.memory.DataOutputView; import org.apache.flink.types.CharValue; +@Internal public class CharValueSerializer extends TypeSerializerSingleton<CharValue> { 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/typeutils/base/DateComparator.java ---------------------------------------------------------------------- diff --git a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/DateComparator.java b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/DateComparator.java index 177ed45..fbf73ba 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/DateComparator.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/DateComparator.java @@ -18,13 +18,14 @@ package org.apache.flink.api.common.typeutils.base; +import org.apache.flink.annotation.Internal; import org.apache.flink.core.memory.DataInputView; import org.apache.flink.core.memory.MemorySegment; import java.io.IOException; import java.util.Date; - +@Internal public final class DateComparator extends BasicTypeComparator<Date> { 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/typeutils/base/DateSerializer.java ---------------------------------------------------------------------- diff --git a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/DateSerializer.java b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/DateSerializer.java index 6703240..1d3751b 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/DateSerializer.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/DateSerializer.java @@ -18,13 +18,14 @@ package org.apache.flink.api.common.typeutils.base; +import org.apache.flink.annotation.Internal; import org.apache.flink.core.memory.DataInputView; import org.apache.flink.core.memory.DataOutputView; import java.io.IOException; import java.util.Date; - +@Internal public final class DateSerializer extends TypeSerializerSingleton<Date> { 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/typeutils/base/DoubleComparator.java ---------------------------------------------------------------------- diff --git a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/DoubleComparator.java b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/DoubleComparator.java index 8f0191f..3b33ba7 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/DoubleComparator.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/DoubleComparator.java @@ -20,11 +20,11 @@ package org.apache.flink.api.common.typeutils.base; import java.io.IOException; +import org.apache.flink.annotation.Internal; import org.apache.flink.core.memory.DataInputView; import org.apache.flink.core.memory.MemorySegment; - - +@Internal public final class DoubleComparator extends BasicTypeComparator<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/typeutils/base/DoubleSerializer.java ---------------------------------------------------------------------- diff --git a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/DoubleSerializer.java b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/DoubleSerializer.java index f982399..375cb9c 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/DoubleSerializer.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/DoubleSerializer.java @@ -20,9 +20,11 @@ package org.apache.flink.api.common.typeutils.base; import java.io.IOException; +import org.apache.flink.annotation.Internal; import org.apache.flink.core.memory.DataInputView; import org.apache.flink.core.memory.DataOutputView; +@Internal public final class DoubleSerializer extends TypeSerializerSingleton<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/typeutils/base/DoubleValueSerializer.java ---------------------------------------------------------------------- diff --git a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/DoubleValueSerializer.java b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/DoubleValueSerializer.java index 747d969..232ad6b 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/DoubleValueSerializer.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/DoubleValueSerializer.java @@ -20,11 +20,12 @@ package org.apache.flink.api.common.typeutils.base; import java.io.IOException; +import org.apache.flink.annotation.Internal; import org.apache.flink.core.memory.DataInputView; import org.apache.flink.core.memory.DataOutputView; import org.apache.flink.types.DoubleValue; - +@Internal public final class DoubleValueSerializer extends TypeSerializerSingleton<DoubleValue> { 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/typeutils/base/EnumComparator.java ---------------------------------------------------------------------- diff --git a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/EnumComparator.java b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/EnumComparator.java index bbb2f40..365dc3d 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/EnumComparator.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/EnumComparator.java @@ -18,11 +18,13 @@ package org.apache.flink.api.common.typeutils.base; +import org.apache.flink.annotation.Internal; import org.apache.flink.core.memory.DataInputView; import org.apache.flink.core.memory.MemorySegment; import java.io.IOException; +@Internal public final class EnumComparator<T extends Enum<T>> extends BasicTypeComparator<T> { 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/typeutils/base/EnumSerializer.java ---------------------------------------------------------------------- diff --git a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/EnumSerializer.java b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/EnumSerializer.java index 1c09e71..c64e399 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/EnumSerializer.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/EnumSerializer.java @@ -23,11 +23,12 @@ import java.io.ObjectInputStream; import java.lang.reflect.Method; import com.google.common.base.Preconditions; +import org.apache.flink.annotation.Internal; import org.apache.flink.api.common.typeutils.TypeSerializer; import org.apache.flink.core.memory.DataInputView; import org.apache.flink.core.memory.DataOutputView; - +@Internal public final class EnumSerializer<T extends Enum<T>> extends TypeSerializer<T> { private static final long serialVersionUID = 1L; @@ -130,4 +131,4 @@ public final class EnumSerializer<T extends Enum<T>> extends TypeSerializer<T> { throw new RuntimeException("Cannot access the constants of the enum " + enumClass.getName()); } } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/flink/blob/53f8d773/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/FloatComparator.java ---------------------------------------------------------------------- diff --git a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/FloatComparator.java b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/FloatComparator.java index ed2e741..31196f5 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/FloatComparator.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/FloatComparator.java @@ -20,11 +20,11 @@ package org.apache.flink.api.common.typeutils.base; import java.io.IOException; +import org.apache.flink.annotation.Internal; import org.apache.flink.core.memory.DataInputView; import org.apache.flink.core.memory.MemorySegment; - - +@Internal public final class FloatComparator extends BasicTypeComparator<Float> { 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/typeutils/base/FloatSerializer.java ---------------------------------------------------------------------- diff --git a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/FloatSerializer.java b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/FloatSerializer.java index 1cc574c..b155005 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/FloatSerializer.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/FloatSerializer.java @@ -20,9 +20,11 @@ package org.apache.flink.api.common.typeutils.base; import java.io.IOException; +import org.apache.flink.annotation.Internal; import org.apache.flink.core.memory.DataInputView; import org.apache.flink.core.memory.DataOutputView; +@Internal public final class FloatSerializer extends TypeSerializerSingleton<Float> { 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/typeutils/base/FloatValueSerializer.java ---------------------------------------------------------------------- diff --git a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/FloatValueSerializer.java b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/FloatValueSerializer.java index 11b17c8..3ccd88a 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/FloatValueSerializer.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/FloatValueSerializer.java @@ -20,11 +20,12 @@ package org.apache.flink.api.common.typeutils.base; import java.io.IOException; +import org.apache.flink.annotation.Internal; import org.apache.flink.core.memory.DataInputView; import org.apache.flink.core.memory.DataOutputView; import org.apache.flink.types.FloatValue; - +@Internal public class FloatValueSerializer extends TypeSerializerSingleton<FloatValue> { 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/typeutils/base/GenericArraySerializer.java ---------------------------------------------------------------------- diff --git a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/GenericArraySerializer.java b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/GenericArraySerializer.java index 9ea6811..eb6e708 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/GenericArraySerializer.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/GenericArraySerializer.java @@ -22,6 +22,7 @@ import java.io.IOException; import java.lang.reflect.Array; import com.google.common.base.Preconditions; +import org.apache.flink.annotation.Internal; import org.apache.flink.api.common.typeutils.TypeSerializer; import org.apache.flink.core.memory.DataInputView; import org.apache.flink.core.memory.DataOutputView; @@ -31,6 +32,7 @@ import org.apache.flink.core.memory.DataOutputView; * * @param <C> The component type */ +@Internal public final class GenericArraySerializer<C> extends TypeSerializer<C[]> { 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/typeutils/base/IntComparator.java ---------------------------------------------------------------------- diff --git a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/IntComparator.java b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/IntComparator.java index ef4e50d..b86e405 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/IntComparator.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/IntComparator.java @@ -20,11 +20,11 @@ package org.apache.flink.api.common.typeutils.base; import java.io.IOException; +import org.apache.flink.annotation.Internal; import org.apache.flink.core.memory.DataInputView; import org.apache.flink.core.memory.MemorySegment; - - +@Internal public final class IntComparator extends BasicTypeComparator<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/typeutils/base/IntSerializer.java ---------------------------------------------------------------------- diff --git a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/IntSerializer.java b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/IntSerializer.java index e9d9059..de6b326 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/IntSerializer.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/IntSerializer.java @@ -20,10 +20,11 @@ package org.apache.flink.api.common.typeutils.base; import java.io.IOException; +import org.apache.flink.annotation.Internal; import org.apache.flink.core.memory.DataInputView; import org.apache.flink.core.memory.DataOutputView; - +@Internal public final class IntSerializer extends TypeSerializerSingleton<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/typeutils/base/IntValueSerializer.java ---------------------------------------------------------------------- diff --git a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/IntValueSerializer.java b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/IntValueSerializer.java index a3a5cbb..1a90313 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/IntValueSerializer.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/IntValueSerializer.java @@ -20,11 +20,12 @@ package org.apache.flink.api.common.typeutils.base; import java.io.IOException; +import org.apache.flink.annotation.Internal; import org.apache.flink.core.memory.DataInputView; import org.apache.flink.core.memory.DataOutputView; import org.apache.flink.types.IntValue; - +@Internal public final class IntValueSerializer extends TypeSerializerSingleton<IntValue> { 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/typeutils/base/LongComparator.java ---------------------------------------------------------------------- diff --git a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/LongComparator.java b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/LongComparator.java index fd6d72b..6cee97f 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/LongComparator.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/LongComparator.java @@ -20,11 +20,11 @@ package org.apache.flink.api.common.typeutils.base; import java.io.IOException; +import org.apache.flink.annotation.Internal; import org.apache.flink.core.memory.DataInputView; import org.apache.flink.core.memory.MemorySegment; - - +@Internal public final class LongComparator extends BasicTypeComparator<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/typeutils/base/LongSerializer.java ---------------------------------------------------------------------- diff --git a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/LongSerializer.java b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/LongSerializer.java index 2954477..086a2fc 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/LongSerializer.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/LongSerializer.java @@ -20,10 +20,11 @@ package org.apache.flink.api.common.typeutils.base; import java.io.IOException; +import org.apache.flink.annotation.Internal; import org.apache.flink.core.memory.DataInputView; import org.apache.flink.core.memory.DataOutputView; - +@Internal public final class LongSerializer extends TypeSerializerSingleton<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/typeutils/base/LongValueSerializer.java ---------------------------------------------------------------------- diff --git a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/LongValueSerializer.java b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/LongValueSerializer.java index 6233240..5d94325 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/LongValueSerializer.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/LongValueSerializer.java @@ -20,11 +20,12 @@ package org.apache.flink.api.common.typeutils.base; import java.io.IOException; +import org.apache.flink.annotation.Internal; import org.apache.flink.core.memory.DataInputView; import org.apache.flink.core.memory.DataOutputView; import org.apache.flink.types.LongValue; - +@Internal public final class LongValueSerializer extends TypeSerializerSingleton<LongValue> { 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/typeutils/base/ShortComparator.java ---------------------------------------------------------------------- diff --git a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/ShortComparator.java b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/ShortComparator.java index 9b1b630..e88d77a 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/ShortComparator.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/ShortComparator.java @@ -20,11 +20,11 @@ package org.apache.flink.api.common.typeutils.base; import java.io.IOException; +import org.apache.flink.annotation.Internal; import org.apache.flink.core.memory.DataInputView; import org.apache.flink.core.memory.MemorySegment; - - +@Internal public final class ShortComparator extends BasicTypeComparator<Short> { 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/typeutils/base/ShortSerializer.java ---------------------------------------------------------------------- diff --git a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/ShortSerializer.java b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/ShortSerializer.java index 45004fa..b94c0ac 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/ShortSerializer.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/ShortSerializer.java @@ -20,10 +20,11 @@ package org.apache.flink.api.common.typeutils.base; import java.io.IOException; +import org.apache.flink.annotation.Internal; import org.apache.flink.core.memory.DataInputView; import org.apache.flink.core.memory.DataOutputView; - +@Internal public final class ShortSerializer extends TypeSerializerSingleton<Short> { 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/typeutils/base/ShortValueSerializer.java ---------------------------------------------------------------------- diff --git a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/ShortValueSerializer.java b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/ShortValueSerializer.java index 338d328..51b234e 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/ShortValueSerializer.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/ShortValueSerializer.java @@ -20,11 +20,12 @@ package org.apache.flink.api.common.typeutils.base; import java.io.IOException; +import org.apache.flink.annotation.Internal; import org.apache.flink.core.memory.DataInputView; import org.apache.flink.core.memory.DataOutputView; import org.apache.flink.types.ShortValue; - +@Internal public final class ShortValueSerializer extends TypeSerializerSingleton<ShortValue> { 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/typeutils/base/StringComparator.java ---------------------------------------------------------------------- diff --git a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/StringComparator.java b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/StringComparator.java index b7298b3..235ae74 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/StringComparator.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/StringComparator.java @@ -20,12 +20,12 @@ package org.apache.flink.api.common.typeutils.base; import java.io.IOException; +import org.apache.flink.annotation.Internal; import org.apache.flink.core.memory.DataInputView; import org.apache.flink.core.memory.MemorySegment; import org.apache.flink.types.StringValue; - - +@Internal public final class StringComparator extends BasicTypeComparator<String> { 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/typeutils/base/StringSerializer.java ---------------------------------------------------------------------- diff --git a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/StringSerializer.java b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/StringSerializer.java index b5332f8..034a8cc 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/StringSerializer.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/StringSerializer.java @@ -20,11 +20,12 @@ package org.apache.flink.api.common.typeutils.base; import java.io.IOException; +import org.apache.flink.annotation.Internal; import org.apache.flink.core.memory.DataInputView; import org.apache.flink.core.memory.DataOutputView; import org.apache.flink.types.StringValue; - +@Internal public final class StringSerializer extends TypeSerializerSingleton<String> { 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/typeutils/base/StringValueSerializer.java ---------------------------------------------------------------------- diff --git a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/StringValueSerializer.java b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/StringValueSerializer.java index 6ac8b6c..7f86b76 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/StringValueSerializer.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/StringValueSerializer.java @@ -20,11 +20,12 @@ package org.apache.flink.api.common.typeutils.base; import java.io.IOException; +import org.apache.flink.annotation.Internal; import org.apache.flink.core.memory.DataInputView; import org.apache.flink.core.memory.DataOutputView; import org.apache.flink.types.StringValue; - +@Internal public final class StringValueSerializer extends TypeSerializerSingleton<StringValue> { 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/typeutils/base/TypeSerializerSingleton.java ---------------------------------------------------------------------- diff --git a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/TypeSerializerSingleton.java b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/TypeSerializerSingleton.java index a9d5cd6..c091072 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/TypeSerializerSingleton.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/TypeSerializerSingleton.java @@ -18,8 +18,10 @@ package org.apache.flink.api.common.typeutils.base; +import org.apache.flink.annotation.Internal; import org.apache.flink.api.common.typeutils.TypeSerializer; +@Internal public abstract class TypeSerializerSingleton<T> extends TypeSerializer<T>{ private static final long serialVersionUID = 8766687317209282373L; http://git-wip-us.apache.org/repos/asf/flink/blob/53f8d773/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/VoidSerializer.java ---------------------------------------------------------------------- diff --git a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/VoidSerializer.java b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/VoidSerializer.java index ee1ebbd..5773009 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/VoidSerializer.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/VoidSerializer.java @@ -20,9 +20,11 @@ package org.apache.flink.api.common.typeutils.base; import java.io.IOException; +import org.apache.flink.annotation.Internal; import org.apache.flink.core.memory.DataInputView; import org.apache.flink.core.memory.DataOutputView; +@Internal public final class VoidSerializer extends TypeSerializerSingleton<Void> { 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/typeutils/base/array/BooleanPrimitiveArrayComparator.java ---------------------------------------------------------------------- diff --git a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/array/BooleanPrimitiveArrayComparator.java b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/array/BooleanPrimitiveArrayComparator.java index b7487b8..419eb37 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/array/BooleanPrimitiveArrayComparator.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/array/BooleanPrimitiveArrayComparator.java @@ -18,9 +18,12 @@ package org.apache.flink.api.common.typeutils.base.array; import static java.lang.Math.min; + +import org.apache.flink.annotation.Internal; import org.apache.flink.api.common.typeutils.TypeComparator; import org.apache.flink.api.common.typeutils.base.BooleanComparator; +@Internal public class BooleanPrimitiveArrayComparator extends PrimitiveArrayComparator<boolean[], BooleanComparator> { public BooleanPrimitiveArrayComparator(boolean ascending) { super(ascending, new BooleanComparator(ascending));
