Merge remote-tracking branch 'magento-l3/ACP2E-2673' into ACP2E-2673

Author: aplapana

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

@@ -408,11 +408,11 @@ function ($type) use ($productsTypes) {
                 foreach ($this->dimensionCollectionFactory->create() as $dimensions) {
                     $this->tableMaintainer->createMainTmpTable($dimensions);
                     $temporaryTable = $this->tableMaintainer->getMainTmpTable($dimensions);
+                    $this->_emptyTable($temporaryTable);
                     $indexer->executeByDimensions($dimensions, \SplFixedArray::fromArray($entityIds, false));
                     $mainTable = $this->tableMaintainer->getMainTableByDimensions($dimensions);
                     $this->_insertFromTable($temporaryTable, $mainTable);
                     $this->deleteOutdatedData($entityIds, $temporaryTable, $mainTable);
-                    $this->_connection->dropTable($temporaryTable);
                 }
             } else {
                 // handle 3d-party indexers for backward compatibility

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

@@ -144,7 +144,6 @@ public function testBatchProcessing()
         $adapter = $this->createMock(AdapterInterface::class);
         $adapter->method('select')->willReturn($select);
         $adapter->method('describeTable')->willReturn([]);
-        $adapter->expects($this->exactly(4))->method('dropTable');
         $this->defaultIndexerResource->method('getConnection')->willReturn($adapter);
         $adapter->method('fetchAll')->with($select)->willReturn([]);
 
@@ -194,21 +193,7 @@ public function testBatchProcessing()
             ->method('getPrimaryKeyName')
             ->willReturn('entity_id');
 
-        $actionRows = new Rows(
-            $this->config,
-            $this->storeManager,
-            $this->currencyFactory,
-            $this->localeDate,
-            $this->dateTime,
-            $this->catalogProductType,
-            $this->indexerPriceFactory,
-            $this->defaultIndexerResource,
-            $this->tierPriceIndexResource,
-            $this->dimensionCollectionFactory,
-            $this->tableMaintainer,
-            2
-        );
-        $actionRows->execute($ids);
+        $this->actionRows->execute($ids);
     }
 
     public function testDeletedProductsBatchProcessing()

app/code/Magento/Deploy/Service/DeployPackage.php

@@ -8,6 +8,7 @@
 use Magento\Deploy\Package\Package;
 use Magento\Deploy\Package\PackageFile;
 use Magento\Framework\App\State as AppState;
+use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Locale\ResolverInterface as LocaleResolver;
 use Magento\Framework\View\Asset\ContentProcessorException;
 use Magento\Deploy\Console\InputValidator;
@@ -138,6 +139,7 @@ public function deployEmulated(Package $package, array $options, $skipLogging =
                 $this->errorsCount++;
                 $this->logger->critical($errorMessage);
                 $package->deleteFile($file->getFileId());
+                throw new LocalizedException($errorMessage);
             } catch (\Exception $exception) {
                 $this->logger->critical(
                     'Compilation from source ' . $file->getSourcePath() . ' failed' . PHP_EOL . (string)$exception