This is an automated email from the ASF dual-hosted git repository. godfrey pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/flink.git
commit 8075f10f08f15d2ad0a8bc7db11d1701ab21c79f Author: godfreyhe <[email protected]> AuthorDate: Fri Mar 19 18:18:06 2021 +0800 [FLINK-21869][table-planner-blink] Make the field name in the json plan more readable for Rank node This closes #15284 --- .../flink/table/planner/plan/nodes/exec/stream/StreamExecRank.java | 4 ++-- .../plan/nodes/exec/stream/LimitJsonPlanTest_jsonplan/testLimit.out | 4 ++-- .../plan/nodes/exec/stream/RankJsonPlanTest_jsonplan/testRank.out | 4 ++-- .../exec/stream/SortLimitJsonPlanTest_jsonplan/testSortLimit.out | 4 ++-- .../stream/TableSourceJsonPlanTest_jsonplan/testLimitPushDown.out | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/flink-table/flink-table-planner-blink/src/main/java/org/apache/flink/table/planner/plan/nodes/exec/stream/StreamExecRank.java b/flink-table/flink-table-planner-blink/src/main/java/org/apache/flink/table/planner/plan/nodes/exec/stream/StreamExecRank.java index b616042..fc220cf 100644 --- a/flink-table/flink-table-planner-blink/src/main/java/org/apache/flink/table/planner/plan/nodes/exec/stream/StreamExecRank.java +++ b/flink-table/flink-table-planner-blink/src/main/java/org/apache/flink/table/planner/plan/nodes/exec/stream/StreamExecRank.java @@ -80,8 +80,8 @@ public class StreamExecRank extends ExecNodeBase<RowData> + " state access. Cache size is the number of records in each TopN task."); public static final String FIELD_NAME_RANK_TYPE = "rankType"; - public static final String FIELD_NAME_PARTITION_SPEC = "partitionSpec"; - public static final String FIELD_NAME_SORT_SPEC = "sortSpec"; + public static final String FIELD_NAME_PARTITION_SPEC = "partition"; + public static final String FIELD_NAME_SORT_SPEC = "orderBy"; public static final String FIELD_NAME_RANK_RANG = "rankRange"; public static final String FIELD_NAME_RANK_STRATEGY = "rankStrategy"; public static final String FIELD_NAME_GENERATE_UPDATE_BEFORE = "generateUpdateBefore"; diff --git a/flink-table/flink-table-planner-blink/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/LimitJsonPlanTest_jsonplan/testLimit.out b/flink-table/flink-table-planner-blink/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/LimitJsonPlanTest_jsonplan/testLimit.out index d0d8d5b..cc86711 100644 --- a/flink-table/flink-table-planner-blink/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/LimitJsonPlanTest_jsonplan/testLimit.out +++ b/flink-table/flink-table-planner-blink/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/LimitJsonPlanTest_jsonplan/testLimit.out @@ -91,10 +91,10 @@ }, "description" : "Limit(offset=[0], fetch=[10])", "rankType" : "ROW_NUMBER", - "partitionSpec" : { + "partition" : { "fields" : [ ] }, - "sortSpec" : { + "orderBy" : { "fields" : [ ] }, "outputRowNumber" : false diff --git a/flink-table/flink-table-planner-blink/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/RankJsonPlanTest_jsonplan/testRank.out b/flink-table/flink-table-planner-blink/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/RankJsonPlanTest_jsonplan/testRank.out index 9f83a94..dcff56f 100644 --- a/flink-table/flink-table-planner-blink/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/RankJsonPlanTest_jsonplan/testRank.out +++ b/flink-table/flink-table-planner-blink/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/RankJsonPlanTest_jsonplan/testRank.out @@ -102,10 +102,10 @@ }, { "class" : "org.apache.flink.table.planner.plan.nodes.exec.stream.StreamExecRank", "rankType" : "ROW_NUMBER", - "partitionSpec" : { + "partition" : { "fields" : [ 1 ] }, - "sortSpec" : { + "orderBy" : { "fields" : [ { "index" : 0, "isAscending" : true, diff --git a/flink-table/flink-table-planner-blink/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/SortLimitJsonPlanTest_jsonplan/testSortLimit.out b/flink-table/flink-table-planner-blink/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/SortLimitJsonPlanTest_jsonplan/testSortLimit.out index 3090fc4..e765872 100644 --- a/flink-table/flink-table-planner-blink/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/SortLimitJsonPlanTest_jsonplan/testSortLimit.out +++ b/flink-table/flink-table-planner-blink/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/SortLimitJsonPlanTest_jsonplan/testSortLimit.out @@ -68,7 +68,7 @@ "description" : "Exchange(distribution=[single])" }, { "class" : "org.apache.flink.table.planner.plan.nodes.exec.stream.StreamExecSortLimit", - "sortSpec" : { + "orderBy" : { "fields" : [ { "index" : 1, "isAscending" : true, @@ -103,7 +103,7 @@ }, "description" : "SortLimit(orderBy=[b ASC], offset=[0], fetch=[10], strategy=[AppendFastStrategy])", "rankType" : "ROW_NUMBER", - "partitionSpec" : { + "partition" : { "fields" : [ ] }, "outputRowNumber" : false diff --git a/flink-table/flink-table-planner-blink/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/TableSourceJsonPlanTest_jsonplan/testLimitPushDown.out b/flink-table/flink-table-planner-blink/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/TableSourceJsonPlanTest_jsonplan/testLimitPushDown.out index d53d7c9..85ed406 100644 --- a/flink-table/flink-table-planner-blink/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/TableSourceJsonPlanTest_jsonplan/testLimitPushDown.out +++ b/flink-table/flink-table-planner-blink/src/test/resources/org/apache/flink/table/planner/plan/nodes/exec/stream/TableSourceJsonPlanTest_jsonplan/testLimitPushDown.out @@ -91,10 +91,10 @@ }, "description" : "Limit(offset=[0], fetch=[3])", "rankType" : "ROW_NUMBER", - "partitionSpec" : { + "partition" : { "fields" : [ ] }, - "sortSpec" : { + "orderBy" : { "fields" : [ ] }, "outputRowNumber" : false
