Merge branch 'prestonc/november_update' * prestonc/november_update: Updated pom and instructions based on code review. Updated XQTS results and included fix for Algebricks upgrade. Added rat exclusion for folder manually created for XQTS. Updated the site to fix a few formatting issues. Updated the error checking to search nested exceptions. Updated the XML styling of the pom files. lowercase the 'xml' category fix typos Updated website and xtest now can run all previously passing tests. Feedback from review and maven now runs the previous passing XQTS with maven test. (Saving work) Recent round of changes to improve performance in the benchmarks. Updated the XML styling of the pom files. lowercase the 'xml' category fix typos Added two new test cases for numeric functions. Also includes a few bug fixes and clean up items. Switched arithmetic from a static call to an object created at the beginning of processing. Log output settings have been refined for testing. Recent round of changes to improve performance in the benchmarks. Consolidated changes for November.
Project: http://git-wip-us.apache.org/repos/asf/vxquery/repo Commit: http://git-wip-us.apache.org/repos/asf/vxquery/commit/9abe3e9f Tree: http://git-wip-us.apache.org/repos/asf/vxquery/tree/9abe3e9f Diff: http://git-wip-us.apache.org/repos/asf/vxquery/diff/9abe3e9f Branch: refs/heads/site Commit: 9abe3e9f098756e2092e24f940d15a3eaab91787 Parents: da09ce8 cc57e1f Author: Preston Carman <[email protected]> Authored: Mon Feb 23 10:23:10 2015 -0800 Committer: Preston Carman <[email protected]> Committed: Mon Feb 23 10:23:10 2015 -0800 ---------------------------------------------------------------------- .gitignore | 1 + README | 25 + docs/README | 67 - pom.xml | 3 +- src/site/apt/development_benchmarks.apt | 24 + src/site/apt/development_data_handling.apt | 162 + src/site/apt/development_tips.apt | 162 - .../apt/development_update_xqts_results.apt | 55 + src/site/apt/user_query.apt | 15 +- src/site/apt/user_running_tests.apt | 59 +- src/site/site.xml | 127 +- .../noaa-ghcn-daily/other_systems/mrql/q07.mrql | 2 +- .../other_systems/mrql/q07_count_1940.mrql | 30 + .../other_systems/mrql/q07_count_1960.mrql | 30 + .../other_systems/mrql/q07_count_1980.mrql | 30 + .../other_systems/mrql/q07_count_2000.mrql | 30 + .../other_systems/mrql/q07_count_join.mrql | 6 +- .../other_systems/mrql/q07_count_left.mrql | 21 + .../other_systems/mrql/q07_count_tmax.mrql | 2 +- .../other_systems/mrql/q07_count_tmin.mrql | 2 +- .../other_systems/mrql/q07_data_tmax.mrql | 20 + .../other_systems/mrql/q07_data_tmin.mrql | 20 + .../other_systems/mrql/q07_filter_1940.mrql | 30 + .../other_systems/mrql/q07_filter_1960.mrql | 30 + .../other_systems/mrql/q07_filter_1980.mrql | 30 + .../other_systems/mrql/q07_filter_2000.mrql | 30 + .../mrql_scripts/load_node_file.sh | 2 + .../mrql_scripts/run_group_test.sh | 14 +- .../mrql_scripts/run_mrql_tests.sh | 7 +- .../mrql_scripts/yarn_and_flink/README.md | 23 + .../yarn_and_flink/clear_hadoop2.sh | 22 + .../yarn_and_flink/load_node_file.sh | 47 + .../yarn_and_flink/run_group_test.sh | 86 + .../yarn_and_flink/run_mrql_tests.sh | 49 + .../noaa-ghcn-daily/queries/q07_count_1940.xq | 35 + .../noaa-ghcn-daily/queries/q07_count_1960.xq | 35 + .../noaa-ghcn-daily/queries/q07_count_1980.xq | 35 + .../noaa-ghcn-daily/queries/q07_count_2000.xq | 35 + .../noaa-ghcn-daily/queries/q07_count_left.xq | 27 + .../noaa-ghcn-daily/queries/q07_data_tmax.xq | 26 + .../noaa-ghcn-daily/queries/q07_data_tmin.xq | 26 + .../noaa-ghcn-daily/queries/q07_filter_1940.xq | 35 + .../noaa-ghcn-daily/queries/q07_filter_1960.xq | 35 + .../noaa-ghcn-daily/queries/q07_filter_1980.xq | 35 + .../noaa-ghcn-daily/queries/q07_filter_2000.xq | 35 + .../scripts/benchmark_logging.properties | 43 +- .../noaa-ghcn-daily/scripts/run_benchmark.sh | 4 +- .../scripts/run_benchmark_cluster.sh | 14 +- .../scripts/testing_logging.properties | 79 + .../scripts/weather_benchmark.py | 37 +- .../java/org/apache/vxquery/cli/VXQuery.java | 18 +- .../compiler/rewriter/RewriteRuleset.java | 15 +- .../rewriter/rules/ConsolidateUnnestsRule.java | 10 +- ...tAssignSortDistinctNodesToOperatorsRule.java | 1 - .../PushMapOperatorDownThroughProductRule.java | 142 - .../accessors/atomic/XSDecimalPointable.java | 6 +- .../builders/atomic/UTF8StringBuilder.java | 54 + .../builders/base/AbstractBuilder.java | 27 + .../builders/nodes/DictionaryBuilder.java | 21 +- .../vxquery/functions/builtin-operators.xml | 1 + .../metadata/VXQueryCollectionDataSource.java | 4 + .../metadata/VXQueryMetadataProvider.java | 53 +- ...AbstractMaxMinAggregateEvaluatorFactory.java | 6 +- .../AbstractMaxMinScalarEvaluatorFactory.java | 5 +- .../AvgGlobalAggregateEvaluatorFactory.java | 18 +- .../AvgLocalAggregateEvaluatorFactory.java | 10 +- .../FnAvgAggregateEvaluatorFactory.java | 13 +- .../aggregate/FnAvgScalarEvaluatorFactory.java | 13 +- .../FnSumAggregateEvaluatorFactory.java | 10 +- .../aggregate/FnSumScalarEvaluatorFactory.java | 10 +- ...bstractArithmeticScalarEvaluatorFactory.java | 13 +- .../functions/numeric/FnCeilingOperation.java | 4 +- .../functions/numeric/FnFloorOperation.java | 4 +- .../functions/numeric/FnRoundOperation.java | 4 +- .../functions/step/AbstractChildPathStep.java | 74 - ...stractDescendantPathStepScalarEvaluator.java | 5 +- .../step/AbstractForwardAxisPathStep.java | 74 + .../step/ChildPathStepOperatorDescriptor.java | 38 +- .../functions/step/ChildPathStepUnnesting.java | 13 +- ...DescendantOrSelfPathStepScalarEvaluator.java | 11 +- .../step/DescendantOrSelfPathStepUnnesting.java | 167 + ...cendantOrSelfPathStepUnnestingEvaluator.java | 44 + ...OrSelfPathStepUnnestingEvaluatorFactory.java | 40 + .../step/DescendantPathStepScalarEvaluator.java | 4 - .../DescendantPathStepUnnestingEvaluator.java | 44 + ...endantPathStepUnnestingEvaluatorFactory.java | 39 + .../strings/UTF8StringCharacterIterator.java | 4 +- .../functions/util/ArithmeticHelper.java | 511 ++ .../runtime/functions/util/FunctionHelper.java | 6 + .../vxquery/xmlparser/SAXContentHandler.java | 78 +- .../xmlquery/query/XMLQueryCompiler.java | 26 +- vxquery-server/pom.xml | 16 +- .../src/main/resources/conf/cluster.properties | 54 + .../src/main/resources/scripts/startcc.sh | 25 +- .../src/main/resources/scripts/startnc.sh | 23 +- .../src/main/resources/scripts/stopcc.sh | 4 + .../src/main/resources/scripts/stopcluster.sh | 12 +- .../src/main/resources/scripts/stopnc.sh | 4 + vxquery-xtest/pom.xml | 8 + vxquery-xtest/results/README.md | 5 +- vxquery-xtest/results/xqts.txt | 6460 +++++++++--------- .../vxquery/xtest/AbstractTestCaseFactory.java | 51 +- .../vxquery/xtest/HTMLFileReporterImpl.java | 1 - .../vxquery/xtest/ServletReporterImpl.java | 2 +- .../apache/vxquery/xtest/TestCaseFactory.java | 6 +- .../org/apache/vxquery/xtest/TestRunner.java | 19 +- .../org/apache/vxquery/xtest/XTestOptions.java | 3 + .../vxquery/xtest/JUnitTestCaseFactory.java | 7 +- .../org/apache/vxquery/xtest/VXQueryTest.java | 47 +- .../ExpectedTestResults/Numerics/fn_abs.txt | 8 + .../ExpectedTestResults/Numerics/fn_ceiling.txt | 8 + .../resources/Queries/XQuery/Numerics/fn_abs.xq | 22 + .../Queries/XQuery/Numerics/fn_ceiling.xq | 22 + .../src/test/resources/VXQueryCatalog.xml | 15 + .../FunctionsAndOperatorsOnNumericsQueries.xml | 33 + 115 files changed, 6286 insertions(+), 4008 deletions(-) ----------------------------------------------------------------------
