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:31 UTC
[18/50] [abbrv] git commit: A few fixes to make MRQL queries smoother.
A few fixes to make MRQL queries smoother.
Project: http://git-wip-us.apache.org/repos/asf/vxquery/repo
Commit: http://git-wip-us.apache.org/repos/asf/vxquery/commit/d76e4edc
Tree: http://git-wip-us.apache.org/repos/asf/vxquery/tree/d76e4edc
Diff: http://git-wip-us.apache.org/repos/asf/vxquery/diff/d76e4edc
Branch: refs/heads/site
Commit: d76e4edc05326747e31de53d15ca403a7f7b6946
Parents: 94acdb0
Author: Preston Carman <pr...@apache.org>
Authored: Wed Jun 25 22:48:58 2014 -0700
Committer: Preston Carman <pr...@apache.org>
Committed: Wed Jun 25 22:48:58 2014 -0700
----------------------------------------------------------------------
.../noaa-ghcn-daily/other_systems/mrql/q03.mrql | 1 -
.../noaa-ghcn-daily/other_systems/mrql/q04.mrql | 1 -
.../noaa-ghcn-daily/scripts/run_mrql_tests.sh | 29 ++++++++++++++++++++
3 files changed, 29 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/vxquery/blob/d76e4edc/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
index 2f85e84..981e4c3 100644
--- 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
@@ -2,6 +2,5 @@ max(
select (toInt(text(r.value)))
from r in source(xml, "sample_xml/gsn_sensors.xml", {"data"})
where text(r.dataType) = "TMAX"
- and toInt(substring(text(r.date), 0, 4)) = 1999
) / 10
;
http://git-wip-us.apache.org/repos/asf/vxquery/blob/d76e4edc/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
index 68ee5ec..7d11b49 100644
--- 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
@@ -4,6 +4,5 @@ from r in source(xml, "sample_xml/gsn_sensors.xml", {"data"}),
l in t.locationLabels
where text(t.id) = text(r.station)
and text(r.date) = "1976-07-04T00:00:00.000"
- and text(r.dataType) = "TMAX"
and text(l.displayName) = "WASHINGTON"
;
http://git-wip-us.apache.org/repos/asf/vxquery/blob/d76e4edc/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
new file mode 100644
index 0000000..dd25c01
--- /dev/null
+++ b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/run_mrql_tests.sh
@@ -0,0 +1,29 @@
+#!/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