Merge remote-tracking branch 'origin/ACP2E-4225' into PR_2025_10_16_muntianu

Author: katmoon

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

@@ -61,6 +61,12 @@
         <index referenceId="SEARCH_QUERY_STORE_ID" indexType="btree" disabled="true">
             <column name="store_id"/>
         </index>
+        <index referenceId="SEARCH_QUERY_POPULARITY_QUERY_TEXT_STORE_ID_NUM_RESULTS" indexType="btree">
+            <column name="popularity"/>
+            <column name="query_text"/>
+            <column name="store_id"/>
+            <column name="num_results"/>
+        </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

@@ -20,7 +20,8 @@
             "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
+            "SEARCH_QUERY_STORE_ID_POPULARITY": false,
+            "SEARCH_QUERY_POPULARITY_QUERY_TEXT_STORE_ID_NUM_RESULTS": true
         },
         "constraint": {
             "PRIMARY": true,

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

@@ -35,9 +35,11 @@ public function testSearchQueryTableHasProperIndex(): void
         $table = $this->queryResource->getTable('search_query');
         $indexQueryStoreNumPopularity = 'SEARCH_QUERY_STORE_ID_NUM_RESULTS_POPULARITY';
         $indexQueryTextStoreNumPopularity = 'SEARCH_QUERY_QUERY_TEXT_STORE_ID_NUM_RESULTS_POPULARITY';
+        $indexPopularityQueryTextStoreNum = 'SEARCH_QUERY_POPULARITY_QUERY_TEXT_STORE_ID_NUM_RESULTS';
         $connection = $this->queryResource->getConnection();
         $tableIndexes = $connection->getIndexList($table);
         $this->assertArrayHasKey($indexQueryStoreNumPopularity, $tableIndexes);
         $this->assertArrayHasKey($indexQueryTextStoreNumPopularity, $tableIndexes);
+        $this->assertArrayHasKey($indexPopularityQueryTextStoreNum, $tableIndexes);
     }
 }