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.

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-22861][table-planner] Fix return value deduction of TIMESTAMPADD function #16511

Merged
merged 3 commits into from
Jul 22, 2021
Merged

[FLINK-22861][table-planner] Fix return value deduction of TIMESTAMPADD function #16511

merged 3 commits into from
Jul 22, 2021

Conversation

tsreaper
Copy link
Contributor

What is the purpose of the change

Currently TIMESTAMPADD(MINUTE, 10, CURRENT_TIMESTAMP) will be deduced as timestamp type. However this should be timestamp with local time zone type. With this incorrect type, code generation will refuse to work.

This PR fixes this issue by copying and modifying the corresponding classes from Calcite.

Brief change log

  • Fix return value deduction of TIMESTAMPADD function

Verifying this change

This change added tests and can be verified by running the added tests.

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, ZooKeeper: no
  • The S3 file system connector: no

Documentation

  • Does this pull request introduce a new feature? no
  • If yes, how is the feature documented? not applicable

@flinkbot
Copy link
Collaborator

flinkbot commented Jul 16, 2021

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 6ae6d51 (Thu Sep 23 18:08:49 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

@flinkbot
Copy link
Collaborator

flinkbot commented Jul 16, 2021

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

Copy link
Contributor

@leonardBang leonardBang left a comment

Choose a reason for hiding this comment

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

Thanks @tsreaper for the contribution, I left several comments.
And I found some CI tests failure, you may need to have a look

val ddl =
s"""
|CREATE TABLE MyTable (
| a TIMESTAMP WITH LOCAL TIME ZONE
Copy link
Contributor

Choose a reason for hiding this comment

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

nit: we can use a TIMESTAMP_LTZ

Comment on lines 87 to 98
case MILLISECOND:
type =
typeFactory.createSqlType(
SqlTypeName.TIMESTAMP,
Math.max(MILLISECOND_PRECISION, datetimeType.getPrecision()));
break;
case MICROSECOND:
type =
typeFactory.createSqlType(
SqlTypeName.TIMESTAMP,
Math.max(MICROSECOND_PRECISION, datetimeType.getPrecision()));
break;
Copy link
Contributor

Choose a reason for hiding this comment

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

The timestampAdd function supports the case that a timestamp_ltz argument add interval MILLISECOND or MILLISECOND , and in this case the deduced type should be timestamp_ltz?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Nice catch. However this change cannot be tested now as SQL code generation does not support fractions of seconds.

*
* <p>Returns modified datetime.
*
* <p>This class was copied over from Calcite to fix the return type deduction issue on timestamp
Copy link
Contributor

Choose a reason for hiding this comment

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

Could we create a calcite issue and link it here? we can remove this once calcite community fix it.

TimeUnit timeUnit,
RelDataType intervalType,
RelDataType datetimeType) {
// CHANGED: this method is changed to deduce return type on timestamp with local time zone
Copy link
Contributor

Choose a reason for hiding this comment

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

We can use this template as we discussed with kurt offline

// BEGIN FLINK MODIFICATION
// Reason: …
// (Optional) Should be removed after CALCITE-XXXX is fixed
…
// END FLINK MODIFICATION

@tsreaper
Copy link
Contributor Author

Thanks @leonardBang for the review. The CI failure is caused by the changes in the result type of date + hour / minute / second. The result type used to be timestamp(6), however it would be more proper to deduce it as timestamp(0).

"2016-06-15 00:00:01.000000")
"2016-06-15 00:00:01")
Copy link
Contributor

Choose a reason for hiding this comment

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

I'm not sure this makes sense, I remember the default precision of TIMESTAMP/TIMESTAMP_LTZ is 6 in Flink

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, so for time / timestamp / timestamp_ltz + hour / minute / second we should leave the original precision unchanged, for other data types + hour / minute / second we should use the default timestamp precision.

Copy link
Contributor

@leonardBang leonardBang left a comment

Choose a reason for hiding this comment

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

Thanks @tsreaper for the update, LGTM

Copy link
Contributor

@JingsongLi JingsongLi left a comment

Choose a reason for hiding this comment

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

+1

@JingsongLi JingsongLi merged commit fce9c1d into apache:master Jul 22, 2021
@JingsongLi
Copy link
Contributor

@tsreaper Can you create a PR for 1.13?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
5 participants