In kvtest.c: do not show the --cache-size setting on fopen() runs.

Show progress for the (potentially slow) "export" command.

FossilOrigin-Name: b0f58d2470e08b9c217afd19fcfde3e6d1007d1d
This commit is contained in:
drh 2016-12-29 15:26:50 +00:00
parent 61c565f63b
commit 6739c692ba
3 changed files with 13 additions and 8 deletions

View File

@ -1,5 +1,5 @@
C Improvements\sto\sthe\skvtest.c\sutility.\s\sAdded\sthe\s--cache-size\soption.\nAdditional\sreporting\sof\sversion\sand\ssettings\sat\sthe\send\sof\s"./kvtest\srun".
D 2016-12-29T14:44:43.614
C In\skvtest.c:\sdo\snot\sshow\sthe\s--cache-size\ssetting\son\sfopen()\sruns.\nShow\sprogress\sfor\sthe\s(potentially\sslow)\s"export"\scommand.
D 2016-12-29T15:26:50.575
F Makefile.in 41bd4cad981487345c4a84081074bcdb876e4b2e
F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
F Makefile.msc b8ca53350ae545e3562403d5da2a69cec79308da
@ -894,7 +894,7 @@ F test/json101.test c0897616f32d95431f37fd291cb78742181980ac
F test/json102.test bf3fe7a706d30936a76a0f7a0375e1e8e73aff5a
F test/json103.test c5f6b85e69de05f6b3195f9f9d5ce9cd179099a0
F test/keyword1.test 37ef6bba5d2ed5b07ecdd6810571de2956599dff
F test/kvtest.c c3dac524f2eb0f73dbeea6c20f5154cfeaf17cbb
F test/kvtest.c b25f9fbcb2c1479b8df949ac2ce77362aaf86626
F test/lastinsert.test 42e948fd6442f07d60acbd15d33fb86473e0ef63
F test/laststmtchanges.test ae613f53819206b3222771828d024154d51db200
F test/like.test 0603f4fa0dad50987f70032c05800cbfa8985302
@ -1540,7 +1540,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
P 489e0787c1ea47963174387e8ade6295ceff568e
R a988144fafa83a0cd326685ae38da518
P f6fcac6ae8b3bffee6bf994eef2064affd301a95
R b185b854ef51d14c2b7ee5552cbd21ed
U drh
Z 4424d9424f7545651642c0148887a562
Z 874446abf963a27a56a6fa2b35a90f66

View File

@ -1 +1 @@
f6fcac6ae8b3bffee6bf994eef2064affd301a95
b0f58d2470e08b9c217afd19fcfde3e6d1007d1d

View File

@ -205,6 +205,7 @@ static void writefileFunc(
rc = fwrite(z, 1, sqlite3_value_bytes(argv[1]), out);
}
fclose(out);
printf("\r%s ", zFile); fflush(stdout);
sqlite3_result_int64(context, rc);
}
@ -241,6 +242,7 @@ static int exportMain(int argc, char **argv){
if( rc ) fatalError("database create failed: %s", zErrMsg);
sqlite3_free(zSql);
sqlite3_close(db);
printf("\n");
return 0;
}
@ -480,7 +482,10 @@ static int runMain(int argc, char **argv){
if( eType==PATH_DB ){
printf("SQLite version: %s\n", sqlite3_libversion());
}
printf("--count %d --max-id %d --cache-size %d", nCount-nExtra, iMax, iCache);
printf("--count %d --max-id %d", nCount-nExtra, iMax);
if( eType==PATH_DB ){
printf(" --cache-size %d", iCache);
}
switch( eOrder ){
case ORDER_RANDOM: printf(" --random\n"); break;
case ORDER_DESC: printf(" --desc\n"); break;