commit 83e6b8fbbb9dc8713f6f354a74aa9811623a24a2 Author: Jitendra Pandey Date: Sun Aug 25 23:08:14 2013 -0700 HIVE-5126. local commit diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/ColAndCol.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/ColAndCol.java index 8a24d23..a6cde8e 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/ColAndCol.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/ColAndCol.java @@ -24,16 +24,24 @@ * Evaluate AND of two boolean columns and store result in the output boolean column. */ public class ColAndCol extends VectorExpression { - private final int colNum1; - private final int colNum2; - private final int outputColumn; + + private static final long serialVersionUID = 1L; + + private int colNum1; + private int colNum2; + private int outputColumn; public ColAndCol(int colNum1, int colNum2, int outputColumn) { + this(); this.colNum1 = colNum1; this.colNum2 = colNum2; this.outputColumn = outputColumn; } + public ColAndCol() { + super(); + } + @Override public void evaluate(VectorizedRowBatch batch) { @@ -136,4 +144,24 @@ public int getOutputColumn() { public String getOutputType() { return "boolean"; } + + 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; + } } diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/ColOrCol.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/ColOrCol.java index 4a045e8..b57a844 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/ColOrCol.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/ColOrCol.java @@ -27,16 +27,24 @@ * are supposed to be represented as 0/1 in a long vector. */ public class ColOrCol extends VectorExpression { - private final int colNum1; - private final int colNum2; - private final int outputColumn; + + private static final long serialVersionUID = 1L; + + private int colNum1; + private int colNum2; + private int outputColumn; public ColOrCol(int colNum1, int colNum2, int outputColumn) { + this(); this.colNum1 = colNum1; this.colNum2 = colNum2; this.outputColumn = outputColumn; } + public ColOrCol() { + super(); + } + @Override public void evaluate(VectorizedRowBatch batch) { @@ -284,4 +292,24 @@ public int getOutputColumn() { public String getOutputType() { return "boolean"; } + + 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; + } } diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/ConstantVectorExpression.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/ConstantVectorExpression.java index c1c0c0d..f464f04 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/ConstantVectorExpression.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/ConstantVectorExpression.java @@ -28,30 +28,31 @@ */ public class ConstantVectorExpression extends VectorExpression { + private static final long serialVersionUID = 1L; + private static enum Type { LONG, DOUBLE, BYTES } - private final Type type; - private final int outputColumn; - private long longValue = 0; + private int outputColumn; + protected long longValue = 0; private double doubleValue = 0; private byte[] bytesValue = null; - private int bytesValueLength = 0; - private final String typeString; + private String typeString; + + private transient Type type; + private transient int bytesValueLength = 0; + + public ConstantVectorExpression() { + super(); + } ConstantVectorExpression(int outputColumn, String typeString) { + this(); this.outputColumn = outputColumn; - this.typeString = typeString; - if ("string".equalsIgnoreCase(typeString)) { - this.type = Type.BYTES; - } else if ("double".equalsIgnoreCase(typeString)) { - this.type = Type.DOUBLE; - } else { - this.type = Type.LONG; - } + setTypeString(typeString); } public ConstantVectorExpression(int outputColumn, long value) { @@ -66,8 +67,7 @@ public ConstantVectorExpression(int outputColumn, double value) { public ConstantVectorExpression(int outputColumn, byte[] value) { this(outputColumn, "string"); - this.bytesValue = value; - this.bytesValueLength = this.bytesValue.length; + setBytesValue(value); } private void evaluateLong(VectorizedRowBatch vrg) { @@ -113,6 +113,50 @@ public int getOutputColumn() { @Override public String getOutputType() { + return getTypeString(); + } + + public long getLongValue() { + return longValue; + } + + public void setLongValue(long longValue) { + this.longValue = longValue; + } + + public double getDoubleValue() { + return doubleValue; + } + + public void setDoubleValue(double doubleValue) { + this.doubleValue = doubleValue; + } + + public byte[] getBytesValue() { + return bytesValue; + } + + public void setBytesValue(byte[] bytesValue) { + this.bytesValue = bytesValue; + this.bytesValueLength = bytesValue.length; + } + + public String getTypeString() { return typeString; } + + public void setTypeString(String typeString) { + this.typeString = typeString; + if ("string".equalsIgnoreCase(typeString)) { + this.type = Type.BYTES; + } else if ("double".equalsIgnoreCase(typeString)) { + this.type = Type.DOUBLE; + } else { + this.type = Type.LONG; + } + } + + public void setOutputColumn(int outputColumn) { + this.outputColumn = outputColumn; + } } diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FilterConstantBooleanVectorExpression.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FilterConstantBooleanVectorExpression.java new file mode 100644 index 0000000..ddb7a8e --- /dev/null +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FilterConstantBooleanVectorExpression.java @@ -0,0 +1,42 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.hadoop.hive.ql.exec.vector.expressions; + +import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch; + +public class FilterConstantBooleanVectorExpression extends ConstantVectorExpression { + + private static final long serialVersionUID = 1L; + + public FilterConstantBooleanVectorExpression() { + super(); + } + + public FilterConstantBooleanVectorExpression(long value) { + super(-1, value); + } + + @Override + public void evaluate(VectorizedRowBatch vrg) { + if (longValue == 0) { + // All values are filtered out + vrg.size = 0; + } + } +} diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FilterExprAndExpr.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FilterExprAndExpr.java index cdef233..e6b511d 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FilterExprAndExpr.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FilterExprAndExpr.java @@ -25,12 +25,19 @@ */ public class FilterExprAndExpr extends VectorExpression { + private static final long serialVersionUID = 1L; + public FilterExprAndExpr(VectorExpression childExpr1, VectorExpression childExpr2) { + this(); this.childExpressions = new VectorExpression[2]; childExpressions[0] = childExpr1; childExpressions[1] = childExpr2; } + public FilterExprAndExpr() { + super(); + } + @Override public void evaluate(VectorizedRowBatch batch) { childExpressions[0].evaluate(batch); diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FilterNotExpr.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FilterNotExpr.java index 51a5cec..cdf404c 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FilterNotExpr.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FilterNotExpr.java @@ -24,13 +24,18 @@ * This class represents an NOT filter expression. This applies short circuit optimization. */ public class FilterNotExpr extends VectorExpression { - private final VectorExpression childExpr1; - private final int[] initialSelected = new int[VectorizedRowBatch.DEFAULT_SIZE]; - private int[] unselected = new int[VectorizedRowBatch.DEFAULT_SIZE]; - private final int[] tmp = new int[VectorizedRowBatch.DEFAULT_SIZE]; + private static final long serialVersionUID = 1L; + private transient final int[] initialSelected = new int[VectorizedRowBatch.DEFAULT_SIZE]; + private transient int[] unselected = new int[VectorizedRowBatch.DEFAULT_SIZE]; + private transient final int[] tmp = new int[VectorizedRowBatch.DEFAULT_SIZE]; public FilterNotExpr(VectorExpression childExpr1) { - this.childExpr1 = childExpr1; + this(); + this.childExpressions = new VectorExpression[] {childExpr1}; + } + + public FilterNotExpr() { + super(); } @Override @@ -53,6 +58,7 @@ public void evaluate(VectorizedRowBatch batch) { batch.selectedInUse = true; } + VectorExpression childExpr1 = this.childExpressions[0]; childExpr1.evaluate(batch); // Calculate unselected ones in last evaluate. diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FilterStringColLikeStringScalar.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FilterStringColLikeStringScalar.java index 3779091..eb3e511 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FilterStringColLikeStringScalar.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FilterStringColLikeStringScalar.java @@ -18,9 +18,7 @@ package org.apache.hadoop.hive.ql.exec.vector.expressions; -import org.apache.hadoop.hive.ql.exec.vector.BytesColumnVector; -import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch; -import org.apache.hadoop.io.Text; +import static org.apache.hadoop.hive.ql.udf.UDFLike.likePatternToRegExp; import java.nio.ByteBuffer; import java.nio.CharBuffer; @@ -29,23 +27,28 @@ import java.nio.charset.CodingErrorAction; import java.util.regex.Pattern; -import static org.apache.hadoop.hive.ql.udf.UDFLike.likePatternToRegExp; +import org.apache.hadoop.hive.ql.exec.vector.BytesColumnVector; +import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch; +import org.apache.hadoop.io.Text; /** * Evaluate LIKE filter on a batch for a vector of strings. */ public class FilterStringColLikeStringScalar extends VectorExpression { + private static final long serialVersionUID = 1L; private int colNum; private Pattern compiledPattern; - private final Text simplePattern = new Text(); - private ByteBuffer byteBuffer; - private CharBuffer charBuffer; - private CharsetDecoder decoder; private PatternType type = PatternType.NONE; + private String simpleStringPattern; + + private transient Text simplePattern = new Text(); + private transient ByteBuffer byteBuffer; + private transient CharBuffer charBuffer; + private transient CharsetDecoder decoder; // Doing characters comparison directly instead of regular expression // matching for simple patterns like "%abc%". - enum PatternType { + public enum PatternType { NONE, // "abc" BEGIN, // "abc%" END, // "%abc" @@ -54,12 +57,17 @@ } public FilterStringColLikeStringScalar(int colNum, Text likePattern) { + this(); this.colNum = colNum; String stringLikePattern = likePattern.toString(); parseSimplePattern(stringLikePattern); if (type == PatternType.COMPLEX) { compiledPattern = Pattern.compile(likePatternToRegExp(stringLikePattern)); } + } + + public FilterStringColLikeStringScalar() { + super(); decoder = Charset.forName("UTF-8").newDecoder() .onMalformedInput(CodingErrorAction.REPLACE) .onUnmappableCharacter(CodingErrorAction.REPLACE); @@ -67,7 +75,7 @@ public FilterStringColLikeStringScalar(int colNum, Text likePattern) { charBuffer = CharBuffer.allocate(4); } - PatternType getType() { + public PatternType getType() { return type; } @@ -259,16 +267,17 @@ private void parseSimplePattern(String likePattern) { } strPattern += likePattern.substring(beginIndex, endIndex); - simplePattern.set(strPattern); + simpleStringPattern = strPattern; + simplePattern.set(simpleStringPattern); } @Override public void evaluate(VectorizedRowBatch batch) { - + if (childExpressions != null) { super.evaluateChildren(batch); } - + BytesColumnVector inputColVector = (BytesColumnVector) batch.cols[colNum]; int[] sel = batch.selected; boolean[] nullPos = inputColVector.isNull; @@ -528,4 +537,33 @@ public int getOutputColumn() { public String getOutputType() { return "boolean"; } + + public int getColNum() { + return colNum; + } + + public void setColNum(int colNum) { + this.colNum = colNum; + } + + public Pattern getCompiledPattern() { + return compiledPattern; + } + + public void setCompiledPattern(Pattern compiledPattern) { + this.compiledPattern = compiledPattern; + } + + public void setType(PatternType type) { + this.type = type; + } + + public String getSimpleStringPattern() { + return simpleStringPattern; + } + + public void setSimpleStringPattern(String simpleStringPattern) { + this.simpleStringPattern = simpleStringPattern; + simplePattern.set(simpleStringPattern); + } } diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/IdentityExpression.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/IdentityExpression.java index 45169b2..758cfcb 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/IdentityExpression.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/IdentityExpression.java @@ -23,8 +23,14 @@ * An expression representing a column, only children are evaluated. */ public class IdentityExpression extends VectorExpression { - private final int colNum; - private final String type; + + private static final long serialVersionUID = 1L; + + private int colNum = -1; + private String type = null; + + public IdentityExpression() { + } public IdentityExpression(int colNum, String type) { this.colNum = colNum; @@ -47,4 +53,20 @@ public int getOutputColumn() { public String getOutputType() { return type; } + + public int getColNum() { + return getOutputColumn(); + } + + public String getType() { + return getOutputType(); + } + + public void setColNum(int colNum) { + this.colNum = colNum; + } + + public void setType(String type) { + this.type = type; + } } diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/IsNotNull.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/IsNotNull.java index 96eb215..126090c 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/IsNotNull.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/IsNotNull.java @@ -26,14 +26,20 @@ * The boolean output is stored in the specified output column. */ public class IsNotNull extends VectorExpression { - private final int colNum; - private final int outputColumn; + private static final long serialVersionUID = 1L; + private int colNum; + private int outputColumn; public IsNotNull(int colNum, int outputColumn) { + this(); this.colNum = colNum; this.outputColumn = outputColumn; } + public IsNotNull() { + super(); + } + @Override public void evaluate(VectorizedRowBatch batch) { @@ -86,4 +92,16 @@ public int getOutputColumn() { public String getOutputType() { return "boolean"; } + + public int getColNum() { + return colNum; + } + + public void setColNum(int colNum) { + this.colNum = colNum; + } + + public void setOutputColumn(int outputColumn) { + this.outputColumn = outputColumn; + } } diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/IsNull.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/IsNull.java index e6f5fe2..4a3f368 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/IsNull.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/IsNull.java @@ -26,14 +26,21 @@ * The boolean output is stored in the specified output column. */ public class IsNull extends VectorExpression { - private final int colNum; - private final int outputColumn; + + private static final long serialVersionUID = 1L; + private int colNum; + private int outputColumn; public IsNull(int colNum, int outputColumn) { + this(); this.colNum = colNum; this.outputColumn = outputColumn; } + public IsNull() { + super(); + } + @Override public void evaluate(VectorizedRowBatch batch) { @@ -83,4 +90,16 @@ public int getOutputColumn() { public String getOutputType() { return "boolean"; } + + public int getColNum() { + return colNum; + } + + public void setColNum(int colNum) { + this.colNum = colNum; + } + + public void setOutputColumn(int outputColumn) { + this.outputColumn = outputColumn; + } } diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/LongColDivideLongColumn.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/LongColDivideLongColumn.java index 5af6997..499b7df 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/LongColDivideLongColumn.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/LongColDivideLongColumn.java @@ -28,16 +28,22 @@ * from a template like the other arithmetic operations are. */ public class LongColDivideLongColumn extends VectorExpression { + private static final long serialVersionUID = 1L; int colNum1; int colNum2; int outputColumn; public LongColDivideLongColumn(int colNum1, int colNum2, int outputColumn) { + this(); this.colNum1 = colNum1; this.colNum2 = colNum2; this.outputColumn = outputColumn; } + public LongColDivideLongColumn() { + super(); + } + @Override public void evaluate(VectorizedRowBatch batch) { @@ -125,4 +131,24 @@ public int getOutputColumn() { 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; + } } diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/LongColDivideLongScalar.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/LongColDivideLongScalar.java index 2d64e69..461e632 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/LongColDivideLongScalar.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/LongColDivideLongScalar.java @@ -28,16 +28,22 @@ * from a template like the other arithmetic operations are. */ public class LongColDivideLongScalar extends VectorExpression { - private final int colNum; - private final long value; - private final int outputColumn; + private static final long serialVersionUID = 1L; + private int colNum; + private long value; + private int outputColumn; public LongColDivideLongScalar(int colNum, long value, int outputColumn) { + this(); this.colNum = colNum; this.value = value; this.outputColumn = outputColumn; } + public LongColDivideLongScalar() { + super(); + } + @Override public void evaluate(VectorizedRowBatch batch) { @@ -108,4 +114,24 @@ public int getOutputColumn() { 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; + } } diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/LongScalarDivideLongColumn.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/LongScalarDivideLongColumn.java index cfa3cf4..b37eafd 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/LongScalarDivideLongColumn.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/LongScalarDivideLongColumn.java @@ -28,16 +28,22 @@ * from a template like the other arithmetic operations are. */ public class LongScalarDivideLongColumn extends VectorExpression { - private final int colNum; - private final double value; - private final int outputColumn; + private static final long serialVersionUID = 1L; + private int colNum; + private double value; + private int outputColumn; public LongScalarDivideLongColumn(long value, int colNum, int outputColumn) { + this(); this.colNum = colNum; this.value = (double) value; this.outputColumn = outputColumn; } + public LongScalarDivideLongColumn() { + super(); + } + @Override public void evaluate(VectorizedRowBatch batch) { @@ -108,4 +114,24 @@ public int getOutputColumn() { 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; + } } diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/NotCol.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/NotCol.java index d310251..16c5805 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/NotCol.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/NotCol.java @@ -24,14 +24,20 @@ * Evaluates the boolean complement of the input. */ public class NotCol extends VectorExpression { - private final int colNum; - private final int outputColumn; + private static final long serialVersionUID = 1L; + private int colNum; + private int outputColumn; public NotCol(int colNum, int outputColumn) { + this(); this.colNum = colNum; this.outputColumn = outputColumn; } + public NotCol() { + super(); + } + @Override public void evaluate(VectorizedRowBatch batch) { @@ -101,4 +107,16 @@ public int getOutputColumn() { public String getOutputType() { return "boolean"; } + + public int getColNum() { + return colNum; + } + + public void setColNum(int colNum) { + this.colNum = colNum; + } + + public void setOutputColumn(int outputColumn) { + this.outputColumn = outputColumn; + } } diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/SelectColumnIsFalse.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/SelectColumnIsFalse.java index 1929453..c92be99 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/SelectColumnIsFalse.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/SelectColumnIsFalse.java @@ -25,12 +25,18 @@ * This expression selects a row if the given boolean column is false. */ public class SelectColumnIsFalse extends VectorExpression { - private final int colNum1; + private static final long serialVersionUID = 1L; + private int colNum1; public SelectColumnIsFalse(int colNum1) { + this(); this.colNum1 = colNum1; } + public SelectColumnIsFalse() { + super(); + } + @Override public void evaluate(VectorizedRowBatch batch) { @@ -122,4 +128,12 @@ public int getOutputColumn() { public String getOutputType() { return "boolean"; } + + public int getColNum1() { + return colNum1; + } + + public void setColNum1(int colNum1) { + this.colNum1 = colNum1; + } } diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/SelectColumnIsNotNull.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/SelectColumnIsNotNull.java index da9311a..8dd232c 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/SelectColumnIsNotNull.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/SelectColumnIsNotNull.java @@ -25,12 +25,18 @@ * This expression selects a row if the given column is null. */ public class SelectColumnIsNotNull extends VectorExpression { - private final int colNum; + private static final long serialVersionUID = 1L; + private int colNum; public SelectColumnIsNotNull(int colNum) { + this(); this.colNum = colNum; } + public SelectColumnIsNotNull() { + super(); + } + @Override public void evaluate(VectorizedRowBatch batch) { @@ -91,4 +97,12 @@ public int getOutputColumn() { public String getOutputType() { return "boolean"; } + + public int getColNum() { + return colNum; + } + + public void setColNum(int colNum) { + this.colNum = colNum; + } } diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/SelectColumnIsNull.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/SelectColumnIsNull.java index 9f08b3e..81106ac 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/SelectColumnIsNull.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/SelectColumnIsNull.java @@ -25,12 +25,19 @@ * This expression selects a row if the given column is null. */ public class SelectColumnIsNull extends VectorExpression { - private final int colNum; + private static final long serialVersionUID = 1L; + private int colNum; public SelectColumnIsNull(int colNum) { + this(); this.colNum = colNum; } + public SelectColumnIsNull() { + super(); + } + + @Override public void evaluate(VectorizedRowBatch batch) { if (childExpressions != null) { @@ -88,4 +95,12 @@ public int getOutputColumn() { public String getOutputType() { return "boolean"; } + + public int getColNum() { + return colNum; + } + + public void setColNum(int colNum) { + this.colNum = colNum; + } } diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/SelectColumnIsTrue.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/SelectColumnIsTrue.java index ded913c..f1ffc39 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/SelectColumnIsTrue.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/SelectColumnIsTrue.java @@ -25,12 +25,18 @@ * This expression selects a row if the given boolean column is true. */ public class SelectColumnIsTrue extends VectorExpression { - private final int colNum1; + private static final long serialVersionUID = 1L; + private int colNum1; public SelectColumnIsTrue(int colNum1) { + this(); this.colNum1 = colNum1; } + public SelectColumnIsTrue() { + super(); + } + @Override public void evaluate(VectorizedRowBatch batch) { if (childExpressions != null) { @@ -121,4 +127,12 @@ public int getOutputColumn() { public String getOutputType() { return "boolean"; } + + public int getColNum1() { + return colNum1; + } + + public void setColNum1(int colNum1) { + this.colNum1 = colNum1; + } } diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/StringConcatColCol.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/StringConcatColCol.java index 6d1c156..d09febb 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/StringConcatColCol.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/StringConcatColCol.java @@ -27,16 +27,22 @@ * the output in a third column. */ public class StringConcatColCol extends VectorExpression { + private static final long serialVersionUID = 1L; private int colNum1; private int colNum2; private int outputColumn; public StringConcatColCol(int colNum1, int colNum2, int outputColumn) { + this(); this.colNum1 = colNum1; this.colNum2 = colNum2; this.outputColumn = outputColumn; } + public StringConcatColCol() { + super(); + } + @Override public void evaluate(VectorizedRowBatch batch) { @@ -411,4 +417,24 @@ public int getOutputColumn() { public String getOutputType() { return "String"; } + + 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; + } } diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/StringConcatColScalar.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/StringConcatColScalar.java index 29ef244..e82401e 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/StringConcatColScalar.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/StringConcatColScalar.java @@ -26,16 +26,22 @@ * the result in an output column. */ public class StringConcatColScalar extends VectorExpression { + private static final long serialVersionUID = 1L; private int colNum; private int outputColumn; private byte[] value; StringConcatColScalar(int colNum, int outputColumn, byte[] value) { + this(); this.colNum = colNum; this.outputColumn = outputColumn; this.value = value; } + public StringConcatColScalar() { + super(); + } + @Override public void evaluate(VectorizedRowBatch batch) { BytesColumnVector inputColVector = (BytesColumnVector) batch.cols[colNum]; @@ -115,4 +121,24 @@ public int getOutputColumn() { public String getOutputType() { return "String"; } + + public int getColNum() { + return colNum; + } + + public void setColNum(int colNum) { + this.colNum = colNum; + } + + public byte[] getValue() { + return value; + } + + public void setValue(byte[] value) { + this.value = value; + } + + public void setOutputColumn(int outputColumn) { + this.outputColumn = outputColumn; + } } diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/StringConcatScalarCol.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/StringConcatScalarCol.java index 14205ee..69c4e97 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/StringConcatScalarCol.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/StringConcatScalarCol.java @@ -26,16 +26,22 @@ * the result in an output column. */ public class StringConcatScalarCol extends VectorExpression { + private static final long serialVersionUID = 1L; private int colNum; private int outputColumn; private byte[] value; StringConcatScalarCol(byte[] value, int colNum, int outputColumn) { + this(); this.colNum = colNum; this.outputColumn = outputColumn; this.value = value; } + public StringConcatScalarCol() { + super(); + } + @Override public void evaluate(VectorizedRowBatch batch) { BytesColumnVector inputColVector = (BytesColumnVector) batch.cols[colNum]; @@ -115,4 +121,24 @@ public int getOutputColumn() { public String getOutputType() { return "String"; } + + public int getColNum() { + return colNum; + } + + public void setColNum(int colNum) { + this.colNum = colNum; + } + + public byte[] getValue() { + return value; + } + + public void setValue(byte[] value) { + this.value = value; + } + + public void setOutputColumn(int outputColumn) { + this.outputColumn = outputColumn; + } } diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/StringLength.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/StringLength.java index dc79ff1..c7acc55 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/StringLength.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/StringLength.java @@ -27,14 +27,20 @@ * it in the output column vector. */ public class StringLength extends VectorExpression { - private final int colNum; - private final int outputColumn; + private static final long serialVersionUID = 1L; + private int colNum; + private int outputColumn; public StringLength(int colNum, int outputColumn) { + this(); this.colNum = colNum; this.outputColumn = outputColumn; } + public StringLength() { + super(); + } + // Calculate the length of the UTF-8 strings in input vector and place results in output vector. @Override public void evaluate(VectorizedRowBatch batch) { @@ -137,5 +143,15 @@ public String getOutputType() { return "Long"; } + public int getColNum() { + return colNum; + } + + public void setColNum(int colNum) { + this.colNum = colNum; + } + public void setOutputColumn(int outputColumn) { + this.outputColumn = outputColumn; + } } diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/StringLower.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/StringLower.java index a93137c..47e8321 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/StringLower.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/StringLower.java @@ -26,7 +26,13 @@ * Extends {@link StringUnaryUDF}. */ public class StringLower extends StringUnaryUDF { + private static final long serialVersionUID = 1L; + public StringLower(int colNum, int outputColumn) { super(colNum, outputColumn, (IUDFUnaryString) new UDFLower()); } + + public StringLower() { + super(); + } } diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/StringSubstrColStart.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/StringSubstrColStart.java index dbf0196..bdccc7b 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/StringSubstrColStart.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/StringSubstrColStart.java @@ -29,10 +29,11 @@ * string will be in the output. */ public class StringSubstrColStart extends VectorExpression { - private final int startIdx; - private final int colNum; - private final int outputColumn; - private static byte[] EMPTYSTRING; + private static final long serialVersionUID = 1L; + private int startIdx; + private int colNum; + private int outputColumn; + private transient static byte[] EMPTYSTRING; // Populating the Empty string bytes. Putting it as static since it should be immutable and can // be shared. @@ -45,11 +46,16 @@ } public StringSubstrColStart(int colNum, int startIdx, int outputColumn) { + this(); this.colNum = colNum; this.startIdx = startIdx; this.outputColumn = outputColumn; } + public StringSubstrColStart() { + super(); + } + /** * Given the substring start index param it finds the starting offset of the passed in utf8 * string byte array that matches the index. @@ -196,4 +202,24 @@ public int getOutputColumn() { public String getOutputType() { return "string"; } + + public int getStartIdx() { + return startIdx; + } + + public void setStartIdx(int startIdx) { + this.startIdx = startIdx; + } + + public int getColNum() { + return colNum; + } + + public void setColNum(int colNum) { + this.colNum = colNum; + } + + public void setOutputColumn(int outputColumn) { + this.outputColumn = outputColumn; + } } diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/StringSubstrColStartLen.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/StringSubstrColStartLen.java index c48355e..ee0f1c2 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/StringSubstrColStartLen.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/StringSubstrColStartLen.java @@ -31,12 +31,13 @@ * ending index. */ public class StringSubstrColStartLen extends VectorExpression { - private final int startIdx; - private final int colNum; - private final int length; - private final int outputColumn; - private final int[] offsetArray; - private static byte[] EMPTYSTRING; + private static final long serialVersionUID = 1L; + private int startIdx; + private int colNum; + private int length; + private int outputColumn; + private transient final int[] offsetArray; + private transient static byte[] EMPTYSTRING; // Populating the Empty string bytes. Putting it as static since it should be immutable and can be // shared @@ -49,10 +50,15 @@ } public StringSubstrColStartLen(int colNum, int startIdx, int length, int outputColumn) { + this(); this.colNum = colNum; this.startIdx = startIdx; this.length = length; this.outputColumn = outputColumn; + } + + public StringSubstrColStartLen() { + super(); offsetArray = new int[2]; } @@ -216,4 +222,32 @@ public String getOutputType() { return "string"; } + public int getStartIdx() { + return startIdx; + } + + public void setStartIdx(int startIdx) { + this.startIdx = startIdx; + } + + public int getColNum() { + return colNum; + } + + public void setColNum(int colNum) { + this.colNum = colNum; + } + + public int getLength() { + return length; + } + + public void setLength(int length) { + this.length = length; + } + + public void setOutputColumn(int outputColumn) { + this.outputColumn = outputColumn; + } + } diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/StringUnaryUDF.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/StringUnaryUDF.java index 23b909a..87f8de2 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/StringUnaryUDF.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/StringUnaryUDF.java @@ -29,15 +29,21 @@ * the vector. */ public class StringUnaryUDF extends VectorExpression { - private final int colNum; - private final int outputColumn; - private final IUDFUnaryString func; - private final Text s; + private static final long serialVersionUID = 1L; + private int colNum; + private int outputColumn; + private IUDFUnaryString func; + private transient final Text s; StringUnaryUDF(int colNum, int outputColumn, IUDFUnaryString func) { + this(); this.colNum = colNum; this.outputColumn = outputColumn; this.func = func; + } + + public StringUnaryUDF() { + super(); s = new Text(); } @@ -138,5 +144,23 @@ public String getOutputType() { return "String"; } + public int getColNum() { + return colNum; + } + public void setColNum(int colNum) { + this.colNum = colNum; + } + + public IUDFUnaryString getFunc() { + return func; + } + + public void setFunc(IUDFUnaryString func) { + this.func = func; + } + + public void setOutputColumn(int outputColumn) { + this.outputColumn = outputColumn; + } } diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/StringUpper.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/StringUpper.java index c5e748b..e41f950 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/StringUpper.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/StringUpper.java @@ -26,7 +26,13 @@ * Extends {@link StringUnaryUDF}. */ public class StringUpper extends StringUnaryUDF { + private static final long serialVersionUID = 1L; + public StringUpper(int colNum, int outputColumn) { super(colNum, outputColumn, (IUDFUnaryString) new UDFUpper()); } + + public StringUpper() { + super(); + } } diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/VectorExpression.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/VectorExpression.java index 5728df0..2844a09 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/VectorExpression.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/VectorExpression.java @@ -18,13 +18,16 @@ package org.apache.hadoop.hive.ql.exec.vector.expressions; +import java.io.Serializable; + import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch; /** * Base class for expressions. */ -public abstract class VectorExpression { +public abstract class VectorExpression implements Serializable { + private static final long serialVersionUID = 1L; /** * Child expressions are evaluated post order. */ diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/VectorUDFDayOfMonthLong.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/VectorUDFDayOfMonthLong.java index 08e6d24..bbd734c 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/VectorUDFDayOfMonthLong.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/VectorUDFDayOfMonthLong.java @@ -26,8 +26,13 @@ */ public final class VectorUDFDayOfMonthLong extends VectorUDFTimestampFieldLong { + private static final long serialVersionUID = 1L; + public VectorUDFDayOfMonthLong(int colNum, int outputColumn) { super(Calendar.DAY_OF_MONTH, colNum, outputColumn); } + public VectorUDFDayOfMonthLong() { + super(); + } } diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/VectorUDFHourLong.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/VectorUDFHourLong.java index 0107510..1d4d572 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/VectorUDFHourLong.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/VectorUDFHourLong.java @@ -26,8 +26,14 @@ */ public final class VectorUDFHourLong extends VectorUDFTimestampFieldLong { + private static final long serialVersionUID = 1L; + public VectorUDFHourLong(int colNum, int outputColumn) { super(Calendar.HOUR_OF_DAY, colNum, outputColumn); } + public VectorUDFHourLong() { + super(); + } + } diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/VectorUDFMinuteLong.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/VectorUDFMinuteLong.java index 17ea01b..4e3eede 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/VectorUDFMinuteLong.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/VectorUDFMinuteLong.java @@ -26,8 +26,13 @@ */ public final class VectorUDFMinuteLong extends VectorUDFTimestampFieldLong { + private static final long serialVersionUID = 1L; + public VectorUDFMinuteLong(int colNum, int outputColumn) { super(Calendar.MINUTE, colNum, outputColumn); } + public VectorUDFMinuteLong() { + super(); + } } diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/VectorUDFMonthLong.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/VectorUDFMonthLong.java index e547c1f..21552e1 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/VectorUDFMonthLong.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/VectorUDFMonthLong.java @@ -26,10 +26,16 @@ */ public final class VectorUDFMonthLong extends VectorUDFTimestampFieldLong { + private static final long serialVersionUID = 1L; + public VectorUDFMonthLong(int colNum, int outputColumn) { super(Calendar.MONTH, colNum, outputColumn); } + public VectorUDFMonthLong() { + super(); + } + @Override protected long getField(long time) { /* january is 0 */ diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/VectorUDFSecondLong.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/VectorUDFSecondLong.java index 4a85caf..41655ec 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/VectorUDFSecondLong.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/VectorUDFSecondLong.java @@ -26,8 +26,13 @@ */ public final class VectorUDFSecondLong extends VectorUDFTimestampFieldLong { + private static final long serialVersionUID = 1L; + public VectorUDFSecondLong(int colNum, int outputColumn) { super(Calendar.SECOND, colNum, outputColumn); } + public VectorUDFSecondLong() { + super(); + } } diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/VectorUDFTimestampFieldLong.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/VectorUDFTimestampFieldLong.java index d671731..c19fd2a 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/VectorUDFTimestampFieldLong.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/VectorUDFTimestampFieldLong.java @@ -29,19 +29,25 @@ */ 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 String getOutputType() { 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; + } + } diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/VectorUDFUnixTimeStampLong.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/VectorUDFUnixTimeStampLong.java index 7f56678..0feed95 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/VectorUDFUnixTimeStampLong.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/VectorUDFUnixTimeStampLong.java @@ -24,6 +24,8 @@ */ 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 VectorUDFUnixTimeStampLong(int colNum, int outputColumn) { super(-1, colNum, outputColumn); } + public VectorUDFUnixTimeStampLong() { + super(); + } + } diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/VectorUDFWeekOfYearLong.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/VectorUDFWeekOfYearLong.java index 91f0703..1ebadda 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/VectorUDFWeekOfYearLong.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/VectorUDFWeekOfYearLong.java @@ -26,11 +26,21 @@ */ 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); } - } diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/VectorUDFYearLong.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/VectorUDFYearLong.java index 1d82f09..abd87fe 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/VectorUDFYearLong.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/VectorUDFYearLong.java @@ -27,10 +27,11 @@ */ 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 VectorUDFYearLong(int colNum, int outputColumn) { super(Calendar.YEAR, colNum, outputColumn); } + public VectorUDFYearLong() { + super(); + } } diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/aggregates/VectorAggregateExpression.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/aggregates/VectorAggregateExpression.java index 6ca2312..1836169 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/aggregates/VectorAggregateExpression.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/aggregates/VectorAggregateExpression.java @@ -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 @@ /** * 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(); }; diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/aggregates/VectorUDAFCount.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/aggregates/VectorUDAFCount.java index 8fc6b64..086f91f 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/aggregates/VectorUDAFCount.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/aggregates/VectorUDAFCount.java @@ -37,12 +37,17 @@ @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 int getVariableSize() { } } - 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 int getAggregationBufferFixedSize() { public void init(AggregationDesc desc) throws HiveException { // No-op } + + public VectorExpression getInputExpression() { + return inputExpression; + } + + public void setInputExpression(VectorExpression inputExpression) { + this.inputExpression = inputExpression; + } } diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/aggregates/VectorUDAFCountStar.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/aggregates/VectorUDAFCountStar.java index 09adb97..4926f6c 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/aggregates/VectorUDAFCountStar.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/aggregates/VectorUDAFCountStar.java @@ -35,12 +35,17 @@ @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 int getVariableSize() { } } - private final LongWritable result; + transient private final LongWritable result; public VectorUDAFCountStar(VectorExpression inputExpression) { + this(); + } + + public VectorUDAFCountStar() { super(); result = new LongWritable(0); } diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/aggregates/gen/VectorUDAFAvgDouble.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/aggregates/gen/VectorUDAFAvgDouble.java index a9b8d4a..5940c2a 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/aggregates/gen/VectorUDAFAvgDouble.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/aggregates/gen/VectorUDAFAvgDouble.java @@ -44,12 +44,17 @@ @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 int getVariableSize() { } 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 int getAggregationBufferFixedSize() { public void init(AggregationDesc desc) throws HiveException { // No-op } + + public VectorExpression getInputExpression() { + return inputExpression; + } + + public void setInputExpression(VectorExpression inputExpression) { + this.inputExpression = inputExpression; + } } diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/aggregates/gen/VectorUDAFAvgLong.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/aggregates/gen/VectorUDAFAvgLong.java index 9322aaf..f0c3f78 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/aggregates/gen/VectorUDAFAvgLong.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/aggregates/gen/VectorUDAFAvgLong.java @@ -22,21 +22,20 @@ 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 @@ @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 int getVariableSize() { 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 @@ private void initPartialResultInspector() { fname.add("sum"); soi = ObjectInspectorFactory.getStandardStructObjectInspector(fname, foi); } - + private Aggregation getCurrentAggregationBuffer( VectorAggregationBufferRow[] aggregationBufferSets, int bufferIndex, @@ -104,21 +111,21 @@ private Aggregation getCurrentAggregationBuffer( 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 @@ private void iterateNoNullsRepeatingWithAggregationSelection( 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 @@ private void iterateNoNullsSelectionWithAggregationSelection( 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 @@ private void iterateNoNullsWithAggregationSelection( int batchSize) { for (int i=0; i < batchSize; ++i) { Aggregation myagg = getCurrentAggregationBuffer( - aggregationBufferSets, + aggregationBufferSets, bufferIndex, i); myagg.sumValue(values[i]); @@ -216,17 +223,17 @@ private void iterateHasNullsRepeatingSelectionWithAggregationSelection( 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 @@ private void iterateHasNullsRepeatingWithAggregationSelection( for (int i=0; i < batchSize; ++i) { if (!isNull[i]) { Aggregation myagg = getCurrentAggregationBuffer( - aggregationBufferSets, + aggregationBufferSets, bufferIndex, i); myagg.sumValue(value); @@ -259,7 +266,7 @@ private void iterateHasNullsSelectionWithAggregationSelection( int i = selection[j]; if (!isNull[i]) { Aggregation myagg = getCurrentAggregationBuffer( - aggregationBufferSets, + aggregationBufferSets, bufferIndex, j); myagg.sumValue(values[i]); @@ -277,7 +284,7 @@ private void iterateHasNullsWithAggregationSelection( 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 @@ private void iterateHasNullsWithAggregationSelection( } } - + @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 void aggregateInput(AggregationBuffer agg, VectorizedRowBatch batch) } return; } - + if (!batch.selectedInUse && inputVector.noNulls) { iterateNoSelectionNoNulls(myagg, vector, batchSize); } @@ -331,14 +338,14 @@ else if (inputVector.noNulls){ 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 @@ private void iterateSelectionHasNulls( } 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 @@ private void iterateSelectionNoNulls( } private void iterateNoSelectionHasNulls( - Aggregation myagg, - long[] vector, + Aggregation myagg, + long[] vector, int batchSize, boolean[] isNull) { - + for(int i=0;i= comparison on a vector of strings. */ public class FilterStringColGreaterEqualStringScalar extends VectorExpression { + + private static final long serialVersionUID = 1L; + private int colNum; private byte[] value; @@ -35,6 +38,9 @@ public FilterStringColGreaterEqualStringScalar(int colNum, byte[] value) { this.value = value; } + public FilterStringColGreaterEqualStringScalar() { + } + @Override public void evaluate(VectorizedRowBatch batch) { if (childExpressions != null) { @@ -136,4 +142,20 @@ public int getOutputColumn() { public String getOutputType() { return "boolean"; } + + public int getColNum() { + return colNum; + } + + public void setColNum(int colNum) { + this.colNum = colNum; + } + + public byte[] getValue() { + return value; + } + + public void setValue(byte[] value) { + this.value = value; + } } diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterStringColGreaterStringColumn.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterStringColGreaterStringColumn.java index c3fc4fa..8f728d2 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterStringColGreaterStringColumn.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterStringColGreaterStringColumn.java @@ -28,6 +28,9 @@ * This code is generated from a template. */ public class FilterStringColGreaterStringColumn extends VectorExpression { + + private static final long serialVersionUID = 1L; + private int colNum1; private int colNum2; @@ -36,6 +39,9 @@ public FilterStringColGreaterStringColumn(int colNum1, int colNum2) { this.colNum2 = colNum2; } + public FilterStringColGreaterStringColumn() { + } + @Override public void evaluate(VectorizedRowBatch batch) { @@ -452,4 +458,20 @@ public String getOutputType() { public int getOutputColumn() { return -1; } + + 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; + } } diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterStringColGreaterStringScalar.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterStringColGreaterStringScalar.java index 2915593..7093c31 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterStringColGreaterStringScalar.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterStringColGreaterStringScalar.java @@ -27,6 +27,9 @@ * This is a generated class to evaluate a > comparison on a vector of strings. */ public class FilterStringColGreaterStringScalar extends VectorExpression { + + private static final long serialVersionUID = 1L; + private int colNum; private byte[] value; @@ -35,6 +38,9 @@ public FilterStringColGreaterStringScalar(int colNum, byte[] value) { this.value = value; } + public FilterStringColGreaterStringScalar() { + } + @Override public void evaluate(VectorizedRowBatch batch) { if (childExpressions != null) { @@ -136,4 +142,20 @@ public int getOutputColumn() { public String getOutputType() { return "boolean"; } + + public int getColNum() { + return colNum; + } + + public void setColNum(int colNum) { + this.colNum = colNum; + } + + public byte[] getValue() { + return value; + } + + public void setValue(byte[] value) { + this.value = value; + } } diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterStringColLessEqualStringColumn.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterStringColLessEqualStringColumn.java index edc703c..8f74388 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterStringColLessEqualStringColumn.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterStringColLessEqualStringColumn.java @@ -28,6 +28,9 @@ * This code is generated from a template. */ public class FilterStringColLessEqualStringColumn extends VectorExpression { + + private static final long serialVersionUID = 1L; + private int colNum1; private int colNum2; @@ -36,6 +39,9 @@ public FilterStringColLessEqualStringColumn(int colNum1, int colNum2) { this.colNum2 = colNum2; } + public FilterStringColLessEqualStringColumn() { + } + @Override public void evaluate(VectorizedRowBatch batch) { @@ -452,4 +458,20 @@ public String getOutputType() { public int getOutputColumn() { return -1; } + + 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; + } } diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterStringColLessEqualStringScalar.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterStringColLessEqualStringScalar.java index 01d1bd0..452e563 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterStringColLessEqualStringScalar.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterStringColLessEqualStringScalar.java @@ -27,6 +27,9 @@ * This is a generated class to evaluate a <= comparison on a vector of strings. */ public class FilterStringColLessEqualStringScalar extends VectorExpression { + + private static final long serialVersionUID = 1L; + private int colNum; private byte[] value; @@ -35,6 +38,9 @@ public FilterStringColLessEqualStringScalar(int colNum, byte[] value) { this.value = value; } + public FilterStringColLessEqualStringScalar() { + } + @Override public void evaluate(VectorizedRowBatch batch) { if (childExpressions != null) { @@ -136,4 +142,20 @@ public int getOutputColumn() { public String getOutputType() { return "boolean"; } + + public int getColNum() { + return colNum; + } + + public void setColNum(int colNum) { + this.colNum = colNum; + } + + public byte[] getValue() { + return value; + } + + public void setValue(byte[] value) { + this.value = value; + } } diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterStringColLessStringColumn.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterStringColLessStringColumn.java index cb730a2..c087781 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterStringColLessStringColumn.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterStringColLessStringColumn.java @@ -28,6 +28,9 @@ * This code is generated from a template. */ public class FilterStringColLessStringColumn extends VectorExpression { + + private static final long serialVersionUID = 1L; + private int colNum1; private int colNum2; @@ -36,6 +39,9 @@ public FilterStringColLessStringColumn(int colNum1, int colNum2) { this.colNum2 = colNum2; } + public FilterStringColLessStringColumn() { + } + @Override public void evaluate(VectorizedRowBatch batch) { @@ -452,4 +458,20 @@ public String getOutputType() { public int getOutputColumn() { return -1; } + + 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; + } } diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterStringColLessStringScalar.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterStringColLessStringScalar.java index 9ae70ce..900d81a 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterStringColLessStringScalar.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterStringColLessStringScalar.java @@ -27,6 +27,9 @@ * This is a generated class to evaluate a < comparison on a vector of strings. */ public class FilterStringColLessStringScalar extends VectorExpression { + + private static final long serialVersionUID = 1L; + private int colNum; private byte[] value; @@ -35,6 +38,9 @@ public FilterStringColLessStringScalar(int colNum, byte[] value) { this.value = value; } + public FilterStringColLessStringScalar() { + } + @Override public void evaluate(VectorizedRowBatch batch) { if (childExpressions != null) { @@ -136,4 +142,20 @@ public int getOutputColumn() { public String getOutputType() { return "boolean"; } + + public int getColNum() { + return colNum; + } + + public void setColNum(int colNum) { + this.colNum = colNum; + } + + public byte[] getValue() { + return value; + } + + public void setValue(byte[] value) { + this.value = value; + } } diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterStringColNotEqualStringColumn.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterStringColNotEqualStringColumn.java index aa25ebf..520d2d8 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterStringColNotEqualStringColumn.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterStringColNotEqualStringColumn.java @@ -28,6 +28,9 @@ * This code is generated from a template. */ public class FilterStringColNotEqualStringColumn extends VectorExpression { + + private static final long serialVersionUID = 1L; + private int colNum1; private int colNum2; @@ -36,6 +39,9 @@ public FilterStringColNotEqualStringColumn(int colNum1, int colNum2) { this.colNum2 = colNum2; } + public FilterStringColNotEqualStringColumn() { + } + @Override public void evaluate(VectorizedRowBatch batch) { @@ -452,4 +458,20 @@ public String getOutputType() { public int getOutputColumn() { return -1; } + + 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; + } } diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterStringColNotEqualStringScalar.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterStringColNotEqualStringScalar.java index e5996c9..f5a2e19 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterStringColNotEqualStringScalar.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterStringColNotEqualStringScalar.java @@ -27,6 +27,9 @@ * This is a generated class to evaluate a != comparison on a vector of strings. */ public class FilterStringColNotEqualStringScalar extends VectorExpression { + + private static final long serialVersionUID = 1L; + private int colNum; private byte[] value; @@ -35,6 +38,9 @@ public FilterStringColNotEqualStringScalar(int colNum, byte[] value) { this.value = value; } + public FilterStringColNotEqualStringScalar() { + } + @Override public void evaluate(VectorizedRowBatch batch) { if (childExpressions != null) { @@ -136,4 +142,20 @@ public int getOutputColumn() { public String getOutputType() { return "boolean"; } + + public int getColNum() { + return colNum; + } + + public void setColNum(int colNum) { + this.colNum = colNum; + } + + public byte[] getValue() { + return value; + } + + public void setValue(byte[] value) { + this.value = value; + } } diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterStringScalarEqualStringColumn.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterStringScalarEqualStringColumn.java index 5dca36d..32727e5 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterStringScalarEqualStringColumn.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterStringScalarEqualStringColumn.java @@ -28,6 +28,9 @@ * Do not edit the generated code directly. */ public class FilterStringScalarEqualStringColumn extends VectorExpression { + + private static final long serialVersionUID = 1L; + private int colNum; private byte[] value; @@ -36,6 +39,9 @@ public FilterStringScalarEqualStringColumn(int colNum, byte[] value) { this.value = value; } + public FilterStringScalarEqualStringColumn() { + } + @Override public void evaluate(VectorizedRowBatch batch) { if (childExpressions != null) { @@ -137,4 +143,20 @@ public int getOutputColumn() { public String getOutputType() { return "boolean"; } + + public int getColNum() { + return colNum; + } + + public void setColNum(int colNum) { + this.colNum = colNum; + } + + public byte[] getValue() { + return value; + } + + public void setValue(byte[] value) { + this.value = value; + } } diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterStringScalarGreaterEqualStringColumn.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterStringScalarGreaterEqualStringColumn.java index fa1fef5..bb45d12 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterStringScalarGreaterEqualStringColumn.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterStringScalarGreaterEqualStringColumn.java @@ -28,6 +28,9 @@ * Do not edit the generated code directly. */ public class FilterStringScalarGreaterEqualStringColumn extends VectorExpression { + + private static final long serialVersionUID = 1L; + private int colNum; private byte[] value; @@ -36,6 +39,9 @@ public FilterStringScalarGreaterEqualStringColumn(int colNum, byte[] value) { this.value = value; } + public FilterStringScalarGreaterEqualStringColumn() { + } + @Override public void evaluate(VectorizedRowBatch batch) { if (childExpressions != null) { @@ -137,4 +143,20 @@ public int getOutputColumn() { public String getOutputType() { return "boolean"; } + + public int getColNum() { + return colNum; + } + + public void setColNum(int colNum) { + this.colNum = colNum; + } + + public byte[] getValue() { + return value; + } + + public void setValue(byte[] value) { + this.value = value; + } } diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterStringScalarGreaterStringColumn.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterStringScalarGreaterStringColumn.java index 42bdf73..069f2a7 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterStringScalarGreaterStringColumn.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterStringScalarGreaterStringColumn.java @@ -28,6 +28,9 @@ * Do not edit the generated code directly. */ public class FilterStringScalarGreaterStringColumn extends VectorExpression { + + private static final long serialVersionUID = 1L; + private int colNum; private byte[] value; @@ -36,6 +39,9 @@ public FilterStringScalarGreaterStringColumn(int colNum, byte[] value) { this.value = value; } + public FilterStringScalarGreaterStringColumn() { + } + @Override public void evaluate(VectorizedRowBatch batch) { if (childExpressions != null) { @@ -137,4 +143,20 @@ public int getOutputColumn() { public String getOutputType() { return "boolean"; } + + public int getColNum() { + return colNum; + } + + public void setColNum(int colNum) { + this.colNum = colNum; + } + + public byte[] getValue() { + return value; + } + + public void setValue(byte[] value) { + this.value = value; + } } diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterStringScalarLessEqualStringColumn.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterStringScalarLessEqualStringColumn.java index 5cd6d60..115f5c5 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterStringScalarLessEqualStringColumn.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterStringScalarLessEqualStringColumn.java @@ -28,6 +28,9 @@ * Do not edit the generated code directly. */ public class FilterStringScalarLessEqualStringColumn extends VectorExpression { + + private static final long serialVersionUID = 1L; + private int colNum; private byte[] value; @@ -36,6 +39,9 @@ public FilterStringScalarLessEqualStringColumn(int colNum, byte[] value) { this.value = value; } + public FilterStringScalarLessEqualStringColumn() { + } + @Override public void evaluate(VectorizedRowBatch batch) { if (childExpressions != null) { @@ -137,4 +143,20 @@ public int getOutputColumn() { public String getOutputType() { return "boolean"; } + + public int getColNum() { + return colNum; + } + + public void setColNum(int colNum) { + this.colNum = colNum; + } + + public byte[] getValue() { + return value; + } + + public void setValue(byte[] value) { + this.value = value; + } } diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterStringScalarLessStringColumn.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterStringScalarLessStringColumn.java index 5f52816..19b6627 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterStringScalarLessStringColumn.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterStringScalarLessStringColumn.java @@ -28,6 +28,9 @@ * Do not edit the generated code directly. */ public class FilterStringScalarLessStringColumn extends VectorExpression { + + private static final long serialVersionUID = 1L; + private int colNum; private byte[] value; @@ -36,6 +39,9 @@ public FilterStringScalarLessStringColumn(int colNum, byte[] value) { this.value = value; } + public FilterStringScalarLessStringColumn() { + } + @Override public void evaluate(VectorizedRowBatch batch) { if (childExpressions != null) { @@ -137,4 +143,20 @@ public int getOutputColumn() { public String getOutputType() { return "boolean"; } + + public int getColNum() { + return colNum; + } + + public void setColNum(int colNum) { + this.colNum = colNum; + } + + public byte[] getValue() { + return value; + } + + public void setValue(byte[] value) { + this.value = value; + } } diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterStringScalarNotEqualStringColumn.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterStringScalarNotEqualStringColumn.java index cab01df..e9db4ce 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterStringScalarNotEqualStringColumn.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterStringScalarNotEqualStringColumn.java @@ -28,6 +28,9 @@ * Do not edit the generated code directly. */ public class FilterStringScalarNotEqualStringColumn extends VectorExpression { + + private static final long serialVersionUID = 1L; + private int colNum; private byte[] value; @@ -36,6 +39,9 @@ public FilterStringScalarNotEqualStringColumn(int colNum, byte[] value) { this.value = value; } + public FilterStringScalarNotEqualStringColumn() { + } + @Override public void evaluate(VectorizedRowBatch batch) { if (childExpressions != null) { @@ -137,4 +143,20 @@ public int getOutputColumn() { public String getOutputType() { return "boolean"; } + + public int getColNum() { + return colNum; + } + + public void setColNum(int colNum) { + this.colNum = colNum; + } + + public byte[] getValue() { + return value; + } + + public void setValue(byte[] value) { + this.value = value; + } } diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/LongColAddDoubleColumn.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/LongColAddDoubleColumn.java index 36ad564..d208d6c 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/LongColAddDoubleColumn.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/LongColAddDoubleColumn.java @@ -28,6 +28,9 @@ * expressions between columns. */ public class LongColAddDoubleColumn extends VectorExpression { + + private static final long serialVersionUID = 1L; + private int colNum1; private int colNum2; private int outputColumn; @@ -38,6 +41,9 @@ public LongColAddDoubleColumn(int colNum1, int colNum2, int outputColumn) { this.outputColumn = outputColumn; } + public LongColAddDoubleColumn() { + } + @Override public void evaluate(VectorizedRowBatch batch) { @@ -128,4 +134,24 @@ public int getOutputColumn() { 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; + } } diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/LongColAddDoubleScalar.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/LongColAddDoubleScalar.java index 0da2aa0..f264624 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/LongColAddDoubleScalar.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/LongColAddDoubleScalar.java @@ -29,6 +29,9 @@ * expressions between a column and a scalar. */ public class LongColAddDoubleScalar extends VectorExpression { + + private static final long serialVersionUID = 1L; + private int colNum; private double value; private int outputColumn; @@ -39,6 +42,9 @@ public LongColAddDoubleScalar(int colNum, double value, int outputColumn) { this.outputColumn = outputColumn; } + public LongColAddDoubleScalar() { + } + @Override public void evaluate(VectorizedRowBatch batch) { @@ -105,4 +111,24 @@ public int getOutputColumn() { 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; + } } diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/LongColAddLongColumn.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/LongColAddLongColumn.java index d258f6c..4feff6f 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/LongColAddLongColumn.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/LongColAddLongColumn.java @@ -28,6 +28,9 @@ * expressions between columns. */ public class LongColAddLongColumn extends VectorExpression { + + private static final long serialVersionUID = 1L; + private int colNum1; private int colNum2; private int outputColumn; @@ -38,6 +41,9 @@ public LongColAddLongColumn(int colNum1, int colNum2, int outputColumn) { this.outputColumn = outputColumn; } + public LongColAddLongColumn() { + } + @Override public void evaluate(VectorizedRowBatch batch) { @@ -128,4 +134,24 @@ public int getOutputColumn() { public String getOutputType() { return "long"; } + + 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; + } } diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/LongColAddLongScalar.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/LongColAddLongScalar.java index f5933c5..1031e8c 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/LongColAddLongScalar.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/LongColAddLongScalar.java @@ -29,6 +29,9 @@ * expressions between a column and a scalar. */ public class LongColAddLongScalar extends VectorExpression { + + private static final long serialVersionUID = 1L; + private int colNum; private long value; private int outputColumn; @@ -39,6 +42,9 @@ public LongColAddLongScalar(int colNum, long value, int outputColumn) { this.outputColumn = outputColumn; } + public LongColAddLongScalar() { + } + @Override public void evaluate(VectorizedRowBatch batch) { @@ -105,4 +111,24 @@ public int getOutputColumn() { public String getOutputType() { return "long"; } + + 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; + } } diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/LongColDivideDoubleColumn.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/LongColDivideDoubleColumn.java index e7b16f8..4cb3d8a 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/LongColDivideDoubleColumn.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/LongColDivideDoubleColumn.java @@ -28,6 +28,9 @@ * expressions between columns. */ public class LongColDivideDoubleColumn extends VectorExpression { + + private static final long serialVersionUID = 1L; + private int colNum1; private int colNum2; private int outputColumn; @@ -38,6 +41,9 @@ public LongColDivideDoubleColumn(int colNum1, int colNum2, int outputColumn) { this.outputColumn = outputColumn; } + public LongColDivideDoubleColumn() { + } + @Override public void evaluate(VectorizedRowBatch batch) { @@ -128,4 +134,24 @@ public int getOutputColumn() { 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; + } } diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/LongColDivideDoubleScalar.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/LongColDivideDoubleScalar.java index 5770136..9c57c99 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/LongColDivideDoubleScalar.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/LongColDivideDoubleScalar.java @@ -29,6 +29,9 @@ * expressions between a column and a scalar. */ public class LongColDivideDoubleScalar extends VectorExpression { + + private static final long serialVersionUID = 1L; + private int colNum; private double value; private int outputColumn; @@ -39,6 +42,9 @@ public LongColDivideDoubleScalar(int colNum, double value, int outputColumn) { this.outputColumn = outputColumn; } + public LongColDivideDoubleScalar() { + } + @Override public void evaluate(VectorizedRowBatch batch) { @@ -105,4 +111,24 @@ public int getOutputColumn() { 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; + } } diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/LongColEqualDoubleScalar.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/LongColEqualDoubleScalar.java index cb654fa..c322f1a 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/LongColEqualDoubleScalar.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/LongColEqualDoubleScalar.java @@ -29,6 +29,9 @@ * separate boolean column. */ public class LongColEqualDoubleScalar extends VectorExpression { + + private static final long serialVersionUID = 1L; + private int colNum; private double value; private int outputColumn; @@ -39,6 +42,9 @@ public LongColEqualDoubleScalar(int colNum, double value, int outputColumn) { this.outputColumn = outputColumn; } + public LongColEqualDoubleScalar() { + } + @Override public void evaluate(VectorizedRowBatch batch) { @@ -120,4 +126,24 @@ public int getOutputColumn() { 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; + } } diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/LongColGreaterDoubleScalar.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/LongColGreaterDoubleScalar.java index 474bdcb..ae327f3 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/LongColGreaterDoubleScalar.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/LongColGreaterDoubleScalar.java @@ -29,6 +29,9 @@ * separate boolean column. */ public class LongColGreaterDoubleScalar extends VectorExpression { + + private static final long serialVersionUID = 1L; + private int colNum; private double value; private int outputColumn; @@ -39,6 +42,9 @@ public LongColGreaterDoubleScalar(int colNum, double value, int outputColumn) { this.outputColumn = outputColumn; } + public LongColGreaterDoubleScalar() { + } + @Override public void evaluate(VectorizedRowBatch batch) { @@ -120,4 +126,24 @@ public int getOutputColumn() { 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; + } } diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/LongColGreaterEqualDoubleScalar.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/LongColGreaterEqualDoubleScalar.java index 197ccfb..6d3d19f 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/LongColGreaterEqualDoubleScalar.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/LongColGreaterEqualDoubleScalar.java @@ -29,6 +29,9 @@ * separate boolean column. */ public class LongColGreaterEqualDoubleScalar extends VectorExpression { + + private static final long serialVersionUID = 1L; + private int colNum; private double value; private int outputColumn; @@ -39,6 +42,9 @@ public LongColGreaterEqualDoubleScalar(int colNum, double value, int outputColum this.outputColumn = outputColumn; } + public LongColGreaterEqualDoubleScalar() { + } + @Override public void evaluate(VectorizedRowBatch batch) { @@ -120,4 +126,24 @@ public int getOutputColumn() { 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; + } } diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/LongColLessDoubleScalar.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/LongColLessDoubleScalar.java index a88ee56..5c322b0 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/LongColLessDoubleScalar.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/LongColLessDoubleScalar.java @@ -29,6 +29,9 @@ * separate boolean column. */ public class LongColLessDoubleScalar extends VectorExpression { + + private static final long serialVersionUID = 1L; + private int colNum; private double value; private int outputColumn; @@ -39,6 +42,9 @@ public LongColLessDoubleScalar(int colNum, double value, int outputColumn) { this.outputColumn = outputColumn; } + public LongColLessDoubleScalar() { + } + @Override public void evaluate(VectorizedRowBatch batch) { @@ -120,4 +126,24 @@ public int getOutputColumn() { 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; + } } diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/LongColLessEqualDoubleScalar.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/LongColLessEqualDoubleScalar.java index c54aa14..eece809 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/LongColLessEqualDoubleScalar.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/LongColLessEqualDoubleScalar.java @@ -29,6 +29,9 @@ * separate boolean column. */ public class LongColLessEqualDoubleScalar extends VectorExpression { + + private static final long serialVersionUID = 1L; + private int colNum; private double value; private int outputColumn; @@ -39,6 +42,9 @@ public LongColLessEqualDoubleScalar(int colNum, double value, int outputColumn) this.outputColumn = outputColumn; } + public LongColLessEqualDoubleScalar() { + } + @Override public void evaluate(VectorizedRowBatch batch) { @@ -120,4 +126,24 @@ public int getOutputColumn() { 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; + } } diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/LongColModuloDoubleColumn.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/LongColModuloDoubleColumn.java index 6b832f5..8828199 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/LongColModuloDoubleColumn.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/LongColModuloDoubleColumn.java @@ -28,6 +28,9 @@ * expressions between columns. */ public class LongColModuloDoubleColumn extends VectorExpression { + + private static final long serialVersionUID = 1L; + private int colNum1; private int colNum2; private int outputColumn; @@ -38,6 +41,9 @@ public LongColModuloDoubleColumn(int colNum1, int colNum2, int outputColumn) { this.outputColumn = outputColumn; } + public LongColModuloDoubleColumn() { + } + @Override public void evaluate(VectorizedRowBatch batch) { @@ -128,4 +134,24 @@ public int getOutputColumn() { 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; + } } diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/LongColModuloDoubleScalar.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/LongColModuloDoubleScalar.java index c4104c5..4858d9c 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/LongColModuloDoubleScalar.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/LongColModuloDoubleScalar.java @@ -29,6 +29,9 @@ * expressions between a column and a scalar. */ public class LongColModuloDoubleScalar extends VectorExpression { + + private static final long serialVersionUID = 1L; + private int colNum; private double value; private int outputColumn; @@ -39,6 +42,9 @@ public LongColModuloDoubleScalar(int colNum, double value, int outputColumn) { this.outputColumn = outputColumn; } + public LongColModuloDoubleScalar() { + } + @Override public void evaluate(VectorizedRowBatch batch) { @@ -105,4 +111,24 @@ public int getOutputColumn() { 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; + } } diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/LongColModuloLongColumn.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/LongColModuloLongColumn.java index bee034e..161f256 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/LongColModuloLongColumn.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/LongColModuloLongColumn.java @@ -28,6 +28,9 @@ * expressions between columns. */ public class LongColModuloLongColumn extends VectorExpression { + + private static final long serialVersionUID = 1L; + private int colNum1; private int colNum2; private int outputColumn; @@ -38,6 +41,9 @@ public LongColModuloLongColumn(int colNum1, int colNum2, int outputColumn) { this.outputColumn = outputColumn; } + public LongColModuloLongColumn() { + } + @Override public void evaluate(VectorizedRowBatch batch) { @@ -128,4 +134,24 @@ public int getOutputColumn() { public String getOutputType() { return "long"; } + + 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; + } } diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/LongColModuloLongScalar.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/LongColModuloLongScalar.java index bca8b01..fb17419 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/LongColModuloLongScalar.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/LongColModuloLongScalar.java @@ -29,6 +29,9 @@ * expressions between a column and a scalar. */ public class LongColModuloLongScalar extends VectorExpression { + + private static final long serialVersionUID = 1L; + private int colNum; private long value; private int outputColumn; @@ -39,6 +42,9 @@ public LongColModuloLongScalar(int colNum, long value, int outputColumn) { this.outputColumn = outputColumn; } + public LongColModuloLongScalar() { + } + @Override public void evaluate(VectorizedRowBatch batch) { @@ -105,4 +111,24 @@ public int getOutputColumn() { public String getOutputType() { return "long"; } + + 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; + } } diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/LongColMultiplyDoubleColumn.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/LongColMultiplyDoubleColumn.java index 950aa79..c9981bb 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/LongColMultiplyDoubleColumn.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/LongColMultiplyDoubleColumn.java @@ -28,6 +28,9 @@ * expressions between columns. */ public class LongColMultiplyDoubleColumn extends VectorExpression { + + private static final long serialVersionUID = 1L; + private int colNum1; private int colNum2; private int outputColumn; @@ -38,6 +41,9 @@ public LongColMultiplyDoubleColumn(int colNum1, int colNum2, int outputColumn) { this.outputColumn = outputColumn; } + public LongColMultiplyDoubleColumn() { + } + @Override public void evaluate(VectorizedRowBatch batch) { @@ -128,4 +134,24 @@ public int getOutputColumn() { 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; + } } diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/LongColMultiplyDoubleScalar.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/LongColMultiplyDoubleScalar.java index 2a13575..269b89a 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/LongColMultiplyDoubleScalar.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/LongColMultiplyDoubleScalar.java @@ -29,6 +29,9 @@ * expressions between a column and a scalar. */ public class LongColMultiplyDoubleScalar extends VectorExpression { + + private static final long serialVersionUID = 1L; + private int colNum; private double value; private int outputColumn; @@ -39,6 +42,9 @@ public LongColMultiplyDoubleScalar(int colNum, double value, int outputColumn) { this.outputColumn = outputColumn; } + public LongColMultiplyDoubleScalar() { + } + @Override public void evaluate(VectorizedRowBatch batch) { @@ -105,4 +111,24 @@ public int getOutputColumn() { 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; + } } diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/LongColMultiplyLongColumn.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/LongColMultiplyLongColumn.java index 1f9844a..40f9dab 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/LongColMultiplyLongColumn.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/LongColMultiplyLongColumn.java @@ -28,6 +28,9 @@ * expressions between columns. */ public class LongColMultiplyLongColumn extends VectorExpression { + + private static final long serialVersionUID = 1L; + private int colNum1; private int colNum2; private int outputColumn; @@ -38,6 +41,9 @@ public LongColMultiplyLongColumn(int colNum1, int colNum2, int outputColumn) { this.outputColumn = outputColumn; } + public LongColMultiplyLongColumn() { + } + @Override public void evaluate(VectorizedRowBatch batch) { @@ -128,4 +134,24 @@ public int getOutputColumn() { public String getOutputType() { return "long"; } + + 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; + } } diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/LongColMultiplyLongScalar.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/LongColMultiplyLongScalar.java index f2884fc..5ba9523 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/LongColMultiplyLongScalar.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/LongColMultiplyLongScalar.java @@ -29,6 +29,9 @@ * expressions between a column and a scalar. */ public class LongColMultiplyLongScalar extends VectorExpression { + + private static final long serialVersionUID = 1L; + private int colNum; private long value; private int outputColumn; @@ -39,6 +42,9 @@ public LongColMultiplyLongScalar(int colNum, long value, int outputColumn) { this.outputColumn = outputColumn; } + public LongColMultiplyLongScalar() { + } + @Override public void evaluate(VectorizedRowBatch batch) { @@ -105,4 +111,24 @@ public int getOutputColumn() { public String getOutputType() { return "long"; } + + 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; + } } diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/LongColNotEqualDoubleScalar.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/LongColNotEqualDoubleScalar.java index 30bdb00..938bcaa 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/LongColNotEqualDoubleScalar.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/LongColNotEqualDoubleScalar.java @@ -29,6 +29,9 @@ * separate boolean column. */ public class LongColNotEqualDoubleScalar extends VectorExpression { + + private static final long serialVersionUID = 1L; + private int colNum; private double value; private int outputColumn; @@ -39,6 +42,9 @@ public LongColNotEqualDoubleScalar(int colNum, double value, int outputColumn) { this.outputColumn = outputColumn; } + public LongColNotEqualDoubleScalar() { + } + @Override public void evaluate(VectorizedRowBatch batch) { @@ -120,4 +126,24 @@ public int getOutputColumn() { 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; + } } diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/LongColSubtractDoubleColumn.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/LongColSubtractDoubleColumn.java index d9a24be..c54ac35 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/LongColSubtractDoubleColumn.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/LongColSubtractDoubleColumn.java @@ -28,6 +28,9 @@ * expressions between columns. */ public class LongColSubtractDoubleColumn extends VectorExpression { + + private static final long serialVersionUID = 1L; + private int colNum1; private int colNum2; private int outputColumn; @@ -38,6 +41,9 @@ public LongColSubtractDoubleColumn(int colNum1, int colNum2, int outputColumn) { this.outputColumn = outputColumn; } + public LongColSubtractDoubleColumn() { + } + @Override public void evaluate(VectorizedRowBatch batch) { @@ -128,4 +134,24 @@ public int getOutputColumn() { 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; + } } diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/LongColSubtractDoubleScalar.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/LongColSubtractDoubleScalar.java index 5bf2f34..68caab5 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/LongColSubtractDoubleScalar.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/LongColSubtractDoubleScalar.java @@ -29,6 +29,9 @@ * expressions between a column and a scalar. */ public class LongColSubtractDoubleScalar extends VectorExpression { + + private static final long serialVersionUID = 1L; + private int colNum; private double value; private int outputColumn; @@ -39,6 +42,9 @@ public LongColSubtractDoubleScalar(int colNum, double value, int outputColumn) { this.outputColumn = outputColumn; } + public LongColSubtractDoubleScalar() { + } + @Override public void evaluate(VectorizedRowBatch batch) { @@ -105,4 +111,24 @@ public int getOutputColumn() { 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; + } } diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/LongColSubtractLongColumn.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/LongColSubtractLongColumn.java index d3219fe..13c132f 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/LongColSubtractLongColumn.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/LongColSubtractLongColumn.java @@ -28,6 +28,9 @@ * expressions between columns. */ public class LongColSubtractLongColumn extends VectorExpression { + + private static final long serialVersionUID = 1L; + private int colNum1; private int colNum2; private int outputColumn; @@ -38,6 +41,9 @@ public LongColSubtractLongColumn(int colNum1, int colNum2, int outputColumn) { this.outputColumn = outputColumn; } + public LongColSubtractLongColumn() { + } + @Override public void evaluate(VectorizedRowBatch batch) { @@ -128,4 +134,24 @@ public int getOutputColumn() { public String getOutputType() { return "long"; } + + 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; + } } diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/LongColSubtractLongScalar.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/LongColSubtractLongScalar.java index 02c5894..019f9e6 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/LongColSubtractLongScalar.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/LongColSubtractLongScalar.java @@ -29,6 +29,9 @@ * expressions between a column and a scalar. */ public class LongColSubtractLongScalar extends VectorExpression { + + private static final long serialVersionUID = 1L; + private int colNum; private long value; private int outputColumn; @@ -39,6 +42,9 @@ public LongColSubtractLongScalar(int colNum, long value, int outputColumn) { this.outputColumn = outputColumn; } + public LongColSubtractLongScalar() { + } + @Override public void evaluate(VectorizedRowBatch batch) { @@ -105,4 +111,24 @@ public int getOutputColumn() { public String getOutputType() { return "long"; } + + 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; + } } diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/LongColUnaryMinus.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/LongColUnaryMinus.java index 8f33a55..e0805f4 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/LongColUnaryMinus.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/LongColUnaryMinus.java @@ -26,6 +26,9 @@ * Generated from template ColumnUnaryMinus.txt, which covers unary negation operator. */ public class LongColUnaryMinus extends VectorExpression { + + private static final long serialVersionUID = 1L; + private int colNum; private int outputColumn; @@ -34,6 +37,9 @@ public LongColUnaryMinus(int colNum, int outputColumn) { this.outputColumn = outputColumn; } + public LongColUnaryMinus() { + } + @Override public void evaluate(VectorizedRowBatch batch) { @@ -101,4 +107,16 @@ public int getOutputColumn() { public String getOutputType() { return "long"; } + + public int getColNum() { + return colNum; + } + + public void setColNum(int colNum) { + this.colNum = colNum; + } + + public void setOutputColumn(int outputColumn) { + this.outputColumn = outputColumn; + } } diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/LongScalarAddDoubleColumn.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/LongScalarAddDoubleColumn.java index 97dc672..e499340 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/LongScalarAddDoubleColumn.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/LongScalarAddDoubleColumn.java @@ -36,6 +36,9 @@ * column vector on the right. The result is output to an output column vector. */ public class LongScalarAddDoubleColumn extends VectorExpression { + + private static final long serialVersionUID = 1L; + private int colNum; private long value; private int outputColumn; @@ -46,6 +49,9 @@ public LongScalarAddDoubleColumn(long value, int colNum, int outputColumn) { this.outputColumn = outputColumn; } + public LongScalarAddDoubleColumn() { + } + @Override /** * Method to evaluate scalar-column operation in vectorized fashion. @@ -117,4 +123,25 @@ public int getOutputColumn() { 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; + } + } diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/LongScalarAddLongColumn.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/LongScalarAddLongColumn.java index 4d90f2b..db1fcd3 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/LongScalarAddLongColumn.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/LongScalarAddLongColumn.java @@ -36,6 +36,9 @@ * column vector on the right. The result is output to an output column vector. */ public class LongScalarAddLongColumn extends VectorExpression { + + private static final long serialVersionUID = 1L; + private int colNum; private long value; private int outputColumn; @@ -46,6 +49,9 @@ public LongScalarAddLongColumn(long value, int colNum, int outputColumn) { this.outputColumn = outputColumn; } + public LongScalarAddLongColumn() { + } + @Override /** * Method to evaluate scalar-column operation in vectorized fashion. @@ -117,4 +123,25 @@ public int getOutputColumn() { public String getOutputType() { return "long"; } + + 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; + } + } diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/LongScalarDivideDoubleColumn.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/LongScalarDivideDoubleColumn.java index e5ed537..83b91c7 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/LongScalarDivideDoubleColumn.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/LongScalarDivideDoubleColumn.java @@ -36,6 +36,9 @@ * column vector on the right. The result is output to an output column vector. */ public class LongScalarDivideDoubleColumn extends VectorExpression { + + private static final long serialVersionUID = 1L; + private int colNum; private long value; private int outputColumn; @@ -46,6 +49,9 @@ public LongScalarDivideDoubleColumn(long value, int colNum, int outputColumn) { this.outputColumn = outputColumn; } + public LongScalarDivideDoubleColumn() { + } + @Override /** * Method to evaluate scalar-column operation in vectorized fashion. @@ -117,4 +123,25 @@ public int getOutputColumn() { 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; + } + } diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/LongScalarModuloDoubleColumn.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/LongScalarModuloDoubleColumn.java index 0ddb280..435525c 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/LongScalarModuloDoubleColumn.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/LongScalarModuloDoubleColumn.java @@ -36,6 +36,9 @@ * column vector on the right. The result is output to an output column vector. */ public class LongScalarModuloDoubleColumn extends VectorExpression { + + private static final long serialVersionUID = 1L; + private int colNum; private long value; private int outputColumn; @@ -46,6 +49,9 @@ public LongScalarModuloDoubleColumn(long value, int colNum, int outputColumn) { this.outputColumn = outputColumn; } + public LongScalarModuloDoubleColumn() { + } + @Override /** * Method to evaluate scalar-column operation in vectorized fashion. @@ -117,4 +123,25 @@ public int getOutputColumn() { 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; + } + } diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/LongScalarModuloLongColumn.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/LongScalarModuloLongColumn.java index edf2220..6623f8a 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/LongScalarModuloLongColumn.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/LongScalarModuloLongColumn.java @@ -36,6 +36,9 @@ * column vector on the right. The result is output to an output column vector. */ public class LongScalarModuloLongColumn extends VectorExpression { + + private static final long serialVersionUID = 1L; + private int colNum; private long value; private int outputColumn; @@ -46,6 +49,9 @@ public LongScalarModuloLongColumn(long value, int colNum, int outputColumn) { this.outputColumn = outputColumn; } + public LongScalarModuloLongColumn() { + } + @Override /** * Method to evaluate scalar-column operation in vectorized fashion. @@ -117,4 +123,25 @@ public int getOutputColumn() { public String getOutputType() { return "long"; } + + 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; + } + } diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/LongScalarMultiplyDoubleColumn.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/LongScalarMultiplyDoubleColumn.java index 5fc259a..8a53343 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/LongScalarMultiplyDoubleColumn.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/LongScalarMultiplyDoubleColumn.java @@ -36,6 +36,9 @@ * column vector on the right. The result is output to an output column vector. */ public class LongScalarMultiplyDoubleColumn extends VectorExpression { + + private static final long serialVersionUID = 1L; + private int colNum; private long value; private int outputColumn; @@ -46,6 +49,9 @@ public LongScalarMultiplyDoubleColumn(long value, int colNum, int outputColumn) this.outputColumn = outputColumn; } + public LongScalarMultiplyDoubleColumn() { + } + @Override /** * Method to evaluate scalar-column operation in vectorized fashion. @@ -117,4 +123,25 @@ public int getOutputColumn() { 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; + } + } diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/LongScalarMultiplyLongColumn.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/LongScalarMultiplyLongColumn.java index e7e8903..437136d 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/LongScalarMultiplyLongColumn.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/LongScalarMultiplyLongColumn.java @@ -36,6 +36,9 @@ * column vector on the right. The result is output to an output column vector. */ public class LongScalarMultiplyLongColumn extends VectorExpression { + + private static final long serialVersionUID = 1L; + private int colNum; private long value; private int outputColumn; @@ -46,6 +49,9 @@ public LongScalarMultiplyLongColumn(long value, int colNum, int outputColumn) { this.outputColumn = outputColumn; } + public LongScalarMultiplyLongColumn() { + } + @Override /** * Method to evaluate scalar-column operation in vectorized fashion. @@ -117,4 +123,25 @@ public int getOutputColumn() { public String getOutputType() { return "long"; } + + 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; + } + } diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/LongScalarSubtractDoubleColumn.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/LongScalarSubtractDoubleColumn.java index 14096f6..da9b22a 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/LongScalarSubtractDoubleColumn.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/LongScalarSubtractDoubleColumn.java @@ -36,6 +36,9 @@ * column vector on the right. The result is output to an output column vector. */ public class LongScalarSubtractDoubleColumn extends VectorExpression { + + private static final long serialVersionUID = 1L; + private int colNum; private long value; private int outputColumn; @@ -46,6 +49,9 @@ public LongScalarSubtractDoubleColumn(long value, int colNum, int outputColumn) this.outputColumn = outputColumn; } + public LongScalarSubtractDoubleColumn() { + } + @Override /** * Method to evaluate scalar-column operation in vectorized fashion. @@ -117,4 +123,25 @@ public int getOutputColumn() { 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; + } + } diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/LongScalarSubtractLongColumn.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/LongScalarSubtractLongColumn.java index a6cde10..8f4a50d 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/LongScalarSubtractLongColumn.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/LongScalarSubtractLongColumn.java @@ -36,6 +36,9 @@ * column vector on the right. The result is output to an output column vector. */ public class LongScalarSubtractLongColumn extends VectorExpression { + + private static final long serialVersionUID = 1L; + private int colNum; private long value; private int outputColumn; @@ -46,6 +49,9 @@ public LongScalarSubtractLongColumn(long value, int colNum, int outputColumn) { this.outputColumn = outputColumn; } + public LongScalarSubtractLongColumn() { + } + @Override /** * Method to evaluate scalar-column operation in vectorized fashion. @@ -117,4 +123,25 @@ public int getOutputColumn() { public String getOutputType() { return "long"; } + + 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; + } + } diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/templates/ColumnArithmeticColumn.txt ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/templates/ColumnArithmeticColumn.txt index dcd11d0..2ab4aec 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/templates/ColumnArithmeticColumn.txt +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/templates/ColumnArithmeticColumn.txt @@ -28,6 +28,9 @@ import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch; * expressions between columns. */ public class extends VectorExpression { + + private static final long serialVersionUID = 1L; + private int colNum1; private int colNum2; private int outputColumn; @@ -38,6 +41,9 @@ public class extends VectorExpression { this.outputColumn = outputColumn; } + public () { + } + @Override public void evaluate(VectorizedRowBatch batch) { @@ -128,4 +134,24 @@ public class extends VectorExpression { public String getOutputType() { return ""; } + + 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; + } } diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/templates/ColumnArithmeticScalar.txt ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/templates/ColumnArithmeticScalar.txt index 33241d5..35890f8 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/templates/ColumnArithmeticScalar.txt +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/templates/ColumnArithmeticScalar.txt @@ -29,6 +29,9 @@ import org.apache.hadoop.hive.ql.exec.vector.expressions.NullUtil; * expressions between a column and a scalar. */ public class extends VectorExpression { + + private static final long serialVersionUID = 1L; + private int colNum; private value; private int outputColumn; @@ -39,6 +42,9 @@ public class extends VectorExpression { this.outputColumn = outputColumn; } + public () { + } + @Override public void evaluate(VectorizedRowBatch batch) { @@ -105,4 +111,24 @@ public class extends VectorExpression { public String getOutputType() { return ""; } + + public int getColNum() { + return colNum; + } + + public void setColNum(int colNum) { + this.colNum = colNum; + } + + public getValue() { + return value; + } + + public void setValue( value) { + this.value = value; + } + + public void setOutputColumn(int outputColumn) { + this.outputColumn = outputColumn; + } } diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/templates/ColumnCompareScalar.txt ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/templates/ColumnCompareScalar.txt index 6a687c2..e333224 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/templates/ColumnCompareScalar.txt +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/templates/ColumnCompareScalar.txt @@ -29,6 +29,9 @@ import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch; * separate boolean column. */ public class extends VectorExpression { + + private static final long serialVersionUID = 1L; + private int colNum; private value; private int outputColumn; @@ -39,6 +42,9 @@ public class extends VectorExpression { this.outputColumn = outputColumn; } + public () { + } + @Override public void evaluate(VectorizedRowBatch batch) { @@ -120,4 +126,24 @@ public class extends VectorExpression { public String getOutputType() { return ""; } + + public int getColNum() { + return colNum; + } + + public void setColNum(int colNum) { + this.colNum = colNum; + } + + public getValue() { + return value; + } + + public void setValue( value) { + this.value = value; + } + + public void setOutputColumn(int outputColumn) { + this.outputColumn = outputColumn; + } } diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/templates/ColumnUnaryMinus.txt ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/templates/ColumnUnaryMinus.txt index 4b4e647..085145a 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/templates/ColumnUnaryMinus.txt +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/templates/ColumnUnaryMinus.txt @@ -26,6 +26,9 @@ import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch; * Generated from template ColumnUnaryMinus.txt, which covers unary negation operator. */ public class extends VectorExpression { + + private static final long serialVersionUID = 1L; + private int colNum; private int outputColumn; @@ -34,6 +37,9 @@ public class extends VectorExpression { this.outputColumn = outputColumn; } + public () { + } + @Override public void evaluate(VectorizedRowBatch batch) { @@ -101,4 +107,16 @@ public class extends VectorExpression { public String getOutputType() { return ""; } + + public int getColNum() { + return colNum; + } + + public void setColNum(int colNum) { + this.colNum = colNum; + } + + public void setOutputColumn(int outputColumn) { + this.outputColumn = outputColumn; + } } diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/templates/FilterColumnCompareColumn.txt ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/templates/FilterColumnCompareColumn.txt index ab0d612..1c16816 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/templates/FilterColumnCompareColumn.txt +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/templates/FilterColumnCompareColumn.txt @@ -28,6 +28,9 @@ import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch; * The selected vector of the input {@link VectorizedRowBatch} is updated for in-place filtering. */ public class extends VectorExpression { + + private static final long serialVersionUID = 1L; + private int colNum1; private int colNum2; @@ -36,6 +39,9 @@ public class extends VectorExpression { this.colNum2 = colNum2; } + public () { + } + @Override public void evaluate(VectorizedRowBatch batch) { @@ -229,4 +235,20 @@ public class extends VectorExpression { public int getOutputColumn() { return -1; } + + 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; + } } diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/templates/FilterColumnCompareScalar.txt ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/templates/FilterColumnCompareScalar.txt index b8758c5..bf02419 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/templates/FilterColumnCompareScalar.txt +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/templates/FilterColumnCompareScalar.txt @@ -28,6 +28,9 @@ import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch; * The selected vector of the input {@link VectorizedRowBatch} is updated for in-place filtering. */ public class extends VectorExpression { + + private static final long serialVersionUID = 1L; + private int colNum; private value; @@ -36,6 +39,9 @@ public class extends VectorExpression { this.value = value; } + public () { + } + @Override public void evaluate(VectorizedRowBatch batch) { @@ -133,4 +139,20 @@ public class extends VectorExpression { public String getOutputType() { return "boolean"; } + + public int getColNum() { + return colNum; + } + + public void setColNum(int colNum) { + this.colNum = colNum; + } + + public getValue() { + return value; + } + + public void setValue( value) { + this.value = value; + } } diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/templates/FilterScalarCompareColumn.txt ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/templates/FilterScalarCompareColumn.txt index 69eb575..9a1d741 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/templates/FilterScalarCompareColumn.txt +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/templates/FilterScalarCompareColumn.txt @@ -28,6 +28,9 @@ import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch; * The selected vector of the input {@link VectorizedRowBatch} is updated for in-place filtering. */ public class extends VectorExpression { + + private static final long serialVersionUID = 1L; + private int colNum; private value; @@ -36,6 +39,9 @@ public class extends VectorExpression { this.value = value; } + public () { + } + @Override public void evaluate(VectorizedRowBatch batch) { @@ -133,4 +139,20 @@ public class extends VectorExpression { public String getOutputType() { return "boolean"; } + + public int getColNum() { + return colNum; + } + + public void setColNum(int colNum) { + this.colNum = colNum; + } + + public getValue() { + return value; + } + + public void setValue( value) { + this.value = value; + } } diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/templates/FilterStringColumnCompareColumn.txt ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/templates/FilterStringColumnCompareColumn.txt index 9309326..449c010 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/templates/FilterStringColumnCompareColumn.txt +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/templates/FilterStringColumnCompareColumn.txt @@ -28,6 +28,9 @@ import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch; * This code is generated from a template. */ public class extends VectorExpression { + + private static final long serialVersionUID = 1L; + private int colNum1; private int colNum2; @@ -36,6 +39,9 @@ public class extends VectorExpression { this.colNum2 = colNum2; } + public () { + } + @Override public void evaluate(VectorizedRowBatch batch) { @@ -452,4 +458,20 @@ public class extends VectorExpression { public int getOutputColumn() { return -1; } + + 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; + } } diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/templates/FilterStringColumnCompareScalar.txt ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/templates/FilterStringColumnCompareScalar.txt index 30eddcf..690dd3c 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/templates/FilterStringColumnCompareScalar.txt +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/templates/FilterStringColumnCompareScalar.txt @@ -27,6 +27,9 @@ import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch; * This is a generated class to evaluate a comparison on a vector of strings. */ public class extends VectorExpression { + + private static final long serialVersionUID = 1L; + private int colNum; private byte[] value; @@ -35,6 +38,9 @@ public class extends VectorExpression { this.value = value; } + public () { + } + @Override public void evaluate(VectorizedRowBatch batch) { if (childExpressions != null) { @@ -136,4 +142,20 @@ public class extends VectorExpression { public String getOutputType() { return "boolean"; } + + public int getColNum() { + return colNum; + } + + public void setColNum(int colNum) { + this.colNum = colNum; + } + + public byte[] getValue() { + return value; + } + + public void setValue(byte[] value) { + this.value = value; + } } diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/templates/FilterStringScalarCompareColumn.txt ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/templates/FilterStringScalarCompareColumn.txt index 9d2f434..5ba7703 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/templates/FilterStringScalarCompareColumn.txt +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/templates/FilterStringScalarCompareColumn.txt @@ -28,6 +28,9 @@ import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch; * Do not edit the generated code directly. */ public class extends VectorExpression { + + private static final long serialVersionUID = 1L; + private int colNum; private byte[] value; @@ -36,6 +39,9 @@ public class extends VectorExpression { this.value = value; } + public () { + } + @Override public void evaluate(VectorizedRowBatch batch) { if (childExpressions != null) { @@ -137,4 +143,20 @@ public class extends VectorExpression { public String getOutputType() { return "boolean"; } + + public int getColNum() { + return colNum; + } + + public void setColNum(int colNum) { + this.colNum = colNum; + } + + public byte[] getValue() { + return value; + } + + public void setValue(byte[] value) { + this.value = value; + } } diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/templates/ScalarArithmeticColumn.txt ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/templates/ScalarArithmeticColumn.txt index 14f56d0..d9efbe7 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/templates/ScalarArithmeticColumn.txt +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/templates/ScalarArithmeticColumn.txt @@ -36,6 +36,9 @@ import org.apache.hadoop.hive.ql.exec.vector.expressions.NullUtil; * column vector on the right. The result is output to an output column vector. */ public class extends VectorExpression { + + private static final long serialVersionUID = 1L; + private int colNum; private value; private int outputColumn; @@ -46,6 +49,9 @@ public class extends VectorExpression { this.outputColumn = outputColumn; } + public () { + } + @Override /** * Method to evaluate scalar-column operation in vectorized fashion. @@ -117,4 +123,25 @@ public class extends VectorExpression { public String getOutputType() { return ""; } + + public int getColNum() { + return colNum; + } + + public void setColNum(int colNum) { + this.colNum = colNum; + } + + public getValue() { + return value; + } + + public void setValue( value) { + this.value = value; + } + + public void setOutputColumn(int outputColumn) { + this.outputColumn = outputColumn; + } + } diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/templates/VectorUDAFAvg.txt ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/templates/VectorUDAFAvg.txt index 48022f4..cb94145 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/templates/VectorUDAFAvg.txt +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/templates/VectorUDAFAvg.txt @@ -44,12 +44,17 @@ import org.apache.hadoop.hive.serde2.objectinspector.primitive.PrimitiveObjectIn @Description(name = "avg", value = "_FUNC_(expr) - Returns the average value of expr (vectorized, type: )") public class 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( value) { if (isNull) { @@ -69,20 +74,23 @@ public class extends VectorAggregateExpression { } 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 (VectorExpression inputExpression) { - super(); + this(); this.inputExpression = inputExpression; + } + + public () { + super(); partialResult = new Object[2]; resultCount = new LongWritable(); resultSum = new DoubleWritable(); partialResult[0] = resultCount; partialResult[1] = resultSum; - initPartialResultInspector(); } @@ -454,5 +462,13 @@ public class extends VectorAggregateExpression { public void init(AggregationDesc desc) throws HiveException { // No-op } + + public VectorExpression getInputExpression() { + return inputExpression; + } + + public void setInputExpression(VectorExpression inputExpression) { + this.inputExpression = inputExpression; + } } diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/templates/VectorUDAFMinMax.txt ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/templates/VectorUDAFMinMax.txt index 9a0afa1..2b0364c 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/templates/VectorUDAFMinMax.txt +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/templates/VectorUDAFMinMax.txt @@ -38,13 +38,18 @@ import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspector; @Description(name = "", value = "") public class extends VectorAggregateExpression { + + private static final long serialVersionUID = 1L; /** * class for storing the current aggregate value. */ static private final class Aggregation implements AggregationBuffer { - private value; - private boolean isNull; + + private static final long serialVersionUID = 1L; + + transient private value; + transient private boolean isNull; public void checkValue( value) { if (isNull) { @@ -62,12 +67,16 @@ public class extends VectorAggregateExpression { } private VectorExpression inputExpression; - private VectorExpressionWriter resultWriter; + private transient VectorExpressionWriter resultWriter; public (VectorExpression inputExpression) { - super(); + this(); this.inputExpression = inputExpression; } + + public () { + super(); + } @Override public void init(AggregationDesc desc) throws HiveException { @@ -421,5 +430,12 @@ public class extends VectorAggregateExpression { model.memoryAlign()); } + public VectorExpression getInputExpression() { + return inputExpression; + } + + public void setInputExpression(VectorExpression inputExpression) { + this.inputExpression = inputExpression; + } } diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/templates/VectorUDAFMinMaxString.txt ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/templates/VectorUDAFMinMaxString.txt index 7978fdf..36f483e 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/templates/VectorUDAFMinMaxString.txt +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/templates/VectorUDAFMinMaxString.txt @@ -41,15 +41,19 @@ import org.apache.hadoop.io.Text; value = "") public class 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 extends VectorAggregateExpression { JavaDataModel model = JavaDataModel.get(); return model.lengthForByteArrayOfSize(bytes.length); } - } private VectorExpression inputExpression; - private Text result; + transient private Text result; public (VectorExpression inputExpression) { - super(); + this(); this.inputExpression = inputExpression; + } + + public () { + super(); result = new Text(); } @@ -381,5 +388,13 @@ public class extends VectorAggregateExpression { public void init(AggregationDesc desc) throws HiveException { // No-op } + + public VectorExpression getInputExpression() { + return inputExpression; + } + + public void setInputExpression(VectorExpression inputExpression) { + this.inputExpression = inputExpression; + } } diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/templates/VectorUDAFSum.txt ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/templates/VectorUDAFSum.txt index b4d55bd..3573997 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/templates/VectorUDAFSum.txt +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/templates/VectorUDAFSum.txt @@ -39,13 +39,18 @@ import org.apache.hadoop.hive.serde2.objectinspector.primitive.PrimitiveObjectIn @Description(name = "sum", value = "_FUNC_(expr) - Returns the sum value of expr (vectorized, type: )") public class extends VectorAggregateExpression { + + private static final long serialVersionUID = 1L; /** * class for storing the current aggregate value. */ private static final class Aggregation implements AggregationBuffer { - private sum; - private boolean isNull; + + private static final long serialVersionUID = 1L; + + transient private sum; + transient private boolean isNull; public void sumValue( value) { if (isNull) { @@ -62,12 +67,16 @@ public class extends VectorAggregateExpression { } } - private final VectorExpression inputExpression; - private final result; + private VectorExpression inputExpression; + transient private final result; public (VectorExpression inputExpression) { - super(); + this(); this.inputExpression = inputExpression; + } + + public () { + super(); result = new (); } @@ -416,6 +425,12 @@ public class extends VectorAggregateExpression { // No-op } + public VectorExpression getInputExpression() { + return inputExpression; + } + public void setInputExpression(VectorExpression inputExpression) { + this.inputExpression = inputExpression; + } } diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/templates/VectorUDAFVar.txt ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/templates/VectorUDAFVar.txt index 1b5b8ee..7c0e58f 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/templates/VectorUDAFVar.txt +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/templates/VectorUDAFVar.txt @@ -43,15 +43,20 @@ import org.apache.hadoop.hive.serde2.objectinspector.primitive.PrimitiveObjectIn @Description(name = "", value = "") public class 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 extends VectorAggregateExpression { } 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 (VectorExpression inputExpression) { - super(); + this(); this.inputExpression = inputExpression; + } + + public () { + super(); partialResult = new Object[3]; resultCount = new LongWritable(); resultSum = new DoubleWritable(); @@ -500,6 +509,12 @@ public class extends VectorAggregateExpression { // No-op } + public VectorExpression getInputExpression() { + return inputExpression; + } + public void setInputExpression(VectorExpression inputExpression) { + this.inputExpression = inputExpression; + } }