ACPT-757: Fix Deadlock in Magento\UrlRewrite\Model\Storage\DbStorage

2: No longer deleting rows that we are just going to insert back in.
Using upsert instead of insert.  (unique key is (`request_path`,`store_id`))

Author: JacobBrownAustin

app/code/Magento/UrlRewrite/Model/Storage/DbStorage.php

@@ -222,30 +222,26 @@ private function deleteOldUrls(array $urls): void
         $oldUrlsSelect->from(
             $this->resource->getTableName(self::TABLE_NAME)
         );
-
         $uniqueEntities = $this->prepareUniqueEntities($urls);
         foreach ($uniqueEntities as $storeId => $entityTypes) {
             foreach ($entityTypes as $entityType => $entities) {
                 $oldUrlsSelect->orWhere(
-                    $this->connection->quoteIdentifier(
-                        UrlRewrite::STORE_ID
-                    ) . ' = ' . $this->connection->quote($storeId, 'INTEGER') .
-                    ' AND ' . $this->connection->quoteIdentifier(
-                        UrlRewrite::ENTITY_ID
-                    ) . ' IN (' . $this->connection->quote($entities, 'INTEGER') . ')' .
-                    ' AND ' . $this->connection->quoteIdentifier(
-                        UrlRewrite::ENTITY_TYPE
-                    ) . ' = ' . $this->connection->quote($entityType)
+                    $this->connection->quoteIdentifier(UrlRewrite::STORE_ID)
+                    . ' = ' . $this->connection->quote($storeId, 'INTEGER') .
+                    ' AND ' . $this->connection->quoteIdentifier(UrlRewrite::ENTITY_ID)
+                    . ' IN (' . $this->connection->quote(array_keys($entities), 'INTEGER') . ')' .
+                    ' AND ' . $this->connection->quoteIdentifier(UrlRewrite::ENTITY_TYPE)
+                    . ' = ' . $this->connection->quote($entityType) .
+                    ' AND ' . $this->connection->quoteIdentifier(UrlRewrite::REQUEST_PATH)
+                    . ' NOT IN (' . $this->connection->quote(array_merge(...$entities)) . ')'
                 );
             }
         }
-
         // prevent query locking in a case when nothing to delete
         $checkOldUrlsSelect = clone $oldUrlsSelect;
         $checkOldUrlsSelect->reset(Select::COLUMNS);
         $checkOldUrlsSelect->columns('count(*)');
         $hasOldUrls = (bool)$this->connection->fetchOne($checkOldUrlsSelect);
-
         if ($hasOldUrls) {
             $this->connection->query(
                 $oldUrlsSelect->deleteFromSelect(
@@ -264,17 +260,9 @@ private function deleteOldUrls(array $urls): void
     private function prepareUniqueEntities(array $urls): array
     {
         $uniqueEntities = [];
-        /** @var UrlRewrite $url */
         foreach ($urls as $url) {
-            $entityIds = (!empty($uniqueEntities[$url->getStoreId()][$url->getEntityType()])) ?
-                $uniqueEntities[$url->getStoreId()][$url->getEntityType()] : [];
-
-            if (!\in_array($url->getEntityId(), $entityIds)) {
-                $entityIds[] = $url->getEntityId();
-            }
-            $uniqueEntities[$url->getStoreId()][$url->getEntityType()] = $entityIds;
+            $uniqueEntities[$url->getStoreId()][$url->getEntityType()][$url->getEntityId()][] = $url->getRequestPath();
         }
-
         return $uniqueEntities;
     }
 
@@ -291,7 +279,7 @@ protected function doReplace(array $urls): array
                 foreach ($urls as $url) {
                     $data[] = $url->toArray();
                 }
-                $this->insertMultiple($data);
+                $this->upsertMultiple($data);
                 $this->connection->commit();
             } catch (\Magento\Framework\DB\Adapter\DeadlockException $deadlockException) {
                 continue;
@@ -336,6 +324,8 @@ protected function doReplace(array $urls): array
      * @return void
      * @throws \Magento\Framework\Exception\AlreadyExistsException|\Exception
      * @throws \Exception
+     * @deprecated Not used anymore.
+     * @see upsertMultiple
      */
     protected function insertMultiple($data): void
     {
@@ -354,6 +344,17 @@ protected function insertMultiple($data): void
         }
     }
 
+    /**
+     * Upsert multiple
+     *
+     * @param  array $data
+     * @return void
+     */
+    private function upsertMultiple(array $data): void
+    {
+        $this->connection->insertOnDuplicate($this->resource->getTableName(self::TABLE_NAME), $data);
+    }
+
     /**
      * Get filter for url rows deletion due to provided urls
      *