dtenedor commented on code in PR #41429:
URL: https://github.com/apache/spark/pull/41429#discussion_r1227284125
##########
sql/catalyst/src/main/antlr4/org/apache/spark/sql/catalyst/parser/SqlBaseParser.g4:
##########
@@ -921,7 +930,7 @@ primaryExpression
| LEFT_PAREN namedExpression (COMMA namedExpression)+ RIGHT_PAREN
#rowConstructor
| LEFT_PAREN query RIGHT_PAREN
#subqueryExpression
| IDENTIFIER_KW LEFT_PAREN expression RIGHT_PAREN
#identifierClause
- | functionName LEFT_PAREN (setQuantifier? argument+=expression (COMMA
argument+=expression)*)? RIGHT_PAREN
+ | functionName LEFT_PAREN (setQuantifier? argument+=functionArgument
(COMMA argument+=functionArgument)*)? RIGHT_PAREN
Review Comment:
can you maybe fix formatting of these three lines so they break before the
94th column that the above labeks (e.g. `#identifierClause`) start on? This
could make the parser logic easier to read.
##########
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/parser/AstBuilder.scala:
##########
@@ -1544,8 +1544,17 @@ class AstBuilder extends
SqlBaseParserBaseVisitor[AnyRef] with SQLConfHelper wit
if (name.length > 1) {
throw QueryParsingErrors.invalidTableValuedFunctionNameError(name,
ctx)
}
+ val args = func.functionArgument.asScala.map { e =>
+ if (e.namedArgumentExpression != null) {
Review Comment:
You can simplify using `Option` and `map`:
```
Option(e.namedArgumentExpression).map { n =>
NamedArgumentExpression(n.get.getText, expression(nvalue))
}.getOrElse {
expression(e)
}
```
Same on L2188 below.
##########
sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/parser/ExpressionParserSuite.scala:
##########
@@ -329,6 +329,18 @@ class ExpressionParserSuite extends AnalysisTest {
parameters = Map("error" -> "'x'", "hint" -> ": extra input 'x'"))
}
+ test("function expressions with named arguments") {
+ assertEqual("encode(value => 'abc', charset => 'utf-8')",
Review Comment:
Great, thanks!
##########
sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/parser/PlanParserSuite.scala:
##########
@@ -1412,6 +1412,31 @@ class PlanParserSuite extends AnalysisTest {
assertEqual("select a, b from db.c; ;; ;", table("db", "c").select($"a",
$"b"))
}
+ test("table valued function with named arguments") {
+ // All named arguments
Review Comment:
Great, thanks!
##########
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/parser/AstBuilder.scala:
##########
@@ -1544,8 +1544,17 @@ class AstBuilder extends
SqlBaseParserBaseVisitor[AnyRef] with SQLConfHelper wit
if (name.length > 1) {
throw QueryParsingErrors.invalidTableValuedFunctionNameError(name,
ctx)
}
+ val args = func.functionArgument.asScala.map { e =>
+ if (e.namedArgumentExpression != null) {
+ val key = e.namedArgumentExpression.key.getText
+ val value = e.namedArgumentExpression.value
+ NamedArgumentExpression(key, expression(value))
Review Comment:
Can you control this behavior with a SQLConf? You can create a new entry
like `ALLOW_NAMED_FUNCTION_ARGUMENTS` and return an error here if the config is
not set to true:
https://github.com/apache/spark/blob/master/sql/catalyst/src/main/scala/org/apache/spark/sql/internal/SQLConf.scala
##########
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/NamedArgumentExpression.scala:
##########
@@ -0,0 +1,52 @@
+/*
+ * 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.catalyst.expressions
+
+import org.apache.spark.sql.types.DataType
+
+/**
+ * An unevaluable unary expression specifically for named argument functions
+ *
+ * SQL Syntax: key => value
+ * SQL grammar: key=identifier FAT_ARROW value=expression
+ *
+ * Example usage in encode:
Review Comment:
```suggestion
* Example usage with the "encode" scalar function:
```
##########
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/NamedArgumentExpression.scala:
##########
@@ -0,0 +1,52 @@
+/*
+ * 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.catalyst.expressions
+
+import org.apache.spark.sql.types.DataType
+
+/**
+ * An unevaluable unary expression specifically for named argument functions
Review Comment:
```suggestion
* This represents an argument expression to a function call accompanied
with an
* explicit reference to the corresponding argument name as a string. In
this way,
* the analyzer can make sure that the provided values match up to the
arguments
* as intended, and the arguments may appear in any order.
* This unary expression is unevaluable because we intend to replace it with
* the provided value itself during query analysis (after possibly
rearranging
* the parsed argument list to match up the names to the expected function
* signature).
```
--
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]
