diff options
| author | drh <drh@noemail.net> | 2013-06-11 02:32:50 +0000 |
|---|---|---|
| committer | drh <drh@noemail.net> | 2013-06-11 02:32:50 +0000 |
| commit | 8a4380d76156ba0ffbcdb64b5e37f82dee6385c6 (patch) | |
| tree | a86fb4d78bd38d66289dad3d4f63fda4733af6ab /src | |
| parent | 8636e9c55cb46f8923ebbb8a1014010d9c813472 (diff) | |
| download | sqlite-8a4380d76156ba0ffbcdb64b5e37f82dee6385c6.tar.gz sqlite-8a4380d76156ba0ffbcdb64b5e37f82dee6385c6.zip | |
Fixes to EXPLAIN QUERY PLAN output. Change weights back to something closer
to what they are in legacy. More test case fixes.
FossilOrigin-Name: 36373b85f9a97840aa06e24ae31c12fcfbae084e
Diffstat (limited to 'src')
| -rw-r--r-- | src/select.c | 7 | ||||
| -rw-r--r-- | src/where.c | 2 |
2 files changed, 4 insertions, 5 deletions
diff --git a/src/select.c b/src/select.c index ee994a8c2..8972faacc 100644 --- a/src/select.c +++ b/src/select.c @@ -3884,11 +3884,10 @@ static void explainSimpleCount( Index *pIdx /* Index used to optimize scan, or NULL */ ){ if( pParse->explain==2 ){ - char *zEqp = sqlite3MPrintf(pParse->db, "SCAN TABLE %s %s%s(~%d rows)", + char *zEqp = sqlite3MPrintf(pParse->db, "SCAN TABLE %s%s%s", pTab->zName, - pIdx ? "USING COVERING INDEX " : "", - pIdx ? pIdx->zName : "", - pTab->nRowEst + pIdx ? " USING COVERING INDEX " : "", + pIdx ? pIdx->zName : "" ); sqlite3VdbeAddOp4( pParse->pVdbe, OP_Explain, pParse->iSelectId, 0, 0, zEqp, P4_DYNAMIC diff --git a/src/where.c b/src/where.c index 4a27b9e38..330faf771 100644 --- a/src/where.c +++ b/src/where.c @@ -4308,7 +4308,7 @@ static int whereLoopAddBtreeIndex( }else{ /* Each row involves a step of the index, then a binary search of ** the main table */ - WhereCost rStepAndSearch = rLogSize>80 ? rLogSize-80 : 1; + WhereCost rStepAndSearch = whereCostAdd(10, rLogSize>17 ? rLogSize-17 : 1); pNew->rRun = whereCostAdd(pNew->rRun, rStepAndSearch); } /* TBD: Adjust nOut for additional constraints */ |