Skip to content

[SPARK-8831][SQL] Support AbstractDataType in TypeCollection. #7232

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
rxin wants to merge 1 commit into from
Closed

[SPARK-8831][SQL] Support AbstractDataType in TypeCollection. #7232

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 0 additions & 2 deletions sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/HiveTypeCoercion.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -708,8 +708,6 @@ object HiveTypeCoercion {
case (NullType, target) => Cast(e, target.defaultConcreteType)

// Implicit cast among numeric types
// If input is decimal, and we expect a decimal type, just use the input.
case (_: DecimalType, DecimalType) => e
// If input is a numeric type but not decimal, and we expect a decimal type,
// cast the input to unlimited precision decimal.
Copy link
Contributor Author

@rxin rxin Jul 6, 2015

Choose a reason for hiding this comment

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

cc @cloud-fan

case (_: NumericType, DecimalType) if !inType.isInstanceOf[DecimalType] =>
Expand Down
10 changes: 6 additions & 4 deletions sql/catalyst/src/main/scala/org/apache/spark/sql/types/AbstractDataType.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,10 +53,12 @@ private[sql] abstract class AbstractDataType {
*
* This means that we prefer StringType over BinaryType if it is possible to cast to StringType.
*/
private[sql] class TypeCollection(private val types: Seq[DataType]) extends AbstractDataType {
private[sql] class TypeCollection(private val types: Seq[AbstractDataType])
extends AbstractDataType {

require(types.nonEmpty, s"TypeCollection ($types) cannot be empty")

private[sql] override def defaultConcreteType: DataType = types.head
private[sql] override def defaultConcreteType: DataType = types.head.defaultConcreteType

private[sql] override def isParentOf(childCandidate: DataType): Boolean = false

Expand All @@ -68,9 +70,9 @@ private[sql] class TypeCollection(private val types: Seq[DataType]) extends Abst

private[sql] object TypeCollection {

def apply(types: DataType*): TypeCollection = new TypeCollection(types)
def apply(types: AbstractDataType*): TypeCollection = new TypeCollection(types)

def unapply(typ: AbstractDataType): Option[Seq[DataType]] = typ match {
def unapply(typ: AbstractDataType): Option[Seq[AbstractDataType]] = typ match {
case typ: TypeCollection => Some(typ.types)
case _ => None
}
Expand Down
6 changes: 6 additions & 0 deletions ...atalyst/src/test/scala/org/apache/spark/sql/catalyst/analysis/HiveTypeCoercionSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,12 @@ class HiveTypeCoercionSuite extends PlanTest {

shouldCast(IntegerType, TypeCollection(StringType, BinaryType), StringType)
shouldCast(IntegerType, TypeCollection(BinaryType, StringType), StringType)

shouldCast(
DecimalType.Unlimited, TypeCollection(IntegerType, DecimalType), DecimalType.Unlimited)
shouldCast(DecimalType(10, 2), TypeCollection(IntegerType, DecimalType), DecimalType(10, 2))
shouldCast(DecimalType(10, 2), TypeCollection(DecimalType, IntegerType), DecimalType(10, 2))
shouldCast(IntegerType, TypeCollection(DecimalType(10, 2), StringType), DecimalType(10, 2))
}

test("ineligible implicit type cast") {
Expand Down