Update graph API to return the original string revision as X values

[kpdev42]

Summary

api/db_default/v4/nts/graph is used to request regression points on fly using JS.
We still use convert_revision() for sorting, but return the original (unchanged) values.
It must be done before refactoring to use the library plotly.

OS Laboratory. Huawei Russian Research Institute. Saint-Petersburg

[kpdev42]

ping

[cmatthews]

LGTM

lnt/server/ui/api.py

def get(machine_id, test_id, field_index):
 
         limit = request.values.get('limit', None)
         if limit:
             limit = int(limit)
             if limit:
                 q = q.limit(limit)
 
         samples = [
-            [convert_revision(rev), val,
+            [rev, val,
              {'label': rev, 'date': str(time), 'runID': str(rid)}]
             for val, rev, time, rid in q.all()[::-1]
         ]
-        samples.sort(key=lambda x: x[0])
+        samples.sort(key=lambda x: convert_revision(x[0]))
         return samples
 
 
 class Regression(Resource):
     """List all the machines and give summary information."""
     method_decorators = [in_db]
 
     @staticmethod

lnt/server/ui/templates/v4_new_regressions.html

 {% block javascript %}
 var g = {}
 {% set api_graph = "api/db_default/v4/" + testsuite_name + "/graph"%}
 var changes = [
 {% for form_change in form.field_changes%}
     {% set fc = changes[loop.index -1] %}
     {% set fc_ri_field_index = ts.get_field_index(fc.ri.field) %}
     {"url": "/{{api_graph}}/{{ fc.ri.machine.id}}/{{fc.ri.test.id}}/{{fc_ri_field_index}}",
-     "start": {{fc.ri.start_order.llvm_project_revision}},
-     "end": {{fc.ri.end_order.llvm_project_revision}}
+     "start": "{{fc.ri.start_order.as_ordered_string()}}",
+     "end": "{{fc.ri.end_order.as_ordered_string()}}"
  },
 {% endfor %}
 ];
 
 /* Bind events to the zoom bar buttons, so that 
  * the zoom buttons work, then position them
  * over top of the main graph.
  */

lnt/server/ui/templates/v4_regression_detail.html

 var test_suite_name = "{{ testsuite_name }}";
 var db_name = "{{ request.view_args.get('db_name','') }}";
 var max_samples = {{ request.args.get('limit', 350) }};
 var changes = [
 {% for form_change in form.field_changes%}
     {% set fc = changes[loop.index -1] %}
     {% set fc_ri_field_index = ts.get_field_index(fc.ri.field) %}
     {"url": "{{fc.ri.machine.id}}/{{fc.ri.test.id}}/{{fc_ri_field_index}}",
-     "start": {{fc.ri.start_order.llvm_project_revision}},
-     "end": {{fc.ri.end_order.llvm_project_revision}}
+     "start": "{{fc.ri.start_order.as_ordered_string()}}",
+     "end": "{{fc.ri.end_order.as_ordered_string()}}"
  },
 {% endfor %}
 ];
 
 {% endblock %}
 
 {% block body %}
 <section id="regression_detail" />

tests/server/ui/test_api.py

 order_expected_response = {u'llvm_project_revision': u'154331',
                            u'id': 1}
 
 sample_expected_response = {u'id': 1,
                             u'execution_time': 0.0003,
                             u'test_id': 1,
                             u'compile_time': 0.007}
 
-graph_data = [[[152292], 1.0,
-               {u'date': u'2012-05-01 16:28:23',
-                u'label': u'152292',
-                u'runID': u'5'}],
-              [[152293], 10.0,
-               {u'date': u'2012-05-03 16:28:24',
-                u'label': u'152293',
-                u'runID': u'6'}]]
+graph_data = [[u'152292', 1.0,
+              [u'152293', 10.0,
 
-graph_data2 = [[[152293], 10.0,
-                {u'date': u'2012-05-03 16:28:24',
-                 u'label': u'152293',
-                 u'runID': u'6'}]]
+graph_data2 = [[u'152293', 10.0,
 
 possible_run_keys = {
     u'ARCH',
     u'CC_UNDER_TEST_IS_CLANG',
     u'CC_UNDER_TEST_TARGET_IS_X86_64',
     u'DISABLE_CBE',
     u'DISABLE_JIT',
     u'ENABLE_HASHED_PROGRAM_OUTPUT',