database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-07-27 20:41:58 +03:00
Code Activity

Remove the EP_Vector expression flag.

Browse Source 
FossilOrigin-Name: e9d9c6d46b46160fad6aa6e3441a65a09157515f
This commit is contained in:
dan
2016-07-30 16:39:28 +00:00
parent 19ff12dd76
commit 625015e0c9
7 changed files with 37 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/wherecode.c
View File

@ -952,7 +952,7 @@ static void codeDeferredSeek(
static void codeExprOrVector(Parse *pParse, Expr *p, int iReg, int nReg){
assert( nReg>0 );
if( p->flags & EP_Vector ){
if( sqlite3ExprIsVector(p) ){
int i;
if( (p->flags & EP_xIsSelect)==0 ){
ExprList *pList = p->x.pList;
@ -1200,7 +1200,7 @@ Bitmask sqlite3WhereCodeOneLoopStart(
pX = pStart->pExpr;
assert( pX!=0 );
testcase( pStart->leftCursor!=iCur ); /* transitive constraints */
if( pX->pRight->flags & EP_Vector ){
if( sqlite3ExprIsVector(pX->pRight) ){
r1 = rTemp = sqlite3GetTempReg(pParse);
codeExprOrVector(pParse, pX->pRight, r1, 1);
op = aMoveOp[(pX->op - TK_GT) | 0x0001];
@ -1231,7 +1231,9 @@ Bitmask sqlite3WhereCodeOneLoopStart(
testcase( pEnd->wtFlags & TERM_VIRTUAL );
memEndValue = ++pParse->nMem;
codeExprOrVector(pParse, pX->pRight, memEndValue, 1);
if( !(pX->pRight->flags&EP_Vector) && (pX->op==TK_LT || pX->op==TK_GT) ){
if( 0==sqlite3ExprIsVector(pX->pRight)
&& (pX->op==TK_LT || pX->op==TK_GT)
){
testOp = bRev ? OP_Le : OP_Ge;
}else{
testOp = bRev ? OP_Lt : OP_Gt;
@ -1440,7 +1442,7 @@ Bitmask sqlite3WhereCodeOneLoopStart(
}
nConstraint += nBtm;
testcase( pRangeStart->wtFlags & TERM_VIRTUAL );
if( (pRight->flags & EP_Vector)==0 ){
if( sqlite3ExprIsVector(pRight)==0 ){
disableTerm(pLevel, pRangeStart);
}else{
startEq = 1;
@ -1493,7 +1495,7 @@ Bitmask sqlite3WhereCodeOneLoopStart(
nConstraint += nTop;
testcase( pRangeEnd->wtFlags & TERM_VIRTUAL );
if( (pRight->flags & EP_Vector)==0 ){
if( sqlite3ExprIsVector(pRight)==0 ){
disableTerm(pLevel, pRangeEnd);
}else{
endEq = 1;