Merge branch 'MCP-87' into mcp-123

Author: vzabaznov

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

@@ -430,7 +430,7 @@ protected function prepareSelectsByRange(
                 $field,
                 $select,
                 $range,
-                \Magento\Framework\DB\Query\BatchIteratorInterface::NON_UNIQUE_FIELD_ITERATOR
+                \Magento\Framework\DB\Query\BatchIteratorInterface::UNIQUE_FIELD_ITERATOR
             );
 
             $queries = [];

app/code/Magento/CatalogInventory/Model/Indexer/Stock/Action/Full.php

@@ -149,13 +149,21 @@ public function execute($ids = null): void
 
                 $select = $connection->select();
                 $select->distinct(true);
-                $select->from(['e' => $entityMetadata->getEntityTable()], $entityMetadata->getIdentifierField());
+                $select->from(
+                    [
+                        'e' => $entityMetadata->getEntityTable()
+                    ],
+                    $entityMetadata->getIdentifierField()
+                )->where(
+                    'type_id = ?',
+                    $indexer->getTypeId()
+                );
 
                 $batchQueries = $this->batchQueryGenerator->generate(
                     $entityMetadata->getIdentifierField(),
                     $select,
                     $batchRowCount,
-                    BatchIteratorInterface::NON_UNIQUE_FIELD_ITERATOR
+                    BatchIteratorInterface::UNIQUE_FIELD_ITERATOR
                 );
 
                 foreach ($batchQueries as $query) {