[Checkins] SVN: Products.ZCatalog/trunk/ Increase plan precision to 4 digits in its string representation.

[Hanno Schlichting]

Log message for revision 122421:
  Increase plan precision to 4 digits in its string representation.
  

Changed:
  U   Products.ZCatalog/trunk/CHANGES.txt
  U   Products.ZCatalog/trunk/src/Products/ZCatalog/ZCatalog.py
  U   Products.ZCatalog/trunk/src/Products/ZCatalog/tests/test_plan.py

-=-
Modified: Products.ZCatalog/trunk/CHANGES.txt
===================================================================
--- Products.ZCatalog/trunk/CHANGES.txt	2011-07-29 09:42:01 UTC (rev 122420)
+++ Products.ZCatalog/trunk/CHANGES.txt	2011-07-29 09:51:38 UTC (rev 122421)
@@ -4,6 +4,7 @@
 2.13.19 (unreleased)
 --------------------
 
+- Increase plan precision to 4 digits in its string representation.
 
 2.13.18 (2011-07-29)
 --------------------

Modified: Products.ZCatalog/trunk/src/Products/ZCatalog/ZCatalog.py
===================================================================
--- Products.ZCatalog/trunk/src/Products/ZCatalog/ZCatalog.py	2011-07-29 09:42:01 UTC (rev 122420)
+++ Products.ZCatalog/trunk/src/Products/ZCatalog/ZCatalog.py	2011-07-29 09:51:38 UTC (rev 122421)
@@ -901,7 +901,7 @@
             for querykey, details in sorted(plan.items()):
                 output.append('    %s: {' % repr(querykey))
                 for indexname, benchmark in sorted(details.items()):
-                    tuplebench = (round(benchmark[0], 2), ) + benchmark[1:]
+                    tuplebench = (round(benchmark[0], 4), ) + benchmark[1:]
                     output.append('      %r:\n      %r,' % (indexname, tuplebench))
                 output.append('    },')
             output.append('  },')

Modified: Products.ZCatalog/trunk/src/Products/ZCatalog/tests/test_plan.py
===================================================================
--- Products.ZCatalog/trunk/src/Products/ZCatalog/tests/test_plan.py	2011-07-29 09:42:01 UTC (rev 122420)
+++ Products.ZCatalog/trunk/src/Products/ZCatalog/tests/test_plan.py	2011-07-29 09:51:38 UTC (rev 122421)
@@ -227,18 +227,15 @@
         plan = self._makeOne(zcat._catalog, query={'index1': 1, 'index2': 2})
         plan.start()
         plan.start_split('index1')
-        time.sleep(0.1111)
+        time.sleep(0.111111)
         plan.stop_split('index1')
         plan.start_split('index2')
-        time.sleep(0.2222)
+        time.sleep(0.222222)
         plan.stop_split('index2')
         plan.stop()
         plan_str = zcat.getCatalogPlan()
         self.assertTrue('queryplan = {' in plan_str)
         self.assertTrue('index1' in plan_str)
-        # test rounding worked
-        self.assertTrue('(0.11, 1, False),' in plan_str)
-        self.assertTrue('(0.22, 1, False),' in plan_str)
 
     def test_plan_empty(self):
         plan = self._makeOne()