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

Commitce43cc6

Browse files
committed
Merge branch 'master' into PGPRO-4561-ds
2 parentsa752cc0 +2aeee15 commitce43cc6

File tree

6 files changed

+37
-22
lines changed

6 files changed

+37
-22
lines changed

‎expected/corner_cases.out

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,9 @@ save_own_pid
1818

1919
(1 row)
2020

21+
step s2_pg_qs_counterpart: select pg_query_state(counterpart_pid(0)); <waiting ...>
2122
s2: INFO: state of backend is idle
22-
step s2_pg_qs_counterpart:select pg_query_state(counterpart_pid(0));
23+
step s2_pg_qs_counterpart:<... completed>
2324
pg_query_state
2425
--------------
2526
(0 rows)
@@ -33,8 +34,9 @@ save_own_pid
3334
(1 row)
3435

3536
step s1_disable_pg_qs: set pg_query_state.enable to off;
37+
step s2_pg_qs_counterpart: select pg_query_state(counterpart_pid(0)); <waiting ...>
3638
s2: INFO: query execution statistics disabled
37-
step s2_pg_qs_counterpart:select pg_query_state(counterpart_pid(0));
39+
step s2_pg_qs_counterpart:<... completed>
3840
pg_query_state
3941
--------------
4042
(0 rows)
@@ -49,8 +51,9 @@ save_own_pid
4951

5052
(1 row)
5153

54+
step s2_pg_qs_counterpart: select pg_query_state(counterpart_pid(0)); <waiting ...>
5255
s2: INFO: state of backend is idle
53-
step s2_pg_qs_counterpart:select pg_query_state(counterpart_pid(0));
56+
step s2_pg_qs_counterpart:<... completed>
5457
pg_query_state
5558
--------------
5659
(0 rows)
@@ -65,8 +68,9 @@ save_own_pid
6568

6669
(1 row)
6770

71+
step s2_pg_qs_counterpart: select pg_query_state(counterpart_pid(0)); <waiting ...>
6872
s2: INFO: state of backend is idle
69-
step s2_pg_qs_counterpart:select pg_query_state(counterpart_pid(0));
73+
step s2_pg_qs_counterpart:<... completed>
7074
pg_query_state
7175
--------------
7276
(0 rows)
@@ -81,5 +85,6 @@ save_own_pid
8185

8286
(1 row)
8387

84-
step s2_pg_qs_counterpart: select pg_query_state(counterpart_pid(0));
88+
step s2_pg_qs_counterpart: select pg_query_state(counterpart_pid(0)); <waiting ...>
89+
step s2_pg_qs_counterpart: <... completed>
8590
ERROR: permission denied

‎expected/corner_cases_2.out

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,9 @@ step s1_save_pid: select save_own_pid(0);
1313
save_own_pid
1414

1515

16+
step s2_pg_qs_counterpart: select pg_query_state(counterpart_pid(0)); <waiting ...>
1617
s2: INFO: state of backend is idle
17-
step s2_pg_qs_counterpart:select pg_query_state(counterpart_pid(0));
18+
step s2_pg_qs_counterpart:<... completed>
1819
pg_query_state
1920

2021

@@ -24,8 +25,9 @@ save_own_pid
2425

2526

2627
step s1_disable_pg_qs: set pg_query_state.enable to off;
28+
step s2_pg_qs_counterpart: select pg_query_state(counterpart_pid(0)); <waiting ...>
2729
s2: INFO: query execution statistics disabled
28-
step s2_pg_qs_counterpart:select pg_query_state(counterpart_pid(0));
30+
step s2_pg_qs_counterpart:<... completed>
2931
pg_query_state
3032

3133

@@ -36,8 +38,9 @@ step s1_save_pid: select save_own_pid(0);
3638
save_own_pid
3739

3840

41+
step s2_pg_qs_counterpart: select pg_query_state(counterpart_pid(0)); <waiting ...>
3942
s2: INFO: state of backend is idle
40-
step s2_pg_qs_counterpart:select pg_query_state(counterpart_pid(0));
43+
step s2_pg_qs_counterpart:<... completed>
4144
pg_query_state
4245

4346

@@ -48,8 +51,9 @@ step s1_save_pid: select save_own_pid(0);
4851
save_own_pid
4952

5053

54+
step s2_pg_qs_counterpart: select pg_query_state(counterpart_pid(0)); <waiting ...>
5155
s2: INFO: state of backend is idle
52-
step s2_pg_qs_counterpart:select pg_query_state(counterpart_pid(0));
56+
step s2_pg_qs_counterpart:<... completed>
5357
pg_query_state
5458

5559

@@ -60,5 +64,6 @@ step s1_save_pid: select save_own_pid(0);
6064
save_own_pid
6165

6266

63-
step s2_pg_qs_counterpart: select pg_query_state(counterpart_pid(0));
67+
step s2_pg_qs_counterpart: select pg_query_state(counterpart_pid(0)); <waiting ...>
68+
step s2_pg_qs_counterpart: <... completed>
6469
ERROR: permission denied

‎expected/corner_cases_3.out

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,9 @@ step s1_save_pid: select save_own_pid(0);
1313
save_own_pid
1414

1515

16+
step s2_pg_qs_counterpart: select pg_query_state(counterpart_pid(0)); <waiting ...>
1617
s2: INFO: state of backend is idle
17-
step s2_pg_qs_counterpart:select pg_query_state(counterpart_pid(0));
18+
step s2_pg_qs_counterpart:<... completed>
1819
pg_query_state
1920

2021

@@ -24,8 +25,9 @@ save_own_pid
2425

2526

2627
step s1_disable_pg_qs: set pg_query_state.enable to off;
28+
step s2_pg_qs_counterpart: select pg_query_state(counterpart_pid(0)); <waiting ...>
2729
s2: INFO: query execution statistics disabled
28-
step s2_pg_qs_counterpart:select pg_query_state(counterpart_pid(0));
30+
step s2_pg_qs_counterpart:<... completed>
2931
pg_query_state
3032

3133

@@ -36,8 +38,9 @@ step s1_save_pid: select save_own_pid(0);
3638
save_own_pid
3739

3840

41+
step s2_pg_qs_counterpart: select pg_query_state(counterpart_pid(0)); <waiting ...>
3942
s2: INFO: state of backend is idle
40-
step s2_pg_qs_counterpart:select pg_query_state(counterpart_pid(0));
43+
step s2_pg_qs_counterpart:<... completed>
4144
pg_query_state
4245

4346

@@ -48,8 +51,9 @@ step s1_save_pid: select save_own_pid(0);
4851
save_own_pid
4952

5053

54+
step s2_pg_qs_counterpart: select pg_query_state(counterpart_pid(0)); <waiting ...>
5155
s2: INFO: state of backend is idle
52-
step s2_pg_qs_counterpart:select pg_query_state(counterpart_pid(0));
56+
step s2_pg_qs_counterpart:<... completed>
5357
pg_query_state
5458

5559

@@ -60,7 +64,8 @@ step s1_save_pid: select save_own_pid(0);
6064
save_own_pid
6165

6266

63-
step s2_pg_qs_counterpart: select pg_query_state(counterpart_pid(0));
67+
step s2_pg_qs_counterpart: select pg_query_state(counterpart_pid(0)); <waiting ...>
68+
step s2_pg_qs_counterpart: <... completed>
6469
ERROR: permission denied
6570
unused step name: s1_enable_pg_qs
6671
unused step name: s1_pg_qs_counterpart

‎pg_query_state.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -895,7 +895,7 @@ SendBgWorkerPids(void)
895895
msg->pids[i++]=current_pid;
896896
}
897897

898-
#ifPG_VERSION_NUM <=140000
898+
#ifPG_VERSION_NUM<150000
899899
shm_mq_send(mqh,msg_len,msg, false);
900900
#else
901901
shm_mq_send(mqh,msg_len,msg, false, true);

‎signal_handler.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ shm_mq_send_nonblocking(shm_mq_handle *mqh, Size nbytes, const void *data, Size
168168

169169
for(i=0;i<attempts;i++)
170170
{
171-
#ifPG_VERSION_NUM <=140000
171+
#ifPG_VERSION_NUM<150000
172172
res=shm_mq_send(mqh,nbytes,data, true);
173173
#else
174174
res=shm_mq_send(mqh,nbytes,data, true, true);

‎specs/corner_cases.spec

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -64,12 +64,12 @@ permutation "s1_pg_qs_1"
6464
permutation"s1_pg_qs_2"
6565

6666
# Check idle
67-
permutation"s1_save_pid""s2_pg_qs_counterpart"
67+
permutation"s1_save_pid""s2_pg_qs_counterpart"(*)
6868

6969
# Check module disable
70-
permutation"s1_save_pid""s1_disable_pg_qs""s2_pg_qs_counterpart"
70+
permutation"s1_save_pid""s1_disable_pg_qs""s2_pg_qs_counterpart"(*)
7171

7272
# Check roles correspondence
73-
permutation"s1_set_bob""s2_set_bob""s1_save_pid""s2_pg_qs_counterpart"
74-
permutation"s1_set_bob""s2_set_su""s1_save_pid""s2_pg_qs_counterpart"
75-
permutation"s1_set_bob""s2_set_alice""s1_save_pid""s2_pg_qs_counterpart"
73+
permutation"s1_set_bob""s2_set_bob""s1_save_pid""s2_pg_qs_counterpart"(*)
74+
permutation"s1_set_bob""s2_set_su""s1_save_pid""s2_pg_qs_counterpart"(*)
75+
permutation"s1_set_bob""s2_set_alice""s1_save_pid""s2_pg_qs_counterpart"(*)

0 commit comments

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