MAGETWO-64187: Batch size algorithm

Author: Stanislav Idolov

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

@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 
-namespace Magento\Indexer\Model;
+namespace Magento\Catalog\Model\ResourceModel\Product\Indexer;
 
 class IndexTableRowSizeEstimator implements \Magento\Framework\Indexer\IndexTableRowSizeEstimatorInterface
 {

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

@@ -9,7 +9,7 @@
 class CompositeProductRowSizeEstimator implements \Magento\Framework\Indexer\IndexTableRowSizeEstimatorInterface
 {
     /**
-     * @var \Magento\Indexer\Model\IndexTableRowSizeEstimator
+     * @var \Magento\Catalog\Model\ResourceModel\Product\Indexer\IndexTableRowSizeEstimator
      */
     private $indexTableRowSizeEstimator;
 
@@ -20,11 +20,11 @@ class CompositeProductRowSizeEstimator implements \Magento\Framework\Indexer\Ind
 
     /**
      * @param DefaultPrice $indexerResource
-     * @param \Magento\Indexer\Model\IndexTableRowSizeEstimator $indexTableRowSizeEstimator
+     * @param \Magento\Catalog\Model\ResourceModel\Product\Indexer\IndexTableRowSizeEstimator $indexTableRowSizeEstimator
      */
     public function __construct(
         \Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\DefaultPrice $indexerResource,
-        \Magento\Indexer\Model\IndexTableRowSizeEstimator $indexTableRowSizeEstimator
+        \Magento\Catalog\Model\ResourceModel\Product\Indexer\IndexTableRowSizeEstimator $indexTableRowSizeEstimator
     ) {
         $this->indexerResource = $indexerResource;
         $this->indexTableRowSizeEstimator = $indexTableRowSizeEstimator;

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

@@ -943,4 +943,9 @@
             <argument name="indexerFrontendResource" xsi:type="object">Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\FrontendResource</argument>
         </arguments>
     </type>
+    <type name="Magento\Framework\Indexer\BatchSizeManagement">
+        <arguments>
+            <argument name="rowSizeEstimator" xsi:type="object" shared="false">\Magento\Catalog\Model\ResourceModel\Product\Indexer\IndexTableRowSizeEstimator</argument>
+        </arguments>
+    </type>
 </config>

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

@@ -56,9 +56,4 @@
         </arguments>
     </type>
     <preference for="Magento\Framework\Indexer\BatchSizeManagementInterface" type="Magento\Framework\Indexer\BatchSizeManagement" />
-    <type name="Magento\Framework\Indexer\BatchSizeManagement">
-        <arguments>
-            <argument name="rowSizeEstimator" xsi:type="object" shared="false">Magento\Indexer\Model\IndexTableRowSizeEstimator</argument>
-        </arguments>
-    </type>
 </config>