Repository: incubator-drill Updated Branches: refs/heads/master 5c220e35a -> 29dde769b
DRILL-1473: o.a.d.exec.planner.logical.DrillPushPartitionFilterIntoScan asserts on Windows Project: http://git-wip-us.apache.org/repos/asf/incubator-drill/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-drill/commit/29dde769 Tree: http://git-wip-us.apache.org/repos/asf/incubator-drill/tree/29dde769 Diff: http://git-wip-us.apache.org/repos/asf/incubator-drill/diff/29dde769 Branch: refs/heads/master Commit: 29dde769bb8c82743b9128c4cc1be4ec149ce939 Parents: 5c220e3 Author: Aditya Kishore <[email protected]> Authored: Wed Oct 1 15:03:16 2014 -0700 Committer: Steven Phillips <[email protected]> Committed: Wed Oct 1 15:03:16 2014 -0700 ---------------------------------------------------------------------- .../planner/logical/DrillPushPartitionFilterIntoScan.java | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/29dde769/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillPushPartitionFilterIntoScan.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillPushPartitionFilterIntoScan.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillPushPartitionFilterIntoScan.java index 3fbc3af..19a92f0 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillPushPartitionFilterIntoScan.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillPushPartitionFilterIntoScan.java @@ -94,15 +94,12 @@ public abstract class DrillPushPartitionFilterIntoScan extends RelOptRule { String fullPath = pathPrefix + dirPath; // check containment of this path in the list of files for (String origFilePath : origFiles) { - String[] components = origFilePath.split(":"); // some paths are of the form 'file:<path>', so we need to split - assert (components.length <= 2); + String[] components = origFilePath.split(":", 2); // some paths are of the form 'file:<path>', so we need to split String origFileName = ""; if (components.length == 1) { origFileName = components[0]; - } else if (components.length == 2) { - origFileName = components[1]; } else { - assert false ; + origFileName = components[1]; } if (origFileName.startsWith(fullPath)) { newFiles.add(origFileName);
