ACP2E-2222: EAV Indexer performance

- implemented solution

Author: aplapana

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

@@ -6,6 +6,7 @@
 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
@@ -54,6 +55,7 @@ public function reindexAll()
             $this->clearTemporaryIndexTable();
             $this->_prepareIndex();
             $this->_prepareRelationIndex();
+            $this->_removeNotVisibleEntityFromIndex();
             $this->syncData();
             $this->commit();
         } catch (\Exception $e) {
@@ -76,6 +78,7 @@ public function reindexEntities($processIds)
 
         $this->_prepareIndex($processIds);
         $this->_prepareRelationIndex($processIds);
+        $this->_removeNotVisibleEntityFromIndex();
 
         return $this;
     }
@@ -88,7 +91,6 @@ public function reindexEntities($processIds)
      * @param int $attributeId
      * @param bool $isIndexable
      * @return $this
-     * @throws \Exception
      */
     public function reindexAttribute($attributeId, $isIndexable = true)
     {
@@ -99,6 +101,7 @@ public function reindexAttribute($attributeId, $isIndexable = true)
 
             $this->_prepareIndex(null, $attributeId);
             $this->_prepareRelationIndex();
+            $this->_removeNotVisibleEntityFromIndex();
 
             $this->_synchronizeAttributeIndexData($attributeId);
         }
@@ -115,6 +118,39 @@ 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

@@ -75,6 +75,25 @@ public function __construct(
                 ->get(\Magento\Framework\Api\SearchCriteriaBuilder::class);
     }
 
+    /**
+     * @inheritDoc
+     */
+    public function reindexAttribute($attributeId, $isIndexable = true)
+    {
+        if (!$isIndexable) {
+            $this->_removeAttributeIndexData($attributeId);
+        } else {
+            $this->clearTemporaryIndexTable();
+
+            $this->_prepareIndex(null, $attributeId);
+            $this->_prepareRelationIndex();
+
+            $this->_synchronizeAttributeIndexData($attributeId);
+        }
+
+        return $this;
+    }
+
     /**
      * Initialize connection and define main index table
      *