Merge #152025

152025: logictest: add retry before all ALTER TABLE EXPERIMENTAL_RELOCATE r=yuzefovich,mw5h a=michae2

In #139839 we added retries before various `ALTER TABLE EXPERIMENTAL_RELOCATE` statements. We're still seeing some failures, so add retries to more `ALTER TABLE EXPERIMENTAL_RELOCATE` statements.

The following command was used to add the retries (via ChatGPT 5):

```bash
git ls-files -z pkg/sql/logictest/testdata/logic_test/ pkg/sql/opt/exec/execbuilder/testdata/ pkg/ccl/logictestccl/testdata/logic_test/ \
| while IFS= read -r -d '' f; do
  awk '
    BEGIN { seen_retry=0; have_pending=0; last_stmt_retry=0; bcount=0 }
    /retry/ { seen_retry=1 }
    /statement ok/ {
      if (have_pending) { for (i=1;i<=bcount;i++) print buf[i] }
      have_pending=1; bcount=0; last_stmt_retry=seen_retry; buf[++bcount]=$0; next
    }
    have_pending {
      buf[++bcount]=$0
      if ($0 ~ /ALTER TABLE .* EXPERIMENTAL_RELOCATE/) {
        if (last_stmt_retry==0) print "retry"
        for (i=1;i<=bcount;i++) print buf[i]
        have_pending=0; bcount=0
      }
      next
    }
    { print }
    END { if (have_pending) for (i=1;i<=bcount;i++) print buf[i] }
  ' "$f" > "$f.tmp" && mv "$f.tmp" "$f"
done
```

Fixes: #151855

Release note: None

Co-authored-by: Michael Erickson <[email protected]>

Author: craig[bot]

pkg/sql/logictest/testdata/logic_test/distsql_agg

@@ -8,6 +8,7 @@ statement ok
 ALTER TABLE data SPLIT AT SELECT i FROM generate_series(1, 9) AS g(i)
 
 # Relocate the ten parts to the five nodes.
+retry
 statement ok
 ALTER TABLE data EXPERIMENTAL_RELOCATE
   SELECT ARRAY[i%5+1], i FROM generate_series(0, 9) AS g(i)
@@ -305,6 +306,7 @@ CREATE TABLE one (k INT PRIMARY KEY, v INT)
 statement ok
 ALTER TABLE one SPLIT AT VALUES (0), (99)
 
+retry
 statement ok
 ALTER TABLE one EXPERIMENTAL_RELOCATE VALUES (ARRAY[1], 0)
 
@@ -317,6 +319,7 @@ CREATE TABLE two (k INT PRIMARY KEY, v INT);
 statement ok
 ALTER TABLE two SPLIT AT VALUES (0), (99)
 
+retry
 statement ok
 ALTER TABLE two EXPERIMENTAL_RELOCATE VALUES (ARRAY[2], 0)
 
@@ -474,6 +477,7 @@ statement ok
 ALTER TABLE sorted_data SPLIT AT SELECT i FROM generate_series(1, 9) AS g(i)
 
 # Relocate the ten parts to the five nodes.
+retry
 statement ok
 ALTER TABLE sorted_data EXPERIMENTAL_RELOCATE
   SELECT ARRAY[i%5+1], i FROM generate_series(0, 9) AS g(i)
@@ -614,6 +618,7 @@ statement ok
 ALTER TABLE statistics_agg_test SPLIT AT SELECT i FROM generate_series(1, 9) AS g(i)
 
 # Relocate the ten parts to the five nodes.
+retry
 statement ok
 ALTER TABLE statistics_agg_test EXPERIMENTAL_RELOCATE
   SELECT ARRAY[i%5+1], i FROM generate_series(0, 9) AS g(i)

pkg/sql/logictest/testdata/logic_test/distsql_crdb_internal

@@ -8,6 +8,7 @@ statement ok
 ALTER TABLE data SPLIT AT SELECT i FROM generate_series(1, 9) AS g(i)
 
 # Relocate the ten parts to the five nodes.
+retry
 statement ok
 ALTER TABLE data EXPERIMENTAL_RELOCATE
   SELECT ARRAY[i%5+1], i FROM generate_series(0, 9) AS g(i)

pkg/sql/opt/exec/execbuilder/testdata/dist_vectorize

@@ -19,9 +19,11 @@ ALTER TABLE kv SPLIT AT SELECT i FROM generate_series(1,5) AS g(i)
 statement ok
 ALTER TABLE kw SPLIT AT SELECT i FROM generate_series(1,5) AS g(i)
 
+retry
 statement ok
 ALTER TABLE kv EXPERIMENTAL_RELOCATE SELECT ARRAY[i], i FROM generate_series(1, 5) as g(i)
 
+retry
 statement ok
 ALTER TABLE kw EXPERIMENTAL_RELOCATE SELECT ARRAY[i], i FROM generate_series(1, 5) as g(i)
 

pkg/sql/opt/exec/execbuilder/testdata/distsql_agg

@@ -8,6 +8,7 @@ statement ok
 ALTER TABLE data SPLIT AT SELECT i FROM generate_series(1, 9) AS g(i)
 
 # Relocate the ten parts to the five nodes.
+retry
 statement ok
 ALTER TABLE data EXPERIMENTAL_RELOCATE
   SELECT ARRAY[i%5+1], i FROM generate_series(0, 9) AS g(i)
@@ -814,6 +815,7 @@ statement ok
 ALTER TABLE sorted_data SPLIT AT SELECT i FROM generate_series(1, 9) AS g(i)
 
 # Relocate the ten parts to the five nodes.
+retry
 statement ok
 ALTER TABLE sorted_data EXPERIMENTAL_RELOCATE
   SELECT ARRAY[i%5+1], i FROM generate_series(0, 9) AS g(i)

pkg/sql/opt/exec/execbuilder/testdata/distsql_distinct_on

@@ -19,6 +19,7 @@ CREATE TABLE abc (
 statement ok
 ALTER TABLE xyz SPLIT AT VALUES (2), (4), (6), (7)
 
+retry
 statement ok
 ALTER TABLE xyz EXPERIMENTAL_RELOCATE VALUES
   (ARRAY[1], 0),
@@ -35,6 +36,7 @@ ALTER TABLE abc SPLIT AT VALUES
   ('2', '3', '4'),
   ('3', '4', '5')
 
+retry
 statement ok
 ALTER TABLE abc EXPERIMENTAL_RELOCATE VALUES
   (ARRAY[1], NULL, NULL, NULL),

pkg/sql/opt/exec/execbuilder/testdata/distsql_group_join

@@ -8,6 +8,7 @@ statement ok
 ALTER TABLE data SPLIT AT SELECT i FROM generate_series(1, 9) AS g(i)
 
 # Relocate the ten parts to the five nodes.
+retry
 statement ok
 ALTER TABLE data EXPERIMENTAL_RELOCATE
   SELECT ARRAY[i%5+1], i FROM generate_series(0, 9) AS g(i)

pkg/sql/opt/exec/execbuilder/testdata/distsql_inverted_index

@@ -57,6 +57,7 @@ ANALYZE json_tab
 statement ok
 ALTER TABLE json_tab SPLIT AT VALUES (10), (20)
 
+retry
 statement ok
 ALTER TABLE json_tab EXPERIMENTAL_RELOCATE VALUES (ARRAY[1], 1), (ARRAY[2], 10), (ARRAY[3], 20)
 
@@ -166,6 +167,7 @@ ANALYZE array_tab
 statement ok
 ALTER TABLE array_tab SPLIT AT VALUES (3), (3)
 
+retry
 statement ok
 ALTER TABLE array_tab EXPERIMENTAL_RELOCATE VALUES (ARRAY[1], 1), (ARRAY[2], 3), (ARRAY[3], 5)
 

pkg/sql/opt/exec/execbuilder/testdata/distsql_join

@@ -8,6 +8,7 @@ statement ok
 ALTER TABLE data SPLIT AT SELECT i FROM generate_series(1, 9) AS g(i)
 
 # Relocate the ten parts to the five nodes.
+retry
 statement ok
 ALTER TABLE data EXPERIMENTAL_RELOCATE
   SELECT ARRAY[i%5+1], i FROM generate_series(0, 9) AS g(i)

pkg/sql/opt/exec/execbuilder/testdata/distsql_merge_join

@@ -97,6 +97,7 @@ ALTER TABLE grandchild2 SPLIT AT SELECT pid1, pid1 + 40, pid1, pid1 FROM
 generate_series(2, 38, 4) AS g(pid1)
 
 # Relocate the twenty parts to the five nodes.
+retry
 statement ok
 ALTER TABLE grandchild2 EXPERIMENTAL_RELOCATE
   SELECT ARRAY[((i-1)/2)::INT%5+1], i, i+20, i, i FROM generate_series(1, 39, 2) AS g(i)
@@ -746,6 +747,7 @@ statement ok
 ALTER TABLE outer_p1 SPLIT AT
   SELECT i FROM generate_series(0, 40, 5) AS g(i)
 
+retry
 statement ok
 ALTER TABLE outer_p1 EXPERIMENTAL_RELOCATE
   SELECT ARRAY[(((i-3)/5)%4)::INT + 1], i FROM generate_series(3, 40, 5) AS g(i)

pkg/sql/opt/exec/execbuilder/testdata/distsql_misc

@@ -63,6 +63,7 @@ statement ok
 ALTER TABLE data SPLIT AT SELECT i FROM generate_series(1, 9) AS g(i)
 
 # Relocate the ten parts to the five nodes.
+retry
 statement ok
 ALTER TABLE data EXPERIMENTAL_RELOCATE
   SELECT ARRAY[i%5+1], i FROM generate_series(0, 9) AS g(i)