Removed benchmark new files not in master. They have been added a separate 
branch.


Project: http://git-wip-us.apache.org/repos/asf/vxquery/repo
Commit: http://git-wip-us.apache.org/repos/asf/vxquery/commit/ab0838d9
Tree: http://git-wip-us.apache.org/repos/asf/vxquery/tree/ab0838d9
Diff: http://git-wip-us.apache.org/repos/asf/vxquery/diff/ab0838d9

Branch: refs/heads/site
Commit: ab0838d953bb88151ab56a26c529c5d9d3f3bd78
Parents: 94acdb0
Author: Preston Carman <[email protected]>
Authored: Wed Jun 25 19:28:46 2014 -0700
Committer: Preston Carman <[email protected]>
Committed: Wed Jun 25 19:28:46 2014 -0700

----------------------------------------------------------------------
 .../noaa-ghcn-daily/conf/weather_example.xml    |  35 ---
 .../conf/weather_example_cluster.xml            |  58 -----
 .../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 |   7 -
 .../noaa-ghcn-daily/other_systems/mrql/q04.mrql |   9 -
 .../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 -
 .../noaa-ghcn-daily/other_systems/saxon/q00.xq  |  15 --
 .../noaa-ghcn-daily/other_systems/saxon/q01.xq  |   8 -
 .../noaa-ghcn-daily/other_systems/saxon/q02.xq  |  14 --
 .../noaa-ghcn-daily/other_systems/saxon/q03.xq  |   8 -
 .../noaa-ghcn-daily/other_systems/saxon/q04.xq  |  13 -
 .../other_systems/saxon/q04_sensor.xq           |  10 -
 .../other_systems/saxon/q04_station.xq          |   8 -
 .../noaa-ghcn-daily/other_systems/saxon/q05.xq  |  16 --
 .../other_systems/saxon/q05_sensor.xq           |  11 -
 .../other_systems/saxon/q05_station.xq          |   8 -
 .../noaa-ghcn-daily/other_systems/saxon/q06.xq  |  13 -
 .../other_systems/saxon/q06_sensor.xq           |   8 -
 .../other_systems/saxon/q06_station.xq          |   5 -
 .../noaa-ghcn-daily/other_systems/saxon/q07.xq  |  15 --
 .../other_systems/saxon/q07_tmax.xq             |   9 -
 .../other_systems/saxon/q07_tmin.xq             |   9 -
 .../other_systems/saxon/sensor_count.xq         |   7 -
 .../other_systems/saxon/station_count.xq        |   7 -
 .../noaa-ghcn-daily/queries/q04_join_count.xq   |  32 ---
 .../noaa-ghcn-daily/queries/q05_join_count.xq   |  33 ---
 .../noaa-ghcn-daily/queries/q06_join_count.xq   |  32 ---
 .../noaa-ghcn-daily/queries/q07_join_count.xq   |  33 ---
 .../noaa-ghcn-daily/queries/q07_tmax_values.xq  |  24 --
 .../noaa-ghcn-daily/queries/q07_tmin_self.xq    |  33 ---
 .../noaa-ghcn-daily/queries/q07_tmin_values.xq  |  24 --
 .../scripts/benchmark_logging.properties        |   1 -
 .../noaa-ghcn-daily/scripts/run_group_test.sh   |  35 ---
 .../resources/util/find_averages_in_logs.py     |  97 --------
 .../src/main/resources/util/log_top.sh          |  17 --
 .../src/main/resources/util/merge_xml_files.py  |  88 -------
 .../src/main/resources/xmark/README.md          |  28 ---
 .../xmark/data/categories/micro_categories.xml  |  36 ---
 .../xmark/data/catgraph/micro_catgraph.xml      |   6 -
 .../closed_auctions/micro_closed_auctions.xml   | 118 ---------
 .../data/open_auctions/micro_open_auctions.xml  | 117 ---------
 .../xmark/data/people/micro_people.xml          |  15 --
 .../xmark/data/regions/micro_regions.xml        | 243 -------------------
 .../src/main/resources/xmark/queries/q01.xq     |  23 --
 .../src/main/resources/xmark/queries/q02.xq     |  22 --
 .../src/main/resources/xmark/queries/q03.xq     |  26 --
 .../src/main/resources/xmark/queries/q04.xq     |  26 --
 .../src/main/resources/xmark/queries/q05.xq     |  25 --
 .../src/main/resources/xmark/queries/q06.xq     |  22 --
 .../src/main/resources/xmark/queries/q07.xq     |  23 --
 .../src/main/resources/xmark/queries/q08.xq     |  27 ---
 .../src/main/resources/xmark/queries/q09.xq     |  33 ---
 .../src/main/resources/xmark/queries/q10.xq     |  46 ----
 .../src/main/resources/xmark/queries/q11.xq     |  27 ---
 .../src/main/resources/xmark/queries/q12.xq     |  28 ---
 .../src/main/resources/xmark/queries/q13.xq     |  22 --
 .../src/main/resources/xmark/queries/q14.xq     |  23 --
 .../src/main/resources/xmark/queries/q15.xq     |  29 ---
 .../src/main/resources/xmark/queries/q16.xq     |  30 ---
 .../src/main/resources/xmark/queries/q17.xq     |  23 --
 .../src/main/resources/xmark/queries/q18.xq     |  28 ---
 .../src/main/resources/xmark/queries/q19.xq     |  24 --
 .../src/main/resources/xmark/queries/q20.xq     |  58 -----
 76 files changed, 1987 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/vxquery/blob/ab0838d9/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/conf/weather_example.xml
----------------------------------------------------------------------
diff --git 
a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/conf/weather_example.xml 
b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/conf/weather_example.xml
deleted file mode 100644
index 2c15a33..0000000
--- 
a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/conf/weather_example.xml
+++ /dev/null
@@ -1,35 +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.
--->
-<data xmlns="data">
-    <name>Local Example</name>
-    <save_path>/data</save_path>
-    <package>ghcnd_all</package>
-    <node>
-        <id>localhost</id>
-        <cluster_ip>127.0.0.1</cluster_ip>
-    </node>
-    <dataset>
-        <name>tiny-example</name>
-        <test>local_speed_up</test>
-        <save_path>/data</save_path>
-        <partition_type>small_files</partition_type>
-        <partitions_per_path>1</partitions_per_path>
-        <partitions_per_path>2</partitions_per_path>
-        <partitions_per_path>4</partitions_per_path>
-        <partitions_per_path>8</partitions_per_path>
-    </dataset>
-</data>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/vxquery/blob/ab0838d9/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/conf/weather_example_cluster.xml
----------------------------------------------------------------------
diff --git 
a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/conf/weather_example_cluster.xml
 
b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/conf/weather_example_cluster.xml
deleted file mode 100644
index 7d05ac0..0000000
--- 
a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/conf/weather_example_cluster.xml
+++ /dev/null
@@ -1,58 +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.
--->
-<data xmlns="data">
-    <name>Cluster Example</name>
-    <save_path>/data</save_path>
-    <package>ghcnd_all</package>
-    <node>
-        <id>machine1</id>
-        <cluster_ip>127.0.0.1</cluster_ip>
-    </node>
-    <node>
-        <id>machine2</id>
-        <cluster_ip>127.0.0.2</cluster_ip>
-    </node>
-    <node>
-        <id>machine3</id>
-        <cluster_ip>127.0.0.3</cluster_ip>
-    </node>
-    <node>
-        <id>machine4</id>
-        <cluster_ip>127.0.0.4</cluster_ip>
-    </node>
-    <node>
-        <id>machine5</id>
-        <cluster_ip>127.0.0.5</cluster_ip>
-    </node>
-    <dataset>
-        <name>tiny-1drive</name>
-        <test>speed_up</test>
-        <test>batch_scale_out</test>
-        <save_path>/data</save_path>
-        <partition_type>small_files</partition_type>
-        <partitions_per_path>1</partitions_per_path>
-    </dataset>
-    <dataset>
-        <name>small-2drives</name>
-        <test>speed_up</test>
-        <test>batch_scale_out</test>
-        <save_path>/data</save_path>
-        <save_path>/data2</save_path>
-        <partition_type>large_files</partition_type>
-        <partitions_per_path>1</partitions_per_path>
-    </dataset>
-</data>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/vxquery/blob/ab0838d9/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/ab0838d9/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/ab0838d9/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/ab0838d9/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 2f85e84..0000000
--- 
a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql/q03.mrql
+++ /dev/null
@@ -1,7 +0,0 @@
-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/ab0838d9/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 68ee5ec..0000000
--- 
a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql/q04.mrql
+++ /dev/null
@@ -1,9 +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(r.dataType) = "TMAX"
-    and text(l.displayName) = "WASHINGTON"
-;

http://git-wip-us.apache.org/repos/asf/vxquery/blob/ab0838d9/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/ab0838d9/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/ab0838d9/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/ab0838d9/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/ab0838d9/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/ab0838d9/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/ab0838d9/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/ab0838d9/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/ab0838d9/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/ab0838d9/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/ab0838d9/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/ab0838d9/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/ab0838d9/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/saxon/q00.xq
----------------------------------------------------------------------
diff --git 
a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/saxon/q00.xq
 
b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/saxon/q00.xq
deleted file mode 100644
index 09c5b79..0000000
--- 
a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/saxon/q00.xq
+++ /dev/null
@@ -1,15 +0,0 @@
-(: 
-XQuery Filter Query
--------------------
-See historical data for Key West International Airport, FL (USW00012836)
-station by selecting  the weather readings for December 25 over the last 
-10 years. 
-:)
-let $collection := 
"../../../../../../../weather_data/dataset-tiny-local/data_links/local_speed_up/d0_p1_i0/sensors/?select=*.xml;recurse=yes"
-for $r in collection($collection)/root/dataCollection/data
-let $datetime := xs:dateTime(fn:data($r/date))
-where $r/station eq "GHCND:USW00012836" 
-    and fn:year-from-dateTime($datetime) ge 2003
-    and fn:month-from-dateTime($datetime) eq 12 
-    and fn:day-from-dateTime($datetime) eq 25
-return $r
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/vxquery/blob/ab0838d9/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/saxon/q01.xq
----------------------------------------------------------------------
diff --git 
a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/saxon/q01.xq
 
b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/saxon/q01.xq
deleted file mode 100644
index 39d7e20..0000000
--- 
a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/saxon/q01.xq
+++ /dev/null
@@ -1,8 +0,0 @@
-(: XQuery Filter Query :)
-(: Find all reading for hurricane force wind warning or extreme wind warning. 
:)
-(: The warnings occur when the wind speed (AWND) exceeds 110 mph (49.1744     
:)
-(: meters per second). (Wind value is in tenth of a meter per second)         
:)
-let $collection := 
"../../../../../../../weather_data/dataset-tiny-local/data_links/local_speed_up/d0_p1_i0/sensors/?select=*.xml;recurse=yes"
-for $r in fn:collection($collection)/root/dataCollection/data
-where $r/dataType eq "AWND" and xs:decimal($r/value) gt 491.744
-return $r

http://git-wip-us.apache.org/repos/asf/vxquery/blob/ab0838d9/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/saxon/q02.xq
----------------------------------------------------------------------
diff --git 
a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/saxon/q02.xq
 
b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/saxon/q02.xq
deleted file mode 100644
index 3fb0975..0000000
--- 
a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/saxon/q02.xq
+++ /dev/null
@@ -1,14 +0,0 @@
-(:
-XQuery Aggregate Query
-----------------------
-Find the annual precipitation (PRCP) for a Syracuse, NY using the airport
-weather station (USW00014771) report for 1999.                                 
    
-:)
-fn:sum(
-    let $collection := 
"../../../../../../../weather_data/dataset-tiny-local/data_links/local_speed_up/d0_p1_i0/sensors/?select=*.xml;recurse=yes"
-    for $r in collection($collection)/root/dataCollection/data
-    where $r/station eq "GHCND:USW00014771" 
-        and $r/dataType eq "PRCP" 
-        and fn:year-from-dateTime(xs:dateTime(fn:data($r/date))) eq 1999
-    return $r/value
-) div 10

http://git-wip-us.apache.org/repos/asf/vxquery/blob/ab0838d9/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/saxon/q03.xq
----------------------------------------------------------------------
diff --git 
a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/saxon/q03.xq
 
b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/saxon/q03.xq
deleted file mode 100644
index cda344a..0000000
--- 
a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/saxon/q03.xq
+++ /dev/null
@@ -1,8 +0,0 @@
-(: XQuery Aggregate Query :)
-(: Find the highest recorded temperature (TMAX) in Celsius.                   
:)
-fn:max(
-    let $collection := 
"../../../../../../../weather_data/dataset-tiny-local/data_links/local_speed_up/d0_p1_i0/sensors/?select=*.xml;recurse=yes"
-    for $r in collection($collection)/root/dataCollection/data
-    where $r/dataType eq "TMAX"
-    return $r/value
-) div 10

http://git-wip-us.apache.org/repos/asf/vxquery/blob/ab0838d9/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
deleted file mode 100644
index 09752d1..0000000
--- 
a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/saxon/q04.xq
+++ /dev/null
@@ -1,13 +0,0 @@
-(: 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 $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
-
-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"))
-    and xs:dateTime(fn:data($r/date)) eq xs:dateTime("1976-07-04T00:00:00.000")
-return $r

http://git-wip-us.apache.org/repos/asf/vxquery/blob/ab0838d9/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/saxon/q04_sensor.xq
----------------------------------------------------------------------
diff --git 
a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/saxon/q04_sensor.xq
 
b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/saxon/q04_sensor.xq
deleted file mode 100644
index 6c927a4..0000000
--- 
a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/saxon/q04_sensor.xq
+++ /dev/null
@@ -1,10 +0,0 @@
-(: XQuery Join Query :)
-(: Count all the weather sensor readings on 1976-07-04.                       
:)
-count(
-    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 $date := xs:date(fn:substring(xs:string(fn:data($r/date)), 0, 11))
-    where $date eq xs:date("1976-07-04")
-    return $r
-)
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/vxquery/blob/ab0838d9/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/saxon/q04_station.xq
----------------------------------------------------------------------
diff --git 
a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/saxon/q04_station.xq
 
b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/saxon/q04_station.xq
deleted file mode 100644
index 957aec0..0000000
--- 
a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/saxon/q04_station.xq
+++ /dev/null
@@ -1,8 +0,0 @@
-(: XQuery Join Query :)
-(: Count all the weather stations for King county.                            
:)
-count(
-    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 (some $x in $s/locationLabels satisfies ($x/type eq "CNTY" and 
fn:contains(fn:upper-case(fn:data($x/displayName)), "KING")))
-    return $s
-)
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/vxquery/blob/ab0838d9/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
deleted file mode 100644
index eca1c68..0000000
--- 
a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/saxon/q05.xq
+++ /dev/null
@@ -1,16 +0,0 @@
-(: XQuery Join Aggregate Query :)
-(: 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 $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
-    
-    where $s/id eq $r/station
-        and (some $x in $s/locationLabels satisfies ($x/type eq "CNTRY" and 
$x/id eq "FIPS:US"))
-        and $r/dataType eq "TMIN" 
-        and fn:year-from-dateTime(xs:dateTime(fn:data($r/date))) eq 2001
-    return $r/value
-) div 10

http://git-wip-us.apache.org/repos/asf/vxquery/blob/ab0838d9/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/saxon/q05_sensor.xq
----------------------------------------------------------------------
diff --git 
a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/saxon/q05_sensor.xq
 
b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/saxon/q05_sensor.xq
deleted file mode 100644
index 4ac353b..0000000
--- 
a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/saxon/q05_sensor.xq
+++ /dev/null
@@ -1,11 +0,0 @@
-(: XQuery Join Aggregate Query :)
-(: Count all sensor readings for TMIN in 2001.                                
:)
-count(
-    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 $date := xs:date(fn:substring(xs:string(fn:data($r/date)), 0, 11))
-    where $r/dataType eq "TMIN" 
-        and fn:year-from-date($date) eq 2001
-    return $r/value
-)
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/vxquery/blob/ab0838d9/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/saxon/q05_station.xq
----------------------------------------------------------------------
diff --git 
a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/saxon/q05_station.xq
 
b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/saxon/q05_station.xq
deleted file mode 100644
index 4349805..0000000
--- 
a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/saxon/q05_station.xq
+++ /dev/null
@@ -1,8 +0,0 @@
-(: XQuery Join Aggregate Query :)
-(: Count all stations in the state of Oregon.                                 
:)
-count(
-    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 (some $x in $s/locationLabels satisfies ($x/type eq "ST" and 
fn:upper-case(fn:data($x/displayName)) eq "OREGON"))
-    return $s
-)
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/vxquery/blob/ab0838d9/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
deleted file mode 100644
index 7be7c69..0000000
--- 
a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/saxon/q06.xq
+++ /dev/null
@@ -1,13 +0,0 @@
-(: 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
-
-where $s/id eq $r/station
-    and $r/dataType eq "TMAX" 
-    and fn:year-from-dateTime(xs:dateTime(fn:data($r/date))) eq 2000
-return ($s/displayName, $r/date, $r/value)
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/vxquery/blob/ab0838d9/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/saxon/q06_sensor.xq
----------------------------------------------------------------------
diff --git 
a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/saxon/q06_sensor.xq
 
b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/saxon/q06_sensor.xq
deleted file mode 100644
index 5ca3329..0000000
--- 
a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/saxon/q06_sensor.xq
+++ /dev/null
@@ -1,8 +0,0 @@
-count(
-    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
-    
-    where $r/dataType eq "TMAX" 
-        and fn:year-from-dateTime(xs:dateTime(fn:data($r/date))) eq 2000
-    return $r
-)
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/vxquery/blob/ab0838d9/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/saxon/q06_station.xq
----------------------------------------------------------------------
diff --git 
a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/saxon/q06_station.xq
 
b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/saxon/q06_station.xq
deleted file mode 100644
index ef1e732..0000000
--- 
a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/saxon/q06_station.xq
+++ /dev/null
@@ -1,5 +0,0 @@
-count(
-    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
-    return $s
-)
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/vxquery/blob/ab0838d9/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/saxon/q07.xq
----------------------------------------------------------------------
diff --git 
a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/saxon/q07.xq
 
b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/saxon/q07.xq
deleted file mode 100644
index 35e5ea2..0000000
--- 
a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/saxon/q07.xq
+++ /dev/null
@@ -1,15 +0,0 @@
-(: XQuery Join Aggregate Query :)
-(: Self join with all sensor readings after the year 2000.                    
:)
-fn:avg(
-let $sensor_collection_min := 
"../../../../../../../weather_data/dataset-tiny-local/data_links/local_speed_up/d0_p1_i0/sensors/?select=*.xml;recurse=yes"
-for $r_min in collection($sensor_collection_min)/root/dataCollection/data
-
-let $sensor_collection_max := 
"../../../../../../../weather_data/dataset-tiny-local/data_links/local_speed_up/d0_p1_i0/sensors/?select=*.xml;recurse=yes"
-for $r_max in collection($sensor_collection_max)/root/dataCollection/data
-
-where $r_min/station eq $r_max/station
-    and $r_min/date eq $r_max/date
-    and $r_min/dataType eq "TMIN"
-    and $r_max/dataType eq "TMAX"
-return ($r_max/value - $r_min/value)
-) div 10
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/vxquery/blob/ab0838d9/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/saxon/q07_tmax.xq
----------------------------------------------------------------------
diff --git 
a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/saxon/q07_tmax.xq
 
b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/saxon/q07_tmax.xq
deleted file mode 100644
index 3245746..0000000
--- 
a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/saxon/q07_tmax.xq
+++ /dev/null
@@ -1,9 +0,0 @@
-(: XQuery Join Query :)
-(: Find the all the records for TMAX.                                         
:)
-count(
-    let $sensor_collection_max := 
"../../../../../../../weather_data/dataset-tiny-local/data_links/local_speed_up/d0_p1_i0/sensors/?select=*.xml;recurse=yes"
-    for $r_max in collection($sensor_collection_max)/root/dataCollection/data
-    
-    where $r_max/dataType eq "TMAX"
-    return $r_max
-)
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/vxquery/blob/ab0838d9/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/saxon/q07_tmin.xq
----------------------------------------------------------------------
diff --git 
a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/saxon/q07_tmin.xq
 
b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/saxon/q07_tmin.xq
deleted file mode 100644
index 6fcd276..0000000
--- 
a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/saxon/q07_tmin.xq
+++ /dev/null
@@ -1,9 +0,0 @@
-(: XQuery Join Query :)
-(: Find the all the records for TMIN.                                         
:)
-count(
-    let $sensor_collection_min := 
"../../../../../../../weather_data/dataset-tiny-local/data_links/local_speed_up/d0_p1_i0/sensors/?select=*.xml;recurse=yes"
-    for $r_min in collection($sensor_collection_min)/root/dataCollection/data
-    
-    where $r_min/dataType eq "TMIN"
-    return $r_min
-)
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/vxquery/blob/ab0838d9/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/saxon/sensor_count.xq
----------------------------------------------------------------------
diff --git 
a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/saxon/sensor_count.xq
 
b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/saxon/sensor_count.xq
deleted file mode 100644
index 1e8e312..0000000
--- 
a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/saxon/sensor_count.xq
+++ /dev/null
@@ -1,7 +0,0 @@
-(: XQuery Join Query :)
-(: Count all the weather sensor readings available.                           
:)
-count(
-    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
-    return $r
-)
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/vxquery/blob/ab0838d9/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/saxon/station_count.xq
----------------------------------------------------------------------
diff --git 
a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/saxon/station_count.xq
 
b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/saxon/station_count.xq
deleted file mode 100644
index fe6ec8f..0000000
--- 
a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/saxon/station_count.xq
+++ /dev/null
@@ -1,7 +0,0 @@
-(: XQuery Join Query :)
-(: Count all the weather stations available.                                  
:)
-count(
-    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
-    return $s
-)
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/vxquery/blob/ab0838d9/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/queries/q04_join_count.xq
----------------------------------------------------------------------
diff --git 
a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/queries/q04_join_count.xq
 
b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/queries/q04_join_count.xq
deleted file mode 100644
index c63deec..0000000
--- 
a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/queries/q04_join_count.xq
+++ /dev/null
@@ -1,32 +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. :)
-
-(: XQuery Join Query :)
-(: Find all the weather readings for Washington state for a specific day    :)
-(: 1976/7/4.                                                                  
:)
-fn:count(
-    let $station_collection := "/tmp/1.0_partition_ghcnd_all_xml/stations"
-    for $s in collection($station_collection)/stationCollection/station
-    
-    let $sensor_collection := "/tmp/1.0_partition_ghcnd_all_xml/sensors"
-    for $r in collection($sensor_collection)/dataCollection/data
-        
-    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"))
-        and xs:dateTime(fn:data($r/date)) eq 
xs:dateTime("1976-07-04T00:00:00.000")
-    return $r
-)
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/vxquery/blob/ab0838d9/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/queries/q05_join_count.xq
----------------------------------------------------------------------
diff --git 
a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/queries/q05_join_count.xq
 
b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/queries/q05_join_count.xq
deleted file mode 100644
index 0023cef..0000000
--- 
a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/queries/q05_join_count.xq
+++ /dev/null
@@ -1,33 +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. :)
-
-(: XQuery Join Aggregate Query :)
-(: Find the lowest recorded temperature (TMIN) in the United States for     :)
-(: 2001.                                                                      
:)
-fn:count(
-    let $station_collection := "/tmp/1.0_partition_ghcnd_all_xml/stations"
-    for $s in collection($station_collection)/stationCollection/station
-    
-    let $sensor_collection := "/tmp/1.0_partition_ghcnd_all_xml/sensors"
-    for $r in collection($sensor_collection)/dataCollection/data
-    
-    where $s/id eq $r/station
-        and (some $x in $s/locationLabels satisfies ($x/type eq "CNTRY" and 
$x/id eq "FIPS:US"))
-        and $r/dataType eq "TMIN" 
-        and fn:year-from-dateTime(xs:dateTime(fn:data($r/date))) eq 2001
-    return $r/value
-)
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/vxquery/blob/ab0838d9/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/queries/q06_join_count.xq
----------------------------------------------------------------------
diff --git 
a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/queries/q06_join_count.xq
 
b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/queries/q06_join_count.xq
deleted file mode 100644
index 85db07c..0000000
--- 
a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/queries/q06_join_count.xq
+++ /dev/null
@@ -1,32 +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. :)
-
-(: XQuery Join Query :)
-(: Find the highest recorded temperature (TMAX) for each station for each     
:)
-(: day over the year 2000.                                                    
:)
-fn:count(
-    let $station_collection := "/tmp/1.0_partition_ghcnd_all_xml/stations"
-    for $s in collection($station_collection)/stationCollection/station
-    
-    let $sensor_collection := "/tmp/1.0_partition_ghcnd_all_xml/sensors"
-    for $r in collection($sensor_collection)/dataCollection/data
-    
-    where $s/id eq $r/station
-        and $r/dataType eq "TMAX" 
-        and fn:year-from-dateTime(xs:dateTime(fn:data($r/date))) eq 2000
-    return ($s/displayName, $r/date, $r/value)
-)
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/vxquery/blob/ab0838d9/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/queries/q07_join_count.xq
----------------------------------------------------------------------
diff --git 
a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/queries/q07_join_count.xq
 
b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/queries/q07_join_count.xq
deleted file mode 100644
index 24b8340..0000000
--- 
a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/queries/q07_join_count.xq
+++ /dev/null
@@ -1,33 +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. :)
-
-(: XQuery Self Join Query :)
-(: Self join with all stations finding the difference in min and max       :)
-(: temperature and get the average.                                        :)
-fn:count(
-    let $sensor_collection_min := "/tmp/1.0_partition_ghcnd_all_xml/sensors"
-    for $r_min in collection($sensor_collection_min)/dataCollection/data
-    
-    let $sensor_collection_max := "/tmp/1.0_partition_ghcnd_all_xml/sensors"
-    for $r_max in collection($sensor_collection_max)/dataCollection/data
-    
-    where $r_min/station eq $r_max/station
-        and $r_min/date eq $r_max/date
-        and $r_min/dataType eq "TMIN"
-        and $r_max/dataType eq "TMAX"
-    return $r_max/value - $r_min/value
-)
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/vxquery/blob/ab0838d9/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/queries/q07_tmax_values.xq
----------------------------------------------------------------------
diff --git 
a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/queries/q07_tmax_values.xq
 
b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/queries/q07_tmax_values.xq
deleted file mode 100644
index 2b94827..0000000
--- 
a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/queries/q07_tmax_values.xq
+++ /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. :)
-
-(: XQuery Join Query :)
-(: Find the all the records for TMAX.                                         
:)
-let $sensor_collection_max := "/tmp/1.0_partition_ghcnd_all_xml/sensors"
-for $r_max in collection($sensor_collection_max)/dataCollection/data
-
-where $r_max/dataType eq "TMAX"
-return fn:concat($r_max/station, ",", $r_max/date, ",", $r_max/dataType)
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/vxquery/blob/ab0838d9/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/queries/q07_tmin_self.xq
----------------------------------------------------------------------
diff --git 
a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/queries/q07_tmin_self.xq 
b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/queries/q07_tmin_self.xq
deleted file mode 100644
index 6eb9f70..0000000
--- 
a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/queries/q07_tmin_self.xq
+++ /dev/null
@@ -1,33 +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. :)
-
-(: XQuery Self Join Query :)
-(: Self join with all stations finding the difference in min and max       :)
-(: temperature and get the average.                                        :)
-fn:count(
-    let $sensor_collection_min := "/tmp/1.0_partition_ghcnd_all_xml/sensors"
-    for $r_min in collection($sensor_collection_min)/dataCollection/data
-    
-    let $sensor_collection_max := "/tmp/1.0_partition_ghcnd_all_xml/sensors"
-    for $r_max in collection($sensor_collection_max)/dataCollection/data
-    
-    where $r_min/station eq $r_max/station
-        and $r_min/date eq $r_max/date
-        and $r_min/dataType eq "TMIN"
-        and $r_max/dataType eq "TMIN"
-    return $r_max/station
-)
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/vxquery/blob/ab0838d9/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/queries/q07_tmin_values.xq
----------------------------------------------------------------------
diff --git 
a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/queries/q07_tmin_values.xq
 
b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/queries/q07_tmin_values.xq
deleted file mode 100644
index fa390a0..0000000
--- 
a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/queries/q07_tmin_values.xq
+++ /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. :)
-
-(: XQuery Join Query :)
-(: Find the all the records for TMIN.                                         
:)
-let $sensor_collection_min := "/tmp/1.0_partition_ghcnd_all_xml/sensors"
-for $r_min in collection($sensor_collection_min)/dataCollection/data
-
-where $r_min/dataType eq "TMIN"
-return fn:concat($r_min/station, ",", $r_min/date, ",", $r_min/dataType)
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/vxquery/blob/ab0838d9/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/benchmark_logging.properties
----------------------------------------------------------------------
diff --git 
a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/benchmark_logging.properties
 
b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/benchmark_logging.properties
deleted file mode 100644
index 2fb0af0..0000000
--- 
a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/benchmark_logging.properties
+++ /dev/null
@@ -1 +0,0 @@
-java.util.logging.ConsoleHandler.level=OFF
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/vxquery/blob/ab0838d9/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
deleted file mode 100644
index b6ff22f..0000000
--- 
a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/run_group_test.sh
+++ /dev/null
@@ -1,35 +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.
-#
-
-cluster_ip=${1}
-
-for n in 2 1 0
-do
-    for t in "batch_scale_out" "speed_up"
-    do 
-        for p in 2 1
-        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}"
-            done
-        done
-    done
-done

http://git-wip-us.apache.org/repos/asf/vxquery/blob/ab0838d9/vxquery-benchmark/src/main/resources/util/find_averages_in_logs.py
----------------------------------------------------------------------
diff --git a/vxquery-benchmark/src/main/resources/util/find_averages_in_logs.py 
b/vxquery-benchmark/src/main/resources/util/find_averages_in_logs.py
deleted file mode 100644
index 1cd7939..0000000
--- a/vxquery-benchmark/src/main/resources/util/find_averages_in_logs.py
+++ /dev/null
@@ -1,97 +0,0 @@
-#!/usr/bin/env python
-#
-# 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.
-import fnmatch
-import getopt
-import glob
-import os
-import sys
-import csv
-
-SEARCH_STRING = 'Average execution time:'
-
-def find_files(directory, pattern):
-    for root, dirs, files in os.walk(directory):
-        for basename in files:
-            if fnmatch.fnmatch(basename, pattern):
-                yield (root, basename)
-    
-    
-def main(argv):
-    ''' Same as bash: find $FOLDER -type f -name "*.xml" -exec basename {} \; 
> list_xml.csv
-    '''
-    log_folder = ""
-    save_file = ""
-    data_type = ""
-    
-    # Get the base folder
-    try:
-        opts, args = getopt.getopt(argv, "f:hs:t:", ["folder=", "save_file=", 
"data_type="])
-    except getopt.GetoptError:
-        print 'The file options for list_xml_files.py were not correctly 
specified.'
-        print 'To see a full list of options try:'
-        print '  $ python list_xml_files.py -h'
-        sys.exit(2)
-    for opt, arg in opts:
-        if opt == '-h':
-            print 'Options:'
-            print '    -f        The base folder to build XML file list.'
-            print '    -s        The save file.'
-            sys.exit()
-        elif opt in ('-f', "--folder"):
-            # check if file exists.
-            if os.path.exists(arg):
-                log_folder = arg
-            else:
-                print 'Error: Argument must be a folder name for --folder 
(-f).'
-                sys.exit()
-        elif opt in ('-s', "--save_file"):
-            save_file = arg
-        elif opt in ('-t', "--data_type"):
-            data_type = arg
-  
-    # Required fields to run the script.
-    if log_folder == "" or not os.path.exists(log_folder):
-        print 'Error: The folder path option must be supplied:  --folder (-f).'
-        sys.exit()
-    if save_file == "":
-        print 'Error: The folder path option must be supplied:  --save_file 
(-s).'
-        sys.exit()
-      
-    list_xml_csv = ''
-    with open(save_file, 'w') as outfile:
-        csvfile = csv.writer(outfile)
-        for path, filename in find_files(log_folder, '*.log'):
-            # Only write out a specific type of data xml documents found in a 
specific path.
-            with open(path + "/" + filename) as infile:
-                folders = path.replace(log_folder, "")
-                for line in infile:
-                    # Skip the root tags.
-                    if line.startswith(SEARCH_STRING):
-                        time_split = line.split(" ")
-                        name_split = filename.split(".")
-                        folder_split = folders.split("/")
-
-                        # Build data row
-                        row = folder_split
-                        row.append(name_split[0])
-                        row.append(time_split[3])
-                        row.append(name_split[2])
-                        csvfile.writerow(row)
-        
-          
-if __name__ == "__main__":
-    main(sys.argv[1:])

http://git-wip-us.apache.org/repos/asf/vxquery/blob/ab0838d9/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
deleted file mode 100644
index 6e54b0c..0000000
--- a/vxquery-benchmark/src/main/resources/util/log_top.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/bash
-LOG_FILE=logs/top.log
-
-# Reset counters
-iostat >> /dev/null
-sar -n DEV 1 1  >> /dev/null
-
-# Save IO, CPU and Network snapshot to a log file.
-while (sleep 10)
-do
-       echo "---------------------------------------------" >> ${LOG_FILE}
-       date >> ${LOG_FILE}
-       echo >> ${LOG_FILE}
-       iostat >> ${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

http://git-wip-us.apache.org/repos/asf/vxquery/blob/ab0838d9/vxquery-benchmark/src/main/resources/util/merge_xml_files.py
----------------------------------------------------------------------
diff --git a/vxquery-benchmark/src/main/resources/util/merge_xml_files.py 
b/vxquery-benchmark/src/main/resources/util/merge_xml_files.py
deleted file mode 100644
index 8a6952b..0000000
--- a/vxquery-benchmark/src/main/resources/util/merge_xml_files.py
+++ /dev/null
@@ -1,88 +0,0 @@
-#!/usr/bin/env python
-#
-# 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.
-import fnmatch
-import getopt
-import glob
-import os
-import sys
-
-XML_PREFIX = '<?xml version="1.0" encoding="UTF-8" standalone="yes"?><root>' + 
"\n"
-XML_SUFFIX = '</root>' + "\n"
-
-def find_files(directory, pattern):
-    for root, dirs, files in os.walk(directory):
-        for basename in files:
-            if fnmatch.fnmatch(basename, pattern):
-                yield (root, basename)
-    
-    
-def main(argv):
-    ''' Same as bash: find $FOLDER -type f -name "*.xml" -exec basename {} \; 
> list_xml.csv
-    '''
-    xml_folder = ""
-    save_file = ""
-    data_type = ""
-     
-    # Get the base folder
-    try:
-        opts, args = getopt.getopt(argv, "f:hs:t:", ["folder=", "save_file=", 
"data_type="])
-    except getopt.GetoptError:
-        print 'The file options for list_xml_files.py were not correctly 
specified.'
-        print 'To see a full list of options try:'
-        print '  $ python list_xml_files.py -h'
-        sys.exit(2)
-    for opt, arg in opts:
-        if opt == '-h':
-            print 'Options:'
-            print '    -f        The base folder to build XML file list.'
-            print '    -s        The save file.'
-            sys.exit()
-        elif opt in ('-f', "--folder"):
-            # check if file exists.
-            if os.path.exists(arg):
-                xml_folder = arg
-            else:
-                print 'Error: Argument must be a folder name for --folder 
(-f).'
-                sys.exit()
-        elif opt in ('-s', "--save_file"):
-            save_file = arg
-        elif opt in ('-t', "--data_type"):
-            data_type = arg
-  
-    # Required fields to run the script.
-    if xml_folder == "" or not os.path.exists(xml_folder):
-        print 'Error: The folder path option must be supplied:  --folder (-f).'
-        sys.exit()
-    if save_file == "":
-        print 'Error: The folder path option must be supplied:  --save_file 
(-s).'
-        sys.exit()
-      
-    list_xml_csv = ''
-    with open(save_file, 'w') as outfile:
-        outfile.write(XML_PREFIX)
-        for path, filename in find_files(xml_folder, '*.xml'):
-            # Only write out a specific type of data xml documents found in a 
specific path.
-            if data_type in path:
-                with open(path + "/" + filename) as infile:
-                    for line in infile:
-                        # Skip the root tags.
-                        if line != XML_PREFIX and line != XML_SUFFIX:
-                            outfile.write(line)
-        outfile.write(XML_SUFFIX)
-          
-if __name__ == "__main__":
-    main(sys.argv[1:])

http://git-wip-us.apache.org/repos/asf/vxquery/blob/ab0838d9/vxquery-benchmark/src/main/resources/xmark/README.md
----------------------------------------------------------------------
diff --git a/vxquery-benchmark/src/main/resources/xmark/README.md 
b/vxquery-benchmark/src/main/resources/xmark/README.md
deleted file mode 100644
index 2c293bd..0000000
--- a/vxquery-benchmark/src/main/resources/xmark/README.md
+++ /dev/null
@@ -1,28 +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.
--->
-
-XMark
-=====
-
-# Description
-
-The original XMark queries and data generation are available at 
http://www.xml-benchmark.org/downloads.html, 
-with the queries being viewable online at 
http://www.ins.cwi.nl/projects/xmark/Assets/xmlquery.txt. In the
-query folder, we have separate query files singling out the exact syntax for 
the versions of these queries 
-used in our VXQuery work with XMark; the differences are due to the way we 
have physically organized the 
-XMark data for storage/parallelism reasons.
-  

http://git-wip-us.apache.org/repos/asf/vxquery/blob/ab0838d9/vxquery-benchmark/src/main/resources/xmark/data/categories/micro_categories.xml
----------------------------------------------------------------------
diff --git 
a/vxquery-benchmark/src/main/resources/xmark/data/categories/micro_categories.xml
 
b/vxquery-benchmark/src/main/resources/xmark/data/categories/micro_categories.xml
deleted file mode 100644
index b5c4b7f..0000000
--- 
a/vxquery-benchmark/src/main/resources/xmark/data/categories/micro_categories.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" standalone="yes"?>
-<site>
-<categories>
-<category id="category0">
-<name>dispatch reported dotard holofernes </name>
-<description>
-<parlist>
-<listitem>
-<text>
-shift carrion doubtful strangle sounding crowned troubled naked yesterday 
overthrow owe silent recount waters derive sans four 
-</text>
-</listitem>
-<listitem>
-<parlist>
-<listitem>
-<text>
-fragment pamper arthur thrive wound fouler streets preventions obey vow bawds 
myrtle said infinite montague fierce sense ride souls commended gainsay 
profession labour intents persuade alter 
-</text>
-</listitem>
-<listitem>
-<text>
-ord villain wore thunder congeal pawned alack customary deny faithful top 
office spoken please neighbour office afternoon drum embowell touch sue 
lifeless leapt called weary congregation yield 
-</text>
-</listitem>
-<listitem>
-<text>
-mental fatal hard ancient stands cor dishes therein gramercy discipline 
farewell dire tricks protest cut horatio brother speech sleeping adultress 
pitch cave liv nurse drink state plants combating desired requir rebellion 
afraid repented tree scald stopp wine advise undermine norfolk vilely whet 
scars companions hanging foolish scene musty fruitful unburthen teacher 
garments betimes sight now for oaths vouchsafe particulars globe laertes 
afflictions rouse once news humanity buck destroy military lucius lap <keyword> 
considered forc mourning verona </keyword> waters triumphing officer hastily 
<emph> resign subject figure hay thwart written signs gout bred distance period 
glove players change folly </emph> going wat lost song hautboys pick business 
crocodile leading cave twice frenzy sprightly dislike invite forbids morn 
devour ambassador seldom speak tickling rejoice triumphant ascanius forward 
-</text>
-</listitem>
-</parlist>
-</listitem>
-</parlist>
-</description>
-</category>
-</categories>
-</site>

http://git-wip-us.apache.org/repos/asf/vxquery/blob/ab0838d9/vxquery-benchmark/src/main/resources/xmark/data/catgraph/micro_catgraph.xml
----------------------------------------------------------------------
diff --git 
a/vxquery-benchmark/src/main/resources/xmark/data/catgraph/micro_catgraph.xml 
b/vxquery-benchmark/src/main/resources/xmark/data/catgraph/micro_catgraph.xml
deleted file mode 100644
index 85427ef..0000000
--- 
a/vxquery-benchmark/src/main/resources/xmark/data/catgraph/micro_catgraph.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" standalone="yes"?>
-<site>
-<catgraph>
-<edge from="category0" to="category0"/>
-</catgraph>
-</site>

http://git-wip-us.apache.org/repos/asf/vxquery/blob/ab0838d9/vxquery-benchmark/src/main/resources/xmark/data/closed_auctions/micro_closed_auctions.xml
----------------------------------------------------------------------
diff --git 
a/vxquery-benchmark/src/main/resources/xmark/data/closed_auctions/micro_closed_auctions.xml
 
b/vxquery-benchmark/src/main/resources/xmark/data/closed_auctions/micro_closed_auctions.xml
deleted file mode 100644
index d637766..0000000
--- 
a/vxquery-benchmark/src/main/resources/xmark/data/closed_auctions/micro_closed_auctions.xml
+++ /dev/null
@@ -1,118 +0,0 @@
-<?xml version="1.0" standalone="yes"?>
-<site>
-<closed_auctions>
-<closed_auction>
-<seller person="person0"/>
-<buyer person="person0"/>
-<itemref item="item1"/>
-<price>113.87</price>
-<date>06/06/2000</date>
-<quantity>1</quantity>
-<type>Regular</type>
-<annotation>
-<author person="person0"/>
-<description>
-<parlist>
-<listitem>
-<parlist>
-<listitem>
-<text>
-farewells religion fetch bells rage names valued exeunt soul albans ungently 
advised serving ratcliff braggarts knowest desp sheep died repeat toy corrupted 
michael help dunghill trembles pill reap office early secure desires hated 
garland carriage impatient deserts feel challenger evil <bold> editions depart 
laur hereford richer </bold> 
-</text>
-</listitem>
-<listitem>
-<text>
-proudest lust approve rey should spectacles fiery perfect worshipp foul quod 
yes remorse young tyburn thrust attending spear shun doctor wild 
-</text>
-</listitem>
-</parlist>
-</listitem>
-<listitem>
-<text>
-throng grandam awak helpless ventidius tread defeat teem durst wonderful 
attaint chaste sees fulfill mortality arme expedient attendants themselves 
performed leading sing villain skill store mischief see consciences sail text 
speed sons spleen die oft girl atomies commodity honor fall stopp they 
-</text>
-</listitem>
-<listitem>
-<text>
-rain pays spilling rancour reasons grieves camp bachelor crow can whom 
soldiers growth invite less for vaughan properties <keyword> record penury 
herself reasons merits villainous whereupon wrote penny mar </keyword> 
preventions followed best eternity bestow blots rocks barnardine torn cassio 
tailor fame forfeit triumphant conceived deem cowardly merciful topgallant 
flint purgation whosoever ventidius befits forever bankrupt choughs stains 
certain violated burgundy shadows possesseth men repent predominant burns 
revelry swore prodigious next tyrant oath noses apart balth trade feasting 
field importunity expect experience kingly stay babe hopes liege astonished 
suspicion unmannerd alexander crown soil committed god stately incensed trance 
oracle slowness fast princes damned corn grandsire change tender end fields 
slain palm softly samp shore notion herod messengers horseman <bold> riggish 
</bold> quirks shut thence beware jewels sland preventions has sells assails 
influences oppressi
 on pow maggot caught methought mechanical durst liker not seat <emph> assigns 
flesh made his third <keyword> seemeth </keyword> peril gain they stroke 
forsworn scape full determin professes commons </emph> lordship clear operation 
practice pyrrhus earnest broke devil posterity company text misbegotten oregon 
strike saw arthur earnestly brow popilius ugly serves presentation commandment 
metal comparing thereon true secretly gallows preventions horridly slack 
lieutenant hers stop clown rosalinde wed pretty wildly 
-</text>
-</listitem>
-</parlist>
-</description>
-<happiness>9</happiness>
-</annotation>
-</closed_auction>
-<closed_auction>
-<seller person="person0"/>
-<buyer person="person0"/>
-<itemref item="item2"/>
-<price>96.92</price>
-<date>12/05/2001</date>
-<quantity>1</quantity>
-<type>Featured</type>
-<annotation>
-<author person="person0"/>
-<description>
-<text>
-hitherto queen painted seat fords clay recall countryman divided delicate 
mocking active bills filth pledge surrender madness sufficiency moved converse 
goot claw show edmundsbury torment tough fish mediators tarquin pyrrhus 
<keyword> heathen </keyword> 
-</text>
-</description>
-<happiness>6</happiness>
-</annotation>
-</closed_auction>
-<closed_auction>
-<seller person="person0"/>
-<buyer person="person0"/>
-<itemref item="item3"/>
-<price>53.85</price>
-<date>05/11/1999</date>
-<quantity>1</quantity>
-<type>Featured</type>
-<annotation>
-<author person="person0"/>
-<description>
-<text>
-strives occasion question sticks shall ingenious sinews liquid ashy 
gentlewomen authority assay hole selves living near doting modest wiltshire 
mocker eton profess forgeries butt wade lawful maccabaeus wert forced 
succeeding becomes wayward got 
-</text>
-</description>
-<happiness>6</happiness>
-</annotation>
-</closed_auction>
-<closed_auction>
-<seller person="person0"/>
-<buyer person="person0"/>
-<itemref item="item4"/>
-<price>123.52</price>
-<date>02/11/1999</date>
-<quantity>1</quantity>
-<type>Regular</type>
-<annotation>
-<author person="person0"/>
-<description>
-<text>
-vowed keys imperial were swinstead forsake cat aliena spies crave requite 
forfeit doctor <emph> possess </emph> aught demand ceremonies obscure engross 
hero restraint bolingbroke neighbour crimes dominions common turns conduct wav 
therewithal abandon yet hunger 
-</text>
-</description>
-<happiness>5</happiness>
-</annotation>
-</closed_auction>
-<closed_auction>
-<seller person="person0"/>
-<buyer person="person0"/>
-<itemref item="item5"/>
-<price>96.06</price>
-<date>04/24/1999</date>
-<quantity>2</quantity>
-<type>Featured</type>
-<annotation>
-<author person="person0"/>
-<description>
-<text>
-jove superiors prolong which conspirator crowns fellowship indisposition skins 
filthy divers fault apparell worthiness supposition parchment restitution rings 
rages remains lass dependent pelican contrive paradoxes unmask desdemona weak 
pleases shame wisely cheek poison avoid ulysses exeunt answer smoothing 
punishment much anointed bloody shook here armado supply four digestion 
unresisted consummate glou ding figure made unwrung worst repute envious 
meanest read nan stake shriek tower nights armed drinking instant scruple 
citizens rightful nonino shame hills dismal other fasting attends judge aspire 
hand putting repeal grounds bestrid commission crave mess tarries sport view 
freely lame done intend cast shun kills presented body landed question hem same 
burdens plenty esteem weak sigh sunday body preventions revenge horses 
cleomenes thrust what albeit foolishly mirror gently mock allow index evils 
should consider deeds suit damsons willoughby thousand number morn banish 
barricado un
 folding perhaps gently stalk degree oblivion wars monsieur companies swords 
shifted clay strives frozen jour <emph> ajax states mark parcels advertised 
utterly virtue flatter sleeping ope </emph> lucilius tybalt glow killed account 
obdurate kindly <bold> heart light bosom garden cog yet daughters tott </bold> 
lifted offer 
-</text>
-</description>
-<happiness>4</happiness>
-</annotation>
-</closed_auction>
-</closed_auctions>
-</site>

http://git-wip-us.apache.org/repos/asf/vxquery/blob/ab0838d9/vxquery-benchmark/src/main/resources/xmark/data/open_auctions/micro_open_auctions.xml
----------------------------------------------------------------------
diff --git 
a/vxquery-benchmark/src/main/resources/xmark/data/open_auctions/micro_open_auctions.xml
 
b/vxquery-benchmark/src/main/resources/xmark/data/open_auctions/micro_open_auctions.xml
deleted file mode 100644
index 70a2709..0000000
--- 
a/vxquery-benchmark/src/main/resources/xmark/data/open_auctions/micro_open_auctions.xml
+++ /dev/null
@@ -1,117 +0,0 @@
-<?xml version="1.0" standalone="yes"?>
-<site>
-<open_auctions>
-<open_auction id="open_auction0">
-<initial>13.56</initial>
-<reserve>33.78</reserve>
-<bidder>
-<date>10/22/2001</date>
-<time>10:21:43</time>
-<personref person="person0"/>
-<increase>55.50</increase>
-</bidder>
-<bidder>
-<date>07/27/2001</date>
-<time>12:36:50</time>
-<personref person="person0"/>
-<increase>19.50</increase>
-</bidder>
-<bidder>
-<date>02/14/2000</date>
-<time>16:40:16</time>
-<personref person="person0"/>
-<increase>19.50</increase>
-</bidder>
-<bidder>
-<date>05/09/2001</date>
-<time>11:39:57</time>
-<personref person="person0"/>
-<increase>30.00</increase>
-</bidder>
-<bidder>
-<date>07/12/1999</date>
-<time>23:20:27</time>
-<personref person="person0"/>
-<increase>13.50</increase>
-</bidder>
-<bidder>
-<date>10/21/2001</date>
-<time>01:19:47</time>
-<personref person="person0"/>
-<increase>3.00</increase>
-</bidder>
-<bidder>
-<date>09/28/2001</date>
-<time>17:03:24</time>
-<personref person="person0"/>
-<increase>6.00</increase>
-</bidder>
-<bidder>
-<date>11/15/1999</date>
-<time>14:23:15</time>
-<personref person="person0"/>
-<increase>9.00</increase>
-</bidder>
-<bidder>
-<date>01/02/1998</date>
-<time>22:18:07</time>
-<personref person="person0"/>
-<increase>1.50</increase>
-</bidder>
-<bidder>
-<date>12/24/2001</date>
-<time>16:46:32</time>
-<personref person="person0"/>
-<increase>13.50</increase>
-</bidder>
-<bidder>
-<date>08/12/2000</date>
-<time>11:41:54</time>
-<personref person="person0"/>
-<increase>3.00</increase>
-</bidder>
-<bidder>
-<date>11/15/2000</date>
-<time>15:53:40</time>
-<personref person="person0"/>
-<increase>6.00</increase>
-</bidder>
-<bidder>
-<date>03/04/2000</date>
-<time>20:46:15</time>
-<personref person="person0"/>
-<increase>16.50</increase>
-</bidder>
-<bidder>
-<date>07/22/1998</date>
-<time>10:34:11</time>
-<personref person="person0"/>
-<increase>25.50</increase>
-</bidder>
-<bidder>
-<date>04/01/1998</date>
-<time>10:44:22</time>
-<personref person="person0"/>
-<increase>7.50</increase>
-</bidder>
-<current>243.06</current>
-<itemref item="item0"/>
-<seller person="person0"/>
-<annotation>
-<author person="person0"/>
-<description>
-<text>
-debauch corpse canons domain night forsake yea satisfy between fume were 
monsters ear players moreover ungentleness sorrows prouder tonight favours rome 
bastard unshown excellence journey loves swearing proceeds stone buck battle 
breathless kindness prophesy entomb urging rogues hector conquer provoke 
nothing raw wight places needy feasted romeo rivers worser occupation brook 
stoops brooch plucks level samp tent windsor rubs whereof beam signior built 
suff heavy dull husbands roman favour urge spear gone wolf cheeks execute 
resolv such horrid drives provide twice spoke trade friar taking pheasant 
sentenc scarf corrections brothers charge spur ass agamemnon truepenny saves 
roots practis impatient diest didest starv seeing beneath interpose gods home 
black forgot snuff dress dozen napkins <emph> countess northumberland headlong 
needless angry pleading </emph> better joy <emph> meagre </emph> reap enquire 
crab wales died violent rear past liberty <emph> braggart armour infer bankrupt 
w
 inds teeth </emph> case wore pouch crows cognition <keyword> reports 
expedition free chief cressida hearsed </keyword> loath monuments silent 
congregation soon farm doct ross susan ready empty dedicate shilling whole soul 
foot beseech higher lifeless hay postmaster distress disposition <bold> 
inherits </bold> marcus betters pitch betray beam corse player quality ros 
conduct thersites greediness boast pilgrims startles contented belch hung thus 
captain early blood par brook jul gain needs above ensign grapes revelling 
glean thank 
-</text>
-</description>
-<happiness>6</happiness>
-</annotation>
-<quantity>1</quantity>
-<type>Regular</type>
-<interval>
-<start>06/16/1999</start>
-<end>05/12/2001</end>
-</interval>
-</open_auction>
-</open_auctions>
-</site>

http://git-wip-us.apache.org/repos/asf/vxquery/blob/ab0838d9/vxquery-benchmark/src/main/resources/xmark/data/people/micro_people.xml
----------------------------------------------------------------------
diff --git 
a/vxquery-benchmark/src/main/resources/xmark/data/people/micro_people.xml 
b/vxquery-benchmark/src/main/resources/xmark/data/people/micro_people.xml
deleted file mode 100644
index 55d8203..0000000
--- a/vxquery-benchmark/src/main/resources/xmark/data/people/micro_people.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" standalone="yes"?>
-<site>
-<people>
-<person id="person0">
-<name>Jaak Tempesti</name>
-<emailaddress>mailto:[email protected]</emailaddress>
-<phone>+0 (873) 14873867</phone>
-<homepage>http://www.labs.com/~Tempesti</homepage>
-<creditcard>5048 5813 2703 8253</creditcard>
-<watches>
-<watch open_auction="open_auction0"/>
-</watches>
-</person>
-</people>
-</site>

Reply via email to