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/08/21 08:20:00 UTC
[1/2] git commit: A few minor fixes to the benchmarks scripts.
Repository: vxquery
Updated Branches:
refs/heads/prestonc/join_hash_size 569ccd650 -> da6ff7145
refs/heads/prestonc/vxquery_test_suite 6ded3150f -> 5ee0a43a7
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/da6ff714
Tree: http://git-wip-us.apache.org/repos/asf/vxquery/tree/da6ff714
Diff: http://git-wip-us.apache.org/repos/asf/vxquery/diff/da6ff714
Branch: refs/heads/prestonc/join_hash_size
Commit: da6ff71458d0d4f0b7c932ad60f864c497d2bf5b
Parents: 569ccd6
Author: Preston Carman <pr...@apache.org>
Authored: Wed Aug 20 23:18:27 2014 -0700
Committer: Preston Carman <pr...@apache.org>
Committed: Wed Aug 20 23:18:27 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/da6ff714/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/da6ff714/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/da6ff714/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/da6ff714/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"]
[2/2] git commit: Remove extra reporting.
Posted by pr...@apache.org.
Remove extra reporting.
Project: http://git-wip-us.apache.org/repos/asf/vxquery/repo
Commit: http://git-wip-us.apache.org/repos/asf/vxquery/commit/5ee0a43a
Tree: http://git-wip-us.apache.org/repos/asf/vxquery/tree/5ee0a43a
Diff: http://git-wip-us.apache.org/repos/asf/vxquery/diff/5ee0a43a
Branch: refs/heads/prestonc/vxquery_test_suite
Commit: 5ee0a43a73289ccf7b40e9f4c14b0102dd709a77
Parents: 6ded315
Author: Preston Carman <pr...@apache.org>
Authored: Wed Aug 20 23:19:45 2014 -0700
Committer: Preston Carman <pr...@apache.org>
Committed: Wed Aug 20 23:19:45 2014 -0700
----------------------------------------------------------------------
.../src/main/java/org/apache/vxquery/xtest/TestRunner.java | 1 -
.../src/test/java/org/apache/vxquery/xtest/VXQueryTest.java | 2 +-
2 files changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/vxquery/blob/5ee0a43a/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/TestRunner.java
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/TestRunner.java b/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/TestRunner.java
index daba8ca..9c0bc64 100644
--- a/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/TestRunner.java
+++ b/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/TestRunner.java
@@ -133,7 +133,6 @@ public class TestRunner {
res.result.trim();
hcc.waitForCompletion(jobId);
} catch (HyracksException e) {
- e.printStackTrace();
Throwable t = e;
while (t.getCause() != null) {
t = t.getCause();
http://git-wip-us.apache.org/repos/asf/vxquery/blob/5ee0a43a/vxquery-xtest/src/test/java/org/apache/vxquery/xtest/VXQueryTest.java
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/java/org/apache/vxquery/xtest/VXQueryTest.java b/vxquery-xtest/src/test/java/org/apache/vxquery/xtest/VXQueryTest.java
index a759819..28d7735 100644
--- a/vxquery-xtest/src/test/java/org/apache/vxquery/xtest/VXQueryTest.java
+++ b/vxquery-xtest/src/test/java/org/apache/vxquery/xtest/VXQueryTest.java
@@ -37,7 +37,7 @@ public class VXQueryTest {
private static XTestOptions getOptions() {
XTestOptions opts = new XTestOptions();
opts.catalog = StringUtils.join(new String[] { "src", "test", "resources", CATALOG }, File.separator);
- opts.verbose = true;
+ opts.verbose = false;
opts.threads = 1;
return opts;
}