Repository: vxquery Updated Branches: refs/heads/prestonc/exrt_benchmark_queries e1ec495f7 -> 6fccebf63
Updating MRQL queries to take parameters for sensor and station locations. Project: http://git-wip-us.apache.org/repos/asf/vxquery/repo Commit: http://git-wip-us.apache.org/repos/asf/vxquery/commit/07a89119 Tree: http://git-wip-us.apache.org/repos/asf/vxquery/tree/07a89119 Diff: http://git-wip-us.apache.org/repos/asf/vxquery/diff/07a89119 Branch: refs/heads/prestonc/exrt_benchmark_queries Commit: 07a8911927b43f41adc89cc4a6f95f937b443383 Parents: e1ec495 Author: Preston Carman <[email protected]> Authored: Thu Oct 2 14:32:34 2014 -0700 Committer: Preston Carman <[email protected]> Committed: Thu Oct 2 14:32:34 2014 -0700 ---------------------------------------------------------------------- .../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_sensor.mrql | 21 ++++++++++ .../other_systems/mrql/q04_station.mrql | 23 +++++++++++ .../noaa-ghcn-daily/other_systems/mrql/q05.mrql | 27 ++++++++++++ .../other_systems/mrql/q05_sensor.mrql | 23 +++++++++++ .../other_systems/mrql/q05_station.mrql | 23 +++++++++++ .../noaa-ghcn-daily/other_systems/mrql/q06.mrql | 26 ++++++++++++ .../other_systems/mrql/q06_sensor.mrql | 23 +++++++++++ .../other_systems/mrql/q06_station.mrql | 23 +++++++++++ .../noaa-ghcn-daily/other_systems/mrql/q07.mrql | 26 ++++++++++++ .../other_systems/mrql/q07_join_count.mrql | 26 ++++++++++++ .../other_systems/mrql/q07_tmax.mrql | 22 ++++++++++ .../other_systems/mrql/q07_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_scripts/clear.sh | 2 +- .../mrql_scripts/run_mrql_tests.sh | 2 +- .../other_systems/mrql_scripts/start.sh | 3 +- .../other_systems/mrql_scripts/stop.sh | 3 +- .../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 ------------ .../saxon_scripts/run_saxon_tests.sh | 43 ++++++++++++++++++++ 47 files changed, 446 insertions(+), 600 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/vxquery/blob/07a89119/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 new file mode 100644 index 0000000..49d005e --- /dev/null +++ b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql/q00.mrql @@ -0,0 +1,23 @@ +/* + * 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. + */ +select (r) +from r in source(xml, args[0], {"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/07a89119/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 new file mode 100644 index 0000000..f4cbd45 --- /dev/null +++ b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql/q01.mrql @@ -0,0 +1,21 @@ +/* + * 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. + */ +select (r) +from r in source(xml, args[0], {"data"}) +where text(r.dataType) = "AWND" + and toFloat(text(r.value)) > 491.744 +; \ No newline at end of file http://git-wip-us.apache.org/repos/asf/vxquery/blob/07a89119/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 new file mode 100644 index 0000000..5b7b507 --- /dev/null +++ b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql/q02.mrql @@ -0,0 +1,24 @@ +/* + * 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. + */ +sum( + select (toInt(text(r.value))) + from r in source(xml, args[0], {"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/07a89119/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 new file mode 100644 index 0000000..b444e55 --- /dev/null +++ b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql/q03.mrql @@ -0,0 +1,22 @@ +/* + * 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. + */ +max( + select (toInt(text(r.value))) + from r in source(xml, args[0], {"data"}) + where text(r.dataType) = "TMAX" +) / 10 +; http://git-wip-us.apache.org/repos/asf/vxquery/blob/07a89119/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 new file mode 100644 index 0000000..1b36852 --- /dev/null +++ b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql/q04.mrql @@ -0,0 +1,24 @@ +/* + * 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. + */ +select (sensors) +from sensors in source(xml, args[0], {"data"}), + stations in source(xml, args[1], {"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/07a89119/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 new file mode 100644 index 0000000..da0eae3 --- /dev/null +++ b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql/q04_sensor.mrql @@ -0,0 +1,21 @@ +/* + * 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. + */ +select (r) +from r in source(xml, args[0], {"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/07a89119/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 new file mode 100644 index 0000000..16bbe5a --- /dev/null +++ b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql/q04_station.mrql @@ -0,0 +1,23 @@ +/* + * 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. + */ +count( + select (r) + from t in source(xml, args[1], {"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/07a89119/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 new file mode 100644 index 0000000..230f6e7 --- /dev/null +++ b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql/q05.mrql @@ -0,0 +1,27 @@ +/* + * 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. + */ +min( + select (toInt(text(sensors.value))) + from sensors in source(xml, args[0], {"data"}), + stations in source(xml, args[1], {"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/07a89119/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 new file mode 100644 index 0000000..dd801ed --- /dev/null +++ b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql/q05_sensor.mrql @@ -0,0 +1,23 @@ +/* + * 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. + */ +count( + select (toInt(text(r.value))) + from r in source(xml, args[0], {"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/07a89119/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 new file mode 100644 index 0000000..d8fcacc --- /dev/null +++ b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql/q05_station.mrql @@ -0,0 +1,23 @@ +/* + * 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. + */ +count( + select (t) + from t in source(xml, args[1], {"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/07a89119/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 new file mode 100644 index 0000000..583a5b9 --- /dev/null +++ b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql/q06.mrql @@ -0,0 +1,26 @@ +/* + * 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. + */ +select (n, d, v) +from sensors in source(xml, args[0], {"data"}), + d in sensors.date, + v in sensors.value, + stations in source(xml, args[1], {"station"}), + n in stations.displayName, +where text(stations.id) = text(sensors.station) + and toInt(substring(text(d), 0, 4)) = 2000 + and text(sensors.dataType) = "TMAX" +; \ No newline at end of file http://git-wip-us.apache.org/repos/asf/vxquery/blob/07a89119/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 new file mode 100644 index 0000000..22e5918 --- /dev/null +++ b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql/q06_sensor.mrql @@ -0,0 +1,23 @@ +/* + * 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. + */ +count( + select (r.date, r.value) + from r in source(xml, args[0], {"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/07a89119/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 new file mode 100644 index 0000000..9fb9e84 --- /dev/null +++ b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql/q06_station.mrql @@ -0,0 +1,23 @@ +/* + * 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. + */ +count( + select (t.displayName) + from t in source(xml, args[1], {"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/07a89119/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 new file mode 100644 index 0000000..cdb0b0c --- /dev/null +++ b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql/q07.mrql @@ -0,0 +1,26 @@ +/* + * 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. + */ +avg( + select (toInt(text(rtmax.value))-toInt(text(rtmin.value))) + from rtmax in source(xml, args[0], {"data"}), + rtmin in source(xml, args[0], {"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/07a89119/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 new file mode 100644 index 0000000..8dec470 --- /dev/null +++ b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql/q07_join_count.mrql @@ -0,0 +1,26 @@ +/* + * 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. + */ +count( + select (toInt(text(rtmax.value))-toInt(text(rtmin.value))) + from rtmax in source(xml, args[0], {"data"}), + rtmin in source(xml, args[0], {"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/07a89119/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 new file mode 100644 index 0000000..ca8ab4c --- /dev/null +++ b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql/q07_tmax.mrql @@ -0,0 +1,22 @@ +/* + * 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. + */ +count( + select (rtmax) + from rtmax in source(xml, args[0], {"data"}) + where text(r.dataType) = "TMAX" +) +; http://git-wip-us.apache.org/repos/asf/vxquery/blob/07a89119/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 new file mode 100644 index 0000000..fe17ebe --- /dev/null +++ b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql/q07_tmin.mrql @@ -0,0 +1,22 @@ +/* + * 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. + */ +count( + select (rtmin) + from rtmin in source(xml, args[0], {"data"}) + where text(r.dataType) = "TMIN" +) +; http://git-wip-us.apache.org/repos/asf/vxquery/blob/07a89119/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 deleted file mode 100644 index 8e83879..0000000 --- a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_gsn/q00.mrql +++ /dev/null @@ -1,23 +0,0 @@ -/* - * 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. - */ -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/07a89119/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 deleted file mode 100644 index 643c47b..0000000 --- a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_gsn/q01.mrql +++ /dev/null @@ -1,21 +0,0 @@ -/* - * 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. - */ -select (r) -from r in source(xml, "sample_xml/gsn_sensors.xml", {"data"}) -where text(r.dataType) = "AWND" - and toFloat(text(r.value)) > 491.744 -; \ No newline at end of file http://git-wip-us.apache.org/repos/asf/vxquery/blob/07a89119/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 deleted file mode 100644 index 8dc9c4b..0000000 --- a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_gsn/q02.mrql +++ /dev/null @@ -1,24 +0,0 @@ -/* - * 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. - */ -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/07a89119/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 deleted file mode 100644 index f81e914..0000000 --- a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_gsn/q03.mrql +++ /dev/null @@ -1,22 +0,0 @@ -/* - * 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. - */ -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/07a89119/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 deleted file mode 100644 index aaa8599..0000000 --- a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_gsn/q04.mrql +++ /dev/null @@ -1,24 +0,0 @@ -/* - * 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. - */ -select (sensors) -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/07a89119/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 deleted file mode 100644 index 69fb35a..0000000 --- a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_gsn/q04_sensor.mrql +++ /dev/null @@ -1,21 +0,0 @@ -/* - * 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. - */ -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/07a89119/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 deleted file mode 100644 index 7c3c8bb..0000000 --- a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_gsn/q04_station.mrql +++ /dev/null @@ -1,24 +0,0 @@ -/* - * 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. - */ -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/07a89119/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 deleted file mode 100644 index ca5a558..0000000 --- a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_gsn/q05.mrql +++ /dev/null @@ -1,27 +0,0 @@ -/* - * 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. - */ -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/07a89119/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 deleted file mode 100644 index 95ea398..0000000 --- a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_gsn/q05_sensor.mrql +++ /dev/null @@ -1,23 +0,0 @@ -/* - * 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. - */ -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/07a89119/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 deleted file mode 100644 index 1f41e1e..0000000 --- a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_gsn/q05_station.mrql +++ /dev/null @@ -1,23 +0,0 @@ -/* - * 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. - */ -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/07a89119/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 deleted file mode 100644 index b46049f..0000000 --- a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_gsn/q06.mrql +++ /dev/null @@ -1,26 +0,0 @@ -/* - * 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. - */ -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, -where text(stations.id) = text(sensors.station) - and toInt(substring(text(d), 0, 4)) = 2000 - and text(sensors.dataType) = "TMAX" -; \ No newline at end of file http://git-wip-us.apache.org/repos/asf/vxquery/blob/07a89119/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 deleted file mode 100644 index 2b21287..0000000 --- a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_gsn/q06_sensor.mrql +++ /dev/null @@ -1,23 +0,0 @@ -/* - * 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. - */ -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/07a89119/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 deleted file mode 100644 index fbc1ea3..0000000 --- a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_gsn/q06_station.mrql +++ /dev/null @@ -1,23 +0,0 @@ -/* - * 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. - */ -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/07a89119/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 deleted file mode 100644 index 5d94e6c..0000000 --- a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_gsn/q07.mrql +++ /dev/null @@ -1,26 +0,0 @@ -/* - * 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. - */ -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/07a89119/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 deleted file mode 100644 index 1c3a87b..0000000 --- a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_gsn/q07_join_count.mrql +++ /dev/null @@ -1,26 +0,0 @@ -/* - * 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. - */ -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/07a89119/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 deleted file mode 100644 index 6863dc1..0000000 --- a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_gsn/q07_tmax.mrql +++ /dev/null @@ -1,22 +0,0 @@ -/* - * 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. - */ -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/07a89119/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 deleted file mode 100644 index f2b98b7..0000000 --- a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_gsn/q07_tmin.mrql +++ /dev/null @@ -1,22 +0,0 @@ -/* - * 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. - */ -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/07a89119/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_scripts/clear.sh ---------------------------------------------------------------------- diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_scripts/clear.sh b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_scripts/clear.sh index b5ea487..da7cabe 100755 --- a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_scripts/clear.sh +++ b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_scripts/clear.sh @@ -16,4 +16,4 @@ # See the License for the specific language governing permissions and # limitations under the License. # -bin/hadoop namenode -format +hadoop namenode -format http://git-wip-us.apache.org/repos/asf/vxquery/blob/07a89119/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_scripts/run_mrql_tests.sh ---------------------------------------------------------------------- diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_scripts/run_mrql_tests.sh b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_scripts/run_mrql_tests.sh index 918206a..10ab4d9 100755 --- a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_scripts/run_mrql_tests.sh +++ b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_scripts/run_mrql_tests.sh @@ -29,7 +29,7 @@ for j in $(find ${1} -name '*q??.mrql') do date echo "Running MRQL query: ${j}" - time for i in {1..${REPEAT}}; do ~/mrql/incubator-mrql/bin/mrql -dist -nodes ${NODES} ${j} >> ~/disk1/weather_data/mrql/query_logs/$(basename "${j}").log 2>&1; done; + time for i in {1..${REPEAT}}; do ~/mrql/incubator-mrql/bin/mrql -dist -nodes ${NODES} ${j} ${DATASET}/sensors.xml ${DATASET}/stations.xml >> ~/disk1/weather_data/mrql/query_logs/$(basename "${j}").log 2>&1; done; done http://git-wip-us.apache.org/repos/asf/vxquery/blob/07a89119/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_scripts/start.sh ---------------------------------------------------------------------- diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_scripts/start.sh b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_scripts/start.sh index c09e7e7..a1766c9 100755 --- a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_scripts/start.sh +++ b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_scripts/start.sh @@ -17,5 +17,4 @@ # limitations under the License. # -bin/start-dfs.sh -bin/start-mapred.sh +bin/start-all.sh http://git-wip-us.apache.org/repos/asf/vxquery/blob/07a89119/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_scripts/stop.sh ---------------------------------------------------------------------- diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_scripts/stop.sh b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_scripts/stop.sh index c4259b8..e49d818 100755 --- a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_scripts/stop.sh +++ b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_scripts/stop.sh @@ -17,5 +17,4 @@ # limitations under the License. # -bin/stop-mapred.sh -bin/stop-dfs.sh +bin/stop-all.sh http://git-wip-us.apache.org/repos/asf/vxquery/blob/07a89119/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_test/q00.mrql ---------------------------------------------------------------------- diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_test/q00.mrql b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_test/q00.mrql deleted file mode 100644 index d4bd10b..0000000 --- a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_test/q00.mrql +++ /dev/null @@ -1,23 +0,0 @@ -/* - * 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. - */ -select (r) -from r in source(xml, "sample_xml/nano_sensors.xml", {"data"}) -where text(r.station) = "GHCND:AS000000003" - and toInt(substring(text(r.date), 0, 4)) >= 2000 - and toInt(substring(text(r.date), 5, 7)) = 3 - and toInt(substring(text(r.date), 8, 10)) = 3 -; \ No newline at end of file http://git-wip-us.apache.org/repos/asf/vxquery/blob/07a89119/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_test/q01.mrql ---------------------------------------------------------------------- diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_test/q01.mrql b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_test/q01.mrql deleted file mode 100644 index 8f100df..0000000 --- a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_test/q01.mrql +++ /dev/null @@ -1,21 +0,0 @@ -/* - * 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. - */ -select (r) -from r in source(xml, "sample_xml/nano_sensors.xml", {"data"}) -where text(r.dataType) = "AWND" - and toFloat(text(r.value)) > 491.744 -; \ No newline at end of file http://git-wip-us.apache.org/repos/asf/vxquery/blob/07a89119/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_test/q02.mrql ---------------------------------------------------------------------- diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_test/q02.mrql b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_test/q02.mrql deleted file mode 100644 index 3bba05f..0000000 --- a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_test/q02.mrql +++ /dev/null @@ -1,24 +0,0 @@ -/* - * 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. - */ -sum( - select (toFloat(text(r.value))) - from r in source(xml, "sample_xml/nano_sensors.xml", {"data"}) - where text(r.station) = "GHCND:US000000002" - and toInt(substring(text(r.date), 0, 4)) = 2002 - and text(r.dataType) = "PRCP" -) / 10 -; \ No newline at end of file http://git-wip-us.apache.org/repos/asf/vxquery/blob/07a89119/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_test/q03.mrql ---------------------------------------------------------------------- diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_test/q03.mrql b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_test/q03.mrql deleted file mode 100644 index a6f9afe..0000000 --- a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_test/q03.mrql +++ /dev/null @@ -1,22 +0,0 @@ -/* - * 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. - */ -max( - select (toFloat(text(r.value))) - from r in source(xml, "sample_xml/nano_sensors.xml", {"data"}) - where text(r.dataType) = "TMAX" -) / 10 -; http://git-wip-us.apache.org/repos/asf/vxquery/blob/07a89119/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_test/q04.mrql ---------------------------------------------------------------------- diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_test/q04.mrql b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_test/q04.mrql deleted file mode 100644 index 4d24016..0000000 --- a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_test/q04.mrql +++ /dev/null @@ -1,24 +0,0 @@ -/* - * 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. - */ -select (sensors) -from sensors in source(xml, "sample_xml/nano_sensors.xml", {"data"}), - stations in source(xml, "sample_xml/nano_stations.xml", {"station"}), - l in stations.locationLabels -where text(stations.id) = text(sensors.station) - and text(sensors.date) = "2002-02-02T00:00:00.000" - and text(l.displayName) = "State 1" -; http://git-wip-us.apache.org/repos/asf/vxquery/blob/07a89119/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_test/q05.mrql ---------------------------------------------------------------------- diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_test/q05.mrql b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_test/q05.mrql deleted file mode 100644 index 0fdb641..0000000 --- a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_test/q05.mrql +++ /dev/null @@ -1,27 +0,0 @@ -/* - * 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. - */ -min( - select (toFloat(text(sensors.value))) - from sensors in source(xml, "sample_xml/nano_sensors.xml", {"data"}), - stations in source(xml, "sample_xml/nano_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/07a89119/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_test/q06.mrql ---------------------------------------------------------------------- diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_test/q06.mrql b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_test/q06.mrql deleted file mode 100644 index c44f70c..0000000 --- a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_test/q06.mrql +++ /dev/null @@ -1,27 +0,0 @@ -/* - * 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. - */ -select (n, d, v) -from sensors in source(xml, "sample_xml/nano_sensors.xml", {"data"}), - d in sensors.date, - v in sensors.value, - stations in source(xml, "sample_xml/nano_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)) = 2002 - and text(sensors.dataType) = "TMAX" -; \ No newline at end of file http://git-wip-us.apache.org/repos/asf/vxquery/blob/07a89119/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_test/q07.mrql ---------------------------------------------------------------------- diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_test/q07.mrql b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_test/q07.mrql deleted file mode 100644 index 9046181..0000000 --- a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_test/q07.mrql +++ /dev/null @@ -1,26 +0,0 @@ -/* - * 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. - */ -avg( - select (toFloat(text(rtmax.value))-toFloat(text(rtmin.value))) - from rtmax in source(xml, "sample_xml/nano_sensors.xml", {"data"}), - rtmin in source(xml, "sample_xml/nano_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/07a89119/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/saxon_scripts/run_saxon_tests.sh ---------------------------------------------------------------------- diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/saxon_scripts/run_saxon_tests.sh b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/saxon_scripts/run_saxon_tests.sh new file mode 100755 index 0000000..831f424 --- /dev/null +++ b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/saxon_scripts/run_saxon_tests.sh @@ -0,0 +1,43 @@ +#!/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. +# + +NODES=${2} +REPEAT=${3} +DATASET="hcn" + + +for j in $(find ${1} -name '*q??.mrql') +do + date + echo "Running MRQL query: ${j}" + time for i in {1..${REPEAT}}; do ~/mrql/incubator-mrql/bin/mrql -dist -nodes ${NODES} ${j} >> ~/disk1/weather_data/mrql/query_logs/$(basename "${j}").log 2>&1; done; +done + + +if which programname >/dev/null; +then + echo "Sending out e-mail notification." + SUBJECT="MRQL Tests Finished (${DATASET})" + EMAIL="[email protected]" + /bin/mail -s "${SUBJECT}" "${EMAIL}" <<EOM + Completed all MRQL tests on ${DATASET}. + EOM +else + echo "No mail command to use." +fi;
