A few minor fixes to the benchmarks scripts.
Project: http://git-wip-us.apache.org/repos/asf/vxquery/repo Commit: http://git-wip-us.apache.org/repos/asf/vxquery/commit/0d165589 Tree: http://git-wip-us.apache.org/repos/asf/vxquery/tree/0d165589 Diff: http://git-wip-us.apache.org/repos/asf/vxquery/diff/0d165589 Branch: refs/heads/site Commit: 0d165589179ab5ce0c085eeed6bf9de2929aecdd Parents: ceaa49d Author: Preston Carman <[email protected]> Authored: Wed Aug 20 23:18:27 2014 -0700 Committer: Preston Carman <[email protected]> Committed: Wed Aug 20 23:23:13 2014 -0700 ---------------------------------------------------------------------- .../resources/noaa-ghcn-daily/scripts/run_benchmark.sh | 10 ++++++---- .../noaa-ghcn-daily/scripts/run_benchmark_cluster.sh | 5 ++++- .../resources/noaa-ghcn-daily/scripts/run_group_test.sh | 2 +- .../noaa-ghcn-daily/scripts/weather_benchmark.py | 7 ------- 4 files changed, 11 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/vxquery/blob/0d165589/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/run_benchmark.sh ---------------------------------------------------------------------- diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/run_benchmark.sh b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/run_benchmark.sh index 0852d86..632dbcb 100755 --- a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/run_benchmark.sh +++ b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/run_benchmark.sh @@ -28,6 +28,7 @@ REPEAT=5 FRAME_SIZE=$((8*1024)) BUFFER_SIZE=$((32*1024*1024)) +JOIN_HASH_SIZE=-1 if [ -z "${1}" ] then @@ -46,10 +47,11 @@ do log_file="$(basename ${j}).$(date +%Y%m%d%H%M).log" log_base_path=$(dirname ${j/queries/query_logs}) mkdir -p ${log_base_path} - time sh ./vxquery-cli/target/appassembler/bin/vxq ${j} ${2} -timing -showquery -showoet -showrp -frame-size ${FRAME_SIZE} -buffer-size ${BUFFER_SIZE} -repeatexec ${REPEAT} > ${log_base_path}/${log_file} 2>&1 - echo "Buffer Size: ${BUFFER_SIZE}" >> ${log_base_path}/${log_file} - echo "Frame Size: ${FRAME_SIZE}" >> ${log_base_path}/${log_file} - fi; + time sh ./vxquery-cli/target/appassembler/bin/vxq ${j} ${2} -timing -showquery -showoet -showrp -frame-size ${FRAME_SIZE} -buffer-size ${BUFFER_SIZE} -join-hash-size ${JOIN_HASH_SIZE} -repeatexec ${REPEAT} > ${log_base_path}/${log_file} 2>&1 + echo "\nBuffer Size: ${BUFFER_SIZE}" >> ${log_base_path}/${log_file} + echo "\nFrame Size: ${FRAME_SIZE}" >> ${log_base_path}/${log_file} + echo "\nJoin Hash Size: ${JOIN_HASH_SIZE}" >> ${log_base_path}/${log_file} + fi; done if which programname >/dev/null; http://git-wip-us.apache.org/repos/asf/vxquery/blob/0d165589/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/run_benchmark_cluster.sh ---------------------------------------------------------------------- diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/run_benchmark_cluster.sh b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/run_benchmark_cluster.sh index 5c27266..98ab04b 100755 --- a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/run_benchmark_cluster.sh +++ b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/run_benchmark_cluster.sh @@ -29,6 +29,8 @@ CLUSTER="uci" REPEAT=5 FRAME_SIZE=$((8*1024)) BUFFER_SIZE=$((32*1024*1024)) +#JOIN_HASH_SIZE=$((256*1024*1024)) +JOIN_HASH_SIZE=-1 if [ -z "${1}" ] then @@ -64,9 +66,10 @@ do log_file="$(basename ${j}).$(date +%Y%m%d%H%M).log" log_base_path=$(dirname ${j/queries/query_logs}) mkdir -p ${log_base_path} - time sh ./vxquery-cli/target/appassembler/bin/vxq ${j} ${3} -timing -showquery -showoet -showrp -frame-size ${FRAME_SIZE} -buffer-size ${BUFFER_SIZE} -repeatexec ${REPEAT} > ${log_base_path}/${log_file} 2>&1 + time sh ./vxquery-cli/target/appassembler/bin/vxq ${j} ${3} -timing -showquery -showoet -showrp -frame-size ${FRAME_SIZE} -buffer-size ${BUFFER_SIZE} -join-hash-size ${JOIN_HASH_SIZE} -repeatexec ${REPEAT} > ${log_base_path}/${log_file} 2>&1 echo "\nBuffer Size: ${BUFFER_SIZE}" >> ${log_base_path}/${log_file} echo "\nFrame Size: ${FRAME_SIZE}" >> ${log_base_path}/${log_file} + echo "\nJoin Hash Size: ${JOIN_HASH_SIZE}" >> ${log_base_path}/${log_file} fi; fi; done http://git-wip-us.apache.org/repos/asf/vxquery/blob/0d165589/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/run_group_test.sh ---------------------------------------------------------------------- diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/run_group_test.sh b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/run_group_test.sh index d5b8dc5..58976b7 100755 --- 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 @@ -27,7 +27,7 @@ do for t in "batch_scale_out" #for t in "speed_up" do - for p in 2 1 0 + for p in 2 do for c in 4 do http://git-wip-us.apache.org/repos/asf/vxquery/blob/0d165589/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 c013d8e..8021b2c 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 @@ -50,21 +50,14 @@ class WeatherBenchmark: "no_result.xq", "sensor_count.xq", "station_count.xq", - "q04_join_count.xq", "q04_sensor.xq", "q04_station.xq", - "q05_join_count.xq", "q05_sensor.xq", "q05_station.xq", - "q06_join_count.xq", "q06_sensor.xq", "q06_station.xq", - "q07_join_count.xq", "q07_tmin.xq", - "q07_tmin_values.xq", - "q07_tmin_self.xq", "q07_tmax.xq", - "q07_tmax_values.xq" ] BENCHMARK_LOCAL_TESTS = ["local_speed_up", "local_batch_scale_out"] BENCHMARK_CLUSTER_TESTS = ["speed_up", "batch_scale_out"]
