DRILL-1130: Leading / in a select query should be rooted from the workspace rather than from the file system

1 files changed, 11 insertions, 2 deletions

diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/dfs/FileSelection.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/dfs/FileSelection.java
index 709fac9ba..4fbe87cd6 100644
--- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/dfs/FileSelection.java
+++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/dfs/FileSelection.java
@@ -125,11 +125,11 @@ public class FileSelection {
 
   public static FileSelection create(DrillFileSystem fs, String parent, String path) throws IOException {
     if ( !(path.contains("*") || path.contains("?")) ) {
-      Path p = new Path(parent, path);
+      Path p = new Path(parent, removeLeadingSlash(path));
       FileStatus status = fs.getFileStatus(p);
       return new FileSelection(Collections.singletonList(status), p.toUri().getPath());
     } else {
-      Path p = new Path(parent, path);
+      Path p = new Path(parent,removeLeadingSlash(path));
       FileStatus[] status = fs.getUnderlying().globStatus(p);
       if(status == null || status.length == 0) return null;
       String[] s = p.toUri().getPath().split("/");
@@ -139,4 +139,13 @@ public class FileSelection {
     }
   }
 
+  private static String removeLeadingSlash(String path) {
+    if (path.charAt(0) == '/') {
+      String newPath = path.substring(1);
+      return removeLeadingSlash(newPath);
+    } else {
+      return path;
+    }
+  }
+
 }