From 5890fe8d9365e2da70506021ba740adc5c961c66 Mon Sep 17 00:00:00 2001 From: Dongjoon Hyun Date: Thu, 16 Jun 2022 14:49:50 -0700 Subject: [PATCH 1/2] [SPARK-39495][SQL][TESTS] Support `SPARK_TEST_HIVE_CLIENT_VERSIONS` for `HiveClientVersions` --- .../apache/spark/sql/hive/client/HiveClientVersions.scala | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sql/hive/src/test/scala/org/apache/spark/sql/hive/client/HiveClientVersions.scala b/sql/hive/src/test/scala/org/apache/spark/sql/hive/client/HiveClientVersions.scala index d48d70f7d4e7..5b5447e822db 100644 --- a/sql/hive/src/test/scala/org/apache/spark/sql/hive/client/HiveClientVersions.scala +++ b/sql/hive/src/test/scala/org/apache/spark/sql/hive/client/HiveClientVersions.scala @@ -22,7 +22,10 @@ import scala.collection.immutable.IndexedSeq import org.apache.commons.lang3.{JavaVersion, SystemUtils} private[client] trait HiveClientVersions { - protected val versions = if (SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_9)) { + private val testVersions = sys.env.get("SPARK_TEST_HIVE_CLIENT_VERSIONS") + protected val versions = if (testVersions.nonEmpty) { + testVersions.get.split(",").map(_.strip).filter(_.nonEmpty).toIndexedSeq + } else if (SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_9)) { IndexedSeq("2.0", "2.1", "2.2", "2.3", "3.0", "3.1") } else { IndexedSeq("0.12", "0.13", "0.14", "1.0", "1.1", "1.2", "2.0", "2.1", "2.2", "2.3", "3.0", From 538c7ba49425c83be3c0671b19d107e1251373c0 Mon Sep 17 00:00:00 2001 From: Dongjoon Hyun Date: Thu, 16 Jun 2022 16:26:59 -0700 Subject: [PATCH 2/2] Avoid Java 11 'strip' method --- .../org/apache/spark/sql/hive/client/HiveClientVersions.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sql/hive/src/test/scala/org/apache/spark/sql/hive/client/HiveClientVersions.scala b/sql/hive/src/test/scala/org/apache/spark/sql/hive/client/HiveClientVersions.scala index 5b5447e822db..6648c04a4c50 100644 --- a/sql/hive/src/test/scala/org/apache/spark/sql/hive/client/HiveClientVersions.scala +++ b/sql/hive/src/test/scala/org/apache/spark/sql/hive/client/HiveClientVersions.scala @@ -24,7 +24,7 @@ import org.apache.commons.lang3.{JavaVersion, SystemUtils} private[client] trait HiveClientVersions { private val testVersions = sys.env.get("SPARK_TEST_HIVE_CLIENT_VERSIONS") protected val versions = if (testVersions.nonEmpty) { - testVersions.get.split(",").map(_.strip).filter(_.nonEmpty).toIndexedSeq + testVersions.get.split(",").map(_.trim).filter(_.nonEmpty).toIndexedSeq } else if (SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_9)) { IndexedSeq("2.0", "2.1", "2.2", "2.3", "3.0", "3.1") } else {