You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@asterixdb.apache.org by im...@apache.org on 2015/04/24 20:46:31 UTC

[64/85] [abbrv] incubator-asterixdb-hyracks git commit: Eliminate trivial subplan (e.g., a NTS only plan) in EliminateSubplanRule.

Eliminate trivial subplan (e.g., a NTS only plan) in EliminateSubplanRule.

Change-Id: I13a56fe78847e882358f393bf19391e97e1730e3
Reviewed-on: http://fulliautomatix.ics.uci.edu:8443/188
Tested-by: Jenkins <je...@fulliautomatix.ics.uci.edu>
Reviewed-by: Preston Carman <ec...@ucr.edu>


Project: http://git-wip-us.apache.org/repos/asf/incubator-asterixdb-hyracks/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-asterixdb-hyracks/commit/7527bbbb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-asterixdb-hyracks/tree/7527bbbb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-asterixdb-hyracks/diff/7527bbbb

Branch: refs/heads/master
Commit: 7527bbbb3930e8c237cd3171887c0aa7c76cfa3e
Parents: e82f811
Author: buyingyi <bu...@gmail.com>
Authored: Wed Dec 3 18:34:01 2014 -0800
Committer: Ian Maxon <im...@uci.edu>
Committed: Thu Dec 4 12:08:27 2014 -0800

----------------------------------------------------------------------
 .../hyracks/algebricks/rewriter/rules/EliminateSubplanRule.java   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-asterixdb-hyracks/blob/7527bbbb/algebricks/algebricks-rewriter/src/main/java/edu/uci/ics/hyracks/algebricks/rewriter/rules/EliminateSubplanRule.java
----------------------------------------------------------------------
diff --git a/algebricks/algebricks-rewriter/src/main/java/edu/uci/ics/hyracks/algebricks/rewriter/rules/EliminateSubplanRule.java b/algebricks/algebricks-rewriter/src/main/java/edu/uci/ics/hyracks/algebricks/rewriter/rules/EliminateSubplanRule.java
index 048e863..8a381f7 100644
--- a/algebricks/algebricks-rewriter/src/main/java/edu/uci/ics/hyracks/algebricks/rewriter/rules/EliminateSubplanRule.java
+++ b/algebricks/algebricks-rewriter/src/main/java/edu/uci/ics/hyracks/algebricks/rewriter/rules/EliminateSubplanRule.java
@@ -74,7 +74,8 @@ public class EliminateSubplanRule implements IAlgebraicRewriteRule {
         SubplanOperator subplan = (SubplanOperator) opRef.getValue();
         AbstractLogicalOperator rootOp = (AbstractLogicalOperator) subplan.getNestedPlans().get(0).getRoots().get(0)
                 .getValue();
-        if (rootOp.getOperatorTag() == LogicalOperatorTag.EMPTYTUPLESOURCE) {
+        if (rootOp.getOperatorTag() == LogicalOperatorTag.EMPTYTUPLESOURCE
+                || rootOp.getOperatorTag() == LogicalOperatorTag.NESTEDTUPLESOURCE) {
             opRef.setValue(subplan.getInputs().get(0).getValue());
             return true;
         } else {