svn commit: r833782 - /lucene/java/branches/flex_1458/contrib/benchmark/sortBench.py

[mi...@apache.org]

Author: mikemccand
Date: Sun Nov  8 00:01:49 2009
New Revision: 833782

URL: http://svn.apache.org/viewvc?rev=833782&view=rev
Log:
LUCENE-1458 (on flex branch): fix report issues

Modified:
    lucene/java/branches/flex_1458/contrib/benchmark/sortBench.py

Modified: lucene/java/branches/flex_1458/contrib/benchmark/sortBench.py
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/benchmark/sortBench.py?rev=833782&r1=833781&r2=833782&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/contrib/benchmark/sortBench.py (original)
+++ lucene/java/branches/flex_1458/contrib/benchmark/sortBench.py Sun Nov  8 00:01:49 2009
@@ -430,7 +430,7 @@
 
 def report(name):
 
-  print '||Query||Tot hits||Top N||QPS old||QPS new||Pct change||'
+  print '||Query||Deletes %||Tot hits||QPS old||QPS new||Pct change||'
 
   results = cPickle.load(open('%s.pk' % name))
   for qpsOld, qpsNew, params in results:
@@ -442,7 +442,7 @@
 
     params = list(params)
 
-    query = params[2]
+    query = params[0]
     if query == '*:*':
       query = '<all>'
     params[2] = query
@@ -513,7 +513,7 @@
       maxDocs = INDEX_NUM_DOCS
       numDocs = int(INDEX_NUM_DOCS * (1.0-deletePct/100.))
 
-      prefix = r.getLogPrefix(query=query)
+      prefix = r.getLogPrefix(query=query, deletePct=deletePct)
       indexPath = '%s/%s' % (INDEX_DIR_BASE, indexes['baseline'])
 
       # baseline (trunk)
@@ -540,7 +540,7 @@
 
       if mode == 'run':
         r.compare(baseline, flex,
-                  query, baseline[0], numHits)
+                  query, deletePct, baseline[0])
         r.save(name)
 
 def cleanScores(l):