aboutsummaryrefslogtreecommitdiff
path: root/sql/catalyst
diff options
context:
space:
mode:
authorscwf <wangfei1@huawei.com>2015-05-17 15:17:11 +0800
committerCheng Lian <lian@databricks.com>2015-06-29 13:30:47 -0700
commit457d07eaa023b44b75344110508f629925eb6247 (patch)
treec5a11ea054d03c62efabe74ecc55c0644644f604 /sql/catalyst
parent6b9f3831a8d417362bfb42c260613eb7da850f12 (diff)
downloadspark-457d07eaa023b44b75344110508f629925eb6247.tar.gz
spark-457d07eaa023b44b75344110508f629925eb6247.tar.bz2
spark-457d07eaa023b44b75344110508f629925eb6247.zip
[SQL] [MINOR] Skip unresolved expression for InConversion
Author: scwf <wangfei1@huawei.com> Closes #6145 from scwf/InConversion and squashes the following commits: 5c8ac6b [scwf] minir fix for InConversion (cherry picked from commit edf09ea1bd4bf7692e0085ad9c70cb1bfc8d06d8) Signed-off-by: Cheng Lian <lian@databricks.com>
Diffstat (limited to 'sql/catalyst')
-rw-r--r--sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/HiveTypeCoercion.scala3
1 files changed, 3 insertions, 0 deletions
diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/HiveTypeCoercion.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/HiveTypeCoercion.scala
index 6d0f4a0c61..e62a1f927a 100644
--- a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/HiveTypeCoercion.scala
+++ b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/HiveTypeCoercion.scala
@@ -307,6 +307,9 @@ trait HiveTypeCoercion {
*/
object InConversion extends Rule[LogicalPlan] {
def apply(plan: LogicalPlan): LogicalPlan = plan transformAllExpressions {
+ // Skip nodes who's children have not been resolved yet.
+ case e if !e.childrenResolved => e
+
case i @ In(a, b) if b.exists(_.dataType != a.dataType) =>
i.makeCopy(Array(a, b.map(Cast(_, a.dataType))))
}