moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-05 00:46:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

performance/mymoodle MDL-18241 - Assigments were very expensive

Browse source 
Reworked to take queries out of loops and let it scale. Unfortunately
I don't think we can get the get_users_by_capability() call out of the
loop on assignments.

Real query numbers before/after:
Teacher: 12,509 / 314
Student: 127 / 72
Admin: 718 / 133

Conflicts:

	mod/assignment/lib.php

Merged from 19_STABLE (with dmlib changes)
This commit is contained in:
poltawski 2009-02-16 13:14:30 +00:00
parent 31f9d77191
commit 041a1e4173
1 changed files with 41 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

55
mod/assignment/lib.php
View file

@ -2893,6 +2893,8 @@ function assignment_print_overview($courses, &$htmlarray) {
return; return;
} }
$assignmentids = array();
// Do assignment_base::isopen() here without loading the whole thing for speed // Do assignment_base::isopen() here without loading the whole thing for speed
foreach ($assignments as $key => $assignment) { foreach ($assignments as $key => $assignment) {
$time = time(); $time = time();
@ -2905,9 +2907,16 @@ function assignment_print_overview($courses, &$htmlarray) {
} }
if (empty($isopen) || empty($assignment->timedue)) { if (empty($isopen) || empty($assignment->timedue)) {
unset($assignments[$key]); unset($assignments[$key]);
}else{
$assignmentids[] = $assignment->id;
} }
} }
if(empty($assignmentids)){
// no assigments to look at - we're done
return true;
}
$strduedate = get_string('duedate', 'assignment'); $strduedate = get_string('duedate', 'assignment');
$strduedateno = get_string('duedateno', 'assignment'); $strduedateno = get_string('duedateno', 'assignment');
$strgraded = get_string('graded', 'assignment'); $strgraded = get_string('graded', 'assignment');
@ -2917,6 +2926,31 @@ function assignment_print_overview($courses, &$htmlarray) {
$strassignment = get_string('modulename', 'assignment'); $strassignment = get_string('modulename', 'assignment');
$strreviewed = get_string('reviewed','assignment'); $strreviewed = get_string('reviewed','assignment');
// NOTE: we do all possible database work here *outside* of the loop to ensure this scales
//
list($sqlassignmentids, $assignmentidparams) = $DB->get_in_or_equal($assignmentids);
// build up and array of unmarked submissions indexed by assigment id/ userid
// for use where the user has grading rights on assigment
$rs = $DB->get_recordset_sql("SELECT id, assignment, userid
FROM {assignment_submissions}
WHERE teacher = 0 AND timemarked = 0
AND assignment $sqlassignmentids", $assignmentidparams);
$unmarkedsubmissions = array();
foreach ($rs as $rd) {
$unmarkedsubmissions[$rd->assignment][$rd->userid] = $rd->id;
}
$rs->close();
// get all user submissions, indexed by assigment id
$mysubmissions = $DB->get_records_sql("SELECT assignment, timemarked, teacher, grade
FROM {assignment_submissions}
WHERE userid = ? AND
assignment $sqlassignmentids", array_merge(array($USER->id), $assignmentidparams));
foreach ($assignments as $assignment) { foreach ($assignments as $assignment) {
$str = '<div class="assignment overview"><div class="name">'.$strassignment. ': '. $str = '<div class="assignment overview"><div class="name">'.$strassignment. ': '.
'<a '.($assignment->visible ? '':' class="dimmed"'). '<a '.($assignment->visible ? '':' class="dimmed"').
@ -2933,14 +2967,9 @@ function assignment_print_overview($courses, &$htmlarray) {
// count how many people can submit // count how many people can submit
$submissions = 0; // init $submissions = 0; // init
if ($students = get_users_by_capability($context, 'mod/assignment:submit', '', '', '', '', 0, '', false)) { if ($students = get_users_by_capability($context, 'mod/assignment:submit', 'u.id', '', '', '', 0, '', false)) {
foreach ($students as $student) { foreach($students as $student){
if ($DB->record_exists_sql("SELECT id if(isset($unmarkedsubmissions[$assignment->id][$student->id])){
FROM {assignment_submissions}
WHERE assignment = ? AND
userid = ? AND
teacher = 0 AND
timemarked = 0", array($assignment->id, $student->id))) {
$submissions++; $submissions++;
} }
} }
@ -2950,12 +2979,10 @@ function assignment_print_overview($courses, &$htmlarray) {
$str .= get_string('submissionsnotgraded', 'assignment', $submissions); $str .= get_string('submissionsnotgraded', 'assignment', $submissions);
} }
} else { } else {
$sql = "SELECT * if(isset($mysubmissions[$assignment->id])){
FROM {assignment_submissions}
WHERE userid = ? $submission = $mysubmissions[$assignment->id];
AND assignment = ?";
$params = array($USER->id, $assignment->id);
if ($submission = $DB->get_record_sql($sql, $params)) {
if ($submission->teacher == 0 && $submission->timemarked == 0) { if ($submission->teacher == 0 && $submission->timemarked == 0) {
$str .= $strsubmitted . ', ' . $strnotgradedyet; $str .= $strsubmitted . ', ' . $strnotgradedyet;
} else if ($submission->grade <= 0) { } else if ($submission->grade <= 0) {