Merge remote-tracking branch 'magento-tango/MC-21808' into MPI-PR-2019-10-18

Author: arnobsh

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"

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

@@ -17,7 +17,8 @@
             "SEARCH_QUERY_QUERY_TEXT_STORE_ID_POPULARITY": true,
             "SEARCH_QUERY_STORE_ID": true,
             "SEARCH_QUERY_IS_PROCESSED": true,
-            "SEARCH_QUERY_SYNONYM_FOR": true
+            "SEARCH_QUERY_SYNONYM_FOR": true,
+            "SEARCH_QUERY_STORE_ID_POPULARITY": true
         },
         "constraint": {
             "PRIMARY": true,
@@ -43,4 +44,4 @@
             "SEARCH_SYNONYMS_WEBSITE_ID_STORE_WEBSITE_WEBSITE_ID": true
         }
     }
-}
+}