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

Remove an unreachable branch in the direct blob I/O logic of btree.c.

Browse Source 
FossilOrigin-Name: f97d7274f48e3bb98ed17eae11abb55064134874
This commit is contained in:
drh
2013-04-03 20:04:04 +00:00
parent 716d6d2da7
commit 370c9f498d
3 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
manifest
View File

@@ -1,5 +1,5 @@
C Fix\sa\sbug\sin\sthe\sdetection\sof\siOS\swhen\ssetting\sthe\sdefault\smmap_limit. C Remove\san\sunreachable\sbranch\sin\sthe\sdirect\sblob\sI/O\slogic\sof\sbtree.c.
D 2013-04-03T13:38:46.133 D 2013-04-03T20:04:04.697
F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
F Makefile.in df3e48659d80e1b7765785d8d66c86b320f72cc7 F Makefile.in df3e48659d80e1b7765785d8d66c86b320f72cc7
F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -121,7 +121,7 @@ F src/auth.c 523da7fb4979469955d822ff9298352d6b31de34
F src/backup.c b266767351ae2d847716c56fcb2a1fea7c761c03 F src/backup.c b266767351ae2d847716c56fcb2a1fea7c761c03
F src/bitvec.c 19a4ba637bd85f8f63fc8c9bae5ade9fb05ec1cb F src/bitvec.c 19a4ba637bd85f8f63fc8c9bae5ade9fb05ec1cb
F src/btmutex.c 976f45a12e37293e32cae0281b15a21d48a8aaa7 F src/btmutex.c 976f45a12e37293e32cae0281b15a21d48a8aaa7
F src/btree.c fd492d65eee0eb35f4000ddf478215c99dca6838 F src/btree.c 4e3d07b3781a41e6ba9ea13ca97d7baab0a252a3
F src/btree.h d9490cd37aaeb530a41b07f06e1262950b1be916 F src/btree.h d9490cd37aaeb530a41b07f06e1262950b1be916
F src/btreeInt.h eecc84f02375b2bb7a44abbcbbe3747dde73edb2 F src/btreeInt.h eecc84f02375b2bb7a44abbcbbe3747dde73edb2
F src/build.c 083da8466fd7e481cb8bd5264398f537507f6176 F src/build.c 083da8466fd7e481cb8bd5264398f537507f6176
@@ -1042,7 +1042,7 @@ F tool/vdbe-compress.tcl f12c884766bd14277f4fcedcae07078011717381
F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
F tool/win/sqlite.vsix 97894c2790eda7b5bce3cc79cb2a8ec2fde9b3ac F tool/win/sqlite.vsix 97894c2790eda7b5bce3cc79cb2a8ec2fde9b3ac
P 2d9f1327fe79e40435ce1e2594d7cd9a5aea0ef2 P ac1432b3a8e968be4cbc138b4a35f34187c0c36f
R e2d5c255f4ba7e0fb00c083dac088003 R d830cc1d5cf92f6d3df5e32e65cb6d76
U drh U drh
Z 519f2edad4b962613f9e09a344e900e8 Z d56f9eb968ec676dc0a522c6c207a8e6

2
manifest.uuid
View File

@@ -1 +1 @@
ac1432b3a8e968be4cbc138b4a35f34187c0c36f f97d7274f48e3bb98ed17eae11abb55064134874

10
src/btree.c
View File

@@ -8380,11 +8380,13 @@ int sqlite3BtreePutData(BtCursor *pCsr, u32 offset, u32 amt, void *z){
/* Save the positions of all other cursors open on this table. This is /* Save the positions of all other cursors open on this table. This is
** required in case any of them are holding references to an xFetch ** required in case any of them are holding references to an xFetch
** version of the b-tree page modified by the accessPayload call below. ** version of the b-tree page modified by the accessPayload call below.
**
** Note that pCsr must be open on a BTREE_INTKEY table and saveCursorPosition()
** and hence saveAllCursors() cannot fail on a BTREE_INTKEY table, hence
** saveAllCursors can only return SQLITE_OK.
*/ */
rc = saveAllCursors(pCsr->pBt, pCsr->pgnoRoot, pCsr); VVA_ONLY(rc =) saveAllCursors(pCsr->pBt, pCsr->pgnoRoot, pCsr);
if( rc!=SQLITE_OK ){ assert( rc==SQLITE_OK );
return SQLITE_OK;
}
/* Check some assumptions: /* Check some assumptions:
** (a) the cursor is open for writing, ** (a) the cursor is open for writing,