fixes for @rxin's suggestions

apache · Jul 27, 2015 · e49da48 · e49da48
1 parent 60e120b
commit e49da48
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/FunctionRegistry.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/FunctionRegistry.scala
@@ -210,7 +210,7 @@ object FunctionRegistry {
   }
 
   /** See usage above. */
-  private[sql] def expression[T <: Expression](name: String)
+  def expression[T <: Expression](name: String)
       (implicit tag: ClassTag[T]): (String, FunctionBuilder) = {
 
     // See if we can find a constructor that accepts Seq[Expression]

diff --git a/sql/core/src/main/scala/org/apache/spark/sql/SQLContext.scala b/sql/core/src/main/scala/org/apache/spark/sql/SQLContext.scala
@@ -21,9 +21,6 @@ import java.beans.Introspector
 import java.util.Properties
 import java.util.concurrent.atomic.AtomicReference
 
-import org.apache.spark.sql.catalyst.analysis.FunctionRegistry.{expression, FunctionBuilder}
-import org.apache.spark.sql.execution.expressions.SparkPartitionID
-
 import scala.collection.JavaConversions._
 import scala.collection.immutable
 import scala.language.implicitConversions
@@ -34,6 +31,8 @@ import org.apache.spark.SparkContext
 import org.apache.spark.annotation.{DeveloperApi, Experimental}
 import org.apache.spark.api.java.{JavaRDD, JavaSparkContext}
 import org.apache.spark.rdd.RDD
+import org.apache.spark.sql.catalyst.analysis.FunctionRegistry.{expression => FunctionExpression, FunctionBuilder}
+import org.apache.spark.sql.execution.expressions.SparkPartitionID
 import org.apache.spark.sql.SQLConf.SQLConfEntry
 import org.apache.spark.sql.catalyst.analysis._
 import org.apache.spark.sql.catalyst.errors.DialectException
@@ -141,14 +140,14 @@ class SQLContext(@transient val sparkContext: SparkContext)
   @transient
   protected[sql] lazy val catalog: Catalog = new SimpleCatalog(conf)
 
-  protected[sql] val extendedFunctions: Map[String, FunctionBuilder] = Map(
-    expression[SparkPartitionID]("spark__partition__id")
-  )
-
   // TODO how to handle the temp function per user session?
   @transient
   protected[sql] lazy val functionRegistry: FunctionRegistry = {
     val reg = FunctionRegistry.builtin
+    val extendedFunctions = List[(String, FunctionBuilder)](
+      FunctionExpression[SparkPartitionID]("spark__partition__id")
+    )
+
     extendedFunctions.foreach { case(name, fun) => reg.registerFunction(name, fun) }
     reg
   }