Skip to content

Commit b5dc6b0

Browse files
darssenmatticbot
darssen
authored and
matticbot
committed
Full sync: Use term id for terms range (#42740)
* Use term_id for the id when calculating ranges for terms * changelog Committed via a GitHub action: https://github.com/Automattic/jetpack/actions/runs/14168888501 Upstream-Ref: Automattic/jetpack@dab2808
1 parent c8427ca commit b5dc6b0

File tree

4 files changed

+70
-67
lines changed

4 files changed

+70
-67
lines changed

‎jetpack_vendor/automattic/jetpack-sync/src/modules/class-full-sync-immediately.php

+5-2
Original file line numberDiff line numberDiff line change
@@ -316,8 +316,11 @@ public function get_range( $type ) {
316316
return array();
317317
}
318318

319-
$table = $module->table();
320-
$id = $module->id_field();
319+
$table = $module->table();
320+
$id = $module->id_field();
321+
if ( 'terms' === $module ) { // Terms module relies on the term_taxonomy and term_taxonomy_id for the where sql, let's use term_id instead.
322+
$id = 'term_id';
323+
}
321324
$where_sql = $module->get_where_sql( array() );
322325

323326
// TODO: Call $wpdb->prepare on the following query.

‎jetpack_vendor/i18n-map.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@
8282
),
8383
'jetpack-sync' => array(
8484
'path' => 'jetpack_vendor/automattic/jetpack-sync',
85-
'ver' => '4.10.0-alpha1742998833',
85+
'ver' => '4.10.0-alpha1743414874',
8686
),
8787
),
8888
);

‎vendor/composer/installed.json

+32-32
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@
8181
"dist": {
8282
"type": "path",
8383
"url": "/tmp/jetpack-build/Automattic/jetpack-a8c-mc-stats",
84-
"reference": "3a94033d6d7d64f832453bd2fd62ac55593609ef"
84+
"reference": "17c04cb65dd0ebb823a15530ff8f2061774d59c4"
8585
},
8686
"require": {
8787
"php": ">=7.2"
@@ -138,7 +138,7 @@
138138
"dist": {
139139
"type": "path",
140140
"url": "/tmp/jetpack-build/Automattic/jetpack-admin-ui",
141-
"reference": "2f657c1271d9381b421242529a3150fa1bfc9fcf"
141+
"reference": "66647247203fb1fe954946a52649b023784ac2de"
142142
},
143143
"require": {
144144
"php": ">=7.2"
@@ -201,7 +201,7 @@
201201
"dist": {
202202
"type": "path",
203203
"url": "/tmp/jetpack-build/Automattic/jetpack-assets",
204-
"reference": "db2da47c1dbeabef948b61a07ee8cf15295d75de"
204+
"reference": "7a900584b4ef765dcfe134a36a789014809dce30"
205205
},
206206
"require": {
207207
"automattic/jetpack-constants": "^3.0.6-alpha",
@@ -274,7 +274,7 @@
274274
"dist": {
275275
"type": "path",
276276
"url": "/tmp/jetpack-build/Automattic/jetpack-blaze",
277-
"reference": "5659e3207b3c506829856d27ebba380ec37dbfc4"
277+
"reference": "7a9a4e9a27eaa34f871380beab4d299ee2fc9db9"
278278
},
279279
"require": {
280280
"automattic/jetpack-assets": "^4.0.15-alpha",
@@ -353,7 +353,7 @@
353353
"dist": {
354354
"type": "path",
355355
"url": "/tmp/jetpack-build/Automattic/jetpack-blocks",
356-
"reference": "08d67be21e39669d4f99f64b1c6c86f468a587ab"
356+
"reference": "85ecec032ee3285199ccfee0862f42fb855c005e"
357357
},
358358
"require": {
359359
"automattic/jetpack-constants": "^3.0.6-alpha",
@@ -413,7 +413,7 @@
413413
"dist": {
414414
"type": "path",
415415
"url": "/tmp/jetpack-build/Automattic/jetpack-calypsoify",
416-
"reference": "f9228601c27376af6bc261faa30c01a9675e229d"
416+
"reference": "b288f99ac3bf21ade2e1f76aaf27269b0a65a6b4"
417417
},
418418
"require": {
419419
"automattic/jetpack-assets": "^4.0.15-alpha",
@@ -482,7 +482,7 @@
482482
"dist": {
483483
"type": "path",
484484
"url": "/tmp/jetpack-build/Automattic/jetpack-classic-theme-helper",
485-
"reference": "25b0dfac237f2651ea863adac9c8960424244565"
485+
"reference": "9fef9257556648028a013a93f2d412e4123d1aff"
486486
},
487487
"require": {
488488
"automattic/jetpack-assets": "^4.0.15-alpha",
@@ -550,7 +550,7 @@
550550
"dist": {
551551
"type": "path",
552552
"url": "/tmp/jetpack-build/Automattic/jetpack-compat",
553-
"reference": "e8c9ed2c66e0b144d2216d80f28c1f5590e33304"
553+
"reference": "e8961033984b35325a2eb08dec4c3992b11742d0"
554554
},
555555
"require": {
556556
"php": ">=7.2"
@@ -590,7 +590,7 @@
590590
"dist": {
591591
"type": "path",
592592
"url": "/tmp/jetpack-build/Automattic/jetpack-composer-plugin",
593-
"reference": "861a6d2f3a26731990dfd5f0c8689bedc4cf3529"
593+
"reference": "c9b0fd378359128cd57a05918d1059948dda05e3"
594594
},
595595
"require": {
596596
"composer-plugin-api": "^2.2",
@@ -654,7 +654,7 @@
654654
"dist": {
655655
"type": "path",
656656
"url": "/tmp/jetpack-build/Automattic/jetpack-config",
657-
"reference": "dfcb0f78295663c4d81916d1fe835da4a0d3c991"
657+
"reference": "3be370d90c48ed56c483252b96136ed51475b561"
658658
},
659659
"require": {
660660
"php": ">=7.2"
@@ -731,7 +731,7 @@
731731
"dist": {
732732
"type": "path",
733733
"url": "/tmp/jetpack-build/Automattic/jetpack-connection",
734-
"reference": "308a02c235ef0c2310b2f53ccbfa09983def20c2"
734+
"reference": "5fd6854bae1a0c067adf65a8b192478cf0f722e3"
735735
},
736736
"require": {
737737
"automattic/jetpack-a8c-mc-stats": "^3.0.4",
@@ -819,7 +819,7 @@
819819
"dist": {
820820
"type": "path",
821821
"url": "/tmp/jetpack-build/Automattic/jetpack-constants",
822-
"reference": "4d734ab758b49046142ae31063b705d0ac33efe5"
822+
"reference": "1900a1c122f530abf87c2be317a59d1c6b2b009a"
823823
},
824824
"require": {
825825
"php": ">=7.2"
@@ -877,7 +877,7 @@
877877
"dist": {
878878
"type": "path",
879879
"url": "/tmp/jetpack-build/Automattic/jetpack-device-detection",
880-
"reference": "5ac175422dff0cd5f215df82c380e4b9ffc4df20"
880+
"reference": "dffa463f0733d8000f3d11f97a7cc267da640811"
881881
},
882882
"require": {
883883
"php": ">=7.2"
@@ -934,7 +934,7 @@
934934
"dist": {
935935
"type": "path",
936936
"url": "/tmp/jetpack-build/Automattic/jetpack-google-analytics",
937-
"reference": "9693e59d2c157f8dbaf826951f33803d8fa0d211"
937+
"reference": "fe98c3a86d4cfd1da50e158c94a0b1f51f85f731"
938938
},
939939
"require": {
940940
"automattic/jetpack-status": "^5.1.1-alpha",
@@ -1003,7 +1003,7 @@
10031003
"dist": {
10041004
"type": "path",
10051005
"url": "/tmp/jetpack-build/Automattic/jetpack-ip",
1006-
"reference": "68c27d30e90119111141f2d85fa78fa8e746f76b"
1006+
"reference": "8b75831c6801d77c0d7f436ec4e6159b7fab119b"
10071007
},
10081008
"require": {
10091009
"php": ">=7.2"
@@ -1065,7 +1065,7 @@
10651065
"dist": {
10661066
"type": "path",
10671067
"url": "/tmp/jetpack-build/Automattic/jetpack-jitm",
1068-
"reference": "6ce0097ea2e677dd12669599047db48b080d9341"
1068+
"reference": "cf22a3b83c1ccca10d7f9372098d9e8e7c003e32"
10691069
},
10701070
"require": {
10711071
"automattic/jetpack-a8c-mc-stats": "^3.0.4",
@@ -1144,7 +1144,7 @@
11441144
"dist": {
11451145
"type": "path",
11461146
"url": "/tmp/jetpack-build/Automattic/jetpack-logo",
1147-
"reference": "5fa5cb84b8a7f469ec28ea00493b21accdcc0783"
1147+
"reference": "0f38be9e20182b946caefc9e0e9e436fdfd8471f"
11481148
},
11491149
"require": {
11501150
"php": ">=7.2"
@@ -1201,7 +1201,7 @@
12011201
"dist": {
12021202
"type": "path",
12031203
"url": "/tmp/jetpack-build/Automattic/jetpack-masterbar",
1204-
"reference": "98d9e99e1b34fff90ed1f92dbec0b7fa33dd1b3e"
1204+
"reference": "46c7cf153f83492defb7b02ffaf9ffc89660d6a8"
12051205
},
12061206
"require": {
12071207
"automattic/jetpack-assets": "^4.0.15-alpha",
@@ -1287,7 +1287,7 @@
12871287
"dist": {
12881288
"type": "path",
12891289
"url": "/tmp/jetpack-build/Automattic/jetpack-mu-wpcom",
1290-
"reference": "34f10860bef23bcd02064905df35bc30e80f40c7"
1290+
"reference": "951fbe09991ec37dd40f704d36b4750f4e68d916"
12911291
},
12921292
"require": {
12931293
"automattic/jetpack-assets": "^4.0.15-alpha",
@@ -1374,7 +1374,7 @@
13741374
"dist": {
13751375
"type": "path",
13761376
"url": "/tmp/jetpack-build/Automattic/jetpack-password-checker",
1377-
"reference": "29ab26bf5689a82ab396154ea1627df39dc3d8a7"
1377+
"reference": "93460319b88135cb52cf0f621ab0f2ed283a9718"
13781378
},
13791379
"require": {
13801380
"php": ">=7.2"
@@ -1433,7 +1433,7 @@
14331433
"dist": {
14341434
"type": "path",
14351435
"url": "/tmp/jetpack-build/Automattic/jetpack-plans",
1436-
"reference": "4760cafc1686b6974b4c0dbb7a953406a5b9a993"
1436+
"reference": "020b203d088952fcffb5b4e3b7590f813c24abfb"
14371437
},
14381438
"require": {
14391439
"automattic/jetpack-connection": "^6.10.0-alpha",
@@ -1499,7 +1499,7 @@
14991499
"dist": {
15001500
"type": "path",
15011501
"url": "/tmp/jetpack-build/Automattic/jetpack-post-list",
1502-
"reference": "ed914214fc9540cc872d1d368b25f4fb0f5c5e1a"
1502+
"reference": "0671119e224072bd70f1d2833eca137a36adc94a"
15031503
},
15041504
"require": {
15051505
"automattic/jetpack-assets": "^4.0.15-alpha",
@@ -1568,7 +1568,7 @@
15681568
"dist": {
15691569
"type": "path",
15701570
"url": "/tmp/jetpack-build/Automattic/jetpack-redirect",
1571-
"reference": "253caf5c45012d3d36bfa6bf057969c2d8175c7f"
1571+
"reference": "b6dbe88cdb5c379fc01bb5a245f027b940d5131c"
15721572
},
15731573
"require": {
15741574
"automattic/jetpack-status": "^5.1.1-alpha",
@@ -1627,7 +1627,7 @@
16271627
"dist": {
16281628
"type": "path",
16291629
"url": "/tmp/jetpack-build/Automattic/jetpack-roles",
1630-
"reference": "8fc7019386a4389239c3350af41df8954a5ba927"
1630+
"reference": "303e9ea4ffe2d8bc46d2f622c85f9a0a8855df0f"
16311631
},
16321632
"require": {
16331633
"php": ">=7.2"
@@ -1685,7 +1685,7 @@
16851685
"dist": {
16861686
"type": "path",
16871687
"url": "/tmp/jetpack-build/Automattic/jetpack-stats",
1688-
"reference": "8fc918c2dae8923aa8b0bcff0e5cc8bc7e74d91a"
1688+
"reference": "f14d8513acfae748a123c639033e67e0e5cfadc0"
16891689
},
16901690
"require": {
16911691
"automattic/jetpack-connection": "^6.10.0-alpha",
@@ -1755,7 +1755,7 @@
17551755
"dist": {
17561756
"type": "path",
17571757
"url": "/tmp/jetpack-build/Automattic/jetpack-stats-admin",
1758-
"reference": "42216b9e0d6bfdc18d01d6c485f37304b3bb38f8"
1758+
"reference": "9dd7051a10a753f581244dc86574824f59a50d0a"
17591759
},
17601760
"require": {
17611761
"automattic/jetpack-connection": "^6.10.0-alpha",
@@ -1826,7 +1826,7 @@
18261826
"dist": {
18271827
"type": "path",
18281828
"url": "/tmp/jetpack-build/Automattic/jetpack-status",
1829-
"reference": "e4022b340512beb76c22ae6854638ceee1ca50eb"
1829+
"reference": "8185ab079f3725e948ed53ed61ea9983f424af9c"
18301830
},
18311831
"require": {
18321832
"automattic/jetpack-constants": "^3.0.6-alpha",
@@ -1894,7 +1894,7 @@
18941894
"dist": {
18951895
"type": "path",
18961896
"url": "/tmp/jetpack-build/Automattic/jetpack-subscribers-dashboard",
1897-
"reference": "d8f16653a76c89b388eb123c24c2c3d9076609bf"
1897+
"reference": "cf74423fc12d336881c35adb752d8cf329058815"
18981898
},
18991899
"require": {
19001900
"automattic/jetpack-connection": "^6.10.0-alpha",
@@ -1971,12 +1971,12 @@
19711971
},
19721972
{
19731973
"name": "automattic/jetpack-sync",
1974-
"version": "4.10.0-alpha.1742998833",
1975-
"version_normalized": "4.10.0.0-alpha1742998833",
1974+
"version": "4.10.0-alpha.1743414874",
1975+
"version_normalized": "4.10.0.0-alpha1743414874",
19761976
"dist": {
19771977
"type": "path",
19781978
"url": "/tmp/jetpack-build/Automattic/jetpack-sync",
1979-
"reference": "9f8b2791c690ff6863dab3e14412f37520545ca7"
1979+
"reference": "fbeb0c8686fd82de00234cce563ebf028b77d4b9"
19801980
},
19811981
"require": {
19821982
"automattic/jetpack-connection": "^6.10.0-alpha",
@@ -2052,7 +2052,7 @@
20522052
"dist": {
20532053
"type": "path",
20542054
"url": "/tmp/jetpack-build/Automattic/scheduled-updates",
2055-
"reference": "ab9297e8645dbc48002bdb781fcabe66150f8640"
2055+
"reference": "3041f72053434504064e86526a8491bc3f27f2e4"
20562056
},
20572057
"require": {
20582058
"automattic/jetpack-connection": "^6.10.0-alpha",

0 commit comments

Comments
 (0)