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

9977 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
drh
9ad3ee40f2 Add SQLITE_DBSTATUS_CACHE_WRITE. Used to query a database connection for the cumulative number of database pages written. 
FossilOrigin-Name: 05f98d4eec0f029b76fd471f8d9edf2807de6b55
 2012-03-24 20:06:14 +00:00
dan
bde1a0b196 Add SQLITE_DBSTATUS_CACHE_WRITE. Used to query a database connection for the cumulative number of database pages written. 
FossilOrigin-Name: 3cb6a879f1220db03a66429d63330e27e8ca6e49
 2012-03-24 19:44:56 +00:00
drh
6c2e7e19fa Enable fts3 tables to use incremental merge by automatically creating the 
%_stat table when it is needed.

FossilOrigin-Name: cc051fc0b2d89603b27b94cf2afdbda417ee9d94
 2012-03-24 17:29:05 +00:00
dan
61fa09dbf2 Fix a failing assert() in the FTS3_LOG_MERGES related code. 
FossilOrigin-Name: 4220d52cb3426f1680b72d57ecc9f4ade029357d
 2012-03-24 17:09:11 +00:00
dan
0dfcdeb4f0 Add a comment to fts3SyncMethod() to justify the nMinMerge=64 constant. 
FossilOrigin-Name: af55ca5fc6778cb6d1a79a17dfa2d4e567ea1ccc
 2012-03-24 16:43:55 +00:00
drh
790964ebc4 Fix a bug in debugging code enabled when FTS3_LOG_MERGES is defined. 
FossilOrigin-Name: 2e06babf49de844d0e878d68114dbcc5ad4d6e54
 2012-03-24 16:18:08 +00:00
dan
45eddd6855 Remove the Fts3Table.mxLevel variable. 
FossilOrigin-Name: 67a0cffc9d07be7f09dad9d019a18160711295cd
 2012-03-24 16:11:21 +00:00
dan
1b8e7546e8 Merge auto-incr-merge with incr-merge branch. 
FossilOrigin-Name: 1c68687ab6d05b100191663820e7d82377d52445
 2012-03-24 14:45:59 +00:00
dan
4b1e4dabc3 Modify the way the number of leaves written and the maximum relative level are calculated in the auto-incr-merge code. 
FossilOrigin-Name: 0d841c957c6ec4afecb49504177c6279e09d7012
 2012-03-24 14:45:19 +00:00
drh
4ef9dfff97 An attempt at automatic incremental merging for FTS4. 
FossilOrigin-Name: ed69434cd89084f4b57bd2cc4f5cc558904af565
 2012-03-24 02:20:43 +00:00
dan
d59de73e27 Fix a spurious SQLITE_CONSTRAINT error that may be returned by an incr-merge operation. 
FossilOrigin-Name: ed7c17ea165f6348506bd23ebc58c427bb65d697
 2012-03-23 18:26:11 +00:00
dan
ba512b0b3d Add a test to verify that sqlite3_total_changes() works with incr-merge operations. 
FossilOrigin-Name: 1c72cecc6bf5be2a5c04ad6214a6bac22a29f860
 2012-03-23 15:38:43 +00:00
dan
3501a91677 Remove an incorrect assert() statement. Fix a const-related warning. 
FossilOrigin-Name: 96ed47493b3d46344fd2105642f31690aee06674
 2012-03-23 14:38:49 +00:00
drh
d60f4f4c95 When an incremental blob cursor is invalidated (occurs when an SQL statement modifies or deletes the row the blob cursor points to) release all page references held by the cursor. Otherwise, the presence of these references may cause other code in btree.c to incorrectly infer that the database is corrupt. 
FossilOrigin-Name: 341b703ce16361a64ed8bba64ff46792132c0b56
 2012-03-23 14:23:52 +00:00
dan
865e26afa2 Fix another test case issue in trace2.test. 
FossilOrigin-Name: 02a8e4236cf2c1c74b3c6537be1b5f197175a32e
 2012-03-23 13:40:59 +00:00
dan
dbd4f5cfb6 When an incremental blob cursor is invalidated (occurs when an SQL statement modifies or deletes the row the blob cursor points to) release all page references held by the cursor. Otherwise, the presence of these references may cause other code in btree.c to incorrectly infer that the database is corrupt. 
FossilOrigin-Name: 82c3f2ba42f2c75ba6951cc2743148886a4dc0bc
 2012-03-23 11:09:59 +00:00
dan
40c21432b7 Update a couple of existing test cases. 
FossilOrigin-Name: dcb8fa0f77a44250df0e8c4f6cfb9f6e181982d7
 2012-03-23 11:07:22 +00:00
dan
185c1fb02e Add test cases to fts4merge.test. 
FossilOrigin-Name: ecab2083334dcdde24a3c56864114979b7a6f25a
 2012-03-22 17:48:00 +00:00
dan
e81eaec754 Following an incr-merge operation that does not completely consume its input segments, store context in the rowid==1 row of the %_stat table that allows the next incr-merge to pick up where the previous left off. 
FossilOrigin-Name: ab0a4f44fb67e9f0cb82297b80e728ca58cdb0fb
 2012-03-22 16:48:12 +00:00
drh
bf92ec0ce3 Always quote the names of tables in the output of the shell's ".dump" command, 
even if the name is pure alphabetic text, in case the name is a keyword.

FossilOrigin-Name: 638b71150281a211f89b4057b0d5d32d3fbcf323
 2012-03-22 12:50:34 +00:00
dan
74f47e1d31 Add fts4merge3.test, for testing that older versions of FTS4 may interoperate with incr-merge capable versions. 
FossilOrigin-Name: 903ec5126dd981da6d7bab45c568f34b99446159
 2012-03-21 14:34:23 +00:00
drh
e239233982 Merge trunk changes into the fts4-incr-merge branch. 
FossilOrigin-Name: f61d5fb0281381228eb1a12a233bacaeb26b12a3
 2012-03-20 17:04:17 +00:00
drh
d878cab51a Remove the _SafeInit() entry points from the TCL interface. They have long 
been no-ops.  Removing them completely avoids confusion as to why they
don't work.

FossilOrigin-Name: 0fb26c7bfa7a4bb1503f90fd6f5b9c70f444665b
 2012-03-20 15:10:42 +00:00
drh
7b7c359fe6 Version 3.7.11 
FossilOrigin-Name: 00bb9c9ce4f465e6ac321ced2a9d0062dc364669
 2012-03-20 11:35:50 +00:00
drh
82ebc2a098 Fix out-of-bounds array references in the "echo" virtual table module 
used for testing.  No changes to the SQLite core.

FossilOrigin-Name: 7b449b301ea03295262b8d572b02625e4b39cfa5
 2012-03-20 03:10:51 +00:00
drh
0299b40f0f Add additional test cases to e_insert.test. Update evidence marks. 
no changes to core code.

FossilOrigin-Name: 036395c0a8e08883b11df025e3da9e2461e4b1eb
 2012-03-19 17:42:46 +00:00
drh
d13a3bc772 Fix one more compiler warning missed by the previous check-in. 
FossilOrigin-Name: bc03d99a78e90c02b69037e5f5f81537b5a3ac60
 2012-03-19 14:57:49 +00:00
drh
01ea399a84 Suppress harmless compiler warnings on windows in FTS4 and RTREE. 
FossilOrigin-Name: 4fd68647c8d4b120e04d054617cef31001f44c6f
 2012-03-19 14:51:19 +00:00
drh
bbe0520329 Avoid a compiler warning (an incorrect compiler warning, at that) in vs2010. 
FossilOrigin-Name: 7dd97f12cd268cac1241f0f3e8de94bb629b97c7
 2012-03-19 14:28:43 +00:00
dan
0d1614c731 Ensure that compatible malloc and free functions are used with stat3 data if SQLITE_ENABLE_STAT3 is defined. 
FossilOrigin-Name: 32bb1ecee4e43a4683512dbca047abf735afd313
 2012-03-19 10:21:37 +00:00
dan
d1ab097d45 Fix various incorrect and missing comments and other style issues in and around the FTS incremental merge code. 
FossilOrigin-Name: 7aabb62c8ccbd2b8d216e25226f06e5820dec38a
 2012-03-17 16:56:57 +00:00
dan
db0ad5f204 In pager1.test, use "file attr test.db -readonly 0" before "file attr test.db -perm rw-rw-rw-", not after. 
FossilOrigin-Name: 4f5283f18f570a09b95c26e5aa14885ada518dd2
 2012-03-17 15:12:16 +00:00
dan
a2e85abaa2 Modify a test in ioerr2.test to account for the new SQLITE_ABORT_ROLLBACK extended error code. 
FossilOrigin-Name: affaebde109e8dd851474ffe7b7d48b1aae8c7ed
 2012-03-17 09:43:09 +00:00
drh
1a342a4a73 Update the trace2.test script for languageid. 
FossilOrigin-Name: a11528ac575fa20fd8022756d042a32fe1272e12
 2012-03-16 17:00:49 +00:00
drh
c8d7b24e93 Cherrypick the [3475092cff] fix for 32-bit overflow with large language-ids 
into trunk.

FossilOrigin-Name: 2755edc7f1186ba8955f2c3550a90f40a55ddae2
 2012-03-16 16:52:54 +00:00
dan
81b35dc66c Fix some integer overflow problems that can occur when using large langauge id values. 
FossilOrigin-Name: 3475092cff862080a020d386076d739f0d22c9b2
 2012-03-16 15:54:19 +00:00
dan
e931b7f45f Add a comment to the FTS getAbsoluteLevel() function. No actual code changes. 
FossilOrigin-Name: 7e0f861beda4d74d0c3c9fb4abb3ddb5fee346bd
 2012-03-16 14:54:07 +00:00
drh
7a48480d07 Fix harmless compiler warnings. 
FossilOrigin-Name: 74eadeec34c4b19cf5f8b7f648db3b7ad601a00e
 2012-03-16 00:28:11 +00:00
drh
a929e6282b Add the sqlite3_db_readonly() API to trunk. 
FossilOrigin-Name: fed134a5f395533de0c9d76950697c060ddb126d
 2012-03-15 22:54:37 +00:00
drh
421377e67a Add the sqlite3_db_readonly() interface. This is still tentative, pending 
a closer look at other ideas to accomplish the same thing.

FossilOrigin-Name: 254f99ea9ff1534948bdb179e69ab0c940c87ec1
 2012-03-15 21:28:54 +00:00
dan
4ab6f2b9c1 Modify incremental merge code to merge nMin segments at a time. 
FossilOrigin-Name: cd34bc1af4ba608ea3b52bab55bcfe0086711900
 2012-03-15 17:45:50 +00:00
dan
5730ef599c Add tests for incremental merge code. 
FossilOrigin-Name: 570473729d6561d81e6e5f8884fd18487008636e
 2012-03-14 20:01:52 +00:00
dan
a2af0aecdb Avoid allocating a large object on the stack in the incremental merge code. Use sqlite3_malloc() instead. 
FossilOrigin-Name: 36ae510de45be44efd34cff242d02fb21b7419ac
 2012-03-14 12:17:40 +00:00
dan
8af1fc721e Fix another bug in the incremental merge code. 
FossilOrigin-Name: f97b12e0955c4c29f9c31a186d72d87f7407782e
 2012-03-14 11:51:31 +00:00
dan
604f58a686 Fix some bugs in the incremental merge code. Some remain. 
FossilOrigin-Name: bff21683705a61b8b8672e0b44c287d1dc7c32a9
 2012-03-13 19:56:34 +00:00
drh
331b67c151 Candidate fix for the optimizer problem described in ticket 
[b7c8682cc17f3] which can causes a LEFT JOIN to be changed
into a INNER JOIN if there are OR terms in the WHERE clause.

FossilOrigin-Name: 0dc4cb935514131c99172175d57feec3a1743aa9
 2012-03-09 22:02:08 +00:00
drh
ab4f6385de Minor commenting and stylistic changes only. 
FossilOrigin-Name: a1747086c5e0c152fcf4bd9fa80a61b6f03f4a94
 2012-03-09 12:52:43 +00:00
mistachkin
533b8f6d47 On Windows, make sure the returned test current directory value does not contain any backslashes. 
FossilOrigin-Name: efee39e64bd95c284220fdb0ae8ee6c1847fadab
 2012-03-08 20:28:31 +00:00
mistachkin
f8a784645c On Windows, make sure the current directory value used by the test suite is 'normalized' to what the parent command shell sees. Also, clean the test directories used by the quota2.test file. 
FossilOrigin-Name: 82bcd7ec1531f6d71c079578434c58d3ce46a1de
 2012-03-08 20:00:36 +00:00
dan
593c9824bc Add the 'merge=?,?' command to fts4. This still needs some work. 
FossilOrigin-Name: 741b8f897750eac3c9774fd65de7e40bb89781b1
 2012-03-08 18:39:03 +00:00