cloud-fan commented on code in PR #49445:
URL: https://github.com/apache/spark/pull/49445#discussion_r1931436154
##########
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/ColumnResolutionHelper.scala:
##########
@@ -266,22 +275,46 @@ trait ColumnResolutionHelper extends Logging with
DataTypeErrorsBase {
}
}
- if (maybeTempVariableName(nameParts)) {
- val variableName = if (conf.caseSensitiveAnalysis) {
- nameParts.last
- } else {
- nameParts.last.toLowerCase(Locale.ROOT)
- }
- catalogManager.tempVariableManager.get(variableName).map { varDef =>
+ val namePartsCaseAdjusted = if (conf.caseSensitiveAnalysis) {
+ nameParts
+ } else {
+ nameParts.map(_.toLowerCase(Locale.ROOT))
+ }
+
+ SqlScriptingLocalVariableManager.get()
+ // If sessionOnly is set to true lookup only session variables.
+ .filterNot(_ => AnalysisContext.get.isExecuteImmediate)
+ // If variable name is qualified with system.session.<varName> treat it
as a session variable.
+ .filterNot(_ =>
+ nameParts.length == 3
+ && nameParts.take(2).map(_.toLowerCase(Locale.ROOT)) ==
Seq("system", "session"))
+ // If variable name is qualified with session.<varName> treat it as a
session variable.
+ .filterNot(_ =>
+ nameParts.length == 2
+ && nameParts.head.toLowerCase(Locale.ROOT) == "session")
+ // Local variable must be in format <varName> or <label>.<varName>
+ .filter(_ => namePartsCaseAdjusted.nonEmpty &&
namePartsCaseAdjusted.length <= 2)
+ .flatMap(_.get(namePartsCaseAdjusted))
+ .map { varDef =>
VariableReference(
nameParts,
FakeSystemCatalog,
- Identifier.of(Array(CatalogManager.SESSION_NAMESPACE), variableName),
+ Identifier.of(Array(varDef.identifier.namespace().last),
namePartsCaseAdjusted.last),
varDef)
}
- } else {
- None
- }
+ .orElse(
+ Option.when(maybeTempVariableName(nameParts)) {
Review Comment:
I feel the previous `if-else` is more readable than `Option.when`
--
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: reviews-unsubscr...@spark.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscr...@spark.apache.org
For additional commands, e-mail: reviews-h...@spark.apache.org
