You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@vxquery.apache.org by ti...@apache.org on 2014/09/08 01:05:36 UTC
[23/50] [abbrv] git commit: Updated the queries and benchmark test to
make them more consistent and easier to use.
Updated the queries and benchmark test to make them more consistent and easier to use.
Project: http://git-wip-us.apache.org/repos/asf/vxquery/repo
Commit: http://git-wip-us.apache.org/repos/asf/vxquery/commit/5f72282e
Tree: http://git-wip-us.apache.org/repos/asf/vxquery/tree/5f72282e
Diff: http://git-wip-us.apache.org/repos/asf/vxquery/diff/5f72282e
Branch: refs/heads/site
Commit: 5f72282e2548cc91d0bf24a6e4276272f150344c
Parents: d7772ec
Author: Preston Carman <pr...@apache.org>
Authored: Wed Jul 9 18:26:30 2014 -0700
Committer: Preston Carman <pr...@apache.org>
Committed: Wed Jul 9 18:26:30 2014 -0700
----------------------------------------------------------------------
.../noaa-ghcn-daily/other_systems/mrql/q00.mrql | 7 -----
.../noaa-ghcn-daily/other_systems/mrql/q01.mrql | 5 ----
.../noaa-ghcn-daily/other_systems/mrql/q02.mrql | 8 ------
.../noaa-ghcn-daily/other_systems/mrql/q03.mrql | 6 ----
.../noaa-ghcn-daily/other_systems/mrql/q04.mrql | 8 ------
.../other_systems/mrql/q04_sensor.mrql | 5 ----
.../other_systems/mrql/q04_station.mrql | 8 ------
.../noaa-ghcn-daily/other_systems/mrql/q05.mrql | 11 --------
.../other_systems/mrql/q05_sensor.mrql | 7 -----
.../other_systems/mrql/q05_station.mrql | 7 -----
.../noaa-ghcn-daily/other_systems/mrql/q06.mrql | 12 --------
.../other_systems/mrql/q06_sensor.mrql | 7 -----
.../other_systems/mrql/q06_station.mrql | 7 -----
.../noaa-ghcn-daily/other_systems/mrql/q07.mrql | 11 --------
.../other_systems/mrql/q07_join_count.mrql | 10 -------
.../other_systems/mrql/q07_tmax.mrql | 6 ----
.../other_systems/mrql/q07_tmin.mrql | 6 ----
.../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 | 12 ++++++++
.../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 ++++
.../noaa-ghcn-daily/other_systems/saxon/q04.xq | 8 +++---
.../noaa-ghcn-daily/other_systems/saxon/q05.xq | 8 +++---
.../noaa-ghcn-daily/other_systems/saxon/q06.xq | 6 ++--
.../noaa-ghcn-daily/scripts/run_benchmark.sh | 10 +++++--
.../scripts/run_benchmark_cluster.sh | 10 +++++--
.../noaa-ghcn-daily/scripts/run_group_test.sh | 17 +++++++++---
.../noaa-ghcn-daily/scripts/run_mrql_test.sh | 29 --------------------
.../noaa-ghcn-daily/scripts/run_mrql_tests.sh | 15 +++++++---
.../src/main/resources/util/log_top.sh | 4 +--
60 files changed, 313 insertions(+), 185 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/vxquery/blob/5f72282e/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql/q00.mrql
----------------------------------------------------------------------
diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql/q00.mrql b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql/q00.mrql
deleted file mode 100644
index 538df72..0000000
--- a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql/q00.mrql
+++ /dev/null
@@ -1,7 +0,0 @@
-select (r)
-from r in source(xml, "sample_xml/gsn_sensors.xml", {"data"})
-where text(r.station) = "GHCND:USW00012836"
- and toInt(substring(text(r.date), 0, 4)) >= 2003
- and toInt(substring(text(r.date), 5, 7)) = 12
- and toInt(substring(text(r.date), 8, 10)) = 25
-;
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/vxquery/blob/5f72282e/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql/q01.mrql
----------------------------------------------------------------------
diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql/q01.mrql b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql/q01.mrql
deleted file mode 100644
index 5e8de9b..0000000
--- a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql/q01.mrql
+++ /dev/null
@@ -1,5 +0,0 @@
-select (r)
-from r in source(xml, "sample_xml/gsn_sensors.xml", {"data"})
-where text(r.dataType) = "AWND"
- and toInt(text(r.value)) > 491.744
-;
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/vxquery/blob/5f72282e/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql/q02.mrql
----------------------------------------------------------------------
diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql/q02.mrql b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql/q02.mrql
deleted file mode 100644
index b8cd451..0000000
--- a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql/q02.mrql
+++ /dev/null
@@ -1,8 +0,0 @@
-sum(
- select (toInt(text(r.value)))
- from r in source(xml, "sample_xml/gsn_sensors.xml", {"data"})
- where text(r.station) = "GHCND:USW00014771"
- and toInt(substring(text(r.date), 0, 4)) = 1999
- and text(r.dataType) = "PRCP"
-) / 10
-;
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/vxquery/blob/5f72282e/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql/q03.mrql
----------------------------------------------------------------------
diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql/q03.mrql b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql/q03.mrql
deleted file mode 100644
index 981e4c3..0000000
--- a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql/q03.mrql
+++ /dev/null
@@ -1,6 +0,0 @@
-max(
- select (toInt(text(r.value)))
- from r in source(xml, "sample_xml/gsn_sensors.xml", {"data"})
- where text(r.dataType) = "TMAX"
-) / 10
-;
http://git-wip-us.apache.org/repos/asf/vxquery/blob/5f72282e/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql/q04.mrql
----------------------------------------------------------------------
diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql/q04.mrql b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql/q04.mrql
deleted file mode 100644
index 7d11b49..0000000
--- a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql/q04.mrql
+++ /dev/null
@@ -1,8 +0,0 @@
-select (r)
-from r in source(xml, "sample_xml/gsn_sensors.xml", {"data"}),
- t in source(xml, "sample_xml/gsn_stations.xml", {"station"}),
- l in t.locationLabels
-where text(t.id) = text(r.station)
- and text(r.date) = "1976-07-04T00:00:00.000"
- and text(l.displayName) = "WASHINGTON"
-;
http://git-wip-us.apache.org/repos/asf/vxquery/blob/5f72282e/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql/q04_sensor.mrql
----------------------------------------------------------------------
diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql/q04_sensor.mrql b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql/q04_sensor.mrql
deleted file mode 100644
index bf30e52..0000000
--- a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql/q04_sensor.mrql
+++ /dev/null
@@ -1,5 +0,0 @@
-select (r)
-from r in source(xml, "sample_xml/gsn_sensors.xml", {"data"})
-where text(r.date) = "1976-07-04T00:00:00.000"
- and text(r.dataType) = "TMAX"
-;
http://git-wip-us.apache.org/repos/asf/vxquery/blob/5f72282e/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql/q04_station.mrql
----------------------------------------------------------------------
diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql/q04_station.mrql b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql/q04_station.mrql
deleted file mode 100644
index fdd6fba..0000000
--- a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql/q04_station.mrql
+++ /dev/null
@@ -1,8 +0,0 @@
-count(
- select (r)
- from r in source(xml, "sample_xml/gsn_sensors.xml", {"data"}),
- t in source(xml, "sample_xml/gsn_stations.xml", {"station"}),
- l in t.locationLabels
- where text(l.displayName) = "WASHINGTON"
-)
-;
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/vxquery/blob/5f72282e/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql/q05.mrql
----------------------------------------------------------------------
diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql/q05.mrql b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql/q05.mrql
deleted file mode 100644
index 5b940f3..0000000
--- a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql/q05.mrql
+++ /dev/null
@@ -1,11 +0,0 @@
-min(
- select (toInt(text(r.value)))
- from r in source(xml, "sample_xml/gsn_sensors.xml", {"data"}),
- t in source(xml, "sample_xml/gsn_stations.xml", {"station"}),
- l in t.locationLabels
- where text(t.id) = text(r.station)
- and toInt(substring(text(r.date), 0, 4)) = 2001
- and text(r.dataType) = "TMIN"
- and text(l.id) = "FIPS:US"
-) / 10
-;
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/vxquery/blob/5f72282e/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql/q05_sensor.mrql
----------------------------------------------------------------------
diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql/q05_sensor.mrql b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql/q05_sensor.mrql
deleted file mode 100644
index 232b07b..0000000
--- a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql/q05_sensor.mrql
+++ /dev/null
@@ -1,7 +0,0 @@
-count(
- select (toInt(text(r.value)))
- from r in source(xml, "sample_xml/gsn_sensors.xml", {"data"})
- where toInt(substring(text(r.date), 0, 4)) = 2001
- and text(r.dataType) = "TMIN"
-)
-;
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/vxquery/blob/5f72282e/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql/q05_station.mrql
----------------------------------------------------------------------
diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql/q05_station.mrql b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql/q05_station.mrql
deleted file mode 100644
index b47aeef..0000000
--- a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql/q05_station.mrql
+++ /dev/null
@@ -1,7 +0,0 @@
-count(
- select (t)
- from t in source(xml, "sample_xml/gsn_stations.xml", {"station"}),
- l in t.locationLabels
- where text(l.id) = "FIPS:US"
-)
-;
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/vxquery/blob/5f72282e/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql/q06.mrql
----------------------------------------------------------------------
diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql/q06.mrql b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql/q06.mrql
deleted file mode 100644
index f84f803..0000000
--- a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql/q06.mrql
+++ /dev/null
@@ -1,12 +0,0 @@
-select (n, d, v)
-from r in source(xml, "sample_xml/gsn_sensors.xml", {"data"}),
- d in r.date,
- v in r.value,
- t in source(xml, "sample_xml/gsn_stations.xml", {"station"}),
- n in t.displayName,
- l in t.locationLabels
-where text(t.id) = text(r.station)
- and toInt(substring(text(d), 0, 4)) = 2000
- and text(r.dataType) = "TMAX"
- and text(l.displayName) = "WASHINGTON"
-;
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/vxquery/blob/5f72282e/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql/q06_sensor.mrql
----------------------------------------------------------------------
diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql/q06_sensor.mrql b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql/q06_sensor.mrql
deleted file mode 100644
index 5050654..0000000
--- a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql/q06_sensor.mrql
+++ /dev/null
@@ -1,7 +0,0 @@
-count(
- select (r.date, r.value)
- from r in source(xml, "sample_xml/gsn_sensors.xml", {"data"})
- where toInt(substring(text(r.date), 0, 4)) = 2000
- and text(r.dataType) = "TMAX"
-)
-;
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/vxquery/blob/5f72282e/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql/q06_station.mrql
----------------------------------------------------------------------
diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql/q06_station.mrql b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql/q06_station.mrql
deleted file mode 100644
index 78e3297..0000000
--- a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql/q06_station.mrql
+++ /dev/null
@@ -1,7 +0,0 @@
-count(
- select (t.displayName)
- from t in source(xml, "sample_xml/gsn_stations.xml", {"station"}),
- l in t.locationLabels
- where text(l.displayName) = "WASHINGTON"
-)
-;
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/vxquery/blob/5f72282e/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql/q07.mrql
----------------------------------------------------------------------
diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql/q07.mrql b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql/q07.mrql
deleted file mode 100644
index 40662dd..0000000
--- a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql/q07.mrql
+++ /dev/null
@@ -1,11 +0,0 @@
-avg(
- select (toInt(text(rtmax.value))-toInt(text(rtmin.value)))
- from rtmax in source(xml, "sample_xml/gsn_sensors.xml", {"data"}),
- rtmin in source(xml, "sample_xml/gsn_sensors.xml", {"data"})
- where text(rtmax.date) = text(rtmin.date)
- and text(rtmax.station) = text(rtmin.station)
- and text(rtmax.dataType) = "TMAX"
- and text(rtmin.dataType) = "TMIN"
-) / 10
-;
-
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/vxquery/blob/5f72282e/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql/q07_join_count.mrql
----------------------------------------------------------------------
diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql/q07_join_count.mrql b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql/q07_join_count.mrql
deleted file mode 100644
index 2f41db1..0000000
--- a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql/q07_join_count.mrql
+++ /dev/null
@@ -1,10 +0,0 @@
-count(
- select (toInt(text(rtmax.value))-toInt(text(rtmin.value)))
- from rtmax in source(xml, "sample_xml/gsn_sensors.xml", {"data"}),
- rtmin in source(xml, "sample_xml/gsn_sensors.xml", {"data"})
- where text(rtmax.date) = text(rtmin.date)
- and text(rtmax.station) = text(rtmin.station)
- and text(r.dataType) = "TMAX"
- and text(r.dataType) = "TMIN"
-)
-;
http://git-wip-us.apache.org/repos/asf/vxquery/blob/5f72282e/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql/q07_tmax.mrql
----------------------------------------------------------------------
diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql/q07_tmax.mrql b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql/q07_tmax.mrql
deleted file mode 100644
index 3db5107..0000000
--- a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql/q07_tmax.mrql
+++ /dev/null
@@ -1,6 +0,0 @@
-count(
- select (rtmax)
- from rtmax in source(xml, "sample_xml/gsn_sensors.xml", {"data"})
- where text(r.dataType) = "TMAX"
-)
-;
http://git-wip-us.apache.org/repos/asf/vxquery/blob/5f72282e/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql/q07_tmin.mrql
----------------------------------------------------------------------
diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql/q07_tmin.mrql b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql/q07_tmin.mrql
deleted file mode 100644
index 9c93116..0000000
--- a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql/q07_tmin.mrql
+++ /dev/null
@@ -1,6 +0,0 @@
-count(
- select (rtmin)
- from rtmin in source(xml, "sample_xml/gsn_sensors.xml", {"data"})
- where text(r.dataType) = "TMIN"
-)
-;
http://git-wip-us.apache.org/repos/asf/vxquery/blob/5f72282e/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_gsn/q00.mrql
----------------------------------------------------------------------
diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_gsn/q00.mrql b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_gsn/q00.mrql
new file mode 100644
index 0000000..538df72
--- /dev/null
+++ b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_gsn/q00.mrql
@@ -0,0 +1,7 @@
+select (r)
+from r in source(xml, "sample_xml/gsn_sensors.xml", {"data"})
+where text(r.station) = "GHCND:USW00012836"
+ and toInt(substring(text(r.date), 0, 4)) >= 2003
+ and toInt(substring(text(r.date), 5, 7)) = 12
+ and toInt(substring(text(r.date), 8, 10)) = 25
+;
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/vxquery/blob/5f72282e/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_gsn/q01.mrql
----------------------------------------------------------------------
diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_gsn/q01.mrql b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_gsn/q01.mrql
new file mode 100644
index 0000000..5e8de9b
--- /dev/null
+++ b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_gsn/q01.mrql
@@ -0,0 +1,5 @@
+select (r)
+from r in source(xml, "sample_xml/gsn_sensors.xml", {"data"})
+where text(r.dataType) = "AWND"
+ and toInt(text(r.value)) > 491.744
+;
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/vxquery/blob/5f72282e/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_gsn/q02.mrql
----------------------------------------------------------------------
diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_gsn/q02.mrql b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_gsn/q02.mrql
new file mode 100644
index 0000000..b8cd451
--- /dev/null
+++ b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_gsn/q02.mrql
@@ -0,0 +1,8 @@
+sum(
+ select (toInt(text(r.value)))
+ from r in source(xml, "sample_xml/gsn_sensors.xml", {"data"})
+ where text(r.station) = "GHCND:USW00014771"
+ and toInt(substring(text(r.date), 0, 4)) = 1999
+ and text(r.dataType) = "PRCP"
+) / 10
+;
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/vxquery/blob/5f72282e/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_gsn/q03.mrql
----------------------------------------------------------------------
diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_gsn/q03.mrql b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_gsn/q03.mrql
new file mode 100644
index 0000000..981e4c3
--- /dev/null
+++ b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_gsn/q03.mrql
@@ -0,0 +1,6 @@
+max(
+ select (toInt(text(r.value)))
+ from r in source(xml, "sample_xml/gsn_sensors.xml", {"data"})
+ where text(r.dataType) = "TMAX"
+) / 10
+;
http://git-wip-us.apache.org/repos/asf/vxquery/blob/5f72282e/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_gsn/q04.mrql
----------------------------------------------------------------------
diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_gsn/q04.mrql b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_gsn/q04.mrql
new file mode 100644
index 0000000..938f6d8
--- /dev/null
+++ b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_gsn/q04.mrql
@@ -0,0 +1,8 @@
+select (r)
+from sensors in source(xml, "sample_xml/gsn_sensors.xml", {"data"}),
+ stations in source(xml, "sample_xml/gsn_stations.xml", {"station"}),
+ l in stations.locationLabels
+where text(stations.id) = text(sensors.station)
+ and text(sensors.date) = "1976-07-04T00:00:00.000"
+ and text(l.displayName) = "WASHINGTON"
+;
http://git-wip-us.apache.org/repos/asf/vxquery/blob/5f72282e/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_gsn/q04_sensor.mrql
----------------------------------------------------------------------
diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_gsn/q04_sensor.mrql b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_gsn/q04_sensor.mrql
new file mode 100644
index 0000000..bf30e52
--- /dev/null
+++ b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_gsn/q04_sensor.mrql
@@ -0,0 +1,5 @@
+select (r)
+from r in source(xml, "sample_xml/gsn_sensors.xml", {"data"})
+where text(r.date) = "1976-07-04T00:00:00.000"
+ and text(r.dataType) = "TMAX"
+;
http://git-wip-us.apache.org/repos/asf/vxquery/blob/5f72282e/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_gsn/q04_station.mrql
----------------------------------------------------------------------
diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_gsn/q04_station.mrql b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_gsn/q04_station.mrql
new file mode 100644
index 0000000..fdd6fba
--- /dev/null
+++ b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_gsn/q04_station.mrql
@@ -0,0 +1,8 @@
+count(
+ select (r)
+ from r in source(xml, "sample_xml/gsn_sensors.xml", {"data"}),
+ t in source(xml, "sample_xml/gsn_stations.xml", {"station"}),
+ l in t.locationLabels
+ where text(l.displayName) = "WASHINGTON"
+)
+;
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/vxquery/blob/5f72282e/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_gsn/q05.mrql
----------------------------------------------------------------------
diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_gsn/q05.mrql b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_gsn/q05.mrql
new file mode 100644
index 0000000..be9edf0
--- /dev/null
+++ b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_gsn/q05.mrql
@@ -0,0 +1,11 @@
+min(
+ select (toInt(text(sensors.value)))
+ from sensors in source(xml, "sample_xml/gsn_sensors.xml", {"data"}),
+ stations in source(xml, "sample_xml/gsn_stations.xml", {"station"}),
+ l in stations.locationLabels
+ where text(stations.id) = text(sensors.station)
+ and toInt(substring(text(sensors.date), 0, 4)) = 2001
+ and text(sensors.dataType) = "TMIN"
+ and text(l.id) = "FIPS:US"
+) / 10
+;
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/vxquery/blob/5f72282e/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_gsn/q05_sensor.mrql
----------------------------------------------------------------------
diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_gsn/q05_sensor.mrql b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_gsn/q05_sensor.mrql
new file mode 100644
index 0000000..f0c1490
--- /dev/null
+++ b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_gsn/q05_sensor.mrql
@@ -0,0 +1,7 @@
+count(
+ select (toInt(text(r.value)))
+ from r in source(xml, "sample_xml/gsn_sensors.xml", {"data"})
+ where toInt(substring(text(r.date), 0, 4)) = 2001
+ and text(r.dataType) = "TMIN"
+)
+;
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/vxquery/blob/5f72282e/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_gsn/q05_station.mrql
----------------------------------------------------------------------
diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_gsn/q05_station.mrql b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_gsn/q05_station.mrql
new file mode 100644
index 0000000..b47aeef
--- /dev/null
+++ b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_gsn/q05_station.mrql
@@ -0,0 +1,7 @@
+count(
+ select (t)
+ from t in source(xml, "sample_xml/gsn_stations.xml", {"station"}),
+ l in t.locationLabels
+ where text(l.id) = "FIPS:US"
+)
+;
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/vxquery/blob/5f72282e/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_gsn/q06.mrql
----------------------------------------------------------------------
diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_gsn/q06.mrql b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_gsn/q06.mrql
new file mode 100644
index 0000000..c4ab3da
--- /dev/null
+++ b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_gsn/q06.mrql
@@ -0,0 +1,12 @@
+select (n, d, v)
+from sensors in source(xml, "sample_xml/gsn_sensors.xml", {"data"}),
+ d in sensors.date,
+ v in sensors.value,
+ stations in source(xml, "sample_xml/gsn_stations.xml", {"station"}),
+ n in stations.displayName,
+ l in stations.locationLabels
+where text(stations.id) = text(sensors.station)
+ and toInt(substring(text(d), 0, 4)) = 2000
+ and text(sensors.dataType) = "TMAX"
+ and text(l.displayName) = "WASHINGTON"
+;
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/vxquery/blob/5f72282e/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_gsn/q06_sensor.mrql
----------------------------------------------------------------------
diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_gsn/q06_sensor.mrql b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_gsn/q06_sensor.mrql
new file mode 100644
index 0000000..5050654
--- /dev/null
+++ b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_gsn/q06_sensor.mrql
@@ -0,0 +1,7 @@
+count(
+ select (r.date, r.value)
+ from r in source(xml, "sample_xml/gsn_sensors.xml", {"data"})
+ where toInt(substring(text(r.date), 0, 4)) = 2000
+ and text(r.dataType) = "TMAX"
+)
+;
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/vxquery/blob/5f72282e/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_gsn/q06_station.mrql
----------------------------------------------------------------------
diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_gsn/q06_station.mrql b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_gsn/q06_station.mrql
new file mode 100644
index 0000000..78e3297
--- /dev/null
+++ b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_gsn/q06_station.mrql
@@ -0,0 +1,7 @@
+count(
+ select (t.displayName)
+ from t in source(xml, "sample_xml/gsn_stations.xml", {"station"}),
+ l in t.locationLabels
+ where text(l.displayName) = "WASHINGTON"
+)
+;
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/vxquery/blob/5f72282e/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_gsn/q07.mrql
----------------------------------------------------------------------
diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_gsn/q07.mrql b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_gsn/q07.mrql
new file mode 100644
index 0000000..51efa5d
--- /dev/null
+++ b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_gsn/q07.mrql
@@ -0,0 +1,10 @@
+avg(
+ select (toInt(text(rtmax.value))-toInt(text(rtmin.value)))
+ from rtmax in source(xml, "sample_xml/gsn_sensors.xml", {"data"}),
+ rtmin in source(xml, "sample_xml/gsn_sensors.xml", {"data"})
+ where text(rtmax.date) = text(rtmin.date)
+ and text(rtmax.station) = text(rtmin.station)
+ and text(rtmax.dataType) = "TMAX"
+ and text(rtmin.dataType) = "TMIN"
+) / 10
+;
http://git-wip-us.apache.org/repos/asf/vxquery/blob/5f72282e/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_gsn/q07_join_count.mrql
----------------------------------------------------------------------
diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_gsn/q07_join_count.mrql b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_gsn/q07_join_count.mrql
new file mode 100644
index 0000000..2f41db1
--- /dev/null
+++ b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_gsn/q07_join_count.mrql
@@ -0,0 +1,10 @@
+count(
+ select (toInt(text(rtmax.value))-toInt(text(rtmin.value)))
+ from rtmax in source(xml, "sample_xml/gsn_sensors.xml", {"data"}),
+ rtmin in source(xml, "sample_xml/gsn_sensors.xml", {"data"})
+ where text(rtmax.date) = text(rtmin.date)
+ and text(rtmax.station) = text(rtmin.station)
+ and text(r.dataType) = "TMAX"
+ and text(r.dataType) = "TMIN"
+)
+;
http://git-wip-us.apache.org/repos/asf/vxquery/blob/5f72282e/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_gsn/q07_tmax.mrql
----------------------------------------------------------------------
diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_gsn/q07_tmax.mrql b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_gsn/q07_tmax.mrql
new file mode 100644
index 0000000..3db5107
--- /dev/null
+++ b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_gsn/q07_tmax.mrql
@@ -0,0 +1,6 @@
+count(
+ select (rtmax)
+ from rtmax in source(xml, "sample_xml/gsn_sensors.xml", {"data"})
+ where text(r.dataType) = "TMAX"
+)
+;
http://git-wip-us.apache.org/repos/asf/vxquery/blob/5f72282e/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_gsn/q07_tmin.mrql
----------------------------------------------------------------------
diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_gsn/q07_tmin.mrql b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_gsn/q07_tmin.mrql
new file mode 100644
index 0000000..9c93116
--- /dev/null
+++ b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_gsn/q07_tmin.mrql
@@ -0,0 +1,6 @@
+count(
+ select (rtmin)
+ from rtmin in source(xml, "sample_xml/gsn_sensors.xml", {"data"})
+ where text(r.dataType) = "TMIN"
+)
+;
http://git-wip-us.apache.org/repos/asf/vxquery/blob/5f72282e/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_hcn/q00.mrql
----------------------------------------------------------------------
diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_hcn/q00.mrql b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_hcn/q00.mrql
new file mode 100644
index 0000000..0c1e727
--- /dev/null
+++ b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_hcn/q00.mrql
@@ -0,0 +1,7 @@
+select (r)
+from r in source(xml, "sample_xml/hcn_sensors.xml", {"data"})
+where text(r.station) = "GHCND:USW00012836"
+ and toInt(substring(text(r.date), 0, 4)) >= 2003
+ and toInt(substring(text(r.date), 5, 7)) = 12
+ and toInt(substring(text(r.date), 8, 10)) = 25
+;
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/vxquery/blob/5f72282e/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_hcn/q01.mrql
----------------------------------------------------------------------
diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_hcn/q01.mrql b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_hcn/q01.mrql
new file mode 100644
index 0000000..4bfa786
--- /dev/null
+++ b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_hcn/q01.mrql
@@ -0,0 +1,5 @@
+select (r)
+from r in source(xml, "sample_xml/hcn_sensors.xml", {"data"})
+where text(r.dataType) = "AWND"
+ and toInt(text(r.value)) > 491.744
+;
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/vxquery/blob/5f72282e/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_hcn/q02.mrql
----------------------------------------------------------------------
diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_hcn/q02.mrql b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_hcn/q02.mrql
new file mode 100644
index 0000000..3a9d142
--- /dev/null
+++ b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_hcn/q02.mrql
@@ -0,0 +1,8 @@
+sum(
+ select (toInt(text(r.value)))
+ from r in source(xml, "sample_xml/hcn_sensors.xml", {"data"})
+ where text(r.station) = "GHCND:USW00014771"
+ and toInt(substring(text(r.date), 0, 4)) = 1999
+ and text(r.dataType) = "PRCP"
+) / 10
+;
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/vxquery/blob/5f72282e/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_hcn/q03.mrql
----------------------------------------------------------------------
diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_hcn/q03.mrql b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_hcn/q03.mrql
new file mode 100644
index 0000000..3fcee93
--- /dev/null
+++ b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_hcn/q03.mrql
@@ -0,0 +1,6 @@
+max(
+ select (toInt(text(r.value)))
+ from r in source(xml, "sample_xml/hcn_sensors.xml", {"data"})
+ where text(r.dataType) = "TMAX"
+) / 10
+;
http://git-wip-us.apache.org/repos/asf/vxquery/blob/5f72282e/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_hcn/q04.mrql
----------------------------------------------------------------------
diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_hcn/q04.mrql b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_hcn/q04.mrql
new file mode 100644
index 0000000..1d9ada6
--- /dev/null
+++ b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_hcn/q04.mrql
@@ -0,0 +1,8 @@
+select (r)
+from r in source(xml, "sample_xml/hcn_sensors.xml", {"data"}),
+ t in source(xml, "sample_xml/hcn_stations.xml", {"station"}),
+ l in t.locationLabels
+where text(t.id) = text(r.station)
+ and text(r.date) = "1976-07-04T00:00:00.000"
+ and text(l.displayName) = "WASHINGTON"
+;
http://git-wip-us.apache.org/repos/asf/vxquery/blob/5f72282e/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_hcn/q04_sensor.mrql
----------------------------------------------------------------------
diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_hcn/q04_sensor.mrql b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_hcn/q04_sensor.mrql
new file mode 100644
index 0000000..2823a3f
--- /dev/null
+++ b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_hcn/q04_sensor.mrql
@@ -0,0 +1,5 @@
+select (r)
+from r in source(xml, "sample_xml/hcn_sensors.xml", {"data"})
+where text(r.date) = "1976-07-04T00:00:00.000"
+ and text(r.dataType) = "TMAX"
+;
http://git-wip-us.apache.org/repos/asf/vxquery/blob/5f72282e/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_hcn/q04_station.mrql
----------------------------------------------------------------------
diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_hcn/q04_station.mrql b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_hcn/q04_station.mrql
new file mode 100644
index 0000000..d362ca8
--- /dev/null
+++ b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_hcn/q04_station.mrql
@@ -0,0 +1,8 @@
+count(
+ select (r)
+ from r in source(xml, "sample_xml/hcn_sensors.xml", {"data"}),
+ t in source(xml, "sample_xml/hcn_stations.xml", {"station"}),
+ l in t.locationLabels
+ where text(l.displayName) = "WASHINGTON"
+)
+;
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/vxquery/blob/5f72282e/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_hcn/q05.mrql
----------------------------------------------------------------------
diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_hcn/q05.mrql b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_hcn/q05.mrql
new file mode 100644
index 0000000..15c2ef2
--- /dev/null
+++ b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_hcn/q05.mrql
@@ -0,0 +1,11 @@
+min(
+ select (toInt(text(r.value)))
+ from r in source(xml, "sample_xml/hcn_sensors.xml", {"data"}),
+ t in source(xml, "sample_xml/hcn_stations.xml", {"station"}),
+ l in t.locationLabels
+ where text(t.id) = text(r.station)
+ and toInt(substring(text(r.date), 0, 4)) = 2001
+ and text(r.dataType) = "TMIN"
+ and text(l.id) = "FIPS:US"
+) / 10
+;
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/vxquery/blob/5f72282e/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_hcn/q05_sensor.mrql
----------------------------------------------------------------------
diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_hcn/q05_sensor.mrql b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_hcn/q05_sensor.mrql
new file mode 100644
index 0000000..a4fa55c
--- /dev/null
+++ b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_hcn/q05_sensor.mrql
@@ -0,0 +1,7 @@
+count(
+ select (toInt(text(r.value)))
+ from r in source(xml, "sample_xml/hcn_sensors.xml", {"data"})
+ where toInt(substring(text(r.date), 0, 4)) = 2001
+ and text(r.dataType) = "TMIN"
+)
+;
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/vxquery/blob/5f72282e/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_hcn/q05_station.mrql
----------------------------------------------------------------------
diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_hcn/q05_station.mrql b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_hcn/q05_station.mrql
new file mode 100644
index 0000000..311e742
--- /dev/null
+++ b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_hcn/q05_station.mrql
@@ -0,0 +1,7 @@
+count(
+ select (t)
+ from t in source(xml, "sample_xml/hcn_stations.xml", {"station"}),
+ l in t.locationLabels
+ where text(l.id) = "FIPS:US"
+)
+;
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/vxquery/blob/5f72282e/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_hcn/q06.mrql
----------------------------------------------------------------------
diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_hcn/q06.mrql b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_hcn/q06.mrql
new file mode 100644
index 0000000..601a72e
--- /dev/null
+++ b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_hcn/q06.mrql
@@ -0,0 +1,12 @@
+select (n, d, v)
+from r in source(xml, "sample_xml/hcn_sensors.xml", {"data"}),
+ d in r.date,
+ v in r.value,
+ t in source(xml, "sample_xml/hcn_stations.xml", {"station"}),
+ n in t.displayName,
+ l in t.locationLabels
+where text(t.id) = text(r.station)
+ and toInt(substring(text(d), 0, 4)) = 2000
+ and text(r.dataType) = "TMAX"
+ and text(l.displayName) = "WASHINGTON"
+;
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/vxquery/blob/5f72282e/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_hcn/q06_sensor.mrql
----------------------------------------------------------------------
diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_hcn/q06_sensor.mrql b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_hcn/q06_sensor.mrql
new file mode 100644
index 0000000..5172bc0
--- /dev/null
+++ b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_hcn/q06_sensor.mrql
@@ -0,0 +1,7 @@
+count(
+ select (r.date, r.value)
+ from r in source(xml, "sample_xml/hcn_sensors.xml", {"data"})
+ where toInt(substring(text(r.date), 0, 4)) = 2000
+ and text(r.dataType) = "TMAX"
+)
+;
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/vxquery/blob/5f72282e/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_hcn/q06_station.mrql
----------------------------------------------------------------------
diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_hcn/q06_station.mrql b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_hcn/q06_station.mrql
new file mode 100644
index 0000000..c38bee3
--- /dev/null
+++ b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_hcn/q06_station.mrql
@@ -0,0 +1,7 @@
+count(
+ select (t.displayName)
+ from t in source(xml, "sample_xml/hcn_stations.xml", {"station"}),
+ l in t.locationLabels
+ where text(l.displayName) = "WASHINGTON"
+)
+;
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/vxquery/blob/5f72282e/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_hcn/q07.mrql
----------------------------------------------------------------------
diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_hcn/q07.mrql b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_hcn/q07.mrql
new file mode 100644
index 0000000..1adf2cc
--- /dev/null
+++ b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_hcn/q07.mrql
@@ -0,0 +1,10 @@
+avg(
+ select (toInt(text(rtmax.value))-toInt(text(rtmin.value)))
+ from rtmax in source(xml, "sample_xml/hcn_sensors.xml", {"data"}),
+ rtmin in source(xml, "sample_xml/hcn_sensors.xml", {"data"})
+ where text(rtmax.date) = text(rtmin.date)
+ and text(rtmax.station) = text(rtmin.station)
+ and text(rtmax.dataType) = "TMAX"
+ and text(rtmin.dataType) = "TMIN"
+) / 10
+;
http://git-wip-us.apache.org/repos/asf/vxquery/blob/5f72282e/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_hcn/q07_join_count.mrql
----------------------------------------------------------------------
diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_hcn/q07_join_count.mrql b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_hcn/q07_join_count.mrql
new file mode 100644
index 0000000..1630a14
--- /dev/null
+++ b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_hcn/q07_join_count.mrql
@@ -0,0 +1,10 @@
+count(
+ select (toInt(text(rtmax.value))-toInt(text(rtmin.value)))
+ from rtmax in source(xml, "sample_xml/hcn_sensors.xml", {"data"}),
+ rtmin in source(xml, "sample_xml/hcn_sensors.xml", {"data"})
+ where text(rtmax.date) = text(rtmin.date)
+ and text(rtmax.station) = text(rtmin.station)
+ and text(r.dataType) = "TMAX"
+ and text(r.dataType) = "TMIN"
+)
+;
http://git-wip-us.apache.org/repos/asf/vxquery/blob/5f72282e/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_hcn/q07_tmax.mrql
----------------------------------------------------------------------
diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_hcn/q07_tmax.mrql b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_hcn/q07_tmax.mrql
new file mode 100644
index 0000000..ab83041
--- /dev/null
+++ b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_hcn/q07_tmax.mrql
@@ -0,0 +1,6 @@
+count(
+ select (rtmax)
+ from rtmax in source(xml, "sample_xml/hcn_sensors.xml", {"data"})
+ where text(r.dataType) = "TMAX"
+)
+;
http://git-wip-us.apache.org/repos/asf/vxquery/blob/5f72282e/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_hcn/q07_tmin.mrql
----------------------------------------------------------------------
diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_hcn/q07_tmin.mrql b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_hcn/q07_tmin.mrql
new file mode 100644
index 0000000..34dc039
--- /dev/null
+++ b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_hcn/q07_tmin.mrql
@@ -0,0 +1,6 @@
+count(
+ select (rtmin)
+ from rtmin in source(xml, "sample_xml/hcn_sensors.xml", {"data"})
+ where text(r.dataType) = "TMIN"
+)
+;
http://git-wip-us.apache.org/repos/asf/vxquery/blob/5f72282e/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/saxon/q04.xq
----------------------------------------------------------------------
diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/saxon/q04.xq b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/saxon/q04.xq
index 09752d1..7b761d6 100644
--- a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/saxon/q04.xq
+++ b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/saxon/q04.xq
@@ -1,11 +1,11 @@
(: XQuery Join Query :)
(: Find all the weather readings for King county for a specific day :)
(: 1976/7/4. :)
-let $collection2 := "../../../../../../../weather_data/dataset-tiny-local/data_links/local_speed_up/d0_p1_i0/sensors/?select=*.xml;recurse=yes"
-for $r in collection($collection2)/root/dataCollection/data
+let $sensor_collection := "../../../../../../../weather_data/dataset-tiny-local/data_links/local_speed_up/d0_p1_i0/sensors/?select=*.xml;recurse=yes"
+for $r in collection($sensor_collection)/root/dataCollection/data
-let $collection1 := "../../../../../../../weather_data/dataset-tiny-local/data_links/local_speed_up/d0_p1_i0/stations/?select=*.xml;recurse=yes"
-for $s in collection($collection1)/root/stationCollection/station
+let $station_collection := "../../../../../../../weather_data/dataset-tiny-local/data_links/local_speed_up/d0_p1_i0/stations/?select=*.xml;recurse=yes"
+for $s in collection($station_collection)/root/stationCollection/station
where $s/id eq $r/station
and (some $x in $s/locationLabels satisfies ($x/type eq "ST" and fn:upper-case(fn:data($x/displayName)) eq "WASHINGTON"))
http://git-wip-us.apache.org/repos/asf/vxquery/blob/5f72282e/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/saxon/q05.xq
----------------------------------------------------------------------
diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/saxon/q05.xq b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/saxon/q05.xq
index eca1c68..394b011 100644
--- a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/saxon/q05.xq
+++ b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/saxon/q05.xq
@@ -2,11 +2,11 @@
(: Find the lowest recorded temperature (TMIN) in the state of Oregon for :)
(: 2001. :)
fn:min(
- let $collection2 := "../../../../../../../weather_data/dataset-tiny-local/data_links/local_speed_up/d0_p1_i0/sensors/?select=*.xml;recurse=yes"
- for $r in collection($collection2)/root/dataCollection/data
+ let $sensor_collection := "../../../../../../../weather_data/dataset-tiny-local/data_links/local_speed_up/d0_p1_i0/sensors/?select=*.xml;recurse=yes"
+ for $r in collection($sensor_collection)/root/dataCollection/data
- let $collection1 := "../../../../../../../weather_data/dataset-tiny-local/data_links/local_speed_up/d0_p1_i0/stations/?select=*.xml;recurse=yes"
- for $s in collection($collection1)/root/stationCollection/station
+ let $station_collection := "../../../../../../../weather_data/dataset-tiny-local/data_links/local_speed_up/d0_p1_i0/stations/?select=*.xml;recurse=yes"
+ for $s in collection($station_collection)/root/stationCollection/station
where $s/id eq $r/station
and (some $x in $s/locationLabels satisfies ($x/type eq "CNTRY" and $x/id eq "FIPS:US"))
http://git-wip-us.apache.org/repos/asf/vxquery/blob/5f72282e/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/saxon/q06.xq
----------------------------------------------------------------------
diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/saxon/q06.xq b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/saxon/q06.xq
index 7be7c69..c643f0c 100644
--- a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/saxon/q06.xq
+++ b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/saxon/q06.xq
@@ -1,12 +1,12 @@
(: XQuery Join Query :)
(: Find the highest recorded temperature (TMAX) for each station for each :)
(: day over the year 2000. :)
-let $station_collection := "../../../../../../../weather_data/dataset-tiny-local/data_links/local_speed_up/d0_p1_i0/stations/?select=*.xml;recurse=yes"
-for $s in collection($station_collection)/root/stationCollection/station
-
let $sensor_collection := "../../../../../../../weather_data/dataset-tiny-local/data_links/local_speed_up/d0_p1_i0/sensors/?select=*.xml;recurse=yes"
for $r in collection($sensor_collection)/root/dataCollection/data
+let $station_collection := "../../../../../../../weather_data/dataset-tiny-local/data_links/local_speed_up/d0_p1_i0/stations/?select=*.xml;recurse=yes"
+for $s in collection($station_collection)/root/stationCollection/station
+
where $s/id eq $r/station
and $r/dataType eq "TMAX"
and fn:year-from-dateTime(xs:dateTime(fn:data($r/date))) eq 2000
http://git-wip-us.apache.org/repos/asf/vxquery/blob/5f72282e/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/run_benchmark.sh
----------------------------------------------------------------------
diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/run_benchmark.sh b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/run_benchmark.sh
index b2b1531..9b79277 100755
--- a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/run_benchmark.sh
+++ b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/run_benchmark.sh
@@ -27,6 +27,7 @@
#
REPEAT=5
FRAME_SIZE=10000
+BUFFER_SIZE=8192
if [ -z "${1}" ]
then
@@ -34,7 +35,7 @@ then
exit
fi
-export JAVA_OPTS="$JAVA_OPTS -server -Xmx8G -XX:+HeapDumpOnOutOfMemoryError -Djava.util.logging.config.file=./vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/benchmark_logging.properties"
+export JAVA_OPTS="$JAVA_OPTS -server -Xmx1G -XX:+HeapDumpOnOutOfMemoryError -Djava.util.logging.config.file=./vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/benchmark_logging.properties"
for j in $(find ${1} -name '*q??.xq')
do
@@ -45,7 +46,12 @@ do
log_file="$(basename ${j}).$(date +%Y%m%d%H%M).log"
log_base_path=$(dirname ${j/queries/query_logs})
mkdir -p ${log_base_path}
- time sh ./vxquery-cli/target/appassembler/bin/vxq ${j} ${2} -timing -showquery -showoet -showrp -frame-size ${FRAME_SIZE} -repeatexec ${REPEAT} > ${log_base_path}/${log_file} 2>&1
+time sh ./vxquery-cli/target/appassembler/bin/vxq ${j} ${2} -timing -showquery -showoet -showrp -frame-size ${FRAME_SIZE} -buffer-size ${BUFFER_SIZE} -repeatexec ${REPEAT} > ${log_base_path}/${log_file} 2>&1
fi;
done
+SUBJECT="Benchmark Tests Finished"
+EMAIL="ecarm002@ucr.edu"
+/bin/mail -s "${SUBJECT}" "${EMAIL}" <<EOM
+Completed all tests in folder ${1}.
+EOM
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/vxquery/blob/5f72282e/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/run_benchmark_cluster.sh
----------------------------------------------------------------------
diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/run_benchmark_cluster.sh b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/run_benchmark_cluster.sh
index f868024..a00de98 100644
--- a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/run_benchmark_cluster.sh
+++ b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/run_benchmark_cluster.sh
@@ -27,6 +27,7 @@
#
REPEAT=5
FRAME_SIZE=10000
+BUFFER_SIZE=8192
if [ -z "${1}" ]
then
@@ -47,7 +48,7 @@ python vxquery-server/src/main/resources/scripts/cluster_cli.py -c vxquery-serve
# wait for cluster to finish setting up
sleep 5
-export JAVA_OPTS="$JAVA_OPTS -server -Xmx8G -XX:+HeapDumpOnOutOfMemoryError -Djava.util.logging.config.file=./vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/benchmark_logging.properties"
+export JAVA_OPTS="$JAVA_OPTS -server -Xmx1G -XX:+HeapDumpOnOutOfMemoryError -Djava.util.logging.config.file=./vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/benchmark_logging.properties"
for j in $(find ${1} -name '*q??.xq')
do
@@ -62,7 +63,7 @@ do
log_file="$(basename ${j}).$(date +%Y%m%d%H%M).log"
log_base_path=$(dirname ${j/queries/query_logs})
mkdir -p ${log_base_path}
- time sh ./vxquery-cli/target/appassembler/bin/vxq ${j} ${3} -timing -showquery -showoet -showrp -frame-size ${FRAME_SIZE} -repeatexec ${REPEAT} > ${log_base_path}/${log_file} 2>&1
+ time sh ./vxquery-cli/target/appassembler/bin/vxq ${j} ${3} -timing -showquery -showoet -showrp -frame-size ${FRAME_SIZE} -buffer-size ${BUFFER_SIZE} -repeatexec ${REPEAT} > ${log_base_path}/${log_file} 2>&1
fi;
fi;
done
@@ -70,3 +71,8 @@ done
# Stop cluster.
python vxquery-server/src/main/resources/scripts/cluster_cli.py -c vxquery-server/src/main/resources/conf/${2}nodes.xml -a stop
+SUBJECT="Benchmark Cluster Tests Finished"
+EMAIL="ecarm002@ucr.edu"
+/bin/mail -s "${SUBJECT}" "${EMAIL}" <<EOM
+Completed all tests in folder ${1} for a ${2} node cluster.
+EOM
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/vxquery/blob/5f72282e/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/run_group_test.sh
----------------------------------------------------------------------
diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/run_group_test.sh b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/run_group_test.sh
index b6ff22f..7bef3cb 100644
--- a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/run_group_test.sh
+++ b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/run_group_test.sh
@@ -17,19 +17,28 @@
# limitations under the License.
#
+DATASET="dataset-hcn-d2"
cluster_ip=${1}
-for n in 2 1 0
+for n in 4
do
- for t in "batch_scale_out" "speed_up"
+ #for t in "batch_scale_out" "speed_up"
+ for t in "batch_scale_out"
+ #for t in "speed_up"
do
- for p in 2 1
+ for p in 0
do
for c in 4
do
echo " ==== node ${n} test ${t} partition ${p} cores ${c} ===="
- sh noaa-ghcn-daily/scripts/run_benchmark_cluster.sh weather_data/dataset-small-d2/queries/${t}/${n}nodes/d2_p${p}/ ${n} "-client-net-ip-address ${cluster_ip} -available-processors ${c}"
+ sh vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/run_benchmark_cluster.sh weather_data/${DATASET}/queries/${t}/${n}nodes/d2_p${p}/ ${n} "-client-net-ip-address ${cluster_ip} -available-processors ${c}"
done
done
done
done
+
+SUBJECT="Benchmark Group Tests Finished"
+EMAIL="ecarm002@ucr.edu"
+/bin/mail -s "${SUBJECT}" "${EMAIL}" <<EOM
+Completed all tests in the predefined group for ${DATASET}.
+EOM
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/vxquery/blob/5f72282e/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/run_mrql_test.sh
----------------------------------------------------------------------
diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/run_mrql_test.sh b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/run_mrql_test.sh
deleted file mode 100644
index dd25c01..0000000
--- a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/run_mrql_test.sh
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/bash
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-export JAVA_HOME=/home/ecarm002/java/jdk1.6.0_45
-REPEAT=${1}
-
-#for n in `seq 0 7`
-for n in 6
-do
- date
- echo "Running q0${n} for MRQL."
- time for i in {1..${REPEAT}}; do ~/mrql/incubator-mrql/bin/mrql -dist -nodes 5 ~/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql/q0${n}.mrql > weather_data/mrql/query_logs/gsn/q0${n}.mrql.log 2>&1; done;
-done
http://git-wip-us.apache.org/repos/asf/vxquery/blob/5f72282e/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/run_mrql_tests.sh
----------------------------------------------------------------------
diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/run_mrql_tests.sh b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/run_mrql_tests.sh
index dd25c01..eb1b2a2 100644
--- a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/run_mrql_tests.sh
+++ b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/run_mrql_tests.sh
@@ -19,11 +19,18 @@
export JAVA_HOME=/home/ecarm002/java/jdk1.6.0_45
REPEAT=${1}
+DATASET="hcn"
-#for n in `seq 0 7`
-for n in 6
+for n in `seq 0 7`
+#for n in 0
do
date
- echo "Running q0${n} for MRQL."
- time for i in {1..${REPEAT}}; do ~/mrql/incubator-mrql/bin/mrql -dist -nodes 5 ~/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql/q0${n}.mrql > weather_data/mrql/query_logs/gsn/q0${n}.mrql.log 2>&1; done;
+ echo "Running q0${n} on ${DATASET} for MRQL."
+ time for i in {1..${REPEAT}}; do ~/mrql/incubator-mrql/bin/mrql -dist -nodes 5 ~/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_${DATASET}/q0${n}.mrql >> weather_data/mrql/query_logs/${DATASET}/q0${n}.mrql.log 2>&1; done;
done
+
+SUBJECT="MRQL Tests Finished (${DATASET})"
+EMAIL="ecarm002@ucr.edu"
+/bin/mail -s "${SUBJECT}" "${EMAIL}" <<EOM
+Completed all MRQL tests on ${DATASET}.
+EOM
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/vxquery/blob/5f72282e/vxquery-benchmark/src/main/resources/util/log_top.sh
----------------------------------------------------------------------
diff --git a/vxquery-benchmark/src/main/resources/util/log_top.sh b/vxquery-benchmark/src/main/resources/util/log_top.sh
index 6e54b0c..26557f5 100644
--- a/vxquery-benchmark/src/main/resources/util/log_top.sh
+++ b/vxquery-benchmark/src/main/resources/util/log_top.sh
@@ -6,12 +6,12 @@ iostat >> /dev/null
sar -n DEV 1 1 >> /dev/null
# Save IO, CPU and Network snapshot to a log file.
-while (sleep 10)
+while (sleep 7)
do
echo "---------------------------------------------" >> ${LOG_FILE}
date >> ${LOG_FILE}
echo >> ${LOG_FILE}
- iostat >> ${LOG_FILE}
+ iostat -y 1 1 >> ${LOG_FILE}
top -n 1 -b | head -11 | tail -6 >> ${LOG_FILE}
sar -n DEV 1 1 >> ${LOG_FILE}
done;
\ No newline at end of file