MC-18332: Remove MySQL Search Engine

- refactor scopes and index structure

Author: cpartica

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

@@ -55,11 +55,15 @@ class Fulltext implements
 
     /**
      * @var IndexSwitcherInterface
+     * @deprecated
+     * @see \Magento\Elasticsearch
      */
     private $indexSwitcher;
 
     /**
      * @var \Magento\CatalogSearch\Model\Indexer\Scope\State
+     * @deprecated
+     * @see \Magento\Elasticsearch
      */
     private $indexScopeState;
 
@@ -136,13 +140,9 @@ public function executeByDimensions(array $dimensions, \Traversable $entityIds =
         );
 
         if (null === $entityIds) {
-            $this->indexScopeState->useTemporaryIndex();
             $saveHandler->cleanIndex($dimensions);
             $saveHandler->saveIndex($dimensions, $this->fullAction->rebuildStoreIndex($storeId));
 
-            $this->indexSwitcher->switchIndex($dimensions);
-            $this->indexScopeState->useRegularIndex();
-
             $this->fulltextResource->resetSearchResultsByStore($storeId);
         } else {
             // internal implementation works only with array

app/code/Magento/CatalogSearch/Model/Indexer/IndexStructure.php

@@ -6,9 +6,8 @@
 
 namespace Magento\CatalogSearch\Model\Indexer;
 
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\App\ResourceConnection;
-use Magento\Framework\DB\Adapter\AdapterInterface;
-use Magento\Framework\DB\Ddl\Table;
 use Magento\Framework\Indexer\IndexStructureInterface;
 use Magento\Framework\Indexer\ScopeResolver\IndexScopeResolver;
 use Magento\Framework\Search\Request\IndexScopeResolverInterface;
@@ -21,83 +20,72 @@
  */
 class IndexStructure implements IndexStructureInterface
 {
+    /**
+     * @var IndexStructureInterface
+     */
+    private $indexStructureEntity;
+
+    /**
+     * @var IndexStructureFactory
+     */
+    private $indexStructureFactory;
+
     /**
      * @var Resource
+     * @deprecated
+     * @see \Magento\Elasticsearch
      */
     private $resource;
 
     /**
      * @var IndexScopeResolver
+     * @deprecated
+     * @see \Magento\Elasticsearch
      */
     private $indexScopeResolver;
 
     /**
      * @param ResourceConnection $resource
      * @param IndexScopeResolverInterface $indexScopeResolver
+     * @param IndexStructureFactory|null $indexStructureFactory
      */
     public function __construct(
         ResourceConnection $resource,
-        IndexScopeResolverInterface $indexScopeResolver
+        IndexScopeResolverInterface $indexScopeResolver,
+        IndexStructureFactory $indexStructureFactory = null
     ) {
         $this->resource = $resource;
         $this->indexScopeResolver = $indexScopeResolver;
+        $this->indexStructureFactory = $indexStructureFactory ? : ObjectManager::getInstance()
+            ->get(IndexStructureFactory::class);
     }
 
     /**
      * @inheritdoc
      */
     public function delete($index, array $dimensions = [])
     {
-        $tableName = $this->indexScopeResolver->resolve($index, $dimensions);
-        if ($this->resource->getConnection()->isTableExists($tableName)) {
-            $this->resource->getConnection()->dropTable($tableName);
-        }
+        return $this->getEntity()->delete($index, $dimensions);
     }
 
     /**
      * @inheritdoc
      */
     public function create($index, array $fields, array $dimensions = [])
     {
-        $this->createFulltextIndex($this->indexScopeResolver->resolve($index, $dimensions));
+        return $this->getEntity()->create($index, $fields, $dimensions);
     }
 
     /**
-     * Create fulltext index table.
+     * Get instance of current index structure
      *
-     * @param string $tableName
-     * @throws \Zend_Db_Exception
-     * @return void
+     * @return IndexStructureInterface
      */
-    protected function createFulltextIndex($tableName)
+    private function getEntity()
     {
-        $table = $this->resource->getConnection()->newTable($tableName)
-            ->addColumn(
-                'entity_id',
-                Table::TYPE_INTEGER,
-                10,
-                ['unsigned' => true, 'nullable' => false],
-                'Entity ID'
-            )->addColumn(
-                'attribute_id',
-                Table::TYPE_INTEGER,
-                10,
-                ['unsigned' => true, 'nullable' => false]
-            )->addColumn(
-                'data_index',
-                Table::TYPE_TEXT,
-                '4g',
-                ['nullable' => true],
-                'Data index'
-            )->addIndex(
-                'idx_primary',
-                ['entity_id', 'attribute_id'],
-                ['type' => AdapterInterface::INDEX_TYPE_PRIMARY]
-            )->addIndex(
-                'FTI_FULLTEXT_DATA_INDEX',
-                ['data_index'],
-                ['type' => AdapterInterface::INDEX_TYPE_FULLTEXT]
-            );
-        $this->resource->getConnection()->createTable($table);
+        if (empty($this->indexStructureEntity)) {
+            $this->indexStructureEntity = $this->indexStructureFactory->create();
+        }
+        return $this->indexStructureEntity;
     }
 }

app/code/Magento/CatalogSearch/Model/Indexer/IndexStructureProxy.php

@@ -9,6 +9,9 @@
 
 /**
  * Catalog search index structure proxy.
+ *
+ * @deprecated
+ * @see \Magento\Elasticsearch
  */
 class IndexStructureProxy implements IndexStructureInterface
 {

app/code/Magento/CatalogSearch/Model/Indexer/Scope/ScopeProxy.php

@@ -10,6 +10,9 @@
 
 /**
  * Implementation of IndexScopeResolverInterface which resolves index scope dynamically depending on current scope state
+ *
+ * @deprecated
+ * @see \Magento\Elasticsearch
  */
 class ScopeProxy implements \Magento\Framework\Search\Request\IndexScopeResolverInterface
 {

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

@@ -14,7 +14,7 @@
     <preference for="Magento\CatalogSearch\Model\ResourceModel\Fulltext\Collection\SearchResultApplierInterface" type="Magento\CatalogSearch\Model\ResourceModel\Fulltext\Collection\SearchResultApplier"/>
     <preference for="Magento\CatalogSearch\Model\ResourceModel\Fulltext\Collection\TotalRecordsResolverInterface" type="Magento\CatalogSearch\Model\ResourceModel\Fulltext\Collection\TotalRecordsResolver"/>
     <preference for="Magento\CatalogSearch\Model\Search\ItemCollectionProviderInterface" type="Magento\CatalogSearch\Model\Search\ItemCollectionProvider"/>
-    <preference for="Magento\Framework\Indexer\IndexStructureInterface" type="Magento\CatalogSearch\Model\Indexer\IndexStructureProxy" />
+    <preference for="Magento\Framework\Indexer\IndexStructureInterface" type="Magento\CatalogSearch\Model\Indexer\IndexStructure" />
     <type name="Magento\Catalog\Model\Indexer\Product\Full">
         <arguments>
             <argument name="indexerList" xsi:type="array">
@@ -182,18 +182,6 @@
             </argument>
         </arguments>
     </type>
-    <type name="Magento\CatalogSearch\Model\Indexer\IndexStructure">
-        <arguments>
-            <argument name="indexScopeResolver" xsi:type="object">\Magento\CatalogSearch\Model\Indexer\Scope\ScopeProxy</argument>
-        </arguments>
-    </type>
-    <type name="Magento\CatalogSearch\Model\Indexer\Scope\ScopeProxy">
-        <arguments>
-            <argument name="states" xsi:type="array">
-                <item name="use_main_table" xsi:type="string">\Magento\Framework\Indexer\ScopeResolver\IndexScopeResolver</item>
-            </argument>
-        </arguments>
-    </type>
     <type name="Magento\CatalogSearch\Model\Adapter\Aggregation\RequestCheckerComposite">
         <arguments>
             <argument name="queryCheckers" xsi:type="array">