L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MDL-65429 mod_forum: Indicate subs fetch completion with no subs

Browse Source 
Unit tests updated to make sure only a single query is executed after
multiple reads
This commit is contained in:
Peter
2019-08-30 09:08:19 +08:00
committed by Peter
parent 5f5e77c4ef
commit e49444d535
2 changed files with 31 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mod/forum/classes/subscriptions.php
+3
View File
@@ -512,9 +512,12 @@ class subscriptions {
'userid' => $userid,
'forum' => $forumid,
), null, 'id, discussion, preference');
self::$forumdiscussioncache[$userid][$forumid] = array();
foreach ($subscriptions as $id => $data) {
self::add_to_discussion_cache($forumid, $userid, $data->discussion, $data->preference);
}
$subscriptions->close();
}
} else {
mod/forum/tests/subscriptions_test.php
+28 -2
View File
@@ -1036,7 +1036,7 @@ class mod_forum_subscriptions_testcase extends advanced_testcase {
// Create a course, with a forum.
$course = $this->getDataGenerator()->create_course();
$options = array('course' => $course->id, 'forcesubscribe' => FORUM_INITIALSUBSCRIBE);
$options = array('course' => $course->id, 'forcesubscribe' => FORUM_FORCESUBSCRIBE);
$forum = $this->getDataGenerator()->create_module('forum', $options);
// Create some users.
@@ -1045,6 +1045,8 @@ class mod_forum_subscriptions_testcase extends advanced_testcase {
// Post some discussions to the forum.
$discussions = array();
$author = $users[0];
$userwithnosubs = $users[1];
for ($i = 0; $i < 20; $i++) {
list($discussion, $post) = $this->helper_post_to_forum($forum, $author);
$discussions[] = $discussion;
@@ -1053,15 +1055,20 @@ class mod_forum_subscriptions_testcase extends advanced_testcase {
// Unsubscribe half the users from the half the discussions.
$forumcount = 0;
$usercount = 0;
$userwithsubs = null;
foreach ($discussions as $data) {
// Unsubscribe user from all discussions.
\mod_forum\subscriptions::unsubscribe_user_from_discussion($userwithnosubs->id, $data);
if ($forumcount % 2) {
continue;
}
foreach ($users as $user) {
if ($usercount % 2) {
$userwithsubs = $user;
continue;
}
\mod_forum\subscriptions::unsubscribe_user_from_discussion($user->id, $discussion);
\mod_forum\subscriptions::unsubscribe_user_from_discussion($user->id, $data);
$usercount++;
}
$forumcount++;
@@ -1071,6 +1078,25 @@ class mod_forum_subscriptions_testcase extends advanced_testcase {
\mod_forum\subscriptions::reset_forum_cache();
\mod_forum\subscriptions::reset_discussion_cache();
// A user with no subscriptions should only be fetched once.
$this->assertNull(\mod_forum\subscriptions::fill_discussion_subscription_cache($forum->id, $userwithnosubs->id));
$startcount = $DB->perf_get_reads();
$this->assertNull(\mod_forum\subscriptions::fill_discussion_subscription_cache($forum->id, $userwithnosubs->id));
$this->assertEquals($startcount, $DB->perf_get_reads());
// Confirm subsequent calls properly tries to fetch subs.
$this->assertNull(\mod_forum\subscriptions::fill_discussion_subscription_cache($forum->id, $userwithsubs->id));
$this->assertNotEquals($startcount, $DB->perf_get_reads());
// Another read should be performed to get all subscriptions for the forum.
$startcount = $DB->perf_get_reads();
$this->assertNull(\mod_forum\subscriptions::fill_discussion_subscription_cache($forum->id));
$this->assertNotEquals($startcount, $DB->perf_get_reads());
// Reset the subscription caches.
\mod_forum\subscriptions::reset_forum_cache();
\mod_forum\subscriptions::reset_discussion_cache();
// Filling the discussion subscription cache should only use a single query.
$startcount = $DB->perf_get_reads();
$this->assertNull(\mod_forum\subscriptions::fill_discussion_subscription_cache($forum->id));