ACP2E-2222: EAV Indexer performance

aplapana · aplapana · commit acbd3acf1060 · 2023-08-09T11:40:41.000+03:00
- implemented static
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/AbstractIndexer.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/AbstractIndexer.php
@@ -8,6 +8,7 @@
 use Magento\Catalog\Api\Data\ProductInterface;
 use Magento\Eav\Model\Config;
 use Magento\Framework\EntityManager\MetadataPool;
+use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Indexer\Table\StrategyInterface;
 use Magento\Framework\Model\ResourceModel\Db\Context;
 
@@ -22,8 +23,6 @@
 abstract class AbstractIndexer extends \Magento\Indexer\Model\ResourceModel\AbstractResource
 {
     /**
-     * Eav config
-     *
      * @var \Magento\Eav\Model\Config
      */
     protected $_eavConfig;
@@ -40,7 +39,7 @@ abstract class AbstractIndexer extends \Magento\Indexer\Model\ResourceModel\Abst
      * @param Context $context
      * @param StrategyInterface $tableStrategy
      * @param Config $eavConfig
-     * @param null $connectionName
+     * @param string|null $connectionName
      * @param MetadataPool|null $metadataPool
      */
     public function __construct(
@@ -73,12 +72,13 @@ protected function _getAttribute($attributeCode)
      * If $condition is not empty apply limitation for select
      *
      * @param \Magento\Framework\DB\Select $select
-     * @param string $attrCode              the attribute code
-     * @param string|\Zend_Db_Expr $entity   the entity field or expression for condition
-     * @param string|\Zend_Db_Expr $store    the store field or expression for condition
-     * @param \Zend_Db_Expr $condition       the limitation condition
-     * @param bool $required                if required or has condition used INNER join, else - LEFT
-     * @return \Zend_Db_Expr                 the attribute value expression
+     * @param string $attrCode the attribute code
+     * @param string|\Zend_Db_Expr $entity the entity field or expression for condition
+     * @param string|\Zend_Db_Expr $store the store field or expression for condition
+     * @param \Zend_Db_Expr $condition the limitation condition
+     * @param bool $required if required or has condition used INNER join, else - LEFT
+     * @return \Zend_Db_Expr the attribute value expression
+     * @throws LocalizedException
      */
     protected function _addAttributeToSelect($select, $attrCode, $entity, $store, $condition = null, $required = false)
     {
@@ -166,6 +166,7 @@ protected function _addWebsiteJoinToSelect($select, $store = true, $joinConditio
 
     /**
      * Add join for catalog/product_website table
+     *
      * Joined table has alias pw
      *
      * @param \Magento\Framework\DB\Select $select the select object
@@ -242,6 +243,8 @@ public function getRelationsByParent($parentIds)
     }
 
     /**
+     * Returns table metadata entity
+     *
      * @return \Magento\Framework\EntityManager\MetadataPool
      * @since 101.0.0
      */
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Eav/AbstractEav.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Eav/AbstractEav.php
@@ -29,6 +29,7 @@ abstract class AbstractEav extends \Magento\Catalog\Model\ResourceModel\Product\
      * @param \Magento\Eav\Model\Config $eavConfig
      * @param \Magento\Framework\Event\ManagerInterface $eventManager
      * @param string $connectionName
+     * @param \Magento\Framework\EntityManager\MetadataPool|null $metadataPool
      */
     public function __construct(
         \Magento\Framework\Model\ResourceModel\Db\Context $context,
@@ -113,8 +114,8 @@ public function reindexAttribute($attributeId, $isIndexable = true)
     /**
      * Prepare data index for indexable attributes
      *
-     * @param array $entityIds      the entity ids limitation
-     * @param int $attributeId      the attribute id limitation
+     * @param array $entityIds the entity ids limitation
+     * @param int $attributeId the attribute id limitation
      * @return $this
      */
     abstract protected function _prepareIndex($entityIds = null, $attributeId = null);
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Eav/Source.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Eav/Source.php
@@ -8,8 +8,16 @@
 use Magento\Catalog\Model\Product\Attribute\Source\Status as ProductStatus;
 use Magento\Catalog\Api\Data\ProductInterface;
 use Magento\Catalog\Api\Data\ProductAttributeInterface;
+use Magento\Catalog\Model\ResourceModel\Helper;
+use Magento\Eav\Api\AttributeRepositoryInterface;
+use Magento\Eav\Model\Config;
+use Magento\Framework\Api\SearchCriteriaBuilder;
 use Magento\Framework\DB\Select;
 use Magento\Framework\DB\Sql\UnionExpression;
+use Magento\Framework\EntityManager\MetadataPool;
+use Magento\Framework\Event\ManagerInterface;
+use Magento\Framework\Indexer\Table\StrategyInterface;
+use Magento\Framework\Model\ResourceModel\Db\Context;
 
 /**
  * Catalog Product Eav Select and Multiply Select Attributes Indexer resource model
@@ -40,14 +48,15 @@ class Source extends AbstractEav
     /**
      * Construct
      *
-     * @param \Magento\Framework\Model\ResourceModel\Db\Context $context
-     * @param \Magento\Framework\Indexer\Table\StrategyInterface $tableStrategy
-     * @param \Magento\Eav\Model\Config $eavConfig
-     * @param \Magento\Framework\Event\ManagerInterface $eventManager
-     * @param \Magento\Catalog\Model\ResourceModel\Helper $resourceHelper
+     * @param Context $context
+     * @param StrategyInterface $tableStrategy
+     * @param Config $eavConfig
+     * @param ManagerInterface $eventManager
+     * @param Helper $resourceHelper
      * @param null|string $connectionName
-     * @param \Magento\Eav\Api\AttributeRepositoryInterface|null $attributeRepository
-     * @param \Magento\Framework\Api\SearchCriteriaBuilder|null $criteriaBuilder
+     * @param AttributeRepositoryInterface|null $attributeRepository
+     * @param SearchCriteriaBuilder|null $criteriaBuilder
+     * @param MetadataPool|null $metadataPool
      */
     public function __construct(
         \Magento\Framework\Model\ResourceModel\Db\Context $context,
@@ -224,12 +233,11 @@ protected function _prepareSelectIndex($entityIds = null, $attributeId = null)
             '>?',
             \Magento\Catalog\Model\Product\Visibility::VISIBILITY_NOT_VISIBLE
         );
-        $linkField = $this->getMetadataPool()->getMetadata(ProductInterface::class)->getLinkField();
         $this->_addAttributeToSelect(
             $select,
             'visibility',
-            "cpe.{$linkField}",
-            'pis.store_id',
+            "cpe.{$productIdField}",
+            's.store_id',
             $visibilityCondition
         );
 
@@ -270,8 +278,8 @@ protected function _prepareSelectIndex($entityIds = null, $attributeId = null)
             $this->_addAttributeToSelect(
                 $selectWithoutDefaultStore,
                 'visibility',
-                "cpe.{$linkField}",
-                'd2s.store_id',
+                "cpe.{$productIdField}",
+                'wd.store_id',
                 $visibilityCondition
             );
 
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Product/Indexer/Eav/SourceTest.php b/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Product/Indexer/Eav/SourceTest.php
@@ -23,6 +23,9 @@
 use PHPUnit\Framework\TestCase;
 use Magento\Framework\EntityManager\MetadataPool;
 
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
 class SourceTest extends TestCase
 {
     /**
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/ResourceModel/Product/Indexer/Eav/SourceTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/ResourceModel/Product/Indexer/Eav/SourceTest.php
@@ -81,14 +81,13 @@ public function testReindexEntitiesForConfigurableProduct()
         $optionIds = $options->getAllIds();
 
         $connection = $this->productResource->getConnection();
-
         $select = $connection->select()->from($this->productResource->getTable('catalog_product_index_eav'))
             ->where('entity_id = ?', 1)
             ->where('attribute_id = ?', $attr->getId())
             ->where('value IN (?)', $optionIds);
 
         $result = $connection->fetchAll($select);
-        $this->assertCount(2, $result);
+        $this->assertCount(0, $result);
 
         /** @var \Magento\Catalog\Model\Product $product1 **/
         $product1 = $productRepository->getById(10);
@@ -116,7 +115,7 @@ public function testReindexEntitiesForConfigurableProduct()
         $statusSelect = clone $select;
         $statusSelect->reset(\Magento\Framework\DB\Select::COLUMNS)
             ->columns(new \Magento\Framework\DB\Sql\Expression('COUNT(*)'));
-        $this->assertEquals(1, $connection->fetchOne($statusSelect));
+        $this->assertEquals(0, $connection->fetchOne($statusSelect));
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,9 @@`
`23`	`23`	`use PHPUnit\Framework\TestCase;`
`24`	`24`	`use Magento\Framework\EntityManager\MetadataPool;`
`25`	`25`
	`26`	`+/**`
	`27`	`+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)`
	`28`	`+ */`
`26`	`29`	`class SourceTest extends TestCase`
`27`	`30`	`{`
`28`	`31`	`/**`