MAGETWO-97915: Catalog Search index is taking hours to complete

Author: Oleksandr Iegorov

app/code/Magento/Elasticsearch/Model/Adapter/BatchDataMapper/ProductDataMapper.php

@@ -12,12 +12,18 @@
 use Magento\Elasticsearch\Model\Adapter\BatchDataMapperInterface;
 use Magento\Elasticsearch\Model\Adapter\FieldType\Date as DateFieldType;
 use Magento\AdvancedSearch\Model\Adapter\DataMapper\AdditionalFieldsProviderInterface;
+use Magento\Eav\Api\Data\AttributeOptionInterface;
 
 /**
  * Map product index data to search engine metadata
  */
 class ProductDataMapper implements BatchDataMapperInterface
 {
+    /**
+     * @var AttributeOptionInterface[]
+     */
+    private $attributeOptionsCache;
+
     /**
      * @var Builder
      */
@@ -95,6 +101,7 @@ public function __construct(
         $this->excludedAttributes = array_merge($this->defaultExcludedAttributes, $excludedAttributes);
         $this->additionalFieldsProvider = $additionalFieldsProvider;
         $this->dataProvider = $dataProvider;
+        $this->attributeOptionsCache = [];
     }
 
     /**
@@ -272,7 +279,13 @@ private function isAttributeDate(Attribute $attribute): bool
     private function getValuesLabels(Attribute $attribute, array $attributeValues): array
     {
         $attributeLabels = [];
-        foreach ($attribute->getOptions() as $option) {
+
+        $options = $this->getAttributeOptions($attribute);
+        if (empty($options)) {
+            return $attributeLabels;
+        }
+
+        foreach ($options as $option) {
             if (\in_array($option->getValue(), $attributeValues)) {
                 $attributeLabels[] = $option->getLabel();
             }
@@ -281,6 +294,22 @@ private function getValuesLabels(Attribute $attribute, array $attributeValues):
         return $attributeLabels;
     }
 
+    /**
+     * Retrieve options for attribute
+     *
+     * @param Attribute $attribute
+     * @return array
+     */
+    private function getAttributeOptions(Attribute $attribute): array
+    {
+        if (!isset($this->attributeOptionsCache[$attribute->getId()])) {
+            $options = $attribute->getOptions() ?? [];
+            $this->attributeOptionsCache[$attribute->getId()] = $options;
+        }
+
+        return $this->attributeOptionsCache[$attribute->getId()];
+    }
+
     /**
      * Retrieve value for field. If field have only one value this method return it.
      * Otherwise will be returned array of these values.