Return-Path: X-Original-To: apmail-hive-commits-archive@www.apache.org Delivered-To: apmail-hive-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 762EF10A3E for ; Wed, 7 Aug 2013 16:29:47 +0000 (UTC) Received: (qmail 27732 invoked by uid 500); 7 Aug 2013 16:29:47 -0000 Delivered-To: apmail-hive-commits-archive@hive.apache.org Received: (qmail 27676 invoked by uid 500); 7 Aug 2013 16:29:47 -0000 Mailing-List: contact commits-help@hive.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: hive-dev@hive.apache.org Delivered-To: mailing list commits@hive.apache.org Received: (qmail 27668 invoked by uid 99); 7 Aug 2013 16:29:47 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 07 Aug 2013 16:29:47 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 07 Aug 2013 16:29:42 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 428612388831; Wed, 7 Aug 2013 16:29:22 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1511377 [1/2] - in /hive/trunk: contrib/src/java/org/apache/hadoop/hive/contrib/genericudf/example/ contrib/src/java/org/apache/hadoop/hive/contrib/udtf/example/ ql/src/java/org/apache/hadoop/hive/ql/plan/ ql/src/java/org/apache/hadoop/hiv... Date: Wed, 07 Aug 2013 16:29:19 -0000 To: commits@hive.apache.org From: hashutosh@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20130807162922.428612388831@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: hashutosh Date: Wed Aug 7 16:29:18 2013 New Revision: 1511377 URL: http://svn.apache.org/r1511377 Log: HIVE-4967 : Don't serialize unnecessary fields in query plan (Ashutosh Chauhan. Reviewed by Brock Noland) Modified: hive/trunk/contrib/src/java/org/apache/hadoop/hive/contrib/genericudf/example/GenericUDFDBOutput.java hive/trunk/contrib/src/java/org/apache/hadoop/hive/contrib/udtf/example/GenericUDTFExplode2.java hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/ExprNodeGenericFuncDesc.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/GenericUDAFAverage.java hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDAFCollectSet.java hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDAFComputeStats.java hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDAFContextNGrams.java hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDAFCorrelation.java hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDAFCovariance.java hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDAFEWAHBitmap.java hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDAFHistogramNumeric.java hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDAFLeadLag.java hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDAFMax.java hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDAFMin.java hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDAFNTile.java hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDAFPercentileApprox.java hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDAFVariance.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/GenericUDFArrayContains.java hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFBaseCompare.java hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFCase.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/GenericUDFConcatWS.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/GenericUDFField.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/GenericUDFFromUtcTimestamp.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/GenericUDFIn.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/GenericUDFInstr.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/GenericUDFMap.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/GenericUDFNvl.java hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFOPAnd.java hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFOPNot.java hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFOPOr.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/GenericUDFReflect.java hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFReflect2.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/GenericUDFTimestamp.java hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFToBinary.java hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFToDate.java hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFToDecimal.java hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFToUnixTimeStamp.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/GenericUDFUnion.java hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFWhen.java hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDTFExplode.java hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDTFInline.java hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDTFJSONTuple.java hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDTFStack.java hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/xml/GenericUDFXPath.java hive/trunk/ql/src/test/org/apache/hadoop/hive/ql/udf/generic/GenericUDFTestTranslate.java hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/primitive/AbstractPrimitiveObjectInspector.java 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=1511377&r1=1511376&r2=1511377&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 Wed Aug 7 16:29:18 2013 @@ -62,12 +62,11 @@ import org.apache.hadoop.io.IntWritable; + "passed to the PreparedStatement object\n") @UDFType(deterministic = false) public class GenericUDFDBOutput extends GenericUDF { - private static Log LOG = LogFactory + private static final Log LOG = LogFactory .getLog(GenericUDFDBOutput.class.getName()); - ObjectInspector[] argumentOI; - GenericUDFUtils.ReturnObjectInspectorResolver returnOIResolver; - Connection connection = null; + private transient ObjectInspector[] argumentOI; + private transient Connection connection = null; private String url; private String user; private String pass; Modified: hive/trunk/contrib/src/java/org/apache/hadoop/hive/contrib/udtf/example/GenericUDTFExplode2.java URL: http://svn.apache.org/viewvc/hive/trunk/contrib/src/java/org/apache/hadoop/hive/contrib/udtf/example/GenericUDTFExplode2.java?rev=1511377&r1=1511376&r2=1511377&view=diff ============================================================================== --- hive/trunk/contrib/src/java/org/apache/hadoop/hive/contrib/udtf/example/GenericUDTFExplode2.java (original) +++ hive/trunk/contrib/src/java/org/apache/hadoop/hive/contrib/udtf/example/GenericUDTFExplode2.java Wed Aug 7 16:29:18 2013 @@ -38,7 +38,7 @@ import org.apache.hadoop.hive.serde2.obj value = "_FUNC_(a) - like explode, but outputs two identical columns (for testing purposes)") public class GenericUDTFExplode2 extends GenericUDTF { - ListObjectInspector listOI = null; + private transient ListObjectInspector listOI = null; @Override public void close() throws HiveException { Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/ExprNodeGenericFuncDesc.java URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/ExprNodeGenericFuncDesc.java?rev=1511377&r1=1511376&r2=1511377&view=diff ============================================================================== --- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/ExprNodeGenericFuncDesc.java (original) +++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/ExprNodeGenericFuncDesc.java Wed Aug 7 16:29:18 2013 @@ -66,7 +66,7 @@ public class ExprNodeGenericFuncDesc ext * This class uses a writableObjectInspector rather than a TypeInfo to store * the canonical type information for this NodeDesc. */ - private ObjectInspector writableObjectInspector; + private transient ObjectInspector writableObjectInspector; //Is this an expression that should perform a comparison for sorted searches private boolean isSortedExpr; 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=1511377&r1=1511376&r2=1511377&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 Wed Aug 7 16:29:18 2013 @@ -30,14 +30,13 @@ import org.apache.hadoop.hive.ql.exec.UD import org.apache.hadoop.hive.ql.index.bitmap.BitmapObjectInput; import org.apache.hadoop.hive.ql.index.bitmap.BitmapObjectOutput; import org.apache.hadoop.hive.ql.metadata.HiveException; +import org.apache.hadoop.hive.serde2.objectinspector.ListObjectInspector; import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspector; +import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspector.Category; import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspectorFactory; import org.apache.hadoop.hive.serde2.objectinspector.PrimitiveObjectInspector; -import org.apache.hadoop.hive.serde2.objectinspector.ListObjectInspector; -import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspector.Category; import org.apache.hadoop.hive.serde2.objectinspector.primitive.PrimitiveObjectInspectorFactory; import org.apache.hadoop.hive.serde2.objectinspector.primitive.PrimitiveObjectInspectorUtils; -import org.apache.hadoop.hive.serde2.objectinspector.primitive.WritableVoidObjectInspector; import org.apache.hadoop.io.LongWritable; /** @@ -46,8 +45,7 @@ import org.apache.hadoop.io.LongWritable */ abstract public class AbstractGenericUDFEWAHBitmapBop extends GenericUDF { protected final ArrayList ret = new ArrayList(); - private ObjectInspector b1OI; - private ObjectInspector b2OI; + private transient ObjectInspector b1OI; private final String name; AbstractGenericUDFEWAHBitmapBop(String name) { @@ -70,15 +68,13 @@ abstract public class AbstractGenericUDF + arguments[0].getTypeName() + "\" is found"); } - if (arguments[1].getCategory().equals(Category.LIST)) { - b2OI = (ListObjectInspector) arguments[1]; - } else { + if (!arguments[1].getCategory().equals(Category.LIST)) { throw new UDFArgumentTypeException(1, "\"" + Category.LIST.toString().toLowerCase() + "\" is expected at function " + name + ", but \"" + arguments[1].getTypeName() + "\" is found"); - } + } return ObjectInspectorFactory .getStandardListObjectInspector(PrimitiveObjectInspectorFactory .writableLongObjectInspector); 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=1511377&r1=1511376&r2=1511377&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 Wed Aug 7 16:29:18 2013 @@ -26,18 +26,18 @@ import org.apache.hadoop.hive.ql.metadat import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspector; import org.apache.hadoop.hive.serde2.objectinspector.PrimitiveObjectInspector; import org.apache.hadoop.hive.serde2.objectinspector.primitive.PrimitiveObjectInspectorUtils; -import org.apache.hadoop.hive.serde2.objectinspector.primitive.PrimitiveObjectInspectorUtils.*; +import org.apache.hadoop.hive.serde2.objectinspector.primitive.PrimitiveObjectInspectorUtils.PrimitiveTypeEntry; /** * common class for reflective UDFs */ public abstract class AbstractGenericUDFReflect extends GenericUDF { - private PrimitiveObjectInspector[] parameterOIs; - private PrimitiveTypeEntry[] parameterTypes; - private Class[] parameterClasses; + private transient PrimitiveObjectInspector[] parameterOIs; + private transient PrimitiveTypeEntry[] parameterTypes; + private transient Class[] parameterClasses; - private Object[] parameterJavaValues; + private transient Object[] parameterJavaValues; void setupParameterOIs(ObjectInspector[] arguments, int start) throws UDFArgumentTypeException { int length = arguments.length - start; Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDAFAverage.java URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDAFAverage.java?rev=1511377&r1=1511376&r2=1511377&view=diff ============================================================================== --- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDAFAverage.java (original) +++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDAFAverage.java Wed Aug 7 16:29:18 2013 @@ -243,15 +243,15 @@ public class GenericUDAFAverage extends public static abstract class AbstractGenericUDAFAverageEvaluator extends GenericUDAFEvaluator { // For PARTIAL1 and COMPLETE - private PrimitiveObjectInspector inputOI; + private transient PrimitiveObjectInspector inputOI; // For PARTIAL2 and FINAL - private StructObjectInspector soi; - private StructField countField; - private StructField sumField; + private transient StructObjectInspector soi; + private transient StructField countField; + private transient StructField sumField; private LongObjectInspector countFieldOI; private ObjectInspector sumFieldOI; // For PARTIAL1 and PARTIAL2 - protected Object[] partialResult; + protected transient Object[] partialResult; private boolean warned = false; Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDAFCollectSet.java URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDAFCollectSet.java?rev=1511377&r1=1511376&r2=1511377&view=diff ============================================================================== --- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDAFCollectSet.java (original) +++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDAFCollectSet.java Wed Aug 7 16:29:18 2013 @@ -69,10 +69,11 @@ public class GenericUDAFCollectSet exten private PrimitiveObjectInspector inputOI; // For PARTIAL2 and FINAL: ObjectInspectors for partial aggregations (list // of objs) - private StandardListObjectInspector loi; + private transient StandardListObjectInspector loi; - private StandardListObjectInspector internalMergeOI; + private transient StandardListObjectInspector internalMergeOI; + @Override public ObjectInspector init(Mode m, ObjectInspector[] parameters) throws HiveException { super.init(m, parameters); Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDAFComputeStats.java URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDAFComputeStats.java?rev=1511377&r1=1511376&r2=1511377&view=diff ============================================================================== --- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDAFComputeStats.java (original) +++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDAFComputeStats.java Wed Aug 7 16:29:18 2013 @@ -112,18 +112,15 @@ public class GenericUDAFComputeStats ext /* Object Inspectors corresponding to the struct returned by TerminatePartial and the long * field within the struct - "count" */ - private StructObjectInspector soi; + private transient StructObjectInspector soi; - private StructField columnTypeField; - private WritableStringObjectInspector columnTypeFieldOI; - - private StructField countTruesField; + private transient StructField countTruesField; private WritableLongObjectInspector countTruesFieldOI; - private StructField countFalsesField; + private transient StructField countFalsesField; private WritableLongObjectInspector countFalsesFieldOI; - private StructField countNullsField; + private transient StructField countNullsField; private WritableLongObjectInspector countNullsFieldOI; /* Output of final result of the aggregation @@ -141,10 +138,6 @@ public class GenericUDAFComputeStats ext } else { soi = (StructObjectInspector) parameters[0]; - columnTypeField = soi.getStructFieldRef("ColumnType"); - columnTypeFieldOI = (WritableStringObjectInspector) - columnTypeField.getFieldObjectInspector(); - countTruesField = soi.getStructFieldRef("CountTrues"); countTruesFieldOI = (WritableLongObjectInspector) countTruesField.getFieldObjectInspector(); @@ -313,7 +306,7 @@ public class GenericUDAFComputeStats ext /* Object Inspector corresponding to the input parameter. */ private PrimitiveObjectInspector inputOI; - private PrimitiveObjectInspector numVectorsOI; + private transient PrimitiveObjectInspector numVectorsOI; /* Partial aggregation result returned by TerminatePartial. Partial result is a struct * containing a long field named "count". @@ -323,24 +316,21 @@ public class GenericUDAFComputeStats ext /* Object Inspectors corresponding to the struct returned by TerminatePartial and the long * field within the struct - "count" */ - private StructObjectInspector soi; + private transient StructObjectInspector soi; - private StructField columnType; - private WritableStringObjectInspector columnTypeFieldOI; - - private StructField minField; + private transient StructField minField; private WritableLongObjectInspector minFieldOI; - private StructField maxField; + private transient StructField maxField; private WritableLongObjectInspector maxFieldOI; - private StructField countNullsField; + private transient StructField countNullsField; private WritableLongObjectInspector countNullsFieldOI; - private StructField ndvField; + private transient StructField ndvField; private WritableStringObjectInspector ndvFieldOI; - private StructField numBitVectorsField; + private transient StructField numBitVectorsField; private WritableIntObjectInspector numBitVectorsFieldOI; /* Output of final result of the aggregation @@ -358,9 +348,6 @@ public class GenericUDAFComputeStats ext } else { soi = (StructObjectInspector) parameters[0]; - columnType = soi.getStructFieldRef("ColumnType"); - columnTypeFieldOI = (WritableStringObjectInspector) columnType.getFieldObjectInspector(); - minField = soi.getStructFieldRef("Min"); minFieldOI = (WritableLongObjectInspector) minField.getFieldObjectInspector(); @@ -474,23 +461,6 @@ public class GenericUDAFComputeStats ext boolean warned = false; - private void printDebugOutput(String functionName, AggregationBuffer agg) { - LongStatsAgg myagg = (LongStatsAgg) agg; - - LOG.debug(functionName); - - LOG.debug("Max Value:"); - LOG.debug(myagg.max); - - LOG.debug("Min Value:"); - LOG.debug(myagg.min); - - LOG.debug("Count of Null Values:"); - LOG.debug(myagg.countNulls); - - myagg.numDV.printNumDistinctValueEstimator(); - } - @Override public void iterate(AggregationBuffer agg, Object[] parameters) throws HiveException { Object p = parameters[0]; @@ -632,7 +602,7 @@ public class GenericUDAFComputeStats ext /* Object Inspector corresponding to the input parameter. */ private PrimitiveObjectInspector inputOI; - private PrimitiveObjectInspector numVectorsOI; + private transient PrimitiveObjectInspector numVectorsOI; /* Partial aggregation result returned by TerminatePartial. Partial result is a struct * containing a long field named "count". @@ -642,24 +612,21 @@ public class GenericUDAFComputeStats ext /* Object Inspectors corresponding to the struct returned by TerminatePartial and the long * field within the struct - "count" */ - private StructObjectInspector soi; - - private StructField columnTypeField; - private WritableStringObjectInspector columnTypeFieldOI; + private transient StructObjectInspector soi; - private StructField minField; + private transient StructField minField; private WritableDoubleObjectInspector minFieldOI; - private StructField maxField; + private transient StructField maxField; private WritableDoubleObjectInspector maxFieldOI; - private StructField countNullsField; + private transient StructField countNullsField; private WritableLongObjectInspector countNullsFieldOI; - private StructField ndvField; + private transient StructField ndvField; private WritableStringObjectInspector ndvFieldOI; - private StructField numBitVectorsField; + private transient StructField numBitVectorsField; private WritableIntObjectInspector numBitVectorsFieldOI; /* Output of final result of the aggregation @@ -677,10 +644,6 @@ public class GenericUDAFComputeStats ext } else { soi = (StructObjectInspector) parameters[0]; - columnTypeField = soi.getStructFieldRef("ColumnType"); - columnTypeFieldOI = (WritableStringObjectInspector) - columnTypeField.getFieldObjectInspector(); - minField = soi.getStructFieldRef("Min"); minFieldOI = (WritableDoubleObjectInspector) minField.getFieldObjectInspector(); @@ -794,23 +757,6 @@ public class GenericUDAFComputeStats ext boolean warned = false; - private void printDebugOutput(String functionName, AggregationBuffer agg) { - DoubleStatsAgg myagg = (DoubleStatsAgg) agg; - - LOG.debug(functionName); - - LOG.debug("Max Value:"); - LOG.debug(myagg.max); - - LOG.debug("Min Value:"); - LOG.debug(myagg.min); - - LOG.debug("Count of Null Values:"); - LOG.debug(myagg.countNulls); - - myagg.numDV.printNumDistinctValueEstimator(); - } - @Override public void iterate(AggregationBuffer agg, Object[] parameters) throws HiveException { Object p = parameters[0]; @@ -953,7 +899,7 @@ public class GenericUDAFComputeStats ext /* Object Inspector corresponding to the input parameter. */ private PrimitiveObjectInspector inputOI; - private PrimitiveObjectInspector numVectorsOI; + private transient PrimitiveObjectInspector numVectorsOI; /* Partial aggregation result returned by TerminatePartial. Partial result is a struct * containing a long field named "count". @@ -963,27 +909,24 @@ public class GenericUDAFComputeStats ext /* Object Inspectors corresponding to the struct returned by TerminatePartial and the * fields within the struct - "maxLength", "sumLength", "count", "countNulls", "ndv" */ - private StructObjectInspector soi; + private transient StructObjectInspector soi; - private StructField columnTypeField; - private WritableStringObjectInspector columnTypeFieldOI; - - private StructField maxLengthField; + private transient StructField maxLengthField; private WritableLongObjectInspector maxLengthFieldOI; - private StructField sumLengthField; + private transient StructField sumLengthField; private WritableLongObjectInspector sumLengthFieldOI; - private StructField countField; + private transient StructField countField; private WritableLongObjectInspector countFieldOI; - private StructField countNullsField; + private transient StructField countNullsField; private WritableLongObjectInspector countNullsFieldOI; - private StructField ndvField; + private transient StructField ndvField; private WritableStringObjectInspector ndvFieldOI; - private StructField numBitVectorsField; + private transient StructField numBitVectorsField; private WritableIntObjectInspector numBitVectorsFieldOI; /* Output of final result of the aggregation @@ -1001,10 +944,6 @@ public class GenericUDAFComputeStats ext } else { soi = (StructObjectInspector) parameters[0]; - columnTypeField = soi.getStructFieldRef("ColumnType"); - columnTypeFieldOI = (WritableStringObjectInspector) - columnTypeField.getFieldObjectInspector(); - maxLengthField = soi.getStructFieldRef("MaxLength"); maxLengthFieldOI = (WritableLongObjectInspector) maxLengthField.getFieldObjectInspector(); @@ -1126,26 +1065,6 @@ public class GenericUDAFComputeStats ext boolean warned = false; - private void printDebugOutput(String functionName, AggregationBuffer agg) { - StringStatsAgg myagg = (StringStatsAgg) agg; - - LOG.debug(functionName); - - LOG.debug("Max Length:"); - LOG.debug(myagg.maxLength); - - LOG.debug("Sum of Length:"); - LOG.debug(myagg.sumLength); - - LOG.debug("Count of non-Null Values:"); - LOG.debug(myagg.count); - - LOG.debug("Count of Null Values:"); - LOG.debug(myagg.countNulls); - - myagg.numDV.printNumDistinctValueEstimator(); - } - @Override public void iterate(AggregationBuffer agg, Object[] parameters) throws HiveException { Object p = parameters[0]; @@ -1308,21 +1227,18 @@ public class GenericUDAFComputeStats ext /* Object Inspectors corresponding to the struct returned by TerminatePartial and the * fields within the struct - "maxLength", "sumLength", "count", "countNulls" */ - private StructObjectInspector soi; + private transient StructObjectInspector soi; - private StructField columnTypeField; - private WritableStringObjectInspector columnTypeFieldOI; - - private StructField maxLengthField; + private transient StructField maxLengthField; private WritableLongObjectInspector maxLengthFieldOI; - private StructField sumLengthField; + private transient StructField sumLengthField; private WritableLongObjectInspector sumLengthFieldOI; - private StructField countField; + private transient StructField countField; private WritableLongObjectInspector countFieldOI; - private StructField countNullsField; + private transient StructField countNullsField; private WritableLongObjectInspector countNullsFieldOI; /* Output of final result of the aggregation @@ -1339,10 +1255,6 @@ public class GenericUDAFComputeStats ext } else { soi = (StructObjectInspector) parameters[0]; - columnTypeField = soi.getStructFieldRef("ColumnType"); - columnTypeFieldOI = (WritableStringObjectInspector) - columnTypeField.getFieldObjectInspector(); - maxLengthField = soi.getStructFieldRef("MaxLength"); maxLengthFieldOI = (WritableLongObjectInspector) maxLengthField.getFieldObjectInspector(); @@ -1483,24 +1395,6 @@ public class GenericUDAFComputeStats ext } } - private void printDebugOutput(String functionName, AggregationBuffer agg) { - BinaryStatsAgg myagg = (BinaryStatsAgg) agg; - - LOG.debug(functionName); - - LOG.debug("Max Length:"); - LOG.debug(myagg.maxLength); - - LOG.debug("Sum of Length:"); - LOG.debug(myagg.sumLength); - - LOG.debug("Count of non-Null Values:"); - LOG.debug(myagg.count); - - LOG.debug("Count of Null Values:"); - LOG.debug(myagg.countNulls); - } - @Override public Object terminatePartial(AggregationBuffer agg) throws HiveException { BinaryStatsAgg myagg = (BinaryStatsAgg) agg; Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDAFContextNGrams.java URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDAFContextNGrams.java?rev=1511377&r1=1511376&r2=1511377&view=diff ============================================================================== --- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDAFContextNGrams.java (original) +++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDAFContextNGrams.java Wed Aug 7 16:29:18 2013 @@ -158,16 +158,16 @@ public class GenericUDAFContextNGrams im */ public static class GenericUDAFContextNGramEvaluator extends GenericUDAFEvaluator { // For PARTIAL1 and COMPLETE: ObjectInspectors for original data - private StandardListObjectInspector outerInputOI; - private StandardListObjectInspector innerInputOI; - private StandardListObjectInspector contextListOI; + private transient StandardListObjectInspector outerInputOI; + private transient StandardListObjectInspector innerInputOI; + private transient StandardListObjectInspector contextListOI; private PrimitiveObjectInspector contextOI; private PrimitiveObjectInspector inputOI; - private PrimitiveObjectInspector kOI; - private PrimitiveObjectInspector pOI; + private transient PrimitiveObjectInspector kOI; + private transient PrimitiveObjectInspector pOI; // For PARTIAL2 and FINAL: ObjectInspectors for partial aggregations - private StandardListObjectInspector loi; + private transient StandardListObjectInspector loi; @Override public ObjectInspector init(Mode m, ObjectInspector[] parameters) throws HiveException { Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDAFCorrelation.java URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDAFCorrelation.java?rev=1511377&r1=1511376&r2=1511377&view=diff ============================================================================== --- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDAFCorrelation.java (original) +++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDAFCorrelation.java Wed Aug 7 16:29:18 2013 @@ -157,13 +157,13 @@ public class GenericUDAFCorrelation exte private PrimitiveObjectInspector yInputOI; // For PARTIAL2 and FINAL - private StructObjectInspector soi; - private StructField countField; - private StructField xavgField; - private StructField yavgField; - private StructField xvarField; - private StructField yvarField; - private StructField covarField; + private transient StructObjectInspector soi; + private transient StructField countField; + private transient StructField xavgField; + private transient StructField yavgField; + private transient StructField xvarField; + private transient StructField yvarField; + private transient StructField covarField; private LongObjectInspector countFieldOI; private DoubleObjectInspector xavgFieldOI; private DoubleObjectInspector yavgFieldOI; Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDAFCovariance.java URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDAFCovariance.java?rev=1511377&r1=1511376&r2=1511377&view=diff ============================================================================== --- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDAFCovariance.java (original) +++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDAFCovariance.java Wed Aug 7 16:29:18 2013 @@ -150,11 +150,11 @@ public class GenericUDAFCovariance exten private PrimitiveObjectInspector yInputOI; // For PARTIAL2 and FINAL - private StructObjectInspector soi; - private StructField countField; - private StructField xavgField; - private StructField yavgField; - private StructField covarField; + private transient StructObjectInspector soi; + private transient StructField countField; + private transient StructField xavgField; + private transient StructField yavgField; + private transient StructField covarField; private LongObjectInspector countFieldOI; private DoubleObjectInspector xavgFieldOI; private DoubleObjectInspector yavgFieldOI; @@ -252,7 +252,7 @@ public class GenericUDAFCovariance exten myagg.covar = 0; } - private boolean warned = false; + private final boolean warned = false; @Override public void iterate(AggregationBuffer agg, Object[] parameters) throws HiveException { Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDAFEWAHBitmap.java URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDAFEWAHBitmap.java?rev=1511377&r1=1511376&r2=1511377&view=diff ============================================================================== --- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDAFEWAHBitmap.java (original) +++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDAFEWAHBitmap.java Wed Aug 7 16:29:18 2013 @@ -35,7 +35,6 @@ import org.apache.hadoop.hive.serde2.obj import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspectorUtils; import org.apache.hadoop.hive.serde2.objectinspector.PrimitiveObjectInspector; import org.apache.hadoop.hive.serde2.objectinspector.StandardListObjectInspector; -import org.apache.hadoop.hive.serde2.objectinspector.primitive.LongObjectInspector; import org.apache.hadoop.hive.serde2.objectinspector.primitive.PrimitiveObjectInspectorFactory; import org.apache.hadoop.hive.serde2.objectinspector.primitive.PrimitiveObjectInspectorUtils; import org.apache.hadoop.hive.serde2.typeinfo.TypeInfo; @@ -74,12 +73,11 @@ public class GenericUDAFEWAHBitmap exten // For PARTIAL1 and COMPLETE: ObjectInspectors for original data private PrimitiveObjectInspector inputOI; - private LongObjectInspector bitmapLongOI; // For PARTIAL2 and FINAL: ObjectInspectors for partial aggregations // (lists of bitmaps) - private StandardListObjectInspector loi; - private StandardListObjectInspector internalMergeOI; + private transient StandardListObjectInspector loi; + private transient StandardListObjectInspector internalMergeOI; @Override public ObjectInspector init(Mode m, ObjectInspector[] parameters) @@ -93,13 +91,11 @@ public class GenericUDAFEWAHBitmap exten .getStandardListObjectInspector(PrimitiveObjectInspectorFactory.writableLongObjectInspector); } else if (m == Mode.PARTIAL2 || m == Mode.FINAL) { internalMergeOI = (StandardListObjectInspector) parameters[0]; - bitmapLongOI = PrimitiveObjectInspectorFactory.writableLongObjectInspector; inputOI = PrimitiveObjectInspectorFactory.writableByteObjectInspector; loi = (StandardListObjectInspector) ObjectInspectorFactory .getStandardListObjectInspector(PrimitiveObjectInspectorFactory.writableLongObjectInspector); return loi; } else { // Mode.COMPLETE, ie. no map-side aggregation, requires ordering - bitmapLongOI = PrimitiveObjectInspectorFactory.writableLongObjectInspector; inputOI = PrimitiveObjectInspectorFactory.writableByteObjectInspector; loi = (StandardListObjectInspector) ObjectInspectorFactory .getStandardListObjectInspector(PrimitiveObjectInspectorFactory.writableLongObjectInspector); Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDAFHistogramNumeric.java URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDAFHistogramNumeric.java?rev=1511377&r1=1511376&r2=1511377&view=diff ============================================================================== --- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDAFHistogramNumeric.java (original) +++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDAFHistogramNumeric.java Wed Aug 7 16:29:18 2013 @@ -121,10 +121,10 @@ public class GenericUDAFHistogramNumeric // For PARTIAL1 and COMPLETE: ObjectInspectors for original data private PrimitiveObjectInspector inputOI; - private PrimitiveObjectInspector nbinsOI; + private transient PrimitiveObjectInspector nbinsOI; // For PARTIAL2 and FINAL: ObjectInspectors for partial aggregations (list of doubles) - private StandardListObjectInspector loi; + private transient StandardListObjectInspector loi; @Override Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDAFLeadLag.java URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDAFLeadLag.java?rev=1511377&r1=1511376&r2=1511377&view=diff ============================================================================== --- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDAFLeadLag.java (original) +++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDAFLeadLag.java Wed Aug 7 16:29:18 2013 @@ -94,10 +94,10 @@ public abstract class GenericUDAFLeadLag public static abstract class GenericUDAFLeadLagEvaluator extends GenericUDAFEvaluator { - ObjectInspector[] inputOI; - int amt; + private transient ObjectInspector[] inputOI; + private int amt; String fnName; - Converter defaultValueConverter; + private transient Converter defaultValueConverter; @Override public ObjectInspector init(Mode m, ObjectInspector[] parameters) throws HiveException Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDAFMax.java URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDAFMax.java?rev=1511377&r1=1511376&r2=1511377&view=diff ============================================================================== --- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDAFMax.java (original) +++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDAFMax.java Wed Aug 7 16:29:18 2013 @@ -53,8 +53,8 @@ public class GenericUDAFMax extends Abst @UDFType(distinctLike=true) public static class GenericUDAFMaxEvaluator extends GenericUDAFEvaluator { - ObjectInspector inputOI; - ObjectInspector outputOI; + private transient ObjectInspector inputOI; + private transient ObjectInspector outputOI; @Override public ObjectInspector init(Mode m, ObjectInspector[] parameters) Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDAFMin.java URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDAFMin.java?rev=1511377&r1=1511376&r2=1511377&view=diff ============================================================================== --- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDAFMin.java (original) +++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDAFMin.java Wed Aug 7 16:29:18 2013 @@ -53,8 +53,8 @@ public class GenericUDAFMin extends Abst @UDFType(distinctLike=true) public static class GenericUDAFMinEvaluator extends GenericUDAFEvaluator { - ObjectInspector inputOI; - ObjectInspector outputOI; + private transient ObjectInspector inputOI; + private transient ObjectInspector outputOI; @Override public ObjectInspector init(Mode m, ObjectInspector[] parameters) Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDAFNTile.java URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDAFNTile.java?rev=1511377&r1=1511376&r2=1511377&view=diff ============================================================================== --- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDAFNTile.java (original) +++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDAFNTile.java Wed Aug 7 16:29:18 2013 @@ -90,7 +90,7 @@ public class GenericUDAFNTile extends A public static class GenericUDAFNTileEvaluator extends GenericUDAFEvaluator { - PrimitiveObjectInspector inputOI; + private transient PrimitiveObjectInspector inputOI; @Override public ObjectInspector init(Mode m, ObjectInspector[] parameters) throws HiveException Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDAFPercentileApprox.java URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDAFPercentileApprox.java?rev=1511377&r1=1511376&r2=1511377&view=diff ============================================================================== --- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDAFPercentileApprox.java (original) +++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDAFPercentileApprox.java Wed Aug 7 16:29:18 2013 @@ -292,7 +292,7 @@ public class GenericUDAFPercentileApprox protected Integer nbins = 10000; // For PARTIAL2 and FINAL: ObjectInspectors for partial aggregations (list of doubles) - protected StandardListObjectInspector loi; + protected transient StandardListObjectInspector loi; @Override public void merge(AggregationBuffer agg, Object partial) throws HiveException { Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDAFVariance.java URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDAFVariance.java?rev=1511377&r1=1511376&r2=1511377&view=diff ============================================================================== --- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDAFVariance.java (original) +++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDAFVariance.java Wed Aug 7 16:29:18 2013 @@ -104,16 +104,15 @@ public class GenericUDAFVariance extends public static class GenericUDAFVarianceEvaluator extends GenericUDAFEvaluator { // For PARTIAL1 and COMPLETE - private PrimitiveObjectInspector inputOI; + private transient PrimitiveObjectInspector inputOI; // For PARTIAL2 and FINAL - private StructObjectInspector soi; - private StructField countField; - private StructField sumField; - private StructField varianceField; + private transient StructObjectInspector soi; + private transient StructField countField; + private transient StructField sumField; + private transient StructField varianceField; private LongObjectInspector countFieldOI; private DoubleObjectInspector sumFieldOI; - private DoubleObjectInspector varianceFieldOI; // For PARTIAL1 and PARTIAL2 private Object[] partialResult; @@ -139,8 +138,6 @@ public class GenericUDAFVariance extends countFieldOI = (LongObjectInspector) countField .getFieldObjectInspector(); sumFieldOI = (DoubleObjectInspector) sumField.getFieldObjectInspector(); - varianceFieldOI = (DoubleObjectInspector) varianceField - .getFieldObjectInspector(); } // init output 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=1511377&r1=1511376&r2=1511377&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 Wed Aug 7 16:29:18 2013 @@ -26,9 +26,9 @@ import org.apache.hadoop.hive.ql.exec.UD 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.ObjectInspectorConverters.Converter; import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspectorFactory; import org.apache.hadoop.hive.serde2.objectinspector.PrimitiveObjectInspector; -import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspectorConverters.Converter; import org.apache.hadoop.hive.serde2.objectinspector.primitive.PrimitiveObjectInspectorFactory; /** Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFArrayContains.java URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFArrayContains.java?rev=1511377&r1=1511376&r2=1511377&view=diff ============================================================================== --- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFArrayContains.java (original) +++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFArrayContains.java Wed Aug 7 16:29:18 2013 @@ -23,8 +23,8 @@ import org.apache.hadoop.hive.ql.exec.UD import org.apache.hadoop.hive.ql.metadata.HiveException; import org.apache.hadoop.hive.serde2.objectinspector.ListObjectInspector; import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspector; -import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspectorUtils; import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspector.Category; +import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspectorUtils; import org.apache.hadoop.hive.serde2.objectinspector.primitive.PrimitiveObjectInspectorFactory; import org.apache.hadoop.io.BooleanWritable; @@ -44,9 +44,9 @@ public class GenericUDFArrayContains ext private static final int ARG_COUNT = 2; // Number of arguments to this UDF private static final String FUNC_NAME = "ARRAY_CONTAINS"; // External Name - private ObjectInspector valueOI; - private ListObjectInspector arrayOI; - private ObjectInspector arrayElementOI; + private transient ObjectInspector valueOI; + private transient ListObjectInspector arrayOI; + private transient ObjectInspector arrayElementOI; private BooleanWritable result; @Override Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFBaseCompare.java URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFBaseCompare.java?rev=1511377&r1=1511376&r2=1511377&view=diff ============================================================================== --- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFBaseCompare.java (original) +++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFBaseCompare.java Wed Aug 7 16:29:18 2013 @@ -56,17 +56,17 @@ public abstract class GenericUDFBaseComp protected String opName; protected String opDisplayName; - protected ObjectInspector[] argumentOIs; + protected transient ObjectInspector[] argumentOIs; - protected ReturnObjectInspectorResolver conversionHelper = null; + protected transient ReturnObjectInspectorResolver conversionHelper = null; protected ObjectInspector compareOI; protected CompareType compareType; - protected Converter converter0, converter1; - protected StringObjectInspector soi0, soi1; - protected IntObjectInspector ioi0, ioi1; - protected LongObjectInspector loi0, loi1; - protected ByteObjectInspector byoi0, byoi1; - protected BooleanObjectInspector boi0,boi1; + protected transient Converter converter0, converter1; + protected transient StringObjectInspector soi0, soi1; + protected transient IntObjectInspector ioi0, ioi1; + protected transient LongObjectInspector loi0, loi1; + protected transient ByteObjectInspector byoi0, byoi1; + protected transient BooleanObjectInspector boi0,boi1; protected final BooleanWritable result = new BooleanWritable(); @Override Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFCase.java URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFCase.java?rev=1511377&r1=1511376&r2=1511377&view=diff ============================================================================== --- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFCase.java (original) +++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFCase.java Wed Aug 7 16:29:18 2013 @@ -32,9 +32,9 @@ import org.apache.hadoop.hive.serde2.obj * and f should have the same TypeInfo, or an exception will be thrown. */ public class GenericUDFCase extends GenericUDF { - private ObjectInspector[] argumentOIs; - private GenericUDFUtils.ReturnObjectInspectorResolver returnOIResolver; - private GenericUDFUtils.ReturnObjectInspectorResolver caseOIResolver; + private transient ObjectInspector[] argumentOIs; + private transient GenericUDFUtils.ReturnObjectInspectorResolver returnOIResolver; + private transient GenericUDFUtils.ReturnObjectInspectorResolver caseOIResolver; @Override public ObjectInspector initialize(ObjectInspector[] arguments) throws UDFArgumentTypeException { 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=1511377&r1=1511376&r2=1511377&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 Wed Aug 7 16:29:18 2013 @@ -34,8 +34,8 @@ import org.apache.hadoop.hive.serde2.obj extended = "Example:\n" + " > SELECT _FUNC_(NULL, 1, NULL) FROM src LIMIT 1;\n" + " 1") public class GenericUDFCoalesce extends GenericUDF { - private ObjectInspector[] argumentOIs; - private GenericUDFUtils.ReturnObjectInspectorResolver returnOIResolver; + private transient ObjectInspector[] argumentOIs; + private transient GenericUDFUtils.ReturnObjectInspectorResolver returnOIResolver; @Override public ObjectInspector initialize(ObjectInspector[] arguments) throws UDFArgumentTypeException { 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=1511377&r1=1511376&r2=1511377&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 Wed Aug 7 16:29:18 2013 @@ -47,7 +47,7 @@ import org.apache.hadoop.io.Text; + " > SELECT _FUNC_('.', 'www', array('facebook', 'com')) FROM src LIMIT 1;\n" + " 'www.facebook.com'") public class GenericUDFConcatWS extends GenericUDF { - private ObjectInspector[] argumentOIs; + private transient ObjectInspector[] argumentOIs; @Override public ObjectInspector initialize(ObjectInspector[] arguments) throws UDFArgumentException { @@ -64,12 +64,14 @@ public class GenericUDFConcatWS extends if (((ListObjectInspector)arguments[i]).getListElementObjectInspector() .getTypeName().equals(serdeConstants.STRING_TYPE_NAME) || ((ListObjectInspector)arguments[i]).getListElementObjectInspector() - .getTypeName().equals(serdeConstants.VOID_TYPE_NAME)) + .getTypeName().equals(serdeConstants.VOID_TYPE_NAME)) { break; + } case PRIMITIVE: if (arguments[i].getTypeName().equals(serdeConstants.STRING_TYPE_NAME) - || arguments[i].getTypeName().equals(serdeConstants.VOID_TYPE_NAME)) + || arguments[i].getTypeName().equals(serdeConstants.VOID_TYPE_NAME)) { break; + } default: throw new UDFArgumentTypeException(i, "Argument " + (i + 1) + " of function CONCAT_WS must be \"" + serdeConstants.STRING_TYPE_NAME 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=1511377&r1=1511376&r2=1511377&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 Wed Aug 7 16:29:18 2013 @@ -31,8 +31,8 @@ import org.apache.hadoop.hive.ql.index.b import org.apache.hadoop.hive.ql.metadata.HiveException; import org.apache.hadoop.hive.serde2.objectinspector.ListObjectInspector; import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspector; -import org.apache.hadoop.hive.serde2.objectinspector.PrimitiveObjectInspector; import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspector.Category; +import org.apache.hadoop.hive.serde2.objectinspector.PrimitiveObjectInspector; import org.apache.hadoop.hive.serde2.objectinspector.primitive.BooleanObjectInspector; import org.apache.hadoop.hive.serde2.objectinspector.primitive.PrimitiveObjectInspectorFactory; import org.apache.hadoop.hive.serde2.objectinspector.primitive.PrimitiveObjectInspectorUtils; @@ -42,8 +42,8 @@ import org.apache.hadoop.io.LongWritable @Description(name = "ewah_bitmap_empty", value = "_FUNC_(bitmap) - " + "Predicate that tests whether an EWAH-compressed bitmap is all zeros ") public class GenericUDFEWAHBitmapEmpty extends GenericUDF { - ObjectInspector bitmapOI; - BooleanObjectInspector boolOI; + private transient ObjectInspector bitmapOI; + private transient BooleanObjectInspector boolOI; @Override public ObjectInspector initialize(ObjectInspector[] arguments) throws UDFArgumentException { 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=1511377&r1=1511376&r2=1511377&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 Wed Aug 7 16:29:18 2013 @@ -24,8 +24,8 @@ import org.apache.hadoop.hive.ql.exec.UD 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.ObjectInspector.Category; +import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspectorConverters; import org.apache.hadoop.hive.serde2.objectinspector.primitive.PrimitiveObjectInspectorFactory; import org.apache.hadoop.io.IntWritable; @@ -41,7 +41,7 @@ import org.apache.hadoop.io.IntWritable; extended = "Example:\n" + " > SELECT _FUNC_(1, 'face', 'book') FROM src LIMIT 1;\n" + " 'face'") public class GenericUDFElt extends GenericUDF { - private ObjectInspectorConverters.Converter[] converters; + private transient ObjectInspectorConverters.Converter[] converters; @Override public ObjectInspector initialize(ObjectInspector[] arguments) throws UDFArgumentException { 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=1511377&r1=1511376&r2=1511377&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 Wed Aug 7 16:29:18 2013 @@ -24,9 +24,8 @@ import org.apache.hadoop.hive.ql.exec.UD 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.ObjectInspectorUtils; -import org.apache.hadoop.hive.serde2.objectinspector.PrimitiveObjectInspector; import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspector.Category; +import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspectorUtils; import org.apache.hadoop.hive.serde2.objectinspector.primitive.PrimitiveObjectInspectorFactory; import org.apache.hadoop.io.IntWritable; @@ -38,7 +37,7 @@ import org.apache.hadoop.io.IntWritable; + "returns the index of str in the str1,str2,... list or 0 if not found", extended = "All primitive types are supported, arguments are compared using str.equals(x)." + " If str is NULL, the return value is 0.") public class GenericUDFField extends GenericUDF { - private ObjectInspector[] argumentOIs; + private transient ObjectInspector[] argumentOIs; @Override public ObjectInspector initialize(ObjectInspector[] arguments) 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=1511377&r1=1511376&r2=1511377&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 Wed Aug 7 16:29:18 2013 @@ -18,6 +18,8 @@ package org.apache.hadoop.hive.ql.udf.generic; +import java.text.DecimalFormat; + import org.apache.hadoop.hive.ql.exec.Description; import org.apache.hadoop.hive.ql.exec.UDFArgumentException; import org.apache.hadoop.hive.ql.exec.UDFArgumentLengthException; @@ -26,19 +28,12 @@ import org.apache.hadoop.hive.ql.metadat import org.apache.hadoop.hive.serde.serdeConstants; import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspector; 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.hive.serde2.objectinspector.primitive.StringObjectInspector; +import org.apache.hadoop.hive.serde2.objectinspector.primitive.DoubleObjectInspector; import org.apache.hadoop.hive.serde2.objectinspector.primitive.IntObjectInspector; import org.apache.hadoop.hive.serde2.objectinspector.primitive.LongObjectInspector; -import org.apache.hadoop.hive.serde2.objectinspector.primitive.DoubleObjectInspector; +import org.apache.hadoop.hive.serde2.objectinspector.primitive.PrimitiveObjectInspectorFactory; import org.apache.hadoop.io.Text; -import java.text.DecimalFormat; -import java.text.NumberFormat; -import java.lang.Number; -import java.lang.NumberFormatException; - /** * Generic UDF for format_number function * FORMAT_NUMBER(X, D). @@ -58,7 +53,7 @@ import java.lang.NumberFormatException; + " > SELECT _FUNC_(12332.123456, 4) FROM src LIMIT 1;\n" + " '12,332.1235'") public class GenericUDFFormatNumber extends GenericUDF { - private ObjectInspector[] argumentOIs; + private transient ObjectInspector[] argumentOIs; private final Text resultText = new Text(); private final StringBuilder pattern = new StringBuilder(""); private final DecimalFormat numberFormat = new DecimalFormat(""); Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFFromUtcTimestamp.java URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFFromUtcTimestamp.java?rev=1511377&r1=1511376&r2=1511377&view=diff ============================================================================== --- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFFromUtcTimestamp.java (original) +++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFFromUtcTimestamp.java Wed Aug 7 16:29:18 2013 @@ -38,9 +38,9 @@ public class GenericUDFFromUtcTimestamp static final Log LOG = LogFactory.getLog(GenericUDFFromUtcTimestamp.class); - private PrimitiveObjectInspector[] argumentOIs; - private TimestampConverter timestampConverter; - private TextConverter textConverter; + private transient PrimitiveObjectInspector[] argumentOIs; + private transient TimestampConverter timestampConverter; + private transient TextConverter textConverter; @Override public ObjectInspector initialize(ObjectInspector[] arguments) 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=1511377&r1=1511376&r2=1511377&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 Wed Aug 7 16:29:18 2013 @@ -32,7 +32,7 @@ import org.apache.hadoop.io.IntWritable; */ @Description(name = "hash", value = "_FUNC_(a1, a2, ...) - Returns a hash value of the arguments") public class GenericUDFHash extends GenericUDF { - private ObjectInspector[] argumentOIs; + private transient ObjectInspector[] argumentOIs; @Override public ObjectInspector initialize(ObjectInspector[] arguments) throws UDFArgumentTypeException { @@ -41,7 +41,7 @@ public class GenericUDFHash extends Gene return PrimitiveObjectInspectorFactory.writableIntObjectInspector; } - private IntWritable result = new IntWritable(); + private final IntWritable result = new IntWritable(); @Override public Object evaluate(DeferredObject[] arguments) throws HiveException { 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=1511377&r1=1511376&r2=1511377&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 Wed Aug 7 16:29:18 2013 @@ -34,8 +34,8 @@ import org.apache.hadoop.hive.serde2.obj * on the context in which it is used. */ public class GenericUDFIf extends GenericUDF { - private ObjectInspector[] argumentOIs; - private GenericUDFUtils.ReturnObjectInspectorResolver returnOIResolver; + private transient ObjectInspector[] argumentOIs; + private transient GenericUDFUtils.ReturnObjectInspectorResolver returnOIResolver; @Override public ObjectInspector initialize(ObjectInspector[] arguments) throws UDFArgumentException { Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFIn.java URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFIn.java?rev=1511377&r1=1511376&r2=1511377&view=diff ============================================================================== --- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFIn.java (original) +++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFIn.java Wed Aug 7 16:29:18 2013 @@ -56,14 +56,14 @@ import org.apache.hadoop.io.BooleanWrita public class GenericUDFIn extends GenericUDF { - private ObjectInspector[] argumentOIs; + private transient ObjectInspector[] argumentOIs; private Set constantInSet; private boolean isInSetConstant = true; //are variables from IN(...) constant - BooleanWritable bw = new BooleanWritable(); + private final BooleanWritable bw = new BooleanWritable(); - ReturnObjectInspectorResolver conversionHelper; - ObjectInspector compareOI; + private transient ReturnObjectInspectorResolver conversionHelper; + private transient ObjectInspector compareOI; @Override public ObjectInspector initialize(ObjectInspector[] arguments) 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=1511377&r1=1511376&r2=1511377&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 Wed Aug 7 16:29:18 2013 @@ -24,7 +24,6 @@ import java.io.FileInputStream; import java.io.FileNotFoundException; import java.io.InputStream; import java.io.InputStreamReader; - import java.util.HashSet; import org.apache.hadoop.hive.ql.exec.Description; @@ -48,9 +47,9 @@ import org.apache.hadoop.hive.serde2.obj value = "_FUNC_(str, filename) - Returns true if str appears in the file") public class GenericUDFInFile extends GenericUDF { - HashSet set; - ObjectInspector strObjectInspector; - ObjectInspector fileObjectInspector; + private HashSet set; + private transient ObjectInspector strObjectInspector; + private transient ObjectInspector fileObjectInspector; @Override public ObjectInspector initialize(ObjectInspector[] arguments) 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=1511377&r1=1511376&r2=1511377&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 Wed Aug 7 16:29:18 2013 @@ -24,8 +24,8 @@ import org.apache.hadoop.hive.ql.exec.UD 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.ObjectInspector.Category; +import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspectorConverters; import org.apache.hadoop.hive.serde2.objectinspector.primitive.PrimitiveObjectInspectorFactory; import org.apache.hadoop.io.IntWritable; import org.apache.hadoop.io.Text; @@ -47,7 +47,7 @@ import org.apache.hadoop.io.Text; + " > SELECT _FUNC_('Facebook', 'boo') FROM src LIMIT 1;\n" + " 5") public class GenericUDFInstr extends GenericUDF { - ObjectInspectorConverters.Converter[] converters; + private transient ObjectInspectorConverters.Converter[] converters; @Override public ObjectInspector initialize(ObjectInspector[] arguments) throws UDFArgumentException { 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=1511377&r1=1511376&r2=1511377&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 Wed Aug 7 16:29:18 2013 @@ -24,8 +24,8 @@ import org.apache.hadoop.hive.ql.exec.UD 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.ObjectInspector.Category; +import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspectorConverters; import org.apache.hadoop.hive.serde2.objectinspector.primitive.PrimitiveObjectInspectorFactory; import org.apache.hadoop.io.IntWritable; import org.apache.hadoop.io.Text; @@ -48,7 +48,7 @@ import org.apache.hadoop.io.Text; extended = "Example:\n" + " > SELECT _FUNC_('bar', 'foobarbar', 5) FROM src LIMIT 1;\n" + " 7") public class GenericUDFLocate extends GenericUDF { - private ObjectInspectorConverters.Converter[] converters; + private transient ObjectInspectorConverters.Converter[] converters; @Override public ObjectInspector initialize(ObjectInspector[] arguments) throws UDFArgumentException { @@ -82,7 +82,7 @@ public class GenericUDFLocate extends Ge return PrimitiveObjectInspectorFactory.writableIntObjectInspector; } - private IntWritable intWritable = new IntWritable(0); + private final IntWritable intWritable = new IntWritable(0); @Override public Object evaluate(DeferredObject[] arguments) throws HiveException { Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFMap.java URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFMap.java?rev=1511377&r1=1511376&r2=1511377&view=diff ============================================================================== --- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFMap.java (original) +++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFMap.java Wed Aug 7 16:29:18 2013 @@ -27,9 +27,9 @@ import org.apache.hadoop.hive.ql.exec.UD 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.ObjectInspectorConverters.Converter; import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspectorFactory; import org.apache.hadoop.hive.serde2.objectinspector.PrimitiveObjectInspector; -import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspectorConverters.Converter; import org.apache.hadoop.hive.serde2.objectinspector.primitive.PrimitiveObjectInspectorFactory; /** @@ -39,7 +39,7 @@ import org.apache.hadoop.hive.serde2.obj @Description(name = "map", value = "_FUNC_(key0, value0, key1, value1...) - " + "Creates a map with the given key/value pairs ") public class GenericUDFMap extends GenericUDF { - Converter[] converters; + private transient Converter[] converters; HashMap ret = new HashMap(); @Override 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=1511377&r1=1511376&r2=1511377&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 Wed Aug 7 16:29:18 2013 @@ -27,8 +27,8 @@ import org.apache.hadoop.hive.ql.exec.UD import org.apache.hadoop.hive.ql.metadata.HiveException; import org.apache.hadoop.hive.serde2.objectinspector.MapObjectInspector; import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspector; -import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspectorFactory; import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspector.Category; +import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspectorFactory; /** * GenericUDFMapKeys. @@ -37,7 +37,7 @@ import org.apache.hadoop.hive.serde2.obj @Description(name = "map_keys", value = "_FUNC_(map) - " + "Returns an unordered array containing the keys of the input map.") public class GenericUDFMapKeys extends GenericUDF { - private MapObjectInspector mapOI; + private transient MapObjectInspector mapOI; private final ArrayList retArray = new ArrayList(); @Override 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=1511377&r1=1511376&r2=1511377&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 Wed Aug 7 16:29:18 2013 @@ -27,8 +27,8 @@ import org.apache.hadoop.hive.ql.exec.UD import org.apache.hadoop.hive.ql.metadata.HiveException; import org.apache.hadoop.hive.serde2.objectinspector.MapObjectInspector; import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspector; -import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspectorFactory; import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspector.Category; +import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspectorFactory; /** * GenericUDFMapValues. @@ -37,7 +37,7 @@ import org.apache.hadoop.hive.serde2.obj @Description(name = "map_values", value = "_FUNC_(map) - " + "Returns an unordered array containing the values of the input map.") public class GenericUDFMapValues extends GenericUDF { - private MapObjectInspector mapOI; + private transient MapObjectInspector mapOI; private final ArrayList retArray = new ArrayList(); @Override Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFNvl.java URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFNvl.java?rev=1511377&r1=1511376&r2=1511377&view=diff ============================================================================== --- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFNvl.java (original) +++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFNvl.java Wed Aug 7 16:29:18 2013 @@ -22,8 +22,6 @@ import org.apache.hadoop.hive.ql.exec.UD import org.apache.hadoop.hive.ql.exec.UDFArgumentLengthException; import org.apache.hadoop.hive.ql.exec.UDFArgumentTypeException; import org.apache.hadoop.hive.ql.metadata.HiveException; -import org.apache.hadoop.hive.ql.udf.generic.GenericUDF; -import org.apache.hadoop.hive.ql.udf.generic.GenericUDFUtils; import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspector; @Description(name = "nvl", @@ -31,8 +29,8 @@ value = "_FUNC_(value,default_value) - R extended = "Example:\n" + " > SELECT _FUNC_(null,'bla') FROM src LIMIT 1;\n" + " bla") public class GenericUDFNvl extends GenericUDF{ - private GenericUDFUtils.ReturnObjectInspectorResolver returnOIResolver; - private ObjectInspector[] argumentOIs; + private transient GenericUDFUtils.ReturnObjectInspectorResolver returnOIResolver; + private transient ObjectInspector[] argumentOIs; @Override public ObjectInspector initialize(ObjectInspector[] arguments) throws UDFArgumentException { Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFOPAnd.java URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFOPAnd.java?rev=1511377&r1=1511376&r2=1511377&view=diff ============================================================================== --- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFOPAnd.java (original) +++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFOPAnd.java Wed Aug 7 16:29:18 2013 @@ -33,7 +33,7 @@ import org.apache.hadoop.io.BooleanWrita @Description(name = "and", value = "a _FUNC_ b - Logical and") public class GenericUDFOPAnd extends GenericUDF { private final BooleanWritable result = new BooleanWritable(); - BooleanObjectInspector boi0,boi1; + private transient BooleanObjectInspector boi0,boi1; @Override public ObjectInspector initialize(ObjectInspector[] arguments) throws UDFArgumentException { Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFOPNot.java URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFOPNot.java?rev=1511377&r1=1511376&r2=1511377&view=diff ============================================================================== --- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFOPNot.java (original) +++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFOPNot.java Wed Aug 7 16:29:18 2013 @@ -34,7 +34,7 @@ import org.apache.hadoop.io.BooleanWrita @Description(name = "not", value = "_FUNC_ a - Logical not") public class GenericUDFOPNot extends GenericUDF { private final BooleanWritable result = new BooleanWritable(); - BooleanObjectInspector boi; + private transient BooleanObjectInspector boi; @Override public ObjectInspector initialize(ObjectInspector[] arguments) Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFOPOr.java URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFOPOr.java?rev=1511377&r1=1511376&r2=1511377&view=diff ============================================================================== --- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFOPOr.java (original) +++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFOPOr.java Wed Aug 7 16:29:18 2013 @@ -33,7 +33,7 @@ import org.apache.hadoop.io.BooleanWrita @Description(name = "or", value = "a _FUNC_ b - Logical or") public class GenericUDFOPOr extends GenericUDF { private final BooleanWritable result = new BooleanWritable(); - BooleanObjectInspector boi0,boi1; + private transient BooleanObjectInspector boi0,boi1; @Override public ObjectInspector initialize(ObjectInspector[] arguments) 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=1511377&r1=1511376&r2=1511377&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 Wed Aug 7 16:29:18 2013 @@ -18,6 +18,10 @@ package org.apache.hadoop.hive.ql.udf.generic; +import java.util.ArrayList; +import java.util.Formatter; +import java.util.Locale; + import org.apache.hadoop.hive.ql.exec.Description; import org.apache.hadoop.hive.ql.exec.UDFArgumentException; import org.apache.hadoop.hive.ql.exec.UDFArgumentLengthException; @@ -26,26 +30,19 @@ import org.apache.hadoop.hive.ql.metadat import org.apache.hadoop.hive.serde.serdeConstants; import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspector; import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspector.Category; -import org.apache.hadoop.hive.serde2.objectinspector.ListObjectInspector; import org.apache.hadoop.hive.serde2.objectinspector.PrimitiveObjectInspector; -import org.apache.hadoop.hive.serde2.objectinspector.primitive.PrimitiveObjectInspectorFactory; import org.apache.hadoop.hive.serde2.objectinspector.primitive.BooleanObjectInspector; import org.apache.hadoop.hive.serde2.objectinspector.primitive.ByteObjectInspector; -import org.apache.hadoop.hive.serde2.objectinspector.primitive.ShortObjectInspector; +import org.apache.hadoop.hive.serde2.objectinspector.primitive.DoubleObjectInspector; +import org.apache.hadoop.hive.serde2.objectinspector.primitive.FloatObjectInspector; import org.apache.hadoop.hive.serde2.objectinspector.primitive.IntObjectInspector; import org.apache.hadoop.hive.serde2.objectinspector.primitive.LongObjectInspector; -import org.apache.hadoop.hive.serde2.objectinspector.primitive.FloatObjectInspector; -import org.apache.hadoop.hive.serde2.objectinspector.primitive.DoubleObjectInspector; +import org.apache.hadoop.hive.serde2.objectinspector.primitive.PrimitiveObjectInspectorFactory; +import org.apache.hadoop.hive.serde2.objectinspector.primitive.ShortObjectInspector; import org.apache.hadoop.hive.serde2.objectinspector.primitive.StringObjectInspector; import org.apache.hadoop.hive.serde2.objectinspector.primitive.TimestampObjectInspector; -import org.apache.hadoop.hive.serde2.objectinspector.primitive.BinaryObjectInspector; -import org.apache.hadoop.hive.serde2.lazy.ByteArrayRef; import org.apache.hadoop.io.Text; -import java.util.Formatter; -import java.util.Locale; -import java.util.ArrayList; - /** * Generic UDF for printf function * printf(String format, Obj... args). @@ -60,7 +57,7 @@ import java.util.ArrayList; + "FROM src LIMIT 1;\n" + " \"Hello World 100 days\"") public class GenericUDFPrintf extends GenericUDF { - private ObjectInspector[] argumentOIs; + private transient ObjectInspector[] argumentOIs; private final Text resultText = new Text(); @Override Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFReflect.java URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFReflect.java?rev=1511377&r1=1511376&r2=1511377&view=diff ============================================================================== --- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFReflect.java (original) +++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFReflect.java Wed Aug 7 16:29:18 2013 @@ -24,8 +24,8 @@ import org.apache.hadoop.hive.ql.exec.De import org.apache.hadoop.hive.ql.exec.UDFArgumentException; import org.apache.hadoop.hive.ql.exec.UDFArgumentLengthException; import org.apache.hadoop.hive.ql.exec.UDFArgumentTypeException; -import org.apache.hadoop.hive.ql.udf.UDFType; import org.apache.hadoop.hive.ql.metadata.HiveException; +import org.apache.hadoop.hive.ql.udf.UDFType; import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspector; import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspectorUtils; import org.apache.hadoop.hive.serde2.objectinspector.PrimitiveObjectInspector.PrimitiveCategory; @@ -42,8 +42,8 @@ import org.apache.hadoop.util.Reflection @UDFType(deterministic = false) public class GenericUDFReflect extends AbstractGenericUDFReflect { - StringObjectInspector inputClassNameOI; - StringObjectInspector inputMethodNameOI; + private transient StringObjectInspector inputClassNameOI; + private transient StringObjectInspector inputMethodNameOI; StringObjectInspector classNameOI; StringObjectInspector methodNameOI; Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFReflect2.java URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFReflect2.java?rev=1511377&r1=1511376&r2=1511377&view=diff ============================================================================== --- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFReflect2.java (original) +++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFReflect2.java Wed Aug 7 16:29:18 2013 @@ -29,9 +29,9 @@ import org.apache.hadoop.hive.ql.exec.UD import org.apache.hadoop.hive.ql.exec.UDFArgumentTypeException; import org.apache.hadoop.hive.ql.metadata.HiveException; import org.apache.hadoop.hive.ql.udf.UDFType; -import org.apache.hadoop.hive.serde2.io.HiveDecimalWritable; import org.apache.hadoop.hive.serde2.io.ByteWritable; import org.apache.hadoop.hive.serde2.io.DoubleWritable; +import org.apache.hadoop.hive.serde2.io.HiveDecimalWritable; import org.apache.hadoop.hive.serde2.io.ShortWritable; import org.apache.hadoop.hive.serde2.io.TimestampWritable; import org.apache.hadoop.hive.serde2.objectinspector.ConstantObjectInspector; @@ -57,11 +57,11 @@ import org.apache.hadoop.io.Writable; @UDFType(deterministic = true) public class GenericUDFReflect2 extends AbstractGenericUDFReflect { - PrimitiveObjectInspector targetOI; - PrimitiveObjectInspector returnOI; - Method method; + private PrimitiveObjectInspector targetOI; + private PrimitiveObjectInspector returnOI; + private transient Method method; - transient Writable returnObj; + private transient Writable returnObj; @Override public ObjectInspector initialize(ObjectInspector[] arguments) throws UDFArgumentException { 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=1511377&r1=1511376&r2=1511377&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 Wed Aug 7 16:29:18 2013 @@ -18,9 +18,9 @@ package org.apache.hadoop.hive.ql.udf.generic; +import java.text.BreakIterator; import java.util.ArrayList; import java.util.Locale; -import java.text.BreakIterator; import org.apache.hadoop.hive.ql.exec.Description; import org.apache.hadoop.hive.ql.exec.UDFArgumentException; @@ -49,7 +49,7 @@ import org.apache.hadoop.io.Text; + "language codes are fully supported, and if an unsupported code is specified, a default " + "locale is used to process that string.") public class GenericUDFSentences extends GenericUDF { - private ObjectInspectorConverters.Converter[] converters; + private transient ObjectInspectorConverters.Converter[] converters; @Override public ObjectInspector initialize(ObjectInspector[] arguments) throws UDFArgumentException { 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=1511377&r1=1511376&r2=1511377&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 Wed Aug 7 16:29:18 2013 @@ -37,8 +37,8 @@ import org.apache.hadoop.io.IntWritable; */ @Description(name = "size", value = "_FUNC_(a) - Returns the size of a") public class GenericUDFSize extends GenericUDF { - private ObjectInspector returnOI; - private final IntWritable result = new IntWritable(-1); + private transient ObjectInspector returnOI; + private final transient IntWritable result = new IntWritable(-1); @Override public ObjectInspector initialize(ObjectInspector[] arguments)