893ca50d0f
Merge enhancements from trunk, including the new sqlite3_value_dup() API and
...
the addition of the apSqlParam field in the sqlite3_rtree_query_info object
of R-Tree.
FossilOrigin-Name: cdc0ca6fb36e787b981fb544a27c6df838f85704
2015-05-22 23:26:18 +00:00
18070e08c5
Fix incorrect validation of the size of the BLOB returned by a geometry
...
function on the RHS of a MATCH operator in RTree. The old code worked for
64-bit systems (by chance) but fails on 32-bit.
FossilOrigin-Name: 10cc44f5a63e6cadf6940bb7310a177ee7fa6ee2
2015-05-22 23:17:28 +00:00
fd29973f11
Update with fixes and enhancements from trunk.
...
FossilOrigin-Name: 9605d008f5c763137e9734d033fe4510ca316858
2015-05-22 18:40:48 +00:00
6b76418e67
Have r-tree prefer to use the constraint "col MATCH ?" over "rowid = ?".
...
FossilOrigin-Name: b9fb95194d4f7c535f1d175fd2e18d69d76e8fc4
2015-05-22 16:08:42 +00:00
4f03f413bc
Add the sqlite3_value_dup() and sqlite3_value_free() interfaces. Use
...
these interfaces to enhance R-Tree to add the
sqlite3_rtree_query_info.apSqlParam field.
FossilOrigin-Name: a7ee40c4fc62843ac5b96ba47ca14a66e8cd6961
2015-05-20 21:28:32 +00:00
dbbd816059
Merge the Makefile.msc fix and the compiler warning fix from trunk. Also
...
fix another compiler warning in sqlite3session_diff().
FossilOrigin-Name: 7530e1bf557083ef91447a02f05b019dbe60fa70
2015-05-19 23:04:26 +00:00
7ac07bda73
Fix the MSVC makefile so that it works with OTA. Fix a harmless compiler
...
warning in FTS3.
FossilOrigin-Name: c7b16645307d6e46c4153693d6806269de64955f
2015-05-19 22:56:45 +00:00
adf3bf5811
Merge recent trunk changes, include the R-Tree enhancement that allows
...
8-byte BLOB arguments to geometry functions, and the fix for the TEXT affinity
problem that could cause corrupt indexes.
FossilOrigin-Name: 0a0de8b72ca24f287f9c84766a14e12ea4564b59
2015-05-19 22:42:23 +00:00
856d446efe
Allow R-Tree geometry functions to take 8-byte BLOB arguments which are
...
passed directly through to the underlying callback, and which can be used
to pass pointers into the callback.
FossilOrigin-Name: b271ed56532a78323accc8a7cb348d55f95c350e
2015-05-19 22:20:48 +00:00
815bd625c2
Remove the sqlite3ota_open_v2() API. Add a new parameter to sqlite3ota_open() instead.
...
FossilOrigin-Name: c74e0bc481ce995f83ca8384e05dfbe068a0ae85
2015-05-19 17:48:11 +00:00
a6fb464878
Allow OTA update state data to be stored in a database separate from the OTA update database.
...
FossilOrigin-Name: 5af8db56af457d60ea030d84666ca7fffb6821fe
2015-05-19 16:22:58 +00:00
5f9a57fc49
Merge in the IS-operator enhancements and other recent changes from trunk.
...
FossilOrigin-Name: 4f9229445c293b39c80b2a662901f608c85b36ef
2015-05-14 15:17:20 +00:00
8255079611
Merge latest trunk changes with this branch.
...
FossilOrigin-Name: 299ed55c909d327826ef47e204ef1e9afd54852b
2015-05-14 08:58:52 +00:00
1c1cea8bae
Merge latest trunk changes into this branch.
...
FossilOrigin-Name: 82e5a6e088c58815140ad36715ac11c96527cb25
2015-05-11 18:46:42 +00:00
6a12854024
Remove a couple stray test breakpoint calls.
...
FossilOrigin-Name: 2860cebeeaebd346de60c762aa3e51dbab008578
2015-05-08 00:58:39 +00:00
739b903e6d
Remove some dead code from fts3_snippet.c.
...
FossilOrigin-Name: 46b2d3cef5c22a9e6bd0a4f8411f17b7ec72bd18
2015-05-06 17:51:59 +00:00
e60aedc564
More optimization for the 'y' and 'b' matchinfo directives.
...
FossilOrigin-Name: 8c5b9fedfcee3ac22a222819dceb981ad94a9903
2015-05-06 17:41:19 +00:00
753c1f56db
Further optimizations for the 'y' and 'b' matchinfo operators.
...
FossilOrigin-Name: fbd038bb57322e1ed2e1ee52f3d134594b6bfcc0
2015-05-06 08:43:26 +00:00
99eaf39784
Add the fts3 matchinfo 'b' flag.
...
FossilOrigin-Name: b9b77972d88171e4239b8194f308eb5d60b5d172
2015-05-05 20:39:53 +00:00
b2bd727e52
Optimizations for the matchinfo() function, particularly the 'y' flag.
...
FossilOrigin-Name: dddd7e182943a1d3a9d32830e819a63f1a228d6d
2015-05-05 19:37:07 +00:00
d689fd3a92
Merge all trunk enhancements and fixes into the sessions branch.
...
FossilOrigin-Name: de7083cfe2bb00b689bec6bcc75e994f564ceda6
2015-05-05 17:12:27 +00:00
28f98455f4
Add the experimental matchinfo 'y' flag to fts3/4.
...
FossilOrigin-Name: 92941609af74044b3078e020324a37b04a0638b0
2015-05-02 09:44:15 +00:00
e9c5f97683
Fix an assert in RTREE that would fire if the rtree table is misdeclared.
...
FossilOrigin-Name: 9a45409cc4078f2b6e68aa777f6ab86a14309833
2015-05-01 18:00:37 +00:00
abf582509d
Use the sqlite3Fts3ErrMsg() function to set error message text in FTS3,
...
and to ensure that error messages are not overwritten and thus leaked.
FossilOrigin-Name: 605347e087ec5eb817f3c94f4616abe26c7ab66b
2015-05-01 14:07:30 +00:00
6758959ec3
Fix a problem in the "ota" utility program causing it to crash if SQLite failed to open the target database.
...
FossilOrigin-Name: a1a2b4a2eff4f641fa80e8ffa805c97afb73be95
2015-04-23 19:38:20 +00:00
e11afed562
Merge latest trunk changes into this branch.
...
FossilOrigin-Name: 1506e99eca19f72fb59b55ec9e2534505dfa7a6e
2015-04-23 19:32:19 +00:00
55d46f01c5
Fix a performance problem in calls to sqlite3ota_close() made after the OTA update has been completely applied and checkpointed.
...
FossilOrigin-Name: fa62093b2531424846ea500c4155170d1bc7110e
2015-04-23 19:18:42 +00:00
1cdd523a50
Have OTA maintain a small LRU cache of UPDATE statements. This reduces the amount of time it spends compiling UPDATE if a single data_xxx table contains many different ota_control strings.
...
FossilOrigin-Name: baee3556ea10d96f1623cf4dce112fa1a1070820
2015-04-23 18:14:21 +00:00
b9db909952
Modify the sqlite3session_diff() API so that tables with no PRIMARY KEYs are ignored. This matches the other sessions APIs. Also change sqlite3session_diff() so that it returns SQLITE_SCHEMA, instead of SQLITE_ERROR, if the tables being compared do not have compatible schemas.
...
FossilOrigin-Name: aada0ad08e3baa10d14d1f3393183110289e068e
2015-04-23 17:22:49 +00:00
4cc923e3e3
Fix the error message returned by sqlite3session_diff() for tables with no PRIMARY KEY.
...
FossilOrigin-Name: 4d34a3d40da210bebb2a2e6dff094f9a39c92798
2015-04-23 15:03:14 +00:00
dd009f839c
Fix a performance problem in sqlite3session_diff().
...
FossilOrigin-Name: ea400eca314d81761fe5c0e329b906c045f0dfe4
2015-04-23 14:40:17 +00:00
6ea60c7c53
Merge the latest trunk enhancements and fixes into the sessions branch.
...
FossilOrigin-Name: 4e5f17d189eb0578a544c21fc150f9e2ee3428e3
2015-04-23 13:49:53 +00:00
38f2024062
Fix a problem causing the fts3 integrity-check to fail if run inside a transaction.
...
FossilOrigin-Name: 3b925189a75eae875da256b6e54999cad3cef1eb
2015-04-23 11:52:04 +00:00
39b7ff7987
Add comments related to database locking to sqlite3ota.h.
...
FossilOrigin-Name: 77242965e77446313a8f0a65a39fccb67fe4cabf
2015-04-22 11:34:38 +00:00
903dd7d5d1
Add a comment to sqlite3ota.h. No code changes.
...
FossilOrigin-Name: 352fa09efd8240567b8f9487944e8c3ade4e664a
2015-04-21 15:35:30 +00:00
3c9a073723
Fix an fts4 problem to do with the handling of phrases that contain zero tokens.
...
FossilOrigin-Name: caba5be0b2bdaf4eb4af9af267c0c22dfbd3dba5
2015-04-21 12:06:53 +00:00
850b0d031d
Merge all recent trunk enhancements and fixes into the sessions branch.
...
FossilOrigin-Name: b8ef1cdee307441e8d97b4bfc21f8547692eea9f
2015-04-20 01:32:53 +00:00
8e18922f12
Fix harmless compiler warnings seen with MSVC 2015.
...
FossilOrigin-Name: d05becd873a03a366843a34e7f4c732dd8f88c86
2015-04-19 21:43:16 +00:00
1586699cfc
Fix a problem affecting some fts3 UPDATE and DELETE statements on order=DESC tables.
...
FossilOrigin-Name: 284c1623f81704ef80edb9324954525cb2b72172
2015-04-17 20:51:55 +00:00
1c29c27bb0
Ensure that filenames passed to the VFS xOpen() function are terminated by 2 '\0' bytes.
...
FossilOrigin-Name: 66eff473c3634edb42f6ad6955acfba3e3a10def
2015-04-17 17:00:52 +00:00
43030868e6
Fix a memory leak in sqlite3ota.c that can follow an OOM error.
...
FossilOrigin-Name: c3dc15e71782fc70e92b71ad9eec0cf8ffef611f
2015-04-17 16:29:11 +00:00
10dc553c13
Hold the database mutex for the duration of sqlite3session_diff().
...
FossilOrigin-Name: 6f33050115562833c43da3c99dd37aeb0bf966b6
2015-04-17 11:31:08 +00:00
ec16d98489
Have OTA always specify SQLITE_CONFIG_URI when opening databases. Fix a test issue causing otacrash.test to fail.
...
FossilOrigin-Name: 0d0e5ec064eaecb200b9b601b7a54a1700cd176e
2015-04-17 08:36:05 +00:00
a4bb7764fe
Fix a boundry-value condition in the phrase poslist extractor of FTS3/4.
...
FossilOrigin-Name: 55d10baf0bffdb1a34bf5627ed8f25e4a4efd942
2015-04-16 20:10:17 +00:00
5c06dd831f
Be sure to release any xShmLock locks held when closing an OTA handle.
...
FossilOrigin-Name: d0fba72a47f73082ade40a732aab114bc8f6d83e
2015-04-16 18:49:53 +00:00
28b22a0159
Fix a mismatched printf() argument and format specifier. Add ota files to Makefile.in.
...
FossilOrigin-Name: 5db810a88dac5cbf1f6b321345d01cc0d9d05d31
2015-04-16 14:33:09 +00:00
92f283c0d4
Fix a stray backslash character in a printf format string in
...
sessionDiffFindModified()
FossilOrigin-Name: abb192a1d79388d4717f459b91e34f9c035935f2
2015-04-16 13:52:03 +00:00
4141a81b30
Avoid attempting to rename the *-oal file while it is still open.
...
FossilOrigin-Name: 658c3b0c80b9fe7eaac5982573651dc649a4c53f
2015-04-16 10:55:58 +00:00
fdb031891c
Merge all recent trunk enhancements and fixes into the ota-update branch.
...
FossilOrigin-Name: 9bd3e4453d4ad416f7e3f08f0bd283d34f1c319c
2015-04-15 14:26:04 +00:00
ff363ee121
Merge all recent trunk fixes and enhancements into the sessions branch.
...
FossilOrigin-Name: e65e65f9bc9b4bf5c9dd6e3a77a0d5f03c40e006
2015-04-15 14:14:38 +00:00
drh