/ Check-in [78d075ff]
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:A few minor changes to test scripts so that they work on linux-amd64. (CVS 5752)
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 78d075ff38d96cc58659a7097dec0e49402aa960
User & Date: drh 2008-09-30 00:31:38
Context
2008-09-30
04:20
Misc clean up. Wrapped a CE only variable in if-defs. Changed to only provide cache hint for CE builds (as this prevents CE from compressing the file.) Performance testing on XP and Vista showed caching hint had little effect when the DB size was much smaller than the O/S disk cache size, and provided only marginal benefit when the DB size was much larger than the cache. On Vista, overall system performance was hurt for very large DBs. Ticket #3387. (CVS 5753) check-in: 15dd0169 user: shane tags: trunk
00:31
A few minor changes to test scripts so that they work on linux-amd64. (CVS 5752) check-in: 78d075ff user: drh tags: trunk
2008-09-29
16:41
Remove the reparentPage() and reparentChildPages() functions from btree.c. All calls to these functions can now be replaced by a call to setChildPtrmaps(). (CVS 5751) check-in: 35e8e4dc user: danielk1977 tags: trunk
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Changes to test/lookaside.test.

     7      7   #    May you find forgiveness for yourself and forgive others.
     8      8   #    May you share freely, never taking more than you give.
     9      9   #
    10     10   #***********************************************************************
    11     11   #
    12     12   # Tests for the lookaside memory allocator.
    13     13   #
    14         -# $Id: lookaside.test,v 1.5 2008/08/12 15:48:25 drh Exp $
           14  +# $Id: lookaside.test,v 1.6 2008/09/30 00:31:38 drh Exp $
    15     15   
    16     16   set testdir [file dirname $argv0]
    17     17   source $testdir/tester.tcl
    18     18   
    19     19   catch {db close}
    20     20   sqlite3_shutdown
    21     21   sqlite3_config_pagecache 0 0
................................................................................
    25     25   
    26     26   # Make sure sqlite3_db_config() and sqlite3_db_status are working.
    27     27   #
    28     28   do_test lookaside-1.1 {
    29     29     catch {sqlite3_config_error db}
    30     30   } {0}
    31     31   do_test lookaside-1.2 {
    32         -  sqlite3_db_config_lookaside db 1 20 20
           32  +  sqlite3_db_config_lookaside db 1 18 18
    33     33   } {0}
    34     34   do_test lookaside-1.3 {
    35     35     sqlite3_db_status db SQLITE_DBSTATUS_LOOKASIDE_USED 0
    36     36   } {0 0 0}
    37     37   do_test lookaside-1.4 {
    38     38     db eval {CREATE TABLE t1(w,x,y,z);}
    39     39     foreach {x y z} [sqlite3_db_status db SQLITE_DBSTATUS_LOOKASIDE_USED 0] break
    40         -  expr {$x==0 && $y<$z && $z==20}
           40  +  expr {$x==0 && $y<$z && $z==18}
    41     41   } {1}
    42     42   do_test lookaside-1.5 {
    43     43     foreach {x y z} [sqlite3_db_status db SQLITE_DBSTATUS_LOOKASIDE_USED 1] break
    44         -  expr {$x==0 && $y<$z && $z==20}
           44  +  expr {$x==0 && $y<$z && $z==18}
    45     45   } {1}
    46     46   do_test lookaside-1.6 {
    47     47     foreach {x y z} [sqlite3_db_status db SQLITE_DBSTATUS_LOOKASIDE_USED 0] break
    48         -  expr {$x==0 && $y==$z && $y<20}
           48  +  expr {$x==0 && $y==$z && $y<18}
    49     49   } {1}
    50     50   do_test lookaside-1.7 {
    51     51     db cache flush
    52     52     foreach {x y z} [sqlite3_db_status db SQLITE_DBSTATUS_LOOKASIDE_USED 0] break
    53         -  expr {$x==0 && $y==0 && $z<20}
           53  +  expr {$x==0 && $y==0 && $z<18}
    54     54   } {1}
    55     55   do_test lookaside-1.8 {
    56     56     db cache flush
    57     57     foreach {x y z} [sqlite3_db_status db SQLITE_DBSTATUS_LOOKASIDE_USED 1] break
    58         -  expr {$x==0 && $y==0 && $z<20}
           58  +  expr {$x==0 && $y==0 && $z<18}
    59     59   } {1}
    60     60   do_test lookaside-1.9 {
    61     61     db cache flush
    62     62     sqlite3_db_status db SQLITE_DBSTATUS_LOOKASIDE_USED 0
    63     63   } {0 0 0}
    64     64   
    65     65   do_test lookaside-2.1 {

Changes to test/memsubsys1.test.

     7      7   #    May you find forgiveness for yourself and forgive others.
     8      8   #    May you share freely, never taking more than you give.
     9      9   #
    10     10   #***********************************************************************
    11     11   #
    12     12   # This file contains tests of the memory allocation subsystem
    13     13   #
    14         -# $Id: memsubsys1.test,v 1.11 2008/08/26 18:05:48 danielk1977 Exp $
           14  +# $Id: memsubsys1.test,v 1.12 2008/09/30 00:31:38 drh Exp $
    15     15   
    16     16   set testdir [file dirname $argv0]
    17     17   source $testdir/tester.tcl
    18     18   sqlite3_reset_auto_extension
    19     19   
    20     20   # This procedure constructs a new database in test.db.  It fills
    21     21   # this database with many small records (enough to force multiple
................................................................................
   206    206   build_test_db memsubsys1-6 {PRAGMA page_size=4096}
   207    207   #show_memstats
   208    208   do_test memsubsys1-6.3 {
   209    209     set pg_used [lindex [sqlite3_status SQLITE_STATUS_PAGECACHE_USED 0] 2]
   210    210   } 23
   211    211   do_test memsubsys1-6.4 {
   212    212     set maxreq [lindex [sqlite3_status SQLITE_STATUS_MALLOC_SIZE 0] 2]
   213         -  expr {$maxreq>4096 && $maxreq<(4096+$xtra_size)}
          213  +  expr {$maxreq>4096 && $maxreq<=(4096+$xtra_size)}
   214    214   } 1
   215    215   do_test memsubsys1-6.5 {
   216    216     set s_used [lindex [sqlite3_status SQLITE_STATUS_SCRATCH_USED 0] 2]
   217    217   } 1
   218    218   do_test memsubsys1-6.6 {
   219    219     set s_ovfl [lindex [sqlite3_status SQLITE_STATUS_SCRATCH_OVERFLOW 0] 2]
   220    220   } 0