DRILL-5730: Mock testing improvements and interface improvements

closes #1045

2 files changed, 4 insertions, 12 deletions

diff --git a/contrib/storage-jdbc/src/main/java/org/apache/drill/exec/store/jdbc/JdbcBatchCreator.java b/contrib/storage-jdbc/src/main/java/org/apache/drill/exec/store/jdbc/JdbcBatchCreator.java
index 1782e1ad0..d37bfad6e 100755
--- a/contrib/storage-jdbc/src/main/java/org/apache/drill/exec/store/jdbc/JdbcBatchCreator.java
+++ b/contrib/storage-jdbc/src/main/java/org/apache/drill/exec/store/jdbc/JdbcBatchCreator.java
@@ -21,10 +21,9 @@ import java.util.Collections;
 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.CloseableRecordBatch;
 import org.apache.drill.exec.record.RecordBatch;
 import org.apache.drill.exec.store.RecordReader;
 
@@ -32,11 +31,11 @@ import com.google.common.base.Preconditions;
 
 public class JdbcBatchCreator implements BatchCreator<JdbcSubScan> {
   @Override
-  public ScanBatch getBatch(FragmentContext context, JdbcSubScan config,
+  public ScanBatch getBatch(ExecutorFragmentContext context, JdbcSubScan config,
       List<RecordBatch> children) throws ExecutionSetupException {
     Preconditions.checkArgument(children.isEmpty());
     JdbcStoragePlugin plugin = config.getPlugin();
-    RecordReader reader = new JdbcRecordReader(context, plugin.getSource(), config.getSql(), plugin.getName());
+    RecordReader reader = new JdbcRecordReader(plugin.getSource(), config.getSql(), plugin.getName());
     return new ScanBatch(config, context, Collections.singletonList(reader));
   }
 }
diff --git a/contrib/storage-jdbc/src/main/java/org/apache/drill/exec/store/jdbc/JdbcRecordReader.java b/contrib/storage-jdbc/src/main/java/org/apache/drill/exec/store/jdbc/JdbcRecordReader.java
index 531f343b4..364b8a817 100755
--- a/contrib/storage-jdbc/src/main/java/org/apache/drill/exec/store/jdbc/JdbcRecordReader.java
+++ b/contrib/storage-jdbc/src/main/java/org/apache/drill/exec/store/jdbc/JdbcRecordReader.java
@@ -40,7 +40,6 @@ import org.apache.drill.common.types.TypeProtos.MinorType;
 import org.apache.drill.common.types.Types;
 import org.apache.drill.exec.exception.SchemaChangeException;
 import org.apache.drill.exec.expr.TypeHelper;
-import org.apache.drill.exec.ops.FragmentContext;
 import org.apache.drill.exec.ops.OperatorContext;
 import org.apache.drill.exec.physical.impl.OutputMutator;
 import org.apache.drill.exec.record.MaterializedField;
@@ -70,17 +69,13 @@ class JdbcRecordReader extends AbstractRecordReader {
   private final DataSource source;
   private ResultSet resultSet;
   private final String storagePluginName;
-  private FragmentContext fragmentContext;
   private Connection connection;
   private Statement statement;
   private final String sql;
   private ImmutableList<ValueVector> vectors;
   private ImmutableList<Copier<?>> copiers;
 
-  private OperatorContext operatorContext;
-
-  public JdbcRecordReader(FragmentContext fragmentContext, DataSource source, String sql, String storagePluginName) {
-    this.fragmentContext = fragmentContext;
+  public JdbcRecordReader(DataSource source, String sql, String storagePluginName) {
     this.source = source;
     this.sql = sql;
     this.storagePluginName = storagePluginName;
@@ -170,8 +165,6 @@ class JdbcRecordReader extends AbstractRecordReader {
   @Override
   public void setup(OperatorContext operatorContext, OutputMutator output) throws ExecutionSetupException {
     try {
-
-      this.operatorContext = operatorContext;
       connection = source.getConnection();
       statement = connection.createStatement();
       resultSet = statement.executeQuery(sql);