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

Do not suppress the ORDER BY clause on a virtual table query if an IN

Browse Source 
constraint is used.  Fix for ticket [f69b96e3076e].  Testing done on
TH3 using cov1/where37.test.

FossilOrigin-Name: 61b2a7be3b9c04bf45bffa93a7d3a480fc5c947a
This commit is contained in:
drh
2013-04-18 02:55:54 +00:00
parent 44fddcad02
commit 83b5bfc7d3
3 changed files with 15 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
manifest
View File

@@ -1,5 +1,5 @@
C Fix\sthe\s--match\scommand\sin\smptester\sso\sthat\sit\schecks\sthe\sentire\sresult,\nnot\sjust\sa\sprefix\sof\sthe\sresult. C Do\snot\ssuppress\sthe\sORDER\sBY\sclause\son\sa\svirtual\stable\squery\sif\san\sIN\nconstraint\sis\sused.\s\sFix\sfor\sticket\s[f69b96e3076e].\s\sTesting\sdone\son\nTH3\susing\scov1/where37.test.
D 2013-04-17T19:42:17.479 D 2013-04-18T02:55:54.826
F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
F Makefile.in 3dd3fcb87b70c78d99b2c8a03e44ec86d6ca9ce2 F Makefile.in 3dd3fcb87b70c78d99b2c8a03e44ec86d6ca9ce2
F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -258,7 +258,7 @@ F src/vtab.c b05e5f1f4902461ba9f5fc49bb7eb7c3a0741a83
F src/wal.c 436bfceb141b9423c45119e68e444358ee0ed35d F src/wal.c 436bfceb141b9423c45119e68e444358ee0ed35d
F src/wal.h a4d3da523d55a226a0b28e9058ef88d0a8051887 F src/wal.h a4d3da523d55a226a0b28e9058ef88d0a8051887
F src/walker.c 3d75ba73de15e0f8cd0737643badbeb0e002f07b F src/walker.c 3d75ba73de15e0f8cd0737643badbeb0e002f07b
F src/where.c 4ad2329c439a30ddb915a780f6f80bdffafe3a64 F src/where.c e63f84e5583133c77573b78d3696dccd97bfd00d
F test/8_3_names.test 631ea964a3edb091cf73c3b540f6bcfdb36ce823 F test/8_3_names.test 631ea964a3edb091cf73c3b540f6bcfdb36ce823
F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2 F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
F test/aggnested.test 45c0201e28045ad38a530b5a144b73cd4aa2cfd6 F test/aggnested.test 45c0201e28045ad38a530b5a144b73cd4aa2cfd6
@@ -1051,7 +1051,7 @@ F tool/vdbe-compress.tcl f12c884766bd14277f4fcedcae07078011717381
F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
F tool/win/sqlite.vsix 97894c2790eda7b5bce3cc79cb2a8ec2fde9b3ac F tool/win/sqlite.vsix 97894c2790eda7b5bce3cc79cb2a8ec2fde9b3ac
P c273c171f511475045ef0aa68ecf8e22b8351996 P 3e3ecad2b5d6c97032f2a9fb920c1b8a16ab8ef5
R c2176482a0665dc72d6ff4f34c638c84 R 6fada9489bb28405c28c5a46dce1bedb
U drh U drh
Z 66ee4dc6efdb5b603ad21e244f0428fb Z da33d363d10fd9678c928e7a78f01d61

2
manifest.uuid
View File

@@ -1 +1 @@
3e3ecad2b5d6c97032f2a9fb920c1b8a16ab8ef5 61b2a7be3b9c04bf45bffa93a7d3a480fc5c947a

19
src/where.c
View File

@@ -2275,9 +2275,8 @@ static void bestVirtualIndex(WhereBestIdx *p){
struct sqlite3_index_constraint *pIdxCons; struct sqlite3_index_constraint *pIdxCons;
struct sqlite3_index_constraint_usage *pUsage; struct sqlite3_index_constraint_usage *pUsage;
WhereTerm *pTerm; WhereTerm *pTerm;
int i, j, k; int i, j;
int nOrderBy; int nOrderBy;
int sortOrder; /* Sort order for IN clauses */
int bAllowIN; /* Allow IN optimizations */ int bAllowIN; /* Allow IN optimizations */
double rCost; double rCost;
@@ -2376,7 +2375,6 @@ static void bestVirtualIndex(WhereBestIdx *p){
return; return;
} }
sortOrder = SQLITE_SO_ASC;
pIdxCons = *(struct sqlite3_index_constraint**)&pIdxInfo->aConstraint; pIdxCons = *(struct sqlite3_index_constraint**)&pIdxInfo->aConstraint;
for(i=0; i<pIdxInfo->nConstraint; i++, pIdxCons++){ for(i=0; i<pIdxInfo->nConstraint; i++, pIdxCons++){
if( pUsage[i].argvIndex>0 ){ if( pUsage[i].argvIndex>0 ){
@@ -2391,12 +2389,12 @@ static void bestVirtualIndex(WhereBestIdx *p){
** repeated in the output. */ ** repeated in the output. */
break; break;
} }
for(k=0; k<pIdxInfo->nOrderBy; k++){ /* A virtual table that is constrained by an IN clause may not
if( pIdxInfo->aOrderBy[k].iColumn==pIdxCons->iColumn ){ ** consume the ORDER BY clause because (1) the order of IN terms
sortOrder = pIdxInfo->aOrderBy[k].desc; ** is not necessarily related to the order of output terms and
break; ** (2) Multiple outputs from a single IN value will not merge
} ** together. */
} pIdxInfo->orderByConsumed = 0;
} }
} }
} }
@@ -2426,8 +2424,7 @@ static void bestVirtualIndex(WhereBestIdx *p){
} }
p->cost.plan.u.pVtabIdx = pIdxInfo; p->cost.plan.u.pVtabIdx = pIdxInfo;
if( pIdxInfo->orderByConsumed ){ if( pIdxInfo->orderByConsumed ){
assert( sortOrder==0 || sortOrder==1 ); p->cost.plan.wsFlags |= WHERE_ORDERED;
p->cost.plan.wsFlags |= WHERE_ORDERED + sortOrder*WHERE_REVERSE;
p->cost.plan.nOBSat = nOrderBy; p->cost.plan.nOBSat = nOrderBy;
}else{ }else{
p->cost.plan.nOBSat = p->i ? p->aLevel[p->i-1].plan.nOBSat : 0; p->cost.plan.nOBSat = p->i ? p->aLevel[p->i-1].plan.nOBSat : 0;