MD-524: Drill API change broke the MapRDB Plugin
Project: http://git-wip-us.apache.org/repos/asf/drill/repo Commit: http://git-wip-us.apache.org/repos/asf/drill/commit/2a45749a Tree: http://git-wip-us.apache.org/repos/asf/drill/tree/2a45749a Diff: http://git-wip-us.apache.org/repos/asf/drill/diff/2a45749a Branch: refs/heads/master Commit: 2a45749ad59a807474e006ba9d03b31c290c28aa Parents: a0f9658 Author: Aditya <adi...@mapr.com> Authored: Thu Nov 5 17:09:51 2015 -0800 Committer: Aditya Kishore <a...@apache.org> Committed: Fri Sep 9 10:08:29 2016 -0700 ---------------------------------------------------------------------- .../exec/store/maprdb/MapRDBFormatMatcher.java | 18 ++++++++++++------ .../drill/exec/store/maprdb/MapRDBSubScan.java | 2 +- 2 files changed, 13 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/drill/blob/2a45749a/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/maprdb/MapRDBFormatMatcher.java ---------------------------------------------------------------------- diff --git a/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/maprdb/MapRDBFormatMatcher.java b/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/maprdb/MapRDBFormatMatcher.java index b048e37..fa084f0 100644 --- a/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/maprdb/MapRDBFormatMatcher.java +++ b/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/maprdb/MapRDBFormatMatcher.java @@ -17,15 +17,19 @@ */ package org.apache.drill.exec.store.maprdb; -import com.mapr.fs.MapRFileStatus; +import java.io.IOException; + +import org.apache.drill.exec.planner.logical.DrillTable; +import org.apache.drill.exec.planner.logical.DynamicDrillTable; +import org.apache.drill.exec.store.dfs.DrillFileSystem; import org.apache.drill.exec.store.dfs.FileSelection; +import org.apache.drill.exec.store.dfs.FileSystemPlugin; import org.apache.drill.exec.store.dfs.FormatMatcher; import org.apache.drill.exec.store.dfs.FormatPlugin; import org.apache.drill.exec.store.dfs.FormatSelection; -import org.apache.drill.exec.store.dfs.DrillFileSystem; import org.apache.hadoop.fs.FileStatus; -import java.io.IOException; +import com.mapr.fs.MapRFileStatus; public class MapRDBFormatMatcher extends FormatMatcher { @@ -40,14 +44,16 @@ public class MapRDBFormatMatcher extends FormatMatcher { return false; } - @Override - public FormatSelection isReadable(DrillFileSystem fs, FileSelection selection) throws IOException { + public DrillTable isReadable(DrillFileSystem fs, + FileSelection selection, FileSystemPlugin fsPlugin, + String storageEngineName, String userName) throws IOException { FileStatus status = selection.getFirstPath(fs); if (!isFileReadable(fs, status)) { return null; } - return new FormatSelection(getFormatPlugin().getConfig(), selection); + return new DynamicDrillTable(fsPlugin, storageEngineName, userName, + new FormatSelection(getFormatPlugin().getConfig(), selection)); } @Override http://git-wip-us.apache.org/repos/asf/drill/blob/2a45749a/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/maprdb/MapRDBSubScan.java ---------------------------------------------------------------------- diff --git a/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/maprdb/MapRDBSubScan.java b/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/maprdb/MapRDBSubScan.java index c80ae30..57ef0b6 100644 --- a/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/maprdb/MapRDBSubScan.java +++ b/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/maprdb/MapRDBSubScan.java @@ -116,7 +116,7 @@ public class MapRDBSubScan extends AbstractBase implements SubScan { protected byte[] stopRow; protected byte[] serializedFilter; - @parquet.org.codehaus.jackson.annotate.JsonCreator + @JsonCreator public HBaseSubScanSpec(@JsonProperty("tableName") String tableName, @JsonProperty("regionServer") String regionServer, @JsonProperty("startRow") byte[] startRow,
