Add test cases for running multiple RBU operations within the same process

concurrently.

FossilOrigin-Name: 407b5ed35c178bb0dbc69c8b902652038a0653d55a58a7543f9d4857c6baf3ea

diff --git a/ext/rbu/rbumulti.test b/ext/rbu/rbumulti.test
new file mode 100644 (file)
index 0000000..59c6538
--- /dev/null
+++ b/ext/rbu/rbumulti.test
@@ -0,0 +1,175 @@
+# 2018 January 11
+#
+# The author disclaims copyright to this source code.  In place of
+# a legal notice, here is a blessing:
+#
+#    May you do good and not evil.
+#    May you find forgiveness for yourself and forgive others.
+#    May you share freely, never taking more than you give.
+#
+#***********************************************************************
+#
+# This file contains tests of multiple RBU operations running
+# concurrently within the same process. 
+#
+
+source [file join [file dirname [info script]] rbu_common.tcl]
+set ::testprefix rbumulti
+
+db close
+sqlite3_shutdown
+sqlite3_config_uri 1
+
+autoinstall_test_functions
+
+proc build_db {db} {
+  $db eval {
+    CREATE TABLE t1(a PRIMARY KEY, b, c);
+    CREATE INDEX i1 ON t1(b);
+    CREATE INDEX i2 ON t1(c);
+
+    WITH s(i) AS ( SELECT 1 UNION ALL SELECT i+1 FROM s WHERE i<500 )
+    INSERT INTO t1 
+    SELECT randomblob(10), randomblob(100), randomblob(100) FROM s;
+  }
+}
+
+proc build_rbu {db} {
+  $db eval {
+    CREATE TABLE data_t1(a, b, c, rbu_control);
+    WITH s(i) AS ( SELECT 1 UNION ALL SELECT i+1 FROM s WHERE i<100 )
+    INSERT INTO data_t1 
+    SELECT randomblob(10), randomblob(100), randomblob(100), 0 FROM s;
+  }
+}
+
+proc step_rbu2 {bOpenClose openr1 openr2} {
+
+  forcedelete teststate.db1
+  forcedelete teststate.db2
+
+  if {$bOpenClose!=0 && $bOpenClose!=1} { error $bOpenClose }
+  if {$bOpenClose==0} {
+    eval $openr1 
+    eval $openr2 
+  }
+
+  set b1 0
+  set b2 0
+
+  while {$b1==0 || $b2==0} {
+    if {$bOpenClose==1} {
+      if {$b1==0} { eval $openr1 teststate.db1 }
+      if {$b2==0} { eval $openr2 teststate.db2 }
+    }
+    if {$b1==0} {
+      set rc1 [r1 step]
+      if {$rc1 != "SQLITE_OK"} { set b1 1 }
+    }
+    if {$b2==0} {
+      set rc2 [r2 step]
+      if {$rc2 != "SQLITE_OK"} { set b2 1 }
+    }
+    if {$bOpenClose==1} {
+      if {$b1==0} { r1 close }
+      if {$b2==0} { r2 close }
+    }
+  }
+
+  set rc1 [r1 close]
+  set rc2 [r2 close]
+
+  list $rc1 $rc2
+}
+
+
+for {set i 0} {$i<=3} {incr i} {
+
+  if {$i & 0x01} {
+    sqlite3rbu_create_vfs -default myrbu ""
+  }
+  set bOpenClose [expr $i>>1]
+
+  forcedelete test.db
+  forcedelete test.db2
+  forcedelete rbu.db
+  forcedelete rbu.db2
+  
+  do_test 1.$i.0 {
+    sqlite3 db test.db
+    sqlite3 db2 test.db2
+    build_db db
+    build_db db2
+  
+    sqlite3 rbu1 rbu.db
+    sqlite3 rbu2 rbu.db2
+  
+    build_rbu rbu1
+    build_rbu rbu2
+  
+    rbu1 close
+    rbu2 close
+  } {}
+
+  set m1 [db eval {SELECT md5sum(a, b, c) FROM t1}]
+  set m2 [db2 eval {SELECT md5sum(a, b, c) FROM t1}]
+  
+  do_test 1.$i.1 {
+    step_rbu2 $bOpenClose {
+      sqlite3rbu r1 test.db rbu.db
+    } {
+      sqlite3rbu r2 test.db2 rbu.db2
+    }
+  } {SQLITE_DONE SQLITE_DONE}
+  
+  do_execsql_test -db db  1.$i.2.1 { PRAGMA integrity_check } ok
+  do_execsql_test -db db2 1.$i.2.2 { PRAGMA integrity_check } ok
+
+  do_execsql_test -db db  1.$i.3.1 { SELECT md5sum(a, b, c)==$m1 FROM t1 } 0
+  do_execsql_test -db db2 1.$i.3.2 { SELECT md5sum(a, b, c)==$m2 FROM t1 } 0
+  
+  catch { db close }
+  catch { db2 close }
+  #-----------------------------------------------------------------------
+  forcedelete test.db2
+  forcedelete test.db
+  forcedelete rbu.db2
+  
+  do_test 1.$i.4 {
+    sqlite3 db test.db
+    sqlite3 db2 test.db2
+    build_db db
+    build_db db2
+    sqlite3 rbu2 rbu.db2
+    build_rbu rbu2
+    rbu2 close
+  } {}
+
+  set m1 [db eval {SELECT md5sum(a, b, c) FROM t1}]
+  set m2 [db2 eval {SELECT md5sum(a, b, c) FROM t1}]
+
+  do_test 1.$i.5 {
+    step_rbu2 $bOpenClose {
+      sqlite3rbu_vacuum r1 test.db
+    } {
+      sqlite3rbu r2 test.db2 rbu.db2
+    }
+  } {SQLITE_DONE SQLITE_DONE}
+
+  do_execsql_test -db db  1.$i.6.1 { SELECT md5sum(a, b, c)==$m1 FROM t1 } 1
+  do_execsql_test -db db2 1.$i.6.2 { SELECT md5sum(a, b, c)==$m2 FROM t1 } 0
+
+  do_execsql_test -db db  1.$i.7.1 { PRAGMA integrity_check } ok
+  do_execsql_test -db db2 1.$i.7.2 { PRAGMA integrity_check } ok
+
+  catch { db close }
+  catch { db2 close }
+  if {$i & 0x01} {
+    sqlite3rbu_destroy_vfs myrbu
+  }
+
+}
+
+
+finish_test
+

diff --git a/manifest b/manifest
index ee79e40a2b37760ad65ef53d483fec550c1f359d..fcbf2dda8e7601f4723c0a68caf094b75f2ed84b 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Minor\sformatting\schanges\sin\szipfile.c.\s\sNo\slogical\scode\sdifferences.
-D 2018-01-11T14:50:40.176
+C Add\stest\scases\sfor\srunning\smultiple\sRBU\soperations\swithin\sthe\ssame\sprocess\nconcurrently.
+D 2018-01-11T16:16:03.148
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F Makefile.in 38f84f301cbef443b2d269f67a74b8cc536469831f70df7c3e912acc04932cc2
@@ -330,6 +330,7 @@ F ext/rbu/rbufault2.test 9a7f19edd6ea35c4c9f807d8a3db0a03a5670c06
 F ext/rbu/rbufault3.test 0913c1aeaee266d9c36c33179341a5a504aad7d423d1979cfec43c8346a29899
 F ext/rbu/rbufault4.test 34e70701cbec51571ffbd9fbf9d4e0f2ec495ca7
 F ext/rbu/rbufts.test a2bbd202c9321fba15fb4a62a90add7d70e07bd8404e1e598135adbfff8a0508
+F ext/rbu/rbumulti.test 2cf153ab3d5861ff26517dc6cbaec430787a59f1d50e8771fe7a7529a0551cf1
 F ext/rbu/rbuprogress.test 1849d4e0e50616edf5ce75ce7db86622e656b5cf
 F ext/rbu/rburesume.test 8acb77f4a422ff55acfcfc9cc15a5cb210b1de83
 F ext/rbu/rbusave.test 0f43b6686084f426ddd040b878426452fd2c2f48
@@ -1697,7 +1698,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 2c55571baaae58d6f5b6210cf85d0fa325a9977682bd449e3802191f7a4142de
-R 33de751c900466ee2a12d260dcb2a3de
-U drh
-Z 324651d5684ea52cfa823d4ea5809b01
+P 4f68bed3b9a63a349a2a2d7f26609491577e9717034ad86af404cf9eed9d6aaf
+R b4712b12dc6463238ee69f57e3b3a2cb
+U dan
+Z e742283e882b3ab287b40d1d09763224

diff --git a/manifest.uuid b/manifest.uuid
index 774aa87cbe81163ffbe301f02052e2eb33734cc1..0d3f74a2d6020e521fa88648331719b6e073c367 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-4f68bed3b9a63a349a2a2d7f26609491577e9717034ad86af404cf9eed9d6aaf
\ No newline at end of file
+407b5ed35c178bb0dbc69c8b902652038a0653d55a58a7543f9d4857c6baf3ea
\ No newline at end of file