Fix an fts5 problem that could occur if a term and the first associated rowid are...

FossilOrigin-Name: ffe2796ac9244c62325fce4960f26c653321623c

diff --git a/ext/fts5/fts5_index.c b/ext/fts5/fts5_index.c
index a7e654d745c610207fbf2577f95a9fafa7e2237b..3935bd92fb53a4043a567ae4b00cd460add70f4b 100644 (file)
--- a/ext/fts5/fts5_index.c
+++ b/ext/fts5/fts5_index.c
@@ -1464,6 +1464,7 @@ static void fts5SegIterNextPage(
   Fts5Index *p,                   /* FTS5 backend object */
   Fts5SegIter *pIter              /* Iterator to advance to next page */
 ){
+  Fts5Data *pLeaf;
   Fts5StructureSegment *pSeg = pIter->pSeg;
   fts5DataRelease(pIter->pLeaf);
   pIter->iLeafPgno++;
@@ -1478,12 +1479,16 @@ static void fts5SegIterNextPage(
   }else{
     pIter->pLeaf = 0;
   }
+  pLeaf = pIter->pLeaf;
 
-  if( pIter->pLeaf ){
-    if( fts5LeafIsTermless(pIter->pLeaf) ){
-      pIter->iEndofDoclist = pIter->pLeaf->nn+1;
+  if( pLeaf ){
+    pIter->iPgidxOff = pLeaf->szLeaf;
+    if( fts5LeafIsTermless(pLeaf) ){
+      pIter->iEndofDoclist = pLeaf->nn+1;
     }else{
-      pIter->iEndofDoclist = fts5LeafFirstTermOff(pIter->pLeaf);
+      pIter->iPgidxOff += fts5GetVarint32(&pLeaf->p[pIter->iPgidxOff],
+          pIter->iEndofDoclist
+      );
     }
   }
 }

diff --git a/manifest b/manifest
index b78f6f361ca32a390b7664db79a54a3eae2db306..d750e018c5012a66908554747c114c114054dbb4 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Change\sthe\sarray\sof\s16-bit\soffsets\sat\sthe\send\sof\seach\spage\sto\san\sarray\sof\svarints.
-D 2015-09-10T05:40:17.756
+C Fix\san\sfts5\sproblem\sthat\scould\soccur\sif\sa\sterm\sand\sthe\sfirst\sassociated\srowid\sare\son\sdifferent\sleaf\spages.
+D 2015-09-10T10:01:30.421
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in f85066ce844a28b671aaeeff320921cd0ce36239
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -112,7 +112,7 @@ F ext/fts5/fts5_buffer.c 64dcaf36a3ebda9e84b7c3b8788887ec325e12a4
 F ext/fts5/fts5_config.c 57ee5fe71578cb494574fc0e6e51acb9a22a8695
 F ext/fts5/fts5_expr.c 1c24e1a2ffb286bfe37e537a43b7fadabfe993d4
 F ext/fts5/fts5_hash.c 4bf4b99708848357b8a2b5819e509eb6d3df9246
-F ext/fts5/fts5_index.c a13a652f042d2c88f74ad5edea893e68aadc1d99
+F ext/fts5/fts5_index.c 5d59a136b76ee10ef4e4850d128deab27c432c0e
 F ext/fts5/fts5_main.c 4b04c934084ea24a858438a04b5be8af3a9e0311
 F ext/fts5/fts5_storage.c 120f7b143688b5b7710dacbd48cff211609b8059
 F ext/fts5/fts5_tcl.c 6da58d6e8f42a93c4486b5ba9b187a7f995dee37
@@ -1384,7 +1384,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh 48bd54594752d5be3337f12c72f28d2080cb630b
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P 0eb2b9521fad6fa36e6fa374c2bc1f70b5180f7c
-R 25079dc3a625e241875e08ccc405324e
+P fab245bea4f283714c17bca22428d5eb4db5935a
+R 4069a06076810ffdc49a2b6325563d3b
 U dan
-Z c053aed547ab3325e91f842560bd3190
+Z ba033d01ce03ffe119d3bd7a8ead0adc

diff --git a/manifest.uuid b/manifest.uuid
index 2645b94c08112a2822a9dcdaaf655794358e8839..9dae9bbfc3e04b4669bcb5e3f66d60d54866500a 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-fab245bea4f283714c17bca22428d5eb4db5935a
\ No newline at end of file
+ffe2796ac9244c62325fce4960f26c653321623c
\ No newline at end of file