Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit1733460

Browse files
committed
postgres_fdw: Fourth attempt to stabilize regression tests.
Commit1bc0100 added this test, andcommits882ea50,958e20e,4fa3964 tried to stabilize it. It'sstill not stable, so keep trying.The latest comment from Tom Lane is that disabling autovacuum seemslike a good strategy, but we might need to do it on more tables, hencethis patch.Etsuro FujitaDiscussion:http://postgr.es/m/5A9928F1.2010206@lab.ntt.co.jp
1 parent497171d commit1733460

File tree

2 files changed

+37
-6
lines changed

2 files changed

+37
-6
lines changed

‎contrib/postgres_fdw/expected/postgres_fdw.out

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,6 @@ CREATE TABLE "S 1"."T 1" (
3535
c8 user_enum,
3636
CONSTRAINT t1_pkey PRIMARY KEY ("C 1")
3737
);
38-
-- "S 1"."T 1" will be heavily updated below, so disable autovacuum for
39-
-- the table to avoid unexpected effects of that
40-
ALTER TABLE "S 1"."T 1" SET (autovacuum_enabled = 'false');
4138
CREATE TABLE "S 1"."T 2" (
4239
c1 int NOT NULL,
4340
c2 text,
@@ -55,6 +52,11 @@ CREATE TABLE "S 1"."T 4" (
5552
c3 text,
5653
CONSTRAINT t4_pkey PRIMARY KEY (c1)
5754
);
55+
-- Disable autovacuum for these tables to avoid unexpected effects of that
56+
ALTER TABLE "S 1"."T 1" SET (autovacuum_enabled = 'false');
57+
ALTER TABLE "S 1"."T 2" SET (autovacuum_enabled = 'false');
58+
ALTER TABLE "S 1"."T 3" SET (autovacuum_enabled = 'false');
59+
ALTER TABLE "S 1"."T 4" SET (autovacuum_enabled = 'false');
5860
INSERT INTO "S 1"."T 1"
5961
SELECT id,
6062
id % 10,
@@ -6172,6 +6174,7 @@ ALTER FOREIGN TABLE ft1 DROP CONSTRAINT ft1_c2negative;
61726174
-- test WITH CHECK OPTION constraints
61736175
-- ===================================================================
61746176
CREATE TABLE base_tbl (a int, b int);
6177+
ALTER TABLE base_tbl SET (autovacuum_enabled = 'false');
61756178
CREATE FOREIGN TABLE foreign_tbl (a int, b int)
61766179
SERVER loopback OPTIONS(table_name 'base_tbl');
61776180
CREATE VIEW rw_view AS SELECT * FROM foreign_tbl
@@ -6232,6 +6235,7 @@ DROP TABLE base_tbl;
62326235
-- test serial columns (ie, sequence-based defaults)
62336236
-- ===================================================================
62346237
create table loc1 (f1 serial, f2 text);
6238+
alter table loc1 set (autovacuum_enabled = 'false');
62356239
create foreign table rem1 (f1 serial, f2 text)
62366240
server loopback options(table_name 'loc1');
62376241
select pg_catalog.setval('rem1_f1_seq', 10, false);
@@ -6779,6 +6783,8 @@ DROP TRIGGER trig_row_after_delete ON rem1;
67796783
-- ===================================================================
67806784
CREATE TABLE a (aa TEXT);
67816785
CREATE TABLE loct (aa TEXT, bb TEXT);
6786+
ALTER TABLE a SET (autovacuum_enabled = 'false');
6787+
ALTER TABLE loct SET (autovacuum_enabled = 'false');
67826788
CREATE FOREIGN TABLE b (bb TEXT) INHERITS (a)
67836789
SERVER loopback OPTIONS (table_name 'loct');
67846790
INSERT INTO a(aa) VALUES('aaa');
@@ -6920,12 +6926,16 @@ DROP TABLE loct;
69206926
-- Check SELECT FOR UPDATE/SHARE with an inherited source table
69216927
create table loct1 (f1 int, f2 int, f3 int);
69226928
create table loct2 (f1 int, f2 int, f3 int);
6929+
alter table loct1 set (autovacuum_enabled = 'false');
6930+
alter table loct2 set (autovacuum_enabled = 'false');
69236931
create table foo (f1 int, f2 int);
69246932
create foreign table foo2 (f3 int) inherits (foo)
69256933
server loopback options (table_name 'loct1');
69266934
create table bar (f1 int, f2 int);
69276935
create foreign table bar2 (f3 int) inherits (bar)
69286936
server loopback options (table_name 'loct2');
6937+
alter table foo set (autovacuum_enabled = 'false');
6938+
alter table bar set (autovacuum_enabled = 'false');
69296939
insert into foo values(1,1);
69306940
insert into foo values(3,3);
69316941
insert into foo2 values(2,2,2);
@@ -7685,6 +7695,8 @@ SET enable_partitionwise_join=on;
76857695
CREATE TABLE fprt1 (a int, b int, c varchar) PARTITION BY RANGE(a);
76867696
CREATE TABLE fprt1_p1 (LIKE fprt1);
76877697
CREATE TABLE fprt1_p2 (LIKE fprt1);
7698+
ALTER TABLE fprt1_p1 SET (autovacuum_enabled = 'false');
7699+
ALTER TABLE fprt1_p2 SET (autovacuum_enabled = 'false');
76887700
INSERT INTO fprt1_p1 SELECT i, i, to_char(i/50, 'FM0000') FROM generate_series(0, 249, 2) i;
76897701
INSERT INTO fprt1_p2 SELECT i, i, to_char(i/50, 'FM0000') FROM generate_series(250, 499, 2) i;
76907702
CREATE FOREIGN TABLE ftprt1_p1 PARTITION OF fprt1 FOR VALUES FROM (0) TO (250)
@@ -7697,6 +7709,8 @@ ANALYZE fprt1_p2;
76977709
CREATE TABLE fprt2 (a int, b int, c varchar) PARTITION BY RANGE(b);
76987710
CREATE TABLE fprt2_p1 (LIKE fprt2);
76997711
CREATE TABLE fprt2_p2 (LIKE fprt2);
7712+
ALTER TABLE fprt2_p1 SET (autovacuum_enabled = 'false');
7713+
ALTER TABLE fprt2_p2 SET (autovacuum_enabled = 'false');
77007714
INSERT INTO fprt2_p1 SELECT i, i, to_char(i/50, 'FM0000') FROM generate_series(0, 249, 3) i;
77017715
INSERT INTO fprt2_p2 SELECT i, i, to_char(i/50, 'FM0000') FROM generate_series(250, 499, 3) i;
77027716
CREATE FOREIGN TABLE ftprt2_p1 PARTITION OF fprt2 FOR VALUES FROM (0) TO (250)

‎contrib/postgres_fdw/sql/postgres_fdw.sql

Lines changed: 20 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,6 @@ CREATE TABLE "S 1"."T 1" (
3939
c8 user_enum,
4040
CONSTRAINT t1_pkeyPRIMARY KEY ("C 1")
4141
);
42-
-- "S 1"."T 1" will be heavily updated below, so disable autovacuum for
43-
-- the table to avoid unexpected effects of that
44-
ALTERTABLE"S 1"."T 1"SET (autovacuum_enabled='false');
4542
CREATE TABLE"S 1"."T 2" (
4643
c1intNOT NULL,
4744
c2text,
@@ -60,6 +57,12 @@ CREATE TABLE "S 1"."T 4" (
6057
CONSTRAINT t4_pkeyPRIMARY KEY (c1)
6158
);
6259

60+
-- Disable autovacuum for these tables to avoid unexpected effects of that
61+
ALTERTABLE"S 1"."T 1"SET (autovacuum_enabled='false');
62+
ALTERTABLE"S 1"."T 2"SET (autovacuum_enabled='false');
63+
ALTERTABLE"S 1"."T 3"SET (autovacuum_enabled='false');
64+
ALTERTABLE"S 1"."T 4"SET (autovacuum_enabled='false');
65+
6366
INSERT INTO"S 1"."T 1"
6467
SELECT id,
6568
id %10,
@@ -1260,6 +1263,7 @@ ALTER FOREIGN TABLE ft1 DROP CONSTRAINT ft1_c2negative;
12601263
-- ===================================================================
12611264

12621265
CREATETABLEbase_tbl (aint, bint);
1266+
ALTERTABLE base_tblSET (autovacuum_enabled='false');
12631267
CREATE FOREIGN TABLE foreign_tbl (aint, bint)
12641268
SERVER loopback OPTIONS(table_name'base_tbl');
12651269
CREATEVIEWrw_viewASSELECT*FROM foreign_tbl
@@ -1283,6 +1287,7 @@ DROP TABLE base_tbl;
12831287
-- test serial columns (ie, sequence-based defaults)
12841288
-- ===================================================================
12851289
createtableloc1 (f1serial, f2text);
1290+
altertable loc1set (autovacuum_enabled='false');
12861291
create foreign table rem1 (f1serial, f2text)
12871292
server loopback options(table_name'loc1');
12881293
selectpg_catalog.setval('rem1_f1_seq',10, false);
@@ -1599,6 +1604,8 @@ DROP TRIGGER trig_row_after_delete ON rem1;
15991604

16001605
CREATETABLEa (aaTEXT);
16011606
CREATETABLEloct (aaTEXT, bbTEXT);
1607+
ALTERTABLE aSET (autovacuum_enabled='false');
1608+
ALTERTABLE loctSET (autovacuum_enabled='false');
16021609
CREATE FOREIGN TABLE b (bbTEXT) INHERITS (a)
16031610
SERVER loopback OPTIONS (table_name'loct');
16041611

@@ -1645,13 +1652,19 @@ DROP TABLE loct;
16451652
createtableloct1 (f1int, f2int, f3int);
16461653
createtableloct2 (f1int, f2int, f3int);
16471654

1655+
altertable loct1set (autovacuum_enabled='false');
1656+
altertable loct2set (autovacuum_enabled='false');
1657+
16481658
createtablefoo (f1int, f2int);
16491659
create foreign table foo2 (f3int) inherits (foo)
16501660
server loopback options (table_name'loct1');
16511661
createtablebar (f1int, f2int);
16521662
create foreign table bar2 (f3int) inherits (bar)
16531663
server loopback options (table_name'loct2');
16541664

1665+
altertable fooset (autovacuum_enabled='false');
1666+
altertable barset (autovacuum_enabled='false');
1667+
16551668
insert into foovalues(1,1);
16561669
insert into foovalues(3,3);
16571670
insert into foo2values(2,2,2);
@@ -1866,6 +1879,8 @@ SET enable_partitionwise_join=on;
18661879
CREATETABLEfprt1 (aint, bint, cvarchar) PARTITION BY RANGE(a);
18671880
CREATETABLEfprt1_p1 (LIKE fprt1);
18681881
CREATETABLEfprt1_p2 (LIKE fprt1);
1882+
ALTERTABLE fprt1_p1SET (autovacuum_enabled='false');
1883+
ALTERTABLE fprt1_p2SET (autovacuum_enabled='false');
18691884
INSERT INTO fprt1_p1SELECT i, i, to_char(i/50,'FM0000')FROM generate_series(0,249,2) i;
18701885
INSERT INTO fprt1_p2SELECT i, i, to_char(i/50,'FM0000')FROM generate_series(250,499,2) i;
18711886
CREATE FOREIGN TABLE ftprt1_p1 PARTITION OF fprt1 FORVALUESFROM (0) TO (250)
@@ -1879,6 +1894,8 @@ ANALYZE fprt1_p2;
18791894
CREATETABLEfprt2 (aint, bint, cvarchar) PARTITION BY RANGE(b);
18801895
CREATETABLEfprt2_p1 (LIKE fprt2);
18811896
CREATETABLEfprt2_p2 (LIKE fprt2);
1897+
ALTERTABLE fprt2_p1SET (autovacuum_enabled='false');
1898+
ALTERTABLE fprt2_p2SET (autovacuum_enabled='false');
18821899
INSERT INTO fprt2_p1SELECT i, i, to_char(i/50,'FM0000')FROM generate_series(0,249,3) i;
18831900
INSERT INTO fprt2_p2SELECT i, i, to_char(i/50,'FM0000')FROM generate_series(250,499,3) i;
18841901
CREATE FOREIGN TABLE ftprt2_p1 PARTITION OF fprt2 FORVALUESFROM (0) TO (250)

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp