Skip to content

Commit ae78219

Browse files
ildusildus
committed
Simplify tests for 9.4
1 parent 4c54dc0 commit ae78219

File tree

6 files changed

+47
-261
lines changed

6 files changed

+47
-261
lines changed

‎contrib/pg_stat_wait/Makefile‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ EXTENSION = pg_stat_wait
77
DATA = pg_stat_wait--1.0.sql
88
PG_CPPFLAGS = -DPG_STAT_WAIT_TESTS
99
EXTRA_CLEAN = $(pg_regress_clean_files) ./regression_output ./isolation_output
10-
EXTRA_INSTALL=contrib/pg_stat_wait
1110

1211
ifdef USE_PGXS
1312
PG_CONFIG = pg_config
@@ -20,7 +19,7 @@ include $(top_builddir)/src/Makefile.global
2019
include $(top_srcdir)/contrib/contrib-global.mk
2120
endif
2221

23-
check: regresscheck isolationcheck
22+
check: regresscheck
2423

2524
submake-regress:
2625
$(MAKE) -C $(top_builddir)/src/test/regress all
@@ -31,13 +30,13 @@ submake-isolation:
3130
submake-pg_stat_wait:
3231
$(MAKE) -C $(top_builddir)/contrib/pg_stat_wait
3332

34-
REGRESSCHECKS=file_trace descriptions
33+
REGRESSCHECKS=descriptions file_trace
3534

3635
regresscheck: all | submake-regress submake-pg_stat_wait
3736
$(MKDIR_P) regression_output
3837
$(pg_regress_check) \
39-
--temp-instance=./tmp_check \
40-
--load-extension=pg_stat_wait \
38+
--temp-install=./tmp_check \
39+
--extra-install=contrib/pg_stat_wait \
4140
--outputdir=./regression_output \
4241
$(REGRESSCHECKS)
4342

@@ -46,9 +45,8 @@ ISOLATIONCHECKS=history
4645
isolationcheck: all | submake-isolation submake-pg_stat_wait
4746
$(MKDIR_P) isolation_output
4847
$(pg_isolation_regress_check) \
49-
--temp-instance=./tmp_check \
48+
--extra-install=contrib/pg_stat_wait \
5049
--temp-config=./waits.conf \
51-
--load-extension=pg_stat_wait \
5250
--outputdir=./isolation_output \
5351
$(ISOLATIONCHECKS)
5452

‎contrib/pg_stat_wait/expected/descriptions.out‎

Lines changed: 37 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1+
CREATE EXTENSION pg_stat_wait;
12
SELECT * FROM pg_wait_event;
23
class_id | event_id | name
34
----------+----------+-----------------------------------
4-
0 | 0 |
5-
1 | 0 |
5+
1 | 0 | BufFreelistLock
66
1 | 1 | ShmemIndexLock
77
1 | 2 | OidGenLock
88
1 | 3 | XidGenLock
@@ -40,33 +40,28 @@ SELECT * FROM pg_wait_event;
4040
1 | 35 | AutoFileLock
4141
1 | 36 | ReplicationSlotAllocationLock
4242
1 | 37 | ReplicationSlotControlLock
43-
1 | 38 | CommitTsControlLock
44-
1 | 39 | CommitTsLock
45-
1 | 40 | ReplicationOriginLock
46-
1 | 41 | UserDefinedLocks
47-
1 | 42 | WALInsertLocks
48-
1 | 43 | CLogBufferLocks
49-
1 | 44 | CommitTSBufferLocks
50-
1 | 45 | SubtransBufferLocks
51-
1 | 46 | MultiXactOffsetBufferLocks
52-
1 | 47 | MultiXactMemberBufferLocks
53-
1 | 48 | BufferMgrLocks
54-
1 | 49 | BufferLWLocks
55-
1 | 50 | LockMgrLWLocks
56-
1 | 51 | OldSerXidBufferLocks
57-
1 | 52 | PredicateLWLocks
58-
1 | 53 | ProcessLocks
59-
1 | 54 | AsyncBufferLocks
43+
1 | 38 | UserDefinedLocks
44+
1 | 39 | WALInsertLocks
45+
1 | 40 | CLogBufferLocks
46+
1 | 41 | SubtransBufferLocks
47+
1 | 42 | MultiXactOffsetBufferLocks
48+
1 | 43 | MultiXactMemberBufferLocks
49+
1 | 44 | BufferMgrLocks
50+
1 | 45 | BufferLWLocks
51+
1 | 46 | LockMgrLWLocks
52+
1 | 47 | OldSerXidBufferLocks
53+
1 | 48 | PredicateLWLocks
54+
1 | 49 | ProcessLocks
55+
1 | 50 | AsyncBufferLocks
6056
2 | 0 | Relation
6157
2 | 1 | RelationExtend
6258
2 | 2 | Page
6359
2 | 3 | Tuple
6460
2 | 4 | Transaction
6561
2 | 5 | VirtualTransaction
66-
2 | 6 | SpeculativeToken
67-
2 | 7 | Object
68-
2 | 8 | Userlock
69-
2 | 9 | Advisory
62+
2 | 6 | Object
63+
2 | 7 | Userlock
64+
2 | 8 | Advisory
7065
3 | 0 | SMGR_READ
7166
3 | 1 | SMGR_WRITE
7267
3 | 2 | SMGR_FSYNC
@@ -81,7 +76,7 @@ SELECT * FROM pg_wait_event;
8176
5 | 1 | WRITE
8277
5 | 2 | SYSLOG
8378
6 | 0 | Allocations
84-
(80 rows)
79+
(74 rows)
8580

8681
SELECT * FROM pg_wait_class;
8782
class_id | name
@@ -97,7 +92,7 @@ SELECT * FROM pg_wait_class;
9792
SELECT * FROM pg_wait_events;
9893
class_id | class_name | event_id | event_name
9994
----------+-------------+----------+-----------------------------------
100-
1 | LWLocks | 0 |
95+
1 | LWLocks | 0 | BufFreelistLock
10196
1 | LWLocks | 1 | ShmemIndexLock
10297
1 | LWLocks | 2 | OidGenLock
10398
1 | LWLocks | 3 | XidGenLock
@@ -135,33 +130,28 @@ SELECT * FROM pg_wait_events;
135130
1 | LWLocks | 35 | AutoFileLock
136131
1 | LWLocks | 36 | ReplicationSlotAllocationLock
137132
1 | LWLocks | 37 | ReplicationSlotControlLock
138-
1 | LWLocks | 38 | CommitTsControlLock
139-
1 | LWLocks | 39 | CommitTsLock
140-
1 | LWLocks | 40 | ReplicationOriginLock
141-
1 | LWLocks | 41 | UserDefinedLocks
142-
1 | LWLocks | 42 | WALInsertLocks
143-
1 | LWLocks | 43 | CLogBufferLocks
144-
1 | LWLocks | 44 | CommitTSBufferLocks
145-
1 | LWLocks | 45 | SubtransBufferLocks
146-
1 | LWLocks | 46 | MultiXactOffsetBufferLocks
147-
1 | LWLocks | 47 | MultiXactMemberBufferLocks
148-
1 | LWLocks | 48 | BufferMgrLocks
149-
1 | LWLocks | 49 | BufferLWLocks
150-
1 | LWLocks | 50 | LockMgrLWLocks
151-
1 | LWLocks | 51 | OldSerXidBufferLocks
152-
1 | LWLocks | 52 | PredicateLWLocks
153-
1 | LWLocks | 53 | ProcessLocks
154-
1 | LWLocks | 54 | AsyncBufferLocks
133+
1 | LWLocks | 38 | UserDefinedLocks
134+
1 | LWLocks | 39 | WALInsertLocks
135+
1 | LWLocks | 40 | CLogBufferLocks
136+
1 | LWLocks | 41 | SubtransBufferLocks
137+
1 | LWLocks | 42 | MultiXactOffsetBufferLocks
138+
1 | LWLocks | 43 | MultiXactMemberBufferLocks
139+
1 | LWLocks | 44 | BufferMgrLocks
140+
1 | LWLocks | 45 | BufferLWLocks
141+
1 | LWLocks | 46 | LockMgrLWLocks
142+
1 | LWLocks | 47 | OldSerXidBufferLocks
143+
1 | LWLocks | 48 | PredicateLWLocks
144+
1 | LWLocks | 49 | ProcessLocks
145+
1 | LWLocks | 50 | AsyncBufferLocks
155146
2 | Locks | 0 | Relation
156147
2 | Locks | 1 | RelationExtend
157148
2 | Locks | 2 | Page
158149
2 | Locks | 3 | Tuple
159150
2 | Locks | 4 | Transaction
160151
2 | Locks | 5 | VirtualTransaction
161-
2 | Locks | 6 | SpeculativeToken
162-
2 | Locks | 7 | Object
163-
2 | Locks | 8 | Userlock
164-
2 | Locks | 9 | Advisory
152+
2 | Locks | 6 | Object
153+
2 | Locks | 7 | Userlock
154+
2 | Locks | 8 | Advisory
165155
3 | Storage | 0 | SMGR_READ
166156
3 | Storage | 1 | SMGR_WRITE
167157
3 | Storage | 2 | SMGR_FSYNC
@@ -176,5 +166,5 @@ SELECT * FROM pg_wait_events;
176166
5 | Network | 1 | WRITE
177167
5 | Network | 2 | SYSLOG
178168
6 | Allocations | 0 | Allocations
179-
(79 rows)
169+
(74 rows)
180170

‎contrib/pg_stat_wait/expected/history.out‎

Lines changed: 0 additions & 107 deletions
This file was deleted.

‎contrib/pg_stat_wait/pg_stat_wait.c‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -162,6 +162,8 @@ pg_wait_event_list(PG_FUNCTION_ARGS)
162162

163163
funcctx->tuple_desc = BlessTupleDesc(tupdesc);
164164
funcctx->user_fctx = palloc0(sizeof(WaitEventContext));
165+
166+
((WaitEventContext *)funcctx->user_fctx)->class_cnt = 1;
165167
MemoryContextSwitchTo(oldcontext);
166168
}
167169

‎contrib/pg_stat_wait/specs/history.spec‎

Lines changed: 0 additions & 99 deletions
This file was deleted.

0 commit comments

Comments
 (0)