Merge pull request #52 from magento-performance/MCP-89

MCP-89: Move product batch size variable to environment
magento · Jan 20, 2021 · 650ea9b · 650ea9b
2 parents 20dfba7 + 3d7cdbc
commit 650ea9b
Show file tree

Hide file tree

Showing 3 changed files with 73 additions and 4 deletions.
diff --git a/InventoryConfigurableProductIndexer/Indexer/SourceItem/SourceItemIndexer.php b/InventoryConfigurableProductIndexer/Indexer/SourceItem/SourceItemIndexer.php
@@ -7,6 +7,7 @@
 
 namespace Magento\InventoryConfigurableProductIndexer\Indexer\SourceItem;
 
+use Magento\Framework\App\DeploymentConfig;
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\Indexer\SaveHandler\Batch;
@@ -75,6 +76,18 @@ class SourceItemIndexer
  */
  private $batch;
 
+ /**
+ * @var DeploymentConfig|null
+ */
+ private $deploymentConfig;
+
+ /**
+ * Deployment config path
+ *
+ * @var string
+ */
+ private const DEPLOYMENT_CONFIG_INDEXER_BATCHES = 'indexer/batch_size/';
+
  /**
  * @param ResourceConnection $resourceConnection
  * @param IndexNameBuilder $indexNameBuilder
@@ -85,6 +98,7 @@ class SourceItemIndexer
  * @param DefaultStockProviderInterface $defaultStockProvider
  * @param Batch|null $batch
  * @param int|null $batchSize
+ * @param DeploymentConfig|null $deploymentConfig
  */
  public function __construct(
  ResourceConnection $resourceConnection,
@@ -95,7 +109,8 @@ public function __construct(
  SiblingSkuListInStockProvider $siblingSkuListInStockProvider,
  DefaultStockProviderInterface $defaultStockProvider,
  ?Batch $batch = null,
- ?int $batchSize = null
+ ?int $batchSize = null,
+ ?DeploymentConfig $deploymentConfig = null
  ) {
  $this->resourceConnection = $resourceConnection;
  $this->indexNameBuilder = $indexNameBuilder;
@@ -106,6 +121,7 @@ public function __construct(
  $this->defaultStockProvider = $defaultStockProvider;
  $this->batch = $batch ?: ObjectManager::getInstance()->get(Batch::class);
  $this->batchSize = $batchSize ?? self::BATCH_SIZE;
+ $this->deploymentConfig = $deploymentConfig ?: ObjectManager::getInstance()->get(DeploymentConfig::class);
  }
 
  /**
@@ -116,6 +132,13 @@ public function __construct(
  public function executeList(array $sourceItemIds)
  {
  $skuListInStockList = $this->siblingSkuListInStockProvider->execute($sourceItemIds);
+ $this->batchSize = $this->deploymentConfig->get(
+ self::DEPLOYMENT_CONFIG_INDEXER_BATCHES . InventoryIndexer::INDEXER_ID . '/' . 'configurable'
+ ) ??
+ $this->deploymentConfig->get(
+ self::DEPLOYMENT_CONFIG_INDEXER_BATCHES . InventoryIndexer::INDEXER_ID . '/' . 'default'
+ )
+ ?? $this->batchSize;
 
  foreach ($skuListInStockList as $skuListInStock) {
  $stockId = $skuListInStock->getStockId();

diff --git a/InventoryConfigurableProductIndexer/Indexer/Stock/StockIndexer.php b/InventoryConfigurableProductIndexer/Indexer/Stock/StockIndexer.php
@@ -7,6 +7,7 @@
 
 namespace Magento\InventoryConfigurableProductIndexer\Indexer\Stock;
 
+use Magento\Framework\App\DeploymentConfig;
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\Exception\StateException;
@@ -84,6 +85,18 @@ class StockIndexer
  */
  private $batch;
 
+ /**
+ * @var DeploymentConfig|null
+ */
+ private $deploymentConfig;
+
+ /**
+ * Deployment config path
+ *
+ * @var string
+ */
+ private const DEPLOYMENT_CONFIG_INDEXER_BATCHES = 'indexer/batch_size/';
+
  /**
  * $indexStructure is reserved name for construct variable in index internal mechanism
  *
@@ -97,6 +110,7 @@ class StockIndexer
  * @param PrepareIndexDataForClearingIndex|null $prepareIndexDataForClearingIndex
  * @param Batch|null $batch
  * @param int|null $batchSize
+ * @param DeploymentConfig|null $deploymentConfig
  * @SuppressWarnings(PHPMD.ExcessiveParameterList) All parameters are needed for backward compatibility
  */
  public function __construct(
@@ -109,7 +123,8 @@ public function __construct(
  DefaultStockProviderInterface $defaultStockProvider,
  ?PrepareIndexDataForClearingIndex $prepareIndexDataForClearingIndex = null,
  ?Batch $batch = null,
- ?int $batchSize = null
+ ?int $batchSize = null,
+ ?DeploymentConfig $deploymentConfig = null
  ) {
  $this->getAllStockIds = $getAllStockIds;
  $this->indexStructure = $indexStructure;
@@ -122,6 +137,7 @@ public function __construct(
  ->get(PrepareIndexDataForClearingIndex::class);
  $this->batch = $batch ?: ObjectManager::getInstance()->get(Batch::class);
  $this->batchSize = $batchSize ?? self::BATCH_SIZE;
+ $this->deploymentConfig = $deploymentConfig ?: ObjectManager::getInstance()->get(DeploymentConfig::class);
  }
 
  /**
@@ -157,6 +173,14 @@ public function executeRow(int $stockId): void
  */
  public function executeList(array $stockIds): void
  {
+ $this->batchSize = $this->deploymentConfig->get(
+ self::DEPLOYMENT_CONFIG_INDEXER_BATCHES . InventoryIndexer::INDEXER_ID . '/' . 'configurable'
+ ) ??
+ $this->deploymentConfig->get(
+ self::DEPLOYMENT_CONFIG_INDEXER_BATCHES . InventoryIndexer::INDEXER_ID . '/' . 'default'
+ )
+ ?? $this->batchSize;
+
  foreach ($stockIds as $stockId) {
  if ($this->defaultStockProvider->getId() === $stockId) {
  continue;

diff --git a/InventoryIndexer/Indexer/IndexHandler.php b/InventoryIndexer/Indexer/IndexHandler.php
@@ -7,6 +7,8 @@
 
 namespace Magento\InventoryIndexer\Indexer;
 
+use Magento\Framework\App\DeploymentConfig;
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\Indexer\SaveHandler\Batch;
 use Magento\InventoryMultiDimensionalIndexerApi\Model\IndexHandlerInterface;
@@ -38,22 +40,37 @@ class IndexHandler implements IndexHandlerInterface
  */
  private $batchSize;
 
+ /**
+ * @var DeploymentConfig|null
+ */
+ private $deploymentConfig;
+
+ /**
+ * Deployment config path
+ *
+ * @var string
+ */
+ private const DEPLOYMENT_CONFIG_INDEXER_BATCHES = 'indexer/batch_size/';
+
  /**
  * @param IndexNameResolverInterface $indexNameResolver
  * @param Batch $batch
  * @param ResourceConnection $resourceConnection
- * @param int $batchSize
+ * @param $batchSize
+ * @param DeploymentConfig|null $deploymentConfig
  */
  public function __construct(
  IndexNameResolverInterface $indexNameResolver,
  Batch $batch,
  ResourceConnection $resourceConnection,
- $batchSize
+ $batchSize,
+ ?DeploymentConfig $deploymentConfig = null
  ) {
  $this->indexNameResolver = $indexNameResolver;
  $this->batch = $batch;
  $this->resourceConnection = $resourceConnection;
  $this->batchSize = $batchSize;
+ $this->deploymentConfig = $deploymentConfig ?: ObjectManager::getInstance()->get(DeploymentConfig::class);
  }
 
  /**
@@ -65,6 +82,11 @@ public function saveIndex(IndexName $indexName, \Traversable $documents, string
  $tableName = $this->indexNameResolver->resolveName($indexName);
 
  $columns = [IndexStructure::SKU, IndexStructure::QUANTITY, IndexStructure::IS_SALABLE];
+
+ $this->batchSize = $this->deploymentConfig->get(
+ self::DEPLOYMENT_CONFIG_INDEXER_BATCHES . InventoryIndexer::INDEXER_ID . '/' . 'default'
+ ) ?? $this->batchSize;
+
  foreach ($this->batch->getItems($documents, $this->batchSize) as $batchDocuments) {
  $connection->insertOnDuplicate($tableName, $batchDocuments, $columns);
  }