NGSTACK-836 add parent child indexing compiler pass

netgen · Mar 25, 2024 · 0aaa15b · 0aaa15b
1 parent ad0b014
commit 0aaa15b
Show file tree

Hide file tree

Showing 9 changed files with 63 additions and 31 deletions.
diff --git a/bundle/DependencyInjection/NetgenIbexaSearchExtraExtension.php b/bundle/DependencyInjection/NetgenIbexaSearchExtraExtension.php
@@ -88,6 +88,7 @@ private function processExtensionConfiguration(array $configs, ContainerBuilder
         $this->processIndexableFieldTypeConfiguration($configuration, $container);
         $this->processSearchResultExtractorConfiguration($configuration, $container);
         $this->processAsynchronousIndexingConfiguration($configuration, $container);
+        $this->processParentChildIndexingConfiguration($configuration, $container);
     }
 
     private function processSearchResultExtractorConfiguration(array $configuration, ContainerBuilder $container): void
@@ -117,4 +118,12 @@ private function processAsynchronousIndexingConfiguration(array $configuration,
             $configuration['use_asynchronous_indexing'],
         );
     }
+
+    private function processParentChildIndexingConfiguration(array $configuration, ContainerBuilder $container): void
+    {
+        $container->setParameter(
+            'netgen_ibexa_search_extra.use_parent_child_indexing',
+            $configuration['use_parent_child_indexing'],
+        );
+    }
 }
diff --git a/bundle/NetgenIbexaSearchExtraBundle.php b/bundle/NetgenIbexaSearchExtraBundle.php
@@ -5,6 +5,7 @@
 namespace Netgen\Bundle\IbexaSearchExtraBundle;
 
 use Netgen\IbexaSearchExtra\Container\Compiler;
+use Symfony\Component\DependencyInjection\Compiler\PassConfig;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\HttpKernel\Bundle\Bundle;
 
@@ -21,6 +22,7 @@ public function build(ContainerBuilder $container): void
         $container->addCompilerPass(new Compiler\AggregateFacetBuilderVisitorPass());
         $container->addCompilerPass(new Compiler\AggregateSubdocumentQueryCriterionVisitorPass());
         $container->addCompilerPass(new Compiler\AsynchronousIndexingPass());
+        $container->addCompilerPass(new Compiler\ParentChildIndexingPass(), PassConfig::TYPE_BEFORE_OPTIMIZATION, 100);
         $container->addCompilerPass(new Compiler\FieldType\RichTextIndexablePass());
         $container->addCompilerPass(new Compiler\SearchResultExtractorPass());
         $container->addCompilerPass(new Compiler\RawFacetBuilderDomainVisitorPass());

diff --git a/lib/Container/Compiler/ParentChildIndexingPass.php b/lib/Container/Compiler/ParentChildIndexingPass.php
@@ -0,0 +1,31 @@
+<?php
+
+namespace Netgen\IbexaSearchExtra\Container\Compiler;
+
+use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+
+class ParentChildIndexingPass implements CompilerPassInterface
+{
+    private const ParentChildIndexerTag = 'netgen.parent_child_indexer.message_handler';
+    private const MessageHandlerTag = 'messenger.message_handler';
+
+    public function process(ContainerBuilder $container) :void
+    {
+        $useParentChildIndexing = $container->getParameter(
+            'netgen_ibexa_search_extra.use_parent_child_indexing',
+        );
+
+        if ($useParentChildIndexing !== true) {
+            return;
+        }
+
+        $serviceIds =$container->findTaggedServiceIds(self::ParentChildIndexerTag);
+
+        foreach ($serviceIds as $serviceId => $tag) {
+            $definition = $container->getDefinition($serviceId);
+            $definition->addTag(self::MessageHandlerTag);
+        }
+
+    }
+}
diff --git a/lib/Resources/config/search/common/parent_child_indexing.yaml b/lib/Resources/config/search/common/parent_child_indexing.yaml
@@ -7,14 +7,4 @@ imports:
     - { resource: parent_child_indexing/trash.yaml }
 
 parameters:
-    netgen.ibexa_search_extra.parent_child_indexer:
-        parent_content:
-            children:
-                child_content:
-                    indexed: true
-                    children:
-                        child_content:
-                            indexed: true
-                            children:
-                                child_content:
-                                    indexed: true
+    netgen.ibexa_search_extra.parent_child_indexer: []
diff --git a/lib/Resources/config/search/common/parent_child_indexing/content.yaml b/lib/Resources/config/search/common/parent_child_indexing/content.yaml
@@ -4,15 +4,15 @@ services:
             - '@Ibexa\Contracts\Core\Persistence\Content\Location\Handler'
             - '@Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\ParentChildIndexing\AncestorIndexer'
         tags:
-            - { name: messenger.message_handler }
+            - { name: netgen.parent_child_indexer.message_handler }
 
     Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\ParentChildIndexing\Content\DeleteContentHandler:
         arguments:
             - '@Ibexa\Contracts\Core\Persistence\Content\Location\Handler'
             - '@Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\ParentChildIndexing\AncestorIndexer'
             - '@?logger'
         tags:
-            - { name: messenger.message_handler }
+            - { name: netgen.parent_child_indexer.message_handler }
             - { name: monolog.logger, channel: ngsearchextra }
 
     Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\ParentChildIndexing\Content\DeleteTranslationHandler:
@@ -22,29 +22,29 @@ services:
             - '@Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\ParentChildIndexing\AncestorIndexer'
             - '@?logger'
         tags:
-            - { name: messenger.message_handler }
+            - { name: netgen.parent_child_indexer.message_handler }
             - { name: monolog.logger, channel: ngsearchextra }
 
     Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\ParentChildIndexing\Content\HideContentHandler:
         arguments:
             - '@Ibexa\Contracts\Core\Persistence\Content\Location\Handler'
             - '@Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\ParentChildIndexing\AncestorIndexer'
         tags:
-            - { name: messenger.message_handler }
+            - { name: netgen.parent_child_indexer.message_handler }
 
     Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\ParentChildIndexing\Content\PublishVersionHandler:
         arguments:
             - '@Ibexa\Contracts\Core\Persistence\Content\Location\Handler'
             - '@Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\ParentChildIndexing\AncestorIndexer'
         tags:
-            - { name: messenger.message_handler }
+            - { name: netgen.parent_child_indexer.message_handler }
 
     Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\ParentChildIndexing\Content\RevealContentHandler:
         arguments:
             - '@Ibexa\Contracts\Core\Persistence\Content\Location\Handler'
             - '@Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\ParentChildIndexing\AncestorIndexer'
         tags:
-            - { name: messenger.message_handler }
+            - { name: netgen.parent_child_indexer.message_handler }
 
     Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\ParentChildIndexing\Content\UpdateContentMetadataHandler:
         arguments:
@@ -53,5 +53,5 @@ services:
             - '@Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\ParentChildIndexing\AncestorIndexer'
             - '@?logger'
         tags:
-            - { name: messenger.message_handler }
+            - { name: netgen.parent_child_indexer.message_handler }
             - { name: monolog.logger, channel: ngsearchextra }
diff --git a/lib/Resources/config/search/common/parent_child_indexing/location.yaml b/lib/Resources/config/search/common/parent_child_indexing/location.yaml
@@ -5,7 +5,7 @@ services:
             - '@Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\ParentChildIndexing\AncestorIndexer'
             - '@?logger'
         tags:
-            - { name: messenger.message_handler }
+            - { name: netgen.parent_child_indexer.message_handler }
             - { name: monolog.logger, channel: ngsearchextra }
 
     Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\ParentChildIndexing\Location\CopySubtreeHandler:
@@ -14,7 +14,7 @@ services:
             - '@Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\ParentChildIndexing\AncestorIndexer'
             - '@?logger'
         tags:
-            - { name: messenger.message_handler }
+            - { name: netgen.parent_child_indexer.message_handler }
             - { name: monolog.logger, channel: ngsearchextra }
 
     Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\ParentChildIndexing\Location\CreateLocationHandler:
@@ -23,7 +23,7 @@ services:
             - '@Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\ParentChildIndexing\AncestorIndexer'
             - '@?logger'
         tags:
-            - { name: messenger.message_handler }
+            - { name: netgen.parent_child_indexer.message_handler }
             - { name: monolog.logger, channel: ngsearchextra }
 
     Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\ParentChildIndexing\Location\DeleteLocationHandler:
@@ -32,7 +32,7 @@ services:
             - '@Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\ParentChildIndexing\AncestorIndexer'
             - '@?logger'
         tags:
-            - { name: messenger.message_handler }
+            - { name: netgen.parent_child_indexer.message_handler }
             - { name: monolog.logger, channel: ngsearchextra }
 
     Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\ParentChildIndexing\Location\HideLocationHandler:
@@ -41,7 +41,7 @@ services:
             - '@Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\ParentChildIndexing\AncestorIndexer'
             - '@?logger'
         tags:
-            - { name: messenger.message_handler }
+            - { name: netgen.parent_child_indexer.message_handler }
             - { name: monolog.logger, channel: ngsearchextra }
 
     Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\ParentChildIndexing\Location\MoveSubtreeHandler:
@@ -50,7 +50,7 @@ services:
             - '@Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\ParentChildIndexing\AncestorIndexer'
             - '@?logger'
         tags:
-            - { name: messenger.message_handler }
+            - { name: netgen.parent_child_indexer.message_handler }
             - { name: monolog.logger, channel: ngsearchextra }
 
     Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\ParentChildIndexing\Location\SwapLocationHandler:
@@ -59,7 +59,7 @@ services:
             - '@Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\ParentChildIndexing\AncestorIndexer'
             - '@?logger'
         tags:
-            - { name: messenger.message_handler }
+            - { name: netgen.parent_child_indexer.message_handler }
             - { name: monolog.logger, channel: ngsearchextra }
 
     Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\ParentChildIndexing\Location\UnhideLocationHandler:
@@ -68,7 +68,7 @@ services:
             - '@Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\ParentChildIndexing\AncestorIndexer'
             - '@?logger'
         tags:
-            - { name: messenger.message_handler }
+            - { name: netgen.parent_child_indexer.message_handler }
             - { name: monolog.logger, channel: ngsearchextra }
 
     Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\ParentChildIndexing\Location\UpdateLocationHandler:
@@ -77,5 +77,5 @@ services:
             - '@Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\ParentChildIndexing\AncestorIndexer'
             - '@?logger'
         tags:
-            - { name: messenger.message_handler }
+            - { name: netgen.parent_child_indexer.message_handler }
             - { name: monolog.logger, channel: ngsearchextra }
diff --git a/lib/Resources/config/search/common/parent_child_indexing/object_state.yaml b/lib/Resources/config/search/common/parent_child_indexing/object_state.yaml
@@ -4,4 +4,4 @@ services:
             - '@Ibexa\Contracts\Core\Persistence\Content\Location\Handler'
             - '@Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\ParentChildIndexing\AncestorIndexer'
         tags:
-            - { name: messenger.message_handler }
+            - { name: netgen.parent_child_indexer.message_handler }
diff --git a/lib/Resources/config/search/common/parent_child_indexing/section.yaml b/lib/Resources/config/search/common/parent_child_indexing/section.yaml
@@ -4,4 +4,4 @@ services:
             - '@Ibexa\Contracts\Core\Persistence\Content\Location\Handler'
             - '@Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\ParentChildIndexing\AncestorIndexer'
         tags:
-            - { name: messenger.message_handler }
+            - { name: netgen.parent_child_indexer.message_handler }
diff --git a/lib/Resources/config/search/common/parent_child_indexing/trash.yaml b/lib/Resources/config/search/common/parent_child_indexing/trash.yaml
@@ -5,7 +5,7 @@ services:
             - '@Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\ParentChildIndexing\AncestorIndexer'
             - '@?logger'
         tags:
-            - { name: messenger.message_handler }
+            - { name: netgen.parent_child_indexer.message_handler }
             - { name: monolog.logger, channel: ngsearchextra }
 
     Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\ParentChildIndexing\Trash\TrashHandler:
@@ -14,5 +14,5 @@ services:
             - '@Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\ParentChildIndexing\AncestorIndexer'
             - '@?logger'
         tags:
-            - { name: messenger.message_handler }
+            - { name: netgen.parent_child_indexer.message_handler }
             - { name: monolog.logger, channel: ngsearchextra }