Merge pull request #118 from dfeyer/task-support-es20

TASK: Add support for ElasticSearch 2.0 - 2.4

This change add support for ElasticSearch 2.0 - 2.4. 

This change is not backward compatible and break the support for earlier version.

Author: dfeyer

.travis.yml

@@ -7,8 +7,8 @@ matrix:
 sudo: false
 before_install:
   - cd ..
-  - wget --no-check-certificate https://download.elastic.co/elasticsearch/elasticsearch/elasticsearch-1.7.5.zip && unzip elasticsearch-1.7.5.zip
-  - mv elasticsearch-1.7.5 elasticsearch
+  - wget --no-check-certificate https://download.elastic.co/elasticsearch/release/org/elasticsearch/distribution/zip/elasticsearch/2.4.1/elasticsearch-2.4.1.zip && unzip elasticsearch-2.4.1.zip
+  - mv elasticsearch-2.4.1 elasticsearch
   - cd elasticsearch
   - bin/elasticsearch -d
   - cd ..

Classes/Flowpack/ElasticSearch/ContentRepositoryAdaptor/Command/NodeIndexCommandController.php

@@ -15,6 +15,7 @@
 use Flowpack\ElasticSearch\ContentRepositoryAdaptor\Service\IndexWorkspaceTrait;
 use TYPO3\Flow\Annotations as Flow;
 use TYPO3\Flow\Cli\CommandController;
+use TYPO3\TYPO3CR\Domain\Model\NodeInterface;
 
 /**
  * Provides CLI features for index handling
@@ -61,6 +62,11 @@ class NodeIndexCommandController extends CommandController
      */
     protected $nodeTypeMappingBuilder;
 
+    /**
+     * @var integer
+     */
+    protected $limit;
+
     /**
      * @Flow\Inject
      * @var \Flowpack\ElasticSearch\ContentRepositoryAdaptor\LoggerInterface
@@ -160,6 +166,7 @@ public function buildCommand($limit = null, $update = false, $workspace = null,
         $this->logger->log(sprintf('Indexing %snodes ... ', ($limit !== null ? 'the first ' . $limit . ' ' : '')), LOG_INFO);
 
         $count = 0;
+        $this->limit = $limit;
 
         if ($workspace === null && $this->settings['indexAllWorkspaces'] === false) {
             $workspace = 'live';
@@ -174,10 +181,10 @@ public function buildCommand($limit = null, $update = false, $workspace = null,
         };
         if ($workspace === null) {
             foreach ($this->workspaceRepository->findAll() as $workspace) {
-                $count += $this->indexWorkspace($workspace->getName(), $limit, $callback);
+                $count += $this->indexWorkspace($workspace->getName());
             }
         } else {
-            $count += $this->indexWorkspace($workspace, $limit, $callback);
+            $count = $this->indexWorkspace($workspace);
         }
 
         $this->nodeIndexingManager->flushQueues();
@@ -199,17 +206,81 @@ public function buildCommand($limit = null, $update = false, $workspace = null,
     public function cleanupCommand()
     {
         try {
-            $indicesToBeRemoved = $this->nodeIndexer->removeOldIndices();
-            if (count($indicesToBeRemoved) > 0) {
-                foreach ($indicesToBeRemoved as $indexToBeRemoved) {
-                    $this->logger->log('Removing old index ' . $indexToBeRemoved);
+            $removedIndices = $this->nodeIndexer->removeOldIndices();
+            if (count($removedIndices) > 0) {
+                if (count($removedIndices) === 1) {
+                    $this->logger->log('Removed old index ' . current($removedIndices) . '.');
+                } else {
+                    $this->logger->log('Removed old indices ' . implode(', ', $removedIndices) . '.');
                 }
             } else {
                 $this->logger->log('Nothing to remove.');
             }
         } catch (\Flowpack\ElasticSearch\Transfer\Exception\ApiException $exception) {
             $response = json_decode($exception->getResponse());
-            $this->logger->log(sprintf('Nothing removed. ElasticSearch responded with status %s, saying "%s"', $response->status, $response->error));
+            $this->logger->log(sprintf('Nothing removed. ElasticSearch responded with status %s, saying "%s: %s"', $response->status, $response->error->type, $response->error->reason));
+        }
+    }
+
+    /**
+     * @param string $workspaceName
+     * @return int
+     */
+    protected function indexWorkspace($workspaceName)
+    {
+        $indexedNodes = 0;
+        $combinations = $this->contentDimensionCombinator->getAllAllowedCombinations();
+        if ($combinations === []) {
+            $indexedNodes += $this->indexWorkspaceWithDimensions($workspaceName);
+        } else {
+            foreach ($combinations as $combination) {
+                $indexedNodes += $this->indexWorkspaceWithDimensions($workspaceName, $combination);
+            }
+        }
+
+        return $indexedNodes;
+    }
+
+    /**
+     * @param string $workspaceName
+     * @param array $dimensions
+     * @return int
+     */
+    protected function indexWorkspaceWithDimensions($workspaceName, array $dimensions = [])
+    {
+        $indexedNodes = 0;
+        $context = $this->contextFactory->create(['workspaceName' => $workspaceName, 'dimensions' => $dimensions]);
+        $rootNode = $context->getRootNode();
+
+        $indexedNodes += $this->traverseNodes($rootNode);
+
+        if ($dimensions === []) {
+            $this->outputLine('Workspace "' . $workspaceName . '" without dimensions done. (Indexed ' . $indexedNodes . ' nodes)');
+        } else {
+            $this->outputLine('Workspace "' . $workspaceName . '" and dimensions "' . json_encode($dimensions) . '" done. (Indexed ' . $indexedNodes . ' nodes)');
+        }
+
+        return $indexedNodes;
+    }
+
+    /**
+     * @param NodeInterface $currentNode
+     * @param integer $traversedUntilNow
+     * @return integer Indexed nodes in this traversal
+     */
+    protected function traverseNodes(NodeInterface $currentNode, $traversedUntilNow = 0)
+    {
+        if ($this->limit !== null && $traversedUntilNow > $this->limit) {
+            return $traversedUntilNow;
         }
+
+        $this->nodeIndexingManager->indexNode($currentNode);
+        $traversedUntilNow++;
+
+        foreach ($currentNode->getChildNodes() as $childNode) {
+            $traversedUntilNow = $this->traverseNodes($childNode, $traversedUntilNow);
+        }
+
+        return $traversedUntilNow;
     }
 }