f8efe64649
Rearrange code in fts5_expr.c so that synonym support does not slow down the common case.
...
FossilOrigin-Name: 801882817f1d895aef1426f9a7196bd140b807c3
2015-09-03 19:48:02 +00:00
cce413202a
Merge enhancements from trunk.
...
FossilOrigin-Name: 4b49fe996989fe42d2bb1c24e7193fef09c5fc50
2015-09-03 18:57:52 +00:00
98c5f8795a
A simple optimization and size reduction in sqlite3PagerAcquire().
...
FossilOrigin-Name: 618d8dd4ff44cce10cc4688a2134715ff66cc562
2015-09-03 18:20:10 +00:00
ea8b93ee20
Add documentation for fts5 synonym support.
...
FossilOrigin-Name: 58aa1f435959852df74f1bca8e0bdbc4f47c256a
2015-09-03 18:05:09 +00:00
c98a4cc8b6
Change the Pager.hasBeenUsed flag into Pager.hasHeldSharedLock in order to
...
take it off the critical path in sqlite3PagerAcquire().
FossilOrigin-Name: b79096be7cb02aae2f303db33a8bf19e69204374
2015-09-03 17:54:32 +00:00
ea623630e2
Add tests to improve coverage of fts5_varint.c.
...
FossilOrigin-Name: 89f24f31a8f7d7cb0a66ee53523881f566dcb035
2015-09-03 15:37:26 +00:00
e1c28d7229
Remove some more code from fts5_index.c by consolidating similar functions.
...
FossilOrigin-Name: 59ae30b97b40faa363c55aa2664dead9eaeeddc0
2015-09-03 14:22:27 +00:00
076e85f59c
Add the sqlite3VdbeLoadString() and sqlite3VdbeMultiLoad() routines to help
...
with code generation, especially on PRAGMAs. Rename sqlite3VdbeAddGoto()
to just sqlite3VdbeGoto().
FossilOrigin-Name: 847387ec8e6fef283899578fb232b2c23b00ee5b
2015-09-03 13:46:12 +00:00
5d144875bc
Remove dead code from fts5_index.c.
...
FossilOrigin-Name: 8a0a9b01e74072ee52fe393311ad591208fbbf7c
2015-09-03 11:17:52 +00:00
9a9e3531f7
Fix the fts5 integrity-check so that it works with columnsize=0 tables.
...
FossilOrigin-Name: 11b887b15eaee57ea2577c763e70494f1e251275
2015-09-03 11:00:50 +00:00
2a6ecb3141
Fix a memory leak in fts5_expr.c.
...
FossilOrigin-Name: 399932a181437d84cd57234e76c4b65da1e4ac5f
2015-09-03 10:27:02 +00:00
7cc023c7fa
Factor out and simplify code in pragma.c for pragmas that return a single
...
row with a single column that is an integer or text value.
FossilOrigin-Name: d7f4bdf594e93c848f46901637861c8eed4c34df
2015-09-03 04:28:25 +00:00
b460e52a83
For PRAGMAs, factor out the code that sets the result set column names into
...
a subroutine.
FossilOrigin-Name: 0ea6e5c9fc6b1dd1174c09097be5bf291da4e6c7
2015-09-03 03:29:51 +00:00
2a8f671244
Optimizations to the printf formatter.
...
FossilOrigin-Name: a3b35ddeca8f459e81105ab6477f3c5afb9b96d5
2015-09-02 21:00:48 +00:00
9c671b741c
Further tests to raise coverage of fts5 synonym code to 100%. Fix a dropped error code in the same.
...
FossilOrigin-Name: bdedd838bb3028c586bcc9f643852ce1364adb49
2015-09-02 19:48:55 +00:00
50ea76e748
Fix an issue with fts5 synonyms and NEAR(...) queries.
...
FossilOrigin-Name: f2e590700d8eb30da8ac3a92f6ca92a2bbe9c1fe
2015-09-02 18:56:01 +00:00
0ff287fb01
Add and use the sqlite3VdbeChangeOpcode() routine. Simplify the implementation
...
of the other sqlite3VdbeChange*() routines.
FossilOrigin-Name: 0a5b00e493efae58252f9fc7bde5a469645942d5
2015-09-02 18:40:33 +00:00
2991ba050b
Add the sqlite3VdbeAddGoto(v,i) routine as a shorthand for
...
sqlite3VdbeAddOp2(v,OP_Goto,0,i).
FossilOrigin-Name: be78f413df1b0d874b44a866ef6bf17543d7e8a2
2015-09-02 18:19:00 +00:00
ef41dfe5b1
Change sqlite3_sql() so that it always returns the SQL text of the prepared
...
statement, if the text is available, even if the the prepared statement was
generated using sqlite3_prepare() instead of sqlite3_prepare_v2(). Also
include some minor comment fixes and code simplifications.
FossilOrigin-Name: 2f5472cfda6c72e75b9cf7b7481612465c1a5e6a
2015-09-02 17:55:12 +00:00
bea34fc53a
Fix a problem with fts5 synonyms and phrase queries. Also fix an OOM handling bug in fts5.
...
FossilOrigin-Name: a4c35fa2c94fe34b376670244fe72303c99868c1
2015-09-02 17:34:22 +00:00
2ed0d809a6
Small simplification to the EXPLAIN QUERY PLAN logic.
...
FossilOrigin-Name: d1592d201afea20cb2ca94fe2bf5ae031bd29ede
2015-09-02 16:51:37 +00:00
d37bea5bdc
Use sqlite3XPrintf() instead of sqlite3StrAccumAppend() in a few places
...
for better performance and a smaller footprint.
FossilOrigin-Name: 82355e41084387fa11b7b531e4d660dd3b4cd984
2015-09-02 15:37:50 +00:00
4ef299a32c
The sqlite3_memory_alarm() interface has been deprecated and undocumented
...
for almost 8 years (since version 3.5.3). Change it into a no-op.
FossilOrigin-Name: 5d3f5df4da9f40d5897b5c23b2ea9333fc18ac2c
2015-09-02 14:56:56 +00:00
583611df65
Fix a problem handling OOM conditions within fts5 queries that feature synonyms.
...
FossilOrigin-Name: 11fa980897c6c7be218bbd9c4cd8253272d2c300
2015-09-02 14:17:38 +00:00
df998c3d4f
Fix a problem with fts5 synonyms and the xQueryPhrase() auxiliary function API.
...
FossilOrigin-Name: cf3e45e76d23e10ee06296c3561a341591597a04
2015-09-02 08:22:41 +00:00
02bf8b45b7
Very minor optimizations in the unix VFS.
...
FossilOrigin-Name: 6db3ff45bc15ece29cb2c7a736e5c6d005dde200
2015-09-01 23:51:53 +00:00
59a5364cf9
Performance improvement in sqlite3VarintLen().
...
FossilOrigin-Name: adf9fefb00ae1dbb07a921c6796cb0a9505c6d19
2015-09-01 22:29:07 +00:00
054bbabc76
Small size reduction and performance increase in sqlite3DbMallocSize().
...
FossilOrigin-Name: 8a80967f849eed002a701235ed7fb406099d566e
2015-09-01 20:09:33 +00:00
3c0c43191a
Reduce the number of calls to sqlite3BeginBenignMalloc().
...
FossilOrigin-Name: 0bee6583665782fac5d9e82bdf19b6f07e7bd03f
2015-09-01 19:51:37 +00:00
d917ad019c
Fix a problem that occurs when more than 4 synonyms for a term appear within a single row.
...
FossilOrigin-Name: cd359550bdc2bf7be4c294b60130c9fc3f583902
2015-09-01 18:44:33 +00:00
3faa07ee04
Add tests for fts5 synonyms implemented by adding extra terms to queries. And fixes for the same.
...
FossilOrigin-Name: dbcb73802b88f76be17f09f3eb83ffac542de633
2015-09-01 18:08:36 +00:00
cb8b58caf7
Begin changes to allow synonym support by adding multiple terms to a query (an alternative to adding multiple terms to the FTS index).
...
FossilOrigin-Name: ad7feaed4cd6b1d6e6376bb82d1f5664ddd083f3
2015-08-31 20:06:06 +00:00
3ad93bba84
Enhance the json_extract() function so that if given multiple PATH arguments
...
it will return a JSON array with all of the answers. Also update comments
within the json1 extension to reflect stricter interpretation of JSON and PATH
arguments.
FossilOrigin-Name: 1da60c3dda4254620052a83c853c2d2b6dd5009f
2015-08-29 19:41:45 +00:00
3be094df69
Link the json1 extension into the command-line shell by default.
...
FossilOrigin-Name: 2e8e239cec5a12ac81cf62c0fbe94fb5713c31b1
2015-08-29 19:03:33 +00:00
0cb01f5c2c
Add a test for an fts5 tokenizer that supports synonyms by adding multiple entries to the fts index.
...
FossilOrigin-Name: 98d07d16cab92f1e7001afbe370df3ec6343fc1f
2015-08-29 18:46:12 +00:00
20b3b6109b
New test cases for the json1 extension.
...
FossilOrigin-Name: daff4832af963f98bcc1d2c2f84bd815d384f850
2015-08-29 18:30:30 +00:00
d29759288e
Fix the build with -DSQLITE_OMIT_VIRTUALTABLE.
...
FossilOrigin-Name: 752918def7231f7846b3e985c9953a1cc825ab6b
2015-08-29 17:22:33 +00:00
d1f0068d19
Do not consider an empty string to be valid JSON. Add some additional
...
JSON test cases.
FossilOrigin-Name: fd19ff029f128f478f69910352a6f8b84262ce1d
2015-08-29 16:02:37 +00:00
ee0c0a8de3
Another change to the fts5 tokenizer API.
...
FossilOrigin-Name: fc71868496f45f9c7a79ed2bf2d164a7c4718ce1
2015-08-29 15:44:27 +00:00
a771402e55
Change the json1.c module so that it throws an error if any of the
...
JSON selector paths are malformed.
FossilOrigin-Name: 3aa0855fd463076fc3277f1d9fe00d2f30e6b449
2015-08-29 00:54:49 +00:00
f2df7e71d6
Back out the json_check() routine. Instead, throw an error if the input to
...
a json function (other than json_valid()) is not valid JSON.
FossilOrigin-Name: dc9ce7b18cbe23d065317757234ef9fb8792da7a
2015-08-28 20:07:40 +00:00
57e0add3f9
Change the fts5 tokenizer API to allow more than one token to occupy a single position within a document.
...
FossilOrigin-Name: 90b85b42f2b2dd3e939b129b7df2b822a05e243d
2015-08-28 19:56:47 +00:00
2798f0b54b
Fix compiler warnings in rbu code.
...
FossilOrigin-Name: 0fdc36fe35ae2fc8e9688fe6c53437f4d47502d9
2015-08-28 16:41:45 +00:00
3b05828ea8
When searching the wal file for a frame, do not search that part that was already checkpointed when the transaction was opened.
...
FossilOrigin-Name: a84cf4f5d326270a61faf4ff867260f2dd1e68a6
2015-08-28 16:18:45 +00:00
8f9ea2dc70
Merge latest trunk into this branch.
...
FossilOrigin-Name: ab93024da7bd577d8850b417aff8597a8b3807fc
2015-08-28 15:50:24 +00:00
f6ec8d4f4c
Add the json_check() function, which returns its argument if the argument
...
is well-formed JSON or which throws an error otherwise.
FossilOrigin-Name: 64abb65d4df11e5b3bcc4afc8e7c18e907c6080a
2015-08-28 03:48:04 +00:00
ecb5fedb3f
Enhance the json_insert(), json_replace(), and json_set() functions with the
...
ability to add JSON instead of text if the argument is text and if the PATH
begins with '$$' instead of just '$'.
FossilOrigin-Name: 44f103d8862abc2d5613bac04dc2ea8e625b1f40
2015-08-28 03:33:50 +00:00
2dc292930d
Fix the OR-optimization so that it always ignores subplans that do not
...
use an index.
FossilOrigin-Name: 66f92a16866e5825363636b9cc4b8f9b29d9e84d
2015-08-27 23:18:55 +00:00
a3f108e93d
Reduce the size of the WhereScan object by 24 bytes while also clarifying its
...
operation.
FossilOrigin-Name: cbc3c9a8bf169ae0b21f26855038502c6cc25cfe
2015-08-26 21:08:04 +00:00
5579d59fb3
Evaluate expressions only once when the same expression is used in both the
...
result set and in the ORDER BY clause.
FossilOrigin-Name: c2f3bbad778504681b39ab9399a1eb3c1a35ab3f
2015-08-26 14:01:41 +00:00
dan