ACP2E-752: [Magento Cloud][Premier Support] Incorrect search results with Thai language

Author: thiaramus

app/code/Magento/Elasticsearch/Model/Adapter/Index/Builder.php

@@ -38,27 +38,19 @@ class Builder implements BuilderInterface
      */
     private $synonymReader;
 
-    /**
-     * @var StoreManagerInterface
-     */
-    private $storeManager;
-
     /**
      * @param LocaleResolver $localeResolver
      * @param EsConfigInterface $esConfig
      * @param SynonymReader $synonymReader
-     * @param StoreManagerInterface $storeManager
      */
     public function __construct(
         LocaleResolver $localeResolver,
         EsConfigInterface $esConfig,
-        SynonymReader $synonymReader,
-        StoreManagerInterface $storeManager
+        SynonymReader $synonymReader
     ) {
         $this->localeResolver = $localeResolver;
         $this->esConfig = $esConfig;
         $this->synonymReader = $synonymReader;
-        $this->storeManager = $storeManager;
     }
 
     /**
@@ -204,9 +196,7 @@ protected function getStemmerConfig()
      */
     private function getSynonymFilter(): array
     {
-        $this->storeManager->setCurrentStore($this->storeId);
-
-        $synonyms = $this->synonymReader->getAllSynonyms();
+        $synonyms = $this->synonymReader->getAllSynonymsForStoreViewId($this->storeId);
         $synonymFilter = [];
 
         if ($synonyms) {

app/code/Magento/Search/Model/ResourceModel/SynonymReader.php

@@ -11,6 +11,7 @@
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Model\ResourceModel\Db\AbstractDb;
 use Magento\Store\Model\ScopeInterface;
+use Magento\Store\Model\Store;
 use Magento\Store\Model\StoreManagerInterface;
 
 /**
@@ -71,20 +72,23 @@ public function loadByPhrase(\Magento\Search\Model\SynonymReader $object, $phras
     /**
      * Get all synonyms as an array
      *
+     * @param int $storeViewId
+     * @return array
      * @throws LocalizedException
      */
-    public function getAllSynonyms(): array
+    public function getAllSynonymsForStoreViewId(int $storeViewId): array
     {
         $connection = $this->getConnection();
-        $query = $connection->select()->from($this->getMainTable());
-        $rows = $connection->fetchAll($query);
-        $synonymsPerScope = $this->getSynRowsPerScope($rows);
-
-        return array_merge(
-            array_column($synonymsPerScope[ScopeInterface::SCOPE_STORES], 'synonyms'),
-            array_column($synonymsPerScope[ScopeInterface::SCOPE_WEBSITES], 'synonyms'),
-            array_column($synonymsPerScope[ScopeConfigInterface::SCOPE_TYPE_DEFAULT], 'synonyms')
-        );
+
+        $storeIdField = $connection
+            ->quoteIdentifier(sprintf('%s.%s', $this->getMainTable(), 'store_id'));
+
+        $select = $connection
+            ->select()
+            ->from($this->getMainTable(), 'synonyms')
+            ->where($storeIdField . ' IN (?)', [Store::DEFAULT_STORE_ID, $storeViewId]);
+
+        return $connection->fetchCol($select);
     }
 
     /**