Hussain Towaileb has uploaded a new change for review.

  https://asterix-gerrit.ics.uci.edu/3101

Change subject: [NO ISSUE] Refactoring plan optimization method
......................................................................

[NO ISSUE] Refactoring plan optimization method

- user model changes: no
- storage format changes: no
- interface changes: no

Details:
- Refactoring plan optimization method.

Change-Id: I8275bca00b41969444824cffd12f542d802bf26f
---
M 
hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/rewriter/base/HeuristicOptimizer.java
1 file changed, 17 insertions(+), 8 deletions(-)


  git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb 
refs/changes/01/3101/1

diff --git 
a/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/rewriter/base/HeuristicOptimizer.java
 
b/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/rewriter/base/HeuristicOptimizer.java
index a2a0ca1..43cc78a 100644
--- 
a/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/rewriter/base/HeuristicOptimizer.java
+++ 
b/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/rewriter/base/HeuristicOptimizer.java
@@ -79,9 +79,9 @@
         }
 
         logPlanAt("Logical Plan", Level.TRACE);
-        runOptimizationSets(plan, logicalRewrites);
+        runLogicalOptimizationSets(plan, logicalRewrites);
         computeSchemaBottomUpForPlan(plan);
-        runPhysicalOptimizations(plan, physicalRewrites);
+        runPhysicalOptimizationSets(plan, physicalRewrites);
         logPlanAt("Optimized Plan", Level.TRACE);
     }
 
@@ -94,9 +94,19 @@
         }
     }
 
+    private void runLogicalOptimizationSets(ILogicalPlan plan,
+            List<Pair<AbstractRuleController, List<IAlgebraicRewriteRule>>> 
optimizationSet)
+            throws AlgebricksException {
+        if (AlgebricksConfig.ALGEBRICKS_LOGGER.isTraceEnabled()) {
+            AlgebricksConfig.ALGEBRICKS_LOGGER.trace("Starting logical 
optimizations.\n");
+        }
+        runOptimizationSets(plan, optimizationSet);
+    }
+
     private void runOptimizationSets(ILogicalPlan plan,
-            List<Pair<AbstractRuleController, List<IAlgebraicRewriteRule>>> 
optimSet) throws AlgebricksException {
-        for (Pair<AbstractRuleController, List<IAlgebraicRewriteRule>> 
ruleList : optimSet) {
+            List<Pair<AbstractRuleController, List<IAlgebraicRewriteRule>>> 
optimizationSet)
+            throws AlgebricksException {
+        for (Pair<AbstractRuleController, List<IAlgebraicRewriteRule>> 
ruleList : optimizationSet) {
             for (Mutable<ILogicalOperator> r : plan.getRoots()) {
                 ruleList.first.setContext(context);
                 ruleList.first.rewriteWithRuleCollection(r, ruleList.second);
@@ -123,13 +133,12 @@
         op.recomputeSchema();
     }
 
-    private void runPhysicalOptimizations(ILogicalPlan plan,
-            List<Pair<AbstractRuleController, List<IAlgebraicRewriteRule>>> 
physicalRewrites)
+    private void runPhysicalOptimizationSets(ILogicalPlan plan,
+            List<Pair<AbstractRuleController, List<IAlgebraicRewriteRule>>> 
optimizationSet)
             throws AlgebricksException {
         if (AlgebricksConfig.ALGEBRICKS_LOGGER.isTraceEnabled()) {
             AlgebricksConfig.ALGEBRICKS_LOGGER.trace("Starting physical 
optimizations.\n");
         }
-        runOptimizationSets(plan, physicalRewrites);
+        runOptimizationSets(plan, optimizationSet);
     }
-
 }

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/3101
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8275bca00b41969444824cffd12f542d802bf26f
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Hussain Towaileb <[email protected]>

Reply via email to