MAGETWO-66331: Implement solution to update duplicate rows at once and add environment variable to control batch size

- refactoring object manager initialization, environment variable validation

Author: Igor Melnikov

lib/internal/Magento/Framework/DB/FieldDataConverter.php

@@ -26,16 +26,6 @@ class FieldDataConverter
      */
     const DEFAULT_BATCH_SIZE = 50000;
 
-    /**
-     * Min batch size
-     */
-    const MIN_BATCH_SIZE = 25000;
-
-    /**
-     * Max batch size
-     */
-    const MAX_BATCH_SIZE = 500000;
-
     /**
      * @var Generator
      */
@@ -141,10 +131,10 @@ private function getBatchSize()
     {
         if (null !== $this->envBatchSize) {
             $batchSize = (int) $this->envBatchSize;
-            if ($batchSize < self::MIN_BATCH_SIZE || $batchSize > self::MAX_BATCH_SIZE) {
+            if (bccomp($this->envBatchSize, PHP_INT_MAX, 0) === 1 || $batchSize < 1) {
                 throw new \InvalidArgumentException(
                     'Invalid value for environment variable ' . self::BATCH_SIZE_VARIABLE_NAME . '. '
-                    . 'Should be integer and be > ' . self::MIN_BATCH_SIZE . ', < ' . self::MAX_BATCH_SIZE
+                    . 'Should be integer, >= 1 and < value of PHP_INT_MAX'
                 );
             }
             return $batchSize;

lib/internal/Magento/Framework/DB/Test/Unit/FieldDataConverterTest.php

@@ -209,7 +209,7 @@ public function convertBatchSizeFromEnvDataProvider()
      * @param string|int $batchSize
      * @expectedException \InvalidArgumentException
      * @codingStandardsIgnoreStart
-     * @expectedExceptionMessage Invalid value for environment variable DATA_CONVERTER_BATCH_SIZE. Should be integer and be > 25000, < 500000
+     * @expectedExceptionMessage Invalid value for environment variable DATA_CONVERTER_BATCH_SIZE. Should be integer, >= 1 and < value of PHP_INT_MAX
      * @codingStandardsIgnoreEnd
      * @dataProvider convertBatchSizeFromEnvInvalidDataProvider
      */
@@ -258,7 +258,7 @@ public function convertBatchSizeFromEnvInvalidDataProvider()
     {
         return [
             ['value'],
-            [500001],
+            [bcadd(PHP_INT_MAX, 1)],
         ];
     }
 }

setup/config/autoload/global.php

@@ -9,7 +9,14 @@
 use Magento\Setup\Mvc\Bootstrap\InitParamListener;
 
 return [
-    InitParamListener::BOOTSTRAP_PARAM => [
-        Bootstrap::INIT_PARAM_FILESYSTEM_DIR_PATHS => [DirectoryList::ROOT => [DirectoryList::PATH => BP]],
-    ]
+    InitParamListener::BOOTSTRAP_PARAM => array_merge(
+        $_SERVER,
+        [
+            Bootstrap::INIT_PARAM_FILESYSTEM_DIR_PATHS => [
+                DirectoryList::ROOT => [
+                    DirectoryList::PATH => BP
+                ]
+            ]
+        ]
+    )
 ];

setup/src/Magento/Setup/Model/ObjectManagerProvider.php

@@ -57,10 +57,7 @@ public function __construct(
     public function get()
     {
         if (null === $this->objectManager) {
-            $initParams = array_merge(
-                $this->serviceLocator->get(InitParamListener::BOOTSTRAP_PARAM),
-                $_SERVER
-            );
+            $initParams = $this->serviceLocator->get(InitParamListener::BOOTSTRAP_PARAM);
             $factory = $this->getObjectManagerFactory($initParams);
             $this->objectManager = $factory->create($initParams);
             if (PHP_SAPI == 'cli') {

setup/src/Magento/Setup/Test/Unit/Model/ObjectManagerProviderTest.php

@@ -46,7 +46,7 @@ public function setUp()
 
     public function testGet()
     {
-        $initParams = array_merge(['param' => 'value'], $_SERVER);
+        $initParams = ['param' => 'value'];
 
         $this->serviceLocatorMock
             ->expects($this->atLeastOnce())