forked from apache/flink
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[FLINK-17753] [table-planner-blink] Fix watermark defined in ddl does…
… not work in Table api This closes apache#12335
- Loading branch information
Showing
31 changed files
with
599 additions
and
340 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
118 changes: 118 additions & 0 deletions
118
...pi-java/src/main/java/org/apache/flink/table/api/internal/CatalogTableSchemaResolver.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,118 @@ | ||
| /* | ||
| * 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 | ||
| * | ||
| * https://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.internal; | ||
|
|
||
| import org.apache.flink.annotation.Internal; | ||
| import org.apache.flink.table.api.TableColumn; | ||
| import org.apache.flink.table.api.TableException; | ||
| import org.apache.flink.table.api.TableSchema; | ||
| import org.apache.flink.table.api.ValidationException; | ||
| import org.apache.flink.table.delegation.Parser; | ||
| import org.apache.flink.table.expressions.ResolvedExpression; | ||
| import org.apache.flink.table.types.DataType; | ||
| import org.apache.flink.table.types.logical.LogicalType; | ||
| import org.apache.flink.table.types.logical.TimestampKind; | ||
| import org.apache.flink.table.types.logical.TimestampType; | ||
| import org.apache.flink.table.types.utils.TypeConversions; | ||
|
|
||
| /** | ||
| * The {@link CatalogTableSchemaResolver} is used to derive correct result type of computed column, | ||
| * because the date type of computed column from catalog table is not trusted. | ||
| * | ||
| * <p>Such as `proctime()` function, its type in given TableSchema is Timestamp(3), | ||
| * but its correct type is Timestamp(3) *PROCTIME*. | ||
| */ | ||
| @Internal | ||
| public class CatalogTableSchemaResolver { | ||
| private final Parser parser; | ||
| // A flag to indicate the table environment should work in a batch or streaming | ||
| // TODO remove this once FLINK-18180 is finished | ||
| private final boolean isStreamingMode; | ||
|
|
||
| public CatalogTableSchemaResolver(Parser parser, boolean isStreamingMode) { | ||
| this.parser = parser; | ||
| this.isStreamingMode = isStreamingMode; | ||
| } | ||
|
|
||
| /** | ||
| * Resolve the computed column's type for the given schema. | ||
| * | ||
| * @param tableSchema Table schema to derive table field names and data types | ||
| * @return the resolved TableSchema | ||
| */ | ||
| public TableSchema resolve(TableSchema tableSchema) { | ||
| final String rowtime; | ||
| if (!tableSchema.getWatermarkSpecs().isEmpty()) { | ||
| // TODO: [FLINK-14473] we only support top-level rowtime attribute right now | ||
| rowtime = tableSchema.getWatermarkSpecs().get(0).getRowtimeAttribute(); | ||
| if (rowtime.contains(".")) { | ||
| throw new ValidationException( | ||
| String.format("Nested field '%s' as rowtime attribute is not supported right now.", rowtime)); | ||
| } | ||
| } else { | ||
| rowtime = null; | ||
| } | ||
|
|
||
| String[] fieldNames = tableSchema.getFieldNames(); | ||
| DataType[] fieldTypes = tableSchema.getFieldDataTypes(); | ||
|
|
||
| TableSchema.Builder builder = TableSchema.builder(); | ||
| for (int i = 0; i < tableSchema.getFieldCount(); ++i) { | ||
| TableColumn tableColumn = tableSchema.getTableColumns().get(i); | ||
| DataType fieldType = fieldTypes[i]; | ||
| if (tableColumn.isGenerated() && isProctimeType(tableColumn.getExpr().get(), tableSchema)) { | ||
| if (fieldNames[i].equals(rowtime)) { | ||
| throw new TableException("Watermark can not be defined for a processing time attribute column."); | ||
| } | ||
| TimestampType originalType = (TimestampType) fieldType.getLogicalType(); | ||
| LogicalType proctimeType = new TimestampType( | ||
| originalType.isNullable(), | ||
| TimestampKind.PROCTIME, | ||
| originalType.getPrecision()); | ||
| fieldType = TypeConversions.fromLogicalToDataType(proctimeType); | ||
| } else if (isStreamingMode && fieldNames[i].equals(rowtime)) { | ||
| TimestampType originalType = (TimestampType) fieldType.getLogicalType(); | ||
| LogicalType rowtimeType = new TimestampType( | ||
| originalType.isNullable(), | ||
| TimestampKind.ROWTIME, | ||
| originalType.getPrecision()); | ||
| fieldType = TypeConversions.fromLogicalToDataType(rowtimeType); | ||
| } | ||
| if (tableColumn.isGenerated()) { | ||
| builder.field(fieldNames[i], fieldType, tableColumn.getExpr().get()); | ||
| } else { | ||
| builder.field(fieldNames[i], fieldType); | ||
| } | ||
| } | ||
|
|
||
| tableSchema.getWatermarkSpecs().forEach(builder::watermark); | ||
| tableSchema.getPrimaryKey().ifPresent( | ||
| pk -> builder.primaryKey(pk.getName(), pk.getColumns().toArray(new String[0]))); | ||
| return builder.build(); | ||
| } | ||
|
|
||
| private boolean isProctimeType(String expr, TableSchema tableSchema) { | ||
| ResolvedExpression resolvedExpr = parser.parseSqlExpression(expr, tableSchema); | ||
| if (resolvedExpr == null) { | ||
| return false; | ||
| } | ||
| LogicalType type = resolvedExpr.getOutputDataType().getLogicalType(); | ||
| return type instanceof TimestampType && ((TimestampType) type).getKind() == TimestampKind.PROCTIME; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.