BUG#AC-1705

Author: glo80326

app/code/Magento/Catalog/Model/Indexer/Product/Price/Action/Rows.php

@@ -5,14 +5,17 @@
  */
 namespace Magento\Catalog\Model\Indexer\Product\Price\Action;
 
-use Magento\Directory\Model\CurrencyFactory;
 use Magento\Catalog\Model\Indexer\Product\Price\DimensionCollectionFactory;
 use Magento\Catalog\Model\Indexer\Product\Price\TableMaintainer;
+use Magento\Catalog\Model\Product;
 use Magento\Catalog\Model\Product\Type;
 use Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\DefaultPrice;
 use Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\Factory;
 use Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\TierPrice;
+use Magento\Directory\Model\CurrencyFactory;
 use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Indexer\CacheContext;
 use Magento\Framework\Stdlib\DateTime;
 use Magento\Framework\Stdlib\DateTime\TimezoneInterface;
 use Magento\Store\Model\StoreManagerInterface;
@@ -34,6 +37,11 @@ class Rows extends \Magento\Catalog\Model\Indexer\Product\Price\AbstractAction
      */
     private $batchSize;
 
+    /**
+     * @var CacheContext
+     */
+    private CacheContext $cacheContext;
+
     /**
      * @param ScopeConfigInterface $config
      * @param StoreManagerInterface $storeManager
@@ -63,7 +71,8 @@ public function __construct(
         TierPrice $tierPriceIndexResource = null,
         DimensionCollectionFactory $dimensionCollectionFactory = null,
         TableMaintainer $tableMaintainer = null,
-        ?int $batchSize = null
+        ?int $batchSize = null,
+        CacheContext $cacheContext = null
     ) {
         parent::__construct(
             $config,
@@ -79,6 +88,7 @@ public function __construct(
             $tableMaintainer
         );
         $this->batchSize = $batchSize ?? self::BATCH_SIZE;
+        $this->cacheContext = $cacheContext ?? ObjectManager::getInstance()->get(CacheContext::class);
     }
 
     /**
@@ -101,7 +111,7 @@ public function execute($ids)
             $currentBatch[] = $id;
             if (++$i === $this->batchSize) {
                 try {
-                    $this->_reindexRows($currentBatch);
+                    $this->cacheContext->registerEntities(Product::CACHE_TAG, $this->_reindexRows($currentBatch));
                 } catch (\Exception $e) {
                     throw new \Magento\Framework\Exception\LocalizedException(__($e->getMessage()), $e);
                 }
@@ -112,7 +122,7 @@ public function execute($ids)
 
         if (!empty($currentBatch)) {
             try {
-                $this->_reindexRows($currentBatch);
+                $this->cacheContext->registerEntities(Product::CACHE_TAG, $this->_reindexRows($currentBatch));
             } catch (\Exception $e) {
                 throw new \Magento\Framework\Exception\LocalizedException(__($e->getMessage()), $e);
             }