From 45800651f39283b53de7da9dcbe3bf0d652c2402 Mon Sep 17 00:00:00 2001 From: yangjie01 Date: Mon, 14 Sep 2020 19:57:14 +0800 Subject: [PATCH 1/3] fix sql hive module test --- .../regression-test-SPARK-8489/test-2.13.jar | Bin 0 -> 24348 bytes .../sql/hive/HiveSchemaInferenceSuite.scala | 3 ++- .../spark/sql/hive/HiveSparkSubmitSuite.scala | 2 +- .../apache/spark/sql/hive/StatisticsSuite.scala | 2 +- .../spark/sql/hive/execution/HiveDDLSuite.scala | 2 +- 5 files changed, 5 insertions(+), 4 deletions(-) create mode 100644 sql/hive/src/test/resources/regression-test-SPARK-8489/test-2.13.jar diff --git a/sql/hive/src/test/resources/regression-test-SPARK-8489/test-2.13.jar b/sql/hive/src/test/resources/regression-test-SPARK-8489/test-2.13.jar new file mode 100644 index 0000000000000000000000000000000000000000..d23d19eb6d3fdbbbbf91416c3a6d7ccce4c9a677 GIT binary patch literal 24348 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 Y5n;8|&|y&k35gu`w*)(4G=zWq4|47SL;wH) literal 0 HcmV?d00001 diff --git a/sql/hive/src/test/scala/org/apache/spark/sql/hive/HiveSchemaInferenceSuite.scala b/sql/hive/src/test/scala/org/apache/spark/sql/hive/HiveSchemaInferenceSuite.scala index 590ef949ffbd7..597b634293aaf 100644 --- a/sql/hive/src/test/scala/org/apache/spark/sql/hive/HiveSchemaInferenceSuite.scala +++ b/sql/hive/src/test/scala/org/apache/spark/sql/hive/HiveSchemaInferenceSuite.scala @@ -129,7 +129,8 @@ class HiveSchemaInferenceSuite // properties out). assert(!externalCatalog.getTable(DATABASE, TEST_TABLE_NAME).schemaPreservesCase) val rawTable = client.getTable(DATABASE, TEST_TABLE_NAME) - assert(rawTable.properties.filterKeys(_.startsWith(DATASOURCE_SCHEMA_PREFIX)) == Map.empty) + assert( + rawTable.properties.filterKeys(_.startsWith(DATASOURCE_SCHEMA_PREFIX)).toMap == Map.empty) schema } diff --git a/sql/hive/src/test/scala/org/apache/spark/sql/hive/HiveSparkSubmitSuite.scala b/sql/hive/src/test/scala/org/apache/spark/sql/hive/HiveSparkSubmitSuite.scala index 6feaaea3dfb89..501a877e8b7fb 100644 --- a/sql/hive/src/test/scala/org/apache/spark/sql/hive/HiveSparkSubmitSuite.scala +++ b/sql/hive/src/test/scala/org/apache/spark/sql/hive/HiveSparkSubmitSuite.scala @@ -153,7 +153,7 @@ class HiveSparkSubmitSuite // For more detail, see sql/hive/src/test/resources/regression-test-SPARK-8489/*scala. // TODO: revisit for Scala 2.13 support val version = Properties.versionNumberString match { - case v if v.startsWith("2.12") => v.substring(0, 4) + case v if v.startsWith("2.12") || v.startsWith("2.13") => v.substring(0, 4) case x => throw new Exception(s"Unsupported Scala Version: $x") } val jarDir = getTestResourcePath("regression-test-SPARK-8489") diff --git a/sql/hive/src/test/scala/org/apache/spark/sql/hive/StatisticsSuite.scala b/sql/hive/src/test/scala/org/apache/spark/sql/hive/StatisticsSuite.scala index be6d023302293..1f3878ad2925d 100644 --- a/sql/hive/src/test/scala/org/apache/spark/sql/hive/StatisticsSuite.scala +++ b/sql/hive/src/test/scala/org/apache/spark/sql/hive/StatisticsSuite.scala @@ -1128,7 +1128,7 @@ class StatisticsSuite extends StatisticsCollectionTestBase with TestHiveSingleto def checkColStatsProps(expected: Map[String, String]): Unit = { sql(s"ANALYZE TABLE $tableName COMPUTE STATISTICS FOR COLUMNS " + stats.keys.mkString(", ")) val table = hiveClient.getTable("default", tableName) - val props = table.properties.filterKeys(_.startsWith("spark.sql.statistics.colStats")) + val props = table.properties.filterKeys(_.startsWith("spark.sql.statistics.colStats")).toMap assert(props == expected) } diff --git a/sql/hive/src/test/scala/org/apache/spark/sql/hive/execution/HiveDDLSuite.scala b/sql/hive/src/test/scala/org/apache/spark/sql/hive/execution/HiveDDLSuite.scala index fbd1fc1ea98df..62b6c6c201c68 100644 --- a/sql/hive/src/test/scala/org/apache/spark/sql/hive/execution/HiveDDLSuite.scala +++ b/sql/hive/src/test/scala/org/apache/spark/sql/hive/execution/HiveDDLSuite.scala @@ -994,7 +994,7 @@ class HiveDDLSuite |""".stripMargin) val newPart = catalog.getPartition(TableIdentifier("boxes"), Map("width" -> "4")) assert(newPart.storage.serde == Some(expectedSerde)) - assert(newPart.storage.properties.filterKeys(expectedSerdeProps.contains) == + assert(newPart.storage.properties.filterKeys(expectedSerdeProps.contains).toMap == expectedSerdeProps) } From f0d5880b750669a8d293b9ad29d4b4d879041fb5 Mon Sep 17 00:00:00 2001 From: yangjie01 Date: Tue, 15 Sep 2020 20:55:44 +0800 Subject: [PATCH 2/3] replace test-2.13.jar --- .../regression-test-SPARK-8489/test-2.13.jar | Bin 24348 -> 19579 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/sql/hive/src/test/resources/regression-test-SPARK-8489/test-2.13.jar b/sql/hive/src/test/resources/regression-test-SPARK-8489/test-2.13.jar index d23d19eb6d3fdbbbbf91416c3a6d7ccce4c9a677..0d10f7ff03b35a1829e4f64ddbc82a0124b72f1b 100644 GIT binary patch delta 11298 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 Date: Wed, 16 Sep 2020 10:13:29 +0800 Subject: [PATCH 3/3] change to check isEmpty --- .../org/apache/spark/sql/hive/HiveSchemaInferenceSuite.scala | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sql/hive/src/test/scala/org/apache/spark/sql/hive/HiveSchemaInferenceSuite.scala b/sql/hive/src/test/scala/org/apache/spark/sql/hive/HiveSchemaInferenceSuite.scala index 597b634293aaf..ce82756428849 100644 --- a/sql/hive/src/test/scala/org/apache/spark/sql/hive/HiveSchemaInferenceSuite.scala +++ b/sql/hive/src/test/scala/org/apache/spark/sql/hive/HiveSchemaInferenceSuite.scala @@ -129,8 +129,7 @@ class HiveSchemaInferenceSuite // properties out). assert(!externalCatalog.getTable(DATABASE, TEST_TABLE_NAME).schemaPreservesCase) val rawTable = client.getTable(DATABASE, TEST_TABLE_NAME) - assert( - rawTable.properties.filterKeys(_.startsWith(DATASOURCE_SCHEMA_PREFIX)).toMap == Map.empty) + assert(rawTable.properties.filterKeys(_.startsWith(DATASOURCE_SCHEMA_PREFIX)).isEmpty) schema }