dtenedor commented on code in PR #41429: URL: https://github.com/apache/spark/pull/41429#discussion_r1226973650
########## sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/NamedArgumentExpression.scala: ########## @@ -0,0 +1,54 @@ +/* + * 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 + * + * NamedArgumentExpression is expected to be resolved + * and replaced in class extending [[NamedArgumentFunction]] Review Comment: please remove that ########## sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/parser/AstBuilder.scala: ########## @@ -2176,7 +2185,15 @@ class AstBuilder extends SqlBaseParserBaseVisitor[AnyRef] with SQLConfHelper wit val name = ctx.functionName.getText val isDistinct = Option(ctx.setQuantifier()).exists(_.DISTINCT != null) // Call `toSeq`, otherwise `ctx.argument.asScala.map(expression)` is `Buffer` in Scala 2.13 - val arguments = ctx.argument.asScala.map(expression).toSeq match { + val arguments = ctx.argument.asScala.map { e => + if (e.namedArgumentExpression != null) { + val key = e.namedArgumentExpression.key.strictIdentifier Review Comment: I think you can just use `e.namedArgumentExpression.key.getText` for this since it is a single-part identifier in the grammar. ########## sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/parser/AstBuilder.scala: ########## @@ -2176,7 +2185,15 @@ class AstBuilder extends SqlBaseParserBaseVisitor[AnyRef] with SQLConfHelper wit val name = ctx.functionName.getText val isDistinct = Option(ctx.setQuantifier()).exists(_.DISTINCT != null) // Call `toSeq`, otherwise `ctx.argument.asScala.map(expression)` is `Buffer` in Scala 2.13 - val arguments = ctx.argument.asScala.map(expression).toSeq match { + val arguments = ctx.argument.asScala.map { e => + if (e.namedArgumentExpression != null) { + val key = e.namedArgumentExpression.key.strictIdentifier + val value = e.namedArgumentExpression.value + NamedArgumentExpression(key.getText, expression(value)) Review Comment: This reveals the NamedArgumentExpression to the analyzer, but we haven't yet implemented resolution support for it. This should be OK since it is `Unevaluable`; let's add a couple analyzer or execution tests with the new syntax to show the errors. -- 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]
