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

1141 Commits

Author SHA1 Message Date
drh
f5ddb9c214 Take out the goofy '$$' path syntax. Instead, use subtypes to communicate when 
a string is JSON.  Add the json() function that validates and minifies the
JSON and sets the appropriate subtype.

FossilOrigin-Name: 8a80d6459e246ec1b38325e1cbd1e862157138b3
 2015-09-11 00:06:41 +00:00
dan
33c47f565c Modify the fts5 leaf page format to permit faster seek operations. This is a file-format change. Any existing databases can be upgraded by running the fts5 'rebuild' command. 
FossilOrigin-Name: 0c0c4ae971e54efc526eed7bd071c90dfadb95ff
 2015-09-10 17:23:37 +00:00
drh
383de6918c Create separate "path" and "root" columns in the json_each() and json_tree() 
virtual tables.  "Root" is the 2nd parameter and is fixed.  
"Path" varies as json_tree() walks the hierarchy.

FossilOrigin-Name: 127cce3eb96b819005832997e0a082df9fb96f0b
 2015-09-10 17:20:57 +00:00
dan
204debf3a3 Increment the fts5 version value to indicate that the on-disk format has changed. 
FossilOrigin-Name: 99de5e3613d557728dd196353516bc7cf64a0e6c
 2015-09-10 16:39:38 +00:00
dan
56c8634853 Fix a segfault in fts5 that could occur if the database contents were corrupt. 
FossilOrigin-Name: 4931e37da4d2c26d7afc5432f7f0d534b51a85fa
 2015-09-10 16:19:01 +00:00
dan
40d45f8960 Merge latest changes from trunk. Including fts5_expr.c fixes. 
FossilOrigin-Name: 716e7e747714d6af502f6a87ca8d789bb7ce162a
 2015-09-10 15:52:42 +00:00
dan
b97efa0ba3 Update description of on-disk format in fts5_index.c. 
FossilOrigin-Name: 85aac7b8b6731e2f6880b80cfd62d431ea059799
 2015-09-10 15:49:16 +00:00
dan
f679d97d18 Fix an fts5 problem that could occur if a term and the first associated rowid are on different leaf pages. 
FossilOrigin-Name: ffe2796ac9244c62325fce4960f26c653321623c
 2015-09-10 10:01:30 +00:00
dan
a5aa8e1db2 Change the array of 16-bit offsets at the end of each page to an array of varints. 
FossilOrigin-Name: fab245bea4f283714c17bca22428d5eb4db5935a
 2015-09-10 05:40:17 +00:00
drh
852944eb9b Fix the json_tree() scan for the case when a path is supplied. Add new 
json1 test cases.

FossilOrigin-Name: 6adc7de76acee6cfb5ff761739e7a8de7b5bf4b2
 2015-09-10 03:29:11 +00:00
mistachkin
f5eac36a64 Fix harmless compiler warning in FTS5. 
FossilOrigin-Name: 86146a731d75eb25279c0e072c0bdda593de905d
 2015-09-09 23:54:46 +00:00
mistachkin
4b03efb695 Fix harmless compiler warnings in FTS5. 
FossilOrigin-Name: 2cdb18778f20baa902e54f218ba26d2bacf0801e
 2015-09-09 17:17:22 +00:00
dan
f06bd2c132 Fix a bug in preprocessor macros within fts5_main.c. 
FossilOrigin-Name: 0eb2b9521fad6fa36e6fa374c2bc1f70b5180f7c
 2015-09-09 08:15:06 +00:00
dan
fe8e2eba0a Remove the 0x00 terminators from the end of doclists stored on disk. 
FossilOrigin-Name: 00d990061dec3661b0376bd167082942d5563bfe
 2015-09-08 19:55:26 +00:00
dan
60f8139a96 Use macros to make the code in fts5_index.c easier to read. 
FossilOrigin-Name: 67ff5ae81357eb7fa28049bb724a22cb6f52e076
 2015-09-07 08:14:30 +00:00
dan
e386a1ba25 Experiment with a different fts5 leaf page format that allows faster seeks. 
FossilOrigin-Name: a1f4c3b543eed84e808f6b901a38179786fffe16
 2015-09-05 19:52:08 +00:00
dan
4dfe98a8c4 Enhance showfts5.tcl so that it can optionally display the number of terms in each segment. 
FossilOrigin-Name: d648ddd93de039820f5abe064c7bc1318cd9d6b1
 2015-09-04 11:13:00 +00:00
dan
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
dan
cce413202a Merge enhancements from trunk. 
FossilOrigin-Name: 4b49fe996989fe42d2bb1c24e7193fef09c5fc50
 2015-09-03 18:57:52 +00:00
dan
ea8b93ee20 Add documentation for fts5 synonym support. 
FossilOrigin-Name: 58aa1f435959852df74f1bca8e0bdbc4f47c256a
 2015-09-03 18:05:09 +00:00
dan
ea623630e2 Add tests to improve coverage of fts5_varint.c. 
FossilOrigin-Name: 89f24f31a8f7d7cb0a66ee53523881f566dcb035
 2015-09-03 15:37:26 +00:00
dan
e1c28d7229 Remove some more code from fts5_index.c by consolidating similar functions. 
FossilOrigin-Name: 59ae30b97b40faa363c55aa2664dead9eaeeddc0
 2015-09-03 14:22:27 +00:00
dan
5d144875bc Remove dead code from fts5_index.c. 
FossilOrigin-Name: 8a0a9b01e74072ee52fe393311ad591208fbbf7c
 2015-09-03 11:17:52 +00:00
dan
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
dan
2a6ecb3141 Fix a memory leak in fts5_expr.c. 
FossilOrigin-Name: 399932a181437d84cd57234e76c4b65da1e4ac5f
 2015-09-03 10:27:02 +00:00
dan
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
dan
50ea76e748 Fix an issue with fts5 synonyms and NEAR(...) queries. 
FossilOrigin-Name: f2e590700d8eb30da8ac3a92f6ca92a2bbe9c1fe
 2015-09-02 18:56:01 +00:00
dan
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
dan
583611df65 Fix a problem handling OOM conditions within fts5 queries that feature synonyms. 
FossilOrigin-Name: 11fa980897c6c7be218bbd9c4cd8253272d2c300
 2015-09-02 14:17:38 +00:00
dan
df998c3d4f Fix a problem with fts5 synonyms and the xQueryPhrase() auxiliary function API. 
FossilOrigin-Name: cf3e45e76d23e10ee06296c3561a341591597a04
 2015-09-02 08:22:41 +00:00
dan
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
dan
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
dan
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
drh
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
dan
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
drh
d29759288e Fix the build with -DSQLITE_OMIT_VIRTUALTABLE. 
FossilOrigin-Name: 752918def7231f7846b3e985c9953a1cc825ab6b
 2015-08-29 17:22:33 +00:00
drh
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
dan
ee0c0a8de3 Another change to the fts5 tokenizer API. 
FossilOrigin-Name: fc71868496f45f9c7a79ed2bf2d164a7c4718ce1
 2015-08-29 15:44:27 +00:00
drh
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
drh
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
dan
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
dan
2798f0b54b Fix compiler warnings in rbu code. 
FossilOrigin-Name: 0fdc36fe35ae2fc8e9688fe6c53437f4d47502d9
 2015-08-28 16:41:45 +00:00
drh
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
drh
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
drh
80d874083b Improvements to JSON string dequoting. 
FossilOrigin-Name: 196d66d34d9783622e6f2f79eafea1488fc6f5cf
 2015-08-24 12:42:41 +00:00
drh
442a7c6015 Fix corner-case problems in the type and atom columns of json_each() and 
json_tree().

FossilOrigin-Name: f0aba0e120074430cd7ad93291fcc97b8a25a054
 2015-08-24 02:32:04 +00:00
drh
c3722b2103 Fix minor glitches in the json1.c extension, mostly having to do with OOM 
behavior.

FossilOrigin-Name: cc5204149c4053b9e529a72102d8df0925ad1ea1
 2015-08-23 20:44:59 +00:00
drh
8784eca17f Fixes to json_each() and json_tree(). Improved json_parse() debugging output. 
FossilOrigin-Name: fc1b24f316af07a64672f6edc14ebcff487dffbb
 2015-08-23 02:42:30 +00:00
drh
bc8f092ca1 Add the json_valid() function to the json1.c extension. Fix various minor 
problems in the json1.c extension.

FossilOrigin-Name: 380a97345b446214843a63ccc017d49a52d884da
 2015-08-22 19:39:04 +00:00
drh
be9474ee05 Fix a couple instances of OOM handling in the json extension. 
FossilOrigin-Name: 213a6c5ccbcfe4495d45e3608e99a6398751aeed
 2015-08-22 03:05:54 +00:00