Skip to content

Commit 69537ab

Browse files
committed
MC-18332: Remove MySQL Search Engine
- restore dependency
1 parent 38e6057 commit 69537ab

File tree

4 files changed

+46
-18
lines changed

4 files changed

+46
-18
lines changed

app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Action/Full.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -216,9 +216,9 @@ class Full
216216
* @param \Magento\CatalogSearch\Model\ResourceModel\Fulltext $fulltextResource
217217
* @param \Magento\Framework\Search\Request\DimensionFactory $dimensionFactory
218218
* @param \Magento\Framework\Indexer\ConfigInterface $indexerConfig
219-
* @param \IteratorFactory $indexIteratorFactory
220-
* @param \Magento\Framework\EntityManager\MetadataPool $metadataPool
221-
* @param DataProvider $dataProvider
219+
* @param null $indexIteratorFactory
220+
* @param \Magento\Framework\EntityManager\MetadataPool|null $metadataPool
221+
* @param DataProvider|null $dataProvider
222222
* @param int $batchSize
223223
* @SuppressWarnings(PHPMD.ExcessiveParameterList)
224224
*/
@@ -240,7 +240,7 @@ public function __construct(
240240
\Magento\CatalogSearch\Model\ResourceModel\Fulltext $fulltextResource,
241241
\Magento\Framework\Search\Request\DimensionFactory $dimensionFactory,
242242
\Magento\Framework\Indexer\ConfigInterface $indexerConfig,
243-
$indexIteratorFactory,
243+
$indexIteratorFactory = null,
244244
\Magento\Framework\EntityManager\MetadataPool $metadataPool = null,
245245
DataProvider $dataProvider = null,
246246
$batchSize = 500

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -128,9 +128,9 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Product\Collection
128128
* @param \Magento\Customer\Model\Session $customerSession
129129
* @param \Magento\Framework\Stdlib\DateTime $dateTime
130130
* @param \Magento\Customer\Api\GroupManagementInterface $groupManagement
131-
* @param \Magento\CatalogSearch\Model\Advanced\Request\Builder $requestBuilder
132-
* @param \Magento\Search\Model\SearchEngine $searchEngine
133-
* @param \Magento\Framework\Search\Adapter\Mysql\TemporaryStorageFactory $temporaryStorageFactory
131+
* @param null $requestBuilder
132+
* @param null $searchEngine
133+
* @param null $temporaryStorageFactory
134134
* @param \Magento\Framework\DB\Adapter\AdapterInterface|null $connection
135135
* @param SearchResultFactory|null $searchResultFactory
136136
* @param ProductLimitationFactory|null $productLimitationFactory
@@ -163,9 +163,9 @@ public function __construct(
163163
\Magento\Customer\Model\Session $customerSession,
164164
\Magento\Framework\Stdlib\DateTime $dateTime,
165165
\Magento\Customer\Api\GroupManagementInterface $groupManagement,
166-
$requestBuilder,
167-
$searchEngine,
168-
$temporaryStorageFactory,
166+
$requestBuilder = null,
167+
$searchEngine = null,
168+
$temporaryStorageFactory = null,
169169
\Magento\Framework\DB\Adapter\AdapterInterface $connection = null,
170170
SearchResultFactory $searchResultFactory = null,
171171
ProductLimitationFactory $productLimitationFactory = null,

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -120,10 +120,10 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Product\Collection
120120
* @param \Magento\Customer\Model\Session $customerSession
121121
* @param \Magento\Framework\Stdlib\DateTime $dateTime
122122
* @param \Magento\Customer\Api\GroupManagementInterface $groupManagement
123-
* @param \Magento\Search\Model\QueryFactory $catalogSearchData
124-
* @param \Magento\Framework\Search\Request\Builder $requestBuilder
125-
* @param \Magento\Search\Model\SearchEngine $searchEngine
126-
* @param \Magento\Framework\Search\Adapter\Mysql\TemporaryStorageFactory $temporaryStorageFactory
123+
* @param null $catalogSearchData
124+
* @param null $requestBuilder
125+
* @param null $searchEngine
126+
* @param null $temporaryStorageFactory
127127
* @param \Magento\Framework\DB\Adapter\AdapterInterface|null $connection
128128
* @param string $searchRequestName
129129
* @param SearchResultFactory|null $searchResultFactory
@@ -159,10 +159,10 @@ public function __construct(
159159
\Magento\Customer\Model\Session $customerSession,
160160
\Magento\Framework\Stdlib\DateTime $dateTime,
161161
\Magento\Customer\Api\GroupManagementInterface $groupManagement,
162-
$catalogSearchData,
163-
$requestBuilder,
164-
$searchEngine,
165-
$temporaryStorageFactory,
162+
$catalogSearchData = null,
163+
$requestBuilder = null,
164+
$searchEngine = null,
165+
$temporaryStorageFactory = null,
166166
\Magento\Framework\DB\Adapter\AdapterInterface $connection = null,
167167
$searchRequestName = 'catalog_view_container',
168168
SearchResultFactory $searchResultFactory = null,

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

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -216,4 +216,32 @@
216216
<type name="Magento\CatalogSearch\Model\Indexer\Fulltext\Action\DataProvider">
217217
<plugin name="stockedProductsFilterPlugin" type="Magento\CatalogSearch\Model\Indexer\Plugin\StockedProductsFilterPlugin"/>
218218
</type>
219+
<type name="Magento\CatalogSearch\Model\Indexer\Fulltext\Action\Full">
220+
<arguments>
221+
<!-- @deprecated parameter indexIteratorFactory has been deprecated and not in use now -->
222+
<argument name="indexIteratorFactory" xsi:type="null" />
223+
</arguments>
224+
</type>
225+
<type name="Magento\CatalogSearch\Model\ResourceModel\Advanced\Collection">
226+
<arguments>
227+
<!-- @deprecated parameter requestBuilder has been deprecated and not in use now -->
228+
<argument name="requestBuilder" xsi:type="null" />
229+
<!-- @deprecated parameter searchEngine has been deprecated and not in use now -->
230+
<argument name="searchEngine" xsi:type="null" />
231+
<!-- @deprecated parameter temporaryStorageFactory has been deprecated and not in use now -->
232+
<argument name="temporaryStorageFactory" xsi:type="null" />
233+
</arguments>
234+
</type>
235+
<type name="Magento\CatalogSearch\Model\ResourceModel\Fulltext\Collection">
236+
<arguments>
237+
<!-- @deprecated parameter catalogSearchData has been deprecated and not in use now -->
238+
<argument name="catalogSearchData" xsi:type="null" />
239+
<!-- @deprecated parameter requestBuilder has been deprecated and not in use now -->
240+
<argument name="requestBuilder" xsi:type="null" />
241+
<!-- @deprecated parameter searchEngine has been deprecated and not in use now -->
242+
<argument name="searchEngine" xsi:type="null" />
243+
<!-- @deprecated parameter temporaryStorageFactory has been deprecated and not in use now -->
244+
<argument name="temporaryStorageFactory" xsi:type="null" />
245+
</arguments>
246+
</type>
219247
</config>

0 commit comments

Comments
 (0)