Skip to content

Commit 8c756f1

Browse files
committed
renamed Hive UDF related code
1 parent 2a1ca76 commit 8c756f1

File tree

2 files changed

+14
-14
lines changed

2 files changed

+14
-14
lines changed

sql/hive/src/main/scala/org/apache/spark/sql/hive/HiveQl.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1638,7 +1638,7 @@ https://cwiki.apache.org/confluence/display/Hive/Enhanced+Aggregation%2C+Cube%2C
16381638
sys.error(s"Couldn't find function $functionName"))
16391639
val functionClassName = functionInfo.getFunctionClass.getName
16401640

1641-
(HiveGenericUdtf(
1641+
(HiveGenericUDTF(
16421642
new HiveFunctionWrapper(functionClassName),
16431643
children.map(nodeToExpr)), attributes)
16441644

sql/hive/src/main/scala/org/apache/spark/sql/hive/hiveUdfs.scala renamed to sql/hive/src/main/scala/org/apache/spark/sql/hive/hiveUDFs.scala

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -59,16 +59,16 @@ private[hive] class HiveFunctionRegistry(underlying: analysis.FunctionRegistry)
5959
val functionClassName = functionInfo.getFunctionClass.getName
6060

6161
if (classOf[UDF].isAssignableFrom(functionInfo.getFunctionClass)) {
62-
HiveSimpleUdf(new HiveFunctionWrapper(functionClassName), children)
62+
HiveSimpleUDF(new HiveFunctionWrapper(functionClassName), children)
6363
} else if (classOf[GenericUDF].isAssignableFrom(functionInfo.getFunctionClass)) {
64-
HiveGenericUdf(new HiveFunctionWrapper(functionClassName), children)
64+
HiveGenericUDF(new HiveFunctionWrapper(functionClassName), children)
6565
} else if (
6666
classOf[AbstractGenericUDAFResolver].isAssignableFrom(functionInfo.getFunctionClass)) {
67-
HiveGenericUdaf(new HiveFunctionWrapper(functionClassName), children)
67+
HiveGenericUDAF(new HiveFunctionWrapper(functionClassName), children)
6868
} else if (classOf[UDAF].isAssignableFrom(functionInfo.getFunctionClass)) {
69-
HiveUdaf(new HiveFunctionWrapper(functionClassName), children)
69+
HiveUDAF(new HiveFunctionWrapper(functionClassName), children)
7070
} else if (classOf[GenericUDTF].isAssignableFrom(functionInfo.getFunctionClass)) {
71-
HiveGenericUdtf(new HiveFunctionWrapper(functionClassName), children)
71+
HiveGenericUDTF(new HiveFunctionWrapper(functionClassName), children)
7272
} else {
7373
sys.error(s"No handler for udf ${functionInfo.getFunctionClass}")
7474
}
@@ -79,7 +79,7 @@ private[hive] class HiveFunctionRegistry(underlying: analysis.FunctionRegistry)
7979
throw new UnsupportedOperationException
8080
}
8181

82-
private[hive] case class HiveSimpleUdf(funcWrapper: HiveFunctionWrapper, children: Seq[Expression])
82+
private[hive] case class HiveSimpleUDF(funcWrapper: HiveFunctionWrapper, children: Seq[Expression])
8383
extends Expression with HiveInspectors with Logging {
8484

8585
type UDFType = UDF
@@ -146,7 +146,7 @@ private[hive] class DeferredObjectAdapter(oi: ObjectInspector)
146146
override def get(): AnyRef = wrap(func(), oi)
147147
}
148148

149-
private[hive] case class HiveGenericUdf(funcWrapper: HiveFunctionWrapper, children: Seq[Expression])
149+
private[hive] case class HiveGenericUDF(funcWrapper: HiveFunctionWrapper, children: Seq[Expression])
150150
extends Expression with HiveInspectors with Logging {
151151
type UDFType = GenericUDF
152152

@@ -413,7 +413,7 @@ private[hive] case class HiveWindowFunction(
413413
new HiveWindowFunction(funcWrapper, pivotResult, isUDAFBridgeRequired, children)
414414
}
415415

416-
private[hive] case class HiveGenericUdaf(
416+
private[hive] case class HiveGenericUDAF(
417417
funcWrapper: HiveFunctionWrapper,
418418
children: Seq[Expression]) extends AggregateExpression
419419
with HiveInspectors {
@@ -441,11 +441,11 @@ private[hive] case class HiveGenericUdaf(
441441
s"$nodeName#${funcWrapper.functionClassName}(${children.mkString(",")})"
442442
}
443443

444-
def newInstance(): HiveUdafFunction = new HiveUdafFunction(funcWrapper, children, this)
444+
def newInstance(): HiveUDAFFunction = new HiveUDAFFunction(funcWrapper, children, this)
445445
}
446446

447447
/** It is used as a wrapper for the hive functions which uses UDAF interface */
448-
private[hive] case class HiveUdaf(
448+
private[hive] case class HiveUDAF(
449449
funcWrapper: HiveFunctionWrapper,
450450
children: Seq[Expression]) extends AggregateExpression
451451
with HiveInspectors {
@@ -474,7 +474,7 @@ private[hive] case class HiveUdaf(
474474
s"$nodeName#${funcWrapper.functionClassName}(${children.mkString(",")})"
475475
}
476476

477-
def newInstance(): HiveUdafFunction = new HiveUdafFunction(funcWrapper, children, this, true)
477+
def newInstance(): HiveUDAFFunction = new HiveUDAFFunction(funcWrapper, children, this, true)
478478
}
479479

480480
/**
@@ -488,7 +488,7 @@ private[hive] case class HiveUdaf(
488488
* Operators that require maintaining state in between input rows should instead be implemented as
489489
* user defined aggregations, which have clean semantics even in a partitioned execution.
490490
*/
491-
private[hive] case class HiveGenericUdtf(
491+
private[hive] case class HiveGenericUDTF(
492492
funcWrapper: HiveFunctionWrapper,
493493
children: Seq[Expression])
494494
extends Generator with HiveInspectors {
@@ -553,7 +553,7 @@ private[hive] case class HiveGenericUdtf(
553553
}
554554
}
555555

556-
private[hive] case class HiveUdafFunction(
556+
private[hive] case class HiveUDAFFunction(
557557
funcWrapper: HiveFunctionWrapper,
558558
exprs: Seq[Expression],
559559
base: AggregateExpression,

0 commit comments

Comments
 (0)