MC-18332: Remove MySQL Search Engine

cpartica · cpartica · commit dad8bc737778 · 2020-05-13T17:13:19.000-05:00
- fix static
diff --git a/app/code/Magento/CatalogSearch/Model/Indexer/IndexStructure.php b/app/code/Magento/CatalogSearch/Model/Indexer/IndexStructure.php
@@ -8,6 +8,8 @@
 
 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;
@@ -88,4 +90,45 @@ private function getEntity()
         }
         return $this->indexStructureEntity;
     }
+
+    /**
+     * Create fulltext index table.
+     *
+     * @param string $tableName
+     * @throws \Zend_Db_Exception
+     * @return void
+     * @deprecated
+     * @see \Magento\ElasticSearch
+     */
+    protected function createFulltextIndex($tableName)
+    {
+        $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);
+    }
 }
diff --git a/app/code/Magento/CatalogSearch/Model/Indexer/IndexStructureProxy.php b/app/code/Magento/CatalogSearch/Model/Indexer/IndexStructureProxy.php
@@ -10,7 +10,7 @@
 /**
  * Catalog search index structure proxy.
  *
- * @deprecated
+ * @deprecated mysql search engine has been removed
  * @see \Magento\Elasticsearch
  */
 class IndexStructureProxy implements IndexStructureInterface
diff --git a/app/code/Magento/CatalogSearch/Model/Indexer/IndexSwitcherInterface.php b/app/code/Magento/CatalogSearch/Model/Indexer/IndexSwitcherInterface.php
@@ -10,7 +10,7 @@
  *
  * @api
  * @since 100.2.0
- * @deprecated
+ * @deprecated mysql search engine has been removed
  * @see \Magento\Elasticsearch
  */
 interface IndexSwitcherInterface
diff --git a/app/code/Magento/CatalogSearch/Model/Indexer/IndexSwitcherProxy.php b/app/code/Magento/CatalogSearch/Model/Indexer/IndexSwitcherProxy.php
@@ -11,7 +11,8 @@
 
 /**
  * Proxy for adapter-specific index switcher
- * @deprecated
+ *
+ * @deprecated mysql search engine has been removed
  * @see \Magento\Elasticsearch
  */
 class IndexSwitcherProxy implements IndexSwitcherInterface
diff --git a/app/code/Magento/CatalogSearch/Model/Indexer/Scope/ScopeProxy.php b/app/code/Magento/CatalogSearch/Model/Indexer/Scope/ScopeProxy.php
@@ -6,12 +6,10 @@
 
 namespace Magento\CatalogSearch\Model\Indexer\Scope;
 
-use Magento\Framework\Search\Request\Dimension;
-
 /**
  * Implementation of IndexScopeResolverInterface which resolves index scope dynamically depending on current scope state
  *
- * @deprecated
+ * @deprecated mysql search engine has been removed
  * @see \Magento\Elasticsearch
  */
 class ScopeProxy implements \Magento\Framework\Search\Request\IndexScopeResolverInterface
diff --git a/app/code/Magento/CatalogSearch/Model/Indexer/Scope/State.php b/app/code/Magento/CatalogSearch/Model/Indexer/Scope/State.php
@@ -19,7 +19,7 @@
  *   which means that default indexer table should be left unchanged during indexation
  *   and temporary table should be used instead.
  *
- * @deprecated
+ * @deprecated mysql search engine has been removed
  * @see \Magento\Elasticsearch
  */
 class State
diff --git a/app/code/Magento/CatalogSearch/Model/ResourceModel/EngineInterface.php b/app/code/Magento/CatalogSearch/Model/ResourceModel/EngineInterface.php
@@ -14,7 +14,9 @@
 interface EngineInterface
 {
     /**
-     * @deprecated
+     * Field prefix
+     *
+     * @deprecated mysql search engine has been removed
      * @see \Magento\Framework\Search\EngineResolverInterface
      */
     const FIELD_PREFIX = 'attr_';
diff --git a/app/code/Magento/CatalogSearch/Model/ResourceModel/Fulltext/Collection/SearchResultApplier.php b/app/code/Magento/CatalogSearch/Model/ResourceModel/Fulltext/Collection/SearchResultApplier.php
@@ -13,7 +13,8 @@
 
 /**
  * Resolve specific attributes for search criteria.
- * @deprecated
+ *
+ * @deprecated mysql search engine has been removed
  * @see \Magento\Elasticsearch\Model\ResourceModel\Fulltext\Collection\SearchResultApplier
  */
 class SearchResultApplier implements SearchResultApplierInterface
diff --git a/app/code/Magento/CatalogSearch/Setup/Patch/Data/SetInitialSearchWeightForAttributes.php b/app/code/Magento/CatalogSearch/Setup/Patch/Data/SetInitialSearchWeightForAttributes.php
@@ -64,6 +64,7 @@ function () use ($indexer) {
                     ->save();
             }
         );
+        return $this;
     }
 
     /**
diff --git a/app/code/Magento/CatalogSearch/Test/Unit/Model/Indexer/FulltextTest.php b/app/code/Magento/CatalogSearch/Test/Unit/Model/Indexer/FulltextTest.php
@@ -10,9 +10,8 @@
 use Magento\CatalogSearch\Model\Indexer\Fulltext;
 use Magento\CatalogSearch\Model\Indexer\Fulltext\Action\Full;
 use Magento\CatalogSearch\Model\Indexer\Fulltext\Action\FullFactory;
-use Magento\CatalogSearch\Model\Indexer\IndexerHandler;
+use Magento\Framework\Indexer\SaveHandler\IndexerInterface;
 use Magento\CatalogSearch\Model\Indexer\IndexerHandlerFactory;
-use Magento\CatalogSearch\Model\Indexer\Scope\IndexSwitcher;
 use Magento\CatalogSearch\Model\Indexer\Scope\State;
 use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\Indexer\Dimension;
@@ -38,7 +37,7 @@ class FulltextTest extends TestCase
     protected $fullAction;
 
     /**
-     * @var IndexerHandler|MockObject
+     * @var IndexerInterface|MockObject
      */
     protected $saveHandler;
 
@@ -47,11 +46,6 @@ class FulltextTest extends TestCase
      */
     protected $fulltextResource;
 
-    /**
-     * @var IndexSwitcher|MockObject
-     */
-    private $indexSwitcher;
-
     /**
      * @var DimensionProviderInterface|MockObject
      */
@@ -64,14 +58,13 @@ class FulltextTest extends TestCase
 
     protected function setUp(): void
     {
-        $this->markTestSkipped("MC-18332: Mysql Search Engine is deprecated and will be removed");
         $this->fullAction = $this->getClassMock(Full::class);
         $fullActionFactory = $this->createPartialMock(
             FullFactory::class,
             ['create']
         );
         $fullActionFactory->expects($this->any())->method('create')->willReturn($this->fullAction);
-        $this->saveHandler = $this->getClassMock(IndexerHandler::class);
+        $this->saveHandler = $this->getClassMock(IndexerInterface::class);
         $indexerHandlerFactory = $this->createPartialMock(
             IndexerHandlerFactory::class,
             ['create']
@@ -80,11 +73,6 @@ protected function setUp(): void
 
         $this->fulltextResource = $this->getClassMock(\Magento\CatalogSearch\Model\ResourceModel\Fulltext::class);
 
-        $this->indexSwitcher = $this->getMockBuilder(IndexSwitcher::class)
-            ->disableOriginalConstructor()
-            ->setMethods(['switchIndex'])
-            ->getMock();
-
         $this->dimensionProviderMock = $this->getMockBuilder(DimensionProviderInterface::class)
             ->getMock();
         $stateMock = $this->getMockBuilder(State::class)
@@ -102,7 +90,6 @@ protected function setUp(): void
                 'indexerHandlerFactory' => $indexerHandlerFactory,
                 'fulltextResource' => $this->fulltextResource,
                 'data' => [],
-                'indexSwitcher' => $this->indexSwitcher,
                 'dimensionProvider' => $this->dimensionProviderMock,
                 'indexScopeState' => $stateMock,
                 'processManager' => $this->processManager,
@@ -173,8 +160,6 @@ public function testExecuteFull()
         $indexData = new \ArrayObject([new \ArrayObject([]), new \ArrayObject([])]);
         $this->setupDataProvider($stores);
 
-        $this->indexSwitcher->expects($this->exactly(2))->method('switchIndex');
-
         $this->saveHandler->expects($this->exactly(count($stores)))->method('cleanIndex');
         $this->saveHandler->expects($this->exactly(2))->method('saveIndex');
         $consecutiveStoreRebuildArguments = array_map(
diff --git a/app/code/Magento/Elasticsearch/Model/ResourceModel/Engine.php b/app/code/Magento/Elasticsearch/Model/ResourceModel/Engine.php
@@ -70,6 +70,7 @@ public function processAttributeValue($attribute, $value)
 
     /**
      * Prepare index array as a string glued by separator
+     *
      * Support 2 level array gluing
      *
      * @param array $index
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/Layer/Filter/Price/AlgorithmBaseTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/Layer/Filter/Price/AlgorithmBaseTest.php
@@ -5,6 +5,7 @@
  */
 namespace Magento\Catalog\Model\Layer\Filter\Price;
 
+use Magento\Framework\Search\Dynamic\IntervalInterface;
 use Magento\TestFramework\Helper\Bootstrap;
 
 /**
@@ -50,27 +51,15 @@ public function testPricesSegmentation($categoryId, array $entityIds, array $int
         . 'Stabilize skipped test cases for Integration AlgorithmBaseTest with elasticsearch');
         $objectManager = Bootstrap::getObjectManager();
         $layer = $objectManager->create(\Magento\Catalog\Model\Layer\Category::class);
-        /** @var \Magento\Framework\Search\Request\Aggregation\TermBucket $termBucket */
-        $termBucket = $objectManager->create(
-            \Magento\Framework\Search\Request\Aggregation\TermBucket::class,
-            ['name' => 'name', 'field' => 'price', 'metrics' => []]
-        );
-
-        $dimensions = [
-            'scope' => $objectManager->create(
-                \Magento\Framework\Search\Request\Dimension::class,
-                ['name' => 'someName', 'value' => 'default']
-            ),
-        ];
 
         /** @var \Magento\Framework\Search\EntityMetadata $entityMetadata */
         $entityMetadata = $objectManager->create(\Magento\Framework\Search\EntityMetadata::class, ['entityId' => 'id']);
         $idKey = $entityMetadata->getEntityId();
 
         // this class has been removed
-        /** @var \Magento\Framework\Search\Adapter\Mysql\DocumentFactory $documentFactory */
+        /** @var \Magento\Elasticsearch\SearchAdapter\DocumentFactory $documentFactory */
         $documentFactory = $objectManager->create(
-            \Magento\Framework\Search\Adapter\Mysql\DocumentFactory::class,
+            \Magento\Elasticsearch\SearchAdapter\DocumentFactory::class,
             ['entityMetadata' => $entityMetadata]
         );
 
@@ -83,25 +72,12 @@ public function testPricesSegmentation($categoryId, array $entityIds, array $int
             ];
             $documents[] = $documentFactory->create($rawDocument);
         }
-
-        // this class has been removed
-        /** @var \Magento\Framework\Search\Adapter\Mysql\TemporaryStorage $temporaryStorage */
-        $temporaryStorage = $objectManager->create(\Magento\Framework\Search\Adapter\Mysql\TemporaryStorage::class);
-        $table = $temporaryStorage->storeDocuments($documents);
-
-        // this class has been removed
-        /** @var \Magento\CatalogSearch\Model\Adapter\Mysql\Aggregation\DataProvider $dataProvider */
-        $dataProvider = $objectManager->create(
-            \Magento\CatalogSearch\Model\Adapter\Mysql\Aggregation\DataProvider::class
-        );
-        $select = $dataProvider->getDataSet($termBucket, $dimensions, $table);
-
-        // this class has been removed
-        /** @var \Magento\Framework\Search\Adapter\Mysql\Aggregation\IntervalFactory $intervalFactory */
+        /** @var \Magento\CatalogSearch\Model\Price\IntervalFactory $intervalFactory */
         $intervalFactory = $objectManager->create(
-            \Magento\Framework\Search\Adapter\Mysql\Aggregation\IntervalFactory::class
+            \Magento\CatalogSearch\Model\Price\IntervalFactory::class
         );
-        $interval = $intervalFactory->create(['select' => $select]);
+        /** @var \Magento\CatalogSearch\Model\Price\Interval $interval */
+        $interval = $intervalFactory->create();
 
         /** @var \Magento\Framework\Search\Dynamic\Algorithm $model */
         $model = $objectManager->create(\Magento\Framework\Search\Dynamic\Algorithm::class);
diff --git a/dev/tests/integration/testsuite/Magento/Elasticsearch/SearchAdapter/AdapterTest.php b/dev/tests/integration/testsuite/Magento/Elasticsearch/SearchAdapter/AdapterTest.php
@@ -26,6 +26,7 @@
  * testAdvancedSearchDateField().
  * phpstan:ignore
  *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class AdapterTest extends \PHPUnit\Framework\TestCase
 {

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`	`/**`
`11`	`11`	`* Catalog search index structure proxy.`
`12`	`12`	`*`
`13`		`- * @deprecated`
	`13`	`+ * @deprecated mysql search engine has been removed`
`14`	`14`	`* @see \Magento\Elasticsearch`
`15`	`15`	`*/`
`16`	`16`	`class IndexStructureProxy implements IndexStructureInterface`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@`
`19`	`19`	`* which means that default indexer table should be left unchanged during indexation`
`20`	`20`	`* and temporary table should be used instead.`
`21`	`21`	`*`
`22`		`- * @deprecated`
	`22`	`+ * @deprecated mysql search engine has been removed`
`23`	`23`	`* @see \Magento\Elasticsearch`
`24`	`24`	`*/`
`25`	`25`	`class State`
Original file line number	Diff line number	Diff line change
`@@ -64,6 +64,7 @@ function () use ($indexer) {`
`64`	`64`	`->save();`
`65`	`65`	`}`
`66`	`66`	`);`
	`67`	`+ return $this;`
`67`	`68`	`}`
`68`	`69`
`69`	`70`	`/**`