Merge remote-tracking branch 'origin/MC-37705' into 2.4-develop-pr42

Author: serhii-balko

app/code/Magento/CatalogImportExport/Model/Import/Product/Option.php

@@ -421,7 +421,7 @@ public function __construct(
 
         $this->_initMessageTemplates();
 
-        $this->_initProductsSku()->_initOldCustomOptions();
+        $this->_initProductsSku();
     }
 
     /**
@@ -606,6 +606,9 @@ protected function _initOldCustomOptions()
                     'option_title.store_id = ?',
                     $storeId
                 );
+                if (!empty($this->_newOptionsOldData)) {
+                    $this->_optionCollection->addProductToFilter(array_keys($this->_newOptionsOldData));
+                }
 
                 $this->_byPagesIterator->iterate($this->_optionCollection, $this->_pageSize, [$addCustomOptions]);
             }
@@ -614,6 +617,20 @@ protected function _initOldCustomOptions()
         return $this;
     }
 
+    /**
+     * Get existing custom options data
+     *
+     * @return array
+     */
+    private function getOldCustomOptions(): array
+    {
+        if ($this->_oldCustomOptions === null) {
+            $this->_initOldCustomOptions();
+        }
+
+        return $this->_oldCustomOptions;
+    }
+
     /**
      * Imported entity type code getter
      *
@@ -717,9 +734,9 @@ protected function _findOldOptionsWithTheSameTitles()
         $errorRows = [];
         foreach ($this->_newOptionsOldData as $productId => $options) {
             foreach ($options as $outerData) {
-                if (isset($this->_oldCustomOptions[$productId])) {
+                if (isset($this->getOldCustomOptions()[$productId])) {
                     $optionsCount = 0;
-                    foreach ($this->_oldCustomOptions[$productId] as $innerData) {
+                    foreach ($this->getOldCustomOptions()[$productId] as $innerData) {
                         if (count($outerData['titles']) == count($innerData['titles'])) {
                             $outerTitles = $outerData['titles'];
                             $innerTitles = $innerData['titles'];
@@ -753,8 +770,8 @@ protected function _findNewOldOptionsTypeMismatch()
         $errorRows = [];
         foreach ($this->_newOptionsOldData as $productId => $options) {
             foreach ($options as $outerData) {
-                if (isset($this->_oldCustomOptions[$productId])) {
-                    foreach ($this->_oldCustomOptions[$productId] as $innerData) {
+                if (isset($this->getOldCustomOptions()[$productId])) {
+                    foreach ($this->getOldCustomOptions()[$productId] as $innerData) {
                         if (count($outerData['titles']) == count($innerData['titles'])) {
                             $outerTitles = $outerData['titles'];
                             $innerTitles = $innerData['titles'];
@@ -784,9 +801,9 @@ protected function _findNewOldOptionsTypeMismatch()
     protected function _findExistingOptionId(array $newOptionData, array $newOptionTitles)
     {
         $productId = $newOptionData['product_id'];
-        if (isset($this->_oldCustomOptions[$productId])) {
+        if (isset($this->getOldCustomOptions()[$productId])) {
             ksort($newOptionTitles);
-            $existingOptions = $this->_oldCustomOptions[$productId];
+            $existingOptions = $this->getOldCustomOptions()[$productId];
             foreach ($existingOptions as $optionId => $optionData) {
                 if ($optionData['type'] == $newOptionData['type']
                     && $optionData['titles'][Store::DEFAULT_STORE_ID] == $newOptionTitles[Store::DEFAULT_STORE_ID]