From: dan <dan@noemail.net>
Date: Thu, 10 May 2012 17:43:14 +0000 (+0000)
Subject: Have the FTS auxiliary functions correctly handle terms that appear in non-matching... 
X-Git-Tag: version-3.7.12~11
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5cfed52dd1a2a9038efcf0561f7bdf4cd756d50d;p=thirdparty%2Fsqlite.git

Have the FTS auxiliary functions correctly handle terms that appear in non-matching branches of the FTS expression. Fix for [bdc6bbbb38].

FossilOrigin-Name: 4d3e1673b309a3d6a6cac01d67dfd79a8007f991
---

diff --git a/ext/fts3/fts3.c b/ext/fts3/fts3.c
index f9aef774aa..f80e303b56 100644
--- a/ext/fts3/fts3.c
+++ b/ext/fts3/fts3.c
@@ -3945,7 +3945,7 @@ void sqlite3Fts3DoclistPrev(
   int nDoclist,                   /* Length of aDoclist in bytes */
   char **ppIter,                  /* IN/OUT: Iterator pointer */
   sqlite3_int64 *piDocid,         /* IN/OUT: Docid pointer */
-  int *pnList,                    /* IN/OUT: List length pointer */
+  int *pnList,                    /* OUT: List length pointer */
   u8 *pbEof                       /* OUT: End-of-file flag */
 ){
   char *p = *ppIter;
@@ -3992,6 +3992,41 @@ void sqlite3Fts3DoclistPrev(
   }
 }
 
+/*
+** Iterate forwards through a doclist.
+*/
+void sqlite3Fts3DoclistNext(
+  int bDescIdx,                   /* True if the doclist is desc */
+  char *aDoclist,                 /* Pointer to entire doclist */
+  int nDoclist,                   /* Length of aDoclist in bytes */
+  char **ppIter,                  /* IN/OUT: Iterator pointer */
+  sqlite3_int64 *piDocid,         /* IN/OUT: Docid pointer */
+  u8 *pbEof                       /* OUT: End-of-file flag */
+){
+  char *p = *ppIter;
+
+  assert( nDoclist>0 );
+  assert( *pbEof==0 );
+  assert( p || *piDocid==0 );
+  assert( !p || (p>=aDoclist && p<=&aDoclist[nDoclist]) );
+
+  if( p==0 ){
+    p = aDoclist;
+    p += sqlite3Fts3GetVarint(p, piDocid);
+  }else{
+    fts3PoslistCopy(0, &p);
+    if( p>=&aDoclist[nDoclist] ){
+      *pbEof = 1;
+    }else{
+      sqlite3_int64 iVar;
+      p += sqlite3Fts3GetVarint(p, &iVar);
+      *piDocid += ((bDescIdx ? -1 : 1) * iVar);
+    }
+  }
+
+  *ppIter = p;
+}
+
 /*
 ** Attempt to move the phrase iterator to point to the next matching docid. 
 ** If an error occurs, return an SQLite error code. Otherwise, return 
@@ -5147,26 +5182,87 @@ int sqlite3Fts3EvalPhraseStats(
 ** This function works regardless of whether or not the phrase is deferred,
 ** incremental, or neither.
 */
-char *sqlite3Fts3EvalPhrasePoslist(
+int sqlite3Fts3EvalPhrasePoslist(
   Fts3Cursor *pCsr,               /* FTS3 cursor object */
   Fts3Expr *pExpr,                /* Phrase to return doclist for */
-  int iCol                        /* Column to return position list for */
+  int iCol,                       /* Column to return position list for */
+  char **ppOut                    /* OUT: Pointer to position list */
 ){
   Fts3Phrase *pPhrase = pExpr->pPhrase;
   Fts3Table *pTab = (Fts3Table *)pCsr->base.pVtab;
-  char *pIter = pPhrase->doclist.pList;
+  char *pIter;
   int iThis;
+  sqlite3_int64 iDocid;
 
+  /* If this phrase is applies specifically to some column other than 
+  ** column iCol, return a NULL pointer.  */
+  *ppOut = 0;
   assert( iCol>=0 && iCol<pTab->nColumn );
-  if( !pIter 
-   || pExpr->bEof 
-   || pExpr->iDocid!=pCsr->iPrevId
-   || (pPhrase->iColumn<pTab->nColumn && pPhrase->iColumn!=iCol) 
-  ){
-    return 0;
+  if( (pPhrase->iColumn<pTab->nColumn && pPhrase->iColumn!=iCol) ){
+    return SQLITE_OK;
+  }
+
+  iDocid = pExpr->iDocid;
+  pIter = pPhrase->doclist.pList;
+  if( iDocid!=pCsr->iPrevId || pExpr->bEof ){
+    int bDescDoclist = pTab->bDescIdx;      /* For DOCID_CMP macro */
+    int bOr = 0;
+    u8 bEof = 0;
+    Fts3Expr *p;
+
+    /* Check if this phrase descends from an OR expression node. If not, 
+    ** return NULL. Otherwise, the entry that corresponds to docid 
+    ** pCsr->iPrevId may lie earlier in the doclist buffer. */
+    for(p=pExpr->pParent; p; p=p->pParent){
+      if( p->eType==FTSQUERY_OR ) bOr = 1;
+    }
+    if( bOr==0 ) return SQLITE_OK;
+
+    /* This is the descendent of an OR node. In this case we cannot use
+    ** an incremental phrase. Load the entire doclist for the phrase
+    ** into memory in this case.  */
+    if( pPhrase->bIncr ){
+      int rc = SQLITE_OK;
+      int bEofSave = pExpr->bEof;
+      fts3EvalRestart(pCsr, pExpr, &rc);
+      while( rc==SQLITE_OK && !pExpr->bEof ){
+        fts3EvalNextRow(pCsr, pExpr, &rc);
+        if( bEofSave==0 && pExpr->iDocid==iDocid ) break;
+      }
+      pIter = pPhrase->doclist.pList;
+      assert( rc!=SQLITE_OK || pPhrase->bIncr==0 );
+      if( rc!=SQLITE_OK ) return rc;
+    }
+
+    if( pExpr->bEof ){
+      pIter = 0;
+      iDocid = 0;
+    }
+    bEof = (pPhrase->doclist.nAll==0);
+    assert( bDescDoclist==0 || bDescDoclist==1 );
+    assert( pCsr->bDesc==0 || pCsr->bDesc==1 );
+
+    if( pCsr->bDesc==bDescDoclist ){
+      int dummy;
+      while( (pIter==0 || DOCID_CMP(iDocid, pCsr->iPrevId)>0 ) && bEof==0 ){
+        sqlite3Fts3DoclistPrev(
+            bDescDoclist, pPhrase->doclist.aAll, pPhrase->doclist.nAll, 
+            &pIter, &iDocid, &dummy, &bEof
+        );
+      }
+    }else{
+      while( (pIter==0 || DOCID_CMP(iDocid, pCsr->iPrevId)<0 ) && bEof==0 ){
+        sqlite3Fts3DoclistNext(
+            bDescDoclist, pPhrase->doclist.aAll, pPhrase->doclist.nAll, 
+            &pIter, &iDocid, &bEof
+        );
+      }
+    }
+
+    if( bEof || iDocid!=pCsr->iPrevId ) pIter = 0;
   }
+  if( pIter==0 ) return SQLITE_OK;
 
-  assert( pPhrase->doclist.nList>0 );
   if( *pIter==0x01 ){
     pIter++;
     pIter += sqlite3Fts3GetVarint32(pIter, &iThis);
@@ -5180,7 +5276,8 @@ char *sqlite3Fts3EvalPhrasePoslist(
     pIter += sqlite3Fts3GetVarint32(pIter, &iThis);
   }
 
-  return ((iCol==iThis)?pIter:0);
+  *ppOut = ((iCol==iThis)?pIter:0);
+  return SQLITE_OK;
 }
 
 /*
diff --git a/ext/fts3/fts3Int.h b/ext/fts3/fts3Int.h
index 7d6c34789f..a60b4b6849 100644
--- a/ext/fts3/fts3Int.h
+++ b/ext/fts3/fts3Int.h
@@ -535,7 +535,7 @@ int sqlite3Fts3MsrIncrStart(
     Fts3Table*, Fts3MultiSegReader*, int, const char*, int);
 int sqlite3Fts3MsrIncrNext(
     Fts3Table *, Fts3MultiSegReader *, sqlite3_int64 *, char **, int *);
-char *sqlite3Fts3EvalPhrasePoslist(Fts3Cursor *, Fts3Expr *, int iCol); 
+int sqlite3Fts3EvalPhrasePoslist(Fts3Cursor *, Fts3Expr *, int iCol, char **); 
 int sqlite3Fts3MsrOvfl(Fts3Cursor *, Fts3MultiSegReader *, int *);
 int sqlite3Fts3MsrIncrRestart(Fts3MultiSegReader *pCsr);
 
diff --git a/ext/fts3/fts3_snippet.c b/ext/fts3/fts3_snippet.c
index dd3706cc80..6fce3d0a69 100644
--- a/ext/fts3/fts3_snippet.c
+++ b/ext/fts3/fts3_snippet.c
@@ -360,10 +360,11 @@ static int fts3SnippetFindPositions(Fts3Expr *pExpr, int iPhrase, void *ctx){
   SnippetIter *p = (SnippetIter *)ctx;
   SnippetPhrase *pPhrase = &p->aPhrase[iPhrase];
   char *pCsr;
+  int rc;
 
   pPhrase->nToken = pExpr->pPhrase->nToken;
-
-  pCsr = sqlite3Fts3EvalPhrasePoslist(p->pCsr, pExpr, p->iCol);
+  rc = sqlite3Fts3EvalPhrasePoslist(p->pCsr, pExpr, p->iCol, &pCsr);
+  assert( rc==SQLITE_OK || pCsr==0 );
   if( pCsr ){
     int iFirst = 0;
     pPhrase->pList = pCsr;
@@ -374,10 +375,12 @@ static int fts3SnippetFindPositions(Fts3Expr *pExpr, int iPhrase, void *ctx){
     pPhrase->iHead = iFirst;
     pPhrase->iTail = iFirst;
   }else{
-    assert( pPhrase->pList==0 && pPhrase->pHead==0 && pPhrase->pTail==0 );
+    assert( rc!=SQLITE_OK || (
+       pPhrase->pList==0 && pPhrase->pHead==0 && pPhrase->pTail==0 
+    ));
   }
 
-  return SQLITE_OK;
+  return rc;
 }
 
 /*
@@ -770,13 +773,14 @@ static int fts3ExprLocalHitsCb(
   int iPhrase,                    /* Phrase number */
   void *pCtx                      /* Pointer to MatchInfo structure */
 ){
+  int rc = SQLITE_OK;
   MatchInfo *p = (MatchInfo *)pCtx;
   int iStart = iPhrase * p->nCol * 3;
   int i;
 
-  for(i=0; i<p->nCol; i++){
+  for(i=0; i<p->nCol && rc==SQLITE_OK; i++){
     char *pCsr;
-    pCsr = sqlite3Fts3EvalPhrasePoslist(p->pCursor, pExpr, i);
+    rc = sqlite3Fts3EvalPhrasePoslist(p->pCursor, pExpr, i, &pCsr);
     if( pCsr ){
       p->aMatchinfo[iStart+i*3] = fts3ColumnlistCount(&pCsr);
     }else{
@@ -784,7 +788,7 @@ static int fts3ExprLocalHitsCb(
     }
   }
 
-  return SQLITE_OK;
+  return rc;
 }
 
 static int fts3MatchinfoCheck(
@@ -945,8 +949,10 @@ static int fts3MatchinfoLcs(Fts3Cursor *pCsr, MatchInfo *pInfo){
     int nLive = 0;                /* Number of iterators in aIter not at EOF */
 
     for(i=0; i<pInfo->nPhrase; i++){
+      int rc;
       LcsIterator *pIt = &aIter[i];
-      pIt->pRead = sqlite3Fts3EvalPhrasePoslist(pCsr, pIt->pExpr, iCol);
+      rc = sqlite3Fts3EvalPhrasePoslist(pCsr, pIt->pExpr, iCol, &pIt->pRead);
+      if( rc!=SQLITE_OK ) return rc;
       if( pIt->pRead ){
         pIt->iPos = pIt->iPosOffset;
         fts3LcsIteratorAdvance(&aIter[i]);
@@ -1298,9 +1304,10 @@ static int fts3ExprTermOffsetInit(Fts3Expr *pExpr, int iPhrase, void *ctx){
   int iTerm;                      /* For looping through nTerm phrase terms */
   char *pList;                    /* Pointer to position list for phrase */
   int iPos = 0;                   /* First position in position-list */
+  int rc;
 
   UNUSED_PARAMETER(iPhrase);
-  pList = sqlite3Fts3EvalPhrasePoslist(p->pCsr, pExpr, p->iCol);
+  rc = sqlite3Fts3EvalPhrasePoslist(p->pCsr, pExpr, p->iCol, &pList);
   nTerm = pExpr->pPhrase->nToken;
   if( pList ){
     fts3GetDeltaPosition(&pList, &iPos);
@@ -1314,7 +1321,7 @@ static int fts3ExprTermOffsetInit(Fts3Expr *pExpr, int iPhrase, void *ctx){
     pT->iPos = iPos;
   }
 
-  return SQLITE_OK;
+  return rc;
 }
 
 /*
diff --git a/manifest b/manifest
index aff02237ad..c2d347fb9a 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Further\schanges\sto\sconstraint\sparsing\sto\ssupport\slegacy\ssyntax.
-D 2012-05-08T11:17:33.934
+C Have\sthe\sFTS\sauxiliary\sfunctions\scorrectly\shandle\sterms\sthat\sappear\sin\snon-matching\sbranches\sof\sthe\sFTS\sexpression.\sFix\sfor\s[bdc6bbbb38].
+D 2012-05-10T17:43:14.961
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 2f37e468503dbe79d35c9f6dffcf3fae1ae9ec20
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -55,16 +55,16 @@ F ext/fts3/README.content fdc666a70d5257a64fee209f97cf89e0e6e32b51
 F ext/fts3/README.syntax a19711dc5458c20734b8e485e75fb1981ec2427a
 F ext/fts3/README.tokenizers 998756696647400de63d5ba60e9655036cb966e9
 F ext/fts3/README.txt 8c18f41574404623b76917b9da66fcb0ab38328d
-F ext/fts3/fts3.c 111626ce72b0df93f509ebd14ce31804fed24be0
+F ext/fts3/fts3.c a7adf6747d1fdd627ecd421c1709996741ca6693
 F ext/fts3/fts3.h 3a10a0af180d502cecc50df77b1b22df142817fe
-F ext/fts3/fts3Int.h 5fd2ec4e47faf17bf4a508d6b8ec5fc0f2c80bff
+F ext/fts3/fts3Int.h aca752b99c15ee738f5bcf0910eafb9e4aeb1b97
 F ext/fts3/fts3_aux.c 5205182bd8f372782597888156404766edf5781e
 F ext/fts3/fts3_expr.c dbc7ba4c3a6061adde0f38ed8e9b349568299551
 F ext/fts3/fts3_hash.c 8dd2d06b66c72c628c2732555a32bc0943114914
 F ext/fts3/fts3_hash.h 8331fb2206c609f9fc4c4735b9ab5ad6137c88ec
 F ext/fts3/fts3_icu.c 62ec177c55f6a5c6e994dd3e5fd3194b4045c347
 F ext/fts3/fts3_porter.c a465b49fcb8249a755792f87516eff182efa42b3
-F ext/fts3/fts3_snippet.c 51a3a34c217e24678a133782c1dfb6f2f70fe559
+F ext/fts3/fts3_snippet.c bf67520ae9d2352a65368ed101729ff701c08808
 F ext/fts3/fts3_term.c a521f75132f9a495bdca1bdd45949b3191c52763
 F ext/fts3/fts3_test.c 348f7d08cae05285794e23dc4fe8b8fdf66e264a
 F ext/fts3/fts3_tokenizer.c 3da7254a9881f7e270ab28e2004e0d22b3212bce
@@ -282,7 +282,7 @@ F test/autoindex1.test 058d0b331ae6840a61bbee910d8cbae27bfd5991
 F test/autovacuum.test fcaf4616ae5bb18098db1cb36262565e5c841c3c
 F test/autovacuum_ioerr2.test 8a367b224183ad801e0e24dcb7d1501f45f244b4
 F test/avtrans.test 0252654f4295ddda3b2cce0e894812259e655a85
-F test/backcompat.test 94778872ed9f6158ba1b8534264d3413ae7e27f8
+F test/backcompat.test bccbc64769d9c755ad65ee7c2f7336b86e3cc0c8
 F test/backup.test 717346db953e9e435c2a94916e4af177330d60d3
 F test/backup2.test 34986ef926ea522911a51dfdb2f8e99b7b75ebcf
 F test/backup_ioerr.test 40d208bc9224b666ee3ed423f49bc9062a36a9d0
@@ -460,7 +460,7 @@ F test/fts3am.test 218aa6ba0dfc50c7c16b2022aac5c6be593d08d8
 F test/fts3an.test a49ccadc07a2f7d646ec1b81bc09da2d85a85b18
 F test/fts3ao.test e7b80272efcced57d1d087a9da5c690dd7c21fd9
 F test/fts3atoken.test 402ef2f7c2fb4b3d4fa0587df6441c1447e799b3
-F test/fts3auto.test 868a2afea308d7d8b45ef29fcf022644a9e6d662
+F test/fts3auto.test b39f3f51227aea145eae6638690355dbdf9abf18
 F test/fts3aux1.test 0b02743955d56fc0d4d66236a26177bd1b726de0
 F test/fts3b.test e93bbb653e52afde110ad53bbd793f14fe7a8984
 F test/fts3c.test fc723a9cf10b397fdfc2b32e73c53c8b1ec02958
@@ -768,6 +768,7 @@ F test/tkt-b1d3a2e531.test 610ef582413171b379652663111b1f996d9f8f78
 F test/tkt-b351d95f9.test d14a503c414c5c58fdde3e80f9a3cfef986498c0
 F test/tkt-b72787b1.test a95e8cdad0b98af1853ac7f0afd4ab27b77bf5f3
 F test/tkt-bd484a090c.test 60460bf946f79a79712b71f202eda501ca99b898
+F test/tkt-bdc6bbbb38.test 1ec1c8e0fd0d294dc5d6de1a65eab8bb1b565ebf
 F test/tkt-c48d99d690.test bed446e3513ae10eec1b86fdd186ef750226c408
 F test/tkt-cbd054fa6b.test bd9fb546f63bc0c79d1776978d059fa51c5b1c63
 F test/tkt-d11f09d36e.test fb44f7961aa6d4b632fb7b9768239832210b5fc7
@@ -996,7 +997,7 @@ F tool/tostr.awk e75472c2f98dd76e06b8c9c1367f4ab07e122d06
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
 F tool/warnings-clang.sh a8a0a3babda96dfb1ff51adda3cbbf3dfb7266c2
 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
-P a1c014d8a87c8940b3a037d8d8cc4d5678809802
-R b6207703cdccfd3ac416f9da168138e7
-U drh
-Z c70e51594d9a44ff78a8a89d0fd856a7
+P 38bf90af1ede6ee64ef7be66392e895e60c9126e
+R 8aa768ab15356f78201e8a08039f9508
+U dan
+Z 18c4ee9f4eaf33e7622486489a2f279a
diff --git a/manifest.uuid b/manifest.uuid
index 007ef38e63..ff4c44c6c0 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-38bf90af1ede6ee64ef7be66392e895e60c9126e
\ No newline at end of file
+4d3e1673b309a3d6a6cac01d67dfd79a8007f991
\ No newline at end of file
diff --git a/test/backcompat.test b/test/backcompat.test
index 6a0f91ae97..509dfe530c 100644
--- a/test/backcompat.test
+++ b/test/backcompat.test
@@ -251,96 +251,98 @@ do_allbackcompat_test {
 # Test that FTS3 tables may be read/written by different versions of 
 # SQLite. 
 #
-set contents {
-  CREATE VIRTUAL TABLE t1 USING fts3(a, b);
-}
-foreach {num doc} {
-  one "jk zm jk eczkjblu urvysbnykk sk gnl jk ttvgf hmjf"
-  two "jk bnhc jjrxpjkb mjpavjuhw fibokdry igju jk zm zm xh"
-  three "wxe ogttbykvt uhzq xr iaf zf urvysbnykk aayxpmve oacaxgjoo mjpavjuhw"
-  four "gazrt jk ephknonq myjp uenvbm wuvajhwqz jk zm xnxhf nvfasfh"
-  five "zm aayxpmve csjqxhgj xnxhf xr jk aayxpmve xnxhf zm zm"
-  six "sokcyf zm ogyavjvv jk zm fibokdry zm jk igju igju"
-  seven "vgsld bvgimjik xuprtlyle jk akmikrqyt jk aayxpmve hkfoudzftq ddjj"
-  eight "zm uhzq ovkyevlgv zk uenvbm csjqxhgj jk vgsld pgybs jk"
-  nine  "zm agmckuiu zexh fibokdry jk uhzq bu tugflixoex xnxhf sk"
-} {
-  append contents "INSERT INTO t1 VALUES('$num', '$doc');"
-}
-do_allbackcompat_test {
-  if {[code1 {set ::sqlite_options(fts3)}]
-   && [code2 {set ::sqlite_options(fts3)}]
+ifcapable fts3 {
+  set contents {
+    CREATE VIRTUAL TABLE t1 USING fts3(a, b);
+  }
+  foreach {num doc} {
+    one "jk zm jk eczkjblu urvysbnykk sk gnl jk ttvgf hmjf"
+    two "jk bnhc jjrxpjkb mjpavjuhw fibokdry igju jk zm zm xh"
+    three "wxe ogttbykvt uhzq xr iaf zf urvysbnykk aayxpmve oacaxgjoo mjpavjuhw"
+    four "gazrt jk ephknonq myjp uenvbm wuvajhwqz jk zm xnxhf nvfasfh"
+    five "zm aayxpmve csjqxhgj xnxhf xr jk aayxpmve xnxhf zm zm"
+    six "sokcyf zm ogyavjvv jk zm fibokdry zm jk igju igju"
+    seven "vgsld bvgimjik xuprtlyle jk akmikrqyt jk aayxpmve hkfoudzftq ddjj"
+    eight "zm uhzq ovkyevlgv zk uenvbm csjqxhgj jk vgsld pgybs jk"
+    nine  "zm agmckuiu zexh fibokdry jk uhzq bu tugflixoex xnxhf sk"
   } {
-
-    do_test backcompat-3.1 { sql1 $contents } {}
-
-    foreach {n q} {
-      1    "SELECT * FROM t1 ORDER BY a, b"
-      2    "SELECT rowid FROM t1 WHERE a MATCH 'five'"
-      3    "SELECT * FROM t1 WHERE a MATCH 'five'"
-      4    "SELECT offsets(t1) FROM t1 WHERE t1 MATCH 'jk'"
-      5    "SELECT offsets(t1) FROM t1 WHERE t1 MATCH 'tug* OR eight'"
-    } {
-      do_test backcompat-3.2 [list sql1 $q] [sql2 $q]
-    }
-
-    do_test backcompat-3.3 { sql1 {
-      INSERT INTO t1 SELECT * FROM t1;
-      INSERT INTO t1 SELECT * FROM t1;
-      INSERT INTO t1 SELECT * FROM t1;
-      INSERT INTO t1 SELECT * FROM t1;
-      INSERT INTO t1 SELECT * FROM t1;
-      INSERT INTO t1 SELECT * FROM t1;
-      INSERT INTO t1 SELECT * FROM t1;
-      INSERT INTO t1 SELECT * FROM t1;
-    } } {}
-
-    foreach {n q} {
-      1    "SELECT * FROM t1 ORDER BY a, b"
-      2    "SELECT rowid FROM t1 WHERE a MATCH 'five'"
-      3    "SELECT * FROM t1 WHERE a MATCH 'five'"
-      4    "SELECT offsets(t1) FROM t1 WHERE t1 MATCH 'jk'"
-      5    "SELECT offsets(t1) FROM t1 WHERE t1 MATCH 'tug* OR eight'"
-    } {
-      do_test backcompat-3.4 [list sql1 $q] [sql2 $q]
-    }
-
-    set alphabet "a b c d e f g h i j k l m n o p q r s t u v w x y z 1 2 3 4"
-    for {set i 0} {$i < 900} {incr i} {
-      set term "[lindex $alphabet [expr $i/30]][lindex $alphabet [expr $i%30]] "
-      sql1 "INSERT INTO t1 VALUES($i, '[string repeat $term 14]')"
-    }
-
-    foreach {n q} {
-      1    "SELECT * FROM t1 ORDER BY a, b"
-      2    "SELECT rowid FROM t1 WHERE a MATCH 'five'"
-      3    "SELECT * FROM t1 WHERE a MATCH 'five'"
-      4    "SELECT offsets(t1) FROM t1 WHERE t1 MATCH 'jk'"
-      5    "SELECT offsets(t1) FROM t1 WHERE t1 MATCH 'tug* OR eight'"
-
-      6    "SELECT offsets(t1) FROM t1 WHERE t1 MATCH 'aa'"
-      7    "SELECT offsets(t1) FROM t1 WHERE t1 MATCH '44'"
-      8    "SELECT offsets(t1) FROM t1 WHERE t1 MATCH 'a*'"
-    } {
-      do_test backcompat-3.5 [list sql1 $q] [sql2 $q]
-    }
-
-    do_test backcompat-3.6 { 
-      sql1 "SELECT optimize(t1) FROM t1 LIMIT 1" 
-    } {{Index optimized}}
-
-    foreach {n q} {
-      1    "SELECT * FROM t1 ORDER BY a, b"
-      2    "SELECT rowid FROM t1 WHERE a MATCH 'five'"
-      3    "SELECT * FROM t1 WHERE a MATCH 'five'"
-      4    "SELECT offsets(t1) FROM t1 WHERE t1 MATCH 'jk'"
-      5    "SELECT offsets(t1) FROM t1 WHERE t1 MATCH 'tug* OR eight'"
-
-      6    "SELECT offsets(t1) FROM t1 WHERE t1 MATCH 'aa'"
-      7    "SELECT offsets(t1) FROM t1 WHERE t1 MATCH '44'"
-      8    "SELECT offsets(t1) FROM t1 WHERE t1 MATCH 'a*'"
+    append contents "INSERT INTO t1 VALUES('$num', '$doc');"
+  }
+  do_allbackcompat_test {
+    if {[code1 {set ::sqlite_options(fts3)}]
+     && [code2 {set ::sqlite_options(fts3)}]
     } {
-      do_test backcompat-3.7 [list sql1 $q] [sql2 $q]
+  
+      do_test backcompat-3.1 { sql1 $contents } {}
+  
+      foreach {n q} {
+        1    "SELECT * FROM t1 ORDER BY a, b"
+        2    "SELECT rowid FROM t1 WHERE a MATCH 'five'"
+        3    "SELECT * FROM t1 WHERE a MATCH 'five'"
+        4    "SELECT offsets(t1) FROM t1 WHERE t1 MATCH 'jk'"
+        5    "SELECT offsets(t1) FROM t1 WHERE t1 MATCH 'tug* OR eight'"
+      } {
+        do_test backcompat-3.2 [list sql1 $q] [sql2 $q]
+      }
+  
+      do_test backcompat-3.3 { sql1 {
+        INSERT INTO t1 SELECT * FROM t1;
+        INSERT INTO t1 SELECT * FROM t1;
+        INSERT INTO t1 SELECT * FROM t1;
+        INSERT INTO t1 SELECT * FROM t1;
+        INSERT INTO t1 SELECT * FROM t1;
+        INSERT INTO t1 SELECT * FROM t1;
+        INSERT INTO t1 SELECT * FROM t1;
+        INSERT INTO t1 SELECT * FROM t1;
+      } } {}
+  
+      foreach {n q} {
+        1    "SELECT * FROM t1 ORDER BY a, b"
+        2    "SELECT rowid FROM t1 WHERE a MATCH 'five'"
+        3    "SELECT * FROM t1 WHERE a MATCH 'five'"
+        4    "SELECT offsets(t1) FROM t1 WHERE t1 MATCH 'jk'"
+        5    "SELECT offsets(t1) FROM t1 WHERE t1 MATCH 'tug* OR eight'"
+      } {
+        do_test backcompat-3.4 [list sql1 $q] [sql2 $q]
+      }
+  
+      set alphabet "a b c d e f g h i j k l m n o p q r s t u v w x y z 1 2 3 4"
+      for {set i 0} {$i < 900} {incr i} {
+        set term "[lindex $alphabet [expr $i/30]][lindex $alphabet [expr $i%30]] "
+        sql1 "INSERT INTO t1 VALUES($i, '[string repeat $term 14]')"
+      }
+  
+      foreach {n q} {
+        1    "SELECT * FROM t1 ORDER BY a, b"
+        2    "SELECT rowid FROM t1 WHERE a MATCH 'five'"
+        3    "SELECT * FROM t1 WHERE a MATCH 'five'"
+        4    "SELECT offsets(t1) FROM t1 WHERE t1 MATCH 'jk'"
+        5    "SELECT offsets(t1) FROM t1 WHERE t1 MATCH 'tug* OR eight'"
+  
+        6    "SELECT offsets(t1) FROM t1 WHERE t1 MATCH 'aa'"
+        7    "SELECT offsets(t1) FROM t1 WHERE t1 MATCH '44'"
+        8    "SELECT offsets(t1) FROM t1 WHERE t1 MATCH 'a*'"
+      } {
+        do_test backcompat-3.5 [list sql1 $q] [sql2 $q]
+      }
+  
+      do_test backcompat-3.6 { 
+        sql1 "SELECT optimize(t1) FROM t1 LIMIT 1" 
+      } {{Index optimized}}
+  
+      foreach {n q} {
+        1    "SELECT * FROM t1 ORDER BY a, b"
+        2    "SELECT rowid FROM t1 WHERE a MATCH 'five'"
+        3    "SELECT * FROM t1 WHERE a MATCH 'five'"
+        4    "SELECT offsets(t1) FROM t1 WHERE t1 MATCH 'jk'"
+        5    "SELECT offsets(t1) FROM t1 WHERE t1 MATCH 'tug* OR eight'"
+  
+        6    "SELECT offsets(t1) FROM t1 WHERE t1 MATCH 'aa'"
+        7    "SELECT offsets(t1) FROM t1 WHERE t1 MATCH '44'"
+        8    "SELECT offsets(t1) FROM t1 WHERE t1 MATCH 'a*'"
+      } {
+        do_test backcompat-3.7 [list sql1 $q] [sql2 $q]
+      }
     }
   }
 }
@@ -349,72 +351,74 @@ do_allbackcompat_test {
 # Test that Rtree tables may be read/written by different versions of 
 # SQLite. 
 #
-set contents {
-  CREATE VIRTUAL TABLE t1 USING rtree(id, x1, x2, y1, y2);
-}
-foreach {id x1 x2 y1 y2} {
-  1    -47.64 43.87    33.86 34.42        2    -21.51 17.32    2.05 31.04
-  3    -43.67 -38.33    -19.79 3.43       4    32.41 35.16    9.12 19.82
-  5    33.28 34.87    14.78 28.26         6    49.31 116.59    -9.87 75.09
-  7    -14.93 34.51    -17.64 64.09       8    -43.05 23.43    -1.19 69.44
-  9    44.79 133.56    28.09 80.30        10    -2.66 81.47    -41.38 -10.46
-  11    -42.89 -3.54    15.76 71.63       12    -3.50 84.96    -11.64 64.95
-  13    -45.69 26.25    11.14 55.06       14    -44.09 11.23    17.52 44.45
-  15    36.23 133.49    -19.38 53.67      16    -17.89 81.54    14.64 50.61
-  17    -41.97 -24.04    -39.43 28.95     18    -5.85 7.76    -6.38 47.02
-  19    18.82 27.10    42.82 100.09       20    39.17 113.45    26.14 73.47
-  21    22.31 103.17    49.92 106.05      22    -43.06 40.38    -1.75 76.08
-  23    2.43 57.27    -14.19 -3.83        24    -47.57 -4.35    8.93 100.06
-  25    -37.47 49.14    -29.11 8.81       26    -7.86 75.72    49.34 107.42
-  27    1.53 45.49    20.36 49.74         28    -48.48 32.54    28.81 54.45
-  29    2.67 39.77    -4.05 13.67         30    4.11 62.88    -47.44 -5.72
-  31    -21.47 51.75    37.25 116.09      32    45.59 111.37    -6.43 43.64
-  33    35.23 48.29    23.54 113.33       34    16.61 68.35    -14.69 65.97
-  35    13.98 16.60    48.66 102.87       36    19.74 23.84    31.15 77.27
-  37    -27.61 24.43    7.96 94.91        38    -34.77 12.05    -22.60 -6.29
-  39    -25.83 8.71    -13.48 -12.53      40    -17.11 -1.01    18.06 67.89
-  41    14.13 71.72    -3.78 39.25        42    23.75 76.00    -16.30 8.23
-  43    -39.15 28.63    38.12 125.88      44    48.62 86.09    36.49 102.95
-  45    -31.39 -21.98    2.52 89.78       46    5.65 56.04    15.94 89.10
-  47    18.28 95.81    46.46 143.08       48    30.93 102.82    -20.08 37.36
-  49    -20.78 -3.48    -5.58 35.46       50    49.85 90.58    -24.48 46.29
-} {
-if {$x1 >= $x2 || $y1 >= $y2} { error "$x1 $x2 $y1 $y2" }
-  append contents "INSERT INTO t1 VALUES($id, $x1, $x2, $y1, $y2);"
-}
-set queries {
-  1    "SELECT id FROM t1 WHERE x1>10 AND x2<44"
-  2    "SELECT id FROM t1 WHERE y1<100"
-  3    "SELECT id FROM t1 WHERE y1<100 AND x1>0"
-  4    "SELECT id FROM t1 WHERE y1>10 AND x1>0 AND x2<50 AND y2<550"
-}
-do_allbackcompat_test {
-  if {[code1 {set ::sqlite_options(fts3)}]
-   && [code2 {set ::sqlite_options(fts3)}]
+ifcapable rtree {
+  set contents {
+    CREATE VIRTUAL TABLE t1 USING rtree(id, x1, x2, y1, y2);
+  }
+  foreach {id x1 x2 y1 y2} {
+    1    -47.64 43.87    33.86 34.42        2    -21.51 17.32    2.05 31.04
+    3    -43.67 -38.33    -19.79 3.43       4    32.41 35.16    9.12 19.82
+    5    33.28 34.87    14.78 28.26         6    49.31 116.59    -9.87 75.09
+    7    -14.93 34.51    -17.64 64.09       8    -43.05 23.43    -1.19 69.44
+    9    44.79 133.56    28.09 80.30        10    -2.66 81.47    -41.38 -10.46
+    11    -42.89 -3.54    15.76 71.63       12    -3.50 84.96    -11.64 64.95
+    13    -45.69 26.25    11.14 55.06       14    -44.09 11.23    17.52 44.45
+    15    36.23 133.49    -19.38 53.67      16    -17.89 81.54    14.64 50.61
+    17    -41.97 -24.04    -39.43 28.95     18    -5.85 7.76    -6.38 47.02
+    19    18.82 27.10    42.82 100.09       20    39.17 113.45    26.14 73.47
+    21    22.31 103.17    49.92 106.05      22    -43.06 40.38    -1.75 76.08
+    23    2.43 57.27    -14.19 -3.83        24    -47.57 -4.35    8.93 100.06
+    25    -37.47 49.14    -29.11 8.81       26    -7.86 75.72    49.34 107.42
+    27    1.53 45.49    20.36 49.74         28    -48.48 32.54    28.81 54.45
+    29    2.67 39.77    -4.05 13.67         30    4.11 62.88    -47.44 -5.72
+    31    -21.47 51.75    37.25 116.09      32    45.59 111.37    -6.43 43.64
+    33    35.23 48.29    23.54 113.33       34    16.61 68.35    -14.69 65.97
+    35    13.98 16.60    48.66 102.87       36    19.74 23.84    31.15 77.27
+    37    -27.61 24.43    7.96 94.91        38    -34.77 12.05    -22.60 -6.29
+    39    -25.83 8.71    -13.48 -12.53      40    -17.11 -1.01    18.06 67.89
+    41    14.13 71.72    -3.78 39.25        42    23.75 76.00    -16.30 8.23
+    43    -39.15 28.63    38.12 125.88      44    48.62 86.09    36.49 102.95
+    45    -31.39 -21.98    2.52 89.78       46    5.65 56.04    15.94 89.10
+    47    18.28 95.81    46.46 143.08       48    30.93 102.82    -20.08 37.36
+    49    -20.78 -3.48    -5.58 35.46       50    49.85 90.58    -24.48 46.29
   } {
-
-    do_test backcompat-4.1 { sql1 $contents } {}
-
-    foreach {n q} $::queries {
-      do_test backcompat-4.2.$n [list sql1 $q] [sql2 $q]
-    }
-
-    do_test backcompat-4.3 { sql1 {
-      INSERT INTO t1 SELECT id+100, x1+10.0, x2+10.0, y1-10.0, y2-10.0 FROM t1;
-    } } {}
-
-    foreach {n q} $::queries {
-      do_test backcompat-4.4.$n [list sql1 $q] [sql2 $q]
-    }
-
-    do_test backcompat-4.5 { sql2 {
-      INSERT INTO t1 SELECT id+200, x1+20.0, x2+20.0, y1-20.0, y2-20.0 FROM t1;
-    } } {}
-
-    foreach {n q} $::queries {
-      do_test backcompat-4.6.$n [list sql1 $q] [sql2 $q]
+  if {$x1 >= $x2 || $y1 >= $y2} { error "$x1 $x2 $y1 $y2" }
+    append contents "INSERT INTO t1 VALUES($id, $x1, $x2, $y1, $y2);"
+  }
+  set queries {
+    1    "SELECT id FROM t1 WHERE x1>10 AND x2<44"
+    2    "SELECT id FROM t1 WHERE y1<100"
+    3    "SELECT id FROM t1 WHERE y1<100 AND x1>0"
+    4    "SELECT id FROM t1 WHERE y1>10 AND x1>0 AND x2<50 AND y2<550"
+  }
+  do_allbackcompat_test {
+    if {[code1 {set ::sqlite_options(fts3)}]
+     && [code2 {set ::sqlite_options(fts3)}]
+    } {
+  
+      do_test backcompat-4.1 { sql1 $contents } {}
+  
+      foreach {n q} $::queries {
+        do_test backcompat-4.2.$n [list sql1 $q] [sql2 $q]
+      }
+  
+      do_test backcompat-4.3 { sql1 {
+        INSERT INTO t1 SELECT id+100, x1+10.0, x2+10.0, y1-10.0, y2-10.0 FROM t1;
+      } } {}
+  
+      foreach {n q} $::queries {
+        do_test backcompat-4.4.$n [list sql1 $q] [sql2 $q]
+      }
+  
+      do_test backcompat-4.5 { sql2 {
+        INSERT INTO t1 SELECT id+200, x1+20.0, x2+20.0, y1-20.0, y2-20.0 FROM t1;
+      } } {}
+  
+      foreach {n q} $::queries {
+        do_test backcompat-4.6.$n [list sql1 $q] [sql2 $q]
+      }
+  
     }
-
   }
 }
 
diff --git a/test/fts3auto.test b/test/fts3auto.test
index e5c46a0af4..d5ab4efe4f 100644
--- a/test/fts3auto.test
+++ b/test/fts3auto.test
@@ -75,26 +75,27 @@ proc do_fts3query_test {tn args} {
     }
   }
 
-  get_near_results $tbl $match $deferred aMatchinfo
+  get_near_results $tbl $match $deferred aHit
+  get_near_results $tbl [string map {AND OR} $match] $deferred aMatchinfo
 
   set matchinfo_asc [list]
-  foreach docid [lsort -integer -incr [array names aMatchinfo]] {
+  foreach docid [lsort -integer -incr [array names aHit]] {
     lappend matchinfo_asc $docid $aMatchinfo($docid)
   }
   set matchinfo_desc [list]
-  foreach docid [lsort -integer -decr [array names aMatchinfo]] {
+  foreach docid [lsort -integer -decr [array names aHit]] {
     lappend matchinfo_desc $docid $aMatchinfo($docid)
   }
 
-  set title "(\"$match\" -> [llength [array names aMatchinfo]] rows)"
+  set title "(\"$match\" -> [llength [array names aHit]] rows)"
 
   do_execsql_test $tn$title.1 "
     SELECT docid FROM $tbl WHERE $tbl MATCH '$match' ORDER BY docid ASC
-  " [lsort -integer -incr [array names aMatchinfo]] 
+  " [lsort -integer -incr [array names aHit]] 
 
   do_execsql_test $tn$title.2 "
     SELECT docid FROM $tbl WHERE $tbl MATCH '$match' ORDER BY docid DESC
-  " [lsort -integer -decr [array names aMatchinfo]] 
+  " [lsort -integer -decr [array names aHit]] 
 
   do_execsql_test $tn$title.3 "
     SELECT docid, mit(matchinfo($tbl, 'x')) FROM $tbl 
@@ -650,6 +651,7 @@ foreach {tn pending create} {
   do_fts3query_test 6.$tn.2 t1 {b:G AND c:I}
   do_fts3query_test 6.$tn.3 t1 {b:G NEAR c:I}
   do_fts3query_test 6.$tn.4 t1 {a:C OR b:G OR c:K OR d:C}
+
   do_fts3query_test 6.$tn.5 t1 {a:G OR b:G}
 
   catchsql { COMMIT }
diff --git a/test/tkt-bdc6bbbb38.test b/test/tkt-bdc6bbbb38.test
new file mode 100644
index 0000000000..3c76f7aa12
--- /dev/null
+++ b/test/tkt-bdc6bbbb38.test
@@ -0,0 +1,89 @@
+# 2012 May 11
+#
+# The author disclaims copyright to this source code.  In place of
+# a legal notice, here is a blessing:
+#
+#    May you do good and not evil.
+#    May you find forgiveness for yourself and forgive others.
+#    May you share freely, never taking more than you give.
+#
+#***********************************************************************
+# This file implements regression tests for SQLite library.
+#
+# This file implements tests to verify that ticket [bdc6bbbb38] has been
+# fixed.  
+#
+
+set testdir [file dirname $argv0]
+source $testdir/tester.tcl
+set testprefix tkt-bdc6bbbb38
+
+# If SQLITE_ENABLE_FTS3 is defined, omit this file.
+ifcapable !fts3 { finish_test ; return }
+set sqlite_fts3_enable_parentheses 1
+
+foreach {tn idxdir} {1 ASC 2 DESC} {
+  execsql { DROP TABLE IF EXISTS t2 }
+
+  do_execsql_test $tn.1.1 "CREATE VIRTUAL TABLE t2 USING fts4(x, order=$idxdir)"
+  do_execsql_test $tn.1.2 { INSERT INTO t2 VALUES('a b c') }
+
+  do_execsql_test $tn.1.3 {
+    SELECT offsets(t2) FROM t2 WHERE t2 MATCH 'a AND d OR b' ORDER BY docid ASC
+  } {
+    {0 0 0 1 0 2 2 1}
+  }
+  do_execsql_test $tn.1.4 {
+    SELECT snippet(t2,'[',']') FROM t2 WHERE t2 MATCH 'a AND d OR b' 
+    ORDER BY docid ASC
+  } {
+    {[a] [b] c}
+  }
+  do_execsql_test $tn.1.5 { INSERT INTO t2 VALUES('a c d') }
+  do_execsql_test $tn.1.6 {
+    SELECT offsets(t2) FROM t2 WHERE t2 MATCH 'a AND d OR b' ORDER BY docid ASC
+  } {
+    {0 0 0 1 0 2 2 1}
+    {0 0 0 1 0 1 4 1}
+  }
+  do_execsql_test $tn.1.7 {
+    SELECT snippet(t2,'[',']') FROM t2 WHERE t2 MATCH 'a AND d OR b'
+    ORDER BY docid ASC
+  } {
+    {[a] [b] c}
+    {[a] c [d]}
+  }
+
+  execsql { DROP TABLE IF EXISTS t3 }
+  do_execsql_test $tn.2.1 "CREATE VIRTUAL TABLE t3 USING fts4(x, order=$idxdir)"
+  do_execsql_test $tn.2.2 { INSERT INTO t3 VALUES('a c d') }
+  do_execsql_test $tn.2.3 {
+    SELECT offsets(t3) FROM t3 WHERE t3 MATCH 'a AND d OR b' ORDER BY docid DESC
+  } {
+    {0 0 0 1 0 1 4 1}
+  }
+  do_execsql_test $tn.2.4 {
+    SELECT snippet(t3,'[',']') FROM t3 WHERE t3 MATCH 'a AND d OR b'
+      ORDER BY docid DESC
+  } {
+    {[a] c [d]}
+  }
+  do_execsql_test $tn.2.5 { 
+    INSERT INTO t3 VALUES('a b c');
+  }
+  do_execsql_test $tn.2.6 {
+    SELECT offsets(t3) FROM t3 WHERE t3 MATCH 'a AND d OR b' ORDER BY docid DESC
+  } {
+    {0 0 0 1 0 2 2 1}
+    {0 0 0 1 0 1 4 1}
+  }
+  do_execsql_test $tn.2.7 {
+    SELECT snippet(t3,'[',']') FROM t3 WHERE t3 MATCH 'a AND d OR b'
+      ORDER BY docid DESC
+  } {
+    {[a] [b] c}
+    {[a] c [d]}
+  }
+}
+
+finish_test