Merge remote-tracking branch 'local/ACP2E-2101' into PR_06_SEP_2023

Author: o-dubovyk

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

@@ -150,9 +150,9 @@ public function setPopularQueryFilter($storeIds = null)
 
         $storeIds = $storeIds ?: $this->_storeManager->getStore()->getId();
         $this->addStoreFilter($storeIds);
-        $this->getSelect()->where('num_results > 0');
+        $this->getSelect()->where('main_table.num_results > 0');
 
-        $this->getSelect()->order(['popularity desc']);
+        $this->getSelect()->order(['main_table.popularity desc']);
 
         return $this;
     }
@@ -174,8 +174,8 @@ public function isTopSearchResult(string $term, int $storeId, int $maxCountCache
         $select->distinct(true);
         $select->from(['main_table' => $this->getTable('search_query')], ['query_text']);
         $select->where('main_table.store_id IN (?)', $storeId);
-        $select->where('num_results > 0');
-        $select->order(['popularity desc']);
+        $select->where('main_table.num_results > 0');
+        $select->order(['main_table.popularity desc']);
 
         $select->limit($maxCountCacheableSearchTerms);
 
@@ -208,7 +208,7 @@ public function setRecentQueryFilter()
     public function addStoreFilter($storeIds)
     {
         $condition = is_array($storeIds) ? 'main_table.store_id IN (?)' : 'main_table.store_id = ?';
-        $this->getSelect()->where($condition, $storeIds);
+        $this->getSelect()->where($condition, $storeIds, \Zend_Db::INT_TYPE);
 
         return $this;
     }

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

@@ -40,16 +40,21 @@
             <column name="store_id"/>
             <column name="popularity"/>
         </index>
-        <index referenceId="SEARCH_QUERY_STORE_ID" indexType="btree">
-            <column name="store_id"/>
-        </index>
         <index referenceId="SEARCH_QUERY_IS_PROCESSED" indexType="btree">
             <column name="is_processed"/>
         </index>
-        <index referenceId="SEARCH_QUERY_STORE_ID_POPULARITY" indexType="btree">
+        <index referenceId="SEARCH_QUERY_STORE_ID_NUM_RESULTS_POPULARITY" indexType="btree">
             <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"/>
+        </index>
+        <index referenceId="SEARCH_QUERY_STORE_ID" indexType="btree" disabled="true">
+            <column name="store_id"/>
+        </index>
     </table>
     <table name="search_synonyms" resource="default" engine="innodb" comment="table storing various synonyms groups">
         <column xsi:type="bigint" name="group_id" unsigned="true" nullable="false" identity="true"

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

@@ -15,10 +15,11 @@
         },
         "index": {
             "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_STORE_ID_POPULARITY": true
+            "SEARCH_QUERY_STORE_ID_NUM_RESULTS_POPULARITY": true,
+            "SEARCH_QUERY_STORE_ID": false,
+            "SEARCH_QUERY_STORE_ID_POPULARITY": false
         },
         "constraint": {
             "PRIMARY": true,

dev/tests/integration/testsuite/Magento/Search/Model/ResourceModel/Query/CollectionTest.php

@@ -0,0 +1,40 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Search\Model\ResourceModel\Query;
+
+use Magento\Search\Model\ResourceModel\Query;
+use Magento\Framework\ObjectManagerInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+use PHPUnit\Framework\TestCase;
+use Magento\Framework\DB\Adapter\Pdo\Mysql;
+
+class CollectionTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var Query
+     */
+    private $queryResource;
+
+    /**
+     * @inheritDoc
+     */
+    protected function setUp(): void
+    {
+        $objectManager = Bootstrap::getObjectManager();
+        $this->queryResource = $objectManager->get(Query::class);
+    }
+
+    public function testSearchQueryTableHasProperIndex()
+    {
+        $table = $this->queryResource->getTable('search_query');
+        $indexName = 'SEARCH_QUERY_STORE_ID_NUM_RESULTS_POPULARITY';
+        $connection = $this->queryResource->getConnection();
+        $tableIndexes = $connection->getIndexList($table);
+        $this->assertArrayHasKey($indexName, $tableIndexes);
+    }
+}