SQLite: Check-in [24bab759]

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

Overview

Comment:	Initialize the mmap_limit of temporary files to the configured mmap_limit.
Downloads:	Tarball \| ZIP archive \| SQL archive
Timelines:	family \| ancestors \| descendants \| both \| experimental-mmap
Files:	files \| file ages \| folders
SHA1:	24bab7596bb7385981a5d331df5eeb05353547f7
User & Date:	drh 2013-04-03 10:50:02

Context

2013-04-03
11:17		In btree.c, save the positions of other cursors open on the same table when writing via an incremental blob handle. Otherwise, they may be left holding an out-of-date xFetch page reference. (check-in: 3f09fba1 user: dan tags: experimental-mmap)
10:50		Initialize the mmap_limit of temporary files to the configured mmap_limit. (check-in: 24bab759 user: drh tags: experimental-mmap)
03:53		Make use of xFetch, if it is available when doing a VACUUM or a backup. (check-in: 83bc37af user: drh tags: experimental-mmap)

Changes

Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Changes to src/os_unix.c.

  5056   5056     assert( zFilename!=0 || (ctrlFlags & UNIXFILE_NOLOCK)!=0 );
  5057   5057   
  5058   5058     OSTRACE(("OPEN    %-3d %s\n", h, zFilename));
  5059   5059     pNew->h = h;
  5060   5060     pNew->pVfs = pVfs;
  5061   5061     pNew->zPath = zFilename;
  5062   5062     pNew->ctrlFlags = (u8)ctrlFlags;
  5063         -  pNew->mmapLimit = SQLITE_DEFAULT_MMAP_LIMIT;
         5063  +  pNew->mmapLimit = sqlite3GlobalConfig.mxMmap;
  5064   5064     if( sqlite3_uri_boolean(((ctrlFlags & UNIXFILE_URI) ? zFilename : 0),
  5065   5065                              "psow", SQLITE_POWERSAFE_OVERWRITE) ){
  5066   5066       pNew->ctrlFlags |= UNIXFILE_PSOW;
  5067   5067     }
  5068   5068     if( strcmp(pVfs->zName,"unix-excl")==0 ){
  5069   5069       pNew->ctrlFlags |= UNIXFILE_EXCL;
  5070   5070     }

Changes to src/os_win.c.

  4112   4112     }
  4113   4113     pFile->lastErrno = NO_ERROR;
  4114   4114     pFile->zPath = zName;
  4115   4115     pFile->hMap = NULL;
  4116   4116     pFile->pMapRegion = 0;
  4117   4117     pFile->mmapSize = 0;
  4118   4118     pFile->mmapOrigsize = 0;
  4119         -  pFile->mmapLimit = SQLITE_DEFAULT_MMAP_LIMIT;
         4119  +  pFile->mmapLimit = sqlite3GlobalConfig.mxMmap;
  4120   4120   
  4121   4121     OpenCounter(+1);
  4122   4122     return rc;
  4123   4123   }
  4124   4124   
  4125   4125   /*
  4126   4126   ** Delete the named file.