Remove the Fts3Table.mxLevel variable.

FossilOrigin-Name: 67a0cffc9d07be7f09dad9d019a18160711295cd

diff --git a/ext/fts3/fts3.c b/ext/fts3/fts3.c
index e8b38f2ed3533f8fdf391629c4a70e1265d6bc79..f874dfa7f3c7ae2a623a1566065b8a6f63a98d55 100644 (file)
--- a/ext/fts3/fts3.c
+++ b/ext/fts3/fts3.c
@@ -3113,7 +3113,7 @@ static int fts3SyncMethod(sqlite3_vtab *pVtab){
 
     rc = sqlite3Fts3MaxLevel(p, &mxLevel);
     assert( rc==SQLITE_OK || mxLevel==0 );
-    A = p->nLeafAdd * p->mxLevel;
+    A = p->nLeafAdd * mxLevel;
     A += (A/2);
     if( A>nMinMerge ) rc = sqlite3Fts3Incrmerge(p, A, 8);
   }

diff --git a/ext/fts3/fts3Int.h b/ext/fts3/fts3Int.h
index abf5b76c973cce8da9435d26600a3508a34f6ba6..af310c57385cc6bef67412a5a676287e1825a4a4 100644 (file)
--- a/ext/fts3/fts3Int.h
+++ b/ext/fts3/fts3Int.h
@@ -197,7 +197,6 @@ struct Fts3Table {
   char *zContentTbl;              /* content=xxx option, or NULL */
   char *zLanguageid;              /* languageid=xxx option, or NULL */
   u8 bAutoincrmerge;              /* True if automerge=1 */
-  int mxLevel;                    /* Maximum level seen on this transaction */
   u32 nLeafAdd;                   /* Number of leaf blocks added this trans */
 
   /* Precompiled statements used by the implementation. Each of these 

diff --git a/ext/fts3/fts3_write.c b/ext/fts3/fts3_write.c
index 51f47d0106319722308b3d4ce7340216f1e74a32..8919962baf0b61881d64491d4d9be2534811f746 100644 (file)
--- a/ext/fts3/fts3_write.c
+++ b/ext/fts3/fts3_write.c
@@ -1874,14 +1874,6 @@ static int fts3WriteSegment(
   return rc;
 }
 
-/*
-** Update the Fts3Table.mxLevel field, if appropriate
-*/
-static void fts3UpdateMaxLevel(Fts3Table *p, sqlite3_int64 iLevel){
-  iLevel %= FTS3_SEGDIR_MAXLEVEL;
-  if( iLevel>p->mxLevel ) p->mxLevel = iLevel;
-}
-
 /*
 ** Find the largest relative level number in the table. If successful, set
 ** *pnMax to this value and return SQLITE_OK. Otherwise, if an error occurs,
@@ -1920,7 +1912,6 @@ static int fts3WriteSegdir(
   int rc = fts3SqlStmt(p, SQL_INSERT_SEGDIR, &pStmt, 0);
   if( rc==SQLITE_OK ){
     sqlite3_bind_int64(pStmt, 1, iLevel);
-    fts3UpdateMaxLevel(p, iLevel);
     sqlite3_bind_int(pStmt, 2, iIdx);
     sqlite3_bind_int64(pStmt, 3, iStartBlock);
     sqlite3_bind_int64(pStmt, 4, iLeafEndBlock);
@@ -2407,7 +2398,6 @@ static int fts3SegmentMaxLevel(
   );
   if( SQLITE_ROW==sqlite3_step(pStmt) ){
     *pnMax = sqlite3_column_int64(pStmt, 0);
-    fts3UpdateMaxLevel(p, *pnMax);
   }
   return sqlite3_reset(pStmt);
 }

diff --git a/manifest b/manifest
index fbaa0066115d1e6632ee9c01d90a0773f7a26860..ae8fb4776361a6e57e98a5419469ebb00857b8cd 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Merge\sauto-incr-merge\swith\sincr-merge\sbranch.
-D 2012-03-24T14:45:59.366
+C Remove\sthe\sFts3Table.mxLevel\svariable.
+D 2012-03-24T16:11:21.049
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 2f37e468503dbe79d35c9f6dffcf3fae1ae9ec20
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -63,9 +63,9 @@ 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 442f0ccf5c1a6a63844b9712b6f66bf8adb603b6
+F ext/fts3/fts3.c eb3a57bb7913e83727f6bcb1142375df5637478f
 F ext/fts3/fts3.h 3a10a0af180d502cecc50df77b1b22df142817fe
-F ext/fts3/fts3Int.h f65df0fd76617cd43cb9795e5eec27e90ee4cbab
+F ext/fts3/fts3Int.h 6d4ffaca18df57533a7d6240dbdd835c4f3f096a
 F ext/fts3/fts3_aux.c 5205182bd8f372782597888156404766edf5781e
 F ext/fts3/fts3_expr.c dbc7ba4c3a6061adde0f38ed8e9b349568299551
 F ext/fts3/fts3_hash.c 8dd2d06b66c72c628c2732555a32bc0943114914
@@ -78,7 +78,7 @@ F ext/fts3/fts3_test.c 6b7cc68aef4efb084e1449f7d20c4b20d3bdf6b4
 F ext/fts3/fts3_tokenizer.c 3da7254a9881f7e270ab28e2004e0d22b3212bce
 F ext/fts3/fts3_tokenizer.h 66dec98e365854b6cd2d54f1a96bb6d428fc5a68
 F ext/fts3/fts3_tokenizer1.c 5c98225a53705e5ee34824087478cf477bdb7004
-F ext/fts3/fts3_write.c c71f84711f189bc18a82560949ac1656318fd2c5
+F ext/fts3/fts3_write.c 9c9d3062f50d35a0f8b88e5e8f926b622cc210aa
 F ext/fts3/fts3speed.tcl b54caf6a18d38174f1a6e84219950d85e98bb1e9
 F ext/fts3/mkfts3amal.tcl 252ecb7fe6467854f2aa237bf2c390b74e71f100
 F ext/icu/README.txt bf8461d8cdc6b8f514c080e4e10dc3b2bbdfefa9
@@ -997,7 +997,7 @@ F tool/tostr.awk e75472c2f98dd76e06b8c9c1367f4ab07e122d06
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
 F tool/warnings-clang.sh 9f406d66e750e8ac031c63a9ef3248aaa347ef2a
 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
-P ed7c17ea165f6348506bd23ebc58c427bb65d697 0d841c957c6ec4afecb49504177c6279e09d7012
-R bf494068b52a47b15eebd4119e5e6c0c
+P 1c68687ab6d05b100191663820e7d82377d52445
+R f7873f1fffcc305e18231176cdb210c4
 U dan
-Z a37d5b74ba1d4a69b01095005645cefa
+Z c98b0e8c409bca973107326748221c8a

diff --git a/manifest.uuid b/manifest.uuid
index 6bd6c7d918cc6f6399ca8a5f233f5051897ae383..c164bc08273e6cb2946464bb44e14d2d80ad3526 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-1c68687ab6d05b100191663820e7d82377d52445
\ No newline at end of file
+67a0cffc9d07be7f09dad9d019a18160711295cd
\ No newline at end of file