diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2008-09-16 01:56:43 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2008-09-16 01:56:43 +0000 |
| commit | 6d4b3f19ac64d08fe10fad6486fa2a7af7186020 (patch) | |
| tree | 33e4c40b8bca75a19031007f42d8a1006d9e77b9 | |
| parent | 49b505fd6cc06aad35407d3896ea34019654ccaf (diff) | |
Widen the nLocks counts in local lock tables from int to int64. This
forestalls potential overflow when the same table (or other object, but
usually tables) is accessed by very many successive queries within a single
transaction. Per report from Michael Milligan.
Back-patch to 8.0, which is as far back as the patch conveniently applies.
There have been no reports of overflow in pre-8.3 releases, but clearly the
risk existed all along. (Michael's report suggests that 8.3 may consume lock
counts faster than prior releases, but with no test case to look at it's hard
to be sure about that. Widening the counts seems a good future-proofing
measure in any event.)
| -rw-r--r-- | src/include/storage/lock.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/include/storage/lock.h b/src/include/storage/lock.h index 90fad5412bc..55d46beb665 100644 --- a/src/include/storage/lock.h +++ b/src/include/storage/lock.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/storage/lock.h,v 1.102 2006/11/23 05:14:04 momjian Exp $ + * $PostgreSQL: pgsql/src/include/storage/lock.h,v 1.102.2.1 2008/09/16 01:56:43 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -348,7 +348,7 @@ typedef struct LOCALLOCKOWNER * Must use a forward struct reference to avoid circularity. */ struct ResourceOwnerData *owner; - int nLocks; /* # of times held by this owner */ + int64 nLocks; /* # of times held by this owner */ } LOCALLOCKOWNER; typedef struct LOCALLOCK @@ -360,7 +360,7 @@ typedef struct LOCALLOCK LOCK *lock; /* associated LOCK object in shared mem */ PROCLOCK *proclock; /* associated PROCLOCK object in shmem */ uint32 hashcode; /* copy of LOCKTAG's hash value */ - int nLocks; /* total number of times lock is held */ + int64 nLocks; /* total number of times lock is held */ int numLockOwners; /* # of relevant ResourceOwners */ int maxLockOwners; /* allocated size of array */ LOCALLOCKOWNER *lockOwners; /* dynamically resizable array */ |