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

MDL-64258 Group: Performance problem on the enrol group members page

Browse source
This commit is contained in:
Huong Nguyen 2019-06-26 14:57:02 +07:00
parent 53f796b91a
commit afcc7a723d
1 changed files with 12 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

18
user/selector/lib.php
View file

@ -890,7 +890,15 @@ class group_non_members_selector extends groups_user_selector_base {
list($searchcondition, $searchparams) = $this->search_sql($search, 'u'); list($searchcondition, $searchparams) = $this->search_sql($search, 'u');
// Build the SQL. // Build the SQL.
list($enrolsql, $enrolparams) = get_enrolled_sql($context); $enrolledjoin = get_enrolled_join($context, 'u.id');
$wheres = [];
$wheres[] = $enrolledjoin->wheres;
$wheres[] = 'u.deleted = 0';
$wheres[] = 'gm.id IS NULL';
$wheres = implode(' AND ', $wheres);
$wheres .= ' AND ' . $searchcondition;
$fields = "SELECT r.id AS roleid, u.id AS userid, $fields = "SELECT r.id AS roleid, u.id AS userid,
" . $this->required_fields_sql('u') . ", " . $this->required_fields_sql('u') . ",
(SELECT count(igm.groupid) (SELECT count(igm.groupid)
@ -898,18 +906,16 @@ class group_non_members_selector extends groups_user_selector_base {
JOIN {groups} ig ON igm.groupid = ig.id JOIN {groups} ig ON igm.groupid = ig.id
WHERE igm.userid = u.id AND ig.courseid = :courseid) AS numgroups"; WHERE igm.userid = u.id AND ig.courseid = :courseid) AS numgroups";
$sql = " FROM {user} u $sql = " FROM {user} u
JOIN ($enrolsql) e ON e.id = u.id $enrolledjoin->joins
LEFT JOIN {role_assignments} ra ON (ra.userid = u.id AND ra.contextid $relatedctxsql AND ra.roleid $roleids) LEFT JOIN {role_assignments} ra ON (ra.userid = u.id AND ra.contextid $relatedctxsql AND ra.roleid $roleids)
LEFT JOIN {role} r ON r.id = ra.roleid LEFT JOIN {role} r ON r.id = ra.roleid
LEFT JOIN {groups_members} gm ON (gm.userid = u.id AND gm.groupid = :groupid) LEFT JOIN {groups_members} gm ON (gm.userid = u.id AND gm.groupid = :groupid)
WHERE u.deleted = 0 WHERE $wheres";
AND gm.id IS NULL
AND $searchcondition";
list($sort, $sortparams) = users_order_by_sql('u', $search, $this->accesscontext); list($sort, $sortparams) = users_order_by_sql('u', $search, $this->accesscontext);
$orderby = ' ORDER BY ' . $sort; $orderby = ' ORDER BY ' . $sort;
$params = array_merge($searchparams, $roleparams, $enrolparams, $relatedctxparams); $params = array_merge($searchparams, $roleparams, $relatedctxparams, $enrolledjoin->params);
$params['courseid'] = $this->courseid; $params['courseid'] = $this->courseid;
$params['groupid'] = $this->groupid; $params['groupid'] = $this->groupid;