You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@vxquery.apache.org by pr...@apache.org on 2014/03/13 20:21:40 UTC

[09/18] git commit: A few more tweaks to the weather scripts.

A few more tweaks to the weather scripts.

* now supports all queries.
* example has been update to a single partition.


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

Branch: refs/heads/prestonc/hash_join
Commit: 676977cb986df934de0274e96458a7072dea4e28
Parents: a40f41f
Author: Preston Carman <pr...@apache.org>
Authored: Tue Mar 4 17:26:00 2014 -0800
Committer: Preston Carman <pr...@apache.org>
Committed: Tue Mar 4 17:26:00 2014 -0800

----------------------------------------------------------------------
 .../main/resources/noaa-ghcn-daily/scripts/weather_benchmark.py  | 3 +--
 .../noaa-ghcn-daily/scripts/weather_example_cluster.xml          | 4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/676977cb/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/weather_benchmark.py
----------------------------------------------------------------------
diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/weather_benchmark.py b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/weather_benchmark.py
index 4813bd9..a812a1f 100644
--- a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/weather_benchmark.py
+++ b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/weather_benchmark.py
@@ -35,8 +35,7 @@ class WeatherBenchmark:
 
     QUERY_REPLACEMENT_KEY = "/tmp/1.0_partition_ghcnd_all_xml/"
     QUERY_MASTER_FOLDER = "../queries/"
-    QUERY_FILE_LIST = ["q00.xq", "q01.xq", "q02.xq", "q03.xq"] 
-#     QUERY_FILE_LIST = ["q00.xq", "q01.xq", "q02.xq", "q03.xq", "q04.xq", "q05.xq"] 
+    QUERY_FILE_LIST = ["q00.xq", "q01.xq", "q02.xq", "q03.xq", "q04.xq", "q05.xq"] 
     BENCHMARK_LOCAL_TESTS = ["local_speed_up", "local_batch_scale_out"] 
     BENCHMARK_CLUSTER_TESTS = ["speed_up", "batch_scale_out"] 
     QUERY_COLLECTIONS = ["sensors", "stations"]

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/676977cb/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/weather_example_cluster.xml
----------------------------------------------------------------------
diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/weather_example_cluster.xml b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/weather_example_cluster.xml
index 87be4e3..c8d253f 100644
--- a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/weather_example_cluster.xml
+++ b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/weather_example_cluster.xml
@@ -43,7 +43,7 @@
         <test>speed_up</test>
         <test>batch_scale_out</test>
         <save_path>/data</save_path>
-        <partitions_per_path>4</partitions_per_path>
+        <partitions_per_path>1</partitions_per_path>
     </dataset>
     <dataset>
         <name>small-2drives</name>
@@ -51,6 +51,6 @@
         <test>batch_scale_out</test>
         <save_path>/data</save_path>
         <save_path>/data2</save_path>
-        <partitions_per_path>2</partitions_per_path>
+        <partitions_per_path>1</partitions_per_path>
     </dataset>
 </data>