Commit 272b6ef2 authored by Bruce Momjian's avatar Bruce Momjian

Prevent BLCKSZ < 1024, and have initdb test shared buffers based on the

BLCKSZ value.
parent 4816b0f4
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
* Portions Copyright (c) 1994, Regents of the University of California * Portions Copyright (c) 1994, Regents of the University of California
* Portions taken from FreeBSD. * Portions taken from FreeBSD.
* *
* $PostgreSQL: pgsql/src/bin/initdb/initdb.c,v 1.133 2007/02/16 02:10:07 alvherre Exp $ * $PostgreSQL: pgsql/src/bin/initdb/initdb.c,v 1.134 2007/02/20 23:49:38 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
...@@ -1208,7 +1208,8 @@ test_config_settings(void) ...@@ -1208,7 +1208,8 @@ test_config_settings(void)
for (i = 0; i < bufslen; i++) for (i = 0; i < bufslen; i++)
{ {
test_buffs = trial_bufs[i]; /* Use same amount of memory, independent of BLCKSZ */
test_buffs = (trial_bufs[i] * 8192) / BLCKSZ;
if (test_buffs <= ok_buffers) if (test_buffs <= ok_buffers)
{ {
test_buffs = ok_buffers; test_buffs = ok_buffers;
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
* for developers. If you edit any of these, be sure to do a *full* * for developers. If you edit any of these, be sure to do a *full*
* rebuild (and an initdb if noted). * rebuild (and an initdb if noted).
* *
* $PostgreSQL: pgsql/src/include/pg_config_manual.h,v 1.24 2007/02/06 09:16:08 petere Exp $ * $PostgreSQL: pgsql/src/include/pg_config_manual.h,v 1.25 2007/02/20 23:49:38 momjian Exp $
*------------------------------------------------------------------------ *------------------------------------------------------------------------
*/ */
...@@ -25,6 +25,10 @@ ...@@ -25,6 +25,10 @@
*/ */
#define BLCKSZ 8192 #define BLCKSZ 8192
#if BLCKSZ < 1024
#error BLCKSZ must be >= 1024
#endif
/* /*
* RELSEG_SIZE is the maximum number of blocks allowed in one disk * RELSEG_SIZE is the maximum number of blocks allowed in one disk
* file. Thus, the maximum size of a single file is RELSEG_SIZE * * file. Thus, the maximum size of a single file is RELSEG_SIZE *
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment