From: drh Date: Thu, 31 Mar 2005 21:02:45 +0000 (+0000) Subject: Update comments and documentation to give the true maximum page size as 32K, X-Git-Tag: version-3.6.10~3721 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4fb90f2bff3f1e93573311806c51b3cc5b374649;p=thirdparty%2Fsqlite.git Update comments and documentation to give the true maximum page size as 32K, not 64K as was previously (and erroneously) reported. Ticket #1194. (CVS 2437) FossilOrigin-Name: 58dd436b6572d38ea67960b8d08a0ca4359602f0 --- diff --git a/manifest b/manifest index f2479224ea..0f2fa96c13 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Make\ssure\sinteger\sprimary\skeys\slarger\sthan\s2^31\sare\shandled\nproperly.\s\sTicket\s#1188.\s(CVS\s2436) -D 2005-03-31T18:40:05 +C Update\scomments\sand\sdocumentation\sto\sgive\sthe\strue\smaximum\spage\ssize\sas\s32K,\nnot\s64K\sas\swas\spreviously\s(and\serroneously)\sreported.\s\sTicket\s#1194.\s(CVS\s2437) +D 2005-03-31T21:02:46 F Makefile.in 5c00d0037104de2a50ac7647a5f12769795957a3 F Makefile.linux-gcc 06be33b2a9ad4f005a5f42b22c4a19dab3cbb5c7 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028 @@ -53,7 +53,7 @@ F src/os_unix.h 40b2fd1d02cfa45d6c3dea25316fd019cf9fcb0c F src/os_win.c 2bbbe6fbb010763c3fa79d5e951afca9b138c6b5 F src/os_win.h 41a946bea10f61c158ce8645e7646b29d44f122b F src/pager.c 95e24c9134a00613ca87b963a84ad62d85d5b979 -F src/pager.h 9a417a1e04737c227ebbba3bdf8597d6dd51513a +F src/pager.h 94bb42704ae861036a3bf3bbbe04dd3f0c6a690d F src/parse.y 1770b8673c652756b2dd5bcec16f0bf741e5e879 F src/pragma.c 845c8ab0ab7d09ed2115d3dfc859ba2364b365a7 F src/printf.c 3d20b21cfecadacecac3fb7274e746cb81d3d357 @@ -269,16 +269,16 @@ F www/oldnews.tcl 61e4b210569e3f45b2df77482ddabb3fa2e8a8a6 F www/omitted.tcl f1e57977299c3ed54fbae55e4b5ea6a64de39e19 F www/opcode.tcl 5bd68059416b223515a680d410a9f7cb6736485f F www/optimizing.tcl f0b2538988d1bbad16cbfe63ec6e8f48c9eb04e5 -F www/pragma.tcl 20ea0674d96bfea23a9825fb5a6a2214ee258b17 +F www/pragma.tcl bf23f023a02a0125508d6ff67796b7057c7583fe F www/quickstart.tcl 6f6f694b6139be2d967b1492eb9a6bdf7058aa60 F www/speed.tcl 656ed5be8cc9d536353e1a96927b925634a62933 F www/sqlite.tcl b51fd15f0531a54874de785a9efba323eecd5975 F www/support.tcl 3955da0fd82be68cc5c83d347c05095e80967051 F www/tclsqlite.tcl e73f8f8e5f20e8277619433f7970060ab01088fc F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0 -F www/version3.tcl 092a01f5ef430d2c4acc0ae558d74c4bb89638a0 +F www/version3.tcl a99cf5f6d8bd4d5537584a2b342f0fb9fa601d8b F www/whentouse.tcl 528299b8316726dbcc5548e9aa0648c8b1bd055b -P c31ea6332f53d361be864554b83662d3fc0d52f7 -R a311b9d0ce53d2c52cd966b96ef532ff +P 1d04c2ab299430959b8a193d4679cbc4c0be31a4 +R c50ec978eb0ab13d30afac8678728405 U drh -Z 6c477f50c1882d01dcdfc519faad2371 +Z cf6d4f7038aa022ce629a64a04d78749 diff --git a/manifest.uuid b/manifest.uuid index 588dc3fed8..161d31bb16 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -1d04c2ab299430959b8a193d4679cbc4c0be31a4 \ No newline at end of file +58dd436b6572d38ea67960b8d08a0ca4359602f0 \ No newline at end of file diff --git a/src/pager.h b/src/pager.h index 442df76a45..be2c30eeb7 100644 --- a/src/pager.h +++ b/src/pager.h @@ -13,7 +13,7 @@ ** subsystem. The page cache subsystem reads and writes a file a page ** at a time and provides a journal for rollback. ** -** @(#) $Id: pager.h,v 1.42 2005/03/21 04:04:03 danielk1977 Exp $ +** @(#) $Id: pager.h,v 1.43 2005/03/31 21:02:46 drh Exp $ */ /* @@ -23,12 +23,15 @@ # define SQLITE_DEFAULT_PAGE_SIZE 1024 #endif -/* Maximum page size. The upper bound on this value is 65536 (a limit -** imposed by the 2-byte size of cell array pointers.) The -** maximum page size determines the amount of stack space allocated -** by many of the routines in pager.c and btree.c On embedded architectures -** or any machine where memory and especially stack memory is limited, -** one may wish to chose a smaller value for the maximum page size. +/* Maximum page size. The upper bound on this value is 32768. This a limit +** imposed by necessity of storing the value in a 2-byte unsigned integer +** and the fact that the page size must be a power of 2. +** +** This value is used to initialize certain arrays on the stack at +** various places in the code. On embedded machines where stack space +** is limited and the flexibility of having large pages is not needed, +** it makes good sense to reduce the maximum page size to something more +** reasonable, like 1024. */ #ifndef SQLITE_MAX_PAGE_SIZE # define SQLITE_MAX_PAGE_SIZE 8192 diff --git a/www/pragma.tcl b/www/pragma.tcl index 40dd64f337..0a84c4b5f1 100644 --- a/www/pragma.tcl +++ b/www/pragma.tcl @@ -1,7 +1,7 @@ # # Run this Tcl script to generate the pragma.html file. # -set rcsid {$Id: pragma.tcl,v 1.12 2005/03/21 01:31:37 drh Exp $} +set rcsid {$Id: pragma.tcl,v 1.13 2005/03/31 21:02:46 drh Exp $} source common.tcl header {Pragma statements supported by SQLite} @@ -203,7 +203,8 @@ puts { may only be set if the database has not yet been created. The page size must be a power of two greater than or equal to 512 and less than or equal to 8192. The upper limit may be modified by setting - the value of macro SQLITE_MAX_PAGE_SIZE during compilation. + the value of macro SQLITE_MAX_PAGE_SIZE during compilation. The + maximum upper bound is 32768.

diff --git a/www/version3.tcl b/www/version3.tcl index 1cb3adc48a..05922a71c4 100644 --- a/www/version3.tcl +++ b/www/version3.tcl @@ -67,7 +67,7 @@ overflow pages. Traditional B-trees are still used for indices.

The new file format also supports variable pages sizes between 512 and -65536 bytes. The size of a page is stored in the file header so the +32768 bytes. The size of a page is stored in the file header so the same library can read databases with different pages sizes, in theory, though this feature has not yet been implemented in practice.

@@ -290,4 +290,4 @@ supporting and embracing great Open-Source Software. } -footer {$Id: version3.tcl,v 1.4 2004/06/30 22:54:06 drh Exp $} +footer {$Id: version3.tcl,v 1.5 2005/03/31 21:02:46 drh Exp $}