Skip to content

Commit 02d269e

Browse files
craig[bot]dhartunianlog-head
committed
145380: telemetry: adjust tests to reduce flakes r=alyshanjahani-crl a=dhartunian The telemetry counter tests reuse the same tables for a lot of complex operations. This commit refactors the test to use more tables to test the counters to reduce flakes. Resolves: #144693 Release note: None 145904: authors: add Matthew Lougheed to authors r=log-head a=log-head Epic: None Release note: None Co-authored-by: David Hartunian <[email protected]> Co-authored-by: Matthew Lougheed <[email protected]>
3 parents ef6e2e3 + 08a9dad + 0b61ecc commit 02d269e

File tree

2 files changed

+61
-54
lines changed

2 files changed

+61
-54
lines changed

‎AUTHORS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -345,6 +345,7 @@ Matt Spilchen <[email protected]>
345345
Matt Stobo <[email protected]>
346346
Matt Tracy <[email protected]> <[email protected]>
347347
Matt White <[email protected]>
348+
Matthew Lougheed <[email protected]>
348349
Matthew O'Connor <[email protected]> <[email protected]>
349350
Matthew Todd <[email protected]> <[email protected]>
350351
Max Lang <[email protected]> <[email protected]>

‎pkg/ccl/telemetryccl/testdata/telemetry/multiregion_table

Lines changed: 60 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -12,117 +12,123 @@ USE d;
1212
ALTER DATABASE d ADD REGION "ap-southeast-2"
1313
----
1414

15+
#####################################################################
16+
# CREATE TABLE: Test initial table creation with different localities
17+
#####################################################################
18+
1519
feature-usage
16-
CREATE TABLE t1 ()
20+
CREATE TABLE t0 ()
1721
----
1822
sql.multiregion.create_table.locality.unspecified
1923

2024
feature-usage
21-
CREATE TABLE t2 () LOCALITY REGIONAL BY TABLE
25+
CREATE TABLE t1 () LOCALITY REGIONAL BY TABLE
2226
----
2327
sql.multiregion.create_table.locality.regional_by_table
2428

2529
feature-usage
26-
CREATE TABLE t3 () LOCALITY REGIONAL BY TABLE IN "ap-southeast-2"
30+
CREATE TABLE t2 () LOCALITY REGIONAL BY TABLE IN "ap-southeast-2"
2731
----
2832
sql.multiregion.create_table.locality.regional_by_table_in
2933

30-
#
31-
# REGIONAL BY TABLE -> the others
32-
#
33-
3434
feature-usage
35-
ALTER TABLE t1 SET LOCALITY REGIONAL BY ROW
35+
CREATE TABLE t3 () LOCALITY GLOBAL
3636
----
37-
sql.multiregion.alter_table.locality.from.regional_by_table.to.regional_by_row
37+
sql.multiregion.create_table.locality.global
38+
39+
#####################################################################
40+
# ALTER TABLE from REGIONAL BY TABLE
41+
#####################################################################
3842

3943
exec
40-
ALTER TABLE t1 SET LOCALITY REGIONAL BY TABLE
44+
CREATE TABLE t1_to_row () LOCALITY REGIONAL BY TABLE;
45+
CREATE TABLE t1_to_global () LOCALITY REGIONAL BY TABLE;
46+
CREATE TABLE t1_to_table_in () LOCALITY REGIONAL BY TABLE;
47+
CREATE TABLE t1_to_row_as () LOCALITY REGIONAL BY TABLE;
48+
ALTER TABLE t1_to_row_as ADD COLUMN cr crdb_internal_region NOT NULL;
4149
----
4250

4351
feature-usage
44-
ALTER TABLE t1 SET LOCALITY GLOBAL
52+
ALTER TABLE t1_to_row SET LOCALITY REGIONAL BY ROW
4553
----
46-
sql.multiregion.alter_table.locality.from.regional_by_table.to.global
54+
sql.multiregion.alter_table.locality.from.regional_by_table.to.regional_by_row
4755

48-
exec
49-
ALTER TABLE t1 SET LOCALITY REGIONAL BY TABLE
56+
feature-usage
57+
ALTER TABLE t1_to_global SET LOCALITY GLOBAL
5058
----
59+
sql.multiregion.alter_table.locality.from.regional_by_table.to.global
5160

5261
feature-usage
53-
ALTER TABLE t1 SET LOCALITY REGIONAL BY TABLE IN "ap-southeast-2"
62+
ALTER TABLE t1_to_table_in SET LOCALITY REGIONAL BY TABLE IN "ap-southeast-2"
5463
----
5564
sql.multiregion.alter_table.locality.from.regional_by_table.to.regional_by_table_in
5665

57-
exec
58-
ALTER TABLE t1 SET LOCALITY REGIONAL BY TABLE;
59-
ALTER TABLE t1 ADD COLUMN cr crdb_internal_region NOT NULL
60-
----
61-
6266
feature-usage
63-
ALTER TABLE t1 SET LOCALITY REGIONAL BY ROW AS "cr"
67+
ALTER TABLE t1_to_row_as SET LOCALITY REGIONAL BY ROW AS "cr"
6468
----
6569
sql.multiregion.alter_table.locality.from.regional_by_table.to.regional_by_row_as
6670

67-
exec
68-
ALTER TABLE t1 SET LOCALITY REGIONAL BY TABLE
69-
----
70-
71-
feature-usage
72-
ALTER TABLE t1 SET LOCALITY REGIONAL BY TABLE
73-
----
74-
sql.multiregion.alter_table.locality.from.regional_by_table.to.regional_by_table
71+
#####################################################################
72+
# ALTER TABLE from REGIONAL BY TABLE IN
73+
#####################################################################
7574

7675
exec
77-
ALTER TABLE t1 SET LOCALITY REGIONAL BY TABLE
76+
CREATE TABLE t2_to_row () LOCALITY REGIONAL BY TABLE IN "ap-southeast-2";
77+
CREATE TABLE t2_to_global () LOCALITY REGIONAL BY TABLE IN "ap-southeast-2";
78+
CREATE TABLE t2_to_table () LOCALITY REGIONAL BY TABLE IN "ap-southeast-2";
79+
CREATE TABLE t2_to_row_as () LOCALITY REGIONAL BY TABLE IN "ap-southeast-2";
80+
ALTER TABLE t2_to_row_as ADD COLUMN cr crdb_internal_region NOT NULL;
7881
----
7982

80-
#
81-
# REGIONAL BY TABLE IN "ap-southeast-2" -> the others
82-
#
83-
8483
feature-usage
85-
ALTER TABLE t3 SET LOCALITY REGIONAL BY ROW
84+
ALTER TABLE t2_to_row SET LOCALITY REGIONAL BY ROW
8685
----
8786
sql.multiregion.alter_table.locality.from.regional_by_table_in.to.regional_by_row
8887

89-
exec
90-
ALTER TABLE t3 SET LOCALITY REGIONAL BY TABLE IN "ap-southeast-2"
91-
----
92-
9388
feature-usage
94-
ALTER TABLE t3 SET LOCALITY GLOBAL
89+
ALTER TABLE t2_to_global SET LOCALITY GLOBAL
9590
----
9691
sql.multiregion.alter_table.locality.from.regional_by_table_in.to.global
9792

98-
exec
99-
ALTER TABLE t3 SET LOCALITY REGIONAL BY TABLE IN "ap-southeast-2"
93+
feature-usage
94+
ALTER TABLE t2_to_table SET LOCALITY REGIONAL BY TABLE
10095
----
96+
sql.multiregion.alter_table.locality.from.regional_by_table_in.to.regional_by_table
10197

10298
feature-usage
103-
ALTER TABLE t3 SET LOCALITY REGIONAL BY TABLE IN "ap-southeast-2"
99+
ALTER TABLE t2_to_row_as SET LOCALITY REGIONAL BY ROW AS "cr"
104100
----
105-
sql.multiregion.alter_table.locality.from.regional_by_table_in.to.regional_by_table_in
101+
sql.multiregion.alter_table.locality.from.regional_by_table_in.to.regional_by_row_as
102+
103+
104+
#####################################################################
105+
# ALTER TABLE from GLOBAL
106+
#####################################################################exec
106107

107108
exec
108-
ALTER TABLE t3 SET LOCALITY REGIONAL BY TABLE IN "ap-southeast-2";
109-
ALTER TABLE t3 ADD COLUMN cr crdb_internal_region NOT NULL
109+
CREATE TABLE t3_to_row () LOCALITY GLOBAL;
110+
CREATE TABLE t3_to_table () LOCALITY GLOBAL;
111+
CREATE TABLE t3_to_table_in () LOCALITY GLOBAL;
112+
CREATE TABLE t3_to_row_as () LOCALITY GLOBAL;
113+
ALTER TABLE t3_to_row_as ADD COLUMN cr crdb_internal_region NOT NULL;
110114
----
111115

112116
feature-usage
113-
ALTER TABLE t3 SET LOCALITY REGIONAL BY ROW AS "cr"
117+
ALTER TABLE t3_to_row SET LOCALITY REGIONAL BY ROW
114118
----
115-
sql.multiregion.alter_table.locality.from.regional_by_table_in.to.regional_by_row_as
119+
sql.multiregion.alter_table.locality.from.global.to.regional_by_row
116120

117-
exec
118-
ALTER TABLE t3 SET LOCALITY REGIONAL BY TABLE IN "ap-southeast-2"
121+
feature-usage
122+
ALTER TABLE t3_to_table SET LOCALITY REGIONAL BY TABLE
119123
----
124+
sql.multiregion.alter_table.locality.from.global.to.regional_by_table
120125

121126
feature-usage
122-
ALTER TABLE t3 SET LOCALITY REGIONAL BY TABLE
127+
ALTER TABLE t3_to_table_in SET LOCALITY REGIONAL BY TABLE IN "ap-southeast-2"
123128
----
124-
sql.multiregion.alter_table.locality.from.regional_by_table_in.to.regional_by_table
129+
sql.multiregion.alter_table.locality.from.global.to.regional_by_table_in
125130

126-
exec
127-
ALTER TABLE t3 SET LOCALITY REGIONAL BY TABLE IN "ap-southeast-2"
131+
feature-usage
132+
ALTER TABLE t3_to_row_as SET LOCALITY REGIONAL BY ROW AS "cr"
128133
----
134+
sql.multiregion.alter_table.locality.from.global.to.regional_by_row_as

0 commit comments

Comments
 (0)