Indexation improvement

app/code/Magento/Inventory/Indexer/StockItem/IndexDataProvider.php → app/code/Magento/Inventory/Indexer/IndexDataProvider.php

@@ -3,8 +3,9 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
 
-namespace Magento\Inventory\Indexer\StockItem;
+namespace Magento\Inventory\Indexer;
 
 use Magento\Framework\App\ResourceConnection;
 use Magento\Inventory\Model\ResourceModel\Source as SourceResourceModel;
@@ -33,13 +34,49 @@ public function __construct(ResourceConnection $resourceConnection)
     }
 
     /**
-     * Returns all data for the index to
+     * Returns all data for the index.
+     *
+     * @param int $stockId
+     * @return \ArrayIterator
+     */
+    public function getData(int $stockId): \ArrayIterator
+    {
+        $connection = $this->resourceConnection->getConnection();
+        $select = $this->prepareSelect($stockId);
+
+        return new \ArrayIterator($connection->fetchAll($select));
+    }
+
+    /**
+     * Returns all data for the index by SKU List condition.
      *
      * @param int $stockId
      * @param array $skuList
      * @return \ArrayIterator
      */
-    public function getData(int $stockId, array $skuList = []): \ArrayIterator
+    public function getDataBySkuList(int $stockId, array $skuList): \ArrayIterator
+    {
+        $connection = $this->resourceConnection->getConnection();
+        $conditions = [];
+        if (count($skuList)) {
+            $conditions[] = [
+                'condition' => 'source_item.' . SourceItemInterface::SKU . ' IN (?)',
+                'value' => $skuList
+            ];
+        }
+        $select = $this->prepareSelect($stockId, $conditions);
+
+        return new \ArrayIterator($connection->fetchAll($select));
+    }
+
+    /**
+     * Prepare select.
+     *
+     * @param int $stockId
+     * @param array $conditions
+     * @return \ArrayIterator|\Magento\Framework\DB\Select
+     */
+    private function prepareSelect($stockId, array $conditions = [])
     {
         $connection = $this->resourceConnection->getConnection();
         $sourceTable = $this->resourceConnection->getTableName(SourceResourceModel::TABLE_NAME_SOURCE);
@@ -76,12 +113,14 @@ public function getData(int $stockId, array $skuList = []): \ArrayIterator
             ->where('stock_source_link.' . StockSourceLink::STOCK_ID . ' = ?', $stockId)
             ->where('stock_source_link.' . StockSourceLink::SOURCE_ID . ' IN (?)', $sourceIds);
 
-        if (count($skuList) !== 0) {
-            $select->where('source_item.' . SourceItemInterface::SKU . ' IN (?)', $skuList);
+        if (!empty($conditions)) {
+            foreach ($conditions as $condition) {
+                $select->where($condition['condition'], $condition['value']);
+            }
         }
 
         $select->group([SourceItemInterface::SKU]);
 
-        return new \ArrayIterator($connection->fetchAll($select));
+        return $select;
     }
 }

app/code/Magento/Inventory/Indexer/StockItem/IndexHandler.php → app/code/Magento/Inventory/Indexer/IndexHandler.php

@@ -3,14 +3,12 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
 
-namespace Magento\Inventory\Indexer\StockItem;
+namespace Magento\Inventory\Indexer;
 
 use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\Indexer\SaveHandler\Batch;
-use Magento\Inventory\Indexer\IndexHandlerInterface;
-use Magento\Inventory\Indexer\IndexName;
-use Magento\Inventory\Indexer\IndexNameResolverInterface;
 
 /**
  * Index handler is responsible for index data manipulation
@@ -76,6 +74,6 @@ public function cleanIndex(IndexName $indexName, \Traversable $documents, string
     {
         $connection = $this->resourceConnection->getConnection($connectionName);
         $tableName = $this->indexNameResolver->resolveName($indexName);
-        $connection->delete($tableName, ['sku in (?)' => iterator_to_array($documents)]);
+        $connection->delete($tableName, ['sku IN (?)' => iterator_to_array($documents)]);
     }
 }

app/code/Magento/Inventory/Indexer/StockItem/IndexNameResolver.php → app/code/Magento/Inventory/Indexer/IndexNameResolver.php

@@ -3,39 +3,37 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Inventory\Indexer\StockItem;
+declare(strict_types=1);
+
+namespace Magento\Inventory\Indexer;
 
 use Magento\Framework\Search\Request\IndexScopeResolverInterface;
-use Magento\Inventory\Indexer\ActiveTableSwitcher;
-use Magento\Inventory\Indexer\Alias;
-use Magento\Inventory\Indexer\IndexName;
-use Magento\Inventory\Indexer\IndexNameResolverInterface;
 
 /**
  * @inheritdoc
  */
 class IndexNameResolver implements IndexNameResolverInterface
 {
     /**
-     * @var IndexScopeResolverInterface
+     * TODO: move to separate configurable interface (https://github.com/magento-engcom/msi/issues/213)
+     * Suffix for replica index table
+     *
+     * @var string
      */
-    private $indexScopeResolver;
+    private $additionalTableSuffix = '_replica';
 
     /**
-     * @var ActiveTableSwitcher
+     * @var IndexScopeResolverInterface
      */
-    private $activeTableSwitcher;
+    private $indexScopeResolver;
 
     /**
      * @param IndexScopeResolverInterface $indexScopeResolver
-     * @param ActiveTableSwitcher $activeTableSwitcher
      */
     public function __construct(
-        IndexScopeResolverInterface $indexScopeResolver,
-        ActiveTableSwitcher $activeTableSwitcher
+        IndexScopeResolverInterface $indexScopeResolver
     ) {
         $this->indexScopeResolver = $indexScopeResolver;
-        $this->activeTableSwitcher = $activeTableSwitcher;
     }
 
     /**
@@ -46,8 +44,18 @@ public function resolveName(IndexName $indexName): string
         $tableName = $this->indexScopeResolver->resolve($indexName->getIndexId(), $indexName->getDimensions());
 
         if ($indexName->getAlias()->getValue() === Alias::ALIAS_REPLICA) {
-            $tableName = $this->activeTableSwitcher->getAdditionalTableName($tableName);
+            $tableName = $this->getAdditionalTableName($tableName);
         }
         return $tableName;
     }
+
+    /**
+     * TODO: move to separate configurable interface (https://github.com/magento-engcom/msi/issues/213)
+     * @param string $tableName
+     * @return string
+     */
+    public function getAdditionalTableName(string $tableName): string
+    {
+        return $tableName . $this->additionalTableSuffix;
+    }
 }

app/code/Magento/Inventory/Indexer/StockItem/IndexStructure.php → app/code/Magento/Inventory/Indexer/IndexStructure.php

@@ -3,15 +3,13 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
 
-namespace Magento\Inventory\Indexer\StockItem;
+namespace Magento\Inventory\Indexer;
 
 use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\DB\Ddl\Table;
 use Magento\Framework\Exception\StateException;
-use Magento\Inventory\Indexer\IndexName;
-use Magento\Inventory\Indexer\IndexNameResolverInterface;
-use Magento\Inventory\Indexer\IndexStructureInterface;
 
 /**
  * @inheritdoc

app/code/Magento/Inventory/Indexer/IndexTableSwitcher.php

@@ -0,0 +1,102 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Inventory\Indexer;
+
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\DB\Adapter\AdapterInterface;
+
+/**
+ * @inheritdoc
+ */
+class IndexTableSwitcher implements IndexTableSwitcherInterface
+{
+    /**
+     * TODO: move to separate configurable interface (https://github.com/magento-engcom/msi/issues/213)
+     * Suffix for replica index table
+     *
+     * @var string
+     */
+    private $additionalTableSuffix = '_replica';
+
+    /**
+     * TODO: move to separate configurable interface (https://github.com/magento-engcom/msi/issues/213)
+     * Suffix for outdated index table
+     *
+     * @var string
+     */
+    private $outdatedTableSuffix = '_outdated';
+
+    /**
+     * @var ResourceConnection
+     */
+    private $resourceConnection;
+
+    /**
+     * @var IndexNameResolverInterface
+     */
+    private $indexNameResolver;
+
+    /**
+     * @param ResourceConnection $resourceConnection
+     * @param IndexNameResolverInterface $indexNameResolver
+     */
+    public function __construct(
+        ResourceConnection $resourceConnection,
+        IndexNameResolverInterface $indexNameResolver
+    ) {
+        $this->resourceConnection = $resourceConnection;
+        $this->indexNameResolver = $indexNameResolver;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function switch(IndexName $indexName, string $connectionName)
+    {
+        $connection = $this->resourceConnection->getConnection($connectionName);
+        $tableName = $this->indexNameResolver->resolveName($indexName);
+
+        $this->switchTable($connection, [$tableName]);
+    }
+
+    /**
+     * Switch index tables from replica to active.
+     *
+     * @param AdapterInterface $connection
+     * @param array $tableNames
+     * @return void
+     */
+    private function switchTable(AdapterInterface $connection, array $tableNames)
+    {
+        $toRename = [];
+        foreach ($tableNames as $tableName) {
+            $outdatedTableName = $tableName . $this->outdatedTableSuffix;
+            $replicaTableName = $tableName . $this->additionalTableSuffix;
+
+            $renameBatch = [
+                [
+                    'oldName' => $tableName,
+                    'newName' => $outdatedTableName,
+                ],
+                [
+                    'oldName' => $replicaTableName,
+                    'newName' => $tableName,
+                ],
+                [
+                    'oldName' => $outdatedTableName,
+                    'newName' => $replicaTableName,
+                ]
+            ];
+            $toRename = array_merge($toRename, $renameBatch);
+        }
+
+        if (!empty($toRename)) {
+            $connection->renameTablesBatch($toRename);
+        }
+    }
+}