-
Notifications
You must be signed in to change notification settings - Fork 244
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add 330 shim and fix failures in test_basic_json_read
- Loading branch information
Showing
3 changed files
with
106 additions
and
25 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
103 changes: 103 additions & 0 deletions
103
sql-plugin/src/main/spark330/scala/com/nvidia/spark/rapids/shims/GpuJsonToStructsShim.scala
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,103 @@ | ||
| /* | ||
| * Copyright (c) 2023, NVIDIA CORPORATION. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| /*** spark-rapids-shim-json-lines | ||
| {"spark": "330"} | ||
| {"spark": "330cdh"} | ||
| {"spark": "330db"} | ||
| {"spark": "331"} | ||
| {"spark": "332"} | ||
| {"spark": "332cdh"} | ||
| {"spark": "332db"} | ||
| {"spark": "333"} | ||
| spark-rapids-shim-json-lines ***/ | ||
| package com.nvidia.spark.rapids.shims | ||
|
|
||
| import ai.rapids.cudf.{ColumnVector, DType, Scalar} | ||
| import com.nvidia.spark.rapids.Arm.withResource | ||
| import com.nvidia.spark.rapids.{DateUtils, GpuCast, GpuOverrides, RapidsMeta} | ||
|
|
||
| import org.apache.spark.sql.catalyst.json.GpuJsonUtils | ||
| import org.apache.spark.sql.rapids.ExceptionTimeParserPolicy | ||
|
|
||
| object GpuJsonToStructsShim { | ||
|
|
||
| def tagDateFormatSupport(meta: RapidsMeta[_, _, _], dateFormat: Option[String]): Unit = { | ||
| } | ||
|
|
||
| def castJsonStringToDate(input: ColumnVector, options: Map[String, String]): ColumnVector = { | ||
| GpuJsonUtils.optionalDateFormatInRead(options) match { | ||
| case None => | ||
| // legacy behavior | ||
| withResource(Scalar.fromString(" ")) { space => | ||
| withResource(input.strip(space)) { trimmed => | ||
| GpuCast.castStringToDate(trimmed) | ||
| } | ||
| } | ||
| case Some(f) => | ||
| // from_json does not respect EXCEPTION policy | ||
| jsonStringToDate(input, f, failOnInvalid = false) | ||
| } | ||
| } | ||
|
|
||
| def tagDateFormatSupportFromScan(meta: RapidsMeta[_, _, _], dateFormat: Option[String]): Unit = { | ||
| } | ||
|
|
||
| def castJsonStringToDateFromScan(input: ColumnVector, dt: DType, dateFormat: Option[String], | ||
| failOnInvalid: Boolean): ColumnVector = { | ||
| dateFormat match { | ||
| case None => | ||
| // legacy behavior | ||
| withResource(input.strip()) { trimmed => | ||
| GpuCast.castStringToDateAnsi(trimmed, ansiMode = false) | ||
| } | ||
| case Some(f) => | ||
| jsonStringToDate(input, f, failOnInvalid && | ||
| GpuOverrides.getTimeParserPolicy == ExceptionTimeParserPolicy) | ||
| } | ||
| } | ||
|
|
||
| private def jsonStringToDate(input: ColumnVector, dateFormatPattern: String, | ||
| failOnInvalid: Boolean): ColumnVector = { | ||
| val regexRoot = dateFormatPattern | ||
| .replace("yyyy", raw"\d{4}") | ||
| .replace("MM", raw"\d{2}") | ||
| .replace("dd", raw"\d{2}") | ||
| val cudfFormat = DateUtils.toStrf(dateFormatPattern, parseString = true) | ||
| withResource(input.strip()) { input => | ||
| GpuCast.convertDateOrNull(input, "^" + regexRoot + "$", cudfFormat, failOnInvalid) | ||
| } | ||
| } | ||
|
|
||
| def castJsonStringToTimestamp(input: ColumnVector, | ||
| options: Map[String, String]): ColumnVector = { | ||
| options.get("timestampFormat") match { | ||
| case None => | ||
| // legacy behavior | ||
| withResource(Scalar.fromString(" ")) { space => | ||
| withResource(input.strip(space)) { trimmed => | ||
| // from_json doesn't respect ansi mode | ||
| GpuCast.castStringToTimestamp(trimmed, ansiMode = false) | ||
| } | ||
| } | ||
| case Some("yyyy-MM-dd'T'HH:mm:ss[.SSS][XXX]") => | ||
| GpuCast.convertTimestampOrNull(input, | ||
| "^[0-9]{4}-[0-9]{2}-[0-9]{2}T[0-9]{2}:[0-9]{2}:[0-9]{2}(\\.[0-9]{1,6})?Z?$", "%Y-%m-%d") | ||
| case other => | ||
| // should be unreachable due to GpuOverrides checks | ||
| throw new IllegalStateException(s"Unsupported timestampFormat $other") | ||
| } | ||
| } | ||
| } |