Skip to content

Wrap pg_regress in a TAP test to setup cluster automatically #698

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
jeltz wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Wrap pg_regress in a TAP test to setup cluster automatically #698

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 2 additions & 11 deletions .github/scripts/test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,22 +3,13 @@
set -e

SCRIPT_DIR="$(cd -- "$(dirname "$0")" >/dev/null 2>&1; pwd -P)"
PG_BIN_DIR=$(pg_config --bindir)

cd "$SCRIPT_DIR/../../"

PG_VERSION=$(pg_config --version | sed -n 's/PostgreSQL \([0-9]*\).*/\1/p')

OPTS='-c shared_preload_libraries=pg_stat_monitor'

if [ "$1" = sanitize ]; then
OPTS+=' -c max_stack_depth=8MB'
export PG_TEST_INITDB_EXTRA_OPTS='--set max_stack_depth=8MB'
fi

$PG_BIN_DIR/pg_ctl -D regression_install -l regression_install.log init

$PG_BIN_DIR/pg_ctl -D regression_install -l regression_install.log start -o "$OPTS"

make installcheck

$PG_BIN_DIR/pg_ctl -D regression_install stop
make installcheck PROVE_FLAGS=-f
6 changes: 3 additions & 3 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,8 @@ dkms.conf
typedefs*.list

# test files
/regression.diffs
/regression.out
/results/
/regression/regression.diffs
/regression/regression.out
/regression/results/
/t/results/
/tmp_check/
25 changes: 0 additions & 25 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,31 +12,6 @@ PGFILEDESC = "pg_stat_monitor - Query Performance Monitoring Tool for PostgreSQL
LDFLAGS_SL += $(filter -lm, $(LIBS))

TAP_TESTS = 1
REGRESS_OPTS = --temp-config $(top_srcdir)/contrib/pg_stat_monitor/pg_stat_monitor.conf --inputdir=regression
REGRESS = basic \
version \
guc \
pgsm_query_id \
functions \
counters \
relations \
database \
error_insert \
application_name \
application_name_unique \
top_query \
different_parent_queries \
cmd_type \
error \
rows \
squashing \
tags \
user \
rollback \
level_tracking \
decode_error_level \
parallel \
histogram

PG_CONFIG ?= pg_config
PGXS := $(shell $(PG_CONFIG) --pgxs)
Expand Down
38 changes: 0 additions & 38 deletions meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,41 +24,3 @@ install_data(
'pg_stat_monitor--2.3--next.sql',
kwargs: contrib_data_args,
)

tests += {
'name': 'pg_stat_monitor',
'sd': meson.current_source_dir(),
'bd': meson.current_build_dir(),
'regress': {
'sql': [
'application_name',
'application_name_unique',
'basic',
'cmd_type',
'counters',
'database',
'different_parent_queries',
'error_insert',
'error',
'functions',
'guc',
'histogram',
'level_tracking',
'parallel',
'pgsqm_query_id',
'relations',
'rows',
'squashing',
'state',
'tags',
'top_query',
'user',
'version'
],
'regress_args': ['--temp-config', files('pg_stat_monitor.conf')],
# Disabled because these tests require
# "shared_preload_libraries=pg_stat_monitor", which typical
# runningcheck users do not have (e.g. buildfarm clients).
'runningcheck': false,
},
}
1 change: 0 additions & 1 deletion pg_stat_monitor.conf
View file
Open in desktop

This file was deleted.

18 changes: 9 additions & 9 deletions regression/expected/database.out
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ CREATE TABLE t2 (b int);
\c db2
CREATE TABLE t3 (c int);
CREATE TABLE t4 (d int);
\c contrib_regression
\c pgsm_regression
SELECT pg_stat_monitor_reset();
pg_stat_monitor_reset
-----------------------
Expand All @@ -26,15 +26,15 @@ SELECT * FROM t3,t4 WHERE t3.c = t4.d;
---+---
(0 rows)

\c contrib_regression
\c pgsm_regression
DROP DATABASE db2;
SELECT datname, query FROM pg_stat_monitor ORDER BY query COLLATE "C";
datname | query
--------------------+---------------------------------------
contrib_regression | DROP DATABASE db2
db1 | SELECT * FROM t1,t2 WHERE t1.a = t2.b
db2 | SELECT * FROM t3,t4 WHERE t3.c = t4.d
contrib_regression | SELECT pg_stat_monitor_reset()
datname | query
-----------------+---------------------------------------
pgsm_regression | DROP DATABASE db2
db1 | SELECT * FROM t1,t2 WHERE t1.a = t2.b
db2 | SELECT * FROM t3,t4 WHERE t3.c = t4.d
pgsm_regression | SELECT pg_stat_monitor_reset()
(4 rows)

SELECT pg_stat_monitor_reset();
Expand All @@ -46,6 +46,6 @@ SELECT pg_stat_monitor_reset();
\c db1
DROP TABLE t1;
DROP TABLE t2;
\c contrib_regression
\c pgsm_regression
DROP DATABASE db1;
DROP EXTENSION pg_stat_monitor;
34 changes: 17 additions & 17 deletions regression/expected/pgsm_query_id.out
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ CREATE FUNCTION add(integer, integer) RETURNS integer
LANGUAGE SQL
IMMUTABLE
RETURNS NULL ON NULL INPUT;
\c contrib_regression
\c pgsm_regression
SELECT pg_stat_monitor_reset();
pg_stat_monitor_reset
-----------------------
Expand Down Expand Up @@ -79,22 +79,22 @@ SELECT * FROM t3 where c = 20;
---
(0 rows)

\c contrib_regression
\c pgsm_regression
SELECT datname, pgsm_query_id, query, calls FROM pg_stat_monitor ORDER BY pgsm_query_id, query, datname;
datname | pgsm_query_id | query | calls
--------------------+---------------------+-----------------------------------------------------+-------
contrib_regression | 689150021118383254 | SELECT pg_stat_monitor_reset() | 1
db1 | 1897482803466821995 | SELECT * FROM t2 | 3
db1 | 1988437669671417938 | SELECT * FROM t1 | 1
db2 | 1988437669671417938 | SELECT * FROM t1 | 1
db1 | 2864453209316739369 | select $1 + $2 | 1
db2 | 2864453209316739369 | select $1 + $2 | 1
db2 | 6220142855706866455 | set pg_stat_monitor.pgsm_enable_pgsm_query_id = on | 1
db2 | 6633979598391393345 | SELECT * FROM t3 where c = 20 | 1
db1 | 8140395000078788481 | SELECT *, ADD(1, 2) FROM t1 | 1
db2 | 8140395000078788481 | SELECT *, ADD(1, 2) FROM t1 | 1
db2 | | SELECT * FROM t3 | 1
db2 | | set pg_stat_monitor.pgsm_enable_pgsm_query_id = off | 1
datname | pgsm_query_id | query | calls
-----------------+---------------------+-----------------------------------------------------+-------
pgsm_regression | 689150021118383254 | SELECT pg_stat_monitor_reset() | 1
db1 | 1897482803466821995 | SELECT * FROM t2 | 3
db1 | 1988437669671417938 | SELECT * FROM t1 | 1
db2 | 1988437669671417938 | SELECT * FROM t1 | 1
db1 | 2864453209316739369 | select $1 + $2 | 1
db2 | 2864453209316739369 | select $1 + $2 | 1
db2 | 6220142855706866455 | set pg_stat_monitor.pgsm_enable_pgsm_query_id = on | 1
db2 | 6633979598391393345 | SELECT * FROM t3 where c = 20 | 1
db1 | 8140395000078788481 | SELECT *, ADD(1, 2) FROM t1 | 1
db2 | 8140395000078788481 | SELECT *, ADD(1, 2) FROM t1 | 1
db2 | | SELECT * FROM t3 | 1
db2 | | set pg_stat_monitor.pgsm_enable_pgsm_query_id = off | 1
(12 rows)

SELECT pg_stat_monitor_reset();
Expand All @@ -111,7 +111,7 @@ DROP FUNCTION ADD;
DROP TABLE t1;
DROP TABLE t3;
DROP FUNCTION ADD;
\c contrib_regression
\c pgsm_regression
DROP DATABASE db1;
DROP DATABASE db2;
DROP EXTENSION pg_stat_monitor;
30 changes: 15 additions & 15 deletions regression/expected/pgsm_query_id_1.out
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ CREATE FUNCTION add(integer, integer) RETURNS integer
LANGUAGE SQL
IMMUTABLE
RETURNS NULL ON NULL INPUT;
\c contrib_regression
\c pgsm_regression
SELECT pg_stat_monitor_reset();
pg_stat_monitor_reset
-----------------------
Expand Down Expand Up @@ -79,20 +79,20 @@ SELECT * FROM t3 where c = 20;
---
(0 rows)

\c contrib_regression
\c pgsm_regression
SELECT datname, pgsm_query_id, query, calls FROM pg_stat_monitor ORDER BY pgsm_query_id, query, datname;
datname | pgsm_query_id | query | calls
--------------------+---------------------+-----------------------------------------------------+-------
contrib_regression | 689150021118383254 | SELECT pg_stat_monitor_reset() | 1
db1 | 1897482803466821995 | SELECT * FROM t2 | 3
db1 | 1988437669671417938 | SELECT * FROM t1 | 1
db2 | 1988437669671417938 | SELECT * FROM t1 | 1
db2 | 6220142855706866455 | set pg_stat_monitor.pgsm_enable_pgsm_query_id = on | 1
db2 | 6633979598391393345 | SELECT * FROM t3 where c = 20 | 1
db1 | 8140395000078788481 | SELECT *, ADD(1, 2) FROM t1 | 1
db2 | 8140395000078788481 | SELECT *, ADD(1, 2) FROM t1 | 1
db2 | | SELECT * FROM t3 | 1
db2 | | set pg_stat_monitor.pgsm_enable_pgsm_query_id = off | 1
datname | pgsm_query_id | query | calls
-----------------+---------------------+-----------------------------------------------------+-------
pgsm_regression | 689150021118383254 | SELECT pg_stat_monitor_reset() | 1
db1 | 1897482803466821995 | SELECT * FROM t2 | 3
db1 | 1988437669671417938 | SELECT * FROM t1 | 1
db2 | 1988437669671417938 | SELECT * FROM t1 | 1
db2 | 6220142855706866455 | set pg_stat_monitor.pgsm_enable_pgsm_query_id = on | 1
db2 | 6633979598391393345 | SELECT * FROM t3 where c = 20 | 1
db1 | 8140395000078788481 | SELECT *, ADD(1, 2) FROM t1 | 1
db2 | 8140395000078788481 | SELECT *, ADD(1, 2) FROM t1 | 1
db2 | | SELECT * FROM t3 | 1
db2 | | set pg_stat_monitor.pgsm_enable_pgsm_query_id = off | 1
(10 rows)

SELECT pg_stat_monitor_reset();
Expand All @@ -109,7 +109,7 @@ DROP FUNCTION ADD;
DROP TABLE t1;
DROP TABLE t3;
DROP FUNCTION ADD;
\c contrib_regression
\c pgsm_regression
DROP DATABASE db1;
DROP DATABASE db2;
DROP EXTENSION pg_stat_monitor;
28 changes: 14 additions & 14 deletions regression/expected/pgsm_query_id_2.out
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ CREATE FUNCTION add(integer, integer) RETURNS integer
LANGUAGE SQL
IMMUTABLE
RETURNS NULL ON NULL INPUT;
\c contrib_regression
\c pgsm_regression
SELECT pg_stat_monitor_reset();
pg_stat_monitor_reset
-----------------------
Expand Down Expand Up @@ -79,19 +79,19 @@ SELECT * FROM t3 where c = 20;
---
(0 rows)

\c contrib_regression
\c pgsm_regression
SELECT datname, pgsm_query_id, query, calls FROM pg_stat_monitor ORDER BY pgsm_query_id, query, datname;
datname | pgsm_query_id | query | calls
--------------------+---------------------+-----------------------------------------------------+-------
contrib_regression | 689150021118383254 | SELECT pg_stat_monitor_reset() | 1
db1 | 1897482803466821995 | SELECT * FROM t2 | 3
db1 | 1988437669671417938 | SELECT * FROM t1 | 1
db2 | 1988437669671417938 | SELECT * FROM t1 | 1
db2 | 6633979598391393345 | SELECT * FROM t3 where c = 20 | 1
db1 | 8140395000078788481 | SELECT *, ADD(1, 2) FROM t1 | 1
db2 | 8140395000078788481 | SELECT *, ADD(1, 2) FROM t1 | 1
db2 | | SELECT * FROM t3 | 1
db2 | | set pg_stat_monitor.pgsm_enable_pgsm_query_id = off | 2
datname | pgsm_query_id | query | calls
-----------------+---------------------+-----------------------------------------------------+-------
pgsm_regression | 689150021118383254 | SELECT pg_stat_monitor_reset() | 1
db1 | 1897482803466821995 | SELECT * FROM t2 | 3
db1 | 1988437669671417938 | SELECT * FROM t1 | 1
db2 | 1988437669671417938 | SELECT * FROM t1 | 1
db2 | 6633979598391393345 | SELECT * FROM t3 where c = 20 | 1
db1 | 8140395000078788481 | SELECT *, ADD(1, 2) FROM t1 | 1
db2 | 8140395000078788481 | SELECT *, ADD(1, 2) FROM t1 | 1
db2 | | SELECT * FROM t3 | 1
db2 | | set pg_stat_monitor.pgsm_enable_pgsm_query_id = off | 2
(9 rows)

SELECT pg_stat_monitor_reset();
Expand All @@ -108,7 +108,7 @@ DROP FUNCTION ADD;
DROP TABLE t1;
DROP TABLE t3;
DROP FUNCTION ADD;
\c contrib_regression
\c pgsm_regression
DROP DATABASE db1;
DROP DATABASE db2;
DROP EXTENSION pg_stat_monitor;
34 changes: 17 additions & 17 deletions regression/expected/rollback.out
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@ BEGIN;
INSERT INTO t VALUES (1);
COMMIT;
SELECT query, username, datname FROM pg_stat_monitor ORDER BY query COLLATE "C";
query | username | datname
--------------------------------+----------+--------------------
BEGIN | u | contrib_regression
COMMIT | u | contrib_regression
INSERT INTO t VALUES (1) | u | contrib_regression
SELECT pg_stat_monitor_reset() | u | contrib_regression
query | username | datname
--------------------------------+----------+-----------------
BEGIN | u | pgsm_regression
COMMIT | u | pgsm_regression
INSERT INTO t VALUES (1) | u | pgsm_regression
SELECT pg_stat_monitor_reset() | u | pgsm_regression
(4 rows)

SELECT pg_stat_monitor_reset();
Expand All @@ -31,12 +31,12 @@ BEGIN;
INSERT INTO t VALUES (2);
ROLLBACK;
SELECT query, username, datname FROM pg_stat_monitor ORDER BY query COLLATE "C";
query | username | datname
--------------------------------+----------+--------------------
BEGIN | u | contrib_regression
INSERT INTO t VALUES (2) | u | contrib_regression
ROLLBACK | u | contrib_regression
SELECT pg_stat_monitor_reset() | u | contrib_regression
query | username | datname
--------------------------------+----------+-----------------
BEGIN | u | pgsm_regression
INSERT INTO t VALUES (2) | u | pgsm_regression
ROLLBACK | u | pgsm_regression
SELECT pg_stat_monitor_reset() | u | pgsm_regression
(4 rows)

SELECT pg_stat_monitor_reset();
Expand All @@ -52,12 +52,12 @@ ERROR: duplicate key value violates unique constraint "t_pkey"
DETAIL: Key (a)=(1) already exists.
ROLLBACK;
SELECT query, username, datname FROM pg_stat_monitor ORDER BY query COLLATE "C";
query | username | datname
--------------------------------+----------+--------------------
BEGIN | u | contrib_regression
INSERT INTO t VALUES (1); | u | contrib_regression
query | username | datname
--------------------------------+----------+-----------------
BEGIN | u | pgsm_regression
INSERT INTO t VALUES (1); | u | pgsm_regression
ROLLBACK | |
SELECT pg_stat_monitor_reset() | u | contrib_regression
SELECT pg_stat_monitor_reset() | u | pgsm_regression
(4 rows)

SELECT pg_stat_monitor_reset();
Expand Down
6 changes: 3 additions & 3 deletions regression/sql/database.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,15 @@ CREATE TABLE t2 (b int);
CREATE TABLE t3 (c int);
CREATE TABLE t4 (d int);

\c contrib_regression
\c pgsm_regression
SELECT pg_stat_monitor_reset();
\c db1
SELECT * FROM t1,t2 WHERE t1.a = t2.b;

\c db2
SELECT * FROM t3,t4 WHERE t3.c = t4.d;

\c contrib_regression
\c pgsm_regression
DROP DATABASE db2;

SELECT datname, query FROM pg_stat_monitor ORDER BY query COLLATE "C";
Expand All @@ -29,6 +29,6 @@ SELECT pg_stat_monitor_reset();
DROP TABLE t1;
DROP TABLE t2;

\c contrib_regression
\c pgsm_regression
DROP DATABASE db1;
DROP EXTENSION pg_stat_monitor;
Loading
Loading