database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-11-09 14:21:03 +03:00
Code Activity

Changes to vacuum.c to facilitate full coverage testing. (CVS 6606)

Browse Source 
FossilOrigin-Name: 866284654c1f163af4164fe8c698d30af32e4eaa
This commit is contained in:
drh
2009-05-05 17:37:22 +00:00
parent 3500ed6650
commit 5dc348a2e2
3 changed files with 19 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
manifest
View File

@@ -1,5 +1,5 @@
C Make\ssure\sthe\sleft-shift\soperator\snever\soverflows.\s(CVS\s6605) C Changes\sto\svacuum.c\sto\sfacilitate\sfull\scoverage\stesting.\s(CVS\s6606)
D 2009-05-05T15:46:43 D 2009-05-05T17:37:23
F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
F Makefile.in 583e87706abc3026960ed759aff6371faf84c211 F Makefile.in 583e87706abc3026960ed759aff6371faf84c211
F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -202,7 +202,7 @@ F src/trigger.c 448615bec40efcd6b3a9362a060f2e7067f25be5
F src/update.c deb930324dd67b7ad98234e1258a0ebcdd1ca0f9 F src/update.c deb930324dd67b7ad98234e1258a0ebcdd1ca0f9
F src/utf.c 9541d28f40441812c0b40f00334372a0542c00ff F src/utf.c 9541d28f40441812c0b40f00334372a0542c00ff
F src/util.c 40fb962de1b00a310de4acc87c6800173e35c25f F src/util.c 40fb962de1b00a310de4acc87c6800173e35c25f
F src/vacuum.c 07121a727beeee88f27d704a00313ad6a7c9bef0 F src/vacuum.c e8d178004377e97500c7ea87c8a3542976e3ea45
F src/vdbe.c e7c3355a39dfa0bf0be69e123061a6c1503fb327 F src/vdbe.c e7c3355a39dfa0bf0be69e123061a6c1503fb327
F src/vdbe.h 35a648bc3279a120da24f34d9a25213ec15daf8a F src/vdbe.h 35a648bc3279a120da24f34d9a25213ec15daf8a
F src/vdbeInt.h 43183a2a18654fa570219ab65e53a608057c48ae F src/vdbeInt.h 43183a2a18654fa570219ab65e53a608057c48ae
@@ -728,7 +728,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81
F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
P 25a11b9ecae1befd3f58958d68f6346f1e1e47ad P 300da30178c46ab9f2ceb0c3e3ee3eac73d5d8e1
R effe924e1faf6db44318ac86798fb5da R 1086c9680170d6c78c00ea06b9dddadb
U drh U drh
Z 6a56d2949ddd86ce55cbcf7869e0cd21 Z 1916cee41b899df3b7a6f4b10829cb7e

2
manifest.uuid
View File

@@ -1 +1 @@
300da30178c46ab9f2ceb0c3e3ee3eac73d5d8e1 866284654c1f163af4164fe8c698d30af32e4eaa

21
src/vacuum.c
View File

@@ -14,7 +14,7 @@
** Most of the code in this file may be omitted by defining the ** Most of the code in this file may be omitted by defining the
** SQLITE_OMIT_VACUUM macro. ** SQLITE_OMIT_VACUUM macro.
** **
** $Id: vacuum.c,v 1.87 2009/04/02 20:16:59 drh Exp $ ** $Id: vacuum.c,v 1.88 2009/05/05 17:37:23 drh Exp $
*/ */
#include "sqliteInt.h" #include "sqliteInt.h"
#include "vdbeInt.h" #include "vdbeInt.h"
@@ -25,13 +25,15 @@
*/ */
static int execSql(sqlite3 *db, const char *zSql){ static int execSql(sqlite3 *db, const char *zSql){
sqlite3_stmt *pStmt; sqlite3_stmt *pStmt;
VVA_ONLY( int rc; )
if( !zSql ){ if( !zSql ){
return SQLITE_NOMEM; return SQLITE_NOMEM;
} }
if( SQLITE_OK!=sqlite3_prepare(db, zSql, -1, &pStmt, 0) ){ if( SQLITE_OK!=sqlite3_prepare(db, zSql, -1, &pStmt, 0) ){
return sqlite3_errcode(db); return sqlite3_errcode(db);
} }
while( SQLITE_ROW==sqlite3_step(pStmt) ){} VVA_ONLY( rc = ) sqlite3_step(pStmt);
assert( rc!=SQLITE_ROW );
return sqlite3_finalize(pStmt); return sqlite3_finalize(pStmt);
} }
@@ -142,7 +144,7 @@ int sqlite3RunVacuum(char **pzErrMsg, sqlite3 *db){
if( sqlite3BtreeSetPageSize(pTemp, sqlite3BtreeGetPageSize(pMain), nRes, 0) if( sqlite3BtreeSetPageSize(pTemp, sqlite3BtreeGetPageSize(pMain), nRes, 0)
|| (!isMemDb && sqlite3BtreeSetPageSize(pTemp, db->nextPagesize, nRes, 0)) || (!isMemDb && sqlite3BtreeSetPageSize(pTemp, db->nextPagesize, nRes, 0))
|| db->mallocFailed || NEVER(db->mallocFailed)
){ ){
rc = SQLITE_NOMEM; rc = SQLITE_NOMEM;
goto end_of_vacuum; goto end_of_vacuum;
@@ -230,7 +232,7 @@ int sqlite3RunVacuum(char **pzErrMsg, sqlite3 *db){
** opened for writing. This way, the SQL transaction used to create the ** opened for writing. This way, the SQL transaction used to create the
** temporary database never needs to be committed. ** temporary database never needs to be committed.
*/ */
if( rc==SQLITE_OK ){ {
u32 meta; u32 meta;
int i; int i;
@@ -252,10 +254,12 @@ int sqlite3RunVacuum(char **pzErrMsg, sqlite3 *db){
/* Copy Btree meta values */ /* Copy Btree meta values */
for(i=0; i<ArraySize(aCopy); i+=2){ for(i=0; i<ArraySize(aCopy); i+=2){
/* GetMeta() and UpdateMeta() cannot fail in this context because
** we already have page 1 loaded into cache and marked dirty. */
rc = sqlite3BtreeGetMeta(pMain, aCopy[i], &meta); rc = sqlite3BtreeGetMeta(pMain, aCopy[i], &meta);
if( rc!=SQLITE_OK ) goto end_of_vacuum; if( NEVER(rc!=SQLITE_OK) ) goto end_of_vacuum;
rc = sqlite3BtreeUpdateMeta(pTemp, aCopy[i], meta+aCopy[i+1]); rc = sqlite3BtreeUpdateMeta(pTemp, aCopy[i], meta+aCopy[i+1]);
if( rc!=SQLITE_OK ) goto end_of_vacuum; if( NEVER(rc!=SQLITE_OK) ) goto end_of_vacuum;
} }
rc = sqlite3BtreeCopyFile(pMain, pTemp); rc = sqlite3BtreeCopyFile(pMain, pTemp);
@@ -267,9 +271,8 @@ int sqlite3RunVacuum(char **pzErrMsg, sqlite3 *db){
#endif #endif
} }
if( rc==SQLITE_OK ){ assert( rc==SQLITE_OK );
rc = sqlite3BtreeSetPageSize(pMain, sqlite3BtreeGetPageSize(pTemp), nRes,1); rc = sqlite3BtreeSetPageSize(pMain, sqlite3BtreeGetPageSize(pTemp), nRes,1);
}
end_of_vacuum: end_of_vacuum:
/* Restore the original value of db->flags */ /* Restore the original value of db->flags */