TASK: Remove include_in_all handling and corresponding documentation

Author: daniellienert

Classes/Driver/Version5/Mapping/NodeTypeMappingBuilder.php

@@ -110,38 +110,9 @@ public function buildMappingInformation(Index $index)
      */
     protected function migrateConfigurationForElasticVersion5(array &$mapping)
     {
-        $this->migrateIncludeInAllToCopyTo($mapping);
         $this->adjustStringTypeMapping($mapping);
     }
 
-    /**
-     * include_in_all is deprecated with elasticsearch 5.x and raises
-     * warnings on index creation
-     *
-     * @param array $mapping
-     * @return void
-     */
-    protected function migrateIncludeInAllToCopyTo(array &$mapping)
-    {
-        $migrateIncludeInAll = function (&$mapping) {
-            if (isset($mapping['include_in_all'])) {
-                if ((bool)$mapping['include_in_all'] === true) {
-                    $mapping['copy_to'] = '_all';
-                }
-                unset($mapping['include_in_all']);
-            }
-        };
-
-        $migrateIncludeInAll($mapping);
-        
-        foreach ($mapping as &$item) {
-            if (is_array($item)) {
-                $migrateIncludeInAll($mapping);
-                $this->migrateIncludeInAllToCopyTo($item);
-            }
-        }
-    }
-
     /**
      * Adjust the mapping for string to text or keyword as needed.
      *

Configuration/NodeTypes.yaml

@@ -8,39 +8,34 @@
         elasticSearchMapping:
           type: string
           index: not_analyzed
-          include_in_all: false
         indexing: '${node.identifier}'
 
     '__workspace':
       search:
         elasticSearchMapping:
           type: string
           index: not_analyzed
-          include_in_all: false
         indexing: '${node.context.workspace.name}'
 
     '__path':
       search:
         elasticSearchMapping:
           type: string
           index: not_analyzed
-          include_in_all: false
         indexing: '${node.path}'
 
     '__parentPath':
       search:
         elasticSearchMapping:
           type: string
           index: not_analyzed
-          include_in_all: false
         # we index *all* parent paths as separate tokens to allow for efficient searching without a prefix query
         indexing: '${Indexing.buildAllPathPrefixes(node.parentPath)}'
 
     '__sortIndex':
       search:
         elasticSearchMapping:
           type: integer
-          include_in_all: false
         indexing: '${node.index}'
 
     '_removed':
@@ -54,30 +49,26 @@
         elasticSearchMapping:
           type: string
           index: not_analyzed
-          include_in_all: false
         indexing: '${Indexing.extractNodeTypeNamesAndSupertypes(node.nodeType)}'
 
     '_lastModificationDateTime':
       search:
         elasticSearchMapping:
           type: date
-          include_in_all: false
           format: 'date_time_no_millis'
         indexing: '${(node.lastModificationDateTime ? Date.format(node.lastModificationDateTime, "Y-m-d\TH:i:sP") : null)}'
 
     '_lastPublicationDateTime':
       search:
         elasticSearchMapping:
           type: date
-          include_in_all: false
           format: 'date_time_no_millis'
         indexing: '${(node.lastPublicationDateTime ? Date.format(node.lastPublicationDateTime, "Y-m-d\TH:i:sP") : null)}'
 
     '_creationDateTime':
       search:
         elasticSearchMapping:
           type: date
-          include_in_all: false
           format: 'date_time_no_millis'
         indexing: '${(node.creationDateTime ? Date.format(node.creationDateTime, "Y-m-d\TH:i:sP") : null)}'
 
@@ -95,15 +86,13 @@
       search:
         elasticSearchMapping:
           type: date
-          include_in_all: false
           format: 'date_time_no_millis'
         indexing: '${(node.hiddenBeforeDateTime ? Date.format(node.hiddenBeforeDateTime, "Y-m-d\TH:i:sP") : null)}'
 
     '_hiddenAfterDateTime':
       search:
         elasticSearchMapping:
           type: date
-          include_in_all: false
           format: 'date_time_no_millis'
         indexing: '${(node.hiddenAfterDateTime ? Date.format(node.hiddenAfterDateTime, "Y-m-d\TH:i:sP") : null)}'
 
@@ -125,7 +114,6 @@
       search:
         elasticSearchMapping:
           type: object
-          include_in_all: false
           enabled: false
         indexing: ''
     '__fulltext':

Configuration/Settings.yaml

@@ -86,7 +86,6 @@ Neos:
         string:
           elasticSearchMapping:
             type: string
-            include_in_all: false
 
         boolean:
           elasticSearchMapping:
@@ -100,7 +99,6 @@ Neos:
           elasticSearchMapping:
             type: date
             format: 'date_time_no_millis'
-            include_in_all: false
 
         'Neos\Media\Domain\Model\Asset':
           elasticSearchMapping: '' # deliberately don't map or index this

README.md

@@ -305,7 +305,6 @@ for all your filterable properties, or else filtering won't work on them properl
       search:
         elasticSearchMapping:
           type: "string"
-          include_in_all: false
           index: 'not_analyzed'
 ```
 
@@ -421,11 +420,7 @@ Furthermore, we want that a fulltext match e.g. inside a headline is seen as *mo
 a match inside the normal body text. That's why the `Document` node not only contains one field with
 all the texts, but multiple "buckets" where text is added to: One field which contains everything
 deemed as "very important" (`__fulltext.h1`), one which is "less important" (`__fulltext.h2`),
-and finally one for the plain text (`__fulltext.text`). All of these fields add themselves to the
-Elasticsearch `_all` field, and are configured with different `boost` values.
-
-In order to search this index, you can just search inside the `_all` field with an additional limitation
-of `__typeAndSupertypes` containing `Neos.Neos:Document`.
+and finally one for the plain text (`__fulltext.text`). All of these fields are configured with different `boost` values.
 
 **For a search user interface, checkout the Flowpack.SearchPlugin package**
 
@@ -505,12 +500,10 @@ Neos:
     Search:
       defaultConfigurationPerType:
 
-        # strings should, by default, not be included in the _all field; and
-        # indexing should just use their simple value.
+        # strings should just be indexed with their simple value.
         string:
           elasticSearchMapping:
             type: string
-            include_in_all: false
           indexing: '${value}'
 ```
 
@@ -525,7 +518,6 @@ Neos:
         # Elasticsearch understands
         elasticSearchMapping:
           type: DateTime
-          include_in_all: false
           format: 'date_time_no_millis'
         indexing: '${(node.hiddenBeforeDateTime ? Date.format(node.hiddenBeforeDateTime, "Y-m-d\TH:i:sP") : null)}'
 ```
@@ -628,13 +620,11 @@ Neos:
         'Neos\Media\Domain\Model\Asset':
           elasticSearchMapping:
             type: attachment
-            include_in_all: true
           indexing: ${Indexing.indexAsset(value)}
 
         'array<Neos\Media\Domain\Model\Asset>':
           elasticSearchMapping:
             type: attachment
-            include_in_all: true
           indexing: ${Indexing.indexAsset(value)}
 ```