a153bbc4c2
Copy fts5.h into the build directory as part of building fts5.c. Also remove code to edit fts5parse.c from various Makefiles and add it to mkfts5c.tcl.
...
FossilOrigin-Name: 4d8f03dc7b6529cf8d46fc0fcc82112c0394dc13
2015-07-02 20:12:34 +00:00
6544b8643f
Minor change to mkfts5c.tcl so that fts5.c can be used according to the instructions in loadext.html.
...
FossilOrigin-Name: edbcccd349090efff3f975e27451608136a429fc
2015-07-02 18:52:16 +00:00
3abdc44e7b
Add fts5_source_id() SQL function, similar to sqlite_source_id().
...
FossilOrigin-Name: ec2573487cb86664f7f056168a764c28ca8236fc
2015-07-02 18:16:02 +00:00
3f09beda45
Remove "#ifdef SQLITE_ENABLE_FTS5" from individual fts5 source files. Add a single "#if !defined(SQLITE_CORE) || defined(SQLITE_ENABLE_FTS5)" to fts5.c.
...
FossilOrigin-Name: 7819002ed85497bbd0f9cf4d39df641573324436
2015-07-02 15:52:21 +00:00
ef648698c8
Fix minor problems in the ota demo application.
...
FossilOrigin-Name: 6aaaec6e63cdf713b0d67e24a892088ff251c82a
2015-06-29 15:41:50 +00:00
018a93d216
Remove unnecessary lines from fts3.h and main.mk.
...
FossilOrigin-Name: c1b268ced38259706674ed2fcbf842d3fbd9fb8c
2015-06-26 20:13:56 +00:00
6394d99a0e
Fix a segfault that could follow an OOM error in fts5.
...
FossilOrigin-Name: 713239b8cf2900e8f7d97646c7f350248b4e804f
2015-06-26 20:08:25 +00:00
6fbeb22596
Fix some cases in the fts5 code where a corrupt database could cause a buffer overread.
...
FossilOrigin-Name: 360c57bbb8bad6cc84af140f61e0282fa06462b4
2015-06-26 18:50:29 +00:00
a468027c8d
Merge upstream changes. Get the test fixture working with FTS5. Fix compiler warnings.
...
FossilOrigin-Name: bfcd16089cf8c65130c011a9718bf7812685c841
2015-06-26 16:55:55 +00:00
eb37567fe2
Remove fts5 initialization code from core file main.c.
...
FossilOrigin-Name: c91a93b343b4d3b1a19afdb5d23d1c508f9779d2
2015-06-26 16:42:17 +00:00
ed52f9ff48
Initial changes to get FTS5 working with MSVC.
...
FossilOrigin-Name: ef2052f81e33ca98e85a60f8a78cdd19a7c1c35c
2015-06-26 04:34:36 +00:00
3e65f89ef6
Fix Makefile.in to account for recent changes. Update fts5 test scripts so that they do not run if SQLITE_ENABLE_FTS5 is not defined.
...
FossilOrigin-Name: 3175220747f5d4dadd17e09fb1899dc782c90926
2015-06-25 20:36:36 +00:00
f32fa3116b
Merge latest trunk changes into this branch.
...
FossilOrigin-Name: fcd8f7ce601729dc51d880d16b97040c1be16aa2
2015-06-25 20:16:23 +00:00
ed2589f555
Add a script to combine all fts5 code into a single file - fts5.c - that can be used to build an SQLite loadable extension.
...
FossilOrigin-Name: 46e86b0637248fb4d623c97778cc041eabe3636c
2015-06-25 20:10:24 +00:00
88d702e6bd
Add "ON CONFLICT" handling to the spellfix module.
...
FossilOrigin-Name: 1d04def785b6031de68b7f199d400cbb5c76caea
2015-06-24 17:21:52 +00:00
51ef0f57c7
Improve test coverage of fts5.
...
FossilOrigin-Name: df5ccea80e8f0da83af5e595b539687006085120
2015-06-23 18:47:55 +00:00
c94a08100b
Merge latest trunk changes with this branch. Add tests for columnsize=0.
...
FossilOrigin-Name: ef44c71a22518727030dd90c0139af8973b05841
2015-06-23 15:06:13 +00:00
f5ed7ad63e
Fix harmless compiler warnings.
...
FossilOrigin-Name: b0badb99023e23bef0e2064cec58f2b279af0c0b
2015-06-15 14:43:25 +00:00
1153e60cf0
Fix the fts5 xRename() method.
...
FossilOrigin-Name: 0f7fd51325875fbf0f1eaca3bbbd170ef99c4208
2015-06-10 10:45:34 +00:00
bcc2f04c68
Add the "columnsize=" option to fts5, similar to fts4's "matchinfo=fts3".
...
FossilOrigin-Name: aa12f9d9b79c2f523fd6b00e47bcb66dba09ce0c
2015-06-09 20:58:39 +00:00
4f20cd402b
Avoid passing constraints that are unusable due to LEFT or CROSS joins to virtual table xBestIndex() methods.
...
FossilOrigin-Name: 80ee56dda7db3860f8be5f6968c8745138f8453f
2015-06-08 18:05:54 +00:00
90502c3dc7
Fix a comment in fts5.h.
...
FossilOrigin-Name: e964b5877497b16cf985d3d847e82529bb3fa4a3
2015-06-06 19:23:32 +00:00
7193b69f52
Fix handling of fts5 rowid constraints in the absence of a MATCH clause. Add tests to cover recently added branches.
...
FossilOrigin-Name: 3a9cb648138a059862fb438c0787fdd888f5e88e
2015-06-06 16:28:29 +00:00
e4449454c5
Make use of range constraints on the rowid field of an fts5 table in full-text queries.
...
FossilOrigin-Name: 32cbc0ed3699cc21302f0b6a159493117ad4bd4f
2015-06-05 19:05:57 +00:00
6f277eb6bc
Fix an fts5 problem in extracting columns from position lists containing large varints.
...
FossilOrigin-Name: 4ea015ab983300d420ef104cca550b22a6395866
2015-06-03 11:23:30 +00:00
f67bb4a21b
Change the fts5 multi-column syntax to use parenthesis instead of square brackets.
...
FossilOrigin-Name: ab85a6fc4f7580278fc9d1f0090fdcf0a90d065b
2015-06-02 19:38:15 +00:00
167fd757f0
Merge latest trunk changes with this branch.
...
FossilOrigin-Name: c9ffda4abb4390bbc5719e269196e2807b254f97
2015-06-02 18:07:58 +00:00
dbef6e752e
Reimplement [ec69e09a] so that each call to the xNext() method does not involve two iterations of the match expression tree (only one).
...
FossilOrigin-Name: 80fe305b3eefb17310a9d6185d1c8cd73ee38b1e
2015-06-02 17:57:01 +00:00
5350d91ed3
Improve performance of the fts5 AND operator.
...
FossilOrigin-Name: b43e9a5b7a0483ccb102316a4dbc5e32b5bc69ec
2015-06-01 19:17:06 +00:00
34efc82eed
Change fts5 expression processing to avoid linear scans of long doclists caused by phrases that match specific columns only.
...
FossilOrigin-Name: ec69e09a55b4daf1c40aeaaf9ee95091fe86f5c0
2015-06-01 09:15:20 +00:00
3f3074e0c1
Remove the "#include sqlite3Int.h" from fts5Int.h.
...
FossilOrigin-Name: e008c3c8e29c843ec945ddad54b9688bbf2bdb44
2015-05-30 11:49:58 +00:00
a8c024905c
Add extra tests and fixes for multi-column matches.
...
FossilOrigin-Name: ae6794ffa23ef6191bd8834422abf322d978c11b
2015-05-29 19:00:22 +00:00
6d21f42db2
Add syntax to fts5 used to specify that a phrase or NEAR group should match a subset of columns. For example "[col1 col2 ...] : <phrase>".
...
FossilOrigin-Name: 0fc0ea20920615f3e48ea2dbe2b7dcd979b0993e
2015-05-29 15:55:30 +00:00
e96efb6426
Optimizations for fts5 queries that match against a specific column.
...
FossilOrigin-Name: b29ac50af0491a780a5a4c0985d88d0e5e014ba3
2015-05-28 19:57:12 +00:00
af5cd564f0
Remove some dead code from fts5. Add auxiliary function api tests to the same.
...
FossilOrigin-Name: 0f9df202cc58097afddb8dad662b7c7fdc2c7d0c
2015-05-28 14:37:26 +00:00
7f64db1343
Simplifications and minor optimizations to fts5 prefix queries that cannot use a prefix index.
...
FossilOrigin-Name: aef89d9f6aa536efee347367558cf5d4ea81b238
2015-05-26 18:22:01 +00:00
add0804943
Avoid using a zero-sized array within a struct in fts3 code.
...
FossilOrigin-Name: b05cae36cedd98d59813e637f328a52eee7ef0d2
2015-05-26 17:29:48 +00:00
494016a424
Avoid redundant loads from the %_data table in the fts5 code.
...
FossilOrigin-Name: 02069782f8b7896a582582c79185b50418622736
2015-05-25 11:46:33 +00:00
3fb37f097c
Fix an fts4 matchinf() problem triggered by deferred tokens that are part of phrases that are part of AND expressions.
...
FossilOrigin-Name: f1e942a1dda496a509741e9cc2a17e8b4dac63a3
2015-05-25 10:57:13 +00:00
2e7d35e2fe
Avoid making redundant copies of position-lists within the fts5 code.
...
FossilOrigin-Name: 5165de548b84825cb000d33e5d3de12b0ef112c0
2015-05-23 15:43:05 +00:00
18070e08c5
Fix incorrect validation of the size of the BLOB returned by a geometry
...
function on the RHS of a MATCH operator in RTree. The old code worked for
64-bit systems (by chance) but fails on 32-bit.
FossilOrigin-Name: 10cc44f5a63e6cadf6940bb7310a177ee7fa6ee2
2015-05-22 23:17:28 +00:00
fd29973f11
Update with fixes and enhancements from trunk.
...
FossilOrigin-Name: 9605d008f5c763137e9734d033fe4510ca316858
2015-05-22 18:40:48 +00:00
6b76418e67
Have r-tree prefer to use the constraint "col MATCH ?" over "rowid = ?".
...
FossilOrigin-Name: b9fb95194d4f7c535f1d175fd2e18d69d76e8fc4
2015-05-22 16:08:42 +00:00
0d45967b7f
Increase test coverage of fts5_vocab.c.
...
FossilOrigin-Name: 065ab83a6ce36e16d3b95a61505aa3cff0bfea84
2015-05-22 07:44:44 +00:00
21b7d2a9b8
Improve test coverage of fts5_unicode2.c.
...
FossilOrigin-Name: fea8a4db9d8c7b9a946017a0dc984cbca6ce240e
2015-05-22 06:08:25 +00:00
4f03f413bc
Add the sqlite3_value_dup() and sqlite3_value_free() interfaces. Use
...
these interfaces to enhance R-Tree to add the
sqlite3_rtree_query_info.apSqlParam field.
FossilOrigin-Name: a7ee40c4fc62843ac5b96ba47ca14a66e8cd6961
2015-05-20 21:28:32 +00:00
8c1f46de50
Improve test coverage of fts5_tokenize.c.
...
FossilOrigin-Name: 0e91a6a520f040b8902da6a1a4d9107dc66c0ea3
2015-05-20 09:27:51 +00:00
7ac07bda73
Fix the MSVC makefile so that it works with OTA. Fix a harmless compiler
...
warning in FTS3.
FossilOrigin-Name: c7b16645307d6e46c4153693d6806269de64955f
2015-05-19 22:56:45 +00:00
856d446efe
Allow R-Tree geometry functions to take 8-byte BLOB arguments which are
...
passed directly through to the underlying callback, and which can be used
to pass pointers into the callback.
FossilOrigin-Name: b271ed56532a78323accc8a7cb348d55f95c350e
2015-05-19 22:20:48 +00:00
116eaee4a0
Add tests for fts5 tokenizers.
...
FossilOrigin-Name: 4f90ba20e2be6ec5755fe894938ac97342d6fbf6
2015-05-19 19:37:09 +00:00
dan