database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-08-07 02:42:48 +03:00
Code Activity

The pager takes the sector size to be the larger of the sector size

Browse Source 
reported by sqlite3OsSectorSize() and the page size. (CVS 3890)

FossilOrigin-Name: e5e6af55ccc5c1a8a9206b42f1dd7bf547cb97ca
This commit is contained in:
drh
2007-05-01 16:59:48 +00:00
parent 0b6212090f
commit c80f058db3
3 changed files with 24 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/pager.c
View File

@@ -18,7 +18,7 @@
** file simultaneously, or one process from reading the database while
** another is writing.
**
** @(#) $Id: pager.c,v 1.331 2007/04/28 15:47:44 danielk1977 Exp $
** @(#) $Id: pager.c,v 1.332 2007/05/01 16:59:49 drh Exp $
*/
#ifndef SQLITE_OMIT_DISKIO
#include "sqliteInt.h"
@@ -1250,6 +1250,19 @@ static int pager_truncate(Pager *pPager, int nPage){
return rc;
}
/*
** Set the sectorSize for the given pager.
**
** The sector size is the larger of the sector size reported
** by sqlite3OsSectorSize() and the pageSize.
*/
static void setSectorSize(Pager *pPager){
pPager->sectorSize = sqlite3OsSectorSize(pPager->fd);
if( pPager->sectorSize<pPager->pageSize ){
pPager->sectorSize = pPager->pageSize;
}
}
/*
** Playback the journal and thus restore the database file to
** the state it was in before we started making changes.
@@ -1417,7 +1430,7 @@ end_playback:
** back a journal created by a process with a different sector size
** value. Reset it to the correct value for this process.
*/
pPager->sectorSize = sqlite3OsSectorSize(pPager->fd);
setSectorSize(pPager);
return rc;
}
@@ -1764,7 +1777,7 @@ int sqlite3PagerOpen(
pPager->nExtra = FORCE_ALIGNMENT(nExtra);
assert(fd||memDb);
if( !memDb ){
pPager->sectorSize = sqlite3OsSectorSize(fd);
setSectorSize(pPager);
}
/* pPager->pBusyHandler = 0; */
/* memset(pPager->aHash, 0, sizeof(pPager->aHash)); */