mirrors/sqlite
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
17,276 Commits 1,487 Branches 166 Tags
Commit Graph

1785 Commits

Author SHA1 Message Date
drh
15d36c603d Remove an unused goto label in the RBU extension. 
FossilOrigin-Name: 2179a106e8dd7943d4f37093e65ce7826720904e
 2016-03-08 16:02:37 +00:00
dan
d0b8b664bd Add a new row type to RBU (a peer of insert, update and delete) - "delete then insert". 
FossilOrigin-Name: 1d9468d2427d2c9b7240b364554ac85a0b62fa44
 2016-03-08 15:52:43 +00:00
dan
c7dbce0f2a Update fts3/4 so that the 'merge=X,Y' command merges at least, instead of exactly, Y segments from a single level. This matches the documentation. 'merge=X,0' is, as it was in 3.11, an error. 
FossilOrigin-Name: 64b3cb29159491cbfab7e01844b54408541ece5e
 2016-03-08 15:37:48 +00:00
dan
108b7953ed Update fts3/4 so that the 'merge=X,0' command merges X pages from all segments of the first level in the fts index that contains 2 or more segments. 
FossilOrigin-Name: cddf69dbc46f10ee7e87538dd850e086386b544c
 2016-03-07 20:14:27 +00:00
drh
c5c67abb9a Merge the virtual table query planner enhancement, the RTREE cost estimate 
fix, and the statement journal spill delay enhancement from trunk.

FossilOrigin-Name: 17fd8f3cf0ec565e08403dc8e10a1cffc2bbe165
 2016-03-07 17:49:17 +00:00
dan
e45216fd9d Add a new row type to RBU (a peer of insert, update and delete) - "delete then insert". 
FossilOrigin-Name: 169311c85b30f625bdb6986c9cd11db70942d73b
 2016-03-07 17:39:30 +00:00
drh
2ea74dc805 Adjust the cost estimates for RTREE such that the expected number of rows and 
expected cost is halved for each additional constraint.

FossilOrigin-Name: fd7cd0609381a85673d1f737ebeb19dde3de180f
 2016-03-05 20:28:24 +00:00
drh
2606aca80f Merge recent enhancements from trunk. Default page size is 4096. Writes 
to statement journals are avoided.

FossilOrigin-Name: 456df3365e2df60e34762f2024bb551538b3f72b
 2016-03-04 16:42:43 +00:00
drh
2b33f6e775 Allow the left-hand side of IN operators on virtual tables to have the 
aConstraintUsage[].omit flag clear.

FossilOrigin-Name: 3eb74342740cd393e03aa38cd01690ccab173b76
 2016-03-03 20:42:18 +00:00
drh
5b38201708 Merge 3.11.1 changes into trunk. 
FossilOrigin-Name: 7abc2dd953477797fa05421b061d73596aa025fb
 2016-03-03 17:54:30 +00:00
drh
2396fce54e Increase the default upper bound on scope to 30. 
FossilOrigin-Name: b1258814f6100f594210775e9e3007b5b0c65025
 2016-03-03 15:16:15 +00:00
dan
e18ec6acc2 Fix an error in an fts5 test script. 
FossilOrigin-Name: b2a03e2d479aec2fc68dfc83a1fa34c740f44e13
 2016-03-02 13:26:19 +00:00
drh
dbc49161c0 Allow the left-hand side of IN operators on virtual tables to have the 
aConstraintUsage[].omit flag clear.

FossilOrigin-Name: 1622623cbbfc4325c53d731aba78ca9c382ec612
 2016-03-02 03:28:07 +00:00
drh
47784529cc Add the optional -DSERIES_OMIT_CONSTRAINT_VERIFY=0 option to the series.c 
extension that implements the generate_series() virtual table.

FossilOrigin-Name: 3d9daa929c0abe6dc01e800ef343b0eef2f0c76a
 2016-03-02 00:58:49 +00:00
dan
bce50c734b Do not attempt to run fts5bigtok.test or fts5merge2.test if FTS5 is not compiled in. 
FossilOrigin-Name: f7ed373953c2dea0919a85dfb461dfef512cd5fc
 2016-03-01 16:56:26 +00:00
drh
fb02bad04f Remove a forgotten "breakpoint" command from an FTS5 test script. 
FossilOrigin-Name: 61927c8f3156c6e61b768318b3cd3bcc4144e17b
 2016-03-01 15:52:41 +00:00
dan
b1e8d31edf Fix a problem in fts5 where a corrupt db could lead to a (huge) buffer overread. Cherrypick of [c9a30e117f]. 
FossilOrigin-Name: daef5869f4d62ebb24eb03b79fe4be0812fa0496
 2016-03-01 14:51:36 +00:00
dan
45a0e4eb59 Fix an fts5 problem causing 'optimize' to corrupt the fts index under some circumstances. Cherrypick of [251d6473f7]. 
FossilOrigin-Name: 5b1b7ab5d67f3d691e52ba57dbc14c52d90c6631
 2016-03-01 14:50:55 +00:00
drh
889cb33b8f Better estimatedCost in the xBestIndex method of the generate_series vtab. 
FossilOrigin-Name: f2c16094a536e7ef62444d0fe38cbee2a4999426
 2016-03-01 02:11:50 +00:00
dan
4e9d0d5418 Fix a problem in fts5 where a corrupt db could lead to a (huge) buffer overread. 
FossilOrigin-Name: c9a30e117f2c6c9ef0cc0c6ca5227d2961715b8f
 2016-02-29 17:34:16 +00:00
dan
437a54eaba Fix an fts5 problem causing 'optimize' to corrupt the fts index under some circumstances. 
FossilOrigin-Name: 251d6473f7c9ad95adbdcc49cb8eaf7c0956764b
 2016-02-29 17:16:26 +00:00
mistachkin
62ab810014 Fix typo in ICU error message. 
FossilOrigin-Name: 00c8fffd47cec763857389e1e91c026ba3179182
 2016-02-27 00:21:16 +00:00
drh
88a1650859 Fix a potential buffer overflow in the ICU upper() function. 
FossilOrigin-Name: b8dc1b9f5d413000387bfe784b69f5d0ee5c0489
 2016-02-26 21:20:57 +00:00
dan
38c3d3d8a5 Fix the ICU extension LIKE function so that it does not read past the end of a buffer if it it passed malformed utf-8. 
FossilOrigin-Name: 424b7aee3310b9782bd312589dc3d9f287aa04b8
 2016-02-26 16:03:29 +00:00
drh
d42908fb0e Provide the new SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER option to 
sqlite3_db_config() that can be used to activate the two-argument version
of fts3_tokenizer() for a specific database connection at run-time.

FossilOrigin-Name: 374b5108087a2eae03676c0f3469b37a272145bf
 2016-02-26 15:38:24 +00:00
dan
fd37e67b16 Disable the RESTRICT foreign key action if "PRAGMA defer_foreign_keys" is set. 
FossilOrigin-Name: 8fea1166016c659ece83e0045bc348f478a9ba6a
 2016-02-25 19:52:11 +00:00
drh
d3e1af4aa0 Merge all the latest changes from trunk. 
FossilOrigin-Name: b86590043e17705ada90562cf30f69b3e3ef65a4
 2016-02-25 18:54:30 +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
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
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
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
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