Merge remote-tracking branch 'origin/2.4-develop' into MC-33288

Author: zakdma

app/code/Magento/Catalog/Model/Indexer/Category/Product/AbstractAction.php

@@ -430,7 +430,7 @@ protected function prepareSelectsByRange(
                 $field,
                 $select,
                 $range,
-                \Magento\Framework\DB\Query\BatchIteratorInterface::NON_UNIQUE_FIELD_ITERATOR
+                \Magento\Framework\DB\Query\BatchIteratorInterface::UNIQUE_FIELD_ITERATOR
             );
 
             $queries = [];

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

@@ -25,4 +25,58 @@ 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/CatalogInventory/Model/Indexer/Stock/Action/Full.php

@@ -149,13 +149,21 @@ public function execute($ids = null): void
 
                 $select = $connection->select();
                 $select->distinct(true);
-                $select->from(['e' => $entityMetadata->getEntityTable()], $entityMetadata->getIdentifierField());
+                $select->from(
+                    [
+                        'e' => $entityMetadata->getEntityTable()
+                    ],
+                    $entityMetadata->getIdentifierField()
+                )->where(
+                    'type_id = ?',
+                    $indexer->getTypeId()
+                );
 
                 $batchQueries = $this->batchQueryGenerator->generate(
                     $entityMetadata->getIdentifierField(),
                     $select,
                     $batchRowCount,
-                    BatchIteratorInterface::NON_UNIQUE_FIELD_ITERATOR
+                    BatchIteratorInterface::UNIQUE_FIELD_ITERATOR
                 );
 
                 foreach ($batchQueries as $query) {

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

@@ -48,4 +48,9 @@
             </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>

lib/internal/Magento/Framework/Cache/Backend/RemoteSynchronizedCache.php

@@ -248,9 +248,23 @@ public function save($data, $id, $tags = [], $specificLifetime = false)
             $this->unlock($id);
         }
 
+        if (!mt_rand(0, 100) && $this->checkIfLocalCacheSpaceExceeded()) {
+            $this->local->clean();
+        }
+
         return $this->local->save($dataToSave, $id, [], $specificLifetime);
     }
 
+    /**
+     * Check if local cache space bigger that configure amount
+     *
+     * @return bool
+     */
+    private function checkIfLocalCacheSpaceExceeded()
+    {
+        return $this->getFillingPercentage() >= 95;
+    }
+
     /**
      * @inheritdoc
      */
@@ -266,7 +280,8 @@ public function remove($id)
      */
     public function clean($mode = \Zend_Cache::CLEANING_MODE_ALL, $tags = [])
     {
-        return $this->remote->clean($mode, $tags);
+        return $this->remote->clean($mode, $tags) &&
+            $this->local->clean($mode, $tags);
     }
 
     /**