Merge branch 'master' into settings-use-presets

Author: kdambekalns

…mand/NodeIndexQueueCommandController.php …mand/NodeIndexQueueCommandController.phpClasses/Flowpack/ElasticSearch/ContentRepositoryQueueIndexer/Command/NodeIndexQueueCommandController.php renamed to Classes/Command/NodeIndexQueueCommandController.php Classes/Flowpack/ElasticSearch/ContentRepositoryQueueIndexer/Command/NodeIndexQueueCommandController.php renamed to Classes/Command/NodeIndexQueueCommandController.php

@@ -9,6 +9,8 @@
 use Flowpack\ElasticSearch\ContentRepositoryQueueIndexer\UpdateAliasJob;
 use Flowpack\JobQueue\Common\Job\JobManager;
 use Flowpack\JobQueue\Common\Queue\QueueManager;
+use Flowpack\ElasticSearch\Domain\Model\Mapping;
+use Flowpack\JobQueue\Common\Exception as JobQueueException;
 use Neos\Flow\Annotations as Flow;
 use Neos\Flow\Cli\CommandController;
 use Neos\Flow\Persistence\PersistenceManagerInterface;
@@ -26,6 +28,7 @@ class NodeIndexQueueCommandController extends CommandController
 
     const BATCH_QUEUE_NAME = 'Flowpack.ElasticSearch.ContentRepositoryQueueIndexer';
     const LIVE_QUEUE_NAME = 'Flowpack.ElasticSearch.ContentRepositoryQueueIndexer.Live';
+    const DEFAULT_BATCH_SIZE = 500;
 
     /**
      * @var JobManager
@@ -69,6 +72,12 @@ class NodeIndexQueueCommandController extends CommandController
      */
     protected $nodeIndexer;
 
+    /**
+     * @Flow\InjectConfiguration(package="Flowpack.ElasticSearch.ContentRepositoryQueueIndexer")
+     * @var array
+     */
+    protected $settings;
+
     /**
      * Index all nodes by creating a new index and when everything was completed, switch the index alias.
      *
@@ -210,7 +219,7 @@ protected function indexWorkspace($workspaceName, $indexPostfix)
         $this->outputLine('<info>++</info> Indexing %s workspace', [$workspaceName]);
         $nodeCounter = 0;
         $offset = 0;
-        $batchSize = 500;
+        $batchSize = $this->settings['batchSize'] ?? static::DEFAULT_BATCH_SIZE;
         while (true) {
             $iterator = $this->nodeDataRepository->findAllBySiteAndWorkspace($workspaceName, $offset, $batchSize);
 

…Domain/Repository/NodeDataRepository.php …Domain/Repository/NodeDataRepository.phpClasses/Flowpack/ElasticSearch/ContentRepositoryQueueIndexer/Domain/Repository/NodeDataRepository.php renamed to Classes/Domain/Repository/NodeDataRepository.php Classes/Flowpack/ElasticSearch/ContentRepositoryQueueIndexer/Domain/Repository/NodeDataRepository.php renamed to Classes/Domain/Repository/NodeDataRepository.php

@@ -34,7 +34,7 @@ class NodeIndexer extends ContentRepositoryAdaptor\Indexer\NodeIndexer
 
     /**
      * @param NodeInterface $node
-     * @param string|null $targetWorkspaceName
+     * @param string|null $targetWorkspaceName In case indexing is triggered during publishing, a target workspace name will be passed in
      */
     public function indexNode(NodeInterface $node, $targetWorkspaceName = null)
     {

…toryQueueIndexer/Indexer/NodeIndexer.php Classes/Indexer/NodeIndexer.phpClasses/Flowpack/ElasticSearch/ContentRepositoryQueueIndexer/Indexer/NodeIndexer.php renamed to Classes/Indexer/NodeIndexer.php Classes/Flowpack/ElasticSearch/ContentRepositoryQueueIndexer/Indexer/NodeIndexer.php renamed to Classes/Indexer/NodeIndexer.php

@@ -6,8 +6,8 @@
 use Flowpack\JobQueue\Common\Job\JobInterface;
 use Flowpack\JobQueue\Common\Queue\Message;
 use Flowpack\JobQueue\Common\Queue\QueueInterface;
+use Neos\ContentRepository\Domain\Model\NodeData;
 use Neos\Flow\Annotations as Flow;
-use Neos\Flow\Log\SystemLoggerInterface;
 use Neos\Flow\Utility\Algorithms;
 use Neos\ContentRepository\Domain\Factory\NodeFactory;
 use Neos\ContentRepository\Domain\Model\NodeInterface;
@@ -52,7 +52,7 @@ class IndexingJob implements JobInterface
     /**
      * @var string
      */
-    protected $workspaceName;
+    protected $targetWorkspaceName;
 
     /**
      * @var string
@@ -66,13 +66,13 @@ class IndexingJob implements JobInterface
 
     /**
      * @param string $indexPostfix
-     * @param string $workspaceName
+     * @param string $targetWorkspaceName In case indexing is triggered during publishing, a target workspace name will be passed in
      * @param array $nodes
      */
-    public function __construct($indexPostfix, $workspaceName, array $nodes)
+    public function __construct($indexPostfix, $targetWorkspaceName, array $nodes)
     {
         $this->identifier = Algorithms::generateRandomString(24);
-        $this->workspaceName = $workspaceName;
+        $this->targetWorkspaceName = $targetWorkspaceName;
         $this->indexPostfix = $indexPostfix;
         $this->nodes = $nodes;
     }
@@ -94,7 +94,7 @@ public function execute(QueueInterface $queue, Message $message)
                 /** @var NodeData $nodeData */
                 $nodeData = $this->nodeDataRepository->findByIdentifier($node['nodeIdentifier']);
                 $context = $this->contextFactory->create([
-                    'workspaceName' => $this->workspaceName,
+                    'workspaceName' => $this->targetWorkspaceName ?: $nodeData->getWorkspace()->getName(),
                     'invisibleContentShown' => true,
                     'inaccessibleContentShown' => false,
                     'dimensions' => $node['dimensions']

…ntRepositoryQueueIndexer/IndexingJob.php Classes/IndexingJob.phpClasses/Flowpack/ElasticSearch/ContentRepositoryQueueIndexer/IndexingJob.php renamed to Classes/IndexingJob.php Classes/Flowpack/ElasticSearch/ContentRepositoryQueueIndexer/IndexingJob.php renamed to Classes/IndexingJob.php

@@ -2,16 +2,18 @@ Flowpack:
   ElasticSearch:
     ContentRepositoryQueueIndexer:
       enableLiveAsyncIndexing: true
-
+      # Change size of single batch jobs via this setting (fallback default is 500)
+      # batchSize: 50
   JobQueue:
     Common:
       presets:
         'Flowpack.ElasticSearch.ContentRepositoryQueueIndexer':
           className: 'Flowpack\JobQueue\Beanstalkd\Queue\BeanstalkdQueue'
           executeIsolated: true
           options:
-            host: '127.0.0.1'
-            port: 11300
+            client:
+              host: '127.0.0.1'
+              port: 11300
 
       queues:
         'Flowpack.ElasticSearch.ContentRepositoryQueueIndexer':

…ntRepositoryQueueIndexer/LoggerTrait.php Classes/LoggerTrait.phpClasses/Flowpack/ElasticSearch/ContentRepositoryQueueIndexer/LoggerTrait.php renamed to Classes/LoggerTrait.php Classes/Flowpack/ElasticSearch/ContentRepositoryQueueIndexer/LoggerTrait.php renamed to Classes/LoggerTrait.php

@@ -1,27 +1,30 @@
-# Neos CMS ElasticSearch indexer based on beanstalkd (job queue)
+# Neos CMS Elasticsearch indexer based on a job queue
 
-This package can be used to index a huge amount of nodes in ElasticSearch indexes. This 
-package use Beanstalkd and the JobQueue package to handle ES indexing asynchronously.
+This package can be used to index a huge amount of nodes in Elasticsearch indexes. This
+package use the Flowpack JobQueue packages to handle the indexing asynchronously.
 
 # Breaking change after an upgrade to 3.0
 
-## Install and configure your Queue package
+Previously the Beanstalk queue package was installed by default, this is no longer
+the case.
+
+# Install and configure your Queue package
 
 You need to install the correct Queue package based on your needs.
 
 Available packages:
 
   - [sqlite](https://packagist.org/packages/flownative/jobqueue-sqlite)
-  - [beanstalkd](https://packagist.org/packages/flownative/jobqueue-beanstalkd)
-  - [doctrine](https://packagist.org/packages/flownative/jobqueue-doctrine)
-  - [redis](https://packagist.org/packages/flownative/jobqueue-redis)
+  - [beanstalkd](https://packagist.org/packages/flowpack/jobqueue-beanstalkd)
+  - [doctrine](https://packagist.org/packages/flowpack/jobqueue-doctrine)
+  - [redis](https://packagist.org/packages/flowpack/jobqueue-redis)
 
 Please check the package documentation for specific configurations.
 
-The default configuration use Beanstalkd, but you need to install it manually:
+The default configuration uses Beanstalkd, but you need to install it manually:
 
     composer require flowpack/jobqueue-beanstalkd
-    
+
 Check the ```Settings.yaml``` to adapt based on the Queue package, you need to adapt the ```className```:
 
     Flowpack:
@@ -30,18 +33,32 @@ Check the ```Settings.yaml``` to adapt based on the Queue package, you need to a
           queues:
             'Flowpack.ElasticSearch.ContentRepositoryQueueIndexer':
               className: 'Flowpack\JobQueue\Beanstalkd\Queue\BeanstalkdQueue'
-    
+
             'Flowpack.ElasticSearch.ContentRepositoryQueueIndexer.Live':
               className: 'Flowpack\JobQueue\Beanstalkd\Queue\BeanstalkdQueue'
 
-   
+If you use the [doctrine](https://packagist.org/packages/flownative/jobqueue-doctrine) package you have to set the ```tableName``` manually:
+
+    Flowpack:
+      JobQueue:
+        Common:
+          queues:
+            'Flowpack.ElasticSearch.ContentRepositoryQueueIndexer':
+              className: 'Flowpack\JobQueue\Doctrine\Queue\DoctrineQueue'
+              options:
+                tableName: 'flowpack_jobqueue_QueueIndexer'
+
+            'Flowpack.ElasticSearch.ContentRepositoryQueueIndexer.Live':
+              className: 'Flowpack\JobQueue\Doctrine\Queue\DoctrineQueue'
+              options:
+                tableName: 'flowpack_jobqueue_QueueIndexerLive'
 
 # Batch Indexing
 
 ## How to build indexing job
 
     flow nodeindexqueue:build --workspace live
-    
+
 ## How to process indexing job
 
 You can use this CLI command to process indexing job:
@@ -56,20 +73,20 @@ You can disable async live indexing by editing ```Settings.yaml```:
       ElasticSearch:
         ContentRepositoryQueueIndexer:
           enableLiveAsyncIndexing: false
-          
+
 You can use this CLI command to process indexing job:
 
-    flow nodeindexqueue:work --queue live          
+    flow nodeindexqueue:work --queue live
 
 # Supervisord configuration
 
 You can use tools like ```supervisord``` to manage long runing process. Bellow you can
 found a basic configuration:
 
     [supervisord]
-   
+
     [supervisorctl]
-   
+
     [program:elasticsearch_batch_indexing]
     command=php flow nodeindexqueue:work --queue batch
     stdout_logfile=AUTO
@@ -80,7 +97,7 @@ found a basic configuration:
     autostart=true
     autorestart=true
     stopsignal=QUIT
-    
+
     [program:elasticsearch_live_indexing]
     command=php flow nodeindexqueue:work --queue live
     stdout_logfile=AUTO

…epositoryQueueIndexer/UpdateAliasJob.php Classes/UpdateAliasJob.phpClasses/Flowpack/ElasticSearch/ContentRepositoryQueueIndexer/UpdateAliasJob.php renamed to Classes/UpdateAliasJob.php Classes/Flowpack/ElasticSearch/ContentRepositoryQueueIndexer/UpdateAliasJob.php renamed to Classes/UpdateAliasJob.php

@@ -1,15 +1,15 @@
 {
   "name": "flowpack/elasticsearch-contentrepositoryqueueindexer",
-  "type": "typo3-flow-package",
-  "description": "Neos CMS ElasticSearch indexer based on beanstalkd (job queue)",
+  "type": "neos-package",
+  "description": "Neos CMS Elasticsearch indexer based on a job queue",
   "license": "MIT",
   "require": {
     "flowpack/jobqueue-common": "^2.0.0",
     "flowpack/elasticsearch-contentrepositoryadaptor": "^4.0.0"
   },
   "autoload": {
-    "psr-0": {
-      "Flowpack\\ElasticSearch\\ContentRepositoryQueueIndexer": "Classes"
+    "psr-4": {
+      "Flowpack\\ElasticSearch\\ContentRepositoryQueueIndexer\\": "Classes"
     }
   },
   "extra": {