MAGETWO-55589: Wrong algorithm for calculation batch size on category indexing

 - CR changes

Author: Oleksii Korshenko

lib/internal/Magento/Framework/DB/Query/BatchIterator.php

@@ -65,6 +65,7 @@ class BatchIterator implements \Iterator
      * @param int $batchSize
      * @param string $correlationName
      * @param string $rangeField
+     * @param string $rangeFieldAlias
      */
     public function __construct(
         Select $select,

lib/internal/Magento/Framework/DB/Query/BatchIteratorFactory.php

@@ -1,4 +1,8 @@
 <?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
 namespace Magento\Framework\DB\Query;
 
 /**
@@ -40,7 +44,7 @@ public function __construct(
      * @param array $data
      * @return \Magento\Framework\DB\Query\BatchIterator
      */
-    public function create(array $data = array())
+    public function create(array $data = [])
     {
         return $this->objectManager->create($this->instanceName, $data);
     }

lib/internal/Magento/Framework/DB/Query/Generator.php

@@ -46,8 +46,8 @@ public function generate($rangeField, \Magento\Framework\DB\Select $select, $bat
         }
 
         $fieldCorrelationName = '';
-        foreach ($fromSelect as $correlationName => $formPart) {
-            if ($formPart['joinType'] == \Magento\Framework\DB\Select::FROM) {
+        foreach ($fromSelect as $correlationName => $fromPart) {
+            if ($fromPart['joinType'] == \Magento\Framework\DB\Select::FROM) {
                 $fieldCorrelationName = $correlationName;
                 break;
             }
@@ -60,9 +60,7 @@ public function generate($rangeField, \Magento\Framework\DB\Select $select, $bat
         $rangeFieldAlias = null;
         foreach ($columns as $column) {
             list($table, $columnName, $alias) = $column;
-            if (is_string($table) && is_string($columnName)
-                && $table == $fieldCorrelationName && $columnName == $rangeField
-            ) {
+            if (is_string($columnName) && $table == $fieldCorrelationName && $columnName == $rangeField) {
                 $rangeFieldAlias = $alias;
                 break;
             }
@@ -71,7 +69,7 @@ public function generate($rangeField, \Magento\Framework\DB\Select $select, $bat
         if (!$rangeFieldAlias) {
             throw new LocalizedException(
                 new \Magento\Framework\Phrase(
-                    'Select object must have correct range field name %field',
+                    'Select object must have correct range field name "%field"',
                     ['field' => $rangeField]
                 )
             );