MCP-1012: Creation of Tmp Tables during Search

Author: aa-kashk

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

@@ -6,10 +6,8 @@
 
 namespace Magento\CatalogSearch\Model\ResourceModel\Fulltext\Collection;
 
-use Magento\Framework\Data\Collection;
-use Magento\Framework\Search\Adapter\Mysql\TemporaryStorage;
-use Magento\Framework\Search\Adapter\Mysql\TemporaryStorageFactory;
 use Magento\Framework\Api\Search\SearchResultInterface;
+use Magento\Framework\Data\Collection;
 
 /**
  * Resolve specific attributes for search criteria.
@@ -29,11 +27,6 @@ class SearchResultApplier implements SearchResultApplierInterface
      */
     private $searchResult;
 
-    /**
-     * @var TemporaryStorageFactory
-     */
-    private $temporaryStorageFactory;
-
     /**
      * @var array
      */
@@ -42,18 +35,15 @@ class SearchResultApplier implements SearchResultApplierInterface
     /**
      * @param Collection $collection
      * @param SearchResultInterface $searchResult
-     * @param TemporaryStorageFactory $temporaryStorageFactory
      * @param array $orders
      */
     public function __construct(
         Collection $collection,
         SearchResultInterface $searchResult,
-        TemporaryStorageFactory $temporaryStorageFactory,
         array $orders
     ) {
         $this->collection = $collection;
         $this->searchResult = $searchResult;
-        $this->temporaryStorageFactory = $temporaryStorageFactory;
         $this->orders = $orders;
     }
 
@@ -62,21 +52,22 @@ public function __construct(
      */
     public function apply()
     {
-        $temporaryStorage = $this->temporaryStorageFactory->create();
-        $table = $temporaryStorage->storeApiDocuments($this->searchResult->getItems());
+        if (empty($this->searchResult->getItems())) {
+            $this->collection->getSelect()->where('NULL');
+            return;
+        }
+        $ids = [];
+        foreach ($this->searchResult->getItems() as $item) {
+            $ids[] = (int)$item->getId();
+        }
 
-        $this->collection->getSelect()->joinInner(
-            [
-                'search_result' => $table->getName(),
-            ],
-            'e.entity_id = search_result.' . TemporaryStorage::FIELD_ENTITY_ID,
-            []
-        );
+        $orderList = implode(',', $ids);
+        $this->collection->getSelect()->where('e.entity_id IN (?)', $ids);
 
         if (isset($this->orders['relevance'])) {
-            $this->collection->getSelect()->order(
-                'search_result.' . TemporaryStorage::FIELD_SCORE . ' ' . $this->orders['relevance']
-            );
+            $this->collection->getSelect()
+                ->reset(\Magento\Framework\DB\Select::ORDER)
+                ->order(new \Magento\Framework\DB\Sql\Expression("FIELD(e.entity_id, $orderList)"));
         }
     }
 }