From: dan <dan@noemail.net>
Date: Fri, 16 May 2014 10:30:44 +0000 (+0000)
Subject: Fix a bug causing an incorrect segment size value to be stored if both an old and... 
X-Git-Tag: version-3.8.5~39^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a7b9e7d2d9e06600d0dc7e4df62e9026ff7053d2;p=thirdparty%2Fsqlite.git

Fix a bug causing an incorrect segment size value to be stored if both an old and new FTS version performed work on the same incremental merge operation.

FossilOrigin-Name: a9a2aeab298ba2ac0b8835e61406e2d83bf7e39b
---

diff --git a/ext/fts3/fts3_write.c b/ext/fts3/fts3_write.c
index 2f940eac7a..2cbf084e84 100644
--- a/ext/fts3/fts3_write.c
+++ b/ext/fts3/fts3_write.c
@@ -3636,6 +3636,7 @@ struct IncrmergeWriter {
   sqlite3_int64 iStart;           /* Block number of first allocated block */
   sqlite3_int64 iEnd;             /* Block number of last allocated block */
   sqlite3_int64 nLeafData;        /* Bytes of leaf page data so far */
+  u8 bNoLeafData;                 /* If true, store 0 for segment size */
   NodeWriter aNodeWriter[FTS_MAX_APPENDABLE_HEIGHT];
 };
 
@@ -4074,7 +4075,7 @@ static void fts3IncrmergeRelease(
         pWriter->iStart,                    /* start_block */
         pWriter->aNodeWriter[0].iBlock,     /* leaves_end_block */
         pWriter->iEnd,                      /* end_block */
-        pWriter->nLeafData,                 /* end_block */
+        (pWriter->bNoLeafData==0 ? pWriter->nLeafData : 0),   /* end_block */
         pRoot->block.a, pRoot->block.n      /* root */
     );
   }
@@ -4180,6 +4181,7 @@ static int fts3IncrmergeLoad(
       if( pWriter->nLeafData<0 ){
         pWriter->nLeafData = pWriter->nLeafData * -1;
       }
+      pWriter->bNoLeafData = (pWriter->nLeafData==0);
       nRoot = sqlite3_column_bytes(pSelect, 4);
       aRoot = sqlite3_column_blob(pSelect, 4);
     }else{
@@ -4914,7 +4916,7 @@ int sqlite3Fts3Incrmerge(Fts3Table *p, int nMerge, int nMin){
         pWriter->nLeafData = pWriter->nLeafData * -1;
       }
       fts3IncrmergeRelease(p, pWriter, &rc);
-      if( nSeg==0 ){
+      if( nSeg==0 && pWriter->bNoLeafData==0 ){
         fts3PromoteSegments(p, iAbsLevel+1, pWriter->nLeafData);
       }
     }
diff --git a/manifest b/manifest
index f27c4b1f83..f12f2aa4a8 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Merge\slatest\strunk\schanges\swith\sthis\sbranch.
-D 2014-05-15T19:05:55.306
+C Fix\sa\sbug\scausing\san\sincorrect\ssegment\ssize\svalue\sto\sbe\sstored\sif\sboth\san\sold\sand\snew\sFTS\sversion\sperformed\swork\son\sthe\ssame\sincremental\smerge\soperation.
+D 2014-05-16T10:30:44.076
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in dd2b1aba364ff9b05de41086f74407f285c57670
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -96,7 +96,7 @@ F ext/fts3/fts3_tokenizer.h 64c6ef6c5272c51ebe60fc607a896e84288fcbc3
 F ext/fts3/fts3_tokenizer1.c 5c98225a53705e5ee34824087478cf477bdb7004
 F ext/fts3/fts3_unicode.c 92391b4b4fb043564c6539ea9b8661e3bcba47b9
 F ext/fts3/fts3_unicode2.c 0113d3acf13429e6dc38e0647d1bc71211c31a4d
-F ext/fts3/fts3_write.c b90173c62460a215498b0da3046f5e429b3a66b0
+F ext/fts3/fts3_write.c 6681e4855bd24e74e91e2017f3fdc44460449fc1
 F ext/fts3/fts3speed.tcl b54caf6a18d38174f1a6e84219950d85e98bb1e9
 F ext/fts3/mkfts3amal.tcl 252ecb7fe6467854f2aa237bf2c390b74e71f100
 F ext/fts3/tool/fts3view.c 6cfc5b67a5f0e09c0d698f9fd012c784bfaa9197
@@ -570,7 +570,7 @@ F test/fts4aa.test 0c3152322c7f0b548cc942ad763eaba0da87ccca
 F test/fts4check.test 66fa274cab2b615f2fb338b257713aba8fad88a8
 F test/fts4content.test 2e7252557d6d24afa101d9ba1de710d6140e6d06
 F test/fts4docid.test e33c383cfbdff0284685604d256f347a18fdbf01
-F test/fts4growth.test 50befaa001a6dd4046d32e5d7b3cb75df8360ca8
+F test/fts4growth.test df10fde9f47cf5c71861e63fd8efcd573c4f7e53
 F test/fts4growth2.test 4ea35ea97c7d87e8f19d5ede939ab356f9f75cf0
 F test/fts4incr.test 361960ed3550e781f3f313e17e2182ef9cefc0e9
 F test/fts4langid.test 24a6e41063b416bbdf371ff6b4476fa41c194aa7
@@ -1172,7 +1172,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh d1a6de74685f360ab718efda6265994b99bbea01
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P 2b09bd17eb85ea3c682e930d2aabc6441f2265e0 0901dccedaf5679691ba803ec76d113de170185d
-R bc36878656a1df406ce5faa15b3690cd
+P 5809986ffcc5d9cbab64760f8d7fbfbb6b626ee7
+R 12132d8d56290c779558e11739c0e6c3
 U dan
-Z 7b26c3764a28756f379665cd911542c0
+Z a463ca0b0e1281a342011aafc1248dc1
diff --git a/manifest.uuid b/manifest.uuid
index 414ca82c34..0c30c7f481 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-5809986ffcc5d9cbab64760f8d7fbfbb6b626ee7
\ No newline at end of file
+a9a2aeab298ba2ac0b8835e61406e2d83bf7e39b
\ No newline at end of file
diff --git a/test/fts4growth.test b/test/fts4growth.test
index 466416e561..aa5f251f95 100644
--- a/test/fts4growth.test
+++ b/test/fts4growth.test
@@ -366,21 +366,72 @@ do_execsql_test 6.5 {
   0 1 {1329 8297} 0 0 {1320 28009} 0 2 {1449 118006}
 }
 
-#do_test 3.2 {
-  #t1_to_x2
-  #execsql {SELECT level, count(*) FROM x2_segdir GROUP BY level}
-#} {0 13 1 15 2 5}
-
-#proc second {x} { lindex $x 1 }
-#db func second second
-#for {set i 0} {$i <1000} {incr i} {
-#  t1_to_x2
-#  db eval {
-#    SELECT level, group_concat( second(end_block), ' ' ) AS c FROM x2_segdir GROUP BY level;
-#  } {
-#    puts "$i.$level: $c"
-#  }
-#}
+#--------------------------------------------------------------------------
+# Ensure that if part of an incremental merge is performed by an old
+# version that does not support storing segment sizes in the end_block
+# field, no size is stored in the final segment (as it would be incorrect).
+#
+do_execsql_test 7.1 {
+  CREATE VIRTUAL TABLE x6 USING fts4;
+  INSERT INTO x6 SELECT words FROM t1;
+  INSERT INTO x6 SELECT words FROM t1;
+  INSERT INTO x6 SELECT words FROM t1;
+  INSERT INTO x6 SELECT words FROM t1;
+  INSERT INTO x6 SELECT words FROM t1;
+  INSERT INTO x6 SELECT words FROM t1;
+  SELECT level, idx, end_block FROM x6_segdir;
+} {
+  0 0 {118 117483} 0 1 {238 118006} 0 2 {358 118006} 
+  0 3 {478 118006} 0 4 {598 118006} 0 5 {718 118006}
+}
+
+do_execsql_test 7.2 {
+  INSERT INTO x6(x6) VALUES('merge=25,4');
+  SELECT level, idx, end_block FROM x6_segdir;
+} {
+  0 0 {118 117483} 0 1 {238 118006} 0 2 {358 118006} 
+  0 3 {478 118006} 0 4 {598 118006} 0 5 {718 118006}
+  1 0 {16014 -51226}
+}
+
+do_execsql_test 7.3 {
+  UPDATE x6_segdir SET end_block = first(end_block) WHERE level=1;
+  SELECT level, idx, end_block FROM x6_segdir;
+} {
+  0 0 {118 117483} 0 1 {238 118006} 0 2 {358 118006} 
+  0 3 {478 118006} 0 4 {598 118006} 0 5 {718 118006}
+  1 0 16014
+}
+
+do_execsql_test 7.4 {
+  INSERT INTO x6(x6) VALUES('merge=25,4');
+  SELECT level, idx, end_block FROM x6_segdir;
+} {
+  0 0 {118 117483} 0 1 {238 118006} 0 2 {358 118006} 
+  0 3 {478 118006} 0 4 {598 118006} 0 5 {718 118006}
+  1 0 16014
+}
+
+do_execsql_test 7.5 {
+  INSERT INTO x6(x6) VALUES('merge=2500,4');
+  SELECT level, idx, end_block FROM x6_segdir;
+} {
+  0 0 {598 118006} 0 1 {718 118006} 1 0 16014
+}
+
+do_execsql_test 7.6 {
+  INSERT INTO x6(x6) VALUES('merge=2500,2');
+  SELECT level, idx, start_block, leaves_end_block, end_block FROM x6_segdir;
+} {
+  2 0 23695 24147 {41262 633507}
+}
+
+do_execsql_test 7.7 {
+  SELECT sum(length(block)) FROM x6_segments 
+  WHERE blockid BETWEEN 23695 AND 24147
+} {633507}
+
+
 
 finish_test