Fix print-speedup.py to query database correctlyHEADmaster

Wasn't pulling from the database or extracting the correct field.

3 files changed, 7 insertions, 6 deletions

diff --git a/benchmark-terasort-report b/benchmark-terasort-report
index 5448d17..3088829 100755
--- a/benchmark-terasort-report
+++ b/benchmark-terasort-report
@@ -24,7 +24,7 @@ THIS_BENCHMARK_DIR="$(cd $(dirname "${BASH_SOURCE[0]}") && pwd -P)"
 PATH=$THIS_BENCHMARK_DIR:$PATH
 source $THIS_BENCHMARK_DIR/common.sh
 
-ZERO_BASELINE=${ZERO_BASELINE:=1} server_today=$(print-speedup server)
+ZERO_BASELINE=${ZERO_BASELINE:=1} server_today=$(print-speedup)
 
 y=$(echo "scale=10; $server_today / ${SERVER_BASELINE}" | bc)
 
@@ -38,7 +38,7 @@ echo ""
 echo "This test measures the performance of the server and client compilers"
 echo "running Hadoop sorting a ${NGIGABYTES}GB file using Terasort and compares"
 echo "the performance against the baseline performance of the Zero interpreter"
-echo "and against the baseline performance of the client and server compilers"
+echo "and against the baseline performance of the server compiler"
 echo "on $BASEDATE."
 echo ""
 echo "Relative performance: Zero: 1.0, Server: ${server_today}"
diff --git a/print-speedup b/print-speedup
index 68fcb8c..dec1b5f 100755
--- a/print-speedup
+++ b/print-speedup
@@ -20,4 +20,4 @@
 
 THIS_BENCHMARK_DIR="$(cd $(dirname "${BASH_SOURCE[0]}") && pwd -P)"
 source $THIS_BENCHMARK_DIR/common.sh
-$THIS_BENCHMARK_DIR/print-speedup.py $RESULTS_DB "$@"
+$THIS_BENCHMARK_DIR/print-speedup.py $RESULTS_DB
diff --git a/print-speedup.py b/print-speedup.py
index f044b91..96d0638 100755
--- a/print-speedup.py
+++ b/print-speedup.py
@@ -29,7 +29,7 @@ if baseline is None or len(baseline) == 0:
     sys.exit(0)
 
 if len(sys.argv) < 2:
-    print "usage: {} <filename> <jvm-type>".format(sys.argv[0])
+    print "usage: {} <filename>".format(sys.argv[0])
     sys.exit(1)
 
 if not os.path.exists(sys.argv[1]):
@@ -40,14 +40,15 @@ conn = sqlite3.connect(sys.argv[1])
 
 query = "select date(datetime(timestamp, 'unixepoch', 'localtime')) as date, \
 		elapsed_time \
+                from results \
 	   order by date DESC LIMIT 1;"
 
 cur = conn.cursor()
-cur.execute(query, [sys.argv[2]])
+cur.execute(query)
 row = cur.fetchone()
 
 if row is None:
     print "error: no result from query: {}".format(query)
     sys.exit(1)
 
-print round(float(baseline) / float(row[2]), 2)
+print round(float(baseline) / float(row[1]), 2)