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

512 Commits

Author SHA1 Message Date
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
drh
ec661058dd Fix harmless compiler warnings on unix. 
FossilOrigin-Name: 90b1aea17400bbda5ebc8ae4eb4e12127519e42e
 2011-07-09 16:17:18 +00:00
dan
f443e317f7 Remove accidental global variable "doclist" from fts3Int.h. 
FossilOrigin-Name: f244b2f3959e86fac555b91438cfe90528ab1648
 2011-07-07 07:37:53 +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
b8ae1afba1 Merge latest trunk changes with fts3-changes branch. 
FossilOrigin-Name: 226686475c28cdc87e86d2d3f10014436a9a2b8f
 2011-06-28 09:51:22 +00:00
dan
0ea2517c4e Changes to allow FTS to be compiled as a loadable module again. 
FossilOrigin-Name: 29e69f389cb0078e125ba5814a68b3fe8cf634c6
 2011-06-28 07:15:43 +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
6764a70086 Fix a problem where FTS test code was not being included in the testfixture build when SQLITE_ENABLE_FTS4 was defined. 
FossilOrigin-Name: e539d08a4dda073dc67dc39a104f89374d3bd8e9
 2011-06-20 11:15:06 +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
10fc4d8c45 Add a missing declaration to fts3Int.h. 
FossilOrigin-Name: 3bfd4466f50711eb71d1a13231025ff4e1e76246
 2011-06-17 16:04:39 +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
bf4bc8c254 Fix so that the TCL test harness works even if SQLITE_ENABLE_FTS is omitted. 
FossilOrigin-Name: 63ebcb52a1909aca80f2fef3e982f8fb5929b73b
 2011-06-15 13:02:21 +00:00
drh
1aa4f3e529 Fix a couple of compiler warnings. 
FossilOrigin-Name: 3899f3b95ed50773a72d907b39b451fefce69c9e
 2011-06-15 12:43:36 +00:00
dan
376d1e5c4f Add an interface to better test incremental loading of doclists by FTS4. Also some tests for this and term prefix queries. 
FossilOrigin-Name: 7a3813138d1a5c5d99f4756c79998831d779774f
 2011-06-15 08:30:29 +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
dan
807d0fcaba Avoid including fts3_term.c in the amalgamation, as it contains test code only. 
FossilOrigin-Name: f392b7ae0266b4c694836583cb91b10f2b6c0752
 2011-05-17 14:41:36 +00:00
drh
e578b5967c Increase the iVersion for sqlite3_module needed for the xSavepoint, 
xRelease, and xRollbackTo methods from 1 to 2.  This is so that it will
conform to published documentation.

FossilOrigin-Name: 0f4954e9793332573d4ffa0c1e199180f4cb990a
 2011-05-06 00:19:57 +00:00
dan
7b0ced74c0 Merge vtab-conflict branch with trunk. 
FossilOrigin-Name: 8f9666af5f9459cbd0305a86281d745ea6163acf
 2011-05-04 17:23:19 +00:00
dan
62d6c7e32b Fix a couple of compiler warnings in the FTS code. 
FossilOrigin-Name: 1a113359705d307efa1833b1dfa5542b045dae43
 2011-05-04 16:30:05 +00:00
dan
e1c8e13bf6 Fix a performance problem in queries that use "ORDER BY rowid DESC" and one or more FTS auxiliary functions. 
FossilOrigin-Name: 95e09b20e9aad28f829c8950f3632debe473070a
 2011-05-04 15:41:18 +00:00
dan
0f599faa29 Optimize "ORDER BY rowid/docid DESC/ASC" clauses on FTS tables. 
FossilOrigin-Name: 13395121e3d17ab6581dc5f6736ea324321a374c
 2011-05-04 12:52:59 +00:00
dan
c6055c7374 Have r-tree virtual tables support on-conflict clauses. 
FossilOrigin-Name: 822ab52f1023b1c4973c806cc75454acd4e95fd0
 2011-04-28 18:46:46 +00:00
dan
3480a01dad Add documentation for the newly introduced sqlite3_vtab_config() and on_conflict() API functions. Test that encountering an SQLITE_MISMATCH in fts3 does not corrupt the full text index. 
FossilOrigin-Name: abdd70ae0424ccadb7edaf16e970c78b5257d23c
 2011-04-27 16:02:46 +00:00
dan
a311b80392 Extra tests for fts3. And fixes for conflict-handling related problems in fts3. 
FossilOrigin-Name: fb4a355871d9482ccb28b6ba03b842b3cc87b696
 2011-04-26 19:21:34 +00:00
dan
b061d058cb Add support for on conflict clauses to fts3/fts4. 
FossilOrigin-Name: 6d2633a6d0a9bb88fb1a6adac0827dc51df2d4d2
 2011-04-25 18:49:57 +00:00
dan
355c53b6ef Avoid passing NULL to the xOpen method of an FTS3/4 tokenizer. 
FossilOrigin-Name: 0dd09fc034c127718366d3a3183e367d2f9fd82d
 2011-04-19 06:43:22 +00:00
drh
fcd71b6010 Suppress many harmless compiler warnings, mostly signed/unsigned comparisons 
within asserts or unused parameters in extensions.

FossilOrigin-Name: 3eeb0ff78d04891b5fd1a3d99a9fb8cfbed77a81
 2011-04-05 22:08:24 +00:00
dan
0370493760 Fix a bug in fts4 to do with matchinfo and deferred tokens. 
FossilOrigin-Name: 30d42dc66f19ef5cc5b27d6273eadf56619a3ce8
 2011-03-23 17:10:43 +00:00
dan
fb1f98a1ac Fix a numbering issue in rtree6.test. Add a couple of extra tests. 
FossilOrigin-Name: 0b7668a71ef8995ea0306c7d890f87761961426e
 2011-03-23 10:52:23 +00:00
dan
8ad5c9492d Change the rtree module to support queries with multiple comparison operators (i.e. > or <) of the same type on a single column. 
FossilOrigin-Name: 387b55aa9bb0f978641f9c2fa40f84fd98662047
 2011-03-23 10:38:49 +00:00
drh
3fcdfb35a6 Fix quoting of the result in rtreeB.test. 
FossilOrigin-Name: c6532b35cc5a81cc753a22e0165bfdd5143941f1
 2011-03-02 22:07:29 +00:00
drh
befd5f3c20 Make sure the rtreenode() testing and analysis routine in the RTREE extension 
can handle 64-bit rowids.  This fix is in response to a message on the
mailing list.

FossilOrigin-Name: 24602557fc3295fe2836d269175f12ec680ac011
 2011-03-02 15:44:35 +00:00
dan
2fe88b7ca4 Ensure fts4aux can handle a table name in single or double quotes as a constructor argument. 
FossilOrigin-Name: 929d62e496bb36a3ee0e19ec4609329d79aaeddc
 2011-02-05 15:47:12 +00:00
dan
bb7e77c758 Add test cases for fts4aux. Fix a bug affecting fts3 tables with multiple columns. 
FossilOrigin-Name: dc511e60a65232a7087e12ff40b63506cf37a634
 2011-02-05 14:37:57 +00:00
dan
4c600ac389 Change fts4aux to (additionally) report on term frequency in individual columns of an fts table. 
FossilOrigin-Name: 3996f92a9aca9ac2628be003eca83c8f954c71de
 2011-02-04 18:56:25 +00:00
dan
767f9a8f9e Extra tests for fts4 compress/uncompress hooks. Fix some minor problems with the same. 
FossilOrigin-Name: 80225abe79b0a7723b922ec129954438af95855a
 2011-02-03 12:48:17 +00:00
dan
16690ed167 Extra tests for the fts4aux module. 
FossilOrigin-Name: cfc475690d85ea7e3547424289d9837f46ab7ef4
 2011-02-03 10:56:00 +00:00
dan
20d5f354e9 Optimize handling of equality and range constraints on the "term" column of an fts4aux table. 
FossilOrigin-Name: 386701ded2bcee5309ec9f285d94e6eb1eade193
 2011-02-02 17:30:43 +00:00
dan
ee85a51092 Add missing file fts3_aux.c. 
FossilOrigin-Name: 0147d9739f318a02721d3ae0e7be339a19231f60
 2011-02-02 04:26:46 +00:00
dan
0bfda98155 Fix a case in fts4 where a corrupt %_stat table could lead to a crash. 
FossilOrigin-Name: 4ade96ce974244fc34bb97713d3cba10e3d33056
 2011-02-01 17:55:48 +00:00
dan
a240fd01b6 Add virtual table module "fts4aux", used to inspect the full-text index of an fts4 table directly. Also add the "compress" and "uncompress" fts4 options. 
FossilOrigin-Name: b010ddcc52889160af2183a33c5f483bb0ae91b9
 2011-02-01 16:34:32 +00:00
dan
a8ab60c648 Fix a couple of crashes in fts3 that can occur if the database contents are inconsistent. 
FossilOrigin-Name: 811e12cddfb3246c6cf3d5085bd9b72b12e05550
 2011-01-13 11:20:04 +00:00
dan
86596e552e Fix a segfault that can occur in matchinfo if an fts4 table contains mostly zero-length documents. Specifically, if the table contains more rows than it does bytes of text. 
FossilOrigin-Name: fe9047668eaaf76e7aa1ef1f32dec7c7c4226e45
 2011-01-13 10:58:26 +00:00
dan
b9a93d70b8 Reduce the number of calls to sqlite3_realloc() made by fts3 when querying for position information of a term prefix. 
FossilOrigin-Name: 7088d9450f403f12f67eed558e368573101245d6
 2010-12-24 15:49:27 +00:00
dan
d3842765ae Fix a performance regression in matchinfo(). 
FossilOrigin-Name: fa37d8eb7cd8049689068af2a80fe2cbb4a603f1
 2010-12-10 17:06:48 +00:00
dan
014153f092 Fix a memory leak in fts3 that can occur in an OOM condition. 
FossilOrigin-Name: 507027b70f71689f77dee3e849ebc66a1c4c3166
 2010-12-04 18:20:18 +00:00
dan
4d8d27813c Fix a bug causing fts3 to incorrectly return SQLITE_CORRUPT. 
FossilOrigin-Name: 099195b14829f375055345b8322905ccd073d442
 2010-12-02 17:39:26 +00:00
dan
c79b6a8c51 Fix a (harmless) valgrind warning in the rtree extension. 
FossilOrigin-Name: a94b9a395e0be9549d8c28e2b86b995c73c7b671
 2010-12-02 11:24:58 +00:00
shaneh
556f6bbc92 Fix some warnings under MSVC in fts3 module. 
FossilOrigin-Name: c7771c0b22f2b45a47070cf84b9ecf1011e40404
 2010-12-01 15:36:00 +00:00
dan
0cb3a1eca4 Fix compiler warnings discovered while building SQLite on [http://www.devio.us/]. 
FossilOrigin-Name: 5602ec95aa2a74d0624bb6c7d53e7a0d35536253
 2010-11-29 17:55:18 +00:00
drh
6ea28d6d84 Fix various compiler warnings. 
FossilOrigin-Name: c412f61229b6ab1ac90b932afd56f7c5e3ba1cfe
 2010-11-26 16:49:59 +00:00
dan
102b7de0e9 Fix an uninitialized variable in fts3.c. 
FossilOrigin-Name: 3c3d076b42da36cd5413749ec022d0349325edfa
 2010-11-26 16:31:43 +00:00
dan
72de061fb1 Add a couple of comments to fts3_snippet.c. 
FossilOrigin-Name: ad8df6c5ee0055cf1161a3b700d69dbe07d969bc
 2010-11-26 15:13:31 +00:00
dan
c2f16cb12b Add coverage tests (and associated fixes) for new matchinfo() code. 
FossilOrigin-Name: 70495ceccc793d608930f59e330777f287ba1ede
 2010-11-25 17:49:28 +00:00
dan
cf56554f42 Fix bugs in fts3 function matchinfo() when used with deferred tokens. 
FossilOrigin-Name: ddc2b7ec2618b010c981ecfa05b3e53a9fac686f
 2010-11-25 10:33:54 +00:00
dan
f9376540fa Add code for the matchinfo 'longest common substring' feature. 
FossilOrigin-Name: 71011a4f9baf09ec6935ad591145252bf3c286ed
 2010-11-24 19:26:18 +00:00
dan
d6e12384bd Fix crashes that can occur when queries are run on an FTS4 table containing zero rows. 
FossilOrigin-Name: ed61fd20adef44d0f6b2345e0205b25f3641a15e
 2010-11-24 15:02:22 +00:00
dan
ad3acbbfb3 Remove some unused code from fts3. Add tests to fts3matchinfo.test. 
FossilOrigin-Name: ae40b34cf7c24c9601bdfb5cbe5b20f05a376ea8
 2010-11-24 11:51:56 +00:00
dan
1e66e40eb9 Experimental changes to fts3 function matchinfo(). 
FossilOrigin-Name: 9cf0f2b76bc68c168e3fa861b7235f384db21d38
 2010-11-23 19:16:47 +00:00
drh
3b691b5466 Restrict the scope of the fts3ExprCost() subroutine inside of FTS3. 
FossilOrigin-Name: 76681870a4705179f78976e7fda638a6fea0b9f9
 2010-11-18 13:52:34 +00:00
drh
437261d077 Fix compiler warnings. 
FossilOrigin-Name: 6c4f1d5c24522d1f541a2b96b229ad0374f99c19
 2010-11-18 13:47:50 +00:00
dan
3985479b9d Change some test cases to account for the new EXPLAIN QUERY PLAN output. 
FossilOrigin-Name: 88a854e18fc6bd619fa8d8a911abff50a9b76b9e
 2010-11-15 16:12:58 +00:00
dan
af4c214e1f Changes to allow FTS4 tables to be created without the underlying %_docsize table (in order to save space). 
FossilOrigin-Name: 31989b18f53d97eddfb39660ef04fbf9463583e0
 2010-11-02 17:41:52 +00:00
dan
cfddb09e3b Test cases and minor changes to make fts3 more robust in the face of a corrupt database. 
FossilOrigin-Name: b770290561f5450e4d985ca0050ef5eb01657c80
 2010-10-30 15:21:13 +00:00
dan
797f3ee87c Add extra test cases and changes to fts3 to avoid crashing on a corrupt database. 
FossilOrigin-Name: 252f0e457d3e33404df87d3e6c44ede61b78319c
 2010-10-29 18:45:10 +00:00
dan
8aaa252d8c Fix a buffer overread in fts3 that can occur if the database is corrupt. 
FossilOrigin-Name: 84194c4195d7144ff7f9cedcdc74fdd908f3bfcd
 2010-10-27 16:52:27 +00:00
dan
8c30711208 In fts4, store the total number of bytes of for all records in the table in the %_stat table. 
FossilOrigin-Name: 941647d121ac60e2eabc998cfe79b157fb918d7e
 2010-10-27 10:55:54 +00:00
dan
c7c91257d5 More coverage tests for fts3.c. 
FossilOrigin-Name: 7a2f2864002d4e9a487e2779ae05513880ecb4d1
 2010-10-26 07:14:25 +00:00
dan
e25ac099f1 Further improvements to coverage of fts3.c. Fixes for bugs revealed by the same. 
FossilOrigin-Name: 918b609290127f54326c638d82837d117398eade
 2010-10-25 19:01:25 +00:00
dan
ddf80eb8ce Test coverage improvements for fts3.c. 
FossilOrigin-Name: a8b1d99899678b72c2a487909eabed321593d55f
 2010-10-25 12:47:43 +00:00
dan
378d0ab97b Fixes for the matchinfo() function related to FTS4 common token handling. 
FossilOrigin-Name: deb80eac9112d21835dfd3cee08ed8f09d975bf7
 2010-10-23 19:07:30 +00:00
dan
789cb8f5cf Add missing comments and fix compiler warnings in new FTS3/4 code. Other minor fixes too. 
FossilOrigin-Name: 1c9c70fec3c88319f7b2efe5316694a6ce0ab1a5
 2010-10-22 16:44:39 +00:00
dan
ca3b8f9c86 Merge trunk changes into experimental branch. 
FossilOrigin-Name: fd1e5cade04961c2f5438a1dfcc2e15eafb4503f
 2010-10-21 15:49:47 +00:00
dan
4e76cc3650 Updates to FTS4 to improve performance and make more accurate cost estimates for prefix terms. 
FossilOrigin-Name: d0a450ce78e99f55c862f26f9332786660007a0a
 2010-10-20 18:56:04 +00:00
dan
4f7c5e684a Experimental changes to fts4 to try to selectively avoid loading very large doclists. 
FossilOrigin-Name: 5ae0ba447a561e3b6637b52f9b83a9fc683d2572
 2010-10-19 14:07:59 +00:00
dan
af7626f5fb Add tests to e_delete.test. 
FossilOrigin-Name: fab3b383bb2c4764a56811f22ff4c783441918e8
 2010-09-23 18:47:36 +00:00
dan
b51d2fa88d Further tests and changes to make the r-tree module more robust. 
FossilOrigin-Name: 7ff3574b9c581b5e1f2b6f98028106c638e59bb7
 2010-09-22 19:06:02 +00:00
dan
bd188afd4c Add new file rtreeA.test, to test that the r-tree extension doesn't crash if it encounters a corrupt or inconsistent database. 
FossilOrigin-Name: 68a305fd5ac917317fee2ef6670ac389a120e502
 2010-09-22 14:19:53 +00:00
drh
9fe5b85d36 Remove additional occurrences of &lt;ctype.h&gt; from FTS2. 
FossilOrigin-Name: ee52589c80a6d37dc8c7a86a0e3b531ec4dd8d45
 2010-09-17 17:10:31 +00:00
dan
8786f7f589 Have all FTS3 queries obtain a read or write table-lock at the shared-cache level before doing anything else. 
FossilOrigin-Name: 018e82c775d0fb8c0d90cddf7a87c20c8c8172a9
 2010-09-17 15:28:41 +00:00
drh
f2fcd0750b Completely remove all trace of ctype.h from FTS2. 
FossilOrigin-Name: 876845661a944ec1c841d1e2486d070efb76e5cd
 2010-09-17 01:07:53 +00:00
dan
d9e430e953 When building from the amalgamation with ENABLE_RTREE defined, do not try to include sqlite3rtree.h. 
FossilOrigin-Name: 5b63e981f1bef26eae0da3144a08bdc54dc36709
 2010-09-11 05:15:37 +00:00
dan
9977edc7c6 Changes to comments and type names in rtree.c. 
FossilOrigin-Name: 7c4f80ad272138cd4ab30455fae6a36498362933
 2010-08-31 15:54:21 +00:00
dan
18ec96b3a3 Add the "circle" test geometry callback to test_rtree.c. And tests for the same. 
FossilOrigin-Name: 169b8ba4be9c3941c742eded80dbacdcd2465bc4
 2010-08-31 15:02:00 +00:00
dan
c223b8f1a8 When generating sqlite3.h, append the contents of sqlite3rtree.h. 
FossilOrigin-Name: fc4d75370bad9021d01b76dbb1b8dde9ff223d2c
 2010-08-30 18:39:49 +00:00
dan
7bddb7550b Add tests (and associated fixes) to restore coverage of rtree.c. 
FossilOrigin-Name: b06f4695bdab244d9c764c082cd434a764dc5c29
 2010-08-30 15:43:45 +00:00
dan
3b5a7a377c Add file sqlite3rtree.h. 
FossilOrigin-Name: e1d9ffce0f84469eeb926f50030cb772de98a652
 2010-08-30 11:34:39 +00:00
dan
9508daa929 Add code to allow user-defined searches of r-tree tables. Still largely untested. 
FossilOrigin-Name: 782ca3b716ee1ecb0dfb5ab6f21dfd73d41758e4
 2010-08-28 18:58:00 +00:00
dan
897230eb7a Fix a couple of memory leaks in r-tree that can occur following an OOM condition. 
FossilOrigin-Name: 1975a27cdec09e1dad4ca8281a87dd7754c02c3e
 2010-08-26 14:15:37 +00:00
dan
c23454023e Remove unreachable condition from rtree.c. 
FossilOrigin-Name: 90f40cd36860d3af13ec24575dff7cc1f57ac493
 2010-08-26 11:27:22 +00:00
dan
2bf19178f7 Improve coverage of rtree.c some more. 
FossilOrigin-Name: bee1959dde19ebec20a7ffcb732aee0c8bb2e67d
 2010-08-26 07:59:10 +00:00
dan
f836afd44a Further test coverage improvements for rtree.c. 
FossilOrigin-Name: 05f6c1aebbe757dd3b54fd027057b9db7ae3a990
 2010-08-25 19:04:38 +00:00
dan
92e01aafe1 Test cases to improve coverage of rtree module. Fixes associated with the same. 
FossilOrigin-Name: 865cec04e4d814f63fb71feb67de7f06f8d54035
 2010-08-25 17:53:17 +00:00
dan
a235d0ca63 Fixes to allow fts3 tables to be renamed mid-transaction. 
FossilOrigin-Name: d1c875320a045c3938c765ceb543dfba1a0ecf0b
 2010-08-24 16:59:47 +00:00
drh
ee2c813b72 The R-tree module should not assume that its shadow tables are consistent. 
If a problem is found in a shadow table, return SQLITE_CORRUPT.

FossilOrigin-Name: 7f2f71cc9e3c39093f09231f448576cff6afb5fe
 2010-08-24 01:49:47 +00:00
dan
036391f7f8 Update an r-tree extension test case to account for recent changes to the query planner. Also fix a comment in rtree.c. 
FossilOrigin-Name: eaaca669a4afc83906806b22365b010c83bc3db8
 2010-08-11 12:26:46 +00:00
drh
f053d5b6c7 Fix two comment typos that were reported on the mailing list. 
FossilOrigin-Name: 88bf9016277c133dfbf4f4b2be0c35c9fe9fabd6
 2010-08-09 14:26:32 +00:00
drh
c78db070a3 Remove all vestiges of ctype.h from FTS3. 
FossilOrigin-Name: b8b465ed2c56b23b50334680a2a940885b1ac530
 2010-08-06 19:00:12 +00:00
drh
60176fa925 Updates to the README.txt file for ICU. 
FossilOrigin-Name: d37443d33388b402e610a00c362a1e2e79548801
 2010-07-30 00:31:08 +00:00
dan
a69f7d5aa5 Re-introduce the prefix-search optimization of [feef1b15d6], which was lost in a reorganization of FTS3 code. 
FossilOrigin-Name: d692434b4935e8e7858230af1c126b0be8203077
 2010-07-19 11:16:36 +00:00
dan
d846c5e047 In the async-IO module, do not increment the open file-counter until after an "open file" event has been added to the event queue. Otherwise, an OOM may cause the system to increment the counter even though no file was successfully opened. 
FossilOrigin-Name: 15a190dc5769beb53b89254543e744a964cd86ed
 2010-07-12 12:22:29 +00:00
shaneh
b638a3d3eb Fix some MSVC compiler warnings in the ASYNC extension. 
FossilOrigin-Name: b951c8675df3e719c30a1dd94200b7c04252a3ea
 2010-07-07 16:49:46 +00:00
dan
78f1e53840 Change the async-IO extension to return SQLITE_IOERR_SHORT_READ when appropriate. This prevents a valgrind warning in the test suite. 
FossilOrigin-Name: d9e3287900ae4aa7722ad0132bb8d6cd2755d3a6
 2010-07-07 11:05:21 +00:00
shaneh
8a300f8095 Fix a couple more compiler warnings under MSVC. 
FossilOrigin-Name: 26bc27e3f4c8a666f3358f73fc21eccdec3508f6
 2010-07-02 18:15:31 +00:00
dan
6d3cb2fbae Fix for [9861b74ab9]. Correctly handle strings with zero tokens in the fts3 offsets() function. 
FossilOrigin-Name: d37034f7fc46b83be681247fde97823736c994cc
 2010-03-24 15:57:33 +00:00
drh
7bca0a3660 More commenting and documentation enhancements in FTS3. 
FossilOrigin-Name: 892e286709c4a72aae364b85dd43bea525bb1b4d
 2010-03-23 18:24:06 +00:00
drh
d6291c9155 Fix up obsolete comments in FTS3 to conform to the latest nomenclature. 
Add new comments to better explain FTS3 operation.

FossilOrigin-Name: 3e4a0082170155b5b779afd075a3ee650530ca68
 2010-03-23 15:46:41 +00:00
dan
3f0d9d3846 Have the xUpdate() method of the rtree module virtual table implementation set the *pRowid output variable when inserting a row. Fix for [dd3ba6063a]. 
FossilOrigin-Name: f31d22489d44701c89cb13c663dfa1a6cc04f900
 2010-03-19 19:02:27 +00:00
dan
3b6f4c06ac Rewrite a couple of queries used internally by FTS3 to take advantage of the "SELECT max(x) FROM ..." optimization. 
FossilOrigin-Name: b7e42ae77443b33e0ab83265064830594094dc7c
 2010-03-19 06:59:19 +00:00
drh
71663ad0c1 Mark internal routines as "static" in FTS3. 
Ticket [b1552d0fa7].

FossilOrigin-Name: 39b34ac4a7bd06144b3630c0ad71bad0615418b6
 2010-03-18 16:34:44 +00:00
drh
3a3dd3ac8d Improved error message when the right-hand operand of MATCH in FTS3 is 
not a valid search expression.  Ticket [170872f1c3].

FossilOrigin-Name: bea9258643edfeb98ebf59d93fa18a14e4221fea
 2010-03-15 20:53:01 +00:00
drh
9396a41e6e Fix FTS3 so that it does not run illegal SQL and cause a spurious log 
message.  Ticket [42d45a693e6].

FossilOrigin-Name: f186b6a61909be1d65b76a6fbaa42f57bbd0d1e5
 2010-03-15 19:27:55 +00:00
drh
40d238e09f Disable FTS4 (which is incomplete and not ready for publication) to prevent 
accidental use.

FossilOrigin-Name: 87a6a9970b8cea25fc5f8ff03d87762dd1166899
 2010-03-09 12:35:21 +00:00
dan
89374d2309 Fix a one byte buffer overread in fts3. 
FossilOrigin-Name: 6e3e014af91601ed1f3a9cbe23f7c4260a4d177f
 2010-03-05 17:27:01 +00:00
shaneh
84f4b2f237 Minor changes to silence some compiler warnings with MSVC. 
FossilOrigin-Name: 4927c62d6214d93e582bf1266215ed3519630c15
 2010-02-26 01:46:54 +00:00
drh
31caa42afd Remove an unused variable from rtree. 
FossilOrigin-Name: 8e60d3995a1ea940de9751dd3bbd7ef41b0bb00a
 2010-02-24 18:25:58 +00:00
dan
5dcb3937b6 Fix for [e9a9fde1f4]. When opening an existing rtree, determine the node size by inspecting the root node of the r-tree structure (instead of assuming it is a function of the page-size). 
FossilOrigin-Name: ebc9433fddf78ef7b4237686951d8d79c1c98f03
 2010-02-16 10:59:40 +00:00
dan
56f2996b48 Fix a segfault in fts3 that may occur if the snippet, offsets or matchinfo functions are used in a query that does not contain a MATCH clause. 
FossilOrigin-Name: 14ab536a96f81595ab8c3dcd4b72075f1a827c8b
 2010-02-10 05:33:17 +00:00
drh
b4a1fed2ea Add a new full-text search variant that tracks the total number of documents 
and document sizes, to make ranking search results easier.  Currently
called FTS4.

FossilOrigin-Name: 1b6e6094c88214e02c9e3638932997ac20bfe413
 2010-02-03 19:55:13 +00:00
dan
d3789b98a7 Fix two similar problems in fts3 that meant that an OOM error could cause a memory leak. 
FossilOrigin-Name: 701ef64b3dbf45e52043e79e528002bd4b7a21e2
 2010-01-22 15:48:18 +00:00
dan
3996a06236 Add coverage tests for fts3_snippet.c. Also fixes related to the same. 
FossilOrigin-Name: 5e9d8ccae9731f380527463ef87ddcd216b4b721
 2010-01-15 17:25:52 +00:00