3bde1354ff
Merge compiler-warning fixes from trunk.
...
FossilOrigin-Name: a1f2b0428518ec18af74a0e01deb4e40cd95a78f
2014-03-05 23:12:55 +00:00
dc90d3d8af
Always include the ctype.h header in the spellfix.c extension.
...
FossilOrigin-Name: bfd75f471a607b442d8cd8a7070491a158e8fb1a
2014-03-05 19:36:52 +00:00
5671ef69ec
Sync the latest trunk changes, and in particular the STAT4 IS NOT NULL fix.
...
FossilOrigin-Name: b006792695d23980e1923b21915d5c1138ecf29d
2014-02-11 04:30:29 +00:00
0211d8bca4
Change the spellfix1 virtual table to deterministically names its shadow
...
tables.
FossilOrigin-Name: 5219cdfc56ec3e1cd645ae6443ba72ce0df0339a
2014-02-06 13:18:51 +00:00
19913f4419
Bring in the latest updates from trunk.
...
FossilOrigin-Name: 7b5f3773867ed0e4ed17bd473ba972d500035318
2014-01-28 18:06:17 +00:00
693e671936
Fixes for various clang warnings.
...
FossilOrigin-Name: 87bf60637e5863c54c5e2d05aaaca0835b7aace8
2014-01-24 22:58:00 +00:00
c187698614
Bring in all the latest trunk changes, including the Common Table
...
Expressions implementation.
FossilOrigin-Name: 9b43e559195680e558264c4c00d34dc9cf9d9146
2014-01-24 14:05:18 +00:00
a8a0617e06
Update the spellfix virtual table to optimize queries of the form "SELECT ... FROM tbl WHERE rowid=?".
...
FossilOrigin-Name: a0ba55ff0596c5f15e9cdb254c68ef50df2dfaad
2014-01-22 17:43:16 +00:00
2e08486a08
Add the usual "fts3" prefix to new static method setEstimatedRows() in fts3.c. This fixes a problem when compiling the amalgamation, as the r-tree module also contains a static method named setEstimatedRows.
...
FossilOrigin-Name: d6fcfc8890489b942e5b3f1bc271835d77c5ef96
2014-01-04 19:58:29 +00:00
69014393f8
Instead of having the planner ignore plans with unusable MATCH constraints, have FTS assign extremely high costs to such plans in order to discourage the planner from using them.
...
FossilOrigin-Name: 24f84b38131866f7b435ffe641bb2f6991a70db2
2014-01-04 14:42:14 +00:00
d9e3c267b4
Merge the latest trunk changes into the sessions branch.
...
FossilOrigin-Name: cfd110bf5db2c1993a5e2ca718648bd9c17ee22c
2013-12-24 12:09:42 +00:00
c73d0d9dec
Fix harmless compiler warnings in FTS4. This involved corrupting
...
Martin Porter's beautifully written and elegant stemmer code, making it
a little less beautiful and a little less elegant. Today is a sad
day. But the warnings from GCC grow increasingly verbose and irksome
with each new release and so something had to be done.
FossilOrigin-Name: df05679838b571c16a7ab7e135f9564cd2d9647c
2013-12-21 16:06:47 +00:00
1b2ee4fe1a
Merge in performance enhancements from trunk.
...
FossilOrigin-Name: fc9ae839569eb28eb734c52d95676c59b2e27494
2013-11-26 18:00:29 +00:00
707f1c560a
Fix a harmless MSVC compiler warning.
...
FossilOrigin-Name: 6cc023bb29be51847fbbfab95c24fc89993ccdba
2013-11-19 18:17:20 +00:00
2bea7cde6e
Fix harmless compiler warnings from clang scan-build.
...
FossilOrigin-Name: 8d002740bffca2a76d2dfbc1a67293d34f9de9ba
2013-11-18 11:20:50 +00:00
212c6be141
Merge the skip-scan optimization into the sessions branch.
...
FossilOrigin-Name: 7596d1bf8040f7cefc7b22c5e609acc5d66820bf
2013-11-14 19:18:39 +00:00
3aa4be39a9
Fix harmless compiler warning.
...
FossilOrigin-Name: ddacd10105c6df2d3a9d707947e72c62e88212eb
2013-11-12 21:10:02 +00:00
85963f5474
When possible, have FTS use 32-bit operations to read varints from the database.
...
FossilOrigin-Name: aa7ba302ed13aedde89b5bcbe9119799c0da8a42
2013-11-12 17:46:44 +00:00
cf1ef10b62
Import recent bug fixes from trunk.
...
FossilOrigin-Name: 20eeee4cd34a9bffe6bf65962126ddf8ca04eb3e
2013-11-12 15:39:01 +00:00
ff4b23ba9e
Fix for [4065ac8595]: Do not order CROSS or LEFT joins, even if the right-hand-side is a virtual table.
...
FossilOrigin-Name: e2684ece455f53563ae6da7cbb5505d9a4a3076a
2013-11-12 12:17:16 +00:00
f8396b201c
Fix an error message in the spellfix extension so that it conforms to the
...
style of error messages in the core.
FossilOrigin-Name: b896ae3d2787c370be3ff5d09da7d631a16d3a2a
2013-11-12 01:11:56 +00:00
fba5765b57
Fix two test cases (due to changes in the formatting of constraint errors)
...
so that all tests now pass.
FossilOrigin-Name: 129e2b69178147d04ee27fce66c17b39f8654da3
2013-11-11 23:02:10 +00:00
cbf1b8ef7d
Merge in the WITHOUT ROWID changes. A few tests are failing now. They will
...
be fixed in a follow-on check-in.
FossilOrigin-Name: 5addd1234ded59ce60fb633b76ac87d483377edd
2013-11-11 22:55:26 +00:00
14ec33f73b
Fix typos in compile and run-time tests of the sqlite library version number in rtree.c.
...
FossilOrigin-Name: f58d57017199421167dae8ebc67db2f19be45082
2013-11-11 19:56:35 +00:00
a9f5815b67
Add a way for virtual tables to return the expected number of rows for a scan (not just the overall cost) to SQLite. Have the rtree module make use of this.
...
FossilOrigin-Name: 5a3cfd747a85480d215784817c3821d87ecfa2f7
2013-11-11 19:01:33 +00:00
d6dd5def4d
Fix a bug preventing FTS from correctly processing bracket tokens that are immediately preceded by characters that are neither whitespace or token characters.
...
FossilOrigin-Name: 49be646cd981f8ff0434cf90d2748afa30260017
2013-11-04 08:56:22 +00:00
d63d4b7bd7
Merge all trunk changes since 3.8.1 into the sessions branch.
...
FossilOrigin-Name: aa72ea8a004de7fe744fc13baef19d05aea607d5
2013-10-28 22:47:24 +00:00
05684271c6
Improved header comment with better instructions on the vfslog.c
...
extension.
FossilOrigin-Name: 4bd592c8f0e011e203443a6e88008a61d6926df5
2013-10-19 16:51:39 +00:00
8f8b231239
Add the SQLITE_FCNTL_TRACE file control and generate it for OP_Trace
...
when compiled with SQLITE_USE_FCNTL_TRACE. Update vfslog.c to make
use of the new file control. Also update vfslog.c to log UNLOCK events
before the fact, rather than afterwards.
FossilOrigin-Name: e801f35a96d861a1e5f223655af4c8a6a7e356bc
2013-10-18 20:03:43 +00:00
06d6efb661
Further enhance the vfslog extension to record the number of freelist pages
...
and the first freelist page in CHNGCTR-READ and CHNGCTR-WRITE records.
FossilOrigin-Name: 08157524ca816a81f3c341097e23982727eaa125
2013-10-18 17:42:35 +00:00
2eebbf699e
In the vfslog extension for FILECONTROL records, show the pragma name for
...
SQLITE_FCNTL_PRAGMAs and the requested size for SQLITE_FCNTL_SIZE_HINT.
FossilOrigin-Name: f062969548da26850ceeb48d4283f6567f828887
2013-10-18 14:37:26 +00:00
d82d4750a8
Merge the latest trunk changes.
...
FossilOrigin-Name: 5806546822b717d712dc7cd9de88a86f5bf2f715
2013-10-16 14:32:47 +00:00
a4bbc8b119
Add the "languageid" hidden column to fts4aux.
...
FossilOrigin-Name: 891df358e51075fb937f34952ce43bf51130b0d0
2013-10-15 19:06:17 +00:00
9327c70f68
Merge the latest trunk changes into the sessions branch. This merge
...
should fix the build for WinRT.
FossilOrigin-Name: e111e4edf9d7b2d4d6d6673a7576801839e9537d
2013-10-15 14:10:44 +00:00
bc863b50ba
Fix harmless macro redefinition warnings in the totype extension.
...
FossilOrigin-Name: a38adeb7ffd77474754b66877d60717cdb3cb865
2013-10-15 10:43:04 +00:00
0593516fcc
Fix harmless compiler warning in the totype extension. Include all standard whitespace characters in totypeIsspace. Minor adjustments to style and comments.
...
FossilOrigin-Name: 73238f655a58c810876f46cc04eab1ac2d5b8ef7
2013-10-14 22:35:40 +00:00
5f8cdac620
Move the tointeger() and toreal() functions out of core and make them into
...
a run-time loadable extension.
FossilOrigin-Name: 9f66dd7e3790c04f0ab724419f5381bd21f9ebad
2013-10-14 21:14:42 +00:00
362d21614e
Fix a crash in FTS incremental phrase processing that can occur if the second or subsequent token is much more common in the dataset than the first.
...
FossilOrigin-Name: 0bf438fc30582a08fddfc3cec49366ee17ae2abe
2013-10-14 20:30:51 +00:00
b084582299
Fix harmless compiler warning.
...
FossilOrigin-Name: 4b130f88fba216e088f61252bbcdde57ec7ee6a9
2013-10-12 02:33:22 +00:00
4f99189051
Fix various harmless compiler warnings. Change the "warnings.sh" script to
...
work with STAT4 instead of STAT3.
FossilOrigin-Name: 7df06684ab36bfdad9e9aca6940b7a665c2a0cb5
2013-10-11 15:05:05 +00:00
a63b852992
Synchronize with the trunk.
...
FossilOrigin-Name: 136445ba020c9475d3f5a7843d7d0add98477138
2013-10-10 20:13:18 +00:00
a0cbd3fd17
Enhancements to the vfslog.c module to show all change-counter changes and
...
to show the hostname and pid of the process that creates each log file.
FossilOrigin-Name: af7abebeb1f70466833bc766d294d721eaef746f
2013-10-10 15:04:52 +00:00
919e3b3908
Another fix to the hash signature algorithm in vfslog.c.
...
FossilOrigin-Name: 34212aa8c405c4ff3f8045ec0cf2a860af61540f
2013-10-10 13:41:04 +00:00
7cd84ffc60
Fix the hash signature algorithm in vfslog.c. Add a utility program to
...
show the hash signatures for every page of a database file.
FossilOrigin-Name: eaf4de13a63b2294ae575432a022493308a4313a
2013-10-10 13:38:51 +00:00
30e2f0ae08
Add ext/misc/vfslog.c, a VFS shim for unix that keeps a log of method calls made by SQLite.
...
FossilOrigin-Name: 24a827b87666670c56d68a18685f4f712852fa92
2013-10-10 13:04:46 +00:00
86f72f0721
Fix compilation issue with MSVC.
...
FossilOrigin-Name: 36d64dc36f18c166b2c93c43579fa3bbb5cd545f
2013-10-07 21:49:16 +00:00
9211f8a6ce
Allow FTS4 multi-token phrases to use a combination of in-memory and incrementally loaded doclists. This allows phrases to (partially) benefit from incremental doclists without disabling the deferred token optimization.
...
FossilOrigin-Name: f6819c5f3363d358e7ef65fe6978f13991bd44af
2013-10-03 19:27:14 +00:00
eb26672d0e
Add a test to check that the new multi-token phrase optimization is actually helping.
...
FossilOrigin-Name: bc3a2ed5fb2402805928b0002457eebf06f87c47
2013-10-02 08:04:27 +00:00
ff574f4c76
Allow multi-token phrases to load doclists from the database incrementally. This allows queries that feature such phrases to benefit from the "docid<?" optimization.
...
FossilOrigin-Name: ea543f081d93ed1bf66c21ce2108ec94e349f4c5
2013-10-01 20:02:32 +00:00
73632e37c9
Merge trunk changes with this branch.
...
FossilOrigin-Name: e294a9c7c525d1da698259c2fef089579bfd1c0b
2013-09-30 18:16:07 +00:00
drh