This is an automated email from the ASF dual-hosted git repository.
godfrey pushed a commit to branch release-1.13
in repository https://gitbox.apache.org/repos/asf/flink.git
The following commit(s) were added to refs/heads/release-1.13 by this push:
new 0cad0aa [hotfix][table-planner-blink] Fix the incorrect ExecNode's id
in testIncrementalAggregate.out
0cad0aa is described below
commit 0cad0aa7563c1be8fa33a3ea43f94fa889802cf3
Author: godfreyhe <[email protected]>
AuthorDate: Wed Apr 21 16:26:35 2021 +0800
[hotfix][table-planner-blink] Fix the incorrect ExecNode's id in
testIncrementalAggregate.out
After FLINK-22298 is finished, the ExecNode's id should always start from 1
in the json plan tests, while the testIncrementalAggregate.out was overrided by
FLINK-20613
This closes #15698
(cherry picked from commit 84ce237bbc04db47495abf5f50f8ac3cc6a793bd)
---
.../testIncrementalAggregate.out | 50 +++++++++++-----------
1 file changed, 25 insertions(+), 25 deletions(-)
diff --git
a/flink-table/flink-table-planner-blink/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/IncrementalAggregateJsonPlanTest_jsonplan/testIncrementalAggregate.out
b/flink-table/flink-table-planner-blink/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/IncrementalAggregateJsonPlanTest_jsonplan/testIncrementalAggregate.out
index a54cb42..9c54a23 100644
---
a/flink-table/flink-table-planner-blink/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/IncrementalAggregateJsonPlanTest_jsonplan/testIncrementalAggregate.out
+++
b/flink-table/flink-table-planner-blink/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/IncrementalAggregateJsonPlanTest_jsonplan/testIncrementalAggregate.out
@@ -34,7 +34,7 @@
}
} ]
},
- "id" : 18,
+ "id" : 1,
"outputType" : {
"type" : "ROW",
"nullable" : true,
@@ -52,7 +52,7 @@
"interval" : 10000,
"mode" : "ProcTime"
},
- "id" : 19,
+ "id" : 2,
"inputProperties" : [ {
"requiredDistribution" : {
"type" : "UNKNOWN"
@@ -128,7 +128,7 @@
}
} ],
"condition" : null,
- "id" : 20,
+ "id" : 3,
"inputProperties" : [ {
"requiredDistribution" : {
"type" : "UNKNOWN"
@@ -170,7 +170,7 @@
} ],
"aggCallNeedRetractions" : [ false ],
"needRetraction" : false,
- "id" : 21,
+ "id" : 4,
"inputProperties" : [ {
"requiredDistribution" : {
"type" : "UNKNOWN"
@@ -194,7 +194,7 @@
"description" : "LocalGroupAggregate(groupBy=[a, $f2],
partialFinalType=[PARTIAL], select=[a, $f2, COUNT(distinct$0 c) AS count$0,
DISTINCT(c) AS distinct$0])"
}, {
"class" :
"org.apache.flink.table.planner.plan.nodes.exec.stream.StreamExecExchange",
- "id" : 22,
+ "id" : 5,
"inputProperties" : [ {
"requiredDistribution" : {
"type" : "HASH",
@@ -251,7 +251,7 @@
} ]
},
"partialAggNeedRetraction" : false,
- "id" : 23,
+ "id" : 6,
"inputProperties" : [ {
"requiredDistribution" : {
"type" : "UNKNOWN"
@@ -271,7 +271,7 @@
"description" : "IncrementalGroupAggregate(partialAggGrouping=[a, $f2],
finalAggGrouping=[a], select=[a, COUNT(distinct$0 count$0) AS count$0])"
}, {
"class" :
"org.apache.flink.table.planner.plan.nodes.exec.stream.StreamExecExchange",
- "id" : 24,
+ "id" : 7,
"inputProperties" : [ {
"requiredDistribution" : {
"type" : "HASH",
@@ -324,7 +324,7 @@
},
"generateUpdateBefore" : true,
"needRetraction" : false,
- "id" : 25,
+ "id" : 8,
"inputProperties" : [ {
"requiredDistribution" : {
"type" : "UNKNOWN"
@@ -361,7 +361,7 @@
}
},
"inputChangelogMode" : [ "INSERT", "UPDATE_BEFORE", "UPDATE_AFTER",
"DELETE" ],
- "id" : 26,
+ "id" : 9,
"inputProperties" : [ {
"requiredDistribution" : {
"type" : "UNKNOWN"
@@ -381,57 +381,57 @@
"description" : "Sink(table=[default_catalog.default_database.MySink],
fields=[a, $f1])"
} ],
"edges" : [ {
- "source" : 18,
- "target" : 19,
+ "source" : 1,
+ "target" : 2,
"shuffle" : {
"type" : "FORWARD"
},
"shuffleMode" : "PIPELINED"
}, {
- "source" : 19,
- "target" : 20,
+ "source" : 2,
+ "target" : 3,
"shuffle" : {
"type" : "FORWARD"
},
"shuffleMode" : "PIPELINED"
}, {
- "source" : 20,
- "target" : 21,
+ "source" : 3,
+ "target" : 4,
"shuffle" : {
"type" : "FORWARD"
},
"shuffleMode" : "PIPELINED"
}, {
- "source" : 21,
- "target" : 22,
+ "source" : 4,
+ "target" : 5,
"shuffle" : {
"type" : "FORWARD"
},
"shuffleMode" : "PIPELINED"
}, {
- "source" : 22,
- "target" : 23,
+ "source" : 5,
+ "target" : 6,
"shuffle" : {
"type" : "FORWARD"
},
"shuffleMode" : "PIPELINED"
}, {
- "source" : 23,
- "target" : 24,
+ "source" : 6,
+ "target" : 7,
"shuffle" : {
"type" : "FORWARD"
},
"shuffleMode" : "PIPELINED"
}, {
- "source" : 24,
- "target" : 25,
+ "source" : 7,
+ "target" : 8,
"shuffle" : {
"type" : "FORWARD"
},
"shuffleMode" : "PIPELINED"
}, {
- "source" : 25,
- "target" : 26,
+ "source" : 8,
+ "target" : 9,
"shuffle" : {
"type" : "FORWARD"
},
