Skip to content

Implement TimeStampXXXTZVector for parquet isAdjustedToUTC #926 #576 #577 #927

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

Draft
wants to merge 7 commits into
base: master
Choose a base branch
from
Draft

Implement TimeStampXXXTZVector for parquet isAdjustedToUTC #926 #576 #577 #927

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
b5c614c
Implement TimeStampMicroTZVector for parquet isAdjustedToUTC timestam…
Oct 17, 2024
d5bd3a2
test for TimeStampMicroTZVector
Oct 18, 2024
330951c
add support for TimeStampNanoTZVector
Oct 18, 2024
7bc05a4
fix precision of TimeStampMicroTZVector (div. 1_000L was wrong)
Oct 18, 2024
bd049d9
add support for TimeStampMilliTZVector
Oct 18, 2024
cbdf8f7
use proper utility method for TimeStampNanoTZVector
Oct 18, 2024
e121232
add support for timeStampSecTZVector
Oct 18, 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
Prev Previous commit
Next Next commit
add support for TimeStampMilliTZVector
  • Loading branch information
Laurent Perez committed Oct 18, 2024
commit bd049d90182f45cc8ba4f0807b86f430ebfaa7b8
13 changes: 13 additions & 0 deletions dataframe-arrow/src/main/kotlin/org/jetbrains/kotlinx/dataframe/io/arrowReadingImpl.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ import org.apache.arrow.vector.TimeMilliVector
import org.apache.arrow.vector.TimeNanoVector
import org.apache.arrow.vector.TimeSecVector
import org.apache.arrow.vector.TimeStampMicroVector
import org.apache.arrow.vector.TimeStampMilliTZVector
import org.apache.arrow.vector.TimeStampMilliVector
import org.apache.arrow.vector.TimeStampNanoTZVector
import org.apache.arrow.vector.TimeStampNanoVector
Expand Down Expand Up @@ -216,6 +217,16 @@ private fun TimeStampMilliVector.values(range: IntRange): List<LocalDateTime?> =
}
}

private fun TimeStampMilliTZVector.values(range: IntRange): List<LocalDateTime?> =
range.mapIndexed { i, it ->
if (isNull(i)) {
null
} else {
Instant.fromEpochMilliseconds(getObject(it))
.toLocalDateTime(TimeZone.of(this.timeZone))
}
}

private fun TimeStampSecVector.values(range: IntRange): List<LocalDateTime?> =
range.mapIndexed { i, it ->
if (isNull(i)) {
Expand Down Expand Up @@ -379,6 +390,8 @@ private fun readField(root: VectorSchemaRoot, field: Field, nullability: Nullabi

is TimeStampMilliVector -> vector.values(range).withTypeNullable(field.isNullable, nullability)

is TimeStampMilliTZVector -> vector.values(range).withTypeNullable(field.isNullable, nullability)

is TimeStampSecVector -> vector.values(range).withTypeNullable(field.isNullable, nullability)

is StructVector -> vector.values(range).withTypeNullable(field.isNullable, nullability)
Expand Down
13 changes: 12 additions & 1 deletion dataframe-arrow/src/test/kotlin/org/jetbrains/kotlinx/dataframe/io/ArrowKtTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import kotlinx.datetime.toJavaInstant
import org.apache.arrow.memory.RootAllocator
import org.apache.arrow.vector.TimeStampMicroTZVector
import org.apache.arrow.vector.TimeStampMicroVector
import org.apache.arrow.vector.TimeStampMilliTZVector
import org.apache.arrow.vector.TimeStampMilliVector
import org.apache.arrow.vector.TimeStampNanoTZVector
import org.apache.arrow.vector.TimeStampNanoVector
Expand Down Expand Up @@ -538,6 +539,7 @@ internal class ArrowKtTest {
"ts_micro" to dates,
"ts_micro_tz" to dates,
"ts_milli" to dates,
"ts_milli_tz" to dates,
"ts_sec" to dates,
)

Expand All @@ -553,6 +555,12 @@ internal class ArrowKtTest {
null,
)

val timeStampMilliTZ = Field(
"ts_milli_tz",
FieldType.nullable(ArrowType.Timestamp(TimeUnit.MILLISECOND, "UTC")),
null,
)

val timeStampMicro = Field(
"ts_micro",
FieldType.nullable(ArrowType.Timestamp(TimeUnit.MICROSECOND, null)),
Expand Down Expand Up @@ -583,16 +591,18 @@ internal class ArrowKtTest {
null,
)
val schemaTimeStamp = Schema(
listOf(timeStampNano, timeStampNanoTZ, timeStampMicro, timeStampMicroTZ, timeStampMilli, timeStampSec),
listOf(timeStampNano, timeStampNanoTZ, timeStampMicro, timeStampMicroTZ, timeStampMilli, timeStampMilliTZ, timeStampSec),
)
VectorSchemaRoot.create(schemaTimeStamp, allocator).use { vectorSchemaRoot ->
val timeStampMilliVector = vectorSchemaRoot.getVector("ts_milli") as TimeStampMilliVector
val timeStampMilliTZVector = vectorSchemaRoot.getVector("ts_milli_tz") as TimeStampMilliTZVector
val timeStampNanoVector = vectorSchemaRoot.getVector("ts_nano") as TimeStampNanoVector
val timeStampNanoTZVector = vectorSchemaRoot.getVector("ts_nano_tz") as TimeStampNanoTZVector
val timeStampMicroVector = vectorSchemaRoot.getVector("ts_micro") as TimeStampMicroVector
val timeStampMicroTZVector = vectorSchemaRoot.getVector("ts_micro_tz") as TimeStampMicroTZVector
val timeStampSecVector = vectorSchemaRoot.getVector("ts_sec") as TimeStampSecVector
timeStampMilliVector.allocateNew(dates.size)
timeStampMilliTZVector.allocateNew(dates.size)
timeStampNanoVector.allocateNew(dates.size)
timeStampNanoTZVector.allocateNew(dates.size)
timeStampMicroVector.allocateNew(dates.size)
Expand All @@ -606,6 +616,7 @@ internal class ArrowKtTest {
timeStampMicroVector[index] = instant.toEpochMilli() * 1_000L
timeStampMicroTZVector[index] = instant.toEpochMilli() * 1_000L
timeStampMilliVector[index] = instant.toEpochMilli()
timeStampMilliTZVector[index] = instant.toEpochMilli()
timeStampSecVector[index] = instant.toEpochMilli() / 1_000L
}
vectorSchemaRoot.setRowCount(dates.size)
Expand Down