You are viewing a plain text version of this content. The canonical link for it is here.
Posted to issues@flink.apache.org by GitBox <gi...@apache.org> on 2020/11/20 14:34:40 UTC
[GitHub] [flink] wuchong opened a new pull request #14154: [FLINK-19878][table-planner-blink] Fix WatermarkAssigner shouldn't be after ChangelogNormalize
wuchong opened a new pull request #14154:
URL: https://github.com/apache/flink/pull/14154
<!--
*Thank you very much for contributing to Apache Flink - we are happy that you want to help us improve Flink. To help the community review your contribution in the best possible way, please go through the checklist below, which will get the contribution into a shape in which it can be best reviewed.*
*Please understand that we do not do this to make contributions to Flink a hassle. In order to uphold a high standard of quality for code contributions, while at the same time managing a large number of contributions, we need contributors to prepare the contributions well, and give reviewers enough contextual information for the review. Please also understand that contributions that do not follow this guide will take longer to review and thus typically be picked up with lower priority by the community.*
## Contribution Checklist
- Make sure that the pull request corresponds to a [JIRA issue](https://issues.apache.org/jira/projects/FLINK/issues). Exceptions are made for typos in JavaDoc or documentation files, which need no JIRA issue.
- Name the pull request in the form "[FLINK-XXXX] [component] Title of the pull request", where *FLINK-XXXX* should be replaced by the actual issue number. Skip *component* if you are unsure about which is the best component.
Typo fixes that have no associated JIRA issue should be named following this pattern: `[hotfix] [docs] Fix typo in event time introduction` or `[hotfix] [javadocs] Expand JavaDoc for PuncuatedWatermarkGenerator`.
- Fill out the template below to describe the changes contributed by the pull request. That will give reviewers the context they need to do the review.
- Make sure that the change passes the automated tests, i.e., `mvn clean verify` passes. You can set up Azure Pipelines CI to do that following [this guide](https://cwiki.apache.org/confluence/display/FLINK/Azure+Pipelines#AzurePipelines-Tutorial:SettingupAzurePipelinesforaforkoftheFlinkrepository).
- Each pull request should address only one issue, not mix up code from multiple issues.
- Each commit in the pull request has a meaningful commit message (including the JIRA id)
- Once all items of the checklist are addressed, remove the above text and this checklist, leaving only the filled out template below.
**(The sections below can be removed for hotfixes of typos)**
-->
## What is the purpose of the change
Cutrrently, for a upsertSource like upsert-kafka, the WatermarkAssigner is followed after ChangelogNormalize node, it may returns Long.MaxValue as watermark if some parallelism doesn't have data.
```
+- Exchange(distribution=[hash[currency]], changelogMode=[I,UA,D])
+- WatermarkAssigner(rowtime=[rowtime], watermark=[rowtime], changelogMode=[I,UA,D])
+- ChangelogNormalize(key=[currency], changelogMode=[I,UA,D])
+- Exchange(distribution=[hash[currency]], changelogMode=[UA,D])
+- TableSourceScan(table=[[default_catalog, default_database, rates_history]], fields=[currency, rate, rowtime], changelogMode=[UA,D])
```
As an improvement, we can move the WatermarkAssigner to be after the SourceScan node and thus the watermark will produce like general Source.
## Brief change log
- Added rules to transpose`StreamExecWatermarkAssigner` past into `StreamExecChangelogNormalize`.
- Added a HEP program for the watermark transpose rules in physical rewrite phase.
## Verifying this change
- The existing tests in `TableScanTest`.
- Added a `testUpsertSourceWithWatermarkPushDown` test to verify this rule works well with watermark pushdown rule.
## Does this pull request potentially affect one of the following parts:
- Dependencies (does it add or upgrade a dependency): (yes / **no**)
- The public API, i.e., is any changed class annotated with `@Public(Evolving)`: (yes / **no**)
- The serializers: (yes / **no** / don't know)
- The runtime per-record code paths (performance sensitive): (yes / **no** / don't know)
- Anything that affects deployment or recovery: JobManager (and its components), Checkpointing, Yarn/Mesos, ZooKeeper: (yes / **no** / don't know)
- The S3 file system connector: (yes / **no** / don't know)
## Documentation
- Does this pull request introduce a new feature? (yes / **no**)
- If yes, how is the feature documented? (**not applicable** / docs / JavaDocs / not documented)
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [flink] flinkbot edited a comment on pull request #14154: [FLINK-19878][table-planner-blink] Fix WatermarkAssigner shouldn't be after ChangelogNormalize
Posted by GitBox <gi...@apache.org>.
flinkbot edited a comment on pull request #14154:
URL: https://github.com/apache/flink/pull/14154#issuecomment-731223999
<!--
Meta data
{
"version" : 1,
"metaDataEntries" : [ {
"hash" : "b476a71cd82914eca67cfa71abae513dad56ac6f",
"status" : "SUCCESS",
"url" : "https://dev.azure.com/apache-flink/98463496-1af2-4620-8eab-a2ecc1a2e6fe/_build/results?buildId=9881",
"triggerID" : "b476a71cd82914eca67cfa71abae513dad56ac6f",
"triggerType" : "PUSH"
} ]
}-->
## CI report:
* b476a71cd82914eca67cfa71abae513dad56ac6f Azure: [SUCCESS](https://dev.azure.com/apache-flink/98463496-1af2-4620-8eab-a2ecc1a2e6fe/_build/results?buildId=9881)
<details>
<summary>Bot commands</summary>
The @flinkbot bot supports the following commands:
- `@flinkbot run travis` re-run the last Travis build
- `@flinkbot run azure` re-run the last Azure build
</details>
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [flink] flinkbot commented on pull request #14154: [FLINK-19878][table-planner-blink] Fix WatermarkAssigner shouldn't be after ChangelogNormalize
Posted by GitBox <gi...@apache.org>.
flinkbot commented on pull request #14154:
URL: https://github.com/apache/flink/pull/14154#issuecomment-731207356
Thanks a lot for your contribution to the Apache Flink project. I'm the @flinkbot. I help the community
to review your pull request. We will use this comment to track the progress of the review.
## Automated Checks
Last check on commit b476a71cd82914eca67cfa71abae513dad56ac6f (Fri Nov 20 14:37:36 UTC 2020)
**Warnings:**
* No documentation files were touched! Remember to keep the Flink docs up to date!
<sub>Mention the bot in a comment to re-run the automated checks.</sub>
## Review Progress
* ❓ 1. The [description] looks good.
* ❓ 2. There is [consensus] that the contribution should go into to Flink.
* ❓ 3. Needs [attention] from.
* ❓ 4. The change fits into the overall [architecture].
* ❓ 5. Overall code [quality] is good.
Please see the [Pull Request Review Guide](https://flink.apache.org/contributing/reviewing-prs.html) for a full explanation of the review process.<details>
The Bot is tracking the review progress through labels. Labels are applied according to the order of the review items. For consensus, approval by a Flink committer of PMC member is required <summary>Bot commands</summary>
The @flinkbot bot supports the following commands:
- `@flinkbot approve description` to approve one or more aspects (aspects: `description`, `consensus`, `architecture` and `quality`)
- `@flinkbot approve all` to approve all aspects
- `@flinkbot approve-until architecture` to approve everything until `architecture`
- `@flinkbot attention @username1 [@username2 ..]` to require somebody's attention
- `@flinkbot disapprove architecture` to remove an approval you gave earlier
</details>
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [flink] flinkbot edited a comment on pull request #14154: [FLINK-19878][table-planner-blink] Fix WatermarkAssigner shouldn't be after ChangelogNormalize
Posted by GitBox <gi...@apache.org>.
flinkbot edited a comment on pull request #14154:
URL: https://github.com/apache/flink/pull/14154#issuecomment-731223999
<!--
Meta data
{
"version" : 1,
"metaDataEntries" : [ {
"hash" : "b476a71cd82914eca67cfa71abae513dad56ac6f",
"status" : "SUCCESS",
"url" : "https://dev.azure.com/apache-flink/98463496-1af2-4620-8eab-a2ecc1a2e6fe/_build/results?buildId=9881",
"triggerID" : "b476a71cd82914eca67cfa71abae513dad56ac6f",
"triggerType" : "PUSH"
}, {
"hash" : "cb4f213d5749bf5101a92b8b3888630d5be4f011",
"status" : "UNKNOWN",
"url" : "TBD",
"triggerID" : "cb4f213d5749bf5101a92b8b3888630d5be4f011",
"triggerType" : "PUSH"
} ]
}-->
## CI report:
* b476a71cd82914eca67cfa71abae513dad56ac6f Azure: [SUCCESS](https://dev.azure.com/apache-flink/98463496-1af2-4620-8eab-a2ecc1a2e6fe/_build/results?buildId=9881)
* cb4f213d5749bf5101a92b8b3888630d5be4f011 UNKNOWN
<details>
<summary>Bot commands</summary>
The @flinkbot bot supports the following commands:
- `@flinkbot run travis` re-run the last Travis build
- `@flinkbot run azure` re-run the last Azure build
</details>
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [flink] flinkbot edited a comment on pull request #14154: [FLINK-19878][table-planner-blink] Fix WatermarkAssigner shouldn't be after ChangelogNormalize
Posted by GitBox <gi...@apache.org>.
flinkbot edited a comment on pull request #14154:
URL: https://github.com/apache/flink/pull/14154#issuecomment-731223999
<!--
Meta data
{
"version" : 1,
"metaDataEntries" : [ {
"hash" : "b476a71cd82914eca67cfa71abae513dad56ac6f",
"status" : "SUCCESS",
"url" : "https://dev.azure.com/apache-flink/98463496-1af2-4620-8eab-a2ecc1a2e6fe/_build/results?buildId=9881",
"triggerID" : "b476a71cd82914eca67cfa71abae513dad56ac6f",
"triggerType" : "PUSH"
}, {
"hash" : "cb4f213d5749bf5101a92b8b3888630d5be4f011",
"status" : "PENDING",
"url" : "https://dev.azure.com/apache-flink/98463496-1af2-4620-8eab-a2ecc1a2e6fe/_build/results?buildId=9928",
"triggerID" : "cb4f213d5749bf5101a92b8b3888630d5be4f011",
"triggerType" : "PUSH"
} ]
}-->
## CI report:
* b476a71cd82914eca67cfa71abae513dad56ac6f Azure: [SUCCESS](https://dev.azure.com/apache-flink/98463496-1af2-4620-8eab-a2ecc1a2e6fe/_build/results?buildId=9881)
* cb4f213d5749bf5101a92b8b3888630d5be4f011 Azure: [PENDING](https://dev.azure.com/apache-flink/98463496-1af2-4620-8eab-a2ecc1a2e6fe/_build/results?buildId=9928)
<details>
<summary>Bot commands</summary>
The @flinkbot bot supports the following commands:
- `@flinkbot run travis` re-run the last Travis build
- `@flinkbot run azure` re-run the last Azure build
</details>
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [flink] godfreyhe commented on a change in pull request #14154: [FLINK-19878][table-planner-blink] Fix WatermarkAssigner shouldn't be after ChangelogNormalize
Posted by GitBox <gi...@apache.org>.
godfreyhe commented on a change in pull request #14154:
URL: https://github.com/apache/flink/pull/14154#discussion_r528490059
##########
File path: flink-table/flink-table-planner-blink/src/test/resources/org/apache/flink/table/planner/plan/stream/sql/TableScanTest.xml
##########
@@ -556,10 +577,10 @@ LogicalProject(a=[$1], b=[$2], c=[$3])
<Resource name="planAfter">
<![CDATA[
Calc(select=[a, b, c], where=[>(a, 1)], changelogMode=[I,UB,UA,D])
-+- WatermarkAssigner(rowtime=[ts], watermark=[-(ts, 1000:INTERVAL SECOND)], changelogMode=[I,UB,UA,D])
- +- Calc(select=[id, a, +(a, 1) AS b, c, TO_TIMESTAMP(c) AS ts], changelogMode=[I,UB,UA,D])
- +- ChangelogNormalize(key=[id], changelogMode=[I,UB,UA,D])
- +- Exchange(distribution=[hash[id]], changelogMode=[UA,D])
++- ChangelogNormalize(key=[id], changelogMode=[I,UB,UA,D])
+ +- Exchange(distribution=[hash[id]], changelogMode=[UA,D])
+ +- WatermarkAssigner(rowtime=[ts], watermark=[-(ts, 1000:INTERVAL SECOND)], changelogMode=[UA,D])
+ +- Calc(select=[id, a, +(a, 1) AS b, c, TO_TIMESTAMP(c) AS ts], changelogMode=[UA,D])
Review comment:
It's a bad case here, that more data needs to shuffle now.
##########
File path: flink-table/flink-table-planner-blink/src/main/java/org/apache/flink/table/planner/plan/rules/physical/stream/WatermarkAssignerChangelogNormalizeTransposeRule.java
##########
@@ -0,0 +1,132 @@
+/*
+ * 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.rules.physical.stream;
+
+import org.apache.flink.table.planner.plan.nodes.physical.stream.StreamExecCalc;
+import org.apache.flink.table.planner.plan.nodes.physical.stream.StreamExecChangelogNormalize;
+import org.apache.flink.table.planner.plan.nodes.physical.stream.StreamExecExchange;
+import org.apache.flink.table.planner.plan.nodes.physical.stream.StreamExecWatermarkAssigner;
+
+import org.apache.calcite.plan.RelOptRule;
+import org.apache.calcite.plan.RelOptRuleCall;
+import org.apache.calcite.plan.RelOptUtil;
+import org.apache.calcite.plan.RelRule;
+import org.apache.calcite.rel.RelNode;
+
+import java.util.Collections;
+
+import static org.apache.flink.util.Preconditions.checkArgument;
+
+/**
+ * Transpose {@link StreamExecWatermarkAssigner} past into {@link StreamExecChangelogNormalize}.
+ */
+public class WatermarkAssignerChangelogNormalizeTransposeRule
+ extends RelRule<WatermarkAssignerChangelogNormalizeTransposeRule.Config> {
+
+ public static final RelOptRule WITH_COMPUTED_COLUMN = Config.EMPTY
Review comment:
`WITH_CALC` is simpler and more accurate
##########
File path: flink-table/flink-table-planner-blink/src/main/java/org/apache/flink/table/planner/plan/rules/physical/stream/WatermarkAssignerChangelogNormalizeTransposeRule.java
##########
@@ -0,0 +1,132 @@
+/*
+ * 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.rules.physical.stream;
+
+import org.apache.flink.table.planner.plan.nodes.physical.stream.StreamExecCalc;
+import org.apache.flink.table.planner.plan.nodes.physical.stream.StreamExecChangelogNormalize;
+import org.apache.flink.table.planner.plan.nodes.physical.stream.StreamExecExchange;
+import org.apache.flink.table.planner.plan.nodes.physical.stream.StreamExecWatermarkAssigner;
+
+import org.apache.calcite.plan.RelOptRule;
+import org.apache.calcite.plan.RelOptRuleCall;
+import org.apache.calcite.plan.RelOptUtil;
+import org.apache.calcite.plan.RelRule;
+import org.apache.calcite.rel.RelNode;
+
+import java.util.Collections;
+
+import static org.apache.flink.util.Preconditions.checkArgument;
+
+/**
+ * Transpose {@link StreamExecWatermarkAssigner} past into {@link StreamExecChangelogNormalize}.
+ */
+public class WatermarkAssignerChangelogNormalizeTransposeRule
+ extends RelRule<WatermarkAssignerChangelogNormalizeTransposeRule.Config> {
+
+ public static final RelOptRule WITH_COMPUTED_COLUMN = Config.EMPTY
+ .withDescription("WatermarkAssignerChangelogNormalizeTransposeRuleWithComputedColumn")
+ .as(Config.class)
+ .withComputedColumnCalc()
+ .toRule();
+
+ public static final RelOptRule WITHOUT_COMPUTED_COLUMN = Config.EMPTY
Review comment:
WITHOUT_CALC
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [flink] flinkbot commented on pull request #14154: [FLINK-19878][table-planner-blink] Fix WatermarkAssigner shouldn't be after ChangelogNormalize
Posted by GitBox <gi...@apache.org>.
flinkbot commented on pull request #14154:
URL: https://github.com/apache/flink/pull/14154#issuecomment-731223999
<!--
Meta data
{
"version" : 1,
"metaDataEntries" : [ {
"hash" : "b476a71cd82914eca67cfa71abae513dad56ac6f",
"status" : "UNKNOWN",
"url" : "TBD",
"triggerID" : "b476a71cd82914eca67cfa71abae513dad56ac6f",
"triggerType" : "PUSH"
} ]
}-->
## CI report:
* b476a71cd82914eca67cfa71abae513dad56ac6f UNKNOWN
<details>
<summary>Bot commands</summary>
The @flinkbot bot supports the following commands:
- `@flinkbot run travis` re-run the last Travis build
- `@flinkbot run azure` re-run the last Azure build
</details>
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [flink] wuchong commented on a change in pull request #14154: [FLINK-19878][table-planner-blink] Fix WatermarkAssigner shouldn't be after ChangelogNormalize
Posted by GitBox <gi...@apache.org>.
wuchong commented on a change in pull request #14154:
URL: https://github.com/apache/flink/pull/14154#discussion_r528522574
##########
File path: flink-table/flink-table-planner-blink/src/test/resources/org/apache/flink/table/planner/plan/stream/sql/TableScanTest.xml
##########
@@ -556,10 +577,10 @@ LogicalProject(a=[$1], b=[$2], c=[$3])
<Resource name="planAfter">
<![CDATA[
Calc(select=[a, b, c], where=[>(a, 1)], changelogMode=[I,UB,UA,D])
-+- WatermarkAssigner(rowtime=[ts], watermark=[-(ts, 1000:INTERVAL SECOND)], changelogMode=[I,UB,UA,D])
- +- Calc(select=[id, a, +(a, 1) AS b, c, TO_TIMESTAMP(c) AS ts], changelogMode=[I,UB,UA,D])
- +- ChangelogNormalize(key=[id], changelogMode=[I,UB,UA,D])
- +- Exchange(distribution=[hash[id]], changelogMode=[UA,D])
++- ChangelogNormalize(key=[id], changelogMode=[I,UB,UA,D])
+ +- Exchange(distribution=[hash[id]], changelogMode=[UA,D])
+ +- WatermarkAssigner(rowtime=[ts], watermark=[-(ts, 1000:INTERVAL SECOND)], changelogMode=[UA,D])
+ +- Calc(select=[id, a, +(a, 1) AS b, c, TO_TIMESTAMP(c) AS ts], changelogMode=[UA,D])
Review comment:
I think this can be an improvement. Because `ChangelogNormalize` along with the upsert source is introduced in this version, there is no regressions. We can pull out the `+(a, 1)` to be after the `ChangelogNormalize` in the future. I have created https://issues.apache.org/jira/browse/FLINK-20289 to track this improvement.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [flink] wuchong closed pull request #14154: [FLINK-19878][table-planner-blink] Fix WatermarkAssigner shouldn't be after ChangelogNormalize
Posted by GitBox <gi...@apache.org>.
wuchong closed pull request #14154:
URL: https://github.com/apache/flink/pull/14154
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [flink] wuchong commented on pull request #14154: [FLINK-19878][table-planner-blink] Fix WatermarkAssigner shouldn't be after ChangelogNormalize
Posted by GitBox <gi...@apache.org>.
wuchong commented on pull request #14154:
URL: https://github.com/apache/flink/pull/14154#issuecomment-732139493
Build is passed: https://dev.azure.com/imjark/Flink/_build/results?buildId=342&view=results
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [flink] flinkbot edited a comment on pull request #14154: [FLINK-19878][table-planner-blink] Fix WatermarkAssigner shouldn't be after ChangelogNormalize
Posted by GitBox <gi...@apache.org>.
flinkbot edited a comment on pull request #14154:
URL: https://github.com/apache/flink/pull/14154#issuecomment-731223999
<!--
Meta data
{
"version" : 1,
"metaDataEntries" : [ {
"hash" : "b476a71cd82914eca67cfa71abae513dad56ac6f",
"status" : "PENDING",
"url" : "https://dev.azure.com/apache-flink/98463496-1af2-4620-8eab-a2ecc1a2e6fe/_build/results?buildId=9881",
"triggerID" : "b476a71cd82914eca67cfa71abae513dad56ac6f",
"triggerType" : "PUSH"
} ]
}-->
## CI report:
* b476a71cd82914eca67cfa71abae513dad56ac6f Azure: [PENDING](https://dev.azure.com/apache-flink/98463496-1af2-4620-8eab-a2ecc1a2e6fe/_build/results?buildId=9881)
<details>
<summary>Bot commands</summary>
The @flinkbot bot supports the following commands:
- `@flinkbot run travis` re-run the last Travis build
- `@flinkbot run azure` re-run the last Azure build
</details>
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org