Merge pull request #864 from magento-nord/SPRINT-30-NORD

- MAGETWO-64890: Catalog performance improvement

Author: balex13

app/code/Magento/Catalog/Model/ProductIdLocator.php

@@ -8,10 +8,16 @@
 
 /**
  * Product ID locator provides all product IDs by SKUs.
- * @api
  */
 class ProductIdLocator implements \Magento\Catalog\Model\ProductIdLocatorInterface
 {
+    /**
+     * Limit values for array IDs by SKU.
+     *
+     * @var int
+     */
+    private $idsLimit;
+
     /**
      * Metadata pool.
      *
@@ -34,13 +40,16 @@ class ProductIdLocator implements \Magento\Catalog\Model\ProductIdLocatorInterfa
     /**
      * @param \Magento\Framework\EntityManager\MetadataPool $metadataPool
      * @param \Magento\Catalog\Model\ResourceModel\Product\CollectionFactory $collectionFactory
+     * @param string $limitIdsBySkuValues
      */
     public function __construct(
         \Magento\Framework\EntityManager\MetadataPool $metadataPool,
-        \Magento\Catalog\Model\ResourceModel\Product\CollectionFactory $collectionFactory
+        \Magento\Catalog\Model\ResourceModel\Product\CollectionFactory $collectionFactory,
+        $idsLimit
     ) {
         $this->metadataPool = $metadataPool;
         $this->collectionFactory = $collectionFactory;
+        $this->idsLimit = (int)$idsLimit;
     }
 
     /**
@@ -75,7 +84,19 @@ public function retrieveProductIdsBySkus(array $skus)
                 $productIds[$sku] = $this->idsBySku[$unifiedSku];
             }
         }
-
+        $this->truncateToLimit();
         return $productIds;
     }
+
+    /**
+     * Cleanup IDs by SKU cache more than some limit.
+     *
+     * @return void
+     */
+    private function truncateToLimit()
+    {
+        if (count($this->idsBySku) > $this->idsLimit) {
+            $this->idsBySku = array_slice($this->idsBySku, round($this->idsLimit / -2));
+        }
+    }
 }

app/code/Magento/Catalog/Model/ProductIdLocatorInterface.php

@@ -7,6 +7,7 @@
 
 /**
  * Product ID locator provides all product IDs by SKU.
+ * @api
  */
 interface ProductIdLocatorInterface
 {

app/code/Magento/Catalog/etc/di.xml

@@ -157,6 +157,11 @@
             <argument name="perPageValues" xsi:type="string">9,15,30</argument>
         </arguments>
     </type>
+    <type name="Magento\Catalog\Model\ProductIdLocator">
+        <arguments>
+            <argument name="idsLimit" xsi:type="number">1000</argument>
+        </arguments>
+    </type>
     <type name="Magento\Catalog\Model\Config\Source\ListPerPage">
         <arguments>
             <argument name="options" xsi:type="string">5,10,15,20,25</argument>

dev/tests/integration/testsuite/Magento/Customer/Model/Config/Source/Group/MultiselectTest.php

@@ -29,13 +29,16 @@ public function testToOptionArray()
             }
         }
         sort($optionsToCompare);
-        $this->assertEquals(
-            [
-                ['value' => 1, 'label' => 'General'],
-                ['value' => 2, 'label' => 'Wholesale'],
-                ['value' => 3, 'label' => 'Retailer'],
-            ],
-            $optionsToCompare
-        );
+        foreach ($optionsToCompare as $item) {
+            $this->assertContains(
+                $item,
+                [
+                    ['value' => 1, 'label' => 'Default (General)'],
+                    ['value' => 1, 'label' => 'General'],
+                    ['value' => 2, 'label' => 'Wholesale'],
+                    ['value' => 3, 'label' => 'Retailer'],
+                ]
+            );
+        }
     }
 }