Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[SPARK-37149][SQL] Improve error messages for arithmetic overflow exc…
…eptions under ANSI mode ### What changes were proposed in this pull request? This PR improves error messages for arithmetic overflow exceptions thrown under ANSI mode. It augments the error messages by suggesting workarounds to users: - Turn off ANSI mode (except for ANSI interval type) - Use `try_` function if applicable. ### Why are the changes needed? To make error messages more actionable. ### Does this PR introduce _any_ user-facing change? Yes. Certain error messages will be different. ### How was this patch tested? Existing tests. Closes #34427 from allisonwang-db/spark-37149-overflow-err-msg. Authored-by: allisonwang-db <allison.wang@databricks.com> Signed-off-by: Wenchen Fan <wenchen@databricks.com>
- Loading branch information
1 parent
f258d30
commit e582799
Showing
19 changed files
with
177 additions
and
104 deletions.
There are no files selected for viewing
This file contains 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
This file contains 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
This file contains 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
This file contains 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
61 changes: 61 additions & 0 deletions
61
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/util/MathUtils.scala
This file contains 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,61 @@ | ||
/* | ||
* 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.util | ||
|
||
import org.apache.spark.sql.errors.QueryExecutionErrors | ||
|
||
/** | ||
* Helper functions for arithmetic operations with overflow. | ||
*/ | ||
object MathUtils { | ||
|
||
def addExact(a: Int, b: Int): Int = withOverflow(Math.addExact(a, b)) | ||
|
||
def addExact(a: Long, b: Long): Long = withOverflow(Math.addExact(a, b)) | ||
|
||
def subtractExact(a: Int, b: Int): Int = withOverflow(Math.subtractExact(a, b)) | ||
|
||
def subtractExact(a: Long, b: Long): Long = withOverflow(Math.subtractExact(a, b)) | ||
|
||
def multiplyExact(a: Int, b: Int): Int = withOverflow(Math.multiplyExact(a, b)) | ||
|
||
def multiplyExact(a: Long, b: Long): Long = withOverflow(Math.multiplyExact(a, b)) | ||
|
||
def negateExact(a: Int): Int = withOverflow(Math.negateExact(a)) | ||
|
||
def negateExact(a: Long): Long = withOverflow(Math.negateExact(a)) | ||
|
||
def toIntExact(a: Long): Int = withOverflow(Math.toIntExact(a)) | ||
|
||
def floorDiv(a: Int, b: Int): Int = withOverflow(Math.floorDiv(a, b), Some("try_divide")) | ||
|
||
def floorDiv(a: Long, b: Long): Long = withOverflow(Math.floorDiv(a, b), Some("try_divide")) | ||
|
||
def floorMod(a: Int, b: Int): Int = withOverflow(Math.floorMod(a, b)) | ||
|
||
def floorMod(a: Long, b: Long): Long = withOverflow(Math.floorMod(a, b)) | ||
|
||
private def withOverflow[A](f: => A, hint: Option[String] = None): A = { | ||
try { | ||
f | ||
} catch { | ||
case e: ArithmeticException => | ||
throw QueryExecutionErrors.arithmeticOverflowError(e.getMessage, hint) | ||
} | ||
} | ||
} |
This file contains 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
This file contains 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
Oops, something went wrong.