From 63b84b7d6785a687dd7f4c0e2bb1e348800d30d8 Mon Sep 17 00:00:00 2001
From: Cheng Hao <hao.cheng@intel.com>
Date: Tue, 30 Dec 2014 11:47:08 -0800
Subject: [PATCH] [SPARK-4904] [SQL] Remove the unnecessary code change in
Generic UDF
Since #3429 has been merged, the bug of wrapping to Writable for HiveGenericUDF is resolved, we can safely remove the foldable checking in `HiveGenericUdf.eval`, which discussed in #2802.
Author: Cheng Hao <hao.cheng@intel.com>
Closes #3745 from chenghao-intel/generic_udf and squashes the following commits:
622ad03 [Cheng Hao] Remove the unnecessary code change in Generic UDF
---
.../src/main/scala/org/apache/spark/sql/hive/hiveUdfs.scala | 6 ------
1 file changed, 6 deletions(-)
diff --git a/sql/hive/src/main/scala/org/apache/spark/sql/hive/hiveUdfs.scala b/sql/hive/src/main/scala/org/apache/spark/sql/hive/hiveUdfs.scala
index 93b6ef9fbc..7d863f9d89 100644
--- a/sql/hive/src/main/scala/org/apache/spark/sql/hive/hiveUdfs.scala
+++ b/sql/hive/src/main/scala/org/apache/spark/sql/hive/hiveUdfs.scala
@@ -158,11 +158,6 @@ private[hive] case class HiveGenericUdf(funcWrapper: HiveFunctionWrapper, childr
override def foldable =
isUDFDeterministic && returnInspector.isInstanceOf[ConstantObjectInspector]
- @transient
- protected def constantReturnValue = unwrap(
- returnInspector.asInstanceOf[ConstantObjectInspector].getWritableConstantValue(),
- returnInspector)
-
@transient
protected lazy val deferedObjects =
argumentInspectors.map(new DeferredObjectAdapter(_)).toArray[DeferredObject]
@@ -171,7 +166,6 @@ private[hive] case class HiveGenericUdf(funcWrapper: HiveFunctionWrapper, childr
override def eval(input: Row): Any = {
returnInspector // Make sure initialized.
- if(foldable) return constantReturnValue
var i = 0
while (i < children.length) {
--
GitLab