spark-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From marmb...@apache.org
Subject spark git commit: [SQL] remove a decimal case branch that has no effect at runtime
Date Tue, 11 Nov 2014 01:21:20 GMT
Repository: spark
Updated Branches:
  refs/heads/branch-1.2 0089a4f64 -> 1ed1c68c0


[SQL] remove a decimal case branch that has no effect at runtime

it generates warnings at compile time marmbrus

Author: Xiangrui Meng <meng@databricks.com>

Closes #3192 from mengxr/dtc-decimal and squashes the following commits:

955e9fb [Xiangrui Meng] remove a decimal case branch that has no effect

(cherry picked from commit d793d80c8084923ea04dcf7d268eec8ede490127)
Signed-off-by: Michael Armbrust <michael@databricks.com>


Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/1ed1c68c
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/1ed1c68c
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/1ed1c68c

Branch: refs/heads/branch-1.2
Commit: 1ed1c68c0aa8f4da517cd4ac5c4ab117d2cee839
Parents: 0089a4f
Author: Xiangrui Meng <meng@databricks.com>
Authored: Mon Nov 10 17:20:52 2014 -0800
Committer: Michael Armbrust <michael@databricks.com>
Committed: Mon Nov 10 17:21:16 2014 -0800

----------------------------------------------------------------------
 .../scala/org/apache/spark/sql/types/util/DataTypeConversions.scala | 1 -
 1 file changed, 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/spark/blob/1ed1c68c/sql/core/src/main/scala/org/apache/spark/sql/types/util/DataTypeConversions.scala
----------------------------------------------------------------------
diff --git a/sql/core/src/main/scala/org/apache/spark/sql/types/util/DataTypeConversions.scala
b/sql/core/src/main/scala/org/apache/spark/sql/types/util/DataTypeConversions.scala
index 3fa4a7c..9aad7b3 100644
--- a/sql/core/src/main/scala/org/apache/spark/sql/types/util/DataTypeConversions.scala
+++ b/sql/core/src/main/scala/org/apache/spark/sql/types/util/DataTypeConversions.scala
@@ -133,7 +133,6 @@ protected[sql] object DataTypeConversions {
   def convertJavaToCatalyst(a: Any, dataType: DataType): Any = (a, dataType) match {
     case (obj, udt: UserDefinedType[_]) => ScalaReflection.convertToCatalyst(obj, udt)
// Scala type
     case (d: java.math.BigDecimal, _) => Decimal(BigDecimal(d))
-    case (d: java.math.BigDecimal, _) => BigDecimal(d)
     case (other, _) => other
   }
 


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org


Mime
View raw message