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

Enhance the IdList object to exist in a single memory allocation (rather than

Browse Source 
a separate allocate for the base object and the array of IDs).  Also permit
an IdList object to store an Expr pointer together with each name.

FossilOrigin-Name: 40f3c95871e6f40f287ef2756abafb8fc56dffdd0af69436e5c7d8e95022d94e
This commit is contained in:
drh
2022-04-15 15:47:14 +00:00
parent 358424aeff
commit a99e325468
7 changed files with 65 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/build.c
View File

@@ -4672,18 +4672,17 @@ IdList *sqlite3IdListAppend(Parse *pParse, IdList *pList, Token *pToken){
if( pList==0 ){
pList = sqlite3DbMallocZero(db, sizeof(IdList) );
if( pList==0 ) return 0;
}else{
IdList *pNew;
pNew = sqlite3DbRealloc(db, pList,
sizeof(IdList) + pList->nId*sizeof(pList->a));
if( pNew==0 ){
sqlite3IdListDelete(db, pList);
return 0;
}
pList = pNew;
}
pList->a = sqlite3ArrayAllocate(
db,
pList->a,
sizeof(pList->a[0]),
&pList->nId,
&i
);
if( i<0 ){
sqlite3IdListDelete(db, pList);
return 0;
}
i = pList->nId++;
pList->a[i].zName = sqlite3NameFromToken(db, pToken);
if( IN_RENAME_OBJECT && pList->a[i].zName ){
sqlite3RenameTokenMap(pParse, (void*)pList->a[i].zName, pToken);
@@ -4696,11 +4695,13 @@ IdList *sqlite3IdListAppend(Parse *pParse, IdList *pList, Token *pToken){
*/
void sqlite3IdListDelete(sqlite3 *db, IdList *pList){
int i;
int delExpr;
if( pList==0 ) return;
delExpr = pList->eU4==EU4_EXPR;
for(i=0; i<pList->nId; i++){
sqlite3DbFree(db, pList->a[i].zName);
if( delExpr ) sqlite3ExprDelete(db, pList->a[i].u4.pExpr);
}
sqlite3DbFree(db, pList->a);
sqlite3DbFreeNN(db, pList);
}