PHP-CMSIG · alexander-schranz · Dec 18, 2024 · Nov 21, 2024 · Dec 13, 2024 · Dec 13, 2024
diff --git a/.examples/laravel/app/Search/BlogReindexProvider.php b/.examples/laravel/app/Search/BlogReindexProvider.php
@@ -4,6 +4,7 @@
 
 namespace App\Search;
 
+use CmsIg\Seal\Reindex\ReindexConfig;
 use CmsIg\Seal\Reindex\ReindexProviderInterface;
 
 class BlogReindexProvider implements ReindexProviderInterface
@@ -13,7 +14,7 @@ public function total(): int|null
         return 3;
     }
 
-    public function provide(): \Generator
+    public function provide(ReindexConfig $reindexConfig): \Generator
     {
         yield [
             'id' => 1,

diff --git a/.examples/mezzio/src/App/src/Search/BlogReindexProvider.php b/.examples/mezzio/src/App/src/Search/BlogReindexProvider.php
@@ -4,6 +4,7 @@
 
 namespace App\Search;
 
+use CmsIg\Seal\Reindex\ReindexConfig;
 use CmsIg\Seal\Reindex\ReindexProviderInterface;
 
 class BlogReindexProvider implements ReindexProviderInterface
@@ -13,7 +14,7 @@ public function total(): int|null
         return 3;
     }
 
-    public function provide(): \Generator
+    public function provide(ReindexConfig $reindexConfig): \Generator
     {
         yield [
             'id' => 1,

diff --git a/.examples/spiral/app/src/Search/BlogReindexProvider.php b/.examples/spiral/app/src/Search/BlogReindexProvider.php
@@ -4,6 +4,7 @@
 
 namespace App\Search;
 
+use CmsIg\Seal\Reindex\ReindexConfig;
 use CmsIg\Seal\Reindex\ReindexProviderInterface;
 
 class BlogReindexProvider implements ReindexProviderInterface
@@ -13,7 +14,7 @@ public function total(): int|null
         return 3;
     }
 
-    public function provide(): \Generator
+    public function provide(ReindexConfig $partialReindexConfig): \Generator
     {
         yield [
             'id' => 1,

diff --git a/.examples/symfony/src/Search/BlogReindexProvider.php b/.examples/symfony/src/Search/BlogReindexProvider.php
@@ -4,6 +4,7 @@
 
 namespace App\Search;
 
+use CmsIg\Seal\Reindex\ReindexConfig;
 use CmsIg\Seal\Reindex\ReindexProviderInterface;
 
 class BlogReindexProvider implements ReindexProviderInterface
@@ -13,7 +14,7 @@ public function total(): int|null
         return 3;
     }
 
-    public function provide(): \Generator
+    public function provide(ReindexConfig $reindexConfig): \Generator
     {
         yield [
             'id' => 1,

diff --git a/.examples/yii/src/Search/BlogReindexProvider.php b/.examples/yii/src/Search/BlogReindexProvider.php
@@ -4,6 +4,7 @@
 
 namespace App\Search;
 
+use CmsIg\Seal\Reindex\ReindexConfig;
 use CmsIg\Seal\Reindex\ReindexProviderInterface;
 
 class BlogReindexProvider implements ReindexProviderInterface
@@ -13,7 +14,7 @@ public function total(): int|null
         return 3;
     }
 
-    public function provide(): \Generator
+    public function provide(ReindexConfig $reindexConfig): \Generator
     {
         yield [
             'id' => 1,

diff --git a/integrations/laravel/src/Console/ReindexCommand.php b/integrations/laravel/src/Console/ReindexCommand.php
@@ -14,6 +14,7 @@
 namespace CmsIg\Seal\Integration\Laravel\Console;
 
 use CmsIg\Seal\EngineRegistry;
+use CmsIg\Seal\Reindex\ReindexConfig;
 use CmsIg\Seal\Reindex\ReindexProviderInterface;
 use Illuminate\Console\Command;
 
@@ -60,6 +61,11 @@ public function handle(
         /** @var int $bulkSize */
         $bulkSize = ((int) $this->option('bulk-size')) ?: 100;
 
+        $reindexConfig = ReindexConfig::create()
+            ->withIndex($indexName)
+            ->withBulkSize($bulkSize)
+            ->withDropIndex($drop);
+
         foreach ($engineRegistry->getEngines() as $name => $engine) {
             if ($engineName && $engineName !== $name) {
                 continue;
@@ -71,9 +77,7 @@ public function handle(
 
             $engine->reindex(
                 $this->reindexProviders,
-                $indexName,
-                $drop,
-                $bulkSize,
+                $reindexConfig,
                 function (string $index, int $count, int|null $total) use ($progressBar) {
                     if (null !== $total) {
                         $progressBar->setMaxSteps($total);

diff --git a/integrations/mezzio/src/Command/ReindexCommand.php b/integrations/mezzio/src/Command/ReindexCommand.php
@@ -14,6 +14,7 @@
 namespace CmsIg\Seal\Integration\Mezzio\Command;
 
 use CmsIg\Seal\EngineRegistry;
+use CmsIg\Seal\Reindex\ReindexConfig;
 use CmsIg\Seal\Reindex\ReindexProviderInterface;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
@@ -57,6 +58,11 @@ protected function execute(InputInterface $input, OutputInterface $output): int
         /** @var int $bulkSize */
         $bulkSize = ((int) $input->getOption('bulk-size')) ?: 100; // @phpstan-ignore-line
 
+        $reindexConfig = ReindexConfig::create()
+            ->withIndex($indexName)
+            ->withBulkSize($bulkSize)
+            ->withDropIndex($drop);
+
         foreach ($this->engineRegistry->getEngines() as $name => $engine) {
             if ($engineName && $engineName !== $name) {
                 continue;
@@ -68,9 +74,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 
             $engine->reindex(
                 $this->reindexProviders,
-                $indexName,
-                $drop,
-                $bulkSize,
+                $reindexConfig,
                 function (string $index, int $count, int|null $total) use ($progressBar) {
                     if (null !== $total) {
                         $progressBar->setMaxSteps($total);

diff --git a/integrations/spiral/src/Console/ReindexCommand.php b/integrations/spiral/src/Console/ReindexCommand.php
@@ -14,6 +14,7 @@
 namespace CmsIg\Seal\Integration\Spiral\Console;
 
 use CmsIg\Seal\EngineRegistry;
+use CmsIg\Seal\Reindex\ReindexConfig;
 use CmsIg\Seal\Reindex\ReindexProviderInterface;
 use Spiral\Console\Attribute\AsCommand;
 use Spiral\Console\Attribute\Option;
@@ -53,6 +54,11 @@ public function __construct(
     public function __invoke(
         EngineRegistry $engineRegistry,
     ): int {
+        $reindexConfig = ReindexConfig::create()
+            ->withIndex($this->indexName)
+            ->withBulkSize($this->bulkSize)
+            ->withDropIndex($this->drop);
+
         foreach ($engineRegistry->getEngines() as $name => $engine) {
             if ($this->engineName && $this->engineName !== $name) {
                 continue;
@@ -64,9 +70,7 @@ public function __invoke(
 
             $engine->reindex(
                 $this->reindexProviders,
-                $this->indexName,
-                $this->drop,
-                $this->bulkSize,
+                $reindexConfig,
                 function (string $index, int $count, int|null $total) use ($progressBar) {
                     if (null !== $total) {
                         $progressBar->setMaxSteps($total);

diff --git a/integrations/symfony/src/Command/ReindexCommand.php b/integrations/symfony/src/Command/ReindexCommand.php
@@ -14,6 +14,7 @@
 namespace CmsIg\Seal\Integration\Symfony\Command;
 
 use CmsIg\Seal\EngineRegistry;
+use CmsIg\Seal\Reindex\ReindexConfig;
 use CmsIg\Seal\Reindex\ReindexProviderInterface;
 use Symfony\Component\Console\Attribute\AsCommand;
 use Symfony\Component\Console\Command\Command;
@@ -43,7 +44,9 @@ protected function configure(): void
         $this->addOption('engine', null, InputOption::VALUE_REQUIRED, 'The name of the engine to create the schema for.');
         $this->addOption('index', null, InputOption::VALUE_REQUIRED, 'The name of the index to create the schema for.');
         $this->addOption('drop', null, InputOption::VALUE_NONE, 'Drop the index before reindexing.');
-        $this->addOption('bulk-size', null, InputOption::VALUE_REQUIRED, 'The bulk size for reindexing, defaults to 100.');
+        $this->addOption('bulk-size', null, InputOption::VALUE_REQUIRED, 'The bulk size for reindexing, defaults to 100.', 100);
+        $this->addOption('datetime-boundary', null, InputOption::VALUE_REQUIRED, 'Do a partial update and limit to only documents that have been changed since a given datetime object.');
+        $this->addOption('identifiers', null, InputOption::VALUE_REQUIRED, 'Do a partial update and limit to only a comma-separated list of identifiers.');
     }
 
     protected function execute(InputInterface $input, OutputInterface $output): int
@@ -56,7 +59,18 @@ protected function execute(InputInterface $input, OutputInterface $output): int
         /** @var bool $drop */
         $drop = $input->getOption('drop');
         /** @var int $bulkSize */
-        $bulkSize = ((int) $input->getOption('bulk-size')) ?: 100; // @phpstan-ignore-line
+        $bulkSize = $input->getOption('bulk-size');
+        /** @var \DateTimeImmutable|null $dateTimeBoundary */
+        $dateTimeBoundary = $input->getOption('datetime-boundary') ? new \DateTimeImmutable((string) $input->getOption('datetime-boundary')) : null; // @phpstan-ignore-line
+        /** @var array<string> $identifiers */
+        $identifiers = \explode(',', (string) $input->getOption('identifiers')); // @phpstan-ignore-line
+
+        $reindexConfig = ReindexConfig::create()
+            ->withIndex($indexName)
+            ->withBulkSize($bulkSize)
+            ->withDropIndex($drop)
+            ->withDateTimeBoundary($dateTimeBoundary)
+            ->withIdentifiers($identifiers);
 
         foreach ($this->engineRegistry->getEngines() as $name => $engine) {
             if ($engineName && $engineName !== $name) {
@@ -69,9 +83,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 
             $engine->reindex(
                 $this->reindexProviders,
-                $indexName,
-                $drop,
-                $bulkSize,
+                $reindexConfig,
                 function (string $index, int $count, int|null $total) use ($progressBar) {
                     if (null !== $total) {
                         $progressBar->setMaxSteps($total);

diff --git a/integrations/yii/src/Command/ReindexCommand.php b/integrations/yii/src/Command/ReindexCommand.php
@@ -14,6 +14,7 @@
 namespace CmsIg\Seal\Integration\Yii\Command;
 
 use CmsIg\Seal\EngineRegistry;
+use CmsIg\Seal\Reindex\ReindexConfig;
 use CmsIg\Seal\Reindex\ReindexProviderInterface;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
@@ -57,6 +58,11 @@ protected function execute(InputInterface $input, OutputInterface $output): int
         /** @var int $bulkSize */
         $bulkSize = ((int) $input->getOption('bulk-size')) ?: 100; // @phpstan-ignore-line
 
+        $reindexConfig = ReindexConfig::create()
+            ->withIndex($indexName)
+            ->withBulkSize($bulkSize)
+            ->withDropIndex($drop);
+
         foreach ($this->engineRegistry->getEngines() as $name => $engine) {
             if ($engineName && $engineName !== $name) {
                 continue;
@@ -68,9 +74,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 
             $engine->reindex(
                 $this->reindexProviders,
-                $indexName,
-                $drop,
-                $bulkSize,
+                $reindexConfig,
                 function (string $index, int $count, int|null $total) use ($progressBar) {
                     if (null !== $total) {
                         $progressBar->setMaxSteps($total);

diff --git a/packages/seal/src/Engine.php b/packages/seal/src/Engine.php
@@ -15,6 +15,7 @@
 
 use CmsIg\Seal\Adapter\AdapterInterface;
 use CmsIg\Seal\Exception\DocumentNotFoundException;
+use CmsIg\Seal\Reindex\ReindexConfig;
 use CmsIg\Seal\Reindex\ReindexProviderInterface;
 use CmsIg\Seal\Schema\Schema;
 use CmsIg\Seal\Search\Condition\IdentifierCondition;
@@ -134,9 +135,7 @@ public function dropSchema(array $options = []): TaskInterface|null
 
     public function reindex(
         iterable $reindexProviders,
-        string|null $index = null,
-        bool $dropIndex = false,
-        int $bulkSize = 100,
+        ReindexConfig $reindexConfig,
         callable|null $progressCallback = null,
     ): void {
         /** @var array<string, ReindexProviderInterface[]> $reindexProvidersPerIndex */
@@ -146,13 +145,13 @@ public function reindex(
                 continue;
             }
 
-            if ($reindexProvider::getIndex() === $index || null === $index) {
+            if ($reindexProvider::getIndex() === $reindexConfig->getIndex() || null === $reindexConfig->getIndex()) {
                 $reindexProvidersPerIndex[$reindexProvider::getIndex()][] = $reindexProvider;
             }
         }
 
         foreach ($reindexProvidersPerIndex as $index => $reindexProviders) {
-            if ($dropIndex && $this->existIndex($index)) {
+            if ($reindexConfig->shouldDropIndex() && $this->existIndex($index)) {
                 $task = $this->dropIndex($index, ['return_slow_promise_result' => true]);
                 $task->wait();
                 $task = $this->createIndex($index, ['return_slow_promise_result' => true]);
@@ -165,18 +164,18 @@ public function reindex(
             foreach ($reindexProviders as $reindexProvider) {
                 $this->bulk(
                     $index,
-                    (function () use ($index, $reindexProvider, $bulkSize, $progressCallback) {
+                    (function () use ($index, $reindexProvider, $reindexConfig, $progressCallback) {
                         $count = 0;
                         $total = $reindexProvider->total();
 
                         $lastCount = -1;
-                        foreach ($reindexProvider->provide() as $document) {
+                        foreach ($reindexProvider->provide($reindexConfig) as $document) {
                             ++$count;
 
                             yield $document;
 
                             if (null !== $progressCallback
-                                && 0 === ($count % $bulkSize)
+                                && 0 === ($count % $reindexConfig->getBulkSize())
                             ) {
                                 $lastCount = $count;
                                 $progressCallback($index, $count, $total);
@@ -190,7 +189,7 @@ public function reindex(
                         }
                     })(),
                     [],
-                    $bulkSize,
+                    $reindexConfig->getBulkSize(),
                 );
             }
         }

diff --git a/packages/seal/src/EngineInterface.php b/packages/seal/src/EngineInterface.php
@@ -14,6 +14,7 @@
 namespace CmsIg\Seal;
 
 use CmsIg\Seal\Exception\DocumentNotFoundException;
+use CmsIg\Seal\Reindex\ReindexConfig;
 use CmsIg\Seal\Reindex\ReindexProviderInterface;
 use CmsIg\Seal\Search\SearchBuilder;
 use CmsIg\Seal\Task\TaskInterface;
@@ -92,9 +93,7 @@ public function dropSchema(array $options = []): TaskInterface|null;
      */
     public function reindex(
         iterable $reindexProviders,
-        string|null $index = null,
-        bool $dropIndex = false,
-        int $bulkSize = 100,
+        ReindexConfig $reindexConfig,
         callable|null $progressCallback = null,
     ): void;
 }