Update the test VFS in test_journal.c so that it implements the

xCurrentTimeInt64 method.

FossilOrigin-Name: ec3b4a7e5d3d7bd737d356b8a09ce94f8f0f8ce0

diff --git a/manifest b/manifest
index d46b2c1200ca6d95e20cd08c54bca2c904d9e067..f7c61d0ed00bbe6a6988f816d1e6b33b7f95df2b 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,8 @@
-C Store\sthe\sMemPage\sstructure\sin\smemory\sfollowing,\sinstead\sof\spreceding,\sthe\spage\sdata\sfor\scached\spages.\sThis\sreduces\sthe\slikelihood\sof\sa\scorrupt\sdatabase\spage\simage\scausing\sSQLite\sto\sread\spast\sthe\send\sof\sa\sbuffer.
-D 2010-06-10T06:53:27
+-----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
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in a5cad1f8f3e021356bfcc6c77dc16f6f1952bbc3
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -196,7 +199,7 @@ F src/test_hexio.c 1237f000ec7a491009b1233f5c626ea71bce1ea2
 F src/test_init.c 5d624ffd0409d424cf9adbfe1f056b200270077c
 F src/test_intarray.c d879bbf8e4ce085ab966d1f3c896a7c8b4f5fc99
 F src/test_intarray.h 489edb9068bb926583445cb02589344961054207
-F src/test_journal.c 51da4dd6118ee843349592fde29429fab84a6243
+F src/test_journal.c 044c1a53ec4dd6f0dde66727b154cd099f5f34d1
 F src/test_loadext.c df586c27176e3c2cb2e099c78da67bf14379a56e
 F src/test_malloc.c 2842c922b8e8d992aba722214952204ca025b411
 F src/test_mutex.c ce06b59aca168cd8c520b77159a24352a7469bd3
@@ -818,7 +821,14 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P 7abcd54ec09e8025193d1e0ea57775051d823801
-R 31070636553ae76b50ea1052e3aa5bdb
-U dan
-Z e8833716b224a38eb8684e00df026f78
+P 0ce42e76654d9ba52dac74c940d38b17866016ba
+R 0231deccb58b66a7f42390de50d754a2
+U drh
+Z ed04779b5d04855d224eb604c116e907
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.6 (GNU/Linux)
+
+iD8DBQFMEMOzoxKgR168RlERAvo4AJ9qvdapbiEhrE9QM+cunPtPh/F5XACfcZRl
+A9HHJfwejiuEgon9WFsTIWc=
+=JQVb
+-----END PGP SIGNATURE-----

diff --git a/manifest.uuid b/manifest.uuid
index 898440cd6bc05abd5a5bfc235f5d06623d04cfe8..386b479529d4e373e4eb05d3a91d93013bf2e314 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-0ce42e76654d9ba52dac74c940d38b17866016ba
\ No newline at end of file
+ec3b4a7e5d3d7bd737d356b8a09ce94f8f0f8ce0
\ No newline at end of file

diff --git a/src/test_journal.c b/src/test_journal.c
index c4bc5d094c5b4f0518ed304f55a6084a8061010c..17166f780e50eded08b01c7f425134a4f3214559 100644 (file)
--- a/src/test_journal.c
+++ b/src/test_journal.c
@@ -161,9 +161,10 @@ static void jtDlClose(sqlite3_vfs*, void*);
 static int jtRandomness(sqlite3_vfs*, int nByte, char *zOut);
 static int jtSleep(sqlite3_vfs*, int microseconds);
 static int jtCurrentTime(sqlite3_vfs*, double*);
+static int jtCurrentTimeInt64(sqlite3_vfs*, sqlite3_int64*);
 
 static sqlite3_vfs jt_vfs = {
-  1,                             /* iVersion */
+  2,                             /* iVersion */
   sizeof(jt_file),               /* szOsFile */
   JT_MAX_PATHNAME,               /* mxPathname */
   0,                             /* pNext */
@@ -180,6 +181,9 @@ static sqlite3_vfs jt_vfs = {
   jtRandomness,                  /* xRandomness */
   jtSleep,                       /* xSleep */
   jtCurrentTime,                 /* xCurrentTime */
+  0,                             /* xGetLastError */
+  0,                             /* xRename */
+  jtCurrentTimeInt64             /* xCurrentTimeInt64 */
 };
 
 static sqlite3_io_methods jt_io_methods = {
@@ -803,6 +807,12 @@ static int jtSleep(sqlite3_vfs *pVfs, int nMicro){
 static int jtCurrentTime(sqlite3_vfs *pVfs, double *pTimeOut){
   return g.pVfs->xCurrentTime(g.pVfs, pTimeOut);
 }
+/*
+** Return the current time as a Julian Day number in *pTimeOut.
+*/
+static int jtCurrentTimeInt64(sqlite3_vfs *pVfs, sqlite3_int64 *pTimeOut){
+  return g.pVfs->xCurrentTimeInt64(g.pVfs, pTimeOut);
+}
 
 /**************************************************************************
 ** Start of public API.
@@ -821,6 +831,11 @@ int jt_register(char *zWrap, int isDefault){
     return SQLITE_ERROR;
   }
   jt_vfs.szOsFile = sizeof(jt_file) + g.pVfs->szOsFile;
+  if( g.pVfs->iVersion==1 ){
+    jt_vfs.iVersion = 1;
+  }else if( g.pVfs->xCurrentTimeInt64==0 ){
+    jt_vfs.xCurrentTimeInt64 = 0;
+  }
   sqlite3_vfs_register(&jt_vfs, isDefault);
   return SQLITE_OK;
 }