You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by mm...@apache.org on 2017/10/29 20:40:28 UTC
[49/51] [partial] hive git commit: HIVE-17433: Vectorization: Support
Decimal64 in Hive Query Engine (Matt McCline, reviewed by Teddy Choi)
http://git-wip-us.apache.org/repos/asf/hive/blob/e63ebccc/ql/src/gen/vectorization/ExpressionTemplates/FilterTimestampColumnCompareTimestampColumn.txt
----------------------------------------------------------------------
diff --git a/ql/src/gen/vectorization/ExpressionTemplates/FilterTimestampColumnCompareTimestampColumn.txt b/ql/src/gen/vectorization/ExpressionTemplates/FilterTimestampColumnCompareTimestampColumn.txt
index eeb73c9..4211efb 100644
--- a/ql/src/gen/vectorization/ExpressionTemplates/FilterTimestampColumnCompareTimestampColumn.txt
+++ b/ql/src/gen/vectorization/ExpressionTemplates/FilterTimestampColumnCompareTimestampColumn.txt
@@ -37,15 +37,21 @@ public class <ClassName> extends VectorExpression {
private static final long serialVersionUID = 1L;
- private int colNum1;
- private int colNum2;
+ private final int colNum1;
+ private final int colNum2;
public <ClassName>(int colNum1, int colNum2) {
+ super();
this.colNum1 = colNum1;
this.colNum2 = colNum2;
}
public <ClassName>() {
+ super();
+
+ // Dummy final assignments.
+ colNum1 = -1;
+ colNum2 = -1;
}
@Override
@@ -426,18 +432,8 @@ public class <ClassName> extends VectorExpression {
}
@Override
- public String getOutputType() {
- return "boolean";
- }
-
- @Override
- public int getOutputColumn() {
- return -1;
- }
-
- @Override
public String vectorExpressionParameters() {
- return "col " + colNum1 + ", col " + + colNum2;
+ return getColumnParamString(0, colNum1) + ", " + getColumnParamString(1, colNum2);
}
@Override
http://git-wip-us.apache.org/repos/asf/hive/blob/e63ebccc/ql/src/gen/vectorization/ExpressionTemplates/FilterTimestampColumnCompareTimestampScalar.txt
----------------------------------------------------------------------
diff --git a/ql/src/gen/vectorization/ExpressionTemplates/FilterTimestampColumnCompareTimestampScalar.txt b/ql/src/gen/vectorization/ExpressionTemplates/FilterTimestampColumnCompareTimestampScalar.txt
index 23790a5..1d5df5f 100644
--- a/ql/src/gen/vectorization/ExpressionTemplates/FilterTimestampColumnCompareTimestampScalar.txt
+++ b/ql/src/gen/vectorization/ExpressionTemplates/FilterTimestampColumnCompareTimestampScalar.txt
@@ -36,15 +36,21 @@ public class <ClassName> extends VectorExpression {
private static final long serialVersionUID = 1L;
- private int colNum;
- private <HiveOperandType> value;
+ private final int colNum;
+ private final <HiveOperandType> value;
public <ClassName>(int colNum, <HiveOperandType> value) {
+ super();
this.colNum = colNum;
this.value = value;
}
public <ClassName>() {
+ super();
+
+ // Dummy final assignments.
+ colNum = -1;
+ value = null;
}
@Override
@@ -137,18 +143,8 @@ public class <ClassName> extends VectorExpression {
}
@Override
- public int getOutputColumn() {
- return -1;
- }
-
- @Override
- public String getOutputType() {
- return "boolean";
- }
-
- @Override
public String vectorExpressionParameters() {
- return "col " + colNum + ", val " + value.toString();
+ return getColumnParamString(0, colNum) + ", val " + value.toString();
}
@Override
http://git-wip-us.apache.org/repos/asf/hive/blob/e63ebccc/ql/src/gen/vectorization/ExpressionTemplates/FilterTimestampScalarCompareLongDoubleColumn.txt
----------------------------------------------------------------------
diff --git a/ql/src/gen/vectorization/ExpressionTemplates/FilterTimestampScalarCompareLongDoubleColumn.txt b/ql/src/gen/vectorization/ExpressionTemplates/FilterTimestampScalarCompareLongDoubleColumn.txt
index 0e10779..c674c31 100644
--- a/ql/src/gen/vectorization/ExpressionTemplates/FilterTimestampScalarCompareLongDoubleColumn.txt
+++ b/ql/src/gen/vectorization/ExpressionTemplates/FilterTimestampScalarCompareLongDoubleColumn.txt
@@ -44,7 +44,7 @@ public class <ClassName> extends <BaseClassName> {
@Override
public String vectorExpressionParameters() {
- return "val " + value + ", col " + + colNum;
+ return "val " + value + ", " + getColumnParamString(1, colNum);
}
@Override
http://git-wip-us.apache.org/repos/asf/hive/blob/e63ebccc/ql/src/gen/vectorization/ExpressionTemplates/FilterTimestampScalarCompareTimestampColumn.txt
----------------------------------------------------------------------
diff --git a/ql/src/gen/vectorization/ExpressionTemplates/FilterTimestampScalarCompareTimestampColumn.txt b/ql/src/gen/vectorization/ExpressionTemplates/FilterTimestampScalarCompareTimestampColumn.txt
index 5a6def3..a430e5e 100644
--- a/ql/src/gen/vectorization/ExpressionTemplates/FilterTimestampScalarCompareTimestampColumn.txt
+++ b/ql/src/gen/vectorization/ExpressionTemplates/FilterTimestampScalarCompareTimestampColumn.txt
@@ -37,15 +37,21 @@ public class <ClassName> extends VectorExpression {
private static final long serialVersionUID = 1L;
- private int colNum;
- private <HiveOperandType> value;
+ private final <HiveOperandType> value;
+ private final int colNum;
public <ClassName>(<HiveOperandType> value, int colNum) {
- this.colNum = colNum;
+ super();
this.value = value;
+ this.colNum = colNum;
}
public <ClassName>() {
+ super();
+
+ // Dummy final assignments.
+ value = null;
+ colNum = -1;
}
@Override
@@ -139,18 +145,8 @@ public class <ClassName> extends VectorExpression {
}
@Override
- public int getOutputColumn() {
- return -1;
- }
-
- @Override
- public String getOutputType() {
- return "boolean";
- }
-
- @Override
public String vectorExpressionParameters() {
- return "val " + value.toString() + ", col " + + colNum;
+ return "val " + value.toString() + ", " + getColumnParamString(1, colNum);
}
@Override
http://git-wip-us.apache.org/repos/asf/hive/blob/e63ebccc/ql/src/gen/vectorization/ExpressionTemplates/FilterTruncStringColumnBetween.txt
----------------------------------------------------------------------
diff --git a/ql/src/gen/vectorization/ExpressionTemplates/FilterTruncStringColumnBetween.txt b/ql/src/gen/vectorization/ExpressionTemplates/FilterTruncStringColumnBetween.txt
index a8f5114..68b830b 100644
--- a/ql/src/gen/vectorization/ExpressionTemplates/FilterTruncStringColumnBetween.txt
+++ b/ql/src/gen/vectorization/ExpressionTemplates/FilterTruncStringColumnBetween.txt
@@ -36,17 +36,24 @@ public class <ClassName> extends VectorExpression {
private static final long serialVersionUID = 1L;
- private int colNum;
+ private final int colNum;
+
+ // NOTE: These can be set later by FilterColumnBetweenDynamicValue.txt so they are not final.
private byte[] left;
private byte[] right;
public <ClassName>(int colNum, <TruncStringHiveType> left, <TruncStringHiveType> right) {
+ super();
this.colNum = colNum;
this.left = left.<TruncStringHiveGetBytes>;
this.right = right.<TruncStringHiveGetBytes>;
}
public <ClassName>() {
+ super();
+
+ // Dummy final assignments.
+ colNum = -1;
}
@Override
@@ -147,24 +154,6 @@ public class <ClassName> extends VectorExpression {
}
}
- @Override
- public int getOutputColumn() {
- return -1;
- }
-
- @Override
- public String getOutputType() {
- return "boolean";
- }
-
- public int getColNum() {
- return colNum;
- }
-
- public void setColNum(int colNum) {
- this.colNum = colNum;
- }
-
public byte[] getLeftValue() {
return left;
}
@@ -183,7 +172,7 @@ public class <ClassName> extends VectorExpression {
@Override
public String vectorExpressionParameters() {
- return "col " + colNum + ", left " + displayUtf8Bytes(left) +
+ return getColumnParamString(0, colNum) + ", left " + displayUtf8Bytes(left) +
", right " + displayUtf8Bytes(right);
}
http://git-wip-us.apache.org/repos/asf/hive/blob/e63ebccc/ql/src/gen/vectorization/ExpressionTemplates/FilterTruncStringScalarCompareStringGroupColumn.txt
----------------------------------------------------------------------
diff --git a/ql/src/gen/vectorization/ExpressionTemplates/FilterTruncStringScalarCompareStringGroupColumn.txt b/ql/src/gen/vectorization/ExpressionTemplates/FilterTruncStringScalarCompareStringGroupColumn.txt
index c4745d3..da6fb68 100644
--- a/ql/src/gen/vectorization/ExpressionTemplates/FilterTruncStringScalarCompareStringGroupColumn.txt
+++ b/ql/src/gen/vectorization/ExpressionTemplates/FilterTruncStringScalarCompareStringGroupColumn.txt
@@ -30,16 +30,16 @@ import org.apache.hadoop.hive.ql.exec.vector.VectorExpressionDescriptor;
/**
* This is a generated class to evaluate a <OperatorSymbol> comparison on a vector of strings.
- * Do not edit the generated code directly.
+ * Do not edit the generated code directly.
*/
public class <ClassName> extends <BaseClassName> {
public <ClassName>(<TruncStringHiveType> value, int colNum) {
- this.colNum = colNum;
- this.value = value.<TruncStringHiveGetBytes>;
+ super(value.<TruncStringHiveGetBytes>, colNum);
}
public <ClassName>() {
+ super();
}
@Override
http://git-wip-us.apache.org/repos/asf/hive/blob/e63ebccc/ql/src/gen/vectorization/ExpressionTemplates/IfExprColumnScalar.txt
----------------------------------------------------------------------
diff --git a/ql/src/gen/vectorization/ExpressionTemplates/IfExprColumnScalar.txt b/ql/src/gen/vectorization/ExpressionTemplates/IfExprColumnScalar.txt
index 94372d6..941d755 100644
--- a/ql/src/gen/vectorization/ExpressionTemplates/IfExprColumnScalar.txt
+++ b/ql/src/gen/vectorization/ExpressionTemplates/IfExprColumnScalar.txt
@@ -35,19 +35,25 @@ public class <ClassName> extends VectorExpression {
private static final long serialVersionUID = 1L;
- private int arg1Column, arg2Column;
- private <OperandType3> arg3Scalar;
- private int outputColumn;
+ private final int arg1Column;
+ private final int arg2Column;
+ private final <OperandType3> arg3Scalar;
public <ClassName>(int arg1Column, int arg2Column, <OperandType3> arg3Scalar,
- int outputColumn) {
+ int outputColumnNum) {
+ super(outputColumnNum);
this.arg1Column = arg1Column;
this.arg2Column = arg2Column;
this.arg3Scalar = arg3Scalar;
- this.outputColumn = outputColumn;
}
public <ClassName>() {
+ super();
+
+ // Dummy final assignments.
+ arg1Column = -1;
+ arg2Column = -1;
+ arg3Scalar = 0;
}
@Override
@@ -59,7 +65,7 @@ public class <ClassName> extends VectorExpression {
LongColumnVector arg1ColVector = (LongColumnVector) batch.cols[arg1Column];
<Arg2ColumnVectorType> arg2ColVector = (<Arg2ColumnVectorType>) batch.cols[arg2Column];
- <OutputColumnVectorType> outputColVector = (<OutputColumnVectorType>) batch.cols[outputColumn];
+ <OutputColumnVectorType> outputColVector = (<OutputColumnVectorType>) batch.cols[outputColumnNum];
int[] sel = batch.selected;
boolean[] outputIsNull = outputColVector.isNull;
outputColVector.noNulls = arg2ColVector.noNulls; // nulls can only come from arg2
@@ -126,46 +132,9 @@ public class <ClassName> extends VectorExpression {
}
@Override
- public int getOutputColumn() {
- return outputColumn;
- }
-
- @Override
- public String getOutputType() {
- return "<ReturnType>";
- }
-
- public int getArg1Column() {
- return arg1Column;
- }
-
- public void setArg1Column(int colNum) {
- this.arg1Column = colNum;
- }
-
- public int getArg2Column() {
- return arg2Column;
- }
-
- public void setArg2Column(int colNum) {
- this.arg2Column = colNum;
- }
-
- public <OperandType3> getArg3Scalar() {
- return arg3Scalar;
- }
-
- public void setArg3Scalar(<OperandType3> value) {
- this.arg3Scalar = value;
- }
-
- public void setOutputColumn(int outputColumn) {
- this.outputColumn = outputColumn;
- }
-
- @Override
public String vectorExpressionParameters() {
- return "col " + arg1Column + ", col " + arg2Column + ", val "+ arg3Scalar;
+ return getColumnParamString(0, arg1Column) + ", " + getColumnParamString(1, arg2Column) +
+ ", val "+ arg3Scalar;
}
@Override
http://git-wip-us.apache.org/repos/asf/hive/blob/e63ebccc/ql/src/gen/vectorization/ExpressionTemplates/IfExprScalarColumn.txt
----------------------------------------------------------------------
diff --git a/ql/src/gen/vectorization/ExpressionTemplates/IfExprScalarColumn.txt b/ql/src/gen/vectorization/ExpressionTemplates/IfExprScalarColumn.txt
index 487d894..c095a9a 100644
--- a/ql/src/gen/vectorization/ExpressionTemplates/IfExprScalarColumn.txt
+++ b/ql/src/gen/vectorization/ExpressionTemplates/IfExprScalarColumn.txt
@@ -35,19 +35,25 @@ public class <ClassName> extends VectorExpression {
private static final long serialVersionUID = 1L;
- private int arg1Column, arg3Column;
- private <OperandType2> arg2Scalar;
- private int outputColumn;
+ private final int arg1Column;
+ private final <OperandType2> arg2Scalar;
+ private final int arg3Column;
public <ClassName>(int arg1Column, <OperandType2> arg2Scalar, int arg3Column,
- int outputColumn) {
+ int outputColumnNum) {
+ super(outputColumnNum);
this.arg1Column = arg1Column;
this.arg2Scalar = arg2Scalar;
this.arg3Column = arg3Column;
- this.outputColumn = outputColumn;
}
public <ClassName>() {
+ super();
+
+ // Dummy final assignments.
+ arg1Column = -1;
+ arg2Scalar = 0;
+ arg3Column = -1;
}
@Override
@@ -59,7 +65,7 @@ public class <ClassName> extends VectorExpression {
LongColumnVector arg1ColVector = (LongColumnVector) batch.cols[arg1Column];
<Arg3ColumnVectorType> arg3ColVector = (<Arg3ColumnVectorType>) batch.cols[arg3Column];
- <OutputColumnVectorType> outputColVector = (<OutputColumnVectorType>) batch.cols[outputColumn];
+ <OutputColumnVectorType> outputColVector = (<OutputColumnVectorType>) batch.cols[outputColumnNum];
int[] sel = batch.selected;
boolean[] outputIsNull = outputColVector.isNull;
outputColVector.noNulls = arg3ColVector.noNulls; // nulls can only come from arg3 column vector
@@ -124,46 +130,9 @@ public class <ClassName> extends VectorExpression {
}
@Override
- public int getOutputColumn() {
- return outputColumn;
- }
-
- @Override
- public String getOutputType() {
- return "<ReturnType>";
- }
-
- public int getArg1Column() {
- return arg1Column;
- }
-
- public void setArg1Column(int colNum) {
- this.arg1Column = colNum;
- }
-
- public int getArg3Column() {
- return arg3Column;
- }
-
- public void setArg3Column(int colNum) {
- this.arg3Column = colNum;
- }
-
- public <OperandType2> getArg2Scalar() {
- return arg2Scalar;
- }
-
- public void setArg2Scalar(<OperandType2> value) {
- this.arg2Scalar = value;
- }
-
- public void setOutputColumn(int outputColumn) {
- this.outputColumn = outputColumn;
- }
-
- @Override
public String vectorExpressionParameters() {
- return "col " + arg1Column + ", val "+ arg2Scalar + ", col "+ arg3Column;
+ return getColumnParamString(0, arg1Column) + ", val "+ arg2Scalar + ", " +
+ getColumnParamString(2, arg3Column);
}
@Override
http://git-wip-us.apache.org/repos/asf/hive/blob/e63ebccc/ql/src/gen/vectorization/ExpressionTemplates/IfExprScalarScalar.txt
----------------------------------------------------------------------
diff --git a/ql/src/gen/vectorization/ExpressionTemplates/IfExprScalarScalar.txt b/ql/src/gen/vectorization/ExpressionTemplates/IfExprScalarScalar.txt
index 5651d15..a0d975c 100644
--- a/ql/src/gen/vectorization/ExpressionTemplates/IfExprScalarScalar.txt
+++ b/ql/src/gen/vectorization/ExpressionTemplates/IfExprScalarScalar.txt
@@ -35,20 +35,25 @@ public class <ClassName> extends VectorExpression {
private static final long serialVersionUID = 1L;
- private int arg1Column;
- private <OperandType2> arg2Scalar;
- private <OperandType3> arg3Scalar;
- private int outputColumn;
+ private final int arg1Column;
+ private final <OperandType2> arg2Scalar;
+ private final <OperandType3> arg3Scalar;
public <ClassName>(int arg1Column, <OperandType2> arg2Scalar, <OperandType3> arg3Scalar,
- int outputColumn) {
+ int outputColumnNum) {
+ super(outputColumnNum);
this.arg1Column = arg1Column;
this.arg2Scalar = arg2Scalar;
this.arg3Scalar = arg3Scalar;
- this.outputColumn = outputColumn;
}
public <ClassName>() {
+ super();
+
+ // Dummy final assignments.
+ arg1Column = -1;
+ arg2Scalar = 0;
+ arg3Scalar = 0;
}
@Override
@@ -59,7 +64,7 @@ public class <ClassName> extends VectorExpression {
}
LongColumnVector arg1ColVector = (LongColumnVector) batch.cols[arg1Column];
- <OutputColumnVectorType> outputColVector = (<OutputColumnVectorType>) batch.cols[outputColumn];
+ <OutputColumnVectorType> outputColVector = (<OutputColumnVectorType>) batch.cols[outputColumnNum];
int[] sel = batch.selected;
boolean[] outputIsNull = outputColVector.isNull;
outputColVector.noNulls = false; // output is a scalar which we know is non null
@@ -109,46 +114,8 @@ public class <ClassName> extends VectorExpression {
}
@Override
- public int getOutputColumn() {
- return outputColumn;
- }
-
- @Override
- public String getOutputType() {
- return "<ReturnType>";
- }
-
- public int getArg1Column() {
- return arg1Column;
- }
-
- public void setArg1Column(int colNum) {
- this.arg1Column = colNum;
- }
-
- public <OperandType2> getArg2Scalar() {
- return arg2Scalar;
- }
-
- public void setArg2Scalar(<OperandType2> value) {
- this.arg2Scalar = value;
- }
-
- public <OperandType3> getArg3Scalar() {
- return arg3Scalar;
- }
-
- public void setArg3Scalar(<OperandType3> value) {
- this.arg3Scalar = value;
- }
-
- public void setOutputColumn(int outputColumn) {
- this.outputColumn = outputColumn;
- }
-
- @Override
public String vectorExpressionParameters() {
- return "col " + arg1Column + ", val "+ arg2Scalar + ", val "+ arg3Scalar;
+ return getColumnParamString(0, arg1Column) + ", val "+ arg2Scalar + ", val "+ arg3Scalar;
}
@Override
http://git-wip-us.apache.org/repos/asf/hive/blob/e63ebccc/ql/src/gen/vectorization/ExpressionTemplates/IntervalYearMonthColumnArithmeticDateColumn.txt
----------------------------------------------------------------------
diff --git a/ql/src/gen/vectorization/ExpressionTemplates/IntervalYearMonthColumnArithmeticDateColumn.txt b/ql/src/gen/vectorization/ExpressionTemplates/IntervalYearMonthColumnArithmeticDateColumn.txt
index 49a1950..f92deb2 100644
--- a/ql/src/gen/vectorization/ExpressionTemplates/IntervalYearMonthColumnArithmeticDateColumn.txt
+++ b/ql/src/gen/vectorization/ExpressionTemplates/IntervalYearMonthColumnArithmeticDateColumn.txt
@@ -36,24 +36,26 @@ public class <ClassName> extends VectorExpression {
private static final long serialVersionUID = 1L;
- private int colNum1;
- private int colNum2;
- private int outputColumn;
- private HiveIntervalYearMonth scratchIntervalYearMonth1;
- private Date scratchDate2;
- private Date outputDate;
- private DateTimeMath dtm = new DateTimeMath();
-
- public <ClassName>(int colNum1, int colNum2, int outputColumn) {
+ private final int colNum1;
+ private final int colNum2;
+
+ private transient final HiveIntervalYearMonth scratchIntervalYearMonth1 = new HiveIntervalYearMonth();
+ private transient final Date scratchDate2 = new Date(0);
+ private transient final Date outputDate = new Date(0);
+ private transient final DateTimeMath dtm = new DateTimeMath();
+
+ public <ClassName>(int colNum1, int colNum2, int outputColumnNum) {
+ super(outputColumnNum);
this.colNum1 = colNum1;
this.colNum2 = colNum2;
- this.outputColumn = outputColumn;
- scratchIntervalYearMonth1 = new HiveIntervalYearMonth();
- scratchDate2 = new Date(0);
- outputDate = new Date(0);
}
public <ClassName>() {
+ super();
+
+ // Dummy final assignments.
+ colNum1 = -1;
+ colNum2 = -1;
}
@Override
@@ -70,7 +72,7 @@ public class <ClassName> extends VectorExpression {
LongColumnVector inputColVector2 = (LongColumnVector) batch.cols[colNum2];
// Output is type date.
- LongColumnVector outputColVector = (LongColumnVector) batch.cols[outputColumn];
+ LongColumnVector outputColVector = (LongColumnVector) batch.cols[outputColumnNum];
int[] sel = batch.selected;
int n = batch.size;
@@ -170,18 +172,8 @@ public class <ClassName> extends VectorExpression {
}
@Override
- public int getOutputColumn() {
- return outputColumn;
- }
-
- @Override
- public String getOutputType() {
- return "long";
- }
-
- @Override
public String vectorExpressionParameters() {
- return "col " + colNum1 + ", col " + + colNum2;
+ return getColumnParamString(0, colNum1) + ", " + getColumnParamString(1, colNum2);
}
@Override
http://git-wip-us.apache.org/repos/asf/hive/blob/e63ebccc/ql/src/gen/vectorization/ExpressionTemplates/IntervalYearMonthColumnArithmeticDateScalar.txt
----------------------------------------------------------------------
diff --git a/ql/src/gen/vectorization/ExpressionTemplates/IntervalYearMonthColumnArithmeticDateScalar.txt b/ql/src/gen/vectorization/ExpressionTemplates/IntervalYearMonthColumnArithmeticDateScalar.txt
index 283352d..e618e5f 100644
--- a/ql/src/gen/vectorization/ExpressionTemplates/IntervalYearMonthColumnArithmeticDateScalar.txt
+++ b/ql/src/gen/vectorization/ExpressionTemplates/IntervalYearMonthColumnArithmeticDateScalar.txt
@@ -37,22 +37,25 @@ public class <ClassName> extends VectorExpression {
private static final long serialVersionUID = 1L;
- private int colNum;
- private Date value;
- private int outputColumn;
- private HiveIntervalYearMonth scratchIntervalYearMonth1;
- private Date outputDate;
- private DateTimeMath dtm = new DateTimeMath();
-
- public <ClassName>(int colNum, long value, int outputColumn) {
+ private final int colNum;
+ private final Date value;
+
+ private transient final HiveIntervalYearMonth scratchIntervalYearMonth1 = new HiveIntervalYearMonth();
+ private transient final Date outputDate = new Date(0);
+ private transient final DateTimeMath dtm = new DateTimeMath();
+
+ public <ClassName>(int colNum, long value, int outputColumnNum) {
+ super(outputColumnNum);
this.colNum = colNum;
this.value = new Date(DateWritable.daysToMillis((int) value));
- this.outputColumn = outputColumn;
- scratchIntervalYearMonth1 = new HiveIntervalYearMonth();
- outputDate = new Date(0);
}
public <ClassName>() {
+ super();
+
+ // Dummy final assignments.
+ colNum = -1;
+ value = null;
}
@Override
@@ -66,7 +69,7 @@ public class <ClassName> extends VectorExpression {
LongColumnVector inputColVector1 = (LongColumnVector) batch.cols[colNum];
// Output is type date.
- LongColumnVector outputColVector = (LongColumnVector) batch.cols[outputColumn];
+ LongColumnVector outputColVector = (LongColumnVector) batch.cols[outputColumnNum];
int[] sel = batch.selected;
boolean[] inputIsNull = inputColVector1.isNull;
@@ -131,18 +134,8 @@ public class <ClassName> extends VectorExpression {
}
@Override
- public int getOutputColumn() {
- return outputColumn;
- }
-
- @Override
- public String getOutputType() {
- return "long";
- }
-
- @Override
public String vectorExpressionParameters() {
- return "col " + colNum + ", val " + value.toString();
+ return getColumnParamString(0, colNum) + ", val " + value.toString();
}
@Override
http://git-wip-us.apache.org/repos/asf/hive/blob/e63ebccc/ql/src/gen/vectorization/ExpressionTemplates/IntervalYearMonthColumnArithmeticTimestampColumn.txt
----------------------------------------------------------------------
diff --git a/ql/src/gen/vectorization/ExpressionTemplates/IntervalYearMonthColumnArithmeticTimestampColumn.txt b/ql/src/gen/vectorization/ExpressionTemplates/IntervalYearMonthColumnArithmeticTimestampColumn.txt
index 9eba829..61db8c4 100644
--- a/ql/src/gen/vectorization/ExpressionTemplates/IntervalYearMonthColumnArithmeticTimestampColumn.txt
+++ b/ql/src/gen/vectorization/ExpressionTemplates/IntervalYearMonthColumnArithmeticTimestampColumn.txt
@@ -36,20 +36,24 @@ public class <ClassName> extends VectorExpression {
private static final long serialVersionUID = 1L;
- private int colNum1;
- private int colNum2;
- private int outputColumn;
- private HiveIntervalYearMonth scratchIntervalYearMonth1;
- private DateTimeMath dtm = new DateTimeMath();
+ private final int colNum1;
+ private final int colNum2;
- public <ClassName>(int colNum1, int colNum2, int outputColumn) {
+ private transient final HiveIntervalYearMonth scratchIntervalYearMonth1 = new HiveIntervalYearMonth();
+ private transient final DateTimeMath dtm = new DateTimeMath();
+
+ public <ClassName>(int colNum1, int colNum2, int outputColumnNum) {
+ super(outputColumnNum);
this.colNum1 = colNum1;
this.colNum2 = colNum2;
- this.outputColumn = outputColumn;
- scratchIntervalYearMonth1 = new HiveIntervalYearMonth();
}
public <ClassName>() {
+ super();
+
+ // Dummy final assignments.
+ colNum1 = -1;
+ colNum2 = -1;
}
@Override
@@ -66,7 +70,7 @@ public class <ClassName> extends VectorExpression {
TimestampColumnVector inputColVector2 = (TimestampColumnVector) batch.cols[colNum2];
// Output is type Timestamp.
- TimestampColumnVector outputColVector = (TimestampColumnVector) batch.cols[outputColumn];
+ TimestampColumnVector outputColVector = (TimestampColumnVector) batch.cols[outputColumnNum];
int[] sel = batch.selected;
int n = batch.size;
@@ -160,18 +164,8 @@ public class <ClassName> extends VectorExpression {
}
@Override
- public int getOutputColumn() {
- return outputColumn;
- }
-
- @Override
- public String getOutputType() {
- return "timestamp";
- }
-
- @Override
public String vectorExpressionParameters() {
- return "col " + colNum1 + ", col " + + colNum2;
+ return getColumnParamString(0, colNum1) + ", " + getColumnParamString(1, colNum2);
}
@Override
http://git-wip-us.apache.org/repos/asf/hive/blob/e63ebccc/ql/src/gen/vectorization/ExpressionTemplates/IntervalYearMonthColumnArithmeticTimestampScalar.txt
----------------------------------------------------------------------
diff --git a/ql/src/gen/vectorization/ExpressionTemplates/IntervalYearMonthColumnArithmeticTimestampScalar.txt b/ql/src/gen/vectorization/ExpressionTemplates/IntervalYearMonthColumnArithmeticTimestampScalar.txt
index 9a06822..faa3013 100644
--- a/ql/src/gen/vectorization/ExpressionTemplates/IntervalYearMonthColumnArithmeticTimestampScalar.txt
+++ b/ql/src/gen/vectorization/ExpressionTemplates/IntervalYearMonthColumnArithmeticTimestampScalar.txt
@@ -37,20 +37,24 @@ public class <ClassName> extends VectorExpression {
private static final long serialVersionUID = 1L;
- private int colNum;
- private Timestamp value;
- private int outputColumn;
- private HiveIntervalYearMonth scratchIntervalYearMonth1;
- private DateTimeMath dtm = new DateTimeMath();
+ private final int colNum;
+ private final Timestamp value;
- public <ClassName>(int colNum, Timestamp value, int outputColumn) {
+ private transient final HiveIntervalYearMonth scratchIntervalYearMonth1 = new HiveIntervalYearMonth();
+ private transient final DateTimeMath dtm = new DateTimeMath();
+
+ public <ClassName>(int colNum, Timestamp value, int outputColumnNum) {
+ super(outputColumnNum);
this.colNum = colNum;
this.value = value;
- this.outputColumn = outputColumn;
- scratchIntervalYearMonth1 = new HiveIntervalYearMonth();
}
public <ClassName>() {
+ super();
+
+ // Dummy final assignments.
+ colNum = -1;
+ value = null;
}
@Override
@@ -64,7 +68,7 @@ public class <ClassName> extends VectorExpression {
LongColumnVector inputColVector1 = (LongColumnVector) batch.cols[colNum];
// Output is type Timestamp.
- TimestampColumnVector outputColVector = (TimestampColumnVector) batch.cols[outputColumn];
+ TimestampColumnVector outputColVector = (TimestampColumnVector) batch.cols[outputColumnNum];
int[] sel = batch.selected;
boolean[] inputIsNull = inputColVector1.isNull;
@@ -129,18 +133,8 @@ public class <ClassName> extends VectorExpression {
}
@Override
- public int getOutputColumn() {
- return outputColumn;
- }
-
- @Override
- public String getOutputType() {
- return "timestamp";
- }
-
- @Override
public String vectorExpressionParameters() {
- return "col " + colNum + ", val " + value.toString();
+ return getColumnParamString(0, colNum) + ", val " + value.toString();
}
@Override
http://git-wip-us.apache.org/repos/asf/hive/blob/e63ebccc/ql/src/gen/vectorization/ExpressionTemplates/IntervalYearMonthScalarArithmeticDateColumn.txt
----------------------------------------------------------------------
diff --git a/ql/src/gen/vectorization/ExpressionTemplates/IntervalYearMonthScalarArithmeticDateColumn.txt b/ql/src/gen/vectorization/ExpressionTemplates/IntervalYearMonthScalarArithmeticDateColumn.txt
index a5d9877..7ef145e 100644
--- a/ql/src/gen/vectorization/ExpressionTemplates/IntervalYearMonthScalarArithmeticDateColumn.txt
+++ b/ql/src/gen/vectorization/ExpressionTemplates/IntervalYearMonthScalarArithmeticDateColumn.txt
@@ -46,22 +46,25 @@ public class <ClassName> extends VectorExpression {
private static final long serialVersionUID = 1L;
- private int colNum;
- private HiveIntervalYearMonth value;
- private int outputColumn;
- private Date scratchDate2;
- private Date outputDate;
- private DateTimeMath dtm = new DateTimeMath();
-
- public <ClassName>(long value, int colNum, int outputColumn) {
- this.colNum = colNum;
+ private final HiveIntervalYearMonth value;
+ private final int colNum;
+
+ private transient final Date scratchDate2 = new Date(0);
+ private transient final Date outputDate = new Date(0);
+ private transient final DateTimeMath dtm = new DateTimeMath();
+
+ public <ClassName>(long value, int colNum, int outputColumnNum) {
+ super(outputColumnNum);
this.value = new HiveIntervalYearMonth((int) value);
- this.outputColumn = outputColumn;
- scratchDate2 = new Date(0);
- outputDate = new Date(0);
+ this.colNum = colNum;
}
public <ClassName>() {
+ super();
+
+ // Dummy final assignments.
+ value = null;
+ colNum = -1;
}
@Override
@@ -80,7 +83,7 @@ public class <ClassName> extends VectorExpression {
LongColumnVector inputColVector2 = (LongColumnVector) batch.cols[colNum];
// Output is type Date.
- LongColumnVector outputColVector = (LongColumnVector) batch.cols[outputColumn];
+ LongColumnVector outputColVector = (LongColumnVector) batch.cols[outputColumnNum];
int[] sel = batch.selected;
boolean[] inputIsNull = inputColVector2.isNull;
@@ -145,18 +148,8 @@ public class <ClassName> extends VectorExpression {
}
@Override
- public int getOutputColumn() {
- return outputColumn;
- }
-
- @Override
- public String getOutputType() {
- return "long";
- }
-
- @Override
public String vectorExpressionParameters() {
- return "val " + value.toString() + ", col " + + colNum;
+ return "val " + value.toString() + ", " + getColumnParamString(0, colNum);
}
@Override
http://git-wip-us.apache.org/repos/asf/hive/blob/e63ebccc/ql/src/gen/vectorization/ExpressionTemplates/IntervalYearMonthScalarArithmeticTimestampColumn.txt
----------------------------------------------------------------------
diff --git a/ql/src/gen/vectorization/ExpressionTemplates/IntervalYearMonthScalarArithmeticTimestampColumn.txt b/ql/src/gen/vectorization/ExpressionTemplates/IntervalYearMonthScalarArithmeticTimestampColumn.txt
index 9a0d397..12fe21a 100644
--- a/ql/src/gen/vectorization/ExpressionTemplates/IntervalYearMonthScalarArithmeticTimestampColumn.txt
+++ b/ql/src/gen/vectorization/ExpressionTemplates/IntervalYearMonthScalarArithmeticTimestampColumn.txt
@@ -45,18 +45,23 @@ public class <ClassName> extends VectorExpression {
private static final long serialVersionUID = 1L;
- private int colNum;
- private HiveIntervalYearMonth value;
- private int outputColumn;
- private DateTimeMath dtm = new DateTimeMath();
+ private final int colNum;
+ private final HiveIntervalYearMonth value;
- public <ClassName>(long value, int colNum, int outputColumn) {
+ private transient final DateTimeMath dtm = new DateTimeMath();
+
+ public <ClassName>(long value, int colNum, int outputColumnNum) {
+ super(outputColumnNum);
this.colNum = colNum;
this.value = new HiveIntervalYearMonth((int) value);
- this.outputColumn = outputColumn;
}
public <ClassName>() {
+ super();
+
+ // Dummy final assignments.
+ colNum = -1;
+ value = null;
}
@Override
@@ -75,7 +80,7 @@ public class <ClassName> extends VectorExpression {
TimestampColumnVector inputColVector2 = (TimestampColumnVector) batch.cols[colNum];
// Output is type Timestamp.
- TimestampColumnVector outputColVector = (TimestampColumnVector) batch.cols[outputColumn];
+ TimestampColumnVector outputColVector = (TimestampColumnVector) batch.cols[outputColumnNum];
int[] sel = batch.selected;
boolean[] inputIsNull = inputColVector2.isNull;
@@ -133,18 +138,8 @@ public class <ClassName> extends VectorExpression {
}
@Override
- public int getOutputColumn() {
- return outputColumn;
- }
-
- @Override
- public String getOutputType() {
- return "timestamp";
- }
-
- @Override
public String vectorExpressionParameters() {
- return "val " + value.toString() + ", col " + + colNum;
+ return "val " + value.toString() + ", " + getColumnParamString(0, colNum);
}
@Override
http://git-wip-us.apache.org/repos/asf/hive/blob/e63ebccc/ql/src/gen/vectorization/ExpressionTemplates/LongDoubleColumnCompareTimestampColumn.txt
----------------------------------------------------------------------
diff --git a/ql/src/gen/vectorization/ExpressionTemplates/LongDoubleColumnCompareTimestampColumn.txt b/ql/src/gen/vectorization/ExpressionTemplates/LongDoubleColumnCompareTimestampColumn.txt
index cff2deb..524d6d1 100644
--- a/ql/src/gen/vectorization/ExpressionTemplates/LongDoubleColumnCompareTimestampColumn.txt
+++ b/ql/src/gen/vectorization/ExpressionTemplates/LongDoubleColumnCompareTimestampColumn.txt
@@ -34,17 +34,21 @@ public class <ClassName> extends VectorExpression {
private static final long serialVersionUID = 1L;
- private int colNum1;
- private int colNum2;
- private int outputColumn;
+ private final int colNum1;
+ private final int colNum2;
- public <ClassName>(int colNum1, int colNum2, int outputColumn) {
+ public <ClassName>(int colNum1, int colNum2, int outputColumnNum) {
+ super(outputColumnNum);
this.colNum1 = colNum1;
this.colNum2 = colNum2;
- this.outputColumn = outputColumn;
}
public <ClassName>() {
+ super();
+
+ // Dummy final assignments.
+ colNum1 = -1;
+ colNum2 = -1;
}
@Override
@@ -56,7 +60,7 @@ public class <ClassName> extends VectorExpression {
<InputColumnVectorType1> inputColVector1 = (<InputColumnVectorType1>) batch.cols[colNum1];
TimestampColumnVector inputColVector2 = (TimestampColumnVector) batch.cols[colNum2];
- LongColumnVector outputColVector = (LongColumnVector) batch.cols[outputColumn];
+ LongColumnVector outputColVector = (LongColumnVector) batch.cols[outputColumnNum];
int[] sel = batch.selected;
int n = batch.size;
<OperandType>[] vector1 = inputColVector1.vector;
@@ -129,18 +133,8 @@ public class <ClassName> extends VectorExpression {
}
@Override
- public int getOutputColumn() {
- return outputColumn;
- }
-
- @Override
- public String getOutputType() {
- return "long";
- }
-
- @Override
public String vectorExpressionParameters() {
- return "col " + colNum1 + ", col " + + colNum2;
+ return getColumnParamString(0, colNum1) + ", " + getColumnParamString(1, colNum2);
}
@Override
http://git-wip-us.apache.org/repos/asf/hive/blob/e63ebccc/ql/src/gen/vectorization/ExpressionTemplates/LongDoubleColumnCompareTimestampScalar.txt
----------------------------------------------------------------------
diff --git a/ql/src/gen/vectorization/ExpressionTemplates/LongDoubleColumnCompareTimestampScalar.txt b/ql/src/gen/vectorization/ExpressionTemplates/LongDoubleColumnCompareTimestampScalar.txt
index 8308a30..35c12c9 100644
--- a/ql/src/gen/vectorization/ExpressionTemplates/LongDoubleColumnCompareTimestampScalar.txt
+++ b/ql/src/gen/vectorization/ExpressionTemplates/LongDoubleColumnCompareTimestampScalar.txt
@@ -34,17 +34,21 @@ public class <ClassName> extends VectorExpression {
private static final long serialVersionUID = 1L;
- private int colNum;
- private <OperandType> value;
- private int outputColumn;
+ private final int colNum;
+ private final <OperandType> value;
- public <ClassName>(int colNum, Timestamp value, int outputColumn) {
+ public <ClassName>(int colNum, Timestamp value, int outputColumnNum) {
+ super(outputColumnNum);
this.colNum = colNum;
this.value = TimestampColumnVector.<GetTimestampLongDoubleMethod>(value);
- this.outputColumn = outputColumn;
}
public <ClassName>() {
+ super();
+
+ // Dummy final assignments.
+ colNum = -1;
+ value = 0;
}
@Override
@@ -55,7 +59,7 @@ public class <ClassName> extends VectorExpression {
}
<InputColumnVectorType1> inputColVector1 = (<InputColumnVectorType1>) batch.cols[colNum];
- LongColumnVector outputColVector = (LongColumnVector) batch.cols[outputColumn];
+ LongColumnVector outputColVector = (LongColumnVector) batch.cols[outputColumnNum];
int[] sel = batch.selected;
boolean[] nullPos = inputColVector1.isNull;
boolean[] outNulls = outputColVector.isNull;
@@ -120,18 +124,8 @@ public class <ClassName> extends VectorExpression {
}
@Override
- public int getOutputColumn() {
- return outputColumn;
- }
-
- @Override
- public String getOutputType() {
- return "long";
- }
-
- @Override
public String vectorExpressionParameters() {
- return "col " + colNum + ", val " + value;
+ return getColumnParamString(0, colNum) + ", val " + value;
}
@Override
http://git-wip-us.apache.org/repos/asf/hive/blob/e63ebccc/ql/src/gen/vectorization/ExpressionTemplates/LongDoubleScalarCompareTimestampColumn.txt
----------------------------------------------------------------------
diff --git a/ql/src/gen/vectorization/ExpressionTemplates/LongDoubleScalarCompareTimestampColumn.txt b/ql/src/gen/vectorization/ExpressionTemplates/LongDoubleScalarCompareTimestampColumn.txt
index 6aa30e4..7fd27c5 100644
--- a/ql/src/gen/vectorization/ExpressionTemplates/LongDoubleScalarCompareTimestampColumn.txt
+++ b/ql/src/gen/vectorization/ExpressionTemplates/LongDoubleScalarCompareTimestampColumn.txt
@@ -34,17 +34,21 @@ public class <ClassName> extends VectorExpression {
private static final long serialVersionUID = 1L;
- private int colNum;
- private <OperandType> value;
- private int outputColumn;
+ private final <OperandType> value;
+ private final int colNum;
- public <ClassName>(<OperandType> value, int colNum, int outputColumn) {
- this.colNum = colNum;
+ public <ClassName>(<OperandType> value, int colNum, int outputColumnNum) {
+ super(outputColumnNum);
this.value = value;
- this.outputColumn = outputColumn;
+ this.colNum = colNum;
}
public <ClassName>() {
+ super();
+
+ // Dummy final assignments.
+ value = 0;
+ colNum = -1;
}
@Override
@@ -55,7 +59,7 @@ public class <ClassName> extends VectorExpression {
}
TimestampColumnVector inputColVector = (TimestampColumnVector) batch.cols[colNum];
- LongColumnVector outputColVector = (LongColumnVector) batch.cols[outputColumn];
+ LongColumnVector outputColVector = (LongColumnVector) batch.cols[outputColumnNum];
int[] sel = batch.selected;
boolean[] nullPos = inputColVector.isNull;
boolean[] outNulls = outputColVector.isNull;
@@ -119,18 +123,8 @@ public class <ClassName> extends VectorExpression {
}
@Override
- public int getOutputColumn() {
- return outputColumn;
- }
-
- @Override
- public String getOutputType() {
- return "long";
- }
-
- @Override
public String vectorExpressionParameters() {
- return "val " + value + ", col " + + colNum;
+ return "val " + value + ", " + getColumnParamString(1, colNum);
}
@Override
http://git-wip-us.apache.org/repos/asf/hive/blob/e63ebccc/ql/src/gen/vectorization/ExpressionTemplates/ScalarArithmeticColumn.txt
----------------------------------------------------------------------
diff --git a/ql/src/gen/vectorization/ExpressionTemplates/ScalarArithmeticColumn.txt b/ql/src/gen/vectorization/ExpressionTemplates/ScalarArithmeticColumn.txt
index 8473599..87c6bc1 100644
--- a/ql/src/gen/vectorization/ExpressionTemplates/ScalarArithmeticColumn.txt
+++ b/ql/src/gen/vectorization/ExpressionTemplates/ScalarArithmeticColumn.txt
@@ -40,17 +40,21 @@ public class <ClassName> extends VectorExpression {
private static final long serialVersionUID = 1L;
- private int colNum;
- private <OperandType1> value;
- private int outputColumn;
+ private final <OperandType1> value;
+ private final int colNum;
- public <ClassName>(<OperandType1> value, int colNum, int outputColumn) {
+ public <ClassName>(<OperandType1> value, int colNum, int outputColumnNum) {
+ super(outputColumnNum);
this.colNum = colNum;
this.value = value;
- this.outputColumn = outputColumn;
}
public <ClassName>() {
+ super();
+
+ // Dummy final assignments.
+ value = 0;
+ colNum = -1;
}
@Override
@@ -66,7 +70,7 @@ public class <ClassName> extends VectorExpression {
}
<InputColumnVectorType> inputColVector = (<InputColumnVectorType>) batch.cols[colNum];
- <OutputColumnVectorType> outputColVector = (<OutputColumnVectorType>) batch.cols[outputColumn];
+ <OutputColumnVectorType> outputColVector = (<OutputColumnVectorType>) batch.cols[outputColumnNum];
int[] sel = batch.selected;
boolean[] inputIsNull = inputColVector.isNull;
boolean[] outputIsNull = outputColVector.isNull;
@@ -111,43 +115,13 @@ public class <ClassName> extends VectorExpression {
System.arraycopy(inputIsNull, 0, outputIsNull, 0, n);
}
}
-
- NullUtil.setNullOutputEntriesColScalar(outputColVector, batch.selectedInUse, sel, n);
- }
-
- @Override
- public int getOutputColumn() {
- return outputColumn;
- }
-
- @Override
- public String getOutputType() {
- return "<ReturnType>";
- }
-
- public int getColNum() {
- return colNum;
- }
- public void setColNum(int colNum) {
- this.colNum = colNum;
- }
-
- public <OperandType1> getValue() {
- return value;
- }
-
- public void setValue(<OperandType1> value) {
- this.value = value;
- }
-
- public void setOutputColumn(int outputColumn) {
- this.outputColumn = outputColumn;
+ NullUtil.setNullOutputEntriesColScalar(outputColVector, batch.selectedInUse, sel, n);
}
@Override
public String vectorExpressionParameters() {
- return "val " + value + ", col " + + colNum;
+ return "val " + value + ", " + getColumnParamString(1, colNum);
}
@Override
http://git-wip-us.apache.org/repos/asf/hive/blob/e63ebccc/ql/src/gen/vectorization/ExpressionTemplates/ScalarArithmeticColumnDecimal.txt
----------------------------------------------------------------------
diff --git a/ql/src/gen/vectorization/ExpressionTemplates/ScalarArithmeticColumnDecimal.txt b/ql/src/gen/vectorization/ExpressionTemplates/ScalarArithmeticColumnDecimal.txt
index d3fd9bd..e757499 100644
--- a/ql/src/gen/vectorization/ExpressionTemplates/ScalarArithmeticColumnDecimal.txt
+++ b/ql/src/gen/vectorization/ExpressionTemplates/ScalarArithmeticColumnDecimal.txt
@@ -35,19 +35,21 @@ public class <ClassName> extends VectorExpression {
private static final long serialVersionUID = 1L;
- private int colNum;
- private HiveDecimal value;
- private int outputColumn;
+ private final HiveDecimal value;
+ private final int colNum;
- public <ClassName>(HiveDecimal value, int colNum, int outputColumn) {
- this.colNum = colNum;
+ public <ClassName>(HiveDecimal value, int colNum, int outputColumnNum) {
+ super(outputColumnNum);
this.value = value;
- this.outputColumn = outputColumn;
- this.outputType = "decimal";
+ this.colNum = colNum;
}
public <ClassName>() {
- this.outputType = "decimal";
+ super();
+
+ // Dummy final assignments.
+ value = null;
+ colNum = -1;
}
@Override
@@ -58,7 +60,7 @@ public class <ClassName> extends VectorExpression {
}
DecimalColumnVector inputColVector = (DecimalColumnVector) batch.cols[colNum];
- DecimalColumnVector outputColVector = (DecimalColumnVector) batch.cols[outputColumn];
+ DecimalColumnVector outputColVector = (DecimalColumnVector) batch.cols[outputColumnNum];
int[] sel = batch.selected;
boolean[] inputIsNull = inputColVector.isNull;
boolean[] outputIsNull = outputColVector.isNull;
@@ -119,18 +121,13 @@ public class <ClassName> extends VectorExpression {
}
}
}
-
- NullUtil.setNullDataEntriesDecimal(outputColVector, batch.selectedInUse, sel, n);
- }
- @Override
- public int getOutputColumn() {
- return outputColumn;
+ NullUtil.setNullDataEntriesDecimal(outputColVector, batch.selectedInUse, sel, n);
}
@Override
public String vectorExpressionParameters() {
- return "val " + value.toString() + ", col " + + colNum;
+ return "val " + value.toString() + ", " + getColumnParamString(1, colNum);
}
@Override
http://git-wip-us.apache.org/repos/asf/hive/blob/e63ebccc/ql/src/gen/vectorization/ExpressionTemplates/ScalarCompareColumn.txt
----------------------------------------------------------------------
diff --git a/ql/src/gen/vectorization/ExpressionTemplates/ScalarCompareColumn.txt b/ql/src/gen/vectorization/ExpressionTemplates/ScalarCompareColumn.txt
index 6f9e2e2..d3bc8df 100644
--- a/ql/src/gen/vectorization/ExpressionTemplates/ScalarCompareColumn.txt
+++ b/ql/src/gen/vectorization/ExpressionTemplates/ScalarCompareColumn.txt
@@ -33,17 +33,21 @@ public class <ClassName> extends VectorExpression {
private static final long serialVersionUID = 1L;
- private int colNum;
- private <OperandType1> value;
- private int outputColumn;
+ private final <OperandType1> value;
+ private final int colNum;
- public <ClassName>(<OperandType1> value, int colNum, int outputColumn) {
- this.colNum = colNum;
+ public <ClassName>(<OperandType1> value, int colNum, int outputColumnNum) {
+ super(outputColumnNum);
this.value = value;
- this.outputColumn = outputColumn;
+ this.colNum = colNum;
}
public <ClassName>() {
+ super();
+
+ // Dummy final assignments.
+ value = 0;
+ colNum = -1;
}
@Override
@@ -54,7 +58,7 @@ public class <ClassName> extends VectorExpression {
}
<InputColumnVectorType> inputColVector = (<InputColumnVectorType>) batch.cols[colNum];
- <OutputColumnVectorType> outputColVector = (<OutputColumnVectorType>) batch.cols[outputColumn];
+ <OutputColumnVectorType> outputColVector = (<OutputColumnVectorType>) batch.cols[outputColumnNum];
int[] sel = batch.selected;
boolean[] nullPos = inputColVector.isNull;
boolean[] outNulls = outputColVector.isNull;
@@ -119,38 +123,8 @@ public class <ClassName> extends VectorExpression {
}
@Override
- public int getOutputColumn() {
- return outputColumn;
- }
-
- @Override
- public String getOutputType() {
- return "<ReturnType>";
- }
-
- public int getColNum() {
- return colNum;
- }
-
- public void setColNum(int colNum) {
- this.colNum = colNum;
- }
-
- public <OperandType1> getValue() {
- return value;
- }
-
- public void setValue(<OperandType1> value) {
- this.value = value;
- }
-
- public void setOutputColumn(int outputColumn) {
- this.outputColumn = outputColumn;
- }
-
- @Override
public String vectorExpressionParameters() {
- return "val " + value + ", col " + + colNum;
+ return "val " + value + ", " + getColumnParamString(1, colNum);
}
@Override
http://git-wip-us.apache.org/repos/asf/hive/blob/e63ebccc/ql/src/gen/vectorization/ExpressionTemplates/ScalarDivideColumn.txt
----------------------------------------------------------------------
diff --git a/ql/src/gen/vectorization/ExpressionTemplates/ScalarDivideColumn.txt b/ql/src/gen/vectorization/ExpressionTemplates/ScalarDivideColumn.txt
index 8e6e8a9..ee943a0 100644
--- a/ql/src/gen/vectorization/ExpressionTemplates/ScalarDivideColumn.txt
+++ b/ql/src/gen/vectorization/ExpressionTemplates/ScalarDivideColumn.txt
@@ -40,17 +40,21 @@ public class <ClassName> extends VectorExpression {
private static final long serialVersionUID = 1L;
- private int colNum;
- private <OperandType1> value;
- private int outputColumn;
+ private final <OperandType1> value;
+ private final int colNum;
- public <ClassName>(<OperandType1> value, int colNum, int outputColumn) {
- this.colNum = colNum;
+ public <ClassName>(<OperandType1> value, int colNum, int outputColumnNum) {
+ super(outputColumnNum);
this.value = value;
- this.outputColumn = outputColumn;
+ this.colNum = colNum;
}
public <ClassName>() {
+ super();
+
+ // Dummy final assignments.
+ value = 0;
+ colNum = -1;
}
@Override
@@ -66,7 +70,7 @@ public class <ClassName> extends VectorExpression {
}
<InputColumnVectorType> inputColVector = (<InputColumnVectorType>) batch.cols[colNum];
- <OutputColumnVectorType> outputColVector = (<OutputColumnVectorType>) batch.cols[outputColumn];
+ <OutputColumnVectorType> outputColVector = (<OutputColumnVectorType>) batch.cols[outputColumnNum];
int[] sel = batch.selected;
boolean[] inputIsNull = inputColVector.isNull;
boolean[] outputIsNull = outputColVector.isNull;
@@ -132,38 +136,8 @@ public class <ClassName> extends VectorExpression {
}
@Override
- public int getOutputColumn() {
- return outputColumn;
- }
-
- @Override
- public String getOutputType() {
- return "<ReturnType>";
- }
-
- public int getColNum() {
- return colNum;
- }
-
- public void setColNum(int colNum) {
- this.colNum = colNum;
- }
-
- public <OperandType1> getValue() {
- return value;
- }
-
- public void setValue(<OperandType1> value) {
- this.value = value;
- }
-
- public void setOutputColumn(int outputColumn) {
- this.outputColumn = outputColumn;
- }
-
- @Override
public String vectorExpressionParameters() {
- return "val " + value + ", col " + + colNum;
+ return "val " + value + ", " + getColumnParamString(1, colNum);
}
@Override
http://git-wip-us.apache.org/repos/asf/hive/blob/e63ebccc/ql/src/gen/vectorization/ExpressionTemplates/ScalarDivideColumnDecimal.txt
----------------------------------------------------------------------
diff --git a/ql/src/gen/vectorization/ExpressionTemplates/ScalarDivideColumnDecimal.txt b/ql/src/gen/vectorization/ExpressionTemplates/ScalarDivideColumnDecimal.txt
index 1014978..3383404 100644
--- a/ql/src/gen/vectorization/ExpressionTemplates/ScalarDivideColumnDecimal.txt
+++ b/ql/src/gen/vectorization/ExpressionTemplates/ScalarDivideColumnDecimal.txt
@@ -35,19 +35,21 @@ public class <ClassName> extends VectorExpression {
private static final long serialVersionUID = 1L;
- private int colNum;
- private HiveDecimal value;
- private int outputColumn;
+ private final HiveDecimal value;
+ private final int colNum;
- public <ClassName>(HiveDecimal value, int colNum, int outputColumn) {
- this.colNum = colNum;
+ public <ClassName>(HiveDecimal value, int colNum, int outputColumnNum) {
+ super(outputColumnNum);
this.value = value;
- this.outputColumn = outputColumn;
- this.outputType = "decimal";
+ this.colNum = colNum;
}
public <ClassName>() {
- this.outputType = "decimal";
+ super();
+
+ // Dummy final assignments.
+ value = null;
+ colNum = -1;
}
@Override
@@ -58,7 +60,7 @@ public class <ClassName> extends VectorExpression {
}
DecimalColumnVector inputColVector = (DecimalColumnVector) batch.cols[colNum];
- DecimalColumnVector outputColVector = (DecimalColumnVector) batch.cols[outputColumn];
+ DecimalColumnVector outputColVector = (DecimalColumnVector) batch.cols[outputColumnNum];
int[] sel = batch.selected;
boolean[] inputIsNull = inputColVector.isNull;
boolean[] outputIsNull = outputColVector.isNull;
@@ -126,13 +128,8 @@ public class <ClassName> extends VectorExpression {
}
@Override
- public int getOutputColumn() {
- return outputColumn;
- }
-
- @Override
public String vectorExpressionParameters() {
- return "val " + value.toString() + ", col " + + colNum;
+ return "val " + value.toString() + ", " + getColumnParamString(1, colNum);
}
@Override
http://git-wip-us.apache.org/repos/asf/hive/blob/e63ebccc/ql/src/gen/vectorization/ExpressionTemplates/StringGroupColumnCompareStringGroupColumn.txt
----------------------------------------------------------------------
diff --git a/ql/src/gen/vectorization/ExpressionTemplates/StringGroupColumnCompareStringGroupColumn.txt b/ql/src/gen/vectorization/ExpressionTemplates/StringGroupColumnCompareStringGroupColumn.txt
index 747f707..269800f 100644
--- a/ql/src/gen/vectorization/ExpressionTemplates/StringGroupColumnCompareStringGroupColumn.txt
+++ b/ql/src/gen/vectorization/ExpressionTemplates/StringGroupColumnCompareStringGroupColumn.txt
@@ -33,17 +33,21 @@ public class <ClassName> extends VectorExpression {
private static final long serialVersionUID = 1L;
- private int colNum1;
- private int colNum2;
- private int outputColumn;
+ private final int colNum1;
+ private final int colNum2;
- public <ClassName>(int colNum1, int colNum2, int outputColumn) {
+ public <ClassName>(int colNum1, int colNum2, int outputColumnNum) {
+ super(outputColumnNum);
this.colNum1 = colNum1;
this.colNum2 = colNum2;
- this.outputColumn = outputColumn;
}
public <ClassName>() {
+ super();
+
+ // Dummy final assignments.
+ colNum1 = -1;
+ colNum2 = -1;
}
@Override
@@ -55,7 +59,7 @@ public class <ClassName> extends VectorExpression {
BytesColumnVector inputColVector1 = (BytesColumnVector) batch.cols[colNum1];
BytesColumnVector inputColVector2 = (BytesColumnVector) batch.cols[colNum2];
- LongColumnVector outputColVector = (LongColumnVector) batch.cols[outputColumn];
+ LongColumnVector outputColVector = (LongColumnVector) batch.cols[outputColumnNum];
int[] sel = batch.selected;
boolean[] nullPos1 = inputColVector1.isNull;
boolean[] nullPos2 = inputColVector2.isNull;
@@ -457,44 +461,14 @@ public class <ClassName> extends VectorExpression {
}
}
}
- }
- }
+ }
+ }
}
}
@Override
- public String getOutputType() {
- return "boolean";
- }
-
- @Override
- public int getOutputColumn() {
- return outputColumn;
- }
-
- 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;
- }
-
- @Override
public String vectorExpressionParameters() {
- return "col " + colNum1 + ", col " + + colNum2;
+ return getColumnParamString(0, colNum1) + ", " + getColumnParamString(1, colNum2);
}
@Override
http://git-wip-us.apache.org/repos/asf/hive/blob/e63ebccc/ql/src/gen/vectorization/ExpressionTemplates/StringGroupColumnCompareStringGroupScalarBase.txt
----------------------------------------------------------------------
diff --git a/ql/src/gen/vectorization/ExpressionTemplates/StringGroupColumnCompareStringGroupScalarBase.txt b/ql/src/gen/vectorization/ExpressionTemplates/StringGroupColumnCompareStringGroupScalarBase.txt
index 08b3e75..57fef08 100644
--- a/ql/src/gen/vectorization/ExpressionTemplates/StringGroupColumnCompareStringGroupScalarBase.txt
+++ b/ql/src/gen/vectorization/ExpressionTemplates/StringGroupColumnCompareStringGroupScalarBase.txt
@@ -34,9 +34,22 @@ public abstract class <ClassName> extends VectorExpression {
private static final long serialVersionUID = 1L;
- protected int colNum;
- protected byte[] value;
- protected int outputColumn;
+ protected final int colNum;
+ protected final byte[] value;
+
+ public <ClassName>(int colNum, byte[] value, int outputColumnNum) {
+ super(outputColumnNum);
+ this.colNum = colNum;
+ this.value = value;
+ }
+
+ public <ClassName>() {
+ super();
+
+ // Dummy final assignments.
+ colNum = -1;
+ value = null;
+ }
@Override
public void evaluate(VectorizedRowBatch batch) {
@@ -44,7 +57,7 @@ public abstract class <ClassName> extends VectorExpression {
super.evaluateChildren(batch);
}
BytesColumnVector inputColVector = (BytesColumnVector) batch.cols[colNum];
- LongColumnVector outputColVector = (LongColumnVector) batch.cols[outputColumn];
+ LongColumnVector outputColVector = (LongColumnVector) batch.cols[outputColumnNum];
int[] sel = batch.selected;
boolean[] nullPos = inputColVector.isNull;
boolean[] outNull = outputColVector.isNull;
@@ -128,37 +141,7 @@ public abstract class <ClassName> extends VectorExpression {
}
@Override
- public int getOutputColumn() {
- return outputColumn;
- }
-
- @Override
- 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;
- }
-
- public void setOutputColumn(int outputColumn) {
- this.outputColumn = outputColumn;
- }
-
- @Override
public String vectorExpressionParameters() {
- return "col " + colNum + ", val " + displayUtf8Bytes(value);
+ return getColumnParamString(0, colNum) + ", val " + displayUtf8Bytes(value);
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/hive/blob/e63ebccc/ql/src/gen/vectorization/ExpressionTemplates/StringGroupColumnCompareStringScalar.txt
----------------------------------------------------------------------
diff --git a/ql/src/gen/vectorization/ExpressionTemplates/StringGroupColumnCompareStringScalar.txt b/ql/src/gen/vectorization/ExpressionTemplates/StringGroupColumnCompareStringScalar.txt
index 9b11c5e..ec1158f 100644
--- a/ql/src/gen/vectorization/ExpressionTemplates/StringGroupColumnCompareStringScalar.txt
+++ b/ql/src/gen/vectorization/ExpressionTemplates/StringGroupColumnCompareStringScalar.txt
@@ -32,13 +32,12 @@ import org.apache.hadoop.hive.ql.exec.vector.VectorExpressionDescriptor;
*/
public class <ClassName> extends <BaseClassName> {
- public <ClassName>(int colNum, byte[] value, int outputColumn) {
- this.colNum = colNum;
- this.value = value;
- this.outputColumn = outputColumn;
+ public <ClassName>(int colNum, byte[] value, int outputColumnNum) {
+ super(colNum, value, outputColumnNum);
}
public <ClassName>() {
+ super();
}
@Override
http://git-wip-us.apache.org/repos/asf/hive/blob/e63ebccc/ql/src/gen/vectorization/ExpressionTemplates/StringGroupColumnCompareTruncStringScalar.txt
----------------------------------------------------------------------
diff --git a/ql/src/gen/vectorization/ExpressionTemplates/StringGroupColumnCompareTruncStringScalar.txt b/ql/src/gen/vectorization/ExpressionTemplates/StringGroupColumnCompareTruncStringScalar.txt
index 969fe1b..54233a5 100644
--- a/ql/src/gen/vectorization/ExpressionTemplates/StringGroupColumnCompareTruncStringScalar.txt
+++ b/ql/src/gen/vectorization/ExpressionTemplates/StringGroupColumnCompareTruncStringScalar.txt
@@ -36,18 +36,17 @@ import org.apache.hadoop.hive.ql.exec.vector.VectorExpressionDescriptor;
*/
public class <ClassName> extends <BaseClassName> {
- public <ClassName>(int colNum, <TruncStringHiveType> value, int outputColumn) {
- this.colNum = colNum;
- this.value = value.<TruncStringHiveGetBytes>;
- this.outputColumn = outputColumn;
+ public <ClassName>(int colNum, <TruncStringHiveType> value, int outputColumnNum) {
+ super(colNum, value.<TruncStringHiveGetBytes>, outputColumnNum);
}
public <ClassName>() {
+ super();
}
@Override
public String vectorExpressionParameters() {
- return "col " + colNum + ", val " + displayUtf8Bytes(value);
+ return getColumnParamString(0, colNum) + ", val " + displayUtf8Bytes(value);
}
@Override
http://git-wip-us.apache.org/repos/asf/hive/blob/e63ebccc/ql/src/gen/vectorization/ExpressionTemplates/StringGroupScalarCompareStringGroupColumnBase.txt
----------------------------------------------------------------------
diff --git a/ql/src/gen/vectorization/ExpressionTemplates/StringGroupScalarCompareStringGroupColumnBase.txt b/ql/src/gen/vectorization/ExpressionTemplates/StringGroupScalarCompareStringGroupColumnBase.txt
index dee2bfc..7052844 100644
--- a/ql/src/gen/vectorization/ExpressionTemplates/StringGroupScalarCompareStringGroupColumnBase.txt
+++ b/ql/src/gen/vectorization/ExpressionTemplates/StringGroupScalarCompareStringGroupColumnBase.txt
@@ -35,9 +35,22 @@ public abstract class <ClassName> extends VectorExpression {
private static final long serialVersionUID = 1L;
- protected int colNum;
- protected byte[] value;
- protected int outputColumn;
+ protected final int colNum;
+ protected final byte[] value;
+
+ public <ClassName>(int colNum, byte[] value, int outputColumnNum) {
+ super(outputColumnNum);
+ this.colNum = colNum;
+ this.value = value;
+ }
+
+ public <ClassName>() {
+ super();
+
+ // Dummy final assignments.
+ colNum = -1;
+ value = null;
+ }
@Override
public void evaluate(VectorizedRowBatch batch) {
@@ -45,7 +58,7 @@ public abstract class <ClassName> extends VectorExpression {
super.evaluateChildren(batch);
}
BytesColumnVector inputColVector = (BytesColumnVector) batch.cols[colNum];
- LongColumnVector outputColVector = (LongColumnVector) batch.cols[outputColumn];
+ LongColumnVector outputColVector = (LongColumnVector) batch.cols[outputColumnNum];
int[] sel = batch.selected;
boolean[] nullPos = inputColVector.isNull;
boolean[] outNull = outputColVector.isNull;
@@ -128,37 +141,7 @@ public abstract class <ClassName> extends VectorExpression {
}
@Override
- public int getOutputColumn() {
- return outputColumn;
- }
-
- @Override
- 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;
- }
-
- public void setOutputColumn(int outputColumn) {
- this.outputColumn = outputColumn;
- }
-
- @Override
public String vectorExpressionParameters() {
- return "val " + displayUtf8Bytes(value) + ", col " + + colNum;
+ return "val " + displayUtf8Bytes(value) + ", " + getColumnParamString(1, colNum);
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/hive/blob/e63ebccc/ql/src/gen/vectorization/ExpressionTemplates/StringScalarCompareStringGroupColumn.txt
----------------------------------------------------------------------
diff --git a/ql/src/gen/vectorization/ExpressionTemplates/StringScalarCompareStringGroupColumn.txt b/ql/src/gen/vectorization/ExpressionTemplates/StringScalarCompareStringGroupColumn.txt
index 5b5e02e..75041b1 100644
--- a/ql/src/gen/vectorization/ExpressionTemplates/StringScalarCompareStringGroupColumn.txt
+++ b/ql/src/gen/vectorization/ExpressionTemplates/StringScalarCompareStringGroupColumn.txt
@@ -35,13 +35,12 @@ public class <ClassName> extends <BaseClassName> {
private static final long serialVersionUID = 1L;
- public <ClassName>(byte[] value, int colNum, int outputColumn) {
- this.colNum = colNum;
- this.value = value;
- this.outputColumn = outputColumn;
+ public <ClassName>(byte[] value, int colNum, int outputColumnNum) {
+ super(colNum, value, outputColumnNum);
}
public <ClassName>() {
+ super();
}
@Override
http://git-wip-us.apache.org/repos/asf/hive/blob/e63ebccc/ql/src/gen/vectorization/ExpressionTemplates/TimestampColumnArithmeticDateColumn.txt
----------------------------------------------------------------------
diff --git a/ql/src/gen/vectorization/ExpressionTemplates/TimestampColumnArithmeticDateColumn.txt b/ql/src/gen/vectorization/ExpressionTemplates/TimestampColumnArithmeticDateColumn.txt
index 7aeff81..c14c952 100644
--- a/ql/src/gen/vectorization/ExpressionTemplates/TimestampColumnArithmeticDateColumn.txt
+++ b/ql/src/gen/vectorization/ExpressionTemplates/TimestampColumnArithmeticDateColumn.txt
@@ -37,20 +37,24 @@ public class <ClassName> extends VectorExpression {
private static final long serialVersionUID = 1L;
- private int colNum1;
- private int colNum2;
- private int outputColumn;
- private Timestamp scratchTimestamp2;
- private DateTimeMath dtm = new DateTimeMath();
+ private final int colNum1;
+ private final int colNum2;
- public <ClassName>(int colNum1, int colNum2, int outputColumn) {
+ private transient final Timestamp scratchTimestamp2 = new Timestamp(0);
+ private transient final DateTimeMath dtm = new DateTimeMath();
+
+ public <ClassName>(int colNum1, int colNum2, int outputColumnNum) {
+ super(outputColumnNum);
this.colNum1 = colNum1;
this.colNum2 = colNum2;
- this.outputColumn = outputColumn;
- scratchTimestamp2 = new Timestamp(0);
}
public <ClassName>() {
+ super();
+
+ // Dummy final assignments.
+ colNum1 = -1;
+ colNum2 = -1;
}
@Override
@@ -67,7 +71,7 @@ public class <ClassName> extends VectorExpression {
LongColumnVector inputColVector2 = (LongColumnVector) batch.cols[colNum2];
// Output is type <ReturnType>.
- <OutputColumnVectorType> outputColVector = (<OutputColumnVectorType>) batch.cols[outputColumn];
+ <OutputColumnVectorType> outputColVector = (<OutputColumnVectorType>) batch.cols[outputColumnNum];
int[] sel = batch.selected;
int n = batch.size;
@@ -161,18 +165,8 @@ public class <ClassName> extends VectorExpression {
}
@Override
- public int getOutputColumn() {
- return outputColumn;
- }
-
- @Override
- public String getOutputType() {
- return "interval_day_time";
- }
-
- @Override
public String vectorExpressionParameters() {
- return "col " + colNum1 + ", col " + + colNum2;
+ return getColumnParamString(0, colNum1) + ", " + getColumnParamString(1, colNum2);
}
@Override
http://git-wip-us.apache.org/repos/asf/hive/blob/e63ebccc/ql/src/gen/vectorization/ExpressionTemplates/TimestampColumnArithmeticDateScalar.txt
----------------------------------------------------------------------
diff --git a/ql/src/gen/vectorization/ExpressionTemplates/TimestampColumnArithmeticDateScalar.txt b/ql/src/gen/vectorization/ExpressionTemplates/TimestampColumnArithmeticDateScalar.txt
index f8cb880..023cb74 100644
--- a/ql/src/gen/vectorization/ExpressionTemplates/TimestampColumnArithmeticDateScalar.txt
+++ b/ql/src/gen/vectorization/ExpressionTemplates/TimestampColumnArithmeticDateScalar.txt
@@ -38,19 +38,24 @@ public class <ClassName> extends VectorExpression {
private static final long serialVersionUID = 1L;
- private int colNum;
- private Timestamp value;
- private int outputColumn;
- private DateTimeMath dtm = new DateTimeMath();
+ private final int colNum;
+ private final Timestamp value;
- public <ClassName>(int colNum, long value, int outputColumn) {
+ private transient final DateTimeMath dtm = new DateTimeMath();
+
+ public <ClassName>(int colNum, long value, int outputColumnNum) {
+ super(outputColumnNum);
this.colNum = colNum;
this.value = new Timestamp(0);
this.value.setTime(DateWritable.daysToMillis((int) value));
- this.outputColumn = outputColumn;
}
public <ClassName>() {
+ super();
+
+ // Dummy final assignments.
+ colNum = -1;
+ value = null;
}
@Override
@@ -64,7 +69,7 @@ public class <ClassName> extends VectorExpression {
<InputColumnVectorType1> inputColVector1 = (<InputColumnVectorType1>) batch.cols[colNum];
// Output is type <ReturnType>.
- <OutputColumnVectorType> outputColVector = (<OutputColumnVectorType>) batch.cols[outputColumn];
+ <OutputColumnVectorType> outputColVector = (<OutputColumnVectorType>) batch.cols[outputColumnNum];
int[] sel = batch.selected;
boolean[] inputIsNull = inputColVector1.isNull;
@@ -122,18 +127,8 @@ public class <ClassName> extends VectorExpression {
}
@Override
- public int getOutputColumn() {
- return outputColumn;
- }
-
- @Override
- public String getOutputType() {
- return "<ReturnType>";
- }
-
- @Override
public String vectorExpressionParameters() {
- return "col " + colNum + ", val " + value.toString();
+ return getColumnParamString(0, colNum) + ", val " + value.toString();
}
@Override
http://git-wip-us.apache.org/repos/asf/hive/blob/e63ebccc/ql/src/gen/vectorization/ExpressionTemplates/TimestampColumnArithmeticIntervalYearMonthColumn.txt
----------------------------------------------------------------------
diff --git a/ql/src/gen/vectorization/ExpressionTemplates/TimestampColumnArithmeticIntervalYearMonthColumn.txt b/ql/src/gen/vectorization/ExpressionTemplates/TimestampColumnArithmeticIntervalYearMonthColumn.txt
index 989e2f5..6c5b9ab 100644
--- a/ql/src/gen/vectorization/ExpressionTemplates/TimestampColumnArithmeticIntervalYearMonthColumn.txt
+++ b/ql/src/gen/vectorization/ExpressionTemplates/TimestampColumnArithmeticIntervalYearMonthColumn.txt
@@ -36,20 +36,24 @@ public class <ClassName> extends VectorExpression {
private static final long serialVersionUID = 1L;
- private int colNum1;
- private int colNum2;
- private int outputColumn;
- private HiveIntervalYearMonth scratchIntervalYearMonth2;
- private DateTimeMath dtm = new DateTimeMath();
+ private final int colNum1;
+ private final int colNum2;
- public <ClassName>(int colNum1, int colNum2, int outputColumn) {
+ private transient final HiveIntervalYearMonth scratchIntervalYearMonth2 = new HiveIntervalYearMonth();
+ private transient final DateTimeMath dtm = new DateTimeMath();
+
+ public <ClassName>(int colNum1, int colNum2, int outputColumnNum) {
+ super(outputColumnNum);
this.colNum1 = colNum1;
this.colNum2 = colNum2;
- this.outputColumn = outputColumn;
- scratchIntervalYearMonth2 = new HiveIntervalYearMonth();
}
public <ClassName>() {
+ super();
+
+ // Dummy final assignments.
+ colNum1 = -1;
+ colNum2 = -1;
}
@Override
@@ -66,7 +70,7 @@ public class <ClassName> extends VectorExpression {
LongColumnVector inputColVector2 = (LongColumnVector) batch.cols[colNum2];
// Output is type Timestamp.
- TimestampColumnVector outputColVector = (TimestampColumnVector) batch.cols[outputColumn];
+ TimestampColumnVector outputColVector = (TimestampColumnVector) batch.cols[outputColumnNum];
int[] sel = batch.selected;
int n = batch.size;
@@ -160,18 +164,8 @@ public class <ClassName> extends VectorExpression {
}
@Override
- public int getOutputColumn() {
- return outputColumn;
- }
-
- @Override
- public String getOutputType() {
- return "timestamp";
- }
-
- @Override
public String vectorExpressionParameters() {
- return "col " + colNum1 + ", col " + + colNum2;
+ return getColumnParamString(0, colNum1) + ", " + getColumnParamString(1, colNum2);
}
@Override
http://git-wip-us.apache.org/repos/asf/hive/blob/e63ebccc/ql/src/gen/vectorization/ExpressionTemplates/TimestampColumnArithmeticIntervalYearMonthScalar.txt
----------------------------------------------------------------------
diff --git a/ql/src/gen/vectorization/ExpressionTemplates/TimestampColumnArithmeticIntervalYearMonthScalar.txt b/ql/src/gen/vectorization/ExpressionTemplates/TimestampColumnArithmeticIntervalYearMonthScalar.txt
index a90b1b2..d777e96 100644
--- a/ql/src/gen/vectorization/ExpressionTemplates/TimestampColumnArithmeticIntervalYearMonthScalar.txt
+++ b/ql/src/gen/vectorization/ExpressionTemplates/TimestampColumnArithmeticIntervalYearMonthScalar.txt
@@ -35,18 +35,23 @@ public class <ClassName> extends VectorExpression {
private static final long serialVersionUID = 1L;
- private int colNum;
- private HiveIntervalYearMonth value;
- private int outputColumn;
- private DateTimeMath dtm = new DateTimeMath();
+ private final int colNum;
+ private final HiveIntervalYearMonth value;
- public <ClassName>(int colNum, long value, int outputColumn) {
+ private transient final DateTimeMath dtm = new DateTimeMath();
+
+ public <ClassName>(int colNum, long value, int outputColumnNum) {
+ super(outputColumnNum);
this.colNum = colNum;
this.value = new HiveIntervalYearMonth((int) value);
- this.outputColumn = outputColumn;
}
public <ClassName>() {
+ super();
+
+ // Dummy final assignments.
+ colNum = -1;
+ value = null;
}
@Override
@@ -60,7 +65,7 @@ public class <ClassName> extends VectorExpression {
TimestampColumnVector inputColVector1 = (TimestampColumnVector) batch.cols[colNum];
// Output is type Timestamp.
- TimestampColumnVector outputColVector = (TimestampColumnVector) batch.cols[outputColumn];
+ TimestampColumnVector outputColVector = (TimestampColumnVector) batch.cols[outputColumnNum];
int[] sel = batch.selected;
boolean[] inputIsNull = inputColVector1.isNull;
@@ -118,18 +123,8 @@ public class <ClassName> extends VectorExpression {
}
@Override
- public int getOutputColumn() {
- return outputColumn;
- }
-
- @Override
- public String getOutputType() {
- return "timestamp";
- }
-
- @Override
public String vectorExpressionParameters() {
- return "col " + colNum + ", val " + value.toString();
+ return getColumnParamString(0, colNum) + ", val " + value.toString();
}
@Override
http://git-wip-us.apache.org/repos/asf/hive/blob/e63ebccc/ql/src/gen/vectorization/ExpressionTemplates/TimestampColumnArithmeticTimestampColumn.txt
----------------------------------------------------------------------
diff --git a/ql/src/gen/vectorization/ExpressionTemplates/TimestampColumnArithmeticTimestampColumn.txt b/ql/src/gen/vectorization/ExpressionTemplates/TimestampColumnArithmeticTimestampColumn.txt
index ad43cac..5141e30 100644
--- a/ql/src/gen/vectorization/ExpressionTemplates/TimestampColumnArithmeticTimestampColumn.txt
+++ b/ql/src/gen/vectorization/ExpressionTemplates/TimestampColumnArithmeticTimestampColumn.txt
@@ -36,18 +36,23 @@ public class <ClassName> extends VectorExpression {
private static final long serialVersionUID = 1L;
- private int colNum1;
- private int colNum2;
- private int outputColumn;
- private DateTimeMath dtm = new DateTimeMath();
+ private final int colNum1;
+ private final int colNum2;
- public <ClassName>(int colNum1, int colNum2, int outputColumn) {
+ private transient final DateTimeMath dtm = new DateTimeMath();
+
+ public <ClassName>(int colNum1, int colNum2, int outputColumnNum) {
+ super(outputColumnNum);
this.colNum1 = colNum1;
this.colNum2 = colNum2;
- this.outputColumn = outputColumn;
}
public <ClassName>() {
+ super();
+
+ // Dummy final assignments.
+ colNum1 = -1;
+ colNum2 = -1;
}
@Override
@@ -64,7 +69,7 @@ public class <ClassName> extends VectorExpression {
<InputColumnVectorType2> inputColVector2 = (<InputColumnVectorType2>) batch.cols[colNum2];
// Output is type <ReturnType>.
- <OutputColumnVectorType> outputColVector = (<OutputColumnVectorType>) batch.cols[outputColumn];
+ <OutputColumnVectorType> outputColVector = (<OutputColumnVectorType>) batch.cols[outputColumnNum];
int[] sel = batch.selected;
int n = batch.size;
@@ -151,18 +156,8 @@ public class <ClassName> extends VectorExpression {
}
@Override
- public int getOutputColumn() {
- return outputColumn;
- }
-
- @Override
- public String getOutputType() {
- return "<ReturnType>";
- }
-
- @Override
public String vectorExpressionParameters() {
- return "col " + colNum1 + ", col " + + colNum2;
+ return getColumnParamString(0, colNum1) + ", " + getColumnParamString(1, colNum2);
}
@Override
http://git-wip-us.apache.org/repos/asf/hive/blob/e63ebccc/ql/src/gen/vectorization/ExpressionTemplates/TimestampColumnArithmeticTimestampScalar.txt
----------------------------------------------------------------------
diff --git a/ql/src/gen/vectorization/ExpressionTemplates/TimestampColumnArithmeticTimestampScalar.txt b/ql/src/gen/vectorization/ExpressionTemplates/TimestampColumnArithmeticTimestampScalar.txt
index 32b49a3..1f0f077 100644
--- a/ql/src/gen/vectorization/ExpressionTemplates/TimestampColumnArithmeticTimestampScalar.txt
+++ b/ql/src/gen/vectorization/ExpressionTemplates/TimestampColumnArithmeticTimestampScalar.txt
@@ -37,18 +37,23 @@ public class <ClassName> extends VectorExpression {
private static final long serialVersionUID = 1L;
- private int colNum;
- private <HiveOperandType2> value;
- private int outputColumn;
- private DateTimeMath dtm = new DateTimeMath();
+ private final int colNum;
+ private final <HiveOperandType2> value;
- public <ClassName>(int colNum, <HiveOperandType2> value, int outputColumn) {
+ private transient final DateTimeMath dtm = new DateTimeMath();
+
+ public <ClassName>(int colNum, <HiveOperandType2> value, int outputColumnNum) {
+ super(outputColumnNum);
this.colNum = colNum;
this.value = value;
- this.outputColumn = outputColumn;
}
public <ClassName>() {
+ super();
+
+ // Dummy final assignments.
+ colNum = -1;
+ value = null;
}
@Override
@@ -62,7 +67,7 @@ public class <ClassName> extends VectorExpression {
<InputColumnVectorType1> inputColVector1 = (<InputColumnVectorType1>) batch.cols[colNum];
// Output is type <ReturnType>.
- <OutputColumnVectorType> outputColVector = (<OutputColumnVectorType>) batch.cols[outputColumn];
+ <OutputColumnVectorType> outputColVector = (<OutputColumnVectorType>) batch.cols[outputColumnNum];
int[] sel = batch.selected;
boolean[] inputIsNull = inputColVector1.isNull;
@@ -120,18 +125,8 @@ public class <ClassName> extends VectorExpression {
}
@Override
- public int getOutputColumn() {
- return outputColumn;
- }
-
- @Override
- public String getOutputType() {
- return "<ReturnType>";
- }
-
- @Override
public String vectorExpressionParameters() {
- return "col " + colNum + ", val " + value.toString();
+ return getColumnParamString(0, colNum) + ", val " + value.toString();
}
@Override
http://git-wip-us.apache.org/repos/asf/hive/blob/e63ebccc/ql/src/gen/vectorization/ExpressionTemplates/TimestampColumnCompareLongDoubleColumn.txt
----------------------------------------------------------------------
diff --git a/ql/src/gen/vectorization/ExpressionTemplates/TimestampColumnCompareLongDoubleColumn.txt b/ql/src/gen/vectorization/ExpressionTemplates/TimestampColumnCompareLongDoubleColumn.txt
index 7267148..39648e4 100644
--- a/ql/src/gen/vectorization/ExpressionTemplates/TimestampColumnCompareLongDoubleColumn.txt
+++ b/ql/src/gen/vectorization/ExpressionTemplates/TimestampColumnCompareLongDoubleColumn.txt
@@ -32,17 +32,21 @@ public class <ClassName> extends VectorExpression {
private static final long serialVersionUID = 1L;
- private int colNum1;
- private int colNum2;
- private int outputColumn;
+ private final int colNum1;
+ private final int colNum2;
- public <ClassName>(int colNum1, int colNum2, int outputColumn) {
+ public <ClassName>(int colNum1, int colNum2, int outputColumnNum) {
+ super(outputColumnNum);
this.colNum1 = colNum1;
this.colNum2 = colNum2;
- this.outputColumn = outputColumn;
}
public <ClassName>() {
+ super();
+
+ // Dummy final assignments.
+ colNum1 = -1;
+ colNum2 = -1;
}
@Override
@@ -54,7 +58,7 @@ public class <ClassName> extends VectorExpression {
TimestampColumnVector inputColVector1 = (TimestampColumnVector) batch.cols[colNum1];
<InputColumnVectorType2> inputColVector2 = (<InputColumnVectorType2>) batch.cols[colNum2];
- LongColumnVector outputColVector = (LongColumnVector) batch.cols[outputColumn];
+ LongColumnVector outputColVector = (LongColumnVector) batch.cols[outputColumnNum];
int[] sel = batch.selected;
int n = batch.size;
<OperandType>[] vector2 = inputColVector2.vector;
@@ -128,18 +132,8 @@ public class <ClassName> extends VectorExpression {
}
@Override
- public int getOutputColumn() {
- return outputColumn;
- }
-
- @Override
- public String getOutputType() {
- return "long";
- }
-
- @Override
public String vectorExpressionParameters() {
- return "col " + colNum1 + ", col " + + colNum2;
+ return getColumnParamString(0, colNum1) + ", " + getColumnParamString(1, colNum2);
}
@Override
http://git-wip-us.apache.org/repos/asf/hive/blob/e63ebccc/ql/src/gen/vectorization/ExpressionTemplates/TimestampColumnCompareLongDoubleScalar.txt
----------------------------------------------------------------------
diff --git a/ql/src/gen/vectorization/ExpressionTemplates/TimestampColumnCompareLongDoubleScalar.txt b/ql/src/gen/vectorization/ExpressionTemplates/TimestampColumnCompareLongDoubleScalar.txt
index 2be05f3..c9ec3b9 100644
--- a/ql/src/gen/vectorization/ExpressionTemplates/TimestampColumnCompareLongDoubleScalar.txt
+++ b/ql/src/gen/vectorization/ExpressionTemplates/TimestampColumnCompareLongDoubleScalar.txt
@@ -34,17 +34,21 @@ public class <ClassName> extends VectorExpression {
private static final long serialVersionUID = 1L;
- private int colNum;
- private <OperandType> value;
- private int outputColumn;
+ private final int colNum;
+ private final <OperandType> value;
- public <ClassName>(int colNum, <OperandType> value, int outputColumn) {
+ public <ClassName>(int colNum, <OperandType> value, int outputColumnNum) {
+ super(outputColumnNum);
this.colNum = colNum;
this.value = value;
- this.outputColumn = outputColumn;
}
public <ClassName>() {
+ super();
+
+ // Dummy final assignments.
+ colNum = -1;
+ value = 0;
}
@Override
@@ -55,7 +59,7 @@ public class <ClassName> extends VectorExpression {
}
TimestampColumnVector inputColVector = (TimestampColumnVector) batch.cols[colNum];
- LongColumnVector outputColVector = (LongColumnVector) batch.cols[outputColumn];
+ LongColumnVector outputColVector = (LongColumnVector) batch.cols[outputColumnNum];
int[] sel = batch.selected;
boolean[] nullPos = inputColVector.isNull;
boolean[] outNulls = outputColVector.isNull;
@@ -119,18 +123,8 @@ public class <ClassName> extends VectorExpression {
}
@Override
- public int getOutputColumn() {
- return outputColumn;
- }
-
- @Override
- public String getOutputType() {
- return "long";
- }
-
- @Override
public String vectorExpressionParameters() {
- return "col " + colNum + ", val " + value;
+ return getColumnParamString(0, colNum) + ", val " + value;
}
@Override
http://git-wip-us.apache.org/repos/asf/hive/blob/e63ebccc/ql/src/gen/vectorization/ExpressionTemplates/TimestampColumnCompareTimestampColumn.txt
----------------------------------------------------------------------
diff --git a/ql/src/gen/vectorization/ExpressionTemplates/TimestampColumnCompareTimestampColumn.txt b/ql/src/gen/vectorization/ExpressionTemplates/TimestampColumnCompareTimestampColumn.txt
index 2710fa4..0255ef3 100644
--- a/ql/src/gen/vectorization/ExpressionTemplates/TimestampColumnCompareTimestampColumn.txt
+++ b/ql/src/gen/vectorization/ExpressionTemplates/TimestampColumnCompareTimestampColumn.txt
@@ -35,17 +35,21 @@ public class <ClassName> extends VectorExpression {
private static final long serialVersionUID = 1L;
- private int colNum1;
- private int colNum2;
- private int outputColumn;
+ private final int colNum1;
+ private final int colNum2;
- public <ClassName>(int colNum1, int colNum2, int outputColumn) {
+ public <ClassName>(int colNum1, int colNum2, int outputColumnNum) {
+ super(outputColumnNum);
this.colNum1 = colNum1;
this.colNum2 = colNum2;
- this.outputColumn = outputColumn;
}
public <ClassName>() {
+ super();
+
+ // Dummy final assignments.
+ colNum1 = -1;
+ colNum2 = -1;
}
@Override
@@ -61,7 +65,7 @@ public class <ClassName> extends VectorExpression {
// Input #2 is type <OperandType>.
<InputColumnVectorType> inputColVector2 = (<InputColumnVectorType>) batch.cols[colNum2];
- LongColumnVector outputColVector = (LongColumnVector) batch.cols[outputColumn];
+ LongColumnVector outputColVector = (LongColumnVector) batch.cols[outputColumnNum];
int[] sel = batch.selected;
int n = batch.size;
long[] outputVector = outputColVector.vector;
@@ -133,18 +137,8 @@ public class <ClassName> extends VectorExpression {
}
@Override
- public int getOutputColumn() {
- return outputColumn;
- }
-
- @Override
- public String getOutputType() {
- return "long";
- }
-
- @Override
public String vectorExpressionParameters() {
- return "col " + colNum1 + ", col " + + colNum2;
+ return getColumnParamString(0, colNum1) + ", " + getColumnParamString(1, colNum2);
}
@Override
http://git-wip-us.apache.org/repos/asf/hive/blob/e63ebccc/ql/src/gen/vectorization/ExpressionTemplates/TimestampColumnCompareTimestampScalar.txt
----------------------------------------------------------------------
diff --git a/ql/src/gen/vectorization/ExpressionTemplates/TimestampColumnCompareTimestampScalar.txt b/ql/src/gen/vectorization/ExpressionTemplates/TimestampColumnCompareTimestampScalar.txt
index 32647f2..c1b0338 100644
--- a/ql/src/gen/vectorization/ExpressionTemplates/TimestampColumnCompareTimestampScalar.txt
+++ b/ql/src/gen/vectorization/ExpressionTemplates/TimestampColumnCompareTimestampScalar.txt
@@ -35,17 +35,21 @@ public class <ClassName> extends VectorExpression {
private static final long serialVersionUID = 1L;
- private int colNum;
- private <HiveOperandType> value;
- private int outputColumn;
+ private final int colNum;
+ private final <HiveOperandType> value;
- public <ClassName>(int colNum, <HiveOperandType> value, int outputColumn) {
+ public <ClassName>(int colNum, <HiveOperandType> value, int outputColumnNum) {
+ super(outputColumnNum);
this.colNum = colNum;
this.value = value;
- this.outputColumn = outputColumn;
}
public <ClassName>() {
+ super();
+
+ // Dummy final assignments.
+ colNum = -1;
+ value = null;
}
@Override
@@ -58,7 +62,7 @@ public class <ClassName> extends VectorExpression {
// Input #1 is type <OperandType>.
<InputColumnVectorType> inputColVector1 = (<InputColumnVectorType>) batch.cols[colNum];
- LongColumnVector outputColVector = (LongColumnVector) batch.cols[outputColumn];
+ LongColumnVector outputColVector = (LongColumnVector) batch.cols[outputColumnNum];
int[] sel = batch.selected;
boolean[] nullPos = inputColVector1.isNull;
@@ -123,18 +127,8 @@ public class <ClassName> extends VectorExpression {
}
@Override
- public int getOutputColumn() {
- return outputColumn;
- }
-
- @Override
- public String getOutputType() {
- return "long";
- }
-
- @Override
public String vectorExpressionParameters() {
- return "col " + colNum + ", val " + value.toString();
+ return getColumnParamString(0, colNum) + ", val " + value.toString();
}
@Override