Improve performance of indexer

Co-authored-by: Aleksandr Yegorov <a.yegorov@youweagency.com>

Author: 2 people

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

@@ -370,11 +370,8 @@ private function getValuesLabels(Attribute $attribute, array $attributeValues, i
             return $attributeLabels;
         }
 
-        foreach ($options as $option) {
-            if (\in_array($option['value'], $attributeValues)) {
-                $attributeLabels[] = $option['label'];
-            }
-        }
+        $options = array_intersect_key($options, array_flip($attributeValues));
+        $attributeLabels = array_column($options, 'label');
 
         return $attributeLabels;
     }
@@ -395,6 +392,14 @@ private function getAttributeOptions(Attribute $attribute, int $storeId): array
              * $attribute->getOptions() loads options into data objects which can be costly.
              */
             $options = $attribute->usesSource() ? $attribute->setStoreId($storeId)->getSource()->getAllOptions() : [];
+
+            if (!empty($options)) {
+                $options = array_combine(
+                    array_column($options, 'value'),
+                    $options
+                );
+            }
+
             $this->attributeOptionsCache[$storeId][$attribute->getId()] = $options;
             $attribute->setStoreId($attributeStoreId);
         }