2718960316
Consider the affinity of "b" when using an "a IN (SELECT b ...)" expression with an index on "a". Fix for [199df416].
...
FossilOrigin-Name: f5e49855412e389a8a410db5d7ffb2e3634c5fa3
2016-09-03 15:31:20 +00:00
4910a76d45
Performance optimizations.
...
FossilOrigin-Name: f1d06c49ba0d814dc7ffb538aac3f4e6251fd8f0
2016-09-03 01:46:15 +00:00
55a6f6dc72
Merge recent changes from trunk.
...
FossilOrigin-Name: c7271fbde1aebb15daaedb7f1fa75fe410fd46f6
2016-09-02 23:56:32 +00:00
c6952addf7
Add a test case for the OOM handled by the previous commit.
...
FossilOrigin-Name: 9bdf7ca1b317fe0ba7efea38fb395bf6130ac89a
2016-09-02 21:34:17 +00:00
76729ed4be
Correctly detect an OOM occurring in the setDestPgsz() subroutine of
...
backup.
FossilOrigin-Name: d9d8a048d4b621435870b4f8dd13b2938ac2f8fd
2016-09-02 21:17:51 +00:00
033564cca9
Within a backup operation, ensure that a read-transaction is opened on the source database before its page size is read. This ensures the page-size used to write to the backup database is the same as its actual page-size, which is important for ZipVFS databases.
...
FossilOrigin-Name: 7908fc604991d81140c182b97981fd724ad126ae
2016-09-02 17:18:20 +00:00
e5a0cfa161
Have "sqldiff --rbu" ignore rows with NULL values in primary key fields. RBU can't handle such rows and the documentation already says sqldiff ignores them. Because the code now uses "=" instead of "IS" to filter on primary key columns, diffs on virtual tables are faster now too.
...
FossilOrigin-Name: f4ba894a86aa195bcbe2fa69e91cd870ec3fb577
2016-09-01 14:03:28 +00:00
d0d49b9ca3
If SQLITE_ENABLE_ZIPVFS is defined, journal_mode=off is configured and a savepoint or statement rollback is attempted, move the pager into the error state to prevent the transaction from being committed. This makes it safe to use journal_mode=off with zipvfs under some conditions.
...
FossilOrigin-Name: 38d31e189e7c7899e14455f2c083aa676ce4d4c0
2016-09-01 09:35:20 +00:00
a87070a271
Use some of the example code from the sessions documenatation in the sessions test cases.
...
FossilOrigin-Name: 6602974d17536bcb904a794bddedffd58926794b
2016-08-29 14:18:18 +00:00
2e5c5052fd
Fix typos in comments. No changes to running code.
...
FossilOrigin-Name: a07269f2a0f87e0b736127f528f6caf3b63f9052
2016-08-27 20:21:51 +00:00
6650190891
Fix some comments in sqlite3session.h. No changes to code.
...
FossilOrigin-Name: 78cd64e202fcbe9ce69070b0f48ccd0c6b48538d
2016-08-27 18:35:55 +00:00
57b60432ba
Fixes to fts5 snippet() function.
...
FossilOrigin-Name: d464a7b18d212720a4f4e2fa4e204f1aca99c837
2016-08-27 18:34:06 +00:00
888e1faf95
Merge updates from trunk.
...
FossilOrigin-Name: 082fd5f8ac227dbb983da0a772485268af40a484
2016-08-27 14:13:58 +00:00
1ad78c5791
Fix the extra comments (added with -DSQLITE_ENABLE_EXPLAIN_COMMENTS) so that
...
the sense of <, <=, >, and >= tests is correct and so that the
SQLITE_STOREP2 version is shown correctly. These changes are already in the
rowvalue branch but are added here since they are technically unrelated to
rowvalue.
FossilOrigin-Name: 4d43c4698eef4e3db7556813f0274b4018c7c2b9
2016-08-27 14:05:12 +00:00
88e665fd0b
Fix the "Synopsis" on the OP_Lt, OP_Le, OP_Gt, and OP_Ge opcodes, which
...
has been backwards for time out of mind.
FossilOrigin-Name: f51248dcfa22e989dacde41021e96a65f12c5ca8
2016-08-27 01:41:53 +00:00
106526e1bc
Fix a minor problem in sqlite3FindInIndex() related to rowids being used
...
as part of the index.
FossilOrigin-Name: 829f802be7d4647dd815b739bbc9e1d1ac6a224d
2016-08-26 22:09:01 +00:00
a84a283d18
Fix the sqlite3FindInIndex() to ensure that it always uses a prefix of
...
the index and uses no repeated columns. Enhanced comments.
FossilOrigin-Name: b9fc89e432fbe4e5b41959a42797641907e075e3
2016-08-26 21:15:35 +00:00
363fb95bc3
Add an EXPLAIN QUERY PLAN line for when a index is used to implement
...
an IN operator.
FossilOrigin-Name: 171aa833a2e1650c3d9cf9bd6438ae46f6c35871
2016-08-26 19:54:12 +00:00
4b4f51148a
Add test cases to rowvalue2.test.
...
FossilOrigin-Name: 078bb69e99891ba3b76a39ac974990714c43908f
2016-08-26 19:47:30 +00:00
6fc8f36490
Enhance sqlite3FindInIndex() so that it is able to make use of the
...
primary keys at the end of an index.
FossilOrigin-Name: 4b589fbfcc4265902de0f552961d2df497a184da
2016-08-26 19:31:29 +00:00
0c36fca004
Fix a post-OOM crash in updateRangeAffinityStr(). Add several ALWAYS()
...
macros on unreachable branches.
FossilOrigin-Name: 87d40195ae5cc2abd9bae45073a615db81263285
2016-08-26 18:17:08 +00:00
b7ca2177d7
Fix a problem with affinity changes and vector range comparisons.
...
FossilOrigin-Name: b34413ac7e34369b4420e57b0132249dca68a7b0
2016-08-26 17:54:46 +00:00
0dfa4f6fcc
Allow ROWID values in indexed vector comparisons.
...
FossilOrigin-Name: b0cc6be4eb81f21b11796e1f14d4412bf21dea6e
2016-08-26 13:19:49 +00:00
61441c3493
Fix a problem in internal function sqlite3OpenTableAndIndices causing an operand of an unrelated VM instruction to be overwritten. Fix for [ef360601].
...
FossilOrigin-Name: 7090147903337864d54ecfb2cd84a3f823973167
2016-08-26 12:00:50 +00:00
8e16b2d3e6
Rename a test procedure in 'speed3.test' to avoid a name collision.
...
FossilOrigin-Name: 84de17bc688f1df2be1a34420470d1b16f8f4e56
2016-08-26 04:32:59 +00:00
64bcb8cfbb
Comment improvements. Put ALWAYS and NEVER macros on three unreachable
...
branches.
FossilOrigin-Name: 397617009e07004596476d6f5644fdf84c376f54
2016-08-26 03:42:57 +00:00
975c800dd8
Adapt the special case of '$' in item names for test 'vtabH-3.1' as well.
...
FossilOrigin-Name: e4aeaa2bc73b57f1ef134cc4f54e2a652a20b5c9
2016-08-26 02:10:50 +00:00
0a9428d0a7
Make the test 'vtabH-3.1' work when there are less than 5 top-level items.
...
FossilOrigin-Name: 328f79bb5713abbecaeb0ef3fb37f56a0946b915
2016-08-26 01:47:22 +00:00
7dd7d98bbf
Support running the fstree tests in 'vtabH.test' on Windows when not using the system drive.
...
FossilOrigin-Name: 3680f95ff34fdcf6a18a99268678a56e4be5a023
2016-08-26 01:17:12 +00:00
a28f85b076
Remove an unreachable branch from sqlite3ExprAffinity()
...
FossilOrigin-Name: 9d96f61481704e5ec399ee425f0ebb246902ecc5
2016-08-26 01:02:09 +00:00
f10122d535
Fix typos in 'vtabF.test' file. No changes to code.
...
FossilOrigin-Name: a8546feec9388d96934b16e516a165cd37d32ce9
2016-08-25 23:24:09 +00:00
3cc19132da
Merge recent changes from trunk.
...
FossilOrigin-Name: 5789aab8ef59ae1cdfdae123b078ee03da6e08ed
2016-08-25 22:31:44 +00:00
fb82820a38
Fix the sqlite3_trace_v2() interface so that it goes disabled if either the
...
callback or mask arguments are zero, in accordance with the documentation.
FossilOrigin-Name: 37e6c54b1afc634844026b3fe874dd2d550c6558
2016-08-25 22:06:37 +00:00
e347d3e813
Refactor the sqlite3ExprCodeIN() routine for improved maintainability.
...
FossilOrigin-Name: b56705ae6374db9db82613ef89faa1a1e6b00a18
2016-08-25 21:14:34 +00:00
0a1082aec2
Another fix in the IN-operator algorithm description.
...
FossilOrigin-Name: f474aeac4fa62d87e73189868d7c7a295ffb7265
2016-08-25 17:47:36 +00:00
1373c3a8c5
Further refinement of the in-operator.md documentation.
...
FossilOrigin-Name: df0648373a50006ca18d692e12552d1d53d549e3
2016-08-25 17:40:32 +00:00
ecb87ac88d
Improvements to IN operator code generator comments. Avoid unnecessary
...
Copy operations on the LHS of the IN operator.
FossilOrigin-Name: b6344298783a1207cba3f635939ddc9ba922ab67
2016-08-25 15:46:25 +00:00
ee0f22fd3b
Corrections to the IN-operator notes.
...
FossilOrigin-Name: 25033ee94538289ba7e0147da30a18300047123f
2016-08-25 14:23:59 +00:00
539f2fef03
Add notes on the implementation of the IN operator.
...
FossilOrigin-Name: d256b2caeb9e3eb5dd88bb569ec71f91e9991c81
2016-08-25 14:00:15 +00:00
18016ad2bb
Simplified VDBE code for the vector NOT IN null-scanning loop.
...
FossilOrigin-Name: 7ae504e62e9bbbbd85a676f3c3922b7fd0cc73d2
2016-08-24 21:54:47 +00:00
72e26dec86
Improved extended comments of comparison operators when the SQLITE_STOREP2
...
flags is set on P5. No changes to non-debug code.
FossilOrigin-Name: bbc1b016164ed0793e07302614384d52119463e0
2016-08-24 21:24:04 +00:00
62659b2a80
In sqlite3FindInIndex(), improve internal comments and avoid an
...
unreachable branch.
FossilOrigin-Name: 55945fc12f8157e32e6850e41575c0c6422d29e7
2016-08-24 18:51:23 +00:00
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
24b6b81cb0
Sync up the MSVC autoconf makefile.
...
FossilOrigin-Name: 77f7c31a3aa44798cfa5f557242caffb593ce7af
2016-08-24 18:21:58 +00:00
321e828d03
Fix more unreachable branches.
...
FossilOrigin-Name: 6099c180db55396d6307538a5428ae5ef1b82d10
2016-08-24 17:49:07 +00:00
d0b67a8654
Add a NEVER() on an unreachable branch in comparisonAffinity().
...
FossilOrigin-Name: 505a2f20eac62d4e170f003255c8984e4f3b0918
2016-08-24 15:37:31 +00:00
7887d7f24d
Fix a buffer overrun in the code for handling IN(...) operators when the LHS of the operator contains indexed columns or expressions.
...
FossilOrigin-Name: f41a0391b732a8c4ad188163f34a0f4a22237bb5
2016-08-24 12:22:17 +00:00
ac6b47d164
The previous OOM fix was bad. Back it out and replace it with a better one.
...
FossilOrigin-Name: 1e3bc3698a4b779e6af8e3c727929c4dbddf3edb
2016-08-24 00:51:48 +00:00
894241c847
Avoid a potential null-pointer dereference following an OOM.
...
FossilOrigin-Name: 25f6ed8de4df9c9890d4a352a6d11084433e82ea
2016-08-24 00:25:27 +00:00
e835bc1285
Simplify the row value misuse error message.
...
FossilOrigin-Name: 838c50a5bf46fd0340839d577fa28ba02b4f2034
2016-08-23 19:02:55 +00:00
66860af3dd
Fix a problem with rowvalue UPDATE when the rowvalue is not the left-most and
...
the RHS is a multi-column subquery.
FossilOrigin-Name: e149e6b93a9afb3d574309c0db60e221e24078f7
2016-08-23 18:30:10 +00:00
abb9d5f189
Fix an uninitialized variable in CASE expression code generation.
...
FossilOrigin-Name: c8ffae05e13033ec7425bf0f002df31f550bb7f1
2016-08-23 17:30:55 +00:00
6ae3ab0036
Fix the SQLITE_USER_AUTHENTICATION login check so that the SQLITE_AUTH_USER
...
error code correctly propagates and is not overwritten by SQLITE_ERROR.
FossilOrigin-Name: c640489db2037f1a284d7b85fa753ccdac1b8f79
2016-08-23 14:42:15 +00:00
cbfe1101b3
Add support for the SQLITE_DBCONFIG_MAINDBNAME configuration option.
...
FossilOrigin-Name: 7839519349c7371cdb4e16a215eacd27004cbc62
2016-08-22 20:10:01 +00:00
12abf408ff
Fix the vector BETWEEN operator so that it only evaluates the left-most
...
vector expression once. Add support for vector comparisons in the CASE
operator.
FossilOrigin-Name: 07e69f43a294d35b5145a2b0242ee42d50adab14
2016-08-22 14:30:05 +00:00
db45bd5e82
Reinstate the mechanism in BETWEEN that avoids evaluating the first expression
...
more than once, but fix the affinity extractor so that it works with this
mechanism. The de-duplication of the first expression still does not work
for vector expressions, though.
FossilOrigin-Name: 2f39987f21bd6dae8d2be610a1fd5f06f8878e9e
2016-08-22 00:48:58 +00:00
84b19a3da1
The docs promise the in "x BETWEEN y AND z" the x expression is only evaluated
...
once. That is no longer true, and so some tests are failing. This needs to
be fixed before merging to trunk.
FossilOrigin-Name: e50d264fdc2f08d19202c68f73f18df301cb233d
2016-08-20 22:49:28 +00:00
d832da7f40
Further comment enhancements. No changes to code.
...
FossilOrigin-Name: d4562a9e7b1eaff41466210e3a0caaf374ec5a92
2016-08-20 21:11:25 +00:00
76dbe7a8d0
Clarification of code comments in expr.c. Clean up the implementations
...
of sqlite3ExprIsVector() and sqlite3ExprVectorSize() slightly.
FossilOrigin-Name: 4fb66d6592b141a4a71359250dbd1ac454569cb9
2016-08-20 21:02:38 +00:00
8bd0d58e1c
Fixes for problems following OOM errors.
...
FossilOrigin-Name: 9041ee4a6f0e8389297f887f1431ab5cfe783390
2016-08-20 18:06:14 +00:00
783e778f38
Fix other minor problems with the fts5 snippet() function.
...
FossilOrigin-Name: b56b2a85cf377686727f3929208ede43f797cf76
2016-08-20 17:23:45 +00:00
9854260bca
Do not duplicate the Expr.pLeft subtree of a TK_SELECT_COLUMN node.
...
FossilOrigin-Name: 8384c77ebb3f65fbc54c199885926f2066f0b140
2016-08-20 17:00:16 +00:00
f358009a93
Fix a segfault that could occur if a query that used a vector comparison contained certain types of syntax errors.
...
FossilOrigin-Name: 203f07c5e140e74cf91d0c1e20135c21236f0fc1
2016-08-20 15:01:24 +00:00
9e730f0bb8
Improvements to the vector comparison splitter in exprAnalyze().
...
FossilOrigin-Name: a3ffd283bc931b04170ef737e56bced33d27f06d
2016-08-20 12:00:05 +00:00
8762ec1935
Improvements to comments. No code changes.
...
FossilOrigin-Name: 4165d20f64d778a4e48f511a37cfced8579d4dbe
2016-08-20 01:06:22 +00:00
a1251bc40d
Add support for vector assignments in the SET clause of an UPDATE statement.
...
FossilOrigin-Name: f320d47d6b7b08d9552c8444004bc256348bda90
2016-08-20 00:51:37 +00:00
fc7f27b9d2
Change the way TK_SELECT_COLUMN is handled so that the subquery is only
...
generated once even if part of the vector comparison is used for indexing
and the other part is now. This change also is a pathway to vector assignment
in UPDATE statements.
FossilOrigin-Name: d8feea7dcde83179bff303072426561cfe825e58
2016-08-20 00:07:01 +00:00
8d25cb90cd
Replace the magic number (-2) with its symbol XN_EXPR in the
...
exprMightBeIndexed() routine. No logic changes.
FossilOrigin-Name: d4a5af69cc3bde6f8c02075c07b4d47a0252392d
2016-08-19 19:58:06 +00:00
39a11819f3
Improved comments on sqlite3CodeSubquery(). No changes to code.
...
FossilOrigin-Name: acea4ee136def4815d22eec240c5903a72bde9bd
2016-08-19 19:12:58 +00:00
a15a8bc822
Show the WhereTerm.iField value on debugging output, when it is non-zero.
...
FossilOrigin-Name: 931c95358d8bc02f3e3d8ee4e545a07b2d2c97e8
2016-08-19 18:40:17 +00:00
c9e75fb23a
Register any built-in fts5 module before loading automatic extensions. This allows automatic extensions to register fts5 tokenizers and auxiliary functions.
...
FossilOrigin-Name: b10e31dce8e590e1ba30f512374a8c16656bcc72
2016-08-19 18:37:35 +00:00
4602b8e89d
Fix an obsolete comment on codeEqualityTerm(). No changes to code.
...
FossilOrigin-Name: d07be5afb0a915769382dfd815403f8832cb3eec
2016-08-19 18:28:00 +00:00
b684fd5c4a
Merge recent enhancements from trunk.
...
FossilOrigin-Name: b17872363b60edab05a5d382a44038aad91e4d9f
2016-08-19 15:41:24 +00:00
05a41ee9ec
Merge the VACUUM attached database enhancement from trunk.
...
FossilOrigin-Name: 12d5e38d269ede27cd38a031a395915301fffe56
2016-08-19 15:17:51 +00:00
fcc31545bc
Enhance the VACUUM command so that it can operate on an attached database.
...
FossilOrigin-Name: 083f9e6270fa4faa402b91231271da4f3915c79f
2016-08-19 15:15:55 +00:00
6a754dc767
Disable row counting on queries run while doing a VACUUM.
...
FossilOrigin-Name: ad35ef116296e5d6aaeb9ef260bf35bee3bd6d20
2016-08-19 15:12:38 +00:00
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
9ef5e7708a
Add the capability to VACUUM an attached database by specifying the schema
...
name as an argument to the VACUUM command. Since version 2.0, VACUUM has
accepted an argument which was silently ignored. Now it has meaning.
FossilOrigin-Name: 29d63059b4d2bb612523ac55ebfef040d054a64f
2016-08-19 14:20:56 +00:00
da84dcae54
Add the SQLITE_DBCONFIG_MAINDBNAME interface.
...
FossilOrigin-Name: d6e3d5796c9991ca0af45ed92ce36f55efc02348
2016-08-18 22:44:22 +00:00
61ea610cd0
Change the name of Db.zName to Db.zDbSName for improved long-term code
...
maintainability.
FossilOrigin-Name: cb9865e14db1c0076618f13400151112f84960cb
2016-08-18 22:19:03 +00:00
e59be01072
Fix a zName to zDbSName conversion missed in the previous check-in.
...
FossilOrigin-Name: d7cf423cdccada2b0a4b7cc79ccf5f35d6f43212
2016-08-18 20:56:39 +00:00
03181c8c27
Fix a SQL NULL handling bug in the vector IN operator code generation.
...
FossilOrigin-Name: 936146b12e27784f15a68fe65732c6d92c3a12f3
2016-08-18 19:04:57 +00:00
48cb3a7600
Display SELECT_COLUMN expressions in the .wheretrace debugging output.
...
FossilOrigin-Name: 3b27a5da100037f75a4efc15e0354a6aa94194f8
2016-08-18 18:09:10 +00:00
db97e56217
Display VECTOR expressions in .wheretrace and .selecttrace debugging output.
...
FossilOrigin-Name: 157347e2580e5078c4081d602e9d1a82d194e719
2016-08-18 17:55:57 +00:00
c8d0b0b9d4
Since the TK_VECTOR token is not actually used by the parser, make it an
...
extra token code added by the tool/addopcodes.tcl script during parser build.
FossilOrigin-Name: b40b202c1f82808d2240e87b22f1e78b2208cb26
2016-08-18 15:36:03 +00:00
5ea494425f
Merge recent enhancements from trunk.
...
FossilOrigin-Name: 4768a1066cb9c7627064d7efec44188d6755cb03
2016-08-18 15:21:16 +00:00
a79e10b665
Simplify the vector comparison code generator logic, and the resulting
...
VDBE code.
FossilOrigin-Name: e2ad0b5d8e1e83118c12889150aca2f2a6b2bdde
2016-08-18 15:15:29 +00:00
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
69c338263a
Rename the Db.zName field to Db.zDbSName to make it more descriptive and to
...
distinguish it from all of the other "zName" variables scattered throughout
the code.
FossilOrigin-Name: 92a22f01343a898455fd61c3b8e7d7c954f5b569
2016-08-18 14:33:11 +00:00
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
8c2b1fde58
Fix a problem in the fts5 snippet() auxiliary function.
...
FossilOrigin-Name: a861713cc6a3868a1c89240e8340bc7b2b9559da
2016-08-17 11:14:39 +00:00
0f832ddc06
Fix a bug in destructor processing of Lemon. That has no impact on the
...
SQLite grammar. The bug was introduced by prior work to optimize the
Lemon-generated parser used by SQLite.
FossilOrigin-Name: f9035b8e2ea331801402bcb62b203ab092949770
2016-08-16 16:46:40 +00:00
0f825a7e26
Remove an unnecessary stack variable from sqlite3VdbeExec().
...
FossilOrigin-Name: c54bd9c82dd34951dc87848c0b19fcccaef928db
2016-08-13 14:17:02 +00:00
af69eda63e
Improvements to commits. No code changes.
...
FossilOrigin-Name: 18f5a3bee4f870be4644a6042a20081c46edb7d0
2016-08-13 13:03:46 +00:00
a2f629251f
Fix to the vector less-than operator. All legacy tests passing now.
...
FossilOrigin-Name: ec70a67ebc997f457be4d52d8affc37e142dc3ff
2016-08-13 12:37:47 +00:00
460d38f15e
Fix an fts5 problem with corrupt database handling found by address-sanitizer.
...
FossilOrigin-Name: e22252e1da4cd9e41b970970a1c4f466aa6cc133
2016-08-13 10:34:12 +00:00
79752b6e63
Attempt to simplify the logic and generated code for vector comparisons.
...
Basic comparison operators are working, but there are many indexing test
failures still to be worked through.
FossilOrigin-Name: dfc028cfbe7657d20727a2670ecadb1575eb8cbb
2016-08-13 10:02:17 +00:00
3b96d1e2e4
Fix a buffer overread in fts5.
...
FossilOrigin-Name: fcfbee6c7d33a9ae7feb46044a0c2fe680460d39
2016-08-13 06:38:31 +00:00
471b4b92bd
Add VdbeCoverage() macros on newly added VDBE branch operations.
...
FossilOrigin-Name: 381aa73141db8ec59adbcb09e71af660ee4ae5ce
2016-08-12 11:25:49 +00:00
a48d7e7749
Fix a post-OOM memory leak.
...
FossilOrigin-Name: 14009b32b955b42cfd5f0c2ce7d4b3ce19ce201e
2016-08-12 11:01:20 +00:00
dan