|
|
4ef9dfff97
|
An attempt at automatic incremental merging for FTS4.
FossilOrigin-Name: ed69434cd89084f4b57bd2cc4f5cc558904af565
|
2012-03-24 02:20:43 +00:00 |
|
|
|
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 |
|
|
|
3501a91677
|
Remove an incorrect assert() statement. Fix a const-related warning.
FossilOrigin-Name: 96ed47493b3d46344fd2105642f31690aee06674
|
2012-03-23 14:38:49 +00:00 |
|
|
|
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 |
|
|
|
e239233982
|
Merge trunk changes into the fts4-incr-merge branch.
FossilOrigin-Name: f61d5fb0281381228eb1a12a233bacaeb26b12a3
|
2012-03-20 17:04:17 +00:00 |
|
|
|
d13a3bc772
|
Fix one more compiler warning missed by the previous check-in.
FossilOrigin-Name: bc03d99a78e90c02b69037e5f5f81537b5a3ac60
|
2012-03-19 14:57:49 +00:00 |
|
|
|
01ea399a84
|
Suppress harmless compiler warnings on windows in FTS4 and RTREE.
FossilOrigin-Name: 4fd68647c8d4b120e04d054617cef31001f44c6f
|
2012-03-19 14:51:19 +00:00 |
|
|
|
bbe0520329
|
Avoid a compiler warning (an incorrect compiler warning, at that) in vs2010.
FossilOrigin-Name: 7dd97f12cd268cac1241f0f3e8de94bb629b97c7
|
2012-03-19 14:28:43 +00:00 |
|
|
|
6d972c1b98
|
Merge the latest trunk changes into the sessions branch.
FossilOrigin-Name: 2277c70b6f14e2f8043112a5c49a8bc18b7504f3
|
2012-03-19 11:17:17 +00:00 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
e931b7f45f
|
Add a comment to the FTS getAbsoluteLevel() function. No actual code changes.
FossilOrigin-Name: 7e0f861beda4d74d0c3c9fb4abb3ddb5fee346bd
|
2012-03-16 14:54:07 +00:00 |
|
|
|
7a48480d07
|
Fix harmless compiler warnings.
FossilOrigin-Name: 74eadeec34c4b19cf5f8b7f648db3b7ad601a00e
|
2012-03-16 00:28:11 +00:00 |
|
|
|
4ab6f2b9c1
|
Modify incremental merge code to merge nMin segments at a time.
FossilOrigin-Name: cd34bc1af4ba608ea3b52bab55bcfe0086711900
|
2012-03-15 17:45:50 +00:00 |
|
|
|
5730ef599c
|
Add tests for incremental merge code.
FossilOrigin-Name: 570473729d6561d81e6e5f8884fd18487008636e
|
2012-03-14 20:01:52 +00:00 |
|
|
|
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 |
|
|
|
8af1fc721e
|
Fix another bug in the incremental merge code.
FossilOrigin-Name: f97b12e0955c4c29f9c31a186d72d87f7407782e
|
2012-03-14 11:51:31 +00:00 |
|
|
|
604f58a686
|
Fix some bugs in the incremental merge code. Some remain.
FossilOrigin-Name: bff21683705a61b8b8672e0b44c287d1dc7c32a9
|
2012-03-13 19:56:34 +00:00 |
|
|
|
ab4f6385de
|
Minor commenting and stylistic changes only.
FossilOrigin-Name: a1747086c5e0c152fcf4bd9fa80a61b6f03f4a94
|
2012-03-09 12:52:43 +00:00 |
|
|
|
593c9824bc
|
Add the 'merge=?,?' command to fts4. This still needs some work.
FossilOrigin-Name: 741b8f897750eac3c9774fd65de7e40bb89781b1
|
2012-03-08 18:39:03 +00:00 |
|
|
|
ddf01aeb16
|
Merge in the latest trunk changes.
FossilOrigin-Name: ff86875ca35e04cea6c3d5e1b5117a4f227a6b15
|
2012-03-05 16:26:00 +00:00 |
|
|
|
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 |
|
|
|
3a1abde7c8
|
Merge the fts4-languageid branch with the trunk.
FossilOrigin-Name: 99a9073b5e411ce94f38ce49608baaa15de8b850
|
2012-03-05 15:33:32 +00:00 |
|
|
|
996073b3ae
|
Add the xLanguageid method to sqlite3_fts3_tokenizer versions 1 and greater.
FossilOrigin-Name: f8e9c445dd358c40e5a7bf3756b9f291909dbea7
|
2012-03-03 18:46:41 +00:00 |
|
|
|
9db1d56f02
|
Remove an obsolete comment from FTS3. No code changes.
FossilOrigin-Name: 74d224b14467d8a6915d3cf372f45e0d28708fa2
|
2012-03-02 20:34:57 +00:00 |
|
|
|
7395599031
|
Fix problems with combining content= and languageid= in a single fts4 table.
FossilOrigin-Name: 22491e7bc38aee43819b888e04241cb6a6ef73a3
|
2012-03-02 19:53:02 +00:00 |
|
|
|
8fb662b0be
|
Fix the FTS 'optimize' command on multi-lingual databases.
FossilOrigin-Name: 65fa693729a336e4d905ce72e6b9ccf4faa772bd
|
2012-03-02 12:26:19 +00:00 |
|
|
|
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 |
|
|
|
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 |
|
|
|
fdf1795618
|
Pull all the latest trunk changes into the sessions branch.
FossilOrigin-Name: 361fb66a799f4f253e61ca94d999accde2c75b2c
|
2012-02-10 17:54:52 +00:00 |
|
|
|
548af8b69e
|
Fix a compiler warning in FTS4.
FossilOrigin-Name: b4cad1ce78e6bb967c472bec5c562a24b4dfebaf
|
2012-01-31 23:34:21 +00:00 |
|
|
|
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 |
|
|
|
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 |
|
|
|
af49af7f9e
|
Update sessions branch with latest changes from trunk.
FossilOrigin-Name: 01c84fd391a0ca1f5245c7eff0644d0cc6cff86b
|
2012-01-14 13:50:12 +00:00 |
|
|
|
45d29309a7
|
Fix typos in commands. Combine the ExpandBlob and expandBlob macros into one.
FossilOrigin-Name: fc9179e154751b51ddef429600d30a89d4a098bd
|
2012-01-08 22:18:33 +00:00 |
|
|
|
54cced185c
|
Merge all of the latest trunk changes into the sessions branch.
FossilOrigin-Name: a9bcb432f58b96f079a73c456efd4851c582221e
|
2012-01-05 13:02:36 +00:00 |
|
|
|
64803bd2fa
|
Fix minor issues with FTS and RTREE discovered by coverity.
FossilOrigin-Name: 1c27d842163e27c39bbe9409f50657b9de9ade6e
|
2011-12-22 17:31:17 +00:00 |
|
|
|
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 |
|
|
|
689e38f7cf
|
Add a missing va_end() macro to fts3.c.
FossilOrigin-Name: e6f825748a1d510c8f5529c79656bb5db9216231
|
2011-11-04 10:37:21 +00:00 |
|
|
|
f004e1d69e
|
Merge in all changes found in the version 3.7.9 release candidate.
FossilOrigin-Name: 23580718e1c15ddb89682d0e7566da4d7276bfe9
|
2011-10-31 14:34:31 +00:00 |
|
|
|
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 |
|
|
|
efb1ca3738
|
Merge the latest trunk enhancements into the sessions branch.
FossilOrigin-Name: 8baef58170ff851d0c4387a6888f59b487b4f33c
|
2011-10-21 17:08:23 +00:00 |
|
|
|
6ed18b7110
|
Fix harmless compiler warnings in FTS4.
FossilOrigin-Name: 1af4a25631c4077a9bfc64e15eb92fbf5146c89c
|
2011-10-19 18:21:47 +00:00 |
|
|
|
e459b07601
|
Merge the fts4-content branch with the trunk.
FossilOrigin-Name: 8a4077057ddeb08e8edc5f20a75abaaba7a278ba
|
2011-10-19 16:20:40 +00:00 |
|
|
|
9743948386
|
Have FTS3 ignore ^ prefixes. The ^ syntax is only supported on FTS4 tables.
FossilOrigin-Name: df36ac948179f37b432a88701b6c79299e073ce8
|
2011-10-19 15:52:48 +00:00 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
a986d33fd3
|
Cherrypick patch [3126754c72] from the trunk into the content= branch.
FossilOrigin-Name: f9b5b217088a6aeb25eba184ab92d1a842a680a6
|
2011-10-18 12:49:59 +00:00 |
|
