Skip to content

Commit

Permalink
[KYUUBI #2312] Spark data type TimestampNTZ supported version changes…
Browse files Browse the repository at this point in the history
… as 3.4.0

### _Why are the changes needed?_

fix #2312

### _How was this patch tested?_
- [ ] Add some test cases that check the changes thoroughly including negative and positive cases if possible

- [ ] Add screenshots for manual tests if appropriate

- [x] [Run test](https://kyuubi.apache.org/docs/latest/develop_tools/testing.html#running-tests) locally before make a pull request

Closes #2313 from Nick-0723/2312.

Closes #2312

91e607a [Nick Song] Spark data type TimestampNTZ supported version changes as 3.4.0

Authored-by: Nick Song <chun2184@163.com>
Signed-off-by: Cheng Pan <chengpan@apache.org>
  • Loading branch information
Nick-0723 authored and pan3793 committed Apr 10, 2022
1 parent e5834ae commit e1e0b35
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 8 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import org.apache.spark.sql.types._
object SchemaHelper {

/**
* Spark 3.3.0 DataType TimestampNTZType's class name.
* Spark 3.4.0 DataType TimestampNTZType's class name.
*/
final val TIMESTAMP_NTZ = "TimestampNTZType$"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -80,9 +80,13 @@ class SparkOperationSuite extends WithSparkSQLEngine with HiveMetadataTests with
// since spark3.3.0
if (SPARK_ENGINE_MAJOR_MINOR_VERSION._1 > 3 ||
(SPARK_ENGINE_MAJOR_MINOR_VERSION._1 == 3 && SPARK_ENGINE_MAJOR_MINOR_VERSION._2 >= 3)) {
schema = schema.add("c18", "timestamp_ntz", nullable = true, "18")
.add("c19", "interval day", nullable = true, "19")
.add("c20", "interval year", nullable = true, "20")
schema = schema.add("c18", "interval day", nullable = true, "18")
.add("c19", "interval year", nullable = true, "19")
}
// since spark3.4.0
if (SPARK_ENGINE_MAJOR_MINOR_VERSION._1 > 3 ||
(SPARK_ENGINE_MAJOR_MINOR_VERSION._1 == 3 && SPARK_ENGINE_MAJOR_MINOR_VERSION._2 >= 4)) {
schema = schema.add("c20", "timestamp_ntz", nullable = true, "20")
}

val ddl =
Expand Down Expand Up @@ -120,9 +124,9 @@ class SparkOperationSuite extends WithSparkSQLEngine with HiveMetadataTests with
STRUCT,
BINARY,
STRUCT,
TIMESTAMP,
OTHER,
OTHER)
OTHER,
TIMESTAMP)

var pos = 0

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -175,8 +175,8 @@ trait SparkQueryTests extends HiveJDBCTestHelper {
}

test("execute statement - select timestamp_ntz") {
assume(SPARK_ENGINE_MAJOR_MINOR_VERSION._1 >= 3
&& SPARK_ENGINE_MAJOR_MINOR_VERSION._2 > 2)
assume(SPARK_ENGINE_MAJOR_MINOR_VERSION._1 > 3 ||
(SPARK_ENGINE_MAJOR_MINOR_VERSION._1 == 3 && SPARK_ENGINE_MAJOR_MINOR_VERSION._2 >= 4))
withJdbcStatement() { statement =>
val resultSet = statement.executeQuery(
"SELECT make_timestamp_ntz(2022, 03, 24, 18, 08, 31.800) AS col")
Expand Down

0 comments on commit e1e0b35

Please sign in to comment.