Skip to content

[SPARK-9060] [SQL] Revert SPARK-8359, SPARK-8800, and SPARK-8677 #7426

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

[SPARK-9060] [SQL] Revert SPARK-8359, SPARK-8800, and SPARK-8677 #7426

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2de9afe
Revert "[SPARK-8800] [SQL] Fix inaccurate precision/scale of Decimal …
yhuai Jul 15, 2015
cfda7e4
Revert "[SPARK-8677] [SQL] Fix non-terminating decimal expansion for …
yhuai Jul 15, 2015
651264d
Revert "[SPARK-8359] [SQL] Fix incorrect decimal precision after mult…
yhuai Jul 15, 2015
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
21 changes: 2 additions & 19 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 @@ -17,8 +17,6 @@

package org.apache.spark.sql.types

import java.math.{MathContext, RoundingMode}

import org.apache.spark.annotation.DeveloperApi

/**
Expand Down Expand Up @@ -138,14 +136,6 @@ final class Decimal extends Ordered[Decimal] with Serializable {
}

def toBigDecimal: BigDecimal = {
if (decimalVal.ne(null)) {
decimalVal(MathContext.UNLIMITED)
} else {
BigDecimal(longVal, _scale)(MathContext.UNLIMITED)
}
}

def toLimitedBigDecimal: BigDecimal = {
if (decimalVal.ne(null)) {
decimalVal
} else {
Expand Down Expand Up @@ -273,15 +263,8 @@ final class Decimal extends Ordered[Decimal] with Serializable {

def * (that: Decimal): Decimal = Decimal(toBigDecimal * that.toBigDecimal)

def / (that: Decimal): Decimal = {
if (that.isZero) {
null
} else {
// To avoid non-terminating decimal expansion problem, we get scala's BigDecimal with limited
// precision and scala.
Decimal(toLimitedBigDecimal / that.toLimitedBigDecimal)
}
}
def / (that: Decimal): Decimal =
if (that.isZero) null else Decimal(toBigDecimal / that.toBigDecimal)

def % (that: Decimal): Decimal =
if (that.isZero) null else Decimal(toBigDecimal % that.toBigDecimal)
Expand Down
18 changes: 0 additions & 18 deletions sql/catalyst/src/test/scala/org/apache/spark/sql/types/decimal/DecimalSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,22 +171,4 @@ class DecimalSuite extends SparkFunSuite with PrivateMethodTester {
assert(new Decimal().set(100L, 10, 0).toUnscaledLong === 100L)
assert(Decimal(Long.MaxValue, 100, 0).toUnscaledLong === Long.MaxValue)
}

test("accurate precision after multiplication") {
val decimal = (Decimal(Long.MaxValue, 38, 0) * Decimal(Long.MaxValue, 38, 0)).toJavaBigDecimal
assert(decimal.unscaledValue.toString === "85070591730234615847396907784232501249")
}

test("fix non-terminating decimal expansion problem") {
val decimal = Decimal(1.0, 10, 3) / Decimal(3.0, 10, 3)
// The difference between decimal should not be more than 0.001.
assert(decimal.toDouble - 0.333 < 0.001)
}

test("fix loss of precision/scale when doing division operation") {
val a = Decimal(2) / Decimal(3)
assert(a.toDouble < 1.0 && a.toDouble > 0.6)
val b = Decimal(1) / Decimal(8)
assert(b.toDouble === 0.125)
}
}