SQLite: Check-in [2eeb6ed8]

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview

Comment:	Remove additional obsolete code from the sqlite3_release_memory() logic.
Downloads:	Tarball \| ZIP archive \| SQL archive
Timelines:	family \| ancestors \| descendants \| both \| trunk
Files:	files \| file ages \| folders
SHA1:	2eeb6ed818dac240afe761b4e7c11e961255bf33
User & Date:	drh 2009-10-26 22:32:55

Context

2009-10-27
18:06		Minor updates and corrections to comments in btreeInt.h. No changes to code. (check-in: ad949fa1 user: drh tags: trunk)
2009-10-26
22:32		Remove additional obsolete code from the sqlite3_release_memory() logic. (check-in: 2eeb6ed8 user: drh tags: trunk)
22:08		Remove some obsolete code within #if 0 that was causing developer concern. (check-in: 1d64e945 user: drh tags: trunk)

Changes

Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Changes to src/vdbeInt.h.

   382    382   int sqlite3VdbeMemFinalize(Mem*, FuncDef*);
   383    383   const char *sqlite3OpcodeName(int);
   384    384   int sqlite3VdbeOpcodeHasProperty(int, int);
   385    385   int sqlite3VdbeMemGrow(Mem *pMem, int n, int preserve);
   386    386   int sqlite3VdbeCloseStatement(Vdbe *, int);
   387    387   void sqlite3VdbeFrameDelete(VdbeFrame*);
   388    388   int sqlite3VdbeFrameRestore(VdbeFrame *);
   389         -#ifdef SQLITE_ENABLE_MEMORY_MANAGEMENT
   390         -int sqlite3VdbeReleaseBuffers(Vdbe *p);
   391         -#endif
   392    389   void sqlite3VdbeMemStoreType(Mem *pMem);
   393    390   
   394    391   #ifndef SQLITE_OMIT_FOREIGN_KEY
   395    392   int sqlite3VdbeCheckFk(Vdbe *, int);
   396    393   #else
   397    394   # define sqlite3VdbeCheckFk(p,i) 0
   398    395   #endif

Changes to src/vdbeaux.c.

  1010   1010     for(i=0; i<p->nChildCsr; i++){
  1011   1011       sqlite3VdbeFreeCursor(p->v, apCsr[i]);
  1012   1012     }
  1013   1013     releaseMemArray(aMem, p->nChildMem);
  1014   1014     sqlite3DbFree(p->v->db, p);
  1015   1015   }
  1016   1016   
  1017         -
  1018         -#ifdef SQLITE_ENABLE_MEMORY_MANAGEMENT
  1019         -int sqlite3VdbeReleaseBuffers(Vdbe *p){
  1020         -  int ii;
  1021         -  int nFree = 0;
  1022         -  assert( sqlite3_mutex_held(p->db->mutex) );
  1023         -  for(ii=1; ii<=p->nMem; ii++){
  1024         -    Mem *pMem = &p->aMem[ii];
  1025         -    if( pMem->flags & MEM_RowSet ){
  1026         -      sqlite3RowSetClear(pMem->u.pRowSet);
  1027         -    }
  1028         -    if( pMem->z && pMem->flags&MEM_Dyn ){
  1029         -      assert( !pMem->xDel );
  1030         -      nFree += sqlite3DbMallocSize(pMem->db, pMem->z);
  1031         -      sqlite3VdbeMemRelease(pMem);
  1032         -    }
  1033         -  }
  1034         -  return nFree;
  1035         -}
  1036         -#endif
  1037         -
  1038   1017   #ifndef SQLITE_OMIT_EXPLAIN
  1039   1018   /*
  1040   1019   ** Give a listing of the program in the virtual machine.
  1041   1020   **
  1042   1021   ** The interface is the same as sqlite3VdbeExec().  But instead of
  1043   1022   ** running the code, it invokes the callback once for each instruction.
  1044   1023   ** This feature is used to implement "EXPLAIN".
................................................................................
  3058   3037     assert( iVar>0 );
  3059   3038     if( iVar>32 ){
  3060   3039       v->expmask = 0xffffffff;
  3061   3040     }else{
  3062   3041       v->expmask |= ((u32)1 << (iVar-1));
  3063   3042     }
  3064   3043   }
  3065         -