Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
Comment: | Change some variable names and comments in the new in-memory database file implementation. Partial (non-working) implementation of the VACUUM command. (CVS 904) |
---|---|
Downloads: | Tarball | ZIP archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA1: |
e76787f877c456abdc8bc88bfefc50ea |
User & Date: | drh 2003-04-15 01:19:48.000 |
Context
2003-04-15
| ||
01:49 | Change lemon to use <stdarg.h> instead of <varargs.h> because GCC no longer supports varargs.h. Tickets #288 and #280. Ironically, lemon originally used varargs.h because stdarg.h was not supported by the compiler I was using in 1989 (which was gcc if I recall correctly.) (CVS 905) (check-in: 7902e4778e user: drh tags: trunk) | |
01:19 | Change some variable names and comments in the new in-memory database file implementation. Partial (non-working) implementation of the VACUUM command. (CVS 904) (check-in: e76787f877 user: drh tags: trunk) | |
2003-04-13
| ||
18:26 | Support in-memory databases for temp tables (CVS 903) (check-in: 96336bffde user: paul tags: trunk) | |
Changes
Changes to Makefile.in.
︙ | ︙ | |||
54 55 56 57 58 59 60 | # Should the database engine assume text is coded as UTF-8 or iso8859? # # ENCODING = UTF8 # ENCODING = ISO8859 ENCODING = @ENCODING@ # Flags controlling use of the in memory btree implementation | < > > > > > | | < < < | | | | 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 | # Should the database engine assume text is coded as UTF-8 or iso8859? # # ENCODING = UTF8 # ENCODING = ISO8859 ENCODING = @ENCODING@ # Flags controlling use of the in memory btree implementation # # SQLITE_OMIT_INMEMORYDB is defined in order to omit the in-memory # red/black tree driver in the file btree_rb.c # # TEMP_STORE is 0 to force temporary tables to be in a file, 1 to # default to file, 2 to default ot memory, and 3 to force temporary # tables to always be in memory. # INCOREDB = @INCOREDB@ INCOREFLAGS = -DSQLITE_OMIT_INMEMORYDB=1 -DTEMP_STORE=${INCOREDB} # You should not have to change anything below this line ############################################################################### # Object files for the SQLite library. # LIBOBJ = attach.lo auth.lo btree.lo build.lo copy.lo \ |
︙ | ︙ |
Changes to src/build.c.
︙ | ︙ | |||
19 20 21 22 23 24 25 | ** DROP INDEX ** creating ID lists ** BEGIN TRANSACTION ** COMMIT ** ROLLBACK ** PRAGMA ** | | | 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 | ** DROP INDEX ** creating ID lists ** BEGIN TRANSACTION ** COMMIT ** ROLLBACK ** PRAGMA ** ** $Id: build.c,v 1.145 2003/04/15 01:19:48 drh Exp $ */ #include "sqliteInt.h" #include <ctype.h> /* ** This routine is called when a new SQL statement is beginning to ** be parsed. Check to see if the schema for the database needs |
︙ | ︙ | |||
432 433 434 435 436 437 438 | #endif /* Before trying to create a temporary table, make sure the Btree for ** holding temporary tables is open. */ if( isTemp && db->aDb[1].pBt==0 && !pParse->explain ){ | | | 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 | #endif /* Before trying to create a temporary table, make sure the Btree for ** holding temporary tables is open. */ if( isTemp && db->aDb[1].pBt==0 && !pParse->explain ){ int rc = sqliteBtreeFactory(db, 0, 0, MAX_PAGES, &db->aDb[1].pBt); if( rc!=SQLITE_OK ){ sqliteSetString(&pParse->zErrMsg, "unable to open a temporary database " "file for storing temporary tables", 0); pParse->nErr++; return; } if( db->flags & SQLITE_InTrans ){ |
︙ | ︙ |
Changes to src/main.c.
︙ | ︙ | |||
10 11 12 13 14 15 16 | ** ************************************************************************* ** Main file for the SQLite library. The routines in this file ** implement the programmer interface to the library. Routines in ** other files are for internal use by SQLite and should not be ** accessed by users of the library. ** | | | 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 | ** ************************************************************************* ** Main file for the SQLite library. The routines in this file ** implement the programmer interface to the library. Routines in ** other files are for internal use by SQLite and should not be ** accessed by users of the library. ** ** $Id: main.c,v 1.123 2003/04/15 01:19:48 drh Exp $ */ #include "sqliteInt.h" #include "os.h" #include <ctype.h> /* ** A pointer to this structure is used to communicate information |
︙ | ︙ | |||
1053 1054 1055 1056 1057 1058 1059 | void *pOld = db->pCommitArg; db->xCommitCallback = xCallback; db->pCommitArg = pArg; return pOld; } /* | | > | > > | > > > > > > | > > > > > > > > > > > > < < < < < | < | | | | > > | > > | 1053 1054 1055 1056 1057 1058 1059 1060 1061 1062 1063 1064 1065 1066 1067 1068 1069 1070 1071 1072 1073 1074 1075 1076 1077 1078 1079 1080 1081 1082 1083 1084 1085 1086 1087 1088 1089 1090 1091 1092 1093 1094 1095 1096 1097 1098 1099 1100 1101 1102 1103 1104 1105 1106 1107 1108 1109 1110 1111 1112 1113 1114 1115 1116 1117 1118 1119 1120 | void *pOld = db->pCommitArg; db->xCommitCallback = xCallback; db->pCommitArg = pArg; return pOld; } /* ** This routine is called to create a connection to a database BTree ** driver. If zFilename is the name of a file, then that file is ** opened and used. If zFilename is the magic name ":memory:" then ** the database is stored in memory (and is thus forgotten as soon as ** the connection is closed.) If zFilename is NULL then the database ** is for temporary use only and is deleted as soon as the connection ** is closed. ** ** ** ** A temporary database can be either a disk file (that is automatically ** deleted when the file is closed) or a set of red-black trees held in memory, ** depending on the values of the TEMP_STORE compile-time macro and the ** db->temp_store variable, according to the following chart: ** ** TEMP_STORE db->temp_store Location of temporary database ** ---------- -------------- ------------------------------ ** 0 any file ** 1 1 file ** 1 2 memory ** 1 0 file ** 2 1 file ** 2 2 memory ** 2 0 memory ** 3 any memory */ int sqliteBtreeFactory( const sqlite *db, /* Main database when opening aux otherwise 0 */ const char *zFilename, /* Name of the file containing the BTree database */ int omitJournal, /* if TRUE then do not journal this file */ int nCache, /* How many pages in the page cache */ Btree **ppBtree){ /* Pointer to new Btree object written here */ assert( ppBtree != 0); #ifndef SQLITE_OMIT_INMEMORYDB if( zFilename==0 ){ if (TEMP_STORE == 0) { /* Always use file based temporary DB */ return sqliteBtreeOpen(0, omitJournal, nCache, ppBtree); } else if (TEMP_STORE == 1 || TEMP_STORE == 2) { /* Switch depending on compile-time and/or runtime settings. */ int location = db->temp_store==0 ? TEMP_STORE : db->temp_store; if (location == 1) { return sqliteBtreeOpen(zFilename, omitJournal, nCache, ppBtree); } else { return sqliteRBtreeOpen(0, 0, 0, ppBtree); } } else { /* Always use in-core DB */ return sqliteRBtreeOpen(0, 0, 0, ppBtree); } }else if( zFilename[0]==':' && strcmp(zFilename,":memory:")==0 ){ return sqliteRBtreeOpen(0, 0, 0, ppBtree); }else #endif { return sqliteBtreeOpen(zFilename, omitJournal, nCache, ppBtree); } } |
Changes to src/pragma.c.
1 2 3 4 5 6 7 8 9 10 11 12 13 | /* ** 2003 April 6 ** ** The author disclaims copyright to this source code. In place of ** a legal notice, here is a blessing: ** ** May you do good and not evil. ** May you find forgiveness for yourself and forgive others. ** May you share freely, never taking more than you give. ** ************************************************************************* ** This file contains code used to implement the PRAGMA command. ** | | > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 | /* ** 2003 April 6 ** ** The author disclaims copyright to this source code. In place of ** a legal notice, here is a blessing: ** ** May you do good and not evil. ** May you find forgiveness for yourself and forgive others. ** May you share freely, never taking more than you give. ** ************************************************************************* ** This file contains code used to implement the PRAGMA command. ** ** $Id: pragma.c,v 1.3 2003/04/15 01:19:49 drh Exp $ */ #include "sqliteInt.h" #include <ctype.h> /* ** Interpret the given string as a boolean value. */ static int getBoolean(char *z){ static char *azTrue[] = { "yes", "on", "true" }; int i; |
︙ | ︙ | |||
65 66 67 68 69 70 71 | } /* ** Interpret the given string as a temp db location. Return 1 for file ** backed temporary databases, 2 for the Red-Black tree in memory database ** and 0 to use the compile-time default. */ | | | | | | | | | | 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 | } /* ** Interpret the given string as a temp db location. Return 1 for file ** backed temporary databases, 2 for the Red-Black tree in memory database ** and 0 to use the compile-time default. */ static int getTempStore(char *z){ if (sqliteStrICmp(z, "file") == 0) { return 1; }else if(sqliteStrICmp(z, "memory") == 0) { return 2; }else{ return 0; } } /* ** Process a pragma statement. ** ** Pragmas are of this form: ** |
︙ | ︙ | |||
435 436 437 438 439 440 441 | sqliteVdbeAddOp(v, OP_Integer, i, 0); sqliteVdbeAddOp(v, OP_String, 0, 0); sqliteVdbeChangeP3(v, -1, db->aDb[i].zName, P3_STATIC); sqliteVdbeAddOp(v, OP_Callback, 2, 0); } }else /* | | | | | | | | > | > | | | | | | > | | | 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 | sqliteVdbeAddOp(v, OP_Integer, i, 0); sqliteVdbeAddOp(v, OP_String, 0, 0); sqliteVdbeChangeP3(v, -1, db->aDb[i].zName, P3_STATIC); sqliteVdbeAddOp(v, OP_Callback, 2, 0); } }else /* ** PRAGMA temp_store ** PRAGMA temp_store = "default"|"memory"|"file" ** ** Return or set the local value of the temp_store flag. Changing ** the local value does not make changes to the disk file and the default ** value will be restored the next time the database is opened. ** ** Note that it is possible for the library compile-time options to ** override this setting */ if( sqliteStrICmp(zLeft, "temp_store")==0 ){ static VdbeOp getTmpDbLoc[] = { { OP_ColumnName, 0, 0, "temp_store"}, { OP_Callback, 1, 0, 0}, }; if( pRight->z==pLeft->z ){ sqliteVdbeAddOp(v, OP_Integer, db->temp_store, 0); sqliteVdbeAddOpList(v, ArraySize(getTmpDbLoc), getTmpDbLoc); }else{ if (&db->aDb[1].pBt != 0) { sqliteErrorMsg(pParse, "The temporary database already exists - " "its location cannot now be changed"); } else { db->temp_store = getTempStore(zRight); } } }else /* ** PRAGMA default_temp_store ** PRAGMA default_temp_store = "default"|"memory"|"file" ** ** Return or set the value of the persistent temp_store flag (as ** well as the value currently in force). ** ** Note that it is possible for the library compile-time options to ** override this setting */ if( sqliteStrICmp(zLeft, "default_temp_store")==0 ){ static VdbeOp getTmpDbLoc[] = { { OP_ColumnName, 0, 0, "temp_store"}, { OP_ReadCookie, 0, 5, 0}, { OP_Callback, 1, 0, 0}}; if( pRight->z==pLeft->z ){ sqliteVdbeAddOpList(v, ArraySize(getTmpDbLoc), getTmpDbLoc); }else{ if (&db->aDb[1].pBt != 0) { sqliteErrorMsg(pParse, "The temporary database already exists - " "its location cannot now be changed"); } else { sqliteBeginWriteOperation(pParse, 0, 0); db->temp_store = getTempStore(zRight); sqliteVdbeAddOp(v, OP_Integer, db->temp_store, 0); sqliteVdbeAddOp(v, OP_SetCookie, 0, 5); sqliteEndWriteOperation(pParse); } } }else #ifndef NDEBUG |
︙ | ︙ |
Changes to src/sqliteInt.h.
1 2 3 4 5 6 7 8 9 10 11 12 13 | /* ** 2001 September 15 ** ** The author disclaims copyright to this source code. In place of ** a legal notice, here is a blessing: ** ** May you do good and not evil. ** May you find forgiveness for yourself and forgive others. ** May you share freely, never taking more than you give. ** ************************************************************************* ** Internal interface definitions for SQLite. ** | | | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 | /* ** 2001 September 15 ** ** The author disclaims copyright to this source code. In place of ** a legal notice, here is a blessing: ** ** May you do good and not evil. ** May you find forgiveness for yourself and forgive others. ** May you share freely, never taking more than you give. ** ************************************************************************* ** Internal interface definitions for SQLite. ** ** @(#) $Id: sqliteInt.h,v 1.172 2003/04/15 01:19:49 drh Exp $ */ #include "config.h" #include "sqlite.h" #include "hash.h" #include "vdbe.h" #include "parse.h" #include "btree.h" |
︙ | ︙ | |||
61 62 63 64 65 66 67 68 69 70 71 72 73 74 | ** The maximum number of attached databases. This must be at least 2 ** in order to support the main database file (0) and the file used to ** hold temporary tables (1). And it must be less than 256 because the ** an unsigned character is used to stored the database index. */ #define MAX_ATTACHED 10 /* ** Integers of known sizes. These typedefs might change for architectures ** where the sizes very. Preprocessor macros are available so that the ** types can be conveniently redefined at compile-type. Like this: ** ** cc '-DUINTPTR_TYPE=long long int' ... */ | > > > > > > > > > > > > > > > > > > > > > > > > | 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 | ** The maximum number of attached databases. This must be at least 2 ** in order to support the main database file (0) and the file used to ** hold temporary tables (1). And it must be less than 256 because the ** an unsigned character is used to stored the database index. */ #define MAX_ATTACHED 10 /* ** The next macro is used to determine where TEMP tables and indices ** are stored. Possible values: ** ** 0 Always use a temporary files ** 1 Use a file unless overridden by "PRAGMA temp_store" ** 2 Use memory unless overridden by "PRAGMA temp_store" ** 3 Always use memory */ #ifndef TEMP_STORE # define TEMP_STORE 1 #endif /* ** When building SQLite for embedded systems where memory is scarce, ** you can define one or more of the following macros to omit extra ** features of the library and thus keep the size of the library to ** a minimum. */ /* #define SQLITE_OMIT_AUTHORIZATION 1 */ #define SQLITE_OMIT_INMEMORYDB 1 /* #define SQLITE_OMIT_TRACE 1 */ /* #define SQLITE_OMIT_VACUUM 1 */ /* ** Integers of known sizes. These typedefs might change for architectures ** where the sizes very. Preprocessor macros are available so that the ** types can be conveniently redefined at compile-type. Like this: ** ** cc '-DUINTPTR_TYPE=long long int' ... */ |
︙ | ︙ | |||
226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 | ** are as follows: ** ** file_format==1 Version 2.1.0. ** file_format==2 Version 2.2.0. Add support for INTEGER PRIMARY KEY. ** file_format==3 Version 2.6.0. Fix empty-string index bug. ** file_format==4 Version 2.7.0. Add support for separate numeric and ** text datatypes. */ struct sqlite { int nDb; /* Number of backends currently in use */ Db *aDb; /* All backends */ Db aDbStatic[2]; /* Static space for the 2 default backends */ int flags; /* Miscellanous flags. See below */ u8 file_format; /* What file format version is this database? */ u8 safety_level; /* How aggressive at synching data to disk */ u8 want_to_close; /* Close after all VDBEs are deallocated */ int next_cookie; /* Next value of aDb[0].schema_cookie */ int cache_size; /* Number of pages to use in the cache */ | > > > > > | | 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 | ** are as follows: ** ** file_format==1 Version 2.1.0. ** file_format==2 Version 2.2.0. Add support for INTEGER PRIMARY KEY. ** file_format==3 Version 2.6.0. Fix empty-string index bug. ** file_format==4 Version 2.7.0. Add support for separate numeric and ** text datatypes. ** ** The sqlite.temp_store determines where temporary database files ** are stored. If 1, then a file is created to hold those tables. If ** 2, then they are held in memory. 0 means use the default value in ** the TEMP_STORE macro. */ struct sqlite { int nDb; /* Number of backends currently in use */ Db *aDb; /* All backends */ Db aDbStatic[2]; /* Static space for the 2 default backends */ int flags; /* Miscellanous flags. See below */ u8 file_format; /* What file format version is this database? */ u8 safety_level; /* How aggressive at synching data to disk */ u8 want_to_close; /* Close after all VDBEs are deallocated */ int next_cookie; /* Next value of aDb[0].schema_cookie */ int cache_size; /* Number of pages to use in the cache */ int temp_store; /* 1=file, 2=memory, 0=compile-time default */ int nTable; /* Number of tables in the database */ void *pBusyArg; /* 1st Argument to the busy callback */ int (*xBusyCallback)(void *,const char*,int); /* The busy callback */ void *pBeginArg; /* Argument to the xBeginCallback() */ int (*xBeginCallback)(void*); /* Invoked at every transaction start */ void *pCommitArg; /* Argument to xCommitCallback() */ int (*xCommitCallback)(void*);/* Invoked at every commit. */ |
︙ | ︙ |
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 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 | ** ************************************************************************* ** 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.2 2003/04/15 01:19:49 drh Exp $ */ #include "sqliteInt.h" #define SQLITE_OMIT_VACUUM 1 /* ** A structure for holding a dynamic string - a string that can grow ** without bound. */ typedef struct dynStr dynStr; struct dynStr { char *z; /* Text of the string in space obtained from sqliteMalloc() */ int nAlloc; /* Amount of space allocated to z[] */ int nUsed; /* Next unused slot in z[] */ }; #ifndef SQLITE_OMIT_VACUUM /* ** Append text to a dynamic string */ static void appendText(dynStr *p, const char *zText, int nText){ if( nText<0 ) nText = strlen(zText); if( p->z==0 || p->nUsed + nText + 1 >= p->nAlloc ){ char *zNew; p->nAlloc = p->nUsed + nText + 1000; zNew = sqliteRealloc(p->z, p->nAlloc); if( zNew==0 ){ sqliteFree(p->z); memset(p, 0, sizeof(*p)); return; } p->z = zNew; } memcpy(&p->z[p->nUsed], zText, nText+1); p->nUsed += nText; } /* ** Append text to a dynamic string, having first put the text in quotes. */ static void appendQuoted(dynStr *p, const char *zText){ int i, j; appendText(p, "'", 1); for(i=j=0; zText[i]; i++){ if( zText[i]='\'' ){ appendText(p, &zText[j], i-j+1); j = i + 1; appendText(p, "'", 1); } } if( j<i ){ appendText(p, &zText[j], i-j); } appendText(p, "'", 1); } /* ** This is an SQLite callback that is invoked once for each row in ** the SQLITE_MASTER table of the database being vacuumed. The three ** parameters are the type of entry, the name of the entry, and the SQL ** text for the entry. ** ** Append SQL text to the dynStr that will make a copy of the structure ** identified by this row. */ static int vacuumCallback(void *pArg, int argc, char **argv, char **NotUsed){ dynStr *p = (dynStr*)pArg; assert( argc==3 ); assert( argv[0]!=0 ); assert( argv[1]!=0 ); assert( argv[2]!=0 ); appendText(p, argv[2], -1); appendText(p, ";\n", 2); if( strcmp(argv[0],"table")==0 ){ appendText(p, "INSERT INTO ", -1); appendQuoted(p, argv[1]); appendText(p, " SELECT * FROM ", -1); appendQuoted(p, argv[1]); appendText(p, ";\n"); } return 0; } /* ** Generate a random name of 20 character in length. */ static void randomName(char *zBuf){ static const char zChars[] = "abcdefghijklmnopqrstuvwxyz" "0123456789"; int i; for(i=0; i<20; i++){ int n = sqliteRandomByte() % (sizeof(zChars)-1); zBuf[i] = zChars[n]; } } #endif /* ** The non-standard VACUUM command is used to clean up the database, ** collapse free space, etc. It is modelled after the VACUUM command ** in PostgreSQL. ** ** In version 1.0.x of SQLite, the VACUUM command would call ** gdbm_reorganize() on all the database tables. But beginning ** with 2.0.0, SQLite no longer uses GDBM so this command has ** become a no-op. */ void sqliteVacuum(Parse *pParse, Token *pTableName){ #ifndef SQLITE_OMIT_VACUUM const char *zFilename; /* full pathname of the database file */ int nFilename; /* number of characters in zFilename[] */ char *zTemp = 0; /* a temporary file in same directory as zFilename */ char *zTemp2; /* Another temp file in the same directory */ sqlite *dbNew = 0; /* The new vacuumed database */ sqlite *dbOld = 0; /* Alternative connection to original database */ sqlite *db; /* The original database */ int rc; char *zErrMsg = 0; char *zSql = 0; dynStr sStr; /* Initial error checks */ if( pParse->explain ){ return; } db = pParse->db; if( db->flags & SQLITE_InTrans ){ sqliteErrorMsg(pParse, "cannot VACUUM from within a transaction"); return; } memset(&sStr, 0, sizeof(sStr)); /* Get the full pathname of the database file and create two ** temporary filenames in the same directory as the original file. */ zFilename = sqliteBtreeGetFilename(db->aDb[0].pBt); if( zFilename==0 ){ /* This only happens with the in-memory database. VACUUM is a no-op ** there, so just return */ return; } nFilename = strlen(zFilename); zTemp = sqliteMalloc( 2*(nFilename+40) ); if( zTemp==0 ) return; zTemp2 = &zTemp[nFilename+40]; strcpy(zTemp, zFilename); strcpy(zTemp2, zFilename); for(i=0; i<10; i++){ zTemp[nFilename] = '-'; randomName(&zTemp[nFilename+1]); randomName(&zTemp2[nFilename+1]); if( !sqliteOsFileExists(zTemp) && !sqliteOsFileExists(zTemp2) ) break; } if( i>=10 ){ sqliteErrorMsg(pParse, "unable to create a temporary database files " "in the same directory as the original database"); goto end_of_vacuum; } dbNew = sqlite_open(zTemp, 0, &zErrMsg); if( dbNew==0 ){ sqliteErrorMsg(pParse, "unable to open a temporary database at %s - %s", zTemp, zErrMsg); goto end_of_vacuum; } appendText(&sStr, "ATTACH DATABASE ", -1); appendQuoted(&sStr, zFilename); appendText(&sStr, " AS orig;\nBEGIN;\n", -1); if( execsql(pParse, dbNew, sStr.z) ) goto end_of_vacuum; sStr.nUsed = 0; rc = sqlite_exec(dbNew, "SELECT type, name, sql FROM sqlite_master " "WHERE sql NOT NULL", vacuumCallback, &sStr, &zErrMsg); if( rc ){ sqliteErrorMsg(pParse, "unable to vacuum database - %s", zErrMsg); goto end_of_vacuum; } appendText(&sStr, "COMMIT;\n", -1); if( execsql(pParse, dbNew, sStr.z) ) goto end_of_vacuum; end_of_vacuum: sqliteFree(zTemp); sqliteFree(zSql); sqliteFree(sStr.z); if( zErrMsg ) sqlite_freemem(zErrMsg); if( dbNew ) sqlite_close(dbNew); #endif } |
Changes to src/vdbe.c.
︙ | ︙ | |||
32 33 34 35 36 37 38 | ** ** Various scripts scan this source file in order to generate HTML ** documentation, headers files, or other derived files. The formatting ** of the code in this file is, therefore, important. See other comments ** in this file for details. If in doubt, do not deviate from existing ** commenting and indentation practices when changing or adding code. ** | | | 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 | ** ** Various scripts scan this source file in order to generate HTML ** documentation, headers files, or other derived files. The formatting ** of the code in this file is, therefore, important. See other comments ** in this file for details. If in doubt, do not deviate from existing ** commenting and indentation practices when changing or adding code. ** ** $Id: vdbe.c,v 1.213 2003/04/15 01:19:49 drh Exp $ */ #include "sqliteInt.h" #include <ctype.h> /* ** The makefile scans this source file and creates the following ** array of string constants which are the names of all VDBE opcodes. |
︙ | ︙ | |||
3499 3500 3501 3502 3503 3504 3505 | Cursor *pCx; VERIFY( if( i<0 ) goto bad_instruction; ) if( expandCursorArraySize(p, i) ) goto no_mem; pCx = &p->aCsr[i]; cleanupCursor(pCx); memset(pCx, 0, sizeof(*pCx)); pCx->nullRow = 1; | | | 3499 3500 3501 3502 3503 3504 3505 3506 3507 3508 3509 3510 3511 3512 3513 | Cursor *pCx; VERIFY( if( i<0 ) goto bad_instruction; ) if( expandCursorArraySize(p, i) ) goto no_mem; pCx = &p->aCsr[i]; cleanupCursor(pCx); memset(pCx, 0, sizeof(*pCx)); pCx->nullRow = 1; rc = sqliteBtreeFactory(db, 0, 1, TEMP_PAGES, &pCx->pBt); if( rc==SQLITE_OK ){ rc = sqliteBtreeBeginTrans(pCx->pBt); } if( rc==SQLITE_OK ){ if( pOp->p2 ){ int pgno; |
︙ | ︙ |