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

More bug fixes to the WhereLoop generator and the solver in NGQP.

Browse Source 
Now finds the best plan for TPC-H Q8.  This seems to prove the
concept, but there is still much work to be done.

FossilOrigin-Name: 8e5aad37529ec3042e3468acf15186f566e2df8a
This commit is contained in:
drh
2013-05-08 04:22:59 +00:00
parent f204dac1e3
commit a184fb87b8
3 changed files with 21 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/where.c
View File

@@ -710,15 +710,6 @@ WhereTerm *whereScanNext(WhereScan *pScan){
iColumn = pScan->aEquiv[pScan->iEquiv-1];
while( (pWC = pScan->pWC)!=0 ){
for(pTerm=pWC->a+pScan->k; pScan->k<pWC->nTerm; pScan->k++, pTerm++){
if( pTerm->iParent>=0 ){
WhereTerm *pParent = &pWC->a[pTerm->iParent];
int j;
for(j=pScan->iEquiv-4; j>=0; j-=2 ){
if( pParent->leftCursor==pScan->aEquiv[j]
&& pParent->u.leftColumn==pScan->aEquiv[j+1] ) break;
}
if( j>=0 ) continue;
}
if( pTerm->leftCursor==iCur && pTerm->u.leftColumn==iColumn ){
if( (pTerm->eOperator & WO_EQUIV)!=0
&& pScan->nEquiv<ArraySize(pScan->aEquiv)
@@ -754,6 +745,13 @@ WhereTerm *whereScanNext(WhereScan *pScan){
continue;
}
}
if( (pTerm->eOperator & WO_EQ)!=0
&& (pX = pTerm->pExpr->pRight)->op==TK_COLUMN
&& pX->iTable==pScan->aEquiv[0]
&& pX->iColumn==pScan->aEquiv[1]
){
continue;
}
pScan->pCurrent = pTerm;
pScan->k++;
return pTerm;
@@ -5058,13 +5056,14 @@ static void whereLoopPrint(WhereLoop *p, SrcList *pTabList){
int nb = 2*((pTabList->nSrc+15)/16);
struct SrcList_item *pItem = pTabList->a + p->iTab;
Table *pTab = pItem->pTab;
sqlite3DebugPrintf("%02d.%0*llx", p->iTab, nb, p->prereq);
sqlite3DebugPrintf(" %6s",
sqlite3DebugPrintf("%2d.%0*llx.%0*llx",
p->iTab, nb, p->maskSelf, nb, p->prereq);
sqlite3DebugPrintf(" %8s",
pItem->zAlias ? pItem->zAlias : pTab->zName);
if( p->pIndex ){
sqlite3DebugPrintf(".%-8s %2d", p->pIndex->zName, p->nEq);
sqlite3DebugPrintf(".%-12s %2d", p->pIndex->zName, p->nEq);
}else{
sqlite3DebugPrintf("%12s","");
sqlite3DebugPrintf("%16s","");
}
sqlite3DebugPrintf(" fg %08x OB %d,%d N %2d",
p->wsFlags, p->iOb, p->nOb, p->nTerm);
@@ -5282,7 +5281,7 @@ static void whereLoopAddBtree(
pNew = pBuilder->pNew;
db = pBuilder->db;
pSrc = pBuilder->pTabList->a + iTab;
pNew->maskSelf = getMask(pBuilder->pWC->pMaskSet, iTab);
pNew->maskSelf = getMask(pBuilder->pWC->pMaskSet, pSrc->iCursor);
if( pSrc->pIndex ){
/* An INDEXED BY clause specifies a particular index to use */
@@ -5460,7 +5459,7 @@ static int wherePathSolver(WhereInfo *pWInfo){
if( nTo<mxChoice ){
jj = nTo++;
}else{
for(jj=nTo-1; aTo[jj].rCost>=mxCost; jj++){ assert(jj>0); }
for(jj=nTo-1; aTo[jj].rCost>=mxCost; jj--){ assert(jj>0); }
}
pTo = &aTo[jj];
}else{