Fix xid table sizing.

vadim4o · vadim4o · commit bbbc211ed13c · 1999-05-29T06:14:43.000Z
diff --git a/src/backend/storage/lmgr/lock.c b/src/backend/storage/lmgr/lock.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/storage/lmgr/lock.c,v 1.54 1999/05/25 22:42:03 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/storage/lmgr/lock.c,v 1.55 1999/05/29 06:14:42 vadim Exp $
  *
  * NOTES
  *	  Outside modules can create a lock table and acquire/release
@@ -1532,7 +1532,7 @@ LockShmemSize(int maxBackends)
 							   SHMEM_LOCKTAB_DATASIZE);
 
 	/* xidHash table */
-	size += hash_estimate_size(maxBackends,
+	size += hash_estimate_size(NLOCKENTS(maxBackends),
 							   SHMEM_XIDTAB_KEYSIZE,
 							   SHMEM_XIDTAB_DATASIZE);
 
diff --git a/src/include/storage/lock.h b/src/include/storage/lock.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: lock.h,v 1.28 1999/05/25 22:43:26 momjian Exp $
+ * $Id: lock.h,v 1.29 1999/05/29 06:14:42 vadim Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -31,10 +31,11 @@ typedef int MASK;
  * See LockShmemSize() in lock.c.
  *
  * NLOCKS_PER_XACT - The number of unique locks acquired in a transaction
+ *                   (should be configurable!)
  * NLOCKENTS - The maximum number of lock entries in the lock table.
  * ----------------------
  */
-#define NLOCKS_PER_XACT			40
+#define NLOCKS_PER_XACT			64
 #define NLOCKENTS(maxBackends)	(NLOCKS_PER_XACT*(maxBackends))
 
 typedef int LOCKMODE;

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`*`
`8`	`8`	`*`
`9`	`9`	`* IDENTIFICATION`
`10`		`- * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/lock.c,v 1.54 1999/05/25 22:42:03 momjian Exp $`
	`10`	`+ * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/lock.c,v 1.55 1999/05/29 06:14:42 vadim Exp $`
`11`	`11`	`*`
`12`	`12`	`* NOTES`
`13`	`13`	`* Outside modules can create a lock table and acquire/release`
`@@ -1532,7 +1532,7 @@ LockShmemSize(int maxBackends)`
`1532`	`1532`	`SHMEM_LOCKTAB_DATASIZE);`
`1533`	`1533`
`1534`	`1534`	`/* xidHash table */`
`1535`		`- size += hash_estimate_size(maxBackends,`
	`1535`	`+ size += hash_estimate_size(NLOCKENTS(maxBackends),`
`1536`	`1536`	`SHMEM_XIDTAB_KEYSIZE,`
`1537`	`1537`	`SHMEM_XIDTAB_DATASIZE);`
`1538`	`1538`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`*`
`7`	`7`	`* Copyright (c) 1994, Regents of the University of California`
`8`	`8`	`*`
`9`		`- * $Id: lock.h,v 1.28 1999/05/25 22:43:26 momjian Exp $`
	`9`	`+ * $Id: lock.h,v 1.29 1999/05/29 06:14:42 vadim Exp $`
`10`	`10`	`*`
`11`	`11`	`*-------------------------------------------------------------------------`
`12`	`12`	`*/`
`@@ -31,10 +31,11 @@ typedef int MASK;`
`31`	`31`	`* See LockShmemSize() in lock.c.`
`32`	`32`	`*`
`33`	`33`	`* NLOCKS_PER_XACT - The number of unique locks acquired in a transaction`
	`34`	`+ * (should be configurable!)`
`34`	`35`	`* NLOCKENTS - The maximum number of lock entries in the lock table.`
`35`	`36`	`* ----------------------`
`36`	`37`	`*/`
`37`		`-#define NLOCKS_PER_XACT 40`
	`38`	`+#define NLOCKS_PER_XACT 64`
`38`	`39`	`#define NLOCKENTS(maxBackends) (NLOCKS_PER_XACT*(maxBackends))`
`39`	`40`
`40`	`41`	`typedef int LOCKMODE;`