MAGETWO-70287: [Backport] - Category edit performance issue - for 2.1

- Update logic for url rewrites;

Author: adifucan

app/code/Magento/Catalog/Model/Category.php

@@ -27,6 +27,8 @@
  * @method Category setUrlPath(string $urlPath)
  * @method Category getSkipDeleteChildren()
  * @method Category setSkipDeleteChildren(boolean $value)
+ * @method Category setChangedProductIds(array $categoryIds) Set products ids that inserted or deleted for category
+ * @method array getChangedProductIds() Get products ids that inserted or deleted for category
  *
  * @SuppressWarnings(PHPMD.LongVariable)
  * @SuppressWarnings(PHPMD.ExcessivePublicCount)

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

@@ -409,9 +409,18 @@ protected function _saveCategoryProducts($category)
          * Update product positions in category
          */
         if (!empty($update)) {
+            $newPositions = [];
             foreach ($update as $productId => $position) {
-                $where = ['category_id = ?' => (int)$id, 'product_id = ?' => (int)$productId];
-                $bind = ['position' => (int)$position];
+                $delta = $position - $oldProducts[$productId];
+                if (!isset($newPositions[$delta])) {
+                    $newPositions[$delta] = [];
+                }
+                $newPositions[$delta][] = $productId;
+            }
+
+            foreach ($newPositions as $delta => $productIds) {
+                $bind = ['position' => new \Zend_Db_Expr("position + ({$delta})")];
+                $where = ['category_id = ?' => (int)$id, 'product_id IN (?)' => $productIds];
                 $connection->update($this->getCategoryProductTable(), $bind, $where);
             }
         }
@@ -422,6 +431,8 @@ protected function _saveCategoryProducts($category)
                 'catalog_category_change_products',
                 ['category' => $category, 'product_ids' => $productIds]
             );
+
+            $category->setChangedProductIds($productIds);
         }
 
         if (!empty($insert) || !empty($update) || !empty($delete)) {

app/code/Magento/CatalogUrlRewrite/Observer/CategoryProcessUrlRewriteSavingObserver.php

@@ -91,10 +91,12 @@ public function execute(\Magento\Framework\Event\Observer $observer)
         }
         if ($category->dataHasChangedFor('url_key')
             || $category->dataHasChangedFor('is_anchor')
-            || $category->getIsChangedProductList()
+            || $category->getChangedProductIds()
         ) {
-            $categoryUrlRewriteResult = $this->categoryUrlRewriteGenerator->generate($category);
-            $this->urlRewriteBunchReplacer->doBunchReplace($categoryUrlRewriteResult);
+            if ($category->dataHasChangedFor('url_key')) {
+                $categoryUrlRewriteResult = $this->categoryUrlRewriteGenerator->generate($category);
+                $this->urlRewriteBunchReplacer->doBunchReplace($categoryUrlRewriteResult);
+            }
 
             $productUrlRewriteResult = $this->urlRewriteHandler->generateProductUrlRewrites($category);
             $this->urlRewriteBunchReplacer->doBunchReplace($productUrlRewriteResult);

app/code/Magento/CatalogUrlRewrite/Observer/UrlRewriteHandler.php

@@ -87,36 +87,31 @@ public function generateProductUrlRewrites(Category $category)
         $this->isSkippedProduct = [];
         $saveRewriteHistory = $category->getData('save_rewrites_history');
         $storeId = $category->getStoreId();
-        if ($category->dataHasChangedFor('name')
-            || $category->dataHasChangedFor('url_key')
-            || $category->dataHasChangedFor('url_path')
-        ) {
-            if ($category->getAffectedProductIds()) {
-                $this->isSkippedProduct = $category->getAffectedProductIds();
-                $collection = $this->productCollectionFactory->create()
-                    ->setStoreId($storeId)
-                    ->addIdFilter($category->getAffectedProductIds())
-                    ->addAttributeToSelect('visibility')
-                    ->addAttributeToSelect('name')
-                    ->addAttributeToSelect('url_key')
-                    ->addAttributeToSelect('url_path');
-                foreach ($collection as $product) {
-                    $product->setStoreId($storeId);
-                    $product->setData('save_rewrites_history', $saveRewriteHistory);
-                    $mergeDataProvider->merge(
-                        $this->productUrlRewriteGenerator->generate($product, $category->getEntityId())
-                    );
-                }
-            } else {
+        if ($category->getChangedProductIds()) {
+            $this->isSkippedProduct = $category->getAffectedProductIds();
+            $collection = $this->productCollectionFactory->create()
+                ->setStoreId($storeId)
+                ->addIdFilter($category->getAffectedProductIds())
+                ->addAttributeToSelect('visibility')
+                ->addAttributeToSelect('name')
+                ->addAttributeToSelect('url_key')
+                ->addAttributeToSelect('url_path');
+            foreach ($collection as $product) {
+                $product->setStoreId($storeId);
+                $product->setData('save_rewrites_history', $saveRewriteHistory);
                 $mergeDataProvider->merge(
-                    $this->getCategoryProductsUrlRewrites(
-                        $category,
-                        $storeId,
-                        $saveRewriteHistory,
-                        $category->getEntityId()
-                    )
+                    $this->productUrlRewriteGenerator->generate($product, $category->getEntityId())
                 );
             }
+        } else {
+            $mergeDataProvider->merge(
+                $this->getCategoryProductsUrlRewrites(
+                    $category,
+                    $storeId,
+                    $saveRewriteHistory,
+                    $category->getEntityId()
+                )
+            );
         }
         foreach ($this->childrenCategoriesProvider->getChildren($category, true) as $childCategory) {
             $mergeDataProvider->merge(

app/code/Magento/CatalogUrlRewrite/Test/Unit/Observer/UrlRewriteHandlerTest.php

@@ -92,12 +92,12 @@ protected function setUp()
             ->setMethods(
                 [
                     'getAffectedProductIds',
+                    'getChangedProductIds',
                     'getData',
                     'getStoreId',
                     'getEntityId',
                     'getId',
                     'getProductCollection',
-                    'dataHasChangedFor'
                 ]
             )
             ->disableOriginalConstructor()
@@ -196,12 +196,12 @@ public function testGenerateProductUrlRewrites($affectedProductIds)
         $this->categoryMock->expects($this->once())
             ->method('getStoreId')
             ->willReturn($storeId);
-        $this->categoryMock->expects($this->atLeastOnce())
-            ->method('dataHasChangedFor')
-            ->willReturn('true');
         $this->categoryMock->expects($this->any())
             ->method('getAffectedProductIds')
             ->willReturn($affectedProductIds);
+        $this->categoryMock->expects($this->any())
+            ->method('getChangedProductIds')
+            ->willReturn($affectedProductIds);
         $this->categoryMock->expects($this->once())
             ->method('getEntityId')
             ->willReturn($categoryId);