Merge remote-tracking branch 'epam/MAGETWO-95445' into BugFixPR

Author: joanhe

app/code/Magento/Catalog/Model/Indexer/Category/Flat/Action/Full.php

@@ -5,6 +5,9 @@
  */
 namespace Magento\Catalog\Model\Indexer\Category\Flat\Action;
 
+/**
+ * Class for full reindex flat categories
+ */
 class Full extends \Magento\Catalog\Model\Indexer\Category\Flat\AbstractAction
 {
     /**
@@ -92,6 +95,7 @@ protected function populateFlatTables(array $stores)
 
     /**
      * Create table and add attributes as fields for specified store.
+     *
      * This routine assumes that DDL operations are allowed
      *
      * @param int $store
@@ -109,6 +113,7 @@ protected function createTable($store)
 
     /**
      * Create category flat tables and add attributes as fields.
+     *
      * Tables are created only if DDL operations are allowed
      *
      * @param \Magento\Store\Model\Store[] $stores if empty, create tables for all stores of the application
@@ -167,6 +172,43 @@ protected function switchTables(array $stores = [])
         return $this;
     }
 
+    /**
+     * Retrieve all actual Catalog Product Flat Table names
+     *
+     * @return string[]
+     */
+    private function getActualStoreTablesForCategoryFlat(): array
+    {
+        $actualStoreTables = [];
+        foreach ($this->storeManager->getStores() as $store) {
+            $actualStoreTables[] = sprintf(
+                '%s_store_%s',
+                $this->connection->getTableName('catalog_category_flat'), $store->getId()
+            );
+        }
+
+        return $actualStoreTables;
+    }
+
+    /**
+     * Delete all category flat tables for not existing stores
+     *
+     * @return void
+     */
+    private function deleteAbandonedStoreCategoryFlatTables(): void
+    {
+        $existentTables = $this->connection->getTables(
+            $this->connection->getTableName('catalog_category_flat_store_%')
+        );
+        $actualStoreTables = $this->getActualStoreTablesForCategoryFlat();
+
+        $tablesToDelete = array_diff($existentTables, $actualStoreTables);
+
+        foreach ($tablesToDelete as $table) {
+            $this->connection->dropTable($table);
+        }
+    }
+
     /**
      * Transactional rebuild flat data from eav
      *
@@ -182,7 +224,7 @@ public function reindexAll()
         $stores = $this->storeManager->getStores();
         $this->populateFlatTables($stores);
         $this->switchTables($stores);
-
+        $this->deleteAbandonedStoreCategoryFlatTables();
         $this->allowTableChanges = true;
 
         return $this;