magento/magento2#39948: Magento_Persistent performance overhead on non-cart, non-checkout pages

app/code/Magento/Persistent/Model/QuoteResourceWrapper.php

@@ -0,0 +1,69 @@
+<?php
+/**
+ * Copyright 2025 Adobe
+ * All Rights Reserved.
+ */
+declare(strict_types=1);
+
+namespace Magento\Persistent\Model;
+
+use Magento\Framework\App\ResourceConnection;
+
+class QuoteResourceWrapper
+{
+    /**
+     * @var ResourceConnection
+     */
+    private ResourceConnection $resourceConnection;
+
+    /**
+     * Constructor
+     *
+     * @param ResourceConnection $resourceConnection
+     */
+    public function __construct(
+        ResourceConnection $resourceConnection
+    ) {
+        $this->resourceConnection = $resourceConnection;
+    }
+
+    /**
+     * Check if quote is active.
+     *
+     * @param int|null $quoteId
+     * @return bool
+     */
+    public function isActive(?int $quoteId): bool
+    {
+        if (empty($quoteId)) {
+            return false;
+        }
+        $table = $this->resourceConnection->getTableName('quote');
+        $connection = $this->resourceConnection->getConnection();
+        $select = $connection->select()
+            ->from($table, 'is_active')
+            ->where('entity_id = ?', $quoteId);
+
+        return (bool)$connection->fetchOne($select);
+    }
+
+    /**
+     * Check if quote is persistent.
+     *
+     * @param int|null $quoteId
+     * @return bool
+     */
+    public function isPersistent(?int $quoteId): bool
+    {
+        if (empty($quoteId)) {
+            return false;
+        }
+        $table = $this->resourceConnection->getTableName('quote');
+        $connection = $this->resourceConnection->getConnection();
+        $select = $connection->select()
+            ->from($table, 'is_persistent')
+            ->where('entity_id = ?', $quoteId);
+
+        return (bool)$connection->fetchOne($select);
+    }
+}

app/code/Magento/Persistent/Observer/CheckExpirePersistentQuoteObserver.php

@@ -1,15 +1,19 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2015 Adobe
+ * All Rights Reserved.
  */
 namespace Magento\Persistent\Observer;
 
+use Magento\Framework\App\RequestInterface;
+use Magento\Framework\Event\ManagerInterface;
+use Magento\Framework\Event\Observer;
 use Magento\Framework\Event\ObserverInterface;
-use Magento\Framework\Exception\NoSuchEntityException;
-use Magento\Quote\Api\CartRepositoryInterface;
-use Magento\Quote\Api\Data\CartInterface;
-use Magento\Quote\Model\Quote;
+use Magento\Persistent\Helper\Data;
+use Magento\Persistent\Helper\Session;
+use Magento\Persistent\Model\QuoteManager;
+use Magento\Persistent\Model\QuoteResourceWrapper;
+use Magento\Framework\App\ObjectManager;
 
 /**
  * Observer of expired session
@@ -19,14 +23,14 @@
 class CheckExpirePersistentQuoteObserver implements ObserverInterface
 {
     /**
-     * Customer session
+     * Customer session instance for managing customer authentication state
      *
      * @var \Magento\Customer\Model\Session
      */
     protected $_customerSession;
 
     /**
-     * Checkout session
+     * Checkout session instance for managing quote data during checkout
      *
      * @var \Magento\Checkout\Model\Session
      */
@@ -40,7 +44,7 @@ class CheckExpirePersistentQuoteObserver implements ObserverInterface
     protected $_eventManager = null;
 
     /**
-     * Persistent session
+     * Helper that provides persistent session functionality
      *
      * @var \Magento\Persistent\Helper\Session
      */
@@ -52,55 +56,54 @@ class CheckExpirePersistentQuoteObserver implements ObserverInterface
     protected $quoteManager;
 
     /**
-     * Persistent data
+     * Helper that provides configuration and utility methods for persistent functionality
      *
      * @var \Magento\Persistent\Helper\Data
      */
     protected $_persistentData = null;
 
     /**
-     * Request
+     * Current HTTP request object
      *
      * @var \Magento\Framework\App\RequestInterface
      */
     private $request;
 
     /**
-     * Checkout Page path
+     * Path identifier for checkout pages
      *
      * @var string
      */
     private $checkoutPagePath = 'checkout';
 
     /**
-     * @var Quote
-     */
-    private $quote;
-
-    /**
-     * @var CartRepositoryInterface
+     * Resource wrapper for efficient quote operations
+     *
+     * @var QuoteResourceWrapper|null
      */
-    private $quoteRepository;
+    private ?QuoteResourceWrapper $quoteResourceWrapper;
 
     /**
-     * @param \Magento\Persistent\Helper\Session $persistentSession
-     * @param \Magento\Persistent\Helper\Data $persistentData
-     * @param \Magento\Persistent\Model\QuoteManager $quoteManager
-     * @param \Magento\Framework\Event\ManagerInterface $eventManager
+     * Constructor
+     *
+     * @param Session $persistentSession
+     * @param Data $persistentData
+     * @param QuoteManager $quoteManager
+     * @param ManagerInterface $eventManager
      * @param \Magento\Customer\Model\Session $customerSession
      * @param \Magento\Checkout\Model\Session $checkoutSession
-     * @param \Magento\Framework\App\RequestInterface $request
-     * @param CartRepositoryInterface $quoteRepository
+     * @param RequestInterface $request
+     * @param QuoteResourceWrapper|null $quoteResourceWrapper
      */
     public function __construct(
-        \Magento\Persistent\Helper\Session $persistentSession,
+        Session                         $persistentSession,
         \Magento\Persistent\Helper\Data $persistentData,
-        \Magento\Persistent\Model\QuoteManager $quoteManager,
-        \Magento\Framework\Event\ManagerInterface $eventManager,
+        QuoteManager                    $quoteManager,
+        ManagerInterface                $eventManager,
         \Magento\Customer\Model\Session $customerSession,
         \Magento\Checkout\Model\Session $checkoutSession,
-        \Magento\Framework\App\RequestInterface $request,
-        CartRepositoryInterface $quoteRepository
+        RequestInterface                $request,
+        ?QuoteResourceWrapper           $quoteResourceWrapper = null
     ) {
         $this->_persistentSession = $persistentSession;
         $this->quoteManager = $quoteManager;
@@ -109,18 +112,17 @@ public function __construct(
         $this->_eventManager = $eventManager;
         $this->_persistentData = $persistentData;
         $this->request = $request;
-        $this->quoteRepository = $quoteRepository;
+        $this->quoteResourceWrapper = $quoteResourceWrapper ?: ObjectManager::getInstance()
+            ->get(QuoteResourceWrapper::class);
     }
 
     /**
      * Check and clear session data if persistent session expired
      *
-     * @param \Magento\Framework\Event\Observer $observer
+     * @param Observer $observer
      * @return void
-     * @throws \Magento\Framework\Exception\LocalizedException
-     * @throws \Magento\Framework\Exception\NoSuchEntityException
      */
-    public function execute(\Magento\Framework\Event\Observer $observer)
+    public function execute(Observer $observer)
     {
         if (!$this->_persistentData->canProcess($observer)) {
             return;
@@ -141,7 +143,7 @@ public function execute(\Magento\Framework\Event\Observer $observer)
             $this->_checkoutSession->getQuoteId() &&
             // persistent session does not expire on onepage checkout page
             !$this->isRequestFromCheckoutPage($this->request) &&
-            $this->getQuote()->getIsPersistent()
+            (bool)$this->quoteResourceWrapper->isPersistent($this->_checkoutSession->getQuoteId())
         ) {
             $this->_eventManager->dispatch('persistent_session_expired');
             $this->quoteManager->expire();
@@ -153,58 +155,26 @@ public function execute(\Magento\Framework\Event\Observer $observer)
      * Checks if current quote marked as persistent and Persistence Functionality is disabled.
      *
      * @return bool
-     * @throws \Magento\Framework\Exception\LocalizedException
-     * @throws \Magento\Framework\Exception\NoSuchEntityException
      */
     private function isPersistentQuoteOutdated(): bool
     {
         if (!($this->_persistentData->isEnabled() && $this->_persistentData->isShoppingCartPersist())
             && !$this->_customerSession->isLoggedIn()
             && $this->_checkoutSession->getQuoteId()
-            && $this->isActiveQuote()
+            && $this->quoteResourceWrapper->isActive($this->_checkoutSession->getQuoteId())
         ) {
-            return (bool)$this->getQuote()->getIsPersistent();
+            return (bool)$this->quoteResourceWrapper->isPersistent($this->_checkoutSession->getQuoteId());
         }
         return false;
     }
 
-    /**
-     * Getter for Quote with micro optimization
-     *
-     * @return Quote
-     * @throws \Magento\Framework\Exception\LocalizedException
-     * @throws \Magento\Framework\Exception\NoSuchEntityException
-     */
-    private function getQuote(): Quote
-    {
-        if ($this->quote === null) {
-            $this->quote = $this->_checkoutSession->getQuote();
-        }
-        return $this->quote;
-    }
-
-    /**
-     * Check if quote is active.
-     *
-     * @return bool
-     */
-    private function isActiveQuote(): bool
-    {
-        try {
-            $this->quoteRepository->getActive($this->_checkoutSession->getQuoteId());
-            return true;
-        } catch (NoSuchEntityException $e) {
-            return false;
-        }
-    }
-
     /**
      * Check current request is coming from onepage checkout page.
      *
-     * @param \Magento\Framework\App\RequestInterface $request
+     * @param RequestInterface $request
      * @return bool
      */
-    private function isRequestFromCheckoutPage(\Magento\Framework\App\RequestInterface $request): bool
+    private function isRequestFromCheckoutPage(RequestInterface $request): bool
     {
         $requestUri = (string)$request->getRequestUri();
         $refererUri = (string)$request->getServer('HTTP_REFERER');