[Performance] Fix array merge in loop #30153

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

Jump to bottom

Merged

magento-engcom-team merged 1 commit into magento:2.4-develop from ihor-sviziev:fix-array-merge-in-loop

Sep 25, 2020

Contributor

ihor-sviziev commented Sep 23, 2020 •

edited by m2-assistant bot

Loading

Description (*)

Continuing #30002 - fix array merge in loop in different places.
Also this is follow up on my old PR #22248, so it should a bit improve static content deploy.

Related Pull Requests

Fixed Issues (if relevant)

Fixes magento/magento2#<issue_number>

Manual testing scenarios (*)

...
...

Questions or comments

Contribution checklist (*)

Pull request has a meaningful description of its purpose
All commits are accompanied by meaningful commit messages
All new or changed code is covered with unit/integration tests (if applicable)
All automated tests passed successfully (all builds are green)

Resolved issues:

resolves [Issue] [Performance] Fix array merge in loop #30183: [Performance] Fix array merge in loop

m2-assistant bot commented Sep 23, 2020

Hi @ihor-sviziev. Thank you for your contribution
Here is some useful tips how you can test your changes using Magento test environment.
Add the comment under your pull request to deploy test or vanilla Magento instance:

@magento give me test instance - deploy test instance based on PR changes
@magento give me 2.4-develop instance - deploy vanilla Magento instance

❗ Automated tests can be triggered manually with an appropriate comment:

@magento run all tests - run or re-run all required tests against the PR changes
@magento run <test-build(s)> - run or re-run specific test build(s)
For example: @magento run Unit Tests

<test-build(s)> is a comma-separated list of build names. Allowed build names are:

Database Compare
Functional Tests CE
Functional Tests EE,
Functional Tests B2B
Integration Tests
Magento Health Index
Sample Data Tests CE
Sample Data Tests EE
Sample Data Tests B2B
Static Tests
Unit Tests
WebAPI Tests

You can find more information about the builds here

ℹ️ Please run only needed test builds instead of all when developing. Please run all test builds before sending your PR for review.

For more details, please, review the Magento Contributor Guide documentation.

⚠️ According to the Magento Contribution requirements, all Pull Requests must go through the Community Contributions Triage process. Community Contributions Triage is a public meeting.

🕙 You can find the schedule on the Magento Community Calendar page.

📞 The triage of Pull Requests happens in the queue order. If you want to speed up the delivery of your contribution, please join the Community Contributions Triage session to discuss the appropriate ticket.

🎥 You can find the recording of the previous Community Contributions Triage on the Magento Youtube Channel

✏️ Feel free to post questions/proposals/feedback related to the Community Contributions Triage process to the corresponding Slack Channel

ghost added the Progress: pending review label

magento-engcom-team added Area: Frontend Component: multiple Release Line: 2.4 labels

Contributor Author

ihor-sviziev commented Sep 23, 2020

@magento run Integration Tests

3 similar comments

Contributor Author

ihor-sviziev commented Sep 23, 2020

@magento run Integration Tests

Contributor Author

ihor-sviziev commented Sep 23, 2020

@magento run Integration Tests

Contributor Author

ihor-sviziev commented Sep 23, 2020

@magento run Integration Tests

Contributor Author

ihor-sviziev commented Sep 23, 2020

Would like to identify what actually breaks the integration tests, for now tried to revert some parts, will see where it start fails

ihor-sviziev mentioned this pull request

Use one format in all places for array_merge #30002

Merged

5 tasks


          Fix array_merge in loop

2381ab4

ihor-sviziev force-pushed the fix-array-merge-in-loop branch from ecf6229 to 2381ab4 Compare

September 23, 2020 10:52

Contributor Author

ihor-sviziev commented Sep 23, 2020

@magento run Integration Tests

Contributor Author

ihor-sviziev commented Sep 23, 2020

@magento run Static Tests

sidolov added Priority: P3 Severity: S3 labels

Contributor Author

ihor-sviziev commented Sep 23, 2020

@magento run all tests

ihor-sviziev marked this pull request as ready for review

September 23, 2020 18:15

ihor-sviziev requested a review from lbajsarowicz

September 23, 2020 18:16

lbajsarowicz reviewed

View reviewed changes

dev/tests/static/testsuite/Magento/Test/Integrity/ComposerTest.php

Comment on lines 74 to +78

                       $blacklist = [];
                       foreach (glob($pattern) as $list) {
-                          //phpcs:ignore Magento2.Performance.ForeachArrayMerge
-                          $blacklist = array_merge($blacklist, file($list, FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES));
+                          $blacklist[] = file($list, FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES);
                       }
-                      return $blacklist;
+                      return array_merge([], ...$blacklist);

Contributor

lbajsarowicz Sep 23, 2020

Could you replace *****list with less controversial word? Eg. IgnoredList?

Contributor Author

ihor-sviziev Sep 24, 2020

That’s not purpose of current PR. We have a lot such places in code, they need to be reviewed all and fixed at once

ghost assigned lbajsarowicz

lbajsarowicz approved these changes

View reviewed changes

ghost added Progress: ready for testing and removed Progress: pending review labels

Contributor

magento-engcom-team commented Sep 23, 2020

Hi @lbajsarowicz, thank you for the review.
ENGCOM-8260 has been created to process this Pull Request
✳️ @lbajsarowicz, could you please add one of the following labels to the Pull Request?

Label	Description
`Auto-Tests: Covered`	All changes in Pull Request is covered by auto-tests
`Auto-Tests: Not Covered`	Changes in Pull Request requires coverage by auto-tests
`Auto-Tests: Not Required`	Changes in Pull Request does not require coverage by auto-tests

lbajsarowicz added the Award: category of expertise label

ghost assigned ihor-sviziev

ihor-sviziev removed their assignment

Contributor Author

ihor-sviziev commented Sep 24, 2020

@magento create issue

m2-assistant bot mentioned this pull request

[Issue] [Performance] Fix array merge in loop #30183

Closed

4 tasks

engcom-Alfa self-assigned this

engcom-Alfa added the Auto-Tests: Covered label

ghost added Progress: testing in progress and removed Progress: ready for testing labels

Contributor

engcom-Alfa commented Sep 24, 2020

QA not applicable

engcom-Alfa added the QA: Added to Regression Scope label

ghost added Progress: extended testing Progress: accept and removed Progress: testing in progress Progress: extended testing labels

sidolov added the Risk: low label

Contributor

gabrieldagama commented Sep 25, 2020

@magento give me new instance with env php 7.3 database 5.7

magento-deployment-service bot commented Sep 25, 2020

Hi @gabrieldagama. Thank you for your request. I'm working on Magento instance for you.

magento-deployment-service bot commented Sep 25, 2020

Hi @gabrieldagama, here is your Magento Instance: https://c178e3cc1a06edcebf1a10b470ad896d.instances.magento-community.engineering
Admin access: https://c178e3cc1a06edcebf1a10b470ad896d.instances.magento-community.engineering/admin_8597
Login: 3b1c7860
Password: ca355c867c52

Contributor

gabrieldagama commented Sep 25, 2020

@magento give me new instance with edition b2b with env php 7.3 database 5.7

magento-deployment-service bot commented Sep 25, 2020

Hi @gabrieldagama. Thank you for your request. I'm working on Magento instance for you.

magento-deployment-service bot commented Sep 25, 2020

Hi @gabrieldagama, here is your Magento Instance: https://c178e3cc1a06edcebf1a10b470ad896d.instances.magento-community.engineering
Admin access: https://c178e3cc1a06edcebf1a10b470ad896d.instances.magento-community.engineering/admin_5d95
Login: 368c0a0c
Password: d7fba295e280

magento-engcom-team pushed a commit that referenced this pull request


          ENGCOM-8260: [Performance] Fix array merge in loop #30153

a64d755

magento-engcom-team merged commit e1c29e9 into magento:2.4-develop

m2-assistant bot commented Sep 25, 2020

Hi @ihor-sviziev, thank you for your contribution!
Please, complete Contribution Survey, it will take less than a minute.
Your feedback will help us to improve contribution process.

ihor-sviziev deleted the fix-array-merge-in-loop branch

October 1, 2020 08:38

ihor-sviziev mentioned this pull request

[Performance] Fix array merge in loop to speed up static content deploy #22248

Closed

4 tasks

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Area: Frontend Auto-Tests: Covered Award: category of expertise Component: multiple Priority: P3 Progress: accept QA: Added to Regression Scope Release Line: 2.4 Risk: low Severity: S3