DRILL-5730: Mock testing improvements and interface improvements

closes #1045

2 files changed, 5 insertions, 10 deletions

diff --git a/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/mapr/db/MapRDBScanBatchCreator.java b/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/mapr/db/MapRDBScanBatchCreator.java
index e770c96a2..d9c8ce772 100644
--- a/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/mapr/db/MapRDBScanBatchCreator.java
+++ b/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/mapr/db/MapRDBScanBatchCreator.java
@@ -20,7 +20,7 @@ package org.apache.drill.exec.store.mapr.db;
 import java.util.List;
 
 import org.apache.drill.common.exceptions.ExecutionSetupException;
-import org.apache.drill.exec.ops.FragmentContext;
+import org.apache.drill.exec.ops.ExecutorFragmentContext;
 import org.apache.drill.exec.physical.impl.BatchCreator;
 import org.apache.drill.exec.physical.impl.ScanBatch;
 import org.apache.drill.exec.record.RecordBatch;
@@ -33,11 +33,9 @@ import org.apache.drill.exec.store.mapr.db.json.MaprDBJsonRecordReader;
 import com.google.common.base.Preconditions;
 import com.google.common.collect.Lists;
 
-public class MapRDBScanBatchCreator implements BatchCreator<MapRDBSubScan>{
-  private static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(MapRDBScanBatchCreator.class);
-
+public class MapRDBScanBatchCreator implements BatchCreator<MapRDBSubScan> {
   @Override
-  public ScanBatch getBatch(FragmentContext context, MapRDBSubScan subScan, List<RecordBatch> children) throws ExecutionSetupException {
+  public ScanBatch getBatch(ExecutorFragmentContext context, MapRDBSubScan subScan, List<RecordBatch> children) throws ExecutionSetupException {
     Preconditions.checkArgument(children.isEmpty());
     List<RecordReader> readers = Lists.newArrayList();
     for(MapRDBSubScanSpec scanSpec : subScan.getRegionScanSpecList()){
@@ -46,8 +44,7 @@ public class MapRDBScanBatchCreator implements BatchCreator<MapRDBSubScan>{
           readers.add(new HBaseRecordReader(
               subScan.getFormatPlugin().getConnection(),
               getHBaseSubScanSpec(scanSpec),
-              subScan.getColumns(),
-              context));
+              subScan.getColumns()));
         } else {
           readers.add(new MaprDBJsonRecordReader(scanSpec, subScan.getFormatPluginConfig(), subScan.getColumns(), context));
         }
diff --git a/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/mapr/db/json/MaprDBJsonRecordReader.java b/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/mapr/db/json/MaprDBJsonRecordReader.java
index 132754166..9f93e18b3 100644
--- a/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/mapr/db/json/MaprDBJsonRecordReader.java
+++ b/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/mapr/db/json/MaprDBJsonRecordReader.java
@@ -72,7 +72,6 @@ import io.netty.buffer.DrillBuf;
 public class MaprDBJsonRecordReader extends AbstractRecordReader {
   private static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(MaprDBJsonRecordReader.class);
 
-  public static final SchemaPath ID_PATH = SchemaPath.getSimplePath(ID_KEY);
   private final long MILLISECONDS_IN_A_DAY  = (long)1000 * 60 * 60 * 24;
 
   private Table table;
@@ -117,7 +116,7 @@ public class MaprDBJsonRecordReader extends AbstractRecordReader {
 
     disableCountOptimization = formatPluginConfig.disableCountOptimization();
     setColumns(projectedColumns);
-    unionEnabled = context.getOptions().getOption(ExecConstants.ENABLE_UNION_TYPE);
+    unionEnabled = context.getOptions().getBoolean(ExecConstants.ENABLE_UNION_TYPE_KEY);
     readNumbersAsDouble = formatPluginConfig.isReadAllNumbersAsDouble();
     allTextMode = formatPluginConfig.isAllTextMode();
     ignoreSchemaChange = formatPluginConfig.isIgnoreSchemaChange();
@@ -518,5 +517,4 @@ public class MaprDBJsonRecordReader extends AbstractRecordReader {
       table.close();
     }
   }
-
 }