Skip to content

Commit efcd895

Browse files
darssenmatticbot
darssen
authored and
matticbot
committed
Full Sync: Consider blacklisted taxonomies when getting next chunk in term relationships (#42618)
* Consider blacklisted taxonomies when getting next chunk for full sync in term relationships * changelog Committed via a GitHub action: https://github.com/Automattic/jetpack/actions/runs/13987583222 Upstream-Ref: Automattic/jetpack@8811bda
1 parent 611d34d commit efcd895

File tree

6 files changed

+126
-120
lines changed

6 files changed

+126
-120
lines changed

‎jetpack_vendor/automattic/jetpack-sync/CHANGELOG.md

+3
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
99

1010
This is an alpha version! The changes listed here are not final.
1111

12+
### Added
13+
- Sync: Consider blacklisted taxonomies when doing full sync for term relationships
14+
1215
## [4.9.1] - 2025-03-17
1316
### Changed
1417
- Internal updates.

‎jetpack_vendor/automattic/jetpack-sync/src/modules/class-term-relationships.php

+8-5
Original file line numberDiff line numberDiff line change
@@ -178,11 +178,14 @@ public function get_next_chunk( $config, $status, $chunk_size ) {
178178

179179
return $wpdb->get_results(
180180
$wpdb->prepare(
181-
"SELECT object_id, term_taxonomy_id
182-
FROM $wpdb->term_relationships
183-
WHERE ( object_id = %d AND term_taxonomy_id < %d ) OR ( object_id < %d )
184-
ORDER BY object_id DESC, term_taxonomy_id
185-
DESC LIMIT %d",
181+
"SELECT tr.object_id, tr.term_taxonomy_id
182+
FROM $wpdb->term_relationships tr INNER JOIN $wpdb->term_taxonomy tt
183+
ON tr.term_taxonomy_id=tt.term_taxonomy_id
184+
WHERE " .
185+
Settings::get_whitelisted_taxonomies_sql() // phpcs:ignore WordPress.DB.PreparedSQL.NotPrepared
186+
. ' AND ( ( tr.object_id = %d AND tr.term_taxonomy_id < %d ) OR ( tr.object_id < %d ) )
187+
ORDER BY tr.object_id DESC, tr.term_taxonomy_id
188+
DESC LIMIT %d',
186189
$status['last_sent']['object_id'],
187190
$status['last_sent']['term_taxonomy_id'],
188191
$status['last_sent']['object_id'],

‎jetpack_vendor/i18n-map.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666
),
6767
'jetpack-sync' => array(
6868
'path' => 'jetpack_vendor/automattic/jetpack-sync',
69-
'ver' => '4.9.2-alpha1742415897',
69+
'ver' => '4.9.2-alpha1742545545',
7070
),
7171
'jetpack-videopress-pkg' => array(
7272
'path' => 'jetpack_vendor/automattic/jetpack-videopress',

‎vendor/composer/installed.json

+29-29
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"dist": {
88
"type": "path",
99
"url": "/tmp/jetpack-build/Automattic/jetpack-a8c-mc-stats",
10-
"reference": "f502f29aba12690c760d0e374f52518bf6c6aa62"
10+
"reference": "a49b6ecedd6cd3978bdfeefb4fcba22afd927e50"
1111
},
1212
"require": {
1313
"php": ">=7.2"
@@ -64,7 +64,7 @@
6464
"dist": {
6565
"type": "path",
6666
"url": "/tmp/jetpack-build/Automattic/jetpack-admin-ui",
67-
"reference": "456d1fe61e5799135754fdd86fb2562e3a1d0ecd"
67+
"reference": "0bcb26d2d00b6f2a110ef72476473e23bfe65df4"
6868
},
6969
"require": {
7070
"php": ">=7.2"
@@ -127,7 +127,7 @@
127127
"dist": {
128128
"type": "path",
129129
"url": "/tmp/jetpack-build/Automattic/jetpack-assets",
130-
"reference": "3246bdc99bfbd24b91cbec32d177d101a2c45f96"
130+
"reference": "0015e998a8f4dac25101e4786f05d5af241dee75"
131131
},
132132
"require": {
133133
"automattic/jetpack-constants": "^3.0.5-alpha",
@@ -200,7 +200,7 @@
200200
"dist": {
201201
"type": "path",
202202
"url": "/tmp/jetpack-build/Automattic/jetpack-autoloader",
203-
"reference": "d086332a39726cec10b06bc7b2e062f88dadb5ae"
203+
"reference": "df9d6abf0e26e6b5ec19b22e0c4ce6023cf2eb8e"
204204
},
205205
"require": {
206206
"composer-plugin-api": "^2.2",
@@ -272,7 +272,7 @@
272272
"dist": {
273273
"type": "path",
274274
"url": "/tmp/jetpack-build/Automattic/jetpack-boost-core",
275-
"reference": "0fc4706bdf18eb47c69d52cb71ee5aba8957d70b"
275+
"reference": "c96a6f3d34c1f56f5ee7285da8c84c5a8648197c"
276276
},
277277
"require": {
278278
"automattic/jetpack-connection": "^6.7.7-alpha",
@@ -331,7 +331,7 @@
331331
"dist": {
332332
"type": "path",
333333
"url": "/tmp/jetpack-build/Automattic/jetpack-boost-speed-score",
334-
"reference": "35d9345c7ddbc6b9ae8994904a59966f166546cf"
334+
"reference": "6af41e2c20e79c633855c1c328b4cc2682d3e6a7"
335335
},
336336
"require": {
337337
"automattic/jetpack-boost-core": "^0.3.9-alpha",
@@ -399,7 +399,7 @@
399399
"dist": {
400400
"type": "path",
401401
"url": "/tmp/jetpack-build/Automattic/jetpack-composer-plugin",
402-
"reference": "fe4c06a28edcaf393dacfce1942c5f19c7133040"
402+
"reference": "f8ff9c812fca3584f2eedc6625be44b3dba09b04"
403403
},
404404
"require": {
405405
"composer-plugin-api": "^2.2",
@@ -463,7 +463,7 @@
463463
"dist": {
464464
"type": "path",
465465
"url": "/tmp/jetpack-build/Automattic/jetpack-config",
466-
"reference": "dc64e2a190a4030d69a07cf09368cffd5defd782"
466+
"reference": "93b9823bf8683d84c8b5f54a3c7632706fc6d61e"
467467
},
468468
"require": {
469469
"php": ">=7.2"
@@ -538,7 +538,7 @@
538538
"dist": {
539539
"type": "path",
540540
"url": "/tmp/jetpack-build/Automattic/jetpack-connection",
541-
"reference": "61e7bb53d79f9182a41678ca5150c1721cddb653"
541+
"reference": "1682e5f6f6be82216f68463c3e9ae89c3fced78b"
542542
},
543543
"require": {
544544
"automattic/jetpack-a8c-mc-stats": "^3.0.4-alpha",
@@ -626,7 +626,7 @@
626626
"dist": {
627627
"type": "path",
628628
"url": "/tmp/jetpack-build/Automattic/jetpack-constants",
629-
"reference": "39788b2f3b9cb866500a519f6c785f43099d3153"
629+
"reference": "f91ab39278bd0ebdab5bc92cd805257ca7b06273"
630630
},
631631
"require": {
632632
"php": ">=7.2"
@@ -684,7 +684,7 @@
684684
"dist": {
685685
"type": "path",
686686
"url": "/tmp/jetpack-build/Automattic/jetpack-device-detection",
687-
"reference": "2a4a50160d106eb9d256e128ed0fa31f129daefd"
687+
"reference": "cf971549ea62d924f2302a6e3111d6e5826015d6"
688688
},
689689
"require": {
690690
"php": ">=7.2"
@@ -741,7 +741,7 @@
741741
"dist": {
742742
"type": "path",
743743
"url": "/tmp/jetpack-build/Automattic/jetpack-explat",
744-
"reference": "0efe827fe0c961a961bb740824af308d99cc4761"
744+
"reference": "3f10b5845f9d6ee91937f1094845e7ab78db89ba"
745745
},
746746
"require": {
747747
"automattic/jetpack-connection": "^6.7.7-alpha",
@@ -820,7 +820,7 @@
820820
"dist": {
821821
"type": "path",
822822
"url": "/tmp/jetpack-build/Automattic/jetpack-ip",
823-
"reference": "a9b64b75969141fd04e03b46010a6ef3826756a1"
823+
"reference": "aa6607513035ec0d0a67bc37a81fdad1dbe89c96"
824824
},
825825
"require": {
826826
"php": ">=7.2"
@@ -882,7 +882,7 @@
882882
"dist": {
883883
"type": "path",
884884
"url": "/tmp/jetpack-build/Automattic/jetpack-jitm",
885-
"reference": "7c8a0ce9aa785703571b58f91b214a94d2246f4c"
885+
"reference": "463c8ccd9af7b05f6870d619e0eef88bd6cc8db7"
886886
},
887887
"require": {
888888
"automattic/jetpack-a8c-mc-stats": "^3.0.4-alpha",
@@ -961,7 +961,7 @@
961961
"dist": {
962962
"type": "path",
963963
"url": "/tmp/jetpack-build/Automattic/jetpack-licensing",
964-
"reference": "155f96088a10a52b743e4fc227487eb6af8bcb4b"
964+
"reference": "f7a1c51534de19b73361e883bd0bb08ad73a6173"
965965
},
966966
"require": {
967967
"automattic/jetpack-connection": "^6.7.7-alpha",
@@ -1021,7 +1021,7 @@
10211021
"dist": {
10221022
"type": "path",
10231023
"url": "/tmp/jetpack-build/Automattic/jetpack-logo",
1024-
"reference": "9b04710fb84d085644ee6a7c318faee706dc1ecb"
1024+
"reference": "d6ff868ddb03e1f22c0acaff80143512aa50a682"
10251025
},
10261026
"require": {
10271027
"php": ">=7.2"
@@ -1078,7 +1078,7 @@
10781078
"dist": {
10791079
"type": "path",
10801080
"url": "/tmp/jetpack-build/Automattic/jetpack-my-jetpack",
1081-
"reference": "ab7dbe9ab8e0e5db4cfb53bbc76d4b07987069ae"
1081+
"reference": "31ccd0238a1bd3b8eace1a8e1fea37d0a2747666"
10821082
},
10831083
"require": {
10841084
"automattic/jetpack-admin-ui": "^0.5.7-alpha",
@@ -1178,7 +1178,7 @@
11781178
"dist": {
11791179
"type": "path",
11801180
"url": "/tmp/jetpack-build/Automattic/jetpack-password-checker",
1181-
"reference": "a28143f59e80f9b56f3d6873d580381ecef5a7f4"
1181+
"reference": "73e45f10c71bd4f7a23347be54d5c0f4af8d6b99"
11821182
},
11831183
"require": {
11841184
"php": ">=7.2"
@@ -1237,7 +1237,7 @@
12371237
"dist": {
12381238
"type": "path",
12391239
"url": "/tmp/jetpack-build/Automattic/jetpack-plans",
1240-
"reference": "f9e5ac29ad04ed5f7098f38968c731a3fe95abaf"
1240+
"reference": "5fbaa97f100a17b8d55b3db436e7b9057253a524"
12411241
},
12421242
"require": {
12431243
"automattic/jetpack-connection": "^6.7.7-alpha",
@@ -1303,7 +1303,7 @@
13031303
"dist": {
13041304
"type": "path",
13051305
"url": "/tmp/jetpack-build/Automattic/jetpack-plugins-installer",
1306-
"reference": "b438dae5092f4154139ce23d9d867898f32f3e6a"
1306+
"reference": "46f43b2988c3f2ff9c6b42133232884e99c26ec3"
13071307
},
13081308
"require": {
13091309
"automattic/jetpack-a8c-mc-stats": "^3.0.4-alpha",
@@ -1363,7 +1363,7 @@
13631363
"dist": {
13641364
"type": "path",
13651365
"url": "/tmp/jetpack-build/Automattic/jetpack-protect-models",
1366-
"reference": "44b7192bd47853a9a8bb6efc7d1bdef1c37e7e22"
1366+
"reference": "aa9f54fd5480fb03702d15b076caf08191c0c24e"
13671367
},
13681368
"require": {
13691369
"automattic/jetpack-redirect": "^3.0.5-alpha",
@@ -1432,7 +1432,7 @@
14321432
"dist": {
14331433
"type": "path",
14341434
"url": "/tmp/jetpack-build/Automattic/jetpack-protect-status",
1435-
"reference": "73584258016e307dfb5da9a83594e00ddf911c27"
1435+
"reference": "3319ffe13fa6668edced4e3f518c5ba2f1f6c047"
14361436
},
14371437
"require": {
14381438
"automattic/jetpack-connection": "^6.7.7-alpha",
@@ -1505,7 +1505,7 @@
15051505
"dist": {
15061506
"type": "path",
15071507
"url": "/tmp/jetpack-build/Automattic/jetpack-redirect",
1508-
"reference": "84326f87527644b51c3086d2878371376e6d2bd1"
1508+
"reference": "51f095e368192d044e1eec83e4d8ab136714ce5e"
15091509
},
15101510
"require": {
15111511
"automattic/jetpack-status": "^5.0.10-alpha",
@@ -1564,7 +1564,7 @@
15641564
"dist": {
15651565
"type": "path",
15661566
"url": "/tmp/jetpack-build/Automattic/jetpack-roles",
1567-
"reference": "d4b7cb5764ba11bdac7bf4c3b282230119769faf"
1567+
"reference": "9d709416542f2f49e38f90c4d9ba932a34c17032"
15681568
},
15691569
"require": {
15701570
"php": ">=7.2"
@@ -1622,7 +1622,7 @@
16221622
"dist": {
16231623
"type": "path",
16241624
"url": "/tmp/jetpack-build/Automattic/jetpack-status",
1625-
"reference": "2f4927af71b5254e9b2c5da9aa46ad24de8613d7"
1625+
"reference": "322824c973e0e26a4a853a4ac8a92cb09bccee25"
16261626
},
16271627
"require": {
16281628
"automattic/jetpack-constants": "^3.0.5-alpha",
@@ -1685,12 +1685,12 @@
16851685
},
16861686
{
16871687
"name": "automattic/jetpack-sync",
1688-
"version": "4.9.2-alpha.1742415897",
1689-
"version_normalized": "4.9.2.0-alpha1742415897",
1688+
"version": "4.9.2-alpha.1742545545",
1689+
"version_normalized": "4.9.2.0-alpha1742545545",
16901690
"dist": {
16911691
"type": "path",
16921692
"url": "/tmp/jetpack-build/Automattic/jetpack-sync",
1693-
"reference": "fda2433b663b1b4389a80e8301109e82d4916879"
1693+
"reference": "be4c2c73c9cbee7b0c80bab4a183dff5b14cee3a"
16941694
},
16951695
"require": {
16961696
"automattic/jetpack-connection": "^6.7.7-alpha",
@@ -1766,7 +1766,7 @@
17661766
"dist": {
17671767
"type": "path",
17681768
"url": "/tmp/jetpack-build/Automattic/jetpack-videopress",
1769-
"reference": "00ae8b1564b39b6daff57e193c9f08de4b470754"
1769+
"reference": "a77ec6375c43238c9438ff2bd101b0e44c3b5fa5"
17701770
},
17711771
"require": {
17721772
"automattic/jetpack-admin-ui": "^0.5.7-alpha",

0 commit comments

Comments
 (0)