Revision Info into GenericSet

dashboard/dashboard/add_histograms_queue.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.
 
 """URL endpoint to add new histograms to the datastore."""
 
 import json
 import sys
 
 # TODO(eakuefner): Move these helpers so we don't have to import add_point or
 # add_point_queue directly.
 from dashboard import add_histograms
 from dashboard import add_point
 from dashboard import add_point_queue
 from dashboard.common import datastore_hooks
 from dashboard.common import request_handler
 from dashboard.common import stored_object
 from dashboard.common import utils
 from dashboard.models import anomaly
 from dashboard.models import graph_data
 from dashboard.models import histogram
 from tracing.value import histogram as histogram_module
 from tracing.value import histogram_set
 from tracing.value.diagnostics import diagnostic_ref
+from tracing.value.diagnostics import reserved_infos
 
-
-REVISION_FIELDS_TO_ANNOTATION_NAMES = {
-    'chromium_commit_position': 'r_chromium_commit_pos',
-    'v8_commit_position': 'r_v8_rev',
-    'chromium': 'r_chromium_git',
-    'v8': 'r_v8_git',
+DIAGNOSTIC_NAMES_TO_ANNOTATION_NAMES = {
+    reserved_infos.CHROMIUM_COMMIT_POSITIONS.name: 'r_chromium_commit_pos',
+    reserved_infos.V8_COMMIT_POSITIONS.name: 'r_v8_rev',
+    reserved_infos.CHROMIUM_REVISIONS.name: 'r_chromium_git',
+    reserved_infos.V8_REVISIONS.name: 'r_v8_git',
     # TODO(eakuefner): Add r_catapult_git to Dashboard revision_info map (see
     # https://github.com/catapult-project/catapult/issues/3545).
-    'catapult': 'r_catapult_git',
-    'angle': 'r_angle_git',
-    'webrtc': 'r_webrtc_git'
+    reserved_infos.CATAPULT_REVISIONS.name: 'r_catapult_git',
+    reserved_infos.ANGLE_REVISIONS.name: 'r_angle_git',
+    reserved_infos.WEBRTC_REVISIONS.name: 'r_webrtc_git'
 }
 
 
 class BadRequestError(Exception):
   pass
 
 
 def _CheckRequest(condition, msg):
   if not condition:
     raise BadRequestError(msg)
@@ skipping 116 matching lines @@
 def _MakeRowDict(revision, test_path, tracing_histogram):
   d = {}
   # TODO(#3563): Wire up a_tracing_uri.
   test_parts = test_path.split('/')
   d['master'] = test_parts[0]
   d['bot'] = test_parts[1]
   d['test'] = '/'.join(test_parts[2:])
   d['revision'] = revision
   d['supplemental_columns'] = {}
 
-  revision_info = tracing_histogram.diagnostics['revisions']
-  for attribute, annotation in REVISION_FIELDS_TO_ANNOTATION_NAMES.iteritems():
-    value = getattr(revision_info, attribute)
+  for diag_name, annotation in DIAGNOSTIC_NAMES_TO_ANNOTATION_NAMES.iteritems():
+    revision_info = tracing_histogram.diagnostics.get(diag_name)
+    value = list(revision_info) if revision_info else None
     # TODO(eakuefner): Formalize unique-per-upload diagnostics to make this
     # check an earlier error. RevisionInfo's fields have to be lists, but there
     # should be only one revision of each type per upload.
     if not value:
       continue
     _CheckRequest(
-        isinstance(value, list) and len(value) == 1,
+        len(value) == 1,
         'RevisionInfo fields must contain at most one revision')
 
     d['supplemental_columns'][annotation] = value[0]
 
   _PopulateNumericalFields(d, tracing_histogram)
   return d
 
 def _PopulateNumericalFields(row_dict, tracing_histogram):
   statistics_scalars = tracing_histogram.statistics_scalars
   for name, scalar in statistics_scalars.iteritems():
     # We'll skip avg/std since these are already stored as value/error in rows.
     if name in ('avg', 'std'):
       continue
 
     row_dict['supplemental_columns']['d_%s' % name] = scalar.value
 
   row_dict['value'] = tracing_histogram.average
   row_dict['error'] = tracing_histogram.standard_deviation