Skip to content
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

Update the legacy mode check: only take effect when reading date/timestamp column #10074

Merged
merged 6 commits into from
Jan 10, 2024
Merged

Update the legacy mode check: only take effect when reading date/timestamp column #10074

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
0ebd6ad
Update the legacy mode check: only take effect when reading date/time…
Dec 19, 2023
fb3d5fb
Fix
Dec 19, 2023
a28e6bc
Refactor
Jan 9, 2024
251d18c
Update
Jan 9, 2024
8698f39
Merge branch 'branch-24.02' into fix-db-legacy-mode
Jan 9, 2024
bed3548
Update 2024 Copyright
Jan 9, 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
16 changes: 14 additions & 2 deletions sql-plugin/src/main/scala/com/nvidia/spark/rapids/DataTypeUtils.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2021, NVIDIA CORPORATION.
* Copyright (c) 2021-2024, NVIDIA CORPORATION.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand All @@ -16,7 +16,8 @@

package com.nvidia.spark.rapids

import org.apache.spark.sql.types.{ArrayType, DataType, MapType, StructType}
import org.apache.spark.sql.rapids.execution.TrampolineUtil
import org.apache.spark.sql.types._

object DataTypeUtils {
def isNestedType(dataType: DataType): Boolean = dataType match {
Expand All @@ -26,4 +27,15 @@ object DataTypeUtils {

def hasNestedTypes(schema: StructType): Boolean =
schema.exists(f => isNestedType(f.dataType))

/**
* If `t` is date/timestamp type or its children have a date/timestamp type.
*
* @param t input date type.
* @return if contains date type.
*/
def hasDateOrTimestampType(t: DataType): Boolean = {
TrampolineUtil.dataTypeExistsRecursively(t, e =>
e.isInstanceOf[DateType] || e.isInstanceOf[TimestampType])
}
}
8 changes: 5 additions & 3 deletions sql-plugin/src/main/scala/com/nvidia/spark/rapids/GpuParquetScan.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2019-2023, NVIDIA CORPORATION.
* Copyright (c) 2019-2024, NVIDIA CORPORATION.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -774,9 +774,11 @@ private case class GpuParquetFileFilterHandler(
val clipped = GpuParquetUtils.clipBlocksToSchema(clippedSchema, blocks, isCaseSensitive)
(clipped, clippedSchema)
}

val hasDateTimeInReadSchema = DataTypeUtils.hasDateOrTimestampType(readDataSchema)
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: There is an isOrContainsDateOrTimestamp in GpuOverrides. Can we use it?

spark-rapids/sql-plugin/src/main/scala/com/nvidia/spark/rapids/GpuOverrides.scala

Lines 712 to 713 in c92bbc0

def isOrContainsDateOrTimestamp(dataType: DataType): Boolean =
TrampolineUtil.dataTypeExistsRecursively(dataType, dt => dt == TimestampType || dt == DateType)

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, we can use it. Since it's a nit, let's merge this PR first.

val dateRebaseModeForThisFile = DateTimeRebaseUtils.datetimeRebaseMode(
footer.getFileMetaData.getKeyValueMetaData.get, datetimeRebaseMode)
footer.getFileMetaData.getKeyValueMetaData.get,
datetimeRebaseMode,
hasDateTimeInReadSchema)
val hasInt96Timestamps = isParquetTimeInInt96(fileSchema)
val timestampRebaseModeForThisFile = if (hasInt96Timestamps) {
DateTimeRebaseUtils.int96RebaseMode(
Expand Down
12 changes: 7 additions & 5 deletions sql-plugin/src/main/scala/com/nvidia/spark/rapids/datetimeRebaseUtils.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2020-2023, NVIDIA CORPORATION.
* Copyright (c) 2020-2024, NVIDIA CORPORATION.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -72,7 +72,8 @@ object DateTimeRebaseUtils {
private def rebaseModeFromFileMeta(lookupFileMeta: String => String,
modeByConfig: String,
minVersion: String,
metadataKey: String): DateTimeRebaseMode = {
metadataKey: String,
hasDateTimeInReadSchema: Boolean = true): DateTimeRebaseMode = {

// If there is no version, we return the mode specified by the config.
val mode = Option(lookupFileMeta(SPARK_VERSION_METADATA_KEY)).map { version =>
Expand All @@ -95,7 +96,7 @@ object DateTimeRebaseUtils {
// Use the default JVM time zone for backward compatibility
TimeZone.getDefault.toZoneId
}
if (fileTimeZoneId.normalized() != GpuOverrides.UTC_TIMEZONE_ID) {
if (hasDateTimeInReadSchema && fileTimeZoneId.normalized() != GpuOverrides.UTC_TIMEZONE_ID) {
throw new UnsupportedOperationException(
"LEGACY datetime rebase mode is only supported for files written in UTC timezone. " +
s"Actual file timezone: $fileTimeZoneId")
Expand All @@ -106,9 +107,10 @@ object DateTimeRebaseUtils {
}

def datetimeRebaseMode(lookupFileMeta: String => String,
modeByConfig: String): DateTimeRebaseMode = {
modeByConfig: String,
hasDateTimeInReadSchema: Boolean = true): DateTimeRebaseMode = {
rebaseModeFromFileMeta(lookupFileMeta, modeByConfig, "3.0.0",
SPARK_LEGACY_DATETIME_METADATA_KEY)
SPARK_LEGACY_DATETIME_METADATA_KEY, hasDateTimeInReadSchema)
}

def int96RebaseMode(lookupFileMeta: String => String,
Expand Down