Bug fixes and speed improvements. Delete is still slow. (CVS 244)

FossilOrigin-Name: 7da856cd94d2572070e40762e5bc477679e60042

diff --git a/manifest b/manifest
index 95f5cf331daeaabb26f5aa81ddf58e54f7d7e053..1bc55e3060d469ebaddac20fd8529046e38f5626 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C All\stests\snow\spass.\s\sBut\sthere\sare\sstill\sissues.\s\sFor\sexample,\sinserts\nare\sway\stoo\sslow.\s\sAnd\sadditional\stests\sare\sneeded\sfor\snew\sfeatures.\s(CVS\s243)
-D 2001-09-14T03:24:24
+C Bug\sfixes\sand\sspeed\simprovements.\sDelete\sis\sstill\sslow.\s(CVS\s244)
+D 2001-09-14T16:42:12
 F COPYRIGHT 74a8a6531a42e124df07ab5599aad63870fa0bd4
 F Makefile.in 7ecb2370b5cb34d390af1fcb3118ea6d84a253ca
 F README 51f6a4e7408b34afa5bc1c0485f61b6a4efb6958
@@ -13,7 +13,7 @@ F notes/notes2.txt 7e3fafd5e25906c1fe1e95f13b089aa398ca403e
 F notes/notes2b.txt 1c17a5b7f6b44a75cd3eb98ed2c24db1eefb06c3
 F notes/notes3.txt 71e47be517e3d2578b3b9343a45b772d43b7ba16
 F src/TODO f0ea267ab55c4d15127c1ac1667edbf781147438
-F src/btree.c 72a9c0b2bac00ed4141488f9f2e3cea5533f1976
+F src/btree.c 04cfedfd8c86401b2a5a61395589bb0c52cbeb15
 F src/btree.h 2427961c702dd0755ec70f529cf3db32707d689b
 F src/build.c d639146a7d88045f1e69d6bb827a51c19c9ec825
 F src/delete.c 62500a09606c0f714b651756475cd42979ef08e8
@@ -27,9 +27,9 @@ F src/ex/pg.h 23a4ac807b0546ec2bb6239ec8bd3e06926572cd
 F src/ex/sizes.tcl f54bad4a2ac567624be59131a6ee42d71b41a3d7
 F src/expr.c bcd91d0487c71cfa44413a46efe5e2c2244901b6
 F src/insert.c edf098ecbbe00e3ecde6b5f22404a8230590c9fd
-F src/main.c b72d2b03a226fdbc241afd3cf66254d504ce74b5
+F src/main.c a2c142626b46e3eb3e01436626df6c2d0a8f3ae6
 F src/md5.c 52f677bfc590e09f71d07d7e327bd59da738d07c
-F src/pager.c 4f9e2b3955687c84567847337faeadca7d8399fa
+F src/pager.c fc0d51b73e74fe7e8aec98c146fa2e714c7a8d52
 F src/pager.h 238aa88bafe33911bf9b0b365f35afd0a261cd46
 F src/parse.y 8fc096948994a7ffbf61ba13129cc589f794a9cb
 F src/printf.c b1e22a47be8cdf707815647239991e08e8cb69f9
@@ -38,7 +38,7 @@ F src/select.c f1673b4d06c24665097faf28d76c4533bce18b84
 F src/shell.c 1fcdf8c4180098bcfdee12501e01b4c8eb21d726
 F src/shell.tcl 27ecbd63dd88396ad16d81ab44f73e6c0ea9d20e
 F src/sqlite.h.in 8faa2fed0513d188ced16e5f9094e57694594e70
-F src/sqliteInt.h 14df6fb9c3bacf546b199396dda28f809ffcd954
+F src/sqliteInt.h 28d53b3690d730d5470a4a183531c7e4371669f1
 F src/table.c adcaf074f6c1075e86359174e68701fa2acfc4d6
 F src/tclsqlite.c d328970848c028e13e61e173bef79adcc379568a
 F src/test1.c abb3cb427e735ae87e6533f5b3b7164b7da91bc4
@@ -47,12 +47,12 @@ F src/test3.c 1fc103f198cbd0447d1a12c3ce48795755ec1a53
 F src/tokenize.c 00c8ab42ee731ff7466b048b449e1e838e9d638c
 F src/update.c ea8f2c0712cd4cd19314a26ef4766866013facda
 F src/util.c c77668fef860cfd2e4e682ef4f3ed8f9e68c551b
-F src/vdbe.c 47b256d1229c448e6d9d95fb8bfa22612dd9a9df
+F src/vdbe.c 244c86e406170c76b89ab07de4c7258f716c36ff
 F src/vdbe.h 9f32bd12c47bd2b4bdd7e93092bb796f2a3b649f
 F src/where.c fef978a9a2234b01e30e36833ab63e14bbc626d3
-F test/all.test 841d176f11fe2fb4419e5b617faedfa617f815fa
+F test/all.test 5cefdb035b45639ddbb9f80324185b0f0a9ebda2
 F test/btree.test 5e1eeb03cda22161eec827dc5224ce6c500eaaf9
-F test/btree2.test a3c9ff1e4490357dd15c9a41f8aefd02f6e32fdc
+F test/btree2.test 061365dfc2a6cd784e17a014b67b277a4cd374ee
 F test/copy.test b77a1214bd7756f2849d5c4fa6e715c0ff0c34eb
 F test/delete.test 50b9b1f06c843d591741dba7869433a105360dbf
 F test/expr.test 80bf8f0e9aa6b9c35bf97ce5d603a28381168d8a
@@ -78,7 +78,7 @@ F test/subselect.test bf8b251a92fb091973c1c469ce499dc9648a41d5
 F test/table.test a882150e82ef01a869cae2d35522145992258502
 F test/tableapi.test 4778414470ba150983d03b9858334effe720c2e0
 F test/tclsqlite.test d2aa55926874783b2401f0146e839f773c6796e1
-F test/tester.tcl 3147bb13461280dfc0afb7a74d14efcd8c0969a0
+F test/tester.tcl fa79c7aeaf4a769ff213864143fa2e27c61bb9c0
 F test/trans.test 1727a0ebf0f3fb6714fcdc016cb9655b55dddbaa
 F test/update.test 72c0c93310483b86dc904a992220c5b84c7ce100
 F test/vacuum.test 135b57e0947ed65e92cf7e1eab64bcefd8cf9519
@@ -86,7 +86,7 @@ F test/where.test 755957829c493b1b7ad1ecb27d6c782131a6b3d5
 F tool/gdbmdump.c 529e67c78d920606ba196326ea55b57b75fcc82b
 F tool/gdbmstat.c 56a9033531e5f5a48413f6ec436d5fb0341632c1
 F tool/lemon.c e007bfdbc79a51a4cd7c8a5f81f517cebd121150
-F tool/lempar.c 943b476d44b319eed525e46bb29e15f2c5986b37
+F tool/lempar.c 276d8ab73e2ff99da5333c035ee81c78d829bb90
 F tool/memleak.awk a0a11dd84bf4582acc81c3c61271021ae49b3f15
 F tool/opNames.awk 5ba1f48aa854ee3b7c3d2b54233665bc3e649ea2
 F tool/opcodeDoc.awk b3a2a3d5d3075b8bd90b7afe24283efdd586659c
@@ -107,7 +107,7 @@ F www/opcode.tcl cb3a1abf8b7b9be9f3a228d097d6bf8b742c2b6f
 F www/sqlite.tcl cb0d23d8f061a80543928755ec7775da6e4f362f
 F www/tclsqlite.tcl 06f81c401f79a04f2c5ebfb97e7c176225c0aef2
 F www/vdbe.tcl 0c8aaa529dd216ccbf7daaabd80985e413d5f9ad
-P 3dfe1711e67e08525427497f0edc3d287dc2733e
-R 7cdc3ce95a1070f684959a39723e9ffa
+P e7b65e37fd88c4d69c89cfe73ab345b8b645ada6
+R ed181b52a40061f0079d6a386222bac2
 U drh
-Z 5045ad3f3570f9f72b603cda49b0fddc
+Z badce0ce49575ed2f4c401ae6458d977

diff --git a/manifest.uuid b/manifest.uuid
index 91d18f9776a243892575ba42107b759af004f76f..f38d1c9605ad78fd922bcf747893faed4d88405c 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-e7b65e37fd88c4d69c89cfe73ab345b8b645ada6
\ No newline at end of file
+7da856cd94d2572070e40762e5bc477679e60042
\ No newline at end of file

diff --git a/src/btree.c b/src/btree.c
index 939898a84adef289b51f85a37aacbe34e1f045a5..587103fdaab582d23884573db5c46fb84ec1c4e3 100644 (file)
--- a/src/btree.c
+++ b/src/btree.c
@@ -21,7 +21,7 @@
 **   http://www.hwaci.com/drh/
 **
 *************************************************************************
-** $Id: btree.c,v 1.25 2001/09/14 03:24:24 drh Exp $
+** $Id: btree.c,v 1.26 2001/09/14 16:42:12 drh Exp $
 **
 ** This file implements a external (disk-based) database using BTrees.
 ** For a detailed discussion of BTrees, refer to
@@ -1702,7 +1702,8 @@ static int balance(Btree *pBt, MemPage *pPage, BtCursor *pCur){
   ** underfull.
   */
   assert( sqlitepager_iswriteable(pPage) );
-  if( !pPage->isOverfull && pPage->nFree<SQLITE_PAGE_SIZE/2 && pPage->nCell>=2){
+  if( !pPage->isOverfull && pPage->nFree<SQLITE_PAGE_SIZE/2 
+        && pPage->nCell>=2){
     relinkCellList(pPage);
     return SQLITE_OK;
   }

diff --git a/src/main.c b/src/main.c
index 7583542de732bb4ead8d4c2bcc6081671ab1ac6f..cbbe5dc8f7dbb8d9a800ef22a8a660b0e34e1f89 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -26,7 +26,7 @@
 ** other files are for internal use by SQLite and should not be
 ** accessed by users of the library.
 **
-** $Id: main.c,v 1.34 2001/09/13 21:53:10 drh Exp $
+** $Id: main.c,v 1.35 2001/09/14 16:42:12 drh Exp $
 */
 #include "sqliteInt.h"
 #if defined(HAVE_USLEEP) && HAVE_USLEEP
@@ -243,7 +243,7 @@ sqlite *sqlite_open(const char *zFilename, int mode, char **pzErrMsg){
   if( db==0 ) goto no_mem_on_open;
   
   /* Open the backend database driver */
-  rc = sqliteBtreeOpen(zFilename, mode, 100, &db->pBe);
+  rc = sqliteBtreeOpen(zFilename, mode, MAX_PAGES, &db->pBe);
   if( rc!=SQLITE_OK ){
     switch( rc ){
       default: {

diff --git a/src/pager.c b/src/pager.c
index 6a447f20c1557a60dc50694e76f52888f66d8779..1428d8253d2d36de3a8f6538fa9e5fa10dd1b887 100644 (file)
--- a/src/pager.c
+++ b/src/pager.c
@@ -27,7 +27,7 @@
 ** all writes in order to support rollback.  Locking is used to limit
 ** access to one or more reader or to one writer.
 **
-** @(#) $Id: pager.c,v 1.16 2001/09/14 03:24:25 drh Exp $
+** @(#) $Id: pager.c,v 1.17 2001/09/14 16:42:12 drh Exp $
 */
 #include "sqliteInt.h"
 #include "pager.h"
@@ -103,7 +103,7 @@ struct PgHdr {
 ** How big to make the hash table used for locating in-memory pages
 ** by page number.  Knuth says this should be a prime number.
 */
-#define N_PG_HASH 101
+#define N_PG_HASH 907
 
 /*
 ** A open page cache is an instance of the following structure.
@@ -1061,7 +1061,7 @@ int sqlitepager_iswriteable(void *pData){
 ** is returned.
 */
 int sqlitepager_commit(Pager *pPager){
-  int i, rc;
+  int rc;
   PgHdr *pPg;
 
   if( pPager->errMask==PAGER_ERR_FULL ){
@@ -1080,14 +1080,12 @@ int sqlitepager_commit(Pager *pPager){
   if( fsync(pPager->jfd) ){
     goto commit_abort;
   }
-  for(i=0; i<N_PG_HASH; i++){
-    for(pPg=pPager->aHash[i]; pPg; pPg=pPg->pNextHash){
-      if( pPg->dirty==0 ) continue;
-      rc = pager_seek(pPager->fd, (pPg->pgno-1)*SQLITE_PAGE_SIZE);
-      if( rc!=SQLITE_OK ) goto commit_abort;
-      rc = pager_write(pPager->fd, PGHDR_TO_DATA(pPg), SQLITE_PAGE_SIZE);
-      if( rc!=SQLITE_OK ) goto commit_abort;
-    }
+  for(pPg=pPager->pAll; pPg; pPg=pPg->pNextAll){
+    if( pPg->dirty==0 ) continue;
+    rc = pager_seek(pPager->fd, (pPg->pgno-1)*SQLITE_PAGE_SIZE);
+    if( rc!=SQLITE_OK ) goto commit_abort;
+    rc = pager_write(pPager->fd, PGHDR_TO_DATA(pPg), SQLITE_PAGE_SIZE);
+    if( rc!=SQLITE_OK ) goto commit_abort;
   }
   if( fsync(pPager->fd) ) goto commit_abort;
   rc = pager_unwritelock(pPager);

diff --git a/src/sqliteInt.h b/src/sqliteInt.h
index 71d1e0294290212b770d8ae18ca11cdf9f3429b3..c99c6a9bfe416fb1db4a8b3c77c5ccd0afec22ba 100644 (file)
--- a/src/sqliteInt.h
+++ b/src/sqliteInt.h
@@ -23,7 +23,7 @@
 *************************************************************************
 ** Internal interface definitions for SQLite.
 **
-** @(#) $Id: sqliteInt.h,v 1.45 2001/09/13 16:18:54 drh Exp $
+** @(#) $Id: sqliteInt.h,v 1.46 2001/09/14 16:42:12 drh Exp $
 */
 #include "sqlite.h"
 #include "vdbe.h"
@@ -34,6 +34,13 @@
 #include <string.h>
 #include <assert.h>
 
+/*
+** The maximum number of in-memory pages to use for the main database
+** table and for temporary tables.
+*/
+#define MAX_PAGES   150
+#define TEMP_PAGES   50
+
 /*
 ** The paging system deals with 32-bit integers.
 */

diff --git a/src/vdbe.c b/src/vdbe.c
index 69a37ac8a02c82b3b54e88bddca36e10d7f489bc..604fa93605874572ddae1fc4e18f42418a4794bf 100644 (file)
--- a/src/vdbe.c
+++ b/src/vdbe.c
@@ -41,7 +41,7 @@
 ** But other routines are also provided to help in building up
 ** a program instruction by instruction.
 **
-** $Id: vdbe.c,v 1.65 2001/09/14 03:24:25 drh Exp $
+** $Id: vdbe.c,v 1.66 2001/09/14 16:42:12 drh Exp $
 */
 #include "sqliteInt.h"
 #include <ctype.h>
@@ -2009,7 +2009,9 @@ case OP_Open: {
     int j;
     p->aCsr = sqliteRealloc( p->aCsr, (i+1)*sizeof(Cursor) );
     if( p->aCsr==0 ){ p->nCursor = 0; goto no_mem; }
-    for(j=p->nCursor; j<=i; j++) p->aCsr[j].pCursor = 0;
+    for(j=p->nCursor; j<=i; j++){
+      memset(&p->aCsr[j], 0, sizeof(Cursor));
+    }
     p->nCursor = i+1;
   }else if( p->aCsr[i].pCursor ){
     sqliteBtreeCloseCursor(p->aCsr[i].pCursor);
@@ -2052,14 +2054,16 @@ case OP_OpenTemp: {
     int j;
     p->aCsr = sqliteRealloc( p->aCsr, (i+1)*sizeof(Cursor) );
     if( p->aCsr==0 ){ p->nCursor = 0; goto no_mem; }
-    for(j=p->nCursor; j<=i; j++) p->aCsr[j].pCursor = 0;
+    for(j=p->nCursor; j<=i; j++){
+      memset(&p->aCsr[j], 0, sizeof(Cursor));
+    }
     p->nCursor = i+1;
   }else if( p->aCsr[i].pCursor ){
     sqliteBtreeCloseCursor(p->aCsr[i].pCursor);
   }
   pCx = &p->aCsr[i];
   memset(pCx, 0, sizeof(*pCx));
-  rc = sqliteBtreeOpen(0, 0, 100, &pCx->pBt);
+  rc = sqliteBtreeOpen(0, 0, TEMP_PAGES, &pCx->pBt);
   if( rc==SQLITE_OK ){
     rc = sqliteBtreeCursor(pCx->pBt, 2, &pCx->pCursor);
   }
@@ -2204,18 +2208,29 @@ case OP_Found: {
 */
 case OP_NewRecno: {
   int i = pOp->p1;
-  static int v = 0;
+  int v = 0;
   if( VERIFY( i<0 || i>=p->nCursor || ) p->aCsr[i].pCursor==0 ){
     v = 0;
   }else{
     int res, rx, cnt;
+    static int x = 0;
+    union {
+       char zBuf[sizeof(int)];
+       int i;
+    } ux;
     cnt = 0;
     do{
-      if( v==0 || cnt>5 ){
-        v = sqliteRandomInteger();
+      if( x==0 || cnt>5 ){
+        x = sqliteRandomInteger();
       }else{
-        v += sqliteRandomByte() + 1;
+        x += sqliteRandomByte() + 1;
       }
+      if( x==0 ) continue;
+      ux.zBuf[3] = x&0xff;
+      ux.zBuf[2] = (x>>8)&0xff;
+      ux.zBuf[1] = (x>>16)&0xff;
+      ux.zBuf[0] = (x>>24)&0xff;
+      v = ux.i;
       rx = sqliteBtreeMoveto(p->aCsr[i].pCursor, &v, sizeof(v), &res);
       cnt++;
     }while( cnt<10 && rx==SQLITE_OK && res==0 );

diff --git a/test/all.test b/test/all.test
index a1fb54caf946fabff510a8df4524f4a8f9a05d24..ec85847aab3f1d9fc9336c5776097ced36329b13 100644 (file)
--- a/test/all.test
+++ b/test/all.test
@@ -22,7 +22,7 @@
 #***********************************************************************
 # This file runs all tests.
 #
-# $Id: all.test,v 1.8 2001/09/13 21:53:10 drh Exp $
+# $Id: all.test,v 1.9 2001/09/14 16:42:13 drh Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
@@ -42,7 +42,7 @@ if {[file exists ./sqlite_test_count]} {
 set LeakList {}
 
 
-for {set Counter 0} {$Counter<$COUNT} {incr Counter} {
+for {set Counter 0} {$Counter<$COUNT && $nErr==0} {incr Counter} {
   foreach testfile [lsort -dictionary [glob $testdir/*.test]] {
     if {[file tail $testfile]=="all.test"} continue
     if {[file tail $testfile]=="malloc.test"} continue
@@ -65,6 +65,7 @@ if {$LeakList!=""} {
        puts "Expected: all values to be the same"
        puts "     Got: $LeakList"
        incr ::nErr
+       lappend ::failList memory-leak-test
        break
     }
   }

diff --git a/test/btree2.test b/test/btree2.test
index 0eb2f6ec905a6758a192cbf663d36374d16d32c4..142c9e7a25e9f72e03c7e156bc43ae1c0b461242 100644 (file)
--- a/test/btree2.test
+++ b/test/btree2.test
@@ -23,7 +23,7 @@
 # This file implements regression tests for SQLite library.  The
 # focus of this script is btree database backend
 #
-# $Id: btree2.test,v 1.5 2001/09/13 14:46:11 drh Exp $
+# $Id: btree2.test,v 1.6 2001/09/14 16:42:13 drh Exp $
 
 
 set testdir [file dirname $argv0]
@@ -288,8 +288,8 @@ foreach {N L} {
   10 2
   50 2
   200 3
-  2000 5
 } {
+  # 2000 5
   puts "**** N=$N L=$L ****"
   set hash [md5file test2.bt]
   do_test btree2-$testno.1 [subst -nocommands {

diff --git a/test/tester.tcl b/test/tester.tcl
index 6d2bd2f22799682424426ff27a1d99b1d89ac624..852a1a8eeaa41fd65d20e6aad3d436889046c61e 100644 (file)
--- a/test/tester.tcl
+++ b/test/tester.tcl
@@ -23,7 +23,7 @@
 # This file implements some common TCL routines used for regression
 # testing the SQLite library
 #
-# $Id: tester.tcl,v 1.16 2001/09/13 21:53:10 drh Exp $
+# $Id: tester.tcl,v 1.17 2001/09/14 16:42:13 drh Exp $
 
 # Make sure tclsqlite was compiled correctly.  Abort now with an
 # error message if not.
@@ -68,6 +68,7 @@ set nErr 0
 set nTest 0
 set nProb 0
 set skip_test 0
+set failList {}
 
 # Invoke the do_test procedure to run a single test 
 #
@@ -95,11 +96,13 @@ proc do_test {name cmd expected} {
   if {[catch {uplevel #0 "$cmd;\n"} result]} {
     puts "\nError: $result"
     incr nErr
-    if {$nErr>10} {puts "*** Giving up..."; exit 1}
+    lappend ::failList $name
+    if {$nErr>10} {puts "*** Giving up..."; finalize_testing}
   } elseif {[string compare $result $expected]} {
     puts "\nExpected: \[$expected\]\n     Got: \[$result\]"
     incr nErr
-    if {$nErr>10} {puts "*** Giving up..."; exit 1}
+    lappend ::failList $name
+    if {$nErr>10} {puts "*** Giving up..."; finalize_testing}
   } else {
     puts " Ok"
   }
@@ -160,10 +163,14 @@ proc memleak_check {} {
 # Run this routine last
 #
 proc finish_test {} {
+  finalize_testing
+}
+proc finalize_testing {} {
   global nTest nErr nProb
-  memleak_check
+  if {$nErr==0} memleak_check
   catch {db close}
   puts "$nErr errors out of $nTest tests"
+  puts "Failures on these tests: $::failList"
   if {$nProb>0} {
     puts "$nProb probabilistic tests also failed, but this does"
     puts "not necessarily indicate a malfunction."

diff --git a/tool/lempar.c b/tool/lempar.c
index 8b35e86bf86d787f88e26db7e7a104296b9db5a8..0f301aeac85e307aa02638d537cdef8e4ba08f59 100644 (file)
--- a/tool/lempar.c
+++ b/tool/lempar.c
@@ -190,16 +190,21 @@ static char *yyTokenName[] = {
 #define YYTRACE(X)
 #endif
 
+
 /*
 ** This function returns the symbolic name associated with a token
 ** value.
 */
 const char *ParseTokenName(int tokenType){
+#ifndef NDEBUG
   if( tokenType>0 && tokenType<(sizeof(yyTokenName)/sizeof(yyTokenName[0])) ){
     return yyTokenName[tokenType];
   }else{
     return "Unknown";
   }
+#else
+  return "";
+#endif
 }
 
 /*