drh
4f25847dbd
Merge the master-journal optimization and other recent changes from trunk.
...
FossilOrigin-Name: 18c3ab4784a4efab2cc583ef712c4db9d127418a
2016-02-22 16:32:39 +00:00
drh
e1ee002891
Fix a couple of harmless warnings generated by clang.
...
FossilOrigin-Name: a1a3ff1f53145c5a9fbf29398cf4a453729e71f0
2016-02-19 15:17:53 +00:00
dan
9e2cfad18a
Add an "#ifndef SQLITE_AMALGAMATION" guard around a typedef in fts5_test_mi.c to avoid redefining "u32" if it is compiled as part of the amalgamation. Cherrypick of [f9c49ba1].
...
FossilOrigin-Name: ce0f1ed517e387ca6a687b805088d7c529cd257b
2016-02-19 10:19:43 +00:00
dan
92b859292d
Add an "#ifndef SQLITE_AMALGAMATION" guard around a typedef in fts5_test_mi.c to avoid redefining "u32" if it is compiled as part of the amalgamation.
...
FossilOrigin-Name: f9c49ba1edf13cb8c48d73f1b2e3f80c46b3c030
2016-02-19 10:18:36 +00:00
dan
557d0383ff
Remove SQLITE_TEST macros from fts5_test_mi.c. Add the SQLITE_FTS5_ENABLE_TEST_MI compile time symbol - to make it easier to create builds that include the fts5 matchinfo demo by default.
...
FossilOrigin-Name: e2ef6667772eeac6eee3aed5d0609c2a0ef5d8cf
2016-02-18 16:16:43 +00:00
drh
62c831d829
Merge the tokenizer buffer overrun bug-fix from trunk.
...
FossilOrigin-Name: 82e7e31b09097b24876f69df56cdd8f4c1aad1f1
2016-02-18 14:53:52 +00:00
dan
a0c2d3c155
Remove an unnecessary "include <tcl.h>" line from fts5_test_mi.c.
...
FossilOrigin-Name: 31d8b69e9e0747e573516570bfe2770384e99134
2016-02-18 13:32:34 +00:00
drh
241014c3f1
Merge recent performance enhancements and the enhanced API_ARMOR from trunk.
...
FossilOrigin-Name: b7fa0fb3399ad2bf1e6bc4c92d43278a40f19ec4
2016-02-18 01:36:47 +00:00
dan
5e29f38d2c
Remove the "#ifdef SQLITE_TEST" condition from fts5_test_mi.c. Update fts5_main.c so that if SQLITE_FTS5_TEST_MI is defined when it is built the fts5_test_mi.c entry point is automatically called. This makes it easier to build versions of fts5 that include the matchinfo() demo by default.
...
FossilOrigin-Name: 87e6e225aea3a4d10476d16eab4a6403a4a128c9
2016-02-17 14:48:26 +00:00
dan
87d6b35541
Improve test coverage of demo code in fts5_test_mi.c.
...
FossilOrigin-Name: 8a78050dc0e374a0df0f29716df60250e2c4b4f7
2016-02-17 14:11:06 +00:00
drh
45f31be85d
Experimental changes to Lemon for improved parser performance.
...
FossilOrigin-Name: a65d583ce97b8c08157268bd054479cda3957a94
2016-02-16 21:19:49 +00:00
drh
7ff89807e0
Fix a harmless compiler warning in FTS5.
...
FossilOrigin-Name: e52c90758c53cbb0f74e0d8582e4c3c1bee04150
2016-02-15 23:46:36 +00:00
drh
d774536f52
Merge changes from the 3.11.0 release candidate.
...
FossilOrigin-Name: d198a6db2e49d0205420f8ed08cfffd75ee93e1e
2016-02-13 17:35:48 +00:00
dan
a66e386225
Fix another test problem in sessionfault.test.
...
FossilOrigin-Name: f6d1cf79437f892220e93635c377513160ee7fd7
2016-02-13 15:08:25 +00:00
drh
50d348b1e1
Harden sqlite3session_delete() against trying to delete a session that
...
is not currently on the session list.
FossilOrigin-Name: 6c2d34df76fb7823f307c11a1135ab30674421a9
2016-02-13 14:45:56 +00:00
dan
6fee795885
Fix a problem in sessionfault.test causing it to segfault following a test failure. This commit does not fix the actual test failure - just the subsequent segfault.
...
FossilOrigin-Name: 582b2ae77d65b1e142ceb5774f37b0aaa3851378
2016-02-13 14:39:46 +00:00
drh
d8b7d6e44c
Merge the changes for the 3.11.0 release candidate from trunk.
...
FossilOrigin-Name: 4d7a802e73ef0352f840bc8d74c560afb7666ff7
2016-02-13 14:07:56 +00:00
dan
53ff9c2972
Fix a potential buffer overread provoked by invalid utf-8 in fts5.
...
FossilOrigin-Name: a049fbbde5da2e43d41aa8c2b41f9eb21507ac76
2016-02-12 18:48:09 +00:00
dan
f2d328fa25
Fix a fairly obscure buffer overread in fts5.
...
FossilOrigin-Name: 130580207ab5cee762b2893808acef7c8afad027
2016-02-12 17:56:27 +00:00
drh
4553f6ea91
Automatically disable FTS3 and FTS4 when building with SQLITE_OMIT_VIRTUALTABLE.
...
FossilOrigin-Name: 0beb32d20d8dd698138cdb2de6b6056de176754d
2016-02-11 22:41:04 +00:00
drh
5d2e2f1267
Remove the unused fts5BlobCompare() routine.
...
FossilOrigin-Name: defc762dd11144402abd591278819768a080d5ea
2016-02-11 21:53:57 +00:00
dan
df9c59f74d
Fix another unused variable warning in fts5 code.
...
FossilOrigin-Name: 61b4c120540afd80a4021b0d3990f13acc38a059
2016-02-11 18:18:33 +00:00
dan
2a44b3d877
Avoid a buffer overread when reading a corrupt fts5 structure record.
...
FossilOrigin-Name: facbc424e555061135aced7b134bf6c19f54e484
2016-02-11 18:08:38 +00:00
dan
22e8356368
Handle parser stack overflow when parsing fts5 query expressions. Fix some compiler warnings in fts5 code.
...
FossilOrigin-Name: bc3f7900d5a06829d123814a5ac7b951bcfc1560
2016-02-11 17:01:32 +00:00
drh
df3a907ecc
Add JSON1 and FTS5 to the set of extensions subject to close compiler warning
...
analysis. Fix some warnings in each. More (harmless) warnings still exist
in FTS5.
FossilOrigin-Name: cfe2eb88b504f5e9b1351022036641b1ac4c3e78
2016-02-11 15:37:18 +00:00
drh
1158cd750f
Merge recent fixes and enhancements from trunk.
...
FossilOrigin-Name: f073401792c0a093d4324fc2636170f108656976
2016-02-09 15:50:33 +00:00
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
81ab26904b
Merge OOM handling optimizations and PRAGMA synchronous=EXTRA as well as
...
other enhancements from trunk.
FossilOrigin-Name: 201fcbeef35d3d06d71ef5770fb72152840fcc2e
2016-02-05 14:29:18 +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
26bb3b2148
Merge recent enhancements from trunk.
...
FossilOrigin-Name: e6a4a16312bf71ed5f277cdcd326003eb2580e72
2016-02-02 02:30:01 +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