database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-07-29 08:01:23 +03:00
Code Activity

Added tests for the new IN operator optimizer and fixed a bug that the

Browse Source 
new tests found.  This completes the implementation of enhancement #63. (CVS 612)

FossilOrigin-Name: 2a710e18176c486525f0abb06644a511a2cd1d7a
This commit is contained in:
drh
2002-06-09 01:55:20 +00:00
parent d9e3093038
commit 48185c15c7
4 changed files with 99 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/where.c
View File

@ -13,7 +13,7 @@
** the WHERE clause of SQL statements. Also found here are subroutines
** to generate VDBE code to evaluate expressions.
**
** $Id: where.c,v 1.49 2002/06/08 23:25:10 drh Exp $
** $Id: where.c,v 1.50 2002/06/09 01:55:20 drh Exp $
*/
#include "sqliteInt.h"
@ -338,7 +338,8 @@ WhereInfo *sqliteWhereBegin(
for(pIdx=pTab->pIndex; pIdx; pIdx=pIdx->pNext){
int eqMask = 0; /* Index columns covered by an x=... constraint */
int ltMask = 0; /* Index columns covered by an x<... constraint */
int gtMask = 0; /* Index columns covered by an x>... constraing */
int gtMask = 0; /* Index columns covered by an x>... constraint */
int inMask = 0; /* Index columns covered by an x IN .. constraint */
int nEq, m, score;
if( pIdx->isDropped ) continue; /* Ignore dropped indices */
@ -351,7 +352,10 @@ WhereInfo *sqliteWhereBegin(
for(k=0; k<pIdx->nColumn; k++){
if( pIdx->aiColumn[k]==iColumn ){
switch( aExpr[j].p->op ){
case TK_IN:
case TK_IN: {
if( k==0 ) inMask |= 1;
break;
}
case TK_EQ: {
eqMask |= 1<<k;
break;
@ -416,6 +420,7 @@ WhereInfo *sqliteWhereBegin(
m = 1<<nEq;
if( m & ltMask ) score++;
if( m & gtMask ) score+=2;
if( score==0 && inMask ) score = 4;
if( score>bestScore ){
pBestIdx = pIdx;
bestScore = score;