From 2b55199d2613911e2c46dcd17153675af8b4f707 Mon Sep 17 00:00:00 2001
From: Yahor Yuzefovich <yahor@cockroachlabs.com>
Date: Sat, 20 Jul 2024 13:26:59 -0700
Subject: [PATCH 1/2] sql: include MaxTimestampAge info for TableReader in
 DistSQL diagrams

This commit includes `MaxTimestampAge` field of the `TableReaderSpec`
into the DistSQL diagram. This feature is used by the table stats
collection to utilize the inconsistent scan, and it'll be easier to
confirm that it's actually used under the hood.

Release note: None
---
 pkg/sql/execinfrapb/flow_diagram.go           |  7 +++++++
 .../exec/execbuilder/testdata/distsql_misc    | 20 +++++++++----------
 2 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/pkg/sql/execinfrapb/flow_diagram.go b/pkg/sql/execinfrapb/flow_diagram.go
index 73c6650e72ce..5dfef032879c 100644
--- a/pkg/sql/execinfrapb/flow_diagram.go
+++ b/pkg/sql/execinfrapb/flow_diagram.go
@@ -21,6 +21,7 @@ import (
 	"sort"
 	"strconv"
 	"strings"
+	"time"
 
 	"github.com/cockroachdb/cockroach/pkg/base"
 	"github.com/cockroachdb/cockroach/pkg/sql/catalog/catalogkeys"
@@ -179,6 +180,12 @@ func (tr *TableReaderSpec) summary() (string, []string) {
 		details = append(details, spanStr.String())
 	}
 
+	if tr.MaxTimestampAgeNanos != 0 {
+		details = append(details, fmt.Sprintf(
+			"Inconsistent scan (max ts age %s)", time.Duration(tr.MaxTimestampAgeNanos),
+		))
+	}
+
 	return "TableReader", details
 }
 
diff --git a/pkg/sql/opt/exec/execbuilder/testdata/distsql_misc b/pkg/sql/opt/exec/execbuilder/testdata/distsql_misc
index 8b473591e91a..52f20dd7ef63 100644
--- a/pkg/sql/opt/exec/execbuilder/testdata/distsql_misc
+++ b/pkg/sql/opt/exec/execbuilder/testdata/distsql_misc
@@ -92,7 +92,7 @@ vectorized: false
 ·
 • create statistics
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJy0lV1ro0oYx-_Ppxiem7YwoqPmzauGNuUITdKTEc4uSyjT-DSVGic7M9Ltlnz3xWSzrW6VRIgXoqP-nt_858U30N9TCGD05e52GE7I-XXII_7f7QW5mo2G0YjwaBiFPAqvONGMTCdEkJvZdExiYQT5P4z-JdO7KJxOOBlyMr0h_CuPRmMSheMRObNYrs-AQiZjnIgVagi-AQMKLlDwgIIPFDowp7BWcoFaS1W88rb9IIx_QOBQSLJ1bormOYWFVAjBG5jEpAgBROIhxRmKGJXtAIUYjUjSbZlC8LI43a-f8RUoXMk0X2U6IAIo8LUoLi2bEZHFhBFpnlDBfENB5ua9oDZiiRCwD4bhNQTOhh4uycVqnaKyO2XBXTNPfmJAmOM4hT83wgTkktWKuBWRTq3Ie_08kypGhXGp_nxTqzpcLhUuhZHKZs7h0uTcdRzykC-e0eiL2i54lS6wcpjs8BFnLUbcZpbtthpzdozmfsy7JxjzbknEPTwvt01ermV7rfJyj9Hc59U7QV69koh3eF5em7w8y_Zb5eUdo7nPq3-CvPolEf_wvPw2efmW3WmVl3-M5j6vwQnyGhzzM5ihXstMY2Uv_rySU6lksWLTxniJux1ey1wt8E7Jxfbd3e10C9o2xKjN7inb3YTZ_pE2CsXqz7_sI4k1ktwSiX0kdaokt9npGCmvEeXXk1iV5LftXrdK6jSSuvVObpXUbevUq5J6jaR-vZNXJfXbOvWrpEHzNHDqpfy_5mbzNG-wGhRL5zGVL_dJDAE4vw_rk9P-gOIDsdTF-uVP8mWLjV7Xxep7FKlGCmPxjNdoUK2SLNEmWUBgVI6bzT-_AgAA___I8qX8
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJy0lV9vozgUxd_3U1j3pa1kBAbyj6dGbapFapJujLS7GkWVC7cpKsEZ26jtVPnuI5LJtGEalCDBAwKDz_2do2vdd9DfMwhg9N_d7TCckPPrkEf8n9sLcjUbDaMR4dEwCnkUXnGiGZlOiCA3s-mYJMII8m8Y_U2md1E4nXAy5GR6Q_j_PBqNSRSOR-TMYoU-Awq5THAilqgh-AYMKLhAwQMKPlDowJzCSskYtZaq_OV9syFMXiFwKKT5qjDl8pxCLBVC8A4mNRlCAJF4yHCGIkFlO0AhQSPSbFOmBLwsb_erZ3wDClcyK5a5DogACnwlykfLZkTkCWFEmidUQCHMY5nrVBvMDdGxyMn5UrwSo4lYIOksHX0B8zUFWZgPLG3EAiFgn3yE1xA4a3q8FS6WqwyV3dm3sV3m6Q8MCHMcp3TJjTABuWQHQdwKSOcgyEf9IpcqQYXJXv35-iDqcLFQuBBGKps5x0OTc9dxyEMRP6OpydKrWGD7YbLj-4I16AubWbbbYmewU8zsOqPbQmd090Dc41N1m6TqWrbXYqruKWZ2qfZaSLW3B-Idn6rXJFXPsv0WU_VOMbNLtd9Cqv09EP_4VP0mqfqW3WkxVf8UM7tUBy2kOjhlSM1Qr2SusTIjvq7kVCpZrBwmmCxwO3m0LFSMd0rGm3-3r9ON0GYhQW22X9n2Jcx3n7RRKJa_Z-xnJVar5O4psc9KnaqSW890CpRXK-UfVmJVJb-pvW5VqVOr1D3M5FaVuk2ZelWlXq1S_zCTV1XqN2XqV5UG9W3gHIby_-jN-javoRqUR-cxky_3aQIBOL8u64vb7oJyg1jo8vzyJ_mykY3eVuXpexSZRgpj8YzXaFAt0zzVJo0hMKrA9fqvnwEAAP__bD7lOg==
 
 statement ok
 INSERT INTO data SELECT a, b, c::FLOAT, 1
@@ -116,7 +116,7 @@ quality of service: regular
 ·
 • create statistics
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJzsllFvm0gQx9_vU4zmpa2EA7tgx-GpOTfVWZXjyKCeTqeo2sDURcYst7sozUX-WPcF7pOdgHKxqXFNJFd9qB-Qd3eY-f-Z3672EfVfKfo4WVxdhlcQhJfhNAinkwA0g_k1CHi7mM8gFkbA79PwN5jfhNP5dQCXAczfQvBHEF7NIJzOruDFgBX6BVqYyZiuxZo0-n8iQws5WuiihR5aOMRbC3MlI9JaqjLksXphGn9G37EwyfLClNO3FkZSEfqPaBKTEvoYiruUFiRiUraDFsZkRJJWZUqBr8vHh3xFD2jhRKbFOtM-CLQwyEX5d2AzEFkMDKT5RAotfPceyuLah4zVQ0XLRJbBhrSpp0yyJh-cf__R9TiSmaHMJDL7aknJew0xRTKm2AfmOPX03YMhDYpE7MPYceDXenq5uJlAJNJUb8XmIlFNLK8mZ-8nE9CGcohkkRl4SZ-NnWTmlQ-O_RRAtOoKqGTJwuSFqSvdbiysx18-tTZiSeizrd5M36DvbKzj2xOIdZ6Ssoe7ramng-RvqmpXlgIjjA-vWacQ3hIy7BTyVL_IpIpJUbxT_3bTKfVyuVS0FEYqmznHi4aX3HHgrohWZPSrTgtuywLb_ZjseNbZM1i32cDm35V2vo92djaCd8ke3vk-3r1T8M578M76tKjhfXQC3kc7QvjxrPDnsMIHtvuTlZ6s8D4talg5PwEr5ztC3ONZcZ_DijuwvZ-s9GTF7dOihpXxCVgZ7wjxjmfFew4r3sAefldW3H2s8DN3PyvuPlZGp2DF7cGK16dFDSsXJ2Dlos_lb0E6l5mm1t1rfyWnVWnAyksaxUuqb3RaFiqiGyWjKrYezqtE1URM2tSrrB5Ms2ZJG0Vi_f_ddTsTO5iJ72Ri25mG7Uz8sKY-otyDqbzuTKydyetrT1RdwYzMvVSreidpyqqjrdybzUK9l-qVp3O3WV2T1mL5FFCSvq1z1NY5PKhz1O2YtzONfkzH522d5wd1jrsdu-1M4x_T8bit8-LwBnG6LXtf7drDB0Avz26nZ37mfcPzsOX5ojyyPqby_kMSo4_Ol99gz6P5YfmCWOry3Aw-yftKdPiQl6feR5FqsnAmVvSGDKl1kiXaJBH6RhW02fzyXwAAAP__uLCbxQ==
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJzsVtFuo8gSfb9fUaqXSSQcaMCOw9PkejJaa5Q4MmhWq1U06kANg4y72e5GSTbyZ-0P7JetgPHGZozXRLKUh-EBuauLqnNc57T6GfUfOQY4mV9dRlcQRpfRNIymkxA0g9kNcPg4n11Dwg2HX6fRLzC7jaazmxAuQ5h9hPC3MLq6hmh6fQXvBqzU79BCIRO64UvSGPyODC100UIPLfTRwiHeWVgoGZPWUlUpz_UH0-QRA8fCTBSlqcJ3FsZSEQbPaDKTEwYY8fuc5sQTUraDFiZkeJbXbSqA76vXl2JBT2jhROblUugAOFoYFrz6ObAZcJEAA2m-kUILpyKWQmfakDCgYy7gZMkfwWjgKcFw6ehTtPDTZ6gg6gAEa5aK0kxWJQ1p04RMtqQAnL__0s06lqKqmknxw5aSDxoSimVCSQDMcZrw_ZMhDYp4EsDYceD_TTid304g5nmuN3ILnql1rlsHrz9PJqANFRDLUhg4oUdjZ8KcBuDYLwlEi66EGpYsTVGaptPdysJm_X0g2vCUMGAbE5x-wMBZWYcPMeTLIidlD7cH2ITD7E-qe9eUQsNNAO9ZJxC3BWTYCeSlfymkSkhRstX_btUJ9TJNFaXcSGUz53DQcOI6DtyX8YKMPu2k4LUosO0_kx3uCPYKR9hsYLtv0BPuLk-wsxF8yna4wt3lCv8YrnB7uIL1GeTaFaMjuGK0BcQ9XFHuaxTlDmzvp6KOoii3zyDXijo_gqLOt4B4hyvKe42ivIHt_1TUURTl9RnkWlHjIyhqvAXEP1xR_msU5Q_s4RtUlLdLUe6Zt1tR3i5FjY6hKK-Hovw-g1wr6uIIirrocymdky6k0NS6E-7u5LQ6DVh1eaQkpeamqWWpYrpVMq5zm-WsLlQHEtKm2WXNYirWW9oo4st_79SbldjeSu5WJbZZadiu5O7H1AeUt7eU312JtSv5fenxeiooyDxItWicpEnUB2DlzfVG46Vm5-V0Xu8uSWueviRUSt_EOWrjHO7FOepm7LYrjd4m4_M2zvO9OMfdjL12pfHbZDxu47zYbxCnm7L_g2v3HwC9OHudnN0z_z84D1ucL6oj62suH75kCQbofH8GO17rB6sPeKqrczP8Jh9q0NFTUZ16X3muycJrvqAPZEgtM5Fpk8UYGFXSavW_fwIAAP__4lPbAw==
 
 query T retry
 EXPLAIN (DISTSQL, TYPES) SELECT * FROM data
@@ -157,7 +157,7 @@ quality of service: regular
 ·
 • create statistics
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJzsV9Fu27gSfb9fQcxLW1w6EiXZcfiUrJtijSJxYAldLBZGwUhTV7AsakkKaTbwZ-0P7JctJNVrSbFcC0GABKgfBHFmNJwzc3gMPoD-MwEOk_nlRXBJ_OAimPrBdOITzciH-eyKRMII8ts0-JXMboLp7NonFz6ZfSD-735weUWC6dUleTNguX4DFFIZ4bVYowb-BzCg4AAFFyh4QGEICwqZkiFqLVUR8lB-MI2-AbcpxGmWm8K8oBBKhcAfwMQmQeAQiNsE5ygiVJYNFCI0Ik7KbYoCz4vH52yF90BhIpN8nWpOBCW3lISUREDBz0RhG1iMiDQijEjzFRVQmGMaoeLknFFy7lBy7lJy7hXv_2ec8-l1MAYKHz-RolbNScqqpcJlLIuUBrWpTCZeIyf2P3_rah3K1GBqYpk-cil5p0mEoYww4oTZdmW-vTeoiUIRcTK2bfJLZV7ObyYkFEmia7GZiNU21imNV58mE6INZiSUeWrIW_xmrDg17zixrV0A4qoroCxL5ibLTbXTYkOhWn-fjDZiicBZbZTT98DtDT1-mr5YZwkqa9icZGX247-w3LuE5BthitnsXp2aldZXbtNB6wbvkY_WbcNOnE4L57AT5w5enkoVocKoAW-x6ezExXKpcCmMVBazj-8JeevYNrnNwxUa_a7WoS5Hq1-Hwprd-0Fks5et4K7Ouq3OsiaF2PGCwJ4iCBYbWM4LlARnnySwkxH5GO8RBWefKHjPIQpOD1FgfSa6FYXR6xOFUQOnczxznScx1xlY7k_mPgtznT4T3TL39PUx97SB0z2eue6TmOsOLO8nc5-FuW6fiW6ZO359zB03cHrHM9d7EnO9gTV8gcx19zHXOXH3M9fdx9zRczDX7cFcr89Et8w9e33MPetzVZqjzmSqsXWV2L-T3dppwIo7B0ZLrC4oWuYqxBslwzK2Ws7KRKUhQm0qL6sW03Tr0kahWP9306tnYgczOY1MrJ5p2M7kHK6pT1HuwVRedybWzuT1hSfKqUCK5k6qVXVQNaaljhdKsHVUR7Xy7P5ktt41ai2WuwDbg0W9zlG7zuHBOkfdiJ12ptHLRHzarvP0YJ3jbsRuO9P4ZSIet-s8O3xA7G7I3qNTe1gAemF2OzE7J94PMA9bmM8KyfqSyLvPcQQc7O-_wZ7H9gfFB2KpC930v8q7sujgPitU74tINFK4Eit8jwbVOk5jbeIQuFE5bjb_-zcAAP__fmlu9A==
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJzsV-9u2zYQ_76nONyXphgdiZLsOPqUzE0xo8gfWEKHYQgKRrq6QmzSI2kkWZDH2gvsyQZJVW0plmshKFoD9QdBvDsd73f348_gI5q_ZxjiaHJ2Gp9BFJ_G4ygejyIwHN5OLs8hFVbAH-P4d7i8iseXFxGcRnD5FqI_o_jsHOLx-Rm86vGleYUMpUrpQszJYPgXcmToIUMfGQbIsI_XDBdaJWSM0nnIY_HBOL3H0GWYycXS5uZrhonShOEj2szOCEOMxc2MJiRS0o6LDFOyIpsV2-QFnuSPD4tbekCGIzVbzqUJQTC4YZAwSJFhtBC5redwEDIFDsp-Io0MxzJR0mTGkrRgEiHhYC7uwRoQU4L-3DWvkeGEZEo6hBPO4MRjcOIzOAny9195GIbji3iIDN-9hxyRCUHycqlpmql8Y0vGliabzSkE979_TblOlMz3zpR85tLqzkBKiUopDYG7bmm-ebBkQJNIQxi6LvxWmqeTqxEkYjYza7ELkekq1iuM5-9HIzCWFpCopbRwQPfWyaR9HYLrrAKIbtsCirLU0i6Wttzp-olhuf48P2PFlDDkawMfv8HQfWK7zzwS88WMtNOvz7s0R9k_VOxdQIqssPlsVq_empWtr_y6g60bgmc-tm7rt-L0Gjj7rThX8JZS6ZQ0pTV410-tnTidTjVNhVXa4e7uPYEDz3XhZpncki2oXHWozdHo17aweve-ElnvZSO4rbN-o7O8TiG-u2zwl8iGw3uOt7fC4W0SDn44gHfZBunwNklH8C2kw-sgHbzL3CvpGOyfdAxqOL3d-e29iN9ez_F_8vs78tvrMveK30f7x--jGk5_d377L-K333OCn_z-jvz2u8y94vdw__g9rOEMdud38CJ-Bz2nv7f89jfx2zv0N_Pb38Tvwbfgt9-B30GXuVf8Pt4_fh93ucJNyCyUNNS44mzeyW3s1OP5XYjSKZUXJ6OWOqErrZIitlxeFokKQ0rGll5eLsaychmrScy_3EDXM_GtmbxaJr6eqd_M5G2vqUtR_tZUQXsm3swUdIUniqmgJHun9G15UA3JQu1zJagc5VEtPau_oso7J2PEdBXgBni9XuegWWd_a52DdsReM9Pgx0R81KzzaGudw3bEfjPT8MdEPGzWebz9gLjtkINnp3a7AHTC7Ldi9g6Dr2DuNzAf55L1cabuPmQphuh-_vU2PKof5h-Iqcl1M_qk7oqi44dFrnofxcwQw3NxS2_Ikp5nMjM2SzC0eklPT7_8HwAA__-heK4y
 
 query T
 EXPLAIN ANALYZE (DISTSQL) CREATE STATISTICS s1 ON c, e, a FROM data
@@ -177,7 +177,7 @@ quality of service: regular
 ·
 • create statistics
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJzsV9Fu2zYUfd9XXNyXbhhdiZLsOHxy5qaYUTgOLKHDMBgFI926QmRRI2mkWeDP2g_sywZJcWurtmEFcZGH6kEAL68Oz9U9hyAf0PydocDh9PIiuoQwuohGYTQahmA4TK4gZkAMJLydTsaQSCvhj1H0O0yuo9HkKoSLECZvIfwzjC7HEI3Gl_Cqw5fmFTLMVUJXckEGxV_IkaGHDH1kGCDDLs4YFlrFZIzSZcpD9cEo-YzCZZjmxdKW4RnDWGlC8YA2tRmhwEjeZDQlmZB2XGSYkJVpVi1TEhyUrw_FLd0jw6HKlovcCJCsLOUGGYaFLAMdh4PME-Cg7CfSyHBKeUJawIAzGHgMBv6vXAgxuor6yPDdeygJGgE5r4ea5qkqoSwZW4dsuiAB7n__mnocq9xSblOVfzOl1Z2BhGKVUCKAu24dvrm3ZECTTAT0XRd-q8Pz6fUQYpllZiO3kKle53pVcPx-OARjqYBYLXMLP9Nn66S5_UWA63xNILrdl1DRUktbLG290mzFsB4_tsNYOScUfKN_ozco3BU7voWhXBQZaae73b46HKb_lH-qbJWVturHwGMDfy8Vr0Glu5fKVwbLXOmENCVbDGarvWQv5nNNc2mVdrj7LLT9Bm2-_Qv58S7gT3aBwzuO94J84O3yAX_dg3fpDid4u5wQnMIJXgsn8DZtXDuhdxIn9LaoeMcrynu6oryO4_9Q1LMqymvTxrWizk6iqLMtKv7xivKfrii_4wQ_FPWsivLbtHGtqP5JFNXfohIcr6jg6YoKOk73BSnK36Uo77W_W1H-LkX1TqEov4WigjZtXCvq_CSKOm9zFJ2SKVRuqHEO3L2S21ipw8sDIyVzqk-XRi11TNdaxVVuPZxUQFUgIWPrWV4PRvl6ylhNcvHlJL2JxA8ieVtIfBOp20TyDnNqQ8o_CBXsR-JNpKBtebLqCuZk75S-rb1kKC8vLOW98zFce6mO96t71HpmQcbI-ZdJF2eb_HpNft2D_Hr7K_WaSL2XVelZk9_ZQX79_ZX6TaT-y6q03-R3ftgI7v5Sg2_cedjo373W83JL-pipuw9pggLdx6ez47V-sPxAzk25L4af1F1FNrovyl3to8wMMRzLW3pDlvQizVNj0xiF1UtarX76PwAA__-ouL_O
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJzsV1Fu20YQ_e8pBvOTBF2FXJKSZX7JVRyUCGwFIpGiKIxgTU4YwtQuu7uC7Ro6Vi_QkxUkrURiJEEyqiYBwg8COzucecP3HrF8QPNniSGOp-dnyTnEyVkSxUk0jsFwmFxCyoAYCHg9nVxAJqyA36LkV5i8TaLJZQxnMUxeQ_x7nJxfQBJdnMOzHp-bZ8hQqowuxYwMhn8gR4YeMvSRYYAM-3jFsNIqJWOUrlMemgei7A5Dl2Ehq7mtw1cMU6UJwwe0hS0JQ0zEdUlTEhlpx0WGGVlRlE2bGuCovr2vbugeGY5VOZ9JE4Jg9SjXyDCuRB3oORyEzICDsh9JI8NIpkqawliSFkwqJDyfiTuwBkRO0J-55gUynJLMSIcw4gxGHoOR_zMPwzC6TIbI8M07qMcwIUjeLjXlhaobWjK2DdliRiG4__xt2nWqZN2zUPKLLa1uDWSUqoyyELjrtuHre0sGNIkshKHrwi9tOJ--HUMqytKs5Fai0MtcrwlevBuPwViqIFVzaeE53VmnkPZFCK7zOYHoZltCA0vNbTW3baerBcN2_UiasSInDPkKy9ErDN0F25_oWMyqkrTTXye5DcfFX_Wbqgm1wjZ8jDw28rdC8TpQ-luhfEYwl0pnpClbQ3C12Ar2LM815cIq7XD3P4Htd2Dz9VfI9_cKf7JXHN5zvO_OLd4mt_CXA3hTbPCLt8kvwTH84h3gF34I2Uu_DI7il8EaFG9_3XlP153Xc_wfuvsKuvMOIXupu5Oj6O5kDYq_v-78p-vO7znBD919Bd35h5C91N3wKLobrkEJ9tdd8HTdBT2n_93pzt-kO--lv1l3_ibdDY6hO_8A3QWHkL3U3elRdHd6yBF5SqZS0lDnfLq5k9vp1OP1QZaynNpTr1FzndJbrdImt11OmkJNICNj213eLiK53DJWk5h9OuGvVuI7K3lrlfhqpX63krcb0yGg_J2lgu2VeLdScOh4omEFJdlbpW9aLxmS9Y9U_df8GG691MaHzf_dcmdGxoj806aLV6v4Bl18_Z34Btsn9bqVBt_WpCddfCc78Q23T-p3Kw2_rUmHXXynu43gbh81-MKdu43-v896Wn-SPpTq9n2RYYju49XbcFteWD8gclN_F-OP6rYBm9xX9VftgygNMbwQN_SKLOlZIQtjixRDq-e0WPz0bwAAAP__cWn_DA==
 
 query T
 EXPLAIN ANALYZE (DISTSQL) CREATE STATISTICS s1 ON e FROM data
@@ -197,7 +197,7 @@ quality of service: regular
 ·
 • create statistics
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJzsVtFu2zYUfd9XEPelLSZXoiQ7Dp-auSkmFI4DS-gwDEHBSLeqYJnUSAppFviz9gP7skFStdiq5VlBDeShehDMy6t7z_E9h-AD6D9zYDBbXl5ElySMLqIgjIJZSDQliyuC5N1yMScJN5z8FkS_ksV1FCyuQnIRksU7Ev4eRpdzEgXzS_JiREv9AiwQMsErvkYN7A-gYIELFnhggQ8WjOHGgkLJGLWWqkp5qD8Iki_AHAsyUZSmCt9YEEuFwB7AZCZHYBDx2xyXyBNUtgMWJGh4ltdtKoBvqtfHYoX3YMFM5uVaaEZuwYKw4NXPkU0JFwmhRJrPqMCCJYoEFSNv6M-UMRZcRVOw4P0HUkHSjAjaLBWmmaxKGNSmCZlsjYw4__ytm3UshUFhMim-2VLyTpMEY5lgwgh1nCZ8e29QE4U8YWTqOOSXJpwur2ck5nmut3ILnqk2162D8w-zGdEGCxLLUhjyEr8YOxPmFSOO_ZiAuOpLqGHJ0hSlaTrdbCxo1l8HoA1PERjdmljwFpizsY4fWsjXRY7KHu8OrAmH2V9Y964phYabaha9QNwOkHEvkMf-pZAqQYXJTv-bTS_UizRVmHIjlU2d40GTl67jkNsyXqHRr3opeB0KdPfPpMc7gD7BATYd2e4z8IC7zwP09YS8z_a4wN3nAv8ULnAHuIAOGVzrgskJXDDZAeIeryD3KQpyR7b3Q0HfRUHukMG1Cjo7gYLOdoB4xyvIe4qCvJHt_1DQd1GQN2RwrYKmJ1DQdAeIf7yC_KcoyB_Z42egIG-fgtzX3n4FefsUNDmFgrwBCvKHDK5V0PkJFHQ-5FK5RF1IobFzp9vfyel0GtHq8odJis1NUctSxXitZFznNstFXagOJKhNs0ubRSDaLW0U8vV_d-LtSvRgJXenEt2uNO5Wcg9jGgLKO1jK769Eu5X8ofR4PRUQaO6kWjVO0ijqA6_yZrvReKnZeTyN2901as3Tx4RK6ds4J12c44M4J_2M3W6lyfNkfNbFeXYQ57SfsdetNH2ejKddnOeHDeL0U_a_ce3hA2AQZ6-Xs_va_x_O4w7n8-rI-pTLu49ZAgycr89oz6t9oPqAp7o6N8PP8q4GHd0X1an3iecaLZjzFb5Fg2qdiUybLAZmVImbzU__BgAA__8olLi2
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJzsVuFum0gQ_n9PMZo_TXQ4sIAdh1_NuakOVYkjg3o6naJqA1OKgne53UVJLspj3Qvck52A-hJT4zORXLVS-YG8s8PM93m-b7UPqP8sMMDZ4uw0PoMoPo3DKA5nEWgG8wsgeLuYn0PKDYffwvhXmF_G4fwigtMI5m8h-j2Kz84hDs_P4NWIVfoVWihkShd8SRqDP5ChhS5a6KGFPlo4xisLSyUT0lqqOuWh-SBM7zBwLMxFWZk6fGVhIhVh8IAmNwVhgDG_LmhBPCVlO2hhSobnRdOmBvi6fn0ob-geLZzJoloKHcA1WhiVvP45shlwkQIDaT6RQgtDkUihc21IGNAJF3Cw5HdgNPCMYLx09CFauCCRkgrgNfuZBUEQXsRTtPDde6iB6wAEa5eKslzWjQxp04ZMvqQAnH_-1u06kaLulUvxxZaStxpSSmRKaQDMcdrw9b0hDYp4GsDUceCXNpwtLmeQ8KLQz3JLnqtVrtsEz9_PZqANlZDIShg4oDtj58IcBuDYTwlEN30JDSxZmbIybaerRwvb9ecxacMzwoA9m2v4BgPn0dp9tBFflgUpe7w-1jYc5X9R07uhFBlu6ln0AnE7QMa9QJ76V0KqlBSla_2vHnuhnmaZoowbqWzm7A4aDlzHgesquSGjD3speB0KbP3PZLv7hL3AJzYb2e534xR3k1PY0QTe5Ru84m7yir8Pr7gDvMKGjHfllckevDJZA-LurjP3JTpzR7b3Q2dfUWfukPGudHa8B50drwHxdteZ9xKdeSPb_6Gzr6gzb8h4Vzqb7kFn0zUg_u4681-iM39kj78bnXmbdOYeeZt15m3S2WQfOvMG6MwfMt6Vzk72oLOTIZfdBelSCk2du-bmTk6n04jVl1JKM2pvsFpWKqFLJZMmt13Om0JNICVt2l3WLkKx2tJGEV_-d1d_XoltreSuVWLPK427ldztmIaA8raW8vsrsW4lfyg93kwFBZlbqW5aJ2kSzbFYe3O10Xqp3Xk6s1e7S9KaZ08JtdKf45x0cY634pz0M3a7lSbfJuPjLs7jrTin_Yy9bqXpt8l42sV5st0gTj9l_wvXbj8ABnH2ejm7R_7_cB53OJ_UR9bHQt5-yFMM0Pn8jDa8Vg_WH_BM1-dm9EneNqDj-7I-9T7yQpOF5_yG3pAhtcxFrk2eYGBURY-PP_0bAAD__zu89_Q=
 
 statement ok
 ALTER TABLE data ADD COLUMN f FLOAT AS (atan2d(c, d::float)) VIRTUAL
@@ -220,7 +220,7 @@ quality of service: regular
 ·
 • create statistics
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJzsV9Fu2zYUfd9XXNyXthhdiZLsOHyy5yaY0TkOLKHDMBgFI924QmRRI2mkWeDP2g_sywZJcWurtmEHc5GH6kEAL68Oz9U9hyAf0fyVocDB5KIfXUAY9aNhGA0HIRgO4yu4ZUAMEricjEeQSCvh92H0K4yvo-H4KoR-CONLCP8Io4sRRMPRBbxq8YV5hQxzldCVnJNB8SdyZOghQx8ZBsiwjVOGhVYxGaN0mfJYfTBMPqNwGaZ5sbBleMowVppQPKJNbUYoMJI3GU1IJqQdFxkmZGWaVcuUBHvl62NxRw_IcKCyxTw3AhIGNwxiZBgWsgy0HA4yT4CDsp9II8MJ5QlpAT3OoOf9zIUQw6uoy0BamXvJ657PelyIy9_G_aj7Bhm-_wAlZyMg5_VQ0yxVJbolY-uQTeckwP33H1OPY5Vbym2q8m-mtLo3kFCsEkoEcNetwzcPlgxokomAruvCL3V4NrkeQCyzzKzlFjLVq1yvCo4-DAZgLBUQq0Vu4TV9tk6a2zcCXOdrAtHdroSKllrYYmHrlaZLhvX4qUPGyhmh4GstHb5D4S7Z4V0N5bzISDvtzY7W4TD9u_xTZfestFWLeh7r-TupeA0q7Z1UvjJY5EonpCnZYDBd7iTbn800zaRV2uHu_0Lbb9Dmm7-QH24M_mxjOLzleC_bGt42a_C3HXifbjGHt80cwSnM4R1hDn5MZ1fm6JzEHJ0NKt7hIvOeLzKv5fg_RHZqkXnHdHYlsrOTiOxsg4p_uMj854vMbznBD5GdWmT-MZ1diax7EpF1N6gEh4sseL7IgpbTftki87eJzHvrbxeZv01knVOIzD9CZMExnV2J7PwkIjs_5lg7IVOo3FDjTLl9JbexUouXh09KZlSfVI1a6JiutYqr3Ho4roCqQELG1rO8Hgzz1ZSxmuT8y6l8HYnvRfI2kPg6UruJ5O3ndAwpfy9UsBuJN5GCY8uTVVcwJ3uv9F3tJUN5efkpr7VP4dpLdbxb3clWM3MyRs6-TLo4XefXafJr7-XX2V2p10TqvKxKz5r8zvby6-6u1G8idV9Wpd0mv_P9RnB3lxp84879Rv_utZ6XW9Jtpu4_pgkKdJ-e1pbX6sHyAzkz5b4YflL3FdnooSh3tVuZGWI4knf0jizpeZqnxqYxCqsXtFz-9F8AAAD__99_2lU=
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJzsl9Fu2zYXx--_pzg4N03x0ZUo2Y7DK2dughld4sASOgxDUDDSiSpEJjWSRpIFeay9wJ5skBS3sWobdjAPQVFfGOAhdfg7Ov-_QD6g_aNAgaPpyXF8AlF8HI-jeDyKwHKYnMM1A2KQwul0cgapdBJ-Hcc_w-QiHk_OIziOYHIK0W9RfHIG8fjsBN50-Ny-QYZKp3QuZ2RR_I4cGQbIMESGXWTYw0uGpdEJWatNteShfmCc3qHwGeaqnLsqfMkw0YZQPKDLXUEoMJZXBU1JpmQ8Hxmm5GRe1NtUgMPq71N5Q_fIcKSL-UxZASmDKwYJMoxKWQU6HgepUuCg3WcyyHCsEq1sbh0pBzaRCg5m8g6cBZkR9Ga-fYsMp6RSMgKGnMEw-D8XQozP4wED6aQK0oNhyIZciNNfJsfxoHrgw0eoKrMCFG-GhrJcVwyOrGtCLp-RAP_vv2wzTrSqMHKtvpky-tZCSolOKRXAfb8JX907smBIpgIGvg8_NeFsejGCRBaFfba2lLlZrA3q4NnH0QisoxISPVcODujOeblybwX43tcFRDfrFtRYeu7KuWt2unxk2Iyf-midzAgFf9b48XsU_iPbvveRnJUFGa-33PcmHOV_Vm-q6rGTrm7RMGDDcC1K0ELprUX5SjBX2qRkKF0iuHxcC3ucZYYy6bTxuP-vYIctbL78Cvn29uEvto_HO17wPRgoWGUg_q4PH_IVFgpWWai7DwsFO1iI79L_hYX6e7FQfwkl2F6KwculGHS88IcUX4cUg136v5Di4V6keLiEEm4vxfDlUgw7XveHFF-HFMNd-r-Q4mAvUhwsoXS3l2L35VLsdrze9yDFcJUUg3fhaimGq6TY34cUwx2k2N2l_wspHu1Fike7HLenZEutLLXOuqt38ls7dXh1KKY0o-YEbfXcJHRhdFKvbYaTOlEdSMm6ZpY3g7FaTFlnSM6-3BaeZ-IbMwVLmfjzTL12pmAz0y5Q4cZU3fWZeDtTd9fyZN0VVORutblpvGRJVZey6lL-FG681MQH9V1xMTMja2X2ZdLHy-d8_TZfbyNff32lQTtT_3VVetjmO9zIN1hfadjONHhdlQ7afEebjeCvL7X7jTs3G_0_r_Wo-iRdF_r2U56iQP_p11nxt_hh9YDMbPVdjD7r2xo2vi-rr9q1LCwxPJM39J4cmVmucuvyBIUzc3p8_N8_AQAA__-jQhmi
 
 statement ok
 CREATE TYPE gh AS (g INT, h INT)
@@ -252,7 +252,7 @@ quality of service: regular
 ·
 • create statistics
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJzsV-Fu2zYQ_r-nONyfphgdiZTsOPzlzE0wo0scWEKHYQgKRrq6QmzRI2mkWZDH2gvsyQZJ9WwrlmsjaFED9Q9BvDsd77v7-Bl8RPvXBCX2R-dn8TlE8Vk8iOJBPwLL4WI0vIRUOQW_D-JfYXgdD4ZXEZxFMLyA6I8oPr-EeHB5Dq9afG5fIcNcp3SlpmRR_okcGQpkGCDDEBm28YbhzOiErNWmCHksPxikn1D6DLN8NneF-YZhog2hfESXuQmhxFjdTmhEKiXj-cgwJaeySblNUWCveLyf3dEDMuzryXyaWwmKwS2DhEGKDKOZKmwtj4PKU-Cg3UcyyHBEeUpGQo8z6AkGvYBBLyzef-ZSysFV3GWgnMpFetQLWC-U8uK34VncfY0M376DAoKVkPNqaWic6WInR9ZVJpdNSYL_7z-2Wic6d5S7TOfPXEbfW0gp0SmlErjvV-bbB0cWDKlUQtf34ZfKPB5d9yFRk4ldiZ2pzCxiRWm8fNfvg3U0g0TPcwdH9Ml5We5eS_C9ZQDRXVNAWZaeu9ncVTvdPDGs1p8HZp0aE0q-MuHBG5T-E9t9yJGaziZkvPb6gCtzlP1N5d4lpMgpV4xs-SpWrGx1Faw72KohfOZjq7b28rXTCFnUILcbIS-RznNtUjKUriG9eWpsytl4bGisnDYe93dvDxwJ34fbeXJHzr5eaVaTo9a6bWHrjfxC5Hpbm4I7cCSW5qaGB7WG83WS8d2VhL9ESTze8sThaInYpCX8uANvsw1qIjapSfg11ETsoSZ8n0Ev1KRz0GrSWYMsdue2eBG3RcsLfnD7W3Jb7DPoBbdPDprbJ2uQg925HbyI20HLC39w-1tyO9hn0Atudw-a2901yOHu3A5fxO2w5bUPh9vBJm6L42Azt4NN3O58DW4He3A73GfQC26fHjS3T_e51I3IznRuqXbT2byTX9upxYsrEaVjqu5PVs9NQtdGJ2VstRyWiUpDStZVXl4tBvnCZZ0hNf3_TrqaiW_NJNYy8dVM7Xomsb2mfYoKtqYKmzPxeqZwX3iqnArm5O61uavOrKW8FP2CuQtHdWorz_IfaeGdkrVqvAzwQ7xZrbNTr7O9tc5OM2JRz9T5PhGf1Os82VpntxlxUM_U_T4Rd-t1nm4_IH4z5PDZqd0uAHthDhoxi-PwC5jbNcynhWR9mOj791mKEv3Pv9aGx-KHxQdqbAvdjD7q-7Lo-GFWqN4HNbHE8FLd0RtyZKZZnlmXJSidmdPT00__BQAA__8846IQ
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJzsV-Fu2zYQ_r-nONyfphgdiZLsOPzlzE0wo0scWEKHYQgKRrq6QmzSI2kkWZDH2gvsyQZJ9WwrlmsjKJAU1Q9BvDsd7zvd9wl8QPvXBAX2R6cnySnEyUkyiJNBPwbL4Ww0PIdMOgm_D5JfYXiZDIYXMZzEMDyD-I84OT2HZHB-Cm9afG7fIEOlM7qQU7Io_kSODANkGCLDCBm28YrhzOiUrNWmCHkoXxhkdyh8hrmazV1hvmKYakMoHtDlbkIoMJHXExqRzMh4PjLMyMl8Um5TFNgrbh9nN3SPDPt6Mp8qK0AyuGaQMsiQYTyTha3lcZAqAw7afSaDDAcq1crm1pFyYFOp4GAq78BZkGOC9tS3b5HhiFRGRkCPM-gFDHohg15UPP_MhRCDi6TLQDqpguygF7JeJMTZb8OTpFu8_P4DFECtAMWrpaFxrot6HFlXmVw-JQH-v__Yap1qVZSUa_XEZfSthYxSnVEmgPt-Zb6-d2TBkMwEdH0ffqnM49FlH1I5mdiV2JnMzSI2KI3nH_p9sI5mkOq5cnBAd87LlXsrwPeWAUQ3TQFlWXruZnNX7XT1yLBaf_ms1skxoeArczB4h8J_ZLuPQiynswkZr70-BpU5zv-mcu8SUuykKz7Z8jFYsbLVVbjuYKuG6ImPrdray8dOI-SgBrndCHmJdK60ychQtob06rGxKSfjsaGxdNp43N-9PXAQ-D5cz9MbcuWwL5rV5Ki1blvYeiO_Erne1qbgDhwES3NTw8Naw_n6kPHd9YY_R2883vKC701xgk2Kww878D7foDnBJs2JvoXmBHtoDt9nHBaa03nVmtNZgxzszoDgWQwIWl74gwEvjwHBPuOwYMDRq2bA0RrkcHcGhM9iQNjyoh8MeHkMCPcZhwUDuq-aAd01yNHuDIiexYCo5bW_NwaEmxgQHIabGRBuYkDnWzAg3IMB0T7jsGDA8atmwPE-h80R2ZlWlmonsM07-bWdWrw4qlE2pupcZ_XcpHRpdFrGVsthmag0ZGRd5eXVYqAWLusMyen_Z-XVTHxrpmAtE1_N1K5nCrbXtE9R4dZUUXMmXs8U7QtPll8FFblbbW4qzlpS5a-hmNyFo2Jt5Vn-txbeKVkrx8sAP8Kr1To79TrbW-vsNCMO6pk6LxPxUb3Oo611dpsRh_VM3ZeJuFuv83g7QfxmyNET1m4XgL0wh42Yg8PoK5jbNczHhWR9mujbj3mGAv0vV2vDbXFh8YIc20I348_6tiw6uZ8VqvdJTiwxPJc39I4cmWmucuvyFIUzc3p8_Om_AAAA___V9eFO
 
 # Check that we also collect stats on the hidden expression index virt column.
 statement ok
@@ -276,7 +276,7 @@ quality of service: regular
 ·
 • create statistics
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJzsWN1u2zgTvf-egpibJt_SkUjJP-GVs26CNbqJA0voYrEICkaaukJs0UtSSLOBH2tfYJ9sIaleW4rlWgiKtkF9IZAzo-EczuER6Ecwf85BwGh6fhaekyA8C8dBOB4FxDByMZ1cklhaSX4bh7-QyXU4nlwF5CwgkwsS_B6E55ckHF-ek1cdlplXQCFVMV7JBRoQfwADChwoeEDBBwpduKGw1CpCY5TOQx6LF8bxRxAuhSRdZjY331CIlEYQj2ATO0cQEMrbOU5RxqgdFyjEaGUyL5bJCxzmj3fLO3wACiM1zxapEURScktJREkMFIKlzG0dhxGZxoQRZT-gBgpTTGPUggwZJUNOydCjZOjn45-YEGJ8FQ4oGbL_5z5pZcrjo6FHh74QF79OzsLBMVB485bkSIwgKSunGmeJyhe0aGxpsskCBXH_-duU80ilFlObqPSJS6t7Q2KMVIyxIMx1S_Ptg0VDNMpYkIHrkp9L82x6PSKRnM_NVuxSJnodywvj5dvRiBiLSxKpLLXkCD9aJ0ntsSCuswlAvGsKKMpSmV1mtlzpZkWhnH_qm7FyhiDYVqPHr0G4K3p4rwO5WM5RO91qn0tzkPyFxdoFpMBKm3duM-RbVro986oOum3wn_jotq27GfY2w34jel5D321EvwGdpUrHqDGugL5ZNe7P2WymcSat0g5zD98pcsRdl9xm0R1ac7y1b02O2i7uC6vu6WciqzvcFNxrcvTJEd-Ymzrh1TrBqkRkh4sOe47oOKzj8O9Odvgu2WEnPfIm2SE8fJfw-F9CeHgL4WFt-r0Wnt5LEZ5eBT0_nO38WWznHcf7wfavwHbept9rtvdfCtv7FfTe4Wz3nsV2r-P4P9j-Fdjuten3mu2Dl8L2QQW9fzjb_Wex3e843e-O7d4utvMTbzfbvV1s730Jtnst2O636fea7acvhe2nbS6QUzRLlRqsXaV2r-TWVuqw_M6F8QzLC5pRmY7wWquoiC2nkyJRYYjR2NLLysk4XbuM1SgX_91_tzOxvZl4JRPbztStZ-L7a2pTlLc3ld-cidUz-W3hyaIrkKK9V_quPL4G0_yLUNxu147yAJeezedq7V2gMXK2CXCLv5w2dfbqdXb31tlrRszrmXrfJuJ-vc7-3joHzYi9eqbBt4l4UK_zdP8BcZsh-09O7X4BaIXZa8TMT_zPYO7WMJ_mkvV-ru7fJTEIcD_9Ojse6x_kL8iZyXUz-KDui6LDh2Wueu_l3CCFS3mHr9GiXiRpYmwSgbA6w9Xqf_8GAAD__wRZvfM=
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJzsWO9u2zYQ_76nONyXphsdi5L8J_zkzE0wo0scWEKHYQgKRrq6QmzSI2kkWZDH2gvsyQZJdW0rlmsjKBAY9QeBvDsd70fe7yfQj2j_nqDA_ujsND6DKD6NB1E86EdgOZyPhheQSifhj0H8Gwyv4sHwMoLTCIbnEP0ZxWcXEA8uzuBNg8_tG2SodEqXckoWxV_IkaGPDANkGCLDFl4znBmdkLXa5CGPxQuD9B6FxzBTs7nLzdcME20IxSO6zE0IBcbyZkIjkimZpocMU3IymxTL5AX28sfH2S09IMO-nsynygqQDG4YJAxSZBjNZG5rNDlIlQIH7T6TQYYDlWhlM-tIObCJVHA0lffgLMgxQWvq2bfIcEQqJSOgxxn0fAa9gEEvzMe_cCHE4DLuMujxn3OfdFL56VEvYL1QiPPfh6dxN8_x_gPkeK0AxcupoXGm87IcWVeaXDYlAd5__9pynmiVV5Zp9cxl9J2FlBKdUiqAe15pvnlwZMGQTAV0PQ9-Lc3j0VUfEjmZ2JXYmczMItYvjBcf-n2wjmaQ6LlycET3rpkp91aA11wGEN3WBRRl6bmbzV250vUTw3L-5XStk2NCwVfaYfAOhffEdu-ISE5nEzLN1no3lOYo-4eKtQtIkZMuP7nl0F-xstVZsO5gq4bwmY-t2lrLYXs57NSi9yvoW7Xol6DnSpuUDKVroK-favfndDw2NJZOmyb3dt8pOPI9D27myS25ov0X-1bnqOzitrD1Pf1G5PoO1wW36xwdOPKX5rqTCConwdcbke8uTfwl0tTkjaZ_oOLkbxInftyG99kGefI3yVP4PeTJ30Oe-D5dsZCn9qHIU3sNvb87J_wXccJvNIMfnHi1nPD36YoFJzqHwonOGvpgd04EL-JE0GiGPzjxajkR7NMVC050D4UT3TX04e6cCF_EibDRbB0oJ4JNnPCPg82cCDZxov09OBHswYlwn65YcOLkUDhxss_FdkR2ppWlyhVv80peZaUGz--ClI6pvDhaPTcJXRmdFLHldFgkKgwpWVd6eTkZqIXLOkNy-vVevpqJb83kr2Xiq5la1Uz-9pr2KSrYmiqsz8SrmcJ94cniVFCRu9PmtqSvJZV_N4pb98JRErj0LD9qC--UrJXjZYBX_GG2rLNdrbO1tc52PWK_mqn9OhF3qnV2ttbZrUccVDN1XyfibrXOk-0E8eohh89Yu10A9sIc1GL2j8NvYG5VMJ_kkvVpou8-ZikK9L78Ghseix_mL8ixzXUz-qzviqLjh1muep_kxBLDC3lL78iRmWYqsy5LUDgzp6enn_4PAAD__5Fs_TE=
 
 # Check that we also collect stats on other hidden columns.
 statement ok
@@ -303,7 +303,7 @@ quality of service: regular
 ·
 • create statistics
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJzsWN1u2zgTvf-egpibJt_SkUjJP-GVs26CNbqJA0voYrEICkaaukJs0UtSSLOBH2tfYJ9sIaleW4rlWgiKtkF9IZAzo-EczuER6Ecwf85BwGh6fhaekyA8C8dBOB4FxDByMZ1cklhaSX4bh7-QyXU4nlwF5CwgkwsS_B6E55ckHF-ek1cdlplXQCFVMV7JBRoQfwADChwoeEDBBwpduKGw1CpCY5TOQx6LF8bxRxAuhSRdZjY331CIlEYQj2ATO0cQEMrbOU5RxqgdFyjEaGUyL5bJCxzmj3fLO3wACiM1zxapEURScktJREkMFIKlzG0dhxGZxoQRZT-gBgpTTGPUggwZJUNOydCjZOjn45-YEGJ8FQ4oGbL_5z5pZcrjo6FHh74QF79OzsLBMVB485bkSIwgKSunGmeJyhe0aGxpsskCBXH_-duU80ilFlObqPSJS6t7Q2KMVIyxIMx1S_Ptg0VDNMpYkIHrkp9L82x6PSKRnM_NVuxSJnodywvj5dvRiBiLSxKpLLXkCD9aJ0ntsSCuswlAvGsKKMpSmV1mtlzpZkWhnH_qm7FyhiDYVqPHr0G4K3p4rwO5WM5RO91qn0tzkPyFxdoFpMBKm3duM-RbVro986oOum3wn_jotq27GfY2w34jel5D321EvwGdpUrHqDGugL5ZNe7P2WymcSat0g5zD98pcsRdl9xm0R1ac7y1b02O2i7uC6vu6WciqzvcFNxrcvTJEd-Ymzrh1TrBqkRkh4sOe47oOKzj8O9Odvgu2WEnPfIm2SE8fJfw-F9CeHgL4WFt-r0Wnt5LEZ5eBT0_nO38WWznHcf7wfavwHbept9rtvdfCtv7FfTe4Wz3nsV2r-P4P9j-Fdjuten3mu2Dl8L2QQW9fzjb_Wex3e843e-O7d4utvMTbzfbvV1s730Jtnst2O636fea7acvhe2nbS6QUzRLlRqsXaV2r-TWVuqw_M6F8QzLC5pRmY7wWquoiC2nkyJRYYjR2NLLysk4XbuM1SgX_91_tzOxvZl4JRPbztStZ-L7a2pTlLc3ld-cidUz-W3hyaIrkKK9V_quPL4G0_yLUNxu147yAJeezedq7V2gMXK2CXCLv5w2dfbqdXb31tlrRszrmXrfJuJ-vc7-3joHzYi9eqbBt4l4UK_zdP8BcZsh-09O7X4BaIXZa8TMT_zPYO7WMJ_mkvV-ru7fJTEIcD_9Ojse6x_kL8iZyXUz-KDui6LDh2Wueu_l3CCFS3mHr9GiXiRpYmwSgbA6w9Xqf_8GAAD__wRZvfM=
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJzsWO9u2zYQ_76nONyXphsdi5L8J_zkzE0wo0scWEKHYQgKRrq6QmzSI2kkWZDH2gvsyQZJdW0rlmsjKBAY9QeBvDsd70fe7yfQj2j_nqDA_ujsND6DKD6NB1E86EdgOZyPhheQSifhj0H8Gwyv4sHwMoLTCIbnEP0ZxWcXEA8uzuBNg8_tG2SodEqXckoWxV_IkaGPDANkGCLDFl4znBmdkLXa5CGPxQuD9B6FxzBTs7nLzdcME20IxSO6zE0IBcbyZkIjkimZpocMU3IymxTL5AX28sfH2S09IMO-nsynygqQDG4YJAxSZBjNZG5rNDlIlQIH7T6TQYYDlWhlM-tIObCJVHA0lffgLMgxQWvq2bfIcEQqJSOgxxn0fAa9gEEvzMe_cCHE4DLuMujxn3OfdFL56VEvYL1QiPPfh6dxN8_x_gPkeK0AxcupoXGm87IcWVeaXDYlAd5__9pynmiVV5Zp9cxl9J2FlBKdUiqAe15pvnlwZMGQTAV0PQ9-Lc3j0VUfEjmZ2JXYmczMItYvjBcf-n2wjmaQ6LlycET3rpkp91aA11wGEN3WBRRl6bmbzV250vUTw3L-5XStk2NCwVfaYfAOhffEdu-ISE5nEzLN1no3lOYo-4eKtQtIkZMuP7nl0F-xstVZsO5gq4bwmY-t2lrLYXs57NSi9yvoW7Xol6DnSpuUDKVroK-favfndDw2NJZOmyb3dt8pOPI9D27myS25ov0X-1bnqOzitrD1Pf1G5PoO1wW36xwdOPKX5rqTCConwdcbke8uTfwl0tTkjaZ_oOLkbxInftyG99kGefI3yVP4PeTJ30Oe-D5dsZCn9qHIU3sNvb87J_wXccJvNIMfnHi1nPD36YoFJzqHwonOGvpgd04EL-JE0GiGPzjxajkR7NMVC050D4UT3TX04e6cCF_EibDRbB0oJ4JNnPCPg82cCDZxov09OBHswYlwn65YcOLkUDhxss_FdkR2ppWlyhVv80peZaUGz--ClI6pvDhaPTcJXRmdFLHldFgkKgwpWVd6eTkZqIXLOkNy-vVevpqJb83kr2Xiq5la1Uz-9pr2KSrYmiqsz8SrmcJ94cniVFCRu9PmtqSvJZV_N4pb98JRErj0LD9qC--UrJXjZYBX_GG2rLNdrbO1tc52PWK_mqn9OhF3qnV2ttbZrUccVDN1XyfibrXOk-0E8eohh89Yu10A9sIc1GL2j8NvYG5VMJ_kkvVpou8-ZikK9L78Ghseix_mL8ixzXUz-qzviqLjh1muep_kxBLDC3lL78iRmWYqsy5LUDgzp6enn_4PAAD__5Fs_TE=
 
 # Check that we can disable stats collection on virtual computed columns.
 statement ok
@@ -330,7 +330,7 @@ quality of service: regular
 ·
 • create statistics
 ·
-Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJzsV-Fum0gQ_n9PsZo_baV1YBfsOPxKzk11VuU6Mqin08mqNjB1kTHL7S5Kc5Ef617gnuwE1GdDDDWKWjVS_QN5Z4bZ-Wa-b4EH0H8l4MFkcX0VXBM_uAqmfjCd-EQz8mYxn5FIGEF-nwa_kflNMJ2_88mVT-ZviP-HH1zPSDCdXZMXA5brF0AhlRG-ExvU4P0JDChwoOAABRcoDGFJIVMyRK2lKkIeyhum0WfwbApxmuWmMC8phFIheA9gYpMgeBCI2wQXKCJUlg0UIjQiTsptigIvi8uHbI33QGEik3yTao8ISm4pCSmJgIKficI2sBgRaUQYkeYTKqDw9j0pqtAeSVm1VLiKZRFsUJvKZOINesT-9x9drUOZGkxNLNNHLiXvNIkwlBFGHmG2XZlv7w1qolBEHhnbNvm1Mq8WNxMSiiTRB7GZiNUulpfG2fvJhGiDGQllnhryEj8bK07NK4_Y1j4Acd0WUJYlc5PlptppuaVQrb_0XBuxQvDYwZCmr8Gzt_T0OflikyWorGF9RpXZj__Gcu8Skm-E8cgl2__lB1Z6uHLqDnpocB_56KXbCo43wA1bwe0x5alUESqMapiW21b4V6uVwpUwUlnMPr0R5CW3bXKbh2s0-tVBW9ocjSZ1hdVb9pXIrgY6jQayOj3Y6TJmT5GxxQYW_65C5seEzM5G5G18RMr8mJTdbyFl3kPKrM-sdlIePRMpj2rg-OlE5E8iIh9Yzk8i9iQi7zOrHRHPnwkRz2vgnNOJ6DyJiM7Acn8SsScRnT6z2hFx_EyIOK6Bc08novskIroDa_hdiegcIyI_c44T0TlGxNG3IKLTg4hun1ntiHjxTIh40ecTYoE6k6nGxtv28Z3sxk4DVryWY7TC6h1ey1yFeKNkWMZWy3mZqDREqE3lZdVimu5c2igUm_-_gA4zsc5MvJaJHWYaNjPx7pr6FOV0pnLbM7FmJrcvPFFOBVI0d1KtK3VqTMuzuHhq7xyVPivP_kGx825Qa7HaB9gOLA_rHDXrHHbWOWpHzJuZRj8m4vNmneeddY7bETvNTOMfE_G4WedFt0DsdsjuI9V2HwC9MDutmPmZ-xXMwwbmi-LI-pjIuw9xBB7YX36DI5fdD4obxEoX56b_Sd6VRQf3WXHqfRSJRgozscbXaFBt4jTWJg7BMyrH7faX_wIAAP__4HEt5w==
+Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJzsV-Fum0gQ_n9PMZo_baV1YAE7Dr-Sc1OdVaWJAurpdIqqDUwpCma53UVJLvJj3Qvck52AcraJcY2iSIlUfqDszDA738z3bbwPqP_K0MfZ5elJeApBeBLOg3A-C0Bz-HB5fgaxMAJ-n4e_wflFOD__FMBJAOcfIPgjCE_PIJyfncKbES_1G2SYy5g-iQVp9P9EjgwdZOgiQw8ZjvGKYaFkRFpLVYU81B_M4zv0bYZpXpSmMl8xjKQi9B_QpCYj9DEU1xldkohJWTYyjMmINKu3qQo8rl5fihu6R4YzmZWLXPsgGFwziBjEyDAoRGUbWRxEHgMHab6RQobzPJK5TrWh3ICORA5vF-IOjAaREIwXtn6HDD9-hqpW7UPOm6WiJJVVSkPaNCaTLsgH-99_dLOOZF5lTWX-yKXkrYaYIhlT7AO37cZ8fW9IgyIR-zC1bfi1MSeXFzOIRJbptdhCpKqNdWrj2efZDLShAiJZ5gbe0p2x0ty888G2VgFEN30BdVmyNEVpmp2ulgyb9ffJaCMSQp-vjXL-Hn17yfafZiAWRUbKGm9OsjEH6d9U711DCowwPhzz1Z_OmpWtr9xNB1s3eI987NjrBed0wI17wa0wlblUMSmKNzBdLXvhnySJokQYqSxu798IeOvYNlyX0Q2ZmpltW_ocnSbtCtts2Q8idzXQ7TSQb9KD7y92_hSxW3xkOS9Q7s42ufODCXxMtwje2SZ47zkE7wwQPB8y0Vbwk1ci-MkGOGd_ujpPoqszstyfdH0WujpDJtrS9fCV0PVwA5y7P13dJ9HVHVneT7o-C13dIRNt6Tp9JXSdboDz9qer9yS6eiNr_ALp6m6jq3Pgbqeru42uk-egqzuArt6QibZ0PXoldD0acrW5JF3IXFPnFrB9J7uz04hX1wWKE2ruFlqWKqILJaM6tlme14lqQ0zaNF7eLOZ569JGkVj8fzNbz8R3ZnI2MvH1TONuJmd3TUOKcnem8voz8W4mbyg8UU8FczK3Ut006tSU1yd29QugdTT6bDyrfyetd0Fai2QVYLt4tV7npFvneGedk37ETjfT5GUiPuzWebizzmk_YrebafoyEU-7dR7tFojdD9l7pNrdB8AgzG4vZufA-wHmcQfzUXVkfc3k7Zc0Rh_t789oy6t9sPpAJLo6N4Nv8rYuOrwvqlPvq8g0MTwTN_SeDKlFmqfapBH6RpW0XP7yXwAAAP__FtptJQ==
 
 statement ok
 RESET CLUSTER SETTING sql.stats.virtual_computed_columns.enabled

From a81beba85cd0007f7081adf349434a3e056351a7 Mon Sep 17 00:00:00 2001
From: Yahor Yuzefovich <yahor@cockroachlabs.com>
Date: Wed, 24 Jul 2024 13:21:37 -0400
Subject: [PATCH 2/2] logictest: retry relocate stmt in a couple of places

The capabilities are propagated asynchronously, so previously we could
try to relocate ranges in the secondary tenant before the necessary
capability was picked up. This was recently changed in
5f2a4f8af18dc83957ceb3c24cf9c6d7c79ee9e4.

Release note: None
---
 .../logictest/testdata/logic_test/distsql_tenant_locality    | 5 +++--
 .../opt/exec/execbuilder/testdata/distsql_tenant_locality    | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkg/sql/logictest/testdata/logic_test/distsql_tenant_locality b/pkg/sql/logictest/testdata/logic_test/distsql_tenant_locality
index 18ef8e4112a3..057ada6dd873 100644
--- a/pkg/sql/logictest/testdata/logic_test/distsql_tenant_locality
+++ b/pkg/sql/logictest/testdata/logic_test/distsql_tenant_locality
@@ -12,8 +12,9 @@ statement ok
 CREATE TABLE t (k INT PRIMARY KEY, v INT, FAMILY (k, v));
 INSERT INTO t SELECT i, i FROM generate_series(1, 6) AS g(i)
 
-# Upreplicate the table's range.
-statement ok
+# Upreplicate the table's range. We need a retry to guarantee that the
+# capability has been picked up.
+statement ok retry
 ALTER TABLE t EXPERIMENTAL_RELOCATE VALUES (ARRAY[1, 2, 3], 0)
 
 # Split the ranges in the table.
diff --git a/pkg/sql/opt/exec/execbuilder/testdata/distsql_tenant_locality b/pkg/sql/opt/exec/execbuilder/testdata/distsql_tenant_locality
index ea66b6106c22..8725baf7a56c 100644
--- a/pkg/sql/opt/exec/execbuilder/testdata/distsql_tenant_locality
+++ b/pkg/sql/opt/exec/execbuilder/testdata/distsql_tenant_locality
@@ -12,8 +12,9 @@ user root
 statement ok
 CREATE TABLE t (k INT PRIMARY KEY, v INT, FAMILY (k, v))
 
-# Upreplicate the table's range.
-statement ok
+# Upreplicate the table's range. We need a retry to guarantee that the
+# capability has been picked up.
+statement ok retry
 ALTER TABLE t EXPERIMENTAL_RELOCATE VALUES (ARRAY[1, 2, 3], 0)
 
 # Split the ranges in the table.