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

Author: Oleksii Korshenko

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

@@ -57,24 +57,15 @@ public function generate($rangeField, \Magento\Framework\DB\Select $select, $bat
         /**
          * Calculate $rangeField alias
          */
-        $rangeFieldAlias = null;
+        $rangeFieldAlias = $rangeField;
         foreach ($columns as $column) {
             list($table, $columnName, $alias) = $column;
-            if (is_string($columnName) && $table == $fieldCorrelationName && $columnName == $rangeField) {
-                $rangeFieldAlias = $alias;
+            if ($table == $fieldCorrelationName && $columnName == $rangeField) {
+                $rangeFieldAlias = $alias ?: $rangeField;
                 break;
             }
         }
 
-        if (!$rangeFieldAlias) {
-            throw new LocalizedException(
-                new \Magento\Framework\Phrase(
-                    'Select object must have correct range field name "%field"',
-                    ['field' => $rangeField]
-                )
-            );
-        }
-
         return $this->iteratorFactory->create(
             [
                 'select' => $select,

lib/internal/Magento/Framework/Test/DB/Query/GeneratorTest.php

@@ -89,10 +89,6 @@ public function testGenerateWithoutFromPart()
         $this->model->generate('entity_id', $this->selectMock, 100);
     }
 
-    /**
-     * @expectedException \Magento\Framework\Exception\LocalizedException
-     * @expectedExceptionMessage  Select object must have correct range field name "entity_id"
-     */
     public function testGenerateWithInvalidRangeField()
     {
         $map = [
@@ -105,19 +101,23 @@ public function testGenerateWithInvalidRangeField()
             [
                 Select::COLUMNS,
                 [
-                    ['cp', 'row_id', 'product_id']
+                    ['cp', 'entity_id', null]
                 ]
             ]
         ];
         $this->selectMock->expects($this->exactly(2))->method('getPart')->willReturnMap($map);
-        $this->factoryMock->expects($this->never())->method('create');
-        $this->model->generate('entity_id', $this->selectMock, 100);
+        $this->factoryMock->expects($this->once())->method('create')->with(
+            [
+                'select' => $this->selectMock,
+                'batchSize' => 100,
+                'correlationName' => 'cp',
+                'rangeField' => 'entity_id',
+                'rangeFieldAlias' => 'entity_id'
+            ]
+        )->willReturn($this->iteratorMock);
+        $this->assertEquals($this->iteratorMock, $this->model->generate('entity_id', $this->selectMock, 100));
     }
 
-    /**
-     * @expectedException \Magento\Framework\Exception\LocalizedException
-     * @expectedExceptionMessage  Select object must have correct range field name "entity_id"
-     */
     public function testGenerateWithInvalidRangeFieldValue()
     {
         $map = [
@@ -130,12 +130,20 @@ public function testGenerateWithInvalidRangeFieldValue()
             [
                 Select::COLUMNS,
                 [
-                    ['cp', new \Zend_Db_Expr('MAX(entity_id) as max'), 'product_id']
+                    ['cp', '*', null]
                 ]
             ]
         ];
         $this->selectMock->expects($this->exactly(2))->method('getPart')->willReturnMap($map);
-        $this->factoryMock->expects($this->never())->method('create');
-        $this->model->generate('entity_id', $this->selectMock, 100);
+        $this->factoryMock->expects($this->once())->method('create')->with(
+            [
+                'select' => $this->selectMock,
+                'batchSize' => 100,
+                'correlationName' => 'cp',
+                'rangeField' => 'entity_id',
+                'rangeFieldAlias' => 'entity_id'
+            ]
+        )->willReturn($this->iteratorMock);
+        $this->assertEquals($this->iteratorMock, $this->model->generate('entity_id', $this->selectMock, 100));
     }
 }