Add the SQLITE_TESTCTRL_PGHDRSZ verb for sqlite3_test_control() used to get

the size of pcache headers for testing purposes.

FossilOrigin-Name: 5d694f04fecf47ca325e108d463c24f42def55d5

diff --git a/manifest b/manifest
index f7c61d0ed00bbe6a6988f816d1e6b33b7f95df2b..e70f2328b28c8df5dd43c42b0a6d0506626ed79a 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,8 +1,8 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-C Update\sthe\stest\sVFS\sin\stest_journal.c\sso\sthat\sit\simplements\sthe\nxCurrentTimeInt64\smethod.
-D 2010-06-10T10:51:27
+C Add\sthe\sSQLITE_TESTCTRL_PGHDRSZ\sverb\sfor\ssqlite3_test_control()\sused\sto\sget\nthe\ssize\sof\spcache\sheaders\sfor\stesting\spurposes.
+D 2010-06-10T14:07:40
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in a5cad1f8f3e021356bfcc6c77dc16f6f1952bbc3
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -136,7 +136,7 @@ F src/journal.c b0ea6b70b532961118ab70301c00a33089f9315c
 F src/legacy.c a199d7683d60cef73089e892409113e69c23a99f
 F src/lempar.c 7f026423f4d71d989e719a743f98a1cbd4e6d99e
 F src/loadext.c 1c7a61ce1281041f437333f366a96aa0d29bb581
-F src/main.c 0939e4b49e5b7e2dc0669bc3ac98963e1b599996
+F src/main.c 4b55bb32a344b50a5388ba2636b83a3fd33dc3d5
 F src/malloc.c a08f16d134f0bfab6b20c3cd142ebf3e58235a6a
 F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
 F src/mem1.c 89d4ea8d5cdd55635cbaa48ad53132af6294cbb2
@@ -171,7 +171,7 @@ F src/resolve.c ac5f1a713cd1ae77f08b83cc69581e11bf5ae6f9
 F src/rowset.c 69afa95a97c524ba6faf3805e717b5b7ae85a697
 F src/select.c c03d8a0565febcde8c6a12c5d77d065fddae889b
 F src/shell.c fd4ccdb37c3b68de0623eb938a649e0990710714
-F src/sqlite.h.in 60f4fcfe18bcb53ed0002989837b68aeeba79a5e
+F src/sqlite.h.in b6a64327e174cf725e57dd93ddf1e97c52dd41e2
 F src/sqlite3ext.h 69dfb8116af51b84a029cddb3b35062354270c89
 F src/sqliteInt.h 242987ebd2366ea36650a09cdab04a9163c62109
 F src/sqliteLimit.h 196e2f83c3b444c4548fc1874f52f84fdbda40f3
@@ -821,14 +821,14 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P 0ce42e76654d9ba52dac74c940d38b17866016ba
-R 0231deccb58b66a7f42390de50d754a2
+P ec3b4a7e5d3d7bd737d356b8a09ce94f8f0f8ce0
+R 5f2583eb28458bacc394a71cd8410e2c
 U drh
-Z ed04779b5d04855d224eb604c116e907
+Z 7820edb3e30c3452cb52c3f3c0c7b425
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFMEMOzoxKgR168RlERAvo4AJ9qvdapbiEhrE9QM+cunPtPh/F5XACfcZRl
-A9HHJfwejiuEgon9WFsTIWc=
-=JQVb
+iD8DBQFMEPGvoxKgR168RlERAj5CAJ9PF/oC4ZPpIPJgFi9WJQ0rwHJ+SQCeNpYh
+a8OEvjx4bNDteUxVRu7mPN0=
+=yAYU
 -----END PGP SIGNATURE-----

diff --git a/manifest.uuid b/manifest.uuid
index 386b479529d4e373e4eb05d3a91d93013bf2e314..47c88028dd46def479c5dab7380ae00d31edece1 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-ec3b4a7e5d3d7bd737d356b8a09ce94f8f0f8ce0
\ No newline at end of file
+5d694f04fecf47ca325e108d463c24f42def55d5
\ No newline at end of file

diff --git a/src/main.c b/src/main.c
index 45a486c48c2bc1d19507824a2f8a8dd306c854c3..517acad55a924463c67daf08deee2db9f6b3ca37 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -2491,6 +2491,15 @@ int sqlite3_test_control(int op, ...){
     }
 #endif 
 
+    /* sqlite3_test_control(SQLITE_TESTCTRL_PGHDRSZ)
+    **
+    ** Return the size of a pcache header in bytes.
+    */
+    case SQLITE_TESTCTRL_PGHDRSZ: {
+      rc = sizeof(PgHdr);
+      break;
+    }
+
   }
   va_end(ap);
 #endif /* SQLITE_OMIT_BUILTIN_TEST */

diff --git a/src/sqlite.h.in b/src/sqlite.h.in
index 952f389544ef3fc7705c00518f1ae7757f39b837..e583e47d953f097ca53467b965f5bfb380b58e4f 100644 (file)
--- a/src/sqlite.h.in
+++ b/src/sqlite.h.in
@@ -5060,7 +5060,8 @@ int sqlite3_test_control(int op, ...);
 #define SQLITE_TESTCTRL_RESERVE                 14
 #define SQLITE_TESTCTRL_OPTIMIZATIONS           15
 #define SQLITE_TESTCTRL_ISKEYWORD               16
-#define SQLITE_TESTCTRL_LAST                    16
+#define SQLITE_TESTCTRL_PGHDRSZ                 17
+#define SQLITE_TESTCTRL_LAST                    17
 
 /*
 ** CAPI3REF: SQLite Runtime Status