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

617 Commits

Author SHA1 Message Date
dan
1b9fd2651b Fix a problem preventing FTS5 from correctly passing the FTS5_TOKENIZE_PREFIX 
flag to custom tokenizer implementations.

FossilOrigin-Name: 03c601344ed56b316bcc5fd02f6648b0009ba61b
 2017-01-23 07:06:27 +00:00
dan
1439a1e80f Improve handling of corrupt data in fts5. 
FossilOrigin-Name: 609ac1c73f7c2b48a571c178a72383996a9538fe
 2017-01-06 11:55:03 +00:00
dan
55092c1504 Fix an fts5 bug that could cause a crash following an OOM error or 
sqlite3_interrupt() interrupt.

FossilOrigin-Name: 0ea3ece988883874bb88e3daaa220d7fc0cf36ef
 2016-12-09 16:12:04 +00:00
dan
158e4e56d7 Simplify some code in fts5_expr.c. Add some extra test cases for the same. 
FossilOrigin-Name: 7cc2d60dce90b8d4dca35708e33002ae6387806e
 2016-11-28 14:52:23 +00:00
dan
b3e845ba33 Fix an fts5 problem causing a crash in phrase queries where the first token of 
the phrase matches one or more rows but some other token within the phrase
matches zero.

FossilOrigin-Name: e78f6f3bbf4781850960fe6741f7cba480f2c27d
 2016-11-14 08:19:37 +00:00
dan
642f0146d7 Fix some compiler warnings in fts5. 
FossilOrigin-Name: b066637bb75959267fe6104da323c5112ad78f82
 2016-10-05 20:14:29 +00:00
dan
49377a8fb7 Fix a problem with the fts5 auxiliary function API causing a crash when a query contained a phrase of zero terms. 
FossilOrigin-Name: 0741812d7fcd558479e4849fbb3ba8d03738d018
 2016-09-21 19:43:34 +00:00
dan
48a72ebfa3 Update the fts5vocab table to handle "ORDER BY term" efficiently. 
FossilOrigin-Name: d4928fb5cd63a72808f01778fa5a11395385dedf
 2016-09-21 14:41:09 +00:00
dan
37ff4d4c77 Fix a bug in the fts5 snippet function causing it to return text containing zero phrase instances. 
FossilOrigin-Name: b174ed2bde43a1872374ce18b85ac9f067e86fbb
 2016-08-24 18:50:47 +00:00
dan
783e778f38 Fix other minor problems with the fts5 snippet() function. 
FossilOrigin-Name: b56b2a85cf377686727f3929208ede43f797cf76
 2016-08-20 17:23:45 +00:00
dan
7ca1ea16ff Have the fts5 snippet() function avoid favouring snippets that begin with sentences that do not contain search terms. Add an extra bias in favour of the first sentence in the document. 
FossilOrigin-Name: d8180af2adfc101dfce95a0498b5cd7b30643b30
 2016-08-19 14:25:38 +00:00
dan
b39a5ac229 Adjust some tests to account for recent changes to the fts5 snippet function. 
FossilOrigin-Name: 184ecbe9c0c3280a22cdeda5c7836a7b280c3e1f
 2016-08-18 14:47:48 +00:00
dan
e7036202bc Bias the fts5 snippet() function to return snippets that look like they start at the start of sentences. 
FossilOrigin-Name: 60de159476edbd48dc363f7f77f09c32ea68422f
 2016-08-17 19:05:12 +00:00
dan
8c2b1fde58 Fix a problem in the fts5 snippet() auxiliary function. 
FossilOrigin-Name: a861713cc6a3868a1c89240e8340bc7b2b9559da
 2016-08-17 11:14:39 +00:00
dan
460d38f15e Fix an fts5 problem with corrupt database handling found by address-sanitizer. 
FossilOrigin-Name: e22252e1da4cd9e41b970970a1c4f466aa6cc133
 2016-08-13 10:34:12 +00:00
dan
3b96d1e2e4 Fix a buffer overread in fts5. 
FossilOrigin-Name: fcfbee6c7d33a9ae7feb46044a0c2fe680460d39
 2016-08-13 06:38:31 +00:00
drh
c73bd0a5cc Fix a harmless compiler warning in FTS5. 
FossilOrigin-Name: 2ea0c8b46eefd4874f021f8dfd344be751f2034f
 2016-08-11 01:24:56 +00:00
drh
8d57d7af23 Fix harmless compiler warning. 
FossilOrigin-Name: 9a5a4f6e3bc265fecf79a7f63d14abbf239da636
 2016-08-09 21:01:52 +00:00
dan
ccf03677a3 Minor update to the way fts5 column filters are parsed. 
FossilOrigin-Name: 14864f2b8470fe98dbd17f59963bf1be8d4962f9
 2016-08-09 19:48:37 +00:00
dan
882ef0b8c0 Have fts5 interpret column lists that begin with a "-" character as "match any column except" lists. 
FossilOrigin-Name: e517545650631d1e8a7ee63c6646a8b183a0a894
 2016-08-09 19:26:57 +00:00
drh
6da466e4f4 Fix documentation typos. No changes to code. 
FossilOrigin-Name: ebc396a19fa79bea208ecda277ffff5d02166d0b
 2016-08-07 18:52:11 +00:00
mistachkin
c08556844e Add macro necessary for building several extensions when the __stdcall calling convention is not in use. 
FossilOrigin-Name: bc8c9b55ddf5227dc6b2116486f4a19bf54fce2b
 2016-07-29 01:31:49 +00:00
mistachkin
2d45d7bfab Missed a couple Tcl command deletion callbacks. 
FossilOrigin-Name: fc5c187602acceedf7152b6927616d134f779a8f
 2016-07-28 23:58:25 +00:00
mistachkin
afe18262b4 Use the SQLITE_TCLAPI macro in several extensions that were missed in the previous check-in. 
FossilOrigin-Name: df2543652b835353c03956dfbd3e35e5b191372e
 2016-07-28 23:54:45 +00:00
mistachkin
52b1dbb5fc Allow the 'testfixture.exe' target to be compiled with the __stdcall calling convention. 
FossilOrigin-Name: e8be3dfeabaa31b3490793cf8230faae1204be15
 2016-07-28 14:37:04 +00:00
drh
07d9a03187 Fix a test case in FTS5 to make it compatible with Tcl 8.5. 
FossilOrigin-Name: a495f8e77e14241150f79e746c7303284f04621a
 2016-07-25 21:11:53 +00:00
dan
033ac6af7e Add extra test cases to verify the fix in [64ca1a835]. 
FossilOrigin-Name: bf98a2de7ed41a8acca89d7369b353f12182cfb4
 2016-07-21 18:02:20 +00:00
dan
8414e81359 Add the largely untested SQLITE_FTS5_NO_WITHOUT_ROWID compile time option to fts5. For building a dynamically loadable extension that does not use WITHOUT ROWID. 
FossilOrigin-Name: d0a1cf1c56c237617fb73cb31f4950365b1f3e9b
 2016-07-15 19:17:19 +00:00
dan
0df5024e83 Fix an FTS5 problem (segfault or incorrect query results) with "... MATCH 'x OR y' ORDER BY rank" queries when either token 'x' or 'y' is completely absent from the dataset. 
FossilOrigin-Name: 64ca1a835a89fd211078d2cd8f9b649e89be528d
 2016-05-30 08:28:21 +00:00
dan
ba1079ba2a Update a comment in fts5.h. No changes to code. 
FossilOrigin-Name: 14e53d0e2f62d82ae1d64a72fd9711548e3bf5ea
 2016-05-09 19:03:42 +00:00
dan
170b66493d Fix the FTS5 xQueryPhrase() API function so that it recognizes column filters. 
FossilOrigin-Name: 48505cde05d74748454dc135d4ec25954ecf020e
 2016-05-09 18:05:44 +00:00
mistachkin
77fac879d2 More harmless compiler warning fixes. 
FossilOrigin-Name: ab69527c1608da0b668f3b49e967661dd99cc3d4
 2016-04-12 20:05:06 +00:00
drh
997de998a8 Remove an unused local variable from FTS5. 
FossilOrigin-Name: 0ed693c29f184223cde3b3d51f0e06273e586803
 2016-03-23 15:53:45 +00:00
dan
848b190e40 Explicitly limit the size of fts5 tokens to 32768 bytes. 
FossilOrigin-Name: 70fc69eed9b09159899d7cbd1416a59d04210a63
 2016-03-23 15:04:00 +00:00
dan
0a2f2b546a Fix some errors in fts5 test scripts. 
FossilOrigin-Name: e1ab2d376a72786098125a41c1ea8140fcbd15c6
 2016-03-22 15:01:54 +00:00
drh
13969f5af0 Fix harmless compiler warnings. 
FossilOrigin-Name: 25d776e4523aefeec007943fe29aa17c23ccb301
 2016-03-21 22:28:51 +00:00
dan
6737aab5cf Add tests to ensure that fts5 is now deterministic. 
FossilOrigin-Name: 3d076094ce411bffcfeb76c0284d15d0f83bd459
 2016-03-21 16:25:34 +00:00
dan
f5268268b7 Have fts5 cache the structure of its index in main memory. Use "PRAGMA data_version" to figure out when this cache should be invalidated. 
FossilOrigin-Name: 902f221754f3cc6fb4ae049c135f85efce604ed3
 2016-03-21 15:30:50 +00:00
dan
3c6707f72b Rearrange code so that tests pass whether SQLITE_DEBUG is defined or not. 
FossilOrigin-Name: 89296a46c3b891ee0b637ff6f89d828d6e46e7b5
 2016-03-21 15:18:13 +00:00
dan
ef480d37dc Change the way fts5 internally allocates segment ids in order to eliminated non-determinism from the module. 
FossilOrigin-Name: d6e2637df16764aa9723a30ea2eb8a631d28cb2b
 2016-03-21 09:56:19 +00:00
dan
cf9bce34ab Add test file fts5multiclient.test. 
FossilOrigin-Name: 7832466f9177cca59455ba272802145297fcd53d
 2016-03-19 14:47:28 +00:00
drh
860443da10 Fix FTS5 so that it works with SQLITE_OMIT_AUTORESET. 
FossilOrigin-Name: b199637d81d7e2a767131ac03c7679b101fd459c
 2016-03-18 00:39:40 +00:00
dan
c9460ab989 Fix some OOM-handling issues in the fts5 changes on this branch. 
FossilOrigin-Name: 020a0bda59fe93b9361ceeed0d5a8ba4177380c8
 2016-03-17 12:39:56 +00:00
dan
db8d320d63 Merge the changes on the reusable-pragma branch into this one. 
FossilOrigin-Name: 6c4a17b963916d19c9433d7a251338042f32e9fa
 2016-03-16 20:53:33 +00:00
dan
377ba38429 Add a cast to an implict (size_t -> int) conversion in fts5_expr.c. 
FossilOrigin-Name: d9b5ff7aba3a8f6ca4505eac308fa9d510254c3e
 2016-03-16 19:53:58 +00:00
dan
f55fb6615b Have fts5 cache the decoded structure of fts5 indexes in memory. Use "PRAGMA data_version" to detect stale caches. 
FossilOrigin-Name: 33ef2210ef19e55c8d460bfe9d3dc146034c8acc
 2016-03-16 19:48:10 +00:00
dan
7d85774da8 Fix a memory leak in fts5 that could occur following a syntax error in a query expression. 
FossilOrigin-Name: 54b8968e335760105206b894672213c1d56771a4
 2016-03-14 12:16:23 +00:00
dan
5cf98f101e Fix a problem handling 'NEAR("" token)' in fts5 found by fuzzing. 
FossilOrigin-Name: 10a827ae5f3f322af836c15e581fdc958a433a5a
 2016-03-12 19:33:47 +00:00
dan
e8c20120ce Fix handling of strings that contain zero tokens in fts5. And other problems found by fuzzing. 
FossilOrigin-Name: 72b3ff0f0df83e62adda6584b4281cf086d45e45
 2016-03-12 16:32:16 +00:00
dan
1bb85f3ed3 Add tests to cover untested branches in recent fts5 changes. 
FossilOrigin-Name: fa0033edf6ddf3c6631fa95b343225dbc8ac9429
 2016-03-10 15:12:47 +00:00
drh
6459ca0b8c Remove an unused local variable. 
FossilOrigin-Name: 3c343c3d012367942037e64a9855b825cb459844
 2016-03-10 14:22:42 +00:00
dan
4dbc65b29a Add an incremental optimize capability to fts5. Make the 'merge' command independent of the 'automerge' settings. 
FossilOrigin-Name: 556671444c03e3afca072d0f5e9bea2657de6fd3
 2016-03-09 20:54:14 +00:00
drh
5b38201708 Merge 3.11.1 changes into trunk. 
FossilOrigin-Name: 7abc2dd953477797fa05421b061d73596aa025fb
 2016-03-03 17:54:30 +00:00
dan
e18ec6acc2 Fix an error in an fts5 test script. 
FossilOrigin-Name: b2a03e2d479aec2fc68dfc83a1fa34c740f44e13
 2016-03-02 13:26:19 +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
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
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
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
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
dan
c2d0b56e6a Fix a signed/unsigned comparison warning in fts5. 
FossilOrigin-Name: 85eb05ddbc3a7cff986af13c3dab6c0063e62171
 2016-02-08 20:14:41 +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
dan
4786cf5a20 Further improve performance of unindexed fts5 prefix queries. 
FossilOrigin-Name: c9c6457d8ea911f6cc63967127e58da3146fd3ef
 2016-02-04 19:45:19 +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
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
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
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
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
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
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
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
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
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
mistachkin
b9becaa268 Fix even more harmless compiler warnings. 
FossilOrigin-Name: 1d0e6aa119da8e15d35508f5d75ffc729979da92
 2015-12-16 23:30:30 +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
43509768e1 Fix harmless compiler warnings in FTS5. 
FossilOrigin-Name: 09752e51a18ac1b4c9642965e6ee1b6a32de00df
 2015-11-10 12:31:25 +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
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
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
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
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
cec7dec006 Remove the unused fts5ExprColsetTest() routine. 
FossilOrigin-Name: 9ecafc0c94102dca6da192f400278399464086fb
 2015-10-12 22:31:02 +00:00
dan
df705d8185 Further tweaks to improve fts5 prefix query performance. 
FossilOrigin-Name: 1c20c1c28b56411f106cf2f6961b3ad4b4d6f6c8
 2015-10-12 19:12:29 +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
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
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
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
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
4ad0971919 Fix an off-by-one error in test function fts5_decode(). 
FossilOrigin-Name: 3a9f076250d9559d8ea94ba44095ba3ddbc5542d
 2015-09-29 12:19:51 +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
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
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
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
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
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
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
dan
ee0c0a8de3 Another change to the fts5 tokenizer API. 
FossilOrigin-Name: fc71868496f45f9c7a79ed2bf2d164a7c4718ce1
 2015-08-29 15:44:27 +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
mistachkin
0cbb513a67 Fix harmless compiler warning in FTS5. 
FossilOrigin-Name: 02448a9fccd4532daa667e4ba6ff1dbb7f68008a
 2015-08-18 16:32:45 +00:00
dan
7899fa78c1 Minor optimization for fts5 API xInst(). 
FossilOrigin-Name: efb7c9c5d0015c8c966f8d6742c05cda82fc146a
 2015-08-12 15:36:58 +00:00
dan
7918dc835b Add the xPhraseFirst() and xPhraseNext() fts5 APIs, for faster iteration through a single phrases position list. Also optimize xInst() and xInstCount() a bit. 
FossilOrigin-Name: f7682435278419829a46bb4cc9b5625d46549e22
 2015-08-12 12:11:28 +00:00
mistachkin
7e968a7d0a Fix harmless compiler warnings in FTS5 code. 
FossilOrigin-Name: 0ddb2532b2daaaf1b0109ac360822f84cb999b7f
 2015-08-06 03:19:14 +00:00
mistachkin
c38e00f61e Fix duplicate test numbering in the FTS5 matchinfo tests. 
FossilOrigin-Name: 483ebe8989ed7dbe197fe84e3eef6e76fa828e14
 2015-08-06 03:09:49 +00:00
dan
50b5491771 Add tests for the matchinfo-like test function. Fix problems found in test and fts5 code by doing so. 
FossilOrigin-Name: 9e3aafe44a0813aa2a0c6172fdba1440b8a973ec
 2015-08-05 19:35:59 +00:00
dan
f9419d17ff Remove all references to "docid" within fts5 source code and comments. Replace with "rowid". 
FossilOrigin-Name: dffd358f6cbf575d3b1045b1ce53429d15bade2a
 2015-08-05 07:43:46 +00:00
dan
d3789c0028 Add new test file fts5_test_mi.c, containing an implementation of a function similar to FTS4 matchinfo() for FTS5. 
FossilOrigin-Name: 4f9520a9dc9c667b7fda5b0822de2bf48184ac99
 2015-08-04 20:29:00 +00:00
dan
90c3179bb4 Remove a duplicate "typedef struct Fts5Global Fts5Global;" from fts5_main.c (duplicate is in fts5Int.h). 
FossilOrigin-Name: 54a771fe2c2b3c1cc2914a527a825934fe114c49
 2015-07-31 17:48:07 +00:00
dan
79e2347fdf Fix a bug in the fts5 porter tokenizer preventing it from passing xCreate() arguments through to its parent tokenizer. 
FossilOrigin-Name: c3c672af97edf2ae5d793f6fa47364370aa4f4ec
 2015-07-31 14:43:02 +00:00
dan
dbac3ece0f Return an error message (instead of segfaulting) if test function fts5_expr() is invoked with no arguments. 
FossilOrigin-Name: 8e818b8985c0196cd9671a6491796faaeebeb16e
 2015-07-30 11:26:10 +00:00
dan
0f43df31b5 Update comments in fts5.h describing the xColumnCount() API function. 
FossilOrigin-Name: a623eb55d1583bcfe360a8dabd29f2a583c61e64
 2015-07-29 14:58:47 +00:00
dan
291d090947 Merge the fts5-btree-index branch with this one. FTS5 changes only. 
FossilOrigin-Name: 9f1dcdc3e1644c21762dacf619fac70afe6318c5
 2015-07-27 12:19:11 +00:00
dan
c3b4132f53 Bump the "version" field in the fts5 config table. 
FossilOrigin-Name: 92c9178933ef95e92c343c0a741a76bbdf071966
 2015-07-27 11:49:01 +00:00
dan
8d90087146 Minor tweak to the SQL schema used by fts5. 
FossilOrigin-Name: 427bf09ba41158041d774aac2b5ffbd062c6eabe
 2015-07-27 11:43:36 +00:00
dan
d0dc8cb5a3 Remove a potentially undefined behaviour involving signed integers and bitshift operations from fts5_hash.c. 
FossilOrigin-Name: ad6286ab1f40e4716456a67b719f9cd733f988eb
 2015-07-27 11:01:19 +00:00
dan
44198f30b5 Merge latest trunk changes with this branch. 
FossilOrigin-Name: 5ec933c257884019484db7f533ce920012e47a1c
 2015-07-27 10:46:48 +00:00
dan
08406bf064 Fix warnings in fts5 code. 
FossilOrigin-Name: bd4f156d07d0db1f063d42891965920fc2229352
 2015-07-24 20:34:40 +00:00
dan
3baaacae03 Merge trunk changes, including fixes for compiler warnings in fts5 code, with this branch. 
FossilOrigin-Name: 7190d79ba452ceb1af77ce1375278b097816a8be
 2015-07-16 20:24:42 +00:00
dan
8694d6049f Fix compiler warnings in fts5 code. 
FossilOrigin-Name: e9bf275cd969eca6fb41384d3637528d6a19f819
 2015-07-16 20:17:57 +00:00
dan
e3229c19cb Use a WITHOUT ROWID table to index fts5 btree leaves. This is faster to query and only slightly larger than storing btree nodes within an intkey table. 
FossilOrigin-Name: 862418e3506d4b7cca9c44d58c2eb9dc915d75c9
 2015-07-15 19:46:02 +00:00
mistachkin
532f179cab Fix some harmless compiler warnings. 
FossilOrigin-Name: 3de030c904d125ccf41fa1929646b8a002b5341b
 2015-07-14 17:18:05 +00:00
dan
3eb9024d68 Fix inconsistencies in formatting of fts5 docs. 
FossilOrigin-Name: 5fb4c77163be8d5ff1e2934dda3cc2ad0a6267e8
 2015-07-10 17:55:42 +00:00
dan
d2454f47e7 Improve the performance of docid merges in fts5. 
FossilOrigin-Name: b2de77a01cc5edcea2f98f7916e64cb33e6bd414
 2015-07-09 20:46:35 +00:00
dan
3dbd2397f4 Reduce the number of calls to malloc() made by fts5. 
FossilOrigin-Name: 898618ccf61d3ad166d9fc742e132d518338b5c3
 2015-07-09 19:02:19 +00:00
dan
bcf2163771 Merge the Fts5MultiSegIter and Fts5IndexIter objects. 
FossilOrigin-Name: 6ace73541ae48aeb19e0c2d9f6772d032d0a7eae
 2015-07-07 19:35:11 +00:00
dan
b2fe306a2e Further optimizations for fts5 b-tree seeks. 
FossilOrigin-Name: f37899686c032145f431f81c1072738536c61c7e
 2015-07-07 08:29:32 +00:00
dan
656773b675 Speed up seek operations on fts5 b-tree structures. 
FossilOrigin-Name: 7b7da1eb435d321fc4283f6aa2161fa1e16f2cf3
 2015-07-06 20:27:19 +00:00
dan
30ae503167 Optimize seek operations on fts5 b-trees. 
FossilOrigin-Name: 8cf02090ce53ec150492d77d9e5e5f27665bd34f
 2015-07-04 18:44:07 +00:00
dan
70c8885417 Fix a problem in the fts5 integrity-check. 
FossilOrigin-Name: 4e473559c9bdcf4d0b823e995a3642cd50ebd337
 2015-07-04 15:35:02 +00:00
dan
28a10c3c1f Rework the Fts5MultiSegIter structure a bit to make it more efficient. 
FossilOrigin-Name: 0778825d0ec9315c70659fae8d0640b209049dd8
 2015-07-03 20:47:18 +00:00
dan
00a1351e55 Speed up eof checks on fts5 cursors. 
FossilOrigin-Name: 3df4af5d8c28863783b0bc867abfbe31cc96f1b9
 2015-07-03 19:13:56 +00:00
dan
ec7c1de354 Avoid freeing the array of instance matches each time the fts5 xNext() method is called. 
FossilOrigin-Name: b9b0c1e50d77f5d6e02f43fbb100c722cb692cc5
 2015-07-03 17:14:18 +00:00
dan
a153bbc4c2 Copy fts5.h into the build directory as part of building fts5.c. Also remove code to edit fts5parse.c from various Makefiles and add it to mkfts5c.tcl. 
FossilOrigin-Name: 4d8f03dc7b6529cf8d46fc0fcc82112c0394dc13
 2015-07-02 20:12:34 +00:00
dan
6544b8643f Minor change to mkfts5c.tcl so that fts5.c can be used according to the instructions in loadext.html. 
FossilOrigin-Name: edbcccd349090efff3f975e27451608136a429fc
 2015-07-02 18:52:16 +00:00
dan
3abdc44e7b Add fts5_source_id() SQL function, similar to sqlite_source_id(). 
FossilOrigin-Name: ec2573487cb86664f7f056168a764c28ca8236fc
 2015-07-02 18:16:02 +00:00