Add more tests of the sqlite_interrupt() logic - looking for a reported

memory leak.  (Didn't find it.) (CVS 1246)

FossilOrigin-Name: e4c8b1c3aa9d288f518c6394187354e6fa18978e

diff --git a/manifest b/manifest
index bb2ef6c6d6288a785d8bc108d214b22c6f5bb507..b6eca890bf5e940289cd7abf67dc49ed5b270733 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Avoid\sline\sendings\smunging\sby\sCygwin;\sticket\s#370\s(CVS\s1245)
-D 2004-02-17T18:26:57
+C Add\smore\stests\sof\sthe\ssqlite_interrupt()\slogic\s-\slooking\sfor\sa\sreported\nmemory\sleak.\s\s(Didn't\sfind\sit.)\s(CVS\s1246)
+D 2004-02-18T01:31:54
 F Makefile.in cfd75c46b335881999333a9e4b982fa8491f200b
 F Makefile.linux-gcc b86a99c493a5bfb402d1d9178dcdc4bd4b32f906
 F README f1de682fbbd94899d50aca13d387d1b3fd3be2dd
@@ -94,7 +94,7 @@ F test/in.test 0de39b02ceeca90993b096822fb5a884661c5b47
 F test/index.test 9295deefbdb6dedbe01be8905f0c448fe5bd4079
 F test/insert.test a17b7f7017097afb2727aa5b67ceeb7ab0a120a1
 F test/insert2.test c288375a64dad3295044714f0dfed4a193cf067f
-F test/interrupt.test 5d4308fc33405abf305d52ddaa571a207768a911
+F test/interrupt.test 46bc6ad9ba9032bee144382ced719d5e010406c2
 F test/intpkey.test 9320af48415c594afd4e15f8ef0daa272e05502e
 F test/ioerr.test 5dbaf09f96b56ee01cf3edd762b96eb4ad2c9ca4
 F test/join.test 9ef6aabaac9de51d5fc41e68d1f4355da05a84cd
@@ -184,7 +184,7 @@ F www/sqlite.tcl 3c83b08cf9f18aa2d69453ff441a36c40e431604
 F www/tclsqlite.tcl b9271d44dcf147a93c98f8ecf28c927307abd6da
 F www/vdbe.tcl 9b9095d4495f37697fd1935d10e14c6015e80aa1
 F www/whentouse.tcl a8335bce47cc2fddb07f19052cb0cb4d9129a8e4
-P f72134852bf33d13fd2bc6f35251e4b33bc10fac
-R 6808102f97e086b6e1f02b48648d93ff
-U dougcurrie
-Z f03216655eb409dac1d13616a0d1feec
+P 50e67948f89380f2f4b536add0b8179e6db960a5
+R 0fd46cdcb719452c286af1cf356d38ce
+U drh
+Z 8eb9cfa9eaeb9d935dda443dd1d5d0a4

diff --git a/manifest.uuid b/manifest.uuid
index b38723e32275e5ecb9a0a009f2853fa5fa355063..32f20546ecbbdee266867fefb3f7e1404a3efa01 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-50e67948f89380f2f4b536add0b8179e6db960a5
\ No newline at end of file
+e4c8b1c3aa9d288f518c6394187354e6fa18978e
\ No newline at end of file

diff --git a/test/interrupt.test b/test/interrupt.test
index 22480f78828044b353c64d71970883bd5142587e..e9e5934d5cf099558ef4eed4628bb7a08746ce86 100644 (file)
--- a/test/interrupt.test
+++ b/test/interrupt.test
@@ -11,7 +11,7 @@
 # This file implements regression tests for SQLite library.  The
 # focus of this script is the sqlite_interrupt() API.
 #
-# $Id: interrupt.test,v 1.2 2004/02/12 15:31:22 drh Exp $
+# $Id: interrupt.test,v 1.3 2004/02/18 01:31:54 drh Exp $
 
 
 set testdir [file dirname $argv0]
@@ -141,4 +141,32 @@ for {set i 1} {$i<50} {incr i 5} {
   } {}
 }
 
+# There are reports of a memory leak if an interrupt occurs during
+# the beginning of a complex query - before the first callback.  We
+# will try to reproduce it here:
+#
+execsql {
+  UPDATE t1 SET b=round((100-rowid)/10);
+}
+set sql {
+  SELECT sum(a.a), max(a.a), min(b.a), a.b 
+  FROM t1 AS a, t1 AS b
+  WHERE b.rowid=a.b
+  GROUP BY 4 ORDER BY 1;
+}
+set sqlite_interrupt_count 1000000
+execsql $sql
+set max_count [expr {1000000-$sqlite_interrupt_count}]
+for {set i 1} {$i<$max_count-5} {incr i 1} {
+  do_test interrupt-4.$i.1 {
+    set ::sqlite_interrupt_count $::i
+    catchsql {
+      SELECT sum(a.a), max(a.a), min(b.a), a.b 
+      FROM t1 AS a, t1 AS b
+      WHERE b.rowid=a.b
+      GROUP BY 4 ORDER BY 1;
+    }
+  } {1 interrupted}
+}
+
 finish_test