Merge branch 'prestonc/september_update'
Project: http://git-wip-us.apache.org/repos/asf/vxquery/repo Commit: http://git-wip-us.apache.org/repos/asf/vxquery/commit/e97888ed Tree: http://git-wip-us.apache.org/repos/asf/vxquery/tree/e97888ed Diff: http://git-wip-us.apache.org/repos/asf/vxquery/diff/e97888ed Branch: refs/heads/site Commit: e97888ed881f8adc749e1e695c9700cc9d4c797f Parents: 72fd5c6 9e0133a Author: Preston Carman <[email protected]> Authored: Tue Oct 21 12:35:39 2014 -0700 Committer: Preston Carman <[email protected]> Committed: Tue Oct 21 12:35:39 2014 -0700 ---------------------------------------------------------------------- .../noaa-ghcn-daily/conf/weather_example.xml | 35 +++++++ .../conf/weather_example_cluster.xml | 58 ++++++++++++ .../noaa-ghcn-daily/other_systems/mrql/q00.mrql | 23 +++++ .../noaa-ghcn-daily/other_systems/mrql/q01.mrql | 21 +++++ .../noaa-ghcn-daily/other_systems/mrql/q02.mrql | 24 +++++ .../noaa-ghcn-daily/other_systems/mrql/q03.mrql | 22 +++++ .../noaa-ghcn-daily/other_systems/mrql/q04.mrql | 24 +++++ .../other_systems/mrql/q04_count_sensor.mrql | 21 +++++ .../other_systems/mrql/q04_count_station.mrql | 23 +++++ .../noaa-ghcn-daily/other_systems/mrql/q05.mrql | 27 ++++++ .../other_systems/mrql/q05_count_sensor.mrql | 23 +++++ .../other_systems/mrql/q05_count_station.mrql | 23 +++++ .../noaa-ghcn-daily/other_systems/mrql/q06.mrql | 26 ++++++ .../other_systems/mrql/q06_count_sensor.mrql | 23 +++++ .../other_systems/mrql/q06_count_station.mrql | 23 +++++ .../noaa-ghcn-daily/other_systems/mrql/q07.mrql | 26 ++++++ .../other_systems/mrql/q07_count_join.mrql | 26 ++++++ .../other_systems/mrql/q07_count_tmax.mrql | 22 +++++ .../other_systems/mrql/q07_count_tmin.mrql | 22 +++++ .../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_scripts/README.md | 23 +++++ .../other_systems/mrql_scripts/clear.sh | 24 +++++ .../mrql_scripts/load_node_file.sh | 47 ++++++++++ .../mrql_scripts/run_group_test.sh | 65 +++++++++++++ .../mrql_scripts/run_mrql_tests.sh | 49 ++++++++++ .../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 ------ .../other_systems/saxon/count_sensor.xq | 7 ++ .../other_systems/saxon/count_station.xq | 7 ++ .../noaa-ghcn-daily/other_systems/saxon/q00.xq | 15 +++ .../noaa-ghcn-daily/other_systems/saxon/q01.xq | 8 ++ .../noaa-ghcn-daily/other_systems/saxon/q02.xq | 14 +++ .../noaa-ghcn-daily/other_systems/saxon/q03.xq | 8 ++ .../other_systems/saxon/q04_count_sensor.xq | 10 ++ .../other_systems/saxon/q04_count_station.xq | 8 ++ .../other_systems/saxon/q05_count_sensor.xq | 11 +++ .../other_systems/saxon/q05_count_station.xq | 8 ++ .../other_systems/saxon/q06_count_sensor.xq | 8 ++ .../other_systems/saxon/q06_count_station.xq | 5 + .../noaa-ghcn-daily/other_systems/saxon/q07.xq | 15 +++ .../other_systems/saxon/q07_count_tmax.xq | 9 ++ .../other_systems/saxon/q07_count_tmin.xq | 9 ++ .../saxon_scripts/run_saxon_tests.sh | 44 +++++++++ .../noaa-ghcn-daily/queries/count_sensor.xq | 27 ++++++ .../noaa-ghcn-daily/queries/count_station.xq | 27 ++++++ .../resources/noaa-ghcn-daily/queries/q04.xq | 8 +- .../noaa-ghcn-daily/queries/q04_count_join.xq | 34 +++++++ .../noaa-ghcn-daily/queries/q04_count_sensor.xq | 29 ++++++ .../queries/q04_count_station.xq | 28 ++++++ .../noaa-ghcn-daily/queries/q04_sensor.xq | 27 ------ .../noaa-ghcn-daily/queries/q04_station.xq | 25 ----- .../noaa-ghcn-daily/queries/q05_count_join.xq | 35 +++++++ .../noaa-ghcn-daily/queries/q05_count_sensor.xq | 31 +++++++ .../queries/q05_count_station.xq | 28 ++++++ .../noaa-ghcn-daily/queries/q05_sensor.xq | 28 ------ .../noaa-ghcn-daily/queries/q05_station.xq | 25 ----- .../noaa-ghcn-daily/queries/q06_count_join.xq | 34 +++++++ .../noaa-ghcn-daily/queries/q06_count_sensor.xq | 29 ++++++ .../queries/q06_count_station.xq | 27 ++++++ .../noaa-ghcn-daily/queries/q06_sensor.xq | 27 ------ .../noaa-ghcn-daily/queries/q06_station.xq | 24 ----- .../noaa-ghcn-daily/queries/q07_count_join.xq | 35 +++++++ .../noaa-ghcn-daily/queries/q07_count_tmax.xq | 28 ++++++ .../noaa-ghcn-daily/queries/q07_count_tmin.xq | 28 ++++++ .../noaa-ghcn-daily/queries/q07_tmax.xq | 26 ------ .../noaa-ghcn-daily/queries/q07_tmin.xq | 26 ------ .../noaa-ghcn-daily/queries/sensor_count.xq | 24 ----- .../noaa-ghcn-daily/queries/station_count.xq | 24 ----- .../scripts/benchmark_logging.properties | 1 + .../noaa-ghcn-daily/scripts/run_benchmark.sh | 3 +- .../noaa-ghcn-daily/scripts/run_mrql_tests.sh | 42 --------- .../scripts/weather_benchmark.py | 10 +- .../scripts/weather_data_files.py | 14 +-- .../src/main/resources/util/diff_xml_files.py | 97 ++++++++++++++++++++ .../src/main/resources/util/list_xml_files.py | 72 +++++++++++++++ .../src/main/resources/util/log_top.sh | 35 ------- .../src/main/resources/util/merge_xml_files.py | 2 +- .../java/org/apache/vxquery/cli/VXQuery.java | 1 + .../RemoveUnusedSortDistinctNodesRule.java | 19 +--- .../rules/util/CardinalityRuleToolbox.java | 13 --- .../rewriter/rules/util/OperatorToolbox.java | 72 --------------- .../vxquery/functions/builtin-functions.xml | 1 + .../xmlquery/query/XMLQueryCompiler.java | 2 +- vxquery-server/pom.xml | 4 + .../vxquery/cli/VXQueryClusterShutdown.java | 76 +++++++++++++++ .../src/main/resources/conf/cluster_example.xml | 12 +-- .../src/main/resources/conf/local.xml | 18 ++-- .../main/resources/scripts/cluster_actions.py | 16 +++- .../src/main/resources/scripts/cluster_cli.py | 6 +- .../resources/scripts/cluster_information.py | 27 ++++-- .../src/main/resources/scripts/startcc.sh | 6 +- .../src/main/resources/scripts/startnc.sh | 4 +- .../src/main/resources/scripts/stopcc.sh | 3 +- .../src/main/resources/scripts/stopcluster.sh | 48 ++++++++++ .../src/main/resources/scripts/stopnc.sh | 2 +- 134 files changed, 1681 insertions(+), 1491 deletions(-) ----------------------------------------------------------------------
