Skip to content

[format]Fix orc and parquet writer about timestamp not contains [local timezone] and [is_adjust_to_utc] #2739

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.

Sign up for GitHub

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
JingsongLi merged 2 commits into from
Jan 20, 2024
Merged

[format]Fix orc and parquet writer about timestamp not contains [local timezone] and [is_adjust_to_utc] #2739

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
46a3f89
fix orc and parquet writer about timestamp not contains [local timezo…
leoyy0316 Jan 19, 2024
83ab144
fix orc and parquet writer about timestamp not contains [local timezo…
leoyy0316 Jan 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion paimon-format/src/main/java/org/apache/paimon/format/orc/reader/OrcSplitReaderUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,9 @@ public static TypeDescription toOrcType(DataType type) {
case DATE:
return TypeDescription.createDate();
case TIMESTAMP_WITHOUT_TIME_ZONE:
case TIMESTAMP_WITH_LOCAL_TIME_ZONE:
return TypeDescription.createTimestamp();
case TIMESTAMP_WITH_LOCAL_TIME_ZONE:
return TypeDescription.createTimestampInstant();
case ARRAY:
ArrayType arrayType = (ArrayType) type;
return TypeDescription.createList(toOrcType(arrayType.getElementType()));
Expand Down
18 changes: 13 additions & 5 deletions paimon-format/src/main/java/org/apache/paimon/format/parquet/ParquetSchemaConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,11 +115,11 @@ private static Type convertToParquetType(
case TIMESTAMP_WITHOUT_TIME_ZONE:
TimestampType timestampType = (TimestampType) type;
return createTimestampWithLogicalType(
name, timestampType.getPrecision(), repetition);
name, timestampType.getPrecision(), repetition, false);
case TIMESTAMP_WITH_LOCAL_TIME_ZONE:
LocalZonedTimestampType localZonedTimestampType = (LocalZonedTimestampType) type;
return createTimestampWithLogicalType(
name, localZonedTimestampType.getPrecision(), repetition);
name, localZonedTimestampType.getPrecision(), repetition, true);
case ARRAY:
ArrayType arrayType = (ArrayType) type;
return ConversionPatterns.listOfElements(
Expand Down Expand Up @@ -151,13 +151,21 @@ private static Type convertToParquetType(
}

private static Type createTimestampWithLogicalType(
String name, int precision, Type.Repetition repetition) {
String name, int precision, Type.Repetition repetition, boolean isAdjustToUTC) {
if (precision <= 3) {
return Types.primitive(INT64, repetition).as(OriginalType.TIMESTAMP_MILLIS).named(name);
return Types.primitive(INT64, repetition)
.as(
LogicalTypeAnnotation.timestampType(
isAdjustToUTC, LogicalTypeAnnotation.TimeUnit.MILLIS))
.named(name);
} else if (precision > 6) {
return Types.primitive(PrimitiveType.PrimitiveTypeName.INT96, repetition).named(name);
} else {
return Types.primitive(INT64, repetition).as(OriginalType.TIMESTAMP_MICROS).named(name);
return Types.primitive(INT64, repetition)
.as(
LogicalTypeAnnotation.timestampType(
isAdjustToUTC, LogicalTypeAnnotation.TimeUnit.MICROS))
.named(name);
}
}

Expand Down