database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-08-05 15:55:57 +03:00
Code Activity

Comment typo fix and minor cleanup in the pager. No logic changes.

Browse Source 
FossilOrigin-Name: 94ef17012855b7be725594c34bcea75f34c40190
This commit is contained in:
drh
2015-06-28 17:33:11 +00:00
parent c5ef7151b0
commit b84c14d07c
3 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
manifest
View File

@@ -1,5 +1,5 @@
C Avoid\sunnecessary\scalls\sto\ssqlite3VdbeSerialTypeLen()\sfor\sinteger\nserial\stypes,\sfor\sa\ssmall\ssize\sreduction\sand\sa\sspeed\sincrease. C Comment\stypo\sfix\sand\sminor\scleanup\sin\sthe\spager.\s\sNo\slogic\schanges.
D 2015-06-28T02:58:51.359 D 2015-06-28T17:33:11.230
F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
F Makefile.in 285a0a234ed7610d431d91671c136098c2bd86a9 F Makefile.in 285a0a234ed7610d431d91671c136098c2bd86a9
F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -314,7 +314,7 @@ F src/os_setup.h c9d4553b5aaa6f73391448b265b89bed0b890faa
F src/os_unix.c 23eb5f56fac54d8fe0cb204291f3b3b2d94f23fc F src/os_unix.c 23eb5f56fac54d8fe0cb204291f3b3b2d94f23fc
F src/os_win.c 27cc135e2d0b8b1e2e4944db1e2669a6a18fa0f8 F src/os_win.c 27cc135e2d0b8b1e2e4944db1e2669a6a18fa0f8
F src/os_win.h eb7a47aa17b26b77eb97e4823f20a00b8bda12ca F src/os_win.h eb7a47aa17b26b77eb97e4823f20a00b8bda12ca
F src/pager.c 9bc918a009285f96ec6dac62dd764c7063552455 F src/pager.c db79b64a5498e2b3a72f0f6bc74faebe48da3e95
F src/pager.h c3476e7c89cdf1c6914e50a11f3714e30b4e0a77 F src/pager.h c3476e7c89cdf1c6914e50a11f3714e30b4e0a77
F src/parse.y 6d60dda8f8d418b6dc034f1fbccd816c459983a8 F src/parse.y 6d60dda8f8d418b6dc034f1fbccd816c459983a8
F src/pcache.c d8b19632706dd6b81b03d0c5fd1e6bab8c13d0b9 F src/pcache.c d8b19632706dd6b81b03d0c5fd1e6bab8c13d0b9
@@ -1364,7 +1364,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
F tool/warnings.sh 48bd54594752d5be3337f12c72f28d2080cb630b F tool/warnings.sh 48bd54594752d5be3337f12c72f28d2080cb630b
F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
P 63998471d023dd846d5583ac856e2acc47ad41ea P 9cd30d33b1d02dc8c55c1d74bdbcefab63ebf2a7
R 212ca1fcb98a576a11f4bdf11ee3ebc0 R b8484b94b4d1a85c0081f4649a289df8
U drh U drh
Z 171de1cc147222ccddab9bfa4a1ca423 Z b085b905d03794e34ce8f566e5412526

2
manifest.uuid
View File

@@ -1 +1 @@
9cd30d33b1d02dc8c55c1d74bdbcefab63ebf2a7 94ef17012855b7be725594c34bcea75f34c40190

10
src/pager.c
View File

@@ -5131,7 +5131,7 @@ int sqlite3PagerSharedLock(Pager *pPager){
** occurring on the very first access to a file, in order to save a ** occurring on the very first access to a file, in order to save a
** single unnecessary sqlite3OsRead() call at the start-up. ** single unnecessary sqlite3OsRead() call at the start-up.
** **
** Database changes is detected by looking at 15 bytes beginning ** Database changes are detected by looking at 15 bytes beginning
** at offset 24 into the file. The first 4 of these 16 bytes are ** at offset 24 into the file. The first 4 of these 16 bytes are
** a 32-bit counter that is incremented with each change. The ** a 32-bit counter that is incremented with each change. The
** other bytes change randomly with each file change when ** other bytes change randomly with each file change when
@@ -5352,10 +5352,11 @@ int sqlite3PagerAcquire(
pPg = 0; pPg = 0;
goto pager_acquire_err; goto pager_acquire_err;
} }
assert( (*ppPage)->pgno==pgno ); assert( pPg==(*ppPage) );
assert( (*ppPage)->pPager==pPager || (*ppPage)->pPager==0 ); assert( pPg->pgno==pgno );
assert( pPg->pPager==pPager || pPg->pPager==0 );
if( (*ppPage)->pPager && !noContent ){ if( pPg->pPager && !noContent ){
/* In this case the pcache already contains an initialized copy of /* In this case the pcache already contains an initialized copy of
** the page. Return without further ado. */ ** the page. Return without further ado. */
assert( pgno<=PAGER_MAX_PGNO && pgno!=PAGER_MJ_PGNO(pPager) ); assert( pgno<=PAGER_MAX_PGNO && pgno!=PAGER_MJ_PGNO(pPager) );
@@ -5366,7 +5367,6 @@ int sqlite3PagerAcquire(
/* The pager cache has created a new page. Its content needs to /* The pager cache has created a new page. Its content needs to
** be initialized. */ ** be initialized. */
pPg = *ppPage;
pPg->pPager = pPager; pPg->pPager = pPager;
/* The maximum page number is 2^31. Return SQLITE_CORRUPT if a page /* The maximum page number is 2^31. Return SQLITE_CORRUPT if a page