Commit Graph

9340 Commits

Author SHA1 Message Date
drh
051eb38a26 Fix various harmless compiler warnings in FTS3 and RTREE.
FossilOrigin-Name: fe62179efdea40887e23a16f898060b879013824
2011-06-20 17:24:29 +00:00
drh
ced174b189 Enable crnl to nl translation for the mksqlite3c.tcl script.
FossilOrigin-Name: 161379d205455a7a4927a76efd4da75a98182854
2011-06-20 15:24:22 +00:00
dan
1fce2b14fb Update some test cases in fts4aa.test.
FossilOrigin-Name: 65e5f7706d3b6784f9cce315478d7623d6d7e7d9
2011-06-20 12:24:26 +00:00
dan
6764a70086 Fix a problem where FTS test code was not being included in the testfixture build when SQLITE_ENABLE_FTS4 was defined.
FossilOrigin-Name: e539d08a4dda073dc67dc39a104f89374d3bd8e9
2011-06-20 11:15:06 +00:00
dan
b727d67944 Add tests for the "column:term" query syntax to fts3auto.test.
FossilOrigin-Name: d138b0e65953c529619d64e662bdb5478d7d79c3
2011-06-20 10:46:49 +00:00
drh
d80138af2c Do not run test tkt-2d1a5c67d.test in the inmemory_journal permutation
since that test requires WAL mode which does not work with inmemory_journal.

FossilOrigin-Name: 228c43c726e637daadc0c9b5a8b24243f239b1cf
2011-06-19 21:17:35 +00:00
shaneh
603e426f95 Fix a header dependency in nmake Makefile.
FossilOrigin-Name: 54492212af6c4be5d5546b370398ef771c16f430
2011-06-17 18:52:07 +00:00
dan
c5f21892a8 Avoid loading doclists for infrequent terms that are part of phrases twice.
FossilOrigin-Name: 8f939723f742329cedba8930f71dff42004f3d0d
2011-06-17 17:37:31 +00:00
dan
10fc4d8c45 Add a missing declaration to fts3Int.h.
FossilOrigin-Name: 3bfd4466f50711eb71d1a13231025ff4e1e76246
2011-06-17 16:04:39 +00:00
shaneh
6e7850c520 Fix a few more issues with the nmake makefile.
FossilOrigin-Name: a117005f502482c4529661616cbb26eee1fe75d1
2011-06-17 15:57:07 +00:00
shaneh
05fd9aab10 Update walro.test script for Windows.
FossilOrigin-Name: d6443f8eb30fc3e91e1ad92e2adb595ccf121880
2011-06-17 15:55:32 +00:00
shaneh
5e0fb2c64c Force almagamation gen scripts to use unix line endings for consistency across platforms.
FossilOrigin-Name: a4adc7f78bf43843ee76911baf2f48eb483dd6ac
2011-06-17 15:54:59 +00:00
shaneh
2989021135 More updates to the nmake makefile.
FossilOrigin-Name: 55bb56d33632eac65bf401dc1f98324b20fb0718
2011-06-17 07:22:09 +00:00
shaneh
b2f20bfc53 Add Microsoft nmake compatible makefile; update a few test cases for Windows.
FossilOrigin-Name: a7590af65f3881cf905b8cac2b87381e89a80271
2011-06-17 07:07:24 +00:00
dan
d4d21fea8e Fix a problem with NEAR queries executed inside a transaction that writes the FTS table.
FossilOrigin-Name: 051c756c367837908f6691c0a36108e088c94f99
2011-06-16 16:06:05 +00:00
drh
6b96771b82 Changes to #ifdefs so that the build goes correctly if the only FTS macro
defined is SQLITE_ENABLE_FTS4.

FossilOrigin-Name: a0b43a320e6491de7070966ed7c3ec55fd660a85
2011-06-16 00:54:45 +00:00
drh
babb61f346 Fix the multiplex.test module so that it works with the inmemory_journal
permutation.

FossilOrigin-Name: 03d9480fc4a8310bc8da81a64f9206c8f4b501d9
2011-06-15 23:34:51 +00:00
drh
518d656574 Further tweaks to the wal7.test test case.
FossilOrigin-Name: 177e2d72a8a654d25720e6afc7706624610ac80f
2011-06-15 19:18:47 +00:00
dan
b0a328324f Add a couple of pointer type casts to test file test_quota.c.
FossilOrigin-Name: 0df061b0554c749cade4ec8ddabe453934825bb2
2011-06-15 17:04:43 +00:00
drh
7c65a882f3 Fix the wal7.test script so that it works even if secure_delete is engaged.
FossilOrigin-Name: 68fb7a548c8fe00bcb9c6d71f2863b55d42b3c64
2011-06-15 16:07:30 +00:00
drh
295b50ce1c Merge the improved incremental doclist loading test from the
broken-build branch (which is now fixed) into trunk.

FossilOrigin-Name: f9750870ee04935f338e4d808900fee5a8b2b389
2011-06-15 13:11:06 +00:00
drh
bf4bc8c254 Fix so that the TCL test harness works even if SQLITE_ENABLE_FTS is omitted.
FossilOrigin-Name: 63ebcb52a1909aca80f2fef3e982f8fb5929b73b
2011-06-15 13:02:21 +00:00
drh
1aa4f3e529 Fix a couple of compiler warnings.
FossilOrigin-Name: 3899f3b95ed50773a72d907b39b451fefce69c9e
2011-06-15 12:43:36 +00:00
dan
376d1e5c4f Add an interface to better test incremental loading of doclists by FTS4. Also some tests for this and term prefix queries.
FossilOrigin-Name: 7a3813138d1a5c5d99f4756c79998831d779774f
2011-06-15 08:30:29 +00:00
dan
5f84e14add Fix a memory leak that can follow an OOM error in a user-function that uses sqlite3_set_auxdata().
FossilOrigin-Name: 0185c4b689d18d66e6aa39b4a7bddc279e3c9d17
2011-06-14 14:18:45 +00:00
dan
79bd81038c Merge fts3-prefix-search branch with trunk.
FossilOrigin-Name: b1f9c1e0ac51cedfb05ac073a603343f6df865b5
2011-06-14 11:50:09 +00:00
dan
db27fc0785 Add a couple of extra tests.
FossilOrigin-Name: aefd46dfae7e06fbaf4f2b9a86a7f2ac6927331e
2011-06-14 11:32:50 +00:00
dan
2cf1a1de4b Fix another bug caused by NEAR/matchinfo/order=DESC interaction.
FossilOrigin-Name: 04907fbadeb743c95cc9f3529e63ef388684799f
2011-06-14 09:00:27 +00:00
dan
c72f9d98cb Merge recent trunk changes into fts3-prefix-search branch.
FossilOrigin-Name: 135ce30f62ebd6a1b239c18dbbd9c926ea507db4
2011-06-14 07:22:30 +00:00
dan
806cbfc214 Remove unused parameters from internal fts3 function.
FossilOrigin-Name: 06de3f2cbc27cdfd9f83218c9ea576f74f60d07b
2011-06-14 07:14:43 +00:00
dan
653265d9ed Update trace2.test to account for new FTS queries.
FossilOrigin-Name: 2c20129297b64f4113b8edb551385eb918279471
2011-06-13 18:21:11 +00:00
dan
2f77934385 Add tests for deferred tokens to fts3auto.test. Fix a problem with OR queries and deferred tokens.
FossilOrigin-Name: b9fb69e55bb05a8819688ee63987f2a05c33d59b
2011-06-13 17:00:12 +00:00
dan
3fd651928f Changes to fts3auto.test to test OR, AND and NOT operations.
FossilOrigin-Name: e4ab6cdb101bbeb804820425cf569ee7dc2397fb
2011-06-13 13:48:36 +00:00
drh
0a32fa6d81 Use only unsigned values in the implementatin of LIKE and GLOB so that
values won't overflow to negative when dealing with malformed UTF8.

FossilOrigin-Name: 77f01578bb565d1bc884b374b68bae10ce34a084
2011-06-13 12:19:21 +00:00
dan
99ebad90e3 Fix a bug exposed by combining matchinfo(), NEAR and "ORDER BY rowid DESC".
FossilOrigin-Name: 5f6b87f420f21749aa7c72e020c50aca74890086
2011-06-13 09:11:01 +00:00
dan
7006c18e00 When updating a field that requires foreign key constraints be checked, ensure that the indexes and tables are consistent when the FK logic is run. Otherwise, it may detect the inconsistency and report database corruption.
FossilOrigin-Name: 2b3d9996a829c62fbaf7c92d50e44636340b07c6
2011-06-10 18:33:35 +00:00
dan
b328debc6a Fix minor problems with foreign key constraints where the parent table is the same as the child table.
FossilOrigin-Name: 442d8d8bfe443797482354ba8766d97d3d6acaae
2011-06-10 16:33:25 +00:00
dan
9dde7cbbad Fix a line in pcache1.c where a global data structure is accessed without using the GLOBAL() macro. This causes a subtle malfunction on test systems that use SQLITE_OMIT_WSD.
FossilOrigin-Name: b11b2e1f8ccadf78bebe2278f05a8e3d3e543328
2011-06-09 17:53:43 +00:00
dan
786b068967 Fix problems to do with using both OR and NEAR operators in a single expression.
FossilOrigin-Name: 4e8dd19eef04777d800977faf1859a405e396f30
2011-06-09 10:48:02 +00:00
dan
abf2545ed9 Fix various issues to do with deferred tokens, NEAR expressions and matchinfo().
FossilOrigin-Name: 3972a787df5ec253b99b148385655e7b68d851fa
2011-06-08 18:39:07 +00:00
dan
3eabcf5f46 Have NEAR queries use incremental merging. Fix issues surrounding the deferred token optimization.
FossilOrigin-Name: 9d10a6846b12a9cc8fd4fdc3affd931a27218b5a
2011-06-07 18:35:45 +00:00
drh
55a0959a18 Fix a comment type on the description of the Schema object.
FossilOrigin-Name: 095cd9a6ec175b703ff3fcafeffb3349f21bd831
2011-06-07 18:31:14 +00:00
drh
ebcdc73f53 Merge the latest trunk changes into the fts3-prefix-search branch.
FossilOrigin-Name: 567dd84359218245d4e6887547e2a48881f2c8e0
2011-06-06 18:14:25 +00:00
dan
5289b01524 Modify fts3rnd.test to run tests for both "ORDER BY docid ASC" and "ORDER BY docid DESC" with both order=ASC and order=DESC FTS tables. Fixes for some bugs found.
FossilOrigin-Name: 89f2f482e077241ac29a58eadf44a72a9c01f98c
2011-06-06 14:51:50 +00:00
drh
2ce71b4e7a Add assert() statements to verify that u16 pointers associated with
the enhancement in [897f56a158] are always 2-byte aligned.

FossilOrigin-Name: 98ccfa930e8e5f10808a518e3e22e85e8a8a65c2
2011-06-06 13:38:11 +00:00
dan
9aab071780 Clean up the code for processing FTS4 options a bit.
FossilOrigin-Name: 0425138a2365d23b07d88fda2b1f458f112f389d
2011-06-06 06:55:38 +00:00
dan
76e04431ef Remove some unreachable code.
FossilOrigin-Name: 650e1a79eda5a2134a1fbd305ab1f205a57c0892
2011-06-04 20:13:24 +00:00
dan
b46ee91729 Allow the "order=DESC" and "order=ASC" parameters in FTS4 "CREATE VIRTUAL TABLE" statements. Tables created with "order=DESC" store all doclists in descending order, which allows optimizations normally applied to "ORDER BY docid ASC" queries to be used with "ORDER BY docid DESC" queries instead.
FossilOrigin-Name: f6a0193f5a32603eb48bddc6297042dbd2ffe96e
2011-06-04 20:04:35 +00:00
drh
afb9817f8c Performance improvement to the btree search routine.
FossilOrigin-Name: 65db822f200bafe9abe59b33b17b2c643c17c5e8
2011-06-04 01:43:53 +00:00
drh
61d2fe955c Performance improvements on memory copies inside of btree by moving 2 bytes
at a time instead of just 1 byte at a time.

FossilOrigin-Name: 897f56a158ebe62758c9998e4941ae046c75fb99
2011-06-03 23:28:33 +00:00