makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-08 04:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #6348 from DaRk1V0iD/ticket/16940_master

Browse source 
[ticket/16940] Optimize phpBB Native Search [master]
This commit is contained in:
Marc Alexander 2021-12-23 22:26:08 +01:00
commit 758d6ddbb9
1 changed files with 13 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
phpBB/phpbb/search/backend/base.php
View file

@ -331,7 +331,7 @@ abstract class base implements search_backend_interface
while (still_on_time() && $post_counter <= $max_post_id)
{
$rows = $this->get_posts_between($post_counter + 1, $post_counter + self::BATCH_SIZE);
$rows = $this->get_posts_batch_after($post_counter);
if ($this->db->sql_buffer_nested_transactions())
{
@ -346,9 +346,8 @@ abstract class base implements search_backend_interface
$this->index('post', (int) $row['post_id'], $row['post_text'], $row['post_subject'], (int) $row['poster_id'], (int) $row['forum_id']);
}
$row_count++;
$post_counter = $row['post_id'];
}
$post_counter += self::BATCH_SIZE;
}
// pretend the number of posts was as big as the number of ids we indexed so far
@ -358,7 +357,7 @@ abstract class base implements search_backend_interface
$this->tidy();
$this->config['num_posts'] = $num_posts;
if ($post_counter <= $max_post_id)
if ($post_counter < $max_post_id)
{
$totaltime = microtime(true) - $starttime;
$rows_per_second = $row_count / $totaltime;
@ -385,7 +384,7 @@ abstract class base implements search_backend_interface
$row_count = 0;
while (still_on_time() && $post_counter <= $max_post_id)
{
$rows = $this->get_posts_between($post_counter + 1, $post_counter + self::BATCH_SIZE);
$rows = $this->get_posts_batch_after($post_counter);
$ids = $posters = $forum_ids = array();
foreach ($rows as $row)
{
@ -398,12 +397,11 @@ abstract class base implements search_backend_interface
if (count($ids))
{
$this->index_remove($ids, $posters, $forum_ids);
$post_counter = $ids[count($ids) - 1];
}
$post_counter += self::BATCH_SIZE;
}
if ($post_counter <= $max_post_id)
if ($post_counter < $max_post_id)
{
$totaltime = microtime(true) - $starttime;
$rows_per_second = $row_count / $totaltime;
@ -445,19 +443,18 @@ abstract class base implements search_backend_interface
}
/**
* Get posts between 2 ids
* Get batch of posts after id
*
* @param int $initial_id
* @param int $final_id
* @param int $post_id
* @return \Generator
*/
protected function get_posts_between(int $initial_id, int $final_id): \Generator
protected function get_posts_batch_after(int $post_id): \Generator
{
$sql = 'SELECT post_id, post_subject, post_text, poster_id, forum_id
FROM ' . POSTS_TABLE . '
WHERE post_id >= ' . $initial_id . '
AND post_id <= ' . $final_id;
$result = $this->db->sql_query($sql);
FROM ' . POSTS_TABLE . '
WHERE post_id > ' . (int) $post_id . '
ORDER BY post_id ASC';
$result = $this->db->sql_query_limit($sql, self::BATCH_SIZE);
while ($row = $this->db->sql_fetchrow($result))
{