Skip to content

#40216-Replacing nested foreach with array union (+) to reduce time complexity #40217

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 7 commits into
base: 2.4-develop
Choose a base branch
from
+33 −22
Open

#40216-Replacing nested foreach with array union (+) to reduce time complexity #40217

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
2c3a2c9
#40216-Replacing nested foreach with array_replace to reduce time com…
Oct 4, 2025
f3f5bc9
#40216 - array union seems to be better optimised from memory perspec…
Oct 4, 2025
85c13c6
#40216 - Moving the setting to outside of if to fix data setting issue
Oct 4, 2025
f8d70b6
#40216 - Moving the attribute value to right side to keep the left ar…
Oct 5, 2025
1ce65b5
Merge branch '2.4-develop' into Fixing-BigOComplexity-in-Eav
senthilengg Oct 7, 2025
072db63
#40216 - Reproduced WebApiFunctional Test errors & fixed
Oct 9, 2025
ab42d68
#40216 - Removing a confusing comment
Oct 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
55 changes: 33 additions & 22 deletions app/code/Magento/Eav/Model/Entity/Collection/AbstractCollection.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php
/**
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
* Copyright 2025 Adobe
* All Rights Reserved.
*/

namespace Magento\Eav\Model\Entity\Collection;
Expand Down Expand Up @@ -1233,8 +1233,27 @@ public function _loadAttributes($printQuery = false, $logQuery = false)
throw $e;
}

$attributeCode = $data = [];
$entityIdField = $entity->getEntityIdField();

foreach ($values as $value) {
$this->_setItemAttributeValue($value);
$entityId = $value[$entityIdField];
$attributeId = $value['attribute_id'];
if (!isset($attributeCode[$attributeId])) {
$attributeCode[$attributeId] = array_search($attributeId, $this->_selectAttributes);
if (!$attributeCode[$attributeId]) {
$attribute = $this->_eavConfig->getAttribute(
$this->getEntity()->getType(),
$attributeId
);
$attributeCode[$attributeId] = $attribute->getAttributeCode();
}
}
$data[$entityId][$attributeCode[$attributeId]] = $value['value'];
}

if ($data) {
$this->_setItemAttributeValue($data);
}
}
}
Expand Down Expand Up @@ -1303,32 +1322,24 @@ protected function _addLoadAttributesSelectValues($select, $table, $type)
/**
* Initialize entity object property value
*
* Parameter $valueInfo is _getLoadAttributesSelect fetch result row
* Parameter $valueInfo is [product_id => [attribute_code => value]]
*
* @param array $valueInfo
* @return $this
* @throws LocalizedException
*/
protected function _setItemAttributeValue($valueInfo)
{
$entityIdField = $this->getEntity()->getEntityIdField();
$entityId = $valueInfo[$entityIdField];
if (!isset($this->_itemsById[$entityId])) {
throw new LocalizedException(
__('A header row is missing for an attribute. Verify the header row and try again.')
);
}
$attributeCode = array_search($valueInfo['attribute_id'], $this->_selectAttributes);
if (!$attributeCode) {
$attribute = $this->_eavConfig->getAttribute(
$this->getEntity()->getType(),
$valueInfo['attribute_id']
);
$attributeCode = $attribute->getAttributeCode();
}

foreach ($this->_itemsById[$entityId] as $object) {
$object->setData($attributeCode, $valueInfo['value']);
foreach ($valueInfo as $entityId => $value) {
if (!isset($this->_itemsById[$entityId])) {
throw new LocalizedException(
__('A header row is missing for an attribute. Verify the header row and try again.')
);
}
// Run only once
foreach ($this->_itemsById[$entityId] as $object) {
$object->setData($object->getData()+$value);
}
}

return $this;
Expand Down