database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-11-16 23:02:26 +03:00
Code Activity

Fix a missing word in a comment. Enhance the "wheretrace" debugging output

Browse Source 
to show the estimated cost of each table option while planning the join order.

FossilOrigin-Name: ac4e119a87497f2e422ff1cb711112ed8594bfa9
This commit is contained in:
drh
2013-01-15 18:49:07 +00:00
parent 5d5cf01ee0
commit ea84a65e4e
3 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
manifest
View File

@@ -1,5 +1,5 @@
C Clarification\sto\sa\scomment\sin\swhere.c.\s\sNo\scode\schanges. C Fix\sa\smissing\sword\sin\sa\scomment.\s\sEnhance\sthe\s"wheretrace"\sdebugging\soutput\nto\sshow\sthe\sestimated\scost\sof\seach\stable\soption\swhile\splanning\sthe\sjoin\sorder.
D 2013-01-15T16:15:28.864 D 2013-01-15T18:49:07.627
F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
F Makefile.in a48faa9e7dd7d556d84f5456eabe5825dd8a6282 F Makefile.in a48faa9e7dd7d556d84f5456eabe5825dd8a6282
F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -252,7 +252,7 @@ F src/vtab.c b05e5f1f4902461ba9f5fc49bb7eb7c3a0741a83
F src/wal.c f5c7b5027d0ed0e9bc9afeb4a3a8dfea762ec7d2 F src/wal.c f5c7b5027d0ed0e9bc9afeb4a3a8dfea762ec7d2
F src/wal.h 29c197540b19044e6cd73487017e5e47a1d3dac6 F src/wal.h 29c197540b19044e6cd73487017e5e47a1d3dac6
F src/walker.c 3d75ba73de15e0f8cd0737643badbeb0e002f07b F src/walker.c 3d75ba73de15e0f8cd0737643badbeb0e002f07b
F src/where.c 9df0419ef7210a531a4fda890ab88f2baeea9755 F src/where.c b2a827f2b3fa23a3245a4e6093827e359c1e8054
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
@@ -1033,7 +1033,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 7e6007a0002f6989bd489abeba8db52acb4a6854 P 04507c176330a06b09dcafa35ec0ca7498f5ace7
R d0bbf16dad26659cda0048aa7cd24d37 R f5ddb099282326d8029eed3fa99d47e6
U drh U drh
Z e1bea2ae72c72e050882322d94f05fc5 Z f7bf9c2b2fa73cf7872c5f7a932db154

2
manifest.uuid
View File

@@ -1 +1 @@
04507c176330a06b09dcafa35ec0ca7498f5ace7 ac4e119a87497f2e422ff1cb711112ed8594bfa9

7
src/where.c
View File

@@ -3569,8 +3569,9 @@ static void bestBtreeIndex(WhereBestIdx *p){
|| p->cost.plan.u.pIdx==pSrc->pIndex || p->cost.plan.u.pIdx==pSrc->pIndex
); );
WHERETRACE((" best index is: %s\n", WHERETRACE((" best index is %s cost=%.1f\n",
p->cost.plan.u.pIdx ? p->cost.plan.u.pIdx->zName : "ipk")); p->cost.plan.u.pIdx ? p->cost.plan.u.pIdx->zName : "ipk",
p->cost.rCost));
bestOrClauseIndex(p); bestOrClauseIndex(p);
bestAutomaticIndex(p); bestAutomaticIndex(p);
@@ -5161,7 +5162,7 @@ WhereInfo *sqlite3WhereBegin(
if( isOptimal ){ if( isOptimal ){
pWInfo->a[j].rOptCost = sWBI.cost.rCost; pWInfo->a[j].rOptCost = sWBI.cost.rCost;
}else if( iFrom<nTabList-1 ){ }else if( iFrom<nTabList-1 ){
/* If two or more tables have nearly the same outer loop cost, /* If two or more tables have nearly the same outer loop cost, but
** very different inner loop (optimal) cost, we want to choose ** very different inner loop (optimal) cost, we want to choose
** for the outer loop that table which benefits the least from ** for the outer loop that table which benefits the least from
** being in the inner loop. The following code scales the ** being in the inner loop. The following code scales the