MAGETWO-83426: [Performance] Customer Import check data does not complete

Author: Oleksandr Gorkun

app/code/Magento/CustomerImportExport/Model/Import/AbstractCustomer.php

@@ -173,43 +173,6 @@ protected function _getCustomerId($email, $websiteCode)
         return false;
     }
 
-    /**
-     * Pre-loading customers for existing customers checks in order
-     * to perform mass validation/import efficiently.
-     *
-     * @param \Traversable $rows Each row must contain data from columns email
-     * and website code.
-     *
-     * @return void
-     */
-    public function prepareCustomerData(\Traversable $rows)
-    {
-        $customersPresent = [];
-        foreach ($rows as $rowData) {
-            $email = isset($rowData[static::COLUMN_EMAIL])
-                ? $rowData[static::COLUMN_EMAIL] : null;
-            $websiteId = isset($rowData[static::COLUMN_WEBSITE])
-                ? $this->getWebsiteId($rowData[static::COLUMN_WEBSITE]) : false;
-            if ($email && $websiteId !== false) {
-                $customersPresent[] = [
-                    'email' => $email,
-                    'website_id' => $websiteId
-                ];
-            }
-        }
-        $this->getCustomerStorage()->prepareCustomers($customersPresent);
-    }
-
-    /**
-     * @inheritDoc
-     */
-    public function validateData()
-    {
-        $this->prepareCustomerData($this->getSource());
-
-        return parent::validateData();
-    }
-
     /**
      * Validate data row
      *

app/code/Magento/CustomerImportExport/Model/Import/Address.php

@@ -487,36 +487,56 @@ protected function _initAddresses()
     }
 
     /**
-     * @inheritDoc
-     *
+     * Pre-loading customers for existing customers checks in order
+     * to perform mass validation/import efficiently.
      * Also loading existing addresses for requested customers.
+     *
+     * @param \Traversable $rows Each row must contain data from columns email
+     * and website code.
+     *
+     * @return void
      */
     public function prepareCustomerData(\Traversable $rows)
     {
-        parent::prepareCustomerData($rows);
+        $customersPresent = [];
+        foreach ($rows as $rowData) {
+            $email = isset($rowData[static::COLUMN_EMAIL])
+                ? $rowData[static::COLUMN_EMAIL] : null;
+            $websiteId = isset($rowData[static::COLUMN_WEBSITE])
+                ? $this->getWebsiteId($rowData[static::COLUMN_WEBSITE]) : false;
+            if ($email && $websiteId !== false) {
+                $customersPresent[] = [
+                    'email' => $email,
+                    'website_id' => $websiteId
+                ];
+            }
+        }
+        $this->getCustomerStorage()->prepareCustomers($customersPresent);
 
         $ids = [];
-        foreach ($rows as $customerData) {
-            if (isset($customerData[static::COLUMN_EMAIL])
-                && ($email = $customerData[static::COLUMN_EMAIL])
-                && isset($customerData[static::COLUMN_WEBSITE])
-                && (
-                    $websiteId = $this->getWebsiteId(
-                        $customerData[static::COLUMN_WEBSITE]
-                    )
-                ) !== false
-            ) {
-                $id = $this->getCustomerStorage()
-                    ->getCustomerId($email, $websiteId);
-                if ($id) {
-                    $ids[] = $id;
-                }
+        foreach ($customersPresent as $customerData) {
+            $id = $this->getCustomerStorage()->getCustomerId(
+                $customerData['email'],
+                $customerData['website_id']
+            );
+            if ($id) {
+                $ids[] = $id;
             }
         }
 
         $this->addressStorage->prepareAddresses($ids);
     }
 
+    /**
+     * @inheritDoc
+     */
+    public function validateData()
+    {
+        $this->prepareCustomerData($this->getSource());
+
+        return parent::validateData();
+    }
+
     /**
      * Initialize country regions hash for clever recognition
      *

app/code/Magento/CustomerImportExport/Model/Import/Customer.php

@@ -323,6 +323,43 @@ protected function _getNextEntityId()
         return $this->_nextEntityId++;
     }
 
+    /**
+     * Pre-loading customers for existing customers checks in order
+     * to perform mass validation/import efficiently.
+     *
+     * @param \Traversable $rows Each row must contain data from columns email
+     * and website code.
+     *
+     * @return void
+     */
+    public function prepareCustomerData(\Traversable $rows)
+    {
+        $customersPresent = [];
+        foreach ($rows as $rowData) {
+            $email = isset($rowData[static::COLUMN_EMAIL])
+                ? $rowData[static::COLUMN_EMAIL] : null;
+            $websiteId = isset($rowData[static::COLUMN_WEBSITE])
+                ? $this->getWebsiteId($rowData[static::COLUMN_WEBSITE]) : false;
+            if ($email && $websiteId !== false) {
+                $customersPresent[] = [
+                    'email' => $email,
+                    'website_id' => $websiteId
+                ];
+            }
+        }
+        $this->getCustomerStorage()->prepareCustomers($customersPresent);
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function validateData()
+    {
+        $this->prepareCustomerData($this->getSource());
+
+        return parent::validateData();
+    }
+
     /**
      * Prepare customer data for update
      *