You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by se...@apache.org on 2018/07/18 18:52:26 UTC
[30/48] hive git commit: HIVE-20174: Vectorization: Fix NULL / Wrong
Results issues in GROUP BY Aggregation Functions (Matt McCline,
reviewed by Teddy Choi)
http://git-wip-us.apache.org/repos/asf/hive/blob/0966a383/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorIfStatement.java
----------------------------------------------------------------------
diff --git a/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorIfStatement.java b/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorIfStatement.java
index e54ccaa..9020016 100644
--- a/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorIfStatement.java
+++ b/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorIfStatement.java
@@ -199,10 +199,12 @@ public class TestVectorIfStatement {
boolean isNullScalar1, boolean isNullScalar2)
throws Exception {
+ /*
System.out.println("*DEBUG* typeName " + typeName +
" columnScalarMode " + columnScalarMode +
" isNullScalar1 " + isNullScalar1 +
" isNullScalar2 " + isNullScalar2);
+ */
TypeInfo typeInfo = TypeInfoUtils.getTypeInfoFromTypeString(typeName);
@@ -457,11 +459,13 @@ public class TestVectorIfStatement {
resultVectorExtractRow.init(new TypeInfo[] { typeInfo }, new int[] { columns.size() });
Object[] scrqtchRow = new Object[1];
+ /*
System.out.println(
"*DEBUG* typeInfo " + typeInfo.toString() +
" ifStmtTestMode " + ifStmtTestMode +
" columnScalarMode " + columnScalarMode +
" vectorExpression " + vectorExpression.getClass().getSimpleName());
+ */
batchSource.resetBatchIteration();
int rowIndex = 0;
http://git-wip-us.apache.org/repos/asf/hive/blob/0966a383/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorNegative.java
----------------------------------------------------------------------
diff --git a/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorNegative.java b/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorNegative.java
index ce20f28..d43249e 100644
--- a/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorNegative.java
+++ b/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorNegative.java
@@ -330,10 +330,12 @@ public class TestVectorNegative {
ObjectInspector rowInspector,
TypeInfo outputTypeInfo, Object[] resultObjects) throws Exception {
+ /*
System.out.println(
"*DEBUG* typeInfo " + typeInfo.toString() +
" negativeTestMode ROW_MODE" +
" exprDesc " + exprDesc.toString());
+ */
HiveConf hiveConf = new HiveConf();
ExprNodeEvaluator evaluator =
@@ -425,10 +427,13 @@ public class TestVectorNegative {
new TypeInfo[] { outputTypeInfo }, new int[] { vectorExpression.getOutputColumnNum() });
Object[] scrqtchRow = new Object[1];
+ /*
System.out.println(
"*DEBUG* typeInfo " + typeInfo.toString() +
" negativeTestMode " + negativeTestMode +
" vectorExpression " + vectorExpression.toString());
+ */
+
batchSource.resetBatchIteration();
int rowIndex = 0;
while (true) {
http://git-wip-us.apache.org/repos/asf/hive/blob/0966a383/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorStringConcat.java
----------------------------------------------------------------------
diff --git a/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorStringConcat.java b/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorStringConcat.java
index a87a8b4..f3050c2 100644
--- a/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorStringConcat.java
+++ b/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorStringConcat.java
@@ -305,12 +305,14 @@ public class TestVectorStringConcat {
ObjectInspector rowInspector,
GenericUDF genericUdf, Object[] resultObjects) throws Exception {
+ /*
System.out.println(
"*DEBUG* stringTypeInfo " + stringTypeInfo.toString() +
" integerTypeInfo " + integerTypeInfo +
" stringConcatTestMode ROW_MODE" +
" columnScalarMode " + columnScalarMode +
" genericUdf " + genericUdf.toString());
+ */
ExprNodeGenericFuncDesc exprDesc =
new ExprNodeGenericFuncDesc(TypeInfoFactory.stringTypeInfo, genericUdf, children);
@@ -405,12 +407,14 @@ public class TestVectorStringConcat {
new TypeInfo[] { outputTypeInfo }, new int[] { columns.size() });
Object[] scrqtchRow = new Object[1];
+ /*
System.out.println(
"*DEBUG* stringTypeInfo1 " + stringTypeInfo1.toString() +
" stringTypeInfo2 " + stringTypeInfo2.toString() +
" stringConcatTestMode " + stringConcatTestMode +
" columnScalarMode " + columnScalarMode +
" vectorExpression " + vectorExpression.toString());
+ */
batchSource.resetBatchIteration();
int rowIndex = 0;
http://git-wip-us.apache.org/repos/asf/hive/blob/0966a383/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorStringUnary.java
----------------------------------------------------------------------
diff --git a/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorStringUnary.java b/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorStringUnary.java
index 90f7992..8df5595 100644
--- a/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorStringUnary.java
+++ b/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorStringUnary.java
@@ -347,11 +347,13 @@ public class TestVectorStringUnary {
resultVectorExtractRow.init(new TypeInfo[] { targetTypeInfo }, new int[] { columns.size() });
Object[] scrqtchRow = new Object[1];
+ /*
System.out.println(
"*DEBUG* typeInfo " + typeInfo.toString() +
" targetTypeInfo " + targetTypeInfo.toString() +
" stringUnaryTestMode " + stringUnaryTestMode +
" vectorExpression " + vectorExpression.getClass().getSimpleName());
+ */
batchSource.resetBatchIteration();
int rowIndex = 0;
http://git-wip-us.apache.org/repos/asf/hive/blob/0966a383/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorSubStr.java
----------------------------------------------------------------------
diff --git a/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorSubStr.java b/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorSubStr.java
index 284a47a..b1344ab 100644
--- a/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorSubStr.java
+++ b/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorSubStr.java
@@ -326,11 +326,13 @@ public class TestVectorSubStr {
resultVectorExtractRow.init(new TypeInfo[] { targetTypeInfo }, new int[] { columns.size() });
Object[] scrqtchRow = new Object[1];
+ /*
System.out.println(
"*DEBUG* typeInfo " + typeInfo.toString() +
" targetTypeInfo " + targetTypeInfo.toString() +
" subStrTestMode " + subStrTestMode +
" vectorExpression " + vectorExpression.getClass().getSimpleName());
+ */
batchSource.resetBatchIteration();
int rowIndex = 0;
http://git-wip-us.apache.org/repos/asf/hive/blob/0966a383/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorTimestampExtract.java
----------------------------------------------------------------------
diff --git a/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorTimestampExtract.java b/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorTimestampExtract.java
index 58e3fa3..e56a6c3 100644
--- a/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorTimestampExtract.java
+++ b/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorTimestampExtract.java
@@ -283,10 +283,12 @@ public class TestVectorTimestampExtract {
Object[][] randomRows, ObjectInspector rowInspector, Object[] resultObjects)
throws Exception {
+ /*
System.out.println(
"*DEBUG* dateTimeStringTypeInfo " + dateTimeStringTypeInfo.toString() +
" timestampExtractTestMode ROW_MODE" +
" exprDesc " + exprDesc.toString());
+ */
HiveConf hiveConf = new HiveConf();
ExprNodeEvaluator evaluator =
@@ -392,10 +394,12 @@ public class TestVectorTimestampExtract {
VectorExpression vectorExpression = vectorizationContext.getVectorExpression(exprDesc);
vectorExpression.transientInit();
+ /*
System.out.println(
"*DEBUG* dateTimeStringTypeInfo " + dateTimeStringTypeInfo.toString() +
" timestampExtractTestMode " + timestampExtractTestMode +
" vectorExpression " + vectorExpression.getClass().getSimpleName());
+ */
VectorRandomRowSource rowSource = batchSource.getRowSource();
VectorizedRowBatchCtx batchContext =
http://git-wip-us.apache.org/repos/asf/hive/blob/0966a383/ql/src/test/org/apache/hadoop/hive/ql/optimizer/physical/TestVectorizer.java
----------------------------------------------------------------------
diff --git a/ql/src/test/org/apache/hadoop/hive/ql/optimizer/physical/TestVectorizer.java b/ql/src/test/org/apache/hadoop/hive/ql/optimizer/physical/TestVectorizer.java
index d9fc060..2a2bbe1 100644
--- a/ql/src/test/org/apache/hadoop/hive/ql/optimizer/physical/TestVectorizer.java
+++ b/ql/src/test/org/apache/hadoop/hive/ql/optimizer/physical/TestVectorizer.java
@@ -112,7 +112,10 @@ public class TestVectorizer {
vectorDesc.setVecAggrDescs(
new VectorAggregationDesc[] {
new VectorAggregationDesc(
- aggDesc, new GenericUDAFSum.GenericUDAFSumLong(), TypeInfoFactory.longTypeInfo, ColumnVector.Type.LONG, null,
+ aggDesc.getGenericUDAFName(),
+ new GenericUDAFSum.GenericUDAFSumLong(),
+ aggDesc.getMode(),
+ TypeInfoFactory.longTypeInfo, ColumnVector.Type.LONG, null,
TypeInfoFactory.longTypeInfo, ColumnVector.Type.LONG, VectorUDAFCountStar.class)});
desc.setOutputColumnNames(outputColumnNames);