-
Notifications
You must be signed in to change notification settings - Fork 29.2k
[SPARK-56916][SQL] Simplify ElementAt array codegen under ANSI mode #55941
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.
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
+97
−23
Closed
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
51 changes: 51 additions & 0 deletions
51
sql/catalyst/src/main/java/org/apache/spark/sql/catalyst/expressions/ElementAtUtils.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,51 @@ | ||
| /* | ||
| * 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.QueryContext; | ||
| import org.apache.spark.sql.errors.QueryExecutionErrors; | ||
|
|
||
| /** | ||
| * Static helpers used by {@link ElementAt} on {@code ArrayType} | ||
| * (codegen and eval) under ANSI mode. | ||
| */ | ||
| public final class ElementAtUtils { | ||
|
|
||
| private ElementAtUtils() {} | ||
|
|
||
| /** | ||
| * Resolves the user-supplied 1-based {@code element_at} index to a | ||
| * 0-based array position. Throws when the absolute index exceeds the | ||
| * array length (ANSI out-of-bounds) or when {@code index} is zero | ||
| * (always invalid). | ||
| * | ||
| * @param length the array length | ||
| * @param index the 1-based index supplied by the user (positive or negative) | ||
| * @param context the query context attached to the error | ||
| * @return the resolved 0-based position | ||
| */ | ||
| public static int resolveArrayIndex(int length, int index, QueryContext context) { | ||
| if (length < Math.abs(index)) { | ||
| throw QueryExecutionErrors.invalidElementAtIndexError(index, length, context); | ||
| } | ||
| if (index == 0) { | ||
| throw QueryExecutionErrors.invalidIndexOfZeroError(context); | ||
| } | ||
| return index > 0 ? index - 1 : length + index; | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2738,19 +2738,23 @@ case class ElementAt( | |
| override def nullSafeEval(value: Any, ordinal: Any): Any = doElementAt(value, ordinal) | ||
|
|
||
| @transient private lazy val doElementAt: (Any, Any) => Any = left.dataType match { | ||
| // ArrayType is split into ANSI (failOnError) and non-ANSI branches. | ||
| // Order matters: the guarded case must come first. | ||
| case _: ArrayType if failOnError => | ||
| (value, ordinal) => { | ||
| val array = value.asInstanceOf[ArrayData] | ||
| val idx = ElementAtUtils.resolveArrayIndex( | ||
| array.numElements(), ordinal.asInstanceOf[Int], getContextOrNull()) | ||
| if (arrayElementNullable && array.isNullAt(idx)) null else array.get(idx, dataType) | ||
| } | ||
| case _: ArrayType => | ||
| (value, ordinal) => { | ||
| val array = value.asInstanceOf[ArrayData] | ||
| val index = ordinal.asInstanceOf[Int] | ||
| if (array.numElements() < math.abs(index)) { | ||
| if (failOnError) { | ||
| throw QueryExecutionErrors.invalidElementAtIndexError( | ||
| index, array.numElements(), getContextOrNull()) | ||
| } else { | ||
| defaultValueOutOfBound match { | ||
| case Some(value) => value.eval() | ||
| case None => null | ||
| } | ||
| defaultValueOutOfBound match { | ||
| case Some(value) => value.eval() | ||
| case None => null | ||
| } | ||
| } else { | ||
| val idx = if (index == 0) { | ||
|
|
@@ -2773,6 +2777,31 @@ case class ElementAt( | |
|
|
||
| override def doGenCode(ctx: CodegenContext, ev: ExprCode): ExprCode = { | ||
| left.dataType match { | ||
| // ArrayType is split into ANSI (failOnError) and non-ANSI branches. | ||
| // Order matters: the guarded case must come first. | ||
| case _: ArrayType if failOnError => | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. ditto |
||
| nullSafeCodeGen(ctx, ev, (eval1, eval2) => { | ||
| val index = ctx.freshName("elementAtIndex") | ||
| val errorContext = getContextOrNullCode(ctx) | ||
| val utils = classOf[ElementAtUtils].getName | ||
| val assignment = s"${ev.value} = ${CodeGenerator.getValue(eval1, dataType, index)};" | ||
| val body = if (arrayElementNullable) { | ||
| s""" | ||
| |if ($eval1.isNullAt($index)) { | ||
| | ${ev.isNull} = true; | ||
| |} else { | ||
| | $assignment | ||
| |} | ||
| """.stripMargin | ||
| } else { | ||
| assignment | ||
| } | ||
| s""" | ||
| |int $index = $utils.resolveArrayIndex( | ||
| | $eval1.numElements(), (int) $eval2, $errorContext); | ||
| |$body | ||
| """.stripMargin | ||
| }) | ||
| case _: ArrayType => | ||
| nullSafeCodeGen(ctx, ev, (eval1, eval2) => { | ||
| val index = ctx.freshName("elementAtIndex") | ||
|
|
@@ -2786,21 +2815,15 @@ case class ElementAt( | |
| "" | ||
| } | ||
| val errorContext = getContextOrNullCode(ctx) | ||
| val indexOutOfBoundBranch = if (failOnError) { | ||
| // scalastyle:off line.size.limit | ||
| s"throw QueryExecutionErrors.invalidElementAtIndexError($index, $eval1.numElements(), $errorContext);" | ||
| // scalastyle:on line.size.limit | ||
| } else { | ||
| defaultValueOutOfBound match { | ||
| case Some(value) => | ||
| val defaultValueEval = value.genCode(ctx) | ||
| s""" | ||
| ${defaultValueEval.code} | ||
| ${ev.isNull} = ${defaultValueEval.isNull}; | ||
| ${ev.value} = ${defaultValueEval.value}; | ||
| """.stripMargin | ||
| case None => s"${ev.isNull} = true;" | ||
| } | ||
| val indexOutOfBoundBranch = defaultValueOutOfBound match { | ||
| case Some(value) => | ||
| val defaultValueEval = value.genCode(ctx) | ||
| s""" | ||
| ${defaultValueEval.code} | ||
| ${ev.isNull} = ${defaultValueEval.isNull}; | ||
| ${ev.value} = ${defaultValueEval.value}; | ||
| """.stripMargin | ||
| case None => s"${ev.isNull} = true;" | ||
| } | ||
|
|
||
| s""" | ||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
suggestion: Add a one-line Scala-side comment explaining the two case _: ArrayType clauses are split by failOnError.