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

Reorder some of the branches in backup.c in order to make the code

Browse Source 
easier to test.

FossilOrigin-Name: 2c443d47ecee7b43a89f0a4bf299c46c66e3f80d
This commit is contained in:
drh
2011-08-25 20:18:47 +00:00
parent 4b2704021a
commit c5dbffe741
3 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
manifest
View File

@@ -1,5 +1,5 @@
C Replace\san\sassert()\sthat\sa\scondition\smay\snot\soccur\sin\sbackup.c\swith\scode\sto\shandle\sthat\scondition,\swhich\scan\soccur. C Reorder\ssome\sof\sthe\sbranches\sin\sbackup.c\sin\sorder\sto\smake\sthe\scode\neasier\sto\stest.
D 2011-08-25T19:28:47.374 D 2011-08-25T20:18:47.446
F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
F Makefile.in 8c930e7b493d59099ea1304bd0f2aed152eb3315 F Makefile.in 8c930e7b493d59099ea1304bd0f2aed152eb3315
F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -121,7 +121,7 @@ F src/alter.c ac80a0f31189f8b4a524ebf661e47e84536ee7f5
F src/analyze.c a425d62e8fa9ebcb4359ab84ff0c62c6563d2e2a F src/analyze.c a425d62e8fa9ebcb4359ab84ff0c62c6563d2e2a
F src/attach.c 12c6957996908edc31c96d7c68d4942c2474405f F src/attach.c 12c6957996908edc31c96d7c68d4942c2474405f
F src/auth.c 523da7fb4979469955d822ff9298352d6b31de34 F src/auth.c 523da7fb4979469955d822ff9298352d6b31de34
F src/backup.c 2d879fd8bf2d40011d0d67233842b0367ce95ac7 F src/backup.c 28a4fe55327ff708bfaf9d4326d02686f7a553c3
F src/bitvec.c af50f1c8c0ff54d6bdb7a80e2fceca5a93670bef F src/bitvec.c af50f1c8c0ff54d6bdb7a80e2fceca5a93670bef
F src/btmutex.c 976f45a12e37293e32cae0281b15a21d48a8aaa7 F src/btmutex.c 976f45a12e37293e32cae0281b15a21d48a8aaa7
F src/btree.c 97cf3ba4ff067e716753b33661035e50853aebba F src/btree.c 97cf3ba4ff067e716753b33661035e50853aebba
@@ -961,7 +961,7 @@ F tool/symbols.sh caaf6ccc7300fd43353318b44524853e222557d5
F tool/tostr.awk 11760e1b94a5d3dcd42378f3cc18544c06cfa576 F tool/tostr.awk 11760e1b94a5d3dcd42378f3cc18544c06cfa576
F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
F tool/warnings.sh b7fdb2cc525f5ef4fa43c80e771636dd3690f9d2 F tool/warnings.sh b7fdb2cc525f5ef4fa43c80e771636dd3690f9d2
P 16f83fec77668c021694fbb189b415bd3b90adc8 P 472c74b3452c5a07dfb006010441232b09599ad5
R 3935a8b1957579da0f0f48128e347d0c R 8c5e28ffe9a7799230a8adf4f20dce05
U dan U drh
Z da737978f8355147bae2811829cc97da Z ae50a88981aafd0a9a503f248a20233b

2
manifest.uuid
View File

@@ -1 +1 @@
472c74b3452c5a07dfb006010441232b09599ad5 2c443d47ecee7b43a89f0a4bf299c46c66e3f80d

18
src/backup.c
View File

@@ -410,16 +410,16 @@ int sqlite3_backup_step(sqlite3_backup *p, int nPage){
** the case where the source and destination databases have the ** the case where the source and destination databases have the
** same schema version. ** same schema version.
*/ */
if( rc==SQLITE_DONE if( rc==SQLITE_DONE ){
&& (rc = sqlite3BtreeUpdateMeta(p->pDest,1,p->iDestSchema+1))==SQLITE_OK rc = sqlite3BtreeUpdateMeta(p->pDest,1,p->iDestSchema+1);
){ if( rc==SQLITE_OK ){
if( p->pDestDb ){ if( p->pDestDb ){
sqlite3ResetInternalSchema(p->pDestDb, -1); sqlite3ResetInternalSchema(p->pDestDb, -1);
}
if( destMode==PAGER_JOURNALMODE_WAL ){
rc = sqlite3BtreeSetVersion(p->pDest, 2);
}
} }
if( destMode==PAGER_JOURNALMODE_WAL ){
rc = sqlite3BtreeSetVersion(p->pDest, 2);
}
if( rc==SQLITE_OK ){ if( rc==SQLITE_OK ){
int nDestTruncate; int nDestTruncate;
/* Set nDestTruncate to the final number of pages in the destination /* Set nDestTruncate to the final number of pages in the destination