ACP2E-1875: [Magento Cloud] Products incorrectly showed Out of Stock then all products show in stock

- stacked indexer actions

Author: aplapana

app/code/Magento/CatalogSearch/Model/Indexer/Fulltext.php

@@ -10,9 +10,9 @@
 use Magento\CatalogSearch\Model\Indexer\Scope\State;
 use Magento\CatalogSearch\Model\Indexer\Scope\StateFactory;
 use Magento\CatalogSearch\Model\ResourceModel\Fulltext as FulltextResource;
-use Magento\Elasticsearch\Model\Indexer\EnhancedIndexerHandler;
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Indexer\DimensionProviderInterface;
+use Magento\Framework\Indexer\SaveHandler\EnhancedIndexerInterface;
 use Magento\Store\Model\StoreDimensionProvider;
 use Magento\Indexer\Model\ProcessManager;
 use Magento\Framework\App\DeploymentConfig;
@@ -102,7 +102,7 @@ class Fulltext implements
     private $deploymentConfig;
 
     /**
-     * @var EnhancedIndexerHandler
+     * @var EnhancedIndexerInterface
      */
     private $enhancedIndexerHandler;
 
@@ -117,7 +117,7 @@ class Fulltext implements
      * @param ProcessManager|null $processManager
      * @param int|null $batchSize
      * @param DeploymentConfig|null $deploymentConfig
-     * @param EnhancedIndexerHandler|null $enhancedIndexerHandler
+     * @param EnhancedIndexerInterface|null $enhancedIndexerHandler
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
@@ -132,7 +132,7 @@ public function __construct(
         ProcessManager $processManager = null,
         ?int $batchSize = null,
         ?DeploymentConfig $deploymentConfig = null,
-        ?EnhancedIndexerHandler $enhancedIndexerHandler = null
+        ?EnhancedIndexerInterface $enhancedIndexerHandler = null
     ) {
         $this->fullAction = $fullActionFactory->create(['data' => $data]);
         $this->indexerHandlerFactory = $indexerHandlerFactory;
@@ -145,7 +145,7 @@ public function __construct(
         $this->batchSize = $batchSize ?? self::BATCH_SIZE;
         $this->deploymentConfig = $deploymentConfig ?: ObjectManager::getInstance()->get(DeploymentConfig::class);
         $this->enhancedIndexerHandler = $enhancedIndexerHandler ?:
-            ObjectManager::getInstance()->create(EnhancedIndexerHandler::class, ['data' => $this->data]);
+            ObjectManager::getInstance()->create(EnhancedIndexerInterface::class, ['data' => $this->data]);
     }
 
     /**
@@ -212,13 +212,13 @@ public function executeByDimensions(array $dimensions, \Traversable $entityIds =
     /**
      * Process batch
      *
-     * @param EnhancedIndexerHandler $saveHandler
+     * @param EnhancedIndexerInterface $saveHandler
      * @param array $dimensions
      * @param array $entityIds
      * @throws \Exception
      */
     private function processBatch(
-        EnhancedIndexerHandler $saveHandler,
+        EnhancedIndexerInterface $saveHandler,
         array $dimensions,
         array $entityIds
     ) : void {

app/code/Magento/Elasticsearch/Model/Indexer/EnhancedIndexerHandler.php

@@ -15,8 +15,9 @@
 use Magento\Framework\Indexer\CacheContext;
 use Magento\Framework\Indexer\IndexStructureInterface;
 use Magento\Framework\Indexer\SaveHandler\Batch;
+use Magento\Framework\Indexer\SaveHandler\EnhancedIndexerInterface;
 
-class EnhancedIndexerHandler extends IndexerHandler
+class EnhancedIndexerHandler extends IndexerHandler implements EnhancedIndexerInterface
 {
     /**
      * @var ElasticsearchAdapter
@@ -35,6 +36,7 @@ class EnhancedIndexerHandler extends IndexerHandler
      * @param DeploymentConfig|null $deploymentConfig
      * @param CacheContext|null $cacheContext
      * @param Processor|null $processor
+     * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
         IndexStructureInterface $indexStructure,

app/code/Magento/Elasticsearch/etc/di.xml

@@ -16,6 +16,7 @@
     <preference for="Magento\Framework\Search\Dynamic\DataProviderInterface" type="Magento\Elasticsearch\SearchAdapter\Dynamic\DataProvider" />
     <preference for="Magento\CatalogSearch\Model\ResourceModel\Fulltext\Collection\SearchResultApplierInterface" type="Magento\Elasticsearch\Model\ResourceModel\Fulltext\Collection\SearchResultApplier"/>
     <preference for="Magento\Elasticsearch\Model\DataProvider\Base\GetSuggestionFrequencyInterface" type="Magento\Elasticsearch\Model\DataProvider\Base\GetSuggestionFrequency"/>
+    <preference for="Magento\Framework\Indexer\SaveHandler\EnhancedIndexerInterface" type="Magento\Elasticsearch\Model\Indexer\EnhancedIndexerHandler"/>
     <type name="Magento\Catalog\Model\Indexer\Category\Product\Action\Rows">
         <plugin name="catalogsearchFulltextProductAssignment" type="Magento\Elasticsearch\Model\Indexer\Fulltext\Plugin\Category\Product\Action\Rows"/>
     </type>

app/code/Magento/Elasticsearch7/etc/di.xml

@@ -6,6 +6,7 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
+    <preference for="Magento\Framework\Indexer\SaveHandler\EnhancedIndexerInterface" type="Magento\Elasticsearch\Model\Indexer\EnhancedIndexerHandler"/>
     <type name="Magento\Elasticsearch\Model\Config">
         <arguments>
             <argument name="engineList" xsi:type="array">

app/code/Magento/OpenSearch/etc/di.xml

@@ -7,6 +7,7 @@
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
+    <preference for="Magento\Framework\Indexer\SaveHandler\EnhancedIndexerInterface" type="Magento\Elasticsearch\Model\Indexer\EnhancedIndexerHandler"/>
     <type name="Magento\Elasticsearch\Model\Config">
         <arguments>
             <argument name="engineList" xsi:type="array">

lib/internal/Magento/Framework/Indexer/SaveHandler/EnhancedIndexerInterface.php

@@ -0,0 +1,21 @@
+<?php
+
+namespace Magento\Framework\Indexer\SaveHandler;
+
+interface EnhancedIndexerInterface extends IndexerInterface
+{
+    /**
+     * @return void
+     */
+    public function disableStackedActions(): void;
+
+    /**
+     * @return void
+     */
+    public function enableStackedActions(): void;
+
+    /**
+     * @return void
+     */
+    public function triggerStackedActions(): void;
+}