Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 5 additions & 0 deletions common/utils/src/main/resources/error/error-classes.json
Original file line number Diff line number Diff line change
Expand Up @@ -1708,6 +1708,11 @@
"Not allowed to implement multiple UDF interfaces, UDF class <className>."
]
},
"NAMED_ARGUMENTS_SUPPORT_DISABLED" : {
"message" : [
"Cannot call function <functionName> because named argument references are not enabled here. In this case, the named argument reference was <argument>. Set \"spark.sql.allowNamedFunctionArguments\" to \"true\" to turn on feature."
]
},
"NESTED_AGGREGATE_FUNCTION" : {
"message" : [
"It is not allowed to use an aggregate function in the argument of another aggregate function. Please use the inner aggregate function in a sub-query."
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -443,6 +443,7 @@ CONCAT_PIPE: '||';
HAT: '^';
COLON: ':';
ARROW: '->';
FAT_ARROW : '=>';
HENT_START: '/*+';
HENT_END: '*/';
QUESTION: '?';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -789,7 +789,7 @@ inlineTable
;

functionTable
: funcName=functionName LEFT_PAREN (expression (COMMA expression)*)? RIGHT_PAREN tableAlias
: funcName=functionName LEFT_PAREN (functionArgument (COMMA functionArgument)*)? RIGHT_PAREN tableAlias
;

tableAlias
Expand Down Expand Up @@ -862,6 +862,15 @@ expression
: booleanExpression
;

namedArgumentExpression
: key=identifier FAT_ARROW value=expression
;

functionArgument
: expression
| namedArgumentExpression
;

expressionSeq
: expression (COMMA expression)*
;
Expand Down Expand Up @@ -921,7 +930,8 @@ 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
(FILTER LEFT_PAREN WHERE where=booleanExpression RIGHT_PAREN)?
(nullsOption=(IGNORE | RESPECT) NULLS)? ( OVER windowSpec)? #functionCall
| identifier ARROW expression #lambda
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
/*
* 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

/**
* 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).
*
* SQL Syntax: key => value
* SQL grammar: key=identifier FAT_ARROW value=expression
*
* Example usage with the "encode" scalar function:
* SELECT encode("abc", charset => "utf-8");
* The second argument generates NamedArgumentExpression("charset", Literal("utf-8"))
* SELECT encode(charset => "utf-8", value => "abc");
*
* @param key The name of the function argument
* @param value The value of the function argument
*/
case class NamedArgumentExpression(key: String, value: Expression)
extends UnaryExpression with Unevaluable {

override def dataType: DataType = value.dataType

override def toString: String = s"$key => $value"

// NamedArgumentExpression has a single child, which is its value expression,
// so the value expression can be resolved by Analyzer rules recursively.
// For example, when the value is a built-in function expression,
// it must be resolved by [[ResolveFunctions]]
override def child: Expression = value

override protected def withNewChildInternal(newChild: Expression): Expression =
copy(value = newChild)
}
Original file line number Diff line number Diff line change
Expand Up @@ -1527,6 +1527,18 @@ class AstBuilder extends SqlBaseParserBaseVisitor[AnyRef] with SQLConfHelper wit
}
}

private def extractNamedArgument(expr: FunctionArgumentContext, funcName: String) : Expression = {
Option(expr.namedArgumentExpression).map { n =>
if (conf.getConf(SQLConf.ALLOW_NAMED_FUNCTION_ARGUMENTS)) {
NamedArgumentExpression(n.key.getText, expression(n.value))
} else {
throw QueryCompilationErrors.namedArgumentsNotEnabledError(funcName, n.key.getText)
}
}.getOrElse {
expression(expr)
}
}

private def withTimeTravel(
ctx: TemporalClauseContext, plan: LogicalPlan): LogicalPlan = withOrigin(ctx) {
val v = ctx.version
Expand All @@ -1551,17 +1563,22 @@ class AstBuilder extends SqlBaseParserBaseVisitor[AnyRef] with SQLConfHelper wit
Seq.empty
}

withFuncIdentClause(func.functionName, ident => {
if (ident.length > 1) {
throw QueryParsingErrors.invalidTableValuedFunctionNameError(ident, ctx)
}
withFuncIdentClause(
func.functionName,
ident => {
if (ident.length > 1) {
throw QueryParsingErrors.invalidTableValuedFunctionNameError(ident, ctx)
}
val args = func.functionArgument.asScala.map { e =>
extractNamedArgument(e, func.functionName.getText)
}.toSeq

val tvf = UnresolvedTableValuedFunction(ident, func.expression.asScala.map(expression).toSeq)
val tvf = UnresolvedTableValuedFunction(ident, args)

val tvfAliases = if (aliases.nonEmpty) UnresolvedTVFAliases(ident, tvf, aliases) else tvf
val tvfAliases = if (aliases.nonEmpty) UnresolvedTVFAliases(ident, tvf, aliases) else tvf

tvfAliases.optionalMap(func.tableAlias.strictIdentifier)(aliasPlan)
})
tvfAliases.optionalMap(func.tableAlias.strictIdentifier)(aliasPlan)
})
}

/**
Expand Down Expand Up @@ -2186,7 +2203,9 @@ 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 =>
extractNamedArgument(e, name)
}.toSeq match {
case Seq(UnresolvedStar(None))
if name.toLowerCase(Locale.ROOT) == "count" && !isDistinct =>
// Transform COUNT(*) into COUNT(1).
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -193,6 +193,15 @@ private[sql] object QueryCompilationErrors extends QueryErrorsBase {
messageParameters = Map("configKey" -> configKey))
}

def namedArgumentsNotEnabledError(functionName: String, argumentName: String): Throwable = {
new AnalysisException(
errorClass = "NAMED_ARGUMENTS_SUPPORT_DISABLED",
messageParameters = Map(
"functionName" -> toSQLId(functionName),
"argument" -> toSQLId(argumentName))
)
}

def unresolvedUsingColForJoinError(
colName: String, suggestion: String, side: String): Throwable = {
new AnalysisException(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -321,6 +321,13 @@ object SQLConf {
.booleanConf
.createWithDefault(false)

val ALLOW_NAMED_FUNCTION_ARGUMENTS = buildConf("spark.sql.allowNamedFunctionArguments")
.doc("If true, Spark will turn on support for named parameters for all functions that has" +
" it implemented.")
.version("3.5.0")
.booleanConf
.createWithDefault(true)

val DYNAMIC_PARTITION_PRUNING_ENABLED =
buildConf("spark.sql.optimizer.dynamicPartitionPruning.enabled")
.doc("When true, we will generate predicate for partition column when it's used as join key")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ import org.apache.spark.sql.catalyst.FunctionIdentifier
import org.apache.spark.sql.catalyst.analysis.{UnresolvedAttribute, _}
import org.apache.spark.sql.catalyst.expressions._
import org.apache.spark.sql.catalyst.expressions.aggregate.{First, Last}
import org.apache.spark.sql.catalyst.plans.logical.{OneRowRelation, Project}
import org.apache.spark.sql.catalyst.util.{DateTimeTestUtils, IntervalUtils}
import org.apache.spark.sql.catalyst.util.DateTimeConstants._
import org.apache.spark.sql.internal.SQLConf
Expand Down Expand Up @@ -329,6 +330,23 @@ 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')",
$"encode".function(NamedArgumentExpression("value", Literal("abc")),
NamedArgumentExpression("charset", Literal("utf-8"))))
assertEqual("encode('abc', charset => 'utf-8')",
$"encode".function(Literal("abc"), NamedArgumentExpression("charset", Literal("utf-8"))))
assertEqual("encode(charset => 'utf-8', 'abc')",
$"encode".function(NamedArgumentExpression("charset", Literal("utf-8")), Literal("abc")))
assertEqual("encode('abc', charset => 'utf' || '-8')",
$"encode".function(Literal("abc"), NamedArgumentExpression("charset",
Concat(Literal("utf") :: Literal("-8") :: Nil))))
val unresolvedAlias = Project(Seq(UnresolvedAlias(Literal("1"))), OneRowRelation())
assertEqual("encode(value => ((select '1')), charset => 'utf-8')",
$"encode".function(NamedArgumentExpression("value", ScalarSubquery(plan = unresolvedAlias)),
NamedArgumentExpression("charset", Literal("utf-8"))))
}

private def lv(s: Symbol) = UnresolvedNamedLambdaVariable(Seq(s.name))

test("lambda functions") {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1412,6 +1412,35 @@ 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
assertEqual(
"select * from my_tvf(arg1 => 'value1', arg2 => true)",
UnresolvedTableValuedFunction("my_tvf",
NamedArgumentExpression("arg1", Literal("value1")) ::
NamedArgumentExpression("arg2", Literal(true)) :: Nil).select(star()))

// Unnamed and named arguments
assertEqual(
"select * from my_tvf(2, arg1 => 'value1', arg2 => true)",
UnresolvedTableValuedFunction("my_tvf",
Literal(2) ::
NamedArgumentExpression("arg1", Literal("value1")) ::
NamedArgumentExpression("arg2", Literal(true)) :: Nil).select(star()))

// Mixed arguments
assertEqual(
"select * from my_tvf(arg1 => 'value1', 2, arg2 => true)",
UnresolvedTableValuedFunction("my_tvf",
NamedArgumentExpression("arg1", Literal("value1")) ::
Literal(2) ::
NamedArgumentExpression("arg2", Literal(true)) :: Nil).select(star()))
assertEqual(
"select * from my_tvf(group => 'abc')",
UnresolvedTableValuedFunction("my_tvf",
NamedArgumentExpression("group", Literal("abc")) :: Nil).select(star()))
}

test("SPARK-32106: TRANSFORM plan") {
// verify schema less
assertEqual(
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,112 @@
-- Automatically generated by SQLQueryTestSuite
-- !query
SELECT mask('AbCD123-@$#', lowerChar => 'q', upperChar => 'Q', otherChar => 'o', digitChar => 'd')
-- !query analysis
org.apache.spark.sql.AnalysisException
{
"errorClass" : "DATATYPE_MISMATCH.NON_FOLDABLE_INPUT",
"sqlState" : "42K09",
"messageParameters" : {
"inputExpr" : "\"namedargumentexpression(q)\"",
"inputName" : "upperChar",
"inputType" : "\"STRING\"",
"sqlExpr" : "\"mask(AbCD123-@$#, namedargumentexpression(q), namedargumentexpression(Q), namedargumentexpression(o), namedargumentexpression(d))\""
},
"queryContext" : [ {
"objectType" : "",
"objectName" : "",
"startIndex" : 8,
"stopIndex" : 98,
"fragment" : "mask('AbCD123-@$#', lowerChar => 'q', upperChar => 'Q', otherChar => 'o', digitChar => 'd')"
} ]
}


-- !query
SELECT mask(lowerChar => 'q', upperChar => 'Q', otherChar => 'o', digitChar => 'd', str => 'AbCD123-@$#')
-- !query analysis
org.apache.spark.sql.AnalysisException
{
"errorClass" : "DATATYPE_MISMATCH.NON_FOLDABLE_INPUT",
"sqlState" : "42K09",
"messageParameters" : {
"inputExpr" : "\"namedargumentexpression(Q)\"",
"inputName" : "upperChar",
"inputType" : "\"STRING\"",
"sqlExpr" : "\"mask(namedargumentexpression(q), namedargumentexpression(Q), namedargumentexpression(o), namedargumentexpression(d), namedargumentexpression(AbCD123-@$#))\""
},
"queryContext" : [ {
"objectType" : "",
"objectName" : "",
"startIndex" : 8,
"stopIndex" : 105,
"fragment" : "mask(lowerChar => 'q', upperChar => 'Q', otherChar => 'o', digitChar => 'd', str => 'AbCD123-@$#')"
} ]
}


-- !query
SELECT mask('AbCD123-@$#', lowerChar => 'q', upperChar => 'Q', digitChar => 'd')
-- !query analysis
org.apache.spark.sql.AnalysisException
{
"errorClass" : "DATATYPE_MISMATCH.NON_FOLDABLE_INPUT",
"sqlState" : "42K09",
"messageParameters" : {
"inputExpr" : "\"namedargumentexpression(q)\"",
"inputName" : "upperChar",
"inputType" : "\"STRING\"",
"sqlExpr" : "\"mask(AbCD123-@$#, namedargumentexpression(q), namedargumentexpression(Q), namedargumentexpression(d), NULL)\""
},
"queryContext" : [ {
"objectType" : "",
"objectName" : "",
"startIndex" : 8,
"stopIndex" : 80,
"fragment" : "mask('AbCD123-@$#', lowerChar => 'q', upperChar => 'Q', digitChar => 'd')"
} ]
}


-- !query
SELECT mask(lowerChar => 'q', upperChar => 'Q', digitChar => 'd', str => 'AbCD123-@$#')
-- !query analysis
org.apache.spark.sql.AnalysisException
{
"errorClass" : "DATATYPE_MISMATCH.NON_FOLDABLE_INPUT",
"sqlState" : "42K09",
"messageParameters" : {
"inputExpr" : "\"namedargumentexpression(Q)\"",
"inputName" : "upperChar",
"inputType" : "\"STRING\"",
"sqlExpr" : "\"mask(namedargumentexpression(q), namedargumentexpression(Q), namedargumentexpression(d), namedargumentexpression(AbCD123-@$#), NULL)\""
},
"queryContext" : [ {
"objectType" : "",
"objectName" : "",
"startIndex" : 8,
"stopIndex" : 87,
"fragment" : "mask(lowerChar => 'q', upperChar => 'Q', digitChar => 'd', str => 'AbCD123-@$#')"
} ]
}


-- !query
SELECT mask(lowerChar => 'q', 'AbCD123-@$#', upperChar => 'Q', otherChar => 'o', digitChar => 'd')
-- !query analysis
org.apache.spark.sql.AnalysisException
{
"errorClass" : "DATATYPE_MISMATCH.INPUT_SIZE_NOT_ONE",
"sqlState" : "42K09",
"messageParameters" : {
"exprName" : "upperChar",
"sqlExpr" : "\"mask(namedargumentexpression(q), AbCD123-@$#, namedargumentexpression(Q), namedargumentexpression(o), namedargumentexpression(d))\""
},
"queryContext" : [ {
"objectType" : "",
"objectName" : "",
"startIndex" : 8,
"stopIndex" : 98,
"fragment" : "mask(lowerChar => 'q', 'AbCD123-@$#', upperChar => 'Q', otherChar => 'o', digitChar => 'd')"
} ]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
SELECT mask('AbCD123-@$#', lowerChar => 'q', upperChar => 'Q', otherChar => 'o', digitChar => 'd');
SELECT mask(lowerChar => 'q', upperChar => 'Q', otherChar => 'o', digitChar => 'd', str => 'AbCD123-@$#');
SELECT mask('AbCD123-@$#', lowerChar => 'q', upperChar => 'Q', digitChar => 'd');
SELECT mask(lowerChar => 'q', upperChar => 'Q', digitChar => 'd', str => 'AbCD123-@$#');
SELECT mask(lowerChar => 'q', 'AbCD123-@$#', upperChar => 'Q', otherChar => 'o', digitChar => 'd');
Loading