Merge remote-tracking branch 'origin/MAGETWO-38817' into bugs

Conflicts:
	app/code/Magento/CatalogSearch/Setup/InstallData.php

Author: igrybkov

app/code/Magento/CatalogSearch/Model/Adapter/Mysql/Filter/Preprocessor.php

@@ -64,11 +64,10 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @SuppressWarnings(PHPMD.UnusedLocalVariable)
      */
     public function process(FilterInterface $filter, $isNegation, $query, QueryContainer $queryContainer)
     {
-        return $resultQuery = $this->processQueryWithField($filter, $isNegation, $query, $queryContainer);
+        return $this->processQueryWithField($filter, $isNegation, $query, $queryContainer);
     }
 
     /**

app/code/Magento/CatalogSearch/Model/Source/Weight.php

@@ -15,7 +15,7 @@ class Weight
      *
      * @var int[]
      */
-    protected $_weights = [1, 2, 3, 4, 5];
+    protected $_weights = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10];
 
     /**
      * Retrieve search weights as options array

app/code/Magento/CatalogSearch/Setup/InstallData.php

@@ -11,6 +11,7 @@
 use Magento\Framework\Setup\ModuleContextInterface;
 use Magento\Framework\Setup\ModuleDataSetupInterface;
 use Magento\Indexer\Model\IndexerInterfaceFactory;
+use Magento\Catalog\Api\ProductAttributeRepositoryInterface;
 
 class InstallData implements InstallDataInterface
 {
@@ -21,10 +22,29 @@ class InstallData implements InstallDataInterface
 
     /**
      * @param IndexerInterfaceFactory $indexerFactory
+     * @param ProductAttributeRepositoryInterface $attributeRepository
      */
-    public function __construct(IndexerInterfaceFactory $indexerFactory)
-    {
+    public function __construct(
+        IndexerInterfaceFactory $indexerFactory,
+        ProductAttributeRepositoryInterface $attributeRepository
+    ) {
         $this->indexerFactory = $indexerFactory;
+        $this->attributeRepository = $attributeRepository;
+    }
+
+    /**
+     * Installs data for a module
+     *
+     * @param ModuleDataSetupInterface $setup
+     * @param ModuleContextInterface $context
+     * @return void
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function install(ModuleDataSetupInterface $setup, ModuleContextInterface $context)
+    {
+        $this->setWeight('sku', 6);
+        $this->setWeight('name', 5);
+        $this->getIndexer('catalogsearch_fulltext')->reindexAll();
     }
 
     /**
@@ -37,15 +57,14 @@ private function getIndexer($indexerId)
     }
 
     /**
-     * Installs data for a module
-     *
-     * @param ModuleDataSetupInterface $setup
-     * @param ModuleContextInterface $context
+     * @param string $attributeCode
+     * @param int $weight
      * @return void
-     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
-    public function install(ModuleDataSetupInterface $setup, ModuleContextInterface $context)
+    private function setWeight($attributeCode, $weight)
     {
-        $this->getIndexer('catalogsearch_fulltext')->reindexAll();
+        $attribute = $this->attributeRepository->get($attributeCode);
+        $attribute->setSearchWeight($weight);
+        $this->attributeRepository->save($attribute);
     }
 }

app/code/Magento/CatalogSearch/Setup/InstallSchema.php

@@ -90,7 +90,7 @@ public function install(SchemaSetupInterface $setup, ModuleContextInterface $con
                 'type' => \Magento\Framework\DB\Ddl\Table::TYPE_FLOAT,
                 'unsigned' => true,
                 'nullable' => false,
-                'default' => '3',
+                'default' => '1',
                 'comment' => 'Search Weight'
             ]
         );

lib/internal/Magento/Framework/Search/Adapter/Mysql/ScoreBuilder.php

@@ -79,7 +79,7 @@ public function endQuery($boost)
     public function addCondition($score)
     {
         $this->addPlus();
-        $this->scoreCondition .= "{$score} * " . self::WEIGHT_FIELD;
+        $this->scoreCondition .= "{$score} * POW(2, " . self::WEIGHT_FIELD . ')';
     }
 
     /**

lib/internal/Magento/Framework/Search/Test/Unit/Adapter/Mysql/ScoreBuilderTest.php

@@ -45,10 +45,11 @@ public function testBuild()
 
         $result = $builder->build();
 
+        $weightExpression = 'POW(2, ' . ScoreBuilder::WEIGHT_FIELD . ')';
         $expected = '((someCondition1 * %1$s + (someCondition2 * %1$s + someCondition3 * %1$s + ' .
             '(someCondition4 * %1$s + someCondition5 * %1$s) * 10.1 + (someCondition6 * %1$s + ' .
             'someCondition7 * %1$s) * 10.2) * 10.3) * 10.4 + (0)) AS ' . $builder->getScoreAlias();
-        $expected = sprintf($expected, ScoreBuilder::WEIGHT_FIELD);
+        $expected = sprintf($expected, $weightExpression);
         $this->assertEquals($expected, $result);
     }
 }