diff --git a/pkg/ccl/logictestccl/testdata/logic_test/multi_region_query_behavior b/pkg/ccl/logictestccl/testdata/logic_test/multi_region_query_behavior
index 318f7ab5d710..c8743ade9780 100644
--- a/pkg/ccl/logictestccl/testdata/logic_test/multi_region_query_behavior
+++ b/pkg/ccl/logictestccl/testdata/logic_test/multi_region_query_behavior
@@ -306,7 +306,7 @@ vectorized: true
               table: orders@orders_pkey
               spans: [/'ap-southeast-2'/'94e4b847-8f2f-4ac5-83f1-641d6e3df727' - /'ap-southeast-2'/'94e4b847-8f2f-4ac5-83f1-641d6e3df727'] [/'us-east-1'/'94e4b847-8f2f-4ac5-83f1-641d6e3df727' - /'us-east-1'/'94e4b847-8f2f-4ac5-83f1-641d6e3df727']
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJyskttO20AQhu_7FKO54aCNEh8gwRKSEU1pUBpoQtVK3QgZ7wS2dXbd3bXqCuWqz9b3qmxDwVGDBO2FrT3MP_N_v_YW7bcMIxx-Oh8fjSaw_Xo0u5i9H-_AbDgeHl-ANoLMpRQMcqOX-m4lU4KjWbO4_C7djS7cZV1wf7sLQtpUF8q1C5sqeDM9e9f0tnB6Npo03S18mI0mJ7B9P2sHPr4dTod_XMAhbB2EFF4Nwn5nsPAXnTBJ9zqDYOF19kNP7FMgFn2_v4UMlRY0SZZkMfqMIc4Z5kanZK021dFtXTASJUY9hlLlhauO5wxTbQijW3TSZYQRXiRXGU0pEWS6PWQoyCUyq9s2BHFu5DIxP5Dhsc6KpbJRKzeZ0kN8yHCWJ1VJl2PMscuR8_Ig5Lyk6nc1OOG8HCy6p79-cl4uPMF56Ql1WG36Wxy7PUiUAA-0uyGD8xVDXbgH-9Yl14SRt2IvQ_T-L2IF03sR5kY0fyPaA5ElI5MMClW7JNGCmq_-ksFEd3Te9dv0Y7mUDryNVnrPSflUS3UXctAe07z-RyGPtf5a5PBFSwVaRRBXgikpQSaC2GMQBwxiv_p2472N9oLn2JuSzbWytBbVJvA5QxLX1MRudWFSOjc6rcc027NaVx8Isq659ZvNSNVX9St9LPb-Rew_KQ5a4t66OHhSHK6J56tXvwMAAP__m3W5aQ==
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJysk9tO20AQhu_7FKO54aCNEh8gwRKSEU1pUBpoQtVK3Sgy3glsSXbd3bWaCuWqz9b3quyFUqMGCdoLew8z_8x8v-xbtF8XmGD_0_nwaDCC7deDycXk_XAHJv1h__gCtBFkZlIwKIxe6rudzAmOJn4z-ybdtS7drE64j-6CkDbXpXLNRJ8Fb8Zn73xtC6dng5GvbuHDZDA6ge37Xjvw8W1_3P89BRzC1kFM8WUv7rZ683DeirN8r9WL5kFrPw7EPkVi3g27W8hQaUGjbEkWk88Y45RhYXRO1mpTXd3WCQOxwqTDUKqidNX1lGGuDWFyi066BWGCF9nlgsaUCTLtDjIU5DK5qMt6gtQvs-KGviPDY70ol8omDe9kTg8WIsNJkVUpbY4pxzZHzlcHMecrql6XvRPOV715-_TnD85X80BwvgqEOqwO3S2O7Q5kSkAA2l2TwemaoS7dA4J12RVhEqzZyzCD_49ZAXVehLoRL9yI90BlychsAaWqpyTRAJuu_-LDSLd00Q6bDgzlUjoINo7SeY7Tp1qqO6OjZhv_F6R-uTd6qPVNWcAXLRVolUBaicakBJkE0oBBGjFIw-rZTfc2jhg9Z8Qx2UIrS4_s2gQ_ZUjiirz1Vpcmp3Oj87qNP57VuvpCkHU-GvrDQNWh-mv9Uxz8izh8Uhw1xJ3H4uhJcfxIPF2_-hUAAP__SGy-Yw==
 
 query T nodeidx=3
 USE multi_region_test_db; EXPLAIN (DISTSQL) SELECT
@@ -343,7 +343,7 @@ vectorized: true
                   table: orders@orders_pkey
                   spans: [/'ap-southeast-2'/'94e4b847-8f2f-4ac5-83f1-641d6e3df727' - /'ap-southeast-2'/'94e4b847-8f2f-4ac5-83f1-641d6e3df727'] [/'us-east-1'/'94e4b847-8f2f-4ac5-83f1-641d6e3df727' - /'us-east-1'/'94e4b847-8f2f-4ac5-83f1-641d6e3df727']
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJysk9tu2zgQhu_3KYi5yW5AxzrFdgQEYJD1bh24dmoHaIHSMBRxnLC1SZWkWhWBr_psfa9CkpNUQWUgaS9skTPzc76fhzuwn9YQw_Dd5fhsNCF__zuaX83fjP8h8-F4eH5FtBFollJQkhm90fao-uwCMkVyNq8Hyy_S3ercLauC--whEdKmOleuWVhXkf9m09d1C0supqPJrgmZ3o-OpFppwnjueSHuKuvY21fD2fABj5ySg5MIo-tB1O8MVsGqEyXpcWcQrvxOL_JFD0Ox6gf9A6CgtMBJskEL8XuIYEEhMzpFa7UpQ3dVwUgUEHsUpMpyV4YXFFJtEOI7cNKtEWK4Sq7XOMNEoOl6QEGgS-S6WrYmZZmRm8R8BQrnep1vlI0bGypTpKR0AxTmWVKmuxwYhy4HzouTiPMCy7_rwf-cF4NV9-L7N86LlS84L3yhTstJ_4BD1yOJEsQn2t2igcWWgs7dI7p1yQ1C7G_py-z5f85eacR7kcVWW0GrrUc3Fo1M1iRXFSGKhqHF9hf-J7qjs27QdD6WG-mI34riPWeHR-ozGofiQkuFphs2W9UvgNWfZbmPSykKoA-yYZEZwnoPz4OVC0xzFxPmUxZQFlIWtZKGzyEtCXdXIWqhvL8KY60_5hn5oKUiWsWElYLphLB-E3SGSqCpWAk7poQF5e-Q9VqJo-cQz9BmWll8cs5tp7aggOIG6ztjdW5SvDQ6rdrU02mlqwICrauzQT0ZqSpVPa-fxf7viIO94rAh9p6Kw73iaL842is-fiJebP_6EQAA__9lwQ-e
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJysU19v0zAQf-dTWPcymNw1_9Z2kSZ5GgU6lXa0k0DCVZXF182stYPtQNDUJz4b3wsl6TYy0UobPCS27-7n-_3Od7dgvy4hhv6n8-HJYERevh5ML6Yfhq_ItD_sn14QbQSauRSUZEavtD2olo1BpkhOpvVm_l26a527eRVw590nQtpU58o1A-so8mYyfl-nsORsPBhtkpDx3e5AqoUmjOeeF-ImsrZ9fNef9O_pkWOydxRhdNmLuq3eIli0oiQ9bPXChd_qRL7oYCgW3aC7BxSUFjhKVmgh_gwRzChkRqdorTal6bYKGIgCYo-CVFnuSvOMQqoNQnwLTrolQgwXyeUSJ5gING0PKAh0iVxW19ZMWb3Msxv8ARRO9TJfKRs3iipTpKRUBBSmWVK62xwYhzYHzoujiPMCy99l7y3nRW_RPvv1k_Ni4QvOC1-o4_LQ3ePQ9kiiBPGJdtdoYLamoHP3QN-65Aoh9tf0eRL9_yuxFOM9S-ZWacFWaQ-KLBqZLEmuKoYoGqJm67_UYKRbOmsHTfVDuZKO-FupeE-p8kB9Q-NQnGmp0LTDZqp6Eli9zMs6zqUogN7D-kVmCOvcjwkrLxjnLibMpyygLKQs2so0fArTkuGmHaJdLDftMNT6Js_IFy0V0SomrASNR4R1m2QnqASaii9hh5SwoPz2WWcr6-gprCdoM60sPnrrbS83o4DiCuu-sTo3KZ4bnVZp6uO4wlUGgdbV3qA-DFTlqsbsT7D_L-BgJzhsgL3H4HAnONoNjnaCDx-BZ-sXvwMAAP__8qQUmA==
 
 # Regression test for #74890. Code should not panic due to distribution already
 # provided by input.
diff --git a/pkg/ccl/logictestccl/testdata/logic_test/regional_by_row_query_behavior b/pkg/ccl/logictestccl/testdata/logic_test/regional_by_row_query_behavior
index 2911d4d6fdff..f42af1411b8f 100644
--- a/pkg/ccl/logictestccl/testdata/logic_test/regional_by_row_query_behavior
+++ b/pkg/ccl/logictestccl/testdata/logic_test/regional_by_row_query_behavior
@@ -358,7 +358,7 @@ SELECT * FROM [EXPLAIN (DISTSQL) SELECT * FROM regional_by_row_table WHERE pk =
   table: regional_by_row_table@regional_by_row_table_pkey
   spans: [/'ap-southeast-2'/1 - /'ap-southeast-2'/1] [/'ca-central-1'/1 - /'ca-central-1'/1] [/'us-east-1'/1 - /'us-east-1'/1]
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJy0kN2q2kAQgO_7FMNctWVLfuxFCRQsNtKAVZsEWjBB1uwgqTG73d1QRfLuJcmF9SCHcxQv5-eb-WZOaP5UGGASzsJJCu9hGi--wyr8tZx9iebw9muUpMmP2Tu4bNC0LWXNq_XmuNby79ryTUXw81sYh6B28Bm8HBbTaRKm4CPDWgqa8z0ZDFboYc5QaVmQMVJ3qVPfEIkDBi7DslaN7dI5w0JqwuCEtrQVYYBptycmLkg7LjIUZHlZ9WOvKo2VLvdcH5HhRFbNvjYBqB0DtfMZcAYbBr-RYaJ4V3EyHGfoeI6LectQNvZsYizfEgZey26z9R5hm2WHT-6jjP0HGRe3G59Fm1pqQZrEhWTeXrlpLj9I5YyeNF5f7b_mWTEZJWtDL5rsdmoktjTcYWSjC1pqWfRrhnDRc31CkLFDdTQEUd2X-t_8D3v3wP498OhZ-OMF7LZ5--ZfAAAA___eJXDk
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJy8kF-r00AQxd_9FMM8qazkT32QgHDlmmKgttckoHATwjY7lJjc7Lq7wZaS7y5JHmoliLbcPs6ZOTPnN0c0PxoMMAlX4X0Kr2EZbz7DY_jtYfUhWsPLj1GSJl9Wr-B8QNOuki1viu2h0PJnYfm2Ifj6KYxDUDW8By-HzXKZhCn4yLCVgtb8iQwGj-hhzlBpWZIxUg_ScRyIxB4Dl2HVqs4Ocs6wlJowOKKtbEMYYDrciYkL0o6LDAVZXjXj2tlId7NqoWo6IMN72XRPrQlA1QxU7TPgDLYMviPDRPGh42R4l6HjOS7mPUPZ2VM4Y_mOMPB6dhmAdyOALNu_c58Lwr8dRHk5xCl710otSJM4y533M5hr-UYqZ_HH4Pxp_3_-F5NRsjX0T5vdIRqJHU0cRna6pActy_HMVG5G3ygIMnbqLqYiasfW-Jvfzd41Zv8a8-Kv5rdnZrfP-xe_AgAA__9014gb
 
 statement ok
 SET vectorize=on
@@ -418,7 +418,7 @@ SELECT * FROM [EXPLAIN (DISTSQL) SELECT * FROM regional_by_row_table WHERE pk =
       table: regional_by_row_table@regional_by_row_table_pkey
       spans: [/'ca-central-1'/1 - /'ca-central-1'/1] [/'us-east-1'/1 - /'us-east-1'/1]
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJy0kt-L00AQx9_9K4Z5UlnJj1aQgHByplio7dkEFC6hbLNDWZtk190N3lHyv0uShzNSe3c9-rgz8-l85tsc0P4qMcIkXsTXKbyF2Xr1FW7jHzeLT_MlvP48T9Lk2-INjAcM7aSqebnZ3m-M-r1xfFsSfP8Sr2PQe_gIQQ6r2SyJUwiRYa0ELXlFFqNbDDBnqI0qyFplutKhH5iLO4x8hrLWjevKOcNCGcLogE66kjDCtNuzJi7IeD4yFOS4LPufPap0pY2suLlHhteqbKraRqD3DPQ-ZMAZbBn8RIaJ5l3HyzDL7j74GXqB52PeMlSNe7Cxju8Io6Bl5xkHFzIuzjd-EG1qZQQZEiPJvD1y01K9U9oL_xk8vjo8N6zJJcK6eiSoyROCsmQkL-HZeU3HBy1kJR0E_1XxnxPcmqxWtaUn_SV-50hiR8NdVjWmoBujin7N8Fz1XF8QZN3QDYfHvO5b_Uf1Nxy8BA5PwtPT8OQl8PQk_H4E-23evvoTAAD__82-s3M=
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJy8kl-L00AUxd_9FJf7pDKSP60gAWFlTbFQ27UJKGxCmGYuJSbNjDMT3KXku0uShzUSu7td6OP988s952SOaH5VGGAUrsLrGN7CYrv5Crfhj5vVp-UaXn9eRnH0bfUGxgua9oWseZXt7jMtf2eW7yqC71_CbQiqhI_gpbBZLKIwBh8Z1lLQmh_IYHCLHqYMlZY5GSN11zr2C0txh4HLsKhVY7t2yjCXmjA4oi1sRRhg3N3ZEhekHRcZCrK8qPrPTkq6muxmqqR7ZHgtq-ZQmwBUyUCVPgPOYMfgJzKMFO8mToJJcvfBTdDxHBfTlqFs7INAY_meMPBadp4J73Im8vNNPGhvaqkFaRIj3Wk7YXMt30nl-P8sTp_2z81vdqH8rh7JbvaE7Azpglfw7AjnY4-r4lBY8P4rxX1OllsyStaGnvSX3E4jiT0NvoxsdE43Wub9maHc9FzfEGTsMPWHYln3o_6d_Q17L4H9k_D8NDx7CTw_Cb8fwW6btq_-BAAA___NQ8qq
 
 query T
 EXPLAIN (VEC) SELECT * FROM regional_by_row_table WHERE pk = 1
@@ -439,7 +439,7 @@ SET vectorize=off
 query T
 SELECT * FROM [EXPLAIN (DISTSQL) SELECT * FROM regional_by_row_table WHERE pk = 1] AS temp(a) WHERE a LIKE '%Diagram%'
 ----
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJy0keFr1EAQxb_7VwwDpa2sJBu_SEBoaSMG47VeDhR64di7Hc71kt11d4MtR_53SSLUSCOo-HHemzf5vewR_dcaUyyzIrtawXN4s7x5D3fZp9viMl_A2XVersoPxTlMFxztldGi3mwfNs582wSxrQk-vs2WGdgDvAZewWUJgRoLZ-L8hyOgyN9lcHpyrcTeiebkFBlqI2khGvKY3iHHiqF1ZkfeG9dLx2Ehl_eYxgyVtm3o5YrhzjjC9IhBhZowxVXPsCQhyUUxMpQUhKqHs0_iXlinGuEekOGVqdtG-xTsgYE9JAwEgy2DL8iwtKJ3ojWu1_ev4jVGPIpBaAkcTPhMDquOoWnDI5kPYk-Y8o79HT3_H_QXI_ksbTJL-wjpySlRQ6uNk-RITjir7olaC_PC2CiZFipUowLwWZT4T37ckrw12tMvLHOXK4Yk9zT28qZ1O7p1Zjd8ZhxvhtwgSPJhdJNxyPVgDS_7c5j_Szj5bfjlJBx3VffsewAAAP__tYozcQ==
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJy8keFr1EAQxb_7VwwDpa2sJBu_SEBoaSMG47VeDhR64di7Hc71kt11d4MtR_53uUQ4IxdBBT_Oe_Mm75fdo_9aY4plVmQ3C3gOb-Z37-Eh-3RfXOczuLjNy0X5obiE8YKjrTJa1Kv108qZb6sg1jXBx7fZPAO7g9fAK7guIVBj4UJc_nAEFPm7DM7PbpXYOtGcnSNDbSTNREMe0wfkWDG0zmzIe-MO0r5fyOUjpjFDpW0bDnLFcGMcYbrHoEJNmOLi0GFOQpKLYmQoKQhV92dP1r06qa7sjp6Q4Y2p20b7FOyOgd0lDASDNYMvyLC04uBES1wuH1_FS4x4FIPQEjiY8JkcVh1D04ZjWR_EljDlHfs7IP6fgK4GmEmAZBLg2NuTU6KGVhsnyZEcVa-6E6Qz88LYKBkzFqpRAfhklfhP_uWcvDXa0y9dpi5XDEluaeDypnUbundm039mGO_6XC9I8mFwk2HIdW_1j_1zmP9LOPlt-OUoHHdV9-x7AAAA__-eCkLr
 
 statement ok
 RESET vectorize
@@ -750,7 +750,7 @@ SELECT * FROM [EXPLAIN (DISTSQL) SELECT * FROM child WHERE NOT EXISTS (SELECT *
               table: child@child_pkey
               spans: [/'ca-central-1'/10 - /'ca-central-1'/10] [/'us-east-1'/10 - /'us-east-1'/10]
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJy0k_Frm0AUx3_fX_F4vyQZN3Iax8pBwNAaZnHaJcIKjRSnj9bNeO48ISXkfx9qoDEsYW3pb96779f7fN-922L1J0eBS8dzLkP4CPNF8A3unNsbb-b6MLxyl-HyuzeCviB5zPIUfnx1Fg4M_SAE57YRwrAvK2NFhd7ryvsshSkk983HaAQz_wqGSVc0-CiCYD5fOiGYyLCQKfnxmioUd2hgxLBUMqGqkqopbVuBm25QcIZZUda6KUcME6kIxRZ1pnNCgWH8M6cFxSmpMUeGKek4y9vfthnsUmXrWD0hw0uZ1-uiEtAwsT0nMlyWcVMdr3C12lzwFY4NPuYQFykYIPUjKYx2DGWtnzEqHT8QCmPHXodqvBXV3mOeRDNPoj0TVaSyOIe6kColRWkPKtr9I4MvP8lybPbpvWydaTBOovCXdOlaZsW-SZP-MeFTSQI8Zx7CzA9duA5cHxl2M3jQPE_K33UJv2RWgCwEDO0JTME29xNpWzCFzcDiAyGEbXBu8C8jZBjUWoBtMNs8GWTyyiDWewVpXvBmcHEYhcFmkPSy_Wc46yXhFlSVsqjoaGJO3X_EkNIH6qavkrVK6EbJpD2mWwatry2kVOlu1-wWbtFutY_t0Gy8xWyeNU96Zn5snpw1W-fN1lnz5yNztPvwNwAA___s6c7r
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJy0k2GLm04Qxt__P8Uwb5L82ZLVWHosBAx3hnpYvSZCDy4SrA539oxr3RVyhHz3oqbcGZrQu7Zv1J2dx_09w7M7VN9zFLh0POcyhP9hvgg-wZ1ze-PNXB-GV-4yXH72RtBvSB6yPIUvH52FA0M_CMG5bRph2G8r44oKfegr11kKU0jWzcdoBDP_CoZJVzT4KIJgPl86IZjIsJAp-fGGFIo7NDBiWFYyIaVk1ZR2bYObblFwhllR1ropRwwTWRGKHepM54QCw_hrTguKU6rGHBmmpOMsb3_berDb57p8pCdkeCnzelMoAQ0WO6Aiw2UZN9XxCler7QVf4djgYw5xkYIBUj9QhdGeoaz1M4nS8T2hMPbsbbTGX6C1D6Qn6cyTdM9QiqoszqEuZJVSRWmPK9r_woYv38lybPYNeNkm02CcROGvGdS1zIrDnCb9Y8KnkgR4zjyEmR-6cB24PjLskmh3r58D9KR8rEv4JrMCZCFgaE9gCrZ5yKZtwRS2A4sPhBC2wbnBP4yQYVBrAbbBbPOkmckbzVj_0kxzn7eDi5d2GGwHSc_fbxq0XmNwQaqUhaKj5JzKQcSQ0nvqUqhkXSV0U8mkPaZbBq2uLaSkdLdrdgu3aLfae_dSbPyJ2DwrnvTE_Fg8OSu2zouts-L3R-Jo_9-PAAAA__9jBNRX
 
 statement ok
 SET vectorize=on
@@ -827,7 +827,7 @@ SELECT * FROM [EXPLAIN (DISTSQL) SELECT * FROM child WHERE EXISTS (SELECT * FROM
           table: child@child_pkey
           spans: [/'ca-central-1'/10 - /'ca-central-1'/10] [/'us-east-1'/10 - /'us-east-1'/10]
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJykk2Fr2z4Qxt__P8Vxb5L80YjsBFYEAZfWYS5u0sWGFRpTPPtovTmSJ8mQEvLdh-1A47B0dH1nnZ7n9POj0w7NrxIFRn7oX8XwP8xXy1t48O_vwstgAcPrIIqjr-EI-oLsuShz-PbFX_ng3zcaGPYVVapJ2oOkeixymEH22HyM4HJxDcOsqzl8lMByPo_8GFxkKFVOi3RDBsUDOpgwrLTKyBilm9KuFQT5FgVnWMiqtk05YZgpTSh2aAtbEgqM0-8lrSjNSY85MszJpkXZtm3pvUoXm1S_IMMrVdYbaQQ0TOyAiQyjKm2q4zWu19sLvsaxw8ccUpmDA8o-k8Zkz1DV9hXD2PSJUDh79m-ozkdRvQPmWTT3LNorkSFdpCXUUumcNOU9qGT_h39YqE-qGrt9-rDYFBacsyj8PSndqEIeQpr0j4lfKhIQ-vMYIv82gJtlsECG3QgehRcq9bOu4IcqJCgpYOhNYAaee5hIbwoz2A6mfCCE8BzOHf55hAxXtFGWoPyru3kw28HFsZ_BdpD1GjYdl7UV4DnMc89GM3lPNCsylZKGTq7pXOgJQ8qfqLtyo2qd0Z1WWXtMt1y2vraQk7HdrtstAtlutRN-bHY-YnbfNE96Zn5qnrxpnp6Yk_1_vwMAAP__Es-NVg==
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJysk1Fr2z4Uxd__n-JyX5L80YjsFFYEAZfWYS5u0sWGFRoTPPvSenUkT5IhJeS7D9sZrcPS0W0vtnV1jvTT0fUOzfcSBUZ-6F_G8D_MlosbuPfvbsOLYA7DqyCKo8_hCPqC7LEoc_jyyV_64N81Ghj2FVWqSdqDpFoXOUwhWzcfI7iYX8Ew62oOHyWwmM0iPwYXGUqV0zzdkEFxjw4mDCutMjJG6aa0awVBvkXBGRayqm1TThhmShOKHdrCloQC4_RrSUtKc9JjjgxzsmlRtsu29F77XFdP9IwML1VZb6QR0GCxAykyjKq0qY5XuFptz_kKxw4fc0hlDg4o-0gakz1DVdsXEmPTB0Lh7Nmf0Tr_gNY7kJ6kc0_SvUAZ0kVaQi2VzklT3uNK9r84xlx9UNXY7R8gLDaFBeckCn9PUNeqkIecJv1t4ueKBIT-LIbIvwngehHMkWHXiF73-hlgqNRTXcE3VUhQUsDQm8AUPPfQm94ZTGE7OOMDIYTncO7wjyNkuKSNsgTlb93Nr7MdnL_2M9gOst6CzYqL2grwHOa5J-OZvCeeJZlKSUNHV3Uq-IQh5Q_UXbtRtc7oVqus3aYbLlpfW8jJ2G7W7QaBbKfaRn9tdv7G7L5pnvTM_Ng8edN8dmRO9v_9CAAA__-CWJEk
 
 statement ok
 SET vectorize=on
@@ -905,7 +905,7 @@ SELECT * FROM [EXPLAIN (DISTSQL) SELECT * FROM child INNER JOIN parent ON p_id =
           table: child@child_pkey
           spans: [/'ca-central-1'/10 - /'ca-central-1'/10] [/'us-east-1'/10 - /'us-east-1'/10]
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJykk1Fr2zAQx9_3KY57STs0ItuFFUHApXWYS2Z3TmCDxhTPPlptjuRJMmSEfPcRO9A4LB1d36yTfqef_5I2aH_VKHAezaLrBbyHaZZ-hvvo293sKk7g7CaeL-ZfZucwXFA-ybqCOEmiDG7TOIGmMKQcpAk0D7KCCZQP3cfXT1EWQdnXPJ5DOp3OowX4yFDpipJiRRbFPXqYM2yMLslabXalTbcgrtYoOEOpmtbtyjnDUhtCsUEnXU0ocFF8rymjoiIz5siwIlfIumvbiYaNkavC_EaG17puV8qKTontLZHhvCl21fESl8v1JV_i2ONjDoWqwAPtnshgvmWoW_esYV3xSCi8Lfs_Ve-tquFe86Saf1Lt2ciSkUUNrdKmIkPVQCrf_uUfEv1BN2N_aD-TK-nAO6nCX5PSrZZqH1Iw3Ka_ZwcpzbT-2TbwQ0sFWgk4CwOYQOifw1VyA2fhBUxgPbrgIyFE6HHu8Y_nyDCjlXYE9T_p3SNYjy4PeQbrUTlouOuYtk5A6LHQZ2FwMobgNTFkZButLB0dyamAc4ZUPVJ_vFa3pqQ7o8tum36YdlxXqMi6ftbvB7HqprrbfAh7b4H9F-FgAPNjOHgRvjiC8-27PwEAAP__HASCuw==
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJysk9Fq2zAUhu_3FIdzk2RoRLYDK4KAS-swl8zunMAGjQmefWi9OpYnyZAR8u4jckbrsHR0241tHemTPv2Sd6i_VyhwEcyDqyW8hVkSf4S74Mvt_DKMYHgdLpaLT_MR9AfkD2VVQBhFQQI3cRhBkymqDcQRNOuygCnka_vx-UOQBJB3NYenEM9mi2AJLjKsZUFRtiGN4g4dTBk2SuaktVSH0s4OCIstCs6wrJvWHMopw1wqQrFDU5qKUOAy-1pRQllBasyRYUEmKys7rRX17XPdPNIPZHglq3ZTa2Gt2FEUGS6a7FAdr3C12l7wFY4dPuaQ1QU4IM0DKUz3DGVrnky0ye4JhbNnf2fr_Adb_2h61s49a_ckpUmVWQVtLVVBioqeV7r_zTYi-U42Y7e_gXm5KQ04Z1X4a4K6kWV9zMnrL9PdNr97_UpqLuVj28A3WdYgawFD34Mp-O4ILqNrGPoTmMJ2MOEDIYTvcO7w9yNkmNBGGoLqj_Thd9gOLp7zDLaDvDfhYca4NQJ8h_ku872zUXiviSIh3cha08mxnAs5ZUjFPXVHrGWrcrpVMrfLdM3YcrZQkDZdr9s1wtp22Uv9HHb-BXZfhL0ezE9h70V4cgKn-zc_AwAA__8ZoYaJ
 
 statement ok
 SET vectorize=on
@@ -983,7 +983,7 @@ SELECT * FROM [EXPLAIN (DISTSQL) SELECT * FROM child LEFT JOIN parent ON p_id =
           table: child@child_pkey
           spans: [/'ca-central-1'/10 - /'ca-central-1'/10] [/'us-east-1'/10 - /'us-east-1'/10]
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJykk1Fr2zAQx9_3KY57STs0ItuBFUHApXVYimd3jscGjSmefbTeHMuTZEgJ-e4jcqBxWDq6vkUn_U6__HXeoP5do8BFEAZXKbyHWRJ_hrvg-214OY_g7Hq-SBdfwnMYHigeq7qEMJilcBPPI2hzRY2BOIL2viphCsW9_fHtU5AEUPQ1h2cQz2aLIAUXGTaypChfkUZxhw5mDFslC9Jaql1pYw_MyzUKzrBq2s7syhnDQipCsUFTmZpQYJr_qCmhvCQ15siwJJNXtW1rPf1WVatcPSHDK1l3q0YLq8T2lshw0ea76niJy-X6gi9x7PAxh7wpwQFpHklhtmUoO_OsoU3-QCicLfs_Veetqv5e86Sae1Lt2UiTqvIaukaqkhSVA6ls-5f_EMkPsh27Q_uwWlUGnJMq_DUp3ciq2YfkDa9Jn1oS_dzFX9MgsdOHDPv5O0gvlPJX18JPWTUgGwFnvgdT8N1zuIyu4cyfwBTWowkfCSF8h3OHfzxHhgmtpCGo_0nvvo316OKQZ7AeFYOGu45xZwT4DvNd5nsn4_FeE09CupWNpqOnOhV8xpDKB-qfXctOFXSrZGGv6Zex5WyhJG36XbdfzBu7Zaf8EHbeArsvwt4A5sew9yI8OYKz7bs_AQAA__9CUokA
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJysk1Fr2zAUhd_3Ky73Je3QiGwXVgQBl9ZhKZ7dOR4bNCZ49qX16lieJENKyH8fkTNah6Wj215s60jn6tPR9Qb1jxoFzoMwuEzhLUyT-CPcBl9vwotZBCdXs3k6_xSewnBBcV_VJYTBNIXreBZBmytqDMQRtMuqhAkUS_vx5UOQBFD0msMziKfTeZCCiwwbWVKUr0ijuEUHM4atkgVpLdVO2tgFs3KNgjOsmrYzOzljWEhFKDZoKlMTCkzzbzUllJekxhwZlmTyqrZlLadvn8v2gR6R4aWsu1WjhaVie1BkOG_znTpe4GKxPucLHDt8zCFvSnBAmntSmG0Zys48kWiT3xEKZ8v-jtb5D7T-nvQonXuU7glKk6ryGrpGqpIUlQOubPubY0TynWzH7vAAYbWqDDhHUfhrgrqWVbPPyRtukz62JPruiz-nQWJ7EBn2Xej3r18JhlI-dC18l1UDshFw4nswAd89hYvoCk78M5jAenTGR0II3-Hc4e9PkWFCK2kI6j-6d3_JenT-3M9gPSoGBXcV484I8B3mu8z3jkbkvSaihHQrG00H13Us_IwhlXfUX72WnSroRsnCbtMPY-uzQkna9LNuP5g1dso2-3Oz8y9m90WzNzDzQ7P3ovnswJxt3_wMAAD__4udjM4=
 
 statement ok
 SET vectorize=on
diff --git a/pkg/sql/distsql_physical_planner_test.go b/pkg/sql/distsql_physical_planner_test.go
index 35b26fbee59f..4dc011b673bb 100644
--- a/pkg/sql/distsql_physical_planner_test.go
+++ b/pkg/sql/distsql_physical_planner_test.go
@@ -525,7 +525,7 @@ func TestDistSQLDeadHosts(t *testing.T) {
 	// Verify the plan (should include all 5 nodes).
 	r.CheckQueryResults(t,
 		"SELECT info FROM [EXPLAIN (DISTSQL) SELECT sum(xsquared) FROM t] WHERE info LIKE 'Diagram%'",
-		[][]string{{"Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJyslF-Lm0AUxd_7KeRC2QRGHP_EdX3aZddSafZPY0oLiw_TOBVBHXdmhC0h372oLTFhM9q4j87cc8_5XYe7BfGSgw9RsAxu11pW_mLap9XjvfYc_Hha3oQP2uwujNbR1-Vc-1sj6mL2Kl5qwmky74plrH3_HKyCTr8MvwTaxV1GUk6KjxeAoGQJfSAFFeA_gwkILEBgAwIHECwgRlBxtqFCMN6UbFtBmLyCjxFkZVXL5jhGsGGcgr8Fmcmcgg9r8jOnK0oSyg0MCBIqSZa3NvK64llB-G9AcMvyuiiFr_3LDQiiijQnumFhiHcIWC33PkKSlIJv7tD4LDdpymlKJOPG4jBK9O1-dm3OT9pYJ2323euS8YR20fet4506iIn_L4l9kMQcP3zzrOEbFtYNZ-z8B-L0sN0p87fGU1vnUTtYN9yx1ANxetSXU6jt8dT2edQu1g1vLPVAnB61N4XaGU_tnEftYX0k8kCWHvLVe62XN2xWVFSsFPRozbzdGTfrhyYp7XaVYDXf0CfONq1N9_nY6tqDhArZ3ZrdR1h2V03AvthUiq0DsXksttTOA9a2Uu2oxc6U3Aul2FU7u1OcL5ViT-3sTXG-Uv8rPPBM1I_s2DveffgTAAD__0Xk6f0="}},
+		[][]string{{"Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJyslG-Lm0AQxt_3U8hAuQQ2uBqT83x1x52l0tyfxpQWDinbOBWpcb3dFa6EfPeitsSEu9XGe-nuPPM8v3GZLcinDDwI_YV_vTLS_Cc3Pizvb41H_9vD4iq4M0Y3QbgKPy_Gxt8aWW5Gz_KpZALjcVOsIuPrR3_pN_pF8Mk3zm5Slgi2eX8GBHIe4x3boATvESwgYAOBKRBwgMAMIgKF4GuUkouqZFsLgvgZPEogzYtSVccRgTUXCN4WVKoyBA9W7EeGS2QxCpMCgRgVS7PaRl2q78Uv_A0ErnlWbnLpGf9iA4GwYNXJxLQpRDsCvFR7G6lYguBZO9I_ylWSCEyY4sKcHSYJv9yOLq3xqzb2qzb77mXORYxN9H3raKcPYtH_SzI9SGL1n711yuxNm05Mp-_4O9K0qOdDxm_3h7ZPgnboxJz3he5I04I-HwI97Q89PQl6Tiem2xe6I00L2h0C7fSHdk6CdumkJ3FHlBbxxVutlhdsligLnks8WjEvd6bV6sE4wWZPSV6KNT4Ivq5tms_7WlcfxChVc2s1H0HeXFUB22JLK7YPxNax2NY7d1hPtWpHL3aG5J5pxXO983yI87lW7Oqd3SHOF_p_RTueif6RHXtHu3d_AgAA___Fl-el"}},
 	)
 
 	// Stop node 5.
@@ -535,16 +535,14 @@ func TestDistSQLDeadHosts(t *testing.T) {
 
 	// The leaseholder for the last range should have moved to either node 2 or 3.
 	query := "SELECT info FROM [EXPLAIN (DISTSQL) SELECT sum(xsquared) FROM t] WHERE info LIKE 'Diagram%'"
-	exp2 := [][]string{{"Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJysk19r2zAUxd_3KcSF0QQU_Ldu5qeW1mNm6Z_FGRsUP2jRnWewLVeSoSPkuw_bG0lKqzjJHi3dc8_vXPmuQD0VEEISzaLrBcmrn4J8nN_fksfo-8PsKr4jo5s4WSRfZmPyt0Y15ehZPTVMIh_3xTol3z5F86jXz-LPETm7yVkmWfn-DChUguMdK1FB-AgOUHCBggcUfEgp1FIsUSkh2-tVVxzzZwhtCnlVN7o9TikshUQIV6BzXSCEsGA_Cpwj4ygtGyhw1CwvOgt9Wcu8ZPI3ULgWRVNWKiT_mIFCUrP2ZGK5NqRrCqLRGx-lWYYQOms6nOUqyyRmTAtp-bsoydfb0aUzftPGfdNm072phOTYo29ap2szyPQwEG8HxBk-e-eo2VuuPbF8m7CKE4cI_QvlwKfYg7Y1gfNTnsIdPgH3uAn49sQKhv6Ae3C2UgenpPaGp_aOSx3YE2s6NPUenK3UF_9r7V6xmaOqRaXwxfq93tlu1xJ5hv0OK9HIJT5Isexs-s_7TtcdcFS6v3X6j7jqr1rAbbFjFLs7Yuel2DWKP5idPaPYN4v9U7DPjeLA7Byc4nxhFE_NztODnNP1uz8BAAD__8cZdFQ="}}
-	exp3 := [][]string{{"Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJysk91q20AQhe_7FMtAiQ1r9BvF1VVColJR56eWSwtBF1vvVBVIWmV3BSnG714ktdgOyVq2e6mdOXO-OWJWoJ4KCCGJZtH1guTVT0E-zu9vyWP0_WF2Fd-R0U2cLJIvszH526OacvSsnhomkY_7Zp2Sb5-iedTrZ_HniJzd5CyTrHx_BhQqwfGOlaggfAQHKLhAwQMKPqQUaimWqJSQbXnVNcf8GUKbQl7VjW6fUwpLIRHCFehcFwghLNiPAufIOErLBgocNcuLzkJf1jIvmfwNFK5F0ZSVCsk_ZqCQ1Kx9mViuDemagmj0xkdpliGEzpoOZ7nKMokZ00Ja_i5K8vV2dOmM37Rx37TZTG8qITn26JvR6doMMj0MxNsBcYZn7xyVveXaE8sfGv8enK2tz0-J3x2-tXvc1r49sQKbsIoThwj9C-XABPagbSUQnJKANzwB77gEAntiTYf-9z04W1tf_K-ze8VmjqoWlcIX5_f6ZLs9S-QZ9jesRCOX-CDFsrPpP-87XffAUem-6vQfcdWXWsBtsWMUuzti56XYNYo_mJ09o9g3i_1TsM-N4sDsHJzifGEUT83O04Oc0_W7PwEAAP__wB10VA=="}}
+	exp2 := [][]string{{"Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJysk29r2zAQxt_vU4iD0QQUbDmum_lVS-sxs_TP4owNihladPPMHMuVZOgI-e7D9kaS0ipuspeW7rnn95x8K9APBYSQRNPock7y8ock72e31-Q--no3vYhvyOAqTubJp-mQ_K3R9XLwqB9qrlAMu2KTki8folnU6afxx4icXOU8U3z59gQolFLgDV-ihvAeGFDwgMIYKPiQUqiUXKDWUjXXq7Y4Fo8QuhTysqpNc5xSWEiFEK7A5KZACGHOvxc4Qy5QOS5QEGh4XrQW5tx8q37hb6BwKYt6WeqQ_EMGCknFm5OR47mQrinI2mxstOEZQsjWtD_KRZYpzLiRyvF3SZLP14NzNnzRxnvRZtO9LqUS2KFvWqdrO8jkdSDjHRDWf_TskNE7njtyfJfwUhBGpPmJqudL7CHbGsDpMS_h9R-Ad9AAfHfkBH1_vz00W6GDY0KP-4ceHxQ6cEfOpG_oPTRboc_-1849YzNDXclS45Pde76z2-wkigy7BdayVgu8U3LR2nSft62uPRCoTXfLuo-47K4awG0xs4q9HTF7Kvas4nd257FV7NvF_jHYp1ZxYHcOjnE-s4ondufJq5zT9Zs_AQAA__9QI3J0"}}
+	exp3 := [][]string{{"Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJysk29r2zAQxt_vU4iD0QQUbDmum_lVS-sxs_TP4owNihladPPMHMuVZOgI-e7D9kaS0ipuspfW3XPP7x5zK9APBYSQRNPock7y8ock72e31-Q--no3vYhvyOAqTubJp-mQ_O3R9XLwqB9qrlAMu2aTki8folnU6afxx4icXOU8U3z59gQolFLgDV-ihvAeGFDwgMIYKPiQUqiUXKDWUjXlVdsci0cIXQp5WdWmeU4pLKRCCFdgclMghDDn3wucIReoHBcoCDQ8L1oLc26-Vb_wN1C4lEW9LHVI_iEDhaTizcvI8VxI1xRkbTY22vAMIWRr2h_lIssUZtxI5fi7JMnn68E5G75o471os5lel1IJ7NA3o9O1HWTyOpDxDgjrHz07JHrHc0eO3zf9PTRbS58ek77Xf2nvoKV9d-QELuGlIIxI8xNVzwD2kG0FEBwTwLh_AOODAgjckTPp-9f30Gwtffa_bu4ZmxnqSpYan9ze85Pd5iZRZNgdsJa1WuCdkovWpvu8bXXtg0BtuirrPuKyKzWA22JmFXs7YvZU7FnF7-zOY6vYt4v9Y7BPreLA7hwc43xmFU_szpNXOafrN38CAAD__0dtcnQ="}}
 
 	res := r.QueryStr(t, query)
-	if !reflect.DeepEqual(res, exp2) {
-		if !reflect.DeepEqual(res, exp3) {
-			t.Errorf("query '%s': expected:\neither\n%vor\n%v\ngot:\n%v\n",
-				query, sqlutils.MatrixToStr(exp2), sqlutils.MatrixToStr(exp3), sqlutils.MatrixToStr(res),
-			)
-		}
+	if !reflect.DeepEqual(res, exp2) && !reflect.DeepEqual(res, exp3) {
+		t.Errorf("query '%s': expected:\neither\n%vor\n%v\ngot:\n%v\n",
+			query, sqlutils.MatrixToStr(exp2), sqlutils.MatrixToStr(exp3), sqlutils.MatrixToStr(res),
+		)
 	}
 
 	// Stop node 4; note that no range had replicas on both 4 and 5.
@@ -616,14 +614,14 @@ func TestDistSQLDrainingHosts(t *testing.T) {
 	}
 
 	// Verify distribution.
-	expectPlan([][]string{{"Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJyskVFrnEAQx9_7KZaBkruy4W6968s-JVwslV40VUMKQcLWnYqgu3Z3hZbD717UQmLI2Tvoo7Pzm__PmQPYnxVwSPy9v0tJqX5o8imObsmj_-1ufx2EZHETJGnydb8kf3ty3Sq3-LAc-1Rb24w8fPZjf6T3wRefXNyUojCifn8BFJSWGIoaLfBHYEDBg4xCY3SO1mrTlw9DUyB_AV9TKFXTur6cUci1QeAHcKWrEDik4nuFMQqJZrUGChKdKKthdK9y1ZiyFuY3UNjpqq2V5UAhaYSynFyuGGQdBd265wDrRIHAWUdPl7guCoOFcNqsvKnDLroP06c4ekgWy6NZ3tGs54hWaSPRoJzMz7p5m-3UJrm_fQrCdHHFjstsJjLs9O2zM7e_Ypcnbv8fEi_-d_Nft_9GVoy20criqyu8PXndXwdlgeMprW5NjndG50PM-BkN3FCQaN34ysaPQI1PveBLmM3C3gRmr2FvFv44n7yZhbfz8PYs7ax79ycAAP__nKh7zQ=="}})
+	expectPlan([][]string{{"Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJyskVFr2zAQx9_3KcTBaDJUEjnZi55aUo-ZpXFnu3RQTNCsmzGzJU-SYSP4uw_bg9al8RLoi0HS_e7_890B7K8SOMT-1t8kpFA_NPkUhbfk0f92t70OdmR2E8RJ_HU7J_9qMt0oN_swH-pUU9mUPHz2I3-gt8EXn1zcFCI3onp_ARSUlrgTFVrgj8CAggcphdroDK3Vprs-9EWB_A18SaFQdeO665RCpg0CP4ArXInAIRHfS4xQSDSLJVCQ6ERR9q07lavus69_4h-gsNFlUynLgUJcC2U5uVwwSFsKunFPEdaJHIGzlp6ucZ3nBnPhtFl4Y4tNeL9L9lH4EM_mR7O8o1lPEY3SRqJBOeqfttM267FNfH-7D3bJ7Iodl1mNZNjp82dnz3_BLk-c_380nv3x6k3n_0pWhLbWyuKLPbzeedntB2WOwzKtbkyGd0ZnfcxwDHuuv5Bo3fDKhkOghqdO8DnMJmFvBLOXsDcJf5xOXk3C62l4fZZ22r77GwAA__-hBX17"}})
 
 	// Drain the second node and expect the query to be planned on only the
 	// first node.
 	distServer := tc.Server(1).DistSQLServer().(*distsql.ServerImpl)
 	distServer.Drain(ctx, 0 /* flowDrainWait */, nil /* reporter */)
 
-	expectPlan([][]string{{"Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJyUkF9LwzAUxd_9FOGCbJPI1j3mybFVLNZ1tpUJo0hsr6XQJjV_QCn97tJG0AkTfcy553fOIR3o1xoYJH7or1NSiRdJruPojhz8x124CrZkugmSNLkPZ-TTk0srzPRi5nzCNjoj-xs_9h0dBrc-mWwqXirenE-AgpAFbnmDGtgBPMgotErmqLVUg9SNhqB4A7agUInWmkHOKORSIbAOTGVqBAYpf64xRl6gmi-AQoGGV_UYO8y4alXVcPUOFNayto3QDCgkLReakUvIegrSmq94bXiJwLye_n3CqiwVltxINfeOF6yjh236FEf7ZDo72bX8T1eMupVC41HPqeRFn1HAokT3pVpaleNOyXyscc9o5EahQG3c1XOPQLjTMPA77P0KL3_AWX_2EQAA__8zCsBk"}})
+	expectPlan([][]string{{"Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJyUkF9LwzAUxd_9FOGCbJPI1j3mybFVLNZ1tpUJo4zYXkuxTWr-gDL63aWNoBMm-hK4555zf4ccQL_WwCDxQ3-Zkko8S3IdR3dk5z9uwkWwJuNVkKTJfTghn55cWmHGFxPnE7bRGdne-LHv0mFw65PRquKl4s35CCgIWeCaN6iB7cCDjEKrZI5aS9VLh8EQFG_AZhQq0VrTyxmFXCoEdgBTmRqBQcqfaoyRF6imM6BQoOFVPZzta1z1z759wXegsJS1bYRmQCFpudCMXELWUZDWfAG04SUC8zr69xKLslRYciPV1DvusIwe1uk-jrbJeHKSNf8PK0bdSqHxiHPq8qzLKGBRovtULa3KcaNkPmDcGA25QShQG7f13BAIt-oLfg97v4bnP8JZd_YRAAD___rywTs="}})
 
 	// Verify correctness.
 	var res int
diff --git a/pkg/sql/execinfrapb/flow_diagram.go b/pkg/sql/execinfrapb/flow_diagram.go
index ee477494eb8e..2836ce5bd545 100644
--- a/pkg/sql/execinfrapb/flow_diagram.go
+++ b/pkg/sql/execinfrapb/flow_diagram.go
@@ -134,9 +134,11 @@ func (a *AggregatorSpec) summary() (string, []string) {
 }
 
 func indexDetail(desc *descpb.TableDescriptor, indexIdx uint32) string {
-	index := "primary"
+	var index string
 	if indexIdx > 0 {
 		index = desc.Indexes[indexIdx-1].Name
+	} else {
+		index = desc.PrimaryIndex.Name
 	}
 	return fmt.Sprintf("%s@%s", desc.Name, index)
 }
diff --git a/pkg/sql/execinfrapb/flow_diagram_external_test.go b/pkg/sql/execinfrapb/flow_diagram_external_test.go
index 168b94a36f4f..188be364223b 100644
--- a/pkg/sql/execinfrapb/flow_diagram_external_test.go
+++ b/pkg/sql/execinfrapb/flow_diagram_external_test.go
@@ -80,7 +80,7 @@ func TestPlanDiagramTableReaderWrapColumns(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	expectedURL := "https://cockroachdb.github.io/distsqlplan/decode.html#eJyMk0Gr2zAQhO_9FWbPglpJk7Y-FUqggbZpk96KWVRrcQSypGrlJm7wfy-2D6EPnvIuhp1vZwTL-Ab820IFp8OXXXH6_rn4tDvuQIDzmr6qjhiqnyChFhCib4jZx0m6zQt7fYWqFGBc6NMk1wIaHwmqGySTLEEFP9QvS0dSmuLrEgRoSsrYOTYRpw8hmk7FAQR89LbvHFdFOhtGw6jwD8UBrXctOtURllJk4CoH1wIEZPibnHmTg9sHyW9z5nc5-D6fLMuMWeZOJVcPktc5c-5UcvMgeSuKqyiGJ1vcB4qo5-99OZ1VmvikUJxGh8oNGEmxd1Ov8BJVCMa1aE1nEiqnses5oQqBVETv0CRGf3FojaP51b9QjwJ8n-6d5aRagkqO4uW9PhIH75j-q_RzyeVYCyDd0vLvsO9jQ9-ib-ZnlvEw-2ZBE6eFymXYuwWN9fjqXwAAAP__T4VS9w=="
+	expectedURL := "https://cockroachdb.github.io/distsqlplan/decode.html#eJyMk1Hr0zAUxd_9FOU-B2w2N7VPggwcqNPNNymX2Fy6YJrE3NStjn53afswFP7Z_yVwz--eEwgnN-BfFio4HT7titPXj8WH3XEHApzX9Fl1xFB9Bwm1gBB9Q8w-TtJtXtjrK1SlAONCnya5FtD4SFDdIJlkCSr4pn5YOpLSFF-WIEBTUsbOsYk4vZsODD9pAAHvve07x1WRzobRMCr8TXFA612LTnWEpRQZuMrBtQABGf4qZ97k4PZB8uuc-U0Ovs0nyzJjlrmnkqsHyeucOfdUcvMgeSuKqyiG_7a4DxRRz-d9OZ1VmvikUJxGh8oNGEmxd1Oz8BJVCMa1aE1nEiqnses5oQqBVETv0CRGf3FojaP51j9QjwJ8n-6t5aRagkqO4vnNPhIH75j-KfVTyeVYCyDd0vJ72PexoS_RN_M1y3iYfbOgidNC5TLs3YLGenzxNwAA__9IF1PL"
 	if url.String() != expectedURL {
 		t.Errorf("expected `%s` got `%s`", expectedURL, url.String())
 	}
diff --git a/pkg/sql/execinfrapb/flow_diagram_test.go b/pkg/sql/execinfrapb/flow_diagram_test.go
index 7a68dab8eb70..54764c122836 100644
--- a/pkg/sql/execinfrapb/flow_diagram_test.go
+++ b/pkg/sql/execinfrapb/flow_diagram_test.go
@@ -48,8 +48,9 @@ func TestPlanDiagramIndexJoin(t *testing.T) {
 	flows := make(map[base.SQLInstanceID]*FlowSpec)
 
 	desc := &descpb.TableDescriptor{
-		Name:    "Table",
-		Indexes: []descpb.IndexDescriptor{{Name: "SomeIndex"}},
+		Name:         "Table",
+		PrimaryIndex: descpb.IndexDescriptor{Name: "primary"},
+		Indexes:      []descpb.IndexDescriptor{{Name: "SomeIndex"}},
 	}
 	tr := TableReaderSpec{
 		Table:     *desc,
@@ -166,8 +167,8 @@ func TestPlanDiagramJoin(t *testing.T) {
 
 	flows := make(map[base.SQLInstanceID]*FlowSpec)
 
-	descA := &descpb.TableDescriptor{Name: "TableA"}
-	descB := &descpb.TableDescriptor{Name: "TableB"}
+	descA := &descpb.TableDescriptor{Name: "TableA", PrimaryIndex: descpb.IndexDescriptor{Name: "primary"}}
+	descB := &descpb.TableDescriptor{Name: "TableB", PrimaryIndex: descpb.IndexDescriptor{Name: "primary"}}
 
 	trA := TableReaderSpec{
 		Table:     *descA,
diff --git a/pkg/sql/logictest/testdata/logic_test/explain b/pkg/sql/logictest/testdata/logic_test/explain
index 3cf802554306..163b23b89f1e 100644
--- a/pkg/sql/logictest/testdata/logic_test/explain
+++ b/pkg/sql/logictest/testdata/logic_test/explain
@@ -16,7 +16,7 @@ distribution: local
       table: t@t_pkey
       spans: FULL SCAN
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJyUUE9LwzAUv_spwgNZK5GtO-a0MasW6zrbsgmjh9g8R6FrapLOP6PfXdoMdMJEb_n9f2QP-qUEBokf-rOUFNWzJNdxdE_W_uMinAZz4lwFSZo8hC45eC6swTlAvts43CXR0o-J41rNuBlZ3fqxbwvnUUrC4M4ngx3mRqriA8X5AChUUuCcb1EDW4MHGYVayRy1lqqj9r0hEG_ARhSKqm5MR2cUcqkQ2B5MYUoEBil_KjFGLlANR0BBoOFF2deaSa2KLVfvQGEmy2ZbaUY4UEhq3j0vIWspyMZ8tWvDNwjMa-nfL1gVlZCvqIbe8fx0eeNMPBcoRI1hZDI-OTf-z1yMupaVxqOxU82jNqOAYoP2U7VsVI4LJfN-xsKoz_WEQG2s6lkQVFbqDvwe9n4Nj3-Es_bsMwAA___IjMWm
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJyUUF9L6zAUf7-fIhy4rL3ksnWPedqYVYt1nW3ZhFEkNsdR7JqapPPP6HeXNgOdMNG3_P4fsgf9VAKDxA_9WUqK6kGS8zi6Jmv_dhFOgzlxzoIkTW5Clxw8_6zBOUC-2zjcJdHSj4njWs24GVld-rFvC-dRSsLgyieDHeZGquINxd8BUKikwDnfoga2Bg8yCrWSOWotVUfte0MgXoCNKBRV3ZiOzijkUiGwPZjClAgMUn5fYoxcoBqOgIJAw4uyrzUTc1c_4itQmMmy2VaaEQ4Ukpp3z_-QtRRkYz7KteEbBOa19OcHrIpKyGdUQ-94fbq8cCaeCxSixjAyGZ-cG_9mLkZdy0rj0dip5lGbUUCxQfunWjYqx4WSeT9jYdTnekKgNlb1LAgqK3UHfg5734bHX8JZ--c9AAD__8sxxS4=
 
 # Test that explaining a query that contains a subquery the result of which is
 # needed to make the physical plan is rejected. See #40677.
diff --git a/pkg/sql/opt/exec/execbuilder/testdata/dist_vectorize b/pkg/sql/opt/exec/execbuilder/testdata/dist_vectorize
index 3e22e1db526c..aaa674d04dfb 100644
--- a/pkg/sql/opt/exec/execbuilder/testdata/dist_vectorize
+++ b/pkg/sql/opt/exec/execbuilder/testdata/dist_vectorize
@@ -78,7 +78,7 @@ regions: <hidden>
       table: kv@kv_pkey
       spans: FULL SCAN
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJzslt9O2zwUwO-_p7DOVfnkKn8LxVdsFZPQBp3awi6mCpnkqIua2JntQDvUx9oL7MmmJmRrCiSppolJ5dLn-MQnP_9s-R701xgYjE8_nA4mJJCZMJ3_D8i70fCczG-BgpAhXvAENbDP4AAFFyh4QMEHCj2YUkiVDFBrqdZT7vOCs3ABzKYQiTQz6_CUQiAVArsHE5kYgcGE38Q4Qh6ismygEKLhUZwvM789SVWUcLUECgMZZ4nQDCiMUy40I11r3cP7K2KiBBmxf3zXxTiQwqAwkRSPUkreaaKQh4w4ReRmabAM9clboHB-NRgQbTAtOJAOLowVCXPAiJ23WExAnD83IeELkmAi1ZLwOJYBNxgyYudfv-Em-IKayMykmWFkPT_vqgw4MF1RKEYPzLThMwTmrGh7rm9mM4UzbqSyelWsg-HlxeR6NPw07hwABVxgkD2G9Qd9us_2-bu9TEgVosKw0tt0Vf8nzpYh48vz67OLSefE-Tt_4lX-xGlvsrOTyZbbtbx9drmB7IYBhy_qstveAHc3A7yu5e-zAQ1kNww4elEDvPYGeLsZ4Hfzi3pvDWggu2FA_0UN8Nsb4O9mQK-7z_vfwHVj_4__mffME32OUKdSaNx61zz9ZXv93sFwhsXjSMtMBfhRySBfphgO87o8EKI2RdYpBmeiSK0b3Cx2aovdSrGzXezWr9ywtFdb7dcX-7v0nVPMgYJAcyfVnMTcoAiWvza9jN_xyFR1CFGjingcfeOPXSnLHk5XgNEtPpywMlUeszJXHLUym6DWfFaZYLd2sIqkV4vksJ7n4SvPbSRHtUj69Tz7rzy3kRzX3xZ2w0VVf83tB9Hp6r-fAQAA__9bq8pp
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJzslt9u2jwUwO-_p7DOFf1klL-01FfdUCdVW8sEtLuYUOUmRywisTPbobCKx9oL7MkmkmYjtA1B08QkeulzfOKTn3-2_AD6awwMhucfznsjEshMmNb_R-TdoH9JpjOgIGSIVzxBDewzOEDBBQoeUPCBQgfGFFIlA9RaqtWUh7zgIpwDsylEIs3MKjymEEiFwB7ARCZGYDDidzEOkIeoLBsohGh4FOfLTGdn09ltOsUFUOjJOEuEZkBhmHKhGWlbqx7e3xATJciI_eO7LsaBFAaFiaR4klLyXhOFPGTEKSJ3C4NlqEveAoXLm16PaINpwYG0cG6sSJgjRuy8xWIC4vSlCQmfkwQTqRaEx7EMuMGQETv_-h03wRfURGYmzQwjq_l5V2XAgfGSQjF6ZKYNnyAwZ0mbc30zmSiccCOV1ali7fWvr0a3g_6nYesIKOAcg-wprD_o032xz9_tZUKqEBWGld7Gy_o_cTYMGV5f3l5cjVpnzt_5E6_yJ05zk52dTLbctuUdsstbyK4ZcLxXl93mBri7GeC1Lf-QDdhCds2Ak70a4DU3wNvNAL-dX9QHa8AWsmsGdPdqgN_cAH83AzrtQ97_LVzX9v_0n3nPPNPnAHUqhcaNd83zX7ZX7x0MJ1g8jrTMVIAflQzyZYphP6_LAyFqU2SdYnAhitSqwfVip7bYrRQ7m8Vu_cpblvZqq_36Yn-XvnOKOVAQaO6lmpKYGxTB4teml_F7HpmqDiFqVBGPo2_8qStl2ePpCjCa4eMJK1PlMStzxVErswlqzSeVCXZjB6tIOrVIjut5Hr_y3ERyUoukW8-z-8pzE8lp_W1hb7mo6q-5wyA6Xv73MwAA__-5gsoy
 
 query T
 EXPLAIN ANALYZE (DISTSQL) SELECT * FROM kv JOIN kw ON kv.k = kw.k
@@ -128,7 +128,7 @@ regions: <hidden>
       table: kw@kw_pkey
       spans: FULL SCAN
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJzsmt9u2zYUxu_3FASv2pWuTMlOEwEFjAUd0G6Jh7TozeALRjqzBcmiS9J2vCCPtRfYkw2S5qb-I8oSOpCzdBeJpHT4O4efvtB8xPJLgn388d2v764_oR_Rz3fjGxSv0Ifx-1sUr9H4FsWr1zF6i-L16xgTnPIQbtkcJPZ_xxQT7GKCPUzwABM8xBOCF4IHICUXWZfHfMD78AH7fYKjdLFU2e0JwQEXgP1HrCKVAPbxJ3afwB2wEITTxwSHoFiU5K-JV6OFiOZMbDDB1zxZzlPpo5igFSb444JlVz0nC-SXz0hFc_BR_--_ZHEd8FRBqiKeHjQJvpZIAAt9RIs79xsF21uX6CdM8M3n62skFSxQwJepQi_gQTlRql76qJ_HWXQAiMs6zNkDmsOciw1iScIDpiD0UT9_-j1TwQwk4ku1WCofZf3zqLY3KJ48EVxcFTy3vO43aMbkbJfUKOs_IVgqNgXs0yfSLAEXewlYlyRg_ZwAh3YpOJICtzQFz8_hIgQB4f5zXmUvPqnXkWzegJjCBx6lIBy6t54S-EO9GNFXL9-KaDor_sQEj7PZjigZuWTkkVG2oOEBguVh4nQ8szb5JUEK5gsURjJGS8mm0Bj3M0rvBJTL9Bimo4RueY8vHDrcZVMy48qwh6VhD3bCpqcvQlpfBR2353jdItTrYI0UvGmgg10KqnWQmtFBeoY66J5ezW4DQfF6zqCrZr2g1EjBZQNB6VJQLSiuGUFxz1BQvNOr2WsgKIOeM-yqWS8oNVJw1UBQuhRUC4pnRlC8MxSUwenVPGggKMNeV8t6OamRgGF9Oek5FLE0RBRxNQPRJUMvLAMzwjI4Q2Gp2NC8A7ngqYS9raDjT-5nBCGcQpEXyZcigN8ED_LXFJfjfFz-32sIUhWtbnHxPt02ScWUbivpvyTXL-rl9OgvSqNPQa25iFHCFKTB5mv42_trFqndiYUgQUQsif5kh7PeDvt3tQcQrfJpf9O0XfZf2_I5b1vnIDMU-4O_P5Irw0ioBsnld0FC6yKh5UXe2jKhwzYyoTW00LVOC_XRX5RG39qEXhlGYkQL9UhoeZG3tkz2tLAlTNx9Jv1vmXi7n4f9wZ52MN3Vor51Sjpo6InPuBz0SMqN9v8hoaY9sYUJbacnrmBi2hMb8QvDhp74jMtEj6TcaNuhhfroTXtiCxPaTk9cwcS0JzaihRd1PHE7kLzprHI9JK3ck9YjKfffdnwx9dEbt8oWrnvjVtlIlV92VrkeklbuSeuRlPtvO7RQH71xq2xECyuYmLbKRqr8qrPKB78yND1qccZlUsHEtFm2sU5auVtdwUTjwe34bFbF30q_TJuet2gvE9OO2Ywg2n2Mw8Y60RhxSwSxO3NxBEqtQxctWfwHZ0mscs02MjHtms2sHT2TdrpmPRPjO9dWQim34pZ8OeucTmuLQ6xzPK0tZqLOobeOiRXb11ZCKbfilgjiwVGVFrrmydMP_wQAAP__QCvB0g==
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJzsmt9u2zYUxu_3FMS5ale6MiU7TQQUMBZ0QLolGdKiN4MxKNKZLUgWXZG24wV5rL3AnmyQNDf1H1GW0IGspbtIJKXD3zn89IXmI4jPMbjw4d2v7y4_kh_Jz3e31yRakve3VzckWpHbGxItX0fkLYlWryOgkPAAb7wZCnB_BwYUbKDgAIUBUBjCmMI85T4KwdOsy2M-4Cp4ALdPIUzmC5ndHlPweYrgPoIMZYzgwkfvPsY79AJMrT5QCFB6YZy_JlqOouUf8wjXQOGSx4tZIlwSUbIECh_mXnbVs7JAfvlEZDhDl_T_-VsU1z5PJCYy5MleU8pXgqToBS5hxZ37tcTNrXPyE1C4_nR5SYTEOfH5IpHkBT5IK0zkS5f08ziLDohRWYeZ90BmOOPpmnhxzH1PYuCSfv70e0_6UxSEL-R8IV2S9c-j2txgMH6iUFwVPDe87tdk6onpNqlR1n9MQUhvguCyJ9osAWc7CViNotWhBKyeE2CxLgUHUmCXpuD5OTwNMMVg9zmvshcf1etANq8xneB7HiaYWmxnPcX4p3wxYq9evk3DybT4EyjcZrMdMTqy6ciho2xB4wP6i_3EqXhmbeJzTCTO5iQIRUQWwptgY9zPKJ0jUC6SQ5gOErrhPT632HCbTcmMK8MeloY92AqbHb8IWX0VtOye5XSLUK2DNVLwpoEOdimo1kGmRwfZCeqgfXw12w0ExelZg66a1YJSIwXnDQSlS0G1oNh6BMU-QUFxjq9mp4GgDHrWsKtmtaDUSMFFA0HpUlAtKI4eQXFOUFAGx1fzoIGgDHtdLavlpEYChvXlpGcx4iUBYYTLKaZdMtTCMtAjLIMTFJaKDc07FHOeCNzZCjr85H5GEIMJFnkRfJH6-FvK_fw1xeVtPi7_7zVAIYtWu7i4SjZNQnpStZX0f5LrF_VyfPRnpdEnKFc8jUjsSUz89ZfwN_dXXii3JxagwDT04vAvb3_Wm2H_rXYfw2U-7a-aNsv-S1s-503rDEWGYnfwt0dyoRkJUyA5_yZIWF0krLzIW1smbNhGJqyGFtrGaaE6-rPS6Fub0AvNSLRooRoJKy_y1pbJjha2hIm9y6T_NRNn-_OwO9hRDmbbWtQ3TkkHDT3xCZeDGkm50f4eEqrbExuY0HZ64gomuj2xFr8wbOiJT7hM1EjKjbYZWqiOXrcnNjCh7fTEFUx0e2ItWnhWxxO3A8mbzirXQ9LKPWk1knL_bcYXUx29dqts4LrXbpW1VPl5Z5XrIWnlnrQaSbn_NkML1dFrt8patLCCiW6rrKXKLzqrvPcrQ9OjFidcJhVMdJtlE-uklbvVFUwUHtyMz2ZV_K30y6zpeYv2MtHtmPUIotnHOEysE4URN0QQuzMXB6DUOnTRksW_d5bEKNdsIhPdrlnP2lEzaadrVjPRvnNtJJRyK27Il7PO6bS2OMQ6x9PaYibqHHrrmBixfW0klHIrbogg7h1VaaFrHj_98G8AAAD__zZQwWk=
 
 query T
 EXPLAIN (VEC, VERBOSE) SELECT count(*) FROM kv
diff --git a/pkg/sql/opt/exec/execbuilder/testdata/distsql_agg b/pkg/sql/opt/exec/execbuilder/testdata/distsql_agg
index 726c87cf59a0..a723a9bc0ee6 100644
--- a/pkg/sql/opt/exec/execbuilder/testdata/distsql_agg
+++ b/pkg/sql/opt/exec/execbuilder/testdata/distsql_agg
@@ -73,7 +73,7 @@ vectorized: true
       table: data@data_pkey
       spans: FULL SCAN
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJzsmUFvqkoUx_fvU0xmZV_G6AxgW1dwLTUkFrxA-9q8NARl4iVRxgfY2Nz0u78MKoL1MlpcdMGiZc5h_mdOz7_zW-hvmPw3h32oP49HmmGC1p3huM7P0RVw9JE-cMEEAf9t1vKvEJgwNvf8KGh5fLVLsDiPp2wVpdnWhb_ePMMoeyZpENC3wtJL_MWyGC_ZNlwtdk8v3FZ78-PQj6Z0F-zFPNgp1yz2_Nms5U3eU5rk7fzNGw3TbeNhug2ztrNoyvIqCEyuEIjpLPaS9fogfi_H7-XYf5utDxPlHWGU0nhKl2kpG5Ny2Tlb0k0G3NvWAwj81AdD23ocgx8vYAIRjFhATX9BE9j_F2KIIIEIShBBGSKowFcElzGb0iRhMd_yOxMYwRr2uwiG0XKV8vQrglMWU9j_DdMwnVPYh64_mVOb-gGNO12IYEBTP5xnx_Au1GUcLvz4HSI4YPPVIkr6gDeKQOY_f_DB82eYQgSdpc-3tDsY-FEAMGDpLxrD1w8E2Srdt5Gk_ozCPv5Ap7eqzWYxnfkpiztKuVOVT0MzXzzTcj3zcTRqqeSKd_P40FIxXw2sR9Pdrn9Y1sjTzLuWKuWhZW-jbKNnW_84LR4-aM9b1YNhblfOT_vOuL_fRY8PnpHXfrZsTxsOW6qclTbczUHKLuLnZIFra6ZjuIZlerY-tHXH4UttOLT1oebqLRUj_jeUB7efxeQd_PKTXwdjwPD1Yz9c8sfh7uusIhYHNKZBqVJWpWL8uPvp4MP543z-pDQlqeyAXHJAKW3t5QZc5wbc8NW9YWojz3Hv7vSnlnqLVII2dYsvvLE1Lr3cG9Xd733SbEMzB_qRMk-a_alGbi_GJX8xKRqMC1UGVl4Hy_s099xznp-PZl-OZV-OZbWn4bES2tPw2G7DdHV7oI_dI-9scuzQkTXWd3mbRgGN-0DFCKiko0oIqDICqoKA2kNAvUZAvUFAvd3-4C7fxxdcgEn-iwuxvFVhLsfZihfAvALmcpLJs7O4inAV4Sqi_BEn0mX_403WZssOVg52Hj9bLp2NT6cuvhh1O7jdIV_grqDZwsXvNdw9l7v4ktzFDXcb7n537pLT2Ucuxz7S7khfYJ-g2cLlu27Ydy77yCXZRxr2Nez77uyTTmefdDn2Se2O_AX2CZotXL6bhn3nsk-6JPukhn0N-747--TT2Sdfjn1yu6N8gX2CZguX77Zh37nsky_JPrlhX8O-784-wVcXNk2WLEroSZ8kdvmNoMGMbq5PwlbxlI5jNs2O2YRWpssSAU3SzVu8CYxo84o3WBTjQzEuiklJjM8T9-qIb-uIca2-sVKtJpXzlqrFUrVZvWq35Eq1Ui1W6lhdLRZYXS0WWF0tFlktUAus7tWx-rpSfFNt1k0ds6rFArOqxQKzqsUiswRqgVm3dczCAoqKMFqPo_VAWo-kNVFaj6W4FkyxgKaywLRPOD3LtGq1yLRqtci0arXQNIFcZNonqFaa9vrx1_8BAAD__yCBgnk=
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJzsmUFvskoXx_fvp5jMir4ZozOAbV3BY6khseADtLfNTUNQJtZcy3gBG5um3_1mUBGsD6PFRRcsKnMO8z9zev7Ob9F-wOTfOexB43E01E0LSDem67m_hxfANYZG3wNjBIK3qRRcIDBmbO4HUSj5fLVNsDiPJ2wZpdnW12C1fs6i7JmkYUjfCks_CV4XxXjBNuHydfv0Z5tqb0E8C6IJ3QY7MQ-2yhWL_WA6lfzxe0qTvJ3_80Zn6abxWboJs7azaMLyKgiMLxCI6TT2k9VqL34vx-_lOHibrvYT5R2zKKXxhC7SUjYm5bJztqDrDLh17DsQBmkABo59PwK_nsAYIhixkFrBK01g72-IIYIEIihDBBWIoAqfEVzEbEKThMV8y0cmMMMV7HUQnEWLZcrTzwhOWExh7wOms3ROYQ96wXhOHRqENG53IIIhTYPZPDuGd6HxD3_xD32HCPbZfPkaJT3AW0Ug-wbwBx89f85SiKC7CPiWVhuDIAoBBix9oTF8_kSQLdNdI0kaTCns4U90fLP6dBrTaZCyuK2We9X4PHTrybdsz7fuh0NJIxe8m_s7ScN81bfvLW-z_mXbQ1-3biRNzkPb2UTZRt-x_3IlHt7pjxvVnWltVu5v58a8vd1G93e-mdd-tB1fHwwkTclKm976IHUb8XOywHN0yzU907Z8xxg4huvypT4YOMZA9wxJw4j_DuXB7WYxfgcvQfKyNwYMnz93wyV_HO6uzjJicUhjGpYqZVUqxo87Xw7enz_O509KU5LLDiglB9TS1m5uwGVuwBVf3ZqWPvRd7-bGeJC0a6QRtK5bfOGP7FHp5c6ozm7vg-6YutU3DpR50J0vNXJ7MS75i0nRYFyo0rfzOljZpbnnvvv4eDD7dCj7dCirPwwOldAfBod2m5ZnOH1j5B1455BDhw7tkbHNOzQKadwDGkZAI21NRkBTENBUBLQuAtolAtoVAtr15gd3-D6-4AJM8g8uxMpGhbkcZyteAPMKmMtJJs_O4irCVYSriPpHnMjn_cZbrMUWbazu7Tx8tlI6Gx_PXXxG7rZxq02-QV5Bu4Wr323Ieyp58TnJixvyNuT96eQlx9OPnJN-pNWWv0E_QbuF63fZ0O9U-pFz0o809Gvo99PpJx9PP_mc9JNbbeUb9BO0W7h-Vw39TqWffE76yQ39Gvr9dPopx9NPOSf9lFZb_Qb9BO0Wrt91Q79T6aeck35KQ7-Gfj-dfoJ_YTg0WbAooUf9RbHDbwQNp3R9fRK2jCd0FLNJdsw6tDNdlghpkq7f4nVgRutXvMGiGO-LcVFMSmJ8mrhbR3xdR4xr9Y3VajWpnLdcLZarzepWu6VUqtVqsVrH6mqxwOpqscDqarHIaoFaYHW3jtWXleKrarOu6phVLRaYVS0WmFUtFpklUAvMuq5jFhZQVITRehytB9J6JK2J0nosxbVgigU0VQSmfcHpSaZVq0WmVatFplWrhaYJ5CLTvkC10rTnz__9FwAA__8pRYXf
 
 
 statement ok
@@ -94,7 +94,7 @@ vectorized: true
       table: data@data_pkey
       spans: FULL SCAN
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJyslF2Lm0AUhu_7K4ZzlcCIjpps1qtdtikEsh-NKRSKF9PMwQaMY2dGaAn570W9WBM2o8beRc07z_twhnME_TuDCJbf39aPqxcy-byKt_HX9ZTEy_XyaUt0eZjwKfmyeX0mghsOFHIp8IUfUEP0AxhQ8IFCABRCoDCDhEKh5A61lqr6y7EOrMQfiDwK-7woTfU6obCTCiE6gtmbDCGCLf-Z4Qa5QOV6QEGg4fusxlToh0LtD1z9BQpPMisPuY5I1ScuePXTcRnhuSCMSPMLFSQnCrI07zhteIoQsRPtX-kxTRWm3Ejlzs4bxd-eJw9sehXjX8W8n17mUglUKM6OTk72Iswb1iQ4a8L6z4ANnoHLHNe_YQodpVry8zFT8Pu7-8PdfccNbnDvKNVyvxvjHvR3D4a7B44b3uDeUarlvhjjHvZ3D4e7h447u8G9o1TL_f5_bZ4PMBvUhcw1Xmygj0_2qs2EIsVmjWlZqh2-KbmrMc3ja52rXwjUpvnKmodV3nyqCrbDzBr2z8LsMuzbyR3owJoO7eFwTO-ZNTy3k-djyHfW8MJOXowh39tn5XVcE_slu2Qnp0__AgAA___4FuM7
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJyslF2Lm0AUhu_7K4ZzlcCIjpps1qtdtikEsh-NKRSKlGnmYEONY2dGaAn570W9WBM2o9W9CfHjned9OHKOoH9nEMHy68v6fvVEJh9X8Tb-vJ6SeLlePmyJLg8TPiWfNs-PRHDDgUIuBT7xA2qIvgEDCj5QCIBCCBRmkFAolNyh1lJVrxzrwEr8gcijsM-L0lS3Ewo7qRCiI5i9yRAi2PIfGW6QC1SuBxQEGr7PakyFvqt-vhe_8C9QeJBZech1RKpGccGrv47LCM8FYUSan6ggOVGQpXkFasNThIidaP9S92mqMOVGKnd23in-8ji5Y9OrGP8q5vX0MpdKoEJxdnRyshdh3v81Cc6asP5TYAOm4DLH9QfMoaNWS38-Zg5-f3t_iL3vuMEA-45aLfubMfZBf_tgiH3guOEA-45aLfvFGPuwv304xD503NkA-45aLfvb99pAb2A2qAuZa7zYRG-f7FUbCkWKzTrTslQ7fFFyV2Oay-c6V98QqE3zlDUXq7x5VBVsh5k17J-F2WXYt5M70IE1HdrD4ZjeM2t4bifPx5BvrOGFnbwYQ761z8rr-EzsH9klOzl9-BcAAP__g7LmoQ==
 
 query T
 EXPLAIN (DISTSQL) SELECT sum((a-1)*1000 + (b-1)*100 + (c::INT-1)*10 + (d-1)) FROM data
@@ -111,7 +111,7 @@ vectorized: true
           table: data@data_pkey
           spans: FULL SCAN
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJzUlVGL2kAQx9_7KZZ5Su42JJvEOy9PimchoN5VLRSKD2t2sIJm7W4CLeJ3L0k4TORuY5u-6JMzs__9z_4yMEfQP3cQwfjb62QYz4j1HC-Wiy8TmyzGk_FoSXS-t4ofJw5hNrkjzPM8m9wTy1rXUnaVSqIoni3750KVF2XCJp_nL1MieMaBQioFzvgeNUTfgQEFHygEQCEECj1YUTgomaDWUhVHjqUgFr8g8ihs00OeFekVhUQqhOgI2TbbIUSw5OsdzpELVK4HFARmfLsrbQrrwUFt91z9Bgojucv3qY4Ip2RNSUKJAAqLAy9yjssITwVhRGY_UAGFOaYCVUQKHAPmsKh6rH1XIHkL7i1r4Ddrb__LWlAFjRO1A4OwrDyPR_F0OLFhdaIg8-z8Wp3xDULETvR6IsPNRuGGZ1K5vSaQxdepNWAf2_gf2pxvz1OpBCoUjatXJ3MjzPu7ToJGJ-z6EWD_PgIuc1z_ZoaghUmN_UOXIfCvR-93QO87bnAz6FuY1NA_dkEfXI8-6IA-cNzwZtC3MKmh73dBH16PPuyAPnTc3s2gb2FSQ__0v7bOOzZz1AeZarzYPu_f7BVbCcUGqxWmZa4SfFUyKW2q8KXUlQmBOquqrAritCoVDdbFzCj2G2J2KfbNzi3WgVEdmsVhl757RvGD2fmhi_OjUdw3O_e7OD-Zv5XXMibmIbv0Xp0-_QkAAP__LqCBIw==
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJzUldGL2k4Qx99_f8UyT8ndhmSTeOflSfH8QUC9q1ooFClrdrBSzdrdBFrE_70k4TCRu40lfdEHcWb2u9_ZjwNzBP1zBxGMv7xOhvGMWM_xYrn4NLHJYjwZj5ZE53ur-HDiEGaTO8I8z7PJPbGsdS1lV6kkiuLZsn8uVHlRJmzy__xlSgTPOFBIpcAZ36OG6CswoOADhQAohEChBysKByUT1Fqq4sixFMTiF0QehW16yLMivaKQSIUQHSHbZjuECJZ8vcM5coHK9YCCwIxvd6VNYT0ovr4dfuBvoDCSu3yf6ohwStaUJJQIoLA48CLnuIzwVBBGZPYdFVCYYypQRaQAMmAOi6rn2ncFlLfg3rIGfrP29rusBVXQOFE7MAjLyvN4FE-HExtWJwoyz87v1RnfIETsRK9nMtxsFG54JpXbayJZfJ5aA_axjf-hzfn2PJVKoELRuHp1MjfCvL_rJGh0wq4fAtZlCFzmuP7NjEELlRr9hy5j4F8P3-8E33fc4Gbgt1CpwX_sAj-4Hn7QCX7guOHNwG-hUoPf7wI_vB5-2Al-6Li9m4HfQqUG_-lfbZ93bOaoDzLVeLGF3r_ZK7YTig1Wq0zLXCX4qmRS2lThS6krEwJ1VlVZFcRpVSoarIuZUew3xOxS7JudW6wDozo0i8MuffeM4gez80MX50ejuG927ndxfjL_V17LmJiH7NJ7dfrvTwAAAP__immEiQ==
 
 query T
 EXPLAIN (DISTSQL) SELECT sum(a), count(a), max(a) FROM data
@@ -126,7 +126,7 @@ vectorized: true
       table: data@data_pkey
       spans: FULL SCAN
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJy0lF2L2kAUhu_7K4ZzFWEkThJ33VwpWwuCH1ujdKHIMnUOVjCZdGYCW8T_XpJAN8o6iYp3mYyvz8tzwtmD_rODEIavL-PBaEqcr6NoEX0ft0g0HA-fF0RnscNblKxllpjiKebvDm-Rb_PZhAhuOFBIpMApj1FD-BMYUPCAgg8UAqDQhRWFVMk1ai1V_pN9ERiJdwg7FLZJmpn89YrCWiqEcA9ma3YIISz4rx3OkQtUbgcoCDR8uyswObqfqm3M1V-g8Cx3WZzokOR9opTnj22XEZ4Iwog0v1HB6kBBZuYDpw3fIITsQJtXGmw2CjfcSOV2jxtFy4nTZ628zGw5XbzNZz8iJz9OBq_FxTm-d5b_gc0SqQQqFEfM1cHekHXOVYyWk7fRdOH0vf8N_fMN_aOGrPnQ2MVDc1nb9a4YW02pipSHu4zNay7Fu1yK13b9K6TUlKpIebyLFL-5FP9yKX7bDa6QUlOqIqV3FylBcynB5VKCttu9QkpNqYqUp7tvvU_4c9SpTDSebL_P_7mTb0UUGyxXqJaZWuOLkusCUx5nRa54IVCb8paVh1FSXuUFq2FmDXtHYXYa9uzkGrRvTQf2cHBL7641_GAnP9xCfrSGe3Zy7xbyk31WnZrPxP6RnbJXhy__AgAA__92gAx9
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJy0lF-L4jwUxu_fTxHOVYVITVsdp1fKvC4I_pm1yg4sIllzcGW1cZMUZhG_-5IKO1XGtFS8kabx6e_hd0KOoH_vIIbB2-uoP5wQ7_9hMk--jhokGYwGL3Ois73HG5SsZZaa_GnP3z3eIF9m0zER3HCgkEqBE75HDfF3YEAhAAohUIiAQhuWFA5KrlFrqexfjnlgKN4hblHYpofM2NdLCmupEOIjmK3ZIcQw5z92OEMuUPktoCDQ8O0ux1h0z_6sDr_wD1B4kbtsn-qY2EbJgdvHps8ITwVhRJqfqGB5oiAz8wHUhm8QYnai1Uv1NxuFG26k8tuXnZLF2Ouxhi0zXUzmq9n0W-LZ5bj_lm_c4gc3-R_YLJVKoEJxwVye3A1Z61bFZDFeDSdzrxf8axjebhheNGTVx8ZqjM1nTT-oMbiSWgUtnYcMLqiuJaijJWj6YQ0tJbUKWp4eoiWsriWsoyVs-lENLSW1Clq6D9ESVdcS1dESNf12DS0ltQpanh9--33Cn6E-yFTj1S34-Zdb9nZEscHzVaplptb4quQ6x5yX0zyXvxCozXmXnRfD9LxlCxbDzBkOLsLsOhy4ySXo0JmO3OHont5tZ7jjJnfuIT85w103uXsP-dk9q1bJMXEfsmv28vTf3wAAAP__7NsP4w==
 
 query T
 EXPLAIN (DISTSQL) SELECT sum(a+b), count(a+b), max(a+b) FROM data
@@ -143,7 +143,7 @@ vectorized: true
           table: data@data_pkey
           spans: FULL SCAN
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJy0lF2L4jwUx--fTxHOlTKRmrQ6Tq-UeVwQfJm1yg4sMkRzcAVt3CSFWcTvvrQuM1XGtPhy52n89__jd0p2YH6vIYTu60u_0xuSyv-9aBJ971dJ1O13nyfEJJuKIA9kXqVkoZLYfkwb8f7vN_k2Hg2IFFYAhVhJHIoNGgh_AgMKHCj4QCEACg2YUdhqtUBjlE7_sssCPfkOYZ3CKt4mNn08o7BQGiHcgV3ZNUIIEzFf4xiFRO3VgYJEK1brrCatbm_1aiP0H6DwrNbJJjYhEZTMgUK0FelU8xgRsSSMKPsLNVAYYyxRh6TNHtocZnsKKrGfBMaKJULI9rQ8ZWe51LgUVmmvcQwZTQeVNqumfKPpcPI2Hv2IKuk46LxmB-f6-dn-z9okVlqiRnnUOdu7CVn9HGI0Hbz1hpNKm38Q-ucJ_SNCVn6P7JI9eqzm8RtssoAz56l5l03y8p74RZ54zfNv4KmAM-fp8S6e_PKe_Is8-TUvuIGnAs6cp9ZdPAXlPQUXeQpqXuMGngo4c56e7n6DftE_RrNVscGTm_TrN9fTGxblEg_XsVGJXuCLVous5jCOslz2QKKxh1N2GHrx4SgFzIeZM8yPwuw0zN3NBdW-Mx24w8E13A1nuOlubl7T_OgMt9zNrWuan9y7qhd8Ju6P7LR7tv_vbwAAAP__c6knYg==
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJy0lF2L4jAUhu_3V4RzpUykJq2O0ytl1gXBj1mr7MAiEs3BldXGTVKYRfzvS-syozKmxY8b8TS-vg_PKdmC-bOCENqvL91Wp09KXzvRKPreLZOo3W0_j4hJ1iVBHsisTMlcJbF9n9bi7f938m046BEprAAKsZLYF2s0EP4EBhQ4UPCBQgAUajChsNFqjsYonf5kmwU68g3CKoVlvEls-nhCYa40QrgFu7QrhBBGYrbCIQqJ2qsCBYlWLFdZTVrdTD-mm9_4Fyg8q1Wyjk1IBCUzoBBtRDpVPEZELAkjyv5CDRSGGEvUIWmyhyaHyY6CSuwHg7FigRCyHS3O2VosNC6EVdqrHWNG416pycop32DcH02Hgx9RKR17rdfs4Fw_P9v_UZvESkvUKI86Jzs3IaueQ4zGvWmnPyo1-Tuhf57QPyJkxTfJLtukxyoev8Euc0gPTNXvskte3BS_0BSveP4NTOWQHph6vIspv7gp_0JTfsULbmAqh_TAVOMupoLipoILTQUVr3YDUzmkB6ae7n6TftI_RLNRscGTG_Xzf66mNy3KBe6vZaMSPccXreZZzX4cZLnsgURj96dsP3Ti_VEKeBhmzjA_CrPTMHc351T7znTgDgfXcNec4bq7uX5N86Mz3HA3N65pfnLvqprzmrhfstPuye7LvwAAAP__JdYqyA==
 
 query T
 EXPLAIN (DISTSQL) SELECT sum((a-1)*1000) + sum((b-1)*100) + sum((c::INT-1)*10) + sum(d-1) FROM data
@@ -162,7 +162,7 @@ vectorized: true
               table: data@data_pkey
               spans: FULL SCAN
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJzMlUGL4kwQhu_fr2jqlIwdkk6i4-QUcfwgoM6surCweGjThSto2u0ksIv435ckiyYyJjLBxVt3Vd68VfUU9AHin1vwYPTtfTwIpkR7DeaL-ZexTuaj8Wi4IJoWpztN48QgTCdPhFmWpZMOyaOrUlQ_RUPPC6aL_jl3Soki9v_sbUIETzhQiKTAKd9hDN53YEDBBgoOUHCBQheWFPZKhhjHUmWfHHJBIH6BZ1HYRPs0ycJLCqFUCN4Bkk2yRfBgwVdbnCEXqEwLKAhM-Gab22TW_l5tdlz9BgpDuU13UewRTsmKkpASARTme57FDJMRHgnCiEx-oAIKM4wEKo9oPjOYV_SqP2Vz-XuhRPPtaqqUcYpjJX9K-24efx0Ng8lgDMsjBZkm5ybjhK8RPHaktw9isF4rXPNEKrNbncP860TzmZ41m53s08k5nVz9ahH21SLO3mkklUCFomK8PNaXyazP1Hkm47sdzXc6ms86vq1f78CpdMBu3yf2-X0ymWHaj75RDaMooerdb6Ps23nYLXjYhuk8Oo-GUZR4PN-Ph3M7D6cFD8cw3Ufn0TCKEo_-_Xi4t_NwW_BwDbP76DwaRlHi8fJvXsAPiphhvJdRjBcv4cd_trIXEsUai-c0lqkK8V3JMLcprm-5Lg8IjJMiy4pLEBWprMCymNWK7YqYXYrteucGa6dW7daL3TZ1d2vFvXrnXhvn51pxv96538b5pZ6V1bAm9Ut26b08_vcnAAD__3X0qjs=
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJzMlVGL2kAQx9_7KZZ5Ss4NySbxzstTxLMQUO-qFgpFypodrFSzdpNAi_jdS5KiiZyJNFh8kd0Z__nPzG9g9xD_3IAHwy9vo34wIdpLMJvPPo10MhuOhoM50bQ43WoaJwZhOnkgzLIsnXRIHl2WovoxGnpeMJn3TrljShSxj9PXMRE84UAhkgInfIsxeF-BAQUbKDhAwQUKXVhQ2CkZYhxLlf1lnwsC8Qs8i8I62qVJFl5QCKVC8PaQrJMNggdzvtzgFLlAZVpAQWDC15vcJrP2s59vux_4GygM5CbdRrFHOCVLSkJKBFCY7XgWM0xGeCQIIzL5jgooTDESqDyi-cxgXtGt_pBN5u-FEs23q6lSximOlfwx7bt5_GU4CMb9ESwOFGSanNqME75C8NiBXj-K_mqlcMUTqcxudRKzz2PNZ3rWbHayjyfneHL1i0XYF4s4eaeRVAIViorx4lBfJrP-pc4TGd_taL7T0XzW8W39cgdOpQN2_UaxNhtlMsO0732nGoZRgvV4u52yrydityJiG6Zz70QahlEi8nQ7Is71RJxWRBzDdO-dSMMwSkR6tyPiXk_EbUXENczuvRNpGEaJyPP_eQnfKWKK8U5GMZ69iO9_2cpeShQrLJ7VWKYqxDclw9ymuL7mujwgME6KLCsuQVSksgLLYlYrtitidi62650brJ1atVsvdtvU3a0VP9Y7P7ZxfqoV9-qde22cn-tZWQ1rUr9k596Lw4c_AQAA__-6wa2h
 
 query T
 EXPLAIN (DISTSQL) SELECT sum(a), min(b), max(c), count(d) FROM data
@@ -177,7 +177,7 @@ vectorized: true
       table: data@data_pkey
       spans: FULL SCAN
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJy8lF2L2kAUhu_7K4ZzlcBInCS6bq4UayHgx9YoXSiyjJmDFTRjZyawRfzvJfFiVdaJjdgrk4lv3ofnhLMH_XsDEQxeX4a9eEycr3EyS74PXZIMhoP-jOh863CXku06c5bFL393UpeSVOaZcYRLvk0nIyK44UAhkwLHfIsaop_AgIIPFAKgEAKFFiwo7JRMUWupir_sy0As3iFqUlhnu9wUxwsKqVQI0R7M2mwQIpjx5QanyAUqrwkUBBq-3pQ1RXV3p9Zbrv4Ahb7c5NtMR4RTsqQkBQrJjhcHDY8RngnCiDS_UMHiQEHm5qNUG75CiNiB3g7WW60UrriRymudcyXzkdNlLlAYxWOn65dXvVenGxRX_cl8PHubTn4kjnuVxL9K8gGQZ1IJVCjO2hcHOytr_gtsMh-9xeOZ0w2vswZnrOz2cbKa4_RYw_NrDLQC7URS-8ED9W-X5NeV5De8oIakCrQTSU8PlhTcLimoKyloeGENSRVoJ5I6D5YU3i4prCspbHitGpIq0E4kPf_H_fkJyRT1TmYaL_bo529uFvsVxQqPy1jLXKX4omRa1hxvJ2WuPBCozfEpO97E2fFRAXgaZtawfxZml2Hf3lxRHVjToT0c3sPdsobb9ub2Pc1P1nDH3ty5p_nZPqtmxWdi_8guuxeHL38DAAD__1DlIiw=
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJy8lF-L2kwUxu_fTzGcqwRG4iRx182V4msh4J-tUbpQRMbMwUo1Y2cmsEX87iXxYlXWiY3YG00mPj4_fiecPehfG4ig__Y66MYj4vwfJ9Pk68AlSX_Q702JzrcOdynZrjNnWXzzdyd1KUllnhlHuOTLZDwkghsOFDIpcMS3qCH6Dgwo-EAhAAohUGjBnMJOyRS1lqr4yb4MxOIdoiaFdbbLTXE8p5BKhRDtwazNBiGCKV9ucIJcoPKaQEGg4etNWVNUd4qPxe4n_gYKPbnJt5mOCKdkSUkKFJIdLw4aHiM8E4QRaX6ggvmBgszNR602fIUQsQO9Ha27WilccSOV1zonS2ZDp8NcoDCMR07HL6-6b04nKK5649loupiMvyWOe5XEv0ryAZBnUglUKM7a5wc7K2v-DWwyGy7i0dTphNdZgzNWdvtAWe2Beqzh-TVGWgF3ounpwSP1b9fk19fkN7yghqYKuBNNzw_WFNyuKaivKWh4YQ1NFXAnmtoP1hTerimsrylseK0amirgTjS9_MM9-gnJBPVOZhov9unn_9ws9iyKFR6Xspa5SvFVybSsOd6Oy1x5IFCb41N2vImz46MC8DTMrGH_LMwuw769uaI6sKZDezi8h7tlDT_Zm5_uaX62htv25vY9zS_2WTUrXhP7S3bZPT_89ycAAP__3gslkg==
 
 # AVG is more tricky: we do two aggregations (for the sum and for the count)
 # and calculate the average at the end.
@@ -196,7 +196,7 @@ vectorized: true
           table: data@data_pkey
           spans: FULL SCAN
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJy0lF-L2kwUxu_fTzGcqwRH4kyi6-Yqy74WAv7ZGoVCkTJmDqmgGTuJpUX87iWxsFHWiTTmLpn4-PzyO-EcIfuxBR9GX97GL-GUWP-H0SL6PLZJNBqPXhdE_EwsyxKkQ9Y26ZDY98PpYlhcSpt8ms8mRIpcAIVUSZyKHWbgfwUGFDhQcIGCBxT6sKKw1yrGLFO6-MmxDITyF_g9Cpt0f8iL4xWFWGkE_wj5Jt8i-LAQ6y3OUUjUTg8oSMzFZlvWFNXBXm92Qv8GCq9qe9ilmU8EJWtKYkokUIj2ojjrOoyIVBJGVP4dNVCYYypR-yTwOpYVsE7A7U7g_n1BWJ0oqEP-zpXlIkHw2Ynez_6SJBoTkSvt9C_Ro-XECphdUM-W00V5fauS36x8bzqkSkvUKC9qViczFOvdooqWk29hwcXtqirmBPwmp3vBye4fK_v3sTqs6_AWBltDX3E4eNRg-f3CeANhvOu4LQiroa8Ie3qUMPd-YW4DYW7X8VoQVkNfETZ8lDDvfmFeA2Fe1-m3IKyGviLsuY1d-0HlHLO9SjO82rkf_3Ov2MUoEzwv7kwddIxvWsVlzfl2VubKA4lZfn7Kzjdhen5UAFbDzBjmF2F2Hebm5ppq15j2zGGvCXffGB6YmwdNmp-M4aG5edik-dk8q17NZ2L-yK67V6f__gQAAP__jxct0g==
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJy0lF2L2kAUhu_7K4ZzleBInEl03Vxl2VoI-LE1CoUiy5g5pFI3YyextIj_vSQWNso6EWJuJJn4-j4-J5wDZL-24MPo28v4KZwS63MYLaKvY5tEo_HoeUHE78SyLEE6ZG2TDol9P5wuhsWltMmX-WxCpMgFUEiVxKl4wwz878CAAgcKLlDwgEIfVhR2WsWYZUoXXzmUgVD-Ab9HYZPu9nlxvKIQK43gHyDf5FsEHxZivcU5Cona6QEFibnYbMuaojooPl53P_EvUHhW2_1bmvlEULKmJKZEAoVoJ4qzrsOISCVhROU_UAOFOaYStU8Cr2NZAesE3O4E7v-_CKsjBbXP38myXCQIPjvS2-mfkkRjInKlnf45fLScWAGzC-rZcroor69V8quV7037VGmJGuVZzepohmK9a1TRcvIaFlzcrqpiTsCvcrpnnOz2wbImg3VY1-EtjLaGv2JxcK_R8tuV8UbKeNdxW1BWw19R9nAvZe7tytxGytyu47WgrIa_omx4L2Xe7cq8Rsq8rtNvQVkNf0XZYxs794PKOWY7lWZ4sXs__uVesZNRJnha4Jna6xhftIrLmtPtrMyVBxKz_PSUnW7C9PSoAKyGmTHMz8LsMszNzTXVrjHtmcNeE-6-MTwwNw-aND8Yw0Nz87BJ86N5Vr2a18T8kl12r46f_gUAAP__r74xOA==
 
 # VARIANCE/STDDEV have three local (sqrdiff, sum, and count) and one final stage aggregations.
 # We calculate and render the variance/stddev at the end.
@@ -215,7 +215,7 @@ vectorized: true
           table: data@data_pkey
           spans: FULL SCAN
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJy8lF-L4jwUxu_fTxHOVYVITVsdp1cV_0DB0RnbeVlYZInm4ArauEm67CJ-96WVZVTGVCruXU7Sp8-T3wlnD_rHBkIYfnkd9-IJcQZxkiZv4wZJhuNhPyU63zq8QYmSeSYcbYTAn86iQQlrkNFs-kIENxwoZFLghG9RQ_gVGFDwgIIPFAKg0IY5hZ2SS9RaquKTfSmIxS8IWxTW2S43xfacwlIqhHAPZm02CCGkfLHBGXKBym0BBYGGrzelTWEd7dR6y9VvoNCXm3yb6ZBwShZAIdnxomq6jPBMEEak-Y4K5gcKMjcfjtrwFULIDvT2VL3VSuGKG6nc9nmo5P3FiVij8H-bDeLRyIm8sir2y1V_-j5Jy_W1KN7VKB8J8kwqgQrFmf38YA_LWtfSjuJJb_wtSQeD4f9O5NHIp1FQHMwwE6hCErG_ryDyKAvDMJ6k3et38M_uwG5vMqvTZJc1Xa9GmytynZDrPLrN3u2IvFqIvKbr10BUkesE0dOjEfm3I_JrIfKbblADUUWuE0TdRyMKbkcU1EIUNN12DUQVuU4QPf_LefpJlBnqncw0XszVz__cKuYtihUeh7OWuVriq5LL0uZYTktduSFQm-MpOxZxdjwqAp6KmVXsnYnZpdizO1dY-1Z1YBcH9-RuW8Udu3PnHucnq7hrd-7e4_xs71Wr4pnYH9ml9_zw358AAAD___c5JPI=
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJy8lF-L4jwUxu_fTxHOVYVITVtnnF5V_AMFR2ds52VhkSGagyurjZukyy7id19aWUZlTKXi3khO4tPnye-EswP9Yw0hDL68jLrxmDj9OEmT11GDJIPRoJcSnW8c3qBEyTwTjjZC4E9n3qCENchwOnkmghsOFDIpcMw3qCH8CgwoeEDBBwoBUGjDjMJWyQVqLVXxl10piMUvCFsUVtk2N8X2jMJCKoRwB2Zl1gghpHy-xilygcptAQWBhq_WpU1hHRU_79vv-Bso9OQ632Q6JJySOVBItryomi4jPBOEEWm-oYLZnoLMzYenNnyJELI9vT5Xd7lUuORGKrd9Git5e3Yi1ij8X6f9eDh0Iq-siv1y1Zu8jdNyfSmKdzHKR4I8k0qgQnFiP9vbw7LWpbTDeNwdvSdpvz_434k8Gvk0CoqDKWYCVUgi9vcdRB5lYRjG47Rz-Q7-yR3Y9W1m9drssqbr1Wh0RbIjdg_3brR3PSSvJiSv6fo1IFUkO4L0eG9I_vWQ_JqQ_KYb1IBUkewIUufekILrIQU1IQVNt10DUkWyI0hP_3KufhJlinorM41n8_XzL7eKuYtiiYchrWWuFvii5KK0OZSTUlduCNTmcMoORZwdjoqAx2JmFXsnYnYu9uzOFda-VR3YxcEtudtW8YPd-eEW50eruGN37tzi_GTvVavimdgf2bn3bP_fnwAAAP__obooWA==
 
 query T
 EXPLAIN (DISTSQL) SELECT sum(a), round(variance(b), 1) FROM data
@@ -232,7 +232,7 @@ vectorized: true
           table: data@data_pkey
           spans: FULL SCAN
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJy8lFGL4jAUhd_3V4T7VCFS01bHyVPFUSg4daY6y8IiSzQXV9DGTdplF_G_L60sozKmUnHecpOenpPvhrsD82sNHAbfXka9KCbOUzSZTl5HDTIZjAb9KTH5xhENSrTKU-n8Fnol0gU68wYlrEGGyfiZSJEJoJAqibHYoAH-HRhQ8ICCDxQCoNCGGYWtVgs0Runik10piOQf4C0Kq3SbZ8X2jMJCaQS-g2yVrRE4TMV8jQkKidptAQWJmVitS5vCOtzq1Ubov0Chr9b5JjWcCErmQGGyFUXVdBkRqSSMqOwnapjtKag8e3c0mVgicLan16fqLZcalyJT2m2fhpq8PTshaxT-r8lTNBw6oVdWxX656o_f4mm5vhTFuxjlPUGeKi1Rozyxn-3tYVnrUtphFPdGP772kqgX9wdO6NHQp2FQHCWYStSchOz_Swg9yjjnUTztXr6Ff3ILdn2bWZ02u6zpejUaXZHriF3n3o32rkfk1ULkNV2_BqKKXEeIHu6NyL8ekV8Lkd90gxqIKnIdIereG1FwPaKgFqKg6bZrIKrIdYTo8TMn6gdREjRblRo8m6wf_7lVTFyUSzyMZ6NyvcAXrRalzaEcl7pyQ6LJDqfsUETp4agIeCxmVrF3ImbnYs_uXGHtW9WBXRzckrttFXfszp1bnB-s4q7duXuL86O9V62KZ2J_ZOfes_2XfwEAAP__i2EmMA==
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJy8lFGL4j4Uxd__nyLcpwqRmrY6Tp4qjkLBqTPV-bOwyBDNxZXVxk3aZRfxuy-tLKMyplJxXyQ38fSc_G64OzA_1sBh8OVl1Iti4jxFk-nkddQgk8Fo0J8Sk28c0aBEqzyVzk-hVyJdoDNvUMIaZJiMn4kUmQAKqZIYiw0a4F-BAQUPKPhAIQAKbZhR2Gq1QGOULv6yKwWR_AW8RWGVbvOs2J5RWCiNwHeQrbI1AoepmK8xQSFRuy2gIDETq3VpU1iHxc_79jv-Bgp9tc43qeFEUDIHCpOtKKqmy4hIJWFEZd9Qw2xPQeXZh6fJxBKBsz29PldvudS4FJnSbvs01uTt2QlZo_B_TZ6i4dAJvbIq9stVf_wWT8v1pSjexSgfCfJUaYka5Yn9bG8Py1qX0g6juDd6_7-XRL24P3BCj4Y-DYPiKMFUouYkZH_fQuhRxjmP4mn38i38k1uw6xvN6jXaZU3Xq9HqimRH9Dr3brV3PSSvJiSv6fo1IFUkO4L0cG9I_vWQ_JqQ_KYb1IBUkewIUvfekILrIQU1IQVNt10DUkWyI0iP_3KyfhIlQbNVqcGzCfv5l1vF5EW5xMOYNirXC3zRalHaHMpxqSs3JJrscMoORZQejoqAx2JmFXsnYnYu9uzOFda-VR3YxcEtudtWccfu3LnF-cEq7tqdu7c4P9p71ap4JvZHdu492__3JwAA__9CrCmW
 
 query T
 EXPLAIN (DISTSQL) SELECT stddev(a+b+c::INT+d) FROM data
@@ -249,7 +249,7 @@ vectorized: true
           table: data@data_pkey
           spans: FULL SCAN
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJy0lNGK4jAUhu_3KcK5qhipaeuM06sOo0LB0RnbWRYWWWJzcAVt3CQuu4jvvrQOjMqYypbepam__9fvhOxB_1pDCMNvL-PHeEKcQZykyeu4RZLhePiUEm2EwN-O43DSJosWaZMsDONJ2i-WokVGs-kzEdxwoJBLgRO-QQ3hd2BAwQMKPlAIgEIP5hS2SmaotVTFT_ZlIBZ_IOxSWOXbnSm25xQyqRDCPZiVWSOEkPLFGmfIBSq3CxQEGr5alzVFdbRVqw1Xf4HCk1zvNrkOCadkQUlGiQAKyZYXex2XEZ4Lwog0P1EBhRnmAlVIoqDtOBFrR16rHfnvHwjzAwW5Mx9c2vAlQsgO9Hb2x-VS4ZIbqdzeOXryOhvEo5ETsVbB-Pb8vnqavk3Scn0NwLsK8NG7y6USqFCclc4PdkR2oXcUTx7HP5J0MBh-dSJGI49G_nUw_wyM3T5V9v9TdVnH9RqYawX9ibS7Zubq3a7Pq6HP67h-A_oq6E_03Tejz79dn19Dn99xgwb0VdCf6Os3oy-4XV9QQ1_QcXsN6KugP9H30Pyl_AnADPVW5hovLufP_7lbXNoolni84bXcqQxflMzKmuPjtMyVGwK1Ob5lx4c4P74qAE_DzBr2zsLsMuzZmyuqfWs6sIeDOtw9a_jO3nxXp_neGu7bm_t1mh_ss-pWHBP7Ibvsnh--_AsAAP__liM7kA==
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJy0lF-L4jwUxu_fTxHOVcVITVtnnF518A8UHJ2xnZeFRYbYHFxZp3GTuOwifveldWBUxlQovZE09fH5-Tshe9C_NhDC6Nvz5DGeEmcYJ2nyMmmRZDQZDVKijRD423EcTtpk2SJtkoVhPE37xVK0yHg-eyKCGw4Ucilwyt9RQ_gdGFDwgIIPFAKg0IMFha2SGWotVfGVfRmIxR8IuxTW-XZniu0FhUwqhHAPZm02CCGkfLnBOXKByu0CBYGGrzdlTVEdFR9v25_4FygM5Gb3nuuQcEqWlGSUCKCQbHmx13EZ4bkgjEjzAxVQmGMuUIUkCtqOE7F25LXakf_xF2FxoCB35pNMG75CCNmB3k7_uFopXHEjlds7h09e5sN4PHYi1ioYX58-VoPZ6zQt19cAvKsAn727XCqBCsVZ6eJgR2QXgsfx9HHylqTD4eh_J2I08mjkXwfzz8DY7XNldebqso7rNTDZCv4TbXfNTNa7XaBXS6DXcf0GBFbwnwi8b0agf7tAv5ZAv-MGDQis4D8R2G9GYHC7wKCWwKDj9hoQWMF_IvCh-cv5C4A56q3MNV5c0l__cre4vFGs8HjTa7lTGT4rmZU1x8dZmSs3BGpzfMuOD3F-fFUAnoaZNeydhdll2LM3V1T71nRgDwd1uHvW8J29-a5O87013Lc39-s0P9hn1a04JvZDdtm9OPz3LwAA__9q1z72
 
 query T
 EXPLAIN (DISTSQL) SELECT variance(a+b+c::INT+d) FROM data
@@ -266,7 +266,7 @@ vectorized: true
           table: data@data_pkey
           spans: FULL SCAN
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJy0lNGK4jAUhu_3KcK5qhipaavj9KriKBScOlOdZWGRJTYHV9DGTeOyi_juS-vAqIxp2dK7NPX3__qdkCNkv7bgw_jby3QYRsR6CueL-eu0Rebj6Xi0IL-52vA0QcuyOGmTVYu0SeL7YbQY5EvRIpN49kwE1xwopFJgxHeYgf8dGFBwgIILFDyg0IMlhb2SCWaZVPlPjkUgFH_A71LYpPuDzreXFBKpEPwj6I3eIviw4KstxsgFKrsLFARqvtkWNXl1sFebHVd_gcJIbg-7NPMJp2RFSUKJAArzPc_3OjYjPBWEEal_ogIKMaYClU8Cr21ZAWsHTqsduO8fCMsTBXnQH1yZ5msEn51odfbheq1wzbVUdu8aff4aP4WTiRWwVs749vy-Gs3eokWxvgfg3AX46D2kUglUKK5KlyczIrvROwmj4fTH12EcDqPR2AoYDRwauPfR3Cs0Vn2u7P_narOO7TQw2RL6C239ZibrVNfn1NDndGy3AX0l9Bf6HprR51bX59bQ53ZsrwF9JfQX-gbN6POq6_Nq6PM6dq8BfSX0F_oem7-WPwGIMdvLNMOb6_nzf-7m1zaKNZ7v-EweVIIvSiZFzflxVuSKDYGZPr9l54cwPb_KAS_DzBh2rsLsNuyYm0uqXWPaM4e9Otw9Y7hvbu7XaX4whgfm5kGd5kfzrLolx8R8yG67l6cv_wIAAP__pi08zg==
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJy0lGFr4jAYx9_fpwjPq4qRmrY611cVp1BwdavuODhkxObBk3ONl8bjDvG7j9bBVGZaKH0jaerf_8_fE3KA7M8WfBj_eJoOw4hYD-F8MX-etsh8PB2PFuQvVxueJmhZFidtsmqRNkl8P4wWg3wpWmQSzx6J4JoDhVQKjPgbZuD_BAYUHKDgAgUPKPRgSWGnZIJZJlX-lUMRCMU_8LsUNulur_PtJYVEKgT_AHqjtwg-LPhqizFygcruAgWBmm-2RU1eHeQfr7vf-B8ojOR2_5ZmPuGUrChJKBFAYb7j-V7HZoSngjAi9S9UQCHGVKDySeC1LStg7cBptQP34y_C8khB7vUnWab5GsFnR1qdfrheK1xzLZXdu4SfP8cP4WRiBayVM748fqxGs5doUaxvATg3AT5796lUAhWKi9Ll0YzIrgRPwmg4ff0-jMNhNBpbAaOBQwP3Npp7gcaqT5bVmazNOrbTwGxL-M_E9ZuZrVNdoFNLoNOx3QYElvCfCbxrRqBbXaBbS6Dbsb0GBJbwnwkcNCPQqy7QqyXQ69i9BgSW8J8JvG_-ev4CIMZsJ9MMr67pr3-5m1_fKNZ4uuszuVcJPimZFDWnx1mRKzYEZvr0lp0ewvT0Kgc8DzNj2LkIs-uwY24uqXaNac8c9upw94zhvrm5X6f5zhgemJsHdZrvzbPqlhwT8yG77l4ev70HAAD__4erQDQ=
 
 # Regression aggregate functions have two local, and one final stage aggregations.
 # Calculation and rendering are happening at the end.
@@ -283,7 +283,7 @@ vectorized: true
       table: data@data_pkey
       spans: FULL SCAN
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJy8lV9ro0AUxd_3U8h9SmCCGTX941Mka4OQTbIqpWUJMqsXN2Add5yUlJLvvqgLja7VYOm-5R7neA4_L5NXyH8nYIL9sF1ZzloZfXU83_u-GiuevbIXvhLyZyaCjGcjRpRwTBSBsQjy47Exv9Tnl_rMnuNjU6if2KcSRYiZrKlCq7824RlWinLnbr4pEZMMCKQ8wjV7whzMH0CBgAYEdCBgAIEZ7AhkgoeY51wUR15LgxMdwZwS2KfZQRbyjkDIBYL5CnIvEwQTfPYzQRdZhEKdAoEIJdsnZUwRPc_E_omJFyCw4MnhKc1NpWgHBLyMFdNEpQpLI4UqXP5CAbsTAX6Qb4m5ZDGCSU_k8lZWHAuMmeRCndVL-a619hzf2awD1166tucVP63l0rWXlm-P5pTMtfG7LbR3W7yFH1IuIhQY1ZJ3p-6etEHvzllbq2CxubfcYLvZjuZ0DOSvWjQPvIeHNvGxRXxsEa37ZYvful-2nHXWvu0u7K3_7yNXa8lbbbZ2Kb-HUa9hpJevGB2yYiqdqNqAJevpdfbxrj5xybTL6WiD6GgTVR9Ap6fXGZ3rT6SjX05HH0RHn6jGADo9vc7o3HwiHeNyOsYgOsZEnQ2g09PrjM7tf7q-W1q4mGc8zbFxjbe_eVpc7xjFWP0X5PwgQtwKHpYx1bgpfaUQYS6rp7QanLR6VBQ8N9NOs1Yz06ZZ607uidY73Ua32fhI71mn-ao7-eojyded5pvu5JuPJN92f6tpz5p0L1kze3f68icAAP__g2h04w==
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJy8ld9ro04Uxd-_f4XcpwQmmFHTHz5F8rVByCZZldKyBJnVixvWOu44KSkl__uiLjS6VoOl-1J6j3M8h4-XySvkvxIwwX7YrixnrYz-dzzf-7oaK569she-EvJnJoKMZyNGlHBMFIGxCPLjsTG_1OeX-sye42NTqJ_YpxJFiJmsqUKrvzbhGVaKcuduvigRkwwIpDzCNXvCHMxvQIGABgR0IGAAgRnsCGSCh5jnXBRHXkuDEx3BnBLYp9lBFvKOQMgFgvkKci8TBBN89j1BF1mEQp0CgQgl2ydlTBE9L_4E2U98AQILnhye0txUin5AwMtYMU1UqrA0UqjC5Q8UsDsR4Af5lplLFiOY9EQu72XFscCYSS7UWb2W71prz_GdzTpw7aVre17xr7VcuvbS8u3RnJK5Nn63hfZui7fwQ8pFhAKjWvLu1N2TNvjdOWtrFSw295YbbDfb0ZyOgfxRi-aB9_DQJj62iI8tonW_bPFb98uWs87at92FvfX_fuRqLXmrzdYu5fcw6jWM9PIlo8OWTKUTVRuwZj3Nzj7f1SeumXY5H20gH22i6gP49DQ743P9iXz0y_noA_noE9UYwKen2Rmfm0_kY1zOxxjIx5ioswF8epqd8bn9R9d4SwsX84ynOTau8_Y3T4trHqMYq9-EnB9EiFvBwzKmGjelrxQizGX1lFaDk1aPioLnZtpp1mpm2jRr3ck90Xqn2-g2Gx_pPes0X3UnX30k-brTfNOdfPOR5NvubzXtWZPuJWtm707__Q4AAP__FG54SQ==
 
 
 # Test various combinations of aggregation functions and verify that the
@@ -303,7 +303,7 @@ vectorized: true
           table: data@data_pkey
           spans: FULL SCAN
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJzcVt1vsjoYvz9_RfNcYazBAjrHVYljhsQXfYF32XJiTAeNx0SBU9BsWfa_nxT8wjA0x2QXu4A8X78-H7-26Qdk_67ABPt5OrYcFykPjh_4v8ct5NtjexigbLNWWAsjtl0ory1c6OFOj6SeRxHfFiGlOM_YOj3V06RUt0wsWRzyYpktE2XgXpFR-_UVhaE2em2hNgpN03GDgRRltjDZxzKMZBmCL8Q8e3s709-r-ntVZ9vF27mhGrGMcy5CnuYVq9Cqy66SlJcW9OhNfqGI5QwwxEnEXbbmGZh_AwEMGmDQAYMBGHoww5CKJORZlggZ8lEAnOgNzC6GZZxucmmeYQgTwcH8gHyZrziYELDXFfc4i7hQu4Ah4jlbroo0MjVNxXLNxDtgGCarzTrOTMQwesUoxCgCDH7KpK2jEsTiCBGU5P9wARg8HkdcmIgabUWhpE21Vpvqu9FjRAlGVMOI6hhRA2afGJJNfqwzy9mCg0k-8fW9WIuF4AuWJ0LtVVvx__xSqNaS9UpJl9Jw8scNdnJhNQ5S78RfyP5v78F5fNytsfNoFc9xHSKlwLNc3wmciTv37JFn-74UrdHIs0dWYCtUwzLhV31rX_Z9bHcTJyLigkeVXmefzZMh3ZrRkEPx-yHNncbhHCL6Unt0XGs894OHB_tJoXeYEkwH5475dDKtcT5ZnmO5Q1uh91gORa-4StCJpyy3ewwaTg5hhBzNcuhz__m51vpSZ32ps1pPo7olrKdRXbTjBrY3tKdBjc_T6pKOJ1N7bz-cmOJoqOXJwIj2VNrHiN7tvgFG9H73ka78yXgizxKRECIxpCd_EkYkhkgQkQit--We0yt7jlx_b5D_f2-opKNq33BzXOjm5Hz0f9TNoV3PonYDi1pH1b-BxQvdnLB496NY1K9nUb-BRb2jGt_A4oVuTlgc_CgWjetZNG5g0eiovW9g8UI3Jyze_ygWL7xBPZ6lSZzxszdZ_cpd-Vbj0YKXD7ss2YiQT0USFmlKdVLgCkPEs7z0klJx4tIlCzwFk0awVgGTc7DWnPlCar0RbTSDjVvq7jWC-82Z-7dkvmsED5ozD27JfN_MVffCNmneZOe5Z59__RcAAP__8oSfLA==
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJzcVt1vsjoYvz9_RfNcYazBAjrHVYljhsQXfYF32XJiTAeNxxwHnIJmy7L__aTgF4ahickuvIA8X78-H7-26Sdk_63ABPt5OrYcFykPjh_4v8ct5NtjexigbP2msBZGbLNQXlu40MOtHkk9jyK-KUJKcZ6xt_RYT5NS3TCxZHHIi2U2TJSBO0VG7dZXFIba6LWF2ig0TccNBlKU2cJkF8swkmUIvhDz7P39RP-o6h9VnW0W76eGasQyzrkIeZpXrEKrLrtKUl5a0KM3-YUiljPAECcRd9kbz8D8Gwhg0ACDDhgMwNCDGYZUJCHPskTIkM8C4ETvYHYxLON0nUvzDEOYCA7mJ-TLfMXBhIC9rrjHWcSF2gUMEc_ZclWkkamp_M3Tf_kHYBgmq_VbnJmIYfSKUYhRBBj8lElbRyWIxREiKMn_4QIweDyOuDARNdqKQkmbaq021bfDx4gSjKiGEdUxogbMvjAk6_xQaZazBQeTfOHLu7EWC8EXLE-E2qs24__5pVCtJeuVki6l4eSPG2zlwmrspd6Rv5D9396D8_i4XWPr0SqewzpESoFnub4TOBN37tkjz_Z9KVqjkWePrMBWqIZlwu_61r7t-9DuOk5ExAWPKr3OvponQ7o1oyH74ndDmjuNw9lH9KX26LjWeO4HDw_2k0LvMCWYDk4d8-lkWuN8sjzHcoe2Qu-xHIpecZWgI09ZbvcQNJzswwg5mOXQ5_7zc631pc76Ume1nkZ1S1hPo7poxw1sb2hPgxqfp9UlHU-m9s6-PzHF0VDLk4ER7am0jxG9234DjOj99iNd-ZPxRJ4lIiFEYkhP_iSMSAyRICIRWvfbPadX9hy5_OYg19wcKumo2g_cHWf6OToh_Zu6O7TLedSu4lHrqPoP8HimnyMe726KR_1yHvWreNQ7qvEDPJ7p54jHwU3xaFzOo3EVj0ZH7f0Aj2f6OeLx_qZ4PPMW9XiWJnHGT95m9St35ZuNRwtePvCyZC1CPhVJWKQp1UmBKwwRz_LSS0rFiUuXLPAYTBrBWgVMTsFac-YzqfVGtNEMNq6pu9cI7jdn7l-T-a4RPGjOPLgm830zV90z26R5k53mnn399X8AAAD__7oiopI=
 
 
 query T
@@ -321,7 +321,7 @@ vectorized: true
           table: data@data_pkey
           spans: FULL SCAN
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJzsV11v6jgQfd9fYc2TUV2B8wFtnhzRFEWigZvksr1aIWQSi0WChHUCoqr631cOFAhLA1rU25e-BPvMGY9n5tgyr5D9MwMLnOd-13Y9hB_cIAx-dGsocLpOO0TZco55jaD5NMFj9cvXOKoRFKXLJMdxjSC-mmCMObpB4xq6QZFluV54p4bKmuVxLFZbM0ErLqc8iQTe0rasKF1xOVqkCzwmBSDFRI6y9RpzgqL9_KU8fynP-WqyPgZe1Io7YJrkQkZikSva-B2VWomUzdKF2KyDHv3eE4p5zoFAksbC43ORgfUXUCCgAQEdCBhAwIQhgYVMI5FlqVSU18LBjddgNQhMk8UyV_CQQJRKAdYr5NN8JsCCkI9nwhc8FrLeAAKxyPl0VoRRodlCTudcvgCBdjpbzpPMQmr7BEUExUAgWHCF3dYp4kmMKErzv4UEAr5IYiEtxIwbjBm9YVrthunbBhFUIERZ30GFEVSAujLA8I1Ausz3e89yPhFg0TdyeX72ZCLFhOeprJvl9IKfT5gZNSDw5HqYmcXIfsasqUbt3k8vHPm9PwOspgWZ7gzbcfDDf3AfHzHTdhztgKOVOPqOox9winHo217ghm7PG_lOx3eCQA3tTsd3OnboYGYS1rqIaJDN9i9Z8TKiQVRpPuqF9mEv9i1YJqmMhRRxqf7Dt-pu0caJdtFdu7Rdu97rOnJVPY1dlc0SXiT76Hp2dxSEDw_OALMWYXeE3e8NA9t3ba_tYEYbhFFKGNX21nZvYPujfq-PGdX3sKraKHh-xowa_0F_nUJ_nULtQefUEvago9jmEex6oeO3nb4SYvPI5msnHIJur--8r787mqXzRhAz66xJEGsRxNRxvFdHsqE-ikgVkyoqVVxqqo-i09aH8tBL8qCXX0X0_19FdXpb177oMjqT4YG8m9-X0SdfRtrlatOuUJt2W9e_SG1nMjxQW-tbbZ-sNv1ytelXqE2_rRtfpLYzGR6o7e5bbZ-sNuNytRlXqM24rZtfpLYzGR6o7f5bbb_xWX-iF77IFmmSiaPn_emVG-rZL-KJ2PxHyNKljERfplERZjPtFX4FEIss31jpZuImG5Pa4KEzrXTWSs702FmrjnwmtF7pbVQ7G9fs26x0blZHbl4TuVXpfFcd-e6ayPfVvWqckUm1yI5jD9_--DcAAP__ERJXMA==
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJzsV11v6jgQfd9fYc2TEUbgfADNkyOaokg0cJNctlcrhExisWhpkk0Coqr631cOFAhLAxLq7Utfgn3mjMczc2yZV8j-XYIB1tNoYNoOwve253s_BjXkWQOr56Ns9Yx5jaDnRYRn8pdvcFAjKIhXUY7DGkF8PccYc1RHsxqqo8AwbMfvyqG0ZnkYivXOTNCapwseBQLvaDtWEK95Ok3iBM9IAaRink6zzQZzgoLD_KU8fynP-Xq-OQVe5Ip7YBHlIg1Ekkva7B1NlRIpW8aJ2K6DHtzhIwp5zoFAFIfC4c8iA-MvoEBAAQIqENCAgA4TAkkaByLL4lRSXgsHO9yA0SKwiJJVLuEJgSBOBRivkC_ypQADfD5bClfwUKTNFhAIRc4XyyKMDM3kZ5r8I16AQC9erp6jzEAyAYICgkIg4CVcYo0mRTwKEUVx_rdIgYArolCkBmJaHWNG60yp1Zm6axFBBUKk9R2UGEEFqEoDTN4IxKv8sPss53MBBn0j12dozuepmPM8Tpt6OUHv5yNmWg0IPNoOZnoxMp8wa8tRb_jT8afu8E8Py2lBpnvDbuz9cO_thwfMlD1HOeIoJY6656hHnGLsu6bj2b49dKau1Xctz5NDs993rb7pW5jphHWuImpku_1rVryOqBFZmo96oXzYi0MLVlGchiIVYan-k7fqbtHWmXbRfbuUfbve6zq1ZT21fZX1El4k-2A75mDq-ff31hizDmFdwu4OhrHp2qbTszCjLcIoJYwqB2tvODbd6Wg4woyqB1hWbeo9PWFGtf-hv86hv86h5rh_bglz3Jds_QS2Hd9ye9ZICrF9YnOVMw7eYDiy3tffH83SeSOI6U3WJoh1CGLyON7JI9mSH0mkkkkllUou1eVH0mnnQ3moJXnQ6y8jestl1KSNpvJF19GFHI8E3v6-jj75OlKu15tyk96URlP9Ir1dyPFIb51vvX2y3tTr9abepDe10dS-SG8XcjzSW_dbb5-sN-16vWk36U1rNPUv0tuFHI_0dvett9_4vD_TC1dkSRxl4uSZf37llnz-i3Autv8VsniVBmKUxkERZjsdFn4FEIos31rpdmJHW5Pc4LEzrXRWSs701FmpjnwhtFrprVU7a7fsW690bldHbt8SuVPp3K2O3L0l8l11r1oXZFItstPYk7c__gsAAP__hfJalg==
 
 
 # Verify that local and final aggregation is correctly shared and de-duplicated.
@@ -340,7 +340,7 @@ vectorized: true
           table: data@data_pkey
           spans: FULL SCAN
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJzslk1v4jAQhu_7K6w5BckocT74yMkIgjYShTbQdqVdVBlisUiQsE5S7ariv69MWpJQCBE9cOEEHs87r2fyWPIbRH9WYIPz437QcYdI6bnjyfhhUENjZ-B0JyhK1gqrYRTFvs9fd3_Z60JhNdR3BxPHQ8rzd8dzEEO_Ek0zOLJqGM3DJIiV2Xuu_H1lYsmCOVdmh8JZKpyjlnRJ1ucy0nOcSuJIr6G-N7pDPosZYAhCnw_Zmkdg_wQCGHTAYAAGEzBYMMWwEeGcR1EoZMrbTuD6f8HWMCyDTRLL8BTDPBQc7DeIl_GKgw0TNltxjzOfC1UDDD6P2XK1s5HWdCOWayb-AYZuuErWQWQjhtEMMIw3TK7qKkEs8BFBYfybC8Dg8cDnwkaUpL1Ytm27w0kLI6qnI2gdRrieRYiMwnSLIUzi7OBRzBYcbLLF1ZvrLBaCL1gcCtUq9jZ-vFOoWZNtPHg9t99_X3VHj8PJx06a8_GFKMnvf46-eKPnsbIXWrlyVsHIysR6ll2I7XXFzCMVjCMVjKMVjJMz1U_ONBtlEoTC54L7hTlOt-VTJ9qRsRM5jb477AxexpNez3lSqI4pwdTITT399-Jm4_tYNfZZzUK8lZV96nhuZ9h1FNrGlGiYErIXEe2zPZH-BqZk55vxK0nEiBoqNTGiFka0odImRlRy2pasaieHahSGSqrfQnLJLVRJXdWvdw_PtJcjonG7hxXvoV4dGf0iZPS6alwPmTPt5ZBp3pCpiIxRHRnjImSMumpeD5kz7eWQad2QqYiMWR0Z8yJkzLpqXQ-ZM-3lkGnfkLnggXhkph6PNmEQ8YOH4vHKmnxAcn_B09dmFCZizu9FON_ZpMvRTrcL-DyK012SLtwg3ZIHzItJqVgviMmhWC93PmNtlKrNcrH5lXNbpeJGuXPjK87NUnGr3Ln1Fed2-bfSzmBSDtmh93T77X8AAAD__yzmtsI=
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJzslk1v6jgUhvfzK6yzCpJR4jjhIysjCJpIFNpA25FmEDLEYtCFhJuP6l5V_Pcrk5YkFEJEF2zYtPj4vOf1OXks-R2in2uwwP7ncdBxhkjpOePJ-GlQQ2N7YHcnKEo2Cq9hFMWeJ972P_nbUuE11HcGE9tFyuvftmsjjv5LNI0KZNYwWgSJHyvzj1z5_42HK-4vhDI_Fs5T4QK1pEuyuZSRnuNckkB6DfXd0QPyeMwBgx94Ysg3IgLrXyCAQQcMFDAYgMGEKYZtGCxEFAWhTHnfCxzvF1gahpW_TWIZnmJYBKEA6x3iVbwWYMGEz9fCFdwToaoBBk_EfLXe20hrJv_Mtj_Eb8DQDdbJxo8sxDGaA4bxlstVXSWI-x4iKIj_FyFgcIXvidBCjKTdmJZlOcNJCyOmp0NoHUeEnkWIjMJ0hyFI4uzoUcyXAiyyw9Xb6yyXoVjyOAhVs9jd-PlBYUZNtvHk9px-_2PVHT0PJ587ac7nN2Ikv_81OnNHr2PlIDRz5cyCkZmJ9Sy7EDvoipknKtATFejJCvTsTPWzM81GmfhB6IlQeIU5TnflUyfaibETOY2-M-wMZuNJr2e_KEzHjGBGc1NPf82cbHyfq8Yhq1mIt7KyLx3X6Qy7tsLamBENM0IOIqJ9tSfSn2JG9r4Zv5JEjBhVmYERMzFiDZU1MWKS07ZkVTs7VFoYKql-D8l191AldVW_3U280GCOicb9Jla8iXp1aPQrodHrKr0dNBcazEHTvENTERpaHRp6JTS0rhq3g-ZCgzloWndoKkJjVIfGuBIao66at4PmQoM5aNp3aK54KJ6YqSuibeBH4ujBeLqyJh-SwluK9NUZBUm4EI9hsNjbpMvRXrcPeCKK012SLhw_3ZIHzItJqVgviMmxWC93vmBNS9VGudj4zrnNUnGj3LnxHedmqbhV7tz6jnO7_FtpFzAph-zYe7r7608AAAD__81Buig=
 
 query T
 EXPLAIN (DISTSQL) SELECT sum(a), avg(DISTINCT a), variance(a) FILTER (WHERE a > 0) FROM data
@@ -357,7 +357,7 @@ vectorized: true
           table: data@data_pkey
           spans: FULL SCAN
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJy0k1GLm0AQgN_7K5Z5SmCDrppS9ikh9Voh513VXgutD1t3sIJx7e56tBz570WlpDnSI5L0zZ3Zz_lmlnkC86MGDuHn--06isnsbZRm6YftnKThNtxkxHS7mZhTIh7LIRfFm4z0gUehK9EUOBNzchNtszAhs0_vwyQkgnztXNdH4s7JTXJ3S6SwAig0SmIsdmiAfwEGFDyg4AOFACgsIafQalWgMUr3V54GIJI_gbsUqqbtbB_OKRRKI_AnsJWtEThk4luNCQqJ2nGBgkQrqnoo05detbraCf0LKGxU3e0aw0nvk7ai_1w4jIhGEkaU_Y4aKCTYSNScrNjYiMs5j-LsDSUrBvmegurswcZYUSJwtqf_MD6Ido3SEjXKI8l8f6KndVlqLIVV2lket5R-vJ2tvDlQWD-8O7zJGHpYJ9E63oT9jT_P8oK0dyTNzh8zmzxmhy0c7_qD9s539qY7ewvHv76zf76zP93ZXzjB9Z2D852D6c7Bwln-3yU84ZygaVVj8Nkynv6z2y8pyhLHjTaq0wXea1UMZcbj3cANAYnGjlk2HqJmSA2Cf8PsRfj1Eew-h71LKvuXwMEl8HISnO9f_Q4AAP__aKQY7A==
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJy0k1GL004QwN__n2KZpxa2JJukf2SfGmpOA73cmcRT0CBrdojFNBt3N4dS-t0lCVJ71KO29aV0Z_aX-c0sswXzrQYO0fv7VRgnZPIyzvLszWpKsmgVLXNius1ETCkRj9WQi5NlTvrAo9Br0ZQ4EVNyE6_yKCWTd6-jNCKCfOxc10fiTslNendLpLACKDRKYiI2aIB_AAYUPKDgA4UAKMyhoNBqVaIxSvdXtgMQy-_AXQrrpu1sHy4olEoj8C3Yta0ROOTic40pConacYGCRCvW9VCmL73ofz61X_EHUFiquts0hpPeKGtF_3fmMCIaSRhR9gtqoJBiI1FzsmBjKy7nPE7yF5QsGBQ7Cqqzex9jRYXA2Y7-wXmv2jVKS9QoDzSL3ZGuwqrSWAmrtDM_bCp7eztZeFOgED682r_KGHoI0zhMllF_49fDPCPtHUiz0wfNzhi0w2aOd_1Re6dbe-dYezPHv761f7q1f461P3OC61sHp1sH51gHM2f-b5fxiHWKplWNwSdLefzLbr-sKCscN9uoTpd4r1U5lBmPdwM3BCQaO2bZeIibITUI_g6zZ-H_D2D3KexdUtm_BA4uged_BRe7_34GAAD__xpgHFI=
 
 query T
 EXPLAIN (DISTSQL) SELECT sum(a), avg(a), count(a), stddev(a), variance(a) FROM data
@@ -372,7 +372,7 @@ vectorized: true
       table: data@data_pkey
       spans: FULL SCAN
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJy8lF9r4kAUxd_3Uwz3KcJInCT2T54iVSFgtU1sd2GRMpu5ZAXNuDOTskvxuy9JHpqUmqgFn5ybm-P5zcnlvoH-swEfJj8eZqNwTqxxGC_jx1mPxJPZ5G5JdL61eI8S_pqWv4nMM1OetBECX8vjK1drniVo8R6ZRot7IrjhQCGTAud8ixr8n8CAggMUXKDgAYUhrCjslExQa6mKV95KQSj-gj-gsM52uSkerygkUiH4b2DWZoPgw5L_2mCEXKCyB0BBoOHrTWlTWAc7td5y9Q8o3MlNvs20TwqeeMeLY99mhGeCMCLNb1Sw2lOQuXm304anCD7b0-ORRmmqMOVGKnvYJIqf7q2A9QqYxdN8WT-_RIvvsVWU8WM0DqfTsnmIxznI846RZ1IJVCgaDKt9OzEbHEKOn-5fwgLaaVRuUU3D-Wj2Ei_H48mzFXg0YLR6rWo8j6JwNL-bNFoRZgKVTwJGScDswKEkcCkJPEqC4cGbu42bs-OHg508HDbr284Z49EBVQv76iLj4RwfknN6SE7fds8IqQOqFtL1RUJyjw_JPT0kt297Z4TUAVUL6eYiIXnHh-SdHpLXt4dnhNQBVQvp9uLb-BOeCPVOZho_bOXP_3lQbGsUKVarXctcJfigZFLaVOWi1JUPBGpTdVlVhFnVKgDrYtYqdhpi9lHstDt3WLutaq9d7H2Fe9gqvmp3vvqK83Wr-Kbd-eYrzrft32rQMSbtQ_bRe7X_9j8AAP__fgQ8zw==
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJy8lF9r4kwUxu_fTzGcK4WROEnsn1xFqkLAapvYvguLyKxzyMrajDszKbsUv_syyUWTUhNJwRudk5PH5zePh_MG-vceAph-e5iPowXpTaJklTzO-ySZzqd3K6Lzlx7vU8Jf0-J7K_PMFCdthMDX4vjK1Y5nW-zxPpnFy3siuOFAIZMCF_wFNQTfgQEFFyh4QMEHCiNYUzgouUWtpbKvvBWCSPyBYEhhlx1yYx-vKWylQgjewOzMHiGAFf-xxxi5QOUMgYJAw3f7wsZah_Zjc_iFf4HCndznL5kOiCVKDtweBw4jPBOEEWl-ooL1kYLMzbuhNjxFCNiRng81TlOFKTdSOaM6U_J03wtZ38Isnxar6nkTL_9PerZMHuNJNJsVzVM87kmed4w8k0qgQlFjWB-bidnwFHLydL-JLLRbqzxbzaLFeL5JVpPJ9LkX-jRktHytbDyP42i8uJvWWjFmAlVAQkZJyJzQpST0KAl9SsLRyZt7tZuz88eDdRgPhw0ct8OAtGBV4r66yIC458fkdonJHTheh5hasCoxXV8kJu_8mLwuMXkDx-8QUwtWJaabi8Tknx-T3yUmf-CMOsTUglWJ6fbiW_kTnhj1QWYaP2znz395aLc2ihTLFa9lrrb4oOS2sCnLZaErHgjUpuyysoiysmUBq2LWKHZrYvZR7DY7t1h7jWq_Wex_hXvUKL5qdr76ivN1o_im2fnmK863zf_VsGVMmofso_f6-N-_AAAA__8XykA1
 
 query T
 EXPLAIN (DISTSQL) SELECT sum(a), avg(b), sum(a), sum(a), avg(b) FROM data
@@ -387,7 +387,7 @@ vectorized: true
       table: data@data_pkey
       spans: FULL SCAN
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJy0lG-r2jAUxt_vU4TzSiFS01avt6-8OAeCf-6swmDIiObQCdq4JB0b4ncfadmuyjUt1b07J_Xx9-Q54RxB_9hBBMMvr-OX0ZQ0Po7iRfx53CTxcDwcLIjO9g3epIT_TBrrJv3XX56TT_PZhAhuOFBIpcAp36OG6CswoOADhQAohEChAysKByU3qLVU9ifHXDASvyBqU9imh8zY4xWFjVQI0RHM1uwQIljw9Q7nyAUqrw0UBBq-3eUYi-4f1HbP1W-gMJC7bJ_qiHBK1kAhPnDbtTxGeCoII9J8RwWrEwWZmTeiNjxBiNiJVnf1kiQKE26k8jqXpuLlpNFnTcu3lW-rwWw5XeT1Lbh_E_7GzFKpBCoUF8DVyW2Ptcv9xcvJt5F1GNhujqlAFZE-o6Tve_2AFuXf9uYlgotLsOpzZXXm6rGW59eYbImvs-i6j5-sXz0Uv1YofssLaoRS4usslKfHhxJUDyWoFUrQ8sIaoZT4Ogul9_hQwuqhhLVCCVtep0YoJb7OQnn-v4vxHfgc9UGmGq8W5Pv_3LaLE0WCxZbVMlMbfFVyk2OKdpbr8gOB2hRfWdGM0uKTNXguZk6xfyFm12LfTS5BB0516BaH9_juOMVdN7l7D_nJKe65yb17yM_uWbVLnon7kV2zV6cPfwIAAP__JjMVtA==
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJy0lF-L2kAUxd_7KYb7pDASJ4m7bp5crAXBP1ujUCiyjM4llWrGzkxKi_jdyyS0q7JOQrQvcu_Ek9_JucM9gP6xhQgGX15Gz8MJaXwcxvP486hJ4sFo0J8Tne0avEkJ_5k0Vk36rz8_J59m0zER3HCgkEqBE75DDdFXYEDBBwoBUAiBQgeWFPZKrlFrqexfDrlgKH5B1KawSfeZscdLCmupEKIDmI3ZIkQw56stzpALVF4bKAg0fLPNMRbdsz-v--_4Gyj05TbbpToinJIVUIj33HYtjxGeCsKINN9QwfJIQWbmjakNTxAidqTVfT0nicKEG6m8zrmteDFu9FjT8m3l26o_XUzmeX0N7l-FvzGzVCqBCsUZcHl022Ptcn_xYvw6tA4D280wFagi0mOU9HyvF9Ci_Nte_Yjg7CNY9cmyepP1WMvza8y2xNlJeA_3n61fPRa_Zix-ywtqxFLi7CSWx_vHElSPJagZS9DywhqxlDg7iaV7_1jC6rGENWMJW16nRiwlzk5iefq_C_Id-Az1XqYaLxbl-29u2wWKIsFi22qZqTW-KLnOMUU7zXX5gUBtiqesaIZp8cgaPBUzp9g_E7NLse8ml6ADpzp0i8NbfHec4gc3-eEW8qNT3HWTu7eQn9yzapdcE_clu2Qvjx_-BAAA__8PERka
 
 query T
 EXPLAIN (DISTSQL) SELECT avg(c), sum(c), avg(d), sum(d) FROM data
@@ -402,7 +402,7 @@ vectorized: true
       table: data@data_pkey
       spans: FULL SCAN
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJy8lF-L2kAUxd_7KYb7tIGROEl03TxFrAuCf7ZGoVCkTDOXVNCMnUlKi_jdy0Rho6wTidineG9yPL85d7h70L82EMLw69u4P5qSp8-jeBF_GTskHo6HgwXhv9OnxKFEF9vyaWpxqoVDXuezCRE850AhkwKnfIsawm_AgIIHFHygEACFDqwo7JRMUGupzCf7UjASfyBsU1hnuyI37RWFRCqEcA_5Ot8ghLDgPzY4Ry5QuW2gIDDn601pY6yjnVpvufoLFAZyU2wzHZKEEgEU4h03VctlhGeCMCLzn6hgdaAgi_zdUec8RQjZgd5O1U9ThSnPpXI751DxcvIUMcfwzJbTxel32fUqXc-5CuJdBXn3LzKpBCoUZ-argx2Vta-xxsvJ99GJ60Trn_UDU80xE6hCEjF30I_N1_34dTzrL3oOJRGjJPLdKDCPq4fzzw7Hbp89azJ7l7Vcr8H0a7gqkXYfO33v9oC8RgF5LddvEFANVyWg58cG5N8ekN8oIL_lBg0CquGqBNR7bEDB7QEFjQIKWm6nQUA1XJWAXv7fgv0AZI56JzONF4v2439umwWMIsXjttayUAm-KZmUNsdyVurKhkCdH9-yYzHKjq8MYFXMrGLvTMwuxZ7ducbat6oDuzi4h7tjFXftzt17nJ-t4p7duXeP84t9Vu2aa2K_ZJfeq8OnfwEAAP__XwMnmw==
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJy8lF-L2kAUxd_7KYb7tIGROEncdfMUsS4I_tkahUKRZZq5pFLN2JmktIjfvUwUNso6kYh9Md6bnJxfzh3uDvSvNYQw-Po66g0n5OHzMJ7HX0YOiQejQX9O-O_0IXEo0cWmvJpaHGvhkJfZdEwEzzlQyKTACd-ghvAbMKDgAQUfKARAoQNLClslE9RaKvPIrhQMxR8I2xRW2bbITXtJIZEKIdxBvsrXCCHM-fc1zpALVG4bKAjM-Wpd2hjryPy8bX_iX6DQl-tik-mQJJQIoBBvualaLiM8E4QRmf9ABcs9BVnk75465ylCyPb0eq5emipMeS6V2znFihfjh4g5hme6mMyP_8uuV-l6zkUQ7yLIu3-RSSVQoTgxX-7tqKx9iTVejN-GR64jrX_SD0w1w0ygCknE3H4vNk_34pfRtDfvOpREjJLId6PAXC5-nH_ycez66bNm03dZy_UazL-GrBLq433n710fkdcwIq_l-g0iqiGrRPR034j86yPyG0bkt9ygQUQ1ZJWIuveNKLg-oqBhREHL7TSIqIasEtHz_1u0H4DMUG9lpvFs4X785rZZxChSPGxtLQuV4KuSSWlzKKelrmwI1PnhLjsUw-xwywBWxcwq9k7E7Fzs2Z1rrH2rOrCLg1u4O1bxo9358RbnJ6u4a3fu3uL8bJ9Vu-aY2A_Zufdy_-lfAAAA__8mTisB
 
 query T
 EXPLAIN (DISTSQL) SELECT max(a), min(b) FROM data HAVING min(b) > 2
@@ -460,7 +460,7 @@ vectorized: true
       table: data@data_pkey
       spans: FULL SCAN
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJy8lV2L4jwUx--fTxHO1QxPSk1fnLFXLo4Lgquz6sXC4kXGhrGgTbeJsIP43Zda0PFlclpTvGva_nL-ze9wugX1ZwUR9H-9Dr8NRuThZTCdTX8OH8m0P-z3ZqRYD0a9GXngj-T7ZPyDxFxzoJDKWIz4WiiIfgMDCh5Q8IFCABRCmFPIcrkQSsm8eGW7BwbxX4haFJI02-ji9pzCQuYCoi3oRK8ERDDjbysxETwWudsCCrHQPFntyxSlu1merHn-ARR6crVZpyoiRZ5pxotLx2WEpzFhROqlyGG-oyA3-lhOaf4uIGI7Wj3SS6J0ki60G57m6RbfPc5jkYs4Il12Vu24wdsHWXK1vKDnu2Mi78tEx31kWet8n__Ljb6MzVq1ch8z-RUybdJrqa4GGklHZi4Lz968Xjs4qc2qNw2r3TQuc1zvhrZBQh3Ov323tmGNtg1rpG286uq8-uo8x_VvUIeEOpzB093UeY2q8xpR51dX59dX5ztucIM6JNThDJ7vps5vVJ3fiLqgurqgvrrAccMb1CGhDmfQuZu6oFF1QeP_2SvlJkJlMlWi0l-0VQQW8bsoP1DJTb4Qr7lc7MuUy_Ge29-IhdLlU1YuBmn5qAj4GWbnMPsMeycwqwe3beCODcyscrPQTHvG8_bNsG-W1TbbCox0aIZDG9VmGFFthhHVZhhTjdCI6raN6icj_GyW9WwjywwjsswwIssMY7IQGpHVsZHFkCmKjVG7OWo3SO0mqeUotZulzGqYMmSaBoi0i3FaS5qZxqSZaUyamUalITgm7WKoGqXNd__9CwAA___lEhkY
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJy8lV2L4jAUhu_3V4RzNcOm1PTD0V65OC4Irs6qFwuLLBkbRlmn6TYRdhD_-1ALOn5MTm2KN2LaPjlv8xxON6D-rSCC3q-nwbf-kNw99ifTyc_BPZn0Br3ulOTr_rA7JXf8nnwfj36QmGsOFBIZiyF_FQqi38CAggcUfKAQAIUQZhTSTM6FUjLLH9nsgH78H6IGhWWSrnV-eUZhLjMB0Qb0Uq8ERDDlzysxFjwWmdsACrHQfLnalclLd_KfP-lf8QYUunK1fk1URPJEk5Tnfx2XEZ7EhBGpFyKD2ZaCXOtDQaX5i4CIbWn5UI9LpZfJXLvhcaJO_uajLBaZiCPSYSfVDhs8v5EFV4szerY9JPI-TXTYRxa1Tvf5Wmz0aWzWuCr3IZNfItM6uZTqYqChdGTqsvDkycu1g6ParHzbsApt4zLH9So0DhJrb6B5s8ZhtTYOq6VxvPLyvCryPMf1K8hDYu1P4eFm8rxa5Xm1yPPLy_OryPMdN6ggD4m1P4XWzeT5tcrza5EXlJcXVJEXOG5YQR4Sa38K7ZvJC2qVF9T-vb1QbixUKhMlSn1NG3lgEb-I4gWVXGdz8ZTJ-a5MsRztuN2FWChd3GXFop8Ut_KAH2F2CrOPsHcEs-vgpg3ctoGZVW4WmmnPeN6-GfbNsppmW4GRDs1waKPaDCOqzTCi2gxjqhEaUd20Uf1ghFtmWS0bWWYYkWWGEVlmGJOF0Iisto0shkxRbIzazVG7QWo3SS1Hqd0sZVbDlCHTNECknY3Tq6SZaUyamcakmWlUGoJj0s6GqlHabPvlPQAA__832xx-
 
 query T
 EXPLAIN (DISTSQL) SELECT SUM (DISTINCT A) FROM data
@@ -479,7 +479,7 @@ vectorized: true
           table: data@data_pkey
           spans: FULL SCAN
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJy8lt1r4kAUxd_3rwj3qWUj8U7iV54sbReEfm11YWHxYWoGK2jizkTYUvzflxjQ-NF7Myb4VpOeuXfO-XHIJ5i_cwjh_vfLw83gybm6GwxHw58P187w_uH-duSY1WLzbPB0O3LktfPj9fnRiWQqwYU4idSTXCgD4R9AcEGACz64EIALLRi7sNTJRBmT6OxfPjeCQfQPwqYLs3i5SrPHYxcmiVYQfkI6S-cKQhjJt7l6VTJS2muCC5FK5Wy-GZON7i_1bCH1B7hwm8xXi9iETrbPcCmzPxseOjKOHHSS9F1pGK9dSFbpbpxJ5VRBiGu3_Ep3M5PO4knqtfb36Wf3ftaR0ioKnT4eTNsd8PbhvEvzfqQer3cbiS832p2T5LMOz_meH_Tl2ti02nu3k2_j0s10qtVUpon28MCo4a_Hqz5efzknKHH3VXzq9icvXthENO02ae1tguVRRWtUPWx44gxYmaW2qbcvBivWCivWAivjUhHWdhVYRXlEhD0iouH5ZyDCLLX1unMxREStiIhaEGFcKiLSqYKIXx4R3x4Rv-EFZyDCLLX1unsxRPxaEfFrQYRxqYhItwoiQXlEAntEgobXOgMRZqmt172LIRLUikhQCyKMS0VEenV9FZ2Y86rMMomNOvg6On1yMzNGRVOVG2mSlZ6oF51MNmPyn88b3eZBpEyav8X8xyDOX2ULFsV4KMaiWOyJ0U7cqSJGrKRuVVL3aLUgDfdpw31SHNCTA1IsmKxbpLpNi9tVQKHFDCi0mAOFUTOgMGoGlA5peJc2vFsFlB7dCU2mFI4qxaoVaDVXC7Sa7QVGzhUDI2cCx6Ni2fddML7TzcJkjnS1YMAMPyoXq9BpNRc6rWZDZ-Rc6IycC53uVWSKFY86xip0umOQKRk8ahmr0Gk1FzqtZkNn5FzojJwLnW5YwTSsoD_aDkMfr7_9DwAA___WjS9z
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJy8lltr20AQhd_7K8Q8JVRGnpV805NDkoIht8YuFIopG2txTB2tq11DQ_B_L7LAli-ZsS74JcSyz87sOR8HfYD5O4cQbn8-3V0NHpyLm8FwNPx-d-kMb-9ur0eOWb6tnw0erkeOvHS-PT_eO5G0ElyIdaQe5JsyEP4CBBcEuOCDCwG40IKxC4tET5QxOkl_8rEWDKJ_EDZdmMWLpU0fj12Y6ERB-AF2ZucKQhjJl7l6VjJSidcEFyJl5Wy-HpOO7qd_fi_-qHdw4VrPl2-xCZ10o-FCpv82PHRkHDnoaPuqEhivXNBLux1orJwqCHHlnr7UzczYWTyxXmt3o35688ckUomKQqePe9O2B7y8O6_SvB6ox6vtRuLTjbbn6GzW_jlfs4M-XRubhfbe7uQXcelqOk3UVFqdeLhn1PDH_UUfLz-dE5xw92V87PZHL57bRDSLbdLa2QRPhxVLwOphwxMlcGXW2uTePhuuWCuuWAuujEt5XNtVcBWnQyLKQCIanl8CEmatjduds0EiaoVE1AIJ41Iekk4VSPzTIfHLQOI3vKAEJMxaG7e7Z4PErxUSvxZIGJfykHSrQBKcDklQBpKg4bVKQMKstXG7dzZIglohCWqBhHEpD0mvrrejI3OelVno2Ki9t6TjJzdTY1Q0VZmRRi-TiXpK9GQ9Jvv4uNatH0TK2OxbzD4M4uyrdMG8GPfFmBeLHTEWE3eqiBErqVuV1D1aLUjDfdpwnxQH9OSAFAsm6xapbtPidhVQaDEDCi3mQGHUDCiMmgGlQxrepQ3vVgGlR3dCkymFg0op1Aq0mqsFWs32AiPnioGRM4HjQbHs-i4Y3-lmYTJHulowYIYflEuh0Gk1FzqtZkNn5FzojJwLne5VZIoVDzqmUOh0xyBTMnjQMoVCp9Vc6LSaDZ2Rc6Ezci50umEF07CCfmnbD328-vI_AAD__2dbMtk=
 
 query T
 EXPLAIN (DISTSQL) SELECT SUM (DISTINCT A), SUM (DISTINCT B) FROM data
@@ -494,7 +494,7 @@ vectorized: true
       table: data@data_pkey
       spans: FULL SCAN
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJyslNGr2jAUxt_3V4TzNCFSk1avt09evA4Er_dOHQyGD9EcXEGbLklhQ_zfR1vQVTQtcY857Zfv-_Ur5wjm1x5imHz_mL1M5-Tz63S5Wn6ddchyMpuMV8Tkh3I2nY9XRHRofbDpkC-L9zcihRVAIVUS5-KABuIfwIACBwohUIiAQh_WFDKttmiM0sUrx1Iwlb8h7lFI0iy3xXhNYas0QnwEm9g9QgwrsdnjAoVEHfSAgkQrkn1pU1iPMp0chP4DFMZqnx9SExNByQYoLDNRnLoBIyKVhBFlf6KG9YmCyu3F0VixQ4jZibZP9ZoYm6RbG_TrkUaMjvhdC37X4nJzniotUaOsXbw-3Qjxsttp3AmrdMCuPs3y29ulqhHrFJ-jNuKduynDWkrWvh7mU0_AugH3KKgh17mggX9BvD0690Ln3SD0QG_IdUZ_8kcP26OHXuhhN4g80BtyndGH_uhRe_TICz3qBn0P9IZcZ_Tn_7ORblgs0GQqNXi1mW7f3Cs2FsodVuvNqFxv8UOrbWlTHd9LXTmQaGz1lFWHaVo9KgL-K2ZOMa-J2bWYu50brEOnOnKLo0dy953igdt58Ijzk1M8dDsPH3F-dnfVa_hN3D_Ztff69OlvAAAA__9iiO4Y
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJyslNGr2jAUxt_3V4TzNCFSk9Z7vX3y4nUgeL136mAwZERzcLLadEkKG-L_PtqCrqJpiXsp5KRfvu-XE84BzK8EYhh_fZ8-T2bk48tksVx8nnbIYjwdj5bE5PuyNpmNlkR0aL2w7pBP87dXIoUVQCFVEmdijwbib8CAAgcKIVCIgEIfVhQyrTZojNLFL4dSMJG_Ie5R2KVZbovyisJGaYT4AHZnE4QYlmKd4ByFRB30gIJEK3ZJaVNYD4vP9-wn_gEKI5Xk-9TERFCyBgqLTBSrbsCISCVhRNkfqGF1pKBye_Y0VmwRYnak7XO97IzdpRsb9OuhhowO-U0LftPifHKeKi1Ro6wdvDpeCfG83WrcCqt0wC4uZ_Hl9dysIesU11Er8c7NlGEtJWvfIObXoIB1A-7RooZkpxY9-LeIt4fnnvC8G4Qe8A3JTvCP_vBhe_jQEz7sBpEHfEOyE_zAHz5qDx95wkfdoO8B35DsBP_0fybTFYs5mkylBi8m1PWTe8XkQrnFaswZlesNvmu1KW2q5VupKwsSja12WbWYpNVWEfBfMXOKeU3MLsXc7dxgHTrVkVsc3ZO77xQ_uJ0f7nF-dIoHbufBPc5P7l71Gp6J-5Fdeq-OH_4GAAD__2su8X4=
 
 query T
 EXPLAIN (DISTSQL) SELECT DISTINCT a, b FROM data WHERE (a + b + c::INT) = 27 ORDER BY a,b
@@ -514,7 +514,7 @@ vectorized: true
           table: data@data_pkey
           spans: FULL SCAN
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJy8ll2L2kAUhu_7Kw7nysWROJPEj0Ah7a5Lha1uVWhL8SImw27ATWwSocvify9JwKxfczRmc5nRZ-bNvA-HvGH8d4kWDn49PnwZjqBxN5zOpj8ebmA6eBjcziB9Ho5uZ-AwWMD9ZPwdPCdx4Oe3wWQAjYYDTVjcQBNcyxqOZr0b-AyiC-PJ3WACX39nGDIMQk-OnBcZo_UHOTIUyFBHhgYyNHHOcBWFrozjMEr_8pYBQ-8fWm2GfrBaJ-nynKEbRhKtN0z8ZCnRwpmzWMqJdDwZaW1k6MnE8ZfZMWlOexX5L070igxvw-X6JYitLBIDFxlOV0660NI4OIEHHMLkWUY43zAM10lxaJw4TxItvmHnB7v3l4mMZKSZu6nydQsaDZtDE2yRXp6tv789K39AhuN1YoHNmS1OhhKXhLrz48QP3ETje3eVn8FwHHkykt7xQ4t9Fq_w7MTPx_aYb4ps-slsxVZhfuL-Vk1mi2a-2emXMEu8RJHO-JB0o7AVrjSxe7-nIpg7Efj5qvOSqmu8pYkSshPRtrJ36pSdCFV4wuuXnVcue6dC2cX5pomypomWppcwjYi2Na1bp2lEqKIkUb9ponLTuhWapp9vml7WNL2lGSVMI6JtTevVaRoRqihJr980vXLTehWaZpxvmlHWNKOlmSVMI6JtTevXaRoRqijJqN80o3LT-h_0qXjk0ImMV2EQy7O-ANtpbOk9yfxV43AdufIxCt3smPxxnHHZgifjJP-V5w_DIP8pDfge5kpYqGGxD_P3sL4D88vg3jUwF1fRnWto0VbTuvLCDTVsqNsiujaVdEcNd5RwVw13rxFFDROiqGFKFIImRFHTlCi9a0Tpq2dCmxgKxEihZsrBULmkboIm-iZoqnAKJxoncKpyfjBaLumcq0cLN4jW1MOFmwR-MF0uKl1NU6WrabJ0AqdKV-Nk6erJSpV-MGR2W-sRramnDO8T-MGcuah0NU2VrqbJ0gmcKl2NU6UL9YTdL32--fQ_AAD__7NCg8g=
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJy8lu9r2kAYx9_vr3h4Xlk8iXeJvwKDbK1lQqedCtsYMmJytDKbuOSEleL_PpKAqVrv0ZjmTSFnP3ff3PfDQ14w_rtEG_s_7u8-DYZQuxlMppNvd1cw6d_1r6eQPA-G11NwGczhdjz6Cr6rXPj-pT_uQ63mQh3mV1AHz7YHw2n3Cj6C6MBofNMfw-efKYYMg9CXQ_dJxmj_Qo4MBTI0kaGFDFs4Y7iKQk_GcRgl__KSAgP_H9pNhotgtVbJ8oyhF0YS7RdUC7WUaOPUnS_lWLq-jIwmMvSlchfL9Jgkp5P8-b36I5-R4XW4XD8FsZ2GYuAhw8nKTRYaBgc38IFDqB5lhLMNw3Ct8mNj5T5ItPmGnR7tdrFUMpKR0drNla3bUKs5HOrgiOT6HPP1_dnZAzIcrZUNDmeOOBpKnBPqZhGrReApg-_dVnYGw1Hky0j6bx-a7zN_hkc3fnxrj9kmz2YezZZvFWYn7m9VZ46oZ5sdf4lWgZfI01nvkm4YNsKVIXbv91iE1k4EfrrsvLDsBm8YooDuRLit7u0qdSdC5abw6nXnpeveLlF3cbprorhromGYBVwjwm1d61TpGhEqr0lU75oo3bVOia6Zp7tmFnfNbBhWAdeIcFvXulW6RoTKazKrd80s3bVuia5Zp7tmFXfNahitAq4R4bau9ap0jQiV12RV75pVumu9d_pkfOPQsYxXYRDLk74Em0ls6T_I7FXjcB158j4KvfSY7HGUcumCL2OV_cqzh0GQ_ZQEfA1zLSz0sNiH-WvY3IH5eXD3EpiLi-j2JbRo6mlTe-GWHrb0bRFdt7R0Ww-3tXBHD3cuEUUPE6LoYUoUgiZE0dOUKN1LROnpZ0KTGArESKFmysFQOadugib6JmiqcAonGidwqnJ-MFrO6ZzrRwu3iNb0w4W3CPxgupxVup6mStfTZOkETpWux8nS9ZOVKv1gyOy21iVa008Z3iPwgzlzVul6mipdT5OlEzhVuh6nShf6Cbtf-mzz4X8AAAD__49Ihy4=
 
 query T
 EXPLAIN (DISTSQL) SELECT DISTINCT a, b FROM data WHERE (a + b + c::INT) = 27 ORDER BY b,a
@@ -537,7 +537,7 @@ vectorized: true
               table: data@data_pkey
               spans: FULL SCAN
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJy8ll-L2kAUxd_7KYb75OJInEnin0Ah7a5Lha1uVWhL8SGaYVdwEzsZocvidy8xaNaszjV_yGOiZ-7Jye8e8gbR3zU4MPj1-PBlOCKNu-F0Nv3xcEOmg4fB7YzE18PR7Yx4lCzI_WT8nfie8sjPb4PJgDQaHmmSxQ1pkqXjDEez3g35THiXjCd3gwn5-pssKPGAQhD6YuS9iAicP8CAAgcKJlCwgIINcwobGS5FFIUy_svbXjD0_4HTprAKNlsV355TWIZSgPMGaqXWAhyYeYu1mAjPF9JoAwVfKG-13o-JfbobuXrx5CtQuA3X25cgcvZPQskSKEw3XnyjZTDiBT5hJFTPQsJ8RyHcqnRopLwnAQ7b0euN3a_WSkghDfvUVXLfIY2Gy0iTuDwOzzXfp-ckF0BhvFUOcRl1-UVTPI-pu1WkVsFSGSyTVTKDwlj6Qgr__ND0nMUrefai53NnzHepN_Oit_SoMJmYPapJXd5MDrv8EHaBh0jdWXmSm4ZSCWnwbG68SV3WvDjDLpzA8eAzZkZhK9wY_PTxL1nonFhg168TK7hOBmsZvMBCIdaOC9Wpc6EQUymLrP6FYpUvVKfChUKSOyxUNrdcC8Wvp5kXpZm3DLMAzYi1I83dOmlGTKUg8Ppp5pXT3K2QZiS5A83Z3HLRbF5Ps1mUZrNlWAVoRqwdae7VSTNiKgXBrJ9ms3KaexXSjCR3oDmbWy6aretptorSbLUMuwDNiLUjzf06aUZMpSBY9dNsVU5zv0KakeQONGdzK_zpfmbGRESbMIjEVV_k7Tga4T-JJM4o3MqleJThcj8muRzvdfsbvohU8itLLoZB8lNs8L2YacVcL-ZZMXsvNk_ELJ-4X0bMrFLqUrM5MtvUBm7pA7e0Yls_2da_6o5-dEer7urFXa24pxf3ylCmFyNvWi_GKEPUpWZjlPX1ndBGSkFfKQhnTN8pDCkV9mG_TuUmIv-wYHlwQdTIO0PUGDCYvNx0DBmmLxdmI7nr6wVjRl8vDOkXpi8YhjQMK1UxiBp7a-VKBpOXm44yo-8ZjvQML9UzHPl2wT5e9D3DkZ7hpXoGUWNfIOV6BpOXm44xw_U9w5Ge4fl6Zr779D8AAP__64mJ3g==
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJy8ll9r4loUxd_vp9jsJ4tH4jlJ_BO4kHtbywgd7agwMwwyRHNoZWziJBGmFL_7EIOmpnq2-UNeColdZ6-s_PYibxj-XqOFg2-PD_8NR9C4G05n0y8PNzAdPAxuZxBfD0e3M3AYLOB-Mv4MrhM58PXTYDKARsOBJixuoAlLyxqOZr0b-BdEF8aTu8EE_v8OCwYOMvR8V46cFxmi9QM5MhTIUEeGBjI0cc5wE_hLGYZ-EP_L214wdP-g1Wa48jbbKL49Z7j0A4nWG0araC3RwpmzWMuJdFwZaG1k6MrIWa33Y2Kfdvzn5-aXfEWGt_56--KF1v5ZGCyR4XTjxDdaGgfHc4GDHz3LAOc7hv42SseGkfMk0eI7dr21-9U6koEMNPPUV3LfgkbD5tAEW8Tx2fr7_KzkAhmOt5EFNme2uGhK5DF1twqjlbeMNJ5JK5nBcBy4MpDu-aHpOYtXeHbC53NnzHepN_2it_QoP5mYParJbNFMDrv8EGaBh0jdGXmSm_pBJANNZHMTTWbz5sUZZuEEjgefMTPyW_5GE6ePf8lC58QCv36heOGF0nhLEwVWijB3XKlOnStFmEpp5PWvFK98pToVrhSR3GGlsrnlWilxPc-iOM-ipekFeCbMHXnu1skzYSpFQdTPs6ic526FPBPJHXjO5paLZ_16nvXiPOstzSjAM2HuyHOvTp4JUykKev0865Xz3KuQZyK5A8_Z3HLxbFzPs1GcZ6OlmQV4Jswdee7XyTNhKkXBqJ9no3Ke-xXyTCR34DmbW-FP-DMzJjLc-F4or_oyb8fRSPdJJnGG_jZYysfAX-7HJJfjvW5_w5VhlPzKk4uhl_wUG3wv5kqxUItFVszfi_UTMc8n7pcRc6OUutRsQczWlYEb6sANpdhUTzbVr7qjHt1RqrtqcVcp7qnFvTKUqcXEm1aLKcoIdanZFGV9dSe0iVJQVwrBGVd3CidKhX_Yr1O5Tsg_LFgeXAg18c4INQUMJS83nUKGq8uFm0Tu6nqhmFHXCyf6hasLhhMNw0tVDKGm3lq5kqHk5aaTzKh7RhA9I0r1jCC-XaiPF3XPCKJnRKmeIdTUF0i5nqHk5aZTzAh1zwiiZ0S-npnv_vkbAAD__2EMjUQ=
 
 query T
 EXPLAIN (DISTSQL) SELECT c, d, sum(a+c::INT) + avg(b+d) FROM data GROUP BY c, d
@@ -557,7 +557,7 @@ vectorized: true
               table: data@data_pkey
               spans: FULL SCAN
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJzUl1tv6jgUhd_nV1j7CYRRsJ1wyVM6nc4IiYYOF2mqEaoMsSgSJEwSRqeq-O9HCbRc0nrDSZDgzRi-bO-9lpfIO0T_zcGGh3-eOndtl5T-aPcH_b87ZdJ_6DzcD8iEEo-SaLUoSVIhE9tuu4NmmVSI_H9aGpMK8crkz173kXgyluSvXnf4RH5_TjGg4AeecuVCRWD_CwwocKAggIIJFCwYUViGwURFURAmP3lPgbb3A-wahZm_XMXJ9ojCJAgV2O8Qz-K5AhsGcjxXPSU9FRo1oOCpWM7maZnkIM4ynC1k-AYU7oP5auFHNpGUjOnHwfpLmexVDUak7xFGgvhVhUChp3xPhTZxWMURm24pcXjFMSlxBCWOCaM1hWAV7w4XxXKqwGZrenoDd9NpqKYyDkLDOjy_I6iTjOfOfX5xu4MXd9jplBxRzmyZyVZ_-Fhy2OeKJ6v77tAdpOvDo-6qj9_Iq4xejwoz6nAYrXcd8W872j1q5Qehp0LlHTwsfYqmZ1b7qvZxhyzbNP9sVXyuPgbx0k7atsoHMibqfUhnONa36olz1HODarA02JFy2aIVjV3MYoe7ORKvHf3y69rWQW12-l1jv37XDFY1-KVuG9LCnvPqN3LbWJG3jV33bUPU2962enG3jZ_ueJ7D8bxqiEs5HmlhT_3GjTieF-l4ft2OR9TbOr5RnOPF6Y4XORwvqoZ5KccjLeyp37wRx4siHS-u2_GIelvHN4tzvHm6480cjjerhnUpxyMt7KnfuhHHm0U63rxuxyPqbR3fusw7xBcFeypaBn6kTnpDqCXDV95UbZSKglU4UU9hMEnLbD52Uy7d8FQUb75lmw9tf_NVcsB9mB3DbB_mBzA7D27kgRnLRVu56Jae5tqBC_3AhRY29ZVNLcwRrS0tXdfD9TxG0cOIUfQwZhSERoyC0IhRGtqBN_UDb-YxSkufCTUkFDKRclYq6GksFvQ0mgsIjgUDgiOCs0ywHM6dI3PXJwuiOdNHCzOR4plwOUt0PY2JrqdR0REcEx3BMdH1ucqQYGWZjDlLdH3GMCRkWCZlzhJdT2Oi62lUdATHREdwTHR9wnIkYbn-T9ux6KP1bz8DAAD__z1bJ4g=
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJzUl9tv4jgUxt_3r7DOEwijYDvhkqd0u90VEg1dLtJUI4QCsWg1NGaSMJqq4n8fJdBySesDSpDgpTKGX47P-T5_at4g-jkHG-6-PXRu2i4p_dPuD_r_d8qkf9e5ux2QKSU-JdHypeSRCpnadtsdNMukQrxfs9KEVIhfJv_2uvfE92KP_NfrDh_I348pBhQC5UvXe5ER2N-BAQUOFARQMIGCBSMKi1BNZRSpMPnJWwq0_d9g1yg8B4tlnGyPKExVKMF-g_g5nkuwYeBN5rInPV-GRg0o-DL2nudpmeQgTvJnvPghX4HCrZovX4LIJh4lE_p-tP7CS_aqBiNe4BNGVPwkQ6DQk4EvQ5s4rOKIdb-UOLzimJQ4ghLHhNGKglrG2-NFsTeTYLMVPb6Fm9kslDMvVqFh7XfgCOokA7pxH8dudzB2h51OyRHlzJaZbPWH9yWHfax4srrtDt1But4_6rb65JU8edHTQWFGHQ6j1bYj_mVH20ctAxX6MpT-3sPSp2h6ZrXPah92yLJN849WxcfqfRDjdtK2Vd6TMVHvXTrDsb5UT5yinquqamGwA-WyRSsau5jFDnd9JF47-OXnta292uz428by3DaDVQ1-rvuGNLHjvfqV3DdW5H1jl33fEPU2961e3H3jx3ue5_I8rxriXJ5HmtjRv3ElnudFep5ftucR9TaebxTneXG850Uuz4uqYZ7L80gTO_o3r8TzokjPi8v2PKLexvPN4jxvHu95M5fnzaphncvzSBM7-reuxPNmkZ43L9vziHobz7fO8y7xScGejBYqiORRbwq1ZPjSn8m1UpFahlP5EKppWmb9sZty6YYvo3j9LVt_aAfrr5ID7sLsEGa7MN-D2WlwIw_MWC7aykW39DTXDlzoBy60sKmvbGphjmhtaem6Hq7nMYoeRoyihzGjIDRiFIRGjNLQDrypH3gzj1Fa-kyoIaGQiZSTUkFPY7Ggp9FcQHAsGBAcEZxlgmV_7hyZuz5ZEM2ZPlqYiRTPhMtJoutpTHQ9jYqO4JjoCI6Jrs9VhgQry2TMSaLrM4YhIcMyKXOS6HoaE11Po6IjOCY6gmOi6xOWIwnL9f-0HYo-Wv31JwAA__8DOyru
 
 query T
 EXPLAIN (DISTSQL) SELECT c, d, sum(a+c::INT) + avg(b+d) FROM data GROUP BY c, d ORDER BY c, d
@@ -581,7 +581,7 @@ vectorized: true
                   table: data@data_pkey
                   spans: FULL SCAN
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJzUl11rwkgUhu_3VwznSslInEliba7Sbd1FsLHrB2xZpEQzWEGNO4nLluJ_X5JoNQnO0Q0BvZuMfeZ8vOc90G8I_16CDZ0_33pPXZfUXrrD0fCPXp0MO73O84jMKPEpCbermkc0MrPtrjtq14lGvH_mtSnRiF8nvw36r8T3Io_8PuiP38iv7wlG-oOXzuDwBRTWgS9cbyVCsP8CBhQ4UDCAggkULJhQ2MhgJsIwkPGffCdA1_8X7CaFxXqzjeLrCYVZIAXY3xAtoqUAG0bedCkGwvOF1JtAwReRt1gmYeK0nI1crDz5BRSeg-V2tQ5t4lEypYfEhhsvvmvojHhrnzASRJ9CAoWBWPtC2sRhmmOktVPicM0xKXEMShwTJjsKwTY6JhdG3lyAzXb08gKGgYyE1K1s7o6hUcfUzobg14R4ms-lmHtRIHXWzMehTixBX_pCCt8mh4sn9_3D7Y8-3HGvV3OMeuHKjK-G49eaw35OPD4998fuKDlnkz_mM_0in174mcuEUYfDZHes0Thb4_GpIM07_5RGHa6lj6makW96ksJpM_YX2cpZsRn8pwXGz-nQoI9u3A6rnpmpeJQOc6Q71lmdzUp64AaNYKPz3CwUs9MUQ25lMmOXu5T9f5fqrKHzqnyKlLD3aauMT5EQp6PJ7tWnrAKf5pt-6z7ll7uBl3ADb-hGVW5ASti74aGMG5AQpwPA79UNvAI35Jt-624wLneDUcINRkM3q3IDUsLeDe0ybkBCnA6Aca9uMCpwQ77pt-4G83I3mCXcYDZ0qyo3ICXs3fBYxg1IiNMBMO_VDWYFbsg3_dbdgPznOhDhJliHIlPVuZebcXOEPxdpQ8NgK2fiTQazJEz62U-45MIXYZT-ytKP7jr9KU7wFGZKmKthnofZKWxkYHYd3C4DM16KbpWheVNNG8qGm2rYVKuFaG0p6ZYabinhBzX8UGZQ1DAyKGoYGxSERgZFTWOD0i4zKI_qndBElgKyUrCdUlgq18iN0IjeCI0JjuGI4giOSc4Kq-UazZl6tTATUU29XJiF4IXtcpXoahoTXU2joiM4JroaR0VXb1ZM9MKSyarWRlRTbxn2iOCFPXOV6GoaE11No6IjOCa6GsdE5-oNmxd9svvlvwAAAP__BAFTvQ==
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJzUl99r6kgUx9_3rxjOk5KROJPE2jyl27qLYGPXH7BlEYlmsGWt403i5Zbi_35JotUkOEcJAX0pyaSfOT--53vALwh_LMGGzr8vvYeuS2pP3eFo-E-vToadXudxROaU-JSEm4-aRzQyt-2uO2rXiUa8n4vajGjEr5O_Bv1n4nuRR_4e9Mcv5M_XBCP9wVNnsH8DCivpC9f7ECHY_wEDChwoGEDBBAoWTCisAzkXYSiD-F--EqDr_wK7SeF9td5E8fGEwlwGAuwviN6jpQAbRt5sKQbC80WgN4GCLyLvfZmEidNy4j_T9f_iEyg8yuXmYxXaxKNkRvepDddefNbQGfFWPmFERm8iAAoDsfJFYBOHaY6RVk-JwzXHpMQxKHFMmGwpyE10SC-MvIUAm23p-SUMZRCJQLey2TuGRh1TOxmCXxLiYbEIxMKLZKCzZj4OdWIR-oEvAuHbZH_w4L5O3f5o6o57vZpj1AtHZnw0HD_XHPb9xOOnx_7YHSXP2eQP-cw-yZsXvuUyYdThMNkeajRO1ni4SqZ556_SqMO19DJVM_JNT1I4bsbuIFs5KzaDf7fA-H7aN2jajdth1TMzFY_Sfo50xzqps1lJD1zZkGud52ahmJ2mGHIrkxk736esjE911tB5VU5Fitg5tVXGqUiI4-Fkt-pUVoFT802_dqfy8_3AS_mBN3SjKj8gRez8cFfGD0iI4xHgt-oHXoEf8k2_dj8Y5_vBKOUHo6GbVfkBKWLnh3YZPyAhjkfAuFU_GBX4Id_0a_eDeb4fzFJ-MBu6VZUfkCJ2frgv4wckxPEImLfqB7MCP-Sbfu1-QH7BDkS4lqtQZKo6dXMzbo7wFyJtaCg3wVy8BHKehElf-wmXHPgijNKvLH3prtJPcYLHMFPCXA3zPMyOYSMDs8vgdhmY8VJ0qwzNm2raUDbcVMOmWi1Ea0tJt9RwSwnfqeG7MoOihpFBUcPYoCA0MihqGhuUdplBuVfvhCayFJCVgu2UwlK5RG6ERvRGaExwDEcUR3BMclZYLZdoztSrhZmIaurlwiwEL2yXi0RX05joahoVHcEx0dU4Krp6s2KiF5ZMVrU2opp6y7B7BC_smYtEV9OY6GoaFR3BMdHVOCY6V2_YvOiT7R-_AwAA___bEFcj
 
 # There should be no "by hash" routers if there is a single stream.
 query T
@@ -602,7 +602,7 @@ vectorized: true
               table: data@data_pkey
               spans: [/10 - ]
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJyUkl-r00wQxu_fTzHMVUrm0PzpC7pXW4_1WOhJa5qqBy2HbXYIhTQbdxNRSr-7JEE8VYx6Oc_M8-Q3mT2j-1SiwMX7zWq-TMB7udxm2zerCWwXq8VtBjmBJnDtyVPgQy7EMsmeTcAH9bnwDuCDnsCrdH0PWjUK3r1epAtQ8LENgpjhOdyl690GXjz0OUhYGc2JOrFD8QFDJPwf94S1NTk7Z2wnn_uhpf6CIiA8VnXbdPKeMDeWUZyxOTYlo8DE3Jh6GiGh5kYdy37sQmja5ofJNapgFPGFngSH48GZOpScstJsp8FVPHZrytoeT8p-RcJbU7anyglQBAf6vuW2Vp02DYMbJEy50mwFyNCX8fADCWTkyxmBjAnkDH9HHf4L9bwoLBeqMXYaXkPLmOQMCefJw2Oyzh6T3WrlyXjyizTrpO3u3pNh33x758locrVDh95x-yPY0RX2H66YsqtN5fivzhhc9oSsCx5eijOtzXljTd5_ZijXva8XNLtm6MZDsayGVgf41ByOmqNxczRqDn4y7y__fQsAAP__LrkQJQ==
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJyUkl-Pk1AQxd_9FJN5omE25U9N9D7duta1SZdWoOpGm-aWOyGNlItcMJqm390AMW41or6QzJk5h98wnNF-LlDg4v1mNV9G4LxcJmnyZjWBZLFa3KaQEWgC254cBS5kQiyj9NkEXFBfcucALugJvIrX96BVo-Dd60W8AAUfW88LGZ7DXbzebuDFQ5-DhKXRHKkTWxQf0EfCp7gjrGqTsbWm7uRzP7TUX1F4hMeyaptO3hFmpmYUZ2yOTcEoMDI3ppoGSKi5UceiH7sQmrb5abKNyhlFeKFHwf54cKoOBcesNNdT7yoeuzVl99hXn_gbEt6aoj2VVoAiONCPPZNKddrU926QMOZScy1A-q4Mh09IIANXzghkSCBn-Cdu_3-453lec64aU0_9a2wZkpwh4Tx62EfrdB9tVytHhpPfpFknJdt7R_p98-2dI4PJ1Q4desftjmAHV9h_uWPMtjKl5X86pHfZEbLOefhXrGnrjDe1yfrXDOW69_WCZtsM3XAoluXQ6gAfm_1RczBuDkbN3i_m3eXJ9wAAAP__csEQ0w==
 
 query T
 EXPLAIN (DISTSQL) SELECT sum(a), sum(b), sum(c) FROM data GROUP BY d HAVING sum(a+b) > 10
@@ -623,7 +623,7 @@ vectorized: true
               table: data@data_pkey
               spans: FULL SCAN
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJzMlm9vqkgUxt_vp5icV5qOgRnAP7zCbW3XxGpX7WabXdOgTKyJgneA5DaN3_0GvCmKvXP0osRX_H04Z87zmyd8QPhtCTZ0_n3qtbt9Urnrjsajv3tVMur0OrdjEsarilul6XH68zirkvvh4JF4buSSh-Hg-Yn8-UI88lf7n27_YSshN2RaJf_Hum4IwnSg4Aee6LsrEYL9HzCgwIGCARRMoGDBhMJaBjMRhoFMXvlIBV3vO9g6hYW_jqPk9oTCLJAC7A-IFtFSgA1jd7oUQ-F6QmpJIU9E7mKZlkk6dNZysXLlO1C4DZbxyg9t4lIypWRGiQcURms3uVfTGHF9jzASRG9CAoWh8D0hbeKwG4dT4jBK0qNBiWPCZEMhiKOsrzBy5wJstqHH996ez6WYu1EgNWu_dSe5bvdfXvuD8Wv_uderOFY16fb5seLwzzPj88z8PGPVXHNZvek7eXPDt1wpBpNNtgD-ywVk34n9QHpCCm_vS-lXFEtk-kHh_BrZkWu08mvM-jdOMeB-sYyEFFJjuflvH9jEsTKKbdu-69x2H9s9oDCIIzvhwTGoggbzvMPsB7VgrXE99-bXta292uz4XcR-fxdprKbxC-wjpPsdyOrXuY_YOfcRK38fIQZk-6hewj7ix7PMC7DMa5pxAZaR7neMblwny_ycLPPyWUYMyFhulMCycTzLRgGWjZpmXoBlpPsdo5vXybJxTpaN8llGDMhYbpbAsnk8y2YBls2aZl2AZaT7HaNb18myeU6WzfJZRgzIWG6V_K_-RTNDEa4DPxRH_YnrybCFNxdbZ8IgljPxJINZWmZ7OUh16Q1PhNH2KdtedP3to6TBXTHLi9mumO-J2WniRhExY4XUViF1S63myoEb6oEbSrGprmwqxRzx2lKq62pxvQgoajECilqMgYKoEVAQNQJKQznwpnrgzSKgtNSZoCOhcBApJ6WCWo3FglqN5gIix4IBkSOGs4Ng2Z87R-auThbEc6aOFmYixQ_C5STT1WrMdLUaNR2RY6Yjcsx0da4yJFjZQcacZLo6YxgSMuwgZU4yXa3GTFerUdMROWY6IsdMVycsRxKWq3_a8qZPNn_8CAAA__-5Q_1S
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJzMlttv6kYQxt_7V6zmCXQW2bO2ufjJNIeTIhFIgVSNWhQZvCKoxKa-SI0i_vfKporBpDsgg8ULvvF5Zuf77Sd_QPT3Gmzo_f446PaHrPa9P5lOfh3U2aQ36N1NWZS81dw6z47z_46LOvsxHj0wz41ddj8ePT2yn5-Zx37p_tYf3u8k7Bub19mfia4bkqEOHPzAk0P3TUZg_wEIHARwMICDCRwsmHHYhMFCRlEQpn_5yAR97x-wdQ4rf5PE6e0Zh0UQSrA_IF7Fawk2TN35Wo6l68lQSwt5MnZX66xM2qGT_rxs_pLvwOEuWCdvfmQzl7M5ZwvOPOAw2bjpvYaGzPU9hiyIX2UIHMbS92RoMwe_OYIzBznLjgZnjgmzLYcgifPOothdSrBxy0_vvrtchnLpxkGoWYfNO-l1d_j8MhxNX4ZPg0HNseppt08PNUd8nhmfZ-bnGdYLzeX15u_s1Y1eC6UQZtt8AeJ_F5C_J_GD0JOh9A7elL1FsUTUjwoX14gnrtEqrjHv3zjHgB-rdSxDGWpYmP_ugc0cK-fYtu3vvbv-Q3cAHEZJbKc8OAZX0GBedpjDoBFsNKEX_vl1beugNp6-j7DMPtKwoYkr7CSi_z3Mmre5k_CSOwmr30mEAflOalawk8TpNItSNIuGZlyBZqL_Patbt0mzuCTNonqaCQNymlsV0GycTrNRimajoZlXoJnof8_q9m3SbFySZqN6mgkDcprbFdBsnk6zWYpms6FZV6CZ6H_P6s5t0mxekmazepoJA3KaOxV_s3_RzFhGm8CP5Elf5Ho6bOkt5c6ZKEjChXwMg0VWZnc5ynTZDU9G8e4p7i76_u5R2uC-GIti3BeLAzGeJ26VESOWUlul1B21WigHbqgHbijFprqyqRQLwmtLqW6qxc0yoKjFBChqMQUKoSZAIdQEKC3lwNvqgbfLgNJRZ4JOhMJRpJyVCmo1FQtqNZkLhJwKBkJOGI5HwXI4d0HMXZ0shOeojhY0ieJH4XKW6Wo1ZbpaTZpOyCnTCTllujpXkQhWPMqYs0xXZwwSIYNHKXOW6Wo1ZbpaTZpOyCnTCTllujphBZGwQv3RVjR9tv3p3wAAAP__bKEAxw==
 
 query T
 EXPLAIN (DISTSQL) SELECT avg(a+b), c FROM data GROUP BY c, d HAVING c = d
@@ -644,7 +644,7 @@ vectorized: true
               table: data@data_pkey
               spans: FULL SCAN
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJzMl11r4k4Uxu__n2I4V0pH4kziW6AQ_922K9jY9WXZskgZzWAFm7iTuGwpfvclsfiW7Rw1CrlLJvllnjPPcw76DuGvGdhw--Ox3Wy5pPCl1ev3vrWLpHfbvr3pE_F7UhDkioyKlIzJXbfzQDwRCXLf7Qweyf9PZEyJR742v7fcezIm18QDCn7gSVe8yhDsn8CAAgcKJlCwgEIFhhTmKhjLMAxU_Mp7ArS8P2CXKUz9-SKKl4cUxoGSYL9DNI1mEmzoi9FMdqXwpDLKQMGTkZjOkm1iVc5cTV-FegMKN8Fs8eqHNhGUjGiiEij05iJeKxmMCN8jjATRi1QwXFIIFtFm3zASEwk2W9LDtd1NZ5FUUhmVXWGrdZs4JrkmTnwCXel7yQq7cjgljknj9c9E8GNENCcTJSciCpTB9g7IiQ1ouk_Pbqf_7A7a7YJjFuMzGTwUHBZf3XQGbv_jevdFXtyTt9lx9EZeRPiytxeD4XJTgvlpCZvvLPxAeVJJb-dLyVd0RVZSG-9rZ-si-cfVcysu00yXaRW33eEG4ox13rLcoBTMDV7ee_Pfe1d29maHtw07vW0MVjL4CY2DqFs3TvWSjYOI2M4Uy2njsHM2TjU3jcMPDy_PEF5eMswTwouoW4e3dsnwIiK2feU5DS8_Z3hruQmveXh4zQzhNUuGdUJ4EXXr8NYvGV5ExLavZk7Da54zvPXchNc6PLxWhvBaJaNyQngRdevwNi4ZXkTEtq9WTsNrnTO8jdyEF_kn1JXhPPBDedCv6XJctvQmcnVGYbBQY_mognGyzeq2k3DJgifDaPWUrW5a_upRLHAbZlqY62G-D7Nt2NyB2XFwPQvMeCa6moXmZT1tag_c0sOW3i3E64qWrurhqhau6eFalqDoYSQoehgLCkIjQdHTWFDqWYLS0M-EMjIUkJGCzZTUUDnGboRG_EZozHAMRxxHcMxylhotx3jO9KOFWYhr-uHCKgiemi5Hma6nMdP1NGo6gmOm63HUdP1kxUxPDZld1-qIa_opwxoInpozR5mupzHT9TRqOoJjputxzHSun7D7pg-X__0NAAD__xrc8ZA=
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJzMl9tr4kAUxt_3rxjOk9KROJN4CxTidtuuYGPXy7JlERnNYGVtxk3isqX4vy-Jxet2jhqFvJRkkl_mO_N951DfIPw9BRtufzw26w2X5L40Ot3Ot2aedG6btzddIv6Mc4JckWGekhG5a7ceiCciQe7brd4j-fxERpR45Gv9e8O9JyNyTTyg4CtPuuJFhmD_BAYUOFAwgYIFFErQpzAL1EiGoQriV94SoOH9BbtIYeLP5lG83KcwUoEE-w2iSTSVYENXDKeyLYUnA6MIFDwZick02SZW5cR_BrNf8hUo3Kjp_MUPbSIoGdJEJ1DozES8VjAYEb5HGFHRswygv6Cg5tF65zASYwk2W9DD1d1NppEMZGCUtqUt123imOSaOPEZtKXvJSvsyuGUOCaN1z8SwY8RUR-PAzkWkQoMtnNETmxB3X0auK3uwO01mznHzMdn0nvIOSy-umn13O779faLPL8jb73j8JU8i_B5Zy8G_cW6BPPDEtbfmfsq8GQgva0vJV_RFVna23hXO1sVyd-vBo24THO_TCu_6Q43EGes85blqoKaGby48-b_9y5t7c0ObxyWpnEMVjD4Ca2D6Fu1TvmSrYOI2EwVy2jrsHO2TjkzrcMPjy9PFV9eMMwT4ovoW8W3csn4IiI2neUZjS8_Z3wrmYmveXh8zVTxNQuGdUJ8EX2r-FYvGV9ExKazZkbja54zvtXMxNc6PL5WqvhaBaN0QnwRfav41i4ZX0TEprNWRuNrnTO-tczEF_lF1JbhTPmhPOi_6mJctvTGcnlGoZoHI_kYqFGyzfK2lXDJgifDaPmULW8a_vJRLHATZlqY62G-C7NN2NyC2XFwNQ3MeCq6nIbmRT1tag_c0sOW3i3E65KWLuvhshau6OFKmqDoYSQoehgLCkIjQdHTWFCqaYJS08-EIjIUkJGCzZS9oXKM3QiN-I3QmOEYjjiO4JjlbG-0HOM5048WZiGu6YcLKyH43nQ5ynQ9jZmup1HTERwzXY-jpusnK2b63pDZdq2KuKafMqyG4Htz5ijT9TRmup5GTUdwzHQ9jpnO9RN21_T-4tO_AAAA___evPT2
 
 query T
 EXPLAIN (DISTSQL) SELECT sum(a+b), sum(a+b) FILTER (WHERE a < d), sum(a+b) FILTER (WHERE a = c) FROM data GROUP BY d
@@ -662,7 +662,7 @@ vectorized: true
           table: data@data_pkey
           spans: FULL SCAN
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJzMltFv2joUxt_vX2GdJ1CNgu2EtpEqpbeX3iFR6ALVVm2oMolFkSBmTiKtqvjfpwStBNrZdAaVN2Pyyznf-T4d5RnSHzPwof31tnvZ6aHaf53BcPC5W0eDdrd9NURpPq9xdILGdVw5o-tOd9gOUe3Lp3bYRhx9z5tNFqFY_9QFiuroOuzfoJhnHP0f9u9u0b_3KAYMiYxFj89FCv43IICBAgYGGFzA4MEIw0LJSKSpVMUjzyXQiX-C38QwTRZ5VlyPMERSCfCfIZtmMwE-DPl4JkLBY6GcJmCIRcans7JM0UWwUNM5V0-A4UrO8nmS-ohjNMYowmVjgwUv7hoOQTyJEUEyexQKMIQiiYXyUUBOAopRQFZDCNzifBEwjAIXRksMMs_W7aUZnwjwyRLvLuFyMlFiwjOpHG9TQVBM57J3_9DrDx96d91uLXDrRdN3N7WAVE6_vQjoG3dsq8115fETeuTp41ZRAqPlWgr9o5T1e_JEqlgoEW-8qXyLRixpviq8rXatkb6c2MupnEU_z3wUUBwwrDGE7VdFTzbkwiHe1pNv13Y3apPd80z-Ps8OaTj0cIk2iKiY3Dr2RJN9Jpp8VKLp7qmiFqmiDYcdLlUGEZVBnx57qug-U0U_KlVs91Qxi1SxhuMeLlUGEZVBnx17qtg-U8U-KlXu7qlyLVLlNhzvcKkyiKgM-vzYU-XuM1XuMXzTvdFjKNKFTFKx0xdbs1Ap4olYjSSVuYrErZJRWWb1s19y5UUs0mz1L1n96CSrv4oGqzDZhkkVphsweR_csoHPbWBi1Tfx9DTVzpvpYaY3q6V3y9XSnh72bKzWwwar9bDBaj1sstpAG6xu2Vh9qoXP9Gad2Zilhw1m6WGDWXrYZJaBNph1bmMWMWxR0xq126N2i9Ruk1quUrtdSqyWKTFsU9dg2qt1-i7T9LTJND1tMk1PG00z4CbTXi1VrWmj5T-_AgAA___TVOSq
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJzMlm9r4koUxt_fT3E4r5SOxJmJtg0U0ttr7wpWu9GyW3aljMlgy9qMmz-wpfjdl0S2RtudsYxS38g45pdznvM8HHzG9OcMPex8ve6dd_tQ-687HA0_9-ow7PQ6FyNI88eagCOY1EnlDJfd3qgTQO3Lp07QAQHf82aThxDpnzqDsA6XweAKIpEJ-D8Y3FzDv7cQIcFYRbIvHmWK3jekSJAhQY4EXSTYwjHBeaJCmaYqKR55LoFu9Au9JsGHeJ5nxfWYYKgSid4zZg_ZTKKHIzGZyUCKSCZOEwlGMhMPs7JM0YVffNzNf8gnJHihZvljnHogCEwIhKRsbTgXxV3DoSDiCCio7F4mSDCQcSQTD3x65DMCPl2OwXeL85nPCfgujhcEVZ6tGkwzMZXo0QXZXsT5dJrIqchU4rTWNfjFfM77t3f9weiuf9Pr1Xy3XjR9c1XzaeX0xw2fvXHHN9pcVZ48wb1I7zeKUhwvVlLYX6Ws3pPHKolkIqO1N5Vv0YilzVeFN9WuNLKXE385lbMY5JkHPiM-JxpD-G5V9FVDzR3a2njy7druWm26faKpTaId2nDY_jJtkFGxuX3omaa7zDT9qEyz7XPFrHLFGg7fX64MMiqjPj70XLFd5op9VK749rniVrniDcfdX64MMiqjPjn0XPFd5op_VK7c7XPlWuXKbTit_eXKIKMy6tNDz5W7y1y5h_Df7o0eA5nOVZzKrf65NQuVMprK5UhSlSehvE5UWJZZfh2UXHkRyTRb_kqXX7rx8qeiwSpMN2FahdkaTN8Ht23gUxuYWvVNW3qaaefN9TDXm9XWu-Vq6ZYebtlYrYcNVuthg9V62GS1gTZY3bax-lgLn-jNOrExSw8bzNLDBrP0sMksA20w69TGLGrYoqY1ardH7Rap3Sa1XKV2u5RaLVNq2KauwbRX6_Rdpulpk2l62mSanjaaZsBNpr1aqlrTxot_fgcAAP___aDoEA==
 
 # Same query but restricted to a single range; no local aggregation stage.
 query T
@@ -681,7 +681,7 @@ vectorized: true
           table: data@data_pkey
           spans: [/1 - /1]
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJyUklGLm0AQx9_7KYZ5Srg54mqehINNr14reJoaQ3u04di4iwSMa3dXaAn57kWlXFJa23ub-c_8x984e0L7rcYQo8_rZBWnMHsXb4rNx2QOmyiJ7guw3XEm4Ab2c7qI4SFOiiiH2acPUR6BgK-d5wUlyOmuOyjn8JBnjyCFE_AiM3ifZ9s1vH0CiYSNlioVR2Ux_IIMCX3cEbZGl8pabXr5NDTF8juGHuGhaTvXyzvCUhuF4QndwdUKQ0z1rW4XPhJK5cShHtrOhLpzLybrRKUwDM50MZhNDy7Evla5ElKZhXc1Hvv1eGsOR2F-IOG9rrtjY0MQBHuCkoYtN63otQW7Hehy1UhlQuDshvsEnI3_lC_7-I4HBHyJfwNnrwFfVZVRlXDaLNg1N18i4Sp9ek6z4jndJsmML-c96vZxxtlF9Ou03P-DFiBh1rkQuE88oAls_wr7H4fMlW11Y9V_XdI77wiVrNT4WKzuTKnWRpfDZ8Y0G3yDIJV1YzUYk7gZSz3gpZlNmv1psz9p9n4z785vfgYAAP__cvQaVQ==
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJyUklGLm0AQx9_7KYZ5Srg54mqehIO9Xr024JnUGNqjDWHjDhJqXOuu0BLy3YtKuaS0tn2Rmf_Mf_yN4wnt1xJDjD6u4vtFApM3i3W2fh9PYR3F0UMGtj1OFNzAfkoXMTwu4ixKYfLhXZRGoOBz63lBDnq86w7yKTymyyfQyil4kQW8TZebFbx-Bo2EldGcqCNbDD-hQEIft4R1Y3K21jSdfOqbFvobhh7hoapb18lbwtw0jOEJ3cGVjCEm5tbUMx8JNTt1KPu2M6Fp3YvJOlUwhsGZLgaL8cGZ2pecstLczLyr8ditJ7vHrv7C35HwwZTtsbIhKII9QU79nutaddpM3PZ8KVeamxCkuJE-gRTDV5XzLr6TAYGc45_Qxf-g3xdFw4VyppmJa3I5R8L75HmXLLNdsonjiZxPO9TN00SKi-jncaX_Gy1AwmXrQpA-yYBGsP0r7L-cMmVbm8ryP93SO28JWRc8_C7WtE3Oq8bk_WuGdNn7ekGzdUM1GJJFNZQ6wEuzGDX742Z_1Oz9Yt6eX_0IAAD__8yYGwM=
 
 # Verify the XOR execution plan
 query T
@@ -699,7 +699,7 @@ vectorized: true
           table: data@data_pkey
           spans: FULL SCAN
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJyslNFu2jAUhu_3FNa5KpJRcBIo9VVZxyokVjrgotOEkIePUiSIme1ITIh3n5JsakCtkyi5Iwl_vj_fsc4JzO8dcBi_PE9Hkydy82WyWC6-TztkMZ6OH5bkqPRaRNGNVetXPN6IDueffyzHiw75Op99I1JYARRiJfFJ7NEA_wkMKPhAIQAKIVDow4rCQasNGqN0-pdTFpjII_AehW18SGx6e0VhozQCP4Hd2h0Ch6X4tcM5Cona6wEFiVZsdxkmRd8f9HYv9B-g8KB2yT42nKR9FgeR_ux6jIhYEkaUfUUNFOYYS9Sc_Puce_b_e2B1pqAS-1bFWBEhcHam1euOokhjJKzSXv-y7ctsvh49PqbED1H-h6g3QhIrLVGjvHj96uwuw3r12wQXbVj1ObHac_JY1_NbnlRJ4YKcQdNJ-dXd-PXd-F0vaNlNSeGCm9umboLqboL6boKuF7bspqRwwc2wqZuwupuwvpuw6_VbdlNSuODmrs3t9w5qjuagYoNXW_D9N_fS7YgywnyVGpXoDT5rtckw-eUsy2U3JBqbP2X5xSTOH6UFi2HmDPsXYXYd9t3kEnTgTIfucNikd98ZHrjJgybkW2d46CYPm5Dv3LPqlRwT9yG7Zq_On_4GAAD__1kTGwE=
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJyslF1v2jAUhu_3K6xzVSSj4CRQ6quyjlVIrHTARacJIQ8fpWg0zmxHYkL89ynJpgbUOhnJDSIfb543z4nOAcyvHXAYPz1OR5MHcvVpslguvk47ZDGeju-WZK_0WkTRlVXrZ9xfiQ7nH78tx4sO-TyffSFSWAEUYiXxQbygAf4dGFDwgUIAFEKg0IcVhUSrDRqjdHbLIQ9M5B54j8I2TlKbnV5R2CiNwA9gt3aHwGEpfuxwjkKi9npAQaIV212OydC32c86-Ym_gcKd2qUvseEka7RIRPa36zEiYkkYUfYZNVCYYyxRc_L3hW7ZvzeC1ZGCSu1rGWNFhMDZkdYvPIoijZGwSnv9075Ps_l6dH-fEd9F-e-iXglprLREjfLk8aujuwzr_X-b4KQNqz8pdsGkPNb1_JZnVVG5pGfQdFZ-fTv-JXb8rhe0bKeicsnOdVM7QX07wSV2gq4XtmynonLJzrCpnbC-nfASO2HX67dsp6Jyyc5Nm1vwDdQcTaJig2fb8O0n97ItiTLCYqUaleoNPmq1yTHF4SzP5SckGltcZcXBJC4uZQXLYeYM-ydhdh723eQKdOBMh-5w2KR33xkeuMmDJuRrZ3joJg-bkG_cs-pVfCbuj-ycvTp--BMAAP__N8ceZw==
 
 # Verify the XOR execution plan
 query T
@@ -715,7 +715,7 @@ vectorized: true
       table: data@data_pkey
       spans: FULL SCAN
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJyslEFro0AUx-_7KYZ3amBER02aemroZksg23STHAqLlNnMww0Yx50ZoUvId1_UQ01oR417i5q_v__PN7wj6D8pRDB_eV7OFk_k5utis938WI7IZr6cP2zJm1SvPElu-Ih8W6--E8ENBwqZFPjED6gh-gkMKPhAIQAKIVAYQ0whV3KHWktV_uVYBRbiDSKPwj7LC1PejinspEKIjmD2JkWIYMt_pbhGLlC5HlAQaPg-rTAl-j5X-wNXf4HCg0yLQ6YjUvbZ5Lz86biM8EwQRqT5jQriEwVZmHecNjxBiNiJdq80SxKFCTdSuePzRi-r9evs8fHmno0-Rfmfot4JRSaVQIXi7PXxyV6Gef3bBGdtWPdZsN6zcJnj-ldMo6VU4wNMhk7D7-7v9_f3HTe4wr-lVMP_dqh_0N0_6O8fOG54hX9LqYb_dKh_2N0_7O8fOu74Cv-WUg3_u_-5jT5ArVHnMtN4sZU-frNXbisUCdarTctC7fBZyV2FqS9XVa66IVCb-imrLxZZ_ags2Awza9g_C7PLsG8nt6ADazq0h8MhvcfW8MROngwh31rDUzt5OoR8Z5-V13JM7Ifskh2fvvwLAAD__4NM6_k=
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJyslF1r2zAUhu_3K8S5SkDGlu2kqa8auqwEsqZLclEYJmjRwQtzLU-SoSPkvw_bF3VCK3v2bkL88fp5eY44J9C_U4hg8fy0mi8fyejzcrvbfluNyXaxWtzvyKtUe54kIz4mXzbrr0Rww4FCJgU-8hfUEH0HBhR8oBAAhRAoTCCmkCt5QK2lKl85VYGleIXIo3DM8sKUt2MKB6kQohOYo0kRItjxHylukAtUrgcUBBp-TCtMib4rf_b5L_wDFO5lWrxkOiJlo23Oy7-OywjPBGFEmp-oID5TkIV5A2rDE4SInWn3UvMkUZhwI5U7uez0vN7s5w8Pozs2_hDlf4h6IxSZVAIViovPx2d7Geb9e5vgog3rPg3WYxouc1y_xzxaajUUTIfOw-9uwO9jwHfcoIeBlloNAzdDDQTdDQR9DASOG_Yw0FKrYWA21EDY3UDYx0DouJMeBlpqNQzc_s-t9A5qgzqXmcar7fT-l71ya6FIsF5xWhbqgE9KHipMfbmuctUNgdrUT1l9sczqR2XBZphZw_5FmF2HfTu5BR1Y06E9HA7pPbGGp3bydAj5xhqe2cmzIeRb-6y8lmNiP2TX7Pj86W8AAAD__2uU718=
 
 query T
 EXPLAIN (DISTSQL) SELECT max(t.a), min(t.b), avg(t.c)  FROM (VALUES (1, 2, 3), (4, 5, 6), (7, 8, 0)) AS t(a, b, c) WHERE b > 3
@@ -772,7 +772,7 @@ vectorized: true
           table: data@data_pkey
           spans: FULL SCAN
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJzMlVGL2kAUhd_7K4b7lNCxcZK46w4Ukq5xG3B1G4V2KbKMmSEVYsZORugi_vcS47pVaiLmxTfvvZ6ck-8OmTXkv1OgEPx4GvjhEBm9cDwZfxuYaBwMgvsJYkqx1xeWJAYzUT8aPSLjbVKWnGmGvn8NogAZxgx9RsRE_rCHjLj4_alt7kq-K9Eo6gUR-vKMmAkYMsnFkC1EDvQnEMBgAwYHMLiAoQNTDEslY5HnUhV_WW8FIf8DtI1hni1XumhPMcRSCaBr0HOdCqAwYbNURIJxoaw2YOBCs3m6tSkie0s1XzD1ChjuZbpaZDlFDKMZRjFGHDCMl6zotSyCWMYRQVL_EgqmGwxypd99c80SAZRs8PnZ-vNUCyWU1TkMVvYpMgzPLnBRSsPhpLsj6DklQkppfzDyJ903tJ67H_SC-_DRHxRkRytNkUdOJrZPJn4PKhUXSvDDlB75CNPNf17LTxIlEqalssgRcj-K_OcX_-HB8Ih5MpJzEImcv2By-YIt0rLsC1Zck26_4purWbF9Pk-7AU-7ZTkX8KxJt-d5ezU8nfN5Og14Oi3LvYBnTbo9z-7V8HTP5-k24Om2rM4FPGvS7XneXQ3PmksoEvlSZrk4yHvqye3iey94Isr7IZcrFYsnJeOtTVmOtrptg4tcl1NSFmFWjoqA_4pJpdg-EJNjsV3tXGPtVKrdarHbJHenUnxT7XzTxPm2Utytdu42cb6r3lW75phUH7Jj7-nmw98AAAD__1XcVrc=
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJzMlVGL2k4Uxd__n2K4Twn_sXGSuOsOFJKucRtwdRuFdikiY2ZIpdmMnYzQRfzuJcZ1q9REzIsv4r3X4zn53SGzhvxXChSCb08DPxwioxeOJ-MvAxONg0FwP0FMKfY6Y0liMBP1o9EjMt4mZcmZZujr5yAKkGHM0UdETOQPe8iIi-8f2uau5LsSjaJeEKFPz4iZgCGTXAzZi8iBfgcCGGzA4AAGFzB0YIphqWQs8lyq4ifrrSDkv4G2MSyy5UoX7SmGWCoBdA16oVMBFCZsnopIMC6U1QYMXGi2SLc2RWSv-Jgtf4pXwHAv09VLllPEMJpjFGPEAcN4yYpeyyKIZRwRJPUPoWC6wSBX-t051ywRQMkGn5-uv0i1UEJZncNoZZ8iw_DsAhilNBxOujuGnlNCpJT2ByN_0n2D67n7QS-4Dx_9QcF2tNIUeeRkYvtk4vegUnGhBD9M6ZH_Ybr5x2P5SaJEwrRUFjmC7keR_zzzHx4Mj5gnIzkHkcj5KyZNVmyRlmVfsOSafPsl31zNku3zidqNiNoty7mAaE2-PdHbqyHqnE_UaUTUaVnuBURr8u2Jdq-GqHs-UbcRUbdldS4gWpNvT_TuaojWXEaRyJcyy8VB3lP_3C7e-4InorwncrlSsXhSMt7alOVoq9s2uMh1OSVlEWblqAj4t5hUiu0DMTkW29XONdZOpdqtFrtNcncqxTfVzjdNnG8rxd1q524T57vqXbVrjkn1ITv2nm7--xMAAP__go1aHQ==
 
 query T
 EXPLAIN (DISTSQL) SELECT json_agg(a) FROM (SELECT a FROM data WHERE b = 1 AND c = 1.0 AND d = 1.0 ORDER BY a)
@@ -790,7 +790,7 @@ vectorized: true
           table: data@data_pkey
           spans: FULL SCAN
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJzMlVGPmk4Uxd__n2JynyD_sTiAu-4kTaAru6VxZYsmbdOYzchMqA0ydhiTNsbv3iDWraaCkRffvPd6OIffnTBrKH5kQCH4_Dz0wxEyBuF4Mv44NNE4GAb3E_S9kPkLS1ODmeghjp6QsRuwquRMM_TpfRAHyDBm6C0iJvJHA2Qk5e83XXNX8l2JongQxOjdF8RMwJBLLkZsIQqgX4EABhswOIDBBQw9mGJYKpmIopCq_Mt6Kwj5T6BdDPN8udJle4ohkUoAXYOe60wAhQmbZSIWjAtldQEDF5rNs61NGdlbqvmCqV-A4V5mq0VeUMQwmmGUYMQBw3jJyl7HIojlHBEk9TehYLrBIFf61bfQLBVAyQafn-1hnmmhhLJ6h8GqPkWG4dklLkppOJr0dwQ9p0JIKX0YRv6k_wet5-4Hg-A-fPKHJdlopSnyyMnE9snEr0Gl4kIJfpjSI__DdPOP1_LTVImUaakscoT8wzgavfiPj4ZHzJOJnINE5Pz9ksv3a5GOZV-w4YZ0-w3fXM2G7fN52i142h3LuYBnQ7o9z9ur4emcz9NpwdPpWO4FPBvS7Xn2r4anez5PtwVPt2P1LuDZkG7P8-5qeDbcQbEoljIvxEHeU0_ulp97wVNRXQ-FXKlEPCuZbG2qMtrqtg0uCl1NSVWEeTUqA_4tJrVi-0BMjsV2vXODtVOrduvFbpvcvVrxTb3zTRvn21pxv96538b5rn5X3YZjUn_Ijr2nm_9-BwAA__8YDFYN
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJzMlVGPmkAUhd_7Kyb3CdKxOIC77iRNoCu7pXFliyZt05jNyEyoLcvYYUzaGP97g1i3mgpGXnwx3ns9nsN3J8wKip8ZUAg-Pw79cISMQTiejD8OTTQOhsHtBH0vZP7E0tRgJrqLowdkbAesKjnTDH16H8QBMowZeouIifzRABlJ-f1N19yWfFuiKB4EMXr3BTETMOSSixF7FgXQr0AAgw0YHMDgAoYeTDEslExEUUhV_mS1EYT8F9Auhnm-WOqyPcWQSCWArkDPdSaAwoTNMhELxoWyuoCBC83m2camjOyVH0-LH-I3YLiV2fI5LyhiGM0wSjDigGG8YGWvYxHEco4IkvqbUDBdY5BL_eJcaJYKoGSNT093N8-0UEJZvf1oVZ8iw_DsEhilNBxN-luGnlNBpJTeDSN_0v8L13N3g0FwGz74w5JttNQUeeRoYvto4pegUnGhBN9P6ZHXMF3_57H8NFUiZVoqixxA_zCORk_-_b3hEfNoImcvETl9w6TNhi3SsewzdtyQb7fjq4vZsX06UbsVUbtjOWcQbci3I3p9MUSd04k6rYg6Hcs9g2hDvh3R_sUQdU8n6rYi6nas3hlEG_LtiN5cDNGGuygWxULmhdjLe-yfu-VrX_BUVNdEIZcqEY9KJhubqow2uk2Di0JXU1IVYV6NyoD_ikmt2N4Tk0OxXe_cYO3Uqt16sdsmd69WfFXvfNXG-bpW3K937rdxvqnfVbfhmNQfskPv6frVnwAAAP__PfVZcw==
 
 # Test that orderings on GROUP BY columns are propagated through aggregations.
 statement ok
@@ -852,7 +852,7 @@ vectorized: true
       table: sorted_data@sorted_data_pkey
       spans: FULL SCAN
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJzMll1v2jwYhs_fX2E9R6DXKDgftM0RrGUTEk26QKVWE6oMsSgSxJkdpFYV_31KckBoVzvFYeKshl72bV-3HvEG8vcafBg-3I0HowC1bkaT6eTnuI0mw_HweoooRhv60pq30fcovEWSi4zFTzHNKPoRhfd36NsjoiiMboZR8SdgSHjMArphEvxfQACDDRgcwOACBg9mGFLBF0xKLvJ_eSuAUfwCfhfDKkm3Wf7xDMOCCwb-G2SrbM3Ahymdr1nEaMyE1QUMMcvoal0cU8nVT8VqQ8UrYLjm6-0mkX5-izlgmKQ0X3UsgmgSI4J49swEzHYY-DbbHywzumTgkx2uH26wXAq2pBkXlneYrZ-_QShiJljso2I1CB6fgnD6FNyPx60-aQOG28FDq2-334XZ7z9_Rc9UPn_YerbbB7Y_Dbzfh5dB3u_zf7mR4lak29y19pGdxiMHvMNTixxK-Ox49-B4Ur9_xKB_FulY9hEN1MSruOqdRwNJww0kp2-gXb8CtkkF7I7lHFEBTbzKY12cRwXshitgn74CTv0KOCYVcDqWe0QFNPEqj3V5HhVwGq6Ac_oKuPUr4JpUwO1Y3hEV0MSrPNbVeVTAbbgC7r_9KfKXNBGTKU8kq_Uro5vfh8VLVt5f8q1YsDvBF8Ux5TIsuOKDmMms_JaUi1FSfpUHrMLkPUyqsH0Ak6_BPRP4ygQmRrmJp6Zt5Xs7athRy-qpbblK2lPDnolqNaxRrYY1qtWwTrWG1qjumai-UMKXalmXJrLUsEaWGtbIUsM6WRpaI-vKRBbRTFHdGDWbo2aD1GySGo5Ss1lKjIYp0UxTVyPtwzj9kjQ1rZOmpnXS1LRWmgbXSfswVJXSZrv__gQAAP__pFWB-g==
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJzMlk9v2jAYxu_7FNZ7As0oOH9omxOsZRMSTbpApVYTQoZYtBqNMztIrSq--5TkQGhXO8Vh4kaAn_3Yv0ev8gryzxp8GN7djAejALWuRpPp5Oe4jSbD8fByiihGT_S5tWij71F4jSQXGYvnMc0o-hGFtzfo2z2iKIyuhlHxETAkPGYBfWIS_F9AAIMNGBzA4AIGD2YYUsGXTEou8r-8FsAofga_i-ExSTdZ_vUMw5ILBv4rZI_ZmoEPU7pYs4jRmAmrCxhiltHHdbFNJVe_8nme_mYvgOGSrzdPifTz4ywAwySl-VPHIogmMSKIZw9MwGyLgW-yXQKZ0RUDn2xx_ZSD1UqwFc24sLz9kP38MkIRM8FiHxVPg-B-HoTTeXA7Hrf6pA0Yrgd3rb7dfhNmt_7iBT1Q-fBu6dl2F9j-MPBuHV4GebvO13IhxalIt7lj7SI7jUcOeIenFtmX8NH27t72pH4RSRNFtEjHsg-ooiZnRVrvNKpIGq4iOX4V7fpdsBvpgt2xnAO6oMlZubWz0-iC3XAX7ON3wanfBaeRLjgdyz2gC5qclVs7P40uOA13wTl-F9z6XXAb6YLbsbwDuqDJWbm1i9PogttwF9z_-7ryjzQRkylPJKv1JtLNz8PiFSvPL_lGLNmN4Mtim_IxLLjii5jJrPyVlA-jpPwpD1iFyVuYVGF7Dyafg3sm8IUJTIxyE09N28r7dtSwo5bVU9tylbSnhj0T1WpYo1oNa1SrYZ1qDa1R3TNRfaaEz9Wyzk1kqWGNLDWskaWGdbI0tEbWhYksopmiujFqNkfNBqnZJDUcpWazlBgNU6KZpq5G2rtx-ilpalonTU3rpKlprTQNrpP2bqgqpc22X_4GAAD__0g_lBA=
 
 query T
 EXPLAIN (DISTSQL) SELECT c, min(b), a FROM sorted_data GROUP BY a, c
@@ -869,7 +869,7 @@ vectorized: true
       table: sorted_data@sorted_data_pkey
       spans: FULL SCAN
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJzMlk9v4jwQxu_vp7DmBHqNgvOHtjnR7XZXSDR0gUpbrVBliEWRIGYdR9qq4ruvkhxIgfWkmEOOifPzPDPPo1HeIf29hhDufz4ObwcRaX0dTKaTH8M2mdwP7--mZEHJZpW05m1KOPk2Hj2QVCot4peYa06-j0dPj-TLM-GULIBCImMR8Y1IIfwFDCi4QMEDCj5QCGBGYavkQqSpVPkn7wUwiP9A2KWwSraZzl_PKCykEhC-g17ptYAQpny-FmPBY6GcLlCIheardVGmoqe_VasNV29A4U6us02ShrmyeSlusuX5i47DCE9iwojUr0LBbEdBZnpfO9V8KSBkO1pf3-1yqcSSa6mc4KO8fj6GkYqFEnFIiqfb6PklGk1foqfhsNVnbaDwMIhafbd9dOi1D_TtS87fyCtPX4-qzXb7Htx_9rC_R5baDu_5v7zI0CjrXrhTCqNMh6Tv0b5Li05OO-PV6CpLTvV1sqVIduTWYcHBl6dr-x9qs_qpZXapdVjHcc_ILaKwYmevsbllF84ta0Ru3frZcS2z43Yc74zsIAorI71qbHbcC2fHbUR2vPrZ8Syz43Uc_4zsIAorI71ubHa8C2fHa0R2_PrZ8S2z43ec4IzsIAorI71pbHb8C2fHb0R2kL_gsUi3MklFrT-pbt6yiJeiHFEqM7UQj0ouijLl46jgihexSHV5ysqHQVIe5QKrMDuEWRV2P8Dsc3DPBr6xgZmVbhaYadc4b88Me2azema3fCMdmOHAxmozjFhthhGrzTBmNUIjVvdsrL4ywtdms65tzDLDiFlmGDHLDGNmITRi1o2NWQzZotgatdujdovUbpNarlK7XcqslilDtqmPmHa0Tj9lmpnGTDPTmGlmGjUNwTHTjpaq0bTZ7r-_AQAA__-jlsiE
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJzMlk9v2kAQxe_9FKs5gbrIrP-QxCfSNK2QiEmBSI0qhBa8IqjES-211Cjiu1e2D5g_3XFYH3zDXn47b-Y9jfwOyZ8N-HD_83F4OwhI6-tgMp38GLbJ5H54fzclS0pe11Fr0aaEk2_j0QNJZKxEOA-54uT7ePT0SL48E07JEihEMhQBfxUJ-L-AAQUbKDhAwQUKHswobGO5FEki4-wv7zkwCP-C36Wwjrapyl7PKCxlLMB_B7VWGwE-TPliI8aChyK2ukAhFIqvN3mZkp5-6fd8-1u8AYU7uUlfo8TPJC4KlZMtz150LEZ4FBJGpHoRMcx2FGSq9iISxVcCfLaj1YXerlaxWHElY8s71NnP5jGKQxGL0Cf5023wPA9G03nwNBy2-qwNFB4GQatvt08OnfaRvn3JxRt54cnLSbXZbt-D_d8e9vfIQtvxPZ-LizSNsm7NnVIYpconfYf2bZp3ct4Zp0JXaXSur7MtBbIjtxbzjv55vrZ7UJtVjy-rKb4W61j2BQFGpJZ87TU2wKzmALNGBNiuHiK7rhDZHcu5IESI1NJsrxobIrvmENmNCJFTPUROXSFyOpZ7QYgQqaXZXjc2RE7NIXIaESK3eojcukLkdizvghAhUkuzvWlsiNyaQ-Q2IkTIl_JYJFsZJaLS11Y3a1mEK1GMKJFpvBSPsVzmZYrHUc7lL0KRqOKUFQ-DqDjKBJZhdgyzMmwfwOxjcM8EvjGBmZFu5ulpWztvRw87erN6erdcLe3pYc_Eaj2MWK2HEav1MGY1QiNW90ysvtLC13qzrk3M0sOIWXoYMUsPY2YhNGLWjYlZDNmi2Bo126Nmi9RskxquUrNdyoyWKUO2qYuYdrJOP2SansZM09OYaXoaNQ3BMdNOlqrWtNnu078AAAD__yAt2po=
 
 query T
 EXPLAIN (DISTSQL) SELECT c, min(b), a FROM sorted_data GROUP BY a, c ORDER BY a
@@ -886,7 +886,7 @@ vectorized: true
       table: sorted_data@sorted_data_pkey
       spans: FULL SCAN
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJzMllFv2jAUhd_3K6z7BJpRcBJomye6lk1INOmASqsmVJnEokgQZ7aRViH--5TkgQCtTTETPDrm8z33nqMrViD_zCGA7q_H_m0vRLX73nA0_Nmvo2G3370boRijxSytTeoYUfR9ED0gyYViyUtCFUU_BtHTI_r2jChGMYoG991BcQIMKU9YSBdMQvAbCGBwAYMHGHzA0IIxhkzwmEnJRf6TVQH0kr8QNDHM0myp8s9jDDEXDIIVqJmaMwhgRCdzNmA0YcJpAoaEKTqbF2Uq0jqZmC2oeAMMd3y-XKQyyEVOMIoBwzCj-YeGQxBNE0QQV69MwHiNgS_VprZUdMogIGt8uL7b6VSwKVVcOK1teZ18DJFImGBJgIrTbfj8Ekajl_Cp3691SB0wPPTCWset71169R19m5KTN_RK5etetfF604P7YQ-bd3ipbfedr-VDmkZJ8792uunCO3kXIW_wzCE7VkVLFaCOhzsuLub4vhp_Sw05PLfELrcOaTjuEck1KKwY2r7Y5JITJ5ecJbnu4VlxLbPiNhzviKwYFFZGeHWxWXFPnBX3LFnxDs-KZ5kVr-H4R2TFoLAywuuLzYp34qx4Z8mKf3hWfMus-A2ndURWDAorI7y52Kz4J86Kf_Z_T-8IHDCZ8VSyLW0fvdzMW2TJlJUjkXwpYvYoeFyUKY9RwRUfEiZVeUvKQy8tr3KBVZjswqQKu1sw-RzctoFvbGBipZu09LSrnbenhz29WW29W76Wbunhlo3VethgtR42WK2HTVYbaIPVbRurr7Twtd6saxuz9LDBLD1sMEsPm8wy0AazbmzMIoYtalqjdnvUbpHabVLLVWq3S4nVMiWGbeobTNtbp58yTU-bTNPTJtP0tNE0A24ybW-pak0br7_8CwAA__9k3bxt
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJzMllFv2j4Uxd__n8K6T6C_UXASaJsnupZNSDTpgEqrJoRMYlE0GjPbSKsQ331K8kCA1qY4E7xhm5997j1HV1mD_L2AALo_Hvu3vRDV7nvD0fB7v46G3X73boRijF7naW1ax4iir4PoAUkuFEsmCVUUfRtET4_oyzOiGMUoGtx3B_kKMKQ8YSF9ZRKCn0AAgwsYPMDgA4YWjDEsBY-ZlFxkf1nnQC_5A0ETwzxdrlS2PcYQc8EgWIOaqwWDAEZ0umADRhMmnCZgSJii80X-TElap_R7svzF3gDDHV-sXlMZZGqnGMWAYbik2UbDIYimCSKIqxcmYLzBwFdqK0IqOmMQkA0-XujtbCbYjCounNauzk7Wj0gkTLAkQPnqNnyehNFoEj71-7UOqQOGh15Y67j1g0Ovvqdv--T0Db1Q-XLw2nizrcH9sIbtPbzQtn_P_8VFmkJJ859Wuq3Cq7yKkDf40iF7VkUrFaCOhzsuzvv4vhp_Rw05PsCkogA7pOG4J0TYILXkbPtiI0wqjjA5S4Td40PjVhUat-F4J4TGILXUy6uLDY1bcWjcs4TGOz40XlWh8RqOf0JoDFJLvby-2NB4FYfGO0to_OND41cVGr_htE4IjUFqqZc3Fxsav-LQ-Gf_wnpH4IDJJU8l29H20c3NrESWzFjREslXImaPgsf5M8Uyyrl8I2FSFaekWPTS4igTWIbJPkzKsLsDk8_BbRv4xgYmVrpJS0-72n57etjTm9XWu-Vr6ZYebtlYrYcNVuthg9V62GS1gTZY3bax-koLX-vNurYxSw8bzNLDBrP0sMksA20w68bGLGKYoqYxajdH7Qap3SS1HKV2s5RYDVNimKa-wbSDcfop0_S0yTQ9bTJNTxtNM-Am0w6Gqta08ea_vwEAAP__cHDOgw==
 
 query T
 EXPLAIN (DISTSQL) SELECT b, max(c) FROM sorted_data@foo GROUP BY b
@@ -906,7 +906,7 @@ vectorized: true
           table: sorted_data@foo
           spans: FULL SCAN
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJyUklFr2zAQx9_3KcT_KQGVxHb34idnXTYyXDtLUmgZISjWzRgcnyfJ0BHy3YftsTUFe-vjnfS7_--QzrA_SoRYPq7jxSoRk4-r7W77NZ6K7TJe3u3EUYqTep5kU_Fpk94Ly8aRPmjlVPSdWXzepA9r8eFJHCFRsaZEncgi_AYPEu-xl6gNZ2Qtm7Z97i6t9DPCuURR1Y1r23uJjA0hPMMVriSESPiG61kACU1OFWV37SLBjfsLWadyQnh7kS8Ge-ODd-pY0oaUJjObX43Hq-0gccdlc6psKJTsVtzWqq1uIJE2LhSRhyEp7y1SX7iofjt5w061KU7K_PwT7ssoGMz335K_yHNDuXJsZv51ftT6pEaTId3tK7FIng5JujskD3E8ibwpJO4Xj5PInw7KBFcy_3j6DdmaK0v_9fbzy16CdE7997LcmIzWhrMupi_TjusamqzrT2_7YlX1R63gS9gbhf1x2B-Fg3E4GIXnr-D95d2vAAAA__-gfDdx
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJyUks9q20AQh-99iuV3smGDLSm96CQ3dYuLIrm2AwnFmLV2Kkxljbq7ghTjdy-SSmsHpCa3nT_f7DcwJ9ifBULMH5fxbJGI0cfFerP-Go_Feh7P7zZiL8VRPY-ysfi0Su-FZeNI77RyKvrOLD6v0oel-PAk9pAoWVOijmQRfoMHiffYSlSGM7KWTZM-tU0L_YxwKnEoq9o16a1ExoYQnuAOriCESPiGq0kACU1OHYq27SzBtfsHWadyQnh7lheDveHBG7UvaEVKk5lMr8bjxXaQuOOiPpY2FEq2K64r1UQ3kEhrF4rIQ5-U9xapL3wo_zh5_U4X7131g379tfBlFPSK-G8RmeW5oVw5NhP_WiRqxFKjyZBuF5eYJU-7JN3skoc4HkXeGBL3s8dR5I97ZYIrmf_cwIpsxaWlVx3B9LyVIJ1Td2eWa5PR0nDWftOFacu1CU3WddXbLliUXakRvIS9Qdgfhv1BOBiGg0F4-gLent_9DgAA__8TijsP
 
 query T
 EXPLAIN (DISTSQL) SELECT * FROM (SELECT a, max(c) FROM sorted_data GROUP BY a) JOIN (SELECT b, min(c) FROM sorted_data@foo GROUP BY b) ON a = b
@@ -940,7 +940,7 @@ vectorized: true
               table: sorted_data@foo
               spans: FULL SCAN
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJzMl1Fv4jgQx9_vU1jzBLdGwU6gFGklenu9EysKvbYr7eqEKkNcigQx5wRpV1W_-ymkJwIBT4zpbd42IT97Jvn9d-oXiP9ZQBeuv94OrvpDUvu9f_9w_9egTu6vB9efHsiv5I-70Q2pvV0KSpbie21az27HSicyfAxFIsifd6Mvt-S3b0TUyedRutYbM6FkOY8OMb0npbbcpE5GQyLIRzIBCpEK5VAsZQzdv4EBBQ4UfKAQAIUWjCmstJrKOFY6feRlA_TD79BtUphHq3WS3h5TmCotofsCyTxZSOjCg5gs5J0UodReEyiEMhHzxWabfGkrPV8K_QMofFKL9TKKu2nzU6BwvxLpVcNjREQhYUQlz1LD-JWCWifbjeNEzCR02SstX9zVbKblTCRKe63d2nrpOxjpUGoZdsnm6mr47XE4engcfhkMaj1WBwo3V19rPV7fK2a7_uQHeRbxc2Hp8eu2YH604O06Kitkf50P2UKGrljzZ7Xlu7VFt0-to0PPHez8RuqZ_KzmkdQe6-yuu5BPSa3HPtQ_6vnsOftn-jLWSfoiaI_Tnk97wVGxLko0ZFHqUDXUyuP-3pOH9-7s7M3KJ445JM5jDY-fkDmkvJyd7Wpkjp05c6wambNu6wyZu3zPzPHy3nMX73nD80_wHikvZ8hFNbznZ_aeV8N767bcvefN9_TeL--97-K93_CCE7xHyssZ0qmG9_6Zvfer4b11W2fwnr2n90F57wMX74OG1zrBe6S8nCGX1fA-OLP3QTW8t9CEtY578qTUniOT3Olza_FROwKbqtIA_VdUu4y82e5pgI4W0DpRT3ba3yP9ofOHbLv5eYb_wPj_dUg8UMidjFcqimWpI2AzbUWGM5m9nVit9VTeajXdbJNdjjbc5kYo4yT7lWUX_Sj7KS0wD7N9mOVhvgMzO_jCBWbMiW450Zdmmhtp3wXuuMAM-VwI3XahOdK2b5Q0MMOBEeaBWfGWkW6b4bZLPswwkg8zjOUDoZF8IDSSjwuXfJhhJB9mGMsHQiP5MNNYPjou-bg0T4AmMgIKA8RqBphpbAiYaXQKIDg2BhAc8ZyZxwjyxREaMR2hMdUxHHEdwTHZWWGW2NjOzLOEIeOAFaaJle5mGtPdTKO6IzimO4JjuhcGqZXuZhrT3UyjuiM4prsZR3UvjFMr3QuDZVf3DqJ7YbJY6W6mMd3NNKo7gmO6Izime2GqWulupjHdzTSqO4JjuptxTHduPpBy5ETKC7NlF-cIbnM645Z0x4ne-2zWeNsJ51jrdke08esv_wYAAP__wv1K7A==
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJzMl1Fv4kYQx9_7KVbzBL1FZteGEEsnOb2mFSdiUuCkO1UIGbwBVPBS20h3ivjulXEqDIYdFjut3zD4t55Z__6Z7CtEf6_Ahsevz72Hrktqv3aHo-EfvToZPvYeP43Iz-S3Qf-J1N4uPUrW3vfarJ5-HckwFv7E92KP_D7of3kmv3wjXp187idrvTFTStbL4BzjvEh54KZ10neJRz6SKVAIpC9cby0isP8EBhQ4UDCBggUUWjCmsAnlTESRDJNbXvdA1_8OdpPCMths4-TrMYWZDAXYrxAv45UAG0bedCUGwvNFaDSBgi9ib7naPyZbWubzZPOX-AEUPsnVdh1EdrILM6Aw3HjJVcNgxAt8woiMFyKE8Y6C3MaHCqLYmwuw2Y5eX-XDfB6KuRfL0GgdF-kkm9EPfREK3yb7qwf328Ttjybul16v5rA6UHh6-FpzeP2kmMP60x9k4UWL3NLj3aFgfrHgwzoyLeR0nQ_pQoquWPP_asss1hY93LUNzt13tvMnEc7FZ7kMRGiwzvG6K_ES1xz2of4xXM4X6cdkM7ZxshHU4dQxqWNdFOvuioY0SnVlQ24Mbp7cef7ZnaNns-ujx8qInsEaBr8hfEidGU3b1QgfKzl8rBrh026rhPDdv2f4-PUB4KUEgDcM84YAIHVmVLmrRgB4yQHg1QiAdlvFA8Cb7xkA8_oAmKUEwGwY1g0BQOrMqNKpRgDMkgNgViMA2m2VEAD2ngGwrg-AVUoArIbRuiEASJ0ZVe6rEQCr5ABY1QiAhi-sdVmYFylPHJlmTqgHnS_aYelUlSTp36LaWhanZSSRulhJ60ZP2W3_qnTdwm-0XUzUEv6k8f_qRHmmkIGINjKIxFXnxWbSivDnIt2dSG7DmXgO5Wz_mPSyv-f2X_giitNfWXrRDdKfkgKzMDuFWRbmRzDTg--KwIwVoluF6Hs1zZW0WQTuFIEZ8roQul2E5kjbplJSSw1bSphbasVbSrqthttF8qGGkXyoYSwfCI3kA6GRfNwVyYcaRvKhhrF8IDSSDzWN5aNTJB_36gnQREZAboBozQA1jQ0BNY1OAQTHxgCCI54z9RhB3jhCI6YjNKY6hiOuIzgmO8vNEh3bmXqWMGQcsNw00dJdTWO6q2lUdwTHdEdwTPfcINXSXU1juqtpVHcEx3RX46juuXGqpXtusBzr3kF0z00WLd3VNKa7mkZ1R3BMdwTHdM9NVS3d1TSmu5pGdUdwTHc1junO1QdSjpxIeW62HOMcwXVOZ1yT7hSiT16bNt4uhHOsdb0j2nj30z8BAAD__7ytYKA=
 
 # Verify that the stages preserve the ordering as expected.
 query T
@@ -960,7 +960,7 @@ vectorized: true
           table: data@data_pkey
           spans: FULL SCAN
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJzMllFv2j4Uxd__n8K6T6AaBTuB0jyFf0snJEq6QKVVE6pcYlEkiJkdpFZVv_uUZBsBVpvidOKNmPyuz73n6CqvoH4swIfet9tBtz9Etav-aDz6OqijUW_QuxwjtV7WnuvoOgpvUO3XGcPo0fevB2F33EFnaIq6I_RcvBKzlNXRlyi8u0X_3yOGwuiqF-U_AUMiYj5kS67A_w4EMFDA4AIGDzC0YIJhJcWUKyVk9sprDvTjZ_CbGObJap1mxxMMUyE5-K-QztMFBx_G7HHBI85iLp0mYIh5yuaL_JpMUbCS8yWTL4DhUizWy0T5eRMYTQHDaMWyg4ZDEEtiRJFIn7hUgCHiScyljwL3LKC_O8YoIDB5wyDW6UaRStmMg0_e8OGqu7OZ5DOWCum0tkUH2WBCGXPJYx_lT93h_cMwHD8M7waDWkDrmfC7m1pA6jtiNvUfX9ATU087pTPxG8H0XcGbOqIQslvnrCik6Yo09-4ut0X22iJ_2qK7bW0ku5VLHoqGWDlkx4Rwneazf0-Ht6WDHJ5QcmRCHdJwaJ5RUmS0gogaZJfMbJ9GREnFESWfH1F6eDTosdGgDcetOBoG2aUhnp9GNGjF0aCfHw338Gi4x0bDbThexdEwyC4NsXMa0XArjob7-dHwDo-Gd2w0vEb-5WEbB4PU0uAuTiMOXsVx8P7td85f1ERcrUSi-JaQ9yo3s354PONF_0qs5ZTfSjHNrykew5zLD2Ku0uJfUjz0k-KvTGAZJrswKcN0CyYfg9s28IUNTKx0k5aeptp5u3rY1ZvV1rvlaemWHm7ZWK2HDVbrYYPVethktYE2WN22sfpcC3f0ZnVszNLDBrP0sMEsPWwyy0AbzLqwMYsYtqhpjdrtUbtFardJLVep3S4lVsuUGLapZzBtb51-yDQ9bTJNT5tM09NG0wy4ybS9pao1bfL2388AAAD__wG6nyA=
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJzMllFv2jAUhd_3K6z7BKpRsBMozVNYSyckSrpApVUTqlxi0Wo0ZnaQWlX971OSbQRYbYrDxAsiTr6bc-85usorqJ9z8KH37XrQ7Q9R7aI_Go--Dupo1Bv0zsdILZ9qz3V0GYVXqPb7jGF07_uXg7A77qATNEXdEXouHolZyuroSxTeXKPPt4ihMLroRflfwJCImA_ZE1fgfwcCGChgcAGDBxhaMMGwkGLKlRIye-Q1B_rxM_hNDI_JYplmxxMMUyE5-K-QPqZzDj6M2f2cR5zFXDpNwBDzlD3O89dkioLs527xg78AhnMxXz4lys_bwGgKGEYLlh00HIJYEiOKRPrApQIMEU9iLn0UuCcB_dMzRgGByRsGsUxXmlTKZhx88oZ3192dzSSfsVRIp7UuO8hGE8qYSx77KL_qDm_vhuH4bngzGNQCWs-E31zVAlLfELOqf_-CHph62CidiV8Jpu8KXtURhZDNOidFIU1XpLn17nJbZKst8rctutnWSrJbueShaIiFQzZMCJdpPvv3dHhrOsjuGSV7Z9QhDYfmKSVFSisIqUF4yc72cYSUVBxScviQ0t3DQfcPB204bsXhMAgvjfH0OMJBKw4HPXw43N3D4e4fDrfheBWHwyC8NMbOcYTDrTgc7uHD4e0eDm__cHiN_AvENhAGsaXRnR1HILyKA-H93--df6iJuFqIRPE1Ie9Vbmb98HjGi_6VWMopv5Zimr-muAxzLj-IuUqLu6S46CfFrUxgGSabMCnDdA0mH4PbNvCZDUysdJOWnqbaebt62NWb1da75Wnplh5u2Vithw1W62GD1XrYZLWBNljdtrH6VAt39GZ1bMzSwwaz9LDBLD1sMstAG8w6szGLGLaoaY3a7VG7RWq3SS1Xqd0uJVbLlBi2qWcwbWudfsg0PW0yTU-bTNPTRtMMuMm0raWqNW3y9ulXAAAA__-L2qKG
 
 query T
 EXPLAIN (DISTSQL) SELECT sum(x) FROM (SELECT a, b::float + c AS x FROM data) WHERE a > x GROUP BY a ORDER BY a
@@ -982,7 +982,7 @@ vectorized: true
               table: data@data_pkey
               spans: FULL SCAN
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJzMlttv2jAUxt_3V1jnCVSjYCfc8hTW0g2Jki5QbdWGKpdYFAkIc4JEVfV_n5KsXMLqwyWdeAMnP5_P_r5zlBcIf0_AhtaP206z3SWFq3av3_vWKZJeq9O67JNwMS0si-Tac29I4e-aoOTRtq87brNfJxdkSJo9skxf8UUkiuT715bXIoL8WpTLpiRL8sVz727J53siiOtdtbzkJ1CYBb7siqkMwf4JDChwoGACBQsoVGBAYa6CoQzDQMWvvCRA21-CXaYwns0XUbw8oDAMlAT7BaJxNJFgQ188TqQnhS-VUQYKvozEeJKUiSU6czWeCvUMFC6DyWI6C-3kVJQMgUJvLuKFksGImPmEkyB6kioECp6c-VLZxDEvHP52BZQ4DAavFIJFtFYURmIkwWavdH_V1-NJJJVURmVbcrpuE4e_XammIj-kYnM0UnIkokAZLHNPTuyFq3yppB-XBgrN7v1D1-0_dO86nYLDi_Fd3d0UHFbMqFkXeHwmTyJ8ymwdq18rNt9VvN4nSIVk97lIN9Idq7JTe_NYbOdYbHUsnj3WWrKVu-RuUArmBs-Y4C6i5O7f01HZ0sH2bwp2ZFMYrGTwpC1Y2hY5dAUie9UV1dy6Aqm4GR92Hl3Bcu6K6sd3Bd8_jfzYNPKSYeacRkT2Ko213NKIVNy0jZ9HGnnOaax9fBrN_dNoHptGs2RYOacRkb1KYz23NCIVN20zzyONZs5prH98Gq3902gdm0arlHxHnppAROoqgY3cEohU3LTKOo8EWjknsPF_v1n_ocaT4TyYhXJLyHs7l-PzSH8k0_OHwUIN5a0KhkmZ9K-bcMmCL8MofcrSP-1Z-igWuAkzLcz1MM_CbBM2t2B2GFw_BWb8JLp6Cs3LetrUXrilhy29W4jXFS1d1cNVLVzTw7VTgqKHkaDoYSwoCI0ERU9jQamfEpSGfiaUkaGAjBRspuwMlUPsRmjEb4TGDMdwxHEExyxnO6PlEM-ZfrQwC3FNP1xYBcF3pstBputpzHQ9jZqO4Jjpehw1XT9ZMdN3hsy2a3XENf2UYQ0E35kzB5mupzHT9TRqOoJjputxzHSun7BZ0wevn_4EAAD__6UBxH0=
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJzMlttv4jgUxt_3r7DOE6hGwU645SlsS3eRKOkGqp1qBlUpsSgaihknSFRV__dRkimXZOrDJR3xUhUnP5_P_r5zlFcIf8zAhs6X21672yelq-5gOPivVyaDTq9zOSTh8rm0KpNrz70hpV9rPiWPtn3dc9vDJrkgY9IekFX6SuBHfpn8_2_H6xCffFtWq6YgK_KP597dkr_viU9c76rjJf8ChbkMRN9_FiHYX4EBBQ4UTKBgAYUajCgslByLMJQqfuU1AbrBCuwqhel8sYzi5RGFsVQC7FeIptFMgA1D_3EmPOEHQhlVoBCIyJ_OkjKxRCf-87D4Ll6AwqWcLZ_noZ2ci5IxUBgs_HihYjDizwPCiYyehAqBgifmgVA2ccwLh79fAiUOg9EbBbmMNprCyJ8IsNkb3V_39XQWCSWUUdsVna7bxOHvl6qpyA-p2J5MlJj4kVQGy9yUE7vhqkAoEcSlgUK7f__Qd4cP_bter-TwcnxXdzclh5UzajYFHl_Ikx8-ZbaO1W8Umx8q3uwjUyHZfS7SjXTHquVqbx-L5Y7F1sfi2WNtJFuFS-7LilwYPGOCu4ySu_9IR21HB9u_LdjRbWGwisGTxmBpYxTQF4jwdV_UC-sLpOJ2gNh59AUruC_qn98XfP888uPzyCuGWXAeEeHrPDYKyyNScds4fh555AXnsfH5eTT3z6N5fB7NimEVnEdE-DqPzcLyiFTcNs48jzyaBeex-fl5tPbPo3V8Hq1K8j15agYRsesMtgrLIFJx2yzrPDJoFZzB1p_9dv2NGk-ECzkPxY6Qj3auxucRwUSk5w_lUo3FrZLjpEz60024ZCEQYZQ-ZemP7jx9FAvchpkW5nqYZ2G2DZs7MDsMbp4CM34SXT-F5lU9bWov3NLDlt4txOualq7r4boWbujhxilB0cNIUPQwFhSERoKip7GgNE8JSks_E6rIUEBGCjZTckPlELsRGvEboTHDMRxxHMExy1lutBziOdOPFmYhrumHC6sheG66HGS6nsZM19Oo6QiOma7HUdP1kxUzPTdkdl1rIq7ppwxrIXhuzhxkup7GTNfTqOkIjpmuxzHTuX7CZk0fvf31MwAA__8Susfj
 
 # Ensure that an interesting input ordering that causes an ordered group by
 # forces an ordered synchronizer. We create an index on b even though it's
@@ -1075,7 +1075,7 @@ vectorized: true
       table: data2@data2_pkey
       spans: [/1 - /1]
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJzMVO-Lm0AQ_d6_YplPSbuH2c2PglAwvdpW8DRVw_UoEja6eAHj2t0Vehz534t6EJPmvMu1lPs4zr6Z9948vAf1MwcT7O8Ld-54aPDJCaPwmztEoe3alxFaY5SIqtCDt0P0OfCvUMo0o-j6qx3YiKEPiKAvgb9coI83aA0YCpFyj225AvMHEMBAAcMUYgylFAlXSsi6dd88dNJfYI4wbIqy0u1nvdE5BxOqQsiUS54ChpRrtsnrfryLMSRCcjD3Tz1xIUpjdvQQg6j0w9gYg9Is42BOdrizmnRWnxgcsXXOA85SLo3RwXhoXLBKudkyeQcYLkVebQtlIoYbG8KS1ZVBLgxi1Db4lTaRReExYuQcYvMskzxjWkiDHvKyml2tcyZqqrl3s_L8aOUtXXdgkWHN1l960Srwr8PB8IjRfsn6Dt0ydfvH_OYGD6zpo6z3c07dESzyDk4esyNt8hJp4fJq5XjRwKLHyvasxwes6fNDQF4YgjoG9OwQPEGs49T4FYWA_tsQTP9PCEb9XgdclaJQ_Fn_mFEtiacZby1QopIJX0iRNGva0m9wzYeUK91237eFU7StmmAXTHrBtB9Mj8GkCx4fgMl54Fk_eNxLe9QPnvSCp_2ap3-juR_8hObZWZrj3ZvfAQAA__8KfWZL
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJzMVGFr2zAQ_b5fIe5Tsqk4UpoMDANnXbYFUjuzHboyQlDiww1zLU-SYaXkvw_LhThZ6jbdGPtiOJ3e3XtPD9-D_pGBC-Ovs-lo4pPOh0kUR1-mXRKNp-OLmKwoWcsyN53XXfIxDC5JIozg5OrzOBwTQd4RRj6FwXxG3l-TFVDIZYK-uEUN7jdgQIEDhQEsKBRKrlFrqarWvb04SX6C26OwyYvS1MdmYzIEF8pcqgQVJkAhQSM2WdVfbBcU1lIhuLurvjyThTM8uEhBluZh7IKCNiJFcM-3tLGaNVYfGRyLVYYhigSV09sbD9YFz36XxXe8AwoXMitvc-0SQa0TUSGqymFnDnMqJ4LSuMTj8Bg3dgq3UZoqTIWRyuH71Dy7qzbPJbYa-ddLP4iX_nw67XisW7EN5n68DIOrqNM9YLRbsrojN0Lf_DbfPsMDa_4o692cY08JHnsDR9-zIe38JdKi-eVy4scdjx8q27Hu77Hmz88Be3kOqiTwk3PwBLeGWf3_KAf87-Zg8G9y0Gv3OkRdyFzjs_40vUoSJinWFmhZqjXOlFzbNXUZWJw9SFCbuvu2LiZ53aoINsGsFczbwfwQzJrg_h6YnQYetoP7rbR77eDzVvCgXfPgTzS3g5_QPDxJ82L76lcAAAD__3_LaAs=
 
 statement ok
 CREATE TABLE uv (u INT PRIMARY KEY, v INT);
@@ -1102,4 +1102,4 @@ vectorized: true
           table: data@data_pkey
           spans: FULL SCAN
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJzMlltv2koUhd_PrxjtJ9AZZGZsbpaORE5CK1JiUy5SowpFDh4RWvBQX6JGEf-9sl0VY8psHAjizcb5ZtbMWnsprxD8WIAJnS_93lXXIqWb7nA0_Nwrk2Gn17kekSBalp7L5MPAviOuEzqka1mdAenZ9qdxn9zaXYtEz8S2SMkh_5GoTD4O7HGf_H9PImIPbjqD5BEoeNIVlrMUAZhfgQEFDhR0oGAAhRpMKKx8ORVBIP34T14ToOv-BLNKYe6tojD-eUJhKn0B5iuE83AhwISR87gQA-G4wteqQMEVoTNfJNvEgtsrf750_BegcC0X0dILTOIAheHKiR8rGiOO5xJOZPgk_AAmawoyCjf7BaEzE2CyNT1c062ce78l1bYlRc8ZQT0pv0cr8k3OPSI9k7Tje7GjMH6ibU7b-l45vIicq9nMFzMnlL7GclfUjm2wfVf4wjVJ8nZl3T9Y9ujBGvd6pTYvx5c1viu19XJOzWaDxxfy5ARPuaUZTNYbxfpexZt1ZCokv86_6UKqY9V29s4ei-0ci_05Fs8fayPZOLlkS1bkSuM5E1LL-V4dtS0d7PB5YIXnQWMVjScTwdKJOHAgEFGZgaifYyAQOdnksMsYCHbigai__0Dww4PIiweRVzT9DUFERGWC2DhHEBE5Wcf4ZQSRnziIjfcPon54EPXiQdQrmvGGICKiMkFsniOIiJysY_plBFE_cRCb7x9E4_AgGsWDaFS02oHhQ4Rkwtc6R_gQOVmXjMsIn3Hi8LXO-__pX9QMRLCSXiC2hOxbuRqfR7gzkZ4_kJE_FX1fTpNt0lc74ZIfXBGE6VeWvnS99FMsMAszJczVMM_DLAvrWzArBjePgRk_iq4fQ_OqmtaVF26oYUPtFuJ1TUnX1XBdCTfUcOOYoKhhJChqGAsKQiNBUdNYUJrHBKWl7oQqUgpIpWCdslMqRexGaMRvhMYMx3DEcQTHLGc71VLEc6auFmYgrqnLhdUQfKddCpmupjHT1TRqOoJjpqtx1HR1s2Km75TMtmtNxDV1y7AWgu_0TCHT1TRmuppGTUdwzHQ1jpnO1Q2bN32y_udXAAAA___HxMQL
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJzMlttv4kYYxd_7V4y-J1AHmRmbm6VKThNakRKbcpEaVShy8IjQEA_1BW0U8b-vbO8uxizzcQviJbIhv5kzc853xAeE_8_BhPY_ve5Nxyalu85gOPi7WyaDdrd9OyRh_FZalskffeeBeG7kko5tt_uk6zh_jXrk3unYJF4SxyYll_xG4jL5s--MeuT3RxITp3_X7qePQMGXnrDdNxGC-S8woMCBgg4UDKBQgzGFRSAnIgxlkPzLRwp0vC9gVinM_EUcJR-PKUxkIMD8gGgWzQWYMHSf56IvXE8EWhUoeCJyZ_N0m0Swlfx5WryKd6BwK-fxmx-axAUKg4WbPFY0RlzfI5zI6EUEIYxXFGQcrXcMI3cqwGQrur-qeznzv4mqbYqKl1a8_C6oK-VrvCD_yZlPpG8SK7kZJ46SJ2pxauk75fBD5NxMp4GYupEMNFa4JCsxwgk8EQjPJOnbjf34ZDvDJ3vU7ZYsXk4ua_RQsvRyQc16g-d38uKGL4WlGYxXa8X6TsXrdWQmpLjOr9lCqmPVtvbOH4ttHYv9OBYvHmst2Ti7ZFtW5ELjBRMyy_lOHbUNHWz_iWBHTITGKhpPZ4JlM7HnSCCyciNRv8RIIHLy2WHXMRLszCNR__yR4PtHkR8TRV7R9COiiMjKRbFxiSgicvKe8euIIj9zFBufH0V9_yjqx0RRr2jGEVFEZOWi2LxEFBE5ec_064iifuYoNj8_isb-UTSOiaJR0Wp7xg-Rkotf6xLxQ-TkfTKuI37GmePXuuzv1J-o6YtwIf1QbAjZtXI1OY_wpiI7fyjjYCJ6gZyk22SvTsqlH3gijLJvWfbS8bOvEoF5mClhroZ5EWZ5WN-A2WFw8xSY8ZPo-ik0r6ppXXnhhho21G4hXteUdF0N15VwQw03TgmKGkaCooaxoCA0EhQ1jQWleUpQWupOqCKlgFQK1ilbpXKI3QiN-I3QmOEYjjiO4JjlbKtaDvGcqauFGYhr6nJhNQTfapeDTFfTmOlqGjUdwTHT1ThqurpZMdO3SmbTtSbimrplWAvBt3rmINPVNGa6mkZNR3DMdDWOmc7VDVs0fbz65WsAAAD__42vx2w=
diff --git a/pkg/sql/opt/exec/execbuilder/testdata/distsql_distinct_on b/pkg/sql/opt/exec/execbuilder/testdata/distsql_distinct_on
index 2ad3861d2568..a84d824b7f96 100644
--- a/pkg/sql/opt/exec/execbuilder/testdata/distsql_distinct_on
+++ b/pkg/sql/opt/exec/execbuilder/testdata/distsql_distinct_on
@@ -95,7 +95,7 @@ vectorized: true
       table: xyz@xyz_pkey
       spans: FULL SCAN
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJy8lU1v4jwQx-_Pp4jm1EqOgp0XICceUVZCYqELHFZacUiJ1UaCOBsHiRfx3VcJu1Bo8bg44oZNfp6_8xtNdiB_LyCE3s_nwf_9ofXw1J9MJz8Gj9akN-h1p1a57g-7U2s0tB7WxNoQa_to_f1hfRuPvlvrzRYIpCLmw2jJJYS_gAIBBgRcIOABAR9mBLJczLmUIi8f2VVAP15D2CCQpNmqKLdnBOYi5xDuoEiKBYcQptHLgo95FPPcaQCBmBdRsqjKrDfbTpYnyyjfAIGuWKyWqQz_pQMCkywqN2yHwWxPQKyKUx1ZRK8cQron-lmeElkk6bxw_PMgHUo6jHTciyon8GVjvUXy7Sp1ysOu5jmdtkpFHvOcx2fnVadcTUwbWpFPQdx6gwyFLTKH-hdPfl7bO6tN9RuE3tYgDrMdT7NFkDTHFx7cqUVofS1CjVqE6WtiN2rybCfQ1ISkOV66eSdNrD5NzEiTq6_JvVFTYDtNTU1ImuOlW3fS5NanyTXS5Olr8m7U1LQ1JSFZjldu30mSV58kr7av4idlxlxmIpVc65vXKIPy-JUfbiXFKp_z51zMqzKH5ajiqo2Yy-LwLz0s-unhrzLge5hewvQ9zM5g-jU4MIHbJjA1yk19Nc2U79tVw65aVqC25SlpXw37JqrVMKJaDSOq1TCmGqER1YGJ6qYSbqlltUxkqWFElhpGZKlhTBZCI7LaJrIoMkWxMWo2R80GqdkkNRylZrOUGg1TikxTD5H2YZx-SZqaxqSpaUyamkalITgm7cNQVUqb7f_7EwAA___4n_tt
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJy8lV9v2jwUh-_fTxGdq1ZyFOz8AXLFK8okJAYdcDFpQlNKrBaNxlkcJALiu08JGxRafFwccYdNHp-f8xydbEH-XkIIve-Pg__7Q-vuoT-ZTr4N7q1Jb9DrTq1y3R92p9ZoaN2tiVUQa3Nv_f1hfRmPvlrrYgMEEhHzYfTKJYQ_gAIBBgRcIOABAR9mBNJMzLmUIisf2VZAP15D2CCwSNJVXm7PCMxFxiHcQr7IlxxCmEZPSz7mUcwzpwEEYp5Hi2VVZl1sOuti8zP9xQsg0BXL1Wsiw3_xgMAkjcoN22Ew2xEQq_xYSObRM4eQ7oh-mIeFzBfJPHf80yQdSjqMdNyzKkfwqbBeIvlykTrmYRfzHE9bJSKLecbjk_OqUy4mpg2tyMcgbr1BhsIWqUP9syc_ru2d1Kb6HUKv7BCH2Y6n2SNInMMbD27UI7S-HqFGPcL0PbFrPXm2E2h6QuIcbt28kSdWnydm5MnV9-Re6ymwnaamJyTO4datG3ly6_PkGnny9D1513pq2pqWkDCHO7dvZMmrz5JX25fxgzJjLlORSK713WuUQXn8zPe3kmKVzfljJuZVmf1yVHHVRsxlvv-X7hf9ZP9XGfAtTM9h-hZmJzD9HByYwG0TmBrlpr6aZsr37aphVy0rUNvylLSvhn0T1WoYUa2GEdVqGFON0IjqwER1Uwm31LJaJrLUMCJLDSOy1DAmC6ERWW0TWRSZotgYNZujZoPUbJIajlKzWUqNhilFpqmHSHs3Tj8lTU1j0tQ0Jk1No9IQHJP2bqgqpc12__0JAAD__1p8_eg=
 
 # Ensure that ordering propagates past local DISTINCT processors.
 query T
@@ -138,7 +138,7 @@ vectorized: true
           table: xyz@xyz_pkey
           spans: FULL SCAN
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJy8lkFv2jAUx-_7FNY7tZpRsBOgzYmtZRJSBx1w2DRxSInVItGY2UGCVnz3CShQCLznEMSthP7sx__99Ffewf4bQQiN348P35otdnXf7Pa6vx6uWbfx0LjrscXnZuuux9otdjXlbMbZ2zX7-IP96LR_sunsjbU7940O-_6HTYFDomPVil6VhfAvCOAggYMPHALgUIE-h7HRA2WtNot_eV8CzXgKYZnDMBlP0sXjPoeBNgrCd0iH6UhBCL3oaaQ6KoqV8crAIVZpNBwtr5nO3upjM3yNzAw43OnR5DWx4XpQ4NAdR4sHJU9Cf85BT9LtPTaNnhWEYs7dZ7kf2nSYDFKvsjtIXfC65HV_75Yt-DRjL5F9OUpt55FH59meNkm0iZVR8c55y1OOTizKTiNvB_HzBNPVJlXGE5lcvh49P3D4oYd-5sehB4Zo6ZIee7K8l8rh6ys71wt3B8VpDnqy5AWOFhLTbHZavZCF4nwWikIWEsGsLczk4mqhdNdAnqhBUPKqjhoQ02xCrV1IA3k-DWQhDYhg1hpkcnHVwHfXwD9Rg2rJqzlqQEyzCfXmQhr459PAL6QBEcxag0wurhoE7hoEJ2pQKzlKQMyyifT2QhIE55MgKCQBEcxagkwup7yYHDi_o-xYJ1Y5vXOUF0Go-FmtUrN6Ygbq0ejB8prVx_aSWz6IlU1X34rVh2ay-mox4GdY7MPiMyx3YJEPrhWBhShEVwrRtzgt0cB9PHAfhQP85gCFJbHrCkpXcbhaRBQcJkTBYUoUgiZEIWhClBoa-A0e-E0RUW7xTigTpZCplFytgNNULeA02QsEThUDgRMLF5li2c1dErnjzULsXODVIgLi8ky55Fo6TlNLx2ly6QROLZ3AqaXjvSqIYhWZjsm1dLxjBFEyItMyuZaO09TScZpcOoFTSydwaul4w0qiYSX-0ra_9P78y_8AAAD__5dMAh4=
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJy8ltFu2jAUhu_3FNa5ajWjYCdAmyu2lklIHXTAxaYJTSmxWjQaszhIQMW7T4QChcA5DkHcldDPPvzn06-8gfk3Ah8aPx8fvjRb7Oq-2e11fzxcs27joXHXY8vPzdZdj7Vb7GrK2Yyz-TV7_4N967S_s-lsztqd-0aHff3FpsAh0qFqBa_KgP8bBHCQwMEFDh5wqECfwzjWA2WMjpf_8pYCzXAKfpnDMBpPkuXjPoeBjhX4b5AMk5ECH3rB00h1VBCq2CkDh1AlwXCUXjOdzevT2fzP-K-aAYc7PZq8RsZfTwocuuNg-aDkSOgvOOhJsr3IJMGzAl8suP0w90OTDKNB4lR2J6kLXpe87u7dsgWfZuwlMC9Hqe088ug829MmkY5DFatw57z0lKMTi7LVyNtB3DzBdHWcqNgRmVw-Hz3fs_ihh37m-6EHhmjpkh47sryXyuHrKzvXC3sJxYkSOrLkeJYaEuNsllq9kIbifBqKQhoSwaw1zORiq6G090Ce6oFXcqqWHhDjbFKtXcgDeT4PZCEPiGDWHmRysfXAtffAPdWDasmpWXpAjLNJ9eZCHrjn88At5AERzNqDTC62Hnj2HninelArWVpADLPJ9PZCFnjns8ArZAERzNqCTC6nvJwcOL-jzFhHRlm9d5SXQajwWa1SM3oSD9RjrAfpNauP7ZRLH4TKJKtvxepDM1p9tRzwIyz2YfERljuwyAfXisBCFKIrhehbnJZo4C4euIvCHn6zh8KS2HUFpas4XC0iCg4TouAwJQpBE6IQNCFKDQ38Bg_8pogot3gnlIlSyFRKrlbAaaoWcJrsBQKnioHAiYWLTLHs5i6J3PFmIXYu8GoRHnF5plxyLR2nqaXjNLl0AqeWTuDU0vFeFUSxikzH5Fo63jGCKBmRaZlcS8dpauk4TS6dwKmlEzi1dLxhJdGwEn9p2196f_HpfwAAAP__JnkEmQ==
 
 # Ensure that even with more ordering columns, ordering propagates past local
 # DISTINCT processors.
@@ -185,7 +185,7 @@ vectorized: true
           table: xyz@xyz_pkey
           spans: FULL SCAN
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJy8lstu4koQhvfnKVq1SpRGptvmEq84kzASUgYywGJGIxYObiVIhGa6jYSDePcRGMkBhypfEEuHfNTv-j-V2ID9Owcfur-en_7v9dnNY280Hv18umWj7lP3Ycx2z73-w5gN-uwmvmVrzmL2fTj4wdbxBxsMH7tD9u03izlbA4eFDlU_eFcW_D8ggIMEDi5w8IBDAyYclkZPlbXa7P5lswd64Rr8OofZYrmKdn-ecJhqo8DfQDSL5gp8GAcvczVUQaiMUwcOoYqC2Xw_Zh1_dJZm9h6YGDg86PnqfWH9fVDgMFoGu6eaI2Gy5aBXUTrERsGrAl9sef4gI20iZZzGcYaOvOMdcXd2hCwy4nFmo9liGjmifjoFOAxMqIwKfdY5faP0G15i9hbYtww92aaR3LOR0u_Ryaxz74pmz2wIzZ7m8irk-jpTX9f00pHHyzw3vnE0XuS3UpSw0pE1x8vpJRHl4GWzipfEiLRbcTUvxcW9zGyolJcyvxiyjBhezWnmFIOIchCjVUUMYkS6XHk1MeTFxchsqJQYbn4x3DJiNGtOK6cYRJSDGO0qYhAj0uW6VxPDvbgYmQ2VEsPLL4ZXRoxWLacWRJCDFvdVtCBGpKv1rqaFd3EtMhuq_APni3FDZZd6YVWu3y71XWAVvqrkJa1emal6Nnq6H5M8Dvbc_g-hslHyqUgeeovko13Az7BAYYnD8hQWn2H3CBbF4HYVWMhKdLMKLes47aIL93DYw9sium6gdBOHmyjcwuFWFVFwmBAFhylRCJoQBacpUdpVRLnHb0KdOArESaFuSuaoFKmboIm-CZoqnMKJxgmcqlxkTkuRzgV-WoRHtIYfF9Eg8Mx1KVQ6TlOl4zRZOoFTpeM4WTp-WanSM0fmuLU20Rp-ZcQ9gWfuTKHScZoqHafJ0gmcKh3HqdIlfmFPS59s__sXAAD__2-YGgs=
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJy8lt1u2kwQhs-_q1jNUaIsMrs2P_ERXxMqIaWQAgetKlQ5eJWgEpZ6jYQTce-VbSQHHGb8gzh0yMO8nvfRiHcwf5fgQv_H48P_gyG7uh9MppPvD9ds0n_o301Z_DwY3k3ZaMiuomu25SxiX8ejb2wbvbHR-L4_Zl9-soizLXBYaV8NvVdlwP0FAjhI4GADBwc4tGDGYR3ouTJGB_G_vCfAwN-C2-SwWK03YfznGYe5DhS47xAuwqUCF6be01KNleerwGoCB1-F3mKZjNlGb71t9PZ7_UdFwOFOLzevK-MmSYHDZO3FTw1LwmzHQW_CbIoJvWcFrtjx4kkmOghVYLUOQ_TkDe-Jm5MjZJkR9wsTLlbz0BLN4ynAYRT4KlC-y3rHb5R9w1PEXjzzkqNnuyySfTJS9j06nXXqXdHsuQ2h2bNcTo1cn2ca6oZeW_JwmafGtw7Gi-JaiipaWrJhOQXFJLLsxWzXEZMYkZUrLiamOLuYuQ1VElMWN0NWMsNpWO2CZhBZ9mZ06phBjMi2Ky9mhjy7GbkNVTLDLm6GXcmMdsPqFDSDyLI3o1vHDGJEtl37YmbYZzcjt6FKZjjFzXAqmdFpFPSCSLL34raOF8SIbLfOxbxwzu5FbkO1f-R8Mm6szFqvjCr0-6UZB1b-s0pf0uhNMFePgZ4nY9LHUcIlf_CVCdNPRfowWKUfxQE_wgKFJQ7LY1h8hO0DWJSDu3VgIWvR7Tq0bOK0jS7cwWEHb4vouoXSbRxuo3AHhzt1RMFhQhQcpkQhaEIUnKZE6dYR5Ra_CU3iKBAnhbopuaNSpm6CJvomaKpwCicaJ3CqcpE7LWU6F_hpEQ7RGn5cRIvAc9elVOk4TZWO02TpBE6VjuNk6fhlpUrPHZnD1rpEa_iVEbcEnrszpUrHaap0nCZLJ3CqdBynSpf4hT0ufbb7718AAAD__6_qHIY=
 
 # Distinct processors elided becaue of strong key.
 query T
@@ -211,7 +211,7 @@ vectorized: true
   table: abc@abc_pkey
   spans: FULL SCAN
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJykk0-r00AUxfd-iuGs3oMJaf7URVZKrRCI6bOtINgsppnLs5Bm4swElNLvLpmo_WOVvGZzybkzJ_c3F84B5luFBPPPT9nbNGcP79LVevUxe2SreTafrVmn03y2ZoucPQjOtpyVj-zXB3u_XHxgYluCo1aScrEng-QLAnCE4IjAEYNjioKj0aokY5TurhycIZXfkUw4dnXT2q5dcJRKE5ID7M5WhARrsa1oSUKS9rv_SrJiV7kxYlu-afRuL_QPcMxU1e5rk_ymA8eqEV3Dzz9l2al4_gbBBn9quAGKI4dq7QnDWPFMSIIj_wfqibCtlZakSV7QFccbj8mVpxp_enXx9ujwYnQwfEvhnVv6ayveuXjRosLhtNFI2vCctheRq_Fg2mg4bXw37RWady78DaaDaePhtJP7aL2rwDBRSxYwZb-SviMpNyCXZBpVGxoUhEmXJJLP1MfOqFaX9KRV6cb0cuF8riHJ2P406EVauyMHeG4O_mt-fWGeXJvDMZOjMeZ4jHn6InNxfPUzAAD__xlx7T8=
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJykk1-L00AUxd_9FMN52oUJaf7UhzwptUIgpmtbQbBBJpnLWsxm4swElNLvLpmo_WOVbPtyybkzJ_c3F84O5luNBPOPD9nrNGd3b9LVevU-u2ereTafrVmv03y2Zouc3QnOSs6qe_brg71dLt4xUVbgaJSkXDyRQfIJAThCcETgiMExRcHRalWRMUr3V3bOkMrvSCYc26btbN8uOCqlCckOdmtrQoK1KGtakpCk_f6_kqzY1m6MKKtXoqw-t1_pBzhmqu6eGpP8xgPHqhV9w88_ZNmheP4GwQZ_argBij2H6uyBw1jxSEiCPf8H6wGxa5SWpEme4BX7C6_Jladaf3p28fLo8GR0MH5N4bVr-mst3rF41qbC8bjRrbjhMe4gIlfj0bjReNz4etwzNu9Y-BtMR-PG43EnV-J6Z6FhopEsYMp-IX1FWi5QLsm0qjE0KgyTPk0kH2mInlGdruhBq8qNGeTC-VxDkrHDaTCItHFHDvDYHPzX_PLEPDk3h7dMjm4xx7eYp88yF_sXPwMAAP__BoruYQ==
 
 query T
 EXPLAIN (VERBOSE) SELECT DISTINCT ON (a, b) a, b FROM abc ORDER BY a, b, c
@@ -252,4 +252,4 @@ vectorized: true
       table: abc@abc_pkey
       spans: FULL SCAN
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJy8lk9v4jwQxu_vp7Dm1KpG4PyhbU6827ISEpt0gZV2tXAwidVGonE2DtJWFd99lUQihLaeFAMXSzY8M8_MbzTKK6g_K_Bg-PNh_P_IJxf3o-ls-n18SabD8fBuRor7yL-bkcAnF5yS5SUpTvJ1EnwjfBmSYHI_nJAvv8pnSkKgkMhI-PxZKPB-AwMKFlCwgYIDFFxYUEgzGQqlZFb85bUUjKK_4PUoxEm6zovnBYVQZgK8V8jjfCXAgxlfrsRE8Ehk3SJuJHIer8o0fBkO0ix-5tkLULiTq_VzorwdU9OUFw9d_8d4XB-d7hzYHLanNQdYbCjIdV7bUDl_FOCxDW1v9T5WeZyEebff9DlgdFC0I8gikYnII9VDM2cdZvlCnrh6ei_GYlNbsz60VoeSVcb9UFd0YF3RgX1VBfywDsYOKKR2aBs6fN-dLzsy7TK3KQnWOWbHadhh7cfOOnDs3oxZZ_fyqclD3G6JXZ9_8thJJs864uRZ7VHbhqitXdTVxS5PpzVqxO22RTfnR22dBLV9RNR2e9TOwaj3uHZ2L905uK1RI263Lbo9P2r7JKidI6J22qPuHYa6s_fhQHgSEUZk_iSyloQRk9vOuOcn7JyEcO9EXwzvJJ0IlcpEiUbGjyL3CtsiehRVuUqus1A8ZDIs01TXoNSVD5FQefUrqy6jpPqpMLgrZvti1hC7DTX7nNoyEfdNxLcmYob4trT9tvViWw-rr6flaNWuXuwaodarkZbpxQhqvRhBjRSN-O6boL7Wim_0sG6MYOnVSNF6MQJLL0ZgIUUjvm9NYDFki2Jr1HCPmi1Ss01qtkrNdikzWqYM2aYOAu3NOv0cNL0cq1yvxqDp1Rg0pHDM-pulqoW22Pz3LwAA__-ORVET
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJy8lm9r4k4Qx5__XsUyj1q6ops_ts0jf9d6IHhJTz2445RjkyytnM3mshGuFN_7kQSMse1O6lafLOzqd-Y78xmGPIP6swIPht_vxv-PfHJ2O5rOpl_H52Q6HA9vZqS4j_ybGQl8csYpCc9JcZLPk-AL4WFEgsntcEI-_SifKYmAQiJj4fNHocD7CQwoWEDBBgoOUHBhQSHNZCSUklnxl-dSMIr_gtejsEzSdV48LyhEMhPgPUO-zFcCPJjxcCUmgsci6xZxY5Hz5apMw8NowMPoV_pbPAGFG7laPybK23E1TXnx0PW_jcf10enOgc1he1pzgMWGglzntQ-V83sBHtvQ9l5vlypfJlHe7TeNDhgdFP0IslhkIvZI9dDMWYcJn8gDVw-vxVhsamvWm9bqULLKuB_qgg6sCzqwL6qAb9bB2AGF1A5tQ4evu_NlR6Zd5jYlwTrH7DgNO6z93FmHzt2LOevsXt41eojdLbLL048eO8roWR84elZ71rYpa2uXdXWxy9NpzRqxu-3R1elZW0dhbX8ga7s9a-dw1ntgO7uX7hzc1qwRu9seXZ-etX0U1s4Hsnbas-4dyLqz9_FAeBITRmT-ILKWiBGX29a4p0fsHAVx70hfDa8knQiVykSJRsa3IvcK2yK-F1W5Sq6zSNxlMirTVNeg1JUPsVB59SurLqOk-qkwuCtm-2LWELsNNXuf2jIR903E1yZihvi2tP229WJbD6uvp-Vo1a5e7Bqh1quRlunFCGq9GEGNFI347pugvtSKr_Swroxg6dVI0XoxAksvRmAhRSO-r01gMWSLYmvUcI-aLVKzTWq2Ss12KTNapgzZpg4C7cU6fR80vRyrXK_GoOnVGDSkcMz6i6WqhbbY_PcvAAD__-AbUjU=
diff --git a/pkg/sql/opt/exec/execbuilder/testdata/distsql_indexjoin b/pkg/sql/opt/exec/execbuilder/testdata/distsql_indexjoin
index 93e1eafbfc1d..adb3b5870970 100644
--- a/pkg/sql/opt/exec/execbuilder/testdata/distsql_indexjoin
+++ b/pkg/sql/opt/exec/execbuilder/testdata/distsql_indexjoin
@@ -36,7 +36,7 @@ vectorized: true
       table: t@t_pkey
       spans: FULL SCAN
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJyUkUFL-0AQxe__TzHMqf2z0k1FkD21tCkGalqTgILmsCZDCabZuLupSsh3lyTWWqGix3lv38yPtzWa5xwFunfr5dTzYTD3wii8WQ4hdJfuLIL_sAhW12Dh9soNXBjs4KHi_JzA4UOY-vNPJYELPkSGhUrJl1syKO7RwZhhqVVCxijdSnX3wEtfUXCGWVFWtpVjhonShKJGm9mcUGAkH3MKSKakRxwZpmRllndr7aTU2VbqN2Q4U3m1LYyAJwY7Bi_IMCxlK5xh3DBUlT3cMFZuCIXTsN9zLLLckiY9co4hel3AYDI-dCKE8Pzo8qOavdN2s3dOQo3_AhWQKVVh6Ajp1GbexAwp3VD_AUZVOqG1Vkl3ph9XXa4TUjK2d51-8IreagG_hp0fw-Nv4bj59x4AAP__k4jCaQ==
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJyUkNFK80AQhe__pxjmqv1Z6aYiyF61tCkGalqTgIIGiclQQtNs3N1UpeTdJVlrrVDRyzlnzszH2aF-LlCge7ecjz0felMvjMKbeR9Cd-5OIvgPs2BxDQZur9zAhd4WHmrOzwkc3oexP_1UUrjgfWRYyoz8ZEMaxT06GDOslExJa6laadcteNkrCs4wL6vatHLMMJWKUOzQ5KYgFBglTwUFlGSkBhwZZmSSvOjOmpF5rNb0hgwnsqg3pRawZrBl8IIMwypphTOMG4ayNocX2iQrQuE07PcYs7wwpEgNnGMGqwvojYaHSoQQnh9dfjSzd9pq9s5JqOFfoALSlSw1HSGdusybmCFlK7L9a1mrlJZKpt0bOy66XCdkpI11HTt4pbVawK9h58fw8Fs4bv69BwAA__-QBMHx
 
 query T
 EXPLAIN (DISTSQL) SELECT * FROM t WHERE v > 10 AND v < 50 ORDER BY v
@@ -55,7 +55,7 @@ vectorized: true
           table: t@t_pkey
           spans: FULL SCAN
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJyUkVFr4kAUhd_3V1zuk-7OYhJZWOZJq5EGbLRJoC1tHqbJRUJjJp2Z2BbJfy9Jaq0FpT7ec-ac-3Fni_o5R47u7XI-9nzoTb0wCq_nfQjduTuJ4DfMgsUVGLi5dAMXeht4qCxrSGBbfRj7008lgX9WHxbB1A3g4g42yLCQKfliTRr5PdoYMyyVTEhrqRpp2z7w0lfkFsOsKCvTyDHDRCpCvkWTmZyQYyQecwpIpKQGFjJMyYgsb2vNqFTZWqg3ZDiRebUuNIcnBhsGL8gwLEUj_MW4Zigrs9-hjVgRcrtmP-eYZbkhRWpgH0J0OofeyNmfh3Pu-dH_jyvtnOZMO-colHMOVCiVITVwDpFGzp-j9cNz6gPSpSw0HdQfa7bqmCGlK-r-V8tKJbRUMmnXdOOizbVCStp0rt0NXtFZDeDXsH0y7JwOOyfDw2_huP71HgAA__8tbvhX
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJyUkdFK80AQhe__pxjmqv1daZIiyF61tikGalqTgIoGiclQQtNs3N1UpeTdJYm1Vmixl3POnjMfsxtUrxlytO_n06HjQmfs-IF_O-2Cb0_tUQD_YeLNbkDD3bXt2dBZw1NpGH0C0-jC0B1_KzFcGF2YeWPbg6sHWCPDXCTkRitSyB_RxJBhIUVMSglZS5vmgZO8IzcYpnlR6loOGcZCEvIN6lRnhByD6CUjj6KEZM9AhgnpKM2aWj3Qz8WSPpDhSGTlKlcclgzWDN6QoV9EtXCOYcVQlHq3QuloQcjNiv0dY5JmmiTJnrnP0OocOgNrdx3OueMGl19H2jr1lbbOQSjrFChfSE2yZ-0jDayzg_X9U-o9UoXIFe3VH2o2qpAhJQtqv1eJUsY0lyJu1rTjrMk1QkJKt67ZDk7eWjXgz7B5NGwdD1tHw_1f4bD69xkAAP__3c733w==
 
 # Here we care about ordering by v, but v is not otherwise used.
 query T
@@ -75,7 +75,7 @@ vectorized: true
           table: t@t_pkey
           spans: FULL SCAN
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJyUkVGLm0AUhd_7Ky73KaFT4hgKZZ5ME0OFVFMV2rLrg6uXIBjHnRmTXYL_fVE3m81CwubxnjPnno87B9SPJQp0_61XM8-H0cKL4ujPagyRu3LnMexhGQa_wcDfX27owmgH941lTQm4NYaZv3hTMvhujSEIF24IP__DDhlWMic_3ZJGcYccE4a1khlpLVUnHfoHXv6EwmJYVHVjOjlhmElFKA5oClMSCozTh5JCSnNSEwsZ5mTSouzXGqdWxTZVz8hwLstmW2kBOwZ7ZBjVaTd9w6RlKBtzKtAm3RAK3rLPQyyL0pAiNeHnBIMuYOTw022EEJ4f_3g90dHpbnR0LkLZt0BFUhlSE_scyeFfkWHQGAGOfbFoektRSLqWlaazokubrTZhSPmGhm_WslEZrZXM-pphDPpcL-SkzeDyYfCqweoA34f51bB9PWxfDU8_hJP2y0sAAAD__1PA-l4=
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJyUkVGLm0AUhd_7Ky73KaFT4hgKZZ5ME0OFVFMV2tJKsXoJssZxZ8Zkl-B_X9TNZrOQsHm858y55-POAfV9iQLdX-vVzPNhtPCiOPqxGkPkrtx5DHtYhsF3MPDzmxu6MNrB38aypgTcGsPMX7woGXy2xhCECzeEr79hhwwrmZOfbkmj-IMcE4a1khlpLVUnHfoHXv6AwmJYVHVjOjlhmElFKA5oClMSCozT_yWFlOakJhYyzMmkRdmvNY75V9_RIzKcy7LZVlrAjsEeGUZ12k2fMGkZysac9muTbggFb9n7GZZFaUiRmvBzgEEXMHL46TRCCM-Pvzxf6Oh0Jzo6F6HsW6AiqQypiX2O5PCPyDBojADHvlg0vaUoJF3LStNZ0aXNVpswpHxDwy9r2aiM1kpmfc0wBn2uF3LSZnD5MHjVYHWAr8P8ati-Hravhqdvwkn74SkAAP__AJr55g==
 
 # The single join reader should be on node 5, and doesn't need to output v.
 query T
@@ -92,4 +92,4 @@ vectorized: true
       table: t@v
       spans: [/41 - /49]
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJyUkcGvmkAQxu_9KyZz0mQNC-hlT1qlKY0FCyZt03KgMDGkyNLdxbYx_O8N0PjURN57x_l2fvN9M3tG_atEgd6X3XblBzDZ-PE-_rSdQuxtvfUefsO7KPwIBj6_9yIPJif43nDuEsz5FFbB5qJksOBTCKONF8Hbr3BChpXMKUiPpFF8QxsZLjBhWCuZkdZSdfK5b_LzPyg4w6KqG9PJCcNMKkJxRlOYklBgIGeythxkmJNJi7JvaxnKxjxB2qQHQuG27GqwPT54n_4oKaI0J2Xxm_Folt0aa1k2x0oL-Mn6teI67Sprbs-sRUeEjRGwtPFRHPs1cT7Iovqfxr5PU6vimKq_F0v3oaVzY_nMaSPStaw0vei2vE0YUn6g4fu0bFRGOyWz3mYow57rhZy0GV7dofCr4akLeA3bo7AzDjujML-Dk_bNvwAAAP__cBLxAg==
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJyUkdGPmkAQxt_7V0zmSZM1LKAv-6RVmtJYsGDSNi1pKEwMEVnKLvYuhv_9Alw8NZG7e5xv5zffN7MnVP9yFOj82KwXrgejlRtuw2_rMYTO2llu4T98CvyvoOH7ZydwYHSE3zXnNsGUj2Hhrc5KAjM-Bj9YOQF8_AlHZFjIlLz4QArFLzSR4QwjhmUlE1JKVq186prc9AEFZ5gVZa1bOWKYyIpQnFBnOicU6MmJLA0LGaak4yzv2hqGstYvkNLxjlDYDbsYbA4P3sZ_cwooTqky-NV41PN2jaXM60OhBOxZt1ZYxm1lTM2JMWsJv9YC5ibei2O-J84XmRXPaczbNPpPuafHs6N919G6cnzlsgGpUhaK3nRa3kQMKd1R_3tK1lVCm0omnU1f-h3XCSkp3b_afeEW_VMb8BI2B2FrGLYGYX4DR82HpwAAAP__UuLwig==
diff --git a/pkg/sql/opt/exec/execbuilder/testdata/distsql_inverted_index b/pkg/sql/opt/exec/execbuilder/testdata/distsql_inverted_index
index 3c9e19bd7005..3cde2a67e181 100644
--- a/pkg/sql/opt/exec/execbuilder/testdata/distsql_inverted_index
+++ b/pkg/sql/opt/exec/execbuilder/testdata/distsql_inverted_index
@@ -92,7 +92,7 @@ vectorized: true
           right columns: ()
           right fixed values: 1 column
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJyUkk1v1DAQhu_8itFcCsLSxtmbT6E0iK1CUpJKfJSocpMhctl6gu0gYJX_jpJIhQW66h5n3jzvPIq8Q_91iwrT9xfZi00OT8821WX1NnsGVZqlLy9Bw6uyeAO3nu110Dfw7nVapnADyachitYEJ1dSQFyfQFGepSWcfgCNAi23lOs78qiuUGItsHfckPfsptVu_mDTfkcVCTS2H8K0rgU27AjVDoMJW0KFH033U3fnbCy5VYQCWwrabOfeyrQEkbp3Sz4zXxv7DcUSyf9GxRAUJBLrUSAP4fdpH3RHqOQoHq83iZWkW3IruS93f7l35k67HygwY_4y9HDLxgLbWUJgkUOy_udvKqXOqyI_fYRvfIxvxS6QW8X7rol8_mD9-pj6knzP1tNe_UPN0VgLpLaj5UV4HlxDF46b-cwyFjM3L1ryYUnlMmzsEk2Cf8LyIBwfhuOD8PovuB6f_AoAAP__JdwK_Q==
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJyUkk9v1DAQxe98itFcCsLSxtmbT6E0iK2WpCSV-FOilZsMkdvFE2wHAat8d5REFBbaVffmmef33k-Wd-i_blFh-v5i_WKVwdOzVXlZvl0_gzJdpy8vQcOrIn8DN57tJuhrePc6LVK4huRTH0VLgpMrKSCuTiAvztICTj-ARoGWG8r0F_KorlBiJbBzXJP37MbVbrqwar6jigQa2_VhXFcCa3aEaofBhC2hwo-m_anbczaW3CJCgQ0FbbZTbmkagkjdsSWfmTfGfkMxS_JeKe-DgkRiNQjkPvyp9kG3hEoO4vF4I1hBuiG3kPtwd82_D5vuln6gwDXzbd_BDRsLbCcUgXkGyfK_N1VKnZd5dvoI6vgY6pJdILeI94kT-fzB-OUx8QX5jq2nvfiHkqOhEkhNS_O_8Ny7mi4c11PNPOaTb1o05MOsynlY2VkaAf82y4Pm-LA5Pmhe_mOuhie_AgAA__9H7A1h
 
 # Combine predicates with AND. Should have the same output as b @> '[1, 2]'.
 # This should use a zigzag join.
@@ -120,7 +120,7 @@ vectorized: true
           right columns: ()
           right fixed values: 1 column
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJyUUl1v00AQfOdXrPalqTgpPuftntwSI1IFu9iV-ChWdY2X6Ep6a-7OCIj835FtVGpEo-ZxZ25mZ1a3R_9thwrTD5frs1UGs-WqvCrfrU-hTNfpqyvQ8LrI38KdZ3sT9C28f5MWKcxuIfncRtGC4ORaViencJYtp2jco3mxTAs4_wgaBVquKdP35FFdo8RKYON4Q96z66H98GBV_0AVCTS2aUMPVwI37AjVHoMJO0KFn8z2l95esLHk5hEKrClosxt8S1MTROohcPKF-cbY7yhGSv6XytugIJFYdQK5DX9X-6C3hEp24vnx-mAF6ZrcXE7DPWxunLnX7icKXDN_bRu4Y2OB7RBCYJ7BLFlMT6yUuijz7PzPqSd0_Ih-Rpv4mDYlu0BuHk-bJPLlk_aLY-wL8g1bTxP7p5yjrhJI9ZbG_-K5dRu6dLwZ1oxjPugGoCYfRlaOw8qOVB_wsVgeFMeHxfFB8eIfcdW9-B0AAP__VW0XbA==
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJyUUl1v00AQfOdXrPalqTgpPuftntwSI1IFu9iV-ChWdI2X6Npwa-7OCIjy35FtKDVqo-bNO-OZnVndDv23LSpMP1wuzxYZTOaL8qp8tzyFMl2mr65Aw-sifwu3nu0q6Bt4_yYtUpjcQPK5jaIZwcm1rE5O4Sybj9G4Q_NinhZw_hE0CrRcU6a_kkd1jRIrgY3jNXnProN2_Q-L-geqSKCxTRs6uBK4ZkeodhhM2BIq_GQ2v_Tmgo0lN41QYE1Bm23vW5qaIFL3gZMvzCtjv6MYKPkolbdBQSKx2gvkNvxb7YPeECq5F8-P1wUrSNfkpnIc7n7z349Vc0c_UeCS-a5t4JaNBbZ9FIF5BpNkNj60UuqizLPzPwcf0fED-hmd4mM6lewCuWk87pPIl0_az46xL8g3bD2N7J9yjvaVQKo3NLwaz61b06Xjdb9mGPNe1wM1-TCwchgWdqC6gA_F8qA4PiyOD4pn_4mr_YvfAQAA___d0RnQ
 
 # Filter with a nested array. This index expression is not tight.
 # This should use a zigzag join.
@@ -148,7 +148,7 @@ vectorized: true
           right columns: ()
           right fixed values: 1 column
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJyUkk1v1DAQhu_8itFcCsLSxtmbT6E0iK1CUpJKfCxR5SZD5LL1BNtBwCr_HSWRCovaVXucefO88yjyHv33HSpMP15krzY5PD_bVJfV--wFVGmWvr4EDW_K4h3ceLZXQV_Dh7dpmcI1JF-GKFoTnGy3UkBc1ydQlGdpCaefQKNAyy3l-pY8qi1KrAX2jhvynt202s8fbNqfqCKBxvZDmNa1wIYdodpjMGFHqPCz6X7r7pyNJbeKUGBLQZvd3FuZliBSd3bJV-YrY3-gWCJ5b1QMQUEisR4F8hD-nvZBd4RKjuLxepNYSbolt5KHcneXe2dutfuFAjPmb0MPN2wssJ0lBBY5JOt7_qdS6rwq8tNHGMdPMa7YBXKr-NA2kS8frF8_pb4k37P1dFD_UHM01gKp7Wh5E54H19CF42Y-s4zFzM2LlnxYUrkMG7tEk-C_sDwKx8fh-Ci8_g-ux2d_AgAA__-nIAxt
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJyUkk9v1DAQxe98itFcCsLSxtmbT6E0iK2WpCSV-LNEKzcZIreLJ9gOAlb57iiJKGzVrtqbZ57fez9Z3qP_vkOF6ceL9atVBs_PVuVl-X79Asp0nb6-BA1vivwdXHu226Cv4MPbtEjhCpIvfRQtCU42GykgrqoTyIuztIDTT6BRoOWGMv2NPKoNSqwEdo5r8p7duNpPF1bNT1SRQGO7PozrSmDNjlDtMZiwI1T42bS_dXvOxpJbRCiwoaDNbsotTUMQqVu65Cvz1tgfKGZJ3ivlfVCQSKwGgdyHf9U-6JZQyUE8Hm8EK0g35BbyEO62-e9h293QLxS4Zr7pO7hmY4HthCIwzyBZ3vOqSqnzMs9OH8EdP4W7ZBfILeJD5kS-fDB--ZT4gnzH1tNB_EPJ0VAJpKal-Wd47l1NF47rqWYe88k3LRryYVblPKzsLI2A_5vlUXN83BwfNS_vmKvh2Z8AAAD__9JIDtE=
 
 subtest array
 
@@ -209,4 +209,4 @@ vectorized: true
           right columns: ()
           right fixed values: 1 column
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJyUklFv0zAUhd_5FVf3ZSAsNU5fkJ9SWBBBpRlOJRgjmrzmUhk632A7iFHlv6MkiFFg1fbme4_POZ8s7zF83aHC_P3ZclGs4PFpUa2rt8snUOXL_MUaDLzU5Rsw3puby2iusk_Ml9Z9g3evcp3DFWQfuySZE5zspYC0P4FSn-Yanp-DQYGOG1qZawqoLlBiLbD1vKEQ2A-r_XihaL6jSgRa13ZxWNcCN-wJ1R6jjTtChR_s9ofZvmbryM8SFNhQNHY35la2IUjUv5AoJk3-Xyu7qCCTWPcCuYu35SGaLaGSvbg_4ICmyTTkZ_IQ77a69fba-BsUuGT-0rXwma0DdiOFwHIF2fz3gy60XpxfSKVUsVo_E-mvQ30P8PQh4BX7SH6WHkJn8umd8fOHxGsKLbtAB_F3JSd9LZCaLU2fI3DnN3TmeTPWTGM5-sZFQyFOqpyGwk3SAPinWR41p8fN6VHz_C9z3T_6GQAA__-B9BKK
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJyUkkFv00AQhe_8itFcCmKleJ0L2pMDNcIoxGUdCUqxom08REvDjtldI0rk_45io5ZAG7W3mXl-732ydofh-xYV5h_P5rNiAU9Pi2pZvZ8_gyqf56-WYOC1Lt-B8d5cr6K5zL4wr6z7AR_e5DqHS8g-d0kyJTjZSQFpfwKlPs01vDwHgwIdN7Qw3yigukCJtcDW85pCYL8_7YYPiuYnqkSgdW0X9-da4Jo9odphtHFLqPCT3fwym7dsHflJggIbisZuh9zKNgSJ-h8SxajJu7WyiwoyiXUvkLt4Wx6i2RAq2YuHA-7RNJmG_EQe4t1W30yr9oquUeCc-apr4StbB-wGGIHlArLpzX-daT07v5BKqWKxfCHSP0P9AP70MfwV-0h-kh6yZ_L5vfHTx8RrCi27QAfx9yUnfS2Qmg2NbyRw59d05nk91IxrOfiGQ0Mhjqocl8KN0h7wb7M8ak6Pm9Oj5uk_5rp_8jsAAP__DSIVUw==
diff --git a/pkg/sql/opt/exec/execbuilder/testdata/distsql_join b/pkg/sql/opt/exec/execbuilder/testdata/distsql_join
index 1176caecd31b..4acf578257d7 100644
--- a/pkg/sql/opt/exec/execbuilder/testdata/distsql_join
+++ b/pkg/sql/opt/exec/execbuilder/testdata/distsql_join
@@ -171,7 +171,7 @@ vectorized: true
           table: data@data_pkey
           spans: FULL SCAN
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJy8lt9u4jgUh-_3KaxzBVujYCf8i1SJbstqqbrQgV7MaMSFIZ6CRGMmCdJUFe8-SijTQsAnTghXlcFf_MPnOz15g_DnElzofX18uOkPSOWuP34af3moksq499C7fSJ_k39Hw___LAUl0-0nnogEuRknf1mV3A9j_H3XjBIvvYuT4eiuNyL_fEs2VMlwQCqCXJNZldwM7khlSq6Tj3e7ppSIKlDwlScH4kWG4H4HBhQ4ULCBggMUGjChsArUTIahCuItbwnQ936BW6ew8FfrKP54QmGmAgnuG0SLaCnBhScxXcqRFJ4MrDpQ8GQkFsvkmDhwdxUsXkTwChRu1XL94oducgFAYbwS8apmMSJ8jzCiorkMYLKhoNbR-4kfB01fyVyE8_0juox2OUw2EwphJJ4luGxD84VvZAsfX3tp4fnJ8B-PWvsq8GQgvb2HTWIS23LkBv4T4fxeLXwZWOygfEv5I6okGavXweJ5vlsAheE6ckmyol2bdp2D3_3xg2yTaoxVEMU5DirR5Ve0y65OnuFkuLRj9_HpwUfCDFRNrSxeP7zloxEaexFYdulYno6xWM3i5fWMQfxmnp45e3x-Mv4luoaV3TVIPXZd0yzSNTx7zXkuZXnNsstT1iB-K5ey547PT8a_hLK8bGWReuyUbRVR1s5eczuXsnbNcspT1iB-O5ey547PT8a_hLJ22coi9dgp2y6irJO95k4uZZ2a1ShPWYP4nVzKnjs-Pxn_Eso6ZSuL1GOnbOdcr9NHzhjJcKX8UGZ6S67HNya9Z7mtQKjWwUw-BmqWHLNdDhMueenxZBhtv-XbRd_ffhUHzA63isCMFaIbheiOnmYGd8bN4FYR-ODOTOlGIbqjp_khXf9M23tw_RC2tbCjr5ajhTnTH90o0h96GOkPPYz1B0Ij_YHQSH80i_SHHkb6Qw9j_YHQSH8gNNIfLa2lbb2k7SL90SliuB5GDNfDmOEIjRiO0NgEMBmb6f-kJnPTlEaHgNHkNMYRzVlqiuypyrhedKYfI4jpLDVHTFRHaMR1hMZkx3DEdgzHdE_NUCPd9TSmu55GdUdwTHcEx3RPDdJ93ZuI7qmZYqR7aqYY6a6nMd31NKo7gmO6Izime2qeGumupzHd9TSqO4JjuiM4pntqqu6_a9f1uvPUbNHqPtn89TsAAP__2TDHhg==
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJy8lt9v2j4QwN-_f4V1T_CtUbATfkWqRNcyjaqDDvqwaUJTIF5BozFLgrSq4n-fEspaEvDFCeFlk4M_8Z3vc728QPB7CTb0vt7fXfUHpHLTHz-Mv9xVSWXcu-tdP5D_ycfR8PO_pUPJdPvEdUKHXI3j_1mV3A4j_HXXjBI3vYuT4eimNyIfvsUbqmQ4IBWHXJJZlVwNbkhlSi7jx7tdU0qcKlDwpCsGzpMIwP4ODChwoGACBQsoNGBCYeXLmQgC6UdbXmKg7_4Bu05h4a3WYfR4QmEmfQH2C4SLcCnAhgdnuhQj4bjCN-pAwRWhs1jGx0QBd6N_fqx-iWegcC2X6ycvsOMrAArjlROtagYjjucSRmQ4Fz5MNhTkOnw98-2o6TOZO8F8_5Auo10Ok82EQhA6jwJstqH5wm9kDT-6-tLC50fDf3vV2pO-K3zh7r1sEpHYlgN38MkJ5rdy4QnfYIkSLsXPsBLHWL30F4_z3QIoDNehTeIV7Zq0ayXyfkvI1KnHWPphFEeiFl1-Qbvs4ugZVoZLO3Qf7158IJiBrMmVwevJWz4YQmMvBJZdO5avawxWM3h5faORQDNf35w8AX40gXN0Diu7c5CK7DqnWaRzePaq85za8pphlqetRgKtnNqeOgF-NIFzaMvL1hapyE7bVhFtzexVN3Nqa9YMqzxtNRJo59T21AnwowmcQ1uzbG2Riuy0bRfR1spedSuntlbNaJSnrUYCnZzanjoBfjSBc2hrla0tUpGdtp1TfV4fOGMkgpX0ApHpq7ke3ZhwH8W2AoFc-zNx78tZfMx2OYy5-APIFUG4_ZVvF31v-1MUYHa4VQRmrBDdKER31DTTuDOuB7eKwIk706UbheiOmuZJuv6eNvfgehI2lbClrpalhDlTH90o0h9qGOkPNYz1B0Ij_YHQSH80i_SHGkb6Qw1j_YHQSH8gNNIfLaWlbbWk7SL90SliuBpGDFfDmOEIjRiO0NgE0Bmb6b-kOnNTl0aHgNbk1MYRzVlqiuypyrhadKYeI4jpLDVHdFRHaMR1hMZkx3DEdgzHdE_NUC3d1TSmu5pGdUdwTHcEx3RPDdJ93ZuI7qmZoqV7aqZo6a6mMd3VNKo7gmO6Izime2qeaumupjHd1TSqO4JjuiM4pntqqu5_a9fVuvPUbFHqPtn89zcAAP__E9_OUg==
 
 # TODO(radu): rework these tests (the inner ORDER BY aren't useful anymore).
 #
diff --git a/pkg/sql/opt/exec/execbuilder/testdata/distsql_merge_join b/pkg/sql/opt/exec/execbuilder/testdata/distsql_merge_join
index 663c616448bf..7749273bfc0b 100644
--- a/pkg/sql/opt/exec/execbuilder/testdata/distsql_merge_join
+++ b/pkg/sql/opt/exec/execbuilder/testdata/distsql_merge_join
@@ -206,7 +206,7 @@ vectorized: true
       table: parent1@parent1_pkey
       spans: [/3 - /5]
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJycktFv0zAQxt_5K0731IBR44TxEKlSpi1Api4dTRFIkAcTH12k1Da2I4Gq_u8oMdLWaQXGS5T7zp_v9528R_e9xwyLTzfL87KC2WVZb-r3ywjqYllcbOA5vFmvrsEIS8pzuFqVFbS3XS85fKjL6i3MTCd5BB_fFesiFPBliOOUFpBGcF5d3hfbBZxFyFBpSZXYkcPsM3JsGBqrW3JO21HaTwdK-QOzmGGnzOBHuWHYakuY7dF3vifMcCO-9rQmIcnOY2QoyYuun64NlLmx3U7Yn8jwQvfDTrkMRh4GbfgKjgxrI8bGPH05f43NgaEe_N1Q58WWMOMH9n9g_Bjs9y5Pk5l_Z0pOMt2hDEpbSZbkEUYzOv925JFg12S3dKU7RXaeHAfr6Zuf5fxFtLDd9jb8IsPV4DPIX7H8jOUJy9OTYdKnLHhNzmjl6GGoR2-OxyQktxQ24_RgW7qxup3GhHI1-SZBkvOhm4SiVFNregH3zfwJ5uShOfmjOT0yx4fm8OxXAAAA__8i3yy3
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJycktFv0zAQxt_5K0731IBR44TxEKlSpi1Api4dTRFIEKEQH11EZhvbkUBV_3eUeNKWaQW6lzj3nT_79528Q_uzwwSzT1fL07yA2Xlebsr3ywDKbJmdbeA5vFmvLkHXhqTjcLHKC2iu205w-FDmxVuY6VbwAD6-y9aZL-BLH4YxLSAO4LQ4vy82CzgJkKFUgor6hiwmn5FjxVAb1ZC1ygzSbtyQi1-YhAxbqXs3yBXDRhnCZIeudR1hgpv6W0drqgWZeYgMBbm67cZjPWXql6_6B_1Ghmeq62-kTWBgYtD4b82RYanroTGPX85fY7VnqHp3d7F19ZYw4Xv2NDg-hbudZ3q7HsDT_w8WHQS74-mlMoIMiQlLNTj_teWRdJdktnShWklmHk3TdfTdzVL-IliYdnvtf5HhqncJpK9YesLSiKXxwTDxMVNek9VKWnoY6tGTwyEJiS35yVjVm4aujGrGa3y5Gn2jIMg63418kcuxNT6D-2Z-hDl6aI7-ao4n5nBf7Z_9CQAA__8YPC_P
 
 # Swap parent1 and child1 tables.
 query T
@@ -261,7 +261,7 @@ vectorized: true
       table: parent1@parent1_pkey
       spans: [/3 - /5]
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJycktFv0zAQxt_5K0731IBR40TjIVKlTFuATF06miKQIA8mPrpIqW1sRwJV_d9RYqSt0wpsL1HuO3--33fyHt2PHjMsPt8sz8sKZpdlvak_LCOoi2VxsYGX8Ha9uob2tuslh6tVWYERlpTn8LEuq3cwM53kEXx6X6yLUMDXIY5TWkAawXl1eV9sF3AWIUOlJVViRw6zL8ixYWisbsk5bUdpPx0o5U_MYoadMoMf5YZhqy1htkff-Z4ww4341tOahCQ7j5GhJC-6fro2IOfGdjthfyHDC90PO-UyGHkYtOErODKsjRgb8_T1_A02B4Z68HdDnRdbwowf2PPA-DHYn_2dJjP_z5ScZLpDGZS2kizJI4xmdP7ryCPBrslu6Up3iuw8OQ7W03c_y_mraGG77W34RYarwWeQc5YnLE9ZfnYyTPqUBa_JGa0cPQz16M3xmITklsJmnB5sSzdWt9OYUK4m3yRIcj50k1CUampNL-C-mT_BnDw0J381p0fm-NAcXvwOAAD__xxkLLQ=
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJycktFv0zAQxt_5K0731IBR40TjIVKlTFuATF06miKQIEImPrqIzDa2I4Gq_u8o8aSt0wqMlzj3nT_79528Q_ejxwyLj1fL07KC2XlZb-p3ywjqYlmcbeA5vF6vLqG97nrJ4WJVVmCEJeU5vK_L6g3MTCd5BB_eFusiFPB5iOOUFpBGcFqd3xfbBZxEyFBpSZW4IYfZJ-TYMDRWt-SctqO0mzaU8idmMcNOmcGPcsOw1ZYw26HvfE-Y4UZ87WlNQpKdx8hQkhddPx0bkPOwfDHf6RcyPNP9cKNcBiMTgzZ8BUeGtRFjY56-nL_CZs9QD_7uYufFljDje_Z_cPwQ7naG-e16BM_8O1hyFOyOZ1DaSrIkD1ia0fm3LY-kuyS7pQvdKbLz5DBdT9_8LOcvooXtttfhFxmuBp9BzlmesDxl-cnRMOlTprwmZ7Ry9DDUoyfHYxKSWwqTcXqwLV1Z3U7XhHI1-SZBkvOhm4SiVFNregb3zfwJ5uShOfmjOT0wx_tm_-x3AAAA__8RwS_M
 
 # Select over two ranges for parent/child with split at grandchild key.
 # Also, rows with pid1 <= 30 should have 4 rows whereas pid1 > 30 should
@@ -315,7 +315,7 @@ vectorized: true
       table: parent1@parent1_pkey
       spans: [/29 - /31]
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJycktGPk0AQxt_9Kybz1Opq2UUfjqQJ5xUjlx6ctIka5WFlxx4JZXF3STQN_7sBzpxcWk3vpenMN9_O75twQPujwgCjT7fryziB2SrebDcf1nPYROvoagvP4V2W3kAjDdWOw3UaJ1DclZXikCZ_2q-aUnFY3gtj9fF9lEUwm0x8bT3PpyWIizlcJqtjarEEn88hzVZRBm8_TzYgw1orSuSeLAZfkGPOsDG6IGu16VuHYSBWPzHwGJZ107q-nTMstCEMDuhKVxEGuJXfKspIKjILDxkqcrKshmfHFGFjyr00v5Dhla7afW0D6CEYFOOv7Hk2jeyFhbh4ufAF5h1D3bqHtdbJHWHAO_Y0ND5Fu7_GabbmHCpxkuoBpq21UWRITUDy3vm_kSPRbsjs6FqXNZmFmEar6LubhfzFfGnK3d34FxmmrQsgfM3CNyzkLBQs9E_m8c-5cka20bWlx7mOvuz1YUjtaDyO1a0p6NboYlgzlungGxqKrBtVMRZxPUjDZ_C3mZ9hFo_N4p9mf2L2urx79jsAAP__T5FBJg==
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJyckt-Pk0AQx9_9Kybz1Opq2UUfjqQJ5xUjlx6ctIkaJQbZsUfkWNxdEk3T_93A1pw0rab3wjI_vjuf72S3aH7UGGD04XZ5GScwWcSr9erdcgqraBldreEpvMnSG2gLTY3lcJ3GCZR3VS05pMmf9Iu2khzm-4KL3r-Nsggmo47Pnef5NAdxMYXLZHGsWs7B51NIs0WUweuPownIsFGSkuKeDAafkGPOsNWqJGOU7lPboSGWPzHwGFZN29k-nTMslSYMtmgrWxMGuC6-1pRRIUnPPGQoyRZVPVzrXITu-NJ-p1_I8ErV3X1jAuhBGJTuW_RMq7boCzNx8XzmC8x3DFVnH0YbW2wIA75jj8PjY7z9RsL9eQKwPQdNnER7IOoapSVpkiOavFf-r-WIvxvSG7pWVUN6Jsb-avpmJyF_Np3ranPnfpFh2tkAwpcsfMVCzkLBQv-kH_-cVWdkWtUYOvR19GavN0NyQ245RnW6pFutymGMC9NBNyQkGeuqwgVxM5SGt_C3mJ8hFodi8U-xPxJ7u3z35HcAAAD__wQuRD4=
 
 # Parent-child where pid1 <= 15 have one joined row and pid1 > 15 have no
 # joined rows (since child2 only has 15 rows up to pid1 = 15).
@@ -377,7 +377,7 @@ vectorized: true
       table: child2@child2_pkey
       spans: [/12 - ]
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJycktFv0zAQxt_5K0731IJRYxd4iDQpsAXI1DUjKQIEeTDx0VlK42A7Eqjq_47iII1MK9C9RPZ3_u5-3yl7dN8bjDH9eL16ma1hdpGVm_Ldag5lukrPN_AYXhf5FXTSUus5XObZGuob3SgB78ts_QZmnVZ8Dh_epkUKwxm-9FG0pDPgAvLiIi3g1adQQIatUbSWO3IYf0aOFcPOmpqcM3aQ9uFBpn5gHDHUbdf7Qa4Y1sYSxnv02jeEMW7k14YKkorsIkKGirzUTWj7GzXprN5J-xMZnpum37UuDhQMOjmglJ0cpAUXT7E6MDS9vx3nvNwSxvzAHobEp0jjwo4T1VqJ8F0yqKX4TzpxlO4Wqm-NVWRJTYCqwfmvJ_dEvCK7pUujW7ILMY3Y0Dc_S_iT-ZnV25vxiAzz3seQcJYIljxjyXOWvDiaZ3nKtgtynWkd3c11b-doCENqS-NynOltTdfW1GHMeM2DLwiKnB-rYrxkbSiF3-FPMz_BLO6axV_Ny4k5OlSHR78CAAD__1DfLRk=
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJycktFv0zAQxt_5K0731IJRYxd4iDQpsAXI1DUjKQIEETLx0UVksbEdCVT1f0dxJo1MK1BeYvs7f77fd8oO3fcWY0zfX66eZ2uYnWXlpnyzmkOZrtLTDTyEl0V-AUZa6jyH8zxbQ33VtErA2zJbv4KZaRSfw7vXaZHCsIdPfRQt6QS4gLw4Swt48SEUkGGnFa3lNTmMPyLHiqGxuibntB2kXbiQqR8YRwybzvR-kCuGtbaE8Q5941vCGDfyS0sFSUV2ESFDRV42bXj2BjW5WT-bb_QTGZ7qtr_uXBxQGBg58JRGDtKCi8dY7Rnq3t_2dF5uCWO-Z__Hxadc49SScTlAVTdKhO-SQS3FPxKKg4S3YH2nrSJLagJVDc6_Xbkn5gXZLZ3rpiO7ENOYLX31s4Q_mp_YZns1bpFh3vsYEs4SwZInLHnKkmcH8yyPmXhBzujO0d1c974cDWFIbWkcjtO9renS6jq0GY958AVBkfNjVYyHrAul8Ev8buZHmMVds_ijeTkxR_tq_-BXAAAA__9zHzAy
 
 # These rows are all on the same node 1 (gateway).
 query T
@@ -434,7 +434,7 @@ vectorized: true
       table: parent1@parent1_pkey
       spans: [/1 - /1] [/11 - /11] [/21 - /21] [/31 - /31]
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJyckt-L00AQx9_9K4Z5uupIuxv1ISBE76Lm6DVnUlGRPKzZsQ2k2bi7AaX0f5dshLseV_V8CfPrO_l8h92j-95ijOmn6-WrbAVnF1m5Lt8vZ1Cmy_R8DY_hTZFfQa8sd17AZZ6toN42rZbwocxWb-Gsb7SYwcd3aZHCGMO4RhAIQSAFQSRmkBcXaQGvP4cBJOyM5pXascP4CwqsCHtranbO2LG0DwOZ_oHxgrDp-sGP5YqwNpYx3qNvfMsY41p9bblgpdnOF0io2aumDWsnyqS3zU7Zn0h4btph17k4QBDUjZbhGxHUSiJh2auxPRdP5xJUpyEC47dsHVYHQjP4Gw7n1YYxFgf6P1ZxzPr7vKdheyVuA84X_8YnT_LdYA2dsZot6yOkalT-beQek1dsN3xpmo7tXB6bbPmbP0vEk9lL22y2U4iE-eBjSJ5T8oISSUlEybOTfqKH3Ltg15vO8V1f925ejGZYb3g6jjODrfnamjr8ZkrzoAsFzc5PXTklWRda4UHcFosHiOVdsfyjODoSLw7V4dGvAAAA__97ija9
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJyckt9v0zAQx9_5K0731MKh1g7wEAkpsAXI1LUjKQKEImTio43I4mA7Eqjq_47iTNo6rcD2Evt-fC-f78k7dD8bjDH9dLF4lS1hcpoV6-L9YgpFukhP1vAY3uSrc-iU5dYLOFtlS6i2daMlfCiy5VuYdLUWU_j4Ls1TGO4wjBEEQhBIQRCJKazy0zSH159DAxK2RvNSXbLD-AsKLAk7ayp2ztghtQsNmf6F8ZywbrveD-mSsDKWMd6hr33DGONafWs4Z6XZzuZIqNmrugljR8pkPL52P_g3Ep6Ypr9sXRxACKpay_CNCColkbDo1FCeiaczCarVEIHxW7YOyz2h6f01i_NqwxiLPT2MVxzyXq04uTqPEHdK3KSczf8PUh6FvGbrW2M1W9YHXOWg_FfLHU7P2W74zNQt25k8dNrwdz9JxJPpS1tvtuMVCVe9jyF5TskLSiQlESXPjvqJ7rP0nF1nWse3fd05eT6YYb3hcTnO9LbiC2uq8JsxXAVdSGh2fqzKMcjaUAqv4qZY3EMsb4vlX8XRgXi-L_eP_gQAAP__0cE51g==
 
 # Parent-grandchild.
 # We add the pa1 > 0 condition so a lookup join is not considered to be a better plan.
@@ -508,7 +508,7 @@ vectorized: true
           table: parent1@parent1_pkey
           spans: FULL SCAN
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJzElVGPozYQx9_7Kax5Cj1HxjawLNJKnO5ybU57yTXZqpXaPHDgJkgsUEOknlb73StgcyFsYiel5F5QCPPzjP__GfsJir8T8GDy--f7t9MZGr2fLh-Wv9wbaDm5n7x7QD-iD4v5J5QHUqQlRR_n0xlayyCNwk2cRAz9upzOfkKjPI6ogX77ebKYoNFoVL-jP7emycUdotRAb2fvUevf8A5RbhhovkDd4NtjwYwaR6P50aU530XnwS4WmQZgSLNIzIJHUYD3B1DAwAADBwwWYLBhhSGXWSiKIpNVyFMNTKN_wDMxxGm-Lau_VxjCTArwnqCMy0SABw_Bl0QsRBAJSUzAEIkyiJM6TUsuP5fxYyC_AoZ3WbJ9TAsPVZVjFMYRq58co3Xzsg6DqrplHlRhY8KIxQgjDAVphCjKyo2QsHrGkG3Ll8L29Xz5ijZBsTmsxKewel5hKMpgLcCjz_i_bdA-XPalOU5vLg9oayOdmvf1sEvq-RAnpZBCEuewmOZ_r-5Cv92DnudNZw_uS7_47UbcfXrpsDZ2exJj31Y8wvHT6TjvcD771qK7L71s5Sdl3K-TyUhIEXXXeVMl3kdt02Nxda6uHZ-EXIuPWZwKSW4Ol03EX-XIp2-MOxmvN81PwDDflh7yHezfYJ9hn2Pfwr59sjmsM3Z1Qb2zbJzlhLJO5PHc9kFuev6g8CFOAkJNYpvVk5pjQi1iW9WTWgMdDPT6HUTN4VuInW8jHcTG3Xk-Jg6xHOIQZyAD2fUNdIf3j5_vnzXMGO4nb0yoS2y3elJ3IBf5dxhDOryN1vk2skFs3A3fuH2u1h6yxsPifzTRur6Jt9e9jY9UsxBFnqWFOOuuNav9iGgtGomKbCtD8VlmYZ2meZ3XXH0zRaIom6-8eZmmzaeqwPNhtw9MWR_a6ZXaVNO0S5tt-rBuswuzC_Rml8FuH7ij94W00yu1qaa5Um9LbZalhClXu2X3mQ41rJkONaybDjWtmQ5Nas10OH3cuumjtxrW6K2GdXqraY3emtQavd0-et_20VsNa_RWwzq91bRGb01q3en_6vK4RHD66vK4RHENrZFcQ-s01-Aa0XXJdaq_ukKUqq-ef_g3AAD__7Rs3aA=
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJzElVGPm0YQx9_7KVbzZJq1lt0FjkM6iShxWkcXO7WvaqXWqghsbVQCdMFSo9N99wqwY8zZu3YplxdsYH47s___DPsIxd8JeDD59eP96-kMjd5Olw_Ln-4NtJzcT948oO_Ru8X8A8oDKdKSovfz6QytZZBG4SZOIoZ-Xk5nP6BRHkfUQL_8OFlM0Gg0qu_R71vT5OIOUWqg17O3qPU0vEOUGwaaL1A3-PZUMKPGyWh-cmnO99F5sI9FpgEY0iwSs-CzKMD7DShgYICBAwYLMNiwwpDLLBRFkckq5LEGptE_4JkY4jTfltXjFYYwkwK8RyjjMhHgwUPwKRELEURCEhMwRKIM4qRO05LLb_3_I_9LfAEMb7Jk-zktPFRtAaMwjlh95Ritm5t1GFRlLvOgChsTRixGGGEoSCNEUVZuhITVE4ZsW-4qPBT26QvaBMXmuCSfwupphaEog7UAjz7h_7ZT-3jZXZf4u98zO8wD2tpNp_BDUeyaot7FSSmkkMQ5rqh57tU96bc70vO86ezB3XWP327L_atdv7Wx27MY-7riCY6fT8d5h_PZ14bdv-nlLT8r42GdTEZCiqi7zqsq8SFqm56Kq3N17fgg5Fq8z-JUSHJzvGwi_ixHPn1l3Ml4vWn-Aob5tvSQ72D_BvsM-xz7Fvbts81hXbCrK-qdZeMsJ5R1Ik_nto9y08unhQ_6XSDUJLZZXak5JtQitlVdqTXQZ4K-fCtRc_heYpf7SYf1c_-ZHxOHWA5xiDOQk-zlnXSHN5JfbqQ18GAeZnFMqEtst7pSdyA7-TcYTDq8n9blfrJh_dyP47j9ya3NZI2Zxf_opvXybt6-7Il9opqFKPIsLcRF57FZ7UdEa9FIVGRbGYqPMgvrNM3tvObqQysSRdm85c3NNG1eVQVeDrt9YMr60E6v1Kaapl3abNPHdZtdmF2hN7sOdvvAHb2vpJ1eqU01zZV6W2qzLCVMudotu890qGHNdKhh3XSoac10aFJrpsPp49ZNH73VsEZvNazTW01r9Nak1ujt9tH7to_ealijtxrW6a2mNXprUuu-_s8Oj2sEp88Oj2sU19AayTW0TnMNrhFdl1yn-rMjRKn66um7fwMAAP__aa7wHQ==
 
 query T
 EXPLAIN (VERBOSE)
@@ -580,7 +580,7 @@ vectorized: true
           table: parent1@parent1_pkey
           spans: FULL SCAN
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJzElVGPozYQx9_7Kax5Cj1HxjawLNJKnO5ybU57yTXZqpXaPHDgJkgsUEOknlb73StgcyFsYiel5F5QCPPzjP__GfsJir8T8GDy--f7t9MZGr2fLh-Wv9wbaDm5n7x7QD-iD4v5J7SWQRqFmziJGPo4n85QHkiRlhT9upzOfkKjPI6ogX77ebKYoNFoVL-jP7emycUdotRAb2fvUevf8A5RbhhovkDd4NtjwYwaR6P50aU530XnwS4WmQZgSLNIzIJHUYD3B1DAwAADBwwWYLBhhSGXWSiKIpNVyFMNTKN_wDMxxGm-Lau_VxjCTArwnqCMy0SABw_Bl0QsRBAJSUzAEIkyiJM6TUs7P5fxYyC_AoZ3WbJ9TAsPVZVjFMYRq58co3Xzsg6DqrplHlRhY8KIxQgjDAVphCjKyo2QsHrGkG3Ll8L29Xz5ijZBsTmsxKewel5hKMpgLcCjz_i_bdA-XPalF05vLg9oayOdmvf1sEvq-RAnpZBCEuewmOZ_r-5Cv92DnudNZw_uS7_47UbcfXrpsDZ2exJj31Y8wvHT6TjvcD771qK7L71s5Sdl3K-TyUhIEXXXeVMl3kdt02Nxda6uHZ-EXIuPWZwKSW4Ol03EX-XIp2-MOxmvN81PwDDflh7yKfYZ9jn2Lezb2L852RzWGbu6oN5ZNs5yQlkn8nhu-yA3PX9Q-BAnAaEmsc3qSc0xoRaxrepJrYEOBnr9DqLm8C3EzreRDmLj7jwfE4dYDnGIM5CB7PoGusP7x8_3zxpmDPeTNybUJbZbPak7kIv8O4whHd5G63wb2SA27oZv3D5Xaw9Z42HxP5poXd_E2-vexkeqWYgiz9JCnHXXmtV-RLQWjURFtpWh-CyzsE7TvM5rrr6ZIlGUzVfevEzT5lNV4Pmw2wemrA_t9Eptqmnapc02fVi32YXZBXqzy2C3D9zR-0La6ZXaVNNcqbelNstSwpSr3bL7TIca1kyHGtZNh5rWTIcmtWY6nD5u3fTRWw1r9FbDOr3VtEZvTWqN3m4fvW_76K2GNXqrYZ3ealqjtya17vR_dXlcIjh9dXlcoriG1kiuoXWaa3CN6LrkOtVfXSFK1VfPP_wbAAD__29T3Yc=
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJzElVGPm0YQx9_7KVbzZJq1lt0FjkM6iShxWkcXO7WvaqXWqghsbVQCdMFSo9N99wqwY8zZu3YplxdsYH47s___DPsIxd8JeDD59eP96-kMjd5Olw_Ln-4NtJzcT948oO_Ru8X8A1rLII3CTZxEDL2fT2coD6RIS4p-Xk5nP6BRHkfUQL_8OFlM0Gg0qu_R71vT5OIOUWqg17O3qPU0vEOUGwaaL1A3-PZUMKPGyWh-cmnO99F5sI9FpgEY0iwSs-CzKMD7DShgYICBAwYLMNiwwpDLLBRFkckq5LEGptE_4JkY4jTfltXjFYYwkwK8RyjjMhHgwUPwKRELEURCEhMwRKIM4qRO09LOb_3_I_9LfAEMb7Jk-zktPFRtAaMwjlh95Ritm5t1GFRlLvOgChsTRixGGGEoSCNEUVZuhITVE4ZsW-4qPBT26QvaBMXmuCSfwupphaEog7UAjz7h_7ZT-3jZXVP4u98zO8wD2tpNp_BDUeyaot7FSSmkkMQ5rqh57tU96bc70vO86ezB3XWP327L_atdv7Wx27MY-7riCY6fT8d5h_PZ14bdv-nlLT8r42GdTEZCiqi7zqsq8SFqm56Kq3N17fgg5Fq8z-JUSHJzvGwi_ixHPn1l3Ml4vWn-Aob5tvSQT7HPsM-xb2Hfxv7N2eawLtjVFfXOsnGWE8o6kadz20e56eXTwgf9LhBqEtusrtQcE2oR26qu1BroM0FfvpWoOXwvscv9pMP6uf_Mj4lDLIc4xBnISfbyTrrDG8kvN9IaeDAPszgm1CW2W12pO5Cd_BsMJh3eT-tyP9mwfu7Hcdz-5NZmssbM4n9003p5N29f9sQ-Uc1CFHmWFuKi89is9iOitWgkKrKtDMVHmYV1muZ2XnP1oRWJomze8uZmmjavqgIvh90-MGV9aKdXalNN0y5ttunjus0uzK7Qm10Hu33gjt5X0k6v1Kaa5kq9LbVZlhKmXO2W3Wc61LBmOtSwbjrUtGY6NKk10-H0ceumj95qWKO3GtbpraY1emtSa_R2--h920dvNazRWw3r9FbTGr01qXVf_2eHxzWC02eHxzWKa2iN5Bpap7kG14iuS65T_dkRolR99fTdvwEAAP__ItPwBA==
 
 query T
 EXPLAIN SELECT * FROM grandchild2 JOIN parent1 USING(pid1) WHERE
@@ -643,7 +643,7 @@ vectorized: true
           table: grandchild2@grandchild2_pkey
           spans: FULL SCAN
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJzsl11vo0YUhu_7K0bnynTHhRkGbCNFYrXrbb1K8NaJ1EqtL1gzxUgOuIClrqL89wowNh9ejh2apBe5QTEzz5yP950T-wGSvzdgwfT3L9fvZw4ZfJzd3t3-eq2Q2-n19MMd-ZF8WsxvyGodbDxOZo4zXZCb6eLnKfk8nznEj93Q2y_OHTIYFH__tA08Rq6qy_krhbx3PpJy0yrweGNT9kpp7dLbu3SF_PbLdDElg3rMP3eapssrYtQPOa6trshIUch8cUw2z6MEGT-RZEkyoZSsX6PEZE_5tf0GUxSgEEaedNx7mYD1BzCgwIGCDhQEUDBgSWEbRyuZJFGcbXnIgZn3D1gahSDc7tLs9ZLCKoolWA-QBulGggV37teNXEjXk7GqAQVPpm6wycMU6dvbOLh3429A4UO02d2HiUWyXlCS5Zk_dUpWbpbQ7dbNloewfKQQ7dJ92GO0r9_I2k3W9Tg2ozantg7LxyWFJHV9CRZ7pE8rgtUPr4h-XiV-8cGvV6RyVXCVq5y4oUcYidK1jBtlHpPnlyT_KdikMpaxatYzL95bmT3tiisty5o5d-O9WeyKJ8uVvb3sqiMbVNWPB6zkRMWTDU5UfHng_gO19e827HjaLoxiT8bSq523zMhyy6kNYLN31ObvqK2_K2I2BbiRsS8_R0GYuadhn438Kx1UTlCu4sBf118BhfkutUhZGbUFtQ1qm9QeUXtM7cl3jSJ61H2iEicaRluVmc0OnYxt1GKz82-YeI4bpjJNNbTsybShyoRqiOzJxBMuHFLL4cJN3i5cu2EvfeHEK144fr7p-bOYvvyvMlRNVZiqqZpPsDtSxcHuoze7txv20nbnr2h3_Xy7G88z449jfaiysWqMsycbP8H0SC0H0zPtzfXtjr20641XdL043_X6s7i-HO3D6nec3PK8sHxypueRSg6eH79Zvt2wl7a8_j_5IXEiz4VMtlGYyLN-JmhZpdLzZdHEJNrFK_kljlZ5mOLjPOfy75GeTNJiVS8-zMJiKUvwfJhpvWizDz3qFRopmzVprUrzGqw1YX5Bw_llcKPhl9JmH3rUKzRStt7ZcNGtluiE2ahbLqOTNrths4_W3TCmNUIjWnfTiNZIaKTsUR-tx53wpFutSR-1umFMLYRG1OqmEbWQ0EjZrDVJL5GLdU9ShoxS1muWIjQmGYYjmiE4IhoWHCu910BlyEQ1ENVaI_Ui1bppVDUEx1TrxjHVkOBY6a3B2qna8vGHfwMAAP__TEWaug==
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJzsl19vo0YUxd_7KUb3yXTHhRn-2EaKNKtdb-tVgrdOpFZqrYo1U4zqBRew1FWU714BxuaPl2uHJulDXohh5sedM-fMjX0Pyd8bsGH666frtzOHDN7Pbu9uf75WyO30evrujnxPPizmN2S1DjYeJzPHmS7IzXTx45R8nM8c4sdu6O0H5w4ZDIrPP2wDj5Gr6nD-SCFvnfeknLQKPN6YlD1SWrP09ixdIb_8NF1MyaBe8_edpunyipj1lxzHVldkpChkvjguNl9HCTJ-YpElyQylZP0aZUz2lF-bbzJFAQph5EnH_SITsH8DBhQ4UNCBggEUTFhS2MbRSiZJFGdT7nNg5v0DtkYhCLe7NHu8pLCKYgn2PaRBupFgw537eSMX0vVkrGpAwZOpG2zyMsXyRfHnj-1f8itQeBdtdl_CxCbZflCSrTW_6pSs3GxRt1s3Gx7C8oFCtEv3pY8VP38lazdZ12sJRgWnQoflw5JCkrq-BJs90McJYfWXV4wXlc9nSPKLG78uTeWqwVWucuKGHmEkStcybug9quCXqPgQbFIZy1i16hKK53aWVVGJqG3bM-duvE-OqAS0HNlnTVTj2aCq4TxgJWdUAtrgjEpID9x_YLv-zQ07vm0XRrEnY-nV3rfMyHLKqQkg2Bsq-Bsq9DdFzaYBNzL25ccoCLMYNXK0kX-mg8oblKs48Nf1R0BhvkttUiqjwqDCpMKiYkTFmIrJN4Ni9NB9QokTDaOtyqzmDp2sbdZqs_OPmvGkR01lmmpq2ZVpQ5UZqmlkV2Y84uQhog4nb_J68tob9twnz3jBk8fPTz9_2vSX_2eGqqUalmqp1iNyj8g55H70mvv2hj137vkL5l4_P_fmE3f9Y6MfqmysmuPsysaPSD8i6pB-pr3Gv71jzx1_8wXjb5wff_1p4182-2H160-efV5kPzkz_IikQ_jHr9lvb9hzZ1__n_zYOLHOhUy2UZjIs35KaJlS6fmy2MQk2sUr-SmOVnmZ4naec_lXTE8maTGqFzezsBjKFng-zLRetNWHHvUqjchmTVqr0rwGa02YX7Dh_DK4seGX0lYfetSrNCJb79xwo9stoxNmo267zE7a6oatPl53w5jXCI143U0jXiOlEdmjPl6PO-FJt1uTPm51w5hbCI241U0jbiGlEdms1UkvsYt1d1KGtFLWq5ciNGYZhiOeIThiGlYck96roTKko5qIa62WepFr3TTqGoJjrnXjmGtIcUx6q7F2urZ8-O7fAAAA___ZbKyy
 
 query T
 EXPLAIN
@@ -701,7 +701,7 @@ vectorized: true
           table: parent1@parent1_pkey
           spans: [/10 - /39]
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJycktFvmzAQxt_3V1j3BJpXMORlSJGIWrZRJaQLqTZp44HhG0UimNlG2hTlf59sKrVETbb0zf7ufv6-O9iD-tVCBMnXu-UizYhzk-bb_PPSJXmyTK63RA07py8ldppd9Q1nLrVS9dC0nF1VRiEfNusVeWwit-s0I2OZ3Odp9pE4liNfPiWbZLyQ74PvhzgnzHfJIrt5rlZzEr53gUInOGblDhVE34BBQaGXokKlhDTS3jak_DdEPoWm6wdt5IJCJSRCtAfd6BYhgm35o8UNlhyl5wMFjrpsWvvsmDPuZbMr5R-gcC3aYdepiJhAlJj5gELel0bzmP_Om_lQHCiIQT85Kl3WCBE70NelYtNUj6s8Fev_AwUnAz3lGDohOUrkkwyFIf_V8sJUK5Q13oqmQ-kF06la_KmdmL1157KpH8YjUFgPOiJxSOPg5BjhJXtd1LXEutRCeuE0QH6_cmJmPO0pcE8azi4x3KDqRafweH8vvuybpSGvcfwISgyywjspKmszXteWswJHpcdqMF7Szpbsn_YcZhfAwTEcnIXDCewfw-FZeHYEF4c3fwMAAP__b9NtWA==
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJycklFvmzAQx9_3Kax7CppXMORlSJGIWrZRJaQLqTZpQxPDN4pGMLONtCnKd5-wI7VESbf0yb7_3c_3v4MdqF8NhBB_vlvMk5RMbpJsk31cOCSLF_H1hqh-O-kKia1mV13NmUONVD7UDWdX5aCQd-vVkhyKyO0qSYlNk_ssSd-TieHIpw_xOrYB-dp7XoAzwjyHzNObp2o5I8FbByi0gmNabFFB-AUY5BQ6KUpUSshB2pmChP-G0KNQt12vBzmnUAqJEO5A17pBCGFTfG9wjQVH6XpAgaMu6sY8a31G9vjW_cQ_QOFaNP22VSEZTFEyzAgUsq4YNJd5b9ypB_meguj1Y1eliwohZHv6Mmds7OywzuhwnvT2_678s64ezfStkBwl8pGRfCD_VXJitCXKCm9F3aJ0_fFoDf7Qk4i9dmayrh7sFSiseh2SKKCRf3aM4JLlzqtKYlVoId1gbCC7X04iNvQ0N98523B6ScM1qk60Co_3d_Jlb1ga8grtR1CilyXeSVGaNjZcGc4IHJW2Wd8GSWtS5nd7CrMLYP8Y9p-FgxHsHcPBs_D0CM73r_4GAAD__8bQcHA=
 
 ###############
 # Outer joins #
@@ -830,7 +830,7 @@ vectorized: true
           table: outer_c1@outer_c1_pkey
           spans: FULL SCAN
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJzMll9r4kAUxd_3Uwz3SbcjyeSPtYGFFNcuFqtdtbCwyJImdzVgM9lJhC3F774ktriGdiZhUHwRM5nf3Dnn3GTyAtmfNXgw-HE_uh6OSevrcDaffR-1yWwwGvTn5DO5mU7uCN_kKH6ljNw8jEbkdjIcvw6FjDzMhuNvpJXGEWsDhYRHOA6eMAPvJzCgYAEFGyg4QMGFBYVU8BCzjItiyksJDKO_4JkU4iTd5MXwgkLIBYL3AnmcrxE8mAePa5xiEKEwinUjzIN4XZZ5256fivgpEM9Aoc_Xm6ck80ixL0rSoEBmaVAMGWbHcEmQRIQRnq9QwGJLi0Vei-9rPj6TVZCtDqv5DBbbBYUsD5YIHtvSD0Ts1-EiQoFRdZ2LovB-1iZ5b15Zq2rGHYol3vI4QWFcHi47f07R2wU1eZgPpmVcQGGNv_OWzy7aX0S8XO3-AoUpJhEKj_Qn16PBrD9o-Yz6dpsS36LEdyjxXUr8bsWivXy7hvwGwsa8w1ODscrM92s7B7VZ_f6x9PrH7RjMPFIDsdM3UO-MGsiqH6KtFyIzOwY71mvAOn2KV2eUol0_RUczRbdjWMd6Fu3Tp8jMM4rRqR-jqRVjxzhWhA0kuO9JCCUSwrdfi5LwQI6WAOtDASfqwe4ZtaDio3CKWcqTDGt9LpiFcIyWuPMy4xsR4r3gYVlmdzkpufIYjjDLd3fZ69Uw2d0rdtiA1oEdHbirA_fkMKvC5v-wJYctKcwOabNK21phKWgdWBGWHFaEJYcVYTk6YbladitoHVhhtxxW2C2HFXZ3dey-1LJbQevACrvlsMJuOaywu6dj95WW3QpaB1bYLYcVdsth1Zu_0WFpNcW1aEeL7mrRPQXd7MRcbD_9CwAA__8Pq1y9
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJzMll9r4kAUxd_3Uwz3SbcjyeSPtYGFFNcuFqtdtbCwSEmTuyprM9lJhC3F774kqbiGNpMwKr5IMpnf3DnnXDN5hfjPChzo_bgfXPeHpPG1P5lOvg-aZNIb9LpT8pncjEd3hK8TFI8RIzcPgwG5HfWHb0M-Iw-T_vAbaUTLgDWBQsgDHHrPGIPzExhQMICCCRQsoGDDjEIkuI9xzEU65TUD-sFfcHQKyzBaJ-nwjILPBYLzCskyWSE4MPWeVjhGL0ChpesGmHjLVVZmuz13e_EY_cYXoNDlq_VzGDsk3R0lkZeCk8hLhzS9pdnECwPCCE8WKGC2oelSb1vYVX56IQsvXuzXdBnMNjMKceLNERy2oR9I2a3DRYACg-I6F2nh3ax1-N68rFbRkjsUc7zlyxCFdrm_7PQlQiePa_Qw7Y2z0IDCCn8lDZddNL-I5XyRXwKFMYYBCod0R9eD3qTba7iMumaTEtegxLUocW1K3HbBop18s4L8GsKGvMUjjbHCzPdrW3u1WfUuMg7RRXZLY_qR2oidvo06Z9RGRvUozUNEyfSWxo71SjBOn-XVGWVpVs_SOkiWdkszjvW_NE-fJdPPKEyrepj6AcJsaccKsoYQ-z0h_laI_5EQf_trUOLviVKSYXwo40T92D6jdpR8OI4xjngYY6WPCT0VjsEccy9jvhY-3gvuZ2Xy21HGZcdzgHGSP2Vvd_0wf5busAatAlsqcFsF7pTDrAjr_8NGOWyUwmyf1ou0qRSWhFaBJWGVw5KwymFJWJZKWLaS3RJaBZbYXQ5L7C6HJXa3Vey-VLJbQqvAErvLYYnd5bDE7o6K3VdKdktoFVhidzkssbsclr35ax2WRl1cibaU6LYS3ZHQ9U7M2ebTvwAAAP__BTlqQg==
 
 query T
 EXPLAIN (VERBOSE) SELECT * FROM outer_gc1 FULL OUTER JOIN outer_c1 USING (pid1, cid1, cid2)
@@ -891,7 +891,7 @@ vectorized: true
           table: outer_c1@outer_c1_pkey
           spans: FULL SCAN
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJyckm-Lm0AQxt_3UyzzKunNkazm-kco7JF6xcOLVzVQKKFYd2oF49pdhR4h372obS_KJZf2TWCenWfye8bZgflRgAPup3v_2luxyXsviqOP_pRFru8uY_aS3YTBHVNNTfpLlnJ2s_Z9dht4q99aytk68lYf2KTKJUeW_vm1poBQKkmrZEsGnM_AAeEKNgiVVikZo3Qr77omT_4EZ46Ql1VTt_IGIVWawNlBndcFgQMrdamqmQ0IkuokL7q2PYJq6keTqZOMwFns8WAwPz04Tr4WFFIiSc_mg_HwN7iodL5N9AMgLFXRbEvjsHFiZFlfZGnSho2qpG27hGOU_H8p-VOU50KeCWcdhXtkakqlJWmS44_yfMsTCe9IZ3Sr8pL0zBomjB8qcvrjC9axG3YnCAgFfasngl-gsC5Q2BfTdzrPvg8lQAiplKQdtgyufTdauhPBUbya4oFgoXg9EGwUb6bIxAKZuEIm3h7dlD3Y1DNXHJKpVGnorDOet2simVG_dqMandK9Vmn3N30ZdL5OkGTq_nXRF17ZP7WAh2Z-0mwPzHxstv7BbI3N9knzfIS92b_4FQAA__9AYngC
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJyckt9um0wQxe-_p1jNlf15InvB6R-kShu5pCIidgpYqlRZEWWnFJWwdBekRpbfvQJax6DYcXuD2LNzht8ZZgvmRw4OuJ_u_CtvyUbvvTAKP_pjFrq-u4jY_-w6WN0yVVek79OEs-u177Oblbf8rSWcrUNv-YGNykxyZMmfpzUGhEJJWsYPZMD5DBwQLmGDUGqVkDFKN_K2LfLkT3BmCFlR1lUjbxASpQmcLVRZlRM4sFQXqpzagCCpirO8LdshqLp6MpkqTgmc-Q4PGvPTjaP4S04BxZL0dNZrD_vgYv92X36nR0BYqLx-KIzDhsGRpd0hTeImc1jGTdkFHIPl_wrLn4Pds56FeiaidRTxiawulJakSQ7_0Mslz-S8JZ3SjcoK0lOrnzN6LMnpNnG1jtyg3UdAyOlrNRJ8gsKaoLAn43c6S7_1JUAIqJCkHbZYXfluuHBHgqN4NcYDwULxuifYKN6MkYk5MnGJTLw9Oim7N6kXVjogU6rC0Fk7PWvGRDKlbuxG1TqhO62S9jPdcdX6WkGSqbrbeXfwiu6qATw085Nmu2fmQ7P1F2ZraLZPmmcD7M3uv18BAAD__7KcfNU=
 
 query T
 EXPLAIN (VERBOSE) SELECT * FROM outer_c1 LEFT OUTER JOIN outer_p1 USING (pid1) WHERE pid1 >= 0 AND pid1 < 40
@@ -945,7 +945,7 @@ vectorized: true
       table: outer_p1@outer_p1_pkey
       spans: [/0 - /39]
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJzMlWFrm0AYx9_vUxzPq2a94J2aNBUKltZuKWnSJSkbbDKsPkuE1HOnwkrJdx9qS6tLNeVosjchnv7uuef_u-MeIPm9Agucb9ej0-GYHJwPZ_PZl1GHzJyRczYnH8nFdHJFRJai_OlzMnIu5uRyMhw_DsWc3MyG40_kIA4D3iFfPztTp3wgPzLGDDwhrENOx-cvB31isg5QiESAY-8OE7C-AwcKOlAwgIIJFHrgUoil8DFJhMw_eSiAYfAHLEYhjOIszYddCr6QCNYDpGG6QrBg7t2ucIpegFLL5w0w9cJVUeZp3XYswztP3gOFM7HK7qLEIvkKKYm9HJnFXj6ksa7WI14UEE5EukQJ7prmkzwWf655e0-WXrKsVrM5uGuXQpJ6CwRLX9NXmnieJ4uEDFBiUJnJzcmnTzZ9ADY_LGvVw7hCucBLEUYotX6Vmd_HaJVSJzdzZ1qoBQor_JUe2PywcyLDxbL8CxQmWWoRm1Nbp7ZBbZPa_Vocz60aCq1uaGIsuiLWOKuHsrG2WanNt98rutpe6XU1zt5ps_Ddb5ajPW0WfXthhpowzroaf6_jre_e2GBPxoztjZmKxnpdTX-vM2bs3tjxnoyZ2xtjm4z5Dcb8p1-dEr9-mZpMSRh_tYsdCev9BzfohiVOMYlFlOBW9yPLm8RggWVuicikj9dS-EWZ8nFScMW9E2CSlm85K5-GUfGuOD1voFVgUwXuq8CDZpjXYfYS1iswr8N6I8yribE6bSjJaqFV4BZZzXCLrGa4RZapIqunFHcLrQK3xN0Mt8TdDLfE3VeJ-0gp7hZaBW6JuxluibsZbol7oBL38VvifiutApsqcF8FHjTD_J97ozFvd_3hbwAAAP__eoaomw==
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJzMlWFPm0AYx9_vU1yeV3Zewx3QWklMMIpbTW1dW7MlGzEIz9pmlWMHJDOm330BbBRWoea07k1TDn733PP_3eXuIf69BAucb5eD4_6Q7J32J9PJl0GLTJyBczIlH8nZeHRBRJqgvPY5GThnU3I-6g8fhiJOrib94SeyFy0C3iJfPztjp3ggP1LGDDwirEWOh6dPB31ishZQCEWAQ-8WY7C-AwcKOlAwgIIJFDrgUoik8DGOhcw-uc-BfvAHLEZhEUZpkg27FHwhEax7SBbJEsGCqXezxDF6AUotmzfAxFss8zLrddvrP9fRL7wDCidimd6GsUWydVISeRk4ibxsSGNtrUO8MCCciGSOEtwVzaZ6WMJj5Zs7MvfiebmmzcFduRTixJshWPqKPtPK4zxpKGSAEoPSTG5Grj_Z9AHYfL-oVY3kAuUMz8UiRKl1y8z0LkKrUDu6mjrjXDBQWOLPZM_m-60juZjNi79AYZQmFrE5tXVqG9Q2qd2txPHYqqHQ6oYmhqItIo2zaigba5ul2nz7HaO_xo7ptDXO3mjL8N1vmYN32jL69tqM19DGWVvjb3XU9d17672TN2N7b-areOu0Nf2tzpuxe2-H7-TN3N4b2-TNX3vzn_Pmr391SvzqJWsyJW382V52pK3zH9ysG5Y4xjgSYYxb3ZssaxKDGRa5xSKVPl5K4edlisdRzuU3UYBxUrzlrHjqh_m7_Ay9gFaBTRW4qwL36mFehdlTWC_BvArrtTAvJ8aqtKEkq4FWgRtk1cMNsurhBlmmiqyOUtwNtArcEHc93BB3PdwQd1cl7gOluBtoFbgh7nq4Ie56uCHunkrchy-J-6W0CmyqwF0VuFcP83_ujdq83dWHvwEAAP__q5iz3Q==
 
 query T
 EXPLAIN (VERBOSE) SELECT * FROM outer_p1 RIGHT OUTER JOIN outer_gc1 USING (pid1) WHERE pid1 >= 1 AND pid1 <= 20
@@ -999,7 +999,7 @@ vectorized: true
       table: outer_p1@outer_p1_pkey
       spans: [/1 - /20]
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJzMlW9Po0AQxt_fp9jMK3tuU5Y_tZKYYBQVU1uvxdwld-SCMEdJKsstkJwx_e4XQKPlKtSsqfem6S7725l5ntnMA2S_l2CC_e16fOxMyN6pM3fnX8Y9MrfH9olLPpOz2fSK8CJH8TNlZOacX7jkcupMHveigJGbuTM5J3tpHLIe-Xphz-x6QX4UiqLhEWE9cjw5fbkZHBFV6QGFhIc48e8wA_M7MKCgAgUNKOhAwQCPQip4gFnGRXnkoQKc8A-YCoU4SYu83PYoBFwgmA-Qx_kSwQTXv13iDP0QxaC8N8Tcj5dVmKdqrFTEd764BwonfFncJZlJyhQpSf0Smad-uTVg_YFB_CQkjPB8gQK8FS0veQz-HPP2niz8bLEezWLgrTwKWe5HCKa6oq8U8XxPkXARosBw7SavJJ-ObDoAFtuvYzXFuEIR4SWPExSD4Trj3qdokrF95pLpjWvPKnOBwhJ_5XsW2-8diTha1H-BwrTITWIxah1QS6WWRi2dWkZDkedqNYlqN9Qx4X2eDpjS1GVjbH0tNtu-XVS5djH6ZYbv1yNs9z1y8HE9om7vkyb5rJX-gDXTkjFK3b1Ro48zStveKF3SKKM_UN_zRWm7N-rw44zStzdK2WRUFLQ4FTz9qpRE9SIKmtNTZVLmsVfL2ZF5xv8xMjdkOcMs5UmGWw1EpawTwwhr6TJeiACvBQ-qMPVyWnHV0Akxy-uvTKlXTlJ9qx7TG2gZWJeBhzLwqB1mTVh5CatrMGvCaivM1hVTmrQmZVYHLQN3mNUOd5jVDneYpcuYZUjJ3UHLwB1yt8MdcrfDHXIPZeQ-kJK7g5aBO-Ruhzvkboc75B7JyH34FrnfSsvAugw8lIFH7TD7Z2606u2tPv0NAAD__9BOo-w=
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJzMlW1L40AQx9_fp1jmlT23JJuHWgNCRKNGauu1kTu4CxKTubRczebyACfS734ksWhzNalsae9N6W72tzPz_88yz5D-noMB1rfbwak9JAfn9sSZfBl0yMQaWGcO-UwuxqMbwvMMk_uYkbF9eeWQ65E9fNkLfUbuJvbwkhzEs4B1yNcra2xVC_Ijl2UVTwjrkNPh-dtN_4QocgcoRDzAofeIKRjfgQEFBSioQEEDCjq4FOKE-5imPCmOPJeAHfwBQ6Ywi-I8K7ZdCj5PEIxnyGbZHMEAx3uY4xi9ABOpuDfAzJvNyzDLaszln_v4Fz4BhTM-zx-j1CBFopTEXgFOYq_YklhX0okXBYQRnk0xAXdBi6teUniN_PBEpl46XY1pMnAXLoU080IEQ1nQd0p5vSePeBJggsHKTW5BLo-sOwAmO6xi1SW5wSTEaz6LMJF6q4zzFKNBBtaFQ0Z3jjUuLQYKc_yZHZjssHOSzMJp9RcojPLMICaj5hE1FWqq1NSoqdcUea1WFah2TR1D3uWxxOS6Lmtjayux2eZNo2yjafRukef2OoXtvlOO9tcpyuZuqVt54nJXYvXkROxSdm9Xf392qZvbpW3FLr0rKdt8Xeru7Tren13a5nbJ6-wK_aVfof-eYf7yV6EkrBahXx-rChPykL1b1Y481P-PWbomyzGmMY9S3GhSykWdGIRYSZfyPPHxNuF-GaZajkqunEMBpln1lcnVyo7Kb-Wb-gAtAmsicE8E7jfDrA7Lb2FlBWZ1WGmE2apicp1WhcxqoUXgFrOa4RazmuEWszQRs3QhuVtoEbhF7ma4Re5muEXunojcR0Jyt9AicIvczXCL3M1wi9x9EbmPPyL3R2kRWBOBeyJwvxlm_8yNRr3dxae_AQAA___gSq-V
 
 query T
 EXPLAIN (DISTSQL) SELECT * FROM child1 JOIN child2 USING(pid1)
@@ -1020,7 +1020,7 @@ vectorized: true
       table: child2@child2_pkey
       spans: FULL SCAN
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJycklGLEzEQx9_9FGGeWh25JkWFgBA5q-zRa89uBUH2IW7GvcB2syZZUMp-d9nk4ezROz1fQjIz_5nff8gRwo8WJKy-3KzfFRs2e1-U-_LTes7K1Xp1uWfP2Yfd9prVt7Y1nF1ti02-C_a5LDYf2ay3hs8BoXOGNvpAAeRX4FAh9N7VFILzU-iYCgrzE-QCwXb9EKdwhVA7TyCPEG1sCSTs9beWdqQN-YsFIBiK2rapbaZQvbcH7X8BwqVrh0MXJJsokNX51BwQyl5PiZdQjQhuiHcDQ9QNgeQj_h8UPwMlHoUS6VxOaOJf0MSDaHdEQ-e8IU_mhKaalH8rOePvmnxDV8525C_Eqb-WvseZ4i_mb71tbvMVELZDlExxVALVEtUrVK9RvXnQ0vIp295R6F0X6L61s50Xkx8yDeX9BDf4mm68q9OY_NwmXQoYCjFnRX4UXUql7_CnmD9BLO6LxaPi5Yl4MVbjs98BAAD__6SII3Q=
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJycklGL1DAQx9_9FGGednXkNikqBITIuUqPvfbcriBIkdqMvWKvqUkKytLvLk0ezj121b2XNJmZ_8zvP3QP7kcHEtafbjZv0owt3qbFrviwWbJivVlf7thT9m6bX7P6tu00Z1d5msW7YB-LNHvPFkOr-RIQeqMpq-7IgfwMHEqEwZqanDN2Du1DQap_glwhtP0w-jlcItTGEsg9-NZ3BBJ21deOtlRpshcrQNDkq7YLbSOFip8vw3f6BQiXphvveifZTIKsjmfFAaEYqjnxHMoJwYz-fqjzVUMg-YSPA-NHwEQEE6fBRDiTGU_8D544iXdPNfbGarKkD4jKWfmvkiMer8k2dGXanuyFOPTY0Te_UPzZ8rVtm9t4BYR89JIpjkqgSlC9QPUS1auTlpJzNr4lN5je0UNrRzuvZj-kG4r7cWa0Nd1YU4cx8ZkHXQhocj5mRXykfUiFX-JPMT9DLB6KxV_FyYF4NZXTk98BAAD__7hiJgc=
 
 query T
 EXPLAIN (DISTSQL) SELECT * FROM parent1 JOIN parent2 ON pid1=pid2
@@ -1043,7 +1043,7 @@ vectorized: true
       table: parent2@parent2_pkey
       spans: FULL SCAN
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJyckUGL2zAQhe_9FWJOu63KWkpPggWXNAWHxE7jHArFB9WaugZHUiUZWoL_e7EcSBOSttmTPU96M98bHcD_6EDA4vNm9T7LycOHrNyVn1aPpFysFvMdeU0-bos1sdKhDowsiyw_FpwUObGtYuR5_HCgoI3CXO7Rg_gCDCoK1pkavTdulA7xQqZ-gkgotNr2YZQrCrVxCOIAoQ0dgoCd_NrhFqVC95QABYVBtl1seyRJrWv30v0CCnPT9XvtRYShxEoGFEorR-ktVAMF04fTLB9kgyDYQF_Gw67x8Bs8fOTh_8PDb_KcMHptnEKH6gyhGp3_unIl1Bpdg0vTanRP_DxUh9_CQ8rePD67tvk-_QKFog-CpIymnKYzmr67GWZ2z3K36K3RHi9DXe2cjElQNThtxpve1bhxpo5jprKIvigo9GE65VOR6XgUX_9PM7vDzC_N_K_m2Zk5Garh1e8AAAD__8jUIAk=
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJycktGL1DAQxt_9K8I83WnkmqxPgYPKuUKPvfbc7oMgRWIz1mIviUkKytL_XZoW1l266t5TOl_yzfy-oXvwPzoQsP74uHmb5eTqXVbuyg-ba1KuN-u7HXlJ3m-LB2KlQx0YuS-yfC44KXJiW8XI7XhwoKCNwlw-oQfxCRhUFKwzNXpv3Cjt44NM_QSRUGi17cMoVxRq4xDEHkIbOgQBO_mlwy1Khe4mAQoKg2y72HYmSefzs_2Ov4DCnen6J-1FJKLESgYUSitH6TVUAwXTh8NAH2SDINhAnwfFlqD4DMWXoPgIxf8Hip-FOrD02jiFDtURRzU6__VkIdkDugbvTavR3fDjZB1-DVcpe3V969rm2_QJFIo-CJIymnKarmj65myY1SUb3qK3Rns8DbXYORmToGpw2ow3vavx0Zk6jpnKIvqioNCH6ZZPRabjVfwF_jSzC8z81Mz_al4dmZOhGl78DgAA___zjyOo
 
 # Join on "non-interleaved" column uses hash joiner.
 query T
@@ -1065,7 +1065,7 @@ vectorized: true
       table: child1@child1_pkey
       spans: FULL SCAN
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJyckkGL2zAQhe_9FWJOSVFZy24vggWVbUq9pPY2zqFQfFCtaSJwJFWSoSX4vxfbhdQhaZu9GPRm3sz3Bh8hfG-Bw-rz0_ptXpDFu7zaVp_WS1Kt1quHLXlJ3m_Kj8RJjyYy8ljmBWn2ulWMlAVxkpF70kgGFIxVWMgDBuBfgEFNwXnbYAjWD9JxbMjVD-AJBW1cFwe5ptBYj8CPEHVsEThs5dcWNygV-rsEKCiMUrfj2N8Ywnl9kP4nUHiwbXcwgROnFaMDEFConBykV1D3FGwXT7tClDsEznr6PB4255kucR2nmb7_B5VehTqxdMZ6hR7VjKMenP9quZDsgwz7R6sN-rt0HqzFb3Eh0uW917t9XIhsCRTKLnIiGBUpFRkVr6l4czVMdsuFNxicNQHPQ12cnAxJUO1wukywnW_wydtmXDM9y9E3CgpDnKrp9MjNWBp_gT_N7AZzem5O_2rOZuakr_sXvwIAAP__RNgflQ==
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJycktGr0zAUxt_9K8J52iRym1ZfAhci14kds53rHgQpEpvjVuySmKSgjP7v0nYwOzZ1vjTky_nO-X2HHsF_b4DD4uN69TrNyOxNWmyLD6s5KRarxdOWPCdvN_l7YqVDHRhZ5mlGqn3dKEbyjFjJyCOpJAMK2ijM5AE98E_AoKRgnanQe-N66TgUpOoH8IhCrW0bermkUBmHwI8Q6tAgcNjKLw1uUCp0DxFQUBhk3QxtTxjidH623_AnUHgyTXvQnhNbK0Z7KqBQWNlLL6DsKJg2nAf6IHcInHX0_6DYFGpchxiPG0jV-P03sPgm2Jmn1cYpdKgmLGXv_FvJlXTvpN8vTa3RPcTTcA1-DTMRzx9dvduHmUjmQCFvAyeCURFTkVDxkopXN8Mk92x5g94a7fEy1NXOUZ8E1Q7HzXjTugrXzlTDmPGaD75BUOjD-BqPl1QPT8Nv8LuZ3WGOL83xH83JxBx1ZffsVwAAAP__3qYirQ==
 
 query T
 EXPLAIN (DISTSQL) SELECT * FROM child2 JOIN grandchild2 USING(pid1, cid2)
@@ -1086,7 +1086,7 @@ vectorized: true
       table: grandchild2@grandchild2_pkey
       spans: FULL SCAN
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJzEld9vmzoUx9_vX2Gdp_bWkbGB_EC6ElddN6Vqk67ppEkTDxQ8gkQxM0RaVeV_n4BWKWlmwxjNiyWDPz7nfL-2zxPkPxJw4OLrzdX_8wU6-TBf3a0-X52i1cXVxfkd-hd9vF1eo2AdJyFDl8v5AkXST8PnD19W88UndJLFIcUoiEN2ChhSEfKF_8BzcL4BBQwMMJiAwQIMNngYMikCnudClkueKmAe_gTHwBCn2aYoP3sYAiE5OE9QxEXCwYE7_z7ht9wPuSQGYAh54cdJFabOx81k_ODLR8BwLpLNQ5o7aJdbNZoYBX6Z0Crzy98j8LYYxKZ4DruLdv-I1n6-bsZxKXYZeFsPQ174EQeHbvGfVUCbO7-StV0ZUT2JmuUQRixGGGHIT0NEkSjWXPatkf22xt1Wm1TIkEseNjbzSvJlyaEF4NIz7LKzOt6-XtdcRvxSxCmXZNzkEv69OHmGT_-TcbTeTQHDclM4qKoEuyZ2LexOsDvF7mxPi12RZo8iD6S-ECOREUr35TgY22rEpu0PkTXEISLUILZRjtQYEWoR2ypHag13puhxztTsXc8Ua-8rG8TXl7dhRMbEGpMxGQ_nKDuOo5N3ddRs76g9zE3dXc4RoVNiT8uRTofz1TyOr9R4V2Ot9saagxj7ckFHrx_jylVWu5r_XVut49g6PVpTP5DYLc8zkea8Vcs2ytJ4GPFasVxsZMBvpAiqMPV0WXFVdwt5XtR_WT2Zp_WvMsH28KQPTGkf2u4Dz9Qw7aAY6wZP-sB7inWk7T7wTA2zfdh4DZtquU0lTJt6G_u01ccsNawxSw3rzFLTGrPUsMYsu49Z4z5yq2GN3GpYJ7ea1sithjVyT_rIPe0jtxrWyK2GdXKraY3calgj96yP3LRLs3z7hHbpll1p7ePfpV92pTWa0zfNQym6t_3nVwAAAP__Q9lqFA==
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJzElW9vmzAQxt_vU1j3ql0dGRvIH6RJTF03pWqTrumkSROaKHgEjWIGRFpV5btPQKuENLNhjOSNEwM_393z2L4nyH5FYMHF15ur99MZOvkwXdwtPl-dosXF1cX5HXqLPt7Or5G3DCOfocv5dIaC1I395wdfFtPZJ3SShD7FyAt9dgoYYuHzmfvAM7C-AQUMDDDogMEADCY4GJJUeDzLRFp88lQCU_83WBqGME5WefHYweCJlIP1BHmYRxwsuHPvI37LXZ-nRAMMPs_dMCrDVPnY1c_35Cd_BAznIlo9xJmFNvmVo46R5xZJLRK3eD0AZ41BrPLn0JuI949o6WbLeiybYpuBs3YwZLkbcLDoGv9bFbS-8pa09tb_BvUE1SSo10UYMRhhhCE39hFFIl_ytGux7K_FbpZaxSL1ecr92mJOQb58su8DsOkZttlZFW9XuGueBvxShDFPybDORfxHfvIMn75Lw2C5mQKG-Sq3UFkJtnVsG9geYXuM7cmOFpsi9Q5F7kl9JgYiIZTuyrE3tlGLTZvvJqPX3USoRkytGKk2INQgplGM1Ohvc9HjbK7JQTcXa24w69fgl9tiQIbEGJIhGfZnLTuOtaODWqs3t9bs-exujuuA0DExx8VIx_0ZrB_HYKod1GGjucN6vw6_HNnB9j1d2ssqe7P_669xHH_HR2v8exK75Vki4ow3autaURr3A14plolV6vGbVHhlmGo6L7my8fk8y6u3rJpM4-pVkWBzeNQFprQLbXaBJ3KYtlCMtYNHXeAdxVrSZhd4IofZLqxtw7pcbl0K07re2i5tdDFLDivMksMqs-S0wiw5rDDL7GLWsIvcclghtxxWyS2nFXLLYYXcoy5yj7vILYcVcsthldxyWiG3HFbIPekiN23TLF9foW26ZVtaefm36ZdtaYXm9FXzkIrurN_8CQAA__-q_3wM
 
 # Subset join on "interleaved" columns uses hash joiner.
 query T
@@ -1108,7 +1108,7 @@ vectorized: true
       table: grandchild2@grandchild2_pkey
       spans: FULL SCAN
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJzEld9umzAUxu_3FNa5aidHxgbyB2kSU9dtqbqkazpp0sQFBS9BopgZIq2q8u4T0C4lzWwYg91YMubnc8732T4PkP2IwYHzr1eXb-cLdPJuvrpZfb48Ravzy_OzG_Qavb9efkLBJopDhi6W8wVaSz8JHz98Wc0XH9BJGoUUoyAKzVPAkIiQL_w7noHzDShgYIDBBAwWYLDBw5BKEfAsE7L45aEE5uFPcAwMUZJu8-KzhyEQkoPzAHmUxxwcuPFvY37N_ZBLYgCGkOd-FJdhqnzcVEZ3vrwHDGci3t4lmYN-58aqDDEK_CKhVeoXyyPwdhjENn8Mu492e482frapx3Epdk3wdh6GLPfXHBy6w39XAa3v_EzWZmWsq8m6Xg5hxGKEEYb8JEQUiXzDZdca2R9r3G-1TYQMueRhbTOvIHW_HBHqo59tLkSUcEnG9exi_j0_KVM8fSOj9eZpAhiW29xB5Qy7DLsWdsfYnWJ3dlD_vjCzQ2FHsl6IkUgJpYcSHI1t1WLT5gfH6uPgEGoQ2yhGaowItYhtFSO1-jtHdNhzNBvsHLHmXrJevHx6A0ZkTKwxGZNxfy6yYV2cDOai2dxFu58bub-EI0KnxJ4WI53256U5rJfUGMxMq7mZZi9mPl3E0fOHtnSSVU5m_9ZKa1grp_-lSR_J6ZpnqUgy3qgFG0VVPFzzSqVMbGXAr6QIyjDVdFlyZbcKeZZXq6yazJNqqUiwOTzpAlPahba7wDM1TFsoxtrBky7wgWItabsLPFPD7BA2nsOmWm5TCdO63sYhbXUxSw1rzFLDOrPUtMYsNawxy-5i1riL3GpYI7ca1smtpjVyq2GN3JMuck-7yK2GNXKrYZ3calojtxrWyD3rIjdt0yxfPqFtumVbWvv4t-mXbWmN5vRF81CK7u1e_QoAAP__OX5gyg==
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJzElW9vmzAQxt_vU1j3qp0cGZs_SZAmMXXdlqpLuqaTJk1oouAlaBQzINKqKt99AtolpJkNY7A3JMb8fHfPY_seIPsRgQ3nn68uX8_m6OTNbHmz_Hh5ipbnl-dnN-glenu9-ID8dRgFDF0sZnO0Sr04eHzxaTmbv0MnSRhQjPww0E8BQywCPvfueAb2F6CAgQEGHTAYgMEEF0OSCp9nmUiLTx5KYBb8BFvDEMbJJi9euxh8kXKwHyAP84iDDTfebcSvuRfwlGiAIeC5F0ZlmCofp_r5mnzn94DhTESbuziz0e_8WJUlRr5XJLVMvGJ6BO4Wg9jkj6F3EW_v0drL1vVYDsWODu7WxZDl3oqDTbf476qg9ZX3pHX2_jeoZ1UNVvW6CCMGI4ww5MUBokjka552LZb9sdjdUptYpAFPeVBbzC1I1SdHFHvvZesLEcY8JVY9u4h_y0_KFE9fpeFq_TQADItNbqNyhB2GHQM7FnYm2Jke1L8rTO9Q2JGs52IkEkLpoQRHYxu12LT5DjJ63UGEasTUiifVRoQaxDSKJzX621B02A01HWxDseamsn5NfboVRsQihkUsYvVnJxvWzvFgdurN7TR7PqO7YzkidELMSfGkk_5M1Yc1lWqDuWo0d1Xv19Wnoznav4NLS1llafZvPTWG9XTyXxr5kZyueZaIOOON2rRWVMWDFa9UysQm9flVKvwyTDVclFzZyAKe5dUsqwazuJoqEmwOj7vAlHahzS7wVA7TFoqxdvC4C3ygWEva7AJP5TA7hLV9WJfLrUthWtdbO6SNLmbJYYVZclhllpxWmCWHFWaZXcyyusgthxVyy2GV3HJaIbccVsg97iL3pIvcclghtxxWyS2nFXLLYYXc0y5y0zbN8vkV2qZbtqWVl3-bftmWVmhOnzUPqeju9sWvAAAA__9TrXLC
 
 # Multi-table staggered join uses merge joiner on the bottom join
 # and a lookup join on the higher join.
@@ -1141,7 +1141,7 @@ vectorized: true
           table: child1@child1_pkey
           spans: FULL SCAN
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJycklFv0z4QwN__n8K6p_a_Q2vSwkQkJMNWUKauHUmRQCgPJj4yQ2oH25FAVb87SlLUpmrHylNyvvvZvzt7De5HCRFMP97PXsdzNriJ02X6fjZk6XQ2vV6y_9nbZHHHCiu0zB9UKQN2u4jnbPv_IY3n79igUjJAlisZDLt0JSxp38sP2SK5mSbszSfWhICgjaS5WJGD6DMEkCFU1uTknLHN0rotiOVPiEYISle1b5YzhNxYgmgNXvmSIIKl-FJSQkKSvRwBgiQvVNluuyfOK6tWwv4ChGtT1ivtIrYTR1b8-YhGLq1EU_AMsg2Cqf3udOdFQRAFG_w3w6Bv-DS5J0qFJ6V2LrU2VpIl2fPIGvJvJUc6uyNb0K1Rmuxl2O-spK9-wIML5OHF8JVVxcMuBIRF7SPGA-Qh8jHyCfLnyF8gvzrZ3fickTdO24mP-17bx7k38pkx3-uKfTNKM6Mbq6N-V8hfnpSbnCOXkKuMdnR4BUd3HjVzJ1lQd4_O1Dane2vy9pguXLRcuyDJ-S4bdkGs21T7YPfh4Aw4PITDR-FxDx4dwuNH4ckBnG3--x0AAP__7dt9rQ==
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJyckl9v0zAQwN_5FNY9tezQmqQwEQnJsBWUqWtGUiQQilCIjywss4PtSKCq3x3lz9SmakfLU3y--zm_O3sF5lcJPsw-387fBgs2ugriZfxxPmbxbD67XLLn7H0U3rBcp1Jkd0UpHHYdBgvWrz_FweIDG1WFcJBlhXDGXbpKNUk7yI9ZGF3NIvbuC2tCQJBK0CJ9IAP-V3AgQai0ysgYpZutVVsQiN_gTxAKWdW22U4QMqUJ_BXYwpYEPizT7yVFlArS5xNAEGTTomyP3RLnW-tv1T39AYRLVdYP0vhs0wGy_PGTNpZxlTYFLyBZI6jabjSMTXMC31nj_6k6Q9Xe8gjBI8Xcg2Ibn1oqLUiTGLgkDfmvkj3d3ZDO6VoVkvS5O-yupB92xJ0z5O7Z-I0u8rtNCAhhbX3GHeQucg_5FPlL5K-QXxzszjtl7I1TP3Vv6NW_VN5_H-c-V-q-rthPVUimZKO2V_IC-euDhtNTDCMylZKGdu9h78mTZvgkcuou06haZ3SrVdb-pgvDlms3BBnbZd0uCGSbal_uNuycALu7sPsk7A3gyS7sPQlPd-Bk_exvAAAA___ZuYQa
 
 # Multi-table join with parent1 and child1 at the bottom uses merge
 # joiner but induces a hash joiner on the higher join.
@@ -1173,7 +1173,7 @@ vectorized: true
           table: grandchild1@grandchild1_pkey
           spans: FULL SCAN
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJyckl1v0zAUhu_5Fda5atlBq9PyFQnJaBSUqWtHUyQklAsTH7JAagfbkUBV_zuKM2hTto5yZZ2P1-c5r70B972CGKYfr2evkzkbvEnSVfp-NmTpdDa9WLHH7O1yccVqaUl7zi4XyZzlN2WlOPuQJvN3bFCXig-7QmGlVn9XkeVtDyBoo2gu1-Qg_gQcMoTampycM7ZNbUJDon5APEIodd34Np0h5MYSxBvwpa8IYljJzxUtSSqy5yNAUORlWYVru_mituVa2p-AcGGqZq1dzHYsyHLJASGtZVt4AtkWwTR-N9B5WRDEfIv_B8X7UHvOPERW_D7-jTC6l3AH1mhjFVlSPaisVT7UcseaV2QLujSlJnse9des6IsfCH6GIjobvrJlcbMLAWHR-JgJjiJCMUYxQfEUxTMUz-_dbnyK_y3Trf3jPtft992zfmbMt6ZmX02pmdEt1R--F4HvZUA8Cjc5BW5Jrjba0eET3HnzqPWdVEHdOzrT2JyurcnDmC5cBF1IKHK-q0ZdkOhQCr93X8xPEEeH4uioeNwTjw7F46PiyYE42z76FQAA__-hiXnR
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJyckm1v0zAQx9_zKax71bJDq5PyFAnJaBSUqWtHUyQkFKEQH1lYZgfbkUBVvzuK09GmrIXy6nIP_9zv7rwC-72CCCYfr6ev4xkbvImTZfJ-OmTJZDq5WLLH7O1ifsXqzJBynF3O4xnLb8pKcvYhiWfv2KAuJR92icJkSv6ZRZa3NYCgtKRZdkcWok_AIUWojc7JWm3a0MoXxPIHRCOEUtWNa8MpQq4NQbQCV7qKIIJl9qWiBWWSzPkIECS5rKz8b7v-ojOf61v6CQgXumrulI3YlgdZnnFASOqsTTyBdI2gG7dtal1WEER8jf8HxvtgO9sRO99HEYt782-owUHULWGjtJFkSPbo0lb5t5IH5r0iU9ClLhWZ86A_b0Vf3UDwMxTB2fCVKYubrQsI88ZFTHAUAYoQxRjFUxTPUDw_OF14yiFaps0dwj7X5i2Ljb3f_1Tr26Zm33SpmFYt2m_IFx7ypec8Sjg-hXBBttbK0v4dHvzzqF0-yYK6Y1rdmJyujc59m86de50PSLKuywadEyuf8m95V8xPEAf74uCoOOyJR_vi8Kh4vCdO149-BQAA__8CtIA-
 
 statement ok
 DROP TABLE grandchild2, grandchild1, child1, child2, parent1, parent2
diff --git a/pkg/sql/opt/exec/execbuilder/testdata/distsql_misc b/pkg/sql/opt/exec/execbuilder/testdata/distsql_misc
index 0ff11ad9fa77..c26d85d704e4 100644
--- a/pkg/sql/opt/exec/execbuilder/testdata/distsql_misc
+++ b/pkg/sql/opt/exec/execbuilder/testdata/distsql_misc
@@ -91,7 +91,7 @@ vectorized: false
 ·
 • create statistics
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJy0lF2L2kAUhu_7K4ZztQsjmUmi6-ZqxVoIbHVrclEoXsw6ByuNmXRmAm3F_16SIFtlncSP3pmJb56X5wxnC-ZnBhFMvr48j-IpufsYJ2ny5fmejOeTUTohSTpK4ySNxwkxnMymRJBP89lnIoUVQCFXEqdigwaib8CBgg8UAqAQAoU-LCgUWi3RGKWrv2zrQCx_QcQorPOitNXxgsJSaYRoC3ZtM4QIUvGa4RyFRO0xoCDRinVWYyr0U6HXG6F_A4WxyspNbiJS9UkKUf3seZyIXBJOlP2OGhY7Cqq0bzhjxQoh4jvavVIiNkWG2usf1mmOk_UfjAhnjFVtEytsRJ74SbB_EvzGK3OlJWqUB7zF7mS10WqlcSWs0h5n3UuSO58x8louf6A19ycrBweVeffx8bPH5_Ge518wwJZS-wEObj5Av7sN_3wbfs8LLrDRUmpv4-HmNoLuNoLzbQQ9L7zARkupvY3hzW2E3W2E59sIe17_AhstpfY2Hv_rqnsHPEdTqNzg0cp7_8usWoUoV9jsTaNKvcQXrZY1pnmc1bn6QKKxzVvePMR586oq-G-YO8P-QZgfh303uQUdONOhOxxe07vvDA_c5ME15AdneOgmD68hP7pnxVquifuSHbMXuw9_AwAA__9S0Q0_
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJy0lNGK2kAUhu_7FMO52oWRzCRx183VirUQ2OrW5KJQpMw6BysbM-nMBNqK716SIFtlnYRob8RM_P1-vjOcHZifGUQw_fr8NI5n5OZjnKTJl6dbMllMx-mUJOk4jZM0niTEcDKfEUE-LeafiRRWAIVcSZyJLRqIvgEHCj5QCIBCCBSGsKRQaLVCY5SufrKrA7H8BRGjsMmL0lbHSworpRGiHdiNzRAiSMVLhgsUErXHgIJEKzZZjanQj9XH9-IVfwOFicrKbW4iUjVKClF9HXiciFwSTpT9gRqWewqqtG9AY8UaIeJ72r1UIrZFhtobHhdqjpPNH4wIZ4xVfRMrbEQe-Vmwfxb8xitzpSVqlEe85f5stfF6rXEtrNIeZ91LkhufMfJSrl7RmtuzlYOjyrz7AHmPAXp84Pk9RthS6zDCu6uP0O_uw-_jwx94QQ8fLbUOPu6v7iPo7iPo4yMYeGEPHy21Dj5GV_cRdvcR9vERDrxhDx8ttQ4-Hv7rynsHvEBTqNzgyep7_59ZtRJRrrHZn0aVeoXPWq1qTPM4r3P1gURjm7e8eYjz5lVV8N8wd4b9ozA_Dftucgs6cKZDdzi8pPfQGb5zk-8uId87wyM3eXQJ-cE9K9ZyTdyX7JS93H_4GwAA__-fBhCl
 
 statement ok
 INSERT INTO data SELECT a, b, c::FLOAT, 1
@@ -110,7 +110,7 @@ network usage: <hidden>
 ·
 • create statistics
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJzcVtFO2zAUfd9XWPcJJJfETlpKnmAVkyoETE3Fy9QHk1x1Ea2d2Y6AoX7WfmBfNiVexMraJJVaCfFW-_r2nHvOSZwXMD8WEMFocnkxvSTx9GI6jqfjUUwMI7c3RJAvk9trkgorgIJUKd6IJRqIvgEDChwoBEAhBAp9mFHItUrQGKXLIy9Vwzh9gsinkMm8sOX2jEKiNEL0AjazC4QIpuJ-gRMUKWrPBwopWpEtKpgS-jzX2VLoZ6AwUotiKU1ESj5xLsqfPY8RIVPCiLLfUQOFqztisyVGxP_9y7h1oqRFaTMl_ytp9WiIRpFGhPm-27t_tlhvDn2ffAYK13ejETEWc5KoQlpyhE_Wy6Q9johf0XYHEB-2HaiQVGHzwjqs2YqCW_9VxlgxR4jYinZXLxbLfIHa668r57bj7CdWWNVksRU2IudsKzDfCvyKV0ilU9SYruHNVlupXcznGufCKu0xvztJcsR9n9wXyQNac7yVcrBGmXVPGts5aR7reXxfWeObssZOBuQqO0DaeOe0tShYp22w97Tx7tbx3a3jPS_46Na1KFhbd7p364Lu1gW7Wxf0vPCjW9eiYG3dcO_Whd2tC3e3Lux5_X1ZF2yyjp8Eh7Eu6Gxdi4K1dWcHvZ43AE_Q5EoafHNNb_5nv7y-MZ2ju-uNKnSCX7VKKhi3vK36qo0UjXVV5hZj6UolwX-bWWMzX2tmb5t5M3ILdNDYHTY3h7vwrlSsBAWJ9lHpB5dbg7J6CZRfGnXBhddVXt87dXWJxoj56wEXwnVq_UZqg-a5Bu93rtNGasPmuYbvd66z5hT7LQ9Q8-O302TB1sn4SdgyWb-cbLb69CcAAP__DKOOqg==
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJzcVtFO4zgUfd-vsO4TSC6JnbSUPMFWrFQhYNVUvKyqlUmuOlFbO2M7Agb1s-YH5stGiSdiyrRJqIqEeKlqX9-ec885ifsM5usSIhhNLi-mlySeXkzH8XQ8iolh5PaGCPLP5PaapMIKoCBVijdihQai_4ABBQ4UAqAQAoU-zCjkWiVojNLlkeeqYZw-QuRTyGRe2HJ7RiFRGiF6BpvZJUIEU3G_xAmKFLXnA4UUrciWFUwJfV5-_J8v8AkojNSyWEkTkZJRnIvya89jRMiUMKLsF9RA4eqO2GyFEfF_fDdunShpUdpMyT9KWj0YolGkEWG-7_bunyzWm0PfJ38Dheu70YgYizlJVCEtOcJH62XSHkfEr4i7A4iLXQcqJFXYvLAOa7am4Na_tDFWzBEitqbd9YvFKl-i9vqb2rntOPuGFVY1WWyFjcg52wnMdwK_4BVS6RQ1pht4s_VOahfzuca5sEp7zO9Okhxx3yf3RbJAa453Ug42KLPuWWN7ZM1jPY8fKm18W9rYyYBcZe-QN945by0a1nkbHDxvvLt5fB_zeM8LPrt5LRrW5p0e3Lygu3nBPuYFPS_87Oa1aFibNzy4eWF388J9zAt7Xv9Q5gXbzOMnwfuYF3Q2r0XD2ryzd72mtwBP0ORKGnx1XW__Zb-8xjGdo7vzjSp0gv9qlVQwbnlb9VUbKRrrqswtxtKVSoK_N7PGZr7RzF4382bkFuigsTtsbg7fwrtSsRIUJNoHpRcutwZl9Roo_3HUBRdeV3l589TVFRoj5i8HXAg3qfUbqQ2a5xp83LlOG6kNm-cafty5zppT7Lc8QM2P35smC3ZOxk_Clsn65WSz9V8_AwAA__8xcpIQ
 
 query T retry
 EXPLAIN (DISTSQL, TYPES) SELECT * FROM data
@@ -124,4 +124,4 @@ vectorized: true
   table: data@data_pkey
   spans: FULL SCAN
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJykk0GL00AUx-9-iuF_UnkhnST1kJOyVijUbm16UCSH2cxzDaSZODMBpfS7S6bCWtmVbHIJzHv55f_LY94J7keDHKvPu8279Va8fL8uDsWnDYnDl92qeCWK1WZ1cxCvxYf97UehlVcgtEbzVh3ZIf8KCUICQgpCBsISJaGzpmLnjB1eOQVgrX8iXxDqtuv9UC4JlbGM_ARf-4aR46DuGt6z0mzjBQiavaqbEDNEv-1sfVT2Fwg3pumPrcuFInFHoiKhQSg6NdSiWArVaiGF8d_ZojwTTO8fcp1X94xcnukJtwelvjVWs2V9rVO3HvTn-a0xyod2VR9Vg_L8yK9tTWS6eHn1lae8kisvOX5mcvrMYhnFyYSpJePtkhl2SRSnE-zS8XbpDLs0irMJdtl4u2yGXRbFy5n78Ijdnl1nWsejbvRiWAnW93xZLmd6W_HOmirEXI63gQsFzc5fuvJyWLehFQT_huV_4TdX8OJfOJmTnM6Bsznw8llweX7xOwAA__-ybuU6
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJykk0GL00AUx-9-iuF_UnkhnST1kJOyVijUbm16UCTIbOa5BtNMnJmAUvrdJamwVraS7VwG5r388v_lkXeA-9Egx-LjZvVmuRbP3y6LXfFhRWL3abMoXohisVrc7MRL8W57-15o5RUIrdG8Vnt2yD9DgpCAkIKQgTBHSeisqdg5Y4dHDiOw1D-Rzwh12_V-KJeEylhGfoCvfcPIsVN3DW9ZabbxDATNXtXNGDNEvx6OL913_gXCjWn6fetyoUjckahIaBCKTg21KJZCtVpIYfw3tiiPBNP7h2Tn1T0jl0e6YPcg1bfGarasz4Xq1oP-nF8bo_zYruq9alAeH_m4tYlMF8_P3nLJKznzktOnJkOmFssoTq6YWzLdLwnyS6I4vcIvne6XBvmlUZxd4ZdN98uC_LIongfuxSN-W3adaR1P-rNnw2qwvufTkjnT24o31lRjzOl6O3JjQbPzp648XZbt2BoF_4blf-FXZ_DsXzgJSU5D4CwEnj8JLo_PfgcAAP__LXzooA==
diff --git a/pkg/sql/opt/exec/execbuilder/testdata/distsql_numtables b/pkg/sql/opt/exec/execbuilder/testdata/distsql_numtables
index 2889d2ac0044..b754d614a04a 100644
--- a/pkg/sql/opt/exec/execbuilder/testdata/distsql_numtables
+++ b/pkg/sql/opt/exec/execbuilder/testdata/distsql_numtables
@@ -61,7 +61,7 @@ vectorized: true
           table: numtostr@numtostr_pkey
           spans: [ - /10]
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJyUkFFL40AQx9_vUwzzdHedo9kcBVkQom3EQG1rElDRPMRkKIEkG3c3YCn57pIEsRUq-vj_z_5mfuwezUuJEv37zfIiWMHvRRDF0e3yD0T-0p_HMCNwYQI7gr9wFa5voG4rq4zVcHfthz7s4Kl1nP_ZOQgH1uHCD-HyAYzVSFirnFdpxQblIwpMCButMjZG6b7aDw-C_BWlQ1jUTWv7OiHMlGaUe7SFLRklxulzySGnOeupg4Q527Qoh7XvOl6jiyrVOyScq7KtaiN76VEkatI-_5sKgUlHqFr7cczYdMsoRUffF4qUtqyn4tjFcydIGHKds5Ywk1IGq_iMwBMT9yAQeO5JDfcnGiGbRtWGjzRObXa6hJDzLY9_b1SrM95olQ1nxrgeuKHI2dhxKsYQ1OOoFzyExZew-wlOul9vAQAA___zrMZW
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJyUkVFL60AQhd_vrxjm6d7bkWYjBVkQom3EQG1rElDRIDEZSjHNxt0NWEr-uySh2AoVfdtzZs-cD2aL5q1Aif79YnoRzODvJIji6Hb6DyJ_6o9jGBG4MIANwX-4Cuc3UNZrq4zVcHfthz5s4Kl2nNPsHIQD83Dih3D5AMZqJCxVzrN0zQblIwpMCCutMjZG6dbadh-C_B2lQ7gqq9q2dkKYKc0ot2hXtmCUGKcvBYec5qyHDhLmbNNV0a3d4Xi7x3P1yhskHKuiXpdGtug9TlSlrT4ZCoFJQ6hq-1lpbLpklKKhn2NFSlvWQ3FI5LkDJAy5zFlLGEkpg1l8RuCJgbsnCDz3KIb7G4yQTaVKwwcYxzY7TULI-ZL7CxhV64wXWmVdTS_nXa4zcja2n4peBGU_agH3w-LbsPslnDR_PgIAAP__zo7I9g==
 
 # Query which requires a full table scan.
 query T
@@ -83,7 +83,7 @@ vectorized: true
               table: numtostr@numtostr_pkey
               spans: FULL SCAN
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJy0leGL2j4Yx9___orwwA_udpE2aetpYOB212OC01sVtjF80dlwCLXpkggT8X8fbdU7RZPOznem9fs8n374QtagfqXAIPz2PPjQH6Kbx_54Mv4yuEXjcBA-TFCAEUV3aIXRO_QUjT6jbLnQQmmJvn4KoxDdrND_iLiue4veIxeNoscwQh-_I6UlYMhEwofxgitgP4AABgoYPMDgA4YAphhyKWZcKSGLv6zLQD_5DczFMM_ypS4eTzHMhOTA1qDnOuXAYBL_THnE44RLxwUMCdfxPC3X7AB7uZwvYrkCDA8iXS4yxYrPqMDGeVycWw51XRemGwxiqV_XKR2_cGBkg-sjPc1TzSWXTnDIUz1n6KZHtqoYY_3hpFMa2_4-i0D_BmEspObSIUdGevTu7Hzv7PzXsUImXPLk1NATEEPRErlDjixEPEsKC8H2gzHqkTv65oBRj56l9A8oSf1ukMu7UVaj5fj1C2Lh2hekfb2CWBB2BSGXFoTWV08bqPdL9e366i1ce_X311NvQdipp5eq9-qr9xqob5fqO_XVW7j26jvXU29B2Kn3LlXv11fvN1BfSG_VtG5B2lvvXs-6BWFn3f8Xl9GJ-RFXucgUPxh_brJb3FQ8eeHVzabEUs74sxSzck11HJW58kHCla7ekurQz6pXBeDbMDGGqTlMjWHvIEyOw54Zu21e7RvTgTkcGMOWze0mH31vDHfMmzvGcNcc7jbBJpaO2Upmbhmx1Iw06hmxFM23LDc3jViqRsxdO2afbv77EwAA__9F9BfV
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJy0lfGL2j4Yxn___hXhhS_czUibtPW0MHC76zHB6a0K2xgyOhsOWW26JMJE_N9HW-udokln529N0ud9P3mfB7IB-SsBH4IvT8N3gxG6eRhMppNPw1s0CYbB_RR5GFHUQmuM3qDHcPwRpaul4lIJ9PlDEAboZo3-R8S27Vv0FtloHD4EIXr_FUklAEPKYzaKlkyC_w0IYKCAwQEMLmDwYIYhE3zOpOQi_2VTCAbxb_BtDIs0W6l8e4ZhzgUDfwNqoRIGPkyjHwkLWRQzYdmAIWYqWiRFmwqwX318z36yNWC458lqmUo_v0yJN8mifN22qG3bMNti4Cv10lSq6JmBT7a4PtjjIlFMMGF5h1Tlvo9u-mQ3MN_3B6Npt5jb7vssAv0bhAkXigmLHM2lT1tn6ztn67-U5SJmgsWnip6AGPE2zyxyNIWQpXE-BW93YYz6pEVfLTDq07OU7gElqZ8Q0jQhRUDalls_Jga6fUw614uJAaGKCbk0JrS-AbSxAW5hQKe-AQa6vQF31zPAgFAZQC81wKlvgNPYgE5hQLe-AQa6vQHd6xlgQKgMcC41wK1vgNvYgHz07ZqzN4DtZ9-73uwNCNXs3X_xSJ2oHzKZ8VSyg_LnKtv5C8biZ1a-eJKvxJw9CT4v2pTLcaErNmImVXlKysUgLY9ywNdiohVTvZhqxc6BmByLHT12R9_a1ao9vdjTig2dO00ufacVd_Wdu1pxTy_uNcEmhoyZQqZPGTHEjDTKGTEEzTU01yeNGKJG9Fk7Zp9t__sTAAD__5dKJPU=
 
 # Query with a restricted span + filter.
 query T
@@ -100,7 +100,7 @@ vectorized: true
       table: numtostr@numtostr_pkey
       spans: [ - /9]
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJyUkEFLw0AQhe_-imGgtIWVJvW2p9Y21WBMahJQ0RxiMpRAko27G7CU_HfZBLEVKnp87-2b-XYOqN5L5Og8bb2l68Nk7UZx9OBNIXI8ZxWD0hI2YXAPdVtpYdTjrRM6MNnDa2tZVxnY1hSW_homJvTcOwfGIxqNpxCEayeE62fYI8Na5OSnFSnkL2hjwrCRIiOlhDTWoX_g5h_ILYZF3bTa2AnDTEhCfkBd6JKQY5y-lRRSmpOcWcgwJ50WZT_2C3HRyKJKpVm7EmVb1YrDnpmvIMOoSY2-nNkWJh1D0ervZUqnO0Jud-zvQJui1CRJzuxTmsHnsJgfXYVzHsWh698gw6DVJj1LMf8PRUiqEbWiE4Zzk60uYUj5jobTK9HKjLZSZP2aQQZ9rzdyUnpI7UG49RAZwOOy_Wt5_qOcdBefAQAA___fqcsM
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJyUkVFruzAUxd__n-JyobSF_Kl2b3lq19pN5rRTYRubDKeXIrPGJRFWit99RClrBx3bm-ccz72_JHtU7yVydB7W3tz1YbR0ozi688YQOZ6ziEFpCaswuIWq2Wph1P21Ezow2sFzY1kXGdjWGOb-EkYm9NwbB4YDGgzHEIRLJ4TLR9ghw0rk5KdbUsif0MaEYS1FRkoJaax994ObfyC3GBZV3WhjJwwzIQn5HnWhS0KOcfpaUkhpTnJiIcOcdFqU3dgD4uzw8VK_kVm-EGWzrRSHHTMHQoZRnRr9f2JbmLQMRaO_Viqdbgi53bLfY62KUpMkObFPmXqfw2x6dDec8ygOXf8KGQaNNulZiulfKEJStagUnTCcm2y1CUPKN9Q_gBKNzGgtRdat6WXQ9TojJ6X71O6FW_WRATwu2z-Wp9_KSfvvMwAA___Npc2s
 
 # Query which requires a full table scan.
 query T
@@ -117,7 +117,7 @@ vectorized: true
       table: numtostr@numtostr_pkey
       spans: FULL SCAN
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJzMlNGL2jAcx9_3V4QfyFUWManV8wIDb2dvK3P1VoVtDB86G45CbbokhYn4v4-2m3fKmZb1wXszid9-P_38SnagfiXAwP32MLv1fGRNvcVy8WXWRQt35t4tkdIS3QfzzyjNN1oUq68f3cBFlrVFHUQJIV30DpEuuvWnyCrOZ94nF1114s5VF82DqRug99_RFjCkIuJ-uOEK2A-ggMEGDAPA4ACGIawwZFKsuVJCFn_ZlQEv-g2MYIjTLNfF9grDWkgObAc61gkHBsvwZ8IDHkZc9glgiLgO46Ss-Uc9yWS8CWWBcSeSfJMqhra4eDvAsMjCYt3r24QQWO0xiFw_1SkdPnJgdI-bI93HieaSy_7wmKfaZ8iyJvSvP8aY5y_HpcbD79LmxH4mkzG2WAae_6F7ltA-S_gEJmTEJY-OqSb0Laz2L7yGL3oi69MTqfNcMzSxz3IMjjho8-HR_x9eObte32k-wRquwwRHF5ug3dyc3cKcU5obNTdXw3Uwd30xc4Pm5gYtzI1Kc-Pm5mq4DubGFzPnNDfntDBXOOs1lFaDdJB28yqu2hcIA64ykSp-xHfuyaS4h3n0yKt7W4lcrvmDFOuyplrOy1y5EXGlq1NaLby0OioAn4epMWwfhelp2DY311QPjGnHHHbacA-N4ZG5edSm-doYHpubx22ab8yzIjWfifkjO-1e7d_8CQAA__9coTYz
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJzMlFFr2zwUhu-_XyEOlDp8CpEcN00Fg3SNu5llTucEtjHC8OJDCXMsT5JhIeS_D9tr2oTGNvgiu7OkvHkfP8doC_pXDALcLw-TW88n1tibzWefJh0ycyfu3Zxoo8h9MP1IkmxtZL76_N4NXGJZG3JBOGOsQ94Q1iG3_phY-fnE--CSy4vVxWWHTIOxG5C3X8kGKCQyQj9cowbxDThQsIFCHyg4QOEKFhRSJZeotVT5T7ZFwIt-g2AUVkmamXx7QWEpFYLYglmZGEHAPPwRY4BhhKrHgEKEJlzFRc0T9ejp4Xv6E3OYOxln60QLsqH5OwKFWRrm627PZozBYkdBZua5VJvwEUHwHW0Odr-KDSpUvatDqnJfEMsa8b8WhRCePx8WMvfPhdOR_UKpEGI2Dzz_XeckoX2S8BlMqggVRodUI_4_LHavvIYvuzLt8SO108wIMrJPcvQPOHjzEfK2Iywm2O05zedYQ7ef4-Bsc7Sb-7Nb-3MKf4Pm_mro9v6uz-av39xfv7W_QeFv2NxfDd3e3_Bs_pzm_pzW_nJz3YbqasD26m7-iSv4FcIAdSoTjQd8p_6Z5fczRo9Y3udaZmqJD0oui5pyOS1yxUaE2pSnvFx4SXmUA74M88qwfRDmx2G7urmmul-ZdqrDThvuq8rwoLp50Kb5ujI8rG4etmm-qZ4Vq_lMqj-y4-7F7r8_AQAA__-b_0NT
 
 #
 # -- Join tests --
@@ -143,7 +143,7 @@ vectorized: true
       table: numtostr@numtostr_pkey
       spans: FULL SCAN
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJy8ld9q2zAUh-_3FOJctaASy3aSxlDw6DqW0iVd04vB8IUba4nBsVxJhoSQdx-2C_nnSXaV5NKWP59zvh_orEG8J-DBw-_np6_DEbr6Npy8Tn49XaPJw9PD_StaYiQkR99fxj9Rmi8kE-95yCl6HA9HHy8kR-MRWqE7tKwOI8CQsoiOwgUV4P0BAhhswOAABhcwdCHAkHE2pUIwXnyyLoFhtATPwhCnWS6L1wGGKeMUvDXIWCYUPHgN3xL6QsOI8o4FGCIqwzgpy-z052c8XoR8BRjuWZIvUuEVo-w0OMnC4uUNBBsMLJcfFbeF3lZoHor5fgnfhmATYBAynFHwyAZ_rnNS17nkdW2vygR2Ou7YlmW1bJvstW3_t-3tf_KU8YhWrrZ_CgpS90nN7D9CMX9kcUp5p7ffWkL_yivfvr7j8Wwur3xyDRjGufSQT7DvHsy5ncExmKGmwRG7YVmHkMNpa2u7e7VJ89jtz8depn7TcU-bPbls9v1zZG839-8Y-HdL_73T-rcv6__2HP6d5v5dA_-90v_taf07l_U_OId_t7n_roH_wnzbbalS715WPbHOvXdq6r9QkbFU0EZbxSomoNGMVkYEy_mUPnM2LctUj-OSK-_tiApZndrVwzCtjooGm8NdE7hvAg9MYELUNGlhzG4Hd03gvgk8MIEPjB3R9iFt7dKOWrejhMm-b-uQdk3CUsOasNSwJiw1rAlLDevC6pqE1TPRrYY1utWwRrca1uhWwzrdfRPdtya61bBGtxrW6FbDGt1qWKd7YKKbtFmWx3dom23ZltZd_m32ZVta55wcbQ-l9GDz5V8AAAD__2lICRY=
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJy8lV2L2kAUhu_7K4ZztQuzmEmiroGFlO2WuljdqheFEkrWTFUaM9mZCSjify9JtvjZmaSj3uXryTnnfULOGsRbDB48fX_pfez20c2n7mg8-ta7RaOn3tPjGC0xEpKjz8PBV5RkC8nEWxZyip4H3f77BcnRoI9W6AEty5sRYEhYRPvhggrwfgABDDZgcACDCxiaEGBIOZtQIRjPH1kXQDdagmdhmCdpJvPLAYYJ4xS8Nci5jCl4MA5fYzqkYUR5wwIMEZXhPC7K7PTn7xz_TH_TFWB4ZHG2SISXz7TT6SgN84t3EGwwsEy-l95WfF2hWShm-7V8G4JNgEHIcErBIxv8fyOQUyNI7v89OGp-VQjZ6bthW5ZVs3my17z9z-a378kSxiNaJrZ9U5CTukdOJPAlFLNnNk8ob7T2W4vpL3nj27cPfD6dyRuf3AKGQSY95BPsuwdzbmdwDGY40WCf3bG0QcjhtCdru3u1SXX5tqn8wv1dwz3vF0Cu-wW0L_EF2NUtOMYW3MJC67wW7OtauL-EBae6BdfYQquwcH9eC851LXQuYcGtbqFpbCHPv-4uVQlwryuAWJfeRyfqD6lIWSJopW1j5RPQaErLRATL-IS-cDYpypSng4Ir_uQRFbK8a5cn3aS8lTdYHW6awG0TuGMCE6KmSY3E7Hpw0wRum8AdE_ggsSPaPqStXdpRx-0oYbKft3VIuyay1LBGlhrWyFLDGllqWCeraSKrZRK3GtbErYY1cathTdxqWBd32yTue5O41bAmbjWsiVsNa-JWw7q4OyZxkzrL8vgfWmdb1qV1P_86-7IurcucHG0PZejB5sOfAAAA__-QihoO
 
 query T
 EXPLAIN (VERBOSE) SELECT x, str FROM NumToSquare JOIN NumToStr ON x = y WHERE x % 2 = 0
@@ -216,7 +216,7 @@ vectorized: true
           table: numtostr@numtostr_pkey
           spans: FULL SCAN
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJzEltFvokoYxd_vXzH5kpvYdBoZQKUkTbjptVmbVrtqsptsfKAya0mQscOQaBr_9w3QrYo6A51Y3xA4fIdzfv3KGySvEbjQ_fn08F-vjxr_90bj0feHCzTqPnRvx2iJUSI4uhsOHlGczgVLXlOfU3Q_6PXfTwiOBn20RDdohX586w67qLFE_yLzAt0gAzDELKB9f04TcH8BAQwmYLAAgw0YWjDBsOBsSpOE8eyWt1zQC5bgGhjCeJGK7PQEw5RxCu4biFBEFFwY-88RHVI_oLyZDQqo8MMoH7Nl1VvwcO7zFWC4ZVE6jxMXLQHDaOFnh1cwWWNgqdjMSYQ_o-CSNa7u5S6MBOWUN8mukeK8ixoeyTJxXbfXHzt5NO_HpfmbRz6v0IufvOw-zyMwWW88mnU8budlHspL8ENhrXIEthJrmoZhHI3N-lRsnS-NzT7qcfOcNGY8oJwGO0-aZMq_txy6ATxyWcwqv-sj5TN6z8I4o6SUf0R_i4ZHLi9ueDh7KQ4BwyAVLvII9qyjcbc0XuWAyT67Yosm6ZRf-uDs9s5sUp0-6_P05fBdNe3qCCp8fSDonBFBcgYErdMgaFbHwNbAwM4xaFfHQOHrA4PrM2JgngED-zQYWNUxaGlg0M4xcKpjoPC1-T9unJED6wwctE7DgV2dg7YGBxkBxz_lrDqWNgh87becfdTkVyHQPv1HyQELQ5osWJzQSp8cRvYSNJjRIpeEpXxKnzib5mOKn4Ncl58IaCKKq6T40YuLS5nBbTEpi8m22N4Rk3piR0dMiJZayzjpyNWmNHBLHrhVI3CzntjREZcCr6vWMl4KfE9tSwNvydtqyf88HHldbam6Ixd3dLqWixVdy8WqrhVqLeOqrh2drq_lXRuKXbi3Sev0pVArClOoVY2p5HreVZ2RvX1apzQi36dEsVCJ1kZVqFWt6e1UlVzPu7I1rbVKFHu1rWhtb7HWak2uVrUmVytbU8j1vCtb21uv0tYm63_-BAAA__8G9HYx
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJzElmFr4koYhb_fXzG8cMHSKWaSGNNAIZdey1pa7aqwC4ssqZm1smnGTiagFP_7kqStGnUm2cH6bUxyMifnPH07r5C8ROBB5_vD3X_dHmr83x2Ohl_vztCwc9e5HqEFRong6GbQv0dx-ixY8pIGnKLbfrf3dkFw1O-hBbpCS_TtS2fQQY0F-heZZ-gKGYAhZiHtBc80Ae8HEMBgAgYLMNiAoQVjDHPOJjRJGM8eec0F3XABnoFhFs9TkV0eY5gwTsF7BTETEQUPRsFjRAc0CClvZhuFVASzKN9mw6q_sf45_02XgOGaRelznHhoARiG8yBbXsB4hYGlYr1hIoIpBY-scHVTN7NIUE55k2w7Kq57qOGTLBzP87q9kZtn9LYu7b9-5eMSPQXJ0_b7fALj1dqjWcfjZnDmvuAE998XO5EtcyI2cmuahmEcDM_6q_DanxqefdDj-j1pzHhIOQ233jTOlO-P7HsAfHJe7FX-1nvKp_SWzeKMlVILEf0lGj45P7vis-lTsQQM_VR4yCfYtw7G3dL4lD0me-yCzZukXf7ovXs7W3uT6gxaugzmCF407eogKtx9gOieEERyAhCt44BoVofB1obBzmFwqsOgcPcBw-UJYTBPAIN9HBis6jC0tGFwchjc6jAo3K3_vxsnpME6AQ2t49BgV6fB0aYh4-DwQc-qY2wNwuee9OyDJj8LBOf4h5U9FgY0mbM4oZWOIkb2ETSc0iKXhKV8Qh84m-TbFD_7uS6_ENJEFHdJ8aMbF7cyg5tiUhaTTbG9JSb1xK6OmBAttZZx0parTWngljxwq0bgZj2xqyMuBV5XrWW8FPiO2pYG3pK31ZL_ebjyuhypui0Xt3W6losVXcvFqq4Vai3jqq5dna4v5V0bilm4M0nr9KVQKwpTqFWNqeR63lWdkZ15Wqc0Ip-nRDFQidZEVahVrenNVJVcz7uyNa2xShRz1VG0tjNYa7UmV6tak6uVrSnket6Vre2MV2lr49U_fwIAAP__r1eHKQ==
 
 #
 # -- Aggregation tests --
@@ -236,7 +236,7 @@ vectorized: true
       table: numtostr@numtostr_pkey
       spans: FULL SCAN
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJyslF1r2zAUhu_3K8y5SkAhlu24qa9augwC6cfiDAbDF1p0MAHb8iQZVkL--7DMqBNaWYt3F9l59byPZM4R1K8CElh9f9ncr5-8yed1uku_bqZeutqsHnaeasrJ69T7sn1-9Kqm1EJpCQQqwfGJlagg-QEUCARAIAQCERBYQEaglmKPSgnZ_uVoAmv-GxKfwKGqG90-zgjshURIjqAPukBIYMd-FrhFxlHOfSDAUbNDYTB_8Xe1PJRMvgKBB1E0ZaUSr12kNWt_zuaB7_uQnQiIRr-RlGY5QkJPxL3NfZ5LzJkWcr44L5N-e5zc0emHmOBDzNvuTSUkR4n8bOvsZC9C_X9rEp41oe7HT686fnP6s3nkfgcDlXrq8Zg7CNzNg-vMI2Meu5sPVOqZ34wxD93Nw-vMY2O-dDcfqNQzX44xj9zNo-vMW-eZo_RAm5707f8aNu9gtqhqUSm8GDrv7-y3wwh5jt3kUqKRe3yRYm8w3fLZ5MwDjkp3b2m3WFfdq7ZgP0yt4eAsTC_DgZ08gA6t6cgejsb0XljDsZ0cjyHfWMNLO3k5hnxrvyt_4DOxf2SX7Oz06U8AAAD__-Dh4Ck=
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJyslF9r2zAUxd_3Kcx9SkAhlu24qZ9augwC6Z_FGQyGGV50MWGO5UkyrIR892GZUju0sob6pj8-95yfr7gnkH9KSGD1_Wlzu37wJp_X6S79upl66Wqzutt5sjlOnqfel-3jvVc1R8WlEkCg4gwf8iNKSH4ABQIBEAiBQAQEFpARqAXfo5RctJ-ctGDN_kLiEzhUdaPa44zAnguE5ATqoEqEBHb5rxK3mDMUcx8IMFT5odQ2L_Y3L4uf9W98BgJ3vGyOlUy8dpPWebuczQPf9yE7E-CNevWTKi8QEnom9plui0JgkSsu5othpPTb_eSGTt-1Cd61ea3eVFwwFMgGpbOzOQj1_y9JOEhC7ZtAHZqgezCbR_adGAnW-wGxSycCe_7AhT_S_LE9_0iwHv-VC39ozx-68Meaf2nPPxKsx7904Y_s-SMX_pZ8Zok-kqmHfv1RQ-gNmy3KmlcSL4bR25X9dkghK7CbaJI3Yo9Pgu-1Tbd91Dp9wFCq7pZ2m3XVXbUB-2JqFAcDMb0UB2bnEevQqI7M4sgl98Iojs3OsYvzlVG8NDsvXZyvzb3yR56J-ZFdemfnT_8CAAD__4Td7Uk=
 
 # Count the rows in the NumToStr table.
 query T
@@ -252,7 +252,7 @@ vectorized: true
       table: numtostr@numtostr_pkey
       spans: FULL SCAN
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJyslNGKm0AUhu_7FHKukjIhjjFu1qtd0hSEbLKNLi0UWaweJGBm7MwILSHvXlTKmrAZh7iXav75_i9nOEeQvwvwYfXjef0YbKzRlyCMwm_rsRWu1qtlZKW8Ymr0eWx93W2fLFYdFJdKAAHGM9wkB5Tg_wQKBBwgMAMCLhCYQ0ygFDxFKbmof3JsAkH2B3ybwJ6VlapfxwRSLhD8I6i9KhB8iJJfBe4wyVBMbSCQoUr2RYP5j38oxf6QiL9AYMmL6sCkDwTCMmHStyZTx7ZtiE8EeKXeOFIlOYJPT8S8y2OeC8wTxcV0fl5luX3ZRK-77fdwNL7Kcq6y3hAV4yJDgdnZ-fFJ34Ze_DPhy9NrsIlGD_R6m9lZG2o-BXrDFJohTKau-Sh6CnXkvcGjcMzlnVvk3UbeM5fvKdSRvxssPzOXn90i7zXyC3P5nkId-cVgeddc3r1FvtaeGHr3dOl433_o8nmHtUNZcibxYgm9f7JdLyfMcmw3meSVSPFZ8LTBtI_bJte8yFCq9ittHwLWfqoLdsNUG3bOwvQy7OjJPeiZNu3qw-6Q3nNt2NOTvSHkO214oScvhpDv9bOye66J_pJdsuPTp38BAAD__8dj5_w=
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJyslF2Lm0AUhu_7K-RcJWVC_Iqb9WqXNAUhm2yjSwtFgtWDhJoZOzNCS8h_LyrLmrAZh7h3UfP6vPMcOUcQfwrwYfnjefUYrI3RlyCMwm-rsREuV8tFZKSsonL0eWx83W6eDFodJBOSAwHKMlwnBxTg_wQLCNhAwAECLhCYQUyg5CxFIRiv_3JsAkH2F3yTwJ6WlaxvxwRSxhH8I8i9LBB8iJJfBW4xyZBPTSCQoUz2RYN5xT-8_tiVv_EfEFiwojpQ4QOBsEyo8I3J1DZNE-ITAVbJN5qQSY7gWyei3-gxzznmiWR8OjsvtNi8rKPddvM9HI2vsuyrrDdERRnPkGN29v74pG5jXfgJX552wToaPVjX2zhnbSz9WVg3z6IZxWTq6g-kp1ZHgTd4ILa-Avt2BW6jwNNX0FOro-BusAJHX4FzuwKvUTDXV9BTq6NgPliBq6_AvV1BffiJ5ul7GnVOf_-hS-kd1hZFyajAi-X0_pvNemlhlmO74QSreIrPnKUNpr3cNLnmRoZCtk-t9iKg7aO6YDdsKcP2Wdi6DNtqcg_aUaZdddgd0numDHtqsjeEfKcMz9Xk-RDyvXpWZs9nov7ILtnx6dP_AAAA__9ixPUc
 
 # Count how many numbers contain the digit 5.
 query T
@@ -271,7 +271,7 @@ vectorized: true
           table: numtostr@numtostr_pkey
           spans: FULL SCAN
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJy0lVFvmzwUhu-_X4GOVDX95CoYSJr6qlVHN7SUdEDVSVNUsXAWIRGcGTNtivLfJ0BLk6ixWVjuYpOX8-DnlbyC4nsGDNzPj-Nbzzd677wwCj-NL4zQHbt3kTHjZS57_18Y98HkwcjLheSFFMbzBzdwjerX2PvoGudn39IfeHYOBHKeoB8vsAD2BSgQsICADQQcIDCAKYGl4DMsCi6qv6zqgJf8BGYSSPNlKavtKYEZFwhsBTKVGQKDKP6aYYBxgqJvAoEEZZxm9Zg_WDdLkS5i8QsI3PGsXOQFqxiBQLiMq8Vl3zJNE6ZrAryUr7MKGc8RGF2T9jz3aSZRoOgPdmGafWbc0N2zYYyFUeD574HApJTM8HmOB1Gsv0G5nc8FzmPJRZ_uHc3d5MmPXoLJc9i7ODjMPjjsdUaZc5GgwGTn_dO1BmfvcMKnhxfPj3o39DCNs0ND27eCHtmKuhSXfad9NTRQm2oMT18NDcq2C9q5GlZ7GdaxMpxaxrC9DA3URsbV6WVoULZlWJ1l2O1l2MfKGNYyRu1laKA2Mkanl6FB2ZZhd5bhtJfhHCuj0nDZ0oOGZ-Ph-vQeNCjbHpx_enm9MSzAYsnzAvcusbffbFaXGyZzbG7Cgpdiho-Cz-oxzXJS5-qNBAvZPKXNwsubRxXgdpgqw5Y6bCnD9k6Y7odtNfZQPdpRpgfq8EAZ1kwedvnoK2V4pJ48Uoav1eHrLthU0zFdydQto5qa0U49o5qiOZrh6qZRTdWoumv77NP1f78DAAD__586OSw=
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJy0lVFv2jwUhu-_XxEdqSr95Io4CZT6ioqlWzQauiRVJ00IZeQMoYWYOc60CfHfpyQqBVTsTBl3scOb8-DnlbyB_EcKDNzPj-M7zzc677wwCj-Nr4zQHbujyJjzIpOd_6-M-2DyYGTFSvJcCuP5gxu4Rvk09j66xuXFt-VPvLgEAhlP0I9XmAP7AhQIWEDABgIOEOjBlMBa8DnmORflTzZVwEt-ATMJLLN1IcvtKYE5FwhsA3IpUwQGUfw1xQDjBEXXBAIJyniZVmNesIYvD7P1d_wNBEY8LVZZzkpSIBCu43Jx3bVM04TplgAv5OvEXMYLBEa3pDnV_TKVKFB0e4dI9T4zhvTwhBhjYRR4_nsgMCkkM3ye4UkU629Q7hYLgYtYctGlRwc0mjz50SyYPIedq5PD7JPDXmcUGRcJCkwOvj_danCODid8eph5ftQZ0tM0zgENbd4N2qobVTWuu07zgmjQdgXpn78gGpR9I7R1QazmSqx2SpxKSb-5Eg3aTsnN-ZVoUPaVWK2V2M2V2O2U9Cslg-ZKNGg7JYPzK9Gg7CuxWytxmitx2ikpZVw3tKGh2tm4Pb8NDcq-DeefXmpvDAswX_Msx6PL7e0vm-Wlh8kC6xsy54WY46Pg82pMvZxUuWojwVzWb2m98LL6VQm4H6bKsKUOW8qwfRCmx2Fbjd1Xj3aU6Z463FOGNZP7bf70jTI8UE8eKMO36vBtG2yq6ZiuZOqWUU3NaKueUU3RHM1wddOopmpU3bVj9un2vz8BAAD__8ioRkw=
 
 #
 # -- Limit tests --
@@ -289,7 +289,7 @@ vectorized: true
   spans: LIMITED SCAN
   limit: 5
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJyMT71q9DAQ7L-nEFN9AYXcFdeoSrg4IPD9xHYRCC4UazkEtuRoZchh_O7BNiGkCKTbmdmdmR3B7y0Uspdz_qCP4v-jLqvyOb8RZZZn-0pcxVNxOgg_dClwiiLXB12JHSR8sHQ0HTHUK7aoJfoYGmIOcabGZUHbD6iNhPP9kGa6lmhCJKgRyaWWoFCZt5YKMpbi3QYSlpJx7WL7FXvfR9eZeIXEPrRD51mJGZS9mcdbSOSuc0nsUE8SYUjfcZzMhaC2k_x7pYK4D57pR5vfnDdTLUH2QuvbHIbY0DmGZolZ4Wm5WwhLnFZ1uwLtV2mqp3-fAQAA__8UeIII
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJyMT01LxDAUvPsrwpwUIu4e9pKTslYIdD9sexCkSGweS7FNal4KLqX_XdqyiAfB23wkM_MG8GcDheTlmD7ovbh-1HmRP6c3Ik_SZFuIs3jKDjvh-jZ6jkGkeqcLsYGE85b2piWGesUapUQXfEXMPkzSMD_Q9gtqJVG7ro-TXEpUPhDUgFjHhqBQmPeGMjKWwt0KEpaiqZs59lJ7fwFv3QedIbH1Td86VmIieWcmeAuJtG7rKDYoRwnfx59SjuZEUOtR_n9YRtx5x_Rr01_Jq7GUIHui5Xj2fajoGHw11yz0MP-bBUscF3e9EO0WayzHq-8AAAD__8A3hKg=
 
 query T
 EXPLAIN (DISTSQL) SELECT y FROM NumToStr ORDER BY y LIMIT 5
@@ -303,7 +303,7 @@ vectorized: true
   spans: LIMITED SCAN
   limit: 5
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJyMT01LxDAUvPsrHnNSiLh72EtO6m6FQvfDtgdFeojNYwm0SU1ScCn979IWEQ-Ctzcz783MGxA-GkgkL6fsIT3Q9S4tyuI5u6EiyZJtSRd6yo97sn0bXYiejvkuyenxlS6Upfu0pA0ErNN8UC0HyDesUQl03tUcgvMTNcwLqf6EXAkY2_VxoiuB2nmGHBBNbBgSpXpvOGel2d-tIKA5KtPMtt8N7jtvWuUvENi6pm9tkDSBolPTeAuBzLQm0gbVKOD6-BMXojoz5HoU_6-Uc-icDfyrzV_Oq7ESYH3m5e3gel_zybt6jlngcb6bCc0hLup6AaldpLEar74CAAD__89ghPg=
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJyMT01L9DAYvL-_4mFOrxBx97CXnNTdCoHuh20PihSJzcNSbJOapOCy9L9LWxbxIHibj2RmnjPCRwOJ5OmQ3qkd_d-ovMgf0yvKkzRZF3Sih2y_Jdu30YXoaZ9tkozun-lEqdqqglYQsM7wTrccIF-wRCnQeVdxCM6P0nl6oMwn5EKgtl0fR7kUqJxnyDNiHRuGRKHfGs5YG_Y3CwgYjrpuptjLgtsLeO3e-QSBtWv61gZJI8k7PcJrCKR1W0daoRwEXB-_S0PUR4ZcDuLvwzIOnbOBf2z6LXkxlAJsjjwfH1zvKz54V001M91P_ybBcIizu5yJsrM1lMO_rwAAAP__jM6HmA==
 
 # Test that the correct node is chosen in a reverse scan with multiple spans.
 query T
@@ -318,7 +318,7 @@ vectorized: true
   spans: [ - /999] [/9001 - ]
   limit: 5
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJyMUM1O8zAQvH9PsdpTK7mq0089kBPQBhEp_SGJBAhyMMmqREriYDsSUZV3R074aZEo3DyzO-PZ2aN-KdBF724bXPhrGC39KI5ugjFEXuAtYmjhKtysoGpKI7VRcHvthR6MWnhsOP-fgsM5H8Mm_KQIzt6ppRfC5T20sPSiBQT-yo9hjgwrmdFalKTRfUAHGc4xYVgrmZLWUll63y_52Su6nGFe1Y2xdMIwlYrQ3aPJTUHo4lpOZD21LhkZkRf9WsdQNuZLpI3YEbqzjh0YO6eNY_FUUEgiIzXlR_b4UcZ5rfJSqBYZLmTRlJV2wYKoFvY5mdpyQFQZOCDNMylkGORlbmCOP2V0jjL-cnxIupaVpj9dz7uEIWU7GgrWslEpbZVM-28GuOl1PZGRNsN0NgC_GkY24KHYOSnm38RJ9-8tAAD__w63xuI=
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJyMUF1Lw0AQfPdXLPvUwpVeKn0wT2obMZB-mARUNEhMlhpMcvHuAoaS_y6XWG0Fq287szuzw2xRveVoo3O39i7cJQzmbhAGN94QAsdzZiE0cOWvFlDWhRZKS7i9dnwHBg081pyfJmBxzoew8r8ogrNPau74cHkPDcydYAaeu3BDmCLDUqS0jAtSaD-ghQynGDGspEhIKSENve2O3PQdbc4wK6taGzpimAhJaG9RZzontHEpRqIaG5eUdJzl3VnLUNT6W6R0vCG0Jy3bM7aOG4fxc04-xSnJMT-wx10Z57vhqXqlBhnORF4XpbLBgKCKzTgam4ogLlOwQOgXksjQy4pMwxR_S2odJP2jAp9UJUpF_-qAtxFDSjfU16xELRNaS5F0b3q46nQdkZLS_XbSA7fsVybgvtg6KuY_xFF78hEAAP__i17Jgg==
 
 query T
 EXPLAIN (VERBOSE) SELECT x FROM (SELECT x, 2*x, x+1 FROM NumToSquare)
@@ -345,7 +345,7 @@ vectorized: true
   table: numtosquare@numtosquare_pkey
   spans: FULL SCAN
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJyMT09L_DAUvP8-RZjT7s-IW485KWuFQt1d2x4E6SE2j6XQJt38gUrpd5c2iHoQPCUz897MvAnu0kEgfTnl99mBbR6ysiqf8y0r0zzdV2xkj8XxiW0-IWe37P_yjOyKJVHUoffGXYK0tAWHNooOsicH8YoENcdgTUPOGbtQ0zqQqRFix9HqIfiFrjkaYwligm99RxCo5FtHBUlF9mYHDkVett1q-y3ybrBtL-07OPamC712go3gKAe5fK9Rzxwm-K8c5-WZIJKZ_71LQW4w2tGPGr857-aag9SZ4r3OBNvQyZpmjYnwuO6thCLno5pEkOkozfX87yMAAP__8mCGmw==
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJyMT09LwzAcvfspwjttGnH1mJMyJxTmNtseBCkSmx-j2CZd_kCl9LtLG8R5EDzl_UneexngTg0ENi-H7X26Y4uHNC_y5-2S5ZvtZl2wnj1m-ye2-Kac3bLL6ejZFUuiqUPrjTsFaWkJDm0U7WRLDuIVCUqOzpqKnDN2kob5Qqp6iBVHrbvgJ7nkqIwliAG-9g1BoJDvDWUkFdmbFTgUeVk3c-xZ5d0Zfus-6BMca9OEVjvBenDknZzgNcqRwwT_U-i8PBJEMvL_j8rIdUY7-rXnr-TVWHKQOlL8uDPBVnSwppprIt3P72ZBkfPRTSJJdbTGcrz4CgAA__9_6Ypz
 
 query T
 EXPLAIN (VERBOSE) SELECT y, str, repeat('test', y) AS res FROM NumToStr ORDER BY res
@@ -416,4 +416,4 @@ vectorized: true
           table: numtosquare@numtosquare_pkey
           spans: [/11 - ]
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJyUkd-L00AQx9_9K4Z5anWl2fRtn672IgZ7zZlETtEgazKEQrqT2x9QKf3fJYnoVWi5e9zvzHc-H9gjuscOFSZf7jerdAuz27Qoi0-bORTJJlmXUHMwfvZ6Du_z7A5mf1IJqwLY0JSasPfsHoO2BA8fkjyBA3wPUbQkkBFk-W2Sw7uvcJhWGtikd2kJMpqjQMMNbfWeHKpvKLES2FuuyTm2Q3QcF9LmgCoSuDN98ENcCazZEqoj-p3vCBWW-mdHOemG7CJCgQ15vevGs0_8bnq722v7CwWuuQt74xQcxF81FFj0eggXUr7F6iSQg_8HdV63hEqexPPFCrae7EKeO93Eb1Bgyf1HBXLwzYJXsGVDF6nxS6irtrXUas92EZ-T19nnbfkjzx6K2fwia_kSVk6uZ-PojHPpcnSqBFLT0vS9joOt6d5yPWKmZzb2xqAh56epnB6pmUaD4NOyvFqOr5fjq-Xlf-Xq9Op3AAAA___X-wl0
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJyUkV2L01AQhu_9FcNctXqkOendudrajRjsNmsSWUXDEpMhFNMz2fMBlZL_LklEW6Fl9y7nnXnneSBHtE8tKoy-3G9W8RZmt3GWZ582c8iiTbTOoWKv3ez1HN6nyR3M_qQSVhmwpinVfu_YPvnSEDx8iNIIDvDdB8GSQAaQpLdRCu--wmFaqWET38U5yGCOAjXXtC33ZFF9Q4mFwM5wRdayGaLjuBDXB1SBwJ3uvBviQmDFhlAd0e1cS6gwL3-0lFJZk1kEKLAmV-7a8eyJ383J92P3k36hwDW3fq-tgoP464gCs64cwoWUb7HoBbJ3_-jWlQ2hkr14vmHGxpFZyHO5m_ANCsy5-6hADuKJdwq2rOkiNXwJddU0hprSsVmE5-R18nmbP6bJQzabX2QtX8JKyXasLZ1xLl0O-kIg1Q1N_9myNxXdG65GzPRMxt4Y1GTdNJXTI9bTaBA8Lcur5fB6ObxaXv5XLvpXvwMAAP__TjINTA==
diff --git a/pkg/sql/opt/exec/execbuilder/testdata/distsql_ordinality b/pkg/sql/opt/exec/execbuilder/testdata/distsql_ordinality
index 536844591b8f..82f9d5bceaa2 100644
--- a/pkg/sql/opt/exec/execbuilder/testdata/distsql_ordinality
+++ b/pkg/sql/opt/exec/execbuilder/testdata/distsql_ordinality
@@ -59,4 +59,4 @@ vectorized: true
       table: xyz@xyz_pkey
       spans: FULL SCAN
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJyUkE9r4zAUxO_7KcScdkFL4hx12pBkqcCNU9vQlsYH1XoEg2O5kgx2gr97sU3_Qkt6fPM0Mz-9M9xTCYHN3S5cyi37vZZJmtyEf1iyCTerlLWcdZydONvDWF1Uqix8twf7H0fXrO1O7FamVyyK13K7DGV6D47KaNqqIzmIBwTIOGprcnLO2EE6jw-kbiHmHEVVN36QM47cWII4wxe-JAik6rGkmJQmO5uDQ5NXRTnGtt3pX22Lo7IdOFambI6VEy-04EhqNQh_kfUcpvFvLc6rA0EEPb-cJHr9-iz4APJV-uIn6TG52lSOLkqe9xkH6QNNt3SmsTntrMnHmmmMRt8oaHJ-2gbTIKtpNQC-NwffmhefzFn_6zkAAP__rdy54A==
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJyUkF9ro0AUxd_3UwznaRdmScyjTxuSLB2wMVWhLY2UqXMJUuPYmRHU4HcvKv0LLenjPXfOOb-5J9inAj42N7tgKbbs91rESXwV_GHxJtisEtZw1nLWcbaHNiovZZG7dg_2PwovWdN27FokFyyM1mK7DERyC45SK9rKI1n4d_CQclRGZ2StNoN0Gh8I1cCfc-RlVbtBTjkybQj-CS53BcFHIh8KikgqMrM5OBQ5mRdjbNN2_5q2u68eqQXHShf1sbT-Cy444koOwl-kPYeu3VuNdfJA8L2en48Svv595n0g-Sp98ZP0iGylS0tnJc_7lIPUgaZjWl2bjHZGZ2PNNIajbxQUWTdtvWkQ5bQaAN-bvW_Ni0_mtP_1HAAA__-nXrpf
diff --git a/pkg/sql/opt/exec/execbuilder/testdata/distsql_single_flow b/pkg/sql/opt/exec/execbuilder/testdata/distsql_single_flow
index 3e080f6de834..38b3b39c6ff2 100644
--- a/pkg/sql/opt/exec/execbuilder/testdata/distsql_single_flow
+++ b/pkg/sql/opt/exec/execbuilder/testdata/distsql_single_flow
@@ -44,7 +44,7 @@ vectorized: true
       table: t@t_pkey
       spans: FULL SCAN
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJysktFr2zAQxt_3V4h7Ssa1ieRsD4KCSufRjCzp7MAGIw-KdUsNjuVJMmyE_O_D9qC1WZJt9E36dL_T9x13AP-9AAnxl4fF7XzJRu_m6Tr9tBizNF7Ed2v2mr1PVh9ZYLcpCxx_HwT7fB8nMQv8WrMbFsT1FhBKa2ip9-RBfgUOCAI2CJWzGXlvXSMf2qK5-QFyipCXVR0aeYOQWUcgDxDyUBBIWNorW00iQDAUdF60ZUcEW4cnyAe9I5CzIz5rzM83XuttQQlpQ24y7bWHoCqX77X7CQh3tqj3pZdMI9siywAhrXQjXMEpH_x_ffCX9SFO-nj6vi6tM-TIDCd8ueQPYe61f_xg85LcRPSzFPQtjBQf37h89xhGSowBYVUHyRRHJVBFqGao3qB6ezJP1MtzYXES8pUtPf3V5kybMGR21A3H29pl9OBs1n7TXVct1wqGfOheZ91lXnZPjcHnMD8LRz2YD2HxD7AYwtFZeDqwvTm--hUAAP__Q89Juw==
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJysktFr2zAQxt_3V4h7Ssa1ieRsD4aCSufRjCzp4sAGIwzFuqVmruVJZ9gI-d-H7UEbsyTb6Jv06X6n7ztuB-F7ATEkn-5m19O5GLyZpqv0w2wo0mSW3KzES_F2uXgvWFyngiX-Pijx8TZZJoLlpRFXgtXlBhBKZ2luHihA_BkkIChYI1TeZRSC8428a4um9gfEY4S8rGpu5DVC5jxBvAPOuSCIYe4uXDWKAMESm7xoy_YIruZHKLDZEsSTPT5pLE83XplNQUsylvxofNAeWPOX6hv9BIQbV9QPZYiFQbFBkQFCWplGuIBjNuT_2pDPakMdtfH4e106b8mT7c_3fMkfstyacP_O5SX5kTqMUtBXHmg5vPL59p4HWg0BYVFzLLRErVBHqCeoX6F-fTRPdJDnzNosKVSuDPRXezNuwpDdUjec4Gqf0Z13WftNd120XCtYCty9TrrLtOyeGoNPYXkSjg5g2YfVP8CqD0cn4XHP9nr_4lcAAAD__-8iSMs=
 
 # Inject stats so that column 'b' has few unique values whereas column 'c' has
 # many unique values.
@@ -101,7 +101,7 @@ vectorized: true
       table: t@t_pkey
       spans: FULL SCAN
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJyskdGL00AQxt_9K5Z5amW8y27Vh4WDPc7IReq1JgUFycM2O7aBNBt3N6CU_O-SRKgtrVK5t-w385tvvske_PcKJMRflvP75IlN3iXZKvs0n7IsnscPK_aSvU8XH1lg9xkLHH9_CPb5MU5jFviNZncsiJs1INTW0JPekQf5FTjkCI2zBXlvXS_th4bE_AAZIZR104ZezhEK6wjkHkIZKgIJK72uKCVtyN1GgGAo6LIaxgbVuHKn3U9AeLBVu6u9ZBrZGlkBCFmje-EV5B2CbcPBwwe9IZC8w__bgz_vHuLiHgf7trbOkCNzZJ335L9azoR51H77wZY1uVtxnKWib2Gi-PTOlZttmCgxBYRFGyRTHJVANUP1GtUbVG8v5pldc9eUfGNrT6e5zk6O-jBkNjQex9vWFbR0thhsxudi4AbBkA9jVYyPpB5Kw4__E-ZXwOIUFn-FZ0dw1OXdi18BAAD___VzF6k=
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJyskdFr1EAQxt_9K5Z5upOxvd1THxYKW2qkkbNXkwMFCbKXHa_BNBt3J6Ac-d8liVCvtMpJ37LfzG---SZ7iN9r0JB8ul6dp1di9ibNN_mH1VzkySq52Ijn4m22fi9YnOeCJf7-UOLjZZIlguWJFWeC1ckWEBrv6MreUgT9GSQUCG3wJcXowyDtx4bU_QC9QKiatuNBLhBKHwj0HrjimkDDxm5rysg6CqcLQHDEtqrHsWz4S_uNfgLCha-72yZqYVFsUZSAkLd2EF5A0SP4ju8sItsdgZY9_t8a8knXUI-ucefeNT44CuQOnIuB_FfLA1kubbx556uGwqk6jFLTV54ZOT8L1e6GZ0bNAWHdsRZGolFolmheonmF5vWjeZbHnDWj2Pom0v1cD05eDGHI7Wg6TvRdKOk6-HK0mZ7rkRsFR5GnqpoeaTOWxv_-JyyPgNV9WP0VXh7Ai77on_0KAAD__xTTFrk=
 
 
 # If we add a not very selective filter, the flow is still moved to the gateway.
@@ -141,7 +141,7 @@ vectorized: true
           table: t@t_pkey
           spans: FULL SCAN
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJyskm-L00AQxt_7KYZ51erctflTkYVCyl0OI730bAoKkhfbZKyBNBt3N6CUfndJIpwtbbVy73ae3d88z0yyQ_O9RIHh56f5LIphcB8lq-TjfAhJOA_vVvAaHpaLR7AwS8A69Pvgwqf34TKEgXVu1zAFZwiz-L4rJUzBurdyiISVyjmWWzYovqCDKWGtVcbGKN1Ku-5BlP9AMSYsqrqxrZwSZkozih3awpaMAldyXfKSZc56NEbCnK0syq6tDWpdbKX-iYR3qmy2lREgCdYEGRImtWyFG0z3hKqxzx7Gyg2jcPb0fzmcl83hXpPjoSgta9Yj9zBErwsI3PajCCGiePXurKV31vLZqamUzllzfmCUtuTfnpzI_ch6wx9UUbEeeYfRS_5qB4HzZjjVxeZbf0TCRWMFBD4FEwreUuBQ4FLgnR3Jv2aLsbpR9cg_nuxk48k1jZdsalUZ_qfO43ZRnG-4X7xRjc74Sauss-nLRcd1Qs7G9rdeX0RVd9X9x3_CzkXYPYDHx7B7hbN7DHsXYf-ys38RnhzB6f7VrwAAAP__wgqGSw==
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJyskm-L00AQxt_7KYZ51erctflTkYVCyl0OI730bAoKEmSbjDWYy8bdDSil312SCGdLW63cu51n9zfPM5Ns0XwvUWD48WE-i2IY3EbJKnk_H0ISzsObFbyEu-XiHizMErAO_T648OFtuAxhYJ3rNUzBGcIsvu1KCVOw7rUcImGlco7lIxsUn9DBlLDWKmNjlG6lbfcgyn-gGBMWVd3YVk4JM6UZxRZtYUtGgSu5LnnJMmc9GiNhzlYWZdfWBvZz_Y1_IuGNKpvHygiQBGuCDAmTWrbCFaY7QtXYJwtj5YZRODv6vxjOs8ZwL4lxV5SWNeuRu5-h1wUEbvtJhBBRvHpz0tI7afnk1FRK56w53zNKW_JvT47kvme94XeqqFiPvP3oJX-xg8B5NZzqYvO1PyLhorECAp-CCQWvKXAocCnwTo7kX7LFWF2peuQfTna08eSSxks2taoM_1PncbsozjfcL96oRmf8oFXW2fTlouM6IWdj-1uvL6Kqu-p-4z9h5yzs7sHjQ9i9wNk9hL2zsH_e2T8LTw7gdPfiVwAAAP__pa6FWw==
 
 # However, if we add a selective filter, the flow is kept on the remote node.
 query T
@@ -183,4 +183,4 @@ vectorized: true
       table: t@t_pkey
       spans: FULL SCAN
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJysktFr2zAQxt_3Vxz31G5qEznOGIKASuduLond2YENRh5U-5YZHMuTZNgI-d-H7UHrsLjr6Jv13f3uvk_WHu2PEgUGX-6WV2EEZ-_DdJ1-Wp5DGiyD6zW8hpskXoGDqxQchzCKggRWQfIhgNs4jP4UPIgjcPxSwQKcd6ng88cgCVolgwVwZFjpnCK1I4viK7aChxuGtdEZWatNK--7pjD_iWLKsKjqxrXyhmGmDaHYoytcSSgw0he6nvjIMCenirJrOzDUjXuArFNbQjE_sEeD-fjgtbovKSGVk5lMB-PRydoUO2V-IcNrXTa7ygpQDO4ZZMgwrVUrXOApH_w5Pm6K0pEhM-FDE70uQM7aaxVChNH63cmV3v9G9142-uykj4f1TaVNToby45_6dMtfwqzIbOlWFxWZyWwYpqRv7kzyN-cLU2y_95_IMG6cAMmZ9JicMekzOWfy7clI_iDSE881IVvrytI_vddpm4fyLfX3Y3VjMrozOuvW9Me44zohJ-v66rw_hFVfag0-hvko7I3D3ijsD2B-DM-eAXvHsD8KT49sbw6vfgcAAP__Lc6KaQ==
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJysktFr2zAQxt_3Vxz31G5qEznOGIKASuduLond2YENRhiqfcvMXMuTZNgI-d-H7UHrsLjr6Jv13f3uvk_WDu2PEgUGn26WF2EEJ2_DdJ1-WJ5CGiyDyzW8hKskXoGDixQchzCKggRWQfIugOs4jP4UPIgjcPxcwQKcd67g4_sgCVolgwVwZFjpnCJ1RxbFZ2wFDzcMa6MzslabVt51TWH-E8WUYVHVjWvlDcNMG0KxQ1e4klBgpM90PfGRYU5OFWXXtmeoG3cPWae2hGK-Zw8G8_HBa3VbUkIqJzOZDsajk-5L_Z1-IcNLXTZ3lRWgGNwyyJBhWqtWOMNjNvhTbFwVpSNDZsKHHnpdgJy1tyqECKP1m6Mrvf9N7j1r8tlRG_fbm0qbnAzlh7_08Za_ZFmR2dK1Lioyk9kwS0lf3Ynkr04Xpth-6z-RYdw4AZIz6TE5Y9Jncs7k66OR_EGkRx5rQrbWlaV_eq3TNg_lW-rvx-rGZHRjdNat6Y9xx3VCTtb11Xl_CKu-1Bp8CPNR2BuHvVHYH8D8EJ49AfYOYX8Unh7Y3uxf_A4AAP__NPGJeQ==
diff --git a/pkg/sql/opt/exec/execbuilder/testdata/distsql_union b/pkg/sql/opt/exec/execbuilder/testdata/distsql_union
index 5c7af4b811b3..18ace61e686a 100644
--- a/pkg/sql/opt/exec/execbuilder/testdata/distsql_union
+++ b/pkg/sql/opt/exec/execbuilder/testdata/distsql_union
@@ -55,7 +55,7 @@ vectorized: true
           table: xyz@xyz_pkey
           spans: FULL SCAN
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJy0ls-O2jwUxfffU0R39VV1FK7tzJ-sZjpDJSQKU5hKrSoWKbFGSIBTJ0gwiHevCEgzVOQ6duiOxJx77jn-LbKF4vccEuh-f-rf9wbB_4-98fP4a_9DMO72uw_PwTr4PBp-Cdab1-DboDccBPf9_pmz4eixOwo-_QjWwGCpMzVIF6qA5CcgMODAQAADCQximDDIjZ6qotBm_5dtJehla0g6DGbLfFXuX08YTLVRkGyhnJVzBQk8p7_maqTSTJmoAwwyVaazeWWz3rze5Wa2SM0GGDzo-WqxLJJqnXGe7n-GEYfJjoFelW8ORZm-KEhwx5pvMdamVCaKTxe4w4-147nL-Pch8aIphUdKdIgpa-e_jdUmU0Zl54aeWWKgQ51H_LSFOvvOv7KPG9nHJ_bocMmudxzxMBINWbbscbzlK1-WXWJeOKfwyIkOQWXt_JY4oQfNvHnP3LlmEUayIU6WPY41X_vi5BATL5xTeOREh6Cydn5LnLgHTqJ5z8K5ZhlGcUOcLHsca77xxckhJl44p_DIiQ5BZe38ljgJD5xk856lc81x2BAmyxbHkm99YXIIiRdNKTxSokNMWTu_JUqy5WfbmckjVeR6WaiGkycMVPaiDlkKvTJT9WT0tLI5PA4rXfUiU0V5OMXDQ295ONov-F6MpFieiPFvMSfFgnYWbZwlKY5pcUyK-RW99xWpvqbF1_RddejFb0j1LW1928oaacosjSONGXILpDRoaHOnUUNpcadhs7rTuNnUNG5o4Q1p4Ljt1mni0IIc0szZ3Hkr5jjNHLcwx2nmuM2dZo5bmOM0c1Z3N-Ymu__-BAAA__9leEQf
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJy0lt-L2k4Uxd-_f0W4T9_SCfHOTPZHnna7a0GwulULLUVKaoZF6jppEiEq_u_FKOxazJ3MxL6ZjOeee858HrKF_PcCIuh-ferf9wbe_4-98WT8uf_OG3f73YeJV3ofR8NPXrneeF8GveHAu-_3z5wNR4_dkffhm1cCg6VO1CB-UTlE3wGBAQcGAhhIYBDClEGa6ZnKc53t_7KtBL2khKjDYL5MV8X-9ZTBTGcKoi0U82KhIIJJ_HOhRipOVBZ0gEGiini-qGzK9eauXG9-pL_UGhg86MXqZZlH1T7jNN7_9AMO0x0DvSpeLfIiflYQ4Y41X2Oss0JlQXi6wR2-rx3Pbca_TYmXjSkcYqJFTlk7_3WszhKVqeTc0DNLDLSv04Cf1lBn3_lX9mEj-_DEHi1u2fqSA-4HoiHNhkWO13zlSrNNzksHFQ5B0SKprJ3fEih04Jk3L5rb9yz8QDYEyrDIsedrV6AscuKlgwqHoGiRVNbObwkUdwBKNC9a2Pcs_SBsCJRhkWPPN65AWeTESwcVDkHRIqmsnd8SKOEAlGxetLTvOfQb4mRY49jyrStOFinxsjGFQ0y0yClr57eESbb8fDszeaTyVC9z1XDylIFKntUhS65X2Uw9ZXpW2Rweh5WuepGovDic4uGhtzwc7Rd8K0ZSLE_E-LeYk2JBO4s2zpIUh7Q4JMX8it77ilRf0-Jr-q469OI3pPqWtr5tZY00ZYbGkcYMuQFSGjQ0udOooTS407AZ3WncTGoaNzTwhjRw3HTrNHFoQA5p5kzuvBVznGaOG5jjNHPc5E4zxw3McZo5o7sdc9Pdf38CAAD__9qqSRU=
 
 query T
 EXPLAIN (DISTSQL) SELECT x FROM xyz UNION SELECT x FROM xyz ORDER BY x
@@ -78,7 +78,7 @@ vectorized: true
           table: xyz@xyz_pkey
           spans: FULL SCAN
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJyslk-P2jAQxe_9FNGcWtUo2En4k9O2C5WQKGyBSq0qDimxVpEgpraRYBHfvSIcUiiM7SS3TbJv3s9vnpCPoP6sIYbhj5fxp9HEez8YzRfzb-MP3nw4Hj4vvL33ZTb96u0Pb973yWg6ufN-OhsMZ97nn94eCOQi5ZNkwxXEv4ACAQYEAiAQAoEIlgS2Uqy4UkKe_-VYCEbpHuI2gSzf7vT59ZLASkgO8RF0ptccYlgkv9d8xpOUS78NBFKuk2xd2OwPb09bmW0SeQACz2K92-QqLnDm2-T8Z8tnsDwREDtdOiidvHKI6YlUo4iapGAuFINM6SxfaZ_eJPFEHxoE1Qwia4PwoUE5d5cLmXLJ06upyxOGwOzPGLmccS6k5tJn9Hb8x4fzO1fzqX1VqGtVfNbyA8vKOnB0muVgLhxlp_5L3LK01gadiqVl9kky5ySDlh9abtSBo9ssB3PhKANnFTdqbdCtuNHAPsnAOcmw5UeWG3Xg6DXLwVw4ysCDihu1NuhV3Ghon2TonGTUstynA0W_SQrmQlGGHVbcprVBv4Frwh2DGVdbkSt-c124P7l9vkbw9JVf7hxK7OSKv0ixKmwuj9NCV7xIudKXr8HlYZRfPp0B_xVTVMxwMUPF4ZWY3oqDOuIQFUc4doSf2XDoDqru4-IuKu7h4l6dxPp1xBTvGDWVDG8ZNSROa_WM1ioaxZtGuwZ0vGu0Y5DjZTOx420zqfG6MWpAxwvH2oafFrxxBnaGF-5WvTy9-xsAAP__0xpIbQ==
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJysll-L2kAUxd_7KcJ9aulInEninzxtu2tBsLpVCy1FSmoui9TN2EyEqPjdi_Eh1eqdmSRvm2TPPb859yBzAPVnDSEMvj2PPgzHztun4Ww--zJ658wGo8Hj3MmdT9PJZyff7Z2v4-FkfOP9ZPo0mDofvzs5MEhkjOPoFRWEP4ADAwEMPGDgA4MAFgw2qVyiUjI9_cuhEAzjHMI2g1Wy2Wan1wsGS5kihAfIVtkaIYR59GuNU4xiTN02MIgxi1brwibf7R_y3f7n5jfugMGjXG9fExUWPLNNdPqz5QpYHBnIbVZaqCx6QQj5kVXDCBrFEDYYTyuVrZJl5vKrLB74XQOvmkFgbODfNSjnbhOZxphifDF1caQQhPkZA5szzmSaYeoKfj3-_d35nYv53Lwr3Lorrmi5nmFpLUA6DYMIG5CyVf9lblhbY4NOxdoK8yiFfZRey_UNd2oB0m0YRNiAlJGLijs1NuhW3KlnHqVnH6XfcgPDnVqA9BoGETYgZeRexZ0aG_Qq7tQ3j9K3jzJoGW7UAqPfKIawwSjj9ivu09ig38B14YbBFNVGJgqvrg23J7dP1wmMX_B891Bymy7xOZXLwub8OCl0xYsYVXb-6p0fhsn50wnwXzEnxYIWC1LsX4j5tdirI_ZJcUBjB_SZNYfukOo-Le6S4h4t7tVJrF9HzOmOcV3J6JZxTeK8Vs94raJxumm8q0Gnu8Y7GjldNh073Tadmq6b4Bp0unCirflpoRunYRd04a7Vi-ObvwEAAP__qRtNYw==
 
 # UNION with no overlap.
 query T
@@ -108,7 +108,7 @@ vectorized: true
               table: xyz@xyz_pkey
               spans: FULL SCAN
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJysl09v2kAQxe_9FKs5taqRmV2bP5YqpU2IipRCClRt1XKgeBVZIjZdG4kk4rtXgIQDDTO7jm_B8PbNvPnNBp4g_7uACHo_bm8-9gfi7VV_PBl_vXknxr2b3uVErMX1aPhFrB8exffPvVFPrMXvVbOp5kKJb4P-cMB9UH8QSgxHV72R-PRTrMGDNIv1YHavc4h-AYIHEjxQ4EEAHoQw9WBpsrnO88xsP_K0E_TjNURND5J0uSq2j6cezDOjIXqCIikWGiKYzP4s9EjPYm38JngQ62KWLHY264fHi6VJ7mfmATy4zBar-zSPduWMl7Ptnw1fwnTjQbYqSoe8mN1piHDj2VdxnSwKbbTxw-MS9s8jcYFlMFEU9QeTzllj6WL8vH2stX9VqX9kApjz_QcuxldJXiTpvPDlSfMXeNYgrGYQWhu0zhqU567SzMTa6Pjo1OmGKkHZ99h26XGcmUIbX-Hp8e_Pnt85Oh8dIHVl1JcNX1luKVPHgdJW3VvqEkDNCahKCSATgfOeMsblGv0HmeWeWhu0Ku6ptJ-hdB6haviBJcRMHYcRtuuG2CEArDkBVSkBZCJwhpgxLhmTFSG2NmhXhFjZz1A5jzBo-KElxEwdhxF26obYIQCsOQFVKQFkInCGmDEuGVMVIbY26FSEOLCfYeA8wrBhiTBTxWGA3boRdmgfa-1fVeofmQCcAWaMS76CigBbG3Rr-Mr_gsFI58sszfXJV_-XT25ufxLo-E7vfz_k2crM9a3J5jub_cvhTrd7EOu82L-L-xf9dP_WtsDnYiTFIS2WpFjRYkWKA1ockOLWkRhPxeFrxC1S3KbLbtOBSVrdIdVdWtylKWGGhQxkHGU0Zsg0jjRozMSQJo1T06ghsyJIw4bM1JDGDRnekAYOO4ycJo5LjkaOUUuaOMkQJ2niJHez0cRJZl0kjZxkbjf5qutNvup-kzRxkiFOMlccNzaaOMmsi6SRU03mXxLNHJOcopE7VU83b_4FAAD__4nHoMI=
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJysl91u2kAQhe_7FKu5alUjM7s2P5YqpU2IipRCClRt1aKK2qsIldjUNpJJxLtXgIQDDTO7ju_in7Nn9sw3G_wI2d8FBND7dnvzvj8Qr6_648n4880bMe7d9C4nohDXo-EnUawfxNePvVFPFOLnqtlUoVDiy6A_HHAv6ndCieHoqjcSH76LAhyIk0gPZvc6g-AHIDggwQEFDnjggA9TB5ZpEuosS9LtK487QT8qIGg6MI-Xq3x7e-pAmKQagkfI5_lCQwCT2e-FHulZpFO3CQ5EOp_NFzubYv1wUawffi3_6DU4cJksVvdxFuzqGS9n2z8broTpxoFklZcWWT670xDgxjEv43q-yHWqU9c_rmF_PxAXWCYTBEF_MOmcNZY2xk_3j_UGoCoFgEwCIR-AZ2N8Nc_yeRzmrjzZ_QWeNfCrGfjGBq2zBuW6qzhJI53q6GjV6YYqQZnvsW2zx3GS5jp1FZ4u__bs-p2j9dGCUmtIXdlwleGcMoUcMG3VPac2CdQdgaoUATIZWE8qY1wO0n-YGU6qsUGr4qRK8yZK-x6qhusZYswUcuhhu26MLRLAuiNQlSJAJgNrjBnjkjJZEWNjg3ZFjJV5E5V9D72G6xtizBRy6GGnbowtEsC6I1CVIkAmA2uMGeOSMlURY2ODTkWMPfMmevY99BuGEDNlHDrYrRtii_1jvQGoSgEgk4A1woxxSZhXEWFjg24NP_2fMRjpbJnEmT75BHh-5eb200BHd3r_HZElqzTUt2kS7mz2l8Odbncj0lm-f4r7i368f7Qt8KkYSbFPiyUpVrRYkWKPFnukuHUkxlOx_xJxixS36bLbdGCSVndIdZcWd2lKmGYhAxlHGY0ZMhtHGjSmY0iTxqlp1JAZEaRhQ6ZrSOOGDG9IA4cdRk4TxyVHI8eoJU2cZIiTNHGSO9lo4iQzLpJGTjKnm3zR8SZfdL5JmjjJECeZI45rG02cZMZF0sipJvMviWaOSU7RyJ2qp5tX_wIAAP__jneluA==
 
 # UNION with partial overlap.
 query T
@@ -138,7 +138,7 @@ vectorized: true
               table: xyz@xyz_pkey
               spans: FULL SCAN
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJysl09v2kAQxe_9FKs5taqRmV2bP5YqpU2IipRCClRt1XJw8SqyRGy6NhJJxHevAAkCDTO7jm_B8PbNm_nNBp6g-DuHCHo_bm8-9gfi7VV_PBl_vXknxr2b3uVErMT1aPhFrB4exffPvVFPrMTvZbOpZh9EIL4N-sMB90ktUAxHV72R-PRTrMCDLE_0IL7XBUS_AMEDCR4o8CAAD0KYerAw-UwXRW42H3naCvrJCqKmB2m2WJabx1MPZrnRED1BmZZzDRFM4j9zPdJxoo3fBA8SXcbpfGuzeni8WJj0PjYP4MFlPl_eZ0W0LWe8iDd_NnwJ07UH-bI8OBRlfKchwrVnX8V1Oi-10cYPj0vYPY_EBe77EkVRfzDpnPWVLr7P02Ot8VWl-Mjk3xDENSBwcb5KizLNZqUvT9Jf4FmDsJpBaG3QOmtwOHeZ5SbRRidHp07XVAnKPmPbJeM4N6U2vsLT49-fPb9zdD46UOoKqS8bvrLcUqaOPaatmrfUJX_NDVCVGoBMB9z3lHE-rNF_kFnuqbVBq-KeSvshSucZqoYfWELM1LGfYbtmiB3yY80NUJUagEwH3CFmnA-MyYoQWxu0K0Ks7IeonGcYNPzQEmKmjv0MOzVD7JAfa26AqtQAZDrgDjHjfGBMVYTY2qBTEeLAfoiB8wzDhiXCTBX7CXZrRtghPdYaX1WKj0x-d4AZ5wNfQUWArQ26NXzlf8FgpItFnhX65Kv_yyc3Nz8JdHKnd78finxpZvrW5LOtze7lcKvbPkh0Ue7exd2LfrZ7a1PgczGS4pAWS1KsaLEixQEtDkhx60iMp-LwNeIWKW7TZbfphkla3SHVXVrcpSlhhoUMZBxlNGbIBEcaNGZiSJPGqWnUkFkRpGFDZmpI44YMb0gDhx1GThPHdY5GjlFLmjjJECdp4iR3s9HESWZdJI2cZG43-arrTb7qfpM0cZIhTjJXHDc2mjjJrIukkVNN5l8SzRzTOUUjd6qert_8CwAA__-Eh6C8
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJysl2-P0kAQxt_7KTbzSmNJmd2WP01MTu-4SHLCCRg1SgzSzYXItdiWpNyF726ABA48Znb3-k4Kzz4zz_xmvT5C_ncOEXS-3d687_bE66vucDT8fPNGDDs3ncuRKMX1oP9JlKsH8fVjZ9ARpfi5rNfV9J0IxJdet9_jfqkFiv7gqjMQH76LEjxI0lj3Jvc6h-gHIHggwQMFHgTgQQhjDxZZOtV5nmabnzxuBd24hKjuwSxZLIvN47EH0zTTED1CMSvmGiIYTX7P9UBPYp35dfAg1sVkNt_alKuHi3L18GvxR6_Ag8t0vrxP8mhbz3Ax2fyz5ksYrz1Il8XBIi8mdxoiXHvmZVzP5oXOdOaHxzXsnkfiAvfBRFHU7Y1aZ32lje_T9rHa_pVT_8gEsGGISyCwcb6a5cUsmRa-PGn_As8ahG4GobFB46zB4dxlkmaxznR8dOp4TZWgzHts2vQ4TLNCZ77C0-Pfnj2_dXQ-WmBqTakva74y3FOmkD2njYr31CaAqhNQTgkgE4H9pjLOh0X6DzPDTTU2aDhuqjSforQfoqr5gSHGTCH7ITYrxtgiAKw6AeWUADIR2GPMOB8ok44YGxs0HTFW5lNU9kMMan5oiDFTyH6IrYoxtggAq05AOSWATAT2GDPOB8qUI8bGBi1HjAPzKQb2QwxrhhAzZexH2K4YYov2sdr-lVP_yARgjzDjfCAscETY2KBdwZ_-zxgMdL5Ik1yfvAI8f3J982qg4zu9e4_I02U21bdZOt3a7D72t7rtg1jnxe5b3H3oJruvNgU-FSMpDmmxJMWKFitSHNDigBQ3jsR4Kg5fIm6Q4iZddpMOTNLqFqlu0-I2TQkzLGQg4yijMUOmcaRBYyaGNGmcmkYNmRVBGjZkpoY0bsjwhjRw2GLkNHFccjRyjFrSxEmGOEkTJ7mbjSZOMusiaeQkc7vJF11v8kX3m6SJkwxxkrniuLHRxElmXSSNnKoz_yXRzDHJKRq5U_V4_epfAAAA__-KWaWy
 
 # UNION ALL with swapped column orders.
 query T
@@ -159,7 +159,7 @@ vectorized: true
       table: xyz@xyz_pkey
       spans: FULL SCAN
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJyslUGLm0AYhu_9FcN3amHEzIxmdz1l2aYQsGabpFAoHmwcFsE4dkZBN-S_lxjabUJ2HMccdXz8Hr_3JdmD-p1DAPMfz-HjIkIfPy_Wm_W38BNaz8P50wY1GLXoy2r5FTXtK_oeLZYRegzDv8ctRs2_Y8BQiJRHyY4rCH4CAQwUMDDA4AEGH2IMpRRbrpSQx0f2HbBIGwgmGLKirKvj7RjDVkgOwR6qrMo5BLBJfuV8xZOUS3cCGFJeJVnejWna11kps10iW8DwJPJ6V6igMwcM6zI5Xjnu0WRZVwGaUTwjEB8wiLp6m6iq5IVDQA7Yzsq3tHpPhL4r8jZfcZklOaoLIVMueXqmEB-uGEfCEaVLJhdPXleYGCgMn-0bzWZns4l5DsQiB5c6LrPpxwCvqbWXWUPIbRtCLBpCzbdBbbbBHNezSWmA1521l1lK9LYpUYuUmPk2mM02PKf7LRyc0gCve2svs5TYbVNiFil55tvwbLbhOzYZDbB6sLQyS8i7bULeyP_DK29ecVWKQnHDN8cYePrCT9-jRC23_FmKbTfmdLnsuO5GylV1OqWni0XRHXVh_Q-TMTDVwkwPMy1Mpmf05JL2tPRUP9ofA0_HfPSdFn7Qw_dj4Icx2kTfMdJXMn3LevFRPSM9RfN7cH3TenF91y7d48OHPwEAAP__S0dirw==
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJysldGK2kAUhu_7FMO5amFCnJnEXXPlsrUgWN2qhUIJJTWHRZrNpJkEEsV3L0bareJOJhMvk8mX8-X8P7oH9TuBACbfnmYP0zl5_3G6Wq--zD6Q1WQ2eVyTipKafFouPpOq3pGv8-liTh5ms7_HNSXVv2OgkMoY59ELKgi-AwMKHCgIoOABBR9CClkuN6iUzI-P7BtgGlcQDChs06wsjrdDChuZIwR7KLZFghDAOvqZ4BKjGHN3ABRiLKJt0oyp6t24qnc_sl9YA4VHmZQvqQoadaCwyqLjleMeVRZlEZAxp2MG4YGCLIvXkaqInhECdqB2Wr6t1lsm_E2TVwGF-TZKSJnKPMYc4zOH8HBFeS4dmblscPHkdYWBgUL32b7RbHE2m5kHwWyCcLnjCpuGdBAb2ouZdYTdtiPMoiPcfB3cah3CcT2bnDqI3dmLmeXEb5sTt8hJmK9DWK3Dc5pfxM45dRC7txczy0ncNidhkZNnvg7Pah2-Y5NSB62RrZZZRt5tM_J6_i9eefMSVSZThYZvDilg_Iyn71GyzDf4lMtNM-Z0uWi45kaMqjid8tPFNG2OmrT-h1kfmGthoYeFFmbDM3pwSXtaeqgf7feBh30--k4Lj_TwfR941Eeb6TvG2kqmb1kr3qtnrKVofguub1orru_apXt4ePcnAAD__7KpZ6U=
 
 # UNION ALL and UNION with different ORDER BY types.
 query T
@@ -186,7 +186,7 @@ vectorized: true
           table: xyz@xyz_pkey
           spans: FULL SCAN
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJy0ll1v2jAUhu_3K6xz1WpG4dhOP3LVrmUSEoMOOmnTxEVGrAqJYpYEKaHiv098SC1bc-zY2h35ePOe5_i54AWK3wtIoPf9YXDbH7Kz-_7kcfJ1cM7OJr1B7-6RVezzePSFVfWGjcb3vTH79IPV5-zbsD8astvBgHxxc_76uwIOS5PpYfqsC0h-AgIHARwkcFDAIYYph1VuZrooTL575WUf6GcVJF0O8-VqXe5uTznMTK4heYFyXi40JPCY_lrosU4znUdd4JDpMp0v9jVVvblZ5fPnNK-Bw51ZrJ-XRcIqzjbAYbJKd1edSMB0y8Gsy9eSokyfNCS45e6DTExe6jyKT2e4wY_AYbQuE3aDjUWiTdFbYnRGrt2QpQcyejGrxqbXApNnOtfZv5-fbt8ZZ2g6ZhWJ05U01Xf_V33sVB-f1GOLE_dwPBKdSDpabhnleOQX4Za3YXaGrl2hpQc0elGrxqZA0dDDc-G-dOEjmuxEylE0yyjHnV-Gi9aCGZ2ha1do6QGNXtSqsSlQNOEhmnRfuvQRTXWi2FE0yyjHnV-Fi9aCGZ2ha1do6QGNXtSqsSlQNOkhmnJfuvIRLe44amYZ5Ljx63DNWhCjM3Lthiw9kNGLWTU2BUqmAv8evvPlsS5WZlloxy9POejsSR9YCrPOZ_ohN7N9zeFytM_tb2S6KA9P8XDRXx4e7QZ8G0YyrE7C-HdYkGFJN8uQZkWGYzock2FxQc99QaYv6fAlfVZdevArMn1NV18HVSNtmWXjSGuGwiIpLRra2mnVUFnaadms7bRutjStG1p8Q1o4YTt12ji0KIe0c7Z2EeScoJ0TFucE7ZywtdPOCYtzgnbO2t7Ouen2w58AAAD__-lCatc=
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJy0ll1r2zAUhu_3K8S5apmCcyS5H75q12YQyJIu6WBjhJHFopSlkWc7YKfkv498QJutPpIldhd_vH7Pc_Rc5BmK3wtIoPf1bnDdH7KT2_7kfvJ5cMpOJr1B7-aeVezjePSJVfWajca3vTH78I3Vp-zLsD8asuvBgHxxffryuwIOS5Pq4exJF5B8BwQOAjhI4KCAQwxTDllu5rooTL595XkX6KcVJF0Oj8tsVW5vTznMTa4heYbysVxoSOB-9nOhx3qW6jzqAodUl7PHxa6mqtdXVb3-kf3SNXC4MYvV07JIWMXZGjhMstn2qhMJmG44mFX50lKUswcNCW64-yQTk5c6j-LjIa7wPXAYrcqEXWFjkWhT9BoZ3ZlrN2bpwYxe0Kqx6aXA5KnOdfrv56ebN8YZmo7JInG8k6b67v-qj53q46N6bHHkPpZHohNJR88tsxzO_Czc8zbQ7tS1K7X0oEYvbNXYFKgaepgu3LcuvFSTnUg5qmaZ5bD083DVWkCjO3XtSi09qNELWzU2BaomPFST7luXXqqpThQ7qmaZ5bD0i3DVWkCjO3XtSi09qNELWzU2BaomPVRT7ltXXqrFHUfRLJMcVn4ZLloLZHRnrt2YpQczekGrxqZAzVTg38Q3vjzWRWaWhXb88pSDTh_0nqUwq3yu73Iz39XsL0e73O5Gqoty_xT3F_3l_tF2wNdhJMPqKIx_hwUZlnSzDGlWZDimwzEZFmf03Gdk-pwOn9Nn1aUHvyDTl3T1ZVA10pZZNo60ZigsktKioa2dVg2VpZ2WzdpO62ZL07qhxTekhRO2U6eNQ4tySDtnaxdBzgnaOWFxTtDOCVs77ZywOCdo56zt7Zybbt79CQAA__-TZW_N
 
 query T
 EXPLAIN (DISTSQL) (SELECT x FROM xyz ORDER BY y) UNION (SELECT x FROM xyz ORDER BY z) ORDER BY x
@@ -209,7 +209,7 @@ vectorized: true
           table: xyz@xyz_pkey
           spans: FULL SCAN
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJysls-O2jwUxfffU1h3NaPPKNhJ-JPVtAOVkChMgUqtKhYpsUaRIKG2IwUQ714lLFLozI1tuhsnOT4_33M0-ATq1xYiGH97mX6YzMjDaLJcLb9MH8nDcjwdP69IST4t5p9JeTiS-WI0XpCP38nhkXydTeYz9KPjY_N3CRSyPBGzeCcURD-AAQUOFHygEACFENYU9jLfCKVyWX1yqgWTpISoSyHN9oWuHq8pbHIpIDqBTvVWQASr-OdWLEScCOl1gUIidJxua5vycHzay3QXywNQeM63xS5TESkpOQKF5T6uVh2vIpkXOiJPDNZnCnmhGzul41cBETtTN6TQFOlgi8RtkEap0mm20R67mRFi4LsZhMYGwbsGzb5FlstESJFc7bo-Ywjc_IyhzRmXudRCepzdbv__u_v3rvZn5r1hDlX2eMfzrctsAdVzKLMpFLeBatr2VxaGdTY26DnWmZuPlbtk7Xe8wDprC6i-S9aGUNwGqomCO2ZtbNB3zNo3H6vvknXQqX9H7LK2gBq4ZG0IxW2gmih8x6yNDQaOWQfmYw1csg471klbIA1dkjZC4jZITQyBY87GBsN_cB15w2Ah1D7PlLi5lry9c7e6rojkVVzuNiov5Ea8yHxT21yW81pXP0iE0pe3_mUxyS6vKsA_xQwVc1zMUXFwJWa3Yv8ecYCKQxw7xM_ccugeqh7i4j4qHuDiwT0TG94jZnjHWFvJ8Jaxlomzu3rG7ioaw5vG-i3oeNdYr0WOl62NHW9bmxqvG2ct6HjheLflXwveuBZ2jhfuVr0-__c7AAD__4vwbyU=
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJysll9v2jwYxe_fT2E9V61eo2An4U-uuhUmITHogEmbJjRlxKrQaMxiR0pAfPcp4SKDtU9ss7s6yfH5-TlHxUdQv3YQwfjL0_TdZEbuRpPlavlpek_uluPp-HFFCvJhMf9IivJA5ovReEHefyXlPfk8m8xn6EeH--bvAiikMhGz-EUoiL4BAwocKPhAIQAKIawp7DO5EUrJrPrkWAsmSQFRl8I23ee6erymsJGZgOgIeqt3AiJYxT92YiHiRGReFygkQsfbXW1TlIeHojx83_8UJVB4lLv8JVURKSg5AIXlPq5WHa9Cmec6Ig8M1icKMteNn9Lxs4CInagbU2jMVNoycRum0VbpbbrRHruaEmLguxmExgbBmwbNvnkqs0RkIrnYdX3CELj5GUObMy5lpkXmcXa9_f9v7t-72J-ZF4e5lNnjHc-3rrMFVc-lzqZU3Iaq6dtfaRgW2tig51hobj5X7pS23_EC67QtqPpOaRtScRuqJgzumLaxQd8xbd98rr5T2kGn_jWxS9uCauCUtiEVt6FqwvAd0zY2GDimHZjPNXBKO-xYZ23BNHTK2oiJ2zA1QQSOSRsbDP_BteQVg4VQe5kqcXU9eX3nbnVtEcmzON9xlMyzjXjK5Ka2OS_nta5-kAilz2_982KSnl9VgH-KGSrmuJij4uBCzK7F_i3iABWHOHaIn7nl0D1UPcTFfVQ8wMWDWyY2vEXM8I6xtpLhLWMtE2c39YzdVDSGN431W9DxrrFeixwvWxs73rY2NV43zlrQ8cLxbsu_FrxxLewcL9y1en3673cAAAD__5bTdBs=
 
 # UNION ALL with conflicting numbers of ORDER BY columns.
 query T
@@ -236,7 +236,7 @@ vectorized: true
           table: xyz@xyz_pkey
           spans: FULL SCAN
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJy0ll1v2jAUhu_3K6xz1WpG4dhOP3LVrmUSEoMOOmnTxEVGrAqJYuYECVrx3yc-JMrWHDu2dpmQ1-95jp8LXqH8PYMMOt8ferfdPju7744eR1975-xs1Ol17h7Zin0eDr6w1fqFDYb3nSH79IOtz9m3fnfQZ7e9Hv0hZy_nx8cVcJibQvfzZ11C9hMQOAjgIIGDAg4pjDksrJnosjR2-8nrLtAtVpC1OUzni2W1fT3mMDFWQ_YK1bSaacjgMf8100OdF9ombeBQ6CqfznY1q_XLzcJOn3O7Bg53ZrZ8npcZW_HdgMBhtMi3L1qJgPGGg1lWx56yyp80ZLjh_rOMjK20TdLTMW7wI3AYLKuM3WBtkWhS9BYa_an9kGUAMgYxq9qmY4Gxhba6-Pf48eadcfqmZRaJOF1JXX37f9WnXvXpST02uPEwzRPRSqSn6I5pDrd-ES96E2x_bl9oGQCNQdSqtinSNQxQXfgvXQS6JluJ8nTNMc1h7ZfxrjXARn9uX2gZAI1B1Kq2KdI1EeCa9F-6DHRNtZLU0zXHNIe1X8W71gAb_bl9oWUANAZRq9qmSNdkgGvKf-kq0LW05WmaY5bD0q_jTWsAjf7UfsgyABmDmFVtU6RnKvKv4jsnD3W5MPNSe5485qCLJ71nKc3STvSDNZNdzf5xsMvtXhS6rPa_4v6hO9__tB3wbRjJsDoJ499hQYYl3SxjmhUZTulwSobFBT33BZm-pMOX9F216cGvyPQ1XX0dVY20ZY6NI60ZCoektGjoaqdVQ-Vop2VzttO6udK0bujwDWnhhOvWaePQoRzSzrnaRZRzgnZOOJwTtHPC1U47JxzOCdo5Z3sz58abD38CAAD__zZCb3U=
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJy0ll1rGkEUhu_7K4ZzldCR9czM5mOvkiYWBKupptBSpFh3CKHGsbsrrAb_e_EDEtvsmS96ueu-857nzHPhM5S_Z5BB5-td77rbZye33dH96HPvlJ2MOr3OzT2r2cfh4BOrV2s2GN52huzDN7Y6ZV_63UGfXfd69IecrU9fHmvgMDe57k-edAnZd0DgIICDBA4KOKQw5rAozFSXpSm2nzzvAt28hqzN4XG-WFbb12MOU1NoyJ6heqxmGjK4n_yc6aGe5LpI2sAh19XkcbarqVfrq3q1_rH4pVfA4cbMlk_zMmM1300IHEaLyfZFKxEw3nAwy-qlqKwmDxoy3HD3YUamqHSRpMdzXOF74DBYVhm7wsYi4VP0mho9sN2YZQAzBkGrxqaXAlPkutD5v8ePN2-M0zcts0jE8U6a6tv_qz51qk-P6tHjygNFT0QrkY6qW8Y5XPtZvOo-3B7grtQygBqDsFVjU6RtGCC7cN-6CLVNthLlaJtlnMPez-Nt8-BGD3BXahlAjUHYqrEp0jYRYJt037oMtU21ktTRNss4h71fxNvmwY0e4K7UMoAag7BVY1OkbTLANuW-dRVqW9pydM0yzGHrl_GueVCjB7YbswxgxiBo1dgUaZqK_Mv4xslDXS7MvNSOJ4856PxB71lKsyym-q4w013N_nGwy-1e5Lqs9r_i_qE73_-0HfB1GMmwOgrj32FBhiXdLGOaFRlO6XBKhsUZPfcZmT6nw-f0XbXpwS_I9CVdfRlVjbRllo0jrRkKi6S0aGhrp1VDZWmnZbO207rZ0rRuaPENaeGE7dZp49CiHNLO2dpFlHOCdk5YnBO0c8LWTjsnLM4J2jlru59z4827PwEAAP__IIl0aw==
 
 # Only one distinct processor should be used in the single node UNION case.
 query T
@@ -280,7 +280,7 @@ vectorized: true
           table: xyz@xyz_pkey
           spans: FULL SCAN
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJy8lt9vokoUx9_vX0HOU5s7BmYAf5DcpL2tmzVxtSs-7GbDA5XZamKFHTCpbfzfN2BNi-gcRsy8qfCZ-TLnczy8QfpnCR70fzwMbwcj4-p-4E_978Nr48rvD_t3U2NjfJmMvxkvm9drYzCa9id-_uvtcHj0jvHkvj8x_v9pbIDAKo74KHzmKXi_gAIBBgRsIOAAARcCAomIZzxNY5Hf8lYAg-gFPIvAYpWss_zngMAsFhy8N8gW2ZKDB9PwccknPIy4MC0gEPEsXCyLbV42rzeJWDyHIk9wFy_Xz6vUK-L4SZh_bJkMgi2BeJ297_Cx8OPGmIfpvLzkDYVgGxBIs_CJg0e35Lykru6k7GTSj3XWq1hEXPCotFKQk9gtRx73a5jOfZ6NE5Me1GW6SbhXFggILPnv7OqGXv8nFk_z4hMQGK8zzyge5fOjfzyWrVIAPxYZFyZ1D0_q35PrOzWO7diJvC96JMQobsWJyazDMz66vVvantb3i6r6ZbKWaV-wFxSytvVnZSezaugGqqkbkBLsu6F9bjew-iVmyiW2W6ZzQR0Vsnb0Z2Uns2rQkWnSESnBXsfOuTra9UtsK5fYaZnuBXVUyNrVn5WdzKpBR1uTjkgJ9jp2z9XRqV9iR7nEbuuCMiok7elOyk4m1aCio0lFpAB7FXuXeG09sv6Ep0m8SnmtN1IrPzMePfFdDdJ4LWb8QcSzYpvd13HBFS8gEU-z3VW2-zJYFZeKutaHO01gShvRbiO6J6epwplRNbjTBD44M1XabUT35DQ7pK3PtF2CrUPYlsKOfGdHCjMq39pt0h9yGOkPOYz1B0Ij_YHQSH-0m_SHHEb6Qw5j_YHQSH8gNNIfHamlXbmk3Sb90WtiuBxGDJfDmOEIjRiO0NgEUBmb1X9SlbmpSqNDQGlyKuOI5rQyRUqqUiYXncrHCGI6rcwRFdURGnEdoTHZMRyxHcMx3SszVEl3OY3pLqdR3REc0x3BMd0rg7SsexvRvTJTlHSvzBQl3eU0prucRnVHcEx3BMd0r8xTJd3lNKa7nEZ1R3BMdwTHdK9M1fK7tiXXnVVmi1T3YPvP3wAAAP__SkGIVw==
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJzElu9vmkAYx9_vryDPqzY7g3eAP0iWtGtdZuK0E19sWchC5VbNrMcAE2nj_76ANS2i93Bi6DsVPndf7vk8PjxD9G8BNvR-3A2u-0Pt4rbvTJzvg0vtwukNejcTLdG-jEfftHXydKn1h5Pe2El_vR4MDt4xGt_2xtrnn1oCBJbC50PvkUdg_wIKBBgQMICACQQscAkEoZjyKBJhestzBvT9NdhNAvNlsIrTn10CUxFysJ8hnscLDjZMvPsFH3PP56HeBAI-j735IttmnTxdrZOn38Ffnka4EYvV4zKyszxO4KUfGzoDd0NArOKXLV5Xvk-0mRfN8mteUXA3LoEo9h442HRDTotq1R6VHY36us5qKUKfh9zPreSmJHbLgef96kUzh8ejQKd7lZkkAbfzCgGBBf8TX1zRy0_h_GGWfQICo1Vsa9mjvH3018cyVCrgiDDmoU6t_ZP6eHR9s8SxHTqRl0UPhBiKhgh01tw_44PbW7ntaXnBqLJgOmvoxhm7QSFs6x3CsqNha-gHWlM_IDXY9UPr1H5g5WvM1GtsNHTzjEIqhG2_Q1h2NGwNQrKahERqsBOyfaqQRvkaG-o1Nhu6dUYhFcJ23iEsOxq2BiGNmoREarATsnOqkGb5GpvqNbYaZ9RRIWq39qjsaNQaZDRrkhGpwE7G7jleXw-sP-ZRIJYRL_Vm2kzPjPsPfFuDSKzCKb8LxTTbZvt1lHHZa4jPo3h7lW2_9JfZpayu5eF2FZjSSrRVie7KaapwZlQNbleB985MlbYq0V05zfbp5lvayMHNfdiQwqZ8Z1MKMyrf2qrSH3IY6Q85jPUHQiP9gdBIf7Sq9IccRvpDDmP9gdBIfyA00h9tqaUduaSdKv3RrWK4HEYMl8OY4QiNGI7Q2ARQGZvFf1KVualKo0NAaXIq44jmtDBFcqpSJhedyscIYjotzBEV1REacR2hMdkxHLEdwzHdCzNUSXc5jekup1HdERzTHcEx3QuDNK97C9G9MFOUdC_MFCXd5TSmu5xGdUdwTHcEx3QvzFMl3eU0prucRnVHcEx3BMd0L0zV_Lt2U647K8wWqe7u5sP_AAAA__9lZo1N
 
 query T
 EXPLAIN (DISTSQL) (SELECT y FROM xyz) INTERSECT (SELECT y FROM xyz) ORDER BY y
@@ -303,7 +303,7 @@ vectorized: true
           table: xyz@xyz_pkey
           spans: FULL SCAN
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJy8mF9v6jYYxu_3KSJftVpQsJ3wJ9Kknp0yDYmVM-Bi09SLHPBaJEpYEqTSqt99IpwqbUzex26S3rXAL37y4ucnh2eW_rdhIRv99W3yZXzjXFyP54v5n5NL52I-moy-LpyD89ts-ofzeHi6dMY3i9Fsfnz13LvT2fVo5vz6t3NgLtvGK3UTPaiUhf8wzlwmmMskc5nPXBawW5ftknip0jROjh95zoHx6pGFXZett7t9dnz51mXLOFEsfGbZOtsoFrJF9H2jZipaqcTrMpetVBatN_kyj4enq12yfoiSY4Kv8Wb_sE3DPM58Fx3_7HiC3b64LN5nxQppFt0pFvIX92MpgiZTCJsU1-s0W2-XmcdLk7jipQUK5vvBuY_S-zOfL0LIj4UIGg3hV4YorrPfxslKJWr17kr5VSpjCjSrIkLQVgQ0qSJCr0YE90Mpf4_S-7nKpjtPlia1OOxU-EYCXyYT5rKN-je7uOKXvyTru_v8L-ay6T4LHeK2-jY7bB4nmUo8qU3t58rrDwzGdm4iPy56JsRN3Il3nt8tz_js8sN3y3Nzl3Bbl3ii40lDp1nk6DWbQ9jkKITCW7SacYhei1bjzSkFzarKag1GQJOqsppdhNpW459kNbDDXq2mTc3UasK8zsK6zrLj-YZascjRbzaHsMlRNFq0qBXjEP0WtSKa6zSaVZVWGoyAJlWlFbsItbUiPkkrYIe9akWbmqlWpHmdpXWd_Y4XGGrFIseg2RzCJkfRaNmiVoxDDFrUimyu02hWVVppMAKaVJVW7CLU1or8JK2AHfaqFW1qplrxzevsW9c56BhKxSLFsMkUwiZF0Wa_RaUYhxi2qBS_uT6jWVUppcEIaFJVSrGLUFsp_icpBeywV6VoU_vIzzpnrj9T6S7epsroF5vucWZqdadO30Ea75Ol-pbEy3yZ07_TnMtfWKk0O70rT_-Mt6e3jgHfwpyEBQ2LMszfwv47mNvBXNahBa9FD-vQsk_TkqSDOjAHI6dpIerQsluLHtC0T27THg0HFrAowz0S7tMF6ZMwuOcBCfucXnpI0hw0m9NS4WBxrmnFxgyARmoAOHIDwoEcAI7swGm5AD0AGvkB4EgQAEeGQDioC9cM837LotHRiinhmiY4LRneA4WhNYNunfaM6ILFadPwIcA11ViVnaZh2Wkclh3gqOw0jsouNMvalB3QqOwAR2UHOCo7wsGOF-Dcik6PmmooXCu7oFUjfHBsplWDbp02jRiAxWnTCHCiEZpqrM78NA0P_TQOT_0AR8d-Godl1yxrVXaahmWncVh2GodlBzja8fRZVoKvXYIHZE6XXdKqkeAkLWnVgFuXtGkkOFZI2jQyALimGpuyAxqVHeCo7AgHZQc4fMjXLGv1lE_T8DGfxuFzPo3DB32Aox1Pn2Ul-t7os2wJ18tOq8YHJ2mfVk351m9ffvo_AAD__wBAF2c=
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJy8mF9v4kYUxd_7Kaz7lKhGZmZs_liqlO2Gqkg0bIGHVlVUsTBNUFlMbSOFRPnuFbCRExvfMxPbeUuAn-f4MuenMU-U_LemkAZ_fBl9Gt44F9fD6Wz6--jSuZgORoPPM2fv_DIZ_-Y87B8vneHNbDCZHl499-54cj2YOD__6ezJpU201Dfzbzqh8C8S5JIklxS55JNLAd26tI2jhU6SKD585OkIDJcPFLZdWm22u_Tw8q1LiyjWFD5RukrXmkKazb-u9UTPlzr22uTSUqfz1fq4zMP-8eph__j39l99iPA5Wu--bZLwmGe6nR_-bHmSbp9dinZptkSSzu80heLZfV-MoNYY0ibG9SpJV5tF6oncLK5EboGM-bp37ufJ_ZnPZyHU-0IEtYbwS0Nk19ltonipY718c6XjVUpjSjSrLELQVAQ0qSxCp0IE910pf50n91Odjreeyk1qtt_q8JUGPo1G5NJa_5NeXInLn-LV3f3xL3JpvEtDh7mtrs0Om0ZxqmNPFab2Y-n1ewZjOzeR7xc9E-ImakVbz2_nZ3x2-f6b5YW5TIS1TDzZ8pSh1SyCdGoOIm2CZEoRDXrNOESnQa-J-qSCZlXmtRojoEmVec0uQmWviQ_yGthhL14rTM3Ua9K8z9K-z6rl-YZisQjSrTmItAmSdVo2KBbjEN0GxSLrazWaVZlYaoyAJlUmFrsIlcUiP0gsYIe9iKUwNVOxKPM-K_s--y0vMBSLRZBezUGkTZCs06pBsRiH6DUoFlVfq9GsysRSYwQ0qTKx2EWoLBb1QWIBO-xFLIWpmYrFN--zb9_noGWoFYsY_VpjSJsYWZ_9BqViHKLfoFT8-hqNZlUmlRojoEmVScUuQmWp-B8kFbDDXqRSmNp7ft45c_2JTrbRJtFGv9y0DzPTyzt9-g6SaBcv9Jc4WhyXOf07PnLHF5Y6SU_vqtM_w83prUPA17BgYcnDMg-L17D_BhZ2sFBVaCkq0f0qtOrytGLpoAoswMh5WsoqtGpXons87bPbtMPDgQUs83CHhbt8QbosDO65x8K-4Jfus7QAzRa8VARYXBS0YmMGQCM1ABy5AeFADgBHdhC8XIAeAI38AHAkCIAjQyAc1EUUDPN2y6LR8YrJ4QVNCF4yogMKw2sG3TrvGdkGi_OmEX2AF1RjVXaehmXncVh2gKOy8zgquyxY1qbsgEZlBzgqO8BR2REOdrwE51Z0eiyohsMLZZe8aqQPjs28atCt86aRPbA4bxoJTjSyoBqrMz9Pw0M_j8NTP8DRsZ_HYdkLlrUqO0_DsvM4LDuPw7IDHO14_iyrwNeuwAOy4MuueNUocJJWvGrArSveNAocKxRvGhUAvKAam7IDGpUd4KjsCAdlBzh8yC9Y1uopn6fhYz6Pw-d8HocP-gBHO54_yyr0vfFn2RxeLDuvGh-cpH1eNflbv33-4f8AAAD__xgiHF0=
 
 # INTERSECT ALL and INTERSECT with MergeJoiner.
 query T
@@ -324,7 +324,7 @@ vectorized: true
       table: xyz@xyz_pkey
       spans: FULL SCAN
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJzEll1v2jAUhu_3K6xz1UpGwU5CS6RJ7VqmITHogItNUy5S4hUkirM4SE0r_vuUMIny5YNn5N2RJo_92ueR-r6B-j2HCDrfH3q33T65uO-OxqNvvUtyMer0OndjUpLPw8FX8lK-ksHwvjMkn36Q8pJ0--POcFR9cNvrIR8DhYVMRT95Fgqin8CAAgcKPlAIgEIIMYUslxOhlMyrT95qoJu-QNSkMFtky6L6c0xhInMB0RsUs2IuIIJx8jgXQ5GkIveaQCEVRTKb19u8lK83WT57TvISKNzJ-fJ5oSJSPYyypPrZ8DjEKwpyWfzdYbPwY0mmiZpuL3nDIF7FFFSRPAmI2Ir-W9LQdVJ-NOlmneVC5qnIRbq1UlyR2CcHjvslUdORKAaZx3bmMi4zEW0LBBTm4ldxccMuP-azp2n9CygMlkVE6qO8P_rmWL7FsQ5k7suGzDwW7l7Awb2Drb3Z6cNnpsP3eMPzzyiqQdaW-6z8aFYHqjJHqvLTR8CNR-A3vOCMuhhkvXKflR_N6kAX7kgX__QR-MYjCBpeeEZdDLJeu8_Kj2Z1oIvvSJfg9BEExiMIG2eUxSBp23VSfjSpA1WC_9CZDiQaCpXJhRInNaJmdSaRPon1HSm5zCfiIZeTepv146Dm6v_rqVDF-i1fP3QX9av63k-HWzZw2wZmVrlZqKeZwZUxM7hlA7dtYGaVe-fK9mi-Szff074e9rUw276z5i4d2AiuhxHB9TAiuB7GBEdoRPDQRnA9jAiuhxHB9TAmOEIjgrdsBL-yUVQPI4rqYURRPYwpitCIotc2iuphRFE9jCiqhzFFERpRtG2jKLPqCQiNSIrQiKUIjWmK4VhXsCsLdm3Bri5Y9gW7wsCsGgPbqwxGtuppzFY9jdmqp1FbERyz1aQs7d-6SVsypTFbjfqSMY7ZulcetLbGqw9_AgAA___Seoao
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJzEll9v2jwUxu_fT2Gdq1YyCnYSWiK9UruWaUgMOuBi0xRNKfEKGsVZHCTSiu8-JUxq-ecTzyjckSY_-7HPT-rzCur3HALofH3o3Xb75OK-OxqPvvQuycWo0-vcjUlOPg4Hn8kqfyGD4X1nSD58I_kl6fbHneGo-OC210M-BgoLGYt-9CwUBN-BAQUOFFyg4AEFH0IKSSonQimZFp-8lkA3XkHQpDBbJMus-HNIYSJTAcErZLNsLiCAcfQ4F0MRxSJ1mkAhFlk0m5fbrPKXm1X-8iP5JXKgcCfny-eFCkjxMEqi4mfD4RCuKchl9neLt5UfczKN1HR7zRsG4TqkoLLoSUDA1vTfovq1R-VHo76ts1zINBapiLdWCgsS--TAeT9FajoS2SBx2M5kxnkigm2FgMJc_Mwubtjl_-nsaVr-AgqDZRaQ8ijvj_52LNfiWAcy92VDJg7zdy_g4N7e1t6s-vSZ8fQd3nDcE6pqELZ1hrD8aNgaZGU1ycqrz4Cbz8BtON4JhTEIe3WGsPxo2BqE4TUJ41afgWs-A6_h-CcUxiDs9RnC8qNhaxDGrUkYr_oMPPMZ-I0T6mIQtV17VH40ag2yeGfoTgcSDYVK5EKJSs2oWZxJxE9ic0dKLtOJeEjlpNxm8zgoufK_eyxUtnnLNw_dRfmqvPfqcMsGbtvAzCo38_U0M7gyZga3bOC2Dcyscu9c2R7Nd-nme9rVw64WZtt31tylPRvB9TAiuB5GBNfDmOAIjQju2wiuhxHB9TAiuB7GBEdoRPCWjeBXNorqYURRPYwoqocxRREaUfTaRlE9jCiqhxFF9TCmKEIjirZtFGVWPQGhEUkRGrEUoTFNMRzrCnZlwa4t2NUFy75gVxiYVWNge5XByFY9jdmqpzFb9TRqK4JjtpqUpf1bN2lLpjRmq1FfMsYxW_fKg9bWcP3fnwAAAP__ud2Lng==
 
 query T
 EXPLAIN (DISTSQL) (SELECT y FROM xyz ORDER BY y) INTERSECT (SELECT y FROM xyz ORDER BY y)
@@ -344,7 +344,7 @@ vectorized: true
       table: xyz@xyz_pkey
       spans: FULL SCAN
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJzEmMFu6kYUhvd9CuusEsnIzIwNxFKl3N5QFYmGW2DRqsrCF08DEsGubaRwo7x7BSwc7Pj8nthOdyHxx_xzMt_hDC-U_rsln8Z_fpt-mdxbV3eTxXLxx_TaulqMp-OvS-tg_Tqf_W49H35Ys_ndeG798pd1uLYm98vxfHF8gH-QbNpFob4PnnRK_t8kyCZJNimyySWbPHqwKU6ilU7TKDk-8nICJuEz-X2bNrt4nx1__WDTKko0-S-UbbKtJp-Wwfetnusg1InTJ5tCnQWb7WmZ58OP2zjZPAXJgWz6Gm33T7vUt44vFnFw_LHnSHp4tSnaZ_kKaRY8avLFq_2xFF6bKaRJirtNmm12q8wRhUrcisICOfP9YK2DdP3O83kI9bEQXqsh3MoQ-fvsd1ES6kSHF-90epfKmBLVKo_gdRUBVSqPMGgQwf5Qyt-CdL3Q2Sx2VKFSy0Os_TdN4Mt0SjZt9T_Z1a24_jnZPK5PP5FNs33mW8y2hu1W9j7qRbGjvGIB3l17dLG2qC-6MBXdkT1H1Ww4BjkG7eaQJjly20WHLad2iEGHLUe05zuqVVXLaTECqlRVyzGL0LjliE9qObK-btJYN9Vz3JraG-QYtptDmuTIjZMdal87xLBD7WV7zqFaVWnfYgRUqSrtzSI01l5-kvaqvm7KWDe353g1tTfIMWo3hzTJkRunOtS-dohRh9qr9pxDtarSvsUIqFJV2ptFaKy9-iTt3fq6uca6eb2a0hukuGkzhTRJkdvmdqh87RA3HSrvtucbqlWV8i1GQJWqUt4sQmPl3f_hO4V3Es11Gke7VNf6xqB_3JMOH_W5Rmm0T1b6WxKtTsucX85O3OkXoU6z81_V-cVkd_7TMeBbWLCw5GFZhMVb2L2AhRksZCP6pgktB01opXhasbTXBBaNlpb9RvSwCa3AYXHZYwr-X54BLIvwgIXBpoe8mgNerxFLC8HTNzzdB32h1FVM3AY0khvhwG6AI70BjvwWpZZqIjigkeEAR4ojHBx3gCPJRamxXh5ZhJdaDIeXRBd8j0Fb55uMGAHd-DYjhgAvNRojW3ka2gpwZCuPQ1t5HNpaarJGtvI0tJXHoa0AR0eWx6Gt_AeMFGCI4sfWAl6yVfKDK9i65DuN9MDcy3ca6QK81GmM5maehoMzwNHkzONwdOZxZKssdVkTWwGNbAU4shXh6MjyOLJV8h8wcgRwfpIt4GVb-VEWbZ3vNArcUhW4IIM5WvFDDag7oJGtCAe2AhzZCnB40-UvyuiqC674zRaHl12Ao9su-I4AnRr-A0ah0vGjbAEv2ar4Wba49YfXn_4LAAD__zFXF-0=
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJzEmMFu6kYUhvd9CuusEsnIzIwNxFKl3N5QFYmGW2DRqooqLp4mqAS7tpHiRHn3Clg42PH5PbGd7kLij_nnZL7DGV4o-XdLPo1__zb9Mrm1Lm4mi-Xit-mldbEYT8dfl1Zm_Tyf_Wo9Zc_WbH4znls__WFll9bkdjmeLw4P8A-STbsw0LerR52Q_ycJskmSTYpscskmj-5siuJwrZMkjA-PvByBSfBEft-mzS7ap4df39m0DmNN_gulm3Sryafl6vtWz_Uq0LHTJ5sCna422-MyT9nz9VP2_Ff0j87Ipq_hdv-4S3zr8GIRrQ4_9hxJd682hfs0XyJJV_eafPFqfyyG12oMaRLjZpOkm906dUShFteisEDOfM-sh1Xy8M7zeQj1sRBeqyHcyhD5--x3YRzoWAdn73R8l8qYEtUqj-B1FQFVKo8waBDB_lDKX1bJw0Kns8hRhUots0j7b9rAl-mUbNrqv9OLa3H5Y7y5fzj-RDbN9qlvMdsatlvZ27AXRo7yigV4d-3R2dqivunC2HRH9hxVs-UYBBm0HESaBMl9Fx02ndohBh02HdGe8ahWVU2nxQioUlVNxyxC46YjPqnpyPq-SXPfVM9xa4pvEGTYchBpEiR3TnYofu0Qww7Fl-1Zh2pVJX6LEVClqsQ3i9BYfPlJ4qv6vilz39ye49UU3yDIqOUg0iRI7pzqUPzaIUYdiq_asw7Vqkr8FiOgSlWJbxahsfjqk8R36_vmmvvm9WpqbxDjqtUY0iRG7pvbofS1Q1x1KL3bnnGoVlXStxgBVapKerMIjaV3_4fvFt5JNNdJFO4SXeubg_5hTzq416caJeE-Xutvcbg-LnN6OTtyx18EOklPf1WnF5Pd6U-HgG9hwcKSh2URFm9h9wwWZrCQjeirJrQcNKGV4mnF0l4TWDRaWvYb0cMmtAKHxWWPKfh_eQawLMIDFgabHvJqDni9RiwtBE9f8XQf9IVSVzFxG9BIboQDuwGO9AY48luUWqqJ4IBGhgMcKY5wcNwBjiQXpcZ6fmQRXmoxHF4SXfA9Bm2dbzJiBHTj24wYArzUaIxs5WloK8CRrTwObeVxaGupyRrZytPQVh6HtgIcHVkeh7byHzBSgCGKH1sLeMlWyQ-uYOuS7zTSA3Mv32mkC_BSpzGam3kaDs4AR5Mzj8PRmceRrbLUZU1sBTSyFeDIVoSjI8vjyFbJf8DIEcD5SbaAl23lR1m0db7TKHBLVeCCDOZoxQ81oO6ARrYiHNgKcGQrwOFNl78oo6suuOI3WxxedgGObrvgOwJ0avgPGIVKx4-yBbxkq-Jn2eLW715_-C8AAP__VX0c4w==
 
 # INTERSECT ALL and INTERSECT with no overlap.
 query T
@@ -374,7 +374,7 @@ vectorized: true
               table: xyz@xyz_pkey
               spans: FULL SCAN
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJzEmF1v4kYUhu_7K6xzlahGZmbMl6WVst1ltUgUtoDUVi0XXpgmSART20iwUf57ZWhCbJN5fQxx7vh6PJOX87xj8kDRv0vyqPvHt_7H3sC6-twbT8a_9a-tq3G33_00sbbWl9HwV2u7-2H9_rU76lpb6-9Nva5mlry2eoNJdzROPvax34eI_pAww9Hn7sj65U9rSzatgrke-Pc6Iu8vEmSTJJsU2eSSTQ2a2rQOg5mOoiBMPvKwB3rzLXl1mxar9SZOXp7aNAtCTd4DxYt4qcmjif99qUfan-vQqZNNcx37i-V-me3ux806XNz74Y5s-hQsN_eryNtvZ7z2k4c1R9L00aZgEx9XiGL_VpMnHu3iu_iyWMY61KHTSG_h8Lpn3YhjMp7n9QaTdmbh47W-76w7P7pLX-hG0PTxuDnJ2dzLiMRFM1KlMhIgpNllMnJf3dzxOptVEM51qOepK00TEn3kxF_41Y_uxjoerh2ZiXmyW2svbRHZtNT_xFc34vpDuLi92z8im4abOIni1cwbnMzHQRjr0JGNbFI_v3r9ZoHYTiXy_0VPbGIQ1IK1o-rZjE8u30otLxiTzR1sR9YcVVB_sI_n0W6-h_6ckC6ckiqVkgAxvUkBiGoLQFRUACDzpwJoli0AWXy4JHu2VM1xCxoI9vE8W633MJARkrhwSqpUSgLE9CYGymoNlBUZCDJ_MrBV1kBVfLgUe7bcmtMoaCDYx_Nstd_DQEZI4sIpqVIpCRDTmxioqjVQVWQgyPzJwHZZA93iw-WyZ6tRK-gf2MXzZHXewz9GROKiGalSGQkQ0pvY51Zrn1uRfSDzJ_s6l_gJeuL6Ix2tg1WkC_26rCeZ6fmtPnwHUbAJZ_pbGMz2yxyeDvfc_oW5juLDu-LwpLc6vJVs8CUssrB4CbspWPJgIc6iW-fQUp1Fd8y0NCauzIkrRuKCB2cS59Ktc-hM4ly6Y6ZdY-INc-INI9w0r9w0f9dAr5aRbpvh9jlummHkJqCBm2YauQlo4GbH3IZ1UIe5MuXYCWikJ8KBnwBHgiIcGCpylZoOXoLgzZ0KJBW5dkkv7oLFc_XCOgXNNDwGAY7OQTMOD0KAA9uEuVtFEwSfa1eWbmYa6gZwpJsZh7oBHOlmPlkEOFpErmRZuplLVoKSlZySzd98sUqWjQPdAI50Qzi68TSXrAQlK3Mly9EN0Eg3hAPdAI50QzjQTZoPGAkOGGm-fwW6SXPJSlCyklOy-ZFjlSwbR7qxSpaNI93MJStByUrODXz-W2fdwbNxpBvrHp6NI93MB4wCB4wy_0skq9v08af_AgAA____MuPK
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJzEmF1v4kYUhu_7K6xzlahGZmbMl6WVst1ltUgUtoDUVi2qWJgmqART20iQKP-9MjQhtsm8PoaYO74ez-TlPO-YPFL474I8av_2rfux07OuPneGo-Ev3Wvratjutj-NrI31ZdD_2dpsH6xfv7YHbWtj_bmuVtXUktdWpzdqD4bxxz52uxDRH2KmP_jcHlg__W5tyKalP9O9yb0OyfuDBNkkySZFNrlkU43GNq0Cf6rD0A_ijzzugM5sQ17VpvlytY7il8c2Tf1Ak_dI0TxaaPJoNPm-0AM9menAqZJNMx1N5ovdMpvtw81m-_DX6h-9JZs--Yv1_TL0dvsZribxw4ojafxkk7-ODkuE0eRWkyee7Pzb-DJfRDrQgVNL7mH_umfdiEM0nud1eqNmauHDtb5vrbtJeJe80I2g8dNhc5KzudcZifOGpAqFJEBK0_OE5L65ucN11ks_mOlAzxJXGsck-siRv_DrJLwb6qi_cmQq59F2pb2kR2TTQv8dXd2I6w_B_PZu94hs6q-jOIo3M69xMh_6QaQDR9bSSf345vXrOWI7lsj_Fz2yiZ5f8VeOqqYzPrp8I7G8YIw2e7IdWXFUzgIAG3mZ7folCoCT0rljUoViEiCnd6kAUW4FiJIqAGT-XAH1ohUg80-X5A-XqjhuTgfBRl6Gq3EJBxkpiXPHpArFJEBO7-KgLNdBWZKDIPNnBxtFHVT5p0vxh8utOLWcDoKNvAxX8xIOMlIS545JFYpJgJzexUFVroOqJAdB5s8ONos66OafLpc_XLVKTgPBNl5Gq3UJAxkZifOGpAqFJEBK7-KfW65_bkn-gcyf_Wud46fokesPdLjyl6HO9SuzGmemZ7d6_x2E_jqY6m-BP90ts3_a33G7F2Y6jPbviv2TznL_VrzB17BIw-I17CZgyYOFOIlunEJLdRLdMtPSmLgyJ64YiQsenEqcSzdOoVOJc-mWmXaNidfMideMcN28ct38XQO9Gka6aYabp7hphpGbgAZummnkJqCBmy1zG1ZBHWbKlGMnoJGeCAd-AhwJinBgqMhUajJ4CYI3dyqQVGTaJbm4CxbP1AvrFDTT8BgEODoHzTg8CAEObBPmbhV1EHymXVm6mWmoG8CRbmYc6gZwpJv5ZBHgaBGZkmXpZi5ZCUpWcko2e_PFKlk2DnQDONIN4ejG01yyEpSszJQsRzdAI90QDnQDONIN4UA3aT5gJDhgpPn-FegmzSUrQclKTslmR45Vsmwc6cYqWTaOdDOXrAQlKzk38NlvnXUHz8aRbqx7eDaOdDMfMAocMMr8L5G0buOnH_4LAAD__5zH6MA=
 
 query T
 EXPLAIN (DISTSQL) (SELECT x FROM xyz WHERE x < 2) INTERSECT (SELECT x FROM xyz WHERE x >= 2) ORDER BY x
@@ -403,7 +403,7 @@ vectorized: true
               table: xyz@xyz_pkey
               spans: FULL SCAN
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJy82Ftv4kYcBfD3fgprnhLVyMzFXCytlO2G1SJR2AJSW7V5YGGaIBFMbSNBonz3CmjicPH_eJghbwF8PP85O_zE-pml_85YxFp_fO98bne9q9v2YDj4rXPtXQ1andaXobfyvvZ7v3qr9ZP3-7dWv-WtvL-X1aoce-Laa3eHrf5gcxm6XH_aXN_r37b63i9_eivms3k80d3Ro05Z9BfjzGeC-Uwynynms5Dd-WyRxGOdpnGyueR5G2hPViyq-mw6Xyyzzdt3PhvHiWbRM8um2UyziA1HP2a6r0cTnQRV5rOJzkbT2XaZ1frpZpFMH0fJmvnsSzxbPs7TaDvOYDHa_FkJBLt78Vm8zPIV0mx0r1nEX_zyU3ydzjKd6CQI90fYvR95NzxvJoqidnfYKFxYmCz8fvvc6f7lWfvnoIAx3r8yWfh2mmbT-TgLxMHmb_jBAnnmx9p7GKUPJ67PhwjPGyJ0OkStcIj8Pst5nEx0oid7d9repXBMibrKR6hfagTUVD5Cw2IE_6wpv43Sh4HOeotAHTQ1XC909E7Cz50O89lM_5Nd3fDrT8n0_mH7F_NZb5ltjn3htpomJ2wQJ5lOAnXU2s_FflVL9Haqkv_vemKKblyJF0FYPSz59Pr7gHIDx0wZC0QlkCUhB3O8QVZzDblJAY4bkGc1wEEFxpSDhXNF-QUpLz1E7YKUc3eOoq6KKHc4AmqqiHKzEawp5x9EOThhr5QftVaaclFeEmEMiawEqiSlYI43SOquKTUogDtuQJ7VAAcVGFMKFs4VExektPQQ9QtSKtw5hroqotThCKipIkrNRrCmVHwQpeCEvVJ61FppSmV5SaQxJKoShCUpBXO8QdJwTalBAdxxA_KsBjiowJhSsHCumLwgpaWHaFyQUunOMdRVEaUOR0BNFVFqNoI1pfKDKAUn7JXSo9ZKU6rKS6KMIQkrJSEFU7wx0nQNqcH2udP9y7P2z0EBxoyChXPB1AUZLT1E84KMKneGoa6KGHU4AmqqiFGzEawZVR_EKDhhr4wetXbWc9oTC_R1uojnqS71CLa6KU1P7vXuHyGNl8lYf0_i8XaZ3cveNrd9Y6LTbPcp371oz3cfbQZ8H-ZkOKTDggxLOizJsKLD6jDM34dre2FuFuZ1m7SwSkurtALpkExbhXnDJi2s0tIqrUC6Rh5TEK4bhMVhuEGGm_QXpEmjUKXn5rQpIUKFVoULEKdd4TUQp2XhgBZ-9CXbjwMTOX3cAE0gjWwCcYQTiCOdQBzxxI--aiY-gTQCCsSRUCCOiAJxZBSnneFNEKelOYgfOcVpa0QV_IgAv18AVYK2RgBrBG2NANYI2hoBrBG0NQL9_rKyBqSRNSCOrAFxZA2II2uElTUgjawBcWQNiCNrQBxZI2hrBLBG0NYIYI2grZHAGmlnjaStkcAaCf6_BKyRtDUSWCNpaySwRlpZA9LIGhBH1oA4sgbEkTXSyhqQRtaAOLIGxJE1II6skbQ1ElgjaWsksEbS1ihgjbKzRtHWKGCNoq1RwBoFns6gxzO0NQpYo6ysAWn4fMfOGhCHT3jsrFFW1oA0sgbEkTUgjqwBcWSNoq1RwBpFW6OANYq2JgTWhIbW3L389F8AAAD__xNVcmU=
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJy82Ftv4kYcBfD3fgprnhLVyMzFXCytlO2G1SJR2AJSW7VRxcI0QWUxtY0EifLdK6CJw8X_42GGvCWEwxzOmp9YP7H03xmLWOu3r52P7a53ddseDAe_dK69q0Gr0_o09Fbe537vZ2-1fvR-_dLqt7yV9-eyWpVjT1x77e6w1R9snoaerj9snt_r37b63k-_eyvms3k80d3Rd52y6A_Gmc8E85lkPlPMZyG789kiicc6TeNk85SnbaA9WbGo6rPpfLHMNg_f-WwcJ5pFTyybZjPNIjYcfZvpvh5NdBJUmc8mOhtNZ9tjVuvHm9X68a_FP3rNfPYpni2_z9No22ewGG1-rASC3T37LF5m-RFpNrrXLOLPfvkan6ezTCc6CcL9DrvHI--G59NEUdTuDhuFBwuTg9--f-52AHnWABwsMMYDKJODb6dpNp2Ps0AcvPsbfnBAnvm29h5G6cOJ5-clwvNKhE5L1ApL5K-znMfJRCd6svdK21cprCnRVnmF-qUqoKXyCg2LCv5ZLb-M0oeBznqLQB0sNVwvdPTGwo-dDvPZTP-dXd3w6w_J9P5h-xPzWW-ZbS77wrfVNLnCBnGS6SRQR6v9WAxYtcRupyb5_1VPtOjGlXgRhNXDkU-fvy8oN4DM2LFAVAJZknJQ5FWymmvKTRZwPYE8awIONjDGHBycO8oviHnpErULYs7dSYq2KsLcYQW0VBHmZhWsMefvhDm4wl4wP1qtNOaiPCXCXBJZCVRJTEGRV0nqrjE1WIC7nkCeNQEHGxhjCg7OHRMXxLR0ifoFMRXuJENbFWHqsAJaqghTswrWmIp3whRcYS-YHq1WGlNZnhJpLomqBGFJTEGRV0karjE1WIC7nkCeNQEHGxhjCg7OHZMXxLR0icYFMZXuJENbFWHqsAJaqghTswrWmMp3whRcYS-YHq1WGlNVnhJlLklYKUkpqPHqSNM1pQbvn7sdQJ41AAcLGEMKDs4NUxeEtHSJ5gUhVe4UQ1sVQeqwAlqqCFKzCtaQqneCFFxhL5AerXbW_doTB_R1uojnqS51K7a6GU1P7vXuHyGNl8lYf03i8faY3a-9bW77wESn2e6vfPdLe77706bg2zAnwyEdFmRY0mFJhhUdVodh_jZc2wtzszCv26SFVVpapRVIh2TaKswbNmlhlZZWaQXSNfIyBeG6QVgchhtkuEl_QJo0ClW6N6dNCREqtCpcgDjtCq-BOC0LB7Twow_ZfhyYyOnLDdAE0sgmEEc4gTjSCcQRT_zoo2biE0gjoEAcCQXiiCgQR0Zx2hneBHFamoP4kVOctkZUwZcI8P0FUCVoawSwRtDWCGCNoK0RwBpBWyPQ9y8ra0AaWQPiyBoQR9aAOLJGWFkD0sgaEEfWgDiyBsSRNYK2RgBrBG2NANYI2hoJrJF21kjaGgmskeD_S8AaSVsjgTWStkYCa6SVNSCNrAFxZA2II2tAHFkjrawBaWQNiCNrQBxZA-LIGklbI4E1krZGAmskbY0C1ig7axRtjQLWKNoaBaxR4O4Muj1DW6OANcrKGpCG93fsrAFxeIfHzhplZQ1II2tAHFkD4sgaEEfWKNoaBaxRtDUKWKNoa0JgTWhozd3zD_8FAAD__4Iud1s=
 
 # INTERSECT ALL and INTERSECT with some overlap.
 query T
@@ -433,7 +433,7 @@ vectorized: true
               table: xyz@xyz_pkey
               spans: FULL SCAN
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJzEmF1v4kYYhe_7K0bvVaIamZkxX5ZWYrvLapEobAGprVouvDBNkAh2bSPBRvnvlaGB2CZzPIY4d-Hj8bwc5jlj8kjRvytyqffHt8HH_pDdfO5PppPfBrfsZtIb9D5N2Y59GY9-ZdvdD_b71964x7bs7029LudM3rL-cNobT5K3fRwMIKI-MH7LRuPPvTH75U-2I4vW_kINvQcVkfsXcbJIkEWSLHLIogbNLApCf66iyA-Ttzzugf5iS27douU62MTJ0zOL5n6oyH2keBmvFLk09b6v1Fh5CxXadbJooWJvudovs9396Abh8sELkwk--avNwzpy2dbaTzQJvORRzRY0e7LI38SnRaLYu1Pk8ier-CBflqtYhSq0G-kpDs-7rMtP4biu2x9O22TRaBO7rJsd4XTV7zt270X36Ut2Oc2eTmMKkzFf5sWvHZgsFRgHic2ZvG5gzqtjnq6zWfvhQoVqkbrSLCHRW8581q9edD9R8SiwRSbz6S5Qbtovsmil_olvuvz2Q7i8u9__dfzo_NX0GybpT_wwVqEtGtmkfn71-s0CsZ1L5P-Lnhli6Nf8wJb1bMZnl2-llucG27zELrdFzZYFiwGMctznzfctBpPErh-ZLBUZB5m9cTXwaquBV1QNIP3namiWrQZRfKeJMhtN1mynoJtglONGa72vmwaJ8etHJktFxkFmb-ymqNZNUZGbIP1nN1tl3ZTFd5oss9Gcmt0o6CYY5bjR2u_rpkFi_PqRyVKRcZDZG7spq3VTVuQmSP_ZzXZZN53iO80ps9EatYJmgkGO26zzvmYa5MWvHZgsFRgHib2xl061XjoVeQnSf_ayc42fumeuP1ZR4K8jVehXbD3JTC3u1OE7iPxNOFffQn--X-bwcLTn9k8sVBQfXuWHB_314aVkwJcwz8L8JeykYGEGc34R3bqEFvIiuqOnhTZxqU9cGiTOzeBM4qZ06xI6k7gp3dHTjjbxhj7xhhZu6ldu6r9roFdLS7f1cPsSN_UwchPQwE09jdwENHCzo2_DOqjDXJma2AlopCfCgZ8AR4IiHBjKc5WaDl6A4PWdCiTluXZJL-6AxXP1YnQK6ml4DAIcnYN6HB6EAAe2cX238iYIPteuRrrpaagbwJFuehzqBnCkm_5k4eBo4bmSNdJNX7IClKwwKdn8zZdRyRrjQDeAI90Qjm489SUrQMmKXMma6AZopBvCgW4AR7ohHOgm9AeMAAeM0N-_At2EvmQFKFlhUrL5LWdUssY40s2oZI1xpJu-ZAUoWWFyA5__1o3u4I1xpJvRPbwxjnTTHzASHDBS_y-RrG6zp5_-CwAA__91qAQW
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJzEmF1v4kYYhe_7K0bvVaIamZkxX5ZWYrvLapEobAGprVpUsTBNUAl2bSNBovz3ytBAbJM5HhPMXfh4PC-Hec6YPFH475Jc6vz2rfex22c3n7uj8eiX3i27GXV6nU9jtmVfhoOf2Wb7yH792hl22Ib9ua5W5YzJW9btjzvDUfy2j70eRNQHxm_ZYPi5M2Q__c62ZNHKm6v-9EGF5P5BnCwSZJEkixyyqEYTi_zAm6kw9IL4LU87oDvfkFu1aLHy11H89MSimRcocp8oWkRLRS6Np9-XaqimcxXYVbJorqLpYrlbZrN9bG-2j3_5_6h4hE_ecv2wCl22sXYjjfxp_KhiC5o8W-Sto-MqYTS9U-TyZyv_JF8Wy0gFKrBryTH2z7uszY_puK7b7Y-bZNFgHbmsnR7heNXvW3Y_De-Tl2xzmjwfxxQmY74OjL97YrJQYhxENmPyfRNz3hzzeJ31ygvmKlDzxJUmMYnecuKzfp2G9yMVDXxbpEIfb33lJg0ji5bq7-imzW8_BIu7-91fh4_O30y_ZpL-yAsiFdiilk7qxzevX88R26lE_r_oiSH6XsXzbVlNZ3xy-UZieW6wz4tsc1tUbJmzGsAsh41ev241mER2gcxkocw4CO3C5cDLLQdeUjmA9F_KoV60HET-rSYK7TRZsZ2cdoJZDjutcV07DSLjF8hMFsqMg9AubKco105Rkp0g_Rc7G0XtlPm3miy005yKXctpJ5jlsNOa17XTIDJ-gcxkocw4CO3Cdspy7ZQl2QnSf7GzWdROJ_9WcwrttFolp5tgksM-a13XTYPA-LsnJgslxkFkFzbTKddMpyQzQfovZrbe4yfviesPVeh7q1Dl-jVbjTNT8zu1_w5Cbx3M1LfAm-2W2T8c7LjdE3MVRvtX-f5Bd7V_KR7wNczTMH8NOwlYmMGcn0U3zqGFPItu6WmhTVzqE5cGiXMzOJW4Kd04h04lbkq39LSjTbymT7ymhev6lev67xro1dDSTT3cPMdNPYzcBDRwU08jNwEN3Gzp27AK6jBTpiZ2AhrpiXDgJ8CRoAgHhvJMpSaDFyB4facCSXmmXZKLO2DxTL0YnYJ6Gh6DAEfnoB6HByHAgW1c3628DoLPtKuRbnoa6gZwpJseh7oBHOmmP1k4OFp4pmSNdNOXrAAlK0xKNnvzZVSyxjjQDeBIN4SjG099yQpQsiJTsia6ARrphnCgG8CRbggHugn9ASPAASP0969AN6EvWQFKVpiUbHbLGZWsMY50MypZYxzppi9ZAUpWmNzAZ791ozt4YxzpZnQPb4wj3fQHjAQHjNT_SySt2-T5h_8CAAD__wcuCQw=
 
 query T
 EXPLAIN (DISTSQL) (SELECT y FROM xyz WHERE x < 3) INTERSECT (SELECT y FROM xyz WHERE x >= 1) ORDER BY y
@@ -462,7 +462,7 @@ vectorized: true
               table: xyz@xyz_pkey
               spans: FULL SCAN
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJy82FuP2kYcBfD3forRPGVVIzMXs2ApEmmWKEgUUkBqq3YfCEx3kVhMbSNBVvvdK6CLl4v_x_bY-xYuB5-cDD8RP_Po3wX3eeePb71P3T77cNcdjUe_9W7Yh1Gn1_k8Zlv2ZTj4lW22P9jvXzvDDtuwv9f1upoydcO6_XFnONq9Db3dfGTihg2Gd50h--VPtuUOXwYz0588mYj7f3HBHS65wxV3uOYO9_i9w1dhMDVRFIS7tzzvA93Zhvt1h8-Xq3W8e_re4dMgNNx_5vE8Xhju8_Hk-8IMzWRmQrfOHT4z8WS-2F9ms_3RXoXzp0m4a_A5WKyflpHPNs6-0Wg12T2quZLfvzg8WMfJRaJ48mC4L16c7EW-zBexCU3oeqctDs_7rC2ScXzf7_bHTe7wwTr2WTu9gsxT4e0WouwxVKExBFhjylT2MXSeCnfzKJ4vp7Erz5Zoi7MLJJnvW_Y4iR6vvD8p4RUr4ZVaopFaIvmc9TIIZyY0s5NP2n9Kak2Ftkoq3FZVAS2VVGhaVHAKtfw6iR5HJh6sXH221Hi7Mv4bIz_1etzhC_NP_KEtbj6G84fH_Z-Oxzz9r9XKc8JGQRib0NUXq_2czlo9w27XJvn_U6-06Ae1YOV69fORr1__1FWRA7UCprmy5qqMxIMqR9Ua1RGfZ43y51CF5hBgDwvkQYXEV1Eh8plLNCpEXpQnLNoqDfkSK6Cl0pDPV8EaefFOyIMT9or8xWqZkZfZWZFFVFE1V2dEFlQ5qnJbHbI51hDlz6EKzSHAHhbIggqJb7JCZDOXuK0QWVmecGirNGRLrICWSkM2XwVrZOU7IQtO2CuyF6tlRlZlZ0UVUUXXXC8jsqDKUZVmdcjmWEOUP4cqNIcAe1ggCyokvqkKkc1colkhsqo84dBWaciWWAEtlYZsvgrWyKp3QhacsFdkL1bLjKzOzoouoopXy0gsKHI0pVUdsTm2EGWPoQqNIcAaFsCCColtukJgM5doVQisLk83tFUasCVWQEulAZuvgjWw-p2ABSfsFdiL1QrdD75ygaGJVsEyMplu9dZ3o5nZgzn8I0TBOpyab2Ew3V_m8HCwz-2fmJkoPrwqDg-6y8NLu4Jvw4IMe3RYkmFFhxUZ1nRYn4fF23DjJCzyhcWtTVpapZVVWoO0R6atwqJpk5ZWaWWV1iDdII8pCN_mCMvzcJMMt-gvSItGoU73FrQpHkKFVkVIEKddEQ0Qp2URgBZx8SU7jQMTBX3cAE0gjWwCcYQTiCOdQBzxJC6-anl8AmkEFIgjoUAcEQXiyChBOyNaIE5Lcxa_cErQ1sg6-BEBfr8AqiRtjQTWSNoaCayRtDUSWCNpayT6_WVlDUgja0AcWQPiyBoQR9ZIK2tAGlkD4sgaEEfWgDiyRtLWSGCNpK2RwBpJW6OANcrOGkVbo4A1Cvx_CVijaGsUsEbR1ihgjbKyBqSRNSCOrAFxZA2II2uUlTUgjawBcWQNiCNrQBxZo2hrFLBG0dYoYI2irdHAGm1njaat0cAaTVujgTUa3J1Bt2doazSwRltZA9Lw_o6dNSAO7_DYWaOtrAFpZA2II2tAHFkD4sgaTVujgTWatkYDazRtjQes8XJac__y038BAAD__5nQkqI=
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJy82G1v2lYcBfD3-xRX91WiGZn7YAKWKqVrqIrEoAOkbdqiicJdgkYxs40EifLdJ2DB4cH_Y_vaeVceDj49vfxE_cyjf-fc5-3fvnY_dnrs6q4zHA1_6V6zq2G72_40Yhv2edD_ma03T-zXL-1Bm63Zn6t6XU2Yumad3qg9GG7fht5uPjBxzfqDu_aA_fQ723CHL4Kp6Y2_m4j7f3DBHS65wxV3uOYO9_i9w5dhMDFRFITbtzzvAp3pmvt1h88Wy1W8ffre4ZMgNNx_5vEsnhvu89H429wMzHhqQrfOHT418Xg2311mvXm6XW-e_lr-Y7YVPgXz1fdF5LO1s6s0XI63j2qu5PcvDg9WcXKVKB4_GO6LFyd7k8-zeWxCE7recY398z67Fck6vu93eqMmd3h_FfvsNr2CzFPh7Rii9DVUoTUEmGPCVPY1dJ4Kd7Moni0msStPprgVJxdIMt827HEcPV54f1LCK1bCK7VEI7VE8jmrRRBOTWimR5-0-5TUmgptlVS4qaoCWiqp0LSo4BRq-WUcPQ5N3F-6-mSp0WZp_DdKfux2ucPn5u_46lZcfwhnD4-7Px2Oefpfq5XnhA2DMDahq89W-zHdtXqG3S5N8v-nXmjRC2rB0vXqpyNfvv4xrCKHakVQc2XNVRmRB10OrDWqQz7PHBXsoQrtIcAgFsyDComwokLmM5doVMi8KM9YtFUa8yVWQEulMZ-vgjXz4p2YByfslfmz1TIzL7O7Iguxomquzsgs6HJg5aY6ZnPMISrYQxXaQ4BBLJgFFRLhZIXMZi5xUyGzsjzj0FZpzJZYAS2Vxmy-CtbMyndiFpywV2bPVsvMrMruiirEiq65XkZmQZcDK83qmM0xh6hgD1VoDwEGsWAWVEiEUxUym7lEs0JmVXnGoa3SmC2xAloqjdl8FayZVe_ELDhhr8yerZaZWZ3dFV2IFa-WEVnQ5IBKqzpkc4whSl9DFVpDgDksiAUVEt10hcRmLtGqkFhdnm9oqzRiS6yAlkojNl8Fa2L1OxELTtgrsWerFbovfOECAxMtg0VkMt3yrW9HM9MHs_9HiIJVODFfw2Cyu8z-YX-X2z0xNVG8f1XsH3QW-5e2Bd-GBRn26LAkw4oOKzKs6bA-DYu34cZRWOQLixubtLRKK6u0BmmPTFuFRdMmLa3SyiqtQbpBHlMQvskRlqfhJhlu0V-QFo1Cne4taFM8hAqtipAgTrsiGiBOyyIALeLsS3YcByYK-rgBmkAa2QTiCCcQRzqBOOJJnH3V8vgE0ggoEEdCgTgiCsSRUYJ2RrRAnJbmJH7mlKCtkXXwIwL8fgFUSdoaCayRtDUSWCNpaySwRtLWSPT7y8oakEbWgDiyBsSRNSCOrJFW1oA0sgbEkTUgjqwBcWSNpK2RwBpJWyOBNZK2RgFrlJ01irZGAWsU-P8SsEbR1ihgjaKtUcAaZWUNSCNrQBxZA-LIGhBH1igra0AaWQPiyBoQR9aAOLJG0dYoYI2irVHAGkVbo4E12s4aTVujgTWatkYDazS4O4Nuz9DWaGCNtrIGpOH9HTtrQBze4bGzRltZA9LIGhBH1oA4sgbEkTWatkYDazRtjQbWaNoaD1jj5bTm_uWH_wIAAP___JqXmA==
 
 # INTERSECT ALL and INTERSECT with swapped column orders.
 query T
@@ -483,7 +483,7 @@ vectorized: true
       table: xyz@xyz_pkey
       spans: FULL SCAN
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJzEll1v2jAUhu_3K6Jz1UpGwUmgJdIkqo5pSAw64GLSlIuUeAUpjbM4kUgr_vuU0C8-5hPHkF0a_ODXPo_E-wziTwguDH7ejW6GY-Piy3A2n_0YXRqzwWhwOzfWxMiNr9PJd2OdPxnD8XwwnRWf34xGr1tyYqzftgCBiAds7D8yAe4voEDAAgI2EHCAQAc8AnHCF0wInhRbnktgGKzBbRNYRXGWFh97BBY8YeA-Q7pKQwYuzP37kE2ZH7DEbAOBgKX-KiyPWedP_ThZPfpJDgRueZg9RsIt0wOBWewXq5ZZJJlkqWv0LdKn4G0I8Cx9OfH9oPvcWPpiuXtEn5K-Bd7GIyBS_4GBSzekXvhOzfCaea1_5n3_qSziScASFuz8mFeQ2JYjl_7mi-WMpZPYpHsDm-cxc3d9AgIh-51elMEvPyerh-Xr4m1sL3f6-Azv97M17nck_Ji3eGzSzv5LHD3b2TmbVneB1nDBtFqmfUaVFeJ3a8c_qcy0WZlp0zJb1Sdi1ZmI3TKdMwqlEP-qdvyTCmU1K5TVtFB29YnYdSbitMp_uXMJpRD_unb8kwplNyuU3bRQTvWJOHUm0mmdUSeF8L2a4U8qk9OsTM7_7G5Hok2ZiHkkWKVm1i4ux4IHtn0swbNkwe4SviiP2S4nJVfWiICJdPuttV0Mo_KrcgDV4a4O3NOBqVZu2pHTVOHJqBrc1YF7OjDVyr33ZAe0tU-3P9K2HLalMN19s_Y-7egILocRweUwIrgcxgRHaETwjo7gchgRXA4jgsthTHCERgTv6gh-paOoHEYUlcOIonIYUxShEUWvdRSVw4iichhRVA5jiiI0omhPR1Gq1RMQGpEUoRFLERrTFMOxrqBXFvTagl5d0OwLeoWBajUGelAZlGyV05itchqzVU6jtiI4ZqtKWTp8dZW2pEpjtir1JWUcs_WgPEht9Taf_gYAAP__zcKoGQ==
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJzEll1v2jAUhu_3K6Jz1UpGwUmgJdIkqo5pSAw64GLSFE0p8QoaxVmcSEkr_vuU0JbyMZ84huzS4Ae_9nkk3mcQf5bgQu_73eCmPzQuPvUn08m3waUx6Q16t1MjJUZmfB6Pvhpp9mT0h9PeeJJ_fjMYvG7JiJG-bQECKx6wof_IBLg_gAIBCwjYQMABAi3wCIQRnzEheJRveS6AfpCC2ySwWIVJnH_sEZjxiIH7DPEiXjJwYerfL9mY-QGLzCYQCFjsL5bFMWn21E2zp5_hb5YBgVu-TB5Xwi3iA4FJ6OerhplHGSWxa3Qt0qXgrQnwJH45cnvSfWbMfTHfPaNLSdcCb-0RELH_wMCla1Itfatqes3A1j8Db38qWfEoYBELdn7My0lsy5Fbf_HFfMLiUWjSvZFNs5C5u0YBgSX7FV8UwS8_RouH-evibW4vd3r_DNv72Rr3OxJ-yBs8NGlr_yWOnu3snE3Ly0CryGBaDdM-o8wK-dvV859UZ1qvzrRuna3yI7EqjcRumM4ZlVLIf1U9_0mVsupVyqpbKbv8SOxKI3EaxX_duZRSyH9dPf9JlbLrVcquWymn_EicSiNpNc4olEL6TtX0J9XJqVcn5392uCPRxkyEfCVYqYbWzC_Hgge2eSzBk2jG7iI-K47ZLEcFV5SJgIl48621WfRXxVfFAMrDbR24owNTrdy0JaepwpNRNbitA3d0YKqVe-_JDmhrn26-p205bEthuvtmzX3a0RFcDiOCy2FEcDmMCY7QiOAtHcHlMCK4HEYEl8OY4AiNCN7WEfxKR1E5jCgqhxFF5TCmKEIjil7rKCqHEUXlMKKoHMYURWhE0Y6OolSrJyA0IilCI5YiNKYphmNdQa8s6LUFvbqg2Rf0CgPVagz0oDIo2SqnMVvlNGarnEZtRXDMVpWydPjqKm1JlcZsVepLyjhm60F5kNrqrT_8DQAA___-Ta0P
 
 query T
 EXPLAIN (DISTSQL) SELECT x, y FROM xyz INTERSECT SELECT y, x from xyz
@@ -503,7 +503,7 @@ vectorized: true
       table: xyz@xyz_pkey
       spans: FULL SCAN
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJzEmF1v4kYUhu_7K6xztSsNIjNjPmKpEqvdVEWiyTZwUanKhRemCRLB1DYSbJT_XmHadWLH553xR3oJzoPfOfH7MMMTJX9vKKCrP77OPk2vvQ9fpvPF_PfZR29-Nbv6vPAOwjt6v9ze_OYdjt-96fXi6nZ-ev_fy0fhHX5cJkHbaGWuw0eTUPAnSRKkSJAmQT4JGtCdoF0cLU2SRPHpT54yYLo6UHAhaL3d7dPT23eCllFsKHiidJ1uDAW0CL9tzK0JVybuX5CglUnD9Sa7zeH4fbKL149hfCRBn6PN_nGbBFlyEjTfhadXvf4pyc0-DbyJEhNJd8-Con2a3zFJw3tDgXwW9VINaqaqCqJcgnxZJ-l6u0z7sjCciRST4j1y7NvRewiTh7eRPIquF2XQQRS_Mkr-UfttFK9MbFavPiz7lMqwymJueYpBVyksRpanGDZIIWoF_TVMHuYmvdn1dWFei-POBC_88Gk2I0Eb81f6IVvEx5_j9f3Dfy9-VJFd36jdKV9HvWjX14PiJN689_jVvaW9BmQNDfRVr6_r6Mkh17B2LjtBgSi5FWTngrKOMuxcULI9NVjMrUpQLaawGFmVoNxSNBaUfG9BKfsyqjpl1L2-X0cSDrlGtXPZSQJEyZupOpeEdZRR55JQ7dXTYm5VkmgxhcXIqiThlqKxJNR7S0Lbl1HXKaPfyw4izpJwyDWunctOEiBK3kzduSSso4w7l4Rur54Wc6uSRIspLEZWJQm3FI0lod9bEr59Gf06ZRz06ijCIdVlzVR2ggBB8lb6nQvCOspl54Lw26umxdyqBNFiCouRVQnCLUVjQfj_528hb0S7Ncku2ibG6peOi9PizOrenIeVRPt4ab7G0TK7zfnlTcZlb6xMkp6v6vOL6fZ86RTwJSxZWPGwKsLyJey_gqUbLFUj-rIJrYZNaK15WrP0oAksG91aXTSiR01oDR4Wn31Mwf9r4ACrIjxkYbDoEV_NIV-vMUtLydOXPH0BvFCyiku3AY3KjXDQboCjegMc9VuWlOpScECjhgMcVRzh4HEHOCq5LIn19SOL8JJiOLxUdMk7Bi2dl4wcg7rxmpEjgJdE49RWnoZtBThqK4_DtvI4bGtJsk5t5WnYVh6HbQU4emR5HLaV_4JREmyi-G1rAS-1VfEbV7B0xZtGDcC-lzeN8gFeMo3Tvpmn4cYZ4GjnzONw68zjqK2qZFmXtgIatRXgqK0IR48sj6O2Kv4LRo0Bzu9kC3i5rfxWFi2dN40Gp1QNDshgH635TQ2YO6BRWxEO2gpw1FaAw5Muf1BGR11wxG92c3jYBTg67YLfCNBTw3_BaDQ6fitbwEtt1fxetrj0u-ef_gkAAP__-GNFtg==
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJzEmF1v4kYUhu_7K6xztSsNgpkxH7FUidVuqiLRZBu4qFRFFQvTBJXF1DYSJMp_rzBtnNjxeWf8kV6C8-B3Tvw-zPBI8d8bCujyt6_TT5Mr78OXyWw--3X60ZtdTi8_z72D8I7eTzfXv3iH44M3uZpf3sxO7_97-Si8w_NlErQNV-Zq8d3EFPxOkgQpEqRJkE-C-nQraBeFSxPHYXT6k8cUmKwOFPQErbe7fXJ6-1bQMowMBY-UrJONoYDmi28bc2MWKxN1eyRoZZLFepPe5nB8GB-OD3_s_jJHEvQ53Oy_b-MgjU6CZrvF6VWne4pyvU8Cb6zEWNLtk6Bwn2S3jJPFnaFAPolqsfpVY5UlUS5JvqzjZL1dJl2ZG89YinH-Hhn27ejdL-L7t5Esiq4Wpd9CFL80SvZR-20YrUxkVq8-LP2U0rDKYm5Zin5bKSxGlqUY1EghKgX9eRHfz0xyvevq3Lzmx50JXhji03RKgjbmz-RDuoiPP0bru_v_Xjx3kV3fsNkpX4WdcNfV_fwk3rz36NW9pb0HZBUPdFWnq6sIyiHYoHowO0WBLJkXZOuKso4yaF1Rsjk5WMytTFENprAYWZmi3FLUVpR8b0Up-zaqSm3Una5fRRMOwYbVg9lpAmTJuqla14R1lGHrmlDNFdRibmWaaDCFxcjKNOGWorYm1HtrQtu3UVdqo99JjyPOmnAINqoezE4TIEvWTd26JqyjjFrXhG6uoBZzK9NEgyksRlamCbcUtTWh31sTvn0b_Upt7HeqSMIh1kXVWHaKAEmyXvqtK8I6ykXrivCbK6fF3MoU0WAKi5GVKcItRW1F-P_nbyJvRLsx8S7cxsbqF4_eaXFmdWfOw4rDfbQ0X6Nwmd7m_PI65dI3ViZOzlf1-cVke750CvgSliyseFjlYfkS9l_B0g2WqhZ9UYdWgzq01jytWbpfB5a1bq16tehhHVqDh8VnH1Pw_-o7wCoPD1gYLHrIV3PA12vE0lLy9AVP94AXClZx6TagUbkRDtoNcFRvgKN-y4JSXQoOaNRwgKOKIxw87gBHJZcFsb5-ZBFeUAyHF4ouecegpfOSkSNQN14zcgjwgmic2srTsK0AR23lcdhWHodtLUjWqa08DdvK47CtAEePLI_DtvJfMEqCTRS_bc3hhbYqfuMKlq5406g-2PfyplE-wAumcdo38zTcOAMc7Zx5HG6deRy1VRUs69JWQKO2Ahy1FeHokeVx1FbFf8GoEcD5nWwOL7aV38qipfOm0eCUqsEBGeyjNb-pAXMHNGorwkFbAY7aCnB40uUPyuioC4749W4OD7sAR6dd8BsBemr4LxiNRsdvZXN4oa2a38vml3779MM_AQAA__9OIkqs
 
 # INTERSECT ALL and INTERSECT with different ORDER BY types.
 query T
@@ -527,7 +527,7 @@ vectorized: true
           table: xyz@xyz_pkey
           spans: FULL SCAN
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJy8lt9vokoUx9_vX0HOU80dAzOAP0hu0t7Wm2viald82M3GByqz1cQKC5iITf_3DVjjIjKHAeVN63xmDnM-3x7eIfy1BgsG355HD8Oxcvc0tGf211FLubMHo8HjTNkp_00nX5RdvFcm06fBVPn3uxK3lOF4NpjayYKH0Ui4eN86fd4BgY3n8rHzxkOwfgAFAgwI6EDAAAImzAn4gbfgYegFyZL3FBi6O7A0AquNv42SP88JLLyAg_UO0Spac7Bg5rys-ZQ7Lg9UDQi4PHJW6_SYXby_94PVmxPEQODRW2_fNqGl7IiyBwK27yTf2mpSyWQbWco9hfkHAW8bfR53OuUlVpZOuMzun66fEwgj55WDRT9ItbLNsmXHtyibFZZ92me78QKXB9zN7DRPSGzJhWf_3wmXNo8mvkrPOjaLfW5lLQMCa_4zurunrX-C1esy_VT46KfH0mW6YXtBxAOVmuc39Xfh_kaJa7t0I5-bXihi7LU9X2Xa-R1fPN7MHE_Ly0YrZERlbVW_SUokCu9USMk1C2eFhTeQE9pQTpB-HHPSqZoTVr7frIqoels1biKqROHdKqJesXBWWHgDorKGREX6cRS1W1VUvXy_9SqiGu107F9fVInCe1VEvWLhrLDwBkTVGxIV6cdR1F5VUY3y_TaqiGq2b6KpRNn9KpperWxWWHYDkhoNSYp04yhp_xqvxxf2n_LQ9zYhL_XmqyV3xt1XfuhB6G2DBX8OvEV6zOHrJOXS1xmXh9HhV3b4MtykP6V9LQ9368CU1qLNWnRfTFOJO6NycLcOfHZnsrRZi-6LaXZOa3_SegbWzmFdCBvikw0hzKj4aLNOPsQwkg8xjOUDoZF8IDSSj06dfIhhJB9iGMsHQiP5QGgkH12hpT2xpL06-ejXMVwMI4aLYcxwhEYMR2hsAsiMzfx_Upm5KUujQ0BqckrjiOY0N0UyqlImFp2KxwhiOs3NERnVERpxHaEx2TEcsR3DMd1zM1RKdzGN6S6mUd0RHNMdwTHdc4M0q3sH0T03U6R0z80UKd3FNKa7mEZ1R3BMdwTHdM_NUyndxTSmu5hGdUdwTHcEx3TPTdXsu7Ym1p3lZotQ9_nHX78DAAD__1D8rmA=
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJy8ll-PmkwUh-_fT0HO1Zp3DM4A_iFpsttdm5pY3aoXbRrTsDJdTV2hgAm42e_egGssInMYUO50nWfmMOf57eEV_D9rMKH_7XF4NxgpNw-D6Wz6ddhQbqb9Yf9-poTKp8n4ixJGO2U8eehPlI_flaihDEaz_mQaL7gbDoWLd43j5xAIbBybj6wX7oP5AygQYEBAAwI6EDBgTsD1nAX3fceLl7wmwMAOwWwRWG3cbRD_eU5g4XgczFcIVsGagwkz62nNJ9yyuae2gIDNA2u1To4Jo91tGO1-ur95BATunfX2ZeObSkiUHRCYulb8ranGpYy3gancUpi_EXC2wft5x2OeImVp-cv0Acn6OQE_sJ45mPSNlKvbKFx3dI26WW7dx322G8ezucft1E7zmMSWnHn4z5a_nPJg7Kr0pGezyOVm2jMgsOa_gptb2vjgrZ6XyafcRz8-libTjqnjBdxTqXF6U__n7q8XuLZzN_K-6ZkiRk7TcVXWOr3js8cbqeNpcdtomZSorKlqV8mJROXtMjm5ZOUst_IakkJrSgrSkENS2mWTwoo3nJVSVWuq-lVUlai8U0rVC1bOciuvQVVWk6pIQw6qdsqqqhVvuFZKVb2ZDP_LqypRebeUqhesnOVWXoOqWk2qIg05qNotq6pevOF6KVWN5lVElai7V0rUi9XNcuuuQVO9Jk2Rdhw07V3iNfnM_hPuu87G54XegFvxnXH7me974Dtbb8EfPWeRHLP_Ok645KXG5n6w_5Xtvww2yU9JX4vDnSowpZVooxLdE9NU4s6oHNypAp_cmSxtVKJ7Ypqd0q1_aS0Ft05hTQjr4pN1Icyo-GijSj7EMJIPMYzlA6GRfCA0ko92lXyIYSQfYhjLB0Ij-UBoJB8doaVdsaTdKvnoVTFcDCOGi2HMcIRGDEdobALIjM3sf1KZuSlLo0NAanJK44jmNDNFUqpSJhadiscIYjrNzBEZ1REacR2hMdkxHLEdwzHdMzNUSncxjekuplHdERzTHcEx3TODNK17G9E9M1OkdM_MFCndxTSmu5hGdUdwTHcEx3TPzFMp3cU0pruYRnVHcEx3BMd0z0zV9Lt2S6w7y8wWoe7zt__-BgAA__-aZLNW
 
 query T
 EXPLAIN (DISTSQL) (SELECT x FROM xyz ORDER BY y) INTERSECT (SELECT x FROM xyz ORDER BY z) ORDER BY x
@@ -550,7 +550,7 @@ vectorized: true
           table: xyz@xyz_pkey
           spans: FULL SCAN
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJy8mE1v6kYUhvf9FdZZJaoRzIz5lCrl9oaqSDTcAotWVRZcmCZIBFPbSJAo_70CbuSEweed8Ud2IfHjeX2Y99E4LxT_t6Ie9f_6NvwyuPOubgeT6eTP4bV3NekP-1-n3s77bTz6w9vtn73R-LY_9n7929tfe4O7aX88OVzAXfh8nf68I5_W4ULfzZ50TL1_SJBPknxS5FNAPjXp3qdNFM51HIfR4ZKXIzBY7KjX8Gm53myTw6_vfZqHkabeCyXLZKWpR9PZ95Ue69lCR_UG-bTQyWy5Oi6z2z_fbKLl0yzak09fw9X2aR33vJ3vPZNPk83s8KlWPyQZbZOedyPo_tWncJuky8XJ7EFTT7z6-SI1bSPtXSNJl0i3yzhZrudJXZzNyFggZb7vvcdZ_Hjh-jSEyheiWWqIIDNEep_tOowWOtKLD3c63iUzpkSzSiM0q4qAJpVGaBWI4OdK-fssfpzoZLSpq7NJTfcb3Xtnii_DIfm00v8mVzfi-pdo-fB4_Mlim7dddtgkjBId1ZUxtZ8z79-xGNulify46YUQd2Et3NSDxvmMLy7f_bC8sBeLyOG6uqzVlbPtHEK1ctjONpR0CZWqRlToO-sQrQp9J8qTDZpVlu9KjIAmleU7twiFfSc-yXdgh735zpiare-kfbdlHuGoWj1wFo5DqHYe4ViGki6h0q7LCoVjHaJdoXBkeW1Hs8oSTokR0KSyhOMWobBw5CcJB-ywN-EYU7MVjrLvtsojnKB2fOVyE45DqE4e4ViGki6h0q6rCoVjHaJToXBUeW1Hs8oSTokR0KSyhOMWobBw1CcJB-ywN-EYU7MVTmDf7SCPcJo1Z904ROrm0Y1VJOkSKe15UKFsrEN0K5RNUF7T0ayyZFNiBDSpLNm4RSgsm-CTZAN22JtsjKnl-ffRhfuPdbwJ17G2-s9Q4zAzvXjQp-8gDrfRXH-LwvlxmdPH0ZE7_mKh4-T0V3X6MFif_nQI-B4WLCx5WJ7D4j0cfICFGyxUEVqKQnS3CK3aPK1YulkEFmDkPC1lEVo1CtEdng7Ybdri4aYDLM_hFgu3-YK0WRg8c4eFA8Ev3WVpAZoteKkIsLgwtOJiBkAjNQAcuQHhQA4AR3YQvFyAHgCN_ABwJAiAI0MgHNRFGIb5uGXR6HjFnOGGJgQvGdECheE1gx6d94xsgMV504guwA3VOJWdp2HZeRyWHeCo7DyOyi4Ny7qUHdCo7ABHZQc4KjvCwY6X4NyKTo-GajjcKLvkVSMDcGzmVYMenTeN7IDFedNIcKKRhmqczvw8DQ_9PA5P_QBHx34eh2U3LOtUdp6GZedxWHYeh2UHONrx_FlWga9dgRdkwZdd8apR4CSteNWAR1e8aRQ4VijeNKoJcEM1LmUHNCo7wFHZEQ7KDnD4km9Y1uktn6fhaz6Pw_d8Hocv-gBHO54_yyr0vfFn2TPcLDuvmgCcpANeNeePfv_60_8BAAD__8gSPXA=
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJy8mF1v4kYUhu_7K6xzlahGMDPmU6qU7SZVkWjYAhetqqhiYZqgspjaRgKi_PcK2MgJg88744_chcSP5_Vh3kfjPFP835J6dPfHl8Gn_r13ddsfT8a_D669q_Hd4O7zxNt6v4yGv3nb3d4bjm7vRt7Pf3q7a69_P7kbjQ8XcBfur9Oft-TTKpzr--k3HVPvLxLkkySfFPkUkE9NevBpHYUzHcdhdLjk-Qj051vqNXxarNab5PDrB59mYaSp90zJIllq6tFk-nWpR3o611G9QT7NdTJdLI_LbHf7m-1u__f6X70jnz6Hy823Vdzztr63J5_G6-nhU61-iDLcJD3vRtDDi0_hJknXi5Ppo6aeePHzZWpaZ9q5ZpIumW4XcbJYzZK6OJuSsUDKfN15T9P46cL1aQiVL0Sz1BBBZoj0PptVGM11pOfv7nS8S2ZMiWaVRmhWFQFNKo3QKhDBz5Xy12n8NNbJcF1XZ5Oa7Na698YVnwYD8mmp_0mubsT1T9Hi8en4k8U2b7vssHEYJTqqK2NqP2bev2MxtksT-X7TCyHuw1q4rgeN8xlfXL77bnlhbxaRx3Z1WasrZ985pGrl8Z1tKumSKpWNqNB41iFaFRpPlKcbNKss45UYAU0qy3huEQobT3yQ8cAOezWeMTVb40n7cstcylG1euCsHIdU7VzKsUwlXVKlbZcVKsc6RLtC5cjy-o5mlaWcEiOgSWUpxy1CYeXID1IO2GGvyjGmZqscZV9ulUs5Qe344uWmHIdUnVzKsUwlXVKlbVcVKsc6RKdC5ajy-o5mlaWcEiOgSWUpxy1CYeWoD1IO2GGvyjGmZqucwL7cQS7lNGvOwnHI1M0lHKtM0iVT2vSgQt1Yh-hWqJugvK6jWWXppsQIaFJZunGLUFg3wQfpBuywV90YU8vzb6QL9x_peB2uYm31H6LGYWZ6_qhP30EcbqKZ_hKFs-Myp4_DI3f8xVzHyemv6vShvzr96RDwLSxYWPKwPIfFWzh4Bws3WKgitBSF6G4RWrV5WrF0swgswMh5WsoitGoUojs8HbDbtMXDTQdYnsMtFm7zBWmzMHjmDgsHgl-6y9ICNFvwUhFgcWFoxcUMgEZqADhyA8KBHACO7CB4uQA9ABr5AeBIEABHhkA4qIswDPN-y6LR8Yo5ww1NCF4yogUKw2sGPTrvGdkAi_OmEV2AG6pxKjtPw7LzOCw7wFHZeRyVXRqWdSk7oFHZAY7KDnBUdoSDHS_BuRWdHg3VcLhRdsmrRgbg2MyrBj06bxrZAYvzppHgRCMN1Tid-XkaHvp5HJ76AY6O_TwOy25Y1qnsPA3LzuOw7DwOyw5wtOP5s6wCX7sCL8iCL7viVaPASVrxqgGPrnjTKHCsULxpVBPghmpcyg5oVHaAo7IjHJQd4PAl37Cs01s-T8PXfB6H7_k8Dl_0AY52PH-WVeh748-yZ7hZdl41AThJB7xqzh_94eWH_wMAAP__DkZCZg==
 
 # INTERSECT ALL and INTERSECT with different numbers of ORDER BY columns.
 query T
@@ -574,7 +574,7 @@ vectorized: true
           table: xyz@xyz_pkey
           spans: FULL SCAN
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJy8ll9vokwUh-_fT0HOVc07BmcA_5Bs0m7rZk1c7YoXu9l4QWW2mlhhB0y0Tb_7BqxxEZnDgHJXdZ6ZH3Oe08MbhH9WYEP_x-PwbjDSbh4GztT5PmxoN05_2L-falvty2T8TdvuXrXx5KE_0T7_1HYNbTCa9idOvOBuOJQvJtpr4_hxCwTWvsdH7gsPwf4FFAgwIGAAARMIWDAjEAh_zsPQF_GStwQYeFuwWwSW62ATxV_PCMx9wcF-g2gZrTjYMHWfVnzCXY8LvQUEPB65y1VyzHb3ehuI5YsrdkDg3l9tXtahrW1JEhAIOIEbf9HU4zDjTWRrtxRm7wT8TfRx4vGgp522cMNF-ohk_YxAGLnPHGz6Tsoltwonv0Zslhv7uM9m7QuPC-6ldprFJLbkzLN_dcOFw6NxoNOTok13AbfTrgGBFf8d3dzSxiexfF4kf-U--vGxDJVqOL6IuNCpdXpT_-fubxa4tnM38rHpmRAjv-kHOmud3vHZ463U8bS4bLRcm-isqRtXaRSF7O0SjXLJ4Cw3eA2tQmtqFaQeh1Zpl20VVrzerKSrRlM3r-KqQvZOGVcvGJzlBq_BVVaTq0g9Dq52yrpqFK-3UdJVs5nM_8u7qpC9W8bVCwZnucFrcNWoyVWkHgdXu2VdNYvX2yzpqtW8iqkKyXtlTL1YbJYbuwZPzZo8Rapx8LR3iVflM_tPeBj465AXegtuxXfGvWe-r0Hob8ScPwp_nhyz_zhOuOS9xuNhtP-V7T8M1slPSV2Lw50qMKWVaKsS3ZPTVOHOqBrcqQKf3JkqbVWie3KandKtf2kjBbdOYUMKm_KTTSnMqPxoq0p_yGGkP-Qw1h8IjfQHQiP90a7SH3IY6Q85jPUHQiP9gdBIf3Sklnblknar9EeviuFyGDFcDmOGIzRiOEJjE0BlbGb_k6rMTVUaHQJKk1MZRzSnmSmSUpUyuehUPkYQ02lmjqiojtCI6wiNyY7hiO0YjumemaFKustpTHc5jeqO4JjuCI7pnhmkad3biO6ZmaKke2amKOkupzHd5TSqO4JjuiM4pntmnirpLqcx3eU0qjuCY7ojOKZ7Zqqm37Vbct1ZZrZIdZ-9__c3AAD__xTvsv4=
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJy8ll-PmkwUh-_fT0HO1Zp3DM4A_iFpsttdm5pY3aoXbRrTsDJdTV2hgAm42e_egGssInMYUO5W5Zn5Mec5e-YV_D9rMKH_7XF4NxgpNw-D6Wz6ddhQbqb9Yf9-poTKp8n4ixJGO2U8eehPlI_flaihDEaz_mQaP3A3HIofJsqucfwYAoGNY_OR9cJ9MH8ABQIMCGhAQAcCBswJuJ6z4L7vePEjrwkwsEMwWwRWG3cbxF_PCSwcj4P5CsEqWHMwYWY9rfmEWzb31BYQsHlgrdbJNmG0uw2j3U_3N4-AwL2z3r5sfFMJSZIQCExdK_6iqcZpxtvAVG4pzN8IONvgfcvjTk-RsrT8ZXqP5Pk5AT-wnjmY9I2Ui24Uj36N3Cw393Gd7cbxbO5xO7XSPCaxR868_GfLX055MHZVelK2WeRyM20bEFjzX8HNLW188FbPy-Sv3Fc_vpYmU46p4wXcU6lxelL_566vFzi2cyfyvuiZECOn6bgqa52e8dntjdT2tLhttGSjqKypaldpFYnw7TKtcsnkLDd5Dc1Ca2oWpCCHZmmXbRZWvOCsrK1aU9WvYqtE-E4pWy-YnOUmr8FWVpOtSEEOtnbK2qoVL7hW1la9mdwCLm-rRPhuKVsvmJzlJq_BVq0mW5GCHGztlrVVL15wvaytRvMqrkpE75Vy9WK5WW7uGkzVazIVKcfB1N4lrsxn1p9w33U2Pi90G27FZ8btZ76vge9svQV_9JxFss3-4zjhktuNzf1g_yvbfxhskp-SuhaHO1VgSivRRiW6J6apxJlRObhTBT45M1naqET3xDQ7pVv_0loKbp3CmhDWxTvrQphR8dZGlf4Qw0h_iGGsPxAa6Q-ERvqjXaU_xDDSH2IY6w-ERvoDoZH-6Agt7Yol7Vbpj14Vw8UwYrgYxgxHaMRwhMYmgMzYzP4nlZmbsjQ6BKQmpzSOaE4zUySlKmVi0al4jCCm08wckVEdoRHXERqTHcMR2zEc0z0zQ6V0F9OY7mIa1R3BMd0RHNM9M0jTurcR3TMzRUr3zEyR0l1MY7qLaVR3BMd0R3BM98w8ldJdTGO6i2lUdwTHdEdwTPfMVE3ftVti3Vlmtgh1n7_99zcAAP__nnu39A==
 
 query T
 EXPLAIN (DISTSQL) (SELECT x FROM xyz ORDER BY y) INTERSECT (SELECT x FROM xyz ORDER BY y, z) ORDER BY x
@@ -597,7 +597,7 @@ vectorized: true
           table: xyz@xyz_pkey
           spans: FULL SCAN
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJy8mE1v6kYYhff9FdasEtXIzIz5slQptzdURaLhFli0qrLwhWmCRDC1jQSJ8t8rzI2cMPg9M_7ILhAez_HLnEdjXljy35oFbPjXt_GX0Z1zdTuazWd_jq-dq9lwPPw6d_bOb9PJH87-8OxMprfDqfPr387h2hndzYfT2fED5Add5_k6f7lnLttES3UXPqmEBf8wzlwmmMskc5nPXNZh9y7bxtFCJUkUHz_ykgGj5Z4FbZetNttdenz73mWLKFYseGHpKl0rFrB5-H2tpipcqthrM5ctVRqu1tky-8PzzTZePYXxgbnsa7TePW2SwNm7WUDmstk2PL7R8o5hJrs0cG44u391WbRL8xWTNHxQLOCvbrlUHeNUtpGETaTbVZKuNovU42dj0hbIme8H5zFMHi98Pg8hy4Xo1BrCLwyRX2e3ieKlitXyw5WyqxTGFGhWeYROUxHQpPII3QoR3FIpfw-Tx5lKJ1tPnk1qftiq4J0vvozHzGVr9W96dcOvf4lXD4_ZXwbbvGezw2ZRnKrYk9rUfi68ft9gbJcm8uOiF0LcRa1o6_nt8xlfXH7wYXluLhZeTneeaHnSWngWubolhGcaStiEym3DG1SecYhug8rj9fkGzapIeTVGQJMqUp5dhMrK45-kPLDD3pSnTc1UecK826Kkc2TL862dY5GrV8Y5hqGETai87qJB5xiH6DXoHFFf4dGsipxTYwQ0qSLn2EWo7BzxSc4BO-zNOdrUTJ0jzbstSzrHb2XPXnbOscjVL-Mcw1DCJlRed9mgc4xD9Bt0jqyv8GhWRc6pMQKaVJFz7CJUdo78JOeAHfbmHG1qps7xzbvtl3ROp2VtHItUgzLGMYokbCLlVfcb9I1xiEGDvvHrKzuaVZFvaoyAJlXkG7sIlX3jf5JvwA578402tTI_JV24_lQl22iTKKNfidrHmanlgzp9B0m0ixfqWxwtsmVOLycZl72xVEl6-q88vRhtTv86BnwPcxIWNCzOYf4e9j_A3A7msgoteCV6UIWWPZqWJN2pAnMwcpoWogot25XoPk375Dbt0nDHAhbncJeEe3RBeiQM7rlPwj6nlx6QNAfN5rRUOFica1qxMQOgkRoAjtyAcCAHgCM7cFouQA-ARn4AOBIEwJEhEA7qwjXDfNyyaHS0Ys5wTROclgzvgsLQmkG3TntGtMHitGn4AOCaaqzKTtOw7DQOyw5wVHYaR2UXmmVtyg5oVHaAo7IDHJUd4WDHC3BuRadHTTUUrpVd0KoRPjg206pBt06bRvTB4rRpBDjRCE01Vmd-moaHfhqHp36Ao2M_jcOya5a1KjtNw7LTOCw7jcOyAxztePosK8HXLsEDMqfLLmnVSHCSlrRqwK1L2jQSHCskbRrZAbimGpuyAxqVHeCo7AgHZQc4fMjXLGv1lE_T8DGfxuFzPo3DB32Aox1Pn2Ul-t7os-wZrpedVo0PTtI-rZrzW79__en_AAAA__9c1UIO
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJy8mF1v4kYUhu_7K6xzlahGMDPmU6qU7YaqSDRsgYtWVVSxME1QWUxtI0Gi_PcK2MgJg88744_cBcLjeX2Y99GYZ4r_W1GP-n98GX4a3HlXt4PJdPL78Nq7mvSH_c9Tb-f9Mh795u32T95ofNsfez__6e2vvcHdtD-eHD7AftD3nq7TlzvyaR0u9N3sm46p9xcJ8kmST4p8CsinJt37tInCuY7jMDp85PkIDBY76jV8Wq432-Tw9r1P8zDS1HumZJmsNPVoOvu60mM9W-io3iCfFjqZLVfHZXb7p5vd_unvzb96Tz59Dlfbb-u45-38Y0LyabKZHd6o1Q9pRtuk590Iun_xKdwm6ZJxMnvQ1BMvfr5YTftYrpmkS6bbZZws1_OkLs4GZSyQMl_33uMsfrzw-TSEyheiWWqIIDNEep3tOowWOtKLd1c6XiUzpkSzSiM0q4qAJpVGaBWI4OdK-essfpzoZLSpq7NJTfcb3XtjjE_DIfm00v8kVzfi-qdo-fB4_Mtim7dddtgkjBId1ZUxtR8zr9-xGNuliXy_6IUQd2Et3NSDxvmMLy7ffbe8sDeLyCm8uqzVlbPyHIK18ijPNpV0SZX6RlQoPesQrQqlJ8ozDppVlvRKjIAmlSU9twiFpSc-SHpgh71Kz5iarfSkfbllXuuoWj1wto5DsHYu61imki6p0sLLCq1jHaJdoXVkeZVHs8qyTokR0KSyrOMWobB15AdZB-ywV-sYU7O1jrIvt8prnaB2fAJzs45DsE4u61imki6p0sKrCq1jHaJToXVUeZVHs8qyTokR0KSyrOMWobB11AdZB-ywV-sYU7O1TmBf7iCvdZo1Z-c4xOrmco5VJumSKS17UKFxrEN0KzROUF7d0ayyjFNiBDSpLOO4RShsnOCDjAN22KtxjKnl-UnpwvXHOt6E61hb_VrUOMxMLx706TuIw20011-icH5c5vRydOSObyx0nJz-q04vBuvTvw4B38KChSUPy3NYvIWDd7Bwg4UqQktRiO4WoVWbpxVLN4vAAoycp6UsQqtGIbrD0wG7TVs83HSA5TncYuE2X5A2C4N77rBwIPiluywtQLMFLxUBFheGVlzMAGikBoAjNyAcyAHgyA6ClwvQA6CRHwCOBAFwZAiEg7oIwzDvtywaHa-YM9zQhOAlI1qgMLxm0K3znpENsDhvGtEFuKEap7LzNCw7j8OyAxyVncdR2aVhWZeyAxqVHeCo7ABHZUc42PESnFvR6dFQDYcbZZe8amQAjs28atCt86aRHbA4bxoJTjTSUI3TmZ-n4aGfx-GpH-Do2M_jsOyGZZ3KztOw7DwOy87jsOwARzueP8sq8LUr8IAs-LIrXjUKnKQVrxpw64o3jQLHCsWbRjUBbqjGpeyARmUHOCo7wkHZAQ4f8g3LOj3l8zR8zOdx-JzP4_BBH-Box_NnWYW-N_4se4abZedVE4CTdMCr5vzW719--D8AAP__4x5HBA==
 
 # INTERSECT ALL and INTERSECT with compatible ORDER BY columns that are not in the final result.
 query T
@@ -618,7 +618,7 @@ vectorized: true
       table: xyz@xyz_pkey
       spans: FULL SCAN
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJzEll1v2jAUhu_3K6xz1UpGwU6gJdKkdi3TkBh0wMWmiYuUeAWJ4iwOUkPV_z4lTOr4iE-MR3LXNH7i1z6PxPsK6vcSfOh-f-jf9gbk4r43noy_9S_Jxbjb795NSEo-j4ZfyUu6IcPRfXdEPv0gm0vSG0y6o3G24LbfRxYDhZUMxSB4Fgr8n8CAAgcKLlDwgEILphSiWM6EUjLOlrzmQC98Ab9JYbGK1kn27ymFmYwF-K-QLJKlAB8mweNSjEQQithpAoVQJMFimW_zkm5uonjxHMQpULiTy_XzSvkkpWQDFMZRkD01nCzJcJ345IbB9I2CXCd_t3vf5TEl80DNd7-fr59SUEnwJMBnb_S02K1aY_PC2O_fWa9kHIpYhDtfmmYktuTI2b8Eaj4WyTBy2N7EJmkk_F21gMJS_Eoubtjlx3jxNM__Kjz6-7Fci2MdyTyQDRk5rLV_AUf39nb2ZuVNYCeY4PCG455FYYPg7ZqD88LgFUjMKpKYl58HP2UebsPxziKSQfCrmoPzwuAViMQrEsktPw_3lHl4jfw37f-LZBD8uubgvDB4BSK5FYnklZ-Hd8o8Wo2zaGQQu1NrbF4YuwKJvBq62ZFEI6EiuVKiVPNqZmcS4ZPY3pGS63gmHmI5y7fZPg5zLm8JoVDJ9i3fPvRW-av83svDbRu4YwMzq9yspaeZwZUxM7htA3dsYGaVe-_KDmi-Tzf_pV097GphtntnzX3asxFcDyOC62FEcD2MCY7QiOAtG8H1MCK4HkYE18OY4AiNCN62EfzKRlE9jCiqhxFF9TCmKEIjil7bKKqHEUX1MKKoHsYURWhE0Y6NosyqJyA0IilCI5YiNKYphmNdwa4s2LUFu7pg2RfsCgOzagzsoDIY2aqnMVv1NGarnkZtRXDMVpOydHjrJm3JlMZsNepLxjhm60F50No6ffvwJwAA___gfqbk
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJzEll1v2jAUhu_3K6xz1UpGwU6gJdKkdi3TkBh0wMWmCU0p8QoaxVkcJELV_z4lTOr48onxSO6axk_82ueReF9A_Z6DD-2vD93bTo9c3HeGo-GX7iW5GLa77bsRScnHQf8zWaVr0h_ctwfkwzeyviSd3qg9GGYLbrtdZDFQWMhQ9IJnocD_DgwocKDgAgUPKDRgTCGK5UQoJeNsyUsOdMIV-HUKs0W0TLJ_jylMZCzAf4FklswF-DAKHudiIIJQxE4dKIQiCWbzfJtVur5Zpesf0S-RAoU7OV8-L5RPUkrWQGEYBdlTzcmi9JeJT24YjF8pyGXyd7-3bR5TMg3UdHuDfP2YgkqCJwE-e6Wn5W5Um5sfzf32neVCxqGIRbj1pXFGYksOHP5ToKZDkfQjh-3MbJRGwt-WCyjMxc_k4oZdvo9nT9P8r6NHfzuWa3GsA5l7siYjhzV2L-Dg3t7W3qy4CuwUFRxec9yzSGyQvFl1cn40eQkas5I05sUHwk8aiFtzvLOoZJD8qurk_GjyElTiJankFh-Ie9JAvFr-y_b_VTJIfl11cn40eQkquSWp5BUfiHfSQBq1s4hkkLtVbW5-NHcJGnkVdLQDiQZCRXKhRKEGVs_OJMInsbkjJZfxRDzEcpJvs3ns51zeFUKhks1bvnnoLPJX-b0Xh5s2cMsGZla5WUNPM4MrY2Zw0wZu2cDMKvfOle3RfJeu_0u7etjVwmz7zuq7tGcjuB5GBNfDiOB6GBMcoRHBGzaC62FEcD2MCK6HMcERGhG8aSP4lY2iehhRVA8jiuphTFGERhS9tlFUDyOK6mFEUT2MKYrQiKItG0WZVU9AaERShEYsRWhMUwzHuoJdWbBrC3Z1wbIv2BUGZtUY2F5lMLJVT2O26mnMVj2N2orgmK0mZWn_1k3akimN2WrUl4xxzNa98qC1dfz67k8AAAD__7vNq9o=
 
 query T
 EXPLAIN (DISTSQL) (SELECT y FROM xyz ORDER BY z) INTERSECT ALL (SELECT y FROM xyz ORDER BY z)
@@ -638,7 +638,7 @@ vectorized: true
       table: xyz@xyz_pkey
       spans: FULL SCAN
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJzEll1v2jAUhu_3K6xz1UpGwU6gJdKkdi3TkBh0wMWmiYuUeAWJ4iwOUkPV_z4lTOr4iE-MR3LXNH7i1z6PxPsK6vcSfOh-f-jf9gbk4r43noy_9S_Jxbjb795NSEo-j4ZfyUu6IcPRfXdEPv0gm0vSG0y6o3G24LbfRxYDhZUMxSB4Fgr8n8CAAgcKLlDwgEILphSiWM6EUjLOlrzmQC98Ab9JYbGK1kn27ymFmYwF-K-QLJKlAB8mweNSjEQQithpAoVQJMFimW_zkm5uonjxHMQpULiTy_XzSvkkpWQDFMZRkD01nCzJcJ345IbB9I2CXCd_t3vf5TEl80DNd7-fr59SUEnwJMBnb_S02K1aY_PC2O_fWa9kHIpYhDtfmmYktuTI2b8Eaj4WyTBy2N7EJmkk_F21gMJS_Eoubtjlx3jxNM__Kjz6-7Fci2MdyTyQDRk5rLV_AUf39nb2ZuVNYCeY4PCG455FYYPg7ZqD88LgFUjMKpKYl58HP2UebsPxziKSQfCrmoPzwuAViMQrEsktPw_3lHl4jfw37f-LZBD8uubgvDB4BSK5FYnklZ-Hd8o8Wo2zaGQQu1NrbF4YuwKJvBq62ZFEI6EiuVKiVPNqZmcS4ZPY3pGS63gmHmI5y7fZPg5zLm8JoVDJ9i3fPvRW-av83svDbRu4YwMzq9yspaeZwZUxM7htA3dsYGaVe-_KDmi-Tzf_pV097GphtntnzX3asxFcDyOC62FEcD2MCY7QiOAtG8H1MCK4HkYE18OY4AiNCN62EfzKRlE9jCiqhxFF9TCmKEIjil7bKKqHEUX1MKKoHsYURWhE0Y6NosyqJyA0IilCI5YiNKYphmNdwa4s2LUFu7pg2RfsCgOzagzsoDIY2aqnMVv1NGarnkZtRXDMVpOydHjrJm3JlMZsNepLxjhm60F50No6ffvwJwAA___gfqbk
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJzEll1v2jAUhu_3K6xz1UpGwU6gJdKkdi3TkBh0wMWmCU0p8QoaxVkcJELV_z4lTOr48onxSO6axk_82ueReF9A_Z6DD-2vD93bTo9c3HeGo-GX7iW5GLa77bsRScnHQf8zWaVr0h_ctwfkwzeyviSd3qg9GGYLbrtdZDFQWMhQ9IJnocD_DgwocKDgAgUPKDRgTCGK5UQoJeNsyUsOdMIV-HUKs0W0TLJ_jylMZCzAf4FklswF-DAKHudiIIJQxE4dKIQiCWbzfJtVur5Zpesf0S-RAoU7OV8-L5RPUkrWQGEYBdlTzcmi9JeJT24YjF8pyGXyd7-3bR5TMg3UdHuDfP2YgkqCJwE-e6Wn5W5Um5sfzf32neVCxqGIRbj1pXFGYksOHP5ToKZDkfQjh-3MbJRGwt-WCyjMxc_k4oZdvo9nT9P8r6NHfzuWa3GsA5l7siYjhzV2L-Dg3t7W3qy4CuwUFRxec9yzSGyQvFl1cn40eQkas5I05sUHwk8aiFtzvLOoZJD8qurk_GjyElTiJankFh-Ie9JAvFr-y_b_VTJIfl11cn40eQkquSWp5BUfiHfSQBq1s4hkkLtVbW5-NHcJGnkVdLQDiQZCRXKhRKEGVs_OJMInsbkjJZfxRDzEcpJvs3ns51zeFUKhks1bvnnoLPJX-b0Xh5s2cMsGZla5WUNPM4MrY2Zw0wZu2cDMKvfOle3RfJeu_0u7etjVwmz7zuq7tGcjuB5GBNfDiOB6GBMcoRHBGzaC62FEcD2MCK6HMcERGhG8aSP4lY2iehhRVA8jiuphTFGERhS9tlFUDyOK6mFEUT2MKYrQiKItG0WZVU9AaERShEYsRWhMUwzHuoJdWbBrC3Z1wbIv2BUGZtUY2F5lMLJVT2O26mnMVj2N2orgmK0mZWn_1k3akimN2WrUl4xxzNa98qC1dfz67k8AAAD__7vNq9o=
 
 # INTERSECT ALL and INTERSECT with a projection on the result.
 query T
@@ -659,7 +659,7 @@ vectorized: true
       table: xyz@xyz_pkey
       spans: FULL SCAN
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJzElkFv2jAYhu_7FdF3Asko2EloiTSJqmMaEoMOOEyaOKTEK0gUZ3GQSKv-9ylhVUcAfzFGydFJnvj15-fwvoL8swYf-j8fhneDkdX4MpjOpj-GTWvaH_bvZ9bO-joZf7cajfc1sdL9o1360rQGo1l_Ms1e3A2H1umPmkBgI0I-Cp65BP8XUCDAgIADBFwg4MGcQBSLBZdSxNknrzkwCHfgtwmsNtE2yR7PCSxEzMF_hWSVrDn4MAse13zCg5DHdhsIhDwJVut8m1360ovi1XMQp0DgXqy3zxvp5-GAwDQKslXLZjB_IyC2yb9NPv79mFrLQC4P_9qjpJchcwIyCZ44-PSNXJbXqycvO5v341fbjYhDHvPw4GfzjMQ-OXHob4FcTnkyjmxauKNZGnH_0CIgsOa_k0YevPk5Xj0t3xdAYLxNfKtHCzP4OJxjcLgTyUeiJSKbesUxnNzbPdiblheBXiCCzVq2c111NRJ36krMziauQF5aqbys_HWwS67DadnudQXSSHxTV2J2NnEFArFKBXLKX4dzyXW4Ldu7rkAaiW_rSszOJq5AIKdSgdzy1-Fech1e67r6aOTt1pOXnc1bgTxubd3rRK4Jl5HYSF6qWbWzk_Hwie8nJcU2XvCHWCzybfbLcc7lnSDkMtm_ZfvFYJO_yqdfHu6YwF0TmBrlpp6aphojo3pwxwTumsDUKHdhZEc0K9Lt_2lHDTtKmB7OrF2kXRPB1TAiuBpGBFfDmOAIjQjumQiuhhHB1TAiuBrGBEdoRPCOieA3JoqqYURRNYwoqoYxRREaUfTWRFE1jCiqhhFF1TCmKEIjinZNFKVGPQGhEUkRGrEUoTFNMRzrCmZlwawtmNUFw75gVhioUWOgR5VBy1Y1jdmqpjFb1TRqK4JjtuqUpeOp67QlXRqzVasvaeOYrUflQWnr_O3T3wAAAP__p0aabQ==
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJzEll1v2jAUhu_3K6JzBZJRsJPQEmkSVcc0JAYdcDFpQlNKvIJGcRYHibTqf58SVjG-fGKMkksneeLXx8_F-wryzxJ86H5_6N_1BlbtU288GX_r161xt9-9n1gb6_No-NWq1d7XxEq3jzbpS93qDSbd0Th7cdfvW6c_qgOBlQj5IHjmEvwfQIEAAwIOEHCBgAdTAlEsZlxKEWefvOZAL9yA3ySwWEXrJHs8JTATMQf_FZJFsuTgwyR4XPIRD0Ie200gEPIkWCzzbTbpS2eTvvyMfvMUCNyL5fp5Jf08HRAYR0G2atgMpm8ExDr5t8vu54-pNQ_kfP-3HUo6GTIlIJPgiYNP38hlgb2KArOzgXe_Wq9EHPKYh3s_m2Yk9smJU38J5HzMk2Fk04NbmqQR9_c9AgJL_iup5cHrH-PF0_x9AQSG68S3OvRgBrvDOQaHO5F8IBoisql3OIaTe7t7e9PiJtBLTLBZw3auK69G5FZlkdnZyCXoS0vVlxW_D3bRfTgN272uQhqRbyqLzM5GLkEhVqpCTvH7cC66D7dhe9dVSCPybWWR2dnIJSjklKqQW_w-3Ivuw2tcVyCNwO2KArOzgUvQx62sg53INeIyEivJCzWsZnYyHj7x7aSkWMcz_hCLWb7NdjnMubwZhFwm27dsu-it8lf59IvDLRO4bQJTo9zUU9NUY2RUD26ZwG0TmBrlPhjZEc0O6eb_tKOGHSVM92fWPKRdE8HVMCK4GkYEV8OY4AiNCO6ZCK6GEcHVMCK4GsYER2hE8JaJ4DcmiqphRFE1jCiqhjFFERpR9NZEUTWMKKqGEUXVMKYoQiOKtk0UpUY9AaERSREasRShMU0xHOsKZmXBrC2Y1QXDvmBWGKhRY6BHlUHLVjWN2aqmMVvVNGorgmO26pSl46nrtCVdGrNVqy9p45itR-VBaev07cPfAAAA___gVp9j
 
 query T
 EXPLAIN (DISTSQL) SELECT x FROM ((SELECT x, y FROM xyz) INTERSECT (SELECT x, y FROM xyz))
@@ -679,7 +679,7 @@ vectorized: true
       table: xyz@xyz_pkey
       spans: FULL SCAN
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJzEmFFv4kYUhd_7K6z7lEiDzMzYQCxVymo3VZFosg08VKry4IVpgkQwtY0UNsp_rwBFTuz4nhlsp49j83nOXOYc3_EzZf-uKKKrv75PvoyvvbNv4-ls-ufk3JteTa6-zrwn77fbmz-8s7PXsfB2x0tPu5_n3vh6dnU73d_4-AfnJGidLMx1_Ggyiv4mSYIUCdIkKCBBId0J2qTJ3GRZku5_8nwAxosnivqCluvNNt9fvhM0T1JD0TPly3xlKKJZ_GNlbk28MKnfJ0ELk8fL1WGap93Py026fIzTHQn6mqy2j-ssOogjQdNNvB_1fEV3L4KSbV5MkuXxvaFIvojThIQtC1EuQr4ts3y5nue-LNXjUorL8hwF9mPnPcTZw8dIIUWfJiXsQEpQK6V41HadpAuTmsW7hx2eUitWWdStUBF2pcKiZIWKQQMV4iShv8fZw9TkNxtfl-o1221M9CYVvkwmJGhl_snPDos4_zVd3j-8DkjQzTaPvEtZu7hhuyW-TnrJxtdhuQwfzj16N7e0zwB5Qgb4qudryzhykDJoXYpykVKkgOw8kKylDDoPJNleFFjUrS6QWlRhUbK6QHJT0TiQ5KcGkrJ3ojrFibrnB5ah4CBl2LoU5SKlcKLqPBSspQw7DwXVnh0t6lYXCi2qsChZXSi4qWgcCupTQ0HbO1Gf4sSg54eWoeAgZdS6FOUipXCi7jwUrKWMOg8F3Z4dLepWFwotqrAoWV0ouKloHAr6U0MhsHdicIoTw55lJDgIuWhZiHIRUrgw6DwQrKVcdB4IQXtWtKhbXSC0qMKiZHWB4KaicSAE_9u3jA903Zpsk6wzY_Wlor9fmVncm2OlsmSbzs33NJkfpjkObw7c4cLCZPnxrj4Oxuvjrb3At7BkYcXDqgzLt3DwDpZusFSN6IsmtBo0obXmac3SYRNYNppa9RvRwya0BpslYLcp-L9CB1iV4QELg0UPeWsOeHuNWFpKnr7g6T7IhUqquHgb0MjcCAfuBjiyN8CRv2UlUl0MDmjkcIAjiyMcbHeAI5PLSrC-37IIr0QMh1eMLvmMQUvnQ0aOgN34mJFDgFeCxsmtPA3dCnDkVh6HbuVx6NZKyDq5laehW3kcuhXgaMvyOHQr_4JREjRRfNtawituVXzjCpau-KRRIeh7-aRRAcArSePUN_M0bJwBjjpnHoetM48jt6pKyrq4FdDIrQBHbkU42rI8jtyq-BeMGgGc72RLeNWtfCuLls4njQanVA0OyKCP1nxTA-oOaORWhAO3Ahy5FeDwpMsflNFRFxzxm00OD7sAR6dd8I0A7Rr-BaNR6fhWtoRX3Kr5Xra89LuXX_4LAAD__-qYOAo=
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJzEmFFv4kYUhd_7K6z7lEiDzMzYQCxVymo3VZFosg08VKqiioVpgspiahsJEuW_V4BWTmx8zwy208ex-TxnLnOO7_iF0n-XFNHNH19Hn4a33sWX4Xgy_n106Y1vRjefJ97W--X-7jfv4uLHWHi746Xt7vnSG95Obu7H-xunf3BJglbx3NxOv5uUoj9JkiBFgjQJCkhQSA-C1kk8M2kaJ_ufvByA4XxLUVfQYrXeZPvLD4JmcWIoeqFskS0NRTSZfluaezOdm8TvkqC5yaaL5WGa7e75ert7_mv9j9mRoM_xcvN9lUYHdSRovJ7uRx1f0cOroHiT5bOk2fTRUCRfxXlKwqaVKBclXxZptljNMl8WKnItxXVxjhz7tvOepunTaSSXos-TErYgJaiUkj9qs4qTuUnM_N3DDk-pFKss6parCNtSYVGyXEWvhgpxltBfp-nT2GR3a18X6jXZrU30Jhc-jUYkaGn-zi4Oi7j8OVk8Pv0YkKC7TRZ517Jycf1mS3wbd-K1r8NiGU7OPXg3t7QPAXlOCPiq42vLQHLQ0mtei3LRkueAbD2SrKX0Wo8k2VwYWNStKpIaVGFRsqpIclNRO5Lkh0aSsreiOsuKuuMHlrHgoKXfvBbloiX3omo9Fqyl9FuPBdWcIS3qVhULDaqwKFlVLLipqB0L6kNjQdtbUZ9lxaDjh5ax4KBl0LwW5aIl96JuPRaspQxajwXdnCEt6lYVCw2qsChZVSy4qagdC_pDYyGwt2JwlhXDjmUoOCi5alqJclGS-zBoPRKspVy1HglBc2a0qFtVJDSowqJkVZHgpqJ2JAT_2zeNE7ruTbqOV6mx-mLR3a_MzB_NsVJpvElm5msSzw7THId3B-5wYW7S7HhXHwfD1fHWXuBbWLKw4mFVhOVbOHgHSzdYqlr0VR1a9erQWvO0ZumwDixrTa26teh-HVqDzRKw2xT8X6EDrIpwj4XBovu8NXu8vQYsLSVPX_F0F-RCKVVcvA1oZG6EA3cDHNkb4MjfshSpLgYHNHI4wJHFEQ62O8CRyWUpWN9vWYSXIobDS0aXfMagpfMhIwfAbnzMyD7AS0Hj5Faehm4FOHIrj0O38jh0aylkndzK09CtPA7dCnC0ZXkcupV_wSgJmii-bS3gJbcqvnEFS1d80qgQ9L180qgA4KWkceqbeRo2zgBHnTOPw9aZx5FbVSllXdwKaORWgCO3IhxtWR5HblX8C0YNAM53sgW87Fa-lUVL55NGg1OqBgdk0EdrvqkBdQc0civCgVsBjtwKcHjS5Q_K6KgLjvj1JoeHXYCj0y74RoB2Df-C0ah0fCtbwEtu1XwvW1z6w-tP_wUAAP__SNw9AA==
 
 subtest Except
 
@@ -705,7 +705,7 @@ vectorized: true
           table: xyz@xyz_pkey
           spans: FULL SCAN
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJy8lt9vmlAUx9_3V5Dz1GbX4L2AP0iWtGtdZuJqJz50WXigcldNrDDARNv4vy9gXYvoPRwxvEnhc--Xcz-nh1eI_87Bht7D_eC6f6dd3PadsfNzcKldOL1B72asrbVvo-EPbbV-udR6Dze9-7F2PRj8v73Srp3cM8PRbW-kff2lrYHBIvDlnfcsY7B_AwcGAhgYwMAEBha4DMIomMg4DqL0kdcM6PsrsJsMZotwmaR_dhlMgkiC_QrJLJlLsGHsPc7lSHq-jPQmMPBl4s3m2Tar9ctVGM2evShNcBPMl8-L2M7iOKGX_mzoAtwNg2CZvO3wvvDjWpt68TS_5BUHd-MyiBPvSYLNN-y0pFappKvzJRVHk76vs1wEkS8j6edWclMSe-TA63734qkjk2Go871zGa9DaX9QCBjM5Z_k4opffolmT9PsFzAYLhNby97j43u_v5NBqb4TRImMdG7tl-nz0fXNEjU7VI63RQ-EuAsaQaiL5n6BD25v5bbn5eXi1DbQRUM3ztgIhKwtaiNUzyqOZq2hFXgdrYDUf9cKrVNbQZQ_X0F20Wjo5hldJGRtk12snFUczVqDi6IOF5H671xsn-qiUf58DbKLZkO3zugiIWuH7GLlrOJo1hpcNOpwEan_zsXOqS6a5c_XJLtoNc5oIiFpl2xixaTiaNIaPDTr8BCp_s7D7jk-VQ-sP5JxGCxiWeortJkWTPpPcnsAcbCMJvI-CibZNtvLYcZl3x2-jJPtXbG96C-2t9KA5eF2FZjzSrRVie6qaU6omaDB7SrwXs2otFWJ7qppsU83P9JGDm7uw4YSNtWnZSphwdVbW1X6Qw0j_aGGsf5AaKQ_EBrpj1aV_lDDSH-oYaw_EBrpD4RG-qOttLSjlrRTpT-6VQxXw4jhahgzHKERwxEamwCUsVn8T0qZm1QaHQKkyUnGEc15YYrkVOVCLTpXjxHEdF6YIxTVERpxHaEx2TEcsR3DMd0LM5Sku5rGdFfTqO4IjumO4JjuhUGa172F6F6YKSTdCzOFpLuaxnRX06juCI7pjuCY7oV5StJdTWO6q2lUdwTHdEdwTPfCVM1_azfVuovCbFHq7m4-_QsAAP__uVOELg==
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJy8lt9vokoUx9_vX0HOU5s7BmYAf5DcpL2tmzVxa1d86GZDNlRmq1krLGAibfzfN2DdFtE5jGN4k8Jn5sucz-nhFZLfC3Cg_3A_vB7caRe3A3fifh1eahduf9i_mWiZ9mk8-qKts5dLrf9w07-faNfD4d_ba-3aLT0zGt_2x9r_37QMCCzDgN_5zzwB5ztQIMCAgAkELCBgg0cgisMpT5Iwzh95LYBBsAbHIDBfRqs0_7NHYBrGHJxXSOfpgoMDE_9xwcfcD3isG0Ag4Kk_XxTbrLOXq3X28iP6xfMIN-Fi9bxMnCKPG_n5z5bOwNsQCFfp2xbvKz9m2sxPZuU1ryh4G49AkvpPHBy6IadFtetFXZ8vKjsa9X2d1TKMAx7zoLSSl5PYIwfe97OfzFyejiKd7lVmkkXc-SAREFjwn-nFFb38L54_zYpfQGC0Sh2teI-P7_3-TqbM8bthnPJYp_b-Mf17dH2rxpkdOo63RQ-EuAtbYaQzY_-AD25vl7an9e2i0o2gs5ZunrEVJMK2pVtBPSw7GraBZqBNNANSgF0ztE9tBla_wEzeRrOlW2e0USJsR95G5bDsaNgGbGRN2IgUYGdj51QbzfoFNuVttFq6fUYbJcJ25W1UDsuOhm3ARrMJG5EC7GzsnmqjVb_AlryNduuMLkpE7cm7qBiVHY3agIlWEyYix78zsXeOT9YD6495EoXLhNf6GjXyA-PBE98WIAlX8ZTfx-G02GZ7OSq44usj4Em6vcu2F4Pl9lYesD7cUYEpVaJtJbonpqnEmTE5uKMC752ZLG0r0T0xzfZp4yNtlmBjHzaFsCWuliWEGRVvbav0hxhG-kMMY_2B0Eh_IDTSH22V_hDDSH-IYaw_EBrpD4RG-qMjtLQrlrSr0h89FcPFMGK4GMYMR2jEcITGJoDM2Kz-J5WZm7I0OgSkJqc0jmhOK1OkpCplYtGpeIwgptPKHJFRHaER1xEakx3DEdsxHNO9MkOldBfTmO5iGtUdwTHdERzTvTJIy7q3Ed0rM0VK98pMkdJdTGO6i2lUdwTHdEdwTPfKPJXSXUxjuotpVHcEx3RHcEz3ylQtf2sbYt1ZZbYIdfc2__wJAAD__5mGiSQ=
 
 query T
 EXPLAIN (DISTSQL) (SELECT y FROM xyz) EXCEPT (SELECT x AS y FROM xyz) ORDER BY y
@@ -728,7 +728,7 @@ vectorized: true
           table: xyz@xyz_pkey
           spans: FULL SCAN
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJy8mF9v6jYYxu_3KSJftVpQsJ3wJ9Kkdi3TKnWlAy7ONPUiB7wWiRKWBAlO1e8-AePkEJP3sZukd23TX_zkxc9PDm8s_XfBQjb48nh_fffgXNzejSfjP-8vnYvx4H5wM3G2zm-j4R_OZvvt0hl8uRk8Tr5f2jjX45Prw9HtYOT8-pezZS5bxjP1EL2qlIV_M85cJpjLJHOZz1wWsCeXrZJ4qtI0Tnb_8rYH7mYbFrZdNl-u1tnuz08um8aJYuEby-bZQrGQTaKvCzVS0UwlXpu5bKayaL7YL7PZfrtaJfPXKNkluIkX69dlGu7jjFfR7seWJ9jTu8vidZavkGbRs2Ihf3c_liIwSrExSyFsUtzO02y-nGYeL0ziihcWyJmvW-clSl_O_H8eQn4sRFBrCL80RH6f9TJOZipRs5M77e9SGlOgWeURgqYioEnlEToVIrgfSvl7lL6MVTZcebIwqcl2pcKjBq7v75nLFuqf7OKKX_6SzJ9f9j8xlw3XWegQz9S12V7jOMlU4kltZD-X3r9nMLNz4_j_pmdCPMSteOX57eKAzy7fP1mem4uE2-rMEy1PGgrNIkfHVmh0DmGTI7cJb1BpxiE6DSqN1-cTNKsypdUYAU2qTGl2ESorjX-G0sD2OipNG5mp0oR5l4W1U2TL8w2dYpGja-0UMoewyZHXWTToFOMQ3QadIuorNJpVmVNqjIAmVeYUuwiVnSI-wylgex2doo3M1CnSvMvS2il-ywsMnWKRo2ftFDKHsMmR11k26BTjEL0GnSLrKzSaVZlTaoyAJlXmFLsIlZ0iP8MpYHsdnaKNzNQpvnmXfWunBC1Do1ik6FsbhUghbFLkVfYb9IlxiH6DPvHrKzOaVZlPaoyAJlXmE7sIlX3if4ZPwPY6-kQb2Ue-yjlz_5FKV_EyVUbf0rR3A1OzZ3X4ANJ4nUzVYxJP98scfh3uuf0fZirNDlfF4Ze75eHSLuCPMCdhScOiCPMfYf8E5nYwl1VowSvR_Sq07NK0JOmgCszByGlaiCq0bFeiezTtk9u0Q8OBBSyKcIeEu3RBuiQMnrlHwj6nl-6TNAc0p6XCkVU0rdiYAdBIDQBHbkA4kAPAkR04LRegB0AjPwAcCQLgyBAIB3XhmmFOtywaHa2YAq5pgtOS4R1QGFoz6NFpz_A-WJw2jWgDXFONVdlpGpadxmHZAY7KTuOo7EKzrE3ZAY3KDnBUdoCjsiMc7HhBn1sFOj1qqqFwreyCVo3wwbGZVg16dNo0AhxJBG0a0QO4phqrMz9Nw0M_jcNTP8DRsZ_GYdk1y1qVnaZh2Wkclp3GYdkBjnY8fZaV4GOX9Fm2gGtll-AVGRyFJa0a8OiSNo0MwOK0aSQ4lUhNNTZlBzQqO8BR2REOyg5w-JKvWdbqLZ-m4Ws-jcP3fBqHL_oARzuePstK9LnRZ9kCrpedVo0PjsI-rZrioz-9__RfAAAA___2XBM-
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJy8mF9v6jYYxu_3KSJftVpQsJ3wJ9Kkdi3TKrHSARdnmqqJA16LxiEsCRK06nefgHFSYvI-dpP0rm36i5-8-PnJ4ZUl_y5YyHpfHvrXd_fOxe3daDz6vX_pXIx6_d7N2Nk6vwwHvzmb7cul0_ty03sYf7-0ca5HJ9cHw9ve0Pn5D2fLXLaMZup-8k0lLPyTceYywVwmmct85rKAPbpsFUdTlSRRvPuX1z1wN9uwsOmy-XK1Tnd_fnTZNIoVC19ZOk8XioVsPPm6UEM1manYazKXzVQ6mS_2y2y2L1eb7ctfq3_ULsJNtFh_WybhPs9oNdn92PAEe3xzWbROsyWSdPKkWMjf3I_FCMxibMxiCJsYt_MknS-nqcdzs7jiuQUy5uvWeZ4kz2f-PwshPxYiqDSEXxgiu896GcUzFavZyZ32dymMKdCssghBXRHQpLIIrRIR3A-l_HWSPI9UOlh5Mjep8XalwqMIrvt95rKF-ju9uOKXP8Xzp-f9T8xlg3UaOsQztW221yiKUxV7UhvZj4X37xjM7Nw4_r_pmRD3USNaeX4zP-Czy3dPlufmJuHWQvNEw5OGSrMI0rJWGh1E2ATJfMJrlJpxiFaNUuPVGQXNqkhqFUZAkyqSml2E0lLjnyE1sL2OUtNGZio1YV5mYW8V2fB8Q6tYBGnbW4UMImyCZIUWNVrFOES7RquI6iqNZlVklQojoEkVWcUuQmmriM-wCtheR6toIzO1ijQvs7S3it_wAkOrWATp2FuFDCJsgmSFljVaxThEp0aryOoqjWZVZJUKI6BJFVnFLkJpq8jPsArYXkeraCMztYpvXmbf3ipBw9ApFjG69k4hYgibGFmZ_RqNYhyiW6NR_OrqjGZVZJQKI6BJFRnFLkJpo_ifYRSwvY5G0Ub2ka90ztx_qJJVtEyU0bc1zd3A1OxJHT6AJFrHU_UQR9P9ModfB3tu_4eZStLDVXH45W55uLQL-B7mJCxpWORh_h72T2BuB3NZhha8FN0tQ8s2TUuSDsrAHIycpoUoQ8tmKbpD0z65TVs0HFjAIg-3SLhNF6RNwuCZOyTsc3rpLklzQHNaKhxZRdOKjRkAjdQAcOQGhAM5ABzZgdNyAXoANPIDwJEgAI4MgXBQF64Z5nTLotHRisnhmiY4LRneAoWhNYMenfYM74LFadOIJsA11ViVnaZh2Wkclh3gqOw0jsouNMvalB3QqOwAR2UHOCo7wsGOF_S5VaDTo6YaCtfKLmjVCB8cm2nVoEenTSPAkUTQphEdgGuqsTrz0zQ89NM4PPUDHB37aRyWXbOsVdlpGpadxmHZaRyWHeBox9NnWQk-dkmfZXO4VnYJXpHBUVjSqgGPLmnTyAAsTptGglOJ1FRjU3ZAo7IDHJUd4aDsAIcv-Zplrd7yaRq-5tM4fM-ncfiiD3C04-mzrESfG32WzeF62WnV-OAo7NOqyT_649sP_wUAAP__00wYNA==
 
 # EXCEPT ALL and EXCEPT with MergeJoiner.
 query T
@@ -749,7 +749,7 @@ vectorized: true
       table: xyz@xyz_pkey
       spans: FULL SCAN
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJy8ll1r2zAUhu_3K8S5akHBkWynjWHQrs1YIGu6JBcdwxdurDWBNPIsB-qW_PdhZ9DmS8eagu7i2o_06uiBvm-g_iwggt7D_eC6f0fObvvjyfjH4JycjXuD3s2ElOTraPidvJSvZDi67Y3Il5-kPCe9h5ve_YRcDwbIl0BhKVNxlzwLBdEvYECBAwUfKARAIYSYQpbLqVBK5tUnbzXQT18galOYL7NVUf05pjCVuYDoDYp5sRAQwSR5XIiRSFKRe22gkIoimS_qbV7K16ssnz8neQkUbuRi9bxUEakexllS_Wx5HOI1Bbkq_u3wvvBjSWaJmm0vecUgXscUVJE8CYjYmv5f0tB1Un406fs6q6XMU5GLdGuluCKxTw4c91uiZmNRDDOP7dzLpMxE9MEeoLAQv4uzK3b-OZ8_zepfQGG4KiJSn-Pjud_P5Fuc6UDgO9mSmcfC3dMf3DvY2ps1v3lmevMeb3n-CS01yNpxn5UfzerAU-bCU958_tx4_n7LC07oikHWC_dZ-dGsDlzhLlzxm8_fN55_0PLCE7pikPXSfVZ-NKsDV3wXrgTN5x8Yzz9sndAUg6Rd10n50aQOPAlc96QDcUZCZXKpRKMW1K4OJNInsRmQkqt8Ku5zOa232TwOa67-X54KVWze8s1Df7l5VQVsDnds4K4NzKxys1BPM4ORcTO4YwN3bWBmlXtnZHs036XbH2lfP29fC7PtmbV36cBGcD2MCK6HEcH1MCY4QiOChzaC62FEcD2MCK6HMcERGhG8YyP4hY2iehhRVA8jiuphTFGERhS9tFFUDyOK6mFEUT2MKYrQiKJdG0WZVU9AaERShEYsRWhMUwzHuoJdWbBrC3Z1wbIv2BUGZtUY2F5lMLJVT2O26mnMVj2N2orgmK0mZWn_zkzakimN2WrUl4xxzNa98qC1NV5_-hsAAP__RSqBOA==
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJzEll1r2zAUhu_3K8S5akHBkWynjWHQrs1YIGu6JBcdwww31pqwNPIsB-KW_PdhZ9DmS8eagnMX136kVzoP9H0F9WcGAXQe7nvX3TtydtsdjobfeufkbNjpdW5GJCefB_2vZJm_kP7gtjMgn76T_Jx0Hm469yNy3eshXwKFuYzFXfQsFAQ_gAEFDhRcoOABBR9CCkkqx0IpmRafvJZAN15C0KQwnSeLrPhzSGEsUwHBK2TTbCYggFH0OBMDEcUidZpAIRZZNJ2V2yzzl6tl_vIz-S1yoHAjZ4vnuQpI8TBMouJnw-EQrijIRfZvi7eVH3MyidRkc80rBuEqpKCy6ElAwFb0_6L6tUflB6O-rbOYyzQWqYg3VgoLEvtkz3m_RGoyFFk_cdjWZEZ5IoJ3_gCFmfiVnV2x84_p9GlS_gIK_UUWkPIc78_9dibX4kx7At_Jhkwc5m-ffu_e3sberPromfHoHd5w3CN6ahC2dYKw_GDYGkxldZjKqw-Amw_AbTjeEW0xCHtxgrD8YNgabOF12OJWH4BrPgCv4fhHtMUg7OUJwvKDYWuwxa3DFq_6ADzzAfiNI7piELVde1R-MGoNpnh196U9cQZCJXKuRKU21CwOJOInsb4gJRfpWNynclxus37sl1z5Hz0WKlu_5euH7nz9qghYHW7ZwG0bmFnlZr6eZgZXxs3glg3ctoGZVe6tK9uh-TbdfE-7-vt2tTDbvLPmNu3ZCK6HEcH1MCK4HsYER2hEcN9GcD2MCK6HEcH1MCY4QiOCt2wEv7BRVA8jiuphRFE9jCmK0IiilzaK6mFEUT2MKKqHMUURGlG0baMos-oJCI1IitCIpQiNaYrhWFewKwt2bcGuLlj2BbvCwKwaA9upDEa26mnMVj2N2aqnUVsRHLPVpCztzsykLZnSmK1GfckYx2zdKQ9aW8PVh78BAAD__-Sohi4=
 
 query T
 EXPLAIN (DISTSQL) (SELECT y FROM xyz ORDER BY y) EXCEPT (SELECT y FROM xyz ORDER BY y)
@@ -769,7 +769,7 @@ vectorized: true
       table: xyz@xyz_pkey
       spans: FULL SCAN
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJy8mF1v4kYUhu_7K6xzlUhGZmZsIJYqZZtQNRINKXCxVZULL54mSAS7tpHCRvnvFaCVFzs-rye2uQsfD_POyTyHM7xR-t-afBp_fZh8ubu3Lm7v5ov5X5NL62I-noxvFtbO-n02_dN63X23prPb8cz67W9rd2mNv96MHxbgXWTTJgr1ffCiU_L_IUE2SbJJkU0u2eTRo01xEi11mkbJ_i1vB-AufCW_b9NqE2-z_dOPNi2jRJP_RtkqW2vyaRF8W-uZDkKdOH2yKdRZsFoflnndfb-Ok9VLkOzIpptovX3ZpL61fzCPg_2fPUfS47tN0TbLV0iz4EmTL97tz6Xw2kwhTVLcrtJstVlmjihU4loUFsiZbzvrOUifP3h_HkJ9LoTXagi3MkT-OdtNlIQ60eHJJx0-pTKmRLXKI3hdRUCVyiMMGkSwP5XyjyB9nutsGjuqUKnFLtb-jw7wZTIhm9b63-ziWlz-mqyeng9_kU3TbeZbzJ6G7Zb1PupFsaO84u4_XHt0sraob7kwtdyRPUfV7DYGOQbt5pAmOXLVRYf9pnaIQYf9RrQnO6pVVb9pMQKqVFW_MYvQuN-Ic_QbWd81aeya6jluTecNcgzbzSFNcuS6yQ6drx1i2KHzsj3hUK2qnG8xAqpUlfNmERo7L8_hvKrvmjJ2ze05Xk3nDXKM2s0hTXLkuqkOna8dYtSh86o94VCtqpxvMQKqVJXzZhEaO6_O4bxb3zXX2DWvV9N4gxRXbaaQJily1dwOfa8d4qpD3932ZEO1qvK9xQioUlW-m0Vo7Lt77t8RPogz02kcbVJd61eC_n5DOnzSxwKl0TZZ6ockWh6WOT6cHrjDE6FOs-Or8vjgbnN8aR_wZ1iwsOJhWYTFz7B7AgszWMhG9FUTWg6a0ErxtGJprwksGi0t-43oYRNagcPisscU_L88A1gW4QELg00PebsGvF4jlhZ9nr7iaQH6QqmrmLgNaCQ3woHdAEd6Axz5LUot1URwQCPDAY4URzg47gBHkotSYz09sggvtRgOL4ku-B6Dts43GTEEuvFtRowAXmo0RrbyNLQV4MhWHoe28ji0tdRkjWzlaWgrj0NbAY6OLI9DW_kvGCnAEAXGVsHbKvnBFWxd8p1GumDu5TuN9ABe6jRGczNPw8EZ4Ghy5nE4OvM4slWWuqyJrYBGtgIc2YpwdGR5HNkq-S8YOQI4P8kW8LKt_CiLts53GgVGWcV3GgVuyIofakDdAY1sRTiwFeDIVoDDmy5_UUZXXXDFb7Y4vOwCHN12wW8E6NTwXzAKlY4fZQt4yVbFz7LFrT--__J_AAAA__8TWRJ9
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJy8mF1v4kYUhu_7K6xzlUhGZmZsIJYqZZtQNRINKXCxVRVVLJ4mqCx2bSPFifLfK0ArJ3Z8Xk9scxc-Huadk3kOZ3ih5L8N-TT-ejf5cnNrnV3fzBfzPybn1tl8PBlfLazM-nU2_d16yp6t6ex6PLN--dPKzq3x16vx3QK8i2zahoG-XX7XCfl_kSCbJNmkyCaXbPLo3qYoDlc6ScJ4_5aXA3ATPJHft2m9jXbp_ul7m1ZhrMl_oXSdbjT5tFh-2-iZXgY6dvpkU6DT5XpzWOYpe758yp7_jv7VGdl0FW5237eJb-0fzKPl_s-eI-n-1aZwl-ZLJOnyQZMvXu3PxfBajSFNYlyvk3S9XaWOKNTiUhQWyJlvmfW4TB4_eH8eQn0uhNdqCLcyRP45u20YBzrWwbtPOnxKZUyJapVH8LqKgCqVRxg0iGB_KuVvy-RxrtNp5KhCpRZZpP0fPeDLZEI2bfQ_6dmlOP85Xj88Hv4im6a71LeYPQ3bLett2AsjR3nF3X-49ujd2qK-5sJYc0f2HFWz3xgEGbQcRJoEyWUXHXac2iEGHXYc0Z7uqFZVHafFCKhSVR3HLELjjiNO0XFkfdmkuWyq57g1rTcIMmw5iDQJkgsnO7S-dohhh9bL9pRDtaqyvsUIqFJV1ptFaGy9PIX1qr5sylw2t-d4Na03CDJqOYg0CZILpzq0vnaIUYfWq_aUQ7Wqsr7FCKhSVdabRWhsvTqF9W592Vxz2bxeTecNYly0GkOaxMhlczs0vnaIiw6Nd9vTDdWqyvgWI6BKVRlvFqGx8e6pf0_4IM5MJ1G4TXStXwv6-w3p4EEfC5SEu3il7-JwdVjm-HB64A5PBDpJj6_K44Ob7fGlfcC3sGBhxcOyCIu3sPsOFmawkI3oiya0HDShleJpxdJeE1g0Wlr2G9HDJrQCh8Vljyn4f3kGsCzCAxYGmx7ydg14vUYsLfo8fcHTAvSFUlcxcRvQSG6EA7sBjvQGOPJblFqqieCARoYDHCmOcHDcAY4kF6XG-v7IIrzUYji8JLrgewzaOt9kxBDoxrcZMQJ4qdEY2crT0FaAI1t5HNrK49DWUpM1spWnoa08Dm0FODqyPA5t5b9gpABDFBhbBW-r5AdXsHXJdxrpgrmX7zTSA3ip0xjNzTwNB2eAo8mZx-HozOPIVlnqsia2AhrZCnBkK8LRkeVxZKvkv2DkCOD8JFvAy7byoyzaOt9pFBhlFd9pFLghK36oAXUHNLIV4cBWgCNbAQ5vuvxFGV11wRW_2eLwsgtwdNsFvxGgU8N_wShUOn6ULeAlWxU_yxa3fv_60_8BAAD__--aF3M=
 
 # EXCEPT ALL and EXCEPT with no overlap.
 query T
@@ -799,7 +799,7 @@ vectorized: true
               table: xyz@xyz_pkey
               spans: FULL SCAN
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJzEmF1v4kYUhu_7K6xzlahGZmbMl6WVss2yWiQaUkDqVi0XXpgmSART20iQKP-9MmxIsMm8PoaYO76emZOX85wZ8kTRfzPyqP39tvu5c2NdfOkMhoM_upfWxaDdbV8PrZX1td_73VqtH60_v7X7bWtl_bOsVtXYkpdW-_t1-3Zofe524ef1pwTo9b-0-9Zvf1krsmkeTPSN_6Aj8v4mQTZJskmRTS7ZVKORTYswGOsoCsLkI08boDNZkVe1aTpfLOPk5ZFN4yDU5D1RPI1nmjwa-j9muq_9iQ6dKtk00bE_nW22Wa0frxbh9MEP12TTdTBbPswjb1POYOEnDyuOpNGzTcEyft0hiv07TZ54tvNX8XU6i3WoQ6e2X8L2dc-6ErskPc_r3AybqX1fl_qxtu796H5_nStBo-fX2iSntrcJiZNGpApFJEBGSfecIiT33epe11nOg3CiQz3ZW2mUkOgjB_7Eb350P9Bxb-HIVM7D9UJ7bxQim2b63_jiSlx-Cqd395tHZFNvGSdBvJt4jZP4IAhjHTqylo7p13fXr-fI7FAcPxc9UMRNUAkWjqqmAz64fWNve8Hoa25bO7LiqJzugzp2jV0_g_ucjE4ckioUkgApfYz9olz7RRn2g8Rf7K8XtV_mby3J7ixVcdyc-oE6dp3VOIN-jIzEiUNShUISIKWP0U-Wq58sQz-Q-It-jaL6qfytpdid5VacWk79QB27zmqeQT9GRuLEIalCIQmQ0sfop8rVT5WhH0j8Rb9mUf3c_K3lsjurVskpH6hi11etM8jHSEicNCJVKCIBMvoY9dxy1XPLUA8k_qJe6xQ_Ow-s39fRIphHOtcvymoSmJ7c6e0XEAXLcKxvw2C82Wb7tLfhNi9MdBRv3xXbJ5359q2kwLewSMPiLezuwYIHC3EU3TiGluooumWmpTFxZU5cMRKXPDiVOJduHEOnEufSLTPtGhOvmROvGeG6-buum79roFfDSDfNcPMYN80wchPQwE0zjdwENHCzZZ6GVTAOM8OUYyegkZ4IB34CHAmKcGCoyIzU_eAlCN48U4GkIjNd9jd3weaZ8cI6Bc00PAYBjs5BMw4PQoAD24R5too6CD4zXVm6mWmoG8CRbmYc6gZwpJv5ZBHgaBGZIcvSzTxkJRiykjNks5cv1pBl40A3gCPdEI4unuYhK8GQlZkhy9EN0Eg3hAPdAI50QzjQTZoPGAkOGGm-vwLdpHnISjBkJWfIZjdnDVk2jnRjDVk2jnQzD1kJhqzkXOCzLce6wbNxpBvrDs_GkW7mA0aBA0aZ_yWS1m30_Mv_AQAA__8No95a
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJzEmF1v4kYUhu_7K6xzlahGZmbMl6WVss2yWiQaUkDqVi2qWJgmqCx2bSNBovz3yrAhwSbz-hhi7vh6Zk5eznNmyCNF_83Jo_bX2-7Hzo118akzGA5-615aF4N2t309tFbW537vV2u1frB-_9Lut62V9deyWlUTS15a7a_X7duh9bHbhZ_XHxKg1__U7lu__GGtyKaFP9U34-86Iu9PEmSTJJsU2eSSTTUa2RSE_kRHkR8mH3ncAJ3piryqTbNFsIyTl0c2TfxQk_dI8Syea_JoOP421309nurQqZJNUx2PZ_PNNqv1w9Vq_fB38K9ek03X_nz5fRF5m3oGwTh5WHEkjZ5s8pfxyxZRPL7T5IknO38Zn2fzWIc6dGr7NWxf96wrsYvS87zOzbCZ2vdlqW9r634c3e-vcyVo9PRSm-TU9joicdqMVKGMBAgp6Z9TpOS-Wd3LOsuFH051qKd7K40SEn3kwJ_4ZRzdD3TcCxyZCnq4DrT3SiKyaa7_iS-uxOWHcHZ3v3lENvWWcRLEm4nXOIkP_DDWoSNr6Zh-fnP9eo7MDsXxY9EDRdz4FT9wVDUd8MHtG3vbC0Zjs_vakRVH5bQfFLLr7PoZ7OeEdOqUVKGUBIjpffwX5fovyvAfJP7sf72o_zJ_b0l-a6mK4-YUEBSya63GGQRkhCROnZIqlJIAMb2PgLJcAWUZAoLEnwVsFBVQ5e8txW8tt-LUcgoICtm1VvMMAjJCEqdOSRVKSYCY3kdAVa6AqgwBQeLPAjaLCujm7y2X31q1Sk79QBm7xmqdQT9GROK0GalCGQkQ0vvI55Yrn1uGfCDxZ_lap_j5eWD9vo4CfxHpXL8sq0lgenqnt19A5C_Dib4N_clmm-3T3obbvDDVUbx9V2yfdBbbt5ICX8MiDYvXsLsHCx4sxFF04xhaqqPolpmWxsSVOXHFSFzy4FTiXLpxDJ1KnEu3zLRrTLxmTrxmhOvm77pu_q6BXg0j3TTDzWPcNMPITUADN800chPQwM2WeRpWwTjMDFOOnYBGeiIc-AlwJCjCgaEiM1L3g5cgePNMBZKKzHTZ39wFm2fGC-sUNNPwGAQ4OgfNODwIAQ5sE-bZKuog-Mx0ZelmpqFuAEe6mXGoG8CRbuaTRYCjRWSGLEs385CVYMhKzpDNXr5YQ5aNA90AjnRDOLp4moesBENWZoYsRzdAI90QDnQDONIN4UA3aT5gJDhgpPn-CnST5iErwZCVnCGb3Zw1ZNk40o01ZNk40s08ZCUYspJzgc-2HOsGz8aRbqw7PBtHupkPGAUOGGX-l0hat9HTT_8HAAD__2ST41A=
 
 query T
 EXPLAIN (DISTSQL) (SELECT x FROM xyz WHERE x < 2) EXCEPT (SELECT x FROM xyz WHERE x >= 2) ORDER BY x
@@ -828,7 +828,7 @@ vectorized: true
               table: xyz@xyz_pkey
               spans: FULL SCAN
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJy82Ftv4kYcBfD3fgprnhLVyMzFXCytlG3CapFoSAGpW7V5YGGaIBFMbSPBRvnuFbDgcPH_eBg7bwF8PGf-O_zE-pXF_01ZwFrfHjqf2_fO1V27P-j_0bl2rvqtTut24CydL73u785y9cP582ur13KWzj-LalWOHHHttL7dth4G8Fr9aX1xt3fX6jm__eUsmctm4VjfD190zIK_GWcuE8xlkrlMMZf57NFl8ygc6TgOo_Ulr5tAe7xkQdVlk9l8kazffnTZKIw0C15ZMkmmmgVsMPw-1T09HOvIqzKXjXUynEw3yyxXP27m0eRlGK2Yy27D6eJlFgebOv35cP1nxRPs8c1l4SJJV4iT4ZNmAX9z87f4MpkmOtKR5x9W2L4fODd8P8UgCNr3g0bmusJk3fe754VuX160fQ72vz4ZaADKZOW7SZxMZqPEE0e7v-FHC6SZ7yvneRg_n7k-LeFfVsIvtEQts0R6n8UsjMY60uODO23ukllTolmlFeplVUCTSis0LCq4F7X8Ooyf-zrpzj11NKnBaq6DHYOfOx3msqn-N7m64defosnT8-Yv5rLuIlkf-sw9NU2OVz-MEh156mRkv2bjVc0xtHPz-HnXMy3uw0o49_zq8YTPr3-oJzdQzBQxT1Q8mVNx0GPPWK1gxU32X_AA5EUD4GAC5o6DlVNCeYmO5y5RK9FxXhyiaFZZjhdYAU0qy3GzCtaO849wHByvneMnI8vtuMjviDBmRFY8ldNR0GPPSL1gRw32zwsegLxoABxMwNxRsHJKmCjR0dwl6iU6KopDDM0qy9ECK6BJZTlqVsHaUfERjoLjtXP0ZGS5HZX5HZHGjKiK5-d0FPTYM9Io2FGD_fOCByAvGgAHEzB3FKycEiZLdDR3iUaJjsriEEOzynK0wApoUlmOmlWwdlR-hKPgeO0cPRlZbkdVfkeUMSN-JaeioMUekWbBihrsnhe6fXnR9jnYv7mhYOWUL1WioblLNEs0VBUHGJpVlqEFVkCTyjLUrIK1oeojDAXHa2foycguejZ7ZoGejufhLNa5HrtW1xPT4ye9_ReIw0U00g9RONoss33Z3eQ2b4x1nGw_5dsX7dn2o3XB92FOhhUdFmRY0mFJhn06rI7D_H24dhDmZmFet0kLq7S0SiuQ9sm0VZg3bNLCKi2t0gqka-QxBeG6QVgchxtkuEl_QZo0ClW6N6dN8REqtCpcgDjtCgc2cFoWDlDjJ1-yw3gNxOnjBmgCaWQTiCOcQBzpBOKIJ37yVTPxCaQRUCCOhAJxRBSII6M47QxvgjgtzVH8xClOWyOq4EcE-P0CqBK0NQJYI2hrBLBG0NYI9AOKtkYAa4SVNSCNrAFxZA2II2tAHFkjrKwBaWQNiCNrQBxZA-LIGkFbI4A1grZGAGsEbY0E1kg7ayRtjQTWSPD_JWCNpK2RwBpJWyOBNdLKGpBG1oA4sgbEkTUgjqyRVtaANLIGxJE1II6sAXFkjaStkcAaSVsjgTWStkYBa5SdNQo8mQHWKNoahZ6v0NYoYI2irVHAGmVlDUjD5zt21oA4fMJjZ42ysgakkTUgjqwBcWQNiCNrFG2NAtYo2hoFrFG0NT6wxje05vHtl_8DAAD___lvbPU=
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJy82Ftv4kYfBvD791NYc5XoNTJzMAdLK2WbsFokGlJA6lZtVLEwTVBZTG0jQaJ89wooOBz8fzyMnbsAfjz_eXb4ifUri_-ZsoC1vj10Prfvnau7dn_Q_6Vz7Vz1W53W7cBZOl963Z-d5erF-fVrq9dyls4fi2pVjhxx7bS-3bYeBvBa_Wl9cbd31-o5P_3mLJnLZuFY3w9_6JgFvzPOXCaYyyRzmWIu89mjy-ZRONJxHEbrS143gfZ4yYKqyyaz-SJZv_3oslEYaRa8smSSTDUL2GD4fap7ejjWkVdlLhvrZDiZbpZZrl5ulquXP-d_6xVz2W04XfyYxcFmnv58uP6z4gn2-OaycJGkS8TJ8EmzgL-5-cf4MpkmOtKR5x_OsH0_cG74vsYgCNr3g0bmusJk3ffb58XuX160fw4KWJ8N1IAyWfluEieT2SjxxNH2b_jRAmnm-8p5HsbPZ65Ph_AvG8IvdIha5hDpfRazMBrrSI8P7rS5S-aYEnWVjlAvawTUVDpCw2IE96Ipvw7j575OunNPHTU1WM11sIPwc6fDXDbVfyVXN_z6UzR5et78xVzWXSTrQ5-5p6bJ8eqHUaIjT51U9v9svao5SjvXx393PTPFfVgJ555fPW74_PqHfHIDxowV80TFkzkdB4PsHasV7LhJAUU3IC9qgIMKzCUHK6eI8hIlzz1ErUTJeXGMoq6yJC9wBNRUluRmI1hLzj9CcnC8dpKfVJZbcpEfEmHuiKx4KqekYJC9I_WCJTUogBfdgLyoAQ4qMJcUrJwiJkqUNPcQ9RIlFcUxhrrKkrTAEVBTWZKajWAtqfgIScHx2kl6UlluSWV-SKS5I6ri-TklBYPsHWkULKlBAbzoBuRFDXBQgbmkYOUUMVmipLmHaJQoqSyOMdRVlqQFjoCaypLUbARrSeVHSAqO107Sk8pyS6ryQ6LMHfErOR0FY-wVaRbsqMH2ebH7lxftn4MCzBUFK6eAqRIVzT1Es0RFVXGEoa6yFC1wBNRUlqJmI1grqj5CUXC8doqeVHbRM9ozC_R0PA9nsc71-LW6bkyPn_T2XyAOF9FIP0ThaLPM9mV3k9u8MdZxsv2Ub1-0Z9uP1gO-D3MyrOiwIMOSDksy7NNhdRzm78O1gzA3C_O6TVpYpaVVWoG0T6atwrxhkxZWaWmVViBdI48pCNcNwuI43CDDTfoL0qRRqNJzc9oUH6FCq8IFiNOucGADp2XhADV-8iU7jNdAnD5ugCaQRjaBOMIJxJFOII544idfNROfQBoBBeJIKBBHRIE4MorTzvAmiNPSHMVPnOK0NaIKfkSA3y-AKkFbI4A1grZGAGsEbY1AP6BoawSwRlhZA9LIGhBH1oA4sgbEkTXCyhqQRtaAOLIGxJE1II6sEbQ1AlgjaGsEsEbQ1khgjbSzRtLWSGCNBP9fAtZI2hoJrJG0NRJYI62sAWlkDYgja0AcWQPiyBppZQ1II2tAHFkD4sgaEEfWSNoaCayRtDUSWCNpaxSwRtlZo8CTGWCNoq1R6PkKbY0C1ijaGgWsUVbWgDR8vmNnDYjDJzx21igra0AaWQPiyBoQR9aAOLJG0dYoYI2irVHAGkVb4wNrfENrHt_-928AAAD__yHBces=
 
 # EXCEPT ALL and EXCEPT with some overlap.
 query T
@@ -858,7 +858,7 @@ vectorized: true
               table: xyz@xyz_pkey
               spans: FULL SCAN
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJzEmF1v4kYYhe_7K0bvVaIamZkxX5ZWYptltUg0pIDUrVouvHiaIBHs2kaCRPnvFbCBYJM5HkPMXfh4PC-Hec6YPFP834xc6ny_633u3rKrL93haPhH75pdDTu9zs2IrdjXQf93tlw9sT-_dQYdtmT_LKpVqT4xfs063286dyP2udeDwITJa9YffOkM2G9_sRVZNA98des9qpjcv4mTRYIskmSRQxbVaGxRGAUTFcdBtH7L8wbo-ktyqxZN5-EiWT89tmgSRIrcZ0qmyUyRSyPvx0wNlOeryK6SRb5KvOlss8xy9dQOo-mjF60nuAlmi8d57LKltZloGHrrRxVb0PjFomCR7BeJE-9ekctfrPyDfJ3OEhWpyK4dTrF93mVtvg_Tdd3u7ahJFvUXicva6RH2V_2xYg9e_HB4yTan8ct-TGEy5tu8-LkDk4UC4yCxCZPnDcx5d8z9dRbzIPJVpPyDK43XJHrLkc_6zYsfhirph7ZIZT5ahcp94xZZNFP_Jldtfv0pmt4_bP7afW7-bvQ1k-iHQZSoyBa1dEy_vnv9eo7MjsXx86JHhrgNKkFoy2o64KPLNw6W5wZ7vMAWt0XFljlbAYyy2-T1y7aCSWLnj0wWioyDzD64F3i5vcDL6AUQ_Wsv1Iv2gsi_zUSRXSYrtpNTTDDKbpc1LiumQWL8_JHJQpFxkNkHiynKFVOUISaI_lXMRlExZf5tJovsMqdi13KKCUbZ7bLmZcU0SIyfPzJZKDIOMvtgMWW5YsoyxATRv4rZLCqmk3-bOUV2Wa2SU0swyG6PtS6rpUFe_NyByUKBcZDYB0vplCulU4aUIPpXKVvn-Hl75PoDFYfBPFa5frlW14Ep_15tv4A4WEQTdRcFk80y24f9Dbd5wldxsn2Vbx9059uX1gO-hXka5m9h5wDmZjDnJ9GNU2ghT6JbelpoE5f6xKVB4sIMTiVuSjdOoVOJm9ItPe1oE6_pE69p4br-u67rv2ugV0NLN_Vw8xQ39TByE9DATT2N3AQ0cLOlb8MqqMNMmZrYCWikJ8KBnwBHgiIcGMozlXoYvADB6zsVSMoz7XK4uAMWz9SL0Smop-ExCHB0DupxeBACHNjG9d3K6yD4TLsa6aanoW4AR7rpcagbwJFu-pOFg6OFZ0rWSDd9yQpQssKkZLM3X0Yla4wD3QCOdEM4uvHUl6wAJSsyJWuiG6CRbggHugEc6YZwoJvQHzACHDBCf_8KdBP6khWgZIVJyWYXNypZYxzpZlSyxjjSTV-yApSsMLmBz245ozt4YxzpZnQPb4wj3fQHjAQHjNT_SySt2_jll_8DAAD__5RZ_pc=
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJzEmF1v4kYYhe_7K0bvVaIamZkxX5ZWYptltUg0pIDUrVpUefE0QWWxaxsJEuW_V8AGgk3meEwwd-Hj8bwc5jlj8kTxfzNyqfP1rvexe8uuPnWHo-FvvWt2Nez0OjcjtmKfB_1f2XL1yH7_0hl02JL9tahWpfrA-DXrfL3p3I3Yx14PAhMmr1l_8KkzYL_8wVZk0Tzw1a33XcXk_kmcLBJkkSSLHLKoRmOLwiiYqDgOovVbnjZA11-SW7VoOg8XyfrpsUWTIFLkPlEyTWaKXBp532ZqoDxfRXaVLPJV4k1nm2WWq8f2cvX4d_ivWo9wE8wW3-exy5bWZqRh6K0fVWxB42eLgkWyXyVOvHtFLn-28k_yeTpLVKQiu3Y4xvZ5l7X5Pk3Xdbu3oyZZ1F8kLmunR9hf9duKPXjxw-El25zGz_sxhcmYrwPj756YLJQYB5FNmHzfxJw3x9xfZzEPIl9Fyj-40nhNorcc-axfvPhhqJJ-aItU6KNVqNxXdpFFM_VPctXm1x-i6f3D5q_d5-ZvRl8ziX4YRImKbFFLx_Tzm9ev58jsWBw_LnpkiNugEoS2rKYDPrp842B5brDJi-xxW1RsmbMXwCy7XV6_bC-YRHaGzGShzDgI7czNwMttBl5GM4DoX5qhXrQZRP59JgptM1mxnZxqgll226xxWTUNIuNnyEwWyoyD0M6spihXTVGGmiD6FzUbRdWU-feZLLTNnIpdy6kmmGW3zZqXVdMgMn6GzGShzDgI7cxqynLVlGWoCaJ_UbNZVE0n_z5zCm2zWiWnmGCS3SZrXVZMg8D4uycmCyXGQWRn1tIpV0unDC1B9C9att7jZ-6R6w9UHAbzWOX6BVtdB6b8e7X9AuJgEU3UXRRMNstsH_Y33OYJX8XJ9lW-fdCdb19aD_ga5mmYv4adA5ibwZyfRDdOoYU8iW7paaFNXOoTlwaJCzM4lbgp3TiFTiVuSrf0tKNNvKZPvKaF6_rvuq7_roFeDS3d1MPNU9zUw8hNQAM39TRyE9DAzZa-DaugDjNlamInoJGeCAd-AhwJinBgKM9U6mHwAgSv71QgKc-0y-HiDlg8Uy9Gp6CehscgwNE5qMfhQQhwYBvXdyuvg-Az7Wqkm56GugEc6abHoW4AR7rpTxYOjhaeKVkj3fQlK0DJCpOSzd58GZWsMQ50AzjSDeHoxlNfsgKUrMiUrIlugEa6IRzoBnCkG8KBbkJ_wAhwwAj9_SvQTehLVoCSFSYlm13cqGSNcaSbUcka40g3fckKULLC5AY-u-WM7uCNcaSb0T28MY500x8wEhwwUv8vkbRu4-ef_g8AAP__3foDnA==
 
 query T
 EXPLAIN (DISTSQL) (SELECT y FROM xyz WHERE x >= 1) EXCEPT (SELECT y FROM xyz WHERE x < 3) ORDER BY y
@@ -887,7 +887,7 @@ vectorized: true
               table: xyz@xyz_pkey
               spans: FULL SCAN
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJy82Ftv4kYcBfD3forRPCWqkZmLCVhaKduE1UaiIQWkbtXmgYVpgkQwtY0EG-W7V8CCw8X_Y3vsvC2Xg8-eHX5i_cqj_6bc5-1vD53Pd_fs4vauP-j_0blkF_12p30zYCv2pdf9nS1XP9ifX9u9Nluyfxb1ujKfmLhk7W837YcBfPOIqUvW7d22e-y3v9iKO3wWjM398MVE3P-bC-5wyR2uuMM1d7jHHx0-D4ORiaIgXL_ldRO4Gy-5X3f4ZDZfxOunHx0-CkLD_VceT-Kp4T4fDL9PTc8MxyZ069zhYxMPJ9PNZZarH9fzcPIyDNcNboLp4mUW-WzpbBr158P1o5or-eObw4NFnFwkiodPhvvizcle5MtkGpvQhK532GL7vM-uRTKk7_t394Mmd3h3EfvsOr2CzFPh_Rai7DFUoTEEWGPEVPYxdJ4Kt5MonsxGsSuPlrgWRxdIMt9X7HkYPZ95f1LCK1bCK7VEI7VE8jmLWRCOTWjGB5-0-ZTUmgptlVS4qqoCWiqp0LSo4BRq-XUYPfdN3J27-mipwWpu_J2Pnzsd7vCp-Te-uBaXn8LJ0_PmT_sznv53auU5Xv0gjE3o6pPJfk03rZ5htHN7_PzUMy3ug1owd7368cLnr3-IqsghWgHQXFlzVUbfQZU9aY3qfM-zRvlzqEJzCLCHhfCgQoKrqFD4zCUaFQovyuMVbZUmfIkV0FJpwuerYC28-AjhwfHaCX8yWWbhZXZTZBFSVM3VGYUFVfakXFUnbI41RPlzqEJzCLCHhbCgQoKbrFDYzCWuKhRWlscb2ipN2BIroKXShM1XwVpY-RHCguO1E_ZksszCquymqCKk6JrrZRQWVNmT0qxO2BxriPLnUIXmEGAPC2FBhQQ3VaGwmUs0KxRWlccb2ipN2BIroKXShM1XwVpY9RHCguO1E_ZksszC6uym6CKkeLWMvoIie1Ba1fmaYwtR9hiq0BgCrGGhK6iQwKYr1DVziVaFuuryaENbpelaYgW0VJqu-SpY66o_QldwvHa6nkxW6B7wmQv0TDQPZpHJdHu3vl7MjJ_M9l8gChbhyDyEwWhzme3D7ia3eWJsonj7qtg-uJttX1oXfB8WZFjTYUmGFR1WZNijw_o4LN6HGwdhkS8srmzS0iqtrNIapD0ybRUWTZu0tEorq7QG6QZ5TEH4KkdYHoebZLhFf0FaNAp1uregTfEQKrQqQoI47YoANghaFgFQEydfssN4A8Tp4wZoAmlkE4gjnEAc6QTiiCdx8lXL4xNII6BAHAkF4ogoEEdGCdoZ0QJxWpqj-IlTgrZG1sGPCPD7BVAlaWsksEbS1khgjaStkegHFG2NBNZIK2tAGlkD4sgaEEfWgDiyRlpZA9LIGhBH1oA4sgbEkTWStkYCayRtjQTWSNoaBaxRdtYo2hoFrFHg_0vAGkVbo4A1irZGAWuUlTUgjawBcWQNiCNrQBxZo6ysAWlkDYgja0AcWQPiyBpFW6OANYq2RgFrFG2NBtZoO2s0uDMDrNG0NRrdX6Gt0cAaTVujgTXayhqQhvd37KwBcXiHx84abWUNSCNrQBxZA-LIGhBH1mjaGg2s0bQ1GlijaWs8YI2X05rHt1_-DwAA__-dWY0y
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJy82Ftv4kYcBfD3fgprnhLVyMzFXCytxDZhtUg0pIDUrdqoYmGaoBJMbSNBonz3ClhwuPh_bI-dt-Vy8Nmzw0-sX1n434x5rP3tvvu5c2dd3XYGw8Fv3WvratDutm-G1tr60u_9aq3WL9bvX9v9trWy_lpWq1J_svi11f52074fwjePLXlt9fq37b71yx_Wmtls7k_03ehZh8z7k3FmM8FsJpnNFLOZyx5stgj8sQ5DP9i85XUb6ExWzKvabDpfLKPN0w82G_uBZt4ri6bRTDOPDUffZ7qvRxMdOFVms4mORtPZ9jKr9UtrtX75e_Gv3lS48WfL53noWSt7W2mwGG0eVRzBHt5s5i-j-CphNHrUzONvdvomX6azSAc6cNzjGrvnPavF4yU9z-vcDRvMZr1l5Fmt5AoiS4X3Y_DC15C51uBgjrEl06-hslS4nYbRdD6OHHEyRYufXCDOfF9bT6Pw6cL74xJuvhJuoSVqiSXiz1nO_WCiAz05-qTtpyTWlGiruEK9rApoqbhCw6CCnavl11H4NNBRb-Gok6WG64X29kJ-7naZzWb6n-iqxa8_BdPHp-2fDmc8-e_UzHK8Bn4Q6cBRZ5P9nIxaNcVol_b48akXWtz5FX_huNXThS9f_1hVnoG0PKI5ouLIlMKDLgfTauUJn2WOEvaQufbgYBAD40GFmFdeovGpS9RKNJ4XByzaKsn4AiugpZKMz1bB2Hj-EcaD47U3_myy1MaL9KiIXKbIiqNSGgu6HEypl2dshjl4CXvIXHtwMIiBsaBCzJso0djUJeolGiuKAw5tlWRsgRXQUknGZqtgbKz4CGPB8dobezZZamNlelRkLlNUxXFTGgu6HExplGdshjl4CXvIXHtwMIiBsaBCzJss0djUJRolGiuLAw5tlWRsgRXQUknGZqtgbKz8CGPB8dobezZZamNVelRULlPcSkphQZODKM3yhM0wBi98DZlrDQ7mMPAVVIhpUyX6mrpEs0RfVXG4oa2SfC2wAloqyddsFYx9VR_hKzhee1_PJst1L_jCBfo6XPjzUKe6zVvdLKYnj3r3LxD6y2Cs7wN_vL3M7mFvm9s-MdFhtHuV7x505ruXNgXfhzkZVnRYkGFJhyUZdumwOg3z9-HaUZhnC_O6SVoYpaVRWoG0S6aNwrxhkhZGaWmUViBdI48pCNczhMVpuEGGm_QXpEmjUKV7c9oUF6FCq8IFiNOucGADp2XhADV-9iU7jtdAnD5ugCaQRjaBOMIJxJFOII544mdftSw-gTQCCsSRUCCOiAJxZBSnneFNEKelOYmfOcVpa0QV_IgAv18AVYK2RgBrBG2NANYI2hqBfkDR1ghgjTCyBqSRNSCOrAFxZA2II2uEkTUgjawBcWQNiCNrQBxZI2hrBLBG0NYIYI2grZHAGmlmjaStkcAaCf6_BKyRtDUSWCNpaySwRhpZA9LIGhBH1oA4sgbEkTXSyBqQRtaAOLIGxJE1II6skbQ1ElgjaWsksEbS1ihgjTKzRoE7M8AaRVuj0P0V2hoFrFG0NQpYo4ysAWl4f8fMGhCHd3jMrFFG1oA0sgbEkTUgjqwBcWSNoq1RwBpFW6OANYq2xgXWuBmteXj76f8AAAD__7hNkig=
 
 # EXCEPT ALL and EXCEPT with swapped column orders.
 query T
@@ -908,7 +908,7 @@ vectorized: true
       table: xyz@xyz_pkey
       spans: FULL SCAN
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJzEls1u2kwUhvffVVhnlUiDzIxtEix9ElFKVSQa0sAiUsXCwdOARDyux5Zwotx7ZZMf_jrH4wF3aczjeeecZ_G-gPy9BB_697fDq8GNdfZlMJ6MfwzPrXF_2L-eWCti5dbXu9F3a5U_W_376_7txLoaDt_f58RafbwHApEI-U3wxCX4P4ECAQYEHCDgAgEPpgTiRMy4lCIp_vJSAoNwBX6bwCKKs7T4eUpgJhIO_guki3TJwYdJ8LDkdzwIeWK3gUDI02CxLI9Z5c-9OFk8BUkOBK7FMnuKpF9GBwLjOCieWjaD6SsBkaVvh3x--yG35oGcb3-1R0mvQKYEZBo8cvDpK6mX16uZl8AoS32rx0iPmoZnfw3_-aksEknIEx5ufWxakNhfDkzgWyDnY56OYpvuLGySx9zfkAkILPmv9KxMff5_snicvz98zODtQpsz-LycY3C5A8lvREvENvV2x3DwbHfrbFrdClrDCpu1bOe4Hmsk7tROfDqTabMm00ZNZtV3w-rsxmnZ7nFt0kh8UTvx6WxizdrEGrXJqb4bp85u3JbtHdcmjcSXtROfzianWZucRm1yq-_GrbMbr3VclzTydmvmPZ1JbrMmuf-srx3IdcdlLCLJK7WxdnEzHj7y9aSkyJIZv03ErDxm_TgqubI6hFym67ds_TCI1q-KgNXhjgncNYGpUW7qqWmqMTKmB3dM4K4JTI1y74xsj2a7dHuTdtTzdpQw3Z5Ze5d2TQRXw4jgahgRXA1jgiM0IrhnIrgaRgRXw4jgahgTHKERwTsmgl-YKKqGEUXVMKKoGsYURWhE0UsTRdUwoqgaRhRVw5iiCI0o2jVRlBr1BIRGJEVoxFKExjTFcKwrmJUFs7ZgVhcM-4JZYaBGjYHuVQYtW9U0ZquaxmxV06itCI7ZqlOW9nem05Z0acxWrb6kjWO27pUHpa3T1__-BAAA__8xhaKp
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJzEll1v2jwUx--fTxGdq1YyCnYSWiI9ElXHNCRWusJFpQlNKfEKGsVZnEhJq373KaFvvMwnjiG7DOEX_33O7-L_BPL3Enzo314PLwZX1smnwXgy_jY8tcb9Yf9yYmXEyq3PN6OvVpY_Wv3by_71xLoYDl_f58TK3t4DgZUI-VXwwCX434ECAQYEHCDgAgEPpgSiWMy4lCIu_vJUAoMwA79NYLGK0qT4eUpgJmIO_hMki2TJwYdJcLfkNzwIeWy3gUDIk2CxLI_J8sdelj_-iH7xHAhcimX6sJJ-mR0IjKOgeGrZDKbPBESavJzy_vG73JoHcr752R4lvQKZEpBJcM_Bp8-kXmCvbmACozTxrR4jPWqanv01_fun0pWIQx7zcONj04LE_rJnBF8COR_zZBTZdGtlkzzi_gedgMCS_0xOytSn_8eL-_nrw9sMXi70cQbvl3MMLrcn-ZVoicim3vYY9p7tbpxNq2tB62hhs5btHNZkjcid-pGP5zJt1mXaqMus-nJYreU4Lds9rE8akc_qRz6eT6xZn1ijPjnVl-PUWo7bsr3D-qQR-bx-5OP55DTrk9OoT2715bi1luO1DmuTRuBu3cDHc8lt1iX3n_W2PbluuIzESvJKraxd3IyH93w9KSnSeMavYzErj1k_jkquLBAhl8n6LVs_DFbrV0XA6nDHBO6awNQoN_XUNNUYGdODOyZw1wSmRrm3RrZDs226_ZF21PN2lDDdnFl7m3ZNBFfDiOBqGBFcDWOCIzQiuGciuBpGBFfDiOBqGBMcoRHBOyaCn5koqoYRRdUwoqgaxhRFaETRcxNF1TCiqBpGFFXDmKIIjSjaNVGUGvUEhEYkRWjEUoTGNMVwrCuYlQWztmBWFwz7gllhoEaNge5UBi1b1TRmq5rGbFXTqK0IjtmqU5Z2d6bTlnRpzFatvqSNY7bulAelrdPn__4EAAD__yskp58=
 
 query T
 EXPLAIN (DISTSQL) SELECT x, y FROM xyz EXCEPT SELECT y, x from xyz
@@ -928,7 +928,7 @@ vectorized: true
       table: xyz@xyz_pkey
       spans: FULL SCAN
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJzEmF9v2kgXxu_fT2Gdq1YaZGbGBmLplahSVhuJTbKBi0qrXLgwmyARzNpGgkb57itAqRs7Ps_4X_bScX_4mdN5fox5puSfNQU0-XY7_XJ17Xz6ejWbz_6cfnZmk-nkcu7shXNwfru7-cPZH344k2-Xk9v5672DcPY_75GgTbQ01-GTSSj4iyQJUiRIkyCPBPl0L2gbRwuTJFF8_CfPJ-BquaegL2i12e7S45_vBS2i2FDwTOkqXRsKaB5-X5s7Ey5N7PZJ0NKk4Wp9esz-8GO8jVdPYXwgQZfReve0SYJTbBI024bHq56r6P5FULRLs4ckafhgKJAvol4Qv2YQQTe7NHDGSoxlaSpVJdXXVZKuNovUlbnhjKUY51eeYd8PzmOYPL6PZFF0vSh-B1G80ijZR-02Ubw0sVm--bDTp5SGVRZzy1L4XaWwGFmWYtAghagV9PcweZyZ9Gbr6ty85oetCV7l8GU6JUFr83f66bSCz_-PVw-Prxc_tz-7uGG7I76OetHW1X5-DO8-e_Tm2dJeCLKGEFzVc7WlmypEGdSOUsNOIFemBNm5nayjDDq3k2zPCxZzK7NTiyksRlZmp2opGttJfqidlH0tVZ1a6p7rWRqiQpRh7Sg1DAFyZbVUnRvCOsqwc0Oo9rppMbcyQ7SYwmJkZYaolqKxIdSHGkLb11LXqaXXc31LQ1SIMqodpYYhQK6slrpzQ1hHGXVuCN1eNy3mVmaIFlNYjKzMENVSNDaE_lBDePa19OrU0u9Z-qFCkIuaQWrYAaTKKul1bgfrKBed28Frr5cWcyuzQ4spLEZWZodqKRrbwfvPfv94J9edSbbRJjFWv270jyszywdznlQS7eKFuY2jxekx58ubE3f6w9Ik6fmuOl9cbc63jgF_hSULax5WeVj-CntvYFkNlqoRfdGEVoMmtNY8rVnabwLLRo9W_Ub0sAmtwWbx2G0K_r_8CrDKwwMWBose8u0a8PUasbTs8_QFT0vghYJVqnQb0KjcCAftBjiqN8BRv2VBqVUKDmjUcICjiiMcbHeAo5LLgljfblmEFxTD4YWiS94xaOm8ZOQQ1I3XjBwBvCCaSm3ladhWgKO28jhsK4_DthYkW6mtPA3byuOwrQBHW5bHYVv5LxglwSEKHFsl31bFH1zB0hVvGuWBcy9vGuUDvGCaSudmnoYHZ4CjkzOPw6Mzj6O2qoJlq7QV0KitAEdtRTjasjyO2qr4Lxg1Ajh_ks3hxbbyR1m0dN40GhxlNW8aDd6QNX-oAXMHNGorwkFbAY7aCnD4psu_KKNXXfCK3-zh8GUX4OhtF_xGgHYN_wWj0ej4o2wOL7RV82fZ_NLvX_73bwAAAP___X9ARg==
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJzEmF9v4kYUxd_7Kaz7tCsNMjNjA7FUiVWWqpFokgYeVqqiioVpgspiahsJEuW7V4CyXuz4nvG_7KPj_eEzd-f8GPNM8X8rCmj05Xb86era-fD5ajKd_Dn-6ExG49Hl1NkJZ-_8dnfzh7PbPzmjL5ej2-nrvb1wdt_vkaB1uDDXs28mpuAvkiRIkSBNgjwS5NO9oE0Uzk0ch9HhnzwfgavFjoKuoOV6s00Of74XNA8jQ8EzJctkZSig6ezrytyZ2cJEbpcELUwyW66Oj9ntn4a7_dPfm3_NngRdhqvtt3UcHHOToMlmdrjquIruXwSF2yR9SpzMHgwF8kVUS-JXTSLoZpsEzlCJoSyMpcrE-ryMk-V6nrgyM56hFMPs0lPs6955nMWPbyNpFF0tit9CFK8wSvpR23UYLUxkFmcfdvyUwrDKYm5pCr-tFBYjS1P0aqQQlYL-PosfJya52bg6M6_pfmOCVz18Go9J0Mr8k3w4ruDjr9Hy4fH14vv2ZxfXb3bE12En3Ljaz47hzWcPzp4t7Y0gqxjBVR1XW9qpRJZe9SwV_ASCpVKQrfvJOkqvdT_J5sxgMbciPzWYwmJkRX4ql6K2n-S7-knZ91JV6qXuuJ6lI0pk6VfPUsERIFhaTNW6I6yj9Ft3hGqunRZzK3JEgyksRlbkiHIpajtCvasjtH0vdaVeeh3Xt3REiSyD6lkqOAIES4upW3eEdZRB647QzbXTYm5FjmgwhcXIihxRLkVtR-h3dYRn30uvUi_9jqUhSiS5qJqkgh9ArLSUXut-sI5y0bofvOaaaTG3Ij80mMJiZEV-KJeith-8n_Y7yBu57ky8CdexsfqVo3tYmVk8mNOk4nAbzc1tFM6Pjzld3hy54x8WJk5Od9Xp4mp9unUI-CMsWVjzsMrC8kfYO4NlOViqWvRFHVr16tBa87Rmab8OLGs9WnVr0f06tAabxWO3Kfj_8kvAKgv3WBgsus-3q8fXa8DSssvTFzwtgRdyVinTbUCjciMctBvgqN4AR_2WOaWWKTigUcMBjiqOcLDdAY5KLnNiPd-yCM8phsNzRZe8Y9DSecnIPqgbrxk5AHhONKXaytOwrQBHbeVx2FYeh23NSbZUW3katpXHYVsBjrYsj8O28l8wSoJDFDi2Sr6tij-4gqUr3jTKA-de3jTKB3jONKXOzTwND84ARydnHodHZx5HbVU5y5ZpK6BRWwGO2opwtGV5HLVV8V8wagBw_iSbwfNt5Y-yaOm8aTQ4ymreNBq8IWv-UAPmDmjUVoSDtgIctRXg8E2Xf1FGr7rgFb_ew-HLLsDR2y74jQDtGv4LRqPR8UfZDJ5rq-bPstml37_88n8AAAD__xxSRTw=
 
 # EXCEPT ALL and EXCEPT with different ORDER BY types.
 query T
@@ -952,7 +952,7 @@ vectorized: true
           table: xyz@xyz_pkey
           spans: FULL SCAN
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJy8lt9u2jAUh-_3FNa5KppRsJPwJ9Kkdi3TkFjpgItOExcp8QoSJVkSJELVd58SyiiE-MQJ5I4Uf_YPn-_05BWCvwuwoPv40L_p3ZOru95oPPrZr5GrUbffvR2TNfk2HPwg62hDBsO77pB8_UWiGuk-3nYfxuSm3_-_MiI3o5PLN7X95zVQWLqOuLdfRADWb2BAgQMFHSgYQMGECQXPd6ciCFw_XvKaAD1nDVaDwnzprcL4zxMKU9cXYL1COA8XAiwY208LMRS2I3ytARQcEdrzRXLMOtpce_78xfYjoHDrLlYvy8Aia0ri55Fnx091LU4yWIUWuWYweaPgrsL34_anPEVkZgezw_2T9RMKQWg_C7DYGy0W28wVO6Jkc4nYPDP2fp_V0vUd4QvnYKdJTGJLTvz273YwG4lw4GnsqGLjyBPWB8-AwkL8Ca-uWe2LP3-eJZ8yf_f-N-kqpRi5fih8jZnH1_Q5c38jx52duo73TU-EuHfrrqfxxvEFnzzePDie5TeNFWgQjdc1_SItohC8WaBFzhmcZwavoElYFU2CFGPXJM2iTcLzF5sXsVSva8ZFLFUI3ipi6RmD88zgFVjKq7AUKcbO0lZRS_X8xdaLWGrUk2l_fksVgreLWHrG4DwzeAWW6lVYihRjZ2m7qKVG_mIbRSw16xdxVCF2p4ijZ4vNM2NXYKhRhaFIKXaGds7xSnxi_6EIPHcZiFxvu434woTzLLYFCNyVPxUPvjtNjtk-DhIueYtxRBBuv-Xbh95y-1UcMD_cKgMzVoo2S9EdOc0U7oyrwa0y8NGdqdJmKbojp_kx3fhI6wdw4xjWpbAhr5YhhTmTH22W6Q85jPSHHMb6A6GR_kBopD-aZfpDDiP9IYex_kBopD8QGumPltTStlzSdpn-6JQxXA4jhsthzHCERgxHaGwCqIzN9H9SlbmpSqNDQGlyKuOI5iw1RQ5UZVwuOpOPEcR0lpojKqojNOI6QmOyYzhiO4ZjuqdmqJLuchrTXU6juiM4pjuCY7qnBumh7k1E99RMUdI9NVOUdJfTmO5yGtUdwTHdERzTPTVPlXSX05juchrVHcEx3REc0z01VQ_ftRty3Xlqtkh1n7x9-hcAAP__jYOqQg==
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJy8lt9vokoUx9_vXzE5TzV3DM4A_iC5SXtbN2vi1q760M3GbKjMVrNWWMBEbPq_b8C6VpE5DChvUucz83XO5_TwCsHvBVjQfXzo3_TuydVdbzQefe3XyNWo2-_ejsmafBoOvpB1tCGD4V13SP7_RqIa6T7edh_G5Kbf_7syIjejk8s3tf3nNVBYuo64t19EANZ3YECBAwUdKBhAwYQJBc93pyIIXD9e8poAPWcNVoPCfOmtwvjPEwpT1xdgvUI4DxcCLBjbTwsxFLYjfK0BFBwR2vNFcsw62lyvo80P75eIgMKtu1i9LAOLrCmJn0eeHT_VtTjKYBVa5JrB5I2Cuwrfz9sf8xSRmR3MDg9I1k8oBKH9LMBib7RYbjNf7oiSzSVy88zc-31WS9d3hC-cg50mMYktOfHjP9vBbCTCgaexo5qNI09YH0wDCgvxM7y6ZrX__PnzLPmU-bv3v0lXqcXI9UPha8w8vqZ_M_c3ctzZqet43_REiHu37noabxxf8MnjzYPjWX7VWJEW0Xhd0y_SJArJm0Wa5JzJeWbyCtqEVdEmSDV2bdIs2iY8f7V5IU_1umZcxFOF5K1Cnp4xOc9MXoGnvApPkWrsPG0V9VTPX229kKdGPZn55_dUIXm7kKdnTM4zk1fgqV6Fp0g1dp62i3pq5K-2UchTs34RSxVydwpZerbcPDN3BY4aVTiK1GLnaOccr8Yn9h-KwHOXgcj11tuIL0w4z2JbgMBd-VPx4LvT5Jjt4yDhkncZRwTh9lu-fegtt1_FAfPDrTIwY6VosxTdkdNM4c64GtwqAx_dmSptlqI7cpof042PtH4AN45hXQob8moZUpgz-dFmmf6Qw0h_yGGsPxAa6Q-ERvqjWaY_5DDSH3IY6w-ERvoDoZH-aEktbcslbZfpj04Zw-UwYrgcxgxHaMRwhMYmgMrYTP8nVZmbqjQ6BJQmpzKOaM5SU-RAVcblojP5GEFMZ6k5oqI6QiOuIzQmO4YjtmM4pntqhirpLqcx3eU0qjuCY7ojOKZ7apAe6t5EdE_NFCXdUzNFSXc5jekup1HdERzTHcEx3VPzVEl3OY3pLqdR3REc0x3BMd1TU_XwXbsh152nZotU98nbP38CAAD__5wmrzg=
 
 query T
 EXPLAIN (DISTSQL) (SELECT x FROM xyz ORDER BY y) EXCEPT (SELECT y AS x FROM xyz ORDER BY z) ORDER BY x
@@ -975,7 +975,7 @@ vectorized: true
           table: xyz@xyz_pkey
           spans: FULL SCAN
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJy8mF1v8jYYhs_3KyIftVoQ2A5fkSa1a5lWiZUOOHinqQd5wWuRKGFJkKBV__sEjDdtTJ7bzkfPSpsrvvPg-5LTNxb_u2Q-G3x7GF7f3TsXt3eT6eTP4aVzMRkMBzdTZ-v8Nh794Wx3r85ofDsYO7_-5ewuncG3m8HD9MdVO-d6cvbS18v05y1z2Sqcq_vgRcXM_5tx5jLBXCaZyzzmsjZ7dNk6CmcqjsNof8nbAbibb5nfctlitd4k-18_umwWRor5byxZJEvFfDYNvi_VWAVzFTVbzGVzlQSL5WGZ7e71ah0tXoJox1x2Ey43L6vYd7aus_88WQf7T43mPslok_jOFWeP7y4LN0m6XJwET4r5_N0tFqltFGnnOq-2kYRNpNtFnCxWs6TJMzPSFkiZ7zvnOYifz1yfhpDFQrQrDeHlhkjvs1mF0VxFav7pToe75MYUaFZphHZdEdCk0gidEhHcQil_D-LniUpG66bMTGq6Wyv_5Irr4ZC5bKn-SS6u-OUv0eLp-fCTwR7v2myvSRglKmpKbWQ_596_ZzCzc-P4_6ZnQtyHjXDd9FrZAZ9dvv9peW5uFV5AdE3RaEpr1VmE6hRQnWkoYRMq9QyvUXbGITo1yo5XZxo0qzzZVRgBTSpPdnYRSsuOf4XswPY6yU4bmanshHmxRRHbyEbTs7aNRahuEdsYhhI2odKiixptYxyiW6NtRHVVR7PKs02FEdCk8mxjF6G0bcRX2AZsr5NttJGZ2kaaF1sWsY3XOLxp2dnGIlSviG0MQwmbUGnRZY22MQ7Rq9E2srqqo1nl2abCCGhSebaxi1DaNvIrbAO218k22shMbeOZF9srYpt2w9o1FpH6RVxjFEnYREpL7tVoGuMQ_RpN41VXczSrPNNUGAFNKs80dhFKm8b7CtOA7XUyjTayIv8yOnP_sYrX4SpWRv8Nau0HpuZP6vgFxOEmmqmHKJwdljl-HB24wy_mKk6OfxXHD3er45_2AT_CnIQlDYsszD_C3ieY28FclqEFL0X3y9CyS9OSpNtlYA5GTtNClKFlqxTdo2mP3KYdGm5bwCILd0i4SxekS8LgmXsk7HF66T5Jc0BzWiocWUXTio0ZAI3UAHDkBoQDOQAc2YHTcgF6ADTyA8CRIACODIFwUBeuGebzlkWjoxWTwTVNcFoyvAMKQ2sGPTrtGd4Hi9OmES2Aa6qxKjtNw7LTOCw7wFHZaRyVXWiWtSk7oFHZAY7KDnBUdoSDHS_oc6tAp0dNNRSulV3QqhEeODbTqkGPTptGgCOJoE0jegDXVGN15qdpeOincXjqBzg69tM4LLtmWauy0zQsO43DstM4LDvA0Y6nz7ISfO2SPstmcK3sErwig6OwpFUDHl3SppFtsDhtGglOJVJTjU3ZAY3KDnBUdoSDsgMcvuRrlrV6y6dp-JpP4_A9n8bhiz7A0Y6nz7ISfW_0WTaD62WnVeOBo7BHqyb76I_vP_0XAAD__wMqOVI=
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJy8mN1u6kYbhc-_q7DmKNFnBDNj_ixVSppQNRINKXCwqyqq2DBNUNmY2kbCRLn3Cij1jge_a8Y_OQuJH8_yy6xH47yx6O8V89ngy9Pw9uHRubp_mEwnvw6vnavJYDi4mzo756fx6Bdnl-yd0fh-MHZ-_M1Jrp3Bl7vB0_S_qxLndnLx0v11-vOOuWwdLNTj7JuKmP8748xlgrlMMpd5zGVt9uyyTRjMVRQF4eGStyPwsNgxv-Wy5XqzjQ-_fnbZPAgV899YvIxXivlsOvu6UmM1W6iw2WIuW6h4tlwdl9kl-5tdsv9j85dKmMvugtX22zrynZ3rHD5PNrPDp0bzEGW0jX3nhrPnd5cF2zhdL4pnL4r5_N0tlqltlilxnb1tJmGT6X4Zxcv1PG7yzJS0BVLma-K8zqLXC9enIWSxEO1KQ3i5IdL7bNdBuFChWny40_EuuTEFmlUaoV1XBDSpNEKnRAS3UMqfZ9HrRMWjTVNmJjVNNso_2-J2OGQuW6k_46sbfv1DuHx5Pf5ksMe7NttrEoSxCptSG9n_c-_fM5jZpXH8e9MLIR6DRrBpeq3sgC8u3_-wPDfXCi-iuqZoNKW17CxSdYrIzjSVsEmVmobXqDvjEJ0adcercw2aVZ7uKoyAJpWnO7sIpXXHP0N3YHuddaeNzFR3wrzZopBvZKPpWfvGIlW3kG8MUwmbVGnVRY2-MQ7RrdE3orqyo1nl-abCCGhSeb6xi1DaN-IzfAO219k32shMfSPNmy0L-cZrHN-37HxjkapXyDeGqYRNqrTqskbfGIfo1egbWV3Z0azyfFNhBDSpPN_YRSjtG_kZvgHb6-wbbWSmvvHMm-0V8k27YW0bi0z9QrYxyiRsMqU192p0jXGIfo2u8aorOppVnmsqjIAmlecauwilXeN9hmvA9jq7RhtZkX8dXbj_WEWbYB0po_8KtQ4DU4sXdfoComAbztVTGMyPy5w-jo7c8RcLFcWnv4rTh4f16U-HgN_DnIQlDYsszL-HvQ8wt4O5LEMLXorul6Fll6YlSbfLwByMnKaFKEPLVim6R9MeuU07NNy2gEUW7pBwly5Il4TBM_dI2OP00n2S5oDmtFQ4soqmFRszABqpAeDIDQgHcgA4sgOn5QL0AGjkB4AjQQAcGQLhoC5cM8zHLYtGRysmg2ua4LRkeAcUhtYMenTaM7wPFqdNI1oA11RjVXaahmWncVh2gKOy0zgqu9Asa1N2QKOyAxyVHeCo7AgHO17Q51aBTo-aaihcK7ugVSM8cGymVYMenTaNAEcSQZtG9ACuqcbqzE_T8NBP4_DUD3B07KdxWHbNslZlp2lYdhqHZadxWHaAox1Pn2Ul-NolfZbN4FrZJXhFBkdhSasGPLqkTSPbYHHaNBKcSqSmGpuyAxqVHeCo7AgHZQc4fMnXLGv1lk_T8DWfxuF7Po3DF32Aox1Pn2Ul-t7os2wG18tOq8YDR2GPVk320Z_f__dPAAAA__8Oij5I
 
 # EXCEPT ALL and EXCEPT with different numbers of ORDER BY columns.
 query T
@@ -999,7 +999,7 @@ vectorized: true
           table: xyz@xyz_pkey
           spans: FULL SCAN
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJy8lt9vokoUx9_vXzE5TzV3DMwA_iC5SXtbb66JW7vqQzcbH6jMVhMrLGCiNv3fN2CNRWQOA8rbzspn5sucz-nhHcLfS7Ch9_w0uOs_kpuH_ngy_j5okJtxb9C7n5AN-W80_EY22x0Zjh56I_LvD7JtkN7zfe9pQu4GA_mTlOwax-UGKKw8Vzw6byIE-ycwoMCBggEUTKBgwZSCH3gzEYZeED_yngB9dwO2TmGx8tdR_N9TCjMvEGC_Q7SIlgJsmDgvSzESjisCTQcKroicxTI5ZrPd3frB4s0JtkDh3luu31ahTTaUxOux78SrphYnGa4jm9wymH5Q8NbR53HHU162ZO6E8_T-yfNTCmHkvAqw2QctF9sqHJuS3TWS89zkx33WKy9wRSDc1E7TmMQeOfP6_zvhfCyioa-xk6JNtr6wv4gGFJbiV3Rzyxr_BIvXefKv3Pc-vpOhUo2xF0Qi0Jh1ek1_5-5vFrizc9fxuemZEI9e0_M1rp9e8NnjrdTxrLhsrESPaLypGVfpEoXgrXJdcsnsPDd7DX3C6ugTpB6HPmmV7RNevN68jKhGUzOvIqpC8HZJUS-Ynedmr0FUXoeoSD0OorbLimoUr7dRRlSzmYz9y4uqELxTUtQLZue52WsQ1ahDVKQeB1E7ZUU1i9fbLCOq1byKpgqxuyU1vVhynpu8BknNOiRFqnGQtHuJz-Mz-49E6HurUBT68tXjCxPuq9gXIPTWwUw8Bd4sOWa_HCZc8jnjijDa_8r3i_5q_1McsDjcrgIzVom2KtFdOc0U7oyrwe0q8MmdqdJWJborp_kprX-ljRSsn8KGFDbl1TKlMGfyo60q_SGHkf6Qw1h_IDTSHwiN9EerSn_IYaQ_5DDWHwiN9AdCI_3RllrakUvaqdIf3SqGy2HEcDmMGY7QiOEIjU0AlbGZ_UuqMjdVaXQIKE1OZRzRnGWmSEpVxuWiM_kYQUxnmTmiojpCI64jNCY7hiO2Yzime2aGKukupzHd5TSqO4JjuiM4pntmkKZ1byG6Z2aKku6ZmaKku5zGdJfTqO4IjumO4JjumXmqpLucxnSX06juCI7pjuCY7pmpmv7W1uW688xskeo-_fjrTwAAAP__ws-tjg==
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJy8ll9v2jwUh-_fT2Gdq6LXKNhJ-BNpUruWaUisdMBFpwlNKfEKGiVZEiSg6nefEopoCPGJE8jdPPLYv_g8pyevEPxdgAXdx4f-Te-eXN31RuPR936NXI26_e7tmKzJl-HgG1lvtmQwvOsOyecfZFMj3cfb7sOY3PT78icp2dYOyzVQWLqOuLdfRADWT2BAgQMFHSgYQMGECQXPd6ciCFw_euQ1BnrOGqwGhfnSW4XRf08oTF1fgPUK4TxcCLBgbD8txFDYjvC1BlBwRGjPF_Ex6832er3Z_vL-iA1QuHUXq5dlYJE1JdF65NnRqq5FUQar0CLXDCZvFNxV-H7e4ZinDZnZwSx5QPz8hEIQ2s8CLPZGi-U28-emZHuJ6Dwz-mGf1dL1HeELJ7HTJCKxR068_1c7mI1EOPA0dlS28cYT1gfVgMJC_A6vrlntkz9_nsX_ynzvwzvpKuUYuX4ofI2Zx9f0f-b-Ro47O3Ud75ueCHHv1l1P443jCz55vJk4nuW3jRXpEo3XNf0ifaKQvFmwT84ZnmeGr6BTWBWdghRk3ynNop3C8xecF1JVr2vGRVRVSN4qquoZw_PM8BWoyqtQFSnIXtVWUVX1_AXXC6lq1OPhf35VFZK3i6p6xvA8M3wFqupVqIoUZK9qu6iqRv6CG4VUNesXEVUhd6eoqGeLzjOjV6CpUYWmSDn2mnbO8Zl8Yv-hCDx3GYhcX8CN6MKE8yx2BQjclT8VD747jY_ZLQcxF3_UOCIId7_y3aK33P0UBcwPt8rAjJWizVJ0R04zhTvjanCrDHx0Z6q0WYruyGl-TDc-0noCbhzDuhQ25NUypDBn8qPNMv0hh5H-kMNYfyA00h8IjfRHs0x_yGGkP-Qw1h8IjfQHQiP90ZJa2pZL2i7TH50yhsthxHA5jBmO0IjhCI1NAJWxmf5LqjI3VWl0CChNTmUc0ZylpkhCVcblojP5GEFMZ6k5oqI6QiOuIzQmO4YjtmM4pntqhirpLqcx3eU0qjuCY7ojOKZ7apAmdW8iuqdmipLuqZmipLucxnSX06juCI7pjuCY7ql5qqS7nMZ0l9Oo7giO6Y7gmO6pqZr81m7Ideep2SLVffL2378AAAD__wgnsoQ=
 
 query T
 EXPLAIN (DISTSQL) (SELECT x FROM xyz ORDER BY y) EXCEPT (SELECT x FROM xyz ORDER BY y, z) ORDER BY x
@@ -1022,7 +1022,7 @@ vectorized: true
           table: xyz@xyz_pkey
           spans: FULL SCAN
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJy8mE1v6kYYhff9FdasblQjMzPmy1Kl3CZUjURDCixuVWXhC9MEiWBqGwkS5b9XQJFvPPg9M_7ILk54PMcvcx6N88aSf1csYMNvD6Ovd_fOl9u76Wz65-jK-TIdjoY3M2fn_DYZ_-Hs9q_OeHI7nDi__uXsr5zht5vhw4z-lOu8XmWXO-aydbRQ9-GLSljwN-PMZYK5TDKX-cxlHfbosk0czVWSRPHhI29H4G6xY0HbZcv1Zpsefv3osnkUKxa8sXSZrhQL2Cz8vlITFS5U7LWZyxYqDZer4zK7_ev1Jl6-hPGeuewmWm1f1kng7FzncD3dhIerlndIMt6mgXPN2eO7y6Jtmi2XpOGTYgF_d8tF6hhHcp1X21TCJtXtMkmX63nq8dyYtAUy5vveeQ6T5wufz0LIciE6tYbwC0Nk99muo3ihYrX4cKfjXQpjCjSrLEKnqQhoUlmEboUIbqmUv4fJ81Sl440nc5Oa7TcqOMvi62jEXLZS_6RfrvnVL_Hy6fn4k8Ee79lsr2kUpyr2pDaynwvv3zeY2aVx_H_TCyHuo1a08fx2fsAXlx98WJ6bi4WXcJ0nWp60tp1FqG4525nmEja5MtXwBn1nHKLboO94fbJBsyryXY0R0KSKfGcXobLv-Gf4Dmyvs--0kZn6Tph3W5QRjmx5vrVwLEL1SgrHMJewyZV1XTQoHOMQvQaFI-prO5pVkXBqjIAmVSQcuwiVhSM-Qzhge52Fo43MVDjSvNuyjHD81vGVy044FqH6JYVjmEvY5Mq6LhsUjnGIfoPCkfW1Hc2qSDg1RkCTKhKOXYTKwpGfIRywvc7C0UZmKhzfvNt-GeF0Wta6sYg0KKkbo1TCJlXWc79B2RiHGDQoG7--pqNZFcmmxghoUkWysYtQWTb-Z8gGbK-zbLSRlfn30YX7T1SyidaJMvrPUPswMLV4UqcvIIm28Vw9xNH8uMzpcnzkjr9YqCQ9_VWcLu7Wpz8dAv4IcxKWNCzyMP8R9j_A3A7msgoteCV6UIWWPZqWJN2pAnMwcpoWogot25XoPk375Dbt0nDHAhZ5uEvCPbogPRIGz9wnYZ_TSw9ImgOa01LhyCqaVmzMAGikBoAjNyAcyAHgyA6clgvQA6CRHwCOBAFwZAiEg7pwzTAftywaHa2YHK5pgtOS4V1QGFoz6NFpz_ABWJw2jWgDXFONVdlpGpadxmHZAY7KTuOo7EKzrE3ZAY3KDnBUdoCjsiMc7HhBn1sFOj1qqqFwreyCVo3wwbGZVg16dNo0AhxJBG0a0Qe4phqrMz9Nw0M_jcNTP8DRsZ_GYdk1y1qVnaZh2Wkclp3GYdkBjnY8fZaV4GuX9Fk2h2tll-AVGRyFJa0a8OiSNo3sgMVp00hwKpGaamzKDmhUdoCjsiMclB3g8CVfs6zVWz5Nw9d8Gofv-TQOX_QBjnY8fZaV6Hujz7I5XC87rRofHIV9WjX5R398_-m_AAAA__-hoDye
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJy8mF1v6jYcxu_3KSJftVpQsB3eIk3qWcu0Sqx0wMWZpmrigNeicQhLggRU_e4TMJQ2Jv_HzkvvmpZf_OSPn5-cvrL43yULWP_r4-DL_YNzdXc_nox_H1w7V-P-oH87cbbOL6Phb852t3eGo7v-yPn5D2d37fS_3vYfJ_SnXGd_nV5umctW4Vw9TL-rmAV_Ms5cJpjLJHOZz1zWYk8uW0fhTMVxGB0-8noE7udbFjRdtlitN8nh108um4WRYsErSxbJUrGATabflmqkpnMVeU3msrlKpovlcZntbn-z3e3_Wv-jdsxlt-Fy830VB87WdQ7X4_X0cNXwDlGGmyRwbjh7enNZuEnS9eJk-qxYwN_cYpla5plcZ28bS9jEulvEyWI1SzyeGZS2QMp82zkv0_jlwufTELJYiFalIfzcEOl9NqswmqtIzT_c6XiX3JgCzSqN0KorAppUGqFdIoJbKOWv0_hlrJLh2pOZSU12axWcdfFlMGAuW6q_k6sbfv1TtHh-Of5ksMc7NttrHEaJijypjezH3Pt3DWZ2aRz_3_RCiIewEa49v5kd8MXlex-W5-Zm4UVs54mGJ619Z5GqXdB3psGETbBUNrxG4xmHaNdoPF6dbtCs8oxXYQQ0qTzj2UUobTz-GcYD2-tsPG1kpsYT5uUWhZQjG55vrRyLVJ2iyjEMJmyCpW0XNSrHOESnRuWI6vqOZpWnnAojoEnlKccuQmnliM9QDtheZ-VoIzNVjjQvtyykHL9xfPGyU45Fqm5R5RgGEzbB0rbLGpVjHKJbo3JkdX1Hs8pTToUR0KTylGMXobRy5GcoB2yvs3K0kZkqxzcvt19IOa2GtXAsMvWKCscolrCJlTbdr1E3xiF6NerGr67raFZ5uqkwAppUnm7sIpTWjf8ZugHb66wbbWRF_o104f4jFa_DVayM_kPUPAxMzZ_V6QuIw000U49RODsuc7ocHrnjL-YqTk5_FaeL-9XpT4eA72FOwpKGRRbm72H_A8ztYC7L0IKXontlaNmhaUnSrTIwByOnaSHK0LJZiu7StE9u0zYNtyxgkYXbJNyhC9IhYfDMXRL2Ob10j6Q5oDktFY6somnFxgyARmoAOHIDwoEcAI7swGm5AD0AGvkB4EgQAEeGQDioC9cM83HLotHRisngmiY4LRneBoWhNYMenfYM74HFadOIJsA11ViVnaZh2Wkclh3gqOw0jsouNMvalB3QqOwAR2UHOCo7wsGOF_S5VaDTo6YaCtfKLmjVCB8cm2nVoEenTSPAkUTQphFdgGuqsTrz0zQ89NM4PPUDHB37aRyWXbOsVdlpGpadxmHZaRyWHeBox9NnWQm-dkmfZTO4VnYJXpHBUVjSqgGPLmnTyBZYnDaNBKcSqanGpuyARmUHOCo7wkHZAQ5f8jXLWr3l0zR8zadx-J5P4_BFH-Box9NnWYm-N_osm8H1stOq8cFR2KdVk330p7cf_gsAAP__46ZBlA==
 
 # EXCEPT ALL and EXCEPT with compatible ORDER BY columns that are not in the final result.
 query T
@@ -1043,7 +1043,7 @@ vectorized: true
       table: xyz@xyz_pkey
       spans: FULL SCAN
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJzEll1v2jAUhu_3K6xz1UpGwU6gJdKkdi3TkFjpgItOExcp8QoSxVmcSA1V__uUMKnlIz4xHuGuafzEr30eifcV1J8F-NB9uO9f9-7I2W1vNB796J-Ts1G3370Zk4x8HQ6-k5dsRQbD2-6QfPlJVuek-3DTvR-T634fWQkUljIUd8GzUOD_AgYUOFBwgYIHFFowoRDFciqUknG-5LUAeuEL-E0K82WUJvm_JxSmMhbgv0IyTxYCfBgHjwsxFEEoYqcJFEKRBPNFsc1LtrqK4vlzEGdA4UYu0uel8klGyQoojKIgf2o4eZJBmvjkisHkjYJMk3_bve_ymJFZoGab3y_WTyioJHgS4LM3eljs1klj89LY799JlzIORSzCjS9NchJbsufs3wI1G4lkEDlsa2LjLBL-B6-AwkL8Ts6u2PnneP40K_4qPff7mVyLM-0JfCcbMnJYa_v0e_f2NvZm1TVgB2jg8IbjHsVfg-DtEwfnpcFrMJjVYTCvPgx-yDDchuMdxSKD4BcnDs5Lg9dgEa_DIrf6MNxDhuE1ip-y_2-RQfDLEwfnpcFrsMitwyKv-jC8Q4bRahzFIYPYnZPG5qWxazDIq7uP7YkzFCqSSyUqta1mfiARPon1BSmZxlNxH8tpsc36cVBwRTMIhUrWb_n6obdcv8oDVofbNnDHBmZWuVlLTzODK-NmcNsG7tjAzCr31pXt0Hybbn6kXf19u1qYbd5Zc5v2bATXw4jgehgRXA9jgiM0InjLRnA9jAiuhxHB9TAmOEIjgrdtBL-wUVQPI4rqYURRPYwpitCIopc2iuphRFE9jCiqhzFFERpRtGOjKLPqCQiNSIrQiKUIjWmK4VhXsCsLdm3Bri5Y9gW7wsCsGgPbqQxGtuppzFY9jdmqp1FbERyz1aQs7c7MpC2Z0pitRn3JGMds3SkPWlsnb5_-BgAA___PZqF0
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJzEll1v2jAUhu_3K6xz1UpGwU6gJdKkdi3TkFjpgItOE5pS4hU0irM4SISq_31KmNTyEZ8Yj3DXNH7i1z6PxPsC6s8MfGg_3HevO3fk7LYzGA6-dc_J2aDdbd8MSUo-93tfyTJdkV7_tt0nn76T1TlpP9y074fkuttFVgKFuQzFXfAsFPg_gAEFDhRcoOABhQaMKESxHAulZJwtecmBTrgEv05hOo8WSfbvEYWxjAX4L5BMk5kAH4bB40z0RRCK2KkDhVAkwXSWb7NMV1fLdPUz-i1SoHAjZ4vnufJJSskKKAyiIHuqOVmU3iLxyRWD0SsFuUj-7fe2zWNKJoGabG6Qrx9RUEnwJMBnr_Sw3I3T5uaFud--s5jLOBSxCDe-NMpIbMmew38J1GQgkl7ksK2ZDdNI-O_MAgoz8Ss5u2LnH-Pp0yT_q_Dcb2dyLc60J_CdrMnIYY3t0-_d29vYm5X3gB3igcNrjnsUgw2SN0-dnBcmr8BhVoXDvPw0-EHTcGuOdxSPDJJfnDo5L0xegUe8Co_c8tNwD5qGV8t_0P6_RwbJL0-dnBcmr8AjtwqPvPLT8A6aRqN2FIsMcrdOm5sX5q7AIa_qXrYnTl-oSM6VKNW66tmBRPgk1hek5CIei_tYjvNt1o-9nMv7QShUsn7L1w-d-fpVFrA83LSBWzYws8rNGnqaGVwZN4ObNnDLBmZWubeubIfm23T9Pe3q79vVwmzzzurbtGcjuB5GBNfDiOB6GBMcoRHBGzaC62FEcD2MCK6HMcERGhG8aSP4hY2iehhRVA8jiuphTFGERhS9tFFUDyOK6mFEUT2MKYrQiKItG0WZVU9AaERShEYsRWhMUwzHuoJdWbBrC3Z1wbIv2BUGZtUY2E5lMLJVT2O26mnMVj2N2orgmK0mZWl3ZiZtyZTGbDXqS8Y4ZutOedDaOnr98DcAAP__Yt-mag==
 
 query T
 EXPLAIN (DISTSQL) (SELECT y FROM xyz ORDER BY z) EXCEPT (SELECT y FROM xyz ORDER BY z)
@@ -1063,7 +1063,7 @@ vectorized: true
       table: xyz@xyz_pkey
       spans: FULL SCAN
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJy8mE9v6kYUxff9FNZdJdIgmBkbiKVKeU2oGomGFFi8qsrCD6YJEsHUNlJIlO9eYfTkxI7v8WA7O_zn5zlzmXN8x68U_7cmn0bf78bfbm6ds-ub2Xz21_jcOZuNxqOrubN3fp9O_nSe9y_OZHo9mjq__e28nDuj71ejuzm4iwRtwqW5DZ5MTP4_JEmQIkGaBLkkyKN7QdsoXJg4DqPDLa8pcLN8Jr8naLXZ7pLD6XtBizAy5L9SskrWhnyaBz_WZmqCpYm6PRK0NEmwWqfDPO9fLrfR6imI9iToKlzvnjax7-yF80KCZtvgcNTpHpRMdonvXEq6fxMU7pJsuDgJHgz58k2cJslrTZKykXS9ipPVZpF0Za5GhQEy5sfeeQzix0_uz0To00R4jYpwS0Vkz9ltwmhpIrP88KT0KaUyFapVJsFrSwKqVCahX0OCOEnlH0H8ODPJZNvVuUrN91vj_8yGb-MxCVqbf5OzS3n-a7R6eEx_VVjjg2bLeht2wm1Xe_nZfzr28MPYsrrl5QmW76pOV1vnkIWofouilI2oLARki0lUWUS_xSSSzcUAqlVZEjUoAVWqLInsJNROIvkVSaSqG0-dYjzd6brWaWAhatCiKGUjKjOiajENKosYtJgGqjkrolqVpUGDElClytLATkLtNFBfkQa6uvH0KcZzO-k2wi4NLEQNWxSlbERlRtQtpkFlEcMW00A3Z0VUq7I0aFACqlRZGthJqJ0G-ivSwK1uPPcU43kd6yywkHTRmiRlIykzodtiElQWcdFiErjN2RDVqiwJGpSAKlWWBHYSaieB-9XfKz6RMzXxNtzEptLXiN5hQmb5YI4FisNdtDB3UbhIhzkeTlIuPbE0cXK8qo4HN5vjpYPA97BkYc3DKg_L97D7AZZ2sFS16Is6tOrXobXmac3SXh1Y1hpa9WrRgzq0BovFZZcp-L88C1jl4T4Lg0kPeHf1eXsNWVr2ePqCpyXIhUKq2Hgb0MjcCAfuBjiyN8CRv2UhUm0MDmjkcIAjiyMcLHeAI5PLQrB-XLIIL0QMhxeMLvmMQVPnQ0YOgN34mJFDgBeCxsqtPA3dCnDkVh6HbuVx6NZCyFq5laehW3kcuhXgaMnyOHQr_4JREjRRoG2VvFsV37iCqSs-aZQL-l4-aZQH8ELSWPXNPA0bZ4CjzpnHYevM48itqpCyNm4FNHIrwJFbEY6WLI8jtyr-BaOGAOc72RxedCvfyqKp80mjQSur-aTRYIes-aYG1B3QyK0IB24FOHIrwOFOl98oo60u2OLXGxxudgGOdrvgGwFaNfwLRqPS8a1sDi-4VfO9bH7q92-__B8AAP__NHYyuQ==
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJy8mF9v4kYUxd_7Kaz7lEiDYGZsIJYqZZtQNRINKfCwVRVVLEwTVBZT20iBKN-9wmjlxI7v8WCbN_zn5zlzmXN8x68U_bcinwZfH4Zf7u6di9u7yXTyx_DSuZgMhoObqbNzfh2PfndedntnNL4djJ1f_nT2l87g683gYQruIkHrYGHuZ99NRP5fJEmQIkGaBLkkyKNHQZswmJsoCsLDLa8JcLd4Ib8jaLnebOPD6UdB8yA05L9SvIxXhnyazr6tzNjMFiZsd0jQwsSz5SoZ5mW3v37Z7f_e_Gt2JOgmWG2_ryPf2QlnT4Imm9nhqNU-SBltY9-5lvT4JijYxul4UTx7MuTLN3GaJq85TcpG0-0yipfredyWmSrlBkiZbzvneRY9f3J_KkKfJsKrVYRbKCJ9znYdhAsTmsWHJyVPKZSpUK1SCV5TElClUgndChLESSp_m0XPExOPNm2dqdR0tzH-j3T4MhySoJX5J764lpc_h8un5-RXiTXeq7es90Er2LS1l539p2P3P4wty3tenuL5tmq1tXUSWajqNqlK2ahKY0A2mEWlRXQbzCJZXxCgWhVlUY0SUKWKsshOQuUskufIIlXeeeok5-lW27XOAwtVvSZVKRtVqRVVg3lQWkSvwTxQ9ZkR1aooD2qUgCpVlAd2EirngTpHHujyztMnOc9tJZsJuzywUNVvUpWyUZVaUTeYB6VF9BvMA12fGVGtivKgRgmoUkV5YCehch7oc-SBW9557knO81rWaWCh6ao5TcpGU2pDt8EsKC3iqsEscOszIqpVURbUKAFVqigL7CRUzgL33N8tPpEzNtEmWEem1FeJzmFCZvFkjgWKgm04Nw9hME-GOR6OEi45sTBRfLyqjgd36-Olg8D3sGRhzcMqC8v3sPsBlnawVJXoqyq06lahteZpzdJeFVhWGlp1KtG9KrQGi8Vllyn4vzwLWGXhLguDSfd4d3V5e_VZWnZ4-oqnJciFXKrYeBvQyNwIB-4GOLI3wJG_ZS5SbQwOaORwgCOLIxwsd4Ajk8tcsH5csgjPRQyH54wu-YxBU-dDRvaA3fiYkX2A54LGyq08Dd0KcORWHodu5XHo1lzIWrmVp6FbeRy6FeBoyfI4dCv_glESNFGgbZW8WxXfuIKpKz5plAv6Xj5plAfwXNJY9c08DRtngKPOmcdh68zjyK0ql7I2bgU0civAkVsRjpYsjyO3Kv4Fo_oA5zvZDJ53K9_KoqnzSaNBK6v5pNFgh6z5pgbUHdDIrQgHbgU4civA4U6X3yijrS7Y4lcbHG52AY52u-AbAVo1_AtGo9LxrWwGz7lV871sduqPbz_9HwAA__8Esjev
 
 # EXCEPT ALL and EXCEPT with a projection on the result.
 query T
@@ -1084,7 +1084,7 @@ vectorized: true
       table: xyz@xyz_pkey
       spans: FULL SCAN
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJzElkFv2jAYhu_7FdF3Asko2EloiTSJqmMaEitd4VBp4pASryBRnMVBglb971OSVZQA_mKMkqMhj_3a33N430D-XYIP_cf74c3gzmp8G4wn41_DpjXuD_u3E2tjfX8Y_bQajY81sbb5T5vta9PqP9727yfWzXBoHf-iCQRWIuR3wQuX4P8GCgQYEHCAgAsEPJgSiGIx41KKOP3kLQMG4Qb8NoHFKlon6c9TAjMRc_DfIFkkSw4-TIKnJX_gQchjuw0EQp4Ei2V2zGb72ovixUsQb4HArViuX1bSz8IBgXEUpKuWzWD6TkCsk_-H7PZ-2lrzQM73d-1R0kuRKQGZBM8cfPpOzsvr1ZOXncy722q9EnHIYx7ubTZNSeyTI5f-Ecj5mCejyKaFGU22Efc_KQQElvxP0shSN7_Gi-f5xwIIjNaJb_Vo4QF2N3MMbnYk9p1oicimXvENjp7t7p1Ny1tAz7DAZi3buay3Gok7dSVmJxNXYC6tzlxWfhbsnFk4Ldu9rD0aia_qSsxOJq7AHladPU75WTjnzMJt2d5l7dFIfF1XYnYycQX2ONXZ45afhXvOLLzWZd3RyNutJy87mbcCc9x6-taRUA9cRmIleak21U6vxcNnnj-TFOt4xu9jMcuOyZejjMt6QMhlkv_L8sVglf-VBiwPd0zgrglMjXJTT01TjSdjenDHBO6awNQod-HJDmhWpNufaUf93o4Spvtv1i7SrongahgRXA0jgqthTHCERgT3TARXw4jgahgRXA1jgiM0InjHRPArE0XVMKKoGkYUVcOYogiNKHptoqgaRhRVw4iiahhTFKERRbsmilKjnoDQiKQIjViK0JimGI51BbOyYNYWzOqCYV8wKwzUqDHQg8qgZauaxmxV05itahq1FcExW3XK0uHMdNqSLo3ZqtWXtHHM1oPyoLR1-v7lXwAAAP__bPGU_Q==
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJzElkFv2jAYhu_7FdF3Asko2EloiTSJqmMaEitd4VBpQlNKvIJGcRYHibTqf58SVrUE8BdjlBwNeezX_p7D-wLy7xJ86N_fDq8GN1bjy2A8Gf8YNq1xf9i_nlgb6-vd6LvVaLytiZVuf9qkz02rf3_dv51YV8OhdfiLJhBYiZDfBE9cgv8TKBBgQMABAi4Q8GBKIIrFjEsp4uyTlxwYhBvw2wQWq2idZD9PCcxEzMF_gWSRLDn4MAkelvyOByGP7TYQCHkSLJb5MZv0ubdJn39Ff3gKBK7Fcv20kn6eDgiMoyBbtWwG01cCYp38P-V984fUmgdyvrttj5JehkwJyCR45ODTV3JaYK-mwOxo4Pet1isRhzzm4c5m04zEPjlw62-BnI95MopsWpjSJI24_0EiILDkv5NGnrr5OV48zt8WQGC0TnyrRwsP8H4zx-BmB2LfiJaIbOoV3-Dg2e7O2bS8BvQUDWzWsp3zmqsRuVNbZHY0cgXu0urcZeWHwU4ahtOy3fP6oxH5orbI7GjkCvxh1fnjlB-Gc9Iw3JbtndcfjciXtUVmRyNX4I9TnT9u-WG4Jw3Da53XHo3A3ZoCs6OBK3DHrad3HQh1x2UkVpKXalXt7Fo8fOTbZ5JiHc_4bSxm-THb5Sjn8jYQcpls_2XbxWC1_SsLWB7umMBdE5ga5aaemqYaT8b04I4J3DWBqVHuwpPt0axItz_Sjvq9HSVMd9-sXaRdE8HVMCK4GkYEV8OY4AiNCO6ZCK6GEcHVMCK4GsYER2hE8I6J4BcmiqphRFE1jCiqhjFFERpR9NJEUTWMKKqGEUXVMKYoQiOKdk0UpUY9AaERSREasRShMU0xHOsKZmXBrC2Y1QXDvmBWGKhRY6B7lUHLVjWN2aqmMVvVNGorgmO26pSl_ZnptCVdGrNVqy9p45ite-VBaev09dO_AAAA__9eK5nz
 
 query T
 EXPLAIN (DISTSQL) SELECT x FROM ((SELECT x, y FROM xyz) EXCEPT (SELECT x, y FROM xyz))
@@ -1104,4 +1104,4 @@ vectorized: true
       table: xyz@xyz_pkey
       spans: FULL SCAN
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJzEmFFr4zgUhd_3V5j71IKCK8lOUsNCh06WLWTbbpOHgaUPnkTbBtI4azvQTOl_X5JQPLXre6TY7jzKzmcd3egcX_mFsv-WFNHo2-34y9W1d_L1ajKd_D0-9Saj8ehy6j17f9zd_OWdnLyNhbc9XHre_jj1Rt8uR7dT7-O7pyRolczNdfxkMor-IUmCFAnSJCggQSHdC1qnycxkWZLufvKyB67mzxSdCVqs1pt8d_le0CxJDUUvlC_ypaGIpvH3pbkz8dyk_hkJmps8Xiz30zxvf1ys08VTnG5J0GWy3DytsmgvjgRN1vFu1PMV3b8KSjZ5MUmWxw-GIvkqjhMStixEuQj5usjyxWqW-7JUjwspLspzFNj3rfcYZ48fI4UUfZyUsAMpQa2U4lGbVZLOTWrm7x62f0qtWGVRt0JF2JUKi5IVKvoNVIijhP4ZZ48Tk9-sfV2q13S7NtFbJHwZj0nQ0vybn-xXcPp7unh4fBuQoJtNHnkXsnZlg3bre530krWvw3INPpx7-G5uaR8A8ogA8FXP15ZZ5CCl37oU5SKliADZeRpZS-l3nkayvRywqFtdGrWowqJkdWnkpqJxGsnPSyNlb0N1jA11zw8sE8FByqB1KcpFSmFD1XkiWEsZdJ4Iqj0vWtStLhFaVGFRsrpEcFPROBHU5yWCtrehPsaGQc8PLRPBQcqwdSnKRUphQ915IlhLGXaeCLo9L1rUrS4RWlRhUbK6RHBT0TgR9OclQmBvw-AYG4Y9yzxwEHLeshDlIqSwYNB5GlhLOe88DYL2fGhRt7o0aFGFRcnq0sBNReM0CH7N94sPRN2ZbJ2sMmP1deJstywzfzCHMmXJJp2Z2zSZ7ac5DG_23P7C3GT54a46DK5Wh1s7gT_DkoU1D6syLH-Gg3ewdIOlakSfN6FVvwmtNU9rlg6bwLLR1OqsET1oQmuwWQJ2m4L_K3SAVRnuszBY9IB3V5-315Cl5RlPn_O0BLlQSRUXbwMamRvhwN0AR_YGOPK3rESqi8EBjRwOcGRxhIPtDnBkclkJ1vdbFuGViOHwitElnzFo6XzIyAGwGx8zcgjwStA4uZWnoVsBjtzK49CtPA7dWglZJ7fyNHQrj0O3AhxtWR6HbuVfMEqCJgq0rZJ3q-IbV7B0xSeNCkDfyyeNCgFeSRqnvpmnYeMMcNQ58zhsnXkcuVVVUtbFrYBGbgU4civC0ZblceRWxb9g1BDgfCdbwqtu5VtZtHQ-aTRoZTWfNBqckDXf1IC6Axq5FeHArQBHbgU4POnyB2V01AVH_GaTw8MuwNFpF3wjQLuGf8FoVDq-lS3hFbdqvpctL_3-9bf_AwAA__8NXTKa
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJzEmFFv4rgXxd__nyK6T61kFGwnQCP9pY46rLYS23YLDyOtqhUD3hYtQ9gkSNCq330FqMo0ae6xSdJ9dMIvPr74nFznhdJ_lhTR8Nvd6Mv1jXf29Xo8Gf8-OvfGw9HwauJtvV_ub3_zzs7exsLbHS9td8_n3vDb1fBu4n1895wEreK5uZn-MClFf5AkQYoEaRIUkKCQHgStk3hm0jRO9j95OQDX8y1FXUGL1XqT7S8_CJrFiaHohbJFtjQU0WT6fWnuzXRuEr9LguYmmy6Wh2m2u-fL7e75z_XfZkeCruLl5scqjQ7qSNB4Pd2POr6ih1dB8SbLZ0mz6aOhSL6K05SETStRLkq-LtJssZplvixU5FKKy-IcOfZ95z1N06ePkVyKPk1K2IKUoFJK_qjNKk7mJjHzdw87PKVSrLKoW64ibEuFRclyFb0aKsRJQn-dpk9jk92ufV2o12S3NtFbKHwZjUjQ0vyVnR1WcP7_ZPH49DYgQbebLPIuZeXK-s3W9ybuxGtfh8UafDj34N3c0j4B5CkJ4KuOry3TyEFLr3ktykVLHgKy9TyyltJrPY9kc0lgUbeqPGpQhUXJqvLITUXtPJKfl0fK3ofqJB_qjh9YZoKDln7zWpSLltyIqvVMsJbSbz0TVHNutKhbVSY0qMKiZFWZ4Kaidiaoz8sEbe9DfZIPg44fWmaCg5ZB81qUi5bciLr1TLCWMmg9E3RzbrSoW1UmNKjComRVmeCmonYm6M_LhMDeh8FJPgw7longoOSiaSXKRUluwqD1PLCWctF6HgTNOdGiblV50KAKi5JV5YGbitp5EPw33zE-EHVv0nW8So3VV4rufllm_miOZUrjTTIzd0k8O0xzHN4euMOFuUmz4111HFyvjrf2An-GJQtrHlZFWP4MB-9g6QZLVYu-qEOrXh1aa57WLB3WgWWtqVW3Ft2vQ2uwWQJ2m4L_K3SAVRHusTBYdJ93V4-314ClZZenL3haglwopYqLtwGNzI1w4G6AI3sDHPlbliLVxeCARg4HOLI4wsF2BzgyuSwF6_sti_BSxHB4yeiSzxi0dD5kZB_YjY8ZOQB4KWic3MrT0K0AR27lcehWHoduLYWsk1t5GrqVx6FbAY62LI9Dt_IvGCVBEwXaVsm7VfGNK1i64pNGBaDv5ZNGhQAvJY1T38zTsHEGOOqceRy2zjyO3KpKKeviVkAjtwIcuRXhaMvyOHKr4l8wagBwvpMt4GW38q0sWjqfNBq0sppPGg1OyJpvakDdAY3cinDgVoAjtwIcnnT5gzI66oIjfr3J4WEX4Oi0C74RoF3Dv2A0Kh3fyhbwkls138sWl_7w-r9_AwAA__8jvDeQ
diff --git a/pkg/sql/opt/exec/execbuilder/testdata/experimental_distsql_planning_5node b/pkg/sql/opt/exec/execbuilder/testdata/experimental_distsql_planning_5node
index 6fc57515b216..a9bd33d6fa29 100644
--- a/pkg/sql/opt/exec/execbuilder/testdata/experimental_distsql_planning_5node
+++ b/pkg/sql/opt/exec/execbuilder/testdata/experimental_distsql_planning_5node
@@ -55,7 +55,7 @@ vectorized: true
   table: kv@kv_pkey
   spans: FULL SCAN
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJykkk9rq0AUxffvU8hZvfcY8f9buHolTUFIkzRmUSgurHMJEuPYGQ0twe9e1EWakJaJWd6Z--P8uJwD1FuBENPn5ewumhu_76N4HT_N_hjxdDadrI2_xsNq8Whs92AoBad5uiOF8AUOGFwweGDwwRAgYaikyEgpIbuVQw9E_B2hzZCXVVN3zwlDJiQhPKDO64IQYp2-FrSilJO0bDBwqtO86GO2-_-VzHep_ADDRBTNrlShsWVGJxRXaTeZloukZRBNfcxQdbohhE7LvvE4xjelkJwk8ZPopL1gOhemqKzgbPFytHsS7eifwLn-BJZrWp7mEVx9E3eEiWdavqaJp2_ijTDxTSvQNPH1TfwRJoE5oqAXPFakKlEq0uqf3RWY-IaGtivRyIyWUmR9zDAueq5_4KTq4dcZhqjsv3rBr7DzI_zvBLbPYfeWZO8W2L8FDq6Ck_bXZwAAAP__fvi71Q==
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJykkk9ro0AYxu_7KeQ57S4j_t-Dp12yKQhpksYcCkWKdV5C0Dh2RkNL8LsX9ZAmpGViju_M--P58fIcoF4LhJg-Lmf_ornx838Ur-OH2S8jns6mk7Xx27hbLe6NfA-GUnCapztSCJ_ggMEFgwcGHwwBEoZKioyUErJbOfRAxN8Q2gzbsmrq7jlhyIQkhAfU27oghFinLwWtKOUkLRsMnOp0W_Qx-f5vvn-ucnoHw0QUza5UoZEzoxOKq7SbTMtF0jKIpj5mqDrdEEKnZV94HOObUkhOkvhJdNJeMJ0LU1RWcLZ4Odo9iXb0T-BcfwLLNS1P8wiuvok7wsQzLV_TxNM38UaY-KYVaJr4-ib-CJPAHFHQCx4rUpUoFWn1z-4KTHxDQ9uVaGRGSymyPmYYFz3XP3BS9fDrDENU9l-94GfY-Rb-cwLb57B7S7J3C-zfAgdXwUn74yMAAP__zL67ng==
 
 # Note that we want to test DistSQL physical planning and the obvious choice
 # would be to use EXPLAIN (DISTSQL). However, this explain variant doesn't have
diff --git a/pkg/sql/opt/exec/execbuilder/testdata/explain_analyze_plans b/pkg/sql/opt/exec/execbuilder/testdata/explain_analyze_plans
index 5155eda48137..99140339bb54 100644
--- a/pkg/sql/opt/exec/execbuilder/testdata/explain_analyze_plans
+++ b/pkg/sql/opt/exec/execbuilder/testdata/explain_analyze_plans
@@ -112,7 +112,7 @@ regions: <hidden>
           table: kw@kw_pkey
           spans: FULL SCAN
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJzsm99u4rgXx-9_T2H5qtWECU5CSyONxEw1v1VnWxj1z0ijFapScpZGQMIkprRb9bH2BfbJVkmGKRCwMdNZu9h3SRyHk4-Pzzc-Pjzi7NsQ-_ji4-nH40s0uHs7sFBw198bTN8O9tH_zztnaHCHPnVO2mgwRZ12cQt6h_J29Nt55-oz-vC1uIgtHCchtIMRZNj_AxNsYQdb2MUW9rCFG7hr4XGa9CDLkjS_5bHocBLeY79u4SgeT2h-uWvhXpIC9h8xjegQsI8vg5shnEMQQmrXsYVDoEE0LH5mcNcap9EoSB-whY-T4WQUZz7KrbkYB_lhzc6t-P0LotEIfFT_5--sPO8lMYWYRklcaUqTaYZSCEIfkfLKzQOF2aUm-oAtfPbl-BhlFMaol0xiivbgntpRTPd9VC-MLG8AGKy7YRTcoxGMkvQBBcNh0gsohD6qF0-_CWjvFjKUTOh4Qn2U319YNbtAcPfJwuVZCXMG6-YB3QbZ7SKmVn5_18IZDfqAffJkbUf_YIn-lEPfJob_Cv7OWv7Pz0nSEFIIl5_zJv_hje5aMZRnkPbhUxLFkNpkaSYN4U-61yJv9t-lUf-2PMQW7uRv2yJWKx9GuIfepDpkLJJ5W_ZtiCiMxiiMsgGaZEEftgb9DNEVceL3_X4K_YAmqU0albGxcKfkmL8qtvD79tfrdufyun11errXIjmHi6uzvZaTHx13rtqX34_XAPnF7uP9nPuw8Tj1n8NzcXV2fZIDcvOzc4hDSAsPQi3HbrkvCO0ZSGMDIJN4FZKVNNpJLRnbzpKfbGt2Y63ZBwtmk83DMBEUQdup2a4Jw2wZFOB_KCqDhj9fBokcGSQ7JYMcJ56XwYPdkkFh9-HIIHntMuhsHs8cUT1xa7Zn4hlbTwT4N0X1xPDn64kjR0-cndITjhPP68nhbumJsPtw9MR57Xribh7PXFE98Wp2w8Qztp4I8D8S1RPDn68nrhw9cXdKTzhOPK8nzd3SE2H34eiJ-9r1xNs8nnmietKomWjGVhMB-g1BNanZBAVxiAhK6C2kZiTYuuLJ0RVvp3SF487zunK0W7oi7D4cXfFeu65wdgLPIRsncQZL20Crn1zPaUHYh5JulkzSHnxOk17xM-Vpp-hXJCBDyGjZ6pQnJ_GsKaMBZW0j_cpJVC-DxubWN9daHwOdJukADQMKce_hh_mz69MgoosvFkIGaRQMo7-C6lvPun0P-T2I7orXnmuaxf4fbcU7z1pHkOUolju_PBLiSmZCGEyaL8KECDMxflKd-LL9RAoTIhAMHeWCIdv65lrrtR3QpWD43zOREgw5TIyf8IKhJkycZSb1eSaLSOrLnV0mUE-lz8oVU4RtPanrqI0cJg3DpBI2jJ9UmWjpJx4zlC4hWe7cYHZ2DhYDsXJfpQdbJhh22B3YSNavRl_DgEpPMCg4onomGDgTX7afSFl7HW6ZYNhhN2EjWb8aVSMYsq2XnmBQcET1TDBwJr5sP5ESDJvMD9sjdoLhaMsEww77GBsJI2uhRtKFY76WC0c2Ez0TDBwmWvoJqezmsTIMesgLEdnN08VPRPYIDRNOQkONJQjPftmDquTkl519kOPplS09k37gMNFyscphwshqKBIROfbLHlQ5EZEz-WWnIOR4emW3cuG7mXjsJASpbOyZLASHiZ7FEzwo6xdoauRmOPbrmYjgQZG96pYDhV2uIJuJHOk1NRCiTPRctJrSCnEoqpfL8Ca_noNqCiFEmei5aDX1FeJQVK-Z4U1-PQeVXQ1BOOUQxNRDVJFuXRChMRTZCzQVoTDSG4qkZ0xNxIr_r5maiCoTtWsiVGQiOxMhZ-5sXROhMRTjKULpDTUWI47aNRFyIqKpiRBlomcmggfFeIpQekORiMiuiXA4NRGOqYmoIjU1EeJQZC_QVISiZ6EFD4rq1TOOqYnoPnWf_vdvAAAA__-xnB8P
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJzsm29vm7oXx5__XoXlR51GRgykS5EmZav2u-pum0z9M2m6iioazk0RCWTgJO2t-rLuG7iv7ApY1iQkdpx11xT7GWBMDh8fny8-PnnA6bcRdvHFx9OPx5conL0JDeTNhgfh_E34Cv3_vHeGwhn61DvponCOet38FvQOZe3ot_Pe1Wf04Wt-ERs4in3oemNIsfsHJtjAFjawjQ3sYAO3cN_AkyQeQJrGSXbLQ97hxL_DbtPAQTSZ0uxy38CDOAHsPmAa0BFgF196NyM4B8-HxGxiA_tAvWCU_0w464Sz60kI99jAx_FoOo5SF2XWXEy87LBhZlb8_gXRYAwuav7zd1qcD-KIQkSDOCo1JfE8RQl4votIceXmnsLiUht9wAY--3J8jFIKEzSIpxFFB3BHzSCir1zUzI0sbgAIt90w9u7QGMZxco-80SgeeBR8FzXzp994dHALKYqndDKlLsruz61aXCC4_2jg4qyAuYB1c49uvfR2FVMnu79v4JR6Q8AueTT2o3-4Rn_eCecs-ibR_Dfwt7byf3pOnPiQgL_-nNfZD-9014ahPINkCJ_iIILEJGszaQR_0oMOef3qXRIMb4tDbOBe9rYdYnSyYYQ7GEzLQ8YimbWl30aIwniC_CAN0TT1hrA36CeItogTvx8OExh6NE5M0iqNjYF7BcfsVbGB33e_Xnd7l9fdq9PTgw7JOFxcnR10rOzouHfVvfx-vAXIL3Yf5-fch43Hav4cnours-uTDJCdnZ1D5EOSexDqWGbHfkZoT0BaOwCZRpuQbKTRjRvxxLTW_GRfs1tbzT5cMZvsHoaJoAiaVsO0dRhmy6AA_7eiMqj582WQyJFBUisZ5Djxsgwe1ksGhd2HI4PkpcugtXs8s0T1xG6Yjo5nbD0R4N8W1RPNn68nlhw9sWqlJxwnXtaTt_XSE2H34eiJ9dL1xN49ntmieuI0zJaOZ2w9EeB_JKonmj9fT2w5emLXSk84TrysJ-166Ymw-3D0xH7peuLsHs8cUT1pNXQ0Y6uJAP2WoJo0TIK8yEcExfQWEj0SbF1x5OiKUytd4bjzsq4c1UtXhN2HoyvOS9cVzk7gOaSTOEphbRto85ObGS3wh1DQTeNpMoDPSTzIf6Y47eX98gSkDyktWq3i5CRaNKXUo6xtpF85iZpF0Njd-vZW6yOg8zgJ0cijEA3uf5i_uD73Arr6Yj6kkATeKPjLK7_1otv3kD-AYJa_9lLTIvb_aMvfedE6hjRDsd75-ZEQWzITwmDSfhYmRJiJ9pPyxJftJ1KYEIFgaFUuGLKtb2-1XtkBXQuG_z0TKcGQw0T7CS8YKsLEWmfSXGayiqS53tlmAnWq9Fm5YYqwrSdNFbWRw6SlmZTChvaTMhMl_cRhhtI1JOudW8zO1uFqIK7cV-nhngmGGrsDG8n21ehLGFDpCYYKjqiaCQbOxJftJ1LWXm_3TDDU2E3YSLavRqsRDNnWS08wVHBE1UwwcCa-bD-REgzbzA_bI3aC4WjPBEONfYyNhJG1qEbShWO-kgtHNhM1EwwcJkr6CSnt5rEyDGrICxHZzVPFT0T2CDUTTkKjGksQnv2yB7WSk1929kGOp5e29HT6gcNEycUqhwkjq1GRiMixX_agyomInMkvOwUhx9NLu5Ur383EYSchSGljT2chOEzULJ7gQdm-QKtGboZjv5qJCB4U2atuOVDY5QqymciRXl0DIcpEzUWrLq0Qh1L1chne5FdzUHUhhCgTNRetur5CHErVa2Z4k1_NQWVXQxBOOQTR9RBlpHsXRCgMRfYCrYpQGOmNiqRndE3Ehv-v6ZqIMpNq10RUkYnsTIScubN3TYTCULSnCKU3qrEYsapdEyEnIuqaCFEmamYieFC0pwilNyoSEdk1ERanJsLSNRFlpLomQhyK7AVaFaGoWWjBg1L16hlL10T0H_uP__s3AAD__0UxHqY=
 
 # This query verifies stats collection for the hashJoiner, distinct and sorter.
 query T
@@ -178,7 +178,7 @@ regions: <hidden>
               table: kw@kw_pkey
               spans: FULL SCAN
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJzsm9Fuo0YXx--_pxjNVaIPL8yAHQdppWiTVM22G1dJtFJV-YLANEa2wcuM46RRHqsv0CerwGW9NmaOSbaZqYe72IBz5nfOnP_wH3jC_MsE-_j6_Ofz0xt0dnF9c3F5eoMOxot3i0P0w9XgExrfo4-Di0s0XqDBJRrfvxuj9yg_jgZXZ-dX6MOvxSds4SSN2GUwZRz7v2GCLUyxhV1sYQ9buIuHFp5lacg4T7P8lKfigovoAfuOheNkNhf510MLh2nGsP-ERSwmDPv4JridsCsWRCyzHWzhiIkgnhT_Znx_MsviaZA9YgufppP5NOE-GmMLX8-C_M-OnUfx02ck4inzkfPXn3z5OUwTwRIRp0nlUJYuOMpYEPmILL-5fRSs_KqPPmALf_p8eoq4YDMUpvNEoAP2IOw4EYc-cooglycwNq47YRo8oCmbptkjCiaTNAwEi3zkFL9-G4hwxDhK52I2Fz7Kzy-iKr8gePhs4eWnJcwS1u0jGgV8tI7pJD9_aGEugjuGffJsvYx-b4P-Yhv9xYq-TVr-W_jTWv6r35knaRaxjEVrvzTMr4RO2ZLEHwM--pjGCctssjGFJux3cXBCDt9n8d2o-AtbeJAP8iRPHXtg4byaJhm9_Bj_MkGCTWcoivkYzXlwx14MdwXObVK4ZzEXcRIKm3Qr2dBiXM2KxntF0cjoUEdPOquRd5tk_TrNBMtsWsn5_3UbVm-HhG5LZzGWrTm9TDvpzHY3ElozaDDybm3kR2uRk931gzRUb5t2bLfVD7l-N-B_1FS_W_6wfpM31m-yL_oNFO5Kv3t6KtRr9LtZ0Uj1m-hJp06_gayX-l3Jueb6TXfvwrSpCrod22u7sFwFG_DvN1XBlj-sgvSNVZDuiwoChbtSwSM9-_xrVLBZ0UhVkOpJp04FgayXKljJueYq6O7ehd2mKuh17G7bheUq2ID_cVMVbPnDKui-sQq6-6KCQOGuVLCvZ59_jQo2KxqpCrp60qlTQSDrpQpWcq65Cnq7d2GvqQp2O20PlmtgA_rdhhrYsQkKkggRlIoRy9pMyNXQe2M19PZFDYESXqnhsZ79_jVq2KxopGro6UmnTg2BrJdqWMm55moIbNheMT5LE842u8HWX3byhLPoji2rg6fzLGS_ZGlY_Jvlx0FxXWE0R4yL5VG6_HCRlIe4CIRse_TfJOfgotvtHv1xbfQJE4s0G6NJIFgSPn4Nv_x-EcRifWAR4yyLg0n8R1AddXnZP0IVsvi-GPY3h0rF-nqsGHN5dMp4jmLz4u-PhHQVMyESJv3vwoQ0ZUJJWycVJkcmMiENmiHVrhnKoz-ujd7YhG40w7dnoqQZAkVO2joBmqEhTOgmE-dbJu4aEmfzYlcK1NNpWbllisijJ0auFwAmRq4X5Eyo2zKpMDHynsyTttKuvJV2pRf31nluXtyTN_H1TuZot6Q9eqE7sce1JEdSP73-CwlV7k5omFEz3QmAierVhpIbt_4L3Yk9LhM5knrLQ49mKI9euTuhYUbNdCcAJqrdCSXN8Fi6sCWOfE1N5O53vT-xx1UGMJG4HnqYNlD8qtcMOibVTIsCgmKkR0EqHvh6R6VAR5XbxT0TF-wE8MKMLDM5EzOnHuCt17sietzHQHWu2sHQcvKbuRypOOGthwEwMfO5DTkTiTWiSUcE6ly1jaGmIwJQVPsYaipdvr1HesCyu7LB1xoZABMzH9-AoNQvRzRxd-TxG2pkAFDMvJuq7B2ud9Q-0FErbntrZJCK294aGQAT1VNPxzox8_EOaPJota_ygviNNDJok_fmDLmVAZioNjKUdESAiZnPeECTp94d0aMjQvEbaWRQ-f4hBfYPaWX_sDUyACZmGhkQFDOXI3IoEndED3cHil_13ZSapFZ2ENc7qgd0VPlbJ0YaGbTitmtlZOjIxMypJ2dippEBTR4zlyMAFK32VbbFD2whGHnTLmei2shQU-fA_qGZRgYweVQ_5qEllHp3RJOOKN8_pMD-IZW_rWOmkQG86WbmygGAYqaRAbzrZuRjHhAUrV7637aekr-s5wIv67kVu91AI2P4_L-_AwAA__9cpPHe
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJzsm9Fuo0YUhu_7FKO52qh4YQbsOEgrRZukarbduEqilarKqghMYwQGLzOOk0Z5rL5An6wCl_XamDkm2Yaph7vYgHPmO2fOP_wDj5h_jrGLr85-Pju5RqfnV9fnFyfX6E20eLs4QD9cjj6i6A59GJ1foGiBRhcounsboXcoP45Gl6dnl-j9r8UnbOAkDdiFN2Ucu79hgg1MsYFtbGAHG7iPxwaeZanPOE-z_JTH4oLz4B67loHDZDYX-ddjA_tpxrD7iEUoYoZdfO3dxOySeQHLTAsbOGDCC-Pi30R3x9Hd77OIPWADn6TxfJpwF0XYwFczL_-zZ-ZR_PQJiXDKXGT9_RdffvbTRLBEhGlSOZSlC44y5gUuIstvbh4EK78aovfYwB8_nZwgLtgM-ek8EegNuxdmmIgDF1lFkMsTGIvqTph692jKpmn2gLw4Tn1PsMBFVvHrN57wJ4yjdC5mc-Gi_PwiqvILgsdPBl5-WsIsYd08oInHJ-uYjvPzxwbmwrtl2CVPxvPoDzboL46jRYX-YkXfJB3_LfxpLf_V78yTNAtYxoK1XxrnV0KnbEnijx6ffEjDhGUm2ZhCMftDvDkmB--y8HZS_IUNPMoHeZynjt0zf15Nk4xefox_jpFg0xkKQh6hOfdu2bPhrsDZTQr3NOQiTHxhkn4lG0qMq1nROC8oGhkdaqlJZzXyfpOsX6WZYJlJKzn_XrVhDXZI6LZ0FmPZmtOLtJfOTHsjoTWDBiPv10Z-uBY52V0_SEP1NmnPtDv9kOt3A_6HTfW74w_rN3ll_Sb7ot9A4a70e6CmQr1Ev5sVjVS_iZp06vQbyHqp35WcK67fdPcuTJuqoN0zna4Ly1WwAf9hUxXs-MMqSF9ZBem-qCBQuCsVPFSzz79EBZsVjVQFqZp06lQQyHqpgpWcK66C9u5d2G6qgk7P7HddWK6CDfgfNVXBjj-sgvYrq6C9LyoIFO5KBYdq9vmXqGCzopGqoK0mnToVBLJeqmAl54qroLN7F3aaqmC_1_VguQY2oN9vqIE9kyAvCRBBqZiwrMuEXA2dV1ZDZ1_UECjhlRoeqdnvX6KGzYpGqoaOmnTq1BDIeqmGlZwrrobAhu0l47M04WyzG2z9ZStPOAtu2bI6eDrPfPZLlvrFv1l-HBXXFUZzwLhYHqXLD-dJeYgLT8i2R_9LchYuut3u0R_VRp8wsUizCMWeYIn_8CX88vuFF4r1gQWMsyz04vBPrzrq8rJ_hcpn4V0x7K8OlYr15Vgx5vLolPEcxebF3x4J6bfMhEiYDL8JE9KUCSVdnVSYHOrIhDRohlS5ZiiP_qg2em0TutEMX59JK80QKHLS1QnQDDVhQjeZWF8zsdeQWJsX21KgjkrLyi1TRB490XK9ADDRcr0gZ0LtjkmFiZb3ZI60lfblrbQvvXiwznPz4oG8ia93Mku5Je3hM92JPa4lOZL66fV_SGjr7oSCGdXTnQCYtL3aaOXGbfhMd2KPy0SOpN7yUKMZyqNv3Z1QMKN6uhMAk7bdiVaa4ZF0YUss-ZqayN3ven9ij6sMYCJxPdQwbaD4214zqJhUPS0KCIqWHgWpeODrHZUCHVVuFw90XLATwAvTsszkTPSceoC3Xu-KqHEfA9V52w6GkpNfz-VIxQnvPAyAiZ7PbciZSKwRRToiUOdt2xjtdEQASts-RjuVLt_eIwNg2V3Z4OuMDICJno9vQFDqlyOKuDvy-DU1MgAoet5NVfYO1zvqEOioFbe9MzJIxW3vjAyASdtTT8U60fPxDmjyKLWv8oz4tTQyaJP35jS5lQGYtG1ktNIRASZ6PuMBTZ56d0SNjgjFr6WRQeX7hxTYP6SV_cPOyACY6GlkQFD0XI7IoUjcETXcHSj-tu-m2klqZQdxvaM6QEeVv3WipZFBK267UkaGikz0nHpyJnoaGdDk0XM5AkBRal9lW_zAFoKWN-1yJm0bGe3UObB_qKeRAUyeth_zUBJKvTuiSEeU7x9SYP-Qyt_W0dPIAN5003PlAEDR08gA3nXT8jEPCIpSL_1vW0_JX9azgZf17IrdrqGRMX767p8AAAD__40T8XU=
 
 # This query verifies stats collection for WITH ORDINALITY and the hashJoiner.
 query T
@@ -236,7 +236,7 @@ regions: <hidden>
           table: kv@kv_pkey
           spans: FULL SCAN
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJzsUcFu00AQvfMVozkBWhTbcTjsySUUNdA2KImKEMph4x2lq9i77u46JIryWfwAX4ZsU9GkjduAuPU4b-bNvHlvg-4mQ47j0_PT_gRew4fR8AIWS_gymJzBcPR-cHlyPph8hZMxCHagMUOG2ki6FDk55N8wxCnDwpqUnDO2gjb1wECukAcMlS5KX8FThqmxhHyDXvmMkONEzDIakZBkOwEylOSFyuq1i2VSWJULu0aGfZOVuXYcFgyWyHBciKp6gww_XYFXOXEIfv5wTZ0a7Ul7ZfS9ljXfHVgSkkOvQWZrT7dQHMA7ZHhx1e-D81RAakrt4SWtfEdp_4pDUMtsBogWhwZysYKccmPXILLMpMKT5NBsnwmfXpMDU_qi9Byq-VrWLdDD6ZZhU_32zXkxJ-Thlj3d26GVSotM-XUn3LWWVpSW9-35B2HRMcLuhh49h_6Yt92_DL37v0OPDwr7o6fUxkqyJHfETCvmYyMPfHcm3PVHozTZTrz73bCSmoQsiVjSZUnMkh5L3iI79HZbVlXP3WTgKS9AKreA0ok5PTnK6LBlvWOyHJErjHa0b92Dm4PKL5Jzavx3prQpfbYmrc805bDm1YAk55tu2BQD3bQqgXfJYSs53iGH--Soldxtv9w94nK0T45byb29y9Pti18BAAD__2MJUVE=
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJzsUcFu00AQvfMVozkBWhTbcTjsySUUNdA2KImKEIrQxjtKLdu77u46JIryWfwAX4bspaJJm7QBceM4b-bNvHlvjfamQI7j0_PT_gRewrvR8ALyBXwaTM5gOHo7uDw5H0w-w8kYBNvTmCFDpSVdipIs8i8Y4pRhZXRK1mrTQOt2YCCXyAOGmapq18BThqk2hHyNLnMFIceJmBU0IiHJdAJkKMmJrGjX5oskX3ytclohw74u6lJZDjmDBTIcV6KpXiHDD1fgspI4BD--W1-nWjlSLtPqXsvobxYMCcmh55HZytEtFAfwBhleXPX7YB1VkOpaOXhOS9fJlHvBIWhl-gGifN9AKZZQUqnNCkRR6FQ4khz89plw6TVZ0LWrasehmW9l3QI9nG4Y-uqXb9aJOSEPN-zp3g6NzJQoMrfqhNvW0pLS-r49fyEsOkbY3dCj_6E_5m33D0Pv_uvQ473CfuuplTaSDMktMdOG-djIA9-dCXv9XmeKTCfe_m7YSE1ClkQs6bIkZkmPJa-R7Xv7UFZNz94U4KisQGY2h9qKOT05ymi_Zb1jshyRrbSytGvdg5uDxi-Sc_L-W12blD4anbZnfDlseS0gyTrfDX0xUL7VCLxLDg-S4y1yuEuODpK7hy93j7gc7ZLjg-TezuXp5tnPAAAA___reVE7
 
 # Verify that EXPLAIN ANALYZE on an unsupported query doesn't return an error.
 statement ok
@@ -292,7 +292,7 @@ regions: <hidden>
       table: kv@kv_pkey
       spans: FULL SCAN
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJzslctu2zoQhvfnKQazsgEaknw5KLhKa6RF0KYunMBdFF4w4sAlJJEKSfnSwI_VF-iTFaKiNnYutdfOznP5yeHnX5g7dLc5crw6_3Q-vgaxXHSyLkxm51PodOH9dHIJ2RIZaiPpsyjIIf-GCTLsI8MBMhwiwxHOGZbWpOScsXXLXRBcyDXymKHSZeXr9Jxhaiwhv0OvfE7I8Vrc5DQlIclGMTKU5IXKwzXZ8qy0qhB2gwzHJq8K7ThkyPCqFPXPXlRP8XEGXhXEIf710zVxarQn7ZXRj0rWrBxYEpJD0mRuNp7a1Bt4hwwvZ-MxOE8lpKbSHjq09pHSvsshDkM2DUTZcw2FWENBhbEbEHluUuFJcojD6TfCp9_Jgal8WXkOdX-Yqk0kON8ybKJ7as6LBSFPtuwZsn-BVtpYSZbkDsz59gn2X5WWZkU2Gu2Cfzv70DlLushwUs9zVlOmNaXVY6IvPbSuudscPBUlSOUyqJxY0MEcRs9y6O9wSA53WHKkw6J-Lxqcssf6h7PtH8t20IuGp8x2cDjbwbFsh73wUZ8s2-HhbIfHsh31TpnsP_b5lFxptKO97fP0yXG9lUguqFlhzlQ2pS_WpOGaJpwEXUhIcr6pJk1woUMpDPhQnLwo_n9HHO-L-8fcHJ4SXoWa_MrYDHLhSaebP39_m18J5XeNIcmRVSJXP8Rj17Sye-ukpJZ0b5-21HqorTU-aqsFuXrdPmyIDzbCLpLBK5J9JMNXJPtIRq9ItvPtf78DAAD__06QY8I=
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJzslcuO0zAUhvc8xdFZtZKrJL0glNVANaARDEWdUVmgCnnio2IlsTO20wujPhYvwJOhOBOYdi6k63bXc_nt469_dO7Q3mYY49X5p_PxNfDlopN2YTI7n0KnC--nk0tIl8hQaUGfeU4W428YIcM-MhwgwyEyHOGcYWF0QtZqU7XcecGFWGMcMpSqKF2VnjNMtCGM79BJlxHGeM1vMpoSF2SCEBkKclxm_pp0eZYuvxcpbZDhWGdlrmwMKTK8Knj1sxdUU3ycgZM5xRD-_mXrONHKkXJSq0clo1cWDHERQ1RnbjaOmtQbeIcML2fjMVhHBSS6VA46tHaBVK4bQ-iHrBuI0ucacr6GnHJtNsCzTCfckYgh9KffcJf8IAu6dEXpYqj6_VRNIsL5lmEd3VOzji8I42jLniH7D2iptBFkSOzAnG-fYP9VKqFXZILRLvi3sw-ds6iLDCfVPGcVZVpTUj4m-tJDq5q9zcBRXoCQNoXS8gW15jB6lkN_h0PU3mHRgQ4L-r1gcMwe67dn2z-U7aAXDI-Z7aA928GhbIc9_1EfLdthe7bDQ9mOesdM9j_7fEq20MrS3vZ5-uSw2kokFlSvMKtLk9AXoxN_TR1OvM4nBFlXV6M6uFC-5Ad8KI5eFL_eEYf74v4hN_un-FehIrfSJoWMO1LJ5u_f3-RXXLpdYwiyZCTP5E_-2DWN7N46Cckl3dunKTUeamq1j5pqTrZatw8bwtZG2EUyOCHZRzI8IdlHMjoh2c63r_4EAAD__1b2Y4s=
 
 # Very simple query to make it easier to spot regressions when rewriting results
 # in test files.
@@ -320,7 +320,7 @@ regions: <hidden>
   table: kv@kv_pkey
   spans: [/0 - /0]
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJyMUcFq20AQvfcrhjm1sGD5ulAoFSo1resiG-cQdFivBkdI2lF2R46N0WflB_JlQVrjEIIht31v3nszvD1jeGxQ4zr7m6UbqOFXvlpCfYC731meQQ3fIUGFjkv6Z1oKqO9xjoXCzrOlENiP1HkSLMoj6kRh5bpeRrpQaNkT6jNKJQ2hxo3ZNZSTKcnPxuCSxFTNFFsffnS-ao0_ocKUm751QUONCtedGZ-zZLL82YJULWlIXp5DxJadkJOK3YeR56cAnkyp4WLenYSuFPxEhcttmkIQ6sBy7wS-0lFmlZNvGuLKKCCqbwlac4SWWvYnME3D1ghd03dG7AMF4F66XuIZ01VvRDEojOhSWxCzJ9TzQX2-2pxCxy7Qu1ZvJSdDoZDKPcXvC9x7S_8922lNhKvJNxElBYnTeQQLF0dDMXx5DQAA__98z7nY
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJyMUdFq4zAQfL-vWPbpDgRxXgUHxxmXhjZNcUL6UExR5CU1siVXWqcJwZ_VH-iXFVshpZRA3zSzM7PL6IjhpUaJy-w2S1dg4CpfzMHs4OE6yzMw8BcSFGhdSXeqoYDyEadYCGy90xSC8wN1HAWzco8yEVjZtuOBLgRq5wnlEbnimlDiSm1qykmV5CdDcEmsqnqMNbt_ZvfUGjqgwNTVXWODBIMCl60anpNktNysgauGJCTvbyFi7SyT5crZbyPvXgN4UqWEk3lzYDpT8B8FztdpCoGpBe06y_Cb9jypLP-REFdGAZG5JGjUHhpqnD-AqmunFdM5faNYP1MA13HbcTxjvOqTKHqBEZ1qC6y2hHLai59Xm1NonQ30pdVLyUlfCKRyS_H7guu8pnvv9LgmwsXoG4mSAsfpNIKZjaO-6H99BAAA__9qHbnN
 
 # Test a query that has a subquery and a postquery.
 statement ok
@@ -410,6 +410,6 @@ regions: <hidden>
                       actual row count: 1
                       label: buffer 1
 ·
-Diagram 1 (subquery): https://cockroachdb.github.io/distsqlplan/decode.html#eJysU9Fq20oQfb9fMcyTDRssOVwo-5TUuGDiyMV2DKWYsFkNyhJpV90dNXaDP6s_0C8rkqw2IsRtad-0Z-bMnjl79IThU44SZ8lqulzDLFkvQN-bPIXN5fxmuoJBLGCwms6nkzUUxg7KIbxbLq6hVJ4sD4co0LqUElVQQPkRYxT4P24Flt5pCsH5Gn5qmmbpDmUk0Niy4hreCtTOE8onZMM5ocTEnblyNEaBKbEyeTOUdqQrNs4Cm4IkRN--BhR4p1jfUwBXcVmxhAgFevf4E4hxexDYno73BVYZoTw_iGea4tOa1uoupyWplPwo6itrbbgovSmU36PAicurwgYJJQpclar-PEOBc1MYhtqdq01_i6sNaGeZ7MsFrzbQ7ONJpbIj3-2ZOugNvEWB15vJBAJTCdpVlmFAOx4Zy0MJUSO4bSB6eK2hUDsoqHB-DyrPnVZMqYSomf4XLsd_4vJllnnKFDs_ivsmXyYfbpPF-ja5mc8HF3GduX-fiHFP6y9SuqRQOhuop_O1ydFhK5DSjNo_IbjKa3rvnW6uaY-LhtcAKQVuq-ftYWbbUi3wOTk-SR6fJo9PkqM-uVml2Qot8aPzD5ArJqv3P5zv8EdluP8mKQXyRuXmi3r5YB3tGHNN5jMdo96Vurx3tTbzXbWgEFTWa4h-Nwjbw3_fAwAA__-BaaYj
+Diagram 1 (subquery): https://cockroachdb.github.io/distsqlplan/decode.html#eJysU9Fq20oQfb9fMcyTDRssOVwo-5TUuGDiyMV2DKWYsFkNyhJpV90dNXaDP6s_0C8rkqw2IsRtaZ_sPTNn9szZoycMn3KUOEtW0-UaZsl6Afre5ClsLuc30xUMYgGD1XQ-nayhMHZQDuHdcnENpfJkeThEgdallKiCAsqPGKPA_3ErsPROUwjO1_BT0zRLdygjgcaWFdfwVqB2nlA-IRvOCSUm7syVozEKTImVyZuhtCNdsXEW2BQkIfr2NaDAO8X6ngK4isuKJUQo0LvHn0CM24PA9nS8L7DKCOX5QTzTFJ_WtFZ3OS1JpeRHUV9Za8NF-3NbPtAeBU5cXhU2SChR4KpU9d8zFDg3hWGoHbra9De52oB2lsm-XPJqA81OnlQqO_LdnqmD3sBbFHi9mUwgMJWgXWUZBrTjkbE8lBA1otsGoofXGgq1g4IK5_eg8txpxZRKiJrpf-F0_CdOX2aZp0yx86O4b_Rl8uE2Waxvk5v5fHAR17n796kY97T-IqlLCqWzgXo6X5scHbYCKc2o_RqCq7ym997p5pr2uGh4DZBS4LZ63h5mti3VAp-T45Pk8Wny-CQ56pObVZqt0BI_Ov8AuWKyev_D-Q5_VIb7b5JSIG9Ubr6olw_W0Y4x12Q-0zHqXanLe1drM99VCwpBZb2G6HeDsD389z0AAP__LpmnwQ==
 Diagram 2 (main-query): https://cockroachdb.github.io/distsqlplan/decode.html#eJyMj89K80AUxfffU1zOqoWBL9nOTiRCoLbSVjeSRZxc2oF0bpy5wULJY_kCPpk0I4gLweX53Tl_5oL02sOiXu-q7Z7q9X5D7uj7jp5uVo_VjhalocWuWlW3ezr5sBiWdLfd3NPQRg66XMIgSMfr9sQJ9hklGoMhiuOUJF7RZX5Qd2fYwsCHYdQrbgycRIa9QL32DIteXNuTkzEoFf8LGHSsre_nYD6zG9VLIPUntlR8vCcYvLTqjpxIRh1GtXR1RXn7BiWaySCrr96k7YFhy8n8fduW0yAh8Y9RvyUXU2PA3YHz_5OM0fFDFDfXZLmZfTPoOGm-llnUIZ-mZvr3GQAA__9Sm4hi
-Diagram 3 (postquery): https://cockroachdb.github.io/distsqlplan/decode.html#eJy0lMGO2jAQhu99itGcQLJEAnuofNrtipWyZJMKslwqDsYZdt0Ndmo7KgjxWH2BPlmVmFVLV6BStTfm9_zjb_it7NB9qZBjks3G0wKSrMhBPquqhPlN-jieQS9m0JuN0_FtAWule3Uf7qb5A9TCkvb9PjLUpqRMrMkh_4QxLhjW1khyzthW2nUNSblBHjFUum58Ky8YSmMJ-Q698hUhx8pIUYGTQsOyWa3IQjSIkGFJXqiqG583nsP1EBnShmTjldHg1Zo4RN-_OWS4FF4-kwPT-Lrtbf3WfP0pxLjYMwzVgcN58UTI4z37c9Y7VXmyZAfxMWDQOVzHkMwgywvIHtP0v_AOL-G9N0pPSZRkB8Nj4mJbE4d0fFfATVYkcJ8nGTIMAV_XVq2F3SLD1JiXpobPRmkwut0Q2SGP9ld3ObToLfNr7byoquONJ_M3tTTak37750zm3UCwJMowdTKH5dbTq_QePiDDh_ntLThPNUjTaA892viB0r7PDw8oNBC9nGr423Cik-GMLgknPHyy1lhQq7BzPBgd5_TvGa8uYZySq412dAR1anK0XzCk8onCB8CZxkr6aI3srgll3vk6oSTnw2kcikSHoxbwV3N81jw8bx6eNY_Om0dnzVe_mRf7dz8CAAD__4iLwK8=
+Diagram 3 (postquery): https://cockroachdb.github.io/distsqlplan/decode.html#eJy0lMGO2j4Qxu__pxjNCSRLJLCHv3xii0DKkk0qyHKpUBWcYdcl2KntqCDEY_UF-mRVYlYtXYFK1Z5gPs83-U0-Kwe0n0vkGCXz8SyDKMlSEC-yLGBxHz-N59AJGXTm43g8ymArVafqwmSWPkKVG1Ku20WGSheU5FuyyD9giEuGldGCrNWmkQ5tQ1TskAcMpapq18hLhkIbQn5AJ11JyLHUIi_BilzBql6vyUDQC5BhQS6XZTs-rR2HYR8Z0o5E7aRW4OSWOATfvlpkuMqdeCELunZV09v4jf7yQwhxeWToqxOHdfkzIQ-P7PdZJ7J0ZMj0wnNAr3MYhhDNIUkzSJ7i-J_w9m_hfdBSzSgvyPT658TZviIO8XiSwX2SRfCQRgky9AEP_c_HakN7ZBhrvakr-KSlAq2aLZGdMmn-tQDQ4Dfcr7V1eVmebz1dvKmFVo7U2xc0XbQDwVBe-KnTBaz2jl6l_-EdMnxcjEZgHVUgdK0cdGjnelK5Lj9dIt9AtLnU8KcBBRcDGtwSkL_8ZIw2INd-57A3OM_q7zPe3cI4I1tpZekM6tLk4LhkSMUz-Y-A1bUR9N5o0T7Gl2nra4WCrPOnoS8i5Y8awJ_N4VVz_7q5f9U8uG4eXDXf_WJeHv_7HgAA__9_S8JN
diff --git a/pkg/sql/opt/exec/execbuilder/testdata/inverted_filter_geospatial b/pkg/sql/opt/exec/execbuilder/testdata/inverted_filter_geospatial
index cc0796d43e3d..ea08b3a65774 100644
--- a/pkg/sql/opt/exec/execbuilder/testdata/inverted_filter_geospatial
+++ b/pkg/sql/opt/exec/execbuilder/testdata/inverted_filter_geospatial
@@ -32,7 +32,7 @@ vectorized: true
               table: geo_table2@geom_index
               spans: 31 spans
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJyUk1GP0kAQx9_9FJt5OUjWY7fFaPYJPXtawwECiRqXkMqO2FB26-7W1BC-u2mrcnCBu_Kwyczw2_n_pzs7cD8zEBB9ngxfxyPSeRvP5rOPwy6ZRcPoZk425HY6viNrNEuffMswIJ_eR9OIOL9MtUfrcOVd52oyjkfzTnjNSHjNuldCvIvGd9F8-oVW6LYLFLRROEq26EB8BQ4LCrk1K3TO2Cq1q_8QqxIEo5DqvPBVekFhZSyC2IFPfYYgYF7pmGKi0PYYUFDokzSrrz3IHFRtl6lWWAKFG5MVW-0E2VCyWeZZ4ZZGY6MNKMzypCr2JLyRsvyupCw5k7Jkjx3wvC3DJZBEKxIyYvwPtA4Wewqm8Ae_zidrBMH39OkzifUvtB7VbZp5tGh7_Hgw_-pRmVtiNBkEgrjKNXE-sV7ULsKXL6RkAZOSsccOIKhVW6wyf-Kewrjwggw4HQRnRxG0GcUHk-q_ryM4-zpym24T-_tp7cM27f9_gfC4eZMXp4vDOOPs4e9V_0F8Je5v1SDoHsSfVd5vo3yKLjfa4ZHuczez_YICqjU2u-tMYVc4sWZVt2nCcc3VCYXON1XeBLFuSpXA-zC_CAeX4eAiHF6Gw4tw_wRe7J_9CQAA___iRKak
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJyUk-GP0jAUwL_7VzTvC5DUo9swmn5Cz53OcIBAosaSZdInLox2tp2ZIfzvZtt5HFzYHfvQrO_t1_7eW7sD-zsDDuHX6ehtNCbd99F8Mf886pF5OAqvF2RDbmaTW7JGHbvkR4Y--fIxnIXEujhVDo3FlbPdznQSjRfd4IqR4Ir1Opx_CCe34WL2jVbotgcUlJY4TrZogX8HD5YUcqNXaK02VWhXfxDJEjijkKq8cFV4SWGlDQLfgUtdhsBhUXnMMJFo-gwoSHRJmtXLHjSH1bZxqiSWQOFaZ8VWWU42lGziPCtsrBU2bkBhnidVsi_gnRDlTylE6TEhSvbUAC8vZTwBJFGSBIxo9wuNheWegi7coV7rkjUC9_b0-T2J1B80DuVNmjk0aPrecWP-58MyN0QrMvQ5sVXVxLrEOF5XEbx-JQTzmRCMPTUAQSUvxariT6qnMCkcJ0OPDv2zrfAvacUnnaq70-G3nY671zjf4N_naQSXaNz_ieBYoonz0wvEPOaxx8-bwaN5hz-8XUO_d5A_az64xHyGNtfK4pH3uZXZfkkB5RqbO2x1YVY4NXpVb9NMJzVXByRa12S9ZhKpJlUJPoS9Vthvh_1WOGiHg1Z4cAIv9y_-BQAA___xTamM
 
 query T
 EXPLAIN (DISTSQL) SELECT k, k_plus_one FROM geo_table2 WHERE ST_Intersects('POINT(3.0 3.0)'::geometry, geom)
@@ -55,7 +55,7 @@ vectorized: true
               table: geo_table2@geom_index
               spans: 31 spans
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJyUk1GP0kAQx9_9FJt5AZL12G0xmn2qnj2t4QCBRI1LSGVHbK7s1t2tqSF8d9NWPeACd_Cwyczw2_n_pztbcD9zEBB_ngxfJyPSfZvM5rOPwx6ZxcP4ek7uKLlbFnnplkYjuZmOb8kazdKn33IMyKf38TQmzi8z7dE6XHnX7UzGyWjeDa8YCa9YryPEu3h8G8-nX2iNbnpAQRuFo3SDDsRX4LCgUFizQueMrVPb5g-JqkAwCpkuSl-nFxRWxiKILfjM5wgC5rWOKaYKbZ8BBYU-zfLm2nuZUd12mWmFFVC4Nnm50U4cWmu1AYVZkdbFvoQ3UlbflZQVZ1JW7LEDnl_KcAkk1YqEjBj_A62DxY6CKf29X-fTNYLgO_r0mST6F1qP6ibLPVq0fX44mH_1uCosMZpEgSCudk2cT60XjYvw5QspWcCkZOyxAwhqdSlWmz9yT2FcekEiTqPg5CiCS0bxwWT67-sITr6Owmab1P4-aE-j8KSC8BIF_z9CeNi_zYvj3WGccfbw92rwIO6I_cWKgt6-_tPiB5eIn6IrjHZ4IP3UzWy3oIBqje0GO1PaFU6sWTVt2nDccE1CofNtlbdBottSLXAf5mfh4DwcnIXD83B4Fh4cwYvdsz8BAAD__wPdrF0=
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJyUk1Fv0zAQx9_5FNa9rJXM6iRFID8FRgZBXVvaSoBwFYX6KFFTO9gOCqr63VGSwdpOzWgerNxd_vbvf_HtwP7MgUP0eTp6HY9J7208X8w_jvpkHo2imwXZULJJiry0iVZIbmeTO7JGnbj0W44--fQ-mkXEuiRTDo3FlbO9q-kkHi96wTUjwTXrX3H-LprcRYvZF1pLt32goLTEcbpFC_wreLCkUBi9Qmu1qVO75oNYVsAZhUwVpavTSworbRD4DlzmcgQOi5pjhqlEM2BAQaJLs7zZ9gEzrI9NMiWxAgo3Oi-3yvJjay0bUJgXaV0cCHgjRPVdClF5TIiKPbXA80s1ngCSKkkCRrT7gcbCck9Bl-7Br3XpGoF7e_r_PYnVLzQO5W2WOzRoBt5xY_7Wo6owRCsS-pzY2jWxLjWONy6Cly-EYD4TgrGnFiCo5KWy2vyJewqT0nESejT0z7bCv6QVH3Sm7m-H33U77l-TYoO_jzBoGJwlCS4h-fczgmOONs9PZ4h5zGOPn1fDR_EVPxyw0O8f8p-HH14CP0NbaGXxCP3czmy_pIByje0kW12aFU6NXjXHtOGk0TUJida1Va8NYtWWasBDsdcp9rvFfqc46BYHneLhiXi5f_YnAAD__0gur0U=
 
 query T
 EXPLAIN SELECT k, k_plus_one FROM geo_table2 WHERE ST_Intersects('POINT(3.0 3.0)'::geometry, geom)
diff --git a/pkg/sql/opt/exec/execbuilder/testdata/inverted_filter_geospatial_dist b/pkg/sql/opt/exec/execbuilder/testdata/inverted_filter_geospatial_dist
index 090c0d8775b6..e8766b9da6ec 100644
--- a/pkg/sql/opt/exec/execbuilder/testdata/inverted_filter_geospatial_dist
+++ b/pkg/sql/opt/exec/execbuilder/testdata/inverted_filter_geospatial_dist
@@ -43,7 +43,7 @@ vectorized: true
                   table: geo_table@geom_index
                   spans: 31 spans
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJyUlG9P2z4Qx5__XoV1T2j181rbCdrwo_InbJkKZWmnDc0Vypobi2jtzHanTKjvfUrCgIIaiB-4vTt_7u57snML7tcSJERfL8aH8TnpncTT2fTTuE-m0Tg6npEbcppMzsg1miuffl8i-fIhSiLi_FWuPVqHC-96e2efx7P4YhKfz3o9MRBEDESfkl4wYCQYsH5_T8r30eQsmiWXtMq16pNJchIl5OiS3AAFbTI8T1foQH4DDnMKhTULdM7YynVbH4izEiSjkOti7Sv3nMLCWAR5Cz73SwQJs6rHBNMM7ZABhQx9mi_rtPcSRlUDV7nOsAQKx2a5XmknyU3TGVCYFmnlGCo4Uqr8kSlVcqZUyV7a4E1Xhisgqc5IwIjxP9E6mG8omLV_kOh8eo0g-Ya-fgyx_o3WY3aaLz1atEO-PYt_8agsLDGajLgkrlJNnE-tl7WK4O2-UkwwpRh7aQOCOuuKVeKfqKcwWXtJRnznHESXOXw0ub67DWLXbShsvkrtn4fSdCR2Vg-6VL-ffrBdu_HLp4-IcRayZom7X8548-fg8OB-MR4-sx9Obq134TN7Tz5-iyPRf8XMwy6qp8Z6tMNwW_OI_78z_X6X9Am6wmiHW-l3ZWabOQXMrrH5ijiztgu8sGZRl2nMSc3Vjgydb6K8MWLdhKoGH8O8FRbtsGiFg3Y4aIXDdjhshfefwPPNf38DAAD__97t5tY=
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJyUVF9v2j4Uff99Cuu-FPTzwHZSbfUT_ZNumWjpAtNWzQhl5K6LoDazzZSp4rtPSbq2UJE2fnB87_U5OefGzh24X0uQEH29Gh7Hl6RzFo8n40_DLhlHw-h0QhbkPBldkBs0M59-XyL58iFKIuL8LNcercO5d52Di8_DSXw1ii8nnY7oCSJ6oktJJ-gxEvRYt3sg5ftodBFNkmtact12ySg5ixJyck0WQEGbDC_TW3QgvwGHKYWVNXN0ztgydVdtiLMCJKOQ69Xal-kphbmxCPIOfO6XCBImpcYE0wxtnwGFDH2aLyvaBwuDUsAs1xkWQOHULNe32kmyqJUBhfEqLRN9BSdKFT8ypQrOlCrYSxO8aYvhCkiqMxIwYvxPtA6mGwpm7R8tOp_eIEi-oa9vQ6x_o_WYnedLjxZtn2_34l89KlaWGE0GXBJXuibOp9bLykXw9lApJphSjL00AUGdtYWV5nfcUxitvSQDvrcPok0fPppc358G0XAa6tVstcA_jwroQOwVEbQR8fARgm0JdV7u3iXGWcjqIe6fnPF6cXR89DAYD5_Fjzu3xrvwWXwgn17Jgei-ovVhG9djYz3afrjtecD_30t_2IY-Qbcy2uEW_T5mtplSwOwG65-JM2s7xytr5tVr6nBU4apEhs7XVV4Hsa5LpcCnYN4IFs1g0QgOmsFBIzhsBoeN4MMd8HTz398AAAD__9wy6Yw=
 
 # The inverted filterer handles five inverted index rows with decoded
 # datums, where the first column is the PK (k) and the second is the cellid
@@ -94,7 +94,7 @@ vectorized: true
                   table: geo_table@geom_index
                   spans: 31 spans
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJyUlG9P2z4Qx5__XoV1T2j181rbCdrwo_InbJkKZWmnDc0Vypobi2jtzHanTKjvfUrCgIIaiB-4vTt_7u57snML7tcSJERfL8aH8TnpncTT2fTTuE-m0Tg6npEbcppMzsg1miuffl8i-fIhSiLi_FWuPVqHC-96e2efx7P4YhKfz3o9MRBEDESfkl4wYCQYsH5_T8r30eQsmiWXtMq16pNJchIl5OiS3AAFbTI8T1foQH4DDnMKhTULdM7YynVbH4izEiSjkOti7Sv3nMLCWAR5Cz73SwQJs6rHBNMM7ZABhQx9mi_rtPcSRlUDV7nOsAQKx2a5XmknyU3TGVCYFmnlGCo4Uqr8kSlVcqZUyV7a4E1Xhisgqc5IwIjxP9E6mG8omLV_kOh8eo0g-Ya-fgyx_o3WY3aaLz1atEO-PYt_8agsLDGajLgkrlJNnE-tl7WK4O2-UkwwpRh7aQOCOuuKVeKfqKcwWXtJRnznHESXOXw0ub67DWLXbShsvkrtn4fSdCR2Vg-6VL-ffrBdu_HLp4-IcRayZom7X8548-fg8OB-MR4-sx9Obq134TN7Tz5-iyPRf8XMwy6qp8Z6tMNwW_OI_78z_X6X9Am6wmiHW-l3ZWabOQXMrrH5ijiztgu8sGZRl2nMSc3Vjgydb6K8MWLdhKoGH8O8FRbtsGiFg3Y4aIXDdjhshfefwPPNf38DAAD__97t5tY=
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJyUVF9v2j4Uff99Cuu-FPTzwHZSbfUT_ZNumWjpAtNWzQhl5K6LoDazzZSp4rtPSbq2UJE2fnB87_U5OefGzh24X0uQEH29Gh7Hl6RzFo8n40_DLhlHw-h0QhbkPBldkBs0M59-XyL58iFKIuL8LNcercO5d52Di8_DSXw1ii8nnY7oCSJ6oktJJ-gxEvRYt3sg5ftodBFNkmtact12ySg5ixJyck0WQEGbDC_TW3QgvwGHKYWVNXN0ztgydVdtiLMCJKOQ69Xal-kphbmxCPIOfO6XCBImpcYE0wxtnwGFDH2aLyvaBwuDUsAs1xkWQOHULNe32kmyqJUBhfEqLRN9BSdKFT8ypQrOlCrYSxO8aYvhCkiqMxIwYvxPtA6mGwpm7R8tOp_eIEi-oa9vQ6x_o_WYnedLjxZtn2_34l89KlaWGE0GXBJXuibOp9bLykXw9lApJphSjL00AUGdtYWV5nfcUxitvSQDvrcPok0fPppc358G0XAa6tVstcA_jwroQOwVEbQR8fARgm0JdV7u3iXGWcjqIe6fnPF6cXR89DAYD5_Fjzu3xrvwWXwgn17Jgei-ovVhG9djYz3afrjtecD_30t_2IY-Qbcy2uEW_T5mtplSwOwG65-JM2s7xytr5tVr6nBU4apEhs7XVV4Hsa5LpcCnYN4IFs1g0QgOmsFBIzhsBoeN4MMd8HTz398AAAD__9wy6Yw=
 
 statement ok
 ALTER INDEX geo_table@geom_index EXPERIMENTAL_RELOCATE VALUES (ARRAY[2], 1152921574000000000)
@@ -132,7 +132,7 @@ vectorized: true
                   table: geo_table@geom_index
                   spans: 31 spans
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJyUlG9P2z4Qx5__XoV1T2j181rbCdrwo_InbJkKZWmnDc0Vypobi2jtzHanTKjvfUrCgIIaiB-4vTt_7u57snML7tcSJERfL8aH8TnpncTT2fTTuE-m0Tg6npEbcppMzsg1miuffl8i-fIhSiLi_FWuPVqHC-96e2efx7P4YhKfz3o9MRBEDESfkl4wYCQYsH5_T8r30eQsmiWXtMq16pNJchIl5OiS3AAFbTI8T1foQH4DDnMKhTULdM7YynVbH4izEiSjkOti7Sv3nMLCWAR5Cz73SwQJs6rHBNMM7ZABhQx9mi_rtPcSRlUDV7nOsAQKx2a5XmknyU3TGVCYFmnlGCo4Uqr8kSlVcqZUyV7a4E1Xhisgqc5IwIjxP9E6mG8omLV_kOh8eo0g-Ya-fgyx_o3WY3aaLz1atEO-PYt_8agsLDGajLgkrlJNnE-tl7WK4O2-UkwwpRh7aQOCOuuKVeKfqKcwWXtJRnznHESXOXw0ub67DWLXbShsvkrtn4fSdCR2Vg-6VL-ffrBdu_HLp4-IcRayZom7X8548-fg8OB-MR4-sx9Obq134TN7Tz5-iyPRf8XMwy6qp8Z6tMNwW_OI_78z_X6X9Am6wmiHW-l3ZWabOQXMrrH5ijiztgu8sGZRl2nMSc3Vjgydb6K8MWLdhKoGH8O8FRbtsGiFg3Y4aIXDdjhshfefwPPNf38DAAD__97t5tY=
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJyUVF9v2j4Uff99Cuu-FPTzwHZSbfUT_ZNumWjpAtNWzQhl5K6LoDazzZSp4rtPSbq2UJE2fnB87_U5OefGzh24X0uQEH29Gh7Hl6RzFo8n40_DLhlHw-h0QhbkPBldkBs0M59-XyL58iFKIuL8LNcercO5d52Di8_DSXw1ii8nnY7oCSJ6oktJJ-gxEvRYt3sg5ftodBFNkmtact12ySg5ixJyck0WQEGbDC_TW3QgvwGHKYWVNXN0ztgydVdtiLMCJKOQ69Xal-kphbmxCPIOfO6XCBImpcYE0wxtnwGFDH2aLyvaBwuDUsAs1xkWQOHULNe32kmyqJUBhfEqLRN9BSdKFT8ypQrOlCrYSxO8aYvhCkiqMxIwYvxPtA6mGwpm7R8tOp_eIEi-oa9vQ6x_o_WYnedLjxZtn2_34l89KlaWGE0GXBJXuibOp9bLykXw9lApJphSjL00AUGdtYWV5nfcUxitvSQDvrcPok0fPppc358G0XAa6tVstcA_jwroQOwVEbQR8fARgm0JdV7u3iXGWcjqIe6fnPF6cXR89DAYD5_Fjzu3xrvwWXwgn17Jgei-ovVhG9djYz3afrjtecD_30t_2IY-Qbcy2uEW_T5mtplSwOwG65-JM2s7xytr5tVr6nBU4apEhs7XVV4Hsa5LpcCnYN4IFs1g0QgOmsFBIzhsBoeN4MMd8HTz398AAAD__9wy6Yw=
 
 # Data is distributed, but the filterer can't be distributed since it is not a union.
 query T
@@ -160,7 +160,7 @@ vectorized: true
                   table: geo_table@geom_index
                   spans: 31 spans
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJyUlN9P2zAQx9_3V1j3Qqt5re0Ebfip_AhbpkJZ2mlDc4VCfWMRbdzZLgpC_d-nJAwoqIH4we3d-XN335OdO3B_5yAh-nk23I9PSecoHk_G34ZdMo6G0eGEXJPjZHRCrtBc-PRyjuTHlyiJiPMXM3ODFvXlbWfn5PtwEp-N4tNJpyN6goie6FLSCXqMBD3W7e5I-TkanUST5JyWqRZdMkqOooQcnJNroJAbjafpAh3IX8BhSmFpzQydM7Z03VUHYl2AZBSyfLnypXtKYWYsgrwDn_k5goRJ2WKCqUbbZ0BBo0-zeZX2QcGgbOAiyzUWQOHQzFeL3ElyXXcGFMbLtHT0FRwoVfzWShWcKVWw1zb40JbhCkiaaxIwYvwftA6mawpm5R8lOp9eIUi-pm8fQ5zfoPWoj7O5R4u2zzdn8T8eFUtLTE4GXBJXqibOp9bLSkXwcVcpJphSjL22AcFct8VK8c_UUxitvCQDvnUOos0cvposv78NYtttWNpskdrbx9J0ILZWD9pUf5h-sFm79stnb4hxFrJ6iftfznj9Z29_72ExHr6wH09urE_hC3tHPn2KA9F9w8jDNqLHxnq0_XBT8oC_35p-t036BN3S5A430m_LzNZTCqivsP6IOLOyMzyzZlaVqc1RxVUOjc7XUV4bcV6HygafwrwRFs2waISDZjhohMNmOGyEd5_B0_W7fwEAAP__bbfl1A==
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJyUVF1P2zAUfd-vsO4Lrea1thO04afyEbZMhbK004bmqgr1Hata4s52URDqf5-SMKBFDcQPju-9Pifn3Ni5B_d3ARKinxf9w_ictE7i4Wj4rd8mw6gfHY_InJwmgzNyjWbi06sFkh9foiQizk-m5hYt6qu71t7Z9_4ovhjE56NWS3QEER3RpqQVdBgJOqzd3pPyczQ4i0bJJS2obtpkkJxECTm6JHOgkBmN5-kNOpC_gMOYwtKaKTpnbJG6LzfEOgfJKMyy5coX6TGFqbEI8h78zC8QJIwKiQmmGm2XAQWNPp0tStpHB71CwGSWacyBwrFZrG4yJ8m8UgYUhsu0SHQVHCmV_9ZK5ZwplbPXJvjQFMMVkDTTJGDE-D9oHYzXFMzKP1l0Pr1GkHxN396GOLtF61GfzhYeLdou3-zF_3qULy0xGelxSVzhmjifWi9LF8HHfaWYYEox9toEBDPdFFaY33JPYbDykvT4zj6IJn34ambZw2kQNaehWk2Wc7x7UkB7YqeIoImIx48QbEqo8nLrKjHOQlYN8fDkjFeLg8ODx8F4-CJ-2rkxPoUv4j35_Eb2RPsNnQ-bmB4a69F2w03LPf5-J_1-E_oE3dJkDjfodzGz9ZgC6mus_iXOrOwUL6yZlq-pwkGJKxMana-qvArirCoVAp-DeS1Y1INFLTioBwe14LAeHNaC97fA4_W7fwEAAP__ZL_oig==
 
 # Move all the index data that will be read to node 2 while the query executes
 # at node 1. The filtering moves to node 2 when it is distributable.
@@ -202,7 +202,7 @@ vectorized: true
                   table: geo_table@geom_index
                   spans: 31 spans
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJyUlN9v2jAQx9_3V1j3UtBcsJ3QrX6iP9ItE4UuMG3VjKqM3LqoYGe2mZgq_vcppGtLK9LGD4Y7-3OX71e2b8H9noOE6NvF4CgektZpPJ6MPw_aZBwNopMJuSFnyeicXKO58umPOZKvH6MkIs5f5dqjdTjzrrV3_mUwiS9G8XDSaomOIKIj2pS0gg4jQYe123tSfohG59EkuaRlrUWbjJLTKCHHl-QGKGiT4TBdoAP5HThQEDClUFgzQ-eMLdO3m01xtgLJKOS6WPoyPaUwMxZB3oLP_RxBwtDsm6LbAwoZ-jSfb7atKZilf4CcT68R5MGaPirM6wtPSgMSTDO0XbZVHu796ZfqrnKd4QoonJj5cqGdJDeVbKAwLtIy0VVwrNTqZ6bUijOlVuylCfabMlwBSXVGAkaM_4XWwS4beBMbYv0HrcfsLJ97tGi7fNuL_-vRqrDEaNLnkrhSNXE-tV5uVATvekoxwZRi7KUJCOqsKVaKf6KewmjpJenznT6IJj58Mrm-Ow1i12kobL5I7d-H1rQvdnYPmnS_dz_Y7l3l5dMbyjgLWTXE3S9nvPpzeHR4PxgPn8UPO7fG-_BZvCcfX_S-aL_C87CJ6rGxHm033Nbc5293lu9tlX_h6UjQFUY7fNXbwdZTCphdY_U8ObO0M7ywZrZpU4WjDbdJZOh8tXpQBbGulsoPfAzzWljUw6IWDurhoBYO6-GwFu7Vw71amD2Bp-s3_wIAAP__EGcZAQ==
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJyUlN9v2jAQx9_3V1j3UtBcsJ3QrX6iP9ItE4UuMG3VjFBGbl0EtTPbTEwV__sU0rWlFaH4IeTO_hz3_cb2Hbjfc5AQfbvqncR90jiPh6Ph516TDKNedDYiM3KRDC7JDZqJT3_MkXz9GCURcX6Sa4_W4dS7xsHll94ovhrE_VGjIVqCiJZoUtIIWowELdZsHkj5IRpcRqPkmpa1bptkkJxHCTm9JjOgoE2G_fQWHcjvwIGCgDGFwpopOmdsmb5bL4qzJUhGIdfFwpfpMYWpsQjyDnzu5wgS-ubQFO0OUMjQp_l8vWxFwSz8I-R8eoMgj1b0SWFeX3hUGpBgmqFts43y8OBPt1Q3yXWGS6BwZuaLW-0kmVWygcKwSMtEW8GpUsufmVJLzpRasl0PONyX4QpIqjMSMGL8L7QOttnA97Eh1n_Qeswu8rlHi7bNN734Px8tC0uMJl0uiStVE-dT6-VaRfCuoxQTTCnGdj2AoM72xUrxz9RTGCy8JF2-1Qexjw-fTK7vd4Oo2Q3V26SY4d_HDmhXbG0i2KeJh48QbLZQ5eXzg8o4C1k1xP0vZ7x6OT45fhiMhy_ix5Ub4334Ij6QT897VzRfYX24j-qhsR5tO9zU3OVvt5bvbJTfcYMk6AqjHb7qCmGrMQXMbrC6pZxZ2CleWTNd_00VDtbcOpGh89XsURXEupoqG3wK81pY1MOiFg7q4aAWDuvhsBbu1MOdWpg9g8erN_8CAAD__4DcG7c=
 
 # Filtering is at gateway node since the filter is not distributable.
 #
@@ -233,7 +233,7 @@ vectorized: true
                   table: geo_table@geom_index
                   spans: 31 spans
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJyUlF9v2jwUxu_fT2Gdm4JeF2wndKuv6J90y0ShC0xbNaMqxWddVIgz21RUFd99Cuna0opQfGE4x_6dk-eR7Qdwf6YgIfpx0TuK-6RxGg9Hw6-9JhlGvehkRG7JWTI4Jzdornx6PUXy_XOURMT5q4m5Q4v6-r6xd_6tN4ovBnF_1GiIliCiJZqUNIIWI0GLNZt7Un6KBufRKLmkZalZkwyS0yghx5fkFijkRmM_naED-RM4UBAwplBYM0HnjC3TD6tNsV6AZBSyvJj7Mj2mMDEWQT6Az_wUQULf7Jui3QEKGn2aTVfblhTM3D9Dzqc3CPJgSV8U5vWFR6X-BFONts3WysOTPd1S3VWWa1wAhRMznc9yJ8ltJRsoDIu0TLQVHCu1-KWVWnCm1IJtm2B_V4YrIGmuScCI8b_ROthkA9_Fhji_Q-tRn2VTjxZtm6978W89WhSWmJx0uSSuVE2cT62XKxXBh45STDClGNs2AcFc74qV4l-ppzCYe0m6fKMPYhcfvpgsfzwNYtNpKGw2S-39c2vaFRu7B7t0f3I_WO9d5eWrC8o4C1k1xOMvZ7z6c3h0-DQYD9_EzzvXxsfwTbwnX97zrmi-w_JwF9FDYz3adrguucv_31i-s1Z-y8uRoCtM7vBdTwdbjimgvsHqdXJmbid4Yc1k1aYKBytuldDofLV6UAVxXi2VH_gS5rWwqIdFLRzUw0EtHNbDYS3cqYc7tTB7BY-X__0NAAD__xVlF_8=
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJyUlF9v2jwUxu_fT2Gdm4JeF2wndKuv6J90y0ShC0xbNSOU4rMOQePMNhVVxXefQrq2tCJtfBFyjv07nOeJ7XtwfxYgIfpx0TuK-6RxGg9Hw6-9JhlGvehkRObkLBmck2s0E59eLZB8_xwlEXF-MjW3aFFf3TX2zr_1RvHFIO6PGg3REkS0RJOSRtBiJGixZnNPyk_R4DwaJZe0KHXTJIPkNErI8SWZA4XMaOynN-hA_gQOFASMKeTWTNE5Y4v0_WZRrFcgGYVZli99kR5TmBqLIO_Bz_wCQULf7Ju83QEKGn06W2yWrSmYpX-CnE-vEeTBmj4rzKsLjwr9CaYabZttlYdHe7qFusks07gCCidmsbzJnCTzUjZQGOZpkWgrOFZq9UsrteJMqRV76wH7dRmugKSZJgEjxv9G62CXDbyODXF2i9ajPpstPFq0bb7txb_5aJVbYjLS5ZK4QjVxPrVeblQEHzpKMcGUYuytBxDMdF2sEP9CPYXB0kvS5Tt9EHV8-GJm2cNuEBW7oXyb5HO8e-qAdsXOJoI6TTx-hGC7hTIvX5xTxlnIyiEefjnj5cvh0eHjYDx8FT-t3Bofw1fxnnx-3Lui-Q7nwzqih8Z6tO1wW3KX_7-zfGer_BsXSIIuN5nDd90gbD2mgPoay0vKmaWd4oU1083flOFgw20SGp0vZw_KIM7KqaLB5zCvhEU1LCrhoBoOKuGwGg4r4U413KmE2Qt4vP7vbwAAAP__f50atQ==
 
 # Bounding box operations.
 statement ok
@@ -276,7 +276,7 @@ vectorized: true
               table: geo_table@geom_index
               spans: 31 spans
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJyUlFFv0zAQx9_5FNa9dJO81U5aQH4qjAyCura0lQDhagr1UaKldrAdFFT1u6MksK2dmq55sHRn_-78_8uXDbhfGQiIvkyGb-IROXsXz-azT8NzMouG0dWc3JHr6fiGrNDc-uR7huTzh2gaVfGayIKx4GWzks5kHI_mZ-ElI-ElO-8I8T4a30Tz6VegoI3CUbJGB-IbcKAQwIJCbs0SnTO2Sm_qQ7EqQTAKqc4LX6UXFJbGIogN-NRnCAJG5sLk3R5QUOiTNKuPbSmYwj9AzicrBNHf0keFeXvheSVwiolC22U75eFe_6BSfptqhSVQuDJZsdZOkDtaWwIUZnlSJboS3kpZ_lBSlpxJWbJjC1ycynAJJNGKhIwY_xOtg0M28FNsiPVvtB7VdZp5tGi7fNeL__tRmVtiNBlwQVylmjifWC9qFeGrvpQsYFIydmwBglqdilXi99RTGBdekAE_6ENwig8fTar_vYbg0GvIbbpO7J-H1nQQHOwentL93v1wt3eTF2QQ7M0f44yzp9_r3pO4I3aG85hpvZ1rHxnOKbrcaIfPmk62XVBAtcLmB-BMYZc4sWZZt2nCcc3VCYXON7v9Joh1s1Vd8DHMW-GgHQ5a4bAdDlvhXjvca4XZHrzYvvgbAAD__-uIzaE=
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJyUlNFv2j4Qx99_f4V1L20lt9gJ_Db5ia1Lt0wUGCBt04xQhm8sItiZ7UyZEP_7lGRrCxVh8GBxZ38u9_3Gly24HxkIiD6NB6_iIbl8E09n0w-DKzKNBtHtjKzJ3WR0T1ZoFj75miH5-C6aRFW8IbJgLPi_WcnFeBQPZ5fhDSPhDbu6EOJtNLqPZpPPQEEbhcNkgw7EF-BAIYA5hdyaJTpnbJXe1odiVYJgFFKdF75KzyksjUUQW_CpzxAEDM21yTtdoKDQJ2lWH9tRMIV_hJxPVgiit6NPCvP2wrNK4AQThbbD9srDg_5-pXyRaoUlULg1WbHRTpA1rS0BCtM8qRIdCa-lLL8pKUvOpCzZqQWuz2W4BJJoRUJGjP-O1sExG_g5NsT6J1qP6i7NPFq0Hb7vxd_9qMwtMZr0uSCuUk2cT6wXtYrwRU9KFjApGTu1AEGtzsUq8QfqKYwKL0ifH_UhOMeH9ybVf25D0HIbmn-LfI2_Hjug_eBoE-E5TTy8hHC_hSYvSD84GEPGGWfPfy-7z-ILsTejp7zr7rV9YkYn6HKjHf7TkLLdnAKqFTbfAWcKu8SxNcv6MU04qrk6odD5ZrfXBLFutqoGn8K8FQ7a4aAVDtvhsBXutsPdVpgdwPPdf78DAAD__8jT0Fc=
 
 query T retry
 EXPLAIN (DISTSQL)
@@ -300,7 +300,7 @@ vectorized: true
               table: geo_table@geom_index
               spans: 31 spans
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJyUk99v2jAQx9_3V1j3Qiu5wk5gm_zEaFONiUEHSEOaUZXhG4sa7Mx2pkyI_31Ksv6gHaHJg6W7y-fO3698O3C_UhAQLW_GH0YTcnY1mi_mX8bnZB6No8sFuSPXs-lnskFz6-PvKZKvH6NZRDqMM85efu97L-KOEMPpMrgiMmcseFufZcMtUNBG4STeogPxDThQCGBFIbNmjc4ZW6Z31U8jVYBgFBKd5b5MryisjUUQO_CJTxEETMyFybo9oKDQx0la_banYHL_CDkfbxBEf0-fNObNjRel8hnGCm2XHbSHB2MGpaLbRCssgMKlSfOtdoLc0Xup8ywuE10JQymLH0rKgjMpC3bqgIu2DJdAYq1IyIjxP9E6OGYDb2PDSP9G61FdJ6lHi7bLD724r0dFZonRZMAFcaVq4nxsvahUhO_6UrKAScnYqQMIatUWK8U_U09hmntBBvyoD0EbHz6ZRP97DcGx15DZZBvbP4-j6SA4Oj1sM_3B_fBwdp0XpDOcLs9CEtKQhOcd8d_tGwSv8KR3cKsTuzdDlxnt8FXLx_YrCqg2WO-3M7ld440162pMHU4rrkoodL6u9utgpOtSecGnMG-Eg2Y4aITDZjhshHvNcK8RZs_g1f7N3wAAAP__-TrK3A==
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJyUk99v2jAQx9_3V1j3Qiu5wk5gm_zEaFONiUEHSEOaEcrwjUUEO7OdKRPif5-SrD9oRyh5sOI7fy73_ca3A_crBQHR_G74YTAiFzeD6Wz6ZXhJptEwup6RDbmdjD-TNZqlj7-nSL5-jCYRaTHOOHv5vO-82LeE6I_nwQ2ROWPB23otC26BgjYKR_EWHYhvwIFCAAsKmTUrdM7YMryrDg1UAYJRSHSW-zK8oLAyFkHswCc-RRAwMlcma3eAgkIfJ2l1bE_B5P4Rcj5eI4junj4pzJsLz0rlE4wV2jY7KA8PxvRKRctEKyyAwrVJ8612gmzovdRpFpeBtoS-lMUPJWXBmZQFO7XA1bkMl0BirUjIiPE_0To4ZgM_x4aB_o3Wo7pNUo8WbZsfenGfj4rMEqNJjwviStXE-dh6UakI33WlZAGTkrFTCxDU6lysFP9MPYVx7gXp8aM-BOf48Mkk-t9tCBpuQ_22zDb457ED2guONhGe08TDTwgPW6jjgrT64_lFSEIakvCyJf47hL3gFdZ0Dro6MYITdJnRDl81g2y_oIBqjfWYO5PbFd5Zs6o-U2_HFVcFFDpfZ7v1ZqDrVNngU5g3wkEzHDTCYTMcNsKdZrjTCLNn8GL_5m8AAAD__5e_zZI=
 
 query T retry
 EXPLAIN (DISTSQL)
@@ -324,7 +324,7 @@ vectorized: true
               table: geo_table@geom_index
               spans: 33 spans
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJyUlGFv2jwQx98_n8K6N7SSC3YS9Eh-xdaFLhOFLiBt04yqjNxY1GBntpkyIfbZpySjBSRCsRRHd_bPl_9fvmzA_sxBQPj5YfQmGpOrd9F0Nv04uibTcBTezsgTGcaTe7JE_eiSbzmST-_DOCSdUTQOp7M4Gt9d8S4jvMso6XdZ9Vx3hLgLJ_fhLP5C_lToCigoneI4WaEF8RU4UPBgTqEweoHWalOlN_WmKC1BMAqZKtauSs8pLLRBEBtwmcsRBIz1jS56AVBI0SVZXm_bUtBr9wJZlywRRH9L9w7m7QfPKo0xJimaHjs4Hp4tGFSKHjOVYgkUbnW-XikryBPdSZ0WSZXoSXgrZfk9lbLkTMqSnZvg5lKGSyCJSonvEe1-oLFwygZ-iQ2R-oXGYTrMcocGTY8ferFbD8vCEK3IgAtiK9XEusQ4Uavw_-9LyTwmJWPnJiCo0kuxSvyRegqTtRNkwE_64F3iwwedqX-3wTt1GwqTrRLz-6U0HXgnq_uXVH923z-s3eQF6TDOPNaM3XtvDJk_bIt5ELDjuCMOenfgvcLR4EDTmc6N0RZaWXxV67LtnAKmS2z-DlavzQIfjF7UZZpwUnN1IkXrmtV-E0SqWao-cB_mrbDXDnutsN8O-61w0A4HrTA7gufb__4GAAD__zWM0xs=
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJyUlFFv2jwUhu-_X2GdG1rJLXYS9Em-YutCl4lCF5C2aUZVRs5YRLAz20yZEPvtU5LRAhKhWIqTc-zHOe8bOxuwP3MQEH5-HL6JRuTqXTSZTj4Or8kkHIZ3U7Ikg3j8QBaon1zyLUfy6X0Yh6QzjEbhZBpHo_srfssIv2WU9G5ZdV13hLgPxw_hNP5C_lToCigoneIoWaEF8RU4UPBgRqEweo7WalOlN_WkKC1BMAqZKtauSs8ozLVBEBtwmcsRBIz0jS66AVBI0SVZXk_bUtBr9wJZlywQRG9L9xbm7QtPK40xJimaLjtYHp4t6FeKnjKVYgkU7nS-XikryJLupE6KpEp0JbyVsvyeSllyJmXJznVwcynDJZBEpcT3iHY_0Fg4ZQO_xIZI_ULjMB1kuUODpssPvdiNh2VhiFakzwWxlWpiXWKcqFX4__ekZB6TkrFzHRBU6aVYJf5IPYXx2gnS5yd98C7x4YPO1L_d4LXshubpqVji75cKaN87WYR_SRHPH8E_LKHJC9JhnHmsabv7Xhswf9AW8yBgx3FHHBzhvvcKY4MDTWcOcIy20Mriq04w284oYLrA5idh9drM8dHoef2aJhzXXJ1I0bpmtNcEkWqGqgL3Yd4Ke-2w1wr77bDfCgftcNAKsyN4tv3vbwAAAP__Y7rV0Q==
 
 query T retry
 EXPLAIN (DISTSQL)
@@ -348,4 +348,4 @@ vectorized: true
               table: geo_table@geom_index
               spans: 30 spans
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJyUk9-LGjEQx9_7V4R58Q5ymOyulObJerdSi9WrChUaObZmapdbk20Syxaxf3vZ3d75A1xrHhJmJp-ZzJfMFtzPDATE88fh-8GI3DwMprPp5-EtmcbD-H5Gnkl_Mv5EVmiefPItQ_LlQzyJS3tN_pAW4yxg9Xo5D1afhf0mm0cRO7VbQvTG8-ABKGijcJSs0YH4ChwoBLCgkFuzROeMLd3b6tJAFSAYhVTnG1-6FxSWxiKILfjUZwgCRubO5O0IKCj0SZpV13YUzMbvIeeTFYLo7OhBYt6ceFbKMsFEoW2zo_Twqlq31Osp1QoLoHBvss1aO0GeaSUkUJjmSeloS-hJWXxXUhacSVmwSxvcXctwCSTRigTviPE_0Do4JwO_RoaB_oXWo-qnmUeLts2PtXiJx0VuidGkywVxZdfE-cR6UXURvu1IyQImJWOXNiCo1bVY2fxJ9xTGGy9Il5_VIbhGh48m1f9-Q3DuN-Q2XSf297407QZnq4fXVH9VPzyuXfsF6Qbl1PbG8xtOOO2Qzm1L7AfukhDR0VMuDNwEXW60w_-aOLZbUEC1wnqondnYJT5as6zK1Oa44iqHQufraKc2BroOlQ88hHkjHDTDQSMcNsNhIxw1w1EjzE7gxe7N3wAAAP__7DXNXw==
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJyUk99v2jAQx9_3V1j30lZyhZ0ETfMTaxs0JgYdIA1pRijDNxYR7Mw2UybE_vYpyVp-SIThByd39sf53je-LbifGQiIp8_9970BuX3qjSfjz_07Mo778eOErEh3NPxElmjmPvmWIfnyIR7FZbwmf8gN4yxg9Xh5HowuC7tNMY8idhrfCPEwnAZPQEEbhYNkjQ7EV-BAIYAZhdyaBTpnbJneVpt6qgDBKKQ63_gyPaOwMBZBbMGnPkMQMDD3Jm9FQEGhT9Ks2rajYDZ-DzmfLBFEe0cPDubNB09KW0aYKLQtdnQ8vLrWKf2ap1phARQeTbZZayfIilZGAoVxnpSJloQHKYvvSsqCMykLdmmC-2sZLoEkWpHgHTH-B1oH52zg19jQ07_QelTdNPNo0bb4sRcv63GRW2I06XBBXFk1cT6xXlRVhG_bUrKAScnYpQkIanUtVhZ_Uj2F4cYL0uFnfQiu8eGjSfW_2xA03Ib6bZ6v8PdeAe0EZ0WE14h4_QnhsYQ6L0gnKJv3YTi95YTTNmnf3Yh9313yIzqScqHvRuhyox3-V-Ox3YwCqiXWve3Mxi7w2ZpF9Zk6HFZclVDofL3aroOerpdKgYcwb4SDZjhohMNmOGyEo2Y4aoTZCTzbvfkbAAD__5Fp0BU=
diff --git a/pkg/sql/opt/exec/execbuilder/testdata/inverted_filter_json_array_dist b/pkg/sql/opt/exec/execbuilder/testdata/inverted_filter_json_array_dist
index 0364e320b6be..34deffebfa3a 100644
--- a/pkg/sql/opt/exec/execbuilder/testdata/inverted_filter_json_array_dist
+++ b/pkg/sql/opt/exec/execbuilder/testdata/inverted_filter_json_array_dist
@@ -186,7 +186,7 @@ vectorized: true
                   table: json_tab@json_inv
                   spans: 4 spans
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJyUU99vmzAQft9fcbqXtpsnMKSq5Cf6g2qpuqaDStvUoMkJt46J2Mw2VaYo__sEJO2oGtQ8gHz33Xf3fbJvhfZPiQLjb7fXp-MbOLwYp3fpl-sjSOPr-PwOJFwmk8_w22r1w8kZfP0UJzEcziCa1r4fEhzc33MGQZYdHMEkeYGEDEYb5CJO4Ow7SGSodE43ckEWxT1yzBhWRs_JWm2a1KotGOdLFD7DQlW1a9IZw7k2hGKFrnAlocA7OSspIZmT8XxkmJOTRdm23QqO2kOhHpHhuS7rhbICJIMZMkwr2UQe971TY9qPf-xF3q2hn8UyVjlIlcMJaPeLjMVszVDX7lmZdfKBUPA1e7v6sXok4yi_LEpHhozH-xa2eLysDGgFERdgG8lgnTROTPFkOvV9v_mFr5z4--YfdDECqXwfCp8itKbDrWmGk9oJiPhO-8E-9lNtHBkv6JuO-Ied7cN92l_pQm2eRrjjaVSmWEjz99kYi4Kdw0f7DH-60lF_dJcXcBgFryyQEOIqndycdYvUL9ls0lPJG27jeB_FCdlKK0s9vbs6--uMIeUP1K2r1bWZ063R83ZMF05aXpvIyboO5V0wVh3UCPyfzAfJwTA5GCSHw-RwkDwaJo8GyccvyNn63b8AAAD__69Ct-0=
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJyUk99P2zAQx9_3V5zuBdg8JU6KkPwUfgStiFGWIG0TjZDb3Fi2YGe2gzpV_d-nJC0siEb0IZbvzp_L9yv7lmj_lCgw_nZ9eTy-gv2zcXqTfrk8gDS-jE9vQMJ5MvkMv6xWd07O4OunOIlhfwbRtPb9kGDv9pYzCLJs7wAmyYtKyGC0rpzFCZx8B4kMlc7pSj6QRXGLHDOGldFzslabJrVsD4zzBQqfYaGq2jXpjOFcG0KxRFe4klDgjZyVlJDMyXg-MszJyaJs224ER-2mUI_I8FSX9YOyAiSDGTJMK9lEHve9Y2Paj3_sRd61oR_FIlY5SJXDEWj3k4zFbMVQ1-5ZmXXynlDwFXu7-rF6JOMoPy9KR4aMx_sWNvV4URnQCiIuwDaSwTppnJji0XTq-36zhK_s-PtmDboYgVS-C8KnCK3pcGOa4aR2AiK-1X6wi_1UG0fGC_qmI_5ha_twl_YXulDrpxEOPQ0nZ3fVb_r7bI9FwVYJo10kPF3sqC-gywvYj4JXxkgIcZFOrk66ceofWc_T05E33MnhLooTspVWlnp6t3X2VxlDyu-pG1qrazOna6Pn7W-6cNJybSIn67oq74Kx6kqNwP9hPggHw3AwCIfDcDgIj4bh0SB8-ALOVu_-BQAA__8n5bpR
 
 # Combine predicates with OR.
 query T
@@ -236,7 +236,7 @@ vectorized: true
                   table: json_tab@json_inv
                   spans: 3 spans
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJyUU91u00wQvf-eYjQ3_fkW2WunIO2V--OKVKUpdiVAjYU28VCMnF2zu66Corw7sk1SjGRDblY7c-bMnKPRbNB-L1Fg_PH-9nx6B8dX0_QhfX97Aml8G18-wClcJ7N38M1q9dnJBXx4GycxHC8gmte-HxIcPYbZ0QnMkn7ykTMIsg65ihO4-AQSGSqd051ckUXxiBwzhpXRS7JWmya1aQum-RqFz7BQVe2adMZwqQ2h2KArXEko8EEuSkpI5mQ8Hxnm5GRRtm13WqP2U6hnZHipy3qlrADJYIEM00o2kcd979wYL3y1_3n3hr4U61jlIFUOZ6DdVzIWsy1DXbsXRdbJJ0LBt-zfVU_VMxlH-XVROjJkPN6XvsPjdWVAK4i4ANtIBeukcWKOb-Zz3_ebJ9z_-Gnzvu5iBFL53wv5HKE1GOwMMpzVTkDEB60Gh1hNtXFkvKBvMOL_D7YPD2l_owv1a_3hwPorU6yk-fFijEUBi8LB-ZND5u83OOlP7_ICjqOgfyJCiJt0dnfRnUoP3d3KvmRQ4tkhEhOylVaWegKHOvvbjCHlT9SdodW1WdK90ct2TBfOWl6byMm6DuVdMFUd1Aj8ncxHycE4ORglh-PkcJQ8GSdPRslnf5Cz7X8_AwAA__-wPaut
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJyUk1tv00wQhu-_XzGamx6-RfbaKUh75R5ckao0xY4EKLGqTTwUg7trdtdVUJT_jmyTFCPFkBtr5_COn1ejWaP9XqLA-OP97fn4Do6vxuk0fX97Aml8G19O4RSuk8k7-Gq1enByAR_exkkMxwuI5rXvhwRHszA7OoFJ0k_OOIMg6ypXcQIXn0AiQ6VzupNPZFHMkGPGsDJ6SdZq06TWbcM4X6HwGRaqql2TzhgutSEUa3SFKwkFTuWipIRkTsbzkWFOThZlO3bLGrWPQj0jw0td1k_KCpAMFsgwrWQTedz3zo3xwle7l3dv6HOxilUOUuVwBtp9IWMx2zDUtXshsk4-Egq-Yf9OPVbPZBzl10XpyJDxeB99W49XlQGtIOICbIMK1knjxBzfzOe-7zefcPfip833dRcjkMr_3sjnCK3BYGuQ4aR2AiK-12pwiNVUG0fGC_oGI_7_3vHhIeNvdKF-rT8cWr-Ti4fqG_14sceigEXhXorRIRS7PY76DF1ewHEU9A9FCHGTTu4uuoPpVbcXs2vZi3h2CGJCttLKUg9w32R_kzGk_JG6Y7S6Nku6N3rZ_qYLJ62uTeRkXVflXTBWXakB_F3MB8XBsDgYFIfD4nBQPBoWjwbFZ3-Is81_PwMAAP__1OmuEQ==
 
 # More complex combination.
 query T
@@ -313,7 +313,7 @@ vectorized: true
           table: json_tab@json_tab_pkey
           spans: [/44 - /44]
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJyslF9v0zAUxd_5FNZ92SY8JU7TP0RC6liDKCptSSsBGhFym8sU1NrBdtBQ1e-OmpStmRr3D7zdG_t3z5FP7BXonwsIIPw8Htz0h-Sy159MJx8HV2QSDsLbKeHkbTT6QH5oKb4ZPiOf3oVRSC5npPs1d90Gkos7Fl9ckVFELjl5TXx_U_fCiLz5QjhQEDLBIV-ihuAOGFDwgEIDYgqZknPUWqrN0qrY2E8eIHAppCLLzeZzTGEuFUKwApOaBUIAUz5bYIQ8QeW4QCFBw9NFMf6vy26m0iVXv4HCrVzkS6EDwimZAYVJxjed4_uOC_GagszNk5Y2_B4hYGta4-fJhlQJKkyqBrrsJcTrPaaH8lpmTruyu069Wau-Z3Av1SYVc-N0njsBCqPSY0DKLjdFVafbquiy41NgNSkURSp-VWLYyYC5zo1SDrt-rJyxwu_pQyiSWpfeKS4nUhlUTmNfSvvHN04Z_16mYnsGzYN_4vb4aderFfcr4t7xCXhnJuA9JuCdm8ABl9sE_HMTODB-J4HW_0_gwN2LUGdSaDzqVrubZwGTeyyfES1zNcexkvNCpmxHBVd8SFCbcpWVTV8US8XTtAszK-xVYPc57FnhV3a4YYV9O-xb4aYdbv7LgbWscNuu3LbCHTvcOcl2vH7xJwAA__9zIHf0
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJy0lNtv0zAUxt_5K6zzsk54yqXphUhIHWsQRaUtaSVAI5rc5jAFOjvYDhqq-r-jJN3WTI17QXs7J_Z3vk_-xV6B-r0EH4Kvk-HlYEQa_cF0Nv08PCfTYBhczQgj78PxJ_JTCX6j2Zx8-RCEAWnMSe97ZttNJGfXTnR2TsYhaTDylnheXveDkLz7RhhQ4CLGEbtDBf41OEDBBQpNiCikUixQKSHzpVWxcRDfg29TSHia6fxzRGEhJIK_Ap3oJYIPMzZfYogsRmnZQCFGzZJlMf4hZe-huEl_4V-gcCWW2R1XPmGUzIHCNGV5Z3meZUO0piAy_eSoNLtF8J01rUn1FEbIGCXG1Rg95zVE6x3RR-JCpFansrvOvVXrvmNwP1E64QttdZ8nAQrjMqNPyi7TRVXn2674OoezcEwsEv6ngmGLgWNbl1JazsVjZU0k_kjuAx7XpnSPSTkVUqO0mrso7R7fPGb8R5HwzRm0DvwfNxBoz62N4FUiuIdzcE_k4D5ycE_lsCflhoN3Koc947c4tF-Kw557GKJKBVd40A238ycC41ssnxQlMrnAiRSLwqZsx4Wu-BCj0uWqUzYDXiwVz9S22DGK3YrYfi52jeI3ZnHTKPbMYs8obpnFrf85sLZR3DE7d4zirlncPSp2tH71LwAA__-_y38g
 
 # We cannot use the index for this query.
 query T
@@ -331,7 +331,7 @@ vectorized: true
       table: json_tab@json_tab_pkey
       spans: FULL SCAN
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJyUkVGrm0AQhd_7K4Z5uQa2XNe-LRS8SQy1mJhqoC2plFWHYDGu2V2hJfjfi0pJLKT0Pp4ze2Y-zl7RXGoUGHzZRy_hDpx1mB7ST9EC0iAKVgeQsEniLfwwqvluZQ6fPwRJAE4O_rfOdd8RPB159rSAOAHHXLR1pBDrYBVuX6IFvAdvmKyDBJZfQSLDRpW0k2cyKI7IMWPYalWQMUoP1nV8EJY_UbgMq6bt7GBnDAulCcUVbWVrQoEHmdeUkCxJP7vIsCQrq3pc-4fVb3V1lvoXMlypujs3RoBkkCPDtJWDeotZz1B19nbHWHkiFLxn_8-yqWpLmvQzn4NMvgDH9-Z1CSE-pvFueVebz-e9iZtEhnFnBfj8Ia73GtyETKsaQzPYR5vdPmNI5Ymm7zGq0wXttSrGM5OMx9xolGTsNOWTCJtpNADeh_k_w95f4ax_8zsAAP__JavVBw==
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJyUkVGLm0AUhd_7Ky73ZQ1MWce-DRTcTVxqcWOqgbakEka9BFvjmJkRWoL_vaiExEJK--Y513Pvx5kzmlONAoMvm-gpXIOzCtNt-ilaQBpEwXILEl6S-BW-G9Xsrczh84cgCcDJwf_Wue47gocdzx4WECfgmJO2jhRiFSzD16doAe_BGyarIIHnryCRYaNKWssjGRQ75JgxbLUqyBilB-s8_hCWP1G4DKum7exgZwwLpQnFGW1la0KBW5nXlJAsST-6yLAkK6t6XHth9S8f-_YH_UKGS1V3x8YIkAxyZJi2clBvMesZqs5erxkrD4SC9-zfiV6q2pIm_cjnOJMvwPG9eWlCiI9pvH6-Kc_n8_bEVSLDuLMCfH4X1_sf3IRMqxpDM9h7m90-Y0jlgaZHMqrTBW20KsYzk4zH3GiUZOw05ZMIm2k0AN6G-V_D3h_hrH_zOwAA__8MfNdr
 
 statement ok
 INSERT INTO array_tab VALUES
@@ -431,7 +431,7 @@ vectorized: true
           table: array_tab@array_tab_pkey
           spans: [/1 - /1]
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJy0lF1r2z4Uxu__n0Kcm6b8VWzZeTUMsjUey8iSzglsYzNFiQ_FkFieJI-V4O8-bIclLrHyUnZjJEu_8zw6etAW1M81eOB_fZi8HU9JazSeL-afJ7dk7k_8-wXh5H0w-0S4lPz5UfMl-fLBD3zSWpLhj8y2XSQ3W5bf3JJZQFqcvCGsGI78gLz7RjhQSESEU75BBd53YEDBAQouhBRSKVaolJDF0rbcOI5-g2dTiJM009VvHes1ggdCRigxAgoRah6vy3pD9j-EeUhhJSSCt989FXcitfq13WFOQWR6VzmkoDR_QvA6OW1QP1J4FCsdJyttDV46AQqzyqNHqlmmy1GTbremy8y6C75cY4A8QmmxuvTfuxlyKR_j5BdQuBfrbJMor7yCecqLocVsi90VX6fRk3OJp7mQGqXlHruT4-XdS8p_FHGyO3Gn6cSpjDdcPu-7TYfNh2vX1J3zG26flt83nJLlYc8tu9EPu9aPc2UAnDIAzvkBOOFpF4D2tQE4Uf4gAN1_HIDXvTO9s94Z-5J3JkCVikThmZVDChg9YXUUJTK5wgcpVqVMNZ2VXPkjQqWrVVZNxkm1VBg8hJkZts20Y6RdM-wa4bYZbhvhum32Eu4Y4YEZ7hrhntl2zwj3zXD_NbYHFzUszP_7EwAA___x1qoY
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJy8lG9r2zAQxt_vU4h705Sp2LLz1zDI1ngsI0s6J7CNzQQlPopZanmSPFZCvvuwHZa4xKqTwt4YydLv7rm7B21B_dqAB_7Xu8nb8ZS0RuP5Yv55ck3m_sS_XRBO3gezT4RLyR-Xmq_Ilw9-4JPWigx_ZLbtIrnast3VNZkFpMXJG8Ly5cgPyLtvhAOFREQ45Q-owPsODCg4QMGFkEIqxRqVEjI_2hYXx9Ef8GwKcZJmuvytY71B8EDICCVGQCFCzeNNEW_IXkO4CymshUTwDren4kakVr9yO9xREJneRw4pKM3vEbzOjtZkPxF4FCsdJ2ttDZ4qAQqzUqNHyl2mi1Vd3m4lLzPnXfDVBgPkEUqLVVP_m82QS7mMk99A4VZssodEecUI5inPlxazLXaTf51aTc45muZCapSWe2omp8O754T_KOJkX3HHUHG5WqY_8fHQdDqsr7FdEeE077vdWMWh_ZSsjidg2bWy2KWynAvt4BR2cJrb4RlNezu0L7XDM-GP7ND9P3Z42ePTa_T42Oc8PgGqVCQKG0YOKWB0j2UpSmRyjXdSrIs05XZWcMWPCJUuT1m5GSflUS7wGGZm2DbTjpF2zbBrhNtmuG2Eq7LZU7hjhAdmuGuEe2bZPSPcN8P9l8genNWwcPfqbwAAAP__u_mycw==
 
 # The split disjunction rule allows us to use the index for this query.
 query T
@@ -467,7 +467,7 @@ vectorized: true
           table: array_tab@array_tab_pkey
           spans: [/1 - /1]
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJy8lNFP2zAQxt_3V5zuBdCMEielQKRJ3SBonRhlLdI2rRVymxOKFOzMdhAI5X-fknSwsMZtmbSXqvb5y_e7-xI_ovmZYYTxt8vz98ML2D0dTq4mX873YBKfxydXIOBsPPoMQmvxcG3FHL5-jMcx7O7OYTAtfD8k2Hnk5c4ejMbQ2gzKnb1mV8A74NXf03gMH76DQIZSJXQhbslg9AM5MgyQYYgzhrlWCzJG6ar0WB8cJvcY-QxTmRe22bapzQgjLKTSCWlKkGFCVqRZVZ-VM4YLpQmj56OnqbGpXFjvoHUWB5X9qLARDDjOSoaqsEufGUNjxQ1h1CtZB8sKp4nSlrTXf-nztvPxB9s8_pNK5ZhEQto7bFs8xTTIdXor9MNzZ2wQdLr3O92fTVeNednSCsQLta9y7-hFKKvdD7fp_SnE41UhNox1kOsjPWr5crfvlZhntBw67xq60Po6lXfI8ERlxa00EQgGc2Q4yUW18rjv8f3qN-zECrbBGso70paSszSzpEl7YZvtdz2-zzUoCQMegalYwFihbTTF6TTgfIpAMlmuwilCJ13Yogs2H5q__k3tHJrnd_Lw1_IErw8xqEMMNg9xDdZfIfb-a4hrvrgxmVxJQxt9y351GVByQ83lYVShF3Sp1aK2aZajWldvJGRsU-XNYiibUgX4p5g7xYFbHDjFYUvMX4pDp7jndu65e_bd6gOnuu8W951i39304b9M7MgpPnZjH2-FPSvf_AoAAP__5zvVHQ==
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJy8lGFP2z4Qxt__P8Xp3gD6GyVOSoFIk7pB0DoxylqkbVor5DYnFC3Yme0gEMp3n5J0sLDGbZm0N1Xs85Pnd_c0fkTzI8MI4y-X52-HF7B7OpxcTT6d78EkPo9PrkDA2Xj0EYTW4uHaijl8fh-PY9jdncNgWvh-SLDzyMudPRiNobUZlDt7za6AN8Crx9N4DO--gkCGUiV0IW7JYPQNOTIMkGGIM4a5VgsyRumq9FgfHCb3GPkMU5kXttm2qc0IIyyk0glpSpBhQlakWVWflTOGC6UJo-ejp6mxqVxY76B1FgeV_aiwEQw4zkqGqrBLnxlDY8UNYdQrWQfLCqeJ0pa013_p83_n6w-2ef0HlcoxiYS0d9i2eIpp8PR0nX-nh-cG2SDohOh3Qjx7r5r2srMVpBdqX-Xe0YtsVrsfbjOCpyyPV2XZMNZ5rk_2qOXL3b5XYp7RcvbcMfvrVN4hwxOVFbfSRCAYzJHhJBfVyuO-x_er37ATK9gGayjvSFtKztLMkibthW22X_X4PtegJAx4BKZiAWOFttEUp9OA8ykCyWS5CqcInXRhiy7YfGj-xn_Yztl5ficWfy1W8PosgzrLYPMs12D9kWXvn2a55sMbk8mVNLTRJ-1XdwIlN9TcIUYVekGXWi1qm2Y5qnX1RkLGNlXeLIayKVWAv4u5Uxy4xYFTHLbE_KU4dIp7bueeu2ffrT5wqvtucd8p9t1NH_7NxI6c4mM39vFW2LPyv58BAAD__xZl2q8=
 
 # We cannot use the index for this query.
 query T
@@ -485,4 +485,4 @@ vectorized: true
       table: array_tab@array_tab_pkey
       spans: FULL SCAN
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJyUklFr2zAUhd_3Ky73pQ6oRJZfhqDgrHGZIXM6JbCVzAw5vhSDY3mSDCvB_33YDlkzaLY9nnPvd33w0RHdjxolJl8fV4s0g2CZbrabz6sZbJJVcr8FDQ9q_Qm0tfrlu9cFfPmYqASCoID4W8d5RHBzFP3NDBbZEgINdxDNZrBWEBQ7nsMd6EEtEwUfnkAjw8aUlOkDOZQ7DJFhhDnD1po9OWfsYB_HpbT8iZIzrJq284OdM9wbSyiP6CtfE0rMzK1p5wIZluR1VY9rPUPT-d-Q8_qZUEY9e3U4vH54q4uaFOmS7JxfnMfzv4hbWx20fUGG96buDo2ToBkUyHDT6kHd4lthwv8J81DVnizZeXiZZPIlBEEsznUslFo87YSUMs227_NTMXE4NHMyTwWNXix2_LyLDNedlxCHbwYXF8H_Uo8i15rG0T_1w_ucIZXPND0BZzq7p0dr9uNnJrkeudEoyflpGk0ibabREPA1HF6FxXVYXIX5H3Dev_sVAAD__583CO0=
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJyUklGLm0AUhd_7Ky73ZQ3MknF8KQMLphuXCqnZTgLtksoyxssS6jp2ZoQuwf9e1JBuCmvbN8-597sePB7R_ahQYvL1frVIMwiW6Wa7-byawSZZJbdb0HCn1p9AW6tfHr0u4MvHRCUQBAXE31rOI4Kro-iuZrDIlhBouIFoNoO1gqDY8RxuQPdqmSj48AAaGdampEw_k0O5wxAZRpgzbKzZk3PG9vZxWErLnyg5w0PdtL63c4Z7YwnlEf3BV4QSM3NtmrlAhiV5faiGtY6haf1vyHn9RCijjr06HE4f3uqiIkW6JDvnF-fx_C3i89Nj851ekOGtqdrn2knQDApkuGl0r67xrUzh_2S6O1SeLNl5eBlo9CUEQSzOrSyUWjzshJQyzbbv81M_cdgXdDJPPQ1eLHb8vIsM162XEIdvBhcXwf_SkiLXmNrRP9XEu5whlU80_gnOtHZP99bsh9eMcj1wg1GS8-M0GkVaj6M-4Gs4nITFNCwmYf4HnHfvfgUAAP__F5kLtg==
diff --git a/pkg/sql/opt/exec/execbuilder/testdata/inverted_index_geospatial b/pkg/sql/opt/exec/execbuilder/testdata/inverted_index_geospatial
index 2b4f0dbc8e4b..a5844f2d6598 100644
--- a/pkg/sql/opt/exec/execbuilder/testdata/inverted_index_geospatial
+++ b/pkg/sql/opt/exec/execbuilder/testdata/inverted_index_geospatial
@@ -78,7 +78,7 @@ regions: <hidden>
                   table: geo_table@geom_index
                   spans: 31 spans
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJzMVeFu2zYQ_r-nONyfJJgGk5LiuRwGeHHVzdtSF7LRoZiMgJFurmCJVElqUxD4sfYCe7JBUtLFNazW65_6B437jh99931H-h7tuwIFLqNfo9kKtvAiXlzDhvSNk7cFwW8_RXEE1t3kypGxlDp7fraM58-_98fP-OS7V4v5y9V5yBhjAXRfLLg4E-LHaHEdreI3XntWeQGL-HkUw9Ub2KKHSmf0UpZkUfyOHNceVkanZK02LXTfbZhnDQrmYa6q2rXw2sNUG0Jxjy53BaHAVVtjTDIjM2LoYUZO5kV37PsWpm0BN7nKqEEPZ7qoS2UFbPvK0MNlJVtglOBVkjR_ZEnScJYkDfvYgt-cyuEJglQZBAy0e0vGooe_vAaXlySA_fP3Q5xq5Ui5XKuDlNF_WTAkMwFhj9zeOXqEAh-u0MPr17MZWEcVpLpWDs6pcaNcuQsBrNOp30C0PbahlA2UVGpzB7IodCodZQJYd_qtdOlbsqBrV9VOQLu_K-sRCHG987CPHoyzTm4IBd95n27uXP1JxlH2Ii8cGTIjvu_wYz5qKgNawZQLsK2XYJ00TnTeBN9eJgnzWZIw9rEFgVR2Kq219MDTRSvDtK23a7BzrTesj62TRbHvLTWU1oeWDxnR5uy7AhyVFWS53UJt5YY-2Sf_qE_-KT79rHP1cAf9Y3ewMnkpzd1_0nhT_3Nm3z-cfT7-Emb_uKbBKZq-n_lgX9EeFx8-yIwz3j69PvPH42fs6Wc2_oFPQt4HEzbhkzCMQn4mnr7RU__i6NT6_2NqP0Om8BSZlto4MqNwX6Qp__pLu1CXp3QVk620srTX1bGT2W7tIWUb6v85ra5NSq-MTruf6cNFx-uAjKzrs7wP5qpPtQU-JfNBsj9M9gfJwTA5GCSHw-RwkHz5AXm9--rfAAAA__8Rp-A1
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJzMVVFu4zYQ_e8pBvOTGFVhUlJcL4sCbrza1m2zXsjGFovKMBRp6hUskVqSahUEPlYv0JMVkpJtvIaVuPmJP2TPGz565j0OdYvmU44CF8GvwXQJW3gTzq9gQ2pt4-uc4LefgjAAY9eZtKQNJdacny3C2evv3dErPv7u3Xz2dnnuM8aYB-0X8wZnQvwYzK-CZfjBafYqBjAPXwchXH6ALTooVUpv44IMit-R48rBUquEjFG6gW7bBbO0RsEczGRZ2QZeOZgoTShu0WY2JxS4bGoMKU5JDxk6mJKNs7zd9nMLk6aAdSZTqtHBqcqrQhoB264ydHBRxg0wjPAyiuo_0iiqOYuimj32wG9O5fAIIZYpeAyU_UjaoIO_vAebFSSA_fP3XZwoaUnaTMmDlFZ_GdAUpwL8Drm-sXQPeS5cooNX76dTMJZKSFQlLZxTbYeZtAMBrNWpW0C0PbagiGsoqFD6BuI8V0lsKRXA2t2vY5t8JAOqsmVlBTTr27LuAR9XOwe76M44Y-MNoeA75-nmzuSfpC2lb7LckiY95PsO3-eDutSgJEy4ANN4CcbG2orWG-_biyhiLosixh57IJBMT6U1lh54Om9kmDT1tg22rnWGdbGxcZ7ve0s1JdWh5X1GNDnzKQdLRQlpZrZQmXhDT_bJPeqTe4pPP6tM3s2g2zOD3a91uaWb_xRyJu5zRsA9HAE-egkjcFxa7xRpPx99b1_YDhdf3suMM97cwC5zR6NX7OFnOvqBj33eBWM25mPfD3x-Jh5e1RN3cPTwuv_j8D5DJv8UmRZKW9JDf1-kCf_6pc3VxSldhWRKJQ3tdXVsZ7ZbOUjphroXqFGVTuidVkn7N104b3ktkJKxXZZ3wUx2qabAh2TeS3b7yW4v2esne71kv5_s95IvviCvdl_9GwAA__9PR-Lr
 
 statement ok
 DROP TABLE geo_table
@@ -162,7 +162,7 @@ regions: <hidden>
                   table: geo_table@geom_index
                   spans: 31 spans
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJzkleFu2zYQx7_vKQ73JQmmwaSkeC6HAV5cdfO21IUSdCgmI2CkmytYIlWS2hQEfqy9wJ5soJR0cYNoM5YPA-YPNO6Of_r4_5H0LdoPFQq8SH5MFpewhVfp6hw2pK-cvK4IfvouSROw7qpUjoyl3Nnjo4t0-fLrcPqCz756s1q-vjyOGWMsgv6LRSdHQnybrM6Ty_Rd4NeqT2CVvkxSOHsHWwxQ6YJey5osip-R4zrAxuicrNXGp277CcuiQ8ECLFXTOp9eB5hrQyhu0ZWuIhR46XtMSRZkJgwDLMjJsuqX_biFuW_gqlQFdRjgQldtrayA7dAZBnjRSJ-YZHiWZd0vRZZ1LPID-5sBvzhUwzMEqQqIGGj3nozFAH94C66sSQD74_e7ONfKkXKlVo9KRv9mwZAsBIRD5vrG0X2KT-EMAzx_u1iAddRArlvl4Jg6NymVOxHAep-GCUTbpybUsoOaam1uQFaVzqWjQgDrV7-WLn9PFnTrmtYJ8PP7tu4TIa53AQ7RHTjr5IZQ8F3wz-Eu1a9kHBWvysqRITPh-4Tv60nXGNAK5lyA9SzBOmmc6NlEX55mGfNsmEcwOiCQKg6VeaSPmK68DXPfb7_BntoAbIitk1W1z5Y6ytvHyMdA-Jr9UIGjuoGitFtordzQM3AKD-H0vS7V3R0Mn7qDjSlraW7-siaYh_-zsx8d4unHMx_tOzrkxacPMuOM-6c3ZOF0-oI9_Cym3_BZzIdgxmZ8FsdJzI_Ewzd6Hp4866n9FzbFh9h0oY0jM4n3TZrzz_9rF-r0kF2lZButLO3t6qmV2W4dIBUbGv45rW5NTm-MzvufGcJVr-sTBVk3VPkQLNVQ8g0-FPNRcTguDkfF0bg4GhXH4-J4VHz6iXi9--zPAAAA__8kMOA3
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJzkleGO4zQQx7_zFKP5slsRVDvJlp4RUtleDgrs9ZRWh06kqrLJ0Iua2DnbgaxWfSxegCdDTnaP7a02ULEfkOgHtzPjvzv-_2LnFs2HEgWuoh-j-Rr28CpeXsGO1Nam1yXBT99FcQTGbgtpSRvKrDk_W8WLl1_7kxd8-tWb5eL1-jxkjLEAui8WjM6E-DZaXkXr-J3n1qpGsIxfRjFcvoM9eihVTq_TigyKn5HjxsNaq4yMUdqlbrsJi7xFwTwsZN1Yl954mClNKG7RFrYkFLh2PcaU5qTHDD3MyaZF2S37cQsz18C2kDm16OFclU0ljYB93xl6uKpTlxgneJkk7S95krQscAP7mwG_OFXDE4RU5hAwUPY9aYMe_vAWbFGRAPbH73dxpqQlaQslH5W0-s2ApjQX4PeZ6xtL9yk-gUv08OrtfA7GUg2ZaqSFc2rtuJB2JIB1PvUTiPZPTajSFiqqlL6BtCxVllrKBbBu9evUZu_JgGps3VgBbn7X1n3Cx83Bwz66A2dsuiMU_OD9c7gL-StpS_mrorSkSY_5MeH7etTWGpSEGRdgHEswNtVWdGyCLy-ShDk2zCEYHBBI5qfKHNJHTJfOhpnrt9tgR60H1sfGpmV5zJZayprHyIdAuJr5UIKlqoa8MHtoTLqjZ-Dkn8Lpe1XIuzPoD5zB_te23tPNXw55M_9_dgSCU6z9-OgHx8b2efHpvcw44-4G9pk_mbxgDz_zyTd8GvI-mLIpn4ZhFPIz8fCqnvmjZ314_4VN4Sk2rZS2pMfhsUkz_vl_7VxdnLKrmEytpKGjXT21MjtsPKR8R_0L1KhGZ_RGq6z7mz5cdroukZOxfZX3wUL2JdfgQzEfFPvDYn9QHAyLg0FxOCwOB8UXn4g3h8_-DAAA__9h3uLt
 
 # Also works when creating an index.
 statement ok
@@ -230,4 +230,4 @@ regions: <hidden>
                   table: geo_table@geom_index
                   spans: 31 spans
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJzkleFu2zYQx7_vKQ73JQmmwaSkeC6HAV5cdfO21IUSdCgmI2CkmytYIlWS2hQEfqy9wJ5soJR0cYNoM5YPA-YPNO6Of_r4_5H0LdoPFQq8SH5MFpewhVfp6hw2pK-cvK4IfvouSROw7qpUjoyl3Nnjo4t0-fLrcPqCz756s1q-vjyOGWMsgv6LRSdHQnybrM6Ty_Rd4NeqT2CVvkxSOHsHWwxQ6YJey5osip-R4zrAxuicrNXGp277CcuiQ8ECLFXTOp9eB5hrQyhu0ZWuIhR46XtMSRZkJgwDLMjJsuqX_biFuW_gqlQFdRjgQldtrayA7dAZBnjRSJ-YZHiWZd0vRZZ1LPID-5sBvzhUwzMEqQqIGGj3nozFAH94C66sSQD74_e7ONfKkXKlVo9KRv9mwZAsBIRD5vrG0X2KT-EMAzx_u1iAddRArlvl4Jg6NymVOxHAep-GCUTbpybUsoOaam1uQFaVzqWjQgDrV7-WLn9PFnTrmtYJ8PP7tu4TIa53AQ7RHTjr5IZQ8F3wz-Eu1a9kHBWvysqRITPh-4Tv60nXGNAK5lyA9SzBOmmc6NlEX55mGfNsmEcwOiCQKg6VeaSPmK68DXPfb7_BntoAbIitk1W1z5Y6ytvHyMdA-Jr9UIGjuoGitFtordzQM3AKD-H0vS7V3R0Mn7qDjSlraW7-siaYh_-zsx8d4unHMx_tOzrkxacPMuOM-6c3ZOF0-oI9_Cym3_BZzIdgxmZ8FsdJzI_Ewzd6Hp4866n9FzbFh9h0oY0jM4n3TZrzz_9rF-r0kF2lZButLO3t6qmV2W4dIBUbGv45rW5NTm-MzvufGcJVr-sTBVk3VPkQLNVQ8g0-FPNRcTguDkfF0bg4GhXH4-J4VHz6iXi9--zPAAAA__8kMOA3
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJzkleGO4zQQx7_zFKP5slsRVDvJlp4RUtleDgrs9ZRWh06kqrLJ0Iua2DnbgaxWfSxegCdDTnaP7a02ULEfkOgHtzPjvzv-_2LnFs2HEgWuoh-j-Rr28CpeXsGO1Nam1yXBT99FcQTGbgtpSRvKrDk_W8WLl1_7kxd8-tWb5eL1-jxkjLEAui8WjM6E-DZaXkXr-J3n1qpGsIxfRjFcvoM9eihVTq_TigyKn5HjxsNaq4yMUdqlbrsJi7xFwTwsZN1Yl954mClNKG7RFrYkFLh2PcaU5qTHDD3MyaZF2S37cQsz18C2kDm16OFclU0ljYB93xl6uKpTlxgneJkk7S95krQscAP7mwG_OFXDE4RU5hAwUPY9aYMe_vAWbFGRAPbH73dxpqQlaQslH5W0-s2ApjQX4PeZ6xtL9yk-gUv08OrtfA7GUg2ZaqSFc2rtuJB2JIB1PvUTiPZPTajSFiqqlL6BtCxVllrKBbBu9evUZu_JgGps3VgBbn7X1n3Cx83Bwz66A2dsuiMU_OD9c7gL-StpS_mrorSkSY_5MeH7etTWGpSEGRdgHEswNtVWdGyCLy-ShDk2zCEYHBBI5qfKHNJHTJfOhpnrt9tgR60H1sfGpmV5zJZayprHyIdAuJr5UIKlqoa8MHtoTLqjZ-Dkn8Lpe1XIuzPoD5zB_te23tPNXw55M_9_dgSCU6z9-OgHx8b2efHpvcw44-4G9pk_mbxgDz_zyTd8GvI-mLIpn4ZhFPIz8fCqnvmjZ314_4VN4Sk2rZS2pMfhsUkz_vl_7VxdnLKrmEytpKGjXT21MjtsPKR8R_0L1KhGZ_RGq6z7mz5cdroukZOxfZX3wUL2JdfgQzEfFPvDYn9QHAyLg0FxOCwOB8UXn4g3h8_-DAAA__9h3uLt
diff --git a/pkg/sql/opt/exec/execbuilder/testdata/inverted_join_geospatial b/pkg/sql/opt/exec/execbuilder/testdata/inverted_join_geospatial
index 08ca32b1ec6f..5bf3057b3231 100644
--- a/pkg/sql/opt/exec/execbuilder/testdata/inverted_join_geospatial
+++ b/pkg/sql/opt/exec/execbuilder/testdata/inverted_join_geospatial
@@ -39,7 +39,7 @@ vectorized: true
           table: ltable@ltable_pkey
           spans: FULL SCAN
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJyUklFv0zAQx9_5FNY9bdLB6nTw4CejUaRMpRltH5BQNIX4VJkmdrAdVFTluyM7E6OFVutb7ny_8y__ZA_-RwMCZl8e5u_zBbv6kK_Wq8_za7aazWd3a9ZskbktZx-XxSfWhOpbQ-y-yBfMpWe5Ids-aqNox4oF8-FRm0DOUx381Tj-Jo5wfAJSdQ0IxipaVC15EF-BQ4nQOVuT99bF1j4N5GoHYoKgTdeH2C4RausIxB6CDg2BgHVcu6RKkbuZAIKiUOkmrR0FZOd0W7lfgHBnm741XqTXSl6AsOqq2HoN5YBg-_B8lQ_VhkDwAV-uk5uf5AKpe6sNuRt-aPRPaoB_iNmuc0cJygyZvI1xFX0QTHKUGcopyrcnZbNLZKPkU3TZf0Wfo5tbu-079t1qw6wRLFrcRrHjr56c3x04n7adXmK7JN9Z4-nA9NTmyVAikNrQ-Dd527uaHpyt0zVjWSQuNRT5MJ7yscjNeBQF_4b5WTg7D2dn4ekRXA6vfgcAAP__vkAwrA==
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJyUkkGP0zAQhe_8CmtOu9LA1unCwSejpUhZlWZpe0BCURXiURWa2sF2UFGV_45sr4AUWtFTMs_zZr68-AjuWwsCZp-e5m_zBbt5l6_Wq4_zW7aazWcPa9bukNkdZ--XxQfW-upLS-yxyBfMxne5JbPfNFrRgRUL5vym0Z6so9q7m9T-KrRwfDbE6hYQtFG0qPbkQHwGDiVCZ01NzhkbpGNsyNUBxASh0V3vg1wi1MYSiCP4xrcEAtZh7JIqRfZuAgiKfNW0cWwCkOmx6Xb0AxAeTNvvtRPx0yIbIKy6KkgvoRwQTO9_r3O-2hIIPuD_I-X6O1lP6tE0muwdH1P9lRzgL8fs0NmTFGWGTN6HyIreCyY5ygzlFOXrs7DZNbAB8jm-7J-gdhTf3Jhd37GvptHMaMECyX2AO_37kfvNiPs88fQa4iW5zmhHI9pzkydDiUBqS-lWOdPbmp6sqeOaVBbRFwVFzqdTnopcp6MA-KeZXzRnl83ZRfP0xFwOL34GAAD__0a7M8I=
 
 query T
 EXPLAIN SELECT lk, rk1, rk2, rtable.geom
diff --git a/pkg/sql/opt/exec/execbuilder/testdata/inverted_join_geospatial_dist b/pkg/sql/opt/exec/execbuilder/testdata/inverted_join_geospatial_dist
index bef206b13de0..dd1cddb4bb00 100644
--- a/pkg/sql/opt/exec/execbuilder/testdata/inverted_join_geospatial_dist
+++ b/pkg/sql/opt/exec/execbuilder/testdata/inverted_join_geospatial_dist
@@ -68,7 +68,7 @@ vectorized: true
               table: ltable@ltable_pkey
               spans: FULL SCAN
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJzElF1vmzwUx--fT2Gdq1Z1HmJD-sIVW5tJVFnokl5smqKKwVHHSmxmm6lTle8-Ad1a0mBSZVPu8Muf8_PRT-cB9PccfBh_vJq8Cafk4CKcX88_TA7JfDwZn1-T_I4SdUfezaL3JDfxlxzJZRROiaq_g1uUy5tMpHhPoinR5iYTBpXGxOiD5vr_1RVGHwP16pBEs4vxjLz9RA6a_x8CBSFTnMZL1OB_BgYUOFBwYUGhUDJBraWqjh7qi2F6D_6QQiaK0lTbCwqJVAj-A5jM5Ag-XFcFZxinqJwhUEjRxFle_75BCwqVLWP1Eyicy7xcCu3X762JgcK8iKutgcNhsaIgS_NUTJv4FsFnK7o9UCh-oDKYXspMoHLcNtOLjgL9kxjfF2qtuwGnJPCqxkWl8UnAaMBp4HaS8teQVoSPnTveSPnUuYmUd2VBvslMECl8ElTPeuFCTTtq0XqdqO5rUOdSGVTOWRszYEc04EdAYRmb5CvJUfiEdVb0Ois-FZIqRYXp5jqL1Qa0qRzIwmG8FelCGLUQ2PZqsx3UdvjA6VaGvQZpTW5vj3L3kD6T-2TfcvegPsrNhn_Rbr69WnwXtdzBlmL1AK2JNdqjWD2kz8Q63bdYPai_xWL_aGxuKDlDXUihcatpOKzmKaa32MxgLUuV4JWSSV2mWUZ1rt5IUZvmlDWLUDRHFeDzMLOGuT3MrWHXHnatYa8VZuthz_7mntIja_rYHj62hk_s4RNr-NQePt2lY2f2jg17NOmRrM8yu2asxzNmF2395YvVf78CAAD__-C31pQ=
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJzMlF1P2zwUx--fT2GdKxDuk9pJeclVNuikoK5hLRebpgplyRHLmtqZ7UxMqN99SsIGKY1TxCa4av3yz_n56KdzC_p7Dj6MP15M3oRTsncWzi_nHyb7ZD6ejE8vSb6kRC3Ju1n0nuQm_pIjOY_CKVH1_-Aa5eoqEynekGhKtLnKhEGlMTF6r7n-f3WF0btAvdon0exsPCNvP5G95vv7QEHIFKfxCjX4n4EBBQ4UXFhQKJRMUGupqqPb-mKY3oA_pJCJojTV9oJCIhWCfwsmMzmCD5dVwRnGKSpnCBRSNHGW159v0ILm56pY4k-gcCrzciW0X7-5pgYK8yKutgYOh8WagizNfUFt4msEn63p7lCh-IHKYHouM4HKcdtcj7oK9E9ifFOojQ4HnJLAq5oXlcYnAaMBp4HbScqfQloR3nXvcCulanVvIuWyLMg3mQkihU-C6mmPnKiJRy1irxPXfQruXCqDyjlpowbsgAb8ACisYpN8JTkKn7DOil5nxftCUqWoMN1eZ7HegjaVA1k4jLciXQijFgLbXXH2TMUdPnC61WFPwdqQ3HtByXtIH0h-9Bok78G9k5wN_6LlfHfF-HMVcwc7CtYDtSHY6AUF6yF9INjxaxCsB_e3YOwfjdEtJWeoCyk07jQdh9V8xfQam5msZakSvFAyqcs0y6jO1RspatOcsmYRiuaoAnwYZtYwt4e5Nezaw6417LXCbDPs2d_cU3pkTR_aw4fW8JE9fGQNH9vDx8_p2Im9Y8MeTXok67PMrhnr8YzZRdt8-WL9368AAAD__78639Y=
 
 query T
 EXPLAIN (DISTSQL) SELECT lk, rk FROM ltable JOIN rtable@geom_index
@@ -95,7 +95,7 @@ vectorized: true
               table: ltable@ltable_pkey
               spans: FULL SCAN
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJzUlV9v2jAUxd_3Kaz7RFXTYAda6qd0LZWoGOmAh00TqjJy1WYNdmabrVPFd5-SdCtQ4lB1k9o3_OfHPedyrrkH8z0FAb1Pl4OT_pA0zvrjyfjjYI-Me4Pe6YSkt5ToW3I-Cj-Q1EZfUyQXYX9IdPE5uEY1v0pkjHckHBJjrxJpURucWdMorxzkV-gDWyzYHglH-d34Z2JvEtlYPaNkDeP53bPeiLz_TBqllj2gIFWMw2iOBsQXYECBAwUfphQyrWZojNL50X1xsR_fgWhRSGS2sPn2lMJMaQRxDzaxKYKASV5zhFGM2msBhRhtlKTF15fqgkwn80j_AgqnKl3MpRFFbwrRQGGcRflW0-MwXVJQC_tYzNjoGkGwJd1dUF_-QG0xvlCJRO3565qedB_oX6J3l-mNXyLglATtzbaXu5Twg5YQ4nwQnky6eXPDhRUkYDTgNPAr3fDnuMldPHT3cKuTx-4OlLpdZOSbSiRRUpAgt_4kW0GHkoBvddRxOGpX2vGfY2estEXtHa9bCdg-Dfg-UJhHdnZDUpSCsMqK7cqKj4WUjlFjvL3OdLlF2lA1VeYxvoZUSeisSWC7jwh7wYh4vOlVx4o9R9LGkLRf-ZDUuFkZkqO3MCQ1dh6GhLX-4ZTw3SPKXxJRv7ljQGsEbQS088oDWuNmJaDdtxDQGjt_Asr-0zO-peQITaakwZ1e51b-vmN8jeV_glELPcNLrWZFmXIZFlyxEaOx5SkrF31ZHuUCV2HmhLkb5k7Yd8O-E26vwWwTbrs915TuOOlDN3zohI_c8JET7rrh7ks6duzuWKsmJjUhq0uZO2asJmfMHbRN59Plu98BAAD__-gFIMA=
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJzUldFv2joUxt_vX2GdJ6qaBjvQUj-lt6USFZf0Ag-bJlRl5KjNCHZmm61Txf8-JelWQsGh6ia1TxDbP873nXzHPID5moKA3ofrwVl_SBoX_fFk_P_ggIx7g975hKRzSvScXI7C_0hqo88pkquwPyS6-B7colrcJDLGexIOibE3ibSoDc6saZRHjvIj9JEtHtgBCUf52fh7Yu8S2Vjfo6SC8fzsRW9E_v1IGqWWA6AgVYzDaIEGxCdgQIEDBR-mFDKtZmiM0vnWQ3GwH9-DaFFIZLa0-fKUwkxpBPEANrEpgoBJXnOEUYzaawGFGG2UpMXPl-qC8uMmm-MPoHCu0uVCGlH0pxAOFMZZlC81PQ7TFQW1tE8FjY1uEQRb0f1F9eU31BbjK5VI1J5f1fXsDQD9TfTuM73xNgJOSdDebH25Sgk_agkhLgfh2aSbNzhcWkECRgNOA3-nG_4SN7mLxw4fb3WiKx0eKDVfZuSLSiRRUpAgt_8sY0GHkoBvddVxuGrvtOS_xNJYaYvaO63aCdghDfghUFhEdnZHUpSCsJ0V2zsrPhVSOkaN8fY609UWaUPVVJnHeAXZJaFTkcD2HxX2ylHxeNPbHS_2Elkbw9J-48NS42ZtWE7ey7DUWHocFtb6g9PC948qf21U_eaeQa0RtRHUzhsPao2btaB230tQayz9Cir7S9f6lpIjNJmSBve6rVv5fY_xLZb_EUYt9QyvtZoVZcrHsOCKhRiNLXdZ-dCX5VYucB1mTpi7Ye6EfTfsO-F2BWabcNvtuaZ0x0kfu-FjJ3zihk-ccNcNd1_TsVN3x1o1MakJWV3K3DFjNTlj7qBtOp-u_vkZAAD__wubKgI=
 
 query T
 EXPLAIN (DISTSQL) SELECT lk, rk FROM ltable JOIN rtable@geom_index
@@ -122,7 +122,7 @@ vectorized: true
               table: ltable@ltable_pkey
               spans: FULL SCAN
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJzUlV9v2jAUxd_3Kaz7BKop2IGW-ildSyUqRjrgYdOEqoxctVmDndlm61Tx3ack3cq_OFTdpPYN__lxz7mcax7AfE9AQO_T1eC0PyS18_54Mv44qJNxb9A7m5DkjhJ9Ry5GwQeS2PBrguQy6A-Jzj_7N6jm17GM8J4EQ2LsdSwtaoMza2rF9cPsCqOPQL6qk9PheXY5-hnb21jWVs4oWcd4nQSj896IvP9MaoWYOlCQKsJhOEcD4gswoMCBggdTCqlWMzRG6ezoIb_Yj-5BtCjEMl3YbHtKYaY0gngAG9sEQcAkKzrCMELdbAGFCG0YJ_nXF4L8VMfzUP8CCmcqWcylEXlzcp1AYZyG2VajyWG6pKAW9qmYseENgmBLur-gvvyB2mJ0qWKJuumta9pqP9C_RO8-1Rs_hc8p8dtbfS-2KeGHLSHExSA4nXSz7gYLK4jPqM-p75Xa4c-xk9l4bO_RTitP7R0odbdIyTcVS6KkIH7mfStdufbOtqUOJdlRqaV2qR_vOX7GSlvUzZN1Lz47oD4_AArz0M5uSYJSEFZasV1a8amQ0hFqjHbXmS53SBuqhkqbjK8hZRI6axLY_kPCXjAkTd5olueKPUfSxpi0X_uYVNhZGZPjNzEmFX4ex4S1_uGc8P1Dyl8SUq-xZ0QrBG1EtPPaI1phZyWi3TcR0Qo_fyLK_tNTvqPkCE2qpMG9XuhW9sZjdIPF_4JRCz3DK61meZliGeRcvhGhscUpKxZ9WRxlAldh5oS5G-ZO2HPDnhNur8FsE267PVeU7jjpIzd85ISP3fCxE-664e5LOnbi7lirIiYVIatKmTtmrCJnzB20TefT5bvfAQAA__91dSIe
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJzUldFv2joUxt_vX2GdJ1BNgx1oaZ7S21KJikt6gYdNE6oyctRmBDuzzdap4n-fknQrAeJQdZPaJ4jtH-f7Tr5jHkF_TcCD_oeb4flgRBqXg8l08v-wSSb9Yf9iSpIFJWpBrsbBfyQx4ecEyXUwGBGVf_fvUC5vYxHhAwlGRJvbWBhUGudGN4rjx9kRRp-A_KlJzkeX2eHoe2zuY9HY2KOkjPEmCcaX_TH59yNpFGKaQEHICEfhEjV4n4ABBQ4UXJhRSJWco9ZSZVuP-cFB9ABem0Is0pXJlmcU5lIheI9gYpMgeDDNio4xjFA5baAQoQnjJP_5QpBffNymC_wBFC5ksloK7eUNyrUChUkaZksth8NsTUGuzHNBbcI7BI-t6eGiBuIbKoPRtYwFKsct69p5BUB_E_2HVG29Dp9T4nd2el8sU8KP257nXQ2D82kv63CwMh7xGfU59d1KO_wldjIbTy0-2WtFlVo8lHKxSskXGQsihUf8zP9OynL93V1bXUqyrUpbnUpP7ks8TaQyqJyzsh-fHVGfHwGFZWjm9yRB4RFWWbFTWfG5kFQRKoz215mt90gbyZZMHcZLSJWEbkkCO3xY2CuHxeEtpzpf7CWytsal89bHpcbOxricvptxqfH0NC6s_QfnhR8eVv7asLqtA6NaI2orqt23HtUaOxtR7b2bqNZ4-hVV9peu9j0lx6hTKTQedGO3szsfozss_ie0XKk53ig5z8sUj0HO5QsRalPssuJhIIqtTOAmzKwwt8PcCrt22LXCnRLMtuGO3XNN6a6VPrHDJ1b41A6fWuGeHe69pmNn9o61a2JSE7K6lNljxmpyxuxB23Y-W__zMwAA___Jwitg
 
 query T
 EXPLAIN (DISTSQL)
@@ -147,7 +147,7 @@ vectorized: true
           table: ltable@ltable_pkey
           spans: FULL SCAN
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJzslcFv2jAUxu_7K6x3KUgG4gQo9SlVC1MqmnTAYdOEqox4XdZgZ7bTtar436ck1UoCGKpuNzhh-31-X35Pn_wM6lcCFIafb8bnno8al950Nv00bqLpcDy8mKHkHiN5j0aT4BolOvyWMHQVeD6SxX_3jonlbcwj9ogCHzWUvo25ZlKxhVaNsr6d1xD8oihWTXTuXyKlbxfigclKoV0tLCvze6PvWZI8_Y71j5g31kowqrYhltVEwQRVrZzcBJ4_a5C2hUjbap7UugAGLiLmh0umgH4FAhhswODAHEMqxYIpJWR-9FwUetEjUAtDzNNM59tzDAshGdBn0LFOGFCY5fdPWBgx2bEAQ8R0GCfF9aVjN5XxMpRPgOFCJNmSK1rgfvmQggZgmKZhftLq2DBfYRCZfu2pdHjHgJIVPtyXxx-Y1Cy6EjFnsuNUrW3MFfBfxfAxlfUZuzZGbq8-UNcpdndMr9QUo2pblNLRODifDbZNzSIWsTZ-I8sZ1dcnlNKPw-B6OJt8KXsDhiDTFLkEuzZ2Hex2dwK03wIwB_cy1_5WeK9zHQtxn6Xop4g5Epwit5u72ghKAaS_FWJ_J8Q-RrnuP0LsVyH2duJzduJ7pZZxISMmWVRBNl9tAeyLlkg7Z7XC7a27ldbk8EiS90eyY7c6zoGh3OOsFsruMZT1UO4BuBbK02MoN0NpH54M-x8kw2kdmIs9vmq56B1zUc_FHoBruRgcc2F-rLbgmzCVCq7YQW-RlT9mLLpj5cunRCYX7EaKRdGmXAaFrtiImNLlKSkXHi-PcoPrYmIU22axbRQ7FTGpix2zbcvcumtU98zinlHcN4v77_noU6N4YO48MIrPzOKzN9merz78CQAA___UpEeA
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJzslcFv2jAUxu_7K6x3KUgG4gQo9SlVC1MqmnTAYdOEECNvXUYaZ7bTtar436ck1UrSEKjW3eil2H6f35ff0yc_gfoVAofh55vxueOSxqUznU0_jZtkOhwPL2YkXFMi12Q08a5JqJffQiRXnuMSmf22b1HcLYLIxwfiuaSh9CKINEqFK60aeX07rWH0WZGtmuTcvSRKL1biHmWh0CwW5pXpvf73JAwffwf6RxA1tkooKbZhhtEk3oQUrZzceI47a7C2QVjbaJ6UugCFSPjoLu9QAf8KDCiYQMGCOYVYihUqJWR69JQVOv4DcINCEMWJTrfnFFZCIvAn0IEOETjM0vsnuPRRdgyg4KNeBmF2fe7Yzv8t4jU-AoULESZ3keIZ8uePyYgAhWm8TE9aHRPmGwoi0S99lV7eInC2oYd7c6J7lBr9KxFEKDtW0d6r2QL9qxg-xLI8Z9ukxO6Vh2pb2e6OCeaabFxtg3M-Gnvns0HV5AxmMOPV38iwRuX1Cef849C7Hs4mX_LeQMFLNCc2o7ZJbYva3Z0AzbcATME9z7ZfCU8WZjsWYp3E5KcIIiIiTuxu6uxVYDIo_UqQ_Z0g-5Skuv8Isl8E2duJ0NqJ8IVcEgnpo0S_gG2-qYDsipaIO2elwurW3UJrdng02ftEs2O2OtaB4dzjrhTO7jGc5XDuAbgVztNjOKvDaR6eEPOdEmK1DszHHm-lfPSO-SjnYw_ArXwMjvnY_3hVIJygikWk8KC3yUgfN_RvMX8JlUjkCm-kWGVt8qWX6bINH5XOT1m-cKL8KDW4LWa1YrNebNaKrYKYlcVWvW2jvnW3Vt2rF_dqxf16cf9fPvq0Vjyo7zyoFZ_Vi8_eZHu--fAnAAD__9BBUMI=
 
 # This query performs a semi-join, which is converted to paired joins by the
 # optimizer.
@@ -172,7 +172,7 @@ vectorized: true
           table: ltable@ltable_pkey
           spans: FULL SCAN
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJzUlF9v2jwUxu_fT2Gdq_aVWUgCtM1Vpi7VUlHoAGmVJlRl8VmVNdiZ7UxUiO8-OWHjj8Ck4qa9tH0en-d39OgsQP3KIYDo4b7_MR6Qs0_xeDL-0j8n46gfXU9I_kxuRsM7kuvke47k6-doFJHowVSRs1XN_3WJ3CxR-jHjGqXCVKuzWv3hCcXMo6vC6nR-DhS4YDhIZqgg-AYuUPCAgg9TCoUUKSolpHlaVIUxm0PQppDxotTmekohFRIhWIDOdI4QwMT8P8KEoXTaQIGhTrK8-r52EhYymyXyBShci7yccRWQ_JmSyiBQGBeJuWo5HkyXFESp182UTp4QAndJmxuK-W-UGtmtyDhKx9_2VM8jNM0fM85wDvSfIpoXcmeYoUdJ2DGD-5FJpclPkXGScVIkmUTWMkegMCx1QEKXhh4NfRp2D4J4rwExAKvB9rYhJi8FBqQf3UzIOLqLye0wHgD9y7aed1-I57KoTQsekNAMYzjYx9gzjApTwZkd8iCbf5BtjVRyIRlKZFs80-Ue-oFoicK52inc37qz1dptHlj3hMA6XsvxG0b2iKWdyHbebmSPgGxE9uLdRdZrnhvvlNz4rYapOWJoJzXdt5uaIyAbqbl8d6k5ssRHqArBFTbaY22zCJE9Yb01lShlivdSpFWb-jisdNUFQ6XrV7c-xLx-MgY3xa5V7NnFnlXsb4ndXbFvt922t-5Y1V27uGsV9-zi3inQF1bxpb3zpVV8ZRdfvcr2dPnfnwAAAP__IAJ2uw==
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJzUlFFv2j4Uxd__n8K6T-1fZiEJ0DZPmbpUS0WhA6RVmlCVxXdVRmpntjO1Qnz3yQlbCQKTipf2KbJ9f7nnXB3dJahfOQQQ3d0OP8YjcvIpns6mX4anZBoNo8sZyRfkajK-IblOvudIvn6OJhGJ7kwVOVnX_F-XyM0Spe8zrlEqTLU6qekPDygePbourE6np0CBC4aj5BEVBN_ABQoeUPBhTqGQIkWlhDRPy6owZk8QdClkvCi1uZ5TSIVECJagM50jBDAz_59gwlA6XaDAUCdZXv2-VhLWn_tigc9A4VLk5SNXAckXlFQigcK0SMxVx_FgvqIgSv3SUOnkASFwV7S9qJj_RqmRXYuMo3T8pq56JqFpfp9xhk9A_xHRUyG3Bhp6lIQ9M7wfmVSa_BQZJxknRZJJZB1zBArjUgckdGno0dCnYX-vEe81RoyB9XAHTROz5wIDMoyuZmQa3cTkehyPgP71JhszHwqxKItauOABCc1AxqNdPgfGp8JUcGY3utefv9ffi62SC8lQImt4mq92TGAkOqJwLrYKd7fuNVq77YPrHhlcx-s4fsvoHpC1Fd3e243uASMb0T17l9H12ufHOzY_fqdleg6I2kpP_-2m54CRjfScv8v0HFjsE1SF4Apb7bWuWYzIHrDeokqUMsVbKdKqTX0cV1x1wVDp-tWtDzGvn4zATdi1wp4d9qyw34Ddbdi3y-7aW_esdN8O963wwA4PjjF9ZoXP7Z3PrfCFHb54lez56r8_AQAA__8VlH_9
 
 # Left joins are converted to paired joins by the optimizer.
 query T
@@ -196,7 +196,7 @@ vectorized: true
           table: ltable@ltable_pkey
           spans: FULL SCAN
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJzUVVFvmzwUff9-hXWfWsn5CJCkLU9MHZWostAlTJo0RRXDdxUrsZltplZV_vtkqNYkawxRnvJ4r-_xPedwZF5A_SohgOjr3fRDPCNnH-NFuvg8PSeLaBpdp6R8pEQ-kpt58omUOvteIplGNym5TeIZkW0jmRGl7wuuUSrMtTprB_9_QLFy6etUU50DBS4YzrIVKgi-gQsUPKDgw5JCJUWOSglpjl6awZg9QTCkUPCq1qa9pJALiRC8gC50iRBAaq6fY8ZQOkOgwFBnRdlc3xIJK1msMvkMFK5FWa-4ChpdDT-gsKgy0xo4HizXFESt35YpnT0gBO6a9icU898oNbJbUXCUjr_NKX2uMGhNTL6k0byxEii0NoWG1H3BGT4B_XtT9FTJHY9Dj5JwZAz9UUilyU9RcFJwUmWFRDYwJVBIah2Q0KWhR0OfhuO9Ar1DBBphr4ZPDhL39iGmQjzWVcta8ICExqV_gtSInBiRCnPBWZfK_fr8vfreZNVcSIYS2Zam5fodB2ZiICrnamfw_dWjrdVu_zC7R4TZ8QaO3zPOHZR24jw6vTh3CNyI88VJxtnrnynvmEz5g56J6iC0k6jx6SWqQ-BGoi5PMlEdP4A5qkpwhb3ev6F5QJE9YPvaKlHLHO-kyJs1bZk0uKbBUOn21G2LmLdHhuAm2LWCPTvYs4L9LbC7C_bttIf21SMremwHj63giR08OUb0hRV8ad98aQVf2cFXB9Ferv_7EwAA__9CfIj7
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJzUVVFr2zwUff9-hbhPLSifYztJWz95dC64ZHGXeDAYoXjWXfHiSp4kj5aS_z5klbXJWtmlT3kK9-oe3XNODvIDqF81RJB8vZp_SBfk6GO6ylef58dklcyT85zUG0rkhlwss0-k1sX3Gsk8ucjJZZYuiLSNbEGUvq64Rqmw1OrIDv5_g-LWp49TXXUMFLhguChuUUH0DXygEACFENYUGilKVEpIc_TQDabsDqIxhYo3rTbtNYVSSIToAXSla4QIcnP9EguG0hsDBYa6qOrueksktj_XzQbvgcK5qNtbrqJOW8cRKKyawrRGXgDrLQXR6qeFShc3CJG_pcNJpfw3So3sUlQcpRfu8srvG4yskdmXPFl2dgIFa1VsSF1XnOEd0L83JXeN3PM5DiiJJ8bUH5VUmvwUFScVJ01RSWQjUwKFrNURiX0aBzQOaTx9VWDwFoFG2KPpszeJkzt_xlyITdtY5oJHJDZO_ROoTujMCFVYCs76lL6uMXxV45O0lgvJUCLb0bXevuDCQoxE453tDb68erKz2h8eav-dofaCkRcOjHUPrb1YTw4v1j0Cn8X65GBjHQzPVvDebIWjgcnqIbWXrOnhJatH4LNknR5ssno-CktUjeAKB72HY_OgIrtB-_oq0coSr6QouzW2zDpc12CotD31bZFye2QIPgf7TnDgBgdOcLgD9vfBoZv22L164kRP3eCpEzxzg2fvEX3iBJ-6N586wWdu8NmbaK-3__0JAAD__2c6kj0=
 
 query T
 EXPLAIN (DISTSQL)
@@ -224,7 +224,7 @@ vectorized: true
               table: ltable@ltable_pkey
               spans: FULL SCAN
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJzcVVFv2jwUff9-hXWfqGoKdoBSP6VfSyUqRjpg0qYJVVly12YNdmabrVXFf5-SdCtQcKi6vfBo-x6f43PvkR_BfE9BQO_j1eC0PyS18_54Mn4_OCDj3qB3NiHpHSX6jlyMgnckteGXFMmgdzEhl0F_SHSx4d-gml0nMsZ7EgyJsdeJtKgNRtbUypKjvIQ-XVAs2AEJRnlt_DOxt4msLZ9RsgLjee15b0T-_0RqpaADoCBVjMNwhgbEZ2BAgQMFD6YUMq0iNEbp_OixKOzH9yCaFBKZzW2-PaUQKY0gHsEmNkUQMMk5RxjGqBtNoBCjDZO0uL5U52c6mYX6ASicqXQ-k0YUBhWigcI4C_OteoPDdEFBze0zmbHhDYJgC7q7oL78gdpifKkSibrhrWqaPGQoym4EHya9UdEToPCiK0D_3NS7z_Rah3xOid9ab0e5Swk_agohLgbB6aSbm_410caSbyqRJJEkCxONcT1fAoVgbgXxGfU59T3qt7eawF9jQv74p6Z0XmXAc7MGSt3Ns1K1koL4uZMvRtXvUOLzjUZ0XhphMFIyrnJiuwfeazwYK21RN05W3--zQ-rzQ6AwC210S1KUgrCtjK2tjM9ESseoMd7MM11skDZUdZU1GF-BbJPQXpHAdo8je0McG7ze8HYMZIWktUC29jOQFSYsBfJ4bwNZ4cFTIFnzLyaS7x4H_pY4ePUdw1AhaC0M7f0MQ4UJS2Ho7m0YKjz4HQb2j76nDZQjNJmSBnf6dZr5v4XxDZZ_nVFzHeGVVlFBUy6DAldsxGhsecrKRV-WR7nAZTBzgrkbzJ1gzw32nODWCpitg1vuN1dQt53ojhvccYKP3eBjJ7jrBnff4tiJ27FmxZhUDFnVlLnHjFXMGXMP2vrLp4v_fgUAAP__db-HXQ==
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJzcVVFv2joUfr-_wjpPVDUFO0Cpn9LbUomKS3qBK91pQlVGztqMYGe22VpV_PcpSbcSCg5VtxeeItvny_f5O-eTn8B8TUBA7_-bwXl_SGqX_fFk_O_giIx7g97FhCRzSvScXI2Cf0hiw08JkkHvakKug_6Q6HzDv0O1uI1lhA8kGBJjb2NpURucWVMrSk6yEvr8g3zBjkgwymqj77G9j2Vt_YySEoxntZe9Efn7A6kVgo6AglQRDsMFGhAfgQEFDhQ8mFJItZqhMUpnR095YT96ANGkEMt0abPtKYWZ0gjiCWxsEwQBk4xzhGGEutEEChHaME7y3xfq_OJzm87xEShcqGS5kEbkJuXCgcI4DbOteoPDdEVBLe0LobHhHYJgK7q_qL78htpidK1iibrhlXVNHlMURUeC_ya9Ud4XoPCqM0B__an3kOqNLvmcEr-12ZJilxJ-0hRCXA2C80k3M_5zrI0lX1QsSSxJGsYao3q2BArB0griM-pz6nvUb-80gb_FhOzyz43pvMkAXWrYQKn5Mi2UKymIn7n5amT9DiU-32pG57UZBmdKRlVu7PbBe4sPY6Ut6sZZ2QOfHVOfHwOFRWhn9yRBKQjbydjayfhCpHSEGqPtPNPVFmlDVVdpg_ESZJeEdkkC2z-W7J2xbPB6w9szmBWyNoLZOsxgVpiwFszTgw5mhQ_PwWTN35hMvn8s-Htj4dX3DEWFqI1QtA8zFBUmrIWie9ChqPDhZyjYH3qutlCO0KRKGtzrFWpm7xhGd1i8fUYt9QxvtJrlNMUyyHH5RoTGFqesWPRlcZQJXAczJ5i7wdwJ9txgzwlulcBsE9xy37mCuu1Ed9zgjhN86gafOsFdN7j7HsfO3I41K8akYsiqpsw9Zqxizph70DZvPl399SMAAP__XiWQnw==
 
 query T
 EXPLAIN (DISTSQL)
@@ -252,7 +252,7 @@ vectorized: true
               table: ltable@ltable_pkey
               spans: FULL SCAN
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJzcVV1P4zgUfd9fYd2nIlxaO_0iT2GhSEXdhm270q5WFco0dyBDamdsdwaE-t9HTjpDG6hTBPPSR38cn3PPvUd-Av01BR_6_14PzwYjUrsYTKaTv4dHZNIf9s-nJL2nRN2Ty3H4F0lN9ClFMuxfTslVOBgRlW8EtygXN4mI8YGEI6LNTSIMKo1zo2sF5sReYXQNyFdHJBzbu_H3xNwlorZxRMkGilPC7d2L_pj8-R-pFYKOgIKQMY6iBWrw_wcGFDhQ8GBGIVNyjlpLZY-e8ouD-AH8JoVEZEtjt2cU5lIh-E9gEpMi-DC1pGOMYlSNJlCI0URJmj9fCAoylSwi9QgUzmW6XAjt5watq8vlAoVJFtmTeoPDbEVBLs0zpzbRLYLPVnR_XQPxDZXB-EomAlXD25Y2fczQL5oS_jPtj_PWAIUXzQH666X-Q6ZKjQo4JUG73JXAs7uU8JOm7_uXw_Bs2rPef06UNuSLTARJBMmiRGFct0ugEC6NTwJGA04DjwYtGnR2-sDf4oOtf92ezps8eG7bUMr7ZVYIl8InQcsKLg9t7kX3hRddSqwfZS80zqWIq8zY7YH3Fg8mUhlUjdPt-gN2TAN-DBQWkZnfkRSFT9hOxtZOxmciqWJUGL_OM1u9Im0k6zJrML4F2SWhvSWB7R9M9v5gNni94e0ZzQplpWi2DjaaFT5sRLN7sNGs8GAdTdb8wGzy_YPBPyAYXn3PWFToKsWifbCxqPBhIxa9g41FhQc_Y8F-05f1CuUYdSaFxr1-oqb9yzC-xeL_03Kp5nit5DynKZZhjss3YtSmOGXFYiCKIytwE8ycYO4GcyfYc4M9J7i1BWZlcMtdcwV124nuuMEdJ7jrBned4J4b3HuPY6dux5oVY1IxZFVT5h4zVjFnzD1o5cpnqz9-BAAA___NKI_L
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJzcVV1v4jgUfd9fYd0nqpqCHb6ap3RbKlGxpAustKsVqrLkbpsh2BnbzLSq-O8jJ8wU0uJQTeeFp8i-PjnH594jP4P-nIIP_b9vhxeDEaldDSbTyZ_DEzLpD_uXU5IuKFELcj0O_yCpif5LkQz711NyEw5GROUbwT3K5V0iYnwk4Yhoc5cIg0rj3OhagTmzRxjdAPLVCQnH9mz8NTEPiahtlSjZQnFKuD171R-T3_8htULQCVAQMsZRtEQN_r_AgAIHCh7MKGRKzlFrqWzpOT84iB_Bb1JIRLYydntGYS4Vgv8MJjEpgg9TSzrGKEbVaAKFGE2UpPnvC0FB8bnLFvgEFC5luloK7ecmbW6YSwYKkyyylXqDw2xNQa7MC6820T2Cz9b0cG0D8QWVwfhGJgJVw9uVN33K0C8aE_417Y_z9gCFVw0C-uNP_cdMlZoVcEqCdrkzgWd3KeFnTd_3r4fhxbRn_f8_UdqQTzIRJBEkixKFcd0ugUK4Mj4JGA04DTwatGjQ2esDf48P9v6bFnXe5YHaad1QysUqK8RL4ZOgZUWXhzf3o_vKjy4l1pOyHxrnUsRVhuz3wXuPDxOpDKrG-a4HATulAT8FCsvIzB9IisInbC9jay_jC5FUMSqM3-aZrd-QNpJ1mTUY34Hsk9DekcAODyj7mIA2eL3hHRjRCnWliLaONqIVPmxFtHvUEa3wYRNR1vzAjPLDA8I_KCBe_cB4VGgrxaN9tPGo8GErHr2jjkeFD9_jwX7RE_YG5Rh1JoXGg16mpn3bML7H4j3UcqXmeKvkPKcplmGOyzdi1KaosmIxEEXJCtwGMyeYu8HcCfbcYM8Jbu2AWRncct-5grrtRHfc4I4T3HWDu05wzw3u_Yxj527HmhVjUjFkVVPmHjNWMWfMPWjlm8_Wv30LAAD__6UZmQ0=
 
 query T
 EXPLAIN (DISTSQL)
@@ -310,7 +310,7 @@ vectorized: true
         └── • scan buffer
               label: buffer 1 (q)
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJyUk09vm0wQxu_vpxjNyY72rQ2kVbUn3JQ0RBRSjJVGrWURmFjUZBfvLlWiyN-9WnDSxJKt-oTmzzPz_AZ4Qr2ukWPw_SqahDEMPofTbPotGsJ1mF3AGiZTGEyDKDjL4ATO0-Qr1Ca_rQmuL4I0gHoFP9vx2CNwh7DtK2QrzOBkyF6Uz5l-wHr7fK7WKwZqta1BFJxncJmEMah-URKDNotKGFKaCqMH63dLkvcO2zZ00XAIX9JkdgWfbqBeIUMhS4rze9LIf6CDc4aNkgVpLZVNPXUNYfmAfMywEk1rbHrOsJCKkD-hqUxNyLGWRV6DLnIBt-3dHSkYj8bIsCSTV3U3PmkNB99hvovzDUPZmr_jtMmXhNzZsH9fGYrfpAyVl7ISpEbO223ZY0O8P1Myy4K0OxYy7K_h22ssKlHSA7KXScFDo3au6LsM_NMhMryrlDbwS1YCKgFNXikq_7chsldozPeY_34voHsMoAVLKS9Jjdyj4BpV3efqERlGUq7apnctBQffs253P5UO8oOF1FRIUR6m3AvnHQM3WS4VLXMj1ch7C-fbNzmJbxZxki3iWRQNfMd6O0tmcbZIk-vpwIYpiZIUB2vednEextnHveZOjzGXkm6k0PTG2L7J482cIZVL6v8YLVtV0JWSRbemD5NO1yVK0qavOn0Qir5kDb4WOwfF7mGxe1DsHRZ7B8WnO-L55r8_AQAA___ZCqGV
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJyUk09vm0wQxu_vpxjNyY72rQ2kVbUn3JQ0RBRSjJVGrWURmFjUZBfvLlWiyN-9WnDSxJKt-rSaP8_M8xubJ9TrGjkG36-iSRjD4HM4zabfoiFch9kFrGEyhcE0iIKzDE7gPE2-Qm3y25rg-iJIA6hX8LMdjz0CdwjbvkK2wgxOhuxF-ZzpB6y373O1XjFQq20NouA8g8skjEH1i5IYtFlUwpDSVBg9WL9bkrx32Lahi4ZD-JImsyv4dAP1ChkKWVKc35NG_gMdnDNslCxIa6ls6qlrCMsH5GOGlWhaY9NzhoVUhPwJTWVqQo61LPIadJELuG3v7kjBeDRGhiWZvKq78UlrOPgO812cbxjK1vwdp02-JOTOhv37ylD8JmWovJSVIDVy3m7LHhvi_ZmSWRak3bGQYX8N315jUYmSHpC9TAoeGrVzRd9l4J8OkeFdpbSBX7ISUAlo8kpR-b8Nkb1CY77H_Pd7Ad1jAC1YSnlJauQeBdc_i2ZFj8gwknLVNr1zKTj4nnW8-3fpQD9YUE2FFOVh0r2A3jGAk-VS0TI3Uo28t4C-_TUn8c0iTrJFPIuige9Yb2fJLM4WaXI9HdgwJVGS4mDN2y7Owzj7uNfc6THmUtKNFJreGNs3ebyZM6RySf1Xo2WrCrpSsujW9GHS6bpESdr0VacPQtGXrMHXYueg2D0sdg-KvcNi76D4dEc83_z3JwAA__8CNaMj
 
 # Anti joins are also converted to paired joins by the optimizer.
 query T
@@ -334,7 +334,7 @@ vectorized: true
           table: ltable@ltable_pkey
           spans: FULL SCAN
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJzUlFFP2z4Uxd__n8K6T_CXuzZJWyBPQSxoQV3C2kxDmiqUxXcoI7Uz25lAqN99coJGG1E3iKc-Or7H9_xuju4TqN8l-BDeXM_Oo5gcfYwW6eLL7Jgswll4kZLynlzOk8-k1NmPEsm3T-E8JHGSkvDGVJKj57r_2zK5Wab0bcE1SoW5VkftCx_uUKxc-lzYnI6PgQIXDONshQr87-AABRcoeLCkUEmRo1JCmqunpjBiD-CPKBS8qrX5vKSQC4ngP4EudIngQ2ren2PGUA5HQIGhzoqyeb51ElSyWGXyEShciLJeceWT8p6SxiBQWFSZ-TQYurBcUxC1fmmmdHaH4Dtr2t9QxP-g1MiuRMFRDr1tT-ljhT6ZhZcpSb6m4ZxcJVEMFNo5BcbUbcEZPgD991L4UMnOkAOXkmBsBvqzkEqTX6LgpOCkygqJbGCOQCGptU8ChwYuDTwaTHYCum8BNGDPA5_uhDuP06jD9vIfZkLc11VrWnCfBGZISfwa49QwKswFZ3bInWzeTrYXpJoLyVAi2-JZrl-hj8VAVMOzTuHrrcdbrZ3-QXbeEeShOxh6PaO8x1InyuPDi_IewI0onxxclN3-eXLfkydv0DNNewx10jQ5vDTtAdxI0-nBpWnP0p-jqgRX2GvvjcziRHaH7ZZVopY5XkuRN23aY9Lomg8MlW5vnfYQ8fbKGNwUO1axaxe7VrG3JXa6Ys9ue2RvPbaqJ3bxxCqe2sXT90CfWMWn9s6nVvGZXXz2JtvL9X9_AwAA__-eDouI
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJzUlVFP2z4Uxd__n8K6T_CXuzZJWyBPQSxoQV3C2kxDmiqUxXcoa7Az25lAqN99coJGG1E3iKc-Vbbv8T2_2yPnCdTvEnwIb65n51FMjj5Gi3TxZXZMFuEsvEhJuSKX8-QzKXX2o0Ty7VM4D0mcpCS8MZXk6Lnu_7ZMbpYpfVtwjVJhrtVRe8OHOxT3Ln0ubFbHx0CBC4Zxdo8K_O_gAAUXKHiwpFBJkaNSQpqjp6YwYg_gjygUvKq12V5SyIVE8J9AF7pE8CE1988xYyiHI6DAUGdF2VzfOgnan9tqhY9A4UKU9T1XPilXlDQmgcKiyszWYOjCck1B1PqlodLZHYLvrGl_UxH_g1IjuxIFRzn0tn2ljxX6ZBZepiT5moZzcpVEMVBoZxUYU7cFZ_gA9N9N4UMlO4MOXEqCsRnqz0IqTX6JgpOCkyorJLKBWQKFpNY-CRwauDTwaDDZCei-BdCAPQ99uhPuPE6jDpvc-i9mQqzqqjUuuE8CM6gkfo1zajgV5oIzO-hOPm8n3wtWzYVkKJFtMS3Xr0wgFgNRDc86ha-3Hm-1dvoH2nlnoIfuYOj1jPQeW51Ijw8v0nsANyJ9cpCRdvvnyn1vrrxBz1TtMdVJ1eTwUrUHcCNVpweZqj0fgjmqSnCFvd7BkXlIkd1h--oqUcscr6XImzbtMml0zQZDpdtTp11EvD0yBjfFjlXs2sWuVextiZ2u2LPbHtlbj63qiV08sYqndvH0PdAnVvGpvfOpVXxmF5-9yfZy_d_fAAAA___mlpTK
 
 query T
 EXPLAIN (DISTSQL)
@@ -361,7 +361,7 @@ vectorized: true
           table: ltable@ltable_pkey
           spans: FULL SCAN
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJzcVU1v2kAQvfdXjOYE7VKwDYTsyWniqI6oSY2rpmpR5OJp5GK87q4dJYr475VtGj5UFqKckuPOztt5782M_YDqT4IcnavL4YnrQePMHQfjz8MmjJ2hcxpAMoNzf_QJkjz8mRB8_ej4DnijAJyrMhMay7y3dZpcT2uo_HoqbkmqRg1_f0NibrBlVnVqwol3Bo1kBj-KTsci6DWXIfkYMsxmE0b-mePDh2-QzJBhKiLywjkp5N_RQIYmMrRwwjCTYkpKCVlePVSJbnSHvMMwTrMiL8MThlMhCfkD5nGeEHIMSkY-hRHJdgcZRpSHcVI9X3O3MxnPQ3mPDE9FUsxTxSGZMagkIcNxFpahVtvEyYKhKPJVMZWHN4TcWLDDCbnpLcmcogsRpyTb1ian4D4jDkPnPIDRl8Dx4WLkesiwdtYuSV3HaUR3yB5fcu4yCauW2CYDu9tEhiMPGrbx2ADOuesFg2UbbGvVhn83yPBXLFUOv0WcQpxCFsaSolZ5LN8rcg62wWyT2RazezsNMZ9iSGnEskH9nWaceIG75cWqb0MhZkVWkxYpB9uqxW950i_1KZqKNDpMYHenQGunwJUuISOSFG1Kso13OFn8xwVPtETWPt7MXvLZSaO7QcM4fBOMZ2xC22y1rQN3YQ-lrV3ovv5d2GPI2i4cvcxdMA8fQvM5Q2i1DhzBPYS2RrD3-kdwjyFrIzh4mSO453_jk8pEqmhD3K6XO-W3mqIbqr_tShRySpdSTKsy9XFU4apARCqvb4364Kb1VUlwHWxowaYebGrB1gbY2AZbetodfemuFt3Tg3tacF8P7j9H9JEWPNBXHmjBx3rw8ZNoTxZv_gYAAP__ttm4fA==
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJzcVcFu2kAQvfcrRnOCdinYBkJ8cpo4qiNqp8ZVU7UocvE0cnG87q4dJYr498o2DRiVhYhTckI7O2_nvTcz5hHlnwRNtK8uxyeOC60zZxJMPo_bMLHH9mkAyRzOfe8TJHn4MyH4-tH2bXC9AOyrMhNay7y3dZpYT2vJ_HrG70jIVg1_f0P8VmPLrOrUhhP3DFrJHH4UvZ5BMGgvQ-IppOntNnj-me3Dh2-QzJFhyiNyw1uSaH5HDRnqyNDAKcNM8BlJyUV59VglOtE9mj2GcZoVeRmeMpxxQWg-Yh7nCaGJQcnIpzAi0e0hw4jyME6q52vuVv1znc3pARme8qS4TaUJyZxBJQsZTrKwDHW6Ok4XDHmRrwrKPLwhNLUF25-Uk96RyCm64HFKoms0eQUPGZkwts8D8L4Etg8XnuMiw9pdqyR1HacR3SN7esm-zwSs2mLpDKx-Gxl6LrQs7akJpmk6bjBatsIyVq34d4MMf8VC5vCbxynEKWRhLCjqlMfyvSI3wdKYpTPLYNZgqyH6cwwpjVg2abjVjBM3cDa8EI3ejTmfF1lNnKcmWEZtwIYvw1KjpBlPo_1E9reKNLaKXGnjIiJBUVOWpb3D6eI_Tri8w7PucTN7yWcrjX6Dhrb_RmgHbkRX73SNPXdiB62Nnei__p3YYcjaThy93J3Q9x9G_dBhNDp7juIOUhujOHj9o7jDkLVRHL3cUdzxH-STzHgqqSFw28u98ttN0Q3V33rJCzGjS8FnVZn66FW4KhCRzOtbrT44aX1VElwHa0qwrgbrSrDRAGubYENNu6cu3VeiB2rwQAkeqsHDQ0QfKcEjdeWREnysBh8_i_Z08eZvAAAA___Bi8G-
 
 # Bounding box operations.
 statement ok
@@ -388,7 +388,7 @@ vectorized: true
           table: ltable@ltable_pkey
           spans: FULL SCAN
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJzElF9v2jAQwN_3Kax7aiWzEAco5ClTx6RULOmAh0kTqjJyQhnBzmynYkL0s09J0PgzMEFI5S2275f72Xe6FajfKbjQ__48-OQH5O6zPxqPvg3uyag_6D-OSTqnRM7Jl2H4laQ6-pkieQr9gMjy25uhWLwkPMYlCYNNwMdi0yZvm5hyCRS4iDGIFqjA_QE2UGBAwYEJhUyKKSolZHG0KgP9eAluk0LCs1wX2xMKUyER3BXoRKcILoyLvw8xilFaTaAQo46StPx9JeJlMllE8g9QeBRpvuDKLe9T-gGFURYVWw2LwWRNQeR6m0zpaIbg2mtaX8jnryg1xk8i4SgtZ9_pvxcD-o_oLzNJlH6ZileU6s5jlHite6AQ5tolnk09Rj3npCW7xLKw27xa56jh9tUGQszzjPwSCSeCu8QrrhQGxGPkjXjtXb_WSTnnpNzWKedCxigx3hOarI_oB6IhMqt3EHg8dWsvtV2_newr2sliDet0qexLlA4aqnWjhjpjudNQD-_fUKx-Vdk1VXUaNWt6Ruigpu0b1fSM5U5Nu7cdEkfkhqgywRXWmgHNYohgPMNq4iiRyyk-SzEt01TLsOTKjRiVrk7tauHz6qgQ3IVtI8zMMDPCzh5sH8KOWbtpTt0y0m0z3DbCHTPcuebSD0a4a87cNcI9M9y7SHuy_vA3AAD__2I2DAY=
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJzElM2O2jAQgO99CmtOu5JpiAO7kFOqLZWyoskWOFSqEErxCKUEO7WdFRVin71KgrpAwYA4cAL_fJlvPKNZgf6dgQ-97y_9T2FE7j6Hw9HwW_-eDHv93tOIZHNK1Jx8GcRfSWaSnxmS5ziMiKr-BzOUi0kqOC5JHG0ufCw3XfK2uVMtgYKQHKNkgRr8H-ACBQYUPBhTyJWcotZSlUer6mLIl-A3KaQiL0y5PaYwlQrBX4FJTYbgw6j8-gATjsppAgWOJkmz6vO1SFD_TPI5_gEKTzIrFkL7VU6VI1AY5km51XAYjNcUZGHeA2qTzBB8d03PlwrFKyqD_FmmApXj7Xr992pA_xG9Za6INpOpfEWl7wJGSdC6BwpxYXwSuDRgNPCOWrJLLEu7zcs9HDRUOy_Xl3Je5OSXTAWRwidBmVYckYCRNxK0tx1bRwW9o4LvXoWQiqNCviM1Xh9IIZINmTvdvYuHQ7d2Qrvnt5V7ZVs5rOEcL5l7idZeY7Vu1FgnLLca6_E2jcXOry67trpe48zanpDaq237RrU9YblV287th8YBwQHqXAqNZ82EZjlUkM-wnkBaFmqKL0pOqzD1Mq64aoOjNvWpWy9CUR-Vgtuwa4WZHWZW2NuB3X3Ys2s37aFbVrpth9tW-MEOP1yT9KMV7tgjd6xw1w53L9Ierz_8DQAA__-vnxVI
 
 query T
 EXPLAIN (DISTSQL)
@@ -411,7 +411,7 @@ vectorized: true
           table: ltable@ltable_pkey
           spans: FULL SCAN
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJzElN9v2j4QwN-_f4V1T61kviEOUMhTpo5JqRjpgIdJE6pSckIZwc5sp6JC9G-fnLTjx8CAkMZbfPYn97HvdEtQvzLwofv9sfcp7JObz-FwNPzWuyXDbq97PyLZjBI5I18G0VeS6fg5Q_IQhX0iy-9gimL-lPIEFyT6CP5vguTt_Xi5coECFwn24zkq8H-ACTCg4MGYQi7FBJUS0mwty4NhsgC_TiHleaFNeExhIiSCvwSd6gzBh5H5_QDjBKVTBwoJ6jjNyt9XqYNcpvNYvgKFe5EVc6788j4fRsM8NqGaw2C8oiAKvU6mdDxF8N0VPV0o5C8oNSYPIuUoHW_b6a8XA_qH6C5ySZR-mogXlJg8v94EjJKgcQsUokL7JHBpwGjgHRRl54gawfeHa-2VXD9cT4hZkZOfIuVEcJ8E5lZRnwRN8kYCtunXOCjnHZRbOxVcyMRcfktovNqj3xc1kTudnYP7Uze2Urund5R7QUc5rOYcLpV7jtJOTzWu11NHRDd66u7f9xQ7vbDsksJ6tRPLekRop6zN65X1iOhGWdvXHRV75AaocsEVnjQJ6maUYDLFau4oUcgJPkoxKdNUy6jkykCCSle7brUIebVlBDdh1wozO8yssLcFu7uwZ9eu21M3rHTTDjetcMsOty659J0Vbtszt61wxw53ztIer_77HQAA__9jZA-Z
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJzElFFv2jAQgN_3K6x7aiWzEAco5ClTx6RUjHTAw6QJoZScUEawM9upqBD97ZOTdgUGBsQDT-Czv9xn3-lWoP5k4EP352PvS9gnN1_D4Wj4o3dLht1e935Esjklck6-DaLvJNPxU4bkIQr7RJb_gxmKxSTlCS5J9B78bILk9e14uXKBAhcJ9uMFKvB_gQkwoODBmEIuxRSVEtJsrcqDYbIEv04h5XmhTXhMYSokgr8CneoMwYeR-fwA4wSlUwcKCeo4zcrPV6mD6meSz_EFKNyLrFhw5Zd3erca5rEJ1RwG4zUFUeiPhErHMwTfXdPTpUL-jFJj8iBSjtLxtr3-ezWg_4juMpdE6clUPKPE5OnlJmCUBI1boBAV2ieBSwNGA--gKDtH1Ai-PV5rr6TceryeEPMiJ79FyongPgnMzaI-CZrklQRs07FxUNA7KPjhVXAhE_MAW1Lj9Z4r9EVN5E5n5-D-1I2t1O7pneVe2FkOqzmHS-aeo7XTW43r9dYR0Y3eurtOb7HTC8wuLbBXO7G8R6R2ytu8XnmPiG6Ut3390bFHcIAqF1zhSZOhbkYLJjOs5pAShZzioxTTMk21jEquDCSodLXrVouQV1tGcBN2rTCzw8wKe1uwuwt7du26PXXDSjftcNMKt-xw65JL31nhtj1z2wp37HDnLO3x-tPfAAAA__8FThjb
 
 query T
 EXPLAIN (DISTSQL)
@@ -434,7 +434,7 @@ vectorized: true
           table: ltable@ltable_pkey
           spans: FULL SCAN
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJzMlE-P2jwQh-_vp7DmtCuZN4kDLOSUakulrCjZAodKLVqlZIRSgp3aTkWF-O6Vk93yp2BAHOgFkXGezGP_Rl6B-pFDAL3Pz_130YDcvY9G49Gn_j0Z9fq9xzHJ55TIOfkwjD-SXCffciRPcTQgsvofzlAsXjKe4pLEb8X_TZF8LV2XtevfV7Ja8IACFykOkgUqCL6AKTCg4MOEQiHFFJUS0iytqhejdAmBSyHjRalNeUJhKiRCsAKd6RwhgLH5_BCTFKXjAoUUdZLl1efr1mEhs0UifwGFR5GXC66CamtvRqMiMaWGw2CypiBKvWmmdDJDCLw1PV8o4j9RakyfRMZROv6u01-HB_QP0VsWkij9knGNUuFUq7uQURI274FCXOqAhB4NGQ39o6bsElNj-Hpy7YOWm5PrCzEvC_JdZJwIHpDQbCsekLC1m3bItlWbRz39o54bvZILmaLEdMdtsj6wk4FoiMLp7r14uHVzp7V3_nR5V0yXwxrO8dS8S5T25qt5w_k6Ybo1Xw83nS92fsjsmpD9xpkRnxDai7h1w4hPmG5F3PlnrpADnkNUheAKz7ohXHPFYDrD-j5SopRTfJZiWrWpH-OKqwopKl2vevVDxOslI7gNe1aY2WFmhf0d2NuHfbu2a2_dtNItO9yywm073L5m0w9WuGPv3LHCXTvcvUh7sv7vdwAAAP__eYob7A==
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJzElFGPmkAQx9_7KTbzdJesBRb1lCeaq024WLmqD01aY6hMDBV36e7S2Bi_ewPc9cTqivHBF4UZ_ju_2f9ktqB-peDB4Ovz8EMwIncfg8l08mV4TyaD4eBxStIVJXJFPo3DzyTV0Y8UyVMYjIgsn_0livU84TFuSPgafF8Eyffctlm3-n1RlgkHKHAR4yhaowLvGxQBBhRcmFHIpFigUkIWqW35YRBvwLMpJDzLdRGeUVgIieBtQSc6RfBgWhw_xihGadlAIUYdJWl5fFXar_7m2Qr_AIVHkeZrrryyvVeqSRYVoZbFYLajIHL9VlDpaIngOTvaHCrgv1FqjJ9EwlFabp3rvwsE-k8x2GSSKD1PuEapcKHVnc8o8dv3QCHMtUd8h_qM-u5JUnYJaUH4cnvdo5SydntDIVZ5Rn6KhBPBPeIXrYUj4nfqrvtsH7d9ktU9yfqGmHMhY5QY1_hmuyPdjERLZFb_4MPjpdu10k7zKXOunDKLtazT7jmXYB3MWfuGc3aGdG_OHm4-Z6y52exas91WQ6vPQB1Y3bmh1WdI96zu3dzqM-tvjCoTXGGjjWEXKwfjJVb7SYlcLvBZikVZpnoNS10ZiFHpKutULwGvUgXgvtgxiplZzIxityZ2DsWuGds2l24b1R2zuGMUd83i7jVNPxjFPXPlnlHcN4v7F2HPdu_-BgAA__-I7SUu
 
 # Tests where the table with the inverted index has multiple columns in the primary
 # key.
@@ -482,7 +482,7 @@ vectorized: true
               table: ltable@ltable_pkey
               spans: FULL SCAN
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJzMlF1v0zAUhu_5Fda52jSX1E4_tlwZtiJ1Ku1odwFC1RSaoxGW2sF20dDU_46cDNaWxclU0HZTNbHfvI-PHvkOzPcMIhh8vBi9GY7Jwdlwdjn7MDoks8FocHpJshtK9A1zP5y8m07ek8zGXzIk55PhmOjiPxfXqJZXqUzwlkzGxNirVFrUBhfWHJT7X7st7jNlong8JJPp2WBK3n4iB5s9h0BBqgTH8RINRJ-BAQUOFEKYU8i1WqAxSrulu2LjMLmFqE0hlfnKutdzCgulEaI7sKnNECK4dL1TjBPUQRsoJGjjNCs-XxKKXKfLWP8ECqcqWy2liYrTF-BAYZbH7lUr4DBfU1Ar-1BmbHyNELE1bQ40lD9QW0zOVSpRB-E209-TBfonMrjN9c6UBadEdNzkJisbEcGo4FSEVHQraflTaB3l_fR6j5M-jG-k1M0qJ99UKomSEXEYHUe2q0YB3duC7lLRryQOn0I8U9qiDk62aQU7ooIfUREeAYVlbBdfSYYyIqyytVPZ-lCmdIIak-qu-foRxLFqqTxgfCtWhdHdwmDNbWd72B7wVhA29L0Gacf3zjP7XkO74Xv_hfheQ3zvO2v_Y-F5c9P4PqaFrYae1QDteNZ9Zs9qaDc8O34hntUQ__aM_ceL9ZHaKZpcSYON7sq2u20xucbyljZqpRd4odWiqCkfJ0WueJGgseUqKx-GslxygJth5g1zf5h7w6E_HHrDna0w2w13_Geuqe560z1_uOcN9_3hvjd87A8f7zOxE__E2jWa1EhWZ5lfM1bjGfOLtnvy-frVrwAAAP__G1TkFg==
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJzMlF9P2zwUxu_fT2GdKxDum9rpH8iVN-ikoq5lLRebpgplzRHLmtqZ7U5MqN99cgKj7YgTxCa4aZrYT55fjn7yLZjvGUQw-HgxejMck4Oz4exy9mF0SGaD0eD0kmRLSvSSuR9O3k0n70lm4y8ZkvPJcEx08Z-La1Srq1QmeEMmY2LsVSotaoMLaw7K_f-7Le41ZaK4PSST6dlgSt5-IgfbPYdAQaoEx_EKDUSfgQEFDhRCmFPItVqgMUq7pdti4zC5gahNIZX52rrHcwoLpRGiW7CpzRAiuHS9U4wT1EEbKCRo4zQrXl8SivJylS_xJ1A4Vdl6JU1UTKCABwqzPHaPWgGH-YaCWtuHQmPja4SIbWhzqKH8gdpicq5SiToId7n-nC7Q35HBTa73Ji04JaLjpjdZ24gIRgWnIqSiW0nLn0LrKO8m2Huc9O56P8ORUst1Tr6pVBIlI-JYOg5v35GCvLdD3qWiX4kdPgV7prRFHZzsIgt2RAU_oiI8Agqr2C6-kgxlRFhla6ey9aFM6QQ1JtVd880jiGPVUnnA-E6sCqO7g8Gaa8-eqX3AW0HYUPwarD3xOy8sfg3tlvj91yR-Dfad-Kz9l83nzZXjz1UubDUUrgZqT7juCwtXQ7sl3PFrEq4G-1449g-P2kdqp2hyJQ02Oj3b7vzF5BrLc9uotV7ghVaLoqa8nRS54kGCxparrLwZynLJAW6HmTfM_WHuDYf-cOgNd3bCbD_c8X9zTXXXm-75wz1vuO8P973hY3_4-DkTO_FPrF2jSY1kdZb5NWM1njG_aPtfPt_89ysAAP__wsbt7g==
 
 query T
 EXPLAIN (DISTSQL)
@@ -510,7 +510,7 @@ vectorized: true
               table: ltable@ltable_pkey
               spans: FULL SCAN
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJzUVd9v2joYfb9_hfU9taq5wQ6_mqfc26YSFSMdMGnThKos-dZlDXZmm6lVxf8-OelWYMWh6vbAC5LtHJ9zPs6RH0B_KyCA6P3V6L_hmBydD6ez6dvRMZlGo-hsRopbStQtsz-cXEziN6QwyacCySi6mJHLeDgmqtrg4Q3KxXUuMrwj8Zhoc50Lg0pjavRRDfrXfmLvqhHV8pjEk_NoQv7_QI7WyY6BgpAZjpMFagg-AgMKHCj4MKdQKpmi1lLZo4fqw2F2B0GbQi7KpbHbcwqpVAjBA5jcFAgBzCzvBJMMldcGChmaJC-q62uFYanyRaLugcKZLJYLoYNqBJVwoDAtE7vV8jjMVxTk0jyRaZPcIARsRfcXNBTfURnMLmUuUHn-pqbZfYlBPen43SyaVPMGCr9PHOivq6K7Um1NP-SUhB070c-50oZ8lbkguSBlkivMWnYJFOKlCUjIaMhp6NOwS8PeTpP8JSatuceh915m8OnfGEl5uyxr5VIExCrsWNHbSau89q1XjakUWZPZHg0HO236L7E5lcqg8k43LYbshIb8hIb-CVBYJCb9QgoUAWE7WTs7WZ_IpMpQYbaba756RuJYtmTpMb4B2yWjuyGD7d8s9opmebzl-Xt2q0HSVrc6h9mtBpNr3eofcrcabD52i7X_cLn4_qnmr0m139oz0w2CtjLdPcxMN5hcy_TgkDPdYPNnptlffDCeoZ2gLqXQuNcb0LavCGY3WL8-Wi5VildKphVNvYwrXLWRoTb1KasXQ1EfWYHrYOYEczeYO8G-G-w7wZ0NMNsGd9yeG6i7TnTPDe45wX03uO8ED9zgwWsmduqeWLshJg0ha0qZO2asIWfMHbRt5_PVPz8CAAD__19vSsU=
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJzUVV9v2j4Uff99Cus-tar5gR3-NU_Z2lSiYqQDJm2aUJUld11GsDPbTK0qvvvkpF2BFYeq2wMviWzn-Jxzc67uPegfOfgQfrwavhmMyNH5YDKdvB8ek0k4DM-mJJ9ToubMPji5GEfvSG7iLzmSYXgxJZfRYERUucGDG5SL60ykeEuiEdHmOhMGlcbE6KMK9L_9xN5VIcrlMYnG5-GYvP1EjtbJjoGCkCmO4gVq8D8DAwocKHgwo1AomaDWUtmj-_LDQXoLfotCJoqlsdszColUCP49mMzkCD5MLe8Y4xRVswUUUjRxlpfXVwqD6nVdzPEOKJzJfLkQ2i_LUIoHCpMitluNJofZioJcmidCbeIbBJ-t6P6iBuInKoPppcwEqqa3qWt6V6BfVTv6MA3HZc2Bwp9VB_r7qvC2UFt_IOCUBG1b1a-Z0oZ8l5kgmSBFnClMG3YJFKKl8UnAaMBp4NGgQ4PuTpP8JSatuYfCd19m8OH9-EuGUs6XRSVfCp9YmW2rfDtypeGeNawxkSKtc9ylQX-nV-8lXidSGVTN002fATuhAT-hgXcCFBaxSb6RHIVP2E7W9k7WJzKpUlSY7uaarZ6ROJINWTQZ34DtktHZkMH2bzH2yhZr8kbT27PJamRtNVn7MJusxuRak_UOvslqvD40GWv95S7j-8ebvzbeXmPPcNeI2gp35zDDXWNyLdz9gw93jdfHcLN_OEKeoR2jLqTQuNdUaNm5gukNVvNIy6VK8ErJpKSpllGJKzdS1KY6ZdViIKojK3AdzJxg7gZzJ9hzgz0nuL0BZtvgtttzDXXHie66wV0nuOcG95zgvhvcf03FTt0Va9XEpCZkdSlzx4zV5Iy5g7btfLb671cAAAD__8xMVJ0=
 
 query T
 EXPLAIN (DISTSQL)
@@ -534,7 +534,7 @@ vectorized: true
           table: ltable@ltable_pkey
           spans: FULL SCAN
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJzUlVFP2z4Uxd__n8K6T_Q_d22StkCeskHQgkrL2kpjmiqUxXcoa2pntjOBUL_75KQD0lE3qC_weO17fM_v6ii5B_UrAx_Cq8vhh2hEDk6j6Wz6edgi03AYnsxItiBnk_EFyXT8PUPy5VM4CUl4ZbrIwbrn_6pFli1ucINieZ1yhrfrdqWvU65RKky0Oqheem-6HPpXVJatFhlPTsMJ-fiVZAugwAXDUbxEBf43cICCCxQ8mFPIpUhQKSHN1X3ZGLFb8LsUUp4X2hzPKSRCIvj3oFOdIfgwM8MmGDOUnS5QYKjjNCufr2wFuUyXsbwDCiciK5Zc-SRbUFK6BQrTPDZH7Y4L8xUFUejHYUrHNwi-s6LNDUX8N0qN7FykHGXHq3v6d6NAHyThbS43Vhu4lAS9FlD4kUqlyU-RcpJyksepRNY2JVAYF9ongUMDlwYeDfo0GGyFcV8CYyDWyx3UQWZ3OfpkGJ7NyDS8iMj5OBoBfeB7XPpQiEWRV8YF94kx2DOeR8-hHhpUhYngrBlrjwb9razeVtZHRCEZSmR1usB5B_PVMwsZibbIO8f17rWlrTZ6NRtO80A7ewS647Y7XsNI77C0Eene6470DpgnkT5885F2m2fJ3SdLXrthknYY2khS_3UnaQfMkyQdvfkk7fgRTFDlgiuscW57uWu-nMhusPrSKlHIBC-lSMoxVTkudeUBQ6WrW6cqIl5dGYNPxY5V7NrFrlXs1cTOptiz2-7aR_es6r5d3LeKB3bxYB_oQ6v4yD75yCo-touPX2R7vvrvTwAAAP__t8uNew==
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJzclV9P2zAUxd_3Kaz7RDd3bZK2QJ6yQdCCSsvaSmOaKpTFdyhrsDPbmUCo331yUv6ko25QXxBPke17fM_v6si5A_UnAx_Ci_Php2hE9o6j6Wz6ddgi03AYHs1ItiAnk_EZyXT8M0Py7Us4CUl4YarI3qrmfVUiyxI3uEJxfZlyhjercqUvU65RKky02qtu-miqHHovKpetFhlPjsMJ-fydZAugwAXDUXyNCvwf4AAFFyh4MKeQS5GgUkKao7uyMGI34HcppDwvtNmeU0iERPDvQKc6Q_BhZppNMGYoO12gwFDHaVZeX9kKqs9lvsBboHAksuKaK59kC0pKx0Bhmsdmq91xYb6kIAr92FDp-ArBd5a0uamI_0WpkZ2KlKPseHVf_08V6IMkvMnl2ngDl5Kg1wIKv1KpNPktUk5STvI4lcjaZgkUxoX2SeDQwKWBR4M-DQYbYdyXwBiI1YAHdZDZbY4-GYYnMzINzyJyOo5GQB_4Vt_7yQ-FWBR55V5wnxiXPWN89BzvvuFVmAjOmgH3aNDfCOxtBH7kFJKhRFZHDJwPMF8-M5WRaIu8c1ivXlnaaKNXs-E0T7azY7I7brvjNcz2Fltr2e697mxvgXmS7f23kW23eajcXUPltRtGaouptUj1X3ektsA8idTB24jUlv_DBFUuuMIa7Kabu-YtRXaF1durRCETPJciKdtUy3GpKzcYKl2dOtUi4tWRMfhU7FjFrl3sWsVeTeysiz277a69dc-q7tvFfat4YBcPdoHet4oP7J0PrOJDu_jwRbbny3f_AgAA___3AZdT
 
 query T
 EXPLAIN (DISTSQL)
@@ -558,4 +558,4 @@ vectorized: true
           table: ltable@ltable_pkey
           spans: FULL SCAN
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJzUlVFv2j4Uxd__n8K6T-U_M0gCtM1TujbVUrGkC5nWaUJVhu-qjGBntplaVXz3yQlbCyuGiicebd9z7_ldjsIjqJ8l-BDeXA_PopgcXUSjbPRx2CKjcBieZ6Sckss0-UBKnX8rkXx-H6YhiZOMhDemkhwt6_5vymRd5gZ3KGa3BWd4v5QofVtwjVLhRKujpttbU-XQP6L62GqRJL0IU_LuCymnQIELhnE-QwX-V3CAggsUPBhTqKSYoFJCmqfHujBi9-B3KRS8mmtzPaYwERLBfwRd6BLBh8wMSzFnKDtdoMBQ50VZt29sBZUsZrl8AArnopzPuPJJOaWkdgsURlVurtodF8YLCmKun4Ypnd8h-M6C7m4o4r9QamRXouAoO96qp-yhQp8Mw8uMJJ-yMCVXSRQDhX83DfRvq_C-kmsrD1xKgl4LKHwvpNLkhyg4KTip8kIia5sjUEjm2ieBQwOXBh4N-jQYbIR0XwNp4JZLH2wEPIuzaJ3v6ccYCjGdV41xwX1iDPaM5_gl1GODqnAiONuNtUeD_kZWbyPrE6KQDCWyVbrAeQPjxQsLiUVbVJ3T1eqlpY02eis2nN2D7uwR9I7b7ng7Rn2LpbWo9w4z6lsgn0X9-OCj7u6eMXefjHntHRO2xdBawvqHmbAtkM8SdnLwCdvyx5GiqgRXuMK5qXPXfGmR3WHzZVZiLid4LcWkHtMck1pXXzBUunl1mkPEmydj8LnYsYpdu9i1ir0VsbMu9uy2u_bRPau6bxf3reKBXTzYB_rYKj6xTz6xik_t4tNX2R4v_vsdAAD__91Aokg=
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJzclVFP2zAUhd_3K6z7RDd3bZK2QJ7CIGhBXcLSTGOaKpTVdyhrsDPbnUCo_31yUgbtqFvUJ3iKbN_je77bI_cO1O8SfAgvzodHUUz2TqJRNvo8bJFROAyPM1JOyWmafCKlzn-USL5-DNOQxElGwgtTSfYWdW-bMlmXucEViuvLgjO8WUiUviy4RqlwotVec9t7U-XQe1G9bLVIkp6EKfnwjZRToMAFwzi_RgX-d3CAggsUPBhTqKSYoFJCmqO7ujBiN-B3KRS8mmmzPaYwERLBvwNd6BLBh8w0SzFnKDtdoMBQ50VZX9_YCprPZTXFW6BwLMrZNVc-KaeU1I6BwqjKzVa748J4TkHM9ENDpfMrBN-Z0-1NRfwPSo3sTBQcZcdb9pXdVuiTYXiakeRLFqbkLIlioPD_tIH-uyq8qeTK2AOXkqDXAgo_C6k0-SUKTgpOqryQyNpmCRSSmfZJ4NDApYFHgz4NBmsh3edAGrjF4AdrAY_iLFrlW3zvf5GhENNZ1bgX3CfGZc8Yj5_i3Te8CieCs-2AezTorwX21gI_cArJUCJbRgycdzCePzGVWLRF1Tlcrl5YWmujt2TD2T7xzo6J77jtjrdl5jfYWsl872VmfgPko8zvv47Mu9uHzd01bF57y6htMLUStf7LjNoGyEdRO3gdUdvwf5KiqgRXuAS77uaueXuRXWHzVisxkxM8l2JSt2mWSa2rNxgq3Zw6zSLizZEx-FjsWMWuXexaxd6S2FkVe3bbXXvrnlXdt4v7VvHALh7sAr1vFR_YOx9YxYd28eGzbI_nb_4GAAD__6g2rCA=
diff --git a/pkg/sql/opt/exec/execbuilder/testdata/inverted_join_json_array_dist b/pkg/sql/opt/exec/execbuilder/testdata/inverted_join_json_array_dist
index cc5d6fdf8d26..627d6d541ead 100644
--- a/pkg/sql/opt/exec/execbuilder/testdata/inverted_join_json_array_dist
+++ b/pkg/sql/opt/exec/execbuilder/testdata/inverted_join_json_array_dist
@@ -94,7 +94,7 @@ vectorized: true
               table: json_tab@json_tab_pkey
               spans: FULL SCAN
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJzElN9v0zAQx9_5K6x7AuYusZPuR548tiCKSjuSSYCgmtLmmFK6ODjJNDT1f0dJS9dWjZ1taHu0nW_uc6eP7g7y3zPwwP963j_pDcjrs154EX7uvyGh3_dPL8hb8j4YfiLTXKaXRTQWP6W8TNIbchKSKaOr-_rMyZcPfuCTKdsfE_GjtG0HyZTvj8kwOPMD8u5b9RTR6i4CCqmMcRBdYw7ed2BAgQMFB0YUMiUnmOdSVU939Ye9-BY8m0KSZmVRXY8oTKRC8O6gSIoZggcX0XiGAUYxKssGCjEWUTKrf79qIFPJdaT-AIVTOSuv09wjESVjoBBmUXXqWMyG0ZyCLIv7UnkRXSF4bE7b4_TSG1QFxh9lkqKynAai5UiBrgL-baaIcFczFNVghmXhEcGo4FQ4jYD8IYAV2HJcB8Zx9aX8VWZkKpOUyNQjoupnOCCiu4vTpaJLa9pGVOchqKFUBSrreBNTsD0qnL3GEm5jifs_SxWjwrjpxztYBrIjM4vxjUgTQncDgbUXmD1WYIvZHYu3ddhAtOWw-_wOGwDXHD58aYcNqEuHmf0UiXl7g_ijDeJ2p6U-BpwtfbrPr48BcE2fo5fWx4D6Tx_2v3bgjhoB5plMc2y12uxqOWJ8hYuFmstSTfBcyUldZnEc1rn6Isa8WLyyxaGXLp4qwPUw04a5Psy1YUcfdrRhdyPMtsOuvmdD6a42faAPH2jDh_rwoTZ8pA8fPWVix_qJ2QZNDJKZLNNrxgyeMb1o252P5q_-BgAA___uXKww
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJzMlN9u2jAUh-_3FNa52lbTxE7on1y5azONiUGXIG3ThlAgZ1UojTMnqToh3n1KoBQQcVIxVb2L7fx8Ph99OnNI_8zAAff7dfei0yNvrzr-wP_afUd8t-teDsh78tHrfyHTVMajLBiL31KOovieXPhkyuh6v1xz8u2T67lkyo7HRPzKTdNCMuXHY9L3rlyPfPhRHAW02AuAQixD7AV3mILzExhQ4EDBgiGFRMkJpqlUxdG8_LETPoBjUojiJM-K7SGFiVQIzhyyKJshODAIxjP0MAhRGSZQCDELoll5_foBjx-j5Bb_AoVLOcvv4tQhASVjoOAnQbFqGcyE4YKCzLOngmkW3CA4bEGbQ3Xie1QZhp9lFKMyrAquVWOBrgPuQ6KIsNedFEV7-nnmEMGo4FRYlYD8OYAF2KppJw2b1pXyNk_IVEYxkbFDRPGqfo-I9j5am4o2LZkrga3nAPtSZaiM821YwY6osI4qS9iVJZ5ulipEhWHVxXtYerIlE4PxrUgVQnsLgTWXmR0ms8HMlsGb-lzDteOz_fI-1wBu-Hz6OnyuAV75zMxDhObNbeIH2sTNVkOVaqB2VGq_vEo1gBsqnb0OlWqAH1Vi_2s27qnhYZrIOMVGI88shiaGN7gctKnM1QSvlZyUZZbLfpkrN0JMs-UpWy468fKoANwMM22Y68NcG7b0YUsbtrfCbDds699cU7qtTZ_owyfa8Kk-fKoNn-nDZ4d07FzfMbNGkxrJ6izTa8ZqPGN60XZfPly8-RcAAP__WK26iA==
 
 # This query performs a cross join followed by a filter.
 # Note that the distribution shows as either full or partial depending on the
@@ -122,7 +122,7 @@ vectorized: true
           table: json_tab@json_tab_pkey
           spans: FULL SCAN
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJy0k29v0zAQxt_zKayT0IC5S-x0G8qrjC1ohdKMpBKgEU1Oc4yUNg62IzFV_e4o6ehI1Xb9o77L-e7J8zv7bgL69whciPyuf9knWf5Dkvdh8Inc-l9vuhedHnl11Yn60efua_JY82ZWMNQyvzMi8f593BW_8IFcRGTI6Dxbx5x8ufZDnwzZSUK876VtO0iG_CQhQXjlh-TdtyolaHUm4sfiGqUX9Em389EnR2mmjcqS0mQyd18eAYVcptgTY9Tg3gIDChwoOBBTKJQcoNZSValJXdhJ_4BrU8jyojTVcUxhIBWCOwGTmRGCC32RjDBEkaKybKCQohHZqP79vNlCZWOhHoDCpRyV41y7RFCSAIWoEFXUspgN8ZSCLM2TlTbiHsFlU7objnMQHL4S54mizKVKUWHaIIgr5XMlS3q6FvrnB5nlqKyzZktBj3h8PhxeGygEpXGJx6jHqedQr72yD2eba42kMqis86a9x46p5xyvtGg3LNjmL8d2fTmL2S2LbzpLWxC1D0XUHCe-ORHfmYjbrQ0vaAuc04PgrF62JTgh6kLmGheXbumf7WrTML3H2eZqWaoB3ig5qG1mYVDr6oMUtZll-Szo5HWqvq__xWwLMV8U87VipyG2F8XOWvHb9eL2Pj2f7tPz2T7O51s5x9MXfwMAAP__LzGAEA==
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJy0k1Fv0zAQx9_5FNZJaMDcJXa6DeUpYwtaoTQjqQRoRJPTHCOls4vtSKCq3x0lHRup2tIu6lvOd__8f2ffzcD8nIAPSdgPz4ekkN8UeRtHH8h1-Pmqf9YbkBcXvWSYfOy_JPc1rxYFY6PkjRVZ8PfjZvoDf5OzhIwZfcjWMSefLsM4JGN2lJHga-m6HpIxP8pIFF-EMXnzpUoJWp2J9L64RhlEQ9LvvQ_JQV4Yq4ustIWS_vMDoCBVjgNxhwb8a2BAgQMFD1IKU61GaIzSVWpWF_byX-C7FAo5LW11nFIYKY3gz8AWdoLgw1BkE4xR5KgdFyjkaEUxqX-_ulmgcK4m5Z00PhGUZEAhmYoq6jjMhXROQZX20dBYcYvgszl9GpS3Ryi-FuqRpZRK56gxb3CklfJ_JSs6uxTm-ztVSNTOSbOxaEAC_jAoQRcoRKX1ScBowGng0aC7tg9vl8tNlLaondOmfcAOaeAdrrXoNizY9u_H2r2fw9yOw7edqx24uvvlao4W356Lt-TibmfLy9oB6niPUOuXcAVUjGaqpMHlZVz5Z7faQMxvcbHRRpV6hFdajWqbRRjVuvogR2MXWb4IerJO1bf2r5jtIObLYr5R7DXE7rLY2yh-vVncbdPzcZueT9o4n-7knM6f_QkAAP__Dt-OaA==
 
 # This query performs an inverted join with an additional filter.
 query T
@@ -151,7 +151,7 @@ vectorized: true
               table: json_tab@json_tab_pkey
               spans: [ - /19]
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJzUk09vm0AQxe_9FKO5xE42hgU7SfdEElOJyIUUrKpVY0Vrs41wHZYuEKWy_N0rcP4RhbVd9dAed3Z-M--N9JaY_1wgQ_fL5ejU86Ez9KJx9GnUhcgduedjmNPePoG51duHD2HwEea5TK8LPoXTCOYWeL7vhuD5n91w7A7hIvD8ZguFwIdOZ057U3CuStO0RTVt2oVTfwjN-t7yCvkVMliuVnvdxw6rx6FumIFldiEIh24IZ18rZbxWxpFgKmPh81uRI_uGFAlaOCGYKTkTeS5VVV7WTV58j8wkmKRZWVTlCcGZVALZEoukWAhkOObThQgFj4UyTCQYi4Ini3r0ozcnU8ktV7-Q4LlclLdpzoATmCLBKOPV69CgJk5WBGVZPK_KC34jkNEV2V6Ol94JVYj4QiapUIbVoui7lNdJeofkCXDvMwUdp_90YMd6OOqLWuPojLGLKPDPukgwKAsGDiWORRy71Ym1i5PKwcNd-xvvOpLyR5nBXCYpyJSBY1eifOg4gzcMDXYz1CfOoNWTvYunSKpCKOOo6cexD4hDD1pX9FtXPE-WKhZKxG2D39Diy0OZGSdNYm3brj1X5ls1DRqa6PYZoX-aEYOah4a1bUw2KHoVE_sfjskGJy9iMvhvYrLB00NMjv9WTN5YEYo8k2kuGivaJptVfkR8I9aZy2WpZuJSyVm9Zv0Maq4uxCIv1r90_fDS9Vcl8CVMtbClhy0tbOthWwv3GzB9Dfe18Hv95oEWPtLDR1r4WA8fa-ETPXyy08Emq3e_AwAA__8nLODt
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJzUk09vm0wQxu_vpxjNJXayMSzYSd49kcRUInIhBatq1VjR2mwjOw5LF4hSWf7uFZB_RGFtqz20N3aY38zzjPSsMPuxRIbul8vRqedDZ-hF4-jTqAuRO3LPx7CgvX0CC6u3Dx_C4CMsMplc53wKpxEsLPB83w3B8z-74dgdwkXg-c0WCoEPnc6C9qbgXBWmaYty2rQLp_4QmvW91RXyK2SwWq_3uk8dVo9D1TADy-xCEA7dEM6-lsp4pYwjwUTGwud3IkP2DSkStHBCMFVyJrJMqrK8qpq8-AGZSXCepEVelicEZ1IJZCvM5_lSIMMxny5FKHgslGEiwVjkfL6sRj95c54-rtNb8RMJnstlcZdkDDiBKRKMUl6-Dg1q4mRNUBb5y8Is5zcCGV2T7UV5yb1QuYgv5DwRyrBadH2X8nqe3CN5BtyHVEHH6T-f2bEeT_uq1jg9Y-wiCvyzLhIMipyBQ4ljEcdudWLt4qR08Hjd_pbXHUl5W6SwkPMEZMLAsUtpPnScwTu2BrvZ6hNn0OrM3sVZJFUulHHUdOXYB8ShB60r-q0rXiZLFQsl4rbB72jx5aFMjZMmUdu2K8-l-VZNg4Ymun1e6O_lxaDmoWFtG5kNut5Exv6LI7PByavIDP6xyGxw9hiZ4z8VmXdWhCJLZZKJxoq2yWaZJRHfiDp_mSzUTFwqOavW1M-g4qpCLLK8_kvrh5fUv0qBr2GqhS09bGlhWw_bWrjfgOlbuK-F_9dvHmjhIz18pIWP9fCxFj7Rwyc7HWyy_u9XAAAA__9uFup9
 
 # This query performs a cross join followed by a filter.
 query T
@@ -182,7 +182,7 @@ vectorized: true
               table: json_tab@json_tab_pkey
               spans: FULL SCAN
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJy8lF1v2j4Uxu__n-LoSH9RVpfEDn3zVfqSqnSMdARpm1pUGeJ1YTRmtiOtQnz3KaGlSwUptOrusH0e_57zcOIpml9j5BgF7eCkB0n6XcFZN_wEV8HXy_ZRqwNbp62oF31u1-Gh5sO8YGRUemPFwH_8cTP5Ke_hKIIRJYvTYs3gy3nQDWBra0QbA_CvM9f1JIxYY1CHo84plPdr02sU18hhOpvV6o8VrCGgKBgCc-sQdk-DLhx_gxFtCJLfJfoPmKKJTtiDdutjALU4MVYng8wmKuX_15BgqmLZEXfSIL9CigQZEvSwT3Ci1VAao3R-NC0KW_Fv5C7BJJ1kNt_uExwqLZFP0SZ2LJFjTwzGsitFLLXjIsFYWpGMi-sXMU10cif0PRI8UePsLjUcBIEBEowmIl_tONTF_oygyuwTylhxK5HTGXmdHfYudtgmds6SsZVaame37GW-z8Fny_96zvlFFHaOV7rwVrp4gmep0rHUMi6x-7nypZIlrZwL8-NCJanUzkG5mbADfnPRh5_HHmaWg0-Jz4jvEb-5so_mJmlGSlupncMy3ve2iU-3F9ScRwr2SupuiUrXHyn62pFyqLvjsHWHfANH3ns5Yps4Wsz53rvOOVs_l-arc2HuzpqhvGBnEcr-P_v4l7joSjNRqZHPH4GlN7v5ly_jWzl_SYzK9FBeajUsMPNlWOiKjVgaOz_15otWWhwV0_y3mFaKWUnsPhezDcjsudirFDeryc1KMXWr1btvSWyvUrxfTd5_S2IHleLDavLhRuT-7L8_AQAA___8hAxm
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJy8lF1v2j4Uxu__n-LoSH9RVpfEDn3zVfqSqnSMdARpm1pUGeJ1YTRmtiNtQnz3KaGlSwUpDHV3sX2e_J7z6OhM0fwYI8coaAdnPUjSrwouuuEHuAk-X7dPWh3YOW9Fvehjuw6PNe_mBSOj0jsrBv7Tx93ku_wFJxGMKFm8FmcGny6DbgA7OyPaGIB_m7muJ2HEGoM6nHTOoXxfm96iuEUO09msVn-qYA0BRcEQmFuHsHsedOH0C4xoQ5D8X6L_iCma6IQ9aLfeB1CLE2N1MshsolL-fw0JpiqWHfEgDfIbpEiQIUEP-wQnWg2lMUrnT9OisBX_RO4STNJJZvPrPsGh0hL5FG1ixxI59sRgLLtSxFI7LhKMpRXJuPj98piQ4JkaZw-p4SAIDJBgNBH5ac-hLvZnBFVmn4HGinuJnM7I35lib2iKbWLqIhlbqaV29suO5vccfLZ8DDjnV1HYOV3pwlvp4hmepUrHUsu4xO7nytdKlrRyKcy3K5WkUjtH5WbCDvjNRR9-Hn6YWQ4-JT4jvkf85so-mpukGSltpXaOy3jf2yU-3V1Qcx4p2Cup-yUqXX-w6HaD5VB3z2HrDvwGvry39cU28bWY-YM3nXm2fjrNLdNh7t6a0bxiahHN4T9bB0tcdKWZqNTIl2th6Z_dfBfI-F7Od4tRmR7Ka62GBWZ-DAtdcRFLY-ev3vzQSounYrL_FNNKMSuJ3ZditgGZvRR7leJmNblZKaZutXp_m8QOKsWH1eTDbRI7qhQfV5OPNyL3Z__9DgAA__-zyhha
 
 # This query performs a left inverted join with an additional filter.
 query T
@@ -212,7 +212,7 @@ vectorized: true
               table: json_tab@json_tab_pkey
               spans: FULL SCAN
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJzklV9P8kgUxu_3U5ycmxfWATpTQJyrqtSkhm1d6G52sxJT6GjKYqc7LUZD-O6bUhVKZIr6Xunl_HnOOfM758ksMf1vjhztv64Gp44Ltb4z8ke_D-owsgf2uQ-_wsXQ-w1mqYxvsmACpyOYMRjYFz447p_20Lf7cOk5bvkGBc-FWm1GmxOwrheGYQqYseakDqduH8r7P5bXGFwjh-Vq9aP-coM1A1hfmAIz6uAN-_YQzv6GGW0GJI8VIMFYhsIN7kWK_B-kSJAhQRPHBBMlpyJNpcqPluuLTviI3CAYxckiy7fHBKdSCeRLzKJsLpCjH0zmYiiCUKiWgQRDkQXRfB3-5X1WoqL7QD0hwXM5X9zHKYeAwAQJjpIgXzVa1MDxiqBcZJtUaRbcCeR0RQ4vx4kfhMpEeCmjWKiWWa7If0oEL1rh_eHbw3UfkGwqvZXyJoofkLwGsh8TBTWr_QrfYs_At_ZKDeGcX44896yOBD0XLLrpCufccf0eEryNVJrBTEYxRDEkQaRE2MiXuWiRcbAosRixTGJ19pJh7yGTE3nuU_edVDb9G0j57yIp6pYxB8ssHlmzum8A6lYDSsVUxuEBIDrE6u4FYb4HxEiqTKjWSRmCZR4Rix7tTdHem2ITWapQKBHuC_xGLa5syKRFWUmyr4ROqQR6uC_pR33ZokajxQ61ZkVFO9ZsfyNrVpDZsubx17ZmBYhna1LjM95khxuDfdgYzGgc6IqKcnZc0flGrqggs-WK3td2RQWIF1fQn_VjvZFjKNJExqk46CMy8q9MhHei-P5SuVBTcaXkdJ2mWHpr3XojFGlWnNJi4cTFUV7gtphqxUwvZlqxqRebWnG7JKa74rb-zRWpO1p1Vy_uasXHevGxVtzTi3ufIXaiJ2ZUjEnFkFVNmX7MaMWcUf2g7b58vPrl_wAAAP__01Rxzg==
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJzkVdFu4joQfb9fMZqXwq2BOAFK_ZS2pFIqbtIL2dWutqgKxK1CaZx1QtUK8e-rkFIIKg4V-8Zb7PjMnDkzRzPH5PcUGVo_bnsXtgOVrj3wBv_3qjCwetaVB__Cdd_9DyaJiO5TfwQXA5jo0LOuPbCd71bfs7pw49pO8QUF14FKZULrIzDvZppmcJjo9VEVLpwuFO9P5nfo3yGD-WJxUl290Os-LB-MQdeq4Pa7Vh8uf8KE1n2SxfKRYCQC7vjPPEH2CykS1JGggUOCsRRjniRCZr_my4d28IpMIxhG8SzNrocEx0JyZHNMw3TKkaHnj6a8z_2Ay4aGBAOe-uF0GX5Vn7n6uI-f-BsSvBLT2XOUMPAJjJDgIPazU61BNRwuCIpZuk6YpP4jR0YXZH9SdvTCZcqDGxFGXDaMIi_vLeYsb4j7zbP6y24gWfN9EOI-jF6QfASyXmMJFbP50QJTf5d9467QFsbYzcB1LqtI0HXApOveMMZsx-sgwYdQJilMRBhBGEHsh5IHteyYgWYpA5MSUyemQczWTmX0ryiTKfLerfYXVdnuYk-Ip1mcsxcRA9PIS62Y7U9kapfLlPCxiII95GgRs71TDuMrcgyETLlsnBelMI1TYtLTnSmaO1OsIwsZcMmDXYE_4eKImogbVC9AdlFoFSjQ_T1KD_Nog2q1hr6vTUt4bdm0eUQ2LVFmw6Znx2DTEjnebUq1Q3yq728S_UCT6FptT4eUkNpySOuIHFKizIZDOsfgkBI5Vg6hf2uTfZKjz5NYRAnfa0Fp2YrjwSPP12IiZnLMb6UYL9PkR3eJW14EPEnzvzQ_2FH-KyO4CaZKsK4G60qwoQYbSnCzAKbb4Ka65pLULSW6rQa3leAzNfhMCe6owZ1DFDtXK6aVjEnJkJVNmXrMaMmcUfWgbVc-XPzzJwAA___JgoAm
 
 # This query performs a semi inverted join with an additional filter.
 query T
@@ -240,7 +240,7 @@ vectorized: true
           table: json_tab@json_tab_pkey
           spans: [ - /19]
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJzUk0FP20wQhu_frxjNKfm6IV47SSWfTMGoRiGhcaRStRHa2AOyG3bdXRuBUP57ZRsBRrEJPbXHHc-z-7yj8QOaXxt00b84nx4GM-gdB-Ey_DLtQ-hP_aMl_A8ni_kZpEbJy1ys4TCE1Iavn_2FD_5F2Qy93a3elVKXibytEP6I9FJ-sAbvR2FZDkFqH6z7cDg7hl5qHwioyhHYVr8P88Wxv4BP38omgQylimkmbsig-x05MrRxxTDTKiJjlC7LD1VTEN-hazFMZFbkZXnFMFKa0H3APMk3hC4uxXpDCxIx6aGFDGPKRbKprn7Sz3RyI_Q9MjxSm-JGGhcEgzUyDDNRngZDbuFqy1AV-fNTJhfXhC7fsv11AnlLOqf4VCWS9NBuMXocKLInwL_LNHijp4F6JXqVaJNDqhIJiYRMJJriQXlEhvMid8HjzLOZ5zBv3Opvv8e_9H6c5qjpvrzPyIWpf7KE0D8L4HQezJDtGvJUqZ9FVmsr6YLnlLoz8CbNdIYiJeP94o1a4zmt8Z5TKR2TprgZyOMfcLXdMYOZGqhsOGl2P_u0mowaJnz_veV_urdDbg2G9r6r-4bRq9V1_rrVfcP_xeqO__XV3RFvQSZT0lAjWtvNVrnXFF9T_R8YVeiIzrWKqmfq47ziqkJMJq-_8voQyPpTKfgS5p2w3Q3bnbDTgPlr2OmEP3a_POqEx93wuBOedMOTd2Vebf_7HQAA__-Y3Xvp
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJzck0FP204Qxe__TzGaU_LvhnjtJJV8MgWjGgWH2pFK1UbIsQdkE3bdXRuBUL57ZZsCRtgE9VL15pmd3-57o-d71D83aKN7djrf93wYHHrhMvwyH0Lozt2DJfwPR8HiBDItxXkRrWE_hMyEr5_dwAX3rBqGweujzoWU56m4qRH-gAwyvrcG50dpGBZBZu6th7DvH8IgM_ciqNsxmMZwCIvg0A3g07dqKEKGQibkR9ek0f6OHBmauGKYKxmT1lJV7ft6yEtu0TYYpiIvi6q9YhhLRWjfY5EWG0Ibl9F6QwFFCamxgQwTKqJ0U1_9KP_3x3l-RXfI8EBuymuhbYgYrJFhmEdVNRpzA1dbhrIsnh7URXRJaPMt212UJ25IFZQcy1SQGpsduh7WiuwRcG9zBc7kca1OhV6kSheQyVRAKiCPUkXJqCqR4aIsbHA4c0zmWMyZduo336O_0v2w00lb-_IuJxvm7tESQvfEg-OF5yPrXvVcyqsyb8RLYYNjVaJ9cGZtj5piKZLdTE46TVqdJp-8SZWQoqRty-EfcLV9ZRO-HMl8PGtPP-npVDJpKeG7Z5j_WYbH3BiNzV1j_IauFzG2_roYv6H_WYyn_0aMXzEZkM6l0NQy2HWzUWWckktq_gktSxXTqZJx_UxTLmqubiSki-aUN4UnmqNK4HOY98JmP2z2wlYL5i9hqxf-2P_ypBee9sPTXnjWD8_e5Xm1_e9XAAAA___F_4V5
 
 # This query performs an anti inverted join with an additional filter.
 query T
@@ -269,7 +269,7 @@ vectorized: true
           table: json_tab@json_tab_pkey
           spans: FULL SCAN
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJzUlVFv2j4Uxd__n-LqPsF_psQJUJqnsDbVUrGkC5nWaUNVIG4VRu3MTqpWFd99SqgKYcXQ7onHa9-f7zmXo_CE6vccbXSvLocDz4fGmTeKRl-GTRi5Q_c0gv_hPAw-w0wJfp3HExiMYGbCt09u6IIfROBelQA0Xm93boS4Tvl9hdFnrDGjRxNwfhaGYTGYmUeTJgz8M2jMzKMYquMpmEazCUF45obw8XvZFCNBLhLmx3dMof0DKRI0kaCFY4KZFFOmlJDl1VPV6CUPaBsEU54VeXk8JjgVkqH9hHmazxnaGMWTOQtZnDDZNpBgwvI4nVfPv1jIZHoXy0ckeCrmxR1XNsQEJkhwlMVl1WpTA8cLgqLIV6NUHt8ytOmC7C_H4_dM5iy5EClnsm3VFUWPGbNh6J5HEHyN3BAuAs9HgpvLRvLykPuQSXA6L8t2yoUFPjh0tWfbtj0_6iPBm1SqHGYi5ZByyOJUsqRVliVU5DY4lDgmcSzidLcaNt9iuDT6vP7eVrMDP_L-8rr6VYZC_CqypWzBbXCsZ4-9um3FpoIn-9nrbLVnbbW3ciVkwiRL6oYc-gHHi1d24IuWyNon9e6Vnq1KOjUldP-g0_cGvU2NVtvcN-s7FG1kvXP4Wd9heC3rx4eYdXP_hJnvTphptPaM1w45G_HqHn68dhhei1f_EOO1458iZCoTXLGatW0vG-V3liW3bPldVqKQU3YpxbQasyyDiqsOEqby5S1dFh5fXpUC12GqhU09bGphqwbTTdjSyzb0oztauquHu1q4p4d7_2L6WAv39ZP7WvhED5-8SfZ48d-fAAAA__89fpL-
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJzUlUFv2kAQhe_9FaM5QbsErw2E-GSaOKojaqfGVVO1KDJ4EpkQr-u1o0QR_72ySUNMw0KUEzd2d76d98ZPyyPKP3M00b44Hw4cFxonzigYfRs2YWQP7eMAPsKp732FmRTJZR5OYDCCmQ4_vti-Da4XgH1RAtB4vdy6EuIyTu4qjD9hjRk_mID1u9A0g2CmH0yaMHBPoDHTD0Kotqega80meP6J7cPnn2VRiAwTEZEb3pJE8xdyZKgjQwPHDNNMTElKkZVHj1WhE92jqTGMk7TIy-0xw6nICM1HzON8TmhiEE7m5FMYUdbWkGFEeRjPq-ufLfz7cZne0AMyPBbz4jaRJoQMJshwlIblqtXmGo4XDEWRrxrKPLwmNPmC7S7KSe4oyyk6E3FCWduo6woeUjJhaJ8G4H0PbB_OPMdFhusjR_Z8kX2fZmB1nkdulWPzXLD4atqmaTpu0EeGV3Emc5iJOIE4gTSMM4pa5bKEitwEizNLZ5bBrO5Gw_pbDJdGnz5Cb6PZgRs4_3ld_zZDIW6KdCleJCZYxpPTXt28pKlIot1MdjaaNDaaXHkTWUQZRXVbFv-E48Urk3BFS6Tto3r1Ss9GJZ2aEr576Pn7Qt_mWqut75r7LbrWct_Z_9xvMfwi94f7m3t997Tp70ybrrV2jNoWUWtR6-5_1LYYfhG1_v5Gbcv_iE8yFYmkmsFNN2vl-0vRNS3faymKbErnmZhWbZZLr-KqjYhkvjzly4WTLI9KgS9hroR1NawrYaMG83XYUMvW1K07SrqrhrtKuKeGe-8xfaiE--rOfSV8pIaP3iR7vPjwNwAA___5r6FW
 
 statement ok
 INSERT INTO array_tab VALUES
@@ -318,7 +318,7 @@ vectorized: true
               table: array_tab@array_tab_pkey
               spans: FULL SCAN
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJzEk0Fv2kwQhu_frxjN6WuziVnbBOrTpomrUlFIbaS2alG04GnkFrzueh0lQvz3ygaFEOEFqko57oyfmUej1wssfs8wwPDLdf-iN4D_r3rxKP7UfwVx2A8vR_Aa3kXDjyC1lg83Rk7ED6Vu0uwOLmKQnG0adcGFz-_DKATJzyYgvpetlkcg3bMJDKOrMIK3X6uWZFVNIsNMJTSQcyow-IYcGXo4ZphrNaWiULoqL-qPesk9Bi2GaZaXpiqPGU6VJgwWaFIzIwxwJCczikgmpJ0WMkzIyHRWj97o5zqdS_2ADC_VrJxnRQCSwQQZxrmsXqeOh-MlQ1WazarCyFvCgC_Z4Tq97I60oeSDSjPSjttktD4oskcivM81CP_xgKJih6UJQHAmXCaaDd1jDCuz9b38_ffqK_WrzOGnSjNQWQDCq6wGINq7RH0m2qzWbXT1jnGNlTaknfNtT8FPmPBOGlf4jSs2k5VOSFPSNHiHy0CdqtzpbhFNBu0tA354gvlfJ9jxTg9M8B6dZwn2XiDBewyfJLj94gne47pOcOdfJXjHioiKXGUFHZTMVhVtSm5p9TsUqtRTutZqWq9ZPYc1VxcSKsyqy1ePXrZqVYJPYW6FXTvsWmHPDntW2N-C-XPYt8Jv7JvbVvjcDp9b4Y4d7ljhrh3uHnWw8fK_PwEAAP__0a2i5g==
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJzMk01v2kAQhu_9FaM5tc0S4w8-6tOmiatSUUhtpLZqEVrwNHJDvO56HSVC_PfKBkGI8AJqpfbGzvDMPBq9XmD-a44-Bl-u-xe9Aby86kWj6FP_FURBP7gcwWt4Fw4_glBKPE60mPIfUk6S9B4uIhA22zaqggOf3wdhAMI-nwL_XjSbLoFwzqcwDK-CEN5-LVuClTWBDFMZ00DcUY7-N7SRoYtjhpmSM8pzqcryovpTL35Av8kwSbNCl-Uxw5lUhP4CdaLnhD6OxHROIYmYlNVEhjFpkcyr0Vv9za9JdkuPyPBSzou7NPdBMJgiwygT5athuTheMpSF3m7Mtbgh9O0lO96ql96T0hR_kElKynLqxNZ3RbYhgodMAfc2d-QlOyy0D9xm3GG83tA5xbA0W5_NO_psfSlviwx-yiQFmfrA3VJuALy1z9djvMUq61pl9xTlSCpNymrv6nL7jHH3rHaFV7tiO1mqmBTFdYP3uAxkQ2ZWd4eoM2jtGNjH59n-0zxbbuPIPB-wepZn9x_k-YDhkzy3_pc8H1Be57nzt_K8Z0VIeSbTnI7KabMMOsU3tPo4clmoGV0rOavWrJ7DiqsKMeV61bVXj166apWCT2HbCDtm2DHCrhl2jbC3A9vPYc8IvzFvbhnhthluG-GOGe4Y4a4Z7p50sPHyxe8AAAD__9-argo=
 
 # This query performs a cross join followed by a filter.
 query T
@@ -344,7 +344,7 @@ vectorized: true
           table: array_tab@array_tab_pkey
           spans: FULL SCAN
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJy0Ul9v0z4Uff99iqsr_TRg3prEHQ958tiCVijNSCoBGtHkNJcRkcbBdiSqqt8dJZlWUrVlHdqb75_jc459lmh-FuhjHIyDiynk5TcFb6PwA9wEn6_H56MJvLgcxdP44_gl3O-86hak1nJxa2UqHk631Q9awHkM0mXredvw4NNVEAUg3dMUxNfacTiB9E5TCKPLIII3X5qRZE1PJvfLrZpJOIXx6H0AR1lurM7T2uaq9P8_Qoalymgi52TQv0EXGXJMGFZazcgYpZv2sl0aZb_QdxjmZVXbpp0wnClN6C_R5rYg9HEq04IikhnpgYMMM7IyL9qr114rnc-lXiDDC1XU89L4IBmkyDCuZFOdDDgmK4aqtmsqY-Udoe-u2NPkeM8ix9spZ62iLpXOSFPWU5A0yL-tbPF0Jc33dyovSQ-GfUvhBIT3EAzRTMPa-iBcJjwmOBPDnT74Ic8aK21JD8769MI9ZoIf76QY9ijcx_-c--SfG_CTRwbpADn8WeTsDtIWORGZSpWGNgO19WanSRFld9Sl0qhaz-haq1lL05Vhi2sbGRnbTb2uGJXtqH2vP8HuAWBvE-ztBfMe2NkE873g1_vBw3_xfHaQ52T13-8AAAD___hO-gY=
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJy0Ul9v0z4Uff99iqsr_TRg3prEHQ958tiCVijNSCoBGtHkNJcRkcXBdiSmqt8dJZlWUjVlZdqb75_jc459lmh-FuhjHEyDsznk5TcFb6PwA1wFny-np5MZvDifxPP44_Ql3O-86hak1vLu2spUPJyuqx90B6cxSJet523Dg08XQRSAdI9TEF9rx-EE0jtOIYzOgwjefGlGkjU9mdwvt2pm4Rymk_cBHGS5sTpPa5ur0v__ABmWKqOZvCWD_hW6yJBjwrDSakHGKN20l-3SJPuFvsMwL6vaNu2E4UJpQn-JNrcFoY9zmRYUkcxIjxxkmJGVedFePeQVGZ6por4tjQ-SQYoM40o21dGIY7JiqGq7ZjRW3hD67or9myrvOVV5g6rWYupS6Yw0ZT0hSYP828oWaxfSfH-n8pL0aNx3Fs5AeA8xEc00rK0PwmXCY4IzMR70wfd53VhpS3p00qcX7iET_HCQYtyjcB__ge5TP3DEjx4Zqz1U8edUNRyrLaoiMpUqDW3Ga-vNTpMpym6oy6hRtV7QpVaLlqYrwxbXNjIytpt6XTEp21H7bH-C3T3A3ibY2wnmPbCzCeY7wa93g8dP8Xyyl-dk9d_vAAAA__-sGwU5
 
 # This query performs an inverted join with an additional filter.
 query T
@@ -374,7 +374,7 @@ vectorized: true
               table: array_tab@array_tab_pkey
               spans: [ - /4]
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJzUk0Fv2k4Qxe__TzGaS-CfDWZtnFCfTIMrOaImNahqlKJowdPIDfG6aztKhPjulQ1NIIoXqHpob-yMfzPvjXgLzH7M0UHvy-Wg5wfQ6Puj8ejToAkjb-Cdj-F_-BAOP4JQSjzd5GLqPv-6Se_oCXojECb4QeCF4AefvXDs9eFi6AcbyDcpb-LkofqWwzCARkPw1hTcr0W7bREIszVtQi_ow3b9aMGXR81fHbMloGrMwG7CMOx7Iby_AsFbgpUjBDJMZESBuKcMnWvkyNDCCcNUyRllmVRleVF95EeP6LQZxkla5GV5wnAmFaGzwDzO54QOjsV0TiGJiJTRRoYR5SKeV6NfvKUqvhfqCRmey3lxn2QOCAZTZDhKRfk6MSycLBnKIn9ZleXiltDhS7a_HD95IJVTdCHjhJRh1ilaXxvZM-E9pgoabuf5sK65PupGrReGvatr7jiOH4y7kyYyHBa5Ay5nrsncehPmISZK8euTdnafdCDlXZHCdxknIBMHXKtUFUDDtd_wYu_rpcNcu9aOdYidkVQ5KeN024prHTOXH9eu6NSueJksVUSKorrBb2gJ5IlMje4WUafA3lLA988B_-0cGNaJUX91foigV0mw_s4k7DCxkQT7X0jCDjvrJJz9qSS8sSKkLJVJRnv9w9tlRCi6pVWsMlmoGV0qOavWrJ7DiqsKEWX5qstXDz9ZtUqBmzDXwqYeNrWwpYctLdzZgvlruKOF3-k321r4VA-fauEzPXymhbt6uHvQwSbL_34GAAD__yb33BI=
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJzUk0Fv2k4Qxe__TzGaS-CfDWZtnFCfTIMrOaImNahqlKJowdPIDfG6aztKhPjulQ1NIMIbUHtob-ysfzvvPfEWmP2Yo4Pel8tBzw-g0fdH49GnQRNG3sA7H8P_8CEcfgShlHi6ycXUff51k97RE_RGIEzwg8ALwQ8-e-HY68PF0A82kG9S3sTJQ_Uth2EAjYbgrSm4X4t22yIQZmvahF7Qh-350YIvj5q_bsyWgOpiBnYThmHfC-H9FQjeEqx8QiDDREYUiHvK0LlGjgwtnDBMlZxRlklVjhfVR370iE6bYZykRV6OJwxnUhE6C8zjfE7o4FhM5xSSiEgZbWQYUS7iefV0XRzI8FzOi_skc0AwmCLDUSrK04lh4WTJUBb5y8YsF7eEDl-y_VX5yQOpnKILGSekDLNO2Dp0ZM-E95gqaLid53xdc53txqwXhr2ra-44jh-Mu5MmMhwWuQMuZ67J3HoT5iEmSvHrZDt7JzuQ8q5I4buME5CJA65Vigug4do7LNn7Wuow1651ZR3iaiRVTso43XbkWsfM5ce1Kzq1K15elioiRVHdwzu0BPJEpkZ3i6hTYG8p4Pu3gv9uKwzrxKgPnx-i61UvrL-zF2-Y2OiF_Q_14g1X616c_ale7FgRUpbKJKO9_u_tsjAU3dKqZJks1IwulZxVa1bHYcVVg4iyfHXLVwc_WV2VAjdhroVNPWxqYUsPW1q4swXz13BHC7_Tb7a18KkePtXCZ3r4TAt39XD3oMAmy_9-BgAA___ugec2
 
 # This query performs a cross join followed by a filter.
 query T
@@ -405,7 +405,7 @@ vectorized: true
               table: array_tab@array_tab_pkey
               spans: FULL SCAN
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJy8k2Fv2j4Qxt__P8XppL8oq0twAm3lV2FtqrIx6ALSVnVRZciti0ZjZjvSKsR3n5J0sFQlLa22d_jOj3_PXR6WaH7MUeA4GAQnE0jSrwrOwtEHuAo-Xwx6_SHsnfbHk_HHQRPu77wpL0it5d21lVN__et68Z3uoDcGydmmXxRc-HQehAHs7UnemoL_JWu3PQLptqZN6A1PoVpvLPmq0fzdcVsSisYMuk0YhadBCG8vQfKWZPkTMrp_vbA_HE1g0H8fQCNOjNXJNLOJSsX_DWSYqpiG8pYMiivkyNDDiOFCqxkZo3ReXhaX-vFPFG2GSbrIbF6OGM6UJhRLtImdEwqcyOmcQpIxaaeNDGOyMpkXT2-Ws9DJrdR3yPBEzbPb1AiQDKbIcLyQ-enA8TBaMVSZ3aCMlTeEgq_Yy-y4f8WOu4uds2RuSZN2OlUvZV2A766_di8Me5dXXAjRH06Oo618byt_g81SpWPSFFeoUa586sojQ5xL8-2dSlLSzmF1jNEQ_M56Aj9f-CizAnzOfJf5HvM7W-fo7LLHsdKWtHNUxfvePvP5_pqa81jB3krtVqj8-WHiLw6T4x043WemewdD3msMPTPdT9hZp7v7D9L9CD8ks1CpoYcpf_Tldh5tim-o_KsYlekZXWg1KzDlcVToikJMxpZdrzz006JVfK8_xbxW7FbE7Ydidwey-1Ds1Yo79eROrfi4Xtx9zcIOa8VH9eSjnRYWrf77FQAA__8kRIQ-
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJy8k2Fv2j4Qxt__P8XppL8oq0twAm3lV2FtqrIx6ALSVnVRZciti0ZjZjvSKsR3n5J0dKlKCuu2d_jOj3_PXR6WaL7NUeA4GAQnE0jSzwrOwtE7uAo-Xgx6_SHsnfbHk_H7QRPu77wqL0it5d21lVN__et68ZXuoDcGydlDvyi48OE8CAPY25O8NQX_U9ZuewTSbU2b0BueQrXeWPJVo_mz47YkFI0ZdJswCk-DEF5fguQtyfInZHT_emF_OJrAoP82gEacGKuTaWYTlYr_G8gwVTEN5S0ZFFfIkaGHEcOFVjMyRum8vCwu9ePvKNoMk3SR2bwcMZwpTSiWaBM7JxQ4kdM5hSRj0k4bGcZkZTIvnt60HGR4oubZbWoESAZTZDheyPx04HgYrRiqzD4QjZU3hIKv2O-5cv-mK3cXV2fJ3JIm7XSqlsq6AN9df_teGPYur7gQoj-cHEcb-d5G_gM2S5WOSVNcoUa58rkrTwxxLs2XNypJSTuH1TFGQ_A76wn8fO-jzArwOfNd5nvM72yco7PLHsdKW9LOURXve_vM5_tras5jBXsjtVuh8u0zxV-aKcc7cLpbZn0HX94f8LVl1p9xtc569x9k_Ql-SGahUkOPM__ky-086BTfUPnHMSrTM7rQalZgyuOo0BWFmIwtu1556KdFq_hsv4p5rditiNuPxe4OZPex2KsVd-rJnVrxcb24-5KFHdaKj-rJRzstLFr99yMAAP__tfyPYg==
 
 # This query performs a left inverted join with an additional filter.
 query T
@@ -436,7 +436,7 @@ vectorized: true
               table: array_tab@array_tab_pkey
               spans: FULL SCAN
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJzkk19v2koQxd_vpxjNSyBZ_qwNhOun5QZHcsQ1qXGrRimKFryJ3BCvuzZREOK7V7Ypf9J4A1Wf2jfvrn8zZ87oLDH5NkML7c_Xg57jQqXvjPzRh0EVRvbAvvCB0_opAW7UT-HSG_4PXCm-uEv5hG2-7uJHsYDeCLgBA_vSB8f9ZHu-3YeroePuEPdS3oXRc_4rhaELlQqn9QmwL_Nm0xRZl0kVem4f9u9PlnR1Uv3xYtQ55A9TaFdh6PVtD_67yYTyXChHgpEMhMufRILWLVIkaOKYYKzkVCSJVNn1Mv_JCV7QahIMo3ieZtdjglOpBFpLTMN0JtBCn09mwhM8EKrRRIKBSHk4y0tvZ4tV-MTVAgleyNn8KUos4AQmSHAU8-xUa5g4XhGU83TbKkn5g0CLrsjhcpzoWahUBFcyjIRqGPuK_EUsrGINw4--7eU7QII_bQHJppL9EiuosNbGcGaszd6563le7-aWWpbluH53XEWCQxcY3exi_YIE70OVpPBVhhGEEcQ8VCKoZceMmacWMEqYQZhJWLvUE-MYTzIv1htqHevHdnMDKR_ncSFcRhYwsxiywjpvWNPRWZOIqYyCAzxoE9Yp9cA8xoORVKlQjc7-_Mw8I4yelbZolbbYVpYqEEoEZYXf0OLKmowb3X2iGNskrEXy4Us1tfc00cPTSX85nQ2zdmA635HzKp3mX5HOdzzZSWf7j03nOx6s03n-u9L5RgtPJLGMErHXoqxyM4utCB5EEfVEztVUXCs5zdsUx2HO5ReBSNLilRYHJyqeMoG7MNXChh42tLCph00t3NqD6Wu4pYX_1Xdua-GOHu5o4XM9fK6Fu3q4e5Rh49U_3wMAAP__1kswaw==
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJzkk19v2kgUxd_3U1zdl0Ay_BkbCOunYYMjOWJN1nirRimKBjyJ3BCPOzZRIsR3r2xTgpN4Amqf2jfPXP_uPXOuzgqTbwu00P58ORo4LtSGzsSf_Deqw8Qe2Wc-cNo8JsCN5jGce-N_gSvFn29SPmPbr5v4XjzDYALcgJF97oPjfrI93x7Cxdhxd4hbKW_C6DH_lcLYhVqN0-YM2Jdlu22KbMqsDgN3COX7oxVdH9V_VIwmh7wwh24dxt7Q9uCfq0woz4VyJBjJQLj8QSRoXSNFgiZOCcZKzkWSSJVdr_KfnOAJrTbBMIqXaXY9JTiXSqC1wjRMFwIt9PlsITzBA6FabSQYiJSHi7x1lRtI8Ewulg9RYgEnMEOCk5hnp0bLxOmaoFymLxOTlN8JtOia7K_KiR6FSkVwIcNIqJZRFuY_x8IqtjH-37e9fBVI8M0ykGw72U-xghrrbH1nxsbznbuB5w2urqllWY7r96d1JDh2gdHtSjYVJHgbqiSFrzKMIIwg5qESQSM7ZswytYBRwgzCTMK6lZ4Yh3iSebFZVOdQP94scCTl_TIu9MvIAmYWb62x3jsO9XQOJWIuo2APK7qE9SqtMA-xYiJVKlSrV7aBmSeE0ZPKEZ3KES-dpQqEEkFV43e0uLIh41a_TBTPNgnrkPzxlZq6JU10_6zSn81qy2zsmdUPVL3KqvlHZPUDT3ay2v3ds_qBFZusnv6qrL4zwhNJLKNElEZUdW5nIRbBnSiCn8ilmotLJef5mOI4zrn8IhBJWlRpcXCiopQJ3IWpFjb0sKGFTT1sauFOCaav4Y4W_ls_uauFe3q4p4VP9fCpFu7r4f5Bhk3Xf30PAAD__3nPO48=
 
 # This query performs a semi inverted join.
 query T
@@ -464,7 +464,7 @@ vectorized: true
           table: array_tab@array_tab_pkey
           spans: FULL SCAN
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJzUk0Fv2kAQhe_9FaM5Je0SsA1U8slp4qiOCKQ2UlO1KFrwJHIDu-6uHQUh_nu1NoI4xQ7pqb15ZvfbeW_0vEL9a44u-jfXg9NgCEfnQTSOvgyOIfIH_tkYuH3yHi7C0RVwpfjyNuNTb_t1mz7QEk4j4DZ8_eyHPvg3hoejDf0HeiflbSIeC8baMNw6mYL3I-90HDLzpscwCs_9ED59MyVHhkLGNOQL0uh-RwsZOjhhmCo5I62lMu1VcSmIn9DtMExEmmemPWE4k4rQXWGWZHNCF8d8OqeQeEyq3UGGMWU8mRdP74SmKllwtUSGZ3KeL4R2gTOYIsMo5aZqtR2crBnKPNuN0hm_J3StNTtcTiAeSWUUX8pEkGrbdYo2q0O2JfynVIHX3e7OM-xdonQGP2UiIBGQ8kRR3DIlMhzlmQuexTybeQ7zerUG7LcYMMI36-xWxY-XKbkw8C_GEPlXAVyOgiGyvVseSPmQp6VuKVzwHKN3CF6_ak_TTIr4MH_dWn9Orb-dLaliUhRXHXnWB5ys9yxhKFsybfert3d6apV0K0qsw5Nr_XVy207rwOS-IudFcp1_L7mvGHiW3N5_n9w9_kLSqRSaKt7qXu6YWFN8T-VvoGWuZnSt5KwYU5ajgisaMemsPLXKIhDlkRH4HLYaYbsZththpwJbL2GnEf7YPLnbCPea4V4j3G-G-2_yPFm_-x0AAP__pSl_fQ==
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJzck9FP2zAQxt_3V5zuCTaXNknbSXkKg6AFlZYllca0VchtDpRR7Mx2EAj1f5-cVC1hJBTtZdpb7uyf7_tOXx5R_1qij-HF-egwGsPecZRMky-jfUjCUXg0Be4evIeTeHIGXCn-cGn4PNh8XeY39ACHCXAXvn4O4xDCC8vD3pr-A72S8jITdyXjrBnuHMwh-FH0eh7ZefN9mMTHYQyfvtmSI0MhUxrzW9Lof0cHGXo4Y5gruSCtpbLtx_JSlN6j32OYibwwtj1juJCK0H9Ek5kloY9TPl9STDwl1e0hw5QMz5bl000ekeGRXBa3QvvAGcyRYZJzW3W6Hs5WDGVhthO14deEvrNiu6uKxB0pQ-mpzASprtskbL1BZBsivM8VBP3NCgPLXmVKG_gpMwGZgJxnitKOLZHhpDA-BA4LXBZ4LBg0GnDfYsAKX2-1Xxc_fcjJh1F4MoUkPIvgdBKNkbUteyTlTZFX8qXwIfCs7DEEw7pLTQsp0t1s9htteo02t-6kSklRWjcWOB9wtnphF2PZkXl3WL-91dOopF9T4uyeY-dvc9z1Ojvm-BVVz3Ls_Xs5fsXAkxwP_pccv2AzJp1Loalmsenlng05pddU_RRaFmpB50ouyjFVOSm5spGSNtWpUxWRqI6swKew0wq77bDbCns12HkOe63wx_bJ_VZ40A4PWuFhOzx8k-fZ6t3vAAAA__-DRYqh
 
 # This query performs an anti inverted join.
 query T
@@ -492,4 +492,4 @@ vectorized: true
           table: array_tab@array_tab_pkey
           spans: FULL SCAN
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJzUk0FP204Qxe__TzGaE_y7IbGdpJJPpmBUo9SmjqtStRHaxANyCbvuro2IUL57tTYimGATeuPm2d03836j53vUf5boon9-NjkMQtg7DqbJ9OtkH6b-xD9KgNsH_8NJHH0BrhRfXRR87j1-XeTXtILDKXAbvn_2Yx_CKAH_3PSAvYcOW_JLKS8ycVvprAcdtw7m4P0qBwOHzMz5PkTxsR_Dpx-m5MhQyJRCfkMa3Z9oIUMHZwxzJRektVTm-L56FKR36A4YZiIvC3M8Y7iQitC9xyIrloQuJny-pJh4Sqo_QIYpFTxbVq03RnOV3XC1QoZHclneCO0CZzBHhtOcm6rXd3C2ZijLYjNKF_yK0LXWbHc7gbglVVB6KjNBqm83HSWrnFyY-CcJRN8SP4bTKAiR4dZKkT128u9yBd7wcaee6XmZKV3Ab5kJyATkPFOU9kyJDKOycMGzmGczz2HeqBXMfguYAXpY87AV6jBMgm2mzfYnUl6Xee1bChc8x_gNwRs38TQtpEh34xu28jmtfBssqVJSlDaJPOsDztYvLCGUPZn3x83XGz-tToYNJ9buibb-OdF9p7djol-x8yzRzvtJ9CtgTxI9eveJfoEvJp1LoanB1tZ5YOJO6RXVv4eWpVrQmZKLakxdRpWuOkhJF_WtVReBqK-Mwadiq1Nsd4vtTrHTEFvPxU6n-GP35GGneNQtHnWKx93i8ZuYZ-v__gYAAP__oEWNtg==
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJzck0FP204Qxe__TzGaE_y7IbGdpJJPpmBUo9SmjqtStRHaxANyCbvuro1AKN-9WhslmGAT1FN7y-zum3m_yfMD6l9LdNE_P5scBiHsHQfTZPp5sg9Tf-IfJcDtg__hJI4-AVeK318UfO6tf13k13QPh1PgNnz96Mc-hFEC_rnpAXuPHbbkl1JeZOK20lmPOm4dzMH7UQ4GDpmZ832I4mM_hg_fTMmRoZAphfyGNLrf0UKGDs4Y5kouSGupzPFD9ShI79AdMMxEXhbmeMZwIRWh-4BFViwJXUz4fEkx8ZRUf4AMUyp4tqxat3EiwyO5LG-EdoEzmCPDac5N1es7OFsxlGWxmagLfkXoWiu2u6tA3JIqKD2VmSDVt5vGkvucXJj4JwlEXxI_htMoCJHh1maRrTv5d7kCb7herWd6XmZKF_BTZgIyATnPFKU9UyLDqCxc8Czm2cxzmDdqBbPfAmaAHrc9bIU6DJNgm2nrT5hIeV3mtX0pXPAcYzsEb9yk1LSQIt0Nc9iK6bRibuikSklR2gTzrHc4W72wi1D2ZN4fN19v_LQ6GTacWLvn2_rTfPed3o75fsXVs3w7f0--XwF7ku_Rv5LvFzBj0rkUmhqIbZ0HJvyUXlH9sWhZqgWdKbmoxtRlVOmqg5R0Ud9adRGI-soYfCq2OsV2t9juFDsNsfVc7HSK33dPHnaKR93iUad43C0ev4l5tvrvdwAAAP__X-uY2g==
diff --git a/pkg/sql/opt/exec/execbuilder/testdata/inverted_join_multi_column_dist b/pkg/sql/opt/exec/execbuilder/testdata/inverted_join_multi_column_dist
index f4cf695d9ef6..f2ac677e9e3d 100644
--- a/pkg/sql/opt/exec/execbuilder/testdata/inverted_join_multi_column_dist
+++ b/pkg/sql/opt/exec/execbuilder/testdata/inverted_join_multi_column_dist
@@ -115,7 +115,7 @@ vectorized: true
             └── • values
                   size: 1 column, 2 rows
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJyUk91um0wQhs-_qxjNkf1lG8MCicTRJjFVXLl2iq3-qEUVNaMEjHfpLlSuLN97BU7j2A20Ppzdefw-hpcNmu85-hh8vBtfjSbQG45m89m7cR9mwTi4mcP_8DqcvoWMizT7miZrBpkNH26DMIBeCjXBGTj9PlxNhtDL-HkG4ktlWQ5BZp9nfZiGwyCE60_1uGSQ8fMlMpQqoUm8IoP-Z7QxYlhotSBjlK6PNs3CKFmjbzFMZVGV9XHEcKE0ob_BMi1zQh_n8becQooT0gMLGSZUxmne_Gxmi0Knq1j_RIY3Kq9W0vhQOyDDWRHX0yuMtgxVVe4TTBnfE_r2lv27xfs4r8gM7EMBF66hx2HxUMml6bcmWa1J-4BKKp2QpuQgIarJv628oHsbm4c3KpWkB_xQeVqVPgibCc6E02rMT3k2I_mDdEnJY6Bz9JJ-FwvZ02awLjSIi6ciiVryuZnLhNcq55wiV0s9tsf9Q2zfnrFSy6qATKUSlPRB1P9iOgFx-ZKkx8QFE5essW31dE_xnCldkh54h47CPWPCPmuN8E6JCMkUSho6blhLZyOGlNzTrqZGVXpBd1otmpjdOG245iAhU-5u-W4Yyeaq-ciew_YJMD-GeSfsHMDWMex0wm437HbCXjfsdcIXR3C0_e9XAAAA__87tdGD
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJyUk91um0wQhs-_qxjNkf1lG8MCjsTRJjFVXLl2iq3-qEURNaOENWHpLlSuLN97Bc6f3UDrw9mdx-9jeNmg-ZGhj8Hn68n5eAq90Xi-mH-Y9GEeTILLBfwPb8PZe5BcpPImTdYMpA2froIwgF4KNcEZOP0-nE9H0JP8VIL4VlmWQyDtU9mHWTgKQrj4Uo8rBpKfrpBhrhKaxvdk0P-KNkYMC62WZIzS9dGmWRgna_QthmleVGV9HDFcKk3ob7BMy4zQx0X8PaOQ4oT0wEKGCZVxmjU_K20h7ZtiRb-Q4aXKqvvc-FA7IMN5EdfTG4y2DFVVPieYMr4l9O0t-3eLj3FWkRnY-wIuXECPw_Kuylem35pktSY9B1S50glpSvYSopr828orulexuXun0pz0gO8rz6rSB2EzwZlwWo35Mc9mnP8kXVLyEOgcvKTHYiF72gzWhQYxfCqSqCVfmrlMeK1yzjFytdRDe9w_xCR_bM9EqVVVgFRpDir3QdT_YjYFcfaapMfEkIkz1ti2errHeM6VLkkPvH1H4Z4wYZ-0RnjHRIRkCpUbOmxYS2cjhpTc0q6mRlV6SddaLZuY3ThruOYgIVPubvluGOfNVfORvYTtI2B-CPNO2NmDrUPY6YTdbtjthL1u2OuEhwdwtP3vdwAAAP__5RvQ4g==
 
 statement ok
 CREATE TABLE a1 (
@@ -195,4 +195,4 @@ vectorized: true
             └── • values
                   size: 1 column, 2 rows
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJyUk11v2jAUhu_3K47OFaxeSZyklXLlfmQqE4MuoH1oiyaPHLUZwc7sZGJC_PcpoSuFNdm4PPZ5eB-SN2u0P3IMMfp4O7oYjqF3PZzOpu9GfZhGo-hqBi_hdTx5C5KLTH7N0hUD6cKHmyiOoJdBTXAGXr8PF-Nr6El-KkF8qRzHI5DuqezDJL6OYrj8VI8LBpKfLpCh0imN5ZIshp_RxYRhYfScrNWmPlo3C8N0haHDMFNFVdbHCcO5NoThGsuszAlDnMlvOcUkUzIDBxmmVMosb35WuqIw2VKaX8jwSufVUtkQagdkOC1kPb3CZMNQV-UuwZbyjjB0N-z_Ld7LvCI7cPcFfLiEHof5faUWtt-a5LQm7QIqpU1KhtK9hKQm_7XyjO6NtPdvdKbIDPi-8qQqQxAuE5wJr9WYH_NshuonmZLSh0Dv4CX9KRayx81oVRgQZ49FErXkUzOfiaBVzjtGrpZ6aI__l9iuPSOtF1UB33WmQKsQRP0vJmMQ589JBkycMXHOGttWT_8Yz6k2JZlBsO8o_BMm3JPWiOCYiJhsoZWlw4a1dDZhSOkdbWtqdWXmdGv0vInZjpOGaw5SsuX2lm-HoWqumo_sKeweAfNDmHfC3h7sHMJeJ-x3w34nHHTDQSd8dgAnmxe_AwAA___eotEF
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJyUk11vmzAUhu_3K47OVbJ6DRhoJa7cNkzNlCUdifahDVVeOGpZqM1smDJF-e8TpF_JClsuj32evE_gZY32Z44hRp-vxmejCfSGo9l89mHch1k0ji7m8BrextP3ILnI5HWWrhhIFz5dRnEEvQxqgjPw-n04mwyhJ_mxBPGtchyPQLrHsg_TeBjFcP6lHpcMJD9eIkOlU5rIO7IYfkUXE4aF0QuyVpv6aN0sjNIVhg7DTBVVWR8nDBfaEIZrLLMyJwxxLr_nFJNMyQwcZJhSKbO8-VnpCuleF0v6jQwvdF7dKRtC7YAMZ4WspzeYbBjqqnxKsKW8IQzdDft_i48yr8gO3F0BH86hx2FxW6ml7bcmOa1JTwGV0iYlQ-lOQlKT_1p5QfdS2tt3OlNkBnxXeVqVIQiXCc6E12rMD3k2I_WLTEnpfaC395IeioXscTNaFQbEyWORRC353MxnImiV8w6Rq6Xu2-P_JSb5Q3vGWi-rAn7oTIFWIYj6X0wnIE5fkgyYOGHilDW2rZ7-IZ4zbUoyg2DXUfhHTLhHrRHBIREx2UIrS_sNa-lswpDSG9rW1OrKLOjK6EUTsx2nDdccpGTL7S3fDiPVXDUf2XPYPQDm-zDvhL0d2NmHvU7Y74b9TjjohoNO-GQPTjav_gQAAP__RTnQUg==
diff --git a/pkg/sql/opt/exec/execbuilder/testdata/lookup_join b/pkg/sql/opt/exec/execbuilder/testdata/lookup_join
index dab38db1f8ae..0de1d4b9fbf6 100644
--- a/pkg/sql/opt/exec/execbuilder/testdata/lookup_join
+++ b/pkg/sql/opt/exec/execbuilder/testdata/lookup_join
@@ -236,7 +236,7 @@ vectorized: true
           table: data@data_pkey
           spans: FULL SCAN
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJzElV9vmzwYxe_fT_HouWpfGYH506aWJhF1qZYqI12SaZO2XFCwOjaKmQFpU5XvPgFbGqrWZiHKLm18OMfP70h-wOJ7igwnH29m42kAJ6-ny9Xy3ewUlpPZ5HIF_8PVYv4WTrrLOCxD-PBmsphABK-AnsJ4CSkE49X7xXgG1_P6VwrJ58qyHA5Wo5NIMBMxD8J7XiD7hBQJ2kjQQYIuEvRwTTCXIuJFIWR95KERTOMfyCyCSZZXZb29JhgJyZE9YJmUKUeGq_A25QsexlyaFhKMeRkmaWNTJ_JzmdyH8icSvBRpdZ8VDEICtwQiAjESXOZhvWeYFMIsBgqi_MIlrjcERVU--hZleMeR0Q3pn-0qSUsuuTS9brB2n4Hv1LNljE2D1ehFS_tvLK9Fkv2eBlWPYybEtyqHryLJQGQMfEp8m_gO8Wsk8wD88y3GPxEJzquye_Sl1M6LqR_DVpmQMZc87gRdb565VyAMkZvUe3LyeW-34037F4juXyCTGqa9R4U06bYVOjtchTSWuxVSD-SoFbL7Y7QHYLQN09kDoybdFuP54TBqLHcxqgdyVIxOf4zOAIyOYbp7YNSk22IcHQ6jxnIXo3ogR8Xo9sfoDsDoGqa3B0ZNui3Gi8Nh1FjuYlQP5J-9y8-kXvAiF1nBe726Vv1u8_iOt498ISoZ8RsposamXc4bXbMR86Jsv9J2Mc3aT3XAXTFVim212FaKnY6YPhU76thnamtXqfbUYk8p1jifDbn0uVI8UjuPlOILtfhiSGyq6ZiuZOqWUU3N6KCeUU3RXI25umlUUzWq7trT7OvNf78CAAD__-FRh80=
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJzElV9r2zwYxe_fT_HwXLUvMrb8p00FA4cuZSmZ0yUZG2xhuLbovLqWJ9uwUfLdh-0tjUsreXHobgKSdXKOnt8B3WPxPUWGk49Xs_E0gKPX0-Vq-W52DMvJbHK-gv_hYjF_C0fdZRyWIXx4M1lMIIJXQI9hvIQUgvHq_WI8g8t5_VcKyefKshwOVqOTSDATMQ_CO14g-4QUCdpI0EGCLhL0cE0wlyLiRSFkfeS-EUzjH8gsgkmWV2W9vSYYCcmR3WOZlClHhqvwOuULHsZcmhYSjHkZJmljUyfy658v-S3_iQTPRVrdZQWDkMA1gYhAjASXeVjvGSaFMIuBgii_conrDUFRlQ_ORRnecGR0Q_qnu0jSkksuTa8brd1n4Dv1dBlj02A1etbS_hvLS5Fkv-dBdQOZCXFb5fBNJBmIjIFPiW8T3yF-jWUegH-6RfknJMF5VXaPPpfbeTb3Q9wqEzLmksedqOvNEzcLhCFyk3qPTj7t7Xa8af8S0SElMqlh2nvUSJNvW6OTw9VIY7lbI91IXrRGdn-U9iCUtmE6e6DU5NuiPD0cSo3lLkrdSF4UpdMfpTMIpWOY7h4oNfm2KEeHQ6mx3EWpG8mLonT7o3QHoXQN09sDpSbfFuXZ4VBqLHdR6kbyz97pJ3IveJGLrOC9XmGrfsd5fMPbR78QlYz4lRRRY9Mu542u2Yh5UbZfabuYZu2nOuCumCrFtlpsK8VOR0wfix117BO1tatUe2qxpxRrnE-GXPpUKR6pnUdK8ZlafDYkNtV0TFcydcuopmZ0UM-opmiuxlzdNKqpGlV37XH29ea_XwEAAP__8v2OmQ==
 
 statement ok
 CREATE TABLE books (title STRING, edition INT, shelf INT, PRIMARY KEY (title, edition))
@@ -383,7 +383,7 @@ vectorized: true
               table: authors@authors_pkey
               spans: FULL SCAN
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJyck99v2jAQx9_3V9zuKUheS5zQSZEqBQFTmRh0gLRJEw8JuULWYGe2I21C_O-THboWBFnpW-7H5_y9H9mi_lVghIPv96PucAxefzibz76OWjAbjAa9OVh7OO7NIanMWip9JZINwafp5AukUj5q6M4g9VltcGdx9pQM3-4G0wF4XupfmdwUBLeQ8vqzBd1xH7ynspa30X1iax9O_Su9puIB3jvSfbeQoZAZjZMNaYx-oI8LhqWSS9JaKuvauoRh9hujNsNclJWx7gXDpVSE0RbdKxjhPEkLmlKSkbpuI8OMTJIXrqxrKS5VvknUH2TYk0W1EToCxzJwYpDhrEys9wMudgxlZZ4f0yZZEUb-jr1NkH8oaD-rU5LsVuolvEYQPyvoWUclpMpIUXagYWHJ_6Wc6Oou0evPMhekrvlhUwU9GC_2W7cqX62NF3O73kllIoh9FnMWBywOz3YSXDJaK2A_2eDEqvmLwY6kfKxK-ClzAVJEEIdW1Rhibi8x_vhPY3BWWniJtH6uTS6W5jo8FBb7Z-t33lS_8-r6N5fUn5IupdB0fCwnK7fthVC2ovritKzUku6VXLpnanPiOOfISJs6ymtjKFzI_VYvYf8CmB_DvBEODuD2MRw0wmEzHDbCnWa40wjfHMGL3bu_AQAA__-GCO68
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJyck2-L2k4Qx5__XsX85lGErZpNvELgYEUtZ7F6VaGFIiUxc5oas2l2Ay3iey-70V61mp73RHd25jP7nT_ZofqeYoCDz4-j7nAMTn84m88-jhowG4wGvTkYezjuzSEs9VoWqpmFW4J308kHiKTcKOjOIHJZZXBrcXYMhk8Pg-kAHCdymzrRKcE9RLw6NqA77oNzTGt44z0ENg7uyG2qNaVP8L8l7bmBDDMZ0zjcksLgC7q4YJgXcklKycJc7WzAMP6BQZthkuWlNtcLhktZEAY7tK9ggPMwSmlKYUxFq40MY9Jhktq0tiRhf7_mG_qJDHsyLbeZCsDiDKweZDjLQ3P7Bhd7hrLUz-8pHa4IA3fPXqfJPdV0aJc4_P-ly0ynGsZLVPGrqp7FlJksYiooPhGyMOS_Qi6U9hCq9XuZZFS0-GllKT1pR7iN-yJZrbUjuBnzpNQBCJcJzoTHhH-1Eu-W_hoBh_Z6F0bOq5nzY3NHUm7KHL7JJAOZBSB8o2wMgputFG9_6_SuyvNvkddPlE6ypW75p-KEezV_51X5Oy_Of3dL_impXGaKzhfmYua22RKKV1RtnZJlsaTHQi7tM5U5sZy9iEnpyssrY5hZl_2-_oTdG2B-DvNa2DuB2-ewVwv79bBfC3fq4U4tfHcGL_b__QoAAP__CK7zbA==
 
 query T
 EXPLAIN (VERBOSE) SELECT a.name FROM authors AS a JOIN books2 AS b2 ON a.book = b2.title ORDER BY a.name
@@ -457,7 +457,7 @@ vectorized: true
           table: authors@authors_pkey
           spans: FULL SCAN
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJyUklFr1EAQx9_9FMM8qUzbS05FFgqRGjHlTGruQEHysL0d6trcTtzdgHLcd5ckd9gWerRvmf_k958fIVsMv1tUmH-_WnwoSnj5sViull8Xr2CZL_KLFbyGT3X1BXQff4oPUJRlXsNlVZRwLXIbUqgOT6dsbLTi4BwS-PY5r_PDItrYMpwfSk6HGAmdGC71hgOqH5hgQ9h5WXMI4odoO75QmD-oZoTWdX0c4oZwLZ5RbXHsRYUrfd1yzdqwP5shoeGobTvW7k9mnbcb7f8i4YW0_cYFBU5vmGDvsuz0kJ0gYc3OsFeQKKWKcvWeIEsIshSbHaH08b9HiPqGUSU7errrpVi3V03uq04f647pQuS27-CXWAfiFGRzygam6qOCLKVhfkPZW8rePeqWPsetlBPpztJ7Wo8Vz59TXHPoxAV-UvNs1xCyueHpJwjS-zVfeVmPZ6axGrkxMBzitE2moXDTahC8CydH4fQ4nB6F5w_gZvfiXwAAAP__9_0Uqw==
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJyUktFr1EAQxt_9K4Z5Upm2l5yKLBRWasSUM6m5AwUJkt4ONV5uJ-5uQDnuf5ckF7SFHr2n2flmv29-LLtD_6tBhcnXm8W7NIPn79Plavl58QKWySK5WsFL-FDkn6Dqwg9xHtIsSwq4ztMMbkU2PoZ8Op2zqUMtFi4hgi8fkyKZBqEODcPlFHLey0hoxXBWbdmj-oYRloStkzV7L66XdsOF1PxGNSOsbduFXi4J1-IY1Q6HXFS4qm4bLrgy7C5mSGg4VHUzxB5W6kP93m74DxJeSdNtrVdgqy0THICWbdVrZ0hYsDXsFERKqTRbvSXQEYGOsdwTShf-wfhQ3TGqaE9PB76W2h54o_u844vpsUy0C5FN18JPqS2IVaDnpHtf3gUFOqa-f0X6Nek3j_LFp_BlcibtRXwP7bHg-SnBBftWrOcnJc_2JSGbOx5_g5fOrfnGyXpYM7b54BsEwz6M02hsUjuOesD_zdFRc3zcHB81zx-Yy_2zvwEAAP__GM0YKQ==
 
 ####################################
 #  LOOKUP JOIN ON SECONDARY INDEX  #
@@ -623,7 +623,7 @@ vectorized: true
       table: small@small_pkey
       spans: FULL SCAN
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJzMlV9r2zwUxu_fT3E48ELClDqynTQVFNK1KaRkTpd4sDFyocai8-ZYnizDSsl3H5LL6pTFzpyb3Onfo-c5vyPQM-Y_E2Q4-Xw_u5oG0LmZLsPlx1kXlpPZ5DoETc84Ae2ePcDtYv4B8g1PErhagqYwm9yGcDefBpBw9SjsqgvzADpGBZdGxrtwFdxAp2Ov-B-GXbiEfhfmi5vJAt5_sQZIMJWRCPhG5Mi-IkWCLhL0kKCPBAe4IpgpuRZ5LpU58mwF0-gXsj7BOM0KbZZXBNdSCWTPqGOdCGQY8odELASPhHL6SDASmseJtbG1jDMVb7h6QoLXMik2ac7ABFpm3Ax7DgWeRkBB6m9C4WpLUBb61S_X_FEgo1tyeKY7GacvkQa7kcKnTLAS7PxTOFlYvEjQAq5EnUn5o8jgu4xTkCmDsUFmyI89A5kxNg3CkWX9Mjb7hTYnydglY29vJe7eSl4LkCoSSkS72cf0Ha62fyk3kD2ZOfQN_T9p9kfxdqLQwxtN_73RDu05botWN6SqtHp44q12D-frtuDr9hyvBd-GVBW-5yfO1zucr9eCr9dz_BZ8G1JV-I5OnK9_OF-_BV-_5wxa8G1IVeF7ceJ8Gz61hcgzmeZip4p9N_fNPyGiR1H-K7ks1FrcK7m2NuV0bnV2IRK5LndpOZmm5ZYJWBXTWrG7I6ZvxW69c4O1V6v268X-MbkHteJhvfPwGOfzWvGo3nl0jPNFfa_6Dc-k_pG99V5t__sdAAD__3h7gNM=
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJzMlV9r2zwUxu_fT3E48ELC5DqynTQVFNy1Lrhkdud4sDHCcGPRZXUtz5ZhpeS7D8ndmpTFDs5Nboz159HznN8R6Bmrnxky9D7fzi78AAZX_jyef5wNYe7NvMsYJD1JCEjr5A6uo_ADVI9JlsHFHCSFmXcdw03oB5Al5T3XsxaEAQyUCs6VLBnCRXAFg4E-4n-YDOEcRkMIoysvgvdftAESzEXKg-SRV8i-IkWCFhK0kaCDBMe4IFiUYsmrSpRqy7MW-OkvZCOCq7yopZpeEFyKkiN7RrmSGUeGcXKX8YgnKS_NERJMuUxWmbbRtbj6-6144E9I8FJk9WNeMVCZ5kWifg2TQpKnQEHI77zExZqgqOWrZSWTe46Mrsn-sW7EKn9JNd5OFT8VnDVsw0-xF2nCSFAzdvX3T9qZEA91AT_EKgeRM3AVOMXftRVqxpgfxFNN_OVfrddS7SSuRVx7ZzHWzmJeaxBlykuebsd36TtcrP9RcSAMUZj0TQ_-ptkdxd6KQvdvN-3VbpMaptWj4R3BNho-Of6GW_tTtvpRtgzT7kG5I9gG5dPjp2zvT9nuR9k2TKcH5Y5gG5Snx0_Z2Z-y04-yY5jjHpQ7gm1QPjt-yh3vXcSrQuQV3ypk18kj9X7w9J43700l6nLJb0ux1DbNMNQ6PZHySjartBn4ebOkAm6KaavY2hLTt2Kr3bnD2m5VO-1i55Dc41bxpN15cojzaat42u48PcT5rL1Xo45r0n7J3nov1v_9DgAA___BWoxP
 
 # Left join against covering secondary index
 query T
@@ -1187,7 +1187,7 @@ vectorized: true
       table: small@small_pkey
       spans: FULL SCAN
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJzMlFFvmzAUhd_3K67uU6uZEgNJU6RJ2VqqUaVJRyKt05QHN1gdG8HMNtKqKP99AjoVqgYQecjesDlH5_BddLeofsfoond_N_3oz-Dkyl8sF1-mp7Dwpt7lEhiBB7gO5regNiyO4etnL_DAu89lcPJPVCpCptmzoBCfMfhQXJ6xU5gHV14An74BQ4KJCPmMbbhC9ztSJGghQRsJOkhwiCuCqRRrrpSQuWRbGPzwD7oDglGSZjq_XhFcC8nR3aKOdMzRxSV7iHnAWcilOUCCIdcsiouYotIkldGGySckeCnibJMot_hEJLhIWX4yTAosCYGC0D-4xNWOoMj0S6TS7JGjS3eke60bESXPrYb1VsunlLsw9a6XsPBufbiZ-7NcwTSrdJ0K8StL4aeIEhCJC5Oc2TzT-ROZWHtLWntLvnQTMuSSh_VaE_oeV7s3vmQmDJGatM52X7xdi6fdR0d7jc6khmn1GF5LscrwRscbntWdntWPnmWYdg96LcUq9M6PR8_uTs_uR882TKcHvZZiFXrj49FzutNz-tFzDHPYg15LsQq9i_9j7b5RMuAqFYninTbqIN_JPHzk5Q5XIpNrfifFuogpj_PCV1yEXOnyLS0PflK-ygtWzbTRbNXM9LXZak5uibYb3U6z2Tmk97DRPGpOHh2SfN5oHjcnjw9Jvmie1aDlN2n-yV5nr3bv_gYAAP__N5hVwQ==
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJzMlNFr2zAQxt_3Vxz31DK5jmwnTQ2DbK3LXNKkcwLrGGGo8dFldSzPkmEl5H8ftlualMY2zkP6YizpPr5PvxO3QvU3Qhe925vhZ38ERxf-ZDr5NjyGiTf0zqcgGNzBZTC-BrUUUQTfv3qBB95tXgZHz0VlRSi0eCooik8EfCo2T8QxjIMLL4AvP0Agw1iGNBJLUuj-RI4MLWRoI0MHGXZxxjBJ5ZyUkmlesioEfvgP3Q7DRZxkOt-eMZzLlNBdoV7oiNDFqbiLKCARUmp2kGFIWiyiwqaINCi-v5IHekSG5zLKlrFyi1siw0ki8pVhchBxCByk_k0pztYMZaZfXJUW94QuX7Pmya7kIn4K1t0ONn1MyIWhdzmFiXftw9XYH-UVQotB_nlOO5TyIUvgj1zEIGMXBjm4cabzPzawdsa0dsZ8SSfTkFIKt4MN-Eecrd-4y0gaMjH5NuBd9vaWPW_eP962fyY3TKtFB2uybXSwd8gOWs0RWq0RWoZpt0BYk20D4ekhEdrNEdqtEdqG6bRAWJNtA2H_kAid5gid1ggdw-y2QFiTbQPh2XsZxW_EDEglMlbUaMp28jlN4T2Vc13JLJ3TTSrnhU25HBe6YiMkpctTXi78uDzKA26KeaXY2hLz12Kr2rnG2q5UO9ViZ5_c3Upxr9q5t4_zaaW4X-3c38f5rLpXnZpnUv3IXnvP1h_-BwAA__8-Q18I
 
 query T
  EXPLAIN (DISTSQL)
@@ -1211,7 +1211,7 @@ vectorized: true
           table: small@small_pkey
           spans: FULL SCAN
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJzMll1v2j4Yxe__n-LRcwXCNDgvLY30l9K1qZaKhg6Q1mnjwhCryxbiLC_SqorvPiVpaaiGzVIhcekHn5xj_46EnzD7FaGN7v3d6MLzoXPlTWfTT6MuTN2RezkDRmAB15PxLWQrFkXw-aM7caHTYdCDRRe-FYOBsQR90IUL_wrc-1IOnRdxrQxYzl6E1VdOGPxfTU9Yres8zxfQq-fL509zoFa3C-PJlTuBD1-AIcFYBNxnK56h_RUpEtSRoIEETSRo4ZxgkoolzzKRllueKoEX_EZ7QDCMkyIvx3OCS5FytJ8wD_OIo40ztoj4hLOAp9oACQY8Z2FU2VTxnCQNVyx9RIKXIipWcWZX94MEpwkrV32NAosDoCDy7zzF-ZqgKPJXyyxnDxxtuib7x7oOo5ynPNWs7Uz13IaOQ6EHjt6gYdu258-GO_31f_G_EWH8fCv0zbXMHhNuw8i9nsHUvfXgZuz55Q6Ws8ZljYT4WSTwQ4QxiNgGp4Q29qHj6GVwq8H6JTjBcZGXO4mj7zyFsfMUr-FFGvCUB9uxHdrD-fovR_VFXyQa3b7oXfbmlj3dv1u0Vbc02tf0Fu1SBNu06_RA7VL4N9tFj7dd-v549XZ49b5mtMCrCLbBe3YgvAr_Jl79ePEa--M12uE1-prZAq8i2Abv8EB4Ff5NvMbx4jX3x2u2w2v2NasFXkWwDd7zA-FV-DfxmseLV_GAmfAsEXHG9_pXH5TvAh488PodkYkiXfK7VCwrm3o5rnTVIOBZXv9K64UX1z-VAZtiKhXrcrEuFRtbYvpWbMhjn8qtTanakostqVjhfPqeQ59JxUO581AqPpeLz98Tmyo6piqZvGVUUTP6rp5RRdFMhbm8aVRRNSrv2tvs8_V_fwIAAP__RQG1bA==
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJzMlm9r4koYxd_fT_HwvIo4Nk7-tDZwIb1tyk2xsVeF22VXltEMXbdpJps_sKX43Zck1cayzrgpgm-EPJmTc2Z-B5wXzH5E6KB3fze88APQrvzJdPLfsAMTb-hdToERmMP1eHQL2ROLIvj_X2_sgaYx6MK8A1-Kft9cgNHvwEVwBd59KQdtLa6VIcvZWlh95YTB39X0hNU67XU-h249X7x-mgO1Ox0Yja-8MfzzCRgSjEXIA_bEM3Q-I0WCBhI0kaCFBG2cEUxSseBZJtJyyUsl8MOf6PQJLuOkyMvxjOBCpBydF8yXecTRwSmbR3zMWchTvY8EQ56zZVTZVPHc6vdr8sifkeCliIqnOHOqI0KCk4SVTz2dAotDoCDybzzF2YqgKPI31yxnDxwduiL7J7teRjlPearb27HquQOaS6ELrtEA4jiOH0wHO_2NP_G_Ecv49WDou5OZPifcgaF3PYWJd-vDzcgPyhUsZ275sz6uoRCPRQLfxTIGETvgluRGAWiuUUa3G8DX0QmOirxcSVxj5z7Mnft4iy_SkKc83A7u0i7OVr_ZbCB6ItHp9lHvsre27On-BaNtC6bTnm60qJgi26ZipweqmMK_WTF6zBUz9mdstGZs9HSzBWNFtg3jswMxVvg3GRvHzNjcn7HZmrHZ060WjBXZNowHB2Ks8G8yNo-ZsbU_Y6s1Y6un2y0YK7JtGJ8fiLHCv8nYOmbGimvNmGeJiDO-1z99v7wr8PCB13eLTBTpgt-lYlHZ1I-jSlcNQp7l9VtaP_hx_aoM2BRTqdiQiw2p2NwS0_diUx77VG5tSdW2XGxLxQrn049s-kwqHsidB1LxuVx8_pHYVNExVcnkLaOKmtEP9YwqimYpzOVNo4qqUXnX3mefrf76FQAA__97Bb6z
 
 # Regression test for #40562.
 
@@ -1902,7 +1902,7 @@ vectorized: true
 └── • values
       size: 1 column, 2 rows
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJyUkU9r3DAQxe_9FMOcpCKSlTcprSCgbeOAg2unaycUig_GHlI3G8nVH-iy7HcvtgttCinNTTNPb55-owP67ztUmH6-yTdZAewyq-rqU86hSvP0Qw2v4WpbfgR2t8lv0wqY5AJYwjlsKojA9hzy9KqG6zIrIJy_eyPPJyVAWUA82cMFhJM9CjS2p6J9JI_qC0psBI7OduS9dVPrMF_I-h-oVgIHM8YwtRuBnXWE6oBhCDtChXftLpI_XaHAnkI77OaJZ_AeWALd12gePMfmKNDG8HuKD-09oVodxf8nXdvBbKntyZ3Kp2n1fiS1cJe3dbqd6VHgwq9HNzy2bqLOrX2II3yzgwFrFDAt4QL0msOmuASmE5hWLpVSWVG_FbD-deIcBZYxKNBS6ETotdBnz1LJl1BtyY_WeHpC9Py-GoHU39PyR95G19GNs90cs5Tl7JsbPfmwqHIpMrNI0wP_NMt_mpO_zM3x1c8AAAD__1P0zvM=
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJyUkdFr1EAQxt_9K4Z5ysrS3uZa0YXCnjaFlJjUS1oECRKSocY7d2N2FwzH_e-SrKAVTuxTMvPtN9_-Zg9ov-9RYvLxLtukOUTXaVmVHzIGZZIl7yp4CTfb4j1ED5vsPikhEoxDFDMGmxI8RBODLLmp4LZIc3CXb16Jy1lxUOTgzya4Anc2IUdtOsqbb2RRfkKBNcdhNC1Za8a5dVgOpN0PlCuOvR68m9s1x9aMhPKArnd7QokPzd6TPV8hx45c0--XiRfwFqIY2i9e7yzD-sjRePd7inXNI6FcHfn_J92aXm-p6Wg8F0_TqmkgGbiL-yrZLvTIMfCr8Pk87Ggmz4zZ-QG-ml6D0RIiJeAK1JrBJr-GSMUwr11IKdO8es1h_euPMeRYeCdBCa5irtZcXZwkE88h25IdjLb0hOr0zmqO1D1SeCdr_NjS3WjaJSaUxeJbGh1ZF1QRilQHab7gn2bxT3P8l7k-vvgZAAD__6n4z4U=
 
 query T
 EXPLAIN (DISTSQL) SELECT * FROM (VALUES (1), (2)) AS u(y) WHERE NOT EXISTS (
@@ -1919,7 +1919,7 @@ vectorized: true
 └── • values
       size: 1 column, 2 rows
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJyUkd9r1EAQx9_9K4Z52pWlvb1a0YVCok0xJSb1EmtB8hCSocZed-P-AMNx_7skKegJJ_Zt58dnZr_f2aH7sUWFyd1NFqc5sMu0rMpPGYcyyZL3FbyEq03xEdhtnH1OSmCSC2BrziEuIQAbOXz5kGwSyIsKkrsJBnaI-vO3r-X51O-fesPJCBfgT0aOArXpKG8eyaH6ihJrgYM1LTln7JTazQ1p9xPVSmCvh-CndC2wNZZQ7dD3fkuo8LbZBnKnKxTYkW_67TzxFbwDtob2W9APjmO9F2iC_z3F-eaeUK324v83XZteb6jpyJ7Kw23VOJCCLLmqIM6rFK6LNEeBiwXRYPvHxo4oMDPmIQzw3fQajFbAIgkXEJ1xiPNLYNEapltIpVSaV28EnD29-ORYEbyCSB7VIp-jZUNuMNrRgY7jLtUCqbun5TLOBNvSjTXtvGYJi5mbEx05v1TlEqR6KU0f_BOW_4TXf8H1_sWvAAAA__87BtNx
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJyUkW9r1EAQxt_7KYZ5tStLe3u1oguFRLvFlJjUS6wFCRKSocY7d2N2FwzHfXdJUtATKvZVMn9-M_s8s0f3Y4cK9d1NGicZsMukKIsPKYdCp_ptCc_hapO_B3Ybpx91AUxyAWzNOcQFBGAjh0_v9EZDlpeg7yYY2DHqz1-_lOdTv3_oDScjXIA_GTkKNLalrP5ODtVnlFgJ7AfbkHN2mFL7uSFpf6JaCexMH_yUrgQ2diBUe_Sd3xEqvK13gdzpCgW25OtuN098AW-AraH5GszWcawOAm3wv6c4X98TqtVB_P-ma9uZDdUtDafyeFs59qQg1VclxFmZwHWeZChwsSBaPl_6LY0oMLV2G3r4ZjsD1ihgkYQLiM44xNklsGgN0z2kUirJylcCzh7--ORaHryCSD6qRz5Fz4Zcb42jIy2PO1UJpPaelus4G4aGbgbbzGuWMJ-5OdGS80tVLkFiltL0wD9h-U94_RdcHZ79CgAA__-lVNQD
 
 statement ok
 CREATE TABLE lookup_expr (
diff --git a/pkg/sql/opt/exec/execbuilder/testdata/merge_join_dist_vec b/pkg/sql/opt/exec/execbuilder/testdata/merge_join_dist_vec
index 2bc515e49ebe..1c7d6dfd106b 100644
--- a/pkg/sql/opt/exec/execbuilder/testdata/merge_join_dist_vec
+++ b/pkg/sql/opt/exec/execbuilder/testdata/merge_join_dist_vec
@@ -63,7 +63,7 @@ vectorized: true
       table: r@r_pkey
       spans: [/2 - /2]
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJzEk1GLm0AQx9_7KYZ5StotcY19EQ4sV6_1yOlVPVooPmziNBGMa3dXaAj57kUtpNpcmqNw9-bs7u8_858Z96h_lOii__V-8T4IYfIhSNLk82IKib_wr1N4DTdxdAclLPybFG6jIAQFD0kQfoSJmMKXT37sg4ArsJFhJXMKxZY0ut-QI0MbM4a1kivSWqr2eN89CvKf6FoMi6puTHucMVxJReju0RSmJHQxFcuSYhI5qVmrlZMRRdlJK69WxVaoHTK8lmWzrbQLgsESGSa1aKOZPbMwOzCUjfmd4yi93MFG6M1Q1OOYHTKG2og1oWsf2CO1HnWaSqqcFOUDpawl__XkhOE7Umu6lUVFajYf1pbuanL7EUQPqR93g0CGJX03E4-_mV6pYr3pP5Fh1BgXPM48m3nOqAtHh_P_cHii_FC-lfXMGbfiZGpnkJpfvgjWsC_lMywCf7TW51gE-0UX4URxMelaVpoumrPV2qN8TX27tGzUiu6VXHVp-jDquK6zOWnT3zp9EFTdVfcvXg7z8zAfw9afsD2A-Ri2z8LvBrA1hudP8PxX5vMwPw87T_KcHV79CgAA__9mp_ev
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJzEk1GPk0AQx9_9FJN5anVNWYovJJdgTk659OAELpoYYrZlbIkci7tLYtP0uxvApIK92ovRe2N29_ef-c8MO9TfSnTR_3i7eB2EMHkTJGnyfjGFxF_4lyk8h6s4uoESFv5VCtdREIKCuyQI38JETOHDOz_2QcAF2MiwkjmF4p40up-QI0MbM4a1kivSWqr2eNc9CvLv6FoMi6puTHucMVxJReju0BSmJHQxFcuSYhI5qVmrlZMRRdlJK099rr_SFhleyrK5r7QLgsESGSa1aKOZPbMw2zOUjfmZ4qC83MJG6M1Q0-OY7TOG2og1oWvv2QOlHnSaSqqcFOUDpawl__TkiN8bUmu6lkVFajYf1pZua3L7CUR3qR93c0CGJX0xE4-_mF6oYr3pP5Fh1BgXPM48m3nOqAsHh_O_cHik_FC-lPXMGbfiaGpnkJqfvwfWsC-lV_7rPeAPlvo_9sB-0j04UlxMupaVprPGbLX2KF9T3y4tG7WiWyVXXZo-jDqu62xO2vS3Th8EVXfV_Yrnw_w0zMew9StsD2A-hu2T8KsBbI3h-SM8_5b5NMxPw86jPGf7Zz8CAAD__xdu9rU=
 
 # Test that we can handle merge joins with equality columns of integers with
 # different widths.
diff --git a/pkg/sql/opt/exec/execbuilder/testdata/union b/pkg/sql/opt/exec/execbuilder/testdata/union
index 07a4cc3e1170..afe893a698ff 100644
--- a/pkg/sql/opt/exec/execbuilder/testdata/union
+++ b/pkg/sql/opt/exec/execbuilder/testdata/union
@@ -469,7 +469,7 @@ vectorized: true
               table: abcde@abcde_b_c_d_e_idx
               spans: /1-/2
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJykkltr20wQhu-_XzHMlf15gqJTKAuBTWKFClIpldwTxRhZOwSBIrmrNaQE__ciKeDYtdW4vRHM4Z3n1cw-Y_OjRIHB1_u7qzCC0TRMZ-nHO4LPQXIdp8EY0uAuuJnB_3CbxB9g9BJmBEuCnEARcF_Klrli-BSFcQTbrrxr3Osaw5f3QRLAKIdLsMdwFU1hpOASeAxxMg0SuP4GGRJWteIoe-QGxXe0cU640nXOTVPrNvXcNYTqCcU5YVGt1qZNzwnzWjOKZzSFKRkFzrJlyQlnirV1joSKTVaU3djOkey-i-UiX6gFLwr1hIQ3dbl-rBqx-7dImK6yNm3ZZ5aD8w1hvTZbdmOyB0Zhb-jt_m6L0rBmbdm75vq8AOnBJUj_KMw5BZbW2rC2nF2UtCdIGK-NAGmTdEk6JD0agLqnQF9fwD10gZUuHjP98w17PzvqyPurnXuHdz6Sbvs8hRBhNHv38kpfDjE-asE_amFLrrVizeq3_ZN0JiTdCUlvQtKf4HxzwPe0aExR5cby9wd0J3P_cLWLU3aUcLOqq4Z3SMcmn7duWT1w_7dNvdY53-s67zB9GHe6LqG4MX3V7oOw6kutwddie1DsDIudQbG_I7b3xe6g2Bsme_9C9gfFF3vk-ea_XwEAAP__pRHQSA==
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJykkt1q20AQhe_7FMNc2fUERX-hLAQ2iRUqSKVUcv8oxsjaIYgqkrtaQ0rwuxdJgcRupCbtjWBn58x3NGfvsflZosDg6_XVWRjBZB6mi_TjFcHnIDmP02AKaXAVXCzgLVwm8QeYPBwzgjVBTqAIuL_K1rli-BSFcQSPXXnXeNA1hS_vgySASQ6nYE_hLJrDRMEp8BTiZB4kcP4NMiSsasVRdssNiu9o45Jwo-ucm6bWbem-awjVHYpjwqLabE1bXhLmtWYU92gKUzIKXGTrkhPOFGvrGAkVm6wou7GdI9l9V-tVvlIrXhXqDgkv6nJ7WzVi_2-RMN1kbdmyjywHlzvCemse2Y3JbhiFvaOX-7ssSsOatWXvm-vrAqQHpyD9QZjzGlhaa8PacvZR0p4hYbw1AqRN0iXpkPRoBOq-Bvo0AXc4gc0P_vWC1R8NmvL-ae3e82ufSLd9oUKIMFq8e3ioD1lMBy34gxYeybVWrFn9EQFJZ0bSnZH0ZiT9GS53z_ieF40pqtxY_uGALjX3L8GdvGZHCTebump4jzQ0-bh1y-qG-79t6q3O-VrXeYfpj3Gn6wqKG9Pf2v0hrPqr1uBTsT0qdsbFzqjY3xPbh2J3VOyNk73_Ifuj4pMD8nL35ncAAAD__z5f0Us=
 
 query T
 EXPLAIN (DISTSQL,VERBOSE) SELECT * FROM (SELECT a, b, c, d, e FROM abcde UNION SELECT  a, c, b, d, e FROM abcde) WHERE c = 1 AND d = e ORDER BY b, c, d, e, a
@@ -547,7 +547,7 @@ vectorized: true
           table: abcde@abcde_pkey
           spans: FULL SCAN
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJy0kN1q20AQhe_7FMNcSe0GW5YCZcEgJ1aoQJVSyf2j6GKtHYJA1qq7a2gxfvciqZAoxCbpz-Wc2TPn23NA871BjtGX22QVp-Cs42JTfEgYfIryq6yIXCiiJLrewGu4ybP34ExHsa0kwcc0zlJYJQk8sXXh87soj8CpYAmeC6t0DY6EJZALWb6Ocrj6CgIZtkpSKnZkkH9DD0uGnVYVGaN0Lx2GB7H8gXzOsG67ve3lkmGlNCE_oK1tQ8hxI7YN5SQk6dkcGUqyom6GswNR2Ol6J_RPZHitmv2uNRwEgy2DioFkQMiw6EQvX2B5ZKj29j7NWHFHyL0jez7RTd1Y0qRn3hRn1Dk4od-XwzmP083b3x2FASwhvHRPIixegvCwlMX_KsX_o1L8f1lKcBLhPllpSZrkNDb03mB5fIIzVReqmwWT16fS5y8pICfTqdbQMy-XDEne0fgVo_a6olutqiFmHLPBNwiSjB233jjE7bjqAR-avbPmYGL2HpsXZ83--WT_b5KDs-bLR8nl8dWvAAAA___vr4vM
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJy0kF9rnEAUxd_7KS73SdsJu64GysCCm6yhgtVUt_8oUmadS1hqHDszCy3LfveiFhJDVpL-eRHuuXPu-XkOaL7XyDH6dJ2s4hScdVxsincJgw9RfpEVkQtFlESXG3gJV3n2FpzxKLaVJHifxlkKqySBR7YufHwT5RE4FSzBc2GVrsGRsARyIcvXUQ4Xn0Egw0ZJSsUtGeRf0MOSYatVRcYo3UmH_kEsfyCfM9w17d52csmwUpqQH9DubE3IcSO2NeUkJOnZHBlKsmJX92d7orD_fm2_0U9keKnq_W1jOAgGWwYVA8mAkGHRik4-w_LIUO3tXaCx4oaQe0f2dKirXW1Jk555Y6JB5-CEftcP5zxON69_1xQGsITw3D2JsHgOwv1eFv-xF_-PevH_ZS_BSYS7ZKUlaZLj2NB7heXxEc5Unal2Foxen0qfP6eAnEyrGkNPvFwyJHlDw68YtdcVXWtV9THDmPW-XpBk7LD1hiFuhlUHeN_sTZqDkdl7aF5Mmv3pZP9vkoNJ8_mD5PL44lcAAAD__4rljdI=
 
 query T
 EXPLAIN (DISTSQL,VERBOSE) SELECT * FROM (SELECT * FROM abcde UNION ALL SELECT * FROM abcde) WHERE c = 1 AND d = e ORDER BY b, c, d, e, a
@@ -703,7 +703,7 @@ vectorized: true
           table: abcde@abcde_pkey
           spans: FULL SCAN
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJy0k9-L2k4Uxd-_f8XlPiVfb9nND6EMCONqlgqusUlotxQfYnJrAzFJJxPoIv7vJUlhVdTW0j7OuXPmnPsJ2WH9LUeB3vNyPp4twJjOwih8Pyf44AUPfuiZEHpzbxLB__AY-E9gHB_jdZIyeM8TbxnBeD6HM2MTPr7zAg-MBEZgmTBeTMFIYQRsgh9MvQAePkGMhEWZ8iLeco3iM1q4IqxUmXBdl6qVdt2FWfodxT1hVlSNbuUVYVIqRrFDnemcUWAUr3MOOE5Z3d0jYco6zvLu2a6RrFS2jdULEk7KvNkWtYCYYE2QEKQEjIRhFbfyG1ztCctGv6bVOt4wCmtPv9_oMcs1K1Z31nGdXhdgSKeFI4SYLaK3PxlJF0Ygh-bFCvYtFQ6h2P8KivNHUJy_CcW9WOE1uSlKlbLi9Ch41Tp_deXMHk-sNhyy9qs793iT6KVicfB7IGHOX7QhrQFJe0DSGZB0BySHA3Okss3X8yMk9BstQFokbZIOSZfk8CKB4S0fIeC6KouaT0mcffm-XZ_TDfc467JRCS9VmXQx_dHvfJ2Qcq37qdUfZkU_agsemq2rZvfIbJ2a7atm53qyc0OyfWp2r5qHJ8mr_X8_AgAA__-W-7DW
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJy0k--L2k4Qxt9__4phXiVfp2h-CGVBWE9zVPCMTUJ7pUiJydRKc0m62UAP8X8vSQqnoraW9k1gZvbZ55lP2B1W3zIU6D0u5-PZAozpLIzCt3OCd15w54eeCaE39yYR_A_3gf8AxnEZr5OUwXuceMsIxvM5nBmb8P6NF3hgJDACy4TxYgpGCiNgE_xg6gVw9wFiJMyLlBfxE1coPqKFK8JSFQlXVaGa1q49MEu_oxgQbvOy1k17RZgUilHsUG91xigwitcZBxynrPoDJExZx9usvbZNJNvvp_IrPyPhpMjqp7wSEBOsCRKClICRMCzjpv0KV3vCotYvhpWON4zC2tPvh7rfZpoVq751nKjrCzCk0_ARQswW0eufmKQLI5BD82IE-5YIh1zsf8jF-SMuzt_k4l6M8OJc54VKWXF6ZLxqlL86cmaPB1YbDln7Zd893iR6LlkcPBIkzPizNqTVI2n3SDo9km6P5LBnjtR28-X8CAn9WguQFkmbpEPSJTm8SGB4y08IuCqLvOJTEmdvHjTrc7rhDmdV1CrhpSqS1qYr_VbXNlKudDe1umKWd6Mm4KHYuip2j8TWqdi-KnauOzs3ONunYveqeHjivNr_9yMAAP__Ptiy3A==
 
 query T
 EXPLAIN (DISTSQL,VERBOSE) SELECT * FROM (SELECT * FROM abcde INTERSECT ALL SELECT * FROM abcde) WHERE c = 1 AND d = e ORDER BY b, c, d, e, a
@@ -824,7 +824,7 @@ vectorized: true
       table: abcde@abcde_b_c_d_e_idx
       spans: FULL SCAN
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJykkV-rm0AQxd_7KZZ5asmU6583n2xvLAipppqWQhFZd4cgGNfurpAS_O7FtSFJSUrb-yLMOZ45P8cTmO8dRJB83W7epRl7vU7LXflpg-xLUrzPy-QNK5NN8rxjHFmDTLAPRf6R8UZIYp-zNM_O_mwik1c-IPRKUsYPZCD6Bj5UCINWgoxRepZO7oVUHiHyENp-GO0sVwhCaYLoBLa1HUEEO950VBCXpJ88QJBkedu5ta4rds-6qUUta6pbeQSEZ9WNh95EZzZAKAc-C2-hmhDUaC-NxvI9QeRP-H9U_j2qQbcHrn9cs_y649-wBA9ZLghKS9Ikb8tjf4VxsMI4XEE13QFft8a2vbBPwe9BjAOMw4dI4b-cpyAzqN7QTcejzd7MSXJPy_cZNWpBW62Eq1nG3OWcIMnYxQ2WIe2d5f7fddh_STj4Yzi8CXtTNb36GQAA__-F4Q-C
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJykkV-rm0AQxd_7KZZ5asmU6583n2zvtSCkmmpaCkVk3R2C1Lh2d4WU4Hcvrg1JSi1t74sw53jm_BzPYL51EEHyebd9k2bs5VNa7ssPW2SfkuJtXiavWJlsk8c948gaZIK9K_L3jDdCEvuYpXl28WcTmbzxAaFXkjJ-JAPRF_ChQhi0EmSM0rN0di-k8gSRh9D2w2hnuUIQShNEZ7Ct7Qgi2POmo4K4JP3gAYIky9vOrXVdsXvWTS1qWVPdyhMgPKpuPPYmurABQjnwWXgN1YSgRnttNJYfCCJ_wv-j8tephq_0_Rbn5yn_BidYxblSKC1Jk7zvj_0NxsEG43AD1fQb9qfW2LYX9iH4NYhxgHG4ihT-y4UKMoPqDd11rG32Zk6SB1q-z6hRC9ppJVzNMuYu5wRJxi5usAxp7yz3C2_D_nPCwR_D4V3Ym6rpxY8AAAD__8epEIU=
 
 # Use a streaming set operation even though the ordering is not required.
 query T
@@ -851,7 +851,7 @@ vectorized: true
       table: abcde@abcde_b_c_d_e_idx
       spans: FULL SCAN
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJycUWFrnEAU_N5fsbxPCfdKTu_bQsE0tSCYM1UphSKy575awXPt7goJh_-9uKZEw6Vt8mVh583szLw9gfnVAofw2118He3Zxacoy7MvMbKvYfoxycJLloVxeJMzgeyArGKf0-SWiUMliUX7PEyzafjImQjI5IIDCJ2StBdHMsC_gwcFQq9VRcYoPUEnR4jkPfAtQtP1g53gAqFSmoCfwDa2JeCQi0NLKQlJ-moLCJKsaFr3rPMK3FkeyqqUJZWNvAeEG9UOx87wP9kAIevFBLyHYkRQg31yNFbUBNwb8W2pvHOpet0chX5YZnnc5f9k8V_M8hRh6JSWpEmu7ItJ-S_KmUK3pGvKyCb9lb_ukz_0xBe_fh3HgNDSD3sReBsM_A0Gu83lB93UP9cQICSD5SzwMPAx2L1Yd_ea1adketUZel777MvbqSvJmubdGTXoiu60qpzNfE2czgGSjJ2n_nyJOjdy_7EUe68Qe8_F_l_Fu5V4Oxbju98BAAD___BfLOo=
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJycUWFrnEAQ_d5fscynhJuS0_u2UDBNLQjmTFVKoYjsuVMrNa7dXSHh8L8X15RoyLW9flnYN-_NvDdzBPOzBQ7hl7v4Otqziw9RlmefYmSfw_R9koWXLAvj8CZnAtkBWcU-psktE4dKEov2eZhmU_GJMxGQyQUHEDolaS_uyQD_Ch4UCL1WFRmj9AQdHSGSD8C3CE3XD3aCC4RKaQJ-BNvYloBDLg4tpSQk6astIEiyomldWzcrcG95KKtSllQ28gEQblQ73HeG__YGCFkvJuAtFCOCGuzzRGNFTcC9Ef_PlXfaVf-DHpd2ntb5L3b8k3aeXQyd0pI0yZWDYlL-jfJKplvSNWVkk_7KX0fKH3vii8NfxzEgtPTNXgTeBgN_g8Fuc_lON_X3NQQIyWA5CzwMfAx2J-Puztl-SqZXnaGXsV_tvJ2ykqxp3p1Rg67oTqvKjZm_idM5QJKxc9WfP1HnSu4eS7F3hth7Kfb_KN6txNuxGN_8CgAA__-Swi3t
 
 # Use a streaming set operation even though the ordering is not required.
 query T
@@ -905,7 +905,7 @@ vectorized: true
       table: abcde@abcde_pkey
       spans: FULL SCAN
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJycklFr2zAQx9_3KcQ9teRGYjt9EQzcpR4E0jqLzSgMYxTrlhkcy5NkaAn57sP2ssYhSZO-GHS6n_6_O7wB86cADsHzfHY_fWI3D9Mojr7PkP0IFl_DKLhlUTALJjFbIsuQSfZtET4yscwkseB5EszjXYNAJpHRXgMglErSk1iTAf4THEgQKq0yMkbpprRpG6byBfgIIS-r2jblBCFTmoBvwOa2IOAQi2VBCxKS9HAECJKsyIv22TbLb7_pMs1SmVKayxdAmKiiXpeG7-QBIapEU_gMyRZB1fYt0VixIuDOFj9m5RyzqnS-Fvp13-Xfni5xca9xeciNzcvMDt2-iO-g76LvAUKoJWmSnP2vnUr2PpTsXZJ8MnN8MvMtqi5V91IvKWnI91qOiD-SXlFENqyG4756_FoR3_3g97MZIBT0y974zgB9d4C-N7j9ovPV736pmbS2F-z37pr9LshUqjR0OPPRl0fNoCRX1C3OqFpnNNcqa2O6Y9hybUGSsd2t2x2mZXfVCO7DzlnYOw-7Z-FxD3YOYe8K2D2Ex2fhuwPtZPvpbwAAAP__SaeeFw==
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJycklFr2zAQx9_3KcQ9teRGYjt9EQzcpR4E3DqLzSgMYxzplpm5lifJ0BLy3YftZY1DkyV9Meh0P_1_d3gD5ncJHILHRXg7f2BXd_M4ib-GyL4Fy89RHFyzOAiDWcJWyAQyyb4so3uWr4QkFjzOgkWya8iRSWS01wAIlZL0kD-RAf4dHEgRaq0EGaN0W9p0DXP5DHyCUFR1Y9tyiiCUJuAbsIUtCTgk-aqkJeWS9HgCCJJsXpTds12W332zVSYymVFWyGdAmKmyeaoM38kDQlznbeEjpFsE1djXRGPzNQF3tvg-K-e4Vf2LXvZ1_q7qHB33Ep27wtiiEnbsDl18B30XfQ8QIi1Jk-TsX-1YsveuZO-c5KOZ06OZr1FNpfqXBklpS_6v5Q3xe9JrislG9Xg6VE9eauK7f_w2DAGhpB_2yndG6Lsj9L3R9SddrH8OS-2kjT1jvzeX7HdJplaVocOZ33x50g5Kck394oxqtKCFVqKL6Y9Rx3UFScb2t25_mFf9VSu4DzsnYe807J6EpwPYOYS9C2D3EJ6ehG8OtNPthz8BAAD__1Kcnxo=
 
 # Use a streaming set operation even though the ordering is not required.
 query T
@@ -932,7 +932,7 @@ vectorized: true
       table: abcde@abcde_b_c_d_e_idx
       spans: FULL SCAN
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJycklGLnDAUhd_7K8J92mVu2dF5CxTcTi0MuOt0lLJQRKK5tYJjbBJhl8H_XoxdVpfZttMXISfn5H4n8QTmZwMcwod9dLu7Z1efdkmafImQfQ0PH-MkvGZJGIXblAlkBbKSfT7Ed0wUpSQWPmzDfcpuo-jZNDqQyZkJEFol6V4cyQD_Bh5kCJ1WJRmj9CidnGEnH4GvEeq26-0oZwil0gT8BLa2DQGHVBQNHUhI0jdrQJBkRd24Y92soNP1UegnQNiqpj-2hj9jA0LSiVF4D9mAoHr7MsdYURFwb8D_Y_HOsbhvXuRlLnPKa_k4p_p9T_9C5b9J9QLTt0pL0iQXINmY_JvlTLU70hUlZOPuxl82S5864rNnB4SGvturwFth4K8w2KyuP-i6-rGUACHuLWeBh4GPwebNrptLXuBAplOtodedz568HouSrGi6OKN6XdJeq9KNmZaxyzlBkrHTrj8tdq3bcr_IPOxdEPZfh_0_hjeL8HrIhne_AgAA__-TtywT
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJycklFrnEAUhd_7K4b7lLC3ZHXfBgqmWwsLJm5XKYEiMjq3VmocOzNCwuJ_L44N0ZBtu3kR5sw5c78z4xHMrwY4hHf76Hp3yy4-7ZI0-RIh-xoePsZJeMmSMAq3KRPICmQl-3yIb5goSkksvNuG-5RdR9GTaXQgkzMTILRK0q24JwP8G3iQIXRalWSM0qN0dIadfAC-RqjbrrejnCGUShPwI9jaNgQcUlE0dCAhSV-tAUGSFXXjjnWzAvfNu5_0CAhb1fT3reFP5ICQdGIU3kM2IKjePo8yVlQE3BvwbTjeaZwiL3OZU17LhznVn6v6Hyr_JNUzTN8qLUmTXIBkY_Jflleq3ZCuKCEbd1f-sln62BGfvTwgNPTdXgTeCgN_hcFmdflB19WPpQQIcW85CzwMfAw2J7tuznmBA5lOtYZedn715PVYlGRF08UZ1euS9lqVbsy0jF3OCZKMnXb9abFr3Zb7ReZh74yw_zLs_zW8WYTXQza8-x0AAP__OSMtFg==
 
 # Do not use a streaming set operation for UNION ALL.
 query T
@@ -957,7 +957,7 @@ vectorized: true
       table: abcde@abcde_pkey
       spans: FULL SCAN
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJykkUFL-0AQxe__T7HM6S9MaRJve7LWCIGY1KSKIDlss0MJpNm4uwGl5LtLNpa2UqXqcd68N_Pb2S2Ylxo4hE-LeBYl7P9NlC_z-xjZY5hdp3l4wfIwDudLJpCtkJXsNkvvmFiVkthDEqUJm8XxzjMYkMkDDyA0SlIiNmSAP4MPBUKrVUnGKD1IW2eI5CtwD6Fq2s4OcoFQKk3At2ArWxNwWIpVTRkJSXrqAYIkK6rajXW7rlpdbYR-A4S5qrtNY_iOCBDyVgzCBIoeQXV2v8dYsSbgfo-_Y_HPZPm44DkswZcsewRDuhI16xqlJWmSRxRFfwI6URPVToNPxtME3k-ukZFpVWPozMkFAsk1jc8xqtMlLbQq3ZqxTF3OCZKMHbvBWESNa7nvOgz7fwkH34Yvj8JeX_T_3gMAAP__FW8KhA==
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJykkdFro0AQxt_vr1jm6Q4mRL23fbpcakGwmmpaCkXKxh2C1Lh2d4WW4P9eXBuSlLSk7Ysw33zfzM_ZLZinGjiEd4t4FiXs90WUL_PrGNltmP1P8_APy8M4nC-ZQLZCVrLLLL1iYlVKYjdJlCZsFsc7z2BAJg88gNAoSYnYkAF-Dz4UCK1WJRmj9CBtnSGSz8A9hKppOzvIBUKpNAHfgq1sTcBhKVY1ZSQk6akHCJKsqGo31u36574P7SO9AMJc1d2mMXwHBQh5KwZhAkWPoDq7X2WsWBNwv8fv4fjn47zd8Ryc4EOcPYUhXYmadY3SkjTJI5CiP8GdqIlqp8E742kC7ysHyci0qjF05uQCgeSaxt8xqtMlLbQq3ZqxTF3OCZKMHbvBWESNa7kXOwz7PwkHn4b_HoW9vuh_vQYAAP__cG4Mig==
 
 # Regression test for #69497. Ensure the merge ordering for streaming set ops
 # matches the input ordering.
@@ -991,7 +991,7 @@ vectorized: true
       table: abc@abc_a_b_c_idx
       spans: FULL SCAN
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJycklFr2zAUhd_3K8R9auktjZ03wcBt6kHArTPbjI5hgizdZAbH8iQZWkL--7C80Lq029JHnaOj-51r78H-aoBD_LBKrpf37Ox2mRf51wTZtzi7SfP4nOVxEi8KppARsg37kqV3TNGGxQ-LeFUcbYGsQiZHW1SSpdltnLGb7z4ICK1WdC92ZIH_gABKhM5oSdZqM0h7f2GpHoHPEOq2690glwhSGwK-B1e7hoBDIaqGMhKKzNUMEBQ5UTf-WUWbqDP1TpgnQFjopt-1lh_RASHvxCBcQnlA0L17nmKd2BLw4IAfIwmmJKKSkajkWqyrtVzX6vElz59d_Q9P-C7PM0bfaqPIkJoglEPyX1feKHVHZks5ubS7CqediqeO-PGzXycJIDS0cWdRcIFReIHR_PL8s6m3P6cSIKS94ywKMAoxmr_bdX7K7jOynW4tve785suzoSipLY2Ls7o3klZGSz9mPKY-5wVF1o1uOB6Wrbf8z_EyHJwQDl-Hw7-G55Pw7FAePv0OAAD__y5zKhQ=
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJycklFrnEAUhd_7K4b7lJAbsrpvAwWTjYUFE7cqJaWIjDPXrdQ4dmaEhMX_XtQuiSFpmz7OOXPmfufqAezPBjiEd7vocnvLTq63aZZ-jpB9CZOrOA1PWRpG4SZjChkhq9inJL5hiioW3m3CXXa0BbISmZxtUUoWJ9dhwq6-TkFAaLWiW3FPFvg38CBH6IyWZK02o3SYLmzVA_AVQt12vRvlHEFqQ8AP4GrXEHDIRNlQQkKRuVgBgiIn6mZ6VlEVKKqK7gc9AsJGN_19a_mRHRDSTozCOeQDgu7d0xjrxJ6AewP-H4q3RBGlDEQpC1GUhSxq9fCc5_ey_oXHf5PnCaNvtVFkSC0Q8jH5tyuvlLohs6eUXNxd-MtO2WNH_PjdL6MIEBqq3EngnWHgn2GwPj_9aOr996UECHHvOAs8DHwM1m92Xb9n9wnZTreWXnZ-9eXVWJTUnubFWd0bSTuj5TRmPsZTbhIUWTe7_nzYtpM1_RzPw947wv7LsP_H8HoRXg358OFXAAAA__8seypX
 
 # Example where the interesting orderings do not include all columns.
 statement ok
@@ -1030,7 +1030,7 @@ vectorized: true
           table: abcd@abcd_a_b_c_idx
           spans: FULL SCAN
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJycUl9r2z4Uff99CnGfWnJLYjtPgh-oTT0IpHVmh9ExQlCsG8fgWJ4kQ0vIdx92KIm9plv2ItDRPff8QXuwPwvgEL7MZ_fTZ3bzOE0WydcZsm9h_BAl4S1Lwlk4WTBCtkGWIduyL3H0xGiTbVn4Mgnni_cRiWyNLEWmjiNynSoWxY9hzB6-twsAodSKnuWOLPAf4MESoTI6JWu1aaB9OzBVr8BHCHlZ1a6BlwipNgR8Dy53BQGHhVwXFJNUZIYjQFDkZF60axtvojL5Tpo3QJjoot6Vlp9lAISkkg12B8sDgq7dSck6mRFw74D_5sbrumlqEM2xkqv1Kl3l6vXc1Km1vzHlX2Mq0caRGfpdP8IboPAHKII7FOMBIOykS7esoJKz4KJycFH5JFiX2igypDqKy4b5p5EP7D-RySghF1XDoBth8VYRf_9997MZIBS0cTe9aLf_mzzb_g4DQlQ7zoSHwkcRoBhfjD2-pvCYbKVLS_34H24eNZlJZXTs0OrapDQ3Om1ljteo5bWAIuuOr8HxMi3bp_abnpO9T8l-hzzqk_0rlP0-OfiUPO4pLw___QoAAP__nw9q6g==
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJycUl1r2zAUfd-vEPeppbcktvMkGKhNPQikdWaH0TFCUKwbJ8yxPEmGlpD_PmxTEntNt-xFoKN77vlAe7C_cuAQPs-md5MndvUwSebJ1ymyb2F8HyXhNUvCaTieM0K2RpYh27AvcfTIaJ1tWPg8DmfztxGJbIUsRabaEblKFYvihzBm99-bBYBQaEVPckcW-A_wYIFQGp2StdrU0L4ZmKgX4EOEbVFWroYXCKk2BHwPbutyAg5zucopJqnIDIaAoMjJbd6srb2J-liWP-kVEMY6r3aF5ScpACEpZY3dwuKAoCt31LJOZgTcO-D_-fG6fuoiRH0s5XK1TJdb9XJq6tjbv5jyLzGVaOPIDPyuH-HdoPBvUAS3KEY3gLCTLt2wnArOgrPKwVnlo2BVaKPIkOooLmrm30besf9IJqOEXFQOgm6E-WtJ_O3_3U2ngJDT2l31ol1_Ntts8ycMCFHlOBMeCh9FgGJ0NvboksJjsqUuLPXjv7t5WGcmlVHbodWVSWlmdNrItNeo4TWAIuva16C9TIrmqfmmp2TvQ7LfIQ_7ZP8CZb9PDj4kj3rKi8On3wEAAP__nAZrmA==
 
 # Regression test for #68702. Ensure correct behavior when a column is projected
 # twice on the left side.
@@ -1066,7 +1066,7 @@ vectorized: true
       row 0, expr 1: -1643624263
       row 0, expr 2: CAST(NULL AS OID)
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJyUUl1vmzAUfd-vsO5TstwqYNK0sjSJLGUSEg1ZoFWlKQ8M7jJUBzPbTKui_PcJ2JYmarZV4gGf63PPB-zAfJMgIHhYRrNwwQY3YZImHyNk98HqfZwEQ5YEUTBPmc0-S1JlwWYJy5V08RThyB5_vXrswyq-ZXZ6feVwFjzMg2XKZlH0e9fbfj64n0V3QcIGi7soQsYvnUuPTydXjhAiDm-QDS7c6cSb8gmfekMhRLhIr4dDQKhUQYtsSwbEJ3BhjVBrlZMxSrfQrrsQFj9AOAhlVTe2hdcIudIEYge2tJJAQNpmWFFWkB47gFCQzUrZre3d-7Uut5l-AoS5ks22MoI9HrIDQlJnLXgBCHFjBfM5to8L6z2CauxB3NhsQyDcPf6_QanyTLLvmWzIMGfsHnvsBT30XfT5WUF-VvCg01RKF6SpOBJYt8x_XXnB9S3pDSVk43rMjx2nTzWJZ78EIEj6Yge-N0LfHaHPR8N3utx8PYb-lOt25Xpns3qvKXdFplaVodPML2522qBUbKgvzqhG57TUKu9k-mPc8TqgIGP7Ke8PYdWNuq__nOy-gsxPyfyvZO-I7OzX-zc_AwAA__8-bTlL
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJyUUuFq20wQ_P89xbG_7M8bLJ0cJxwU5DoqCBTLtZQQKKao0tY1vujUu1NpMH73IqmtIxO3DQikm93ZmVndHsxXCQKCh2U0CxdscBMmafI-QnYfrN7GSTBkSRAF85TZ7JMktS3YLGG5ki6eIhzZ7uenx96t4ltmp9dXDmfBwzxYpmwWRb9m_d_VB_ez6C5I2GBxF0XI-KVz6fHp5MoRQsThDbLBhTudeFM-4VNvKIQIF-n1cAgIpSpokT2SAfEBXFgjVFrlZIzSDbRvG8LiOwgHYVtWtW3gNUKuNIHYg91aSSAgbTKsKCtIjx1AKMhmW9mO7dz73etjtaMnQJgrWT-WRrDdMT8gJFXWgBeAENdWMJ9j87iwPiCo2h4NGJttCIR7wH83KVWeSfYtkzUZ5ozdvs9O0EPfRZ-fFeRnBY86dal0QZqKnsC6Yf6t5QXXt6Q3lJCNqzHvO06fKhLPrgUgSPpsB743Qt8doc9Hwzd6u_nSh34v122X653N6r1muSsylSoNnWZ-cbLTBKViQ93ijKp1Tkut8lamO8YtrwUKMrar8u4Qlm2p_fvPye4ryPyUzP9I9npk57A-_PcjAAD__x2UOdo=
 
 query T
 EXPLAIN (DISTSQL,VERBOSE) SELECT a, b AS b1, b AS b2 FROM abc EXCEPT SELECT a, b, c FROM abc ORDER by a, b1
diff --git a/pkg/sql/opt/exec/execbuilder/testdata/vectorize_local b/pkg/sql/opt/exec/execbuilder/testdata/vectorize_local
index 9d84b87cdf04..8a403937f41c 100644
--- a/pkg/sql/opt/exec/execbuilder/testdata/vectorize_local
+++ b/pkg/sql/opt/exec/execbuilder/testdata/vectorize_local
@@ -60,7 +60,7 @@ regions: <hidden>
   table: a@a_pkey
   spans: FULL SCAN
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJyMkcFqGzEQhu99imFOLahY20MPOpUuLhjXdbGNL2EPsjQ4IrvSRpolNmYfKy-QJwsrxYcQDLntfPPvPz-_LpgeW1S4nf-d1zvQ8GezXoFGgT5Y-qc7SqjusMJGYB-DoZRCnNAlCxb2hEoKdL4feMKNQBMiobogO24JFe70oaUNaUtxJlGgJdauzbb6Vx9dp-MZBdahHTqfVD6-7fX0-R0FLvfAriMF8uU5ldkEz-TZBf9hFcNTgkjaKvghpKwKPZyZrrj6CUv3GwWu9nUNiakHEwbP8JVOPHOevymQOWgRED3cEnT6BB11IZ5Bt20wmskqkDC5HzSbe0oQBu4HVjDpc7grKPGaUWAhb-0l1kdCVY3i8w1vKPXBJ3pX7i1nOTYCyR6pvGIKQzT0PwaTz5Rxnf_LwFLisq3KsPBlNTbjl9cAAAD___Jpt8k=
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJyMkcFq4zAQhu_7FMOcdkFL5D3sQadlTQohTVOSkEsxRZGG1MSWXGlME4Ifqy_QJyuWmkMpgd483_z-5-fXGeNzgwrX09tpuQENN6vlAjQKdN7SnW4ponrAAiuBXfCGYvRhROckmNkjKimwdl3PI64EGh8I1Rm55oZQ4UbvGlqRthQmEgVaYl03yVb_04_dgU4osPRN37qo0u11p8fP3yhwvgWuW1Ig315jno13TI5r776sgn-JEEhbBX-ElEWmuxPTBRd_YV7_R4GLbVlCZOrA-N4x_KQjT2rHvxTIlDMLiA7XBK0-QkutDyfQTeONZrIKJIzuO83miSL4nrueFYz6FO4CcrxqEJjJR3mR9Z5QFYP4fsErip13kT51e81ZDpVAsnvKjxh9HwzdB2_SmTwu038JWIqct0UeZi6vhmr48R4AAP__2AW3Pg==
 
 query T
 EXPLAIN ANALYZE (DISTSQL) SELECT c.a FROM c JOIN d ON d.b = c.b
@@ -98,7 +98,7 @@ regions: <hidden>
       table: c@sec
       spans: FULL SCAN
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJysk89qGzEQxu99imFOLajOrg-lCAqmJgWnibc4IZeyB600pNvsarbSLLUxfqy-QJ-srJRAU5PSPzl-n-Yfvw_tMX7pUOPl6fnp8grszMC7TXUBFs6q1RocVGtwswbegJ01qNCzo7XpKaL-iCXWCofAlmLkMFn7VLByW9SFwtYPo0x2rdByINR7lFY6Qo1XpuloQ8ZROClQoSMxbZfG2kUkiwqX3I29jxqMgmn35WAm9RIVvr8GaXvSUHz_FrO27IW8tOyPngJ_jRDIOA3z7DQ7oXurfAVvUeHF9XIJUWgAy6MXeE5bOWm9vNBQpAtzAdHtYwW92UJPPYcdmK5ja4SchiJNb4zYTxSBRxlG0TDVp7PujTnWB4VZ3SGLYm4IdXlQf471jFt_R7V8SNUthtD2JuxQ4Tnz7TjAZ249sNewmLBU0xmLqSstSNQysKyjmK47YvtvMZTHMbx-ohRoS3Y83v8fAcz_JoANxYF9pAfwH5tcHGqF5G4o_53IY7D0IbBNa7KsUl8yHEXJr2UWK5-fpgN_bi5_2zz_pbk-PPsRAAD__9oeS58=
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJysk89qFEEQxu8-RVEnhTaZ2YNIg7C4RNiY7Mgm5CKD9HQXcdyZrnG6BndZ9rF8AZ9MujsB4xLx3_H7ur6q4lf0HsPnDjVenV2cLa7Bnhh4s64uwcJ5tVyBg2oF7qSBV2BPGlTo2dHK9BRQv8cSa4XDyJZC4DFa-1SwdFvUhcLWD5NEu1ZoeSTUe5RWOkKN16bpaE3G0XhaoEJHYtoutbXzQBYVLribeh80GAVx9tVgonqOCt_egLQ9aSi-fQ1ZW_ZCXlr2R08jfwkwknEaZtlpdkL3VvkCXqPCy5vFAoLQAJYnL_CUtnLaenmmoUgb5gKizWMFvdlCTz2POzBdx9YIOQ1F6t4YsR8pAE8yTKIh1qe17o0Z1geFWd0hC2JuCXV5UL-P9Zxbf0e1fEjVzd2HYUM7VHjBvJkG-MStB_Ya5pFKFbeYx1Dqn6BlXlkHMV13hPbvrlAeX-HlfzoCbclOx_P_gf_sT_ivKQzsAz1g_1jn4lArJHdL-esEnkZL70a2aUyWVcolw1GQ_FpmsfT5KS74Y7j8ZXj2U7g-PPkeAAD__yGeSxc=
 
 query T
 EXPLAIN (OPT, VERBOSE) SELECT c.a FROM c INNER MERGE JOIN d ON c.a = d.b
@@ -196,7 +196,7 @@ regions: <hidden>
       table: d@d_pkey
       spans: FULL SCAN
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJzkUsFqGzEQvfcrhjklRI1316EHQcDUuMVpbRcn5FJ8kKWps2RX2kiz1Mb4s_oD_bKyq4baTuLW0EOhN82b90Yzb2aN4aFAideDj4P-DehzBe-mkxFoGI7HgymMBtP3A7iaDMdgYDJuCZdgzuco0DpDY1VSQPkZU5wJrLzTFILzDbRuCUOzRJkIzG1VcwPPBGrnCeUaOeeCUOKNmhc0JWXIdxIUaIhVXrRldS-QRoF9V9SlDRIUCryuVPN8jQI_3ALnJUlIvn8LMdbOMlnOnX2S8u5rAE_KSMgiMl8xPULpG3iLAke3_T4Epgq0qy3DCS25k1s-lZC07UUC0f1LhFItoaTS-RWoonBaMRkJSVt9rljfUQBXc1WzhIbftvUIZDjbCIzRT78CqwWhTDfizz29dp7Jd9JdO3vpGQqkJen6qUGH2m5y4aEAprICk4d7qINa0F-YKjtmqu1LyXZHM73K56Xyq-1rmf-_19J90ddfdtbWeUOezI6Vs0b5O8ozyxmRX9CVyy35Tnd3OQV94ZNeenZ66fPFXXyiwEkzQi_9107y4piTnFKonA20b-GzlZPGNzILinsIrvaaPnmn229iOGl1LWAocMymMRjamGoa3BanB8XdHXG6L86OEGf74u5B8cVe27PNqx8BAAD__1-LFmQ=
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJzkUsFq20wQvv9PMcwpIfvHkhx6WAiYGrc4re1ih1yKKevdqSMs7Sq7I2pj_Fh9gT5ZkdRQy0ncGnoo9LbzzffNznwzWwwPGUqcDd4P-regLxW8mU5GoGE4Hg-mMBpM3w7gZjIcg4HJuCZcg7lcoEDrDI1VTgHlR4xxLrDwTlMIzlfQtiYMzRplJDC1RckVPBeonSeUW-SUM0KJt2qR0ZSUId-JUKAhVmlWl9W9QBoF9l1W5jZIUChwVqjq-T8KfHcHnOYkIfr2NTSxdpbJcursk5R3XwJ4UkZC0iCLDdMjFL-C1yhwdNfvQ2AqQLvSMpzRmjup5XMJUd1eQyBavUTI1Rpyyp3fgMoypxWTkRDV1ReK9T0FcCUXJUuo-HVbj0CC853AJvrhV2C1JJTxTvy-pzPnmXwnbtvZiy9QIK1Jl08NOtZ2lQsPGTDlBZg0rKAMakl_YKrklKn2LyVpj2Z65lOxos3-sSz-3WPpvmjrTzdL67whT6bl5LxS_oryzG5G5Jd041JLvtNt7yajz3zWiy_Or326vG-eKHBSjdCL_7aLvDrlIqcUCmcDHVr4bOWo8o3Mkpo9BFd6TR-80_U3TTipdTVgKHCTjZtgaJtU1eC-OD4q7rbE8aE4OUGcHIq7R8VXB23Pd_99DwAA__-MIRXc
 
 statement ok
 RESET vectorize; RESET distsql
diff --git a/pkg/sql/rowexec/processors_test.go b/pkg/sql/rowexec/processors_test.go
index 084ce814ec9f..8aadc9b7f3ef 100644
--- a/pkg/sql/rowexec/processors_test.go
+++ b/pkg/sql/rowexec/processors_test.go
@@ -746,17 +746,17 @@ func TestUncertaintyErrorIsReturned(t *testing.T) {
 	}{
 		{
 			query:           "SELECT * FROM t AS t1 JOIN t AS t2 ON t1.x = t2.x",
-			expectedPlanURL: "Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJzElGFr4kwQx98_n2IZeGh7rE12Y20NFFLaHE3P054Kd1DyIjVbDcRsbncDFvG7H0kET9GNufS8d447v5n_7H-yS5A_Y7Bh5Pbc-zGKkjeOPg8HX9GL--O5d-f10fmDNxqPvvUu0DrnU5mg0N0IKYKeBl5_HVA06CNFLhfoFil6ufDR90d36JZVe94XF509RMFUBHP7_zPAkPCQ9YM5k2C_AAEMFDBY4GNIBZ8wKbnIj5ZFohcuwDYxREmaqfxvH8OECwb2ElSkYgY2jIPXmA1ZEDJhmIAhZCqI4qK8clIRzQPxDhjueZzNE2mjBUZ5PEqDPGoZxAR_hYFnat1jU_r1Hc0COdsu6hDwVz4GqYIpA5us8J9ptU6vlR7UuqmTJVyETLBwq5Kfk1UpewZ-DOTsiUcJE0ZnW1rM3tS5Qy5uRTSdFb8AwyBTNnIIdih2LOy0d6bdTGI1mGSPzD5v8dTo7o68t3V7qzU53nBS23CDmC2DfuR-1pDb_idy6UG5J1jR67-3ovT4i6f1L56arQ9ckhpar06vlR7UeoINuTnNI7ZHxJDJlCeSHfVGmfkYLJyy8lokz8SEPQs-KdqU4aDgim8sZFKVp7QMvKQ8ygUeD3eawF09TGrIpvXgThO4q4fpLmz-Dlv6mS0tTMwt2tyl202M1sMVRuvhCqOvmhithyuM1sMVRneaGH3dxCo9XGGVHq6w6qaJVXq4wio9XGFVt5ZV_uq_XwEAAP__aLpPRw==",
+			expectedPlanURL: "Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJzElGFr2zwQx98_n0IcPLQdSm3JadoYCi6tR91lSZcUNihmuLGamDmWJ8mQEvLdh-1AlpDI8dxl73LR_e7-p_9ZC5A_Y7Bh5Pbc2ycUJa8cfRwOPqNn99tj78bro9M7b_Q0-tI7Q6ucD2WCQjcjpAh6GHj9VUDRoI8UOZ-ja6To-dxHX-_doVtW7XmfXHRyFwUTEczs_08AQ8JD1g9mTIL9DAQwUMBggY8hFXzMpOQiP1oUiV44B9vEECVppvK_fQxjLhjYC1CRihnY8BS8xGzIgpAJwwQMIVNBFBfllaO-pz_YG2C45XE2S6SN5hjl8SgN8qhlEBP8JQaeqVWLdeWXNzQN5HSzpkPAX_oYpAomDGyyxH8m1Tq6VLpX6rpOlnARMsHCjUp-Tlal7Jj3PpDTBx4lTBidTWkxe1WnDjm7FtFkWvwCDINM2cgh2KHYsbDT3pp2PYnVYJIdMvu8xVOjuz3yztbtjdbkcL9JXb8NYrYM-p7bWUNt-1-opXvVHmFBL__egtLD753Wvndqtt5xRWpIvTi6VLpX6hH24-o4D9gOEUMmU55IdtD7ZOZjsHDCymuRPBNj9ij4uGhThoOCK76wkElVntIy8JLyKBd4ONxpAnf1MKkhm9aDO03grh6m27D5O2zpZ7a0MDE3aHObbjcxWg9XGK2HK4y-aGK0Hq4wWg9XGN1pYvRlE6v0cIVVerjCqqsmVunhCqv0cIVV3VpW-cv_fgUAAP__x69Mdw==",
 		},
 		{
 			query:           "SELECT * FROM t AS t1 INNER LOOKUP JOIN t AS t2 ON t1.x = t2.y",
-			expectedPlanURL: "Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJy8lOGK2kAQgP_3KYaBcm1Zz-xG7zRQyHGX0tyliVVLC0c4UrOVtJpNNxtQxHcvSYRTq3uxBf85O_M5nzuzrjD_PUMLR47n3I4hSX8I-DAMPsGj823g3bg-vLlzR-PRZ-8tbGre1QUKbkagKLi-7wzBC4KHLwO4D1x_k2EQ-KDo5QLeg2KXyxC-fnSGTt3Ccx8cuLhLoqmM5tbrCySYipj70ZznaD0iRYIMCZoYEsykmPA8F7JMrapCN16gZRBM0qxQ5XFIcCIkR2uFKlEzjhaOo-8zPuRRzGXbQIIxV1Eyq75e2ZlM5pFcIsFbMSvmaW7BgkAZj7KojFptamC4JigK9dwjV9GUo0XXpLnHvUjSjYa5r6Gelk9JvECCnhC_igx-iiQFkVpgl1cQFKr8RGxG7A6xu0eF2D8KXR2_l7-EOntCXWKbR4XMo0LPHkUqZMwlj3ckwvUBZV-0RNbu7xUebt3ZaU2bLwk9eUna1Gi1WdM9eUFlayyd8-xJc6Hr8-wJaz4sdvqwmNFqOKkXPLYupnueSTUX6p3_RR8QGvI8E2nOGz1Yo3zxPJ7y-u8hF4Wc8IEUk6pNHQYVVx3EPFd1ltaBm9apUnAbplqY6WGmhc0dmO7Dpl7b0LfuaOmuHu5q4Ss9fPU_P_paC_f0nXtauK-H-ydph-tXfwIAAP__lFXgiA==",
+			expectedPlanURL: "Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJy8lHFr2kAUwP_fp3g8GN3GWXMXtRoYpLQZS5slTh0blFAyc5OsmstyF1DE7z5ihKrVa9zA_3z33s_38947lyj_TNHCoeM5NyNI0l8CPg2CL_Dg_Oh7164P727d4Wj41XsPm5oPVYGC6yEoCq7vOwPwguD-Wx_uAtffZBgEPih6OYePoNjlIoTvn52BU7Xw3HsHLm6TaJJHM-vtBRJMRcz9aMYlWg9IkSBDgiaGBLNcjLmUIi9Ty3WhG8_RMggmaVao8jgkOBY5R2uJKlFTjhaOop9TPuBRzPOmgQRjrqJkuv56ZavH7IkvkOCNmBazVFowJ1DGwywqo0aTGhiuCIpCPbeQKppwtOiK1Ne4E0m6sTBfWiwek3iOBD0hnooMfoskBZFaYJc3EBSq_ERsRuwWsdtHhdg_CnWOXssLn9aeT5vY5lEf86jPs0aRijzmOY93HMLVAWNfNETW7O0VHm7d2mlN668IPXVFmtRoNFndLXnFZGsorfNsSX2hq7NsCas_KnbyqJjRqDmnVzS2rqV9njnVF-qe_TUf8BlwmYlU8lqP1ShfO48nvPprkKLIx7yfi_G6TRUGa259EHOpqiytAjetUqXgNky1MNPDTAubOzDdh029tqFv3dLSbT3c1sIdPdz5nx99pYW7-s5dLdzTw72TtMPVm78BAAD__7d_3bg=",
 		},
 		{
 			// This test reproduces 51458 and should be enabled once that issue is
 			// fixed.
 			query:           "SELECT * FROM t JOIN onerow ON t.x = onerow.x",
-			expectedPlanURL: "Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJy8lFFr2z4Uxd__n0Jc-NN2KLXlpM0wFDxaj7rLki4JbFD8oMa3icGxPElmKSHffdgOpA6pHeMub7mRflfnnGtpDep3BDZM3IF7OyVh_CLI1_HoO3lyfz0OvnhDcn7nTaaTH4MLst3zqdigycPIGxIRoxR_yGhI9OWK3Gzry5VPft67Y7foOPC-ueTsLuRzyZf2_2dAIRYBDvkSFdhPwICCBRS64FNIpJihUkJmS-t8oxeswDYphHGS6uxvn8JMSAR7DTrUEYINU_4c4Rh5gNIwgUKAmodR3l47iQyXXL4ChVsRpctY2WRFSVZPEp5VHYOZ4G8oiFRvz9i1fn4lC64W5aYOA3_jU1CazxFstqHvaN31SWMhA5QYlDr5GVm35YDhe64WDyKMURq9srQIX_S5wy5uZDhf5L-AwijVNnEYdSzqdPes7mx0W9g4oHEoOiIx-vt-Dx7dKx3Njp82azxtg5kdw_rIgbPTDvzqHw3cOj51q3nqltn5wMgbaO2W2xZv1EHBb16EVlKtd6We4Ou4PsFzcEDBGFUiYoVH3XYz84DBHItMlEjlDB-lmOXHFOUo5_LLFaDSxeq28OJiKRN4PNxrA_erYbYPm29hqxq2KuHPJdjch7ttAquGawKrhmsC67UJ7KqN52q4xnM1XOP5uoFsqxncawP3q-F-o1H5m__-BgAA__9XFGO8",
+			expectedPlanURL: "Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJy8lPFr2kAUx3_fX3E8GG3H2eSirSNQyGgzms5pp8IGJYyredWwmMvuLswi_u8jiWDjbDSk8yd93n3efb_f590S1O8IbBi5Pfd6TML4SZDPw8FX8uD-uO998vrk9MYbjUffemdkvedDsUGTu4HXJyJGKf6QQZ_o8wW5WtfnC598v3WHbtGx531xyclNyKeSz-33J0AhFgH2-RwV2A_AgIIFFNrgU0ikmKBSQmZLy3yjFyzANimEcZLq7GefwkRIBHsJOtQRgg1j_hjhEHmA0jCBQoCah1HeXjv6Z_ILn4HCtYjSeaxssqAkq0cJz6qWwUzwVxREqtdHbDo_PpMZV7NyT4eBv_IpKM2nCDZb0VekbvqksZABSgxKnfyM3Ldlh99brmZ3IoxRGp2ytAif9KnDzq5kOJ3l34DCINU2cRh1LOq0t6xubLQb2NihsS9aIjG62353Ht0pHc0OHzarO2yDmS3Dest5s-PO--I_zds6PHSrduiW2XrDxGtIbZfbFg-UU3z8K_rFm9BIrvWq3CP8QS6P8CDsUDBElYhY4UH33cw8YDDFIhMlUjnBeykm-TFFOci5_H4FqHSxui68uFjKBB4Od5rA3WqYbcPmS9iqhq1K-GMJNrfhdpPAquE9gVXDewLrNAnsoonnaniP52p4j-fLGrKtenCnCdythru1RuWv3v0NAAD__2MQZAI=",
 			overrideErrorOrigin: []errorOriginSpec{
 				{
 					nodeIdx:    0,