Merge pull request tobami#271 from mattip/historical-graphs

MAINT: more deeply embed DEFAULT_EXECUTABLE into historical data plots

Author: tobami

codespeed/models.py

@@ -475,7 +475,7 @@ def get_changes_table(self, trend_depth=10, force_save=False):
                     val_max = "-"
 
                 # Calculate percentage change relative to previous result
-                result = resobj.value
+                result = max(resobj.value, 0)
                 change = "-"
                 if len(change_list):
                     c = change_list.filter(benchmark=bench)

codespeed/views.py

@@ -91,38 +91,49 @@ def gethistoricaldata(request):
     else:
         env = env.first()
 
-    # Fetch Baseline data
+    # Fetch Baseline data, filter by executable
     baseline_exe = Executable.objects.get(
         name=settings.DEF_BASELINE['executable'])
-    baseline_lastrev = Revision.objects.filter(
-        branch__project=baseline_exe.project).order_by('-date')[0]
+    baseline_revs = Revision.objects.filter(
+        branch__project=baseline_exe.project).order_by('-date')
+    baseline_lastrev = baseline_revs[0]
+    for rev in baseline_revs:
+        baseline_results = Result.objects.filter(
+            executable=baseline_exe, revision=rev, environment=env)
+        if baseline_results:
+            baseline_lastrev = rev
+            break
+    if len(baseline_results) == 0:
+        logger.error('Could not find results for {} rev="{}" env="{}"'.format(
+                baseline_exe, baseline_lastrev, env))
     data['baseline'] = '{} {}'.format(
         settings.DEF_BASELINE['executable'], baseline_lastrev.tag)
-    baseline_results = Result.objects.filter(
-        executable=baseline_exe, revision=baseline_lastrev, environment=env)
 
     default_exe = Executable.objects.get(name=settings.DEF_EXECUTABLE)
     default_branch = Branch.objects.get(
         name=default_exe.project.default_branch,
         project=default_exe.project)
 
-    # Fetch tagged revisions for default executable
+    # Fetch tagged revisions for executable
     default_taggedrevs = Revision.objects.filter(
-        branch=default_branch
-    ).exclude(tag="").order_by('date')
-    data['tagged_revs'] = [rev.tag for rev in default_taggedrevs]
+            branch=default_branch
+        ).exclude(tag="").order_by('date')
     default_results = {}
     for rev in default_taggedrevs:
-        default_results[rev.tag] = Result.objects.filter(
+        res = Result.objects.filter(
             executable=default_exe, revision=rev, environment=env)
-
+        if not res:
+            logger.info('no results for %s %s %s' % (str(default_exe), str(rev), str(env)))
+            continue
+        default_results[rev.tag] = res
+    data['tagged_revs'] = [rev.tag for rev in default_taggedrevs if rev.tag in default_results]
     # Fetch data for latest results
     revs = Revision.objects.filter(
         branch=default_branch).order_by('-date')[:5]
     default_lastrev = None
     for i in range(4):
         default_lastrev = revs[i]
-        if default_lastrev.results.filter(executable=default_exe):
+        if default_lastrev.results.filter(executable=default_exe, environment=env):
             break
         default_lastrev = None
     if default_lastrev is None:
@@ -892,7 +903,6 @@ def add_result(request):
         return HttpResponseBadRequest(response)
     else:
         create_report_if_enough_data(response[0], response[1], response[2])
-        logger.debug("add_result: completed")
         return HttpResponse("Result data saved successfully", status=202)
 
 
@@ -917,15 +927,11 @@ def add_json_results(request):
         else:
             unique_reports.add(response)
 
-    logger.debug("add_json_results: about to create reports")
     for rep in unique_reports:
         create_report_if_enough_data(rep[0], rep[1], rep[2])
 
-    logger.debug("add_json_results: completed")
-
     return HttpResponse("All result data saved successfully", status=202)
 
-
 def django_has_content_type():
     return (django.VERSION[0] > 1 or
             (django.VERSION[0] == 1 and django.VERSION[1] >= 6))

sample_project/templates/home.html

@@ -179,6 +179,9 @@ <h3>How has {{ default_exe.project }} performance evolved over time?</h3>
                 renderer:$.jqplot.BarRenderer,
                 showMarker: false
             },
+            axesDefaults: {
+                tickRenderer: $.jqplot.CanvasAxisTickRenderer
+            },
             series:[
                 {
                     pointLabels:{labels:geolabels}
@@ -187,7 +190,8 @@ <h3>How has {{ default_exe.project }} performance evolved over time?</h3>
             axes: {
                 xaxis: {
                     renderer: $.jqplot.CategoryAxisRenderer,
-                    ticks: ticks
+                    ticks: ticks,
+                    tickOptions: {angle: -40}
                 },
                 yaxis:{
                     min: 0,