MAGETWO-95294: Mysql search slow on the catalog page

- changes after CR

Author: vgoncharenko

app/code/Magento/CatalogSearch/Model/ResourceModel/Advanced/Collection.php

@@ -266,6 +266,7 @@ public function setOrder($attribute, $dir = Select::SQL_DESC)
      */
     public function addCategoryFilter(\Magento\Catalog\Model\Category $category)
     {
+        /** This changes need in BIC reasons for support dynamic improved algorithm for price aggregation process. */
         if ($this->isCurrentEngineMysql()) {
             parent::addCategoryFilter($category);
         } else {
@@ -281,6 +282,7 @@ public function addCategoryFilter(\Magento\Catalog\Model\Category $category)
      */
     public function setVisibility($visibility)
     {
+        /** This changes need in BIC reasons for support dynamic improved algorithm for price aggregation process. */
         if ($this->isCurrentEngineMysql()) {
             parent::setVisibility($visibility);
         } else {

app/code/Magento/CatalogSearch/Model/ResourceModel/Fulltext/Collection.php

@@ -584,7 +584,12 @@ public function getFacetedData($field)
     public function addCategoryFilter(\Magento\Catalog\Model\Category $category)
     {
         $this->addFieldToFilter('category_ids', $category->getId());
-        $this->_productLimitationPrice();
+        /** This changes need in BIC reasons for support dynamic improved algorithm for price aggregation process. */
+        if ($this->isCurrentEngineMysql()) {
+            parent::addCategoryFilter($category);
+        } else {
+            $this->_productLimitationPrice();
+        }
 
         return $this;
     }
@@ -598,6 +603,10 @@ public function addCategoryFilter(\Magento\Catalog\Model\Category $category)
     public function setVisibility($visibility)
     {
         $this->addFieldToFilter('visibility', $visibility);
+        /** This changes need in BIC reasons for support dynamic improved algorithm for price aggregation process. */
+        if ($this->isCurrentEngineMysql()) {
+            parent::setVisibility($visibility);
+        }
 
         return $this;
     }

app/code/Magento/Elasticsearch/Model/ResourceModel/Fulltext/Collection/SearchCriteriaResolver.php

@@ -61,7 +61,7 @@ public function __construct(
         string $searchRequestName,
         int $currentPage,
         int $size,
-        array $orders
+        ?array $orders
     ) {
         $this->builder = $builder;
         $this->collection = $collection;

dev/tests/integration/testsuite/Magento/Catalog/Model/Layer/CategoryTest.php

@@ -38,8 +38,7 @@ public function testGetProductCollection()
         /** @var $collection \Magento\Catalog\Model\ResourceModel\Product\Collection */
         $collection = $this->_model->getProductCollection();
         $this->assertInstanceOf(\Magento\Catalog\Model\ResourceModel\Product\Collection::class, $collection);
-        $ids = $collection->getAllIds();
-        $this->assertEquals(2, count($ids));
+        $this->assertEquals(2, $collection->count());
         $this->assertSame($collection, $this->_model->getProductCollection());
     }