Merge branch 'prestonc/benchmark_updates'
* prestonc/benchmark_updates:
Reverted a few changes back to master.
Moved to the latest stable version of Hyracks.
Site updates from master.
fullfill branding requirements - fix issues VXQUERY-118 and VXQUERY-119 - add
"TM" to the project name - add "TM" to the project logo - add apache website
navigation links - add trademark attributions - also: update fluido skin
version to 1.3.1
Removed testing file.
Updated with little changes to improve the benchmark process.
Removed custom frame size from benchmark and found some uncommitted testing
changes.
Fixed a report value.
The next round of benchmark test updates.
Added a disk performance test to help identify the disk speed and parsing
speed.
Updated the queries and benchmark test to make them more consistent and
easier to use.
Added a read me file to the noaa weather data folder.
Updated queries with a station id that is in all datasets.
A collection of changes to the benchmark scripts.
A few fixes to make MRQL queries smoother.
Conflicts:
vxquery-benchmark/src/main/resources/noaa-ghcn-daily/README.md
vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_gsn/q00.mrql
vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_gsn/q01.mrql
vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_gsn/q02.mrql
vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_gsn/q03.mrql
vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_gsn/q04_sensor.mrql
vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_gsn/q04_station.mrql
vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_gsn/q05_sensor.mrql
vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_gsn/q05_station.mrql
vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_gsn/q06_sensor.mrql
vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_gsn/q06_station.mrql
vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_gsn/q07.mrql
vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_gsn/q07_join_count.mrql
vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_gsn/q07_tmax.mrql
vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_gsn/q07_tmin.mrql
vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_hcn/q04.mrql
vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_hcn/q05.mrql
vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_hcn/q06.mrql
vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/saxon/q04.xq
vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/saxon/q05.xq
vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/saxon/q06.xq
vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/run_group_test.sh
vxquery-benchmark/src/main/resources/util/log_top.sh
vxquery-benchmark/src/main/resources/util/merge_xml_files.py
Project: http://git-wip-us.apache.org/repos/asf/vxquery/repo
Commit: http://git-wip-us.apache.org/repos/asf/vxquery/commit/e7ba96b8
Tree: http://git-wip-us.apache.org/repos/asf/vxquery/tree/e7ba96b8
Diff: http://git-wip-us.apache.org/repos/asf/vxquery/diff/e7ba96b8
Branch: refs/heads/master
Commit: e7ba96b81a2673634b21c78cde768e1dfb4c1163
Parents: e6703b2 cbc5a19
Author: Preston Carman <[email protected]>
Authored: Thu Aug 14 10:00:24 2014 -0700
Committer: Preston Carman <[email protected]>
Committed: Thu Aug 14 10:00:24 2014 -0700
----------------------------------------------------------------------
pom.xml | 2 +-
vxquery-benchmark/pom.xml | 21 ++
.../main/resources/noaa-ghcn-daily/README.md | 40 ++++
.../other_systems/mrql_gsn/q00.mrql | 7 +
.../other_systems/mrql_gsn/q01.mrql | 5 +
.../other_systems/mrql_gsn/q02.mrql | 8 +
.../other_systems/mrql_gsn/q03.mrql | 6 +
.../other_systems/mrql_gsn/q04.mrql | 8 +
.../other_systems/mrql_gsn/q04_sensor.mrql | 5 +
.../other_systems/mrql_gsn/q04_station.mrql | 8 +
.../other_systems/mrql_gsn/q05.mrql | 11 +
.../other_systems/mrql_gsn/q05_sensor.mrql | 7 +
.../other_systems/mrql_gsn/q05_station.mrql | 7 +
.../other_systems/mrql_gsn/q06.mrql | 10 +
.../other_systems/mrql_gsn/q06_sensor.mrql | 7 +
.../other_systems/mrql_gsn/q06_station.mrql | 7 +
.../other_systems/mrql_gsn/q07.mrql | 10 +
.../other_systems/mrql_gsn/q07_join_count.mrql | 10 +
.../other_systems/mrql_gsn/q07_tmax.mrql | 6 +
.../other_systems/mrql_gsn/q07_tmin.mrql | 6 +
.../other_systems/mrql_hcn/q00.mrql | 7 +
.../other_systems/mrql_hcn/q01.mrql | 5 +
.../other_systems/mrql_hcn/q02.mrql | 8 +
.../other_systems/mrql_hcn/q03.mrql | 6 +
.../other_systems/mrql_hcn/q04.mrql | 8 +
.../other_systems/mrql_hcn/q04_sensor.mrql | 5 +
.../other_systems/mrql_hcn/q04_station.mrql | 8 +
.../other_systems/mrql_hcn/q05.mrql | 11 +
.../other_systems/mrql_hcn/q05_sensor.mrql | 7 +
.../other_systems/mrql_hcn/q05_station.mrql | 7 +
.../other_systems/mrql_hcn/q06.mrql | 12 ++
.../other_systems/mrql_hcn/q06_sensor.mrql | 7 +
.../other_systems/mrql_hcn/q06_station.mrql | 7 +
.../other_systems/mrql_hcn/q07.mrql | 10 +
.../other_systems/mrql_hcn/q07_join_count.mrql | 10 +
.../other_systems/mrql_hcn/q07_tmax.mrql | 6 +
.../other_systems/mrql_hcn/q07_tmin.mrql | 6 +
.../other_systems/mrql_test/q00.mrql | 7 +
.../other_systems/mrql_test/q01.mrql | 5 +
.../other_systems/mrql_test/q02.mrql | 8 +
.../other_systems/mrql_test/q03.mrql | 6 +
.../other_systems/mrql_test/q04.mrql | 8 +
.../other_systems/mrql_test/q05.mrql | 11 +
.../other_systems/mrql_test/q06.mrql | 11 +
.../other_systems/mrql_test/q07.mrql | 10 +
.../noaa-ghcn-daily/other_systems/saxon/q04.xq | 13 ++
.../noaa-ghcn-daily/other_systems/saxon/q05.xq | 16 ++
.../noaa-ghcn-daily/other_systems/saxon/q06.xq | 13 ++
.../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 | 21 +-
.../scripts/run_benchmark_cluster.sh | 74 ++++---
.../noaa-ghcn-daily/scripts/run_group_test.sh | 51 +++++
.../noaa-ghcn-daily/scripts/run_mrql_tests.sh | 42 ++++
.../scripts/weather_benchmark.py | 180 ++++++++++++----
.../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 -----
.../src/main/resources/util/log_top.sh | 17 ++
.../src/main/resources/util/merge_xml_files.py | 88 ++++++++
.../java/org/apache/vxquery/cli/VXQuery.java | 27 ++-
.../VXQueryCollectionOperatorDescriptor.java | 2 +-
.../metadata/VXQueryMetadataProvider.java | 26 ++-
.../org/apache/vxquery/xmlparser/XMLParser.java | 23 +-
vxquery-xtest/pom.xml | 41 +++-
.../apache/vxquery/xtest/TestRunnerFactory.java | 3 -
.../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 | 17 ++
.../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 | 18 ++
.../main/resources/scripts/run_thread_test.sh | 67 ++++++
87 files changed, 2083 insertions(+), 482 deletions(-)
----------------------------------------------------------------------
