MCP-811: Performance Optimization for Catalog GraphQL

Author: adifucan

app/code/Magento/Elasticsearch/Elasticsearch5/SearchAdapter/Query/Builder.php

@@ -91,7 +91,8 @@ public function initQuery(RequestInterface $request)
             'body' => [
                 'from' => min(self::ELASTIC_INT_MAX, $request->getFrom()),
                 'size' => $request->getSize(),
-                'stored_fields' => ['_id', '_score'],
+                'stored_fields' => '_none_',
+                'docvalue_fields' => ['_id', '_score'],
                 'sort' => $this->sortBuilder->getSort($request),
                 'query' => [],
             ],

app/code/Magento/Elasticsearch/SearchAdapter/Aggregation/Builder/Dynamic.php

@@ -59,6 +59,10 @@ private function getEntityStorage(array $queryResult)
     {
         $ids = [];
         foreach ($queryResult['hits']['hits'] as $document) {
+            if (!array_key_exists('_id', $document) && array_key_exists('fields', $document)) {
+                $document['_id'] = $document['fields']['_id'][0];
+                unset($document['fields']);
+            }
             $ids[] = $document['_id'];
         }
 

app/code/Magento/Elasticsearch/SearchAdapter/ResponseFactory.php

@@ -64,6 +64,10 @@ public function create($response)
     {
         $documents = [];
         foreach ($response['documents'] as $rawDocument) {
+            if (!array_key_exists('_id', $rawDocument) && array_key_exists('fields', $rawDocument)) {
+                $rawDocument['_id'] = $rawDocument['fields']['_id'][0];
+                unset($rawDocument['fields']);
+            }
             /** @var \Magento\Framework\Api\Search\Document[] $documents */
             $documents[] = $this->documentFactory->create(
                 $rawDocument