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

Change an assert() added by the previous commit into a testcase().

Browse Source 
Fix a separate assert() in btree.c:freeSpace().

FossilOrigin-Name: fe51d3aa0ce7021213293a0647e31164073e78f7
This commit is contained in:
drh
2014-08-20 13:17:43 +00:00
parent 4c04f3c8bd
commit 905552628c
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
manifest
View File

@@ -1,5 +1,5 @@
C Further\ssize\sreduction\sand\sperformance\simprovement\sin\sbtree.c:allocateSpace(). C Change\san\sassert()\sadded\sby\sthe\sprevious\scommit\sinto\sa\stestcase().\nFix\sa\sseparate\sassert()\sin\sbtree.c:freeSpace().
D 2014-08-20T11:56:14.338 D 2014-08-20T13:17:43.884
F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
F Makefile.in 5eb79e334a5de69c87740edd56af6527dd219308 F Makefile.in 5eb79e334a5de69c87740edd56af6527dd219308
F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -167,7 +167,7 @@ F src/auth.c 523da7fb4979469955d822ff9298352d6b31de34
F src/backup.c a729e63cf5cd1829507cb7b8e89f99b95141bb53 F src/backup.c a729e63cf5cd1829507cb7b8e89f99b95141bb53
F src/bitvec.c 19a4ba637bd85f8f63fc8c9bae5ade9fb05ec1cb F src/bitvec.c 19a4ba637bd85f8f63fc8c9bae5ade9fb05ec1cb
F src/btmutex.c 976f45a12e37293e32cae0281b15a21d48a8aaa7 F src/btmutex.c 976f45a12e37293e32cae0281b15a21d48a8aaa7
F src/btree.c 398ecbdb4a19230940955c10b4f35de958e9a05c F src/btree.c 53eb576f72093d5138f5b7468994121c6eb6fe98
F src/btree.h 4245a349bfe09611d7ff887dbc3a80cee8b7955a F src/btree.h 4245a349bfe09611d7ff887dbc3a80cee8b7955a
F src/btreeInt.h cf180d86b2e9e418f638d65baa425c4c69c0e0e3 F src/btreeInt.h cf180d86b2e9e418f638d65baa425c4c69c0e0e3
F src/build.c 5abf794fe8a605f2005b422e98a3cedad9b9ef5b F src/build.c 5abf794fe8a605f2005b422e98a3cedad9b9ef5b
@@ -1186,7 +1186,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32 F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32
F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
P 6c66beae97ba1799c908d3a33371dedbc7f3f58c P 1cb1cd64930a6bc371143f7d2e77eb1c51498cb0
R 28706ecaca72a1e3574ba7b8d51854c6 R 2da2148faf73b1d43a764ae813ef9e60
U drh U drh
Z ca9532aeb7742cb91c75177cb9ee4fbc Z 36b8d62cf946d2fc64ee098831079eb8

2
manifest.uuid
View File

@@ -1 +1 @@
1cb1cd64930a6bc371143f7d2e77eb1c51498cb0 fe51d3aa0ce7021213293a0647e31164073e78f7

4
src/btree.c
View File

@@ -1267,7 +1267,7 @@ static int allocateSpace(MemPage *pPage, int nByte, int *pIdx){
testcase( gap+2+nByte==top ); testcase( gap+2+nByte==top );
if( gap+2+nByte>top ){ if( gap+2+nByte>top ){
defragment_page: defragment_page:
assert( pPage->nCell>0 ); testcase( pPage->nCell==0 );
rc = defragmentPage(pPage); rc = defragmentPage(pPage);
if( rc ) return rc; if( rc ) return rc;
top = get2byteNotZero(&data[hdr+5]); top = get2byteNotZero(&data[hdr+5]);
@@ -1306,7 +1306,7 @@ static int freeSpace(MemPage *pPage, int start, int size){
assert( start>=pPage->hdrOffset+6+pPage->childPtrSize ); assert( start>=pPage->hdrOffset+6+pPage->childPtrSize );
assert( (start + size) <= (int)pPage->pBt->usableSize ); assert( (start + size) <= (int)pPage->pBt->usableSize );
assert( sqlite3_mutex_held(pPage->pBt->mutex) ); assert( sqlite3_mutex_held(pPage->pBt->mutex) );
assert( size>=0 ); /* Minimum cell size is 4 */ assert( size>=4 ); /* Minimum cell size is 4 */
if( pPage->pBt->btsFlags & BTS_SECURE_DELETE ){ if( pPage->pBt->btsFlags & BTS_SECURE_DELETE ){
/* Overwrite deleted information with zeros when the secure_delete /* Overwrite deleted information with zeros when the secure_delete