dan
27f2468422
Internally, use a 64-bit integers for segment level numbers.
...
FossilOrigin-Name: 8180e320ee4090e41511836678e49a98c0b228e8
2014-05-17 16:56:52 +00:00
dan
83e05b814e
Fix a broken test case in fts4growth2.test.
...
FossilOrigin-Name: 9fde5b960af39b187474e5b2909ff0e56d5e0bf9
2014-05-17 15:10:37 +00:00
mistachkin
02c1e264a9
Fix harmless compiler warnings.
...
FossilOrigin-Name: 7e60347e21a7473974061965a8d1f2eadde987e2
2014-05-16 23:38:59 +00:00
mistachkin
77a90ce811
Work around compilation issue with MSVC.
...
FossilOrigin-Name: 9623a29c11e3a90513016ea3306c085d2bf91b62
2014-05-16 23:15:50 +00:00
drh
5f4a479048
Rearrange some conditionals and add #if statements to make the code more
...
testable.
FossilOrigin-Name: 17afd77057f8695733a9a60225646c1d8813b1a0
2014-05-16 20:24:51 +00:00
drh
190d695967
Add a pair of sqlite3FaultSim(100) calls to vdbesort.c to facilitate testing
...
of obscure and hard to reach error conditions.
FossilOrigin-Name: cceac14fd83ddd8f868c1767cdc66635607cb159
2014-05-16 17:31:42 +00:00
dan
4bd855fae5
Fixes to prevent an FTS index from growing indefinitely as the corresponding table is updated. Change the FTS 'automerge' option to allow the user to specify the number of segments that should be merged simultaneously by auto-merges.
...
FossilOrigin-Name: a75f1800021d30b712053373440041b7b355a36a
2014-05-16 16:16:59 +00:00
dan
e82384817d
Add extra test to backcompat.test to ensure that old and new versions of FTS may work together on the same incremental merge operation.
...
FossilOrigin-Name: 3997d47bb9c8593a2cd30317ea65163b99db1832
2014-05-16 15:48:17 +00:00
drh
d25c69ef39
Merge all recent changes from trunk, and especially the new sqlite3FaultSim()
...
interface.
FossilOrigin-Name: 43fcbd9116401f30781fdcbe55d1674d6b96311b
2014-05-16 14:27:05 +00:00
drh
c007f61bb0
Repurpose the SQLITE_TESTCTRL_FAULT_INSTALL test-control to register a
...
callback to be invoked by sqlite3FaultSim(). That test-control has been
unused since 2008-06-20 and was never used in any official release.
FossilOrigin-Name: 0d43a7ad9abe821e33e0bf83a997aa4461b1e3f2
2014-05-16 14:17:01 +00:00
drh
8f0dab37cb
Use #ifdef logic to avoid an always-true branch when
...
SQLITE_MAX_WORKER_THREADS=0
FossilOrigin-Name: 88cfe6d7de5f19f484304d0db585eac5de6c00ae
2014-05-16 12:18:08 +00:00
dan
a7b9e7d2d9
Fix a bug causing an incorrect segment size value to be stored if both an old and new FTS version performed work on the same incremental merge operation.
...
FossilOrigin-Name: a9a2aeab298ba2ac0b8835e61406e2d83bf7e39b
2014-05-16 10:30:44 +00:00
dan
df2c52f728
Merge latest trunk changes with this branch.
...
FossilOrigin-Name: 5809986ffcc5d9cbab64760f8d7fbfbb6b626ee7
2014-05-15 19:05:55 +00:00
dan
157c957a65
Fix a problem with the handling of delete markers by automerge on large databases.
...
FossilOrigin-Name: 2b09bd17eb85ea3c682e930d2aabc6441f2265e0
2014-05-15 18:36:39 +00:00
drh
6cc3759383
Use #ifdef to omit code that is not used when SQLITE_MAX_WORKER_THREADS is zero.
...
FossilOrigin-Name: 2e8d287d4f41d395a488bf65b20e956b0e311177
2014-05-15 16:56:56 +00:00
dan
5b34f15a82
Do not search for promotable segments following an FTS 'optimize' operation or creation of a new segment on the oldest existing level.
...
FossilOrigin-Name: 34f6b4b8e4cb8ea45fd518672dc96335d1ce06ab
2014-05-14 19:49:17 +00:00
dan
a0b7ca90b7
Fix a problem to do with loading the value of the FTS automerge setting from the database.
...
FossilOrigin-Name: 7268119f74602929b372b88eca7b3c3b4964f7d5
2014-05-14 18:45:27 +00:00
dan
9e83e465eb
Fix various problems to do with segment promotion. Add test file fts4growth2.test, containing tests to check that the FTS index does not grow indefinitely as the table is updated.
...
FossilOrigin-Name: 21491a9bc686e63bec32f1a67103622f1160a2f9
2014-05-14 15:58:47 +00:00
dan
c0caea21de
Fix a problem preventing delete markers from ever being removed from the FTS index.
...
FossilOrigin-Name: 7f47ae5c5ddb1227484ddae7c6960183932a052a
2014-05-13 20:11:37 +00:00
mistachkin
a5e2b50d0a
Improve a comment in the MSVC makefile. No changes to code.
...
FossilOrigin-Name: 0901dccedaf5679691ba803ec76d113de170185d
2014-05-12 22:36:50 +00:00
mistachkin
548ff8f491
Add VSIX packaging support for Windows Phone 8.1 using Visual Studio 2013 Update 2.
...
FossilOrigin-Name: 013738f3d531078fb47f9992c18a0d630e771a32
2014-05-12 21:12:04 +00:00
dan
6bb9889ef0
Experimental code to prevent FTS indexes from growing indefinitely as the table is updated.
...
FossilOrigin-Name: b3b505a4dd0c679437a4272109f1188175088cd1
2014-05-12 20:04:48 +00:00
mistachkin
0f710546e7
In mutex_w32.c, make inclusion of the Windows header file dependent on SQLITE_OS_WIN, not SQLITE_MUTEX_W32.
...
FossilOrigin-Name: 93ffbcc0b1d207950851dbb16a8c101afb949d5f
2014-05-12 15:37:03 +00:00
drh
b0f935e4da
In the sorter, only use large memory allocations if scratch memory has not
...
been configured. Add #ifdefs to disable unused code when
SQLITE_MAX_WORKER_THREADS is zero. Other sorter changes in support
of testability.
FossilOrigin-Name: d7e2b0d9cb099eda3341bc934bedff9facfe88bd
2014-05-12 15:30:00 +00:00
mistachkin
796407395e
Merge updates from trunk. Emit the AppliesTo and DependsOn SDK manifest attributes when building the VSIX for Windows Phone 8.1.
...
FossilOrigin-Name: f6237a5f190bd5693ceed0ca1f048c3ec2a4da67
2014-05-10 17:33:11 +00:00
mistachkin
1273614191
When using Visual Studio 2013, add the appropriate MaxPlatformVersion attribute to the VSIX SDK manifest.
...
FossilOrigin-Name: 0a4f59676bd0ab33b2c86c9a35a2ebbdbaf09ee7
2014-05-10 17:28:45 +00:00
mistachkin
d9b3c549b3
Further MSVC makefile changes to support Windows Phone 8.1.
...
FossilOrigin-Name: a9c81815e1b7a9c05da61f75edac45cb1a954135
2014-05-09 23:31:55 +00:00
mistachkin
52c40a89bb
Merge updates from trunk.
...
FossilOrigin-Name: f4fea7bb8a4b118bdceff400a6c49c6291c0d58e
2014-05-09 20:54:07 +00:00
mistachkin
4712c21287
When cross-compiling with the MSVC makefile, make sure the correct library path is used. Also, keep track of the required compilation options separately.
...
FossilOrigin-Name: c3dce2e7390eec3a337be1b99f80ad5f721cc647
2014-05-09 20:51:17 +00:00
dan
ae289fccbf
Merge the latest trunk changes into the threads branch.
...
FossilOrigin-Name: 9ac8f1e7115bc50663235adedeb0d3e1234c5740
2014-05-09 15:00:32 +00:00
dan
dcb1a840ff
Add new static mutex SQLITE_MUTEX_STATIC_APP3.
...
FossilOrigin-Name: ee0ab09c80a648e9202757fc04122952375e7c8c
2014-05-09 11:15:57 +00:00
mistachkin
df24cf81a6
Fix static variable declaration issue on Windows.
...
FossilOrigin-Name: a41d29691307067523c8637b486941c5f7c33775
2014-05-08 22:01:08 +00:00
drh
2e7be08152
Include sqlite3rtree.h in the tsrc/ pile of source files during
...
target_source in the main.mk makefile.
FossilOrigin-Name: 116bed5af664899a73b46dca528ac0c021fc50c3
2014-05-07 21:16:56 +00:00
drh
9ee8810be2
Remove a superfluous variable initialization.
...
FossilOrigin-Name: 68766f837491cb89c2103f2627eb9e23ab326a68
2014-05-07 20:33:17 +00:00
drh
8009c9b439
A better fix for the group_concat() problem.
...
FossilOrigin-Name: 1c086deebd0eb442918972e4b9185a5a0db3b8c3
2014-05-07 20:24:00 +00:00
dan
d2d8ca600e
Fix the way parenthesis in MATCH expressions are handled by FTS if the tokenizer considers them to be token characters.
...
FossilOrigin-Name: e21bf7a2ade6373e94ea403c665f78e1ad22143f
2014-05-07 19:59:36 +00:00
drh
faecf50504
Make sure the group_concat() function returns an empty string, not a NULL,
...
if it has at least one input row. Fix for ticket [55746f9e65f8587].
FossilOrigin-Name: d01cedaa73d8f9e5502502a1068a9509d1de295c
2014-05-07 18:23:04 +00:00
drh
86a1119133
Ensure that the sqlite3StrAccumAppend() routine is never called with a NULL
...
second argument. Doing so is harmless when N==0, but it causes an assert()
to fail that was placed to quiet static analyzers.
FossilOrigin-Name: f03fbf3700d9d4a654e3aa2e5caa810a8416bed9
2014-05-07 18:21:56 +00:00
drh
eacc050f30
Make sure the group_concat() function returns an empty string, not a NULL,
...
if it has at least one input row. Fix for ticket [55746f9e65f8587].
FossilOrigin-Name: 0deac8737545a020d344be96fff16660a7977ab8
2014-05-07 17:19:31 +00:00
drh
731dc0cb0e
Add the SQLITE_IOCAP_IMMUTABLE bit as a possible return value from
...
the xDeviceCharacteristics method in the VFS. Add the "nolock" and
"immutable" query parameters to URI filenames.
FossilOrigin-Name: 1a0d7d3d9dd54b783e3a805961287dd01f94770c
2014-05-07 15:46:04 +00:00
drh
6451c2b04e
Fix nolock and immutable so that they work even if READONLY is requested.
...
FossilOrigin-Name: e193aced2942e7405d0f45f90d4954b5663b4ba5
2014-05-07 15:32:03 +00:00
drh
62e603a904
Add test cases and documentation for the nolock and immutable query
...
parameters.
FossilOrigin-Name: 19d56cbaca222b32e2e354063149cccd89441d73
2014-05-07 15:09:24 +00:00
mistachkin
f253813b40
Merge updates from trunk.
...
FossilOrigin-Name: 69698ae90c415cb32d2c144725853483da65f0ff
2014-05-06 21:37:52 +00:00
mistachkin
6117272e03
Update the template VSIX package file as well.
...
FossilOrigin-Name: 99d96765cc378fde7b285f4577ea2b5d130d9a61
2014-05-06 21:37:10 +00:00
mistachkin
f574259a64
Merge updates from trunk.
...
FossilOrigin-Name: 7579c44ac1865133c37b16f2acc074d1eed4fdfd
2014-05-06 21:30:25 +00:00
mistachkin
441aa095ed
Enhance the VSIX package creation tool to better support Visual Studio 2013.
...
FossilOrigin-Name: c1fb04f61eb74d80d1b7607ae6904fe2e1717988
2014-05-06 21:26:34 +00:00
dan
5a7dbc70ea
Add a little extra variety to the tests in sort4.test.
...
FossilOrigin-Name: 7de6aee6a5cb5c7f89dced89f2ebf38f8be7a4fa
2014-05-06 16:21:30 +00:00
dan
dfea45330e
Re-implement the core of the multi-threaded sorter tests in sort4.test using C. Run each test in sort4.test ten times, or repeat all tests for 300 seconds as part of the "multithread" permutation test.
...
FossilOrigin-Name: 208b2b04d4d282bec4424ea7160a123ba549d118
2014-05-06 15:38:07 +00:00
mistachkin
897f6833fc
Refactor VSIX package creation tool to better support Visual Studio 2013.
...
FossilOrigin-Name: 8be166af239cbdaff3937c4003a6dc6e8a96e53a
2014-05-06 00:09:46 +00:00
mistachkin
75cc2f7a14
Merge updates from trunk.
...
FossilOrigin-Name: 668ed76ac6cfd5810aea7319c752d77fafaab319
2014-05-05 22:50:19 +00:00