Merge pull request #2624 from magento-performance/MAGETWO-92306

[performance] MAGETWO-92306: [Forwardport] Fix Category Product Indexer

Author: duhon

app/code/Magento/Catalog/Model/Indexer/Category/Product/TableMaintainer.php

@@ -13,6 +13,9 @@
 use Magento\Catalog\Model\Indexer\Category\Product\AbstractAction;
 use Magento\Framework\Indexer\ScopeResolver\IndexScopeResolver as TableResolver;
 
+/**
+ * Class encapsulate logic of work with tables per store in Category Product indexer
+ */
 class TableMaintainer
 {
     /**
@@ -202,9 +205,14 @@ public function createMainTmpTable(int $storeId)
      * @param $storeId
      *
      * @return string
+     *
+     * @throws \Exception
      */
     public function getMainTmpTable(int $storeId)
     {
+        if (!isset($this->mainTmpTable[$storeId])) {
+            throw new \Exception('Temporary table does not exist');
+        }
         return $this->mainTmpTable[$storeId];
     }
 }

app/code/Magento/Catalog/etc/adminhtml/di.xml

@@ -220,7 +220,4 @@
             <argument name="filter" xsi:type="object">Magento\Catalog\Ui\DataProvider\Product\AddSearchKeyConditionToCollection</argument>
         </arguments>
     </type>
-    <type name="Magento\Framework\App\ResourceConnection">
-        <plugin name="get_catalog_category_product_index_table_name" type="Magento\Catalog\Model\Indexer\Category\Product\Plugin\TableResolver"/>
-    </type>
 </config>