Merge branch 'ACPT-746' into ACPT-757&ACPT-773&ACPT-747&ACPT-748&ACPT-675&ACPT-671&ACPT-746

Author: JacobBrownAustin

app/code/Magento/ImportExport/Model/Import/ErrorProcessing/ProcessingErrorAggregator.php

@@ -26,6 +26,11 @@ class ProcessingErrorAggregator implements ProcessingErrorAggregatorInterface
      */
     protected $items = [];
 
+    /**
+     * @var ProcessingError[]
+     */
+    private $itemsByRowColumnAndCode = [];
+
     /**
      * @var int[]
      */
@@ -87,13 +92,13 @@ public function addError(
             $this->processInvalidRow($rowNumber);
         }
         $errorMessage = $this->getErrorMessage($errorCode, $errorMessage, $columnName);
-
         /** @var ProcessingError $newError */
         $newError = $this->errorFactory->create();
         $newError->init($errorCode, $errorLevel, $rowNumber, $columnName, $errorMessage, $errorDescription);
         $this->items['rows'][$rowNumber][] = $newError;
         $this->items['codes'][$errorCode][] = $newError;
         $this->items['messages'][$errorMessage][] = $newError;
+        $this->itemsByRowColumnAndCode[$rowNumber][$columnName][$errorCode] = $newError;
         return $this;
     }
 
@@ -356,7 +361,7 @@ public function clear()
         $this->errorStatistics = [];
         $this->invalidRows = [];
         $this->skippedRows = [];
-
+        $this->itemsByRowColumnAndCode = [];
         return $this;
     }
 
@@ -370,13 +375,7 @@ public function clear()
      */
     protected function isErrorAlreadyAdded($rowNum, $errorCode, $columnName = null)
     {
-        $errors = $this->getErrorsByCode([$errorCode]);
-        foreach ($errors as $error) {
-            if ($rowNum == $error->getRowNumber() && $columnName == $error->getColumnName()) {
-                return true;
-            }
-        }
-        return false;
+        return isset($this->itemsByRowColumnAndCode[$rowNum][$columnName][$errorCode]);
     }
 
     /**