Skip to content

[SPARK-40387][SQL] Improve the implementation of Spark Decimal #37830

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.

Sign up for GitHub

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
beliefer wants to merge 7 commits into from
Closed

[SPARK-40387][SQL] Improve the implementation of Spark Decimal #37830

Changes from 6 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
9bb6947
[SPARK-40387][SQL] Improve the implementation of Spark Decimal
beliefer Sep 8, 2022
61d7489
Update code
beliefer Sep 8, 2022
c5f743f
Update code
beliefer Sep 8, 2022
0ae7dff
Update code
beliefer Sep 9, 2022
0efecd5
Update code
beliefer Sep 9, 2022
aa60e0e
Update code
beliefer Sep 9, 2022
9af453d
Update code
beliefer Sep 14, 2022
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
32 changes: 15 additions & 17 deletions sql/catalyst/src/main/scala/org/apache/spark/sql/types/Decimal.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,15 +204,15 @@ final class Decimal extends Ordered[Decimal] with Serializable {
if (decimalVal.ne(null)) {
decimalVal.toBigInt
} else {
BigInt(toLong)
BigInt(rawLongValue)
}
}

def toJavaBigInteger: java.math.BigInteger = {
if (decimalVal.ne(null)) {
decimalVal.underlying().toBigInteger()
} else {
java.math.BigInteger.valueOf(toLong)
java.math.BigInteger.valueOf(rawLongValue)
}
}

Expand All @@ -226,7 +226,7 @@ final class Decimal extends Ordered[Decimal] with Serializable {

override def toString: String = toBigDecimal.toString()

def toPlainString: String = toBigDecimal.bigDecimal.toPlainString
def toPlainString: String = toJavaBigDecimal.toPlainString

def toDebugString: String = {
if (decimalVal.ne(null)) {
Expand All @@ -240,9 +240,11 @@ final class Decimal extends Ordered[Decimal] with Serializable {

def toFloat: Float = toBigDecimal.floatValue

private def rawLongValue: Long = longVal / POW_10(_scale)

@cloud-fan cloud-fan Sep 13, 2022

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

let's still use the old name actualLongVal

@beliefer beliefer Sep 14, 2022

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OK


def toLong: Long = {
if (decimalVal.eq(null)) {
longVal / POW_10(_scale)
rawLongValue
} else {
decimalVal.longValue
}
Expand Down Expand Up @@ -278,9 +280,8 @@ final class Decimal extends Ordered[Decimal] with Serializable {
private def roundToNumeric[T <: AnyVal](integralType: IntegralType, maxValue: Int, minValue: Int)
(f1: Long => T) (f2: Double => T): T = {
if (decimalVal.eq(null)) {
val actualLongVal = longVal / POW_10(_scale)
val numericVal = f1(actualLongVal)
if (actualLongVal == numericVal) {
val numericVal = f1(rawLongValue)
if (rawLongValue == numericVal) {
numericVal
} else {
throw QueryExecutionErrors.castingCauseOverflowError(
Expand All @@ -303,7 +304,7 @@ final class Decimal extends Ordered[Decimal] with Serializable {
*/
private[sql] def roundToLong(): Long = {
if (decimalVal.eq(null)) {
longVal / POW_10(_scale)
rawLongValue
} else {
try {
// We cannot store Long.MAX_VALUE as a Double without losing precision.
Expand Down Expand Up @@ -455,7 +456,7 @@ final class Decimal extends Ordered[Decimal] with Serializable {

override def hashCode(): Int = toBigDecimal.hashCode()

def isZero: Boolean = if (decimalVal.ne(null)) decimalVal == BIG_DEC_ZERO else longVal == 0
def isZero: Boolean = if (decimalVal.ne(null)) decimalVal.signum == 0 else longVal == 0

// We should follow DecimalPrecision promote if use longVal for add and subtract:
// Operation Result Precision Result Scale
Expand All @@ -466,15 +467,15 @@ final class Decimal extends Ordered[Decimal] with Serializable {
if (decimalVal.eq(null) && that.decimalVal.eq(null) && scale == that.scale) {
Decimal(longVal + that.longVal, Math.max(precision, that.precision) + 1, scale)
} else {
Decimal(toBigDecimal.bigDecimal.add(that.toBigDecimal.bigDecimal))
Decimal(toJavaBigDecimal.add(that.toJavaBigDecimal))
}
}

def - (that: Decimal): Decimal = {
if (decimalVal.eq(null) && that.decimalVal.eq(null) && scale == that.scale) {
Decimal(longVal - that.longVal, Math.max(precision, that.precision) + 1, scale)
} else {
Decimal(toBigDecimal.bigDecimal.subtract(that.toBigDecimal.bigDecimal))
Decimal(toJavaBigDecimal.subtract(that.toJavaBigDecimal))
}
}

Expand Down Expand Up @@ -504,7 +505,7 @@ final class Decimal extends Ordered[Decimal] with Serializable {
}
}

def abs: Decimal = if (this.compare(Decimal.ZERO) < 0) this.unary_- else this
def abs: Decimal = if (this < Decimal.ZERO) this.unary_- else this

@cloud-fan cloud-fan Sep 9, 2022

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

does this have a real impact?

@beliefer beliefer Sep 9, 2022

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this < Decimal.ZERO is more clear.


def floor: Decimal = if (scale == 0) this else {
val newPrecision = DecimalType.bounded(precision - scale + 1, 0).precision
Expand Down Expand Up @@ -532,8 +533,6 @@ object Decimal {

val POW_10 = Array.tabulate[Long](MAX_LONG_DIGITS + 1)(i => math.pow(10, i).toLong)

private val BIG_DEC_ZERO = BigDecimal(0)

private val MATH_CONTEXT = new MathContext(DecimalType.MAX_PRECISION, RoundingMode.HALF_UP)

private[sql] val ZERO = Decimal(0)
Expand Down Expand Up @@ -575,9 +574,8 @@ object Decimal {
}
}

private def numDigitsInIntegralPart(bigDecimal: JavaBigDecimal): Int = {
bigDecimal.precision - bigDecimal.scale
}
private def numDigitsInIntegralPart(bigDecimal: JavaBigDecimal): Int =
bigDecimal.precision - bigDecimal.scale

private def stringToJavaBigDecimal(str: UTF8String): JavaBigDecimal = {
// According the benchmark test, `s.toString.trim` is much faster than `s.trim.toString`.
Expand Down