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

661 Commits

Author SHA1 Message Date
drh
37ca04880a Merge all changes from trunk. 
FossilOrigin-Name: f2e15b1974e55373b5819e3b2326653f890f409f
 2013-06-12 17:17:45 +00:00
drh
4f402f26b1 Improved processing of DISTINCT. 
FossilOrigin-Name: ba897100fed291d2025f68d09334f9985312298b
 2013-06-11 18:59:38 +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
drh
5822d6feb2 Fix test cases for the new EXPLAIN QUERY PLAN format. Add the 
wherecosttest tool.  Other fixes to logarithm cost.

FossilOrigin-Name: aa580e368e3c398b8377b80342dfdd906324c248
 2013-06-10 23:30:09 +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
drh
a3855653ed Adjust the xBestIndex methods on both the fuzzer and transitive_closure 
virtual tables so that an unused MATCH operator gets a really large cost.
Remove ambiguities from the fuzzer test cases.

FossilOrigin-Name: e2c1af78b65a8ace976fa6c035db212e1ffc79b8
 2013-06-03 21:25:28 +00:00
drh
d2b113bc33 Fix a bug in the transitive_closure virtual table that NGQP exposes. 
Update between.test module to avoid using sqlite_query_plan.

FossilOrigin-Name: aa66b864204b4b8717d845499132b987eb8ef924
 2013-06-03 18:50:15 +00:00
drh
44dc8e822b Fix EXPLAIN QUERY PLAN row counts for the rtree virtual table tests. 
FossilOrigin-Name: 15328987cc876d7a4e34561b6b0e08937aefe4be
 2013-06-03 18:14:31 +00:00
drh
def3367e50 Add the percentile() SQL function as a loadable 
extension in the ext/misc directory.

FossilOrigin-Name: a64d760d9290b1be78cdda7ae66d4f02c3b3fa53
 2013-05-28 20:25:54 +00:00
drh
f7b5496e8e Many small harmless comment changes. Removal of obsolete comments and 
fixing misspelled words.  No changes to code.

FossilOrigin-Name: a0d5cc9315dc6e9ef7dee4c3dfabf4e562d64376
 2013-05-28 12:11:54 +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
f15d23da6e Remove a stray tab character from the transitive_closure extension source code. 
FossilOrigin-Name: 7a9aa21c3506a10ab9465540e81071b39bca447d
 2013-05-17 20:16:41 +00:00
dan
11f71d6ae4 Fixes to allow testfixture to be compiled with SQLITE_OMIT_VIRTUAL_TABLE defined. 
FossilOrigin-Name: 00231fb0127960d700de3549e34e82f8ec1b5819
 2013-05-15 18:34:17 +00:00
drh
15912e70b7 Add the rot13.c loadable extension. 
FossilOrigin-Name: 8f9bd8e7a88eb11fb17d29954fa4b8c2840a5019
 2013-05-15 13:05:03 +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
drh
8c15d99a9a Fix the wholenumber virtual table so that it returns higher costs for 
unconstrained usage.  Cherrypick from [ceff8955020cd13].

FossilOrigin-Name: 7227b61512a534645c73883c2e37b4e647592e5d
 2013-05-08 14:20: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
015db9c859 Remove spellfix virtual table documentation from the source tree. 
Reference the separate documentation on the website instead.

FossilOrigin-Name: adcf78909ff9064b6e3c4dd15ccd3245c8cf270b
 2013-04-27 18:06:40 +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
0d02dd8292 Merge latest trunk changes. 
FossilOrigin-Name: 4d08e74d34e82f3be588049c9576a5c1008435e7
 2013-04-26 06:58:06 +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
ea41dc44c5 Added the nextchar.c extension. Minor changes to the spellfix.c extension 
so that it can be appended to an amalgamation and compiled without duplicating
symbols.

FossilOrigin-Name: 56b9a417f5451631f11c5206d625f11472ee65f9
 2013-04-25 19:31:33 +00:00
drh
d9555a7927 Add wiki documentation files for the spellfix1 virtual table. 
FossilOrigin-Name: 381564e91bbf619f99a48b0b7a94ac586cb9ee79
 2013-04-25 17:07:26 +00:00
drh
8416fc7fc7 Added the transitive_closure, ieee754, and amatch extensions. 
FossilOrigin-Name: 84018099c8715b982cd24ce9221f93c7379e8c08
 2013-04-25 16:42:55 +00:00
drh
b7045ab2ed Move the test_spellfix.c module to ext/misc/spellfix.c. 
FossilOrigin-Name: de556add10150140981a2e34b3712e96a7c262e3
 2013-04-25 14:59:01 +00:00
drh
e50db1c5d2 Convert the fuzzer virtual table into a loadable extension and move it 
to the ext/misc/fuzzer.c file.

FossilOrigin-Name: c8c69307f60c1d07ac666ae3797b7e3f286fd491
 2013-04-25 14:31:46 +00:00
drh
24b6422dcb Make test_wholenumber.c into a loadable extension and move it to 
ext/misc/wholenumber.c.

FossilOrigin-Name: efcc9dd012b5f193324dfc2ee9c2410c16fc1b3b
 2013-04-25 11:58:36 +00:00
drh
248f2be91a Make "test_regexp.c" into a loadable extension and move it over to 
ext/misc/regexp.c.  Add the "load_static_extension" command for testing
purposes.

FossilOrigin-Name: 860fc393bff27045e0593c3c51bf5577accd0b79
 2013-04-23 20:10:13 +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
mistachkin
65eb64765c Correct test numbering on several rtree tests. 
FossilOrigin-Name: 0adf8a3a4f2ca370568b35c9e8ce0e18f18701a2
 2013-04-10 02:56:24 +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
mistachkin
806c00666f Enhance RTree virtual table creation error messages that involve the getNodeSize() function. 
FossilOrigin-Name: 652233d646236d3fbca629813b20d075f00f3ed6
 2013-01-17 03:18:38 +00:00
mistachkin
88be0144fb Spelling and header fixes for the async extension. 
FossilOrigin-Name: 930ba85262b76e8b1555bcfe4637135c27e04d58
 2012-12-07 09:08:42 +00:00
mistachkin
46af59e96c In the async VFS, treat the new error code SQLITE_IOERR_DELETE_NOENT as success for xDelete. 
FossilOrigin-Name: c507ca4a8eb255923ff32001a1903dc85960f485
 2012-12-06 23:16:58 +00:00
drh
7b6be6f7bf Fix an uninitialized variable detected by valgrind. 
FossilOrigin-Name: ffd1e51490286abfaea68fd4b4b4cb967d87b04b
 2012-12-04 00:53:08 +00:00
drh
c5c0707970 Mark the "async" module as deprecated as its functionality has been 
superceded by WAL mode.  This closes ticket [f46ca03b55ae0e]

FossilOrigin-Name: 3d548db7eb14a4133afa6a94530f61fb3ef4a052
 2012-11-29 14:26:11 +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
c197eedbb4 Fix several compiler warnings seen with MSVC. 
FossilOrigin-Name: 8b5f617c2a5f0bf7bdbd9144aee58d69564db1e2
 2012-10-01 20:12:30 +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
0e3037ac36 Refactor the float-to-double rounding routines so that they compile without 
warnings.

FossilOrigin-Name: f607ad27c1ede27af24dbee10ca867c8f7761ee3
 2012-05-29 00:30:43 +00:00
drh
c6bff38216 Simplification to the coordinate rounding logic in RTree. 
FossilOrigin-Name: df24072de27555c6b530b02e821ea8b066c554fc
 2012-05-28 20:16:42 +00:00
drh
7923863602 When converting 64-bit floating point coordinates to 32-bit in RTree, take 
care to round the values such that the size of the bounding box is enlarged.

FossilOrigin-Name: f4e8ff03eae70334632455a867859cfcc25682be
 2012-05-28 19:19:25 +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
2aad3da6ea Fix a typo in the rtree6.test script that prevented it from running. 
FossilOrigin-Name: 221fe4a8ea5bea90031e459746ea71ff173e6f52
 2012-04-03 17:05:16 +00:00
drh
f439fbdab5 The SQLITE_RTREE_INT_ONLY compile-time option causes the RTree extension 
to use only integer math and store only integer coordinates.

FossilOrigin-Name: 02b7640f5118e0a635b68f65765191bb3171b7bd
 2012-04-02 21:35:42 +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
drh
7a48480d07 Fix harmless compiler warnings. 
FossilOrigin-Name: 74eadeec34c4b19cf5f8b7f648db3b7ad601a00e
 2012-03-16 00:28:11 +00:00
dan
4ab6f2b9c1 Modify incremental merge code to merge nMin segments at a time. 
FossilOrigin-Name: cd34bc1af4ba608ea3b52bab55bcfe0086711900
 2012-03-15 17:45:50 +00:00
dan
5730ef599c Add tests for incremental merge code. 
FossilOrigin-Name: 570473729d6561d81e6e5f8884fd18487008636e
 2012-03-14 20:01:52 +00:00
dan
a2af0aecdb Avoid allocating a large object on the stack in the incremental merge code. Use sqlite3_malloc() instead. 
FossilOrigin-Name: 36ae510de45be44efd34cff242d02fb21b7419ac
 2012-03-14 12:17:40 +00:00
dan
8af1fc721e Fix another bug in the incremental merge code. 
FossilOrigin-Name: f97b12e0955c4c29f9c31a186d72d87f7407782e
 2012-03-14 11:51:31 +00:00
dan
604f58a686 Fix some bugs in the incremental merge code. Some remain. 
FossilOrigin-Name: bff21683705a61b8b8672e0b44c287d1dc7c32a9
 2012-03-13 19:56:34 +00:00
drh
ab4f6385de Minor commenting and stylistic changes only. 
FossilOrigin-Name: a1747086c5e0c152fcf4bd9fa80a61b6f03f4a94
 2012-03-09 12:52:43 +00:00
dan
593c9824bc Add the 'merge=?,?' command to fts4. This still needs some work. 
FossilOrigin-Name: 741b8f897750eac3c9774fd65de7e40bb89781b1
 2012-03-08 18:39:03 +00:00
dan
fd6ddf91b0 Fix a problem compiling the test code in fts3_test.c when SQLITE_ENABLE_FTS3 is not defined. 
FossilOrigin-Name: b00ccda307caae597c143ab0586f90acb77f79cf
 2012-03-05 16:24:26 +00:00
dan
3a1abde7c8 Merge the fts4-languageid branch with the trunk. 
FossilOrigin-Name: 99a9073b5e411ce94f38ce49608baaa15de8b850
 2012-03-05 15:33:32 +00:00
dan
996073b3ae Add the xLanguageid method to sqlite3_fts3_tokenizer versions 1 and greater. 
FossilOrigin-Name: f8e9c445dd358c40e5a7bf3756b9f291909dbea7
 2012-03-03 18:46:41 +00:00
drh
9db1d56f02 Remove an obsolete comment from FTS3. No code changes. 
FossilOrigin-Name: 74d224b14467d8a6915d3cf372f45e0d28708fa2
 2012-03-02 20:34:57 +00:00
dan
7395599031 Fix problems with combining content= and languageid= in a single fts4 table. 
FossilOrigin-Name: 22491e7bc38aee43819b888e04241cb6a6ef73a3
 2012-03-02 19:53:02 +00:00
dan
8fb662b0be Fix the FTS 'optimize' command on multi-lingual databases. 
FossilOrigin-Name: 65fa693729a336e4d905ce72e6b9ccf4faa772bd
 2012-03-02 12:26:19 +00:00
dan
e3ddd1ac42 Fix a bug in merging FTS language tables for languages other than language 0. 
FossilOrigin-Name: d281cb8984c911a4c0cce2ec299e1351d8e580e4
 2012-03-02 11:48:50 +00:00
dan
7fcb214b93 Add the "languageid=" option to fts4. This code is still largely untested and alsmost certainly buggy. 
FossilOrigin-Name: bea257f70f10dd1111d79cabd1e1462dc651704d
 2012-03-01 19:44:20 +00:00
drh
548af8b69e Fix a compiler warning in FTS4. 
FossilOrigin-Name: b4cad1ce78e6bb967c472bec5c562a24b4dfebaf
 2012-01-31 23:34:21 +00:00
dan
585db0e23a Fix an FTS problem triggered by querying for an N character prefix using an N+1 character prefix index after rows have been deleted from the FTS table. 
FossilOrigin-Name: c05c3fd20d93f430140d762ead23bacd337ffb4d
 2012-01-25 16:29:45 +00:00
dan
42829635a2 Changes to the async-io module so that the xFileControl method returns SQLITE_NOTFOUND when a file-control is not recognized and so that it adds the second nul-terminator byte to filenames passed to the xOpen method of the underlying VFS. 
FossilOrigin-Name: 7036886e83fccad32187668306ee2ae3f950dfce
 2012-01-24 10:08:26 +00:00
drh
45d29309a7 Fix typos in commands. Combine the ExpandBlob and expandBlob macros into one. 
FossilOrigin-Name: fc9179e154751b51ddef429600d30a89d4a098bd
 2012-01-08 22:18:33 +00:00
drh
64803bd2fa Fix minor issues with FTS and RTREE discovered by coverity. 
FossilOrigin-Name: 1c27d842163e27c39bbe9409f50657b9de9ade6e
 2011-12-22 17:31:17 +00:00
dan
0c8cda6e0d Fix a problem in fts3_write.c causing stack memory to be referenced after it is out of scope. 
FossilOrigin-Name: f9c4a7c8f4e5821b47c1393d6272e32416d8886c
 2011-12-22 15:30:46 +00:00
dan
689e38f7cf Add a missing va_end() macro to fts3.c. 
FossilOrigin-Name: e6f825748a1d510c8f5529c79656bb5db9216231
 2011-11-04 10:37:21 +00:00
dan
042f88e5b4 Add new file ext/fts3/README.content, describing the experimental FTS4 content option. 
FossilOrigin-Name: 13a9d085e1a5654a97b8d26bae7182ca6c0c237b
 2011-10-31 11:36:29 +00:00
drh
6ed18b7110 Fix harmless compiler warnings in FTS4. 
FossilOrigin-Name: 1af4a25631c4077a9bfc64e15eb92fbf5146c89c
 2011-10-19 18:21:47 +00:00
dan
e459b07601 Merge the fts4-content branch with the trunk. 
FossilOrigin-Name: 8a4077057ddeb08e8edc5f20a75abaaba7a278ba
 2011-10-19 16:20:40 +00:00
dan
9743948386 Have FTS3 ignore ^ prefixes. The ^ syntax is only supported on FTS4 tables. 
FossilOrigin-Name: df36ac948179f37b432a88701b6c79299e073ce8
 2011-10-19 15:52:48 +00:00
dan
d17f70a624 Change the way ^ tokens work in FTS so that the filtering is done as part of reading the FTS index instead of waiting until an entire doclist has been retrieved and then filtering it. 
FossilOrigin-Name: 9b58c59eb4efaa38ce50a3ce1b52f9ba578c71d6
 2011-10-19 11:57:13 +00:00
dan
50a7544d6f Fix a problem in FTS to do with ^ tokens and the snippet() function. 
FossilOrigin-Name: 2c03b24f4cc6f2c28c9d5b9984320d41b8486c32
 2011-10-19 09:40:49 +00:00
dan
3f1ea8d114 If a token within an FTS query is prefixed with a '^' character, it must be the first token in a column of data to match. 
FossilOrigin-Name: 63ac33c860eb32ce96699f06bf83121cec2ffaca
 2011-10-18 19:39:41 +00:00
dan
a986d33fd3 Cherrypick patch [3126754c72] from the trunk into the content= branch. 
FossilOrigin-Name: f9b5b217088a6aeb25eba184ab92d1a842a680a6
 2011-10-18 12:49:59 +00:00
dan
42495cd46f Fix a floating-point exception that can occur when an FTS4 query contains a large number of tokens connected by AND or NEAR operators. 
FossilOrigin-Name: 3126754c72351c724be29d75a194bfc3e7b67205
 2011-10-18 12:44:04 +00:00
drh
30ddce6ff4 Added the tool/warnings-clang.sh script. Changes so that there are no 
warnings with either gcc or clang even including FTS4 and RTREE and
both with and without SQLITE_THREADSAFE=0.

FossilOrigin-Name: 39408702a989f907261c298bf0947f3e68bd10fe
 2011-10-15 00:16:30 +00:00
drh
086e4913b5 Fix a few minor and harmless clang warnings in FTS3 and RTREE. 
FossilOrigin-Name: b3324f6cc27c3bfb32b12eacace2fc731c2dd644
 2011-10-14 22:57:03 +00:00
dan
8dab211632 Handle updating the only row of an FTS table correctly. Fix for [9fd058691]. 
FossilOrigin-Name: 7e24645be2fe0ffe092212e7bcfa5b4500305811
 2011-10-13 17:16:45 +00:00
dan
deb9473250 Change FTS4 so that if both the content=xxx option and column names are specified, the virtual table assumes that the named columns correspond to columns of table xxx. 
FossilOrigin-Name: 289ee43179369fce2fde50870d72c445e184e896
 2011-10-05 15:11:30 +00:00
dan
8361b189c9 Fix a problem with IO error handling in the rebuild-index code. 
FossilOrigin-Name: c6ba81fcad32192674bd510e607f787adc1f7038
 2011-10-05 06:07:00 +00:00
dan
49fc336438 Improve test coverage of fts3.c. 
FossilOrigin-Name: 0f439944ab49a5691615bc170fdcf652055573df
 2011-10-04 19:41:50 +00:00
dan
cc5b81464a Add tests to check that modifying the schema of an FTS content table does not cause a crash in the FTS module. Also disable the deferred token optimization for content=xxx FTS tables. 
FossilOrigin-Name: be86c7061b68f403730bf63ea1f7dc0d9ceb0a3b
 2011-10-04 16:37:35 +00:00
dan
d8e454e19a Add experimental 'content' option to FTS4. 
FossilOrigin-Name: 1d27ea741f61c624e18bdc6a3b1c2d8574a64ddc
 2011-10-04 11:22:59 +00:00
dan
f9556a1a3d Allocate the correct size for the output buffer in fts3DoclistOrMerge(). Fix for [56be976859]. 
FossilOrigin-Name: 07788c0f7f3740c1c280f6ce4dc68401c30bae6e
 2011-09-13 19:08:43 +00:00