MAGETWO-65388: Indexation process in non-locking way for stock indexer

Author: Stanislav Idolov

app/code/Magento/Bundle/Model/ResourceModel/Indexer/Stock.php

@@ -6,6 +6,7 @@
 namespace Magento\Bundle\Model\ResourceModel\Indexer;
 
 use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\CatalogInventory\Model\Indexer\Stock\Action\Full;
 
 /**
  * Bundle Stock Status Indexer Resource Model
@@ -65,7 +66,9 @@ protected function _prepareBundleOptionStockData($entityIds = null, $usePrimaryT
     {
         $this->_cleanBundleOptionStockData();
         $linkField = $this->getMetadataPool()->getMetadata(ProductInterface::class)->getLinkField();
-        $table = $this->isFull ? $this->getMainTable() : $this->indexerStockFrontendResource->getMainTable();
+        $table = $this->getActionType() === Full::ACTION_TYPE
+            ? $this->getMainTable()
+            : $this->indexerStockFrontendResource->getMainTable();
         $idxTable = $usePrimaryTable ? $table : $this->getIdxTable();
         $connection = $this->getConnection();
         $select = $connection->select()->from(

app/code/Magento/CatalogInventory/Model/Indexer/Stock/Action/Full.php

@@ -14,7 +14,7 @@
 use Magento\Framework\Indexer\CacheContext;
 use Magento\Framework\Event\ManagerInterface as EventManager;
 use Magento\Framework\EntityManager\MetadataPool;
-use Magento\Framework\Indexer\BatchSizeManagementInterface as BatchSizeManagement;
+use Magento\Framework\Indexer\BatchSizeManagementInterface;
 use Magento\Framework\Indexer\BatchProviderInterface;
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Exception\LocalizedException;
@@ -29,13 +29,18 @@
  */
 class Full extends AbstractAction
 {
+    /**
+     * Action type representation
+     */
+    const ACTION_TYPE = 'full';
+
     /**
      * @var MetadataPool
      */
     private $metadataPool;
 
     /**
-     * @var BatchSizeManagement
+     * @var BatchSizeManagementInterface
      */
     private $batchSizeManagement;
 
@@ -57,7 +62,7 @@ class Full extends AbstractAction
      * @param EventManager $eventManager
      * @param null|\Magento\Indexer\Model\ResourceModel\FrontendResource $indexerStockFrontendResource
      * @param MetadataPool|null $metadataPool
-     * @param BatchSizeManagement|null $batchSizeManagement
+     * @param BatchSizeManagementInterface|null $batchSizeManagement
      * @param BatchProviderInterface|null $batchProvider
      * @param array $batchRowsCount
      *
@@ -71,7 +76,7 @@ public function __construct(
         EventManager $eventManager,
         FrontendResource $indexerStockFrontendResource = null,
         MetadataPool $metadataPool = null,
-        BatchSizeManagement $batchSizeManagement = null,
+        BatchSizeManagementInterface $batchSizeManagement = null,
         BatchProviderInterface $batchProvider = null,
         array $batchRowsCount = []
     ) {
@@ -86,8 +91,9 @@ public function __construct(
 
         $this->metadataPool = $metadataPool ?: ObjectManager::getInstance()->get(MetadataPool::class);
         $this->batchProvider = $batchProvider ?: ObjectManager::getInstance()->get(BatchProviderInterface::class);
-        $this->batchSizeManagement = $batchSizeManagement ?:
-            ObjectManager::getInstance()->get(\Magento\CatalogInventory\Model\Indexer\Stock\BatchSizeManagement::class);
+        $this->batchSizeManagement = $batchSizeManagement ?: ObjectManager::getInstance()->get(
+            \Magento\CatalogInventory\Model\Indexer\Stock\BatchSizeManagement::class
+        );
         $this->batchRowsCount = $batchRowsCount;
     }
 
@@ -109,8 +115,9 @@ public function execute($ids = null)
 
             $columns = array_keys($this->_getConnection()->describeTable($this->_getIdxTable()));
 
-            /** @var \Magento\Catalog\Model\ResourceModel\Product\Indexer\AbstractIndexer $indexer */
+            /** @var \Magento\CatalogInventory\Model\ResourceModel\Indexer\Stock\DefaultStock $indexer */
             foreach ($this->_getTypeIndexers() as $indexer) {
+                $indexer->setActionType(self::ACTION_TYPE);
                 $connection = $indexer->getConnection();
                 $tableName = $indexer->getMainTable();
 
@@ -135,7 +142,7 @@ public function execute($ids = null)
                     $select->where('type_id = ?', $indexer->getTypeId());
 
                     $entityIds = $this->batchProvider->getBatchIds($connection, $select, $batch);
-                    $indexer->reindexBatch($entityIds);
+                    $indexer->reindexEntity($entityIds);
 
                     $select = $connection->select()->from($this->_getIdxTable(), $columns);
                     $query = $select->insertFromSelect($tableName, $columns);

app/code/Magento/CatalogInventory/Model/ResourceModel/Indexer/Stock/DefaultStock.php

@@ -11,18 +11,14 @@
 use Magento\Framework\DB\Adapter\AdapterInterface;
 use Magento\CatalogInventory\Api\StockConfigurationInterface;
 use Magento\Framework\App\ObjectManager;
+use Magento\CatalogInventory\Model\Indexer\Stock\Action\Full;
 
 /**
  * CatalogInventory Default Stock Status Indexer Resource Model
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class DefaultStock extends AbstractIndexer implements StockInterface
 {
-    /**
-     * @var bool
-     */
-    protected $isFull;
-
     /**
      * Current Product Type Id
      *
@@ -64,6 +60,13 @@ class DefaultStock extends AbstractIndexer implements StockInterface
      */
     private $indexerStockFrontendResource;
 
+    /**
+     * Param for switching logic which depends on action type (full reindex or partial)
+     *
+     * @var string
+     */
+    private $actionType;
+
     /**
      * Class constructor
      *
@@ -130,11 +133,38 @@ public function reindexAll()
      */
     public function reindexEntity($entityIds)
     {
-        $this->isFull = false;
+        if ($this->getActionType() === Full::ACTION_TYPE) {
+            $this->tableStrategy->setUseIdxTable(false);
+            $this->_prepareIndexTable($entityIds);
+            return $this;
+        }
+
         $this->_updateIndex($entityIds);
         return $this;
     }
 
+    /**
+     * Returns action run type
+     *
+     * @return string
+     */
+    public function getActionType()
+    {
+        return $this->actionType;
+    }
+
+    /**
+     * Set action run type
+     *
+     * @param string $type
+     * @return $this
+     */
+    public function setActionType($type)
+    {
+        $this->actionType = $type;
+        return $this;
+    }
+
     /**
      * Set active Product Type Id
      *
@@ -254,18 +284,6 @@ protected function _prepareIndexTable($entityIds = null)
         return $this;
     }
 
-    /**
-     * @param array $entityIds
-     * @return $this
-     */
-    public function reindexBatch(array $entityIds)
-    {
-        $this->isFull = true;
-        $this->tableStrategy->setUseIdxTable(false);
-        $this->_prepareIndexTable($entityIds);
-        return $this;
-    }
-
     /**
      * Update Stock status index by product ids
      *

app/code/Magento/ConfigurableProduct/Model/ResourceModel/Indexer/Stock/Configurable.php

@@ -13,6 +13,7 @@
  * @author      Magento Core Team <core@magentocommerce.com>
  */
 use Magento\Catalog\Model\Product\Attribute\Source\Status as ProductStatus;
+use Magento\CatalogInventory\Model\Indexer\Stock\Action\Full;
 
 class Configurable extends \Magento\CatalogInventory\Model\ResourceModel\Indexer\Stock\DefaultStock
 {
@@ -57,7 +58,9 @@ protected function _getStockStatusSelect($entityIds = null, $usePrimaryTable = f
     {
         $metadata = $this->getMetadataPool()->getMetadata(\Magento\Catalog\Api\Data\ProductInterface::class);
         $connection = $this->getConnection();
-        $table = $this->isFull ? $this->getMainTable() : $this->indexerStockFrontendResource->getMainTable();
+        $table = $this->getActionType() === Full::ACTION_TYPE
+            ? $this->getMainTable()
+            : $this->indexerStockFrontendResource->getMainTable();
         $idxTable = $usePrimaryTable ? $table : $this->getIdxTable();
         $select = parent::_getStockStatusSelect($entityIds, $usePrimaryTable);
         $linkField = $metadata->getLinkField();

app/code/Magento/GroupedProduct/Model/ResourceModel/Indexer/Stock/Grouped.php

@@ -12,6 +12,7 @@
 namespace Magento\GroupedProduct\Model\ResourceModel\Indexer\Stock;
 
 use Magento\Catalog\Model\Product\Attribute\Source\Status as ProductStatus;
+use Magento\CatalogInventory\Model\Indexer\Stock\Action\Full;
 
 class Grouped extends \Magento\CatalogInventory\Model\ResourceModel\Indexer\Stock\DefaultStock
 {
@@ -55,7 +56,9 @@ public function __construct(
     protected function _getStockStatusSelect($entityIds = null, $usePrimaryTable = false)
     {
         $connection = $this->getConnection();
-        $table = $this->isFull ? $this->getMainTable() : $this->indexerStockFrontendResource->getMainTable();
+        $table = $this->getActionType() === Full::ACTION_TYPE
+            ? $this->getMainTable()
+            : $this->indexerStockFrontendResource->getMainTable();
         $idxTable = $usePrimaryTable ? $table : $this->getIdxTable();
         $metadata = $this->getMetadataPool()->getMetadata(\Magento\Catalog\Api\Data\ProductInterface::class);
         $select = parent::_getStockStatusSelect($entityIds, $usePrimaryTable);