You are viewing a plain text version of this content. The canonical link for it is here.
Posted to issues@flink.apache.org by "AHeise (via GitHub)" <gi...@apache.org> on 2025/07/02 09:51:35 UTC
[PR] [FLINK-38041] Fix Schema.Builder#fromResolvedSchema dropping comments [flink]
AHeise opened a new pull request, #26741:
URL: https://github.com/apache/flink/pull/26741
<!--
*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
Fix Schema.Builder#fromResolvedSchema dropping comments
## Brief change log
Fix Schema.Builder#fromResolvedSchema dropping comments
## Verifying this change
Added UT
## 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, Kubernetes/Yarn, 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.
To unsubscribe, e-mail: issues-unsubscribe@flink.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] [FLINK-38041] Fix Schema.Builder#fromResolvedSchema dropping comments [flink]
Posted by "davidradl (via GitHub)" <gi...@apache.org>.
davidradl commented on code in PR #26741:
URL: https://github.com/apache/flink/pull/26741#discussion_r2180174790
##########
flink-table/flink-table-common/src/main/java/org/apache/flink/table/api/Schema.java:
##########
@@ -680,24 +680,29 @@ public Schema build() {
// ----------------------------------------------------------------------------------------
private void addResolvedColumns(List<Column> columns) {
- columns.forEach(
- c -> {
- if (c instanceof PhysicalColumn) {
- final PhysicalColumn physicalColumn = (PhysicalColumn) c;
+ for (Column c : columns) {
+ if (c instanceof PhysicalColumn) {
+ PhysicalColumn physicalColumn = (PhysicalColumn) c;
+ final Builder builder =
column(physicalColumn.getName(), physicalColumn.getDataType());
- } else if (c instanceof ComputedColumn) {
- final ComputedColumn computedColumn = (ComputedColumn) c;
+ c.getComment().ifPresent(builder::withComment);
+ } else if (c instanceof ComputedColumn) {
+ ComputedColumn computedColumn = (ComputedColumn) c;
+ final Builder builder =
columnByExpression(
computedColumn.getName(), computedColumn.getExpression());
- } else if (c instanceof MetadataColumn) {
- final MetadataColumn metadataColumn = (MetadataColumn) c;
+ c.getComment().ifPresent(builder::withComment);
+ } else if (c instanceof MetadataColumn) {
+ MetadataColumn metadataColumn = (MetadataColumn) c;
+ final Builder builder =
columnByMetadata(
metadataColumn.getName(),
metadataColumn.getDataType(),
metadataColumn.getMetadataKey().orElse(null),
metadataColumn.isVirtual());
- }
- });
+ c.getComment().ifPresent(builder::withComment);
Review Comment:
This line is duplicated in all 3 conditions , are you happy to move it after the if else's ? As these 3 subclasses are the only types of columns.
--
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: issues-unsubscribe@flink.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] [FLINK-38041] Fix Schema.Builder#fromResolvedSchema dropping comments [flink]
Posted by "flinkbot (via GitHub)" <gi...@apache.org>.
flinkbot commented on PR #26741:
URL: https://github.com/apache/flink/pull/26741#issuecomment-3027236633
<!--
Meta data
{
"version" : 1,
"metaDataEntries" : [ {
"hash" : "17f4187e62d333dfd89589592ad5fd8e86b43edd",
"status" : "UNKNOWN",
"url" : "TBD",
"triggerID" : "17f4187e62d333dfd89589592ad5fd8e86b43edd",
"triggerType" : "PUSH"
} ]
}-->
## CI report:
* 17f4187e62d333dfd89589592ad5fd8e86b43edd UNKNOWN
<details>
<summary>Bot commands</summary>
The @flinkbot bot supports the following commands:
- `@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.
To unsubscribe, e-mail: issues-unsubscribe@flink.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] [FLINK-38041] Fix Schema.Builder#fromResolvedSchema dropping comments [flink]
Posted by "AHeise (via GitHub)" <gi...@apache.org>.
AHeise commented on code in PR #26741:
URL: https://github.com/apache/flink/pull/26741#discussion_r2179653604
##########
flink-table/flink-table-common/src/test/java/org/apache/flink/table/api/SchemaTest.java:
##########
@@ -0,0 +1,26 @@
+package org.apache.flink.table.api;
Review Comment:
I ran a check and it passed but probably because I only executed the submodule.
--
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: issues-unsubscribe@flink.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] [FLINK-38041] Fix Schema.Builder#fromResolvedSchema dropping comments [flink]
Posted by "snuyanzin (via GitHub)" <gi...@apache.org>.
snuyanzin commented on code in PR #26741:
URL: https://github.com/apache/flink/pull/26741#discussion_r2179646899
##########
flink-table/flink-table-common/src/test/java/org/apache/flink/table/api/SchemaTest.java:
##########
@@ -0,0 +1,26 @@
+package org.apache.flink.table.api;
Review Comment:
license header?
doesn't it fail without it?
--
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: issues-unsubscribe@flink.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] [FLINK-38041] Fix Schema.Builder#fromResolvedSchema dropping comments [flink]
Posted by "AHeise (via GitHub)" <gi...@apache.org>.
AHeise commented on PR #26741:
URL: https://github.com/apache/flink/pull/26741#issuecomment-3027911107
@flinkbot run azure
--
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: issues-unsubscribe@flink.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] [FLINK-38041] Fix Schema.Builder#fromResolvedSchema dropping comments [flink]
Posted by "AHeise (via GitHub)" <gi...@apache.org>.
AHeise merged PR #26741:
URL: https://github.com/apache/flink/pull/26741
--
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: issues-unsubscribe@flink.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] [FLINK-38041] Fix Schema.Builder#fromResolvedSchema dropping comments [flink]
Posted by "davidradl (via GitHub)" <gi...@apache.org>.
davidradl commented on code in PR #26741:
URL: https://github.com/apache/flink/pull/26741#discussion_r2180177319
##########
flink-table/flink-table-common/src/test/java/org/apache/flink/table/api/SchemaTest.java:
##########
@@ -0,0 +1,44 @@
+/*
+ * 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.api;
+
+import org.apache.flink.table.catalog.Column;
+import org.apache.flink.table.catalog.ResolvedSchema;
+import org.apache.flink.table.catalog.TestSchemaResolver;
+
+import org.junit.jupiter.api.Nested;
+import org.junit.jupiter.api.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+class SchemaTest {
+ @Nested
+ class Builder {
+ @Test
+ void testFromResolvedSchema() {
+ ResolvedSchema originalSchema =
+ ResolvedSchema.of(
+ Column.physical("timestamp", DataTypes.TIMESTAMP_LTZ(3).notNull())
Review Comment:
I suggest adding a test for the other 2 column types we have affected with the fix
--
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: issues-unsubscribe@flink.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] [FLINK-38041] Fix Schema.Builder#fromResolvedSchema dropping comments [flink]
Posted by "AHeise (via GitHub)" <gi...@apache.org>.
AHeise commented on code in PR #26741:
URL: https://github.com/apache/flink/pull/26741#discussion_r2180353271
##########
flink-table/flink-table-common/src/main/java/org/apache/flink/table/api/Schema.java:
##########
@@ -680,24 +680,29 @@ public Schema build() {
// ----------------------------------------------------------------------------------------
private void addResolvedColumns(List<Column> columns) {
- columns.forEach(
- c -> {
- if (c instanceof PhysicalColumn) {
- final PhysicalColumn physicalColumn = (PhysicalColumn) c;
+ for (Column c : columns) {
+ if (c instanceof PhysicalColumn) {
+ PhysicalColumn physicalColumn = (PhysicalColumn) c;
+ final Builder builder =
column(physicalColumn.getName(), physicalColumn.getDataType());
- } else if (c instanceof ComputedColumn) {
- final ComputedColumn computedColumn = (ComputedColumn) c;
+ c.getComment().ifPresent(builder::withComment);
+ } else if (c instanceof ComputedColumn) {
+ ComputedColumn computedColumn = (ComputedColumn) c;
+ final Builder builder =
columnByExpression(
computedColumn.getName(), computedColumn.getExpression());
- } else if (c instanceof MetadataColumn) {
- final MetadataColumn metadataColumn = (MetadataColumn) c;
+ c.getComment().ifPresent(builder::withComment);
+ } else if (c instanceof MetadataColumn) {
+ MetadataColumn metadataColumn = (MetadataColumn) c;
+ final Builder builder =
columnByMetadata(
metadataColumn.getName(),
metadataColumn.getDataType(),
metadataColumn.getMetadataKey().orElse(null),
metadataColumn.isVirtual());
- }
- });
+ c.getComment().ifPresent(builder::withComment);
Review Comment:
Unfortunately, the cases may not be exhaustive which would lead to overwriting the column of the previously created column.
I lack the context on why the cases are not exhaustive though...
--
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: issues-unsubscribe@flink.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org