[ticket/16902] Improve search results count for MySQL

PHPBB3-16902
This commit is contained in:
rxu 2021-10-29 21:32:26 +07:00
parent 44d0a3a716
commit bf7936380a
No known key found for this signature in database
GPG key ID: 955F0567380E586A
2 changed files with 9 additions and 27 deletions

View file

@ -568,8 +568,7 @@ class fulltext_mysql extends \phpbb\search\base
); );
extract($this->phpbb_dispatcher->trigger_event('core.search_mysql_keywords_main_query_before', compact($vars))); extract($this->phpbb_dispatcher->trigger_event('core.search_mysql_keywords_main_query_before', compact($vars)));
$sql_select = (!$result_count) ? 'SQL_CALC_FOUND_ROWS ' : ''; $sql_select = ($type == 'posts') ? 'p.post_id' : 'DISTINCT t.topic_id';
$sql_select = ($type == 'posts') ? $sql_select . 'p.post_id' : 'DISTINCT ' . $sql_select . 't.topic_id';
$sql_from = ($join_topic) ? TOPICS_TABLE . ' t, ' : ''; $sql_from = ($join_topic) ? TOPICS_TABLE . ' t, ' : '';
$field = ($type == 'posts') ? 'post_id' : 'topic_id'; $field = ($type == 'posts') ? 'post_id' : 'topic_id';
if (count($author_ary) && $author_name) if (count($author_ary) && $author_name)
@ -614,7 +613,7 @@ class fulltext_mysql extends \phpbb\search\base
// if the total result count is not cached yet, retrieve it from the db // if the total result count is not cached yet, retrieve it from the db
if (!$result_count && count($id_ary)) if (!$result_count && count($id_ary))
{ {
$sql_found_rows = 'SELECT FOUND_ROWS() as result_count'; $sql_found_rows = str_replace("SELECT $sql_select", "SELECT COUNT($sql_select) as result_count", $sql);
$result = $this->db->sql_query($sql_found_rows); $result = $this->db->sql_query($sql_found_rows);
$result_count = (int) $this->db->sql_fetchfield('result_count'); $result_count = (int) $this->db->sql_fetchfield('result_count');
$this->db->sql_freeresult($result); $this->db->sql_freeresult($result);
@ -828,12 +827,12 @@ class fulltext_mysql extends \phpbb\search\base
extract($this->phpbb_dispatcher->trigger_event('core.search_mysql_author_query_before', compact($vars))); extract($this->phpbb_dispatcher->trigger_event('core.search_mysql_author_query_before', compact($vars)));
// If the cache was completely empty count the results // If the cache was completely empty count the results
$calc_results = ($result_count) ? '' : 'SQL_CALC_FOUND_ROWS '; $sql_select = ($type == 'posts') ? 'p.post_id' : 't.topic_id';
// Build the query for really selecting the post_ids // Build the query for really selecting the post_ids
if ($type == 'posts') if ($type == 'posts')
{ {
$sql = "SELECT {$calc_results}p.post_id $sql = "SELECT $sql_select
FROM " . $sql_sort_table . POSTS_TABLE . ' p' . (($firstpost_only) ? ', ' . TOPICS_TABLE . ' t ' : ' ') . " FROM " . $sql_sort_table . POSTS_TABLE . ' p' . (($firstpost_only) ? ', ' . TOPICS_TABLE . ' t ' : ' ') . "
WHERE $sql_author WHERE $sql_author
$sql_topic_id $sql_topic_id
@ -847,7 +846,7 @@ class fulltext_mysql extends \phpbb\search\base
} }
else else
{ {
$sql = "SELECT {$calc_results}t.topic_id $sql = "SELECT $sql_select
FROM " . $sql_sort_table . TOPICS_TABLE . ' t, ' . POSTS_TABLE . " p FROM " . $sql_sort_table . TOPICS_TABLE . ' t, ' . POSTS_TABLE . " p
WHERE $sql_author WHERE $sql_author
$sql_topic_id $sql_topic_id
@ -874,7 +873,7 @@ class fulltext_mysql extends \phpbb\search\base
// retrieve the total result count if needed // retrieve the total result count if needed
if (!$result_count) if (!$result_count)
{ {
$sql_found_rows = 'SELECT FOUND_ROWS() as result_count'; $sql_found_rows = str_replace("SELECT $sql_select", "SELECT COUNT($sql_select) as result_count", $sql);
$result = $this->db->sql_query($sql_found_rows); $result = $this->db->sql_query($sql_found_rows);
$result_count = (int) $this->db->sql_fetchfield('result_count'); $result_count = (int) $this->db->sql_fetchfield('result_count');
$this->db->sql_freeresult($result); $this->db->sql_freeresult($result);

View file

@ -908,9 +908,6 @@ class fulltext_native extends \phpbb\search\base
switch ($this->db->get_sql_layer()) switch ($this->db->get_sql_layer())
{ {
case 'mysqli': case 'mysqli':
// 3.x does not support SQL_CALC_FOUND_ROWS
// $sql_array['SELECT'] = 'SQL_CALC_FOUND_ROWS ' . $sql_array['SELECT'];
$is_mysql = true; $is_mysql = true;
break; break;
@ -968,13 +965,6 @@ class fulltext_native extends \phpbb\search\base
); );
} }
// if using mysql and the total result count is not calculated yet, get it from the db
if (!$total_results && $is_mysql)
{
// Also count rows for the query as if there was not LIMIT. Add SQL_CALC_FOUND_ROWS to SQL
$sql_array['SELECT'] = 'SQL_CALC_FOUND_ROWS ' . $sql_array['SELECT'];
}
$sql_array['WHERE'] = implode(' AND ', $sql_where); $sql_array['WHERE'] = implode(' AND ', $sql_where);
$sql_array['GROUP_BY'] = ($group_by) ? (($type == 'posts') ? 'p.post_id' : 'p.topic_id') . ', ' . $sort_by_sql[$sort_key] : ''; $sql_array['GROUP_BY'] = ($group_by) ? (($type == 'posts') ? 'p.post_id' : 'p.topic_id') . ', ' . $sort_by_sql[$sort_key] : '';
$sql_array['ORDER_BY'] = $sql_sort; $sql_array['ORDER_BY'] = $sql_sort;
@ -990,10 +980,10 @@ class fulltext_native extends \phpbb\search\base
} }
$this->db->sql_freeresult($result); $this->db->sql_freeresult($result);
// If using mysql and the total result count is not calculated yet, get it from the db
if (!$total_results && $is_mysql) if (!$total_results && $is_mysql)
{ {
// Get the number of results as calculated by MySQL $sql_count = str_replace("SELECT {$sql_array['SELECT']}", "SELECT COUNT({$sql_array['SELECT']}) as total_results", $sql);
$sql_count = 'SELECT FOUND_ROWS() as total_results';
$result = $this->db->sql_query($sql_count); $result = $this->db->sql_query($sql_count);
$total_results = (int) $this->db->sql_fetchfield('total_results'); $total_results = (int) $this->db->sql_fetchfield('total_results');
$this->db->sql_freeresult($result); $this->db->sql_freeresult($result);
@ -1202,7 +1192,6 @@ class fulltext_native extends \phpbb\search\base
switch ($this->db->get_sql_layer()) switch ($this->db->get_sql_layer())
{ {
case 'mysqli': case 'mysqli':
// $select = 'SQL_CALC_FOUND_ROWS ' . $select;
$is_mysql = true; $is_mysql = true;
break; break;
@ -1295,13 +1284,7 @@ class fulltext_native extends \phpbb\search\base
if (!$total_results && $is_mysql) if (!$total_results && $is_mysql)
{ {
// Count rows for the executed queries. Replace $select within $sql with SQL_CALC_FOUND_ROWS, and run it. $sql_count = str_replace("SELECT $select", "SELECT COUNT($select) as total_results", $sql);
$sql_calc = str_replace('SELECT ' . $select, 'SELECT SQL_CALC_FOUND_ROWS ' . $select, $sql);
$result = $this->db->sql_query($sql_calc);
$this->db->sql_freeresult($result);
$sql_count = 'SELECT FOUND_ROWS() as total_results';
$result = $this->db->sql_query($sql_count); $result = $this->db->sql_query($sql_count);
$total_results = (int) $this->db->sql_fetchfield('total_results'); $total_results = (int) $this->db->sql_fetchfield('total_results');
$this->db->sql_freeresult($result); $this->db->sql_freeresult($result);