From 0c6cc4ed19d98d936e83bd49f11b9a35d1320d0d Mon Sep 17 00:00:00 2001 From: drh Date: Tue, 15 Jun 2004 02:13:26 +0000 Subject: [PATCH] Update comments in btree.c. No changes to code. (CVS 1596) FossilOrigin-Name: 1c6a0706359c21e3b04e9097837a297d1d7714c3 --- manifest | 12 ++++++------ manifest.uuid | 2 +- src/btree.c | 10 +++++----- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/manifest b/manifest index 32b9f3e977..84b56f282d 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Do\snot\suse\sthe\spage\scontaining\slocks\sfor\sanything\sto\savoid\sproblems\swith\nthe\smanditory\sfile\slocking\son\swindows.\s(CVS\s1595) -D 2004-06-15T01:40:29 +C Update\scomments\sin\sbtree.c.\s\sNo\schanges\sto\scode.\s(CVS\s1596) +D 2004-06-15T02:13:27 F Makefile.in ab7b0d5118e2da97bac66be8684a1034e3500f5a F Makefile.linux-gcc a9e5a0d309fa7c38e7c14d3ecf7690879d3a5457 F README f1de682fbbd94899d50aca13d387d1b3fd3be2dd @@ -26,7 +26,7 @@ F sqlite.def fc4f5734786fe4743cfe2aa98eb2da4b089edb5f F sqlite.pc.in 30552343140c53304c2a658c080fbe810cd09ca2 F src/attach.c 93b8ecec4a8d7b4e9f2479e2327d90c9d01765e8 F src/auth.c 204e1e9c45e64315589bc8b62cba5d9de29b6a3c -F src/btree.c a9aabed057eacdaf617caeddc7b136bd831ab22c +F src/btree.c 9e60ffbc24d92889d1e799cd16b15c9fbbfc5021 F src/btree.h 32f96abef464cf8765b23ca669acfe90d191fcc5 F src/build.c 916a84fa5f8bfd44dbe14c3d7c923dd07ee7373f F src/date.c 65b483caeb0e4dd663667d2f927caa058168ebff @@ -223,7 +223,7 @@ F www/support.tcl 1801397edd271cc39a2aadd54e701184b5181248 F www/tclsqlite.tcl 19191cf2a1010eaeff74c51d83fd5f5a4d899075 F www/vdbe.tcl 59288db1ac5c0616296b26dce071c36cb611dfe9 F www/whentouse.tcl a8335bce47cc2fddb07f19052cb0cb4d9129a8e4 -P 186c6f93e12978907c5f0ff81d90bdf7367b9274 -R 39de485059268cbc8025aa3dc3a9cdaa +P 5a814202777f381caf5337b37e11c9ab8b8f554a +R b05c49849b20b6bbd0391b8efa373046 U drh -Z f0561e35a6d128f341936bb7b7366398 +Z ad351ed4b4238509d8c979104170ecf8 diff --git a/manifest.uuid b/manifest.uuid index 351e16561d..baea177fc6 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -5a814202777f381caf5337b37e11c9ab8b8f554a \ No newline at end of file +1c6a0706359c21e3b04e9097837a297d1d7714c3 \ No newline at end of file diff --git a/src/btree.c b/src/btree.c index eeabab175a..cf977ac3a4 100644 --- a/src/btree.c +++ b/src/btree.c @@ -9,7 +9,7 @@ ** May you share freely, never taking more than you give. ** ************************************************************************* -** $Id: btree.c,v 1.167 2004/06/15 01:40:29 drh Exp $ +** $Id: btree.c,v 1.168 2004/06/15 02:13:27 drh Exp $ ** ** This file implements a external (disk-based) database using BTrees. ** For a detailed discussion of BTrees, refer to @@ -2788,14 +2788,14 @@ static int balance(MemPage*); /* ** This routine redistributes Cells on pPage and up to NN*2 siblings ** of pPage so that all pages have about the same amount of free space. -** Usually one sibling on either side of pPage is used in the balancing, -** though both siblings might come from one side if pPage is the first +** Usually NN siblings on either side of pPage is used in the balancing, +** though more siblings might come from one side if pPage is the first ** or last child of its parent. If pPage has fewer than 2*NN siblings ** (something which can only happen if pPage is the root page or a ** child of root) then all available siblings participate in the balancing. ** -** The number of siblings of pPage might be increased or decreased by -** one in an effort to keep pages nearly full but not over full. The root page +** The number of siblings of pPage might be increased or decreased by one or +** two in an effort to keep pages nearly full but not over full. The root page ** is special and is allowed to be nearly empty. If pPage is ** the root page, then the depth of the tree might be increased ** or decreased by one, as necessary, to keep the root page from being