Repository: incubator-drill Updated Branches: refs/heads/master f948d710e -> 92408f193
Fix serialization of IntervalYear in ExpressionStringBuilder Increase average bytes allocated for key vectors in HashAggBatch Project: http://git-wip-us.apache.org/repos/asf/incubator-drill/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-drill/commit/85703655 Tree: http://git-wip-us.apache.org/repos/asf/incubator-drill/tree/85703655 Diff: http://git-wip-us.apache.org/repos/asf/incubator-drill/diff/85703655 Branch: refs/heads/master Commit: 85703655866aa7cf30a978ce2b181a38d7b9f602 Parents: f948d71 Author: Mehant Baid <meha...@gmail.com> Authored: Thu May 22 16:55:04 2014 -0700 Committer: Mehant Baid <meha...@gmail.com> Committed: Thu May 22 22:39:51 2014 -0700 ---------------------------------------------------------------------- .../apache/drill/common/expression/ExpressionStringBuilder.java | 2 +- .../apache/drill/exec/physical/impl/aggregate/HashAggBatch.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/85703655/common/src/main/java/org/apache/drill/common/expression/ExpressionStringBuilder.java ---------------------------------------------------------------------- diff --git a/common/src/main/java/org/apache/drill/common/expression/ExpressionStringBuilder.java b/common/src/main/java/org/apache/drill/common/expression/ExpressionStringBuilder.java index 9301528..8026cdb 100644 --- a/common/src/main/java/org/apache/drill/common/expression/ExpressionStringBuilder.java +++ b/common/src/main/java/org/apache/drill/common/expression/ExpressionStringBuilder.java @@ -162,7 +162,7 @@ public class ExpressionStringBuilder extends AbstractExprVisitor<Void, StringBui @Override public Void visitIntervalYearConstant(IntervalYearExpression lExpr, StringBuilder sb) throws RuntimeException { sb.append("cast( '"); - sb.append(Period.years(lExpr.getIntervalYear()).toString()); + sb.append(Period.months(lExpr.getIntervalYear()).toString()); sb.append("' as INTERVALYEAR)"); return null; } http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/85703655/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/aggregate/HashAggBatch.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/aggregate/HashAggBatch.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/aggregate/HashAggBatch.java index aa6cd54..8b39330 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/aggregate/HashAggBatch.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/aggregate/HashAggBatch.java @@ -199,7 +199,7 @@ public class HashAggBatch extends AbstractRecordBatch<HashAggregate> { final MaterializedField outputField = MaterializedField.create(ne.getRef(), expr.getMajorType()); ValueVector vv = TypeHelper.getNewVector(outputField, oContext.getAllocator()); - keyAllocators.add(VectorAllocator.getAllocator(vv, 50)); + keyAllocators.add(VectorAllocator.getAllocator(vv, 200)); // add this group-by vector to the output container groupByOutFieldIds[i] = container.add(vv); @@ -215,7 +215,7 @@ public class HashAggBatch extends AbstractRecordBatch<HashAggregate> { final MaterializedField outputField = MaterializedField.create(ne.getRef(), expr.getMajorType()); ValueVector vv = TypeHelper.getNewVector(outputField, oContext.getAllocator()); - valueAllocators.add(VectorAllocator.getAllocator(vv, 50)); + valueAllocators.add(VectorAllocator.getAllocator(vv, 200)); aggrOutFieldIds[i] = container.add(vv); aggrExprs[i] = new ValueVectorWriteExpression(aggrOutFieldIds[i], expr, true);
