Move Resaving completely into queue + 10k batching.

internetztube · Jun 18, 2024 · d072254 · d072254
1 parent 5fcab74
commit d072254
Show file tree

Hide file tree

Showing 5 changed files with 69 additions and 40 deletions.
diff --git a/src/ElementRelations.php b/src/ElementRelations.php
@@ -12,7 +12,7 @@
 use craft\services\Plugins;
 use craft\services\Utilities;
 use internetztube\elementRelations\fields\ElementRelationsField;
-use internetztube\elementRelations\jobs\ResaveAllElementRelationsJob;
+use internetztube\elementRelations\jobs\GenerateResaveAllElementRelationsJobsJob;
 use internetztube\elementRelations\jobs\ResaveSingleElementRelations;
 use internetztube\elementRelations\models\Settings;
 use internetztube\elementRelations\services\CacheService;
@@ -66,7 +66,7 @@ public function init()
             if (!($event->plugin instanceof ElementRelations)) {
                 return;
             }
-            Craft::$app->getQueue()->priority(1021)->push(new ResaveAllElementRelationsJob);
+            Craft::$app->getQueue()->priority(1021)->push(new GenerateResaveAllElementRelationsJobsJob());
         };
         Event::on(Plugins::class, Plugins::EVENT_AFTER_ENABLE_PLUGIN, $pluginEnableCallback);
         Event::on(Plugins::class, Plugins::EVENT_AFTER_INSTALL_PLUGIN, $pluginEnableCallback);

diff --git a/src/console/controllers/ResaveRelationsController.php b/src/console/controllers/ResaveRelationsController.php
@@ -11,43 +11,23 @@
 use craft\db\Table;
 use craft\elements\db\ElementQuery;
 use craft\elements\db\ElementQueryInterface;
+use craft\helpers\Db;
 use Illuminate\Support\Collection;
-use internetztube\elementRelations\jobs\ResaveAllElementRelationsJob;
-use internetztube\elementRelations\services\ResaveRelationsService;
+use internetztube\elementRelations\jobs\GenerateResaveAllElementRelationsJobsJob;
+use internetztube\elementRelations\jobs\ResaveMultipleElementRelationsJob;
 use yii\console\ExitCode;
 
 /**
  * Resave Relations controller
  */
 class ResaveRelationsController extends Controller
 {
-    public bool $queue = false;
-
-    public function options($actionID): array
-    {
-        $options = parent::options($actionID);
-        $options[] = "queue";
-        return $options;
-    }
-
-    /**
-     * element-relations/resave-relations command
-     */
     public function actionIndex(): int
     {
-        if ($this->queue) {
-            $job = new ResaveAllElementRelationsJob();
-            Craft::$app->getQueue()->priority(1022)->push($job);
-            $this->stdout("Pushed Job into Queue." . PHP_EOL);
-        } else {
-            $this->stdout("Find all elements ..." . PHP_EOL);
-
-            ResaveRelationsService::resave(function (int $index, int $totalCount, string $elementType) {
-                $message = sprintf("%3s%% - %5s / %5s - %20s", (int) ($index * 100 / $totalCount), $index, $totalCount, $elementType);
-                $this->stdout($message . PHP_EOL);
-            });
-        }
 
+        $job = new GenerateResaveAllElementRelationsJobsJob();
+        Craft::$app->getQueue()->priority(1022)->push($job);
+        $this->stdout("Pushed Job into Queue." . PHP_EOL);
         return ExitCode::OK;
     }
 }
diff --git a/src/jobs/GenerateResaveAllElementRelationsJobsJob.php b/src/jobs/GenerateResaveAllElementRelationsJobsJob.php
@@ -0,0 +1,47 @@
+<?php
+
+namespace internetztube\elementRelations\jobs;
+
+use Craft;
+use craft\db\Query;
+use craft\db\Table;
+use craft\helpers\Db;
+use craft\queue\BaseJob;
+
+/**
+ * Resave Element Relations Job queue job
+ */
+class GenerateResaveAllElementRelationsJobsJob extends BaseJob
+{
+    function execute($queue): void
+    {
+        $query = (new Query())
+            ->select([
+                'elements_sites.elementId',
+                'elements_sites.siteId',
+                'elements.type'
+            ])
+            ->from(['elements_sites' => Table::ELEMENTS_SITES])
+            ->innerJoin(['elements' => Table::ELEMENTS], "[[elements.id]] = [[elements_sites.elementId]]")
+            ->where(['is', 'elements.dateDeleted', null]);
+
+        $batchSize = 10000;
+        $totalCount = $query->count();
+        $totalBatches = ceil($totalCount / $batchSize);
+        $index = 0;
+
+        foreach (Db::batch($query, $batchSize) as $batch) {
+            $index += 1;
+            $job = new ResaveAllElementRelationsJob([
+                'batch' => $batch,
+                'description' => "Resave All Element Relations ($index/$totalBatches)"
+            ]);
+            Craft::$app->getQueue()->push($job);
+            $this->setProgress($queue, $index / $totalBatches, "$index/$totalBatches");
+        }
+    }
+    protected function defaultDescription(): ?string
+    {
+        return "Generate Resave All Element Relations Jobs";
+    }
+}
diff --git a/src/jobs/ResaveAllElementRelationsJob.php b/src/jobs/ResaveAllElementRelationsJob.php
@@ -3,22 +3,24 @@
 namespace internetztube\elementRelations\jobs;
 
 use Craft;
+use craft\helpers\Db;
 use craft\queue\BaseJob;
-use internetztube\elementRelations\services\ResaveRelationsService;
+use internetztube\elementRelations\services\ExtractorService;
 
-/**
- * Resave Element Relations Job queue job
- */
 class ResaveAllElementRelationsJob extends BaseJob
 {
+    public array $batch;
+
     function execute($queue): void
     {
-        ResaveRelationsService::resave(function (int $index, int $totalCount, string $elementType) use ($queue) {
+        $totalCount = count($this->batch);
+        foreach ($this->batch as $index => $row) {
+            $element = \Craft::$app->getElements()->getElementById($row['elementId'], trim($row['type']), $row['siteId']);
             $this->setProgress($queue, $index / $totalCount, "$index/$totalCount");
-        });
-    }
-    protected function defaultDescription(): ?string
-    {
-        return "Resave All Element Relations";
+            if (!$element) {
+                continue;
+            }
+            ExtractorService::refreshRelationsForElement($element);
+        }
     }
 }
diff --git a/src/utilities/ElementRelationsUtility.php b/src/utilities/ElementRelationsUtility.php
@@ -4,7 +4,7 @@
 
 use Craft;
 use craft\base\Utility;
-use internetztube\elementRelations\jobs\ResaveAllElementRelationsJob;
+use internetztube\elementRelations\jobs\GenerateResaveAllElementRelationsJobsJob;
 
 /**
  * Element Relations utility
@@ -30,7 +30,7 @@ static function contentHtml(): string
     {
         $pushed = false;
         if (Craft::$app->request->getIsPost()) {
-            Craft::$app->getQueue()->push(new ResaveAllElementRelationsJob());
+            Craft::$app->getQueue()->push(new GenerateResaveAllElementRelationsJobsJob());
             $pushed = true;
         }
         return Craft::$app->getView()->renderTemplate("element-relations/_utility", ["pushed" => $pushed]);