Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
Comment: | Fix the vacuum bug in version 2.8. Also prepare for release 2.8.16. (CVS 2326) |
---|---|
Downloads: | Tarball | ZIP archive |
Timelines: | family | ancestors | descendants | both | version_2 |
Files: | files | file ages | folders |
SHA1: |
0eaebad5a0242bbdc9c205bf9efeda93 |
User & Date: | drh 2005-02-14 00:21:39.000 |
Context
2005-02-14
| ||
00:25 | Cleanup the vacuum bug fixes in version 2.8. (CVS 2327) (check-in: 5658da7e5a user: drh tags: version_2) | |
00:21 | Fix the vacuum bug in version 2.8. Also prepare for release 2.8.16. (CVS 2326) (check-in: 0eaebad5a0 user: drh tags: version_2) | |
2004-11-20
| ||
20:42 | Avoid excess heap usage when copying expressions. Ticket #979. (CVS 2126) (check-in: 0f444c032d user: drh tags: version_2) | |
Changes
Changes to VERSION.
|
| | | 1 | 2.8.16 |
Changes to src/os.c.
︙ | ︙ | |||
1111 1112 1113 1114 1115 1116 1117 1118 1119 1120 1121 1122 1123 1124 | return SQLITE_IOERR; }else{ return SQLITE_OK; } } #endif } /* ** Make sure all writes to a particular file are committed to disk. ** ** Under Unix, also make sure that the directory entry for the file ** has been created by fsync-ing the directory that contains the file. ** If we do not do this and we encounter a power failure, the directory | > > > > | 1111 1112 1113 1114 1115 1116 1117 1118 1119 1120 1121 1122 1123 1124 1125 1126 1127 1128 | return SQLITE_IOERR; }else{ return SQLITE_OK; } } #endif } #ifdef SQLITE_NOSYNC # define fsync(X) 0 #endif /* ** Make sure all writes to a particular file are committed to disk. ** ** Under Unix, also make sure that the directory entry for the file ** has been created by fsync-ing the directory that contains the file. ** If we do not do this and we encounter a power failure, the directory |
︙ | ︙ |
Changes to src/vacuum.c.
︙ | ︙ | |||
10 11 12 13 14 15 16 | ** ************************************************************************* ** This file contains code used to implement the VACUUM command. ** ** Most of the code in this file may be omitted by defining the ** SQLITE_OMIT_VACUUM macro. ** | | | 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 | ** ************************************************************************* ** This file contains code used to implement the VACUUM command. ** ** Most of the code in this file may be omitted by defining the ** SQLITE_OMIT_VACUUM macro. ** ** $Id: vacuum.c,v 1.13.2.4 2005/02/14 00:21:39 drh Exp $ */ #include "sqliteInt.h" #include "os.h" /* ** A structure for holding a dynamic string - a string that can grow ** without bound. |
︙ | ︙ | |||
222 223 224 225 226 227 228 | char *zTemp = 0; /* a temporary file in same directory as zFilename */ sqlite *dbNew = 0; /* The new vacuumed database */ int rc = SQLITE_OK; /* Return code from service routines */ int i; /* Loop counter */ char *zErrMsg; /* Error message */ vacuumStruct sVac; /* Information passed to callbacks */ | < < < < < < < < | 222 223 224 225 226 227 228 229 230 231 232 233 234 235 | char *zTemp = 0; /* a temporary file in same directory as zFilename */ sqlite *dbNew = 0; /* The new vacuumed database */ int rc = SQLITE_OK; /* Return code from service routines */ int i; /* Loop counter */ char *zErrMsg; /* Error message */ vacuumStruct sVac; /* Information passed to callbacks */ if( db->flags & SQLITE_InTrans ){ sqliteSetString(pzErrMsg, "cannot VACUUM from within a transaction", (char*)0); return SQLITE_ERROR; } if( db->flags & SQLITE_Interrupt ){ return SQLITE_INTERRUPT; |
︙ | ︙ | |||
279 280 281 282 283 284 285 | if( (rc = execsql(pzErrMsg, dbNew, "PRAGMA synchronous=off; BEGIN"))!=0 ){ goto end_of_vacuum; } sVac.dbOld = db; sVac.dbNew = dbNew; sVac.pzErrMsg = pzErrMsg; | < < < < < < < > > > > > > > > > > > > > | 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 | if( (rc = execsql(pzErrMsg, dbNew, "PRAGMA synchronous=off; BEGIN"))!=0 ){ goto end_of_vacuum; } sVac.dbOld = db; sVac.dbNew = dbNew; sVac.pzErrMsg = pzErrMsg; if( rc==SQLITE_OK ){ rc = sqlite_exec(db, "SELECT type, name, sql FROM sqlite_master " "WHERE sql NOT NULL AND type!='view' " "UNION ALL " "SELECT type, name, sql FROM sqlite_master " "WHERE sql NOT NULL AND type=='view'", vacuumCallback1, &sVac, &zErrMsg); } if( rc==SQLITE_OK ){ int meta1[SQLITE_N_BTREE_META]; int meta2[SQLITE_N_BTREE_META]; sqliteBtreeGetMeta(db->aDb[0].pBt, meta1); sqliteBtreeGetMeta(dbNew->aDb[0].pBt, meta2); meta2[1] = meta1[1]+1; meta2[3] = meta1[3]; meta2[4] = meta1[4]; meta2[6] = meta1[6]; rc = sqliteBtreeUpdateMeta(dbNew->aDb[0].pBt, meta2); } if( rc==SQLITE_OK ){ int meta[SQLITE_N_BTREE_META]; rc = sqliteBtreeCopyFile(db->aDb[0].pBt, dbNew->aDb[0].pBt); sqlite_exec(db, "COMMIT", 0, 0, 0); sqliteResetInternalSchema(db, 0); } end_of_vacuum: if( rc && zErrMsg!=0 ){ |
︙ | ︙ |