/ Check-in [2e06babf]
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Fix a bug in debugging code enabled when FTS3_LOG_MERGES is defined.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | fts4-incr-merge
Files: files | file ages | folders
SHA1: 2e06babf49de844d0e878d68114dbcc5ad4d6e54
User & Date: drh 2012-03-24 16:18:08
Context
2012-03-24
16:43
Add a comment to fts3SyncMethod() to justify the nMinMerge=64 constant. check-in: af55ca5f user: dan tags: fts4-incr-merge
16:18
Fix a bug in debugging code enabled when FTS3_LOG_MERGES is defined. check-in: 2e06babf user: drh tags: fts4-incr-merge
16:11
Remove the Fts3Table.mxLevel variable. check-in: 67a0cffc user: dan tags: fts4-incr-merge
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Changes to ext/fts3/fts3_write.c.

  1123   1123     if( rc==SQLITE_OK ){
  1124   1124       /* If iNext is FTS3_MERGE_COUNT, indicating that level iLevel is already
  1125   1125       ** full, merge all segments in level iLevel into a single iLevel+1
  1126   1126       ** segment and allocate (newly freed) index 0 at level iLevel. Otherwise,
  1127   1127       ** if iNext is less than FTS3_MERGE_COUNT, allocate index iNext.
  1128   1128       */
  1129   1129       if( iNext>=FTS3_MERGE_COUNT ){
  1130         -      fts3LogMerge(16, getAbsoluteLevel(iLevel, iLangid, iIndex));
         1130  +      fts3LogMerge(16, getAbsoluteLevel(p, iLevel, iLangid, iIndex));
  1131   1131         rc = fts3SegmentMerge(p, iLangid, iIndex, iLevel);
  1132   1132         *piIdx = 0;
  1133   1133       }else{
  1134   1134         *piIdx = iNext;
  1135   1135       }
  1136   1136     }
  1137   1137