You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by ha...@apache.org on 2013/08/27 19:10:01 UTC

svn commit: r1517888 [2/6] - in /hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions: ./ aggregates/ aggregates/gen/ gen/ templates/

Modified: hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/VectorUDFTimestampFieldLong.java
URL: http://svn.apache.org/viewvc/hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/VectorUDFTimestampFieldLong.java?rev=1517888&r1=1517887&r2=1517888&view=diff
==============================================================================
--- hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/VectorUDFTimestampFieldLong.java (original)
+++ hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/VectorUDFTimestampFieldLong.java Tue Aug 27 17:09:56 2013
@@ -29,19 +29,25 @@ import org.apache.hadoop.hive.ql.exec.ve
  */
 public abstract class VectorUDFTimestampFieldLong extends VectorExpression {
 
-  protected final int colNum;
-  protected final int outputColumn;
-  protected final int field;
-  protected final Calendar calendar = Calendar.getInstance();
-  protected final Timestamp ts = new Timestamp(0);
+  private static final long serialVersionUID = 1L;
+
+  protected int colNum;
+  protected int outputColumn;
+  protected int field;
+  protected transient final Calendar calendar = Calendar.getInstance();
+  protected transient final Timestamp ts = new Timestamp(0);
 
   public VectorUDFTimestampFieldLong(int field, int colNum, int outputColumn) {
-    super();
+    this();
     this.colNum = colNum;
     this.outputColumn = outputColumn;
     this.field = field;
   }
 
+  public VectorUDFTimestampFieldLong() {
+    super();
+  }
+
   protected final Timestamp getTimestamp(long nanos) {
     /*
      * new Timestamp() stores the millisecond precision values in the nanos field.
@@ -134,4 +140,24 @@ public abstract class VectorUDFTimestamp
     return "long";
   }
 
+  public int getColNum() {
+    return colNum;
+  }
+
+  public void setColNum(int colNum) {
+    this.colNum = colNum;
+  }
+
+  public int getField() {
+    return field;
+  }
+
+  public void setField(int field) {
+    this.field = field;
+  }
+
+  public void setOutputColumn(int outputColumn) {
+    this.outputColumn = outputColumn;
+  }
+
 }

Modified: hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/VectorUDFUnixTimeStampLong.java
URL: http://svn.apache.org/viewvc/hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/VectorUDFUnixTimeStampLong.java?rev=1517888&r1=1517887&r2=1517888&view=diff
==============================================================================
--- hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/VectorUDFUnixTimeStampLong.java (original)
+++ hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/VectorUDFUnixTimeStampLong.java Tue Aug 27 17:09:56 2013
@@ -24,6 +24,8 @@ package org.apache.hadoop.hive.ql.exec.v
  */
 public final class VectorUDFUnixTimeStampLong extends VectorUDFTimestampFieldLong {
 
+  private static final long serialVersionUID = 1L;
+
   @Override
   protected long getField(long time) {
     long ms = (time / (1000*1000*1000)) * 1000;
@@ -40,4 +42,8 @@ public final class VectorUDFUnixTimeStam
     super(-1, colNum, outputColumn);
   }
 
+  public VectorUDFUnixTimeStampLong() {
+    super();
+  }
+
 }

Modified: hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/VectorUDFWeekOfYearLong.java
URL: http://svn.apache.org/viewvc/hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/VectorUDFWeekOfYearLong.java?rev=1517888&r1=1517887&r2=1517888&view=diff
==============================================================================
--- hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/VectorUDFWeekOfYearLong.java (original)
+++ hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/VectorUDFWeekOfYearLong.java Tue Aug 27 17:09:56 2013
@@ -26,11 +26,21 @@ import java.util.Calendar;
  */
 public final class VectorUDFWeekOfYearLong extends VectorUDFTimestampFieldLong {
 
+  private static final long serialVersionUID = 1L;
+
   public VectorUDFWeekOfYearLong(int colNum, int outputColumn) {
     super(Calendar.WEEK_OF_YEAR, colNum, outputColumn);
+    initCalendar();
+  }
+
+  public VectorUDFWeekOfYearLong() {
+    super();
+    initCalendar();
+  }
+
+  private void initCalendar() {
     /* code copied over from UDFWeekOfYear implementation */
     calendar.setFirstDayOfWeek(Calendar.MONDAY);
     calendar.setMinimalDaysInFirstWeek(4);
   }
-
 }

Modified: hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/VectorUDFYearLong.java
URL: http://svn.apache.org/viewvc/hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/VectorUDFYearLong.java?rev=1517888&r1=1517887&r2=1517888&view=diff
==============================================================================
--- hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/VectorUDFYearLong.java (original)
+++ hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/VectorUDFYearLong.java Tue Aug 27 17:09:56 2013
@@ -27,10 +27,11 @@ import java.util.Calendar;
  */
 public final class VectorUDFYearLong extends VectorUDFTimestampFieldLong {
 
+  private static final long serialVersionUID = 1L;
   /* year boundaries in nanoseconds */
-  static final long[] YEAR_BOUNDARIES;
-  static final int MIN_YEAR = 1901;
-  static final int MAX_YEAR = 2038;
+  static transient final long[] YEAR_BOUNDARIES;
+  static transient final int MIN_YEAR = 1901;
+  static transient final int MAX_YEAR = 2038;
 
   static {
     YEAR_BOUNDARIES = new long[MAX_YEAR-MIN_YEAR];
@@ -60,4 +61,7 @@ public final class VectorUDFYearLong ext
     super(Calendar.YEAR, colNum, outputColumn);
   }
 
+  public VectorUDFYearLong() {
+    super();
+  }
 }

Modified: hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/aggregates/VectorAggregateExpression.java
URL: http://svn.apache.org/viewvc/hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/aggregates/VectorAggregateExpression.java?rev=1517888&r1=1517887&r2=1517888&view=diff
==============================================================================
--- hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/aggregates/VectorAggregateExpression.java (original)
+++ hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/aggregates/VectorAggregateExpression.java Tue Aug 27 17:09:56 2013
@@ -18,6 +18,8 @@
 
 package org.apache.hadoop.hive.ql.exec.vector.expressions.aggregates;
 
+import java.io.Serializable;
+
 import org.apache.hadoop.hive.ql.exec.vector.VectorAggregationBufferRow;
 import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch;
 import org.apache.hadoop.hive.ql.metadata.HiveException;
@@ -27,12 +29,14 @@ import org.apache.hadoop.hive.serde2.obj
 /**
  * Base class for aggregation expressions.
  */
-public abstract class VectorAggregateExpression  {
+public abstract class VectorAggregateExpression  implements Serializable {
+
+  private static final long serialVersionUID = 1L;
 
   /**
    * Buffer interface to store aggregates.
    */
-  public static interface AggregationBuffer {
+  public static interface AggregationBuffer extends Serializable {
     int getVariableSize();
   };
 

Modified: hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/aggregates/VectorUDAFCount.java
URL: http://svn.apache.org/viewvc/hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/aggregates/VectorUDAFCount.java?rev=1517888&r1=1517887&r2=1517888&view=diff
==============================================================================
--- hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/aggregates/VectorUDAFCount.java (original)
+++ hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/aggregates/VectorUDAFCount.java Tue Aug 27 17:09:56 2013
@@ -37,12 +37,17 @@ import org.apache.hadoop.io.LongWritable
 @Description(name = "count", value = "_FUNC_(expr) - Returns the count (vectorized)")
 public class VectorUDAFCount extends VectorAggregateExpression {
 
+  private static final long serialVersionUID = 1L;
+
     /**
      * class for storing the current aggregate value.
      */
     static class Aggregation implements AggregationBuffer {
-      private long value;
-      private boolean isNull;
+
+      private static final long serialVersionUID = 1L;
+
+      transient private long value;
+      transient private boolean isNull;
 
       public void initIfNull() {
         if (isNull) {
@@ -57,12 +62,16 @@ public class VectorUDAFCount extends Vec
       }
     }
 
-    private final VectorExpression inputExpression;
-  private final LongWritable result;
+    private VectorExpression inputExpression = null;
+    transient private final LongWritable result;
 
     public VectorUDAFCount(VectorExpression inputExpression) {
-      super();
+      this();
       this.inputExpression = inputExpression;
+    }
+
+    public VectorUDAFCount() {
+      super();
       result = new LongWritable(0);
     }
 
@@ -265,5 +274,13 @@ public class VectorUDAFCount extends Vec
     public void init(AggregationDesc desc) throws HiveException {
       // No-op
     }
+
+    public VectorExpression getInputExpression() {
+      return inputExpression;
+    }
+
+    public void setInputExpression(VectorExpression inputExpression) {
+      this.inputExpression = inputExpression;
+    }
 }
 

Modified: hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/aggregates/VectorUDAFCountStar.java
URL: http://svn.apache.org/viewvc/hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/aggregates/VectorUDAFCountStar.java?rev=1517888&r1=1517887&r2=1517888&view=diff
==============================================================================
--- hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/aggregates/VectorUDAFCountStar.java (original)
+++ hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/aggregates/VectorUDAFCountStar.java Tue Aug 27 17:09:56 2013
@@ -35,12 +35,17 @@ import org.apache.hadoop.io.LongWritable
 @Description(name = "count", value = "_FUNC_(expr) - Returns count(*) (vectorized)")
 public class VectorUDAFCountStar extends VectorAggregateExpression {
 
+  private static final long serialVersionUID = 1L;
+
     /**
      * class for storing the current aggregate value.
      */
     static class Aggregation implements AggregationBuffer {
-      private long value;
-      private boolean isNull;
+
+      private static final long serialVersionUID = 1L;
+
+      transient private long value;
+      transient private boolean isNull;
 
       @Override
       public int getVariableSize() {
@@ -48,9 +53,13 @@ public class VectorUDAFCountStar extends
       }
     }
 
-    private final LongWritable result;
+    transient private final LongWritable result;
 
     public VectorUDAFCountStar(VectorExpression inputExpression) {
+      this();
+    }
+
+    public VectorUDAFCountStar() {
       super();
       result = new LongWritable(0);
     }

Modified: hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/aggregates/gen/VectorUDAFAvgDouble.java
URL: http://svn.apache.org/viewvc/hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/aggregates/gen/VectorUDAFAvgDouble.java?rev=1517888&r1=1517887&r2=1517888&view=diff
==============================================================================
--- hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/aggregates/gen/VectorUDAFAvgDouble.java (original)
+++ hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/aggregates/gen/VectorUDAFAvgDouble.java Tue Aug 27 17:09:56 2013
@@ -44,12 +44,17 @@ import org.apache.hadoop.hive.serde2.obj
 @Description(name = "avg",
     value = "_FUNC_(expr) - Returns the average value of expr (vectorized, type: double)")
 public class VectorUDAFAvgDouble extends VectorAggregateExpression {
+
+    private static final long serialVersionUID = 1L;
     
     /** class for storing the current aggregate value. */
     static class Aggregation implements AggregationBuffer {
-      private double sum;
-      private long count;
-      private boolean isNull;
+
+      private static final long serialVersionUID = 1L;
+
+      transient private double sum;
+      transient private long count;
+      transient private boolean isNull;
       
       public void sumValue(double value) {
         if (isNull) {
@@ -69,20 +74,23 @@ public class VectorUDAFAvgDouble extends
     }
     
     private VectorExpression inputExpression;
-    private Object[] partialResult;
-    private LongWritable resultCount;
-    private DoubleWritable resultSum;
-    private StructObjectInspector soi;
+    transient private Object[] partialResult;
+    transient private LongWritable resultCount;
+    transient private DoubleWritable resultSum;
+    transient private StructObjectInspector soi;
         
     public VectorUDAFAvgDouble(VectorExpression inputExpression) {
-      super();
+      this();
       this.inputExpression = inputExpression;
+    }
+
+    public VectorUDAFAvgDouble() {
+      super();
       partialResult = new Object[2];
       resultCount = new LongWritable();
       resultSum = new DoubleWritable();
       partialResult[0] = resultCount;
       partialResult[1] = resultSum;
-      
       initPartialResultInspector();
     }
 
@@ -454,5 +462,13 @@ public class VectorUDAFAvgDouble extends
   public void init(AggregationDesc desc) throws HiveException {
     // No-op
   }
+  
+  public VectorExpression getInputExpression() {
+    return inputExpression;
+  }
+
+  public void setInputExpression(VectorExpression inputExpression) {
+    this.inputExpression = inputExpression;
+  }
 }
 

Modified: hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/aggregates/gen/VectorUDAFAvgLong.java
URL: http://svn.apache.org/viewvc/hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/aggregates/gen/VectorUDAFAvgLong.java?rev=1517888&r1=1517887&r2=1517888&view=diff
==============================================================================
--- hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/aggregates/gen/VectorUDAFAvgLong.java (original)
+++ hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/aggregates/gen/VectorUDAFAvgLong.java Tue Aug 27 17:09:56 2013
@@ -22,21 +22,20 @@ import java.util.ArrayList;
 import java.util.List;
 
 import org.apache.hadoop.hive.ql.exec.Description;
-import org.apache.hadoop.hive.ql.exec.vector.expressions.VectorExpression;
-import org.apache.hadoop.hive.ql.exec.vector.expressions.aggregates.VectorAggregateExpression;
+import org.apache.hadoop.hive.ql.exec.vector.LongColumnVector;
 import org.apache.hadoop.hive.ql.exec.vector.VectorAggregationBufferRow;
 import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch;
-import org.apache.hadoop.hive.ql.exec.vector.LongColumnVector;
-import org.apache.hadoop.hive.ql.exec.vector.DoubleColumnVector;
+import org.apache.hadoop.hive.ql.exec.vector.expressions.VectorExpression;
+import org.apache.hadoop.hive.ql.exec.vector.expressions.aggregates.VectorAggregateExpression;
 import org.apache.hadoop.hive.ql.metadata.HiveException;
 import org.apache.hadoop.hive.ql.plan.AggregationDesc;
 import org.apache.hadoop.hive.ql.util.JavaDataModel;
-import org.apache.hadoop.io.LongWritable;
 import org.apache.hadoop.hive.serde2.io.DoubleWritable;
 import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspector;
 import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspectorFactory;
 import org.apache.hadoop.hive.serde2.objectinspector.StructObjectInspector;
 import org.apache.hadoop.hive.serde2.objectinspector.primitive.PrimitiveObjectInspectorFactory;
+import org.apache.hadoop.io.LongWritable;
 
 /**
  * Generated from template VectorUDAFAvg.txt.
@@ -44,16 +43,21 @@ import org.apache.hadoop.hive.serde2.obj
 @Description(name = "avg",
     value = "_FUNC_(expr) - Returns the average value of expr (vectorized, type: long)")
 public class VectorUDAFAvgLong extends VectorAggregateExpression {
-    
+
+    private static final long serialVersionUID = 1L;
+
     /** class for storing the current aggregate value. */
     static class Aggregation implements AggregationBuffer {
-      private double sum;
-      private long count;
-      private boolean isNull;
-      
+
+      private static final long serialVersionUID = 1L;
+
+      transient private double sum = 0;
+      transient private long count = 0;
+      transient private boolean isNull;
+
       public void sumValue(long value) {
         if (isNull) {
-          sum = value; 
+          sum = value;
           count = 1;
           isNull = false;
         } else {
@@ -67,22 +71,25 @@ public class VectorUDAFAvgLong extends V
         throw new UnsupportedOperationException();
       }
     }
-    
+
     private VectorExpression inputExpression;
-    private Object[] partialResult;
-    private LongWritable resultCount;
-    private DoubleWritable resultSum;
-    private StructObjectInspector soi;
-        
+    transient private Object[] partialResult;
+    transient private LongWritable resultCount;
+    transient private DoubleWritable resultSum;
+    transient private StructObjectInspector soi;
+
     public VectorUDAFAvgLong(VectorExpression inputExpression) {
-      super();
+      this();
       this.inputExpression = inputExpression;
+    }
+
+    public VectorUDAFAvgLong() {
+      super();
       partialResult = new Object[2];
       resultCount = new LongWritable();
       resultSum = new DoubleWritable();
       partialResult[0] = resultCount;
       partialResult[1] = resultSum;
-      
       initPartialResultInspector();
     }
 
@@ -95,7 +102,7 @@ public class VectorUDAFAvgLong extends V
         fname.add("sum");
         soi = ObjectInspectorFactory.getStandardStructObjectInspector(fname, foi);
     }
-    
+
     private Aggregation getCurrentAggregationBuffer(
         VectorAggregationBufferRow[] aggregationBufferSets,
         int bufferIndex,
@@ -104,21 +111,21 @@ public class VectorUDAFAvgLong extends V
       Aggregation myagg = (Aggregation) mySet.getAggregationBuffer(bufferIndex);
       return myagg;
     }
-    
+
     @Override
     public void aggregateInputSelection(
       VectorAggregationBufferRow[] aggregationBufferSets,
-      int bufferIndex, 
+      int bufferIndex,
       VectorizedRowBatch batch) throws HiveException {
-      
+
       int batchSize = batch.size;
-      
+
       if (batchSize == 0) {
         return;
       }
-      
+
       inputExpression.evaluate(batch);
-      
+
        LongColumnVector inputVector = ( LongColumnVector)batch.
         cols[this.inputExpression.getOutputColumn()];
       long[] vector = inputVector.vector;
@@ -172,12 +179,12 @@ public class VectorUDAFAvgLong extends V
 
       for (int i=0; i < batchSize; ++i) {
         Aggregation myagg = getCurrentAggregationBuffer(
-          aggregationBufferSets, 
+          aggregationBufferSets,
           bufferIndex,
           i);
         myagg.sumValue(value);
       }
-    } 
+    }
 
     private void iterateNoNullsSelectionWithAggregationSelection(
       VectorAggregationBufferRow[] aggregationBufferSets,
@@ -185,10 +192,10 @@ public class VectorUDAFAvgLong extends V
       long[] values,
       int[] selection,
       int batchSize) {
-      
+
       for (int i=0; i < batchSize; ++i) {
         Aggregation myagg = getCurrentAggregationBuffer(
-          aggregationBufferSets, 
+          aggregationBufferSets,
           bufferIndex,
           i);
         myagg.sumValue(values[selection[i]]);
@@ -202,7 +209,7 @@ public class VectorUDAFAvgLong extends V
       int batchSize) {
       for (int i=0; i < batchSize; ++i) {
         Aggregation myagg = getCurrentAggregationBuffer(
-          aggregationBufferSets, 
+          aggregationBufferSets,
           bufferIndex,
           i);
         myagg.sumValue(values[i]);
@@ -216,17 +223,17 @@ public class VectorUDAFAvgLong extends V
       int batchSize,
       int[] selection,
       boolean[] isNull) {
-      
+
       for (int i=0; i < batchSize; ++i) {
         if (!isNull[selection[i]]) {
           Aggregation myagg = getCurrentAggregationBuffer(
-            aggregationBufferSets, 
+            aggregationBufferSets,
             bufferIndex,
             i);
           myagg.sumValue(value);
         }
       }
-      
+
     }
 
     private void iterateHasNullsRepeatingWithAggregationSelection(
@@ -239,7 +246,7 @@ public class VectorUDAFAvgLong extends V
       for (int i=0; i < batchSize; ++i) {
         if (!isNull[i]) {
           Aggregation myagg = getCurrentAggregationBuffer(
-            aggregationBufferSets, 
+            aggregationBufferSets,
             bufferIndex,
             i);
           myagg.sumValue(value);
@@ -259,7 +266,7 @@ public class VectorUDAFAvgLong extends V
         int i = selection[j];
         if (!isNull[i]) {
           Aggregation myagg = getCurrentAggregationBuffer(
-            aggregationBufferSets, 
+            aggregationBufferSets,
             bufferIndex,
             j);
           myagg.sumValue(values[i]);
@@ -277,7 +284,7 @@ public class VectorUDAFAvgLong extends V
       for (int i=0; i < batchSize; ++i) {
         if (!isNull[i]) {
           Aggregation myagg = getCurrentAggregationBuffer(
-            aggregationBufferSets, 
+            aggregationBufferSets,
             bufferIndex,
             i);
           myagg.sumValue(values[i]);
@@ -285,26 +292,26 @@ public class VectorUDAFAvgLong extends V
       }
    }
 
-    
+
     @Override
-    public void aggregateInput(AggregationBuffer agg, VectorizedRowBatch batch) 
+    public void aggregateInput(AggregationBuffer agg, VectorizedRowBatch batch)
         throws HiveException {
-        
+
         inputExpression.evaluate(batch);
-        
-        LongColumnVector inputVector = 
+
+        LongColumnVector inputVector =
             (LongColumnVector)batch.cols[this.inputExpression.getOutputColumn()];
-        
+
         int batchSize = batch.size;
-        
+
         if (batchSize == 0) {
           return;
         }
-        
+
         Aggregation myagg = (Aggregation)agg;
-  
+
         long[] vector = inputVector.vector;
-        
+
         if (inputVector.isRepeating) {
           if (inputVector.noNulls) {
             if (myagg.isNull) {
@@ -317,7 +324,7 @@ public class VectorUDAFAvgLong extends V
           }
           return;
         }
-        
+
         if (!batch.selectedInUse && inputVector.noNulls) {
           iterateNoSelectionNoNulls(myagg, vector, batchSize);
         }
@@ -331,14 +338,14 @@ public class VectorUDAFAvgLong extends V
           iterateSelectionHasNulls(myagg, vector, batchSize, inputVector.isNull, batch.selected);
         }
     }
-  
+
     private void iterateSelectionHasNulls(
-        Aggregation myagg, 
-        long[] vector, 
+        Aggregation myagg,
+        long[] vector,
         int batchSize,
-        boolean[] isNull, 
+        boolean[] isNull,
         int[] selected) {
-      
+
       for (int j=0; j< batchSize; ++j) {
         int i = selected[j];
         if (!isNull[i]) {
@@ -355,17 +362,17 @@ public class VectorUDAFAvgLong extends V
     }
 
     private void iterateSelectionNoNulls(
-        Aggregation myagg, 
-        long[] vector, 
-        int batchSize, 
+        Aggregation myagg,
+        long[] vector,
+        int batchSize,
         int[] selected) {
-      
+
       if (myagg.isNull) {
         myagg.isNull = false;
         myagg.sum = 0;
         myagg.count = 0;
       }
-      
+
       for (int i=0; i< batchSize; ++i) {
         long value = vector[selected[i]];
         myagg.sum += value;
@@ -374,15 +381,15 @@ public class VectorUDAFAvgLong extends V
     }
 
     private void iterateNoSelectionHasNulls(
-        Aggregation myagg, 
-        long[] vector, 
+        Aggregation myagg,
+        long[] vector,
         int batchSize,
         boolean[] isNull) {
-      
+
       for(int i=0;i<batchSize;++i) {
         if (!isNull[i]) {
           long value = vector[i];
-          if (myagg.isNull) { 
+          if (myagg.isNull) {
             myagg.isNull = false;
             myagg.sum = 0;
             myagg.count = 0;
@@ -394,15 +401,15 @@ public class VectorUDAFAvgLong extends V
     }
 
     private void iterateNoSelectionNoNulls(
-        Aggregation myagg, 
-        long[] vector, 
+        Aggregation myagg,
+        long[] vector,
         int batchSize) {
       if (myagg.isNull) {
         myagg.isNull = false;
         myagg.sum = 0;
         myagg.count = 0;
       }
-      
+
       for (int i=0;i<batchSize;++i) {
         long value = vector[i];
         myagg.sum += value;
@@ -435,11 +442,11 @@ public class VectorUDAFAvgLong extends V
         return partialResult;
       }
     }
-    
+
   @Override
     public ObjectInspector getOutputObjectInspector() {
     return soi;
-  }     
+  }
 
   @Override
   public int getAggregationBufferFixedSize() {
@@ -454,5 +461,13 @@ public class VectorUDAFAvgLong extends V
   public void init(AggregationDesc desc) throws HiveException {
     // No-op
   }
+
+  public VectorExpression getInputExpression() {
+    return inputExpression;
+  }
+
+  public void setInputExpression(VectorExpression inputExpression) {
+    this.inputExpression = inputExpression;
+  }
 }
 

Modified: hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/aggregates/gen/VectorUDAFMaxDouble.java
URL: http://svn.apache.org/viewvc/hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/aggregates/gen/VectorUDAFMaxDouble.java?rev=1517888&r1=1517887&r2=1517888&view=diff
==============================================================================
--- hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/aggregates/gen/VectorUDAFMaxDouble.java (original)
+++ hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/aggregates/gen/VectorUDAFMaxDouble.java Tue Aug 27 17:09:56 2013
@@ -38,13 +38,18 @@ import org.apache.hadoop.hive.serde2.obj
 @Description(name = "max", 
     value = "_FUNC_(expr) - Returns the maximum value of expr (vectorized, type: double)")
 public class VectorUDAFMaxDouble extends VectorAggregateExpression {
+   
+    private static final long serialVersionUID = 1L;
     
     /** 
      * class for storing the current aggregate value.
      */
     static private final class Aggregation implements AggregationBuffer {
-      private double value;
-      private boolean isNull;
+
+      private static final long serialVersionUID = 1L;
+
+      transient private double value;
+      transient private boolean isNull;
 
       public void checkValue(double value) {
         if (isNull) {
@@ -62,12 +67,16 @@ public class VectorUDAFMaxDouble extends
     }
     
     private VectorExpression inputExpression;
-    private VectorExpressionWriter resultWriter;
+    private transient VectorExpressionWriter resultWriter;
     
     public VectorUDAFMaxDouble(VectorExpression inputExpression) {
-      super();
+      this();
       this.inputExpression = inputExpression;
     }
+
+    public VectorUDAFMaxDouble() {
+      super();
+    }
     
     @Override
     public void init(AggregationDesc desc) throws HiveException {
@@ -421,5 +430,12 @@ public class VectorUDAFMaxDouble extends
       model.memoryAlign());
   }
 
+  public VectorExpression getInputExpression() {
+    return inputExpression;
+  }
+
+  public void setInputExpression(VectorExpression inputExpression) {
+    this.inputExpression = inputExpression;
+  }
 }
 

Modified: hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/aggregates/gen/VectorUDAFMaxLong.java
URL: http://svn.apache.org/viewvc/hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/aggregates/gen/VectorUDAFMaxLong.java?rev=1517888&r1=1517887&r2=1517888&view=diff
==============================================================================
--- hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/aggregates/gen/VectorUDAFMaxLong.java (original)
+++ hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/aggregates/gen/VectorUDAFMaxLong.java Tue Aug 27 17:09:56 2013
@@ -38,13 +38,18 @@ import org.apache.hadoop.hive.serde2.obj
 @Description(name = "max", 
     value = "_FUNC_(expr) - Returns the maximum value of expr (vectorized, type: long)")
 public class VectorUDAFMaxLong extends VectorAggregateExpression {
+   
+    private static final long serialVersionUID = 1L;
     
     /** 
      * class for storing the current aggregate value.
      */
     static private final class Aggregation implements AggregationBuffer {
-      private long value;
-      private boolean isNull;
+
+      private static final long serialVersionUID = 1L;
+
+      transient private long value;
+      transient private boolean isNull;
 
       public void checkValue(long value) {
         if (isNull) {
@@ -62,12 +67,16 @@ public class VectorUDAFMaxLong extends V
     }
     
     private VectorExpression inputExpression;
-    private VectorExpressionWriter resultWriter;
+    private transient VectorExpressionWriter resultWriter;
     
     public VectorUDAFMaxLong(VectorExpression inputExpression) {
-      super();
+      this();
       this.inputExpression = inputExpression;
     }
+
+    public VectorUDAFMaxLong() {
+      super();
+    }
     
     @Override
     public void init(AggregationDesc desc) throws HiveException {
@@ -421,5 +430,12 @@ public class VectorUDAFMaxLong extends V
       model.memoryAlign());
   }
 
+  public VectorExpression getInputExpression() {
+    return inputExpression;
+  }
+
+  public void setInputExpression(VectorExpression inputExpression) {
+    this.inputExpression = inputExpression;
+  }
 }
 

Modified: hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/aggregates/gen/VectorUDAFMaxString.java
URL: http://svn.apache.org/viewvc/hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/aggregates/gen/VectorUDAFMaxString.java?rev=1517888&r1=1517887&r2=1517888&view=diff
==============================================================================
--- hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/aggregates/gen/VectorUDAFMaxString.java (original)
+++ hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/aggregates/gen/VectorUDAFMaxString.java Tue Aug 27 17:09:56 2013
@@ -41,15 +41,19 @@ import org.apache.hadoop.io.Text;
     value = "_FUNC_(expr) - Returns the minimum value of expr (vectorized, type: string)")
 public class VectorUDAFMaxString extends VectorAggregateExpression {
 
+    private static final long serialVersionUID = 1L;
+
     /** 
      * class for storing the current aggregate value.
      */
     static private final class Aggregation implements AggregationBuffer {
 
-      private final static int MIN_BUFFER_SIZE = 16;
-      private byte[] bytes = new byte[MIN_BUFFER_SIZE];
-      private int length;
-      private boolean isNull;
+      private static final long serialVersionUID = 1L;
+
+      transient private final static int MIN_BUFFER_SIZE = 16;
+      transient private byte[] bytes = new byte[MIN_BUFFER_SIZE];
+      transient private int length;
+      transient private boolean isNull;
 
       public void checkValue(byte[] bytes, int start, int length) {
         if (isNull) {
@@ -75,15 +79,18 @@ public class VectorUDAFMaxString extends
         JavaDataModel model = JavaDataModel.get();
         return model.lengthForByteArrayOfSize(bytes.length);
       }
-
     }
     
     private VectorExpression inputExpression;
-    private Text result;
+    transient private Text result;
     
     public VectorUDAFMaxString(VectorExpression inputExpression) {
-      super();
+      this();
       this.inputExpression = inputExpression;
+    }
+
+    public VectorUDAFMaxString() {
+      super();
       result = new Text();
     }
     
@@ -381,5 +388,13 @@ public class VectorUDAFMaxString extends
     public void init(AggregationDesc desc) throws HiveException {
       // No-op
     }
+
+    public VectorExpression getInputExpression() {
+      return inputExpression;
+    }
+
+    public void setInputExpression(VectorExpression inputExpression) {
+      this.inputExpression = inputExpression;
+    }
 }
 

Modified: hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/aggregates/gen/VectorUDAFMinDouble.java
URL: http://svn.apache.org/viewvc/hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/aggregates/gen/VectorUDAFMinDouble.java?rev=1517888&r1=1517887&r2=1517888&view=diff
==============================================================================
--- hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/aggregates/gen/VectorUDAFMinDouble.java (original)
+++ hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/aggregates/gen/VectorUDAFMinDouble.java Tue Aug 27 17:09:56 2013
@@ -38,13 +38,18 @@ import org.apache.hadoop.hive.serde2.obj
 @Description(name = "min", 
     value = "_FUNC_(expr) - Returns the minimum value of expr (vectorized, type: double)")
 public class VectorUDAFMinDouble extends VectorAggregateExpression {
+   
+    private static final long serialVersionUID = 1L;
     
     /** 
      * class for storing the current aggregate value.
      */
     static private final class Aggregation implements AggregationBuffer {
-      private double value;
-      private boolean isNull;
+
+      private static final long serialVersionUID = 1L;
+
+      transient private double value;
+      transient private boolean isNull;
 
       public void checkValue(double value) {
         if (isNull) {
@@ -62,12 +67,16 @@ public class VectorUDAFMinDouble extends
     }
     
     private VectorExpression inputExpression;
-    private VectorExpressionWriter resultWriter;
+    private transient VectorExpressionWriter resultWriter;
     
     public VectorUDAFMinDouble(VectorExpression inputExpression) {
-      super();
+      this();
       this.inputExpression = inputExpression;
     }
+
+    public VectorUDAFMinDouble() {
+      super();
+    }
     
     @Override
     public void init(AggregationDesc desc) throws HiveException {
@@ -421,5 +430,12 @@ public class VectorUDAFMinDouble extends
       model.memoryAlign());
   }
 
+  public VectorExpression getInputExpression() {
+    return inputExpression;
+  }
+
+  public void setInputExpression(VectorExpression inputExpression) {
+    this.inputExpression = inputExpression;
+  }
 }
 

Modified: hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/aggregates/gen/VectorUDAFMinLong.java
URL: http://svn.apache.org/viewvc/hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/aggregates/gen/VectorUDAFMinLong.java?rev=1517888&r1=1517887&r2=1517888&view=diff
==============================================================================
--- hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/aggregates/gen/VectorUDAFMinLong.java (original)
+++ hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/aggregates/gen/VectorUDAFMinLong.java Tue Aug 27 17:09:56 2013
@@ -38,13 +38,18 @@ import org.apache.hadoop.hive.serde2.obj
 @Description(name = "min", 
     value = "_FUNC_(expr) - Returns the minimum value of expr (vectorized, type: long)")
 public class VectorUDAFMinLong extends VectorAggregateExpression {
+   
+    private static final long serialVersionUID = 1L;
     
     /** 
      * class for storing the current aggregate value.
      */
     static private final class Aggregation implements AggregationBuffer {
-      private long value;
-      private boolean isNull;
+
+      private static final long serialVersionUID = 1L;
+
+      transient private long value;
+      transient private boolean isNull;
 
       public void checkValue(long value) {
         if (isNull) {
@@ -62,12 +67,16 @@ public class VectorUDAFMinLong extends V
     }
     
     private VectorExpression inputExpression;
-    private VectorExpressionWriter resultWriter;
+    private transient VectorExpressionWriter resultWriter;
     
     public VectorUDAFMinLong(VectorExpression inputExpression) {
-      super();
+      this();
       this.inputExpression = inputExpression;
     }
+
+    public VectorUDAFMinLong() {
+      super();
+    }
     
     @Override
     public void init(AggregationDesc desc) throws HiveException {
@@ -421,5 +430,12 @@ public class VectorUDAFMinLong extends V
       model.memoryAlign());
   }
 
+  public VectorExpression getInputExpression() {
+    return inputExpression;
+  }
+
+  public void setInputExpression(VectorExpression inputExpression) {
+    this.inputExpression = inputExpression;
+  }
 }
 

Modified: hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/aggregates/gen/VectorUDAFMinString.java
URL: http://svn.apache.org/viewvc/hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/aggregates/gen/VectorUDAFMinString.java?rev=1517888&r1=1517887&r2=1517888&view=diff
==============================================================================
--- hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/aggregates/gen/VectorUDAFMinString.java (original)
+++ hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/aggregates/gen/VectorUDAFMinString.java Tue Aug 27 17:09:56 2013
@@ -41,15 +41,19 @@ import org.apache.hadoop.io.Text;
     value = "_FUNC_(expr) - Returns the minimum value of expr (vectorized, type: string)")
 public class VectorUDAFMinString extends VectorAggregateExpression {
 
+    private static final long serialVersionUID = 1L;
+
     /** 
      * class for storing the current aggregate value.
      */
     static private final class Aggregation implements AggregationBuffer {
 
-      private final static int MIN_BUFFER_SIZE = 16;
-      private byte[] bytes = new byte[MIN_BUFFER_SIZE];
-      private int length;
-      private boolean isNull;
+      private static final long serialVersionUID = 1L;
+
+      transient private final static int MIN_BUFFER_SIZE = 16;
+      transient private byte[] bytes = new byte[MIN_BUFFER_SIZE];
+      transient private int length;
+      transient private boolean isNull;
 
       public void checkValue(byte[] bytes, int start, int length) {
         if (isNull) {
@@ -75,15 +79,18 @@ public class VectorUDAFMinString extends
         JavaDataModel model = JavaDataModel.get();
         return model.lengthForByteArrayOfSize(bytes.length);
       }
-
     }
     
     private VectorExpression inputExpression;
-    private Text result;
+    transient private Text result;
     
     public VectorUDAFMinString(VectorExpression inputExpression) {
-      super();
+      this();
       this.inputExpression = inputExpression;
+    }
+
+    public VectorUDAFMinString() {
+      super();
       result = new Text();
     }
     
@@ -381,5 +388,13 @@ public class VectorUDAFMinString extends
     public void init(AggregationDesc desc) throws HiveException {
       // No-op
     }
+
+    public VectorExpression getInputExpression() {
+      return inputExpression;
+    }
+
+    public void setInputExpression(VectorExpression inputExpression) {
+      this.inputExpression = inputExpression;
+    }
 }
 

Modified: hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/aggregates/gen/VectorUDAFStdPopDouble.java
URL: http://svn.apache.org/viewvc/hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/aggregates/gen/VectorUDAFStdPopDouble.java?rev=1517888&r1=1517887&r2=1517888&view=diff
==============================================================================
--- hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/aggregates/gen/VectorUDAFStdPopDouble.java (original)
+++ hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/aggregates/gen/VectorUDAFStdPopDouble.java Tue Aug 27 17:09:56 2013
@@ -43,15 +43,20 @@ import org.apache.hadoop.hive.serde2.obj
 @Description(name = "std,stddev,stddev_pop",
     value = "_FUNC_(x) - Returns the standard deviation of a set of numbers (vectorized, double)")
 public class VectorUDAFStdPopDouble extends VectorAggregateExpression {
+
+    private static final long serialVersionUID = 1L;
     
     /** 
     /* class for storing the current aggregate value. 
     */
     private static final class Aggregation implements AggregationBuffer {
-      private double sum;
-      private long count;
-      private double variance;
-      private boolean isNull;
+
+      private static final long serialVersionUID = 1L;
+
+      transient private double sum;
+      transient private long count;
+      transient private double variance;
+      transient private boolean isNull;
       
       public void init() {
         isNull = false;
@@ -67,17 +72,21 @@ public class VectorUDAFStdPopDouble exte
     }
     
     private VectorExpression inputExpression;
-    private LongWritable resultCount;
-    private DoubleWritable resultSum;
-    private DoubleWritable resultVariance;
-    private Object[] partialResult;
+    transient private LongWritable resultCount;
+    transient private DoubleWritable resultSum;
+    transient private DoubleWritable resultVariance;
+    transient private Object[] partialResult;
     
-    private ObjectInspector soi;
+    transient private ObjectInspector soi;
     
     
     public VectorUDAFStdPopDouble(VectorExpression inputExpression) {
-      super();
+      this();
       this.inputExpression = inputExpression;
+    }
+
+    public VectorUDAFStdPopDouble() {
+      super();
       partialResult = new Object[3];
       resultCount = new LongWritable();
       resultSum = new DoubleWritable();
@@ -500,6 +509,12 @@ public class VectorUDAFStdPopDouble exte
     // No-op
   }
 
+  public VectorExpression getInputExpression() {
+    return inputExpression;
+  }
 
+  public void setInputExpression(VectorExpression inputExpression) {
+    this.inputExpression = inputExpression;
+  } 
 }
 

Modified: hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/aggregates/gen/VectorUDAFStdPopLong.java
URL: http://svn.apache.org/viewvc/hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/aggregates/gen/VectorUDAFStdPopLong.java?rev=1517888&r1=1517887&r2=1517888&view=diff
==============================================================================
--- hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/aggregates/gen/VectorUDAFStdPopLong.java (original)
+++ hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/aggregates/gen/VectorUDAFStdPopLong.java Tue Aug 27 17:09:56 2013
@@ -43,15 +43,20 @@ import org.apache.hadoop.hive.serde2.obj
 @Description(name = "std,stddev,stddev_pop",
     value = "_FUNC_(x) - Returns the standard deviation of a set of numbers (vectorized, long)")
 public class VectorUDAFStdPopLong extends VectorAggregateExpression {
+
+    private static final long serialVersionUID = 1L;
     
     /** 
     /* class for storing the current aggregate value. 
     */
     private static final class Aggregation implements AggregationBuffer {
-      private double sum;
-      private long count;
-      private double variance;
-      private boolean isNull;
+
+      private static final long serialVersionUID = 1L;
+
+      transient private double sum;
+      transient private long count;
+      transient private double variance;
+      transient private boolean isNull;
       
       public void init() {
         isNull = false;
@@ -67,17 +72,21 @@ public class VectorUDAFStdPopLong extend
     }
     
     private VectorExpression inputExpression;
-    private LongWritable resultCount;
-    private DoubleWritable resultSum;
-    private DoubleWritable resultVariance;
-    private Object[] partialResult;
+    transient private LongWritable resultCount;
+    transient private DoubleWritable resultSum;
+    transient private DoubleWritable resultVariance;
+    transient private Object[] partialResult;
     
-    private ObjectInspector soi;
+    transient private ObjectInspector soi;
     
     
     public VectorUDAFStdPopLong(VectorExpression inputExpression) {
-      super();
+      this();
       this.inputExpression = inputExpression;
+    }
+
+    public VectorUDAFStdPopLong() {
+      super();
       partialResult = new Object[3];
       resultCount = new LongWritable();
       resultSum = new DoubleWritable();
@@ -500,6 +509,12 @@ public class VectorUDAFStdPopLong extend
     // No-op
   }
 
+  public VectorExpression getInputExpression() {
+    return inputExpression;
+  }
 
+  public void setInputExpression(VectorExpression inputExpression) {
+    this.inputExpression = inputExpression;
+  } 
 }
 

Modified: hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/aggregates/gen/VectorUDAFStdSampDouble.java
URL: http://svn.apache.org/viewvc/hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/aggregates/gen/VectorUDAFStdSampDouble.java?rev=1517888&r1=1517887&r2=1517888&view=diff
==============================================================================
--- hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/aggregates/gen/VectorUDAFStdSampDouble.java (original)
+++ hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/aggregates/gen/VectorUDAFStdSampDouble.java Tue Aug 27 17:09:56 2013
@@ -43,15 +43,20 @@ import org.apache.hadoop.hive.serde2.obj
 @Description(name = "stddev_samp",
     value = "_FUNC_(x) - Returns the sample standard deviation of a set of numbers (vectorized, double)")
 public class VectorUDAFStdSampDouble extends VectorAggregateExpression {
+
+    private static final long serialVersionUID = 1L;
     
     /** 
     /* class for storing the current aggregate value. 
     */
     private static final class Aggregation implements AggregationBuffer {
-      private double sum;
-      private long count;
-      private double variance;
-      private boolean isNull;
+
+      private static final long serialVersionUID = 1L;
+
+      transient private double sum;
+      transient private long count;
+      transient private double variance;
+      transient private boolean isNull;
       
       public void init() {
         isNull = false;
@@ -67,17 +72,21 @@ public class VectorUDAFStdSampDouble ext
     }
     
     private VectorExpression inputExpression;
-    private LongWritable resultCount;
-    private DoubleWritable resultSum;
-    private DoubleWritable resultVariance;
-    private Object[] partialResult;
+    transient private LongWritable resultCount;
+    transient private DoubleWritable resultSum;
+    transient private DoubleWritable resultVariance;
+    transient private Object[] partialResult;
     
-    private ObjectInspector soi;
+    transient private ObjectInspector soi;
     
     
     public VectorUDAFStdSampDouble(VectorExpression inputExpression) {
-      super();
+      this();
       this.inputExpression = inputExpression;
+    }
+
+    public VectorUDAFStdSampDouble() {
+      super();
       partialResult = new Object[3];
       resultCount = new LongWritable();
       resultSum = new DoubleWritable();
@@ -500,6 +509,12 @@ public class VectorUDAFStdSampDouble ext
     // No-op
   }
 
+  public VectorExpression getInputExpression() {
+    return inputExpression;
+  }
 
+  public void setInputExpression(VectorExpression inputExpression) {
+    this.inputExpression = inputExpression;
+  } 
 }
 

Modified: hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/aggregates/gen/VectorUDAFStdSampLong.java
URL: http://svn.apache.org/viewvc/hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/aggregates/gen/VectorUDAFStdSampLong.java?rev=1517888&r1=1517887&r2=1517888&view=diff
==============================================================================
--- hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/aggregates/gen/VectorUDAFStdSampLong.java (original)
+++ hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/aggregates/gen/VectorUDAFStdSampLong.java Tue Aug 27 17:09:56 2013
@@ -43,15 +43,20 @@ import org.apache.hadoop.hive.serde2.obj
 @Description(name = "stddev_samp",
     value = "_FUNC_(x) - Returns the sample standard deviation of a set of numbers (vectorized, long)")
 public class VectorUDAFStdSampLong extends VectorAggregateExpression {
+
+    private static final long serialVersionUID = 1L;
     
     /** 
     /* class for storing the current aggregate value. 
     */
     private static final class Aggregation implements AggregationBuffer {
-      private double sum;
-      private long count;
-      private double variance;
-      private boolean isNull;
+
+      private static final long serialVersionUID = 1L;
+
+      transient private double sum;
+      transient private long count;
+      transient private double variance;
+      transient private boolean isNull;
       
       public void init() {
         isNull = false;
@@ -67,17 +72,21 @@ public class VectorUDAFStdSampLong exten
     }
     
     private VectorExpression inputExpression;
-    private LongWritable resultCount;
-    private DoubleWritable resultSum;
-    private DoubleWritable resultVariance;
-    private Object[] partialResult;
+    transient private LongWritable resultCount;
+    transient private DoubleWritable resultSum;
+    transient private DoubleWritable resultVariance;
+    transient private Object[] partialResult;
     
-    private ObjectInspector soi;
+    transient private ObjectInspector soi;
     
     
     public VectorUDAFStdSampLong(VectorExpression inputExpression) {
-      super();
+      this();
       this.inputExpression = inputExpression;
+    }
+
+    public VectorUDAFStdSampLong() {
+      super();
       partialResult = new Object[3];
       resultCount = new LongWritable();
       resultSum = new DoubleWritable();
@@ -500,6 +509,12 @@ public class VectorUDAFStdSampLong exten
     // No-op
   }
 
+  public VectorExpression getInputExpression() {
+    return inputExpression;
+  }
 
+  public void setInputExpression(VectorExpression inputExpression) {
+    this.inputExpression = inputExpression;
+  } 
 }
 

Modified: hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/aggregates/gen/VectorUDAFSumDouble.java
URL: http://svn.apache.org/viewvc/hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/aggregates/gen/VectorUDAFSumDouble.java?rev=1517888&r1=1517887&r2=1517888&view=diff
==============================================================================
--- hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/aggregates/gen/VectorUDAFSumDouble.java (original)
+++ hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/aggregates/gen/VectorUDAFSumDouble.java Tue Aug 27 17:09:56 2013
@@ -39,13 +39,18 @@ import org.apache.hadoop.hive.serde2.obj
 @Description(name = "sum", 
     value = "_FUNC_(expr) - Returns the sum value of expr (vectorized, type: double)")
 public class VectorUDAFSumDouble extends VectorAggregateExpression {
+   
+    private static final long serialVersionUID = 1L;
     
     /** 
      * class for storing the current aggregate value.
      */
     private static final class Aggregation implements AggregationBuffer {
-      private double sum;
-      private boolean isNull;
+
+      private static final long serialVersionUID = 1L;
+
+      transient private double sum;
+      transient private boolean isNull;
       
       public void sumValue(double value) {
         if (isNull) {
@@ -62,12 +67,16 @@ public class VectorUDAFSumDouble extends
       }
     }
     
-    private final VectorExpression inputExpression;
-    private final DoubleWritable result;
+    private VectorExpression inputExpression;
+    transient private final DoubleWritable result;
     
     public VectorUDAFSumDouble(VectorExpression inputExpression) {
-      super();
+      this();
       this.inputExpression = inputExpression;
+    }
+
+    public VectorUDAFSumDouble() {
+      super();
       result = new DoubleWritable();
     }
 
@@ -416,6 +425,12 @@ public class VectorUDAFSumDouble extends
     // No-op
   }
 
+  public VectorExpression getInputExpression() {
+    return inputExpression;
+  }
 
+  public void setInputExpression(VectorExpression inputExpression) {
+    this.inputExpression = inputExpression;
+  }
 }
 

Modified: hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/aggregates/gen/VectorUDAFSumLong.java
URL: http://svn.apache.org/viewvc/hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/aggregates/gen/VectorUDAFSumLong.java?rev=1517888&r1=1517887&r2=1517888&view=diff
==============================================================================
--- hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/aggregates/gen/VectorUDAFSumLong.java (original)
+++ hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/aggregates/gen/VectorUDAFSumLong.java Tue Aug 27 17:09:56 2013
@@ -39,13 +39,18 @@ import org.apache.hadoop.hive.serde2.obj
 @Description(name = "sum", 
     value = "_FUNC_(expr) - Returns the sum value of expr (vectorized, type: long)")
 public class VectorUDAFSumLong extends VectorAggregateExpression {
+   
+    private static final long serialVersionUID = 1L;
     
     /** 
      * class for storing the current aggregate value.
      */
     private static final class Aggregation implements AggregationBuffer {
-      private long sum;
-      private boolean isNull;
+
+      private static final long serialVersionUID = 1L;
+
+      transient private long sum;
+      transient private boolean isNull;
       
       public void sumValue(long value) {
         if (isNull) {
@@ -62,12 +67,16 @@ public class VectorUDAFSumLong extends V
       }
     }
     
-    private final VectorExpression inputExpression;
-    private final LongWritable result;
+    private VectorExpression inputExpression;
+    transient private final LongWritable result;
     
     public VectorUDAFSumLong(VectorExpression inputExpression) {
-      super();
+      this();
       this.inputExpression = inputExpression;
+    }
+
+    public VectorUDAFSumLong() {
+      super();
       result = new LongWritable();
     }
 
@@ -416,6 +425,12 @@ public class VectorUDAFSumLong extends V
     // No-op
   }
 
+  public VectorExpression getInputExpression() {
+    return inputExpression;
+  }
 
+  public void setInputExpression(VectorExpression inputExpression) {
+    this.inputExpression = inputExpression;
+  }
 }
 

Modified: hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/aggregates/gen/VectorUDAFVarPopDouble.java
URL: http://svn.apache.org/viewvc/hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/aggregates/gen/VectorUDAFVarPopDouble.java?rev=1517888&r1=1517887&r2=1517888&view=diff
==============================================================================
--- hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/aggregates/gen/VectorUDAFVarPopDouble.java (original)
+++ hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/aggregates/gen/VectorUDAFVarPopDouble.java Tue Aug 27 17:09:56 2013
@@ -43,15 +43,20 @@ import org.apache.hadoop.hive.serde2.obj
 @Description(name = "variance, var_pop",
     value = "_FUNC_(x) - Returns the variance of a set of numbers (vectorized, double)")
 public class VectorUDAFVarPopDouble extends VectorAggregateExpression {
+
+    private static final long serialVersionUID = 1L;
     
     /** 
     /* class for storing the current aggregate value. 
     */
     private static final class Aggregation implements AggregationBuffer {
-      private double sum;
-      private long count;
-      private double variance;
-      private boolean isNull;
+
+      private static final long serialVersionUID = 1L;
+
+      transient private double sum;
+      transient private long count;
+      transient private double variance;
+      transient private boolean isNull;
       
       public void init() {
         isNull = false;
@@ -67,17 +72,21 @@ public class VectorUDAFVarPopDouble exte
     }
     
     private VectorExpression inputExpression;
-    private LongWritable resultCount;
-    private DoubleWritable resultSum;
-    private DoubleWritable resultVariance;
-    private Object[] partialResult;
+    transient private LongWritable resultCount;
+    transient private DoubleWritable resultSum;
+    transient private DoubleWritable resultVariance;
+    transient private Object[] partialResult;
     
-    private ObjectInspector soi;
+    transient private ObjectInspector soi;
     
     
     public VectorUDAFVarPopDouble(VectorExpression inputExpression) {
-      super();
+      this();
       this.inputExpression = inputExpression;
+    }
+
+    public VectorUDAFVarPopDouble() {
+      super();
       partialResult = new Object[3];
       resultCount = new LongWritable();
       resultSum = new DoubleWritable();
@@ -500,6 +509,12 @@ public class VectorUDAFVarPopDouble exte
     // No-op
   }
 
+  public VectorExpression getInputExpression() {
+    return inputExpression;
+  }
 
+  public void setInputExpression(VectorExpression inputExpression) {
+    this.inputExpression = inputExpression;
+  } 
 }
 

Modified: hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/aggregates/gen/VectorUDAFVarPopLong.java
URL: http://svn.apache.org/viewvc/hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/aggregates/gen/VectorUDAFVarPopLong.java?rev=1517888&r1=1517887&r2=1517888&view=diff
==============================================================================
--- hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/aggregates/gen/VectorUDAFVarPopLong.java (original)
+++ hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/aggregates/gen/VectorUDAFVarPopLong.java Tue Aug 27 17:09:56 2013
@@ -43,15 +43,20 @@ import org.apache.hadoop.hive.serde2.obj
 @Description(name = "variance, var_pop",
     value = "_FUNC_(x) - Returns the variance of a set of numbers (vectorized, long)")
 public class VectorUDAFVarPopLong extends VectorAggregateExpression {
+
+    private static final long serialVersionUID = 1L;
     
     /** 
     /* class for storing the current aggregate value. 
     */
     private static final class Aggregation implements AggregationBuffer {
-      private double sum;
-      private long count;
-      private double variance;
-      private boolean isNull;
+
+      private static final long serialVersionUID = 1L;
+
+      transient private double sum;
+      transient private long count;
+      transient private double variance;
+      transient private boolean isNull;
       
       public void init() {
         isNull = false;
@@ -67,17 +72,21 @@ public class VectorUDAFVarPopLong extend
     }
     
     private VectorExpression inputExpression;
-    private LongWritable resultCount;
-    private DoubleWritable resultSum;
-    private DoubleWritable resultVariance;
-    private Object[] partialResult;
+    transient private LongWritable resultCount;
+    transient private DoubleWritable resultSum;
+    transient private DoubleWritable resultVariance;
+    transient private Object[] partialResult;
     
-    private ObjectInspector soi;
+    transient private ObjectInspector soi;
     
     
     public VectorUDAFVarPopLong(VectorExpression inputExpression) {
-      super();
+      this();
       this.inputExpression = inputExpression;
+    }
+
+    public VectorUDAFVarPopLong() {
+      super();
       partialResult = new Object[3];
       resultCount = new LongWritable();
       resultSum = new DoubleWritable();
@@ -500,6 +509,12 @@ public class VectorUDAFVarPopLong extend
     // No-op
   }
 
+  public VectorExpression getInputExpression() {
+    return inputExpression;
+  }
 
+  public void setInputExpression(VectorExpression inputExpression) {
+    this.inputExpression = inputExpression;
+  } 
 }
 

Modified: hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/aggregates/gen/VectorUDAFVarSampDouble.java
URL: http://svn.apache.org/viewvc/hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/aggregates/gen/VectorUDAFVarSampDouble.java?rev=1517888&r1=1517887&r2=1517888&view=diff
==============================================================================
--- hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/aggregates/gen/VectorUDAFVarSampDouble.java (original)
+++ hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/aggregates/gen/VectorUDAFVarSampDouble.java Tue Aug 27 17:09:56 2013
@@ -43,15 +43,20 @@ import org.apache.hadoop.hive.serde2.obj
 @Description(name = "var_samp",
     value = "_FUNC_(x) - Returns the sample variance of a set of numbers (vectorized, double)")
 public class VectorUDAFVarSampDouble extends VectorAggregateExpression {
+
+    private static final long serialVersionUID = 1L;
     
     /** 
     /* class for storing the current aggregate value. 
     */
     private static final class Aggregation implements AggregationBuffer {
-      private double sum;
-      private long count;
-      private double variance;
-      private boolean isNull;
+
+      private static final long serialVersionUID = 1L;
+
+      transient private double sum;
+      transient private long count;
+      transient private double variance;
+      transient private boolean isNull;
       
       public void init() {
         isNull = false;
@@ -67,17 +72,21 @@ public class VectorUDAFVarSampDouble ext
     }
     
     private VectorExpression inputExpression;
-    private LongWritable resultCount;
-    private DoubleWritable resultSum;
-    private DoubleWritable resultVariance;
-    private Object[] partialResult;
+    transient private LongWritable resultCount;
+    transient private DoubleWritable resultSum;
+    transient private DoubleWritable resultVariance;
+    transient private Object[] partialResult;
     
-    private ObjectInspector soi;
+    transient private ObjectInspector soi;
     
     
     public VectorUDAFVarSampDouble(VectorExpression inputExpression) {
-      super();
+      this();
       this.inputExpression = inputExpression;
+    }
+
+    public VectorUDAFVarSampDouble() {
+      super();
       partialResult = new Object[3];
       resultCount = new LongWritable();
       resultSum = new DoubleWritable();
@@ -500,6 +509,12 @@ public class VectorUDAFVarSampDouble ext
     // No-op
   }
 
+  public VectorExpression getInputExpression() {
+    return inputExpression;
+  }
 
+  public void setInputExpression(VectorExpression inputExpression) {
+    this.inputExpression = inputExpression;
+  } 
 }
 

Modified: hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/aggregates/gen/VectorUDAFVarSampLong.java
URL: http://svn.apache.org/viewvc/hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/aggregates/gen/VectorUDAFVarSampLong.java?rev=1517888&r1=1517887&r2=1517888&view=diff
==============================================================================
--- hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/aggregates/gen/VectorUDAFVarSampLong.java (original)
+++ hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/aggregates/gen/VectorUDAFVarSampLong.java Tue Aug 27 17:09:56 2013
@@ -43,15 +43,20 @@ import org.apache.hadoop.hive.serde2.obj
 @Description(name = "var_samp",
     value = "_FUNC_(x) - Returns the sample variance of a set of numbers (vectorized, long)")
 public class VectorUDAFVarSampLong extends VectorAggregateExpression {
+
+    private static final long serialVersionUID = 1L;
     
     /** 
     /* class for storing the current aggregate value. 
     */
     private static final class Aggregation implements AggregationBuffer {
-      private double sum;
-      private long count;
-      private double variance;
-      private boolean isNull;
+
+      private static final long serialVersionUID = 1L;
+
+      transient private double sum;
+      transient private long count;
+      transient private double variance;
+      transient private boolean isNull;
       
       public void init() {
         isNull = false;
@@ -67,17 +72,21 @@ public class VectorUDAFVarSampLong exten
     }
     
     private VectorExpression inputExpression;
-    private LongWritable resultCount;
-    private DoubleWritable resultSum;
-    private DoubleWritable resultVariance;
-    private Object[] partialResult;
+    transient private LongWritable resultCount;
+    transient private DoubleWritable resultSum;
+    transient private DoubleWritable resultVariance;
+    transient private Object[] partialResult;
     
-    private ObjectInspector soi;
+    transient private ObjectInspector soi;
     
     
     public VectorUDAFVarSampLong(VectorExpression inputExpression) {
-      super();
+      this();
       this.inputExpression = inputExpression;
+    }
+
+    public VectorUDAFVarSampLong() {
+      super();
       partialResult = new Object[3];
       resultCount = new LongWritable();
       resultSum = new DoubleWritable();
@@ -500,6 +509,12 @@ public class VectorUDAFVarSampLong exten
     // No-op
   }
 
+  public VectorExpression getInputExpression() {
+    return inputExpression;
+  }
 
+  public void setInputExpression(VectorExpression inputExpression) {
+    this.inputExpression = inputExpression;
+  } 
 }
 

Modified: hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/DoubleColAddDoubleColumn.java
URL: http://svn.apache.org/viewvc/hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/DoubleColAddDoubleColumn.java?rev=1517888&r1=1517887&r2=1517888&view=diff
==============================================================================
--- hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/DoubleColAddDoubleColumn.java (original)
+++ hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/DoubleColAddDoubleColumn.java Tue Aug 27 17:09:56 2013
@@ -28,6 +28,9 @@ import org.apache.hadoop.hive.ql.exec.ve
  * expressions between columns.
  */
 public class DoubleColAddDoubleColumn extends VectorExpression {
+
+  private static final long serialVersionUID = 1L;
+  
   private int colNum1;
   private int colNum2;
   private int outputColumn;
@@ -38,6 +41,9 @@ public class DoubleColAddDoubleColumn ex
     this.outputColumn = outputColumn;
   }
 
+  public DoubleColAddDoubleColumn() {
+  }
+
   @Override
   public void evaluate(VectorizedRowBatch batch) {
 
@@ -128,4 +134,24 @@ public class DoubleColAddDoubleColumn ex
   public String getOutputType() {
     return "double";
   }
+  
+  public int getColNum1() {
+    return colNum1;
+  }
+
+  public void setColNum1(int colNum1) {
+    this.colNum1 = colNum1;
+  }
+
+  public int getColNum2() {
+    return colNum2;
+  }
+
+  public void setColNum2(int colNum2) {
+    this.colNum2 = colNum2;
+  }
+
+  public void setOutputColumn(int outputColumn) {
+    this.outputColumn = outputColumn;
+  }
 }

Modified: hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/DoubleColAddDoubleScalar.java
URL: http://svn.apache.org/viewvc/hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/DoubleColAddDoubleScalar.java?rev=1517888&r1=1517887&r2=1517888&view=diff
==============================================================================
--- hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/DoubleColAddDoubleScalar.java (original)
+++ hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/DoubleColAddDoubleScalar.java Tue Aug 27 17:09:56 2013
@@ -29,6 +29,9 @@ import org.apache.hadoop.hive.ql.exec.ve
  * expressions between a column and a scalar.
  */
 public class DoubleColAddDoubleScalar extends VectorExpression {
+
+  private static final long serialVersionUID = 1L;
+
   private int colNum;
   private double value;
   private int outputColumn;
@@ -39,6 +42,9 @@ public class DoubleColAddDoubleScalar ex
     this.outputColumn = outputColumn;
   }
 
+  public DoubleColAddDoubleScalar() {
+  }
+
   @Override
   public void evaluate(VectorizedRowBatch batch) {
 
@@ -105,4 +111,24 @@ public class DoubleColAddDoubleScalar ex
   public String getOutputType() {
     return "double";
   }
+  
+  public int getColNum() {
+    return colNum;
+  }
+  
+  public void setColNum(int colNum) {
+    this.colNum = colNum;
+  }
+
+  public double getValue() {
+    return value;
+  }
+
+  public void setValue(double value) {
+    this.value = value;
+  }
+
+  public void setOutputColumn(int outputColumn) {
+    this.outputColumn = outputColumn;
+  }
 }

Modified: hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/DoubleColAddLongColumn.java
URL: http://svn.apache.org/viewvc/hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/DoubleColAddLongColumn.java?rev=1517888&r1=1517887&r2=1517888&view=diff
==============================================================================
--- hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/DoubleColAddLongColumn.java (original)
+++ hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/DoubleColAddLongColumn.java Tue Aug 27 17:09:56 2013
@@ -28,6 +28,9 @@ import org.apache.hadoop.hive.ql.exec.ve
  * expressions between columns.
  */
 public class DoubleColAddLongColumn extends VectorExpression {
+
+  private static final long serialVersionUID = 1L;
+  
   private int colNum1;
   private int colNum2;
   private int outputColumn;
@@ -38,6 +41,9 @@ public class DoubleColAddLongColumn exte
     this.outputColumn = outputColumn;
   }
 
+  public DoubleColAddLongColumn() {
+  }
+
   @Override
   public void evaluate(VectorizedRowBatch batch) {
 
@@ -128,4 +134,24 @@ public class DoubleColAddLongColumn exte
   public String getOutputType() {
     return "double";
   }
+  
+  public int getColNum1() {
+    return colNum1;
+  }
+
+  public void setColNum1(int colNum1) {
+    this.colNum1 = colNum1;
+  }
+
+  public int getColNum2() {
+    return colNum2;
+  }
+
+  public void setColNum2(int colNum2) {
+    this.colNum2 = colNum2;
+  }
+
+  public void setOutputColumn(int outputColumn) {
+    this.outputColumn = outputColumn;
+  }
 }

Modified: hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/DoubleColAddLongScalar.java
URL: http://svn.apache.org/viewvc/hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/DoubleColAddLongScalar.java?rev=1517888&r1=1517887&r2=1517888&view=diff
==============================================================================
--- hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/DoubleColAddLongScalar.java (original)
+++ hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/DoubleColAddLongScalar.java Tue Aug 27 17:09:56 2013
@@ -29,6 +29,9 @@ import org.apache.hadoop.hive.ql.exec.ve
  * expressions between a column and a scalar.
  */
 public class DoubleColAddLongScalar extends VectorExpression {
+
+  private static final long serialVersionUID = 1L;
+
   private int colNum;
   private long value;
   private int outputColumn;
@@ -39,6 +42,9 @@ public class DoubleColAddLongScalar exte
     this.outputColumn = outputColumn;
   }
 
+  public DoubleColAddLongScalar() {
+  }
+
   @Override
   public void evaluate(VectorizedRowBatch batch) {
 
@@ -105,4 +111,24 @@ public class DoubleColAddLongScalar exte
   public String getOutputType() {
     return "double";
   }
+  
+  public int getColNum() {
+    return colNum;
+  }
+  
+  public void setColNum(int colNum) {
+    this.colNum = colNum;
+  }
+
+  public long getValue() {
+    return value;
+  }
+
+  public void setValue(long value) {
+    this.value = value;
+  }
+
+  public void setOutputColumn(int outputColumn) {
+    this.outputColumn = outputColumn;
+  }
 }

Modified: hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/DoubleColDivideDoubleColumn.java
URL: http://svn.apache.org/viewvc/hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/DoubleColDivideDoubleColumn.java?rev=1517888&r1=1517887&r2=1517888&view=diff
==============================================================================
--- hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/DoubleColDivideDoubleColumn.java (original)
+++ hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/DoubleColDivideDoubleColumn.java Tue Aug 27 17:09:56 2013
@@ -28,6 +28,9 @@ import org.apache.hadoop.hive.ql.exec.ve
  * expressions between columns.
  */
 public class DoubleColDivideDoubleColumn extends VectorExpression {
+
+  private static final long serialVersionUID = 1L;
+  
   private int colNum1;
   private int colNum2;
   private int outputColumn;
@@ -38,6 +41,9 @@ public class DoubleColDivideDoubleColumn
     this.outputColumn = outputColumn;
   }
 
+  public DoubleColDivideDoubleColumn() {
+  }
+
   @Override
   public void evaluate(VectorizedRowBatch batch) {
 
@@ -128,4 +134,24 @@ public class DoubleColDivideDoubleColumn
   public String getOutputType() {
     return "double";
   }
+  
+  public int getColNum1() {
+    return colNum1;
+  }
+
+  public void setColNum1(int colNum1) {
+    this.colNum1 = colNum1;
+  }
+
+  public int getColNum2() {
+    return colNum2;
+  }
+
+  public void setColNum2(int colNum2) {
+    this.colNum2 = colNum2;
+  }
+
+  public void setOutputColumn(int outputColumn) {
+    this.outputColumn = outputColumn;
+  }
 }

Modified: hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/DoubleColDivideDoubleScalar.java
URL: http://svn.apache.org/viewvc/hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/DoubleColDivideDoubleScalar.java?rev=1517888&r1=1517887&r2=1517888&view=diff
==============================================================================
--- hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/DoubleColDivideDoubleScalar.java (original)
+++ hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/DoubleColDivideDoubleScalar.java Tue Aug 27 17:09:56 2013
@@ -29,6 +29,9 @@ import org.apache.hadoop.hive.ql.exec.ve
  * expressions between a column and a scalar.
  */
 public class DoubleColDivideDoubleScalar extends VectorExpression {
+
+  private static final long serialVersionUID = 1L;
+
   private int colNum;
   private double value;
   private int outputColumn;
@@ -39,6 +42,9 @@ public class DoubleColDivideDoubleScalar
     this.outputColumn = outputColumn;
   }
 
+  public DoubleColDivideDoubleScalar() {
+  }
+
   @Override
   public void evaluate(VectorizedRowBatch batch) {
 
@@ -105,4 +111,24 @@ public class DoubleColDivideDoubleScalar
   public String getOutputType() {
     return "double";
   }
+  
+  public int getColNum() {
+    return colNum;
+  }
+  
+  public void setColNum(int colNum) {
+    this.colNum = colNum;
+  }
+
+  public double getValue() {
+    return value;
+  }
+
+  public void setValue(double value) {
+    this.value = value;
+  }
+
+  public void setOutputColumn(int outputColumn) {
+    this.outputColumn = outputColumn;
+  }
 }

Modified: hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/DoubleColDivideLongColumn.java
URL: http://svn.apache.org/viewvc/hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/DoubleColDivideLongColumn.java?rev=1517888&r1=1517887&r2=1517888&view=diff
==============================================================================
--- hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/DoubleColDivideLongColumn.java (original)
+++ hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/DoubleColDivideLongColumn.java Tue Aug 27 17:09:56 2013
@@ -28,6 +28,9 @@ import org.apache.hadoop.hive.ql.exec.ve
  * expressions between columns.
  */
 public class DoubleColDivideLongColumn extends VectorExpression {
+
+  private static final long serialVersionUID = 1L;
+  
   private int colNum1;
   private int colNum2;
   private int outputColumn;
@@ -38,6 +41,9 @@ public class DoubleColDivideLongColumn e
     this.outputColumn = outputColumn;
   }
 
+  public DoubleColDivideLongColumn() {
+  }
+
   @Override
   public void evaluate(VectorizedRowBatch batch) {
 
@@ -128,4 +134,24 @@ public class DoubleColDivideLongColumn e
   public String getOutputType() {
     return "double";
   }
+  
+  public int getColNum1() {
+    return colNum1;
+  }
+
+  public void setColNum1(int colNum1) {
+    this.colNum1 = colNum1;
+  }
+
+  public int getColNum2() {
+    return colNum2;
+  }
+
+  public void setColNum2(int colNum2) {
+    this.colNum2 = colNum2;
+  }
+
+  public void setOutputColumn(int outputColumn) {
+    this.outputColumn = outputColumn;
+  }
 }

Modified: hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/DoubleColDivideLongScalar.java
URL: http://svn.apache.org/viewvc/hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/DoubleColDivideLongScalar.java?rev=1517888&r1=1517887&r2=1517888&view=diff
==============================================================================
--- hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/DoubleColDivideLongScalar.java (original)
+++ hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/DoubleColDivideLongScalar.java Tue Aug 27 17:09:56 2013
@@ -29,6 +29,9 @@ import org.apache.hadoop.hive.ql.exec.ve
  * expressions between a column and a scalar.
  */
 public class DoubleColDivideLongScalar extends VectorExpression {
+
+  private static final long serialVersionUID = 1L;
+
   private int colNum;
   private long value;
   private int outputColumn;
@@ -39,6 +42,9 @@ public class DoubleColDivideLongScalar e
     this.outputColumn = outputColumn;
   }
 
+  public DoubleColDivideLongScalar() {
+  }
+
   @Override
   public void evaluate(VectorizedRowBatch batch) {
 
@@ -105,4 +111,24 @@ public class DoubleColDivideLongScalar e
   public String getOutputType() {
     return "double";
   }
+  
+  public int getColNum() {
+    return colNum;
+  }
+  
+  public void setColNum(int colNum) {
+    this.colNum = colNum;
+  }
+
+  public long getValue() {
+    return value;
+  }
+
+  public void setValue(long value) {
+    this.value = value;
+  }
+
+  public void setOutputColumn(int outputColumn) {
+    this.outputColumn = outputColumn;
+  }
 }

Modified: hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/DoubleColEqualDoubleScalar.java
URL: http://svn.apache.org/viewvc/hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/DoubleColEqualDoubleScalar.java?rev=1517888&r1=1517887&r2=1517888&view=diff
==============================================================================
--- hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/DoubleColEqualDoubleScalar.java (original)
+++ hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/DoubleColEqualDoubleScalar.java Tue Aug 27 17:09:56 2013
@@ -29,6 +29,9 @@ import org.apache.hadoop.hive.ql.exec.ve
  * separate boolean column.
  */
 public class DoubleColEqualDoubleScalar extends VectorExpression {
+
+  private static final long serialVersionUID = 1L;
+
   private int colNum;
   private double value;
   private int outputColumn;
@@ -39,6 +42,9 @@ public class DoubleColEqualDoubleScalar 
     this.outputColumn = outputColumn;
   }
 
+  public DoubleColEqualDoubleScalar() {
+  }
+
   @Override
   public void evaluate(VectorizedRowBatch batch) {
 
@@ -120,4 +126,24 @@ public class DoubleColEqualDoubleScalar 
   public String getOutputType() {
     return "long";
   }
+  
+  public int getColNum() {
+    return colNum;
+  }
+  
+  public void setColNum(int colNum) {
+    this.colNum = colNum;
+  }
+
+  public double getValue() {
+    return value;
+  }
+
+  public void setValue(double value) {
+    this.value = value;
+  }
+
+  public void setOutputColumn(int outputColumn) {
+    this.outputColumn = outputColumn;
+  }
 }

Modified: hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/DoubleColGreaterDoubleScalar.java
URL: http://svn.apache.org/viewvc/hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/DoubleColGreaterDoubleScalar.java?rev=1517888&r1=1517887&r2=1517888&view=diff
==============================================================================
--- hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/DoubleColGreaterDoubleScalar.java (original)
+++ hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/DoubleColGreaterDoubleScalar.java Tue Aug 27 17:09:56 2013
@@ -29,6 +29,9 @@ import org.apache.hadoop.hive.ql.exec.ve
  * separate boolean column.
  */
 public class DoubleColGreaterDoubleScalar extends VectorExpression {
+
+  private static final long serialVersionUID = 1L;
+
   private int colNum;
   private double value;
   private int outputColumn;
@@ -39,6 +42,9 @@ public class DoubleColGreaterDoubleScala
     this.outputColumn = outputColumn;
   }
 
+  public DoubleColGreaterDoubleScalar() {
+  }
+
   @Override
   public void evaluate(VectorizedRowBatch batch) {
 
@@ -120,4 +126,24 @@ public class DoubleColGreaterDoubleScala
   public String getOutputType() {
     return "long";
   }
+  
+  public int getColNum() {
+    return colNum;
+  }
+  
+  public void setColNum(int colNum) {
+    this.colNum = colNum;
+  }
+
+  public double getValue() {
+    return value;
+  }
+
+  public void setValue(double value) {
+    this.value = value;
+  }
+
+  public void setOutputColumn(int outputColumn) {
+    this.outputColumn = outputColumn;
+  }
 }

Modified: hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/DoubleColGreaterEqualDoubleScalar.java
URL: http://svn.apache.org/viewvc/hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/DoubleColGreaterEqualDoubleScalar.java?rev=1517888&r1=1517887&r2=1517888&view=diff
==============================================================================
--- hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/DoubleColGreaterEqualDoubleScalar.java (original)
+++ hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/DoubleColGreaterEqualDoubleScalar.java Tue Aug 27 17:09:56 2013
@@ -29,6 +29,9 @@ import org.apache.hadoop.hive.ql.exec.ve
  * separate boolean column.
  */
 public class DoubleColGreaterEqualDoubleScalar extends VectorExpression {
+
+  private static final long serialVersionUID = 1L;
+
   private int colNum;
   private double value;
   private int outputColumn;
@@ -39,6 +42,9 @@ public class DoubleColGreaterEqualDouble
     this.outputColumn = outputColumn;
   }
 
+  public DoubleColGreaterEqualDoubleScalar() {
+  }
+
   @Override
   public void evaluate(VectorizedRowBatch batch) {
 
@@ -120,4 +126,24 @@ public class DoubleColGreaterEqualDouble
   public String getOutputType() {
     return "long";
   }
+  
+  public int getColNum() {
+    return colNum;
+  }
+  
+  public void setColNum(int colNum) {
+    this.colNum = colNum;
+  }
+
+  public double getValue() {
+    return value;
+  }
+
+  public void setValue(double value) {
+    this.value = value;
+  }
+
+  public void setOutputColumn(int outputColumn) {
+    this.outputColumn = outputColumn;
+  }
 }

Modified: hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/DoubleColLessDoubleScalar.java
URL: http://svn.apache.org/viewvc/hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/DoubleColLessDoubleScalar.java?rev=1517888&r1=1517887&r2=1517888&view=diff
==============================================================================
--- hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/DoubleColLessDoubleScalar.java (original)
+++ hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/DoubleColLessDoubleScalar.java Tue Aug 27 17:09:56 2013
@@ -29,6 +29,9 @@ import org.apache.hadoop.hive.ql.exec.ve
  * separate boolean column.
  */
 public class DoubleColLessDoubleScalar extends VectorExpression {
+
+  private static final long serialVersionUID = 1L;
+
   private int colNum;
   private double value;
   private int outputColumn;
@@ -39,6 +42,9 @@ public class DoubleColLessDoubleScalar e
     this.outputColumn = outputColumn;
   }
 
+  public DoubleColLessDoubleScalar() {
+  }
+
   @Override
   public void evaluate(VectorizedRowBatch batch) {
 
@@ -120,4 +126,24 @@ public class DoubleColLessDoubleScalar e
   public String getOutputType() {
     return "long";
   }
+  
+  public int getColNum() {
+    return colNum;
+  }
+  
+  public void setColNum(int colNum) {
+    this.colNum = colNum;
+  }
+
+  public double getValue() {
+    return value;
+  }
+
+  public void setValue(double value) {
+    this.value = value;
+  }
+
+  public void setOutputColumn(int outputColumn) {
+    this.outputColumn = outputColumn;
+  }
 }