MC-21808: MySQL performance query optimization

Author: dhorytskyi

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

@@ -27,16 +27,24 @@ 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\Collection $queryCollection,
+        \Magento\Search\Model\ResourceModel\Query $queryResource
     ) {
         $this->scopeConfig = $scopeConfig;
         $this->queryCollection = $queryCollection;
+        $this->queryResource = $queryResource;
     }
 
     /**
@@ -48,13 +56,17 @@ public function __construct(
      */
     public function isCacheable(string $term, int $storeId)
     {
-        $terms = $this->queryCollection
-            ->setPopularQueryFilter($storeId)
-            ->setPageSize($this->getMaxCountCacheableSearchTerms($storeId))
-            ->load()
-            ->getColumnValues('query_text');
+        $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);
 
-        return in_array($term, $terms);
+        return (bool) $queryId;
     }
 
     /**