Merge pull request #2528 from magento-performance/MAGETWO-88670

[Performance] MAGETWO-88670: Catalog EAV table getting called instead of flat table on top menu when flat is enabled

Author: duhon

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

@@ -0,0 +1,55 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+namespace Magento\Catalog\Model\ResourceModel\Category;
+
+/**
+ * Factory class for state dependent category collection
+ */
+class StateDependentCollectionFactory
+{
+    /**
+     * Object Manager instance
+     *
+     * @var \Magento\Framework\ObjectManagerInterface
+     */
+    private $objectManager;
+
+    /**
+     * Catalog category flat state
+     *
+     * @var \Magento\Catalog\Model\Indexer\Category\Flat\State
+     */
+    private $catalogCategoryFlatState;
+
+    /**
+     * Factory constructor
+     *
+     * @param \Magento\Framework\ObjectManagerInterface $objectManager
+     * @param \Magento\Catalog\Model\Indexer\Category\Flat\State $catalogCategoryFlatState
+     */
+    public function __construct(
+        \Magento\Framework\ObjectManagerInterface $objectManager,
+        \Magento\Catalog\Model\Indexer\Category\Flat\State $catalogCategoryFlatState
+    ) {
+        $this->objectManager = $objectManager;
+        $this->catalogCategoryFlatState = $catalogCategoryFlatState;
+    }
+
+    /**
+     * Create class instance with specified parameters
+     *
+     * @param array $data
+     * @return \Magento\Framework\Data\Collection\AbstractDb
+     */
+    public function create(array $data = [])
+    {
+        return $this->objectManager->create(
+            ($this->catalogCategoryFlatState->isAvailable()) ? Flat\Collection::class : Collection::class,
+            $data
+        );
+    }
+}

app/code/Magento/Catalog/Plugin/Block/Topmenu.php

@@ -22,7 +22,7 @@ class Topmenu
     protected $catalogCategory;
 
     /**
-     * @var \Magento\Catalog\Model\ResourceModel\Category\CollectionFactory
+     * @var \Magento\Catalog\Model\ResourceModel\Category\StateDependentCollectionFactory
      */
     private $collectionFactory;
 
@@ -40,13 +40,13 @@ class Topmenu
      * Initialize dependencies.
      *
      * @param \Magento\Catalog\Helper\Category $catalogCategory
-     * @param \Magento\Catalog\Model\ResourceModel\Category\CollectionFactory $categoryCollectionFactory
+     * @param \Magento\Catalog\Model\ResourceModel\Category\StateDependentCollectionFactory $categoryCollectionFactory
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Catalog\Model\Layer\Resolver $layerResolver
      */
     public function __construct(
         \Magento\Catalog\Helper\Category $catalogCategory,
-        \Magento\Catalog\Model\ResourceModel\Category\CollectionFactory $categoryCollectionFactory,
+        \Magento\Catalog\Model\ResourceModel\Category\StateDependentCollectionFactory $categoryCollectionFactory,
         \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Catalog\Model\Layer\Resolver $layerResolver
     ) {

app/code/Magento/Catalog/Test/Unit/Plugin/Block/TopmenuTest.php

@@ -87,7 +87,7 @@ protected function setUp()
             \Magento\Catalog\Model\ResourceModel\Category\Collection::class
         );
         $this->categoryCollectionFactoryMock = $this->createPartialMock(
-            \Magento\Catalog\Model\ResourceModel\Category\CollectionFactory::class,
+            \Magento\Catalog\Model\ResourceModel\Category\StateDependentCollectionFactory::class,
             ['create']
         );