Test cases for sqlite3_db_config() and sqlite3_db_status(). (CVS 5518)

FossilOrigin-Name: 6a6b94302acdfe6404b04bff1cc8d16c1ef69df9

diff --git a/manifest b/manifest
index 5122d047221e1957927a2a3d934b4d9fcb475eb5..ee67f1a2dfbc0c16abee3d7b82ea6be93cee7669 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\sa\spermutation\stest\scase\sfor\srunning\sall\sOOM\stests\swith\slookaside\ndisabled.\s(CVS\s5517)
-D 2008-08-01T15:06:30
+C Test\scases\sfor\ssqlite3_db_config()\sand\ssqlite3_db_status().\s(CVS\s5518)
+D 2008-08-01T16:31:14
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in bbb62eecc851379aef5a48a1bf8787eb13e6ec06
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -115,8 +115,8 @@ F src/insert.c 89cd9af52a5ea6fb7d0cfc9c3b935d6406c360c4
 F src/journal.c cffd2cd214e58c0e99c3ff632b3bee6c7cbb260e
 F src/legacy.c 3635cc6a5889918086b3501de8287cbbecb55917
 F src/loadext.c 9ab55455f59dce0ae6388952216a1505ce7f9d13
-F src/main.c 70d285dce241ad8daa320f78b060edb73bba637e
-F src/malloc.c b1a337e2b903cd78cd7e529e2706ecf1ad95473d
+F src/main.c fb1645201b4a05a13cc227e1a1338c57088e3be7
+F src/malloc.c f0ad28008351cac2337ef502a3fdc8ffd3e5d9a9
 F src/md5.c 008216bbb5d34c6fbab5357aa68575ad8a31516a
 F src/mem1.c 3a7fe31d8290baa3bb203af72f7dfd6323966bcd
 F src/mem2.c 87381b143530cc377592e868bd548e881c2498a3
@@ -148,7 +148,7 @@ F src/sqlite.h.in 30af3a002a0b672aaae8f4a5deb0a2e9a4b699af
 F src/sqlite3ext.h 1e3887c9bd3ae66cb599e922824b04cd0d0f2c3e
 F src/sqliteInt.h 99a49b2d85b7648fbb2f7933b145dfb5b11d8941
 F src/sqliteLimit.h f435e728c6b620ef7312814d660a81f9356eb5c8
-F src/status.c ca61c18b6f1c632b771514e0c39a7d662c805bbf
+F src/status.c 8ad1f215934c5f5afb91df86e44dccff7ef3c1d0
 F src/table.c 22744786199c9195720c15a7a42cb97b2e2728d8
 F src/tclsqlite.c ec46084184f033ba396a9ee7b5514b695083d0f3
 F src/test1.c e503344d492584d3df31c959f2b14da112e536f4
@@ -168,7 +168,7 @@ F src/test_devsym.c 6012cb8e3acf812513511025a4fa5d626e0ba19b
 F src/test_func.c 94c4424ed9869ecf2e2132662a04581bbec016f6
 F src/test_hexio.c 2f1122aa3f012fa0142ee3c36ce5c902a70cd12f
 F src/test_loadext.c df8ab3a6481ddebbdf0d28ebac5d9e0790f7860f
-F src/test_malloc.c 43668d9cb053be59eac02f42bd0ce6aa4a5f15c6
+F src/test_malloc.c 3919ed155da54a1ee1e06282a69fb8a035b2749f
 F src/test_md5.c 28209a4e2068711b5443c33104fe41f21d160071
 F src/test_mutex.c d3422d9f60cc1330249d102e74b333f0d24a0cb6
 F src/test_onefile.c 243157b10275251c5dc2d6619aee2ff9ae22379c
@@ -393,6 +393,7 @@ F test/lock2.test 018b846f6f3b3b695fad07e317b7988442b556f4
 F test/lock3.test 615111293cf32aa2ed16d01c6611737651c96fb9
 F test/lock4.test 09d97d52cae18fadfe631552af9880dac6b3ae90
 F test/lock5.test f4eeb0400cf65c37f733cb3c74401136f8c46acd
+F test/lookaside.test 7480f4eb87c9883e0db47b97b57e23ee565f4248
 F test/main.test 8d77c161757ef7d96eaff0413daa7120c3b316fe
 F test/malloc.test 69f5bb5a13b24edb1322fc1f42894f9d2f6446b1
 F test/malloc3.test 094f8195fe8e409bd4da0f1d769f7745faec62c8
@@ -614,7 +615,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81
 F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 1dbced29de5f59ba2ebf877edcadf171540374d1
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
-P c9ecd88e273aee56b4af5b69fae94e1f98d3e43d
-R 2a0f3659641a8b538a7fd6b0f31f5a68
+P 3f70e03ae83d374f5f69770bd7a4b279584f7090
+R 21a8914e4d9d6622f109fe97eb26a591
 U drh
-Z 105cd4775e41bce932a17cb137180529
+Z 0e954aa8108084642ae7fe8343f84356

diff --git a/manifest.uuid b/manifest.uuid
index 958996822d41d433f66132d5cf0ce1b1a697e58c..46966a19cce1b77856c5d686a900870855110297 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-3f70e03ae83d374f5f69770bd7a4b279584f7090
\ No newline at end of file
+6a6b94302acdfe6404b04bff1cc8d16c1ef69df9
\ No newline at end of file

diff --git a/src/main.c b/src/main.c
index 92e259fc750df7d4fca0f9f691e9e6c519945188..0676d954e634de5aefcada113371afa3988d05a2 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -14,7 +14,7 @@
 ** other files are for internal use by SQLite and should not be
 ** accessed by users of the library.
 **
-** $Id: main.c,v 1.483 2008/07/28 19:34:53 drh Exp $
+** $Id: main.c,v 1.484 2008/08/01 16:31:14 drh Exp $
 */
 #include "sqliteInt.h"
 #include <ctype.h>
@@ -330,7 +330,7 @@ static int setupLookaside(sqlite3 *db, int sz, int cnt){
 */
 int sqlite3_db_config(sqlite3 *db, int op, ...){
   va_list ap;
-  int rc = SQLITE_OK;
+  int rc;
   va_start(ap, op);
   switch( op ){
     case SQLITE_CONFIG_LOOKASIDE: {
@@ -339,6 +339,10 @@ int sqlite3_db_config(sqlite3 *db, int op, ...){
       rc = setupLookaside(db, sz, cnt);
       break;
     }
+    default: {
+      rc = SQLITE_ERROR;
+      break;
+    }
   }
   va_end(ap);
   return rc;

diff --git a/src/malloc.c b/src/malloc.c
index a68378a0f8ba07d5845075cccaa74bc3a753b1a8..2518741d7f9a5ab42cc5f49b46c30665b5785198 100644 (file)
--- a/src/malloc.c
+++ b/src/malloc.c
@@ -12,7 +12,7 @@
 **
 ** Memory allocation functions used throughout sqlite.
 **
-** $Id: malloc.c,v 1.32 2008/07/31 17:16:05 drh Exp $
+** $Id: malloc.c,v 1.33 2008/08/01 16:31:14 drh Exp $
 */
 #include "sqliteInt.h"
 #include <stdarg.h>
@@ -112,8 +112,8 @@ int sqlite3MallocInit(void){
   if( sqlite3Config.bCoreMutex ){
     mem0.mutex = sqlite3MutexAlloc(SQLITE_MUTEX_STATIC_MEM);
   }
-  if( sqlite3Config.pScratch && sqlite3Config.szScratch>=3000
-      && sqlite3Config.nScratch>0 ){
+  if( sqlite3Config.pScratch && sqlite3Config.szScratch>=100
+      && sqlite3Config.nScratch>=0 ){
     int i;
     sqlite3Config.szScratch -= 4;
     mem0.aScratchFree = (u32*)&((char*)sqlite3Config.pScratch)
@@ -125,7 +125,7 @@ int sqlite3MallocInit(void){
     sqlite3Config.szScratch = 0;
   }
   if( sqlite3Config.pPage && sqlite3Config.szPage>=512
-      && sqlite3Config.nPage>1 ){
+      && sqlite3Config.nPage>=1 ){
     int i;
     int overhead;
     int sz = sqlite3Config.szPage;

diff --git a/src/status.c b/src/status.c
index a5e45dd33aedecec46d866cc082c3eacce33426d..56ecdcdb3903b536111ee25a8ffdb6302e7ed31b 100644 (file)
--- a/src/status.c
+++ b/src/status.c
@@ -13,7 +13,7 @@
 ** This module implements the sqlite3_status() interface and related
 ** functionality.
 **
-** $Id: status.c,v 1.5 2008/07/28 19:34:54 drh Exp $
+** $Id: status.c,v 1.6 2008/08/01 16:31:14 drh Exp $
 */
 #include "sqliteInt.h"
 
@@ -103,6 +103,9 @@ int sqlite3_db_status(
       }
       break;
     }
+    default: {
+      return SQLITE_ERROR;
+    }
   }
   return SQLITE_OK;
 }

diff --git a/src/test_malloc.c b/src/test_malloc.c
index 63c9c046953d56bef7af6f1c00fd457ef18e158b..8eb73d8e9cbb8ddf697202daae0e0e086ebb27f3 100644 (file)
--- a/src/test_malloc.c
+++ b/src/test_malloc.c
@@ -13,7 +13,7 @@
 ** This file contains code used to implement test interfaces to the
 ** memory allocation subsystem.
 **
-** $Id: test_malloc.c,v 1.44 2008/07/31 17:16:05 drh Exp $
+** $Id: test_malloc.c,v 1.45 2008/08/01 16:31:14 drh Exp $
 */
 #include "sqliteInt.h"
 #include "tcl.h"
@@ -886,7 +886,7 @@ static int test_config_scratch(
     buf = 0;
     rc = sqlite3_config(SQLITE_CONFIG_SCRATCH, 0, 0, 0);
   }else{
-    buf = malloc( sz*N );
+    buf = malloc( sz*N + 1 );
     rc = sqlite3_config(SQLITE_CONFIG_SCRATCH, buf, sz, N);
   }
   pResult = Tcl_NewObj();
@@ -1072,6 +1072,44 @@ static int test_config_heap(
   return TCL_OK;
 }
 
+/*
+** tclcmd:     sqlite3_config_error  [DB]
+**
+** Invoke sqlite3_config() or sqlite3_db_config() with invalid
+** opcodes and verify that they return errors.
+*/
+static int test_config_error(
+  void * clientData, 
+  Tcl_Interp *interp,
+  int objc,
+  Tcl_Obj *CONST objv[]
+){
+  sqlite3 *db;
+  int getDbPointer(Tcl_Interp*, const char*, sqlite3**);
+
+  if( objc!=2 && objc!=1 ){
+    Tcl_WrongNumArgs(interp, 1, objv, "[DB]");
+    return TCL_ERROR;
+  }
+  if( objc==2 ){
+    if( getDbPointer(interp, Tcl_GetString(objv[1]), &db) ) return TCL_ERROR;
+    if( sqlite3_db_config(db, 99999)!=SQLITE_ERROR ){
+      Tcl_AppendResult(interp, 
+            "sqlite3_db_config(db, 99999) does not return SQLITE_ERROR",
+            (char*)0);
+      return TCL_ERROR;
+    }
+  }else{
+    if( sqlite3_config(99999)!=SQLITE_ERROR ){
+      Tcl_AppendResult(interp, 
+          "sqlite3_config(99999) does not return SQLITE_ERROR",
+          (char*)0);
+      return TCL_ERROR;
+    }
+  }
+  return TCL_OK;
+}
+
 /*
 ** Usage:    
 **
@@ -1271,6 +1309,7 @@ int Sqlitetest_malloc_Init(Tcl_Interp *interp){
      { "sqlite3_config_memstatus",   test_config_memstatus         ,0 },
      { "sqlite3_config_chunkalloc",  test_config_chunkalloc        ,0 },
      { "sqlite3_config_lookaside",   test_config_lookaside         ,0 },
+     { "sqlite3_config_error",       test_config_error             ,0 },
      { "sqlite3_db_config_lookaside",test_db_config_lookaside      ,0 },
      { "sqlite3_dump_memsys3",       test_dump_memsys3             ,3 },
      { "sqlite3_dump_memsys5",       test_dump_memsys3             ,5 }

diff --git a/test/lookaside.test b/test/lookaside.test
new file mode 100644 (file)
index 0000000..093563a
--- /dev/null
+++ b/test/lookaside.test
@@ -0,0 +1,82 @@
+# 2008 August 01
+#
+# 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.
+#
+#***********************************************************************
+#
+# Tests for the lookaside memory allocator.
+#
+# $Id: lookaside.test,v 1.1 2008/08/01 16:31:14 drh Exp $
+
+set testdir [file dirname $argv0]
+source $testdir/tester.tcl
+
+# Make sure sqlite3_db_config() and sqlite3_db_status are working.
+#
+do_test lookaside-1.1 {
+  catch {sqlite3_config_error db}
+} {0}
+do_test lookaside-1.2 {
+  sqlite3_db_config_lookaside db 20 20
+} {0}
+do_test lookaside-1.3 {
+  sqlite3_db_status db SQLITE_DBSTATUS_LOOKASIDE_USED 0
+} {0 0 0}
+do_test lookaside-1.4 {
+  db eval {CREATE TABLE t1(x);}
+  sqlite3_db_status db SQLITE_DBSTATUS_LOOKASIDE_USED 0
+} {0 7 20}
+do_test lookaside-1.5 {
+  sqlite3_db_status db SQLITE_DBSTATUS_LOOKASIDE_USED 1
+} {0 7 20}
+do_test lookaside-1.6 {
+  sqlite3_db_status db SQLITE_DBSTATUS_LOOKASIDE_USED 0
+} {0 7 7}
+do_test lookaside-1.7 {
+  db cache flush
+  sqlite3_db_status db SQLITE_DBSTATUS_LOOKASIDE_USED 0
+} {0 0 7}
+do_test lookaside-1.8 {
+  db cache flush
+  sqlite3_db_status db SQLITE_DBSTATUS_LOOKASIDE_USED 1
+} {0 0 7}
+do_test lookaside-1.9 {
+  db cache flush
+  sqlite3_db_status db SQLITE_DBSTATUS_LOOKASIDE_USED 0
+} {0 0 0}
+
+do_test lookaside-2.1 {
+  sqlite3_db_config_lookaside db 100 1000
+} {0}
+do_test lookaside-2.2 {
+  db eval {CREATE TABLE t2(x);}
+  sqlite3_db_status db SQLITE_DBSTATUS_LOOKASIDE_USED 0
+} {0 10 48}
+do_test lookaside-2.3 {
+  sqlite3_db_config_lookaside db 50 50
+} {5}  ;# SQLITE_BUSY
+do_test lookaside-2.4 {
+  db cache flush
+  sqlite3_db_config_lookaside db 50 50
+} {0}  ;# SQLITE_OK
+
+# sqlite3_db_status() with an invalid verb returns an error.
+#
+do_test lookaside-3.1 {
+  sqlite3_db_status db 99999 0
+} {1 0 0}
+
+# Test that an invalid verb on sqlite3_config() is detected and
+# reported as an error.
+#
+do_test lookaside-4.1 {
+  db close
+  sqlite3_shutdown
+  catch sqlite3_config_error
+} {0}
+sqlite3_initialize