#12804: [GitHub] Performance: Improve attribute deletion to take advantage of indexes

Author: serhii-balko

dev/tests/integration/testsuite/Magento/Catalog/Model/ResourceModel/AttributeTest.php

@@ -7,6 +7,7 @@
 
 use Magento\Catalog\Api\Data\ProductInterface;
 use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Eav\Model\Entity\Attribute as EavAttribute;
 use Magento\Framework\EntityManager\MetadataPool;
 
 /**
@@ -26,6 +27,11 @@ class AttributeTest extends \PHPUnit\Framework\TestCase
      */
     protected $productResource;
 
+    /**
+     * @var ProductRepositoryInterface
+     */
+    private $productRepository;
+
     /**
      * @var MetadataPool
      */
@@ -45,6 +51,7 @@ protected function setUp()
         $this->productResource = $this->objectManager->get(
             \Magento\Catalog\Model\ResourceModel\Product::class
         );
+        $this->productRepository = $this->objectManager->create(ProductRepositoryInterface::class);
         $this->metadataPool = $this->objectManager->get(MetadataPool::class);
     }
 
@@ -55,9 +62,10 @@ protected function setUp()
      */
     public function testDeleteEntity()
     {
-        /* @var \Magento\Eav\Model\Entity\Attribute $attribute */
-        $attribute = $this->objectManager->get(\Magento\Eav\Model\Entity\Attribute::class);
+        /* @var EavAttribute $attribute */
+        $attribute = $this->objectManager->get(EavAttribute::class);
         $attribute->loadByCode(\Magento\Catalog\Model\Product::ENTITY, 'text_attribute');
+        $product = $this->productRepository->get('simple');
 
         $entityEavAttributeRow = $this->getEavEntityAttributeRow(
             $attribute->getEntityTypeId(),
@@ -70,9 +78,8 @@ public function testDeleteEntity()
         );
 
         $entityAttributeValues = $this->getProductAttributeValues(
-            $attribute->getId(),
-            1,
-            'catalog_product_entity_text'
+            $attribute,
+            $product
         );
         $this->assertNotEmpty(
             $entityAttributeValues,
@@ -93,9 +100,8 @@ public function testDeleteEntity()
         );
 
         $entityAttributeValues = $this->getProductAttributeValues(
-            $attribute->getId(),
-            1,
-            'catalog_product_entity_text'
+            $attribute,
+            $product
         );
         $this->assertEmpty(
             $entityAttributeValues,
@@ -126,19 +132,21 @@ private function getEavEntityAttributeRow($entityTypeId, $attributeSetId, $attri
     /**
      * Retrieve product attribute values.
      *
-     * @param int $attributeId
-     * @param int $productId
-     * @param string $table
+     * @param EavAttribute $attribute
+     * @param ProductInterface $product
      * @return array
      */
-    private function getProductAttributeValues($attributeId, $productId, $table)
+    private function getProductAttributeValues($attribute, $product)
     {
+        $backendTable = $attribute->getBackend()->getTable();
         $linkField = $this->metadataPool->getMetadata(ProductInterface::class)->getLinkField();
+        $linkFieldValue = $product->getData($linkField);
+
         $connection = $this->productResource->getConnection();
         $select = $connection->select()
-            ->from($this->productResource->getTable($table))
-            ->where('attribute_id=?', $attributeId)
-            ->where($linkField . '=?', $productId);
+            ->from($this->productResource->getTable($backendTable))
+            ->where('attribute_id=?', $attribute->getId())
+            ->where($linkField . '=?', $linkFieldValue);
 
         return $connection->fetchAll($select);
     }