Merge remote-tracking branch 'origin/MAGETWO-56356' into SEGFAULT_BANNERS_PR

Author: Yaroslav Onischenko

app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Action/DataProvider.php

@@ -94,6 +94,11 @@ class DataProvider
      */
     private $metadata;
 
+    /**
+     * @var array
+     */
+    private $attributeOptions = [];
+
     /**
      * @param ResourceConnection $resource
      * @param \Magento\Catalog\Model\Product\Type $catalogProductType
@@ -177,23 +182,13 @@ public function getSearchableProducts(
         return $result;
     }
 
-    /**
-     * Retrieve EAV Config Singleton
-     *
-     * @return \Magento\Eav\Model\Config
-     */
-    private function getEavConfig()
-    {
-        return $this->eavConfig;
-    }
-
     /**
      * Retrieve searchable attributes
      *
      * @param string $backendType
      * @return \Magento\Eav\Model\Entity\Attribute[]
      */
-    private function getSearchableAttributes($backendType = null)
+    public function getSearchableAttributes($backendType = null)
     {
         if (null === $this->searchableAttributes) {
             $this->searchableAttributes = [];
@@ -210,7 +205,7 @@ private function getSearchableAttributes($backendType = null)
                 ['engine' => $this->engine, 'attributes' => $attributes]
             );
 
-            $entity = $this->getEavConfig()->getEntityType(\Magento\Catalog\Model\Product::ENTITY)->getEntity();
+            $entity = $this->eavConfig->getEntityType(\Magento\Catalog\Model\Product::ENTITY)->getEntity();
 
             foreach ($attributes as $attribute) {
                 $attribute->setEntity($entity);
@@ -239,7 +234,7 @@ private function getSearchableAttributes($backendType = null)
      * @param int|string $attribute
      * @return \Magento\Eav\Model\Entity\Attribute
      */
-    private function getSearchableAttribute($attribute)
+    public function getSearchableAttribute($attribute)
     {
         $attributes = $this->getSearchableAttributes();
         if (is_numeric($attribute)) {
@@ -254,7 +249,7 @@ private function getSearchableAttribute($attribute)
             }
         }
 
-        return $this->getEavConfig()->getAttribute(\Magento\Catalog\Model\Product::ENTITY, $attribute);
+        return $this->eavConfig->getAttribute(\Magento\Catalog\Model\Product::ENTITY, $attribute);
     }
 
     /**
@@ -487,11 +482,21 @@ private function getAttributeValue($attributeId, $valueId, $storeId)
             && $attribute->usesSource()
             && $this->engine->allowAdvancedIndex()
         ) {
-            $attribute->setStoreId($storeId);
+            if (!isset($this->attributeOptions[$attributeId][$storeId])) {
+                $attribute->setStoreId($storeId);
+                $options = $attribute->getSource()->toOptionArray();
+                $this->attributeOptions[$attributeId][$storeId] = array_combine(
+                    array_column($options, 'value'),
+                    array_column($options, 'label')
+                );
+            }
 
-            $valueText = (array) $attribute->getSource()->getIndexOptionText($valueId);
+            $valueText = '';
+            if (isset($this->attributeOptions[$attributeId][$storeId][$valueId])) {
+                $valueText = $this->attributeOptions[$attributeId][$storeId][$valueId];
+            }
 
-            $pieces = array_filter(array_merge([$value], $valueText));
+            $pieces = array_filter(array_merge([$value], [$valueText]));
 
             $value = implode($this->separator, $pieces);
         }