Fixup for showing memory usage in submission reports

oioioi/programs/models.py

@@ -297,6 +297,19 @@ def make_output_filename(instance, filename):
     return f"userouts/{submission.problem_instance.contest.id!s}/{submission.id}/{instance.submission_report.id}-out"
 
 
+INTEGERFIELD_MAX_SIZE = 2**31 - 1
+
+
+def limit_mem_used(mem_used):
+    if mem_used is None:
+        return None
+    return min(mem_used, INTEGERFIELD_MAX_SIZE)
+
+
+def is_mem_used_overflowed(mem_used):
+    return mem_used == INTEGERFIELD_MAX_SIZE
+
+
 class TestReport(models.Model):
     __test__ = False
     submission_report = models.ForeignKey(SubmissionReport, on_delete=models.CASCADE)
@@ -337,6 +350,10 @@ def was_half_time_limit_exceeded(self):
             return False
         return contest.controller.uses_threshold_linear_scoring() and self.time_used * 2 > self.test_time_limit
 
+    def save(self, *args, **kwargs):
+        self.mem_used = limit_mem_used(self.mem_used)
+        super().save(*args, **kwargs)
+
 
 class GroupReport(models.Model):
     submission_report = models.ForeignKey(SubmissionReport, on_delete=models.CASCADE)

oioioi/programs/templates/programs/report-body.html

@@ -58,14 +58,14 @@
                         <td>
                             {% if is_admin or test.status != 'TLE' %}
                                 {{ test.time_used|runtimeformat }}
-                            {% else %}-.--s
+                            {% else %}-.-- s
                             {% endif %}/ {{ test.test_time_limit|runtimeformat }}
                         </td>
                         {% if show_mem_used %}
                         <td>
                             {% if is_admin or test.status != 'MLE' %}
                                 {{ test.mem_used|memoryformat }}
-                            {% else %}--MiB
+                            {% else %}-- MiB
                             {% endif %}/ {{ test.test_mem_limit|memoryformat }}
                         </td>
                         {% endif %}

oioioi/programs/templatetags/memoryformat.py

@@ -1,13 +1,17 @@
 from django import template
 from django.utils.translation import gettext_lazy as _
 
+from oioioi.programs.models import is_mem_used_overflowed
+
 register = template.Library()
 
 
 @register.filter
 def memoryformat(value):
     if value is None:
         return "???"
+    if is_mem_used_overflowed(value):
+        return "-- MiB"
     mebibytes = value / 1024.0
     if mebibytes < 10:
         return _("%(mebibytes).1f MiB") % {"mebibytes": mebibytes}

oioioi/testrun/controllers.py

@@ -270,10 +270,10 @@ def _render_testrun_report(self, request, report, testrun_report, template="test
         output_container_id_prefix = "hidden_output_data_" if is_ajax(request) else "output_data_"
 
         input_is_zip = False
+        show_mem_used = False
         if testrun_report:
             input_is_zip = is_zipfile(testrun_report.submission_report.submission.programsubmission.testrunprogramsubmission.input_file.read_using_cache())
-
-        show_mem_used = testrun_report.mem_used > 0
+            show_mem_used = testrun_report.mem_used > 0
 
         return render_to_string(
             template,

oioioi/testrun/models.py

@@ -11,7 +11,7 @@
 )
 from oioioi.filetracker.fields import FileField
 from oioioi.problems.models import ProblemInstance
-from oioioi.programs.models import ProgramSubmission
+from oioioi.programs.models import ProgramSubmission, limit_mem_used
 
 submission_statuses.register("TESTRUN_OK", _("No error"))
 submission_kinds.register("TESTRUN", _("Test run"))
@@ -70,3 +70,7 @@ class TestRunReport(models.Model):
     test_time_limit = models.IntegerField(null=True, blank=True)
     test_mem_limit = models.IntegerField(null=True, blank=True)
     output_file = FileField(upload_to=make_custom_output_filename)
+
+    def save(self, *args, **kwargs):
+        self.mem_used = limit_mem_used(self.mem_used)
+        super().save(*args, **kwargs)

oioioi/testrun/tests.py

@@ -144,6 +144,12 @@ def test_submit_view(self):
         self.assertContains(response, "TESTRUN")
         self.assertNotContains(response, "NORMAL")
 
+        kwargs["submission_id"] = submission.id
+        response = self.client.get(reverse("submission", kwargs=kwargs))
+        self.assertEqual(response.status_code, 200)
+        self.assertContains(response, "Test run")
+        self.assertContains(response, "Compilation failed")
+
     def test_archive_submission(self):
         self.assertTrue(self.client.login(username="test_user"))
         kwargs = {"contest_id": Contest.objects.get().id}
@@ -278,27 +284,31 @@ def test_handlers(self):
         try:
             environ["test_results"] = {}
             environ["test_results"]["test"] = {
-                "result_cpode": "OK",
+                "result_code": "OK",
                 "result_string": "OK",
                 "time_used": 111,
                 "out_file": "/output",
             }
-
-            environ = handlers.grade_submission(environ)
-
-            self.assertEqual(None, environ["score"])
-            self.assertEqual("OK", environ["status"])
-
-            environ = handlers.make_report(environ)
-            self.assertIn("report_id", environ)
-            report = TestRunReport.objects.get(submission_report=environ["report_id"])
-            self.assertEqual(111, report.time_used)
-            self.assertEqual("", report.comment)
-            self.assertEqual("o", report.output_file.read())
-
-            handlers.delete_output(environ)
+            cap = 2**31 - 1
+            for mem_used, expected_mem_used in ((44, 44), (cap, cap), (cap + 1, cap), (2**63, cap)):
+                environ["test_results"]["test"]["mem_used"] = mem_used
+                graded_environ = handlers.grade_submission(environ)
+
+                self.assertEqual(None, graded_environ["score"])
+                self.assertEqual("TESTRUN_OK", graded_environ["status"])
+
+                graded_environ = handlers.make_report(graded_environ)
+                self.assertIn("report_id", graded_environ)
+                report = TestRunReport.objects.get(submission_report=graded_environ["report_id"])
+                self.assertEqual(111, report.time_used)
+                self.assertEqual(expected_mem_used, report.mem_used)
+                self.assertEqual("", report.comment)
+                self.assertEqual(b"o", report.output_file.read())
+
+            handlers.delete_output(graded_environ)
         except Exception:
             get_client().delete_file("/output")
+            raise
 
 
 class TestRunTestCase: