Skip to content

Commit 3e277ad

Browse files
PJMODOSPJMODOS
committed
Attempt to stabilize functions test
1 parent b99a02f commit 3e277ad

File tree

2 files changed

+24
-24
lines changed

2 files changed

+24
-24
lines changed

‎expected/functions.out

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -69,15 +69,15 @@ SELECT * FROM pglogical.replication_set_add_all_tables('default_insert_only', '{
6969
t
7070
(1 row)
7171

72-
SELECT pg_xlog_wait_remote_apply(pg_current_xlog_location(), pid) FROM pg_stat_replication;
72+
SELECT pg_xlog_wait_remote_apply(pg_current_xlog_location(), 0);
7373
pg_xlog_wait_remote_apply
7474
---------------------------
7575

7676
(1 row)
7777

7878
INSERT INTO public.funct5(a,b) VALUES (1,2);--c should be e.g. 21 for 2015
7979
INSERT INTO public.funct5(a,b,c) VALUES (3,4,20);-- c should be 20
80-
SELECT pg_xlog_wait_remote_apply(pg_current_xlog_location(), pid) FROM pg_stat_replication;
80+
SELECT pg_xlog_wait_remote_apply(pg_current_xlog_location(), 0);
8181
pg_xlog_wait_remote_apply
8282
---------------------------
8383

@@ -112,7 +112,7 @@ SELECT * FROM pglogical.replication_set_add_all_tables('default_insert_only', '{
112112
t
113113
(1 row)
114114

115-
SELECT pg_xlog_wait_remote_apply(pg_current_xlog_location(), pid) FROM pg_stat_replication;
115+
SELECT pg_xlog_wait_remote_apply(pg_current_xlog_location(), 0);
116116
pg_xlog_wait_remote_apply
117117
---------------------------
118118

@@ -121,7 +121,7 @@ SELECT pg_xlog_wait_remote_apply(pg_current_xlog_location(), pid) FROM pg_stat_r
121121
INSERT INTO public.funct (a) VALUES (1);
122122
INSERT INTO public.funct (a) VALUES (2);
123123
INSERT INTO public.funct (a) VALUES (3);
124-
SELECT pg_xlog_wait_remote_apply(pg_current_xlog_location(), pid) FROM pg_stat_replication;
124+
SELECT pg_xlog_wait_remote_apply(pg_current_xlog_location(), 0);
125125
pg_xlog_wait_remote_apply
126126
---------------------------
127127

@@ -139,7 +139,7 @@ SELECT * FROM public.funct;
139139
\c regression
140140
BEGIN;
141141
COMMIT;--empty transaction
142-
SELECT pg_xlog_wait_remote_apply(pg_current_xlog_location(), pid) FROM pg_stat_replication;
142+
SELECT pg_xlog_wait_remote_apply(pg_current_xlog_location(), 0);
143143
pg_xlog_wait_remote_apply
144144
---------------------------
145145

@@ -174,15 +174,15 @@ SELECT * FROM pglogical.replication_set_add_table('default', 'nullcheck_tbl');
174174
t
175175
(1 row)
176176

177-
SELECT pg_xlog_wait_remote_apply(pg_current_xlog_location(), pid) FROM pg_stat_replication;
177+
SELECT pg_xlog_wait_remote_apply(pg_current_xlog_location(), 0);
178178
pg_xlog_wait_remote_apply
179179
---------------------------
180180

181181
(1 row)
182182

183183
INSERT INTO public.nullcheck_tbl(id,id1,name) VALUES (1,1,'name1');
184184
INSERT INTO public.nullcheck_tbl(id,id1,name) VALUES (2,2,'name2');
185-
SELECT pg_xlog_wait_remote_apply(pg_current_xlog_location(), pid) FROM pg_stat_replication;
185+
SELECT pg_xlog_wait_remote_apply(pg_current_xlog_location(), 0);
186186
pg_xlog_wait_remote_apply
187187
---------------------------
188188

@@ -207,7 +207,7 @@ SELECT * FROM public.nullcheck_tbl;
207207
\c regression
208208
INSERT INTO public.nullcheck_tbl(id,id1,name) VALUES (3,3,'name3');
209209
INSERT INTO public.nullcheck_tbl(id,id1,name) VALUES (4,4,'name4');
210-
SELECT pg_xlog_wait_remote_apply(pg_current_xlog_location(), pid) FROM pg_stat_replication;
210+
SELECT pg_xlog_wait_remote_apply(pg_current_xlog_location(), 0);
211211
pg_xlog_wait_remote_apply
212212
---------------------------
213213

@@ -225,7 +225,7 @@ SELECT * FROM public.nullcheck_tbl;
225225

226226
\c regression
227227
UPDATE public.nullcheck_tbl SET name='name31' where id = 3;
228-
SELECT pg_xlog_wait_remote_apply(pg_current_xlog_location(), pid) FROM pg_stat_replication;
228+
SELECT pg_xlog_wait_remote_apply(pg_current_xlog_location(), 0);
229229
pg_xlog_wait_remote_apply
230230
---------------------------
231231

@@ -262,7 +262,7 @@ SELECT * FROM pglogical.replication_set_add_table('default', 'not_nullcheck_tbl'
262262
t
263263
(1 row)
264264

265-
SELECT pg_xlog_wait_remote_apply(pg_current_xlog_location(), pid) FROM pg_stat_replication;
265+
SELECT pg_xlog_wait_remote_apply(pg_current_xlog_location(), 0);
266266
pg_xlog_wait_remote_apply
267267
---------------------------
268268

@@ -273,7 +273,7 @@ ALTER TABLE public.not_nullcheck_tbl ADD COLUMN id2 integer not null;
273273
\c regression
274274
INSERT INTO public.not_nullcheck_tbl(id,id1,name) VALUES (1,1,'name1');
275275
INSERT INTO public.not_nullcheck_tbl(id,id1,name) VALUES (2,2,'name2');
276-
SELECT pg_xlog_wait_remote_apply(pg_current_xlog_location(), pid) FROM pg_stat_replication;
276+
SELECT pg_xlog_wait_remote_apply(pg_current_xlog_location(), 0);
277277
pg_xlog_wait_remote_apply
278278
---------------------------
279279

@@ -350,7 +350,7 @@ $$;
350350
INSERT INTO public.not_nullcheck_tbl(id,id1,name) VALUES (4,4,'name4'); -- id2 will be 99 on subsriber
351351
ALTER TABLE public.not_nullcheck_tbl ADD COLUMN id2 integer not null default 0;
352352
INSERT INTO public.not_nullcheck_tbl(id,id1,name) VALUES (5,5,'name5'); -- id2 will be 0 on both
353-
SELECT pg_xlog_wait_remote_apply(pg_current_xlog_location(), pid) FROM pg_stat_replication;
353+
SELECT pg_xlog_wait_remote_apply(pg_current_xlog_location(), 0);
354354
pg_xlog_wait_remote_apply
355355
---------------------------
356356

‎sql/functions.sql

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -45,12 +45,12 @@ $$);
4545

4646
SELECT * FROM pglogical.replication_set_add_all_tables('default_insert_only', '{public}');
4747

48-
SELECT pg_xlog_wait_remote_apply(pg_current_xlog_location(), pid) FROM pg_stat_replication;
48+
SELECT pg_xlog_wait_remote_apply(pg_current_xlog_location(), 0);
4949

5050
INSERT INTO public.funct5(a,b) VALUES (1,2);--c should be e.g. 21 for 2015
5151
INSERT INTO public.funct5(a,b,c) VALUES (3,4,20);-- c should be 20
5252

53-
SELECT pg_xlog_wait_remote_apply(pg_current_xlog_location(), pid) FROM pg_stat_replication;
53+
SELECT pg_xlog_wait_remote_apply(pg_current_xlog_location(), 0);
5454

5555
\c postgres
5656
SELECT * from public.funct5;
@@ -69,13 +69,13 @@ $$);
6969

7070
SELECT * FROM pglogical.replication_set_add_all_tables('default_insert_only', '{public}');
7171

72-
SELECT pg_xlog_wait_remote_apply(pg_current_xlog_location(), pid) FROM pg_stat_replication;
72+
SELECT pg_xlog_wait_remote_apply(pg_current_xlog_location(), 0);
7373

7474
INSERT INTO public.funct (a) VALUES (1);
7575
INSERT INTO public.funct (a) VALUES (2);
7676
INSERT INTO public.funct (a) VALUES (3);
7777

78-
SELECT pg_xlog_wait_remote_apply(pg_current_xlog_location(), pid) FROM pg_stat_replication;
78+
SELECT pg_xlog_wait_remote_apply(pg_current_xlog_location(), 0);
7979

8080
\c postgres
8181
SELECT * FROM public.funct;
@@ -85,7 +85,7 @@ SELECT * FROM public.funct;
8585
BEGIN;
8686
COMMIT;--empty transaction
8787

88-
SELECT pg_xlog_wait_remote_apply(pg_current_xlog_location(), pid) FROM pg_stat_replication;
88+
SELECT pg_xlog_wait_remote_apply(pg_current_xlog_location(), 0);
8989

9090
\c postgres
9191
SELECT * FROM public.funct;
@@ -103,12 +103,12 @@ $$);
103103

104104
SELECT * FROM pglogical.replication_set_add_table('default', 'nullcheck_tbl');
105105

106-
SELECT pg_xlog_wait_remote_apply(pg_current_xlog_location(), pid) FROM pg_stat_replication;
106+
SELECT pg_xlog_wait_remote_apply(pg_current_xlog_location(), 0);
107107

108108
INSERT INTO public.nullcheck_tbl(id,id1,name) VALUES (1,1,'name1');
109109
INSERT INTO public.nullcheck_tbl(id,id1,name) VALUES (2,2,'name2');
110110

111-
SELECT pg_xlog_wait_remote_apply(pg_current_xlog_location(), pid) FROM pg_stat_replication;
111+
SELECT pg_xlog_wait_remote_apply(pg_current_xlog_location(), 0);
112112

113113
\c postgres
114114

@@ -123,7 +123,7 @@ SELECT * FROM public.nullcheck_tbl;
123123
INSERT INTO public.nullcheck_tbl(id,id1,name) VALUES (3,3,'name3');
124124
INSERT INTO public.nullcheck_tbl(id,id1,name) VALUES (4,4,'name4');
125125

126-
SELECT pg_xlog_wait_remote_apply(pg_current_xlog_location(), pid) FROM pg_stat_replication;
126+
SELECT pg_xlog_wait_remote_apply(pg_current_xlog_location(), 0);
127127

128128
\c postgres
129129

@@ -133,7 +133,7 @@ SELECT * FROM public.nullcheck_tbl;
133133

134134
UPDATE public.nullcheck_tbl SET name='name31' where id = 3;
135135

136-
SELECT pg_xlog_wait_remote_apply(pg_current_xlog_location(), pid) FROM pg_stat_replication;
136+
SELECT pg_xlog_wait_remote_apply(pg_current_xlog_location(), 0);
137137

138138
\c postgres
139139

@@ -152,7 +152,7 @@ $$);
152152

153153
SELECT * FROM pglogical.replication_set_add_table('default', 'not_nullcheck_tbl');
154154

155-
SELECT pg_xlog_wait_remote_apply(pg_current_xlog_location(), pid) FROM pg_stat_replication;
155+
SELECT pg_xlog_wait_remote_apply(pg_current_xlog_location(), 0);
156156

157157
\c postgres
158158

@@ -162,7 +162,7 @@ ALTER TABLE public.not_nullcheck_tbl ADD COLUMN id2 integer not null;
162162

163163
INSERT INTO public.not_nullcheck_tbl(id,id1,name) VALUES (1,1,'name1');
164164
INSERT INTO public.not_nullcheck_tbl(id,id1,name) VALUES (2,2,'name2');
165-
SELECT pg_xlog_wait_remote_apply(pg_current_xlog_location(), pid) FROM pg_stat_replication;
165+
SELECT pg_xlog_wait_remote_apply(pg_current_xlog_location(), 0);
166166

167167
\c postgres
168168

@@ -209,7 +209,7 @@ $$;
209209
INSERT INTO public.not_nullcheck_tbl(id,id1,name) VALUES (4,4,'name4'); -- id2 will be 99 on subsriber
210210
ALTER TABLE public.not_nullcheck_tbl ADD COLUMN id2 integer not null default 0;
211211
INSERT INTO public.not_nullcheck_tbl(id,id1,name) VALUES (5,5,'name5'); -- id2 will be 0 on both
212-
SELECT pg_xlog_wait_remote_apply(pg_current_xlog_location(), pid) FROM pg_stat_replication;
212+
SELECT pg_xlog_wait_remote_apply(pg_current_xlog_location(), 0);
213213

214214
\c postgres
215215
SELECT * FROM public.not_nullcheck_tbl;

0 commit comments

Comments
 (0)