MAGETWO-90563: [Forwardport] Implement segmentation for Category Product Indexer

Author: slopukhov

app/code/Magento/Catalog/Model/Indexer/Category/Product/AbstractAction.php

@@ -411,8 +411,11 @@ protected function isRangingNeeded()
      * @param int $range
      * @return Select[]
      */
-    protected function prepareSelectsByRange(Select $select, $field, $range = self::RANGE_CATEGORY_STEP)
-    {
+    protected function prepareSelectsByRange(
+        Select $select,
+        string $field,
+        int $range = self::RANGE_CATEGORY_STEP
+    ) {
         if ($this->isRangingNeeded()) {
             $iterator = $this->queryGenerator->generate(
                 $field,

dev/tests/integration/testsuite/Magento/BundleImportExport/Model/Import/Product/Type/BundleTest.php

@@ -5,14 +5,14 @@
  */
 namespace Magento\BundleImportExport\Model\Import\Product\Type;
 
-use Magento\Framework\App\Bootstrap;
+use Magento\TestFramework\Helper\Bootstrap;
 use Magento\Framework\App\Filesystem\DirectoryList;
-use Magento\ImportExport\Model\Import;
 
 /**
  * @magentoAppArea adminhtml
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
-class BundleTest extends \PHPUnit\Framework\TestCase
+class BundleTest extends \Magento\TestFramework\Indexer\TestCase
 {
     /**
      * Bundle product test Name
@@ -41,9 +41,22 @@ class BundleTest extends \PHPUnit\Framework\TestCase
      */
     protected $optionSkuList = ['Simple 1', 'Simple 2', 'Simple 3'];
 
+    public static function setUpBeforeClass()
+    {
+        $db = Bootstrap::getInstance()->getBootstrap()
+            ->getApplication()
+            ->getDbInstance();
+        if (!$db->isDbDumpExists()) {
+            throw new \LogicException('DB dump does not exist.');
+        }
+        $db->restoreFromDbDump();
+
+        parent::setUpBeforeClass();
+    }
+
     protected function setUp()
     {
-        $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+        $this->objectManager = Bootstrap::getObjectManager();
         $this->model = $this->objectManager->create(\Magento\CatalogImportExport\Model\Import\Product::class);
     }
 
@@ -122,6 +135,7 @@ public function testBundleImport()
 
     /**
      * @magentoDataFixture Magento/Store/_files/second_store.php
+     * @magentoDbIsolation disabled
      * @magentoAppArea adminhtml
      * @return void
      */
@@ -179,4 +193,12 @@ public function testBundleImportWithMultipleStoreViews(): void
             }
         }
     }
+
+    /**
+     * teardown
+     */
+    public function tearDown()
+    {
+        parent::tearDown();
+    }
 }