[SPARK-2097][SQL] UDF Support
This patch adds the ability to register lambda functions written in Python,
Java or Scala as UDFs for use in SQL or HiveQL.
Scala:
```scala
registerFunction("strLenScala", (_: String).length)
sql("SELECT strLenScala('test')")
```
Python:
```python
sqlCtx.registerFunction("strLenPython", lambda x: len(x), IntegerType())
sqlCtx.sql("SELECT strLenPython('test')")
```
Java:
```java
sqlContext.registerFunction("stringLengthJava", new UDF1<String, Integer>() {
Override
public Integer call(String str) throws Exception {
return str.length();
}
}, DataType.IntegerType);
sqlContext.sql("SELECT stringLengthJava('test')");
```
Author: Michael Armbrust <mich...@databricks.com>
Closes #1063 from marmbrus/udfs and squashes the following commits:
9eda0fe [Michael Armbrust] newline
747c05e [Michael Armbrust] Add some scala UDF tests.
d92727d [Michael Armbrust] Merge remote-tracking branch 'apache/master' into
udfs
005d684 [Michael Armbrust] Fix naming and formatting.
d14dac8 [Michael Armbrust] Fix last line of autogened java files.
8135c48 [Michael Armbrust] Move UDF unit tests to pyspark.
40b0ffd [Michael Armbrust] Merge remote-tracking branch 'apache/master' into
udfs
6a36890 [Michael Armbrust] Switch logging so that SQLContext can be
serializable.
7a83101 [Michael Armbrust] Drop toString
795fd15 [Michael Armbrust] Try to avoid capturing SQLContext.
e54fb45 [Michael Armbrust] Docs and tests.
437cbe3 [Michael Armbrust] Update use of dataTypes, fix some python tests,
address review comments.
01517d6 [Michael Armbrust] Merge remote-tracking branch 'origin/master' into
udfs
8e6c932 [Michael Armbrust] WIP
3f96a52 [Michael Armbrust] Merge remote-tracking branch 'origin/master' into
udfs
6237c8d [Michael Armbrust] WIP
2766f0b [Michael Armbrust] Move udfs support to SQL from hive. Add support for
Java UDFs.
0f7d50c [Michael Armbrust] Draft of native Spark SQL UDFs for Scala and Python.
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/158ad0bb
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/158ad0bb
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/158ad0bb
Branch: refs/heads/master
Commit: 158ad0bba9382fd494b4789b5628a9cec00cfa19
Parents: 4c47711
Author: Michael Armbrust <mich...@databricks.com>
Authored: Sat Aug 2 16:33:48 2014 -0700
Committer: Michael Armbrust <mich...@databricks.com>
Committed: Sat Aug 2 16:33:48 2014 -0700
----------------------------------------------------------------------
python/pyspark/sql.py | 39 ++-
.../catalyst/analysis/FunctionRegistry.scala | 32 ++
.../sql/catalyst/expressions/ScalaUdf.scala | 307 +++++++++++++++++++
.../org/apache/spark/sql/api/java/UDF1.java | 32 ++
.../org/apache/spark/sql/api/java/UDF10.java | 32 ++
.../org/apache/spark/sql/api/java/UDF11.java | 32 ++
.../org/apache/spark/sql/api/java/UDF12.java | 32 ++
.../org/apache/spark/sql/api/java/UDF13.java | 32 ++
.../org/apache/spark/sql/api/java/UDF14.java | 32 ++
.../org/apache/spark/sql/api/java/UDF15.java | 32 ++
.../org/apache/spark/sql/api/java/UDF16.java | 32 ++
.../org/apache/spark/sql/api/java/UDF17.java | 32 ++
.../org/apache/spark/sql/api/java/UDF18.java | 32 ++
.../org/apache/spark/sql/api/java/UDF19.java | 32 ++
.../org/apache/spark/sql/api/java/UDF2.java | 32 ++
.../org/apache/spark/sql/api/java/UDF20.java | 32 ++
.../org/apache/spark/sql/api/java/UDF21.java | 32 ++
.../org/apache/spark/sql/api/java/UDF22.java | 32 ++
.../org/apache/spark/sql/api/java/UDF3.java | 32 ++
.../org/apache/spark/sql/api/java/UDF4.java | 32 ++
.../org/apache/spark/sql/api/java/UDF5.java | 32 ++
.../org/apache/spark/sql/api/java/UDF6.java | 32 ++
.../org/apache/spark/sql/api/java/UDF7.java | 32 ++
.../org/apache/spark/sql/api/java/UDF8.java | 32 ++
.../org/apache/spark/sql/api/java/UDF9.java | 32 ++
.../scala/org/apache/spark/sql/SQLContext.scala | 11 +-
.../org/apache/spark/sql/UdfRegistration.scala | 196 ++++++++++++
.../spark/sql/api/java/JavaSQLContext.scala | 5 +-
.../spark/sql/api/java/UDFRegistration.scala | 252 +++++++++++++++
.../spark/sql/execution/SparkStrategies.scala | 2 +
.../apache/spark/sql/execution/pythonUdfs.scala | 177 +++++++++++
.../apache/spark/sql/api/java/JavaAPISuite.java | 90 ++++++
.../org/apache/spark/sql/InsertIntoSuite.scala | 2 +-
.../scala/org/apache/spark/sql/UDFSuite.scala | 36 +++
.../org/apache/spark/sql/hive/HiveContext.scala | 13 +-
.../org/apache/spark/sql/hive/TestHive.scala | 4 +-
.../org/apache/spark/sql/hive/hiveUdfs.scala | 6 +-
.../scala/org/apache/spark/sql/QueryTest.scala | 4 +-
38 files changed, 1861 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/158ad0bb/python/pyspark/sql.py
----------------------------------------------------------------------
diff --git a/python/pyspark/sql.py b/python/pyspark/sql.py
index f840475..e7c35ac 100644
--- a/python/pyspark/sql.py
+++ b/python/pyspark/sql.py
@@ -28,9 +28,13 @@ from array import array
from operator import itemgetter
from pyspark.rdd import RDD, PipelinedRDD
-from pyspark.serializers import BatchedSerializer, PickleSerializer
+from pyspark.serializers import BatchedSerializer, PickleSerializer,
CloudPickleSerializer
+
+from itertools import chain, ifilter, imap
from py4j.protocol import Py4JError
+from py4j.java_collections import ListConverter, MapConverter
+
__all__ = [
"StringType", "BinaryType", "BooleanType", "TimestampType", "DecimalType",
@@ -932,6 +936,39 @@ class SQLContext:
self._scala_SQLContext = self._jvm.SQLContext(self._jsc.sc())
return self._scala_SQLContext
+ def registerFunction(self, name, f, returnType=StringType()):
+ """Registers a lambda function as a UDF so it can be used in SQL
statements.
+
+ In addition to a name and the function itself, the return type can be
optionally specified.
+ When the return type is not given it default to a string and
conversion will automatically
+ be done. For any other return type, the produced object must match
the specified type.
+
+ >>> sqlCtx.registerFunction("stringLengthString", lambda x: len(x))
+ >>> sqlCtx.sql("SELECT stringLengthString('test')").collect()
+ [Row(c0=u'4')]
+ >>> sqlCtx.registerFunction("stringLengthInt", lambda x: len(x),
IntegerType())
+ >>> sqlCtx.sql("SELECT stringLengthInt('test')").collect()
+ [Row(c0=4)]
+ >>> sqlCtx.registerFunction("twoArgs", lambda x, y: len(x) + y,
IntegerType())
+ >>> sqlCtx.sql("SELECT twoArgs('test', 1)").collect()
+ [Row(c0=5)]
+ """
+ func = lambda _, it: imap(lambda x: f(*x), it)
+ command = (func,
+ BatchedSerializer(PickleSerializer(), 1024),
+ BatchedSerializer(PickleSerializer(), 1024))
+ env = MapConverter().convert(self._sc.environment,
+ self._sc._gateway._gateway_client)
+ includes = ListConverter().convert(self._sc._python_includes,
+ self._sc._gateway._gateway_client)
+ self._ssql_ctx.registerPython(name,
+
bytearray(CloudPickleSerializer().dumps(command)),
+ env,
+ includes,
+ self._sc.pythonExec,
+ self._sc._javaAccumulator,
+ str(returnType))
+
def inferSchema(self, rdd):
"""Infer and apply a schema to an RDD of L{Row}s.
http://git-wip-us.apache.org/repos/asf/spark/blob/158ad0bb/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/FunctionRegistry.scala
----------------------------------------------------------------------
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
index c025570..760c49f 100644
---
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
@@ -18,17 +18,49 @@
package org.apache.spark.sql.catalyst.analysis
import org.apache.spark.sql.catalyst.expressions.Expression
+import scala.collection.mutable
/** A catalog for looking up user defined functions, used by an [[Analyzer]].
*/
trait FunctionRegistry {
+ type FunctionBuilder = Seq[Expression] => Expression
+
+ def registerFunction(name: String, builder: FunctionBuilder): Unit
+
def lookupFunction(name: String, children: Seq[Expression]): Expression
}
+trait OverrideFunctionRegistry extends FunctionRegistry {
+
+ val functionBuilders = new mutable.HashMap[String, FunctionBuilder]()
+
+ def registerFunction(name: String, builder: FunctionBuilder) = {
+ functionBuilders.put(name, builder)
+ }
+
+ abstract override def lookupFunction(name: String, children:
Seq[Expression]): Expression = {
+
functionBuilders.get(name).map(_(children)).getOrElse(super.lookupFunction(name,children))
+ }
+}
+
+class SimpleFunctionRegistry extends FunctionRegistry {
+ val functionBuilders = new mutable.HashMap[String, FunctionBuilder]()
+
+ def registerFunction(name: String, builder: FunctionBuilder) = {
+ functionBuilders.put(name, builder)
+ }
+
+ override def lookupFunction(name: String, children: Seq[Expression]):
Expression = {
+ functionBuilders(name)(children)
+ }
+}
+
/**
* A trivial catalog that returns an error when a function is requested. Used
for testing when all
* functions are already filled in and the analyser needs only to resolve
attribute references.
*/
object EmptyFunctionRegistry extends FunctionRegistry {
+ def registerFunction(name: String, builder: FunctionBuilder) = ???
+
def lookupFunction(name: String, children: Seq[Expression]): Expression = {
throw new UnsupportedOperationException
}
http://git-wip-us.apache.org/repos/asf/spark/blob/158ad0bb/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/ScalaUdf.scala
----------------------------------------------------------------------
diff --git
a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/ScalaUdf.scala
b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/ScalaUdf.scala
index acddf5e..95633dd 100644
---
a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/ScalaUdf.scala
+++
b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/ScalaUdf.scala
@@ -27,6 +27,22 @@ case class ScalaUdf(function: AnyRef, dataType: DataType,
children: Seq[Expressi
def references = children.flatMap(_.references).toSet
def nullable = true
+ /** This method has been generated by this script
+
+ (1 to 22).map { x =>
+ val anys = (1 to x).map(x => "Any").reduce(_ + ", " + _)
+ val evals = (0 to x - 1).map(x => s"children($x).eval(input)").reduce(_
+ ",\n " + _)
+
+ s"""
+ case $x =>
+ function.asInstanceOf[($anys) => Any](
+ $evals)
+ """
+ }
+
+ */
+
+ // scalastyle:off
override def eval(input: Row): Any = {
children.size match {
case 0 => function.asInstanceOf[() => Any]()
@@ -35,6 +51,297 @@ case class ScalaUdf(function: AnyRef, dataType: DataType,
children: Seq[Expressi
function.asInstanceOf[(Any, Any) => Any](
children(0).eval(input),
children(1).eval(input))
+ case 3 =>
+ function.asInstanceOf[(Any, Any, Any) => Any](
+ children(0).eval(input),
+ children(1).eval(input),
+ children(2).eval(input))
+ case 4 =>
+ function.asInstanceOf[(Any, Any, Any, Any) => Any](
+ children(0).eval(input),
+ children(1).eval(input),
+ children(2).eval(input),
+ children(3).eval(input))
+ case 5 =>
+ function.asInstanceOf[(Any, Any, Any, Any, Any) => Any](
+ children(0).eval(input),
+ children(1).eval(input),
+ children(2).eval(input),
+ children(3).eval(input),
+ children(4).eval(input))
+ case 6 =>
+ function.asInstanceOf[(Any, Any, Any, Any, Any, Any) => Any](
+ children(0).eval(input),
+ children(1).eval(input),
+ children(2).eval(input),
+ children(3).eval(input),
+ children(4).eval(input),
+ children(5).eval(input))
+ case 7 =>
+ function.asInstanceOf[(Any, Any, Any, Any, Any, Any, Any) => Any](
+ children(0).eval(input),
+ children(1).eval(input),
+ children(2).eval(input),
+ children(3).eval(input),
+ children(4).eval(input),
+ children(5).eval(input),
+ children(6).eval(input))
+ case 8 =>
+ function.asInstanceOf[(Any, Any, Any, Any, Any, Any, Any, Any) => Any](
+ children(0).eval(input),
+ children(1).eval(input),
+ children(2).eval(input),
+ children(3).eval(input),
+ children(4).eval(input),
+ children(5).eval(input),
+ children(6).eval(input),
+ children(7).eval(input))
+ case 9 =>
+ function.asInstanceOf[(Any, Any, Any, Any, Any, Any, Any, Any, Any) =>
Any](
+ children(0).eval(input),
+ children(1).eval(input),
+ children(2).eval(input),
+ children(3).eval(input),
+ children(4).eval(input),
+ children(5).eval(input),
+ children(6).eval(input),
+ children(7).eval(input),
+ children(8).eval(input))
+ case 10 =>
+ function.asInstanceOf[(Any, Any, Any, Any, Any, Any, Any, Any, Any,
Any) => Any](
+ children(0).eval(input),
+ children(1).eval(input),
+ children(2).eval(input),
+ children(3).eval(input),
+ children(4).eval(input),
+ children(5).eval(input),
+ children(6).eval(input),
+ children(7).eval(input),
+ children(8).eval(input),
+ children(9).eval(input))
+ case 11 =>
+ function.asInstanceOf[(Any, Any, Any, Any, Any, Any, Any, Any, Any,
Any, Any) => Any](
+ children(0).eval(input),
+ children(1).eval(input),
+ children(2).eval(input),
+ children(3).eval(input),
+ children(4).eval(input),
+ children(5).eval(input),
+ children(6).eval(input),
+ children(7).eval(input),
+ children(8).eval(input),
+ children(9).eval(input),
+ children(10).eval(input))
+ case 12 =>
+ function.asInstanceOf[(Any, Any, Any, Any, Any, Any, Any, Any, Any,
Any, Any, Any) => Any](
+ children(0).eval(input),
+ children(1).eval(input),
+ children(2).eval(input),
+ children(3).eval(input),
+ children(4).eval(input),
+ children(5).eval(input),
+ children(6).eval(input),
+ children(7).eval(input),
+ children(8).eval(input),
+ children(9).eval(input),
+ children(10).eval(input),
+ children(11).eval(input))
+ case 13 =>
+ function.asInstanceOf[(Any, Any, Any, Any, Any, Any, Any, Any, Any,
Any, Any, Any, Any) => Any](
+ children(0).eval(input),
+ children(1).eval(input),
+ children(2).eval(input),
+ children(3).eval(input),
+ children(4).eval(input),
+ children(5).eval(input),
+ children(6).eval(input),
+ children(7).eval(input),
+ children(8).eval(input),
+ children(9).eval(input),
+ children(10).eval(input),
+ children(11).eval(input),
+ children(12).eval(input))
+ case 14 =>
+ function.asInstanceOf[(Any, Any, Any, Any, Any, Any, Any, Any, Any,
Any, Any, Any, Any, Any) => Any](
+ children(0).eval(input),
+ children(1).eval(input),
+ children(2).eval(input),
+ children(3).eval(input),
+ children(4).eval(input),
+ children(5).eval(input),
+ children(6).eval(input),
+ children(7).eval(input),
+ children(8).eval(input),
+ children(9).eval(input),
+ children(10).eval(input),
+ children(11).eval(input),
+ children(12).eval(input),
+ children(13).eval(input))
+ case 15 =>
+ function.asInstanceOf[(Any, Any, Any, Any, Any, Any, Any, Any, Any,
Any, Any, Any, Any, Any, Any) => Any](
+ children(0).eval(input),
+ children(1).eval(input),
+ children(2).eval(input),
+ children(3).eval(input),
+ children(4).eval(input),
+ children(5).eval(input),
+ children(6).eval(input),
+ children(7).eval(input),
+ children(8).eval(input),
+ children(9).eval(input),
+ children(10).eval(input),
+ children(11).eval(input),
+ children(12).eval(input),
+ children(13).eval(input),
+ children(14).eval(input))
+ case 16 =>
+ function.asInstanceOf[(Any, Any, Any, Any, Any, Any, Any, Any, Any,
Any, Any, Any, Any, Any, Any, Any) => Any](
+ children(0).eval(input),
+ children(1).eval(input),
+ children(2).eval(input),
+ children(3).eval(input),
+ children(4).eval(input),
+ children(5).eval(input),
+ children(6).eval(input),
+ children(7).eval(input),
+ children(8).eval(input),
+ children(9).eval(input),
+ children(10).eval(input),
+ children(11).eval(input),
+ children(12).eval(input),
+ children(13).eval(input),
+ children(14).eval(input),
+ children(15).eval(input))
+ case 17 =>
+ function.asInstanceOf[(Any, Any, Any, Any, Any, Any, Any, Any, Any,
Any, Any, Any, Any, Any, Any, Any, Any) => Any](
+ children(0).eval(input),
+ children(1).eval(input),
+ children(2).eval(input),
+ children(3).eval(input),
+ children(4).eval(input),
+ children(5).eval(input),
+ children(6).eval(input),
+ children(7).eval(input),
+ children(8).eval(input),
+ children(9).eval(input),
+ children(10).eval(input),
+ children(11).eval(input),
+ children(12).eval(input),
+ children(13).eval(input),
+ children(14).eval(input),
+ children(15).eval(input),
+ children(16).eval(input))
+ case 18 =>
+ function.asInstanceOf[(Any, Any, Any, Any, Any, Any, Any, Any, Any,
Any, Any, Any, Any, Any, Any, Any, Any, Any) => Any](
+ children(0).eval(input),
+ children(1).eval(input),
+ children(2).eval(input),
+ children(3).eval(input),
+ children(4).eval(input),
+ children(5).eval(input),
+ children(6).eval(input),
+ children(7).eval(input),
+ children(8).eval(input),
+ children(9).eval(input),
+ children(10).eval(input),
+ children(11).eval(input),
+ children(12).eval(input),
+ children(13).eval(input),
+ children(14).eval(input),
+ children(15).eval(input),
+ children(16).eval(input),
+ children(17).eval(input))
+ case 19 =>
+ function.asInstanceOf[(Any, Any, Any, Any, Any, Any, Any, Any, Any,
Any, Any, Any, Any, Any, Any, Any, Any, Any, Any) => Any](
+ children(0).eval(input),
+ children(1).eval(input),
+ children(2).eval(input),
+ children(3).eval(input),
+ children(4).eval(input),
+ children(5).eval(input),
+ children(6).eval(input),
+ children(7).eval(input),
+ children(8).eval(input),
+ children(9).eval(input),
+ children(10).eval(input),
+ children(11).eval(input),
+ children(12).eval(input),
+ children(13).eval(input),
+ children(14).eval(input),
+ children(15).eval(input),
+ children(16).eval(input),
+ children(17).eval(input),
+ children(18).eval(input))
+ case 20 =>
+ function.asInstanceOf[(Any, Any, Any, Any, Any, Any, Any, Any, Any,
Any, Any, Any, Any, Any, Any, Any, Any, Any, Any, Any) => Any](
+ children(0).eval(input),
+ children(1).eval(input),
+ children(2).eval(input),
+ children(3).eval(input),
+ children(4).eval(input),
+ children(5).eval(input),
+ children(6).eval(input),
+ children(7).eval(input),
+ children(8).eval(input),
+ children(9).eval(input),
+ children(10).eval(input),
+ children(11).eval(input),
+ children(12).eval(input),
+ children(13).eval(input),
+ children(14).eval(input),
+ children(15).eval(input),
+ children(16).eval(input),
+ children(17).eval(input),
+ children(18).eval(input),
+ children(19).eval(input))
+ case 21 =>
+ function.asInstanceOf[(Any, Any, Any, Any, Any, Any, Any, Any, Any,
Any, Any, Any, Any, Any, Any, Any, Any, Any, Any, Any, Any) => Any](
+ children(0).eval(input),
+ children(1).eval(input),
+ children(2).eval(input),
+ children(3).eval(input),
+ children(4).eval(input),
+ children(5).eval(input),
+ children(6).eval(input),
+ children(7).eval(input),
+ children(8).eval(input),
+ children(9).eval(input),
+ children(10).eval(input),
+ children(11).eval(input),
+ children(12).eval(input),
+ children(13).eval(input),
+ children(14).eval(input),
+ children(15).eval(input),
+ children(16).eval(input),
+ children(17).eval(input),
+ children(18).eval(input),
+ children(19).eval(input),
+ children(20).eval(input))
+ case 22 =>
+ function.asInstanceOf[(Any, Any, Any, Any, Any, Any, Any, Any, Any,
Any, Any, Any, Any, Any, Any, Any, Any, Any, Any, Any, Any, Any) => Any](
+ children(0).eval(input),
+ children(1).eval(input),
+ children(2).eval(input),
+ children(3).eval(input),
+ children(4).eval(input),
+ children(5).eval(input),
+ children(6).eval(input),
+ children(7).eval(input),
+ children(8).eval(input),
+ children(9).eval(input),
+ children(10).eval(input),
+ children(11).eval(input),
+ children(12).eval(input),
+ children(13).eval(input),
+ children(14).eval(input),
+ children(15).eval(input),
+ children(16).eval(input),
+ children(17).eval(input),
+ children(18).eval(input),
+ children(19).eval(input),
+ children(20).eval(input),
+ children(21).eval(input))
}
+ // scalastyle:on
}
}
http://git-wip-us.apache.org/repos/asf/spark/blob/158ad0bb/sql/core/src/main/java/org/apache/spark/sql/api/java/UDF1.java
----------------------------------------------------------------------
diff --git a/sql/core/src/main/java/org/apache/spark/sql/api/java/UDF1.java
b/sql/core/src/main/java/org/apache/spark/sql/api/java/UDF1.java
new file mode 100644
index 0000000..ef959e3
--- /dev/null
+++ b/sql/core/src/main/java/org/apache/spark/sql/api/java/UDF1.java
@@ -0,0 +1,32 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.spark.sql.api.java;
+
+import java.io.Serializable;
+
+// **************************************************
+// THIS FILE IS AUTOGENERATED BY CODE IN
+// org.apache.spark.sql.api.java.FunctionRegistration
+// **************************************************
+
+/**
+ * A Spark SQL UDF that has 1 arguments.
+ */
+public interface UDF1<T1, R> extends Serializable {
+ public R call(T1 t1) throws Exception;
+}
http://git-wip-us.apache.org/repos/asf/spark/blob/158ad0bb/sql/core/src/main/java/org/apache/spark/sql/api/java/UDF10.java
----------------------------------------------------------------------
diff --git a/sql/core/src/main/java/org/apache/spark/sql/api/java/UDF10.java
b/sql/core/src/main/java/org/apache/spark/sql/api/java/UDF10.java
new file mode 100644
index 0000000..96ab3a9
--- /dev/null
+++ b/sql/core/src/main/java/org/apache/spark/sql/api/java/UDF10.java
@@ -0,0 +1,32 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.spark.sql.api.java;
+
+import java.io.Serializable;
+
+// **************************************************
+// THIS FILE IS AUTOGENERATED BY CODE IN
+// org.apache.spark.sql.api.java.FunctionRegistration
+// **************************************************
+
+/**
+ * A Spark SQL UDF that has 10 arguments.
+ */
+public interface UDF10<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, R> extends
Serializable {
+ public R call(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7, T8 t8, T9 t9,
T10 t10) throws Exception;
+}
http://git-wip-us.apache.org/repos/asf/spark/blob/158ad0bb/sql/core/src/main/java/org/apache/spark/sql/api/java/UDF11.java
----------------------------------------------------------------------
diff --git a/sql/core/src/main/java/org/apache/spark/sql/api/java/UDF11.java
b/sql/core/src/main/java/org/apache/spark/sql/api/java/UDF11.java
new file mode 100644
index 0000000..58ae8ed
--- /dev/null
+++ b/sql/core/src/main/java/org/apache/spark/sql/api/java/UDF11.java
@@ -0,0 +1,32 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.spark.sql.api.java;
+
+import java.io.Serializable;
+
+// **************************************************
+// THIS FILE IS AUTOGENERATED BY CODE IN
+// org.apache.spark.sql.api.java.FunctionRegistration
+// **************************************************
+
+/**
+ * A Spark SQL UDF that has 11 arguments.
+ */
+public interface UDF11<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, R>
extends Serializable {
+ public R call(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7, T8 t8, T9 t9,
T10 t10, T11 t11) throws Exception;
+}
http://git-wip-us.apache.org/repos/asf/spark/blob/158ad0bb/sql/core/src/main/java/org/apache/spark/sql/api/java/UDF12.java
----------------------------------------------------------------------
diff --git a/sql/core/src/main/java/org/apache/spark/sql/api/java/UDF12.java
b/sql/core/src/main/java/org/apache/spark/sql/api/java/UDF12.java
new file mode 100644
index 0000000..d9da0f6
--- /dev/null
+++ b/sql/core/src/main/java/org/apache/spark/sql/api/java/UDF12.java
@@ -0,0 +1,32 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.spark.sql.api.java;
+
+import java.io.Serializable;
+
+// **************************************************
+// THIS FILE IS AUTOGENERATED BY CODE IN
+// org.apache.spark.sql.api.java.FunctionRegistration
+// **************************************************
+
+/**
+ * A Spark SQL UDF that has 12 arguments.
+ */
+public interface UDF12<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, R>
extends Serializable {
+ public R call(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7, T8 t8, T9 t9,
T10 t10, T11 t11, T12 t12) throws Exception;
+}
http://git-wip-us.apache.org/repos/asf/spark/blob/158ad0bb/sql/core/src/main/java/org/apache/spark/sql/api/java/UDF13.java
----------------------------------------------------------------------
diff --git a/sql/core/src/main/java/org/apache/spark/sql/api/java/UDF13.java
b/sql/core/src/main/java/org/apache/spark/sql/api/java/UDF13.java
new file mode 100644
index 0000000..095fc1a
--- /dev/null
+++ b/sql/core/src/main/java/org/apache/spark/sql/api/java/UDF13.java
@@ -0,0 +1,32 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.spark.sql.api.java;
+
+import java.io.Serializable;
+
+// **************************************************
+// THIS FILE IS AUTOGENERATED BY CODE IN
+// org.apache.spark.sql.api.java.FunctionRegistration
+// **************************************************
+
+/**
+ * A Spark SQL UDF that has 13 arguments.
+ */
+public interface UDF13<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
R> extends Serializable {
+ public R call(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7, T8 t8, T9 t9,
T10 t10, T11 t11, T12 t12, T13 t13) throws Exception;
+}
http://git-wip-us.apache.org/repos/asf/spark/blob/158ad0bb/sql/core/src/main/java/org/apache/spark/sql/api/java/UDF14.java
----------------------------------------------------------------------
diff --git a/sql/core/src/main/java/org/apache/spark/sql/api/java/UDF14.java
b/sql/core/src/main/java/org/apache/spark/sql/api/java/UDF14.java
new file mode 100644
index 0000000..eb27eaa
--- /dev/null
+++ b/sql/core/src/main/java/org/apache/spark/sql/api/java/UDF14.java
@@ -0,0 +1,32 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.spark.sql.api.java;
+
+import java.io.Serializable;
+
+// **************************************************
+// THIS FILE IS AUTOGENERATED BY CODE IN
+// org.apache.spark.sql.api.java.FunctionRegistration
+// **************************************************
+
+/**
+ * A Spark SQL UDF that has 14 arguments.
+ */
+public interface UDF14<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
T14, R> extends Serializable {
+ public R call(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7, T8 t8, T9 t9,
T10 t10, T11 t11, T12 t12, T13 t13, T14 t14) throws Exception;
+}
http://git-wip-us.apache.org/repos/asf/spark/blob/158ad0bb/sql/core/src/main/java/org/apache/spark/sql/api/java/UDF15.java
----------------------------------------------------------------------
diff --git a/sql/core/src/main/java/org/apache/spark/sql/api/java/UDF15.java
b/sql/core/src/main/java/org/apache/spark/sql/api/java/UDF15.java
new file mode 100644
index 0000000..1fbcff5
--- /dev/null
+++ b/sql/core/src/main/java/org/apache/spark/sql/api/java/UDF15.java
@@ -0,0 +1,32 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.spark.sql.api.java;
+
+import java.io.Serializable;
+
+// **************************************************
+// THIS FILE IS AUTOGENERATED BY CODE IN
+// org.apache.spark.sql.api.java.FunctionRegistration
+// **************************************************
+
+/**
+ * A Spark SQL UDF that has 15 arguments.
+ */
+public interface UDF15<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
T14, T15, R> extends Serializable {
+ public R call(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7, T8 t8, T9 t9,
T10 t10, T11 t11, T12 t12, T13 t13, T14 t14, T15 t15) throws Exception;
+}
http://git-wip-us.apache.org/repos/asf/spark/blob/158ad0bb/sql/core/src/main/java/org/apache/spark/sql/api/java/UDF16.java
----------------------------------------------------------------------
diff --git a/sql/core/src/main/java/org/apache/spark/sql/api/java/UDF16.java
b/sql/core/src/main/java/org/apache/spark/sql/api/java/UDF16.java
new file mode 100644
index 0000000..1133561
--- /dev/null
+++ b/sql/core/src/main/java/org/apache/spark/sql/api/java/UDF16.java
@@ -0,0 +1,32 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.spark.sql.api.java;
+
+import java.io.Serializable;
+
+// **************************************************
+// THIS FILE IS AUTOGENERATED BY CODE IN
+// org.apache.spark.sql.api.java.FunctionRegistration
+// **************************************************
+
+/**
+ * A Spark SQL UDF that has 16 arguments.
+ */
+public interface UDF16<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
T14, T15, T16, R> extends Serializable {
+ public R call(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7, T8 t8, T9 t9,
T10 t10, T11 t11, T12 t12, T13 t13, T14 t14, T15 t15, T16 t16) throws Exception;
+}
http://git-wip-us.apache.org/repos/asf/spark/blob/158ad0bb/sql/core/src/main/java/org/apache/spark/sql/api/java/UDF17.java
----------------------------------------------------------------------
diff --git a/sql/core/src/main/java/org/apache/spark/sql/api/java/UDF17.java
b/sql/core/src/main/java/org/apache/spark/sql/api/java/UDF17.java
new file mode 100644
index 0000000..dfae792
--- /dev/null
+++ b/sql/core/src/main/java/org/apache/spark/sql/api/java/UDF17.java
@@ -0,0 +1,32 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.spark.sql.api.java;
+
+import java.io.Serializable;
+
+// **************************************************
+// THIS FILE IS AUTOGENERATED BY CODE IN
+// org.apache.spark.sql.api.java.FunctionRegistration
+// **************************************************
+
+/**
+ * A Spark SQL UDF that has 17 arguments.
+ */
+public interface UDF17<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
T14, T15, T16, T17, R> extends Serializable {
+ public R call(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7, T8 t8, T9 t9,
T10 t10, T11 t11, T12 t12, T13 t13, T14 t14, T15 t15, T16 t16, T17 t17) throws
Exception;
+}
http://git-wip-us.apache.org/repos/asf/spark/blob/158ad0bb/sql/core/src/main/java/org/apache/spark/sql/api/java/UDF18.java
----------------------------------------------------------------------
diff --git a/sql/core/src/main/java/org/apache/spark/sql/api/java/UDF18.java
b/sql/core/src/main/java/org/apache/spark/sql/api/java/UDF18.java
new file mode 100644
index 0000000..e9d1c6d
--- /dev/null
+++ b/sql/core/src/main/java/org/apache/spark/sql/api/java/UDF18.java
@@ -0,0 +1,32 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.spark.sql.api.java;
+
+import java.io.Serializable;
+
+// **************************************************
+// THIS FILE IS AUTOGENERATED BY CODE IN
+// org.apache.spark.sql.api.java.FunctionRegistration
+// **************************************************
+
+/**
+ * A Spark SQL UDF that has 18 arguments.
+ */
+public interface UDF18<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
T14, T15, T16, T17, T18, R> extends Serializable {
+ public R call(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7, T8 t8, T9 t9,
T10 t10, T11 t11, T12 t12, T13 t13, T14 t14, T15 t15, T16 t16, T17 t17, T18
t18) throws Exception;
+}
http://git-wip-us.apache.org/repos/asf/spark/blob/158ad0bb/sql/core/src/main/java/org/apache/spark/sql/api/java/UDF19.java
----------------------------------------------------------------------
diff --git a/sql/core/src/main/java/org/apache/spark/sql/api/java/UDF19.java
b/sql/core/src/main/java/org/apache/spark/sql/api/java/UDF19.java
new file mode 100644
index 0000000..46b9d2d
--- /dev/null
+++ b/sql/core/src/main/java/org/apache/spark/sql/api/java/UDF19.java
@@ -0,0 +1,32 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.spark.sql.api.java;
+
+import java.io.Serializable;
+
+// **************************************************
+// THIS FILE IS AUTOGENERATED BY CODE IN
+// org.apache.spark.sql.api.java.FunctionRegistration
+// **************************************************
+
+/**
+ * A Spark SQL UDF that has 19 arguments.
+ */
+public interface UDF19<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
T14, T15, T16, T17, T18, T19, R> extends Serializable {
+ public R call(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7, T8 t8, T9 t9,
T10 t10, T11 t11, T12 t12, T13 t13, T14 t14, T15 t15, T16 t16, T17 t17, T18
t18, T19 t19) throws Exception;
+}
http://git-wip-us.apache.org/repos/asf/spark/blob/158ad0bb/sql/core/src/main/java/org/apache/spark/sql/api/java/UDF2.java
----------------------------------------------------------------------
diff --git a/sql/core/src/main/java/org/apache/spark/sql/api/java/UDF2.java
b/sql/core/src/main/java/org/apache/spark/sql/api/java/UDF2.java
new file mode 100644
index 0000000..cd3fde8
--- /dev/null
+++ b/sql/core/src/main/java/org/apache/spark/sql/api/java/UDF2.java
@@ -0,0 +1,32 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.spark.sql.api.java;
+
+import java.io.Serializable;
+
+// **************************************************
+// THIS FILE IS AUTOGENERATED BY CODE IN
+// org.apache.spark.sql.api.java.FunctionRegistration
+// **************************************************
+
+/**
+ * A Spark SQL UDF that has 2 arguments.
+ */
+public interface UDF2<T1, T2, R> extends Serializable {
+ public R call(T1 t1, T2 t2) throws Exception;
+}
http://git-wip-us.apache.org/repos/asf/spark/blob/158ad0bb/sql/core/src/main/java/org/apache/spark/sql/api/java/UDF20.java
----------------------------------------------------------------------
diff --git a/sql/core/src/main/java/org/apache/spark/sql/api/java/UDF20.java
b/sql/core/src/main/java/org/apache/spark/sql/api/java/UDF20.java
new file mode 100644
index 0000000..113d3d2
--- /dev/null
+++ b/sql/core/src/main/java/org/apache/spark/sql/api/java/UDF20.java
@@ -0,0 +1,32 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.spark.sql.api.java;
+
+import java.io.Serializable;
+
+// **************************************************
+// THIS FILE IS AUTOGENERATED BY CODE IN
+// org.apache.spark.sql.api.java.FunctionRegistration
+// **************************************************
+
+/**
+ * A Spark SQL UDF that has 20 arguments.
+ */
+public interface UDF20<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
T14, T15, T16, T17, T18, T19, T20, R> extends Serializable {
+ public R call(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7, T8 t8, T9 t9,
T10 t10, T11 t11, T12 t12, T13 t13, T14 t14, T15 t15, T16 t16, T17 t17, T18
t18, T19 t19, T20 t20) throws Exception;
+}
http://git-wip-us.apache.org/repos/asf/spark/blob/158ad0bb/sql/core/src/main/java/org/apache/spark/sql/api/java/UDF21.java
----------------------------------------------------------------------
diff --git a/sql/core/src/main/java/org/apache/spark/sql/api/java/UDF21.java
b/sql/core/src/main/java/org/apache/spark/sql/api/java/UDF21.java
new file mode 100644
index 0000000..74118f2
--- /dev/null
+++ b/sql/core/src/main/java/org/apache/spark/sql/api/java/UDF21.java
@@ -0,0 +1,32 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.spark.sql.api.java;
+
+import java.io.Serializable;
+
+// **************************************************
+// THIS FILE IS AUTOGENERATED BY CODE IN
+// org.apache.spark.sql.api.java.FunctionRegistration
+// **************************************************
+
+/**
+ * A Spark SQL UDF that has 21 arguments.
+ */
+public interface UDF21<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
T14, T15, T16, T17, T18, T19, T20, T21, R> extends Serializable {
+ public R call(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7, T8 t8, T9 t9,
T10 t10, T11 t11, T12 t12, T13 t13, T14 t14, T15 t15, T16 t16, T17 t17, T18
t18, T19 t19, T20 t20, T21 t21) throws Exception;
+}
http://git-wip-us.apache.org/repos/asf/spark/blob/158ad0bb/sql/core/src/main/java/org/apache/spark/sql/api/java/UDF22.java
----------------------------------------------------------------------
diff --git a/sql/core/src/main/java/org/apache/spark/sql/api/java/UDF22.java
b/sql/core/src/main/java/org/apache/spark/sql/api/java/UDF22.java
new file mode 100644
index 0000000..0e7cc40
--- /dev/null
+++ b/sql/core/src/main/java/org/apache/spark/sql/api/java/UDF22.java
@@ -0,0 +1,32 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.spark.sql.api.java;
+
+import java.io.Serializable;
+
+// **************************************************
+// THIS FILE IS AUTOGENERATED BY CODE IN
+// org.apache.spark.sql.api.java.FunctionRegistration
+// **************************************************
+
+/**
+ * A Spark SQL UDF that has 22 arguments.
+ */
+public interface UDF22<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
T14, T15, T16, T17, T18, T19, T20, T21, T22, R> extends Serializable {
+ public R call(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7, T8 t8, T9 t9,
T10 t10, T11 t11, T12 t12, T13 t13, T14 t14, T15 t15, T16 t16, T17 t17, T18
t18, T19 t19, T20 t20, T21 t21, T22 t22) throws Exception;
+}
http://git-wip-us.apache.org/repos/asf/spark/blob/158ad0bb/sql/core/src/main/java/org/apache/spark/sql/api/java/UDF3.java
----------------------------------------------------------------------
diff --git a/sql/core/src/main/java/org/apache/spark/sql/api/java/UDF3.java
b/sql/core/src/main/java/org/apache/spark/sql/api/java/UDF3.java
new file mode 100644
index 0000000..6a880f1
--- /dev/null
+++ b/sql/core/src/main/java/org/apache/spark/sql/api/java/UDF3.java
@@ -0,0 +1,32 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.spark.sql.api.java;
+
+import java.io.Serializable;
+
+// **************************************************
+// THIS FILE IS AUTOGENERATED BY CODE IN
+// org.apache.spark.sql.api.java.FunctionRegistration
+// **************************************************
+
+/**
+ * A Spark SQL UDF that has 3 arguments.
+ */
+public interface UDF3<T1, T2, T3, R> extends Serializable {
+ public R call(T1 t1, T2 t2, T3 t3) throws Exception;
+}
http://git-wip-us.apache.org/repos/asf/spark/blob/158ad0bb/sql/core/src/main/java/org/apache/spark/sql/api/java/UDF4.java
----------------------------------------------------------------------
diff --git a/sql/core/src/main/java/org/apache/spark/sql/api/java/UDF4.java
b/sql/core/src/main/java/org/apache/spark/sql/api/java/UDF4.java
new file mode 100644
index 0000000..fcad2fe
--- /dev/null
+++ b/sql/core/src/main/java/org/apache/spark/sql/api/java/UDF4.java
@@ -0,0 +1,32 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.spark.sql.api.java;
+
+import java.io.Serializable;
+
+// **************************************************
+// THIS FILE IS AUTOGENERATED BY CODE IN
+// org.apache.spark.sql.api.java.FunctionRegistration
+// **************************************************
+
+/**
+ * A Spark SQL UDF that has 4 arguments.
+ */
+public interface UDF4<T1, T2, T3, T4, R> extends Serializable {
+ public R call(T1 t1, T2 t2, T3 t3, T4 t4) throws Exception;
+}
http://git-wip-us.apache.org/repos/asf/spark/blob/158ad0bb/sql/core/src/main/java/org/apache/spark/sql/api/java/UDF5.java
----------------------------------------------------------------------
diff --git a/sql/core/src/main/java/org/apache/spark/sql/api/java/UDF5.java
b/sql/core/src/main/java/org/apache/spark/sql/api/java/UDF5.java
new file mode 100644
index 0000000..ce0cef4
--- /dev/null
+++ b/sql/core/src/main/java/org/apache/spark/sql/api/java/UDF5.java
@@ -0,0 +1,32 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.spark.sql.api.java;
+
+import java.io.Serializable;
+
+// **************************************************
+// THIS FILE IS AUTOGENERATED BY CODE IN
+// org.apache.spark.sql.api.java.FunctionRegistration
+// **************************************************
+
+/**
+ * A Spark SQL UDF that has 5 arguments.
+ */
+public interface UDF5<T1, T2, T3, T4, T5, R> extends Serializable {
+ public R call(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5) throws Exception;
+}
http://git-wip-us.apache.org/repos/asf/spark/blob/158ad0bb/sql/core/src/main/java/org/apache/spark/sql/api/java/UDF6.java
----------------------------------------------------------------------
diff --git a/sql/core/src/main/java/org/apache/spark/sql/api/java/UDF6.java
b/sql/core/src/main/java/org/apache/spark/sql/api/java/UDF6.java
new file mode 100644
index 0000000..f56b806
--- /dev/null
+++ b/sql/core/src/main/java/org/apache/spark/sql/api/java/UDF6.java
@@ -0,0 +1,32 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.spark.sql.api.java;
+
+import java.io.Serializable;
+
+// **************************************************
+// THIS FILE IS AUTOGENERATED BY CODE IN
+// org.apache.spark.sql.api.java.FunctionRegistration
+// **************************************************
+
+/**
+ * A Spark SQL UDF that has 6 arguments.
+ */
+public interface UDF6<T1, T2, T3, T4, T5, T6, R> extends Serializable {
+ public R call(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6) throws Exception;
+}
http://git-wip-us.apache.org/repos/asf/spark/blob/158ad0bb/sql/core/src/main/java/org/apache/spark/sql/api/java/UDF7.java
----------------------------------------------------------------------
diff --git a/sql/core/src/main/java/org/apache/spark/sql/api/java/UDF7.java
b/sql/core/src/main/java/org/apache/spark/sql/api/java/UDF7.java
new file mode 100644
index 0000000..25bd6d3
--- /dev/null
+++ b/sql/core/src/main/java/org/apache/spark/sql/api/java/UDF7.java
@@ -0,0 +1,32 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.spark.sql.api.java;
+
+import java.io.Serializable;
+
+// **************************************************
+// THIS FILE IS AUTOGENERATED BY CODE IN
+// org.apache.spark.sql.api.java.FunctionRegistration
+// **************************************************
+
+/**
+ * A Spark SQL UDF that has 7 arguments.
+ */
+public interface UDF7<T1, T2, T3, T4, T5, T6, T7, R> extends Serializable {
+ public R call(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7) throws
Exception;
+}
http://git-wip-us.apache.org/repos/asf/spark/blob/158ad0bb/sql/core/src/main/java/org/apache/spark/sql/api/java/UDF8.java
----------------------------------------------------------------------
diff --git a/sql/core/src/main/java/org/apache/spark/sql/api/java/UDF8.java
b/sql/core/src/main/java/org/apache/spark/sql/api/java/UDF8.java
new file mode 100644
index 0000000..a3b7ac5
--- /dev/null
+++ b/sql/core/src/main/java/org/apache/spark/sql/api/java/UDF8.java
@@ -0,0 +1,32 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.spark.sql.api.java;
+
+import java.io.Serializable;
+
+// **************************************************
+// THIS FILE IS AUTOGENERATED BY CODE IN
+// org.apache.spark.sql.api.java.FunctionRegistration
+// **************************************************
+
+/**
+ * A Spark SQL UDF that has 8 arguments.
+ */
+public interface UDF8<T1, T2, T3, T4, T5, T6, T7, T8, R> extends Serializable {
+ public R call(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7, T8 t8) throws
Exception;
+}
http://git-wip-us.apache.org/repos/asf/spark/blob/158ad0bb/sql/core/src/main/java/org/apache/spark/sql/api/java/UDF9.java
----------------------------------------------------------------------
diff --git a/sql/core/src/main/java/org/apache/spark/sql/api/java/UDF9.java
b/sql/core/src/main/java/org/apache/spark/sql/api/java/UDF9.java
new file mode 100644
index 0000000..205e72a
--- /dev/null
+++ b/sql/core/src/main/java/org/apache/spark/sql/api/java/UDF9.java
@@ -0,0 +1,32 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.spark.sql.api.java;
+
+import java.io.Serializable;
+
+// **************************************************
+// THIS FILE IS AUTOGENERATED BY CODE IN
+// org.apache.spark.sql.api.java.FunctionRegistration
+// **************************************************
+
+/**
+ * A Spark SQL UDF that has 9 arguments.
+ */
+public interface UDF9<T1, T2, T3, T4, T5, T6, T7, T8, T9, R> extends
Serializable {
+ public R call(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7, T8 t8, T9 t9)
throws Exception;
+}
http://git-wip-us.apache.org/repos/asf/spark/blob/158ad0bb/sql/core/src/main/scala/org/apache/spark/sql/SQLContext.scala
----------------------------------------------------------------------
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
index 00dd34a..33931e5 100644
--- a/sql/core/src/main/scala/org/apache/spark/sql/SQLContext.scala
+++ b/sql/core/src/main/scala/org/apache/spark/sql/SQLContext.scala
@@ -48,18 +48,23 @@ import org.apache.spark.{Logging, SparkContext}
*/
@AlphaComponent
class SQLContext(@transient val sparkContext: SparkContext)
- extends Logging
+ extends org.apache.spark.Logging
with SQLConf
with ExpressionConversions
+ with UDFRegistration
with Serializable {
self =>
@transient
protected[sql] lazy val catalog: Catalog = new SimpleCatalog(true)
+
+ @transient
+ protected[sql] lazy val functionRegistry: FunctionRegistry = new
SimpleFunctionRegistry
+
@transient
protected[sql] lazy val analyzer: Analyzer =
- new Analyzer(catalog, EmptyFunctionRegistry, caseSensitive = true)
+ new Analyzer(catalog, functionRegistry, caseSensitive = true)
@transient
protected[sql] val optimizer = Optimizer
@transient
@@ -379,7 +384,7 @@ class SQLContext(@transient val sparkContext: SparkContext)
protected abstract class QueryExecution {
def logical: LogicalPlan
- lazy val analyzed = analyzer(logical)
+ lazy val analyzed = ExtractPythonUdfs(analyzer(logical))
lazy val optimizedPlan = optimizer(analyzed)
// TODO: Don't just pick the first one...
lazy val sparkPlan = {
http://git-wip-us.apache.org/repos/asf/spark/blob/158ad0bb/sql/core/src/main/scala/org/apache/spark/sql/UdfRegistration.scala
----------------------------------------------------------------------
diff --git a/sql/core/src/main/scala/org/apache/spark/sql/UdfRegistration.scala
b/sql/core/src/main/scala/org/apache/spark/sql/UdfRegistration.scala
new file mode 100644
index 0000000..0b48e9e
--- /dev/null
+++ b/sql/core/src/main/scala/org/apache/spark/sql/UdfRegistration.scala
@@ -0,0 +1,196 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.spark.sql
+
+import java.util.{List => JList, Map => JMap}
+
+import org.apache.spark.Accumulator
+import org.apache.spark.sql.catalyst.ScalaReflection
+import org.apache.spark.sql.catalyst.expressions.{Expression, ScalaUdf}
+import org.apache.spark.sql.execution.PythonUDF
+
+import scala.reflect.runtime.universe.{TypeTag, typeTag}
+
+/**
+ * Functions for registering scala lambda functions as UDFs in a SQLContext.
+ */
+protected[sql] trait UDFRegistration {
+ self: SQLContext =>
+
+ private[spark] def registerPython(
+ name: String,
+ command: Array[Byte],
+ envVars: JMap[String, String],
+ pythonIncludes: JList[String],
+ pythonExec: String,
+ accumulator: Accumulator[JList[Array[Byte]]],
+ stringDataType: String): Unit = {
+ log.debug(
+ s"""
+ | Registering new PythonUDF:
+ | name: $name
+ | command: ${command.toSeq}
+ | envVars: $envVars
+ | pythonIncludes: $pythonIncludes
+ | pythonExec: $pythonExec
+ | dataType: $stringDataType
+ """.stripMargin)
+
+
+ val dataType = parseDataType(stringDataType)
+
+ def builder(e: Seq[Expression]) =
+ PythonUDF(
+ name,
+ command,
+ envVars,
+ pythonIncludes,
+ pythonExec,
+ accumulator,
+ dataType,
+ e)
+
+ functionRegistry.registerFunction(name, builder)
+ }
+
+ /** registerFunction 1-22 were generated by this script
+
+ (1 to 22).map { x =>
+ val types = (1 to x).map(x => "_").reduce(_ + ", " + _)
+ s"""
+ def registerFunction[T: TypeTag](name: String, func:
Function$x[$types, T]): Unit = {
+ def builder(e: Seq[Expression]) =
+ ScalaUdf(func, ScalaReflection.schemaFor(typeTag[T]).dataType, e)
+ functionRegistry.registerFunction(name, builder)
+ }
+ """
+ }
+ */
+
+ // scalastyle:off
+ def registerFunction[T: TypeTag](name: String, func: Function1[_, T]): Unit
= {
+ def builder(e: Seq[Expression]) = ScalaUdf(func,
ScalaReflection.schemaFor(typeTag[T]).dataType, e)
+ functionRegistry.registerFunction(name, builder)
+ }
+
+ def registerFunction[T: TypeTag](name: String, func: Function2[_, _, T]):
Unit = {
+ def builder(e: Seq[Expression]) = ScalaUdf(func,
ScalaReflection.schemaFor(typeTag[T]).dataType, e)
+ functionRegistry.registerFunction(name, builder)
+ }
+
+ def registerFunction[T: TypeTag](name: String, func: Function3[_, _, _, T]):
Unit = {
+ def builder(e: Seq[Expression]) = ScalaUdf(func,
ScalaReflection.schemaFor(typeTag[T]).dataType, e)
+ functionRegistry.registerFunction(name, builder)
+ }
+
+ def registerFunction[T: TypeTag](name: String, func: Function4[_, _, _, _,
T]): Unit = {
+ def builder(e: Seq[Expression]) = ScalaUdf(func,
ScalaReflection.schemaFor(typeTag[T]).dataType, e)
+ functionRegistry.registerFunction(name, builder)
+ }
+
+ def registerFunction[T: TypeTag](name: String, func: Function5[_, _, _, _,
_, T]): Unit = {
+ def builder(e: Seq[Expression]) = ScalaUdf(func,
ScalaReflection.schemaFor(typeTag[T]).dataType, e)
+ functionRegistry.registerFunction(name, builder)
+ }
+
+ def registerFunction[T: TypeTag](name: String, func: Function6[_, _, _, _,
_, _, T]): Unit = {
+ def builder(e: Seq[Expression]) = ScalaUdf(func,
ScalaReflection.schemaFor(typeTag[T]).dataType, e)
+ functionRegistry.registerFunction(name, builder)
+ }
+
+ def registerFunction[T: TypeTag](name: String, func: Function7[_, _, _, _,
_, _, _, T]): Unit = {
+ def builder(e: Seq[Expression]) = ScalaUdf(func,
ScalaReflection.schemaFor(typeTag[T]).dataType, e)
+ functionRegistry.registerFunction(name, builder)
+ }
+
+ def registerFunction[T: TypeTag](name: String, func: Function8[_, _, _, _,
_, _, _, _, T]): Unit = {
+ def builder(e: Seq[Expression]) = ScalaUdf(func,
ScalaReflection.schemaFor(typeTag[T]).dataType, e)
+ functionRegistry.registerFunction(name, builder)
+ }
+
+ def registerFunction[T: TypeTag](name: String, func: Function9[_, _, _, _,
_, _, _, _, _, T]): Unit = {
+ def builder(e: Seq[Expression]) = ScalaUdf(func,
ScalaReflection.schemaFor(typeTag[T]).dataType, e)
+ functionRegistry.registerFunction(name, builder)
+ }
+
+ def registerFunction[T: TypeTag](name: String, func: Function10[_, _, _, _,
_, _, _, _, _, _, T]): Unit = {
+ def builder(e: Seq[Expression]) = ScalaUdf(func,
ScalaReflection.schemaFor(typeTag[T]).dataType, e)
+ functionRegistry.registerFunction(name, builder)
+ }
+
+ def registerFunction[T: TypeTag](name: String, func: Function11[_, _, _, _,
_, _, _, _, _, _, _, T]): Unit = {
+ def builder(e: Seq[Expression]) = ScalaUdf(func,
ScalaReflection.schemaFor(typeTag[T]).dataType, e)
+ functionRegistry.registerFunction(name, builder)
+ }
+
+ def registerFunction[T: TypeTag](name: String, func: Function12[_, _, _, _,
_, _, _, _, _, _, _, _, T]): Unit = {
+ def builder(e: Seq[Expression]) = ScalaUdf(func,
ScalaReflection.schemaFor(typeTag[T]).dataType, e)
+ functionRegistry.registerFunction(name, builder)
+ }
+
+ def registerFunction[T: TypeTag](name: String, func: Function13[_, _, _, _,
_, _, _, _, _, _, _, _, _, T]): Unit = {
+ def builder(e: Seq[Expression]) = ScalaUdf(func,
ScalaReflection.schemaFor(typeTag[T]).dataType, e)
+ functionRegistry.registerFunction(name, builder)
+ }
+
+ def registerFunction[T: TypeTag](name: String, func: Function14[_, _, _, _,
_, _, _, _, _, _, _, _, _, _, T]): Unit = {
+ def builder(e: Seq[Expression]) = ScalaUdf(func,
ScalaReflection.schemaFor(typeTag[T]).dataType, e)
+ functionRegistry.registerFunction(name, builder)
+ }
+
+ def registerFunction[T: TypeTag](name: String, func: Function15[_, _, _, _,
_, _, _, _, _, _, _, _, _, _, _, T]): Unit = {
+ def builder(e: Seq[Expression]) = ScalaUdf(func,
ScalaReflection.schemaFor(typeTag[T]).dataType, e)
+ functionRegistry.registerFunction(name, builder)
+ }
+
+ def registerFunction[T: TypeTag](name: String, func: Function16[_, _, _, _,
_, _, _, _, _, _, _, _, _, _, _, _, T]): Unit = {
+ def builder(e: Seq[Expression]) = ScalaUdf(func,
ScalaReflection.schemaFor(typeTag[T]).dataType, e)
+ functionRegistry.registerFunction(name, builder)
+ }
+
+ def registerFunction[T: TypeTag](name: String, func: Function17[_, _, _, _,
_, _, _, _, _, _, _, _, _, _, _, _, _, T]): Unit = {
+ def builder(e: Seq[Expression]) = ScalaUdf(func,
ScalaReflection.schemaFor(typeTag[T]).dataType, e)
+ functionRegistry.registerFunction(name, builder)
+ }
+
+ def registerFunction[T: TypeTag](name: String, func: Function18[_, _, _, _,
_, _, _, _, _, _, _, _, _, _, _, _, _, _, T]): Unit = {
+ def builder(e: Seq[Expression]) = ScalaUdf(func,
ScalaReflection.schemaFor(typeTag[T]).dataType, e)
+ functionRegistry.registerFunction(name, builder)
+ }
+
+ def registerFunction[T: TypeTag](name: String, func: Function19[_, _, _, _,
_, _, _, _, _, _, _, _, _, _, _, _, _, _, _, T]): Unit = {
+ def builder(e: Seq[Expression]) = ScalaUdf(func,
ScalaReflection.schemaFor(typeTag[T]).dataType, e)
+ functionRegistry.registerFunction(name, builder)
+ }
+
+ def registerFunction[T: TypeTag](name: String, func: Function20[_, _, _, _,
_, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, T]): Unit = {
+ def builder(e: Seq[Expression]) = ScalaUdf(func,
ScalaReflection.schemaFor(typeTag[T]).dataType, e)
+ functionRegistry.registerFunction(name, builder)
+ }
+
+ def registerFunction[T: TypeTag](name: String, func: Function21[_, _, _, _,
_, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, T]): Unit = {
+ def builder(e: Seq[Expression]) = ScalaUdf(func,
ScalaReflection.schemaFor(typeTag[T]).dataType, e)
+ functionRegistry.registerFunction(name, builder)
+ }
+
+ def registerFunction[T: TypeTag](name: String, func: Function22[_, _, _, _,
_, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, T]): Unit = {
+ def builder(e: Seq[Expression]) = ScalaUdf(func,
ScalaReflection.schemaFor(typeTag[T]).dataType, e)
+ functionRegistry.registerFunction(name, builder)
+ }
+ // scalastyle:on
+}
http://git-wip-us.apache.org/repos/asf/spark/blob/158ad0bb/sql/core/src/main/scala/org/apache/spark/sql/api/java/JavaSQLContext.scala
----------------------------------------------------------------------
diff --git
a/sql/core/src/main/scala/org/apache/spark/sql/api/java/JavaSQLContext.scala
b/sql/core/src/main/scala/org/apache/spark/sql/api/java/JavaSQLContext.scala
index 809dd03..ae45193 100644
--- a/sql/core/src/main/scala/org/apache/spark/sql/api/java/JavaSQLContext.scala
+++ b/sql/core/src/main/scala/org/apache/spark/sql/api/java/JavaSQLContext.scala
@@ -28,14 +28,13 @@ import org.apache.spark.sql.{SQLContext, StructType =>
SStructType}
import org.apache.spark.sql.catalyst.expressions.{AttributeReference,
GenericRow, Row => ScalaRow}
import org.apache.spark.sql.parquet.ParquetRelation
import org.apache.spark.sql.execution.{ExistingRdd, SparkLogicalPlan}
-import org.apache.spark.sql.types.util.DataTypeConversions
-import DataTypeConversions.asScalaDataType;
+import org.apache.spark.sql.types.util.DataTypeConversions.asScalaDataType
import org.apache.spark.util.Utils
/**
* The entry point for executing Spark SQL queries from a Java program.
*/
-class JavaSQLContext(val sqlContext: SQLContext) {
+class JavaSQLContext(val sqlContext: SQLContext) extends UDFRegistration {
def this(sparkContext: JavaSparkContext) = this(new
SQLContext(sparkContext.sc))
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org
For additional commands, e-mail: commits-h...@spark.apache.org
