MAGETWO-95294: Mysql search slow on the catalog page

Author: vgoncharenko

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

@@ -568,11 +568,8 @@ public function getFacetedData($field)
     public function addCategoryFilter(\Magento\Catalog\Model\Category $category)
     {
         $this->addFieldToFilter('category_ids', $category->getId());
-        if ($this->isCurrentEngineMysql()) {
-            parent::addCategoryFilter($category);
-        } else {
-            $this->_productLimitationPrice();
-        }
+        $this->_productLimitationPrice();
+
         return $this;
     }
 
@@ -585,9 +582,6 @@ public function addCategoryFilter(\Magento\Catalog\Model\Category $category)
     public function setVisibility($visibility)
     {
         $this->addFieldToFilter('visibility', $visibility);
-        if ($this->isCurrentEngineMysql()) {
-            parent::setVisibility($visibility);
-        }
 
         return $this;
     }

app/code/Magento/Elasticsearch/Test/Unit/SearchAdapter/Query/Builder/SortTest.php

@@ -121,6 +121,7 @@ function ($attribute, $context) use ($fieldName) {
     }
 
     /**
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      * @return array
      */
     public function getSortProvider()