MC-41647: SKU Search very slow on Admin Panel

magento · Apr 6, 2021 · 1bc28f4 · 1bc28f4
1 parent 94f2661
commit 1bc28f4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/app/code/Magento/CatalogSearch/Model/ResourceModel/Search/Collection.php b/app/code/Magento/CatalogSearch/Model/ResourceModel/Search/Collection.php
@@ -303,12 +303,14 @@ protected function _getSearchEntityIdsSql($query, $searchOnlyInCurrentStore = tr
                 //force index statement not implemented in framework
                 // phpcs:ignore Magento2.SQL.RawQuery
                 $select = sprintf(
-                    'SELECT `t1`.`%s` FROM `%s` AS `t1` FORCE INDEX(%s) LEFT JOIN `%s` AS `t2`
+                    'SELECT `t1`.`%s` FROM `%s` AS `t1` FORCE INDEX(%s)
+                        LEFT JOIN `%s` AS `t2` FORCE INDEX(%s)
                         ON %s WHERE %s AND %s AND (%s)',
                     $linkField,
                     $table,
                     $preparedIndexEnforcements[$table],
                     $table,
+                    $preparedIndexEnforcements[$table],
                     $joinCondition,
                     $condition1,
                     $condition2,

diff --git a/dev/tests/integration/testsuite/Magento/Backend/Controller/Adminhtml/IndexTest.php b/dev/tests/integration/testsuite/Magento/Backend/Controller/Adminhtml/IndexTest.php
@@ -9,7 +9,7 @@
 
 /**
  * @magentoAppArea adminhtml
- * @magentoDbIsolation disabled
+ * @magentoDbIsolation enabled
  */
 class IndexTest extends \Magento\TestFramework\TestCase\AbstractBackendController
 {