DRILL-7193: Integration changes of the Distributed RM queue configuration with Simple Parallelizer.

Refactor existing ZK based queue to accommodate new Distributed queue for RM.
Refactor and rename the existing memory allocation utilities to ZKQueueMemoryAllocationUtilities and DefaultMemoryAllocationUtilities.
Parallelizer code is changed to accommodate the memory adjustment for the operators during parallelization phase.
With this change, there are 3 different implementation of SimpleParallelizer; they are ZKQueueParallelizer, DistributedQueueParallelizer and DefaultParallelizer which will be used by ZK based RM, Distributed RM and Non RM configuration.

Author: HanumathRao

…r/fragment/DefaultQueryParallelizer.java …lanner/fragment/DefaultParallelizer.javaexec/java-exec/src/main/java/org/apache/drill/exec/planner/fragment/DefaultQueryParallelizer.java renamed to exec/java-exec/src/main/java/org/apache/drill/exec/planner/fragment/DefaultParallelizer.java exec/java-exec/src/main/java/org/apache/drill/exec/planner/fragment/DefaultQueryParallelizer.java renamed to exec/java-exec/src/main/java/org/apache/drill/exec/planner/fragment/DefaultParallelizer.java

@@ -20,7 +20,7 @@
 import org.apache.drill.exec.ops.QueryContext;
 import org.apache.drill.exec.physical.base.PhysicalOperator;
 import org.apache.drill.exec.proto.CoordinationProtos.DrillbitEndpoint;
-import org.apache.drill.exec.util.MemoryAllocationUtilities;
+import org.apache.drill.exec.util.memory.DefaultMemoryAllocationUtilities;
 
 import java.util.Collection;
 import java.util.List;
@@ -32,18 +32,18 @@
  * The memory computation of the operators is based on the earlier logic to assign memory for the buffered
  * operators.
  */
-public class DefaultQueryParallelizer extends SimpleParallelizer {
+public class DefaultParallelizer extends SimpleParallelizer {
   private final boolean planHasMemory;
   private final QueryContext queryContext;
 
-  public DefaultQueryParallelizer(boolean memoryAvailableInPlan, QueryContext queryContext) {
+  public DefaultParallelizer(boolean memoryAvailableInPlan, QueryContext queryContext) {
     super(queryContext);
     this.planHasMemory = memoryAvailableInPlan;
     this.queryContext = queryContext;
   }
 
-  public DefaultQueryParallelizer(boolean memoryPlanning, long parallelizationThreshold, int maxWidthPerNode,
-                                  int maxGlobalWidth, double affinityFactor) {
+  public DefaultParallelizer(boolean memoryPlanning, long parallelizationThreshold, int maxWidthPerNode,
+                             int maxGlobalWidth, double affinityFactor) {
     super(parallelizationThreshold, maxWidthPerNode, maxGlobalWidth, affinityFactor);
     this.planHasMemory = memoryPlanning;
     this.queryContext = null;
@@ -56,7 +56,7 @@ public void adjustMemory(PlanningSet planningSet, Set<Wrapper> roots,
       return;
     }
     List<PhysicalOperator> bufferedOpers = planningSet.getRootWrapper().getNode().getBufferedOperators(queryContext);
-    MemoryAllocationUtilities.setupBufferedOpsMemoryAllocations(planHasMemory, bufferedOpers, queryContext);
+    DefaultMemoryAllocationUtilities.setupBufferedOpsMemoryAllocations(planHasMemory, bufferedOpers, queryContext);
   }
 
   @Override

…ner/fragment/QueueQueryParallelizer.java …agment/DistributedQueueParallelizer.javaexec/java-exec/src/main/java/org/apache/drill/exec/planner/fragment/QueueQueryParallelizer.java renamed to exec/java-exec/src/main/java/org/apache/drill/exec/planner/fragment/DistributedQueueParallelizer.java exec/java-exec/src/main/java/org/apache/drill/exec/planner/fragment/QueueQueryParallelizer.java renamed to exec/java-exec/src/main/java/org/apache/drill/exec/planner/fragment/DistributedQueueParallelizer.java

@@ -40,12 +40,12 @@
  * cluster state. However, the memory assignment for each operator, minor fragment and major
  * fragment is based on the cluster state and provided queue configuration.
  */
-public class QueueQueryParallelizer extends SimpleParallelizer {
+public class DistributedQueueParallelizer extends SimpleParallelizer {
   private final boolean planHasMemory;
   private final QueryContext queryContext;
   private final Map<DrillbitEndpoint, Map<PhysicalOperator, Long>> operators;
 
-  public QueueQueryParallelizer(boolean memoryPlanning, QueryContext queryContext) {
+  public DistributedQueueParallelizer(boolean memoryPlanning, QueryContext queryContext) {
     super(queryContext);
     this.planHasMemory = memoryPlanning;
     this.queryContext = queryContext;

exec/java-exec/src/main/java/org/apache/drill/exec/planner/fragment/Fragment.java

@@ -25,6 +25,7 @@
 import org.apache.drill.exec.physical.base.AbstractPhysicalVisitor;
 import org.apache.drill.exec.physical.base.Exchange;
 import org.apache.drill.exec.physical.base.PhysicalOperator;
+import org.apache.drill.exec.util.memory.ZKQueueMemoryAllocationUtilities;
 import org.apache.drill.exec.work.foreman.ForemanSetupException;
 
 import org.apache.drill.shaded.guava.com.google.common.collect.Lists;

exec/java-exec/src/main/java/org/apache/drill/exec/planner/fragment/ZKQueueParallelizer.java

@@ -0,0 +1,121 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.drill.exec.planner.fragment;
+
+import org.apache.drill.common.util.function.CheckedConsumer;
+import org.apache.drill.exec.ops.QueryContext;
+import org.apache.drill.exec.physical.PhysicalOperatorSetupException;
+import org.apache.drill.exec.physical.base.Exchange;
+import org.apache.drill.exec.physical.base.PhysicalOperator;
+import org.apache.drill.exec.planner.AbstractOpWrapperVisitor;
+import org.apache.drill.exec.proto.CoordinationProtos.DrillbitEndpoint;
+import org.apache.drill.exec.util.memory.ZKQueueMemoryAllocationUtilities;
+import org.apache.drill.exec.work.foreman.rm.QueryResourceManager;
+import org.apache.drill.shaded.guava.com.google.common.collect.ArrayListMultimap;
+import org.apache.drill.shaded.guava.com.google.common.collect.Multimap;
+import java.util.Collection;
+import java.util.Map;
+import java.util.HashMap;
+import java.util.Set;
+import java.util.function.BiFunction;
+
+public class ZKQueueParallelizer extends SimpleParallelizer {
+
+  private final boolean planHasMemory;
+  private final QueryContext queryContext;
+  private Map<String, Collection<PhysicalOperator>> endpointMap;
+  private final QueryResourceManager resourceManager;
+
+  public ZKQueueParallelizer(boolean memoryAvailableInPlan, QueryResourceManager rm, QueryContext queryContext) {
+    super(queryContext);
+    this.planHasMemory = memoryAvailableInPlan;
+    this.queryContext = queryContext;
+    this.resourceManager = rm;
+  }
+
+  @Override
+  public void adjustMemory(PlanningSet planningSet, Set<Wrapper> roots,
+                           Collection<DrillbitEndpoint> activeEndpoints) throws PhysicalOperatorSetupException {
+    if (planHasMemory) {
+      return;
+    }
+
+    Collector collector = new Collector();
+
+    for (Wrapper wrapper : roots) {
+      traverse(wrapper, CheckedConsumer.throwingConsumerWrapper((Wrapper fragment) -> {
+        fragment.getNode().getRoot().accept(collector, fragment);
+      }));
+    }
+
+    endpointMap = collector.getNodeMap();
+
+    ZKQueueMemoryAllocationUtilities.planMemory(queryContext, this.resourceManager, endpointMap);
+  }
+
+
+  public class Collector extends AbstractOpWrapperVisitor<Void, RuntimeException> {
+    private final Multimap<DrillbitEndpoint, PhysicalOperator> bufferedOperators;
+
+    public Collector() {
+      this.bufferedOperators = ArrayListMultimap.create();
+    }
+
+    private void getMinorFragCountPerDrillbit(Wrapper currFragment, PhysicalOperator operator) {
+      for (DrillbitEndpoint endpoint : currFragment.getAssignedEndpoints()) {
+        bufferedOperators.put(endpoint, operator);
+      }
+    }
+
+    @Override
+    public Void visitSendingExchange(Exchange exchange, Wrapper fragment) throws RuntimeException {
+      return visitOp(exchange, fragment);
+    }
+
+    @Override
+    public Void visitReceivingExchange(Exchange exchange, Wrapper fragment) throws RuntimeException {
+      return null;
+    }
+
+    @Override
+    public Void visitOp(PhysicalOperator op, Wrapper fragment) {
+      if (op.isBufferedOperator(queryContext)) {
+        getMinorFragCountPerDrillbit(fragment, op);
+      }
+      for (PhysicalOperator child : op) {
+        child.accept(this, fragment);
+      }
+      return null;
+    }
+
+    public Map<String, Collection<PhysicalOperator>> getNodeMap() {
+      Map<DrillbitEndpoint, Collection<PhysicalOperator>> endpointCollectionMap = bufferedOperators.asMap();
+      Map<String, Collection<PhysicalOperator>> nodeMap = new HashMap<>();
+      for (Map.Entry<DrillbitEndpoint, Collection<PhysicalOperator>> entry : endpointCollectionMap.entrySet()) {
+        nodeMap.put(entry.getKey().getAddress(), entry.getValue());
+      }
+
+      return nodeMap;
+    }
+  }
+
+  @Override
+  protected BiFunction<DrillbitEndpoint, PhysicalOperator, Long> getMemory() {
+    return (endpoint, operator) -> operator.getMaxAllocation();
+  }
+}

exec/java-exec/src/main/java/org/apache/drill/exec/planner/fragment/contrib/SplittingParallelizer.java

@@ -29,7 +29,7 @@
 import org.apache.drill.exec.physical.base.FragmentRoot;
 import org.apache.drill.exec.physical.base.PhysicalOperator;
 import org.apache.drill.exec.planner.PhysicalPlanReader;
-import org.apache.drill.exec.planner.fragment.DefaultQueryParallelizer;
+import org.apache.drill.exec.planner.fragment.DefaultParallelizer;
 import org.apache.drill.exec.planner.fragment.Fragment;
 import org.apache.drill.exec.planner.fragment.PlanningSet;
 import org.apache.drill.exec.planner.fragment.Wrapper;
@@ -57,7 +57,7 @@
  * allows not to pollute parent class with non-authentic functionality
  *
  */
-public class SplittingParallelizer extends DefaultQueryParallelizer {
+public class SplittingParallelizer extends DefaultParallelizer {
 
   static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(SplittingParallelizer.class);
 

…exec/util/MemoryAllocationUtilities.java …ry/DefaultMemoryAllocationUtilities.javaexec/java-exec/src/main/java/org/apache/drill/exec/util/MemoryAllocationUtilities.java renamed to exec/java-exec/src/main/java/org/apache/drill/exec/util/memory/DefaultMemoryAllocationUtilities.java exec/java-exec/src/main/java/org/apache/drill/exec/util/MemoryAllocationUtilities.java renamed to exec/java-exec/src/main/java/org/apache/drill/exec/util/memory/DefaultMemoryAllocationUtilities.java

@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.drill.exec.util;
+package org.apache.drill.exec.util.memory;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -31,9 +31,9 @@
 
 import org.apache.drill.shaded.guava.com.google.common.annotations.VisibleForTesting;
 
-public class MemoryAllocationUtilities {
+public class DefaultMemoryAllocationUtilities {
 
-  private static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(MemoryAllocationUtilities.class);
+  private static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(DefaultMemoryAllocationUtilities.class);
 
 
   public static void setupBufferedMemoryAllocations(PhysicalPlan plan, final QueryContext queryContext) {