add additional logging messages.
Project: http://git-wip-us.apache.org/repos/asf/incubator-drill/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-drill/commit/4cc4b21e Tree: http://git-wip-us.apache.org/repos/asf/incubator-drill/tree/4cc4b21e Diff: http://git-wip-us.apache.org/repos/asf/incubator-drill/diff/4cc4b21e Branch: refs/heads/master Commit: 4cc4b21ed4e731bfa9c8fab992ba63be5d98ec09 Parents: f39acf6 Author: Jacques Nadeau <[email protected]> Authored: Sat Jun 7 18:30:24 2014 -0700 Committer: Jacques Nadeau <[email protected]> Committed: Sat Jun 7 18:30:24 2014 -0700 ---------------------------------------------------------------------- .../physical/impl/aggregate/StreamingAggTemplate.java | 1 + .../drill/exec/vector/allocator/FixedVectorAllocator.java | 8 ++++---- .../exec/vector/allocator/RepeatedVectorAllocator.java | 7 +++++++ .../exec/vector/allocator/VariableEstimatedVector.java | 10 ++++++++-- .../exec/vector/allocator/VariableVectorAllocator.java | 9 ++++++++- 5 files changed, 28 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/4cc4b21e/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/aggregate/StreamingAggTemplate.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/aggregate/StreamingAggTemplate.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/aggregate/StreamingAggTemplate.java index b14c273..d966299 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/aggregate/StreamingAggTemplate.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/aggregate/StreamingAggTemplate.java @@ -66,6 +66,7 @@ public abstract class StreamingAggTemplate implements StreamingAggregator { for (VectorAllocator a : allocators) { if(EXTRA_DEBUG) logger.debug("Allocating {} with {} records.", a, 20000); a.alloc(20000); + if(EXTRA_DEBUG) logger.debug("Allocated {}", a); } } http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/4cc4b21e/exec/java-exec/src/main/java/org/apache/drill/exec/vector/allocator/FixedVectorAllocator.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/vector/allocator/FixedVectorAllocator.java b/exec/java-exec/src/main/java/org/apache/drill/exec/vector/allocator/FixedVectorAllocator.java index 501012f..7b1351d 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/vector/allocator/FixedVectorAllocator.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/vector/allocator/FixedVectorAllocator.java @@ -21,7 +21,7 @@ import org.apache.drill.exec.vector.FixedWidthVector; public class FixedVectorAllocator extends VectorAllocator{ FixedWidthVector out; - + public FixedVectorAllocator(FixedWidthVector out) { super(); this.out = out; @@ -33,8 +33,8 @@ public class FixedVectorAllocator extends VectorAllocator{ @Override public String toString() { - return "FixedVectorAllocator [out=" + out + "]"; + return "FixedVectorAllocator [out=" + out + ", valueCapacity" + out.getValueCapacity() + "]"; } - - + + } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/4cc4b21e/exec/java-exec/src/main/java/org/apache/drill/exec/vector/allocator/RepeatedVectorAllocator.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/vector/allocator/RepeatedVectorAllocator.java b/exec/java-exec/src/main/java/org/apache/drill/exec/vector/allocator/RepeatedVectorAllocator.java index d9be306..95c1d4c 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/vector/allocator/RepeatedVectorAllocator.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/vector/allocator/RepeatedVectorAllocator.java @@ -33,4 +33,11 @@ class RepeatedVectorAllocator extends VectorAllocator{ public void alloc(int recordCount){ out.allocateNew(in.getByteCapacity(), in.getAccessor().getValueCount(), in.getAccessor().getValueCount()); } + + @Override + public String toString() { + return "RepeatedVectorAllocator [out=" + out + ", valueCapacity" + out.getValueCapacity() + ", bytesCapacity" + out.getByteCapacity() + "]"; + } + + } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/4cc4b21e/exec/java-exec/src/main/java/org/apache/drill/exec/vector/allocator/VariableEstimatedVector.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/vector/allocator/VariableEstimatedVector.java b/exec/java-exec/src/main/java/org/apache/drill/exec/vector/allocator/VariableEstimatedVector.java index 51c2a73..b861582 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/vector/allocator/VariableEstimatedVector.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/vector/allocator/VariableEstimatedVector.java @@ -22,14 +22,20 @@ import org.apache.drill.exec.vector.VariableWidthVector; public class VariableEstimatedVector extends VectorAllocator{ VariableWidthVector out; int avgWidth; - + public VariableEstimatedVector(VariableWidthVector out, int avgWidth) { super(); this.out = out; this.avgWidth = avgWidth; } - + public void alloc(int recordCount){ out.allocateNew(avgWidth * recordCount, recordCount); } + + @Override + public String toString() { + return "VariableEstimatedVector [out=" + out + ", valueCapacity" + out.getValueCapacity() + ", bytesCapacity" + out.getByteCapacity() + "]"; + } + } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/4cc4b21e/exec/java-exec/src/main/java/org/apache/drill/exec/vector/allocator/VariableVectorAllocator.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/vector/allocator/VariableVectorAllocator.java b/exec/java-exec/src/main/java/org/apache/drill/exec/vector/allocator/VariableVectorAllocator.java index ae5d4de..47286ae 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/vector/allocator/VariableVectorAllocator.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/vector/allocator/VariableVectorAllocator.java @@ -22,7 +22,7 @@ import org.apache.drill.exec.vector.VariableWidthVector; class VariableVectorAllocator extends VectorAllocator{ VariableWidthVector in; VariableWidthVector out; - + public VariableVectorAllocator(VariableWidthVector in, VariableWidthVector out) { super(); this.in = in; @@ -32,4 +32,11 @@ class VariableVectorAllocator extends VectorAllocator{ public void alloc(int recordCount){ out.allocateNew(in.getByteCapacity(), recordCount); } + + @Override + public String toString() { + return "VariableVectorAllocator [out=" + out + ", valueCapacity" + out.getValueCapacity() + ", bytesCapacity" + out.getByteCapacity() + "]"; + } + + } \ No newline at end of file
