| Index: third_party/sqlite/src/src/expr.c
|
| diff --git a/third_party/sqlite/src/src/expr.c b/third_party/sqlite/src/src/expr.c
|
| index d8d36afa5489970c616c1003583b003b55caf203..ff4f1b5ade5f00851bd329a7ac7f38e0971ea2e8 100644
|
| --- a/third_party/sqlite/src/src/expr.c
|
| +++ b/third_party/sqlite/src/src/expr.c
|
| @@ -14,6 +14,18 @@
|
| */
|
| #include "sqliteInt.h"
|
|
|
| +/* Forward declarations */
|
| +static void exprCodeBetween(Parse*,Expr*,int,void(*)(Parse*,Expr*,int,int),int);
|
| +static int exprCodeVector(Parse *pParse, Expr *p, int *piToFree);
|
| +
|
| +/*
|
| +** Return the affinity character for a single column of a table.
|
| +*/
|
| +char sqlite3TableColumnAffinity(Table *pTab, int iCol){
|
| + assert( iCol<pTab->nCol );
|
| + return iCol>=0 ? pTab->aCol[iCol].affinity : SQLITE_AFF_INTEGER;
|
| +}
|
| +
|
| /*
|
| ** Return the 'affinity' of the expression pExpr if any.
|
| **
|
| @@ -39,21 +51,21 @@ char sqlite3ExprAffinity(Expr *pExpr){
|
| assert( pExpr->flags&EP_xIsSelect );
|
| return sqlite3ExprAffinity(pExpr->x.pSelect->pEList->a[0].pExpr);
|
| }
|
| + if( op==TK_REGISTER ) op = pExpr->op2;
|
| #ifndef SQLITE_OMIT_CAST
|
| if( op==TK_CAST ){
|
| assert( !ExprHasProperty(pExpr, EP_IntValue) );
|
| return sqlite3AffinityType(pExpr->u.zToken, 0);
|
| }
|
| #endif
|
| - if( (op==TK_AGG_COLUMN || op==TK_COLUMN || op==TK_REGISTER)
|
| - && pExpr->pTab!=0
|
| - ){
|
| - /* op==TK_REGISTER && pExpr->pTab!=0 happens when pExpr was originally
|
| - ** a TK_COLUMN but was previously evaluated and cached in a register */
|
| - int j = pExpr->iColumn;
|
| - if( j<0 ) return SQLITE_AFF_INTEGER;
|
| - assert( pExpr->pTab && j<pExpr->pTab->nCol );
|
| - return pExpr->pTab->aCol[j].affinity;
|
| + if( op==TK_AGG_COLUMN || op==TK_COLUMN ){
|
| + return sqlite3TableColumnAffinity(pExpr->pTab, pExpr->iColumn);
|
| + }
|
| + if( op==TK_SELECT_COLUMN ){
|
| + assert( pExpr->pLeft->flags&EP_xIsSelect );
|
| + return sqlite3ExprAffinity(
|
| + pExpr->pLeft->x.pSelect->pEList->a[pExpr->iColumn].pExpr
|
| + );
|
| }
|
| return pExpr->affinity;
|
| }
|
| @@ -85,8 +97,7 @@ Expr *sqlite3ExprAddCollateToken(
|
| Expr *sqlite3ExprAddCollateString(Parse *pParse, Expr *pExpr, const char *zC){
|
| Token s;
|
| assert( zC!=0 );
|
| - s.z = zC;
|
| - s.n = sqlite3Strlen30(s.z);
|
| + sqlite3TokenInit(&s, (char*)zC);
|
| return sqlite3ExprAddCollateToken(pParse, pExpr, &s, 0);
|
| }
|
|
|
| @@ -220,7 +231,7 @@ static char comparisonAffinity(Expr *pExpr){
|
| aff = sqlite3CompareAffinity(pExpr->pRight, aff);
|
| }else if( ExprHasProperty(pExpr, EP_xIsSelect) ){
|
| aff = sqlite3CompareAffinity(pExpr->x.pSelect->pEList->a[0].pExpr, aff);
|
| - }else if( !aff ){
|
| + }else if( aff==0 ){
|
| aff = SQLITE_AFF_BLOB;
|
| }
|
| return aff;
|
| @@ -310,6 +321,274 @@ static int codeCompare(
|
| return addr;
|
| }
|
|
|
| +/*
|
| +** Return true if expression pExpr is a vector, or false otherwise.
|
| +**
|
| +** A vector is defined as any expression that results in two or more
|
| +** columns of result. Every TK_VECTOR node is an vector because the
|
| +** parser will not generate a TK_VECTOR with fewer than two entries.
|
| +** But a TK_SELECT might be either a vector or a scalar. It is only
|
| +** considered a vector if it has two or more result columns.
|
| +*/
|
| +int sqlite3ExprIsVector(Expr *pExpr){
|
| + return sqlite3ExprVectorSize(pExpr)>1;
|
| +}
|
| +
|
| +/*
|
| +** If the expression passed as the only argument is of type TK_VECTOR
|
| +** return the number of expressions in the vector. Or, if the expression
|
| +** is a sub-select, return the number of columns in the sub-select. For
|
| +** any other type of expression, return 1.
|
| +*/
|
| +int sqlite3ExprVectorSize(Expr *pExpr){
|
| + u8 op = pExpr->op;
|
| + if( op==TK_REGISTER ) op = pExpr->op2;
|
| + if( op==TK_VECTOR ){
|
| + return pExpr->x.pList->nExpr;
|
| + }else if( op==TK_SELECT ){
|
| + return pExpr->x.pSelect->pEList->nExpr;
|
| + }else{
|
| + return 1;
|
| + }
|
| +}
|
| +
|
| +#ifndef SQLITE_OMIT_SUBQUERY
|
| +/*
|
| +** Return a pointer to a subexpression of pVector that is the i-th
|
| +** column of the vector (numbered starting with 0). The caller must
|
| +** ensure that i is within range.
|
| +**
|
| +** If pVector is really a scalar (and "scalar" here includes subqueries
|
| +** that return a single column!) then return pVector unmodified.
|
| +**
|
| +** pVector retains ownership of the returned subexpression.
|
| +**
|
| +** If the vector is a (SELECT ...) then the expression returned is
|
| +** just the expression for the i-th term of the result set, and may
|
| +** not be ready for evaluation because the table cursor has not yet
|
| +** been positioned.
|
| +*/
|
| +Expr *sqlite3VectorFieldSubexpr(Expr *pVector, int i){
|
| + assert( i<sqlite3ExprVectorSize(pVector) );
|
| + if( sqlite3ExprIsVector(pVector) ){
|
| + assert( pVector->op2==0 || pVector->op==TK_REGISTER );
|
| + if( pVector->op==TK_SELECT || pVector->op2==TK_SELECT ){
|
| + return pVector->x.pSelect->pEList->a[i].pExpr;
|
| + }else{
|
| + return pVector->x.pList->a[i].pExpr;
|
| + }
|
| + }
|
| + return pVector;
|
| +}
|
| +#endif /* !defined(SQLITE_OMIT_SUBQUERY) */
|
| +
|
| +#ifndef SQLITE_OMIT_SUBQUERY
|
| +/*
|
| +** Compute and return a new Expr object which when passed to
|
| +** sqlite3ExprCode() will generate all necessary code to compute
|
| +** the iField-th column of the vector expression pVector.
|
| +**
|
| +** It is ok for pVector to be a scalar (as long as iField==0).
|
| +** In that case, this routine works like sqlite3ExprDup().
|
| +**
|
| +** The caller owns the returned Expr object and is responsible for
|
| +** ensuring that the returned value eventually gets freed.
|
| +**
|
| +** The caller retains ownership of pVector. If pVector is a TK_SELECT,
|
| +** then the returned object will reference pVector and so pVector must remain
|
| +** valid for the life of the returned object. If pVector is a TK_VECTOR
|
| +** or a scalar expression, then it can be deleted as soon as this routine
|
| +** returns.
|
| +**
|
| +** A trick to cause a TK_SELECT pVector to be deleted together with
|
| +** the returned Expr object is to attach the pVector to the pRight field
|
| +** of the returned TK_SELECT_COLUMN Expr object.
|
| +*/
|
| +Expr *sqlite3ExprForVectorField(
|
| + Parse *pParse, /* Parsing context */
|
| + Expr *pVector, /* The vector. List of expressions or a sub-SELECT */
|
| + int iField /* Which column of the vector to return */
|
| +){
|
| + Expr *pRet;
|
| + if( pVector->op==TK_SELECT ){
|
| + assert( pVector->flags & EP_xIsSelect );
|
| + /* The TK_SELECT_COLUMN Expr node:
|
| + **
|
| + ** pLeft: pVector containing TK_SELECT. Not deleted.
|
| + ** pRight: not used. But recursively deleted.
|
| + ** iColumn: Index of a column in pVector
|
| + ** iTable: 0 or the number of columns on the LHS of an assignment
|
| + ** pLeft->iTable: First in an array of register holding result, or 0
|
| + ** if the result is not yet computed.
|
| + **
|
| + ** sqlite3ExprDelete() specifically skips the recursive delete of
|
| + ** pLeft on TK_SELECT_COLUMN nodes. But pRight is followed, so pVector
|
| + ** can be attached to pRight to cause this node to take ownership of
|
| + ** pVector. Typically there will be multiple TK_SELECT_COLUMN nodes
|
| + ** with the same pLeft pointer to the pVector, but only one of them
|
| + ** will own the pVector.
|
| + */
|
| + pRet = sqlite3PExpr(pParse, TK_SELECT_COLUMN, 0, 0);
|
| + if( pRet ){
|
| + pRet->iColumn = iField;
|
| + pRet->pLeft = pVector;
|
| + }
|
| + assert( pRet==0 || pRet->iTable==0 );
|
| + }else{
|
| + if( pVector->op==TK_VECTOR ) pVector = pVector->x.pList->a[iField].pExpr;
|
| + pRet = sqlite3ExprDup(pParse->db, pVector, 0);
|
| + }
|
| + return pRet;
|
| +}
|
| +#endif /* !define(SQLITE_OMIT_SUBQUERY) */
|
| +
|
| +/*
|
| +** If expression pExpr is of type TK_SELECT, generate code to evaluate
|
| +** it. Return the register in which the result is stored (or, if the
|
| +** sub-select returns more than one column, the first in an array
|
| +** of registers in which the result is stored).
|
| +**
|
| +** If pExpr is not a TK_SELECT expression, return 0.
|
| +*/
|
| +static int exprCodeSubselect(Parse *pParse, Expr *pExpr){
|
| + int reg = 0;
|
| +#ifndef SQLITE_OMIT_SUBQUERY
|
| + if( pExpr->op==TK_SELECT ){
|
| + reg = sqlite3CodeSubselect(pParse, pExpr, 0, 0);
|
| + }
|
| +#endif
|
| + return reg;
|
| +}
|
| +
|
| +/*
|
| +** Argument pVector points to a vector expression - either a TK_VECTOR
|
| +** or TK_SELECT that returns more than one column. This function returns
|
| +** the register number of a register that contains the value of
|
| +** element iField of the vector.
|
| +**
|
| +** If pVector is a TK_SELECT expression, then code for it must have
|
| +** already been generated using the exprCodeSubselect() routine. In this
|
| +** case parameter regSelect should be the first in an array of registers
|
| +** containing the results of the sub-select.
|
| +**
|
| +** If pVector is of type TK_VECTOR, then code for the requested field
|
| +** is generated. In this case (*pRegFree) may be set to the number of
|
| +** a temporary register to be freed by the caller before returning.
|
| +**
|
| +** Before returning, output parameter (*ppExpr) is set to point to the
|
| +** Expr object corresponding to element iElem of the vector.
|
| +*/
|
| +static int exprVectorRegister(
|
| + Parse *pParse, /* Parse context */
|
| + Expr *pVector, /* Vector to extract element from */
|
| + int iField, /* Field to extract from pVector */
|
| + int regSelect, /* First in array of registers */
|
| + Expr **ppExpr, /* OUT: Expression element */
|
| + int *pRegFree /* OUT: Temp register to free */
|
| +){
|
| + u8 op = pVector->op;
|
| + assert( op==TK_VECTOR || op==TK_REGISTER || op==TK_SELECT );
|
| + if( op==TK_REGISTER ){
|
| + *ppExpr = sqlite3VectorFieldSubexpr(pVector, iField);
|
| + return pVector->iTable+iField;
|
| + }
|
| + if( op==TK_SELECT ){
|
| + *ppExpr = pVector->x.pSelect->pEList->a[iField].pExpr;
|
| + return regSelect+iField;
|
| + }
|
| + *ppExpr = pVector->x.pList->a[iField].pExpr;
|
| + return sqlite3ExprCodeTemp(pParse, *ppExpr, pRegFree);
|
| +}
|
| +
|
| +/*
|
| +** Expression pExpr is a comparison between two vector values. Compute
|
| +** the result of the comparison (1, 0, or NULL) and write that
|
| +** result into register dest.
|
| +**
|
| +** The caller must satisfy the following preconditions:
|
| +**
|
| +** if pExpr->op==TK_IS: op==TK_EQ and p5==SQLITE_NULLEQ
|
| +** if pExpr->op==TK_ISNOT: op==TK_NE and p5==SQLITE_NULLEQ
|
| +** otherwise: op==pExpr->op and p5==0
|
| +*/
|
| +static void codeVectorCompare(
|
| + Parse *pParse, /* Code generator context */
|
| + Expr *pExpr, /* The comparison operation */
|
| + int dest, /* Write results into this register */
|
| + u8 op, /* Comparison operator */
|
| + u8 p5 /* SQLITE_NULLEQ or zero */
|
| +){
|
| + Vdbe *v = pParse->pVdbe;
|
| + Expr *pLeft = pExpr->pLeft;
|
| + Expr *pRight = pExpr->pRight;
|
| + int nLeft = sqlite3ExprVectorSize(pLeft);
|
| + int i;
|
| + int regLeft = 0;
|
| + int regRight = 0;
|
| + u8 opx = op;
|
| + int addrDone = sqlite3VdbeMakeLabel(v);
|
| +
|
| + if( nLeft!=sqlite3ExprVectorSize(pRight) ){
|
| + sqlite3ErrorMsg(pParse, "row value misused");
|
| + return;
|
| + }
|
| + assert( pExpr->op==TK_EQ || pExpr->op==TK_NE
|
| + || pExpr->op==TK_IS || pExpr->op==TK_ISNOT
|
| + || pExpr->op==TK_LT || pExpr->op==TK_GT
|
| + || pExpr->op==TK_LE || pExpr->op==TK_GE
|
| + );
|
| + assert( pExpr->op==op || (pExpr->op==TK_IS && op==TK_EQ)
|
| + || (pExpr->op==TK_ISNOT && op==TK_NE) );
|
| + assert( p5==0 || pExpr->op!=op );
|
| + assert( p5==SQLITE_NULLEQ || pExpr->op==op );
|
| +
|
| + p5 |= SQLITE_STOREP2;
|
| + if( opx==TK_LE ) opx = TK_LT;
|
| + if( opx==TK_GE ) opx = TK_GT;
|
| +
|
| + regLeft = exprCodeSubselect(pParse, pLeft);
|
| + regRight = exprCodeSubselect(pParse, pRight);
|
| +
|
| + for(i=0; 1 /*Loop exits by "break"*/; i++){
|
| + int regFree1 = 0, regFree2 = 0;
|
| + Expr *pL, *pR;
|
| + int r1, r2;
|
| + assert( i>=0 && i<nLeft );
|
| + if( i>0 ) sqlite3ExprCachePush(pParse);
|
| + r1 = exprVectorRegister(pParse, pLeft, i, regLeft, &pL, ®Free1);
|
| + r2 = exprVectorRegister(pParse, pRight, i, regRight, &pR, ®Free2);
|
| + codeCompare(pParse, pL, pR, opx, r1, r2, dest, p5);
|
| + testcase(op==OP_Lt); VdbeCoverageIf(v,op==OP_Lt);
|
| + testcase(op==OP_Le); VdbeCoverageIf(v,op==OP_Le);
|
| + testcase(op==OP_Gt); VdbeCoverageIf(v,op==OP_Gt);
|
| + testcase(op==OP_Ge); VdbeCoverageIf(v,op==OP_Ge);
|
| + testcase(op==OP_Eq); VdbeCoverageIf(v,op==OP_Eq);
|
| + testcase(op==OP_Ne); VdbeCoverageIf(v,op==OP_Ne);
|
| + sqlite3ReleaseTempReg(pParse, regFree1);
|
| + sqlite3ReleaseTempReg(pParse, regFree2);
|
| + if( i>0 ) sqlite3ExprCachePop(pParse);
|
| + if( i==nLeft-1 ){
|
| + break;
|
| + }
|
| + if( opx==TK_EQ ){
|
| + sqlite3VdbeAddOp2(v, OP_IfNot, dest, addrDone); VdbeCoverage(v);
|
| + p5 |= SQLITE_KEEPNULL;
|
| + }else if( opx==TK_NE ){
|
| + sqlite3VdbeAddOp2(v, OP_If, dest, addrDone); VdbeCoverage(v);
|
| + p5 |= SQLITE_KEEPNULL;
|
| + }else{
|
| + assert( op==TK_LT || op==TK_GT || op==TK_LE || op==TK_GE );
|
| + sqlite3VdbeAddOp2(v, OP_ElseNotEq, 0, addrDone);
|
| + VdbeCoverageIf(v, op==TK_LT);
|
| + VdbeCoverageIf(v, op==TK_GT);
|
| + VdbeCoverageIf(v, op==TK_LE);
|
| + VdbeCoverageIf(v, op==TK_GE);
|
| + if( i==nLeft-2 ) opx = op;
|
| + }
|
| + }
|
| + sqlite3VdbeResolveLabel(v, addrDone);
|
| +}
|
| +
|
| #if SQLITE_MAX_EXPR_DEPTH>0
|
| /*
|
| ** Check that argument nHeight is less than or equal to the maximum
|
| @@ -445,7 +724,7 @@ void sqlite3ExprSetHeightAndFlags(Parse *pParse, Expr *p){
|
| ** is allocated to hold the integer text and the dequote flag is ignored.
|
| */
|
| Expr *sqlite3ExprAlloc(
|
| - sqlite3 *db, /* Handle for sqlite3DbMallocZero() (may be null) */
|
| + sqlite3 *db, /* Handle for sqlite3DbMallocRawNN() */
|
| int op, /* Expression opcode */
|
| const Token *pToken, /* Token argument. Might be NULL */
|
| int dequote /* True to dequote */
|
| @@ -454,6 +733,7 @@ Expr *sqlite3ExprAlloc(
|
| int nExtra = 0;
|
| int iValue = 0;
|
|
|
| + assert( db!=0 );
|
| if( pToken ){
|
| if( op!=TK_INTEGER || pToken->z==0
|
| || sqlite3GetInt32(pToken->z, &iValue)==0 ){
|
| @@ -461,8 +741,9 @@ Expr *sqlite3ExprAlloc(
|
| assert( iValue>=0 );
|
| }
|
| }
|
| - pNew = sqlite3DbMallocZero(db, sizeof(Expr)+nExtra);
|
| + pNew = sqlite3DbMallocRawNN(db, sizeof(Expr)+nExtra);
|
| if( pNew ){
|
| + memset(pNew, 0, sizeof(Expr));
|
| pNew->op = (u8)op;
|
| pNew->iAgg = -1;
|
| if( pToken ){
|
| @@ -470,15 +751,13 @@ Expr *sqlite3ExprAlloc(
|
| pNew->flags |= EP_IntValue;
|
| pNew->u.iValue = iValue;
|
| }else{
|
| - int c;
|
| pNew->u.zToken = (char*)&pNew[1];
|
| assert( pToken->z!=0 || pToken->n==0 );
|
| if( pToken->n ) memcpy(pNew->u.zToken, pToken->z, pToken->n);
|
| pNew->u.zToken[pToken->n] = 0;
|
| - if( dequote && nExtra>=3
|
| - && ((c = pToken->z[0])=='\'' || c=='"' || c=='[' || c=='`') ){
|
| + if( dequote && sqlite3Isquote(pNew->u.zToken[0]) ){
|
| + if( pNew->u.zToken[0]=='"' ) pNew->flags |= EP_DblQuoted;
|
| sqlite3Dequote(pNew->u.zToken);
|
| - if( c=='"' ) pNew->flags |= EP_DblQuoted;
|
| }
|
| }
|
| }
|
| @@ -544,15 +823,19 @@ Expr *sqlite3PExpr(
|
| Parse *pParse, /* Parsing context */
|
| int op, /* Expression opcode */
|
| Expr *pLeft, /* Left operand */
|
| - Expr *pRight, /* Right operand */
|
| - const Token *pToken /* Argument token */
|
| + Expr *pRight /* Right operand */
|
| ){
|
| Expr *p;
|
| if( op==TK_AND && pParse->nErr==0 ){
|
| /* Take advantage of short-circuit false optimization for AND */
|
| p = sqlite3ExprAnd(pParse->db, pLeft, pRight);
|
| }else{
|
| - p = sqlite3ExprAlloc(pParse->db, op & TKFLG_MASK, pToken, 1);
|
| + p = sqlite3DbMallocRawNN(pParse->db, sizeof(Expr));
|
| + if( p ){
|
| + memset(p, 0, sizeof(Expr));
|
| + p->op = op & TKFLG_MASK;
|
| + p->iAgg = -1;
|
| + }
|
| sqlite3ExprAttachSubtrees(pParse->db, p, pLeft, pRight);
|
| }
|
| if( p ) {
|
| @@ -562,6 +845,22 @@ Expr *sqlite3PExpr(
|
| }
|
|
|
| /*
|
| +** Add pSelect to the Expr.x.pSelect field. Or, if pExpr is NULL (due
|
| +** do a memory allocation failure) then delete the pSelect object.
|
| +*/
|
| +void sqlite3PExprAddSelect(Parse *pParse, Expr *pExpr, Select *pSelect){
|
| + if( pExpr ){
|
| + pExpr->x.pSelect = pSelect;
|
| + ExprSetProperty(pExpr, EP_xIsSelect|EP_Subquery);
|
| + sqlite3ExprSetHeightAndFlags(pParse, pExpr);
|
| + }else{
|
| + assert( pParse->db->mallocFailed );
|
| + sqlite3SelectDelete(pParse->db, pSelect);
|
| + }
|
| +}
|
| +
|
| +
|
| +/*
|
| ** If the expression is always either TRUE or FALSE (respectively),
|
| ** then return 1. If one cannot determine the truth value of the
|
| ** expression at compile-time return 0.
|
| @@ -639,7 +938,7 @@ Expr *sqlite3ExprFunction(Parse *pParse, ExprList *pList, Token *pToken){
|
| ** variable number.
|
| **
|
| ** Wildcards of the form "?nnn" are assigned the number "nnn". We make
|
| -** sure "nnn" is not too be to avoid a denial of service attack when
|
| +** sure "nnn" is not too big to avoid a denial of service attack when
|
| ** the SQL statement comes from an external source.
|
| **
|
| ** Wildcards of the form ":aaa", "@aaa", or "$aaa" are assigned the same number
|
| @@ -647,28 +946,34 @@ Expr *sqlite3ExprFunction(Parse *pParse, ExprList *pList, Token *pToken){
|
| ** instance of the wildcard, the next sequential variable number is
|
| ** assigned.
|
| */
|
| -void sqlite3ExprAssignVarNumber(Parse *pParse, Expr *pExpr){
|
| +void sqlite3ExprAssignVarNumber(Parse *pParse, Expr *pExpr, u32 n){
|
| sqlite3 *db = pParse->db;
|
| const char *z;
|
| + ynVar x;
|
|
|
| if( pExpr==0 ) return;
|
| assert( !ExprHasProperty(pExpr, EP_IntValue|EP_Reduced|EP_TokenOnly) );
|
| z = pExpr->u.zToken;
|
| assert( z!=0 );
|
| assert( z[0]!=0 );
|
| + assert( n==sqlite3Strlen30(z) );
|
| if( z[1]==0 ){
|
| /* Wildcard of the form "?". Assign the next variable number */
|
| assert( z[0]=='?' );
|
| - pExpr->iColumn = (ynVar)(++pParse->nVar);
|
| + x = (ynVar)(++pParse->nVar);
|
| }else{
|
| - ynVar x = 0;
|
| - u32 n = sqlite3Strlen30(z);
|
| + int doAdd = 0;
|
| if( z[0]=='?' ){
|
| /* Wildcard of the form "?nnn". Convert "nnn" to an integer and
|
| ** use it as the variable number */
|
| i64 i;
|
| - int bOk = 0==sqlite3Atoi64(&z[1], &i, n-1, SQLITE_UTF8);
|
| - pExpr->iColumn = x = (ynVar)i;
|
| + int bOk;
|
| + if( n==2 ){ /*OPTIMIZATION-IF-TRUE*/
|
| + i = z[1]-'0'; /* The common case of ?N for a single digit N */
|
| + bOk = 1;
|
| + }else{
|
| + bOk = 0==sqlite3Atoi64(&z[1], &i, n-1, SQLITE_UTF8);
|
| + }
|
| testcase( i==0 );
|
| testcase( i==1 );
|
| testcase( i==db->aLimit[SQLITE_LIMIT_VARIABLE_NUMBER]-1 );
|
| @@ -676,41 +981,32 @@ void sqlite3ExprAssignVarNumber(Parse *pParse, Expr *pExpr){
|
| if( bOk==0 || i<1 || i>db->aLimit[SQLITE_LIMIT_VARIABLE_NUMBER] ){
|
| sqlite3ErrorMsg(pParse, "variable number must be between ?1 and ?%d",
|
| db->aLimit[SQLITE_LIMIT_VARIABLE_NUMBER]);
|
| - x = 0;
|
| + return;
|
| }
|
| - if( i>pParse->nVar ){
|
| - pParse->nVar = (int)i;
|
| + x = (ynVar)i;
|
| + if( x>pParse->nVar ){
|
| + pParse->nVar = (int)x;
|
| + doAdd = 1;
|
| + }else if( sqlite3VListNumToName(pParse->pVList, x)==0 ){
|
| + doAdd = 1;
|
| }
|
| }else{
|
| /* Wildcards like ":aaa", "$aaa" or "@aaa". Reuse the same variable
|
| ** number as the prior appearance of the same name, or if the name
|
| ** has never appeared before, reuse the same variable number
|
| */
|
| - ynVar i;
|
| - for(i=0; i<pParse->nzVar; i++){
|
| - if( pParse->azVar[i] && strcmp(pParse->azVar[i],z)==0 ){
|
| - pExpr->iColumn = x = (ynVar)i+1;
|
| - break;
|
| - }
|
| - }
|
| - if( x==0 ) x = pExpr->iColumn = (ynVar)(++pParse->nVar);
|
| - }
|
| - if( x>0 ){
|
| - if( x>pParse->nzVar ){
|
| - char **a;
|
| - a = sqlite3DbRealloc(db, pParse->azVar, x*sizeof(a[0]));
|
| - if( a==0 ) return; /* Error reported through db->mallocFailed */
|
| - pParse->azVar = a;
|
| - memset(&a[pParse->nzVar], 0, (x-pParse->nzVar)*sizeof(a[0]));
|
| - pParse->nzVar = x;
|
| - }
|
| - if( z[0]!='?' || pParse->azVar[x-1]==0 ){
|
| - sqlite3DbFree(db, pParse->azVar[x-1]);
|
| - pParse->azVar[x-1] = sqlite3DbStrNDup(db, z, n);
|
| + x = (ynVar)sqlite3VListNameToNum(pParse->pVList, z, n);
|
| + if( x==0 ){
|
| + x = (ynVar)(++pParse->nVar);
|
| + doAdd = 1;
|
| }
|
| }
|
| - }
|
| - if( !pParse->nErr && pParse->nVar>db->aLimit[SQLITE_LIMIT_VARIABLE_NUMBER] ){
|
| + if( doAdd ){
|
| + pParse->pVList = sqlite3VListAdd(db, pParse->pVList, z, n, x);
|
| + }
|
| + }
|
| + pExpr->iColumn = x;
|
| + if( x>db->aLimit[SQLITE_LIMIT_VARIABLE_NUMBER] ){
|
| sqlite3ErrorMsg(pParse, "too many SQL variables");
|
| }
|
| }
|
| @@ -718,26 +1014,36 @@ void sqlite3ExprAssignVarNumber(Parse *pParse, Expr *pExpr){
|
| /*
|
| ** Recursively delete an expression tree.
|
| */
|
| -void sqlite3ExprDelete(sqlite3 *db, Expr *p){
|
| - if( p==0 ) return;
|
| +static SQLITE_NOINLINE void sqlite3ExprDeleteNN(sqlite3 *db, Expr *p){
|
| + assert( p!=0 );
|
| /* Sanity check: Assert that the IntValue is non-negative if it exists */
|
| assert( !ExprHasProperty(p, EP_IntValue) || p->u.iValue>=0 );
|
| - if( !ExprHasProperty(p, EP_TokenOnly) ){
|
| +#ifdef SQLITE_DEBUG
|
| + if( ExprHasProperty(p, EP_Leaf) && !ExprHasProperty(p, EP_TokenOnly) ){
|
| + assert( p->pLeft==0 );
|
| + assert( p->pRight==0 );
|
| + assert( p->x.pSelect==0 );
|
| + }
|
| +#endif
|
| + if( !ExprHasProperty(p, (EP_TokenOnly|EP_Leaf)) ){
|
| /* The Expr.x union is never used at the same time as Expr.pRight */
|
| assert( p->x.pList==0 || p->pRight==0 );
|
| - sqlite3ExprDelete(db, p->pLeft);
|
| + if( p->pLeft && p->op!=TK_SELECT_COLUMN ) sqlite3ExprDeleteNN(db, p->pLeft);
|
| sqlite3ExprDelete(db, p->pRight);
|
| - if( ExprHasProperty(p, EP_MemToken) ) sqlite3DbFree(db, p->u.zToken);
|
| if( ExprHasProperty(p, EP_xIsSelect) ){
|
| sqlite3SelectDelete(db, p->x.pSelect);
|
| }else{
|
| sqlite3ExprListDelete(db, p->x.pList);
|
| }
|
| }
|
| + if( ExprHasProperty(p, EP_MemToken) ) sqlite3DbFree(db, p->u.zToken);
|
| if( !ExprHasProperty(p, EP_Static) ){
|
| sqlite3DbFree(db, p);
|
| }
|
| }
|
| +void sqlite3ExprDelete(sqlite3 *db, Expr *p){
|
| + if( p ) sqlite3ExprDeleteNN(db, p);
|
| +}
|
|
|
| /*
|
| ** Return the number of bytes allocated for the expression structure
|
| @@ -789,7 +1095,7 @@ static int dupedExprStructSize(Expr *p, int flags){
|
| assert( flags==EXPRDUP_REDUCE || flags==0 ); /* Only one flag value allowed */
|
| assert( EXPR_FULLSIZE<=0xfff );
|
| assert( (0xfff & (EP_Reduced|EP_TokenOnly))==0 );
|
| - if( 0==(flags&EXPRDUP_REDUCE) ){
|
| + if( 0==flags || p->op==TK_SELECT_COLUMN ){
|
| nSize = EXPR_FULLSIZE;
|
| }else{
|
| assert( !ExprHasProperty(p, EP_TokenOnly|EP_Reduced) );
|
| @@ -851,87 +1157,94 @@ static int dupedExprSize(Expr *p, int flags){
|
| ** if any. Before returning, *pzBuffer is set to the first byte past the
|
| ** portion of the buffer copied into by this function.
|
| */
|
| -static Expr *exprDup(sqlite3 *db, Expr *p, int flags, u8 **pzBuffer){
|
| - Expr *pNew = 0; /* Value to return */
|
| - assert( flags==0 || flags==EXPRDUP_REDUCE );
|
| - if( p ){
|
| - const int isReduced = (flags&EXPRDUP_REDUCE);
|
| - u8 *zAlloc;
|
| - u32 staticFlag = 0;
|
| -
|
| - assert( pzBuffer==0 || isReduced );
|
| +static Expr *exprDup(sqlite3 *db, Expr *p, int dupFlags, u8 **pzBuffer){
|
| + Expr *pNew; /* Value to return */
|
| + u8 *zAlloc; /* Memory space from which to build Expr object */
|
| + u32 staticFlag; /* EP_Static if space not obtained from malloc */
|
| +
|
| + assert( db!=0 );
|
| + assert( p );
|
| + assert( dupFlags==0 || dupFlags==EXPRDUP_REDUCE );
|
| + assert( pzBuffer==0 || dupFlags==EXPRDUP_REDUCE );
|
| +
|
| + /* Figure out where to write the new Expr structure. */
|
| + if( pzBuffer ){
|
| + zAlloc = *pzBuffer;
|
| + staticFlag = EP_Static;
|
| + }else{
|
| + zAlloc = sqlite3DbMallocRawNN(db, dupedExprSize(p, dupFlags));
|
| + staticFlag = 0;
|
| + }
|
| + pNew = (Expr *)zAlloc;
|
|
|
| - /* Figure out where to write the new Expr structure. */
|
| - if( pzBuffer ){
|
| - zAlloc = *pzBuffer;
|
| - staticFlag = EP_Static;
|
| + if( pNew ){
|
| + /* Set nNewSize to the size allocated for the structure pointed to
|
| + ** by pNew. This is either EXPR_FULLSIZE, EXPR_REDUCEDSIZE or
|
| + ** EXPR_TOKENONLYSIZE. nToken is set to the number of bytes consumed
|
| + ** by the copy of the p->u.zToken string (if any).
|
| + */
|
| + const unsigned nStructSize = dupedExprStructSize(p, dupFlags);
|
| + const int nNewSize = nStructSize & 0xfff;
|
| + int nToken;
|
| + if( !ExprHasProperty(p, EP_IntValue) && p->u.zToken ){
|
| + nToken = sqlite3Strlen30(p->u.zToken) + 1;
|
| }else{
|
| - zAlloc = sqlite3DbMallocRaw(db, dupedExprSize(p, flags));
|
| + nToken = 0;
|
| }
|
| - pNew = (Expr *)zAlloc;
|
| -
|
| - if( pNew ){
|
| - /* Set nNewSize to the size allocated for the structure pointed to
|
| - ** by pNew. This is either EXPR_FULLSIZE, EXPR_REDUCEDSIZE or
|
| - ** EXPR_TOKENONLYSIZE. nToken is set to the number of bytes consumed
|
| - ** by the copy of the p->u.zToken string (if any).
|
| - */
|
| - const unsigned nStructSize = dupedExprStructSize(p, flags);
|
| - const int nNewSize = nStructSize & 0xfff;
|
| - int nToken;
|
| - if( !ExprHasProperty(p, EP_IntValue) && p->u.zToken ){
|
| - nToken = sqlite3Strlen30(p->u.zToken) + 1;
|
| - }else{
|
| - nToken = 0;
|
| - }
|
| - if( isReduced ){
|
| - assert( ExprHasProperty(p, EP_Reduced)==0 );
|
| - memcpy(zAlloc, p, nNewSize);
|
| - }else{
|
| - u32 nSize = (u32)exprStructSize(p);
|
| - memcpy(zAlloc, p, nSize);
|
| - if( nSize<EXPR_FULLSIZE ){
|
| - memset(&zAlloc[nSize], 0, EXPR_FULLSIZE-nSize);
|
| - }
|
| + if( dupFlags ){
|
| + assert( ExprHasProperty(p, EP_Reduced)==0 );
|
| + memcpy(zAlloc, p, nNewSize);
|
| + }else{
|
| + u32 nSize = (u32)exprStructSize(p);
|
| + memcpy(zAlloc, p, nSize);
|
| + if( nSize<EXPR_FULLSIZE ){
|
| + memset(&zAlloc[nSize], 0, EXPR_FULLSIZE-nSize);
|
| }
|
| + }
|
|
|
| - /* Set the EP_Reduced, EP_TokenOnly, and EP_Static flags appropriately. */
|
| - pNew->flags &= ~(EP_Reduced|EP_TokenOnly|EP_Static|EP_MemToken);
|
| - pNew->flags |= nStructSize & (EP_Reduced|EP_TokenOnly);
|
| - pNew->flags |= staticFlag;
|
| + /* Set the EP_Reduced, EP_TokenOnly, and EP_Static flags appropriately. */
|
| + pNew->flags &= ~(EP_Reduced|EP_TokenOnly|EP_Static|EP_MemToken);
|
| + pNew->flags |= nStructSize & (EP_Reduced|EP_TokenOnly);
|
| + pNew->flags |= staticFlag;
|
|
|
| - /* Copy the p->u.zToken string, if any. */
|
| - if( nToken ){
|
| - char *zToken = pNew->u.zToken = (char*)&zAlloc[nNewSize];
|
| - memcpy(zToken, p->u.zToken, nToken);
|
| - }
|
| + /* Copy the p->u.zToken string, if any. */
|
| + if( nToken ){
|
| + char *zToken = pNew->u.zToken = (char*)&zAlloc[nNewSize];
|
| + memcpy(zToken, p->u.zToken, nToken);
|
| + }
|
|
|
| - if( 0==((p->flags|pNew->flags) & EP_TokenOnly) ){
|
| - /* Fill in the pNew->x.pSelect or pNew->x.pList member. */
|
| - if( ExprHasProperty(p, EP_xIsSelect) ){
|
| - pNew->x.pSelect = sqlite3SelectDup(db, p->x.pSelect, isReduced);
|
| - }else{
|
| - pNew->x.pList = sqlite3ExprListDup(db, p->x.pList, isReduced);
|
| - }
|
| + if( 0==((p->flags|pNew->flags) & (EP_TokenOnly|EP_Leaf)) ){
|
| + /* Fill in the pNew->x.pSelect or pNew->x.pList member. */
|
| + if( ExprHasProperty(p, EP_xIsSelect) ){
|
| + pNew->x.pSelect = sqlite3SelectDup(db, p->x.pSelect, dupFlags);
|
| + }else{
|
| + pNew->x.pList = sqlite3ExprListDup(db, p->x.pList, dupFlags);
|
| }
|
| + }
|
|
|
| - /* Fill in pNew->pLeft and pNew->pRight. */
|
| - if( ExprHasProperty(pNew, EP_Reduced|EP_TokenOnly) ){
|
| - zAlloc += dupedExprNodeSize(p, flags);
|
| - if( ExprHasProperty(pNew, EP_Reduced) ){
|
| - pNew->pLeft = exprDup(db, p->pLeft, EXPRDUP_REDUCE, &zAlloc);
|
| - pNew->pRight = exprDup(db, p->pRight, EXPRDUP_REDUCE, &zAlloc);
|
| - }
|
| - if( pzBuffer ){
|
| - *pzBuffer = zAlloc;
|
| - }
|
| - }else{
|
| - if( !ExprHasProperty(p, EP_TokenOnly) ){
|
| + /* Fill in pNew->pLeft and pNew->pRight. */
|
| + if( ExprHasProperty(pNew, EP_Reduced|EP_TokenOnly) ){
|
| + zAlloc += dupedExprNodeSize(p, dupFlags);
|
| + if( !ExprHasProperty(pNew, EP_TokenOnly|EP_Leaf) ){
|
| + pNew->pLeft = p->pLeft ?
|
| + exprDup(db, p->pLeft, EXPRDUP_REDUCE, &zAlloc) : 0;
|
| + pNew->pRight = p->pRight ?
|
| + exprDup(db, p->pRight, EXPRDUP_REDUCE, &zAlloc) : 0;
|
| + }
|
| + if( pzBuffer ){
|
| + *pzBuffer = zAlloc;
|
| + }
|
| + }else{
|
| + if( !ExprHasProperty(p, EP_TokenOnly|EP_Leaf) ){
|
| + if( pNew->op==TK_SELECT_COLUMN ){
|
| + pNew->pLeft = p->pLeft;
|
| + assert( p->iColumn==0 || p->pRight==0 );
|
| + assert( p->pRight==0 || p->pRight==p->pLeft );
|
| + }else{
|
| pNew->pLeft = sqlite3ExprDup(db, p->pLeft, 0);
|
| - pNew->pRight = sqlite3ExprDup(db, p->pRight, 0);
|
| }
|
| + pNew->pRight = sqlite3ExprDup(db, p->pRight, 0);
|
| }
|
| -
|
| }
|
| }
|
| return pNew;
|
| @@ -983,18 +1296,20 @@ static With *withDup(sqlite3 *db, With *p){
|
| */
|
| Expr *sqlite3ExprDup(sqlite3 *db, Expr *p, int flags){
|
| assert( flags==0 || flags==EXPRDUP_REDUCE );
|
| - return exprDup(db, p, flags, 0);
|
| + return p ? exprDup(db, p, flags, 0) : 0;
|
| }
|
| ExprList *sqlite3ExprListDup(sqlite3 *db, ExprList *p, int flags){
|
| ExprList *pNew;
|
| struct ExprList_item *pItem, *pOldItem;
|
| int i;
|
| + Expr *pPriorSelectCol = 0;
|
| + assert( db!=0 );
|
| if( p==0 ) return 0;
|
| - pNew = sqlite3DbMallocRaw(db, sizeof(*pNew) );
|
| + pNew = sqlite3DbMallocRawNN(db, sizeof(*pNew) );
|
| if( pNew==0 ) return 0;
|
| pNew->nExpr = i = p->nExpr;
|
| if( (flags & EXPRDUP_REDUCE)==0 ) for(i=1; i<p->nExpr; i+=i){}
|
| - pNew->a = pItem = sqlite3DbMallocRaw(db, i*sizeof(p->a[0]) );
|
| + pNew->a = pItem = sqlite3DbMallocRawNN(db, i*sizeof(p->a[0]) );
|
| if( pItem==0 ){
|
| sqlite3DbFree(db, pNew);
|
| return 0;
|
| @@ -1002,7 +1317,24 @@ ExprList *sqlite3ExprListDup(sqlite3 *db, ExprList *p, int flags){
|
| pOldItem = p->a;
|
| for(i=0; i<p->nExpr; i++, pItem++, pOldItem++){
|
| Expr *pOldExpr = pOldItem->pExpr;
|
| + Expr *pNewExpr;
|
| pItem->pExpr = sqlite3ExprDup(db, pOldExpr, flags);
|
| + if( pOldExpr
|
| + && pOldExpr->op==TK_SELECT_COLUMN
|
| + && (pNewExpr = pItem->pExpr)!=0
|
| + ){
|
| + assert( pNewExpr->iColumn==0 || i>0 );
|
| + if( pNewExpr->iColumn==0 ){
|
| + assert( pOldExpr->pLeft==pOldExpr->pRight );
|
| + pPriorSelectCol = pNewExpr->pLeft = pNewExpr->pRight;
|
| + }else{
|
| + assert( i>0 );
|
| + assert( pItem[-1].pExpr!=0 );
|
| + assert( pNewExpr->iColumn==pItem[-1].pExpr->iColumn+1 );
|
| + assert( pPriorSelectCol==pItem[-1].pExpr->pLeft );
|
| + pNewExpr->pLeft = pPriorSelectCol;
|
| + }
|
| + }
|
| pItem->zName = sqlite3DbStrDup(db, pOldItem->zName);
|
| pItem->zSpan = sqlite3DbStrDup(db, pOldItem->zSpan);
|
| pItem->sortOrder = pOldItem->sortOrder;
|
| @@ -1025,9 +1357,10 @@ SrcList *sqlite3SrcListDup(sqlite3 *db, SrcList *p, int flags){
|
| SrcList *pNew;
|
| int i;
|
| int nByte;
|
| + assert( db!=0 );
|
| if( p==0 ) return 0;
|
| nByte = sizeof(*p) + (p->nSrc>0 ? sizeof(p->a[0]) * (p->nSrc-1) : 0);
|
| - pNew = sqlite3DbMallocRaw(db, nByte );
|
| + pNew = sqlite3DbMallocRawNN(db, nByte );
|
| if( pNew==0 ) return 0;
|
| pNew->nSrc = pNew->nAlloc = p->nSrc;
|
| for(i=0; i<p->nSrc; i++){
|
| @@ -1052,7 +1385,7 @@ SrcList *sqlite3SrcListDup(sqlite3 *db, SrcList *p, int flags){
|
| }
|
| pTab = pNewItem->pTab = pOldItem->pTab;
|
| if( pTab ){
|
| - pTab->nRef++;
|
| + pTab->nTabRef++;
|
| }
|
| pNewItem->pSelect = sqlite3SelectDup(db, pOldItem->pSelect, flags);
|
| pNewItem->pOn = sqlite3ExprDup(db, pOldItem->pOn, flags);
|
| @@ -1064,11 +1397,12 @@ SrcList *sqlite3SrcListDup(sqlite3 *db, SrcList *p, int flags){
|
| IdList *sqlite3IdListDup(sqlite3 *db, IdList *p){
|
| IdList *pNew;
|
| int i;
|
| + assert( db!=0 );
|
| if( p==0 ) return 0;
|
| - pNew = sqlite3DbMallocRaw(db, sizeof(*pNew) );
|
| + pNew = sqlite3DbMallocRawNN(db, sizeof(*pNew) );
|
| if( pNew==0 ) return 0;
|
| pNew->nId = p->nId;
|
| - pNew->a = sqlite3DbMallocRaw(db, p->nId*sizeof(p->a[0]) );
|
| + pNew->a = sqlite3DbMallocRawNN(db, p->nId*sizeof(p->a[0]) );
|
| if( pNew->a==0 ){
|
| sqlite3DbFree(db, pNew);
|
| return 0;
|
| @@ -1084,32 +1418,41 @@ IdList *sqlite3IdListDup(sqlite3 *db, IdList *p){
|
| }
|
| return pNew;
|
| }
|
| -Select *sqlite3SelectDup(sqlite3 *db, Select *p, int flags){
|
| - Select *pNew, *pPrior;
|
| - if( p==0 ) return 0;
|
| - pNew = sqlite3DbMallocRaw(db, sizeof(*p) );
|
| - if( pNew==0 ) return 0;
|
| - pNew->pEList = sqlite3ExprListDup(db, p->pEList, flags);
|
| - pNew->pSrc = sqlite3SrcListDup(db, p->pSrc, flags);
|
| - pNew->pWhere = sqlite3ExprDup(db, p->pWhere, flags);
|
| - pNew->pGroupBy = sqlite3ExprListDup(db, p->pGroupBy, flags);
|
| - pNew->pHaving = sqlite3ExprDup(db, p->pHaving, flags);
|
| - pNew->pOrderBy = sqlite3ExprListDup(db, p->pOrderBy, flags);
|
| - pNew->op = p->op;
|
| - pNew->pPrior = pPrior = sqlite3SelectDup(db, p->pPrior, flags);
|
| - if( pPrior ) pPrior->pNext = pNew;
|
| - pNew->pNext = 0;
|
| - pNew->pLimit = sqlite3ExprDup(db, p->pLimit, flags);
|
| - pNew->pOffset = sqlite3ExprDup(db, p->pOffset, flags);
|
| - pNew->iLimit = 0;
|
| - pNew->iOffset = 0;
|
| - pNew->selFlags = p->selFlags & ~SF_UsesEphemeral;
|
| - pNew->addrOpenEphm[0] = -1;
|
| - pNew->addrOpenEphm[1] = -1;
|
| - pNew->nSelectRow = p->nSelectRow;
|
| - pNew->pWith = withDup(db, p->pWith);
|
| - sqlite3SelectSetName(pNew, p->zSelName);
|
| - return pNew;
|
| +Select *sqlite3SelectDup(sqlite3 *db, Select *pDup, int flags){
|
| + Select *pRet = 0;
|
| + Select *pNext = 0;
|
| + Select **pp = &pRet;
|
| + Select *p;
|
| +
|
| + assert( db!=0 );
|
| + for(p=pDup; p; p=p->pPrior){
|
| + Select *pNew = sqlite3DbMallocRawNN(db, sizeof(*p) );
|
| + if( pNew==0 ) break;
|
| + pNew->pEList = sqlite3ExprListDup(db, p->pEList, flags);
|
| + pNew->pSrc = sqlite3SrcListDup(db, p->pSrc, flags);
|
| + pNew->pWhere = sqlite3ExprDup(db, p->pWhere, flags);
|
| + pNew->pGroupBy = sqlite3ExprListDup(db, p->pGroupBy, flags);
|
| + pNew->pHaving = sqlite3ExprDup(db, p->pHaving, flags);
|
| + pNew->pOrderBy = sqlite3ExprListDup(db, p->pOrderBy, flags);
|
| + pNew->op = p->op;
|
| + pNew->pNext = pNext;
|
| + pNew->pPrior = 0;
|
| + pNew->pLimit = sqlite3ExprDup(db, p->pLimit, flags);
|
| + pNew->pOffset = sqlite3ExprDup(db, p->pOffset, flags);
|
| + pNew->iLimit = 0;
|
| + pNew->iOffset = 0;
|
| + pNew->selFlags = p->selFlags & ~SF_UsesEphemeral;
|
| + pNew->addrOpenEphm[0] = -1;
|
| + pNew->addrOpenEphm[1] = -1;
|
| + pNew->nSelectRow = p->nSelectRow;
|
| + pNew->pWith = withDup(db, p->pWith);
|
| + sqlite3SelectSetName(pNew, p->zSelName);
|
| + *pp = pNew;
|
| + pp = &pNew->pPrior;
|
| + pNext = pNew;
|
| + }
|
| +
|
| + return pRet;
|
| }
|
| #else
|
| Select *sqlite3SelectDup(sqlite3 *db, Select *p, int flags){
|
| @@ -1133,12 +1476,14 @@ ExprList *sqlite3ExprListAppend(
|
| Expr *pExpr /* Expression to be appended. Might be NULL */
|
| ){
|
| sqlite3 *db = pParse->db;
|
| + assert( db!=0 );
|
| if( pList==0 ){
|
| - pList = sqlite3DbMallocZero(db, sizeof(ExprList) );
|
| + pList = sqlite3DbMallocRawNN(db, sizeof(ExprList) );
|
| if( pList==0 ){
|
| goto no_mem;
|
| }
|
| - pList->a = sqlite3DbMallocRaw(db, sizeof(pList->a[0]));
|
| + pList->nExpr = 0;
|
| + pList->a = sqlite3DbMallocRawNN(db, sizeof(pList->a[0]));
|
| if( pList->a==0 ) goto no_mem;
|
| }else if( (pList->nExpr & (pList->nExpr-1))==0 ){
|
| struct ExprList_item *a;
|
| @@ -1165,6 +1510,75 @@ no_mem:
|
| }
|
|
|
| /*
|
| +** pColumns and pExpr form a vector assignment which is part of the SET
|
| +** clause of an UPDATE statement. Like this:
|
| +**
|
| +** (a,b,c) = (expr1,expr2,expr3)
|
| +** Or: (a,b,c) = (SELECT x,y,z FROM ....)
|
| +**
|
| +** For each term of the vector assignment, append new entries to the
|
| +** expression list pList. In the case of a subquery on the RHS, append
|
| +** TK_SELECT_COLUMN expressions.
|
| +*/
|
| +ExprList *sqlite3ExprListAppendVector(
|
| + Parse *pParse, /* Parsing context */
|
| + ExprList *pList, /* List to which to append. Might be NULL */
|
| + IdList *pColumns, /* List of names of LHS of the assignment */
|
| + Expr *pExpr /* Vector expression to be appended. Might be NULL */
|
| +){
|
| + sqlite3 *db = pParse->db;
|
| + int n;
|
| + int i;
|
| + int iFirst = pList ? pList->nExpr : 0;
|
| + /* pColumns can only be NULL due to an OOM but an OOM will cause an
|
| + ** exit prior to this routine being invoked */
|
| + if( NEVER(pColumns==0) ) goto vector_append_error;
|
| + if( pExpr==0 ) goto vector_append_error;
|
| +
|
| + /* If the RHS is a vector, then we can immediately check to see that
|
| + ** the size of the RHS and LHS match. But if the RHS is a SELECT,
|
| + ** wildcards ("*") in the result set of the SELECT must be expanded before
|
| + ** we can do the size check, so defer the size check until code generation.
|
| + */
|
| + if( pExpr->op!=TK_SELECT && pColumns->nId!=(n=sqlite3ExprVectorSize(pExpr)) ){
|
| + sqlite3ErrorMsg(pParse, "%d columns assigned %d values",
|
| + pColumns->nId, n);
|
| + goto vector_append_error;
|
| + }
|
| +
|
| + for(i=0; i<pColumns->nId; i++){
|
| + Expr *pSubExpr = sqlite3ExprForVectorField(pParse, pExpr, i);
|
| + pList = sqlite3ExprListAppend(pParse, pList, pSubExpr);
|
| + if( pList ){
|
| + assert( pList->nExpr==iFirst+i+1 );
|
| + pList->a[pList->nExpr-1].zName = pColumns->a[i].zName;
|
| + pColumns->a[i].zName = 0;
|
| + }
|
| + }
|
| +
|
| + if( pExpr->op==TK_SELECT ){
|
| + if( pList && pList->a[iFirst].pExpr ){
|
| + Expr *pFirst = pList->a[iFirst].pExpr;
|
| + assert( pFirst->op==TK_SELECT_COLUMN );
|
| +
|
| + /* Store the SELECT statement in pRight so it will be deleted when
|
| + ** sqlite3ExprListDelete() is called */
|
| + pFirst->pRight = pExpr;
|
| + pExpr = 0;
|
| +
|
| + /* Remember the size of the LHS in iTable so that we can check that
|
| + ** the RHS and LHS sizes match during code generation. */
|
| + pFirst->iTable = pColumns->nId;
|
| + }
|
| + }
|
| +
|
| +vector_append_error:
|
| + sqlite3ExprDelete(db, pExpr);
|
| + sqlite3IdListDelete(db, pColumns);
|
| + return pList;
|
| +}
|
| +
|
| +/*
|
| ** Set the sort order for the last element on the given ExprList.
|
| */
|
| void sqlite3ExprListSetSortOrder(ExprList *p, int iSortOrder){
|
| @@ -1199,7 +1613,7 @@ void sqlite3ExprListSetName(
|
| pItem = &pList->a[pList->nExpr-1];
|
| assert( pItem->zName==0 );
|
| pItem->zName = sqlite3DbStrNDup(pParse->db, pName->z, pName->n);
|
| - if( dequote && pItem->zName ) sqlite3Dequote(pItem->zName);
|
| + if( dequote ) sqlite3Dequote(pItem->zName);
|
| }
|
| }
|
|
|
| @@ -1248,10 +1662,9 @@ void sqlite3ExprListCheckLength(
|
| /*
|
| ** Delete an entire expression list.
|
| */
|
| -void sqlite3ExprListDelete(sqlite3 *db, ExprList *pList){
|
| +static SQLITE_NOINLINE void exprListDeleteNN(sqlite3 *db, ExprList *pList){
|
| int i;
|
| struct ExprList_item *pItem;
|
| - if( pList==0 ) return;
|
| assert( pList->a!=0 || pList->nExpr==0 );
|
| for(pItem=pList->a, i=0; i<pList->nExpr; i++, pItem++){
|
| sqlite3ExprDelete(db, pItem->pExpr);
|
| @@ -1261,6 +1674,9 @@ void sqlite3ExprListDelete(sqlite3 *db, ExprList *pList){
|
| sqlite3DbFree(db, pList->a);
|
| sqlite3DbFree(db, pList);
|
| }
|
| +void sqlite3ExprListDelete(sqlite3 *db, ExprList *pList){
|
| + if( pList ) exprListDeleteNN(db, pList);
|
| +}
|
|
|
| /*
|
| ** Return the bitwise-OR of all Expr.flags fields in the given
|
| @@ -1272,7 +1688,8 @@ u32 sqlite3ExprListFlags(const ExprList *pList){
|
| if( pList ){
|
| for(i=0; i<pList->nExpr; i++){
|
| Expr *pExpr = pList->a[i].pExpr;
|
| - if( ALWAYS(pExpr) ) m |= pExpr->flags;
|
| + assert( pExpr!=0 );
|
| + m |= pExpr->flags;
|
| }
|
| }
|
| return m;
|
| @@ -1557,23 +1974,22 @@ int sqlite3IsRowid(const char *z){
|
| }
|
|
|
| /*
|
| -** Return true if we are able to the IN operator optimization on a
|
| -** query of the form
|
| -**
|
| -** x IN (SELECT ...)
|
| -**
|
| -** Where the SELECT... clause is as specified by the parameter to this
|
| -** routine.
|
| -**
|
| -** The Select object passed in has already been preprocessed and no
|
| -** errors have been found.
|
| +** pX is the RHS of an IN operator. If pX is a SELECT statement
|
| +** that can be simplified to a direct table access, then return
|
| +** a pointer to the SELECT statement. If pX is not a SELECT statement,
|
| +** or if the SELECT statement needs to be manifested into a transient
|
| +** table, then return NULL.
|
| */
|
| #ifndef SQLITE_OMIT_SUBQUERY
|
| -static int isCandidateForInOpt(Select *p){
|
| +static Select *isCandidateForInOpt(Expr *pX){
|
| + Select *p;
|
| SrcList *pSrc;
|
| ExprList *pEList;
|
| Table *pTab;
|
| - if( p==0 ) return 0; /* right-hand side of IN is SELECT */
|
| + int i;
|
| + if( !ExprHasProperty(pX, EP_xIsSelect) ) return 0; /* Not a subquery */
|
| + if( ExprHasProperty(pX, EP_VarSelect) ) return 0; /* Correlated subq */
|
| + p = pX->x.pSelect;
|
| if( p->pPrior ) return 0; /* Not a compound SELECT */
|
| if( p->selFlags & (SF_Distinct|SF_Aggregate) ){
|
| testcase( (p->selFlags & (SF_Distinct|SF_Aggregate))==SF_Distinct );
|
| @@ -1589,25 +2005,22 @@ static int isCandidateForInOpt(Select *p){
|
| if( pSrc->nSrc!=1 ) return 0; /* Single term in FROM clause */
|
| if( pSrc->a[0].pSelect ) return 0; /* FROM is not a subquery or view */
|
| pTab = pSrc->a[0].pTab;
|
| - if( NEVER(pTab==0) ) return 0;
|
| + assert( pTab!=0 );
|
| assert( pTab->pSelect==0 ); /* FROM clause is not a view */
|
| if( IsVirtual(pTab) ) return 0; /* FROM clause not a virtual table */
|
| pEList = p->pEList;
|
| - if( pEList->nExpr!=1 ) return 0; /* One column in the result set */
|
| - if( pEList->a[0].pExpr->op!=TK_COLUMN ) return 0; /* Result is a column */
|
| - return 1;
|
| + assert( pEList!=0 );
|
| + /* All SELECT results must be columns. */
|
| + for(i=0; i<pEList->nExpr; i++){
|
| + Expr *pRes = pEList->a[i].pExpr;
|
| + if( pRes->op!=TK_COLUMN ) return 0;
|
| + assert( pRes->iTable==pSrc->a[0].iCursor ); /* Not a correlated subquery */
|
| + }
|
| + return p;
|
| }
|
| #endif /* SQLITE_OMIT_SUBQUERY */
|
|
|
| -/*
|
| -** Code an OP_Once instruction and allocate space for its flag. Return the
|
| -** address of the new instruction.
|
| -*/
|
| -int sqlite3CodeOnce(Parse *pParse){
|
| - Vdbe *v = sqlite3GetVdbe(pParse); /* Virtual machine being coded */
|
| - return sqlite3VdbeAddOp1(v, OP_Once, pParse->nOnce++);
|
| -}
|
| -
|
| +#ifndef SQLITE_OMIT_SUBQUERY
|
| /*
|
| ** Generate code that checks the left-most column of index table iCur to see if
|
| ** it contains any NULL entries. Cause the register at regHasNull to be set
|
| @@ -1623,6 +2036,7 @@ static void sqlite3SetHasNullFlag(Vdbe *v, int iCur, int regHasNull){
|
| VdbeComment((v, "first_entry_in(%d)", iCur));
|
| sqlite3VdbeJumpHere(v, addr1);
|
| }
|
| +#endif
|
|
|
|
|
| #ifndef SQLITE_OMIT_SUBQUERY
|
| @@ -1667,7 +2081,7 @@ static int sqlite3InRhsIsConstant(Expr *pIn){
|
| ** An existing b-tree might be used if the RHS expression pX is a simple
|
| ** subquery such as:
|
| **
|
| -** SELECT <column> FROM <table>
|
| +** SELECT <column1>, <column2>... FROM <table>
|
| **
|
| ** If the RHS of the IN operator is a list or a more complex subquery, then
|
| ** an ephemeral table might need to be generated from the RHS and then
|
| @@ -1683,14 +2097,14 @@ static int sqlite3InRhsIsConstant(Expr *pIn){
|
| **
|
| ** When IN_INDEX_LOOP is used (and the b-tree will be used to iterate
|
| ** through the set members) then the b-tree must not contain duplicates.
|
| -** An epheremal table must be used unless the selected <column> is guaranteed
|
| -** to be unique - either because it is an INTEGER PRIMARY KEY or it
|
| -** has a UNIQUE constraint or UNIQUE index.
|
| +** An epheremal table must be used unless the selected columns are guaranteed
|
| +** to be unique - either because it is an INTEGER PRIMARY KEY or due to
|
| +** a UNIQUE constraint or index.
|
| **
|
| ** When IN_INDEX_MEMBERSHIP is used (and the b-tree will be used
|
| ** for fast set membership tests) then an epheremal table must
|
| -** be used unless <column> is an INTEGER PRIMARY KEY or an index can
|
| -** be found with <column> as its left-most column.
|
| +** be used unless <columns> is a single INTEGER PRIMARY KEY column or an
|
| +** index can be found with the specified <columns> as its left-most.
|
| **
|
| ** If the IN_INDEX_NOOP_OK and IN_INDEX_MEMBERSHIP are both set and
|
| ** if the RHS of the IN operator is a list (not a subquery) then this
|
| @@ -1711,9 +2125,26 @@ static int sqlite3InRhsIsConstant(Expr *pIn){
|
| ** the value in that register will be NULL if the b-tree contains one or more
|
| ** NULL values, and it will be some non-NULL value if the b-tree contains no
|
| ** NULL values.
|
| +**
|
| +** If the aiMap parameter is not NULL, it must point to an array containing
|
| +** one element for each column returned by the SELECT statement on the RHS
|
| +** of the IN(...) operator. The i'th entry of the array is populated with the
|
| +** offset of the index column that matches the i'th column returned by the
|
| +** SELECT. For example, if the expression and selected index are:
|
| +**
|
| +** (?,?,?) IN (SELECT a, b, c FROM t1)
|
| +** CREATE INDEX i1 ON t1(b, c, a);
|
| +**
|
| +** then aiMap[] is populated with {2, 0, 1}.
|
| */
|
| #ifndef SQLITE_OMIT_SUBQUERY
|
| -int sqlite3FindInIndex(Parse *pParse, Expr *pX, u32 inFlags, int *prRhsHasNull){
|
| +int sqlite3FindInIndex(
|
| + Parse *pParse, /* Parsing context */
|
| + Expr *pX, /* The right-hand side (RHS) of the IN operator */
|
| + u32 inFlags, /* IN_INDEX_LOOP, _MEMBERSHIP, and/or _NOOP_OK */
|
| + int *prRhsHasNull, /* Register holding NULL status. See notes */
|
| + int *aiMap /* Mapping from Index fields to RHS fields */
|
| +){
|
| Select *p; /* SELECT to the right of IN operator */
|
| int eType = 0; /* Type of RHS table. IN_INDEX_* */
|
| int iTab = pParse->nTab++; /* Cursor of the RHS table */
|
| @@ -1723,38 +2154,46 @@ int sqlite3FindInIndex(Parse *pParse, Expr *pX, u32 inFlags, int *prRhsHasNull){
|
| assert( pX->op==TK_IN );
|
| mustBeUnique = (inFlags & IN_INDEX_LOOP)!=0;
|
|
|
| + /* If the RHS of this IN(...) operator is a SELECT, and if it matters
|
| + ** whether or not the SELECT result contains NULL values, check whether
|
| + ** or not NULL is actually possible (it may not be, for example, due
|
| + ** to NOT NULL constraints in the schema). If no NULL values are possible,
|
| + ** set prRhsHasNull to 0 before continuing. */
|
| + if( prRhsHasNull && (pX->flags & EP_xIsSelect) ){
|
| + int i;
|
| + ExprList *pEList = pX->x.pSelect->pEList;
|
| + for(i=0; i<pEList->nExpr; i++){
|
| + if( sqlite3ExprCanBeNull(pEList->a[i].pExpr) ) break;
|
| + }
|
| + if( i==pEList->nExpr ){
|
| + prRhsHasNull = 0;
|
| + }
|
| + }
|
| +
|
| /* Check to see if an existing table or index can be used to
|
| ** satisfy the query. This is preferable to generating a new
|
| - ** ephemeral table.
|
| - */
|
| - p = (ExprHasProperty(pX, EP_xIsSelect) ? pX->x.pSelect : 0);
|
| - if( pParse->nErr==0 && isCandidateForInOpt(p) ){
|
| + ** ephemeral table. */
|
| + if( pParse->nErr==0 && (p = isCandidateForInOpt(pX))!=0 ){
|
| sqlite3 *db = pParse->db; /* Database connection */
|
| Table *pTab; /* Table <table>. */
|
| - Expr *pExpr; /* Expression <column> */
|
| - i16 iCol; /* Index of column <column> */
|
| i16 iDb; /* Database idx for pTab */
|
| + ExprList *pEList = p->pEList;
|
| + int nExpr = pEList->nExpr;
|
|
|
| - assert( p ); /* Because of isCandidateForInOpt(p) */
|
| assert( p->pEList!=0 ); /* Because of isCandidateForInOpt(p) */
|
| assert( p->pEList->a[0].pExpr!=0 ); /* Because of isCandidateForInOpt(p) */
|
| assert( p->pSrc!=0 ); /* Because of isCandidateForInOpt(p) */
|
| pTab = p->pSrc->a[0].pTab;
|
| - pExpr = p->pEList->a[0].pExpr;
|
| - iCol = (i16)pExpr->iColumn;
|
| -
|
| +
|
| /* Code an OP_Transaction and OP_TableLock for <table>. */
|
| iDb = sqlite3SchemaToIndex(db, pTab->pSchema);
|
| sqlite3CodeVerifySchema(pParse, iDb);
|
| sqlite3TableLock(pParse, iDb, pTab->tnum, 0, pTab->zName);
|
|
|
| - /* This function is only called from two places. In both cases the vdbe
|
| - ** has already been allocated. So assume sqlite3GetVdbe() is always
|
| - ** successful here.
|
| - */
|
| - assert(v);
|
| - if( iCol<0 ){
|
| - int iAddr = sqlite3CodeOnce(pParse);
|
| + assert(v); /* sqlite3GetVdbe() has always been previously called */
|
| + if( nExpr==1 && pEList->a[0].pExpr->iColumn<0 ){
|
| + /* The "x IN (SELECT rowid FROM table)" case */
|
| + int iAddr = sqlite3VdbeAddOp0(v, OP_Once);
|
| VdbeCoverage(v);
|
|
|
| sqlite3OpenTable(pParse, iTab, iDb, pTab, OP_OpenRead);
|
| @@ -1763,44 +2202,114 @@ int sqlite3FindInIndex(Parse *pParse, Expr *pX, u32 inFlags, int *prRhsHasNull){
|
| sqlite3VdbeJumpHere(v, iAddr);
|
| }else{
|
| Index *pIdx; /* Iterator variable */
|
| + int affinity_ok = 1;
|
| + int i;
|
|
|
| - /* The collation sequence used by the comparison. If an index is to
|
| - ** be used in place of a temp-table, it must be ordered according
|
| - ** to this collation sequence. */
|
| - CollSeq *pReq = sqlite3BinaryCompareCollSeq(pParse, pX->pLeft, pExpr);
|
| -
|
| - /* Check that the affinity that will be used to perform the
|
| - ** comparison is the same as the affinity of the column. If
|
| - ** it is not, it is not possible to use any index.
|
| - */
|
| - int affinity_ok = sqlite3IndexAffinityOk(pX, pTab->aCol[iCol].affinity);
|
| -
|
| - for(pIdx=pTab->pIndex; pIdx && eType==0 && affinity_ok; pIdx=pIdx->pNext){
|
| - if( (pIdx->aiColumn[0]==iCol)
|
| - && sqlite3FindCollSeq(db, ENC(db), pIdx->azColl[0], 0)==pReq
|
| - && (!mustBeUnique || (pIdx->nKeyCol==1 && IsUniqueIndex(pIdx)))
|
| - ){
|
| - int iAddr = sqlite3CodeOnce(pParse); VdbeCoverage(v);
|
| - sqlite3VdbeAddOp3(v, OP_OpenRead, iTab, pIdx->tnum, iDb);
|
| - sqlite3VdbeSetP4KeyInfo(pParse, pIdx);
|
| - VdbeComment((v, "%s", pIdx->zName));
|
| - assert( IN_INDEX_INDEX_DESC == IN_INDEX_INDEX_ASC+1 );
|
| - eType = IN_INDEX_INDEX_ASC + pIdx->aSortOrder[0];
|
| -
|
| - if( prRhsHasNull && !pTab->aCol[iCol].notNull ){
|
| - *prRhsHasNull = ++pParse->nMem;
|
| - sqlite3SetHasNullFlag(v, iTab, *prRhsHasNull);
|
| - }
|
| - sqlite3VdbeJumpHere(v, iAddr);
|
| + /* Check that the affinity that will be used to perform each
|
| + ** comparison is the same as the affinity of each column in table
|
| + ** on the RHS of the IN operator. If it not, it is not possible to
|
| + ** use any index of the RHS table. */
|
| + for(i=0; i<nExpr && affinity_ok; i++){
|
| + Expr *pLhs = sqlite3VectorFieldSubexpr(pX->pLeft, i);
|
| + int iCol = pEList->a[i].pExpr->iColumn;
|
| + char idxaff = sqlite3TableColumnAffinity(pTab,iCol); /* RHS table */
|
| + char cmpaff = sqlite3CompareAffinity(pLhs, idxaff);
|
| + testcase( cmpaff==SQLITE_AFF_BLOB );
|
| + testcase( cmpaff==SQLITE_AFF_TEXT );
|
| + switch( cmpaff ){
|
| + case SQLITE_AFF_BLOB:
|
| + break;
|
| + case SQLITE_AFF_TEXT:
|
| + /* sqlite3CompareAffinity() only returns TEXT if one side or the
|
| + ** other has no affinity and the other side is TEXT. Hence,
|
| + ** the only way for cmpaff to be TEXT is for idxaff to be TEXT
|
| + ** and for the term on the LHS of the IN to have no affinity. */
|
| + assert( idxaff==SQLITE_AFF_TEXT );
|
| + break;
|
| + default:
|
| + affinity_ok = sqlite3IsNumericAffinity(idxaff);
|
| }
|
| }
|
| - }
|
| - }
|
| +
|
| + if( affinity_ok ){
|
| + /* Search for an existing index that will work for this IN operator */
|
| + for(pIdx=pTab->pIndex; pIdx && eType==0; pIdx=pIdx->pNext){
|
| + Bitmask colUsed; /* Columns of the index used */
|
| + Bitmask mCol; /* Mask for the current column */
|
| + if( pIdx->nColumn<nExpr ) continue;
|
| + /* Maximum nColumn is BMS-2, not BMS-1, so that we can compute
|
| + ** BITMASK(nExpr) without overflowing */
|
| + testcase( pIdx->nColumn==BMS-2 );
|
| + testcase( pIdx->nColumn==BMS-1 );
|
| + if( pIdx->nColumn>=BMS-1 ) continue;
|
| + if( mustBeUnique ){
|
| + if( pIdx->nKeyCol>nExpr
|
| + ||(pIdx->nColumn>nExpr && !IsUniqueIndex(pIdx))
|
| + ){
|
| + continue; /* This index is not unique over the IN RHS columns */
|
| + }
|
| + }
|
| +
|
| + colUsed = 0; /* Columns of index used so far */
|
| + for(i=0; i<nExpr; i++){
|
| + Expr *pLhs = sqlite3VectorFieldSubexpr(pX->pLeft, i);
|
| + Expr *pRhs = pEList->a[i].pExpr;
|
| + CollSeq *pReq = sqlite3BinaryCompareCollSeq(pParse, pLhs, pRhs);
|
| + int j;
|
| +
|
| + assert( pReq!=0 || pRhs->iColumn==XN_ROWID || pParse->nErr );
|
| + for(j=0; j<nExpr; j++){
|
| + if( pIdx->aiColumn[j]!=pRhs->iColumn ) continue;
|
| + assert( pIdx->azColl[j] );
|
| + if( pReq!=0 && sqlite3StrICmp(pReq->zName, pIdx->azColl[j])!=0 ){
|
| + continue;
|
| + }
|
| + break;
|
| + }
|
| + if( j==nExpr ) break;
|
| + mCol = MASKBIT(j);
|
| + if( mCol & colUsed ) break; /* Each column used only once */
|
| + colUsed |= mCol;
|
| + if( aiMap ) aiMap[i] = j;
|
| + }
|
| +
|
| + assert( i==nExpr || colUsed!=(MASKBIT(nExpr)-1) );
|
| + if( colUsed==(MASKBIT(nExpr)-1) ){
|
| + /* If we reach this point, that means the index pIdx is usable */
|
| + int iAddr = sqlite3VdbeAddOp0(v, OP_Once); VdbeCoverage(v);
|
| +#ifndef SQLITE_OMIT_EXPLAIN
|
| + sqlite3VdbeAddOp4(v, OP_Explain, 0, 0, 0,
|
| + sqlite3MPrintf(db, "USING INDEX %s FOR IN-OPERATOR",pIdx->zName),
|
| + P4_DYNAMIC);
|
| +#endif
|
| + sqlite3VdbeAddOp3(v, OP_OpenRead, iTab, pIdx->tnum, iDb);
|
| + sqlite3VdbeSetP4KeyInfo(pParse, pIdx);
|
| + VdbeComment((v, "%s", pIdx->zName));
|
| + assert( IN_INDEX_INDEX_DESC == IN_INDEX_INDEX_ASC+1 );
|
| + eType = IN_INDEX_INDEX_ASC + pIdx->aSortOrder[0];
|
| +
|
| + if( prRhsHasNull ){
|
| +#ifdef SQLITE_ENABLE_COLUMN_USED_MASK
|
| + i64 mask = (1<<nExpr)-1;
|
| + sqlite3VdbeAddOp4Dup8(v, OP_ColumnsUsed,
|
| + iTab, 0, 0, (u8*)&mask, P4_INT64);
|
| +#endif
|
| + *prRhsHasNull = ++pParse->nMem;
|
| + if( nExpr==1 ){
|
| + sqlite3SetHasNullFlag(v, iTab, *prRhsHasNull);
|
| + }
|
| + }
|
| + sqlite3VdbeJumpHere(v, iAddr);
|
| + }
|
| + } /* End loop over indexes */
|
| + } /* End if( affinity_ok ) */
|
| + } /* End if not an rowid index */
|
| + } /* End attempt to optimize using an index */
|
|
|
| /* If no preexisting index is available for the IN clause
|
| ** and IN_INDEX_NOOP is an allowed reply
|
| ** and the RHS of the IN operator is a list, not a subquery
|
| - ** and the RHS is not contant or has two or fewer terms,
|
| + ** and the RHS is not constant or has two or fewer terms,
|
| ** then it is not worth creating an ephemeral table to evaluate
|
| ** the IN operator so return IN_INDEX_NOOP.
|
| */
|
| @@ -1811,7 +2320,6 @@ int sqlite3FindInIndex(Parse *pParse, Expr *pX, u32 inFlags, int *prRhsHasNull){
|
| ){
|
| eType = IN_INDEX_NOOP;
|
| }
|
| -
|
|
|
| if( eType==0 ){
|
| /* Could not find an existing table or index to use as the RHS b-tree.
|
| @@ -1833,10 +2341,85 @@ int sqlite3FindInIndex(Parse *pParse, Expr *pX, u32 inFlags, int *prRhsHasNull){
|
| }else{
|
| pX->iTable = iTab;
|
| }
|
| +
|
| + if( aiMap && eType!=IN_INDEX_INDEX_ASC && eType!=IN_INDEX_INDEX_DESC ){
|
| + int i, n;
|
| + n = sqlite3ExprVectorSize(pX->pLeft);
|
| + for(i=0; i<n; i++) aiMap[i] = i;
|
| + }
|
| return eType;
|
| }
|
| #endif
|
|
|
| +#ifndef SQLITE_OMIT_SUBQUERY
|
| +/*
|
| +** Argument pExpr is an (?, ?...) IN(...) expression. This
|
| +** function allocates and returns a nul-terminated string containing
|
| +** the affinities to be used for each column of the comparison.
|
| +**
|
| +** It is the responsibility of the caller to ensure that the returned
|
| +** string is eventually freed using sqlite3DbFree().
|
| +*/
|
| +static char *exprINAffinity(Parse *pParse, Expr *pExpr){
|
| + Expr *pLeft = pExpr->pLeft;
|
| + int nVal = sqlite3ExprVectorSize(pLeft);
|
| + Select *pSelect = (pExpr->flags & EP_xIsSelect) ? pExpr->x.pSelect : 0;
|
| + char *zRet;
|
| +
|
| + assert( pExpr->op==TK_IN );
|
| + zRet = sqlite3DbMallocZero(pParse->db, nVal+1);
|
| + if( zRet ){
|
| + int i;
|
| + for(i=0; i<nVal; i++){
|
| + Expr *pA = sqlite3VectorFieldSubexpr(pLeft, i);
|
| + char a = sqlite3ExprAffinity(pA);
|
| + if( pSelect ){
|
| + zRet[i] = sqlite3CompareAffinity(pSelect->pEList->a[i].pExpr, a);
|
| + }else{
|
| + zRet[i] = a;
|
| + }
|
| + }
|
| + zRet[nVal] = '\0';
|
| + }
|
| + return zRet;
|
| +}
|
| +#endif
|
| +
|
| +#ifndef SQLITE_OMIT_SUBQUERY
|
| +/*
|
| +** Load the Parse object passed as the first argument with an error
|
| +** message of the form:
|
| +**
|
| +** "sub-select returns N columns - expected M"
|
| +*/
|
| +void sqlite3SubselectError(Parse *pParse, int nActual, int nExpect){
|
| + const char *zFmt = "sub-select returns %d columns - expected %d";
|
| + sqlite3ErrorMsg(pParse, zFmt, nActual, nExpect);
|
| +}
|
| +#endif
|
| +
|
| +/*
|
| +** Expression pExpr is a vector that has been used in a context where
|
| +** it is not permitted. If pExpr is a sub-select vector, this routine
|
| +** loads the Parse object with a message of the form:
|
| +**
|
| +** "sub-select returns N columns - expected 1"
|
| +**
|
| +** Or, if it is a regular scalar vector:
|
| +**
|
| +** "row value misused"
|
| +*/
|
| +void sqlite3VectorErrorMsg(Parse *pParse, Expr *pExpr){
|
| +#ifndef SQLITE_OMIT_SUBQUERY
|
| + if( pExpr->flags & EP_xIsSelect ){
|
| + sqlite3SubselectError(pParse, pExpr->x.pSelect->pEList->nExpr, 1);
|
| + }else
|
| +#endif
|
| + {
|
| + sqlite3ErrorMsg(pParse, "row value misused");
|
| + }
|
| +}
|
| +
|
| /*
|
| ** Generate code for scalar subqueries used as a subquery expression, EXISTS,
|
| ** or IN operators. Examples:
|
| @@ -1862,7 +2445,9 @@ int sqlite3FindInIndex(Parse *pParse, Expr *pX, u32 inFlags, int *prRhsHasNull){
|
| ** value to non-NULL if the RHS is NULL-free.
|
| **
|
| ** For a SELECT or EXISTS operator, return the register that holds the
|
| -** result. For IN operators or if an error occurs, the return value is 0.
|
| +** result. For a multi-column SELECT, the result is stored in a contiguous
|
| +** array of registers and the return value is the register of the left-most
|
| +** result column. Return 0 for IN operators or if an error occurs.
|
| */
|
| #ifndef SQLITE_OMIT_SUBQUERY
|
| int sqlite3CodeSubselect(
|
| @@ -1877,8 +2462,8 @@ int sqlite3CodeSubselect(
|
| if( NEVER(v==0) ) return 0;
|
| sqlite3ExprCachePush(pParse);
|
|
|
| - /* This code must be run in its entirety every time it is encountered
|
| - ** if any of the following is true:
|
| + /* The evaluation of the IN/EXISTS/SELECT must be repeated every time it
|
| + ** is encountered if any of the following is true:
|
| **
|
| ** * The right-hand side is a correlated subquery
|
| ** * The right-hand side is an expression list containing variables
|
| @@ -1888,7 +2473,7 @@ int sqlite3CodeSubselect(
|
| ** save the results, and reuse the same result on subsequent invocations.
|
| */
|
| if( !ExprHasProperty(pExpr, EP_VarSelect) ){
|
| - jmpIfDynamic = sqlite3CodeOnce(pParse); VdbeCoverage(v);
|
| + jmpIfDynamic = sqlite3VdbeAddOp0(v, OP_Once); VdbeCoverage(v);
|
| }
|
|
|
| #ifndef SQLITE_OMIT_EXPLAIN
|
| @@ -1904,17 +2489,18 @@ int sqlite3CodeSubselect(
|
|
|
| switch( pExpr->op ){
|
| case TK_IN: {
|
| - char affinity; /* Affinity of the LHS of the IN */
|
| int addr; /* Address of OP_OpenEphemeral instruction */
|
| Expr *pLeft = pExpr->pLeft; /* the LHS of the IN operator */
|
| KeyInfo *pKeyInfo = 0; /* Key information */
|
| -
|
| - affinity = sqlite3ExprAffinity(pLeft);
|
| + int nVal; /* Size of vector pLeft */
|
| +
|
| + nVal = sqlite3ExprVectorSize(pLeft);
|
| + assert( !isRowid || nVal==1 );
|
|
|
| /* Whether this is an 'x IN(SELECT...)' or an 'x IN(<exprlist>)'
|
| ** expression it is handled the same way. An ephemeral table is
|
| - ** filled with single-field index keys representing the results
|
| - ** from the SELECT or the <exprlist>.
|
| + ** filled with index keys representing the results from the
|
| + ** SELECT or the <exprlist>.
|
| **
|
| ** If the 'x' expression is a column value, or the SELECT...
|
| ** statement returns a column value, then the affinity of that
|
| @@ -1925,8 +2511,9 @@ int sqlite3CodeSubselect(
|
| ** is used.
|
| */
|
| pExpr->iTable = pParse->nTab++;
|
| - addr = sqlite3VdbeAddOp2(v, OP_OpenEphemeral, pExpr->iTable, !isRowid);
|
| - pKeyInfo = isRowid ? 0 : sqlite3KeyInfoAlloc(pParse->db, 1, 1);
|
| + addr = sqlite3VdbeAddOp2(v, OP_OpenEphemeral,
|
| + pExpr->iTable, (isRowid?0:nVal));
|
| + pKeyInfo = isRowid ? 0 : sqlite3KeyInfoAlloc(pParse->db, nVal, 1);
|
|
|
| if( ExprHasProperty(pExpr, EP_xIsSelect) ){
|
| /* Case 1: expr IN (SELECT ...)
|
| @@ -1935,27 +2522,37 @@ int sqlite3CodeSubselect(
|
| ** table allocated and opened above.
|
| */
|
| Select *pSelect = pExpr->x.pSelect;
|
| - SelectDest dest;
|
| - ExprList *pEList;
|
| + ExprList *pEList = pSelect->pEList;
|
|
|
| assert( !isRowid );
|
| - sqlite3SelectDestInit(&dest, SRT_Set, pExpr->iTable);
|
| - dest.affSdst = (u8)affinity;
|
| - assert( (pExpr->iTable&0x0000FFFF)==pExpr->iTable );
|
| - pSelect->iLimit = 0;
|
| - testcase( pSelect->selFlags & SF_Distinct );
|
| - testcase( pKeyInfo==0 ); /* Caused by OOM in sqlite3KeyInfoAlloc() */
|
| - if( sqlite3Select(pParse, pSelect, &dest) ){
|
| - sqlite3KeyInfoUnref(pKeyInfo);
|
| - return 0;
|
| + /* If the LHS and RHS of the IN operator do not match, that
|
| + ** error will have been caught long before we reach this point. */
|
| + if( ALWAYS(pEList->nExpr==nVal) ){
|
| + SelectDest dest;
|
| + int i;
|
| + sqlite3SelectDestInit(&dest, SRT_Set, pExpr->iTable);
|
| + dest.zAffSdst = exprINAffinity(pParse, pExpr);
|
| + assert( (pExpr->iTable&0x0000FFFF)==pExpr->iTable );
|
| + pSelect->iLimit = 0;
|
| + testcase( pSelect->selFlags & SF_Distinct );
|
| + testcase( pKeyInfo==0 ); /* Caused by OOM in sqlite3KeyInfoAlloc() */
|
| + if( sqlite3Select(pParse, pSelect, &dest) ){
|
| + sqlite3DbFree(pParse->db, dest.zAffSdst);
|
| + sqlite3KeyInfoUnref(pKeyInfo);
|
| + return 0;
|
| + }
|
| + sqlite3DbFree(pParse->db, dest.zAffSdst);
|
| + assert( pKeyInfo!=0 ); /* OOM will cause exit after sqlite3Select() */
|
| + assert( pEList!=0 );
|
| + assert( pEList->nExpr>0 );
|
| + assert( sqlite3KeyInfoIsWriteable(pKeyInfo) );
|
| + for(i=0; i<nVal; i++){
|
| + Expr *p = sqlite3VectorFieldSubexpr(pLeft, i);
|
| + pKeyInfo->aColl[i] = sqlite3BinaryCompareCollSeq(
|
| + pParse, p, pEList->a[i].pExpr
|
| + );
|
| + }
|
| }
|
| - pEList = pSelect->pEList;
|
| - assert( pKeyInfo!=0 ); /* OOM will cause exit after sqlite3Select() */
|
| - assert( pEList!=0 );
|
| - assert( pEList->nExpr>0 );
|
| - assert( sqlite3KeyInfoIsWriteable(pKeyInfo) );
|
| - pKeyInfo->aColl[0] = sqlite3BinaryCompareCollSeq(pParse, pExpr->pLeft,
|
| - pEList->a[0].pExpr);
|
| }else if( ALWAYS(pExpr->x.pList!=0) ){
|
| /* Case 2: expr IN (exprlist)
|
| **
|
| @@ -1964,11 +2561,13 @@ int sqlite3CodeSubselect(
|
| ** that columns affinity when building index keys. If <expr> is not
|
| ** a column, use numeric affinity.
|
| */
|
| + char affinity; /* Affinity of the LHS of the IN */
|
| int i;
|
| ExprList *pList = pExpr->x.pList;
|
| struct ExprList_item *pItem;
|
| int r1, r2, r3;
|
|
|
| + affinity = sqlite3ExprAffinity(pLeft);
|
| if( !affinity ){
|
| affinity = SQLITE_AFF_BLOB;
|
| }
|
| @@ -2008,7 +2607,7 @@ int sqlite3CodeSubselect(
|
| }else{
|
| sqlite3VdbeAddOp4(v, OP_MakeRecord, r3, 1, r2, &affinity, 1);
|
| sqlite3ExprCacheAffinityChange(pParse, r3, 1);
|
| - sqlite3VdbeAddOp2(v, OP_IdxInsert, pExpr->iTable, r2);
|
| + sqlite3VdbeAddOp4Int(v, OP_IdxInsert, pExpr->iTable, r2, r3, 1);
|
| }
|
| }
|
| }
|
| @@ -2024,26 +2623,37 @@ int sqlite3CodeSubselect(
|
| case TK_EXISTS:
|
| case TK_SELECT:
|
| default: {
|
| - /* If this has to be a scalar SELECT. Generate code to put the
|
| - ** value of this select in a memory cell and record the number
|
| - ** of the memory cell in iColumn. If this is an EXISTS, write
|
| - ** an integer 0 (not exists) or 1 (exists) into a memory cell
|
| - ** and record that memory cell in iColumn.
|
| + /* Case 3: (SELECT ... FROM ...)
|
| + ** or: EXISTS(SELECT ... FROM ...)
|
| + **
|
| + ** For a SELECT, generate code to put the values for all columns of
|
| + ** the first row into an array of registers and return the index of
|
| + ** the first register.
|
| + **
|
| + ** If this is an EXISTS, write an integer 0 (not exists) or 1 (exists)
|
| + ** into a register and return that register number.
|
| + **
|
| + ** In both cases, the query is augmented with "LIMIT 1". Any
|
| + ** preexisting limit is discarded in place of the new LIMIT 1.
|
| */
|
| Select *pSel; /* SELECT statement to encode */
|
| - SelectDest dest; /* How to deal with SELECt result */
|
| + SelectDest dest; /* How to deal with SELECT result */
|
| + int nReg; /* Registers to allocate */
|
|
|
| testcase( pExpr->op==TK_EXISTS );
|
| testcase( pExpr->op==TK_SELECT );
|
| assert( pExpr->op==TK_EXISTS || pExpr->op==TK_SELECT );
|
| -
|
| assert( ExprHasProperty(pExpr, EP_xIsSelect) );
|
| +
|
| pSel = pExpr->x.pSelect;
|
| - sqlite3SelectDestInit(&dest, 0, ++pParse->nMem);
|
| + nReg = pExpr->op==TK_SELECT ? pSel->pEList->nExpr : 1;
|
| + sqlite3SelectDestInit(&dest, 0, pParse->nMem+1);
|
| + pParse->nMem += nReg;
|
| if( pExpr->op==TK_SELECT ){
|
| dest.eDest = SRT_Mem;
|
| dest.iSdst = dest.iSDParm;
|
| - sqlite3VdbeAddOp2(v, OP_Null, 0, dest.iSDParm);
|
| + dest.nSdst = nReg;
|
| + sqlite3VdbeAddOp3(v, OP_Null, 0, dest.iSDParm, dest.iSDParm+nReg-1);
|
| VdbeComment((v, "Init subquery result"));
|
| }else{
|
| dest.eDest = SRT_Exists;
|
| @@ -2051,8 +2661,8 @@ int sqlite3CodeSubselect(
|
| VdbeComment((v, "Init EXISTS result"));
|
| }
|
| sqlite3ExprDelete(pParse->db, pSel->pLimit);
|
| - pSel->pLimit = sqlite3PExpr(pParse, TK_INTEGER, 0, 0,
|
| - &sqlite3IntTokens[1]);
|
| + pSel->pLimit = sqlite3ExprAlloc(pParse->db, TK_INTEGER,
|
| + &sqlite3IntTokens[1], 0);
|
| pSel->iLimit = 0;
|
| pSel->selFlags &= ~SF_MultiValue;
|
| if( sqlite3Select(pParse, pSel, &dest) ){
|
| @@ -2075,7 +2685,29 @@ int sqlite3CodeSubselect(
|
|
|
| return rReg;
|
| }
|
| -#endif /* SQLITE_OMIT_SUBQUERY */
|
| +#endif /* SQLITE_OMIT_SUBQUERY */
|
| +
|
| +#ifndef SQLITE_OMIT_SUBQUERY
|
| +/*
|
| +** Expr pIn is an IN(...) expression. This function checks that the
|
| +** sub-select on the RHS of the IN() operator has the same number of
|
| +** columns as the vector on the LHS. Or, if the RHS of the IN() is not
|
| +** a sub-query, that the LHS is a vector of size 1.
|
| +*/
|
| +int sqlite3ExprCheckIN(Parse *pParse, Expr *pIn){
|
| + int nVector = sqlite3ExprVectorSize(pIn->pLeft);
|
| + if( (pIn->flags & EP_xIsSelect) ){
|
| + if( nVector!=pIn->x.pSelect->pEList->nExpr ){
|
| + sqlite3SubselectError(pParse, pIn->x.pSelect->pEList->nExpr, nVector);
|
| + return 1;
|
| + }
|
| + }else if( nVector!=1 ){
|
| + sqlite3VectorErrorMsg(pParse, pIn->pLeft);
|
| + return 1;
|
| + }
|
| + return 0;
|
| +}
|
| +#endif
|
|
|
| #ifndef SQLITE_OMIT_SUBQUERY
|
| /*
|
| @@ -2084,16 +2716,24 @@ int sqlite3CodeSubselect(
|
| ** x IN (SELECT ...)
|
| ** x IN (value, value, ...)
|
| **
|
| -** The left-hand side (LHS) is a scalar expression. The right-hand side (RHS)
|
| -** is an array of zero or more values. The expression is true if the LHS is
|
| -** contained within the RHS. The value of the expression is unknown (NULL)
|
| -** if the LHS is NULL or if the LHS is not contained within the RHS and the
|
| -** RHS contains one or more NULL values.
|
| +** The left-hand side (LHS) is a scalar or vector expression. The
|
| +** right-hand side (RHS) is an array of zero or more scalar values, or a
|
| +** subquery. If the RHS is a subquery, the number of result columns must
|
| +** match the number of columns in the vector on the LHS. If the RHS is
|
| +** a list of values, the LHS must be a scalar.
|
| +**
|
| +** The IN operator is true if the LHS value is contained within the RHS.
|
| +** The result is false if the LHS is definitely not in the RHS. The
|
| +** result is NULL if the presence of the LHS in the RHS cannot be
|
| +** determined due to NULLs.
|
| **
|
| ** This routine generates code that jumps to destIfFalse if the LHS is not
|
| ** contained within the RHS. If due to NULLs we cannot determine if the LHS
|
| ** is contained in the RHS then jump to destIfNull. If the LHS is contained
|
| ** within the RHS then fall through.
|
| +**
|
| +** See the separate in-operator.md documentation file in the canonical
|
| +** SQLite source tree for additional information.
|
| */
|
| static void sqlite3ExprCodeIN(
|
| Parse *pParse, /* Parsing and code generating context */
|
| @@ -2102,36 +2742,83 @@ static void sqlite3ExprCodeIN(
|
| int destIfNull /* Jump here if the results are unknown due to NULLs */
|
| ){
|
| int rRhsHasNull = 0; /* Register that is true if RHS contains NULL values */
|
| - char affinity; /* Comparison affinity to use */
|
| int eType; /* Type of the RHS */
|
| - int r1; /* Temporary use register */
|
| + int rLhs; /* Register(s) holding the LHS values */
|
| + int rLhsOrig; /* LHS values prior to reordering by aiMap[] */
|
| Vdbe *v; /* Statement under construction */
|
| + int *aiMap = 0; /* Map from vector field to index column */
|
| + char *zAff = 0; /* Affinity string for comparisons */
|
| + int nVector; /* Size of vectors for this IN operator */
|
| + int iDummy; /* Dummy parameter to exprCodeVector() */
|
| + Expr *pLeft; /* The LHS of the IN operator */
|
| + int i; /* loop counter */
|
| + int destStep2; /* Where to jump when NULLs seen in step 2 */
|
| + int destStep6 = 0; /* Start of code for Step 6 */
|
| + int addrTruthOp; /* Address of opcode that determines the IN is true */
|
| + int destNotNull; /* Jump here if a comparison is not true in step 6 */
|
| + int addrTop; /* Top of the step-6 loop */
|
| +
|
| + pLeft = pExpr->pLeft;
|
| + if( sqlite3ExprCheckIN(pParse, pExpr) ) return;
|
| + zAff = exprINAffinity(pParse, pExpr);
|
| + nVector = sqlite3ExprVectorSize(pExpr->pLeft);
|
| + aiMap = (int*)sqlite3DbMallocZero(
|
| + pParse->db, nVector*(sizeof(int) + sizeof(char)) + 1
|
| + );
|
| + if( pParse->db->mallocFailed ) goto sqlite3ExprCodeIN_oom_error;
|
|
|
| - /* Compute the RHS. After this step, the table with cursor
|
| - ** pExpr->iTable will contains the values that make up the RHS.
|
| - */
|
| + /* Attempt to compute the RHS. After this step, if anything other than
|
| + ** IN_INDEX_NOOP is returned, the table opened ith cursor pExpr->iTable
|
| + ** contains the values that make up the RHS. If IN_INDEX_NOOP is returned,
|
| + ** the RHS has not yet been coded. */
|
| v = pParse->pVdbe;
|
| assert( v!=0 ); /* OOM detected prior to this routine */
|
| VdbeNoopComment((v, "begin IN expr"));
|
| eType = sqlite3FindInIndex(pParse, pExpr,
|
| IN_INDEX_MEMBERSHIP | IN_INDEX_NOOP_OK,
|
| - destIfFalse==destIfNull ? 0 : &rRhsHasNull);
|
| + destIfFalse==destIfNull ? 0 : &rRhsHasNull, aiMap);
|
|
|
| - /* Figure out the affinity to use to create a key from the results
|
| - ** of the expression. affinityStr stores a static string suitable for
|
| - ** P4 of OP_MakeRecord.
|
| - */
|
| - affinity = comparisonAffinity(pExpr);
|
| + assert( pParse->nErr || nVector==1 || eType==IN_INDEX_EPH
|
| + || eType==IN_INDEX_INDEX_ASC || eType==IN_INDEX_INDEX_DESC
|
| + );
|
| +#ifdef SQLITE_DEBUG
|
| + /* Confirm that aiMap[] contains nVector integer values between 0 and
|
| + ** nVector-1. */
|
| + for(i=0; i<nVector; i++){
|
| + int j, cnt;
|
| + for(cnt=j=0; j<nVector; j++) if( aiMap[j]==i ) cnt++;
|
| + assert( cnt==1 );
|
| + }
|
| +#endif
|
|
|
| - /* Code the LHS, the <expr> from "<expr> IN (...)".
|
| + /* Code the LHS, the <expr> from "<expr> IN (...)". If the LHS is a
|
| + ** vector, then it is stored in an array of nVector registers starting
|
| + ** at r1.
|
| + **
|
| + ** sqlite3FindInIndex() might have reordered the fields of the LHS vector
|
| + ** so that the fields are in the same order as an existing index. The
|
| + ** aiMap[] array contains a mapping from the original LHS field order to
|
| + ** the field order that matches the RHS index.
|
| */
|
| sqlite3ExprCachePush(pParse);
|
| - r1 = sqlite3GetTempReg(pParse);
|
| - sqlite3ExprCode(pParse, pExpr->pLeft, r1);
|
| + rLhsOrig = exprCodeVector(pParse, pLeft, &iDummy);
|
| + for(i=0; i<nVector && aiMap[i]==i; i++){} /* Are LHS fields reordered? */
|
| + if( i==nVector ){
|
| + /* LHS fields are not reordered */
|
| + rLhs = rLhsOrig;
|
| + }else{
|
| + /* Need to reorder the LHS fields according to aiMap */
|
| + rLhs = sqlite3GetTempRange(pParse, nVector);
|
| + for(i=0; i<nVector; i++){
|
| + sqlite3VdbeAddOp3(v, OP_Copy, rLhsOrig+i, rLhs+aiMap[i], 0);
|
| + }
|
| + }
|
|
|
| /* If sqlite3FindInIndex() did not find or create an index that is
|
| ** suitable for evaluating the IN operator, then evaluate using a
|
| ** sequence of comparisons.
|
| + **
|
| + ** This is step (1) in the in-operator.md optimized algorithm.
|
| */
|
| if( eType==IN_INDEX_NOOP ){
|
| ExprList *pList = pExpr->x.pList;
|
| @@ -2143,7 +2830,7 @@ static void sqlite3ExprCodeIN(
|
| assert( !ExprHasProperty(pExpr, EP_xIsSelect) );
|
| if( destIfNull!=destIfFalse ){
|
| regCkNull = sqlite3GetTempReg(pParse);
|
| - sqlite3VdbeAddOp3(v, OP_BitAnd, r1, r1, regCkNull);
|
| + sqlite3VdbeAddOp3(v, OP_BitAnd, rLhs, rLhs, regCkNull);
|
| }
|
| for(ii=0; ii<pList->nExpr; ii++){
|
| r2 = sqlite3ExprCodeTemp(pParse, pList->a[ii].pExpr, ®ToFree);
|
| @@ -2151,16 +2838,16 @@ static void sqlite3ExprCodeIN(
|
| sqlite3VdbeAddOp3(v, OP_BitAnd, regCkNull, r2, regCkNull);
|
| }
|
| if( ii<pList->nExpr-1 || destIfNull!=destIfFalse ){
|
| - sqlite3VdbeAddOp4(v, OP_Eq, r1, labelOk, r2,
|
| + sqlite3VdbeAddOp4(v, OP_Eq, rLhs, labelOk, r2,
|
| (void*)pColl, P4_COLLSEQ);
|
| VdbeCoverageIf(v, ii<pList->nExpr-1);
|
| VdbeCoverageIf(v, ii==pList->nExpr-1);
|
| - sqlite3VdbeChangeP5(v, affinity);
|
| + sqlite3VdbeChangeP5(v, zAff[0]);
|
| }else{
|
| assert( destIfNull==destIfFalse );
|
| - sqlite3VdbeAddOp4(v, OP_Ne, r1, destIfFalse, r2,
|
| + sqlite3VdbeAddOp4(v, OP_Ne, rLhs, destIfFalse, r2,
|
| (void*)pColl, P4_COLLSEQ); VdbeCoverage(v);
|
| - sqlite3VdbeChangeP5(v, affinity | SQLITE_JUMPIFNULL);
|
| + sqlite3VdbeChangeP5(v, zAff[0] | SQLITE_JUMPIFNULL);
|
| }
|
| sqlite3ReleaseTempReg(pParse, regToFree);
|
| }
|
| @@ -2170,78 +2857,113 @@ static void sqlite3ExprCodeIN(
|
| }
|
| sqlite3VdbeResolveLabel(v, labelOk);
|
| sqlite3ReleaseTempReg(pParse, regCkNull);
|
| + goto sqlite3ExprCodeIN_finished;
|
| + }
|
| +
|
| + /* Step 2: Check to see if the LHS contains any NULL columns. If the
|
| + ** LHS does contain NULLs then the result must be either FALSE or NULL.
|
| + ** We will then skip the binary search of the RHS.
|
| + */
|
| + if( destIfNull==destIfFalse ){
|
| + destStep2 = destIfFalse;
|
| }else{
|
| -
|
| - /* If the LHS is NULL, then the result is either false or NULL depending
|
| - ** on whether the RHS is empty or not, respectively.
|
| - */
|
| - if( sqlite3ExprCanBeNull(pExpr->pLeft) ){
|
| - if( destIfNull==destIfFalse ){
|
| - /* Shortcut for the common case where the false and NULL outcomes are
|
| - ** the same. */
|
| - sqlite3VdbeAddOp2(v, OP_IsNull, r1, destIfNull); VdbeCoverage(v);
|
| - }else{
|
| - int addr1 = sqlite3VdbeAddOp1(v, OP_NotNull, r1); VdbeCoverage(v);
|
| - sqlite3VdbeAddOp2(v, OP_Rewind, pExpr->iTable, destIfFalse);
|
| - VdbeCoverage(v);
|
| - sqlite3VdbeGoto(v, destIfNull);
|
| - sqlite3VdbeJumpHere(v, addr1);
|
| - }
|
| - }
|
| -
|
| - if( eType==IN_INDEX_ROWID ){
|
| - /* In this case, the RHS is the ROWID of table b-tree
|
| - */
|
| - sqlite3VdbeAddOp2(v, OP_MustBeInt, r1, destIfFalse); VdbeCoverage(v);
|
| - sqlite3VdbeAddOp3(v, OP_NotExists, pExpr->iTable, destIfFalse, r1);
|
| + destStep2 = destStep6 = sqlite3VdbeMakeLabel(v);
|
| + }
|
| + for(i=0; i<nVector; i++){
|
| + Expr *p = sqlite3VectorFieldSubexpr(pExpr->pLeft, i);
|
| + if( sqlite3ExprCanBeNull(p) ){
|
| + sqlite3VdbeAddOp2(v, OP_IsNull, rLhs+i, destStep2);
|
| VdbeCoverage(v);
|
| - }else{
|
| - /* In this case, the RHS is an index b-tree.
|
| - */
|
| - sqlite3VdbeAddOp4(v, OP_Affinity, r1, 1, 0, &affinity, 1);
|
| -
|
| - /* If the set membership test fails, then the result of the
|
| - ** "x IN (...)" expression must be either 0 or NULL. If the set
|
| - ** contains no NULL values, then the result is 0. If the set
|
| - ** contains one or more NULL values, then the result of the
|
| - ** expression is also NULL.
|
| - */
|
| - assert( destIfFalse!=destIfNull || rRhsHasNull==0 );
|
| - if( rRhsHasNull==0 ){
|
| - /* This branch runs if it is known at compile time that the RHS
|
| - ** cannot contain NULL values. This happens as the result
|
| - ** of a "NOT NULL" constraint in the database schema.
|
| - **
|
| - ** Also run this branch if NULL is equivalent to FALSE
|
| - ** for this particular IN operator.
|
| - */
|
| - sqlite3VdbeAddOp4Int(v, OP_NotFound, pExpr->iTable, destIfFalse, r1, 1);
|
| - VdbeCoverage(v);
|
| - }else{
|
| - /* In this branch, the RHS of the IN might contain a NULL and
|
| - ** the presence of a NULL on the RHS makes a difference in the
|
| - ** outcome.
|
| - */
|
| - int addr1;
|
| -
|
| - /* First check to see if the LHS is contained in the RHS. If so,
|
| - ** then the answer is TRUE the presence of NULLs in the RHS does
|
| - ** not matter. If the LHS is not contained in the RHS, then the
|
| - ** answer is NULL if the RHS contains NULLs and the answer is
|
| - ** FALSE if the RHS is NULL-free.
|
| - */
|
| - addr1 = sqlite3VdbeAddOp4Int(v, OP_Found, pExpr->iTable, 0, r1, 1);
|
| - VdbeCoverage(v);
|
| - sqlite3VdbeAddOp2(v, OP_IsNull, rRhsHasNull, destIfNull);
|
| - VdbeCoverage(v);
|
| - sqlite3VdbeGoto(v, destIfFalse);
|
| - sqlite3VdbeJumpHere(v, addr1);
|
| - }
|
| }
|
| }
|
| - sqlite3ReleaseTempReg(pParse, r1);
|
| +
|
| + /* Step 3. The LHS is now known to be non-NULL. Do the binary search
|
| + ** of the RHS using the LHS as a probe. If found, the result is
|
| + ** true.
|
| + */
|
| + if( eType==IN_INDEX_ROWID ){
|
| + /* In this case, the RHS is the ROWID of table b-tree and so we also
|
| + ** know that the RHS is non-NULL. Hence, we combine steps 3 and 4
|
| + ** into a single opcode. */
|
| + sqlite3VdbeAddOp3(v, OP_SeekRowid, pExpr->iTable, destIfFalse, rLhs);
|
| + VdbeCoverage(v);
|
| + addrTruthOp = sqlite3VdbeAddOp0(v, OP_Goto); /* Return True */
|
| + }else{
|
| + sqlite3VdbeAddOp4(v, OP_Affinity, rLhs, nVector, 0, zAff, nVector);
|
| + if( destIfFalse==destIfNull ){
|
| + /* Combine Step 3 and Step 5 into a single opcode */
|
| + sqlite3VdbeAddOp4Int(v, OP_NotFound, pExpr->iTable, destIfFalse,
|
| + rLhs, nVector); VdbeCoverage(v);
|
| + goto sqlite3ExprCodeIN_finished;
|
| + }
|
| + /* Ordinary Step 3, for the case where FALSE and NULL are distinct */
|
| + addrTruthOp = sqlite3VdbeAddOp4Int(v, OP_Found, pExpr->iTable, 0,
|
| + rLhs, nVector); VdbeCoverage(v);
|
| + }
|
| +
|
| + /* Step 4. If the RHS is known to be non-NULL and we did not find
|
| + ** an match on the search above, then the result must be FALSE.
|
| + */
|
| + if( rRhsHasNull && nVector==1 ){
|
| + sqlite3VdbeAddOp2(v, OP_NotNull, rRhsHasNull, destIfFalse);
|
| + VdbeCoverage(v);
|
| + }
|
| +
|
| + /* Step 5. If we do not care about the difference between NULL and
|
| + ** FALSE, then just return false.
|
| + */
|
| + if( destIfFalse==destIfNull ) sqlite3VdbeGoto(v, destIfFalse);
|
| +
|
| + /* Step 6: Loop through rows of the RHS. Compare each row to the LHS.
|
| + ** If any comparison is NULL, then the result is NULL. If all
|
| + ** comparisons are FALSE then the final result is FALSE.
|
| + **
|
| + ** For a scalar LHS, it is sufficient to check just the first row
|
| + ** of the RHS.
|
| + */
|
| + if( destStep6 ) sqlite3VdbeResolveLabel(v, destStep6);
|
| + addrTop = sqlite3VdbeAddOp2(v, OP_Rewind, pExpr->iTable, destIfFalse);
|
| + VdbeCoverage(v);
|
| + if( nVector>1 ){
|
| + destNotNull = sqlite3VdbeMakeLabel(v);
|
| + }else{
|
| + /* For nVector==1, combine steps 6 and 7 by immediately returning
|
| + ** FALSE if the first comparison is not NULL */
|
| + destNotNull = destIfFalse;
|
| + }
|
| + for(i=0; i<nVector; i++){
|
| + Expr *p;
|
| + CollSeq *pColl;
|
| + int r3 = sqlite3GetTempReg(pParse);
|
| + p = sqlite3VectorFieldSubexpr(pLeft, i);
|
| + pColl = sqlite3ExprCollSeq(pParse, p);
|
| + sqlite3VdbeAddOp3(v, OP_Column, pExpr->iTable, i, r3);
|
| + sqlite3VdbeAddOp4(v, OP_Ne, rLhs+i, destNotNull, r3,
|
| + (void*)pColl, P4_COLLSEQ);
|
| + VdbeCoverage(v);
|
| + sqlite3ReleaseTempReg(pParse, r3);
|
| + }
|
| + sqlite3VdbeAddOp2(v, OP_Goto, 0, destIfNull);
|
| + if( nVector>1 ){
|
| + sqlite3VdbeResolveLabel(v, destNotNull);
|
| + sqlite3VdbeAddOp2(v, OP_Next, pExpr->iTable, addrTop+1);
|
| + VdbeCoverage(v);
|
| +
|
| + /* Step 7: If we reach this point, we know that the result must
|
| + ** be false. */
|
| + sqlite3VdbeAddOp2(v, OP_Goto, 0, destIfFalse);
|
| + }
|
| +
|
| + /* Jumps here in order to return true. */
|
| + sqlite3VdbeJumpHere(v, addrTruthOp);
|
| +
|
| +sqlite3ExprCodeIN_finished:
|
| + if( rLhs!=rLhsOrig ) sqlite3ReleaseTempReg(pParse, rLhs);
|
| sqlite3ExprCachePop(pParse);
|
| VdbeComment((v, "end IN expr"));
|
| +sqlite3ExprCodeIN_oom_error:
|
| + sqlite3DbFree(pParse->db, aiMap);
|
| + sqlite3DbFree(pParse->db, zAff);
|
| }
|
| #endif /* SQLITE_OMIT_SUBQUERY */
|
|
|
| @@ -2285,35 +3007,38 @@ static void codeInteger(Parse *pParse, Expr *pExpr, int negFlag, int iMem){
|
| const char *z = pExpr->u.zToken;
|
| assert( z!=0 );
|
| c = sqlite3DecOrHexToI64(z, &value);
|
| - if( c==0 || (c==2 && negFlag) ){
|
| - if( negFlag ){ value = c==2 ? SMALLEST_INT64 : -value; }
|
| - sqlite3VdbeAddOp4Dup8(v, OP_Int64, 0, iMem, 0, (u8*)&value, P4_INT64);
|
| - }else{
|
| + if( c==1 || (c==2 && !negFlag) || (negFlag && value==SMALLEST_INT64)){
|
| #ifdef SQLITE_OMIT_FLOATING_POINT
|
| sqlite3ErrorMsg(pParse, "oversized integer: %s%s", negFlag ? "-" : "", z);
|
| #else
|
| #ifndef SQLITE_OMIT_HEX_INTEGER
|
| if( sqlite3_strnicmp(z,"0x",2)==0 ){
|
| - sqlite3ErrorMsg(pParse, "hex literal too big: %s", z);
|
| + sqlite3ErrorMsg(pParse, "hex literal too big: %s%s", negFlag?"-":"",z);
|
| }else
|
| #endif
|
| {
|
| codeReal(v, z, negFlag, iMem);
|
| }
|
| #endif
|
| + }else{
|
| + if( negFlag ){ value = c==2 ? SMALLEST_INT64 : -value; }
|
| + sqlite3VdbeAddOp4Dup8(v, OP_Int64, 0, iMem, 0, (u8*)&value, P4_INT64);
|
| }
|
| }
|
| }
|
|
|
| /*
|
| -** Clear a cache entry.
|
| +** Erase column-cache entry number i
|
| */
|
| -static void cacheEntryClear(Parse *pParse, struct yColCache *p){
|
| - if( p->tempReg ){
|
| +static void cacheEntryClear(Parse *pParse, int i){
|
| + if( pParse->aColCache[i].tempReg ){
|
| if( pParse->nTempReg<ArraySize(pParse->aTempReg) ){
|
| - pParse->aTempReg[pParse->nTempReg++] = p->iReg;
|
| + pParse->aTempReg[pParse->nTempReg++] = pParse->aColCache[i].iReg;
|
| }
|
| - p->tempReg = 0;
|
| + }
|
| + pParse->nColCache--;
|
| + if( i<pParse->nColCache ){
|
| + pParse->aColCache[i] = pParse->aColCache[pParse->nColCache];
|
| }
|
| }
|
|
|
| @@ -2344,43 +3069,33 @@ void sqlite3ExprCacheStore(Parse *pParse, int iTab, int iCol, int iReg){
|
| ** that the object will never already be in cache. Verify this guarantee.
|
| */
|
| #ifndef NDEBUG
|
| - for(i=0, p=pParse->aColCache; i<SQLITE_N_COLCACHE; i++, p++){
|
| - assert( p->iReg==0 || p->iTable!=iTab || p->iColumn!=iCol );
|
| + for(i=0, p=pParse->aColCache; i<pParse->nColCache; i++, p++){
|
| + assert( p->iTable!=iTab || p->iColumn!=iCol );
|
| }
|
| #endif
|
|
|
| - /* Find an empty slot and replace it */
|
| - for(i=0, p=pParse->aColCache; i<SQLITE_N_COLCACHE; i++, p++){
|
| - if( p->iReg==0 ){
|
| - p->iLevel = pParse->iCacheLevel;
|
| - p->iTable = iTab;
|
| - p->iColumn = iCol;
|
| - p->iReg = iReg;
|
| - p->tempReg = 0;
|
| - p->lru = pParse->iCacheCnt++;
|
| - return;
|
| - }
|
| - }
|
| -
|
| - /* Replace the last recently used */
|
| - minLru = 0x7fffffff;
|
| - idxLru = -1;
|
| - for(i=0, p=pParse->aColCache; i<SQLITE_N_COLCACHE; i++, p++){
|
| - if( p->lru<minLru ){
|
| - idxLru = i;
|
| - minLru = p->lru;
|
| + /* If the cache is already full, delete the least recently used entry */
|
| + if( pParse->nColCache>=SQLITE_N_COLCACHE ){
|
| + minLru = 0x7fffffff;
|
| + idxLru = -1;
|
| + for(i=0, p=pParse->aColCache; i<SQLITE_N_COLCACHE; i++, p++){
|
| + if( p->lru<minLru ){
|
| + idxLru = i;
|
| + minLru = p->lru;
|
| + }
|
| }
|
| - }
|
| - if( ALWAYS(idxLru>=0) ){
|
| p = &pParse->aColCache[idxLru];
|
| - p->iLevel = pParse->iCacheLevel;
|
| - p->iTable = iTab;
|
| - p->iColumn = iCol;
|
| - p->iReg = iReg;
|
| - p->tempReg = 0;
|
| - p->lru = pParse->iCacheCnt++;
|
| - return;
|
| + }else{
|
| + p = &pParse->aColCache[pParse->nColCache++];
|
| }
|
| +
|
| + /* Add the new entry to the end of the cache */
|
| + p->iLevel = pParse->iCacheLevel;
|
| + p->iTable = iTab;
|
| + p->iColumn = iCol;
|
| + p->iReg = iReg;
|
| + p->tempReg = 0;
|
| + p->lru = pParse->iCacheCnt++;
|
| }
|
|
|
| /*
|
| @@ -2388,14 +3103,13 @@ void sqlite3ExprCacheStore(Parse *pParse, int iTab, int iCol, int iReg){
|
| ** Purge the range of registers from the column cache.
|
| */
|
| void sqlite3ExprCacheRemove(Parse *pParse, int iReg, int nReg){
|
| - int i;
|
| - int iLast = iReg + nReg - 1;
|
| - struct yColCache *p;
|
| - for(i=0, p=pParse->aColCache; i<SQLITE_N_COLCACHE; i++, p++){
|
| - int r = p->iReg;
|
| - if( r>=iReg && r<=iLast ){
|
| - cacheEntryClear(pParse, p);
|
| - p->iReg = 0;
|
| + int i = 0;
|
| + while( i<pParse->nColCache ){
|
| + struct yColCache *p = &pParse->aColCache[i];
|
| + if( p->iReg >= iReg && p->iReg < iReg+nReg ){
|
| + cacheEntryClear(pParse, i);
|
| + }else{
|
| + i++;
|
| }
|
| }
|
| }
|
| @@ -2420,8 +3134,7 @@ void sqlite3ExprCachePush(Parse *pParse){
|
| ** the cache to the state it was in prior the most recent Push.
|
| */
|
| void sqlite3ExprCachePop(Parse *pParse){
|
| - int i;
|
| - struct yColCache *p;
|
| + int i = 0;
|
| assert( pParse->iCacheLevel>=1 );
|
| pParse->iCacheLevel--;
|
| #ifdef SQLITE_DEBUG
|
| @@ -2429,10 +3142,11 @@ void sqlite3ExprCachePop(Parse *pParse){
|
| printf("POP to %d\n", pParse->iCacheLevel);
|
| }
|
| #endif
|
| - for(i=0, p=pParse->aColCache; i<SQLITE_N_COLCACHE; i++, p++){
|
| - if( p->iReg && p->iLevel>pParse->iCacheLevel ){
|
| - cacheEntryClear(pParse, p);
|
| - p->iReg = 0;
|
| + while( i<pParse->nColCache ){
|
| + if( pParse->aColCache[i].iLevel>pParse->iCacheLevel ){
|
| + cacheEntryClear(pParse, i);
|
| + }else{
|
| + i++;
|
| }
|
| }
|
| }
|
| @@ -2446,7 +3160,7 @@ void sqlite3ExprCachePop(Parse *pParse){
|
| static void sqlite3ExprCachePinRegister(Parse *pParse, int iReg){
|
| int i;
|
| struct yColCache *p;
|
| - for(i=0, p=pParse->aColCache; i<SQLITE_N_COLCACHE; i++, p++){
|
| + for(i=0, p=pParse->aColCache; i<pParse->nColCache; i++, p++){
|
| if( p->iReg==iReg ){
|
| p->tempReg = 0;
|
| }
|
| @@ -2490,7 +3204,7 @@ void sqlite3ExprCodeGetColumnOfTable(
|
| }else{
|
| int op = IsVirtual(pTab) ? OP_VColumn : OP_Column;
|
| int x = iCol;
|
| - if( !HasRowid(pTab) ){
|
| + if( !HasRowid(pTab) && !IsVirtual(pTab) ){
|
| x = sqlite3ColumnOfIndex(sqlite3PrimaryKeyIndex(pTab), iCol);
|
| }
|
| sqlite3VdbeAddOp3(v, op, iTabCur, x, regOut);
|
| @@ -2524,8 +3238,8 @@ int sqlite3ExprCodeGetColumn(
|
| int i;
|
| struct yColCache *p;
|
|
|
| - for(i=0, p=pParse->aColCache; i<SQLITE_N_COLCACHE; i++, p++){
|
| - if( p->iReg>0 && p->iTable==iTable && p->iColumn==iColumn ){
|
| + for(i=0, p=pParse->aColCache; i<pParse->nColCache; i++, p++){
|
| + if( p->iTable==iTable && p->iColumn==iColumn ){
|
| p->lru = pParse->iCacheCnt++;
|
| sqlite3ExprCachePinRegister(pParse, p->iReg);
|
| return p->iReg;
|
| @@ -2557,19 +3271,20 @@ void sqlite3ExprCodeGetColumnToReg(
|
| */
|
| void sqlite3ExprCacheClear(Parse *pParse){
|
| int i;
|
| - struct yColCache *p;
|
|
|
| #if SQLITE_DEBUG
|
| if( pParse->db->flags & SQLITE_VdbeAddopTrace ){
|
| printf("CLEAR\n");
|
| }
|
| #endif
|
| - for(i=0, p=pParse->aColCache; i<SQLITE_N_COLCACHE; i++, p++){
|
| - if( p->iReg ){
|
| - cacheEntryClear(pParse, p);
|
| - p->iReg = 0;
|
| + for(i=0; i<pParse->nColCache; i++){
|
| + if( pParse->aColCache[i].tempReg
|
| + && pParse->nTempReg<ArraySize(pParse->aTempReg)
|
| + ){
|
| + pParse->aTempReg[pParse->nTempReg++] = pParse->aColCache[i].iReg;
|
| }
|
| }
|
| + pParse->nColCache = 0;
|
| }
|
|
|
| /*
|
| @@ -2601,7 +3316,7 @@ void sqlite3ExprCodeMove(Parse *pParse, int iFrom, int iTo, int nReg){
|
| static int usedAsColumnCache(Parse *pParse, int iFrom, int iTo){
|
| int i;
|
| struct yColCache *p;
|
| - for(i=0, p=pParse->aColCache; i<SQLITE_N_COLCACHE; i++, p++){
|
| + for(i=0, p=pParse->aColCache; i<pParse->nColCache; i++, p++){
|
| int r = p->iReg;
|
| if( r>=iFrom && r<=iTo ) return 1; /*NO_TEST*/
|
| }
|
| @@ -2609,8 +3324,11 @@ static int usedAsColumnCache(Parse *pParse, int iFrom, int iTo){
|
| }
|
| #endif /* SQLITE_DEBUG || SQLITE_COVERAGE_TEST */
|
|
|
| +
|
| /*
|
| -** Convert an expression node to a TK_REGISTER
|
| +** Convert a scalar expression node to a TK_REGISTER referencing
|
| +** register iReg. The caller must ensure that iReg already contains
|
| +** the correct value for the expression.
|
| */
|
| static void exprToRegister(Expr *p, int iReg){
|
| p->op2 = p->op;
|
| @@ -2620,6 +3338,38 @@ static void exprToRegister(Expr *p, int iReg){
|
| }
|
|
|
| /*
|
| +** Evaluate an expression (either a vector or a scalar expression) and store
|
| +** the result in continguous temporary registers. Return the index of
|
| +** the first register used to store the result.
|
| +**
|
| +** If the returned result register is a temporary scalar, then also write
|
| +** that register number into *piFreeable. If the returned result register
|
| +** is not a temporary or if the expression is a vector set *piFreeable
|
| +** to 0.
|
| +*/
|
| +static int exprCodeVector(Parse *pParse, Expr *p, int *piFreeable){
|
| + int iResult;
|
| + int nResult = sqlite3ExprVectorSize(p);
|
| + if( nResult==1 ){
|
| + iResult = sqlite3ExprCodeTemp(pParse, p, piFreeable);
|
| + }else{
|
| + *piFreeable = 0;
|
| + if( p->op==TK_SELECT ){
|
| + iResult = sqlite3CodeSubselect(pParse, p, 0, 0);
|
| + }else{
|
| + int i;
|
| + iResult = pParse->nMem+1;
|
| + pParse->nMem += nResult;
|
| + for(i=0; i<nResult; i++){
|
| + sqlite3ExprCodeFactorable(pParse, p->x.pList->a[i].pExpr, i+iResult);
|
| + }
|
| + }
|
| + }
|
| + return iResult;
|
| +}
|
| +
|
| +
|
| +/*
|
| ** Generate code into the current Vdbe to evaluate the given
|
| ** expression. Attempt to store the results in register "target".
|
| ** Return the register where results are stored.
|
| @@ -2636,9 +3386,9 @@ int sqlite3ExprCodeTarget(Parse *pParse, Expr *pExpr, int target){
|
| int inReg = target; /* Results stored in register inReg */
|
| int regFree1 = 0; /* If non-zero free this temporary register */
|
| int regFree2 = 0; /* If non-zero free this temporary register */
|
| - int r1, r2, r3, r4; /* Various register numbers */
|
| - sqlite3 *db = pParse->db; /* The database connection */
|
| + int r1, r2; /* Various register numbers */
|
| Expr tempX; /* Temporary expression node */
|
| + int p5 = 0;
|
|
|
| assert( target>0 && target<=pParse->nMem );
|
| if( v==0 ){
|
| @@ -2657,12 +3407,11 @@ int sqlite3ExprCodeTarget(Parse *pParse, Expr *pExpr, int target){
|
| struct AggInfo_col *pCol = &pAggInfo->aCol[pExpr->iAgg];
|
| if( !pAggInfo->directMode ){
|
| assert( pCol->iMem>0 );
|
| - inReg = pCol->iMem;
|
| - break;
|
| + return pCol->iMem;
|
| }else if( pAggInfo->useSortingIdx ){
|
| sqlite3VdbeAddOp3(v, OP_Column, pAggInfo->sortingIdxPTab,
|
| pCol->iSorterColumn, target);
|
| - break;
|
| + return target;
|
| }
|
| /* Otherwise, fall thru into the TK_COLUMN case */
|
| }
|
| @@ -2671,38 +3420,36 @@ int sqlite3ExprCodeTarget(Parse *pParse, Expr *pExpr, int target){
|
| if( iTab<0 ){
|
| if( pParse->ckBase>0 ){
|
| /* Generating CHECK constraints or inserting into partial index */
|
| - inReg = pExpr->iColumn + pParse->ckBase;
|
| - break;
|
| + return pExpr->iColumn + pParse->ckBase;
|
| }else{
|
| /* Coding an expression that is part of an index where column names
|
| ** in the index refer to the table to which the index belongs */
|
| iTab = pParse->iSelfTab;
|
| }
|
| }
|
| - inReg = sqlite3ExprCodeGetColumn(pParse, pExpr->pTab,
|
| + return sqlite3ExprCodeGetColumn(pParse, pExpr->pTab,
|
| pExpr->iColumn, iTab, target,
|
| pExpr->op2);
|
| - break;
|
| }
|
| case TK_INTEGER: {
|
| codeInteger(pParse, pExpr, 0, target);
|
| - break;
|
| + return target;
|
| }
|
| #ifndef SQLITE_OMIT_FLOATING_POINT
|
| case TK_FLOAT: {
|
| assert( !ExprHasProperty(pExpr, EP_IntValue) );
|
| codeReal(v, pExpr->u.zToken, 0, target);
|
| - break;
|
| + return target;
|
| }
|
| #endif
|
| case TK_STRING: {
|
| assert( !ExprHasProperty(pExpr, EP_IntValue) );
|
| sqlite3VdbeLoadString(v, target, pExpr->u.zToken);
|
| - break;
|
| + return target;
|
| }
|
| case TK_NULL: {
|
| sqlite3VdbeAddOp2(v, OP_Null, 0, target);
|
| - break;
|
| + return target;
|
| }
|
| #ifndef SQLITE_OMIT_BLOB_LITERAL
|
| case TK_BLOB: {
|
| @@ -2717,7 +3464,7 @@ int sqlite3ExprCodeTarget(Parse *pParse, Expr *pExpr, int target){
|
| assert( z[n]=='\'' );
|
| zBlob = sqlite3HexToBlob(sqlite3VdbeDb(v), z, n);
|
| sqlite3VdbeAddOp4(v, OP_Blob, n/2, target, 0, zBlob, P4_DYNAMIC);
|
| - break;
|
| + return target;
|
| }
|
| #endif
|
| case TK_VARIABLE: {
|
| @@ -2726,15 +3473,15 @@ int sqlite3ExprCodeTarget(Parse *pParse, Expr *pExpr, int target){
|
| assert( pExpr->u.zToken[0]!=0 );
|
| sqlite3VdbeAddOp2(v, OP_Variable, pExpr->iColumn, target);
|
| if( pExpr->u.zToken[1]!=0 ){
|
| - assert( pExpr->u.zToken[0]=='?'
|
| - || strcmp(pExpr->u.zToken, pParse->azVar[pExpr->iColumn-1])==0 );
|
| - sqlite3VdbeChangeP4(v, -1, pParse->azVar[pExpr->iColumn-1], P4_STATIC);
|
| + const char *z = sqlite3VListNumToName(pParse->pVList, pExpr->iColumn);
|
| + assert( pExpr->u.zToken[0]=='?' || strcmp(pExpr->u.zToken, z)==0 );
|
| + pParse->pVList[0] = 0; /* Indicate VList may no longer be enlarged */
|
| + sqlite3VdbeAppendP4(v, (char*)z, P4_STATIC);
|
| }
|
| - break;
|
| + return target;
|
| }
|
| case TK_REGISTER: {
|
| - inReg = pExpr->iTable;
|
| - break;
|
| + return pExpr->iTable;
|
| }
|
| #ifndef SQLITE_OMIT_CAST
|
| case TK_CAST: {
|
| @@ -2748,42 +3495,37 @@ int sqlite3ExprCodeTarget(Parse *pParse, Expr *pExpr, int target){
|
| sqlite3AffinityType(pExpr->u.zToken, 0));
|
| testcase( usedAsColumnCache(pParse, inReg, inReg) );
|
| sqlite3ExprCacheAffinityChange(pParse, inReg, 1);
|
| - break;
|
| + return inReg;
|
| }
|
| #endif /* SQLITE_OMIT_CAST */
|
| + case TK_IS:
|
| + case TK_ISNOT:
|
| + op = (op==TK_IS) ? TK_EQ : TK_NE;
|
| + p5 = SQLITE_NULLEQ;
|
| + /* fall-through */
|
| case TK_LT:
|
| case TK_LE:
|
| case TK_GT:
|
| case TK_GE:
|
| case TK_NE:
|
| case TK_EQ: {
|
| - r1 = sqlite3ExprCodeTemp(pParse, pExpr->pLeft, ®Free1);
|
| - r2 = sqlite3ExprCodeTemp(pParse, pExpr->pRight, ®Free2);
|
| - codeCompare(pParse, pExpr->pLeft, pExpr->pRight, op,
|
| - r1, r2, inReg, SQLITE_STOREP2);
|
| - assert(TK_LT==OP_Lt); testcase(op==OP_Lt); VdbeCoverageIf(v,op==OP_Lt);
|
| - assert(TK_LE==OP_Le); testcase(op==OP_Le); VdbeCoverageIf(v,op==OP_Le);
|
| - assert(TK_GT==OP_Gt); testcase(op==OP_Gt); VdbeCoverageIf(v,op==OP_Gt);
|
| - assert(TK_GE==OP_Ge); testcase(op==OP_Ge); VdbeCoverageIf(v,op==OP_Ge);
|
| - assert(TK_EQ==OP_Eq); testcase(op==OP_Eq); VdbeCoverageIf(v,op==OP_Eq);
|
| - assert(TK_NE==OP_Ne); testcase(op==OP_Ne); VdbeCoverageIf(v,op==OP_Ne);
|
| - testcase( regFree1==0 );
|
| - testcase( regFree2==0 );
|
| - break;
|
| - }
|
| - case TK_IS:
|
| - case TK_ISNOT: {
|
| - testcase( op==TK_IS );
|
| - testcase( op==TK_ISNOT );
|
| - r1 = sqlite3ExprCodeTemp(pParse, pExpr->pLeft, ®Free1);
|
| - r2 = sqlite3ExprCodeTemp(pParse, pExpr->pRight, ®Free2);
|
| - op = (op==TK_IS) ? TK_EQ : TK_NE;
|
| - codeCompare(pParse, pExpr->pLeft, pExpr->pRight, op,
|
| - r1, r2, inReg, SQLITE_STOREP2 | SQLITE_NULLEQ);
|
| - VdbeCoverageIf(v, op==TK_EQ);
|
| - VdbeCoverageIf(v, op==TK_NE);
|
| - testcase( regFree1==0 );
|
| - testcase( regFree2==0 );
|
| + Expr *pLeft = pExpr->pLeft;
|
| + if( sqlite3ExprIsVector(pLeft) ){
|
| + codeVectorCompare(pParse, pExpr, target, op, p5);
|
| + }else{
|
| + r1 = sqlite3ExprCodeTemp(pParse, pLeft, ®Free1);
|
| + r2 = sqlite3ExprCodeTemp(pParse, pExpr->pRight, ®Free2);
|
| + codeCompare(pParse, pLeft, pExpr->pRight, op,
|
| + r1, r2, inReg, SQLITE_STOREP2 | p5);
|
| + assert(TK_LT==OP_Lt); testcase(op==OP_Lt); VdbeCoverageIf(v,op==OP_Lt);
|
| + assert(TK_LE==OP_Le); testcase(op==OP_Le); VdbeCoverageIf(v,op==OP_Le);
|
| + assert(TK_GT==OP_Gt); testcase(op==OP_Gt); VdbeCoverageIf(v,op==OP_Gt);
|
| + assert(TK_GE==OP_Ge); testcase(op==OP_Ge); VdbeCoverageIf(v,op==OP_Ge);
|
| + assert(TK_EQ==OP_Eq); testcase(op==OP_Eq); VdbeCoverageIf(v,op==OP_Eq);
|
| + assert(TK_NE==OP_Ne); testcase(op==OP_Ne); VdbeCoverageIf(v,op==OP_Ne);
|
| + testcase( regFree1==0 );
|
| + testcase( regFree2==0 );
|
| + }
|
| break;
|
| }
|
| case TK_AND:
|
| @@ -2821,10 +3563,12 @@ int sqlite3ExprCodeTarget(Parse *pParse, Expr *pExpr, int target){
|
| assert( pLeft );
|
| if( pLeft->op==TK_INTEGER ){
|
| codeInteger(pParse, pLeft, 1, target);
|
| + return target;
|
| #ifndef SQLITE_OMIT_FLOATING_POINT
|
| }else if( pLeft->op==TK_FLOAT ){
|
| assert( !ExprHasProperty(pExpr, EP_IntValue) );
|
| codeReal(v, pLeft->u.zToken, 1, target);
|
| + return target;
|
| #endif
|
| }else{
|
| tempX.op = TK_INTEGER;
|
| @@ -2835,7 +3579,6 @@ int sqlite3ExprCodeTarget(Parse *pParse, Expr *pExpr, int target){
|
| sqlite3VdbeAddOp3(v, OP_Subtract, r2, r1, target);
|
| testcase( regFree2==0 );
|
| }
|
| - inReg = target;
|
| break;
|
| }
|
| case TK_BITNOT:
|
| @@ -2844,7 +3587,6 @@ int sqlite3ExprCodeTarget(Parse *pParse, Expr *pExpr, int target){
|
| assert( TK_NOT==OP_Not ); testcase( op==TK_NOT );
|
| r1 = sqlite3ExprCodeTemp(pParse, pExpr->pLeft, ®Free1);
|
| testcase( regFree1==0 );
|
| - inReg = target;
|
| sqlite3VdbeAddOp2(v, op, r1, inReg);
|
| break;
|
| }
|
| @@ -2869,7 +3611,7 @@ int sqlite3ExprCodeTarget(Parse *pParse, Expr *pExpr, int target){
|
| assert( !ExprHasProperty(pExpr, EP_IntValue) );
|
| sqlite3ErrorMsg(pParse, "misuse of aggregate: %s()", pExpr->u.zToken);
|
| }else{
|
| - inReg = pInfo->aFunc[pExpr->iAgg].iMem;
|
| + return pInfo->aFunc[pExpr->iAgg].iMem;
|
| }
|
| break;
|
| }
|
| @@ -2877,13 +3619,18 @@ int sqlite3ExprCodeTarget(Parse *pParse, Expr *pExpr, int target){
|
| ExprList *pFarg; /* List of function arguments */
|
| int nFarg; /* Number of function arguments */
|
| FuncDef *pDef; /* The function definition object */
|
| - int nId; /* Length of the function name in bytes */
|
| const char *zId; /* The function name */
|
| u32 constMask = 0; /* Mask of function arguments that are constant */
|
| int i; /* Loop counter */
|
| + sqlite3 *db = pParse->db; /* The database connection */
|
| u8 enc = ENC(db); /* The text encoding used by this database */
|
| CollSeq *pColl = 0; /* A collating sequence */
|
|
|
| + if( ConstFactorOk(pParse) && sqlite3ExprIsConstantNotJoin(pExpr) ){
|
| + /* SQL functions can be expensive. So try to move constant functions
|
| + ** out of the inner loop, even if that means an extra OP_Copy. */
|
| + return sqlite3ExprCodeAtInit(pParse, pExpr, -1);
|
| + }
|
| assert( !ExprHasProperty(pExpr, EP_xIsSelect) );
|
| if( ExprHasProperty(pExpr, EP_TokenOnly) ){
|
| pFarg = 0;
|
| @@ -2893,10 +3640,14 @@ int sqlite3ExprCodeTarget(Parse *pParse, Expr *pExpr, int target){
|
| nFarg = pFarg ? pFarg->nExpr : 0;
|
| assert( !ExprHasProperty(pExpr, EP_IntValue) );
|
| zId = pExpr->u.zToken;
|
| - nId = sqlite3Strlen30(zId);
|
| - pDef = sqlite3FindFunction(db, zId, nId, nFarg, enc, 0);
|
| - if( pDef==0 || pDef->xFunc==0 ){
|
| - sqlite3ErrorMsg(pParse, "unknown function: %.*s()", nId, zId);
|
| + pDef = sqlite3FindFunction(db, zId, nFarg, enc, 0);
|
| +#ifdef SQLITE_ENABLE_UNKNOWN_SQL_FUNCTION
|
| + if( pDef==0 && pParse->explain ){
|
| + pDef = sqlite3FindFunction(db, "unknown", nFarg, enc, 0);
|
| + }
|
| +#endif
|
| + if( pDef==0 || pDef->xFinalize!=0 ){
|
| + sqlite3ErrorMsg(pParse, "unknown function: %s()", zId);
|
| break;
|
| }
|
|
|
| @@ -2925,9 +3676,24 @@ int sqlite3ExprCodeTarget(Parse *pParse, Expr *pExpr, int target){
|
| */
|
| if( pDef->funcFlags & SQLITE_FUNC_UNLIKELY ){
|
| assert( nFarg>=1 );
|
| - inReg = sqlite3ExprCodeTarget(pParse, pFarg->a[0].pExpr, target);
|
| - break;
|
| + return sqlite3ExprCodeTarget(pParse, pFarg->a[0].pExpr, target);
|
| + }
|
| +
|
| +#ifdef SQLITE_DEBUG
|
| + /* The AFFINITY() function evaluates to a string that describes
|
| + ** the type affinity of the argument. This is used for testing of
|
| + ** the SQLite type logic.
|
| + */
|
| + if( pDef->funcFlags & SQLITE_FUNC_AFFINITY ){
|
| + const char *azAff[] = { "blob", "text", "numeric", "integer", "real" };
|
| + char aff;
|
| + assert( nFarg==1 );
|
| + aff = sqlite3ExprAffinity(pFarg->a[0].pExpr);
|
| + sqlite3VdbeLoadString(v, target,
|
| + aff ? azAff[aff-SQLITE_AFF_BLOB] : "none");
|
| + return target;
|
| }
|
| +#endif
|
|
|
| for(i=0; i<nFarg; i++){
|
| if( i<32 && sqlite3ExprIsConstant(pFarg->a[i].pExpr) ){
|
| @@ -3001,16 +3767,35 @@ int sqlite3ExprCodeTarget(Parse *pParse, Expr *pExpr, int target){
|
| if( nFarg && constMask==0 ){
|
| sqlite3ReleaseTempRange(pParse, r1, nFarg);
|
| }
|
| - break;
|
| + return target;
|
| }
|
| #ifndef SQLITE_OMIT_SUBQUERY
|
| case TK_EXISTS:
|
| case TK_SELECT: {
|
| + int nCol;
|
| testcase( op==TK_EXISTS );
|
| testcase( op==TK_SELECT );
|
| - inReg = sqlite3CodeSubselect(pParse, pExpr, 0, 0);
|
| + if( op==TK_SELECT && (nCol = pExpr->x.pSelect->pEList->nExpr)!=1 ){
|
| + sqlite3SubselectError(pParse, nCol, 1);
|
| + }else{
|
| + return sqlite3CodeSubselect(pParse, pExpr, 0, 0);
|
| + }
|
| break;
|
| }
|
| + case TK_SELECT_COLUMN: {
|
| + int n;
|
| + if( pExpr->pLeft->iTable==0 ){
|
| + pExpr->pLeft->iTable = sqlite3CodeSubselect(pParse, pExpr->pLeft, 0, 0);
|
| + }
|
| + assert( pExpr->iTable==0 || pExpr->pLeft->op==TK_SELECT );
|
| + if( pExpr->iTable
|
| + && pExpr->iTable!=(n = sqlite3ExprVectorSize(pExpr->pLeft))
|
| + ){
|
| + sqlite3ErrorMsg(pParse, "%d columns assigned %d values",
|
| + pExpr->iTable, n);
|
| + }
|
| + return pExpr->pLeft->iTable + pExpr->iColumn;
|
| + }
|
| case TK_IN: {
|
| int destIfFalse = sqlite3VdbeMakeLabel(v);
|
| int destIfNull = sqlite3VdbeMakeLabel(v);
|
| @@ -3020,7 +3805,7 @@ int sqlite3ExprCodeTarget(Parse *pParse, Expr *pExpr, int target){
|
| sqlite3VdbeResolveLabel(v, destIfFalse);
|
| sqlite3VdbeAddOp2(v, OP_AddImm, target, 0);
|
| sqlite3VdbeResolveLabel(v, destIfNull);
|
| - break;
|
| + return target;
|
| }
|
| #endif /* SQLITE_OMIT_SUBQUERY */
|
|
|
| @@ -3037,34 +3822,13 @@ int sqlite3ExprCodeTarget(Parse *pParse, Expr *pExpr, int target){
|
| ** Z is stored in pExpr->pList->a[1].pExpr.
|
| */
|
| case TK_BETWEEN: {
|
| - Expr *pLeft = pExpr->pLeft;
|
| - struct ExprList_item *pLItem = pExpr->x.pList->a;
|
| - Expr *pRight = pLItem->pExpr;
|
| -
|
| - r1 = sqlite3ExprCodeTemp(pParse, pLeft, ®Free1);
|
| - r2 = sqlite3ExprCodeTemp(pParse, pRight, ®Free2);
|
| - testcase( regFree1==0 );
|
| - testcase( regFree2==0 );
|
| - r3 = sqlite3GetTempReg(pParse);
|
| - r4 = sqlite3GetTempReg(pParse);
|
| - codeCompare(pParse, pLeft, pRight, OP_Ge,
|
| - r1, r2, r3, SQLITE_STOREP2); VdbeCoverage(v);
|
| - pLItem++;
|
| - pRight = pLItem->pExpr;
|
| - sqlite3ReleaseTempReg(pParse, regFree2);
|
| - r2 = sqlite3ExprCodeTemp(pParse, pRight, ®Free2);
|
| - testcase( regFree2==0 );
|
| - codeCompare(pParse, pLeft, pRight, OP_Le, r1, r2, r4, SQLITE_STOREP2);
|
| - VdbeCoverage(v);
|
| - sqlite3VdbeAddOp3(v, OP_And, r3, r4, target);
|
| - sqlite3ReleaseTempReg(pParse, r3);
|
| - sqlite3ReleaseTempReg(pParse, r4);
|
| - break;
|
| + exprCodeBetween(pParse, pExpr, target, 0, 0);
|
| + return target;
|
| }
|
| + case TK_SPAN:
|
| case TK_COLLATE:
|
| case TK_UPLUS: {
|
| - inReg = sqlite3ExprCodeTarget(pParse, pExpr->pLeft, target);
|
| - break;
|
| + return sqlite3ExprCodeTarget(pParse, pExpr->pLeft, target);
|
| }
|
|
|
| case TK_TRIGGER: {
|
| @@ -3123,6 +3887,10 @@ int sqlite3ExprCodeTarget(Parse *pParse, Expr *pExpr, int target){
|
| break;
|
| }
|
|
|
| + case TK_VECTOR: {
|
| + sqlite3ErrorMsg(pParse, "row value misused");
|
| + break;
|
| + }
|
|
|
| /*
|
| ** Form A:
|
| @@ -3166,8 +3934,9 @@ int sqlite3ExprCodeTarget(Parse *pParse, Expr *pExpr, int target){
|
| if( (pX = pExpr->pLeft)!=0 ){
|
| tempX = *pX;
|
| testcase( pX->op==TK_COLUMN );
|
| - exprToRegister(&tempX, sqlite3ExprCodeTemp(pParse, pX, ®Free1));
|
| + exprToRegister(&tempX, exprCodeVector(pParse, &tempX, ®Free1));
|
| testcase( regFree1==0 );
|
| + memset(&opCompare, 0, sizeof(opCompare));
|
| opCompare.op = TK_EQ;
|
| opCompare.pLeft = &tempX;
|
| pTest = &opCompare;
|
| @@ -3201,7 +3970,7 @@ int sqlite3ExprCodeTarget(Parse *pParse, Expr *pExpr, int target){
|
| }else{
|
| sqlite3VdbeAddOp2(v, OP_Null, 0, target);
|
| }
|
| - assert( db->mallocFailed || pParse->nErr>0
|
| + assert( pParse->db->mallocFailed || pParse->nErr>0
|
| || pParse->iCacheLevel==iCacheLevel );
|
| sqlite3VdbeResolveLabel(v, endLabel);
|
| break;
|
| @@ -3242,24 +4011,40 @@ int sqlite3ExprCodeTarget(Parse *pParse, Expr *pExpr, int target){
|
|
|
| /*
|
| ** Factor out the code of the given expression to initialization time.
|
| +**
|
| +** If regDest>=0 then the result is always stored in that register and the
|
| +** result is not reusable. If regDest<0 then this routine is free to
|
| +** store the value whereever it wants. The register where the expression
|
| +** is stored is returned. When regDest<0, two identical expressions will
|
| +** code to the same register.
|
| */
|
| -void sqlite3ExprCodeAtInit(
|
| +int sqlite3ExprCodeAtInit(
|
| Parse *pParse, /* Parsing context */
|
| Expr *pExpr, /* The expression to code when the VDBE initializes */
|
| - int regDest, /* Store the value in this register */
|
| - u8 reusable /* True if this expression is reusable */
|
| + int regDest /* Store the value in this register */
|
| ){
|
| ExprList *p;
|
| assert( ConstFactorOk(pParse) );
|
| p = pParse->pConstExpr;
|
| + if( regDest<0 && p ){
|
| + struct ExprList_item *pItem;
|
| + int i;
|
| + for(pItem=p->a, i=p->nExpr; i>0; pItem++, i--){
|
| + if( pItem->reusable && sqlite3ExprCompare(pItem->pExpr,pExpr,-1)==0 ){
|
| + return pItem->u.iConstExprReg;
|
| + }
|
| + }
|
| + }
|
| pExpr = sqlite3ExprDup(pParse->db, pExpr, 0);
|
| p = sqlite3ExprListAppend(pParse, p, pExpr);
|
| if( p ){
|
| struct ExprList_item *pItem = &p->a[p->nExpr-1];
|
| + pItem->reusable = regDest<0;
|
| + if( regDest<0 ) regDest = ++pParse->nMem;
|
| pItem->u.iConstExprReg = regDest;
|
| - pItem->reusable = reusable;
|
| }
|
| pParse->pConstExpr = p;
|
| + return regDest;
|
| }
|
|
|
| /*
|
| @@ -3282,19 +4067,8 @@ int sqlite3ExprCodeTemp(Parse *pParse, Expr *pExpr, int *pReg){
|
| && pExpr->op!=TK_REGISTER
|
| && sqlite3ExprIsConstantNotJoin(pExpr)
|
| ){
|
| - ExprList *p = pParse->pConstExpr;
|
| - int i;
|
| *pReg = 0;
|
| - if( p ){
|
| - struct ExprList_item *pItem;
|
| - for(pItem=p->a, i=p->nExpr; i>0; pItem++, i--){
|
| - if( pItem->reusable && sqlite3ExprCompare(pItem->pExpr,pExpr,-1)==0 ){
|
| - return pItem->u.iConstExprReg;
|
| - }
|
| - }
|
| - }
|
| - r2 = ++pParse->nMem;
|
| - sqlite3ExprCodeAtInit(pParse, pExpr, r2, 1);
|
| + r2 = sqlite3ExprCodeAtInit(pParse, pExpr, -1);
|
| }else{
|
| int r1 = sqlite3GetTempReg(pParse);
|
| r2 = sqlite3ExprCodeTarget(pParse, pExpr, r1);
|
| @@ -3348,7 +4122,7 @@ void sqlite3ExprCodeCopy(Parse *pParse, Expr *pExpr, int target){
|
| */
|
| void sqlite3ExprCodeFactorable(Parse *pParse, Expr *pExpr, int target){
|
| if( pParse->okConstFactor && sqlite3ExprIsConstant(pExpr) ){
|
| - sqlite3ExprCodeAtInit(pParse, pExpr, target, 0);
|
| + sqlite3ExprCodeAtInit(pParse, pExpr, target);
|
| }else{
|
| sqlite3ExprCode(pParse, pExpr, target);
|
| }
|
| @@ -3412,10 +4186,15 @@ int sqlite3ExprCodeExprList(
|
| if( !ConstFactorOk(pParse) ) flags &= ~SQLITE_ECEL_FACTOR;
|
| for(pItem=pList->a, i=0; i<n; i++, pItem++){
|
| Expr *pExpr = pItem->pExpr;
|
| - if( (flags & SQLITE_ECEL_REF)!=0 && (j = pList->a[i].u.x.iOrderByCol)>0 ){
|
| - sqlite3VdbeAddOp2(v, copyOp, j+srcReg-1, target+i);
|
| + if( (flags & SQLITE_ECEL_REF)!=0 && (j = pItem->u.x.iOrderByCol)>0 ){
|
| + if( flags & SQLITE_ECEL_OMITREF ){
|
| + i--;
|
| + n--;
|
| + }else{
|
| + sqlite3VdbeAddOp2(v, copyOp, j+srcReg-1, target+i);
|
| + }
|
| }else if( (flags & SQLITE_ECEL_FACTOR)!=0 && sqlite3ExprIsConstant(pExpr) ){
|
| - sqlite3ExprCodeAtInit(pParse, pExpr, target+i, 0);
|
| + sqlite3ExprCodeAtInit(pParse, pExpr, target+i);
|
| }else{
|
| int inReg = sqlite3ExprCodeTarget(pParse, pExpr, target+i);
|
| if( inReg!=target+i ){
|
| @@ -3446,20 +4225,33 @@ int sqlite3ExprCodeExprList(
|
| **
|
| ** Code it as such, taking care to do the common subexpression
|
| ** elimination of x.
|
| +**
|
| +** The xJumpIf parameter determines details:
|
| +**
|
| +** NULL: Store the boolean result in reg[dest]
|
| +** sqlite3ExprIfTrue: Jump to dest if true
|
| +** sqlite3ExprIfFalse: Jump to dest if false
|
| +**
|
| +** The jumpIfNull parameter is ignored if xJumpIf is NULL.
|
| */
|
| static void exprCodeBetween(
|
| Parse *pParse, /* Parsing and code generating context */
|
| Expr *pExpr, /* The BETWEEN expression */
|
| - int dest, /* Jump here if the jump is taken */
|
| - int jumpIfTrue, /* Take the jump if the BETWEEN is true */
|
| + int dest, /* Jump destination or storage location */
|
| + void (*xJump)(Parse*,Expr*,int,int), /* Action to take */
|
| int jumpIfNull /* Take the jump if the BETWEEN is NULL */
|
| ){
|
| - Expr exprAnd; /* The AND operator in x>=y AND x<=z */
|
| + Expr exprAnd; /* The AND operator in x>=y AND x<=z */
|
| Expr compLeft; /* The x>=y term */
|
| Expr compRight; /* The x<=z term */
|
| Expr exprX; /* The x subexpression */
|
| int regFree1 = 0; /* Temporary use register */
|
|
|
| +
|
| + memset(&compLeft, 0, sizeof(Expr));
|
| + memset(&compRight, 0, sizeof(Expr));
|
| + memset(&exprAnd, 0, sizeof(Expr));
|
| +
|
| assert( !ExprHasProperty(pExpr, EP_xIsSelect) );
|
| exprX = *pExpr->pLeft;
|
| exprAnd.op = TK_AND;
|
| @@ -3471,23 +4263,30 @@ static void exprCodeBetween(
|
| compRight.op = TK_LE;
|
| compRight.pLeft = &exprX;
|
| compRight.pRight = pExpr->x.pList->a[1].pExpr;
|
| - exprToRegister(&exprX, sqlite3ExprCodeTemp(pParse, &exprX, ®Free1));
|
| - if( jumpIfTrue ){
|
| - sqlite3ExprIfTrue(pParse, &exprAnd, dest, jumpIfNull);
|
| + exprToRegister(&exprX, exprCodeVector(pParse, &exprX, ®Free1));
|
| + if( xJump ){
|
| + xJump(pParse, &exprAnd, dest, jumpIfNull);
|
| }else{
|
| - sqlite3ExprIfFalse(pParse, &exprAnd, dest, jumpIfNull);
|
| + /* Mark the expression is being from the ON or USING clause of a join
|
| + ** so that the sqlite3ExprCodeTarget() routine will not attempt to move
|
| + ** it into the Parse.pConstExpr list. We should use a new bit for this,
|
| + ** for clarity, but we are out of bits in the Expr.flags field so we
|
| + ** have to reuse the EP_FromJoin bit. Bummer. */
|
| + exprX.flags |= EP_FromJoin;
|
| + sqlite3ExprCodeTarget(pParse, &exprAnd, dest);
|
| }
|
| sqlite3ReleaseTempReg(pParse, regFree1);
|
|
|
| /* Ensure adequate test coverage */
|
| - testcase( jumpIfTrue==0 && jumpIfNull==0 && regFree1==0 );
|
| - testcase( jumpIfTrue==0 && jumpIfNull==0 && regFree1!=0 );
|
| - testcase( jumpIfTrue==0 && jumpIfNull!=0 && regFree1==0 );
|
| - testcase( jumpIfTrue==0 && jumpIfNull!=0 && regFree1!=0 );
|
| - testcase( jumpIfTrue!=0 && jumpIfNull==0 && regFree1==0 );
|
| - testcase( jumpIfTrue!=0 && jumpIfNull==0 && regFree1!=0 );
|
| - testcase( jumpIfTrue!=0 && jumpIfNull!=0 && regFree1==0 );
|
| - testcase( jumpIfTrue!=0 && jumpIfNull!=0 && regFree1!=0 );
|
| + testcase( xJump==sqlite3ExprIfTrue && jumpIfNull==0 && regFree1==0 );
|
| + testcase( xJump==sqlite3ExprIfTrue && jumpIfNull==0 && regFree1!=0 );
|
| + testcase( xJump==sqlite3ExprIfTrue && jumpIfNull!=0 && regFree1==0 );
|
| + testcase( xJump==sqlite3ExprIfTrue && jumpIfNull!=0 && regFree1!=0 );
|
| + testcase( xJump==sqlite3ExprIfFalse && jumpIfNull==0 && regFree1==0 );
|
| + testcase( xJump==sqlite3ExprIfFalse && jumpIfNull==0 && regFree1!=0 );
|
| + testcase( xJump==sqlite3ExprIfFalse && jumpIfNull!=0 && regFree1==0 );
|
| + testcase( xJump==sqlite3ExprIfFalse && jumpIfNull!=0 && regFree1!=0 );
|
| + testcase( xJump==0 );
|
| }
|
|
|
| /*
|
| @@ -3539,12 +4338,20 @@ void sqlite3ExprIfTrue(Parse *pParse, Expr *pExpr, int dest, int jumpIfNull){
|
| sqlite3ExprIfFalse(pParse, pExpr->pLeft, dest, jumpIfNull);
|
| break;
|
| }
|
| + case TK_IS:
|
| + case TK_ISNOT:
|
| + testcase( op==TK_IS );
|
| + testcase( op==TK_ISNOT );
|
| + op = (op==TK_IS) ? TK_EQ : TK_NE;
|
| + jumpIfNull = SQLITE_NULLEQ;
|
| + /* Fall thru */
|
| case TK_LT:
|
| case TK_LE:
|
| case TK_GT:
|
| case TK_GE:
|
| case TK_NE:
|
| case TK_EQ: {
|
| + if( sqlite3ExprIsVector(pExpr->pLeft) ) goto default_expr;
|
| testcase( jumpIfNull==0 );
|
| r1 = sqlite3ExprCodeTemp(pParse, pExpr->pLeft, ®Free1);
|
| r2 = sqlite3ExprCodeTemp(pParse, pExpr->pRight, ®Free2);
|
| @@ -3554,23 +4361,12 @@ void sqlite3ExprIfTrue(Parse *pParse, Expr *pExpr, int dest, int jumpIfNull){
|
| assert(TK_LE==OP_Le); testcase(op==OP_Le); VdbeCoverageIf(v,op==OP_Le);
|
| assert(TK_GT==OP_Gt); testcase(op==OP_Gt); VdbeCoverageIf(v,op==OP_Gt);
|
| assert(TK_GE==OP_Ge); testcase(op==OP_Ge); VdbeCoverageIf(v,op==OP_Ge);
|
| - assert(TK_EQ==OP_Eq); testcase(op==OP_Eq); VdbeCoverageIf(v,op==OP_Eq);
|
| - assert(TK_NE==OP_Ne); testcase(op==OP_Ne); VdbeCoverageIf(v,op==OP_Ne);
|
| - testcase( regFree1==0 );
|
| - testcase( regFree2==0 );
|
| - break;
|
| - }
|
| - case TK_IS:
|
| - case TK_ISNOT: {
|
| - testcase( op==TK_IS );
|
| - testcase( op==TK_ISNOT );
|
| - r1 = sqlite3ExprCodeTemp(pParse, pExpr->pLeft, ®Free1);
|
| - r2 = sqlite3ExprCodeTemp(pParse, pExpr->pRight, ®Free2);
|
| - op = (op==TK_IS) ? TK_EQ : TK_NE;
|
| - codeCompare(pParse, pExpr->pLeft, pExpr->pRight, op,
|
| - r1, r2, dest, SQLITE_NULLEQ);
|
| - VdbeCoverageIf(v, op==TK_EQ);
|
| - VdbeCoverageIf(v, op==TK_NE);
|
| + assert(TK_EQ==OP_Eq); testcase(op==OP_Eq);
|
| + VdbeCoverageIf(v, op==OP_Eq && jumpIfNull==SQLITE_NULLEQ);
|
| + VdbeCoverageIf(v, op==OP_Eq && jumpIfNull!=SQLITE_NULLEQ);
|
| + assert(TK_NE==OP_Ne); testcase(op==OP_Ne);
|
| + VdbeCoverageIf(v, op==OP_Ne && jumpIfNull==SQLITE_NULLEQ);
|
| + VdbeCoverageIf(v, op==OP_Ne && jumpIfNull!=SQLITE_NULLEQ);
|
| testcase( regFree1==0 );
|
| testcase( regFree2==0 );
|
| break;
|
| @@ -3588,7 +4384,7 @@ void sqlite3ExprIfTrue(Parse *pParse, Expr *pExpr, int dest, int jumpIfNull){
|
| }
|
| case TK_BETWEEN: {
|
| testcase( jumpIfNull==0 );
|
| - exprCodeBetween(pParse, pExpr, dest, 1, jumpIfNull);
|
| + exprCodeBetween(pParse, pExpr, dest, sqlite3ExprIfTrue, jumpIfNull);
|
| break;
|
| }
|
| #ifndef SQLITE_OMIT_SUBQUERY
|
| @@ -3602,6 +4398,7 @@ void sqlite3ExprIfTrue(Parse *pParse, Expr *pExpr, int dest, int jumpIfNull){
|
| }
|
| #endif
|
| default: {
|
| + default_expr:
|
| if( exprAlwaysTrue(pExpr) ){
|
| sqlite3VdbeGoto(v, dest);
|
| }else if( exprAlwaysFalse(pExpr) ){
|
| @@ -3695,12 +4492,20 @@ void sqlite3ExprIfFalse(Parse *pParse, Expr *pExpr, int dest, int jumpIfNull){
|
| sqlite3ExprIfTrue(pParse, pExpr->pLeft, dest, jumpIfNull);
|
| break;
|
| }
|
| + case TK_IS:
|
| + case TK_ISNOT:
|
| + testcase( pExpr->op==TK_IS );
|
| + testcase( pExpr->op==TK_ISNOT );
|
| + op = (pExpr->op==TK_IS) ? TK_NE : TK_EQ;
|
| + jumpIfNull = SQLITE_NULLEQ;
|
| + /* Fall thru */
|
| case TK_LT:
|
| case TK_LE:
|
| case TK_GT:
|
| case TK_GE:
|
| case TK_NE:
|
| case TK_EQ: {
|
| + if( sqlite3ExprIsVector(pExpr->pLeft) ) goto default_expr;
|
| testcase( jumpIfNull==0 );
|
| r1 = sqlite3ExprCodeTemp(pParse, pExpr->pLeft, ®Free1);
|
| r2 = sqlite3ExprCodeTemp(pParse, pExpr->pRight, ®Free2);
|
| @@ -3710,23 +4515,12 @@ void sqlite3ExprIfFalse(Parse *pParse, Expr *pExpr, int dest, int jumpIfNull){
|
| assert(TK_LE==OP_Le); testcase(op==OP_Le); VdbeCoverageIf(v,op==OP_Le);
|
| assert(TK_GT==OP_Gt); testcase(op==OP_Gt); VdbeCoverageIf(v,op==OP_Gt);
|
| assert(TK_GE==OP_Ge); testcase(op==OP_Ge); VdbeCoverageIf(v,op==OP_Ge);
|
| - assert(TK_EQ==OP_Eq); testcase(op==OP_Eq); VdbeCoverageIf(v,op==OP_Eq);
|
| - assert(TK_NE==OP_Ne); testcase(op==OP_Ne); VdbeCoverageIf(v,op==OP_Ne);
|
| - testcase( regFree1==0 );
|
| - testcase( regFree2==0 );
|
| - break;
|
| - }
|
| - case TK_IS:
|
| - case TK_ISNOT: {
|
| - testcase( pExpr->op==TK_IS );
|
| - testcase( pExpr->op==TK_ISNOT );
|
| - r1 = sqlite3ExprCodeTemp(pParse, pExpr->pLeft, ®Free1);
|
| - r2 = sqlite3ExprCodeTemp(pParse, pExpr->pRight, ®Free2);
|
| - op = (pExpr->op==TK_IS) ? TK_NE : TK_EQ;
|
| - codeCompare(pParse, pExpr->pLeft, pExpr->pRight, op,
|
| - r1, r2, dest, SQLITE_NULLEQ);
|
| - VdbeCoverageIf(v, op==TK_EQ);
|
| - VdbeCoverageIf(v, op==TK_NE);
|
| + assert(TK_EQ==OP_Eq); testcase(op==OP_Eq);
|
| + VdbeCoverageIf(v, op==OP_Eq && jumpIfNull!=SQLITE_NULLEQ);
|
| + VdbeCoverageIf(v, op==OP_Eq && jumpIfNull==SQLITE_NULLEQ);
|
| + assert(TK_NE==OP_Ne); testcase(op==OP_Ne);
|
| + VdbeCoverageIf(v, op==OP_Ne && jumpIfNull!=SQLITE_NULLEQ);
|
| + VdbeCoverageIf(v, op==OP_Ne && jumpIfNull==SQLITE_NULLEQ);
|
| testcase( regFree1==0 );
|
| testcase( regFree2==0 );
|
| break;
|
| @@ -3742,7 +4536,7 @@ void sqlite3ExprIfFalse(Parse *pParse, Expr *pExpr, int dest, int jumpIfNull){
|
| }
|
| case TK_BETWEEN: {
|
| testcase( jumpIfNull==0 );
|
| - exprCodeBetween(pParse, pExpr, dest, 0, jumpIfNull);
|
| + exprCodeBetween(pParse, pExpr, dest, sqlite3ExprIfFalse, jumpIfNull);
|
| break;
|
| }
|
| #ifndef SQLITE_OMIT_SUBQUERY
|
| @@ -3758,6 +4552,7 @@ void sqlite3ExprIfFalse(Parse *pParse, Expr *pExpr, int dest, int jumpIfNull){
|
| }
|
| #endif
|
| default: {
|
| + default_expr:
|
| if( exprAlwaysFalse(pExpr) ){
|
| sqlite3VdbeGoto(v, dest);
|
| }else if( exprAlwaysTrue(pExpr) ){
|
| @@ -3915,17 +4710,71 @@ int sqlite3ExprImpliesExpr(Expr *pE1, Expr *pE2, int iTab){
|
| ){
|
| return 1;
|
| }
|
| - if( pE2->op==TK_NOTNULL
|
| - && sqlite3ExprCompare(pE1->pLeft, pE2->pLeft, iTab)==0
|
| - && (pE1->op!=TK_ISNULL && pE1->op!=TK_IS)
|
| - ){
|
| - return 1;
|
| + if( pE2->op==TK_NOTNULL && pE1->op!=TK_ISNULL && pE1->op!=TK_IS ){
|
| + Expr *pX = sqlite3ExprSkipCollate(pE1->pLeft);
|
| + testcase( pX!=pE1->pLeft );
|
| + if( sqlite3ExprCompare(pX, pE2->pLeft, iTab)==0 ) return 1;
|
| }
|
| return 0;
|
| }
|
|
|
| /*
|
| ** An instance of the following structure is used by the tree walker
|
| +** to determine if an expression can be evaluated by reference to the
|
| +** index only, without having to do a search for the corresponding
|
| +** table entry. The IdxCover.pIdx field is the index. IdxCover.iCur
|
| +** is the cursor for the table.
|
| +*/
|
| +struct IdxCover {
|
| + Index *pIdx; /* The index to be tested for coverage */
|
| + int iCur; /* Cursor number for the table corresponding to the index */
|
| +};
|
| +
|
| +/*
|
| +** Check to see if there are references to columns in table
|
| +** pWalker->u.pIdxCover->iCur can be satisfied using the index
|
| +** pWalker->u.pIdxCover->pIdx.
|
| +*/
|
| +static int exprIdxCover(Walker *pWalker, Expr *pExpr){
|
| + if( pExpr->op==TK_COLUMN
|
| + && pExpr->iTable==pWalker->u.pIdxCover->iCur
|
| + && sqlite3ColumnOfIndex(pWalker->u.pIdxCover->pIdx, pExpr->iColumn)<0
|
| + ){
|
| + pWalker->eCode = 1;
|
| + return WRC_Abort;
|
| + }
|
| + return WRC_Continue;
|
| +}
|
| +
|
| +/*
|
| +** Determine if an index pIdx on table with cursor iCur contains will
|
| +** the expression pExpr. Return true if the index does cover the
|
| +** expression and false if the pExpr expression references table columns
|
| +** that are not found in the index pIdx.
|
| +**
|
| +** An index covering an expression means that the expression can be
|
| +** evaluated using only the index and without having to lookup the
|
| +** corresponding table entry.
|
| +*/
|
| +int sqlite3ExprCoveredByIndex(
|
| + Expr *pExpr, /* The index to be tested */
|
| + int iCur, /* The cursor number for the corresponding table */
|
| + Index *pIdx /* The index that might be used for coverage */
|
| +){
|
| + Walker w;
|
| + struct IdxCover xcov;
|
| + memset(&w, 0, sizeof(w));
|
| + xcov.iCur = iCur;
|
| + xcov.pIdx = pIdx;
|
| + w.xExprCallback = exprIdxCover;
|
| + w.u.pIdxCover = &xcov;
|
| + sqlite3WalkExpr(&w, pExpr);
|
| + return !w.eCode;
|
| +}
|
| +
|
| +
|
| +/*
|
| +** An instance of the following structure is used by the tree walker
|
| ** to count references to table columns in the arguments of an
|
| ** aggregate function, in order to implement the
|
| ** sqlite3FunctionThisSrc() routine.
|
| @@ -4121,7 +4970,7 @@ static int analyzeAggregate(Walker *pWalker, Expr *pExpr){
|
| pItem->iMem = ++pParse->nMem;
|
| assert( !ExprHasProperty(pExpr, EP_IntValue) );
|
| pItem->pFunc = sqlite3FindFunction(pParse->db,
|
| - pExpr->u.zToken, sqlite3Strlen30(pExpr->u.zToken),
|
| + pExpr->u.zToken,
|
| pExpr->x.pList ? pExpr->x.pList->nExpr : 0, enc, 0);
|
| if( pExpr->flags & EP_Distinct ){
|
| pItem->iDistinct = pParse->nTab++;
|
| @@ -4207,7 +5056,7 @@ void sqlite3ReleaseTempReg(Parse *pParse, int iReg){
|
| if( iReg && pParse->nTempReg<ArraySize(pParse->aTempReg) ){
|
| int i;
|
| struct yColCache *p;
|
| - for(i=0, p=pParse->aColCache; i<SQLITE_N_COLCACHE; i++, p++){
|
| + for(i=0, p=pParse->aColCache; i<pParse->nColCache; i++, p++){
|
| if( p->iReg==iReg ){
|
| p->tempReg = 1;
|
| return;
|
| @@ -4218,10 +5067,11 @@ void sqlite3ReleaseTempReg(Parse *pParse, int iReg){
|
| }
|
|
|
| /*
|
| -** Allocate or deallocate a block of nReg consecutive registers
|
| +** Allocate or deallocate a block of nReg consecutive registers.
|
| */
|
| int sqlite3GetTempRange(Parse *pParse, int nReg){
|
| int i, n;
|
| + if( nReg==1 ) return sqlite3GetTempReg(pParse);
|
| i = pParse->iRangeReg;
|
| n = pParse->nRangeReg;
|
| if( nReg<=n ){
|
| @@ -4235,6 +5085,10 @@ int sqlite3GetTempRange(Parse *pParse, int nReg){
|
| return i;
|
| }
|
| void sqlite3ReleaseTempRange(Parse *pParse, int iReg, int nReg){
|
| + if( nReg==1 ){
|
| + sqlite3ReleaseTempReg(pParse, iReg);
|
| + return;
|
| + }
|
| sqlite3ExprCacheRemove(pParse, iReg, nReg);
|
| if( nReg>pParse->nRangeReg ){
|
| pParse->nRangeReg = nReg;
|
| @@ -4249,3 +5103,26 @@ void sqlite3ClearTempRegCache(Parse *pParse){
|
| pParse->nTempReg = 0;
|
| pParse->nRangeReg = 0;
|
| }
|
| +
|
| +/*
|
| +** Validate that no temporary register falls within the range of
|
| +** iFirst..iLast, inclusive. This routine is only call from within assert()
|
| +** statements.
|
| +*/
|
| +#ifdef SQLITE_DEBUG
|
| +int sqlite3NoTempsInRange(Parse *pParse, int iFirst, int iLast){
|
| + int i;
|
| + if( pParse->nRangeReg>0
|
| + && pParse->iRangeReg+pParse->nRangeReg<iLast
|
| + && pParse->iRangeReg>=iFirst
|
| + ){
|
| + return 0;
|
| + }
|
| + for(i=0; i<pParse->nTempReg; i++){
|
| + if( pParse->aTempReg[i]>=iFirst && pParse->aTempReg[i]<=iLast ){
|
| + return 0;
|
| + }
|
| + }
|
| + return 1;
|
| +}
|
| +#endif /* SQLITE_DEBUG */
|
|
|
Chromium Code Reviews
Issue 2751253002:
[sql] Import SQLite 3.17.0. (Closed)
