database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-11-14 00:22:38 +03:00
Code Activity

New assert() statements in the rowvalue IN expression processing.

Browse Source 
FossilOrigin-Name: 00c328317473cee8fd7bd92c58409a356337b727cfa562bd8de59350d978769c
This commit is contained in:
drh
2017-11-17 17:32:40 +00:00
parent 7fc0ba0f4c
commit 9b1ecb67c3
3 changed files with 36 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/wherecode.c
View File

@@ -377,6 +377,27 @@ static void updateRangeAffinityStr(
}
}
#ifdef SQLITE_DEBUG
/* Return true if the pSub ExprList is a subset of pMain. The terms
** of pSub can be in a different order from pMain. The only requirement
** is that every term in pSub must exist somewhere in pMain.
**
** Return false if pSub contains any term that is not found in pMain.
*/
static int exprListSubset(ExprList *pSub, ExprList *pMain){
int i, j;
for(i=0; i<pSub->nExpr; i++){
Expr *p = pSub->a[i].pExpr;
for(j=0; j<pMain->nExpr; j++){
if( sqlite3ExprCompare(0, p, pMain->a[j].pExpr, 0)==0 ) break;
}
if( j>=pMain->nExpr ) return 0;
}
return 1;
}
#endif /* SQLITE_DEBUG */
/*
** Generate code for a single equality term of the WHERE clause. An equality
** term can be either X=expr or X IN (...). pTerm is the term to be
@@ -463,6 +484,14 @@ static int codeEqualityTerm(
pLhs = sqlite3ExprListAppend(pParse, pLhs, pNewLhs);
}
}
/* pRhs should be a subset of pOrigRhs (though possibly in a different
** order). And pLhs should be a subset of pOrigLhs. To put it
** another way: Every term of pRhs should exist in pOrigRhs and
** every term of pLhs should exist in pOrigLhs. */
assert( db->mallocFailed || exprListSubset(pRhs, pOrigRhs) );
assert( db->mallocFailed || exprListSubset(pLhs, pOrigLhs) );
if( !db->mallocFailed ){
Expr *pLeft = pX->pLeft;