1 files changed, 12 insertions, 1 deletions
diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/work/foreman/rm/DefaultResourceManager.java b/exec/java-exec/src/main/java/org/apache/drill/exec/work/foreman/rm/DefaultResourceManager.java
index 77957d5a3..7c3cc04d5 100644
--- a/exec/java-exec/src/main/java/org/apache/drill/exec/work/foreman/rm/DefaultResourceManager.java
+++ b/exec/java-exec/src/main/java/org/apache/drill/exec/work/foreman/rm/DefaultResourceManager.java
@@ -20,6 +20,8 @@ package org.apache.drill.exec.work.foreman.rm;
 import org.apache.drill.common.config.DrillConfig;
 import org.apache.drill.exec.ops.QueryContext;
 import org.apache.drill.exec.physical.PhysicalPlan;
+import org.apache.drill.exec.planner.fragment.QueryParallelizer;
+import org.apache.drill.exec.planner.fragment.DefaultQueryParallelizer;
 import org.apache.drill.exec.util.MemoryAllocationUtilities;
 import org.apache.drill.exec.work.QueryWorkUnit;
 import org.apache.drill.exec.work.foreman.Foreman;
@@ -46,12 +48,16 @@ public class DefaultResourceManager implements ResourceManager {
       if (plan == null || plan.getProperties().hasResourcePlan) {
         return;
       }
-      MemoryAllocationUtilities.setupBufferedOpsMemoryAllocations(plan, queryContext);
+      MemoryAllocationUtilities.setupBufferedMemoryAllocations(plan, queryContext);
     }
 
     @Override
     public void visitPhysicalPlan(QueryWorkUnit work) {
     }
+
+    public QueryContext getQueryContext() {
+      return queryContext;
+    }
   }
 
   public static class DefaultQueryResourceManager extends DefaultResourceAllocator implements QueryResourceManager {
@@ -70,6 +76,11 @@ public class DefaultResourceManager implements ResourceManager {
     }
 
     @Override
+    public QueryParallelizer getParallelizer(boolean memoryPlanning){
+      return new DefaultQueryParallelizer(memoryPlanning, this.getQueryContext());
+    }
+
+    @Override
     public void admit() {
       // No queueing by default
     }