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

@@ -325,7 +325,19 @@ protected function _insertAttribute($object, $attribute, $value)
      */
     protected function _updateAttribute($object, $attribute, $valueId, $value)
     {
-        return $this->_saveAttributeValue($object, $attribute, $value);
+        if ($valueId > 0) {
+            $table = $attribute->getBackend()->getTable();
+            $connection = $this->getConnection();
+            $connection->update(
+                $table,
+                ['value' => $this->_prepareValueForSave($value, $attribute)],
+                sprintf('%s=%d', $connection->quoteIdentifier('value_id'), $valueId)
+            );
+
+            return $this;
+        } else {
+            return $this->_saveAttributeValue($object, $attribute, $value);
+        }
     }
 
     /**

app/code/Magento/Eav/Model/Entity/AbstractEntity.php

@@ -1669,7 +1669,6 @@ protected function _deleteAttributes($object, $table, $info)
      */
     public function saveAttribute(DataObject $object, $attributeCode)
     {
-        $updateValue = 0;
         $attribute = $this->getAttribute($attributeCode);
         $backend = $attribute->getBackend();
         $table = $backend->getTable();
@@ -1700,15 +1699,10 @@ public function saveAttribute(DataObject $object, $attributeCode)
                 $this->_insertAttribute($object, $attribute, $newValue);
             } elseif ($origValueId !== false && $newValue !== null) {
                 $this->_updateAttribute($object, $attribute, $origValueId, $newValue);
-                $updateValue = 1;
             } elseif ($origValueId !== false && $newValue === null && $origValue !== null) {
                 $connection->delete($table, $where);
             }
-            if ($updateValue === 1  && $origValue === $newValue) {
-                $this->_updateAttributeValues($attribute, $origValueId);
-            } else {
-                $this->_processAttributeValues();
-            }
+            $this->_processAttributeValues();
             $connection->commit();
         } catch (\Exception $e) {
             $connection->rollBack();
@@ -2017,36 +2011,4 @@ protected function loadAttributesForObject($attributes, $object = null)
             }
         }
     }
-
-    /**
-     * Update entity attribute values
-     *
-     * @param AbstractAttribute $attribute
-     * @param mixed $valueId
-     * @return $this
-     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     */
-    private function _updateAttributeValues(AbstractAttribute $attribute, mixed $valueId): static
-    {
-        $connection = $this->getConnection();
-        foreach ($this->_attributeValuesToSave as $table => $data) {
-            foreach ($data as $columnValue) {
-                $connection->update(
-                    $table,
-                    ['value' => $this->_prepareValueForSave($columnValue['value'], $attribute)],
-                    sprintf('%s=%d', $connection->quoteIdentifier('value_id'), $valueId)
-                );
-            }
-        }
-
-        foreach ($this->_attributeValuesToDelete as $table => $valueIds) {
-            $connection->delete($table, ['value_id IN (?)' => $valueIds]);
-        }
-
-        // reset data arrays
-        $this->_attributeValuesToSave = [];
-        $this->_attributeValuesToDelete = [];
-
-        return $this;
-    }
 }