Skip to content

Support timestamp without zone in GenericParquetWriter #965

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

Closed
waterlx wants to merge 1 commit into from
Closed

Support timestamp without zone in GenericParquetWriter #965

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: 4 additions & 1 deletion data/src/main/java/org/apache/iceberg/data/parquet/GenericParquetWriter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
import org.apache.parquet.io.api.Binary;
import org.apache.parquet.schema.DecimalMetadata;
import org.apache.parquet.schema.GroupType;
import org.apache.parquet.schema.LogicalTypeAnnotation.TimestampLogicalTypeAnnotation;
import org.apache.parquet.schema.MessageType;
import org.apache.parquet.schema.PrimitiveType;
import org.apache.parquet.schema.Type;
Expand Down Expand Up @@ -133,7 +134,9 @@ public ParquetValueWriter<?> primitive(PrimitiveType primitive) {
case TIME_MICROS:
return new TimeWriter(desc);
case TIMESTAMP_MICROS:
return new TimestamptzWriter(desc);
boolean withZone = ((TimestampLogicalTypeAnnotation) primitive.getLogicalTypeAnnotation())
.isAdjustedToUTC();
return withZone ? new TimestamptzWriter(desc) : new TimestampWriter(desc);
case DECIMAL:
DecimalMetadata decimal = primitive.getDecimalMetadata();
switch (primitive.getPrimitiveTypeName()) {
Expand Down
5 changes: 5 additions & 0 deletions data/src/test/java/org/apache/iceberg/data/DataTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,11 @@ public abstract class DataTest {
@Rule
public TemporaryFolder temp = new TemporaryFolder();

@Test
public void testTimestampWithoutZone() throws IOException {
writeAndValidate(new Schema(required(0, "timestamp type without zone", Types.TimestampType.withoutZone())));
}

@Test
public void testSimpleStruct() throws IOException {
writeAndValidate(new Schema(SUPPORTED_PRIMITIVES.fields()));
Expand Down
8 changes: 6 additions & 2 deletions parquet/src/main/java/org/apache/iceberg/parquet/TypeToMessageType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,14 +30,15 @@
import org.apache.iceberg.types.Types.MapType;
import org.apache.iceberg.types.Types.NestedField;
import org.apache.iceberg.types.Types.StructType;
import org.apache.iceberg.types.Types.TimestampType;
import org.apache.parquet.schema.GroupType;
import org.apache.parquet.schema.LogicalTypeAnnotation;
import org.apache.parquet.schema.MessageType;
import org.apache.parquet.schema.Type;
import org.apache.parquet.schema.Types;

import static org.apache.parquet.schema.OriginalType.DATE;
import static org.apache.parquet.schema.OriginalType.DECIMAL;
import static org.apache.parquet.schema.OriginalType.TIMESTAMP_MICROS;
import static org.apache.parquet.schema.OriginalType.TIME_MICROS;
import static org.apache.parquet.schema.OriginalType.UTF8;
import static org.apache.parquet.schema.PrimitiveType.PrimitiveTypeName.BINARY;
Expand Down Expand Up @@ -130,7 +131,10 @@ public Type primitive(PrimitiveType primitive, Type.Repetition repetition, int i
case TIME:
return Types.primitive(INT64, repetition).as(TIME_MICROS).id(id).named(name);
case TIMESTAMP:
return Types.primitive(INT64, repetition).as(TIMESTAMP_MICROS).id(id).named(name);
boolean shouldAdjustToUTC = ((TimestampType) primitive).shouldAdjustToUTC();
LogicalTypeAnnotation.TimeUnit timeUnit = LogicalTypeAnnotation.TimeUnit.MICROS;
return Types.primitive(INT64, repetition).as(LogicalTypeAnnotation.timestampType(shouldAdjustToUTC, timeUnit))
.id(id).named(name);
case STRING:
return Types.primitive(BINARY, repetition).as(UTF8).id(id).named(name);
case BINARY:
Expand Down