Add a simple test program to aid in verifying that journals are cross-platform.

FossilOrigin-Name: a65a7a59d19a64ba1aec388d23ada79aaaaa6f26

diff --git a/manifest b/manifest
index db85daef0fa4622863df0c0f11b40b02299b6fcc..58e27e385210f447821e0edec350f4f7a4018cc9 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\stest\sfile\sunordered.test.
-D 2011-04-09T19:17:49.275
+C Add\sa\ssimple\stest\sprogram\sto\said\sin\sverifying\sthat\sjournals\sare\scross-platform.
+D 2011-04-10T16:39:23.788
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 7a4d9524721d40ef9ee26f93f9bd6a51dba106f2
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -910,6 +910,7 @@ F tool/mksqlite3internalh.tcl 7b43894e21bcb1bb39e11547ce7e38a063357e87
 F tool/omittest.tcl b1dd290c1596e0f31fd335160a74ec5dfea3df4a
 F tool/opcodeDoc.awk b3a2a3d5d3075b8bd90b7afe24283efdd586659c
 F tool/restore_jrnl.tcl 6957a34f8f1f0f8285e07536225ec3b292a9024a
+F tool/rollback-test.c 9fc98427d1e23e84429d7e6d07d9094fbdec65a5
 F tool/shell1.test f608a009b04c490fd360c5ded458a6f98b4e7ec4
 F tool/shell2.test 5dc76b8005b465f420fed8241621da7513060ff3
 F tool/shell3.test 4fad469e8003938426355afdf34155f08c587836
@@ -928,7 +929,7 @@ F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/split-sqlite3c.tcl d9be87f1c340285a3e081eb19b4a247981ed290c
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P 1c2f0f8477bcf251fe874a2cfae4d7a403cb88ff
-R 59d7eb60fa0b4547dfa6a4784c13a2a7
-U dan
-Z a2cc3dbbe88eab08901d5042b741714e
+P f346dae1278b5b0cc0cd8e05aa3b4d8f70d2dc1d
+R 787af88c88556ef35e242179ba67cd89
+U drh
+Z 78bbdd619a80aac136302ef91f42dd4a

diff --git a/manifest.uuid b/manifest.uuid
index 65f7954e8775e0be6cc0b716f6e6af79d2719ec0..cc1106fe1b9a19dcf88344f321bae5a175f694a2 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-f346dae1278b5b0cc0cd8e05aa3b4d8f70d2dc1d
\ No newline at end of file
+a65a7a59d19a64ba1aec388d23ada79aaaaa6f26
\ No newline at end of file

diff --git a/tool/rollback-test.c b/tool/rollback-test.c
new file mode 100644 (file)
index 0000000..915d9d2
--- /dev/null
+++ b/tool/rollback-test.c
@@ -0,0 +1,155 @@
+/*
+** This program is used to generate and verify databases with hot journals.
+** Use this program to generate a hot journal on one machine and verify
+** that it rolls back correctly on another machine with a different
+** architecture.
+**
+** Usage:
+**
+**     rollback-test new [-utf8] [-utf16le] [-utf16be] [-pagesize=N] DATABASE
+**     rollback-test check DATABASE
+**     rollback-test crash [-wal] [-rollback] DATABASE
+*/
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include "sqlite3.h"
+
+static void usage(char *argv0){
+  fprintf(stderr,
+    "Usage: %s new [-utf8] [-utf16le] [-utf16be] [-pagesize=N] DATABASE\n"
+    "       %s check DATABASE\n"
+    "       %s crash [-wal] DATABASE\n",
+    argv0, argv0, argv0
+  );
+  exit(1);
+}
+
+static sqlite3 *openDb(const char *zFilename){
+  int rc;
+  sqlite3 *db;
+  rc = sqlite3_open(zFilename, &db);
+  if( rc ){
+    fprintf(stderr, "Cannot open \"%s\": %s\n",
+            zFilename, sqlite3_errmsg(db));
+    sqlite3_close(db);
+    exit(1);
+  }
+  return db;
+}
+
+static int nReply = 0;
+static char zReply[1000];
+
+static int execCallback(void *NotUsed, int nArg, char **azArg, char **azCol){
+  int i, n;
+  char *z;
+  for(i=0; i<nArg; i++){
+    z = azArg[i];
+    if( z==0 ) z = "NULL";
+    if( nReply>0 && nReply<sizeof(zReply)-1 ) zReply[nReply++] = ' ';
+    n = strlen(z);
+    if( nReply+n>=sizeof(zReply)-1 ) n = sizeof(zReply) - nReply - 1;
+    memcpy(&zReply[nReply], z, n);
+    nReply += n;
+    zReply[nReply] = 0;
+  }
+  return 0;
+}
+
+static void runSql(sqlite3 *db, const char *zSql){
+  char *zErr = 0;
+  int rc;
+  nReply = 0;
+  rc = sqlite3_exec(db, zSql, execCallback, 0, &zErr);
+  if( zErr ){
+    fprintf(stderr, "SQL error: %s\n", zErr);
+    exit(1);
+  }
+  if( rc ){
+    fprintf(stderr, "SQL error: %s\n", sqlite3_errmsg(db));
+    exit(1);
+  }
+}
+
+int main(int argc, char **argv){
+  sqlite3 *db;
+  int i;
+
+  if( argc<3 ) usage(argv[0]);
+  if( strcmp(argv[1], "new")==0 ){
+    db = openDb(argv[argc-1]);
+    for(i=2; i<argc-1; i++){
+      if( strcmp(argv[i],"-utf8")==0 ){
+        runSql(db, "PRAGMA encoding=UTF8");
+      }else if( strcmp(argv[i], "-utf16le")==0 ){
+        runSql(db, "PRAGMA encoding=UTF16LE");
+      }else if( strcmp(argv[i], "-utf16be")==0 ){
+        runSql(db, "PRAGMA encoding=UTF16BE");
+      }else if( strncmp(argv[i], "-pagesize=", 10)==0 ){
+        int szPg = atoi(&argv[i][10]);
+        char zBuf[100];
+        sprintf(zBuf, "PRAGMA pagesize=%d", szPg);
+        runSql(db, zBuf);
+      }else{
+        fprintf(stderr, "unknown option %s\n", argv[i]);
+        usage(argv[0]);
+      }
+    }
+    runSql(db, 
+       "BEGIN;"
+       "CREATE TABLE t1(x INTEGER PRIMARY KEY, y);"
+       "INSERT INTO t1(y) VALUES('abcdefghijklmnopqrstuvwxyz');"
+       "INSERT INTO t1(y) VALUES('abcdefghijklmnopqrstuvwxyz');"
+       "INSERT INTO t1(y) SELECT y FROM t1;" /* 4 */
+       "INSERT INTO t1(y) SELECT y FROM t1;" /* 8 */
+       "INSERT INTO t1(y) SELECT y FROM t1;" /* 16 */
+       "INSERT INTO t1(y) SELECT y FROM t1;" /* 32 */
+       "INSERT INTO t1(y) SELECT y FROM t1;" /* 64 */
+       "INSERT INTO t1(y) SELECT y FROM t1;" /* 128 */
+       "INSERT INTO t1(y) SELECT y FROM t1;" /* 256 */
+       "INSERT INTO t1(y) SELECT y FROM t1;" /* 512 */
+       "INSERT INTO t1(y) SELECT y FROM t1;" /* 1024 */
+       "UPDATE t1 SET y=(y || x);"
+       "CREATE INDEX t1y ON t1(y);"
+       "COMMIT;"
+    );
+    sqlite3_close(db);
+  }else if( strcmp(argv[1], "check")==0 ){
+    db = openDb(argv[argc-1]);
+    runSql(db, "PRAGMA integrity_check");
+    if( strcmp(zReply, "ok")!=0 ){
+      fprintf(stderr, "Integrity check: %s\n", zReply);
+      exit(1);
+    }
+    runSql(db, 
+      "SELECT count(*) FROM t1 WHERE y<>('abcdefghijklmnopqrstuvwxyz' || x)"
+    );
+    if( strcmp(zReply, "0")!=0 ){
+      fprintf(stderr, "Wrong content\n");
+      exit(1);
+    }
+    printf("Ok\n");
+  }else if( strcmp(argv[1], "crash")==0 ){
+    db = openDb(argv[argc-1]);
+    for(i=2; i<argc-1; i++){
+      if( strcmp(argv[i],"-wal")==0 ){
+        runSql(db, "PRAGMA journal_mode=WAL");
+      }else if( strcmp(argv[i], "-rollback")==0 ){
+        runSql(db, "PRAGMA journal_mode=DELETE");
+      }else{
+        fprintf(stderr, "unknown option %s\n", argv[i]);
+        usage(argv[0]);
+      }
+    }
+    runSql(db,
+      "PRAGMA cache_size=10;"
+      "BEGIN;"
+      "UPDATE t1 SET y=(y || -x)"
+    );
+    exit(0);
+  }else{
+    usage(argv[0]);
+  }
+  return 0;
+}