*** a/doc/src/sgml/func.sgml
--- b/doc/src/sgml/func.sgml
***************
*** 14544,14634 **** SELECT (pg_stat_file('filename')).modification;
pg_advisory_lock(key bigint)void
! Obtain exclusive advisory lockpg_advisory_lock(key1 int, key2 int)void
! Obtain exclusive advisory lockpg_advisory_lock_shared(key bigint)void
! Obtain shared advisory lockpg_advisory_lock_shared(key1 int, key2 int)void
! Obtain shared advisory lockpg_advisory_unlock(key bigint)boolean
! Release an exclusive advisory lockpg_advisory_unlock(key1 int, key2 int)boolean
! Release an exclusive advisory lockpg_advisory_unlock_all()void
! Release all advisory locks held by the current sessionpg_advisory_unlock_shared(key bigint)boolean
! Release a shared advisory lockpg_advisory_unlock_shared(key1 int, key2 int)boolean
! Release a shared advisory lockpg_try_advisory_lock(key bigint)boolean
! Obtain exclusive advisory lock if availablepg_try_advisory_lock(key1 int, key2 int)boolean
! Obtain exclusive advisory lock if availablepg_try_advisory_lock_shared(key bigint)boolean
! Obtain shared advisory lock if availablepg_try_advisory_lock_shared(key1 int, key2 int)boolean
! Obtain shared advisory lock if available
--- 14544,14690 ----
pg_advisory_lock(key bigint)void
! Obtain exclusive session level advisory lockpg_advisory_lock(key1 int, key2 int)void
! Obtain exclusive session level advisory lockpg_advisory_lock_shared(key bigint)void
! Obtain shared session level advisory lockpg_advisory_lock_shared(key1 int, key2 int)void
! Obtain shared session level advisory lockpg_advisory_unlock(key bigint)boolean
! Release an exclusive session level advisory lockpg_advisory_unlock(key1 int, key2 int)boolean
! Release an exclusive session level advisory lockpg_advisory_unlock_all()void
! Release all session level advisory locks held by the current sessionpg_advisory_unlock_shared(key bigint)boolean
! Release a shared session level advisory lockpg_advisory_unlock_shared(key1 int, key2 int)boolean
! Release a shared session level advisory lockpg_try_advisory_lock(key bigint)boolean
! Obtain exclusive session level advisory lock if availablepg_try_advisory_lock(key1 int, key2 int)boolean
! Obtain exclusive session level advisory lock if availablepg_try_advisory_lock_shared(key bigint)boolean
! Obtain shared session level advisory lock if availablepg_try_advisory_lock_shared(key1 int, key2 int)boolean
! Obtain shared session level advisory lock if available
!
!
!
! pg_advisory_xact_lock(key bigint)
!
! void
! Obtain exclusive transaction level advisory lock
!
!
!
! pg_advisory_xact_lock(key1 int, key2 int)
!
! void
! Obtain exclusive transaction level advisory lock
!
!
!
! pg_advisory_xact_lock_shared(key bigint)
!
! void
! Obtain shared transaction level advisory lock
!
!
!
! pg_advisory_xact_lock_shared(key1 int, key2 int)
!
! void
! Obtain shared advisory lock for the current transaction
!
!
!
! pg_try_advisory_xact_lock(key bigint)
!
! boolean
! Obtain exclusive transaction level advisory lock if available
!
!
!
! pg_try_advisory_xact_lock(key1 int, key2 int)
!
! boolean
! Obtain exclusive transaction level advisory lock if available
!
!
!
! pg_try_advisory_xact_lock_shared(key bigint)
!
! boolean
! Obtain shared transaction level advisory lock if available
!
!
!
! pg_try_advisory_xact_lock_shared(key1 int, key2 int)
!
! boolean
! Obtain shared transaction level advisory lock if available
***************
*** 14680,14690 **** SELECT (pg_stat_file('filename')).modification;
pg_advisory_unlockpg_advisory_unlock will release a previously-acquired
! exclusive advisory lock. It
returns true if the lock is successfully released.
If the lock was not held, it will return false,
and in addition, an SQL warning will be raised by the server.
--- 14736,14784 ----
+ pg_advisory_xact_lock
+
+
+ pg_advisory_xact_lock works the same as pg_advisory_lock,
+ expect the lock is automatically released at the end of the current
+ transaction and can not be released explicitly.
+
+
+
+ pg_advisory_xact_lock_shared
+
+
+ pg_advisory_xact_lock_shared works the same as
+ pg_advisory_lock_shared, expect the lock is automatically released at the
+ end of the current transaction and can not be released explicitly.
+
+
+
+ pg_try_advisory_xact_lock
+
+
+ pg_try_advisory_xact_lock works the same as
+ pg_try_advisory_lock, expect the lock, if acquired, is automatically
+ released at the end of the current transaction and can not be released
+ explicitly.
+
+
+
+ pg_try_advisory_xact_lock_shared
+
+
+ pg_try_advisory_xact_lock_shared works the same as
+ pg_try_advisory_lock_shared, expect the lock, if acquired, is automatically
+ released at the end of the current transaction and can not be released
+ explicitly.
+
+
+ pg_advisory_unlockpg_advisory_unlock will release a previously-acquired
! exclusive session level advisory lock. It
returns true if the lock is successfully released.
If the lock was not held, it will return false,
and in addition, an SQL warning will be raised by the server.
***************
*** 14696,14710 **** SELECT (pg_stat_file('filename')).modification;
pg_advisory_unlock_shared works the same as
pg_advisory_unlock,
! except it releases a shared advisory lock.
pg_advisory_unlock_all
! pg_advisory_unlock_all will release all advisory locks
! held by the current session. (This function is implicitly invoked
at session end, even if the client disconnects ungracefully.)
--- 14790,14804 ----
pg_advisory_unlock_shared works the same as
pg_advisory_unlock,
! except it releases a shared session level advisory lock.
pg_advisory_unlock_all
! pg_advisory_unlock_all will release all session level advisory
! locks held by the current session. (This function is implicitly invoked
at session end, even if the client disconnects ungracefully.)
*** a/doc/src/sgml/mvcc.sgml
--- b/doc/src/sgml/mvcc.sgml
***************
*** 1038,1056 **** UPDATE accounts SET balance = balance - 100.00 WHERE acctnum = 22222;
called advisory locks, because the system does not
enforce their use — it is up to the application to use them
correctly. Advisory locks can be useful for locking strategies
! that are an awkward fit for the MVCC model. Once acquired, an
! advisory lock is held until explicitly released or the session ends.
! Unlike standard locks, advisory locks do not
! honor transaction semantics: a lock acquired during a
! transaction that is later rolled back will still be held following the
rollback, and likewise an unlock is effective even if the calling
! transaction fails later. The same lock can be acquired multiple times by
! its owning process: for each lock request there must be a corresponding
! unlock request before the lock is actually released. (If a session
! already holds a given lock, additional requests will always succeed, even
! if other sessions are awaiting the lock.) Like all locks in
! PostgreSQL, a complete list of advisory
! locks currently held by any session can be found in the
pg_locks
system view.
--- 1038,1065 ----
called advisory locks, because the system does not
enforce their use — it is up to the application to use them
correctly. Advisory locks can be useful for locking strategies
! that are an awkward fit for the MVCC model.
!
!
! There are two different types of advisory locks in
! PostgreSQL: session level and transaction level.
! Once acquired, a session level advisory lock is held until explicitly
! released or the session ends. Unlike standard locks, session level
! advisory locks do not honor transaction semantics: a lock acquired during
! a transaction that is later rolled back will still be held following the
rollback, and likewise an unlock is effective even if the calling
! transaction fails later. The same session level lock can be acquired
! multiple times by its owning process: for each lock request there must be
! a corresponding unlock request before the lock is actually released. (If a
! session already holds a given lock, additional requests will always succeed,
! even if other sessions are awaiting the lock.) Transaction level locks on
! the other hand behave more like regular locks; they are automatically
! released at the end of the transaction, and can not be explicitly unlocked.
! Session and transaction level locks share the same lock space, which means
! that a transaction level lock will prevent another session from obtaining
! a session level lock on that same resource and vice versa.
! Like all locks in PostgreSQL, a complete list of
! advisory locks currently held by any session can be found in the
pg_locks
system view.
***************
*** 1072,1078 **** UPDATE accounts SET balance = balance - 100.00 WHERE acctnum = 22222;
strategies typical of so called flat file data management
systems.
While a flag stored in a table could be used for the same purpose,
! advisory locks are faster, avoid MVCC bloat, and are automatically
cleaned up by the server at the end of the session.
In certain cases using this advisory locking method, especially in queries
involving explicit ordering and LIMIT clauses, care must be
--- 1081,1087 ----
strategies typical of so called flat file data management
systems.
While a flag stored in a table could be used for the same purpose,
! advisory locks are faster, avoid MVCC bloat, and can be automatically
cleaned up by the server at the end of the session.
In certain cases using this advisory locking method, especially in queries
involving explicit ordering and LIMIT clauses, care must be
*** a/src/backend/storage/lmgr/README
--- b/src/backend/storage/lmgr/README
***************
*** 503,523 **** User Locks
----------
User locks are handled totally on the application side as long term
! cooperative locks which extend beyond the normal transaction boundaries.
! Their purpose is to indicate to an application that someone is `working'
! on an item. So it is possible to put an user lock on a tuple's oid,
! retrieve the tuple, work on it for an hour and then update it and remove
! the lock. While the lock is active other clients can still read and write
! the tuple but they can be aware that it has been locked at the application
! level by someone.
User locks and normal locks are completely orthogonal and they don't
interfere with each other.
- User locks are always held as session locks, so that they are not released at
- transaction end. They must be released explicitly by the application --- but
- they are released automatically when a backend terminates.
-
Locking during Hot Standby
--------------------------
--- 503,520 ----
----------
User locks are handled totally on the application side as long term
! cooperative locks which may extend beyond the normal transaction
! boundaries. Their purpose is to indicate to an application that someone
! is `working' on an item. So it is possible to put a user lock on a
! tuple's oid, retrieve the tuple, work on it for an hour and then update it
! and remove the lock. While the lock is active other clients can still
! read and write the tuple but they can be aware that it has been locked at
! the application level by someone. It is also possible to obtain user locks
! so that the the lock is released automatically at the end of the transaction.
User locks and normal locks are completely orthogonal and they don't
interfere with each other.
Locking during Hot Standby
--------------------------
*** a/src/backend/storage/lmgr/lock.c
--- b/src/backend/storage/lmgr/lock.c
***************
*** 130,136 **** static const LockMethodData default_lockmethod = {
static const LockMethodData user_lockmethod = {
AccessExclusiveLock, /* highest valid lock mode number */
! false,
LockConflicts,
lock_mode_names,
#ifdef LOCK_DEBUG
--- 130,136 ----
static const LockMethodData user_lockmethod = {
AccessExclusiveLock, /* highest valid lock mode number */
! true,
LockConflicts,
lock_mode_names,
#ifdef LOCK_DEBUG
***************
*** 1484,1489 **** LockRelease(const LOCKTAG *locktag, LOCKMODE lockmode, bool sessionLock)
--- 1484,1542 ----
}
/*
+ * LockReleaseSession -- Release all session locks of the specified lock method that
+ * are held by the current process.
+ */
+ void
+ LockReleaseSession(LOCKMETHODID lockmethodid)
+ {
+ HASH_SEQ_STATUS status;
+ LOCALLOCK *locallock;
+ LOCALLOCKOWNER *lockOwners;
+ int i;
+
+ hash_seq_init(&status, LockMethodLocalHash);
+
+ while ((locallock = (LOCALLOCK *) hash_seq_search(&status)) != NULL)
+ {
+ /* Scan to see if there are any session locks */
+ lockOwners = locallock->lockOwners;
+ for (i = locallock->numLockOwners - 1; i >= 0; i--)
+ {
+ if (lockOwners[i].owner == NULL)
+ {
+ Assert(lockOwners[i].nLocks > 0);
+ if (lockOwners[i].nLocks < locallock->nLocks)
+ {
+ /*
+ * We will still hold this lock after forgetting this
+ * ResourceOwner.
+ */
+ locallock->nLocks -= lockOwners[i].nLocks;
+ /* compact out unused slot */
+ locallock->numLockOwners--;
+ if (i < locallock->numLockOwners)
+ lockOwners[i] = lockOwners[locallock->numLockOwners];
+ }
+ else
+ {
+ Assert(lockOwners[i].nLocks == locallock->nLocks);
+ /* We want to call LockRelease just once */
+ lockOwners[i].nLocks = 1;
+ locallock->nLocks = 1;
+ if (!LockRelease(&locallock->tag.lock,
+ locallock->tag.mode,
+ true))
+ elog(WARNING, "LockReleaseSession: failed??");
+ }
+ break;
+ }
+ }
+ }
+
+ }
+
+ /*
* LockReleaseAll -- Release all locks of the specified lock method that
* are held by the current process.
*
*** a/src/backend/storage/lmgr/proc.c
--- b/src/backend/storage/lmgr/proc.c
***************
*** 629,636 **** LockWaitCancel(void)
* At subtransaction abort, we release all locks held by the subtransaction;
* this is implemented by retail releasing of the locks under control of
* the ResourceOwner mechanism.
- *
- * Note that user locks are not released in any case.
*/
void
ProcReleaseLocks(bool isCommit)
--- 629,634 ----
***************
*** 641,646 **** ProcReleaseLocks(bool isCommit)
--- 639,647 ----
LockWaitCancel();
/* Release locks */
LockReleaseAll(DEFAULT_LOCKMETHOD, !isCommit);
+
+ /* Release transaction level advisory locks */
+ LockReleaseAll(USER_LOCKMETHOD, false);
}
*** a/src/backend/utils/adt/lockfuncs.c
--- b/src/backend/utils/adt/lockfuncs.c
***************
*** 343,348 **** pg_advisory_lock_int8(PG_FUNCTION_ARGS)
--- 343,365 ----
}
/*
+ * pg_advisory_xact_lock(int8) - acquire xact scoped
+ * exclusive lock on an int8 key
+ */
+ Datum
+ pg_advisory_xact_lock_int8(PG_FUNCTION_ARGS)
+ {
+ int64 key = PG_GETARG_INT64(0);
+ LOCKTAG tag;
+
+ SET_LOCKTAG_INT64(tag, key);
+
+ (void) LockAcquire(&tag, ExclusiveLock, false, false);
+
+ PG_RETURN_VOID();
+ }
+
+ /*
* pg_advisory_lock_shared(int8) - acquire share lock on an int8 key
*/
Datum
***************
*** 359,364 **** pg_advisory_lock_shared_int8(PG_FUNCTION_ARGS)
--- 376,398 ----
}
/*
+ * pg_advisory_xact_lock_shared(int8) - acquire xact scoped
+ * share lock on an int8 key
+ */
+ Datum
+ pg_advisory_xact_lock_shared_int8(PG_FUNCTION_ARGS)
+ {
+ int64 key = PG_GETARG_INT64(0);
+ LOCKTAG tag;
+
+ SET_LOCKTAG_INT64(tag, key);
+
+ (void) LockAcquire(&tag, ShareLock, false, false);
+
+ PG_RETURN_VOID();
+ }
+
+ /*
* pg_try_advisory_lock(int8) - acquire exclusive lock on an int8 key, no wait
*
* Returns true if successful, false if lock not available
***************
*** 378,383 **** pg_try_advisory_lock_int8(PG_FUNCTION_ARGS)
--- 412,437 ----
}
/*
+ * pg_try_advisory_xact_lock(int8) - acquire xact scoped
+ * exclusive lock on an int8 key, no wait
+ *
+ * Returns true if successful, false if lock not available
+ */
+ Datum
+ pg_try_advisory_xact_lock_int8(PG_FUNCTION_ARGS)
+ {
+ int64 key = PG_GETARG_INT64(0);
+ LOCKTAG tag;
+ LockAcquireResult res;
+
+ SET_LOCKTAG_INT64(tag, key);
+
+ res = LockAcquire(&tag, ExclusiveLock, false, true);
+
+ PG_RETURN_BOOL(res != LOCKACQUIRE_NOT_AVAIL);
+ }
+
+ /*
* pg_try_advisory_lock_shared(int8) - acquire share lock on an int8 key, no wait
*
* Returns true if successful, false if lock not available
***************
*** 397,402 **** pg_try_advisory_lock_shared_int8(PG_FUNCTION_ARGS)
--- 451,476 ----
}
/*
+ * pg_try_advisory_xact_lock_shared(int8) - acquire xact scoped
+ * share lock on an int8 key, no wait
+ *
+ * Returns true if successful, false if lock not available
+ */
+ Datum
+ pg_try_advisory_xact_lock_shared_int8(PG_FUNCTION_ARGS)
+ {
+ int64 key = PG_GETARG_INT64(0);
+ LOCKTAG tag;
+ LockAcquireResult res;
+
+ SET_LOCKTAG_INT64(tag, key);
+
+ res = LockAcquire(&tag, ShareLock, false, true);
+
+ PG_RETURN_BOOL(res != LOCKACQUIRE_NOT_AVAIL);
+ }
+
+ /*
* pg_advisory_unlock(int8) - release exclusive lock on an int8 key
*
* Returns true if successful, false if lock was not held
***************
*** 452,457 **** pg_advisory_lock_int4(PG_FUNCTION_ARGS)
--- 526,549 ----
}
/*
+ * pg_advisory_xact_lock(int4, int4) - acquire xact scoped
+ * exclusive lock on 2 int4 keys
+ */
+ Datum
+ pg_advisory_xact_lock_int4(PG_FUNCTION_ARGS)
+ {
+ int32 key1 = PG_GETARG_INT32(0);
+ int32 key2 = PG_GETARG_INT32(1);
+ LOCKTAG tag;
+
+ SET_LOCKTAG_INT32(tag, key1, key2);
+
+ (void) LockAcquire(&tag, ExclusiveLock, false, false);
+
+ PG_RETURN_VOID();
+ }
+
+ /*
* pg_advisory_lock_shared(int4, int4) - acquire share lock on 2 int4 keys
*/
Datum
***************
*** 469,474 **** pg_advisory_lock_shared_int4(PG_FUNCTION_ARGS)
--- 561,584 ----
}
/*
+ * pg_advisory_xact_lock_shared(int4, int4) - acquire xact scoped
+ * share lock on 2 int4 keys
+ */
+ Datum
+ pg_advisory_xact_lock_shared_int4(PG_FUNCTION_ARGS)
+ {
+ int32 key1 = PG_GETARG_INT32(0);
+ int32 key2 = PG_GETARG_INT32(1);
+ LOCKTAG tag;
+
+ SET_LOCKTAG_INT32(tag, key1, key2);
+
+ (void) LockAcquire(&tag, ShareLock, false, false);
+
+ PG_RETURN_VOID();
+ }
+
+ /*
* pg_try_advisory_lock(int4, int4) - acquire exclusive lock on 2 int4 keys, no wait
*
* Returns true if successful, false if lock not available
***************
*** 489,494 **** pg_try_advisory_lock_int4(PG_FUNCTION_ARGS)
--- 599,625 ----
}
/*
+ * pg_try_advisory_xact_lock(int4, int4) - acquire xact scoped
+ * exclusive lock on 2 int4 keys, no wait
+ *
+ * Returns true if successful, false if lock not available
+ */
+ Datum
+ pg_try_advisory_xact_lock_int4(PG_FUNCTION_ARGS)
+ {
+ int32 key1 = PG_GETARG_INT32(0);
+ int32 key2 = PG_GETARG_INT32(1);
+ LOCKTAG tag;
+ LockAcquireResult res;
+
+ SET_LOCKTAG_INT32(tag, key1, key2);
+
+ res = LockAcquire(&tag, ExclusiveLock, false, true);
+
+ PG_RETURN_BOOL(res != LOCKACQUIRE_NOT_AVAIL);
+ }
+
+ /*
* pg_try_advisory_lock_shared(int4, int4) - acquire share lock on 2 int4 keys, no wait
*
* Returns true if successful, false if lock not available
***************
*** 509,514 **** pg_try_advisory_lock_shared_int4(PG_FUNCTION_ARGS)
--- 640,666 ----
}
/*
+ * pg_try_advisory_xact_lock_shared(int4, int4) - acquire xact scoped
+ * share lock on 2 int4 keys, no wait
+ *
+ * Returns true if successful, false if lock not available
+ */
+ Datum
+ pg_try_advisory_xact_lock_shared_int4(PG_FUNCTION_ARGS)
+ {
+ int32 key1 = PG_GETARG_INT32(0);
+ int32 key2 = PG_GETARG_INT32(1);
+ LOCKTAG tag;
+ LockAcquireResult res;
+
+ SET_LOCKTAG_INT32(tag, key1, key2);
+
+ res = LockAcquire(&tag, ShareLock, false, true);
+
+ PG_RETURN_BOOL(res != LOCKACQUIRE_NOT_AVAIL);
+ }
+
+ /*
* pg_advisory_unlock(int4, int4) - release exclusive lock on 2 int4 keys
*
* Returns true if successful, false if lock was not held
***************
*** 554,560 **** pg_advisory_unlock_shared_int4(PG_FUNCTION_ARGS)
Datum
pg_advisory_unlock_all(PG_FUNCTION_ARGS)
{
! LockReleaseAll(USER_LOCKMETHOD, true);
PG_RETURN_VOID();
}
--- 706,712 ----
Datum
pg_advisory_unlock_all(PG_FUNCTION_ARGS)
{
! LockReleaseSession(USER_LOCKMETHOD);
PG_RETURN_VOID();
}
*** a/src/include/catalog/pg_proc.h
--- b/src/include/catalog/pg_proc.h
***************
*** 4404,4428 **** DESCR("is contained by");
--- 4404,4444 ----
/* userlock replacements */
DATA(insert OID = 2880 ( pg_advisory_lock PGNSP PGUID 12 1 0 0 f f f t f v 1 0 2278 "20" _null_ _null_ _null_ _null_ pg_advisory_lock_int8 _null_ _null_ _null_ ));
+ DESCR("obtain exclusive a4dvisory lock");
+ DATA(insert OID = 3071 ( pg_advisory_xact_lock PGNSP PGUID 12 1 0 0 f f f t f v 1 0 2278 "20" _null_ _null_ _null_ _null_ pg_advisory_xact_lock_int8 _null_ _null_ _null_ ));
DESCR("obtain exclusive advisory lock");
DATA(insert OID = 2881 ( pg_advisory_lock_shared PGNSP PGUID 12 1 0 0 f f f t f v 1 0 2278 "20" _null_ _null_ _null_ _null_ pg_advisory_lock_shared_int8 _null_ _null_ _null_ ));
DESCR("obtain shared advisory lock");
+ DATA(insert OID = 3072 ( pg_advisory_xact_lock_shared PGNSP PGUID 12 1 0 0 f f f t f v 1 0 2278 "20" _null_ _null_ _null_ _null_ pg_advisory_xact_lock_shared_int8 _null_ _null_ _null_ ));
+ DESCR("obtain shared advisory lock");
DATA(insert OID = 2882 ( pg_try_advisory_lock PGNSP PGUID 12 1 0 0 f f f t f v 1 0 16 "20" _null_ _null_ _null_ _null_ pg_try_advisory_lock_int8 _null_ _null_ _null_ ));
DESCR("obtain exclusive advisory lock if available");
+ DATA(insert OID = 3073 ( pg_try_advisory_xact_lock PGNSP PGUID 12 1 0 0 f f f t f v 1 0 16 "20" _null_ _null_ _null_ _null_ pg_try_advisory_xact_lock_int8 _null_ _null_ _null_ ));
+ DESCR("obtain exclusive advisory lock if available");
DATA(insert OID = 2883 ( pg_try_advisory_lock_shared PGNSP PGUID 12 1 0 0 f f f t f v 1 0 16 "20" _null_ _null_ _null_ _null_ pg_try_advisory_lock_shared_int8 _null_ _null_ _null_ ));
DESCR("obtain shared advisory lock if available");
+ DATA(insert OID = 3074 ( pg_try_advisory_xact_lock_shared PGNSP PGUID 12 1 0 0 f f f t f v 1 0 16 "20" _null_ _null_ _null_ _null_ pg_try_advisory_xact_lock_shared_int8 _null_ _null_ _null_ ));
+ DESCR("obtain shared advisory lock if available");
DATA(insert OID = 2884 ( pg_advisory_unlock PGNSP PGUID 12 1 0 0 f f f t f v 1 0 16 "20" _null_ _null_ _null_ _null_ pg_advisory_unlock_int8 _null_ _null_ _null_ ));
DESCR("release exclusive advisory lock");
DATA(insert OID = 2885 ( pg_advisory_unlock_shared PGNSP PGUID 12 1 0 0 f f f t f v 1 0 16 "20" _null_ _null_ _null_ _null_ pg_advisory_unlock_shared_int8 _null_ _null_ _null_ ));
DESCR("release shared advisory lock");
DATA(insert OID = 2886 ( pg_advisory_lock PGNSP PGUID 12 1 0 0 f f f t f v 2 0 2278 "23 23" _null_ _null_ _null_ _null_ pg_advisory_lock_int4 _null_ _null_ _null_ ));
DESCR("obtain exclusive advisory lock");
+ DATA(insert OID = 3075 ( pg_advisory_xact_lock PGNSP PGUID 12 1 0 0 f f f t f v 2 0 2278 "23 23" _null_ _null_ _null_ _null_ pg_advisory_xact_lock_int4 _null_ _null_ _null_ ));
+ DESCR("obtain exclusive advisory lock");
DATA(insert OID = 2887 ( pg_advisory_lock_shared PGNSP PGUID 12 1 0 0 f f f t f v 2 0 2278 "23 23" _null_ _null_ _null_ _null_ pg_advisory_lock_shared_int4 _null_ _null_ _null_ ));
DESCR("obtain shared advisory lock");
+ DATA(insert OID = 3076 ( pg_advisory_xact_lock_shared PGNSP PGUID 12 1 0 0 f f f t f v 2 0 2278 "23 23" _null_ _null_ _null_ _null_ pg_advisory_xact_lock_shared_int4 _null_ _null_ _null_ ));
+ DESCR("obtain shared advisory lock");
DATA(insert OID = 2888 ( pg_try_advisory_lock PGNSP PGUID 12 1 0 0 f f f t f v 2 0 16 "23 23" _null_ _null_ _null_ _null_ pg_try_advisory_lock_int4 _null_ _null_ _null_ ));
DESCR("obtain exclusive advisory lock if available");
+ DATA(insert OID = 3077 ( pg_try_advisory_xact_lock PGNSP PGUID 12 1 0 0 f f f t f v 2 0 16 "23 23" _null_ _null_ _null_ _null_ pg_try_advisory_xact_lock_int4 _null_ _null_ _null_ ));
+ DESCR("obtain exclusive advisory lock if available");
DATA(insert OID = 2889 ( pg_try_advisory_lock_shared PGNSP PGUID 12 1 0 0 f f f t f v 2 0 16 "23 23" _null_ _null_ _null_ _null_ pg_try_advisory_lock_shared_int4 _null_ _null_ _null_ ));
DESCR("obtain shared advisory lock if available");
+ DATA(insert OID = 3079 ( pg_try_advisory_xact_lock_shared PGNSP PGUID 12 1 0 0 f f f t f v 2 0 16 "23 23" _null_ _null_ _null_ _null_ pg_try_advisory_xact_lock_shared_int4 _null_ _null_ _null_ ));
+ DESCR("obtain shared advisory lock if available");
DATA(insert OID = 2890 ( pg_advisory_unlock PGNSP PGUID 12 1 0 0 f f f t f v 2 0 16 "23 23" _null_ _null_ _null_ _null_ pg_advisory_unlock_int4 _null_ _null_ _null_ ));
DESCR("release exclusive advisory lock");
DATA(insert OID = 2891 ( pg_advisory_unlock_shared PGNSP PGUID 12 1 0 0 f f f t f v 2 0 16 "23 23" _null_ _null_ _null_ _null_ pg_advisory_unlock_shared_int4 _null_ _null_ _null_ ));
*** a/src/include/storage/lock.h
--- b/src/include/storage/lock.h
***************
*** 484,489 **** extern LockAcquireResult LockAcquireExtended(const LOCKTAG *locktag,
--- 484,490 ----
bool report_memory_error);
extern bool LockRelease(const LOCKTAG *locktag,
LOCKMODE lockmode, bool sessionLock);
+ extern void LockReleaseSession(LOCKMETHODID lockmethodid);
extern void LockReleaseAll(LOCKMETHODID lockmethodid, bool allLocks);
extern void LockReleaseCurrentOwner(void);
extern void LockReassignCurrentOwner(void);
*** a/src/include/utils/builtins.h
--- b/src/include/utils/builtins.h
***************
*** 991,1005 **** extern Datum show_all_settings(PG_FUNCTION_ARGS);
--- 991,1013 ----
/* lockfuncs.c */
extern Datum pg_lock_status(PG_FUNCTION_ARGS);
extern Datum pg_advisory_lock_int8(PG_FUNCTION_ARGS);
+ extern Datum pg_advisory_xact_lock_int8(PG_FUNCTION_ARGS);
extern Datum pg_advisory_lock_shared_int8(PG_FUNCTION_ARGS);
+ extern Datum pg_advisory_xact_lock_shared_int8(PG_FUNCTION_ARGS);
extern Datum pg_try_advisory_lock_int8(PG_FUNCTION_ARGS);
+ extern Datum pg_try_advisory_xact_lock_int8(PG_FUNCTION_ARGS);
extern Datum pg_try_advisory_lock_shared_int8(PG_FUNCTION_ARGS);
+ extern Datum pg_try_advisory_xact_lock_shared_int8(PG_FUNCTION_ARGS);
extern Datum pg_advisory_unlock_int8(PG_FUNCTION_ARGS);
extern Datum pg_advisory_unlock_shared_int8(PG_FUNCTION_ARGS);
extern Datum pg_advisory_lock_int4(PG_FUNCTION_ARGS);
+ extern Datum pg_advisory_xact_lock_int4(PG_FUNCTION_ARGS);
extern Datum pg_advisory_lock_shared_int4(PG_FUNCTION_ARGS);
+ extern Datum pg_advisory_xact_lock_shared_int4(PG_FUNCTION_ARGS);
extern Datum pg_try_advisory_lock_int4(PG_FUNCTION_ARGS);
+ extern Datum pg_try_advisory_xact_lock_int4(PG_FUNCTION_ARGS);
extern Datum pg_try_advisory_lock_shared_int4(PG_FUNCTION_ARGS);
+ extern Datum pg_try_advisory_xact_lock_shared_int4(PG_FUNCTION_ARGS);
extern Datum pg_advisory_unlock_int4(PG_FUNCTION_ARGS);
extern Datum pg_advisory_unlock_shared_int4(PG_FUNCTION_ARGS);
extern Datum pg_advisory_unlock_all(PG_FUNCTION_ARGS);