You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by yu...@apache.org on 2023/06/05 11:19:08 UTC
[flink] branch master updated: [FLINK-32053][table-planner] Introduce StateMetadata to ExecNode to support configure operator-level state TTL via CompiledPlan (#22593)
This is an automated email from the ASF dual-hosted git repository.
yuxia pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/flink.git
The following commit(s) were added to refs/heads/master by this push:
new 69def87107a [FLINK-32053][table-planner] Introduce StateMetadata to ExecNode to support configure operator-level state TTL via CompiledPlan (#22593)
69def87107a is described below
commit 69def87107a3b2faef09efaae2702a202d07a9cb
Author: Jane Chan <55...@users.noreply.github.com>
AuthorDate: Mon Jun 5 19:19:00 2023 +0800
[FLINK-32053][table-planner] Introduce StateMetadata to ExecNode to support configure operator-level state TTL via CompiledPlan (#22593)
---
.../table/planner/plan/nodes/exec/ExecNode.java | 1 +
.../planner/plan/nodes/exec/StateMetadata.java | 21 +--
.../plan/nodes/exec/batch/BatchExecLookupJoin.java | 21 +++
.../plan/nodes/exec/batch/BatchExecSink.java | 12 ++
.../nodes/exec/common/CommonExecLookupJoin.java | 108 +----------
.../plan/nodes/exec/common/CommonExecSink.java | 60 +-----
.../exec/stream/StreamExecChangelogNormalize.java | 31 +++-
.../nodes/exec/stream/StreamExecDeduplicate.java | 74 ++++++--
.../stream/StreamExecGlobalGroupAggregate.java | 25 ++-
.../exec/stream/StreamExecGroupAggregate.java | 30 ++-
.../StreamExecIncrementalGroupAggregate.java | 24 ++-
.../plan/nodes/exec/stream/StreamExecJoin.java | 35 +++-
.../plan/nodes/exec/stream/StreamExecLimit.java | 13 ++
.../nodes/exec/stream/StreamExecLookupJoin.java | 144 ++++++++++++++
.../plan/nodes/exec/stream/StreamExecRank.java | 26 ++-
.../plan/nodes/exec/stream/StreamExecSink.java | 114 +++++++++++-
.../nodes/exec/stream/StreamExecSortLimit.java | 13 ++
.../planner/factories/TestValuesTableFactory.java | 67 ++++++-
.../plan/nodes/exec/TransformationsTest.java | 35 +++-
.../plan/nodes/exec/serde/StateMetadataTest.java | 31 ++--
.../ConfigureOperatorLevelStateTtlJsonITCase.java | 206 +++++++++++++++++++++
.../table/planner/utils/JsonPlanTestBase.java | 12 +-
.../flink/table/planner/utils/JsonTestUtils.java | 14 ++
.../test/resources/jsonplan/testGetJsonPlan.out | 2 +-
.../test/resources/jsonplan/testUidFlink1_15.out | 88 +++++++++
.../CalcJsonPlanTest_jsonplan/testComplexCalc.out | 2 +-
.../stream/CalcJsonPlanTest_jsonplan/testSarg.out | 2 +-
.../CalcJsonPlanTest_jsonplan/testSimpleFilter.out | 2 +-
.../testSimpleProject.out | 2 +-
.../testChangelogSource.out | 11 +-
.../testUpsertSource.out | 11 +-
.../testCrossJoin.out | 2 +-
.../testCrossJoinOverrideParameters.out | 2 +-
.../testJoinWithFilter.out | 2 +-
.../testLeftOuterJoinWithLiteralTrue.out | 2 +-
.../testDeduplication.out | 11 +-
.../ExpandJsonPlanTest_jsonplan/testExpand.out | 18 +-
...tDistinctAggCalls[isMiniBatchEnabled=false].out | 11 +-
...stDistinctAggCalls[isMiniBatchEnabled=true].out | 11 +-
...gCallsWithGroupBy[isMiniBatchEnabled=false].out | 11 +-
...ggCallsWithGroupBy[isMiniBatchEnabled=true].out | 11 +-
...AggWithoutGroupBy[isMiniBatchEnabled=false].out | 9 +-
...eAggWithoutGroupBy[isMiniBatchEnabled=true].out | 9 +-
...erDefinedAggCalls[isMiniBatchEnabled=false].out | 11 +-
...serDefinedAggCalls[isMiniBatchEnabled=true].out | 11 +-
.../testEventTimeHopWindow.out | 2 +-
.../testEventTimeSessionWindow.out | 2 +-
.../testEventTimeTumbleWindow.out | 4 +-
.../testProcTimeHopWindow.out | 2 +-
.../testProcTimeSessionWindow.out | 2 +-
.../testProcTimeTumbleWindow.out | 4 +-
.../testIncrementalAggregate.out | 18 +-
...lAggregateWithSumCountDistinctAndRetraction.out | 25 ++-
.../testProcessingTimeInnerJoinWithOnClause.out | 2 +-
.../testRowTimeInnerJoinWithOnClause.out | 2 +-
.../JoinJsonPlanTest_jsonplan/testInnerJoin.out | 13 +-
.../testInnerJoinWithEqualPk.out | 29 ++-
.../testInnerJoinWithPk.out | 27 ++-
.../testLeftJoinNonEqui.out | 13 +-
.../LimitJsonPlanTest_jsonplan/testLimit.out | 9 +-
.../testAggAndLeftJoinWithTryResolveMode.out | 16 +-
.../testJoinTemporalTable.out | 4 +-
.../testJoinTemporalTableWithAsyncHint.out | 4 +-
.../testJoinTemporalTableWithAsyncHint2.out | 4 +-
.../testJoinTemporalTableWithAsyncRetryHint.out | 4 +-
.../testJoinTemporalTableWithAsyncRetryHint2.out | 4 +-
...testJoinTemporalTableWithProjectionPushDown.out | 4 +-
.../testJoinTemporalTableWithRetryHint.out | 4 +-
.../testMatch.out | 2 +-
.../testProcTimeBoundedNonPartitionedRangeOver.out | 2 +-
.../testProcTimeBoundedPartitionedRangeOver.out | 2 +-
...undedPartitionedRowsOverWithBuiltinProctime.out | 2 +-
.../testProcTimeUnboundedPartitionedRangeOver.out | 2 +-
...stProctimeBoundedDistinctPartitionedRowOver.out | 2 +-
...edDistinctWithNonDistinctPartitionedRowOver.out | 2 +-
.../testRowTimeBoundedPartitionedRowsOver.out | 2 +-
.../testPythonCalc.out | 2 +-
.../testPythonFunctionInWhereClause.out | 2 +-
.../testJoinWithFilter.out | 2 +-
.../testPythonTableFunction.out | 2 +-
.../tesPythonAggCallsWithGroupBy.out | 2 +-
.../testEventTimeHopWindow.out | 2 +-
.../testEventTimeSessionWindow.out | 2 +-
.../testEventTimeTumbleWindow.out | 2 +-
.../testProcTimeHopWindow.out | 2 +-
.../testProcTimeSessionWindow.out | 2 +-
.../testProcTimeTumbleWindow.out | 2 +-
.../testProcTimeBoundedNonPartitionedRangeOver.out | 2 +-
.../testProcTimeBoundedPartitionedRangeOver.out | 2 +-
...undedPartitionedRowsOverWithBuiltinProctime.out | 2 +-
.../testProcTimeUnboundedPartitionedRangeOver.out | 2 +-
.../testRowTimeBoundedPartitionedRowsOver.out | 2 +-
.../stream/RankJsonPlanTest_jsonplan/testRank.out | 9 +-
.../testSortLimit.out | 9 +-
...WithNonDeterministicFuncSinkWithDifferentPk.out | 11 +-
.../testOverwrite.out | 2 +-
.../testPartialInsert.out | 2 +-
.../testPartitioning.out | 2 +-
.../testWritingMetadata.out | 2 +-
.../testFilterPushDown.out | 2 +-
.../testLimitPushDown.out | 9 +-
.../testPartitionPushDown.out | 2 +-
.../testProjectPushDown.out | 2 +-
.../testReadingMetadata.out | 2 +-
.../testWatermarkPushDown.out | 2 +-
.../testJoinTemporalFunction.out | 2 +-
.../testTemporalTableJoin.out | 2 +-
.../testSortProcessingTime.out | 2 +-
.../testSortRowTime.out | 2 +-
.../UnionJsonPlanTest_jsonplan/testUnion.out | 2 +-
.../ValuesJsonPlanTest_jsonplan/testValues.out | 2 +-
.../testWatermarkAssigner.out | 2 +-
.../testDistinctSplitEnabled.out | 2 +-
.../testEventTimeCumulateWindow.out | 2 +-
.../testEventTimeCumulateWindowWithOffset.out | 2 +-
.../testEventTimeHopWindow.out | 2 +-
.../testEventTimeHopWindowWithOffset.out | 2 +-
.../testEventTimeTumbleWindow.out | 2 +-
.../testEventTimeTumbleWindowWithOffset.out | 2 +-
.../testProcTimeCumulateWindow.out | 2 +-
.../testProcTimeHopWindow.out | 2 +-
.../testProcTimeTumbleWindow.out | 2 +-
.../testEventTimeTumbleWindow.out | 2 +-
.../testFollowedByWindowDeduplicate.out | 2 +-
.../testFollowedByWindowJoin.out | 2 +-
.../testFollowedByWindowRank.out | 2 +-
.../testIndividualWindowTVF.out | 2 +-
.../testIndividualWindowTVFProcessingTime.out | 2 +-
128 files changed, 1307 insertions(+), 399 deletions(-)
diff --git a/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/plan/nodes/exec/ExecNode.java b/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/plan/nodes/exec/ExecNode.java
index dc18eb58a5e..aab1ea8aa4a 100644
--- a/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/plan/nodes/exec/ExecNode.java
+++ b/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/plan/nodes/exec/ExecNode.java
@@ -54,6 +54,7 @@ public interface ExecNode<T> extends ExecNodeTranslator<T> {
String FIELD_NAME_DESCRIPTION = "description";
String FIELD_NAME_INPUT_PROPERTIES = "inputProperties";
String FIELD_NAME_OUTPUT_TYPE = "outputType";
+ String FIELD_NAME_STATE = "state";
/** The unique ID of the node. */
@JsonProperty(value = FIELD_NAME_ID, index = 0)
diff --git a/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/plan/nodes/exec/StateMetadata.java b/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/plan/nodes/exec/StateMetadata.java
index 0ab383d773c..7c575d85f37 100644
--- a/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/plan/nodes/exec/StateMetadata.java
+++ b/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/plan/nodes/exec/StateMetadata.java
@@ -26,10 +26,10 @@ import org.apache.flink.util.Preconditions;
import org.apache.flink.util.TimeUtils;
import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonCreator;
+import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonGetter;
import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonProperty;
-import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import java.time.Duration;
@@ -84,26 +84,23 @@ public class StateMetadata {
stateIndex,
TimeUtils.parseDuration(
Preconditions.checkNotNull(stateTtl, "state ttl should not be null")),
- Preconditions.checkNotNull(stateName, "state name should not be null"));
+ stateName);
}
- public StateMetadata(int stateIndex, @Nonnull Duration stateTtl, @Nonnull String stateName) {
+ public StateMetadata(int stateIndex, Duration stateTtl, String stateName) {
Preconditions.checkArgument(stateIndex >= 0, "state index should start from 0");
this.stateIndex = stateIndex;
- this.stateTtl = stateTtl;
- this.stateName = stateName;
+ this.stateTtl = Preconditions.checkNotNull(stateTtl, "state ttl should not be null");
+ this.stateName = Preconditions.checkNotNull(stateName, "state name should not be null");
}
public int getStateIndex() {
return stateIndex;
}
- public long getStateTtl() {
- return stateTtl.toMillis();
- }
-
- public String getStateName() {
- return stateName;
+ @JsonGetter(value = FIELD_NAME_STATE_TTL)
+ public String getStateTtl() {
+ return TimeUtils.formatWithHighestUnit(stateTtl);
}
public static List<StateMetadata> getOneInputOperatorDefaultMeta(
@@ -143,7 +140,7 @@ public class StateMetadata {
validateStateMetadata(inputNumOfOperator, stateMetadataList);
return stateMetadataList.stream()
.sorted(Comparator.comparing(StateMetadata::getStateIndex))
- .map(StateMetadata::getStateTtl)
+ .map(metadata -> metadata.stateTtl.toMillis())
.collect(Collectors.toList());
}
diff --git a/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/plan/nodes/exec/batch/BatchExecLookupJoin.java b/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/plan/nodes/exec/batch/BatchExecLookupJoin.java
index d1a16a42fed..611d702fed7 100644
--- a/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/plan/nodes/exec/batch/BatchExecLookupJoin.java
+++ b/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/plan/nodes/exec/batch/BatchExecLookupJoin.java
@@ -22,6 +22,7 @@ import org.apache.flink.api.dag.Transformation;
import org.apache.flink.configuration.ReadableConfig;
import org.apache.flink.table.connector.ChangelogMode;
import org.apache.flink.table.data.RowData;
+import org.apache.flink.table.functions.TableFunction;
import org.apache.flink.table.planner.delegation.PlannerBase;
import org.apache.flink.table.planner.plan.nodes.exec.ExecNodeConfig;
import org.apache.flink.table.planner.plan.nodes.exec.ExecNodeContext;
@@ -33,7 +34,9 @@ import org.apache.flink.table.planner.plan.utils.LookupJoinUtil;
import org.apache.flink.table.runtime.operators.join.FlinkJoinType;
import org.apache.flink.table.types.logical.RowType;
+import org.apache.calcite.plan.RelOptTable;
import org.apache.calcite.rex.RexNode;
+import org.apache.calcite.tools.RelBuilder;
import javax.annotation.Nullable;
@@ -83,4 +86,22 @@ public class BatchExecLookupJoin extends CommonExecLookupJoin
// false for now. We can add it to CommonExecLookupJoin when needed.
return createJoinTransformation(planner, config, false, false);
}
+
+ @Override
+ protected Transformation<RowData> createSyncLookupJoinWithState(
+ Transformation<RowData> inputTransformation,
+ RelOptTable temporalTable,
+ ExecNodeConfig config,
+ ClassLoader classLoader,
+ Map<Integer, LookupJoinUtil.LookupKey> allLookupKeys,
+ TableFunction<?> syncLookupFunction,
+ RelBuilder relBuilder,
+ RowType inputRowType,
+ RowType tableSourceRowType,
+ RowType resultRowType,
+ boolean isLeftOuterJoin,
+ boolean isObjectReuseEnabled,
+ boolean lookupKeyContainsPrimaryKey) {
+ return inputTransformation;
+ }
}
diff --git a/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/plan/nodes/exec/batch/BatchExecSink.java b/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/plan/nodes/exec/batch/BatchExecSink.java
index 520fe12bfc0..25040ee88e6 100644
--- a/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/plan/nodes/exec/batch/BatchExecSink.java
+++ b/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/plan/nodes/exec/batch/BatchExecSink.java
@@ -105,6 +105,18 @@ public class BatchExecSink extends CommonExecSink implements BatchExecNode<Objec
return (RowType) schema.toPhysicalRowDataType().getLogicalType();
}
+ @Override
+ protected Transformation<RowData> applyUpsertMaterialize(
+ Transformation<RowData> inputTransform,
+ int[] primaryKeys,
+ int sinkParallelism,
+ ExecNodeConfig config,
+ ClassLoader classLoader,
+ RowType physicalRowType,
+ int[] inputUpsertKey) {
+ return inputTransform;
+ }
+
@Override
protected int[] getPrimaryKeyIndices(RowType sinkRowType, ResolvedSchema schema) {
if (schema.getPrimaryKey().isPresent()) {
diff --git a/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/plan/nodes/exec/common/CommonExecLookupJoin.java b/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/plan/nodes/exec/common/CommonExecLookupJoin.java
index 119ee175ea5..455f2d9c722 100644
--- a/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/plan/nodes/exec/common/CommonExecLookupJoin.java
+++ b/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/plan/nodes/exec/common/CommonExecLookupJoin.java
@@ -23,19 +23,13 @@ import org.apache.flink.api.common.typeinfo.TypeInformation;
import org.apache.flink.api.dag.Transformation;
import org.apache.flink.api.java.typeutils.RowTypeInfo;
import org.apache.flink.configuration.ReadableConfig;
-import org.apache.flink.runtime.state.KeyGroupRangeAssignment;
import org.apache.flink.streaming.api.functions.ProcessFunction;
import org.apache.flink.streaming.api.functions.async.AsyncFunction;
-import org.apache.flink.streaming.api.operators.KeyedProcessOperator;
import org.apache.flink.streaming.api.operators.ProcessOperator;
import org.apache.flink.streaming.api.operators.SimpleOperatorFactory;
import org.apache.flink.streaming.api.operators.StreamOperatorFactory;
import org.apache.flink.streaming.api.operators.async.AsyncWaitOperatorFactory;
-import org.apache.flink.streaming.api.transformations.OneInputTransformation;
-import org.apache.flink.streaming.api.transformations.PartitionTransformation;
-import org.apache.flink.streaming.runtime.partitioner.KeyGroupStreamPartitioner;
import org.apache.flink.table.api.TableException;
-import org.apache.flink.table.api.config.ExecutionConfigOptions;
import org.apache.flink.table.catalog.DataTypeFactory;
import org.apache.flink.table.connector.ChangelogMode;
import org.apache.flink.table.connector.source.LookupTableSource;
@@ -60,7 +54,6 @@ import org.apache.flink.table.planner.plan.nodes.exec.spec.TemporalTableSourceSp
import org.apache.flink.table.planner.plan.nodes.exec.utils.ExecNodeUtil;
import org.apache.flink.table.planner.plan.schema.LegacyTableSourceTable;
import org.apache.flink.table.planner.plan.schema.TableSourceTable;
-import org.apache.flink.table.planner.plan.utils.KeySelectorUtil;
import org.apache.flink.table.planner.plan.utils.LookupJoinUtil;
import org.apache.flink.table.planner.utils.JavaScalaConversionUtil;
import org.apache.flink.table.planner.utils.ShortcutUtils;
@@ -69,12 +62,9 @@ import org.apache.flink.table.runtime.collector.TableFunctionResultFuture;
import org.apache.flink.table.runtime.generated.GeneratedCollector;
import org.apache.flink.table.runtime.generated.GeneratedFunction;
import org.apache.flink.table.runtime.generated.GeneratedResultFuture;
-import org.apache.flink.table.runtime.keyselector.EmptyRowDataKeySelector;
-import org.apache.flink.table.runtime.keyselector.RowDataKeySelector;
import org.apache.flink.table.runtime.operators.join.FlinkJoinType;
import org.apache.flink.table.runtime.operators.join.lookup.AsyncLookupJoinRunner;
import org.apache.flink.table.runtime.operators.join.lookup.AsyncLookupJoinWithCalcRunner;
-import org.apache.flink.table.runtime.operators.join.lookup.KeyedLookupJoinWrapper;
import org.apache.flink.table.runtime.operators.join.lookup.LookupJoinRunner;
import org.apache.flink.table.runtime.operators.join.lookup.LookupJoinWithCalcRunner;
import org.apache.flink.table.runtime.operators.join.lookup.ResultRetryStrategy;
@@ -82,7 +72,6 @@ import org.apache.flink.table.runtime.types.PlannerTypeUtils;
import org.apache.flink.table.runtime.types.TypeInfoDataTypeConverter;
import org.apache.flink.table.runtime.typeutils.InternalSerializers;
import org.apache.flink.table.runtime.typeutils.InternalTypeInfo;
-import org.apache.flink.table.runtime.util.StateConfigUtil;
import org.apache.flink.table.sources.LookupableTableSource;
import org.apache.flink.table.sources.TableSource;
import org.apache.flink.table.types.logical.LogicalType;
@@ -106,10 +95,8 @@ import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.Optional;
-import java.util.stream.Collectors;
import static org.apache.flink.table.planner.calcite.FlinkTypeFactory.toLogicalType;
-import static org.apache.flink.table.planner.plan.nodes.exec.common.CommonExecSink.PARTITIONER_TRANSFORMATION;
import static org.apache.flink.table.planner.utils.ShortcutUtils.unwrapTypeFactory;
import static org.apache.flink.util.Preconditions.checkArgument;
import static org.apache.flink.util.Preconditions.checkNotNull;
@@ -332,7 +319,7 @@ public abstract class CommonExecLookupJoin extends ExecNodeBase<RowData> {
}
}
- private Transformation<RowData> createSyncLookupJoinWithState(
+ protected abstract Transformation<RowData> createSyncLookupJoinWithState(
Transformation<RowData> inputTransformation,
RelOptTable temporalTable,
ExecNodeConfig config,
@@ -345,92 +332,7 @@ public abstract class CommonExecLookupJoin extends ExecNodeBase<RowData> {
RowType resultRowType,
boolean isLeftOuterJoin,
boolean isObjectReuseEnabled,
- boolean lookupKeyContainsPrimaryKey) {
-
- // create lookup function first
- ProcessFunction<RowData, RowData> processFunction =
- createSyncLookupJoinFunction(
- temporalTable,
- config,
- classLoader,
- allLookupKeys,
- syncLookupFunction,
- relBuilder,
- inputRowType,
- tableSourceRowType,
- resultRowType,
- isLeftOuterJoin,
- isObjectReuseEnabled);
-
- RowType rightRowType =
- getRightOutputRowType(
- getProjectionOutputRelDataType(relBuilder), tableSourceRowType);
-
- KeyedLookupJoinWrapper keyedLookupJoinWrapper =
- new KeyedLookupJoinWrapper(
- (LookupJoinRunner) processFunction,
- StateConfigUtil.createTtlConfig(
- config.get(ExecutionConfigOptions.IDLE_STATE_RETENTION).toMillis()),
- InternalSerializers.create(rightRowType),
- lookupKeyContainsPrimaryKey);
-
- KeyedProcessOperator<RowData, RowData, RowData> operator =
- new KeyedProcessOperator<>(keyedLookupJoinWrapper);
-
- List<Integer> refKeys =
- allLookupKeys.values().stream()
- .filter(key -> key instanceof LookupJoinUtil.FieldRefLookupKey)
- .map(key -> ((LookupJoinUtil.FieldRefLookupKey) key).index)
- .collect(Collectors.toList());
- RowDataKeySelector keySelector;
-
- // use single parallelism for empty key shuffle
- boolean singleParallelism = refKeys.isEmpty();
- if (singleParallelism) {
- // all lookup keys are constants, then use an empty key selector
- keySelector = EmptyRowDataKeySelector.INSTANCE;
- } else {
- // make it a deterministic asc order
- Collections.sort(refKeys);
- keySelector =
- KeySelectorUtil.getRowDataSelector(
- classLoader,
- refKeys.stream().mapToInt(Integer::intValue).toArray(),
- InternalTypeInfo.of(inputRowType));
- }
- final KeyGroupStreamPartitioner<RowData, RowData> partitioner =
- new KeyGroupStreamPartitioner<>(
- keySelector, KeyGroupRangeAssignment.DEFAULT_LOWER_BOUND_MAX_PARALLELISM);
- Transformation<RowData> partitionedTransform =
- new PartitionTransformation<>(inputTransformation, partitioner);
- createTransformationMeta(PARTITIONER_TRANSFORMATION, "Partitioner", "Partitioner", config)
- .fill(partitionedTransform);
- if (singleParallelism) {
- setSingletonParallelism(partitionedTransform);
- } else {
- partitionedTransform.setParallelism(inputTransformation.getParallelism(), false);
- }
-
- OneInputTransformation<RowData, RowData> transform =
- ExecNodeUtil.createOneInputTransformation(
- partitionedTransform,
- createTransformationMeta(LOOKUP_JOIN_MATERIALIZE_TRANSFORMATION, config),
- operator,
- InternalTypeInfo.of(resultRowType),
- partitionedTransform.getParallelism(),
- false);
- transform.setStateKeySelector(keySelector);
- transform.setStateKeyType(keySelector.getProducedType());
- if (singleParallelism) {
- setSingletonParallelism(transform);
- }
- return transform;
- }
-
- private void setSingletonParallelism(Transformation transformation) {
- transformation.setParallelism(1);
- transformation.setMaxParallelism(1);
- }
+ boolean lookupKeyContainsPrimaryKey);
protected void validateLookupKeyType(
final Map<Integer, LookupJoinUtil.LookupKey> lookupKeys,
@@ -584,20 +486,20 @@ public abstract class CommonExecLookupJoin extends ExecNodeBase<RowData> {
isObjectReuseEnabled)));
}
- private RelDataType getProjectionOutputRelDataType(RelBuilder relBuilder) {
+ protected RelDataType getProjectionOutputRelDataType(RelBuilder relBuilder) {
return projectionOnTemporalTable != null
? RexUtil.createStructType(unwrapTypeFactory(relBuilder), projectionOnTemporalTable)
: null;
}
- private RowType getRightOutputRowType(
+ protected RowType getRightOutputRowType(
RelDataType projectionOutputRelDataType, RowType tableSourceRowType) {
return projectionOutputRelDataType != null
? (RowType) toLogicalType(projectionOutputRelDataType)
: tableSourceRowType;
}
- private ProcessFunction<RowData, RowData> createSyncLookupJoinFunction(
+ protected ProcessFunction<RowData, RowData> createSyncLookupJoinFunction(
RelOptTable temporalTable,
ExecNodeConfig config,
ClassLoader classLoader,
diff --git a/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/plan/nodes/exec/common/CommonExecSink.java b/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/plan/nodes/exec/common/CommonExecSink.java
index 062297ed7f5..ccdfced77bd 100644
--- a/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/plan/nodes/exec/common/CommonExecSink.java
+++ b/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/plan/nodes/exec/common/CommonExecSink.java
@@ -31,7 +31,6 @@ import org.apache.flink.streaming.api.functions.sink.OutputFormatSinkFunction;
import org.apache.flink.streaming.api.functions.sink.SinkFunction;
import org.apache.flink.streaming.api.operators.SimpleOperatorFactory;
import org.apache.flink.streaming.api.transformations.LegacySinkTransformation;
-import org.apache.flink.streaming.api.transformations.OneInputTransformation;
import org.apache.flink.streaming.api.transformations.PartitionTransformation;
import org.apache.flink.streaming.runtime.partitioner.KeyGroupStreamPartitioner;
import org.apache.flink.table.api.TableException;
@@ -50,7 +49,6 @@ import org.apache.flink.table.connector.sink.SinkV2Provider;
import org.apache.flink.table.connector.sink.abilities.SupportsRowLevelDelete;
import org.apache.flink.table.connector.sink.abilities.SupportsRowLevelUpdate;
import org.apache.flink.table.data.RowData;
-import org.apache.flink.table.planner.codegen.EqualiserCodeGenerator;
import org.apache.flink.table.planner.connectors.TransformationSinkProvider;
import org.apache.flink.table.planner.plan.abilities.sink.RowLevelDeleteSpec;
import org.apache.flink.table.planner.plan.abilities.sink.RowLevelUpdateSpec;
@@ -66,18 +64,13 @@ import org.apache.flink.table.planner.plan.nodes.exec.stream.StreamExecNode;
import org.apache.flink.table.planner.plan.nodes.exec.utils.ExecNodeUtil;
import org.apache.flink.table.planner.plan.nodes.exec.utils.TransformationMetadata;
import org.apache.flink.table.planner.plan.utils.KeySelectorUtil;
-import org.apache.flink.table.planner.typeutils.RowTypeUtils;
import org.apache.flink.table.runtime.connector.sink.SinkRuntimeProviderContext;
-import org.apache.flink.table.runtime.generated.GeneratedRecordEqualiser;
import org.apache.flink.table.runtime.keyselector.RowDataKeySelector;
import org.apache.flink.table.runtime.operators.sink.ConstraintEnforcer;
import org.apache.flink.table.runtime.operators.sink.RowKindSetter;
import org.apache.flink.table.runtime.operators.sink.SinkOperator;
-import org.apache.flink.table.runtime.operators.sink.SinkUpsertMaterializer;
import org.apache.flink.table.runtime.operators.sink.StreamRecordTimestampInserter;
-import org.apache.flink.table.runtime.typeutils.InternalSerializers;
import org.apache.flink.table.runtime.typeutils.InternalTypeInfo;
-import org.apache.flink.table.runtime.util.StateConfigUtil;
import org.apache.flink.table.types.logical.BinaryType;
import org.apache.flink.table.types.logical.CharType;
import org.apache.flink.table.types.logical.LogicalType;
@@ -116,7 +109,7 @@ public abstract class CommonExecSink extends ExecNodeBase<Object>
private final ChangelogMode inputChangelogMode;
private final boolean isBounded;
- private boolean sinkParallelismConfigured;
+ protected boolean sinkParallelismConfigured;
protected CommonExecSink(
int id,
@@ -418,61 +411,14 @@ public abstract class CommonExecSink extends ExecNodeBase<Object>
return partitionedTransform;
}
- private Transformation<RowData> applyUpsertMaterialize(
+ protected abstract Transformation<RowData> applyUpsertMaterialize(
Transformation<RowData> inputTransform,
int[] primaryKeys,
int sinkParallelism,
ExecNodeConfig config,
ClassLoader classLoader,
RowType physicalRowType,
- int[] inputUpsertKey) {
- final GeneratedRecordEqualiser rowEqualiser =
- new EqualiserCodeGenerator(physicalRowType, classLoader)
- .generateRecordEqualiser("SinkMaterializeEqualiser");
- final GeneratedRecordEqualiser upsertKeyEqualiser =
- inputUpsertKey == null
- ? null
- : new EqualiserCodeGenerator(
- RowTypeUtils.projectRowType(
- physicalRowType, inputUpsertKey),
- classLoader)
- .generateRecordEqualiser("SinkMaterializeUpsertKeyEqualiser");
-
- SinkUpsertMaterializer operator =
- new SinkUpsertMaterializer(
- StateConfigUtil.createTtlConfig(
- config.get(ExecutionConfigOptions.IDLE_STATE_RETENTION).toMillis()),
- InternalSerializers.create(physicalRowType),
- rowEqualiser,
- upsertKeyEqualiser,
- inputUpsertKey);
- final String[] fieldNames = physicalRowType.getFieldNames().toArray(new String[0]);
- final List<String> pkFieldNames =
- Arrays.stream(primaryKeys)
- .mapToObj(idx -> fieldNames[idx])
- .collect(Collectors.toList());
-
- OneInputTransformation<RowData, RowData> materializeTransform =
- ExecNodeUtil.createOneInputTransformation(
- inputTransform,
- createTransformationMeta(
- UPSERT_MATERIALIZE_TRANSFORMATION,
- String.format(
- "SinkMaterializer(pk=[%s])",
- String.join(", ", pkFieldNames)),
- "SinkMaterializer",
- config),
- operator,
- inputTransform.getOutputType(),
- sinkParallelism,
- sinkParallelismConfigured);
- RowDataKeySelector keySelector =
- KeySelectorUtil.getRowDataSelector(
- classLoader, primaryKeys, InternalTypeInfo.of(physicalRowType));
- materializeTransform.setStateKeySelector(keySelector);
- materializeTransform.setStateKeyType(keySelector.getProducedType());
- return materializeTransform;
- }
+ int[] inputUpsertKey);
private Transformation<RowData> applyRowKindSetter(
Transformation<RowData> inputTransform, RowKind rowKind, ExecNodeConfig config) {
diff --git a/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/plan/nodes/exec/stream/StreamExecChangelogNormalize.java b/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/plan/nodes/exec/stream/StreamExecChangelogNormalize.java
index 43344375199..2b20223ca24 100644
--- a/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/plan/nodes/exec/stream/StreamExecChangelogNormalize.java
+++ b/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/plan/nodes/exec/stream/StreamExecChangelogNormalize.java
@@ -37,6 +37,7 @@ import org.apache.flink.table.planner.plan.nodes.exec.ExecNodeContext;
import org.apache.flink.table.planner.plan.nodes.exec.ExecNodeMetadata;
import org.apache.flink.table.planner.plan.nodes.exec.InputProperty;
import org.apache.flink.table.planner.plan.nodes.exec.SingleTransformationTranslator;
+import org.apache.flink.table.planner.plan.nodes.exec.StateMetadata;
import org.apache.flink.table.planner.plan.nodes.exec.utils.ExecNodeUtil;
import org.apache.flink.table.planner.plan.utils.AggregateUtil;
import org.apache.flink.table.planner.plan.utils.KeySelectorUtil;
@@ -50,8 +51,11 @@ import org.apache.flink.table.runtime.typeutils.InternalTypeInfo;
import org.apache.flink.table.types.logical.RowType;
import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonCreator;
+import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonInclude;
import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonProperty;
+import javax.annotation.Nullable;
+
import java.util.Collections;
import java.util.List;
@@ -71,6 +75,16 @@ import java.util.List;
producedTransformations = StreamExecChangelogNormalize.CHANGELOG_NORMALIZE_TRANSFORMATION,
minPlanVersion = FlinkVersion.v1_15,
minStateVersion = FlinkVersion.v1_15)
+@ExecNodeMetadata(
+ name = "stream-exec-changelog-normalize",
+ version = 2,
+ consumedOptions = {
+ "table.exec.mini-batch.enabled",
+ "table.exec.mini-batch.size",
+ },
+ producedTransformations = StreamExecChangelogNormalize.CHANGELOG_NORMALIZE_TRANSFORMATION,
+ minPlanVersion = FlinkVersion.v1_18,
+ minStateVersion = FlinkVersion.v1_15)
public class StreamExecChangelogNormalize extends ExecNodeBase<RowData>
implements StreamExecNode<RowData>, SingleTransformationTranslator<RowData> {
@@ -78,6 +92,7 @@ public class StreamExecChangelogNormalize extends ExecNodeBase<RowData>
public static final String FIELD_NAME_UNIQUE_KEYS = "uniqueKeys";
public static final String FIELD_NAME_GENERATE_UPDATE_BEFORE = "generateUpdateBefore";
+ public static final String STATE_NAME = "changelogNormalizeState";
@JsonProperty(FIELD_NAME_UNIQUE_KEYS)
private final int[] uniqueKeys;
@@ -85,6 +100,11 @@ public class StreamExecChangelogNormalize extends ExecNodeBase<RowData>
@JsonProperty(FIELD_NAME_GENERATE_UPDATE_BEFORE)
private final boolean generateUpdateBefore;
+ @Nullable
+ @JsonProperty(FIELD_NAME_STATE)
+ @JsonInclude(JsonInclude.Include.NON_NULL)
+ private final List<StateMetadata> stateMetadataList;
+
public StreamExecChangelogNormalize(
ReadableConfig tableConfig,
int[] uniqueKeys,
@@ -98,6 +118,7 @@ public class StreamExecChangelogNormalize extends ExecNodeBase<RowData>
ExecNodeContext.newPersistedConfig(StreamExecChangelogNormalize.class, tableConfig),
uniqueKeys,
generateUpdateBefore,
+ StateMetadata.getOneInputOperatorDefaultMeta(tableConfig, STATE_NAME),
Collections.singletonList(inputProperty),
outputType,
description);
@@ -110,12 +131,14 @@ public class StreamExecChangelogNormalize extends ExecNodeBase<RowData>
@JsonProperty(FIELD_NAME_CONFIGURATION) ReadableConfig persistedConfig,
@JsonProperty(FIELD_NAME_UNIQUE_KEYS) int[] uniqueKeys,
@JsonProperty(FIELD_NAME_GENERATE_UPDATE_BEFORE) boolean generateUpdateBefore,
+ @Nullable @JsonProperty(FIELD_NAME_STATE) List<StateMetadata> stateMetadataList,
@JsonProperty(FIELD_NAME_INPUT_PROPERTIES) List<InputProperty> inputProperties,
@JsonProperty(FIELD_NAME_OUTPUT_TYPE) RowType outputType,
@JsonProperty(FIELD_NAME_DESCRIPTION) String description) {
super(id, context, persistedConfig, inputProperties, outputType, description);
this.uniqueKeys = uniqueKeys;
this.generateUpdateBefore = generateUpdateBefore;
+ this.stateMetadataList = stateMetadataList;
}
@SuppressWarnings("unchecked")
@@ -129,7 +152,9 @@ public class StreamExecChangelogNormalize extends ExecNodeBase<RowData>
(InternalTypeInfo<RowData>) inputTransform.getOutputType();
final OneInputStreamOperator<RowData, RowData> operator;
- final long stateIdleTime = config.getStateRetentionTime();
+
+ final long stateRetentionTime =
+ StateMetadata.getStateTtlForOneInputOperator(config, stateMetadataList);
final boolean isMiniBatchEnabled =
config.get(ExecutionConfigOptions.TABLE_EXEC_MINIBATCH_ENABLED);
@@ -145,7 +170,7 @@ public class StreamExecChangelogNormalize extends ExecNodeBase<RowData>
new ProcTimeMiniBatchDeduplicateKeepLastRowFunction(
rowTypeInfo,
rowSerializer,
- stateIdleTime,
+ stateRetentionTime,
generateUpdateBefore,
true, // generateInsert
false, // inputInsertOnly
@@ -156,7 +181,7 @@ public class StreamExecChangelogNormalize extends ExecNodeBase<RowData>
ProcTimeDeduplicateKeepLastRowFunction processFunction =
new ProcTimeDeduplicateKeepLastRowFunction(
rowTypeInfo,
- stateIdleTime,
+ stateRetentionTime,
generateUpdateBefore,
true, // generateInsert
false, // inputInsertOnly
diff --git a/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/plan/nodes/exec/stream/StreamExecDeduplicate.java b/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/plan/nodes/exec/stream/StreamExecDeduplicate.java
index 9bf5c8c298c..41eb8d5691c 100644
--- a/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/plan/nodes/exec/stream/StreamExecDeduplicate.java
+++ b/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/plan/nodes/exec/stream/StreamExecDeduplicate.java
@@ -37,6 +37,7 @@ import org.apache.flink.table.planner.plan.nodes.exec.ExecNodeContext;
import org.apache.flink.table.planner.plan.nodes.exec.ExecNodeMetadata;
import org.apache.flink.table.planner.plan.nodes.exec.InputProperty;
import org.apache.flink.table.planner.plan.nodes.exec.SingleTransformationTranslator;
+import org.apache.flink.table.planner.plan.nodes.exec.StateMetadata;
import org.apache.flink.table.planner.plan.nodes.exec.utils.ExecNodeUtil;
import org.apache.flink.table.planner.plan.utils.KeySelectorUtil;
import org.apache.flink.table.runtime.generated.GeneratedRecordEqualiser;
@@ -55,8 +56,11 @@ import org.apache.flink.table.runtime.typeutils.TypeCheckUtils;
import org.apache.flink.table.types.logical.RowType;
import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonCreator;
+import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonInclude;
import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonProperty;
+import javax.annotation.Nullable;
+
import java.util.Collections;
import java.util.List;
@@ -82,6 +86,18 @@ import static org.apache.flink.util.Preconditions.checkNotNull;
producedTransformations = StreamExecDeduplicate.DEDUPLICATE_TRANSFORMATION,
minPlanVersion = FlinkVersion.v1_15,
minStateVersion = FlinkVersion.v1_15)
+@ExecNodeMetadata(
+ name = "stream-exec-deduplicate",
+ version = 2,
+ consumedOptions = {
+ "table.exec.mini-batch.enabled",
+ "table.exec.mini-batch.size",
+ "table.exec.deduplicate.insert-update-after-sensitive-enabled",
+ "table.exec.deduplicate.mini-batch.compact-changes-enabled"
+ },
+ producedTransformations = StreamExecDeduplicate.DEDUPLICATE_TRANSFORMATION,
+ minPlanVersion = FlinkVersion.v1_18,
+ minStateVersion = FlinkVersion.v1_15)
public class StreamExecDeduplicate extends ExecNodeBase<RowData>
implements StreamExecNode<RowData>, SingleTransformationTranslator<RowData> {
@@ -91,6 +107,7 @@ public class StreamExecDeduplicate extends ExecNodeBase<RowData>
public static final String FIELD_NAME_IS_ROWTIME = "isRowtime";
public static final String FIELD_NAME_KEEP_LAST_ROW = "keepLastRow";
public static final String FIELD_NAME_GENERATE_UPDATE_BEFORE = "generateUpdateBefore";
+ public static final String STATE_NAME = "deduplicateState";
@JsonProperty(FIELD_NAME_UNIQUE_KEYS)
private final int[] uniqueKeys;
@@ -104,6 +121,11 @@ public class StreamExecDeduplicate extends ExecNodeBase<RowData>
@JsonProperty(FIELD_NAME_GENERATE_UPDATE_BEFORE)
private final boolean generateUpdateBefore;
+ @Nullable
+ @JsonProperty(FIELD_NAME_STATE)
+ @JsonInclude(JsonInclude.Include.NON_NULL)
+ private final List<StateMetadata> stateMetadataList;
+
public StreamExecDeduplicate(
ReadableConfig tableConfig,
int[] uniqueKeys,
@@ -121,6 +143,7 @@ public class StreamExecDeduplicate extends ExecNodeBase<RowData>
isRowtime,
keepLastRow,
generateUpdateBefore,
+ StateMetadata.getOneInputOperatorDefaultMeta(tableConfig, STATE_NAME),
Collections.singletonList(inputProperty),
outputType,
description);
@@ -135,6 +158,7 @@ public class StreamExecDeduplicate extends ExecNodeBase<RowData>
@JsonProperty(FIELD_NAME_IS_ROWTIME) boolean isRowtime,
@JsonProperty(FIELD_NAME_KEEP_LAST_ROW) boolean keepLastRow,
@JsonProperty(FIELD_NAME_GENERATE_UPDATE_BEFORE) boolean generateUpdateBefore,
+ @Nullable @JsonProperty(FIELD_NAME_STATE) List<StateMetadata> stateMetadataList,
@JsonProperty(FIELD_NAME_INPUT_PROPERTIES) List<InputProperty> inputProperties,
@JsonProperty(FIELD_NAME_OUTPUT_TYPE) RowType outputType,
@JsonProperty(FIELD_NAME_DESCRIPTION) String description) {
@@ -144,6 +168,7 @@ public class StreamExecDeduplicate extends ExecNodeBase<RowData>
this.isRowtime = isRowtime;
this.keepLastRow = keepLastRow;
this.generateUpdateBefore = generateUpdateBefore;
+ this.stateMetadataList = stateMetadataList;
}
@SuppressWarnings("unchecked")
@@ -161,6 +186,8 @@ public class StreamExecDeduplicate extends ExecNodeBase<RowData>
rowTypeInfo.createSerializer(planner.getExecEnv().getConfig());
final OneInputStreamOperator<RowData, RowData> operator;
+ long stateRetentionTime =
+ StateMetadata.getStateTtlForOneInputOperator(config, stateMetadataList);
if (isRowtime) {
operator =
new RowtimeDeduplicateOperatorTranslator(
@@ -169,7 +196,8 @@ public class StreamExecDeduplicate extends ExecNodeBase<RowData>
rowSerializer,
inputRowType,
keepLastRow,
- generateUpdateBefore)
+ generateUpdateBefore,
+ stateRetentionTime)
.createDeduplicateOperator();
} else {
operator =
@@ -180,7 +208,8 @@ public class StreamExecDeduplicate extends ExecNodeBase<RowData>
rowSerializer,
inputRowType,
keepLastRow,
- generateUpdateBefore)
+ generateUpdateBefore,
+ stateRetentionTime)
.createDeduplicateOperator();
}
@@ -209,18 +238,21 @@ public class StreamExecDeduplicate extends ExecNodeBase<RowData>
protected final TypeSerializer<RowData> typeSerializer;
protected final boolean keepLastRow;
protected final boolean generateUpdateBefore;
+ protected final long stateRetentionTime;
protected DeduplicateOperatorTranslator(
ReadableConfig config,
InternalTypeInfo<RowData> rowTypeInfo,
TypeSerializer<RowData> typeSerializer,
boolean keepLastRow,
- boolean generateUpdateBefore) {
+ boolean generateUpdateBefore,
+ long stateRetentionTime) {
this.config = config;
this.rowTypeInfo = rowTypeInfo;
this.typeSerializer = typeSerializer;
this.keepLastRow = keepLastRow;
this.generateUpdateBefore = generateUpdateBefore;
+ this.stateRetentionTime = stateRetentionTime;
}
protected boolean generateInsert() {
@@ -267,8 +299,15 @@ public class StreamExecDeduplicate extends ExecNodeBase<RowData>
TypeSerializer<RowData> typeSerializer,
RowType inputRowType,
boolean keepLastRow,
- boolean generateUpdateBefore) {
- super(config, rowTypeInfo, typeSerializer, keepLastRow, generateUpdateBefore);
+ boolean generateUpdateBefore,
+ long stateRetentionTime) {
+ super(
+ config,
+ rowTypeInfo,
+ typeSerializer,
+ keepLastRow,
+ generateUpdateBefore,
+ stateRetentionTime);
this.inputRowType = inputRowType;
}
@@ -289,7 +328,7 @@ public class StreamExecDeduplicate extends ExecNodeBase<RowData>
new RowTimeMiniBatchLatestChangeDeduplicateFunction(
rowTypeInfo,
typeSerializer,
- getMinRetentionTime(),
+ stateRetentionTime,
rowtimeIndex,
generateUpdateBefore,
generateInsert(),
@@ -300,7 +339,7 @@ public class StreamExecDeduplicate extends ExecNodeBase<RowData>
new RowTimeMiniBatchDeduplicateFunction(
rowTypeInfo,
typeSerializer,
- getMinRetentionTime(),
+ stateRetentionTime,
rowtimeIndex,
generateUpdateBefore,
generateInsert(),
@@ -311,7 +350,7 @@ public class StreamExecDeduplicate extends ExecNodeBase<RowData>
RowTimeDeduplicateFunction processFunction =
new RowTimeDeduplicateFunction(
rowTypeInfo,
- getMinRetentionTime(),
+ stateRetentionTime,
rowtimeIndex,
generateUpdateBefore,
generateInsert(),
@@ -333,8 +372,15 @@ public class StreamExecDeduplicate extends ExecNodeBase<RowData>
TypeSerializer<RowData> typeSerializer,
RowType inputRowType,
boolean keepLastRow,
- boolean generateUpdateBefore) {
- super(config, rowTypeInfo, typeSerializer, keepLastRow, generateUpdateBefore);
+ boolean generateUpdateBefore,
+ long stateRetentionTime) {
+ super(
+ config,
+ rowTypeInfo,
+ typeSerializer,
+ keepLastRow,
+ generateUpdateBefore,
+ stateRetentionTime);
generatedEqualiser =
new EqualiserCodeGenerator(inputRowType, classLoader)
.generateRecordEqualiser("DeduplicateRowEqualiser");
@@ -349,7 +395,7 @@ public class StreamExecDeduplicate extends ExecNodeBase<RowData>
new ProcTimeMiniBatchDeduplicateKeepLastRowFunction(
rowTypeInfo,
typeSerializer,
- getMinRetentionTime(),
+ stateRetentionTime,
generateUpdateBefore,
generateInsert(),
true,
@@ -358,7 +404,7 @@ public class StreamExecDeduplicate extends ExecNodeBase<RowData>
} else {
ProcTimeMiniBatchDeduplicateKeepFirstRowFunction processFunction =
new ProcTimeMiniBatchDeduplicateKeepFirstRowFunction(
- typeSerializer, getMinRetentionTime());
+ typeSerializer, stateRetentionTime);
return new KeyedMapBundleOperator<>(processFunction, trigger);
}
} else {
@@ -366,7 +412,7 @@ public class StreamExecDeduplicate extends ExecNodeBase<RowData>
ProcTimeDeduplicateKeepLastRowFunction processFunction =
new ProcTimeDeduplicateKeepLastRowFunction(
rowTypeInfo,
- getMinRetentionTime(),
+ stateRetentionTime,
generateUpdateBefore,
generateInsert(),
true,
@@ -374,7 +420,7 @@ public class StreamExecDeduplicate extends ExecNodeBase<RowData>
return new KeyedProcessOperator<>(processFunction);
} else {
ProcTimeDeduplicateKeepFirstRowFunction processFunction =
- new ProcTimeDeduplicateKeepFirstRowFunction(getMinRetentionTime());
+ new ProcTimeDeduplicateKeepFirstRowFunction(stateRetentionTime);
return new KeyedProcessOperator<>(processFunction);
}
}
diff --git a/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/plan/nodes/exec/stream/StreamExecGlobalGroupAggregate.java b/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/plan/nodes/exec/stream/StreamExecGlobalGroupAggregate.java
index 207120fa75e..966af383696 100644
--- a/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/plan/nodes/exec/stream/StreamExecGlobalGroupAggregate.java
+++ b/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/plan/nodes/exec/stream/StreamExecGlobalGroupAggregate.java
@@ -36,6 +36,7 @@ import org.apache.flink.table.planner.plan.nodes.exec.ExecNodeConfig;
import org.apache.flink.table.planner.plan.nodes.exec.ExecNodeContext;
import org.apache.flink.table.planner.plan.nodes.exec.ExecNodeMetadata;
import org.apache.flink.table.planner.plan.nodes.exec.InputProperty;
+import org.apache.flink.table.planner.plan.nodes.exec.StateMetadata;
import org.apache.flink.table.planner.plan.nodes.exec.utils.ExecNodeUtil;
import org.apache.flink.table.planner.plan.utils.AggregateInfoList;
import org.apache.flink.table.planner.plan.utils.AggregateUtil;
@@ -80,6 +81,14 @@ import static org.apache.flink.util.Preconditions.checkNotNull;
StreamExecGlobalGroupAggregate.GLOBAL_GROUP_AGGREGATE_TRANSFORMATION,
minPlanVersion = FlinkVersion.v1_15,
minStateVersion = FlinkVersion.v1_15)
+@ExecNodeMetadata(
+ name = "stream-exec-global-group-aggregate",
+ version = 2,
+ consumedOptions = {"table.exec.mini-batch.enabled", "table.exec.mini-batch.size"},
+ producedTransformations =
+ StreamExecGlobalGroupAggregate.GLOBAL_GROUP_AGGREGATE_TRANSFORMATION,
+ minPlanVersion = FlinkVersion.v1_18,
+ minStateVersion = FlinkVersion.v1_15)
public class StreamExecGlobalGroupAggregate extends StreamExecAggregateBase {
private static final Logger LOG = LoggerFactory.getLogger(StreamExecGlobalGroupAggregate.class);
@@ -89,6 +98,8 @@ public class StreamExecGlobalGroupAggregate extends StreamExecAggregateBase {
public static final String FIELD_NAME_LOCAL_AGG_INPUT_ROW_TYPE = "localAggInputRowType";
public static final String FIELD_NAME_INDEX_OF_COUNT_STAR = "indexOfCountStar";
+ public static final String STATE_NAME = "globalGroupAggregateState";
+
@JsonProperty(FIELD_NAME_GROUPING)
private final int[] grouping;
@@ -116,6 +127,11 @@ public class StreamExecGlobalGroupAggregate extends StreamExecAggregateBase {
@JsonInclude(JsonInclude.Include.NON_NULL)
protected final Integer indexOfCountStar;
+ @Nullable
+ @JsonProperty(FIELD_NAME_STATE)
+ @JsonInclude(JsonInclude.Include.NON_NULL)
+ private final List<StateMetadata> stateMetadataList;
+
public StreamExecGlobalGroupAggregate(
ReadableConfig tableConfig,
int[] grouping,
@@ -140,6 +156,7 @@ public class StreamExecGlobalGroupAggregate extends StreamExecAggregateBase {
generateUpdateBefore,
needRetraction,
indexOfCountStar,
+ StateMetadata.getOneInputOperatorDefaultMeta(tableConfig, STATE_NAME),
Collections.singletonList(inputProperty),
outputType,
description);
@@ -157,6 +174,7 @@ public class StreamExecGlobalGroupAggregate extends StreamExecAggregateBase {
@JsonProperty(FIELD_NAME_GENERATE_UPDATE_BEFORE) boolean generateUpdateBefore,
@JsonProperty(FIELD_NAME_NEED_RETRACTION) boolean needRetraction,
@JsonProperty(FIELD_NAME_INDEX_OF_COUNT_STAR) @Nullable Integer indexOfCountStar,
+ @Nullable @JsonProperty(FIELD_NAME_STATE) List<StateMetadata> stateMetadataList,
@JsonProperty(FIELD_NAME_INPUT_PROPERTIES) List<InputProperty> inputProperties,
@JsonProperty(FIELD_NAME_OUTPUT_TYPE) RowType outputType,
@JsonProperty(FIELD_NAME_DESCRIPTION) String description) {
@@ -170,6 +188,7 @@ public class StreamExecGlobalGroupAggregate extends StreamExecAggregateBase {
this.needRetraction = needRetraction;
checkArgument(indexOfCountStar == null || indexOfCountStar >= 0 && needRetraction);
this.indexOfCountStar = indexOfCountStar;
+ this.stateMetadataList = stateMetadataList;
}
@SuppressWarnings("unchecked")
@@ -177,7 +196,9 @@ public class StreamExecGlobalGroupAggregate extends StreamExecAggregateBase {
protected Transformation<RowData> translateToPlanInternal(
PlannerBase planner, ExecNodeConfig config) {
- if (grouping.length > 0 && config.getStateRetentionTime() < 0) {
+ long stateRetentionTime =
+ StateMetadata.getStateTtlForOneInputOperator(config, stateMetadataList);
+ if (grouping.length > 0 && stateRetentionTime < 0) {
LOG.warn(
"No state retention interval configured for a query which accumulates state. "
+ "Please provide a query configuration with valid retention interval to prevent excessive "
@@ -256,7 +277,7 @@ public class StreamExecGlobalGroupAggregate extends StreamExecAggregateBase {
globalAccTypes,
indexOfCountStar,
generateUpdateBefore,
- config.getStateRetentionTime());
+ stateRetentionTime);
operator =
new KeyedMapBundleOperator<>(
diff --git a/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/plan/nodes/exec/stream/StreamExecGroupAggregate.java b/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/plan/nodes/exec/stream/StreamExecGroupAggregate.java
index 928516e93b1..5983dc48166 100644
--- a/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/plan/nodes/exec/stream/StreamExecGroupAggregate.java
+++ b/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/plan/nodes/exec/stream/StreamExecGroupAggregate.java
@@ -36,6 +36,7 @@ import org.apache.flink.table.planner.plan.nodes.exec.ExecNodeConfig;
import org.apache.flink.table.planner.plan.nodes.exec.ExecNodeContext;
import org.apache.flink.table.planner.plan.nodes.exec.ExecNodeMetadata;
import org.apache.flink.table.planner.plan.nodes.exec.InputProperty;
+import org.apache.flink.table.planner.plan.nodes.exec.StateMetadata;
import org.apache.flink.table.planner.plan.nodes.exec.utils.ExecNodeUtil;
import org.apache.flink.table.planner.plan.utils.AggregateInfoList;
import org.apache.flink.table.planner.plan.utils.AggregateUtil;
@@ -53,12 +54,15 @@ import org.apache.flink.table.types.logical.LogicalType;
import org.apache.flink.table.types.logical.RowType;
import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonCreator;
+import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonInclude;
import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonProperty;
import org.apache.calcite.rel.core.AggregateCall;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import javax.annotation.Nullable;
+
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
@@ -78,12 +82,21 @@ import static org.apache.flink.util.Preconditions.checkNotNull;
producedTransformations = StreamExecGroupAggregate.GROUP_AGGREGATE_TRANSFORMATION,
minPlanVersion = FlinkVersion.v1_15,
minStateVersion = FlinkVersion.v1_15)
+@ExecNodeMetadata(
+ name = "stream-exec-group-aggregate",
+ version = 2,
+ consumedOptions = {"table.exec.mini-batch.enabled", "table.exec.mini-batch.size"},
+ producedTransformations = StreamExecGroupAggregate.GROUP_AGGREGATE_TRANSFORMATION,
+ minPlanVersion = FlinkVersion.v1_18,
+ minStateVersion = FlinkVersion.v1_15)
public class StreamExecGroupAggregate extends StreamExecAggregateBase {
private static final Logger LOG = LoggerFactory.getLogger(StreamExecGroupAggregate.class);
public static final String GROUP_AGGREGATE_TRANSFORMATION = "group-aggregate";
+ public static final String STATE_NAME = "groupAggregateState";
+
@JsonProperty(FIELD_NAME_GROUPING)
private final int[] grouping;
@@ -102,6 +115,11 @@ public class StreamExecGroupAggregate extends StreamExecAggregateBase {
@JsonProperty(FIELD_NAME_NEED_RETRACTION)
private final boolean needRetraction;
+ @Nullable
+ @JsonProperty(FIELD_NAME_STATE)
+ @JsonInclude(JsonInclude.Include.NON_NULL)
+ private final List<StateMetadata> stateMetadataList;
+
public StreamExecGroupAggregate(
ReadableConfig tableConfig,
int[] grouping,
@@ -121,6 +139,7 @@ public class StreamExecGroupAggregate extends StreamExecAggregateBase {
aggCallNeedRetractions,
generateUpdateBefore,
needRetraction,
+ StateMetadata.getOneInputOperatorDefaultMeta(tableConfig, STATE_NAME),
Collections.singletonList(inputProperty),
outputType,
description);
@@ -136,6 +155,7 @@ public class StreamExecGroupAggregate extends StreamExecAggregateBase {
@JsonProperty(FIELD_NAME_AGG_CALL_NEED_RETRACTIONS) boolean[] aggCallNeedRetractions,
@JsonProperty(FIELD_NAME_GENERATE_UPDATE_BEFORE) boolean generateUpdateBefore,
@JsonProperty(FIELD_NAME_NEED_RETRACTION) boolean needRetraction,
+ @Nullable @JsonProperty(FIELD_NAME_STATE) List<StateMetadata> stateMetadataList,
@JsonProperty(FIELD_NAME_INPUT_PROPERTIES) List<InputProperty> inputProperties,
@JsonProperty(FIELD_NAME_OUTPUT_TYPE) RowType outputType,
@JsonProperty(FIELD_NAME_DESCRIPTION) String description) {
@@ -146,13 +166,17 @@ public class StreamExecGroupAggregate extends StreamExecAggregateBase {
checkArgument(aggCalls.length == aggCallNeedRetractions.length);
this.generateUpdateBefore = generateUpdateBefore;
this.needRetraction = needRetraction;
+ this.stateMetadataList = stateMetadataList;
}
@SuppressWarnings("unchecked")
@Override
protected Transformation<RowData> translateToPlanInternal(
PlannerBase planner, ExecNodeConfig config) {
- if (grouping.length > 0 && config.getStateRetentionTime() < 0) {
+
+ final long stateRetentionTime =
+ StateMetadata.getStateTtlForOneInputOperator(config, stateMetadataList);
+ if (grouping.length > 0 && stateRetentionTime < 0) {
LOG.warn(
"No state retention interval configured for a query which accumulates state. "
+ "Please provide a query configuration with valid retention interval to prevent excessive "
@@ -220,7 +244,7 @@ public class StreamExecGroupAggregate extends StreamExecAggregateBase {
inputRowType,
inputCountIndex,
generateUpdateBefore,
- config.getStateRetentionTime());
+ stateRetentionTime);
operator =
new KeyedMapBundleOperator<>(
aggFunction, AggregateUtil.createMiniBatchTrigger(config));
@@ -232,7 +256,7 @@ public class StreamExecGroupAggregate extends StreamExecAggregateBase {
accTypes,
inputCountIndex,
generateUpdateBefore,
- config.getStateRetentionTime());
+ stateRetentionTime);
operator = new KeyedProcessOperator<>(aggFunction);
}
diff --git a/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/plan/nodes/exec/stream/StreamExecIncrementalGroupAggregate.java b/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/plan/nodes/exec/stream/StreamExecIncrementalGroupAggregate.java
index 9a5efb5a532..a676d7272c9 100644
--- a/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/plan/nodes/exec/stream/StreamExecIncrementalGroupAggregate.java
+++ b/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/plan/nodes/exec/stream/StreamExecIncrementalGroupAggregate.java
@@ -33,6 +33,7 @@ import org.apache.flink.table.planner.plan.nodes.exec.ExecNodeConfig;
import org.apache.flink.table.planner.plan.nodes.exec.ExecNodeContext;
import org.apache.flink.table.planner.plan.nodes.exec.ExecNodeMetadata;
import org.apache.flink.table.planner.plan.nodes.exec.InputProperty;
+import org.apache.flink.table.planner.plan.nodes.exec.StateMetadata;
import org.apache.flink.table.planner.plan.nodes.exec.utils.ExecNodeUtil;
import org.apache.flink.table.planner.plan.utils.AggregateInfoList;
import org.apache.flink.table.planner.plan.utils.AggregateUtil;
@@ -47,11 +48,14 @@ import org.apache.flink.table.types.DataType;
import org.apache.flink.table.types.logical.RowType;
import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonCreator;
+import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonInclude;
import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonProperty;
import org.apache.calcite.rel.core.AggregateCall;
import org.apache.calcite.tools.RelBuilder;
+import javax.annotation.Nullable;
+
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
@@ -68,6 +72,14 @@ import static org.apache.flink.util.Preconditions.checkNotNull;
StreamExecIncrementalGroupAggregate.INCREMENTAL_GROUP_AGGREGATE_TRANSFORMATION,
minPlanVersion = FlinkVersion.v1_15,
minStateVersion = FlinkVersion.v1_15)
+@ExecNodeMetadata(
+ name = "stream-exec-incremental-group-aggregate",
+ version = 2,
+ consumedOptions = {"table.exec.mini-batch.enabled", "table.exec.mini-batch.size"},
+ producedTransformations =
+ StreamExecIncrementalGroupAggregate.INCREMENTAL_GROUP_AGGREGATE_TRANSFORMATION,
+ minPlanVersion = FlinkVersion.v1_18,
+ minStateVersion = FlinkVersion.v1_15)
public class StreamExecIncrementalGroupAggregate extends StreamExecAggregateBase {
public static final String INCREMENTAL_GROUP_AGGREGATE_TRANSFORMATION =
@@ -82,6 +94,8 @@ public class StreamExecIncrementalGroupAggregate extends StreamExecAggregateBase
"partialLocalAggInputRowType";
public static final String FIELD_NAME_PARTIAL_AGG_NEED_RETRACTION = "partialAggNeedRetraction";
+ public static final String STATE_NAME = "incrementalGroupAggregateState";
+
/** The partial agg's grouping. */
@JsonProperty(FIELD_NAME_PARTIAL_AGG_GROUPING)
private final int[] partialAggGrouping;
@@ -106,6 +120,11 @@ public class StreamExecIncrementalGroupAggregate extends StreamExecAggregateBase
@JsonProperty(FIELD_NAME_PARTIAL_AGG_NEED_RETRACTION)
private final boolean partialAggNeedRetraction;
+ @Nullable
+ @JsonProperty(FIELD_NAME_STATE)
+ @JsonInclude(JsonInclude.Include.NON_NULL)
+ private final List<StateMetadata> stateMetadataList;
+
public StreamExecIncrementalGroupAggregate(
ReadableConfig tableConfig,
int[] partialAggGrouping,
@@ -128,6 +147,7 @@ public class StreamExecIncrementalGroupAggregate extends StreamExecAggregateBase
partialAggCallNeedRetractions,
partialLocalAggInputType,
partialAggNeedRetraction,
+ StateMetadata.getOneInputOperatorDefaultMeta(tableConfig, STATE_NAME),
Collections.singletonList(inputProperty),
outputType,
description);
@@ -146,6 +166,7 @@ public class StreamExecIncrementalGroupAggregate extends StreamExecAggregateBase
boolean[] partialAggCallNeedRetractions,
@JsonProperty(FIELD_NAME_PARTIAL_LOCAL_AGG_INPUT_TYPE) RowType partialLocalAggInputType,
@JsonProperty(FIELD_NAME_PARTIAL_AGG_NEED_RETRACTION) boolean partialAggNeedRetraction,
+ @Nullable @JsonProperty(FIELD_NAME_STATE) List<StateMetadata> stateMetadataList,
@JsonProperty(FIELD_NAME_INPUT_PROPERTIES) List<InputProperty> inputProperties,
@JsonProperty(FIELD_NAME_OUTPUT_TYPE) RowType outputType,
@JsonProperty(FIELD_NAME_DESCRIPTION) String description) {
@@ -157,6 +178,7 @@ public class StreamExecIncrementalGroupAggregate extends StreamExecAggregateBase
checkArgument(partialOriginalAggCalls.length == partialAggCallNeedRetractions.length);
this.partialLocalAggInputType = checkNotNull(partialLocalAggInputType);
this.partialAggNeedRetraction = partialAggNeedRetraction;
+ this.stateMetadataList = stateMetadataList;
}
@SuppressWarnings("unchecked")
@@ -224,7 +246,7 @@ public class StreamExecIncrementalGroupAggregate extends StreamExecAggregateBase
partialAggsHandler,
finalAggsHandler,
finalKeySelector,
- config.getStateRetentionTime());
+ StateMetadata.getStateTtlForOneInputOperator(config, stateMetadataList));
final OneInputStreamOperator<RowData, RowData> operator =
new KeyedMapBundleOperator<>(
diff --git a/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/plan/nodes/exec/stream/StreamExecJoin.java b/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/plan/nodes/exec/stream/StreamExecJoin.java
index 47544eeb6f8..59a60b1759d 100644
--- a/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/plan/nodes/exec/stream/StreamExecJoin.java
+++ b/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/plan/nodes/exec/stream/StreamExecJoin.java
@@ -32,6 +32,7 @@ import org.apache.flink.table.planner.plan.nodes.exec.ExecNodeContext;
import org.apache.flink.table.planner.plan.nodes.exec.ExecNodeMetadata;
import org.apache.flink.table.planner.plan.nodes.exec.InputProperty;
import org.apache.flink.table.planner.plan.nodes.exec.SingleTransformationTranslator;
+import org.apache.flink.table.planner.plan.nodes.exec.StateMetadata;
import org.apache.flink.table.planner.plan.nodes.exec.spec.JoinSpec;
import org.apache.flink.table.planner.plan.nodes.exec.utils.ExecNodeUtil;
import org.apache.flink.table.planner.plan.utils.JoinUtil;
@@ -51,6 +52,8 @@ import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonCre
import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonInclude;
import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonProperty;
+import javax.annotation.Nullable;
+
import java.util.List;
import static org.apache.flink.util.Preconditions.checkArgument;
@@ -68,11 +71,21 @@ import static org.apache.flink.util.Preconditions.checkNotNull;
producedTransformations = StreamExecJoin.JOIN_TRANSFORMATION,
minPlanVersion = FlinkVersion.v1_15,
minStateVersion = FlinkVersion.v1_15)
+@ExecNodeMetadata(
+ name = "stream-exec-join",
+ version = 2,
+ producedTransformations = StreamExecJoin.JOIN_TRANSFORMATION,
+ minPlanVersion = FlinkVersion.v1_18,
+ minStateVersion = FlinkVersion.v1_15)
public class StreamExecJoin extends ExecNodeBase<RowData>
implements StreamExecNode<RowData>, SingleTransformationTranslator<RowData> {
public static final String JOIN_TRANSFORMATION = "join";
+ public static final String LEFT_STATE_NAME = "leftState";
+
+ public static final String RIGHT_STATE_NAME = "rightState";
+
public static final String FIELD_NAME_JOIN_SPEC = "joinSpec";
public static final String FIELD_NAME_LEFT_UPSERT_KEYS = "leftUpsertKeys";
public static final String FIELD_NAME_RIGHT_UPSERT_KEYS = "rightUpsertKeys";
@@ -88,6 +101,11 @@ public class StreamExecJoin extends ExecNodeBase<RowData>
@JsonInclude(JsonInclude.Include.NON_DEFAULT)
private final List<int[]> rightUpsertKeys;
+ @Nullable
+ @JsonProperty(FIELD_NAME_STATE)
+ @JsonInclude(JsonInclude.Include.NON_NULL)
+ private final List<StateMetadata> stateMetadataList;
+
public StreamExecJoin(
ReadableConfig tableConfig,
JoinSpec joinSpec,
@@ -104,6 +122,8 @@ public class StreamExecJoin extends ExecNodeBase<RowData>
joinSpec,
leftUpsertKeys,
rightUpsertKeys,
+ StateMetadata.getMultiInputOperatorDefaultMeta(
+ tableConfig, LEFT_STATE_NAME, RIGHT_STATE_NAME),
Lists.newArrayList(leftInputProperty, rightInputProperty),
outputType,
description);
@@ -117,6 +137,7 @@ public class StreamExecJoin extends ExecNodeBase<RowData>
@JsonProperty(FIELD_NAME_JOIN_SPEC) JoinSpec joinSpec,
@JsonProperty(FIELD_NAME_LEFT_UPSERT_KEYS) List<int[]> leftUpsertKeys,
@JsonProperty(FIELD_NAME_RIGHT_UPSERT_KEYS) List<int[]> rightUpsertKeys,
+ @Nullable @JsonProperty(FIELD_NAME_STATE) List<StateMetadata> stateMetadataList,
@JsonProperty(FIELD_NAME_INPUT_PROPERTIES) List<InputProperty> inputProperties,
@JsonProperty(FIELD_NAME_OUTPUT_TYPE) RowType outputType,
@JsonProperty(FIELD_NAME_DESCRIPTION) String description) {
@@ -125,6 +146,7 @@ public class StreamExecJoin extends ExecNodeBase<RowData>
this.joinSpec = checkNotNull(joinSpec);
this.leftUpsertKeys = leftUpsertKeys;
this.rightUpsertKeys = rightUpsertKeys;
+ this.stateMetadataList = stateMetadataList;
}
@Override
@@ -170,7 +192,10 @@ public class StreamExecJoin extends ExecNodeBase<RowData>
leftType,
rightType);
- long minRetentionTime = config.getStateRetentionTime();
+ List<Long> leftAndRightStateRetentionTime =
+ StateMetadata.getStateTtlForMultiInputOperator(config, 2, stateMetadataList);
+ long leftStateRetentionTime = leftAndRightStateRetentionTime.get(0);
+ long rightStateRetentionTime = leftAndRightStateRetentionTime.get(1);
AbstractStreamingJoinOperator operator;
FlinkJoinType joinType = joinSpec.getJoinType();
@@ -184,8 +209,8 @@ public class StreamExecJoin extends ExecNodeBase<RowData>
leftInputSpec,
rightInputSpec,
joinSpec.getFilterNulls(),
- minRetentionTime,
- minRetentionTime);
+ leftStateRetentionTime,
+ rightStateRetentionTime);
} else {
boolean leftIsOuter = joinType == FlinkJoinType.LEFT || joinType == FlinkJoinType.FULL;
boolean rightIsOuter =
@@ -200,8 +225,8 @@ public class StreamExecJoin extends ExecNodeBase<RowData>
leftIsOuter,
rightIsOuter,
joinSpec.getFilterNulls(),
- minRetentionTime,
- minRetentionTime);
+ leftStateRetentionTime,
+ rightStateRetentionTime);
}
final RowType returnType = (RowType) getOutputType();
diff --git a/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/plan/nodes/exec/stream/StreamExecLimit.java b/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/plan/nodes/exec/stream/StreamExecLimit.java
index 2f673a04aed..f023b017d64 100644
--- a/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/plan/nodes/exec/stream/StreamExecLimit.java
+++ b/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/plan/nodes/exec/stream/StreamExecLimit.java
@@ -29,6 +29,7 @@ import org.apache.flink.table.planner.plan.nodes.exec.ExecNodeConfig;
import org.apache.flink.table.planner.plan.nodes.exec.ExecNodeContext;
import org.apache.flink.table.planner.plan.nodes.exec.ExecNodeMetadata;
import org.apache.flink.table.planner.plan.nodes.exec.InputProperty;
+import org.apache.flink.table.planner.plan.nodes.exec.StateMetadata;
import org.apache.flink.table.planner.plan.nodes.exec.spec.PartitionSpec;
import org.apache.flink.table.planner.plan.nodes.exec.spec.SortSpec;
import org.apache.flink.table.planner.plan.utils.RankProcessStrategy;
@@ -39,6 +40,8 @@ import org.apache.flink.table.types.logical.RowType;
import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonCreator;
import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonProperty;
+import javax.annotation.Nullable;
+
import java.util.Collections;
import java.util.List;
@@ -50,6 +53,13 @@ import java.util.List;
producedTransformations = StreamExecRank.RANK_TRANSFORMATION,
minPlanVersion = FlinkVersion.v1_15,
minStateVersion = FlinkVersion.v1_15)
+@ExecNodeMetadata(
+ name = "stream-exec-limit",
+ version = 2,
+ consumedOptions = {"table.exec.rank.topn-cache-size"},
+ producedTransformations = StreamExecRank.RANK_TRANSFORMATION,
+ minPlanVersion = FlinkVersion.v1_18,
+ minStateVersion = FlinkVersion.v1_15)
public class StreamExecLimit extends StreamExecRank {
private final long limitEnd;
@@ -70,6 +80,7 @@ public class StreamExecLimit extends StreamExecRank {
new ConstantRankRange(limitStart + 1, limitEnd),
getRankStrategy(needRetraction),
generateUpdateBefore,
+ StateMetadata.getOneInputOperatorDefaultMeta(tableConfig, STATE_NAME),
Collections.singletonList(inputProperty),
outputType,
description);
@@ -83,6 +94,7 @@ public class StreamExecLimit extends StreamExecRank {
@JsonProperty(FIELD_NAME_RANK_RANG) ConstantRankRange rankRange,
@JsonProperty(FIELD_NAME_RANK_STRATEGY) RankProcessStrategy rankStrategy,
@JsonProperty(FIELD_NAME_GENERATE_UPDATE_BEFORE) boolean generateUpdateBefore,
+ @Nullable @JsonProperty(FIELD_NAME_STATE) List<StateMetadata> stateMetadataList,
@JsonProperty(FIELD_NAME_INPUT_PROPERTIES) List<InputProperty> inputProperties,
@JsonProperty(FIELD_NAME_OUTPUT_TYPE) RowType outputType,
@JsonProperty(FIELD_NAME_DESCRIPTION) String description) {
@@ -97,6 +109,7 @@ public class StreamExecLimit extends StreamExecRank {
rankStrategy,
false, // outputRankNumber
generateUpdateBefore,
+ stateMetadataList,
inputProperties,
outputType,
description);
diff --git a/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/plan/nodes/exec/stream/StreamExecLookupJoin.java b/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/plan/nodes/exec/stream/StreamExecLookupJoin.java
index 28d15bff07e..426261481de 100644
--- a/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/plan/nodes/exec/stream/StreamExecLookupJoin.java
+++ b/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/plan/nodes/exec/stream/StreamExecLookupJoin.java
@@ -21,31 +21,53 @@ package org.apache.flink.table.planner.plan.nodes.exec.stream;
import org.apache.flink.FlinkVersion;
import org.apache.flink.api.dag.Transformation;
import org.apache.flink.configuration.ReadableConfig;
+import org.apache.flink.runtime.state.KeyGroupRangeAssignment;
+import org.apache.flink.streaming.api.functions.ProcessFunction;
+import org.apache.flink.streaming.api.operators.KeyedProcessOperator;
+import org.apache.flink.streaming.api.transformations.OneInputTransformation;
+import org.apache.flink.streaming.api.transformations.PartitionTransformation;
+import org.apache.flink.streaming.runtime.partitioner.KeyGroupStreamPartitioner;
import org.apache.flink.table.connector.ChangelogMode;
import org.apache.flink.table.data.RowData;
+import org.apache.flink.table.functions.TableFunction;
import org.apache.flink.table.planner.delegation.PlannerBase;
import org.apache.flink.table.planner.plan.nodes.exec.ExecNodeConfig;
import org.apache.flink.table.planner.plan.nodes.exec.ExecNodeContext;
import org.apache.flink.table.planner.plan.nodes.exec.ExecNodeMetadata;
import org.apache.flink.table.planner.plan.nodes.exec.InputProperty;
import org.apache.flink.table.planner.plan.nodes.exec.MultipleTransformationTranslator;
+import org.apache.flink.table.planner.plan.nodes.exec.StateMetadata;
import org.apache.flink.table.planner.plan.nodes.exec.common.CommonExecLookupJoin;
import org.apache.flink.table.planner.plan.nodes.exec.spec.TemporalTableSourceSpec;
+import org.apache.flink.table.planner.plan.nodes.exec.utils.ExecNodeUtil;
+import org.apache.flink.table.planner.plan.utils.KeySelectorUtil;
import org.apache.flink.table.planner.plan.utils.LookupJoinUtil;
+import org.apache.flink.table.runtime.keyselector.EmptyRowDataKeySelector;
+import org.apache.flink.table.runtime.keyselector.RowDataKeySelector;
import org.apache.flink.table.runtime.operators.join.FlinkJoinType;
+import org.apache.flink.table.runtime.operators.join.lookup.KeyedLookupJoinWrapper;
+import org.apache.flink.table.runtime.operators.join.lookup.LookupJoinRunner;
+import org.apache.flink.table.runtime.typeutils.InternalSerializers;
+import org.apache.flink.table.runtime.typeutils.InternalTypeInfo;
+import org.apache.flink.table.runtime.util.StateConfigUtil;
import org.apache.flink.table.types.logical.RowType;
import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonCreator;
import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonInclude;
import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonProperty;
+import org.apache.calcite.plan.RelOptTable;
import org.apache.calcite.rex.RexNode;
+import org.apache.calcite.tools.RelBuilder;
import javax.annotation.Nullable;
import java.util.Collections;
import java.util.List;
import java.util.Map;
+import java.util.stream.Collectors;
+
+import static org.apache.flink.table.planner.plan.nodes.exec.common.CommonExecSink.PARTITIONER_TRANSFORMATION;
/** {@link StreamExecNode} for temporal table join that implemented by lookup. */
@ExecNodeMetadata(
@@ -54,6 +76,12 @@ import java.util.Map;
producedTransformations = CommonExecLookupJoin.LOOKUP_JOIN_TRANSFORMATION,
minPlanVersion = FlinkVersion.v1_15,
minStateVersion = FlinkVersion.v1_15)
+@ExecNodeMetadata(
+ name = "stream-exec-lookup-join",
+ version = 2,
+ producedTransformations = CommonExecLookupJoin.LOOKUP_JOIN_TRANSFORMATION,
+ minPlanVersion = FlinkVersion.v1_18,
+ minStateVersion = FlinkVersion.v1_15)
public class StreamExecLookupJoin extends CommonExecLookupJoin
implements StreamExecNode<RowData>, MultipleTransformationTranslator<RowData> {
public static final String FIELD_NAME_REQUIRE_UPSERT_MATERIALIZE = "requireUpsertMaterialize";
@@ -61,6 +89,8 @@ public class StreamExecLookupJoin extends CommonExecLookupJoin
public static final String FIELD_NAME_LOOKUP_KEY_CONTAINS_PRIMARY_KEY =
"lookupKeyContainsPrimaryKey";
+ public static final String STATE_NAME = "lookupJoinState";
+
@JsonProperty(FIELD_NAME_LOOKUP_KEY_CONTAINS_PRIMARY_KEY)
private final boolean lookupKeyContainsPrimaryKey;
@@ -68,6 +98,11 @@ public class StreamExecLookupJoin extends CommonExecLookupJoin
@JsonInclude(JsonInclude.Include.NON_DEFAULT)
private final boolean upsertMaterialize;
+ @Nullable
+ @JsonProperty(FIELD_NAME_STATE)
+ @JsonInclude(JsonInclude.Include.NON_NULL)
+ private final List<StateMetadata> stateMetadataList;
+
public StreamExecLookupJoin(
ReadableConfig tableConfig,
FlinkJoinType joinType,
@@ -99,6 +134,10 @@ public class StreamExecLookupJoin extends CommonExecLookupJoin
asyncLookupOptions,
retryOptions,
inputChangelogMode,
+ // serialize state meta only when upsert materialize is enabled
+ upsertMaterialize
+ ? StateMetadata.getOneInputOperatorDefaultMeta(tableConfig, STATE_NAME)
+ : null,
Collections.singletonList(inputProperty),
outputType,
description);
@@ -127,6 +166,7 @@ public class StreamExecLookupJoin extends CommonExecLookupJoin
LookupJoinUtil.RetryLookupOptions retryOptions,
@JsonProperty(FIELD_NAME_INPUT_CHANGELOG_MODE) @Nullable
ChangelogMode inputChangelogMode,
+ @JsonProperty(FIELD_NAME_STATE) @Nullable List<StateMetadata> stateMetadataList,
@JsonProperty(FIELD_NAME_INPUT_PROPERTIES) List<InputProperty> inputProperties,
@JsonProperty(FIELD_NAME_OUTPUT_TYPE) RowType outputType,
@JsonProperty(FIELD_NAME_DESCRIPTION) String description) {
@@ -148,6 +188,7 @@ public class StreamExecLookupJoin extends CommonExecLookupJoin
description);
this.lookupKeyContainsPrimaryKey = lookupKeyContainsPrimaryKey;
this.upsertMaterialize = upsertMaterialize;
+ this.stateMetadataList = stateMetadataList;
}
@Override
@@ -157,4 +198,107 @@ public class StreamExecLookupJoin extends CommonExecLookupJoin
return createJoinTransformation(
planner, config, upsertMaterialize, lookupKeyContainsPrimaryKey);
}
+
+ @Override
+ protected Transformation<RowData> createSyncLookupJoinWithState(
+ Transformation<RowData> inputTransformation,
+ RelOptTable temporalTable,
+ ExecNodeConfig config,
+ ClassLoader classLoader,
+ Map<Integer, LookupJoinUtil.LookupKey> allLookupKeys,
+ TableFunction<?> syncLookupFunction,
+ RelBuilder relBuilder,
+ RowType inputRowType,
+ RowType tableSourceRowType,
+ RowType resultRowType,
+ boolean isLeftOuterJoin,
+ boolean isObjectReuseEnabled,
+ boolean lookupKeyContainsPrimaryKey) {
+
+ final long stateRetentionTime =
+ StateMetadata.getStateTtlForOneInputOperator(config, stateMetadataList);
+
+ // create lookup function first
+ ProcessFunction<RowData, RowData> processFunction =
+ createSyncLookupJoinFunction(
+ temporalTable,
+ config,
+ classLoader,
+ allLookupKeys,
+ syncLookupFunction,
+ relBuilder,
+ inputRowType,
+ tableSourceRowType,
+ resultRowType,
+ isLeftOuterJoin,
+ isObjectReuseEnabled);
+
+ RowType rightRowType =
+ getRightOutputRowType(
+ getProjectionOutputRelDataType(relBuilder), tableSourceRowType);
+
+ KeyedLookupJoinWrapper keyedLookupJoinWrapper =
+ new KeyedLookupJoinWrapper(
+ (LookupJoinRunner) processFunction,
+ StateConfigUtil.createTtlConfig(stateRetentionTime),
+ InternalSerializers.create(rightRowType),
+ lookupKeyContainsPrimaryKey);
+
+ KeyedProcessOperator<RowData, RowData, RowData> operator =
+ new KeyedProcessOperator<>(keyedLookupJoinWrapper);
+
+ List<Integer> refKeys =
+ allLookupKeys.values().stream()
+ .filter(key -> key instanceof LookupJoinUtil.FieldRefLookupKey)
+ .map(key -> ((LookupJoinUtil.FieldRefLookupKey) key).index)
+ .collect(Collectors.toList());
+ RowDataKeySelector keySelector;
+
+ // use single parallelism for empty key shuffle
+ boolean singleParallelism = refKeys.isEmpty();
+ if (singleParallelism) {
+ // all lookup keys are constants, then use an empty key selector
+ keySelector = EmptyRowDataKeySelector.INSTANCE;
+ } else {
+ // make it a deterministic asc order
+ Collections.sort(refKeys);
+ keySelector =
+ KeySelectorUtil.getRowDataSelector(
+ classLoader,
+ refKeys.stream().mapToInt(Integer::intValue).toArray(),
+ InternalTypeInfo.of(inputRowType));
+ }
+ final KeyGroupStreamPartitioner<RowData, RowData> partitioner =
+ new KeyGroupStreamPartitioner<>(
+ keySelector, KeyGroupRangeAssignment.DEFAULT_LOWER_BOUND_MAX_PARALLELISM);
+ Transformation<RowData> partitionedTransform =
+ new PartitionTransformation<>(inputTransformation, partitioner);
+ createTransformationMeta(PARTITIONER_TRANSFORMATION, "Partitioner", "Partitioner", config)
+ .fill(partitionedTransform);
+ if (singleParallelism) {
+ setSingletonParallelism(partitionedTransform);
+ } else {
+ partitionedTransform.setParallelism(inputTransformation.getParallelism(), false);
+ }
+
+ OneInputTransformation<RowData, RowData> transform =
+ ExecNodeUtil.createOneInputTransformation(
+ partitionedTransform,
+ createTransformationMeta(LOOKUP_JOIN_MATERIALIZE_TRANSFORMATION, config),
+ operator,
+ InternalTypeInfo.of(resultRowType),
+ partitionedTransform.getParallelism(),
+ false);
+ transform.setStateKeySelector(keySelector);
+ transform.setStateKeyType(keySelector.getProducedType());
+ if (singleParallelism) {
+ setSingletonParallelism(transform);
+ }
+ return transform;
+ }
+
+ private void setSingletonParallelism(Transformation<RowData> transformation) {
+ transformation.setParallelism(1);
+ transformation.setMaxParallelism(1);
+ }
}
diff --git a/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/plan/nodes/exec/stream/StreamExecRank.java b/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/plan/nodes/exec/stream/StreamExecRank.java
index e87982914d0..f2b6400be36 100644
--- a/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/plan/nodes/exec/stream/StreamExecRank.java
+++ b/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/plan/nodes/exec/stream/StreamExecRank.java
@@ -37,6 +37,7 @@ import org.apache.flink.table.planner.plan.nodes.exec.ExecNodeContext;
import org.apache.flink.table.planner.plan.nodes.exec.ExecNodeMetadata;
import org.apache.flink.table.planner.plan.nodes.exec.InputProperty;
import org.apache.flink.table.planner.plan.nodes.exec.SingleTransformationTranslator;
+import org.apache.flink.table.planner.plan.nodes.exec.StateMetadata;
import org.apache.flink.table.planner.plan.nodes.exec.spec.PartitionSpec;
import org.apache.flink.table.planner.plan.nodes.exec.spec.SortSpec;
import org.apache.flink.table.planner.plan.nodes.exec.utils.ExecNodeUtil;
@@ -62,8 +63,11 @@ import org.apache.flink.table.types.logical.LogicalType;
import org.apache.flink.table.types.logical.RowType;
import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonCreator;
+import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonInclude;
import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonProperty;
+import javax.annotation.Nullable;
+
import java.util.Collections;
import java.util.List;
import java.util.stream.IntStream;
@@ -80,6 +84,13 @@ import static org.apache.flink.util.Preconditions.checkNotNull;
producedTransformations = StreamExecRank.RANK_TRANSFORMATION,
minPlanVersion = FlinkVersion.v1_15,
minStateVersion = FlinkVersion.v1_15)
+@ExecNodeMetadata(
+ name = "stream-exec-rank",
+ version = 2,
+ consumedOptions = {"table.exec.rank.topn-cache-size"},
+ producedTransformations = StreamExecRank.RANK_TRANSFORMATION,
+ minPlanVersion = FlinkVersion.v1_18,
+ minStateVersion = FlinkVersion.v1_15)
public class StreamExecRank extends ExecNodeBase<RowData>
implements StreamExecNode<RowData>, SingleTransformationTranslator<RowData> {
@@ -93,6 +104,8 @@ public class StreamExecRank extends ExecNodeBase<RowData>
public static final String FIELD_NAME_GENERATE_UPDATE_BEFORE = "generateUpdateBefore";
public static final String FIELD_NAME_OUTPUT_RANK_NUMBER = "outputRowNumber";
+ public static final String STATE_NAME = "rankState";
+
@JsonProperty(FIELD_NAME_RANK_TYPE)
private final RankType rankType;
@@ -114,6 +127,11 @@ public class StreamExecRank extends ExecNodeBase<RowData>
@JsonProperty(FIELD_NAME_GENERATE_UPDATE_BEFORE)
private final boolean generateUpdateBefore;
+ @Nullable
+ @JsonProperty(FIELD_NAME_STATE)
+ @JsonInclude(JsonInclude.Include.NON_NULL)
+ private final List<StateMetadata> stateMetadataList;
+
public StreamExecRank(
ReadableConfig tableConfig,
RankType rankType,
@@ -137,6 +155,7 @@ public class StreamExecRank extends ExecNodeBase<RowData>
rankStrategy,
outputRankNumber,
generateUpdateBefore,
+ StateMetadata.getOneInputOperatorDefaultMeta(tableConfig, STATE_NAME),
Collections.singletonList(inputProperty),
outputType,
description);
@@ -154,6 +173,7 @@ public class StreamExecRank extends ExecNodeBase<RowData>
@JsonProperty(FIELD_NAME_RANK_STRATEGY) RankProcessStrategy rankStrategy,
@JsonProperty(FIELD_NAME_OUTPUT_RANK_NUMBER) boolean outputRankNumber,
@JsonProperty(FIELD_NAME_GENERATE_UPDATE_BEFORE) boolean generateUpdateBefore,
+ @Nullable @JsonProperty(FIELD_NAME_STATE) List<StateMetadata> stateMetadataList,
@JsonProperty(FIELD_NAME_INPUT_PROPERTIES) List<InputProperty> inputProperties,
@JsonProperty(FIELD_NAME_OUTPUT_TYPE) RowType outputType,
@JsonProperty(FIELD_NAME_DESCRIPTION) String description) {
@@ -166,6 +186,7 @@ public class StreamExecRank extends ExecNodeBase<RowData>
this.partitionSpec = checkNotNull(partitionSpec);
this.outputRankNumber = outputRankNumber;
this.generateUpdateBefore = generateUpdateBefore;
+ this.stateMetadataList = stateMetadataList;
}
@SuppressWarnings("unchecked")
@@ -215,7 +236,10 @@ public class StreamExecRank extends ExecNodeBase<RowData>
RowType.of(sortSpec.getFieldTypes(inputType)),
sortSpecInSortKey);
long cacheSize = config.get(TABLE_EXEC_RANK_TOPN_CACHE_SIZE);
- StateTtlConfig ttlConfig = StateConfigUtil.createTtlConfig(config.getStateRetentionTime());
+
+ long stateRetentionTime =
+ StateMetadata.getStateTtlForOneInputOperator(config, stateMetadataList);
+ StateTtlConfig ttlConfig = StateConfigUtil.createTtlConfig(stateRetentionTime);
AbstractTopNFunction processFunction;
if (rankStrategy instanceof RankProcessStrategy.AppendFastStrategy) {
diff --git a/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/plan/nodes/exec/stream/StreamExecSink.java b/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/plan/nodes/exec/stream/StreamExecSink.java
index 6932c1a951b..979dbbade5a 100644
--- a/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/plan/nodes/exec/stream/StreamExecSink.java
+++ b/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/plan/nodes/exec/stream/StreamExecSink.java
@@ -21,10 +21,12 @@ package org.apache.flink.table.planner.plan.nodes.exec.stream;
import org.apache.flink.FlinkVersion;
import org.apache.flink.api.dag.Transformation;
import org.apache.flink.configuration.ReadableConfig;
+import org.apache.flink.streaming.api.transformations.OneInputTransformation;
import org.apache.flink.table.api.TableException;
import org.apache.flink.table.connector.ChangelogMode;
import org.apache.flink.table.connector.sink.DynamicTableSink;
import org.apache.flink.table.data.RowData;
+import org.apache.flink.table.planner.codegen.EqualiserCodeGenerator;
import org.apache.flink.table.planner.connectors.CollectDynamicSink;
import org.apache.flink.table.planner.delegation.PlannerBase;
import org.apache.flink.table.planner.plan.nodes.exec.ExecEdge;
@@ -33,9 +35,19 @@ import org.apache.flink.table.planner.plan.nodes.exec.ExecNodeConfig;
import org.apache.flink.table.planner.plan.nodes.exec.ExecNodeContext;
import org.apache.flink.table.planner.plan.nodes.exec.ExecNodeMetadata;
import org.apache.flink.table.planner.plan.nodes.exec.InputProperty;
+import org.apache.flink.table.planner.plan.nodes.exec.StateMetadata;
import org.apache.flink.table.planner.plan.nodes.exec.common.CommonExecSink;
import org.apache.flink.table.planner.plan.nodes.exec.spec.DynamicTableSinkSpec;
+import org.apache.flink.table.planner.plan.nodes.exec.utils.ExecNodeUtil;
+import org.apache.flink.table.planner.plan.utils.KeySelectorUtil;
+import org.apache.flink.table.planner.typeutils.RowTypeUtils;
+import org.apache.flink.table.runtime.generated.GeneratedRecordEqualiser;
+import org.apache.flink.table.runtime.keyselector.RowDataKeySelector;
+import org.apache.flink.table.runtime.operators.sink.SinkUpsertMaterializer;
+import org.apache.flink.table.runtime.typeutils.InternalSerializers;
+import org.apache.flink.table.runtime.typeutils.InternalTypeInfo;
import org.apache.flink.table.runtime.typeutils.TypeCheckUtils;
+import org.apache.flink.table.runtime.util.StateConfigUtil;
import org.apache.flink.table.types.logical.LogicalType;
import org.apache.flink.table.types.logical.RowType;
@@ -43,7 +55,10 @@ import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonCre
import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonInclude;
import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonProperty;
+import javax.annotation.Nullable;
+
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import java.util.stream.Collectors;
@@ -70,12 +85,33 @@ import java.util.stream.Collectors;
},
minPlanVersion = FlinkVersion.v1_15,
minStateVersion = FlinkVersion.v1_15)
+@ExecNodeMetadata(
+ name = "stream-exec-sink",
+ version = 2,
+ consumedOptions = {
+ "table.exec.sink.not-null-enforcer",
+ "table.exec.sink.type-length-enforcer",
+ "table.exec.sink.upsert-materialize",
+ "table.exec.sink.keyed-shuffle"
+ },
+ producedTransformations = {
+ CommonExecSink.CONSTRAINT_VALIDATOR_TRANSFORMATION,
+ CommonExecSink.PARTITIONER_TRANSFORMATION,
+ CommonExecSink.UPSERT_MATERIALIZE_TRANSFORMATION,
+ CommonExecSink.TIMESTAMP_INSERTER_TRANSFORMATION,
+ CommonExecSink.SINK_TRANSFORMATION
+ },
+ minPlanVersion = FlinkVersion.v1_18,
+ minStateVersion = FlinkVersion.v1_15)
public class StreamExecSink extends CommonExecSink implements StreamExecNode<Object> {
public static final String FIELD_NAME_INPUT_CHANGELOG_MODE = "inputChangelogMode";
public static final String FIELD_NAME_REQUIRE_UPSERT_MATERIALIZE = "requireUpsertMaterialize";
public static final String FIELD_NAME_INPUT_UPSERT_KEY = "inputUpsertKey";
+ /** New introduced state metadata to enable operator-level state TTL configuration. */
+ public static final String STATE_NAME = "sinkMaterializeState";
+
@JsonProperty(FIELD_NAME_INPUT_CHANGELOG_MODE)
private final ChangelogMode inputChangelogMode;
@@ -87,6 +123,11 @@ public class StreamExecSink extends CommonExecSink implements StreamExecNode<Obj
@JsonInclude(JsonInclude.Include.NON_DEFAULT)
private final int[] inputUpsertKey;
+ @Nullable
+ @JsonProperty(FIELD_NAME_STATE)
+ @JsonInclude(JsonInclude.Include.NON_NULL)
+ private final List<StateMetadata> stateMetadataList;
+
public StreamExecSink(
ReadableConfig tableConfig,
DynamicTableSinkSpec tableSinkSpec,
@@ -102,10 +143,14 @@ public class StreamExecSink extends CommonExecSink implements StreamExecNode<Obj
ExecNodeContext.newPersistedConfig(StreamExecSink.class, tableConfig),
tableSinkSpec,
inputChangelogMode,
- Collections.singletonList(inputProperty),
- outputType,
upsertMaterialize,
+ // do not serialize state metadata if upsertMaterialize is not required
+ upsertMaterialize
+ ? StateMetadata.getOneInputOperatorDefaultMeta(tableConfig, STATE_NAME)
+ : null,
inputUpsertKey,
+ Collections.singletonList(inputProperty),
+ outputType,
description);
}
@@ -116,10 +161,11 @@ public class StreamExecSink extends CommonExecSink implements StreamExecNode<Obj
@JsonProperty(FIELD_NAME_CONFIGURATION) ReadableConfig persistedConfig,
@JsonProperty(FIELD_NAME_DYNAMIC_TABLE_SINK) DynamicTableSinkSpec tableSinkSpec,
@JsonProperty(FIELD_NAME_INPUT_CHANGELOG_MODE) ChangelogMode inputChangelogMode,
- @JsonProperty(FIELD_NAME_INPUT_PROPERTIES) List<InputProperty> inputProperties,
- @JsonProperty(FIELD_NAME_OUTPUT_TYPE) LogicalType outputType,
@JsonProperty(FIELD_NAME_REQUIRE_UPSERT_MATERIALIZE) boolean upsertMaterialize,
+ @Nullable @JsonProperty(FIELD_NAME_STATE) List<StateMetadata> stateMetadataList,
@JsonProperty(FIELD_NAME_INPUT_UPSERT_KEY) int[] inputUpsertKey,
+ @JsonProperty(FIELD_NAME_INPUT_PROPERTIES) List<InputProperty> inputProperties,
+ @JsonProperty(FIELD_NAME_OUTPUT_TYPE) LogicalType outputType,
@JsonProperty(FIELD_NAME_DESCRIPTION) String description) {
super(
id,
@@ -134,6 +180,7 @@ public class StreamExecSink extends CommonExecSink implements StreamExecNode<Obj
this.inputChangelogMode = inputChangelogMode;
this.upsertMaterialize = upsertMaterialize;
this.inputUpsertKey = inputUpsertKey;
+ this.stateMetadataList = stateMetadataList;
}
@SuppressWarnings("unchecked")
@@ -183,4 +230,63 @@ public class StreamExecSink extends CommonExecSink implements StreamExecNode<Obj
upsertMaterialize,
inputUpsertKey);
}
+
+ @Override
+ protected Transformation<RowData> applyUpsertMaterialize(
+ Transformation<RowData> inputTransform,
+ int[] primaryKeys,
+ int sinkParallelism,
+ ExecNodeConfig config,
+ ClassLoader classLoader,
+ RowType physicalRowType,
+ int[] inputUpsertKey) {
+ final GeneratedRecordEqualiser rowEqualiser =
+ new EqualiserCodeGenerator(physicalRowType, classLoader)
+ .generateRecordEqualiser("SinkMaterializeEqualiser");
+ final GeneratedRecordEqualiser upsertKeyEqualiser =
+ inputUpsertKey == null
+ ? null
+ : new EqualiserCodeGenerator(
+ RowTypeUtils.projectRowType(
+ physicalRowType, inputUpsertKey),
+ classLoader)
+ .generateRecordEqualiser("SinkMaterializeUpsertKeyEqualiser");
+
+ final long stateRetentionTime =
+ StateMetadata.getStateTtlForOneInputOperator(config, stateMetadataList);
+
+ SinkUpsertMaterializer operator =
+ new SinkUpsertMaterializer(
+ StateConfigUtil.createTtlConfig(stateRetentionTime),
+ InternalSerializers.create(physicalRowType),
+ rowEqualiser,
+ upsertKeyEqualiser,
+ inputUpsertKey);
+ final String[] fieldNames = physicalRowType.getFieldNames().toArray(new String[0]);
+ final List<String> pkFieldNames =
+ Arrays.stream(primaryKeys)
+ .mapToObj(idx -> fieldNames[idx])
+ .collect(Collectors.toList());
+
+ OneInputTransformation<RowData, RowData> materializeTransform =
+ ExecNodeUtil.createOneInputTransformation(
+ inputTransform,
+ createTransformationMeta(
+ UPSERT_MATERIALIZE_TRANSFORMATION,
+ String.format(
+ "SinkMaterializer(pk=[%s])",
+ String.join(", ", pkFieldNames)),
+ "SinkMaterializer",
+ config),
+ operator,
+ inputTransform.getOutputType(),
+ sinkParallelism,
+ sinkParallelismConfigured);
+ RowDataKeySelector keySelector =
+ KeySelectorUtil.getRowDataSelector(
+ classLoader, primaryKeys, InternalTypeInfo.of(physicalRowType));
+ materializeTransform.setStateKeySelector(keySelector);
+ materializeTransform.setStateKeyType(keySelector.getProducedType());
+ return materializeTransform;
+ }
}
diff --git a/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/plan/nodes/exec/stream/StreamExecSortLimit.java b/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/plan/nodes/exec/stream/StreamExecSortLimit.java
index fd367295922..532c3703039 100644
--- a/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/plan/nodes/exec/stream/StreamExecSortLimit.java
+++ b/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/plan/nodes/exec/stream/StreamExecSortLimit.java
@@ -28,6 +28,7 @@ import org.apache.flink.table.planner.plan.nodes.exec.ExecNodeConfig;
import org.apache.flink.table.planner.plan.nodes.exec.ExecNodeContext;
import org.apache.flink.table.planner.plan.nodes.exec.ExecNodeMetadata;
import org.apache.flink.table.planner.plan.nodes.exec.InputProperty;
+import org.apache.flink.table.planner.plan.nodes.exec.StateMetadata;
import org.apache.flink.table.planner.plan.nodes.exec.spec.PartitionSpec;
import org.apache.flink.table.planner.plan.nodes.exec.spec.SortSpec;
import org.apache.flink.table.planner.plan.utils.RankProcessStrategy;
@@ -38,6 +39,8 @@ import org.apache.flink.table.types.logical.RowType;
import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonCreator;
import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonProperty;
+import javax.annotation.Nullable;
+
import java.util.Collections;
import java.util.List;
@@ -49,6 +52,13 @@ import java.util.List;
producedTransformations = StreamExecRank.RANK_TRANSFORMATION,
minPlanVersion = FlinkVersion.v1_15,
minStateVersion = FlinkVersion.v1_15)
+@ExecNodeMetadata(
+ name = "stream-exec-sort-limit",
+ version = 2,
+ consumedOptions = {"table.exec.rank.topn-cache-size"},
+ producedTransformations = StreamExecRank.RANK_TRANSFORMATION,
+ minPlanVersion = FlinkVersion.v1_18,
+ minStateVersion = FlinkVersion.v1_15)
public class StreamExecSortLimit extends StreamExecRank {
private final long limitEnd;
@@ -71,6 +81,7 @@ public class StreamExecSortLimit extends StreamExecRank {
new ConstantRankRange(limitStart + 1, limitEnd),
rankStrategy,
generateUpdateBefore,
+ StateMetadata.getOneInputOperatorDefaultMeta(tableConfig, STATE_NAME),
Collections.singletonList(inputProperty),
outputType,
description);
@@ -85,6 +96,7 @@ public class StreamExecSortLimit extends StreamExecRank {
@JsonProperty(FIELD_NAME_RANK_RANG) ConstantRankRange rankRange,
@JsonProperty(FIELD_NAME_RANK_STRATEGY) RankProcessStrategy rankStrategy,
@JsonProperty(FIELD_NAME_GENERATE_UPDATE_BEFORE) boolean generateUpdateBefore,
+ @Nullable @JsonProperty(FIELD_NAME_STATE) List<StateMetadata> stateMetadataList,
@JsonProperty(FIELD_NAME_INPUT_PROPERTIES) List<InputProperty> inputProperties,
@JsonProperty(FIELD_NAME_OUTPUT_TYPE) RowType outputType,
@JsonProperty(FIELD_NAME_DESCRIPTION) String description) {
@@ -100,6 +112,7 @@ public class StreamExecSortLimit extends StreamExecRank {
rankStrategy,
false, // outputRankNumber
generateUpdateBefore,
+ stateMetadataList,
inputProperties,
outputType,
description);
diff --git a/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/factories/TestValuesTableFactory.java b/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/factories/TestValuesTableFactory.java
index b7fb6246740..a116ff9044e 100644
--- a/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/factories/TestValuesTableFactory.java
+++ b/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/factories/TestValuesTableFactory.java
@@ -130,6 +130,7 @@ import org.apache.flink.util.InstantiationUtil;
import javax.annotation.Nullable;
import java.io.IOException;
+import java.time.Duration;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
@@ -389,12 +390,28 @@ public final class TestValuesTableFactory
ConfigOptions.key("sink.drop-late-event")
.booleanType()
.defaultValue(false)
- .withDeprecatedKeys("Option to determine whether to discard the late event.");
+ .withDescription("Option to determine whether to discard the late event.");
private static final ConfigOption<Integer> SOURCE_NUM_ELEMENT_TO_SKIP =
ConfigOptions.key("source.num-element-to-skip")
.intType()
.defaultValue(-1)
- .withDeprecatedKeys("Option to define the number of elements to skip.");
+ .withDescription("Option to define the number of elements to skip.");
+
+ private static final ConfigOption<Integer> SOURCE_SLEEP_AFTER_ELEMENTS =
+ ConfigOptions.key("source.sleep-after-elements")
+ .intType()
+ .defaultValue(-1)
+ .withDescription(
+ "Option to specify the number of elements to process before sleeping for a specific amount of time. "
+ + "The default value is -1, which means that this process is skipped.");
+
+ private static final ConfigOption<Duration> SOURCE_SLEEP_TIME =
+ ConfigOptions.key("source.sleep-time")
+ .durationType()
+ .defaultValue(Duration.ofMillis(0))
+ .withDescription(
+ "Option to specify the amount of time to sleep after processing every N elements. "
+ + "The default value is 0, which means that no sleep is performed");
/**
* Parse partition list from Options with the format as
@@ -434,6 +451,8 @@ public final class TestValuesTableFactory
int numElementToSkip = helper.getOptions().get(SOURCE_NUM_ELEMENT_TO_SKIP);
boolean internalData = helper.getOptions().get(INTERNAL_DATA);
int lookupThreshold = helper.getOptions().get(LOOKUP_THRESHOLD);
+ int sleepAfterElements = helper.getOptions().get(SOURCE_SLEEP_AFTER_ELEMENTS);
+ long sleepTimeMillis = helper.getOptions().get(SOURCE_SLEEP_TIME).toMillis();
DefaultLookupCache cache = null;
if (helper.getOptions().get(CACHE_TYPE).equals(LookupOptions.LookupCacheType.PARTIAL)) {
cache = DefaultLookupCache.fromConfig(helper.getOptions());
@@ -460,7 +479,8 @@ public final class TestValuesTableFactory
if (sourceClass.equals("DEFAULT")) {
if (internalData) {
- return new TestValuesScanTableSourceWithInternalData(dataId, isBounded);
+ return new TestValuesScanTableSourceWithInternalData(
+ dataId, isBounded, sleepAfterElements, sleepTimeMillis);
}
Collection<Row> data = registeredData.getOrDefault(dataId, Collections.emptyList());
@@ -665,6 +685,8 @@ public final class TestValuesTableFactory
ENABLE_WATERMARK_PUSH_DOWN,
SINK_DROP_LATE_EVENT,
SOURCE_NUM_ELEMENT_TO_SKIP,
+ SOURCE_SLEEP_AFTER_ELEMENTS,
+ SOURCE_SLEEP_TIME,
INTERNAL_DATA,
CACHE_TYPE,
PARTIAL_CACHE_EXPIRE_AFTER_ACCESS,
@@ -1766,14 +1788,22 @@ public final class TestValuesTableFactory
}
}
- /** Values {@link ScanTableSource} which collects the registered {@link RowData} directly. */
+ /**
+ * Values {@link ScanTableSource} which collects the registered {@link RowData} directly, sleeps
+ * {@link #sleepTimeMillis} every {@link #sleepAfterElements} elements.
+ */
private static class TestValuesScanTableSourceWithInternalData implements ScanTableSource {
private final String dataId;
private final boolean bounded;
+ private final int sleepAfterElements;
+ private final long sleepTimeMillis;
- public TestValuesScanTableSourceWithInternalData(String dataId, boolean bounded) {
+ public TestValuesScanTableSourceWithInternalData(
+ String dataId, boolean bounded, int sleepAfterElements, long sleepTimeMillis) {
this.dataId = dataId;
this.bounded = bounded;
+ this.sleepAfterElements = sleepAfterElements;
+ this.sleepTimeMillis = sleepTimeMillis;
}
@Override
@@ -1783,13 +1813,15 @@ public final class TestValuesTableFactory
@Override
public ScanRuntimeProvider getScanRuntimeProvider(ScanContext runtimeProviderContext) {
- final SourceFunction<RowData> sourceFunction = new FromRowDataSourceFunction(dataId);
+ final SourceFunction<RowData> sourceFunction =
+ new FromRowDataSourceFunction(dataId, sleepAfterElements, sleepTimeMillis);
return SourceFunctionProvider.of(sourceFunction, bounded);
}
@Override
public DynamicTableSource copy() {
- return new TestValuesScanTableSourceWithInternalData(dataId, bounded);
+ return new TestValuesScanTableSourceWithInternalData(
+ dataId, bounded, sleepAfterElements, sleepTimeMillis);
}
@Override
@@ -2042,14 +2074,22 @@ public final class TestValuesTableFactory
/**
* A {@link SourceFunction} which collects specific static {@link RowData} without
- * serialization.
+ * serialization, and sleeps {@link #sleepTimeMillis} every {@link #sleepAfterElements}
+ * elements.
*/
private static class FromRowDataSourceFunction implements SourceFunction<RowData> {
private final String dataId;
+ private final int sleepAfterElements;
+ private final long sleepTimeMillis;
+ private final AtomicInteger elementCtr = new AtomicInteger(0);
+
private volatile boolean isRunning = true;
- public FromRowDataSourceFunction(String dataId) {
+ public FromRowDataSourceFunction(
+ String dataId, int sleepAfterElements, long sleepTimeMillis) {
this.dataId = dataId;
+ this.sleepAfterElements = sleepAfterElements;
+ this.sleepTimeMillis = sleepTimeMillis;
}
@Override
@@ -2060,6 +2100,15 @@ public final class TestValuesTableFactory
while (isRunning && valueIter.hasNext()) {
ctx.collect(valueIter.next());
+ if (elementCtr.incrementAndGet() >= sleepAfterElements && sleepTimeMillis > 0) {
+ try {
+ Thread.sleep(sleepTimeMillis);
+ elementCtr.set(0);
+ } catch (InterruptedException e) {
+ Thread.currentThread().interrupt();
+ break;
+ }
+ }
}
}
diff --git a/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/plan/nodes/exec/TransformationsTest.java b/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/plan/nodes/exec/TransformationsTest.java
index 4fa88b2345b..74ad7c66d26 100644
--- a/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/plan/nodes/exec/TransformationsTest.java
+++ b/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/plan/nodes/exec/TransformationsTest.java
@@ -45,6 +45,7 @@ import org.junit.jupiter.api.parallel.ExecutionMode;
import java.io.IOException;
import java.util.List;
import java.util.function.Consumer;
+import java.util.function.Function;
import java.util.stream.Collectors;
import java.util.stream.IntStream;
@@ -202,7 +203,12 @@ class TransformationsTest {
@Test
public void testUidDefaults() throws IOException {
checkUidModification(
- config -> {}, json -> {}, "\\d+_sink", "\\d+_constraint-validator", "\\d+_values");
+ config -> {},
+ json -> {},
+ env -> planFromCurrentFlinkVersion(env).asJsonString(),
+ "\\d+_sink",
+ "\\d+_constraint-validator",
+ "\\d+_values");
}
@Test
@@ -211,11 +217,24 @@ class TransformationsTest {
config ->
config.set(TABLE_EXEC_UID_FORMAT, "<id>_<type>_<version>_<transformation>"),
json -> {},
+ env -> planFromFlink1_15(env).asJsonString(),
"\\d+_stream-exec-sink_1_sink",
"\\d+_stream-exec-sink_1_constraint-validator",
"\\d+_stream-exec-values_1_values");
}
+ @Test
+ public void testUidFlink1_18() throws IOException {
+ checkUidModification(
+ config ->
+ config.set(TABLE_EXEC_UID_FORMAT, "<id>_<type>_<version>_<transformation>"),
+ json -> {},
+ env -> planFromCurrentFlinkVersion(env).asJsonString(),
+ "\\d+_stream-exec-sink_2_sink",
+ "\\d+_stream-exec-sink_2_constraint-validator",
+ "\\d+_stream-exec-values_1_values");
+ }
+
@Test
public void testPerNodeCustomUid() throws IOException {
checkUidModification(
@@ -223,9 +242,10 @@ class TransformationsTest {
json ->
JsonTestUtils.setExecNodeConfig(
json,
- "stream-exec-sink_1",
+ "stream-exec-sink_2",
TABLE_EXEC_UID_FORMAT.key(),
"my_custom_<transformation>_<id>"),
+ env -> planFromCurrentFlinkVersion(env).asJsonString(),
"my_custom_sink_\\d+",
"my_custom_constraint-validator_\\d+",
"\\d+_values");
@@ -234,12 +254,12 @@ class TransformationsTest {
private static void checkUidModification(
Consumer<TableConfig> configModifier,
Consumer<JsonNode> jsonModifier,
+ Function<TableEnvironment, String> planGenerator,
String... expectedUidPatterns)
throws IOException {
final TableEnvironment env = TableEnvironment.create(EnvironmentSettings.inStreamingMode());
configModifier.accept(env.getConfig());
- final String plan = minimalPlan(env).asJsonString();
- final JsonNode json = JsonTestUtils.readFromString(plan);
+ final JsonNode json = JsonTestUtils.readFromString(planGenerator.apply(env));
jsonModifier.accept(json);
final List<String> planUids =
CompiledPlanUtils.toTransformations(
@@ -256,12 +276,17 @@ class TransformationsTest {
// Helper methods
// --------------------------------------------------------------------------------------------
- private static CompiledPlan minimalPlan(TableEnvironment env) {
+ private static CompiledPlan planFromCurrentFlinkVersion(TableEnvironment env) {
return env.fromValues(1, 2, 3)
.insertInto(TableDescriptor.forConnector("blackhole").build())
.compilePlan();
}
+ private static CompiledPlan planFromFlink1_15(TableEnvironment env) {
+ // plan content is compiled using release-1.15 with exec node version 1
+ return env.loadPlan(PlanReference.fromResource("/jsonplan/testUidFlink1_15.out"));
+ }
+
private static LegacySourceTransformation<?> toLegacySourceTransformation(
StreamTableEnvironment env, Table table) {
Transformation<?> transform = env.toChangelogStream(table).getTransformation();
diff --git a/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/plan/nodes/exec/serde/StateMetadataTest.java b/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/plan/nodes/exec/serde/StateMetadataTest.java
index 5b4be9899af..e2b04e82374 100644
--- a/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/plan/nodes/exec/serde/StateMetadataTest.java
+++ b/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/plan/nodes/exec/serde/StateMetadataTest.java
@@ -91,17 +91,17 @@ public class StateMetadataTest {
@MethodSource("provideConfigForOneInput")
@ParameterizedTest
public void testGetOneInputOperatorDefaultMeta(
- Consumer<TableConfig> configModifier, String expectedStateName, long expectedStateTtl) {
+ Consumer<TableConfig> configModifier,
+ String expectedStateName,
+ long expectedTtlMillis) {
configModifier.accept(tableConfig);
List<StateMetadata> stateMetadataList =
StateMetadata.getOneInputOperatorDefaultMeta(tableConfig, expectedStateName);
assertThat(stateMetadataList).hasSize(1);
assertThat(stateMetadataList.get(0))
- .matches(
- (stateMetadata) ->
- stateMetadata.getStateIndex() == 0
- && stateMetadata.getStateName().equals(expectedStateName)
- && stateMetadata.getStateTtl() == expectedStateTtl);
+ .isEqualTo(
+ new StateMetadata(
+ 0, Duration.ofMillis(expectedTtlMillis), expectedStateName));
}
@MethodSource("provideConfigForMultiInput")
@@ -109,7 +109,7 @@ public class StateMetadataTest {
public void testGetMultiInputOperatorDefaultMeta(
Consumer<TableConfig> configModifier,
List<String> expectedStateNameList,
- List<Long> expectedStateTtlList) {
+ List<Long> expectedTtlMillisList) {
configModifier.accept(tableConfig);
List<StateMetadata> stateMetadataList =
StateMetadata.getMultiInputOperatorDefaultMeta(
@@ -119,17 +119,12 @@ public class StateMetadataTest {
.forEach(
i ->
assertThat(stateMetadataList.get(i))
- .matches(
- (stateMetadata) ->
- stateMetadata.getStateIndex() == i
- && stateMetadata
- .getStateName()
- .equals(
- expectedStateNameList
- .get(i))
- && stateMetadata.getStateTtl()
- == expectedStateTtlList.get(
- i)));
+ .isEqualTo(
+ new StateMetadata(
+ i,
+ Duration.ofMillis(
+ expectedTtlMillisList.get(i)),
+ expectedStateNameList.get(i))));
}
@MethodSource("provideStateMetaForOneInput")
diff --git a/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/runtime/stream/jsonplan/ConfigureOperatorLevelStateTtlJsonITCase.java b/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/runtime/stream/jsonplan/ConfigureOperatorLevelStateTtlJsonITCase.java
new file mode 100644
index 00000000000..6d1a22003a1
--- /dev/null
+++ b/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/runtime/stream/jsonplan/ConfigureOperatorLevelStateTtlJsonITCase.java
@@ -0,0 +1,206 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.flink.table.planner.runtime.stream.jsonplan;
+
+import org.apache.flink.table.api.TableException;
+import org.apache.flink.table.data.GenericRowData;
+import org.apache.flink.table.data.StringData;
+import org.apache.flink.table.planner.factories.TestValuesTableFactory;
+import org.apache.flink.table.planner.utils.JsonPlanTestBase;
+import org.apache.flink.table.planner.utils.JsonTestUtils;
+
+import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.JsonNode;
+
+import org.junit.Test;
+
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Tests for configuring operator-level state TTL via {@link
+ * org.apache.flink.table.api.CompiledPlan}.
+ */
+public class ConfigureOperatorLevelStateTtlJsonITCase extends JsonPlanTestBase {
+
+ @Test
+ public void testDifferentStateTtlForDifferentOneInputOperator() throws Exception {
+ String dataId =
+ TestValuesTableFactory.registerRowData(
+ Arrays.asList(
+ GenericRowData.of(1, StringData.fromString("Tom"), 1, 199.9d),
+ GenericRowData.of(2, StringData.fromString("Jerry"), 2, 99.9d),
+ GenericRowData.of(1, StringData.fromString("Tom"), 1, 199.9d),
+ GenericRowData.of(3, StringData.fromString("Tom"), 1, 29.9d),
+ GenericRowData.of(4, StringData.fromString("Olivia"), 1, 100d),
+ GenericRowData.of(4, StringData.fromString("Olivia"), 1, 100d),
+ GenericRowData.of(2, StringData.fromString("Jerry"), 2, 99.9d),
+ GenericRowData.of(5, StringData.fromString("Michael"), 3, 599.9d),
+ GenericRowData.of(6, StringData.fromString("Olivia"), 3, 1000d)));
+ createTestSourceTable(
+ "Orders",
+ new String[] {
+ "`order_id` INT", "`buyer` STRING", "`quantity` INT", "`amount` DOUBLE"
+ },
+ null,
+ getProperties(dataId, 1, "2s"));
+
+ createTestNonInsertOnlyValuesSinkTable(
+ "OrdersStats",
+ "`buyer` STRING",
+ "`ord_cnt` BIGINT",
+ "`quantity_cnt` BIGINT",
+ "`total_amount` DOUBLE");
+ compileSqlAndExecutePlan(
+ "INSERT INTO OrdersStats \n"
+ + "SELECT buyer, COUNT(1) AS ord_cnt, SUM(quantity) AS quantity_cnt, SUM(amount) AS total_amount FROM (\n"
+ + "SELECT *, ROW_NUMBER() OVER(PARTITION BY order_id, buyer, quantity, amount ORDER BY proctime() ASC) AS rk FROM Orders) tmp\n"
+ + "WHERE rk = 1\n"
+ + "GROUP BY buyer",
+ json -> {
+ try {
+ JsonNode target = JsonTestUtils.readFromString(json);
+ JsonTestUtils.setExecNodeStateMetadata(
+ target, "stream-exec-deduplicate", 0, 6000L);
+ JsonTestUtils.setExecNodeStateMetadata(
+ target, "stream-exec-group-aggregate", 0, 9000L);
+ return JsonTestUtils.writeToString(target);
+ } catch (IOException e) {
+ throw new TableException("Cannot modify compiled json plan.", e);
+ }
+ })
+ .await();
+ // with deduplicate state's TTL as 6s, record (+I,2,Jerry,2,99.9) will duplicate itself
+ // +-------------------+--------------------------------------+------------------+
+ // | data | diff(last_arriving, first_arriving) | within_time_range |
+ // +-------------------+-------------------------------------+-------------------+
+ // | 1,Tom,1,199.9 | 4s | Y |
+ // +-------------------+-------------------------------------+-------------------+
+ // | 2,Jerry,2,99.9 | 10s | N |
+ // +-------------------+-------------------------------------+-------------------+
+ // | 3,Tom,1,29.9 | 0s | Y |
+ // +-------------------+-------------------------------------+-------------------+
+ // | 4,Olivia,1,100 | 2s | Y |
+ // +-------------------+-------------------------------------+-------------------+
+ // | 5,Michael,3,599.9 | 0s | Y |
+ // +-------------------+-------------------------------------+-------------------+
+ // | 6,Olivia,3,1000 | 0s | Y |
+ // +-------------------+-------------------------------------+-------------------+
+
+ // with group-aggregate state's TTL as 9s, record (+I,2,Jerry,2,99.9) will be counted twice
+ List<String> expected =
+ Arrays.asList(
+ "+I[Tom, 2, 2, 229.8]",
+ "+I[Jerry, 1, 2, 99.9]",
+ "+I[Jerry, 1, 2, 99.9]",
+ "+I[Olivia, 2, 4, 1100.0]",
+ "+I[Michael, 1, 3, 599.9]");
+ assertResult(expected, TestValuesTableFactory.getResults("OrdersStats"));
+ }
+
+ @Test
+ public void testDifferentStateTtlForSameTwoInputStreamOperator() throws Exception {
+ String leftTableDataId =
+ TestValuesTableFactory.registerRowData(
+ Arrays.asList(
+ GenericRowData.of(1, 1000001),
+ GenericRowData.of(1, 1000002),
+ GenericRowData.of(1, 1000003),
+ GenericRowData.of(1, 1000004),
+ GenericRowData.of(1, 1000005),
+ GenericRowData.of(2, 2000001)));
+ createTestSourceTable(
+ "Orders",
+ new String[] {"`order_id` INT", "`line_order_id` INT"},
+ null,
+ getProperties(leftTableDataId, 1, "2s"));
+
+ String rightTableDataId =
+ TestValuesTableFactory.registerRowData(
+ Arrays.asList(
+ GenericRowData.of(2000001, StringData.fromString("TRUCK")),
+ GenericRowData.of(1000005, StringData.fromString("AIR")),
+ GenericRowData.of(1000001, StringData.fromString("SHIP")),
+ GenericRowData.of(1000002, StringData.fromString("TRUCK")),
+ GenericRowData.of(1000003, StringData.fromString("RAIL")),
+ GenericRowData.of(1000004, StringData.fromString("RAIL"))));
+ createTestSourceTable(
+ "LineOrders",
+ new String[] {"`line_order_id` INT", "`ship_mode` STRING"},
+ null,
+ getProperties(rightTableDataId, 2, "4s"));
+
+ createTestValuesSinkTable(
+ "OrdersShipInfo", "`order_id` INT", "`line_order_id` INT", "`ship_mode` STRING");
+ compileSqlAndExecutePlan(
+ "INSERT INTO OrdersShipInfo \n"
+ + "SELECT a.order_id, a.line_order_id, b.ship_mode FROM Orders a JOIN LineOrders b ON a.line_order_id = b.line_order_id",
+ json -> {
+ try {
+ JsonNode target = JsonTestUtils.readFromString(json);
+ JsonTestUtils.setExecNodeStateMetadata(
+ target, "stream-exec-join", 0, 3000L);
+ JsonTestUtils.setExecNodeStateMetadata(
+ target, "stream-exec-join", 1, 9000L);
+ return JsonTestUtils.writeToString(target);
+ } catch (IOException e) {
+ throw new TableException("Cannot modify compiled json plan.", e);
+ }
+ })
+ .await();
+
+ // with left-state TTL as 3s and right-state TTL as 9s
+ // +--------------+--------------+-------------------------------------+-------------------+
+ // | left_data | right_data | diff(left_arriving, right_arriving) | within_time_range |
+ // +--------------+--------------+-------------------------------------+-------------------+
+ // | 1,1000001 | 1000001,SHIP | 4s | N |
+ // +--------------+--------------+-------------------------------------+-------------------+
+ // | 1,1000002 | 1000002,TRUCK| 2s | Y |
+ // +--------------+--------------+-------------------------------------+-------------------+
+ // | 1,1000003 | 1000003,RAIL | 4s | N |
+ // +--------------+--------------+-------------------------------------+-------------------+
+ // | 1,1000004 | 1000004,RAIL | 2s | Y |
+ // +--------------+--------------+-------------------------------------+-------------------+
+ // | 1,1000005 | 1000005,AIR | -8s | Y |
+ // +--------------+--------------+-------------------------------------+-------------------+
+ // | 2,2000001 | 2000001,TRUCK| -10s | N |
+ // +--------------+--------------+-------------------------------------+-------------------+
+
+ List<String> expected =
+ Arrays.asList(
+ "+I[1, 1000002, TRUCK]", "+I[1, 1000004, RAIL]", "+I[1, 1000005, AIR]");
+ assertResult(expected, TestValuesTableFactory.getResults("OrdersShipInfo"));
+ }
+
+ private static Map<String, String> getProperties(
+ String dataId, int sleepAfterElements, String sleepTime) {
+ return new HashMap<String, String>() {
+ {
+ put("connector", "values");
+ put("bounded", "false");
+ put("register-internal-data", "true");
+ put("source.sleep-after-elements", String.valueOf(sleepAfterElements));
+ put("source.sleep-time", sleepTime);
+ put("data-id", dataId);
+ }
+ };
+ }
+}
diff --git a/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/utils/JsonPlanTestBase.java b/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/utils/JsonPlanTestBase.java
index 5329c9201c6..961dc62482c 100644
--- a/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/utils/JsonPlanTestBase.java
+++ b/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/utils/JsonPlanTestBase.java
@@ -45,6 +45,7 @@ import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.function.Function;
import java.util.stream.Collectors;
import static org.apache.flink.util.Preconditions.checkArgument;
@@ -67,11 +68,18 @@ public abstract class JsonPlanTestBase extends AbstractTestBase {
}
protected TableResult compileSqlAndExecutePlan(String sql) {
+ return compileSqlAndExecutePlan(sql, json -> json);
+ }
+
+ protected TableResult compileSqlAndExecutePlan(
+ String sql, Function<String, String> jsonPlanTransformer) {
CompiledPlan compiledPlan = tableEnv.compilePlanSql(sql);
checkTransformationUids(compiledPlan);
// try to execute the string json plan to validate to ser/de result
- String jsonPlan = compiledPlan.asJsonString();
- CompiledPlan newCompiledPlan = tableEnv.loadPlan(PlanReference.fromJsonString(jsonPlan));
+ CompiledPlan newCompiledPlan =
+ tableEnv.loadPlan(
+ PlanReference.fromJsonString(
+ jsonPlanTransformer.apply(compiledPlan.asJsonString())));
return newCompiledPlan.execute();
}
diff --git a/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/utils/JsonTestUtils.java b/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/utils/JsonTestUtils.java
index 52394523578..503fe9e170f 100644
--- a/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/utils/JsonTestUtils.java
+++ b/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/utils/JsonTestUtils.java
@@ -68,4 +68,18 @@ public final class JsonTestUtils {
});
return target;
}
+
+ public static JsonNode setExecNodeStateMetadata(
+ JsonNode target, String type, int stateIndex, long stateTtl) {
+ target.get("nodes")
+ .elements()
+ .forEachRemaining(
+ n -> {
+ if (n.get("type").asText().startsWith(type) && n.hasNonNull("state")) {
+ ((ObjectNode) (n.get("state").get(stateIndex)))
+ .put("ttl", stateTtl + " ms");
+ }
+ });
+ return target;
+ }
}
diff --git a/flink-table/flink-table-planner/src/test/resources/jsonplan/testGetJsonPlan.out b/flink-table/flink-table-planner/src/test/resources/jsonplan/testGetJsonPlan.out
index 281372b28f5..d37b53b8425 100644
--- a/flink-table/flink-table-planner/src/test/resources/jsonplan/testGetJsonPlan.out
+++ b/flink-table/flink-table-planner/src/test/resources/jsonplan/testGetJsonPlan.out
@@ -39,7 +39,7 @@
},
{
"id": 2,
- "type": "stream-exec-sink_1",
+ "type": "stream-exec-sink_2",
"configuration":{
"table.exec.sink.keyed-shuffle":"AUTO",
"table.exec.sink.not-null-enforcer":"ERROR",
diff --git a/flink-table/flink-table-planner/src/test/resources/jsonplan/testUidFlink1_15.out b/flink-table/flink-table-planner/src/test/resources/jsonplan/testUidFlink1_15.out
new file mode 100644
index 00000000000..8389d04e545
--- /dev/null
+++ b/flink-table/flink-table-planner/src/test/resources/jsonplan/testUidFlink1_15.out
@@ -0,0 +1,88 @@
+{
+ "flinkVersion": "1.15",
+ "nodes": [
+ {
+ "id": 1,
+ "type": "stream-exec-values_1",
+ "tuples": [
+ [
+ {
+ "kind": "LITERAL",
+ "value": "1",
+ "type": "INT NOT NULL"
+ }
+ ],
+ [
+ {
+ "kind": "LITERAL",
+ "value": "2",
+ "type": "INT NOT NULL"
+ }
+ ],
+ [
+ {
+ "kind": "LITERAL",
+ "value": "3",
+ "type": "INT NOT NULL"
+ }
+ ]
+ ],
+ "outputType": "ROW<f0 INT NOT NULL>",
+ "description": "Values(tuples=[[{ 1 }, { 2 }, { 3 }]])",
+ "inputProperties": []
+ },
+ {
+ "id": 2,
+ "type": "stream-exec-sink_1",
+ "configuration": {
+ "table.exec.sink.keyed-shuffle": "AUTO",
+ "table.exec.sink.not-null-enforcer": "ERROR",
+ "table.exec.sink.type-length-enforcer": "IGNORE",
+ "table.exec.sink.upsert-materialize": "AUTO"
+ },
+ "dynamicTableSink": {
+ "table": {
+ "resolvedTable": {
+ "schema": {
+ "columns": [
+ {
+ "name": "f0",
+ "dataType": "INT NOT NULL"
+ }
+ ],
+ "watermarkSpecs": []
+ },
+ "partitionKeys": [],
+ "options": {
+ "connector": "blackhole"
+ }
+ }
+ }
+ },
+ "inputChangelogMode": [
+ "INSERT"
+ ],
+ "inputProperties": [
+ {
+ "requiredDistribution": {
+ "type": "UNKNOWN"
+ },
+ "damBehavior": "PIPELINED",
+ "priority": 0
+ }
+ ],
+ "outputType": "ROW<f0 INT NOT NULL>",
+ "description": "Sink(table=[anonymous_blackhole$1], fields=[f0])"
+ }
+ ],
+ "edges": [
+ {
+ "source": 1,
+ "target": 2,
+ "shuffle": {
+ "type": "FORWARD"
+ },
+ "shuffleMode": "PIPELINED"
+ }
+ ]
+}
diff --git a/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/CalcJsonPlanTest_jsonplan/testComplexCalc.out b/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/CalcJsonPlanTest_jsonplan/testComplexCalc.out
index 4edfe7963c3..f0f6d0f0248 100644
--- a/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/CalcJsonPlanTest_jsonplan/testComplexCalc.out
+++ b/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/CalcJsonPlanTest_jsonplan/testComplexCalc.out
@@ -207,7 +207,7 @@
"description" : "Calc(select=[a, CAST(a AS VARCHAR(2147483647)) AS a1, b, udf2(b, b, d) AS b1, udf3(c, b) AS c1, udf4(SUBSTRING(c, 1, 5)) AS c2, udf5(d, 1000) AS d1], where=[(((udf1(a) > 0) OR ((a * b) < 100)) AND (b > 10))])"
}, {
"id" : 3,
- "type" : "stream-exec-sink_1",
+ "type" : "stream-exec-sink_2",
"configuration" : {
"table.exec.sink.keyed-shuffle" : "AUTO",
"table.exec.sink.not-null-enforcer" : "ERROR",
diff --git a/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/CalcJsonPlanTest_jsonplan/testSarg.out b/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/CalcJsonPlanTest_jsonplan/testSarg.out
index f39a0d6b95d..ea0bb1775cc 100644
--- a/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/CalcJsonPlanTest_jsonplan/testSarg.out
+++ b/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/CalcJsonPlanTest_jsonplan/testSarg.out
@@ -101,7 +101,7 @@
"description" : "Calc(select=[a], where=[SEARCH(a, Sarg[1, 2; NULL AS TRUE])])"
}, {
"id" : 3,
- "type" : "stream-exec-sink_1",
+ "type" : "stream-exec-sink_2",
"configuration" : {
"table.exec.sink.keyed-shuffle" : "AUTO",
"table.exec.sink.not-null-enforcer" : "ERROR",
diff --git a/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/CalcJsonPlanTest_jsonplan/testSimpleFilter.out b/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/CalcJsonPlanTest_jsonplan/testSimpleFilter.out
index 781cef67ab5..ca4fa8b0e4d 100644
--- a/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/CalcJsonPlanTest_jsonplan/testSimpleFilter.out
+++ b/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/CalcJsonPlanTest_jsonplan/testSimpleFilter.out
@@ -84,7 +84,7 @@
"description" : "Calc(select=[a, b, c, d], where=[(b > 0)])"
}, {
"id" : 3,
- "type" : "stream-exec-sink_1",
+ "type" : "stream-exec-sink_2",
"configuration" : {
"table.exec.sink.keyed-shuffle" : "AUTO",
"table.exec.sink.not-null-enforcer" : "ERROR",
diff --git a/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/CalcJsonPlanTest_jsonplan/testSimpleProject.out b/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/CalcJsonPlanTest_jsonplan/testSimpleProject.out
index 13806b710dc..bc451cec91f 100644
--- a/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/CalcJsonPlanTest_jsonplan/testSimpleProject.out
+++ b/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/CalcJsonPlanTest_jsonplan/testSimpleProject.out
@@ -45,7 +45,7 @@
"inputProperties" : [ ]
}, {
"id" : 2,
- "type" : "stream-exec-sink_1",
+ "type" : "stream-exec-sink_2",
"configuration" : {
"table.exec.sink.keyed-shuffle" : "AUTO",
"table.exec.sink.not-null-enforcer" : "ERROR",
diff --git a/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/ChangelogSourceJsonPlanTest_jsonplan/testChangelogSource.out b/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/ChangelogSourceJsonPlanTest_jsonplan/testChangelogSource.out
index 46c9b032843..88c5d0ee83c 100644
--- a/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/ChangelogSourceJsonPlanTest_jsonplan/testChangelogSource.out
+++ b/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/ChangelogSourceJsonPlanTest_jsonplan/testChangelogSource.out
@@ -76,13 +76,18 @@
"description" : "Exchange(distribution=[hash[a, b]])"
}, {
"id" : 4,
- "type" : "stream-exec-changelog-normalize_1",
+ "type" : "stream-exec-changelog-normalize_2",
"configuration" : {
"table.exec.mini-batch.enabled" : "false",
"table.exec.mini-batch.size" : "-1"
},
"uniqueKeys" : [ 0, 1 ],
"generateUpdateBefore" : true,
+ "state" : [ {
+ "index" : 0,
+ "ttl" : "0 ms",
+ "name" : "changelogNormalizeState"
+ } ],
"inputProperties" : [ {
"requiredDistribution" : {
"type" : "UNKNOWN"
@@ -94,7 +99,7 @@
"description" : "ChangelogNormalize(key=[a, b])"
}, {
"id" : 5,
- "type" : "stream-exec-sink_1",
+ "type" : "stream-exec-sink_2",
"configuration" : {
"table.exec.sink.keyed-shuffle" : "AUTO",
"table.exec.sink.not-null-enforcer" : "ERROR",
@@ -125,6 +130,7 @@
}
},
"inputChangelogMode" : [ "INSERT", "UPDATE_BEFORE", "UPDATE_AFTER", "DELETE" ],
+ "inputUpsertKey" : [ 0, 1 ],
"inputProperties" : [ {
"requiredDistribution" : {
"type" : "UNKNOWN"
@@ -133,7 +139,6 @@
"priority" : 0
} ],
"outputType" : "ROW<`a` BIGINT NOT NULL, `b` INT NOT NULL>",
- "inputUpsertKey" : [ 0, 1 ],
"description" : "Sink(table=[default_catalog.default_database.MySink], fields=[a, b])"
} ],
"edges" : [ {
diff --git a/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/ChangelogSourceJsonPlanTest_jsonplan/testUpsertSource.out b/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/ChangelogSourceJsonPlanTest_jsonplan/testUpsertSource.out
index e29a2507619..1136e2c57e9 100644
--- a/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/ChangelogSourceJsonPlanTest_jsonplan/testUpsertSource.out
+++ b/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/ChangelogSourceJsonPlanTest_jsonplan/testUpsertSource.out
@@ -64,13 +64,18 @@
"description" : "Exchange(distribution=[hash[a, b]])"
}, {
"id" : 3,
- "type" : "stream-exec-changelog-normalize_1",
+ "type" : "stream-exec-changelog-normalize_2",
"configuration" : {
"table.exec.mini-batch.enabled" : "false",
"table.exec.mini-batch.size" : "-1"
},
"uniqueKeys" : [ 0, 1 ],
"generateUpdateBefore" : true,
+ "state" : [ {
+ "index" : 0,
+ "ttl" : "0 ms",
+ "name" : "changelogNormalizeState"
+ } ],
"inputProperties" : [ {
"requiredDistribution" : {
"type" : "UNKNOWN"
@@ -82,7 +87,7 @@
"description" : "ChangelogNormalize(key=[a, b])"
}, {
"id" : 4,
- "type" : "stream-exec-sink_1",
+ "type" : "stream-exec-sink_2",
"configuration" : {
"table.exec.sink.keyed-shuffle" : "AUTO",
"table.exec.sink.not-null-enforcer" : "ERROR",
@@ -113,6 +118,7 @@
}
},
"inputChangelogMode" : [ "INSERT", "UPDATE_BEFORE", "UPDATE_AFTER", "DELETE" ],
+ "inputUpsertKey" : [ 0, 1 ],
"inputProperties" : [ {
"requiredDistribution" : {
"type" : "UNKNOWN"
@@ -121,7 +127,6 @@
"priority" : 0
} ],
"outputType" : "ROW<`a` BIGINT NOT NULL, `b` INT NOT NULL>",
- "inputUpsertKey" : [ 0, 1 ],
"description" : "Sink(table=[default_catalog.default_database.MySink], fields=[a, b])"
} ],
"edges" : [ {
diff --git a/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/CorrelateJsonPlanTest_jsonplan/testCrossJoin.out b/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/CorrelateJsonPlanTest_jsonplan/testCrossJoin.out
index 89307808f00..932b1f91221 100644
--- a/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/CorrelateJsonPlanTest_jsonplan/testCrossJoin.out
+++ b/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/CorrelateJsonPlanTest_jsonplan/testCrossJoin.out
@@ -86,7 +86,7 @@
"description" : "Calc(select=[c, EXPR$0 AS s])"
}, {
"id" : 4,
- "type" : "stream-exec-sink_1",
+ "type" : "stream-exec-sink_2",
"configuration" : {
"table.exec.sink.keyed-shuffle" : "AUTO",
"table.exec.sink.not-null-enforcer" : "ERROR",
diff --git a/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/CorrelateJsonPlanTest_jsonplan/testCrossJoinOverrideParameters.out b/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/CorrelateJsonPlanTest_jsonplan/testCrossJoinOverrideParameters.out
index 9e69b436938..6eb276e6473 100644
--- a/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/CorrelateJsonPlanTest_jsonplan/testCrossJoinOverrideParameters.out
+++ b/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/CorrelateJsonPlanTest_jsonplan/testCrossJoinOverrideParameters.out
@@ -90,7 +90,7 @@
"description" : "Calc(select=[c, EXPR$0 AS s])"
}, {
"id" : 4,
- "type" : "stream-exec-sink_1",
+ "type" : "stream-exec-sink_2",
"configuration" : {
"table.exec.sink.keyed-shuffle" : "AUTO",
"table.exec.sink.not-null-enforcer" : "ERROR",
diff --git a/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/CorrelateJsonPlanTest_jsonplan/testJoinWithFilter.out b/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/CorrelateJsonPlanTest_jsonplan/testJoinWithFilter.out
index 033efb8ede0..2c76b235607 100644
--- a/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/CorrelateJsonPlanTest_jsonplan/testJoinWithFilter.out
+++ b/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/CorrelateJsonPlanTest_jsonplan/testJoinWithFilter.out
@@ -100,7 +100,7 @@
"description" : "Calc(select=[c, EXPR$0], where=[(c = EXPR$0)])"
}, {
"id" : 4,
- "type" : "stream-exec-sink_1",
+ "type" : "stream-exec-sink_2",
"configuration" : {
"table.exec.sink.keyed-shuffle" : "AUTO",
"table.exec.sink.not-null-enforcer" : "ERROR",
diff --git a/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/CorrelateJsonPlanTest_jsonplan/testLeftOuterJoinWithLiteralTrue.out b/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/CorrelateJsonPlanTest_jsonplan/testLeftOuterJoinWithLiteralTrue.out
index 7c3ebe89595..6dc176e201e 100644
--- a/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/CorrelateJsonPlanTest_jsonplan/testLeftOuterJoinWithLiteralTrue.out
+++ b/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/CorrelateJsonPlanTest_jsonplan/testLeftOuterJoinWithLiteralTrue.out
@@ -86,7 +86,7 @@
"description" : "Calc(select=[c, EXPR$0 AS s])"
}, {
"id" : 4,
- "type" : "stream-exec-sink_1",
+ "type" : "stream-exec-sink_2",
"configuration" : {
"table.exec.sink.keyed-shuffle" : "AUTO",
"table.exec.sink.not-null-enforcer" : "ERROR",
diff --git a/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/DeduplicationJsonPlanTest_jsonplan/testDeduplication.out b/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/DeduplicationJsonPlanTest_jsonplan/testDeduplication.out
index 0c219aae929..e17cf5d7e35 100644
--- a/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/DeduplicationJsonPlanTest_jsonplan/testDeduplication.out
+++ b/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/DeduplicationJsonPlanTest_jsonplan/testDeduplication.out
@@ -153,7 +153,7 @@
"description" : "Exchange(distribution=[hash[product]])"
}, {
"id" : 4,
- "type" : "stream-exec-deduplicate_1",
+ "type" : "stream-exec-deduplicate_2",
"configuration" : {
"table.exec.deduplicate.insert-update-after-sensitive-enabled" : "true",
"table.exec.deduplicate.mini-batch.compact-changes-enabled" : "false",
@@ -164,6 +164,11 @@
"isRowtime" : false,
"keepLastRow" : false,
"generateUpdateBefore" : false,
+ "state" : [ {
+ "index" : 0,
+ "ttl" : "0 ms",
+ "name" : "deduplicateState"
+ } ],
"inputProperties" : [ {
"requiredDistribution" : {
"type" : "UNKNOWN"
@@ -228,7 +233,7 @@
"description" : "Calc(select=[order_id, user, product, order_time])"
}, {
"id" : 6,
- "type" : "stream-exec-sink_1",
+ "type" : "stream-exec-sink_2",
"configuration" : {
"table.exec.sink.keyed-shuffle" : "AUTO",
"table.exec.sink.not-null-enforcer" : "ERROR",
@@ -264,6 +269,7 @@
}
},
"inputChangelogMode" : [ "INSERT" ],
+ "inputUpsertKey" : [ 2 ],
"inputProperties" : [ {
"requiredDistribution" : {
"type" : "UNKNOWN"
@@ -272,7 +278,6 @@
"priority" : 0
} ],
"outputType" : "ROW<`order_id` BIGINT, `user` VARCHAR(2147483647), `product` VARCHAR(2147483647), `order_time` TIMESTAMP(3)>",
- "inputUpsertKey" : [ 2 ],
"description" : "Sink(table=[default_catalog.default_database.sink], fields=[order_id, user, product, order_time])"
} ],
"edges" : [ {
diff --git a/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/ExpandJsonPlanTest_jsonplan/testExpand.out b/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/ExpandJsonPlanTest_jsonplan/testExpand.out
index c764125a8e2..7eb7ed7581f 100644
--- a/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/ExpandJsonPlanTest_jsonplan/testExpand.out
+++ b/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/ExpandJsonPlanTest_jsonplan/testExpand.out
@@ -231,7 +231,7 @@
"description" : "Exchange(distribution=[hash[a, $f3, $f4]])"
}, {
"id" : 6,
- "type" : "stream-exec-group-aggregate_1",
+ "type" : "stream-exec-group-aggregate_2",
"configuration" : {
"table.exec.mini-batch.enabled" : "false",
"table.exec.mini-batch.size" : "-1"
@@ -260,6 +260,11 @@
"aggCallNeedRetractions" : [ false, false ],
"generateUpdateBefore" : true,
"needRetraction" : false,
+ "state" : [ {
+ "index" : 0,
+ "ttl" : "0 ms",
+ "name" : "groupAggregateState"
+ } ],
"inputProperties" : [ {
"requiredDistribution" : {
"type" : "UNKNOWN"
@@ -284,7 +289,7 @@
"description" : "Exchange(distribution=[hash[a]])"
}, {
"id" : 8,
- "type" : "stream-exec-group-aggregate_1",
+ "type" : "stream-exec-group-aggregate_2",
"configuration" : {
"table.exec.mini-batch.enabled" : "false",
"table.exec.mini-batch.size" : "-1"
@@ -312,6 +317,11 @@
"aggCallNeedRetractions" : [ true, true ],
"generateUpdateBefore" : true,
"needRetraction" : true,
+ "state" : [ {
+ "index" : 0,
+ "ttl" : "0 ms",
+ "name" : "groupAggregateState"
+ } ],
"inputProperties" : [ {
"requiredDistribution" : {
"type" : "UNKNOWN"
@@ -323,7 +333,7 @@
"description" : "GroupAggregate(groupBy=[a], partialFinalType=[FINAL], select=[a, $SUM0_RETRACT($f3_0) AS $f1, FIRST_VALUE_RETRACT($f4_0) AS $f2])"
}, {
"id" : 9,
- "type" : "stream-exec-sink_1",
+ "type" : "stream-exec-sink_2",
"configuration" : {
"table.exec.sink.keyed-shuffle" : "AUTO",
"table.exec.sink.not-null-enforcer" : "ERROR",
@@ -357,6 +367,7 @@
}
},
"inputChangelogMode" : [ "INSERT", "UPDATE_BEFORE", "UPDATE_AFTER", "DELETE" ],
+ "inputUpsertKey" : [ 0 ],
"inputProperties" : [ {
"requiredDistribution" : {
"type" : "UNKNOWN"
@@ -365,7 +376,6 @@
"priority" : 0
} ],
"outputType" : "ROW<`a` BIGINT, `$f1` BIGINT NOT NULL, `$f2` VARCHAR(2147483647)>",
- "inputUpsertKey" : [ 0 ],
"description" : "Sink(table=[default_catalog.default_database.MySink], fields=[a, $f1, $f2])"
} ],
"edges" : [ {
diff --git a/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/GroupAggregateJsonPlanTest_jsonplan/testDistinctAggCalls[isMiniBatchEnabled=false].out b/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/GroupAggregateJsonPlanTest_jsonplan/testDistinctAggCalls[isMiniBatchEnabled=false].out
index 0b48cdf32cb..211f70c3f4e 100644
--- a/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/GroupAggregateJsonPlanTest_jsonplan/testDistinctAggCalls[isMiniBatchEnabled=false].out
+++ b/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/GroupAggregateJsonPlanTest_jsonplan/testDistinctAggCalls[isMiniBatchEnabled=false].out
@@ -93,7 +93,7 @@
"description" : "Exchange(distribution=[hash[d]])"
}, {
"id" : 4,
- "type" : "stream-exec-group-aggregate_1",
+ "type" : "stream-exec-group-aggregate_2",
"configuration" : {
"table.exec.mini-batch.enabled" : "false",
"table.exec.mini-batch.size" : "-1"
@@ -160,6 +160,11 @@
"aggCallNeedRetractions" : [ false, false, false, false, false, false ],
"generateUpdateBefore" : true,
"needRetraction" : false,
+ "state" : [ {
+ "index" : 0,
+ "ttl" : "0 ms",
+ "name" : "groupAggregateState"
+ } ],
"inputProperties" : [ {
"requiredDistribution" : {
"type" : "UNKNOWN"
@@ -243,7 +248,7 @@
"description" : "Calc(select=[d, CAST(cnt_a1 AS BIGINT) AS cnt_a1, CAST(cnt_a2 AS BIGINT) AS cnt_a2, sum_a, CAST(sum_b AS INTEGER) AS sum_b, CAST(avg_b AS DOUBLE) AS avg_b, CAST(cnt_d AS BIGINT) AS cnt_c])"
}, {
"id" : 6,
- "type" : "stream-exec-sink_1",
+ "type" : "stream-exec-sink_2",
"configuration" : {
"table.exec.sink.keyed-shuffle" : "AUTO",
"table.exec.sink.not-null-enforcer" : "ERROR",
@@ -289,6 +294,7 @@
}
},
"inputChangelogMode" : [ "INSERT", "UPDATE_BEFORE", "UPDATE_AFTER" ],
+ "inputUpsertKey" : [ 0 ],
"inputProperties" : [ {
"requiredDistribution" : {
"type" : "UNKNOWN"
@@ -297,7 +303,6 @@
"priority" : 0
} ],
"outputType" : "ROW<`d` BIGINT, `cnt_a1` BIGINT, `cnt_a2` BIGINT, `sum_a` BIGINT, `sum_b` INT, `avg_b` DOUBLE, `cnt_c` BIGINT>",
- "inputUpsertKey" : [ 0 ],
"description" : "Sink(table=[default_catalog.default_database.MySink], fields=[d, cnt_a1, cnt_a2, sum_a, sum_b, avg_b, cnt_c])"
} ],
"edges" : [ {
diff --git a/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/GroupAggregateJsonPlanTest_jsonplan/testDistinctAggCalls[isMiniBatchEnabled=true].out b/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/GroupAggregateJsonPlanTest_jsonplan/testDistinctAggCalls[isMiniBatchEnabled=true].out
index d9ea30c54cd..5734da3a824 100644
--- a/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/GroupAggregateJsonPlanTest_jsonplan/testDistinctAggCalls[isMiniBatchEnabled=true].out
+++ b/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/GroupAggregateJsonPlanTest_jsonplan/testDistinctAggCalls[isMiniBatchEnabled=true].out
@@ -340,7 +340,7 @@
"description" : "Exchange(distribution=[hash[d]])"
}, {
"id" : 6,
- "type" : "stream-exec-global-group-aggregate_1",
+ "type" : "stream-exec-global-group-aggregate_2",
"configuration" : {
"table.exec.mini-batch.enabled" : "true",
"table.exec.mini-batch.size" : "5"
@@ -408,6 +408,11 @@
"localAggInputRowType" : "ROW<`d` BIGINT, `a` BIGINT, `$f2` BOOLEAN NOT NULL, `b` INT NOT NULL, `c` VARCHAR(2147483647)>",
"generateUpdateBefore" : true,
"needRetraction" : false,
+ "state" : [ {
+ "index" : 0,
+ "ttl" : "0 ms",
+ "name" : "globalGroupAggregateState"
+ } ],
"inputProperties" : [ {
"requiredDistribution" : {
"type" : "UNKNOWN"
@@ -491,7 +496,7 @@
"description" : "Calc(select=[d, CAST(cnt_a1 AS BIGINT) AS cnt_a1, CAST(cnt_a2 AS BIGINT) AS cnt_a2, sum_a, CAST(sum_b AS INTEGER) AS sum_b, CAST(avg_b AS DOUBLE) AS avg_b, CAST(cnt_d AS BIGINT) AS cnt_c])"
}, {
"id" : 8,
- "type" : "stream-exec-sink_1",
+ "type" : "stream-exec-sink_2",
"configuration" : {
"table.exec.sink.keyed-shuffle" : "AUTO",
"table.exec.sink.not-null-enforcer" : "ERROR",
@@ -537,6 +542,7 @@
}
},
"inputChangelogMode" : [ "INSERT", "UPDATE_BEFORE", "UPDATE_AFTER" ],
+ "inputUpsertKey" : [ 0 ],
"inputProperties" : [ {
"requiredDistribution" : {
"type" : "UNKNOWN"
@@ -545,7 +551,6 @@
"priority" : 0
} ],
"outputType" : "ROW<`d` BIGINT, `cnt_a1` BIGINT, `cnt_a2` BIGINT, `sum_a` BIGINT, `sum_b` INT, `avg_b` DOUBLE, `cnt_c` BIGINT>",
- "inputUpsertKey" : [ 0 ],
"description" : "Sink(table=[default_catalog.default_database.MySink], fields=[d, cnt_a1, cnt_a2, sum_a, sum_b, avg_b, cnt_c])"
} ],
"edges" : [ {
diff --git a/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/GroupAggregateJsonPlanTest_jsonplan/testSimpleAggCallsWithGroupBy[isMiniBatchEnabled=false].out b/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/GroupAggregateJsonPlanTest_jsonplan/testSimpleAggCallsWithGroupBy[isMiniBatchEnabled=false].out
index d0194c21577..44d2268c0d2 100644
--- a/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/GroupAggregateJsonPlanTest_jsonplan/testSimpleAggCallsWithGroupBy[isMiniBatchEnabled=false].out
+++ b/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/GroupAggregateJsonPlanTest_jsonplan/testSimpleAggCallsWithGroupBy[isMiniBatchEnabled=false].out
@@ -98,7 +98,7 @@
"description" : "Exchange(distribution=[hash[b]])"
}, {
"id" : 4,
- "type" : "stream-exec-group-aggregate_1",
+ "type" : "stream-exec-group-aggregate_2",
"configuration" : {
"table.exec.mini-batch.enabled" : "false",
"table.exec.mini-batch.size" : "-1"
@@ -136,6 +136,11 @@
"aggCallNeedRetractions" : [ false, false, false ],
"generateUpdateBefore" : true,
"needRetraction" : false,
+ "state" : [ {
+ "index" : 0,
+ "ttl" : "0 ms",
+ "name" : "groupAggregateState"
+ } ],
"inputProperties" : [ {
"requiredDistribution" : {
"type" : "UNKNOWN"
@@ -195,7 +200,7 @@
"description" : "Calc(select=[CAST(b AS BIGINT) AS b, CAST(cnt_a AS BIGINT) AS cnt_a, CAST(max_b AS BIGINT) AS max_b, min_c])"
}, {
"id" : 6,
- "type" : "stream-exec-sink_1",
+ "type" : "stream-exec-sink_2",
"configuration" : {
"table.exec.sink.keyed-shuffle" : "AUTO",
"table.exec.sink.not-null-enforcer" : "ERROR",
@@ -232,6 +237,7 @@
}
},
"inputChangelogMode" : [ "INSERT", "UPDATE_BEFORE", "UPDATE_AFTER" ],
+ "inputUpsertKey" : [ 0 ],
"inputProperties" : [ {
"requiredDistribution" : {
"type" : "UNKNOWN"
@@ -240,7 +246,6 @@
"priority" : 0
} ],
"outputType" : "ROW<`b` BIGINT, `cnt_a` BIGINT, `max_b` BIGINT, `min_c` VARCHAR(2147483647)>",
- "inputUpsertKey" : [ 0 ],
"description" : "Sink(table=[default_catalog.default_database.MySink], fields=[b, cnt_a, max_b, min_c])"
} ],
"edges" : [ {
diff --git a/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/GroupAggregateJsonPlanTest_jsonplan/testSimpleAggCallsWithGroupBy[isMiniBatchEnabled=true].out b/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/GroupAggregateJsonPlanTest_jsonplan/testSimpleAggCallsWithGroupBy[isMiniBatchEnabled=true].out
index 16b72f28c46..841ba6a48ab 100644
--- a/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/GroupAggregateJsonPlanTest_jsonplan/testSimpleAggCallsWithGroupBy[isMiniBatchEnabled=true].out
+++ b/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/GroupAggregateJsonPlanTest_jsonplan/testSimpleAggCallsWithGroupBy[isMiniBatchEnabled=true].out
@@ -162,7 +162,7 @@
"description" : "Exchange(distribution=[hash[b]])"
}, {
"id" : 6,
- "type" : "stream-exec-global-group-aggregate_1",
+ "type" : "stream-exec-global-group-aggregate_2",
"configuration" : {
"table.exec.mini-batch.enabled" : "true",
"table.exec.mini-batch.size" : "5"
@@ -201,6 +201,11 @@
"localAggInputRowType" : "ROW<`b` INT NOT NULL, `a` BIGINT, `$f2` BOOLEAN NOT NULL, `c` VARCHAR(2147483647)>",
"generateUpdateBefore" : true,
"needRetraction" : false,
+ "state" : [ {
+ "index" : 0,
+ "ttl" : "0 ms",
+ "name" : "globalGroupAggregateState"
+ } ],
"inputProperties" : [ {
"requiredDistribution" : {
"type" : "UNKNOWN"
@@ -260,7 +265,7 @@
"description" : "Calc(select=[CAST(b AS BIGINT) AS b, CAST(cnt_a AS BIGINT) AS cnt_a, CAST(max_b AS BIGINT) AS max_b, min_c])"
}, {
"id" : 8,
- "type" : "stream-exec-sink_1",
+ "type" : "stream-exec-sink_2",
"configuration" : {
"table.exec.sink.keyed-shuffle" : "AUTO",
"table.exec.sink.not-null-enforcer" : "ERROR",
@@ -297,6 +302,7 @@
}
},
"inputChangelogMode" : [ "INSERT", "UPDATE_BEFORE", "UPDATE_AFTER" ],
+ "inputUpsertKey" : [ 0 ],
"inputProperties" : [ {
"requiredDistribution" : {
"type" : "UNKNOWN"
@@ -305,7 +311,6 @@
"priority" : 0
} ],
"outputType" : "ROW<`b` BIGINT, `cnt_a` BIGINT, `max_b` BIGINT, `min_c` VARCHAR(2147483647)>",
- "inputUpsertKey" : [ 0 ],
"description" : "Sink(table=[default_catalog.default_database.MySink], fields=[b, cnt_a, max_b, min_c])"
} ],
"edges" : [ {
diff --git a/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/GroupAggregateJsonPlanTest_jsonplan/testSimpleAggWithoutGroupBy[isMiniBatchEnabled=false].out b/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/GroupAggregateJsonPlanTest_jsonplan/testSimpleAggWithoutGroupBy[isMiniBatchEnabled=false].out
index 99ec25cd936..e196ffb67e7 100644
--- a/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/GroupAggregateJsonPlanTest_jsonplan/testSimpleAggWithoutGroupBy[isMiniBatchEnabled=false].out
+++ b/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/GroupAggregateJsonPlanTest_jsonplan/testSimpleAggWithoutGroupBy[isMiniBatchEnabled=false].out
@@ -103,7 +103,7 @@
"description" : "Exchange(distribution=[single])"
}, {
"id" : 4,
- "type" : "stream-exec-group-aggregate_1",
+ "type" : "stream-exec-group-aggregate_2",
"configuration" : {
"table.exec.mini-batch.enabled" : "false",
"table.exec.mini-batch.size" : "-1"
@@ -150,6 +150,11 @@
"aggCallNeedRetractions" : [ false, false, false, false ],
"generateUpdateBefore" : true,
"needRetraction" : false,
+ "state" : [ {
+ "index" : 0,
+ "ttl" : "0 ms",
+ "name" : "groupAggregateState"
+ } ],
"inputProperties" : [ {
"requiredDistribution" : {
"type" : "UNKNOWN"
@@ -219,7 +224,7 @@
"description" : "Calc(select=[CAST(avg_a AS DOUBLE) AS avg_a, CAST(cnt AS BIGINT) AS cnt, CAST(cnt AS BIGINT) AS cnt_b, CAST(min_b AS BIGINT) AS min_b, max_c])"
}, {
"id" : 6,
- "type" : "stream-exec-sink_1",
+ "type" : "stream-exec-sink_2",
"configuration" : {
"table.exec.sink.keyed-shuffle" : "AUTO",
"table.exec.sink.not-null-enforcer" : "ERROR",
diff --git a/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/GroupAggregateJsonPlanTest_jsonplan/testSimpleAggWithoutGroupBy[isMiniBatchEnabled=true].out b/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/GroupAggregateJsonPlanTest_jsonplan/testSimpleAggWithoutGroupBy[isMiniBatchEnabled=true].out
index 17d677399cf..ae550f8c164 100644
--- a/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/GroupAggregateJsonPlanTest_jsonplan/testSimpleAggWithoutGroupBy[isMiniBatchEnabled=true].out
+++ b/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/GroupAggregateJsonPlanTest_jsonplan/testSimpleAggWithoutGroupBy[isMiniBatchEnabled=true].out
@@ -176,7 +176,7 @@
"description" : "Exchange(distribution=[single])"
}, {
"id" : 6,
- "type" : "stream-exec-global-group-aggregate_1",
+ "type" : "stream-exec-global-group-aggregate_2",
"configuration" : {
"table.exec.mini-batch.enabled" : "true",
"table.exec.mini-batch.size" : "5"
@@ -224,6 +224,11 @@
"localAggInputRowType" : "ROW<`a` BIGINT, `b` INT NOT NULL, `c` VARCHAR(2147483647), `$f3` BOOLEAN NOT NULL>",
"generateUpdateBefore" : true,
"needRetraction" : false,
+ "state" : [ {
+ "index" : 0,
+ "ttl" : "0 ms",
+ "name" : "globalGroupAggregateState"
+ } ],
"inputProperties" : [ {
"requiredDistribution" : {
"type" : "UNKNOWN"
@@ -293,7 +298,7 @@
"description" : "Calc(select=[CAST(avg_a AS DOUBLE) AS avg_a, CAST(cnt AS BIGINT) AS cnt, CAST(cnt AS BIGINT) AS cnt_b, CAST(min_b AS BIGINT) AS min_b, max_c])"
}, {
"id" : 8,
- "type" : "stream-exec-sink_1",
+ "type" : "stream-exec-sink_2",
"configuration" : {
"table.exec.sink.keyed-shuffle" : "AUTO",
"table.exec.sink.not-null-enforcer" : "ERROR",
diff --git a/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/GroupAggregateJsonPlanTest_jsonplan/testUserDefinedAggCalls[isMiniBatchEnabled=false].out b/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/GroupAggregateJsonPlanTest_jsonplan/testUserDefinedAggCalls[isMiniBatchEnabled=false].out
index 1fb96ffad72..baeafdb02a0 100644
--- a/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/GroupAggregateJsonPlanTest_jsonplan/testUserDefinedAggCalls[isMiniBatchEnabled=false].out
+++ b/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/GroupAggregateJsonPlanTest_jsonplan/testUserDefinedAggCalls[isMiniBatchEnabled=false].out
@@ -87,7 +87,7 @@
"description" : "Exchange(distribution=[hash[b]])"
}, {
"id" : 4,
- "type" : "stream-exec-group-aggregate_1",
+ "type" : "stream-exec-group-aggregate_2",
"configuration" : {
"table.exec.mini-batch.enabled" : "false",
"table.exec.mini-batch.size" : "-1"
@@ -134,6 +134,11 @@
"aggCallNeedRetractions" : [ false, false, false, false ],
"generateUpdateBefore" : true,
"needRetraction" : false,
+ "state" : [ {
+ "index" : 0,
+ "ttl" : "0 ms",
+ "name" : "groupAggregateState"
+ } ],
"inputProperties" : [ {
"requiredDistribution" : {
"type" : "UNKNOWN"
@@ -185,7 +190,7 @@
"description" : "Calc(select=[CAST(b AS BIGINT) AS b, a1, a2, a3, c1])"
}, {
"id" : 6,
- "type" : "stream-exec-sink_1",
+ "type" : "stream-exec-sink_2",
"configuration" : {
"table.exec.sink.keyed-shuffle" : "AUTO",
"table.exec.sink.not-null-enforcer" : "ERROR",
@@ -225,6 +230,7 @@
}
},
"inputChangelogMode" : [ "INSERT", "UPDATE_BEFORE", "UPDATE_AFTER" ],
+ "inputUpsertKey" : [ 0 ],
"inputProperties" : [ {
"requiredDistribution" : {
"type" : "UNKNOWN"
@@ -233,7 +239,6 @@
"priority" : 0
} ],
"outputType" : "ROW<`b` BIGINT, `a1` BIGINT, `a2` BIGINT, `a3` BIGINT, `c1` BIGINT>",
- "inputUpsertKey" : [ 0 ],
"description" : "Sink(table=[default_catalog.default_database.MySink], fields=[b, a1, a2, a3, c1])"
} ],
"edges" : [ {
diff --git a/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/GroupAggregateJsonPlanTest_jsonplan/testUserDefinedAggCalls[isMiniBatchEnabled=true].out b/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/GroupAggregateJsonPlanTest_jsonplan/testUserDefinedAggCalls[isMiniBatchEnabled=true].out
index 9a3a2629d58..27ebd618e83 100644
--- a/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/GroupAggregateJsonPlanTest_jsonplan/testUserDefinedAggCalls[isMiniBatchEnabled=true].out
+++ b/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/GroupAggregateJsonPlanTest_jsonplan/testUserDefinedAggCalls[isMiniBatchEnabled=true].out
@@ -103,7 +103,7 @@
"description" : "Exchange(distribution=[hash[b]])"
}, {
"id" : 5,
- "type" : "stream-exec-group-aggregate_1",
+ "type" : "stream-exec-group-aggregate_2",
"configuration" : {
"table.exec.mini-batch.enabled" : "true",
"table.exec.mini-batch.size" : "5"
@@ -150,6 +150,11 @@
"aggCallNeedRetractions" : [ false, false, false, false ],
"generateUpdateBefore" : true,
"needRetraction" : false,
+ "state" : [ {
+ "index" : 0,
+ "ttl" : "0 ms",
+ "name" : "groupAggregateState"
+ } ],
"inputProperties" : [ {
"requiredDistribution" : {
"type" : "UNKNOWN"
@@ -201,7 +206,7 @@
"description" : "Calc(select=[CAST(b AS BIGINT) AS b, a1, a2, a3, c1])"
}, {
"id" : 7,
- "type" : "stream-exec-sink_1",
+ "type" : "stream-exec-sink_2",
"configuration" : {
"table.exec.sink.keyed-shuffle" : "AUTO",
"table.exec.sink.not-null-enforcer" : "ERROR",
@@ -241,6 +246,7 @@
}
},
"inputChangelogMode" : [ "INSERT", "UPDATE_BEFORE", "UPDATE_AFTER" ],
+ "inputUpsertKey" : [ 0 ],
"inputProperties" : [ {
"requiredDistribution" : {
"type" : "UNKNOWN"
@@ -249,7 +255,6 @@
"priority" : 0
} ],
"outputType" : "ROW<`b` BIGINT, `a1` BIGINT, `a2` BIGINT, `a3` BIGINT, `c1` BIGINT>",
- "inputUpsertKey" : [ 0 ],
"description" : "Sink(table=[default_catalog.default_database.MySink], fields=[b, a1, a2, a3, c1])"
} ],
"edges" : [ {
diff --git a/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/GroupWindowAggregateJsonPlanTest_jsonplan/testEventTimeHopWindow.out b/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/GroupWindowAggregateJsonPlanTest_jsonplan/testEventTimeHopWindow.out
index ab0ae9d1088..b70e2786a66 100644
--- a/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/GroupWindowAggregateJsonPlanTest_jsonplan/testEventTimeHopWindow.out
+++ b/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/GroupWindowAggregateJsonPlanTest_jsonplan/testEventTimeHopWindow.out
@@ -263,7 +263,7 @@
"description" : "GroupWindowAggregate(groupBy=[b], window=[SlidingGroupWindow('w$, rowtime, 10000, 5000)], select=[b, COUNT(c) AS EXPR$1, SUM(a) AS EXPR$2])"
}, {
"id" : 6,
- "type" : "stream-exec-sink_1",
+ "type" : "stream-exec-sink_2",
"configuration" : {
"table.exec.sink.keyed-shuffle" : "AUTO",
"table.exec.sink.not-null-enforcer" : "ERROR",
diff --git a/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/GroupWindowAggregateJsonPlanTest_jsonplan/testEventTimeSessionWindow.out b/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/GroupWindowAggregateJsonPlanTest_jsonplan/testEventTimeSessionWindow.out
index 467b00f4df5..8773bc75359 100644
--- a/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/GroupWindowAggregateJsonPlanTest_jsonplan/testEventTimeSessionWindow.out
+++ b/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/GroupWindowAggregateJsonPlanTest_jsonplan/testEventTimeSessionWindow.out
@@ -261,7 +261,7 @@
"description" : "GroupWindowAggregate(groupBy=[b], window=[SessionGroupWindow('w$, rowtime, 10000)], select=[b, COUNT(c) AS EXPR$1, SUM(a) AS EXPR$2])"
}, {
"id" : 6,
- "type" : "stream-exec-sink_1",
+ "type" : "stream-exec-sink_2",
"configuration" : {
"table.exec.sink.keyed-shuffle" : "AUTO",
"table.exec.sink.not-null-enforcer" : "ERROR",
diff --git a/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/GroupWindowAggregateJsonPlanTest_jsonplan/testEventTimeTumbleWindow.out b/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/GroupWindowAggregateJsonPlanTest_jsonplan/testEventTimeTumbleWindow.out
index ab47bb954c1..718329a599b 100644
--- a/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/GroupWindowAggregateJsonPlanTest_jsonplan/testEventTimeTumbleWindow.out
+++ b/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/GroupWindowAggregateJsonPlanTest_jsonplan/testEventTimeTumbleWindow.out
@@ -414,7 +414,7 @@
"description" : "Calc(select=[b, w$start AS window_start, w$end AS window_end, EXPR$3, EXPR$4, EXPR$5, EXPR$6])"
}, {
"id" : 7,
- "type" : "stream-exec-sink_1",
+ "type" : "stream-exec-sink_2",
"configuration" : {
"table.exec.sink.keyed-shuffle" : "AUTO",
"table.exec.sink.not-null-enforcer" : "ERROR",
@@ -458,6 +458,7 @@
}
},
"inputChangelogMode" : [ "INSERT" ],
+ "inputUpsertKey" : [ 0, 1 ],
"inputProperties" : [ {
"requiredDistribution" : {
"type" : "UNKNOWN"
@@ -466,7 +467,6 @@
"priority" : 0
} ],
"outputType" : "ROW<`b` BIGINT, `window_start` TIMESTAMP(3) NOT NULL, `window_end` TIMESTAMP(3) NOT NULL, `EXPR$3` BIGINT NOT NULL, `EXPR$4` INT, `EXPR$5` BIGINT NOT NULL, `EXPR$6` VARCHAR(2147483647)>",
- "inputUpsertKey" : [ 0, 1 ],
"description" : "Sink(table=[default_catalog.default_database.MySink], fields=[b, window_start, window_end, EXPR$3, EXPR$4, EXPR$5, EXPR$6])"
} ],
"edges" : [ {
diff --git a/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/GroupWindowAggregateJsonPlanTest_jsonplan/testProcTimeHopWindow.out b/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/GroupWindowAggregateJsonPlanTest_jsonplan/testProcTimeHopWindow.out
index 68ecda4bd6e..d6c0df4b751 100644
--- a/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/GroupWindowAggregateJsonPlanTest_jsonplan/testProcTimeHopWindow.out
+++ b/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/GroupWindowAggregateJsonPlanTest_jsonplan/testProcTimeHopWindow.out
@@ -342,7 +342,7 @@
"description" : "GroupWindowAggregate(groupBy=[b], window=[SlidingGroupWindow('w$, proctime, 600000, 300000)], select=[b, SUM(a) AS EXPR$1])"
}, {
"id" : 7,
- "type" : "stream-exec-sink_1",
+ "type" : "stream-exec-sink_2",
"configuration" : {
"table.exec.sink.keyed-shuffle" : "AUTO",
"table.exec.sink.not-null-enforcer" : "ERROR",
diff --git a/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/GroupWindowAggregateJsonPlanTest_jsonplan/testProcTimeSessionWindow.out b/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/GroupWindowAggregateJsonPlanTest_jsonplan/testProcTimeSessionWindow.out
index e07c84acb30..993ff6a62ae 100644
--- a/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/GroupWindowAggregateJsonPlanTest_jsonplan/testProcTimeSessionWindow.out
+++ b/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/GroupWindowAggregateJsonPlanTest_jsonplan/testProcTimeSessionWindow.out
@@ -340,7 +340,7 @@
"description" : "GroupWindowAggregate(groupBy=[b], window=[SessionGroupWindow('w$, proctime, 600000)], select=[b, SUM(a) AS EXPR$1])"
}, {
"id" : 7,
- "type" : "stream-exec-sink_1",
+ "type" : "stream-exec-sink_2",
"configuration" : {
"table.exec.sink.keyed-shuffle" : "AUTO",
"table.exec.sink.not-null-enforcer" : "ERROR",
diff --git a/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/GroupWindowAggregateJsonPlanTest_jsonplan/testProcTimeTumbleWindow.out b/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/GroupWindowAggregateJsonPlanTest_jsonplan/testProcTimeTumbleWindow.out
index 52af443ff67..e3bd03a0aee 100644
--- a/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/GroupWindowAggregateJsonPlanTest_jsonplan/testProcTimeTumbleWindow.out
+++ b/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/GroupWindowAggregateJsonPlanTest_jsonplan/testProcTimeTumbleWindow.out
@@ -411,7 +411,7 @@
"description" : "Calc(select=[b, w$end AS window_end, EXPR$2])"
}, {
"id" : 8,
- "type" : "stream-exec-sink_1",
+ "type" : "stream-exec-sink_2",
"configuration" : {
"table.exec.sink.keyed-shuffle" : "AUTO",
"table.exec.sink.not-null-enforcer" : "ERROR",
@@ -443,6 +443,7 @@
}
},
"inputChangelogMode" : [ "INSERT" ],
+ "inputUpsertKey" : [ 0, 1 ],
"inputProperties" : [ {
"requiredDistribution" : {
"type" : "UNKNOWN"
@@ -451,7 +452,6 @@
"priority" : 0
} ],
"outputType" : "ROW<`b` BIGINT, `window_end` TIMESTAMP(3) NOT NULL, `EXPR$2` BIGINT NOT NULL>",
- "inputUpsertKey" : [ 0, 1 ],
"description" : "Sink(table=[default_catalog.default_database.MySink], fields=[b, window_end, EXPR$2])"
} ],
"edges" : [ {
diff --git a/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/IncrementalAggregateJsonPlanTest_jsonplan/testIncrementalAggregate.out b/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/IncrementalAggregateJsonPlanTest_jsonplan/testIncrementalAggregate.out
index a457f742d3d..c0a59cbed87 100644
--- a/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/IncrementalAggregateJsonPlanTest_jsonplan/testIncrementalAggregate.out
+++ b/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/IncrementalAggregateJsonPlanTest_jsonplan/testIncrementalAggregate.out
@@ -212,7 +212,7 @@
"description" : "Exchange(distribution=[hash[a, $f2]])"
}, {
"id" : 6,
- "type" : "stream-exec-incremental-group-aggregate_1",
+ "type" : "stream-exec-incremental-group-aggregate_2",
"configuration" : {
"table.exec.mini-batch.enabled" : "true",
"table.exec.mini-batch.size" : "5"
@@ -233,6 +233,11 @@
"partialAggCallNeedRetractions" : [ false ],
"partialLocalAggInputRowType" : "ROW<`a` BIGINT, `c` VARCHAR(2147483647), `$f2` INT>",
"partialAggNeedRetraction" : false,
+ "state" : [ {
+ "index" : 0,
+ "ttl" : "0 ms",
+ "name" : "incrementalGroupAggregateState"
+ } ],
"inputProperties" : [ {
"requiredDistribution" : {
"type" : "UNKNOWN"
@@ -257,7 +262,7 @@
"description" : "Exchange(distribution=[hash[a]])"
}, {
"id" : 8,
- "type" : "stream-exec-global-group-aggregate_1",
+ "type" : "stream-exec-global-group-aggregate_2",
"configuration" : {
"table.exec.mini-batch.enabled" : "true",
"table.exec.mini-batch.size" : "5"
@@ -277,6 +282,11 @@
"localAggInputRowType" : "ROW<`a` BIGINT, `$f2` INT, `$f2_0` BIGINT NOT NULL>",
"generateUpdateBefore" : true,
"needRetraction" : false,
+ "state" : [ {
+ "index" : 0,
+ "ttl" : "0 ms",
+ "name" : "globalGroupAggregateState"
+ } ],
"inputProperties" : [ {
"requiredDistribution" : {
"type" : "UNKNOWN"
@@ -288,7 +298,7 @@
"description" : "GlobalGroupAggregate(groupBy=[a], partialFinalType=[FINAL], select=[a, $SUM0(count$0) AS $f1])"
}, {
"id" : 9,
- "type" : "stream-exec-sink_1",
+ "type" : "stream-exec-sink_2",
"configuration" : {
"table.exec.sink.keyed-shuffle" : "AUTO",
"table.exec.sink.not-null-enforcer" : "ERROR",
@@ -319,6 +329,7 @@
}
},
"inputChangelogMode" : [ "INSERT", "UPDATE_BEFORE", "UPDATE_AFTER", "DELETE" ],
+ "inputUpsertKey" : [ 0 ],
"inputProperties" : [ {
"requiredDistribution" : {
"type" : "UNKNOWN"
@@ -327,7 +338,6 @@
"priority" : 0
} ],
"outputType" : "ROW<`a` BIGINT, `$f1` BIGINT NOT NULL>",
- "inputUpsertKey" : [ 0 ],
"description" : "Sink(table=[default_catalog.default_database.MySink], fields=[a, $f1])"
} ],
"edges" : [ {
diff --git a/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/IncrementalAggregateJsonPlanTest_jsonplan/testIncrementalAggregateWithSumCountDistinctAndRetraction.out b/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/IncrementalAggregateJsonPlanTest_jsonplan/testIncrementalAggregateWithSumCountDistinctAndRetraction.out
index f29f49ac995..c3a06ecf954 100644
--- a/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/IncrementalAggregateJsonPlanTest_jsonplan/testIncrementalAggregateWithSumCountDistinctAndRetraction.out
+++ b/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/IncrementalAggregateJsonPlanTest_jsonplan/testIncrementalAggregateWithSumCountDistinctAndRetraction.out
@@ -113,7 +113,7 @@
"description" : "Exchange(distribution=[hash[a]])"
}, {
"id" : 5,
- "type" : "stream-exec-global-group-aggregate_1",
+ "type" : "stream-exec-global-group-aggregate_2",
"configuration" : {
"table.exec.mini-batch.enabled" : "true",
"table.exec.mini-batch.size" : "5"
@@ -143,6 +143,11 @@
"localAggInputRowType" : "ROW<`a` BIGINT, `b` INT NOT NULL>",
"generateUpdateBefore" : true,
"needRetraction" : false,
+ "state" : [ {
+ "index" : 0,
+ "ttl" : "0 ms",
+ "name" : "globalGroupAggregateState"
+ } ],
"inputProperties" : [ {
"requiredDistribution" : {
"type" : "UNKNOWN"
@@ -326,7 +331,7 @@
"description" : "Exchange(distribution=[hash[b, $f2]])"
}, {
"id" : 9,
- "type" : "stream-exec-incremental-group-aggregate_1",
+ "type" : "stream-exec-incremental-group-aggregate_2",
"configuration" : {
"table.exec.mini-batch.enabled" : "true",
"table.exec.mini-batch.size" : "5"
@@ -366,6 +371,11 @@
"partialAggCallNeedRetractions" : [ true, true, true ],
"partialLocalAggInputRowType" : "ROW<`b` BIGINT NOT NULL, `b1` INT NOT NULL, `$f2` INT NOT NULL>",
"partialAggNeedRetraction" : true,
+ "state" : [ {
+ "index" : 0,
+ "ttl" : "0 ms",
+ "name" : "incrementalGroupAggregateState"
+ } ],
"inputProperties" : [ {
"requiredDistribution" : {
"type" : "UNKNOWN"
@@ -390,7 +400,7 @@
"description" : "Exchange(distribution=[hash[b]])"
}, {
"id" : 11,
- "type" : "stream-exec-global-group-aggregate_1",
+ "type" : "stream-exec-global-group-aggregate_2",
"configuration" : {
"table.exec.mini-batch.enabled" : "true",
"table.exec.mini-batch.size" : "5"
@@ -429,6 +439,11 @@
"generateUpdateBefore" : true,
"needRetraction" : true,
"indexOfCountStar" : 2,
+ "state" : [ {
+ "index" : 0,
+ "ttl" : "0 ms",
+ "name" : "globalGroupAggregateState"
+ } ],
"inputProperties" : [ {
"requiredDistribution" : {
"type" : "UNKNOWN"
@@ -440,7 +455,7 @@
"description" : "GlobalGroupAggregate(groupBy=[b], partialFinalType=[FINAL], select=[b, SUM_RETRACT((sum$0, count$1)) AS $f1, $SUM0_RETRACT(count$2) AS $f2, $SUM0_RETRACT(count1$3) AS $f3], indexOfCountStar=[2])"
}, {
"id" : 12,
- "type" : "stream-exec-sink_1",
+ "type" : "stream-exec-sink_2",
"configuration" : {
"table.exec.sink.keyed-shuffle" : "AUTO",
"table.exec.sink.not-null-enforcer" : "ERROR",
@@ -477,6 +492,7 @@
}
},
"inputChangelogMode" : [ "INSERT", "UPDATE_BEFORE", "UPDATE_AFTER", "DELETE" ],
+ "inputUpsertKey" : [ 0 ],
"inputProperties" : [ {
"requiredDistribution" : {
"type" : "UNKNOWN"
@@ -485,7 +501,6 @@
"priority" : 0
} ],
"outputType" : "ROW<`b` BIGINT NOT NULL, `$f1` INT NOT NULL, `$f2` BIGINT NOT NULL, `$f3` BIGINT NOT NULL>",
- "inputUpsertKey" : [ 0 ],
"description" : "Sink(table=[default_catalog.default_database.MySink], fields=[b, $f1, $f2, $f3])"
} ],
"edges" : [ {
diff --git a/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/IntervalJoinJsonPlanTest_jsonplan/testProcessingTimeInnerJoinWithOnClause.out b/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/IntervalJoinJsonPlanTest_jsonplan/testProcessingTimeInnerJoinWithOnClause.out
index 4d61dede144..16800b1667c 100644
--- a/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/IntervalJoinJsonPlanTest_jsonplan/testProcessingTimeInnerJoinWithOnClause.out
+++ b/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/IntervalJoinJsonPlanTest_jsonplan/testProcessingTimeInnerJoinWithOnClause.out
@@ -655,7 +655,7 @@
"description" : "Calc(select=[a, b])"
}, {
"id" : 13,
- "type" : "stream-exec-sink_1",
+ "type" : "stream-exec-sink_2",
"configuration" : {
"table.exec.sink.keyed-shuffle" : "AUTO",
"table.exec.sink.not-null-enforcer" : "ERROR",
diff --git a/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/IntervalJoinJsonPlanTest_jsonplan/testRowTimeInnerJoinWithOnClause.out b/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/IntervalJoinJsonPlanTest_jsonplan/testRowTimeInnerJoinWithOnClause.out
index 94927bb53e7..352a868a0a4 100644
--- a/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/IntervalJoinJsonPlanTest_jsonplan/testRowTimeInnerJoinWithOnClause.out
+++ b/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/IntervalJoinJsonPlanTest_jsonplan/testRowTimeInnerJoinWithOnClause.out
@@ -479,7 +479,7 @@
"description" : "Calc(select=[a, b])"
}, {
"id" : 11,
- "type" : "stream-exec-sink_1",
+ "type" : "stream-exec-sink_2",
"configuration" : {
"table.exec.sink.keyed-shuffle" : "AUTO",
"table.exec.sink.not-null-enforcer" : "ERROR",
diff --git a/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/JoinJsonPlanTest_jsonplan/testInnerJoin.out b/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/JoinJsonPlanTest_jsonplan/testInnerJoin.out
index 243f4d203ec..97aa74e138b 100644
--- a/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/JoinJsonPlanTest_jsonplan/testInnerJoin.out
+++ b/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/JoinJsonPlanTest_jsonplan/testInnerJoin.out
@@ -108,7 +108,7 @@
"description" : "Exchange(distribution=[hash[b1]])"
}, {
"id" : 5,
- "type" : "stream-exec-join_1",
+ "type" : "stream-exec-join_2",
"joinSpec" : {
"joinType" : "INNER",
"leftKeys" : [ 0 ],
@@ -116,6 +116,15 @@
"filterNulls" : [ true ],
"nonEquiCondition" : null
},
+ "state" : [ {
+ "index" : 0,
+ "ttl" : "0 ms",
+ "name" : "leftState"
+ }, {
+ "index" : 1,
+ "ttl" : "0 ms",
+ "name" : "rightState"
+ } ],
"inputProperties" : [ {
"requiredDistribution" : {
"type" : "UNKNOWN"
@@ -133,7 +142,7 @@
"description" : "Join(joinType=[InnerJoin], where=[(a1 = b1)], select=[a1, b1], leftInputSpec=[NoUniqueKey], rightInputSpec=[NoUniqueKey])"
}, {
"id" : 6,
- "type" : "stream-exec-sink_1",
+ "type" : "stream-exec-sink_2",
"configuration" : {
"table.exec.sink.keyed-shuffle" : "AUTO",
"table.exec.sink.not-null-enforcer" : "ERROR",
diff --git a/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/JoinJsonPlanTest_jsonplan/testInnerJoinWithEqualPk.out b/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/JoinJsonPlanTest_jsonplan/testInnerJoinWithEqualPk.out
index a230c7d8695..c25e3ad9851 100644
--- a/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/JoinJsonPlanTest_jsonplan/testInnerJoinWithEqualPk.out
+++ b/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/JoinJsonPlanTest_jsonplan/testInnerJoinWithEqualPk.out
@@ -55,7 +55,7 @@
"description" : "Exchange(distribution=[hash[a1]])"
}, {
"id" : 3,
- "type" : "stream-exec-group-aggregate_1",
+ "type" : "stream-exec-group-aggregate_2",
"configuration" : {
"table.exec.mini-batch.enabled" : "false",
"table.exec.mini-batch.size" : "-1"
@@ -65,6 +65,11 @@
"aggCallNeedRetractions" : [ ],
"generateUpdateBefore" : true,
"needRetraction" : false,
+ "state" : [ {
+ "index" : 0,
+ "ttl" : "0 ms",
+ "name" : "groupAggregateState"
+ } ],
"inputProperties" : [ {
"requiredDistribution" : {
"type" : "UNKNOWN"
@@ -142,7 +147,7 @@
"description" : "Exchange(distribution=[hash[b1]])"
}, {
"id" : 7,
- "type" : "stream-exec-group-aggregate_1",
+ "type" : "stream-exec-group-aggregate_2",
"configuration" : {
"table.exec.mini-batch.enabled" : "false",
"table.exec.mini-batch.size" : "-1"
@@ -152,6 +157,11 @@
"aggCallNeedRetractions" : [ ],
"generateUpdateBefore" : true,
"needRetraction" : false,
+ "state" : [ {
+ "index" : 0,
+ "ttl" : "0 ms",
+ "name" : "groupAggregateState"
+ } ],
"inputProperties" : [ {
"requiredDistribution" : {
"type" : "UNKNOWN"
@@ -176,7 +186,7 @@
"description" : "Exchange(distribution=[hash[b1]])"
}, {
"id" : 9,
- "type" : "stream-exec-join_1",
+ "type" : "stream-exec-join_2",
"joinSpec" : {
"joinType" : "INNER",
"leftKeys" : [ 0 ],
@@ -186,6 +196,15 @@
},
"leftUpsertKeys" : [ [ 0 ] ],
"rightUpsertKeys" : [ [ 0 ] ],
+ "state" : [ {
+ "index" : 0,
+ "ttl" : "0 ms",
+ "name" : "leftState"
+ }, {
+ "index" : 1,
+ "ttl" : "0 ms",
+ "name" : "rightState"
+ } ],
"inputProperties" : [ {
"requiredDistribution" : {
"type" : "UNKNOWN"
@@ -203,7 +222,7 @@
"description" : "Join(joinType=[InnerJoin], where=[(a1 = b1)], select=[a1, b1], leftInputSpec=[JoinKeyContainsUniqueKey], rightInputSpec=[JoinKeyContainsUniqueKey])"
}, {
"id" : 10,
- "type" : "stream-exec-sink_1",
+ "type" : "stream-exec-sink_2",
"configuration" : {
"table.exec.sink.keyed-shuffle" : "AUTO",
"table.exec.sink.not-null-enforcer" : "ERROR",
@@ -234,6 +253,7 @@
}
},
"inputChangelogMode" : [ "INSERT", "UPDATE_BEFORE", "UPDATE_AFTER" ],
+ "inputUpsertKey" : [ 0 ],
"inputProperties" : [ {
"requiredDistribution" : {
"type" : "UNKNOWN"
@@ -242,7 +262,6 @@
"priority" : 0
} ],
"outputType" : "ROW<`a1` INT, `b1` INT>",
- "inputUpsertKey" : [ 0 ],
"description" : "Sink(table=[default_catalog.default_database.MySink], fields=[a1, b1])"
} ],
"edges" : [ {
diff --git a/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/JoinJsonPlanTest_jsonplan/testInnerJoinWithPk.out b/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/JoinJsonPlanTest_jsonplan/testInnerJoinWithPk.out
index b0980c85f52..8f0b39e6898 100644
--- a/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/JoinJsonPlanTest_jsonplan/testInnerJoinWithPk.out
+++ b/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/JoinJsonPlanTest_jsonplan/testInnerJoinWithPk.out
@@ -55,7 +55,7 @@
"description" : "Exchange(distribution=[hash[a1]])"
}, {
"id" : 3,
- "type" : "stream-exec-group-aggregate_1",
+ "type" : "stream-exec-group-aggregate_2",
"configuration" : {
"table.exec.mini-batch.enabled" : "false",
"table.exec.mini-batch.size" : "-1"
@@ -74,6 +74,11 @@
"aggCallNeedRetractions" : [ false ],
"generateUpdateBefore" : true,
"needRetraction" : false,
+ "state" : [ {
+ "index" : 0,
+ "ttl" : "0 ms",
+ "name" : "groupAggregateState"
+ } ],
"inputProperties" : [ {
"requiredDistribution" : {
"type" : "UNKNOWN"
@@ -173,7 +178,7 @@
"description" : "Exchange(distribution=[hash[b1]])"
}, {
"id" : 8,
- "type" : "stream-exec-group-aggregate_1",
+ "type" : "stream-exec-group-aggregate_2",
"configuration" : {
"table.exec.mini-batch.enabled" : "false",
"table.exec.mini-batch.size" : "-1"
@@ -192,6 +197,11 @@
"aggCallNeedRetractions" : [ false ],
"generateUpdateBefore" : true,
"needRetraction" : false,
+ "state" : [ {
+ "index" : 0,
+ "ttl" : "0 ms",
+ "name" : "groupAggregateState"
+ } ],
"inputProperties" : [ {
"requiredDistribution" : {
"type" : "UNKNOWN"
@@ -238,7 +248,7 @@
"description" : "Exchange(distribution=[hash[b2]])"
}, {
"id" : 11,
- "type" : "stream-exec-join_1",
+ "type" : "stream-exec-join_2",
"joinSpec" : {
"joinType" : "INNER",
"leftKeys" : [ 0 ],
@@ -248,6 +258,15 @@
},
"leftUpsertKeys" : [ [ 1 ] ],
"rightUpsertKeys" : [ [ 1 ] ],
+ "state" : [ {
+ "index" : 0,
+ "ttl" : "0 ms",
+ "name" : "leftState"
+ }, {
+ "index" : 1,
+ "ttl" : "0 ms",
+ "name" : "rightState"
+ } ],
"inputProperties" : [ {
"requiredDistribution" : {
"type" : "UNKNOWN"
@@ -295,7 +314,7 @@
"description" : "Calc(select=[a1, a2, b1, b2])"
}, {
"id" : 13,
- "type" : "stream-exec-sink_1",
+ "type" : "stream-exec-sink_2",
"configuration" : {
"table.exec.sink.keyed-shuffle" : "AUTO",
"table.exec.sink.not-null-enforcer" : "ERROR",
diff --git a/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/JoinJsonPlanTest_jsonplan/testLeftJoinNonEqui.out b/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/JoinJsonPlanTest_jsonplan/testLeftJoinNonEqui.out
index 27ad53723c9..cfcae3ee74e 100644
--- a/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/JoinJsonPlanTest_jsonplan/testLeftJoinNonEqui.out
+++ b/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/JoinJsonPlanTest_jsonplan/testLeftJoinNonEqui.out
@@ -108,7 +108,7 @@
"description" : "Exchange(distribution=[hash[b1]])"
}, {
"id" : 5,
- "type" : "stream-exec-join_1",
+ "type" : "stream-exec-join_2",
"joinSpec" : {
"joinType" : "LEFT",
"leftKeys" : [ 0 ],
@@ -130,6 +130,15 @@
"type" : "BOOLEAN"
}
},
+ "state" : [ {
+ "index" : 0,
+ "ttl" : "0 ms",
+ "name" : "leftState"
+ }, {
+ "index" : 1,
+ "ttl" : "0 ms",
+ "name" : "rightState"
+ } ],
"inputProperties" : [ {
"requiredDistribution" : {
"type" : "UNKNOWN"
@@ -169,7 +178,7 @@
"description" : "Calc(select=[a1, b1])"
}, {
"id" : 7,
- "type" : "stream-exec-sink_1",
+ "type" : "stream-exec-sink_2",
"configuration" : {
"table.exec.sink.keyed-shuffle" : "AUTO",
"table.exec.sink.not-null-enforcer" : "ERROR",
diff --git a/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/LimitJsonPlanTest_jsonplan/testLimit.out b/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/LimitJsonPlanTest_jsonplan/testLimit.out
index 361b644af17..0c6c10aa34a 100644
--- a/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/LimitJsonPlanTest_jsonplan/testLimit.out
+++ b/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/LimitJsonPlanTest_jsonplan/testLimit.out
@@ -60,7 +60,7 @@
"description" : "Exchange(distribution=[single])"
}, {
"id" : 3,
- "type" : "stream-exec-limit_1",
+ "type" : "stream-exec-limit_2",
"configuration" : {
"table.exec.rank.topn-cache-size" : "10000"
},
@@ -73,6 +73,11 @@
"type" : "AppendFast"
},
"generateUpdateBefore" : false,
+ "state" : [ {
+ "index" : 0,
+ "ttl" : "0 ms",
+ "name" : "rankState"
+ } ],
"inputProperties" : [ {
"requiredDistribution" : {
"type" : "UNKNOWN"
@@ -114,7 +119,7 @@
"description" : "Calc(select=[a, a AS a0])"
}, {
"id" : 5,
- "type" : "stream-exec-sink_1",
+ "type" : "stream-exec-sink_2",
"configuration" : {
"table.exec.sink.keyed-shuffle" : "AUTO",
"table.exec.sink.not-null-enforcer" : "ERROR",
diff --git a/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/LookupJoinJsonPlanTest_jsonplan/testAggAndLeftJoinWithTryResolveMode.out b/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/LookupJoinJsonPlanTest_jsonplan/testAggAndLeftJoinWithTryResolveMode.out
index 5c9649bfb02..80f22668457 100644
--- a/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/LookupJoinJsonPlanTest_jsonplan/testAggAndLeftJoinWithTryResolveMode.out
+++ b/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/LookupJoinJsonPlanTest_jsonplan/testAggAndLeftJoinWithTryResolveMode.out
@@ -217,7 +217,7 @@
"description" : "Exchange(distribution=[hash[b]])"
}, {
"id" : 6,
- "type" : "stream-exec-group-aggregate_1",
+ "type" : "stream-exec-group-aggregate_2",
"configuration" : {
"table.exec.mini-batch.enabled" : "false",
"table.exec.mini-batch.size" : "-1"
@@ -236,6 +236,11 @@
"aggCallNeedRetractions" : [ false ],
"generateUpdateBefore" : true,
"needRetraction" : false,
+ "state" : [ {
+ "index" : 0,
+ "ttl" : "0 ms",
+ "name" : "groupAggregateState"
+ } ],
"inputProperties" : [ {
"requiredDistribution" : {
"type" : "UNKNOWN"
@@ -265,7 +270,7 @@
"description" : "Calc(select=[a])"
}, {
"id" : 8,
- "type" : "stream-exec-lookup-join_1",
+ "type" : "stream-exec-lookup-join_2",
"joinType" : "LEFT",
"joinCondition" : null,
"temporalTable" : {
@@ -307,6 +312,11 @@
"lookupKeyContainsPrimaryKey" : false,
"requireUpsertMaterialize" : true,
"inputChangelogMode" : [ "INSERT", "UPDATE_BEFORE", "UPDATE_AFTER" ],
+ "state" : [ {
+ "index" : 0,
+ "ttl" : "0 ms",
+ "name" : "lookupJoinState"
+ } ],
"inputProperties" : [ {
"requiredDistribution" : {
"type" : "UNKNOWN"
@@ -344,7 +354,7 @@
"description" : "Calc(select=[a, name, age])"
}, {
"id" : 10,
- "type" : "stream-exec-sink_1",
+ "type" : "stream-exec-sink_2",
"configuration" : {
"table.exec.sink.keyed-shuffle" : "AUTO",
"table.exec.sink.not-null-enforcer" : "ERROR",
diff --git a/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/LookupJoinJsonPlanTest_jsonplan/testJoinTemporalTable.out b/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/LookupJoinJsonPlanTest_jsonplan/testJoinTemporalTable.out
index 43bd34417c9..07c99c4eba7 100644
--- a/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/LookupJoinJsonPlanTest_jsonplan/testJoinTemporalTable.out
+++ b/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/LookupJoinJsonPlanTest_jsonplan/testJoinTemporalTable.out
@@ -219,7 +219,7 @@
"description" : "WatermarkAssigner(rowtime=[rowtime], watermark=[(rowtime - 1000:INTERVAL SECOND)])"
}, {
"id" : 4,
- "type" : "stream-exec-lookup-join_1",
+ "type" : "stream-exec-lookup-join_2",
"joinType" : "INNER",
"joinCondition" : null,
"temporalTable" : {
@@ -379,7 +379,7 @@
"description" : "Calc(select=[a, b, c, CAST(PROCTIME_MATERIALIZE(proctime) AS TIMESTAMP(3)) AS proctime, CAST(rowtime AS TIMESTAMP(3)) AS rowtime, id, name, age])"
}, {
"id" : 6,
- "type" : "stream-exec-sink_1",
+ "type" : "stream-exec-sink_2",
"configuration" : {
"table.exec.sink.keyed-shuffle" : "AUTO",
"table.exec.sink.not-null-enforcer" : "ERROR",
diff --git a/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/LookupJoinJsonPlanTest_jsonplan/testJoinTemporalTableWithAsyncHint.out b/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/LookupJoinJsonPlanTest_jsonplan/testJoinTemporalTableWithAsyncHint.out
index 57c29f7169a..a08543027f8 100644
--- a/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/LookupJoinJsonPlanTest_jsonplan/testJoinTemporalTableWithAsyncHint.out
+++ b/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/LookupJoinJsonPlanTest_jsonplan/testJoinTemporalTableWithAsyncHint.out
@@ -219,7 +219,7 @@
"description" : "WatermarkAssigner(rowtime=[rowtime], watermark=[(rowtime - 1000:INTERVAL SECOND)])"
}, {
"id" : 4,
- "type" : "stream-exec-lookup-join_1",
+ "type" : "stream-exec-lookup-join_2",
"joinType" : "INNER",
"joinCondition" : null,
"temporalTable" : {
@@ -379,7 +379,7 @@
"description" : "Calc(select=[a, b, c, CAST(PROCTIME_MATERIALIZE(proctime) AS TIMESTAMP(3)) AS proctime, CAST(rowtime AS TIMESTAMP(3)) AS rowtime, id, name, age])"
}, {
"id" : 6,
- "type" : "stream-exec-sink_1",
+ "type" : "stream-exec-sink_2",
"configuration" : {
"table.exec.sink.keyed-shuffle" : "AUTO",
"table.exec.sink.not-null-enforcer" : "ERROR",
diff --git a/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/LookupJoinJsonPlanTest_jsonplan/testJoinTemporalTableWithAsyncHint2.out b/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/LookupJoinJsonPlanTest_jsonplan/testJoinTemporalTableWithAsyncHint2.out
index 57c29f7169a..a08543027f8 100644
--- a/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/LookupJoinJsonPlanTest_jsonplan/testJoinTemporalTableWithAsyncHint2.out
+++ b/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/LookupJoinJsonPlanTest_jsonplan/testJoinTemporalTableWithAsyncHint2.out
@@ -219,7 +219,7 @@
"description" : "WatermarkAssigner(rowtime=[rowtime], watermark=[(rowtime - 1000:INTERVAL SECOND)])"
}, {
"id" : 4,
- "type" : "stream-exec-lookup-join_1",
+ "type" : "stream-exec-lookup-join_2",
"joinType" : "INNER",
"joinCondition" : null,
"temporalTable" : {
@@ -379,7 +379,7 @@
"description" : "Calc(select=[a, b, c, CAST(PROCTIME_MATERIALIZE(proctime) AS TIMESTAMP(3)) AS proctime, CAST(rowtime AS TIMESTAMP(3)) AS rowtime, id, name, age])"
}, {
"id" : 6,
- "type" : "stream-exec-sink_1",
+ "type" : "stream-exec-sink_2",
"configuration" : {
"table.exec.sink.keyed-shuffle" : "AUTO",
"table.exec.sink.not-null-enforcer" : "ERROR",
diff --git a/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/LookupJoinJsonPlanTest_jsonplan/testJoinTemporalTableWithAsyncRetryHint.out b/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/LookupJoinJsonPlanTest_jsonplan/testJoinTemporalTableWithAsyncRetryHint.out
index 6171c82ac9e..9df2b8c3d0d 100644
--- a/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/LookupJoinJsonPlanTest_jsonplan/testJoinTemporalTableWithAsyncRetryHint.out
+++ b/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/LookupJoinJsonPlanTest_jsonplan/testJoinTemporalTableWithAsyncRetryHint.out
@@ -219,7 +219,7 @@
"description" : "WatermarkAssigner(rowtime=[rowtime], watermark=[(rowtime - 1000:INTERVAL SECOND)])"
}, {
"id" : 4,
- "type" : "stream-exec-lookup-join_1",
+ "type" : "stream-exec-lookup-join_2",
"joinType" : "INNER",
"joinCondition" : null,
"temporalTable" : {
@@ -385,7 +385,7 @@
"description" : "Calc(select=[a, b, c, CAST(PROCTIME_MATERIALIZE(proctime) AS TIMESTAMP(3)) AS proctime, CAST(rowtime AS TIMESTAMP(3)) AS rowtime, id, name, age])"
}, {
"id" : 6,
- "type" : "stream-exec-sink_1",
+ "type" : "stream-exec-sink_2",
"configuration" : {
"table.exec.sink.keyed-shuffle" : "AUTO",
"table.exec.sink.not-null-enforcer" : "ERROR",
diff --git a/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/LookupJoinJsonPlanTest_jsonplan/testJoinTemporalTableWithAsyncRetryHint2.out b/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/LookupJoinJsonPlanTest_jsonplan/testJoinTemporalTableWithAsyncRetryHint2.out
index 6171c82ac9e..9df2b8c3d0d 100644
--- a/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/LookupJoinJsonPlanTest_jsonplan/testJoinTemporalTableWithAsyncRetryHint2.out
+++ b/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/LookupJoinJsonPlanTest_jsonplan/testJoinTemporalTableWithAsyncRetryHint2.out
@@ -219,7 +219,7 @@
"description" : "WatermarkAssigner(rowtime=[rowtime], watermark=[(rowtime - 1000:INTERVAL SECOND)])"
}, {
"id" : 4,
- "type" : "stream-exec-lookup-join_1",
+ "type" : "stream-exec-lookup-join_2",
"joinType" : "INNER",
"joinCondition" : null,
"temporalTable" : {
@@ -385,7 +385,7 @@
"description" : "Calc(select=[a, b, c, CAST(PROCTIME_MATERIALIZE(proctime) AS TIMESTAMP(3)) AS proctime, CAST(rowtime AS TIMESTAMP(3)) AS rowtime, id, name, age])"
}, {
"id" : 6,
- "type" : "stream-exec-sink_1",
+ "type" : "stream-exec-sink_2",
"configuration" : {
"table.exec.sink.keyed-shuffle" : "AUTO",
"table.exec.sink.not-null-enforcer" : "ERROR",
diff --git a/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/LookupJoinJsonPlanTest_jsonplan/testJoinTemporalTableWithProjectionPushDown.out b/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/LookupJoinJsonPlanTest_jsonplan/testJoinTemporalTableWithProjectionPushDown.out
index a798ea2aa4f..22c4cfa11eb 100644
--- a/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/LookupJoinJsonPlanTest_jsonplan/testJoinTemporalTableWithProjectionPushDown.out
+++ b/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/LookupJoinJsonPlanTest_jsonplan/testJoinTemporalTableWithProjectionPushDown.out
@@ -219,7 +219,7 @@
"description" : "WatermarkAssigner(rowtime=[rowtime], watermark=[(rowtime - 1000:INTERVAL SECOND)])"
}, {
"id" : 4,
- "type" : "stream-exec-lookup-join_1",
+ "type" : "stream-exec-lookup-join_2",
"joinType" : "INNER",
"joinCondition" : null,
"temporalTable" : {
@@ -374,7 +374,7 @@
"description" : "Calc(select=[a, b, c, CAST(PROCTIME_MATERIALIZE(proctime) AS TIMESTAMP(3)) AS proctime, CAST(rowtime AS TIMESTAMP(3)) AS rowtime, id])"
}, {
"id" : 6,
- "type" : "stream-exec-sink_1",
+ "type" : "stream-exec-sink_2",
"configuration" : {
"table.exec.sink.keyed-shuffle" : "AUTO",
"table.exec.sink.not-null-enforcer" : "ERROR",
diff --git a/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/LookupJoinJsonPlanTest_jsonplan/testJoinTemporalTableWithRetryHint.out b/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/LookupJoinJsonPlanTest_jsonplan/testJoinTemporalTableWithRetryHint.out
index 6171c82ac9e..9df2b8c3d0d 100644
--- a/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/LookupJoinJsonPlanTest_jsonplan/testJoinTemporalTableWithRetryHint.out
+++ b/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/LookupJoinJsonPlanTest_jsonplan/testJoinTemporalTableWithRetryHint.out
@@ -219,7 +219,7 @@
"description" : "WatermarkAssigner(rowtime=[rowtime], watermark=[(rowtime - 1000:INTERVAL SECOND)])"
}, {
"id" : 4,
- "type" : "stream-exec-lookup-join_1",
+ "type" : "stream-exec-lookup-join_2",
"joinType" : "INNER",
"joinCondition" : null,
"temporalTable" : {
@@ -385,7 +385,7 @@
"description" : "Calc(select=[a, b, c, CAST(PROCTIME_MATERIALIZE(proctime) AS TIMESTAMP(3)) AS proctime, CAST(rowtime AS TIMESTAMP(3)) AS rowtime, id, name, age])"
}, {
"id" : 6,
- "type" : "stream-exec-sink_1",
+ "type" : "stream-exec-sink_2",
"configuration" : {
"table.exec.sink.keyed-shuffle" : "AUTO",
"table.exec.sink.not-null-enforcer" : "ERROR",
diff --git a/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/MatchRecognizeJsonPlanTest_jsonplan/testMatch.out b/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/MatchRecognizeJsonPlanTest_jsonplan/testMatch.out
index 47816fcfb17..dbd0b066786 100644
--- a/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/MatchRecognizeJsonPlanTest_jsonplan/testMatch.out
+++ b/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/MatchRecognizeJsonPlanTest_jsonplan/testMatch.out
@@ -301,7 +301,7 @@
"description" : "Match(orderBy=[proctime ASC], measures=[FINAL(A\".id) AS aid, FINAL(l.id) AS bid, FINAL(C.id) AS cid], rowsPerMatch=[ONE ROW PER MATCH], after=[SKIP TO NEXT ROW], pattern=[((_UTF-16LE'A\"', _UTF-16LE'l'), _UTF-16LE'C')], define=[{A\"==(LAST(*.$1, 0), _UTF-16LE'a'), l==(LAST(*.$1, 0), _UTF-16LE'b'), C==(LAST(*.$1, 0), _UTF-16LE'c')}])"
}, {
"id" : 5,
- "type" : "stream-exec-sink_1",
+ "type" : "stream-exec-sink_2",
"configuration" : {
"table.exec.sink.keyed-shuffle" : "AUTO",
"table.exec.sink.not-null-enforcer" : "ERROR",
diff --git a/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/OverAggregateJsonPlanTest_jsonplan/testProcTimeBoundedNonPartitionedRangeOver.out b/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/OverAggregateJsonPlanTest_jsonplan/testProcTimeBoundedNonPartitionedRangeOver.out
index 4a91e46f98e..c5d891dce14 100644
--- a/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/OverAggregateJsonPlanTest_jsonplan/testProcTimeBoundedNonPartitionedRangeOver.out
+++ b/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/OverAggregateJsonPlanTest_jsonplan/testProcTimeBoundedNonPartitionedRangeOver.out
@@ -361,7 +361,7 @@
"description" : "Calc(select=[$2 AS a, CAST(w0$o0 AS BIGINT) AS b])"
}, {
"id" : 8,
- "type" : "stream-exec-sink_1",
+ "type" : "stream-exec-sink_2",
"configuration" : {
"table.exec.sink.keyed-shuffle" : "AUTO",
"table.exec.sink.not-null-enforcer" : "ERROR",
diff --git a/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/OverAggregateJsonPlanTest_jsonplan/testProcTimeBoundedPartitionedRangeOver.out b/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/OverAggregateJsonPlanTest_jsonplan/testProcTimeBoundedPartitionedRangeOver.out
index cb0835c8abd..e3febe81b2d 100644
--- a/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/OverAggregateJsonPlanTest_jsonplan/testProcTimeBoundedPartitionedRangeOver.out
+++ b/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/OverAggregateJsonPlanTest_jsonplan/testProcTimeBoundedPartitionedRangeOver.out
@@ -421,7 +421,7 @@
"description" : "Calc(select=[$3 AS a, CAST((CASE((w0$o0 > 0), w0$o1, null:BIGINT) / w0$o0) AS DOUBLE) AS b])"
}, {
"id" : 8,
- "type" : "stream-exec-sink_1",
+ "type" : "stream-exec-sink_2",
"configuration" : {
"table.exec.sink.keyed-shuffle" : "AUTO",
"table.exec.sink.not-null-enforcer" : "ERROR",
diff --git a/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/OverAggregateJsonPlanTest_jsonplan/testProcTimeBoundedPartitionedRowsOverWithBuiltinProctime.out b/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/OverAggregateJsonPlanTest_jsonplan/testProcTimeBoundedPartitionedRowsOverWithBuiltinProctime.out
index bcfa04121e2..356166461c4 100644
--- a/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/OverAggregateJsonPlanTest_jsonplan/testProcTimeBoundedPartitionedRowsOverWithBuiltinProctime.out
+++ b/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/OverAggregateJsonPlanTest_jsonplan/testProcTimeBoundedPartitionedRowsOverWithBuiltinProctime.out
@@ -358,7 +358,7 @@
"description" : "Calc(select=[$2 AS a, CASE((w0$o0 > 0), w0$o1, null:BIGINT) AS b, w0$o2 AS c])"
}, {
"id" : 7,
- "type" : "stream-exec-sink_1",
+ "type" : "stream-exec-sink_2",
"configuration" : {
"table.exec.sink.keyed-shuffle" : "AUTO",
"table.exec.sink.not-null-enforcer" : "ERROR",
diff --git a/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/OverAggregateJsonPlanTest_jsonplan/testProcTimeUnboundedPartitionedRangeOver.out b/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/OverAggregateJsonPlanTest_jsonplan/testProcTimeUnboundedPartitionedRangeOver.out
index 8bb57718f8f..12623157337 100644
--- a/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/OverAggregateJsonPlanTest_jsonplan/testProcTimeUnboundedPartitionedRangeOver.out
+++ b/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/OverAggregateJsonPlanTest_jsonplan/testProcTimeUnboundedPartitionedRangeOver.out
@@ -392,7 +392,7 @@
"description" : "Calc(select=[c AS a, CAST(w0$o0 AS BIGINT) AS b, CAST(CASE((w0$o0 > 0), w0$o1, null:INTEGER) AS BIGINT) AS c])"
}, {
"id" : 8,
- "type" : "stream-exec-sink_1",
+ "type" : "stream-exec-sink_2",
"configuration" : {
"table.exec.sink.keyed-shuffle" : "AUTO",
"table.exec.sink.not-null-enforcer" : "ERROR",
diff --git a/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/OverAggregateJsonPlanTest_jsonplan/testProctimeBoundedDistinctPartitionedRowOver.out b/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/OverAggregateJsonPlanTest_jsonplan/testProctimeBoundedDistinctPartitionedRowOver.out
index 64b37ff923c..44fb1a117a3 100644
--- a/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/OverAggregateJsonPlanTest_jsonplan/testProctimeBoundedDistinctPartitionedRowOver.out
+++ b/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/OverAggregateJsonPlanTest_jsonplan/testProctimeBoundedDistinctPartitionedRowOver.out
@@ -402,7 +402,7 @@
"description" : "Calc(select=[c AS a, CAST(w0$o0 AS BIGINT) AS b, CAST(CASE((w0$o0 > 0), w0$o1, null:INTEGER) AS BIGINT) AS c])"
}, {
"id" : 8,
- "type" : "stream-exec-sink_1",
+ "type" : "stream-exec-sink_2",
"configuration" : {
"table.exec.sink.keyed-shuffle" : "AUTO",
"table.exec.sink.not-null-enforcer" : "ERROR",
diff --git a/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/OverAggregateJsonPlanTest_jsonplan/testProctimeBoundedDistinctWithNonDistinctPartitionedRowOver.out b/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/OverAggregateJsonPlanTest_jsonplan/testProctimeBoundedDistinctWithNonDistinctPartitionedRowOver.out
index 3e483c4ce90..545242f63a3 100644
--- a/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/OverAggregateJsonPlanTest_jsonplan/testProctimeBoundedDistinctWithNonDistinctPartitionedRowOver.out
+++ b/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/OverAggregateJsonPlanTest_jsonplan/testProctimeBoundedDistinctWithNonDistinctPartitionedRowOver.out
@@ -492,7 +492,7 @@
"description" : "Calc(select=[b AS a, CAST(w0$o0 AS BIGINT) AS b, CAST(CASE((w0$o0 > 0), w0$o1, null:INTEGER) AS BIGINT) AS c, CAST(w0$o2 AS BIGINT) AS d, CASE((w0$o3 > 0), w0$o4, null:BIGINT) AS e])"
}, {
"id" : 8,
- "type" : "stream-exec-sink_1",
+ "type" : "stream-exec-sink_2",
"configuration" : {
"table.exec.sink.keyed-shuffle" : "AUTO",
"table.exec.sink.not-null-enforcer" : "ERROR",
diff --git a/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/OverAggregateJsonPlanTest_jsonplan/testRowTimeBoundedPartitionedRowsOver.out b/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/OverAggregateJsonPlanTest_jsonplan/testRowTimeBoundedPartitionedRowsOver.out
index 514303f1ed3..232070cf5a1 100644
--- a/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/OverAggregateJsonPlanTest_jsonplan/testRowTimeBoundedPartitionedRowsOver.out
+++ b/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/OverAggregateJsonPlanTest_jsonplan/testRowTimeBoundedPartitionedRowsOver.out
@@ -236,7 +236,7 @@
"description" : "Calc(select=[c, w0$o0 AS $1])"
}, {
"id" : 6,
- "type" : "stream-exec-sink_1",
+ "type" : "stream-exec-sink_2",
"configuration" : {
"table.exec.sink.keyed-shuffle" : "AUTO",
"table.exec.sink.not-null-enforcer" : "ERROR",
diff --git a/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/PythonCalcJsonPlanTest_jsonplan/testPythonCalc.out b/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/PythonCalcJsonPlanTest_jsonplan/testPythonCalc.out
index 331f7054703..79fd273efd2 100644
--- a/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/PythonCalcJsonPlanTest_jsonplan/testPythonCalc.out
+++ b/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/PythonCalcJsonPlanTest_jsonplan/testPythonCalc.out
@@ -75,7 +75,7 @@
"description" : "PythonCalc(select=[a, pyFunc(b, b) AS EXPR$1])"
}, {
"id" : 3,
- "type" : "stream-exec-sink_1",
+ "type" : "stream-exec-sink_2",
"configuration" : {
"table.exec.sink.keyed-shuffle" : "AUTO",
"table.exec.sink.not-null-enforcer" : "ERROR",
diff --git a/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/PythonCalcJsonPlanTest_jsonplan/testPythonFunctionInWhereClause.out b/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/PythonCalcJsonPlanTest_jsonplan/testPythonFunctionInWhereClause.out
index 5ea0d3005b1..99300aa63ff 100644
--- a/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/PythonCalcJsonPlanTest_jsonplan/testPythonFunctionInWhereClause.out
+++ b/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/PythonCalcJsonPlanTest_jsonplan/testPythonFunctionInWhereClause.out
@@ -144,7 +144,7 @@
"description" : "Calc(select=[a, b], where=[f0])"
}, {
"id" : 5,
- "type" : "stream-exec-sink_1",
+ "type" : "stream-exec-sink_2",
"configuration" : {
"table.exec.sink.keyed-shuffle" : "AUTO",
"table.exec.sink.not-null-enforcer" : "ERROR",
diff --git a/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/PythonCorrelateJsonPlanTest_jsonplan/testJoinWithFilter.out b/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/PythonCorrelateJsonPlanTest_jsonplan/testJoinWithFilter.out
index a4d1a5dbd7d..4b7af322179 100644
--- a/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/PythonCorrelateJsonPlanTest_jsonplan/testJoinWithFilter.out
+++ b/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/PythonCorrelateJsonPlanTest_jsonplan/testJoinWithFilter.out
@@ -192,7 +192,7 @@
"description" : "Calc(select=[x, y], where=[(((y + 1) = (y * y)) AND (x = a))])"
}, {
"id" : 5,
- "type" : "stream-exec-sink_1",
+ "type" : "stream-exec-sink_2",
"configuration" : {
"table.exec.sink.keyed-shuffle" : "AUTO",
"table.exec.sink.not-null-enforcer" : "ERROR",
diff --git a/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/PythonCorrelateJsonPlanTest_jsonplan/testPythonTableFunction.out b/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/PythonCorrelateJsonPlanTest_jsonplan/testPythonTableFunction.out
index 137419d1818..2407830bc41 100644
--- a/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/PythonCorrelateJsonPlanTest_jsonplan/testPythonTableFunction.out
+++ b/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/PythonCorrelateJsonPlanTest_jsonplan/testPythonTableFunction.out
@@ -138,7 +138,7 @@
"description" : "Calc(select=[x, y])"
}, {
"id" : 5,
- "type" : "stream-exec-sink_1",
+ "type" : "stream-exec-sink_2",
"configuration" : {
"table.exec.sink.keyed-shuffle" : "AUTO",
"table.exec.sink.not-null-enforcer" : "ERROR",
diff --git a/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/PythonGroupAggregateJsonPlanTest_jsonplan/tesPythonAggCallsWithGroupBy.out b/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/PythonGroupAggregateJsonPlanTest_jsonplan/tesPythonAggCallsWithGroupBy.out
index 5275647c919..c547c0378a0 100644
--- a/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/PythonGroupAggregateJsonPlanTest_jsonplan/tesPythonAggCallsWithGroupBy.out
+++ b/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/PythonGroupAggregateJsonPlanTest_jsonplan/tesPythonAggCallsWithGroupBy.out
@@ -152,7 +152,7 @@
"description" : "Calc(select=[CAST(b AS BIGINT) AS a, EXPR$1 AS b])"
}, {
"id" : 6,
- "type" : "stream-exec-sink_1",
+ "type" : "stream-exec-sink_2",
"configuration" : {
"table.exec.sink.keyed-shuffle" : "AUTO",
"table.exec.sink.not-null-enforcer" : "ERROR",
diff --git a/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/PythonGroupWindowAggregateJsonPlanTest_jsonplan/testEventTimeHopWindow.out b/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/PythonGroupWindowAggregateJsonPlanTest_jsonplan/testEventTimeHopWindow.out
index ae5cde333a0..6c44321917a 100644
--- a/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/PythonGroupWindowAggregateJsonPlanTest_jsonplan/testEventTimeHopWindow.out
+++ b/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/PythonGroupWindowAggregateJsonPlanTest_jsonplan/testEventTimeHopWindow.out
@@ -305,7 +305,7 @@
"description" : "PythonGroupWindowAggregate(groupBy=[b], window=[SlidingGroupWindow('w$, rowtime, 10000, 5000)], select=[b, pyFunc(a, $f3) AS EXPR$1])"
}, {
"id" : 7,
- "type" : "stream-exec-sink_1",
+ "type" : "stream-exec-sink_2",
"configuration" : {
"table.exec.sink.keyed-shuffle" : "AUTO",
"table.exec.sink.not-null-enforcer" : "ERROR",
diff --git a/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/PythonGroupWindowAggregateJsonPlanTest_jsonplan/testEventTimeSessionWindow.out b/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/PythonGroupWindowAggregateJsonPlanTest_jsonplan/testEventTimeSessionWindow.out
index 1cf29460bfc..282974091fe 100644
--- a/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/PythonGroupWindowAggregateJsonPlanTest_jsonplan/testEventTimeSessionWindow.out
+++ b/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/PythonGroupWindowAggregateJsonPlanTest_jsonplan/testEventTimeSessionWindow.out
@@ -303,7 +303,7 @@
"description" : "PythonGroupWindowAggregate(groupBy=[b], window=[SessionGroupWindow('w$, rowtime, 10000)], select=[b, pyFunc(a, $f3) AS EXPR$1])"
}, {
"id" : 7,
- "type" : "stream-exec-sink_1",
+ "type" : "stream-exec-sink_2",
"configuration" : {
"table.exec.sink.keyed-shuffle" : "AUTO",
"table.exec.sink.not-null-enforcer" : "ERROR",
diff --git a/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/PythonGroupWindowAggregateJsonPlanTest_jsonplan/testEventTimeTumbleWindow.out b/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/PythonGroupWindowAggregateJsonPlanTest_jsonplan/testEventTimeTumbleWindow.out
index 96e8440a89a..0b72db793d9 100644
--- a/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/PythonGroupWindowAggregateJsonPlanTest_jsonplan/testEventTimeTumbleWindow.out
+++ b/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/PythonGroupWindowAggregateJsonPlanTest_jsonplan/testEventTimeTumbleWindow.out
@@ -415,7 +415,7 @@
"description" : "Calc(select=[b, w$start AS window_start, w$end AS window_end, EXPR$3])"
}, {
"id" : 8,
- "type" : "stream-exec-sink_1",
+ "type" : "stream-exec-sink_2",
"configuration" : {
"table.exec.sink.keyed-shuffle" : "AUTO",
"table.exec.sink.not-null-enforcer" : "ERROR",
diff --git a/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/PythonGroupWindowAggregateJsonPlanTest_jsonplan/testProcTimeHopWindow.out b/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/PythonGroupWindowAggregateJsonPlanTest_jsonplan/testProcTimeHopWindow.out
index e44b53bc2f1..e138dcba3e0 100644
--- a/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/PythonGroupWindowAggregateJsonPlanTest_jsonplan/testProcTimeHopWindow.out
+++ b/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/PythonGroupWindowAggregateJsonPlanTest_jsonplan/testProcTimeHopWindow.out
@@ -358,7 +358,7 @@
"description" : "PythonGroupWindowAggregate(groupBy=[b], window=[SlidingGroupWindow('w$, proctime, 600000, 300000)], select=[b, pyFunc(a, $f3) AS EXPR$1])"
}, {
"id" : 7,
- "type" : "stream-exec-sink_1",
+ "type" : "stream-exec-sink_2",
"configuration" : {
"table.exec.sink.keyed-shuffle" : "AUTO",
"table.exec.sink.not-null-enforcer" : "ERROR",
diff --git a/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/PythonGroupWindowAggregateJsonPlanTest_jsonplan/testProcTimeSessionWindow.out b/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/PythonGroupWindowAggregateJsonPlanTest_jsonplan/testProcTimeSessionWindow.out
index 86ab8d82dd2..dcc08485be0 100644
--- a/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/PythonGroupWindowAggregateJsonPlanTest_jsonplan/testProcTimeSessionWindow.out
+++ b/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/PythonGroupWindowAggregateJsonPlanTest_jsonplan/testProcTimeSessionWindow.out
@@ -356,7 +356,7 @@
"description" : "PythonGroupWindowAggregate(groupBy=[b], window=[SessionGroupWindow('w$, proctime, 600000)], select=[b, pyFunc(a, $f3) AS EXPR$1])"
}, {
"id" : 7,
- "type" : "stream-exec-sink_1",
+ "type" : "stream-exec-sink_2",
"configuration" : {
"table.exec.sink.keyed-shuffle" : "AUTO",
"table.exec.sink.not-null-enforcer" : "ERROR",
diff --git a/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/PythonGroupWindowAggregateJsonPlanTest_jsonplan/testProcTimeTumbleWindow.out b/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/PythonGroupWindowAggregateJsonPlanTest_jsonplan/testProcTimeTumbleWindow.out
index 544d4db6ce8..2a417743eff 100644
--- a/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/PythonGroupWindowAggregateJsonPlanTest_jsonplan/testProcTimeTumbleWindow.out
+++ b/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/PythonGroupWindowAggregateJsonPlanTest_jsonplan/testProcTimeTumbleWindow.out
@@ -447,7 +447,7 @@
"description" : "Calc(select=[b, w$end AS window_end, EXPR$2])"
}, {
"id" : 8,
- "type" : "stream-exec-sink_1",
+ "type" : "stream-exec-sink_2",
"configuration" : {
"table.exec.sink.keyed-shuffle" : "AUTO",
"table.exec.sink.not-null-enforcer" : "ERROR",
diff --git a/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/PythonOverAggregateJsonPlanTest_jsonplan/testProcTimeBoundedNonPartitionedRangeOver.out b/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/PythonOverAggregateJsonPlanTest_jsonplan/testProcTimeBoundedNonPartitionedRangeOver.out
index acf9749ab4e..6fe95a38bc8 100644
--- a/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/PythonOverAggregateJsonPlanTest_jsonplan/testProcTimeBoundedNonPartitionedRangeOver.out
+++ b/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/PythonOverAggregateJsonPlanTest_jsonplan/testProcTimeBoundedNonPartitionedRangeOver.out
@@ -354,7 +354,7 @@
"description" : "Calc(select=[$2 AS $0, w0$o0 AS $1])"
}, {
"id" : 8,
- "type" : "stream-exec-sink_1",
+ "type" : "stream-exec-sink_2",
"configuration" : {
"table.exec.sink.keyed-shuffle" : "AUTO",
"table.exec.sink.not-null-enforcer" : "ERROR",
diff --git a/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/PythonOverAggregateJsonPlanTest_jsonplan/testProcTimeBoundedPartitionedRangeOver.out b/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/PythonOverAggregateJsonPlanTest_jsonplan/testProcTimeBoundedPartitionedRangeOver.out
index 28c139943f9..2bb1131d593 100644
--- a/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/PythonOverAggregateJsonPlanTest_jsonplan/testProcTimeBoundedPartitionedRangeOver.out
+++ b/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/PythonOverAggregateJsonPlanTest_jsonplan/testProcTimeBoundedPartitionedRangeOver.out
@@ -368,7 +368,7 @@
"description" : "Calc(select=[$3 AS $0, w0$o0 AS $1])"
}, {
"id" : 8,
- "type" : "stream-exec-sink_1",
+ "type" : "stream-exec-sink_2",
"configuration" : {
"table.exec.sink.keyed-shuffle" : "AUTO",
"table.exec.sink.not-null-enforcer" : "ERROR",
diff --git a/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/PythonOverAggregateJsonPlanTest_jsonplan/testProcTimeBoundedPartitionedRowsOverWithBuiltinProctime.out b/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/PythonOverAggregateJsonPlanTest_jsonplan/testProcTimeBoundedPartitionedRowsOverWithBuiltinProctime.out
index 04d23d8209a..503de28e9e5 100644
--- a/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/PythonOverAggregateJsonPlanTest_jsonplan/testProcTimeBoundedPartitionedRowsOverWithBuiltinProctime.out
+++ b/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/PythonOverAggregateJsonPlanTest_jsonplan/testProcTimeBoundedPartitionedRowsOverWithBuiltinProctime.out
@@ -305,7 +305,7 @@
"description" : "Calc(select=[$2 AS $0, w0$o0 AS $1])"
}, {
"id" : 7,
- "type" : "stream-exec-sink_1",
+ "type" : "stream-exec-sink_2",
"configuration" : {
"table.exec.sink.keyed-shuffle" : "AUTO",
"table.exec.sink.not-null-enforcer" : "ERROR",
diff --git a/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/PythonOverAggregateJsonPlanTest_jsonplan/testProcTimeUnboundedPartitionedRangeOver.out b/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/PythonOverAggregateJsonPlanTest_jsonplan/testProcTimeUnboundedPartitionedRangeOver.out
index 0b95247d2c4..e4cdb7fa3cb 100644
--- a/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/PythonOverAggregateJsonPlanTest_jsonplan/testProcTimeUnboundedPartitionedRangeOver.out
+++ b/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/PythonOverAggregateJsonPlanTest_jsonplan/testProcTimeUnboundedPartitionedRangeOver.out
@@ -358,7 +358,7 @@
"description" : "Calc(select=[$3 AS $0, w0$o0 AS $1])"
}, {
"id" : 8,
- "type" : "stream-exec-sink_1",
+ "type" : "stream-exec-sink_2",
"configuration" : {
"table.exec.sink.keyed-shuffle" : "AUTO",
"table.exec.sink.not-null-enforcer" : "ERROR",
diff --git a/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/PythonOverAggregateJsonPlanTest_jsonplan/testRowTimeBoundedPartitionedRowsOver.out b/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/PythonOverAggregateJsonPlanTest_jsonplan/testRowTimeBoundedPartitionedRowsOver.out
index bd6753fc60e..9954a54c74e 100644
--- a/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/PythonOverAggregateJsonPlanTest_jsonplan/testRowTimeBoundedPartitionedRowsOver.out
+++ b/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/PythonOverAggregateJsonPlanTest_jsonplan/testRowTimeBoundedPartitionedRowsOver.out
@@ -300,7 +300,7 @@
"description" : "Calc(select=[$3 AS $0, w0$o0 AS $1])"
}, {
"id" : 7,
- "type" : "stream-exec-sink_1",
+ "type" : "stream-exec-sink_2",
"configuration" : {
"table.exec.sink.keyed-shuffle" : "AUTO",
"table.exec.sink.not-null-enforcer" : "ERROR",
diff --git a/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/RankJsonPlanTest_jsonplan/testRank.out b/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/RankJsonPlanTest_jsonplan/testRank.out
index 3c0fde4021a..4ad4769728c 100644
--- a/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/RankJsonPlanTest_jsonplan/testRank.out
+++ b/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/RankJsonPlanTest_jsonplan/testRank.out
@@ -71,7 +71,7 @@
"description" : "Exchange(distribution=[hash[b]])"
}, {
"id" : 4,
- "type" : "stream-exec-rank_1",
+ "type" : "stream-exec-rank_2",
"configuration" : {
"table.exec.rank.topn-cache-size" : "10000"
},
@@ -95,6 +95,11 @@
},
"outputRowNumber" : true,
"generateUpdateBefore" : true,
+ "state" : [ {
+ "index" : 0,
+ "ttl" : "0 ms",
+ "name" : "rankState"
+ } ],
"inputProperties" : [ {
"requiredDistribution" : {
"type" : "UNKNOWN"
@@ -128,7 +133,7 @@
"description" : "Calc(select=[a, w0$o0])"
}, {
"id" : 6,
- "type" : "stream-exec-sink_1",
+ "type" : "stream-exec-sink_2",
"configuration" : {
"table.exec.sink.keyed-shuffle" : "AUTO",
"table.exec.sink.not-null-enforcer" : "ERROR",
diff --git a/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/SortLimitJsonPlanTest_jsonplan/testSortLimit.out b/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/SortLimitJsonPlanTest_jsonplan/testSortLimit.out
index c0a3251360a..6525462393d 100644
--- a/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/SortLimitJsonPlanTest_jsonplan/testSortLimit.out
+++ b/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/SortLimitJsonPlanTest_jsonplan/testSortLimit.out
@@ -57,7 +57,7 @@
"description" : "Exchange(distribution=[single])"
}, {
"id" : 3,
- "type" : "stream-exec-sort-limit_1",
+ "type" : "stream-exec-sort-limit_2",
"configuration" : {
"table.exec.rank.topn-cache-size" : "10000"
},
@@ -77,6 +77,11 @@
"type" : "AppendFast"
},
"generateUpdateBefore" : true,
+ "state" : [ {
+ "index" : 0,
+ "ttl" : "0 ms",
+ "name" : "rankState"
+ } ],
"inputProperties" : [ {
"requiredDistribution" : {
"type" : "UNKNOWN"
@@ -115,7 +120,7 @@
"description" : "Calc(select=[a, a AS a1])"
}, {
"id" : 5,
- "type" : "stream-exec-sink_1",
+ "type" : "stream-exec-sink_2",
"configuration" : {
"table.exec.sink.keyed-shuffle" : "AUTO",
"table.exec.sink.not-null-enforcer" : "ERROR",
diff --git a/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/TableSinkJsonPlanTest_jsonplan/testCdcWithNonDeterministicFuncSinkWithDifferentPk.out b/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/TableSinkJsonPlanTest_jsonplan/testCdcWithNonDeterministicFuncSinkWithDifferentPk.out
index 40bedb2ea92..bb16afd1a67 100644
--- a/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/TableSinkJsonPlanTest_jsonplan/testCdcWithNonDeterministicFuncSinkWithDifferentPk.out
+++ b/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/TableSinkJsonPlanTest_jsonplan/testCdcWithNonDeterministicFuncSinkWithDifferentPk.out
@@ -76,7 +76,7 @@
"description" : "Calc(select=[user_id, ndFunc(user_name) AS EXPR$1, email, balance])"
}, {
"id" : 3,
- "type" : "stream-exec-sink_1",
+ "type" : "stream-exec-sink_2",
"configuration" : {
"table.exec.sink.keyed-shuffle" : "AUTO",
"table.exec.sink.not-null-enforcer" : "ERROR",
@@ -117,6 +117,13 @@
}
},
"inputChangelogMode" : [ "INSERT", "UPDATE_BEFORE", "UPDATE_AFTER", "DELETE" ],
+ "requireUpsertMaterialize" : true,
+ "state" : [ {
+ "index" : 0,
+ "ttl" : "0 ms",
+ "name" : "sinkMaterializeState"
+ } ],
+ "inputUpsertKey" : [ 0 ],
"inputProperties" : [ {
"requiredDistribution" : {
"type" : "UNKNOWN"
@@ -125,8 +132,6 @@
"priority" : 0
} ],
"outputType" : "ROW<`user_id` VARCHAR(2147483647) NOT NULL, `EXPR$1` VARCHAR(2147483647), `email` VARCHAR(2147483647), `balance` DECIMAL(18, 2)>",
- "requireUpsertMaterialize" : true,
- "inputUpsertKey" : [ 0 ],
"description" : "Sink(table=[default_catalog.default_database.sink], fields=[user_id, EXPR$1, email, balance], upsertMaterialize=[true])"
} ],
"edges" : [ {
diff --git a/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/TableSinkJsonPlanTest_jsonplan/testOverwrite.out b/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/TableSinkJsonPlanTest_jsonplan/testOverwrite.out
index c9d3d045313..10ae42699e2 100644
--- a/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/TableSinkJsonPlanTest_jsonplan/testOverwrite.out
+++ b/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/TableSinkJsonPlanTest_jsonplan/testOverwrite.out
@@ -33,7 +33,7 @@
"inputProperties" : [ ]
}, {
"id" : 2,
- "type" : "stream-exec-sink_1",
+ "type" : "stream-exec-sink_2",
"configuration" : {
"table.exec.sink.keyed-shuffle" : "AUTO",
"table.exec.sink.not-null-enforcer" : "ERROR",
diff --git a/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/TableSinkJsonPlanTest_jsonplan/testPartialInsert.out b/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/TableSinkJsonPlanTest_jsonplan/testPartialInsert.out
index fd587e59286..18ea6a67dbc 100644
--- a/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/TableSinkJsonPlanTest_jsonplan/testPartialInsert.out
+++ b/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/TableSinkJsonPlanTest_jsonplan/testPartialInsert.out
@@ -71,7 +71,7 @@
"description" : "Calc(select=[a, b, 'A' AS EXPR$2, null:INTEGER AS EXPR$3, null:DOUBLE AS EXPR$4, c])"
}, {
"id" : 3,
- "type" : "stream-exec-sink_1",
+ "type" : "stream-exec-sink_2",
"configuration" : {
"table.exec.sink.keyed-shuffle" : "AUTO",
"table.exec.sink.not-null-enforcer" : "ERROR",
diff --git a/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/TableSinkJsonPlanTest_jsonplan/testPartitioning.out b/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/TableSinkJsonPlanTest_jsonplan/testPartitioning.out
index 4858fb995f6..056f08ac97a 100644
--- a/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/TableSinkJsonPlanTest_jsonplan/testPartitioning.out
+++ b/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/TableSinkJsonPlanTest_jsonplan/testPartitioning.out
@@ -68,7 +68,7 @@
"description" : "Calc(select=[a, b, 'A' AS EXPR$2])"
}, {
"id" : 3,
- "type" : "stream-exec-sink_1",
+ "type" : "stream-exec-sink_2",
"configuration" : {
"table.exec.sink.keyed-shuffle" : "AUTO",
"table.exec.sink.not-null-enforcer" : "ERROR",
diff --git a/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/TableSinkJsonPlanTest_jsonplan/testWritingMetadata.out b/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/TableSinkJsonPlanTest_jsonplan/testWritingMetadata.out
index 60411d8a3d9..1ee8691c0a3 100644
--- a/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/TableSinkJsonPlanTest_jsonplan/testWritingMetadata.out
+++ b/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/TableSinkJsonPlanTest_jsonplan/testWritingMetadata.out
@@ -33,7 +33,7 @@
"inputProperties" : [ ]
}, {
"id" : 2,
- "type" : "stream-exec-sink_1",
+ "type" : "stream-exec-sink_2",
"configuration" : {
"table.exec.sink.keyed-shuffle" : "AUTO",
"table.exec.sink.not-null-enforcer" : "ERROR",
diff --git a/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/TableSourceJsonPlanTest_jsonplan/testFilterPushDown.out b/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/TableSourceJsonPlanTest_jsonplan/testFilterPushDown.out
index 25a53489e38..067237904b1 100644
--- a/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/TableSourceJsonPlanTest_jsonplan/testFilterPushDown.out
+++ b/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/TableSourceJsonPlanTest_jsonplan/testFilterPushDown.out
@@ -52,7 +52,7 @@
"inputProperties" : [ ]
}, {
"id" : 2,
- "type" : "stream-exec-sink_1",
+ "type" : "stream-exec-sink_2",
"configuration" : {
"table.exec.sink.keyed-shuffle" : "AUTO",
"table.exec.sink.not-null-enforcer" : "ERROR",
diff --git a/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/TableSourceJsonPlanTest_jsonplan/testLimitPushDown.out b/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/TableSourceJsonPlanTest_jsonplan/testLimitPushDown.out
index 50c566df575..9b59554fbda 100644
--- a/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/TableSourceJsonPlanTest_jsonplan/testLimitPushDown.out
+++ b/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/TableSourceJsonPlanTest_jsonplan/testLimitPushDown.out
@@ -49,7 +49,7 @@
"description" : "Exchange(distribution=[single])"
}, {
"id" : 3,
- "type" : "stream-exec-limit_1",
+ "type" : "stream-exec-limit_2",
"configuration" : {
"table.exec.rank.topn-cache-size" : "10000"
},
@@ -62,6 +62,11 @@
"type" : "AppendFast"
},
"generateUpdateBefore" : false,
+ "state" : [ {
+ "index" : 0,
+ "ttl" : "0 ms",
+ "name" : "rankState"
+ } ],
"inputProperties" : [ {
"requiredDistribution" : {
"type" : "UNKNOWN"
@@ -81,7 +86,7 @@
"outputRowNumber" : false
}, {
"id" : 4,
- "type" : "stream-exec-sink_1",
+ "type" : "stream-exec-sink_2",
"configuration" : {
"table.exec.sink.keyed-shuffle" : "AUTO",
"table.exec.sink.not-null-enforcer" : "ERROR",
diff --git a/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/TableSourceJsonPlanTest_jsonplan/testPartitionPushDown.out b/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/TableSourceJsonPlanTest_jsonplan/testPartitionPushDown.out
index 92328503259..dfa3c68e166 100644
--- a/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/TableSourceJsonPlanTest_jsonplan/testPartitionPushDown.out
+++ b/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/TableSourceJsonPlanTest_jsonplan/testPartitionPushDown.out
@@ -80,7 +80,7 @@
"description" : "Calc(select=[a, b, CAST('A' AS VARCHAR(2147483647)) AS p])"
}, {
"id" : 3,
- "type" : "stream-exec-sink_1",
+ "type" : "stream-exec-sink_2",
"configuration" : {
"table.exec.sink.keyed-shuffle" : "AUTO",
"table.exec.sink.not-null-enforcer" : "ERROR",
diff --git a/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/TableSourceJsonPlanTest_jsonplan/testProjectPushDown.out b/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/TableSourceJsonPlanTest_jsonplan/testProjectPushDown.out
index 98a25181247..1b855167f6d 100644
--- a/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/TableSourceJsonPlanTest_jsonplan/testProjectPushDown.out
+++ b/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/TableSourceJsonPlanTest_jsonplan/testProjectPushDown.out
@@ -42,7 +42,7 @@
"inputProperties" : [ ]
}, {
"id" : 2,
- "type" : "stream-exec-sink_1",
+ "type" : "stream-exec-sink_2",
"configuration" : {
"table.exec.sink.keyed-shuffle" : "AUTO",
"table.exec.sink.not-null-enforcer" : "ERROR",
diff --git a/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/TableSourceJsonPlanTest_jsonplan/testReadingMetadata.out b/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/TableSourceJsonPlanTest_jsonplan/testReadingMetadata.out
index a8014cf4400..f48790cbed0 100644
--- a/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/TableSourceJsonPlanTest_jsonplan/testReadingMetadata.out
+++ b/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/TableSourceJsonPlanTest_jsonplan/testReadingMetadata.out
@@ -48,7 +48,7 @@
"inputProperties" : [ ]
}, {
"id" : 2,
- "type" : "stream-exec-sink_1",
+ "type" : "stream-exec-sink_2",
"configuration" : {
"table.exec.sink.keyed-shuffle" : "AUTO",
"table.exec.sink.not-null-enforcer" : "ERROR",
diff --git a/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/TableSourceJsonPlanTest_jsonplan/testWatermarkPushDown.out b/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/TableSourceJsonPlanTest_jsonplan/testWatermarkPushDown.out
index bf02aa52233..49e04cdb3b0 100644
--- a/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/TableSourceJsonPlanTest_jsonplan/testWatermarkPushDown.out
+++ b/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/TableSourceJsonPlanTest_jsonplan/testWatermarkPushDown.out
@@ -112,7 +112,7 @@
"inputProperties" : [ ]
}, {
"id" : 2,
- "type" : "stream-exec-sink_1",
+ "type" : "stream-exec-sink_2",
"configuration" : {
"table.exec.sink.keyed-shuffle" : "AUTO",
"table.exec.sink.not-null-enforcer" : "ERROR",
diff --git a/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/TemporalJoinJsonPlanTest_jsonplan/testJoinTemporalFunction.out b/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/TemporalJoinJsonPlanTest_jsonplan/testJoinTemporalFunction.out
index 6c093078332..f312826c038 100644
--- a/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/TemporalJoinJsonPlanTest_jsonplan/testJoinTemporalFunction.out
+++ b/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/TemporalJoinJsonPlanTest_jsonplan/testJoinTemporalFunction.out
@@ -323,7 +323,7 @@
"description" : "Calc(select=[(amount * rate) AS EXPR$0])"
}, {
"id" : 9,
- "type" : "stream-exec-sink_1",
+ "type" : "stream-exec-sink_2",
"configuration" : {
"table.exec.sink.keyed-shuffle" : "AUTO",
"table.exec.sink.not-null-enforcer" : "ERROR",
diff --git a/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/TemporalJoinJsonPlanTest_jsonplan/testTemporalTableJoin.out b/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/TemporalJoinJsonPlanTest_jsonplan/testTemporalTableJoin.out
index 7666686f266..f1ca79a24f0 100644
--- a/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/TemporalJoinJsonPlanTest_jsonplan/testTemporalTableJoin.out
+++ b/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/TemporalJoinJsonPlanTest_jsonplan/testTemporalTableJoin.out
@@ -323,7 +323,7 @@
"description" : "Calc(select=[(amount * rate) AS EXPR$0])"
}, {
"id" : 9,
- "type" : "stream-exec-sink_1",
+ "type" : "stream-exec-sink_2",
"configuration" : {
"table.exec.sink.keyed-shuffle" : "AUTO",
"table.exec.sink.not-null-enforcer" : "ERROR",
diff --git a/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/TemporalSortJsonPlanTest_jsonplan/testSortProcessingTime.out b/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/TemporalSortJsonPlanTest_jsonplan/testSortProcessingTime.out
index a8b9d4c857c..b2943f9b2d2 100644
--- a/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/TemporalSortJsonPlanTest_jsonplan/testSortProcessingTime.out
+++ b/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/TemporalSortJsonPlanTest_jsonplan/testSortProcessingTime.out
@@ -308,7 +308,7 @@
"description" : "Calc(select=[a])"
}, {
"id" : 7,
- "type" : "stream-exec-sink_1",
+ "type" : "stream-exec-sink_2",
"configuration" : {
"table.exec.sink.keyed-shuffle" : "AUTO",
"table.exec.sink.not-null-enforcer" : "ERROR",
diff --git a/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/TemporalSortJsonPlanTest_jsonplan/testSortRowTime.out b/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/TemporalSortJsonPlanTest_jsonplan/testSortRowTime.out
index 1bfbf4d324a..566ceb551be 100644
--- a/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/TemporalSortJsonPlanTest_jsonplan/testSortRowTime.out
+++ b/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/TemporalSortJsonPlanTest_jsonplan/testSortRowTime.out
@@ -254,7 +254,7 @@
"description" : "Calc(select=[a])"
}, {
"id" : 7,
- "type" : "stream-exec-sink_1",
+ "type" : "stream-exec-sink_2",
"configuration" : {
"table.exec.sink.keyed-shuffle" : "AUTO",
"table.exec.sink.not-null-enforcer" : "ERROR",
diff --git a/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/UnionJsonPlanTest_jsonplan/testUnion.out b/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/UnionJsonPlanTest_jsonplan/testUnion.out
index 246a01af684..f112dfaf611 100644
--- a/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/UnionJsonPlanTest_jsonplan/testUnion.out
+++ b/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/UnionJsonPlanTest_jsonplan/testUnion.out
@@ -91,7 +91,7 @@
"description" : "Union(all=[true], union=[a, b])"
}, {
"id" : 4,
- "type" : "stream-exec-sink_1",
+ "type" : "stream-exec-sink_2",
"configuration" : {
"table.exec.sink.keyed-shuffle" : "AUTO",
"table.exec.sink.not-null-enforcer" : "ERROR",
diff --git a/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/ValuesJsonPlanTest_jsonplan/testValues.out b/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/ValuesJsonPlanTest_jsonplan/testValues.out
index 718cff0937e..76db73c84a7 100644
--- a/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/ValuesJsonPlanTest_jsonplan/testValues.out
+++ b/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/ValuesJsonPlanTest_jsonplan/testValues.out
@@ -77,7 +77,7 @@
"description" : "Calc(select=[CAST(EXPR$0 AS BIGINT) AS a, CAST(EXPR$1 AS BIGINT) AS b, CAST(EXPR$2 AS VARCHAR(2147483647)) AS c])"
}, {
"id" : 3,
- "type" : "stream-exec-sink_1",
+ "type" : "stream-exec-sink_2",
"configuration" : {
"table.exec.sink.keyed-shuffle" : "AUTO",
"table.exec.sink.not-null-enforcer" : "ERROR",
diff --git a/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/WatermarkAssignerJsonPlanTest_jsonplan/testWatermarkAssigner.out b/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/WatermarkAssignerJsonPlanTest_jsonplan/testWatermarkAssigner.out
index 4ebd7ddefd6..72f24ae27a8 100644
--- a/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/WatermarkAssignerJsonPlanTest_jsonplan/testWatermarkAssigner.out
+++ b/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/WatermarkAssignerJsonPlanTest_jsonplan/testWatermarkAssigner.out
@@ -103,7 +103,7 @@
"description" : "WatermarkAssigner(rowtime=[c], watermark=[(c - 5000:INTERVAL SECOND)])"
}, {
"id" : 3,
- "type" : "stream-exec-sink_1",
+ "type" : "stream-exec-sink_2",
"configuration" : {
"table.exec.sink.keyed-shuffle" : "AUTO",
"table.exec.sink.not-null-enforcer" : "ERROR",
diff --git a/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/WindowAggregateJsonPlanTest_jsonplan/testDistinctSplitEnabled.out b/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/WindowAggregateJsonPlanTest_jsonplan/testDistinctSplitEnabled.out
index 7b2c254af5c..3aa41526073 100644
--- a/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/WindowAggregateJsonPlanTest_jsonplan/testDistinctSplitEnabled.out
+++ b/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/WindowAggregateJsonPlanTest_jsonplan/testDistinctSplitEnabled.out
@@ -783,7 +783,7 @@
"description" : "Calc(select=[CAST(a AS BIGINT) AS a, CAST(window_start AS TIMESTAMP(3)) AS window_start, CAST(window_end AS TIMESTAMP(3)) AS window_end, CAST($f1 AS BIGINT) AS cnt_star, $f2 AS sum_b, CAST($f3 AS BIGINT) AS cnt_distinct_c])"
}, {
"id" : 13,
- "type" : "stream-exec-sink_1",
+ "type" : "stream-exec-sink_2",
"configuration" : {
"table.exec.sink.keyed-shuffle" : "AUTO",
"table.exec.sink.not-null-enforcer" : "ERROR",
diff --git a/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/WindowAggregateJsonPlanTest_jsonplan/testEventTimeCumulateWindow.out b/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/WindowAggregateJsonPlanTest_jsonplan/testEventTimeCumulateWindow.out
index cdfeaf552f1..5b9b3f93339 100644
--- a/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/WindowAggregateJsonPlanTest_jsonplan/testEventTimeCumulateWindow.out
+++ b/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/WindowAggregateJsonPlanTest_jsonplan/testEventTimeCumulateWindow.out
@@ -412,7 +412,7 @@
"description" : "Calc(select=[b, window_end, EXPR$2, EXPR$3])"
}, {
"id" : 9,
- "type" : "stream-exec-sink_1",
+ "type" : "stream-exec-sink_2",
"configuration" : {
"table.exec.sink.keyed-shuffle" : "AUTO",
"table.exec.sink.not-null-enforcer" : "ERROR",
diff --git a/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/WindowAggregateJsonPlanTest_jsonplan/testEventTimeCumulateWindowWithOffset.out b/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/WindowAggregateJsonPlanTest_jsonplan/testEventTimeCumulateWindowWithOffset.out
index aa5990662ab..ec749e9bda9 100644
--- a/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/WindowAggregateJsonPlanTest_jsonplan/testEventTimeCumulateWindowWithOffset.out
+++ b/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/WindowAggregateJsonPlanTest_jsonplan/testEventTimeCumulateWindowWithOffset.out
@@ -414,7 +414,7 @@
"description" : "Calc(select=[b, window_end, EXPR$2, EXPR$3])"
}, {
"id" : 9,
- "type" : "stream-exec-sink_1",
+ "type" : "stream-exec-sink_2",
"configuration" : {
"table.exec.sink.keyed-shuffle" : "AUTO",
"table.exec.sink.not-null-enforcer" : "ERROR",
diff --git a/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/WindowAggregateJsonPlanTest_jsonplan/testEventTimeHopWindow.out b/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/WindowAggregateJsonPlanTest_jsonplan/testEventTimeHopWindow.out
index 74a780364d8..148cd463b61 100644
--- a/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/WindowAggregateJsonPlanTest_jsonplan/testEventTimeHopWindow.out
+++ b/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/WindowAggregateJsonPlanTest_jsonplan/testEventTimeHopWindow.out
@@ -408,7 +408,7 @@
"description" : "Calc(select=[b, EXPR$1, EXPR$2])"
}, {
"id" : 9,
- "type" : "stream-exec-sink_1",
+ "type" : "stream-exec-sink_2",
"configuration" : {
"table.exec.sink.keyed-shuffle" : "AUTO",
"table.exec.sink.not-null-enforcer" : "ERROR",
diff --git a/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/WindowAggregateJsonPlanTest_jsonplan/testEventTimeHopWindowWithOffset.out b/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/WindowAggregateJsonPlanTest_jsonplan/testEventTimeHopWindowWithOffset.out
index fd02b9e0855..3e6af40ae01 100644
--- a/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/WindowAggregateJsonPlanTest_jsonplan/testEventTimeHopWindowWithOffset.out
+++ b/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/WindowAggregateJsonPlanTest_jsonplan/testEventTimeHopWindowWithOffset.out
@@ -410,7 +410,7 @@
"description" : "Calc(select=[b, EXPR$1, EXPR$2])"
}, {
"id" : 9,
- "type" : "stream-exec-sink_1",
+ "type" : "stream-exec-sink_2",
"configuration" : {
"table.exec.sink.keyed-shuffle" : "AUTO",
"table.exec.sink.not-null-enforcer" : "ERROR",
diff --git a/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/WindowAggregateJsonPlanTest_jsonplan/testEventTimeTumbleWindow.out b/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/WindowAggregateJsonPlanTest_jsonplan/testEventTimeTumbleWindow.out
index 9d9064218f7..a6b76215d7a 100644
--- a/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/WindowAggregateJsonPlanTest_jsonplan/testEventTimeTumbleWindow.out
+++ b/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/WindowAggregateJsonPlanTest_jsonplan/testEventTimeTumbleWindow.out
@@ -624,7 +624,7 @@
"description" : "Calc(select=[b, window_start, window_end, EXPR$3, EXPR$4, EXPR$5, EXPR$6])"
}, {
"id" : 9,
- "type" : "stream-exec-sink_1",
+ "type" : "stream-exec-sink_2",
"configuration" : {
"table.exec.sink.keyed-shuffle" : "AUTO",
"table.exec.sink.not-null-enforcer" : "ERROR",
diff --git a/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/WindowAggregateJsonPlanTest_jsonplan/testEventTimeTumbleWindowWithOffset.out b/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/WindowAggregateJsonPlanTest_jsonplan/testEventTimeTumbleWindowWithOffset.out
index 577951a3fe6..61ccde4afd1 100644
--- a/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/WindowAggregateJsonPlanTest_jsonplan/testEventTimeTumbleWindowWithOffset.out
+++ b/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/WindowAggregateJsonPlanTest_jsonplan/testEventTimeTumbleWindowWithOffset.out
@@ -626,7 +626,7 @@
"description" : "Calc(select=[b, window_start, window_end, EXPR$3, EXPR$4, EXPR$5, EXPR$6])"
}, {
"id" : 9,
- "type" : "stream-exec-sink_1",
+ "type" : "stream-exec-sink_2",
"configuration" : {
"table.exec.sink.keyed-shuffle" : "AUTO",
"table.exec.sink.not-null-enforcer" : "ERROR",
diff --git a/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/WindowAggregateJsonPlanTest_jsonplan/testProcTimeCumulateWindow.out b/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/WindowAggregateJsonPlanTest_jsonplan/testProcTimeCumulateWindow.out
index b7c7cb2a05c..7028b677498 100644
--- a/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/WindowAggregateJsonPlanTest_jsonplan/testProcTimeCumulateWindow.out
+++ b/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/WindowAggregateJsonPlanTest_jsonplan/testProcTimeCumulateWindow.out
@@ -379,7 +379,7 @@
"description" : "Calc(select=[b, EXPR$1])"
}, {
"id" : 8,
- "type" : "stream-exec-sink_1",
+ "type" : "stream-exec-sink_2",
"configuration" : {
"table.exec.sink.keyed-shuffle" : "AUTO",
"table.exec.sink.not-null-enforcer" : "ERROR",
diff --git a/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/WindowAggregateJsonPlanTest_jsonplan/testProcTimeHopWindow.out b/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/WindowAggregateJsonPlanTest_jsonplan/testProcTimeHopWindow.out
index 0f5cbd6d713..4ee5a58af94 100644
--- a/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/WindowAggregateJsonPlanTest_jsonplan/testProcTimeHopWindow.out
+++ b/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/WindowAggregateJsonPlanTest_jsonplan/testProcTimeHopWindow.out
@@ -379,7 +379,7 @@
"description" : "Calc(select=[b, EXPR$1])"
}, {
"id" : 8,
- "type" : "stream-exec-sink_1",
+ "type" : "stream-exec-sink_2",
"configuration" : {
"table.exec.sink.keyed-shuffle" : "AUTO",
"table.exec.sink.not-null-enforcer" : "ERROR",
diff --git a/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/WindowAggregateJsonPlanTest_jsonplan/testProcTimeTumbleWindow.out b/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/WindowAggregateJsonPlanTest_jsonplan/testProcTimeTumbleWindow.out
index 2b2369f3e4a..a3b5c73c7a8 100644
--- a/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/WindowAggregateJsonPlanTest_jsonplan/testProcTimeTumbleWindow.out
+++ b/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/WindowAggregateJsonPlanTest_jsonplan/testProcTimeTumbleWindow.out
@@ -362,7 +362,7 @@
"description" : "Calc(select=[b, window_end, EXPR$2])"
}, {
"id" : 8,
- "type" : "stream-exec-sink_1",
+ "type" : "stream-exec-sink_2",
"configuration" : {
"table.exec.sink.keyed-shuffle" : "AUTO",
"table.exec.sink.not-null-enforcer" : "ERROR",
diff --git a/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/WindowJoinJsonPlanTest_jsonplan/testEventTimeTumbleWindow.out b/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/WindowJoinJsonPlanTest_jsonplan/testEventTimeTumbleWindow.out
index 2a59a3f7a2d..2c0b17949e9 100644
--- a/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/WindowJoinJsonPlanTest_jsonplan/testEventTimeTumbleWindow.out
+++ b/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/WindowJoinJsonPlanTest_jsonplan/testEventTimeTumbleWindow.out
@@ -1078,7 +1078,7 @@
"description" : "Calc(select=[a, window_start, window_end, cnt, uv, a0, cnt0, uv0])"
}, {
"id" : 19,
- "type" : "stream-exec-sink_1",
+ "type" : "stream-exec-sink_2",
"configuration" : {
"table.exec.sink.keyed-shuffle" : "AUTO",
"table.exec.sink.not-null-enforcer" : "ERROR",
diff --git a/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/WindowTableFunctionJsonPlanTest_jsonplan/testFollowedByWindowDeduplicate.out b/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/WindowTableFunctionJsonPlanTest_jsonplan/testFollowedByWindowDeduplicate.out
index a10937b0c33..2e3653e3a1e 100644
--- a/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/WindowTableFunctionJsonPlanTest_jsonplan/testFollowedByWindowDeduplicate.out
+++ b/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/WindowTableFunctionJsonPlanTest_jsonplan/testFollowedByWindowDeduplicate.out
@@ -475,7 +475,7 @@
"description" : "Calc(select=[window_start, window_end, a, b, c])"
}, {
"id" : 9,
- "type" : "stream-exec-sink_1",
+ "type" : "stream-exec-sink_2",
"configuration" : {
"table.exec.sink.keyed-shuffle" : "AUTO",
"table.exec.sink.not-null-enforcer" : "ERROR",
diff --git a/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/WindowTableFunctionJsonPlanTest_jsonplan/testFollowedByWindowJoin.out b/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/WindowTableFunctionJsonPlanTest_jsonplan/testFollowedByWindowJoin.out
index f1f33d283a6..2a7c1bb4940 100644
--- a/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/WindowTableFunctionJsonPlanTest_jsonplan/testFollowedByWindowJoin.out
+++ b/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/WindowTableFunctionJsonPlanTest_jsonplan/testFollowedByWindowJoin.out
@@ -682,7 +682,7 @@
"description" : "Calc(select=[window_start, window_end, a, b, c, a0, b0, c0])"
}, {
"id" : 15,
- "type" : "stream-exec-sink_1",
+ "type" : "stream-exec-sink_2",
"configuration" : {
"table.exec.sink.keyed-shuffle" : "AUTO",
"table.exec.sink.not-null-enforcer" : "ERROR",
diff --git a/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/WindowTableFunctionJsonPlanTest_jsonplan/testFollowedByWindowRank.out b/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/WindowTableFunctionJsonPlanTest_jsonplan/testFollowedByWindowRank.out
index 398af034987..c88dc65c48e 100644
--- a/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/WindowTableFunctionJsonPlanTest_jsonplan/testFollowedByWindowRank.out
+++ b/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/WindowTableFunctionJsonPlanTest_jsonplan/testFollowedByWindowRank.out
@@ -406,7 +406,7 @@
"description" : "Calc(select=[window_start, window_end, a, b, c])"
}, {
"id" : 9,
- "type" : "stream-exec-sink_1",
+ "type" : "stream-exec-sink_2",
"configuration" : {
"table.exec.sink.keyed-shuffle" : "AUTO",
"table.exec.sink.not-null-enforcer" : "ERROR",
diff --git a/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/WindowTableFunctionJsonPlanTest_jsonplan/testIndividualWindowTVF.out b/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/WindowTableFunctionJsonPlanTest_jsonplan/testIndividualWindowTVF.out
index 24430239300..119c21f277f 100644
--- a/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/WindowTableFunctionJsonPlanTest_jsonplan/testIndividualWindowTVF.out
+++ b/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/WindowTableFunctionJsonPlanTest_jsonplan/testIndividualWindowTVF.out
@@ -263,7 +263,7 @@
"description" : "Calc(select=[window_start, window_end, a, b, c])"
}, {
"id" : 6,
- "type" : "stream-exec-sink_1",
+ "type" : "stream-exec-sink_2",
"configuration" : {
"table.exec.sink.keyed-shuffle" : "AUTO",
"table.exec.sink.not-null-enforcer" : "ERROR",
diff --git a/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/WindowTableFunctionJsonPlanTest_jsonplan/testIndividualWindowTVFProcessingTime.out b/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/WindowTableFunctionJsonPlanTest_jsonplan/testIndividualWindowTVFProcessingTime.out
index f3a32187d22..c1077d52839 100644
--- a/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/WindowTableFunctionJsonPlanTest_jsonplan/testIndividualWindowTVFProcessingTime.out
+++ b/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/WindowTableFunctionJsonPlanTest_jsonplan/testIndividualWindowTVFProcessingTime.out
@@ -361,7 +361,7 @@
"description" : "Calc(select=[window_start, window_end, a, b, c])"
}, {
"id" : 7,
- "type" : "stream-exec-sink_1",
+ "type" : "stream-exec-sink_2",
"configuration" : {
"table.exec.sink.keyed-shuffle" : "AUTO",
"table.exec.sink.not-null-enforcer" : "ERROR",