NEXT-22163 - Optimize Taskhandler delete queries

fixes shopware#2565
pweyck · Jul 11, 2022 · 64ede82 · 64ede82
1 parent bb28a53
commit 64ede82
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 14 deletions.
diff --git a/changelog/_unreleased/2022-06-24-optimize-delete-queries.md b/changelog/_unreleased/2022-06-24-optimize-delete-queries.md
@@ -0,0 +1,9 @@
+---
+title: Optimize Delete queries on cart and version tables
+issue: Issue-2532
+author: Micha Hobert
+author_email: [email protected]
+author_github: Isengo1989
+---
+# Core
+* Adding a do-while loop and limit to the `DELETE` query in `CleanupCartTaskHandler` and `CleanupVersionTaskHandler` to 1000 entries. This is necessary when a scheduled task failed / was inactive for some time
diff --git a/src/Core/Checkout/Cart/Cleanup/CleanupCartTaskHandler.php b/src/Core/Checkout/Cart/Cleanup/CleanupCartTaskHandler.php
@@ -36,13 +36,15 @@ public function run(): void
         $time = new \DateTime();
         $time->modify(sprintf('-%s day', $this->days));
 
-        $this->connection->executeStatement(
-            <<<'SQL'
+        do {
+            $result = $this->connection->executeStatement(
+                <<<'SQL'
                 DELETE FROM cart
                     WHERE (updated_at IS NULL AND created_at <= :timestamp)
-                        OR (updated_at IS NOT NULL AND updated_at <= :timestamp);
+                        OR (updated_at IS NOT NULL AND updated_at <= :timestamp) LIMIT 1000;
             SQL,
-            ['timestamp' => $time->format(Defaults::STORAGE_DATE_TIME_FORMAT)]
-        );
+                ['timestamp' => $time->format(Defaults::STORAGE_DATE_TIME_FORMAT)]
+            );
+        } while ($result > 0);
     }
 }
diff --git a/src/Core/Framework/DataAbstractionLayer/Version/Cleanup/CleanupVersionTaskHandler.php b/src/Core/Framework/DataAbstractionLayer/Version/Cleanup/CleanupVersionTaskHandler.php
@@ -36,14 +36,18 @@ public function run(): void
         $time = new \DateTime();
         $time->modify(sprintf('-%s day', $this->days));
 
-        $this->connection->executeStatement(
-            'DELETE FROM version WHERE created_at <= :timestamp',
-            ['timestamp' => $time->format(Defaults::STORAGE_DATE_TIME_FORMAT)]
-        );
-
-        $this->connection->executeStatement(
-            'DELETE FROM version_commit WHERE created_at <= :timestamp',
-            ['timestamp' => $time->format(Defaults::STORAGE_DATE_TIME_FORMAT)]
-        );
+        do {
+            $result = $this->connection->executeStatement(
+                'DELETE FROM version WHERE created_at <= :timestamp LIMIT 1000',
+                ['timestamp' => $time->format(Defaults::STORAGE_DATE_TIME_FORMAT)]
+            );
+        } while ($result > 0);
+
+        do {
+            $result = $this->connection->executeStatement(
+                'DELETE FROM version_commit WHERE created_at <= :timestamp LIMIT 1000',
+                ['timestamp' => $time->format(Defaults::STORAGE_DATE_TIME_FORMAT)]
+            );
+        } while ($result > 0);
     }
 }