ACP2E-1522: Auto increment number jumping up for catalog_product_entity_* tables

 - Fixed the build error.

Author: devarul

app/code/Magento/Catalog/Model/ResourceModel/AbstractResource.php

@@ -24,14 +24,14 @@
 abstract class AbstractResource extends \Magento\Eav\Model\Entity\AbstractEntity
 {
     /**
-     * Store manager
+     * Store manager to get the store information
      *
      * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $_storeManager;
 
     /**
-     * Model factory
+     * Model factory to create a model object
      *
      * @var \Magento\Catalog\Model\Factory
      */
@@ -327,7 +327,11 @@ protected function _updateAttribute($object, $attribute, $valueId, $value)
     {
         $entity = $attribute->getEntity();
         $row = $this->getAttributeRow($entity, $object, $attribute);
-        if ($valueId > 0 && array_key_exists('store_id', $row)) {
+        $hasSingleStore = $this->_storeManager->hasSingleStore();
+        $storeId = $hasSingleStore
+            ? $this->getDefaultStoreId()
+            : (int) $this->_storeManager->getStore($object->getStoreId())->getId();
+        if ($valueId > 0 && array_key_exists('store_id', $row) && $storeId === $row['store_id']) {
             $table = $attribute->getBackend()->getTable();
             $connection = $this->getConnection();
             $connection->update(