-
Notifications
You must be signed in to change notification settings - Fork 13.5k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[FLINK-19606][table-runtime-blink] Introduce StreamExecWindowJoin and window join it cases #15479
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
180 changes: 180 additions & 0 deletions
180
...main/java/org/apache/flink/table/planner/plan/nodes/exec/stream/StreamExecWindowJoin.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,180 @@ | ||
| /* | ||
| * 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.plan.nodes.exec.stream; | ||
|
|
||
| import org.apache.flink.api.dag.Transformation; | ||
| import org.apache.flink.streaming.api.transformations.TwoInputTransformation; | ||
| import org.apache.flink.table.api.TableConfig; | ||
| import org.apache.flink.table.api.TableException; | ||
| import org.apache.flink.table.data.RowData; | ||
| import org.apache.flink.table.planner.delegation.PlannerBase; | ||
| import org.apache.flink.table.planner.plan.logical.WindowAttachedWindowingStrategy; | ||
| import org.apache.flink.table.planner.plan.logical.WindowingStrategy; | ||
| import org.apache.flink.table.planner.plan.nodes.exec.ExecEdge; | ||
| import org.apache.flink.table.planner.plan.nodes.exec.ExecNodeBase; | ||
| 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.spec.JoinSpec; | ||
| import org.apache.flink.table.planner.plan.utils.JoinUtil; | ||
| import org.apache.flink.table.planner.plan.utils.KeySelectorUtil; | ||
| import org.apache.flink.table.runtime.generated.GeneratedJoinCondition; | ||
| import org.apache.flink.table.runtime.keyselector.RowDataKeySelector; | ||
| import org.apache.flink.table.runtime.operators.join.window.WindowJoinOperator; | ||
| import org.apache.flink.table.runtime.operators.join.window.WindowJoinOperatorBuilder; | ||
| import org.apache.flink.table.runtime.typeutils.InternalTypeInfo; | ||
| import org.apache.flink.table.runtime.util.TimeWindowUtil; | ||
| import org.apache.flink.table.types.logical.RowType; | ||
|
|
||
| import org.apache.flink.shaded.guava18.com.google.common.collect.Lists; | ||
| import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonCreator; | ||
| import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonIgnoreProperties; | ||
| import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonProperty; | ||
|
|
||
| import java.time.ZoneId; | ||
| import java.util.List; | ||
|
|
||
| import static org.apache.flink.util.Preconditions.checkArgument; | ||
| import static org.apache.flink.util.Preconditions.checkNotNull; | ||
|
|
||
| /** {@link StreamExecNode} for WindowJoin. */ | ||
| @JsonIgnoreProperties(ignoreUnknown = true) | ||
| public class StreamExecWindowJoin extends ExecNodeBase<RowData> | ||
| implements StreamExecNode<RowData>, SingleTransformationTranslator<RowData> { | ||
| public static final String FIELD_NAME_JOIN_SPEC = "joinSpec"; | ||
| public static final String FIELD_NAME_LEFT_WINDOWING = "leftWindowing"; | ||
| public static final String FIELD_NAME_RIGHT_WINDOWING = "rightWindowing"; | ||
|
|
||
| @JsonProperty(FIELD_NAME_JOIN_SPEC) | ||
| private final JoinSpec joinSpec; | ||
|
|
||
| @JsonProperty(FIELD_NAME_LEFT_WINDOWING) | ||
| private final WindowingStrategy leftWindowing; | ||
|
|
||
| @JsonProperty(FIELD_NAME_RIGHT_WINDOWING) | ||
| private final WindowingStrategy rightWindowing; | ||
|
|
||
| public StreamExecWindowJoin( | ||
| JoinSpec joinSpec, | ||
| WindowingStrategy leftWindowing, | ||
| WindowingStrategy rightWindowing, | ||
| InputProperty leftInputProperty, | ||
| InputProperty rightInputProperty, | ||
| RowType outputType, | ||
| String description) { | ||
| this( | ||
| joinSpec, | ||
| leftWindowing, | ||
| rightWindowing, | ||
| getNewNodeId(), | ||
| Lists.newArrayList(leftInputProperty, rightInputProperty), | ||
| outputType, | ||
| description); | ||
| } | ||
|
|
||
| @JsonCreator | ||
| public StreamExecWindowJoin( | ||
| @JsonProperty(FIELD_NAME_JOIN_SPEC) JoinSpec joinSpec, | ||
| @JsonProperty(FIELD_NAME_LEFT_WINDOWING) WindowingStrategy leftWindowing, | ||
| @JsonProperty(FIELD_NAME_RIGHT_WINDOWING) WindowingStrategy rightWindowing, | ||
| @JsonProperty(FIELD_NAME_ID) int id, | ||
| @JsonProperty(FIELD_NAME_INPUT_PROPERTIES) List<InputProperty> inputProperties, | ||
| @JsonProperty(FIELD_NAME_OUTPUT_TYPE) RowType outputType, | ||
| @JsonProperty(FIELD_NAME_DESCRIPTION) String description) { | ||
| super(id, inputProperties, outputType, description); | ||
| checkArgument(inputProperties.size() == 2); | ||
| this.joinSpec = checkNotNull(joinSpec); | ||
| validate(leftWindowing); | ||
| validate(rightWindowing); | ||
| this.leftWindowing = leftWindowing; | ||
| this.rightWindowing = rightWindowing; | ||
| } | ||
|
|
||
| private void validate(WindowingStrategy windowing) { | ||
| // validate window strategy | ||
| if (!windowing.isRowtime()) { | ||
| throw new TableException("Processing time Window Join is not supported yet."); | ||
| } | ||
|
|
||
| if (!(windowing instanceof WindowAttachedWindowingStrategy)) { | ||
| throw new TableException(windowing.getClass().getName() + " is not supported yet."); | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
| @SuppressWarnings("unchecked") | ||
| protected Transformation<RowData> translateToPlanInternal(PlannerBase planner) { | ||
| int leftWindowEndIndex = ((WindowAttachedWindowingStrategy) leftWindowing).getWindowEnd(); | ||
| int rightWindowEndIndex = ((WindowAttachedWindowingStrategy) rightWindowing).getWindowEnd(); | ||
| final ExecEdge leftInputEdge = getInputEdges().get(0); | ||
| final ExecEdge rightInputEdge = getInputEdges().get(1); | ||
|
|
||
| final Transformation<RowData> leftTransform = | ||
| (Transformation<RowData>) leftInputEdge.translateToPlan(planner); | ||
| final Transformation<RowData> rightTransform = | ||
| (Transformation<RowData>) rightInputEdge.translateToPlan(planner); | ||
|
|
||
| final RowType leftType = (RowType) leftInputEdge.getOutputType(); | ||
| final RowType rightType = (RowType) rightInputEdge.getOutputType(); | ||
| JoinUtil.validateJoinSpec(joinSpec, leftType, rightType, true); | ||
|
|
||
| final int[] leftJoinKey = joinSpec.getLeftKeys(); | ||
| final int[] rightJoinKey = joinSpec.getRightKeys(); | ||
|
|
||
| final InternalTypeInfo<RowData> leftTypeInfo = InternalTypeInfo.of(leftType); | ||
| final InternalTypeInfo<RowData> rightTypeInfo = InternalTypeInfo.of(rightType); | ||
|
|
||
| final TableConfig tableConfig = planner.getTableConfig(); | ||
| GeneratedJoinCondition generatedCondition = | ||
| JoinUtil.generateConditionFunction(tableConfig, joinSpec, leftType, rightType); | ||
|
|
||
| ZoneId shiftTimeZone = | ||
| TimeWindowUtil.getShiftTimeZone(leftWindowing.getTimeAttributeType(), tableConfig); | ||
| WindowJoinOperator operator = | ||
| WindowJoinOperatorBuilder.builder() | ||
| .leftSerializer(leftTypeInfo.toRowSerializer()) | ||
| .rightSerializer(rightTypeInfo.toRowSerializer()) | ||
| .generatedJoinCondition(generatedCondition) | ||
| .leftWindowEndIndex(leftWindowEndIndex) | ||
| .rightWindowEndIndex(rightWindowEndIndex) | ||
| .filterNullKeys(joinSpec.getFilterNulls()) | ||
| .joinType(joinSpec.getJoinType()) | ||
| .withShiftTimezone(shiftTimeZone) | ||
| .build(); | ||
|
|
||
| final RowType returnType = (RowType) getOutputType(); | ||
| final TwoInputTransformation<RowData, RowData, RowData> transform = | ||
| new TwoInputTransformation<>( | ||
| leftTransform, | ||
| rightTransform, | ||
| getDescription(), | ||
| operator, | ||
| InternalTypeInfo.of(returnType), | ||
| leftTransform.getParallelism()); | ||
|
|
||
| // set KeyType and Selector for state | ||
| RowDataKeySelector leftSelect = | ||
| KeySelectorUtil.getRowDataSelector(leftJoinKey, leftTypeInfo); | ||
| RowDataKeySelector rightSelect = | ||
| KeySelectorUtil.getRowDataSelector(rightJoinKey, rightTypeInfo); | ||
| transform.setStateKeySelectors(leftSelect, rightSelect); | ||
| transform.setStateKeyType(leftSelect.getProducedType()); | ||
| return transform; | ||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
112 changes: 112 additions & 0 deletions
112
...st/java/org/apache/flink/table/planner/plan/nodes/exec/stream/WindowJoinJsonPlanTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,112 @@ | ||
| /* | ||
| * 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.plan.nodes.exec.stream; | ||
|
|
||
| import org.apache.flink.table.api.TableConfig; | ||
| import org.apache.flink.table.api.TableEnvironment; | ||
| import org.apache.flink.table.planner.utils.StreamTableTestUtil; | ||
| import org.apache.flink.table.planner.utils.TableTestBase; | ||
|
|
||
| import org.junit.Before; | ||
| import org.junit.Test; | ||
|
|
||
| /** Test json serialization/deserialization for window join. */ | ||
| public class WindowJoinJsonPlanTest extends TableTestBase { | ||
|
|
||
| private StreamTableTestUtil util; | ||
| private TableEnvironment tEnv; | ||
|
|
||
| @Before | ||
| public void setup() { | ||
| util = streamTestUtil(TableConfig.getDefault()); | ||
| tEnv = util.getTableEnv(); | ||
|
|
||
| String srcTable1Ddl = | ||
| "CREATE TABLE MyTable (\n" | ||
| + " a INT,\n" | ||
| + " b BIGINT,\n" | ||
| + " c VARCHAR,\n" | ||
| + " `rowtime` AS TO_TIMESTAMP(c),\n" | ||
| + " proctime as PROCTIME(),\n" | ||
| + " WATERMARK for `rowtime` AS `rowtime` - INTERVAL '1' SECOND\n" | ||
| + ") WITH (\n" | ||
| + " 'connector' = 'values')\n"; | ||
| tEnv.executeSql(srcTable1Ddl); | ||
|
|
||
| String srcTable2Ddl = | ||
| "CREATE TABLE MyTable2 (\n" | ||
| + " a INT,\n" | ||
| + " b BIGINT,\n" | ||
| + " c VARCHAR,\n" | ||
| + " `rowtime` AS TO_TIMESTAMP(c),\n" | ||
| + " proctime as PROCTIME(),\n" | ||
| + " WATERMARK for `rowtime` AS `rowtime` - INTERVAL '1' SECOND\n" | ||
| + ") WITH (\n" | ||
| + " 'connector' = 'values')\n"; | ||
| tEnv.executeSql(srcTable2Ddl); | ||
| } | ||
|
|
||
| @Test | ||
| public void testEventTimeTumbleWindow() { | ||
| String sinkTableDdl = | ||
| "CREATE TABLE MySink (\n" | ||
| + " l_a INT,\n" | ||
| + " window_start TIMESTAMP(3),\n" | ||
| + " window_end TIMESTAMP(3),\n" | ||
| + " l_cnt BIGINT,\n" | ||
| + " l_uv BIGINT,\n" | ||
| + " r_a INT,\n" | ||
| + " r_cnt BIGINT,\n" | ||
| + " r_uv BIGINT\n" | ||
| + ") WITH (\n" | ||
| + " 'connector' = 'values')\n"; | ||
| tEnv.executeSql(sinkTableDdl); | ||
| util.verifyJsonPlan( | ||
| "insert into MySink select\n" | ||
| + " L.a,\n" | ||
| + " L.window_start,\n" | ||
| + " L.window_end,\n" | ||
| + " L.cnt,\n" | ||
| + " L.uv,\n" | ||
| + " R.a,\n" | ||
| + " R.cnt,\n" | ||
| + " R.uv\n" | ||
| + "FROM (\n" | ||
| + " SELECT\n" | ||
| + " a,\n" | ||
| + " window_start,\n" | ||
| + " window_end,\n" | ||
| + " count(*) as cnt,\n" | ||
| + " count(distinct c) AS uv\n" | ||
| + " FROM TABLE(TUMBLE(TABLE MyTable, DESCRIPTOR(rowtime), INTERVAL '15' MINUTE))\n" | ||
| + " GROUP BY a, window_start, window_end, window_time\n" | ||
| + ") L\n" | ||
| + "JOIN (\n" | ||
| + " SELECT\n" | ||
| + " a,\n" | ||
| + " window_start,\n" | ||
| + " window_end,\n" | ||
| + " count(*) as cnt,\n" | ||
| + " count(distinct c) AS uv\n" | ||
| + " FROM TABLE(TUMBLE(TABLE MyTable2, DESCRIPTOR(rowtime), INTERVAL '15' MINUTE))\n" | ||
| + " GROUP BY a, window_start, window_end, window_time\n" | ||
| + ") R\n" | ||
| + "ON L.window_start = R.window_start AND L.window_end = R.window_end AND L.a = R.a"); | ||
| } | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Maybe you should add some
JsonPlanTestfor this class?