Github user rxin commented on a diff in the pull request:
https://github.com/apache/spark/pull/14235#discussion_r71100858
--- Diff:
sql/hive/src/test/scala/org/apache/spark/sql/catalyst/LogicalPlanToSQLSuite.scala
---
@@ -76,22 +88,58 @@ class LogicalPlanToSQLSuite extends SQLBuilderTest with
SQLTestUtils {
}
}
- private def checkHiveQl(hiveQl: String): Unit = {
- val df = sql(hiveQl)
+ // Used for generating new query answer files by saving
+ private val saveQuery = false
+
+ /**
+ * Compare the generated SQL with the expected answer string.
+ * Note that there exists a normalization for both arguments for the
convenience.
+ * - Remove the id from the generated attributes, e.g., `gen_attr_1` ->
`gen_attr`.
+ */
+ private def checkSQLStructure(originalSQL: String, convertedSQL: String,
answerFile: String) = {
+ val normalizedGenSQL = convertedSQL.replaceAll("`gen_attr_\\d+`",
"`gen_attr`")
+ if (answerFile != null) {
+ val path = s"src/test/resources/sqlgen/$answerFile.sql"
+ val separator = "-" * 80
+ if (saveQuery) {
+ val header = "-- This file is automatically generated by
LogicalPlanToSQLSuite."
+ val answerText =
s"$header\n${originalSQL.trim()}\n${separator}\n$normalizedGenSQL\n"
+ Files.write(Paths.get(path),
answerText.getBytes(StandardCharsets.UTF_8))
+ } else {
+ val answerText = new String(Files.readAllBytes(Paths.get(path)),
StandardCharsets.UTF_8)
+ val sqls = answerText.split(separator)
+ if (sqls.length == 2) {
--- End diff --
shouldn't we do an assert here instead?
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscr...@spark.apache.org
For additional commands, e-mail: reviews-h...@spark.apache.org
