-
Notifications
You must be signed in to change notification settings - Fork 3k
Add TypeToFlinkType: convert iceberg types to Flink types #1174
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
Merged
Merged
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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
132 changes: 132 additions & 0 deletions
132
flink/src/main/java/org/apache/iceberg/flink/TypeToFlinkType.java
This file contains hidden or 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,132 @@ | ||
| /* | ||
| * 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.iceberg.flink; | ||
|
|
||
| import java.util.List; | ||
| import org.apache.flink.table.types.logical.ArrayType; | ||
| import org.apache.flink.table.types.logical.BigIntType; | ||
| import org.apache.flink.table.types.logical.BinaryType; | ||
| import org.apache.flink.table.types.logical.BooleanType; | ||
| import org.apache.flink.table.types.logical.DateType; | ||
| import org.apache.flink.table.types.logical.DecimalType; | ||
| import org.apache.flink.table.types.logical.DoubleType; | ||
| import org.apache.flink.table.types.logical.FloatType; | ||
| import org.apache.flink.table.types.logical.IntType; | ||
| import org.apache.flink.table.types.logical.LocalZonedTimestampType; | ||
| import org.apache.flink.table.types.logical.LogicalType; | ||
| import org.apache.flink.table.types.logical.MapType; | ||
| import org.apache.flink.table.types.logical.RowType; | ||
| import org.apache.flink.table.types.logical.TimeType; | ||
| import org.apache.flink.table.types.logical.TimestampType; | ||
| import org.apache.flink.table.types.logical.VarBinaryType; | ||
| import org.apache.flink.table.types.logical.VarCharType; | ||
| import org.apache.iceberg.Schema; | ||
| import org.apache.iceberg.relocated.com.google.common.collect.Lists; | ||
| import org.apache.iceberg.types.Type; | ||
| import org.apache.iceberg.types.TypeUtil; | ||
| import org.apache.iceberg.types.Types; | ||
|
|
||
| class TypeToFlinkType extends TypeUtil.SchemaVisitor<LogicalType> { | ||
| TypeToFlinkType() { | ||
| } | ||
|
|
||
| @Override | ||
| public LogicalType schema(Schema schema, LogicalType structType) { | ||
| return structType; | ||
| } | ||
|
|
||
| @Override | ||
| public LogicalType struct(Types.StructType struct, List<LogicalType> fieldResults) { | ||
| List<Types.NestedField> fields = struct.fields(); | ||
|
|
||
| List<RowType.RowField> flinkFields = Lists.newArrayListWithExpectedSize(fieldResults.size()); | ||
| for (int i = 0; i < fields.size(); i += 1) { | ||
| Types.NestedField field = fields.get(i); | ||
| LogicalType type = fieldResults.get(i); | ||
| RowType.RowField flinkField = new RowType.RowField( | ||
| field.name(), type.copy(field.isOptional()), field.doc()); | ||
| flinkFields.add(flinkField); | ||
| } | ||
|
|
||
| return new RowType(flinkFields); | ||
| } | ||
|
|
||
| @Override | ||
| public LogicalType field(Types.NestedField field, LogicalType fieldResult) { | ||
| return fieldResult; | ||
| } | ||
|
|
||
| @Override | ||
| public LogicalType list(Types.ListType list, LogicalType elementResult) { | ||
| return new ArrayType(elementResult.copy(list.isElementOptional())); | ||
| } | ||
|
|
||
| @Override | ||
| public LogicalType map(Types.MapType map, LogicalType keyResult, LogicalType valueResult) { | ||
| // keys in map are not allowed to be null. | ||
| return new MapType(keyResult.copy(false), valueResult.copy(map.isValueOptional())); | ||
| } | ||
|
|
||
| @Override | ||
| public LogicalType primitive(Type.PrimitiveType primitive) { | ||
| switch (primitive.typeId()) { | ||
| case BOOLEAN: | ||
| return new BooleanType(); | ||
| case INTEGER: | ||
| return new IntType(); | ||
| case LONG: | ||
| return new BigIntType(); | ||
| case FLOAT: | ||
| return new FloatType(); | ||
| case DOUBLE: | ||
| return new DoubleType(); | ||
| case DATE: | ||
| return new DateType(); | ||
| case TIME: | ||
| // MICROS | ||
| return new TimeType(6); | ||
| case TIMESTAMP: | ||
| Types.TimestampType timestamp = (Types.TimestampType) primitive; | ||
| if (timestamp.shouldAdjustToUTC()) { | ||
| // MICROS | ||
| return new LocalZonedTimestampType(6); | ||
| } else { | ||
| // MICROS | ||
| return new TimestampType(6); | ||
| } | ||
| case STRING: | ||
| return new VarCharType(VarCharType.MAX_LENGTH); | ||
| case UUID: | ||
| // UUID length is 16 | ||
| return new BinaryType(16); | ||
| case FIXED: | ||
| Types.FixedType fixedType = (Types.FixedType) primitive; | ||
| return new BinaryType(fixedType.length()); | ||
| case BINARY: | ||
| return new VarBinaryType(VarBinaryType.MAX_LENGTH); | ||
| case DECIMAL: | ||
| Types.DecimalType decimal = (Types.DecimalType) primitive; | ||
| return new DecimalType(decimal.precision(), decimal.scale()); | ||
| default: | ||
| throw new UnsupportedOperationException( | ||
| "Cannot convert unknown type to Flink: " + primitive); | ||
| } | ||
| } | ||
| } |
This file contains hidden or 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
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'd prefer to provide some separate unit tests to address the conversion differences ( so that we won't regress).
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'll add tests for the conversion differences.