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

492 Commits

Author SHA1 Message Date
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