This is an automated email from the ASF dual-hosted git repository. jcamacho pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/hive.git
commit a17ad92accf75c9df0901706b8953eccf9dc8a5f Author: Jesus Camacho Rodriguez <[email protected]> AuthorDate: Mon Feb 3 10:30:37 2020 -0800 HIVE-22795: Create new parser and udf module from ql (Jesus Camacho Rodriguez, reviewed by Vineet Garg, Zoltan Haindrich) --- .../java/org/apache/hadoop/hive/ql/ErrorMsg.java | 90 +--------------------- .../java/org/apache/hadoop/hive/ql/lib/Node.java | 0 .../hadoop/hive/ql/lib/NodeProcessorCtx.java | 0 .../hadoop/hive/ql/metadata/HiveException.java | 0 .../hive/ql/metadata/HiveFatalException.java | 0 .../hadoop/hive/ql/parse/SemanticException.java | 0 .../apache/hadoop/hive/ql/parse/ASTErrorNode.java | 0 .../org/apache/hadoop/hive/ql/parse/ASTNode.java | 0 .../apache/hadoop/hive/ql/parse/ASTNodeOrigin.java | 0 .../apache/hadoop/hive/ql/parse/FromClauseParser.g | 0 .../org/apache/hadoop/hive/ql/parse/HintParser.g | 0 .../org/apache/hadoop/hive/ql/parse/HiveLexer.g | 0 .../org/apache/hadoop/hive/ql/parse/HiveParser.g | 0 .../hadoop/hive/ql/parse/IdentifiersParser.g | 0 .../hadoop/hive/ql/parse/ImmutableCommonToken.java | 0 .../apache/hadoop/hive/ql/parse/ParseError.java | 0 .../hadoop/hive/ql/parse/ResourcePlanParser.g | 0 .../hadoop/hive/ql/parse/SelectClauseParser.g | 0 .../{Dispatcher.java => SemanticDispatcher.java} | 3 +- .../{GraphWalker.java => SemanticGraphWalker.java} | 3 +- ...deProcessor.java => SemanticNodeProcessor.java} | 3 +- .../hive/ql/lib/{Rule.java => SemanticRule.java} | 4 +- .../hive/ql/exec/AmbiguousMethodException.java | 0 .../hive/ql/exec/DefaultUDAFEvaluatorResolver.java | 2 +- .../hive/ql/exec/DefaultUDFMethodResolver.java | 2 +- .../apache/hadoop/hive/ql/exec/Description.java | 0 .../hive/ql/exec/NoMatchingMethodException.java | 0 .../java/org/apache/hadoop/hive/ql/exec/UDAF.java | 4 +- .../apache/hadoop/hive/ql/exec/UDAFEvaluator.java | 0 .../hadoop/hive/ql/exec/UDAFEvaluatorResolver.java | 0 .../java/org/apache/hadoop/hive/ql/exec/UDF.java | 12 +-- .../hadoop/hive/ql/exec/UDFArgumentException.java | 0 .../hadoop/hive/ql/exec/UDFMethodResolver.java | 0 .../org/apache/hadoop/hive/ql/udf/UDFType.java | 0 34 files changed, 17 insertions(+), 106 deletions(-) diff --git a/ql/src/java/org/apache/hadoop/hive/ql/ErrorMsg.java b/common/src/java/org/apache/hadoop/hive/ql/ErrorMsg.java similarity index 94% rename from ql/src/java/org/apache/hadoop/hive/ql/ErrorMsg.java rename to common/src/java/org/apache/hadoop/hive/ql/ErrorMsg.java index 467ce50..8e643fe 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/ErrorMsg.java +++ b/common/src/java/org/apache/hadoop/hive/ql/ErrorMsg.java @@ -15,17 +15,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.hadoop.hive.ql; -import org.antlr.runtime.tree.Tree; import org.apache.hadoop.hdfs.protocol.DSQuotaExceededException; import org.apache.hadoop.hdfs.protocol.NSQuotaExceededException; import org.apache.hadoop.hdfs.protocol.UnresolvedPathException; import org.apache.hadoop.hive.conf.HiveConf; -import org.apache.hadoop.hive.ql.ddl.table.AlterTableType; -import org.apache.hadoop.hive.ql.parse.ASTNode; -import org.apache.hadoop.hive.ql.parse.ASTNodeOrigin; import org.apache.hadoop.security.AccessControlException; import java.io.FileNotFoundException; @@ -214,8 +209,7 @@ public enum ErrorMsg { ALTER_COMMAND_FOR_VIEWS(10131, "To alter a view you need to use the ALTER VIEW command."), ALTER_COMMAND_FOR_TABLES(10132, "To alter a base table you need to use the ALTER TABLE command."), ALTER_VIEW_DISALLOWED_OP(10133, "Cannot use this form of ALTER on a view"), - ALTER_TABLE_NON_NATIVE(10134, "ALTER TABLE can only be used for " + AlterTableType.NON_NATIVE_TABLE_ALLOWED + - " to a non-native table "), + ALTER_TABLE_NON_NATIVE(10134, "ALTER TABLE can only be used for {0} to a non-native table {1}", true), SORTMERGE_MAPJOIN_FAILED(10135, "Sort merge bucketed join could not be performed. " + "If you really want to perform the operation, either set " + @@ -777,88 +771,6 @@ public enum ErrorMsg { this.format = format ? new MessageFormat(mesg) : null; } - private static int getLine(ASTNode tree) { - if (tree.getChildCount() == 0) { - return tree.getToken().getLine(); - } - - return getLine((ASTNode) tree.getChild(0)); - } - - private static int getCharPositionInLine(ASTNode tree) { - if (tree.getChildCount() == 0) { - return tree.getToken().getCharPositionInLine(); - } - - return getCharPositionInLine((ASTNode) tree.getChild(0)); - } - - // Dirty hack as this will throw away spaces and other things - find a better - // way! - public static String getText(ASTNode tree) { - if (tree.getChildCount() == 0) { - return tree.getText(); - } - return getText((ASTNode) tree.getChild(tree.getChildCount() - 1)); - } - - public String getMsg(ASTNode tree) { - StringBuilder sb = new StringBuilder(); - renderPosition(sb, tree); - sb.append(" "); - sb.append(mesg); - sb.append(" '"); - sb.append(getText(tree)); - sb.append("'"); - renderOrigin(sb, tree.getOrigin()); - return sb.toString(); - } - - static final String LINE_SEP = System.getProperty("line.separator"); - - public static void renderOrigin(StringBuilder sb, ASTNodeOrigin origin) { - while (origin != null) { - sb.append(" in definition of "); - sb.append(origin.getObjectType()); - sb.append(" "); - sb.append(origin.getObjectName()); - sb.append(" ["); - sb.append(LINE_SEP); - sb.append(origin.getObjectDefinition()); - sb.append(LINE_SEP); - sb.append("] used as "); - sb.append(origin.getUsageAlias()); - sb.append(" at "); - ASTNode usageNode = origin.getUsageNode(); - renderPosition(sb, usageNode); - origin = usageNode.getOrigin(); - } - } - - private static void renderPosition(StringBuilder sb, ASTNode tree) { - sb.append("Line "); - sb.append(getLine(tree)); - sb.append(":"); - sb.append(getCharPositionInLine(tree)); - } - public static String renderPosition(ASTNode n) { - StringBuilder sb = new StringBuilder(); - ErrorMsg.renderPosition(sb, n); - return sb.toString(); - } - - public String getMsg(Tree tree) { - return getMsg((ASTNode) tree); - } - - public String getMsg(ASTNode tree, String reason) { - return getMsg(tree) + ": " + reason; - } - - public String getMsg(Tree tree, String reason) { - return getMsg((ASTNode) tree, reason); - } - public String getMsg(String reason) { return mesg + " " + reason; } diff --git a/ql/src/java/org/apache/hadoop/hive/ql/lib/Node.java b/common/src/java/org/apache/hadoop/hive/ql/lib/Node.java similarity index 100% rename from ql/src/java/org/apache/hadoop/hive/ql/lib/Node.java rename to common/src/java/org/apache/hadoop/hive/ql/lib/Node.java diff --git a/ql/src/java/org/apache/hadoop/hive/ql/lib/NodeProcessorCtx.java b/common/src/java/org/apache/hadoop/hive/ql/lib/NodeProcessorCtx.java similarity index 100% rename from ql/src/java/org/apache/hadoop/hive/ql/lib/NodeProcessorCtx.java rename to common/src/java/org/apache/hadoop/hive/ql/lib/NodeProcessorCtx.java diff --git a/ql/src/java/org/apache/hadoop/hive/ql/metadata/HiveException.java b/common/src/java/org/apache/hadoop/hive/ql/metadata/HiveException.java similarity index 100% rename from ql/src/java/org/apache/hadoop/hive/ql/metadata/HiveException.java rename to common/src/java/org/apache/hadoop/hive/ql/metadata/HiveException.java diff --git a/ql/src/java/org/apache/hadoop/hive/ql/metadata/HiveFatalException.java b/common/src/java/org/apache/hadoop/hive/ql/metadata/HiveFatalException.java similarity index 100% rename from ql/src/java/org/apache/hadoop/hive/ql/metadata/HiveFatalException.java rename to common/src/java/org/apache/hadoop/hive/ql/metadata/HiveFatalException.java diff --git a/ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticException.java b/common/src/java/org/apache/hadoop/hive/ql/parse/SemanticException.java similarity index 100% rename from ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticException.java rename to common/src/java/org/apache/hadoop/hive/ql/parse/SemanticException.java diff --git a/ql/src/java/org/apache/hadoop/hive/ql/parse/ASTErrorNode.java b/parser/src/java/org/apache/hadoop/hive/ql/parse/ASTErrorNode.java similarity index 100% rename from ql/src/java/org/apache/hadoop/hive/ql/parse/ASTErrorNode.java rename to parser/src/java/org/apache/hadoop/hive/ql/parse/ASTErrorNode.java diff --git a/ql/src/java/org/apache/hadoop/hive/ql/parse/ASTNode.java b/parser/src/java/org/apache/hadoop/hive/ql/parse/ASTNode.java similarity index 100% rename from ql/src/java/org/apache/hadoop/hive/ql/parse/ASTNode.java rename to parser/src/java/org/apache/hadoop/hive/ql/parse/ASTNode.java diff --git a/ql/src/java/org/apache/hadoop/hive/ql/parse/ASTNodeOrigin.java b/parser/src/java/org/apache/hadoop/hive/ql/parse/ASTNodeOrigin.java similarity index 100% rename from ql/src/java/org/apache/hadoop/hive/ql/parse/ASTNodeOrigin.java rename to parser/src/java/org/apache/hadoop/hive/ql/parse/ASTNodeOrigin.java diff --git a/ql/src/java/org/apache/hadoop/hive/ql/parse/FromClauseParser.g b/parser/src/java/org/apache/hadoop/hive/ql/parse/FromClauseParser.g similarity index 100% rename from ql/src/java/org/apache/hadoop/hive/ql/parse/FromClauseParser.g rename to parser/src/java/org/apache/hadoop/hive/ql/parse/FromClauseParser.g diff --git a/ql/src/java/org/apache/hadoop/hive/ql/parse/HintParser.g b/parser/src/java/org/apache/hadoop/hive/ql/parse/HintParser.g similarity index 100% rename from ql/src/java/org/apache/hadoop/hive/ql/parse/HintParser.g rename to parser/src/java/org/apache/hadoop/hive/ql/parse/HintParser.g diff --git a/ql/src/java/org/apache/hadoop/hive/ql/parse/HiveLexer.g b/parser/src/java/org/apache/hadoop/hive/ql/parse/HiveLexer.g similarity index 100% rename from ql/src/java/org/apache/hadoop/hive/ql/parse/HiveLexer.g rename to parser/src/java/org/apache/hadoop/hive/ql/parse/HiveLexer.g diff --git a/ql/src/java/org/apache/hadoop/hive/ql/parse/HiveParser.g b/parser/src/java/org/apache/hadoop/hive/ql/parse/HiveParser.g similarity index 100% rename from ql/src/java/org/apache/hadoop/hive/ql/parse/HiveParser.g rename to parser/src/java/org/apache/hadoop/hive/ql/parse/HiveParser.g diff --git a/ql/src/java/org/apache/hadoop/hive/ql/parse/IdentifiersParser.g b/parser/src/java/org/apache/hadoop/hive/ql/parse/IdentifiersParser.g similarity index 100% rename from ql/src/java/org/apache/hadoop/hive/ql/parse/IdentifiersParser.g rename to parser/src/java/org/apache/hadoop/hive/ql/parse/IdentifiersParser.g diff --git a/ql/src/java/org/apache/hadoop/hive/ql/parse/ImmutableCommonToken.java b/parser/src/java/org/apache/hadoop/hive/ql/parse/ImmutableCommonToken.java similarity index 100% rename from ql/src/java/org/apache/hadoop/hive/ql/parse/ImmutableCommonToken.java rename to parser/src/java/org/apache/hadoop/hive/ql/parse/ImmutableCommonToken.java diff --git a/ql/src/java/org/apache/hadoop/hive/ql/parse/ParseError.java b/parser/src/java/org/apache/hadoop/hive/ql/parse/ParseError.java similarity index 100% rename from ql/src/java/org/apache/hadoop/hive/ql/parse/ParseError.java rename to parser/src/java/org/apache/hadoop/hive/ql/parse/ParseError.java diff --git a/ql/src/java/org/apache/hadoop/hive/ql/parse/ResourcePlanParser.g b/parser/src/java/org/apache/hadoop/hive/ql/parse/ResourcePlanParser.g similarity index 100% rename from ql/src/java/org/apache/hadoop/hive/ql/parse/ResourcePlanParser.g rename to parser/src/java/org/apache/hadoop/hive/ql/parse/ResourcePlanParser.g diff --git a/ql/src/java/org/apache/hadoop/hive/ql/parse/SelectClauseParser.g b/parser/src/java/org/apache/hadoop/hive/ql/parse/SelectClauseParser.g similarity index 100% rename from ql/src/java/org/apache/hadoop/hive/ql/parse/SelectClauseParser.g rename to parser/src/java/org/apache/hadoop/hive/ql/parse/SelectClauseParser.g diff --git a/ql/src/java/org/apache/hadoop/hive/ql/lib/Dispatcher.java b/ql/src/java/org/apache/hadoop/hive/ql/lib/SemanticDispatcher.java similarity index 95% rename from ql/src/java/org/apache/hadoop/hive/ql/lib/Dispatcher.java rename to ql/src/java/org/apache/hadoop/hive/ql/lib/SemanticDispatcher.java index 34fd5a4..1ea1d40 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/lib/Dispatcher.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/lib/SemanticDispatcher.java @@ -26,7 +26,7 @@ import org.apache.hadoop.hive.ql.parse.SemanticException; * Dispatcher interface for Operators Used in operator graph walking to dispatch * process/visitor functions for operators. */ -public interface Dispatcher { +public interface SemanticDispatcher extends Dispatcher { /** * Dispatcher function. @@ -41,6 +41,7 @@ public interface Dispatcher { * @return Object The return object from the processing call. * @throws SemanticException */ + @Override Object dispatch(Node nd, Stack<Node> stack, Object... nodeOutputs) throws SemanticException; diff --git a/ql/src/java/org/apache/hadoop/hive/ql/lib/GraphWalker.java b/ql/src/java/org/apache/hadoop/hive/ql/lib/SemanticGraphWalker.java similarity index 95% rename from ql/src/java/org/apache/hadoop/hive/ql/lib/GraphWalker.java rename to ql/src/java/org/apache/hadoop/hive/ql/lib/SemanticGraphWalker.java index 032f1a5..6354420 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/lib/GraphWalker.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/lib/SemanticGraphWalker.java @@ -26,7 +26,7 @@ import org.apache.hadoop.hive.ql.parse.SemanticException; /** * Interface for operator graph walker. */ -public interface GraphWalker { +public interface SemanticGraphWalker extends GraphWalker { /** * starting point for walking. @@ -38,6 +38,7 @@ public interface GraphWalker { * the map from node to objects returned by the processors. * @throws SemanticException */ + @Override void startWalking(Collection<Node> startNodes, HashMap<Node, Object> nodeOutput) throws SemanticException; diff --git a/ql/src/java/org/apache/hadoop/hive/ql/lib/NodeProcessor.java b/ql/src/java/org/apache/hadoop/hive/ql/lib/SemanticNodeProcessor.java similarity index 95% rename from ql/src/java/org/apache/hadoop/hive/ql/lib/NodeProcessor.java rename to ql/src/java/org/apache/hadoop/hive/ql/lib/SemanticNodeProcessor.java index 069a7e1..cfee71d 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/lib/NodeProcessor.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/lib/SemanticNodeProcessor.java @@ -25,7 +25,7 @@ import org.apache.hadoop.hive.ql.parse.SemanticException; * Base class for processing operators which is no-op. The specific processors * can register their own context with the dispatcher. */ -public interface NodeProcessor { +public interface SemanticNodeProcessor extends NodeProcessor { /** * Generic process for all ops that don't have specific implementations. @@ -39,6 +39,7 @@ public interface NodeProcessor { * @return Object to be returned by the process call * @throws SemanticException */ + @Override Object process(Node nd, Stack<Node> stack, NodeProcessorCtx procCtx, Object... nodeOutputs) throws SemanticException; } diff --git a/ql/src/java/org/apache/hadoop/hive/ql/lib/Rule.java b/ql/src/java/org/apache/hadoop/hive/ql/lib/SemanticRule.java similarity index 95% rename from ql/src/java/org/apache/hadoop/hive/ql/lib/Rule.java rename to ql/src/java/org/apache/hadoop/hive/ql/lib/SemanticRule.java index f735eb5..23a6710 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/lib/Rule.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/lib/SemanticRule.java @@ -26,17 +26,19 @@ import org.apache.hadoop.hive.ql.parse.SemanticException; * Rule interface for Operators Used in operator dispatching to dispatch * process/visitor functions for operators. */ -public interface Rule { +public interface SemanticRule extends Rule { /** * @return the cost of the rule - the lower the cost, the better the rule * matches * @throws SemanticException */ + @Override int cost(Stack<Node> stack) throws SemanticException; /** * @return the name of the rule - may be useful for debugging */ + @Override String getName(); } diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/AmbiguousMethodException.java b/udf/src/java/org/apache/hadoop/hive/ql/exec/AmbiguousMethodException.java similarity index 100% rename from ql/src/java/org/apache/hadoop/hive/ql/exec/AmbiguousMethodException.java rename to udf/src/java/org/apache/hadoop/hive/ql/exec/AmbiguousMethodException.java diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/DefaultUDAFEvaluatorResolver.java b/udf/src/java/org/apache/hadoop/hive/ql/exec/DefaultUDAFEvaluatorResolver.java similarity index 97% rename from ql/src/java/org/apache/hadoop/hive/ql/exec/DefaultUDAFEvaluatorResolver.java rename to udf/src/java/org/apache/hadoop/hive/ql/exec/DefaultUDAFEvaluatorResolver.java index 30afba7..2366b6b 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/exec/DefaultUDAFEvaluatorResolver.java +++ b/udf/src/java/org/apache/hadoop/hive/ql/exec/DefaultUDAFEvaluatorResolver.java @@ -80,7 +80,7 @@ public class DefaultUDAFEvaluatorResolver implements UDAFEvaluatorResolver { } } - Method m = FunctionRegistry.getMethodInternal(udafClass, mList, false, argClasses); + Method m = MethodUtils.getMethodInternal(udafClass, mList, false, argClasses); // Find the class that has this method. // Note that Method.getDeclaringClass() may not work here because the method diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/DefaultUDFMethodResolver.java b/udf/src/java/org/apache/hadoop/hive/ql/exec/DefaultUDFMethodResolver.java similarity index 96% rename from ql/src/java/org/apache/hadoop/hive/ql/exec/DefaultUDFMethodResolver.java rename to udf/src/java/org/apache/hadoop/hive/ql/exec/DefaultUDFMethodResolver.java index 23c753f..9749126 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/exec/DefaultUDFMethodResolver.java +++ b/udf/src/java/org/apache/hadoop/hive/ql/exec/DefaultUDFMethodResolver.java @@ -56,7 +56,7 @@ public class DefaultUDFMethodResolver implements UDFMethodResolver { */ @Override public Method getEvalMethod(List<TypeInfo> argClasses) throws UDFArgumentException { - return FunctionRegistry.getMethodInternal(udfClass, "evaluate", false, + return MethodUtils.getMethodInternal(udfClass, "evaluate", false, argClasses); } } diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/Description.java b/udf/src/java/org/apache/hadoop/hive/ql/exec/Description.java similarity index 100% rename from ql/src/java/org/apache/hadoop/hive/ql/exec/Description.java rename to udf/src/java/org/apache/hadoop/hive/ql/exec/Description.java diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/NoMatchingMethodException.java b/udf/src/java/org/apache/hadoop/hive/ql/exec/NoMatchingMethodException.java similarity index 100% rename from ql/src/java/org/apache/hadoop/hive/ql/exec/NoMatchingMethodException.java rename to udf/src/java/org/apache/hadoop/hive/ql/exec/NoMatchingMethodException.java diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/UDAF.java b/udf/src/java/org/apache/hadoop/hive/ql/exec/UDAF.java similarity index 95% rename from ql/src/java/org/apache/hadoop/hive/ql/exec/UDAF.java rename to udf/src/java/org/apache/hadoop/hive/ql/exec/UDAF.java index dc33a08..f98cca5 100755 --- a/ql/src/java/org/apache/hadoop/hive/ql/exec/UDAF.java +++ b/udf/src/java/org/apache/hadoop/hive/ql/exec/UDAF.java @@ -66,8 +66,8 @@ package org.apache.hadoop.hive.ql.exec; * <li>public boolean aggregatePartial(String partial);</li> * </ul> * - * @deprecated Either implement {@link org.apache.hadoop.hive.ql.udf.generic.GenericUDAFResolver2} or extend - * {@link org.apache.hadoop.hive.ql.udf.generic.AbstractGenericUDAFResolver} instead. + * @deprecated Either implement org.apache.hadoop.hive.ql.udf.generic.GenericUDAFResolver2 or extend + * org.apache.hadoop.hive.ql.udf.generic.AbstractGenericUDAFResolver instead. */ @Deprecated public class UDAF { diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/UDAFEvaluator.java b/udf/src/java/org/apache/hadoop/hive/ql/exec/UDAFEvaluator.java similarity index 100% rename from ql/src/java/org/apache/hadoop/hive/ql/exec/UDAFEvaluator.java rename to udf/src/java/org/apache/hadoop/hive/ql/exec/UDAFEvaluator.java diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/UDAFEvaluatorResolver.java b/udf/src/java/org/apache/hadoop/hive/ql/exec/UDAFEvaluatorResolver.java similarity index 100% rename from ql/src/java/org/apache/hadoop/hive/ql/exec/UDAFEvaluatorResolver.java rename to udf/src/java/org/apache/hadoop/hive/ql/exec/UDAFEvaluatorResolver.java diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/UDF.java b/udf/src/java/org/apache/hadoop/hive/ql/exec/UDF.java similarity index 87% rename from ql/src/java/org/apache/hadoop/hive/ql/exec/UDF.java rename to udf/src/java/org/apache/hadoop/hive/ql/exec/UDF.java index 9e7fd50..40b64b3 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/exec/UDF.java +++ b/udf/src/java/org/apache/hadoop/hive/ql/exec/UDF.java @@ -23,8 +23,8 @@ import org.apache.hadoop.hive.ql.udf.UDFType; /** * A User-defined function (UDF) for use with Hive. * <p> - * New UDF classes need to inherit from this UDF class (or from {@link - * org.apache.hadoop.hive.ql.udf.generic.GenericUDF GenericUDF} which provides more flexibility at + * New UDF classes need to inherit from this UDF class (or from + * org.apache.hadoop.hive.ql.udf.generic.GenericUDF GenericUDF which provides more flexibility at * the cost of more complexity). * <p> * Requirements for all classes extending this UDF are: @@ -53,7 +53,7 @@ import org.apache.hadoop.hive.ql.udf.UDFType; * @see Description * @see UDFType * - * @deprecated use {@link org.apache.hadoop.hive.ql.udf.generic.GenericUDF} + * @deprecated use org.apache.hadoop.hive.ql.udf.generic.GenericUDF */ @Deprecated @UDFType(deterministic = true) @@ -97,9 +97,6 @@ public class UDF { /** * This can be overridden to include JARs required by this UDF. * - * @see org.apache.hadoop.hive.ql.udf.generic.GenericUDF#getRequiredJars() - * GenericUDF.getRequiredJars() - * * @return an array of paths to files to include, {@code null} by default. */ public String[] getRequiredJars() { @@ -109,9 +106,6 @@ public class UDF { /** * This can be overridden to include files required by this UDF. * - * @see org.apache.hadoop.hive.ql.udf.generic.GenericUDF#getRequiredFiles() - * GenericUDF.getRequiredFiles() - * * @return an array of paths to files to include, {@code null} by default. */ public String[] getRequiredFiles() { diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/UDFArgumentException.java b/udf/src/java/org/apache/hadoop/hive/ql/exec/UDFArgumentException.java similarity index 100% rename from ql/src/java/org/apache/hadoop/hive/ql/exec/UDFArgumentException.java rename to udf/src/java/org/apache/hadoop/hive/ql/exec/UDFArgumentException.java diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/UDFMethodResolver.java b/udf/src/java/org/apache/hadoop/hive/ql/exec/UDFMethodResolver.java similarity index 100% rename from ql/src/java/org/apache/hadoop/hive/ql/exec/UDFMethodResolver.java rename to udf/src/java/org/apache/hadoop/hive/ql/exec/UDFMethodResolver.java diff --git a/ql/src/java/org/apache/hadoop/hive/ql/udf/UDFType.java b/udf/src/java/org/apache/hadoop/hive/ql/udf/UDFType.java similarity index 100% rename from ql/src/java/org/apache/hadoop/hive/ql/udf/UDFType.java rename to udf/src/java/org/apache/hadoop/hive/ql/udf/UDFType.java
