diff --git common/src/java/org/apache/hadoop/hive/conf/HiveConf.java common/src/java/org/apache/hadoop/hive/conf/HiveConf.java index 6358ff3..7d99cf5 100644 --- common/src/java/org/apache/hadoop/hive/conf/HiveConf.java +++ common/src/java/org/apache/hadoop/hive/conf/HiveConf.java @@ -3536,6 +3536,10 @@ private static void populateLlapDaemonVarsSet(Set llapDaemonVarsSetLocal "This flag should be set to true to use overflow checked vector expressions when available.\n" + "For example, arithmetic expressions which can overflow the output data type can be evaluated using\n" + " checked vector expressions so that they produce same result as non-vectorized evaluation."), + HIVE_VECTORIZED_ADAPTOR_SUPPRESS_EVALUATE_EXCEPTIONS( + "hive.vectorized.adaptor.suppress.evaluate.exceptions", false, + "This flag should be set to true to suppress HiveException from the generic UDF function\n" + + "evaluate call and turn them into NULLs. Assume, by default, this is not needed"), HIVE_VECTORIZED_INPUT_FORMAT_SUPPORTS_ENABLED( "hive.vectorized.input.format.supports.enabled", "decimal_64", diff --git itests/hive-jmh/src/main/java/org/apache/hive/benchmark/vectorization/AbstractExpression.java itests/hive-jmh/src/main/java/org/apache/hive/benchmark/vectorization/AbstractExpression.java index 681f173..b23d071 100644 --- itests/hive-jmh/src/main/java/org/apache/hive/benchmark/vectorization/AbstractExpression.java +++ itests/hive-jmh/src/main/java/org/apache/hive/benchmark/vectorization/AbstractExpression.java @@ -22,6 +22,7 @@ import org.apache.hadoop.hive.ql.exec.vector.LongColumnVector; import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch; import org.apache.hadoop.hive.ql.exec.vector.expressions.VectorExpression; +import org.apache.hadoop.hive.ql.metadata.HiveException; import org.openjdk.jmh.annotations.Benchmark; import org.openjdk.jmh.annotations.BenchmarkMode; import org.openjdk.jmh.annotations.Fork; @@ -58,7 +59,7 @@ protected VectorizedRowBatch buildRowBatch(ColumnVector output, int colNum, Colu @Benchmark @Warmup(iterations = 2, time = 2, timeUnit = TimeUnit.MILLISECONDS) @Measurement(iterations = 2, time = 2, timeUnit = TimeUnit.MILLISECONDS) - public void bench() { + public void bench() throws HiveException { for (int i = 0; i < DEFAULT_ITER_TIME; i++) { rowBatch.selectedInUse = false; rowBatch.size = VectorizedRowBatch.DEFAULT_SIZE; diff --git ql/src/gen/vectorization/ExpressionTemplates/ColumnArithmeticColumn.txt ql/src/gen/vectorization/ExpressionTemplates/ColumnArithmeticColumn.txt index cb29953..f4a95ac 100644 --- ql/src/gen/vectorization/ExpressionTemplates/ColumnArithmeticColumn.txt +++ ql/src/gen/vectorization/ExpressionTemplates/ColumnArithmeticColumn.txt @@ -24,6 +24,7 @@ import org.apache.hadoop.hive.ql.exec.vector.expressions.NullUtil; import org.apache.hadoop.hive.ql.exec.vector.*; import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch; import org.apache.hadoop.hive.ql.exec.vector.VectorExpressionDescriptor; +import org.apache.hadoop.hive.ql.metadata.HiveException; /** * Generated from template ColumnArithmeticColumn.txt, which covers binary arithmetic @@ -51,7 +52,7 @@ public class extends VectorExpression { } @Override - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { // return immediately if batch is empty final int n = batch.size; diff --git ql/src/gen/vectorization/ExpressionTemplates/ColumnArithmeticColumnDecimal.txt ql/src/gen/vectorization/ExpressionTemplates/ColumnArithmeticColumnDecimal.txt index d7c7fb4..23ede32 100644 --- ql/src/gen/vectorization/ExpressionTemplates/ColumnArithmeticColumnDecimal.txt +++ ql/src/gen/vectorization/ExpressionTemplates/ColumnArithmeticColumnDecimal.txt @@ -25,6 +25,7 @@ import org.apache.hadoop.hive.ql.exec.vector.expressions.NullUtil; import org.apache.hadoop.hive.ql.exec.vector.expressions.DecimalUtil; import org.apache.hadoop.hive.ql.exec.vector.VectorExpressionDescriptor; import org.apache.hadoop.hive.serde2.io.HiveDecimalWritable; +import org.apache.hadoop.hive.ql.metadata.HiveException; /** * Generated from template ColumnArithmeticColumnDecimal.txt, which covers binary arithmetic @@ -52,7 +53,7 @@ public class extends VectorExpression { } @Override - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { // return immediately if batch is empty final int n = batch.size; diff --git ql/src/gen/vectorization/ExpressionTemplates/ColumnArithmeticScalar.txt ql/src/gen/vectorization/ExpressionTemplates/ColumnArithmeticScalar.txt index 00b8d96..cd1e46a 100644 --- ql/src/gen/vectorization/ExpressionTemplates/ColumnArithmeticScalar.txt +++ ql/src/gen/vectorization/ExpressionTemplates/ColumnArithmeticScalar.txt @@ -27,6 +27,7 @@ import org.apache.hadoop.hive.ql.exec.vector.; import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch; import org.apache.hadoop.hive.ql.exec.vector.expressions.NullUtil; import org.apache.hadoop.hive.ql.exec.vector.VectorExpressionDescriptor; +import org.apache.hadoop.hive.ql.metadata.HiveException; /** * Generated from template ColumnArithmeticScalar.txt, which covers binary arithmetic @@ -54,7 +55,7 @@ public class extends VectorExpression { } @Override - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { // return immediately if batch is empty final int n = batch.size; diff --git ql/src/gen/vectorization/ExpressionTemplates/ColumnArithmeticScalarDecimal.txt ql/src/gen/vectorization/ExpressionTemplates/ColumnArithmeticScalarDecimal.txt index 9d0365e..1824edb 100644 --- ql/src/gen/vectorization/ExpressionTemplates/ColumnArithmeticScalarDecimal.txt +++ ql/src/gen/vectorization/ExpressionTemplates/ColumnArithmeticScalarDecimal.txt @@ -27,6 +27,7 @@ import org.apache.hadoop.hive.ql.exec.vector.expressions.DecimalUtil; import org.apache.hadoop.hive.ql.exec.vector.VectorExpressionDescriptor; import org.apache.hadoop.hive.serde2.io.HiveDecimalWritable; import org.apache.hadoop.hive.common.type.HiveDecimal; +import org.apache.hadoop.hive.ql.metadata.HiveException; /** * Generated from template ColumnArithmeticScalarDecimal.txt, which covers binary arithmetic @@ -54,7 +55,7 @@ public class extends VectorExpression { } @Override - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { // return immediately if batch is empty final int n = batch.size; diff --git ql/src/gen/vectorization/ExpressionTemplates/ColumnCompareColumn.txt ql/src/gen/vectorization/ExpressionTemplates/ColumnCompareColumn.txt index 14a0993..56d96b8 100644 --- ql/src/gen/vectorization/ExpressionTemplates/ColumnCompareColumn.txt +++ ql/src/gen/vectorization/ExpressionTemplates/ColumnCompareColumn.txt @@ -23,6 +23,7 @@ import org.apache.hadoop.hive.ql.exec.vector.expressions.NullUtil; import org.apache.hadoop.hive.ql.exec.vector.*; import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch; import org.apache.hadoop.hive.ql.exec.vector.VectorExpressionDescriptor; +import org.apache.hadoop.hive.ql.metadata.HiveException; /** * Generated from template ColumnArithmeticColumn.txt, which covers binary arithmetic @@ -50,7 +51,7 @@ public class extends VectorExpression { } @Override - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { // return immediately if batch is empty final int n = batch.size; diff --git ql/src/gen/vectorization/ExpressionTemplates/ColumnCompareScalar.txt ql/src/gen/vectorization/ExpressionTemplates/ColumnCompareScalar.txt index 79b1bbd..9556066 100644 --- ql/src/gen/vectorization/ExpressionTemplates/ColumnCompareScalar.txt +++ ql/src/gen/vectorization/ExpressionTemplates/ColumnCompareScalar.txt @@ -25,6 +25,7 @@ import org.apache.hadoop.hive.ql.exec.vector.; import org.apache.hadoop.hive.ql.exec.vector.; import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch; import org.apache.hadoop.hive.ql.exec.vector.VectorExpressionDescriptor; +import org.apache.hadoop.hive.ql.metadata.HiveException; /** * Generated from template ColumnCompareScalar.txt, which covers binary comparison @@ -53,7 +54,7 @@ public class extends VectorExpression { } @Override - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { // return immediately if batch is empty final int n = batch.size; diff --git ql/src/gen/vectorization/ExpressionTemplates/ColumnDivideColumn.txt ql/src/gen/vectorization/ExpressionTemplates/ColumnDivideColumn.txt index 1e20dba..c4a76ae 100644 --- ql/src/gen/vectorization/ExpressionTemplates/ColumnDivideColumn.txt +++ ql/src/gen/vectorization/ExpressionTemplates/ColumnDivideColumn.txt @@ -24,6 +24,7 @@ import org.apache.hadoop.hive.ql.exec.vector.expressions.NullUtil; import org.apache.hadoop.hive.ql.exec.vector.*; import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch; import org.apache.hadoop.hive.ql.exec.vector.VectorExpressionDescriptor; +import org.apache.hadoop.hive.ql.metadata.HiveException; /** * Generated from template ColumnDivideColumn.txt, which covers division and modulo @@ -51,7 +52,7 @@ public class extends VectorExpression { } @Override - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { // return immediately if batch is empty final int n = batch.size; diff --git ql/src/gen/vectorization/ExpressionTemplates/ColumnDivideColumnDecimal.txt ql/src/gen/vectorization/ExpressionTemplates/ColumnDivideColumnDecimal.txt index c8a2665..8faf095 100644 --- ql/src/gen/vectorization/ExpressionTemplates/ColumnDivideColumnDecimal.txt +++ ql/src/gen/vectorization/ExpressionTemplates/ColumnDivideColumnDecimal.txt @@ -25,6 +25,7 @@ import org.apache.hadoop.hive.ql.exec.vector.expressions.NullUtil; import org.apache.hadoop.hive.ql.exec.vector.expressions.DecimalUtil; import org.apache.hadoop.hive.ql.exec.vector.VectorExpressionDescriptor; import org.apache.hadoop.hive.serde2.io.HiveDecimalWritable; +import org.apache.hadoop.hive.ql.metadata.HiveException; /** * Generated from template ColumnArithmeticColumnDecimal.txt, which covers binary arithmetic @@ -52,7 +53,7 @@ public class extends VectorExpression { } @Override - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { // return immediately if batch is empty final int n = batch.size; diff --git ql/src/gen/vectorization/ExpressionTemplates/ColumnDivideScalar.txt ql/src/gen/vectorization/ExpressionTemplates/ColumnDivideScalar.txt index 74fd0e2..3b0e147 100644 --- ql/src/gen/vectorization/ExpressionTemplates/ColumnDivideScalar.txt +++ ql/src/gen/vectorization/ExpressionTemplates/ColumnDivideScalar.txt @@ -26,6 +26,7 @@ import org.apache.hadoop.hive.ql.exec.vector.; import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch; import org.apache.hadoop.hive.ql.exec.vector.expressions.NullUtil; import org.apache.hadoop.hive.ql.exec.vector.VectorExpressionDescriptor; +import org.apache.hadoop.hive.ql.metadata.HiveException; /** * Generated from template ColumnArithmeticScalar.txt, which covers binary arithmetic @@ -53,7 +54,7 @@ public class extends VectorExpression { } @Override - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { // return immediately if batch is empty final int n = batch.size; diff --git ql/src/gen/vectorization/ExpressionTemplates/ColumnDivideScalarDecimal.txt ql/src/gen/vectorization/ExpressionTemplates/ColumnDivideScalarDecimal.txt index 15d21d0..0bd7c00 100644 --- ql/src/gen/vectorization/ExpressionTemplates/ColumnDivideScalarDecimal.txt +++ ql/src/gen/vectorization/ExpressionTemplates/ColumnDivideScalarDecimal.txt @@ -27,6 +27,7 @@ import org.apache.hadoop.hive.ql.exec.vector.expressions.DecimalUtil; import org.apache.hadoop.hive.ql.exec.vector.VectorExpressionDescriptor; import org.apache.hadoop.hive.serde2.io.HiveDecimalWritable; import org.apache.hadoop.hive.common.type.HiveDecimal; +import org.apache.hadoop.hive.ql.metadata.HiveException; /** * Generated from template ColumnDivideScalarDecimal.txt, which covers binary arithmetic @@ -54,7 +55,7 @@ public class extends VectorExpression { } @Override - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { // return immediately if batch is empty final int n = batch.size; diff --git ql/src/gen/vectorization/ExpressionTemplates/ColumnUnaryFunc.txt ql/src/gen/vectorization/ExpressionTemplates/ColumnUnaryFunc.txt index cead258..3ac896c 100644 --- ql/src/gen/vectorization/ExpressionTemplates/ColumnUnaryFunc.txt +++ ql/src/gen/vectorization/ExpressionTemplates/ColumnUnaryFunc.txt @@ -25,6 +25,7 @@ import org.apache.hadoop.hive.ql.exec.vector.expressions.MathExpr; import org.apache.hadoop.hive.ql.exec.vector.*; import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch; import org.apache.hadoop.hive.ql.exec.vector.VectorExpressionDescriptor; +import org.apache.hadoop.hive.ql.metadata.HiveException; public class extends VectorExpression { private static final long serialVersionUID = 1L; @@ -44,7 +45,7 @@ public class extends VectorExpression { } @Override - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { // return immediately if batch is empty final int n = batch.size; diff --git ql/src/gen/vectorization/ExpressionTemplates/ColumnUnaryMinus.txt ql/src/gen/vectorization/ExpressionTemplates/ColumnUnaryMinus.txt index 53e4bb4..8fa8e44 100644 --- ql/src/gen/vectorization/ExpressionTemplates/ColumnUnaryMinus.txt +++ ql/src/gen/vectorization/ExpressionTemplates/ColumnUnaryMinus.txt @@ -25,6 +25,7 @@ import org.apache.hadoop.hive.ql.exec.vector.expressions.VectorExpression; import org.apache.hadoop.hive.ql.exec.vector.*; import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch; import org.apache.hadoop.hive.ql.exec.vector.VectorExpressionDescriptor; +import org.apache.hadoop.hive.ql.metadata.HiveException; /** * Generated from template ColumnUnaryMinus.txt, which covers unary negation operator. @@ -48,7 +49,7 @@ public class extends VectorExpression { } @Override - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { // return immediately if batch is empty final int n = batch.size; diff --git ql/src/gen/vectorization/ExpressionTemplates/DateColumnArithmeticIntervalYearMonthColumn.txt ql/src/gen/vectorization/ExpressionTemplates/DateColumnArithmeticIntervalYearMonthColumn.txt index bf1128a..32dd6ed 100644 --- ql/src/gen/vectorization/ExpressionTemplates/DateColumnArithmeticIntervalYearMonthColumn.txt +++ ql/src/gen/vectorization/ExpressionTemplates/DateColumnArithmeticIntervalYearMonthColumn.txt @@ -27,6 +27,7 @@ import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch; import org.apache.hadoop.hive.ql.exec.vector.VectorExpressionDescriptor; import org.apache.hadoop.hive.ql.util.DateTimeMath; import org.apache.hadoop.hive.serde2.io.DateWritable; +import org.apache.hadoop.hive.ql.metadata.HiveException; /** * Generated from template DateColumnArithmeticIntervalYearMonthColumn.txt, which covers binary arithmetic @@ -59,7 +60,7 @@ public class extends VectorExpression { } @Override - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { // return immediately if batch is empty final int n = batch.size; diff --git ql/src/gen/vectorization/ExpressionTemplates/DateColumnArithmeticIntervalYearMonthScalar.txt ql/src/gen/vectorization/ExpressionTemplates/DateColumnArithmeticIntervalYearMonthScalar.txt index 172bd39..94c0c5c 100644 --- ql/src/gen/vectorization/ExpressionTemplates/DateColumnArithmeticIntervalYearMonthScalar.txt +++ ql/src/gen/vectorization/ExpressionTemplates/DateColumnArithmeticIntervalYearMonthScalar.txt @@ -30,6 +30,7 @@ import org.apache.hadoop.hive.ql.exec.vector.VectorExpressionDescriptor; import org.apache.hadoop.hive.ql.exec.vector.*; import org.apache.hadoop.hive.ql.util.DateTimeMath; import org.apache.hadoop.hive.serde2.io.DateWritable; +import org.apache.hadoop.hive.ql.metadata.HiveException; /** * Generated from template DateColumnArithmeticIntervalYearMonthScalar.txt, which covers binary arithmetic @@ -61,7 +62,7 @@ public class extends VectorExpression { } @Override - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { // return immediately if batch is empty final int n = batch.size; diff --git ql/src/gen/vectorization/ExpressionTemplates/DateColumnArithmeticTimestampColumn.txt ql/src/gen/vectorization/ExpressionTemplates/DateColumnArithmeticTimestampColumn.txt index a515319..96c525d 100644 --- ql/src/gen/vectorization/ExpressionTemplates/DateColumnArithmeticTimestampColumn.txt +++ ql/src/gen/vectorization/ExpressionTemplates/DateColumnArithmeticTimestampColumn.txt @@ -29,6 +29,7 @@ import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch; import org.apache.hadoop.hive.ql.exec.vector.VectorExpressionDescriptor; import org.apache.hadoop.hive.ql.util.DateTimeMath; import org.apache.hadoop.hive.serde2.io.DateWritable; +import org.apache.hadoop.hive.ql.metadata.HiveException; /** * Generated from template DateColumnArithmeticTimestampColumn.txt, a class @@ -59,7 +60,7 @@ public class extends VectorExpression { } @Override - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { // return immediately if batch is empty final int n = batch.size; diff --git ql/src/gen/vectorization/ExpressionTemplates/DateColumnArithmeticTimestampScalar.txt ql/src/gen/vectorization/ExpressionTemplates/DateColumnArithmeticTimestampScalar.txt index 0bae7da..fb22992 100644 --- ql/src/gen/vectorization/ExpressionTemplates/DateColumnArithmeticTimestampScalar.txt +++ ql/src/gen/vectorization/ExpressionTemplates/DateColumnArithmeticTimestampScalar.txt @@ -30,6 +30,7 @@ import org.apache.hadoop.hive.ql.exec.vector.VectorExpressionDescriptor; import org.apache.hadoop.hive.ql.exec.vector.*; import org.apache.hadoop.hive.ql.util.DateTimeMath; import org.apache.hadoop.hive.serde2.io.DateWritable; +import org.apache.hadoop.hive.ql.metadata.HiveException; /** * Generated from template DateColumnArithmeticTimestampScalarBase.txt, a base class @@ -60,7 +61,7 @@ public class extends VectorExpression { } @Override - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { // return immediately if batch is empty final int n = batch.size; diff --git ql/src/gen/vectorization/ExpressionTemplates/DateScalarArithmeticIntervalYearMonthColumn.txt ql/src/gen/vectorization/ExpressionTemplates/DateScalarArithmeticIntervalYearMonthColumn.txt index 42046e0..0c8ec9c 100644 --- ql/src/gen/vectorization/ExpressionTemplates/DateScalarArithmeticIntervalYearMonthColumn.txt +++ ql/src/gen/vectorization/ExpressionTemplates/DateScalarArithmeticIntervalYearMonthColumn.txt @@ -38,6 +38,7 @@ import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch; import org.apache.hadoop.hive.ql.exec.vector.expressions.NullUtil; import org.apache.hadoop.hive.ql.util.DateTimeMath; import org.apache.hadoop.hive.serde2.io.DateWritable; +import org.apache.hadoop.hive.ql.metadata.HiveException; /** * Generated from template DateTimeScalarArithmeticIntervalYearMonthColumn.txt. @@ -75,7 +76,7 @@ public class extends VectorExpression { * * @batch a package of rows with each column stored in a vector */ - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { // return immediately if batch is empty final int n = batch.size; diff --git ql/src/gen/vectorization/ExpressionTemplates/DateScalarArithmeticTimestampColumn.txt ql/src/gen/vectorization/ExpressionTemplates/DateScalarArithmeticTimestampColumn.txt index 191eaa6..ef8f2a3 100644 --- ql/src/gen/vectorization/ExpressionTemplates/DateScalarArithmeticTimestampColumn.txt +++ ql/src/gen/vectorization/ExpressionTemplates/DateScalarArithmeticTimestampColumn.txt @@ -37,6 +37,7 @@ import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch; import org.apache.hadoop.hive.ql.exec.vector.expressions.NullUtil; import org.apache.hadoop.hive.ql.util.DateTimeMath; import org.apache.hadoop.hive.serde2.io.DateWritable; +import org.apache.hadoop.hive.ql.metadata.HiveException; /** * Generated from template DateTimeScalarArithmeticTimestampColumnBase.txt. @@ -74,7 +75,7 @@ public class extends VectorExpression { * * @batch a package of rows with each column stored in a vector */ - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { // return immediately if batch is empty final int n = batch.size; diff --git ql/src/gen/vectorization/ExpressionTemplates/Decimal64ColumnArithmeticDecimal64Column.txt ql/src/gen/vectorization/ExpressionTemplates/Decimal64ColumnArithmeticDecimal64Column.txt index 5b643bb..25ebae4 100644 --- ql/src/gen/vectorization/ExpressionTemplates/Decimal64ColumnArithmeticDecimal64Column.txt +++ ql/src/gen/vectorization/ExpressionTemplates/Decimal64ColumnArithmeticDecimal64Column.txt @@ -25,6 +25,7 @@ import org.apache.hadoop.hive.ql.exec.vector.expressions.NullUtil; import org.apache.hadoop.hive.ql.exec.vector.expressions.Decimal64Util; import org.apache.hadoop.hive.ql.exec.vector.expressions.VectorExpression; import org.apache.hadoop.hive.serde2.io.HiveDecimalWritable; +import org.apache.hadoop.hive.ql.metadata.HiveException; /** * Generated from template Decimal64ColumnArithmeticDecimal64Column.txt, which covers @@ -52,7 +53,7 @@ public class extends VectorExpression { } @Override - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { // return immediately if batch is empty final int n = batch.size; diff --git ql/src/gen/vectorization/ExpressionTemplates/Decimal64ColumnArithmeticDecimal64Scalar.txt ql/src/gen/vectorization/ExpressionTemplates/Decimal64ColumnArithmeticDecimal64Scalar.txt index fa091d4..35d9f06 100644 --- ql/src/gen/vectorization/ExpressionTemplates/Decimal64ColumnArithmeticDecimal64Scalar.txt +++ ql/src/gen/vectorization/ExpressionTemplates/Decimal64ColumnArithmeticDecimal64Scalar.txt @@ -27,6 +27,7 @@ import org.apache.hadoop.hive.ql.exec.vector.expressions.Decimal64Util; import org.apache.hadoop.hive.ql.exec.vector.expressions.VectorExpression; import org.apache.hadoop.hive.serde2.io.HiveDecimalWritable; import org.apache.hadoop.hive.serde2.typeinfo.DecimalTypeInfo; +import org.apache.hadoop.hive.ql.metadata.HiveException; /** * Generated from template ColumnArithmeticScalar.txt, which covers decimal64 arithmetic @@ -54,7 +55,7 @@ public class extends VectorExpression { } @Override - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { // return immediately if batch is empty final int n = batch.size; diff --git ql/src/gen/vectorization/ExpressionTemplates/Decimal64ScalarArithmeticDecimal64Column.txt ql/src/gen/vectorization/ExpressionTemplates/Decimal64ScalarArithmeticDecimal64Column.txt index db813b7..ca5b4bc 100644 --- ql/src/gen/vectorization/ExpressionTemplates/Decimal64ScalarArithmeticDecimal64Column.txt +++ ql/src/gen/vectorization/ExpressionTemplates/Decimal64ScalarArithmeticDecimal64Column.txt @@ -27,6 +27,7 @@ import org.apache.hadoop.hive.ql.exec.vector.expressions.Decimal64Util; import org.apache.hadoop.hive.ql.exec.vector.expressions.VectorExpression; import org.apache.hadoop.hive.serde2.io.HiveDecimalWritable; import org.apache.hadoop.hive.serde2.typeinfo.DecimalTypeInfo; +import org.apache.hadoop.hive.ql.metadata.HiveException; /** * Generated from template Decimal64ScalarArithmeticDecimal64Column.txt. @@ -55,7 +56,7 @@ public class extends VectorExpression { } @Override - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { // return immediately if batch is empty final int n = batch.size; diff --git ql/src/gen/vectorization/ExpressionTemplates/DecimalColumnUnaryFunc.txt ql/src/gen/vectorization/ExpressionTemplates/DecimalColumnUnaryFunc.txt index 5e684b4..aaec7e0 100644 --- ql/src/gen/vectorization/ExpressionTemplates/DecimalColumnUnaryFunc.txt +++ ql/src/gen/vectorization/ExpressionTemplates/DecimalColumnUnaryFunc.txt @@ -29,6 +29,7 @@ import org.apache.hadoop.hive.serde2.io.HiveDecimalWritable; import org.apache.hadoop.hive.ql.exec.vector.DecimalColumnVector; import org.apache.hadoop.hive.ql.exec.vector.LongColumnVector; import org.apache.hadoop.hive.ql.exec.vector.expressions.DecimalUtil; +import org.apache.hadoop.hive.ql.metadata.HiveException; public class extends VectorExpression { private static final long serialVersionUID = 1L; @@ -48,7 +49,7 @@ public class extends VectorExpression { } @Override - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { // return immediately if batch is empty final int n = batch.size; diff --git ql/src/gen/vectorization/ExpressionTemplates/FilterColumnBetween.txt ql/src/gen/vectorization/ExpressionTemplates/FilterColumnBetween.txt index 55eb50e..0664cbf 100644 --- ql/src/gen/vectorization/ExpressionTemplates/FilterColumnBetween.txt +++ ql/src/gen/vectorization/ExpressionTemplates/FilterColumnBetween.txt @@ -22,6 +22,7 @@ import org.apache.hadoop.hive.ql.exec.vector.expressions.VectorExpression; import org.apache.hadoop.hive.ql.exec.vector.; import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch; import org.apache.hadoop.hive.ql.exec.vector.VectorExpressionDescriptor; +import org.apache.hadoop.hive.ql.metadata.HiveException; /** * Generated from template FilterColumnBetween.txt, which covers [NOT] BETWEEN filter @@ -55,7 +56,7 @@ public class extends VectorExpression { } @Override - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { // return immediately if batch is empty final int n = batch.size; diff --git ql/src/gen/vectorization/ExpressionTemplates/FilterColumnBetweenDynamicValue.txt ql/src/gen/vectorization/ExpressionTemplates/FilterColumnBetweenDynamicValue.txt index b5a36df..5242bbd 100644 --- ql/src/gen/vectorization/ExpressionTemplates/FilterColumnBetweenDynamicValue.txt +++ ql/src/gen/vectorization/ExpressionTemplates/FilterColumnBetweenDynamicValue.txt @@ -83,7 +83,7 @@ public class extends FilterColumnBetween { } @Override - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { if (!initialized) { Object lVal = leftDynamicValue.getValue(); Object rVal = rightDynamicValue.getValue(); diff --git ql/src/gen/vectorization/ExpressionTemplates/FilterColumnCompareColumn.txt ql/src/gen/vectorization/ExpressionTemplates/FilterColumnCompareColumn.txt index e458992..be9bbb2 100644 --- ql/src/gen/vectorization/ExpressionTemplates/FilterColumnCompareColumn.txt +++ ql/src/gen/vectorization/ExpressionTemplates/FilterColumnCompareColumn.txt @@ -23,6 +23,7 @@ import org.apache.hadoop.hive.ql.exec.vector.expressions.NullUtil; import org.apache.hadoop.hive.ql.exec.vector.*; import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch; import org.apache.hadoop.hive.ql.exec.vector.VectorExpressionDescriptor; +import org.apache.hadoop.hive.ql.metadata.HiveException; /** * Generated from template FilterColumnCompareColumn.txt, which covers binary comparison @@ -51,7 +52,7 @@ public class extends VectorExpression { } @Override - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { // return immediately if batch is empty int n = batch.size; diff --git ql/src/gen/vectorization/ExpressionTemplates/FilterColumnCompareScalar.txt ql/src/gen/vectorization/ExpressionTemplates/FilterColumnCompareScalar.txt index c955c06..8b6f978 100644 --- ql/src/gen/vectorization/ExpressionTemplates/FilterColumnCompareScalar.txt +++ ql/src/gen/vectorization/ExpressionTemplates/FilterColumnCompareScalar.txt @@ -22,6 +22,7 @@ import org.apache.hadoop.hive.ql.exec.vector.expressions.VectorExpression; import org.apache.hadoop.hive.ql.exec.vector.; import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch; import org.apache.hadoop.hive.ql.exec.vector.VectorExpressionDescriptor; +import org.apache.hadoop.hive.ql.metadata.HiveException; /** * Generated from template FilterColumnCompareScalar.txt, which covers binary comparison @@ -49,7 +50,7 @@ public class extends VectorExpression { } @Override - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { // return immediately if batch is empty final int n = batch.size; diff --git ql/src/gen/vectorization/ExpressionTemplates/FilterDecimalColumnBetween.txt ql/src/gen/vectorization/ExpressionTemplates/FilterDecimalColumnBetween.txt index f42668c..c7cfc4d 100644 --- ql/src/gen/vectorization/ExpressionTemplates/FilterDecimalColumnBetween.txt +++ ql/src/gen/vectorization/ExpressionTemplates/FilterDecimalColumnBetween.txt @@ -25,6 +25,7 @@ import org.apache.hadoop.hive.ql.exec.vector.expressions.DecimalUtil; import org.apache.hadoop.hive.ql.exec.vector.expressions.VectorExpression; import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch; import org.apache.hadoop.hive.ql.exec.vector.VectorExpressionDescriptor; +import org.apache.hadoop.hive.ql.metadata.HiveException; /** * Generated from template FilterDecimalColumnBetween.txt, which covers [NOT] BETWEEN filter @@ -58,7 +59,7 @@ public class extends VectorExpression { } @Override - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { // return immediately if batch is empty final int n = batch.size; diff --git ql/src/gen/vectorization/ExpressionTemplates/FilterDecimalColumnCompareDecimalColumn.txt ql/src/gen/vectorization/ExpressionTemplates/FilterDecimalColumnCompareDecimalColumn.txt index 77fe7ae..ae2bb17 100644 --- ql/src/gen/vectorization/ExpressionTemplates/FilterDecimalColumnCompareDecimalColumn.txt +++ ql/src/gen/vectorization/ExpressionTemplates/FilterDecimalColumnCompareDecimalColumn.txt @@ -23,6 +23,7 @@ import org.apache.hadoop.hive.ql.exec.vector.DecimalColumnVector; import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch; import org.apache.hadoop.hive.ql.exec.vector.VectorExpressionDescriptor; import org.apache.hadoop.hive.serde2.io.HiveDecimalWritable; +import org.apache.hadoop.hive.ql.metadata.HiveException; /** * Generated from template FilterDecimalColumnCompareColumn.txt, which covers binary comparison @@ -51,7 +52,7 @@ public class extends VectorExpression { } @Override - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { // return immediately if batch is empty final int n = batch.size; diff --git ql/src/gen/vectorization/ExpressionTemplates/FilterDecimalColumnCompareDecimalScalar.txt ql/src/gen/vectorization/ExpressionTemplates/FilterDecimalColumnCompareDecimalScalar.txt index 078b132..5e59c03 100644 --- ql/src/gen/vectorization/ExpressionTemplates/FilterDecimalColumnCompareDecimalScalar.txt +++ ql/src/gen/vectorization/ExpressionTemplates/FilterDecimalColumnCompareDecimalScalar.txt @@ -25,6 +25,7 @@ import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch; import org.apache.hadoop.hive.ql.exec.vector.VectorExpressionDescriptor; import org.apache.hadoop.hive.serde2.io.HiveDecimalWritable; import org.apache.hadoop.hive.common.type.HiveDecimal; +import org.apache.hadoop.hive.ql.metadata.HiveException; /** * This is a generated class to evaluate a comparison on a vector of decimal @@ -52,7 +53,7 @@ public class extends VectorExpression { } @Override - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { // return immediately if batch is empty final int n = batch.size; diff --git ql/src/gen/vectorization/ExpressionTemplates/FilterDecimalScalarCompareDecimalColumn.txt ql/src/gen/vectorization/ExpressionTemplates/FilterDecimalScalarCompareDecimalColumn.txt index 20dbaba..00d0042 100644 --- ql/src/gen/vectorization/ExpressionTemplates/FilterDecimalScalarCompareDecimalColumn.txt +++ ql/src/gen/vectorization/ExpressionTemplates/FilterDecimalScalarCompareDecimalColumn.txt @@ -25,6 +25,7 @@ import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch; import org.apache.hadoop.hive.ql.exec.vector.VectorExpressionDescriptor; import org.apache.hadoop.hive.serde2.io.HiveDecimalWritable; import org.apache.hadoop.hive.common.type.HiveDecimal; +import org.apache.hadoop.hive.ql.metadata.HiveException; /** * This is a generated class to evaluate a comparison on a vector of decimal @@ -52,7 +53,7 @@ public class extends VectorExpression { } @Override - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { // return immediately if batch is empty final int n = batch.size; diff --git ql/src/gen/vectorization/ExpressionTemplates/FilterLongDoubleColumnCompareTimestampColumn.txt ql/src/gen/vectorization/ExpressionTemplates/FilterLongDoubleColumnCompareTimestampColumn.txt index 4afed54..4e78fd6 100644 --- ql/src/gen/vectorization/ExpressionTemplates/FilterLongDoubleColumnCompareTimestampColumn.txt +++ ql/src/gen/vectorization/ExpressionTemplates/FilterLongDoubleColumnCompareTimestampColumn.txt @@ -26,6 +26,7 @@ import org.apache.hadoop.hive.ql.exec.vector.expressions.NullUtil; import org.apache.hadoop.hive.ql.exec.vector.*; import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch; import org.apache.hadoop.hive.ql.exec.vector.VectorExpressionDescriptor; +import org.apache.hadoop.hive.ql.metadata.HiveException; /** * Generated from template FilterColumnCompareColumn.txt, which covers binary comparison @@ -54,7 +55,7 @@ public class extends VectorExpression { } @Override - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { // return immediately if batch is empty int n = batch.size; diff --git ql/src/gen/vectorization/ExpressionTemplates/FilterLongDoubleScalarCompareTimestampColumn.txt ql/src/gen/vectorization/ExpressionTemplates/FilterLongDoubleScalarCompareTimestampColumn.txt index 8f8104d..69cf579 100644 --- ql/src/gen/vectorization/ExpressionTemplates/FilterLongDoubleScalarCompareTimestampColumn.txt +++ ql/src/gen/vectorization/ExpressionTemplates/FilterLongDoubleScalarCompareTimestampColumn.txt @@ -26,6 +26,7 @@ import org.apache.hadoop.hive.ql.exec.vector.expressions.VectorExpression; import org.apache.hadoop.hive.ql.exec.vector.TimestampColumnVector; import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch; import org.apache.hadoop.hive.ql.exec.vector.VectorExpressionDescriptor; +import org.apache.hadoop.hive.ql.metadata.HiveException; /** * Generated from template FilterScalarCompareTimestampColumn.txt, which covers comparison @@ -55,7 +56,7 @@ public class extends VectorExpression { } @Override - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { // return immediately if batch is empty final int n = batch.size; diff --git ql/src/gen/vectorization/ExpressionTemplates/FilterScalarCompareColumn.txt ql/src/gen/vectorization/ExpressionTemplates/FilterScalarCompareColumn.txt index 28b5704..2ff9e98 100644 --- ql/src/gen/vectorization/ExpressionTemplates/FilterScalarCompareColumn.txt +++ ql/src/gen/vectorization/ExpressionTemplates/FilterScalarCompareColumn.txt @@ -22,6 +22,7 @@ import org.apache.hadoop.hive.ql.exec.vector.expressions.VectorExpression; import org.apache.hadoop.hive.ql.exec.vector.; import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch; import org.apache.hadoop.hive.ql.exec.vector.VectorExpressionDescriptor; +import org.apache.hadoop.hive.ql.metadata.HiveException; /** * Generated from template FilterScalarCompareColumn.txt, which covers binary comparison @@ -50,7 +51,7 @@ public class extends VectorExpression { } @Override - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { // return immediately if batch is empty final int n = batch.size; diff --git ql/src/gen/vectorization/ExpressionTemplates/FilterStringColumnBetween.txt ql/src/gen/vectorization/ExpressionTemplates/FilterStringColumnBetween.txt index b7f70e1..aac8fa8 100644 --- ql/src/gen/vectorization/ExpressionTemplates/FilterStringColumnBetween.txt +++ ql/src/gen/vectorization/ExpressionTemplates/FilterStringColumnBetween.txt @@ -25,7 +25,7 @@ import org.apache.hadoop.hive.ql.exec.vector.expressions.StringExpr; import org.apache.hadoop.hive.ql.exec.vector.BytesColumnVector; import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch; import org.apache.hadoop.hive.ql.exec.vector.VectorExpressionDescriptor; - +import org.apache.hadoop.hive.ql.metadata.HiveException; /** * This is a generated class to evaluate a [NOT] BETWEEN comparison on a vector of strings. @@ -55,7 +55,7 @@ public class extends VectorExpression { } @Override - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { // return immediately if batch is empty final int n = batch.size; diff --git ql/src/gen/vectorization/ExpressionTemplates/FilterStringGroupColumnCompareStringGroupColumn.txt ql/src/gen/vectorization/ExpressionTemplates/FilterStringGroupColumnCompareStringGroupColumn.txt index 2d18d1d..046ae79 100644 --- ql/src/gen/vectorization/ExpressionTemplates/FilterStringGroupColumnCompareStringGroupColumn.txt +++ ql/src/gen/vectorization/ExpressionTemplates/FilterStringGroupColumnCompareStringGroupColumn.txt @@ -23,6 +23,7 @@ import org.apache.hadoop.hive.ql.exec.vector.expressions.StringExpr; import org.apache.hadoop.hive.ql.exec.vector.BytesColumnVector; import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch; import org.apache.hadoop.hive.ql.exec.vector.VectorExpressionDescriptor; +import org.apache.hadoop.hive.ql.metadata.HiveException; /** * Filter the rows in a batch by comparing one string column to another. @@ -50,7 +51,7 @@ public class extends VectorExpression { } @Override - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { // return immediately if batch is empty final int n = batch.size; diff --git ql/src/gen/vectorization/ExpressionTemplates/FilterStringGroupColumnCompareStringGroupScalarBase.txt ql/src/gen/vectorization/ExpressionTemplates/FilterStringGroupColumnCompareStringGroupScalarBase.txt index 76ec8a0..6efa1ca 100644 --- ql/src/gen/vectorization/ExpressionTemplates/FilterStringGroupColumnCompareStringGroupScalarBase.txt +++ ql/src/gen/vectorization/ExpressionTemplates/FilterStringGroupColumnCompareStringGroupScalarBase.txt @@ -25,6 +25,7 @@ import org.apache.hadoop.hive.ql.exec.vector.expressions.StringExpr; import org.apache.hadoop.hive.ql.exec.vector.BytesColumnVector; import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch; import org.apache.hadoop.hive.ql.exec.vector.VectorExpressionDescriptor; +import org.apache.hadoop.hive.ql.metadata.HiveException; /** * This is a generated class to evaluate a comparison on a vector of strings. @@ -51,7 +52,7 @@ public abstract class extends VectorExpression { } @Override - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { // return immediately if batch is empty final int n = batch.size; diff --git ql/src/gen/vectorization/ExpressionTemplates/FilterStringGroupScalarCompareStringGroupColumnBase.txt ql/src/gen/vectorization/ExpressionTemplates/FilterStringGroupScalarCompareStringGroupColumnBase.txt index 91d8da5c..7165eb2 100644 --- ql/src/gen/vectorization/ExpressionTemplates/FilterStringGroupScalarCompareStringGroupColumnBase.txt +++ ql/src/gen/vectorization/ExpressionTemplates/FilterStringGroupScalarCompareStringGroupColumnBase.txt @@ -25,6 +25,7 @@ import org.apache.hadoop.hive.ql.exec.vector.expressions.StringExpr; import org.apache.hadoop.hive.ql.exec.vector.BytesColumnVector; import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch; import org.apache.hadoop.hive.ql.exec.vector.VectorExpressionDescriptor; +import org.apache.hadoop.hive.ql.metadata.HiveException; /** * This is a generated class to evaluate a comparison on a vector of strings. @@ -52,7 +53,7 @@ public abstract class extends VectorExpression { } @Override - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { // return immediately if batch is empty final int n = batch.size; diff --git ql/src/gen/vectorization/ExpressionTemplates/FilterTimestampColumnBetween.txt ql/src/gen/vectorization/ExpressionTemplates/FilterTimestampColumnBetween.txt index 604060a..ad5985f 100644 --- ql/src/gen/vectorization/ExpressionTemplates/FilterTimestampColumnBetween.txt +++ ql/src/gen/vectorization/ExpressionTemplates/FilterTimestampColumnBetween.txt @@ -24,6 +24,7 @@ import org.apache.hadoop.hive.ql.exec.vector.TimestampColumnVector; import org.apache.hadoop.hive.ql.exec.vector.expressions.VectorExpression; import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch; import org.apache.hadoop.hive.ql.exec.vector.VectorExpressionDescriptor; +import org.apache.hadoop.hive.ql.metadata.HiveException; /** * Generated from template FilterTimestampColumnBetween.txt, which covers [NOT] BETWEEN filter @@ -57,7 +58,7 @@ public class extends VectorExpression { } @Override - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { // return immediately if batch is empty final int n = batch.size; diff --git ql/src/gen/vectorization/ExpressionTemplates/FilterTimestampColumnCompareLongDoubleColumn.txt ql/src/gen/vectorization/ExpressionTemplates/FilterTimestampColumnCompareLongDoubleColumn.txt index f9bc9ee..8399334 100644 --- ql/src/gen/vectorization/ExpressionTemplates/FilterTimestampColumnCompareLongDoubleColumn.txt +++ ql/src/gen/vectorization/ExpressionTemplates/FilterTimestampColumnCompareLongDoubleColumn.txt @@ -23,6 +23,7 @@ import org.apache.hadoop.hive.ql.exec.vector.expressions.NullUtil; import org.apache.hadoop.hive.ql.exec.vector.*; import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch; import org.apache.hadoop.hive.ql.exec.vector.VectorExpressionDescriptor; +import org.apache.hadoop.hive.ql.metadata.HiveException; /** * Generated from template FilterColumnCompareColumn.txt, which covers binary comparison @@ -51,7 +52,7 @@ public class extends VectorExpression { } @Override - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { // return immediately if batch is empty int n = batch.size; diff --git ql/src/gen/vectorization/ExpressionTemplates/FilterTimestampColumnCompareLongDoubleScalar.txt ql/src/gen/vectorization/ExpressionTemplates/FilterTimestampColumnCompareLongDoubleScalar.txt index fc1be95..57834c2 100644 --- ql/src/gen/vectorization/ExpressionTemplates/FilterTimestampColumnCompareLongDoubleScalar.txt +++ ql/src/gen/vectorization/ExpressionTemplates/FilterTimestampColumnCompareLongDoubleScalar.txt @@ -22,6 +22,7 @@ import org.apache.hadoop.hive.ql.exec.vector.expressions.VectorExpression; import org.apache.hadoop.hive.ql.exec.vector.TimestampColumnVector; import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch; import org.apache.hadoop.hive.ql.exec.vector.VectorExpressionDescriptor; +import org.apache.hadoop.hive.ql.metadata.HiveException; /** * Generated from template FilterTimestampColumnCompareScalar.txt, which covers comparison @@ -51,7 +52,7 @@ public class extends VectorExpression { } @Override - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { // return immediately if batch is empty final int n = batch.size; diff --git ql/src/gen/vectorization/ExpressionTemplates/FilterTimestampColumnCompareTimestampColumn.txt ql/src/gen/vectorization/ExpressionTemplates/FilterTimestampColumnCompareTimestampColumn.txt index 0a541f9..b855714 100644 --- ql/src/gen/vectorization/ExpressionTemplates/FilterTimestampColumnCompareTimestampColumn.txt +++ ql/src/gen/vectorization/ExpressionTemplates/FilterTimestampColumnCompareTimestampColumn.txt @@ -27,6 +27,7 @@ import org.apache.hadoop.hive.ql.exec.vector.*; import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch; import org.apache.hadoop.hive.ql.exec.vector.VectorExpressionDescriptor; import org.apache.hadoop.hive.serde2.io.HiveDecimalWritable; +import org.apache.hadoop.hive.ql.metadata.HiveException; /** * Generated from template FilterTimestampColumnCompareColumn.txt, which covers binary comparison @@ -55,7 +56,7 @@ public class extends VectorExpression { } @Override - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { // return immediately if batch is empty final int n = batch.size; diff --git ql/src/gen/vectorization/ExpressionTemplates/FilterTimestampColumnCompareTimestampScalar.txt ql/src/gen/vectorization/ExpressionTemplates/FilterTimestampColumnCompareTimestampScalar.txt index 68e0006..3fa542b 100644 --- ql/src/gen/vectorization/ExpressionTemplates/FilterTimestampColumnCompareTimestampScalar.txt +++ ql/src/gen/vectorization/ExpressionTemplates/FilterTimestampColumnCompareTimestampScalar.txt @@ -26,6 +26,7 @@ import org.apache.hadoop.hive.ql.exec.vector.TimestampColumnVector; import org.apache.hadoop.hive.ql.exec.vector.*; import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch; import org.apache.hadoop.hive.ql.exec.vector.VectorExpressionDescriptor; +import org.apache.hadoop.hive.ql.metadata.HiveException; /** * Generated from template FilterColumnCompareScalar.txt, which covers binary comparison @@ -54,7 +55,7 @@ public class extends VectorExpression { } @Override - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { // return immediately if batch is empty final int n = batch.size; diff --git ql/src/gen/vectorization/ExpressionTemplates/FilterTimestampScalarCompareTimestampColumn.txt ql/src/gen/vectorization/ExpressionTemplates/FilterTimestampScalarCompareTimestampColumn.txt index d5952de..fcda65f 100644 --- ql/src/gen/vectorization/ExpressionTemplates/FilterTimestampScalarCompareTimestampColumn.txt +++ ql/src/gen/vectorization/ExpressionTemplates/FilterTimestampScalarCompareTimestampColumn.txt @@ -28,6 +28,7 @@ import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch; import org.apache.hadoop.hive.ql.exec.vector.VectorExpressionDescriptor; import org.apache.hadoop.hive.serde2.io.HiveDecimalWritable; import org.apache.hadoop.hive.common.type.HiveDecimal; +import org.apache.hadoop.hive.ql.metadata.HiveException; /** * This is a generated class to evaluate a comparison on a vector of timestamp @@ -55,7 +56,7 @@ public class extends VectorExpression { } @Override - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { // return immediately if batch is empty final int n = batch.size; diff --git ql/src/gen/vectorization/ExpressionTemplates/FilterTruncStringColumnBetween.txt ql/src/gen/vectorization/ExpressionTemplates/FilterTruncStringColumnBetween.txt index 44e8e18..416f9e8 100644 --- ql/src/gen/vectorization/ExpressionTemplates/FilterTruncStringColumnBetween.txt +++ ql/src/gen/vectorization/ExpressionTemplates/FilterTruncStringColumnBetween.txt @@ -27,7 +27,7 @@ import org.apache.hadoop.hive.ql.exec.vector.expressions.StringExpr; import org.apache.hadoop.hive.ql.exec.vector.BytesColumnVector; import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch; import org.apache.hadoop.hive.ql.exec.vector.VectorExpressionDescriptor; - +import org.apache.hadoop.hive.ql.metadata.HiveException; /** * This is a generated class to evaluate a [NOT] BETWEEN comparison on a vector of strings. @@ -57,7 +57,7 @@ public class extends VectorExpression { } @Override - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { // return immediately if batch is empty final int n = batch.size; diff --git ql/src/gen/vectorization/ExpressionTemplates/IfExprColumnScalar.txt ql/src/gen/vectorization/ExpressionTemplates/IfExprColumnScalar.txt index cf9afa0..d50a6f6 100644 --- ql/src/gen/vectorization/ExpressionTemplates/IfExprColumnScalar.txt +++ ql/src/gen/vectorization/ExpressionTemplates/IfExprColumnScalar.txt @@ -23,6 +23,7 @@ import org.apache.hadoop.hive.ql.exec.vector.LongColumnVector; import org.apache.hadoop.hive.ql.exec.vector.DoubleColumnVector; import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch; import org.apache.hadoop.hive.ql.exec.vector.VectorExpressionDescriptor; +import org.apache.hadoop.hive.ql.metadata.HiveException; /** * Compute IF(expr1, expr2, expr3) for 3 input column expressions. @@ -56,7 +57,7 @@ public class extends VectorExpression { } @Override - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { // return immediately if batch is empty final int n = batch.size; diff --git ql/src/gen/vectorization/ExpressionTemplates/IfExprScalarColumn.txt ql/src/gen/vectorization/ExpressionTemplates/IfExprScalarColumn.txt index 0eb42d1..3658129 100644 --- ql/src/gen/vectorization/ExpressionTemplates/IfExprScalarColumn.txt +++ ql/src/gen/vectorization/ExpressionTemplates/IfExprScalarColumn.txt @@ -23,6 +23,7 @@ import org.apache.hadoop.hive.ql.exec.vector.LongColumnVector; import org.apache.hadoop.hive.ql.exec.vector.DoubleColumnVector; import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch; import org.apache.hadoop.hive.ql.exec.vector.VectorExpressionDescriptor; +import org.apache.hadoop.hive.ql.metadata.HiveException; /** * Compute IF(expr1, expr2, expr3) for 3 input column expressions. @@ -56,7 +57,7 @@ public class extends VectorExpression { } @Override - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { // return immediately if batch is empty final int n = batch.size; diff --git ql/src/gen/vectorization/ExpressionTemplates/IfExprScalarScalar.txt ql/src/gen/vectorization/ExpressionTemplates/IfExprScalarScalar.txt index cec1231..d11459a 100644 --- ql/src/gen/vectorization/ExpressionTemplates/IfExprScalarScalar.txt +++ ql/src/gen/vectorization/ExpressionTemplates/IfExprScalarScalar.txt @@ -23,6 +23,7 @@ import org.apache.hadoop.hive.ql.exec.vector.LongColumnVector; import org.apache.hadoop.hive.ql.exec.vector.DoubleColumnVector; import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch; import org.apache.hadoop.hive.ql.exec.vector.VectorExpressionDescriptor; +import org.apache.hadoop.hive.ql.metadata.HiveException; import java.util.Arrays; /** @@ -57,7 +58,7 @@ public class extends VectorExpression { } @Override - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { // return immediately if batch is empty final int n = batch.size; diff --git ql/src/gen/vectorization/ExpressionTemplates/IntervalYearMonthColumnArithmeticDateColumn.txt ql/src/gen/vectorization/ExpressionTemplates/IntervalYearMonthColumnArithmeticDateColumn.txt index 7c5b614..393413f 100644 --- ql/src/gen/vectorization/ExpressionTemplates/IntervalYearMonthColumnArithmeticDateColumn.txt +++ ql/src/gen/vectorization/ExpressionTemplates/IntervalYearMonthColumnArithmeticDateColumn.txt @@ -27,6 +27,7 @@ import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch; import org.apache.hadoop.hive.ql.exec.vector.VectorExpressionDescriptor; import org.apache.hadoop.hive.ql.util.DateTimeMath; import org.apache.hadoop.hive.serde2.io.DateWritable; +import org.apache.hadoop.hive.ql.metadata.HiveException; /** * Generated from template DateColumnArithmeticIntervalYearMonthColumn.txt, which covers binary arithmetic @@ -59,7 +60,7 @@ public class extends VectorExpression { } @Override - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { // return immediately if batch is empty final int n = batch.size; diff --git ql/src/gen/vectorization/ExpressionTemplates/IntervalYearMonthColumnArithmeticDateScalar.txt ql/src/gen/vectorization/ExpressionTemplates/IntervalYearMonthColumnArithmeticDateScalar.txt index 84d6c4a..a65c4b9 100644 --- ql/src/gen/vectorization/ExpressionTemplates/IntervalYearMonthColumnArithmeticDateScalar.txt +++ ql/src/gen/vectorization/ExpressionTemplates/IntervalYearMonthColumnArithmeticDateScalar.txt @@ -30,6 +30,7 @@ import org.apache.hadoop.hive.ql.exec.vector.VectorExpressionDescriptor; import org.apache.hadoop.hive.ql.exec.vector.*; import org.apache.hadoop.hive.ql.util.DateTimeMath; import org.apache.hadoop.hive.serde2.io.DateWritable; +import org.apache.hadoop.hive.ql.metadata.HiveException; /** * Generated from template DateColumnArithmeticIntervalYearMonthScalar.txt, which covers binary arithmetic @@ -61,7 +62,7 @@ public class extends VectorExpression { } @Override - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { // return immediately if batch is empty final int n = batch.size; diff --git ql/src/gen/vectorization/ExpressionTemplates/IntervalYearMonthColumnArithmeticTimestampColumn.txt ql/src/gen/vectorization/ExpressionTemplates/IntervalYearMonthColumnArithmeticTimestampColumn.txt index cfe44c1..08e033a 100644 --- ql/src/gen/vectorization/ExpressionTemplates/IntervalYearMonthColumnArithmeticTimestampColumn.txt +++ ql/src/gen/vectorization/ExpressionTemplates/IntervalYearMonthColumnArithmeticTimestampColumn.txt @@ -27,6 +27,7 @@ import org.apache.hadoop.hive.ql.exec.vector.*; import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch; import org.apache.hadoop.hive.ql.exec.vector.VectorExpressionDescriptor; import org.apache.hadoop.hive.ql.util.DateTimeMath; +import org.apache.hadoop.hive.ql.metadata.HiveException; /** * Generated from template TimestampColumnArithmeticIntervalYearMonthColumn.txt, which covers binary arithmetic @@ -57,7 +58,7 @@ public class extends VectorExpression { } @Override - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { // return immediately if batch is empty final int n = batch.size; diff --git ql/src/gen/vectorization/ExpressionTemplates/IntervalYearMonthColumnArithmeticTimestampScalar.txt ql/src/gen/vectorization/ExpressionTemplates/IntervalYearMonthColumnArithmeticTimestampScalar.txt index 22f7abf..c297116 100644 --- ql/src/gen/vectorization/ExpressionTemplates/IntervalYearMonthColumnArithmeticTimestampScalar.txt +++ ql/src/gen/vectorization/ExpressionTemplates/IntervalYearMonthColumnArithmeticTimestampScalar.txt @@ -29,6 +29,7 @@ import org.apache.hadoop.hive.ql.exec.vector.expressions.NullUtil; import org.apache.hadoop.hive.ql.exec.vector.VectorExpressionDescriptor; import org.apache.hadoop.hive.ql.exec.vector.*; import org.apache.hadoop.hive.ql.util.DateTimeMath; +import org.apache.hadoop.hive.ql.metadata.HiveException; /** * Generated from template TimestampColumnArithmeticIntervalYearMonthScalar.txt, which covers binary arithmetic @@ -59,7 +60,7 @@ public class extends VectorExpression { } @Override - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { // return immediately if batch is empty final int n = batch.size; diff --git ql/src/gen/vectorization/ExpressionTemplates/IntervalYearMonthScalarArithmeticDateColumn.txt ql/src/gen/vectorization/ExpressionTemplates/IntervalYearMonthScalarArithmeticDateColumn.txt index ffc2cec..34d516e 100644 --- ql/src/gen/vectorization/ExpressionTemplates/IntervalYearMonthScalarArithmeticDateColumn.txt +++ ql/src/gen/vectorization/ExpressionTemplates/IntervalYearMonthScalarArithmeticDateColumn.txt @@ -38,6 +38,7 @@ import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch; import org.apache.hadoop.hive.ql.exec.vector.expressions.NullUtil; import org.apache.hadoop.hive.ql.util.DateTimeMath; import org.apache.hadoop.hive.serde2.io.DateWritable; +import org.apache.hadoop.hive.ql.metadata.HiveException; /** * Generated from template DateTimeScalarArithmeticIntervalYearMonthColumn.txt. @@ -75,7 +76,7 @@ public class extends VectorExpression { * * @batch a package of rows with each column stored in a vector */ - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { // return immediately if batch is empty final int n = batch.size; diff --git ql/src/gen/vectorization/ExpressionTemplates/IntervalYearMonthScalarArithmeticTimestampColumn.txt ql/src/gen/vectorization/ExpressionTemplates/IntervalYearMonthScalarArithmeticTimestampColumn.txt index 157e95e..9f18c5a 100644 --- ql/src/gen/vectorization/ExpressionTemplates/IntervalYearMonthScalarArithmeticTimestampColumn.txt +++ ql/src/gen/vectorization/ExpressionTemplates/IntervalYearMonthScalarArithmeticTimestampColumn.txt @@ -36,6 +36,7 @@ import org.apache.hadoop.hive.ql.exec.vector.LongColumnVector; import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch; import org.apache.hadoop.hive.ql.exec.vector.expressions.NullUtil; import org.apache.hadoop.hive.ql.util.DateTimeMath; +import org.apache.hadoop.hive.ql.metadata.HiveException; /** * Generated from template TimestampScalarArithmeticIntervalYearMonthColumn.txt. @@ -71,7 +72,7 @@ public class extends VectorExpression { * * @batch a package of rows with each column stored in a vector */ - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { // return immediately if batch is empty final int n = batch.size; diff --git ql/src/gen/vectorization/ExpressionTemplates/LongDoubleColumnCompareTimestampColumn.txt ql/src/gen/vectorization/ExpressionTemplates/LongDoubleColumnCompareTimestampColumn.txt index e3f36b9..703efdd 100644 --- ql/src/gen/vectorization/ExpressionTemplates/LongDoubleColumnCompareTimestampColumn.txt +++ ql/src/gen/vectorization/ExpressionTemplates/LongDoubleColumnCompareTimestampColumn.txt @@ -25,6 +25,7 @@ import org.apache.hadoop.hive.ql.exec.vector.expressions.NullUtil; import org.apache.hadoop.hive.ql.exec.vector.*; import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch; import org.apache.hadoop.hive.ql.exec.vector.VectorExpressionDescriptor; +import org.apache.hadoop.hive.ql.metadata.HiveException; /** * Generated from template ColumnCompareTimestampColumn.txt, which covers binary arithmetic @@ -52,7 +53,7 @@ public class extends VectorExpression { } @Override - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { // return immediately if batch is empty final int n = batch.size; diff --git ql/src/gen/vectorization/ExpressionTemplates/LongDoubleColumnCompareTimestampScalar.txt ql/src/gen/vectorization/ExpressionTemplates/LongDoubleColumnCompareTimestampScalar.txt index 2957c73..19263d9 100644 --- ql/src/gen/vectorization/ExpressionTemplates/LongDoubleColumnCompareTimestampScalar.txt +++ ql/src/gen/vectorization/ExpressionTemplates/LongDoubleColumnCompareTimestampScalar.txt @@ -25,6 +25,7 @@ import org.apache.hadoop.hive.ql.exec.vector.expressions.VectorExpression; import org.apache.hadoop.hive.ql.exec.vector.*; import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch; import org.apache.hadoop.hive.ql.exec.vector.VectorExpressionDescriptor; +import org.apache.hadoop.hive.ql.metadata.HiveException; /** * Generated from template ColumnCompareTimestampScalar.txt, which covers binary comparison @@ -53,7 +54,7 @@ public class extends VectorExpression { } @Override - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { // return immediately if batch is empty final int n = batch.size; diff --git ql/src/gen/vectorization/ExpressionTemplates/LongDoubleScalarCompareTimestampColumn.txt ql/src/gen/vectorization/ExpressionTemplates/LongDoubleScalarCompareTimestampColumn.txt index bb7f57d..067d21f 100644 --- ql/src/gen/vectorization/ExpressionTemplates/LongDoubleScalarCompareTimestampColumn.txt +++ ql/src/gen/vectorization/ExpressionTemplates/LongDoubleScalarCompareTimestampColumn.txt @@ -26,6 +26,7 @@ import org.apache.hadoop.hive.ql.exec.vector.LongColumnVector; import org.apache.hadoop.hive.ql.exec.vector.*; import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch; import org.apache.hadoop.hive.ql.exec.vector.VectorExpressionDescriptor; +import org.apache.hadoop.hive.ql.metadata.HiveException; /** * Generated from template ScalarCompareTimestamp.txt, which covers comparison @@ -54,7 +55,7 @@ public class extends VectorExpression { } @Override - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { // return immediately if batch is empty final int n = batch.size; diff --git ql/src/gen/vectorization/ExpressionTemplates/ScalarArithmeticColumn.txt ql/src/gen/vectorization/ExpressionTemplates/ScalarArithmeticColumn.txt index 695a063..be8001d 100644 --- ql/src/gen/vectorization/ExpressionTemplates/ScalarArithmeticColumn.txt +++ ql/src/gen/vectorization/ExpressionTemplates/ScalarArithmeticColumn.txt @@ -33,6 +33,7 @@ import org.apache.hadoop.hive.ql.exec.vector.DoubleColumnVector; import org.apache.hadoop.hive.ql.exec.vector.LongColumnVector; import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch; import org.apache.hadoop.hive.ql.exec.vector.expressions.NullUtil; +import org.apache.hadoop.hive.ql.metadata.HiveException; /** * Generated from template ScalarArithmeticColumn.txt. @@ -66,7 +67,7 @@ public class extends VectorExpression { * * @batch a package of rows with each column stored in a vector */ - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { // return immediately if batch is empty final int n = batch.size; diff --git ql/src/gen/vectorization/ExpressionTemplates/ScalarArithmeticColumnDecimal.txt ql/src/gen/vectorization/ExpressionTemplates/ScalarArithmeticColumnDecimal.txt index a0dbea6..7877127 100644 --- ql/src/gen/vectorization/ExpressionTemplates/ScalarArithmeticColumnDecimal.txt +++ ql/src/gen/vectorization/ExpressionTemplates/ScalarArithmeticColumnDecimal.txt @@ -28,6 +28,7 @@ import org.apache.hadoop.hive.ql.exec.vector.expressions.DecimalUtil; import org.apache.hadoop.hive.ql.exec.vector.VectorExpressionDescriptor; import org.apache.hadoop.hive.serde2.io.HiveDecimalWritable; import org.apache.hadoop.hive.common.type.HiveDecimal; +import org.apache.hadoop.hive.ql.metadata.HiveException; /** * Generated from template ScalarArithmeticColumnDecimal.txt, which covers binary arithmetic @@ -55,7 +56,7 @@ public class extends VectorExpression { } @Override - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { // return immediately if batch is empty final int n = batch.size; diff --git ql/src/gen/vectorization/ExpressionTemplates/ScalarCompareColumn.txt ql/src/gen/vectorization/ExpressionTemplates/ScalarCompareColumn.txt index 06cd7e6..753f061 100644 --- ql/src/gen/vectorization/ExpressionTemplates/ScalarCompareColumn.txt +++ ql/src/gen/vectorization/ExpressionTemplates/ScalarCompareColumn.txt @@ -26,6 +26,7 @@ import org.apache.hadoop.hive.ql.exec.vector.; import org.apache.hadoop.hive.ql.exec.vector.; import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch; import org.apache.hadoop.hive.ql.exec.vector.VectorExpressionDescriptor; +import org.apache.hadoop.hive.ql.metadata.HiveException; /** * Generated from template ColumnCompareScalar.txt, which covers binary comparison @@ -54,7 +55,7 @@ public class extends VectorExpression { } @Override - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { // return immediately if batch is empty final int n = batch.size; diff --git ql/src/gen/vectorization/ExpressionTemplates/ScalarDivideColumn.txt ql/src/gen/vectorization/ExpressionTemplates/ScalarDivideColumn.txt index a5de652..95e4ce1 100644 --- ql/src/gen/vectorization/ExpressionTemplates/ScalarDivideColumn.txt +++ ql/src/gen/vectorization/ExpressionTemplates/ScalarDivideColumn.txt @@ -32,6 +32,7 @@ import org.apache.hadoop.hive.ql.exec.vector.DoubleColumnVector; import org.apache.hadoop.hive.ql.exec.vector.LongColumnVector; import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch; import org.apache.hadoop.hive.ql.exec.vector.expressions.NullUtil; +import org.apache.hadoop.hive.ql.metadata.HiveException; /** * Generated from template ScalarArithmeticColumn.txt. @@ -65,7 +66,7 @@ public class extends VectorExpression { * * @batch a package of rows with each column stored in a vector */ - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { // return immediately if batch is empty final int n = batch.size; diff --git ql/src/gen/vectorization/ExpressionTemplates/ScalarDivideColumnDecimal.txt ql/src/gen/vectorization/ExpressionTemplates/ScalarDivideColumnDecimal.txt index b4ec35c..b3f1031 100644 --- ql/src/gen/vectorization/ExpressionTemplates/ScalarDivideColumnDecimal.txt +++ ql/src/gen/vectorization/ExpressionTemplates/ScalarDivideColumnDecimal.txt @@ -28,6 +28,7 @@ import org.apache.hadoop.hive.ql.exec.vector.expressions.DecimalUtil; import org.apache.hadoop.hive.ql.exec.vector.VectorExpressionDescriptor; import org.apache.hadoop.hive.serde2.io.HiveDecimalWritable; import org.apache.hadoop.hive.common.type.HiveDecimal; +import org.apache.hadoop.hive.ql.metadata.HiveException; /** * Generated from template ScalarDivideColumnDecimal.txt, which covers binary arithmetic @@ -55,7 +56,7 @@ public class extends VectorExpression { } @Override - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { // return immediately if batch is empty final int n = batch.size; diff --git ql/src/gen/vectorization/ExpressionTemplates/StringGroupColumnCompareStringGroupColumn.txt ql/src/gen/vectorization/ExpressionTemplates/StringGroupColumnCompareStringGroupColumn.txt index 573af7f..8a0c8c1 100644 --- ql/src/gen/vectorization/ExpressionTemplates/StringGroupColumnCompareStringGroupColumn.txt +++ ql/src/gen/vectorization/ExpressionTemplates/StringGroupColumnCompareStringGroupColumn.txt @@ -26,6 +26,7 @@ import org.apache.hadoop.hive.ql.exec.vector.BytesColumnVector; import org.apache.hadoop.hive.ql.exec.vector.LongColumnVector; import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch; import org.apache.hadoop.hive.ql.exec.vector.VectorExpressionDescriptor; +import org.apache.hadoop.hive.ql.metadata.HiveException; /** * Filter the rows in a batch by comparing one string column to another. @@ -53,7 +54,7 @@ public class extends VectorExpression { } @Override - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { // return immediately if batch is empty final int n = batch.size; diff --git ql/src/gen/vectorization/ExpressionTemplates/StringGroupColumnCompareStringGroupScalarBase.txt ql/src/gen/vectorization/ExpressionTemplates/StringGroupColumnCompareStringGroupScalarBase.txt index cb6cf4e..48913a3 100644 --- ql/src/gen/vectorization/ExpressionTemplates/StringGroupColumnCompareStringGroupScalarBase.txt +++ ql/src/gen/vectorization/ExpressionTemplates/StringGroupColumnCompareStringGroupScalarBase.txt @@ -27,6 +27,7 @@ import org.apache.hadoop.hive.ql.exec.vector.BytesColumnVector; import org.apache.hadoop.hive.ql.exec.vector.LongColumnVector; import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch; import org.apache.hadoop.hive.ql.exec.vector.VectorExpressionDescriptor; +import org.apache.hadoop.hive.ql.metadata.HiveException; /** * This is a generated class to evaluate a comparison on a vector of strings. @@ -53,7 +54,7 @@ public abstract class extends VectorExpression { } @Override - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { // return immediately if batch is empty final int n = batch.size; diff --git ql/src/gen/vectorization/ExpressionTemplates/StringGroupScalarCompareStringGroupColumnBase.txt ql/src/gen/vectorization/ExpressionTemplates/StringGroupScalarCompareStringGroupColumnBase.txt index 74d8b48..3cf4a2e 100644 --- ql/src/gen/vectorization/ExpressionTemplates/StringGroupScalarCompareStringGroupColumnBase.txt +++ ql/src/gen/vectorization/ExpressionTemplates/StringGroupScalarCompareStringGroupColumnBase.txt @@ -27,6 +27,7 @@ import org.apache.hadoop.hive.ql.exec.vector.BytesColumnVector; import org.apache.hadoop.hive.ql.exec.vector.LongColumnVector; import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch; import org.apache.hadoop.hive.ql.exec.vector.VectorExpressionDescriptor; +import org.apache.hadoop.hive.ql.metadata.HiveException; /** * This is a generated class to evaluate a comparison on a vector of strings. @@ -54,7 +55,7 @@ public abstract class extends VectorExpression { } @Override - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { // return immediately if batch is empty final int n = batch.size; diff --git ql/src/gen/vectorization/ExpressionTemplates/TimestampColumnArithmeticDateColumn.txt ql/src/gen/vectorization/ExpressionTemplates/TimestampColumnArithmeticDateColumn.txt index 27d8a3d..45f6408 100644 --- ql/src/gen/vectorization/ExpressionTemplates/TimestampColumnArithmeticDateColumn.txt +++ ql/src/gen/vectorization/ExpressionTemplates/TimestampColumnArithmeticDateColumn.txt @@ -28,6 +28,7 @@ import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch; import org.apache.hadoop.hive.ql.exec.vector.VectorExpressionDescriptor; import org.apache.hadoop.hive.ql.util.DateTimeMath; import org.apache.hadoop.hive.serde2.io.DateWritable; +import org.apache.hadoop.hive.ql.metadata.HiveException; /** * Generated from template TimestampColumnArithmeticDateColumn.txt, which covers binary arithmetic @@ -58,7 +59,7 @@ public class extends VectorExpression { } @Override - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { // return immediately if batch is empty final int n = batch.size; diff --git ql/src/gen/vectorization/ExpressionTemplates/TimestampColumnArithmeticDateScalar.txt ql/src/gen/vectorization/ExpressionTemplates/TimestampColumnArithmeticDateScalar.txt index 799daf2..0bbdce7 100644 --- ql/src/gen/vectorization/ExpressionTemplates/TimestampColumnArithmeticDateScalar.txt +++ ql/src/gen/vectorization/ExpressionTemplates/TimestampColumnArithmeticDateScalar.txt @@ -30,6 +30,7 @@ import org.apache.hadoop.hive.ql.exec.vector.VectorExpressionDescriptor; import org.apache.hadoop.hive.ql.exec.vector.*; import org.apache.hadoop.hive.ql.util.DateTimeMath; import org.apache.hadoop.hive.serde2.io.DateWritable; +import org.apache.hadoop.hive.ql.metadata.HiveException; /** * Generated from template TimestampColumnArithmeticDateScalar.txt, which covers binary arithmetic @@ -60,7 +61,7 @@ public class extends VectorExpression { } @Override - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { // return immediately if batch is empty final int n = batch.size; diff --git ql/src/gen/vectorization/ExpressionTemplates/TimestampColumnArithmeticIntervalYearMonthColumn.txt ql/src/gen/vectorization/ExpressionTemplates/TimestampColumnArithmeticIntervalYearMonthColumn.txt index f894bcf..982a880 100644 --- ql/src/gen/vectorization/ExpressionTemplates/TimestampColumnArithmeticIntervalYearMonthColumn.txt +++ ql/src/gen/vectorization/ExpressionTemplates/TimestampColumnArithmeticIntervalYearMonthColumn.txt @@ -27,6 +27,7 @@ import org.apache.hadoop.hive.ql.exec.vector.*; import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch; import org.apache.hadoop.hive.ql.exec.vector.VectorExpressionDescriptor; import org.apache.hadoop.hive.ql.util.DateTimeMath; +import org.apache.hadoop.hive.ql.metadata.HiveException; /** * Generated from template TimestampColumnArithmeticIntervalYearMonthColumn.txt, which covers binary arithmetic @@ -57,7 +58,7 @@ public class extends VectorExpression { } @Override - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { // return immediately if batch is empty final int n = batch.size; diff --git ql/src/gen/vectorization/ExpressionTemplates/TimestampColumnArithmeticIntervalYearMonthScalar.txt ql/src/gen/vectorization/ExpressionTemplates/TimestampColumnArithmeticIntervalYearMonthScalar.txt index 0e2cd13..8edd9eb 100644 --- ql/src/gen/vectorization/ExpressionTemplates/TimestampColumnArithmeticIntervalYearMonthScalar.txt +++ ql/src/gen/vectorization/ExpressionTemplates/TimestampColumnArithmeticIntervalYearMonthScalar.txt @@ -28,6 +28,7 @@ import org.apache.hadoop.hive.ql.exec.vector.expressions.NullUtil; import org.apache.hadoop.hive.ql.exec.vector.VectorExpressionDescriptor; import org.apache.hadoop.hive.ql.exec.vector.*; import org.apache.hadoop.hive.ql.util.DateTimeMath; +import org.apache.hadoop.hive.ql.metadata.HiveException; /** * Generated from template TimestampColumnArithmeticIntervalYearMonthScalar.txt, which covers binary arithmetic @@ -57,7 +58,7 @@ public class extends VectorExpression { } @Override - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { // return immediately if batch is empty final int n = batch.size; diff --git ql/src/gen/vectorization/ExpressionTemplates/TimestampColumnArithmeticTimestampColumn.txt ql/src/gen/vectorization/ExpressionTemplates/TimestampColumnArithmeticTimestampColumn.txt index 4240994..2afc778 100644 --- ql/src/gen/vectorization/ExpressionTemplates/TimestampColumnArithmeticTimestampColumn.txt +++ ql/src/gen/vectorization/ExpressionTemplates/TimestampColumnArithmeticTimestampColumn.txt @@ -27,6 +27,7 @@ import org.apache.hadoop.hive.ql.exec.vector.*; import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch; import org.apache.hadoop.hive.ql.exec.vector.VectorExpressionDescriptor; import org.apache.hadoop.hive.ql.util.DateTimeMath; +import org.apache.hadoop.hive.ql.metadata.HiveException; /** * Generated from template TimestampColumnArithmeticTimestampColumnBase.txt, which covers binary arithmetic @@ -56,7 +57,7 @@ public class extends VectorExpression { } @Override - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { // return immediately if batch is empty final int n = batch.size; diff --git ql/src/gen/vectorization/ExpressionTemplates/TimestampColumnArithmeticTimestampScalar.txt ql/src/gen/vectorization/ExpressionTemplates/TimestampColumnArithmeticTimestampScalar.txt index bcb8fd1..6532fcf 100644 --- ql/src/gen/vectorization/ExpressionTemplates/TimestampColumnArithmeticTimestampScalar.txt +++ ql/src/gen/vectorization/ExpressionTemplates/TimestampColumnArithmeticTimestampScalar.txt @@ -29,6 +29,7 @@ import org.apache.hadoop.hive.ql.exec.vector.expressions.NullUtil; import org.apache.hadoop.hive.ql.exec.vector.VectorExpressionDescriptor; import org.apache.hadoop.hive.ql.exec.vector.*; import org.apache.hadoop.hive.ql.util.DateTimeMath; +import org.apache.hadoop.hive.ql.metadata.HiveException; /** * Generated from template TimestampColumnArithmeticTimestampScalar.txt, which covers binary arithmetic @@ -58,7 +59,7 @@ public class extends VectorExpression { } @Override - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { // return immediately if batch is empty final int n = batch.size; diff --git ql/src/gen/vectorization/ExpressionTemplates/TimestampColumnCompareLongDoubleColumn.txt ql/src/gen/vectorization/ExpressionTemplates/TimestampColumnCompareLongDoubleColumn.txt index 7e65b9b..d17437b 100644 --- ql/src/gen/vectorization/ExpressionTemplates/TimestampColumnCompareLongDoubleColumn.txt +++ ql/src/gen/vectorization/ExpressionTemplates/TimestampColumnCompareLongDoubleColumn.txt @@ -23,6 +23,7 @@ import org.apache.hadoop.hive.ql.exec.vector.expressions.NullUtil; import org.apache.hadoop.hive.ql.exec.vector.*; import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch; import org.apache.hadoop.hive.ql.exec.vector.VectorExpressionDescriptor; +import org.apache.hadoop.hive.ql.metadata.HiveException; /** * Generated from template ColumnArithmeticColumn.txt, which covers binary arithmetic @@ -50,7 +51,7 @@ public class extends VectorExpression { } @Override - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { // return immediately if batch is empty final int n = batch.size; diff --git ql/src/gen/vectorization/ExpressionTemplates/TimestampColumnCompareLongDoubleScalar.txt ql/src/gen/vectorization/ExpressionTemplates/TimestampColumnCompareLongDoubleScalar.txt index b1e92e0..e2f6c7b 100644 --- ql/src/gen/vectorization/ExpressionTemplates/TimestampColumnCompareLongDoubleScalar.txt +++ ql/src/gen/vectorization/ExpressionTemplates/TimestampColumnCompareLongDoubleScalar.txt @@ -27,6 +27,7 @@ import org.apache.hadoop.hive.ql.exec.vector.LongColumnVector; import org.apache.hadoop.hive.ql.exec.vector.*; import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch; import org.apache.hadoop.hive.ql.exec.vector.VectorExpressionDescriptor; +import org.apache.hadoop.hive.ql.metadata.HiveException; /** * Generated from template TimestampColumnCompareScalar.txt, which covers comparison @@ -55,7 +56,7 @@ public class extends VectorExpression { } @Override - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { // return immediately if batch is empty final int n = batch.size; diff --git ql/src/gen/vectorization/ExpressionTemplates/TimestampColumnCompareTimestampColumn.txt ql/src/gen/vectorization/ExpressionTemplates/TimestampColumnCompareTimestampColumn.txt index b81b805..a9a8659 100644 --- ql/src/gen/vectorization/ExpressionTemplates/TimestampColumnCompareTimestampColumn.txt +++ ql/src/gen/vectorization/ExpressionTemplates/TimestampColumnCompareTimestampColumn.txt @@ -26,6 +26,7 @@ import org.apache.hadoop.hive.ql.exec.vector.expressions.NullUtil; import org.apache.hadoop.hive.ql.exec.vector.*; import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch; import org.apache.hadoop.hive.ql.exec.vector.VectorExpressionDescriptor; +import org.apache.hadoop.hive.ql.metadata.HiveException; /** * Generated from template TimestampColumnCompareColumn.txt, which covers comparision @@ -53,7 +54,7 @@ public class extends VectorExpression { } @Override - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { // return immediately if batch is empty final int n = batch.size; diff --git ql/src/gen/vectorization/ExpressionTemplates/TimestampColumnCompareTimestampScalar.txt ql/src/gen/vectorization/ExpressionTemplates/TimestampColumnCompareTimestampScalar.txt index cee680a..dce87f4 100644 --- ql/src/gen/vectorization/ExpressionTemplates/TimestampColumnCompareTimestampScalar.txt +++ ql/src/gen/vectorization/ExpressionTemplates/TimestampColumnCompareTimestampScalar.txt @@ -27,6 +27,7 @@ import org.apache.hadoop.hive.ql.exec.vector.expressions.NullUtil; import org.apache.hadoop.hive.ql.exec.vector.*; import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch; import org.apache.hadoop.hive.ql.exec.vector.VectorExpressionDescriptor; +import org.apache.hadoop.hive.ql.metadata.HiveException; /** * Generated from template TimestampColumnCompareTimestampScalar.txt, which covers binary comparison @@ -55,7 +56,7 @@ public class extends VectorExpression { } @Override - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { // return immediately if batch is empty final int n = batch.size; diff --git ql/src/gen/vectorization/ExpressionTemplates/TimestampScalarArithmeticDateColumn.txt ql/src/gen/vectorization/ExpressionTemplates/TimestampScalarArithmeticDateColumn.txt index b50cbc8..9a21cda 100644 --- ql/src/gen/vectorization/ExpressionTemplates/TimestampScalarArithmeticDateColumn.txt +++ ql/src/gen/vectorization/ExpressionTemplates/TimestampScalarArithmeticDateColumn.txt @@ -37,6 +37,7 @@ import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch; import org.apache.hadoop.hive.ql.exec.vector.expressions.NullUtil; import org.apache.hadoop.hive.ql.util.DateTimeMath; import org.apache.hadoop.hive.serde2.io.DateWritable; +import org.apache.hadoop.hive.ql.metadata.HiveException; /** * Generated from template TimestampScalarArithmeticDateColumnBase.txt. @@ -73,7 +74,7 @@ public class extends VectorExpression { * * @batch a package of rows with each column stored in a vector */ - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { // return immediately if batch is empty final int n = batch.size; diff --git ql/src/gen/vectorization/ExpressionTemplates/TimestampScalarArithmeticIntervalYearMonthColumn.txt ql/src/gen/vectorization/ExpressionTemplates/TimestampScalarArithmeticIntervalYearMonthColumn.txt index 9db7b53..dc4f5c8 100644 --- ql/src/gen/vectorization/ExpressionTemplates/TimestampScalarArithmeticIntervalYearMonthColumn.txt +++ ql/src/gen/vectorization/ExpressionTemplates/TimestampScalarArithmeticIntervalYearMonthColumn.txt @@ -36,6 +36,7 @@ import org.apache.hadoop.hive.ql.exec.vector.LongColumnVector; import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch; import org.apache.hadoop.hive.ql.exec.vector.expressions.NullUtil; import org.apache.hadoop.hive.ql.util.DateTimeMath; +import org.apache.hadoop.hive.ql.metadata.HiveException; /** * Generated from template TimestampScalarArithmeticIntervalYearMonthColumn.txt. @@ -72,7 +73,7 @@ public class extends VectorExpression { * * @batch a package of rows with each column stored in a vector */ - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { // return immediately if batch is empty final int n = batch.size; diff --git ql/src/gen/vectorization/ExpressionTemplates/TimestampScalarArithmeticTimestampColumn.txt ql/src/gen/vectorization/ExpressionTemplates/TimestampScalarArithmeticTimestampColumn.txt index e860e4d..1b1117e 100644 --- ql/src/gen/vectorization/ExpressionTemplates/TimestampScalarArithmeticTimestampColumn.txt +++ ql/src/gen/vectorization/ExpressionTemplates/TimestampScalarArithmeticTimestampColumn.txt @@ -35,6 +35,7 @@ import org.apache.hadoop.hive.ql.exec.vector.TimestampColumnVector; import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch; import org.apache.hadoop.hive.ql.exec.vector.expressions.NullUtil; import org.apache.hadoop.hive.ql.util.DateTimeMath; +import org.apache.hadoop.hive.ql.metadata.HiveException; /** * Generated from template TimestampScalarArithmeticTimestampColumnBase.txt. @@ -70,7 +71,7 @@ public class extends VectorExpression { * * @batch a package of rows with each column stored in a vector */ - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { // return immediately if batch is empty final int n = batch.size; diff --git ql/src/gen/vectorization/ExpressionTemplates/TimestampScalarCompareTimestampColumn.txt ql/src/gen/vectorization/ExpressionTemplates/TimestampScalarCompareTimestampColumn.txt index 10f6162..c409a6b 100644 --- ql/src/gen/vectorization/ExpressionTemplates/TimestampScalarCompareTimestampColumn.txt +++ ql/src/gen/vectorization/ExpressionTemplates/TimestampScalarCompareTimestampColumn.txt @@ -29,6 +29,7 @@ import org.apache.hadoop.hive.ql.exec.vector.LongColumnVector; import org.apache.hadoop.hive.ql.exec.vector.*; import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch; import org.apache.hadoop.hive.ql.exec.vector.VectorExpressionDescriptor; +import org.apache.hadoop.hive.ql.metadata.HiveException; /** * Generated from template ScalarCompareTimestamp.txt, which covers comparison @@ -57,7 +58,7 @@ public class extends VectorExpression { } @Override - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { // return immediately if batch is empty final int n = batch.size; diff --git ql/src/gen/vectorization/TestTemplates/TestClass.txt ql/src/gen/vectorization/TestTemplates/TestClass.txt index f15695a..8f02195 100644 --- ql/src/gen/vectorization/TestTemplates/TestClass.txt +++ ql/src/gen/vectorization/TestTemplates/TestClass.txt @@ -26,7 +26,7 @@ import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch; import org.apache.hadoop.hive.ql.exec.vector.util.VectorizedRowGroupGenUtil; import org.apache.hadoop.hive.serde2.typeinfo.TypeInfoFactory; import org.junit.Test; - +import org.apache.hadoop.hive.ql.metadata.HiveException; /** * diff --git ql/src/gen/vectorization/TestTemplates/TestColumnColumnFilterVectorExpressionEvaluation.txt ql/src/gen/vectorization/TestTemplates/TestColumnColumnFilterVectorExpressionEvaluation.txt index 2bb1aa3..0fb089a 100644 --- ql/src/gen/vectorization/TestTemplates/TestColumnColumnFilterVectorExpressionEvaluation.txt +++ ql/src/gen/vectorization/TestTemplates/TestColumnColumnFilterVectorExpressionEvaluation.txt @@ -15,7 +15,7 @@ limitations under the License. --> @Test - public void () { + public void () throws HiveException { Random rand = new Random(SEED); diff --git ql/src/gen/vectorization/TestTemplates/TestColumnColumnOperationVectorExpressionCheckedEvaluation.txt ql/src/gen/vectorization/TestTemplates/TestColumnColumnOperationVectorExpressionCheckedEvaluation.txt index 069d9ab..3b926b9 100644 --- ql/src/gen/vectorization/TestTemplates/TestColumnColumnOperationVectorExpressionCheckedEvaluation.txt +++ ql/src/gen/vectorization/TestTemplates/TestColumnColumnOperationVectorExpressionCheckedEvaluation.txt @@ -15,7 +15,7 @@ limitations under the License. --> @Test - public void () { + public void () throws HiveException { Random rand = new Random(SEED); diff --git ql/src/gen/vectorization/TestTemplates/TestColumnColumnOperationVectorExpressionEvaluation.txt ql/src/gen/vectorization/TestTemplates/TestColumnColumnOperationVectorExpressionEvaluation.txt index 3c8f8822..a0cf298 100644 --- ql/src/gen/vectorization/TestTemplates/TestColumnColumnOperationVectorExpressionEvaluation.txt +++ ql/src/gen/vectorization/TestTemplates/TestColumnColumnOperationVectorExpressionEvaluation.txt @@ -15,7 +15,7 @@ limitations under the License. --> @Test - public void () { + public void () throws HiveException { Random rand = new Random(SEED); diff --git ql/src/gen/vectorization/TestTemplates/TestColumnScalarFilterVectorExpressionEvaluation.txt ql/src/gen/vectorization/TestTemplates/TestColumnScalarFilterVectorExpressionEvaluation.txt index 290c94c..479540a 100644 --- ql/src/gen/vectorization/TestTemplates/TestColumnScalarFilterVectorExpressionEvaluation.txt +++ ql/src/gen/vectorization/TestTemplates/TestColumnScalarFilterVectorExpressionEvaluation.txt @@ -15,7 +15,7 @@ limitations under the License. --> @Test - public void () { + public void () throws HiveException { Random rand = new Random(SEED); diff --git ql/src/gen/vectorization/TestTemplates/TestColumnScalarOperationVectorExpressionCheckedEvaluation.txt ql/src/gen/vectorization/TestTemplates/TestColumnScalarOperationVectorExpressionCheckedEvaluation.txt index c918f3b..2095971 100644 --- ql/src/gen/vectorization/TestTemplates/TestColumnScalarOperationVectorExpressionCheckedEvaluation.txt +++ ql/src/gen/vectorization/TestTemplates/TestColumnScalarOperationVectorExpressionCheckedEvaluation.txt @@ -15,7 +15,7 @@ limitations under the License. --> @Test - public void () { + public void () throws HiveException { Random rand = new Random(SEED); diff --git ql/src/gen/vectorization/TestTemplates/TestColumnScalarOperationVectorExpressionEvaluation.txt ql/src/gen/vectorization/TestTemplates/TestColumnScalarOperationVectorExpressionEvaluation.txt index 991135c..04873a5 100644 --- ql/src/gen/vectorization/TestTemplates/TestColumnScalarOperationVectorExpressionEvaluation.txt +++ ql/src/gen/vectorization/TestTemplates/TestColumnScalarOperationVectorExpressionEvaluation.txt @@ -15,7 +15,7 @@ limitations under the License. --> @Test - public void () { + public void () throws HiveException { Random rand = new Random(SEED); diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/VectorizationContext.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/VectorizationContext.java index abbbe9a..2cad04b 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/VectorizationContext.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/VectorizationContext.java @@ -154,6 +154,8 @@ public static HiveVectorIfStmtMode getHiveConfValue(HiveConf hiveConf) { private boolean reuseScratchColumns = HiveConf.ConfVars.HIVE_VECTORIZATION_TESTING_REUSE_SCRATCH_COLUMNS.defaultBoolVal; + private boolean adaptorSuppressEvaluateExceptions; + private void setHiveConfVars(HiveConf hiveConf) { hiveVectorAdaptorUsageMode = HiveVectorAdaptorUsageMode.getHiveConfValue(hiveConf); hiveVectorIfStmtMode = HiveVectorIfStmtMode.getHiveConfValue(hiveConf); @@ -162,6 +164,9 @@ private void setHiveConfVars(HiveConf hiveConf) { this.ocm.setReuseColumns(reuseScratchColumns); useCheckedVectorExpressions = HiveConf.getBoolVar(hiveConf, HiveConf.ConfVars.HIVE_VECTORIZATION_USE_CHECKED_EXPRESSIONS); + adaptorSuppressEvaluateExceptions = + HiveConf.getBoolVar( + hiveConf, HiveConf.ConfVars.HIVE_VECTORIZED_ADAPTOR_SUPPRESS_EVALUATE_EXCEPTIONS); } private void copyHiveConfVars(VectorizationContext vContextEnvironment) { @@ -3360,7 +3365,8 @@ private VectorExpression getCustomUDFExpression(ExprNodeGenericFuncDesc expr, Ve final int outputColumnNum = ocm.allocateOutputColumn(expr.getTypeInfo()); // Make vectorized operator - VectorExpression ve = new VectorUDFAdaptor(expr, outputColumnNum, resultTypeName, argDescs); + VectorUDFAdaptor ve = new VectorUDFAdaptor(expr, outputColumnNum, resultTypeName, argDescs); + ve.setSuppressEvaluateExceptions(adaptorSuppressEvaluateExceptions); // Set child expressions VectorExpression[] childVEs = null; diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/AbstractFilterStringColLikeStringScalar.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/AbstractFilterStringColLikeStringScalar.java index 688bc1f..277f866 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/AbstractFilterStringColLikeStringScalar.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/AbstractFilterStringColLikeStringScalar.java @@ -90,7 +90,7 @@ Checker createChecker(String pattern) { } @Override - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { if (childExpressions != null) { super.evaluateChildren(batch); diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/CastDateToTimestamp.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/CastDateToTimestamp.java index f1a584e..dbd7c01 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/CastDateToTimestamp.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/CastDateToTimestamp.java @@ -24,6 +24,7 @@ import org.apache.hadoop.hive.ql.exec.vector.TimestampColumnVector; import org.apache.hadoop.hive.ql.exec.vector.VectorExpressionDescriptor; import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch; +import org.apache.hadoop.hive.ql.metadata.HiveException; import org.apache.hadoop.hive.serde2.io.DateWritable; public class CastDateToTimestamp extends VectorExpression { @@ -49,7 +50,7 @@ private void setDays(TimestampColumnVector timestampColVector, long[] vector, in } @Override - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { if (childExpressions != null) { this.evaluateChildren(batch); diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/CastDecimalToDecimal.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/CastDecimalToDecimal.java index 8326002..5e0d570 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/CastDecimalToDecimal.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/CastDecimalToDecimal.java @@ -23,6 +23,7 @@ import org.apache.hadoop.hive.ql.exec.vector.DecimalColumnVector; import org.apache.hadoop.hive.ql.exec.vector.VectorExpressionDescriptor; import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch; +import org.apache.hadoop.hive.ql.metadata.HiveException; /** * Cast a decimal to a decimal, accounting for precision and scale changes. @@ -66,7 +67,7 @@ protected void convert(DecimalColumnVector outputColVector, DecimalColumnVector * respectively. */ @Override - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { if (childExpressions != null) { super.evaluateChildren(batch); diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/CastDecimalToTimestamp.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/CastDecimalToTimestamp.java index 8107c44..c7c397b 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/CastDecimalToTimestamp.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/CastDecimalToTimestamp.java @@ -20,10 +20,8 @@ import java.sql.Timestamp; -import org.apache.hadoop.hive.common.type.HiveDecimal; import org.apache.hadoop.hive.ql.exec.vector.DecimalColumnVector; import org.apache.hadoop.hive.ql.exec.vector.TimestampColumnVector; -import org.apache.hadoop.hive.ql.metadata.HiveException; import org.apache.hadoop.hive.ql.util.TimestampUtils; import org.apache.hadoop.hive.serde2.io.HiveDecimalWritable; diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/CastDoubleToTimestamp.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/CastDoubleToTimestamp.java index 5494579..ad00987 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/CastDoubleToTimestamp.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/CastDoubleToTimestamp.java @@ -24,6 +24,7 @@ import org.apache.hadoop.hive.ql.exec.vector.TimestampColumnVector; import org.apache.hadoop.hive.ql.exec.vector.VectorExpressionDescriptor; import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch; +import org.apache.hadoop.hive.ql.metadata.HiveException; import org.apache.hadoop.hive.ql.util.TimestampUtils; public class CastDoubleToTimestamp extends VectorExpression { @@ -47,7 +48,7 @@ private void setDouble(TimestampColumnVector timestampColVector, } @Override - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { if (childExpressions != null) { this.evaluateChildren(batch); diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/CastLongToDate.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/CastLongToDate.java index 47b6556..b2185d9 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/CastLongToDate.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/CastLongToDate.java @@ -21,6 +21,7 @@ import org.apache.hadoop.hive.ql.exec.vector.LongColumnVector; import org.apache.hadoop.hive.ql.exec.vector.VectorExpressionDescriptor; import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch; +import org.apache.hadoop.hive.ql.metadata.HiveException; import org.apache.hadoop.hive.serde2.io.DateWritable; import org.apache.hadoop.hive.serde2.objectinspector.PrimitiveObjectInspector.PrimitiveCategory; import org.apache.hadoop.hive.serde2.typeinfo.PrimitiveTypeInfo; @@ -46,7 +47,7 @@ public CastLongToDate(int inputColumn, int outputColumnNum) { } @Override - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { if (childExpressions != null) { super.evaluateChildren(batch); diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/CastLongToTimestamp.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/CastLongToTimestamp.java index a3c4212..9e0c00e 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/CastLongToTimestamp.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/CastLongToTimestamp.java @@ -22,6 +22,7 @@ import org.apache.hadoop.hive.ql.exec.vector.expressions.VectorExpression; import org.apache.hadoop.hive.ql.exec.vector.*; +import org.apache.hadoop.hive.ql.metadata.HiveException; import org.apache.hadoop.hive.serde2.io.TimestampWritable; public class CastLongToTimestamp extends VectorExpression { @@ -47,7 +48,7 @@ private void setSeconds(TimestampColumnVector timestampColVector, long[] vector, } @Override - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { if (childExpressions != null) { this.evaluateChildren(batch); diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/CastMillisecondsLongToTimestamp.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/CastMillisecondsLongToTimestamp.java index 6a29c62..a9ede6b 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/CastMillisecondsLongToTimestamp.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/CastMillisecondsLongToTimestamp.java @@ -22,6 +22,7 @@ import org.apache.hadoop.hive.ql.exec.vector.expressions.VectorExpression; import org.apache.hadoop.hive.ql.exec.vector.*; +import org.apache.hadoop.hive.ql.metadata.HiveException; import org.apache.hadoop.hive.serde2.io.TimestampWritable; public class CastMillisecondsLongToTimestamp extends VectorExpression { @@ -45,7 +46,7 @@ private void setMilliseconds(TimestampColumnVector timestampColVector, } @Override - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { if (childExpressions != null) { this.evaluateChildren(batch); diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/CastStringToDate.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/CastStringToDate.java index b55712a..6edd7b9 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/CastStringToDate.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/CastStringToDate.java @@ -54,7 +54,7 @@ public CastStringToDate(int inputColumn, int outputColumnNum) { } @Override - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { if (childExpressions != null) { super.evaluateChildren(batch); diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/CastStringToDecimal.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/CastStringToDecimal.java index cbefa80..d8d7dae 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/CastStringToDecimal.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/CastStringToDecimal.java @@ -25,6 +25,7 @@ import org.apache.hadoop.hive.ql.exec.vector.DecimalColumnVector; import org.apache.hadoop.hive.ql.exec.vector.VectorExpressionDescriptor; import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch; +import org.apache.hadoop.hive.ql.metadata.HiveException; /** * Cast a string to a decimal. @@ -72,7 +73,7 @@ protected void func(DecimalColumnVector outputColVector, BytesColumnVector input } @Override - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { if (childExpressions != null) { super.evaluateChildren(batch); diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/CastStringToDouble.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/CastStringToDouble.java index 9ad442a..f4020a4 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/CastStringToDouble.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/CastStringToDouble.java @@ -24,6 +24,7 @@ import org.apache.hadoop.hive.ql.exec.vector.DoubleColumnVector; import org.apache.hadoop.hive.ql.exec.vector.VectorExpressionDescriptor; import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch; +import org.apache.hadoop.hive.ql.metadata.HiveException; import org.apache.hadoop.hive.serde2.lazy.LazyUtils; import org.apache.hadoop.hive.serde2.lazy.fast.StringToDouble; @@ -76,7 +77,7 @@ protected void func(DoubleColumnVector outputColVector, BytesColumnVector inputC } @Override - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { if (childExpressions != null) { super.evaluateChildren(batch); diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/CastStringToIntervalDayTime.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/CastStringToIntervalDayTime.java index 8a64dcf..790328d 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/CastStringToIntervalDayTime.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/CastStringToIntervalDayTime.java @@ -26,6 +26,7 @@ import org.apache.hadoop.hive.ql.exec.vector.IntervalDayTimeColumnVector; import org.apache.hadoop.hive.ql.exec.vector.VectorExpressionDescriptor; import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch; +import org.apache.hadoop.hive.ql.metadata.HiveException; import org.apache.hadoop.hive.serde.serdeConstants; import org.apache.hive.common.util.DateUtils; @@ -51,7 +52,7 @@ public CastStringToIntervalDayTime(int inputColumn, int outputColumnNum) { } @Override - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { if (childExpressions != null) { super.evaluateChildren(batch); diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/CastStringToIntervalYearMonth.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/CastStringToIntervalYearMonth.java index 598113f..4fd0859 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/CastStringToIntervalYearMonth.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/CastStringToIntervalYearMonth.java @@ -25,6 +25,7 @@ import org.apache.hadoop.hive.ql.exec.vector.LongColumnVector; import org.apache.hadoop.hive.ql.exec.vector.VectorExpressionDescriptor; import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch; +import org.apache.hadoop.hive.ql.metadata.HiveException; import org.apache.hadoop.hive.serde.serdeConstants; @@ -49,7 +50,7 @@ public CastStringToIntervalYearMonth(int inputColumn, int outputColumnNum) { } @Override - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { if (childExpressions != null) { super.evaluateChildren(batch); diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/CastStringToLong.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/CastStringToLong.java index e3da77e..58235de 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/CastStringToLong.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/CastStringToLong.java @@ -174,7 +174,7 @@ protected void func(LongColumnVector outputColVector, BytesColumnVector inputCol } @Override - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { if (childExpressions != null) { super.evaluateChildren(batch); diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/CastTimestampToBoolean.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/CastTimestampToBoolean.java index 1836131..c257574 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/CastTimestampToBoolean.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/CastTimestampToBoolean.java @@ -23,6 +23,7 @@ import org.apache.hadoop.hive.ql.exec.vector.expressions.VectorExpression; import org.apache.hadoop.hive.ql.exec.vector.expressions.MathExpr; import org.apache.hadoop.hive.ql.exec.vector.*; +import org.apache.hadoop.hive.ql.metadata.HiveException; public class CastTimestampToBoolean extends VectorExpression { private static final long serialVersionUID = 1L; @@ -47,7 +48,7 @@ private int toBool(TimestampColumnVector timestampColVector, int index) { } @Override - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { if (childExpressions != null) { this.evaluateChildren(batch); diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/CastTimestampToDouble.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/CastTimestampToDouble.java index c11797b..eedde7a 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/CastTimestampToDouble.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/CastTimestampToDouble.java @@ -22,6 +22,7 @@ import org.apache.hadoop.hive.ql.exec.vector.expressions.VectorExpression; import org.apache.hadoop.hive.ql.exec.vector.*; +import org.apache.hadoop.hive.ql.metadata.HiveException; import org.apache.hadoop.hive.serde2.io.TimestampWritable; public class CastTimestampToDouble extends VectorExpression { @@ -42,7 +43,7 @@ public CastTimestampToDouble() { } @Override - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { if (childExpressions != null) { this.evaluateChildren(batch); diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/CastTimestampToLong.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/CastTimestampToLong.java index a0f0927..42e005e 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/CastTimestampToLong.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/CastTimestampToLong.java @@ -23,6 +23,7 @@ import org.apache.hadoop.hive.ql.exec.vector.expressions.VectorExpression; import org.apache.hadoop.hive.ql.exec.vector.expressions.MathExpr; import org.apache.hadoop.hive.ql.exec.vector.*; +import org.apache.hadoop.hive.ql.metadata.HiveException; public class CastTimestampToLong extends VectorExpression { private static final long serialVersionUID = 1L; @@ -39,7 +40,7 @@ public CastTimestampToLong() { } @Override - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { if (childExpressions != null) { this.evaluateChildren(batch); diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/ColAndCol.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/ColAndCol.java index 6fb29a8..c6b52fa 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/ColAndCol.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/ColAndCol.java @@ -22,6 +22,7 @@ import org.apache.hadoop.hive.ql.exec.vector.LongColumnVector; import org.apache.hadoop.hive.ql.exec.vector.VectorExpressionDescriptor; import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch; +import org.apache.hadoop.hive.ql.metadata.HiveException; /** * Evaluate AND of two boolean columns and store result in the output boolean column. @@ -48,7 +49,7 @@ public ColAndCol() { } @Override - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { if (childExpressions != null) { super.evaluateChildren(batch); diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/ColOrCol.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/ColOrCol.java index 9208cd4..6d816d1 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/ColOrCol.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/ColOrCol.java @@ -23,6 +23,7 @@ import org.apache.hadoop.hive.ql.exec.vector.LongColumnVector; import org.apache.hadoop.hive.ql.exec.vector.VectorExpressionDescriptor; import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch; +import org.apache.hadoop.hive.ql.metadata.HiveException; /** * This class performs OR expression on two input columns and stores, @@ -51,7 +52,7 @@ public ColOrCol() { } @Override - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { if (childExpressions != null) { super.evaluateChildren(batch); diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/DateColSubtractDateColumn.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/DateColSubtractDateColumn.java index 7342d9e..d963b87 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/DateColSubtractDateColumn.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/DateColSubtractDateColumn.java @@ -57,7 +57,7 @@ public DateColSubtractDateColumn() { } @Override - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { if (childExpressions != null) { super.evaluateChildren(batch); diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/DateColSubtractDateScalar.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/DateColSubtractDateScalar.java index 3ea189a..8942b78 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/DateColSubtractDateScalar.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/DateColSubtractDateScalar.java @@ -59,7 +59,7 @@ public DateColSubtractDateScalar() { } @Override - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { if (childExpressions != null) { super.evaluateChildren(batch); diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/DateScalarSubtractDateColumn.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/DateScalarSubtractDateColumn.java index a87ae39..68b038f 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/DateScalarSubtractDateColumn.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/DateScalarSubtractDateColumn.java @@ -61,7 +61,7 @@ public DateScalarSubtractDateColumn() { * * @batch a package of rows with each column stored in a vector */ - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { if (childExpressions != null) { super.evaluateChildren(batch); diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/DecimalColumnInList.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/DecimalColumnInList.java index a677f90..e150789 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/DecimalColumnInList.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/DecimalColumnInList.java @@ -70,7 +70,7 @@ public void transientInit() throws HiveException { } @Override - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { if (childExpressions != null) { super.evaluateChildren(batch); diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/DecimalToStringUnaryUDF.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/DecimalToStringUnaryUDF.java index 452bd5e..84cb6c8 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/DecimalToStringUnaryUDF.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/DecimalToStringUnaryUDF.java @@ -24,6 +24,7 @@ import org.apache.hadoop.hive.ql.exec.vector.DecimalColumnVector; import org.apache.hadoop.hive.ql.exec.vector.VectorExpressionDescriptor; import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch; +import org.apache.hadoop.hive.ql.metadata.HiveException; /** * This is a superclass for unary decimal functions returning strings that operate directly on the @@ -48,7 +49,7 @@ public DecimalToStringUnaryUDF() { abstract protected void func(BytesColumnVector outputColVector, DecimalColumnVector inputColVector, int i); @Override - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { if (childExpressions != null) { super.evaluateChildren(batch); diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/DoubleColumnInList.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/DoubleColumnInList.java index 89e58f1..20458b2 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/DoubleColumnInList.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/DoubleColumnInList.java @@ -25,6 +25,7 @@ import org.apache.hadoop.hive.ql.exec.vector.LongColumnVector; import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch; import org.apache.hadoop.hive.ql.exec.vector.VectorExpressionDescriptor; +import org.apache.hadoop.hive.ql.metadata.HiveException; /** * Output a boolean value indicating if a column is IN a list of constants. @@ -51,7 +52,7 @@ public DoubleColumnInList() { } @Override - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { if (childExpressions != null) { super.evaluateChildren(batch); diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/DoubleToStringUnaryUDF.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/DoubleToStringUnaryUDF.java index b33046e..00d2710 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/DoubleToStringUnaryUDF.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/DoubleToStringUnaryUDF.java @@ -24,6 +24,7 @@ import org.apache.hadoop.hive.ql.exec.vector.DoubleColumnVector; import org.apache.hadoop.hive.ql.exec.vector.VectorExpressionDescriptor; import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch; +import org.apache.hadoop.hive.ql.metadata.HiveException; /** * This is a superclass for unary double functions returning strings that operate directly on the @@ -49,7 +50,7 @@ public DoubleToStringUnaryUDF() { abstract protected void func(BytesColumnVector outputColVector, double[] vector, int i); @Override - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { if (childExpressions != null) { super.evaluateChildren(batch); diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FilterColAndScalar.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FilterColAndScalar.java index 17922d9..7c78e58 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FilterColAndScalar.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FilterColAndScalar.java @@ -20,6 +20,7 @@ import org.apache.hadoop.hive.ql.exec.vector.VectorExpressionDescriptor; import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch; +import org.apache.hadoop.hive.ql.metadata.HiveException; public class FilterColAndScalar extends VectorExpression { @@ -42,7 +43,7 @@ public FilterColAndScalar(int colNum, long scalarVal) { } @Override - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { if (value == 0) { batch.size = 0; return; diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FilterColOrScalar.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FilterColOrScalar.java index 6a5a817..4dc9715 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FilterColOrScalar.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FilterColOrScalar.java @@ -20,6 +20,7 @@ import org.apache.hadoop.hive.ql.exec.vector.VectorExpressionDescriptor; import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch; +import org.apache.hadoop.hive.ql.metadata.HiveException; public class FilterColOrScalar extends VectorExpression { @@ -43,7 +44,7 @@ public FilterColOrScalar(int colNum, long scalarVal) { } @Override - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { // Evaluate children only of scalar is FALSE. if (value == 0) { super.evaluateChildren(batch); diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FilterDecimalColumnInList.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FilterDecimalColumnInList.java index c8d696b..b6ca2ac 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FilterDecimalColumnInList.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FilterDecimalColumnInList.java @@ -67,7 +67,7 @@ public void transientInit() throws HiveException { } @Override - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { if (childExpressions != null) { super.evaluateChildren(batch); diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FilterDoubleColumnInList.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FilterDoubleColumnInList.java index 35b73c3..c4e0ed6 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FilterDoubleColumnInList.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FilterDoubleColumnInList.java @@ -71,7 +71,7 @@ public void transientInit() throws HiveException { } @Override - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { if (childExpressions != null) { super.evaluateChildren(batch); diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FilterExprAndExpr.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FilterExprAndExpr.java index 52e95f2..9a239b6 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FilterExprAndExpr.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FilterExprAndExpr.java @@ -22,6 +22,7 @@ import org.apache.hadoop.hive.ql.exec.vector.VectorExpressionDescriptor; import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch; +import org.apache.hadoop.hive.ql.metadata.HiveException; /** * This class represents a non leaf binary operator in the expression tree. @@ -35,7 +36,7 @@ public FilterExprAndExpr() { } @Override - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { childExpressions[0].evaluate(batch); for (int childIndex = 1; childIndex < childExpressions.length; childIndex++) { childExpressions[childIndex].evaluate(batch); diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FilterExprOrExpr.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FilterExprOrExpr.java index 5593d48..a32e394 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FilterExprOrExpr.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FilterExprOrExpr.java @@ -22,6 +22,7 @@ import org.apache.hadoop.hive.ql.exec.vector.VectorExpressionDescriptor; import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch; +import org.apache.hadoop.hive.ql.metadata.HiveException; /** * This class represents an Or expression. This applies short circuit optimization. @@ -113,7 +114,7 @@ public boolean verifyMonotonicallyIncreasing(int[] selected, int size) { } @Override - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { int n = batch.size; if (n <= 0) { return; diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FilterLongColumnInList.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FilterLongColumnInList.java index 0c6b0f0..312a388 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FilterLongColumnInList.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FilterLongColumnInList.java @@ -69,7 +69,7 @@ public void transientInit() throws HiveException { } @Override - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { if (childExpressions != null) { super.evaluateChildren(batch); diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FilterScalarAndColumn.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FilterScalarAndColumn.java index 9b0a015..9b319e5 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FilterScalarAndColumn.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FilterScalarAndColumn.java @@ -20,6 +20,7 @@ import org.apache.hadoop.hive.ql.exec.vector.VectorExpressionDescriptor; import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch; +import org.apache.hadoop.hive.ql.metadata.HiveException; public class FilterScalarAndColumn extends VectorExpression { @@ -42,7 +43,7 @@ public FilterScalarAndColumn(long scalarVal, int colNum) { } @Override - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { if (value == 0) { batch.size = 0; return; diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FilterScalarOrColumn.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FilterScalarOrColumn.java index 355377c..6e12404 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FilterScalarOrColumn.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FilterScalarOrColumn.java @@ -20,6 +20,7 @@ import org.apache.hadoop.hive.ql.exec.vector.VectorExpressionDescriptor; import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch; +import org.apache.hadoop.hive.ql.metadata.HiveException; public class FilterScalarOrColumn extends VectorExpression { @@ -42,7 +43,7 @@ public FilterScalarOrColumn(long scalarVal, int colNum) { } @Override - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { // Evaluate children only of scalar is FALSE. if (value == 0) { super.evaluateChildren(batch); diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FilterStringColumnInList.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FilterStringColumnInList.java index 1bc79fc..3456abb 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FilterStringColumnInList.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FilterStringColumnInList.java @@ -24,6 +24,7 @@ import org.apache.hadoop.hive.ql.exec.vector.BytesColumnVector; import org.apache.hadoop.hive.ql.exec.vector.VectorExpressionDescriptor.Descriptor; import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch; +import org.apache.hadoop.hive.ql.metadata.HiveException; /** * Evaluate an IN filter on a batch for a vector of strings. @@ -54,7 +55,7 @@ public FilterStringColumnInList(int colNum) { } @Override - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { if (childExpressions != null) { super.evaluateChildren(batch); diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FilterStructColumnInList.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FilterStructColumnInList.java index e4e0665..ca1bf42 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FilterStructColumnInList.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FilterStructColumnInList.java @@ -61,7 +61,7 @@ public FilterStructColumnInList() { } @Override - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { final int logicalSize = batch.size; if (logicalSize == 0) { diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FilterTimestampColumnInList.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FilterTimestampColumnInList.java index ca92c7c..cb22e2a 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FilterTimestampColumnInList.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FilterTimestampColumnInList.java @@ -65,7 +65,7 @@ public void transientInit() throws HiveException { } @Override - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { if (childExpressions != null) { super.evaluateChildren(batch); diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FuncDecimalToDouble.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FuncDecimalToDouble.java index 2d8becf..0921550 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FuncDecimalToDouble.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FuncDecimalToDouble.java @@ -24,6 +24,7 @@ import org.apache.hadoop.hive.ql.exec.vector.DoubleColumnVector; import org.apache.hadoop.hive.ql.exec.vector.VectorExpressionDescriptor; import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch; +import org.apache.hadoop.hive.ql.metadata.HiveException; /** * This is a superclass for unary decimal functions and expressions returning doubles that @@ -48,7 +49,7 @@ public FuncDecimalToDouble() { abstract protected void func(DoubleColumnVector outputColVector, DecimalColumnVector inputColVector, int i); @Override - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { if (childExpressions != null) { super.evaluateChildren(batch); diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FuncDecimalToLong.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FuncDecimalToLong.java index 0ef3da0..6b90ec5 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FuncDecimalToLong.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FuncDecimalToLong.java @@ -24,6 +24,7 @@ import org.apache.hadoop.hive.ql.exec.vector.LongColumnVector; import org.apache.hadoop.hive.ql.exec.vector.VectorExpressionDescriptor; import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch; +import org.apache.hadoop.hive.ql.metadata.HiveException; import org.apache.hadoop.hive.serde2.objectinspector.PrimitiveObjectInspector.PrimitiveCategory; import org.apache.hadoop.hive.serde2.typeinfo.TypeInfo; import org.apache.hadoop.hive.serde2.typeinfo.TypeInfoUtils; @@ -56,7 +57,7 @@ public FuncDecimalToLong() { abstract protected void func(LongColumnVector outputColVector, DecimalColumnVector inputColVector, int i); @Override - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { if (childExpressions != null) { super.evaluateChildren(batch); diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FuncDecimalToTimestamp.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FuncDecimalToTimestamp.java index 8324506..01d710d 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FuncDecimalToTimestamp.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FuncDecimalToTimestamp.java @@ -24,6 +24,7 @@ import org.apache.hadoop.hive.ql.exec.vector.TimestampColumnVector; import org.apache.hadoop.hive.ql.exec.vector.VectorExpressionDescriptor; import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch; +import org.apache.hadoop.hive.ql.metadata.HiveException; /** * This is a superclass for unary decimal functions and expressions returning timestamps that @@ -49,7 +50,7 @@ public FuncDecimalToTimestamp() { abstract protected void func(TimestampColumnVector outputColVector, DecimalColumnVector inputColVector, int i); @Override - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { if (childExpressions != null) { super.evaluateChildren(batch); diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FuncDoubleToDecimal.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FuncDoubleToDecimal.java index b67632a..7fc8f6a 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FuncDoubleToDecimal.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FuncDoubleToDecimal.java @@ -24,6 +24,7 @@ import org.apache.hadoop.hive.ql.exec.vector.DoubleColumnVector; import org.apache.hadoop.hive.ql.exec.vector.VectorExpressionDescriptor; import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch; +import org.apache.hadoop.hive.ql.metadata.HiveException; /** * This is a superclass for unary double functions and expressions returning decimals that @@ -48,7 +49,7 @@ public FuncDoubleToDecimal() { abstract protected void func(DecimalColumnVector outputColVector, DoubleColumnVector inputColVector, int i); @Override - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { if (childExpressions != null) { super.evaluateChildren(batch); diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FuncLongToDecimal.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FuncLongToDecimal.java index 1b8707e..d3136c3 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FuncLongToDecimal.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FuncLongToDecimal.java @@ -24,6 +24,7 @@ import org.apache.hadoop.hive.ql.exec.vector.LongColumnVector; import org.apache.hadoop.hive.ql.exec.vector.VectorExpressionDescriptor; import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch; +import org.apache.hadoop.hive.ql.metadata.HiveException; /** * This is a superclass for unary long functions and expressions returning decimals that @@ -48,7 +49,7 @@ public FuncLongToDecimal() { abstract protected void func(DecimalColumnVector outputColVector, LongColumnVector inputColVector, int i); @Override - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { if (childExpressions != null) { super.evaluateChildren(batch); diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FuncLongToString.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FuncLongToString.java index 733444e..5805afc 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FuncLongToString.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FuncLongToString.java @@ -61,7 +61,7 @@ public void transientInit() throws HiveException { } @Override - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { if (childExpressions != null) { super.evaluateChildren(batch); diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FuncRand.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FuncRand.java index aebfa25..d6d52ed 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FuncRand.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FuncRand.java @@ -24,6 +24,7 @@ import org.apache.hadoop.hive.ql.exec.vector.DoubleColumnVector; import org.apache.hadoop.hive.ql.exec.vector.VectorExpressionDescriptor; import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch; +import org.apache.hadoop.hive.ql.metadata.HiveException; /** * Implements vectorized rand(seed) function evaluation. @@ -46,7 +47,7 @@ public FuncRand() { } @Override - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { if (childExpressions != null) { this.evaluateChildren(batch); diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FuncRandNoSeed.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FuncRandNoSeed.java index f0d7c60..a432d3d 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FuncRandNoSeed.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FuncRandNoSeed.java @@ -24,6 +24,7 @@ import org.apache.hadoop.hive.ql.exec.vector.DoubleColumnVector; import org.apache.hadoop.hive.ql.exec.vector.VectorExpressionDescriptor; import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch; +import org.apache.hadoop.hive.ql.metadata.HiveException; /** * Implements vectorized rand() function evaluation. @@ -46,7 +47,7 @@ public FuncRandNoSeed() { } @Override - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { if (childExpressions != null) { this.evaluateChildren(batch); diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FuncRoundWithNumDigitsDecimalToDecimal.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FuncRoundWithNumDigitsDecimalToDecimal.java index e605e88..bad5101 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FuncRoundWithNumDigitsDecimalToDecimal.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FuncRoundWithNumDigitsDecimalToDecimal.java @@ -23,6 +23,7 @@ import org.apache.hadoop.hive.ql.exec.vector.VectorExpressionDescriptor; import org.apache.hadoop.hive.ql.exec.vector.DecimalColumnVector; import org.apache.hadoop.hive.ql.exec.vector.expressions.DecimalUtil; +import org.apache.hadoop.hive.ql.metadata.HiveException; import org.apache.hadoop.hive.serde2.io.HiveDecimalWritable; import java.util.Arrays; @@ -48,7 +49,7 @@ public FuncRoundWithNumDigitsDecimalToDecimal() { } @Override - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { if (childExpressions != null) { this.evaluateChildren(batch); diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FuncStringToLong.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FuncStringToLong.java index 1b5c07a..fffb36d 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FuncStringToLong.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FuncStringToLong.java @@ -24,6 +24,7 @@ import org.apache.hadoop.hive.ql.exec.vector.LongColumnVector; import org.apache.hadoop.hive.ql.exec.vector.VectorExpressionDescriptor; import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch; +import org.apache.hadoop.hive.ql.metadata.HiveException; /** * Superclass to support vectorized functions that take a long @@ -46,7 +47,7 @@ public FuncStringToLong() { } @Override - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { if (childExpressions != null) { super.evaluateChildren(batch); diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FuncTimestampToDecimal.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FuncTimestampToDecimal.java index 2213b83..53b3d83 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FuncTimestampToDecimal.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FuncTimestampToDecimal.java @@ -24,6 +24,7 @@ import org.apache.hadoop.hive.ql.exec.vector.TimestampColumnVector; import org.apache.hadoop.hive.ql.exec.vector.VectorExpressionDescriptor; import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch; +import org.apache.hadoop.hive.ql.metadata.HiveException; /** * This is a superclass for unary timestamp functions and expressions returning decimals that @@ -49,7 +50,7 @@ public FuncTimestampToDecimal() { abstract protected void func(DecimalColumnVector outputColVector, TimestampColumnVector inputColVector, int i); @Override - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { if (childExpressions != null) { super.evaluateChildren(batch); diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FuncTimestampToLong.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FuncTimestampToLong.java index 060070e..c02ad5d 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FuncTimestampToLong.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FuncTimestampToLong.java @@ -25,6 +25,7 @@ import org.apache.hadoop.hive.ql.exec.vector.TimestampColumnVector; import org.apache.hadoop.hive.ql.exec.vector.VectorExpressionDescriptor; import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch; +import org.apache.hadoop.hive.ql.metadata.HiveException; /** * This is a superclass for unary timestamp functions and expressions returning long that @@ -50,7 +51,7 @@ public FuncTimestampToLong() { abstract protected void func(LongColumnVector outputColVector, TimestampColumnVector inputColVector, int i); @Override - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { if (childExpressions != null) { super.evaluateChildren(batch); diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/IdentityExpression.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/IdentityExpression.java index 86d3dbf..8f24027 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/IdentityExpression.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/IdentityExpression.java @@ -19,6 +19,7 @@ import org.apache.hadoop.hive.ql.exec.vector.VectorExpressionDescriptor; import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch; +import org.apache.hadoop.hive.ql.metadata.HiveException; /** * An expression representing a column, only children are evaluated. @@ -35,7 +36,7 @@ public IdentityExpression(int colNum) { } @Override - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { if (childExpressions != null) { this.evaluateChildren(batch); } diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/IfExprColumnCondExpr.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/IfExprColumnCondExpr.java index 94e5190..0a1fa17 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/IfExprColumnCondExpr.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/IfExprColumnCondExpr.java @@ -19,6 +19,7 @@ import org.apache.hadoop.hive.ql.exec.vector.ColumnVector; import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch; +import org.apache.hadoop.hive.ql.metadata.HiveException; /** * Do regular execution of the THEN vector expression (a column or scalar) and conditional execution @@ -46,7 +47,7 @@ public IfExprColumnCondExpr() { } @Override - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { int n = batch.size; if (n <= 0) { diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/IfExprColumnNull.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/IfExprColumnNull.java index bf2c9a4..7d56ed3 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/IfExprColumnNull.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/IfExprColumnNull.java @@ -21,6 +21,7 @@ import org.apache.hadoop.hive.ql.exec.vector.LongColumnVector; import org.apache.hadoop.hive.ql.exec.vector.VectorExpressionDescriptor; import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch; +import org.apache.hadoop.hive.ql.metadata.HiveException; public class IfExprColumnNull extends VectorExpression { @@ -44,7 +45,7 @@ public IfExprColumnNull() { } @Override - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { if (childExpressions != null) { super.evaluateChildren(batch); diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/IfExprCondExprBase.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/IfExprCondExprBase.java index abc1343..04b54a2 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/IfExprCondExprBase.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/IfExprCondExprBase.java @@ -20,6 +20,7 @@ import org.apache.hadoop.hive.ql.exec.vector.LongColumnVector; import org.apache.hadoop.hive.ql.exec.vector.VectorExpressionDescriptor; import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch; +import org.apache.hadoop.hive.ql.metadata.HiveException; /** * Base class that supports conditional execution of the THEN/ELSE vector expressions of @@ -54,7 +55,7 @@ public IfExprCondExprBase() { } public void conditionalEvaluate(VectorizedRowBatch batch, VectorExpression condVecExpr, - int[] condSelected, int condSize) { + int[] condSelected, int condSize) throws HiveException { int saveSize = batch.size; boolean saveSelectedInUse = batch.selectedInUse; @@ -72,7 +73,7 @@ public void conditionalEvaluate(VectorizedRowBatch batch, VectorExpression condV } @Override - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { // NOTE: We do conditional vector expression so we do not call super.evaluateChildren(batch). diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/IfExprCondExprColumn.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/IfExprCondExprColumn.java index cc465c1..f2f4d3e 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/IfExprCondExprColumn.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/IfExprCondExprColumn.java @@ -19,6 +19,7 @@ import org.apache.hadoop.hive.ql.exec.vector.ColumnVector; import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch; +import org.apache.hadoop.hive.ql.metadata.HiveException; /** * Do conditional execution of the THEN/ vector expression and regular execution of the ELSE @@ -46,7 +47,7 @@ public IfExprCondExprColumn() { } @Override - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { int n = batch.size; if (n <= 0) { diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/IfExprCondExprCondExpr.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/IfExprCondExprCondExpr.java index 7874d5c..59db6b7 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/IfExprCondExprCondExpr.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/IfExprCondExprCondExpr.java @@ -19,6 +19,7 @@ import org.apache.hadoop.hive.ql.exec.vector.ColumnVector; import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch; +import org.apache.hadoop.hive.ql.metadata.HiveException; /** * Do conditional execution of the THEN/ELSE vector expressions of a SQL IF statement. @@ -45,7 +46,7 @@ public IfExprCondExprCondExpr() { } @Override - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { int n = batch.size; if (n <= 0) { diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/IfExprCondExprNull.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/IfExprCondExprNull.java index b2bf0e4..40dbb38 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/IfExprCondExprNull.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/IfExprCondExprNull.java @@ -19,6 +19,7 @@ import org.apache.hadoop.hive.ql.exec.vector.ColumnVector; import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch; +import org.apache.hadoop.hive.ql.metadata.HiveException; /** * Do conditional execution of the THEN vector expression with NULL ELSE of a SQL IF statement. @@ -41,7 +42,7 @@ public IfExprCondExprNull() { } @Override - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { int n = batch.size; if (n <= 0) { diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/IfExprDoubleColumnDoubleColumn.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/IfExprDoubleColumnDoubleColumn.java index 4296692..3772270 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/IfExprDoubleColumnDoubleColumn.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/IfExprDoubleColumnDoubleColumn.java @@ -21,6 +21,7 @@ import org.apache.hadoop.hive.ql.exec.vector.LongColumnVector; import org.apache.hadoop.hive.ql.exec.vector.VectorExpressionDescriptor; import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch; +import org.apache.hadoop.hive.ql.metadata.HiveException; /** * Compute IF(expr1, expr2, expr3) for 3 input column expressions. @@ -53,7 +54,7 @@ public IfExprDoubleColumnDoubleColumn() { } @Override - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { if (childExpressions != null) { super.evaluateChildren(batch); diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/IfExprIntervalDayTimeColumnColumn.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/IfExprIntervalDayTimeColumnColumn.java index 099a319..13e5fff 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/IfExprIntervalDayTimeColumnColumn.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/IfExprIntervalDayTimeColumnColumn.java @@ -21,6 +21,7 @@ import org.apache.hadoop.hive.ql.exec.vector.IntervalDayTimeColumnVector; import org.apache.hadoop.hive.ql.exec.vector.VectorExpressionDescriptor; import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch; +import org.apache.hadoop.hive.ql.metadata.HiveException; /** * Compute IF(expr1, expr2, expr3) for 3 input column expressions. @@ -53,7 +54,7 @@ public IfExprIntervalDayTimeColumnColumn() { } @Override - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { if (childExpressions != null) { super.evaluateChildren(batch); diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/IfExprIntervalDayTimeColumnScalar.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/IfExprIntervalDayTimeColumnScalar.java index 905ffba..d5fb6a0 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/IfExprIntervalDayTimeColumnScalar.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/IfExprIntervalDayTimeColumnScalar.java @@ -25,6 +25,7 @@ import org.apache.hadoop.hive.ql.exec.vector.IntervalDayTimeColumnVector; import org.apache.hadoop.hive.ql.exec.vector.VectorExpressionDescriptor; import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch; +import org.apache.hadoop.hive.ql.metadata.HiveException; /** * Compute IF(expr1, expr2, expr3) for 3 input column expressions. @@ -58,7 +59,7 @@ public IfExprIntervalDayTimeColumnScalar() { } @Override - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { if (childExpressions != null) { super.evaluateChildren(batch); diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/IfExprIntervalDayTimeScalarColumn.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/IfExprIntervalDayTimeScalarColumn.java index e99754b..53466e5 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/IfExprIntervalDayTimeScalarColumn.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/IfExprIntervalDayTimeScalarColumn.java @@ -25,6 +25,7 @@ import org.apache.hadoop.hive.ql.exec.vector.IntervalDayTimeColumnVector; import org.apache.hadoop.hive.ql.exec.vector.VectorExpressionDescriptor; import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch; +import org.apache.hadoop.hive.ql.metadata.HiveException; /** * Compute IF(expr1, expr2, expr3) for 3 input column expressions. @@ -58,7 +59,7 @@ public IfExprIntervalDayTimeScalarColumn() { } @Override - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { if (childExpressions != null) { super.evaluateChildren(batch); diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/IfExprIntervalDayTimeScalarScalar.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/IfExprIntervalDayTimeScalarScalar.java index 5875d48..177f358 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/IfExprIntervalDayTimeScalarScalar.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/IfExprIntervalDayTimeScalarScalar.java @@ -25,6 +25,7 @@ import org.apache.hadoop.hive.ql.exec.vector.IntervalDayTimeColumnVector; import org.apache.hadoop.hive.ql.exec.vector.VectorExpressionDescriptor; import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch; +import org.apache.hadoop.hive.ql.metadata.HiveException; /** * Compute IF(expr1, expr2, expr3) for 3 input expressions. @@ -58,7 +59,7 @@ public IfExprIntervalDayTimeScalarScalar() { } @Override - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { if (childExpressions != null) { super.evaluateChildren(batch); diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/IfExprLongColumnLongColumn.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/IfExprLongColumnLongColumn.java index d8ec895..75de7a0 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/IfExprLongColumnLongColumn.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/IfExprLongColumnLongColumn.java @@ -20,6 +20,7 @@ import org.apache.hadoop.hive.ql.exec.vector.LongColumnVector; import org.apache.hadoop.hive.ql.exec.vector.VectorExpressionDescriptor; import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch; +import org.apache.hadoop.hive.ql.metadata.HiveException; /** * Compute IF(expr1, expr2, expr3) for 3 input column expressions. @@ -52,7 +53,7 @@ public IfExprLongColumnLongColumn() { } @Override - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { if (childExpressions != null) { super.evaluateChildren(batch); diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/IfExprNullColumn.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/IfExprNullColumn.java index 4afdce4..a4c44c3 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/IfExprNullColumn.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/IfExprNullColumn.java @@ -21,6 +21,7 @@ import org.apache.hadoop.hive.ql.exec.vector.LongColumnVector; import org.apache.hadoop.hive.ql.exec.vector.VectorExpressionDescriptor; import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch; +import org.apache.hadoop.hive.ql.metadata.HiveException; public class IfExprNullColumn extends VectorExpression { @@ -44,7 +45,7 @@ public IfExprNullColumn() { } @Override - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { if (childExpressions != null) { super.evaluateChildren(batch); diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/IfExprNullCondExpr.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/IfExprNullCondExpr.java index 2ca3388..aa971c3 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/IfExprNullCondExpr.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/IfExprNullCondExpr.java @@ -19,6 +19,7 @@ import org.apache.hadoop.hive.ql.exec.vector.ColumnVector; import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch; +import org.apache.hadoop.hive.ql.metadata.HiveException; /** * Do conditional execution of a NULL THEN and a ELSE vector expression of a SQL IF statement. @@ -41,7 +42,7 @@ public IfExprNullCondExpr() { } @Override - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { int n = batch.size; if (n <= 0) { diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/IfExprNullNull.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/IfExprNullNull.java index 5a68cec..c5a4bd3 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/IfExprNullNull.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/IfExprNullNull.java @@ -20,6 +20,7 @@ import org.apache.hadoop.hive.ql.exec.vector.ColumnVector; import org.apache.hadoop.hive.ql.exec.vector.VectorExpressionDescriptor; import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch; +import org.apache.hadoop.hive.ql.metadata.HiveException; public class IfExprNullNull extends VectorExpression { @@ -34,7 +35,7 @@ public IfExprNullNull() { } @Override - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { if (childExpressions != null) { super.evaluateChildren(batch); diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/IfExprStringGroupColumnStringGroupColumn.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/IfExprStringGroupColumnStringGroupColumn.java index bb57e4e..fc244ec 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/IfExprStringGroupColumnStringGroupColumn.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/IfExprStringGroupColumnStringGroupColumn.java @@ -23,6 +23,7 @@ import org.apache.hadoop.hive.ql.exec.vector.BytesColumnVector; import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch; import org.apache.hadoop.hive.ql.exec.vector.VectorExpressionDescriptor; +import org.apache.hadoop.hive.ql.metadata.HiveException; /** * Compute IF(expr1, expr2, expr3) for 3 input column expressions. @@ -55,7 +56,7 @@ public IfExprStringGroupColumnStringGroupColumn() { } @Override - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { if (childExpressions != null) { super.evaluateChildren(batch); diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/IfExprStringGroupColumnStringScalar.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/IfExprStringGroupColumnStringScalar.java index 998448a..e6b30d9 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/IfExprStringGroupColumnStringScalar.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/IfExprStringGroupColumnStringScalar.java @@ -25,6 +25,7 @@ import org.apache.hadoop.hive.ql.exec.vector.BytesColumnVector; import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch; import org.apache.hadoop.hive.ql.exec.vector.VectorExpressionDescriptor; +import org.apache.hadoop.hive.ql.metadata.HiveException; /** * Compute IF(expr1, expr2, expr3) for 3 input expressions. @@ -58,7 +59,7 @@ public IfExprStringGroupColumnStringScalar() { } @Override - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { if (childExpressions != null) { super.evaluateChildren(batch); diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/IfExprStringScalarStringGroupColumn.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/IfExprStringScalarStringGroupColumn.java index c597a34..52ed087 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/IfExprStringScalarStringGroupColumn.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/IfExprStringScalarStringGroupColumn.java @@ -25,6 +25,7 @@ import org.apache.hadoop.hive.ql.exec.vector.BytesColumnVector; import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch; import org.apache.hadoop.hive.ql.exec.vector.VectorExpressionDescriptor; +import org.apache.hadoop.hive.ql.metadata.HiveException; /** * Compute IF(expr1, expr2, expr3) for 3 input column expressions. @@ -59,7 +60,7 @@ public IfExprStringScalarStringGroupColumn() { } @Override - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { if (childExpressions != null) { super.evaluateChildren(batch); diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/IfExprStringScalarStringScalar.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/IfExprStringScalarStringScalar.java index 9c0e7be..9992743 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/IfExprStringScalarStringScalar.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/IfExprStringScalarStringScalar.java @@ -26,6 +26,7 @@ import org.apache.hadoop.hive.ql.exec.vector.BytesColumnVector; import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch; import org.apache.hadoop.hive.ql.exec.vector.VectorExpressionDescriptor; +import org.apache.hadoop.hive.ql.metadata.HiveException; /** * Compute IF(expr1, expr2, expr3) for 3 input column expressions. @@ -59,7 +60,7 @@ public IfExprStringScalarStringScalar() { } @Override - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { if (childExpressions != null) { super.evaluateChildren(batch); diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/IfExprTimestampColumnColumnBase.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/IfExprTimestampColumnColumnBase.java index ed21ce9..fc7a859 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/IfExprTimestampColumnColumnBase.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/IfExprTimestampColumnColumnBase.java @@ -20,6 +20,7 @@ import org.apache.hadoop.hive.ql.exec.vector.LongColumnVector; import org.apache.hadoop.hive.ql.exec.vector.TimestampColumnVector; import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch; +import org.apache.hadoop.hive.ql.metadata.HiveException; /** * Compute IF(expr1, expr2, expr3) for 3 input column expressions. @@ -52,7 +53,7 @@ public IfExprTimestampColumnColumnBase() { } @Override - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { if (childExpressions != null) { super.evaluateChildren(batch); diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/IfExprTimestampColumnScalarBase.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/IfExprTimestampColumnScalarBase.java index c0cb2c1..64add36 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/IfExprTimestampColumnScalarBase.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/IfExprTimestampColumnScalarBase.java @@ -25,6 +25,7 @@ import org.apache.hadoop.hive.ql.exec.vector.LongColumnVector; import org.apache.hadoop.hive.ql.exec.vector.TimestampColumnVector; import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch; +import org.apache.hadoop.hive.ql.metadata.HiveException; /** * Compute IF(expr1, expr2, expr3) for 3 input column expressions. @@ -58,7 +59,7 @@ public IfExprTimestampColumnScalarBase() { } @Override - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { if (childExpressions != null) { super.evaluateChildren(batch); diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/IfExprTimestampScalarColumnBase.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/IfExprTimestampScalarColumnBase.java index 0798f1f..73044ad 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/IfExprTimestampScalarColumnBase.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/IfExprTimestampScalarColumnBase.java @@ -26,6 +26,7 @@ import org.apache.hadoop.hive.ql.exec.vector.TimestampColumnVector; import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch; import org.apache.hadoop.hive.ql.exec.vector.VectorExpressionDescriptor; +import org.apache.hadoop.hive.ql.metadata.HiveException; /** * Compute IF(expr1, expr2, expr3) for 3 input column expressions. @@ -59,7 +60,7 @@ public IfExprTimestampScalarColumnBase() { } @Override - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { if (childExpressions != null) { super.evaluateChildren(batch); diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/IfExprTimestampScalarScalarBase.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/IfExprTimestampScalarScalarBase.java index 0059c58..df1418e 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/IfExprTimestampScalarScalarBase.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/IfExprTimestampScalarScalarBase.java @@ -22,6 +22,7 @@ import org.apache.hadoop.hive.ql.exec.vector.LongColumnVector; import org.apache.hadoop.hive.ql.exec.vector.TimestampColumnVector; import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch; +import org.apache.hadoop.hive.ql.metadata.HiveException; import java.sql.Timestamp; import java.util.Arrays; @@ -58,7 +59,7 @@ public IfExprTimestampScalarScalarBase() { } @Override - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { if (childExpressions != null) { super.evaluateChildren(batch); diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/IsNotNull.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/IsNotNull.java index a5cddc6..6f41b42 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/IsNotNull.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/IsNotNull.java @@ -23,6 +23,7 @@ import org.apache.hadoop.hive.ql.exec.vector.LongColumnVector; import org.apache.hadoop.hive.ql.exec.vector.VectorExpressionDescriptor; import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch; +import org.apache.hadoop.hive.ql.metadata.HiveException; /** * This expression evaluates to true if the given input columns is not null. @@ -46,7 +47,7 @@ public IsNotNull() { } @Override - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { if (childExpressions != null) { super.evaluateChildren(batch); diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/IsNull.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/IsNull.java index 17d567f..f700054 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/IsNull.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/IsNull.java @@ -23,6 +23,7 @@ import org.apache.hadoop.hive.ql.exec.vector.LongColumnVector; import org.apache.hadoop.hive.ql.exec.vector.VectorExpressionDescriptor; import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch; +import org.apache.hadoop.hive.ql.metadata.HiveException; /** * This expression evaluates to true if the given input columns is null. @@ -46,7 +47,7 @@ public IsNull() { } @Override - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { if (childExpressions != null) { super.evaluateChildren(batch); diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/ListIndexColColumn.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/ListIndexColColumn.java index 9d22a3c..55417cf 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/ListIndexColColumn.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/ListIndexColColumn.java @@ -23,6 +23,7 @@ import org.apache.hadoop.hive.ql.exec.vector.LongColumnVector; import org.apache.hadoop.hive.ql.exec.vector.VectorExpressionDescriptor; import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch; +import org.apache.hadoop.hive.ql.metadata.HiveException; /** * Vectorized instruction to get an element from a list with the index from another column and put @@ -45,7 +46,7 @@ public ListIndexColColumn(int listColumnNum, int indexColumnNum, int outputColum } @Override - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { if (childExpressions != null) { super.evaluateChildren(batch); } diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/ListIndexColScalar.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/ListIndexColScalar.java index 948652a..808e9fb 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/ListIndexColScalar.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/ListIndexColScalar.java @@ -22,6 +22,7 @@ import org.apache.hadoop.hive.ql.exec.vector.ListColumnVector; import org.apache.hadoop.hive.ql.exec.vector.VectorExpressionDescriptor; import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch; +import org.apache.hadoop.hive.ql.metadata.HiveException; /** * Vectorized instruction to get an element from a list with a scalar index and put @@ -44,7 +45,7 @@ public ListIndexColScalar(int listColumn, int index, int outputColumnNum) { } @Override - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { if (childExpressions != null) { super.evaluateChildren(batch); } diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/LongColDivideLongColumn.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/LongColDivideLongColumn.java index 42483c0..1ed724c 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/LongColDivideLongColumn.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/LongColDivideLongColumn.java @@ -22,6 +22,7 @@ import org.apache.hadoop.hive.ql.exec.vector.LongColumnVector; import org.apache.hadoop.hive.ql.exec.vector.VectorExpressionDescriptor; import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch; +import org.apache.hadoop.hive.ql.metadata.HiveException; /** * This operation is handled as a special case because Hive @@ -49,7 +50,7 @@ public LongColDivideLongColumn() { } @Override - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { if (childExpressions != null) { super.evaluateChildren(batch); diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/LongColDivideLongScalar.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/LongColDivideLongScalar.java index 67d1e76..6445446 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/LongColDivideLongScalar.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/LongColDivideLongScalar.java @@ -24,6 +24,7 @@ import org.apache.hadoop.hive.ql.exec.vector.LongColumnVector; import org.apache.hadoop.hive.ql.exec.vector.VectorExpressionDescriptor; import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch; +import org.apache.hadoop.hive.ql.metadata.HiveException; /** * This operation is handled as a special case because Hive @@ -51,7 +52,7 @@ public LongColDivideLongScalar() { } @Override - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { if (childExpressions != null) { super.evaluateChildren(batch); diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/LongColEqualLongColumn.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/LongColEqualLongColumn.java index 608c32a..308ddf9 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/LongColEqualLongColumn.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/LongColEqualLongColumn.java @@ -21,6 +21,7 @@ import org.apache.hadoop.hive.ql.exec.vector.LongColumnVector; import org.apache.hadoop.hive.ql.exec.vector.VectorExpressionDescriptor; import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch; +import org.apache.hadoop.hive.ql.metadata.HiveException; public class LongColEqualLongColumn extends VectorExpression { @@ -44,7 +45,7 @@ public LongColEqualLongColumn() { } @Override - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { if (childExpressions != null) { super.evaluateChildren(batch); diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/LongColEqualLongScalar.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/LongColEqualLongScalar.java index 1a82e8e..797dd39 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/LongColEqualLongScalar.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/LongColEqualLongScalar.java @@ -23,6 +23,7 @@ import org.apache.hadoop.hive.ql.exec.vector.LongColumnVector; import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch; import org.apache.hadoop.hive.ql.exec.vector.VectorExpressionDescriptor; +import org.apache.hadoop.hive.ql.metadata.HiveException; public class LongColEqualLongScalar extends VectorExpression { private static final long serialVersionUID = 1L; @@ -45,7 +46,7 @@ public LongColEqualLongScalar() { } @Override - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { // return immediately if batch is empty final int n = batch.size; diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/LongColGreaterEqualLongColumn.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/LongColGreaterEqualLongColumn.java index eb040ca..ad9c7a3 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/LongColGreaterEqualLongColumn.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/LongColGreaterEqualLongColumn.java @@ -21,6 +21,7 @@ import org.apache.hadoop.hive.ql.exec.vector.LongColumnVector; import org.apache.hadoop.hive.ql.exec.vector.VectorExpressionDescriptor; import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch; +import org.apache.hadoop.hive.ql.metadata.HiveException; public class LongColGreaterEqualLongColumn extends VectorExpression { @@ -44,7 +45,7 @@ public LongColGreaterEqualLongColumn() { } @Override - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { if (childExpressions != null) { super.evaluateChildren(batch); diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/LongColGreaterEqualLongScalar.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/LongColGreaterEqualLongScalar.java index 3f0ece7..497826a 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/LongColGreaterEqualLongScalar.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/LongColGreaterEqualLongScalar.java @@ -23,6 +23,7 @@ import org.apache.hadoop.hive.ql.exec.vector.LongColumnVector; import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch; import org.apache.hadoop.hive.ql.exec.vector.VectorExpressionDescriptor; +import org.apache.hadoop.hive.ql.metadata.HiveException; public class LongColGreaterEqualLongScalar extends VectorExpression { @@ -46,7 +47,7 @@ public LongColGreaterEqualLongScalar() { } @Override - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { if (childExpressions != null) { super.evaluateChildren(batch); diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/LongColGreaterLongColumn.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/LongColGreaterLongColumn.java index 9ab9e1e..3e1a13e 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/LongColGreaterLongColumn.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/LongColGreaterLongColumn.java @@ -21,6 +21,7 @@ import org.apache.hadoop.hive.ql.exec.vector.LongColumnVector; import org.apache.hadoop.hive.ql.exec.vector.VectorExpressionDescriptor; import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch; +import org.apache.hadoop.hive.ql.metadata.HiveException; public class LongColGreaterLongColumn extends VectorExpression { @@ -44,7 +45,7 @@ public LongColGreaterLongColumn() { } @Override - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { if (childExpressions != null) { super.evaluateChildren(batch); diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/LongColGreaterLongScalar.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/LongColGreaterLongScalar.java index 4d34707..a4deedf 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/LongColGreaterLongScalar.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/LongColGreaterLongScalar.java @@ -23,6 +23,7 @@ import org.apache.hadoop.hive.ql.exec.vector.LongColumnVector; import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch; import org.apache.hadoop.hive.ql.exec.vector.VectorExpressionDescriptor; +import org.apache.hadoop.hive.ql.metadata.HiveException; public class LongColGreaterLongScalar extends VectorExpression { private static final long serialVersionUID = 1L; @@ -45,7 +46,7 @@ public LongColGreaterLongScalar() { } @Override - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { if (childExpressions != null) { super.evaluateChildren(batch); diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/LongColLessEqualLongColumn.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/LongColLessEqualLongColumn.java index 004bf4f..3212269 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/LongColLessEqualLongColumn.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/LongColLessEqualLongColumn.java @@ -21,6 +21,7 @@ import org.apache.hadoop.hive.ql.exec.vector.LongColumnVector; import org.apache.hadoop.hive.ql.exec.vector.VectorExpressionDescriptor; import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch; +import org.apache.hadoop.hive.ql.metadata.HiveException; public class LongColLessEqualLongColumn extends VectorExpression { @@ -44,7 +45,7 @@ public LongColLessEqualLongColumn() { } @Override - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { if (childExpressions != null) { super.evaluateChildren(batch); diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/LongColLessEqualLongScalar.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/LongColLessEqualLongScalar.java index b50bdd3..c2f0de1 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/LongColLessEqualLongScalar.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/LongColLessEqualLongScalar.java @@ -23,6 +23,7 @@ import org.apache.hadoop.hive.ql.exec.vector.LongColumnVector; import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch; import org.apache.hadoop.hive.ql.exec.vector.VectorExpressionDescriptor; +import org.apache.hadoop.hive.ql.metadata.HiveException; public class LongColLessEqualLongScalar extends VectorExpression { @@ -46,7 +47,7 @@ public LongColLessEqualLongScalar() { } @Override - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { if (childExpressions != null) { super.evaluateChildren(batch); diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/LongColLessLongColumn.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/LongColLessLongColumn.java index 3a3425b..7c2ee20 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/LongColLessLongColumn.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/LongColLessLongColumn.java @@ -21,6 +21,7 @@ import org.apache.hadoop.hive.ql.exec.vector.LongColumnVector; import org.apache.hadoop.hive.ql.exec.vector.VectorExpressionDescriptor; import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch; +import org.apache.hadoop.hive.ql.metadata.HiveException; public class LongColLessLongColumn extends VectorExpression { @@ -44,7 +45,7 @@ public LongColLessLongColumn() { } @Override - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { if (childExpressions != null) { super.evaluateChildren(batch); diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/LongColLessLongScalar.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/LongColLessLongScalar.java index f32de24..c7efe84 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/LongColLessLongScalar.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/LongColLessLongScalar.java @@ -23,6 +23,7 @@ import org.apache.hadoop.hive.ql.exec.vector.LongColumnVector; import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch; import org.apache.hadoop.hive.ql.exec.vector.VectorExpressionDescriptor; +import org.apache.hadoop.hive.ql.metadata.HiveException; public class LongColLessLongScalar extends VectorExpression { @@ -46,7 +47,7 @@ public LongColLessLongScalar() { } @Override - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { if (childExpressions != null) { super.evaluateChildren(batch); diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/LongColModuloLongColumn.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/LongColModuloLongColumn.java index cfd61a9..60faebb 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/LongColModuloLongColumn.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/LongColModuloLongColumn.java @@ -21,8 +21,7 @@ import org.apache.hadoop.hive.ql.exec.vector.expressions.VectorExpression; import org.apache.hadoop.hive.ql.exec.vector.expressions.NullUtil; import org.apache.hadoop.hive.ql.exec.vector.*; -import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch; -import org.apache.hadoop.hive.ql.exec.vector.VectorExpressionDescriptor; +import org.apache.hadoop.hive.ql.metadata.HiveException; /** * This operation is handled as a special case because Hive @@ -51,7 +50,7 @@ public LongColModuloLongColumn() { } @Override - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { if (childExpressions != null) { super.evaluateChildren(batch); diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/LongColModuloLongColumnChecked.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/LongColModuloLongColumnChecked.java index f367139..24a860a 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/LongColModuloLongColumnChecked.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/LongColModuloLongColumnChecked.java @@ -19,6 +19,7 @@ import org.apache.hadoop.hive.ql.exec.vector.LongColumnVector; import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch; +import org.apache.hadoop.hive.ql.metadata.HiveException; /** * This vector expression implements a Checked variant of LongColModuloLongColumn @@ -36,7 +37,7 @@ public LongColModuloLongColumnChecked() { } @Override - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { super.evaluate(batch); //checked for overflow based on the outputTypeInfo OverflowUtils diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/LongColNotEqualLongColumn.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/LongColNotEqualLongColumn.java index 833b8fa..213b876 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/LongColNotEqualLongColumn.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/LongColNotEqualLongColumn.java @@ -21,6 +21,7 @@ import org.apache.hadoop.hive.ql.exec.vector.LongColumnVector; import org.apache.hadoop.hive.ql.exec.vector.VectorExpressionDescriptor; import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch; +import org.apache.hadoop.hive.ql.metadata.HiveException; public class LongColNotEqualLongColumn extends VectorExpression { @@ -44,7 +45,7 @@ public LongColNotEqualLongColumn() { } @Override - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { if (childExpressions != null) { super.evaluateChildren(batch); diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/LongColNotEqualLongScalar.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/LongColNotEqualLongScalar.java index b4c68fa..c2b52b8 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/LongColNotEqualLongScalar.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/LongColNotEqualLongScalar.java @@ -23,6 +23,7 @@ import org.apache.hadoop.hive.ql.exec.vector.LongColumnVector; import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch; import org.apache.hadoop.hive.ql.exec.vector.VectorExpressionDescriptor; +import org.apache.hadoop.hive.ql.metadata.HiveException; public class LongColNotEqualLongScalar extends VectorExpression { @@ -46,7 +47,7 @@ public LongColNotEqualLongScalar() { } @Override - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { if (childExpressions != null) { super.evaluateChildren(batch); diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/LongColumnInList.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/LongColumnInList.java index 181aeae..8469882 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/LongColumnInList.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/LongColumnInList.java @@ -24,6 +24,7 @@ import org.apache.hadoop.hive.ql.exec.vector.LongColumnVector; import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch; import org.apache.hadoop.hive.ql.exec.vector.VectorExpressionDescriptor; +import org.apache.hadoop.hive.ql.metadata.HiveException; /** * Output a boolean value indicating if a column is IN a list of constants. @@ -50,7 +51,7 @@ public LongColumnInList() { } @Override - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { if (childExpressions != null) { super.evaluateChildren(batch); diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/LongScalarDivideLongColumn.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/LongScalarDivideLongColumn.java index df78433..31f4a1c 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/LongScalarDivideLongColumn.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/LongScalarDivideLongColumn.java @@ -24,6 +24,7 @@ import org.apache.hadoop.hive.ql.exec.vector.LongColumnVector; import org.apache.hadoop.hive.ql.exec.vector.VectorExpressionDescriptor; import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch; +import org.apache.hadoop.hive.ql.metadata.HiveException; /** * This operation is handled as a special case because Hive @@ -51,7 +52,7 @@ public LongScalarDivideLongColumn() { } @Override - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { if (childExpressions != null) { super.evaluateChildren(batch); diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/LongScalarEqualLongColumn.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/LongScalarEqualLongColumn.java index 2ca74c3..7b28f71 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/LongScalarEqualLongColumn.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/LongScalarEqualLongColumn.java @@ -23,6 +23,7 @@ import org.apache.hadoop.hive.ql.exec.vector.LongColumnVector; import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch; import org.apache.hadoop.hive.ql.exec.vector.VectorExpressionDescriptor; +import org.apache.hadoop.hive.ql.metadata.HiveException; public class LongScalarEqualLongColumn extends VectorExpression { @@ -46,7 +47,7 @@ public LongScalarEqualLongColumn() { } @Override - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { if (childExpressions != null) { super.evaluateChildren(batch); diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/LongScalarGreaterEqualLongColumn.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/LongScalarGreaterEqualLongColumn.java index ac245f6..10fd423 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/LongScalarGreaterEqualLongColumn.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/LongScalarGreaterEqualLongColumn.java @@ -23,6 +23,7 @@ import org.apache.hadoop.hive.ql.exec.vector.LongColumnVector; import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch; import org.apache.hadoop.hive.ql.exec.vector.VectorExpressionDescriptor; +import org.apache.hadoop.hive.ql.metadata.HiveException; public class LongScalarGreaterEqualLongColumn extends VectorExpression { private static final long serialVersionUID = 1L; @@ -45,7 +46,7 @@ public LongScalarGreaterEqualLongColumn() { } @Override - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { if (childExpressions != null) { super.evaluateChildren(batch); diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/LongScalarGreaterLongColumn.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/LongScalarGreaterLongColumn.java index f8cd8a9..ad9ccf5 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/LongScalarGreaterLongColumn.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/LongScalarGreaterLongColumn.java @@ -23,6 +23,7 @@ import org.apache.hadoop.hive.ql.exec.vector.LongColumnVector; import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch; import org.apache.hadoop.hive.ql.exec.vector.VectorExpressionDescriptor; +import org.apache.hadoop.hive.ql.metadata.HiveException; public class LongScalarGreaterLongColumn extends VectorExpression { @@ -46,7 +47,7 @@ public LongScalarGreaterLongColumn() { } @Override - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { if (childExpressions != null) { super.evaluateChildren(batch); diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/LongScalarLessEqualLongColumn.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/LongScalarLessEqualLongColumn.java index 7b3d4b3..abe5d08 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/LongScalarLessEqualLongColumn.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/LongScalarLessEqualLongColumn.java @@ -23,6 +23,7 @@ import org.apache.hadoop.hive.ql.exec.vector.LongColumnVector; import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch; import org.apache.hadoop.hive.ql.exec.vector.VectorExpressionDescriptor; +import org.apache.hadoop.hive.ql.metadata.HiveException; public class LongScalarLessEqualLongColumn extends VectorExpression { @@ -46,7 +47,7 @@ public LongScalarLessEqualLongColumn() { } @Override - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { if (childExpressions != null) { super.evaluateChildren(batch); diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/LongScalarLessLongColumn.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/LongScalarLessLongColumn.java index 948f812..87ab939 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/LongScalarLessLongColumn.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/LongScalarLessLongColumn.java @@ -23,6 +23,7 @@ import org.apache.hadoop.hive.ql.exec.vector.LongColumnVector; import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch; import org.apache.hadoop.hive.ql.exec.vector.VectorExpressionDescriptor; +import org.apache.hadoop.hive.ql.metadata.HiveException; public class LongScalarLessLongColumn extends VectorExpression { @@ -46,7 +47,7 @@ public LongScalarLessLongColumn() { } @Override - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { if (childExpressions != null) { super.evaluateChildren(batch); diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/LongScalarNotEqualLongColumn.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/LongScalarNotEqualLongColumn.java index 1191b31..d936dee 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/LongScalarNotEqualLongColumn.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/LongScalarNotEqualLongColumn.java @@ -23,6 +23,7 @@ import org.apache.hadoop.hive.ql.exec.vector.LongColumnVector; import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch; import org.apache.hadoop.hive.ql.exec.vector.VectorExpressionDescriptor; +import org.apache.hadoop.hive.ql.metadata.HiveException; public class LongScalarNotEqualLongColumn extends VectorExpression { @@ -46,7 +47,7 @@ public LongScalarNotEqualLongColumn() { } @Override - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { if (childExpressions != null) { super.evaluateChildren(batch); diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/LongToStringUnaryUDF.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/LongToStringUnaryUDF.java index 0976f20..de0400e 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/LongToStringUnaryUDF.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/LongToStringUnaryUDF.java @@ -24,6 +24,7 @@ import org.apache.hadoop.hive.ql.exec.vector.LongColumnVector; import org.apache.hadoop.hive.ql.exec.vector.VectorExpressionDescriptor; import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch; +import org.apache.hadoop.hive.ql.metadata.HiveException; /** * This is a superclass for unary long functions returning strings that operate directly on the @@ -49,7 +50,7 @@ public LongToStringUnaryUDF() { abstract protected void func(BytesColumnVector outputColVector, long[] vector, int i); @Override - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { if (childExpressions != null) { super.evaluateChildren(batch); diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/MathFuncDoubleToDouble.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/MathFuncDoubleToDouble.java index aad408f..01ab9c8 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/MathFuncDoubleToDouble.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/MathFuncDoubleToDouble.java @@ -23,6 +23,7 @@ import org.apache.hadoop.hive.ql.exec.vector.DoubleColumnVector; import org.apache.hadoop.hive.ql.exec.vector.LongColumnVector; import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch; +import org.apache.hadoop.hive.ql.metadata.HiveException; /** * Implement vectorized math function that takes a double (and optionally additional @@ -55,7 +56,7 @@ public MathFuncDoubleToDouble() { } @Override - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { if (childExpressions != null) { this.evaluateChildren(batch); diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/MathFuncLongToDouble.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/MathFuncLongToDouble.java index dcebc24..cae6ba1 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/MathFuncLongToDouble.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/MathFuncLongToDouble.java @@ -23,6 +23,7 @@ import org.apache.hadoop.hive.ql.exec.vector.DoubleColumnVector; import org.apache.hadoop.hive.ql.exec.vector.LongColumnVector; import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch; +import org.apache.hadoop.hive.ql.metadata.HiveException; /** * Implement vectorized math function that takes a double (and optionally additional @@ -54,7 +55,7 @@ public MathFuncLongToDouble() { } @Override - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { if (childExpressions != null) { this.evaluateChildren(batch); diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/MathFuncLongToLong.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/MathFuncLongToLong.java index e5b6902..b9fbbf2 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/MathFuncLongToLong.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/MathFuncLongToLong.java @@ -23,6 +23,7 @@ import org.apache.hadoop.hive.ql.exec.vector.DoubleColumnVector; import org.apache.hadoop.hive.ql.exec.vector.LongColumnVector; import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch; +import org.apache.hadoop.hive.ql.metadata.HiveException; /** * Implement vectorized math function that takes a long (and optionally additional @@ -53,7 +54,7 @@ public MathFuncLongToLong() { } @Override - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { if (childExpressions != null) { this.evaluateChildren(batch); diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/NotCol.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/NotCol.java index be69f7f..cfd90e8 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/NotCol.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/NotCol.java @@ -22,6 +22,7 @@ import org.apache.hadoop.hive.ql.exec.vector.LongColumnVector; import org.apache.hadoop.hive.ql.exec.vector.VectorExpressionDescriptor; import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch; +import org.apache.hadoop.hive.ql.metadata.HiveException; /** * Evaluates the boolean complement of the input. @@ -44,7 +45,7 @@ public NotCol() { } @Override - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { if (childExpressions != null) { super.evaluateChildren(batch); diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/OctetLength.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/OctetLength.java index 62873e9..ebea38d 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/OctetLength.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/OctetLength.java @@ -24,6 +24,7 @@ import org.apache.hadoop.hive.ql.exec.vector.LongColumnVector; import org.apache.hadoop.hive.ql.exec.vector.VectorExpressionDescriptor; import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch; +import org.apache.hadoop.hive.ql.metadata.HiveException; public class OctetLength extends VectorExpression { private static final long serialVersionUID = 1L; @@ -44,7 +45,7 @@ public OctetLength() { // Calculate the length of the UTF-8 strings in input vector and place results in output vector. @Override - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { if (childExpressions != null) { super.evaluateChildren(batch); diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/SelectColumnIsFalse.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/SelectColumnIsFalse.java index 8dc995e..79b8692 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/SelectColumnIsFalse.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/SelectColumnIsFalse.java @@ -21,6 +21,7 @@ import org.apache.hadoop.hive.ql.exec.vector.LongColumnVector; import org.apache.hadoop.hive.ql.exec.vector.VectorExpressionDescriptor; import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch; +import org.apache.hadoop.hive.ql.metadata.HiveException; /** * This expression selects a row if the given boolean column is false. @@ -43,7 +44,7 @@ public SelectColumnIsFalse() { } @Override - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { if (childExpressions != null) { super.evaluateChildren(batch); diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/SelectColumnIsNotNull.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/SelectColumnIsNotNull.java index cf484b8..6c7d31d 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/SelectColumnIsNotNull.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/SelectColumnIsNotNull.java @@ -21,6 +21,7 @@ import org.apache.hadoop.hive.ql.exec.vector.ColumnVector; import org.apache.hadoop.hive.ql.exec.vector.VectorExpressionDescriptor; import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch; +import org.apache.hadoop.hive.ql.metadata.HiveException; /** * This expression selects a row if the given column is null. @@ -43,7 +44,7 @@ public SelectColumnIsNotNull() { } @Override - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { if (childExpressions != null) { super.evaluateChildren(batch); diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/SelectColumnIsNull.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/SelectColumnIsNull.java index 3b9a55e..59f0c2b 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/SelectColumnIsNull.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/SelectColumnIsNull.java @@ -21,6 +21,7 @@ import org.apache.hadoop.hive.ql.exec.vector.ColumnVector; import org.apache.hadoop.hive.ql.exec.vector.VectorExpressionDescriptor; import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch; +import org.apache.hadoop.hive.ql.metadata.HiveException; /** * This expression selects a row if the given column is null. @@ -44,7 +45,7 @@ public SelectColumnIsNull() { } @Override - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { if (childExpressions != null) { super.evaluateChildren(batch); } diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/SelectColumnIsTrue.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/SelectColumnIsTrue.java index b2f430d..cff064e 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/SelectColumnIsTrue.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/SelectColumnIsTrue.java @@ -21,6 +21,7 @@ import org.apache.hadoop.hive.ql.exec.vector.LongColumnVector; import org.apache.hadoop.hive.ql.exec.vector.VectorExpressionDescriptor; import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch; +import org.apache.hadoop.hive.ql.metadata.HiveException; /** * This expression selects a row if the given boolean column is true. @@ -43,7 +44,7 @@ public SelectColumnIsTrue() { } @Override - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { if (childExpressions != null) { super.evaluateChildren(batch); } diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/SelectStringColLikeStringScalar.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/SelectStringColLikeStringScalar.java index db684c3..185680b 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/SelectStringColLikeStringScalar.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/SelectStringColLikeStringScalar.java @@ -27,6 +27,7 @@ import org.apache.hadoop.hive.ql.exec.vector.LongColumnVector; import org.apache.hadoop.hive.ql.exec.vector.VectorExpressionDescriptor; import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch; +import org.apache.hadoop.hive.ql.metadata.HiveException; public class SelectStringColLikeStringScalar extends VectorExpression { @@ -52,7 +53,7 @@ public SelectStringColLikeStringScalar(int colNum, byte[] pattern, int outputCol } @Override - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { if (checker == null) { checker = borrowChecker(); } diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/StringColumnInList.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/StringColumnInList.java index eb91321..55c2586 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/StringColumnInList.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/StringColumnInList.java @@ -60,7 +60,7 @@ public StringColumnInList(int colNum, int outputColumnNum) { } @Override - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { if (childExpressions != null) { super.evaluateChildren(batch); diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/StringGroupColConcatStringScalar.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/StringGroupColConcatStringScalar.java index 6c92e39..9194e8b 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/StringGroupColConcatStringScalar.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/StringGroupColConcatStringScalar.java @@ -24,6 +24,7 @@ import org.apache.hadoop.hive.ql.exec.vector.BytesColumnVector; import org.apache.hadoop.hive.ql.exec.vector.VectorExpressionDescriptor; import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch; +import org.apache.hadoop.hive.ql.metadata.HiveException; /** * Vectorized instruction to concatenate a string column to a scalar and put @@ -50,7 +51,7 @@ public StringGroupColConcatStringScalar() { } @Override - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { if (childExpressions != null) { super.evaluateChildren(batch); diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/StringGroupConcatColCol.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/StringGroupConcatColCol.java index 6c40a28..1c9433b 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/StringGroupConcatColCol.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/StringGroupConcatColCol.java @@ -24,6 +24,7 @@ import org.apache.hadoop.hive.ql.exec.vector.ColumnVector; import org.apache.hadoop.hive.ql.exec.vector.VectorExpressionDescriptor; import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch; +import org.apache.hadoop.hive.ql.metadata.HiveException; /** * Vectorized instruction to concatenate two string columns and put @@ -50,7 +51,7 @@ public StringGroupConcatColCol() { } @Override - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { if (childExpressions != null) { super.evaluateChildren(batch); diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/StringLength.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/StringLength.java index f1fabb7..956fd7b 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/StringLength.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/StringLength.java @@ -24,6 +24,7 @@ import org.apache.hadoop.hive.ql.exec.vector.LongColumnVector; import org.apache.hadoop.hive.ql.exec.vector.VectorExpressionDescriptor; import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch; +import org.apache.hadoop.hive.ql.metadata.HiveException; /** * Calculate the length of the strings in the input column vector, and store @@ -48,7 +49,7 @@ public StringLength() { // Calculate the length of the UTF-8 strings in input vector and place results in output vector. @Override - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { if (childExpressions != null) { super.evaluateChildren(batch); diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/StringScalarConcatStringGroupCol.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/StringScalarConcatStringGroupCol.java index a9f09dd..db679b0 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/StringScalarConcatStringGroupCol.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/StringScalarConcatStringGroupCol.java @@ -24,6 +24,7 @@ import org.apache.hadoop.hive.ql.exec.vector.BytesColumnVector; import org.apache.hadoop.hive.ql.exec.vector.VectorExpressionDescriptor; import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch; +import org.apache.hadoop.hive.ql.metadata.HiveException; /** * Vectorized instruction to concatenate a scalar to a string column and put @@ -50,7 +51,7 @@ public StringScalarConcatStringGroupCol() { } @Override - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { if (childExpressions != null) { super.evaluateChildren(batch); diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/StringSubstrColStart.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/StringSubstrColStart.java index 7c58838..411fc4b 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/StringSubstrColStart.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/StringSubstrColStart.java @@ -24,6 +24,7 @@ import org.apache.hadoop.hive.ql.exec.vector.BytesColumnVector; import org.apache.hadoop.hive.ql.exec.vector.VectorExpressionDescriptor; import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch; +import org.apache.hadoop.hive.ql.metadata.HiveException; /** * This class provides the implementation of vectorized substring, with a single start index @@ -120,7 +121,7 @@ static int getSubstrStartOffset(byte[] utf8String, int start, int len, int subst } @Override - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { if (childExpressions != null) { super.evaluateChildren(batch); } diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/StringSubstrColStartLen.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/StringSubstrColStartLen.java index 7c5d19a..e28c0a7 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/StringSubstrColStartLen.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/StringSubstrColStartLen.java @@ -24,6 +24,7 @@ import org.apache.hadoop.hive.ql.exec.vector.BytesColumnVector; import org.apache.hadoop.hive.ql.exec.vector.VectorExpressionDescriptor; import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch; +import org.apache.hadoop.hive.ql.metadata.HiveException; /** * This class provides the implementation of vectorized substring, with a start index and length @@ -141,7 +142,7 @@ static void populateSubstrOffsets(byte[] utf8String, int start, int len, int sub } @Override - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { if (childExpressions != null) { super.evaluateChildren(batch); } diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/StringUnaryUDF.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/StringUnaryUDF.java index 9b7005d..2b89648 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/StringUnaryUDF.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/StringUnaryUDF.java @@ -23,6 +23,7 @@ import org.apache.hadoop.hive.ql.exec.vector.BytesColumnVector; import org.apache.hadoop.hive.ql.exec.vector.VectorExpressionDescriptor; import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch; +import org.apache.hadoop.hive.ql.metadata.HiveException; import org.apache.hadoop.io.Text; /** @@ -59,7 +60,7 @@ public StringUnaryUDF() { } @Override - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { if (childExpressions != null) { super.evaluateChildren(batch); diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/StringUnaryUDFDirect.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/StringUnaryUDFDirect.java index 9462347..5726e89 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/StringUnaryUDFDirect.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/StringUnaryUDFDirect.java @@ -23,6 +23,7 @@ import org.apache.hadoop.hive.ql.exec.vector.BytesColumnVector; import org.apache.hadoop.hive.ql.exec.vector.VectorExpressionDescriptor; import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch; +import org.apache.hadoop.hive.ql.metadata.HiveException; /** * This is a superclass for unary string functions that operate directly on the @@ -49,7 +50,7 @@ public StringUnaryUDFDirect() { abstract protected void func(BytesColumnVector outputColVector, byte[][] vector, int[] start, int[] length, int i); @Override - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { if (childExpressions != null) { super.evaluateChildren(batch); diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/StructColumnInList.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/StructColumnInList.java index 2c661a8..f07be7a 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/StructColumnInList.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/StructColumnInList.java @@ -63,7 +63,7 @@ public StructColumnInList(int outputColumnNum) { } @Override - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { final int logicalSize = batch.size; if (logicalSize == 0) { diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/TimestampColumnInList.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/TimestampColumnInList.java index 31a0ad1..c361764 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/TimestampColumnInList.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/TimestampColumnInList.java @@ -26,6 +26,7 @@ import org.apache.hadoop.hive.ql.exec.vector.VectorExpressionDescriptor.Descriptor; import org.apache.hadoop.hive.ql.exec.vector.LongColumnVector; import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch; +import org.apache.hadoop.hive.ql.metadata.HiveException; /** * Output a boolean value indicating if a column is IN a list of constants. @@ -57,7 +58,7 @@ public TimestampColumnInList(int colNum, int outputColumnNum) { } @Override - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { if (childExpressions != null) { super.evaluateChildren(batch); diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/TimestampToStringUnaryUDF.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/TimestampToStringUnaryUDF.java index 13abfd3..0d9f9f7 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/TimestampToStringUnaryUDF.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/TimestampToStringUnaryUDF.java @@ -24,6 +24,7 @@ import org.apache.hadoop.hive.ql.exec.vector.TimestampColumnVector; import org.apache.hadoop.hive.ql.exec.vector.VectorExpressionDescriptor; import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch; +import org.apache.hadoop.hive.ql.metadata.HiveException; /** * This is a superclass for unary long functions returning strings that operate directly on the @@ -49,7 +50,7 @@ public TimestampToStringUnaryUDF() { abstract protected void func(BytesColumnVector outputColVector, TimestampColumnVector inV, int i); @Override - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { if (childExpressions != null) { super.evaluateChildren(batch); diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/VectorCoalesce.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/VectorCoalesce.java index c66beb0..2bd726d 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/VectorCoalesce.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/VectorCoalesce.java @@ -21,6 +21,7 @@ import org.apache.hadoop.hive.ql.exec.vector.LongColumnVector; import org.apache.hadoop.hive.ql.exec.vector.VectorExpressionDescriptor; import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch; +import org.apache.hadoop.hive.ql.metadata.HiveException; import com.google.common.base.Preconditions; @@ -53,7 +54,7 @@ public VectorCoalesce() { } @Override - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { if (childExpressions != null) { super.evaluateChildren(batch); diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/VectorElt.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/VectorElt.java index a30a7df..00e529d 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/VectorElt.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/VectorElt.java @@ -23,6 +23,7 @@ import org.apache.hadoop.hive.ql.exec.vector.LongColumnVector; import org.apache.hadoop.hive.ql.exec.vector.VectorExpressionDescriptor; import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch; +import org.apache.hadoop.hive.ql.metadata.HiveException; /* * ELT(index, string, ....) returns the string column/expression value at the specified @@ -50,7 +51,7 @@ public VectorElt() { } @Override - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { if (childExpressions != null) { super.evaluateChildren(batch); 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 3d0ee50..893da15 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 @@ -247,8 +247,9 @@ public DataTypePhysicalVariation getOutputDataTypePhysicalVariation() { /** * This is the primary method to implement expression logic. * @param batch + * @throws HiveException */ - public abstract void evaluate(VectorizedRowBatch batch); + public abstract void evaluate(VectorizedRowBatch batch) throws HiveException; public void init(Configuration conf) { if (childExpressions != null) { @@ -264,7 +265,7 @@ public void init(Configuration conf) { * Evaluate the child expressions on the given input batch. * @param vrg {@link VectorizedRowBatch} */ - final protected void evaluateChildren(VectorizedRowBatch vrg) { + final protected void evaluateChildren(VectorizedRowBatch vrg) throws HiveException { if (childExpressions != null) { for (VectorExpression ve : childExpressions) { ve.evaluate(vrg); diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/VectorInBloomFilterColDynamicValue.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/VectorInBloomFilterColDynamicValue.java index 72c2980..d8a3cac 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/VectorInBloomFilterColDynamicValue.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/VectorInBloomFilterColDynamicValue.java @@ -122,7 +122,7 @@ private void initValue() { } @Override - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { if (childExpressions != null) { super.evaluateChildren(batch); } diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/VectorUDFDateAddColCol.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/VectorUDFDateAddColCol.java index f6e9c8b..fa23d89 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/VectorUDFDateAddColCol.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/VectorUDFDateAddColCol.java @@ -72,7 +72,7 @@ public void transientInit() throws HiveException { } @Override - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { if (childExpressions != null) { super.evaluateChildren(batch); diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/VectorUDFDateAddColScalar.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/VectorUDFDateAddColScalar.java index 7bb5c54..a73d2e6 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/VectorUDFDateAddColScalar.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/VectorUDFDateAddColScalar.java @@ -72,7 +72,7 @@ public void transientInit() throws HiveException { } @Override - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { if (childExpressions != null) { super.evaluateChildren(batch); diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/VectorUDFDateAddScalarCol.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/VectorUDFDateAddScalarCol.java index ecde39b..0d418fd 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/VectorUDFDateAddScalarCol.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/VectorUDFDateAddScalarCol.java @@ -81,7 +81,7 @@ public void transientInit() throws HiveException { } @Override - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { if (childExpressions != null) { super.evaluateChildren(batch); diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/VectorUDFDateDiffColCol.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/VectorUDFDateDiffColCol.java index 0d794fe..84ee944 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/VectorUDFDateDiffColCol.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/VectorUDFDateDiffColCol.java @@ -71,7 +71,7 @@ public void transientInit() throws HiveException { } @Override - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { if (childExpressions != null) { super.evaluateChildren(batch); diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/VectorUDFDateDiffColScalar.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/VectorUDFDateDiffColScalar.java index 08c91e2..55af413 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/VectorUDFDateDiffColScalar.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/VectorUDFDateDiffColScalar.java @@ -25,6 +25,7 @@ import org.apache.hadoop.hive.ql.exec.vector.TimestampColumnVector; import org.apache.hadoop.hive.ql.exec.vector.VectorExpressionDescriptor; import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch; +import org.apache.hadoop.hive.ql.metadata.HiveException; import org.apache.hadoop.hive.serde2.io.DateWritable; import org.apache.hadoop.hive.serde2.objectinspector.PrimitiveObjectInspector.PrimitiveCategory; import org.apache.hadoop.hive.serde2.typeinfo.PrimitiveTypeInfo; @@ -75,7 +76,7 @@ public VectorUDFDateDiffColScalar() { } @Override - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { if (childExpressions != null) { super.evaluateChildren(batch); diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/VectorUDFDateDiffScalarCol.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/VectorUDFDateDiffScalarCol.java index c436c96..c51d3cd 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/VectorUDFDateDiffScalarCol.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/VectorUDFDateDiffScalarCol.java @@ -24,6 +24,7 @@ import org.apache.hadoop.hive.ql.exec.vector.TimestampColumnVector; import org.apache.hadoop.hive.ql.exec.vector.VectorExpressionDescriptor; import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch; +import org.apache.hadoop.hive.ql.metadata.HiveException; import org.apache.hadoop.hive.serde2.io.DateWritable; import org.apache.hadoop.hive.serde2.objectinspector.PrimitiveObjectInspector.PrimitiveCategory; import org.apache.hadoop.hive.serde2.typeinfo.PrimitiveTypeInfo; @@ -73,7 +74,7 @@ public VectorUDFDateDiffScalarCol() { } @Override - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { if (childExpressions != null) { super.evaluateChildren(batch); diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/VectorUDFMapIndexBaseCol.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/VectorUDFMapIndexBaseCol.java index 1f2d5cb..157154a 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/VectorUDFMapIndexBaseCol.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/VectorUDFMapIndexBaseCol.java @@ -21,6 +21,7 @@ import org.apache.hadoop.hive.ql.exec.vector.ColumnVector; import org.apache.hadoop.hive.ql.exec.vector.MapColumnVector; import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch; +import org.apache.hadoop.hive.ql.metadata.HiveException; /** * Superclass to support vectorized functions that take a column value as key of Map @@ -45,7 +46,7 @@ public VectorUDFMapIndexBaseCol(int mapColumnNum, int indexColumnNum, int output } @Override - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { if (childExpressions != null) { super.evaluateChildren(batch); } diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/VectorUDFMapIndexBaseScalar.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/VectorUDFMapIndexBaseScalar.java index a7d730b..72662e0 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/VectorUDFMapIndexBaseScalar.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/VectorUDFMapIndexBaseScalar.java @@ -21,6 +21,7 @@ import org.apache.hadoop.hive.ql.exec.vector.ColumnVector; import org.apache.hadoop.hive.ql.exec.vector.MapColumnVector; import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch; +import org.apache.hadoop.hive.ql.metadata.HiveException; /** * Superclass to support vectorized functions that take a scalar as key of Map @@ -42,7 +43,7 @@ public VectorUDFMapIndexBaseScalar(int mapColumnNum, int outputColumnNum) { } @Override - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { if (childExpressions != null) { super.evaluateChildren(batch); } diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/VectorUDFStructField.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/VectorUDFStructField.java index b40126a..342cb05 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/VectorUDFStructField.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/VectorUDFStructField.java @@ -24,6 +24,7 @@ import org.apache.hadoop.hive.ql.exec.vector.StructColumnVector; import org.apache.hadoop.hive.ql.exec.vector.VectorExpressionDescriptor; import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch; +import org.apache.hadoop.hive.ql.metadata.HiveException; /** * Vectorized instruction to get the field of Struct type with field name and put @@ -45,7 +46,7 @@ public VectorUDFStructField(int structColumnNum, int fieldIndex, int outputColum } @Override - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { // return immediately if batch is empty final int n = batch.size; diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/VectorUDFTimestampFieldDate.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/VectorUDFTimestampFieldDate.java index eb6d6dd..a1167b2 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/VectorUDFTimestampFieldDate.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/VectorUDFTimestampFieldDate.java @@ -74,7 +74,7 @@ protected long getDateField(long days) { } @Override - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { Preconditions.checkState( ((PrimitiveTypeInfo) inputTypeInfos[0]).getPrimitiveCategory() == PrimitiveCategory.DATE); diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/VectorUDFTimestampFieldString.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/VectorUDFTimestampFieldString.java index 2918546..931cc98 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/VectorUDFTimestampFieldString.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/VectorUDFTimestampFieldString.java @@ -87,7 +87,7 @@ protected long doGetField(byte[] bytes, int start, int length) throws ParseExcep } @Override - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { if (childExpressions != null) { super.evaluateChildren(batch); diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/VectorUDFTimestampFieldTimestamp.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/VectorUDFTimestampFieldTimestamp.java index 740a00c..a9ea1f6 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/VectorUDFTimestampFieldTimestamp.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/VectorUDFTimestampFieldTimestamp.java @@ -74,7 +74,7 @@ protected long getTimestampField(TimestampColumnVector timestampColVector, int e } @Override - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { Preconditions.checkState( ((PrimitiveTypeInfo) inputTypeInfos[0]).getPrimitiveCategory() == PrimitiveCategory.TIMESTAMP); diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/mapjoin/VectorMapJoinGenerateResultOperator.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/mapjoin/VectorMapJoinGenerateResultOperator.java index 92ec1ee..3821cc6 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/mapjoin/VectorMapJoinGenerateResultOperator.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/mapjoin/VectorMapJoinGenerateResultOperator.java @@ -134,7 +134,7 @@ protected void commonSetup(VectorizedRowBatch batch) throws HiveException { //------------------------------------------------------------------------------------------------ protected void performValueExpressions(VectorizedRowBatch batch, - int[] allMatchs, int allMatchCount) { + int[] allMatchs, int allMatchCount) throws HiveException { /* * For the moment, pretend all matched are selected so we can evaluate the value * expressions. diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/mapjoin/VectorMapJoinOuterGenerateResultOperator.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/mapjoin/VectorMapJoinOuterGenerateResultOperator.java index 8a6c817..2e5c568 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/mapjoin/VectorMapJoinOuterGenerateResultOperator.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/mapjoin/VectorMapJoinOuterGenerateResultOperator.java @@ -196,7 +196,7 @@ protected void outerPerBatchSetup(VectorizedRowBatch batch) { * The (original) input batch size. */ private void doValueExprOnInputSelected(VectorizedRowBatch batch, - boolean inputSelectedInUse, int inputLogicalSize) { + boolean inputSelectedInUse, int inputLogicalSize) throws HiveException { int saveBatchSize = batch.size; int[] saveSelected = batch.selected; @@ -228,7 +228,7 @@ private void doValueExprOnInputSelected(VectorizedRowBatch batch, * The size of selected. */ private void doValueExpr(VectorizedRowBatch batch, - int[] selected, int size) { + int[] selected, int size) throws HiveException { int saveBatchSize = batch.size; int[] saveSelected = batch.selected; diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFEvaluatorBase.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFEvaluatorBase.java index 5957f15..ff09eb6 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFEvaluatorBase.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFEvaluatorBase.java @@ -25,6 +25,7 @@ import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch; import org.apache.hadoop.hive.ql.exec.vector.expressions.IdentityExpression; import org.apache.hadoop.hive.ql.exec.vector.expressions.VectorExpression; +import org.apache.hadoop.hive.ql.metadata.HiveException; import org.apache.hadoop.hive.ql.plan.ptf.WindowFrameDef; import org.apache.hadoop.hive.serde2.io.HiveDecimalWritable; @@ -72,14 +73,14 @@ public VectorPTFEvaluatorBase(WindowFrameDef windowFrameDef, VectorExpression in } // Evaluate the aggregation input argument expression. - public void evaluateInputExpr(VectorizedRowBatch batch) { + public void evaluateInputExpr(VectorizedRowBatch batch) throws HiveException { if (inputVecExpr != null) { inputVecExpr.evaluate(batch); } } // Evaluate the aggregation over one of the group's batches. - public abstract void evaluateGroupBatch(VectorizedRowBatch batch, boolean isLastGroupBatch); + public abstract void evaluateGroupBatch(VectorizedRowBatch batch, boolean isLastGroupBatch) throws HiveException; // Returns true if the aggregation result will be streamed. public boolean streamsResult() { diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFEvaluatorCount.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFEvaluatorCount.java index 9515832..f837148 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFEvaluatorCount.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFEvaluatorCount.java @@ -25,6 +25,7 @@ import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch; import org.apache.hadoop.hive.ql.exec.vector.ColumnVector.Type; import org.apache.hadoop.hive.ql.exec.vector.expressions.VectorExpression; +import org.apache.hadoop.hive.ql.metadata.HiveException; import org.apache.hadoop.hive.ql.plan.ptf.WindowFrameDef; import com.google.common.base.Preconditions; @@ -48,7 +49,9 @@ public VectorPTFEvaluatorCount(WindowFrameDef windowFrameDef, VectorExpression i resetEvaluator(); } - public void evaluateGroupBatch(VectorizedRowBatch batch, boolean isLastGroupBatch) { + public void evaluateGroupBatch(VectorizedRowBatch batch, boolean isLastGroupBatch) + throws HiveException { + evaluateInputExpr(batch); // Count non-null column rows. diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFEvaluatorDecimalAvg.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFEvaluatorDecimalAvg.java index bd4896a..d0589d2 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFEvaluatorDecimalAvg.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFEvaluatorDecimalAvg.java @@ -25,6 +25,7 @@ import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch; import org.apache.hadoop.hive.ql.exec.vector.ColumnVector.Type; import org.apache.hadoop.hive.ql.exec.vector.expressions.VectorExpression; +import org.apache.hadoop.hive.ql.metadata.HiveException; import org.apache.hadoop.hive.ql.plan.ptf.WindowFrameDef; import org.apache.hadoop.hive.serde2.io.HiveDecimalWritable; @@ -56,7 +57,9 @@ public VectorPTFEvaluatorDecimalAvg(WindowFrameDef windowFrameDef, VectorExpress resetEvaluator(); } - public void evaluateGroupBatch(VectorizedRowBatch batch, boolean isLastGroupBatch) { + public void evaluateGroupBatch(VectorizedRowBatch batch, boolean isLastGroupBatch) + throws HiveException { + evaluateInputExpr(batch); // Sum all non-null decimal column values for avg; maintain isGroupResultNull; after last row of diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFEvaluatorDecimalFirstValue.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFEvaluatorDecimalFirstValue.java index daba90c..ce118bc 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFEvaluatorDecimalFirstValue.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFEvaluatorDecimalFirstValue.java @@ -27,6 +27,7 @@ import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch; import org.apache.hadoop.hive.ql.exec.vector.ColumnVector.Type; import org.apache.hadoop.hive.ql.exec.vector.expressions.VectorExpression; +import org.apache.hadoop.hive.ql.metadata.HiveException; import org.apache.hadoop.hive.ql.plan.ptf.WindowFrameDef; import org.apache.hadoop.hive.serde2.io.HiveDecimalWritable; @@ -55,7 +56,9 @@ public VectorPTFEvaluatorDecimalFirstValue(WindowFrameDef windowFrameDef, resetEvaluator(); } - public void evaluateGroupBatch(VectorizedRowBatch batch, boolean isLastGroupBatch) { + public void evaluateGroupBatch(VectorizedRowBatch batch, boolean isLastGroupBatch) + throws HiveException { + evaluateInputExpr(batch); // First row determines isGroupResultNull and decimal firstValue; stream fill result as repeated. diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFEvaluatorDecimalLastValue.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFEvaluatorDecimalLastValue.java index b2cbdf6..7cc6158 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFEvaluatorDecimalLastValue.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFEvaluatorDecimalLastValue.java @@ -26,6 +26,7 @@ import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch; import org.apache.hadoop.hive.ql.exec.vector.ColumnVector.Type; import org.apache.hadoop.hive.ql.exec.vector.expressions.VectorExpression; +import org.apache.hadoop.hive.ql.metadata.HiveException; import org.apache.hadoop.hive.ql.plan.ptf.WindowFrameDef; import org.apache.hadoop.hive.serde2.io.HiveDecimalWritable; @@ -53,7 +54,9 @@ public VectorPTFEvaluatorDecimalLastValue(WindowFrameDef windowFrameDef, resetEvaluator(); } - public void evaluateGroupBatch(VectorizedRowBatch batch, boolean isLastGroupBatch) { + public void evaluateGroupBatch(VectorizedRowBatch batch, boolean isLastGroupBatch) + throws HiveException { + evaluateInputExpr(batch); // Last row of last batch determines isGroupResultNull and decimal lastValue. diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFEvaluatorDecimalMax.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFEvaluatorDecimalMax.java index 4d8c7fe..ae4792e 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFEvaluatorDecimalMax.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFEvaluatorDecimalMax.java @@ -26,6 +26,7 @@ import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch; import org.apache.hadoop.hive.ql.exec.vector.ColumnVector.Type; import org.apache.hadoop.hive.ql.exec.vector.expressions.VectorExpression; +import org.apache.hadoop.hive.ql.metadata.HiveException; import org.apache.hadoop.hive.ql.plan.ptf.WindowFrameDef; import org.apache.hadoop.hive.serde2.io.HiveDecimalWritable; @@ -50,7 +51,9 @@ public VectorPTFEvaluatorDecimalMax(WindowFrameDef windowFrameDef, VectorExpress resetEvaluator(); } - public void evaluateGroupBatch(VectorizedRowBatch batch, boolean isLastGroupBatch) { + public void evaluateGroupBatch(VectorizedRowBatch batch, boolean isLastGroupBatch) + throws HiveException { + evaluateInputExpr(batch); // Determine maximum of all non-null decimal column values; maintain isGroupResultNull. diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFEvaluatorDecimalMin.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFEvaluatorDecimalMin.java index 312c43c..521a2ff 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFEvaluatorDecimalMin.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFEvaluatorDecimalMin.java @@ -26,6 +26,7 @@ import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch; import org.apache.hadoop.hive.ql.exec.vector.ColumnVector.Type; import org.apache.hadoop.hive.ql.exec.vector.expressions.VectorExpression; +import org.apache.hadoop.hive.ql.metadata.HiveException; import org.apache.hadoop.hive.ql.plan.ptf.WindowFrameDef; import org.apache.hadoop.hive.serde2.io.HiveDecimalWritable; @@ -50,7 +51,9 @@ public VectorPTFEvaluatorDecimalMin(WindowFrameDef windowFrameDef, VectorExpress resetEvaluator(); } - public void evaluateGroupBatch(VectorizedRowBatch batch, boolean isLastGroupBatch) { + public void evaluateGroupBatch(VectorizedRowBatch batch, boolean isLastGroupBatch) + throws HiveException { + evaluateInputExpr(batch); // Determine minimum of all non-null decimal column values; maintain isGroupResultNull. diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFEvaluatorDecimalSum.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFEvaluatorDecimalSum.java index e899c36..5a7dc4c 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFEvaluatorDecimalSum.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFEvaluatorDecimalSum.java @@ -25,6 +25,7 @@ import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch; import org.apache.hadoop.hive.ql.exec.vector.ColumnVector.Type; import org.apache.hadoop.hive.ql.exec.vector.expressions.VectorExpression; +import org.apache.hadoop.hive.ql.metadata.HiveException; import org.apache.hadoop.hive.ql.plan.ptf.WindowFrameDef; import org.apache.hadoop.hive.serde2.io.HiveDecimalWritable; @@ -51,7 +52,9 @@ public VectorPTFEvaluatorDecimalSum(WindowFrameDef windowFrameDef, VectorExpress resetEvaluator(); } - public void evaluateGroupBatch(VectorizedRowBatch batch, boolean isLastGroupBatch) { + public void evaluateGroupBatch(VectorizedRowBatch batch, boolean isLastGroupBatch) + throws HiveException { + evaluateInputExpr(batch); // Sum all non-null decimal column values; maintain isGroupResultNull. diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFEvaluatorDenseRank.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFEvaluatorDenseRank.java index e457e32..f639316 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFEvaluatorDenseRank.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFEvaluatorDenseRank.java @@ -24,6 +24,7 @@ import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch; import org.apache.hadoop.hive.ql.exec.vector.ColumnVector.Type; import org.apache.hadoop.hive.ql.exec.vector.expressions.VectorExpression; +import org.apache.hadoop.hive.ql.metadata.HiveException; import org.apache.hadoop.hive.ql.plan.ptf.WindowFrameDef; /** @@ -46,7 +47,9 @@ public VectorPTFEvaluatorDenseRank(WindowFrameDef windowFrameDef, VectorExpressi resetEvaluator(); } - public void evaluateGroupBatch(VectorizedRowBatch batch, boolean isLastGroupBatch) { + public void evaluateGroupBatch(VectorizedRowBatch batch, boolean isLastGroupBatch) + throws HiveException { + evaluateInputExpr(batch); LongColumnVector longColVector = (LongColumnVector) batch.cols[outputColumnNum]; diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFEvaluatorDoubleAvg.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFEvaluatorDoubleAvg.java index 298de2d..cd09ce7 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFEvaluatorDoubleAvg.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFEvaluatorDoubleAvg.java @@ -24,6 +24,7 @@ import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch; import org.apache.hadoop.hive.ql.exec.vector.ColumnVector.Type; import org.apache.hadoop.hive.ql.exec.vector.expressions.VectorExpression; +import org.apache.hadoop.hive.ql.metadata.HiveException; import org.apache.hadoop.hive.ql.plan.ptf.WindowFrameDef; import com.google.common.base.Preconditions; @@ -50,7 +51,9 @@ public VectorPTFEvaluatorDoubleAvg(WindowFrameDef windowFrameDef, VectorExpressi resetEvaluator(); } - public void evaluateGroupBatch(VectorizedRowBatch batch, boolean isLastGroupBatch) { + public void evaluateGroupBatch(VectorizedRowBatch batch, boolean isLastGroupBatch) + throws HiveException { + evaluateInputExpr(batch); // Sum all non-null double column values for avg; maintain isGroupResultNull; after last row of diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFEvaluatorDoubleFirstValue.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFEvaluatorDoubleFirstValue.java index 460fbe5..7d1fb61 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFEvaluatorDoubleFirstValue.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFEvaluatorDoubleFirstValue.java @@ -25,6 +25,7 @@ import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch; import org.apache.hadoop.hive.ql.exec.vector.ColumnVector.Type; import org.apache.hadoop.hive.ql.exec.vector.expressions.VectorExpression; +import org.apache.hadoop.hive.ql.metadata.HiveException; import org.apache.hadoop.hive.ql.plan.ptf.WindowFrameDef; import com.google.common.base.Preconditions; @@ -51,7 +52,9 @@ public VectorPTFEvaluatorDoubleFirstValue(WindowFrameDef windowFrameDef, resetEvaluator(); } - public void evaluateGroupBatch(VectorizedRowBatch batch, boolean isLastGroupBatch) { + public void evaluateGroupBatch(VectorizedRowBatch batch, boolean isLastGroupBatch) + throws HiveException { + evaluateInputExpr(batch); // First row determines isGroupResultNull and double firstValue; stream fill result as repeated. diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFEvaluatorDoubleLastValue.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFEvaluatorDoubleLastValue.java index 51d06a8..dbc78eb 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFEvaluatorDoubleLastValue.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFEvaluatorDoubleLastValue.java @@ -24,6 +24,7 @@ import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch; import org.apache.hadoop.hive.ql.exec.vector.ColumnVector.Type; import org.apache.hadoop.hive.ql.exec.vector.expressions.VectorExpression; +import org.apache.hadoop.hive.ql.metadata.HiveException; import org.apache.hadoop.hive.ql.plan.ptf.WindowFrameDef; import com.google.common.base.Preconditions; @@ -49,7 +50,9 @@ public VectorPTFEvaluatorDoubleLastValue(WindowFrameDef windowFrameDef, resetEvaluator(); } - public void evaluateGroupBatch(VectorizedRowBatch batch, boolean isLastGroupBatch) { + public void evaluateGroupBatch(VectorizedRowBatch batch, boolean isLastGroupBatch) + throws HiveException { + evaluateInputExpr(batch); // Last row of last batch determines isGroupResultNull and double lastValue. diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFEvaluatorDoubleMax.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFEvaluatorDoubleMax.java index 2bc4c6b..93745c4 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFEvaluatorDoubleMax.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFEvaluatorDoubleMax.java @@ -24,6 +24,7 @@ import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch; import org.apache.hadoop.hive.ql.exec.vector.ColumnVector.Type; import org.apache.hadoop.hive.ql.exec.vector.expressions.VectorExpression; +import org.apache.hadoop.hive.ql.metadata.HiveException; import org.apache.hadoop.hive.ql.plan.ptf.WindowFrameDef; import com.google.common.base.Preconditions; @@ -46,7 +47,9 @@ public VectorPTFEvaluatorDoubleMax(WindowFrameDef windowFrameDef, VectorExpressi resetEvaluator(); } - public void evaluateGroupBatch(VectorizedRowBatch batch, boolean isLastGroupBatch) { + public void evaluateGroupBatch(VectorizedRowBatch batch, boolean isLastGroupBatch) + throws HiveException { + evaluateInputExpr(batch); // Determine maximum of all non-null double column values; maintain isGroupResultNull. diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFEvaluatorDoubleMin.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFEvaluatorDoubleMin.java index 6a422b2..42cce54 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFEvaluatorDoubleMin.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFEvaluatorDoubleMin.java @@ -24,6 +24,7 @@ import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch; import org.apache.hadoop.hive.ql.exec.vector.ColumnVector.Type; import org.apache.hadoop.hive.ql.exec.vector.expressions.VectorExpression; +import org.apache.hadoop.hive.ql.metadata.HiveException; import org.apache.hadoop.hive.ql.plan.ptf.WindowFrameDef; import com.google.common.base.Preconditions; @@ -46,7 +47,9 @@ public VectorPTFEvaluatorDoubleMin(WindowFrameDef windowFrameDef, VectorExpressi resetEvaluator(); } - public void evaluateGroupBatch(VectorizedRowBatch batch, boolean isLastGroupBatch) { + public void evaluateGroupBatch(VectorizedRowBatch batch, boolean isLastGroupBatch) + throws HiveException { + evaluateInputExpr(batch); // Determine minimum of all non-null double column values; maintain isGroupResultNull. diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFEvaluatorDoubleSum.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFEvaluatorDoubleSum.java index 2ecc4ae..552d4a9 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFEvaluatorDoubleSum.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFEvaluatorDoubleSum.java @@ -24,6 +24,7 @@ import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch; import org.apache.hadoop.hive.ql.exec.vector.ColumnVector.Type; import org.apache.hadoop.hive.ql.exec.vector.expressions.VectorExpression; +import org.apache.hadoop.hive.ql.metadata.HiveException; import org.apache.hadoop.hive.ql.plan.ptf.WindowFrameDef; import com.google.common.base.Preconditions; @@ -46,7 +47,9 @@ public VectorPTFEvaluatorDoubleSum(WindowFrameDef windowFrameDef, VectorExpressi resetEvaluator(); } - public void evaluateGroupBatch(VectorizedRowBatch batch, boolean isLastGroupBatch) { + public void evaluateGroupBatch(VectorizedRowBatch batch, boolean isLastGroupBatch) + throws HiveException { + evaluateInputExpr(batch); // Sum all non-null double column values; maintain isGroupResultNull. diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFEvaluatorLongAvg.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFEvaluatorLongAvg.java index f48df25..ad3950f 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFEvaluatorLongAvg.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFEvaluatorLongAvg.java @@ -24,6 +24,7 @@ import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch; import org.apache.hadoop.hive.ql.exec.vector.ColumnVector.Type; import org.apache.hadoop.hive.ql.exec.vector.expressions.VectorExpression; +import org.apache.hadoop.hive.ql.metadata.HiveException; import org.apache.hadoop.hive.ql.plan.ptf.WindowFrameDef; import com.google.common.base.Preconditions; @@ -50,7 +51,9 @@ public VectorPTFEvaluatorLongAvg(WindowFrameDef windowFrameDef, VectorExpression resetEvaluator(); } - public void evaluateGroupBatch(VectorizedRowBatch batch, boolean isLastGroupBatch) { + public void evaluateGroupBatch(VectorizedRowBatch batch, boolean isLastGroupBatch) + throws HiveException { + evaluateInputExpr(batch); // Sum all non-null long column values for avg; maintain isGroupResultNull; after last row of diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFEvaluatorLongFirstValue.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFEvaluatorLongFirstValue.java index 3deadb1..a288f16 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFEvaluatorLongFirstValue.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFEvaluatorLongFirstValue.java @@ -25,6 +25,7 @@ import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch; import org.apache.hadoop.hive.ql.exec.vector.ColumnVector.Type; import org.apache.hadoop.hive.ql.exec.vector.expressions.VectorExpression; +import org.apache.hadoop.hive.ql.metadata.HiveException; import org.apache.hadoop.hive.ql.plan.ptf.WindowFrameDef; import com.google.common.base.Preconditions; @@ -51,7 +52,9 @@ public VectorPTFEvaluatorLongFirstValue(WindowFrameDef windowFrameDef, resetEvaluator(); } - public void evaluateGroupBatch(VectorizedRowBatch batch, boolean isLastGroupBatch) { + public void evaluateGroupBatch(VectorizedRowBatch batch, boolean isLastGroupBatch) + throws HiveException { + evaluateInputExpr(batch); // First row determines isGroupResultNull and long firstValue; stream fill result as repeated. diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFEvaluatorLongLastValue.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFEvaluatorLongLastValue.java index 0a5df51..cf7bf24 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFEvaluatorLongLastValue.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFEvaluatorLongLastValue.java @@ -24,6 +24,7 @@ import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch; import org.apache.hadoop.hive.ql.exec.vector.ColumnVector.Type; import org.apache.hadoop.hive.ql.exec.vector.expressions.VectorExpression; +import org.apache.hadoop.hive.ql.metadata.HiveException; import org.apache.hadoop.hive.ql.plan.ptf.WindowFrameDef; import com.google.common.base.Preconditions; @@ -49,7 +50,9 @@ public VectorPTFEvaluatorLongLastValue(WindowFrameDef windowFrameDef, resetEvaluator(); } - public void evaluateGroupBatch(VectorizedRowBatch batch, boolean isLastGroupBatch) { + public void evaluateGroupBatch(VectorizedRowBatch batch, boolean isLastGroupBatch) + throws HiveException { + evaluateInputExpr(batch); // Last row of last batch determines isGroupResultNull and long lastValue. diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFEvaluatorLongMax.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFEvaluatorLongMax.java index 0e7eb07..04f106b 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFEvaluatorLongMax.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFEvaluatorLongMax.java @@ -24,6 +24,7 @@ import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch; import org.apache.hadoop.hive.ql.exec.vector.ColumnVector.Type; import org.apache.hadoop.hive.ql.exec.vector.expressions.VectorExpression; +import org.apache.hadoop.hive.ql.metadata.HiveException; import org.apache.hadoop.hive.ql.plan.ptf.WindowFrameDef; import com.google.common.base.Preconditions; @@ -46,7 +47,9 @@ public VectorPTFEvaluatorLongMax(WindowFrameDef windowFrameDef, VectorExpression resetEvaluator(); } - public void evaluateGroupBatch(VectorizedRowBatch batch, boolean isLastGroupBatch) { + public void evaluateGroupBatch(VectorizedRowBatch batch, boolean isLastGroupBatch) + throws HiveException { + evaluateInputExpr(batch); // Determine maximum of all non-null long column values; maintain isGroupResultNull. diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFEvaluatorLongMin.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFEvaluatorLongMin.java index df31c51..a80819d 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFEvaluatorLongMin.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFEvaluatorLongMin.java @@ -24,6 +24,7 @@ import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch; import org.apache.hadoop.hive.ql.exec.vector.ColumnVector.Type; import org.apache.hadoop.hive.ql.exec.vector.expressions.VectorExpression; +import org.apache.hadoop.hive.ql.metadata.HiveException; import org.apache.hadoop.hive.ql.plan.ptf.WindowFrameDef; import com.google.common.base.Preconditions; @@ -46,7 +47,9 @@ public VectorPTFEvaluatorLongMin(WindowFrameDef windowFrameDef, VectorExpression resetEvaluator(); } - public void evaluateGroupBatch(VectorizedRowBatch batch, boolean isLastGroupBatch) { + public void evaluateGroupBatch(VectorizedRowBatch batch, boolean isLastGroupBatch) + throws HiveException { + evaluateInputExpr(batch); // Determine minimum of all non-null long column values; maintain isGroupResultNull. diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFEvaluatorLongSum.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFEvaluatorLongSum.java index 9402218..277cff3 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFEvaluatorLongSum.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFEvaluatorLongSum.java @@ -24,6 +24,7 @@ import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch; import org.apache.hadoop.hive.ql.exec.vector.ColumnVector.Type; import org.apache.hadoop.hive.ql.exec.vector.expressions.VectorExpression; +import org.apache.hadoop.hive.ql.metadata.HiveException; import org.apache.hadoop.hive.ql.plan.ptf.WindowFrameDef; import com.google.common.base.Preconditions; @@ -46,7 +47,9 @@ public VectorPTFEvaluatorLongSum(WindowFrameDef windowFrameDef, VectorExpression resetEvaluator(); } - public void evaluateGroupBatch(VectorizedRowBatch batch, boolean isLastGroupBatch) { + public void evaluateGroupBatch(VectorizedRowBatch batch, boolean isLastGroupBatch) + throws HiveException { + evaluateInputExpr(batch); // Sum all non-null long column values; maintain isGroupResultNull. diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFEvaluatorRank.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFEvaluatorRank.java index 34add61..9b2710f 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFEvaluatorRank.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFEvaluatorRank.java @@ -24,6 +24,7 @@ import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch; import org.apache.hadoop.hive.ql.exec.vector.ColumnVector.Type; import org.apache.hadoop.hive.ql.exec.vector.expressions.VectorExpression; +import org.apache.hadoop.hive.ql.metadata.HiveException; import org.apache.hadoop.hive.ql.plan.ptf.WindowFrameDef; /** @@ -47,7 +48,9 @@ public VectorPTFEvaluatorRank(WindowFrameDef windowFrameDef, VectorExpression in resetEvaluator(); } - public void evaluateGroupBatch(VectorizedRowBatch batch, boolean isLastGroupBatch) { + public void evaluateGroupBatch(VectorizedRowBatch batch, boolean isLastGroupBatch) + throws HiveException { + evaluateInputExpr(batch); /* diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFEvaluatorRowNumber.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFEvaluatorRowNumber.java index 8d43b33..3bc70c8 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFEvaluatorRowNumber.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFEvaluatorRowNumber.java @@ -24,6 +24,7 @@ import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch; import org.apache.hadoop.hive.ql.exec.vector.ColumnVector.Type; import org.apache.hadoop.hive.ql.exec.vector.expressions.VectorExpression; +import org.apache.hadoop.hive.ql.metadata.HiveException; import org.apache.hadoop.hive.ql.plan.ptf.WindowFrameDef; /** @@ -45,7 +46,9 @@ public VectorPTFEvaluatorRowNumber(WindowFrameDef windowFrameDef, VectorExpressi resetEvaluator(); } - public void evaluateGroupBatch(VectorizedRowBatch batch, boolean isLastGroupBatch) { + public void evaluateGroupBatch(VectorizedRowBatch batch, boolean isLastGroupBatch) + throws HiveException { + evaluateInputExpr(batch); final int size = batch.size; diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFGroupBatches.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFGroupBatches.java index 607d34a..573910e 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFGroupBatches.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/ptf/VectorPTFGroupBatches.java @@ -163,7 +163,8 @@ private void releaseSpillRowBytesContainer() { spillRowBytesContainer = null; } - public void evaluateStreamingGroupBatch(VectorizedRowBatch batch, boolean isLastGroupBatch) { + public void evaluateStreamingGroupBatch(VectorizedRowBatch batch, boolean isLastGroupBatch) + throws HiveException { // Streaming evaluators fill in their results during the evaluate call. for (VectorPTFEvaluatorBase evaluator : evaluators) { @@ -171,7 +172,9 @@ public void evaluateStreamingGroupBatch(VectorizedRowBatch batch, boolean isLast } } - public void evaluateGroupBatch(VectorizedRowBatch batch, boolean isLastGroupBatch) { + public void evaluateGroupBatch(VectorizedRowBatch batch, boolean isLastGroupBatch) + throws HiveException { + for (VectorPTFEvaluatorBase evaluator : evaluators) { evaluator.evaluateGroupBatch(batch, isLastGroupBatch); } diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/udf/VectorUDFAdaptor.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/udf/VectorUDFAdaptor.java index 82b7a15..5b2cb4c 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/udf/VectorUDFAdaptor.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/udf/VectorUDFAdaptor.java @@ -60,6 +60,7 @@ private String resultType; private VectorUDFArgDesc[] argDescs; private ExprNodeGenericFuncDesc expr; + private boolean suppressEvaluateExceptions; private transient GenericUDF genericUDF; private transient GenericUDF.DeferredObject[] deferredChildren; @@ -84,6 +85,10 @@ public VectorUDFAdaptor ( this.argDescs = argDescs; } + public void setSuppressEvaluateExceptions(boolean suppressEvaluateExceptions) { + this.suppressEvaluateExceptions = suppressEvaluateExceptions; + } + // Initialize transient fields. To be called after deserialization of other fields. public void init() throws HiveException, UDFArgumentException { genericUDF = expr.getGenericUDF(); @@ -112,7 +117,7 @@ public void init() throws HiveException, UDFArgumentException { } @Override - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { if (genericUDF == null) { try { @@ -192,7 +197,7 @@ private boolean allInputColsRepeating(VectorizedRowBatch batch) { /* Calculate the function result for row i of the batch and * set the output column vector entry i to the result. */ - private void setResult(int i, VectorizedRowBatch b) { + private void setResult(int i, VectorizedRowBatch b) throws HiveException { // get arguments for (int j = 0; j < argDescs.length; j++) { @@ -201,15 +206,19 @@ private void setResult(int i, VectorizedRowBatch b) { // call function Object result; - try { + if (!suppressEvaluateExceptions) { result = genericUDF.evaluate(deferredChildren); - } catch (HiveException e) { - - /* For UDFs that expect primitive types (like int instead of Integer or IntWritable), - * this will catch the the exception that happens if they are passed a NULL value. - * Then the default NULL handling logic will apply, and the result will be NULL. - */ - result = null; + } else { + try { + result = genericUDF.evaluate(deferredChildren); + } catch (HiveException e) { + + /* For UDFs that expect primitive types (like int instead of Integer or IntWritable), + * this will catch the the exception that happens if they are passed a NULL value. + * Then the default NULL handling logic will apply, and the result will be NULL. + */ + result = null; + } } // Set output column vector entry. Since we have one output column, the logical index = 0. diff --git ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestUnaryMinus.java ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestUnaryMinus.java index e227f44..3860345 100644 --- ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestUnaryMinus.java +++ ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestUnaryMinus.java @@ -25,6 +25,7 @@ import org.apache.hadoop.hive.ql.exec.vector.expressions.gen.LongColUnaryMinus; import org.apache.hadoop.hive.ql.exec.vector.expressions.gen.LongColUnaryMinusChecked; import org.apache.hadoop.hive.ql.exec.vector.util.VectorizedRowGroupGenUtil; +import org.apache.hadoop.hive.ql.metadata.HiveException; import org.apache.hadoop.hive.serde2.typeinfo.TypeInfoFactory; import org.junit.Test; @@ -34,7 +35,7 @@ public class TestUnaryMinus { @Test - public void testUnaryMinus() { + public void testUnaryMinus() throws HiveException { VectorizedRowBatch vrg = VectorizedRowGroupGenUtil.getVectorizedRowBatch(1024, 2, 23); LongColUnaryMinus expr = new LongColUnaryMinus(0, 1); expr.evaluate(vrg); @@ -48,7 +49,7 @@ public void testUnaryMinus() { @Test - public void testUnaryMinusCheckedOverflow() { + public void testUnaryMinusCheckedOverflow() throws HiveException { VectorizedRowBatch vrg = VectorizedRowGroupGenUtil.getVectorizedRowBatch(1, 2, 0); //set value to MIN_VALUE so that -MIN_VALUE overflows and gets set to MIN_VALUE again ((LongColumnVector)vrg.cols[0]).vector[0] = Integer.MIN_VALUE; @@ -64,7 +65,7 @@ public void testUnaryMinusCheckedOverflow() { } @Test - public void testUnaryMinusChecked() { + public void testUnaryMinusChecked() throws HiveException { VectorizedRowBatch vrg = VectorizedRowGroupGenUtil.getVectorizedRowBatch(1024, 2, 23); LongColUnaryMinusChecked expr = new LongColUnaryMinusChecked(0, 1); expr.setOutputTypeInfo(TypeInfoFactory.getPrimitiveTypeInfo("bigint")); diff --git ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorArithmeticExpressions.java ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorArithmeticExpressions.java index f2adc08..f5491af 100644 --- ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorArithmeticExpressions.java +++ ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorArithmeticExpressions.java @@ -55,6 +55,7 @@ import org.apache.hadoop.hive.ql.exec.vector.expressions.gen.DecimalScalarMultiplyDecimalColumn; import org.apache.hadoop.hive.ql.exec.vector.expressions.gen.LongColAddLongScalarChecked; import org.apache.hadoop.hive.ql.exec.vector.util.VectorizedRowGroupGenUtil; +import org.apache.hadoop.hive.ql.metadata.HiveException; import org.apache.hadoop.hive.serde2.typeinfo.TypeInfoFactory; import org.junit.Test; @@ -64,16 +65,16 @@ public class TestVectorArithmeticExpressions { @Test - public void testLongColAddLongScalarNoNulls() { + public void testLongColAddLongScalarNoNulls() throws HiveException { longColAddLongScalarNoNulls(false); } @Test - public void testLongColAddLongScalarCheckedNoNulls() { + public void testLongColAddLongScalarCheckedNoNulls() throws HiveException { longColAddLongScalarNoNulls(true); } - private void longColAddLongScalarNoNulls(boolean checked) { + private void longColAddLongScalarNoNulls(boolean checked) throws HiveException { VectorizedRowBatch vrg = getVectorizedRowBatchSingleLongVector(VectorizedRowBatch.DEFAULT_SIZE); VectorExpression expr; if (checked) { @@ -122,16 +123,16 @@ public static VectorizedRowBatch getVectorizedRowBatch2LongInDoubleOut() { } @Test - public void testLongColAddLongScalarWithNulls() { + public void testLongColAddLongScalarWithNulls() throws HiveException { longColAddLongScalarCheckedWithNulls(false); } @Test - public void testLongColAddLongScalarCheckedWithNulls() { + public void testLongColAddLongScalarCheckedWithNulls() throws HiveException { longColAddLongScalarCheckedWithNulls(true); } - private void longColAddLongScalarCheckedWithNulls(boolean isChecked) { + private void longColAddLongScalarCheckedWithNulls(boolean isChecked) throws HiveException { VectorizedRowBatch batch = getVectorizedRowBatchSingleLongVector( VectorizedRowBatch.DEFAULT_SIZE); LongColumnVector lcv = (LongColumnVector) batch.cols[0]; @@ -160,16 +161,16 @@ private void longColAddLongScalarCheckedWithNulls(boolean isChecked) { } @Test - public void testLongColAddLongScalarWithRepeating() { + public void testLongColAddLongScalarWithRepeating() throws HiveException { longColAddLongScalarWithRepeatingUtil(false); } @Test - public void testLongColAddLongScalarCheckedWithRepeating() { + public void testLongColAddLongScalarCheckedWithRepeating() throws HiveException { longColAddLongScalarWithRepeatingUtil(true); } - private void longColAddLongScalarWithRepeatingUtil(boolean isChecked) { + private void longColAddLongScalarWithRepeatingUtil(boolean isChecked) throws HiveException { LongColumnVector in, out; VectorizedRowBatch batch; VectorExpression expr; @@ -248,16 +249,16 @@ public static void verifyLongNullDataVectorEntries( } @Test - public void testLongColAddLongColumn() { + public void testLongColAddLongColumn() throws HiveException { longColAddLongColumnUtil(false); } @Test - public void testLongColAddLongColumnChecked() { + public void testLongColAddLongColumnChecked() throws HiveException { longColAddLongColumnUtil(true); } - private void longColAddLongColumnUtil(boolean isChecked) { + private void longColAddLongColumnUtil(boolean isChecked) throws HiveException { int seed = 17; VectorizedRowBatch vrg = VectorizedRowGroupGenUtil.getVectorizedRowBatch( VectorizedRowBatch.DEFAULT_SIZE, @@ -348,7 +349,7 @@ private void longColAddLongColumnUtil(boolean isChecked) { } @Test - public void testLongColDivideLongColumn() { + public void testLongColDivideLongColumn() throws HiveException { /* Testing for equality of doubles after a math operation is * not always reliable so use this as a tolerance. */ @@ -384,7 +385,7 @@ public void testLongColDivideLongColumn() { } @Test - public void testLongColModuloLongColumn() { + public void testLongColModuloLongColumn() throws HiveException { VectorizedRowBatch batch = getVectorizedRowBatch2LongInLongOut(); LongColModuloLongColumn expr = new LongColModuloLongColumn(0, 1, 2); batch.cols[0].isNull[1] = true; @@ -432,7 +433,7 @@ private VectorizedRowBatch getVectorizedRowBatch2LongInLongOut() { } @Test - public void testDecimalColAddDecimalColumn() { + public void testDecimalColAddDecimalColumn() throws HiveException { VectorizedRowBatch b = getVectorizedRowBatch3DecimalCols(); VectorExpression expr = new DecimalColAddDecimalColumn(0, 1, 2); DecimalColumnVector r = (DecimalColumnVector) b.cols[2]; @@ -496,7 +497,7 @@ public void testDecimalColAddDecimalColumn() { // Spot check decimal column-column subtract @Test - public void testDecimalColSubtractDecimalColumn() { + public void testDecimalColSubtractDecimalColumn() throws HiveException { VectorizedRowBatch b = getVectorizedRowBatch3DecimalCols(); VectorExpression expr = new DecimalColSubtractDecimalColumn(0, 1, 2); DecimalColumnVector r = (DecimalColumnVector) b.cols[2]; @@ -518,7 +519,7 @@ public void testDecimalColSubtractDecimalColumn() { // Spot check decimal column-column multiply @Test - public void testDecimalColMultiplyDecimalColumn() { + public void testDecimalColMultiplyDecimalColumn() throws HiveException { VectorizedRowBatch b = getVectorizedRowBatch3DecimalCols(); VectorExpression expr = new DecimalColMultiplyDecimalColumn(0, 1, 2); DecimalColumnVector r = (DecimalColumnVector) b.cols[2]; @@ -544,7 +545,7 @@ public void testDecimalColMultiplyDecimalColumn() { * cases used in the source code template ColumnArithmeticScalarDecimal.txt. */ @Test - public void testDecimalColAddDecimalScalar() { + public void testDecimalColAddDecimalScalar() throws HiveException { VectorizedRowBatch b = getVectorizedRowBatch3DecimalCols(); HiveDecimal d = HiveDecimal.create(1); VectorExpression expr = new DecimalColAddDecimalScalar(0, d, 2); @@ -602,7 +603,7 @@ public void testDecimalColAddDecimalScalar() { * The template is used for division and modulo. */ @Test - public void testDecimalColDivideDecimalScalar() { + public void testDecimalColDivideDecimalScalar() throws HiveException { VectorizedRowBatch b = getVectorizedRowBatch3DecimalCols(); HiveDecimal d = HiveDecimal.create("2.00"); VectorExpression expr = new DecimalColDivideDecimalScalar(0, d, 2); @@ -661,7 +662,7 @@ public void testDecimalColDivideDecimalScalar() { * for template ScalarDivideColumnDecimal.txt. */ @Test - public void testDecimalScalarDivideDecimalColumn() { + public void testDecimalScalarDivideDecimalColumn() throws HiveException { VectorizedRowBatch b = getVectorizedRowBatch3DecimalCols(); HiveDecimal d = HiveDecimal.create("3.96"); // 1.20 * 3.30 VectorExpression expr = new DecimalScalarDivideDecimalColumn(d, 0, 2); @@ -708,7 +709,7 @@ public void testDecimalScalarDivideDecimalColumn() { // Spot check Decimal Col-Scalar Modulo @Test - public void testDecimalColModuloDecimalScalar() { + public void testDecimalColModuloDecimalScalar() throws HiveException { VectorizedRowBatch b = getVectorizedRowBatch3DecimalCols(); HiveDecimal d = HiveDecimal.create("2.00"); VectorExpression expr = new DecimalColModuloDecimalScalar(0, d, 2); @@ -744,7 +745,7 @@ public void testDecimalColModuloDecimalScalar() { // Spot check decimal scalar-column modulo @Test - public void testDecimalScalarModuloDecimalColumn() { + public void testDecimalScalarModuloDecimalColumn() throws HiveException { VectorizedRowBatch b = getVectorizedRowBatch3DecimalCols(); HiveDecimal d = HiveDecimal.create("2.00"); VectorExpression expr = new DecimalScalarModuloDecimalColumn(d, 0, 2); @@ -771,7 +772,7 @@ public void testDecimalScalarModuloDecimalColumn() { } @Test - public void testDecimalColDivideDecimalColumn() { + public void testDecimalColDivideDecimalColumn() throws HiveException { VectorizedRowBatch b = getVectorizedRowBatch3DecimalCols(); DecimalColumnVector in1 = (DecimalColumnVector) b.cols[1]; for (int i = 0; i < 3; i++) { @@ -848,7 +849,7 @@ public void testDecimalColDivideDecimalColumn() { // Spot check decimal column modulo decimal column @Test - public void testDecimalColModuloDecimalColumn() { + public void testDecimalColModuloDecimalColumn() throws HiveException { VectorizedRowBatch b = getVectorizedRowBatch3DecimalCols(); DecimalColumnVector in1 = (DecimalColumnVector) b.cols[1]; for (int i = 0; i < 3; i++) { @@ -867,7 +868,7 @@ public void testDecimalColModuloDecimalColumn() { * addition checks all the cases for the template, so don't do that redundantly here. */ @Test - public void testDecimalColSubtractDecimalScalar() { + public void testDecimalColSubtractDecimalScalar() throws HiveException { VectorizedRowBatch b = getVectorizedRowBatch3DecimalCols(); HiveDecimal d = HiveDecimal.create(1); VectorExpression expr = new DecimalColSubtractDecimalScalar(0, d, 2); @@ -893,7 +894,7 @@ public void testDecimalColSubtractDecimalScalar() { * addition checks all the cases for the template, so don't do that redundantly here. */ @Test - public void testDecimalColMultiplyDecimalScalar() { + public void testDecimalColMultiplyDecimalScalar() throws HiveException { VectorizedRowBatch b = getVectorizedRowBatch3DecimalCols(); HiveDecimal d = HiveDecimal.create(2); VectorExpression expr = new DecimalColMultiplyDecimalScalar(0, d, 2); @@ -919,7 +920,7 @@ public void testDecimalColMultiplyDecimalScalar() { * cases used in the source code template ScalarArithmeticColumnDecimal.txt. */ @Test - public void testDecimalScalarAddDecimalColumn() { + public void testDecimalScalarAddDecimalColumn() throws HiveException { VectorizedRowBatch b = getVectorizedRowBatch3DecimalCols(); HiveDecimal d = HiveDecimal.create(1); VectorExpression expr = new DecimalScalarAddDecimalColumn(d, 0, 2); @@ -976,7 +977,7 @@ public void testDecimalScalarAddDecimalColumn() { * addition checks all the cases for the template, so don't do that redundantly here. */ @Test - public void testDecimalScalarSubtractDecimalColumn() { + public void testDecimalScalarSubtractDecimalColumn() throws HiveException { VectorizedRowBatch b = getVectorizedRowBatch3DecimalCols(); HiveDecimal d = HiveDecimal.create(1); VectorExpression expr = new DecimalScalarSubtractDecimalColumn(d, 0, 2); @@ -1003,7 +1004,7 @@ public void testDecimalScalarSubtractDecimalColumn() { */ @Test - public void testDecimalScalarMultiplyDecimalColumn() { + public void testDecimalScalarMultiplyDecimalColumn() throws HiveException { VectorizedRowBatch b = getVectorizedRowBatch3DecimalCols(); HiveDecimal d = HiveDecimal.create(2); VectorExpression expr = new DecimalScalarMultiplyDecimalColumn(d, 0, 2); diff --git ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorConditionalExpressions.java ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorConditionalExpressions.java index ea19e93..d02ae02 100644 --- ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorConditionalExpressions.java +++ ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorConditionalExpressions.java @@ -35,7 +35,7 @@ import org.apache.hadoop.hive.ql.exec.vector.expressions.IfExprStringGroupColumnStringScalar; import org.apache.hadoop.hive.ql.exec.vector.expressions.IfExprStringScalarStringGroupColumn; import org.apache.hadoop.hive.ql.exec.vector.expressions.IfExprStringScalarStringScalar; - +import org.apache.hadoop.hive.ql.metadata.HiveException; import org.junit.Test; /** @@ -175,7 +175,7 @@ private String getString(BytesColumnVector v, int i) { } @Test - public void testLongColumnColumnIfExpr() { + public void testLongColumnColumnIfExpr() throws HiveException { VectorizedRowBatch batch = getBatch4LongVectors(); VectorExpression expr = new IfExprLongColumnLongColumn(0, 1, 2, 3); expr.evaluate(batch); @@ -290,7 +290,7 @@ public void testLongColumnColumnIfExpr() { } @Test - public void testDoubleColumnColumnIfExpr() { + public void testDoubleColumnColumnIfExpr() throws HiveException { // Just spot check because we already checked the logic for long. // The code is from the same template file. @@ -310,7 +310,7 @@ public void testDoubleColumnColumnIfExpr() { } @Test - public void testLongColumnScalarIfExpr() { + public void testLongColumnScalarIfExpr() throws HiveException { VectorizedRowBatch batch = getBatch4LongVectors(); VectorExpression expr = new IfExprLongColumnLongScalar(0, 1, 100, 3); LongColumnVector r = (LongColumnVector) batch.cols[3]; @@ -322,7 +322,7 @@ public void testLongColumnScalarIfExpr() { } @Test - public void testLongScalarColumnIfExpr() { + public void testLongScalarColumnIfExpr() throws HiveException { VectorizedRowBatch batch = getBatch4LongVectors(); VectorExpression expr = new IfExprLongScalarLongColumn(0, 100, 2, 3); LongColumnVector r = (LongColumnVector) batch.cols[3]; @@ -334,7 +334,7 @@ public void testLongScalarColumnIfExpr() { } @Test - public void testLongScalarScalarIfExpr() { + public void testLongScalarScalarIfExpr() throws HiveException { VectorizedRowBatch batch = getBatch4LongVectors(); VectorExpression expr = new IfExprLongScalarLongScalar(0, 100, 200, 3); LongColumnVector r = (LongColumnVector) batch.cols[3]; @@ -346,7 +346,7 @@ public void testLongScalarScalarIfExpr() { } @Test - public void testDoubleScalarScalarIfExpr() { + public void testDoubleScalarScalarIfExpr() throws HiveException { VectorizedRowBatch batch = getBatch1Long3DoubleVectors(); VectorExpression expr = new IfExprDoubleScalarDoubleScalar(0, 100.0d, 200.0d, 3); DoubleColumnVector r = (DoubleColumnVector) batch.cols[3]; @@ -358,7 +358,7 @@ public void testDoubleScalarScalarIfExpr() { } @Test - public void testDoubleScalarColumnIfExpr() { + public void testDoubleScalarColumnIfExpr() throws HiveException { VectorizedRowBatch batch = getBatch1Long3DoubleVectors(); VectorExpression expr = new IfExprDoubleScalarDoubleColumn(0, 100.0d, 2, 3); DoubleColumnVector r = (DoubleColumnVector) batch.cols[3]; @@ -370,7 +370,7 @@ public void testDoubleScalarColumnIfExpr() { } @Test - public void testDoubleColumnScalarIfExpr() { + public void testDoubleColumnScalarIfExpr() throws HiveException { VectorizedRowBatch batch = getBatch1Long3DoubleVectors(); VectorExpression expr = new IfExprDoubleColumnDoubleScalar(0, 1, 200d, 3); DoubleColumnVector r = (DoubleColumnVector) batch.cols[3]; @@ -382,7 +382,7 @@ public void testDoubleColumnScalarIfExpr() { } @Test - public void testIfExprStringColumnStringColumn() { + public void testIfExprStringColumnStringColumn() throws HiveException { VectorizedRowBatch batch = getBatch1Long3BytesVectors(); VectorExpression expr = new IfExprStringGroupColumnStringGroupColumn(0, 1, 2, 3); BytesColumnVector r = (BytesColumnVector) batch.cols[3]; @@ -467,7 +467,7 @@ public void testIfExprStringColumnStringColumn() { } @Test - public void testIfExprStringColumnStringScalar() { + public void testIfExprStringColumnStringScalar() throws HiveException { VectorizedRowBatch batch = getBatch1Long3BytesVectors(); byte[] scalar = getUTF8Bytes("scalar"); VectorExpression expr = new IfExprStringGroupColumnStringScalar(0, 1, scalar, 3); @@ -490,7 +490,7 @@ public void testIfExprStringColumnStringScalar() { } @Test - public void testIfExprStringScalarStringColumn() { + public void testIfExprStringScalarStringColumn() throws HiveException { VectorizedRowBatch batch = getBatch1Long3BytesVectors(); byte[] scalar = getUTF8Bytes("scalar"); VectorExpression expr = new IfExprStringScalarStringGroupColumn(0,scalar, 2, 3); @@ -513,7 +513,7 @@ public void testIfExprStringScalarStringColumn() { } @Test - public void testIfExprStringScalarStringScalar() { + public void testIfExprStringScalarStringScalar() throws HiveException { // standard case VectorizedRowBatch batch = getBatch1Long3BytesVectors(); diff --git ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorDateExpressions.java ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorDateExpressions.java index 9db91be..ffe9c81 100644 --- ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorDateExpressions.java +++ ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorDateExpressions.java @@ -115,7 +115,7 @@ private void compareToUDFYearDate(long t, int y) { Assert.assertEquals(res.get(), y); } - private void verifyUDFYear(VectorizedRowBatch batch) { + private void verifyUDFYear(VectorizedRowBatch batch) throws HiveException { VectorExpression udf = null; udf = new VectorUDFYearDate(0, 1); udf.setInputTypeInfos(new TypeInfo[] {TypeInfoFactory.dateTypeInfo}); @@ -138,7 +138,7 @@ private void verifyUDFYear(VectorizedRowBatch batch) { } @Test - public void testVectorUDFYear() { + public void testVectorUDFYear() throws HiveException { VectorizedRowBatch batch = getVectorizedRowBatch(new int[] {0}, VectorizedRowBatch.DEFAULT_SIZE); Assert.assertTrue(((LongColumnVector) batch.cols[1]).noNulls); @@ -177,7 +177,7 @@ private void compareToUDFDayOfMonthDate(long t, int y) { Assert.assertEquals(res.get(), y); } - private void verifyUDFDayOfMonth(VectorizedRowBatch batch) { + private void verifyUDFDayOfMonth(VectorizedRowBatch batch) throws HiveException { VectorExpression udf = null; udf = new VectorUDFDayOfMonthDate(0, 1); udf.setInputTypeInfos(new TypeInfo[] {TypeInfoFactory.dateTypeInfo}); @@ -200,7 +200,7 @@ private void verifyUDFDayOfMonth(VectorizedRowBatch batch) { } @Test - public void testVectorUDFDayOfMonth() { + public void testVectorUDFDayOfMonth() throws HiveException { VectorizedRowBatch batch = getVectorizedRowBatch(new int[] {0}, VectorizedRowBatch.DEFAULT_SIZE); Assert.assertTrue(((LongColumnVector) batch.cols[1]).noNulls); @@ -239,7 +239,7 @@ private void compareToUDFMonthDate(long t, int y) { Assert.assertEquals(res.get(), y); } - private void verifyUDFMonth(VectorizedRowBatch batch) { + private void verifyUDFMonth(VectorizedRowBatch batch) throws HiveException { VectorExpression udf; udf = new VectorUDFMonthDate(0, 1); udf.setInputTypeInfos(new TypeInfo[] {TypeInfoFactory.dateTypeInfo}); @@ -262,7 +262,7 @@ private void verifyUDFMonth(VectorizedRowBatch batch) { } @Test - public void testVectorUDFMonth() { + public void testVectorUDFMonth() throws HiveException { VectorizedRowBatch batch = getVectorizedRowBatch(new int[] {0}, VectorizedRowBatch.DEFAULT_SIZE); Assert.assertTrue(((LongColumnVector) batch.cols[1]).noNulls); @@ -315,7 +315,7 @@ private void compareToUDFUnixTimeStampDate(long t, long y) { Assert.assertEquals(res.get(), y); } - private void verifyUDFUnixTimeStamp(VectorizedRowBatch batch) { + private void verifyUDFUnixTimeStamp(VectorizedRowBatch batch) throws HiveException { VectorExpression udf; udf = new VectorUDFUnixTimeStampDate(0, 1); udf.setInputTypeInfos(new TypeInfo[] {TypeInfoFactory.dateTypeInfo}); @@ -338,7 +338,7 @@ private void verifyUDFUnixTimeStamp(VectorizedRowBatch batch) { } @Test - public void testVectorUDFUnixTimeStamp() { + public void testVectorUDFUnixTimeStamp() throws HiveException { VectorizedRowBatch batch = getVectorizedRowBatch(new int[] {0}, VectorizedRowBatch.DEFAULT_SIZE); Assert.assertTrue(((LongColumnVector) batch.cols[1]).noNulls); @@ -460,7 +460,7 @@ public Void call() throws Exception { // 5s timeout @Test(timeout = 5000) - public void testMultiThreadedVectorUDFDate() { + public void testMultiThreadedVectorUDFDate() throws HiveException { List> tasks = new ArrayList>(); for (int i = 0; i < 200; i++) { tasks.add(new MultiThreadedDateFormatTest()); 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 3e769bb..5f4d138 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 @@ -65,7 +65,7 @@ public class TestVectorFilterExpressions { @Test - public void testFilterLongColEqualLongScalar() { + public void testFilterLongColEqualLongScalar() throws HiveException { VectorizedRowBatch vrg = VectorizedRowGroupGenUtil.getVectorizedRowBatch(1024, 1, 23); FilterLongColEqualLongScalar expr = new FilterLongColEqualLongScalar(0, 46); @@ -75,7 +75,7 @@ public void testFilterLongColEqualLongScalar() { } @Test - public void testFilterLongColGreaterLongColumn() { + public void testFilterLongColGreaterLongColumn() throws HiveException { int seed = 17; VectorizedRowBatch b = VectorizedRowGroupGenUtil.getVectorizedRowBatch( VectorizedRowBatch.DEFAULT_SIZE, @@ -132,7 +132,7 @@ public void testFilterLongColGreaterLongColumn() { } @Test - public void testColOpScalarNumericFilterNullAndRepeatingLogic() { + public void testColOpScalarNumericFilterNullAndRepeatingLogic() throws HiveException { // No nulls, not repeating FilterLongColGreaterLongScalar f = new FilterLongColGreaterLongScalar(0, 1); VectorizedRowBatch batch = this.getSimpleLongBatch(); @@ -196,7 +196,7 @@ private VectorizedRowBatch getSimpleLongBatch() { } @Test - public void testFilterLongColLessLongColumn() { + public void testFilterLongColLessLongColumn() throws HiveException { int seed = 17; VectorizedRowBatch vrg = VectorizedRowGroupGenUtil.getVectorizedRowBatch( 5, 3, seed); @@ -229,7 +229,7 @@ public void testFilterLongColLessLongColumn() { } @Test - public void testFilterLongScalarLessLongColumn() { + public void testFilterLongScalarLessLongColumn() throws HiveException { int seed = 17; VectorizedRowBatch vrb = VectorizedRowGroupGenUtil.getVectorizedRowBatch( 5, 2, seed); @@ -333,7 +333,7 @@ public void testFilterLongScalarLessLongColumn() { } @Test - public void testFilterLongBetween() { + public void testFilterLongBetween() throws HiveException { int seed = 17; VectorizedRowBatch vrb = VectorizedRowGroupGenUtil.getVectorizedRowBatch( 5, 2, seed); @@ -429,7 +429,7 @@ public void testFilterLongBetween() { } @Test - public void testFilterLongNotBetween() { + public void testFilterLongNotBetween() throws HiveException { // Spot check only. null & repeating behavior are checked elsewhere for the same template. int seed = 17; @@ -452,7 +452,7 @@ public void testFilterLongNotBetween() { } @Test - public void testFilterDoubleBetween() { + public void testFilterDoubleBetween() throws HiveException { // Spot check only. null & repeating behavior are checked elsewhere for the same template. int seed = 17; @@ -476,7 +476,7 @@ public void testFilterDoubleBetween() { } @Test - public void testFilterDoubleNotBetween() { + public void testFilterDoubleNotBetween() throws HiveException { // Spot check only. null & repeating behavior are checked elsewhere for the same template. int seed = 17; @@ -514,7 +514,7 @@ public void testFilterDoubleNotBetween() { } @Test - public void testFilterStringBetween() { + public void testFilterStringBetween() throws HiveException { int seed = 17; VectorizedRowBatch vrb = VectorizedRowGroupGenUtil.getVectorizedRowBatch( 3, 2, seed); @@ -566,7 +566,7 @@ public void testFilterStringBetween() { } @Test - public void testFilterStringNotBetween() { + public void testFilterStringNotBetween() throws HiveException { // Spot check only. Non-standard cases are checked for the same template in another test. int seed = 17; @@ -589,7 +589,7 @@ public void testFilterStringNotBetween() { } @Test - public void testFilterTimestampBetween() { + public void testFilterTimestampBetween() throws HiveException { VectorizedRowBatch vrb = new VectorizedRowBatch(1); vrb.cols[0] = new TimestampColumnVector(); @@ -614,7 +614,7 @@ public void testFilterTimestampBetween() { } @Test - public void testFilterTimestampNotBetween() { + public void testFilterTimestampNotBetween() throws HiveException { VectorizedRowBatch vrb = new VectorizedRowBatch(1); vrb.cols[0] = new TimestampColumnVector(); @@ -775,7 +775,7 @@ public void testFilterDoubleIn() throws HiveException { } @Test - public void testFilterStringIn() { + public void testFilterStringIn() throws HiveException { int seed = 17; VectorizedRowBatch vrb = VectorizedRowGroupGenUtil.getVectorizedRowBatch( 3, 2, seed); @@ -834,7 +834,7 @@ public void testFilterStringIn() { * multiple cases because the logic is the same for <, >, <=, >=, == and !=. */ @Test - public void testFilterDecimalColEqualDecimalScalar() { + public void testFilterDecimalColEqualDecimalScalar() throws HiveException { VectorizedRowBatch b = getVectorizedRowBatch1DecimalCol(); HiveDecimal scalar = HiveDecimal.create("-3.30"); VectorExpression expr = new FilterDecimalColEqualDecimalScalar(0, scalar); @@ -879,7 +879,7 @@ public void testFilterDecimalColEqualDecimalScalar() { * cases because the logic is the same for <, >, <=, >=, == and !=. */ @Test - public void testFilterDecimalScalarEqualDecimalColumn() { + public void testFilterDecimalScalarEqualDecimalColumn() throws HiveException { VectorizedRowBatch b = getVectorizedRowBatch1DecimalCol(); HiveDecimal scalar = HiveDecimal.create("-3.30"); VectorExpression expr = new FilterDecimalScalarEqualDecimalColumn(scalar, 0); @@ -924,7 +924,7 @@ public void testFilterDecimalScalarEqualDecimalColumn() { * cases because the logic is the same for <, >, <=, >=, == and !=. */ @Test - public void testFilterDecimalColumnEqualDecimalColumn() { + public void testFilterDecimalColumnEqualDecimalColumn() throws HiveException { VectorizedRowBatch b = getVectorizedRowBatch2DecimalCol(); VectorExpression expr = new FilterDecimalColEqualDecimalColumn(0, 1); expr.evaluate(b); @@ -984,7 +984,7 @@ public void testFilterDecimalColumnEqualDecimalColumn() { * Spot check col < scalar for decimal. */ @Test - public void testFilterDecimalColLessScalar() { + public void testFilterDecimalColLessScalar() throws HiveException { VectorizedRowBatch b = getVectorizedRowBatch1DecimalCol(); HiveDecimal scalar = HiveDecimal.create("0"); VectorExpression expr = new FilterDecimalColLessDecimalScalar(0, scalar); @@ -1000,7 +1000,7 @@ public void testFilterDecimalColLessScalar() { * Spot check scalar > col for decimal. */ @Test - public void testFilterDecimalScalarGreaterThanColumn() { + public void testFilterDecimalScalarGreaterThanColumn() throws HiveException { VectorizedRowBatch b = getVectorizedRowBatch1DecimalCol(); HiveDecimal scalar = HiveDecimal.create("0"); VectorExpression expr = new FilterDecimalScalarGreaterDecimalColumn(scalar, 0); @@ -1016,7 +1016,7 @@ public void testFilterDecimalScalarGreaterThanColumn() { * Spot check col >= col for decimal. */ @Test - public void testFilterDecimalColGreaterEqualCol() { + public void testFilterDecimalColGreaterEqualCol() throws HiveException { VectorizedRowBatch b = getVectorizedRowBatch2DecimalCol(); VectorExpression expr = new FilterDecimalColGreaterEqualDecimalColumn(0, 1); expr.evaluate(b); diff --git ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorLogicalExpressions.java ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorLogicalExpressions.java index a60b9e4..50ad196 100644 --- ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorLogicalExpressions.java +++ ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorLogicalExpressions.java @@ -26,6 +26,7 @@ import org.apache.hadoop.hive.ql.exec.vector.LongColumnVector; import org.apache.hadoop.hive.ql.exec.vector.VectorExpressionDescriptor.Descriptor; import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch; +import org.apache.hadoop.hive.ql.metadata.HiveException; import org.junit.Assert; import org.junit.Test; @@ -37,7 +38,7 @@ private static final int BOOLEAN_COLUMN_TEST_SIZE = 9; @Test - public void testLongColOrLongCol() { + public void testLongColOrLongCol() throws HiveException { VectorizedRowBatch batch = getBatchThreeBooleanCols(); ColOrCol expr = new ColOrCol(0, 1, 2); LongColumnVector outCol = (LongColumnVector) batch.cols[2]; @@ -92,7 +93,7 @@ public void testLongColOrLongCol() { } @Test - public void testLongColAndLongCol() { + public void testLongColAndLongCol() throws HiveException { VectorizedRowBatch batch = getBatchThreeBooleanCols(); ColAndCol expr = new ColAndCol(0, 1, 2); LongColumnVector outCol = (LongColumnVector) batch.cols[2]; @@ -187,7 +188,7 @@ private VectorizedRowBatch getBatchThreeBooleanCols() { } @Test - public void testBooleanNot() { + public void testBooleanNot() throws HiveException { VectorizedRowBatch batch = getBatchThreeBooleanCols(); NotCol expr = new NotCol(0, 2); LongColumnVector outCol = (LongColumnVector) batch.cols[2]; @@ -229,7 +230,7 @@ public void testBooleanNot() { } @Test - public void testIsNullExpr() { + public void testIsNullExpr() throws HiveException { // has nulls, not repeating VectorizedRowBatch batch = getBatchThreeBooleanCols(); IsNull expr = new IsNull(0, 2); @@ -269,7 +270,7 @@ public void testIsNullExpr() { } @Test - public void testIsNotNullExpr() { + public void testIsNotNullExpr() throws HiveException { // has nulls, not repeating VectorizedRowBatch batch = getBatchThreeBooleanCols(); IsNotNull expr = new IsNotNull(0, 2); @@ -309,7 +310,7 @@ public void testIsNotNullExpr() { } @Test - public void testBooleanFiltersOnColumns() { + public void testBooleanFiltersOnColumns() throws HiveException { VectorizedRowBatch batch = getBatchThreeBooleanCols(); SelectColumnIsTrue expr = new SelectColumnIsTrue(0); @@ -329,7 +330,7 @@ public void testBooleanFiltersOnColumns() { } @Test - public void testSelectColumnIsNull() { + public void testSelectColumnIsNull() throws HiveException { // has nulls, not repeating VectorizedRowBatch batch = getBatchThreeBooleanCols(); SelectColumnIsNull expr = new SelectColumnIsNull(0); @@ -362,7 +363,7 @@ public void testSelectColumnIsNull() { } @Test - public void testSelectColumnIsNotNull() { + public void testSelectColumnIsNotNull() throws HiveException { // has nulls, not repeating VectorizedRowBatch batch = getBatchThreeBooleanCols(); SelectColumnIsNotNull expr = new SelectColumnIsNotNull(0); @@ -413,7 +414,7 @@ public SelectColumnAll() { } @Override - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { if (childExpressions != null) { super.evaluateChildren(batch); @@ -450,7 +451,7 @@ public SelectColumnNotExpected() { } @Override - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { if (childExpressions != null) { super.evaluateChildren(batch); @@ -487,7 +488,7 @@ public SelectColumnNothing() { } @Override - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { if (childExpressions != null) { super.evaluateChildren(batch); @@ -526,7 +527,7 @@ public SelectColumnOne() { } @Override - public void evaluate(VectorizedRowBatch batch) { + public void evaluate(VectorizedRowBatch batch) throws HiveException { if (childExpressions != null) { super.evaluateChildren(batch); @@ -550,7 +551,7 @@ public String vectorExpressionParameters() { } @Test - public void testFilterExprOrExpr() { + public void testFilterExprOrExpr() throws HiveException { VectorizedRowBatch batch1 = getBatchThreeBooleanCols(); VectorizedRowBatch batch2 = getBatchThreeBooleanCols(); @@ -591,7 +592,7 @@ public void testFilterExprOrExpr() { } @Test - public void testFilterExprMultiOrExpr() { + public void testFilterExprMultiOrExpr() throws HiveException { // Select all with the first expression and expect the other 2 children to not be invoked. @@ -719,7 +720,7 @@ public void testFilterExprMultiOrExpr() { } @Test - public void testFilterExprOrExprWithBatchReuse() { + public void testFilterExprOrExprWithBatchReuse() throws HiveException { VectorizedRowBatch batch1 = getBatchThreeBooleanCols(); SelectColumnIsTrue expr1 = new SelectColumnIsTrue(0); @@ -753,7 +754,7 @@ public void testFilterExprOrExprWithBatchReuse() { } @Test - public void testFilterExprOrExprWithSelectInUse() { + public void testFilterExprOrExprWithSelectInUse() throws HiveException { VectorizedRowBatch batch1 = getBatchThreeBooleanCols(); SelectColumnIsTrue expr1 = new SelectColumnIsTrue(0); @@ -783,7 +784,7 @@ public void testFilterExprOrExprWithSelectInUse() { } @Test - public void testFilterExprAndExpr() { + public void testFilterExprAndExpr() throws HiveException { VectorizedRowBatch batch1 = getBatchThreeBooleanCols(); SelectColumnIsTrue expr1 = new SelectColumnIsTrue(0); @@ -800,7 +801,7 @@ public void testFilterExprAndExpr() { } @Test - public void testLongInExpr() { + public void testLongInExpr() throws HiveException { // check basic operation VectorizedRowBatch b = TestVectorMathFunctions.getVectorizedRowBatchLongInLongOut(); @@ -831,7 +832,7 @@ public void testLongInExpr() { } @Test - public void testDoubleInExpr() { + public void testDoubleInExpr() throws HiveException { // check basic operation VectorizedRowBatch b = TestVectorMathFunctions.getVectorizedRowBatchDoubleInLongOut(); diff --git ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorMathFunctions.java ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorMathFunctions.java index a8f94e5..e81844c 100644 --- ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorMathFunctions.java +++ ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorMathFunctions.java @@ -69,7 +69,7 @@ private static boolean equalsWithinTolerance(double a, double b) { } @Test - public void testVectorRound() { + public void testVectorRound() throws HiveException { VectorizedRowBatch b = getVectorizedRowBatchDoubleInDoubleOut(); VectorExpression expr = new FuncRoundDoubleToDouble(0, 1); DoubleColumnVector resultV = (DoubleColumnVector) b.cols[1]; @@ -106,7 +106,7 @@ public void testVectorRound() { } @Test - public void testRoundToDecimalPlaces() { + public void testRoundToDecimalPlaces() throws HiveException { VectorizedRowBatch b = getVectorizedRowBatchDoubleInDoubleOut(); VectorExpression expr = new RoundWithNumDigitsDoubleToDouble(0, 4, 1); expr.evaluate(b); @@ -357,7 +357,7 @@ public static VectorizedRowBatch getBatchForStringMath() { * (for FuncRoundDoubleToDouble). */ @Test - public void testVectorSin() { + public void testVectorSin() throws HiveException { VectorizedRowBatch b = getVectorizedRowBatchDoubleInDoubleOut(); DoubleColumnVector resultV = (DoubleColumnVector) b.cols[1]; b.cols[0].noNulls = true; @@ -367,7 +367,7 @@ public void testVectorSin() { } @Test - public void testVectorCos() { + public void testVectorCos() throws HiveException { VectorizedRowBatch b = getVectorizedRowBatchDoubleInDoubleOut(); DoubleColumnVector resultV = (DoubleColumnVector) b.cols[1]; b.cols[0].noNulls = true; @@ -377,7 +377,7 @@ public void testVectorCos() { } @Test - public void testVectorTan() { + public void testVectorTan() throws HiveException { VectorizedRowBatch b = getVectorizedRowBatchDoubleInDoubleOut(); DoubleColumnVector resultV = (DoubleColumnVector) b.cols[1]; b.cols[0].noNulls = true; @@ -387,7 +387,7 @@ public void testVectorTan() { } @Test - public void testVectorASin() { + public void testVectorASin() throws HiveException { VectorizedRowBatch b = getVectorizedRowBatchDoubleInDoubleOut(); DoubleColumnVector resultV = (DoubleColumnVector) b.cols[1]; b.cols[0].noNulls = true; @@ -397,7 +397,7 @@ public void testVectorASin() { } @Test - public void testVectorACos() { + public void testVectorACos() throws HiveException { VectorizedRowBatch b = getVectorizedRowBatchDoubleInDoubleOut(); DoubleColumnVector resultV = (DoubleColumnVector) b.cols[1]; b.cols[0].noNulls = true; @@ -407,7 +407,7 @@ public void testVectorACos() { } @Test - public void testVectorATan() { + public void testVectorATan() throws HiveException { VectorizedRowBatch b = getVectorizedRowBatchDoubleInDoubleOut(); DoubleColumnVector resultV = (DoubleColumnVector) b.cols[1]; b.cols[0].noNulls = true; @@ -417,7 +417,7 @@ public void testVectorATan() { } @Test - public void testVectorDegrees() { + public void testVectorDegrees() throws HiveException { VectorizedRowBatch b = getVectorizedRowBatchDoubleInDoubleOut(); DoubleColumnVector resultV = (DoubleColumnVector) b.cols[1]; b.cols[0].noNulls = true; @@ -427,7 +427,7 @@ public void testVectorDegrees() { } @Test - public void testVectorRadians() { + public void testVectorRadians() throws HiveException { VectorizedRowBatch b = getVectorizedRowBatchDoubleInDoubleOut(); DoubleColumnVector resultV = (DoubleColumnVector) b.cols[1]; b.cols[0].noNulls = true; @@ -437,7 +437,7 @@ public void testVectorRadians() { } @Test - public void testVectorFloor() { + public void testVectorFloor() throws HiveException { VectorizedRowBatch b = getVectorizedRowBatchDoubleInLongOut(); LongColumnVector resultV = (LongColumnVector) b.cols[1]; b.cols[0].noNulls = true; @@ -448,7 +448,7 @@ public void testVectorFloor() { } @Test - public void testVectorCeil() { + public void testVectorCeil() throws HiveException { VectorizedRowBatch b = getVectorizedRowBatchDoubleInLongOut(); LongColumnVector resultV = (LongColumnVector) b.cols[1]; b.cols[0].noNulls = true; @@ -459,7 +459,7 @@ public void testVectorCeil() { } @Test - public void testVectorExp() { + public void testVectorExp() throws HiveException { VectorizedRowBatch b = getVectorizedRowBatchDoubleInDoubleOut(); DoubleColumnVector resultV = (DoubleColumnVector) b.cols[1]; b.cols[0].noNulls = true; @@ -469,7 +469,7 @@ public void testVectorExp() { } @Test - public void testVectorLn() { + public void testVectorLn() throws HiveException { // test double->double version VectorizedRowBatch b = getVectorizedRowBatchDoubleInDoubleOut(); @@ -489,7 +489,7 @@ public void testVectorLn() { } @Test - public void testVectorLog2() { + public void testVectorLog2() throws HiveException { // test double->double version VectorizedRowBatch b = getVectorizedRowBatchDoubleInDoubleOut(); @@ -509,7 +509,7 @@ public void testVectorLog2() { } @Test - public void testVectorLog10() { + public void testVectorLog10() throws HiveException { // test double->double version VectorizedRowBatch b = getVectorizedRowBatchDoubleInDoubleOut(); @@ -529,7 +529,7 @@ public void testVectorLog10() { } @Test - public void testVectorRand() { + public void testVectorRand() throws HiveException { VectorizedRowBatch b = new VectorizedRowBatch(1); DoubleColumnVector v = new DoubleColumnVector(); b.cols[0] = v; @@ -565,7 +565,7 @@ public void testVectorRand() { } @Test - public void testVectorLogBase() { + public void testVectorLogBase() throws HiveException { // test double->double version VectorizedRowBatch b = getVectorizedRowBatchDoubleInDoubleOut(); @@ -577,7 +577,7 @@ public void testVectorLogBase() { } @Test - public void testVectorPosMod() { + public void testVectorPosMod() throws HiveException { // test double->double version VectorizedRowBatch b = getVectorizedRowBatchDoubleInDoubleOut(); @@ -620,7 +620,7 @@ public void testVectorPosMod() { } @Test - public void testVectorPosModWithFloatOutputType() { + public void testVectorPosModWithFloatOutputType() throws HiveException { // test double->double version VectorizedRowBatch b = getVectorizedRowBatchDoubleInDoubleOut(); @@ -644,7 +644,7 @@ public void testVectorPosModWithFloatOutputType() { } @Test - public void testVectorPower() { + public void testVectorPower() throws HiveException { VectorizedRowBatch b = getVectorizedRowBatchDoubleInDoubleOut(); DoubleColumnVector resultV = (DoubleColumnVector) b.cols[1]; b.cols[0].noNulls = true; @@ -654,7 +654,7 @@ public void testVectorPower() { } @Test - public void testVectorSqrt() { + public void testVectorSqrt() throws HiveException { VectorizedRowBatch b = getVectorizedRowBatchDoubleInDoubleOut(); DoubleColumnVector resultV = (DoubleColumnVector) b.cols[1]; b.cols[0].noNulls = true; @@ -664,7 +664,7 @@ public void testVectorSqrt() { } @Test - public void testVectorAbs() { + public void testVectorAbs() throws HiveException { // test double->double version VectorizedRowBatch b = getVectorizedRowBatchDoubleInDoubleOut(); @@ -686,7 +686,7 @@ public void testVectorAbs() { } @Test - public void testVectorSign() { + public void testVectorSign() throws HiveException { // test double->double version VectorizedRowBatch b = getVectorizedRowBatchDoubleInDoubleOut(); diff --git ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorScalarColArithmetic.java ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorScalarColArithmetic.java index d93aa3b..a246a45 100644 --- ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorScalarColArithmetic.java +++ ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorScalarColArithmetic.java @@ -28,6 +28,7 @@ import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch; import org.apache.hadoop.hive.ql.exec.vector.expressions.gen.LongScalarModuloLongColumn; import org.apache.hadoop.hive.ql.exec.vector.expressions.gen.LongScalarSubtractLongColumn; +import org.apache.hadoop.hive.ql.metadata.HiveException; import org.junit.Test; /** @@ -67,7 +68,7 @@ private VectorizedRowBatch getBatchSingleLongVectorPositiveNonZero() { } @Test - public void testLongScalarModuloLongColNoNulls() { + public void testLongScalarModuloLongColNoNulls() throws HiveException { VectorizedRowBatch batch = getBatchSingleLongVectorPositiveNonZero(); LongScalarModuloLongColumn expr = new LongScalarModuloLongColumn(100, 0, 1); expr.evaluate(batch); @@ -81,7 +82,7 @@ public void testLongScalarModuloLongColNoNulls() { } @Test - public void testLongScalarSubtractLongColNoNulls() { + public void testLongScalarSubtractLongColNoNulls() throws HiveException { VectorizedRowBatch batch = getVectorizedRowBatchSingleLongVector( VectorizedRowBatch.DEFAULT_SIZE); LongScalarSubtractLongColumn expr = new LongScalarSubtractLongColumn(100, 0, 1); @@ -96,7 +97,7 @@ public void testLongScalarSubtractLongColNoNulls() { } @Test - public void testLongScalarSubtractLongColWithNulls() { + public void testLongScalarSubtractLongColWithNulls() throws HiveException { VectorizedRowBatch batch = getVectorizedRowBatchSingleLongVector( VectorizedRowBatch.DEFAULT_SIZE); LongColumnVector lcv = (LongColumnVector) batch.cols[0]; @@ -119,7 +120,7 @@ public void testLongScalarSubtractLongColWithNulls() { } @Test - public void testLongScalarSubtractLongColWithRepeating() { + public void testLongScalarSubtractLongColWithRepeating() throws HiveException { LongColumnVector in, out; VectorizedRowBatch batch; LongScalarSubtractLongColumn expr; @@ -167,7 +168,7 @@ private boolean equalsWithinTolerance(double a, double b) { } @Test - public void testLongScalarDivide() { + public void testLongScalarDivide() throws HiveException { VectorizedRowBatch batch = TestVectorArithmeticExpressions.getVectorizedRowBatch2LongInDoubleOut(); LongColDivideLongScalar expr = new LongColDivideLongScalar(0, 100, 2); @@ -191,7 +192,7 @@ public void testLongScalarDivide() { } @Test - public void testScalarLongDivide() { + public void testScalarLongDivide() throws HiveException { VectorizedRowBatch batch = TestVectorArithmeticExpressions.getVectorizedRowBatch2LongInDoubleOut(); LongScalarDivideLongColumn expr = new LongScalarDivideLongColumn(100, 0, 2); @@ -219,7 +220,7 @@ public void testScalarLongDivide() { } @Test - public void testBooleanValuedLongIn() { + public void testBooleanValuedLongIn() throws HiveException { VectorizedRowBatch batch = getBatch(); long[] a = new long[2]; a[0] = 20; diff --git ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorStringExpressions.java ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorStringExpressions.java index 202f18c..80dddcb 100644 --- ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorStringExpressions.java +++ ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorStringExpressions.java @@ -3222,7 +3222,7 @@ public void testLoadBytesColumnVectorByRef() { @Test // Test string column to string literal comparison - public void testStringColCompareStringScalarFilter() { + public void testStringColCompareStringScalarFilter() throws HiveException { VectorizedRowBatch batch = makeStringBatch(); VectorExpression expr; expr = new FilterStringGroupColEqualStringScalar(0, red2); @@ -3252,7 +3252,7 @@ public void testStringColCompareStringScalarFilter() { @Test // Test string column to CHAR literal comparison - public void testStringColCompareCharScalarFilter() { + public void testStringColCompareCharScalarFilter() throws HiveException { VectorizedRowBatch batch = makeStringBatch(); VectorExpression expr; expr = new FilterStringGroupColEqualCharScalar(0, new HiveChar(new String(red2), 10)); @@ -3282,7 +3282,7 @@ public void testStringColCompareCharScalarFilter() { @Test // Test string column to VARCHAR literal comparison - public void testStringColCompareVarCharScalarFilter() { + public void testStringColCompareVarCharScalarFilter() throws HiveException { VectorizedRowBatch batch = makeStringBatch(); VectorExpression expr; expr = new FilterStringGroupColEqualVarCharScalar(0, new HiveVarchar(new String(red2), 10)); @@ -3311,7 +3311,7 @@ public void testStringColCompareVarCharScalarFilter() { } @Test - public void testStringColCompareStringScalarProjection() { + public void testStringColCompareStringScalarProjection() throws HiveException { VectorizedRowBatch batch = makeStringBatch(); VectorExpression expr; @@ -3334,7 +3334,7 @@ public void testStringColCompareStringScalarProjection() { } @Test - public void testStringColCompareCharScalarProjection() { + public void testStringColCompareCharScalarProjection() throws HiveException { VectorizedRowBatch batch = makeStringBatch(); VectorExpression expr; @@ -3357,7 +3357,7 @@ public void testStringColCompareCharScalarProjection() { } @Test - public void testStringColCompareVarCharScalarProjection() { + public void testStringColCompareVarCharScalarProjection() throws HiveException { VectorizedRowBatch batch = makeStringBatch(); VectorExpression expr; @@ -3381,7 +3381,7 @@ public void testStringColCompareVarCharScalarProjection() { @Test // Test string literal to string column comparison - public void testStringScalarCompareStringCol() { + public void testStringScalarCompareStringCol() throws HiveException { VectorizedRowBatch batch = makeStringBatch(); VectorExpression expr; expr = new FilterStringScalarEqualStringGroupColumn(red2, 0); @@ -3411,7 +3411,7 @@ public void testStringScalarCompareStringCol() { @Test // Test CHAR literal to string column comparison - public void testCharScalarCompareStringCol() { + public void testCharScalarCompareStringCol() throws HiveException { VectorizedRowBatch batch = makeStringBatch(); VectorExpression expr; expr = new FilterCharScalarEqualStringGroupColumn(new HiveChar(new String(red2), 8), 0); @@ -3441,7 +3441,7 @@ public void testCharScalarCompareStringCol() { @Test // Test VARCHAR literal to string column comparison - public void testVarCharScalarCompareStringCol() { + public void testVarCharScalarCompareStringCol() throws HiveException { VectorizedRowBatch batch = makeStringBatch(); VectorExpression expr; expr = new FilterVarCharScalarEqualStringGroupColumn(new HiveVarchar(new String(red2), 8), 0); @@ -3470,7 +3470,7 @@ public void testVarCharScalarCompareStringCol() { } @Test - public void testStringScalarCompareStringColProjection() { + public void testStringScalarCompareStringColProjection() throws HiveException { VectorizedRowBatch batch = makeStringBatch(); VectorExpression expr; @@ -3493,7 +3493,7 @@ public void testStringScalarCompareStringColProjection() { } @Test - public void testCharScalarCompareStringColProjection() { + public void testCharScalarCompareStringColProjection() throws HiveException { VectorizedRowBatch batch = makeStringBatch(); VectorExpression expr; @@ -3516,7 +3516,7 @@ public void testCharScalarCompareStringColProjection() { } @Test - public void testVarCharScalarCompareStringColProjection() { + public void testVarCharScalarCompareStringColProjection() throws HiveException { VectorizedRowBatch batch = makeStringBatch(); VectorExpression expr; @@ -3538,7 +3538,7 @@ public void testVarCharScalarCompareStringColProjection() { Assert.assertEquals(0, outVector.vector[2]); } @Test - public void testStringColCompareStringColFilter() { + public void testStringColCompareStringColFilter() throws HiveException { VectorizedRowBatch batch; VectorExpression expr; @@ -3690,7 +3690,7 @@ public void testStringColCompareStringColFilter() { } @Test - public void testStringColCompareStringColProjection() { + public void testStringColCompareStringColProjection() throws HiveException { VectorizedRowBatch batch; VectorExpression expr; long [] outVector; @@ -4029,7 +4029,7 @@ VectorizedRowBatch makeStringBatchMixedCharSize() { } @Test - public void testColLower() { + public void testColLower() throws HiveException { // has nulls, not repeating VectorizedRowBatch batch = makeStringBatchMixedCase(); StringLower expr = new StringLower(0, 1); @@ -4077,7 +4077,7 @@ public void testColLower() { } @Test - public void testColUpper() { + public void testColUpper() throws HiveException { // no nulls, not repeating @@ -4096,7 +4096,7 @@ public void testColUpper() { } @Test - public void testStringLength() { + public void testStringLength() throws HiveException { // has nulls, not repeating VectorizedRowBatch batch = makeStringBatchMixedCharSize(); @@ -4435,7 +4435,7 @@ public void testStringLikeRandomized() throws HiveException, UnsupportedEncoding } @Test - public void testColConcatStringScalar() { + public void testColConcatStringScalar() throws HiveException { // has nulls, not repeating VectorizedRowBatch batch = makeStringBatch(); @@ -4497,7 +4497,7 @@ public void testColConcatStringScalar() { } @Test - public void testColConcatCharScalar() { + public void testColConcatCharScalar() throws HiveException { // has nulls, not repeating VectorizedRowBatch batch = makeStringBatch(); @@ -4559,7 +4559,7 @@ public void testColConcatCharScalar() { } @Test - public void testColConcatVarCharScalar() { + public void testColConcatVarCharScalar() throws HiveException { // has nulls, not repeating VectorizedRowBatch batch = makeStringBatch(); @@ -4621,7 +4621,7 @@ public void testColConcatVarCharScalar() { } @Test - public void testStringScalarConcatCol() { + public void testStringScalarConcatCol() throws HiveException { // has nulls, not repeating VectorizedRowBatch batch = makeStringBatch(); @@ -4683,7 +4683,7 @@ public void testStringScalarConcatCol() { } @Test - public void testCharScalarConcatCol() { + public void testCharScalarConcatCol() throws HiveException { // has nulls, not repeating VectorizedRowBatch batch = makeStringBatch(); @@ -4745,7 +4745,7 @@ public void testCharScalarConcatCol() { } @Test - public void testVarCharScalarConcatCol() { + public void testVarCharScalarConcatCol() throws HiveException { // has nulls, not repeating VectorizedRowBatch batch = makeStringBatch(); @@ -4807,7 +4807,7 @@ public void testVarCharScalarConcatCol() { } @Test - public void testColConcatCol() { + public void testColConcatCol() throws HiveException { // has nulls, not repeating VectorizedRowBatch batch = makeStringBatch2In1Out(); @@ -4949,7 +4949,7 @@ public void testColConcatCol() { } @Test - public void testSubstrStart() throws UnsupportedEncodingException { + public void testSubstrStart() throws HiveException, UnsupportedEncodingException { // Testing no nulls and no repeating VectorizedRowBatch batch = new VectorizedRowBatch(2); BytesColumnVector v = new BytesColumnVector(); @@ -5148,7 +5148,7 @@ public void testSubstrStart() throws UnsupportedEncodingException { } @Test - public void testSubstrStartLen() throws UnsupportedEncodingException { + public void testSubstrStartLen() throws HiveException, UnsupportedEncodingException { // Testing no nulls and no repeating VectorizedRowBatch batch = new VectorizedRowBatch(2); @@ -5403,7 +5403,7 @@ public void testSubstrStartLen() throws UnsupportedEncodingException { } @Test - public void testVectorLTrim() { + public void testVectorLTrim() throws HiveException { VectorizedRowBatch b = makeTrimBatch(); VectorExpression expr = new StringLTrim(0, 1); expr.evaluate(b); @@ -5423,7 +5423,7 @@ public void testVectorLTrim() { } @Test - public void testVectorRTrim() { + public void testVectorRTrim() throws HiveException { VectorizedRowBatch b = makeTrimBatch(); VectorExpression expr = new StringRTrim(0, 1); expr.evaluate(b); @@ -5443,7 +5443,7 @@ public void testVectorRTrim() { } @Test - public void testVectorTrim() { + public void testVectorTrim() throws HiveException { VectorizedRowBatch b = makeTrimBatch(); VectorExpression expr = new StringTrim(0, 1); expr.evaluate(b); @@ -5481,7 +5481,7 @@ private VectorizedRowBatch makeTrimBatch() { // Test boolean-valued (non-filter) IN expression for strings @Test - public void testStringInExpr() { + public void testStringInExpr() throws HiveException { // test basic operation VectorizedRowBatch b = makeStringBatch(); diff --git ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorTypeCasts.java ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorTypeCasts.java index 6aa6da9..3f17d4c 100644 --- ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorTypeCasts.java +++ ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorTypeCasts.java @@ -58,7 +58,7 @@ public class TestVectorTypeCasts { @Test - public void testVectorCastLongToDouble() { + public void testVectorCastLongToDouble() throws HiveException { VectorizedRowBatch b = TestVectorMathFunctions.getVectorizedRowBatchLongInDoubleOut(); DoubleColumnVector resultV = (DoubleColumnVector) b.cols[1]; b.cols[0].noNulls = true; @@ -68,7 +68,7 @@ public void testVectorCastLongToDouble() { } @Test - public void testVectorCastDoubleToLong() { + public void testVectorCastDoubleToLong() throws HiveException { VectorizedRowBatch b = TestVectorMathFunctions.getVectorizedRowBatchDoubleInLongOut(); LongColumnVector resultV = (LongColumnVector) b.cols[1]; b.cols[0].noNulls = true; @@ -78,7 +78,7 @@ public void testVectorCastDoubleToLong() { } @Test - public void testCastDateToTimestamp() { + public void testCastDateToTimestamp() throws HiveException { int[] intValues = new int[500]; VectorizedRowBatch b = TestVectorMathFunctions.getVectorizedRowBatchDateInTimestampOut(intValues); TimestampColumnVector resultV = (TimestampColumnVector) b.cols[1]; @@ -93,7 +93,7 @@ public void testCastDateToTimestamp() { } @Test - public void testCastDoubleToBoolean() { + public void testCastDoubleToBoolean() throws HiveException { VectorizedRowBatch b = TestVectorMathFunctions.getVectorizedRowBatchDoubleInLongOut(); LongColumnVector resultV = (LongColumnVector) b.cols[1]; b.cols[0].noNulls = true; @@ -104,7 +104,7 @@ public void testCastDoubleToBoolean() { } @Test - public void testCastDoubleToTimestamp() { + public void testCastDoubleToTimestamp() throws HiveException { VectorizedRowBatch b = TestVectorMathFunctions.getVectorizedRowBatchDoubleInTimestampOut(); TimestampColumnVector resultV = (TimestampColumnVector) b.cols[1]; b.cols[0].noNulls = true; @@ -115,7 +115,7 @@ public void testCastDoubleToTimestamp() { } @Test - public void testCastLongToBoolean() { + public void testCastLongToBoolean() throws HiveException { VectorizedRowBatch b = TestVectorMathFunctions.getVectorizedRowBatchLongInLongOut(); LongColumnVector inV = (LongColumnVector) b.cols[0]; inV.vector[0] = 0; // make one entry produce false in result @@ -128,7 +128,7 @@ public void testCastLongToBoolean() { } @Test - public void testCastStringToBoolean() { + public void testCastStringToBoolean() throws HiveException { VectorizedRowBatch b = TestVectorMathFunctions.getVectorizedRowBatchStringInLongOut(); LongColumnVector resultV = (LongColumnVector) b.cols[1]; b.cols[0].noNulls = true; @@ -145,7 +145,7 @@ public void testCastStringToBoolean() { } @Test - public void testCastLongToTimestamp() { + public void testCastLongToTimestamp() throws HiveException { long[] longValues = new long[500]; VectorizedRowBatch b = TestVectorMathFunctions.getVectorizedRowBatchLongInTimestampOut(longValues); TimestampColumnVector resultV = (TimestampColumnVector) b.cols[1]; @@ -160,7 +160,7 @@ public void testCastLongToTimestamp() { } @Test - public void testCastTimestampToLong() { + public void testCastTimestampToLong() throws HiveException { long[] longValues = new long[500]; VectorizedRowBatch b = TestVectorMathFunctions.getVectorizedRowBatchTimestampInLongOut(longValues); TimestampColumnVector inV = (TimestampColumnVector) b.cols[0]; @@ -178,7 +178,7 @@ public void testCastTimestampToLong() { } @Test - public void testCastTimestampToDouble() { + public void testCastTimestampToDouble() throws HiveException { double[] doubleValues = new double[500]; VectorizedRowBatch b = TestVectorMathFunctions.getVectorizedRowBatchTimestampInDoubleOut(doubleValues); TimestampColumnVector inV = (TimestampColumnVector) b.cols[0]; @@ -219,7 +219,7 @@ public void testCastLongToString() throws HiveException { } @Test - public void testCastBooleanToString() { + public void testCastBooleanToString() throws HiveException { byte[] t = toBytes("TRUE"); byte[] f = toBytes("FALSE"); VectorizedRowBatch b = TestVectorMathFunctions.getBatchForStringMath(); @@ -319,7 +319,7 @@ private VectorizedRowBatch getBatchDecimalLong() { } @Test - public void testCastDecimalToDouble() { + public void testCastDecimalToDouble() throws HiveException { final double eps = 0.000001d; // tolerance to check double equality @@ -422,7 +422,7 @@ private VectorizedRowBatch getBatchDecimalString() { } @Test - public void testCastDecimalToTimestamp() { + public void testCastDecimalToTimestamp() throws HiveException { double[] doubleValues = new double[500]; VectorizedRowBatch b = getBatchDecimalTimestamp(doubleValues); VectorExpression expr = new CastDecimalToTimestamp(0, 1); @@ -477,7 +477,7 @@ private VectorizedRowBatch getBatchDecimalTimestamp(double[] doubleValues) { } @Test - public void testCastLongToDecimal() { + public void testCastLongToDecimal() throws HiveException { VectorizedRowBatch b = getBatchLongDecimal(); VectorExpression expr = new CastLongToDecimal(0, 1); expr.evaluate(b); @@ -540,7 +540,7 @@ private VectorizedRowBatch getBatchTimestampDecimal(HiveDecimal[] hiveDecimalVal } @Test - public void testCastDoubleToDecimal() { + public void testCastDoubleToDecimal() throws HiveException { VectorizedRowBatch b = getBatchDoubleDecimal(); VectorExpression expr = new CastDoubleToDecimal(0, 1); expr.evaluate(b); @@ -577,7 +577,7 @@ private VectorizedRowBatch getBatchDoubleDecimal() { } @Test - public void testCastStringToDecimal() { + public void testCastStringToDecimal() throws HiveException { VectorizedRowBatch b = getBatchStringDecimal(); VectorExpression expr = new CastStringToDecimal(0, 1); expr.evaluate(b); @@ -607,7 +607,7 @@ private VectorizedRowBatch getBatchStringDecimal() { } @Test - public void testCastTimestampToDecimal() { + public void testCastTimestampToDecimal() throws HiveException { // The input timestamps are stored as long values // measured in nanoseconds from the epoch. diff --git ql/src/test/org/apache/hadoop/hive/ql/exec/vector/udf/TestVectorUDFAdaptor.java ql/src/test/org/apache/hadoop/hive/ql/exec/vector/udf/TestVectorUDFAdaptor.java index 7e512ba..46834d8 100644 --- ql/src/test/org/apache/hadoop/hive/ql/exec/vector/udf/TestVectorUDFAdaptor.java +++ ql/src/test/org/apache/hadoop/hive/ql/exec/vector/udf/TestVectorUDFAdaptor.java @@ -61,7 +61,7 @@ } @Test - public void testLongUDF() { + public void testLongUDF() throws HiveException { // create a syntax tree for a simple function call "longudf(col0)" ExprNodeGenericFuncDesc funcDesc; @@ -124,7 +124,7 @@ public void testLongUDF() { } @Test - public void testMultiArgumentUDF() { + public void testMultiArgumentUDF() throws HiveException { // create a syntax tree for a function call "testudf(col0, col1, col2)" ExprNodeGenericFuncDesc funcDesc; @@ -246,7 +246,7 @@ private VectorizedRowBatch getBatchStrDblLongWithStrOut() { // test the UDF adaptor for a generic UDF (as opposed to a legacy UDF) @Test - public void testGenericUDF() { + public void testGenericUDF() throws HiveException { // create a syntax tree for a function call 'myisnull(col0, "UNKNOWN")' ExprNodeGenericFuncDesc funcDesc; diff --git ql/src/test/queries/clientpositive/vector_retry_failure.q ql/src/test/queries/clientpositive/vector_retry_failure.q new file mode 100644 index 0000000..448af73 --- /dev/null +++ ql/src/test/queries/clientpositive/vector_retry_failure.q @@ -0,0 +1,15 @@ +--! qt:dataset:src + +SET hive.vectorized.execution.enabled=true; +create table tx(a int,f string); +insert into tx values (1,'non_existent_file'); + +set zzz=1; +set reexec.overlay.zzz=2; + +set hive.query.reexecution.enabled=true; +set hive.query.reexecution.strategies=overlay; + +explain vectorization expression +select assert_true(${hiveconf:zzz} > a) from tx group by a; +select assert_true(${hiveconf:zzz} > a) from tx group by a; diff --git ql/src/test/results/clientpositive/llap/vector_retry_failure.q.out ql/src/test/results/clientpositive/llap/vector_retry_failure.q.out new file mode 100644 index 0000000..7bb21a4 --- /dev/null +++ ql/src/test/results/clientpositive/llap/vector_retry_failure.q.out @@ -0,0 +1,160 @@ +PREHOOK: query: create table tx(a int,f string) +PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default +PREHOOK: Output: default@tx +POSTHOOK: query: create table tx(a int,f string) +POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default +POSTHOOK: Output: default@tx +PREHOOK: query: insert into tx values (1,'non_existent_file') +PREHOOK: type: QUERY +PREHOOK: Input: _dummy_database@_dummy_table +PREHOOK: Output: default@tx +POSTHOOK: query: insert into tx values (1,'non_existent_file') +POSTHOOK: type: QUERY +POSTHOOK: Input: _dummy_database@_dummy_table +POSTHOOK: Output: default@tx +POSTHOOK: Lineage: tx.a SCRIPT [] +POSTHOOK: Lineage: tx.f SCRIPT [] +PREHOOK: query: explain vectorization expression +select assert_true(1 > a) from tx group by a +PREHOOK: type: QUERY +POSTHOOK: query: explain vectorization expression +select assert_true(1 > a) from tx group by a +POSTHOOK: type: QUERY +PLAN VECTORIZATION: + enabled: true + enabledConditionsMet: [hive.vectorized.execution.enabled IS true] + +STAGE DEPENDENCIES: + Stage-1 is a root stage + Stage-0 depends on stages: Stage-1 + +STAGE PLANS: + Stage: Stage-1 + Tez +#### A masked pattern was here #### + Edges: + Reducer 2 <- Map 1 (SIMPLE_EDGE) +#### A masked pattern was here #### + Vertices: + Map 1 + Map Operator Tree: + TableScan + alias: tx + Statistics: Num rows: 1 Data size: 4 Basic stats: COMPLETE Column stats: COMPLETE + TableScan Vectorization: + native: true + Select Operator + expressions: a (type: int) + outputColumnNames: a + Select Vectorization: + className: VectorSelectOperator + native: true + projectedOutputColumnNums: [0] + Statistics: Num rows: 1 Data size: 4 Basic stats: COMPLETE Column stats: COMPLETE + Group By Operator + Group By Vectorization: + className: VectorGroupByOperator + groupByMode: HASH + keyExpressions: col 0:int + native: false + vectorProcessingMode: HASH + projectedOutputColumnNums: [] + keys: a (type: int) + mode: hash + outputColumnNames: _col0 + Statistics: Num rows: 1 Data size: 4 Basic stats: COMPLETE Column stats: COMPLETE + Reduce Output Operator + key expressions: _col0 (type: int) + sort order: + + Map-reduce partition columns: _col0 (type: int) + Reduce Sink Vectorization: + className: VectorReduceSinkLongOperator + native: true + nativeConditionsMet: hive.vectorized.execution.reducesink.new.enabled IS true, hive.execution.engine tez IN [tez, spark] IS true, No PTF TopN IS true, No DISTINCT columns IS true, BinarySortableSerDe for keys IS true, LazyBinarySerDe for values IS true + Statistics: Num rows: 1 Data size: 4 Basic stats: COMPLETE Column stats: COMPLETE + Execution mode: vectorized, llap + LLAP IO: no inputs + Map Vectorization: + enabled: true + enabledConditionsMet: hive.vectorized.use.vector.serde.deserialize IS true + inputFormatFeatureSupport: [DECIMAL_64] + vectorizationSupportRemovedReasons: [DECIMAL_64 disabled because LLAP is enabled] + featureSupportInUse: [] + inputFileFormats: org.apache.hadoop.mapred.TextInputFormat + allNative: false + usesVectorUDFAdaptor: false + vectorized: true + Reducer 2 + Execution mode: vectorized, llap + Reduce Vectorization: + enabled: true + enableConditionsMet: hive.vectorized.execution.reduce.enabled IS true, hive.execution.engine tez IN [tez, spark] IS true + allNative: false + usesVectorUDFAdaptor: true + vectorized: true + Reduce Operator Tree: + Group By Operator + Group By Vectorization: + className: VectorGroupByOperator + groupByMode: MERGEPARTIAL + keyExpressions: col 0:int + native: false + vectorProcessingMode: MERGE_PARTIAL + projectedOutputColumnNums: [] + keys: KEY._col0 (type: int) + mode: mergepartial + outputColumnNames: _col0 + Statistics: Num rows: 1 Data size: 4 Basic stats: COMPLETE Column stats: COMPLETE + Select Operator + expressions: assert_true((_col0 < 1)) (type: void) + outputColumnNames: _col0 + Select Vectorization: + className: VectorSelectOperator + native: true + projectedOutputColumnNums: [2] + selectExpressions: VectorUDFAdaptor(assert_true((_col0 < 1)))(children: LongColLessLongScalar(col 0:int, val 1) -> 1:boolean) -> 2:void + Statistics: Num rows: 1 Data size: 4 Basic stats: COMPLETE Column stats: COMPLETE + File Output Operator + compressed: false + File Sink Vectorization: + className: VectorFileSinkOperator + native: false + Statistics: Num rows: 1 Data size: 4 Basic stats: COMPLETE Column stats: COMPLETE + table: + input format: org.apache.hadoop.mapred.SequenceFileInputFormat + output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat + serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe + + Stage: Stage-0 + Fetch Operator + limit: -1 + Processor Tree: + ListSink + +PREHOOK: query: select assert_true(1 > a) from tx group by a +PREHOOK: type: QUERY +PREHOOK: Input: default@tx +#### A masked pattern was here #### +Status: Failed +Vertex failed, vertexName=Reducer 2, vertexId=vertex_#ID#, diagnostics=[Task failed, taskId=task_#ID#, diagnostics=[TaskAttempt 0 failed, info=[Error: Error while running task ( failure ) : attempt_#ID#:java.lang.RuntimeException: java.lang.RuntimeException: Hive Runtime Error while closing operators: ASSERT_TRUE(): assertion failed. +#### A masked pattern was here #### +], TaskAttempt 1 failed, info=[Error: Error while running task ( failure ) : attempt_#ID#:java.lang.RuntimeException: java.lang.RuntimeException: Hive Runtime Error while closing operators: ASSERT_TRUE(): assertion failed. +#### A masked pattern was here #### +]], Vertex did not succeed due to OWN_TASK_FAILURE, failedTasks:1 killedTasks:0, Vertex vertex_#ID# [Reducer 2] killed/failed due to:OWN_TASK_FAILURE] +DAG did not succeed due to VERTEX_FAILURE. failedVertices:1 killedVertices:0 +FAILED: Execution Error, return code 2 from org.apache.hadoop.hive.ql.exec.tez.TezTask. Vertex failed, vertexName=Reducer 2, vertexId=vertex_#ID#, diagnostics=[Task failed, taskId=task_#ID#, diagnostics=[TaskAttempt 0 failed, info=[Error: Error while running task ( failure ) : attempt_#ID#:java.lang.RuntimeException: java.lang.RuntimeException: Hive Runtime Error while closing operators: ASSERT_TRUE(): assertion failed. +#### A masked pattern was here #### +], TaskAttempt 1 failed, info=[Error: Error while running task ( failure ) : attempt_#ID#:java.lang.RuntimeException: java.lang.RuntimeException: Hive Runtime Error while closing operators: ASSERT_TRUE(): assertion failed. +#### A masked pattern was here #### +]], Vertex did not succeed due to OWN_TASK_FAILURE, failedTasks:1 killedTasks:0, Vertex vertex_#ID# [Reducer 2] killed/failed due to:OWN_TASK_FAILURE]DAG did not succeed due to VERTEX_FAILURE. failedVertices:1 killedVertices:0 +PREHOOK: query: select assert_true(2 > a) from tx group by a +PREHOOK: type: QUERY +PREHOOK: Input: default@tx +#### A masked pattern was here #### +POSTHOOK: query: select assert_true(2 > a) from tx group by a +POSTHOOK: type: QUERY +POSTHOOK: Input: default@tx +#### A masked pattern was here #### +NULL