Skip to content

Commit bf060d6

Browse files
cloud-fancloud-fan
authored
fix java udf name (#3)
1 parent 1b3aa22 commit bf060d6

File tree

2 files changed

+26
-26
lines changed

2 files changed

+26
-26
lines changed

‎python/pyspark/sql/context.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -220,11 +220,11 @@ def registerJavaFunction(self, name, javaClassName, returnType=None):
220220
>>> sqlContext.registerJavaFunction("javaStringLength",
221221
... "test.org.apache.spark.sql.JavaStringLength", IntegerType())
222222
>>> sqlContext.sql("SELECT javaStringLength('test')").collect()
223-
[Row(UDF(test)=4)]
223+
[Row(UDF:javaStringLength(test)=4)]
224224
>>> sqlContext.registerJavaFunction("javaStringLength2",
225225
... "test.org.apache.spark.sql.JavaStringLength")
226226
>>> sqlContext.sql("SELECT javaStringLength2('test')").collect()
227-
[Row(UDF(test)=4)]
227+
[Row(UDF:javaStringLength2(test)=4)]
228228
229229
"""
230230
jdt = None

‎sql/core/src/main/scala/org/apache/spark/sql/UDFRegistration.scala‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ class UDFRegistration private[sql] (functionRegistry: FunctionRegistry) extends
149149
|def register(name: String, f: UDF$i[$extTypeArgs], returnType: DataType): Unit = {
150150
| val func = f$anyCast.call($anyParams)
151151
| def builder(e: Seq[Expression]) = if (e.length == $i) {
152-
| ScalaUDF($funcCall, returnType, e)
152+
| ScalaUDF($funcCall, returnType, e, udfName = Some(name))
153153
| } else {
154154
| throw new AnalysisException("Invalid number of arguments for function " + name +
155155
| ". Expected: $i; Found: " + e.length)
@@ -694,7 +694,7 @@ class UDFRegistration private[sql] (functionRegistry: FunctionRegistry) extends
694694
def register(name: String, f: UDF0[_], returnType: DataType): Unit = {
695695
val func = f.asInstanceOf[UDF0[Any]].call()
696696
def builder(e: Seq[Expression]) = if (e.length == 0) {
697-
ScalaUDF(() => func, returnType, e)
697+
ScalaUDF(() => func, returnType, e, udfName = Some(name))
698698
} else {
699699
throw new AnalysisException("Invalid number of arguments for function " + name +
700700
". Expected: 0; Found: " + e.length)
@@ -709,7 +709,7 @@ class UDFRegistration private[sql] (functionRegistry: FunctionRegistry) extends
709709
def register(name: String, f: UDF1[_, _], returnType: DataType): Unit = {
710710
val func = f.asInstanceOf[UDF1[Any, Any]].call(_: Any)
711711
def builder(e: Seq[Expression]) = if (e.length == 1) {
712-
ScalaUDF(func, returnType, e)
712+
ScalaUDF(func, returnType, e, udfName = Some(name))
713713
} else {
714714
throw new AnalysisException("Invalid number of arguments for function " + name +
715715
". Expected: 1; Found: " + e.length)
@@ -724,7 +724,7 @@ class UDFRegistration private[sql] (functionRegistry: FunctionRegistry) extends
724724
def register(name: String, f: UDF2[_, _, _], returnType: DataType): Unit = {
725725
val func = f.asInstanceOf[UDF2[Any, Any, Any]].call(_: Any, _: Any)
726726
def builder(e: Seq[Expression]) = if (e.length == 2) {
727-
ScalaUDF(func, returnType, e)
727+
ScalaUDF(func, returnType, e, udfName = Some(name))
728728
} else {
729729
throw new AnalysisException("Invalid number of arguments for function " + name +
730730
". Expected: 2; Found: " + e.length)
@@ -739,7 +739,7 @@ class UDFRegistration private[sql] (functionRegistry: FunctionRegistry) extends
739739
def register(name: String, f: UDF3[_, _, _, _], returnType: DataType): Unit = {
740740
val func = f.asInstanceOf[UDF3[Any, Any, Any, Any]].call(_: Any, _: Any, _: Any)
741741
def builder(e: Seq[Expression]) = if (e.length == 3) {
742-
ScalaUDF(func, returnType, e)
742+
ScalaUDF(func, returnType, e, udfName = Some(name))
743743
} else {
744744
throw new AnalysisException("Invalid number of arguments for function " + name +
745745
". Expected: 3; Found: " + e.length)
@@ -754,7 +754,7 @@ class UDFRegistration private[sql] (functionRegistry: FunctionRegistry) extends
754754
def register(name: String, f: UDF4[_, _, _, _, _], returnType: DataType): Unit = {
755755
val func = f.asInstanceOf[UDF4[Any, Any, Any, Any, Any]].call(_: Any, _: Any, _: Any, _: Any)
756756
def builder(e: Seq[Expression]) = if (e.length == 4) {
757-
ScalaUDF(func, returnType, e)
757+
ScalaUDF(func, returnType, e, udfName = Some(name))
758758
} else {
759759
throw new AnalysisException("Invalid number of arguments for function " + name +
760760
". Expected: 4; Found: " + e.length)
@@ -769,7 +769,7 @@ class UDFRegistration private[sql] (functionRegistry: FunctionRegistry) extends
769769
def register(name: String, f: UDF5[_, _, _, _, _, _], returnType: DataType): Unit = {
770770
val func = f.asInstanceOf[UDF5[Any, Any, Any, Any, Any, Any]].call(_: Any, _: Any, _: Any, _: Any, _: Any)
771771
def builder(e: Seq[Expression]) = if (e.length == 5) {
772-
ScalaUDF(func, returnType, e)
772+
ScalaUDF(func, returnType, e, udfName = Some(name))
773773
} else {
774774
throw new AnalysisException("Invalid number of arguments for function " + name +
775775
". Expected: 5; Found: " + e.length)
@@ -784,7 +784,7 @@ class UDFRegistration private[sql] (functionRegistry: FunctionRegistry) extends
784784
def register(name: String, f: UDF6[_, _, _, _, _, _, _], returnType: DataType): Unit = {
785785
val func = f.asInstanceOf[UDF6[Any, Any, Any, Any, Any, Any, Any]].call(_: Any, _: Any, _: Any, _: Any, _: Any, _: Any)
786786
def builder(e: Seq[Expression]) = if (e.length == 6) {
787-
ScalaUDF(func, returnType, e)
787+
ScalaUDF(func, returnType, e, udfName = Some(name))
788788
} else {
789789
throw new AnalysisException("Invalid number of arguments for function " + name +
790790
". Expected: 6; Found: " + e.length)
@@ -799,7 +799,7 @@ class UDFRegistration private[sql] (functionRegistry: FunctionRegistry) extends
799799
def register(name: String, f: UDF7[_, _, _, _, _, _, _, _], returnType: DataType): Unit = {
800800
val func = f.asInstanceOf[UDF7[Any, Any, Any, Any, Any, Any, Any, Any]].call(_: Any, _: Any, _: Any, _: Any, _: Any, _: Any, _: Any)
801801
def builder(e: Seq[Expression]) = if (e.length == 7) {
802-
ScalaUDF(func, returnType, e)
802+
ScalaUDF(func, returnType, e, udfName = Some(name))
803803
} else {
804804
throw new AnalysisException("Invalid number of arguments for function " + name +
805805
". Expected: 7; Found: " + e.length)
@@ -814,7 +814,7 @@ class UDFRegistration private[sql] (functionRegistry: FunctionRegistry) extends
814814
def register(name: String, f: UDF8[_, _, _, _, _, _, _, _, _], returnType: DataType): Unit = {
815815
val func = f.asInstanceOf[UDF8[Any, Any, Any, Any, Any, Any, Any, Any, Any]].call(_: Any, _: Any, _: Any, _: Any, _: Any, _: Any, _: Any, _: Any)
816816
def builder(e: Seq[Expression]) = if (e.length == 8) {
817-
ScalaUDF(func, returnType, e)
817+
ScalaUDF(func, returnType, e, udfName = Some(name))
818818
} else {
819819
throw new AnalysisException("Invalid number of arguments for function " + name +
820820
". Expected: 8; Found: " + e.length)
@@ -829,7 +829,7 @@ class UDFRegistration private[sql] (functionRegistry: FunctionRegistry) extends
829829
def register(name: String, f: UDF9[_, _, _, _, _, _, _, _, _, _], returnType: DataType): Unit = {
830830
val func = f.asInstanceOf[UDF9[Any, Any, Any, Any, Any, Any, Any, Any, Any, Any]].call(_: Any, _: Any, _: Any, _: Any, _: Any, _: Any, _: Any, _: Any, _: Any)
831831
def builder(e: Seq[Expression]) = if (e.length == 9) {
832-
ScalaUDF(func, returnType, e)
832+
ScalaUDF(func, returnType, e, udfName = Some(name))
833833
} else {
834834
throw new AnalysisException("Invalid number of arguments for function " + name +
835835
". Expected: 9; Found: " + e.length)
@@ -844,7 +844,7 @@ class UDFRegistration private[sql] (functionRegistry: FunctionRegistry) extends
844844
def register(name: String, f: UDF10[_, _, _, _, _, _, _, _, _, _, _], returnType: DataType): Unit = {
845845
val func = f.asInstanceOf[UDF10[Any, Any, Any, Any, Any, Any, Any, Any, Any, Any, Any]].call(_: Any, _: Any, _: Any, _: Any, _: Any, _: Any, _: Any, _: Any, _: Any, _: Any)
846846
def builder(e: Seq[Expression]) = if (e.length == 10) {
847-
ScalaUDF(func, returnType, e)
847+
ScalaUDF(func, returnType, e, udfName = Some(name))
848848
} else {
849849
throw new AnalysisException("Invalid number of arguments for function " + name +
850850
". Expected: 10; Found: " + e.length)
@@ -859,7 +859,7 @@ class UDFRegistration private[sql] (functionRegistry: FunctionRegistry) extends
859859
def register(name: String, f: UDF11[_, _, _, _, _, _, _, _, _, _, _, _], returnType: DataType): Unit = {
860860
val func = f.asInstanceOf[UDF11[Any, Any, Any, Any, Any, Any, Any, Any, Any, Any, Any, Any]].call(_: Any, _: Any, _: Any, _: Any, _: Any, _: Any, _: Any, _: Any, _: Any, _: Any, _: Any)
861861
def builder(e: Seq[Expression]) = if (e.length == 11) {
862-
ScalaUDF(func, returnType, e)
862+
ScalaUDF(func, returnType, e, udfName = Some(name))
863863
} else {
864864
throw new AnalysisException("Invalid number of arguments for function " + name +
865865
". Expected: 11; Found: " + e.length)
@@ -874,7 +874,7 @@ class UDFRegistration private[sql] (functionRegistry: FunctionRegistry) extends
874874
def register(name: String, f: UDF12[_, _, _, _, _, _, _, _, _, _, _, _, _], returnType: DataType): Unit = {
875875
val func = f.asInstanceOf[UDF12[Any, Any, Any, Any, Any, Any, Any, Any, Any, Any, Any, Any, Any]].call(_: Any, _: Any, _: Any, _: Any, _: Any, _: Any, _: Any, _: Any, _: Any, _: Any, _: Any, _: Any)
876876
def builder(e: Seq[Expression]) = if (e.length == 12) {
877-
ScalaUDF(func, returnType, e)
877+
ScalaUDF(func, returnType, e, udfName = Some(name))
878878
} else {
879879
throw new AnalysisException("Invalid number of arguments for function " + name +
880880
". Expected: 12; Found: " + e.length)
@@ -889,7 +889,7 @@ class UDFRegistration private[sql] (functionRegistry: FunctionRegistry) extends
889889
def register(name: String, f: UDF13[_, _, _, _, _, _, _, _, _, _, _, _, _, _], returnType: DataType): Unit = {
890890
val func = f.asInstanceOf[UDF13[Any, Any, Any, Any, Any, Any, Any, Any, Any, Any, Any, Any, Any, Any]].call(_: Any, _: Any, _: Any, _: Any, _: Any, _: Any, _: Any, _: Any, _: Any, _: Any, _: Any, _: Any, _: Any)
891891
def builder(e: Seq[Expression]) = if (e.length == 13) {
892-
ScalaUDF(func, returnType, e)
892+
ScalaUDF(func, returnType, e, udfName = Some(name))
893893
} else {
894894
throw new AnalysisException("Invalid number of arguments for function " + name +
895895
". Expected: 13; Found: " + e.length)
@@ -904,7 +904,7 @@ class UDFRegistration private[sql] (functionRegistry: FunctionRegistry) extends
904904
def register(name: String, f: UDF14[_, _, _, _, _, _, _, _, _, _, _, _, _, _, _], returnType: DataType): Unit = {
905905
val func = f.asInstanceOf[UDF14[Any, Any, Any, Any, Any, Any, Any, Any, Any, Any, Any, Any, Any, Any, Any]].call(_: Any, _: Any, _: Any, _: Any, _: Any, _: Any, _: Any, _: Any, _: Any, _: Any, _: Any, _: Any, _: Any, _: Any)
906906
def builder(e: Seq[Expression]) = if (e.length == 14) {
907-
ScalaUDF(func, returnType, e)
907+
ScalaUDF(func, returnType, e, udfName = Some(name))
908908
} else {
909909
throw new AnalysisException("Invalid number of arguments for function " + name +
910910
". Expected: 14; Found: " + e.length)
@@ -919,7 +919,7 @@ class UDFRegistration private[sql] (functionRegistry: FunctionRegistry) extends
919919
def register(name: String, f: UDF15[_, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _], returnType: DataType): Unit = {
920920
val func = f.asInstanceOf[UDF15[Any, Any, Any, Any, Any, Any, Any, Any, Any, Any, Any, Any, Any, Any, Any, Any]].call(_: Any, _: Any, _: Any, _: Any, _: Any, _: Any, _: Any, _: Any, _: Any, _: Any, _: Any, _: Any, _: Any, _: Any, _: Any)
921921
def builder(e: Seq[Expression]) = if (e.length == 15) {
922-
ScalaUDF(func, returnType, e)
922+
ScalaUDF(func, returnType, e, udfName = Some(name))
923923
} else {
924924
throw new AnalysisException("Invalid number of arguments for function " + name +
925925
". Expected: 15; Found: " + e.length)
@@ -934,7 +934,7 @@ class UDFRegistration private[sql] (functionRegistry: FunctionRegistry) extends
934934
def register(name: String, f: UDF16[_, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _], returnType: DataType): Unit = {
935935
val func = f.asInstanceOf[UDF16[Any, Any, Any, Any, Any, Any, Any, Any, Any, Any, Any, Any, Any, Any, Any, Any, Any]].call(_: Any, _: Any, _: Any, _: Any, _: Any, _: Any, _: Any, _: Any, _: Any, _: Any, _: Any, _: Any, _: Any, _: Any, _: Any, _: Any)
936936
def builder(e: Seq[Expression]) = if (e.length == 16) {
937-
ScalaUDF(func, returnType, e)
937+
ScalaUDF(func, returnType, e, udfName = Some(name))
938938
} else {
939939
throw new AnalysisException("Invalid number of arguments for function " + name +
940940
". Expected: 16; Found: " + e.length)
@@ -949,7 +949,7 @@ class UDFRegistration private[sql] (functionRegistry: FunctionRegistry) extends
949949
def register(name: String, f: UDF17[_, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _], returnType: DataType): Unit = {
950950
val func = f.asInstanceOf[UDF17[Any, Any, Any, Any, Any, Any, Any, Any, Any, Any, Any, Any, Any, Any, Any, Any, Any, Any]].call(_: Any, _: Any, _: Any, _: Any, _: Any, _: Any, _: Any, _: Any, _: Any, _: Any, _: Any, _: Any, _: Any, _: Any, _: Any, _: Any, _: Any)
951951
def builder(e: Seq[Expression]) = if (e.length == 17) {
952-
ScalaUDF(func, returnType, e)
952+
ScalaUDF(func, returnType, e, udfName = Some(name))
953953
} else {
954954
throw new AnalysisException("Invalid number of arguments for function " + name +
955955
". Expected: 17; Found: " + e.length)
@@ -964,7 +964,7 @@ class UDFRegistration private[sql] (functionRegistry: FunctionRegistry) extends
964964
def register(name: String, f: UDF18[_, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _], returnType: DataType): Unit = {
965965
val func = f.asInstanceOf[UDF18[Any, Any, Any, Any, Any, Any, Any, Any, Any, Any, Any, Any, Any, Any, Any, Any, Any, Any, Any]].call(_: Any, _: Any, _: Any, _: Any, _: Any, _: Any, _: Any, _: Any, _: Any, _: Any, _: Any, _: Any, _: Any, _: Any, _: Any, _: Any, _: Any, _: Any)
966966
def builder(e: Seq[Expression]) = if (e.length == 18) {
967-
ScalaUDF(func, returnType, e)
967+
ScalaUDF(func, returnType, e, udfName = Some(name))
968968
} else {
969969
throw new AnalysisException("Invalid number of arguments for function " + name +
970970
". Expected: 18; Found: " + e.length)
@@ -979,7 +979,7 @@ class UDFRegistration private[sql] (functionRegistry: FunctionRegistry) extends
979979
def register(name: String, f: UDF19[_, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _], returnType: DataType): Unit = {
980980
val func = f.asInstanceOf[UDF19[Any, Any, Any, Any, Any, Any, Any, Any, Any, Any, Any, Any, Any, Any, Any, Any, Any, Any, Any, Any]].call(_: Any, _: Any, _: Any, _: Any, _: Any, _: Any, _: Any, _: Any, _: Any, _: Any, _: Any, _: Any, _: Any, _: Any, _: Any, _: Any, _: Any, _: Any, _: Any)
981981
def builder(e: Seq[Expression]) = if (e.length == 19) {
982-
ScalaUDF(func, returnType, e)
982+
ScalaUDF(func, returnType, e, udfName = Some(name))
983983
} else {
984984
throw new AnalysisException("Invalid number of arguments for function " + name +
985985
". Expected: 19; Found: " + e.length)
@@ -994,7 +994,7 @@ class UDFRegistration private[sql] (functionRegistry: FunctionRegistry) extends
994994
def register(name: String, f: UDF20[_, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _], returnType: DataType): Unit = {
995995
val func = f.asInstanceOf[UDF20[Any, Any, Any, Any, Any, Any, Any, Any, Any, Any, Any, Any, Any, Any, Any, Any, Any, Any, Any, Any, Any]].call(_: Any, _: Any, _: Any, _: Any, _: Any, _: Any, _: Any, _: Any, _: Any, _: Any, _: Any, _: Any, _: Any, _: Any, _: Any, _: Any, _: Any, _: Any, _: Any, _: Any)
996996
def builder(e: Seq[Expression]) = if (e.length == 20) {
997-
ScalaUDF(func, returnType, e)
997+
ScalaUDF(func, returnType, e, udfName = Some(name))
998998
} else {
999999
throw new AnalysisException("Invalid number of arguments for function " + name +
10001000
". Expected: 20; Found: " + e.length)
@@ -1009,7 +1009,7 @@ class UDFRegistration private[sql] (functionRegistry: FunctionRegistry) extends
10091009
def register(name: String, f: UDF21[_, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _], returnType: DataType): Unit = {
10101010
val func = f.asInstanceOf[UDF21[Any, Any, Any, Any, Any, Any, Any, Any, Any, Any, Any, Any, Any, Any, Any, Any, Any, Any, Any, Any, Any, Any]].call(_: Any, _: Any, _: Any, _: Any, _: Any, _: Any, _: Any, _: Any, _: Any, _: Any, _: Any, _: Any, _: Any, _: Any, _: Any, _: Any, _: Any, _: Any, _: Any, _: Any, _: Any)
10111011
def builder(e: Seq[Expression]) = if (e.length == 21) {
1012-
ScalaUDF(func, returnType, e)
1012+
ScalaUDF(func, returnType, e, udfName = Some(name))
10131013
} else {
10141014
throw new AnalysisException("Invalid number of arguments for function " + name +
10151015
". Expected: 21; Found: " + e.length)
@@ -1024,7 +1024,7 @@ class UDFRegistration private[sql] (functionRegistry: FunctionRegistry) extends
10241024
def register(name: String, f: UDF22[_, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _], returnType: DataType): Unit = {
10251025
val func = f.asInstanceOf[UDF22[Any, Any, Any, Any, Any, Any, Any, Any, Any, Any, Any, Any, Any, Any, Any, Any, Any, Any, Any, Any, Any, Any, Any]].call(_: Any, _: Any, _: Any, _: Any, _: Any, _: Any, _: Any, _: Any, _: Any, _: Any, _: Any, _: Any, _: Any, _: Any, _: Any, _: Any, _: Any, _: Any, _: Any, _: Any, _: Any, _: Any)
10261026
def builder(e: Seq[Expression]) = if (e.length == 22) {
1027-
ScalaUDF(func, returnType, e)
1027+
ScalaUDF(func, returnType, e, udfName = Some(name))
10281028
} else {
10291029
throw new AnalysisException("Invalid number of arguments for function " + name +
10301030
". Expected: 22; Found: " + e.length)

0 commit comments

Comments
 (0)