@@ -72,19 +72,15 @@ def printCompareResults(results, stats, maxDoc, resultsBase, statsBase):
72
72
if '-reindex' in sys .argv or '-reindexFast' in sys .argv :
73
73
print ('Index time (sec)||Force merge time (sec)||Index size (GB)||Reader heap (MB)||' )
74
74
print ('||Dev||Base||Diff ||Dev ||Base ||diff ||Dev||Base||Diff||Dev||Base||Diff ||' )
75
- for op in ops :
76
- if op in stats :
77
- readerHeapMB , indexSizeGB , indexTimeSec , forceMergeTimeSec = stats [op ]
78
- readerHeapMBBase , indexSizeGBBase , indexTimeSecBase , forceMergeTimeSecBase = statsBase [op ]
79
- print ('|%.1fs|%.1fs|%2.f%%|%.1fs|%.1fs|%2.f%%|%.2f|%.2f|%2.f%%|%.2f|%.2f|%2.f%%|' % (indexTimeSec , indexTimeSecBase , computeDiff (indexTimeSec , indexTimeSecBase ), forceMergeTimeSec , forceMergeTimeSecBase , computeDiff (forceMergeTimeSec , forceMergeTimeSecBase ), indexSizeGB , indexSizeGBBase , computeDiff (indexSizeGB , indexSizeGBBase ), readerHeapMB , readerHeapMBBase , computeDiff (readerHeapMB , readerHeapMBBase )))
75
+ readerHeapMB , indexSizeGB , indexTimeSec , forceMergeTimeSec = stats ['LatLonShape' ]
76
+ readerHeapMBBase , indexSizeGBBase , indexTimeSecBase , forceMergeTimeSecBase = statsBase ['LatLonShape' ]
77
+ print ('|%.1fs|%.1fs|%2.f%%|%.1fs|%.1fs|%2.f%%|%.2f|%.2f|%2.f%%|%.2f|%.2f|%2.f%%|' % (indexTimeSec , indexTimeSecBase , computeDiff (indexTimeSec , indexTimeSecBase ), forceMergeTimeSec , forceMergeTimeSecBase , computeDiff (forceMergeTimeSec , forceMergeTimeSecBase ), indexSizeGB , indexSizeGBBase , computeDiff (indexSizeGB , indexSizeGBBase ), readerHeapMB , readerHeapMBBase , computeDiff (readerHeapMB , readerHeapMBBase )))
80
78
else :
81
79
print ('||Index size (GB)||Reader heap (MB)||' )
82
80
print ('||Dev||Base||Diff||Dev||Base||Diff ||' )
83
- for op in ops :
84
- if op in stats :
85
- readerHeapMB , indexSizeGB = stats [op ][:2 ]
86
- readerHeapMBBase , indexSizeGBBase = statsBase [op ][:2 ]
87
- print ('|%.2f|%.2f|%2.f%%|%.2f|%.2f|%2.f%%|' % (indexSizeGB , indexSizeGBBase , computeDiff (indexSizeGB , indexSizeGBBase ), readerHeapMB , readerHeapMBBase , computeDiff (readerHeapMB , readerHeapMBBase )))
81
+ readerHeapMB , indexSizeGB = stats ['LatLonShape' ][:2 ]
82
+ readerHeapMBBase , indexSizeGBBase = statsBase ['LatLonShape' ][:2 ]
83
+ print ('|%.2f|%.2f|%2.f%%|%.2f|%.2f|%2.f%%|' % (indexSizeGB , indexSizeGBBase , computeDiff (indexSizeGB , indexSizeGBBase ), readerHeapMB , readerHeapMBBase , computeDiff (readerHeapMB , readerHeapMBBase )))
88
84
89
85
print ()
90
86
print ('||Approach||Shape||M hits/sec ||QPS ||Hit count ||' )
0 commit comments