/**
 * 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.store.maprdb;

import com.google.common.base.Preconditions;
import com.google.common.collect.Lists;
import org.apache.drill.common.exceptions.ExecutionSetupException;
import org.apache.drill.exec.ops.FragmentContext;
import org.apache.drill.exec.physical.impl.BatchCreator;
import org.apache.drill.exec.physical.impl.ScanBatch;
import org.apache.drill.exec.record.RecordBatch;
import org.apache.drill.exec.store.RecordReader;
import org.apache.drill.exec.store.hbase.HBaseRecordReader;
import org.apache.drill.exec.store.hbase.HBaseSubScan;
import org.apache.hadoop.hbase.HBaseConfiguration;

import java.util.List;

public class MapRDBScanBatchCreator implements BatchCreator<MapRDBSubScan>{
  static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(MapRDBScanBatchCreator.class);

  @Override
  public RecordBatch getBatch(FragmentContext context, MapRDBSubScan subScan, List<RecordBatch> children) throws ExecutionSetupException {
    Preconditions.checkArgument(children.isEmpty());
    List<RecordReader> readers = Lists.newArrayList();
    for(HBaseSubScan.HBaseSubScanSpec scanSpec : subScan.getRegionScanSpecList()){
      try {
        readers.add(
            new HBaseRecordReader(HBaseConfiguration.create(), scanSpec, subScan.getColumns(), context)
        );
      } catch (Exception e1) {
        throw new ExecutionSetupException(e1);
      }
    }
    return new ScanBatch(subScan, context, readers.iterator());
  }

}

@@ -852,85 +852,24 @@
 ort 
-com.google.common.base.Preconditions;%0Aimport com.google.common.collect
+java.util
 .List
-s
 ;
+%0A
 %0Aimp
@@ -1365,30 +1365,92 @@
 %0Aimport 
-java.util
+com.google.common.base.Preconditions;%0Aimport com.google.common.collect
 .List
+s
 ;%0A%0Apubli
@@ -1648,22 +1648,20 @@
  public 
-Record
+Scan
 Batch ge

Simplify and centralize Operator cleanup