e7c4184348
Merge updates from trunk.
...
FossilOrigin-Name: d8051f611acabc2aaf8d23e8707c2a45961be416
2015-09-12 18:58:32 +00:00
04abf0878f
Import common changes from the mutex initialization branch.
...
FossilOrigin-Name: 334720c01722478af0d3dfd6fe8bafd88ba09f49
2015-09-12 18:57:45 +00:00
aa985b3208
Merge updates from trunk.
...
FossilOrigin-Name: 4859778900a99e7e50ce3d56910ad4c5469f2cdb
2015-09-12 16:59:38 +00:00
3f44c65513
Fix comments.
...
FossilOrigin-Name: de3fa51e931d34f341fc3432bfdf97390bb68d4e
2015-09-12 04:22:01 +00:00
acc8f7b24c
Specifying an invalid mutex implementation (via SQLITE_CONFIG_MUTEX) should cause the default one to be used instead.
...
FossilOrigin-Name: 1a97bc81ccfc88f2dd527dff16e9e395718675bc
2015-09-12 04:19:51 +00:00
a4da3c17c3
Clarify the new mutex implementation reset logic in sqlite3_shutdown().
...
FossilOrigin-Name: f9a034834e6c6e32ac350cf48bec981490e533ad
2015-09-12 03:40:13 +00:00
89e57dd671
Add more asserts to the mutex subsystem.
...
FossilOrigin-Name: 7562f1fbede70b19bbbb928e0a534203528b5b65
2015-09-12 03:35:55 +00:00
db17a83295
Fix typo in the Win32 implementation of sqlite3CompareAndSwap.
...
FossilOrigin-Name: 31a26a1dd796e073e847e1e9c636f1976ffbb085
2015-09-12 01:17:20 +00:00
4b3f0d6281
Make sure that the mutex implementation can be altered after calling sqlite3_shutdown().
...
FossilOrigin-Name: dc2cf8974337ca1ef705aee4efd4a96b91ca3edd
2015-09-11 23:24:50 +00:00
b3366b99c8
Update evidence marks due to wording changes in requirements text. No
...
changes to code.
FossilOrigin-Name: 86781093bdb4c4fdedd228cb1c8961db48a483bb
2015-09-11 20:54:44 +00:00
16a93128f8
Fix harmless compiler warnings.
...
FossilOrigin-Name: bfc7b84b766860d2e410702ba7c1166d7328309a
2015-09-11 18:05:01 +00:00
e98b6fab47
More test cases in test/json102.test corresponding to new examples in the
...
json1 documentation.
FossilOrigin-Name: f599a42e190b4b89d74055402143c5487985cd90
2015-09-11 15:32:33 +00:00
bcb04b6128
Fix some compiler warnings in fts5 code.
...
FossilOrigin-Name: 0dc436116e55e3fd55eb6085ada71e099069b32d
2015-09-11 14:15:46 +00:00
8bdc914af3
Enhance mutex initialization to prevent possible race conditions between sqlite3_initialize() and sqlite3_config(). Also, re-check sqlite3GlobalConfig.isInit after the mutex subsystem has been initialized.
...
FossilOrigin-Name: f6a8f577957769171acd72df3cc9aa5ad474d84b
2015-09-11 05:06:15 +00:00
12b3b89542
Updates to the sqlite3_value_subtype() and sqlite3_result_subtype()
...
documentation and to test cases for json1 dealing with those interfaces.
FossilOrigin-Name: d6cadbe9fefce9a7af6b2d0cb83362f967d7d89a
2015-09-11 01:22:41 +00:00
46f76d6c3c
Add new interfaces sqlite3_value_subtype() and sqlite3_result_subtype().
...
Update the json1.c extension to take advantages of those interfaces to avoid
the goofy '$$' path syntax and to allow nested calls to json_array() and
json_object() that work as expected.
FossilOrigin-Name: db4152aef2253ed2a33e3cad01e0c6758e03f900
2015-09-11 00:26:04 +00:00
f5ddb9c214
Take out the goofy '$$' path syntax. Instead, use subtypes to communicate when
...
a string is JSON. Add the json() function that validates and minifies the
JSON and sets the appropriate subtype.
FossilOrigin-Name: 8a80d6459e246ec1b38325e1cbd1e862157138b3
2015-09-11 00:06:41 +00:00
cf94f17964
Make the sqlite3_value_subtype() and sqlite3_result_subtype() interfaces
...
available to loadable extensions.
FossilOrigin-Name: c6fca0be11f7414292279e2ea1b004260e6f4bb6
2015-09-10 20:40:21 +00:00
bcdf78a61c
Experimental implementation of sqlite3_result_subtype() and
...
sqlite3_value_subtype() interfaces.
FossilOrigin-Name: 7b5be299c617a3d3ed327ed30ef0a66a62c85b1f
2015-09-10 20:34:56 +00:00
0b19c96935
Fix a potential NULL pointer deref in the testing logic of pcache1.
...
NB: The -DSQLITE_TEST compile-time option is needed to hit the problem.
FossilOrigin-Name: f5580f08538636ffb1367e717a33756288ccddde
2015-09-10 19:22:25 +00:00
33c47f565c
Modify the fts5 leaf page format to permit faster seek operations. This is a file-format change. Any existing databases can be upgraded by running the fts5 'rebuild' command.
...
FossilOrigin-Name: 0c0c4ae971e54efc526eed7bd071c90dfadb95ff
2015-09-10 17:23:37 +00:00
383de6918c
Create separate "path" and "root" columns in the json_each() and json_tree()
...
virtual tables. "Root" is the 2nd parameter and is fixed.
"Path" varies as json_tree() walks the hierarchy.
FossilOrigin-Name: 127cce3eb96b819005832997e0a082df9fb96f0b
2015-09-10 17:20:57 +00:00
204debf3a3
Increment the fts5 version value to indicate that the on-disk format has changed.
...
FossilOrigin-Name: 99de5e3613d557728dd196353516bc7cf64a0e6c
2015-09-10 16:39:38 +00:00
56c8634853
Fix a segfault in fts5 that could occur if the database contents were corrupt.
...
FossilOrigin-Name: 4931e37da4d2c26d7afc5432f7f0d534b51a85fa
2015-09-10 16:19:01 +00:00
40d45f8960
Merge latest changes from trunk. Including fts5_expr.c fixes.
...
FossilOrigin-Name: 716e7e747714d6af502f6a87ca8d789bb7ce162a
2015-09-10 15:52:42 +00:00
b97efa0ba3
Update description of on-disk format in fts5_index.c.
...
FossilOrigin-Name: 85aac7b8b6731e2f6880b80cfd62d431ea059799
2015-09-10 15:49:16 +00:00
0c2750889e
Make the sqlite3ext.h header file responsive to -DSQLITE_OMIT_LOAD_EXTENSION.
...
FossilOrigin-Name: 47a46a9fa4a96cdb96a20b6aec802661b1ee4598
2015-09-10 15:24:27 +00:00
e6f5278c9a
Disable tests for json_each() and json_tree() on builds where
...
virtual tables are not supported
FossilOrigin-Name: bb8ee3b140a0a8b7c89f5debf22369f204ceef0b
2015-09-10 15:22:35 +00:00
b1031f05e0
Fix the --help option on test/releasetest.tcl. Also fix the final error
...
count so that it includes a count of subtest crashes.
FossilOrigin-Name: 9ecf684dfe0cd7e3b058d208aca7eb600bf1d21b
2015-09-10 15:20:49 +00:00
e712acb641
Revert an accidentally committed makefile change.
...
FossilOrigin-Name: 402704b13f1f246c0224f90862bed93a825575f1
2015-09-10 10:40:00 +00:00
f679d97d18
Fix an fts5 problem that could occur if a term and the first associated rowid are on different leaf pages.
...
FossilOrigin-Name: ffe2796ac9244c62325fce4960f26c653321623c
2015-09-10 10:01:30 +00:00
a5aa8e1db2
Change the array of 16-bit offsets at the end of each page to an array of varints.
...
FossilOrigin-Name: fab245bea4f283714c17bca22428d5eb4db5935a
2015-09-10 05:40:17 +00:00
0e8729dbe4
Attempt to declare sqlite3MemoryBarrier() correctly for all possible
...
build configurations.
FossilOrigin-Name: da8a288f8ef4be34281519b4b4db9b857b9d168b
2015-09-10 04:17:06 +00:00
852944eb9b
Fix the json_tree() scan for the case when a path is supplied. Add new
...
json1 test cases.
FossilOrigin-Name: 6adc7de76acee6cfb5ff761739e7a8de7b5bf4b2
2015-09-10 03:29:11 +00:00
5fb72e5f3e
No-op the sqlite3_memory_alarm() interface in a different way, that does
...
not break legacy memory behavior. This is a re-do of
check-in [5d3f5df4da9f40d5].
FossilOrigin-Name: 8250e2a487ee12c9a2dea5603ab60aed51e5dc7b
2015-09-10 01:22:09 +00:00
f5eac36a64
Fix harmless compiler warning in FTS5.
...
FossilOrigin-Name: 86146a731d75eb25279c0e072c0bdda593de905d
2015-09-09 23:54:46 +00:00
5c472d0860
Fix an assert() enabled by SQLITE_ENABLE_EXPENSIVE_ASSERT in wal.c.
...
FossilOrigin-Name: 8d2ed150a7a15626965cf994ef48c3ab61eca6ec
2015-09-09 19:44:33 +00:00
8820250e8d
Fix a possible NULL pointer deref when using SQLITE_ENABLE_MEMORY_MANAGEMENT.
...
FossilOrigin-Name: 89bfdbfe943adce8e02c84ede014fcfed504c5d3
2015-09-09 19:27:10 +00:00
3f62cb5aad
Fix harmless compiler warning.
...
FossilOrigin-Name: 280fd3a482978b4a488a8b425721e451c2a30745
2015-09-09 17:23:48 +00:00
4b03efb695
Fix harmless compiler warnings in FTS5.
...
FossilOrigin-Name: 2cdb18778f20baa902e54f218ba26d2bacf0801e
2015-09-09 17:17:22 +00:00
3c03afd3f5
When running a CREATE TABLE AS, make the initial temporary sqlite_master entry
...
for the new table a real record rather than a NULL, in case the query after
the AS actually tries to read the sqlite_master table.
Fix for ticket [acd12990885d9276].
FossilOrigin-Name: 4a18d8bd4cc66eb08c6198cdf6e14f1bce0ec05a
2015-09-09 13:28:06 +00:00
f06bd2c132
Fix a bug in preprocessor macros within fts5_main.c.
...
FossilOrigin-Name: 0eb2b9521fad6fa36e6fa374c2bc1f70b5180f7c
2015-09-09 08:15:06 +00:00
0c6dfaa34a
Remove an unused local variable from Lemon.
...
FossilOrigin-Name: fe9ffe5eed7d376f3f08c78c1ce5514c886f3479
2015-09-08 21:16:46 +00:00
a46a4a63de
Enhance the DBSTAT virtual table with a new hidden table "schema" that if
...
set will cause the table to report on the specified schema rather than on
"main". Also: Fix a faulty assert in sqlite3_context_db_handle().
FossilOrigin-Name: 6beb512c7a3c3649b56f0df1ca77855535a87ba7
2015-09-08 21:12:53 +00:00
b4d472f609
Eponymous virtual tables exist in the "main" schema only. Enforce this rule.
...
FossilOrigin-Name: 06f90bb274c4bb0c30585024c8d365d43c4162f2
2015-09-08 20:26:09 +00:00
fe8e2eba0a
Remove the 0x00 terminators from the end of doclists stored on disk.
...
FossilOrigin-Name: 00d990061dec3661b0376bd167082942d5563bfe
2015-09-08 19:55:26 +00:00
310a8d6668
Fix the help message that sqlite3_analyzer.exe generates for invalid
...
arguments.
FossilOrigin-Name: 33a14e7be1004abca7a30f675459138d7f8d72b1
2015-09-08 17:31:30 +00:00
337cd0def4
Minor tweaks to Lemon.
...
FossilOrigin-Name: 986677224a8da5e79fbbd90673f1b595da89c5d6
2015-09-07 23:40:42 +00:00
3921d8be5d
Enhance the Lemon parser generator to add SHIFTREDUCE states that reduce the
...
sizes of some of the parser tables.
FossilOrigin-Name: 99b992fa840707711d99f8d05b62412f7008cd93
2015-09-07 20:11:30 +00:00
ae2a4084a2
Fix an unreachable branch in the new parse automaton.
...
FossilOrigin-Name: e9d604b4306a86faae315ac3cba59bf07d1b665c
2015-09-07 20:02:39 +00:00
mistachkin