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 2015/06/23 20:36:03 UTC
[2/2] vxquery git commit: Added more default options to improve longs
during debugging.
Added more default options to improve longs during debugging.
- Also included a missing rewrite rule to improve the plans.
Project: http://git-wip-us.apache.org/repos/asf/vxquery/repo
Commit: http://git-wip-us.apache.org/repos/asf/vxquery/commit/5ddf5e02
Tree: http://git-wip-us.apache.org/repos/asf/vxquery/tree/5ddf5e02
Diff: http://git-wip-us.apache.org/repos/asf/vxquery/diff/5ddf5e02
Branch: refs/heads/prestonc/junit_testing
Commit: 5ddf5e02cc38b4d4e0636eb58056c6dc62468010
Parents: 1ca86c3
Author: Eldon Carman <ec...@ucr.edu>
Authored: Tue Jun 23 11:34:50 2015 -0700
Committer: Eldon Carman <ec...@ucr.edu>
Committed: Tue Jun 23 11:34:50 2015 -0700
----------------------------------------------------------------------
.../java/org/apache/vxquery/compiler/rewriter/RewriteRuleset.java | 2 ++
.../src/test/java/org/apache/vxquery/xtest/AbstractXQueryTest.java | 2 ++
2 files changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/vxquery/blob/5ddf5e02/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/RewriteRuleset.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/RewriteRuleset.java b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/RewriteRuleset.java
index b67402b..0db26a9 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/RewriteRuleset.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/RewriteRuleset.java
@@ -60,6 +60,7 @@ import edu.uci.ics.hyracks.algebricks.rewriter.rules.IntroduceAggregateCombinerR
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.MoveFreeVariableOperatorOutOfSubplanRule;
import edu.uci.ics.hyracks.algebricks.rewriter.rules.PullSelectOutOfEqJoin;
import edu.uci.ics.hyracks.algebricks.rewriter.rules.PushMapOperatorDownThroughProductRule;
import edu.uci.ics.hyracks.algebricks.rewriter.rules.PushProjectDownRule;
@@ -124,6 +125,7 @@ public class RewriteRuleset {
// Improvement for scalar child expressions
normalization.add(new EliminateSubplanForSingleItemsRule());
+ normalization.add(new MoveFreeVariableOperatorOutOfSubplanRule());
return normalization;
}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/5ddf5e02/vxquery-xtest/src/test/java/org/apache/vxquery/xtest/AbstractXQueryTest.java
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/java/org/apache/vxquery/xtest/AbstractXQueryTest.java b/vxquery-xtest/src/test/java/org/apache/vxquery/xtest/AbstractXQueryTest.java
index 4f0487a..9cae8e8 100644
--- a/vxquery-xtest/src/test/java/org/apache/vxquery/xtest/AbstractXQueryTest.java
+++ b/vxquery-xtest/src/test/java/org/apache/vxquery/xtest/AbstractXQueryTest.java
@@ -35,6 +35,8 @@ public abstract class AbstractXQueryTest {
XTestOptions opts = new XTestOptions();
opts.verbose = false;
opts.threads = 1;
+ opts.showQuery = true;
+ opts.showResult = true;
return opts;
}