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

Commit6d6e26d

Browse files
dlepikhovaololobus
authored andcommitted
Added support for 13 pgsql
1 parentfeaebcd commit6d6e26d

9 files changed

+653
-6
lines changed

‎.travis.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ notifications:
1818
on_failure:always
1919

2020
env:
21+
-PG_VERSION=13 LEVEL=hardcore USE_TPCDS=1
22+
-PG_VERSION=13
2123
-PG_VERSION=12 LEVEL=hardcore USE_TPCDS=1
2224
-PG_VERSION=12
2325
-PG_VERSION=11 LEVEL=hardcore USE_TPCDS=1

‎Makefile

Lines changed: 23 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,10 @@ DATA = pg_query_state--1.0--1.1.sql
88
DATA_built =$(EXTENSION)--$(EXTVERSION).sql
99
PGFILEDESC = "pg_query_state - facility to track progress of plan execution"
1010

11+
ISOLATIONCHECKS=corner_cases
12+
1113
EXTRA_CLEAN = ./isolation_output$(EXTENSION)--$(EXTVERSION).sql\
12-
Dockerfile ./tests/*.pyc./tmp_stress
14+
Dockerfile ./tests/*.pycexpected/$(ISOLATIONCHECKS).out expected/$(ISOLATIONCHECKS)_2.out
1315

1416
ifdefUSE_PGXS
1517
PG_CONFIG ?= pg_config
@@ -25,9 +27,24 @@ endif
2527
$(EXTENSION)--$(EXTVERSION).sql: init.sql
2628
cat$^>$@
2729

28-
check: isolationcheck
30+
check:versioncheckisolationcheck
2931

30-
ISOLATIONCHECKS=corner_cases
32+
VERSION =$(MAJORVERSION)
33+
ifneq (,$(findstring$(MAJORVERSION), 9.5 9.6 10 11 12))
34+
VERSION = old
35+
else
36+
VERSION = new
37+
endif
38+
39+
versioncheck:
40+
if [-f expected/$(ISOLATIONCHECKS).out&&-f expected/$(ISOLATIONCHECKS)_2.out]; \
41+
then\
42+
cp expected/$(ISOLATIONCHECKS).out.$(VERSION) cat expected/$(ISOLATIONCHECKS).out;\
43+
cp expected/$(ISOLATIONCHECKS)_2.out.$(VERSION) cat expected/$(ISOLATIONCHECKS)_2.out;\
44+
else\
45+
cp expected/$(ISOLATIONCHECKS).out.$(VERSION) expected/$(ISOLATIONCHECKS).out;\
46+
cp expected/$(ISOLATIONCHECKS)_2.out.$(VERSION) expected/$(ISOLATIONCHECKS)_2.out;\
47+
fi
3148

3249
submake-isolation:
3350
$(MAKE) -C$(top_builddir)/src/test/isolation all
@@ -37,14 +54,14 @@ isolationcheck: | submake-isolation temp-install
3754
$(pg_isolation_regress_check)\
3855
--temp-config$(top_srcdir)/contrib/pg_query_state/test.conf\
3956
--outputdir=isolation_output\
40-
$(ISOLATIONCHECKS)
57+
$(ISOLATIONCHECKS)
4158

4259
isolationcheck-install-force: all | submake-isolation temp-install
4360
$(MKDIR_P) isolation_output
4461
$(pg_isolation_regress_installcheck)\
4562
--outputdir=isolation_output\
46-
$(ISOLATIONCHECKS)
63+
$(ISOLATIONCHECKS)
4764

48-
.PHONY: isolationcheck isolationcheck-install-force check
65+
.PHONY:versioncheckisolationcheck isolationcheck-install-force check
4966

5067
temp-install: EXTRA_INSTALL=contrib/pg_query_state

‎expected/corner_cases.out.new

Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
Parsed test spec with 2 sessions
2+
3+
starting permutation: s1_pg_qs_1
4+
step s1_pg_qs_1: select pg_query_state(1);
5+
ERROR: backend with pid=1 not found
6+
7+
starting permutation: s1_pg_qs_2
8+
step s1_pg_qs_2: select pg_query_state(pg_backend_pid());
9+
ERROR: attempt to extract state of current process
10+
11+
starting permutation: s1_save_pid s2_pg_qs_counterpart
12+
step s1_save_pid: select save_own_pid(0);
13+
save_own_pid
14+
15+
16+
s2: INFO: state of backend is idle
17+
step s2_pg_qs_counterpart: select pg_query_state(counterpart_pid(0));
18+
pg_query_state
19+
20+
21+
starting permutation: s1_save_pid s1_disable_pg_qs s2_pg_qs_counterpart
22+
step s1_save_pid: select save_own_pid(0);
23+
save_own_pid
24+
25+
26+
step s1_disable_pg_qs: set pg_query_state.enable to off;
27+
s2: INFO: query execution statistics disabled
28+
step s2_pg_qs_counterpart: select pg_query_state(counterpart_pid(0));
29+
pg_query_state
30+
31+
32+
starting permutation: s1_set_bob s2_set_bob s1_save_pid s2_pg_qs_counterpart
33+
step s1_set_bob: set role bob;
34+
step s2_set_bob: set role bob;
35+
step s1_save_pid: select save_own_pid(0);
36+
save_own_pid
37+
38+
39+
s2: INFO: state of backend is idle
40+
step s2_pg_qs_counterpart: select pg_query_state(counterpart_pid(0));
41+
pg_query_state
42+
43+
44+
starting permutation: s1_set_bob s2_set_su s1_save_pid s2_pg_qs_counterpart
45+
step s1_set_bob: set role bob;
46+
step s2_set_su: set role super;
47+
step s1_save_pid: select save_own_pid(0);
48+
save_own_pid
49+
50+
51+
s2: INFO: state of backend is idle
52+
step s2_pg_qs_counterpart: select pg_query_state(counterpart_pid(0));
53+
pg_query_state
54+
55+
56+
starting permutation: s1_set_bob s2_set_alice s1_save_pid s2_pg_qs_counterpart
57+
step s1_set_bob: set role bob;
58+
step s2_set_alice: set role alice;
59+
step s1_save_pid: select save_own_pid(0);
60+
save_own_pid
61+
62+
63+
step s2_pg_qs_counterpart: select pg_query_state(counterpart_pid(0));
64+
ERROR: permission denied
65+
unused step name: s1_enable_pg_qs
66+
unused step name: s1_pg_qs_counterpart
67+
unused step name: s2_save_pid
File renamed without changes.

‎expected/corner_cases_2.out.new

Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
Parsed test spec with 2 sessions
2+
3+
starting permutation: s1_pg_qs_1
4+
step s1_pg_qs_1: select pg_query_state(1);
5+
ERROR: backend with pid=1 not found
6+
7+
starting permutation: s1_pg_qs_2
8+
step s1_pg_qs_2: select pg_query_state(pg_backend_pid());
9+
ERROR: attempt to extract state of current process
10+
11+
starting permutation: s1_save_pid s2_pg_qs_counterpart
12+
step s1_save_pid: select save_own_pid(0);
13+
save_own_pid
14+
15+
16+
s2: INFO: state of backend is idle
17+
step s2_pg_qs_counterpart: select pg_query_state(counterpart_pid(0));
18+
pg_query_state
19+
20+
21+
starting permutation: s1_save_pid s1_disable_pg_qs s2_pg_qs_counterpart
22+
step s1_save_pid: select save_own_pid(0);
23+
save_own_pid
24+
25+
26+
step s1_disable_pg_qs: set pg_query_state.enable to off;
27+
s2: INFO: query execution statistics disabled
28+
step s2_pg_qs_counterpart: select pg_query_state(counterpart_pid(0));
29+
pg_query_state
30+
31+
32+
starting permutation: s1_set_bob s2_set_bob s1_save_pid s2_pg_qs_counterpart
33+
step s1_set_bob: set role bob;
34+
step s2_set_bob: set role bob;
35+
step s1_save_pid: select save_own_pid(0);
36+
save_own_pid
37+
38+
39+
s2: INFO: state of backend is idle
40+
step s2_pg_qs_counterpart: select pg_query_state(counterpart_pid(0));
41+
pg_query_state
42+
43+
44+
starting permutation: s1_set_bob s2_set_su s1_save_pid s2_pg_qs_counterpart
45+
step s1_set_bob: set role bob;
46+
step s2_set_su: set role super;
47+
step s1_save_pid: select save_own_pid(0);
48+
save_own_pid
49+
50+
51+
s2: INFO: state of backend is idle
52+
step s2_pg_qs_counterpart: select pg_query_state(counterpart_pid(0));
53+
pg_query_state
54+
55+
56+
starting permutation: s1_set_bob s2_set_alice s1_save_pid s2_pg_qs_counterpart
57+
step s1_set_bob: set role bob;
58+
step s2_set_alice: set role alice;
59+
step s1_save_pid: select save_own_pid(0);
60+
save_own_pid
61+
62+
63+
step s2_pg_qs_counterpart: select pg_query_state(counterpart_pid(0));
64+
ERROR: permission denied
65+
unused step name: s1_enable_pg_qs
66+
unused step name: s1_pg_qs_counterpart
67+
unused step name: s2_save_pid
File renamed without changes.

0 commit comments

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