MC-21808: MySQL performance query optimization

Author: dhorytskyi

app/code/Magento/Search/Model/PopularSearchTerms.php

@@ -27,24 +27,16 @@ class PopularSearchTerms
      */
     private $queryCollection;
 
-    /**
-     * @var \Magento\Search\Model\ResourceModel\Query
-     */
-    private $queryResource;
-
     /**
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
      * @param \Magento\Search\Model\ResourceModel\Query\Collection
-     * @param ResourceModel\Query $queryResource
      */
     public function __construct(
         \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
-        \Magento\Search\Model\ResourceModel\Query\Collection $queryCollection,
-        \Magento\Search\Model\ResourceModel\Query $queryResource
+        \Magento\Search\Model\ResourceModel\Query\Collection $queryCollection
     ) {
         $this->scopeConfig = $scopeConfig;
         $this->queryCollection = $queryCollection;
-        $this->queryResource = $queryResource;
     }
 
     /**
@@ -56,17 +48,13 @@ public function __construct(
      */
     public function isCacheable(string $term, int $storeId)
     {
-        $connection = $this->queryResource->getConnection();
-        $select = $connection->select();
-        $select->from($this->queryResource->getMainTable(), [$this->queryResource->getIdFieldName()])
-            ->where('query_text = ?', $term)
-            ->where('store_id = ?', $storeId)
-            ->where('num_results > 0')
-            ->order(['popularity DESC'])
-            ->limit($this->getMaxCountCacheableSearchTerms($storeId));
-        $queryId = $connection->fetchOne($select);
+        $terms = $this->queryCollection
+            ->setPopularQueryFilter($storeId)
+            ->setPageSize($this->getMaxCountCacheableSearchTerms($storeId))
+            ->load()
+            ->getColumnValues('query_text');
 
-        return (bool) $queryId;
+        return in_array($term, $terms);
     }
 
     /**

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

@@ -130,7 +130,6 @@ public function setQueryFilter($query)
      */
     public function setPopularQueryFilter($storeIds = null)
     {
-
         $this->getSelect()->reset(
             \Magento\Framework\DB\Select::FROM
         )->reset(
@@ -140,13 +139,10 @@ public function setPopularQueryFilter($storeIds = null)
         )->from(
             ['main_table' => $this->getTable('search_query')]
         );
-        if ($storeIds) {
-            $this->addStoreFilter($storeIds);
-            $this->getSelect()->where('num_results > 0');
-        } elseif (null === $storeIds) {
-            $this->addStoreFilter($this->_storeManager->getStore()->getId());
-            $this->getSelect()->where('num_results > 0');
-        }
+
+        $storeIds = $storeIds ?: $this->_storeManager->getStore()->getId();
+        $this->addStoreFilter($storeIds);
+        $this->getSelect()->where('num_results > 0');
 
         $this->getSelect()->order(['popularity desc']);
 
@@ -172,10 +168,9 @@ public function setRecentQueryFilter()
      */
     public function addStoreFilter($storeIds)
     {
-        if (!is_array($storeIds)) {
-            $storeIds = [$storeIds];
-        }
-        $this->getSelect()->where('main_table.store_id IN (?)', $storeIds);
+        $condition = is_array($storeIds) ? 'main_table.store_id IN (?)' : 'main_table.store_id = ?';
+        $this->getSelect()->where($condition, $storeIds);
+
         return $this;
     }
 }

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

@@ -46,6 +46,10 @@
         <index referenceId="SEARCH_QUERY_IS_PROCESSED" indexType="btree">
             <column name="is_processed"/>
         </index>
+        <index referenceId="SEARCH_QUERY_STORE_ID_POPULARITY" indexType="btree">
+            <column name="store_id"/>
+            <column name="popularity"/>
+        </index>
     </table>
     <table name="search_synonyms" resource="default" engine="innodb" comment="table storing various synonyms groups">
         <column xsi:type="bigint" name="group_id" padding="20" unsigned="true" nullable="false" identity="true"