MC-16239: Search result page contain 24k results

Author: vgoncharenko

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

@@ -247,6 +247,10 @@ public function addFieldsToFilter($fields)
      */
     public function setOrder($attribute, $dir = Select::SQL_DESC)
     {
+        /**
+         * This changes need in backward compatible reasons for support dynamic improved algorithm
+         * for price aggregation process.
+         */
         $this->setSearchOrder($attribute, $dir);
         if ($this->defaultFilterStrategyApplyChecker->isApplicable()) {
             parent::setOrder($attribute, $dir);

app/code/Magento/Elasticsearch/Elasticsearch5/SearchAdapter/Query/Builder.php

@@ -56,20 +56,17 @@ class Builder
      * @param SearchIndexNameResolver $searchIndexNameResolver
      * @param AggregationBuilder $aggregationBuilder
      * @param ScopeResolverInterface $scopeResolver
-     * @param Sort|null $sortBuilder
      */
     public function __construct(
         Config $clientConfig,
         SearchIndexNameResolver $searchIndexNameResolver,
         AggregationBuilder $aggregationBuilder,
-        ScopeResolverInterface $scopeResolver,
-        Sort $sortBuilder = null
+        ScopeResolverInterface $scopeResolver
     ) {
         $this->clientConfig = $clientConfig;
         $this->searchIndexNameResolver = $searchIndexNameResolver;
         $this->aggregationBuilder = $aggregationBuilder;
         $this->scopeResolver = $scopeResolver;
-        $this->sortBuilder = $sortBuilder ?: ObjectManager::getInstance()->get(Sort::class);
     }
 
     /**
@@ -91,7 +88,7 @@ public function initQuery(RequestInterface $request)
                 'from' => $request->getFrom(),
                 'size' => $request->getSize(),
                 'stored_fields' => ['_id', '_score'],
-                'sort' => $this->sortBuilder->getSort($request),
+                'sort' => $this->getSortBuilder()->getSort($request),
                 'query' => [],
             ],
         ];
@@ -112,4 +109,17 @@ public function initAggregations(
     ) {
         return $this->aggregationBuilder->build($request, $searchQuery);
     }
+
+    /**
+     * Get sort builder instance.
+     *
+     * @return Sort
+     */
+    private function getSortBuilder()
+    {
+        if (null === $this->sortBuilder){
+            $this->sortBuilder = ObjectManager::getInstance()->get(Sort::class);
+        }
+        return $this->sortBuilder;
+    }
 }

lib/internal/Magento/Framework/Search/Search.php

@@ -71,7 +71,16 @@ public function search(SearchCriteriaInterface $searchCriteria)
 
         $this->requestBuilder->setFrom($searchCriteria->getCurrentPage() * $searchCriteria->getPageSize());
         $this->requestBuilder->setSize($searchCriteria->getPageSize());
-        $this->requestBuilder->setSort($searchCriteria->getSortOrders());
+
+        /**
+         * This added in Backward compatibility purposes.
+         * Temporary solution for an existing API of a fulltext search request builder.
+         * It must be moved to different API.
+         * Scope to split Search request builder API in MC-16461.
+         */
+        if (method_exists($this->requestBuilder, 'setSort')) {
+            $this->requestBuilder->setSort($searchCriteria->getSortOrders());
+        }
         $request = $this->requestBuilder->create();
         $searchResponse = $this->searchEngine->search($request);