You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by jd...@apache.org on 2015/02/13 20:37:42 UTC
svn commit: r1659656 - in /hive/trunk:
contrib/src/java/org/apache/hadoop/hive/contrib/genericudf/example/
itests/util/src/main/java/org/apache/hadoop/hive/ql/udf/generic/
ql/src/java/org/apache/hadoop/hive/ql/udf/generic/
ql/src/test/results/clientpos...
Author: jdere
Date: Fri Feb 13 19:37:41 2015
New Revision: 1659656
URL: http://svn.apache.org/r1659656
Log:
HIVE-9596: move standard getDisplayString impl to GenericUDF (Alexander Pivovarov via Jason Dere)
Modified:
hive/trunk/contrib/src/java/org/apache/hadoop/hive/contrib/genericudf/example/GenericUDFDBOutput.java
hive/trunk/itests/util/src/main/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFEvaluateNPE.java
hive/trunk/itests/util/src/main/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFTestGetJavaBoolean.java
hive/trunk/itests/util/src/main/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFTestGetJavaString.java
hive/trunk/itests/util/src/main/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFTestTranslate.java
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/AbstractGenericUDFEWAHBitmapBop.java
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/AbstractGenericUDFReflect.java
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDF.java
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFAbs.java
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFAddMonths.java
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFArray.java
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFAssertTrue.java
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFBaseNumeric.java
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFBasePad.java
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFBaseTrim.java
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFCoalesce.java
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFConcat.java
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFConcatWS.java
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFDate.java
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFDateAdd.java
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFDateDiff.java
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFDateSub.java
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFDecode.java
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFEWAHBitmapEmpty.java
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFElt.java
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFEncode.java
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFField.java
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFFloorCeilBase.java
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFFormatNumber.java
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFGreatest.java
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFHash.java
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFIf.java
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFInFile.java
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFInitCap.java
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFInstr.java
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFLastDay.java
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFLeadLag.java
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFLocate.java
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFLower.java
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFMacro.java
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFMapKeys.java
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFMapValues.java
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFNamedStruct.java
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFPower.java
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFPrintf.java
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFRound.java
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFSentences.java
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFSize.java
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFSortArray.java
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFSplit.java
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFStringToMap.java
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFStruct.java
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFTranslate.java
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFUpper.java
hive/trunk/ql/src/test/results/clientpositive/udf_instr.q.out
hive/trunk/ql/src/test/results/clientpositive/udf_locate.q.out
Modified: hive/trunk/contrib/src/java/org/apache/hadoop/hive/contrib/genericudf/example/GenericUDFDBOutput.java
URL: http://svn.apache.org/viewvc/hive/trunk/contrib/src/java/org/apache/hadoop/hive/contrib/genericudf/example/GenericUDFDBOutput.java?rev=1659656&r1=1659655&r2=1659656&view=diff
==============================================================================
--- hive/trunk/contrib/src/java/org/apache/hadoop/hive/contrib/genericudf/example/GenericUDFDBOutput.java (original)
+++ hive/trunk/contrib/src/java/org/apache/hadoop/hive/contrib/genericudf/example/GenericUDFDBOutput.java Fri Feb 13 19:37:41 2015
@@ -29,7 +29,6 @@ import org.apache.hadoop.hive.ql.exec.UD
import org.apache.hadoop.hive.ql.metadata.HiveException;
import org.apache.hadoop.hive.ql.udf.UDFType;
import org.apache.hadoop.hive.ql.udf.generic.GenericUDF;
-import org.apache.hadoop.hive.ql.udf.generic.GenericUDFUtils;
import org.apache.hadoop.hive.serde.serdeConstants;
import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspector;
import org.apache.hadoop.hive.serde2.objectinspector.PrimitiveObjectInspector;
@@ -159,17 +158,7 @@ public class GenericUDFDBOutput extends
@Override
public String getDisplayString(String[] children) {
- StringBuilder sb = new StringBuilder();
- sb.append("dboutput(");
- if (children.length > 0) {
- sb.append(children[0]);
- for (int i = 1; i < children.length; i++) {
- sb.append(",");
- sb.append(children[i]);
- }
- }
- sb.append(")");
- return sb.toString();
+ return getStandardDisplayString("dboutput", children, ",");
}
}
Modified: hive/trunk/itests/util/src/main/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFEvaluateNPE.java
URL: http://svn.apache.org/viewvc/hive/trunk/itests/util/src/main/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFEvaluateNPE.java?rev=1659656&r1=1659655&r2=1659656&view=diff
==============================================================================
--- hive/trunk/itests/util/src/main/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFEvaluateNPE.java (original)
+++ hive/trunk/itests/util/src/main/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFEvaluateNPE.java Fri Feb 13 19:37:41 2015
@@ -76,6 +76,6 @@ public class GenericUDFEvaluateNPE exten
@Override
public String getDisplayString(String[] children) {
assert (children.length == 1);
- return "evaluate_npe(" + children[0] + ")";
+ return getStandardDisplayString("evaluate_npe", children);
}
}
Modified: hive/trunk/itests/util/src/main/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFTestGetJavaBoolean.java
URL: http://svn.apache.org/viewvc/hive/trunk/itests/util/src/main/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFTestGetJavaBoolean.java?rev=1659656&r1=1659655&r2=1659656&view=diff
==============================================================================
--- hive/trunk/itests/util/src/main/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFTestGetJavaBoolean.java (original)
+++ hive/trunk/itests/util/src/main/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFTestGetJavaBoolean.java Fri Feb 13 19:37:41 2015
@@ -54,6 +54,6 @@ public class GenericUDFTestGetJavaBoolea
@Override
public String getDisplayString(String[] children) {
assert (children.length == 1);
- return "TestGetJavaBoolean(" + children[0] + ")";
+ return getStandardDisplayString("TestGetJavaBoolean", children);
}
}
Modified: hive/trunk/itests/util/src/main/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFTestGetJavaString.java
URL: http://svn.apache.org/viewvc/hive/trunk/itests/util/src/main/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFTestGetJavaString.java?rev=1659656&r1=1659655&r2=1659656&view=diff
==============================================================================
--- hive/trunk/itests/util/src/main/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFTestGetJavaString.java (original)
+++ hive/trunk/itests/util/src/main/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFTestGetJavaString.java Fri Feb 13 19:37:41 2015
@@ -50,6 +50,6 @@ public class GenericUDFTestGetJavaString
@Override
public String getDisplayString(String[] children) {
assert (children.length == 1);
- return "GenericUDFTestGetJavaString(" + children[0] + ")";
+ return getStandardDisplayString("GenericUDFTestGetJavaString", children);
}
}
Modified: hive/trunk/itests/util/src/main/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFTestTranslate.java
URL: http://svn.apache.org/viewvc/hive/trunk/itests/util/src/main/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFTestTranslate.java?rev=1659656&r1=1659655&r2=1659656&view=diff
==============================================================================
--- hive/trunk/itests/util/src/main/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFTestTranslate.java (original)
+++ hive/trunk/itests/util/src/main/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFTestTranslate.java Fri Feb 13 19:37:41 2015
@@ -119,7 +119,6 @@ public class GenericUDFTestTranslate ext
@Override
public String getDisplayString(String[] children) {
assert (children.length == 3);
- return "translate(" + children[0] + "," + children[1] + "," + children[2]
- + ")";
+ return getStandardDisplayString("translate", children, ",");
}
}
Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/AbstractGenericUDFEWAHBitmapBop.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/AbstractGenericUDFEWAHBitmapBop.java?rev=1659656&r1=1659655&r2=1659656&view=diff
==============================================================================
--- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/AbstractGenericUDFEWAHBitmapBop.java (original)
+++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/AbstractGenericUDFEWAHBitmapBop.java Fri Feb 13 19:37:41 2015
@@ -141,16 +141,6 @@ abstract public class AbstractGenericUDF
@Override
public String getDisplayString(String[] children) {
- StringBuilder sb = new StringBuilder();
- sb.append(name);
- sb.append("(");
- for (int i = 0; i < children.length; i++) {
- sb.append(children[i]);
- if (i + 1 != children.length) {
- sb.append(",");
- }
- }
- sb.append(")");
- return sb.toString();
+ return getStandardDisplayString(name, children, ",");
}
}
Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/AbstractGenericUDFReflect.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/AbstractGenericUDFReflect.java?rev=1659656&r1=1659655&r2=1659656&view=diff
==============================================================================
--- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/AbstractGenericUDFReflect.java (original)
+++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/AbstractGenericUDFReflect.java Fri Feb 13 19:37:41 2015
@@ -101,16 +101,7 @@ public abstract class AbstractGenericUDF
@Override
public String getDisplayString(String[] children) {
- StringBuilder sb = new StringBuilder();
- sb.append(functionName()).append('(');
- for (int i = 0; i < children.length; i++) {
- if (i > 0) {
- sb.append(',');
- }
- sb.append(children[i]);
- }
- sb.append(')');
- return sb.toString();
+ return getStandardDisplayString(functionName(), children, ",");
}
protected abstract String functionName();
Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDF.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDF.java?rev=1659656&r1=1659655&r2=1659656&view=diff
==============================================================================
--- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDF.java (original)
+++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDF.java Fri Feb 13 19:37:41 2015
@@ -210,4 +210,23 @@ public abstract class GenericUDF impleme
+ " and " + newInstance.getClass().getName());
}
}
+
+ protected String getStandardDisplayString(String name, String[] children) {
+ return getStandardDisplayString(name, children, ", ");
+ }
+
+ protected String getStandardDisplayString(String name, String[] children, String delim) {
+ StringBuilder sb = new StringBuilder();
+ sb.append(name);
+ sb.append("(");
+ if (children.length > 0) {
+ sb.append(children[0]);
+ for (int i = 1; i < children.length; i++) {
+ sb.append(delim);
+ sb.append(children[i]);
+ }
+ }
+ sb.append(")");
+ return sb.toString();
+ }
}
Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFAbs.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFAbs.java?rev=1659656&r1=1659655&r2=1659656&view=diff
==============================================================================
--- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFAbs.java (original)
+++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFAbs.java Fri Feb 13 19:37:41 2015
@@ -150,17 +150,7 @@ public class GenericUDFAbs extends Gener
@Override
public String getDisplayString(String[] children) {
- StringBuilder sb = new StringBuilder();
- sb.append("abs(");
- if (children.length > 0) {
- sb.append(children[0]);
- for (int i = 1; i < children.length; i++) {
- sb.append(",");
- sb.append(children[i]);
- }
- }
- sb.append(")");
- return sb.toString();
+ return getStandardDisplayString("abs", children);
}
}
Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFAddMonths.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFAddMonths.java?rev=1659656&r1=1659655&r2=1659656&view=diff
==============================================================================
--- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFAddMonths.java (original)
+++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFAddMonths.java Fri Feb 13 19:37:41 2015
@@ -156,17 +156,7 @@ public class GenericUDFAddMonths extends
@Override
public String getDisplayString(String[] children) {
- StringBuilder sb = new StringBuilder();
- sb.append("add_months(");
- if (children.length > 0) {
- sb.append(children[0]);
- for (int i = 1; i < children.length; i++) {
- sb.append(", ");
- sb.append(children[i]);
- }
- }
- sb.append(")");
- return sb.toString();
+ return getStandardDisplayString("add_months", children);
}
protected Calendar addMonth(Date d, int numMonths) {
Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFArray.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFArray.java?rev=1659656&r1=1659655&r2=1659656&view=diff
==============================================================================
--- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFArray.java (original)
+++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFArray.java Fri Feb 13 19:37:41 2015
@@ -80,15 +80,6 @@ public class GenericUDFArray extends Gen
@Override
public String getDisplayString(String[] children) {
- StringBuilder sb = new StringBuilder();
- sb.append("array(");
- for (int i = 0; i < children.length; i++) {
- sb.append(children[i]);
- if (i + 1 != children.length) {
- sb.append(",");
- }
- }
- sb.append(")");
- return sb.toString();
+ return getStandardDisplayString("array", children, ",");
}
}
Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFAssertTrue.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFAssertTrue.java?rev=1659656&r1=1659655&r2=1659656&view=diff
==============================================================================
--- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFAssertTrue.java (original)
+++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFAssertTrue.java Fri Feb 13 19:37:41 2015
@@ -75,15 +75,6 @@ public class GenericUDFAssertTrue extend
@Override
public String getDisplayString(String[] children) {
- StringBuilder sb = new StringBuilder();
- sb.append("assert_true(");
- for (int i = 0; i < children.length; ++i) {
- sb.append(children[i]);
- if (i != children.length - 1) {
- sb.append(", ");
- }
- }
- sb.append(")");
- return sb.toString();
+ return getStandardDisplayString("assert_true", children);
}
}
Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFBaseNumeric.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFBaseNumeric.java?rev=1659656&r1=1659655&r2=1659656&view=diff
==============================================================================
--- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFBaseNumeric.java (original)
+++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFBaseNumeric.java Fri Feb 13 19:37:41 2015
@@ -22,7 +22,6 @@ import java.util.ArrayList;
import java.util.List;
import org.apache.hadoop.hive.common.type.HiveDecimal;
-import org.apache.hadoop.hive.conf.HiveConf;
import org.apache.hadoop.hive.ql.exec.Description;
import org.apache.hadoop.hive.ql.exec.FunctionRegistry;
import org.apache.hadoop.hive.ql.exec.NoMatchingMethodException;
Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFBasePad.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFBasePad.java?rev=1659656&r1=1659655&r2=1659656&view=diff
==============================================================================
--- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFBasePad.java (original)
+++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFBasePad.java Fri Feb 13 19:37:41 2015
@@ -18,16 +18,15 @@
package org.apache.hadoop.hive.ql.udf.generic;
-import org.apache.commons.lang.StringUtils;
import org.apache.hadoop.hive.ql.exec.UDFArgumentException;
import org.apache.hadoop.hive.ql.exec.UDFArgumentTypeException;
import org.apache.hadoop.hive.ql.metadata.HiveException;
import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspector;
import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspectorConverters;
-import org.apache.hadoop.hive.serde2.objectinspector.PrimitiveObjectInspector;
-import org.apache.hadoop.hive.serde2.objectinspector.primitive.PrimitiveObjectInspectorFactory;
import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspectorConverters.Converter;
+import org.apache.hadoop.hive.serde2.objectinspector.PrimitiveObjectInspector;
import org.apache.hadoop.hive.serde2.objectinspector.PrimitiveObjectInspector.PrimitiveCategory;
+import org.apache.hadoop.hive.serde2.objectinspector.primitive.PrimitiveObjectInspectorFactory;
import org.apache.hadoop.io.IntWritable;
import org.apache.hadoop.io.Text;
@@ -85,7 +84,7 @@ public abstract class GenericUDFBasePad
@Override
public String getDisplayString(String[] children) {
- return udfName + "(" + StringUtils.join(children, ", ") + ")";
+ return getStandardDisplayString(udfName, children);
}
protected abstract void performOp(byte[] data, byte[] txt, byte[] padTxt, int len, Text str,
Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFBaseTrim.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFBaseTrim.java?rev=1659656&r1=1659655&r2=1659656&view=diff
==============================================================================
--- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFBaseTrim.java (original)
+++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFBaseTrim.java Fri Feb 13 19:37:41 2015
@@ -78,7 +78,7 @@ public abstract class GenericUDFBaseTrim
@Override
public String getDisplayString(String[] children) {
- return udfName + "(" + StringUtils.join(children, ", ") + ")";
+ return getStandardDisplayString(udfName, children);
}
protected abstract String performOp(String val);
Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFCoalesce.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFCoalesce.java?rev=1659656&r1=1659655&r2=1659656&view=diff
==============================================================================
--- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFCoalesce.java (original)
+++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFCoalesce.java Fri Feb 13 19:37:41 2015
@@ -69,17 +69,7 @@ public class GenericUDFCoalesce extends
@Override
public String getDisplayString(String[] children) {
- StringBuilder sb = new StringBuilder();
- sb.append("COALESCE(");
- if (children.length > 0) {
- sb.append(children[0]);
- for (int i = 1; i < children.length; i++) {
- sb.append(",");
- sb.append(children[i]);
- }
- }
- sb.append(")");
- return sb.toString();
+ return getStandardDisplayString("COALESCE", children, ",");
}
}
Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFConcat.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFConcat.java?rev=1659656&r1=1659655&r2=1659656&view=diff
==============================================================================
--- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFConcat.java (original)
+++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFConcat.java Fri Feb 13 19:37:41 2015
@@ -205,17 +205,7 @@ public class GenericUDFConcat extends Ge
@Override
public String getDisplayString(String[] children) {
- StringBuilder sb = new StringBuilder();
- sb.append("concat(");
- if (children.length > 0) {
- sb.append(children[0]);
- for (int i = 1; i < children.length; i++) {
- sb.append(", ");
- sb.append(children[i]);
- }
- }
- sb.append(")");
- return sb.toString();
+ return getStandardDisplayString("concat", children);
}
}
Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFConcatWS.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFConcatWS.java?rev=1659656&r1=1659655&r2=1659656&view=diff
==============================================================================
--- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFConcatWS.java (original)
+++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFConcatWS.java Fri Feb 13 19:37:41 2015
@@ -142,12 +142,6 @@ public class GenericUDFConcatWS extends
@Override
public String getDisplayString(String[] children) {
assert (children.length >= 2);
- StringBuilder sb = new StringBuilder();
- sb.append("concat_ws(");
- for (int i = 0; i < children.length - 1; i++) {
- sb.append(children[i]).append(", ");
- }
- sb.append(children[children.length - 1]).append(")");
- return sb.toString();
+ return getStandardDisplayString("concat_ws", children);
}
}
Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFDate.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFDate.java?rev=1659656&r1=1659655&r2=1659656&view=diff
==============================================================================
--- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFDate.java (original)
+++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFDate.java Fri Feb 13 19:37:41 2015
@@ -131,17 +131,7 @@ public class GenericUDFDate extends Gene
@Override
public String getDisplayString(String[] children) {
- StringBuilder sb = new StringBuilder();
- sb.append("to_date(");
- if (children.length > 0) {
- sb.append(children[0]);
- for (int i = 1; i < children.length; i++) {
- sb.append(", ");
- sb.append(children[i]);
- }
- }
- sb.append(")");
- return sb.toString();
+ return getStandardDisplayString("to_date", children);
}
}
Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFDateAdd.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFDateAdd.java?rev=1659656&r1=1659655&r2=1659656&view=diff
==============================================================================
--- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFDateAdd.java (original)
+++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFDateAdd.java Fri Feb 13 19:37:41 2015
@@ -196,16 +196,6 @@ public class GenericUDFDateAdd extends G
@Override
public String getDisplayString(String[] children) {
- StringBuilder sb = new StringBuilder();
- sb.append("date_add(");
- if (children.length > 0) {
- sb.append(children[0]);
- for (int i = 1; i < children.length; i++) {
- sb.append(", ");
- sb.append(children[i]);
- }
- }
- sb.append(")");
- return sb.toString();
+ return getStandardDisplayString("date_add", children);
}
}
Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFDateDiff.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFDateDiff.java?rev=1659656&r1=1659655&r2=1659656&view=diff
==============================================================================
--- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFDateDiff.java (original)
+++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFDateDiff.java Fri Feb 13 19:37:41 2015
@@ -96,17 +96,7 @@ public class GenericUDFDateDiff extends
@Override
public String getDisplayString(String[] children) {
- StringBuilder sb = new StringBuilder();
- sb.append("datediff(");
- if (children.length > 0) {
- sb.append(children[0]);
- for (int i = 1; i < children.length; i++) {
- sb.append(", ");
- sb.append(children[i]);
- }
- }
- sb.append(")");
- return sb.toString();
+ return getStandardDisplayString("datediff", children);
}
private Date convertToDate(PrimitiveCategory inputType, Converter converter, DeferredObject argument)
Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFDateSub.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFDateSub.java?rev=1659656&r1=1659655&r2=1659656&view=diff
==============================================================================
--- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFDateSub.java (original)
+++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFDateSub.java Fri Feb 13 19:37:41 2015
@@ -196,16 +196,6 @@ public class GenericUDFDateSub extends G
@Override
public String getDisplayString(String[] children) {
- StringBuilder sb = new StringBuilder();
- sb.append("date_sub(");
- if (children.length > 0) {
- sb.append(children[0]);
- for (int i = 1; i < children.length; i++) {
- sb.append(", ");
- sb.append(children[i]);
- }
- }
- sb.append(")");
- return sb.toString();
+ return getStandardDisplayString("date_sub", children);
}
}
Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFDecode.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFDecode.java?rev=1659656&r1=1659655&r2=1659656&view=diff
==============================================================================
--- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFDecode.java (original)
+++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFDecode.java Fri Feb 13 19:37:41 2015
@@ -113,10 +113,6 @@ public class GenericUDFDecode extends Ge
@Override
public String getDisplayString(String[] children) {
assert (children.length == 2);
- StringBuilder sb = new StringBuilder();
- sb.append("decode(");
- sb.append(children[0]).append(",");
- sb.append(children[1]).append(")");
- return sb.toString();
+ return getStandardDisplayString("decode", children, ",");
}
}
Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFEWAHBitmapEmpty.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFEWAHBitmapEmpty.java?rev=1659656&r1=1659655&r2=1659656&view=diff
==============================================================================
--- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFEWAHBitmapEmpty.java (original)
+++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFEWAHBitmapEmpty.java Fri Feb 13 19:37:41 2015
@@ -95,15 +95,6 @@ public ObjectInspector initialize(Object
@Override
public String getDisplayString(String[] children) {
- StringBuilder sb = new StringBuilder();
- sb.append("EWAH_BITMAP_EMPTY(");
- for (int i = 0; i < children.length; i++) {
- sb.append(children[i]);
- if (i + 1 != children.length) {
- sb.append(",");
- }
- }
- sb.append(")");
- return sb.toString();
+ return getStandardDisplayString("EWAH_BITMAP_EMPTY", children);
}
}
Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFElt.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFElt.java?rev=1659656&r1=1659655&r2=1659656&view=diff
==============================================================================
--- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFElt.java (original)
+++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFElt.java Fri Feb 13 19:37:41 2015
@@ -92,12 +92,6 @@ public class GenericUDFElt extends Gener
@Override
public String getDisplayString(String[] children) {
assert (children.length >= 2);
- StringBuilder sb = new StringBuilder();
- sb.append("elt(");
- for (int i = 0; i < children.length - 1; i++) {
- sb.append(children[i]).append(", ");
- }
- sb.append(children[children.length - 1]).append(")");
- return sb.toString();
+ return getStandardDisplayString("elt", children);
}
}
Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFEncode.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFEncode.java?rev=1659656&r1=1659655&r2=1659656&view=diff
==============================================================================
--- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFEncode.java (original)
+++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFEncode.java Fri Feb 13 19:37:41 2015
@@ -113,10 +113,6 @@ public class GenericUDFEncode extends Ge
@Override
public String getDisplayString(String[] children) {
assert (children.length == 2);
- StringBuilder sb = new StringBuilder();
- sb.append("encode(");
- sb.append(children[0]).append(",");
- sb.append(children[1]).append(")");
- return sb.toString();
+ return getStandardDisplayString("encode", children, ",");
}
}
Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFField.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFField.java?rev=1659656&r1=1659655&r2=1659656&view=diff
==============================================================================
--- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFField.java (original)
+++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFField.java Fri Feb 13 19:37:41 2015
@@ -90,12 +90,6 @@ public class GenericUDFField extends Gen
@Override
public String getDisplayString(String[] children) {
assert (children.length >= 2);
-
- final StringBuilder sb = new StringBuilder();
- sb.append("field(");
- sb.append(StringUtils.join(children, ", "));
- sb.append(")");
-
- return sb.toString();
+ return getStandardDisplayString("field", children);
}
}
Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFFloorCeilBase.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFFloorCeilBase.java?rev=1659656&r1=1659655&r2=1659656&view=diff
==============================================================================
--- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFFloorCeilBase.java (original)
+++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFFloorCeilBase.java Fri Feb 13 19:37:41 2015
@@ -128,7 +128,7 @@ public abstract class GenericUDFFloorCei
@Override
public String getDisplayString(String[] children) {
assert (children.length == 1);
- return opDisplayName + "(" + children[0] + ")";
+ return getStandardDisplayString(opDisplayName, children);
}
}
Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFFormatNumber.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFFormatNumber.java?rev=1659656&r1=1659655&r2=1659656&view=diff
==============================================================================
--- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFFormatNumber.java (original)
+++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFFormatNumber.java Fri Feb 13 19:37:41 2015
@@ -220,12 +220,6 @@ public class GenericUDFFormatNumber exte
@Override
public String getDisplayString(String[] children) {
assert (children.length == 2);
- StringBuilder sb = new StringBuilder();
- sb.append("format_number(");
- for (int i = 0; i < children.length - 1; i++) {
- sb.append(children[i]).append(", ");
- }
- sb.append(children[children.length - 1]).append(")");
- return sb.toString();
+ return getStandardDisplayString("format_number", children);
}
}
Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFGreatest.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFGreatest.java?rev=1659656&r1=1659655&r2=1659656&view=diff
==============================================================================
--- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFGreatest.java (original)
+++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFGreatest.java Fri Feb 13 19:37:41 2015
@@ -94,17 +94,7 @@ public class GenericUDFGreatest extends
@Override
public String getDisplayString(String[] children) {
- StringBuilder sb = new StringBuilder();
- sb.append(getFuncName()).append("(");
- if (children.length > 0) {
- sb.append(children[0]);
- for (int i = 1; i < children.length; i++) {
- sb.append(",");
- sb.append(children[i]);
- }
- }
- sb.append(")");
- return sb.toString();
+ return getStandardDisplayString(getFuncName(), children, ",");
}
protected String getFuncName() {
Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFHash.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFHash.java?rev=1659656&r1=1659655&r2=1659656&view=diff
==============================================================================
--- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFHash.java (original)
+++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFHash.java Fri Feb 13 19:37:41 2015
@@ -58,7 +58,7 @@ public class GenericUDFHash extends Gene
@Override
public String getDisplayString(String[] children) {
- return "hash(" + StringUtils.join(children, ',') + ")";
+ return getStandardDisplayString("hash", children, ",");
}
}
Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFIf.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFIf.java?rev=1659656&r1=1659655&r2=1659656&view=diff
==============================================================================
--- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFIf.java (original)
+++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFIf.java Fri Feb 13 19:37:41 2015
@@ -139,11 +139,6 @@ public class GenericUDFIf extends Generi
@Override
public String getDisplayString(String[] children) {
assert (children.length == 3);
- StringBuilder sb = new StringBuilder();
- sb.append("if(");
- sb.append(children[0]).append(", ");
- sb.append(children[1]).append(", ");
- sb.append(children[2]).append(")");
- return sb.toString();
+ return getStandardDisplayString("if", children);
}
}
Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFInFile.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFInFile.java?rev=1659656&r1=1659655&r2=1659656&view=diff
==============================================================================
--- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFInFile.java (original)
+++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFInFile.java Fri Feb 13 19:37:41 2015
@@ -165,6 +165,6 @@ public class GenericUDFInFile extends Ge
@Override
public String getDisplayString(String[] children) {
assert (children.length == 2);
- return "in_file(" + children[0] + ", " + children[1] + ")";
+ return getStandardDisplayString("in_file", children);
}
}
Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFInitCap.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFInitCap.java?rev=1659656&r1=1659655&r2=1659656&view=diff
==============================================================================
--- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFInitCap.java (original)
+++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFInitCap.java Fri Feb 13 19:37:41 2015
@@ -108,16 +108,6 @@ public class GenericUDFInitCap extends G
@Override
public String getDisplayString(String[] children) {
- StringBuilder sb = new StringBuilder();
- sb.append("initcap(");
- if (children.length > 0) {
- sb.append(children[0]);
- for (int i = 1; i < children.length; i++) {
- sb.append(",");
- sb.append(children[i]);
- }
- }
- sb.append(")");
- return sb.toString();
+ return getStandardDisplayString("initcap", children);
}
}
\ No newline at end of file
Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFInstr.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFInstr.java?rev=1659656&r1=1659655&r2=1659656&view=diff
==============================================================================
--- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFInstr.java (original)
+++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFInstr.java Fri Feb 13 19:37:41 2015
@@ -93,6 +93,6 @@ public class GenericUDFInstr extends Gen
@Override
public String getDisplayString(String[] children) {
assert (children.length == 2);
- return "instr(" + children[0] + children[1] + ")";
+ return getStandardDisplayString("instr", children);
}
}
Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFLastDay.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFLastDay.java?rev=1659656&r1=1659655&r2=1659656&view=diff
==============================================================================
--- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFLastDay.java (original)
+++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFLastDay.java Fri Feb 13 19:37:41 2015
@@ -133,17 +133,7 @@ public class GenericUDFLastDay extends G
@Override
public String getDisplayString(String[] children) {
- StringBuilder sb = new StringBuilder();
- sb.append("last_day(");
- if (children.length > 0) {
- sb.append(children[0]);
- for (int i = 1; i < children.length; i++) {
- sb.append(", ");
- sb.append(children[i]);
- }
- }
- sb.append(")");
- return sb.toString();
+ return getStandardDisplayString("last_day", children);
}
protected Calendar lastDay(Date d) {
Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFLeadLag.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFLeadLag.java?rev=1659656&r1=1659655&r2=1659656&view=diff
==============================================================================
--- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFLeadLag.java (original)
+++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFLeadLag.java Fri Feb 13 19:37:41 2015
@@ -165,14 +165,7 @@ public abstract class GenericUDFLeadLag
@Override
public String getDisplayString(String[] children) {
assert (children.length == 2);
- StringBuilder sb = new StringBuilder();
- sb.append(_getFnName());
- sb.append("(");
- sb.append(children[0]);
- sb.append(", ");
- sb.append(children[1]);
- sb.append(")");
- return sb.toString();
+ return getStandardDisplayString(_getFnName(), children);
}
protected abstract String _getFnName();
Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFLocate.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFLocate.java?rev=1659656&r1=1659655&r2=1659656&view=diff
==============================================================================
--- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFLocate.java (original)
+++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFLocate.java Fri Feb 13 19:37:41 2015
@@ -109,7 +109,6 @@ public class GenericUDFLocate extends Ge
@Override
public String getDisplayString(String[] children) {
assert (children.length == 2 || children.length == 3);
- return "locate(" + children[0] + children[1]
- + (children.length == 3 ? children[2] : "") + ")";
+ return getStandardDisplayString("locate", children);
}
}
Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFLower.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFLower.java?rev=1659656&r1=1659655&r2=1659656&view=diff
==============================================================================
--- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFLower.java (original)
+++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFLower.java Fri Feb 13 19:37:41 2015
@@ -105,17 +105,7 @@ public class GenericUDFLower extends Gen
@Override
public String getDisplayString(String[] children) {
- StringBuilder sb = new StringBuilder();
- sb.append("lower(");
- if (children.length > 0) {
- sb.append(children[0]);
- for (int i = 1; i < children.length; i++) {
- sb.append(",");
- sb.append(children[i]);
- }
- }
- sb.append(")");
- return sb.toString();
+ return getStandardDisplayString("lower", children);
}
}
Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFMacro.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFMacro.java?rev=1659656&r1=1659655&r2=1659656&view=diff
==============================================================================
--- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFMacro.java (original)
+++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFMacro.java Fri Feb 13 19:37:41 2015
@@ -128,17 +128,7 @@ public class GenericUDFMacro extends Gen
@Override
public String getDisplayString(String[] children) {
- StringBuilder sb = new StringBuilder();
- sb.append(macroName);
- sb.append("(");
- for (int i = 0; i < children.length; i++) {
- sb.append(children[i]);
- if (i + 1 < children.length) {
- sb.append(", ");
- }
- }
- sb.append(")");
- return sb.toString();
+ return getStandardDisplayString(macroName, children);
}
public void setMacroName(String macroName) {
Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFMapKeys.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFMapKeys.java?rev=1659656&r1=1659655&r2=1659656&view=diff
==============================================================================
--- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFMapKeys.java (original)
+++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFMapKeys.java Fri Feb 13 19:37:41 2015
@@ -68,6 +68,6 @@ public class GenericUDFMapKeys extends G
@Override
public String getDisplayString(String[] children) {
assert children.length == 1;
- return "map_keys(" + children[0] + ")";
+ return getStandardDisplayString("map_keys", children);
}
}
Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFMapValues.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFMapValues.java?rev=1659656&r1=1659655&r2=1659656&view=diff
==============================================================================
--- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFMapValues.java (original)
+++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFMapValues.java Fri Feb 13 19:37:41 2015
@@ -68,6 +68,6 @@ public class GenericUDFMapValues extends
@Override
public String getDisplayString(String[] children) {
assert children.length == 1;
- return "map_values(" + children[0] + ")";
+ return getStandardDisplayString("map_values", children);
}
}
Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFNamedStruct.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFNamedStruct.java?rev=1659656&r1=1659655&r2=1659656&view=diff
==============================================================================
--- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFNamedStruct.java (original)
+++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFNamedStruct.java Fri Feb 13 19:37:41 2015
@@ -75,15 +75,6 @@ public class GenericUDFNamedStruct exten
@Override
public String getDisplayString(String[] children) {
- StringBuilder sb = new StringBuilder();
- sb.append("named_struct(");
- for (int i = 0; i < children.length; i++) {
- if (i > 0) {
- sb.append(',');
- }
- sb.append(children[i]);
- }
- sb.append(')');
- return sb.toString();
+ return getStandardDisplayString("named_struct", children, ",");
}
}
Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFPower.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFPower.java?rev=1659656&r1=1659655&r2=1659656&view=diff
==============================================================================
--- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFPower.java (original)
+++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFPower.java Fri Feb 13 19:37:41 2015
@@ -41,7 +41,6 @@ extended = "Example:\n"
@VectorizedExpressions({FuncPowerLongToDouble.class, FuncPowerDoubleToDouble.class})
public class GenericUDFPower extends GenericUDF {
private final String opName;
- private final String opDisplayName;
private transient PrimitiveObjectInspector baseOI;
private transient PrimitiveObjectInspector powerOI;
@@ -54,7 +53,6 @@ public class GenericUDFPower extends Gen
public GenericUDFPower() {
opName = getClass().getSimpleName();
- opDisplayName = "power";
resultOI = PrimitiveObjectInspectorFactory.writableDoubleObjectInspector;
}
@@ -103,7 +101,7 @@ public class GenericUDFPower extends Gen
@Override
public String getDisplayString(String[] children) {
assert (children.length == 2);
- return opDisplayName + "(" + children[0] + ", " + children[1] + ")";
+ return getStandardDisplayString("power", children);
}
@Override
Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFPrintf.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFPrintf.java?rev=1659656&r1=1659655&r2=1659656&view=diff
==============================================================================
--- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFPrintf.java (original)
+++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFPrintf.java Fri Feb 13 19:37:41 2015
@@ -141,12 +141,6 @@ public class GenericUDFPrintf extends Ge
@Override
public String getDisplayString(String[] children) {
assert (children.length >= 2);
- StringBuilder sb = new StringBuilder();
- sb.append("printf(");
- for (int i = 0; i < children.length - 1; i++) {
- sb.append(children[i]).append(", ");
- }
- sb.append(children[children.length - 1]).append(")");
- return sb.toString();
+ return getStandardDisplayString("printf", children);
}
}
Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFRound.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFRound.java?rev=1659656&r1=1659655&r2=1659656&view=diff
==============================================================================
--- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFRound.java (original)
+++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFRound.java Fri Feb 13 19:37:41 2015
@@ -263,17 +263,7 @@ public class GenericUDFRound extends Gen
@Override
public String getDisplayString(String[] children) {
- StringBuilder sb = new StringBuilder();
- sb.append("round(");
- if (children.length > 0) {
- sb.append(children[0]);
- for (int i = 1; i < children.length; i++) {
- sb.append(", ");
- sb.append(children[i]);
- }
- }
- sb.append(")");
- return sb.toString();
+ return getStandardDisplayString("round", children);
}
}
Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFSentences.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFSentences.java?rev=1659656&r1=1659655&r2=1659656&view=diff
==============================================================================
--- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFSentences.java (original)
+++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFSentences.java Fri Feb 13 19:37:41 2015
@@ -128,14 +128,6 @@ public class GenericUDFSentences extends
@Override
public String getDisplayString(String[] children) {
assert (children.length >= 1 && children.length <= 3);
- String display = "sentences(" + children[0];
- if(children.length > 1) {
- display += ", " + children[1];
- if(children.length > 2) {
- display += ", " + children[2];
- }
- }
- display += ")";
- return display;
+ return getStandardDisplayString("sentences", children);
}
}
Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFSize.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFSize.java?rev=1659656&r1=1659655&r2=1659656&view=diff
==============================================================================
--- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFSize.java (original)
+++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFSize.java Fri Feb 13 19:37:41 2015
@@ -79,6 +79,6 @@ public class GenericUDFSize extends Gene
@Override
public String getDisplayString(String[] children) {
assert (children.length == 1);
- return "size(" + children[0] + ")";
+ return getStandardDisplayString("size", children);
}
}
Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFSortArray.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFSortArray.java?rev=1659656&r1=1659655&r2=1659656&view=diff
==============================================================================
--- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFSortArray.java (original)
+++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFSortArray.java Fri Feb 13 19:37:41 2015
@@ -116,6 +116,6 @@ public class GenericUDFSortArray extends
@Override
public String getDisplayString(String[] children) {
assert (children.length == 1);
- return "sort_array(" + children[0] + ")";
+ return getStandardDisplayString("sort_array", children);
}
}
Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFSplit.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFSplit.java?rev=1659656&r1=1659655&r2=1659656&view=diff
==============================================================================
--- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFSplit.java (original)
+++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFSplit.java Fri Feb 13 19:37:41 2015
@@ -82,7 +82,7 @@ public class GenericUDFSplit extends Gen
@Override
public String getDisplayString(String[] children) {
assert (children.length == 2);
- return "split(" + children[0] + ", " + children[1] + ")";
+ return getStandardDisplayString("split", children);
}
}
Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFStringToMap.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFStringToMap.java?rev=1659656&r1=1659655&r2=1659656&view=diff
==============================================================================
--- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFStringToMap.java (original)
+++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFStringToMap.java Fri Feb 13 19:37:41 2015
@@ -104,19 +104,7 @@ public class GenericUDFStringToMap exten
@Override
public String getDisplayString(String[] children) {
- StringBuilder sb = new StringBuilder();
- sb.append("str_to_map(");
assert (children.length <= 3);
- boolean firstChild = true;
- for (String child : children) {
- if (firstChild) {
- firstChild = false;
- } else {
- sb.append(",");
- }
- sb.append(child);
- }
- sb.append(")");
- return sb.toString();
+ return getStandardDisplayString("str_to_map", children, ",");
}
}
Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFStruct.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFStruct.java?rev=1659656&r1=1659655&r2=1659656&view=diff
==============================================================================
--- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFStruct.java (original)
+++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFStruct.java Fri Feb 13 19:37:41 2015
@@ -59,15 +59,6 @@ public class GenericUDFStruct extends Ge
@Override
public String getDisplayString(String[] children) {
- StringBuilder sb = new StringBuilder();
- sb.append("struct(");
- for (int i = 0; i < children.length; i++) {
- if (i > 0) {
- sb.append(',');
- }
- sb.append(children[i]);
- }
- sb.append(')');
- return sb.toString();
+ return getStandardDisplayString("struct", children, ",");
}
}
Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFTranslate.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFTranslate.java?rev=1659656&r1=1659655&r2=1659656&view=diff
==============================================================================
--- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFTranslate.java (original)
+++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFTranslate.java Fri Feb 13 19:37:41 2015
@@ -287,7 +287,7 @@ public class GenericUDFTranslate extends
@Override
public String getDisplayString(String[] children) {
assert (children.length == 3);
- return "translate(" + children[0] + ", " + children[1] + ", " + children[2] + ")";
+ return getStandardDisplayString("translate", children);
}
}
Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFUpper.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFUpper.java?rev=1659656&r1=1659655&r2=1659656&view=diff
==============================================================================
--- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFUpper.java (original)
+++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFUpper.java Fri Feb 13 19:37:41 2015
@@ -107,17 +107,7 @@ public class GenericUDFUpper extends Gen
@Override
public String getDisplayString(String[] children) {
- StringBuilder sb = new StringBuilder();
- sb.append("upper(");
- if (children.length > 0) {
- sb.append(children[0]);
- for (int i = 1; i < children.length; i++) {
- sb.append(",");
- sb.append(children[i]);
- }
- }
- sb.append(")");
- return sb.toString();
+ return getStandardDisplayString("upper", children);
}
}
Modified: hive/trunk/ql/src/test/results/clientpositive/udf_instr.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/udf_instr.q.out?rev=1659656&r1=1659655&r2=1659656&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/udf_instr.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/udf_instr.q.out Fri Feb 13 19:37:41 2015
@@ -56,7 +56,7 @@ STAGE PLANS:
Row Limit Per Split: 1
Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: COMPLETE
Select Operator
- expressions: 1 (type: int), 0 (type: int), 2 (type: int), 2 (type: int), 0 (type: int), 0 (type: int), 2 (type: int), 3 (type: int), 4 (type: int), 2 (type: int), 3 (type: int), instr(null'abc') (type: int), instr('abcd'null) (type: int)
+ expressions: 1 (type: int), 0 (type: int), 2 (type: int), 2 (type: int), 0 (type: int), 0 (type: int), 2 (type: int), 3 (type: int), 4 (type: int), 2 (type: int), 3 (type: int), instr(null, 'abc') (type: int), instr('abcd', null) (type: int)
outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8, _col9, _col10, _col11, _col12
Statistics: Num rows: 500 Data size: 26000 Basic stats: COMPLETE Column stats: COMPLETE
ListSink
Modified: hive/trunk/ql/src/test/results/clientpositive/udf_locate.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/udf_locate.q.out?rev=1659656&r1=1659655&r2=1659656&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/udf_locate.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/udf_locate.q.out Fri Feb 13 19:37:41 2015
@@ -64,7 +64,7 @@ STAGE PLANS:
Row Limit Per Split: 1
Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: COMPLETE
Select Operator
- expressions: 1 (type: int), 0 (type: int), 2 (type: int), 2 (type: int), 4 (type: int), 4 (type: int), 0 (type: int), 0 (type: int), 2 (type: int), 3 (type: int), 4 (type: int), 2 (type: int), 3 (type: int), locate(null'abc') (type: int), locate('abc'null) (type: int), locate('abc''abcd'null) (type: int), 0 (type: int)
+ expressions: 1 (type: int), 0 (type: int), 2 (type: int), 2 (type: int), 4 (type: int), 4 (type: int), 0 (type: int), 0 (type: int), 2 (type: int), 3 (type: int), 4 (type: int), 2 (type: int), 3 (type: int), locate(null, 'abc') (type: int), locate('abc', null) (type: int), locate('abc', 'abcd', null) (type: int), 0 (type: int)
outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8, _col9, _col10, _col11, _col12, _col13, _col14, _col15, _col16
Statistics: Num rows: 500 Data size: 34000 Basic stats: COMPLETE Column stats: COMPLETE
ListSink