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

163 Commits

Author SHA1 Message Date
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
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
dan
da7b45615d Add a fix and tests for the FTS deferred token logic. 
FossilOrigin-Name: 91daea7d2ec41f014fb30c6371aae447cc07f287
 2011-06-28 11:58:09 +00:00
dan
5b217c308f Changes to improve the selection of deferred tokens within phrases. 
FossilOrigin-Name: 2c4bbd90e2fca593c186bf412b608aff8c9f9061
 2011-06-27 11:15:53 +00:00
dan
17fb042578 Fix some of the code issues (missing comments etc.) in the new FTS code. 
FossilOrigin-Name: 8230d83120e0f4d217fde56e22c6f05aa5adee09
 2011-06-23 17:09:51 +00:00
drh
45de8d5f0f If "PRAGMA page_size" commands are not authorized, the FTS module will assume 
a page size of 1024.

FossilOrigin-Name: ba39382ef546b4c4ae15ed90ef0b6c87762bffef
 2011-06-23 00:59:41 +00:00
shaneh
2e2f36b4ed Fix a couple of compiler issues on Windows due to warning clean up. 
FossilOrigin-Name: 81e6f151d384fa1f1474175b39ad6dfa64f8da0d
 2011-06-20 20:50:49 +00:00
drh
7fd3392981 More compiler warning fixes. 
FossilOrigin-Name: ed2dda9329ca42e9c0be1986c78b091051e7598f
 2011-06-20 19:00:30 +00:00
drh
051eb38a26 Fix various harmless compiler warnings in FTS3 and RTREE. 
FossilOrigin-Name: fe62179efdea40887e23a16f898060b879013824
 2011-06-20 17:24:29 +00:00
dan
c5f21892a8 Avoid loading doclists for infrequent terms that are part of phrases twice. 
FossilOrigin-Name: 8f939723f742329cedba8930f71dff42004f3d0d
 2011-06-17 17:37:31 +00:00
dan
d4d21fea8e Fix a problem with NEAR queries executed inside a transaction that writes the FTS table. 
FossilOrigin-Name: 051c756c367837908f6691c0a36108e088c94f99
 2011-06-16 16:06:05 +00:00
drh
6b96771b82 Changes to #ifdefs so that the build goes correctly if the only FTS macro 
defined is SQLITE_ENABLE_FTS4.

FossilOrigin-Name: a0b43a320e6491de7070966ed7c3ec55fd660a85
 2011-06-16 00:54:45 +00:00
drh
1aa4f3e529 Fix a couple of compiler warnings. 
FossilOrigin-Name: 3899f3b95ed50773a72d907b39b451fefce69c9e
 2011-06-15 12:43:36 +00:00
dan
2cf1a1de4b Fix another bug caused by NEAR/matchinfo/order=DESC interaction. 
FossilOrigin-Name: 04907fbadeb743c95cc9f3529e63ef388684799f
 2011-06-14 09:00:27 +00:00
dan
c72f9d98cb Merge recent trunk changes into fts3-prefix-search branch. 
FossilOrigin-Name: 135ce30f62ebd6a1b239c18dbbd9c926ea507db4
 2011-06-14 07:22:30 +00:00
dan
806cbfc214 Remove unused parameters from internal fts3 function. 
FossilOrigin-Name: 06de3f2cbc27cdfd9f83218c9ea576f74f60d07b
 2011-06-14 07:14:43 +00:00
dan
2f77934385 Add tests for deferred tokens to fts3auto.test. Fix a problem with OR queries and deferred tokens. 
FossilOrigin-Name: b9fb69e55bb05a8819688ee63987f2a05c33d59b
 2011-06-13 17:00:12 +00:00
dan
99ebad90e3 Fix a bug exposed by combining matchinfo(), NEAR and "ORDER BY rowid DESC". 
FossilOrigin-Name: 5f6b87f420f21749aa7c72e020c50aca74890086
 2011-06-13 09:11:01 +00:00
dan
786b068967 Fix problems to do with using both OR and NEAR operators in a single expression. 
FossilOrigin-Name: 4e8dd19eef04777d800977faf1859a405e396f30
 2011-06-09 10:48:02 +00:00
dan
abf2545ed9 Fix various issues to do with deferred tokens, NEAR expressions and matchinfo(). 
FossilOrigin-Name: 3972a787df5ec253b99b148385655e7b68d851fa
 2011-06-08 18:39:07 +00:00
dan
3eabcf5f46 Have NEAR queries use incremental merging. Fix issues surrounding the deferred token optimization. 
FossilOrigin-Name: 9d10a6846b12a9cc8fd4fdc3affd931a27218b5a
 2011-06-07 18:35:45 +00:00
drh
ebcdc73f53 Merge the latest trunk changes into the fts3-prefix-search branch. 
FossilOrigin-Name: 567dd84359218245d4e6887547e2a48881f2c8e0
 2011-06-06 18:14:25 +00:00
dan
5289b01524 Modify fts3rnd.test to run tests for both "ORDER BY docid ASC" and "ORDER BY docid DESC" with both order=ASC and order=DESC FTS tables. Fixes for some bugs found. 
FossilOrigin-Name: 89f2f482e077241ac29a58eadf44a72a9c01f98c
 2011-06-06 14:51:50 +00:00
dan
9aab071780 Clean up the code for processing FTS4 options a bit. 
FossilOrigin-Name: 0425138a2365d23b07d88fda2b1f458f112f389d
 2011-06-06 06:55:38 +00:00
dan
76e04431ef Remove some unreachable code. 
FossilOrigin-Name: 650e1a79eda5a2134a1fbd305ab1f205a57c0892
 2011-06-04 20:13:24 +00:00
dan
b46ee91729 Allow the "order=DESC" and "order=ASC" parameters in FTS4 "CREATE VIRTUAL TABLE" statements. Tables created with "order=DESC" store all doclists in descending order, which allows optimizations normally applied to "ORDER BY docid ASC" queries to be used with "ORDER BY docid DESC" queries instead. 
FossilOrigin-Name: f6a0193f5a32603eb48bddc6297042dbd2ffe96e
 2011-06-04 20:04:35 +00:00
dan
126ba6c0ac FTS changes: Remove unreachable code. Fix bugs. When processing a large doclist incrementally, read from disk incrementally too. 
FossilOrigin-Name: a4c7e2820824e82580730c36f85aede2efa66754
 2011-06-03 18:00:19 +00:00
dan
e414854800 Changes to improve performance and support LIMIT clauses on fts3 tables. This branch is unstable for now. 
FossilOrigin-Name: 28149a7882a1e9dfe4a75ec5b91d176ebe6284e9
 2011-06-02 19:57:24 +00:00
dan
382874fc5c Minor changes made while planning a larger change. 
FossilOrigin-Name: 84097a4c759b1d65890af885f137d3cb16eef584
 2011-05-28 15:57:40 +00:00
drh
7ee4fdd7ba Fix some minor and harmless compiler warnings. 
FossilOrigin-Name: a4755e7088c3cc7c5ea191ce37f3950472f523ec
 2011-05-25 23:18:02 +00:00
dan
98b08e71f2 If a prefix index of size N is not present, use a prefix index of size N+1 along with the terms index for queries for prefixes of length N. 
FossilOrigin-Name: cc83991caae7c7d647432d5711b6cd80228c3002
 2011-05-25 19:17:32 +00:00
dan
73ae6e5e76 Merge trunk changes into experimental fts3-prefix-search branch. 
FossilOrigin-Name: f0f0a03db214b68a37069f64c27ae8520220c900
 2011-05-25 18:47:26 +00:00
dan
9d1f874ab3 Change fts4 so that the prefix= parameter is passes a comma-separated list of integers. For each integer N, a separate index of all prefixes of length N bytes is created. 
FossilOrigin-Name: be59bf49402d2e2f4b95fb6668849f3745cb7bf2
 2011-05-25 18:34:53 +00:00
drh
346506f97b Changes to savepoint in virtual tables for simpler and more consistent 
operation.

FossilOrigin-Name: 92f26a8b8f18832cb1f8ba7dd8e5b020e71a5883
 2011-05-25 01:16:42 +00:00
dan
09643ab745 If the fts4 option prefix=1 is specified, have the fts4 module maintain an index of prefixes as well as terms. 
FossilOrigin-Name: b5bdc639898ee22eebedeb560810e94e74de8aa4
 2011-05-24 18:49:45 +00:00
drh
e485522462 Do not invoke the xRollbackTo or xRelease methods of a virtual table without 
having first invoked an appropriate xSavepoint method.  Add assert() statements
to FTS3/4 to verify that this is happening in all cases.

FossilOrigin-Name: 651ef24249d8c22c4f13e4c0bb98a60099cfd23a
 2011-05-24 15:36:01 +00:00
dan
133d7dab17 Add extended return code SQLITE_CORRUPT_VTAB. Returned when the tcontents of the sqlite tables used internally by a virtual table module are invalid or inconsistent. 
FossilOrigin-Name: 8844e8bfb87314fb40ecb92705e8fff88f72bb38
 2011-05-17 15:56:16 +00:00