ACPT-1194-part2

Don't call reset() method from _resetState() method in Collections!

Author: JacobBrownAustin

app/code/Magento/Catalog/Model/ResourceModel/Product/Collection.php

@@ -399,7 +399,6 @@ public function _resetState(): void
     {
         parent::_resetState();
         $this->_flatEnabled = [];
-        $this->_initTables();
         $this->_addUrlRewrite = false;
         $this->_urlRewriteCategory = '';
         $this->_addFinalPrice = false;
@@ -420,6 +419,7 @@ public function _resetState(): void
         $this->linkField = null;
         $this->backend = null;
         $this->emptyItem = null;
+        $this->_construct();
     }
 
     /**

app/code/Magento/Eav/Model/Entity/Collection/AbstractCollection.php

@@ -189,7 +189,12 @@ public function _resetState(): void
         $this->_itemsById = [];
         $this->_staticFields = [];
         $this->_entity = null;
-        $this->_reset();
+        $this->_selectEntityTypes = [];
+        $this->_selectAttributes = [];
+        $this->_filterAttributes = [];
+        $this->_joinEntities = [];
+        $this->_joinAttributes = [];
+        $this->_joinFields = [];
     }
 
     /**

lib/internal/Magento/Framework/Data/Collection/AbstractDb.php

@@ -125,12 +125,14 @@ public function __construct(
     public function _resetState(): void
     {
         parent::_resetState();
-        $this->_reset();
+        $this->setConnection($this->_conn);
         $this->_idFieldName = null;
         $this->_bindParams = [];
+        $this->_data = null;
         $this->map = null;
         $this->_fetchStmt = null;
         $this->_isOrdersRendered = false;
+        $this->extensionAttributesJoinProcessor = null;
     }
 
     /**