Skip to content
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.

Sign up for GitHub

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

Jump to bottom

[FLINK-22303][table-planner-blink] FlinkRelMdFilteredColumnInterval should remapping the columnIndex of the inputRel otherwise may cause IllegalArgumentException or get incorrectly metadata #15641

Closed
wants to merge 5 commits into from
Closed

[FLINK-22303][table-planner-blink] FlinkRelMdFilteredColumnInterval should remapping the columnIndex of the inputRel otherwise may cause IllegalArgumentException or get incorrectly metadata #15641

wants to merge 5 commits into from

Conversation

lincoln-lil
Copy link
Contributor

What is the purpose of the change

fix FlinkRelMdFilteredColumnInterval: remapping the columnIndex of the inputRel avoid IllegalArgumentException or
incorrect metadata

Brief change log

  • fix FlinkRelMdFilteredColumnInterval#getFilteredColumnInterval logic and add related tests

Verifying this change

Added ut

Does this pull request potentially affect one of the following parts:

  • Dependencies (does it add or upgrade a dependency): ( no )
  • The public API, i.e., is any changed class annotated with @public(Evolving): ( no )
  • The serializers: ( no )
  • The runtime per-record code paths (performance sensitive): ( no )
  • Anything that affects deployment or recovery: JobManager (and its components), Checkpointing, Kubernetes/Yarn/Mesos, -ZooKeeper: ( no )
    -The S3 file system connector: ( no )

Documentation

  • Does this pull request introduce a new feature? ( no)

@lincoln-lil
[FLINK-22303][table-planner-blink] FlinkRelMdFilteredColumnInterval s…
bc7f712 
…hould remapping the columnIndex of the inputRel otherwise may cause IllegalArgumentException or get incorrectly metadata
@flinkbot
Copy link
Collaborator

flinkbot commented Apr 16, 2021 •
edited

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 f61e767 (Fri May 28 09:09:52 UTC 2021)

Warnings:

  • No documentation files were touched! Remember to keep the Flink docs up to date!

Mention the bot in a comment to re-run the automated checks.

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 for a full explanation of the review process.


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 Bot commands
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

godfreyhe
godfreyhe reviewed Apr 16, 2021
View reviewed changes
Copy link
Contributor

@godfreyhe godfreyhe left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the contribution @lincoln-lil , I left some minor comments

...in/scala/org/apache/flink/table/planner/plan/metadata/FlinkRelMdFilteredColumnInterval.scala Outdated
@@ -132,11 +143,12 @@ class FlinkRelMdFilteredColumnInterval private extends MetadataHandler[FilteredC
} else {
val filterRef = calc.getProgram.getProjectList.get(filterArg)
val condition = calc.getProgram.expandLocalRef(filterRef)
val columnRef = calc.getProgram.getProjectList.get(columnIndex).getIndex
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we need the similar logic with Project ? (should use the ref index of expandLocalRef result)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

good catch！

...in/scala/org/apache/flink/table/planner/plan/metadata/FlinkRelMdFilteredColumnInterval.scala
@@ -236,7 +248,9 @@ class FlinkRelMdFilteredColumnInterval private extends MetadataHandler[FilteredC
mq: RelMetadataQuery,
columnIndex: Int,
filterArg: Int): ValueInterval = {
checkArgument(filterArg == -1)
if (filterArg != -1) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

please add a test case to cover this change

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

convered by the newly added case testGetColumnIntervalOnAggregateWithFilter

@flinkbot
Copy link
Collaborator

flinkbot commented Apr 16, 2021 •
edited

CI report:

Bot commands 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

godfreyhe
godfreyhe reviewed Apr 16, 2021
View reviewed changes
Copy link
Contributor

@godfreyhe godfreyhe left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the quick update, LGTM overall except two minor comments

...in/scala/org/apache/flink/table/planner/plan/metadata/FlinkRelMdFilteredColumnInterval.scala Outdated
* additional predicate expression, if the given column is a RexInputRef then the final interval
* is intersect with the predicate, if the given column is a RexLiteral then the final interval
* is the literal itself, otherwise return null.
* This can be improved (e.g., for RexCall) later and refactor this meta data to a utility class
Copy link
Contributor

@godfreyhe godfreyhe Apr 16, 2021 •
edited

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

move refactor this meta data to a utility class because it only serves for calculating the monotonicity of some specific aggregate functions. to class javadoc ?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ok

...ner-blink/src/test/scala/org/apache/flink/table/planner/plan/metadata/MetadataTestUtil.scala Outdated
@@ -36,6 +36,7 @@ import org.apache.calcite.schema.Schema.TableType
import org.apache.calcite.schema.{Schema, SchemaPlus, Table}
import org.apache.calcite.sql.{SqlCall, SqlNode}

import java.lang.{String => JString}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Scala String and Java String is totally same

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ok

@godfreyhe godfreyhe closed this in 504880c Apr 18, 2021
guoweiM pushed a commit that referenced this pull request Apr 18, 2021
@lincoln-lil @guoweiM
[FLINK-22303][table-planner-blink] FlinkRelMdFilteredColumnInterval s…
b2c40e3 
…hould remapping the columnIndex of the inputRel otherwise may cause IllegalArgumentException or get incorrectly metadata

This closes #15641
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@godfreyhe godfreyhe godfreyhe left review comments

Assignees
No one assigned
Labels
component=TableSQL/Planner review=description?
Projects
None yet
Milestone
No milestone
4 participants
@lincoln-lil @flinkbot @godfreyhe @rmetzger