]> git.ipfire.org Git - thirdparty/sqlite.git/log
thirdparty/sqlite.git
13 years agoSimplify directory checking for winOpen and add checking to winDelete. win-check-dir
mistachkin [Mon, 7 May 2012 17:16:07 +0000 (17:16 +0000)] 
Simplify directory checking for winOpen and add checking to winDelete.

FossilOrigin-Name: b08530e1a02cba03afefd65dc101e074e8847c07

13 years agoDo not do the AV retry loop on open if the file that is attempting to be
drh [Mon, 7 May 2012 13:15:20 +0000 (13:15 +0000)] 
Do not do the AV retry loop on open if the file that is attempting to be
opened is really a directory.

FossilOrigin-Name: 03875633f465e82fbe99829f96db25f6d32bd333

13 years agoUpdate a test in io.test to account for [05f98d4eec].
dan [Tue, 1 May 2012 14:21:57 +0000 (14:21 +0000)] 
Update a test in io.test to account for [05f98d4eec].

FossilOrigin-Name: bfa61e781cb442be641486e7e55a1518e888d830

13 years agoFix a minor deviation from the coding style guidelines.
drh [Fri, 27 Apr 2012 16:38:11 +0000 (16:38 +0000)] 
Fix a minor deviation from the coding style guidelines.

FossilOrigin-Name: 1e51bffe777587cd05bd7db5e02d6291c3eb8c1a

13 years agoEnhance the processing of ORDER BY clauses on compound queries to better
drh [Fri, 27 Apr 2012 01:09:06 +0000 (01:09 +0000)] 
Enhance the processing of ORDER BY clauses on compound queries to better
match terms of the order by against expressions in the result set, in order
to enable better query optimization.

FossilOrigin-Name: a49e909c8738317c8383ce93771c0a9c4cf270bc

13 years agoEnhance the do_test proc in the test suite so that if the expected result
drh [Fri, 27 Apr 2012 01:08:02 +0000 (01:08 +0000)] 
Enhance the do_test proc in the test suite so that if the expected result
is of the form "/.../" or "~/.../" then regular expression matching is done
between result and the "..." part of the expectation.  In the ~/.../ case,
we expect there to be no match.

FossilOrigin-Name: c9a734406c016329e80d887f7438206e41c52ce7

13 years agoAll virtual table constructors to be invoked recursively. A test case for
drh [Thu, 26 Apr 2012 22:47:20 +0000 (22:47 +0000)] 
All virtual table constructors to be invoked recursively.  A test case for
this has been added to TH3.

FossilOrigin-Name: 696a5a40bb28c4a54c9951f877b67015dc00bf55

13 years agoNew test cases for the ".dump" and ".mode insert" commands of the shell.
drh [Tue, 24 Apr 2012 13:14:49 +0000 (13:14 +0000)] 
New test cases for the ".dump" and ".mode insert" commands of the shell.

FossilOrigin-Name: dfce8569765614462a3952d1761c10d579984665

13 years agoMove the shell test scripts into the test/ subfolder so that they are
drh [Tue, 24 Apr 2012 12:46:05 +0000 (12:46 +0000)] 
Move the shell test scripts into the test/ subfolder so that they are
run automatically by "make test".

FossilOrigin-Name: 9fb7da6904e479f4671eeebf1a4b7e4e4e4f2b7b

13 years agoFix a sign-extension problem for BLOB output in ".insert" mode of the
drh [Tue, 24 Apr 2012 12:12:57 +0000 (12:12 +0000)] 
Fix a sign-extension problem for BLOB output in ".insert" mode of the
command-line shell.

FossilOrigin-Name: 282f2a74c23aa3fca6087bdeaf5d961b4f5bbe47

13 years agoUpdate the ".table" command in the shell to show all tables in all
drh [Mon, 23 Apr 2012 12:38:05 +0000 (12:38 +0000)] 
Update the ".table" command in the shell to show all tables in all
attached databases, and to avoid using the deprecated sqlite3_get_table()
function.

FossilOrigin-Name: ce2d06e2533763a8008e7a405630293d8f9a3108

13 years agoIf terminating interactive input to the command-line shell with ^D, issue
drh [Sat, 21 Apr 2012 11:33:39 +0000 (11:33 +0000)] 
If terminating interactive input to the command-line shell with ^D, issue
an extra \n to move the cursor to the next line before exiting.

FossilOrigin-Name: feff1ef0b8f7b51ae80a9d34380b46a5103bf6cd

13 years agoDo not consider a DISTINCT clause redundant unless a subset of the result-set is...
dan [Fri, 20 Apr 2012 16:59:24 +0000 (16:59 +0000)] 
Do not consider a DISTINCT clause redundant unless a subset of the result-set is collectively subject to a UNIQUE constraint and it can be guaranteed that all columns of the subset are NOT NULL (either due to NOT NULL constraints WHERE clause terms). Fix for [385a5b56b9].

FossilOrigin-Name: 7b8548b1872cc1225355ba8311e93dd08d6526e2

13 years agoFix for 2a5629202f. When considering whether or not a UNIQUE index may be used to...
dan [Fri, 20 Apr 2012 15:24:53 +0000 (15:24 +0000)] 
Fix for 2a5629202f. When considering whether or not a UNIQUE index may be used to optimize an ORDER BY clause, do not assume that all index entries are distinct unless there is some reason to believe that the index contains no NULL values.

FossilOrigin-Name: 9870e4c4fef10112c987c40cb1b95255a7214202

13 years agoRemove obsolete art.
drh [Fri, 20 Apr 2012 12:02:32 +0000 (12:02 +0000)] 
Remove obsolete art.

FossilOrigin-Name: 372a90e2264a29ce543c093766cdec764d18b5a5

13 years agoFix harmless compiler warnings on x64 MSVC, mostly in test code, but also in
drh [Thu, 19 Apr 2012 18:04:28 +0000 (18:04 +0000)] 
Fix harmless compiler warnings on x64 MSVC, mostly in test code, but also in
tclsqlite.c and in the FTS4 module.

FossilOrigin-Name: 3281972eaa46cb57fd9f0387063f47430dc0a3b4

13 years agoFix a harmless compiler warning in tclsqlite.c for MSVC x64. Fix a test
drh [Thu, 19 Apr 2012 17:19:51 +0000 (17:19 +0000)] 
Fix a harmless compiler warning in tclsqlite.c for MSVC x64.  Fix a test
case associated with the FTS4 merge feature.

FossilOrigin-Name: de3f7187eb2ff24683a1854ae523e7d30c290893

13 years agoFix harmless compiler warnings (unused parameter warnings) in the aggregate
drh [Thu, 19 Apr 2012 15:49:19 +0000 (15:49 +0000)] 
Fix harmless compiler warnings (unused parameter warnings) in the aggregate
query analyzer.

FossilOrigin-Name: 2d43562084316ec180a4c2cfc3fee08d58432204

13 years agoFix a harmless compiler warning in the mkkeywordhash.c utility program.
drh [Wed, 18 Apr 2012 10:13:20 +0000 (10:13 +0000)] 
Fix a harmless compiler warning in the mkkeywordhash.c utility program.

FossilOrigin-Name: 6015200beb3be7ec141ce36de694278e3ba11a02

13 years agoFix a typecast problem in lemon that could cause problems on 64-bit machines.
drh [Wed, 18 Apr 2012 09:59:56 +0000 (09:59 +0000)] 
Fix a typecast problem in lemon that could cause problems on 64-bit machines.

FossilOrigin-Name: 4a5641cc0aa4c49762f4fe73dab4a6612631c0d2

13 years agoImproved handling of aggregate subqueries within an aggregate query.
drh [Tue, 17 Apr 2012 16:38:53 +0000 (16:38 +0000)] 
Improved handling of aggregate subqueries within an aggregate query.

FossilOrigin-Name: 430bb59d798286a86c351de92c429345f016b3f0

13 years agoAdd an undocumented and possibly ephemeral ".breakpoint" command to the
drh [Tue, 17 Apr 2012 09:09:33 +0000 (09:09 +0000)] 
Add an undocumented and possibly ephemeral ".breakpoint" command to the
command-line shell, to call a no-op routine on which it is convenient to
set a symbolic debugger breakpoint.

FossilOrigin-Name: 8e2363ad76446e863d03ead91fd621e59d5cb495

13 years agoFix a bug in the command-line shell logic that attempts to continue with a
drh [Mon, 16 Apr 2012 17:22:30 +0000 (17:22 +0000)] 
Fix a bug in the command-line shell logic that attempts to continue with a
".dump" even after encountering database corruption.

FossilOrigin-Name: 020b5e90f950a42299074ff770612b9e68850d95

13 years agoIn the unix VFS, always set every open file to close-on-exec using either
drh [Sat, 14 Apr 2012 13:25:11 +0000 (13:25 +0000)] 
In the unix VFS, always set every open file to close-on-exec using either
O_CLOEXEC at open (preferred) or FD_CLOEXEC in an ioctl after opening.  Before
this changes, many files were done this way, but not all.

FossilOrigin-Name: 9efbeb11ae0d480a13ff1353820c12f3a8bff452

13 years agoFix a typo in a comment that is extracted for documentation. No changes to
drh [Sat, 14 Apr 2012 11:48:25 +0000 (11:48 +0000)] 
Fix a typo in a comment that is extracted for documentation.  No changes to
code.

FossilOrigin-Name: e87371c5081ce28431a4c7ceaa81ff966a378c66

13 years agoAdd a testcase() macro to ensure that the sqlite3AuthCheck() call inside
drh [Wed, 11 Apr 2012 23:22:37 +0000 (23:22 +0000)] 
Add a testcase() macro to ensure that the sqlite3AuthCheck() call inside
the query flattener really is effective.

FossilOrigin-Name: a134e6e739cbb27701b092b33033244feb164cdf

13 years agoFix harmless static-analysis warnings, mosting having to do with memory
drh [Wed, 11 Apr 2012 11:38:53 +0000 (11:38 +0000)] 
Fix harmless static-analysis warnings, mosting having to do with memory
leaks in the command-line shell.  Add a clang analysis of the command-line
shell to the "warnings-clang.sh" script.  Other minor cleanups to the
command-line shell code.

FossilOrigin-Name: 93a0f452a7023898ad3d62ee81b39a80477c332f

13 years agoAdd new interfaces to the test_quota.c module: sqlite3_quota_ftruncate(),
drh [Tue, 10 Apr 2012 17:53:47 +0000 (17:53 +0000)] 
Add new interfaces to the test_quota.c module:  sqlite3_quota_ftruncate(),
sqlite3_quota_file_size(), sqlite3_quota_file_truesize(), and
sqlite3_quota_file_mtime().

FossilOrigin-Name: 2fa9f54309aea9927fb3695a986febd4963df7d1

13 years agoFix a copy/paste error in a comment in the fuzzer. No changes to code.
drh [Tue, 10 Apr 2012 16:05:27 +0000 (16:05 +0000)] 
Fix a copy/paste error in a comment in the fuzzer.  No changes to code.

FossilOrigin-Name: 7433f2b5508ebf09d0e3e32a995f1126eaab8999

13 years agoFix the application-defined function logic so that functions with a variable
drh [Sat, 7 Apr 2012 00:09:21 +0000 (00:09 +0000)] 
Fix the application-defined function logic so that functions with a variable
number of parameters can be replaced or deleted correctly.  Also refactor
some of the function-finder code for clarity of presentation.

FossilOrigin-Name: 09d5581c81fb6a9bf6a369d0abf5ef6b54637576

13 years agoUpdate sqlite3_analyzer to correctly find all database files when the
drh [Fri, 6 Apr 2012 00:09:27 +0000 (00:09 +0000)] 
Update sqlite3_analyzer to correctly find all database files when the
multiplexor is being used.

FossilOrigin-Name: 1bfc30cb0fdc4b9def989eea2d78f6ac851633fa

13 years agoIgnore the value of SQLITE_FCNTL_CHUNK_SIZE if it is negative.
drh [Thu, 5 Apr 2012 20:04:39 +0000 (20:04 +0000)] 
Ignore the value of SQLITE_FCNTL_CHUNK_SIZE if it is negative.

FossilOrigin-Name: 1b08fef9451f4d59148548faed115d1a5d0bcd98

13 years agoPerformance improvements for the RowSet object when it undergoes many
drh [Thu, 5 Apr 2012 01:37:32 +0000 (01:37 +0000)] 
Performance improvements for the RowSet object when it undergoes many
cycles between RowSetInsert and RowSetTest.

FossilOrigin-Name: 49d20ede5f4c0895a165126d5cf7c95a0510ba35

13 years agoAdd the ".trace" option to the command-line shell.
drh [Wed, 4 Apr 2012 16:56:23 +0000 (16:56 +0000)] 
Add the ".trace" option to the command-line shell.

FossilOrigin-Name: b9ac3d7e340eb616fd23cc7dbdef6fdd66a79fe4

13 years agoFix the multiplexor logging so that it works with SQLITE_ENABLE_8_3_NAMES.
drh [Wed, 4 Apr 2012 13:58:19 +0000 (13:58 +0000)] 
Fix the multiplexor logging so that it works with SQLITE_ENABLE_8_3_NAMES.

FossilOrigin-Name: 9e1e2fe2950bb96784413eae934314d95bce08e7

13 years agoIn the multiplexor extension, improve the error logging when a chunk fails
drh [Wed, 4 Apr 2012 13:43:13 +0000 (13:43 +0000)] 
In the multiplexor extension, improve the error logging when a chunk fails
to open.

FossilOrigin-Name: 781453c686656a7bd4a274a3b3204ceb6ecae8df

13 years agoDo not run attempt to run test file fts4merge3.test unless the build includes FTS.
dan [Tue, 3 Apr 2012 18:34:24 +0000 (18:34 +0000)] 
Do not run attempt to run test file fts4merge3.test unless the build includes FTS.

FossilOrigin-Name: 0506bf86d31e821a905e3a8a03c4817e326f7f44

13 years agoModify capi3.test and capi3c.test so that they work with SQLITE_OMIT_AUTORESET builds.
dan [Tue, 3 Apr 2012 18:33:43 +0000 (18:33 +0000)] 
Modify capi3.test and capi3c.test so that they work with SQLITE_OMIT_AUTORESET builds.

FossilOrigin-Name: 1d5e744cc645150ccaa7256663146fc7b8540bd5

13 years agoModify the integrity-check code to reduce the size of the large allocation from 4...
dan [Tue, 3 Apr 2012 17:43:28 +0000 (17:43 +0000)] 
Modify the integrity-check code to reduce the size of the large allocation from 4 bytes to 1 bit for each page in the database file.

FossilOrigin-Name: fa3a498dfe9ed59c30da5eaa0d7cad167fd4e393

13 years agoFix a typo in the rtree6.test script that prevented it from running.
drh [Tue, 3 Apr 2012 17:05:16 +0000 (17:05 +0000)] 
Fix a typo in the rtree6.test script that prevented it from running.

FossilOrigin-Name: 221fe4a8ea5bea90031e459746ea71ff173e6f52

13 years agoRerun autoconf to update the configure script for version 3.7.12
drh [Tue, 3 Apr 2012 17:01:36 +0000 (17:01 +0000)] 
Rerun autoconf to update the configure script for version 3.7.12

FossilOrigin-Name: 6d73eb20e825f51143a1b59ad33f44e6448ef760

13 years agoIf the SELECT that finds all root pages in the showdb fails, then report
drh [Tue, 3 Apr 2012 15:10:34 +0000 (15:10 +0000)] 
If the SELECT that finds all root pages in the showdb fails, then report
an error.

FossilOrigin-Name: 4b16141501655faa23e7d34ad05570ea929abb7c

13 years agoEnhance the "showdb" utility program with the "pgidx" option. Now requires
drh [Tue, 3 Apr 2012 14:59:50 +0000 (14:59 +0000)] 
Enhance the "showdb" utility program with the "pgidx" option.  Now requires
linkage with the amalgamation.

FossilOrigin-Name: 4b5737014c6f1638de9dc162463508ea7dfe333d

13 years agoThe SQLITE_RTREE_INT_ONLY compile-time option causes the RTree extension
drh [Mon, 2 Apr 2012 21:35:42 +0000 (21:35 +0000)] 
The SQLITE_RTREE_INT_ONLY compile-time option causes the RTree extension
to use only integer math and store only integer coordinates.

FossilOrigin-Name: 02b7640f5118e0a635b68f65765191bb3171b7bd

13 years agoAdd #ifdefs to allow a test build to succeed even if SQLITE_ENABLE_FTS3 is
drh [Mon, 2 Apr 2012 17:18:23 +0000 (17:18 +0000)] 
Add #ifdefs to allow a test build to succeed even if SQLITE_ENABLE_FTS3 is
not defined.

FossilOrigin-Name: fb121980e48af368353431fd04924e414b65c852

13 years agoFix a compiler warning by removing a redundant variable.
drh [Sat, 31 Mar 2012 19:12:23 +0000 (19:12 +0000)] 
Fix a compiler warning by removing a redundant variable.

FossilOrigin-Name: af602d87736b52802a4e760ffeeaa28112b99d9a

13 years agoTest cases for RELEASE and ROLLBACK TO of a nested savepoint while queries
drh [Sat, 31 Mar 2012 17:50:12 +0000 (17:50 +0000)] 
Test cases for RELEASE and ROLLBACK TO of a nested savepoint while queries
are pending.

FossilOrigin-Name: d2bf0efa7da59448a62f5be795403be4e5b7fb7f

13 years agoDo not abort pending queries on a RELEASE of a nested SAVEPOINT.
drh [Sat, 31 Mar 2012 17:17:26 +0000 (17:17 +0000)] 
Do not abort pending queries on a RELEASE of a nested SAVEPOINT.
This is a candidate fix for ticket [27ca74af3c083f787].

FossilOrigin-Name: 79a4a3a84f0b367d54da5e69e64ffca474264717

13 years agoModify selectColumnsFromExprList() to avoid ever incorrectly returning SQLITE_NOMEM.
dan [Sat, 31 Mar 2012 15:08:56 +0000 (15:08 +0000)] 
Modify selectColumnsFromExprList() to avoid ever incorrectly returning SQLITE_NOMEM.

FossilOrigin-Name: e7cb6b73ac079d0751b3f9429d0f6a35ca8ec853

13 years agoChange the ICU tokenizer so that it does not attempt to call strlen(NULL).
dan [Sat, 31 Mar 2012 11:58:23 +0000 (11:58 +0000)] 
Change the ICU tokenizer so that it does not attempt to call strlen(NULL).

FossilOrigin-Name: 04298f1ac42c40cb2a48092b415acf96a08954b7

13 years agoFix a bug in the EXPLAIN code for listing trigger programs that was causing an out...
dan [Sat, 31 Mar 2012 09:59:44 +0000 (09:59 +0000)] 
Fix a bug in the EXPLAIN code for listing trigger programs that was causing an out-of-bounds read.

FossilOrigin-Name: c9342ca58105499a5eb61c3e6d016559b6072c95

13 years agoDo more aggressive optimization of the AND operator where one side or the
drh [Sat, 31 Mar 2012 02:34:35 +0000 (02:34 +0000)] 
Do more aggressive optimization of the AND operator where one side or the
other is always false.

FossilOrigin-Name: f9a7e179cbbeeab5e57bbf392bef89750215546b

13 years agoAvoid using the OVERLAPPED struct on WinCE.
mistachkin [Fri, 30 Mar 2012 16:44:33 +0000 (16:44 +0000)] 
Avoid using the OVERLAPPED struct on WinCE.

FossilOrigin-Name: 196ca3a8b007b9f792e969893d981f6c5aa2fccc

13 years agoSimplify the winRead and winWrite VFS functions to reduce the number
drh [Fri, 30 Mar 2012 15:57:45 +0000 (15:57 +0000)] 
Simplify the winRead and winWrite VFS functions to reduce the number
of system calls.

FossilOrigin-Name: b34491869c4fb31d2fdd14c94a7db2e1c0e572ba

13 years agoWhen a named CHECK constraint fails, include the name of the constraint
drh [Fri, 30 Mar 2012 15:48:48 +0000 (15:48 +0000)] 
When a named CHECK constraint fails, include the name of the constraint
in the error message.

FossilOrigin-Name: 1b75f301affac654bee24fa247046ea0782d3c4d

13 years agoFix MSVC compiler warnings in test code.
drh [Fri, 30 Mar 2012 14:59:43 +0000 (14:59 +0000)] 
Fix MSVC compiler warnings in test code.

FossilOrigin-Name: cb7a850439c9a4a7887650d6b81d95ab8025de5b

13 years agoFix an FTS4 test script problem for windows.
drh [Fri, 30 Mar 2012 13:34:17 +0000 (13:34 +0000)] 
Fix an FTS4 test script problem for windows.

FossilOrigin-Name: 36aa6665e709b5942b3558afbd555058b42f2c78

13 years agoChange the name of a local variable from "not" to "bNot" to lessen the
drh [Fri, 30 Mar 2012 12:10:38 +0000 (12:10 +0000)] 
Change the name of a local variable from "not" to "bNot" to lessen the
chances of it colliding with some prior #define in the appliation.

FossilOrigin-Name: cbdd86387630600b309de4aaeaa131ec7b053ce2

13 years agoIn the ".output" command-line shell, if the first character of the output
drh [Fri, 30 Mar 2012 00:05:57 +0000 (00:05 +0000)] 
In the ".output" command-line shell, if the first character of the output
filename is '|' then use popen() instead of fopen().

FossilOrigin-Name: fa82062c659ffbe7ad01106d3ef54d7bb44f1f44

13 years agoFix compiler warnings on GCC and MSVC and fix a C89-ism that
drh [Fri, 30 Mar 2012 00:00:36 +0000 (00:00 +0000)] 
Fix compiler warnings on GCC and MSVC and fix a C89-ism that
broke the build for MSVC.

FossilOrigin-Name: b451c0f97f0abe78ebe6c62ff489ec1ad8a1f767

13 years agoMerge fts4-incr-merge with trunk.
dan [Thu, 29 Mar 2012 15:11:32 +0000 (15:11 +0000)] 
Merge fts4-incr-merge with trunk.

FossilOrigin-Name: 4d6de3e9bef3487f2d89167939ab2c42872d05b3

13 years agoDisable the LIKE optimization if the column on the left-hand-side of the LIKE operato...
dan [Thu, 29 Mar 2012 14:29:07 +0000 (14:29 +0000)] 
Disable the LIKE optimization if the column on the left-hand-side of the LIKE operator belongs to a virtual table.

FossilOrigin-Name: 0bacb879e18026f2a8e22fe3e4bc8d27de5c4416

13 years agoFix an out of date comment on sqlite3ArrayAllocate().
dan [Thu, 29 Mar 2012 07:51:45 +0000 (07:51 +0000)] 
Fix an out of date comment on sqlite3ArrayAllocate().

FossilOrigin-Name: 4afdd5ae53ef0ff7c0fde74eaa04638c923c679b

13 years agoMerge in the latest changes from trunk. fts4-incr-merge
drh [Wed, 28 Mar 2012 16:44:13 +0000 (16:44 +0000)] 
Merge in the latest changes from trunk.

FossilOrigin-Name: 66c4aaadda433c9d479a25c27cdff84560088402

13 years agoAvoid loading overflow pages just to satisfy typeof() or length() functions
drh [Wed, 28 Mar 2012 16:22:03 +0000 (16:22 +0000)] 
Avoid loading overflow pages just to satisfy typeof() or length() functions
if the correct result can be computed without the extra page fetches.

FossilOrigin-Name: 0733c98c329bc9942460746e9bbaf4b4c94c1520

13 years agoMinor changes to the core of OP_Column for performance and to clarify the faster-typeof-and-length
drh [Wed, 28 Mar 2012 16:14:50 +0000 (16:14 +0000)] 
Minor changes to the core of OP_Column for performance and to clarify the
critical path.

FossilOrigin-Name: 868394761e41b7483a5874426ee052dfb3a9e2be

13 years agoFix a problem in fts4merge3.test.
dan [Wed, 28 Mar 2012 13:55:29 +0000 (13:55 +0000)] 
Fix a problem in fts4merge3.test.

FossilOrigin-Name: 64fc8b30f8bc7ddc697b6042040e958787ff3118

13 years agoImprovements to comments. Minor changes to code in the hot path of
drh [Wed, 28 Mar 2012 13:41:10 +0000 (13:41 +0000)] 
Improvements to comments.  Minor changes to code in the hot path of
OP_Column - with the hope of get a few cycles of performance improvement.

FossilOrigin-Name: ca093103437f141caa3eb11539c6eb7b4dd65175

13 years agoTest cases for length() of a large blob in an aggregate query.
drh [Wed, 28 Mar 2012 02:51:51 +0000 (02:51 +0000)] 
Test cases for length() of a large blob in an aggregate query.

FossilOrigin-Name: d095fa4bfabd765c8e935ed227a334161097dd34

13 years agoFix the typeof() and length() optimization so that it works for aggregates
drh [Wed, 28 Mar 2012 02:43:20 +0000 (02:43 +0000)] 
Fix the typeof() and length() optimization so that it works for aggregates
as well as scalar queries.

FossilOrigin-Name: bc18215a8a660442db6ddeeda4a88df0acffe0f7

13 years agoEvaluate typeof(X) and length(Y) where X is any column and Y is a blob column
drh [Wed, 28 Mar 2012 01:34:47 +0000 (01:34 +0000)] 
Evaluate typeof(X) and length(Y) where X is any column and Y is a blob column
without actually loading X and Y from disk.

FossilOrigin-Name: b899dbeb60752843287e2c6ad3577e1d00f0d587

13 years agoAdd output of PRAGMAs auto_vacuum and encoding to the "schema" command of the
drh [Tue, 27 Mar 2012 18:00:05 +0000 (18:00 +0000)] 
Add output of PRAGMAs auto_vacuum and encoding to the "schema" command of the
fts3view utility program.

FossilOrigin-Name: e31076319363a46905836880765bae3bf204ed19

13 years agoReally delete the fts3merge.test script (should have been deleted by the previous...
dan [Tue, 27 Mar 2012 15:10:50 +0000 (15:10 +0000)] 
Really delete the fts3merge.test script (should have been deleted by the previous commit).

FossilOrigin-Name: 83838149d9dd7956c5f48f760c2f321180d2db5f

13 years agoRemove the fts3merge.test script in favour of changing the fts4merge.test script...
dan [Tue, 27 Mar 2012 15:00:06 +0000 (15:00 +0000)] 
Remove the fts3merge.test script in favour of changing the fts4merge.test script so that it runs tests using both fts4 and fts3. Fix some problems with incr-merge and FTS3 tables.

FossilOrigin-Name: 5c447e226afca0d46b9ed994dea26a16a9ae168c

13 years agoIn the fts3view utility, label the blank segments used to mark the end of a
drh [Tue, 27 Mar 2012 14:54:44 +0000 (14:54 +0000)] 
In the fts3view utility, label the blank segments used to mark the end of a
segment sequence for a level/idx as "null".  Improve the alignment of root
segment names.

FossilOrigin-Name: 04aea0245e4183fef3664609f5a6353b65d71a85

13 years agoEnhance the fts3view tool with the big-segment command and fix a bug in the
drh [Tue, 27 Mar 2012 13:51:31 +0000 (13:51 +0000)] 
Enhance the fts3view tool with the big-segment command and fix a bug in the
display of doclists.

FossilOrigin-Name: e9436d8038e5a0d1ba992a77d1064d4a55595f57

13 years agoMerge the fts4-incr-merge-exp branch with fts4-incr-merge.
dan [Tue, 27 Mar 2012 13:44:28 +0000 (13:44 +0000)] 
Merge the fts4-incr-merge-exp branch with fts4-incr-merge.

FossilOrigin-Name: eb00b95885023a8592693f0babbb0066207073b0

13 years agoAllow multiple incremental merges to proceed concurrently. This is required to preven...
dan [Tue, 27 Mar 2012 11:48:02 +0000 (11:48 +0000)] 
Allow multiple incremental merges to proceed concurrently. This is required to prevent a large crisis-merge from occuring while an even larger incremental-merge is underway.

FossilOrigin-Name: 7ed9d2f24a650b424b97dfc19b8042c4cf09c82c

13 years agoMinor correct errors in the file format description for FTS3/4 contained in
drh [Tue, 27 Mar 2012 00:38:33 +0000 (00:38 +0000)] 
Minor correct errors in the file format description for FTS3/4 contained in
the fts3.c header comment.

FossilOrigin-Name: fb8aacdd8fbdc946cb271cc589f76b806387937d

13 years agoEnhance fts3view to show decodes of segments and doclists.
drh [Tue, 27 Mar 2012 00:34:04 +0000 (00:34 +0000)] 
Enhance fts3view to show decodes of segments and doclists.

FossilOrigin-Name: 6d09de231b68dd9520d99c65d133f26e90eb784f

13 years agoAdd the fts3view utility program.
drh [Mon, 26 Mar 2012 21:57:53 +0000 (21:57 +0000)] 
Add the fts3view utility program.

FossilOrigin-Name: f936c8ea16d21345fd1622272dc7e9850acb2493

13 years agoFix FTS3 so that it works even without SQLITE_DEBUG.
drh [Mon, 26 Mar 2012 14:36:42 +0000 (14:36 +0000)] 
Fix FTS3 so that it works even without SQLITE_DEBUG.

FossilOrigin-Name: a18c103121529c2e3c6a8ada16a4c40d14080670

13 years agoModify the FTS integrity-check so that the checksums do not depend on the results...
dan [Mon, 26 Mar 2012 10:57:31 +0000 (10:57 +0000)] 
Modify the FTS integrity-check so that the checksums do not depend on the results of signed integer overflow, which is undefined in C.

FossilOrigin-Name: f907fc3fb387e74bb66babcbf050748cb253a6fa

13 years agoAdd a comment to explain how the FTS integrity-check works.
dan [Mon, 26 Mar 2012 10:47:03 +0000 (10:47 +0000)] 
Add a comment to explain how the FTS integrity-check works.

FossilOrigin-Name: 64e8a116f39434a3b7347f01a47f88eef3276742

13 years agoAdd an experimental integrity-check function to FTS.
dan [Mon, 26 Mar 2012 10:36:55 +0000 (10:36 +0000)] 
Add an experimental integrity-check function to FTS.

FossilOrigin-Name: 40fc8804743dfb005991e9c5ef7b0ebcb3c2e731

13 years agoIncrease the version number to 3.7.12
drh [Sun, 25 Mar 2012 17:25:38 +0000 (17:25 +0000)] 
Increase the version number to 3.7.12

FossilOrigin-Name: d95f9fb713c7ba4e570556d835fbd77e574afdea

13 years agoAdd SQLITE_DBSTATUS_CACHE_WRITE to the command-line shell.
drh [Sat, 24 Mar 2012 20:09:33 +0000 (20:09 +0000)] 
Add SQLITE_DBSTATUS_CACHE_WRITE to the command-line shell.

FossilOrigin-Name: 30b8dd326d28c0c08543989e376011ea41773a7e

13 years agoAdd SQLITE_DBSTATUS_CACHE_WRITE. Used to query a database connection for the cumulati...
drh [Sat, 24 Mar 2012 20:06:14 +0000 (20:06 +0000)] 
Add SQLITE_DBSTATUS_CACHE_WRITE. Used to query a database connection for the cumulative number of database pages written.

FossilOrigin-Name: 05f98d4eec0f029b76fd471f8d9edf2807de6b55

13 years agoAdd SQLITE_DBSTATUS_CACHE_WRITE. Used to query a database connection for the cumulati...
dan [Sat, 24 Mar 2012 19:44:56 +0000 (19:44 +0000)] 
Add SQLITE_DBSTATUS_CACHE_WRITE. Used to query a database connection for the cumulative number of database pages written.

FossilOrigin-Name: 3cb6a879f1220db03a66429d63330e27e8ca6e49

13 years agoEnable fts3 tables to use incremental merge by automatically creating the
drh [Sat, 24 Mar 2012 17:29:05 +0000 (17:29 +0000)] 
Enable fts3 tables to use incremental merge by automatically creating the
%_stat table when it is needed.

FossilOrigin-Name: cc051fc0b2d89603b27b94cf2afdbda417ee9d94

13 years agoFix a failing assert() in the FTS3_LOG_MERGES related code.
dan [Sat, 24 Mar 2012 17:09:11 +0000 (17:09 +0000)] 
Fix a failing assert() in the FTS3_LOG_MERGES related code.

FossilOrigin-Name: 4220d52cb3426f1680b72d57ecc9f4ade029357d

13 years agoAdd a comment to fts3SyncMethod() to justify the nMinMerge=64 constant.
dan [Sat, 24 Mar 2012 16:43:55 +0000 (16:43 +0000)] 
Add a comment to fts3SyncMethod() to justify the nMinMerge=64 constant.

FossilOrigin-Name: af55ca5fc6778cb6d1a79a17dfa2d4e567ea1ccc

13 years agoFix a bug in debugging code enabled when FTS3_LOG_MERGES is defined.
drh [Sat, 24 Mar 2012 16:18:08 +0000 (16:18 +0000)] 
Fix a bug in debugging code enabled when FTS3_LOG_MERGES is defined.

FossilOrigin-Name: 2e06babf49de844d0e878d68114dbcc5ad4d6e54

13 years agoRemove the Fts3Table.mxLevel variable.
dan [Sat, 24 Mar 2012 16:11:21 +0000 (16:11 +0000)] 
Remove the Fts3Table.mxLevel variable.

FossilOrigin-Name: 67a0cffc9d07be7f09dad9d019a18160711295cd

13 years agoMerge auto-incr-merge with incr-merge branch.
dan [Sat, 24 Mar 2012 14:45:59 +0000 (14:45 +0000)] 
Merge auto-incr-merge with incr-merge branch.

FossilOrigin-Name: 1c68687ab6d05b100191663820e7d82377d52445

13 years agoModify the way the number of leaves written and the maximum relative level are calcul... fts4-auto-incr-merge
dan [Sat, 24 Mar 2012 14:45:19 +0000 (14:45 +0000)] 
Modify the way the number of leaves written and the maximum relative level are calculated in the auto-incr-merge code.

FossilOrigin-Name: 0d841c957c6ec4afecb49504177c6279e09d7012

13 years agoAn attempt at automatic incremental merging for FTS4.
drh [Sat, 24 Mar 2012 02:20:43 +0000 (02:20 +0000)] 
An attempt at automatic incremental merging for FTS4.

FossilOrigin-Name: ed69434cd89084f4b57bd2cc4f5cc558904af565

13 years agoFix a spurious SQLITE_CONSTRAINT error that may be returned by an incr-merge operation.
dan [Fri, 23 Mar 2012 18:26:11 +0000 (18:26 +0000)] 
Fix a spurious SQLITE_CONSTRAINT error that may be returned by an incr-merge operation.

FossilOrigin-Name: ed7c17ea165f6348506bd23ebc58c427bb65d697

13 years agoAdd a test to verify that sqlite3_total_changes() works with incr-merge operations.
dan [Fri, 23 Mar 2012 15:38:43 +0000 (15:38 +0000)] 
Add a test to verify that sqlite3_total_changes() works with incr-merge operations.

FossilOrigin-Name: 1c72cecc6bf5be2a5c04ad6214a6bac22a29f860

13 years agoRemove an incorrect assert() statement. Fix a const-related warning.
dan [Fri, 23 Mar 2012 14:38:49 +0000 (14:38 +0000)] 
Remove an incorrect assert() statement. Fix a const-related warning.

FossilOrigin-Name: 96ed47493b3d46344fd2105642f31690aee06674