Use doclist indexes for AND queries as well as phrases.

FossilOrigin-Name: 5d38e6edc40ef188fbf96505073797036aa6783a

diff --git a/ext/fts5/fts5_expr.c b/ext/fts5/fts5_expr.c
index 82645a2619a2933c115a38e9d02ffbf7602ee6c1..b1fbe9ea970c9f09403be4d6d2d16a58a7ec96d7 100644 (file)
--- a/ext/fts5/fts5_expr.c
+++ b/ext/fts5/fts5_expr.c
@@ -641,7 +641,9 @@ static int fts5ExprAdvanceto(
 */
 static int fts5ExprNearNextRowidMatch(
   Fts5Expr *pExpr,                /* Expression pPhrase belongs to */
-  Fts5ExprNode *pNode
+  Fts5ExprNode *pNode,
+  int bFromValid,
+  i64 iFrom
 ){
   Fts5ExprNearset *pNear = pNode->pNear;
   int rc = SQLITE_OK;
@@ -654,6 +656,9 @@ static int fts5ExprNearNextRowidMatch(
   ** minimum rowid. Or, if the iterator is "ORDER BY rowid ASC", then it
   ** means the maximum rowid.  */
   iLast = sqlite3Fts5IterRowid(pNear->apPhrase[0]->aTerm[0].pIter);
+  if( bFromValid && (iFrom>iLast)==(pExpr->bAsc!=0) ){
+    iLast = iFrom;
+  }
 
   do {
     bMatch = 1;
@@ -693,7 +698,9 @@ static int fts5ExprNearNextRowidMatch(
 */
 static int fts5ExprNearNextMatch(
   Fts5Expr *pExpr,                /* Expression that pNear is a part of */
-  Fts5ExprNode *pNode
+  Fts5ExprNode *pNode,
+  int bFromValid,
+  i64 iFrom
 ){
   int rc = SQLITE_OK;
   Fts5ExprNearset *pNear = pNode->pNear;
@@ -701,7 +708,7 @@ static int fts5ExprNearNextMatch(
     int i;
 
     /* Advance the iterators until they all point to the same rowid */
-    rc = fts5ExprNearNextRowidMatch(pExpr, pNode);
+    rc = fts5ExprNearNextRowidMatch(pExpr, pNode, bFromValid, iFrom);
     if( pNode->bEof || rc!=SQLITE_OK ) break;
 
     for(i=0; i<pNear->nPhrase; i++){
@@ -769,7 +776,7 @@ static int fts5ExprNearInitAll(
 }
 
 /* fts5ExprNodeNext() calls fts5ExprNodeNextMatch(). And vice-versa. */
-static int fts5ExprNodeNextMatch(Fts5Expr*, Fts5ExprNode*);
+static int fts5ExprNodeNextMatch(Fts5Expr*, Fts5ExprNode*, int, i64);
 
 /*
 ** Compare the values currently indicated by the two nodes as follows:
@@ -799,7 +806,19 @@ static int fts5NodeCompare(
   }
 }
 
-static int fts5ExprNodeNext(Fts5Expr *pExpr, Fts5ExprNode *pNode){
+/*
+** Advance node iterator pNode, part of expression pExpr. If argument
+** bFromValid is zero, then pNode is advanced exactly once. Or, if argument
+** bFromValid is non-zero, then pNode is advanced until it is at or past
+** rowid value iFrom. Whether "past" means "less than" or "greater than"
+** depends on whether this is an ASC or DESC iterator.
+*/
+static int fts5ExprNodeNext(
+  Fts5Expr *pExpr, 
+  Fts5ExprNode *pNode,
+  int bFromValid,
+  i64 iFrom
+){
   int rc = SQLITE_OK;
 
   if( pNode->bEof==0 ){
@@ -810,8 +829,11 @@ static int fts5ExprNodeNext(Fts5Expr *pExpr, Fts5ExprNode *pNode){
       };
 
       case FTS5_AND: {
-        rc = fts5ExprNodeNext(pExpr, pNode->pLeft);
-        if( rc==SQLITE_OK ) rc = fts5ExprNodeNext(pExpr, pNode->pRight);
+        rc = fts5ExprNodeNext(pExpr, pNode->pLeft, bFromValid, iFrom);
+        if( rc==SQLITE_OK ){
+          /* todo: update (iFrom/bFromValid) here */
+          rc = fts5ExprNodeNext(pExpr, pNode->pRight, bFromValid, iFrom);
+        }
         break;
       }
 
@@ -821,23 +843,25 @@ static int fts5ExprNodeNext(Fts5Expr *pExpr, Fts5ExprNode *pNode){
         int cmp = fts5NodeCompare(pExpr, p1, p2);
 
         if( cmp==0 ){
-          rc = fts5ExprNodeNext(pExpr, p1);
-          if( rc==SQLITE_OK ) rc = fts5ExprNodeNext(pExpr, p2);
+          rc = fts5ExprNodeNext(pExpr, p1, bFromValid, iFrom);
+          if( rc==SQLITE_OK ){
+            rc = fts5ExprNodeNext(pExpr, p2, bFromValid, iFrom);
+          }
         }else{
-          rc = fts5ExprNodeNext(pExpr, (cmp < 0) ? p1 : p2);
+          rc = fts5ExprNodeNext(pExpr, (cmp < 0) ? p1 : p2, bFromValid, iFrom);
         }
 
         break;
       }
 
       default: assert( pNode->eType==FTS5_NOT ); {
-        rc = fts5ExprNodeNext(pExpr, pNode->pLeft);
+        rc = fts5ExprNodeNext(pExpr, pNode->pLeft, bFromValid, iFrom);
         break;
       }
     }
 
     if( rc==SQLITE_OK ){
-      rc = fts5ExprNodeNextMatch(pExpr, pNode);
+      rc = fts5ExprNodeNextMatch(pExpr, pNode, bFromValid, iFrom);
     }
   }
 
@@ -855,13 +879,18 @@ static void fts5ExprSetEof(Fts5ExprNode *pNode){
 /*
 **
 */
-static int fts5ExprNodeNextMatch(Fts5Expr *pExpr, Fts5ExprNode *pNode){
+static int fts5ExprNodeNextMatch(
+  Fts5Expr *pExpr, 
+  Fts5ExprNode *pNode,
+  int bFromValid,
+  i64 iFrom
+){
   int rc = SQLITE_OK;
   if( pNode->bEof==0 ){
     switch( pNode->eType ){
 
       case FTS5_STRING: {
-        rc = fts5ExprNearNextMatch(pExpr, pNode);
+        rc = fts5ExprNearNextMatch(pExpr, pNode, bFromValid, iFrom);
         break;
       }
 
@@ -869,14 +898,22 @@ static int fts5ExprNodeNextMatch(Fts5Expr *pExpr, Fts5ExprNode *pNode){
         Fts5ExprNode *p1 = pNode->pLeft;
         Fts5ExprNode *p2 = pNode->pRight;
 
+
         while( p1->bEof==0 && p2->bEof==0 && p2->iRowid!=p1->iRowid ){
           Fts5ExprNode *pAdv;
-          if( pExpr->bAsc ){
-            pAdv = (p1->iRowid < p2->iRowid) ? p1 : p2;
+          assert( pExpr->bAsc==0 || pExpr->bAsc==1 );
+          if( pExpr->bAsc==(p1->iRowid < p2->iRowid) ){
+            pAdv = p1;
+            if( bFromValid==0 || pExpr->bAsc==(p2->iRowid > iFrom) ){
+              iFrom = p2->iRowid;
+            }
           }else{
-            pAdv = (p1->iRowid > p2->iRowid) ? p1 : p2;
+            pAdv = p2;
+            if( bFromValid==0 || pExpr->bAsc==(p1->iRowid > iFrom) ){
+              iFrom = p1->iRowid;
+            }
           }
-          rc = fts5ExprNodeNext(pExpr, pAdv);
+          rc = fts5ExprNodeNext(pExpr, pAdv, 1, iFrom);
           if( rc!=SQLITE_OK ) break;
         }
         if( p1->bEof || p2->bEof ){
@@ -901,10 +938,10 @@ static int fts5ExprNodeNextMatch(Fts5Expr *pExpr, Fts5ExprNode *pNode){
         while( rc==SQLITE_OK ){
           int cmp;
           while( rc==SQLITE_OK && (cmp = fts5NodeCompare(pExpr, p1, p2))>0 ){
-            rc = fts5ExprNodeNext(pExpr, p2);
+            rc = fts5ExprNodeNext(pExpr, p2, bFromValid, iFrom);
           }
           if( rc || cmp ) break;
-          rc = fts5ExprNodeNext(pExpr, p1);
+          rc = fts5ExprNodeNext(pExpr, p1, bFromValid, iFrom);
         }
         pNode->bEof = p1->bEof;
         pNode->iRowid = p1->iRowid;
@@ -934,7 +971,7 @@ static int fts5ExprNodeFirst(Fts5Expr *pExpr, Fts5ExprNode *pNode){
 
     /* Attempt to advance to the first match */
     if( rc==SQLITE_OK && pNode->bEof==0 ){
-      rc = fts5ExprNearNextMatch(pExpr, pNode);
+      rc = fts5ExprNearNextMatch(pExpr, pNode, 0, 0);
     }
 
   }else{
@@ -943,7 +980,7 @@ static int fts5ExprNodeFirst(Fts5Expr *pExpr, Fts5ExprNode *pNode){
       rc = fts5ExprNodeFirst(pExpr, pNode->pRight);
     }
     if( rc==SQLITE_OK ){
-      rc = fts5ExprNodeNextMatch(pExpr, pNode);
+      rc = fts5ExprNodeNextMatch(pExpr, pNode, 0, 0);
     }
   }
   return rc;
@@ -976,7 +1013,7 @@ int sqlite3Fts5ExprFirst(Fts5Expr *p, Fts5Index *pIdx, int bAsc){
 */
 int sqlite3Fts5ExprNext(Fts5Expr *p){
   int rc;
-  rc = fts5ExprNodeNext(p, p->pRoot);
+  rc = fts5ExprNodeNext(p, p->pRoot, 0, 0);
   return rc;
 }
 

diff --git a/manifest b/manifest
index cca7f70664ad107effbfede7d4d8124b79ffd319..476c18f4f9f564a346edcec010abb1070ce07fb4 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Use\sdoclist-indexes\swith\s"ORDER\sBY\srowid\sASC"\sfts5\squeries\sas\swell.
-D 2014-08-05T19:00:22.438
+C Use\sdoclist\sindexes\sfor\sAND\squeries\sas\swell\sas\sphrases.
+D 2014-08-05T19:35:20.490
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in b03432313a3aad96c706f8164fb9f5307eaf19f5
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -109,7 +109,7 @@ F ext/fts5/fts5Int.h aef50f3078e60707aeb2e4b2787d8c5eecdd02dc
 F ext/fts5/fts5_aux.c 366057c7186bc3615deb5ecc0ff61de50b6d2dbc
 F ext/fts5/fts5_buffer.c 248c61ac9fec001602efc72a45704f3b8d367c00
 F ext/fts5/fts5_config.c f4ebf143e141b8c77355e3b15aba81b7be51d710
-F ext/fts5/fts5_expr.c 9402474456732ddb5019f83a77907852f108a96a
+F ext/fts5/fts5_expr.c 7b8e380233176053841904a86006696ee8f6cd24
 F ext/fts5/fts5_index.c 40d9086948d6f1420a078bd9fb0b5372e54ec791
 F ext/fts5/fts5_storage.c 2866e7e1de9dc851756c3a9c76b6e1d75e0facb7
 F ext/fts5/fts5parse.y 777da8e5819f75c217982c79c29d014c293acac9
@@ -1199,7 +1199,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P 90b82d3ef613b2915e0e280dc1d2e5a2b617d59c
-R 0266e2e08ce753d75d582fc91e12512e
+P d028ba6589f3122b635474c2683c0f93d5bc6c7c
+R df749c2987e3f7fa39a4c1c54f5a22e6
 U dan
-Z 1a32a19af984c36e1b27a239a8950f8a
+Z 78f1e7641fc2b68987e4a3c99853c1c0

diff --git a/manifest.uuid b/manifest.uuid
index 42fda0330831cfeeb1e36dd063c52187406ed94c..41e7ea9f1547d18ac13211a926d3e362792f4f3d 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-d028ba6589f3122b635474c2683c0f93d5bc6c7c
\ No newline at end of file
+5d38e6edc40ef188fbf96505073797036aa6783a
\ No newline at end of file