Skip to content

[SPARK-29237][SQL][FOLLOWUP] Ignore SET commands in expression examples while checking the _FUNC_ pattern #25958

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
MaxGekk wants to merge 2 commits into from
Closed

[SPARK-29237][SQL][FOLLOWUP] Ignore SET commands in expression examples while checking the _FUNC_ pattern #25958

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4fd130a
Ignore SET commands
MaxGekk Sep 28, 2019
02f0270
Merge branch 'master' into dont-check-_FUNC_-in-set
MaxGekk Sep 28, 2019
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
10 changes: 5 additions & 5 deletions sql/core/src/test/scala/org/apache/spark/sql/SQLQuerySuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,7 @@ class SQLQuerySuite extends QueryTest with SharedSparkSession {

test("using _FUNC_ instead of function names in examples") {
val exampleRe = "(>.*;)".r
val setStmtRe = "(?i)^(>\\s+set\\s+).+".r
val ignoreSet = Set(
// Examples for CaseWhen show simpler syntax:
// `CASE WHEN ... THEN ... WHEN ... THEN ... END`
Expand All @@ -128,17 +129,16 @@ class SQLQuerySuite extends QueryTest with SharedSparkSession {
// _FUNC_ is replaced by `%` which causes a parsing error on `SELECT %(2, 1.8)`
"org.apache.spark.sql.catalyst.expressions.Remainder",
// Examples demonstrate alternative names, see SPARK-20749
"org.apache.spark.sql.catalyst.expressions.Length",
// Uses settings without _FUNC_ in `SET spark.sql.parser.escapedStringLiterals=true`
"org.apache.spark.sql.catalyst.expressions.Like",
"org.apache.spark.sql.catalyst.expressions.RLike")
"org.apache.spark.sql.catalyst.expressions.Length")
spark.sessionState.functionRegistry.listFunction().foreach { funcId =>
val info = spark.sessionState.catalog.lookupFunctionInfo(funcId)
val className = info.getClassName
withClue(s"Expression class '$className'") {
val exprExamples = info.getOriginalExamples
if (!exprExamples.isEmpty && !ignoreSet.contains(className)) {
assert(exampleRe.findAllIn(exprExamples).toSet.forall(_.contains("_FUNC_")))
assert(exampleRe.findAllIn(exprExamples).toIterable
.filter(setStmtRe.findFirstIn(_).isEmpty) // Ignore SET commands
.forall(_.contains("_FUNC_")))
}
}
}
Expand Down