Merge pull request #598 from magento-troll/m2beta3

[Merchant Beta][MX] Bugfixes for beta 3

Author: Slabko,Michael(mslabko)

app/code/Magento/ConfigurableImportExport/Model/Import/Product/Type/Configurable.php

@@ -344,11 +344,23 @@ protected function _loadSkuSuperAttributeValues($bunch, $newSku, $oldSku)
     /**
      * Array of SKU to array of super attribute values for all products.
      *
+     * @param array $bunch
      * @return $this
      */
-    protected function _loadSkuSuperData()
+    protected function _loadSkuSuperDataForBunch(array $bunch)
     {
-        if (!$this->_skuSuperData) {
+        $newSku = $this->_entityModel->getNewSku();
+        $oldSku = $this->_entityModel->getOldSku();
+        $productIds = [];
+        foreach ($bunch as $rowData) {
+            $sku = $rowData[ImportProduct::COL_SKU];
+            $productData = isset($newSku[$sku]) ? $newSku[$sku] : $oldSku[$sku];
+            $productIds[] = $productData['entity_id'];
+        }
+
+        $this->_productSuperAttrs = [];
+        $this->_skuSuperData = [];
+        if (!empty($productIds)) {
             $mainTable = $this->_resource->getTableName('catalog_product_super_attribute');
             $optionTable = $this->_resource->getTableName('eav_attribute_option');
             $select = $this->_connection->select()->from(
@@ -362,6 +374,9 @@ protected function _loadSkuSuperData()
                     'o.attribute_id'
                 ),
                 ['option_id']
+            )->where(
+                'product_id IN ( ? )',
+                $productIds
             );
 
             foreach ($this->_connection->fetchAll($select) as $row) {
@@ -696,11 +711,10 @@ public function saveData()
         $this->_productSuperData = [];
         $this->_productData = null;
 
-        if ($this->_entityModel->getBehavior() == \Magento\ImportExport\Model\Import::BEHAVIOR_APPEND) {
-            $this->_loadSkuSuperData();
-        }
-
         while ($bunch = $this->_entityModel->getNextBunch()) {
+            if ($this->_entityModel->getBehavior() == \Magento\ImportExport\Model\Import::BEHAVIOR_APPEND) {
+                $this->_loadSkuSuperDataForBunch($bunch);
+            }
             if (!$this->configurableInBunch($bunch)) {
                 continue;
             }