stefankandic commented on code in PR #45739: URL: https://github.com/apache/spark/pull/45739#discussion_r1551959563
########## sql/core/src/test/scala/org/apache/spark/sql/TPCDSCollationQueryTestSuite.scala: ########## @@ -0,0 +1,214 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You 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. + */ + +package org.apache.spark.sql + +import java.nio.file.{Files, Paths} +import java.util.Locale + +import org.apache.spark.{SparkConf, SparkContext} +import org.apache.spark.sql.catalyst.util.resourceToString +import org.apache.spark.sql.internal.SQLConf +import org.apache.spark.sql.test.TestSparkSession +import org.apache.spark.tags.ExtendedSQLTest +import org.apache.spark.util.Utils + +@ExtendedSQLTest +class TPCDSCollationQueryTestSuite extends QueryTest with TPCDSBase with SQLQueryTestHelper { + + private val tpcdsDataPath = sys.env.get("SPARK_TPCDS_DATA") + + // To make output results deterministic + override protected def sparkConf: SparkConf = super.sparkConf + .set(SQLConf.SHUFFLE_PARTITIONS.key, "1") + + protected override def createSparkSession: TestSparkSession = { + new TestSparkSession(new SparkContext("local[1]", this.getClass.getSimpleName, sparkConf)) + } + + if (tpcdsDataPath.nonEmpty) { + val nonExistentTables = tableColumns.keys.filterNot { tableName => + Files.exists(Paths.get(s"${tpcdsDataPath.get}/$tableName")) + } + if (nonExistentTables.nonEmpty) { + fail(s"Non-existent TPCDS table paths found in ${tpcdsDataPath.get}: " + + nonExistentTables.mkString(", ")) + } + } + + private def withDB[T](dbName: String)(fun: => T): T = { + Utils.tryWithSafeFinally({ + spark.sql(s"USE `$dbName`") + fun + }) { + spark.sql("USE DEFAULT") + } + } + + abstract class CollationCheck(val dbName: String, + val collation: String, + val columnTransform: String) { + def queryTransform: String => String + } + + case class CaseInsensitiveCollationCheck(override val dbName: String, + override val collation: String, + override val columnTransform: String) + extends CollationCheck(dbName, collation, columnTransform) { + def queryTransform: String => String = identity + } + + case class CaseSensitiveCollationCheck(override val dbName: String, + override val collation: String, + override val columnTransform: String) + extends CollationCheck(dbName, collation, columnTransform) { + override def queryTransform: String => String = _.toLowerCase(Locale.ROOT) + } + + val randomizeCase = "RANDOMIZE_CASE" + + // List of batches of runs which should yield the same result when run on a query + val checks: Seq[Seq[CollationCheck]] = Seq( + Seq( + CaseSensitiveCollationCheck("tpcds_utf8", "UTF8_BINARY", "LOWER"), + CaseInsensitiveCollationCheck("tpcds_utf8_random", "UTF8_BINARY_LCASE", randomizeCase) + ), + Seq( + CaseSensitiveCollationCheck("tpcds_unicode", "UNICODE", "LOWER"), + CaseInsensitiveCollationCheck("tpcds_unicode_random", "UNICODE_CI", randomizeCase) + ) + ) + + override def createTables(): Unit = { + spark.udf.register( + randomizeCase, + functions.udf((s: String) => { + s match { + case null => null + case _ => + val random = new scala.util.Random() + s.map(c => if (random.nextBoolean()) c.toUpper else c.toLower) + } + }).asNondeterministic()) + checks.flatten.foreach(check => { + spark.sql(s"CREATE DATABASE `${check.dbName}`") + withDB(check.dbName) { + tableNames.foreach(tableName => { + val columns = tableColumns(tableName) + .split("\n") + .filter(_.trim.nonEmpty) + .map { column => + if (column.trim.split("\\s+").length != 2) { + throw new IllegalArgumentException(s"Invalid column definition: $column") + } + val Array(name, colType) = column.trim.split("\\s+") + (name, colType.replaceAll(",$", "")) + } + + spark.sql( + s""" + |CREATE TABLE `$tableName` (${collateStringColumns(columns, check.collation)}) + |USING parquet + |""".stripMargin) + + val transformedColumns = columns.map { case (name, colType) => + if (isTextColumn(colType)) { + s"${check.columnTransform}($name) AS $name" + } else { + name + } + }.mkString(", ") + + spark.sql( + s""" + |INSERT INTO TABLE `$tableName` + |SELECT $transformedColumns + |FROM parquet.`${tpcdsDataPath.get}/$tableName` + |""".stripMargin) + }) + } + }) + } + + override def dropTables(): Unit = + checks.flatten.foreach(check => { + withDB(check.dbName)(super.dropTables()) + spark.sql(s"DROP DATABASE `${check.dbName}`") + }) + + private def collateStringColumns( + columns: Array[(String, String)], + collation: String): String = { + columns + .map { case (name, colType) => + if (isTextColumn(colType)) { + s"$name STRING COLLATE $collation" + } else { + s"$name $colType" + } + } + .mkString(",\n") + } + + private def isTextColumn(columnType: String): Boolean = { + columnType.toUpperCase(Locale.ROOT).contains("CHAR") + } + + private def runQuery(query: String, conf: Map[String, String]): Unit = { + withSQLConf(conf.toSeq: _*) { + try { + checks.foreach(batch => { + val res = batch.map(check => + withDB(check.dbName)(getQueryOutput(check.queryTransform(query)).toLowerCase())) + if (res.nonEmpty) res.foreach(currRes => assertResult(currRes)(res.head)) + }) + } catch { + case e: Throwable => + val configs = conf.map { case (k, v) => + s"$k=$v" + } + throw new Exception(s"${e.getMessage}\nError using configs:\n${configs.mkString("\n")}") + } + } + } + + private def getQueryOutput(query: String): String = { + val (_, output) = handleExceptions(getNormalizedQueryExecutionResult(spark, query)) + output.mkString("\n").replaceAll("\\s+$", "") + } + + // skip q91 due to use of like expression which is not supported with collations yet + override def excludedTpcdsQueries: Set[String] = super.excludedTpcdsQueries ++ Set("q91") Review Comment: what do you think about writing the output to golden files like the regular tpcds test does? that way we won't have to skip this query -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected] --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
