mirrors/sqlite
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
13,503 Commits 1,487 Branches 166 Tags 416 MiB
a4bb7764fe
Commit Graph

416 Commits

Author SHA1 Message Date
dan
85963f5474 When possible, have FTS use 32-bit operations to read varints from the database. 
FossilOrigin-Name: aa7ba302ed13aedde89b5bcbe9119799c0da8a42
 2013-11-12 17:46:44 +00:00
dan
d6dd5def4d Fix a bug preventing FTS from correctly processing bracket tokens that are immediately preceded by characters that are neither whitespace or token characters. 
FossilOrigin-Name: 49be646cd981f8ff0434cf90d2748afa30260017
 2013-11-04 08:56:22 +00:00
dan
a4bbc8b119 Add the "languageid" hidden column to fts4aux. 
FossilOrigin-Name: 891df358e51075fb937f34952ce43bf51130b0d0
 2013-10-15 19:06:17 +00:00
dan
362d21614e Fix a crash in FTS incremental phrase processing that can occur if the second or subsequent token is much more common in the dataset than the first. 
FossilOrigin-Name: 0bf438fc30582a08fddfc3cec49366ee17ae2abe
 2013-10-14 20:30:51 +00:00
mistachkin
b084582299 Fix harmless compiler warning. 
FossilOrigin-Name: 4b130f88fba216e088f61252bbcdde57ec7ee6a9
 2013-10-12 02:33:22 +00:00
drh
4f99189051 Fix various harmless compiler warnings. Change the "warnings.sh" script to 
work with STAT4 instead of STAT3.

FossilOrigin-Name: 7df06684ab36bfdad9e9aca6940b7a665c2a0cb5
 2013-10-11 15:05:05 +00:00
mistachkin
86f72f0721 Fix compilation issue with MSVC. 
FossilOrigin-Name: 36d64dc36f18c166b2c93c43579fa3bbb5cd545f
 2013-10-07 21:49:16 +00:00
dan
9211f8a6ce Allow FTS4 multi-token phrases to use a combination of in-memory and incrementally loaded doclists. This allows phrases to (partially) benefit from incremental doclists without disabling the deferred token optimization. 
FossilOrigin-Name: f6819c5f3363d358e7ef65fe6978f13991bd44af
 2013-10-03 19:27:14 +00:00
dan
eb26672d0e Add a test to check that the new multi-token phrase optimization is actually helping. 
FossilOrigin-Name: bc3a2ed5fb2402805928b0002457eebf06f87c47
 2013-10-02 08:04:27 +00:00
dan
ff574f4c76 Allow multi-token phrases to load doclists from the database incrementally. This allows queries that feature such phrases to benefit from the "docid<?" optimization. 
FossilOrigin-Name: ea543f081d93ed1bf66c21ce2108ec94e349f4c5
 2013-10-01 20:02:32 +00:00
dan
73632e37c9 Merge trunk changes with this branch. 
FossilOrigin-Name: e294a9c7c525d1da698259c2fef089579bfd1c0b
 2013-09-30 18:16:07 +00:00
dan
1f03e609ff Fix a performance problem in the FTS4 auxiliary functions triggered by an OR clause in the full-text query. 
FossilOrigin-Name: fa0f2f0e3e79ae653118b901e1cca7725dfaf249
 2013-09-30 18:14:45 +00:00
dan
19384380f3 Have fts4 full-text queries consider "docid<?" and similar constraints. 
FossilOrigin-Name: 6622424a3a149edd35ba2ba0881aa41b4536417b
 2013-09-30 11:42:19 +00:00
dan
2505a5fee2 Fix an FTS4 problem introduced by [361084e1eb]. 
FossilOrigin-Name: 5f35c8cb8f8b67121c70f98c02c4aa7c25327690
 2013-08-21 15:45:27 +00:00
dan
2c18788ffa Initialize a variable in fts3_write.c on the grounds that the argument required to show that it does not require initialization with is complicated. Add an assert() to where.c to silence a clang scan-build warning. 
FossilOrigin-Name: d6c4d48a002a6d7057fccc30064ce0b049678f0c
 2013-08-19 19:29:50 +00:00
dan
290703091e Add some extra assert() statements to silence a few clang warnings. 
FossilOrigin-Name: 1c63e9515b5f5cb9169928b108d002dcd18ad4fd
 2013-08-19 18:17:03 +00:00
drh
1f10c28618 Modify several extensions to use the new exported function naming. 
Fix some shared library compilation issues.

FossilOrigin-Name: 1e39f85077f1f2b96c3a656c5b6334bafb005908
 2013-07-09 12:36:30 +00:00
dan
ed20073b8d Make a couple of implicit casts explicit to fix compiler warnings. 
FossilOrigin-Name: 9676280a9387b8bfba82cfc0087318863d05d4f3
 2013-07-05 10:46:08 +00:00
mistachkin
049d487e2e Modify several extensions to use the new exported function naming. Fix some shared library compilation issues. 
FossilOrigin-Name: f2ab8747825ab5131ffab174aa0ffe5e474f6811
 2013-07-04 23:53:56 +00:00
drh
4580cfb93e Cut over the next generation query planner. Increase the version number 
to 3.8.0.

FossilOrigin-Name: 0fe31f60cadc5fe5a9d87e110bfaed5fd026cba1
 2013-06-26 11:43:18 +00:00
drh
adbae616bd Remove an unused function declaration from the FTS3 source code. 
FossilOrigin-Name: 096ae1d8f9a08f92daedece6b0615f4d22b05023
 2013-06-21 18:36:44 +00:00
dan
8def92bac3 Add the "notindexed" option to fts4. 
FossilOrigin-Name: 8ff2b8f5948ccddce70102e6d68d464c66e4f7ca
 2013-06-21 17:30:47 +00:00
drh
37ca04880a Merge all changes from trunk. 
FossilOrigin-Name: f2e15b1974e55373b5819e3b2326653f890f409f
 2013-06-12 17:17:45 +00:00
dan
5f0b33c2cb Add the SQLITE_FTS3_MAX_EXPR_DEPTH compile time option. 
FossilOrigin-Name: 24fc9d4438a5615dd20af5419456166df83a72ea
 2013-06-11 14:22:11 +00:00
dan
f2c9229f73 Up until now the fts4 "unicode61" tokenizer has treated all private use codepoints except the first and last of each of the three ranges as alphanumeric (eligible to be part of tokens). This commit fixes this so that all private use codepoints are considered alphanumeric. In other words, it fixes the handling of codepoints 0xE000, 0xF8FF, 0xF0000, 0xFFFFD, 0x100000 and 0x10FFFD. 
FossilOrigin-Name: 6cfd9af5250029c0d275be027b4208c48954a8a1
 2013-06-05 16:17:21 +00:00
drh
73843cac73 Increase the estimated full-scan cost for an FTS3 table. 
FossilOrigin-Name: 8d9f29f847f38612447c79a5fb366a9143ef6205
 2013-06-04 13:07:44 +00:00
dan
87ddfeb079 When writing to an FTS table, take an exclusive shared-cache lock on the %_segdir table before writing. Otherwise, an xCommit() call may report an SQLITE_LOCKED error. 
FossilOrigin-Name: 3cd2da42e9403b1e6243ad53f3f2bbf89c0fb9b0
 2013-05-27 10:11:53 +00:00
drh
92692d32ad Fix a couple of harmless compiler warnings in the fts3_tokenize virtual 
table.

FossilOrigin-Name: 1fa8c457394c94864f7584e4c893ec09e685fba4
 2013-05-08 17:06:28 +00:00
dan
e8dee7d1ed Modify the fts3tokenize table implementation so that it does not use the SQL function fts3_tokenizer. The user may have installed an authorizer callback that prohibits this. 
FossilOrigin-Name: 0ba67b64de258883e4c43db09e131bb67083855e
 2013-05-07 12:16:48 +00:00
drh
acf9c2b555 Add an assert() to fts3_expr.c in order to silence a clang warning. 
FossilOrigin-Name: d8dc2c5fb554eb5898ddc8d703c6a360af7fe023
 2013-05-06 14:57:48 +00:00
dan
3a01b600d3 Improve the error message issued when an FTS query exceeds the maximum allowable tree depth. 
FossilOrigin-Name: f480b1fe6012f36c59cd0525efdc6df74143ccd0
 2013-04-29 18:07:37 +00:00
dan
181f4f789d Fix an off-by-one in the code for limiting the depth of FTS expression trees. 
FossilOrigin-Name: 72ac73189c3577740a77d2ea2fc7118391c0703f
 2013-04-29 17:12:06 +00:00
drh
6f77140f78 Fix harmless compiler warnings in the FTS expression parser. 
FossilOrigin-Name: 3c78af8c535e16518f18733325f4cd1df7ec8282
 2013-04-26 13:14:19 +00:00
dan
aa29c86e49 Rebalance FTS expressions after parsing to limit recursion during evaluation. Avoid recursion when deleting FTS expression trees. Enforce a limit on the depth of an expression tree. 
FossilOrigin-Name: f968d43f80cc2f236e7d09ba1e8278343e2b6976
 2013-04-25 20:34:02 +00:00
drh
da8caa0b2d Fix harmless compiler warnings. 
FossilOrigin-Name: 1a1cf5aa86734c832d845e07780262a178188d56
 2013-04-22 23:38:50 +00:00
drh
4d648c777b Update MSCV makefile for the fts3tokenize virtual table. Clear some 
harmless compiler warnings in the fts3tokenize code.

FossilOrigin-Name: 2b3fed09eb89f1e9d6a5f7487ef526b46eb51490
 2013-04-22 17:07:56 +00:00
dan
d7a959c694 Add virtual table module 'fts3tokenize' to fts3. fts3tokenize provides SQL access to FTS tokenizer implementations. 
FossilOrigin-Name: c5a4b21a15bd8a184380817ff41657acbccb866d
 2013-04-22 15:30:37 +00:00
dan
a8f60381a9 Change the fts4aux virtual table module so that fts4aux tables created in the temp database may report on fts3/fts4 tables in any attached database. 
FossilOrigin-Name: 546a187f1361dad340ed8f6c28dd89e6c19f9c33
 2013-04-12 16:47:27 +00:00
dan
1cb90c668c In fts3, when filtering lists for hits in a specific column, edit the list in place in the same way as it is for NEAR filtering. Fix for [38b1ae018f]. 
FossilOrigin-Name: f85f9103cffa5c8ba6a63a68beb90817147ba080
 2013-03-25 11:38:44 +00:00
mistachkin
48864df97d Many spelling fixes in comments. No changes to code. 
FossilOrigin-Name: 6f6e2d50941e444ebc83604daddcc034137a05b7
 2013-03-21 21:20:32 +00:00
drh
7b6be6f7bf Fix an uninitialized variable detected by valgrind. 
FossilOrigin-Name: ffd1e51490286abfaea68fd4b4b4cb967d87b04b
 2012-12-04 00:53:08 +00:00
dan
bba44d0d1b Fix a problem causing the "number-of-documents" field maintained by FTS4 to be set incorrectly. 
FossilOrigin-Name: e38fb02d5ea5daa6992df4dfbbeec92bf7b525f6
 2012-11-27 15:56:38 +00:00
dan
e62c0694de Fix a bug in fts3 causing it to return SQLITE_NOMEM when NEAR, OR and some auxiliary functions were used together. Also a segfault in vtab.c that could follow an OOM condition. 
FossilOrigin-Name: 33f4f9817e8b3cb97ce02a4c49bd586332da37b2
 2012-10-25 19:25:39 +00:00
drh
8749c1831a Make sure substructure elements have proper alignment in the ICU tokenizers 
of FTS2 and FTS3.

FossilOrigin-Name: aaa2d9b0db74d8452d9294de17cff786ab4ec7c8
 2012-10-19 02:10:53 +00:00
dan
1276cd0ba8 Add a comment to fts3_snippet.c. 
FossilOrigin-Name: b5f5ba3103e6fcf117fb69d5379fa70f691a652d
 2012-10-17 20:28:52 +00:00
dan
6c42aa4a0e Initialize variables used as outputs of custom tokenizer method calls in fts4. 
FossilOrigin-Name: 514505a84bcc677518d60a42896598f85ed78265
 2012-10-17 20:15:10 +00:00
mistachkin
d5578433ff Fix all known instances of 'repeated the' style typos in comments. No changes to code. 
FossilOrigin-Name: 9b19b847533f944f289d93dcdba29c0d67bf251c
 2012-08-25 10:01:29 +00:00
dan
4dc3d73d69 Add the SQLITE_DISABLE_FTS4_DEFERRED compile time option. 
FossilOrigin-Name: e799222f3b8246e65657a758437914ece7069ba9
 2012-08-20 17:24:48 +00:00
mistachkin
fe7b2bc9ff Merge several compiler compatibility fixes to trunk. 
FossilOrigin-Name: d3d491a5461e21d84c6425977b80deedc7fa8a3a
 2012-06-21 14:05:15 +00:00
dan
2ae26b759d Fix a problem with identifying white-space characters outside of the ascii range in the ICU tokenizer. 
FossilOrigin-Name: 892b74116a3b23268895b96433d18ef00c1433d8
 2012-06-18 20:52:32 +00:00
mistachkin
c8bde37d19 Fix a few compilation issues that can occur with certain compilers (e.g. GCC 2.95.3, MSVC). 
FossilOrigin-Name: f970a3de61fe2ebaf1778c4a3383cfdc52299162
 2012-06-18 08:00:56 +00:00
drh
1c30debd41 Fix an obscure memory leak in FTS3 that can come about when two memory 
allocations are immediately adjacent to one another.

FossilOrigin-Name: 025227be5495f950c466dfabac140cba69e498be
 2012-06-08 14:01:53 +00:00
dan
25cdf46ae4 Add the "tokenchars=" and "separators=" options, for customizing the set of characters considered to be token separators, to the unicode61 tokenizer. 
FossilOrigin-Name: e56fb462aa1f11bb23303ae0dc62815c21e26a52
 2012-06-07 15:53:48 +00:00
dan
2c897e3e5f Disable FTS unicode61 by default. It is enabled by specifying compile time option SQLITE_ENABLE_FTS4_UNICODE61. 
FossilOrigin-Name: eccd6b6580637084495b80e9232262188ba0cf8d
 2012-06-06 19:51:27 +00:00
dan
754d3adf7c Have the FTS unicode61 strip out diacritics when tokenizing text. This can be disabled by specifying the tokenizer option "remove_diacritics=0". 
FossilOrigin-Name: 790f76a5898dad1a955d40edddf11f7b0fec0ccd
 2012-06-06 19:30:38 +00:00
drh
a9cfaba95a Omit the fts3 unicode character class routines from the build if fts3/4 
is disabled.

FossilOrigin-Name: c00bb5d4601efc15933f222349e96a043b610a19
 2012-05-28 12:22:00 +00:00
dan
7946c53009 If SQLITE_DISABLE_FTS3_UNICODE is defined, do not build the "unicode61" tokenizer. 
FossilOrigin-Name: e71495a817b479bc23c5403d99255e3f098eb054
 2012-05-26 18:28:14 +00:00
dan
501c74d3e1 Change the format of the tables used by sqlite3FtsUnicodeTolower() to make them a little smaller. 
FossilOrigin-Name: b89d3834f6690073fca0fc22c18afa1fb280ea7d
 2012-05-26 17:57:02 +00:00
dan
cf9f6f1375 Add fault-injection tests that use the unicode61 tokenizer. Fix a problem revealed by the same. 
FossilOrigin-Name: ed28c48a3dd7e766e60db0d96ef5460bf9913e6b
 2012-05-26 15:44:08 +00:00
dan
ab322bd21e Change the name of the "unicode" tokenizer to "unicode61" to emphasize that the case folding and separator-character identification routines are based on unicode version 6.1. 
FossilOrigin-Name: 8f3e60aa2253f21bcee5d03982cfdd7f16c00060
 2012-05-26 14:54:50 +00:00
dan
1c7016c9a5 Add special fast paths to sqlite3FtsUnicodeTolower() and Isalnum() for codepoints in the ASCII range. 
FossilOrigin-Name: cf7b25d47687635a04f4347d45f135c686b9d758
 2012-05-25 19:50:12 +00:00
dan
80ed5a56a5 Fix comments in generated file fts3_unicode2.c. 
FossilOrigin-Name: 3dc567ef4702d9a63d78d11ff705cb7f7359f7a6
 2012-05-25 18:48:48 +00:00
dan
3d403c71a8 Add an experimental tokenizer to fts4 - "unicode". This tokenizer works in the same way except that it understands unicode "simple case folding" and recognizes all characters not classified as "Letters" or "Numbers" by unicode as token separators. 
FossilOrigin-Name: 0c13570ec78c6887103dc99b81b470829fa28385
 2012-05-25 17:50:19 +00:00
dan
5cfed52dd1 Have the FTS auxiliary functions correctly handle terms that appear in non-matching branches of the FTS expression. Fix for [bdc6bbbb38]. 
FossilOrigin-Name: 4d3e1673b309a3d6a6cac01d67dfd79a8007f991
 2012-05-10 17:43:14 +00:00
drh
83cc139231 Fix harmless compiler warnings on x64 MSVC, mostly in test code, but also in 
tclsqlite.c and in the FTS4 module.

FossilOrigin-Name: 3281972eaa46cb57fd9f0387063f47430dc0a3b4
 2012-04-19 18:04:28 +00:00
drh
85e7243acf Fix harmless static-analysis warnings, mosting having to do with memory 
leaks in the command-line shell.  Add a clang analysis of the command-line
shell to the "warnings-clang.sh" script.  Other minor cleanups to the
command-line shell code.

FossilOrigin-Name: 93a0f452a7023898ad3d62ee81b39a80477c332f
 2012-04-11 11:38:53 +00:00
drh
3b06a2a056 Add #ifdefs to allow a test build to succeed even if SQLITE_ENABLE_FTS3 is 
not defined.

FossilOrigin-Name: fb121980e48af368353431fd04924e414b65c852
 2012-04-02 17:18:23 +00:00
dan
a25a42cfe7 Change the ICU tokenizer so that it does not attempt to call strlen(NULL). 
FossilOrigin-Name: 04298f1ac42c40cb2a48092b415acf96a08954b7
 2012-03-31 11:58:23 +00:00
drh
7da5fcb0b7 Fix MSVC compiler warnings in test code. 
FossilOrigin-Name: cb7a850439c9a4a7887650d6b81d95ab8025de5b
 2012-03-30 14:59:43 +00:00
drh
4e245a4c35 Fix compiler warnings on GCC and MSVC and fix a C89-ism that 
broke the build for MSVC.

FossilOrigin-Name: b451c0f97f0abe78ebe6c62ff489ec1ad8a1f767
 2012-03-30 00:00:36 +00:00
drh
cdb86dc437 Add output of PRAGMAs auto_vacuum and encoding to the "schema" command of the 
fts3view utility program.

FossilOrigin-Name: e31076319363a46905836880765bae3bf204ed19
 2012-03-27 18:00:05 +00:00
dan
311ec02587 Remove the fts3merge.test script in favour of changing the fts4merge.test script so that it runs tests using both fts4 and fts3. Fix some problems with incr-merge and FTS3 tables. 
FossilOrigin-Name: 5c447e226afca0d46b9ed994dea26a16a9ae168c
 2012-03-27 15:00:06 +00:00
drh
a1a9f0a0d8 In the fts3view utility, label the blank segments used to mark the end of a 
segment sequence for a level/idx as "null".  Improve the alignment of root
segment names.

FossilOrigin-Name: 04aea0245e4183fef3664609f5a6353b65d71a85
 2012-03-27 14:54:44 +00:00
drh
1ecb59a1e5 Enhance the fts3view tool with the big-segment command and fix a bug in the 
display of doclists.

FossilOrigin-Name: e9436d8038e5a0d1ba992a77d1064d4a55595f57
 2012-03-27 13:51:31 +00:00
dan
5da0aa1603 Allow multiple incremental merges to proceed concurrently. This is required to prevent a large crisis-merge from occuring while an even larger incremental-merge is underway. 
FossilOrigin-Name: 7ed9d2f24a650b424b97dfc19b8042c4cf09c82c
 2012-03-27 11:48:02 +00:00
drh
40aab4c56d Minor correct errors in the file format description for FTS3/4 contained in 
the fts3.c header comment.

FossilOrigin-Name: fb8aacdd8fbdc946cb271cc589f76b806387937d
 2012-03-27 00:38:33 +00:00
drh
280d5c33cd Enhance fts3view to show decodes of segments and doclists. 
FossilOrigin-Name: 6d09de231b68dd9520d99c65d133f26e90eb784f
 2012-03-27 00:34:04 +00:00
drh
36f6b891e6 Add the fts3view utility program. 
FossilOrigin-Name: f936c8ea16d21345fd1622272dc7e9850acb2493
 2012-03-26 21:57:53 +00:00
drh
cbf9450404 Fix FTS3 so that it works even without SQLITE_DEBUG. 
FossilOrigin-Name: a18c103121529c2e3c6a8ada16a4c40d14080670
 2012-03-26 14:36:42 +00:00
dan
6f4df8ac83 Modify the FTS integrity-check so that the checksums do not depend on the results of signed integer overflow, which is undefined in C. 
FossilOrigin-Name: f907fc3fb387e74bb66babcbf050748cb253a6fa
 2012-03-26 10:57:31 +00:00
dan
84bce14f77 Add a comment to explain how the FTS integrity-check works. 
FossilOrigin-Name: 64e8a116f39434a3b7347f01a47f88eef3276742
 2012-03-26 10:47:03 +00:00
dan
cbcd9f5357 Add an experimental integrity-check function to FTS. 
FossilOrigin-Name: 40fc8804743dfb005991e9c5ef7b0ebcb3c2e731
 2012-03-26 10:36:55 +00:00
drh
6c2e7e19fa Enable fts3 tables to use incremental merge by automatically creating the 
%_stat table when it is needed.

FossilOrigin-Name: cc051fc0b2d89603b27b94cf2afdbda417ee9d94
 2012-03-24 17:29:05 +00:00
dan
61fa09dbf2 Fix a failing assert() in the FTS3_LOG_MERGES related code. 
FossilOrigin-Name: 4220d52cb3426f1680b72d57ecc9f4ade029357d
 2012-03-24 17:09:11 +00:00
dan
0dfcdeb4f0 Add a comment to fts3SyncMethod() to justify the nMinMerge=64 constant. 
FossilOrigin-Name: af55ca5fc6778cb6d1a79a17dfa2d4e567ea1ccc
 2012-03-24 16:43:55 +00:00
drh
790964ebc4 Fix a bug in debugging code enabled when FTS3_LOG_MERGES is defined. 
FossilOrigin-Name: 2e06babf49de844d0e878d68114dbcc5ad4d6e54
 2012-03-24 16:18:08 +00:00
dan
45eddd6855 Remove the Fts3Table.mxLevel variable. 
FossilOrigin-Name: 67a0cffc9d07be7f09dad9d019a18160711295cd
 2012-03-24 16:11:21 +00:00
dan
4b1e4dabc3 Modify the way the number of leaves written and the maximum relative level are calculated in the auto-incr-merge code. 
FossilOrigin-Name: 0d841c957c6ec4afecb49504177c6279e09d7012
 2012-03-24 14:45:19 +00:00
drh
4ef9dfff97 An attempt at automatic incremental merging for FTS4. 
FossilOrigin-Name: ed69434cd89084f4b57bd2cc4f5cc558904af565
 2012-03-24 02:20:43 +00:00
dan
d59de73e27 Fix a spurious SQLITE_CONSTRAINT error that may be returned by an incr-merge operation. 
FossilOrigin-Name: ed7c17ea165f6348506bd23ebc58c427bb65d697
 2012-03-23 18:26:11 +00:00
dan
3501a91677 Remove an incorrect assert() statement. Fix a const-related warning. 
FossilOrigin-Name: 96ed47493b3d46344fd2105642f31690aee06674
 2012-03-23 14:38:49 +00:00
dan
e81eaec754 Following an incr-merge operation that does not completely consume its input segments, store context in the rowid==1 row of the %_stat table that allows the next incr-merge to pick up where the previous left off. 
FossilOrigin-Name: ab0a4f44fb67e9f0cb82297b80e728ca58cdb0fb
 2012-03-22 16:48:12 +00:00
drh
e239233982 Merge trunk changes into the fts4-incr-merge branch. 
FossilOrigin-Name: f61d5fb0281381228eb1a12a233bacaeb26b12a3
 2012-03-20 17:04:17 +00:00
drh
d13a3bc772 Fix one more compiler warning missed by the previous check-in. 
FossilOrigin-Name: bc03d99a78e90c02b69037e5f5f81537b5a3ac60
 2012-03-19 14:57:49 +00:00
drh
01ea399a84 Suppress harmless compiler warnings on windows in FTS4 and RTREE. 
FossilOrigin-Name: 4fd68647c8d4b120e04d054617cef31001f44c6f
 2012-03-19 14:51:19 +00:00
drh
bbe0520329 Avoid a compiler warning (an incorrect compiler warning, at that) in vs2010. 
FossilOrigin-Name: 7dd97f12cd268cac1241f0f3e8de94bb629b97c7
 2012-03-19 14:28:43 +00:00
dan
d1ab097d45 Fix various incorrect and missing comments and other style issues in and around the FTS incremental merge code. 
FossilOrigin-Name: 7aabb62c8ccbd2b8d216e25226f06e5820dec38a
 2012-03-17 16:56:57 +00:00
drh
c8d7b24e93 Cherrypick the [3475092cff] fix for 32-bit overflow with large language-ids 
into trunk.

FossilOrigin-Name: 2755edc7f1186ba8955f2c3550a90f40a55ddae2
 2012-03-16 16:52:54 +00:00
dan
81b35dc66c Fix some integer overflow problems that can occur when using large langauge id values. 
FossilOrigin-Name: 3475092cff862080a020d386076d739f0d22c9b2
 2012-03-16 15:54:19 +00:00
dan
e931b7f45f Add a comment to the FTS getAbsoluteLevel() function. No actual code changes. 
FossilOrigin-Name: 7e0f861beda4d74d0c3c9fb4abb3ddb5fee346bd
 2012-03-16 14:54:07 +00:00