ACP2E-1028: Current Indexer implementation for large catalogs is causing items to not appear on site.

Author: dhorytskyi

app/code/Magento/Catalog/Model/Indexer/Product/Price/AbstractAction.php

@@ -387,13 +387,20 @@ protected function _reindexRows($changedIds = [])
         $changedIds = array_unique(array_merge($changedIds, ...array_values($parentProductsTypes)));
         $productsTypes = array_merge_recursive($productsTypes, $parentProductsTypes);
 
-        $typeIndexers = $this->getTypeIndexers();
-        foreach ($typeIndexers as $productType => $indexer) {
-            $entityIds = $productsTypes[$productType] ?? [];
-            if (empty($entityIds)) {
-                continue;
-            }
+        $typeIndexers = array_filter(
+            $this->getTypeIndexers(),
+            function ($type) use ($productsTypes) {
+                return isset($productsTypes[$type]) && !empty($productsTypes[$type]);
+            },
+            ARRAY_FILTER_USE_KEY
+        );
+        if (empty($typeIndexers)) {
+            $this->deleteIndexData($changedIds);
+            return $changedIds;
+        }
 
+        foreach ($typeIndexers as $productType => $indexer) {
+            $entityIds = $productsTypes[$productType];
             if ($indexer instanceof DimensionalIndexerInterface) {
                 foreach ($this->dimensionCollectionFactory->create() as $dimensions) {
                     $this->tableMaintainer->createMainTmpTable($dimensions);

app/code/Magento/Catalog/Test/Unit/Model/Indexer/Product/Price/Action/RowsTest.php

@@ -195,4 +195,63 @@ public function testBatchProcessing()
 
         $this->actionRows->execute($ids);
     }
+
+    public function testDeletedProductsBatchProcessing()
+    {
+        $ids = [1, 2, 3, 4];
+
+        $select = $this->createMock(Select::class);
+        $select->method('from')->willReturnSelf();
+        $select->method('joinLeft')->willReturnSelf();
+        $select->method('where')->willReturnSelf();
+        $select->method('join')->willReturnSelf();
+        $adapter = $this->createMock(AdapterInterface::class);
+        $adapter->method('select')->willReturn($select);
+        $adapter->method('describeTable')->willReturn([]);
+        $this->defaultIndexerResource->method('getConnection')->willReturn($adapter);
+        $adapter->method('fetchAll')->with($select)->willReturn([]);
+
+        $adapter->expects($this->exactly(4))
+            ->method('fetchPairs')
+            ->with($select)
+            ->willReturnOnConsecutiveCalls([], [], [], []);
+        $multiDimensionProvider = $this->createMock(MultiDimensionProvider::class);
+        $this->dimensionCollectionFactory->expects($this->exactly(2))
+            ->method('create')
+            ->willReturn($multiDimensionProvider);
+        $dimension = $this->createMock(Dimension::class);
+        $dimension->method('getName')->willReturn('default');
+        $dimension->method('getValue')->willReturn('0');
+        $iterator = new \ArrayIterator([[$dimension]]);
+        $multiDimensionProvider->expects($this->exactly(2))
+            ->method('getIterator')
+            ->willReturn($iterator);
+        $this->catalogProductType->expects($this->once())
+            ->method('getTypesByPriority')
+            ->willReturn(
+                [
+                    'virtual' => ['price_indexer' => '\Price\Indexer'],
+                    'simple' => ['price_indexer' => '\Price\Indexer'],
+                ]
+            );
+        $priceIndexer = $this->createMock(DimensionalIndexerInterface::class);
+        $this->indexerPriceFactory->expects($this->exactly(2))
+            ->method('create')
+            ->with('\Price\Indexer', ['fullReindexAction' => false])
+            ->willReturn($priceIndexer);
+        $priceIndexer->expects($this->never())
+            ->method('executeByDimensions');
+        $select->expects($this->exactly(2))
+            ->method('deleteFromSelect')
+            ->with('index_price')
+            ->willReturn('');
+        $adapter->expects($this->exactly(2))
+            ->method('getIndexList')
+            ->willReturn(['entity_id'=>['COLUMNS_LIST'=>['test']]]);
+        $adapter->expects($this->exactly(2))
+            ->method('getPrimaryKeyName')
+            ->willReturn('entity_id');
+
+        $this->actionRows->execute($ids);
+    }
 }