Remove RelatedHistogramSet.

tracing/tracing/value/histogram.py

 # Copyright 2017 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import datetime
 import json
 import math
 import random
 import uuid
 
@@ skipping 478 matching lines @@
 class HistogramRef(object):
 
   def __init__(self, guid):
     self._guid = guid
 
   @property
   def guid(self):
     return self._guid
 
 
-class RelatedHistogramSet(diagnostic.Diagnostic):
-
-  def __init__(self, histograms=()):
-    super(RelatedHistogramSet, self).__init__()
-    self._histograms_by_guid = {}
-    for hist in histograms:
-      self.Add(hist)
-
-  def Add(self, hist):
-    assert isinstance(hist, (Histogram, HistogramRef))
-    assert not self.Has(hist)
-    self._histograms_by_guid[hist.guid] = hist
-
-  def Has(self, hist):
-    return hist.guid in self._histograms_by_guid
-
-  def __len__(self):
-    return len(self._histograms_by_guid)
-
-  def __iter__(self):
-    for hist in self._histograms_by_guid.itervalues():
-      yield hist
-
-  def Resolve(self, histograms, required=False):
-    for hist in self:
-      if isinstance(hist, Histogram):
-        continue
-      guid = hist.guid
-      hist = histograms.LookupHistogram(guid)
-      if isinstance(hist, Histogram):
-        self._histograms_by_guid[guid] = hist
-      else:
-        assert not required, guid
-
-  def _AsDictInto(self, d):
-    d['guids'] = []
-    for hist in self:
-      d['guids'].append(hist.guid)
-
-  @staticmethod
-  def FromDict(d):
-    return RelatedHistogramSet(HistogramRef(guid) for guid in d['guids'])
-
-
 class RelatedHistogramMap(diagnostic.Diagnostic):
 
   def __init__(self):
     super(RelatedHistogramMap, self).__init__()
     self._histograms_by_name = {}
 
   def Get(self, name):
     return self._histograms_by_name.get(name)
 
   def Set(self, name, hist):
@@ skipping 394 matching lines @@
 
   def AsDict(self):
     dct = {}
     for name, diag in self.iteritems():
       dct[name] = diag.AsDictOrReference()
     return dct
 
   def Merge(self, other, parent_hist, other_parent_hist):
     merged_from = self.get(reserved_infos.MERGED_FROM.name)
     if merged_from is None:
-      merged_from = RelatedHistogramSet()
+      merged_from = RelatedHistogramMap()
       self[reserved_infos.MERGED_FROM.name] = merged_from
-    merged_from.Add(other_parent_hist)
+    merged_from.Set(len(merged_from), other_parent_hist)
 
     for name, other_diagnostic in other.iteritems():
       if name not in self:
         self[name] = other_diagnostic
         continue
       my_diagnostic = self[name]
       if my_diagnostic.CanAddDiagnostic(
           other_diagnostic, name, parent_hist, other_parent_hist):
         my_diagnostic.AddDiagnostic(
             other_diagnostic, name, parent_hist, other_parent_hist)
@@ skipping 607 matching lines @@
     'W': HistogramBinBoundaries.CreateExponential(1e-3, 1, 50),
     'unitless': HistogramBinBoundaries.CreateExponential(1e-3, 1e3, 50),
     'count': HistogramBinBoundaries.CreateExponential(1, 1e3, 20),
     'sigma': HistogramBinBoundaries.CreateLinear(-5, 5, 50),
 }
 
 
 all_diagnostics.DIAGNOSTICS_BY_NAME.update({
     'Breakdown': Breakdown,
     'GenericSet': GenericSet,
-    'RelatedHistogramSet': RelatedHistogramSet,
     'UnmergeableDiagnosticSet': UnmergeableDiagnosticSet,
     'RelatedEventSet': RelatedEventSet,
     'BuildbotInfo': BuildbotInfo,
     'DateRange': DateRange,
     'TagMap': TagMap,
     'RelatedHistogramBreakdown': RelatedHistogramBreakdown,
     'TelemetryInfo': TelemetryInfo,
     'RelatedHistogramMap': RelatedHistogramMap,
 })