Repository: spark Updated Branches: refs/heads/branch-1.1 568966018 -> 930978641
[SQL] Make functionRegistry in HiveContext transient. Seems we missed `transient` for the `functionRegistry` in `HiveContext`. cc: marmbrus Author: Yin Huai <[email protected]> Closes #2074 from yhuai/makeFunctionRegistryTransient and squashes the following commits: 6534e7d [Yin Huai] Make functionRegistry transient. (cherry picked from commit 2fb1c72ea21e137c8b60a72e5aecd554c71b16e1) Signed-off-by: Michael Armbrust <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/93097864 Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/93097864 Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/93097864 Branch: refs/heads/branch-1.1 Commit: 9309786416c83b2f3401724fdeb19c2be07c0431 Parents: 5689660 Author: Yin Huai <[email protected]> Authored: Sat Aug 23 12:46:41 2014 -0700 Committer: Michael Armbrust <[email protected]> Committed: Sat Aug 23 12:46:51 2014 -0700 ---------------------------------------------------------------------- sql/hive/src/main/scala/org/apache/spark/sql/hive/HiveContext.scala | 1 + 1 file changed, 1 insertion(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/93097864/sql/hive/src/main/scala/org/apache/spark/sql/hive/HiveContext.scala ---------------------------------------------------------------------- diff --git a/sql/hive/src/main/scala/org/apache/spark/sql/hive/HiveContext.scala b/sql/hive/src/main/scala/org/apache/spark/sql/hive/HiveContext.scala index ff32c7c..29baefe 100644 --- a/sql/hive/src/main/scala/org/apache/spark/sql/hive/HiveContext.scala +++ b/sql/hive/src/main/scala/org/apache/spark/sql/hive/HiveContext.scala @@ -255,6 +255,7 @@ class HiveContext(sc: SparkContext) extends SQLContext(sc) { } // Note that HiveUDFs will be overridden by functions registered in this context. + @transient override protected[sql] lazy val functionRegistry = new HiveFunctionRegistry with OverrideFunctionRegistry --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
