database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-08-08 14:02:16 +03:00
Code Activity

In pageReinit() in btree.c, only reinitialize a page if there are one or more references to it, not including the transient reference held by pager.c. This was always the intent. (CVS 6424)

Browse Source 
FossilOrigin-Name: 0c5a7d1117cfb322d1c89da89e8887b0bb091602
This commit is contained in:
danielk1977
2009-04-01 17:13:51 +00:00
parent 769e97e032
commit d217e6f16d
3 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
manifest
View File

@@ -1,5 +1,5 @@
C Remove\sdead\scode\sfrom\sthe\sUTF\sconversion\sroutines.\s\sFix\sa\sbug\sin\nsqlite3_prepare16_v2()\sin\swhich\san\sout-of-memory\serror\sfails\sto\nset\sthe\sstatement\sreturn\spointer\sto\sNULL.\s(CVS\s6423) C In\spageReinit()\sin\sbtree.c,\sonly\sreinitialize\sa\spage\sif\sthere\sare\sone\sor\smore\sreferences\sto\sit,\snot\sincluding\sthe\stransient\sreference\sheld\sby\spager.c.\sThis\swas\salways\sthe\sintent.\s(CVS\s6424)
D 2009-04-01T16:33:38 D 2009-04-01T17:13:51
F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
F Makefile.in 583e87706abc3026960ed759aff6371faf84c211 F Makefile.in 583e87706abc3026960ed759aff6371faf84c211
F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -103,7 +103,7 @@ F src/auth.c c8b2ab5c8bad4bd90ed7c294694f48269162c627
F src/backup.c 0082d0e5a63f04e88faee0dff0a7d63d3e92a78d F src/backup.c 0082d0e5a63f04e88faee0dff0a7d63d3e92a78d
F src/bitvec.c 44f7059ac1f874d364b34af31b9617e52223ba75 F src/bitvec.c 44f7059ac1f874d364b34af31b9617e52223ba75
F src/btmutex.c 341502bc496dc0840dcb00cde65680fb0e85c3ab F src/btmutex.c 341502bc496dc0840dcb00cde65680fb0e85c3ab
F src/btree.c cfa70f8e31c01e2278478740896620bf32ffd837 F src/btree.c abd530b62ab95735ca9ea001369192dcf34d21d9
F src/btree.h e302c5747494067cd4f5763000fbe7bca767d816 F src/btree.h e302c5747494067cd4f5763000fbe7bca767d816
F src/btreeInt.h df64030d632f8c8ac217ed52e8b6b3eacacb33a5 F src/btreeInt.h df64030d632f8c8ac217ed52e8b6b3eacacb33a5
F src/build.c 72357fd75ef036d0afbf1756edab6d62c56fcf4b F src/build.c 72357fd75ef036d0afbf1756edab6d62c56fcf4b
@@ -714,7 +714,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81
F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
P f8e15a542df67fd9dc1c91c7d9e1c4df59acb82b P 94e2f815ebb38981a2226d8aed9f3731f8833f7c
R 0f32d6c1480412f4597b43816b3f4d1f R 969797a9b971dcabb14bfdb8fddd941c
U drh U danielk1977
Z 65f1d97cdae9710553c2d01cde604d65 Z 79fdfc4dbd1df7fe614486048e869a12

2
manifest.uuid
View File

@@ -1 +1 @@
94e2f815ebb38981a2226d8aed9f3731f8833f7c 0c5a7d1117cfb322d1c89da89e8887b0bb091602

5
src/btree.c
View File

@@ -9,7 +9,7 @@
** May you share freely, never taking more than you give. ** May you share freely, never taking more than you give.
** **
************************************************************************* *************************************************************************
** $Id: btree.c,v 1.584 2009/04/01 16:25:33 danielk1977 Exp $ ** $Id: btree.c,v 1.585 2009/04/01 17:13:51 danielk1977 Exp $
** **
** This file implements a external (disk-based) database using BTrees. ** This file implements a external (disk-based) database using BTrees.
** See the header comment on "btreeInt.h" for additional information. ** See the header comment on "btreeInt.h" for additional information.
@@ -1320,10 +1320,11 @@ static void releasePage(MemPage *pPage){
static void pageReinit(DbPage *pData){ static void pageReinit(DbPage *pData){
MemPage *pPage; MemPage *pPage;
pPage = (MemPage *)sqlite3PagerGetExtra(pData); pPage = (MemPage *)sqlite3PagerGetExtra(pData);
assert( sqlite3PagerPageRefcount(pData)>0 );
if( pPage->isInit ){ if( pPage->isInit ){
assert( sqlite3_mutex_held(pPage->pBt->mutex) ); assert( sqlite3_mutex_held(pPage->pBt->mutex) );
pPage->isInit = 0; pPage->isInit = 0;
if( sqlite3PagerPageRefcount(pData)>0 ){ if( sqlite3PagerPageRefcount(pData)>1 ){
/* pPage might not be a btree page; it might be an overflow page /* pPage might not be a btree page; it might be an overflow page
** or ptrmap page or a free page. In those cases, the following ** or ptrmap page or a free page. In those cases, the following
** call to sqlite3BtreeInitPage() will likely return SQLITE_CORRUPT. ** call to sqlite3BtreeInitPage() will likely return SQLITE_CORRUPT.