ACP2E-2222: EAV Indexer performance

- implemented solution

Author: aplapana

app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Eav/AbstractEav.php

@@ -6,7 +6,6 @@
 namespace Magento\Catalog\Model\ResourceModel\Product\Indexer\Eav;
 
 use Magento\Catalog\Api\Data\ProductInterface;
-use Magento\Framework\App\ObjectManager;
 
 /**
  * Catalog Product Eav Attributes abstract indexer resource model
@@ -55,7 +54,6 @@ public function reindexAll()
             $this->clearTemporaryIndexTable();
             $this->_prepareIndex();
             $this->_prepareRelationIndex();
-            $this->_removeNotVisibleEntityFromIndex();
             $this->syncData();
             $this->commit();
         } catch (\Exception $e) {
@@ -78,7 +76,6 @@ public function reindexEntities($processIds)
 
         $this->_prepareIndex($processIds);
         $this->_prepareRelationIndex($processIds);
-        $this->_removeNotVisibleEntityFromIndex();
 
         return $this;
     }
@@ -91,6 +88,7 @@ public function reindexEntities($processIds)
      * @param int $attributeId
      * @param bool $isIndexable
      * @return $this
+     * @throws \Exception
      */
     public function reindexAttribute($attributeId, $isIndexable = true)
     {
@@ -101,7 +99,6 @@ public function reindexAttribute($attributeId, $isIndexable = true)
 
             $this->_prepareIndex(null, $attributeId);
             $this->_prepareRelationIndex();
-            $this->_removeNotVisibleEntityFromIndex();
 
             $this->_synchronizeAttributeIndexData($attributeId);
         }
@@ -118,39 +115,6 @@ public function reindexAttribute($attributeId, $isIndexable = true)
      */
     abstract protected function _prepareIndex($entityIds = null, $attributeId = null);
 
-    /**
-     * Remove Not Visible products from temporary data index
-     *
-     * @return $this
-     */
-    protected function _removeNotVisibleEntityFromIndex()
-    {
-        $connection = $this->getConnection();
-        $idxTable = $this->getIdxTable();
-
-        $select = $connection->select()->from($idxTable, null);
-
-        $select->joinLeft(
-            ['cpe' => $this->getTable('catalog_product_entity')],
-            "cpe.entity_id = {$idxTable}.entity_id",
-            []
-        );
-        $linkField = $this->getMetadataPool()->getMetadata(ProductInterface::class)->getLinkField();
-        $condition = $connection->quoteInto('=?', \Magento\Catalog\Model\Product\Visibility::VISIBILITY_NOT_VISIBLE);
-        $this->_addAttributeToSelect(
-            $select,
-            'visibility',
-            "cpe.{$linkField}",
-            $idxTable . '.store_id',
-            $condition
-        );
-
-        $query = $select->deleteFromSelect($idxTable);
-        $connection->query($query);
-
-        return $this;
-    }
-
     /**
      * Prepare data index select for product relations
      *

app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Eav/Source.php

@@ -135,6 +135,7 @@ protected function _prepareIndex($entityIds = null, $attributeId = null)
      * @param int $attributeId the attribute id limitation
      * @return $this
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     * @throws \Exception
      */
     protected function _prepareSelectIndex($entityIds = null, $attributeId = null)
     {
@@ -149,7 +150,7 @@ protected function _prepareSelectIndex($entityIds = null, $attributeId = null)
         $attrIdsFlat = implode(',', array_map('intval', $attrIds));
         $ifNullSql = $connection->getIfNullSql('pis.value', 'COALESCE(ds.value, dd.value)');
 
-        /**@var $select \Magento\Framework\DB\Select*/
+        /**@var $select Select */
         $select = $connection->select()->distinct(true)->from(
             ['s' => $this->getTable('store')],
             []
@@ -204,6 +205,15 @@ protected function _prepareSelectIndex($entityIds = null, $attributeId = null)
                 'cpe.entity_id AS source_id',
             ]
         );
+        $visibilityCondition = $connection->quoteInto('>?', \Magento\Catalog\Model\Product\Visibility::VISIBILITY_NOT_VISIBLE);
+        $linkField = $this->getMetadataPool()->getMetadata(ProductInterface::class)->getLinkField();
+        $this->_addAttributeToSelect(
+            $select,
+            'visibility',
+            "cpe.{$linkField}",
+            'pis.store_id',
+            $visibilityCondition
+        );
 
         if ($entityIds !== null) {
             $ids = implode(',', array_map('intval', $entityIds));
@@ -239,6 +249,14 @@ protected function _prepareSelectIndex($entityIds = null, $attributeId = null)
                 ->where('wd.store_id != 0')
                 ->where("cpe.entity_id IN({$ids})");
             $select->where("cpe.entity_id IN({$ids})");
+            $this->_addAttributeToSelect(
+                $selectWithoutDefaultStore,
+                'visibility',
+                "cpe.{$linkField}",
+                'd2s.store_id',
+                $visibilityCondition
+            );
+
             $selects = new UnionExpression(
                 [$select, $selectWithoutDefaultStore],
                 Select::SQL_UNION,
@@ -272,6 +290,7 @@ protected function _prepareSelectIndex($entityIds = null, $attributeId = null)
      * @param array $entityIds the entity ids limitation
      * @param int $attributeId the attribute id limitation
      * @return $this
+     * @throws \Exception
      */
     protected function _prepareMultiselectIndex($entityIds = null, $attributeId = null)
     {
@@ -358,6 +377,13 @@ protected function _prepareMultiselectIndex($entityIds = null, $attributeId = nu
             ]
         );
 
+        $this->_addAttributeToSelect(
+            $select,
+            'visibility',
+            "cpe.{$productIdField}",
+            'cs.store_id',
+            $connection->quoteInto('>?', \Magento\Catalog\Model\Product\Visibility::VISIBILITY_NOT_VISIBLE)
+        );
         $this->saveDataFromSelect($select, $options);
 
         return $this;
@@ -431,11 +457,11 @@ public function getIdxTable($table = null)
     /**
      * Save data from select
      *
-     * @param \Magento\Framework\DB\Select $select
+     * @param Select $select
      * @param array $options
      * @return void
      */
-    private function saveDataFromSelect(\Magento\Framework\DB\Select $select, array $options)
+    private function saveDataFromSelect(Select $select, array $options)
     {
         $i = 0;
         $data = [];