Merge commit 'refs/pull/1567/head' of github.com:magento/magento2ce into 2.2-develop

Author: Andrey Konosov

app/code/Magento/Catalog/Model/Product/Attribute/Backend/GroupPrice/AbstractGroupPrice.php

@@ -360,7 +360,7 @@ protected function modifyPriceData($object, $data)
     {
         /** @var array $priceItem */
         foreach ($data as $key => $priceItem) {
-            if (isset($priceItem['price']) && $priceItem['price'] > 0) {
+            if (array_key_exists('price', $priceItem)) {
                 $data[$key]['website_price'] = $priceItem['price'];
             }
             if ($priceItem['all_groups']) {

app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Price/IndexTableRowSizeEstimator.php

@@ -15,7 +15,7 @@ class IndexTableRowSizeEstimator implements \Magento\Framework\Indexer\IndexTabl
     /**
      * Calculated memory size for one record in catalog_product_index_price table
      */
-    const MEMORY_SIZE_FOR_ONE_ROW = 120;
+    const MEMORY_SIZE_FOR_ONE_ROW = 200;
 
     /**
      * @var \Magento\Store\Api\WebsiteManagementInterface

app/code/Magento/Catalog/Test/Unit/Model/Product/Attribute/Backend/TierpriceTest.php

@@ -141,6 +141,10 @@ public function testSetPriceData()
     {
         $attributeName = 'tier_price';
         $tierPrices = [
+            [
+                'price' => 0,
+                'all_groups' => 1,
+            ],
             [
                 'price' => 10,
                 'all_groups' => 1,
@@ -153,6 +157,12 @@ public function testSetPriceData()
         $productPrice = 20;
         $allCustomersGroupId = 32000;
         $finalTierPrices = [
+            [
+                'price' => 0,
+                'all_groups' => 1,
+                'website_price' => 0,
+                'cust_group' => 32000,
+            ],
             [
                 'price' => 10,
                 'all_groups' => 1,
@@ -170,8 +180,11 @@ public function testSetPriceData()
             ->disableOriginalConstructor()->getMock();
         $allCustomersGroup = $this->getMockBuilder(\Magento\Customer\Api\Data\GroupInterface::class)
             ->disableOriginalConstructor()->getMock();
-        $this->groupManagement->expects($this->once())->method('getAllCustomersGroup')->willReturn($allCustomersGroup);
-        $allCustomersGroup->expects($this->once())->method('getId')->willReturn($allCustomersGroupId);
+        $this->groupManagement
+            ->expects($this->exactly(2))
+            ->method('getAllCustomersGroup')
+            ->willReturn($allCustomersGroup);
+        $allCustomersGroup->expects($this->exactly(2))->method('getId')->willReturn($allCustomersGroupId);
         $object->expects($this->once())->method('getPrice')->willReturn($productPrice);
         $this->attribute->expects($this->atLeastOnce())->method('isScopeGlobal')->willReturn(true);
         $object->expects($this->once())->method('getStoreId')->willReturn(null);

app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Product/Indexer/Price/IndexTableRowSizeEstimatorTest.php

@@ -38,7 +38,7 @@ protected function setUp()
 
     public function testEstimateRowSize()
     {
-        $expectedValue = 2400000;
+        $expectedValue = 4000000;
 
         $this->websiteManagementMock->expects($this->once())->method('getCount')->willReturn(100);
         $collectionMock = $this->createMock(\Magento\Customer\Model\ResourceModel\Group\Collection::class);