Add the --mmap option to the kvtest utility program.

FossilOrigin-Name: 4948f7e6d2a1cfce36a7aab2f5b65be07c285ac3

diff --git a/manifest b/manifest
index 3e45f5ecce940706008885dcf644523c9df628ea..d96fa45b3ed529483c038176e3a81d2e806d1d0e 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Optimization:\sTry\sto\savoid\sunnecessary\sbtree\ssearching\swhen\srepositioning\s\na\scursor\sto\sthe\snext\srow.
-D 2017-01-23T16:56:18.240
+C Add\sthe\s--mmap\soption\sto\sthe\skvtest\sutility\sprogram.
+D 2017-01-23T18:40:15.799
 F Makefile.in 41bd4cad981487345c4a84081074bcdb876e4b2e
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc b8ca53350ae545e3562403d5da2a69cec79308da
@@ -898,7 +898,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 9f0efc313b7bbef9022e9e3fe699d99f5bdc7efa
+F test/kvtest.c 87e6e974eb9e1502e00e77bc2831f3c9174a6dfb
 F test/lastinsert.test 42e948fd6442f07d60acbd15d33fb86473e0ef63
 F test/laststmtchanges.test ae613f53819206b3222771828d024154d51db200
 F test/like.test 0603f4fa0dad50987f70032c05800cbfa8985302
@@ -1547,8 +1547,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 7a4f512ddf9e7e718389c80930d6268ab598459c 2c4ecb85a475b9063aa8a3bb517ac181a7ded649
-R 29a4885c53e914cde79778fd2e323ab3
-T +closed 2c4ecb85a475b9063aa8a3bb517ac181a7ded649
+P ee793d30c1dc1f78f49e6230d17750eceedbd8ed
+R c50065d103fe6e8d8104ae7a368dc7b9
 U drh
-Z 5710c3bf174cb3e3f9b43957024c6c5f
+Z a1392fb7660aa1d68b81ecf426bbd2cf

diff --git a/manifest.uuid b/manifest.uuid
index 2e7c43d7572f70ce661be296ae6670ef1fb010b1..28766bd75abb5cfb12ea7ff3fe815606ee07787c 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-ee793d30c1dc1f78f49e6230d17750eceedbd8ed
\ No newline at end of file
+4948f7e6d2a1cfce36a7aab2f5b65be07c285ac3
\ No newline at end of file

diff --git a/test/kvtest.c b/test/kvtest.c
index 6847d03a445da17f9e279ccf980f339073cc4b5a..f87e4940ef86ebd0413616048d5d4e6d7b75f0ad 100644 (file)
--- a/test/kvtest.c
+++ b/test/kvtest.c
@@ -513,6 +513,7 @@ static int runMain(int argc, char **argv){
   sqlite3_blob *pBlob = 0;    /* Handle for incremental Blob I/O */
   sqlite3_int64 tmStart;      /* Start time */
   sqlite3_int64 tmElapsed;    /* Elapsed time */
+  int mmapSize = 0;           /* --mmap N argument */
   int nData = 0;              /* Bytes of data */
   sqlite3_int64 nTotal = 0;   /* Total data read */
   unsigned char *pData = 0;   /* Content of the blob */
@@ -535,6 +536,12 @@ static int runMain(int argc, char **argv){
       if( nCount<1 ) fatalError("the --count must be positive");
       continue;
     }
+    if( strcmp(z, "-mmap")==0 ){
+      if( i==argc-1 ) fatalError("missing argument on \"%s\"", argv[i]);
+      mmapSize = atoi(argv[++i]);
+      if( nCount<0 ) fatalError("the --mmap must be non-negative");
+      continue;
+    }
     if( strcmp(z, "-max-id")==0 ){
       if( i==argc-1 ) fatalError("missing argument on \"%s\"", argv[i]);
       iMax = atoi(argv[++i]);
@@ -581,6 +588,8 @@ static int runMain(int argc, char **argv){
     if( rc ){
       fatalError("cannot open database \"%s\": %s", zDb, sqlite3_errmsg(db));
     }
+    zSql = sqlite3_mprintf("PRAGMA mmap_size=%d", mmapSize);
+    sqlite3_exec(db, zSql, 0, 0, 0);
     zSql = sqlite3_mprintf("PRAGMA cache_size=%d", iCache);
     sqlite3_exec(db, zSql, 0, 0, 0);
     sqlite3_free(zSql);