Merge branch 'MC-42025' of https://github.com/magento-l3/magento2ce into TANGO_PR-05-11-2021_24

thiaramus · thiaramus · commit 4328261fccd8 · 2021-05-11T10:49:30.000-05:00
diff --git a/app/code/Magento/Sales/Model/Grid/LastUpdateTimeCache.php b/app/code/Magento/Sales/Model/Grid/LastUpdateTimeCache.php
@@ -0,0 +1,86 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Sales\Model\Grid;
+
+use Magento\Framework\App\CacheInterface;
+
+/**
+ * Cache for last grid update time.
+ */
+class LastUpdateTimeCache
+{
+    /**
+     * Prefix for cache key.
+     */
+    private const CACHE_PREFIX = 'LAST_GRID_UPDATE_TIME';
+
+    /**
+     * @var CacheInterface
+     */
+    private $cache;
+
+    /**
+     * @param CacheInterface $cache
+     */
+    public function __construct(CacheInterface $cache)
+    {
+        $this->cache = $cache;
+    }
+
+    /**
+     * Save last grid update time.
+     *
+     * @param string $gridTableName
+     * @param string $lastUpdatedAt
+     * @return void
+     */
+    public function save(string $gridTableName, string $lastUpdatedAt): void
+    {
+        $this->cache->save(
+            $lastUpdatedAt,
+            $this->getCacheKey($gridTableName),
+            [],
+            3600
+        );
+    }
+
+    /**
+     * Get last grid update time.
+     *
+     * @param string $gridTableName
+     * @return string|null
+     */
+    public function get(string $gridTableName): ?string
+    {
+        $lastUpdatedAt = $this->cache->load($this->getCacheKey($gridTableName));
+
+        return $lastUpdatedAt ?: null;
+    }
+
+    /**
+     * Remove last grid update time.
+     *
+     * @param string $gridTableName
+     * @return void
+     */
+    public function remove(string $gridTableName): void
+    {
+        $this->cache->remove($this->getCacheKey($gridTableName));
+    }
+
+    /**
+     * Generate cache key.
+     *
+     * @param string $gridTableName
+     * @return string
+     */
+    private function getCacheKey(string $gridTableName): string
+    {
+        return self::CACHE_PREFIX . ':' . $gridTableName;
+    }
+}
diff --git a/app/code/Magento/Sales/Model/ResourceModel/Grid.php b/app/code/Magento/Sales/Model/ResourceModel/Grid.php
@@ -8,10 +8,11 @@
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\DB\Adapter\AdapterInterface;
 use Magento\Framework\Model\ResourceModel\Db\Context;
+use Magento\Sales\Model\Grid\LastUpdateTimeCache;
 use Magento\Sales\Model\ResourceModel\Provider\NotSyncedDataProviderInterface;
 
 /**
- * Class Grid
+ * Sales order grid resource model.
  */
 class Grid extends AbstractGrid
 {
@@ -45,6 +46,11 @@ class Grid extends AbstractGrid
      */
     private $notSyncedDataProvider;
 
+    /**
+     * @var LastUpdateTimeCache
+     */
+    private $lastUpdateTimeCache;
+
     /**
      * Order grid rows batch size
      */
@@ -58,7 +64,8 @@ class Grid extends AbstractGrid
      * @param array $joins
      * @param array $columns
      * @param string $connectionName
-     * @param NotSyncedDataProviderInterface $notSyncedDataProvider
+     * @param NotSyncedDataProviderInterface|null $notSyncedDataProvider
+     * @param LastUpdateTimeCache|null $lastUpdateTimeCache
      */
     public function __construct(
         Context $context,
@@ -68,15 +75,19 @@ public function __construct(
         array $joins = [],
         array $columns = [],
         $connectionName = null,
-        NotSyncedDataProviderInterface $notSyncedDataProvider = null
+        NotSyncedDataProviderInterface $notSyncedDataProvider = null,
+        LastUpdateTimeCache $lastUpdateTimeCache = null
     ) {
         $this->mainTableName = $mainTableName;
         $this->gridTableName = $gridTableName;
         $this->orderIdField = $orderIdField;
         $this->joins = $joins;
         $this->columns = $columns;
-        $this->notSyncedDataProvider =
-            $notSyncedDataProvider ?: ObjectManager::getInstance()->get(NotSyncedDataProviderInterface::class);
+        $this->notSyncedDataProvider = $notSyncedDataProvider ??
+            ObjectManager::getInstance()->get(NotSyncedDataProviderInterface::class);
+        $this->lastUpdateTimeCache = $lastUpdateTimeCache ??
+            ObjectManager::getInstance()->get(LastUpdateTimeCache::class);
+
         parent::__construct($context, $connectionName);
     }
 
@@ -118,6 +129,7 @@ public function refresh($value, $field = null)
      */
     public function refreshBySchedule()
     {
+        $lastUpdatedAt = null;
         $notSyncedIds = $this->notSyncedDataProvider->getIds($this->mainTableName, $this->gridTableName);
         foreach (array_chunk($notSyncedIds, self::BATCH_SIZE) as $bunch) {
             $select = $this->getGridOriginSelect()->where($this->mainTableName . '.entity_id IN (?)', $bunch);
@@ -127,6 +139,15 @@ public function refreshBySchedule()
                 $fetchResult,
                 array_keys($this->columns)
             );
+
+            $timestamps = array_column($fetchResult, 'updated_at');
+            if ($timestamps) {
+                $lastUpdatedAt = max(max($timestamps), $lastUpdatedAt);
+            }
+        }
+
+        if ($lastUpdatedAt) {
+            $this->lastUpdateTimeCache->save($this->gridTableName, $lastUpdatedAt);
         }
     }
 
diff --git a/app/code/Magento/Sales/Model/ResourceModel/Provider/UpdatedAtListProvider.php b/app/code/Magento/Sales/Model/ResourceModel/Provider/UpdatedAtListProvider.php
@@ -7,6 +7,7 @@
 
 use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\DB\Adapter\AdapterInterface;
+use Magento\Sales\Model\Grid\LastUpdateTimeCache;
 
 /**
  * Retrieves ID's of not synced by `updated_at` column entities.
@@ -25,36 +26,42 @@ class UpdatedAtListProvider implements NotSyncedDataProviderInterface
      */
     private $connection;
 
+    /**
+     * @var LastUpdateTimeCache
+     */
+    private $lastUpdateTimeCache;
+
     /**
      * @param ResourceConnection $resourceConnection
+     * @param LastUpdateTimeCache $lastUpdateTimeCache
      */
-    public function __construct(ResourceConnection $resourceConnection)
-    {
+    public function __construct(
+        ResourceConnection $resourceConnection,
+        LastUpdateTimeCache $lastUpdateTimeCache
+    ) {
         $this->connection = $resourceConnection->getConnection('sales');
         $this->resourceConnection = $resourceConnection;
+        $this->lastUpdateTimeCache = $lastUpdateTimeCache;
     }
 
     /**
      * @inheritdoc
      */
     public function getIds($mainTableName, $gridTableName)
     {
-        $mainTableName = $this->resourceConnection->getTableName($mainTableName);
-        $gridTableName = $this->resourceConnection->getTableName($gridTableName);
         $select = $this->connection->select()
-            ->from($mainTableName, [$mainTableName . '.entity_id'])
+            ->from(['main_table' => $this->resourceConnection->getTableName($mainTableName)], ['main_table.entity_id'])
             ->joinInner(
-                [$gridTableName => $gridTableName],
-                sprintf(
-                    '%s.entity_id = %s.entity_id AND %s.updated_at > %s.updated_at',
-                    $mainTableName,
-                    $gridTableName,
-                    $mainTableName,
-                    $gridTableName
-                ),
+                ['grid_table' => $this->resourceConnection->getTableName($gridTableName)],
+                'main_table.entity_id = grid_table.entity_id AND main_table.updated_at > grid_table.updated_at',
                 []
             );
 
+        $lastUpdatedAt = $this->lastUpdateTimeCache->get($gridTableName);
+        if ($lastUpdatedAt) {
+            $select->where('main_table.updated_at > ?', $lastUpdatedAt);
+        }
+
         return $this->connection->fetchAll($select, [], \Zend_Db::FETCH_COLUMN);
     }
 }
diff --git a/app/code/Magento/Sales/Test/Unit/Model/ResourceModel/GridTest.php b/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;
@@ -35,6 +36,11 @@ class GridTest extends TestCase
      */
     private $connection;
 
+    /**
+     * @var LastUpdateTimeCache|MockObject
+     */
+    private $lastUpdateTimeCache;
+
     /**
      * @var string
      */
@@ -49,8 +55,9 @@ class GridTest extends TestCase
      * @var array
      */
     private $columns = [
-        'column_1_key' => 'column_1_value',
-        'column_2_key' => 'column_2_value'
+        'entity_id' => 'sales_order.entity_id',
+        'status' => 'sales_order.status',
+        'updated_at' => 'sales_order.updated_at',
     ];
 
     /**
@@ -59,14 +66,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);
+        $this->lastUpdateTimeCache = $this->createMock(LastUpdateTimeCache::class);
 
         $this->grid = $objectManager->getObject(
             Grid::class,
@@ -76,7 +78,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' => $this->lastUpdateTimeCache,
             ]
         );
     }
@@ -87,26 +90,49 @@ protected function setUp(): void
     public function testRefreshBySchedule()
     {
         $notSyncedIds = ['1', '2', '3'];
-        $fetchResult = ['column_1' => '1', 'column_2' => '2'];
-
-        $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], [])
+        $fetchResult = [];
+        for ($i = 1; $i <= 220; $i++) {
+            $fetchResult[] = [
+                'entity_id' => $i,
+                'status' => 1,
+                'updated_at' => '2021-01-01 01:02:03',
+            ];
+        }
+        $fetchResult[50]['updated_at'] = '2021-02-03 01:02:03';
+        $fetchResult[150]['updated_at'] = '2021-03-04 01:02:03';
+
+        $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('columns')->willReturnSelf();
-        $select->expects($this->atLeastOnce())->method('where')
+        $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));
 
+        $this->lastUpdateTimeCache->expects($this->once())
+            ->method('save')
+            ->with($this->gridTable, '2021-03-04 01:02:03');
+
         $this->grid->refreshBySchedule();
     }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Sales/Model/ResourceModel/GridTest.php b/dev/tests/integration/testsuite/Magento/Sales/Model/ResourceModel/GridTest.php
