MAGETWO-95445: Category Flat Data indexer doesnt show status as reindex required after deleting store/storeview

- Delete abandoned tables in full reindex

Author: nikshostko

app/code/Magento/Catalog/Helper/Product/Flat/Indexer.php

@@ -466,6 +466,17 @@ public function getFlatTableName($storeId)
         return sprintf('%s_%s', $this->getTable('catalog_product_flat'), $storeId);
     }
 
+    /**
+     * Retrieve Catalog Product Flat Table name
+     *
+     * @param int $storeId
+     * @return string
+     */
+    private function getCategoryFlatTableName(int $storeId): string
+    {
+        return sprintf('%s_store_%s', $this->getTable('catalog_category_flat'), $storeId);
+    }
+
     /**
      * Retrieve loaded attribute by code
      *
@@ -515,4 +526,25 @@ public function deleteAbandonedStoreFlatTables()
             $connection->dropTable($table);
         }
     }
+
+    /**
+     * Delete all category flat tables for not existing stores
+     *
+     * @return void
+     */
+    public function deleteAbandonedStoreCategoryFlatTables()
+    {
+        $connection = $this->_resource->getConnection();
+        $existentTables = $connection->getTables($connection->getTableName('catalog_category_flat_store_%'));
+        $actualStoreTables = [];
+        foreach ($this->_storeManager->getStores() as $store) {
+            $actualStoreTables[] = $this->getCategoryFlatTableName($store->getId());
+        }
+
+        $tablesToDelete = array_diff($existentTables, $actualStoreTables);
+
+        foreach ($tablesToDelete as $table) {
+            $connection->dropTable($table);
+        }
+    }
 }

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

@@ -5,6 +5,11 @@
  */
 namespace Magento\Catalog\Model\Indexer\Category\Flat\Action;
 
+use Magento\Framework\App\ResourceConnection;
+
+/**
+ * Class for full reindex flat categories
+ */
 class Full extends \Magento\Catalog\Model\Indexer\Category\Flat\AbstractAction
 {
     /**
@@ -19,6 +24,28 @@ class Full extends \Magento\Catalog\Model\Indexer\Category\Flat\AbstractAction
      */
     protected $allowTableChanges = true;
 
+    /**
+     * @var \Magento\Catalog\Helper\Product\Flat\Indexer
+     */
+    private $indexer;
+
+    /**
+     * @param ResourceConnection $resource
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+     * @param \Magento\Catalog\Model\ResourceModel\Helper $resourceHelper
+     * @param \Magento\Catalog\Helper\Product\Flat\Indexer $indexer
+     */
+    public function __construct(
+        ResourceConnection $resource,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
+        \Magento\Catalog\Model\ResourceModel\Helper $resourceHelper,
+        \Magento\Catalog\Helper\Product\Flat\Indexer $indexer = null
+    ) {
+        $this->indexer  = $indexer ?: \Magento\Framework\App\ObjectManager::getInstance()
+            ->get(\Magento\Catalog\Helper\Product\Flat\Indexer::class);
+        parent::__construct($resource, $storeManager, $resourceHelper);
+    }
+
     /**
      * Add suffix to table name to show it is old
      *
@@ -92,6 +119,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 +137,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
@@ -182,7 +211,7 @@ public function reindexAll()
         $stores = $this->storeManager->getStores();
         $this->populateFlatTables($stores);
         $this->switchTables($stores);
-
+        $this->indexer->deleteAbandonedStoreCategoryFlatTables();
         $this->allowTableChanges = true;
 
         return $this;