commit 0ced545a56dc85931e28742146ff9525ce2ffdaf Author: Jitendra Pandey Date: Thu May 2 16:03:03 2013 -0700 Local Commit 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 b07a7a8..5728df0 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 @@ -70,4 +70,24 @@ final protected void evaluateChildren(VectorizedRowBatch vrg) { } } } -} + + @Override + public String toString() { + StringBuilder b = new StringBuilder(); + b.append(this.getClass().getSimpleName()); + b.append("["); + b.append(this.getOutputColumn()); + b.append("]"); + if (childExpressions != null) { + b.append("("); + for (int i = 0; i < childExpressions.length; i++) { + b.append(childExpressions[i].toString()); + if (i < childExpressions.length-1) { + b.append(" "); + } + } + b.append(")"); + } + return b.toString(); + } +} \ No newline at end of file diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/DoubleScalarAddDoubleColumn.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/DoubleScalarAddDoubleColumn.java index d4c9cac..3a14d22 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/DoubleScalarAddDoubleColumn.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/DoubleScalarAddDoubleColumn.java @@ -51,6 +51,11 @@ public DoubleScalarAddDoubleColumn(double value, int colNum, int outputColumn) { * @batch a package of rows with each column stored in a vector */ public void evaluate(VectorizedRowBatch batch) { + + if (childExpressions != null) { + super.evaluateChildren(batch); + } + DoubleColumnVector inputColVector = (DoubleColumnVector) batch.cols[colNum]; DoubleColumnVector outputColVector = (DoubleColumnVector) batch.cols[outputColumn]; int[] sel = batch.selected; diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/DoubleScalarAddLongColumn.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/DoubleScalarAddLongColumn.java index 98e532b..5362afb 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/DoubleScalarAddLongColumn.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/DoubleScalarAddLongColumn.java @@ -51,6 +51,11 @@ public DoubleScalarAddLongColumn(double value, int colNum, int outputColumn) { * @batch a package of rows with each column stored in a vector */ public void evaluate(VectorizedRowBatch batch) { + + if (childExpressions != null) { + super.evaluateChildren(batch); + } + LongColumnVector inputColVector = (LongColumnVector) batch.cols[colNum]; DoubleColumnVector outputColVector = (DoubleColumnVector) batch.cols[outputColumn]; int[] sel = batch.selected; diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/DoubleScalarDivideDoubleColumn.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/DoubleScalarDivideDoubleColumn.java index 62a04a9..faad560 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/DoubleScalarDivideDoubleColumn.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/DoubleScalarDivideDoubleColumn.java @@ -51,6 +51,11 @@ public DoubleScalarDivideDoubleColumn(double value, int colNum, int outputColumn * @batch a package of rows with each column stored in a vector */ public void evaluate(VectorizedRowBatch batch) { + + if (childExpressions != null) { + super.evaluateChildren(batch); + } + DoubleColumnVector inputColVector = (DoubleColumnVector) batch.cols[colNum]; DoubleColumnVector outputColVector = (DoubleColumnVector) batch.cols[outputColumn]; int[] sel = batch.selected; diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/DoubleScalarDivideLongColumn.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/DoubleScalarDivideLongColumn.java index 14f002e..5fe7419 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/DoubleScalarDivideLongColumn.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/DoubleScalarDivideLongColumn.java @@ -51,6 +51,11 @@ public DoubleScalarDivideLongColumn(double value, int colNum, int outputColumn) * @batch a package of rows with each column stored in a vector */ public void evaluate(VectorizedRowBatch batch) { + + if (childExpressions != null) { + super.evaluateChildren(batch); + } + LongColumnVector inputColVector = (LongColumnVector) batch.cols[colNum]; DoubleColumnVector outputColVector = (DoubleColumnVector) batch.cols[outputColumn]; int[] sel = batch.selected; diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/DoubleScalarModuloDoubleColumn.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/DoubleScalarModuloDoubleColumn.java index bb6768b..aa40b0d 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/DoubleScalarModuloDoubleColumn.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/DoubleScalarModuloDoubleColumn.java @@ -51,6 +51,11 @@ public DoubleScalarModuloDoubleColumn(double value, int colNum, int outputColumn * @batch a package of rows with each column stored in a vector */ public void evaluate(VectorizedRowBatch batch) { + + if (childExpressions != null) { + super.evaluateChildren(batch); + } + DoubleColumnVector inputColVector = (DoubleColumnVector) batch.cols[colNum]; DoubleColumnVector outputColVector = (DoubleColumnVector) batch.cols[outputColumn]; int[] sel = batch.selected; diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/DoubleScalarModuloLongColumn.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/DoubleScalarModuloLongColumn.java index 91ab41f..0add898 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/DoubleScalarModuloLongColumn.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/DoubleScalarModuloLongColumn.java @@ -51,6 +51,11 @@ public DoubleScalarModuloLongColumn(double value, int colNum, int outputColumn) * @batch a package of rows with each column stored in a vector */ public void evaluate(VectorizedRowBatch batch) { + + if (childExpressions != null) { + super.evaluateChildren(batch); + } + LongColumnVector inputColVector = (LongColumnVector) batch.cols[colNum]; DoubleColumnVector outputColVector = (DoubleColumnVector) batch.cols[outputColumn]; int[] sel = batch.selected; diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/DoubleScalarMultiplyDoubleColumn.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/DoubleScalarMultiplyDoubleColumn.java index 4b95c96..ad9128c 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/DoubleScalarMultiplyDoubleColumn.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/DoubleScalarMultiplyDoubleColumn.java @@ -51,6 +51,11 @@ public DoubleScalarMultiplyDoubleColumn(double value, int colNum, int outputColu * @batch a package of rows with each column stored in a vector */ public void evaluate(VectorizedRowBatch batch) { + + if (childExpressions != null) { + super.evaluateChildren(batch); + } + DoubleColumnVector inputColVector = (DoubleColumnVector) batch.cols[colNum]; DoubleColumnVector outputColVector = (DoubleColumnVector) batch.cols[outputColumn]; int[] sel = batch.selected; diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/DoubleScalarMultiplyLongColumn.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/DoubleScalarMultiplyLongColumn.java index e3b03ae..8edceea 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/DoubleScalarMultiplyLongColumn.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/DoubleScalarMultiplyLongColumn.java @@ -51,6 +51,11 @@ public DoubleScalarMultiplyLongColumn(double value, int colNum, int outputColumn * @batch a package of rows with each column stored in a vector */ public void evaluate(VectorizedRowBatch batch) { + + if (childExpressions != null) { + super.evaluateChildren(batch); + } + LongColumnVector inputColVector = (LongColumnVector) batch.cols[colNum]; DoubleColumnVector outputColVector = (DoubleColumnVector) batch.cols[outputColumn]; int[] sel = batch.selected; diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/DoubleScalarSubtractDoubleColumn.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/DoubleScalarSubtractDoubleColumn.java index 58fe68a..c17e612 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/DoubleScalarSubtractDoubleColumn.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/DoubleScalarSubtractDoubleColumn.java @@ -51,6 +51,11 @@ public DoubleScalarSubtractDoubleColumn(double value, int colNum, int outputColu * @batch a package of rows with each column stored in a vector */ public void evaluate(VectorizedRowBatch batch) { + + if (childExpressions != null) { + super.evaluateChildren(batch); + } + DoubleColumnVector inputColVector = (DoubleColumnVector) batch.cols[colNum]; DoubleColumnVector outputColVector = (DoubleColumnVector) batch.cols[outputColumn]; int[] sel = batch.selected; diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/DoubleScalarSubtractLongColumn.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/DoubleScalarSubtractLongColumn.java index beb14bf..4aae322 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/DoubleScalarSubtractLongColumn.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/DoubleScalarSubtractLongColumn.java @@ -51,6 +51,11 @@ public DoubleScalarSubtractLongColumn(double value, int colNum, int outputColumn * @batch a package of rows with each column stored in a vector */ public void evaluate(VectorizedRowBatch batch) { + + if (childExpressions != null) { + super.evaluateChildren(batch); + } + LongColumnVector inputColVector = (LongColumnVector) batch.cols[colNum]; DoubleColumnVector outputColVector = (DoubleColumnVector) batch.cols[outputColumn]; int[] sel = batch.selected; diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterDoubleColEqualDoubleColumn.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterDoubleColEqualDoubleColumn.java index 5bea910..c4b4c96 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterDoubleColEqualDoubleColumn.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterDoubleColEqualDoubleColumn.java @@ -33,6 +33,11 @@ public FilterDoubleColEqualDoubleColumn(int colNum1, int colNum2) { @Override public void evaluate(VectorizedRowBatch batch) { + + if (childExpressions != null) { + super.evaluateChildren(batch); + } + DoubleColumnVector inputColVector1 = (DoubleColumnVector) batch.cols[colNum1]; DoubleColumnVector inputColVector2 = (DoubleColumnVector) batch.cols[colNum2]; int[] sel = batch.selected; diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterDoubleColEqualLongColumn.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterDoubleColEqualLongColumn.java index 5f7e852..3a40761 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterDoubleColEqualLongColumn.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterDoubleColEqualLongColumn.java @@ -33,6 +33,11 @@ public FilterDoubleColEqualLongColumn(int colNum1, int colNum2) { @Override public void evaluate(VectorizedRowBatch batch) { + + if (childExpressions != null) { + super.evaluateChildren(batch); + } + DoubleColumnVector inputColVector1 = (DoubleColumnVector) batch.cols[colNum1]; LongColumnVector inputColVector2 = (LongColumnVector) batch.cols[colNum2]; int[] sel = batch.selected; diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterDoubleColGreaterDoubleColumn.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterDoubleColGreaterDoubleColumn.java index 3df0389..020cc2d 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterDoubleColGreaterDoubleColumn.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterDoubleColGreaterDoubleColumn.java @@ -33,6 +33,11 @@ public FilterDoubleColGreaterDoubleColumn(int colNum1, int colNum2) { @Override public void evaluate(VectorizedRowBatch batch) { + + if (childExpressions != null) { + super.evaluateChildren(batch); + } + DoubleColumnVector inputColVector1 = (DoubleColumnVector) batch.cols[colNum1]; DoubleColumnVector inputColVector2 = (DoubleColumnVector) batch.cols[colNum2]; int[] sel = batch.selected; diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterDoubleColGreaterEqualDoubleColumn.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterDoubleColGreaterEqualDoubleColumn.java index 2167256..cd7b052 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterDoubleColGreaterEqualDoubleColumn.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterDoubleColGreaterEqualDoubleColumn.java @@ -33,6 +33,11 @@ public FilterDoubleColGreaterEqualDoubleColumn(int colNum1, int colNum2) { @Override public void evaluate(VectorizedRowBatch batch) { + + if (childExpressions != null) { + super.evaluateChildren(batch); + } + DoubleColumnVector inputColVector1 = (DoubleColumnVector) batch.cols[colNum1]; DoubleColumnVector inputColVector2 = (DoubleColumnVector) batch.cols[colNum2]; int[] sel = batch.selected; diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterDoubleColGreaterEqualLongColumn.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterDoubleColGreaterEqualLongColumn.java index fdeed9a..de65022 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterDoubleColGreaterEqualLongColumn.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterDoubleColGreaterEqualLongColumn.java @@ -33,6 +33,11 @@ public FilterDoubleColGreaterEqualLongColumn(int colNum1, int colNum2) { @Override public void evaluate(VectorizedRowBatch batch) { + + if (childExpressions != null) { + super.evaluateChildren(batch); + } + DoubleColumnVector inputColVector1 = (DoubleColumnVector) batch.cols[colNum1]; LongColumnVector inputColVector2 = (LongColumnVector) batch.cols[colNum2]; int[] sel = batch.selected; diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterDoubleColGreaterLongColumn.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterDoubleColGreaterLongColumn.java index 8616032..5e7fcf1 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterDoubleColGreaterLongColumn.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterDoubleColGreaterLongColumn.java @@ -33,6 +33,11 @@ public FilterDoubleColGreaterLongColumn(int colNum1, int colNum2) { @Override public void evaluate(VectorizedRowBatch batch) { + + if (childExpressions != null) { + super.evaluateChildren(batch); + } + DoubleColumnVector inputColVector1 = (DoubleColumnVector) batch.cols[colNum1]; LongColumnVector inputColVector2 = (LongColumnVector) batch.cols[colNum2]; int[] sel = batch.selected; diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterDoubleColLessDoubleColumn.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterDoubleColLessDoubleColumn.java index 224e154..0c06e21 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterDoubleColLessDoubleColumn.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterDoubleColLessDoubleColumn.java @@ -33,6 +33,11 @@ public FilterDoubleColLessDoubleColumn(int colNum1, int colNum2) { @Override public void evaluate(VectorizedRowBatch batch) { + + if (childExpressions != null) { + super.evaluateChildren(batch); + } + DoubleColumnVector inputColVector1 = (DoubleColumnVector) batch.cols[colNum1]; DoubleColumnVector inputColVector2 = (DoubleColumnVector) batch.cols[colNum2]; int[] sel = batch.selected; diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterDoubleColLessEqualDoubleColumn.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterDoubleColLessEqualDoubleColumn.java index 46a349f..958a4c1 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterDoubleColLessEqualDoubleColumn.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterDoubleColLessEqualDoubleColumn.java @@ -33,6 +33,11 @@ public FilterDoubleColLessEqualDoubleColumn(int colNum1, int colNum2) { @Override public void evaluate(VectorizedRowBatch batch) { + + if (childExpressions != null) { + super.evaluateChildren(batch); + } + DoubleColumnVector inputColVector1 = (DoubleColumnVector) batch.cols[colNum1]; DoubleColumnVector inputColVector2 = (DoubleColumnVector) batch.cols[colNum2]; int[] sel = batch.selected; diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterDoubleColLessEqualLongColumn.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterDoubleColLessEqualLongColumn.java index bf286c4..deabf10 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterDoubleColLessEqualLongColumn.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterDoubleColLessEqualLongColumn.java @@ -33,6 +33,11 @@ public FilterDoubleColLessEqualLongColumn(int colNum1, int colNum2) { @Override public void evaluate(VectorizedRowBatch batch) { + + if (childExpressions != null) { + super.evaluateChildren(batch); + } + DoubleColumnVector inputColVector1 = (DoubleColumnVector) batch.cols[colNum1]; LongColumnVector inputColVector2 = (LongColumnVector) batch.cols[colNum2]; int[] sel = batch.selected; diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterDoubleColLessLongColumn.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterDoubleColLessLongColumn.java index 465b2d5..bd13f7b 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterDoubleColLessLongColumn.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterDoubleColLessLongColumn.java @@ -33,6 +33,11 @@ public FilterDoubleColLessLongColumn(int colNum1, int colNum2) { @Override public void evaluate(VectorizedRowBatch batch) { + + if (childExpressions != null) { + super.evaluateChildren(batch); + } + DoubleColumnVector inputColVector1 = (DoubleColumnVector) batch.cols[colNum1]; LongColumnVector inputColVector2 = (LongColumnVector) batch.cols[colNum2]; int[] sel = batch.selected; diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterDoubleColNotEqualDoubleColumn.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterDoubleColNotEqualDoubleColumn.java index 305697b..8f3faee 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterDoubleColNotEqualDoubleColumn.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterDoubleColNotEqualDoubleColumn.java @@ -33,6 +33,11 @@ public FilterDoubleColNotEqualDoubleColumn(int colNum1, int colNum2) { @Override public void evaluate(VectorizedRowBatch batch) { + + if (childExpressions != null) { + super.evaluateChildren(batch); + } + DoubleColumnVector inputColVector1 = (DoubleColumnVector) batch.cols[colNum1]; DoubleColumnVector inputColVector2 = (DoubleColumnVector) batch.cols[colNum2]; int[] sel = batch.selected; diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterDoubleColNotEqualLongColumn.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterDoubleColNotEqualLongColumn.java index 5fe7e7d..130723a 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterDoubleColNotEqualLongColumn.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterDoubleColNotEqualLongColumn.java @@ -33,6 +33,11 @@ public FilterDoubleColNotEqualLongColumn(int colNum1, int colNum2) { @Override public void evaluate(VectorizedRowBatch batch) { + + if (childExpressions != null) { + super.evaluateChildren(batch); + } + DoubleColumnVector inputColVector1 = (DoubleColumnVector) batch.cols[colNum1]; LongColumnVector inputColVector2 = (LongColumnVector) batch.cols[colNum2]; int[] sel = batch.selected; diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterLongColEqualDoubleColumn.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterLongColEqualDoubleColumn.java index 0f9ea13..d06bb0c 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterLongColEqualDoubleColumn.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterLongColEqualDoubleColumn.java @@ -33,6 +33,11 @@ public FilterLongColEqualDoubleColumn(int colNum1, int colNum2) { @Override public void evaluate(VectorizedRowBatch batch) { + + if (childExpressions != null) { + super.evaluateChildren(batch); + } + LongColumnVector inputColVector1 = (LongColumnVector) batch.cols[colNum1]; DoubleColumnVector inputColVector2 = (DoubleColumnVector) batch.cols[colNum2]; int[] sel = batch.selected; diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterLongColEqualLongColumn.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterLongColEqualLongColumn.java index b912adc..36a6b92 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterLongColEqualLongColumn.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterLongColEqualLongColumn.java @@ -33,6 +33,11 @@ public FilterLongColEqualLongColumn(int colNum1, int colNum2) { @Override public void evaluate(VectorizedRowBatch batch) { + + if (childExpressions != null) { + super.evaluateChildren(batch); + } + LongColumnVector inputColVector1 = (LongColumnVector) batch.cols[colNum1]; LongColumnVector inputColVector2 = (LongColumnVector) batch.cols[colNum2]; int[] sel = batch.selected; diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterLongColGreaterDoubleColumn.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterLongColGreaterDoubleColumn.java index 80f70f5..6c96b96 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterLongColGreaterDoubleColumn.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterLongColGreaterDoubleColumn.java @@ -33,6 +33,11 @@ public FilterLongColGreaterDoubleColumn(int colNum1, int colNum2) { @Override public void evaluate(VectorizedRowBatch batch) { + + if (childExpressions != null) { + super.evaluateChildren(batch); + } + LongColumnVector inputColVector1 = (LongColumnVector) batch.cols[colNum1]; DoubleColumnVector inputColVector2 = (DoubleColumnVector) batch.cols[colNum2]; int[] sel = batch.selected; diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterLongColGreaterEqualDoubleColumn.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterLongColGreaterEqualDoubleColumn.java index 200f60f..3b85914 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterLongColGreaterEqualDoubleColumn.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterLongColGreaterEqualDoubleColumn.java @@ -33,6 +33,11 @@ public FilterLongColGreaterEqualDoubleColumn(int colNum1, int colNum2) { @Override public void evaluate(VectorizedRowBatch batch) { + + if (childExpressions != null) { + super.evaluateChildren(batch); + } + LongColumnVector inputColVector1 = (LongColumnVector) batch.cols[colNum1]; DoubleColumnVector inputColVector2 = (DoubleColumnVector) batch.cols[colNum2]; int[] sel = batch.selected; diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterLongColGreaterEqualLongColumn.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterLongColGreaterEqualLongColumn.java index 90b7984..d6144d2 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterLongColGreaterEqualLongColumn.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterLongColGreaterEqualLongColumn.java @@ -33,6 +33,11 @@ public FilterLongColGreaterEqualLongColumn(int colNum1, int colNum2) { @Override public void evaluate(VectorizedRowBatch batch) { + + if (childExpressions != null) { + super.evaluateChildren(batch); + } + LongColumnVector inputColVector1 = (LongColumnVector) batch.cols[colNum1]; LongColumnVector inputColVector2 = (LongColumnVector) batch.cols[colNum2]; int[] sel = batch.selected; diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterLongColGreaterLongColumn.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterLongColGreaterLongColumn.java index e11e690..822e584 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterLongColGreaterLongColumn.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterLongColGreaterLongColumn.java @@ -33,6 +33,11 @@ public FilterLongColGreaterLongColumn(int colNum1, int colNum2) { @Override public void evaluate(VectorizedRowBatch batch) { + + if (childExpressions != null) { + super.evaluateChildren(batch); + } + LongColumnVector inputColVector1 = (LongColumnVector) batch.cols[colNum1]; LongColumnVector inputColVector2 = (LongColumnVector) batch.cols[colNum2]; int[] sel = batch.selected; diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterLongColLessDoubleColumn.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterLongColLessDoubleColumn.java index 863fd1f..13555fe 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterLongColLessDoubleColumn.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterLongColLessDoubleColumn.java @@ -33,6 +33,11 @@ public FilterLongColLessDoubleColumn(int colNum1, int colNum2) { @Override public void evaluate(VectorizedRowBatch batch) { + + if (childExpressions != null) { + super.evaluateChildren(batch); + } + LongColumnVector inputColVector1 = (LongColumnVector) batch.cols[colNum1]; DoubleColumnVector inputColVector2 = (DoubleColumnVector) batch.cols[colNum2]; int[] sel = batch.selected; diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterLongColLessEqualDoubleColumn.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterLongColLessEqualDoubleColumn.java index 123fe1a..96afae4 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterLongColLessEqualDoubleColumn.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterLongColLessEqualDoubleColumn.java @@ -33,6 +33,11 @@ public FilterLongColLessEqualDoubleColumn(int colNum1, int colNum2) { @Override public void evaluate(VectorizedRowBatch batch) { + + if (childExpressions != null) { + super.evaluateChildren(batch); + } + LongColumnVector inputColVector1 = (LongColumnVector) batch.cols[colNum1]; DoubleColumnVector inputColVector2 = (DoubleColumnVector) batch.cols[colNum2]; int[] sel = batch.selected; diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterLongColLessEqualLongColumn.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterLongColLessEqualLongColumn.java index 300ae29..91609aa 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterLongColLessEqualLongColumn.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterLongColLessEqualLongColumn.java @@ -33,6 +33,11 @@ public FilterLongColLessEqualLongColumn(int colNum1, int colNum2) { @Override public void evaluate(VectorizedRowBatch batch) { + + if (childExpressions != null) { + super.evaluateChildren(batch); + } + LongColumnVector inputColVector1 = (LongColumnVector) batch.cols[colNum1]; LongColumnVector inputColVector2 = (LongColumnVector) batch.cols[colNum2]; int[] sel = batch.selected; diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterLongColLessLongColumn.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterLongColLessLongColumn.java index 52cc0a7..4f2aec5 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterLongColLessLongColumn.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterLongColLessLongColumn.java @@ -33,6 +33,11 @@ public FilterLongColLessLongColumn(int colNum1, int colNum2) { @Override public void evaluate(VectorizedRowBatch batch) { + + if (childExpressions != null) { + super.evaluateChildren(batch); + } + LongColumnVector inputColVector1 = (LongColumnVector) batch.cols[colNum1]; LongColumnVector inputColVector2 = (LongColumnVector) batch.cols[colNum2]; int[] sel = batch.selected; diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterLongColNotEqualDoubleColumn.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterLongColNotEqualDoubleColumn.java index 9503a02..acc9d20 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterLongColNotEqualDoubleColumn.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterLongColNotEqualDoubleColumn.java @@ -33,6 +33,11 @@ public FilterLongColNotEqualDoubleColumn(int colNum1, int colNum2) { @Override public void evaluate(VectorizedRowBatch batch) { + + if (childExpressions != null) { + super.evaluateChildren(batch); + } + LongColumnVector inputColVector1 = (LongColumnVector) batch.cols[colNum1]; DoubleColumnVector inputColVector2 = (DoubleColumnVector) batch.cols[colNum2]; int[] sel = batch.selected; diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterLongColNotEqualLongColumn.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterLongColNotEqualLongColumn.java index a818cce..b8e71dd 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterLongColNotEqualLongColumn.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterLongColNotEqualLongColumn.java @@ -33,6 +33,11 @@ public FilterLongColNotEqualLongColumn(int colNum1, int colNum2) { @Override public void evaluate(VectorizedRowBatch batch) { + + if (childExpressions != null) { + super.evaluateChildren(batch); + } + LongColumnVector inputColVector1 = (LongColumnVector) batch.cols[colNum1]; LongColumnVector inputColVector2 = (LongColumnVector) batch.cols[colNum2]; int[] sel = batch.selected; diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterStringColEqualStringScalar.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterStringColEqualStringScalar.java index 439117d..e337223 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterStringColEqualStringScalar.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterStringColEqualStringScalar.java @@ -37,6 +37,9 @@ public FilterStringColEqualStringScalar(int colNum, byte[] value) { @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; diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterStringColGreaterEqualStringScalar.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterStringColGreaterEqualStringScalar.java index fad9131..601150b 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterStringColGreaterEqualStringScalar.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterStringColGreaterEqualStringScalar.java @@ -37,6 +37,9 @@ public FilterStringColGreaterEqualStringScalar(int colNum, byte[] value) { @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; 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 fa2237a..2915593 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 @@ -37,6 +37,9 @@ public FilterStringColGreaterStringScalar(int colNum, byte[] value) { @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; 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 519616b..01d1bd0 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 @@ -37,6 +37,9 @@ public FilterStringColLessEqualStringScalar(int colNum, byte[] value) { @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; 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 d96d1d5..9ae70ce 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 @@ -37,6 +37,9 @@ public FilterStringColLessStringScalar(int colNum, byte[] value) { @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; 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 250e18a..e5996c9 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 @@ -37,6 +37,9 @@ public FilterStringColNotEqualStringScalar(int colNum, byte[] value) { @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; 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 e8733bb..a0fd2c7 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 @@ -51,6 +51,11 @@ public LongScalarAddDoubleColumn(long value, int colNum, int outputColumn) { * @batch a package of rows with each column stored in a vector */ public void evaluate(VectorizedRowBatch batch) { + + if (childExpressions != null) { + super.evaluateChildren(batch); + } + DoubleColumnVector inputColVector = (DoubleColumnVector) batch.cols[colNum]; DoubleColumnVector outputColVector = (DoubleColumnVector) batch.cols[outputColumn]; int[] sel = batch.selected; 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 0dc85d5..b016d56 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 @@ -51,6 +51,11 @@ public LongScalarAddLongColumn(long value, int colNum, int outputColumn) { * @batch a package of rows with each column stored in a vector */ public void evaluate(VectorizedRowBatch batch) { + + if (childExpressions != null) { + super.evaluateChildren(batch); + } + LongColumnVector inputColVector = (LongColumnVector) batch.cols[colNum]; LongColumnVector outputColVector = (LongColumnVector) batch.cols[outputColumn]; int[] sel = batch.selected; 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 3ce218f..461c294 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 @@ -51,6 +51,11 @@ public LongScalarDivideDoubleColumn(long value, int colNum, int outputColumn) { * @batch a package of rows with each column stored in a vector */ public void evaluate(VectorizedRowBatch batch) { + + if (childExpressions != null) { + super.evaluateChildren(batch); + } + DoubleColumnVector inputColVector = (DoubleColumnVector) batch.cols[colNum]; DoubleColumnVector outputColVector = (DoubleColumnVector) batch.cols[outputColumn]; int[] sel = batch.selected; diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/LongScalarDivideLongColumn.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/LongScalarDivideLongColumn.java index 4a7df71..a67df6f 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/LongScalarDivideLongColumn.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/LongScalarDivideLongColumn.java @@ -51,6 +51,11 @@ public LongScalarDivideLongColumn(long value, int colNum, int outputColumn) { * @batch a package of rows with each column stored in a vector */ public void evaluate(VectorizedRowBatch batch) { + + if (childExpressions != null) { + super.evaluateChildren(batch); + } + LongColumnVector inputColVector = (LongColumnVector) batch.cols[colNum]; LongColumnVector outputColVector = (LongColumnVector) batch.cols[outputColumn]; int[] sel = batch.selected; 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 4acda1d..1c06e79 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 @@ -51,6 +51,11 @@ public LongScalarModuloDoubleColumn(long value, int colNum, int outputColumn) { * @batch a package of rows with each column stored in a vector */ public void evaluate(VectorizedRowBatch batch) { + + if (childExpressions != null) { + super.evaluateChildren(batch); + } + DoubleColumnVector inputColVector = (DoubleColumnVector) batch.cols[colNum]; DoubleColumnVector outputColVector = (DoubleColumnVector) batch.cols[outputColumn]; int[] sel = batch.selected; 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 f66d8d1..66eadb0 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 @@ -51,6 +51,11 @@ public LongScalarModuloLongColumn(long value, int colNum, int outputColumn) { * @batch a package of rows with each column stored in a vector */ public void evaluate(VectorizedRowBatch batch) { + + if (childExpressions != null) { + super.evaluateChildren(batch); + } + LongColumnVector inputColVector = (LongColumnVector) batch.cols[colNum]; LongColumnVector outputColVector = (LongColumnVector) batch.cols[outputColumn]; int[] sel = batch.selected; 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 70424bd..90d626c 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 @@ -51,6 +51,11 @@ public LongScalarMultiplyDoubleColumn(long value, int colNum, int outputColumn) * @batch a package of rows with each column stored in a vector */ public void evaluate(VectorizedRowBatch batch) { + + if (childExpressions != null) { + super.evaluateChildren(batch); + } + DoubleColumnVector inputColVector = (DoubleColumnVector) batch.cols[colNum]; DoubleColumnVector outputColVector = (DoubleColumnVector) batch.cols[outputColumn]; int[] sel = batch.selected; 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 9526ece..681ded9 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 @@ -51,6 +51,11 @@ public LongScalarMultiplyLongColumn(long value, int colNum, int outputColumn) { * @batch a package of rows with each column stored in a vector */ public void evaluate(VectorizedRowBatch batch) { + + if (childExpressions != null) { + super.evaluateChildren(batch); + } + LongColumnVector inputColVector = (LongColumnVector) batch.cols[colNum]; LongColumnVector outputColVector = (LongColumnVector) batch.cols[outputColumn]; int[] sel = batch.selected; 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 b635775..6d7c003 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 @@ -51,6 +51,11 @@ public LongScalarSubtractDoubleColumn(long value, int colNum, int outputColumn) * @batch a package of rows with each column stored in a vector */ public void evaluate(VectorizedRowBatch batch) { + + if (childExpressions != null) { + super.evaluateChildren(batch); + } + DoubleColumnVector inputColVector = (DoubleColumnVector) batch.cols[colNum]; DoubleColumnVector outputColVector = (DoubleColumnVector) batch.cols[outputColumn]; int[] sel = batch.selected; 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 896ff06..0689b83 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 @@ -51,6 +51,11 @@ public LongScalarSubtractLongColumn(long value, int colNum, int outputColumn) { * @batch a package of rows with each column stored in a vector */ public void evaluate(VectorizedRowBatch batch) { + + if (childExpressions != null) { + super.evaluateChildren(batch); + } + LongColumnVector inputColVector = (LongColumnVector) batch.cols[colNum]; LongColumnVector outputColVector = (LongColumnVector) batch.cols[outputColumn]; int[] sel = batch.selected; 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 76362ba..8e3b717 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 @@ -33,6 +33,11 @@ public class extends VectorExpression { @Override public void evaluate(VectorizedRowBatch batch) { + + if (childExpressions != null) { + super.evaluateChildren(batch); + } + inputColVector1 = () batch.cols[colNum1]; inputColVector2 = () batch.cols[colNum2]; int[] sel = batch.selected; 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 eb2dc36..30eddcf 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 @@ -37,6 +37,9 @@ public class extends VectorExpression { @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; 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 75f300d..9899e7e 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 @@ -51,6 +51,11 @@ public class extends VectorExpression { * @batch a package of rows with each column stored in a vector */ public void evaluate(VectorizedRowBatch batch) { + + if (childExpressions != null) { + super.evaluateChildren(batch); + } + inputColVector = () batch.cols[colNum]; outputColVector = () batch.cols[outputColumn]; int[] sel = batch.selected; diff --git ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorFilterExpressions.java ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorFilterExpressions.java index 1739976..1ac1378 100644 --- ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorFilterExpressions.java +++ ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorFilterExpressions.java @@ -25,6 +25,8 @@ import org.apache.hadoop.hive.ql.exec.vector.expressions.gen.FilterLongColEqualLongScalar; import org.apache.hadoop.hive.ql.exec.vector.expressions.gen.FilterLongColGreaterLongColumn; import org.apache.hadoop.hive.ql.exec.vector.expressions.gen.FilterLongColGreaterLongScalar; +import org.apache.hadoop.hive.ql.exec.vector.expressions.gen.FilterLongColLessLongColumn; +import org.apache.hadoop.hive.ql.exec.vector.expressions.gen.LongColAddLongScalar; import org.junit.Assert; import org.junit.Test; @@ -132,4 +134,44 @@ private VectorizedRowBatch getSimpleLongBatch() { lcv0.vector[3] = 3; return batch; } + + @Test + public void testFilterLongColLessLongColumn() { + int seed = 17; + VectorizedRowBatch vrg = VectorizedRowGroupGenUtil.getVectorizedRowBatch( + 5, 3, seed); + LongColumnVector lcv0 = (LongColumnVector) vrg.cols[0]; + LongColumnVector lcv1 = (LongColumnVector) vrg.cols[1]; + LongColumnVector lcv2 = (LongColumnVector) vrg.cols[2]; + FilterLongColLessLongColumn expr = new FilterLongColLessLongColumn(2, 1); + + LongColAddLongScalar childExpr = new LongColAddLongScalar(0, 10, 2); + + expr.setChildExpressions(new VectorExpression[] {childExpr}); + + //Basic case + lcv0.vector[0] = 10; + lcv0.vector[1] = 20; + lcv0.vector[2] = 10; + lcv0.vector[3] = 20; + lcv0.vector[4] = 10; + + lcv1.vector[0] = 20; + lcv1.vector[1] = 10; + lcv1.vector[2] = 20; + lcv1.vector[3] = 10; + lcv1.vector[4] = 20; + + childExpr.evaluate(vrg); + + assertEquals(20, lcv2.vector[0]); + assertEquals(30, lcv2.vector[1]); + assertEquals(20, lcv2.vector[2]); + assertEquals(30, lcv2.vector[3]); + assertEquals(20, lcv2.vector[4]); + + expr.evaluate(vrg); + + assertEquals(0, vrg.size); + } }