From b124dbf2f5b6db6ef48fd029f89abdbdb19d9eae Mon Sep 17 00:00:00 2001 From: Martin Traverso Date: Tue, 21 Aug 2012 17:47:01 -0700 Subject: [PATCH 1/3] rename variable for clarity --- src/main/java/com/facebook/presto/HashAggregation.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/facebook/presto/HashAggregation.java b/src/main/java/com/facebook/presto/HashAggregation.java index 1c4aa189af551..9e45abd9636ad 100644 --- a/src/main/java/com/facebook/presto/HashAggregation.java +++ b/src/main/java/com/facebook/presto/HashAggregation.java @@ -23,7 +23,8 @@ public class HashAggregation private long position; private final TupleInfo tupleInfo; - public HashAggregation(TupleInfo tupleInfo, Iterator keySource, + public HashAggregation(TupleInfo outputTupleInfo, + Iterator keySource, SeekableIterator valueSource, Provider functionProvider) { @@ -31,7 +32,7 @@ public HashAggregation(TupleInfo tupleInfo, Iterator keyS this.aggregationSource = valueSource; this.functionProvider = functionProvider; - this.tupleInfo = tupleInfo; + this.tupleInfo = outputTupleInfo; } @Override From dc96c8e460e8c83f1c673c2f5ac4c30978026656 Mon Sep 17 00:00:00 2001 From: Martin Traverso Date: Tue, 21 Aug 2012 17:47:22 -0700 Subject: [PATCH 2/3] use tuple builder --- src/main/java/com/facebook/presto/SumAggregation.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/facebook/presto/SumAggregation.java b/src/main/java/com/facebook/presto/SumAggregation.java index 16f37533488d1..1de5ff602e8f7 100644 --- a/src/main/java/com/facebook/presto/SumAggregation.java +++ b/src/main/java/com/facebook/presto/SumAggregation.java @@ -1,7 +1,5 @@ package com.facebook.presto; -import static com.facebook.presto.SizeOf.SIZE_OF_LONG; - public class SumAggregation implements AggregationFunction { @@ -26,8 +24,8 @@ public void add(ValueBlock values, PositionBlock relevantPositions) @Override public Tuple evaluate() { - Slice slice = Slices.allocate(SIZE_OF_LONG); - slice.setLong(0, sum); - return new Tuple(slice, getTupleInfo()); + return getTupleInfo().builder() + .append(sum) + .build(); } } From 59fc8f2f7765c5f5b9ec02155b681a3805931a2d Mon Sep 17 00:00:00 2001 From: Martin Traverso Date: Tue, 21 Aug 2012 17:47:53 -0700 Subject: [PATCH 3/3] rename TestSumAggregation -> TestAggregations --- .../{TestSumAggregation.java => TestAggregations.java} | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) rename src/test/java/com/facebook/presto/{TestSumAggregation.java => TestAggregations.java} (96%) diff --git a/src/test/java/com/facebook/presto/TestSumAggregation.java b/src/test/java/com/facebook/presto/TestAggregations.java similarity index 96% rename from src/test/java/com/facebook/presto/TestSumAggregation.java rename to src/test/java/com/facebook/presto/TestAggregations.java index 1ef993744d18b..9af3027aec9c2 100644 --- a/src/test/java/com/facebook/presto/TestSumAggregation.java +++ b/src/test/java/com/facebook/presto/TestAggregations.java @@ -1,6 +1,5 @@ package com.facebook.presto; -import com.google.common.base.Charsets; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.PeekingIterator; @@ -14,13 +13,11 @@ import java.util.List; import java.util.Map; -import static com.facebook.presto.SizeOf.SIZE_OF_LONG; -import static com.facebook.presto.SizeOf.SIZE_OF_SHORT; import static com.facebook.presto.TupleInfo.Type.FIXED_INT_64; import static com.facebook.presto.TupleInfo.Type.VARIABLE_BINARY; import static com.google.common.base.Charsets.UTF_8; -public class TestSumAggregation +public class TestAggregations { @Test public void testPipelinedAggregation()