diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/aggregates/gen/VectorUDAFAvgLong.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/aggregates/gen/VectorUDAFAvgLong.java index ff8ca5c..f12fe98 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/aggregates/gen/VectorUDAFAvgLong.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/aggregates/gen/VectorUDAFAvgLong.java @@ -51,7 +51,7 @@ /** class for storing the current aggregate value. */ static class Aggregation implements AggregationBuffer { - long sum; + double sum; long count; boolean isNull; diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/aggregates/gen/VectorUDAFStdPopLong.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/aggregates/gen/VectorUDAFStdPopLong.java index 45a0018..19e8d77 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/aggregates/gen/VectorUDAFStdPopLong.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/aggregates/gen/VectorUDAFStdPopLong.java @@ -165,7 +165,7 @@ else if (inputVector.noNulls){ private void iterateRepeatingNoNullsWithAggregationSelection( VectorAggregationBufferRow[] aggregationBufferSets, int aggregateIndex, - long value, + double value, int batchSize) { for (int i=0; i 1) { @@ -330,7 +330,7 @@ else if (inputVector.noNulls){ private void iterateRepeatingNoNulls( Aggregation myagg, - long value, + double value, int batchSize) { if (myagg.isNull) { @@ -366,7 +366,7 @@ private void iterateSelectionHasNulls( for (int j=0; j< batchSize; ++j) { int i = selected[j]; if (!isNull[i]) { - long value = vector[i]; + double value = vector[i]; if (myagg.isNull) { myagg.init (); } @@ -390,7 +390,7 @@ private void iterateSelectionNoNulls( myagg.init (); } - long value = vector[selected[0]]; + double value = vector[selected[0]]; myagg.sum += value; myagg.count += 1; if(myagg.count > 1) { @@ -417,7 +417,7 @@ private void iterateNoSelectionHasNulls( for(int i=0;i 1) { @@ -330,7 +330,7 @@ else if (inputVector.noNulls){ private void iterateRepeatingNoNulls( Aggregation myagg, - long value, + double value, int batchSize) { if (myagg.isNull) { @@ -366,7 +366,7 @@ private void iterateSelectionHasNulls( for (int j=0; j< batchSize; ++j) { int i = selected[j]; if (!isNull[i]) { - long value = vector[i]; + double value = vector[i]; if (myagg.isNull) { myagg.init (); } @@ -390,7 +390,7 @@ private void iterateSelectionNoNulls( myagg.init (); } - long value = vector[selected[0]]; + double value = vector[selected[0]]; myagg.sum += value; myagg.count += 1; if(myagg.count > 1) { @@ -417,7 +417,7 @@ private void iterateNoSelectionHasNulls( for(int i=0;i 1) { @@ -330,7 +330,7 @@ else if (inputVector.noNulls){ private void iterateRepeatingNoNulls( Aggregation myagg, - long value, + double value, int batchSize) { if (myagg.isNull) { @@ -366,7 +366,7 @@ private void iterateSelectionHasNulls( for (int j=0; j< batchSize; ++j) { int i = selected[j]; if (!isNull[i]) { - long value = vector[i]; + double value = vector[i]; if (myagg.isNull) { myagg.init (); } @@ -390,7 +390,7 @@ private void iterateSelectionNoNulls( myagg.init (); } - long value = vector[selected[0]]; + double value = vector[selected[0]]; myagg.sum += value; myagg.count += 1; if(myagg.count > 1) { @@ -417,7 +417,7 @@ private void iterateNoSelectionHasNulls( for(int i=0;i 1) { @@ -330,7 +330,7 @@ else if (inputVector.noNulls){ private void iterateRepeatingNoNulls( Aggregation myagg, - long value, + double value, int batchSize) { if (myagg.isNull) { @@ -366,7 +366,7 @@ private void iterateSelectionHasNulls( for (int j=0; j< batchSize; ++j) { int i = selected[j]; if (!isNull[i]) { - long value = vector[i]; + double value = vector[i]; if (myagg.isNull) { myagg.init (); } @@ -390,7 +390,7 @@ private void iterateSelectionNoNulls( myagg.init (); } - long value = vector[selected[0]]; + double value = vector[selected[0]]; myagg.sum += value; myagg.count += 1; if(myagg.count > 1) { @@ -417,7 +417,7 @@ private void iterateNoSelectionHasNulls( for(int i=0;i extends VectorAggregateExpression { /** class for storing the current aggregate value. */ static class Aggregation implements AggregationBuffer { - sum; + double sum; long count; boolean isNull; diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/templates/VectorUDAFVar.txt ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/templates/VectorUDAFVar.txt index 0f46d1a..aa2cfee 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/templates/VectorUDAFVar.txt +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/templates/VectorUDAFVar.txt @@ -165,7 +165,7 @@ public class extends VectorAggregateExpression { private void iterateRepeatingNoNullsWithAggregationSelection( VectorAggregationBufferRow[] aggregationBufferSets, int aggregateIndex, - value, + double value, int batchSize) { for (int i=0; i extends VectorAggregateExpression { j); int i = selected[j]; if (!isNull[i]) { - value = vector[i]; + double value = vector[i]; if (myagg.isNull) { myagg.init (); } @@ -226,7 +226,7 @@ public class extends VectorAggregateExpression { aggregationBufferSets, aggregateIndex, i); - value = vector[selected[i]]; + double value = vector[selected[i]]; if (myagg.isNull) { myagg.init (); } @@ -252,7 +252,7 @@ public class extends VectorAggregateExpression { aggregationBufferSets, aggregateIndex, i); - value = vector[i]; + double value = vector[i]; if (myagg.isNull) { myagg.init (); } @@ -280,7 +280,7 @@ public class extends VectorAggregateExpression { if (myagg.isNull) { myagg.init (); } - value = vector[i]; + double value = vector[i]; myagg.sum += value; myagg.count += 1; if(myagg.count > 1) { @@ -330,7 +330,7 @@ public class extends VectorAggregateExpression { private void iterateRepeatingNoNulls( Aggregation myagg, - value, + double value, int batchSize) { if (myagg.isNull) { @@ -366,7 +366,7 @@ public class extends VectorAggregateExpression { for (int j=0; j< batchSize; ++j) { int i = selected[j]; if (!isNull[i]) { - value = vector[i]; + double value = vector[i]; if (myagg.isNull) { myagg.init (); } @@ -390,7 +390,7 @@ public class extends VectorAggregateExpression { myagg.init (); } - value = vector[selected[0]]; + double value = vector[selected[0]]; myagg.sum += value; myagg.count += 1; if(myagg.count > 1) { @@ -417,7 +417,7 @@ public class extends VectorAggregateExpression { for(int i=0;i value = vector[i]; + double value = vector[i]; if (myagg.isNull) { myagg.init (); } @@ -440,7 +440,7 @@ public class extends VectorAggregateExpression { myagg.init (); } - value = vector[0]; + double value = vector[0]; myagg.sum += value; myagg.count += 1;