Merge remote-tracking branch 'origin/indexers' into stock_indexer_batching

Author: Stanislav Idolov

app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Price/BatchSizeCalculator.php

@@ -6,6 +6,9 @@
 
 namespace Magento\Catalog\Model\ResourceModel\Product\Indexer\Price;
 
+/**
+ * Ensure that size of index MEMORY table is enough for configured rows count in batch.
+ */
 class BatchSizeCalculator
 {
     /**

app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Price/CompositeProductRowSizeEstimator.php

@@ -8,6 +8,9 @@
 
 use Magento\Framework\Indexer\IndexTableRowSizeEstimatorInterface;
 
+/**
+ * Estimate index memory size for largest composite product in catalog.
+ */
 class CompositeProductRowSizeEstimator implements IndexTableRowSizeEstimatorInterface
 {
     /**

app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Price/IndexTableRowSizeEstimator.php

@@ -6,6 +6,10 @@
 
 namespace Magento\Catalog\Model\ResourceModel\Product\Indexer\Price;
 
+/**
+ * Estimate index memory size for simple product.
+ * Size depends on websites and customer groups count.
+ */
 class IndexTableRowSizeEstimator implements \Magento\Framework\Indexer\IndexTableRowSizeEstimatorInterface
 {
     /**

app/code/Magento/Catalog/etc/di.xml

@@ -63,7 +63,6 @@
     <preference for="Magento\Catalog\Api\SpecialPriceInterface" type="Magento\Catalog\Model\ResourceModel\Product\Price\SpecialPrice" />
     <preference for="Magento\Catalog\Model\ProductIdLocatorInterface" type="Magento\Catalog\Model\ProductIdLocator" />
     <preference for="Magento\Framework\Indexer\BatchProviderInterface" type="Magento\Framework\Indexer\BatchProvider" />
-    <preference for="Magento\Framework\Indexer\BatchSizeCalculatorInterface" type="Magento\Framework\Indexer\BatchSizeCalculator" />
     <type name="Magento\Customer\Model\ResourceModel\Visitor">
         <plugin name="catalogLog" type="Magento\Catalog\Model\Plugin\Log" />
     </type>
@@ -928,12 +927,12 @@
     </type>
     <virtualType name="Magento\Catalog\Model\Indexer\Price\CompositeProductBatchSizeManagement" type="Magento\Framework\Indexer\BatchSizeManagement">
         <arguments>
-            <argument name="rowSizeEstimator" xsi:type="object" shared="false">Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\CompositeProductRowSizeEstimator</argument>
+            <argument name="rowSizeEstimator" xsi:type="object">Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\CompositeProductRowSizeEstimator</argument>
         </arguments>
     </virtualType>
     <virtualType name="Magento\Catalog\Model\Indexer\Price\BatchSizeManagement" type="Magento\Framework\Indexer\BatchSizeManagement">
         <arguments>
-            <argument name="rowSizeEstimator" xsi:type="object" shared="false">Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\IndexTableRowSizeEstimator</argument>
+            <argument name="rowSizeEstimator" xsi:type="object">Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\IndexTableRowSizeEstimator</argument>
         </arguments>
     </virtualType>
     <virtualType name="Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\FrontendResource" type="Magento\Indexer\Model\ResourceModel\FrontendResource">

app/code/Magento/Indexer/Setup/UpgradeSchema.php

@@ -22,7 +22,7 @@ public function upgrade(SchemaSetupInterface $setup, ModuleContextInterface $con
     {
         $setup->startSetup();
 
-        if (version_compare($context->getVersion(), '2.2.0', '<')) {
+        if (version_compare($context->getVersion(), '2.1.0', '<')) {
             $this->addTableSuffixColumn($setup);
         }
         $setup->endSetup();

app/code/Magento/Indexer/etc/module.xml

@@ -6,7 +6,7 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Magento_Indexer" setup_version="2.2.0">
+    <module name="Magento_Indexer" setup_version="2.1.0">
         <sequence>
             <module name="Magento_Store"/>
             <module name="Magento_AdminNotification"/>

lib/internal/Magento/Framework/Indexer/BatchSizeManagement.php

@@ -6,6 +6,9 @@
 
 namespace Magento\Framework\Indexer;
 
+/**
+ * Class set MEMORY table size for indexer processes according batch size and index row size.
+ */
 class BatchSizeManagement implements \Magento\Framework\Indexer\BatchSizeManagementInterface
 {
     /**
@@ -28,14 +31,13 @@ public function __construct(
      */
     public function ensureBatchSize(\Magento\Framework\DB\Adapter\AdapterInterface $connection, $batchSize)
     {
-        // Calculate memory table size for product
-        $memoryForLargeComposite = $this->rowSizeEstimator->estimateRowSize();
+        $rowMemory = $this->rowSizeEstimator->estimateRowSize();
 
         $maxHeapTableSize = $connection->fetchOne('SELECT @@max_heap_table_size;');
         $tmpTableSize = $connection->fetchOne('SELECT @@tmp_table_size;');
         $maxMemoryTableSize = min($maxHeapTableSize, $tmpTableSize);
 
-        $size = (int) ($memoryForLargeComposite * $batchSize);
+        $size = (int) ($rowMemory * $batchSize);
 
         if ($maxMemoryTableSize < $size) {
             $connection->query('SET SESSION tmp_table_size = ' . $size . ';');

lib/internal/Magento/Framework/Indexer/BatchSizeManagementInterface.php

@@ -9,6 +9,7 @@
 
 /**
  * Batch size manager can be used to ensure that MEMORY table has enough memory for data in batch.
+ * @api
  */
 interface BatchSizeManagementInterface
 {

lib/internal/Magento/Framework/Indexer/IndexTableRowSizeEstimatorInterface.php

@@ -6,10 +6,14 @@
 
 namespace Magento\Framework\Indexer;
 
+/**
+ * Calculate memory size for entity according different dimensions.
+ * @api
+ */
 interface IndexTableRowSizeEstimatorInterface
 {
     /**
-     * Calculate memory size for product row.
+     * Calculate memory size for entity row.
      *
      * @return float
      */