diff options
Diffstat (limited to 'exec/java-exec/src/main/java/org/apache/drill/exec/physical/base')
3 files changed, 11 insertions, 6 deletions
diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/base/AbstractGroupScan.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/base/AbstractGroupScan.java index 7e2623a19..03b53a4f7 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/base/AbstractGroupScan.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/base/AbstractGroupScan.java @@ -34,6 +34,7 @@ import org.apache.drill.exec.planner.physical.PlannerSettings; import com.fasterxml.jackson.annotation.JsonIgnore; import org.apache.drill.exec.server.options.OptionManager; +import org.apache.hadoop.fs.Path; public abstract class AbstractGroupScan extends AbstractBase implements GroupScan { @@ -171,7 +172,7 @@ public abstract class AbstractGroupScan extends AbstractBase implements GroupSca } @Override - public Collection<String> getFiles() { + public Collection<Path> getFiles() { return null; } diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/base/GroupScan.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/base/GroupScan.java index e42ae2dc8..6dbad224c 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/base/GroupScan.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/base/GroupScan.java @@ -30,6 +30,7 @@ import org.apache.drill.exec.planner.physical.PlannerSettings; import org.apache.drill.exec.proto.CoordinationProtos.DrillbitEndpoint; import org.apache.drill.exec.server.options.OptionManager; import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableList; +import org.apache.hadoop.fs.Path; /** * A GroupScan operator represents all data which will be scanned by a given physical @@ -142,8 +143,10 @@ public interface GroupScan extends Scan, HasAffinity{ /** * Returns a collection of file names associated with this GroupScan. This should be called after checking * hasFiles(). If this GroupScan cannot provide file names, it returns null. + * + * @return collection of files paths */ - Collection<String> getFiles(); + Collection<Path> getFiles(); @JsonIgnore LogicalExpression getFilter(); diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/base/SchemalessScan.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/base/SchemalessScan.java index 999c417fc..fb60ddddb 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/base/SchemalessScan.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/base/SchemalessScan.java @@ -23,6 +23,7 @@ import com.fasterxml.jackson.annotation.JsonTypeName; import org.apache.drill.common.expression.SchemaPath; import org.apache.drill.exec.proto.CoordinationProtos; import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import org.apache.hadoop.fs.Path; import java.util.List; @@ -32,17 +33,17 @@ import java.util.List; @JsonTypeName("schemaless-scan") public class SchemalessScan extends AbstractFileGroupScan implements SubScan { - private final String selectionRoot; + private final Path selectionRoot; @JsonCreator public SchemalessScan(@JsonProperty("userName") String userName, - @JsonProperty("selectionRoot") String selectionRoot, + @JsonProperty("selectionRoot") Path selectionRoot, @JsonProperty("columns") List<SchemaPath> columns) { this(userName, selectionRoot); } public SchemalessScan(@JsonProperty("userName") String userName, - @JsonProperty("selectionRoot") String selectionRoot) { + @JsonProperty("selectionRoot") Path selectionRoot) { super(userName); this.selectionRoot = selectionRoot; } @@ -53,7 +54,7 @@ public class SchemalessScan extends AbstractFileGroupScan implements SubScan { } @JsonProperty - public String getSelectionRoot() { + public Path getSelectionRoot() { return selectionRoot; } |