1fanwang opened a new pull request, #29979:
URL: https://github.com/apache/flink/pull/29979
<!--
*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
Views created with SELECT CURRENT_DATE or SELECT LOCALTIME fail when queried
without an explicit alias. The stored query repeats the function name as an
unquoted alias, so it cannot be parsed again. SHOW CREATE VIEW emits the same
invalid SQL. This fixes
[FLINK-41409](https://issues.apache.org/jira/browse/FLINK-41409).
## Brief change log
- Quote aliases when storing SQL, including names that Calcite would
otherwise print as function keywords.
- Leave the validated query and table hints unchanged.
- Exercise CREATE VIEW, SHOW CREATE VIEW, querying and recreating the view
for CURRENT_DATE and LOCALTIME in streaming and batch modes.
## Verifying this change
Please make sure both new and modified tests in this PR follow [the
conventions for tests defined in our code quality
guide](https://flink.apache.org/how-to-contribute/code-style-and-quality-common/#7-testing).
This change added tests and can be verified as follows:
Java 17 on macOS. The regression uses a real TableEnvironment and collects
the query result without mocks.
Before the fix, this command failed in both streaming and batch modes:
```bash
./mvnw -pl flink-table/flink-table-planner
-Dtest=JavaCatalogTableTest#testViewWithCurrentDate -Dfast test
```
```text
SHOW CREATE VIEW: CREATE VIEW `default_catalog`.`default_database`.`v` (
`CURRENT_DATE`
)
AS SELECT CURRENT_DATE AS CURRENT_DATE
[ERROR] Run 1: JavaCatalogTableTest.testViewWithCurrentDate:213 ยป
SqlParser SQL parse failed. Incorrect syntax near the keyword 'CURRENT_DATE' at
line 1, column 24:
SELECT CURRENT_DATE AS CURRENT_DATE
^^^^^^^^^^^^
```
The standalone reproducer below also failed before the fix:
```text
mode=streaming
CREATE VIEW v AS SELECT CURRENT_DATE
CREATE VIEW `default_catalog`.`default_database`.`v` (
`CURRENT_DATE`
)
AS SELECT CURRENT_DATE AS CURRENT_DATE
Exception in thread "main" org.apache.flink.table.api.SqlParserException:
SQL parse failed. Incorrect syntax near the keyword 'CURRENT_DATE' at line 1,
column 24:
SELECT CURRENT_DATE AS CURRENT_DATE
^^^^^^^^^^^^
```
After the fix, the same regression command completed successfully.
Save the source below as ReproduceCurrentDateView.java at the repository
root. After running the regression command, these commands execute the real
CREATE VIEW, SHOW CREATE VIEW and SELECT path, then recreate each view from its
displayed DDL:
```bash
CP=$(python3 -c 'import xml.etree.ElementTree as ET;
root=ET.parse("flink-table/flink-table-planner/target/surefire-reports/TEST-org.apache.flink.table.planner.catalog.JavaCatalogTableTest.xml").getroot();
print(next(p.attrib["value"] for p in root.find("properties") if
p.attrib["name"] == "java.class.path"))')
java --add-opens=java.base/java.lang=ALL-UNNAMED
--add-opens=java.base/java.util=ALL-UNNAMED -cp "$CP"
ReproduceCurrentDateView.java
```
Passed with this output:
```text
mode=streaming
CREATE VIEW v AS SELECT CURRENT_DATE
CREATE VIEW `default_catalog`.`default_database`.`v` (
`CURRENT_DATE`
)
AS SELECT CURRENT_DATE AS `CURRENT_DATE`
SELECT * FROM v: +I[2026-11-16]
Recreated view: +I[2026-11-16]
CREATE VIEW v AS SELECT CURRENT_TIME
CREATE VIEW `default_catalog`.`default_database`.`v` (
`CURRENT_TIME`
)
AS SELECT CURRENT_TIME AS `CURRENT_TIME`
SELECT * FROM v: +I[12:19:12.456]
Recreated view: +I[12:19:13.070]
CREATE VIEW v AS SELECT CURRENT_TIMESTAMP
CREATE VIEW `default_catalog`.`default_database`.`v` (
`CURRENT_TIMESTAMP`
)
AS SELECT CURRENT_TIMESTAMP AS `CURRENT_TIMESTAMP`
SELECT * FROM v: +I[2026-11-16T17:19:13.719Z]
Recreated view: +I[2026-11-16T17:19:14.317Z]
CREATE VIEW v AS SELECT LOCALTIME
CREATE VIEW `default_catalog`.`default_database`.`v` (
`LOCALTIME`
)
AS SELECT LOCALTIME AS `LOCALTIME`
SELECT * FROM v: +I[12:19:14.932]
Recreated view: +I[12:19:15.528]
CREATE VIEW v AS SELECT LOCALTIMESTAMP
CREATE VIEW `default_catalog`.`default_database`.`v` (
`LOCALTIMESTAMP`
)
AS SELECT LOCALTIMESTAMP AS `LOCALTIMESTAMP`
SELECT * FROM v: +I[2026-11-16T12:19:16.122]
Recreated view: +I[2026-11-16T12:19:16.638]
mode=batch
CREATE VIEW v AS SELECT CURRENT_DATE
CREATE VIEW `default_catalog`.`default_database`.`v` (
`CURRENT_DATE`
)
AS SELECT CURRENT_DATE AS `CURRENT_DATE`
SELECT * FROM v: +I[2026-11-16]
Recreated view: +I[2026-11-16]
CREATE VIEW v AS SELECT CURRENT_TIME
CREATE VIEW `default_catalog`.`default_database`.`v` (
`CURRENT_TIME`
)
AS SELECT CURRENT_TIME AS `CURRENT_TIME`
SELECT * FROM v: +I[12:19:18.082]
Recreated view: +I[12:19:18.764]
CREATE VIEW v AS SELECT CURRENT_TIMESTAMP
CREATE VIEW `default_catalog`.`default_database`.`v` (
`CURRENT_TIMESTAMP`
)
AS SELECT CURRENT_TIMESTAMP AS `CURRENT_TIMESTAMP`
SELECT * FROM v: +I[2026-11-16T17:19:19.512Z]
Recreated view: +I[2026-11-16T17:19:20.154Z]
CREATE VIEW v AS SELECT LOCALTIME
CREATE VIEW `default_catalog`.`default_database`.`v` (
`LOCALTIME`
)
AS SELECT LOCALTIME AS `LOCALTIME`
SELECT * FROM v: +I[12:19:20.813]
Recreated view: +I[12:19:21.427]
CREATE VIEW v AS SELECT LOCALTIMESTAMP
CREATE VIEW `default_catalog`.`default_database`.`v` (
`LOCALTIMESTAMP`
)
AS SELECT LOCALTIMESTAMP AS `LOCALTIMESTAMP`
SELECT * FROM v: +I[2026-11-16T12:19:22.029]
Recreated view: +I[2026-11-16T12:19:22.633]
```
<details>
<summary>Reproducer source: ReproduceCurrentDateView.java</summary>
```java
import org.apache.flink.table.api.EnvironmentSettings;
import org.apache.flink.table.api.TableEnvironment;
import org.apache.flink.types.Row;
import org.apache.flink.util.CloseableIterator;
public class ReproduceCurrentDateView {
public static void main(String[] args) throws Exception {
for (boolean streaming : new boolean[] {true, false}) {
TableEnvironment env =
TableEnvironment.create(
streaming
? EnvironmentSettings.inStreamingMode()
: EnvironmentSettings.inBatchMode());
System.out.println("mode=" + (streaming ? "streaming" :
"batch"));
for (String function :
new String[] {
"CURRENT_DATE", "CURRENT_TIME", "CURRENT_TIMESTAMP",
"LOCALTIME", "LOCALTIMESTAMP"
}) {
String create = "CREATE VIEW v AS SELECT " + function;
System.out.println(create);
env.executeSql(create);
String definition;
try (CloseableIterator<Row> rows = env.executeSql("SHOW
CREATE VIEW v").collect()) {
definition = rows.next().getFieldAs(0);
System.out.print(definition);
}
try (CloseableIterator<Row> rows = env.executeSql("SELECT *
FROM v").collect()) {
System.out.println("SELECT * FROM v: " + rows.next());
if (rows.hasNext()) {
throw new AssertionError("Expected one row");
}
}
env.executeSql("DROP VIEW v");
env.executeSql(definition);
try (CloseableIterator<Row> rows = env.executeSql("SELECT *
FROM v").collect()) {
System.out.println("Recreated view: " + rows.next());
}
env.executeSql("DROP VIEW v");
}
}
}
}
```
</details>
The full repository clean verify was not run.
## 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
---
##### Was generative AI tooling used to co-author this PR?
<!--
If generative AI tooling has been used in the process of authoring this PR,
please
change the checkbox below to `[X]` and replace the placeholder in the
"Generated-by"
line with the tool name and version. Otherwise remove the "Generated-by"
line.
See the ASF Generative Tooling Guidance for details:
https://www.apache.org/legal/generative-tooling.html
You are responsible for the quality and correctness of every change in this
PR
regardless of the tooling used. Low-effort AI-generated PRs will be closed.
See
AGENTS.md for the full guidance.
-->
- [X] Yes (please specify the tool below)
Generated-by: GitHub Copilot CLI 1.0.112 (Auto)
--
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.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]