MCP-946: Price Index Optimization

Author: aa-kashk

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

@@ -357,54 +357,65 @@ public function getProductAttributes($storeId, array $productIds, array $attribu
         $selects = [];
         $ifStoreValue = $this->connection->getCheckSql('t_store.value_id > 0', 't_store.value', 't_default.value');
         $linkField = $this->metadata->getLinkField();
-
+        $productLinkFieldsToEntityIdMap = $this->connection->fetchPairs(
+            $this->connection->select()->from(
+                ['cpe' => $this->getTable('catalog_product_entity')],
+                [$linkField, 'entity_id']
+            )->where(
+                'cpe.entity_id IN (?)',
+                $productIds,
+                Zend_Db::INT_TYPE
+            )
+        );
         foreach ($attributeTypes as $backendType => $attributeIds) {
             if ($attributeIds) {
-                foreach ($attributeIds as $attributeId) {
-                    $tableName = $this->getTable('catalog_product_entity_' . $backendType);
-                    $select = $this->connection->select()->from(
-                        't',
-                        [
-                            'entity_id' => 't.entity_id',
-                            'value' => $this->unifyField($ifStoreValue, $backendType),
-                        ]
-                    )->joinLeft(
-                        ['t_default' => $tableName],
-                        't.' . $linkField . ' = t_default.' . $linkField
-                        . ' AND t_default.attribute_id = ' . (int) $attributeId
-                        . ' AND t_default.store_id = 0',
-                        ['attribute_id' => 't_default.attribute_id']
-                    )->joinLeft(
-                        ['t_store' => $tableName],
-                        't.' . $linkField . ' = t_store.' . $linkField
-                        . ' AND t_store.attribute_id = '  . (int) $attributeId
-                        . ' AND t_store.store_id = ' . (int) $storeId,
-
-                        []
-                    );
-                    $selects[] = $select;
-                }
-
+                $tableName = $this->getTable('catalog_product_entity_' . $backendType);
+
+                $select = $this->connection->select()->from(
+                    ['t' => $tableName],
+                    [
+                        $linkField => 't.' . $linkField,
+                        'attribute_id' => 't.attribute_id',
+                        'value' => $this->unifyField($ifStoreValue, $backendType),
+                    ]
+                )->joinLeft(
+                    ['t_store' => $tableName],
+                    $this->connection->quoteInto(
+                        't.' . $linkField . '=t_store.' . $linkField .
+                        ' AND t.attribute_id=t_store.attribute_id' .
+                        ' AND t_store.store_id = ?',
+                        $storeId
+                    ),
+                    []
+                )->joinLeft(
+                    ['t_default' => $tableName],
+                    $this->connection->quoteInto(
+                        't.' . $linkField . '=t_default.' . $linkField .
+                        ' AND t.attribute_id=t_default.attribute_id' .
+                        ' AND t_default.store_id = ?',
+                        0
+                    ),
+                    []
+                )->where(
+                    't.attribute_id IN (?)',
+                    $attributeIds
+                )->where(
+                    't.' . $linkField . ' IN (?)',
+                    array_keys($productLinkFieldsToEntityIdMap)
+                )->distinct();
+                $selects[] = $select;
             }
         }
 
         if ($selects) {
-            $select = 'WITH t AS (' .
-                $this->connection->select()->from(
-                    ['cpe' => $this->getTable('catalog_product_entity')],
-                    $linkField != 'entity_id' ? [$linkField, 'entity_id'] : ['entity_id']
-                )->where(
-                    'cpe.entity_id IN (?)',
-                    $productIds,
-                    Zend_Db::INT_TYPE
-                ) . ') '.
-                $this->connection->select()->union($selects, Select::SQL_UNION_ALL);
+            $select = $this->connection->select()->union($selects, Select::SQL_UNION_ALL);
             $query = $this->connection->query($select);
             while ($row = $query->fetch()) {
-                $entityId = $row['entity_id'];
+                $entityId = $productLinkFieldsToEntityIdMap[$row[$linkField]];
                 $result[$entityId][$row['attribute_id']] = $row['value'];
             }
         }
+
         return $result;
     }