e780764b4e
Fix the fts3EvalAverageDocsize() routine so that it returns errors from
...
sqlite3_reset() rather than always returning SQLITE_OK.
FossilOrigin-Name: 430f539cbb3f806fb89191e0b759a5f8b49d9e5b6c95fe9a4b55a1aa0875762a
2017-05-02 18:00:31 +00:00
6f92c34866
Update this branch with latest trunk changes.
...
FossilOrigin-Name: 11f4761c3a84e2cc9df62f117a003af8c57f3d226eec5a40d6241b121e78d002
2017-05-01 14:25:34 +00:00
b9e6a73866
Replace <fts5.h> with "fts5.h" in test file fts5_test_tok.c.
...
FossilOrigin-Name: 63d9ca5c7392e1efe3330689fe750310a952287e843b3242178724e8561fae0e
2017-04-26 14:34:04 +00:00
f3ac8ba569
Another minor formatting fix.
...
FossilOrigin-Name: 9fa2ce3c2b75408594d387684984cd946765776d30bc622a1f4e64d6fe1856d5
2017-04-21 19:58:35 +00:00
6b0fa916f5
Fix formatting errors in the previous commit.
...
FossilOrigin-Name: da9a2e5aa977f7e8e9e4365f7b34bb4f482029a3d44646100773cedc8ea9b959
2017-04-21 19:56:53 +00:00
5b9dbd1ed0
Update the README.md file in the ext/expert/ directory.
...
FossilOrigin-Name: 3b2ff4e0692dfca395d4523b7d5cd0dfd5c319c1072a2a873631fa477cee0b79
2017-04-21 19:53:39 +00:00
0619838c55
Fix an FTS5 bug that could cause a prefix-query without a prefix-index on a
...
database that contains delete-markers to return extra, non-matching, rows.
FossilOrigin-Name: 840042cb2bed2924e2263f21887317f661e5a585c4466c3af25b91ed57a6b49b
2017-04-21 16:04:18 +00:00
c42a0056d7
Merge latest trunk changes into this branch.
...
FossilOrigin-Name: b1533bc455f52f570c0f4b8aaa0da802757dc89b0e45b9a9b31aa591a44bf7bd
2017-04-20 17:35:46 +00:00
bc3f784cd2
Speed this branch up a bit by filtering before the virtual table layer when
...
sampling user data.
FossilOrigin-Name: 8e57c31340dd9ffc457da63c5996fb1b573f8154f864ec2b52c15f399906ac8b
2017-04-20 16:43:32 +00:00
2ed99def5b
Avoid creating a temp table in the user database in the sqlite3_expert code.
...
Trouble is, this makes sampling for stat1 data much slower.
FossilOrigin-Name: c62e358243d96cb38a7ce2aa679fc640b62bf46080eab4bd5fc2acf5997d6cd5
2017-04-20 16:08:33 +00:00
e53b4f9774
Add an option to generate stat1 data based on a subset of the user database
...
table contents to sqlite3_expert.
FossilOrigin-Name: c69c3e21db6e141f7e24226c6432f2ed31fe5f177bd23781915871f8600ee56a
2017-04-20 09:54:04 +00:00
dc62daca86
Further improvements to coverage of fts3 module.
...
FossilOrigin-Name: 6b21d0fdebdccfaf63590d9ca9a279c22b8baec07c1a669b9f617f25bd857384
2017-04-19 13:25:45 +00:00
a059e99ca8
Further modifications and test cases to improve test coverage of fts3.
...
FossilOrigin-Name: ea8a0d2ce0cb1ca3f4f18c72fb780d1c26792799acc87e6726f9eaccf2f178bf
2017-04-19 07:33:52 +00:00
a6ed5a4f39
Have sqlite3_expert_analyze() populate the sqlite_stat1 table before running
...
queries through the planner for the second time.
FossilOrigin-Name: a157fcfde5afc27ae38e7cf4669fcc8e60e23d9d301ffe2e541dd69f895b493b
2017-04-18 20:10:16 +00:00
0027e98b85
Use sqlite3_table_column_metadata() instead of a SELECT statement to check for
...
the existence of a %_stat table in fts3. This leads to smaller and easier to
test code.
FossilOrigin-Name: dc2a48020a3c856a8b4cfa2309c290f0508b991e92cc0e4de680d19aae7872fc
2017-04-18 13:50:00 +00:00
7853002c71
Fix sqlite3_expert handling of triggers on views.
...
FossilOrigin-Name: ff4976da667872614331d88e68fb67d347874f164a1c7950dd738c7c2320b954
2017-04-18 09:04:48 +00:00
bda00fbdb7
Refactor the fts3ColumnMethod() function so that all branches can be covered.
...
FossilOrigin-Name: e47fdb493bd76d85f6f05771ee7a0b3ee31b1eb05839a60d2bdb47149ac692d8
2017-04-18 05:49:23 +00:00
280db65e2c
Add support for analyzing trigger programs to the sqlite3_expert code.
...
FossilOrigin-Name: 159e8022a9d6701532b8b60e0c41154bc434c1bbdb107c8c97a78fb1140fa745
2017-04-17 17:03:08 +00:00
624edacf6a
Further improvements to test coverage in fts3.
...
FossilOrigin-Name: 352413eed469802665e7d2c17b7fe6e3a0b0b2209ce45bdc85fd4243cec50ea6
2017-04-17 16:07:25 +00:00
ddf4747053
Improve coverage of code in fts3.
...
FossilOrigin-Name: 1a08a836fa919524216a16faf5212eebc9ad788c9e15463b68b0576dfccd4387
2017-04-17 13:38:09 +00:00
b65b3e429a
Add the anycollseq.c loadable extension in etc/misc
...
FossilOrigin-Name: d7b9813cb17615c3d00afd6994a4309d6d48c8e924b6cd813c543e1fa65c7719
2017-04-16 22:08:31 +00:00
2abf90096f
Fix problems with handling constraints on the rowid column in sqlite3expert.c.
...
FossilOrigin-Name: 2e6308798ae2db30564deb35ba3896597448edabbcac6efc4ff084552e42de30
2017-04-15 16:52:12 +00:00
990b6ceccf
Merge latest trunk changes into this branch.
...
FossilOrigin-Name: 2d0c458e013cb2d02fbeabed8dabd66f55141aac194611f0e599b3c95af1964f
2017-04-15 15:47:19 +00:00
79610f5d09
Fix memory leaks in the code on this branch. Make use of the
...
sqlite3_index_constraint.usage field. Do not try to handle ORDER BY terms with
explicit COLLATE clauses - they don't get passed to the vtab layer anyway.
FossilOrigin-Name: 0cd75a872c89958a7f418720a0e8c6f638f8284c488f666015c19136feae6be8
2017-04-15 14:16:04 +00:00
0824ccf29b
Modify the code in ext/expert/ to use the vtab interface instead of
...
sqlite3_whereinfo_hook(). Remove sqlite3_whereinfo_hook().
FossilOrigin-Name: 3bb6585004090dbf92dd5e9abdf0fd2c921e64b5b3121c4fb7446db764ab59e5
2017-04-14 19:41:37 +00:00
b1ed717f18
Make USE_FULLWARN=1 the default for MSVC and fix harmless compiler warnings.
...
FossilOrigin-Name: 6bf673767b8e5cedef1acff795cbe524fab8db2525c06424db4e038934a33936
2017-04-14 14:50:34 +00:00
81beb6d115
Update this branch with latest changes from trunk.
...
FossilOrigin-Name: 5fcd840cf9b6a5c3ee4ef1e8f92f6c30f96a7899a3d774ee9be8a816916f2c3b
2017-04-13 16:19:40 +00:00
929b695111
Allow a user column name to be used on the LHS of a MATCH operator in FTS5.
...
FossilOrigin-Name: 6f54ffd151b0eca6f9ef57ac54802584a839cfc7373f10c100fc18c855edcc0a
2017-04-13 09:45:21 +00:00
8671538cad
Fix a regression caused by the fix for ticket [6c9b5514077fed34551f98e64c09a1] -
...
control characters allowed in JSON.
FossilOrigin-Name: 8e7b611863247a3bf46a96ec4b47d24c0ae0d60c9cee968a1cfd1da157e7c9bb
2017-04-13 00:12:32 +00:00
03155f659f
Update fts5 to support "<colset> : ( <expr> )" for column filtering, as well
...
as "<colset> : NEAR(...)" and "<colset> : <phrase>".
FossilOrigin-Name: c847543f8bb1376fef52bca72b4191162a32eb7e6c5f0cd1aa0ab116b3183396
2017-04-12 17:50:12 +00:00
26849e14c2
Improved \n and \r escapes in the ext/misc/dbdump.c utility function. The
...
implementation of dbdump.c now matches the implementation in the CLI.
FossilOrigin-Name: f2643315bb41a71eebd79f5d671f9163187e299a52ff8a481186f1e8fa7e5262
2017-04-12 17:38:24 +00:00
0e0f5edbb5
Update this branch with latest trunk changes.
...
FossilOrigin-Name: 0f66a093935100efd731e14aa63b57360ddd517c1ac97edd1ea9a9de95e1f3cc
2017-04-11 19:00:30 +00:00
ff6d50e973
Limit the depth of recursion for valid JSON in the JSON1 extension in order
...
to avoid using excess stack space in the recursive descent parser.
Fix for ticket [981329adeef51011052667a9].
FossilOrigin-Name: 1f68c184596912d742b50b1ca38252a9e783aacf121619a27b17a7ae9f6df041
2017-04-11 18:55:05 +00:00
c2309693b9
Fix a formatting issue in the output of the sqlite3_expert program.
...
FossilOrigin-Name: cc8c3581060ffef02290b680183e6f6bc9837ba3550e74c8aaabdc7c45edc223
2017-04-11 18:29:14 +00:00
a4e61024d7
Add header comments to the API functions in sqlite3expert.h. Include a list of
...
all candidate indexes in the report output by the sqlite3_expert program.
FossilOrigin-Name: 0c45c5eb9f0f171b8d7c5f0d2973f9f59915467506cdff1450f3e4b2134a01ca
2017-04-11 17:43:12 +00:00
96d43a05ec
Add ext/expert/README.md.
...
FossilOrigin-Name: 9318f1b9ed2d8da3a82ea69179e2d56a99d326c7721642665f87f6a4534e7bf0
2017-04-10 20:00:26 +00:00
cd84474ece
Changes to allow the code in sqlite3expert.c to be tested directly (via the
...
API in sqlite3expert.h) instead of by invoking the sqlite3_expert application.
Fix memory leaks and other problems.
FossilOrigin-Name: 5dd9831721b70a89a26728adcd49c7f6103ef8266891a79c2db34d913702709e
2017-04-10 16:13:20 +00:00
e12e24ded8
Change the JSON extension so that it disallows control characters inside of
...
strings. Fix for ticket [6c9b5514077fed34551f98e64c09a10dc2fc8e16].
FossilOrigin-Name: 475d8f82ec61a4ff3e6a7650731230ccecb6cc580d1397d189d0ba479d9bad4d
2017-04-10 12:25:05 +00:00
958151b005
Fix the -file option on the sqlite3_expert program.
...
FossilOrigin-Name: 0857c48e02a76490fc623364f77363165dea94ec254f93d8f0fd0bac2968c572
2017-04-09 08:38:37 +00:00
2b78dd2359
Merge latest trunk with this branch.
...
FossilOrigin-Name: e051e8f21b909c5e89a7203eef6501fecd64f82a634c4e10398b5ef7d716eb37
2017-04-08 19:00:37 +00:00
e7c3aca601
Rename shell6.test to expert1.test. Have it invoke the sqlite3_expert binary
...
if it is present.
FossilOrigin-Name: be0deff940bea4f653d644113f42529a32ff7039d1d168119233aaf000a22f40
2017-04-08 18:56:32 +00:00
9fa866a8d9
Disallow leading zeros on numeric constants in JSON.
...
Fix for ticket [b93be8729a895a528e2]
FossilOrigin-Name: 204e72f0080e8f08f99978870bd3cb9d59b068ecffee82192d707c650548b43b
2017-04-08 18:18:22 +00:00
65e67ed1b2
Use hash tables instead of in-memory database tables for a few purposes in
...
sqlite3expert.c.
FossilOrigin-Name: bf10e68d9e4d5eae7ae6148a7ad64c9596f2ed8ccd36065adb09a1f9e7dae50b
2017-04-08 17:41:24 +00:00
5b09d13a58
Have the rtree module close any open blob-handle within the xSavepoint method.
...
This prevents such an open blob handle from interfering with DROP TABLE
operations.
FossilOrigin-Name: fa4416adc2a9a3a80db1d5befc0b95c3d0fc41affe38f7f2f45cdfae3f1b49eb
2017-04-08 13:52:41 +00:00
be0bc8bb4d
Have fts5 close any open blob-handle when a new savepoint is opened. This
...
ensures that fts5 does not prevent DROP TABLE statements (which always open a
savepoint) from succeeding.
FossilOrigin-Name: a921ada89050ce1d162fd1b0056939573635e2cec7ac0c2a99ae924b3ae593f7
2017-04-08 09:12:20 +00:00
297e2bdb8e
Make sure the RTree sqlite3_blob handle is reset prior to renaming the table.
...
FossilOrigin-Name: 1cdae2db3c54970a1811e597065724578408c84d49d75b8fe25d56281ddc2e94
2017-04-08 01:09:14 +00:00
8e0b8e0688
Refactor code to suggest indexes from the shell tool into an extension in
...
ext/expert. Unfinished.
FossilOrigin-Name: 305e19f976ca064638a294e0817bf547ea745e1eb74746c5855514e6ced9c5fa
2017-04-07 20:14:22 +00:00
2fb79e9b04
Fix two harmless compiler warnings.
...
FossilOrigin-Name: 32be9c3faaafd736da3f49d475dc9279af4e4ba38070b60033d898345080acf0
2017-03-25 12:08:11 +00:00
ba7cce317b
Fix a harmless compiler warning in the JSON1 extension.
...
FossilOrigin-Name: c2c3dd84534bb5ea81c974847b74a166c9cba1545fc749ce625929f303bf22e4
2017-03-24 19:45:05 +00:00
29c9969871
Fix an error in the new json_patch() routine discovered by Ralf Junker.
...
FossilOrigin-Name: 9d5350418b2f6113e0b50c57e8a872006f27753067baf08ffdfa7943c0c9a148
2017-03-24 12:35:17 +00:00
drh