Skip to content

Commit

Permalink
Rename method and argument in Delta Lake connector
Browse files Browse the repository at this point in the history
  • Loading branch information
ebyhr committed Jul 21, 2023
1 parent 524a2db commit ada049b
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -149,16 +149,16 @@ private static Object parseDecimal(DecimalType type, String valueString)
@Nullable
public static Object deserializePartitionValue(DeltaLakeColumnHandle column, Optional<String> valueString)
{
return valueString.map(value -> deserializeColumnValue(column, value, TransactionLogParser::readPartitionTimestamp)).orElse(null);
return valueString.map(value -> deserializeColumnValue(column, value, TransactionLogParser::readPartitionTimestampWithZone)).orElse(null);
}

private static Long readPartitionTimestamp(String timestamp)
private static Long readPartitionTimestampWithZone(String timestamp)
{
ZonedDateTime zonedDateTime = LocalDateTime.parse(timestamp, PARTITION_TIMESTAMP_FORMATTER).atZone(UTC);
return packDateTimeWithZone(zonedDateTime.toInstant().toEpochMilli(), UTC_KEY);
}

public static Object deserializeColumnValue(DeltaLakeColumnHandle column, String valueString, Function<String, Long> timestampReader)
public static Object deserializeColumnValue(DeltaLakeColumnHandle column, String valueString, Function<String, Long> timestampWithZoneReader)
{
verify(column.isBaseColumn(), "Unexpected dereference: %s", column);
Type type = column.getBaseType();
Expand Down Expand Up @@ -197,7 +197,7 @@ public static Object deserializeColumnValue(DeltaLakeColumnHandle column, String
return LocalDate.parse(valueString).toEpochDay();
}
if (type.equals(TIMESTAMP_TZ_MILLIS)) {
return timestampReader.apply(valueString);
return timestampWithZoneReader.apply(valueString);
}
if (VARCHAR.equals(type)) {
return utf8Slice(valueString);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ private Optional<Object> deserializeStatisticsValue(DeltaLakeColumnHandle column
if (!columnHandle.isBaseColumn()) {
return Optional.empty();
}
Object columnValue = deserializeColumnValue(columnHandle, statValue, DeltaLakeJsonFileStatistics::readStatisticsTimestamp);
Object columnValue = deserializeColumnValue(columnHandle, statValue, DeltaLakeJsonFileStatistics::readStatisticsTimestampWithZone);

Type columnType = columnHandle.getBaseType();
if (columnType.equals(DATE)) {
Expand All @@ -153,7 +153,7 @@ private Optional<Object> deserializeStatisticsValue(DeltaLakeColumnHandle column
return Optional.of(columnValue);
}

private static Long readStatisticsTimestamp(String timestamp)
private static Long readStatisticsTimestampWithZone(String timestamp)
{
ZonedDateTime zonedDateTime = ZonedDateTime.parse(timestamp, JSON_STATISTICS_TIMESTAMP_FORMATTER);
return packDateTimeWithZone(zonedDateTime.toInstant().toEpochMilli(), UTC_KEY);
Expand Down

0 comments on commit ada049b

Please sign in to comment.