From bdbce26f3be509c366ee7240a0206cbb50a7ffb2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=91=A8=E5=9C=A3=E6=9D=B0?=
 <32413588+dblark@users.noreply.github.com>
Date: Mon, 1 Apr 2019 17:28:21 +0800
Subject: [PATCH 01/12] Fix import/export no additional file

---
 modules/problem.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/modules/problem.js b/modules/problem.js
index 84df7e2..7c97280 100644
--- a/modules/problem.js
+++ b/modules/problem.js
@@ -257,6 +257,7 @@ app.get('/problem/:id/export', async (req, res) => {
       limit_and_hint: problem.limit_and_hint,
       time_limit: problem.time_limit,
       memory_limit: problem.memory_limit,
+      additional_file_id: problem.additional_file_id,
       file_io: problem.file_io,
       file_io_input_name: problem.file_io_input_name,
       file_io_output_name: problem.file_io_output_name,
@@ -465,6 +466,11 @@ app.post('/problem/:id/import', async (req, res) => {
       let data = await download(req.body.url + (req.body.url.endsWith('/') ? 'testdata/download' : '/testdata/download'));
       await fs.writeFileAsync(tmpFile.path, data);
       await problem.updateTestdata(tmpFile.path, await res.locals.user.hasPrivilege('manage_problem'));
+      if (json.obj.additional_file_id != null) {
+        let additional_file = await download(req.body.url + (req.body.url.endsWith('/') ? 'download/additional_file' : '/download/additional_file'));
+        await fs.writeFileAsync(tmpFile.path, additional_file);
+        await problem.updateFile(tmpFile.path, 'additional_file', await res.locals.user.hasPrivilege('manage_problem'));
+      }
     } catch (e) {
       syzoj.log(e);
     }

From a3dc32ff6dc805746587b9b024bc8539b1cee1b0 Mon Sep 17 00:00:00 2001
From: Menci <huanghaorui301@gmail.com>
Date: Mon, 1 Apr 2019 21:39:52 +0800
Subject: [PATCH 02/12] Fix wrong comparison when querying longest or shortest
 in statistics

---
 models/problem.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/models/problem.js b/models/problem.js
index 6c5ecf0..e844fe5 100644
--- a/models/problem.js
+++ b/models/problem.js
@@ -58,15 +58,15 @@ SELECT \
 			`id` \
 		FROM `judge_state` `inner_table` \
 		WHERE `problem_id` = `outer_table`.`problem_id` AND `user_id` = `outer_table`.`user_id` AND `status` = "Accepted" AND `type` = 0 \
-		ORDER BY LENGTH(`code`) ASC \
+		ORDER BY `code_length` ASC \
     LIMIT 1 \
 	) AS `id`, \
 	( \
 		SELECT \
-			LENGTH(`code`) \
+			`code_length` \
 		FROM `judge_state` `inner_table` \
 		WHERE `problem_id` = `outer_table`.`problem_id` AND `user_id` = `outer_table`.`user_id` AND `status` = "Accepted" AND `type` = 0 \
-		ORDER BY LENGTH(`code`) ASC \
+		ORDER BY `code_length` ASC \
     LIMIT 1 \
 	) AS `code_length` \
 FROM `judge_state` `outer_table` \
@@ -83,15 +83,15 @@ SELECT \
 			`id` \
 		FROM `judge_state` `inner_table` \
 		WHERE `problem_id` = `outer_table`.`problem_id` AND `user_id` = `outer_table`.`user_id` AND `status` = "Accepted" AND `type` = 0 \
-		ORDER BY LENGTH(`code`) DESC \
+		ORDER BY `code_length` DESC \
     LIMIT 1 \
 	) AS `id`, \
 	( \
 		SELECT \
-			LENGTH(`code`) \
+			`code_length` \
 		FROM `judge_state` `inner_table` \
 		WHERE `problem_id` = `outer_table`.`problem_id` AND `user_id` = `outer_table`.`user_id` AND `status` = "Accepted" AND `type` = 0 \
-		ORDER BY LENGTH(`code`) DESC \
+		ORDER BY `code_length` DESC \
     LIMIT 1 \
 	) AS `code_length` \
 FROM `judge_state` `outer_table` \

From 7d20537ce60ffd19873836ed0dbb9cb4998acb29 Mon Sep 17 00:00:00 2001
From: Menci <huanghaorui301@gmail.com>
Date: Mon, 1 Apr 2019 21:47:50 +0800
Subject: [PATCH 03/12] Add <b> to some elements

---
 views/contest.ejs    | 2 ++
 views/statistics.ejs | 8 +++++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/views/contest.ejs b/views/contest.ejs
index 8ee23a5..2de9aa9 100644
--- a/views/contest.ejs
+++ b/views/contest.ejs
@@ -75,8 +75,10 @@
                   <a href="<%= syzoj.utils.makeUrl(['contest', 'submission', problem.judge_id]) %>">
                   <% if (typeof problem.status === 'string') { %>
                     <span class="status <%= problem.status.toLowerCase().split(' ').join('_') %>">
+                      <b>
                       <i class="<%= icon[getStatusMeta(problem.status)] || 'remove' %> icon"></i>
                       <%= problem.feedback || problem.status %>
+                      </b>
                     </span>
                   <% } else if (typeof problem.status === 'object') { %>
                     <% if (problem.status.accepted) { %>
diff --git a/views/statistics.ejs b/views/statistics.ejs
index 05d2481..8166f12 100644
--- a/views/statistics.ejs
+++ b/views/statistics.ejs
@@ -71,19 +71,21 @@ function getColorOfScore(score) {
       <% for (let judge of statistics.judge_state) { %>
           <% include util %>
           <tr>
-              <td><a href="<%= syzoj.utils.makeUrl(['submission', judge.id]) %>">#<%= judge.id %></a></td>
-              <td><a href="<%= syzoj.utils.makeUrl(['problem', judge.problem_id]) %>">#<%= judge.problem_id %>. <%= judge.problem.title %></a></td>
+              <td><a href="<%= syzoj.utils.makeUrl(['submission', judge.id]) %>"><b>#<%= judge.id %></b></a></td>
+              <td><a href="<%= syzoj.utils.makeUrl(['problem', judge.problem_id]) %>"><b>#<%= judge.problem_id %>.</b> <%= judge.problem.title %></a></td>
               <td><a href="<%= syzoj.utils.makeUrl(['submission', judge.id]) %>">
+                  <b>
                   <span class="status <%= getStatusMeta(judge.status).toLowerCase().split(' ').join('_') %>">
                   <i class="<%= icon[getStatusMeta(judge.status)] || 'remove' %> icon"></i>
                   <%= judge.status %>
                   </span>
+                  </b>
               </a></td>
               <td><a href="<%= syzoj.utils.makeUrl(['submission', judge.id]) %>"><span class="score score_<%= parseInt(judge.score / 10) || 0 %>"><%= judge.score %></span></a></td>
               <% if (problem.type !== 'submit-answer') { %>
                 <td><%= judge.total_time %> ms</td>
                 <td><%= parseInt(judge.max_memory) || 0 %> K</td>
-                <td><a href="<%= syzoj.utils.makeUrl(['submission', judge.id]) %>"><%= syzoj.languages[judge.language].show %></a> / <%= syzoj.utils.formatSize(judge.code.length) %></td>
+                <td><a href="<%= syzoj.utils.makeUrl(['submission', judge.id]) %>"><b><%= syzoj.languages[judge.language].show %></b></a> / <%= syzoj.utils.formatSize(judge.code.length) %></td>
               <% } else { %>
                 <td><%= syzoj.utils.formatSize(judge.max_memory) %></td>
               <% } %>

From 54cd962e6005f18c37e36257f6b1e7754cc56861 Mon Sep 17 00:00:00 2001
From: Menci <huanghaorui301@gmail.com>
Date: Tue, 2 Apr 2019 10:50:36 +0800
Subject: [PATCH 04/12] Fix testcase's System Error message not shown

---
 libs/submissions_process.js | 1 +
 views/submission.ejs        | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/libs/submissions_process.js b/libs/submissions_process.js
index 910f70b..79f4642 100644
--- a/libs/submissions_process.js
+++ b/libs/submissions_process.js
@@ -66,6 +66,7 @@ const processOverallResult = (source, config) => {
                 score: st.score,
                 cases: st.cases.map(cs => ({
                     status: cs.status,
+                    errorMessage: cs.errorMessage,
                     result: cs.result && {
                         type: cs.result.type,
                         time: config.showUsage ? cs.result.time : undefined,
diff --git a/views/submission.ejs b/views/submission.ejs
index 23a6a4f..7fdffc2 100644
--- a/views/submission.ejs
+++ b/views/submission.ejs
@@ -85,7 +85,7 @@
       <div class="content" :class="singleSubtask ? 'active' : ''">
         <div class="accordion">
           <template v-for="curCase, $caseIndex in subtask.cases">
-            <div class="title" :class="checkTestcaseOK(curCase) ? '' : 'unexpandable'">
+            <div class="title" :class="checkTestcaseOK(curCase) || curCase.errorMessage ? '' : 'unexpandable'">
               <div class="ui grid">
                 <div class="three wide column">
                     <i class="dropdown icon"></i>

From 18f9acba449b9f812d0e6c4c518931a8c9200702 Mon Sep 17 00:00:00 2001
From: Menci <huanghaorui301@gmail.com>
Date: Tue, 2 Apr 2019 10:59:35 +0800
Subject: [PATCH 05/12] Disable result pushing's debug print

---
 modules/socketio.js | 29 +++++++++++++++--------------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/modules/socketio.js b/modules/socketio.js
index 7acc982..420441e 100644
--- a/modules/socketio.js
+++ b/modules/socketio.js
@@ -14,6 +14,7 @@ const finishedJudgeList = {};
 const compiledList = [];
 const clientDetailProgressList = {};
 const clientDisplayConfigList = {};
+const debug = false;
 
 function processOverallResult(source, config) {
     if (source == null)
@@ -75,25 +76,25 @@ function forAllClients(ns, taskId, exec) {
             });
         }
         else {
-            winston.warn(`Error while listing socketio clients in ${taskId}`, err);
+            if (debug) winston.warn(`Error while listing socketio clients in ${taskId}`, err);
         }
     });
 }
 function initializeSocketIO(s) {
     ioInstance = socketio(s);
     const initializeNamespace = (name, exec) => {
-        winston.debug('initializing socketIO', name);
+        if (debug) winston.debug('initializing socketIO', name);
         const newNamespace = ioInstance.of('/' + name);
         newNamespace.on('connection', (socket) => {
             socket.on('disconnect', () => {
-                winston.info(`Client ${socket.id} disconnected.`);
+                if (debug) winston.info(`Client ${socket.id} disconnected.`);
                 delete clientDisplayConfigList[socket.id];
                 if (clientDetailProgressList[socket.id]) {
                     delete clientDetailProgressList[socket.id];
                 }
             });
             socket.on('join', (reqJwt, cb) => {
-                winston.info(`Client ${socket.id} connected.`);
+                if (debug) winston.info(`Client ${socket.id} connected.`);
                 let req;
                 try {
                     req = jwt.verify(reqJwt, syzoj.config.session_secret);
@@ -102,12 +103,12 @@ function initializeSocketIO(s) {
                     }
                     clientDisplayConfigList[socket.id] = req.displayConfig;
                     const taskId = req.taskId;
-                    winston.verbose(`A client trying to join ${name} namespace for ${taskId}.`);
+                    if (debug) winston.verbose(`A client trying to join ${name} namespace for ${taskId}.`);
                     socket.join(taskId.toString());
                     exec(req, socket).then(x => cb(x), err => cb({ ok: false, message: err.toString() }));
                 }
                 catch (err) {
-                    winston.info('Error while joining.');
+                    if (debug) winston.info('Error while joining.');
                     cb({
                         ok: false,
                         message: err.toString()
@@ -121,7 +122,7 @@ function initializeSocketIO(s) {
     detailProgressNamespace = initializeNamespace('detail', async (req, socket) => {
         const taskId = req.taskId;
         if (finishedJudgeList[taskId]) {
-            winston.debug(`Judge task #${taskId} has been finished, ${JSON.stringify(currentJudgeList[taskId])}`);
+            if (debug) winston.debug(`Judge task #${taskId} has been finished, ${JSON.stringify(currentJudgeList[taskId])}`);
             return {
                 ok: true,
                 running: false,
@@ -131,7 +132,7 @@ function initializeSocketIO(s) {
             };
         }
         else {
-            winston.debug(`Judge task #${taskId} has not been finished`);
+            if (debug) winston.debug(`Judge task #${taskId} has not been finished`);
             if (currentJudgeList[taskId]) {
                 clientDetailProgressList[socket.id] = {
                     version: 0,
@@ -208,7 +209,7 @@ function initializeSocketIO(s) {
 }
 exports.initializeSocketIO = initializeSocketIO;
 function createTask(taskId) {
-    winston.debug(`Judge task #${taskId} has started`);
+    if (debug) winston.debug(`Judge task #${taskId} has started`);
     currentJudgeList[taskId] = {};
     finishedJudgeList[taskId] = null;
     forAllClients(detailProgressNamespace, taskId, (clientId) => {
@@ -223,7 +224,7 @@ function createTask(taskId) {
 }
 exports.createTask = createTask;
 function updateCompileStatus(taskId, result) {
-    winston.debug(`Updating compilation status for #${taskId}`);
+    if (debug) winston.debug(`Updating compilation status for #${taskId}`);
     compiledList[taskId] = { result: result.status === interfaces.TaskStatus.Done ? 'Submitted' : 'Compile Error' };
     compileProgressNamespace.to(taskId.toString()).emit('finish', {
         taskId: taskId,
@@ -232,7 +233,7 @@ function updateCompileStatus(taskId, result) {
 }
 exports.updateCompileStatus = updateCompileStatus;
 function updateProgress(taskId, data) {
-    winston.verbose(`Updating progress for #${taskId}`);
+    if (debug) winston.verbose(`Updating progress for #${taskId}`);
     currentJudgeList[taskId] = data;
     const finalResult = judgeResult.convertResult(taskId, data);
     const roughResult = {
@@ -243,7 +244,7 @@ function updateProgress(taskId, data) {
     };
     forAllClients(detailProgressNamespace, taskId, (client) => {
         try {
-            winston.debug(`Pushing progress update to ${client}`);
+            if (debug) winston.debug(`Pushing progress update to ${client}`);
            if (clientDetailProgressList[client] && clientDisplayConfigList[client]) {
                 const original = clientDetailProgressList[client].content;
                 const updated = processOverallResult(currentJudgeList[taskId], clientDisplayConfigList[client]);
@@ -283,7 +284,7 @@ function updateResult(taskId, data) {
     };
     finishedJudgeList[taskId] = roughResult;
     forAllClients(roughProgressNamespace, taskId, (client) => {
-        winston.debug(`Pushing rough result to ${client}`);
+        if (debug) winston.debug(`Pushing rough result to ${client}`);
         roughProgressNamespace.sockets[client].emit('finish', {
             taskId: taskId,
             result: processRoughResult(finishedJudgeList[taskId], clientDisplayConfigList[client])
@@ -291,7 +292,7 @@ function updateResult(taskId, data) {
     });
     forAllClients(detailProgressNamespace, taskId, (client) => {
         if (clientDisplayConfigList[client]) {
-            winston.debug(`Pushing detail result to ${client}`);
+            if (debug) winston.debug(`Pushing detail result to ${client}`);
             detailProgressNamespace.sockets[client].emit('finish', {
                 taskId: taskId,
                 result: processOverallResult(currentJudgeList[taskId], clientDisplayConfigList[client]),

From 220887eb4c72458ca81cc2f546c191edffecded8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=91=A8=E5=9C=A3=E6=9D=B0?=
 <32413588+dblark@users.noreply.github.com>
Date: Tue, 2 Apr 2019 12:15:04 +0800
Subject: [PATCH 06/12] Update problem.js

---
 modules/problem.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/problem.js b/modules/problem.js
index 7c97280..3e74485 100644
--- a/modules/problem.js
+++ b/modules/problem.js
@@ -257,7 +257,7 @@ app.get('/problem/:id/export', async (req, res) => {
       limit_and_hint: problem.limit_and_hint,
       time_limit: problem.time_limit,
       memory_limit: problem.memory_limit,
-      additional_file_id: problem.additional_file_id,
+      have_additional_file_id: problem.additional_file_id !== null,
       file_io: problem.file_io,
       file_io_input_name: problem.file_io_input_name,
       file_io_output_name: problem.file_io_output_name,
@@ -466,7 +466,7 @@ app.post('/problem/:id/import', async (req, res) => {
       let data = await download(req.body.url + (req.body.url.endsWith('/') ? 'testdata/download' : '/testdata/download'));
       await fs.writeFileAsync(tmpFile.path, data);
       await problem.updateTestdata(tmpFile.path, await res.locals.user.hasPrivilege('manage_problem'));
-      if (json.obj.additional_file_id != null) {
+      if (json.obj.have_additional_file) {
         let additional_file = await download(req.body.url + (req.body.url.endsWith('/') ? 'download/additional_file' : '/download/additional_file'));
         await fs.writeFileAsync(tmpFile.path, additional_file);
         await problem.updateFile(tmpFile.path, 'additional_file', await res.locals.user.hasPrivilege('manage_problem'));

From 7fed7b9d72f9bd4310344e473e6e09c70b21db18 Mon Sep 17 00:00:00 2001
From: Menci <huanghaorui301@gmail.com>
Date: Tue, 2 Apr 2019 12:44:16 +0800
Subject: [PATCH 07/12] Print more debug logs in judger.js

---
 libs/judger.js | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/libs/judger.js b/libs/judger.js
index a047925..93bec16 100644
--- a/libs/judger.js
+++ b/libs/judger.js
@@ -66,7 +66,7 @@ async function connect() {
 
       waitingForTask = true;
 
-      winston.verbose(`Judge client ${socket.id} emitted waitForTask.`);
+      winston.warn(`Judge client ${socket.id} emitted waitForTask.`);
 
       // Poll the judge queue, timeout = 10s.
       let obj;
@@ -80,9 +80,11 @@ async function connect() {
         return;
       }
 
+      winston.warn(`Judge task ${obj.data.content.taskId} poped from queue.`);
+
       // Re-push to queue if got task but judge client already disconnected.
       if (socket.disconnected) {
-        winston.warn(`Judge client ${socket.id} got task but disconnected re-pushing task to queue.`);
+        winston.warn(`Judge client ${socket.id} got task but disconnected re-pushing task ${obj.data.content.taskId} to queue.`);
         judgeQueue.push(obj.data, obj.priority);
         return;
       }
@@ -90,10 +92,10 @@ async function connect() {
       // Send task to judge client, and wait for ack.
       const task = obj.data;
       pendingAckTaskObj = obj;
-      winston.verbose(`Sending task ${task.content.taskId} to judge client ${socket.id}.`);
+      winston.warn(`Sending task ${task.content.taskId} to judge client ${socket.id}.`);
       socket.emit('onTask', msgPack.encode(task), () => {
         // Acked.
-        winston.verbose(`Judge client ${socket.id} acked task ${task.content.taskId}.`);
+        winston.warn(`Judge client ${socket.id} acked task ${task.content.taskId}.`);
         pendingAckTaskObj = null;
         waitingForTask = false;
       });
@@ -232,6 +234,8 @@ module.exports.judge = async function (judge_state, problem, priority) {
     content: content,
     extraData: extraData
   }, priority);
+
+  winston.warn(`Judge task ${content.taskId} enqueued.`);
 }
 
 module.exports.getCachedJudgeState = taskId => judgeStateCache.get(taskId);

From 0d9c0d6eade2f7c14e4ae55e2f906ed163dc7777 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=91=A8=E5=9C=A3=E6=9D=B0?=
 <32413588+dblark@users.noreply.github.com>
Date: Tue, 2 Apr 2019 17:32:01 +0800
Subject: [PATCH 08/12] Update problem.js

---
 modules/problem.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/problem.js b/modules/problem.js
index 3e74485..bc5d60b 100644
--- a/modules/problem.js
+++ b/modules/problem.js
@@ -257,7 +257,7 @@ app.get('/problem/:id/export', async (req, res) => {
       limit_and_hint: problem.limit_and_hint,
       time_limit: problem.time_limit,
       memory_limit: problem.memory_limit,
-      have_additional_file_id: problem.additional_file_id !== null,
+      have_additional_file: problem.additional_file_id !== null,
       file_io: problem.file_io,
       file_io_input_name: problem.file_io_input_name,
       file_io_output_name: problem.file_io_output_name,

From 05c5fa057dcd885191cb504db72cff10fef80ee5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=91=A8=E5=9C=A3=E6=9D=B0?=
 <32413588+dblark@users.noreply.github.com>
Date: Wed, 3 Apr 2019 06:59:15 +0800
Subject: [PATCH 09/12] Fix have_additional_file always true

---
 modules/problem.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/problem.js b/modules/problem.js
index bc5d60b..d93cec2 100644
--- a/modules/problem.js
+++ b/modules/problem.js
@@ -257,7 +257,7 @@ app.get('/problem/:id/export', async (req, res) => {
       limit_and_hint: problem.limit_and_hint,
       time_limit: problem.time_limit,
       memory_limit: problem.memory_limit,
-      have_additional_file: problem.additional_file_id !== null,
+      have_additional_file: problem.additional_file_id != null,
       file_io: problem.file_io,
       file_io_input_name: problem.file_io_input_name,
       file_io_output_name: problem.file_io_output_name,

From 296137397d719006c7073a215287c3aa68403874 Mon Sep 17 00:00:00 2001
From: Menci <huanghaorui301@gmail.com>
Date: Sat, 13 Apr 2019 04:37:50 +0800
Subject: [PATCH 10/12] Fix #118

---
 views/problem.ejs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/views/problem.ejs b/views/problem.ejs
index ceb3df4..e2332dc 100644
--- a/views/problem.ejs
+++ b/views/problem.ejs
@@ -41,8 +41,8 @@ div[class*=ace_br] {
           <% if (problem.type === 'interaction') { %>
             <span class="ui label">题目类型：交互</span>
           <% } else if (problem.file_io) { %>
-            <span class="ui label">输入文件: <%= problem.file_io_input_name %></span>
-            <span class="ui label">输出文件: <%= problem.file_io_output_name %></span>
+            <span class="ui label">输入文件：<%= problem.file_io_input_name %></span>
+            <span class="ui label">输出文件：<%= problem.file_io_output_name %></span>
           <% } else { %>
             <span class="ui label">标准输入输出</span>
           <% } %>

From d2462620da2900b83e6b36d1016735e54f90d519 Mon Sep 17 00:00:00 2001
From: Menci <huanghaorui301@gmail.com>
Date: Sat, 13 Apr 2019 18:47:24 +0800
Subject: [PATCH 11/12] Fix error when ranking_params is null

---
 modules/contest.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/contest.js b/modules/contest.js
index fd2f4f0..763d3d8 100644
--- a/modules/contest.js
+++ b/modules/contest.js
@@ -249,7 +249,7 @@ app.get('/contest/:id/ranklist', async (req, res) => {
 
         /*** XXX: Clumsy duplication, see ContestRanklist::updatePlayer() ***/
         if (contest.type === 'noi' || contest.type === 'ioi') {
-          let multiplier = contest.ranklist.ranking_params[i] || 1.0;
+          let multiplier = (contest.ranklist.ranking_params || {})[i] || 1.0;
           player.score_details[i].weighted_score = player.score_details[i].score == null ? null : Math.round(player.score_details[i].score * multiplier);
           player.score += player.score_details[i].weighted_score;
         }

From d171207b7dbeb4c321276b8e7fc568d2ed3757dd Mon Sep 17 00:00:00 2001
From: Menci <huanghaorui301@gmail.com>
Date: Mon, 15 Apr 2019 00:15:41 +0800
Subject: [PATCH 12/12] Fix deadlock in JudgeState::updateRelatedInfo()

---
 models/judge_state.js | 23 ++++++++++-------------
 models/problem.js     |  2 +-
 models/user.js        |  2 ++
 3 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/models/judge_state.js b/models/judge_state.js
index 025cb5d..f937c2a 100644
--- a/models/judge_state.js
+++ b/models/judge_state.js
@@ -118,19 +118,16 @@ class JudgeState extends Model {
   }
 
   async updateRelatedInfo(newSubmission) {
-    await syzoj.utils.lock(['JudgeState::updateRelatedInfo', 'problem', this.problem_id], async () => {
-      await syzoj.utils.lock(['JudgeState::updateRelatedInfo', 'user', this.user_id], async () => {
-        if (this.type === 0) {
-          await this.loadRelationships();
-          await this.user.refreshSubmitInfo();
-          await this.user.save();
-          await this.problem.resetSubmissionCount();
-        } else if (this.type === 1) {
-          let contest = await Contest.fromID(this.type_info);
-          await contest.newSubmission(this);
-        }
-      });
-    });
+    if (this.type === 0) {
+      await this.loadRelationships();
+
+      // No need to await them.
+      this.user.refreshSubmitInfo();
+      this.problem.resetSubmissionCount();
+    } else if (this.type === 1) {
+      let contest = await Contest.fromID(this.type_info);
+      await contest.newSubmission(this);
+    }
   }
 
   async rejudge() {
diff --git a/models/problem.js b/models/problem.js
index 6c5ecf0..a7ab9b7 100644
--- a/models/problem.js
+++ b/models/problem.js
@@ -490,7 +490,7 @@ class Problem extends Model {
   async resetSubmissionCount() {
     let JudgeState = syzoj.model('judge_state');
     await syzoj.utils.lock(['Problem::resetSubmissionCount', this.id], async () => {
-      this.submit_num = await JudgeState.count({ score: { $not: null }, problem_id: this.id, type: { $not: 1 } });
+      this.submit_num = await JudgeState.count({ problem_id: this.id, type: { $not: 1 } });
       this.ac_num = await JudgeState.count({ score: 100, problem_id: this.id, type: { $not: 1 } });
       await this.save();
     });
diff --git a/models/user.js b/models/user.js
index 4f215e4..c67c475 100644
--- a/models/user.js
+++ b/models/user.js
@@ -108,6 +108,8 @@ class User extends Model {
       });
 
       this.submit_num = cnt;
+
+      await this.save();
     });
   }