merge magento-commerce/2.4-develop into magento-tsg/MC-41213

Author: magento-mts-svc

app/code/Magento/Catalog/Ui/DataProvider/Product/ProductCollection.php

@@ -25,58 +25,4 @@ protected function _productLimitationJoinPrice()
         $this->_productLimitationFilters->setUsePriceIndex(false);
         return $this->_productLimitationPrice(true);
     }
-
-    /**
-     * Return approximately amount if too much entities.
-     *
-     * @return int|mixed
-     */
-    public function getSize()
-    {
-        $sql = $this->getSelectCountSql();
-        $possibleCount = $this->analyzeCount($sql);
-
-        if ($possibleCount > 20000) {
-            return $possibleCount;
-        }
-
-        return parent::getSize();
-    }
-
-    /**
-     * Analyze amount of entities in DB.
-     *
-     * @param $sql
-     * @return int|mixed
-     * @throws \Zend_Db_Statement_Exception
-     */
-    private function analyzeCount($sql)
-    {
-        $results = $this->getConnection()->query('EXPLAIN ' . $sql)->fetchAll();
-        $alias = $this->getMainTableAlias();
-
-        foreach ($results as $result) {
-            if ($result['table'] == $alias) {
-                return $result['rows'];
-            }
-        }
-
-        return 0;
-    }
-
-    /**
-     * Identify main table alias or its name if alias is not defined.
-     *
-     * @return string
-     * @throws \LogicException
-     */
-    private function getMainTableAlias()
-    {
-        foreach ($this->getSelect()->getPart(\Magento\Framework\DB\Select::FROM) as $tableAlias => $tableMetadata) {
-            if ($tableMetadata['joinType'] == 'from') {
-                return $tableAlias;
-            }
-        }
-        throw new \LogicException("Main table cannot be identified.");
-    }
 }

app/code/Magento/CatalogRule/Model/Indexer/IndexerTableSwapper.php

@@ -122,4 +122,14 @@ public function swapIndexTables(array $originalTablesNames)
             $this->resourceConnection->getConnection()->dropTable($tableName);
         }
     }
+
+    /**
+     * Cleanup leftover temporary tables
+     */
+    public function __destruct()
+    {
+        foreach ($this->temporaryTables as $tableName) {
+            $this->resourceConnection->getConnection()->dropTable($tableName);
+        }
+    }
 }

app/code/Magento/Sales/etc/adminhtml/di.xml

@@ -48,9 +48,4 @@
             </argument>
         </arguments>
     </type>
-    <type name="Magento\Sales\Block\Adminhtml\Order\Create\Search\Grid\DataProvider\ProductCollection">
-        <arguments>
-            <argument name="collectionFactory" xsi:type="object">\Magento\Catalog\Ui\DataProvider\Product\ProductCollectionFactory</argument>
-        </arguments>
-    </type>
 </config>

app/code/Magento/SalesRule/view/adminhtml/ui_component/sales_rule_form.xml

@@ -493,7 +493,7 @@
         <field name="stop_rules_processing" formElement="checkbox">
             <argument name="data" xsi:type="array">
                 <item name="config" xsi:type="array">
-                    <item name="default" xsi:type="number">0</item>
+                    <item name="default" xsi:type="number">1</item>
                     <item name="source" xsi:type="string">sales_rule</item>
                 </item>
             </argument>

setup/src/Magento/Setup/Fixtures/CartPriceRulesFixture.php

@@ -199,7 +199,7 @@ public function generateRules($ruleFactory, $categoriesArray)
                 'discount_step'             => '',
                 'apply_to_shipping'         => '0',
                 'simple_free_shipping'      => '0',
-                'stop_rules_processing'     => '0',
+                'stop_rules_processing'     => '1',
                 'reward_points_delta'       => '',
                 'store_labels'              => [
                     0 => '',