/ Check-in [0f3c5633]
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Fix a comment in btree.c. No code changes. (CVS 5756)
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 0f3c56330b43fb7c9dc43a444ca38bace9397ede
User & Date: danielk1977 2008-09-30 16:48:11
Context
2008-09-30
17:18
Add some testcase() and assert() macros to btree.c to aid with testing recent changes. (CVS 5757) check-in: fb461b78 user: drh tags: trunk
16:48
Fix a comment in btree.c. No code changes. (CVS 5756) check-in: 0f3c5633 user: danielk1977 tags: trunk
14:06
Change leading tabs into spaces. (CVS 5755) check-in: 4e536463 user: drh tags: trunk
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Changes to src/btree.c.

     5      5   ** a legal notice, here is a blessing:
     6      6   **
     7      7   **    May you do good and not evil.
     8      8   **    May you find forgiveness for yourself and forgive others.
     9      9   **    May you share freely, never taking more than you give.
    10     10   **
    11     11   *************************************************************************
    12         -** $Id: btree.c,v 1.522 2008/09/30 14:06:29 drh Exp $
           12  +** $Id: btree.c,v 1.523 2008/09/30 16:48:11 danielk1977 Exp $
    13     13   **
    14     14   ** This file implements a external (disk-based) database using BTrees.
    15     15   ** See the header comment on "btreeInt.h" for additional information.
    16     16   ** Including a description of file format and an overview of operation.
    17     17   */
    18     18   #include "btreeInt.h"
    19     19   
................................................................................
  5952   5952           ** are two copies of that key in the tree - one here on the leaf
  5953   5953           ** page and one on some internal node in the tree. The copy on
  5954   5954           ** the leaf node is always the next key in tree-order after the 
  5955   5955           ** copy on the internal node. So, the call to sqlite3BtreeNext()
  5956   5956           ** calls restoreCursorPosition() to point the cursor to the copy
  5957   5957           ** stored on the internal node, then advances to the next entry,
  5958   5958           ** which happens to be the copy of the key on the internal node.
  5959         -        ** Net effect: leafCur is pointing back where
         5959  +        ** Net effect: leafCur is pointing back to the duplicate cell
         5960  +        ** that needs to be removed, and the leafCur.apPage[] and
         5961  +        ** leafCur.aiIdx[] arrays are correct.
  5960   5962           */
  5961   5963         #ifndef NDEBUG
  5962   5964           Pgno leafPgno = pLeafPage->pgno;
  5963   5965         #endif
  5964   5966           rc = saveCursorPosition(&leafCur);
  5965   5967           if( rc==SQLITE_OK ){
  5966   5968             rc = sqlite3BtreeNext(&leafCur, &notUsed);