[解决冲突]oj/urls.py

submission/migrations/0002_submission_is_counted.py

@@ -0,0 +1,19 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('submission', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='submission',
+            name='is_counted',
+            field=models.BooleanField(default=False),
+        ),
+    ]

submission/migrations/0003_auto_20150821_1654.py

@@ -0,0 +1,24 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('submission', '0002_submission_is_counted'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='submission',
+            name='problem_id',
+            field=models.IntegerField(db_index=True),
+        ),
+        migrations.AlterField(
+            model_name='submission',
+            name='user_id',
+            field=models.IntegerField(db_index=True),
+        ),
+    ]

submission/models.py

@@ -6,18 +6,19 @@ from judge.judger.result import result
 
 class Submission(models.Model):
     id = models.CharField(max_length=32, default=rand_str, primary_key=True, db_index=True)
-    user_id = models.IntegerField()
+    user_id = models.IntegerField(db_index=True)
     create_time = models.DateTimeField(auto_now_add=True)
     result = models.IntegerField(default=result["waiting"])
     language = models.IntegerField()
     code = models.TextField()
-    problem_id = models.IntegerField()
+    problem_id = models.IntegerField(db_index=True)
     # 这个字段可能存储很多数据 比如编译错误、系统错误的时候，存储错误原因字符串
     # 正常运行的时候存储 lrun 的判题结果，比如cpu时间内存之类的
     info = models.TextField(blank=True, null=True)
     accepted_answer_time = models.IntegerField(blank=True, null=True)
     # 这个字段只有在题目是accepted 的时候才会用到，比赛题目的提交可能还会有得分等信息，存储在这里面
     accepted_answer_info = models.TextField(blank=True, null=True)
+    is_counted = models.BooleanField(default=False)
 
     class Meta:
         db_table = "submission"

submission/views.py

@@ -1,5 +1,6 @@
 # coding=utf-8
 import json
+import redis
 
 from django.shortcuts import render
 
@@ -7,6 +8,7 @@ from rest_framework.views import APIView
 
 from judge.judger.result import result
 from judge.judger_controller.tasks import judge
+from judge.judger_controller.settings import redis_config
 from account.decorators import login_required
 from account.models import SUPER_ADMIN
 from problem.models import Problem
@@ -29,6 +31,9 @@ class SubmissionAPIView(APIView):
             data = serializer.data
             try:
                 problem = Problem.objects.get(id=data["problem_id"])
+                # 更新问题的总提交计数
+                problem.total_submit_number += 1
+                problem.save()
             except Problem.DoesNotExist:
                 return error_response(u"题目不存在")
             submission = Submission.objects.create(user_id=request.user.id, language=int(data["language"]),
@@ -39,6 +44,10 @@ class SubmissionAPIView(APIView):
             except Exception:
                 return error_response(u"提交判题任务失败")
 
+            # 增加redis 中判题队列长度的计数器
+            r = redis.Redis(host=redis_config["host"], port=redis_config["port"], db=redis_config["db"])
+            r.incr("judge_queue_length")
+
             return success_response({"submission_id": submission.id})
         else:
             return serializer_invalid_response(serializer)
@@ -52,6 +61,18 @@ class SubmissionAPIView(APIView):
             submission = Submission.objects.get(id=submission_id, user_id=request.user.id)
         except Submission.DoesNotExist:
             return error_response(u"提交不存在")
+        # 标记这个submission 已经被统计
+        if not submission.is_counted:
+            submission.is_counted = True
+            submission.save()
+        if submission.result == result["accepted"]:
+            # 更新题目的 ac 计数器
+            try:
+                problem = Problem.objects.get(id=submission.problem_id)
+                problem.total_accepted_number += 1
+                problem.save()
+            except Problem.DoesNotExist:
+                pass
         response_data = {"result": submission.result}
         if submission.result == 0:
             response_data["accepted_answer_time"] = submission.accepted_answer_time
@@ -64,7 +85,8 @@ def problem_my_submissions_list_page(request, problem_id):
         problem = Problem.objects.get(id=problem_id, visible=True)
     except Problem.DoesNotExist:
         return error_page(request, u"问题不存在")
-    submissions = Submission.objects.filter(user_id=request.user.id, problem_id=problem.id).order_by("-create_time")
+    submissions = Submission.objects.filter(user_id=request.user.id, problem_id=problem.id).order_by("-create_time").\
+        values("id", "result", "create_time", "accepted_answer_time", "language")
     return render(request, "oj/problem/my_submissions_list.html",
                   {"submissions": submissions, "problem": problem})