Further examples of using automatic deallocation to replace "delete" methods.

FossilOrigin-Name: da2f62c502dfd3b53940b08a971137048732ecea

diff --git a/manifest b/manifest
index 97bbfbc4de3bf681d2a7d11df98026ff14cd0c4b..d297456c3ae6a1f25a950885059f295545f7d299 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,8 +1,8 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-C Additional\smalloc\ssanity\schanges.\s\sUse\ssqlite3MemLink()\son\sIndex.zColAff\sand\nTable.zColAff\sas\sa\sproof\sof\sconcept.
-D 2010-07-24T19:08:13
+C Further\sexamples\sof\susing\sautomatic\sdeallocation\sto\sreplace\s"delete"\smethods.
+D 2010-07-25T02:12:51
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in ec08dc838fd8110fe24c92e5130bcd91cbb1ff2e
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -109,8 +109,8 @@ F spec.template 86a4a43b99ebb3e75e6b9a735d5fd293a24e90ca
 F sqlite.pc.in 42b7bf0d02e08b9e77734a47798d1a55a9e0716b
 F sqlite3.1 6be1ad09113570e1fc8dcaff84c9b0b337db5ffc
 F sqlite3.pc.in ae6f59a76e862f5c561eb32a380228a02afc3cad
-F src/alter.c 8dc27638e7e2553e80b2b621f232be5eb1e85ef3
-F src/analyze.c c1bcd04b720e3300edafcdfe8bd2ba6bd9a8dca8
+F src/alter.c 2b9a10affb4d202d51473faee831bb269b1d6dd7
+F src/analyze.c c949a108d1dc43ca12bdd9a5c7f1ffde11e3061d
 F src/attach.c 17bec1f18254d9341369f20f90ba24ce35d20d10
 F src/auth.c 523da7fb4979469955d822ff9298352d6b31de34
 F src/backup.c 51d83300fe0baee39405c416ceb19a58ed30a8ed
@@ -119,7 +119,7 @@ F src/btmutex.c 96a12f50f7a17475155971a241d85ec5171573ff
 F src/btree.c ed454f53f7bf7fb89c7a89f93fa93c5cd35e7aae
 F src/btree.h dd83041eda10c17daf023257c1fc883b5f71f85a
 F src/btreeInt.h b0c87f6725b06a0aa194a6d25d54b16ce9d6e291
-F src/build.c 216e3635a8f675d86f1c102534b9ef05ae27be82
+F src/build.c b4f3c9ba159a4c6e3f6ba6b254f2b560d0fb7a44
 F src/callback.c da3c38d0ef5d7f04fae371e519bda61aa9cb1704
 F src/complete.c dc1d136c0feee03c2f7550bafc0d29075e36deac
 F src/ctime.c 4f3aadad62c6c9f0d4e5a96718516ac4e3c598df
@@ -133,13 +133,13 @@ F src/global.c 02335177cf6946fe5525c6f0755cf181140debf3
 F src/hash.c 458488dcc159c301b8e7686280ab209f1fb915af
 F src/hash.h 2894c932d84d9f892d4b4023a75e501f83050970
 F src/hwtime.h d32741c8f4df852c7d959236615444e2b1063b08
-F src/insert.c e21574be131ce9912a85b4f9f30465d7e0825536
+F src/insert.c 45d9a637f3ede400339f916d841b3e27bd16827e
 F src/journal.c 552839e54d1bf76fb8f7abe51868b66acacf6a0e
 F src/legacy.c a199d7683d60cef73089e892409113e69c23a99f
 F src/lempar.c 7f026423f4d71d989e719a743f98a1cbd4e6d99e
 F src/loadext.c 6d422ea91cf3d2d00408c5a8f2391cd458da85f8
 F src/main.c a487fe90aecaccb142e4a6b738c7e26e99145bcd
-F src/malloc.c 4ab52050d99528b0d7d7109df3438346eee9c61c
+F src/malloc.c a7e805ed0bd140b9b3110cee6fffe70b2361c7a3
 F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
 F src/mem1.c 89d4ea8d5cdd55635cbaa48ad53132af6294cbb2
 F src/mem2.c 716e62689d49b01ee742be6c745b1c3bbfbccd18
@@ -171,11 +171,11 @@ F src/printf.c 8ae5082dd38a1b5456030c3755ec3a392cd51506
 F src/random.c cd4a67b3953b88019f8cd4ccd81394a8ddfaba50
 F src/resolve.c 1c0f32b64f8e3f555fe1f732f9d6f501a7f05706
 F src/rowset.c 69afa95a97c524ba6faf3805e717b5b7ae85a697
-F src/select.c 74fef1334bec27e606ef0b19e5c41cd0a639e69c
+F src/select.c b0fec59c8bb5246be793baa40b0518041837cc12
 F src/shell.c fd4ccdb37c3b68de0623eb938a649e0990710714
 F src/sqlite.h.in 2585fc82c922f2772e201e60a76d5fd1ca18370e
 F src/sqlite3ext.h 69dfb8116af51b84a029cddb3b35062354270c89
-F src/sqliteInt.h 2e5a9ae356ea10b65922c720fb2de0e95293a0f2
+F src/sqliteInt.h 0431c9cd9a4158811d4c15dd362c3cae5ecb75da
 F src/sqliteLimit.h 196e2f83c3b444c4548fc1874f52f84fdbda40f3
 F src/status.c e2ad9f18c16209dab501e26020590fcebb2b751b
 F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
@@ -841,14 +841,14 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P 48ef221c28ceaeb11427d9fe3049aa16249d466e
-R 32338a1f34513b853c12a700e9047211
+P e5ecb15984e433b102e82eadb127d50ba2dc2ce3
+R a33d59e84cff2f0b84bd9d9458cba780
 U drh
-Z 4d4eddfc2c83d359d3776863df1232ad
+Z b0d2c45f9a50710478f7169e725e5290
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFMSzoioxKgR168RlERArlYAJ9mL1s/uk/lQ08E8yNlsC0CIXElUQCeNRTU
-xF13RI4V3Pr7PzVNeUBhJFE=
-=4aJd
+iD8DBQFMS52moxKgR168RlERAidqAJ4wHohDl6Iox9qRr6lkRAJPtN4DEwCfUboT
+TLoFiPNTB9PUW0R9U0mj5LI=
+=EF4M
 -----END PGP SIGNATURE-----

diff --git a/manifest.uuid b/manifest.uuid
index c04f7fa80bdf1431202f090989cffb414e10250c..aada8d3c94ef70c0211882288f453d43fcca1295 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-e5ecb15984e433b102e82eadb127d50ba2dc2ce3
\ No newline at end of file
+da2f62c502dfd3b53940b08a971137048732ecea
\ No newline at end of file

diff --git a/src/alter.c b/src/alter.c
index a863c4548b8bd191d047c36efaedc4e424b3f265..26dbeb1761194341afdd4108f1d57a09a4d42cbc 100644 (file)
--- a/src/alter.c
+++ b/src/alter.c
@@ -775,6 +775,7 @@ void sqlite3AlterBeginAddColumn(Parse *pParse, SrcList *pSrc){
   assert( nAlloc>=pNew->nCol && nAlloc%8==0 && nAlloc-pNew->nCol<8 );
   pNew->aCol = (Column*)sqlite3DbMallocZero(db, sizeof(Column)*nAlloc);
   pNew->zName = sqlite3MPrintf(db, "sqlite_altertab_%s", pTab->zName);
+  sqlite3MemLink(pNew, pNew->zName);
   if( !pNew->aCol || !pNew->zName ){
     db->mallocFailed = 1;
     goto exit_begin_add_column;

diff --git a/src/analyze.c b/src/analyze.c
index 88a1820ed0a11e7d6965ad5b7db095553eaa4189..c8e858a3f153850e8bd3b90e49a66bed88a6c80a 100644 (file)
--- a/src/analyze.c
+++ b/src/analyze.c
@@ -486,28 +486,6 @@ static int analysisLoader(void *pData, int argc, char **argv, char **NotUsed){
   return 0;
 }
 
-/*
-** If the Index.aSample variable is not NULL, delete the aSample[] array
-** and its contents.
-*/
-void sqlite3DeleteIndexSamples(Index *pIdx){
-#ifdef SQLITE_ENABLE_STAT2
-  if( pIdx->aSample ){
-    int j;
-    for(j=0; j<SQLITE_INDEX_SAMPLES; j++){
-      IndexSample *p = &pIdx->aSample[j];
-      if( p->eType==SQLITE_TEXT || p->eType==SQLITE_BLOB ){
-        sqlite3_free(p->u.z);
-      }
-    }
-    sqlite3DbFree(0, pIdx->aSample);
-    pIdx->aSample = 0;
-  }
-#else
-  UNUSED_PARAMETER(pIdx);
-#endif
-}
-
 /*
 ** Load the content of the sqlite_stat1 and sqlite_stat2 tables. The
 ** contents of sqlite_stat1 are used to populate the Index.aiRowEst[]
@@ -542,7 +520,11 @@ int sqlite3AnalysisLoad(sqlite3 *db, int iDb){
   for(i=sqliteHashFirst(&db->aDb[iDb].pSchema->idxHash);i;i=sqliteHashNext(i)){
     Index *pIdx = sqliteHashData(i);
     sqlite3DefaultRowEst(pIdx);
-    sqlite3DeleteIndexSamples(pIdx);
+    if( pIdx->aSample ){
+      sqlite3MemUnlink(pIdx, pIdx->aSample);
+      sqlite3DbFree(db, pIdx->aSample);
+      pIdx->aSample = 0;
+    }
   }
 
   /* Check to make sure the sqlite_stat1 table exists */
@@ -588,20 +570,20 @@ int sqlite3AnalysisLoad(sqlite3 *db, int iDb){
           int iSample = sqlite3_column_int(pStmt, 1);
           if( iSample<SQLITE_INDEX_SAMPLES && iSample>=0 ){
             int eType = sqlite3_column_type(pStmt, 2);
+            IndexSample *aSample = pIdx->aSample;
 
-            if( pIdx->aSample==0 ){
+            if( aSample==0 ){
               static const int sz = sizeof(IndexSample)*SQLITE_INDEX_SAMPLES;
-              pIdx->aSample = (IndexSample *)sqlite3DbMallocRaw(0, sz);
-              if( pIdx->aSample==0 ){
+              pIdx->aSample = aSample = sqlite3DbMallocZeroChild(0, sz, pIdx);
+              if( aSample==0 ){
                 db->mallocFailed = 1;
                 break;
               }
-             memset(pIdx->aSample, 0, sz);
             }
-
-            assert( pIdx->aSample );
+  
+            assert( aSample );
             {
-              IndexSample *pSample = &pIdx->aSample[iSample];
+              IndexSample *pSample = &aSample[iSample];
               pSample->eType = (u8)eType;
               if( eType==SQLITE_INTEGER || eType==SQLITE_FLOAT ){
                 pSample->u.r = sqlite3_column_double(pStmt, 2);
@@ -619,9 +601,10 @@ int sqlite3AnalysisLoad(sqlite3 *db, int iDb){
                 if( n < 1){
                   pSample->u.z = 0;
                 }else{
-                  pSample->u.z = sqlite3Malloc(n);
-                  if( pSample->u.z ){
-                    memcpy(pSample->u.z, z, n);
+                  char *zSample;
+                  pSample->u.z = zSample = sqlite3DbMallocRawChild(0,n,aSample);
+                  if( zSample ){
+                    memcpy(zSample, z, n);
                   }else{
                     db->mallocFailed = 1;
                     break;

diff --git a/src/build.c b/src/build.c
index f9ce2d7b36c21dc1cb7738327eede210b084685d..49c8deea18d016cb73abcaac08eeb704dab344e3 100644 (file)
--- a/src/build.c
+++ b/src/build.c
@@ -346,9 +346,6 @@ Index *sqlite3FindIndex(sqlite3 *db, const char *zName, const char *zDb){
 ** Reclaim the memory used by an index
 */
 static void freeIndex(sqlite3 *db, Index *p){
-#ifndef SQLITE_OMIT_ANALYZE
-  sqlite3DeleteIndexSamples(p);
-#endif
   sqlite3DbFree(db, p);
 }
 
@@ -477,9 +474,6 @@ static void sqliteResetColumnNames(sqlite3 *db, Table *pTable){
     for(i=0; i<pTable->nCol; i++, pCol++){
       sqlite3DbFree(db, pCol->zName);
       sqlite3ExprDelete(db, pCol->pDflt);
-      sqlite3DbFree(db, pCol->zDflt);
-      sqlite3DbFree(db, pCol->zType);
-      sqlite3DbFree(db, pCol->zColl);
     }
     sqlite3DbFree(db, pTable->aCol);
   }
@@ -522,7 +516,6 @@ void sqlite3DeleteTable(sqlite3 *db, Table *pTable){
   /* Delete the Table structure itself.
   */
   sqliteResetColumnNames(db, pTable);
-  sqlite3DbFree(db, pTable->zName);
   sqlite3SelectDelete(db, pTable->pSelect);
 #ifndef SQLITE_OMIT_CHECK
   sqlite3ExprDelete(db, pTable->pCheck);
@@ -811,6 +804,7 @@ void sqlite3StartTable(
     goto begin_table_error;
   }
   pTable->zName = zName;
+  sqlite3MemLink(pTable, zName);
   pTable->iPKey = -1;
   pTable->pSchema = db->aDb[iDb].pSchema;
   pTable->nRef = 1;
@@ -943,7 +937,7 @@ void sqlite3AddColumn(Parse *pParse, Token *pName){
   }
   if( (p->nCol & 0x7)==0 ){
     Column *aNew;
-    aNew = sqlite3DbRealloc(db,p->aCol,(p->nCol+8)*sizeof(p->aCol[0]));
+    aNew = sqlite3DbRealloc(db, p->aCol, (p->nCol+8)*sizeof(p->aCol[0]));
     if( aNew==0 ){
       sqlite3DbFree(db, z);
       return;
@@ -1054,6 +1048,7 @@ void sqlite3AddColumnType(Parse *pParse, Token *pType){
   pCol = &p->aCol[p->nCol-1];
   assert( pCol->zType==0 );
   pCol->zType = sqlite3NameFromToken(pParse->db, pType);
+  sqlite3MemLink(p->aCol, pCol->zType);
   pCol->affinity = sqlite3AffinityType(pCol->zType);
 }
 
@@ -1084,9 +1079,9 @@ void sqlite3AddDefaultValue(Parse *pParse, ExprSpan *pSpan){
       */
       sqlite3ExprDelete(db, pCol->pDflt);
       pCol->pDflt = sqlite3ExprDup(db, pSpan->pExpr, EXPRDUP_REDUCE);
-      sqlite3DbFree(db, pCol->zDflt);
       pCol->zDflt = sqlite3DbStrNDup(db, (char*)pSpan->zStart,
                                      (int)(pSpan->zEnd - pSpan->zStart));
+      sqlite3MemLink(p->aCol, pCol->zDflt);
     }
   }
   sqlite3ExprDelete(db, pSpan->pExpr);
@@ -1209,6 +1204,7 @@ void sqlite3AddCollateType(Parse *pParse, Token *pToken){
   if( sqlite3LocateCollSeq(pParse, zColl) ){
     Index *pIdx;
     p->aCol[i].zColl = zColl;
+    sqlite3MemLink(p->aCol, zColl);
   
     /* If the column is declared as "<name> PRIMARY KEY COLLATE <type>",
     ** then an index may have been created on this column before the

diff --git a/src/insert.c b/src/insert.c
index 76631f80bcaaff25bcaf9bfc4fc760a7289dddbd..78f21196fbf68d1b28c3c8fb56789024df31b912 100644 (file)
--- a/src/insert.c
+++ b/src/insert.c
@@ -67,12 +67,11 @@ const char *sqlite3IndexAffinityStr(Vdbe *v, Index *pIdx){
     int n;
     Table *pTab = pIdx->pTable;
     sqlite3 *db = sqlite3VdbeDb(v);
-    pIdx->zColAff = (char *)sqlite3DbMallocRaw(0, pIdx->nColumn+2);
+    pIdx->zColAff = (char *)sqlite3DbMallocRawChild(0, pIdx->nColumn+2, pIdx);
     if( !pIdx->zColAff ){
       db->mallocFailed = 1;
       return 0;
     }
-    sqlite3MemLink(pIdx, pIdx->zColAff);
     for(n=0; n<pIdx->nColumn; n++){
       pIdx->zColAff[n] = pTab->aCol[pIdx->aiColumn[n]].affinity;
     }
@@ -110,12 +109,11 @@ void sqlite3TableAffinityStr(Vdbe *v, Table *pTab){
     int i;
     sqlite3 *db = sqlite3VdbeDb(v);
 
-    zColAff = (char *)sqlite3DbMallocRaw(0, pTab->nCol+1);
+    zColAff = (char *)sqlite3DbMallocRawChild(0, pTab->nCol+1, pTab);
     if( !zColAff ){
       db->mallocFailed = 1;
       return;
     }
-    sqlite3MemLink(pTab, zColAff);
     for(i=0; i<pTab->nCol; i++){
       zColAff[i] = pTab->aCol[i].affinity;
     }

diff --git a/src/malloc.c b/src/malloc.c
index e8b244b8aa64453a71430187e04a54d835dfef87..90124c6775241856d7bc3ff96eb1e17f1784f3b9 100644 (file)
--- a/src/malloc.c
+++ b/src/malloc.c
@@ -654,7 +654,7 @@ void *sqlite3MallocZero(int n){
 }
 
 /*
-** Allocate and zero memory.  If the allocation fails, make
+** Allocate and zero memory.  If the allocation fails, set
 ** the mallocFailed flag in the connection pointer.
 */
 void *sqlite3DbMallocZero(sqlite3 *db, int n){
@@ -665,6 +665,21 @@ void *sqlite3DbMallocZero(sqlite3 *db, int n){
   return p;
 }
 
+/*
+** Allocate and zero memory child memory.  If the allocation fails, set
+** the mallocFailed flag in the connection pointer.
+*/
+void *sqlite3DbMallocZeroChild(sqlite3 *db, int n, void *pParent){
+  void *p = sqlite3DbMallocRaw(db, n);
+  if( p ){
+    memset(p, 0, n);
+    sqlite3MemLink(pParent, p);
+  }
+  return p;
+}
+
+
+
 /*
 ** Allocate and zero memory.  If the allocation fails, make
 ** the mallocFailed flag in the connection pointer.
@@ -723,6 +738,15 @@ finish_emalloc_raw:
   return (void*)&p[1];
 }
 
+/*
+** A convenience wrapper around sqlite3DbMallocRaw() and sqlite3MemLink().
+*/
+void *sqlite3DbMallocRawChild(sqlite3 *db, int n, void *pParent){
+  void *p = sqlite3DbMallocRaw(db, n);
+  sqlite3MemLink(pParent, p);
+  return p;
+}
+
 /*
 ** Resize the block of memory pointed to by p to n bytes. If the
 ** resize fails, set the mallocFailed flag in the connection object.

diff --git a/src/select.c b/src/select.c
index b3aa3d7ca2bba57ba895d2a79023b7848a0a3485..e8effc9d8c15e449fd91808d3af5a3fc06b14def 100644 (file)
--- a/src/select.c
+++ b/src/select.c
@@ -1268,11 +1268,13 @@ static void selectAddColumnTypeAndCollation(
   for(i=0, pCol=aCol; i<nCol; i++, pCol++){
     p = a[i].pExpr;
     pCol->zType = sqlite3DbStrDup(db, columnType(&sNC, p, 0, 0, 0));
+    sqlite3MemLink(aCol, pCol->zType);
     pCol->affinity = sqlite3ExprAffinity(p);
     if( pCol->affinity==0 ) pCol->affinity = SQLITE_AFF_NONE;
     pColl = sqlite3ExprCollSeq(pParse, p);
     if( pColl ){
       pCol->zColl = sqlite3DbStrDup(db, pColl->zName);
+      sqlite3MemLink(aCol, pCol->zColl);
     }
   }
 }
@@ -3097,6 +3099,7 @@ static int selectExpander(Walker *pWalker, Select *p){
       if( pTab==0 ) return WRC_Abort;
       pTab->nRef = 1;
       pTab->zName = sqlite3MPrintf(db, "sqlite_subquery_%p_", (void*)pTab);
+      sqlite3MemLink(pTab, pTab->zName);
       while( pSel->pPrior ){ pSel = pSel->pPrior; }
       selectColumnsFromExprList(pParse, pSel->pEList, &pTab->nCol, &pTab->aCol);
       pTab->iPKey = -1;

diff --git a/src/sqliteInt.h b/src/sqliteInt.h
index 3a39a7904feac0225dd1a85a22f7a070e1920317..923d232b9ea61891b85417b963cfcf8d7f62f71e 100644 (file)
--- a/src/sqliteInt.h
+++ b/src/sqliteInt.h
@@ -2487,6 +2487,8 @@ void *sqlite3Malloc(int);
 void *sqlite3MallocZero(int);
 void *sqlite3DbMallocZero(sqlite3*, int);
 void *sqlite3DbMallocRaw(sqlite3*, int);
+void *sqlite3DbMallocZeroChild(sqlite3*, int, void *pParent);
+void *sqlite3DbMallocRawChild(sqlite3*, int, void *pParent);
 char *sqlite3DbStrDup(sqlite3*,const char*);
 char *sqlite3DbStrNDup(sqlite3*,const char*, int);
 void *sqlite3Realloc(void*, int);
@@ -2910,7 +2912,6 @@ int sqlite3InvokeBusyHandler(BusyHandler*);
 int sqlite3FindDb(sqlite3*, Token*);
 int sqlite3FindDbName(sqlite3 *, const char *);
 int sqlite3AnalysisLoad(sqlite3*,int iDB);
-void sqlite3DeleteIndexSamples(Index*);
 void sqlite3DefaultRowEst(Index*);
 void sqlite3RegisterLikeFunctions(sqlite3*, int);
 int sqlite3IsLikeFunction(sqlite3*,Expr*,int*,char*);