Slight changes to increase number of records in join.
Project: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/commit/0b1033fa Tree: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/tree/0b1033fa Diff: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/diff/0b1033fa Branch: refs/heads/prestonc/hash_join Commit: 0b1033fa16fd59fbba59ad1364c1eb3a43fa57a4 Parents: 3171202 Author: Preston Carman <[email protected]> Authored: Fri Mar 14 22:55:46 2014 -0700 Committer: Preston Carman <[email protected]> Committed: Tue Apr 1 20:56:24 2014 -0700 ---------------------------------------------------------------------- .../src/main/resources/noaa-ghcn-daily/queries/q07.xq | 8 ++++---- .../src/main/resources/noaa-ghcn-daily/queries/q07_sensor.xq | 2 +- .../resources/noaa-ghcn-daily/scripts/weather_benchmark.py | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/0b1033fa/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/queries/q07.xq ---------------------------------------------------------------------- diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/queries/q07.xq b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/queries/q07.xq index 6ed194d..573a3a3 100644 --- a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/queries/q07.xq +++ b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/queries/q07.xq @@ -1,6 +1,6 @@ (: XQuery Join Query :) -(: Find the highest recorded temperature (TMAX) for each station on :) -(: 2000-01-01. :) +(: Find the highest recorded temperature (TMAX) for each station for each :) +(: day over the year 2000. :) let $station_collection := "/tmp/1.0_partition_ghcnd_all_xml/stations" for $s in collection($station_collection)/stationCollection/station @@ -9,5 +9,5 @@ for $r in collection($sensor_collection)/dataCollection/data where $s/id eq $r/station and $r/dataType eq "TMAX" - and xs:dateTime(fn:data($r/date)) eq xs:dateTime("2000-01-01T00:00:00.000") -return ($s/displayName, $r/value) \ No newline at end of file + and fn:year-from-dateTime(xs:dateTime(fn:data($r/date))) eq 2000 +return ($s/displayName, $r/date, $r/value) \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/0b1033fa/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/queries/q07_sensor.xq ---------------------------------------------------------------------- diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/queries/q07_sensor.xq b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/queries/q07_sensor.xq index 254c879..e8eb64a 100644 --- a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/queries/q07_sensor.xq +++ b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/queries/q07_sensor.xq @@ -5,6 +5,6 @@ count( for $r in collection($sensor_collection)/dataCollection/data where $r/dataType eq "TMAX" - and xs:dateTime(fn:data($r/date)) eq xs:dateTime("2000-01-01T00:00:00.000") + and fn:year-from-dateTime(xs:dateTime(fn:data($r/date))) eq 2000 return $r ) \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/0b1033fa/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/weather_benchmark.py ---------------------------------------------------------------------- diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/weather_benchmark.py b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/weather_benchmark.py index 0500de3..6374d38 100644 --- a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/weather_benchmark.py +++ b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/weather_benchmark.py @@ -34,8 +34,8 @@ class WeatherBenchmark: QUERY_REPLACEMENT_KEY = "/tmp/1.0_partition_ghcnd_all_xml/" QUERY_MASTER_FOLDER = "../queries/" - QUERY_FILE_LIST = ["q00.xq", "q01.xq", "q02.xq", "q03.xq", "q04.xq", "q05.xq", "q06.xq"] - QUERY_UTILITY_LIST = ["sensor_count.xq", "station_count.xq", "q04_sensor.xq", "q04_station.xq", "q05_sensor.xq", "q05_station.xq", "q06_sensor.xq"] + QUERY_FILE_LIST = ["q00.xq", "q01.xq", "q02.xq", "q03.xq", "q04.xq", "q05.xq", "q06.xq", "q07.xq"] + QUERY_UTILITY_LIST = ["sensor_count.xq", "station_count.xq", "q04_sensor.xq", "q04_station.xq", "q05_sensor.xq", "q05_station.xq", "q06_tmin.xq", "q06_tmax.xq", "q07_sensor.xq", "q07_station.xq"] BENCHMARK_LOCAL_TESTS = ["local_speed_up", "local_batch_scale_out"] BENCHMARK_CLUSTER_TESTS = ["speed_up", "batch_scale_out"] QUERY_COLLECTIONS = ["sensors", "stations"]
