Merge pull request #334 from daniellienert/task/remove-deduplicate-method

TASK: Remove unneeded deleteDuplicateDocumentNotMatchingType

Author: daniellienert

Classes/Driver/DocumentDriverInterface.php

@@ -31,14 +31,4 @@ interface DocumentDriverInterface
      * @return array
      */
     public function delete(NodeInterface $node, string $identifier): array;
-
-    /**
-     * Delete documents by $documentIdentifier not having the given $nodeType
-     *
-     * @param Index $index
-     * @param string $documentIdentifier
-     * @param NodeType $nodeType
-     * @return void
-     */
-    public function deleteDuplicateDocumentNotMatchingType(Index $index, string $documentIdentifier, NodeType $nodeType): void;
 }

Classes/Driver/Version6/DocumentDriver.php

@@ -43,58 +43,4 @@ public function delete(NodeInterface $node, string $identifier): array
             ]
         ];
     }
-
-    /**
-     * {@inheritdoc}
-     * @throws \Flowpack\ElasticSearch\Exception
-     * @throws \Neos\Flow\Http\Exception
-     */
-    public function deleteDuplicateDocumentNotMatchingType(Index $index, string $documentIdentifier, NodeType $nodeType): void
-    {
-        $result = $index->request('GET', '/_search?scroll=1m', [], json_encode([
-            'sort' => ['_doc'],
-            'query' => [
-                'bool' => [
-                    'must' => [
-                        'ids' => [
-                            'values' => [$documentIdentifier]
-                        ]
-                    ],
-                    'must_not' => [
-                        'term' => [
-                            Mapping::NEOS_TYPE_FIELD => $nodeType->getName()
-                        ]
-                    ]
-                ]
-            ]
-        ]));
-        $treatedContent = $result->getTreatedContent();
-        $scrollId = $treatedContent['_scroll_id'];
-        $mapHitToDeleteRequest = static function ($hit) {
-            return json_encode([
-                'delete' => [
-                    '_id' => $hit['_id']
-                ]
-            ]);
-        };
-        $bulkRequest = [];
-        while (isset($treatedContent['hits']['hits']) && $treatedContent['hits']['hits'] !== []) {
-            $hits = $treatedContent['hits']['hits'];
-            $bulkRequest = array_merge($bulkRequest, array_map($mapHitToDeleteRequest, $hits));
-            $result = $index->request('POST', '/_search/scroll', [], json_encode([
-                'scroll'    => '1m',
-                'scroll_id' => $scrollId,
-            ]), false);
-            $treatedContent = $result->getTreatedContent();
-        }
-        $this->logger->debug(sprintf('NodeIndexer: Check duplicate nodes for %s (%s), found %d document(s)', $documentIdentifier, $nodeType->getName(), count($bulkRequest)), LogEnvironment::fromMethodName(__METHOD__));
-        if ($bulkRequest !== []) {
-            $index->request('POST', '/_bulk', [], implode("\n", $bulkRequest) . "\n");
-        }
-        $this->searchClient->request('DELETE', '/_search/scroll', [], json_encode([
-            'scroll_id' => [
-                $scrollId
-            ]
-        ]));
-    }
 }

Classes/Indexer/NodeIndexer.php

@@ -261,12 +261,6 @@ public function indexNode(NodeInterface $node, $targetWorkspaceName = null): voi
 
             $mappingType = $this->getIndex()->findType($nodeType->getName());
 
-            if ($this->bulkProcessing === false) {
-                // Remove document with the same contextPathHash but different NodeType, required after NodeType change
-                $this->logger->debug(sprintf('Search and remove duplicate document for node %s (%s) if needed.', $contextPath, $node->getIdentifier()), LogEnvironment::fromMethodName(__METHOD__));
-                $this->documentDriver->deleteDuplicateDocumentNotMatchingType($this->getIndex(), $documentIdentifier, $node->getNodeType());
-            }
-
             $fulltextIndexOfNode = [];
             $nodePropertiesToBeStoredInIndex = $this->extractPropertiesAndFulltext($node, $fulltextIndexOfNode, function ($propertyName) use ($documentIdentifier, $node) {
                 $this->logger->debug(sprintf('Property "%s" not indexed because no configuration found, node type %s.', $propertyName, $node->getNodeType()->getName()), LogEnvironment::fromMethodName(__METHOD__));