Skip to content

[SPARK-7562][SPARK-6444][SQL] Improve error reporting for expression data type mismatch #6405

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
cloud-fan wants to merge 17 commits into from
Closed

[SPARK-7562][SPARK-6444][SQL] Improve error reporting for expression data type mismatch #6405

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
cb77e4f
Improve error reporting for expression data type mismatch
cloud-fan May 27, 2015
7ae76b9
address comments
cloud-fan May 28, 2015
6491721
use value class TypeCheckResult
cloud-fan May 28, 2015
c71d02c
fix hive tests
cloud-fan May 28, 2015
69ca3fe
add error message and tests
cloud-fan May 29, 2015
1524ff6
fix style
cloud-fan May 29, 2015
e0a3628
improve error message
cloud-fan May 29, 2015
654d46a
improve tests
cloud-fan May 29, 2015
3affbd8
more fixes
cloud-fan May 29, 2015
6eaadff
add equal type constraint to EqualTo
cloud-fan May 29, 2015
cffb67c
to have resolved call the data type check function
cloud-fan May 29, 2015
8883025
apply type check interface to CaseWhen
cloud-fan May 29, 2015
3bee157
and decimal type coercion rule for binary comparison
cloud-fan May 30, 2015
0808fd2
make constrcutor of TypeCheckResult private
cloud-fan May 30, 2015
39929d9
add todo
cloud-fan May 30, 2015
b917275
rebase
cloud-fan May 30, 2015
b5ff31b
address comments
cloud-fan Jun 1, 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
Prev Previous commit
Next Next commit
fix hive tests
  • Loading branch information
@cloud-fan
cloud-fan committed Jun 1, 2015
commit c71d02cedd0dd60c24b1f5b8a6ab5eb22ba27477
2 changes: 1 addition & 1 deletion sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/TypeCheckResult.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,4 @@ class TypeCheckResult(val errorMessage: String) extends AnyVal {
object TypeCheckResult {
val success: TypeCheckResult = new TypeCheckResult(null)
def fail(msg: String): TypeCheckResult = new TypeCheckResult(msg)
}
}
35 changes: 16 additions & 19 deletions sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/predicates.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,17 +172,6 @@ case class Or(left: Expression, right: Expression)
abstract class BinaryComparison extends BinaryExpression with Predicate {
self: Product =>

override def checkInputDataTypes: TypeCheckResult = {
if (left.dataType != right.dataType) {
TypeCheckResult.fail(
s"differing types in BinaryComparisons -- ${left.dataType}, ${right.dataType}")
} else {
checkTypesInternal(left.dataType)
}
}

protected def checkTypesInternal(t: DataType): TypeCheckResult = TypeCheckResult.success

override def eval(input: Row): Any = {
val evalE1 = left.eval(input)
if(evalE1 == null) {
Expand Down Expand Up @@ -231,8 +220,10 @@ case class EqualNullSafe(left: Expression, right: Expression) extends BinaryComp
case class LessThan(left: Expression, right: Expression) extends BinaryComparison {
override def symbol: String = "<"

override protected def checkTypesInternal(t: DataType) = {
if (TypeUtils.validForOrderingExpr(t)) {
override def checkInputDataTypes: TypeCheckResult = {
if (left.dataType != right.dataType) {
TypeCheckResult.fail("types do not match -- ${left.dataType} != ${right.dataType}")
} else if (TypeUtils.validForOrderingExpr(left.dataType)) {
TypeCheckResult.success
} else {
TypeCheckResult.fail("todo")
Expand All @@ -247,8 +238,10 @@ case class LessThan(left: Expression, right: Expression) extends BinaryCompariso
case class LessThanOrEqual(left: Expression, right: Expression) extends BinaryComparison {
override def symbol: String = "<="

override protected def checkTypesInternal(t: DataType) = {
if (TypeUtils.validForOrderingExpr(t)) {
override def checkInputDataTypes: TypeCheckResult = {
if (left.dataType != right.dataType) {
TypeCheckResult.fail("types do not match -- ${left.dataType} != ${right.dataType}")
} else if (TypeUtils.validForOrderingExpr(left.dataType)) {
TypeCheckResult.success
} else {
TypeCheckResult.fail("todo")
Expand All @@ -263,8 +256,10 @@ case class LessThanOrEqual(left: Expression, right: Expression) extends BinaryCo
case class GreaterThan(left: Expression, right: Expression) extends BinaryComparison {
override def symbol: String = ">"

override protected def checkTypesInternal(t: DataType) = {
if (TypeUtils.validForOrderingExpr(t)) {
override def checkInputDataTypes: TypeCheckResult = {
if (left.dataType != right.dataType) {
TypeCheckResult.fail("types do not match -- ${left.dataType} != ${right.dataType}")
} else if (TypeUtils.validForOrderingExpr(left.dataType)) {
TypeCheckResult.success
} else {
TypeCheckResult.fail("todo")
Expand All @@ -279,8 +274,10 @@ case class GreaterThan(left: Expression, right: Expression) extends BinaryCompar
case class GreaterThanOrEqual(left: Expression, right: Expression) extends BinaryComparison {
override def symbol: String = ">="

override protected def checkTypesInternal(t: DataType) = {
if (TypeUtils.validForOrderingExpr(t)) {
override def checkInputDataTypes: TypeCheckResult = {
if (left.dataType != right.dataType) {
TypeCheckResult.fail("types do not match -- ${left.dataType} != ${right.dataType}")
} else if (TypeUtils.validForOrderingExpr(left.dataType)) {
TypeCheckResult.success
} else {
TypeCheckResult.fail("todo")
Expand Down