Switched the xqts fiel to use version sort order. Easier to read.
Project: http://git-wip-us.apache.org/repos/asf/vxquery/repo Commit: http://git-wip-us.apache.org/repos/asf/vxquery/commit/43852a54 Tree: http://git-wip-us.apache.org/repos/asf/vxquery/tree/43852a54 Diff: http://git-wip-us.apache.org/repos/asf/vxquery/diff/43852a54 Branch: refs/heads/master Commit: 43852a5476ccb33bf9ee58e27468b400cc169d6a Parents: bf8ab73 Author: Preston Carman <[email protected]> Authored: Fri Mar 4 11:10:03 2016 -0800 Committer: Preston Carman <[email protected]> Committed: Fri Mar 4 11:10:03 2016 -0800 ---------------------------------------------------------------------- .../apt/development_update_xqts_results.apt | 4 +- src/site/apt/user_running_tests.apt | 22 +- .../compiler/rewriter/RewriteRuleset.java | 10 +- vxquery-xtest/results/xqts.txt | 13440 ++++++++--------- 4 files changed, 6739 insertions(+), 6737 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/vxquery/blob/43852a54/src/site/apt/development_update_xqts_results.apt ---------------------------------------------------------------------- diff --git a/src/site/apt/development_update_xqts_results.apt b/src/site/apt/development_update_xqts_results.apt index 115a178..50b36d8 100644 --- a/src/site/apt/development_update_xqts_results.apt +++ b/src/site/apt/development_update_xqts_results.apt @@ -15,7 +15,7 @@ Update the XQTS Results - VXQuery stores the latest XQTS result for the last release. + VXQuery stores the latest XQTS result for the last release. The file can be used to verify that all the previous test still passing. The following instructions show how to update the XQTS results file. @@ -45,7 +45,7 @@ sh ./vxquery-xtest/target/appassembler/bin/xtest -catalog vxquery-xtest/test-sui * Sort the results so they can be compared with previous results. ---------------------------------------- -sort vxquery-xtest/results/xqts_temp.txt --output=vxquery-xtest/results/xqts.txt +sort -V vxquery-xtest/results/xqts_temp.txt --output=vxquery-xtest/results/xqts.txt ---------------------------------------- * Clean up (remove) the temporary results files. http://git-wip-us.apache.org/repos/asf/vxquery/blob/43852a54/src/site/apt/user_running_tests.apt ---------------------------------------------------------------------- diff --git a/src/site/apt/user_running_tests.apt b/src/site/apt/user_running_tests.apt index d5e97b2..c117785 100644 --- a/src/site/apt/user_running_tests.apt +++ b/src/site/apt/user_running_tests.apt @@ -45,7 +45,7 @@ xtest.bat -v : Verbose -xmlreport VAL : XML Report output file ---------------------------------------- - + * Java Options The command can be run with Java options to increase the amount of memory to one gigabyte. @@ -55,30 +55,30 @@ xtest.bat ---------------------------------------- JAVA_OPTS="-Xmx1024m -Djava.util.logging.config.file=/path/to/logging.properties" ---------------------------------------- - + * VXQuery Testing Options * VXQuery Test Suite The VXQuery test suite focuses on parallel processing tests used in our weather benchmark. - + ---------------------------------------- sh ./vxquery-xtest/target/appassembler/bin/xtest -catalog vxquery-xtest/src/test/resources/VXQueryCatalog.xml -htmlreport /tmp/vxquery_report.html ---------------------------------------- * view the results at {{{file:///tmp/vxquery_report.html}file:///tmp/vxquery_report.html}}. - + * XQTS (XQuery Test Suite) To run the complete XQTS on VXQuery. - - * Create a folder to hold the XQTS. + + * Create a folder to hold the XQTS. If you use "vxquery-xtest/test-suites/xqts", then maven will utilize the XQTS to verify VXQuery's passing functions during the build process. - + ---------------------------------------- $ mkdir -p vxquery-xtest/test-suites $ cd vxquery-xtest/test-suites ---------------------------------------- - + * Get the archive {{{http://dev.w3.org/2006/xquery-test-suite/PublicPagesStagingArea/XQTS_1_0_3.zip}XQTS_1_0_3.zip}} (e.g. using wget), ---------------------------------------- @@ -88,10 +88,7 @@ $ wget http://dev.w3.org/2006/xquery-test-suite/PublicPagesStagingArea/XQTS_1_0_ * unpack it, ---------------------------------------- -$ mkdir xqts -$ cd xqts -$ unzip ../XQTS_1_0_3.zip -$ cd .. +$ unzip -d xqts XQTS_1_0_3.zip ---------------------------------------- * go back to the project root, @@ -123,4 +120,3 @@ sh ./vxquery-xtest/target/appassembler/bin/xtest -catalog vxquery-xtest/test-sui * view the results at {{{file:///tmp/previous_report.html}file:///tmp/previous_report.html}}. - \ No newline at end of file http://git-wip-us.apache.org/repos/asf/vxquery/blob/43852a54/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 6f09543..fd20465 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 @@ -90,6 +90,7 @@ import org.apache.hyracks.algebricks.rewriter.rules.SubplanOutOfGroupRule; public class RewriteRuleset { /** * Optimizations specific to XQuery. + * * @return List of algebraic rewrite rules. */ public final static List<IAlgebraicRewriteRule> buildPathStepNormalizationRuleCollection() { @@ -147,6 +148,7 @@ public class RewriteRuleset { /** * Optimizations specific to XQuery. + * * @return List of algebraic rewrite rules. */ public final static List<IAlgebraicRewriteRule> buildXQueryNormalizationRuleCollection() { @@ -172,6 +174,7 @@ public class RewriteRuleset { /** * Remove expressions known to be redundant. + * * @return List of algebraic rewrite rules. */ public final static List<IAlgebraicRewriteRule> buildInlineRedundantExpressionNormalizationRuleCollection() { @@ -191,6 +194,7 @@ public class RewriteRuleset { /** * When a nested data sources exist, convert the plan to use the join operator. + * * @return List of algebraic rewrite rules. */ public final static List<IAlgebraicRewriteRule> buildNestedDataSourceRuleCollection() { @@ -215,6 +219,7 @@ public class RewriteRuleset { /** * Unnest more complex structures. + * * @return List of algebraic rewrite rules. */ public final static List<IAlgebraicRewriteRule> buildUnnestingRuleCollection() { @@ -306,6 +311,7 @@ public class RewriteRuleset { physicalPlanRewrites.add(new PullSelectOutOfEqJoin()); physicalPlanRewrites.add(new PushFunctionsOntoEqJoinBranches()); physicalPlanRewrites.add(new SetAlgebricksPhysicalOperatorsRule()); + physicalPlanRewrites.add(new SetExecutionModeRule()); physicalPlanRewrites.add(new EnforceStructuralPropertiesRule()); physicalPlanRewrites.add(new PushProjectDownRule()); physicalPlanRewrites.add(new CopyLimitDownRule()); @@ -322,8 +328,8 @@ public class RewriteRuleset { public final static List<IAlgebraicRewriteRule> prepareForJobGenRuleCollection() { List<IAlgebraicRewriteRule> prepareForJobGenRewrites = new LinkedList<IAlgebraicRewriteRule>(); prepareForJobGenRewrites.add(new ConvertFromAlgebricksExpressionsRule()); - prepareForJobGenRewrites.add(new IsolateHyracksOperatorsRule( - HeuristicOptimizer.hyraxOperatorsBelowWhichJobGenIsDisabled)); + prepareForJobGenRewrites + .add(new IsolateHyracksOperatorsRule(HeuristicOptimizer.hyraxOperatorsBelowWhichJobGenIsDisabled)); prepareForJobGenRewrites.add(new ExtractCommonOperatorsRule()); // Re-infer all types, so that, e.g., the effect of not-is-null is // propagated.
