mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-07-26 00:31:35 +02:00
Code Issues Projects Releases Wiki Activity

MDL-46044 Assign: Add conditions to the inner query for performance

Browse Source
This commit is contained in:
Damyon Wiese
2014-06-27 14:58:58 +08:00
parent 6447021bc0
commit 92d78aace8
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
mod/assign/lib.php
View File

@@ -392,11 +392,12 @@ function assign_print_overview($courses, &$htmlarray) {
if (!isset($unmarkedsubmissions)) { if (!isset($unmarkedsubmissions)) {
$submissionmaxattempt = 'SELECT mxs.userid, MAX(mxs.attemptnumber) AS maxattempt, mxs.assignment $submissionmaxattempt = 'SELECT mxs.userid, MAX(mxs.attemptnumber) AS maxattempt, mxs.assignment
FROM {assign_submission} mxs FROM {assign_submission} mxs
WHERE mxs.assignment ' . $sqlassignmentids . '
GROUP BY mxs.userid, mxs.assignment'; GROUP BY mxs.userid, mxs.assignment';
// Build up and array of unmarked submissions indexed by assignment id/ userid // Build up and array of unmarked submissions indexed by assignment id/ userid
// for use where the user has grading rights on assignment. // for use where the user has grading rights on assignment.
$dbparams = array_merge(array(ASSIGN_SUBMISSION_STATUS_SUBMITTED), $assignmentidparams); $dbparams = array_merge($assignmentidparams, array(ASSIGN_SUBMISSION_STATUS_SUBMITTED), $assignmentidparams);
$rs = $DB->get_recordset_sql('SELECT $rs = $DB->get_recordset_sql('SELECT
s.assignment as assignment, s.assignment as assignment,
s.userid as userid, s.userid as userid,
@@ -451,10 +452,12 @@ function assign_print_overview($courses, &$htmlarray) {
// This is nasty because we only want the last attempt. // This is nasty because we only want the last attempt.
$submissionmaxattempt = 'SELECT mxs.userid, MAX(mxs.attemptnumber) AS maxattempt, mxs.assignment $submissionmaxattempt = 'SELECT mxs.userid, MAX(mxs.attemptnumber) AS maxattempt, mxs.assignment
FROM {assign_submission} mxs FROM {assign_submission} mxs
WHERE mxs.assignment ' . $sqlassignmentids . '
AND mxs.userid = ?
GROUP BY mxs.userid, mxs.assignment'; GROUP BY mxs.userid, mxs.assignment';
// Get all user submissions, indexed by assignment id. // Get all user submissions, indexed by assignment id.
$dbparams = array_merge(array($USER->id, $USER->id, $USER->id, $USER->id), $assignmentidparams); $dbparams = array_merge($assignmentidparams, array($USER->id, $USER->id, $USER->id), $assignmentidparams);
$mysubmissions = $DB->get_records_sql('SELECT $mysubmissions = $DB->get_records_sql('SELECT
a.id AS assignment, a.id AS assignment,
a.nosubmissions AS nosubmissions, a.nosubmissions AS nosubmissions,
@@ -464,7 +467,6 @@ function assign_print_overview($courses, &$htmlarray) {
s.status AS status s.status AS status
FROM {assign} a FROM {assign} a
LEFT JOIN ( ' . $submissionmaxattempt . ' ) smx ON LEFT JOIN ( ' . $submissionmaxattempt . ' ) smx ON
smx.userid = ? AND
smx.assignment = a.id smx.assignment = a.id
LEFT JOIN {assign_grades} g ON LEFT JOIN {assign_grades} g ON
g.assignment = a.id AND g.assignment = a.id AND