Skip to content

[SPARK-17108][SQL]: Fix BIGINT and INT comparison failure in spark sql #15448

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

[SPARK-17108][SQL]: Fix BIGINT and INT comparison failure in spark sql #15448

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ec3d552
[SPARK-17108][SQL]: Fix BIGINT and INT comparison failure in spark sql
weiqingy Oct 12, 2016
8707caf
Added implicit casting to the GetMapValue
weiqingy Oct 15, 2016
b21eec2
Fix conflicts
weiqingy Oct 20, 2016
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
Next Next commit
[SPARK-17108][SQL]: Fix BIGINT and INT comparison failure in spark sql
  • Loading branch information
@weiqingy
weiqingy committed Oct 12, 2016
commit ec3d55296abc9f355a0f0db0f40e04abb4b58d94
14 changes: 13 additions & 1 deletion sql/catalyst/src/main/scala/org/apache/spark/sql/types/DataType.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,17 @@ abstract class DataType extends AbstractDataType {
private[spark] def sameType(other: DataType): Boolean =
DataType.equalsIgnoreNullability(this, other)

/**
* Check if two integers are compatible. Returns true if `right` can be converted to `left`.
*/
private[spark] def isCompatibleIntegralType(left: DataType, right: DataType): Boolean = {
(left, right) match {
case (l, r) => l.isInstanceOf[IntegralType] && r.isInstanceOf[IntegralType] &&
l.defaultSize >= r.defaultSize
case _ => false
}
}

/**
* Returns the same data type but set all nullability fields are true
* (`StructField.nullable`, `ArrayType.containsNull`, and `MapType.valueContainsNull`).
Expand All @@ -91,7 +102,8 @@ abstract class DataType extends AbstractDataType {

override private[sql] def defaultConcreteType: DataType = this

override private[sql] def acceptsType(other: DataType): Boolean = sameType(other)
override private[sql] def acceptsType(other: DataType): Boolean = sameType(other) ||
isCompatibleIntegralType(this, other)
}


Expand Down