/ Check-in [adca7688]
Login

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

Overview
Comment:When closing a (shared-cache) database connection, be sure to clear out all KeyInfo objects cached on Index objects. Fix for ticket [e4a18565a36884b00edf].
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1:adca7688de20ff40d8ddf2107dfaf92af3873b83
User & Date: drh 2014-12-05 14:44:57
Context
2014-12-05
15:31
The KeyInfo cache must be cleared before closing the btree, not after. Revised fix for ticket [e4a18565a36884b00edf]. check-in: 7ed3346e user: drh tags: trunk
14:51
When closing a (shared-cache) database connection, be sure to clear out all KeyInfo objects cached on Index objects. Fix for ticket [e4a18565a36884b00edf]. check-in: b7905b8c user: drh tags: branch-3.8.7
14:44
When closing a (shared-cache) database connection, be sure to clear out all KeyInfo objects cached on Index objects. Fix for ticket [e4a18565a36884b00edf]. check-in: adca7688 user: drh tags: trunk
14:34
Improved comment on the sharedB.test test script. Closed-Leaf check-in: 71f589e3 user: drh tags: fix-stale-keyinfo-cache
00:32
Fix compiler warnings. check-in: e9955c0e user: drh tags: trunk
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Changes to src/main.c.

  1030   1030   
  1031   1031     /* Close all database connections */
  1032   1032     for(j=0; j<db->nDb; j++){
  1033   1033       struct Db *pDb = &db->aDb[j];
  1034   1034       if( pDb->pBt ){
  1035   1035         sqlite3BtreeClose(pDb->pBt);
  1036   1036         pDb->pBt = 0;
  1037         -      if( j!=1 ){
         1037  +      if( j!=1 && pDb->pSchema ){
         1038  +        /* Must clear the KeyInfo cache.  See ticket [e4a18565a36884b00edf] */
         1039  +        for(i=sqliteHashFirst(&pDb->pSchema->idxHash); i; i=sqliteHashNext(i)){
         1040  +          Index *pIdx = sqliteHashData(i);
         1041  +          sqlite3KeyInfoUnref(pIdx->pKeyInfo);
         1042  +          pIdx->pKeyInfo = 0;
         1043  +        }
  1038   1044           pDb->pSchema = 0;
  1039   1045         }
  1040   1046       }
  1041   1047     }
  1042   1048     /* Clear the TEMP schema separately and last */
  1043   1049     if( db->aDb[1].pSchema ){
  1044   1050       sqlite3SchemaClear(db->aDb[1].pSchema);

Added test/sharedB.test.

            1  +# 2014-12-05
            2  +#
            3  +# The author disclaims copyright to this source code.  In place of
            4  +# a legal notice, here is a blessing:
            5  +#
            6  +#    May you do good and not evil.
            7  +#    May you find forgiveness for yourself and forgive others.
            8  +#    May you share freely, never taking more than you give.
            9  +#
           10  +#***********************************************************************
           11  +#
           12  +# Open two database connections on the same database in shared cache
           13  +# mode.  Hold one open while repeatedly closing, reopening, and using
           14  +# the second.
           15  +#
           16  +# This test is designed to demostrate that the fix for ticket
           17  +# [e4a18565a36884b00edf66541f38c693827968ab] works.  
           18  +#
           19  +
           20  +
           21  +set testdir [file dirname $argv0]
           22  +source $testdir/tester.tcl
           23  +if {[run_thread_tests]==0} { finish_test ; return }
           24  +db close
           25  +set ::testprefix sharedB
           26  +
           27  +set ::enable_shared_cache [sqlite3_enable_shared_cache 1]
           28  +
           29  +#-------------------------------------------------------------------------
           30  +#
           31  +do_test 1.1 {
           32  +  sqlite3 db1 test.db
           33  +  sqlite3 db2 test.db
           34  +
           35  +  db1 eval {
           36  +    CREATE TABLE t1(x,y TEXT COLLATE nocase);
           37  +    WITH RECURSIVE
           38  +      c(i) AS (VALUES(1) UNION ALL SELECT i+1 FROM c WHERE i<100)
           39  +    INSERT INTO t1(x,y) SELECT i, printf('x%03dy',i) FROM c;
           40  +    CREATE INDEX t1yx ON t1(y,x);
           41  +  }
           42  +  db2 eval {
           43  +    SELECT x FROM t1 WHERE y='X014Y';
           44  +  }
           45  +} {14}
           46  +
           47  +for {set j 1} {$j<=100} {incr j} {
           48  +  do_test 1.2.$j {
           49  +    db2 close
           50  +    sqlite3 db2 test.db
           51  +    db2 eval {
           52  +      SELECT x FROM t1 WHERE y='X014Y';
           53  +    }
           54  +  } {14}
           55  +}
           56  +
           57  +db1 close
           58  +db2 close
           59  +sqlite3_enable_shared_cache $::enable_shared_cache
           60  +finish_test