Add a title to the comparison graph

.github/workflows/tests.yml

@@ -0,0 +1,23 @@
+name: Tests
+
+on:
+  push:
+  pull_request:
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Set up Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: "3.x"
+
+      - name: Install dependencies
+        run: pip install -e .
+
+      - name: Run tests
+        run: python manage.py test codespeed --settings=codespeed.tests.settings

.gitignore

@@ -4,6 +4,7 @@
 .DS_Store
 *.db
 sample_project/repos/*
+speed_pypy/repos/*
 override
 build
 dist

codespeed/admin.py

@@ -39,13 +39,23 @@ class ProjectAdmin(admin.ModelAdmin):
 class BranchAdmin(admin.ModelAdmin):
     list_display = ('name', 'project', 'display_on_comparison_page')
     list_filter = ('project',)
+    actions = ['enable_comparison_page', 'disable_comparison_page']
+
+    @admin.action(description='Display selected branches on comparison page')
+    def enable_comparison_page(self, request, queryset):
+        queryset.update(display_on_comparison_page=True)
+
+    @admin.action(description='Hide selected branches from comparison page')
+    def disable_comparison_page(self, request, queryset):
+        queryset.update(display_on_comparison_page=False)
 
 
 @admin.register(Revision)
 class RevisionAdmin(admin.ModelAdmin):
     list_display = ('commitid', 'branch', 'tag', 'date')
     list_filter = ('branch__project', 'branch', 'tag', 'date')
     search_fields = ('commitid', 'tag')
+    raw_id_fields = ('branch',)
 
 
 @admin.register(Executable)
@@ -58,7 +68,7 @@ class ExecutableAdmin(admin.ModelAdmin):
 
 @admin.register(Benchmark)
 class BenchmarkAdmin(admin.ModelAdmin):
-    list_display = ('name', 'benchmark_type', 'data_type', 'description',
+    list_display = ('name', 'source', 'data_type', 'description',
                     'units_title', 'units', 'lessisbetter',
                     'default_on_comparison')
     list_filter = ('data_type', 'lessisbetter')
@@ -78,6 +88,7 @@ class ResultAdmin(admin.ModelAdmin):
     list_display = ('revision', 'benchmark', 'executable', 'environment',
                     'value', 'date')
     list_filter = ('environment', 'executable', 'date', 'benchmark')
+    raw_id_fields = ('revision', 'benchmark', 'executable', 'environment')
 
 
 def recalculate_report(modeladmin, request, queryset):

codespeed/admin_views.py

@@ -0,0 +1,176 @@
+import os
+import sqlite3
+import tempfile
+from datetime import datetime, date
+
+from django.contrib.admin.views.decorators import staff_member_required
+from django.http import FileResponse
+
+from django.db import connection
+
+SIZE_LIMIT = 95 * 1024 * 1024  # 95 MB
+
+# Schema for the exported SQLite file, in FK-safe creation order.
+# Column names must match Django's generated PostgreSQL column names exactly.
+_SCHEMA = """
+PRAGMA foreign_keys = OFF;
+
+CREATE TABLE codespeed_project (
+    id INTEGER PRIMARY KEY,
+    name TEXT NOT NULL,
+    repo_type TEXT NOT NULL,
+    repo_path TEXT NOT NULL,
+    repo_user TEXT NOT NULL,
+    repo_pass TEXT NOT NULL,
+    commit_browsing_url TEXT NOT NULL,
+    track INTEGER NOT NULL,
+    default_branch TEXT NOT NULL
+);
+
+CREATE TABLE codespeed_branch (
+    id INTEGER PRIMARY KEY,
+    name TEXT NOT NULL,
+    project_id INTEGER NOT NULL,
+    display_on_comparison_page INTEGER NOT NULL
+);
+
+CREATE TABLE codespeed_executable (
+    id INTEGER PRIMARY KEY,
+    name TEXT NOT NULL,
+    description TEXT NOT NULL,
+    project_id INTEGER NOT NULL
+);
+
+CREATE TABLE codespeed_environment (
+    id INTEGER PRIMARY KEY,
+    name TEXT NOT NULL,
+    cpu TEXT NOT NULL,
+    memory TEXT NOT NULL,
+    os TEXT NOT NULL,
+    kernel TEXT NOT NULL
+);
+
+CREATE TABLE codespeed_benchmark (
+    id INTEGER PRIMARY KEY,
+    name TEXT NOT NULL,
+    parent_id INTEGER,
+    source TEXT NOT NULL,
+    data_type TEXT NOT NULL,
+    description TEXT NOT NULL,
+    units_title TEXT NOT NULL,
+    units TEXT NOT NULL,
+    lessisbetter INTEGER NOT NULL,
+    default_on_comparison INTEGER NOT NULL
+);
+
+CREATE TABLE codespeed_revision (
+    id INTEGER PRIMARY KEY,
+    commitid TEXT NOT NULL,
+    tag TEXT NOT NULL,
+    date TEXT,
+    message TEXT NOT NULL,
+    project_id INTEGER,
+    author TEXT NOT NULL,
+    branch_id INTEGER NOT NULL
+);
+
+CREATE TABLE codespeed_result (
+    id INTEGER PRIMARY KEY,
+    value REAL NOT NULL,
+    std_dev REAL,
+    val_min REAL,
+    val_max REAL,
+    q1 REAL,
+    q3 REAL,
+    suite_version TEXT NOT NULL,
+    date TEXT,
+    revision_id INTEGER NOT NULL,
+    executable_id INTEGER NOT NULL,
+    benchmark_id INTEGER NOT NULL,
+    environment_id INTEGER NOT NULL
+);
+"""
+
+_SMALL_TABLES = [
+    'codespeed_project',
+    'codespeed_branch',
+    'codespeed_executable',
+    'codespeed_environment',
+    'codespeed_benchmark',
+    'codespeed_revision',
+]
+
+
+def _conv(v):
+    """Convert PostgreSQL Python types to SQLite-safe scalars."""
+    if isinstance(v, (datetime, date)):
+        return v.isoformat()
+    return v
+
+
+def _build_sqlite(path):
+    lite = sqlite3.connect(path)
+    try:
+        lite.executescript(_SCHEMA)
+        lite.commit()
+
+        with connection.cursor() as pg:
+            for table in _SMALL_TABLES:
+                pg.execute(f'SELECT * FROM {table}')
+                cols = [d[0] for d in pg.description]
+                rows = [tuple(_conv(v) for v in row) for row in pg.fetchall()]
+                if rows:
+                    ph = ', '.join(['?'] * len(cols))
+                    lite.executemany(
+                        f"INSERT INTO {table} ({', '.join(cols)}) VALUES ({ph})",
+                        rows,
+                    )
+            lite.commit()
+
+            # Result table: newest-first, stop at size cap
+            pg.execute(
+                'SELECT * FROM codespeed_result ORDER BY date DESC NULLS LAST'
+            )
+            cols = [d[0] for d in pg.description]
+            ph = ', '.join(['?'] * len(cols))
+            insert_sql = (
+                f"INSERT INTO codespeed_result ({', '.join(cols)}) VALUES ({ph})"
+            )
+            while True:
+                batch = pg.fetchmany(5000)
+                if not batch:
+                    break
+                lite.executemany(
+                    insert_sql,
+                    [tuple(_conv(v) for v in row) for row in batch],
+                )
+                lite.commit()
+                if os.path.getsize(path) > SIZE_LIMIT:
+                    break
+    finally:
+        lite.close()
+
+
+@staff_member_required
+def download_db(request):
+    fd, path = tempfile.mkstemp(suffix='.sqlite3')
+    os.close(fd)
+    try:
+        _build_sqlite(path)
+        f = open(path, 'rb')
+        today = datetime.today().strftime('%Y-%m-%d')
+        response = FileResponse(
+            f,
+            as_attachment=True,
+            filename=f'codespeed-{today}.sqlite3',
+        )
+        os.unlink(path)  # unlink after FileResponse reads the file size
+        response.set_cookie(
+            'codespeed_download_ready', '1',
+            max_age=60, path='/', samesite='Lax',
+        )
+        return response
+    except Exception:
+        if os.path.exists(path):
+            os.unlink(path)
+        raise

codespeed/commits/git.py

@@ -52,9 +52,12 @@ def getlogs(endrev, startrev):
     else:
         logfmt = '--format=format:%h%x00%H%x00%at%x00%an%x00%ae%x00%s%x00%b%x1e'
 
+    max_log_entries = getattr(settings, 'GIT_MAX_LOG_ENTRIES', 30)
+
     cmd = ["git", "log", logfmt]
 
     if endrev.commitid != startrev.commitid:
+        cmd.append("-n%d" % max_log_entries)
         cmd.append("%s...%s" % (startrev.commitid, endrev.commitid))
     else:
         cmd.append("-1")  # Only return one commit
@@ -64,8 +67,8 @@ def getlogs(endrev, startrev):
     p, stdout, stderr = execute_command(cmd, working_copy)
 
     if p.returncode != 0:
-        raise CommitLogError("%s returned %s: %s" % (
-                             " ".join(cmd), p.returncode, stderr))
+        raise CommitLogError(f"'%s' in '%s' returned %s: %s" % (
+                             " ".join(cmd), working_copy, p.returncode, stderr))
     logs = []
     for log in filter(None, stdout.split('\x1e')):
         (short_commit_id, commit_id, date_t, author_name, author_email,
@@ -79,7 +82,7 @@ def getlogs(endrev, startrev):
             logger.debug('Failed to get tag', exc_info=True)
 
         tag = stdout.strip() if p.returncode == 0 else ""
-        date = datetime.datetime.fromtimestamp(
+        date = datetime.datetime.utcfromtimestamp(
             int(date_t)).strftime("%Y-%m-%d %H:%M:%S")
 
         logs.append({

codespeed/commits/mercurial.py

@@ -63,7 +63,7 @@ def getlogs(endrev, startrev):
     if p.returncode != 0:
         raise CommitLogError(str(stderr))
     else:
-        stdout = stdout.rstrip('\n')  # Remove last newline
+        stdout = stdout.decode('utf-8').rstrip('\n')  # Remove last newline
         logs = []
         for log in stdout.split("=newlog=\n"):
             elements = []

codespeed/commits/tests/test_git.py

@@ -1,6 +1,6 @@
 from datetime import datetime
 from django.test import TestCase, override_settings
-from mock import Mock, patch
+from unittest.mock import Mock, patch
 
 from codespeed.commits.git import getlogs
 from codespeed.models import Project, Revision, Branch, Environment
@@ -48,7 +48,7 @@ def side_effect(cmd, *args, **kwargs):
 
         # then
         expected = {
-            'date': '2020-03-06 04:14:41',
+            'date': '2020-03-06 10:14:41',
             'message': 'msg',
             'commitid': 'long_id',
             'author': 'author',
@@ -57,4 +57,4 @@ def side_effect(cmd, *args, **kwargs):
             'short_commit_id': 'id',
             'tag': 'tag',
         }
-        self.assertEquals([expected], logs)
+        self.assertEqual([expected], logs)

codespeed/fixtures/testdata.json

@@ -219,7 +219,7 @@
     "fields": {
         "name": "float",
         "parent": null,
-        "benchmark_type": "C",
+        "source": "legacy",
         "data_type": "U",
         "description": "",
         "units_title": "Time",
@@ -234,7 +234,7 @@
     "fields": {
         "name": "int",
         "parent": null,
-        "benchmark_type": "C",
+        "source": "legacy",
         "data_type": "U",
         "description": "",
         "units_title": "Time",

codespeed/fixtures/timeline_tests.json

@@ -210,7 +210,7 @@
         "fields": {
             "parent": null,
             "name": "float",
-            "benchmark_type": "C",
+            "source": "legacy",
             "default_on_comparison": true,
             "units_title": "Time",
             "units": "seconds",
@@ -224,7 +224,7 @@
         "fields": {
             "parent": null,
             "name": "int",
-            "benchmark_type": "C",
+            "source": "legacy",
             "default_on_comparison": true,
             "units_title": "Time",
             "units": "seconds",