MAGETWO-66829: [Performance] Join to product entity table cause locks…

… on order page/api
magento · Mar 29, 2017 · 7e2712d · 7e2712d
1 parent ab23fb9
commit 7e2712d
Show file tree

Hide file tree

Showing 2 changed files with 112 additions and 3 deletions.
diff --git a/app/code/Magento/CatalogInventory/Model/ResourceModel/Stock.php b/app/code/Magento/CatalogInventory/Model/ResourceModel/Stock.php
@@ -125,13 +125,23 @@ public function lockProductsStock($productIds, $websiteId)
             return [];
         }
         $itemTable = $this->getTable('cataloginventory_stock_item');
-        $productTable = $this->getTable('catalog_product_entity');
         $select = $this->getConnection()->select()->from(['si' => $itemTable])
-            ->join(['p' => $productTable], 'p.entity_id=si.product_id', ['type_id'])
             ->where('website_id=?', $websiteId)
             ->where('product_id IN(?)', $productIds)
             ->forUpdate(true);
-        return $this->getConnection()->fetchAll($select);
+
+        $productTable = $this->getTable('catalog_product_entity');
+        $selectProducts = $this->getConnection()->select()->from(['p' => $productTable], [])
+            ->where('entity_id IN (?)', $productIds)
+            ->columns(
+                [
+                    'product_id' => 'entity_id',
+                    'type_id' => 'type_id'
+                ]
+            );
+        $this->getConnection()->query($select);
+
+        return $this->getConnection()->fetchAll($selectProducts);
     }
 
     /**

diff --git a/app/code/Magento/CatalogInventory/Test/Unit/Model/ResourceModel/StockTest.php b/app/code/Magento/CatalogInventory/Test/Unit/Model/ResourceModel/StockTest.php
@@ -0,0 +1,99 @@
+<?php
+/**
+ * Copyright © 2013-2017 Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\CatalogInventory\Test\Unit\Model\ResourceModel;
+
+use Magento\Framework\Model\ResourceModel\Db\Context;
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\CatalogInventory\Model\ResourceModel\Stock;
+
+/**
+ * Class StockTest
+ */
+class StockTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @var Context|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $contextMock;
+
+    /**
+     * @var ResourceConnection|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $resourceMock;
+
+    /**
+     * @var Stock
+     */
+    private $stockModel;
+
+    public function setUp()
+    {
+        $this->contextMock = $this->getMockBuilder(Context::class)->disableOriginalConstructor()->getMock();
+        $this->resourceMock = $this->getMockBuilder(ResourceConnection::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->contextMock->expects($this->once())->method('getResources')->willReturn($this->resourceMock);
+
+        $this->stockModel = (new ObjectManager($this))->getObject(
+            Stock::class,
+            [
+                'context' => $this->contextMock
+            ]
+        );
+    }
+
+    public function testLockProductsStock()
+    {
+        $productIds = [1, 2];
+        $websiteId = 1;
+        $itemTable = 'item_table';
+        $productTable = 'product_table';
+
+        $connectionMock = $this->getMockBuilder(\Magento\Framework\DB\Adapter\AdapterInterface::class)->getMock();
+        $this->resourceMock->method('getConnection')->will($this->returnValue($connectionMock));
+
+        $this->resourceMock->method('getTableName')
+            ->withConsecutive(['cataloginventory_stock_item'], ['catalog_product_entity'])
+            ->willReturnOnConsecutiveCalls($itemTable, $productTable);
+
+        $selectMock = $this->getMockBuilder(\Magento\Framework\DB\Select::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $selectProductsMock = clone $selectMock;
+
+        $selectMock->expects($this->once())->method('forUpdate')->with(true)->willReturnSelf();
+        $selectMock->expects($this->once())->method('from')->with(['si' => $itemTable])->willReturnSelf();
+        $selectMock->expects($this->exactly(2))
+            ->method('where')
+            ->withConsecutive(['website_id=?', $websiteId], ['product_id IN(?)', $productIds])
+            ->willReturnSelf();
+        $connectionMock->expects($this->exactly(2))
+            ->method('select')
+            ->willReturnOnConsecutiveCalls($selectMock, $selectProductsMock);
+
+        $selectProductsMock->expects($this->once())->method('from')->with(['p' => $productTable], [])->willReturnSelf();
+        $selectProductsMock->expects($this->once())->method('where')
+            ->with('entity_id IN (?)', $productIds)
+            ->willReturnSelf();
+        $selectProductsMock->expects($this->once())->method('columns')->willReturnSelf();
+
+        $connectionMock->expects($this->once())->method('query')->with($selectMock);
+        $connectionMock->expects($this->once())->method('fetchAll')->with($selectProductsMock)->willReturn([]);
+
+        $this->assertEquals([], $this->stockModel->lockProductsStock($productIds, $websiteId));
+    }
+
+    public function testLockNoProductsStock()
+    {
+        $productIds = [];
+        $websiteId = 1;
+
+        $this->assertEquals([], $this->stockModel->lockProductsStock($productIds, $websiteId));
+    }
+}