MAGETWO-90564: [Indexer optimizations] Catalog Rule indexer matching mechanism optimization

Author: AVoskoboinikov

app/code/Magento/Catalog/Model/Api/SearchCriteria/CollectionProcessor/ConditionProcessor/ConditionBuilder/EavAttributeCondition.php

@@ -42,6 +42,8 @@ public function __construct(
     }
 
     /**
+     * Build condition to filter product collection by EAV attribute
+     *
      * @param Filter $filter
      * @return string
      * @throws \DomainException

app/code/Magento/Catalog/Model/Api/SearchCriteria/CollectionProcessor/ConditionProcessor/ConditionBuilder/Factory.php

@@ -57,6 +57,10 @@ public function __construct(
     }
 
     /**
+     * Decides which condition builder should be used for passed filter
+     * can be either EAV attribute builder or native attribute builder
+     * "native" attribute means attribute that is in catalog_product_entity table
+     *
      * @param Filter $filter
      * @return CustomConditionInterface
      * @throws \Magento\Framework\Exception\LocalizedException

app/code/Magento/Catalog/Model/Api/SearchCriteria/CollectionProcessor/ConditionProcessor/ConditionBuilder/NativeAttributeCondition.php

@@ -34,6 +34,9 @@ public function __construct(
     }
 
     /**
+     * Build condition to filter product collection by product native attribute
+     * "native" attribute means attribute that is in catalog_product_entity table
+     *
      * @param Filter $filter
      * @return string
      * @throws \DomainException

app/code/Magento/Catalog/Model/Api/SearchCriteria/CollectionProcessor/ConditionProcessor/DefaultCondition.php

@@ -31,6 +31,8 @@ public function __construct(
     }
 
     /**
+     * Builds condition to filter product collection either by EAV or by native attribute
+     *
      * @param Filter $filter
      * @return string
      */

app/code/Magento/Catalog/Model/Api/SearchCriteria/CollectionProcessor/ConditionProcessor/ProductCategoryCondition.php

@@ -48,6 +48,8 @@ public function __construct(
     }
 
     /**
+     * Builds condition to filter product collection by categories
+     *
      * @param Filter $filter
      * @return string
      */
@@ -109,14 +111,14 @@ private function getCategoryIds(Filter $filter): array
      * Map equal and not equal conditions to in and not in
      *
      * @param string $conditionType
-     * @return mixed
+     * @return string
      */
     private function mapConditionType(string $conditionType): string
     {
         $conditionsMap = [
-            'eq'    => 'in',
-            'neq'   => 'nin',
-            'like'  => 'in',
+            'eq' => 'in',
+            'neq' => 'nin',
+            'like' => 'in',
             'nlike' => 'nin',
         ];
         return $conditionsMap[$conditionType] ?? $conditionType;

app/code/Magento/CatalogRule/Model/Rule.php

@@ -163,7 +163,7 @@ class Rule extends \Magento\Rule\Model\AbstractModel implements RuleInterface, I
     /**
      * @var ConditionsToCollectionApplier
      */
-    protected $conditionsToCollectionApplier;
+    private $conditionsToCollectionApplier;
 
     /**
      * @var array
@@ -372,6 +372,11 @@ public function getMatchingProductIds()
         return $this->_productIds;
     }
 
+    /**
+     * Check if we can use mapping for rule conditions
+     *
+     * @return bool
+     */
     private function canPreMapProducts()
     {
         $conditions = $this->getConditions();

app/code/Magento/CatalogRule/Model/Rule/Condition/ConditionsToSearchCriteriaMapper.php

@@ -183,16 +183,16 @@ private function getGlueForArrayValues(string $operator): string
     private function reverseSqlOperatorInFilter(Filter $filter)
     {
         $operatorsMap = [
-            'eq'    => 'neq',
-            'neq'   => 'eq',
-            'gteq'  => 'lt',
-            'lteq'  => 'gt',
-            'gt'    => 'lteq',
-            'lt'    => 'gteq',
-            'like'  => 'nlike',
+            'eq' => 'neq',
+            'neq' => 'eq',
+            'gteq' => 'lt',
+            'lteq' => 'gt',
+            'gt' => 'lteq',
+            'lt' => 'gteq',
+            'like' => 'nlike',
             'nlike' => 'like',
-            'in'    => 'nin',
-            'nin'   => 'in',
+            'in' => 'nin',
+            'nin' => 'in',
         ];
 
         if (!array_key_exists($filter->getConditionType(), $operatorsMap)) {
@@ -254,16 +254,16 @@ private function createFilter(string $field, string $value, string $conditionTyp
     private function mapRuleOperatorToSQLCondition(string $ruleOperator): string
     {
         $operatorsMap = [
-            '=='    => 'eq',    // is
-            '!='    => 'neq',   // is not
-            '>='    => 'gteq',  // equals or greater than
-            '<='    => 'lteq',  // equals or less than
-            '>'     => 'gt',    // greater than
-            '<'     => 'lt',    // less than
-            '{}'    => 'like',  // contains
-            '!{}'   => 'nlike', // does not contains
-            '()'    => 'in',    // is one of
-            '!()'   => 'nin',   // is not one of
+            '==' => 'eq',    // is
+            '!=' => 'neq',   // is not
+            '>=' => 'gteq',  // equals or greater than
+            '<=' => 'lteq',  // equals or less than
+            '>' => 'gt',    // greater than
+            '<' => 'lt',    // less than
+            '{}' => 'like',  // contains
+            '!{}' => 'nlike', // does not contains
+            '()' => 'in',    // is one of
+            '!()' => 'nin',   // is not one of
         ];
 
         if (!array_key_exists($ruleOperator, $operatorsMap)) {
@@ -289,8 +289,8 @@ private function mapRuleOperatorToSQLCondition(string $ruleOperator): string
     private function mapRuleAggregatorToSQLAggregator(string $ruleAggregator): string
     {
         $operatorsMap = [
-            'all'    => 'AND',
-            'any'    => 'OR',
+            'all' => 'AND',
+            'any' => 'OR',
         ];
 
         if (!array_key_exists(strtolower($ruleAggregator), $operatorsMap)) {