Skip to content

[arrow] Fix TIMESTAMP_LTZ Arrow timezone to use UTC instead of system default #7364

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

Open
plusplusjiajia wants to merge 1 commit into
base: master
Choose a base branch
from
+22 −4
Open

[arrow] Fix TIMESTAMP_LTZ Arrow timezone to use UTC instead of system default #7364

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 1 addition & 4 deletions paimon-arrow/src/main/java/org/apache/paimon/arrow/ArrowFieldTypeConversion.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,6 @@
import org.apache.arrow.vector.types.pojo.ArrowType;
import org.apache.arrow.vector.types.pojo.FieldType;

import java.time.ZoneId;

/** Utils for conversion between Paimon {@link DataType} and Arrow {@link FieldType}. */
public class ArrowFieldTypeConversion {

Expand Down Expand Up @@ -148,8 +146,7 @@ public FieldType visit(TimestampType timestampType) {
public FieldType visit(LocalZonedTimestampType localZonedTimestampType) {
int precision = localZonedTimestampType.getPrecision();
TimeUnit timeUnit = getTimeUnit(precision);
ArrowType arrowType =
new ArrowType.Timestamp(timeUnit, ZoneId.systemDefault().toString());
ArrowType arrowType = new ArrowType.Timestamp(timeUnit, "UTC");
return new FieldType(localZonedTimestampType.isNullable(), arrowType, null);
}

Expand Down
21 changes: 21 additions & 0 deletions paimon-arrow/src/test/java/org/apache/paimon/arrow/vector/ArrowFormatWriterTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,8 @@
import org.apache.arrow.vector.complex.ListVector;
import org.apache.arrow.vector.complex.MapVector;
import org.apache.arrow.vector.complex.StructVector;
import org.apache.arrow.vector.types.pojo.ArrowType;
import org.apache.arrow.vector.types.pojo.FieldType;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.ValueSource;
Expand Down Expand Up @@ -693,4 +695,23 @@ private byte[] randomBytes(int minLength, int maxLength) {
}
return bytes;
}

@Test
public void testTimestampArrowFieldTypeTimezone() {
for (int precision : new int[] {0, 3, 6, 9}) {
// TIMESTAMP_LTZ should use UTC
FieldType ltzFieldType =
DataTypes.TIMESTAMP_WITH_LOCAL_TIME_ZONE(precision)
.accept(ArrowFieldTypeConversion.ARROW_FIELD_TYPE_VISITOR);
ArrowType.Timestamp ltzType = (ArrowType.Timestamp) ltzFieldType.getType();
assertThat(ltzType.getTimezone()).isEqualTo("UTC");

// TIMESTAMP should have no timezone
FieldType tsFieldType =
DataTypes.TIMESTAMP(precision)
.accept(ArrowFieldTypeConversion.ARROW_FIELD_TYPE_VISITOR);
ArrowType.Timestamp tsType = (ArrowType.Timestamp) tsFieldType.getType();
assertThat(tsType.getTimezone()).isNull();
}
}
}
Loading