MC-42025: Bad performance and outages after upgrade to MariaDB 10.2.34

Author: dhorytskyi

app/code/Magento/Sales/Test/Unit/Model/ResourceModel/GridTest.php

@@ -10,6 +10,7 @@
 use Magento\Framework\DB\Adapter\AdapterInterface as ConnectionAdapterInterface;
 use Magento\Framework\DB\Select;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Sales\Model\Grid\LastUpdateTimeCache;
 use Magento\Sales\Model\ResourceModel\Grid;
 use Magento\Sales\Model\ResourceModel\Provider\NotSyncedDataProviderInterface;
 use PHPUnit\Framework\MockObject\MockObject;
@@ -59,14 +60,9 @@ class GridTest extends TestCase
     protected function setUp(): void
     {
         $objectManager = new ObjectManager($this);
-        $this->notSyncedDataProvider = $this->getMockBuilder(NotSyncedDataProviderInterface::class)
-            ->disableOriginalConstructor()
-            ->setMethods(['getIds'])
-            ->getMockForAbstractClass();
-        $this->connection = $this->getMockBuilder(ConnectionAdapterInterface::class)
-            ->disableOriginalConstructor()
-            ->setMethods(['select', 'fetchAll', 'insertOnDuplicate'])
-            ->getMockForAbstractClass();
+        $this->notSyncedDataProvider = $this->createMock(NotSyncedDataProviderInterface::class);
+        $this->connection = $this->createMock(ConnectionAdapterInterface::class);
+        $lastUpdateTimeCache = $this->createMock(LastUpdateTimeCache::class);
 
         $this->grid = $objectManager->getObject(
             Grid::class,
@@ -76,7 +72,8 @@ protected function setUp(): void
                 'gridTableName' => $this->gridTable,
                 'connection' => $this->connection,
                 '_tables' => ['sales_order' => $this->mainTable, 'sales_order_grid' => $this->gridTable],
-                'columns' => $this->columns
+                'columns' => $this->columns,
+                'lastUpdateTimeCache' => $lastUpdateTimeCache,
             ]
         );
     }
@@ -87,23 +84,36 @@ protected function setUp(): void
     public function testRefreshBySchedule()
     {
         $notSyncedIds = ['1', '2', '3'];
-        $fetchResult = ['column_1' => '1', 'column_2' => '2'];
+        $fetchResult = [
+            ['entity_id' => 1, 'updated_at' => date('Y-m-d H:i:s')],
+            ['entity_id' => 2, 'updated_at' => date('Y-m-d H:i:s')],
+        ];
 
-        $this->notSyncedDataProvider->expects($this->atLeastOnce())->method('getIds')->willReturn($notSyncedIds);
-        $select = $this->getMockBuilder(Select::class)
-            ->disableOriginalConstructor()
-            ->setMethods(['from', 'columns', 'where'])
-            ->getMock();
-        $select->expects($this->atLeastOnce())->method('from')->with(['sales_order' => $this->mainTable], [])
+        $this->notSyncedDataProvider->expects($this->atLeastOnce())
+            ->method('getIds')
+            ->willReturn($notSyncedIds);
+        $select = $this->createMock(Select::class);
+        $select->expects($this->atLeastOnce())
+            ->method('from')
+            ->with(['sales_order' => $this->mainTable], [])
             ->willReturnSelf();
-        $select->expects($this->atLeastOnce())->method('columns')->willReturnSelf();
-        $select->expects($this->atLeastOnce())->method('where')
+        $select->expects($this->atLeastOnce())
+            ->method('columns')
+            ->willReturnSelf();
+        $select->expects($this->atLeastOnce())
+            ->method('where')
             ->with($this->mainTable . '.entity_id IN (?)', $notSyncedIds)
             ->willReturnSelf();
 
-        $this->connection->expects($this->atLeastOnce())->method('select')->willReturn($select);
-        $this->connection->expects($this->atLeastOnce())->method('fetchAll')->with($select)->willReturn($fetchResult);
-        $this->connection->expects($this->atLeastOnce())->method('insertOnDuplicate')
+        $this->connection->expects($this->atLeastOnce())
+            ->method('select')
+            ->willReturn($select);
+        $this->connection->expects($this->atLeastOnce())
+            ->method('fetchAll')
+            ->with($select)
+            ->willReturn($fetchResult);
+        $this->connection->expects($this->atLeastOnce())
+            ->method('insertOnDuplicate')
             ->with($this->gridTable, $fetchResult, array_keys($this->columns))
             ->willReturn(array_count_values($notSyncedIds));
 

dev/tests/integration/testsuite/Magento/Backend/Model/Dashboard/ChartTest.php

@@ -14,6 +14,7 @@
  * Verify chart data by different period.
  *
  * @magentoAppArea adminhtml
+ * @magentoAppIsolation enabled
  */
 class ChartTest extends TestCase
 {