read image metadata from database first

Author: akaplya

app/code/Magento/Catalog/Model/Product/Gallery/CreateHandler.php

@@ -245,7 +245,6 @@ public function getAttribute()
                 'media_gallery'
             );
         }
-
         return $this->attribute;
     }
 

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

@@ -2334,49 +2334,32 @@ public function addPriceDataFieldFilter($comparisonFormat, $fields)
      * @SuppressWarnings(PHPMD.NPathComplexity)
      * @since 101.0.1
      * @throws \Magento\Framework\Exception\LocalizedException
+     * @throws \Zend_Db_Statement_Exception
      */
     public function addMediaGalleryData()
     {
         if ($this->getFlag('media_gallery_added')) {
             return $this;
         }
-
         if (!$this->getSize()) {
             return $this;
         }
-
-        $items = $this->getItems();
-        $linkField = $this->getProductEntityMetadata()->getLinkField();
-
-        $select = $this->getMediaGalleryResource()
-            ->createBatchBaseSelect(
-                $this->getStoreId(),
-                $this->getAttribute('media_gallery')->getAttributeId()
-            )->reset(
-                Select::ORDER // we don't care what order is in current scenario
-            )->where(
-                'entity.' . $linkField . ' IN (?)',
-                array_map(
-                    function ($item) use ($linkField) {
-                        return (int) $item->getOrigData($linkField);
-                    },
-                    $items
-                )
-            );
-
+        $records = $this->getMediaGalleryResource()->getMediaRecords(
+            $this->getStoreId(),
+            $this->getLoadedIds()
+        );
         $mediaGalleries = [];
-        foreach ($this->getConnection()->fetchAll($select) as $row) {
-            $mediaGalleries[$row[$linkField]][] = $row;
+        foreach ($records as $record) {
+            $mediaGalleries[$record['entity_id']][] = $record;
         }
 
-        foreach ($items as $item) {
+        foreach ($this->getItems() as $item) {
             $this->getGalleryReadHandler()
                 ->addMediaDataToProduct(
                     $item,
-                    $mediaGalleries[$item->getOrigData($linkField)] ?? []
+                    $mediaGalleries[$item->getId()] ?? []
                 );
         }
-
         $this->setFlag('media_gallery_added', true);
         return $this;
     }

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

@@ -126,17 +126,13 @@ public function loadDataFromTableByValueId(
      * @param int $attributeId
      * @return array
      * @since 101.0.0
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     * @throws \Magento\Framework\Exception\LocalizedException
+     * @throws \Zend_Db_Statement_Exception
      */
-    public function loadProductGalleryByAttributeId($product, $attributeId)
+    public function loadProductGalleryByAttributeId($product, $attributeId = null)
     {
-        $select = $this->createBaseLoadSelect(
-            $product->getData($this->metadata->getLinkField()),
-            $product->getStoreId(),
-            $attributeId
-        );
-
-        $result = $this->getConnection()->fetchAll($select);
-
+        $result = $this->getMediaRecords($product->getStoreId(), [$product->getId()], true);
         $this->removeDuplicates($result);
         return $result;
     }
@@ -200,9 +196,10 @@ public function getMediaRecords(int $storeId, array $entityIds, bool $preserveSo
      * @param int $attributeId
      * @return \Magento\Framework\DB\Select
      * @throws \Magento\Framework\Exception\LocalizedException
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      * @since 101.0.1
      */
-    public function createBatchBaseSelect($storeId, $attributeId)
+    public function createBatchBaseSelect($storeId, $attributeId = null)
     {
         $linkField = $this->metadata->getLinkField();
 
@@ -266,7 +263,6 @@ public function createBatchBaseSelect($storeId, $attributeId)
         )->order(
             $positionCheckSql . ' ' . \Magento\Framework\DB\Select::SQL_ASC
         );
-
         return $select;
     }