MAGETWO-64669: Performance degradation for bundle product if price view set as from..to

Author: AVoskoboinikov

app/code/Magento/Bundle/Model/Product/Type.php

@@ -344,7 +344,7 @@ public function isVirtual($product)
                 }
             }
 
-            return $virtualCount == count($selections);
+            return $virtualCount === $selections->getSize();
         }
 
         return false;
@@ -627,7 +627,7 @@ protected function _prepareProduct(\Magento\Framework\DataObject $buyRequest, $p
                 if (!empty($selectionIds)) {
                     $selections = $this->getSelectionsByIds($selectionIds, $product);
 
-                    if (count($selections->getItems()) !== count($selectionIds)) {
+                    if ($selections->getSize() !== count($selectionIds)) {
                         throw new \Magento\Framework\Exception\LocalizedException(
                             __('The options you selected are not available.')
                         );
@@ -972,7 +972,7 @@ public function hasOptions($product)
             ->getAllIds();
         $collection = $this->getSelectionsCollection($optionIds, $product);
 
-        if (count($collection) > 0 || $product->getOptions()) {
+        if ($collection->getSize() > 0 || $product->getOptions()) {
             return true;
         }
 

app/code/Magento/Bundle/Pricing/Price/BundleOptionPrice.php

@@ -109,9 +109,14 @@ public function getOptions()
      */
     public function getOptionSelectionAmount($selection)
     {
-        $selectionPrice = $this->selectionFactory
-            ->create($this->product, $selection, $selection->getSelectionQty());
-        return $selectionPrice->getAmount();
+        $cacheKey = implode('_', [$this->product->getId(), $selection->getOptionId()]);
+        if (!isset($this->optionSelecionAmountCache[$cacheKey])) {
+            $selectionPrice = $this->selectionFactory
+                ->create($this->product, $selection, $selection->getSelectionQty());
+            $this->optionSelecionAmountCache[$cacheKey] =  $selectionPrice->getAmount();
+        }
+
+        return $this->optionSelecionAmountCache[$cacheKey];
     }
 
     /**