summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Lane2008-09-16 01:56:49 +0000
committerTom Lane2008-09-16 01:56:49 +0000
commit839ed8bd069a37b5386565c6cce27e1317e07747 (patch)
tree5df21416345bab0409b0af35d8438f420188d3a7
parent74da120713d15f8fb06c65f92111db6654ecfe2e (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.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/include/storage/lock.h b/src/include/storage/lock.h
index e6b9e94b657..c3c75afbbcc 100644
--- a/src/include/storage/lock.h
+++ b/src/include/storage/lock.h
@@ -7,7 +7,7 @@
* Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California
*
- * $PostgreSQL: pgsql/src/include/storage/lock.h,v 1.91 2005/10/15 02:49:46 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/storage/lock.h,v 1.91.2.1 2008/09/16 01:56:49 tgl Exp $
*
*-------------------------------------------------------------------------
*/
@@ -314,7 +314,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
@@ -326,7 +326,7 @@ typedef struct LOCALLOCK
LOCK *lock; /* associated LOCK object in shared mem */
PROCLOCK *proclock; /* associated PROCLOCK object in shmem */
bool isTempObject; /* true if lock is on a temporary object */
- 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 */