You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by go...@apache.org on 2016/01/19 00:36:26 UTC
hive git commit: Vectorization: fix VectorUDAF* suspect isNull checks
(Gopal V, reviewed by Matt McCline)
Repository: hive
Updated Branches:
refs/heads/master 6469961c3 -> 36e855084
Vectorization: fix VectorUDAF* suspect isNull checks (Gopal V, reviewed by Matt McCline)
Signed-off-by: Gopal V <go...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/hive/repo
Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/36e85508
Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/36e85508
Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/36e85508
Branch: refs/heads/master
Commit: 36e855084da833915dfe6c34f74e19352b64fde9
Parents: 6469961
Author: Gopal V <go...@apache.org>
Authored: Mon Jan 18 15:36:01 2016 -0800
Committer: Gopal V <go...@apache.org>
Committed: Mon Jan 18 15:36:01 2016 -0800
----------------------------------------------------------------------
.../UDAFTemplates/VectorUDAFAvg.txt | 32 ++++++++++--------
.../UDAFTemplates/VectorUDAFMinMax.txt | 32 ++++++++++--------
.../UDAFTemplates/VectorUDAFMinMaxDecimal.txt | 16 +++++----
.../UDAFTemplates/VectorUDAFSum.txt | 34 +++++++++++---------
.../aggregates/VectorUDAFAvgDecimal.java | 32 ++++++++++--------
.../aggregates/VectorUDAFCountMerge.java | 32 ++++++++++--------
.../aggregates/VectorUDAFSumDecimal.java | 32 ++++++++++--------
7 files changed, 118 insertions(+), 92 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hive/blob/36e85508/ql/src/gen/vectorization/UDAFTemplates/VectorUDAFAvg.txt
----------------------------------------------------------------------
diff --git a/ql/src/gen/vectorization/UDAFTemplates/VectorUDAFAvg.txt b/ql/src/gen/vectorization/UDAFTemplates/VectorUDAFAvg.txt
index 6f7ee6a..d153fd6 100644
--- a/ql/src/gen/vectorization/UDAFTemplates/VectorUDAFAvg.txt
+++ b/ql/src/gen/vectorization/UDAFTemplates/VectorUDAFAvg.txt
@@ -235,15 +235,17 @@ public class <ClassName> extends VectorAggregateExpression {
int batchSize,
int[] selection,
boolean[] isNull) {
+
+ if (isNull[0]) {
+ return;
+ }
for (int i=0; i < batchSize; ++i) {
- if (!isNull[selection[i]]) {
- Aggregation myagg = getCurrentAggregationBuffer(
- aggregationBufferSets,
- bufferIndex,
- i);
- myagg.sumValue(value);
- }
+ Aggregation myagg = getCurrentAggregationBuffer(
+ aggregationBufferSets,
+ bufferIndex,
+ i);
+ myagg.sumValue(value);
}
}
@@ -255,14 +257,16 @@ public class <ClassName> extends VectorAggregateExpression {
int batchSize,
boolean[] isNull) {
+ if (isNull[0]) {
+ return;
+ }
+
for (int i=0; i < batchSize; ++i) {
- if (!isNull[i]) {
- Aggregation myagg = getCurrentAggregationBuffer(
- aggregationBufferSets,
- bufferIndex,
- i);
- myagg.sumValue(value);
- }
+ Aggregation myagg = getCurrentAggregationBuffer(
+ aggregationBufferSets,
+ bufferIndex,
+ i);
+ myagg.sumValue(value);
}
}
http://git-wip-us.apache.org/repos/asf/hive/blob/36e85508/ql/src/gen/vectorization/UDAFTemplates/VectorUDAFMinMax.txt
----------------------------------------------------------------------
diff --git a/ql/src/gen/vectorization/UDAFTemplates/VectorUDAFMinMax.txt b/ql/src/gen/vectorization/UDAFTemplates/VectorUDAFMinMax.txt
index 0595f71..46d66bd 100644
--- a/ql/src/gen/vectorization/UDAFTemplates/VectorUDAFMinMax.txt
+++ b/ql/src/gen/vectorization/UDAFTemplates/VectorUDAFMinMax.txt
@@ -214,15 +214,17 @@ public class <ClassName> extends VectorAggregateExpression {
int batchSize,
int[] selection,
boolean[] isNull) {
+
+ if (isNull[0]) {
+ return;
+ }
for (int i=0; i < batchSize; ++i) {
- if (!isNull[selection[i]]) {
- Aggregation myagg = getCurrentAggregationBuffer(
- aggregationBufferSets,
- aggregrateIndex,
- i);
- myagg.checkValue(value);
- }
+ Aggregation myagg = getCurrentAggregationBuffer(
+ aggregationBufferSets,
+ aggregrateIndex,
+ i);
+ myagg.checkValue(value);
}
}
@@ -234,14 +236,16 @@ public class <ClassName> extends VectorAggregateExpression {
int batchSize,
boolean[] isNull) {
+ if (isNull[0]) {
+ return;
+ }
+
for (int i=0; i < batchSize; ++i) {
- if (!isNull[i]) {
- Aggregation myagg = getCurrentAggregationBuffer(
- aggregationBufferSets,
- aggregrateIndex,
- i);
- myagg.checkValue(value);
- }
+ Aggregation myagg = getCurrentAggregationBuffer(
+ aggregationBufferSets,
+ aggregrateIndex,
+ i);
+ myagg.checkValue(value);
}
}
http://git-wip-us.apache.org/repos/asf/hive/blob/36e85508/ql/src/gen/vectorization/UDAFTemplates/VectorUDAFMinMaxDecimal.txt
----------------------------------------------------------------------
diff --git a/ql/src/gen/vectorization/UDAFTemplates/VectorUDAFMinMaxDecimal.txt b/ql/src/gen/vectorization/UDAFTemplates/VectorUDAFMinMaxDecimal.txt
index 6912ced..9a48171 100644
--- a/ql/src/gen/vectorization/UDAFTemplates/VectorUDAFMinMaxDecimal.txt
+++ b/ql/src/gen/vectorization/UDAFTemplates/VectorUDAFMinMaxDecimal.txt
@@ -245,14 +245,16 @@ public class <ClassName> extends VectorAggregateExpression {
int batchSize,
boolean[] isNull) {
+ if (isNull[0]) {
+ return;
+ }
+
for (int i=0; i < batchSize; ++i) {
- if (!isNull[i]) {
- Aggregation myagg = getCurrentAggregationBuffer(
- aggregationBufferSets,
- aggregrateIndex,
- i);
- myagg.checkValue(value, scale);
- }
+ Aggregation myagg = getCurrentAggregationBuffer(
+ aggregationBufferSets,
+ aggregrateIndex,
+ i);
+ myagg.checkValue(value, scale);
}
}
http://git-wip-us.apache.org/repos/asf/hive/blob/36e85508/ql/src/gen/vectorization/UDAFTemplates/VectorUDAFSum.txt
----------------------------------------------------------------------
diff --git a/ql/src/gen/vectorization/UDAFTemplates/VectorUDAFSum.txt b/ql/src/gen/vectorization/UDAFTemplates/VectorUDAFSum.txt
index 4f70733..cc7e54d 100644
--- a/ql/src/gen/vectorization/UDAFTemplates/VectorUDAFSum.txt
+++ b/ql/src/gen/vectorization/UDAFTemplates/VectorUDAFSum.txt
@@ -210,15 +210,17 @@ public class <ClassName> extends VectorAggregateExpression {
int batchSize,
int[] selection,
boolean[] isNull) {
-
+
+ if (isNull[0]) {
+ return;
+ }
+
for (int i=0; i < batchSize; ++i) {
- if (!isNull[selection[i]]) {
- Aggregation myagg = getCurrentAggregationBuffer(
- aggregationBufferSets,
- aggregateIndex,
- i);
- myagg.sumValue(value);
- }
+ Aggregation myagg = getCurrentAggregationBuffer(
+ aggregationBufferSets,
+ aggregateIndex,
+ i);
+ myagg.sumValue(value);
}
}
@@ -230,14 +232,16 @@ public class <ClassName> extends VectorAggregateExpression {
int batchSize,
boolean[] isNull) {
+ if (isNull[0]) {
+ return;
+ }
+
for (int i=0; i < batchSize; ++i) {
- if (!isNull[i]) {
- Aggregation myagg = getCurrentAggregationBuffer(
- aggregationBufferSets,
- aggregateIndex,
- i);
- myagg.sumValue(value);
- }
+ Aggregation myagg = getCurrentAggregationBuffer(
+ aggregationBufferSets,
+ aggregateIndex,
+ i);
+ myagg.sumValue(value);
}
}
http://git-wip-us.apache.org/repos/asf/hive/blob/36e85508/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/aggregates/VectorUDAFAvgDecimal.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/aggregates/VectorUDAFAvgDecimal.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/aggregates/VectorUDAFAvgDecimal.java
index 9cc0621..d0ff5fa 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/aggregates/VectorUDAFAvgDecimal.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/aggregates/VectorUDAFAvgDecimal.java
@@ -293,14 +293,16 @@ public class VectorUDAFAvgDecimal extends VectorAggregateExpression {
int[] selection,
boolean[] isNull) {
+ if (isNull[0]) {
+ return;
+ }
+
for (int i=0; i < batchSize; ++i) {
- if (!isNull[selection[i]]) {
- Aggregation myagg = getCurrentAggregationBuffer(
- aggregationBufferSets,
- bufferIndex,
- i);
- myagg.sumValueWithNullCheck(value, this.sumScale);
- }
+ Aggregation myagg = getCurrentAggregationBuffer(
+ aggregationBufferSets,
+ bufferIndex,
+ i);
+ myagg.sumValueWithNullCheck(value, this.sumScale);
}
}
@@ -312,14 +314,16 @@ public class VectorUDAFAvgDecimal extends VectorAggregateExpression {
int batchSize,
boolean[] isNull) {
+ if (isNull[0]) {
+ return;
+ }
+
for (int i=0; i < batchSize; ++i) {
- if (!isNull[i]) {
- Aggregation myagg = getCurrentAggregationBuffer(
- aggregationBufferSets,
- bufferIndex,
- i);
- myagg.sumValueWithNullCheck(value, this.sumScale);
- }
+ Aggregation myagg = getCurrentAggregationBuffer(
+ aggregationBufferSets,
+ bufferIndex,
+ i);
+ myagg.sumValueWithNullCheck(value, this.sumScale);
}
}
http://git-wip-us.apache.org/repos/asf/hive/blob/36e85508/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/aggregates/VectorUDAFCountMerge.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/aggregates/VectorUDAFCountMerge.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/aggregates/VectorUDAFCountMerge.java
index 7dabbd8..577977f 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/aggregates/VectorUDAFCountMerge.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/aggregates/VectorUDAFCountMerge.java
@@ -193,15 +193,17 @@ public class VectorUDAFCountMerge extends VectorAggregateExpression {
int batchSize,
int[] selection,
boolean[] isNull) {
+
+ if (isNull[0]) {
+ return;
+ }
for (int i=0; i < batchSize; ++i) {
- if (!isNull[selection[i]]) {
- Aggregation myagg = getCurrentAggregationBuffer(
- aggregationBufferSets,
- aggregateIndex,
- i);
- myagg.value += value;
- }
+ Aggregation myagg = getCurrentAggregationBuffer(
+ aggregationBufferSets,
+ aggregateIndex,
+ i);
+ myagg.value += value;
}
}
@@ -213,14 +215,16 @@ public class VectorUDAFCountMerge extends VectorAggregateExpression {
int batchSize,
boolean[] isNull) {
+ if (isNull[0]) {
+ return;
+ }
+
for (int i=0; i < batchSize; ++i) {
- if (!isNull[i]) {
- Aggregation myagg = getCurrentAggregationBuffer(
- aggregationBufferSets,
- aggregateIndex,
- i);
- myagg.value += value;
- }
+ Aggregation myagg = getCurrentAggregationBuffer(
+ aggregationBufferSets,
+ aggregateIndex,
+ i);
+ myagg.value += value;
}
}
http://git-wip-us.apache.org/repos/asf/hive/blob/36e85508/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/aggregates/VectorUDAFSumDecimal.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/aggregates/VectorUDAFSumDecimal.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/aggregates/VectorUDAFSumDecimal.java
index 80b7131..3a5fef6 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/aggregates/VectorUDAFSumDecimal.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/aggregates/VectorUDAFSumDecimal.java
@@ -232,14 +232,16 @@ public class VectorUDAFSumDecimal extends VectorAggregateExpression {
int[] selection,
boolean[] isNull) {
+ if (isNull[0]) {
+ return;
+ }
+
for (int i=0; i < batchSize; ++i) {
- if (!isNull[selection[i]]) {
- Aggregation myagg = getCurrentAggregationBuffer(
- aggregationBufferSets,
- aggregateIndex,
- i);
- myagg.sumValue(value, scale);
- }
+ Aggregation myagg = getCurrentAggregationBuffer(
+ aggregationBufferSets,
+ aggregateIndex,
+ i);
+ myagg.sumValue(value, scale);
}
}
@@ -252,14 +254,16 @@ public class VectorUDAFSumDecimal extends VectorAggregateExpression {
int batchSize,
boolean[] isNull) {
+ if (isNull[0]) {
+ return;
+ }
+
for (int i=0; i < batchSize; ++i) {
- if (!isNull[i]) {
- Aggregation myagg = getCurrentAggregationBuffer(
- aggregationBufferSets,
- aggregateIndex,
- i);
- myagg.sumValue(value, scale);
- }
+ Aggregation myagg = getCurrentAggregationBuffer(
+ aggregationBufferSets,
+ aggregateIndex,
+ i);
+ myagg.sumValue(value, scale);
}
}