You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@vxquery.apache.org by pr...@apache.org on 2013/12/07 03:34:34 UTC
svn commit: r1548785 - in
/incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery:
compiler/rewriter/RewriteRuleset.java xmlquery/query/XMLQueryCompiler.java
Author: prestonc
Date: Sat Dec 7 02:34:34 2013
New Revision: 1548785
URL: http://svn.apache.org/r1548785
Log:
Enabling the two new rules and creating a group related to Path Steps and Aggregation Optimization.
Modified:
incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/RewriteRuleset.java
incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/query/XMLQueryCompiler.java
Modified: incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/RewriteRuleset.java
URL: http://svn.apache.org/viewvc/incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/RewriteRuleset.java?rev=1548785&r1=1548784&r2=1548785&view=diff
==============================================================================
--- incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/RewriteRuleset.java (original)
+++ incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/RewriteRuleset.java Sat Dec 7 02:34:34 2013
@@ -20,6 +20,7 @@ import java.util.LinkedList;
import java.util.List;
import org.apache.vxquery.compiler.rewriter.rules.ConsolidateAssignAggregateRule;
+import org.apache.vxquery.compiler.rewriter.rules.ConsolidateUnnestsRule;
import org.apache.vxquery.compiler.rewriter.rules.ConvertAssignToAggregateRule;
import org.apache.vxquery.compiler.rewriter.rules.ConvertAssignToUnnestRule;
import org.apache.vxquery.compiler.rewriter.rules.EliminateUnnestAggregateSequencesRule;
@@ -27,6 +28,7 @@ import org.apache.vxquery.compiler.rewri
import org.apache.vxquery.compiler.rewriter.rules.IntroduceCollectionRule;
import org.apache.vxquery.compiler.rewriter.rules.IntroduceTwoStepAggregateRule;
import org.apache.vxquery.compiler.rewriter.rules.PushMapOperatorDownThroughProductRule;
+import org.apache.vxquery.compiler.rewriter.rules.RemoveRedudantTreatExpressionsRule;
import org.apache.vxquery.compiler.rewriter.rules.RemoveUnusedSortDistinctNodesRule;
import org.apache.vxquery.compiler.rewriter.rules.RemoveUnusedTreatRule;
import org.apache.vxquery.compiler.rewriter.rules.SetCollectionDataSourceRule;
@@ -48,6 +50,7 @@ import edu.uci.ics.hyracks.algebricks.re
import edu.uci.ics.hyracks.algebricks.rewriter.rules.InlineVariablesRule;
import edu.uci.ics.hyracks.algebricks.rewriter.rules.IntroduceAggregateCombinerRule;
import edu.uci.ics.hyracks.algebricks.rewriter.rules.IntroduceGroupByCombinerRule;
+import edu.uci.ics.hyracks.algebricks.rewriter.rules.IntroduceProjectsRule;
import edu.uci.ics.hyracks.algebricks.rewriter.rules.IsolateHyracksOperatorsRule;
import edu.uci.ics.hyracks.algebricks.rewriter.rules.PullSelectOutOfEqJoin;
import edu.uci.ics.hyracks.algebricks.rewriter.rules.PushLimitDownRule;
@@ -67,7 +70,7 @@ public class RewriteRuleset {
/**
* Optimizations specific to XQuery.
*/
- public final static List<IAlgebraicRewriteRule> buildXQueryNormalizationRuleCollection() {
+ public final static List<IAlgebraicRewriteRule> buildPathStepNormalizationRuleCollection() {
List<IAlgebraicRewriteRule> normalization = new LinkedList<IAlgebraicRewriteRule>();
normalization.add(new SetVariableIdContextRule());
@@ -83,14 +86,6 @@ public class RewriteRuleset {
normalization.add(new RemoveRedundantVariablesRule());
normalization.add(new RemoveUnusedAssignAndAggregateRule());
- // Find assign for scalar aggregate function followed by an aggregate operator.
- normalization.add(new ConsolidateAssignAggregateRule());
- normalization.add(new RemoveRedundantVariablesRule());
- normalization.add(new RemoveUnusedAssignAndAggregateRule());
-
- // Find assign for scalar aggregate function.
- normalization.add(new ConvertAssignToAggregateRule());
-
// Find unnest followed by aggregate in a subplan.
normalization.add(new EliminateUnnestAggregateSubplanRule());
normalization.add(new RemoveRedundantVariablesRule());
@@ -102,12 +97,36 @@ public class RewriteRuleset {
normalization.add(new EliminateUnnestAggregateSequencesRule());
normalization.add(new ConvertAssignToUnnestRule());
+ normalization.add(new ConsolidateUnnestsRule());
+
+ // Used to clean up any missing noops after all the subplans have been altered.
+ normalization.add(new RemoveRedundantVariablesRule());
+ normalization.add(new RemoveUnusedAssignAndAggregateRule());
+ normalization.add(new RemoveRedudantTreatExpressionsRule());
+
// Convert to a data source scan operator.
normalization.add(new SetCollectionDataSourceRule());
normalization.add(new IntroduceCollectionRule());
normalization.add(new RemoveUnusedAssignAndAggregateRule());
+ return normalization;
+ }
+
+ /**
+ * Optimizations specific to XQuery.
+ */
+ public final static List<IAlgebraicRewriteRule> buildXQueryNormalizationRuleCollection() {
+ List<IAlgebraicRewriteRule> normalization = new LinkedList<IAlgebraicRewriteRule>();
+
+ // Find assign for scalar aggregate function followed by an aggregate operator.
+ normalization.add(new ConsolidateAssignAggregateRule());
+ normalization.add(new RemoveRedundantVariablesRule());
+ normalization.add(new RemoveUnusedAssignAndAggregateRule());
+
+ // Find assign for scalar aggregate function.
+ normalization.add(new ConvertAssignToAggregateRule());
+
// Use two step aggregate operators if possible.
normalization.add(new IntroduceTwoStepAggregateRule());
@@ -170,6 +189,12 @@ public class RewriteRuleset {
return opPushDown;
}
+ public final static List<IAlgebraicRewriteRule> buildIntroduceProjectRuleCollection() {
+ List<IAlgebraicRewriteRule> project = new LinkedList<IAlgebraicRewriteRule>();
+ project.add(new IntroduceProjectsRule());
+ return project;
+ }
+
public final static List<IAlgebraicRewriteRule> buildDataExchangeRuleCollection() {
List<IAlgebraicRewriteRule> dataExchange = new LinkedList<IAlgebraicRewriteRule>();
dataExchange.add(new SetExecutionModeRule());
Modified: incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/query/XMLQueryCompiler.java
URL: http://svn.apache.org/viewvc/incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/query/XMLQueryCompiler.java?rev=1548785&r1=1548784&r2=1548785&view=diff
==============================================================================
--- incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/query/XMLQueryCompiler.java (original)
+++ incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/query/XMLQueryCompiler.java Sat Dec 7 02:34:34 2013
@@ -186,6 +186,8 @@ public class XMLQueryCompiler {
SequentialOnceRuleController seqOnceCtrl = new SequentialOnceRuleController(true);
PrioritizedRuleController priorityCtrl = new PrioritizedRuleController();
defaultLogicalRewrites.add(new Pair<AbstractRuleController, List<IAlgebraicRewriteRule>>(priorityCtrl,
+ RewriteRuleset.buildPathStepNormalizationRuleCollection()));
+ defaultLogicalRewrites.add(new Pair<AbstractRuleController, List<IAlgebraicRewriteRule>>(priorityCtrl,
RewriteRuleset.buildXQueryNormalizationRuleCollection()));
defaultLogicalRewrites.add(new Pair<AbstractRuleController, List<IAlgebraicRewriteRule>>(seqCtrlFullDfs,
RewriteRuleset.buildNestedDataSourceRuleCollection()));