Commit272b6ef

committed

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

BLCKSZ value.

1 parent4816b0f commit272b6efCopy full SHA for 272b6ef

File tree

-3

lines changed

-3

lines changed

Lines changed: 3 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@`
`42`	`42`	`* Portions Copyright (c) 1994, Regents of the University of California`
`43`	`43`	`* Portions taken from FreeBSD.`
`44`	`44`	`*`
`45`		`- * $PostgreSQL: pgsql/src/bin/initdb/initdb.c,v 1.133 2007/02/16 02:10:07 alvherre Exp $`
	`45`	`+ * $PostgreSQL: pgsql/src/bin/initdb/initdb.c,v 1.134 2007/02/20 23:49:38 momjian Exp $`
`46`	`46`	`*`
`47`	`47`	`*-------------------------------------------------------------------------`
`48`	`48`	`*/`
`@@ -1208,7 +1208,8 @@ test_config_settings(void)`
`1208`	`1208`
`1209`	`1209`	`for (i=0;i<bufslen;i++)`
`1210`	`1210`	`{`
`1211`		`-test_buffs=trial_bufs[i];`
	`1211`	`+/* Use same amount of memory, independent of BLCKSZ */`
	`1212`	`+test_buffs= (trial_bufs[i]*8192) /BLCKSZ;`
`1212`	`1213`	`if (test_buffs <=ok_buffers)`
`1213`	`1214`	`{`
`1214`	`1215`	`test_buffs=ok_buffers;`

Lines changed: 5 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`* for developers.If you edit any of these, be sure to do a full`
`7`	`7`	`* rebuild (and an initdb if noted).`
`8`	`8`	`*`
`9`		`- * $PostgreSQL: pgsql/src/include/pg_config_manual.h,v 1.24 2007/02/06 09:16:08 petere Exp $`
	`9`	`+ * $PostgreSQL: pgsql/src/include/pg_config_manual.h,v 1.25 2007/02/20 23:49:38 momjian Exp $`
`10`	`10`	`*------------------------------------------------------------------------`
`11`	`11`	`*/`
`12`	`12`
`@@ -25,6 +25,10 @@`
`25`	`25`	`*/`
`26`	`26`	`#defineBLCKSZ8192`
`27`	`27`
	`28`	`+#ifBLCKSZ<1024`
	`29`	`+#error BLCKSZ must be >= 1024`
	`30`	`+#endif`
	`31`	`+`
`28`	`32`	`/*`
`29`	`33`	`* RELSEG_SIZE is the maximum number of blocks allowed in one disk`
`30`	`34`	`* file. Thus, the maximum size of a single file is RELSEG_SIZE *`

Comments

(0)