diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/backend/utils/adt/lockfuncs.c | 7 | ||||
| -rw-r--r-- | src/test/isolation/expected/insert-conflict-specconflict.out | 10 | ||||
| -rw-r--r-- | src/test/isolation/specs/insert-conflict-specconflict.spec | 2 |
3 files changed, 11 insertions, 8 deletions
diff --git a/src/backend/utils/adt/lockfuncs.c b/src/backend/utils/adt/lockfuncs.c index ecb1bf92ff7..e992d1bbfce 100644 --- a/src/backend/utils/adt/lockfuncs.c +++ b/src/backend/utils/adt/lockfuncs.c @@ -22,7 +22,10 @@ #include "utils/builtins.h" -/* This must match enum LockTagType! */ +/* + * This must match enum LockTagType! Also, be sure to document any changes + * in the docs for the pg_locks view and for wait event types. + */ const char *const LockTagTypeNames[] = { "relation", "extend", @@ -30,7 +33,7 @@ const char *const LockTagTypeNames[] = { "tuple", "transactionid", "virtualxid", - "speculative token", + "spectoken", "object", "userlock", "advisory" diff --git a/src/test/isolation/expected/insert-conflict-specconflict.out b/src/test/isolation/expected/insert-conflict-specconflict.out index 9be5ccf55f0..ae361fbd03a 100644 --- a/src/test/isolation/expected/insert-conflict-specconflict.out +++ b/src/test/isolation/expected/insert-conflict-specconflict.out @@ -362,16 +362,16 @@ step controller_print_speculative_locks: SELECT pa.application_name, locktype, mode, granted FROM pg_locks pl JOIN pg_stat_activity pa USING (pid) WHERE - locktype IN ('speculative token', 'transactionid') + locktype IN ('spectoken', 'transactionid') AND pa.datname = current_database() AND pa.application_name LIKE 'isolation/insert-conflict-specconflict-s%' ORDER BY 1, 2, 3, 4; application_namelocktype mode granted -isolation/insert-conflict-specconflict-s1speculative tokenShareLock f +isolation/insert-conflict-specconflict-s1spectoken ShareLock f isolation/insert-conflict-specconflict-s1transactionid ExclusiveLock t -isolation/insert-conflict-specconflict-s2speculative tokenExclusiveLock t +isolation/insert-conflict-specconflict-s2spectoken ExclusiveLock t isolation/insert-conflict-specconflict-s2transactionid ExclusiveLock t step controller_unlock_2_4: SELECT pg_advisory_unlock(2, 4); pg_advisory_unlock @@ -384,7 +384,7 @@ step controller_print_speculative_locks: SELECT pa.application_name, locktype, mode, granted FROM pg_locks pl JOIN pg_stat_activity pa USING (pid) WHERE - locktype IN ('speculative token', 'transactionid') + locktype IN ('spectoken', 'transactionid') AND pa.datname = current_database() AND pa.application_name LIKE 'isolation/insert-conflict-specconflict-s%' ORDER BY 1, 2, 3, 4; @@ -406,7 +406,7 @@ step controller_print_speculative_locks: SELECT pa.application_name, locktype, mode, granted FROM pg_locks pl JOIN pg_stat_activity pa USING (pid) WHERE - locktype IN ('speculative token', 'transactionid') + locktype IN ('spectoken', 'transactionid') AND pa.datname = current_database() AND pa.application_name LIKE 'isolation/insert-conflict-specconflict-s%' ORDER BY 1, 2, 3, 4; diff --git a/src/test/isolation/specs/insert-conflict-specconflict.spec b/src/test/isolation/specs/insert-conflict-specconflict.spec index 2572072c9e6..60283974915 100644 --- a/src/test/isolation/specs/insert-conflict-specconflict.spec +++ b/src/test/isolation/specs/insert-conflict-specconflict.spec @@ -64,7 +64,7 @@ step "controller_print_speculative_locks" { SELECT pa.application_name, locktype, mode, granted FROM pg_locks pl JOIN pg_stat_activity pa USING (pid) WHERE - locktype IN ('speculative token', 'transactionid') + locktype IN ('spectoken', 'transactionid') AND pa.datname = current_database() AND pa.application_name LIKE 'isolation/insert-conflict-specconflict-s%' ORDER BY 1, 2, 3, 4; |