ACP2E-3362: search_query table when of huge size, has large impact on load time frontend

Author: aplapana

app/code/Magento/Search/Model/ResourceModel/Query/Collection.php

@@ -171,7 +171,6 @@ public function isTopSearchResult(string $term, int $storeId, int $maxCountCache
         $select = $this->getSelect();
         $select->reset(\Magento\Framework\DB\Select::FROM);
         $select->reset(\Magento\Framework\DB\Select::COLUMNS);
-        $select->distinct(true);
         $select->from(['main_table' => $this->getTable('search_query')], ['query_text']);
         $select->where('main_table.store_id IN (?)', $storeId);
         $select->where('main_table.num_results > 0');

app/code/Magento/Search/etc/db_schema.xml

@@ -35,7 +35,7 @@
             <column name="query_text"/>
             <column name="store_id"/>
         </constraint>
-        <index referenceId="SEARCH_QUERY_QUERY_TEXT_STORE_ID_POPULARITY" indexType="btree">
+        <index referenceId="SEARCH_QUERY_QUERY_TEXT_STORE_ID_POPULARITY" indexType="btree" disabled="true">
             <column name="query_text"/>
             <column name="store_id"/>
             <column name="popularity"/>
@@ -48,6 +48,12 @@
             <column name="num_results"/>
             <column name="popularity"/>
         </index>
+        <index referenceId="SEARCH_QUERY_QUERY_TEXT_STORE_ID_NUM_RESULTS_POPULARITY" indexType="btree">
+            <column name="query_text"/>
+            <column name="store_id"/>
+            <column name="num_results"/>
+            <column name="popularity"/>
+        </index>
         <index referenceId="SEARCH_QUERY_STORE_ID_POPULARITY" indexType="btree" disabled="true">
             <column name="store_id"/>
             <column name="popularity"/>

app/code/Magento/Search/etc/db_schema_whitelist.json

@@ -14,9 +14,10 @@
             "updated_at": true
         },
         "index": {
-            "SEARCH_QUERY_QUERY_TEXT_STORE_ID_POPULARITY": true,
+            "SEARCH_QUERY_QUERY_TEXT_STORE_ID_NUM_RESULTS_POPULARITY": true,
             "SEARCH_QUERY_IS_PROCESSED": true,
             "SEARCH_QUERY_SYNONYM_FOR": true,
+            "SEARCH_QUERY_QUERY_TEXT_STORE_ID_POPULARITY": false,
             "SEARCH_QUERY_STORE_ID_NUM_RESULTS_POPULARITY": true,
             "SEARCH_QUERY_STORE_ID": false,
             "SEARCH_QUERY_STORE_ID_POPULARITY": false