You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@drill.apache.org by ja...@apache.org on 2015/03/26 07:26:44 UTC

[05/10] drill git commit: DRILL-2572: Use PrelUtil to get PlannerSettings for PruneScanRule.

DRILL-2572: Use PrelUtil to get PlannerSettings for PruneScanRule.

+ context.getPlannerSettings() returns null sometimes
+ introduced in commit 48c9c01


Project: http://git-wip-us.apache.org/repos/asf/drill/repo
Commit: http://git-wip-us.apache.org/repos/asf/drill/commit/96528369
Tree: http://git-wip-us.apache.org/repos/asf/drill/tree/96528369
Diff: http://git-wip-us.apache.org/repos/asf/drill/diff/96528369

Branch: refs/heads/0.8.0
Commit: 965283692001df52990d5a3540b840720e08551b
Parents: b559cc6
Author: Sudheesh Katkam <sk...@maprtech.com>
Authored: Wed Mar 25 17:18:57 2015 -0700
Committer: Jacques Nadeau <ja...@apache.org>
Committed: Wed Mar 25 21:11:22 2015 -0700

----------------------------------------------------------------------
 .../drill/exec/planner/logical/partition/PruneScanRule.java       | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/drill/blob/96528369/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/partition/PruneScanRule.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/partition/PruneScanRule.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/partition/PruneScanRule.java
index b8c9ebf..413259d 100644
--- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/partition/PruneScanRule.java
+++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/partition/PruneScanRule.java
@@ -45,6 +45,7 @@ import org.apache.drill.exec.planner.logical.DrillRel;
 import org.apache.drill.exec.planner.logical.DrillScanRel;
 import org.apache.drill.exec.planner.logical.RelOptHelper;
 import org.apache.drill.exec.planner.physical.PlannerSettings;
+import org.apache.drill.exec.planner.physical.PrelUtil;
 import org.apache.drill.exec.record.MaterializedField;
 import org.apache.drill.exec.record.VectorContainer;
 import org.apache.drill.exec.store.dfs.FileSelection;
@@ -119,7 +120,7 @@ public abstract class PruneScanRule extends RelOptRule {
   }
 
   protected void doOnMatch(RelOptRuleCall call, DrillFilterRel filterRel, DrillProjectRel projectRel, DrillScanRel scanRel) {
-    PlannerSettings settings = context.getPlannerSettings();
+    final PlannerSettings settings = PrelUtil.getPlannerSettings(call.getPlanner());
     FileSystemPartitionDescriptor descriptor = new FileSystemPartitionDescriptor(settings.getFsPartitionColumnLabel());
     final BufferAllocator allocator = context.getAllocator();