Merge tag 'apache-vxquery-0.4' into site [maven-release-plugin] copy for tag apache-vxquery-0.4
Project: http://git-wip-us.apache.org/repos/asf/vxquery/repo Commit: http://git-wip-us.apache.org/repos/asf/vxquery/commit/d270323b Tree: http://git-wip-us.apache.org/repos/asf/vxquery/tree/d270323b Diff: http://git-wip-us.apache.org/repos/asf/vxquery/diff/d270323b Branch: refs/heads/site Commit: d270323baff9092644b1ad80c8172cf0b657829c Parents: dabe1a5 7d46ac2 Author: Till Westmann <[email protected]> Authored: Sun Sep 7 15:53:39 2014 -0700 Committer: Till Westmann <[email protected]> Committed: Sun Sep 7 15:53:39 2014 -0700 ---------------------------------------------------------------------- .rat-excludes | 2 + pom.xml | 13 +- src/site/apt/release.apt | 24 +- src/site/apt/user_running_tests.apt | 15 +- vxquery-benchmark/pom.xml | 28 +- .../main/resources/noaa-ghcn-daily/README.md | 40 +++ .../other_systems/mrql_gsn/q00.mrql | 23 ++ .../other_systems/mrql_gsn/q01.mrql | 21 ++ .../other_systems/mrql_gsn/q02.mrql | 24 ++ .../other_systems/mrql_gsn/q03.mrql | 22 ++ .../other_systems/mrql_gsn/q04.mrql | 24 ++ .../other_systems/mrql_gsn/q04_sensor.mrql | 21 ++ .../other_systems/mrql_gsn/q04_station.mrql | 24 ++ .../other_systems/mrql_gsn/q05.mrql | 27 ++ .../other_systems/mrql_gsn/q05_sensor.mrql | 23 ++ .../other_systems/mrql_gsn/q05_station.mrql | 23 ++ .../other_systems/mrql_gsn/q06.mrql | 26 ++ .../other_systems/mrql_gsn/q06_sensor.mrql | 23 ++ .../other_systems/mrql_gsn/q06_station.mrql | 23 ++ .../other_systems/mrql_gsn/q07.mrql | 26 ++ .../other_systems/mrql_gsn/q07_join_count.mrql | 26 ++ .../other_systems/mrql_gsn/q07_tmax.mrql | 22 ++ .../other_systems/mrql_gsn/q07_tmin.mrql | 22 ++ .../other_systems/mrql_hcn/q00.mrql | 23 ++ .../other_systems/mrql_hcn/q01.mrql | 21 ++ .../other_systems/mrql_hcn/q02.mrql | 24 ++ .../other_systems/mrql_hcn/q03.mrql | 22 ++ .../other_systems/mrql_hcn/q04.mrql | 24 ++ .../other_systems/mrql_hcn/q04_sensor.mrql | 21 ++ .../other_systems/mrql_hcn/q04_station.mrql | 24 ++ .../other_systems/mrql_hcn/q05.mrql | 27 ++ .../other_systems/mrql_hcn/q05_sensor.mrql | 23 ++ .../other_systems/mrql_hcn/q05_station.mrql | 23 ++ .../other_systems/mrql_hcn/q06.mrql | 28 ++ .../other_systems/mrql_hcn/q06_sensor.mrql | 23 ++ .../other_systems/mrql_hcn/q06_station.mrql | 23 ++ .../other_systems/mrql_hcn/q07.mrql | 26 ++ .../other_systems/mrql_hcn/q07_join_count.mrql | 26 ++ .../other_systems/mrql_hcn/q07_tmax.mrql | 22 ++ .../other_systems/mrql_hcn/q07_tmin.mrql | 22 ++ .../other_systems/mrql_test/q00.mrql | 23 ++ .../other_systems/mrql_test/q01.mrql | 21 ++ .../other_systems/mrql_test/q02.mrql | 24 ++ .../other_systems/mrql_test/q03.mrql | 22 ++ .../other_systems/mrql_test/q04.mrql | 24 ++ .../other_systems/mrql_test/q05.mrql | 27 ++ .../other_systems/mrql_test/q06.mrql | 27 ++ .../other_systems/mrql_test/q07.mrql | 26 ++ .../noaa-ghcn-daily/other_systems/saxon/q04.xq | 30 ++ .../noaa-ghcn-daily/other_systems/saxon/q05.xq | 33 +++ .../noaa-ghcn-daily/other_systems/saxon/q06.xq | 30 ++ .../noaa-ghcn-daily/queries/no_result.xq | 24 ++ .../resources/noaa-ghcn-daily/queries/q00.xq | 13 +- .../resources/noaa-ghcn-daily/queries/q02.xq | 12 +- .../noaa-ghcn-daily/scripts/run_benchmark.sh | 25 +- .../scripts/run_benchmark_cluster.sh | 77 +++-- .../noaa-ghcn-daily/scripts/run_group_test.sh | 51 ++++ .../noaa-ghcn-daily/scripts/run_mrql_tests.sh | 42 +++ .../scripts/weather_benchmark.py | 173 ++++++++--- .../noaa-ghcn-daily/scripts/weather_cli.py | 15 +- .../noaa-ghcn-daily/scripts/weather_config.py | 12 +- .../scripts/weather_convert_to_xml.py | 200 +------------ .../scripts/weather_data_files.py | 139 ++++----- .../noaa-ghcn-daily/scripts/weather_example.xml | 34 --- .../scripts/weather_example_cluster.xml | 56 ---- .../resources/util/find_averages_in_logs.py | 97 +++++++ .../src/main/resources/util/log_top.sh | 35 +++ .../src/main/resources/util/merge_xml_files.py | 88 ++++++ vxquery-cli/pom.xml | 7 +- .../java/org/apache/vxquery/cli/VXQuery.java | 89 ++++-- vxquery-core/pom.xml | 5 +- .../compiler/rewriter/RewriteRuleset.java | 2 +- .../AbstractUsedVariablesProcessingRule.java | 17 +- .../rewriter/rules/ConsolidateUnnestsRule.java | 1 + .../datamodel/accessors/TypedPointables.java | 77 +++++ .../accessors/nodes/AttributeNodePointable.java | 6 + .../VXQueryCollectionOperatorDescriptor.java | 104 +------ .../metadata/VXQueryMetadataProvider.java | 26 +- ...AbstractMaxMinAggregateEvaluatorFactory.java | 10 +- .../AbstractMaxMinScalarEvaluatorFactory.java | 5 +- .../AvgGlobalAggregateEvaluatorFactory.java | 16 +- .../AvgLocalAggregateEvaluatorFactory.java | 12 +- .../FnAvgAggregateEvaluatorFactory.java | 12 +- .../aggregate/FnAvgScalarEvaluatorFactory.java | 7 +- .../FnCountAggregateEvaluatorFactory.java | 5 + .../FnSumAggregateEvaluatorFactory.java | 10 +- .../aggregate/FnSumScalarEvaluatorFactory.java | 5 +- ...bstractArithmeticScalarEvaluatorFactory.java | 5 +- .../cast/CastScalarEvaluatorFactory.java | 4 +- .../CastableScalarEvaluatorFactory.java | 4 +- ...ctValueComparisonScalarEvaluatorFactory.java | 29 +- ...GeneralComparisonScalarEvaluatorFactory.java | 11 +- .../FnDocAvailableScalarEvaluatorFactory.java | 13 +- .../node/FnDocScalarEvaluatorFactory.java | 8 +- .../node/FnNumberScalarEvaluatorFactory.java | 8 +- .../node/IdFromNodeScalarEvaluatorFactory.java | 4 +- .../LocalIdFromNodeScalarEvaluatorFactory.java | 4 +- .../AbstractNumericScalarEvaluatorFactory.java | 14 +- ...FnRoundHalfToEvenScalarEvaluatorFactory.java | 5 +- .../FnDistinctValuesScalarEvaluatorFactory.java | 5 +- .../FnIndexOfScalarEvaluatorFactory.java | 7 +- .../SequenceAggregateEvaluatorFactory.java | 7 +- .../strings/FnConcatEvaluatorFactory.java | 3 +- .../strings/FnStringScalarEvaluatorFactory.java | 4 +- .../type/PromoteScalarEvaluatorFactory.java | 4 +- ...tractNumericUnaryScalarEvaluatorFactory.java | 5 +- .../runtime/functions/util/FunctionHelper.java | 103 ++----- .../apache/vxquery/types/BuiltinAtomicType.java | 1 + .../vxquery/xmlparser/SAXContentHandler.java | 291 ++++++++++++++++--- .../org/apache/vxquery/xmlparser/XMLParser.java | 92 +++++- .../xmlquery/query/XMLQueryCompiler.java | 7 +- .../translator/VXQueryPositionWriter.java | 33 +++ .../xmlquery/translator/XMLQueryTranslator.java | 15 +- vxquery-server/pom.xml | 9 +- .../main/resources/scripts/cluster_actions.py | 6 +- .../resources/scripts/cluster_information.py | 92 +++--- .../src/main/resources/scripts/startcc.sh | 27 +- .../src/main/resources/scripts/startnc.sh | 29 +- .../src/main/resources/scripts/stopcc.sh | 4 +- vxquery-xtest/pom.xml | 48 ++- .../vxquery/xtest/AbstractTestCaseFactory.java | 212 ++++++++++++++ .../apache/vxquery/xtest/TestCaseFactory.java | 196 +------------ .../org/apache/vxquery/xtest/TestRunner.java | 168 +++++++++++ .../apache/vxquery/xtest/TestRunnerFactory.java | 146 +--------- .../java/org/apache/vxquery/xtest/XTest.java | 2 +- .../vxquery/xtest/util/DiskPerformance.java | 215 ++++++++++++++ .../xtest/util/tests/AbstractDiskTest.java | 90 ++++++ .../tests/BufferedParsedCharacterStream.java | 45 +++ .../tests/BufferedReaderBufferedStream.java | 48 +++ .../xtest/util/tests/BufferedReaderStream.java | 46 +++ .../xtest/util/tests/BufferedStream.java | 45 +++ .../vxquery/xtest/util/tests/IDiskTest.java | 31 ++ .../util/tests/ParsedBufferedByteStream.java | 48 +++ .../tests/ParsedBufferedCharacterStream.java | 48 +++ .../xtest/util/tests/ParsedByteStream.java | 46 +++ .../xtest/util/tests/ParsedCharacterStream.java | 47 +++ .../xtest/util/tests/ReaderBufferedStream.java | 46 +++ .../vxquery/xtest/util/tests/ReaderStream.java | 45 +++ .../apache/vxquery/xtest/util/tests/Stream.java | 44 +++ .../resources/scripts/build_thread_summary.py | 121 ++++++++ .../main/resources/scripts/clear_file_cache.sh | 33 +++ .../main/resources/scripts/run_thread_test.sh | 81 ++++++ .../vxquery/xtest/JUnitTestCaseFactory.java | 43 +++ .../org/apache/vxquery/xtest/VXQueryTest.java | 77 +++++ .../ExpectedTestResults/Simple/add.txt | 1 + .../ExpectedTestResults/Simple/list.txt | 3 + .../test/resources/Queries/XQuery/Simple/add.xq | 18 ++ .../resources/Queries/XQuery/Simple/list.xq | 18 ++ .../src/test/resources/VXQueryCatalog.xml | 23 ++ .../resources/VXQuerySingleAlternateCatalog.xml | 96 ++++++ .../src/test/resources/VXQuerySingleCatalog.xml | 97 +++++++ .../test/resources/cat/SingleAlternateQuery.xml | 28 ++ .../src/test/resources/cat/SingleQuery.xml | 28 ++ 153 files changed, 4630 insertions(+), 1226 deletions(-) ----------------------------------------------------------------------
