aboutsummaryrefslogtreecommitdiff
path: root/exec/java-exec/src/main/java/org/apache/drill/exec/work/fragment
diff options
context:
space:
mode:
authorJacques Nadeau <jacques@apache.org>2015-04-28 08:53:12 -0700
committerJacques Nadeau <jacques@apache.org>2015-05-02 19:33:54 -0700
commit0dd0e833714120c77e3e7ef34de654f5246953b9 (patch)
tree09ab9d5e0df4efd02a8d8280a979b299f10a4734 /exec/java-exec/src/main/java/org/apache/drill/exec/work/fragment
parent88bb05194b023467d590ac747ec5fa14d04249f5 (diff)
DRILL-2940, DRILL-2847: Improve Memory Characteristics
- Update Large Buffer allocation so Drill releases immediately rather than waiting for Garbage Collection - Remove DrillBuf.wrap() and all references to it. - Update Parquet Reader to reduce object churn and indirection. - Add additional metric to memory iterator - Add Large and small buffer metric historgram tracking - Add memory tracking reporter - Update Netty to 4.0.27
Diffstat (limited to 'exec/java-exec/src/main/java/org/apache/drill/exec/work/fragment')
-rw-r--r--exec/java-exec/src/main/java/org/apache/drill/exec/work/fragment/FragmentExecutor.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/work/fragment/FragmentExecutor.java b/exec/java-exec/src/main/java/org/apache/drill/exec/work/fragment/FragmentExecutor.java
index fb2045f62..ddb828c0f 100644
--- a/exec/java-exec/src/main/java/org/apache/drill/exec/work/fragment/FragmentExecutor.java
+++ b/exec/java-exec/src/main/java/org/apache/drill/exec/work/fragment/FragmentExecutor.java
@@ -274,7 +274,9 @@ public class FragmentExecutor implements Runnable {
// first close the operators and release all memory.
try {
- root.close();
+ if (root != null) {
+ root.close();
+ }
} catch (final Exception e) {
fail(e);
}