/ Check-in [69823ed1]
Login

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

Overview
Comment:Remove a stray merge-sort related change from pager.c and pager.h.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 69823ed163049d6fa1e24a9810c3c99f2a8fdd46
User & Date: dan 2011-09-19 11:57:34
Context
2011-09-19
13:01
Increase the default lookaside cache line size from 100 to 128 bytes. check-in: db019465 user: drh tags: trunk
11:57
Remove a stray merge-sort related change from pager.c and pager.h. check-in: 69823ed1 user: dan tags: trunk
2011-09-17
17:29
Add a new script to build an amalgamation that omits FTS3/4 and RTREE. check-in: b31a7d7d user: drh tags: trunk
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Changes to src/pager.c.

   616    616     u8 noSync;                  /* Do not sync the journal if true */
   617    617     u8 fullSync;                /* Do extra syncs of the journal for robustness */
   618    618     u8 ckptSyncFlags;           /* SYNC_NORMAL or SYNC_FULL for checkpoint */
   619    619     u8 syncFlags;               /* SYNC_NORMAL or SYNC_FULL otherwise */
   620    620     u8 tempFile;                /* zFilename is a temporary file */
   621    621     u8 readOnly;                /* True for a read-only database */
   622    622     u8 memDb;                   /* True to inhibit all file I/O */
   623         -  u8 hasSeenStress;           /* pagerStress() called one or more times */
   624    623   
   625    624     /**************************************************************************
   626    625     ** The following block contains those class members that change during
   627    626     ** routine opertion.  Class members not in this block are either fixed
   628    627     ** when the pager is first created or else only change when there is a
   629    628     ** significant mode change (such as changing the page_size, locking_mode,
   630    629     ** or the journal_mode).  From another view, these class members describe
................................................................................
  4171   4170     ** Spilling is also prohibited when in an error state since that could
  4172   4171     ** lead to database corruption.   In the current implementaton it 
  4173   4172     ** is impossible for sqlite3PCacheFetch() to be called with createFlag==1
  4174   4173     ** while in the error state, hence it is impossible for this routine to
  4175   4174     ** be called in the error state.  Nevertheless, we include a NEVER()
  4176   4175     ** test for the error state as a safeguard against future changes.
  4177   4176     */
  4178         -  pPager->hasSeenStress = 1;
  4179   4177     if( NEVER(pPager->errCode) ) return SQLITE_OK;
  4180   4178     if( pPager->doNotSpill ) return SQLITE_OK;
  4181   4179     if( pPager->doNotSyncSpill && (pPg->flags & PGHDR_NEED_SYNC)!=0 ){
  4182   4180       return SQLITE_OK;
  4183   4181     }
  4184   4182   
  4185   4183     pPg->pDirty = 0;

Changes to src/pager.h.

    56     56   ** Allowed values for the flags parameter to sqlite3PagerOpen().
    57     57   **
    58     58   ** NOTE: These values must match the corresponding BTREE_ values in btree.h.
    59     59   */
    60     60   #define PAGER_OMIT_JOURNAL  0x0001    /* Do not use a rollback journal */
    61     61   #define PAGER_NO_READLOCK   0x0002    /* Omit readlocks on readonly files */
    62     62   #define PAGER_MEMORY        0x0004    /* In-memory database */
    63         -#define PAGER_SORTER        0x0020    /* Accumulator in external merge sort */
    64     63   
    65     64   /*
    66     65   ** Valid values for the second argument to sqlite3PagerLockingMode().
    67     66   */
    68     67   #define PAGER_LOCKINGMODE_QUERY      -1
    69     68   #define PAGER_LOCKINGMODE_NORMAL      0
    70     69   #define PAGER_LOCKINGMODE_EXCLUSIVE   1