Merge remote-tracking branch 'origin/MAGETWO-39757' into S70pr

# Conflicts:
#	lib/internal/Magento/Framework/Search/Adapter/Mysql/Mapper.php

Author: Andrii Kasian

app/code/Magento/CatalogSearch/etc/search_request.xml

@@ -78,6 +78,6 @@
             <filter xsi:type="termFilter" name="category_filter" field="category_ids" value="$category_ids$"/>
         </filters>
         <from>0</from>
-        <size>10</size>
+        <size>10000</size>
     </request>
 </requests>

lib/internal/Magento/Framework/Search/Adapter/Mysql/Mapper.php

@@ -23,7 +23,6 @@
  */
 class Mapper
 {
-    const SQL_ENTITIES_MATCH_LIMIT = 100000;
     /**
      * @var ScoreBuilder
      */
@@ -152,6 +151,8 @@ public function buildQuery(RequestInterface $request)
             }
         }
 
+        $select->limit($request->getSize());
+
         $select->limit($request->getSize());
         $select->order('relevance ' . Select::SQL_DESC);
         return $select;

lib/internal/Magento/Framework/Search/Adapter/Mysql/Query/QueryContainer.php

@@ -81,7 +81,6 @@ public function addMatchQuery(
         $subScoreBuilder = $this->scoreBuilderFactory->create();
         $this->buildMatchQuery($subScoreBuilder, $subSelect, $query, $conditionType);
         $subSelect->columns($subScoreBuilder->build());
-        $subSelect->limit($this->request->getSize());
         $this->addDerivedQuery($subSelect);
 
         return $select;

lib/internal/Magento/Framework/Search/Test/Unit/Adapter/Mysql/Query/QueryContainerTest.php

@@ -91,8 +91,6 @@ public function testBuild()
             ->getMock();
         $this->indexBuilder->expects($this->once())->method('build')->willReturn($subSelect);
         $subSelect->expects($this->once())->method('columns')->with('score condition');
-        $this->request->expects($this->once())->method('getSize')->willReturn(1000);
-        $subSelect->expects($this->once())->method('limit')->with(1000);
 
         $result = $this->queryContainer->addMatchQuery($this->select, $this->query, Bool::QUERY_CONDITION_MUST);
         $this->assertEquals($this->select, $result);