Skip to content

[SPARK-43945][SQL][TESTS] Fix bug for SQLQueryTestSuite when run on local env #41431

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
panbingkun wants to merge 5 commits into from
Closed

[SPARK-43945][SQL][TESTS] Fix bug for SQLQueryTestSuite when run on local env #41431

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9ab51f1
[MINOR][TESTS] Fix bug for SQLQueryTestSuite when run on local env
panbingkun Jun 2, 2023
7d0d8a6
Merge branch 'master' into fix_SQLQueryTestSuite_run_on_local
panbingkun Jun 2, 2023
f44213f
[SPARK-43945][SQL][TESTS] Fix bug for `SQLQueryTestSuite` when run on…
panbingkun Jun 2, 2023
36bad6f
[SPARK-43945][SQL][TESTS] Fix bug for `SQLQueryTestSuite` when run on…
panbingkun Jun 2, 2023
d796590
[SPARK-43945][SQL][TESTS] Fix bug for `SQLQueryTestSuite` when run on…
panbingkun Jun 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions sql/core/src/test/scala/org/apache/spark/sql/SQLQueryTestSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -595,7 +595,6 @@ class SQLQueryTestSuite extends QueryTest with SharedSparkSession with SQLHelper
file.getAbsolutePath.replace(inputFilePath, analyzerGoldenFilePath) + ".out"
val absPath = file.getAbsolutePath
val testCaseName = absPath.stripPrefix(inputFilePath).stripPrefix(File.separator)
val analyzerTestCaseName = s"${testCaseName}_analyzer_test"

// Create test cases of test types that depend on the input filename.
val newTestCases: Seq[TestCase] = if (file.getAbsolutePath.startsWith(
Expand Down Expand Up @@ -838,13 +837,17 @@ class SQLQueryTestSuite extends QueryTest with SharedSparkSession with SQLHelper
s"Schema did not match for query #$i\n${expected.sql}: $output") {
output.schema
}
assertResult(expected.output, s"Result did not match" +
assertResult(normalizeOwner(expected.output), s"Result did not match" +
s" for query #$i\n${expected.sql}") {
output.output
}
}
}

private def normalizeOwner(plan: String): String = {
plan.replaceAll("""Owner\t\{runner}""", "Owner\t" + Utils.getCurrentUserName)
}
Copy link
Contributor

@beliefer beliefer Jun 2, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I know this work is OK. But it introduce the extra complexity and readability.


/** A single SQL query's output. */
trait QueryTestOutput {
def sql: String
Expand Down