Skip to content

Commit af019ba

Browse files
committed
Restructure foreign key handling code for ATTACH/DETACH
53af9491a0439720094a11b72602952d79f59ac7
1 parent 34eb2db commit af019ba

18 files changed

+505
-497
lines changed

src/test/regress/expected/citus_non_blocking_split_columnar.out

Lines changed: 148 additions & 148 deletions
Large diffs are not rendered by default.

src/test/regress/expected/citus_non_blocking_split_shards.out

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ SELECT shard.shardid, logicalrelid, shardminvalue, shardmaxvalue, nodename, node
134134
ORDER BY 1, 2;
135135
relname | Constraint | Definition
136136
---------------------------------------------------------------------
137-
sensors_8981000 | fkey_table_to_dist_8981000 | FOREIGN KEY (measureid) REFERENCES colocated_dist_table_8981003(measureid)
137+
sensors_8981000 | t | FOREIGN KEY (measureid) REFERENCES colocated_dist_table_8981003(measureid)
138138
(1 row)
139139

140140
SELECT tablename, indexdef FROM pg_indexes WHERE tablename like 'sensors_%' ORDER BY 1,2;
@@ -175,7 +175,7 @@ SELECT shard.shardid, logicalrelid, shardminvalue, shardmaxvalue, nodename, node
175175
ORDER BY 1, 2;
176176
relname | Constraint | Definition
177177
---------------------------------------------------------------------
178-
sensors_8981001 | fkey_table_to_dist_8981001 | FOREIGN KEY (measureid) REFERENCES colocated_dist_table_8981004(measureid)
178+
sensors_8981001 | t | FOREIGN KEY (measureid) REFERENCES colocated_dist_table_8981004(measureid)
179179
(1 row)
180180

181181
SELECT tablename, indexdef FROM pg_indexes WHERE tablename like 'sensors_%' ORDER BY 1,2;
@@ -320,8 +320,8 @@ SELECT shard.shardid, logicalrelid, shardminvalue, shardmaxvalue, nodename, node
320320
ORDER BY 1, 2;
321321
relname | Constraint | Definition
322322
---------------------------------------------------------------------
323-
sensors_8981013 | fkey_table_to_dist_8981013 | FOREIGN KEY (measureid) REFERENCES colocated_dist_table_8981016(measureid)
324-
sensors_8981014 | fkey_table_to_dist_8981014 | FOREIGN KEY (measureid) REFERENCES colocated_dist_table_8981017(measureid)
323+
sensors_8981013 | t | FOREIGN KEY (measureid) REFERENCES colocated_dist_table_8981016(measureid)
324+
sensors_8981014 | t | FOREIGN KEY (measureid) REFERENCES colocated_dist_table_8981017(measureid)
325325
(2 rows)
326326

327327
SELECT tablename, indexdef FROM pg_indexes WHERE tablename like 'sensors_%' ORDER BY 1,2;
@@ -368,9 +368,9 @@ SELECT shard.shardid, logicalrelid, shardminvalue, shardmaxvalue, nodename, node
368368
ORDER BY 1, 2;
369369
relname | Constraint | Definition
370370
---------------------------------------------------------------------
371-
sensors_8981007 | fkey_table_to_dist_8981007 | FOREIGN KEY (measureid) REFERENCES colocated_dist_table_8981009(measureid)
372-
sensors_8981008 | fkey_table_to_dist_8981008 | FOREIGN KEY (measureid) REFERENCES colocated_dist_table_8981010(measureid)
373-
sensors_8981015 | fkey_table_to_dist_8981015 | FOREIGN KEY (measureid) REFERENCES colocated_dist_table_8981018(measureid)
371+
sensors_8981007 | t | FOREIGN KEY (measureid) REFERENCES colocated_dist_table_8981009(measureid)
372+
sensors_8981008 | t | FOREIGN KEY (measureid) REFERENCES colocated_dist_table_8981010(measureid)
373+
sensors_8981015 | t | FOREIGN KEY (measureid) REFERENCES colocated_dist_table_8981018(measureid)
374374
(3 rows)
375375

376376
SELECT tablename, indexdef FROM pg_indexes WHERE tablename like 'sensors_%' ORDER BY 1,2;

src/test/regress/expected/citus_split_shard_by_split_points.out

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ SELECT shard.shardid, logicalrelid, shardminvalue, shardmaxvalue, nodename, node
130130
ORDER BY 1, 2;
131131
relname | Constraint | Definition
132132
---------------------------------------------------------------------
133-
sensors_8981000 | fkey_table_to_dist_8981000 | FOREIGN KEY (measureid) REFERENCES colocated_dist_table_8981003(measureid)
133+
sensors_8981000 | t | FOREIGN KEY (measureid) REFERENCES colocated_dist_table_8981003(measureid)
134134
(1 row)
135135

136136
SELECT tablename, indexdef FROM pg_indexes WHERE tablename like 'sensors_%' ORDER BY 1,2;
@@ -171,7 +171,7 @@ SELECT shard.shardid, logicalrelid, shardminvalue, shardmaxvalue, nodename, node
171171
ORDER BY 1, 2;
172172
relname | Constraint | Definition
173173
---------------------------------------------------------------------
174-
sensors_8981001 | fkey_table_to_dist_8981001 | FOREIGN KEY (measureid) REFERENCES colocated_dist_table_8981004(measureid)
174+
sensors_8981001 | t | FOREIGN KEY (measureid) REFERENCES colocated_dist_table_8981004(measureid)
175175
(1 row)
176176

177177
SELECT tablename, indexdef FROM pg_indexes WHERE tablename like 'sensors_%' ORDER BY 1,2;
@@ -316,8 +316,8 @@ SELECT shard.shardid, logicalrelid, shardminvalue, shardmaxvalue, nodename, node
316316
ORDER BY 1, 2;
317317
relname | Constraint | Definition
318318
---------------------------------------------------------------------
319-
sensors_8981013 | fkey_table_to_dist_8981013 | FOREIGN KEY (measureid) REFERENCES colocated_dist_table_8981016(measureid)
320-
sensors_8981014 | fkey_table_to_dist_8981014 | FOREIGN KEY (measureid) REFERENCES colocated_dist_table_8981017(measureid)
319+
sensors_8981013 | t | FOREIGN KEY (measureid) REFERENCES colocated_dist_table_8981016(measureid)
320+
sensors_8981014 | t | FOREIGN KEY (measureid) REFERENCES colocated_dist_table_8981017(measureid)
321321
(2 rows)
322322

323323
SELECT tablename, indexdef FROM pg_indexes WHERE tablename like 'sensors_%' ORDER BY 1,2;
@@ -364,9 +364,9 @@ SELECT shard.shardid, logicalrelid, shardminvalue, shardmaxvalue, nodename, node
364364
ORDER BY 1, 2;
365365
relname | Constraint | Definition
366366
---------------------------------------------------------------------
367-
sensors_8981007 | fkey_table_to_dist_8981007 | FOREIGN KEY (measureid) REFERENCES colocated_dist_table_8981009(measureid)
368-
sensors_8981008 | fkey_table_to_dist_8981008 | FOREIGN KEY (measureid) REFERENCES colocated_dist_table_8981010(measureid)
369-
sensors_8981015 | fkey_table_to_dist_8981015 | FOREIGN KEY (measureid) REFERENCES colocated_dist_table_8981018(measureid)
367+
sensors_8981007 | t | FOREIGN KEY (measureid) REFERENCES colocated_dist_table_8981009(measureid)
368+
sensors_8981008 | t | FOREIGN KEY (measureid) REFERENCES colocated_dist_table_8981010(measureid)
369+
sensors_8981015 | t | FOREIGN KEY (measureid) REFERENCES colocated_dist_table_8981018(measureid)
370370
(3 rows)
371371

372372
SELECT tablename, indexdef FROM pg_indexes WHERE tablename like 'sensors_%' ORDER BY 1,2;

0 commit comments

Comments
 (0)