mirrors/sqlite
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
16,390 Commits 1,487 Branches 166 Tags 416 MiB
80f2b33a12
Commit Graph

1687 Commits

Author SHA1 Message Date
drh
1a606f8246 Merge enhancements and fixes from trunk. 
FossilOrigin-Name: f040a5bb62f3473fba6450c97c68f538d1df21ef
 2016-02-09 15:44:18 +00:00
dan
c2d0b56e6a Fix a signed/unsigned comparison warning in fts5. 
FossilOrigin-Name: 85eb05ddbc3a7cff986af13c3dab6c0063e62171
 2016-02-08 20:14:41 +00:00
drh
83d7920e55 Fix a compiler warning when compiling without SQLITE_ENABLE_FTS3_TOKENIZER. 
FossilOrigin-Name: 6926f28cd56bf61f7c92877baa54024bee7cbab5
 2016-02-08 20:06:52 +00:00
dan
e064c4066c Disable the two-argument form of the fts3_tokenizer() SQL function unless the library is built with -DSQLITE_ENABLE_FTS3_TOKENIZER. 
FossilOrigin-Name: e0eb217aca7e4aadf9c44ed20822b78139f7c83c
 2016-02-08 19:40:17 +00:00
dan
d120a1e3ab Add tests for and remove unreachable branches from fts5 in order to restore test coverage. 
FossilOrigin-Name: 22589018ac3321f7bd89ce9fa69e57eae395e324
 2016-02-05 21:09:26 +00:00
dan
b80b8f482c Further streamlining of fts5 prefix query code. 
FossilOrigin-Name: ca91bd8ac70a5b3fef127364f73ec675e58bb92c
 2016-02-05 19:18:02 +00:00
drh
0ac7cfaf99 Merge enhancements from trunk. 
FossilOrigin-Name: a533608cb0de3cbc1e28a794aab99864b8c249f4
 2016-02-05 14:15:34 +00:00
drh
4a642b6060 Improvements to the way that OOM errors are processed. 
FossilOrigin-Name: c3ef03478a5788c855b3aef385d43ae7f494f440
 2016-02-05 01:55:27 +00:00
dan
4786cf5a20 Further improve performance of unindexed fts5 prefix queries. 
FossilOrigin-Name: c9c6457d8ea911f6cc63967127e58da3146fd3ef
 2016-02-04 19:45:19 +00:00
drh
c4703eedab Use sqlite3_malloc64() instead of sqlite3_malloc() in the spellfix extension. 
FossilOrigin-Name: 634d008c34bd237fc9cfb88dc291394fc5d31efa
 2016-02-04 11:15:57 +00:00
drh
3b7f9a68d5 Escape control characters in JSON. 
Fix for ticket [ad2559db380abf8].

FossilOrigin-Name: 4f1b5229a3bbc9d40b7433a5eb3139d59d31dcb1
 2016-02-04 10:28:57 +00:00
dan
eb715c62f9 Improve performance of fts5 prefix queries on detail=col tables. 
FossilOrigin-Name: ca11f46db047e7f131cef3893f73824758a2076b
 2016-02-03 20:04:59 +00:00
dan
b06347a5dc Add tests to restore full coverage of fts5 code. 
FossilOrigin-Name: 063755c81574800e7db12a42e17d982a8c1e5181
 2016-02-02 21:19:21 +00:00
dan
735ff4a809 Enhance the performance of fts5 AND and OR queries. 
FossilOrigin-Name: 62ea9e5ab8bc1a20245beebceb5ea62dcd7ec84e
 2016-02-02 17:40:41 +00:00
drh
33c1eb6477 Merge all recent enhancements from trunk. 
FossilOrigin-Name: f3f9200115caf4b356f90ec97c351d1afbcb9bf6
 2016-02-02 02:22:30 +00:00
dan
df015945e3 Improve performance of fts5 queries. 
FossilOrigin-Name: 2334e88244afe6387208be5d527aba9b5ddf4e4c
 2016-02-01 20:12:41 +00:00
dan
52f5d1ba6b Performance enhancement for fts5 column filter queries on detail=full tables. 
FossilOrigin-Name: 13fb4aa6a87c5c6258979953da82eedc1a7bf14f
 2016-01-30 19:16:11 +00:00
dan
2f36f06e10 Performance improvements for fts5, particularly detail=col mode. 
FossilOrigin-Name: a3d7b8ac53f94d29a11362f193fd1967f30583df
 2016-01-26 20:19:55 +00:00
dan
18205c781d Further minor performance improvements and code-size reductions related to fts5 column filters on detail=col tables. 
FossilOrigin-Name: b4ac61aeee976296e7719949cd4fb496147a29e8
 2016-01-26 20:08:50 +00:00
dan
1c16bccb79 Improve the performance of fts5 column filters on detail=col tables. 
FossilOrigin-Name: 249a2d070c34bf884a04cb248b9691e239f2871c
 2016-01-26 19:30:49 +00:00
dan
fee981e5b9 Enhance fts5txt2db.tcl, a script used to generate fts5/fts4 databases for performance testing. 
FossilOrigin-Name: c646e40350e5aa91abcf52de61fb31275bad38f9
 2016-01-26 17:08:22 +00:00
drh
9084ec1d96 Add the SQLITE_SPELLFIX_STACKALLOC_SZ compile-time option to control how much 
stack space is available for use as the Wagner matrix in editDest3 of the
spellfix extension.

FossilOrigin-Name: dd0100dd87e2c7c70fabb2d3188f0906e605583d
 2016-01-23 22:55:53 +00:00
dan
e9eb1593f5 Fix an fts5 problem with using both xPhraseFirst() and xPhraseFirstColumn() within a single statement in detail=col mode. 
FossilOrigin-Name: 72d53699bf0dcdb9d2a22e229989d7435f061399
 2016-01-23 18:51:59 +00:00
drh
c6aab32144 Changes to spellfix to try to get it to use stack space instead of heap space 
in cases where that makes sense.

FossilOrigin-Name: dfcebc7393a3a780ee9c4f257723c303bb633064
 2016-01-23 18:24:52 +00:00
dan
e17b646fd5 Merge trunk changes (including fixes for warnings in fts5) with this branch. 
FossilOrigin-Name: ceccc9ad788fb4da9120915741995b9f088f85ff
 2016-01-23 16:20:16 +00:00
dan
c66d03f1e1 Fix some signed/unsigned comparison compiler warnings in fts5. 
FossilOrigin-Name: 3be336aa893f9eb0837d7d66c83bab1489792b9a
 2016-01-23 15:57:06 +00:00
dan
8498f387be Fix a problem involving detail=col and column filters. 
FossilOrigin-Name: 7558a0ad2276e91f2faced8ea405d9fdb4fa0c6e
 2016-01-23 14:45:36 +00:00
dan
795502d26c Experimental performance enhancements for fts5. 
FossilOrigin-Name: b5a57b812fd6a734cf2a342bf0b730ae18912d73
 2016-01-22 19:48:34 +00:00
dan
bd5af9ea31 Add a -detail option to the loadfts5.tcl script. For creating tables with the detail= option set. 
FossilOrigin-Name: 81e830e21f81b6428209afa0b8f42f2fd9bd7aab
 2016-01-20 16:36:10 +00:00
drh
20f272c96f Merge recent enhancements from trunk. 
FossilOrigin-Name: 327af5f644a49b2f41d5456958f9d61a2b704e1c
 2016-01-20 11:33:37 +00:00
dan
4684ffd495 Add further fts5 tests. 100% code coverage is finally restored. 
FossilOrigin-Name: b914ece0d146cfc8adba4dc4e8633e14f174d6ea
 2016-01-19 16:06:23 +00:00
dan
6d3c2889ec Add tests for fts5. Fix a crash that can occur in fts5 if the database content is corrupted. 
FossilOrigin-Name: acaf426449bf6fd3140fd63141750ff69d1119a5
 2016-01-18 17:48:28 +00:00
dan
0536a07c0e Add a debugging function to print human-readable versions of fts5 detail=none leaf pages. 
FossilOrigin-Name: 8358af3658d888516cdef5f8c8d89e9bdee53f91
 2016-01-18 09:08:56 +00:00
dan
3ed7029921 Add extra tests to cover untested branches in fts5. 
FossilOrigin-Name: 61deab043dcea860070dba6b02601a7de627fff1
 2016-01-16 21:06:41 +00:00
dan
8631402e6a Add further tests for fts5. Fix some problems with detail=col mode and auxiliary functions. 
FossilOrigin-Name: de77d6026e8035c505a704e7b8cfe5af6579d35f
 2016-01-16 18:58:51 +00:00
dan
25247435be Rationalize some code in fts5_storage.c. Add tests to cover recently added branches in fts5. 
FossilOrigin-Name: 3b72df405ac9b3a71144f45317d32e25f0084c4b
 2016-01-15 19:54:47 +00:00
mistachkin
1e38927c12 Fix a couple C99-isms in FTS5 that cause compile errors on MSVC. 
FossilOrigin-Name: 584848d4396d7755027fab377c97e40fbcc90d21
 2016-01-15 05:39:55 +00:00
dan
2cfe049f40 Add a test to verify that the fts3 and fts5 "unicode61" tokenizers are byte for byte compatible. 
FossilOrigin-Name: 8ec8314354edc9d6f7d1c8a6370fd984a552a52f
 2016-01-14 20:05:59 +00:00
drh
cb75bff3f7 Merge the latest fixes and enhancements from trunk. 
FossilOrigin-Name: 007e5c6df60f9743ac6914332f59925e4a7a861c
 2016-01-14 14:48:17 +00:00
drh
0ea94db612 Yet another change to FTS5 trying to get it to merge successfully into sessions. 
FossilOrigin-Name: 8dedff3b9ac3e6bf9c131fee19f7d26dc1ebd61f
 2016-01-14 14:33:36 +00:00
drh
d625adb8db Fix more compiler warnings in FTS5. 
FossilOrigin-Name: f791fc7009d68941c60d7bf953bab19d86112133
 2016-01-14 14:29:57 +00:00
dan
17535393b9 Fix another compiler warning in fts5 code. 
FossilOrigin-Name: d17bc2c92f4d086280e49a3cc72993be7fee2da7
 2016-01-14 14:19:50 +00:00
dan
f705e9deab Fix compiler warnings in fts5. 
FossilOrigin-Name: 5a343cc0336bba056df4449e6cd2e3fb9e75a105
 2016-01-14 14:15:54 +00:00
drh
7647377f52 Fix harmless compiler warnings in RBU and add RBU to the autoconf and windows 
makefiles.

FossilOrigin-Name: fabe78c5d8ab353988f6fe0decacd651edc17ec2
 2016-01-14 13:22:24 +00:00
dan
7f50d69359 Add documentation for new API functions to the comments in fts5.h. 
FossilOrigin-Name: 14d296fa7b43b4999a1fd070cf030f83fe1b94c3
 2016-01-13 18:25:36 +00:00
dan
fd7601a125 Improve performance of fts5 low level iterators. 
FossilOrigin-Name: bc5118f40a11f64ffb4e1c086277fa80b9764745
 2016-01-12 19:28:51 +00:00
dan
6a657b2477 Add the fts5speed.tcl script to ext/fts5/tool/. 
FossilOrigin-Name: 2c0b93553ebb00a70c611eb8dac021877933f088
 2016-01-11 18:23:07 +00:00
dan
aaf17c41ec Fix bugs in fts5 synonym processing for detail=col and other modes. 
FossilOrigin-Name: 0e3c545423246231ddac8fed2f103d71d556e17f
 2016-01-11 17:30:28 +00:00
dan
4f40cc6f3d Begin adding fts5 tests involving synonyms and detail=none/col tables. 
FossilOrigin-Name: b3e6f15ec2d9a834e2c80b91ffd7097553816228
 2016-01-08 17:21:18 +00:00
dan
4ca02079cf Fix fts5vocab.test so that it works with detail=none tables. 
FossilOrigin-Name: d9135cc723fc4227aace6dcf4ffa4630c9d23aa0
 2016-01-08 07:53:09 +00:00
dan
2598b833f0 Update the fts5vocab module to work with detail=col and detail=none tables. 
FossilOrigin-Name: eedd095dc1c81ce45df00093ba237dd7b3cdff3d
 2016-01-07 20:07:41 +00:00
dan
7c230dd99c Fix a test script problem caused by a change in constraint handling within the core. 
FossilOrigin-Name: 625695b3d7d4eae7536b5f761b96cd7519ac6ada
 2016-01-06 19:43:26 +00:00
dan
4d14398a61 Merge latest trunk changes into this branch. 
FossilOrigin-Name: e7dcd013516723941c2fb78ecdc96806d49d310b
 2016-01-06 19:35:52 +00:00
dan
4364e5c9f7 Fix an fts5 problem involving detail=none, "ORDER BY rowid DESC" and deleted items. Also add tests to verify that the documented operator precedences are correct. 
FossilOrigin-Name: 8d05cfd48db1462dfd3efd502d53bd33214403fb
 2016-01-06 18:53:57 +00:00
dan
f062d676ef Fix a problem with the xPhraseFirstColumn() API in detail=col mode. Remove some unused test code from fts5ac.test. 
FossilOrigin-Name: a4e55f73b3c81e28b917395089c0201f9a2c9178
 2016-01-06 10:17:26 +00:00
dan
10e1535dee Rationalize and extend some fts5 test code. Fix bugs revealed by the same. 
FossilOrigin-Name: fd217fdb396cf22278a496de0e9dec7902ba8b1f
 2016-01-05 21:04:35 +00:00
dan
211bd3a20a Fix an OOM handling problem in fts5 detail=none and detail=col modes. Also a bug in the xInst() API when used with detail=col and column filtering expressions. Update the matchinfo() test function so that 'b' is fast with detail=col tables. 
FossilOrigin-Name: ee38f9dff5e9239c541515cd8a1aa3d81fdc0ae9
 2016-01-04 19:12:00 +00:00
dan
5af1019691 Update more fts5 tests to run in detail=none and detail=column modes as well as the default detail=full. 
FossilOrigin-Name: 3fcf3b1e24483b2cd1c1710f053ed8403e09106d
 2016-01-04 16:19:51 +00:00
dan
fe0c3cfee1 Changes to run many fts5 tests with detail=none and detail=col tables as well as the default detail=full. Also fixes for the bugs uncovered by running said tests. 
FossilOrigin-Name: 6322a1d984e7946735bace8a069ef24b31754b3b
 2016-01-02 19:01:56 +00:00
drh
8de1d77c60 Merge the latest enhancements from trunk. 
FossilOrigin-Name: c0be246a740c8f33a7c07e1414688364dee56ece
 2016-01-01 13:25:06 +00:00
drh
2307926ea9 Remove unreachable branches from the new JSON aggregate functions. 
FossilOrigin-Name: 6e30f8c6c3af9b0df39783888a1479f88271f989
 2016-01-01 00:15:59 +00:00
dan
811501e237 Fix the fts5 integrity-check code so that it works with detail=none tables. 
FossilOrigin-Name: 3a1df69e58e5830da1dff158eedbe3817743f58f
 2015-12-31 18:39:14 +00:00
dan
841243156f Fix some problems with fts5 detail=none tables. Some still remain. 
FossilOrigin-Name: 6a6f7bc40d6b4c8a4a254a9098c9d2f31fde69ca
 2015-12-31 17:36:58 +00:00
dan
d11e397b2c Updates to fts5 to support detail=none mode. As of this commit, many cases are still broken. 
FossilOrigin-Name: ac8f4cf0cede6bcbe47eeefb85d80a27e9278212
 2015-12-30 19:58:57 +00:00
drh
ff135ae4c3 Add the json_group_array() and json_group_object() aggregate functions to 
the JSON1 extension.

FossilOrigin-Name: 7f386a9332237100a345035ca213327e21d95855
 2015-12-30 01:07:02 +00:00
dan
9a3a5275cd Add the xPhraseFirstColumn() and xPhraseNextColumn() API functions to fts5. For iterating through the set of columns that contain intances of a phrase. 
FossilOrigin-Name: 8c30605bcd0a78a5015948171145bc6f640b8358
 2015-12-29 19:35:03 +00:00
dan
9f44deed93 Change the name of the offsets=0 option to "detail=column". Have the xInst, xPhraseFirst and other API functions work by parsing the original text for detail=column tables. 
FossilOrigin-Name: 228b4d10e38f7d70e1b008c3c9b4a1ae3e32e30d
 2015-12-28 19:55:00 +00:00
dan
3e6a141130 Fix some harmless gcc compiler warnings. Mostly in fts5, but also two in the core code. 
FossilOrigin-Name: 5d44d4a6cf5c6b983cbd846d9bc34251df8f4bc5
 2015-12-23 16:42:27 +00:00
dan
8f9ced636f Updates so that fts5 API functions xInst, xPhraseFirst and xPhraseNext work with the offsets=0 option. 
FossilOrigin-Name: 69bffc1632c8a8f3bfe5bf92607e64fed982e48c
 2015-12-22 18:54:16 +00:00
dan
159fd77e0f Fix an fts5 integrity-check problem that affects offsets=0 tables with prefix indexes. 
FossilOrigin-Name: 609a0bc7f34e6dae74ce756aff920f3df78fe828
 2015-12-21 18:45:09 +00:00
dan
c58b9eeaaa Fix a problem with prefix queries on fts5 offsets=0 tables. 
FossilOrigin-Name: ad0987d83c252dd8d6a69321893629d7be805c28
 2015-12-18 19:07:14 +00:00
dan
b12dc84fbb Add the "offsets=0" option to fts5, to create a smaller index without term offset information. A few things are currently broken on this branch. 
FossilOrigin-Name: 40b5bbf02a824ca73b33aa4ae1c7d5f65b7cda10
 2015-12-17 20:36:13 +00:00
drh
1db0a72be2 Fix the spellfix1_scriptcode() function to ignore whitespace and punctuation, 
and to recognize hebrew and arabic scripts.

FossilOrigin-Name: 7adfa4a5794e47f97491c08abeaaac90e826b331
 2015-12-17 14:18:21 +00:00
mistachkin
b9becaa268 Fix even more harmless compiler warnings. 
FossilOrigin-Name: 1d0e6aa119da8e15d35508f5d75ffc729979da92
 2015-12-16 23:30:30 +00:00
mistachkin
8ccdef6be4 Fix some more harmless compiler warnings. 
FossilOrigin-Name: 18f531e1cf3c8bb986d912c9c5e3f5698360c93e
 2015-12-16 22:06:52 +00:00
drh
1bb15fc973 Merge recent enhancements from trunk. 
FossilOrigin-Name: d1a1278d7f3306536dc9cbd8fb300898f1e373e8
 2015-12-02 20:40:26 +00:00
dan
f5d8c58950 Fix the fts5 "prefix=" option to match the documentation (space separated list, multiple prefix= options supported). The undocumented comma-separated format (compatible with fts4) still works. 
FossilOrigin-Name: 11eb8e877e2ba859ef6b44318f286597186dfaf2
 2015-11-25 11:56:24 +00:00
drh
769dc6e2a2 Merge the latest enhancements from trunk. 
FossilOrigin-Name: 7d6cfc79e7e5534ebacd980479917bc528a638f7
 2015-11-19 19:40:40 +00:00
drh
43509768e1 Fix harmless compiler warnings in FTS5. 
FossilOrigin-Name: 09752e51a18ac1b4c9642965e6ee1b6a32de00df
 2015-11-10 12:31:25 +00:00
drh
98a0e0083f Merge recent enhancements and bug fixes from trunk. 
FossilOrigin-Name: 78bc42e664e9fa9ee21ad9762c369f291fcdf5db
 2015-11-07 01:33:30 +00:00
drh
3901692ede Fix a harmless sanitizer warning in the ieee754 extension. 
FossilOrigin-Name: dd9a26ecdeaef7b0b9cbf4ff70448ab13a276b4e
 2015-11-07 00:51:15 +00:00
drh
ff621c6894 Test cases for the ieee754 extension. 
FossilOrigin-Name: 840cbda88675b6012dae2423252bf42d0d563874
 2015-11-06 17:01:20 +00:00
dan
dbbda39453 Have fts5 load its configuration from the xConnect() method is invoked. This ensures that the very first query run uses the correct value of the 'rank' option. 
FossilOrigin-Name: 33e6606f5e497e81119ec491cf2370f60bddafc0
 2015-11-06 12:50:57 +00:00
mistachkin
9030d0ac28 Fix typo in help information for an FTS5 script. 
FossilOrigin-Name: 777ae8007f6ff303b120b25f2dc37d7ef6b6a4f8
 2015-11-05 21:49:19 +00:00
dan
d82211db56 Add the 'hashsize' configuration option to fts5, for configuring the amount of memory allocated to the in-memory hash table while writing. 
FossilOrigin-Name: 445480095e6877cce8220b1c095f334bbb04c1c3
 2015-11-05 18:09:16 +00:00
drh
d286b9fb7d Merge all the latest enhancements from trunk. 
FossilOrigin-Name: 395a153ff7b3c7a72f3d02b6fe76d72383f4e480
 2015-10-30 16:50:00 +00:00
drh
c56fac7483 Fix uses of ctype functions (ex: isspace()) on signed characters in test 
programs and in some obscure extensions.  No changes to the core.

FossilOrigin-Name: 34eb6911afee09e779318b79baf953f616200128
 2015-10-29 13:48:15 +00:00
dan
36c33aa633 Have contentless and external content fts5 tables ignore "OR REPLACE" conflict handling. 
FossilOrigin-Name: a85c2a4758c27e8d5d0395751eb3cfd9985ce696
 2015-10-27 20:04:53 +00:00
dan
24b8457911 Fix problems with prefix queries in fts5. 
FossilOrigin-Name: 3b5758c647530bd5c2e68d0ee3e9f58a96347ca4
 2015-10-27 17:48:57 +00:00
mistachkin
16158eeb49 Fix harmless compiler warnings in FTS5. 
FossilOrigin-Name: aa4e01ea1af327d1f8398ebea1c5bacc46698c3d
 2015-10-21 22:08:36 +00:00
dan
99b25309d0 Remove some branches made unreachable by recent changes from fts5. 
FossilOrigin-Name: ae350bfbfd59f912c469a51bf7d1409f3c8d958a
 2015-10-21 20:56:27 +00:00
dan
f2c9995dbe Minor optimization for fts5 queries. 
FossilOrigin-Name: 363b36d50b6f3e3d3e79c538be1167b071a5a710
 2015-10-21 20:07:08 +00:00
dan
5c22e82a17 Add extra debugging function to test_rbu.c. Enhance the documentation for sqlite3rbu_db() to define the validity of the returned database handles. 
FossilOrigin-Name: b9c4aa521156d8ca09151a82a7e80aa8d1d7a313
 2015-10-21 08:26:01 +00:00
mistachkin
6d7734c27d Fix harmless compiler warnings in FTS5. 
FossilOrigin-Name: 0a903ec26bfbbe9bfd18bc34934e689ffdb01ce5
 2015-10-20 23:27:14 +00:00
dan
219f4d48a2 More optimizations for fts5 prefix queries. 
FossilOrigin-Name: b8fb263ed1b36d085437131795505e53af103d26
 2015-10-20 21:05:53 +00:00
dan
9cc4ae6f2a Fix #line directives added to generated file fts5.c. 
FossilOrigin-Name: 1f5f5804cd394a81b1c0712ce6d1052f228d0a40
 2015-10-20 19:55:35 +00:00
dan
3f9bfa740f Initialize variables in the fts5 integrity-check code to avoid compiler warnings. 
FossilOrigin-Name: e979e2cccac257ad554803e6a1103558b0f159d8
 2015-10-20 15:49:02 +00:00
dan
8789fbb2bd Another optimization for fts5 prefix (and other) queries. 
FossilOrigin-Name: 60a8bde055a960c5b8cb4e231802c75617c942d8
 2015-10-19 20:49:10 +00:00
dan
5e5b454cd8 Another tweak to improve performance of fts5 prefix queries. 
FossilOrigin-Name: 69be427c864dc3de804ca3c5f1c6addcd33cd188
 2015-10-19 17:43:24 +00:00
dan
3c060c2aef Fix a problem in the fts5txt2db.tcl script causing it to fail when creating tables with more than 8 columns. 
FossilOrigin-Name: 68ee426a6432ac63655909ff70cb22bde33cf28c
 2015-10-19 15:59:08 +00:00
dan
0206920e27 Add tests to cover new branches added to the fts5 code by the previous commit. 
FossilOrigin-Name: cf618334a8a05a067e844236e4d461b2e5706da6
 2015-10-17 20:34:49 +00:00
dan
05903e6a87 Handle equality and range constraints on the "term" column of fts5vocab tables. Also have the same module report columns using names instead of indexes. 
FossilOrigin-Name: 6020d96ab47a0bebe41f691a3f44fd55d8b2d2b7
 2015-10-17 19:49:01 +00:00
drh
5db9901479 Merge the version 3.9.1 updates. 
FossilOrigin-Name: 2bbb9595ccc4fdd854bf16a1efcddbc42a7ff14e
 2015-10-16 20:20:08 +00:00
drh
0b086403b4 Cherrypick the json form-feed fix, and other #ifdef and build script changes 
to address minor issues that came to light after the 3.9.0 release.  Update
the version number to 3.9.0.  No logic changes except for the form-feed
bug-fix in json1 (ticket [57eec374ae1d0a1d4a]).

FossilOrigin-Name: 746fcd2fd412ddc27071827fb20eb6df0741dfb1
 2015-10-16 15:56:27 +00:00
drh
49472655d4 Fix the JSON1 extension so that it does not depend on isdigit() and 
strtod() from the standard library when compiled into SQLite as part of the
amalgamation.

FossilOrigin-Name: bc9a9a60c31ebf9b11ac89ae5f99a3b66d6efc67
 2015-10-16 15:35:39 +00:00
drh
b9e8f59b63 Form-feed is not valid whitespace for json. 
Fix for ticket [57eec374ae1d0a1d]

FossilOrigin-Name: 28957d635961c525f735a52b8ffe3e69ccf31382
 2015-10-16 15:16:06 +00:00
dan
5f93ccd7fc Tests and minor fixes to improve coverage of FTS5 code. 
FossilOrigin-Name: f4de6d450e143cb1dd5447800d4b178e3db114c8
 2015-10-14 21:08:48 +00:00
mistachkin
cdabd7bd50 Fix harmless compiler warnings. 
FossilOrigin-Name: 1c46c194a2da24fe613d77b5a8d727cc2fc9faa4
 2015-10-14 20:34:57 +00:00
dan
8d32e8042c Avoid exporting sqlite3_json_init() from amalgamation builds. 
FossilOrigin-Name: 8463f7e7908d0a96ed036377dfa3805328c62925
 2015-10-14 18:45:42 +00:00
dan
f4f968443b Add the missing 'extern "C" {...}' blocks to fts5.h and sqlite3rbu.h. 
FossilOrigin-Name: 47a2ce97d585e1760ffcf760c0de1753677d5713
 2015-10-14 10:56:34 +00:00
drh
2c22b5259e Merge in the final few changes before the 3.9.0 release. 
FossilOrigin-Name: e1afdbb50120f7d058b25538c6cb8ce3bb34993d
 2015-10-13 20:42:16 +00:00
drh
cec7dec006 Remove the unused fts5ExprColsetTest() routine. 
FossilOrigin-Name: 9ecafc0c94102dca6da192f400278399464086fb
 2015-10-12 22:31:02 +00:00
mistachkin
f2c26ed17b Fix a couple harmless compiler warnings. 
FossilOrigin-Name: 7f896a971c5953d5370215ecd834d1fb711b4263
 2015-10-12 22:20:29 +00:00
dan
df705d8185 Further tweaks to improve fts5 prefix query performance. 
FossilOrigin-Name: 1c20c1c28b56411f106cf2f6961b3ad4b4d6f6c8
 2015-10-12 19:12:29 +00:00
drh
4918480252 Pull in the latest 3.9.0 tweaks from trunk. 
FossilOrigin-Name: ed174ccf0ae615647ba026fed649d26dc9a98640
 2015-10-10 20:35:10 +00:00
drh
72724da95a Remove another instance of strcpy() from FTS5, to mollify OpenBSD. 
FossilOrigin-Name: 35e6248abb4435a8b26d270092b856beff867406
 2015-10-10 15:57:20 +00:00
drh
c5971cc859 Omit the use of strcpy() in FTS5 since OpenBSD hates strcpy(). 
FossilOrigin-Name: bc24a5bbfd95df3518611b221de69b73776111bc
 2015-10-10 15:11:49 +00:00
drh
9a4718ff73 Add some #ifdef-ery to json1.c to avoid a duplicate typedef when used in the 
amalgamation, since some compilers become upset over duplicate typedefs.

FossilOrigin-Name: de28acd42f29693341feb884b7223cd3d2b96730
 2015-10-10 14:00:37 +00:00
drh
a0882fad7c The previous fix to JSON1 was not complete. A few more tweaks are needed 
for correct handling of all oversized integers.

FossilOrigin-Name: 4a47f0177851721cdf6c981df962b6e8862372e7
 2015-10-09 20:40:44 +00:00
drh
8deb4b8b17 Fix the JSON1 extension so that it renders integers outside the range 
of -9223372036854775808 to +9223372036854775807 as floating-point numbers.

FossilOrigin-Name: ae736e35fb59c9aed33a8c805cf2ecdee528051f
 2015-10-09 18:21:43 +00:00
drh
973bc6f1a8 Merge the version 3.9.0 changes and the incorporation of JSON1 and FTS5 
into the amalgamation from trunk.

FossilOrigin-Name: c1d96fb654b2c0f66d586aa39d80ea0468186690
 2015-10-09 15:29:24 +00:00
drh
b5c8d27c7d Add the JSON1 and FTS5 extensions to the amalgamation. Add new options 
to ./configure: --enable-json1 and --enable-fts5.

FossilOrigin-Name: 1eb769933108cf401b25c8d784ea23f27324a0bd
 2015-10-09 13:39:51 +00:00
dan
0008ce7cc5 Makefile and fts5 changes so that fts5 works with main.mk. Still does not work with Makefile.in. 
FossilOrigin-Name: 6ebac32d8378e46f44a6eb55aaa30baf4d7dde7d
 2015-10-09 11:09:47 +00:00
drh
45fac88951 Trying to get FTS5 tests to build and run using main.mk. Not yet working. 
FossilOrigin-Name: 206174f9b154c590a3e2e94236db38e111d64bdb
 2015-10-09 01:42:49 +00:00
dan
d3b90a2e41 Remove calls to "load_static_extension" from fts5 test scripts. 
FossilOrigin-Name: 53dd7c4c65842c5c9ed3e84edd62e24f2c9be15b
 2015-10-08 21:02:29 +00:00
dan
23fda8242c Further tweaks to main.mk so that fts5 builds as part of testfixture. 
FossilOrigin-Name: 97e11b79a52fb1c57f0afd2dbd6ee66cf00a922d
 2015-10-08 21:00:46 +00:00
dan
56eac26897 Fix further fts5 compilation issues. 
FossilOrigin-Name: 0d7f301fb03c8546a5dbce5d061a1d74e3c86bcf
 2015-10-08 20:40:18 +00:00
dan
351ccb3825 Fix two more warnings in fts5 code. 
FossilOrigin-Name: 5343e601fb6f0f24f4e4d5d442f7b5b074734143
 2015-10-08 20:28:33 +00:00
dan
056d7acf25 Fix a couple of errors in fts5 compilation. This branch still does not build with -Wall -Werror. 
FossilOrigin-Name: e9e76e12812b9b42b1142246b71cea98e26903aa
 2015-10-08 20:11:42 +00:00
drh
50065656f7 First attempt to add json1 and fts5 to the amalgamation. This check-in does 
not compile.

FossilOrigin-Name: d820a1bd1b8dd702d1b3a099af393530cc5a5d51
 2015-10-08 19:29:18 +00:00
mistachkin
b2682eb14b In the RBU extension, use MoveFile() instead of rename() on Windows CE. 
FossilOrigin-Name: df9ef61f1ba2e3a3420fae84e3eaa2e0e235bc28
 2015-10-08 17:35:51 +00:00
drh
2d000eafbe Merge the 3.8.12 beta changes from trunk. 
FossilOrigin-Name: 35b1b8d4b97715030700e37b292bb4f1bb3f44d6
 2015-10-08 14:55:30 +00:00
dan
98e713bb8d Further optimizations for fts5 prefix queries without a prefix index. 
FossilOrigin-Name: 83dc1ff7fa010715ca7f406a572f4ee444a967d7
 2015-10-07 19:06:21 +00:00
mistachkin
08114efde4 Fix harmless compiler warning in FTS5. 
FossilOrigin-Name: 13adcd038fc20dd1b6f344f79b449b4034f8f8f2
 2015-10-07 17:06:17 +00:00
dan
22c7cca21f Allow the subsitute character (codepoint 26 - 0x1A) to appear in fts5 barewords. 
FossilOrigin-Name: baec1b96cb64a6a6317143a8df841e502afe3914
 2015-10-07 17:01:22 +00:00
dan
d46cc33131 Add tests for fts5 phrase queries with column filters. 
FossilOrigin-Name: f20f9f813f00cefcd427e506a09b0b973c782e3f
 2015-10-07 13:24:27 +00:00
dan
92099b0753 Add further tests for fts5 prefix queries. 
FossilOrigin-Name: accdc98b1291f07b802fd23f3ebc7dbc02ba09d3
 2015-10-07 09:02:50 +00:00
dan
a2507137f3 Optimizations for fts5 expressions that filter on column. More still to come. 
FossilOrigin-Name: bf1607ac155018573ca40fb58aca62c5fea7e60b
 2015-10-06 20:53:26 +00:00
dan
6f832d3dff Improve performance of prefix queries without a prefix index on fts5 tables. 
FossilOrigin-Name: f2f0184e9e1c9f121ee2ac864cd28c8cd8efecb5
 2015-10-05 19:41:16 +00:00
dan
f24bebe37a Update fts3 so that expressions to the left and right of a NOT operator are balanced. This prevents relatively small expressions (a dozen terms or so) that are children of NOT operators from triggering the "expression tree is too large" error. 
FossilOrigin-Name: d6b66cd7b89fbd964f798d160a34caac0ba7347a
 2015-10-05 15:39:45 +00:00
dan
2c1023df09 Add fts5txt2db.tcl, a tool for creating sample fts4/5 databases from text files. 
FossilOrigin-Name: 44f1ce30d1e446c9ee5f8bd8a62119e00356aa0e
 2015-10-05 11:57:09 +00:00
dan
a0f197b842 Update fts5 to support the table function syntax. "... FROM fts5_tbl WHERE fts5_tbl MATCH ?1 AND rank MATCH ?1" can now be written "FROM fts5_tbl(?1, ?2)". 
FossilOrigin-Name: 41d17d9e24303aed6d549ea23c62b93bf2f71691
 2015-10-03 15:38:57 +00:00
dan
06f8c635ef Add tests for the rtree module to verify that attempts to insert non-integer primary key values or non-numeric dimensions into an rtree table are handled correctly. 
FossilOrigin-Name: f653fce90846b700441e8fa5f1930c1ec5e38e31
 2015-10-03 12:23:18 +00:00
dan
bca189d5d8 Update fts5 to avoid using a statement journal for UPDATE and DELETE operations that affect at most a single row. 
FossilOrigin-Name: 5c83b9db46d61cfa76a1abed50467e2f02db0eb0
 2015-10-02 20:04:30 +00:00
dan
5171e911f2 Fix an fts3 bug causing NEAR queries on uncommitted data to malfunction. 
FossilOrigin-Name: 6f90839e91024e2006042f5eb7f21ca5b47a9b4a
 2015-10-01 18:31:29 +00:00
dan
6c39e6a800 Changes to the sesssions module ensure that tables appear within changesets and patchsets in the same order that they were attached to the sessions object. 
FossilOrigin-Name: 7695890230dc1e0c6db9b7aa509db2039c7f7239
 2015-10-01 16:35:57 +00:00
drh
32af5eda6a Merge recent enhancements from trunk, and especially the fix for 
ticket [1b266395d6bc10].

FossilOrigin-Name: b2face9aa95ade96a5666c70b6b31064c1ad0977
 2015-09-30 14:50:39 +00:00
dan
e60856980a Add the sqlite3_index_info.idxFlags field, allowing xBestIndex() implementations to specify to SQLite that a strategy may visit at most one row. Add support for this to fts3/4. Omit the statement journal from virtual table UPDATE and DELETE operations that are guaranteed not to affect more than one row. 
FossilOrigin-Name: a1d08fd3d0419da8c22355d48c6d83eed6fd7e07
 2015-09-29 16:47:53 +00:00
dan
4ad0971919 Fix an off-by-one error in test function fts5_decode(). 
FossilOrigin-Name: 3a9f076250d9559d8ea94ba44095ba3ddbc5542d
 2015-09-29 12:19:51 +00:00
dan
b3deb4ea64 Change the name of the new sqlite3_index_info.flags field to "idxFlags". Add documentation for the same to sqlite.h.in. 
FossilOrigin-Name: f61203bc0fb0b62e12d6270e8d9063e445a5a252
 2015-09-29 11:57:20 +00:00
dan
0f40037eee Also allow UPDATE on virtual tables to use the onepass strategy. 
FossilOrigin-Name: 1aa27d706db9b2e21737ce4b94b47ecd12c2570f
 2015-09-28 20:03:49 +00:00
dan
d943b27596 Update fts3 to use the onepass strategy for delete operations. 
FossilOrigin-Name: fffab4f70f85eeb2acbb89534064a6e397c39384
 2015-09-28 15:23:29 +00:00
drh
2f20e13b83 Enable adding JSON1 by appending the json1.c source file to the amalgamation 
and compiling with -DSQLITE_ENABLE_JSON1

FossilOrigin-Name: 33404b2029120d4aabe1e25d484871810777e934
 2015-09-26 17:44:59 +00:00
drh
9ec0efd946 Merge all the latest trunk enhancements into the sessions branch. 
FossilOrigin-Name: c91065f8edb1e54076791716fc20d3fcfe3070dc
 2015-09-24 14:26:51 +00:00
drh
8cb15cc5ae Another (smaller) performance optimization for the JSON parser. 
FossilOrigin-Name: c43daa8c78df99f62dd4d3c83708a3a8eff92496
 2015-09-24 01:40:45 +00:00
drh
9567794fd9 Performance optimizations on the JSON parser. 
FossilOrigin-Name: 7dd4b07a42eb84589d34430b9d7bfa88fbd743eb
 2015-09-24 01:06:37 +00:00
drh
f27cd1f3aa Do not allow a comma at the end of a JSON array or object. 
FossilOrigin-Name: 7c7a3f3e9bc2f7a7334d8d6eae183d83f22097be
 2015-09-23 01:10:29 +00:00
drh
3d1d2a97a5 Futher simplifications to json1.c. Also an obscure bug-fix in the initial 
output of json_tree() when using a path to an object contained within an array.

FossilOrigin-Name: fcb1e327a64134e5ac539ec3d52733422d3061fd
 2015-09-22 01:15:49 +00:00
drh
8cb0c83cce Fix json_set() so that it can overwrite a value that was previously overwritten 
during the same call.

FossilOrigin-Name: 0f16041647993975c316203c7e11f06e27640136
 2015-09-22 00:21:03 +00:00
drh
a8f39a9b5d Simplifications to the json1.c logic. 
FossilOrigin-Name: 1646a2bd85f87d03a14fcaec288107f5f6411c6f
 2015-09-21 22:53:16 +00:00
drh
dc38495715 Fix a memory leak in json1.c that could occur after misuse of json_object(). 
FossilOrigin-Name: 394b81b11f261a9b179a034bc2a2d2dff0765e3b
 2015-09-19 18:54:39 +00:00
drh
4977ccf143 Fix an off-by-one error (really off-by-2 in this case) in the buffer 
resize logic of json1.

FossilOrigin-Name: d2a027372a5a6efc0f9b6f605093d865ae1c6788
 2015-09-19 11:57:26 +00:00
dan
2e8f5517f7 Avoid passing (signed char) values directly to isspace(), isalnum() or isdigit() in json1.c. Cast the value to (unsigned char) first. 
FossilOrigin-Name: 6713e35b8a8c997aa2717e86ce6dcd63bb993477
 2015-09-17 17:21:09 +00:00
dan
cf346d7a9c Fix a crash in FTS5 caused by specifying NULL as the rhs of a MATCH operator. 
FossilOrigin-Name: e8ed62f82e8acc40b818bf86fafe3d480687514e
 2015-09-17 09:48:01 +00:00
dan
ec9e8f004e Fix typo in fts5.h. 
FossilOrigin-Name: 07721c6c24f651d8e281c29227b113d292f6b0de
 2015-09-16 12:31:39 +00:00
dan
438b881540 Merge the latest trunk enhancements with this branch. 
FossilOrigin-Name: b7469c44be77358e02892a3abc696f7caa0dcd3b
 2015-09-15 15:55:15 +00:00
dan
6609bab24d Add test cases to cover fts5 integrity-check code. 
FossilOrigin-Name: 1d018c35b9e81982df036f5e62a4a42219b54e02
 2015-09-15 14:39:17 +00:00
dan
128ea696ea Fix a problem with fts5 "ORDER BY rowid DESC" queries and large terms. 
FossilOrigin-Name: b26d8f79c62cb71b4c3ea5df9d0e09558bbbd794
 2015-09-15 11:58:33 +00:00
dan
dafeda754b Improve test coverage of fts5_index.c. 
FossilOrigin-Name: c1f76686cee3918b1be785a4071d68cb3afda0ef
 2015-09-14 19:51:05 +00:00
drh
91762f2d18 Merge the latest trunk enhancements. 
FossilOrigin-Name: 22ce9218fb2bb56cc5dd4e32077a16f669250d5f
 2015-09-14 10:47:29 +00:00
mistachkin
16a93128f8 Fix harmless compiler warnings. 
FossilOrigin-Name: bfc7b84b766860d2e410702ba7c1166d7328309a
 2015-09-11 18:05:01 +00:00
dan
bcb04b6128 Fix some compiler warnings in fts5 code. 
FossilOrigin-Name: 0dc436116e55e3fd55eb6085ada71e099069b32d
 2015-09-11 14:15:46 +00:00
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