[Checkins] SVN: Products.ZCatalog/trunk/src/Products/ZCatalog/ Write out the value indexes into the plan text representation

[Hanno Schlichting]

Log message for revision 123121:
  Write out the value indexes into the plan text representation
  

Changed:
  U   Products.ZCatalog/trunk/src/Products/ZCatalog/ZCatalog.py
  U   Products.ZCatalog/trunk/src/Products/ZCatalog/plan.py

-=-
Modified: Products.ZCatalog/trunk/src/Products/ZCatalog/ZCatalog.py
===================================================================
--- Products.ZCatalog/trunk/src/Products/ZCatalog/ZCatalog.py	2011-10-20 14:18:10 UTC (rev 123120)
+++ Products.ZCatalog/trunk/src/Products/ZCatalog/ZCatalog.py	2011-10-20 14:26:58 UTC (rev 123121)
@@ -49,6 +49,7 @@
 from Products.ZCatalog.ProgressHandler import ZLogHandler
 from Products.ZCatalog.ZCatalogIndexes import ZCatalogIndexes
 from .plan import PriorityMap
+from .plan import VALUE_INDEX_KEY
 
 LOG = logging.getLogger('Zope.ZCatalog')
 
@@ -901,12 +902,13 @@
             for querykey, details in sorted(plan.items()):
                 output.append('    %s: {' % repr(querykey))
                 if isinstance(details, (frozenset, set)):
-                    # todo: print out value indexes
-                    pass
+                    output.append('      %r:\n      %r,' % (
+                        VALUE_INDEX_KEY, details))
                 else:
-                    for indexname, benchmark in sorted(details.items()):
-                        tuplebench = (round(benchmark[0], 4), ) + benchmark[1:]
-                        output.append('      %r:\n      %r,' % (indexname, tuplebench))
+                    for indexname, bench in sorted(details.items()):
+                        tuplebench = (round(bench[0], 4), ) + bench[1:]
+                        output.append('      %r:\n      %r,' % (
+                            indexname, tuplebench))
                 output.append('    },')
             output.append('  },')
         output.append('}')

Modified: Products.ZCatalog/trunk/src/Products/ZCatalog/plan.py
===================================================================
--- Products.ZCatalog/trunk/src/Products/ZCatalog/plan.py	2011-10-20 14:18:10 UTC (rev 123120)
+++ Products.ZCatalog/trunk/src/Products/ZCatalog/plan.py	2011-10-20 14:26:58 UTC (rev 123121)
@@ -24,7 +24,7 @@
 
 MAX_DISTINCT_VALUES = 10
 REFRESH_RATE = 100
-VALUE_INDEX_KEY = '#valueindexes'
+VALUE_INDEX_KEY = 'VALUE_INDEXES'
 
 Duration = namedtuple('Duration', ['start', 'end'])
 IndexMeasurement = namedtuple('IndexMeasurement',