2.2.6 Use batches and direct queries to fix sales address upgrade #19098

rikwillems · 2018-11-07T09:36:40Z

Description (*)

Magento Commerce compatible fix for sales address upgrade script.

Fixed Issues (if relevant)

[update] enhance performance on large catalog #16570: enhance performance on large catalog
(comment)
2.2.6 Use batches and direct queries to fix sales address upgrade #18945

magento-engcom-team · 2018-11-07T09:36:42Z

Hi @rikwillems. 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-engcom-team give me test instance - deploy test instance based on PR changes
@magento-engcom-team give me 2.2-develop instance - deploy vanilla Magento instance

For more details, please, review the Magento Contributor Assistant documentation

app/code/Magento/Sales/Setup/UpgradeData.php

ihor-sviziev · 2018-11-07T15:30:54Z

Also looks like CLA showing as "not signed", so probably we have some issue there. Could you contact me in Slack to get it resolved faster?

orlangur · 2018-11-07T15:32:09Z

@ihor-sviziev is this not relevant or already delivered to 2.3?

ihor-sviziev · 2018-11-07T15:34:19Z

@orlangur this PR was just re-created from #18945 by author.

BTW we have the same issue in 2.3:
https://github.com/magento/magento2/blob/2.3-develop/app/code/Magento/Sales/Setup/Patch/Data/FillQuoteAddressIdInSalesOrderAddress.php

magento-cicd2 · 2018-11-08T08:25:45Z

All committers have signed the CLA.

rikwillems · 2018-11-08T08:34:27Z

This CLA is giving me a headache. I tried a new PR fix this as I cannot modify existing commits with new emailaddress. #19114

orlangur · 2018-11-08T10:05:54Z

@rikwillems,

cannot modify existing commits with new email address

git reset --soft HEAD^
git commit -m'Message'
git force push

should do the trick for arbitrary amount of last commits.

app/code/Magento/Sales/Setup/UpgradeData.php

ihor-sviziev · 2018-11-21T06:44:25Z

Hi @rikwillems,
Could you update your PR by squashing all commits into single one and force push, as @orlangur showed above?

Also please create PR to 2.3-develop branch, as we should accept it at first according to contributor guide

rikwillems · 2018-11-21T14:54:19Z

@ihor-sviziev I tried this now. Please see it that works.

ihor-sviziev · 2018-11-21T15:02:35Z

Hi @rikwillems,
Looks like you pushed without force option, as result - it merged changes.
Use git push origin <your branch> -f

rikwillems · 2018-11-21T15:09:03Z

@ihor-sviziev this is quote a pain. Not sure why it is not working out. Tried it again.

ihor-sviziev · 2018-11-21T15:19:20Z

@rikwillems, now you force-pushed, but pushed the same commits as before, but we want to have one squashed commit from you.
In order to verify if you did everything is ok - on the commits section all commit authors should be clickable, now we have two commits from email not linked to your github account
https://github.com/magento/magento2/pull/19098/commits

rikwillems · 2018-11-21T15:29:28Z

@ihor-sviziev this should do it...

ihor-sviziev

Issues with commit author is gone, that's good 👍
One small thing still there. Please check it.
Also please create PR to 2.3-develop branch, because it should be merged at first

app/code/Magento/Sales/Setup/UpgradeData.php

ihor-sviziev · 2018-12-05T07:05:57Z

Hi @rikwillems,
Are you interested in finalizing this PR?

Revert not needed changes

Fix static test failures

Fix statis test failures

Fix static test failure

magento-engcom-team · 2019-02-20T17:59:44Z

Hi @ihor-sviziev, thank you for the review.
ENGCOM-4344 has been created to process this Pull Request

magento-engcom-team · 2019-02-20T17:59:46Z

@rikwillems thank you for contributing. Please accept Community Contributors team invitation here to gain extended permissions for this repository.

…6_performance_sales_address_upgrade-v2

p-bystritsky · 2019-03-12T09:09:08Z

@rikwillems @ihor-sviziev there is not such column as "orderAddressId" in "sales_order_address" table, used in 'where' clause in https://github.com/magento/magento2/pull/19098/files#diff-0815805b2d40fcf0d22ebd639e0d73c4R247. Which will lead to an error during update.

ihor-sviziev · 2019-03-12T09:39:20Z

app/code/Magento/Sales/Setup/UpgradeData.php

+                'quote_address_id' => $quoteAddresses[$orderAddress['quote_id']]['address_id'] ?? null,
+            ];
+            $where = [
+                'orderAddressId' => $orderAddress['entity_id']


Suggested change

'orderAddressId' => $orderAddress['entity_id']

'entity_id' => $orderAddress['entity_id']

Fix field name

magento-engcom-team · 2019-03-12T09:43:37Z

Hi @ihor-sviziev, thank you for the review.
ENGCOM-4344 has been created to process this Pull Request

magento-engcom-team · 2019-03-12T18:11:38Z

Hi @ihor-sviziev, thank you for the review.
ENGCOM-4344 has been created to process this Pull Request

ghost · 2019-03-14T15:31:43Z

Hi @rikwillems, 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.

…s upgrade #19098

magento-engcom-team added Component: Sales Release Line: 2.2 labels Nov 7, 2018

rikwillems mentioned this pull request Nov 7, 2018

2.2.6 Use batches and direct queries to fix sales address upgrade #18945

Closed

ihor-sviziev self-assigned this Nov 7, 2018

ihor-sviziev changed the title ~~Combined commit~~ 2.2.6 Use batches and direct queries to fix sales address upgrade Nov 7, 2018

ihor-sviziev requested changes Nov 7, 2018

View reviewed changes

app/code/Magento/Sales/Setup/UpgradeData.php Show resolved Hide resolved

app/code/Magento/Sales/Setup/UpgradeData.php Show resolved Hide resolved

ihor-sviziev mentioned this pull request Nov 7, 2018

Specify connexion for db upgrade #18728

Closed

4 tasks

rikwillems mentioned this pull request Nov 8, 2018

2.2.6 Use batches and direct queries to fix sales address upgrade #19114

Closed

orlangur added the Progress: on hold label Nov 8, 2018

ihor-sviziev requested changes Nov 8, 2018

View reviewed changes

app/code/Magento/Sales/Setup/UpgradeData.php Show resolved Hide resolved

app/code/Magento/Sales/Setup/UpgradeData.php Outdated Show resolved Hide resolved

CLA force push commit

b271dd8

ihor-sviziev requested changes Nov 21, 2018

View reviewed changes

app/code/Magento/Sales/Setup/UpgradeData.php Outdated Show resolved Hide resolved

ihor-sviziev and others added 2 commits January 22, 2019 16:25

#19098 2.2.6 Use batches and direct queries to fix sales address upgrade

0b0dcfb

Revert not needed changes

#19098 2.2.6 Use batches and direct queries to fix sales address upgrade

4a9a98a

Fix static test failures

ihor-sviziev mentioned this pull request Jan 30, 2019

[Forwardport] Use batches and direct queries to fix sales address upgrade #20785

Merged

4 tasks

#19098 2.2.6 Use batches and direct queries to fix sales address upgrade

7c6026e

Fix statis test failures

#19098 2.2.6 Use batches and direct queries to fix sales address upgrade

c60d395

Fix static test failure

ihor-sviziev approved these changes Feb 20, 2019

View reviewed changes

Merge remote-tracking branch 'mainline/2.2-develop' into feature/2.2.…

9b01f5c

…6_performance_sales_address_upgrade-v2

ihor-sviziev removed the Progress: on hold label Mar 1, 2019

p-bystritsky added the Progress: needs update label Mar 12, 2019

ihor-sviziev reviewed Mar 12, 2019

View reviewed changes

#19098 2.2.6 Use batches and direct queries to fix sales address upgrade

8b8a46c

Fix field name

ihor-sviziev approved these changes Mar 12, 2019

View reviewed changes

ghost added Progress: ready for testing and removed Progress: needs update labels Mar 12, 2019

ghost added Progress: needs update and removed Progress: ready for testing labels Mar 12, 2019

#19098 Use batches and direct queries to fix sales address upgrade

df36443

ihor-sviziev approved these changes Mar 12, 2019

View reviewed changes

ghost added Progress: ready for testing and removed Progress: needs update labels Mar 12, 2019

ihor-sviziev added the Award: bug fix label Mar 12, 2019

p-bystritsky self-assigned this Mar 13, 2019

ghost added Progress: accept and removed Progress: ready for testing labels Mar 13, 2019

magento-engcom-team merged commit df36443 into magento:2.2-develop Mar 14, 2019

magento-engcom-team pushed a commit that referenced this pull request Mar 14, 2019

ENGCOM-4344: 2.2.6 Use batches and direct queries to fix sales addres…

eb1ead3

…s upgrade #19098

magento-engcom-team removed the Award: bug fix label Mar 14, 2019

magento-engcom-team added this to the Release: 2.2.9 milestone Mar 14, 2019

	'orderAddressId' => $orderAddress['entity_id']
	'entity_id' => $orderAddress['entity_id']

2.2.6 Use batches and direct queries to fix sales address upgrade #19098

2.2.6 Use batches and direct queries to fix sales address upgrade #19098

Uh oh!

Conversation

rikwillems commented Nov 7, 2018

Description (*)

Fixed Issues (if relevant)

Uh oh!

magento-engcom-team commented Nov 7, 2018

Uh oh!

Uh oh!

Uh oh!

ihor-sviziev commented Nov 7, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

orlangur commented Nov 7, 2018

Uh oh!

ihor-sviziev commented Nov 7, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

magento-cicd2 commented Nov 8, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

rikwillems commented Nov 8, 2018

Uh oh!

orlangur commented Nov 8, 2018

Uh oh!

Uh oh!

Uh oh!

ihor-sviziev commented Nov 21, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

rikwillems commented Nov 21, 2018

Uh oh!

ihor-sviziev commented Nov 21, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

rikwillems commented Nov 21, 2018

Uh oh!

ihor-sviziev commented Nov 21, 2018

Uh oh!

rikwillems commented Nov 21, 2018

Uh oh!

ihor-sviziev left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

ihor-sviziev commented Dec 5, 2018

Uh oh!

magento-engcom-team commented Feb 20, 2019

Uh oh!

magento-engcom-team commented Feb 20, 2019

Uh oh!

p-bystritsky commented Mar 12, 2019

Uh oh!

ihor-sviziev Mar 12, 2019

Choose a reason for hiding this comment

Uh oh!

magento-engcom-team commented Mar 12, 2019

Uh oh!

magento-engcom-team commented Mar 12, 2019

Uh oh!

ghost commented Mar 14, 2019

Uh oh!

Uh oh!

ihor-sviziev commented Nov 7, 2018 •

edited

Loading

ihor-sviziev commented Nov 7, 2018 •

edited

Loading

magento-cicd2 commented Nov 8, 2018 •

edited

Loading

ihor-sviziev commented Nov 21, 2018 •

edited

Loading

ihor-sviziev commented Nov 21, 2018 •

edited

Loading