ACP2E-3891: Categories in admin are loading very slow

Author: soklymeach

app/code/Magento/Catalog/Model/ResourceModel/Category/Collection.php

@@ -11,6 +11,8 @@
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\DB\Select;
 use Magento\Store\Model\ScopeInterface;
+use Magento\Framework\DB\Adapter\AdapterInterface;
+use Magento\Framework\DB\Ddl\Table;
 
 /**
  * Category resource collection
@@ -370,41 +372,59 @@ public function loadProductCount($items, $countRegular = true, $countAnchor = tr
      * @param array $categoryIds
      * @param int $websiteId
      * @return array
+     * @throws \Zend_Db_Exception
      */
     private function getCountFromCategoryTableBulk(
         array $categoryIds,
         int $websiteId
     ) : array {
         $connection = $this->_conn;
-        $tempTableName = $connection->getTableName('temp_category_descendants_' . uniqid());
-        $connection->query("CREATE TEMPORARY TABLE {$tempTableName} (
-        category_id INT UNSIGNED NOT NULL,
-        descendant_id INT UNSIGNED NOT NULL,
-        PRIMARY KEY (category_id, descendant_id)
-    )");
-        $selectDescendants = clone $connection->select();
-        $selectDescendants->from(
-            ['ce' => $this->getTable('catalog_category_entity')],
-            ['category_id' => 'ce.entity_id', 'descendant_id' => 'ce2.entity_id']
-        )
+        $tempTableName = 'temp_category_descendants_' . uniqid();
+        $tempTable = $connection->newTable($tempTableName)
+            ->addColumn(
+                'category_id',
+                Table::TYPE_INTEGER,
+                null,
+                ['unsigned' => true, 'nullable' => false],
+                'Category ID'
+            )
+            ->addColumn(
+                'descendant_id',
+                Table::TYPE_INTEGER,
+                null,
+                ['unsigned' => true, 'nullable' => false],
+                'Descendant ID'
+            )
+            ->addIndex(
+                $connection->getIndexName($tempTableName, ['category_id', 'descendant_id']),
+                ['category_id', 'descendant_id'],
+                ['type' => AdapterInterface::INDEX_TYPE_PRIMARY]
+            );
+        $connection->createTemporaryTable($tempTable);
+        $selectDescendants = $connection->select()
+            ->from(
+                ['ce' => $this->getTable('catalog_category_entity')],
+                ['category_id' => 'ce.entity_id', 'descendant_id' => 'ce2.entity_id']
+            )
             ->joinInner(
                 ['ce2' => $this->getTable('catalog_category_entity')],
                 'ce2.path LIKE CONCAT(ce.path, \'/%\') OR ce2.entity_id = ce.entity_id',
                 []
             )
             ->where('ce.entity_id IN (?)', $categoryIds);
+
         $connection->query(
             $connection->insertFromSelect(
                 $selectDescendants,
                 $tempTableName,
                 ['category_id', 'descendant_id']
             )
         );
-        $select = clone $connection->select();
-        $select->from(
-            ['t' => $tempTableName],
-            ['category_id' => 't.category_id']
-        )
+        $select = $connection->select()
+            ->from(
+                ['t' => $tempTableName],
+                ['category_id' => 't.category_id']
+            )
             ->joinLeft(
                 ['cp' => $this->getTable('catalog_category_product')],
                 'cp.category_id = t.descendant_id',
@@ -419,7 +439,7 @@ private function getCountFromCategoryTableBulk(
         }
         $select->group('t.category_id');
         $result = $connection->fetchPairs($select);
-        $connection->query("DROP TEMPORARY TABLE {$tempTableName}");
+        $connection->dropTemporaryTable($tempTableName);
         $counts = array_fill_keys($categoryIds, 0);
         foreach ($result as $categoryId => $count) {
             $counts[$categoryId] = (int)$count;

app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Category/CollectionTest.php

@@ -245,23 +245,29 @@ public function testLoadProductCountCallsBulkMethodForLargeCategoryCount()
         $this->storeManager->method('getStore')->with($storeId)->willReturn($storeMock);
         $this->connection->method('select')->willReturn($this->select);
         $counts = array_fill_keys($categoryIds, 5);
+        $tableMock = $this->createMock(\Magento\Framework\DB\Ddl\Table::class);
+        $tableMock->method('addColumn')->willReturnSelf();
+        $tableMock->method('addIndex')->willReturnSelf();
+        $this->connection->method('newTable')
+            ->with($this->stringContains('temp_category_descendants_'))
+            ->willReturn($tableMock);
+        $this->connection->expects($this->once())->method('createTemporaryTable')->with($tableMock);
+        $this->connection->expects($this->once())->method('dropTemporaryTable')
+            ->with($this->stringContains('temp_category_descendants_'));
         $this->select->method('from')->willReturnSelf();
+        $this->select->method('joinInner')->willReturnSelf();
+        $this->select->method('where')->willReturnSelf();
+        $this->connection->method('select')->willReturn($this->select);
+        $this->connection->method('insertFromSelect')->willReturn('INSERT QUERY');
+        $this->connection->method('query')->with('INSERT QUERY')->willReturnSelf();
+        $this->select->method('from')->willReturnSelf();
+        $this->select->method('joinLeft')->willReturnSelf();
+        $this->select->method('join')->willReturnSelf();
         $this->select->method('where')->willReturnSelf();
         $this->select->method('group')->willReturnSelf();
         $this->connection->method('fetchPairs')
             ->with($this->isInstanceOf(Select::class))
             ->willReturn($counts);
-        $tempTableName = 'temp_category_descendants_';
-        $this->connection->method('query')->willReturn($tempTableName);
-        $this->select->method('joinInner')->willReturnSelf();
-        $this->connection->method('insertFromSelect')->willReturn('INSERT QUERY');
-        $bulkSelectMock = $this->createMock(Select::class);
-        $bulkSelectMock->method('from')->willReturnSelf();
-        $bulkSelectMock->method('joinLeft')->willReturnSelf();
-        $bulkSelectMock->method('join')->willReturnSelf();
-        $bulkSelectMock->method('where')->willReturnSelf();
-        $bulkSelectMock->method('group')->willReturnSelf();
-        $this->connection->method('fetchPairs')->willReturn($counts);
         $this->collection->setProductStoreId($storeId);
         $this->collection->loadProductCount($items, false, true);
     }