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

Avoid unnecessary no-op calls from getAndInitPage() to btreeInitPage()

Browse Source 
in the btree.c logic.

FossilOrigin-Name: 81f5ae13b2e23daee03151d32515387b7f5ba5e5
This commit is contained in:
drh
2013-12-09 01:04:54 +00:00
parent 7599d4aa44
commit 29f2bad6f0
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
manifest
View File

@@ -1,5 +1,5 @@
C Use\sputVarint32()\sinstead\sof\sputVarint()\sfor\sa\squantity\sthat\scan\snever\nexceed\s2GiB\s-\s1. C Avoid\sunnecessary\sno-op\scalls\sfrom\sgetAndInitPage()\sto\sbtreeInitPage()\s\nin\sthe\sbtree.c\slogic.
D 2013-12-09T00:47:11.109 D 2013-12-09T01:04:54.208
F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
F Makefile.in e1a9b4258bbde53f5636f4e238c65b7e11459e2b F Makefile.in e1a9b4258bbde53f5636f4e238c65b7e11459e2b
F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -166,7 +166,7 @@ F src/auth.c 523da7fb4979469955d822ff9298352d6b31de34
F src/backup.c 1809a7caa2504233bdddd12f5018422421789537 F src/backup.c 1809a7caa2504233bdddd12f5018422421789537
F src/bitvec.c 19a4ba637bd85f8f63fc8c9bae5ade9fb05ec1cb F src/bitvec.c 19a4ba637bd85f8f63fc8c9bae5ade9fb05ec1cb
F src/btmutex.c 976f45a12e37293e32cae0281b15a21d48a8aaa7 F src/btmutex.c 976f45a12e37293e32cae0281b15a21d48a8aaa7
F src/btree.c 6a5f69e455804d4ace172075d284124bc816edde F src/btree.c 368d2eaeea81254d5c7bf7e3d6c1737e08e1e10e
F src/btree.h a61ddebc78c66795a2b93181321a116746302cc9 F src/btree.h a61ddebc78c66795a2b93181321a116746302cc9
F src/btreeInt.h f038e818bfadf75afbd09819ed93c26a333d39e0 F src/btreeInt.h f038e818bfadf75afbd09819ed93c26a333d39e0
F src/build.c 9b40580b62916612678bdb69ce0286e39c29a862 F src/build.c 9b40580b62916612678bdb69ce0286e39c29a862
@@ -1146,7 +1146,7 @@ F tool/vdbe-compress.tcl f12c884766bd14277f4fcedcae07078011717381
F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
F tool/warnings.sh d1a6de74685f360ab718efda6265994b99bbea01 F tool/warnings.sh d1a6de74685f360ab718efda6265994b99bbea01
F tool/win/sqlite.vsix 030f3eeaf2cb811a3692ab9c14d021a75ce41fff F tool/win/sqlite.vsix 030f3eeaf2cb811a3692ab9c14d021a75ce41fff
P f2f5a3ce9d075c4b1ac586c5db3a623d9035402d P 6996fb34445adedf463b66ed1f339ee1f27ce6e5
R bafb04b65bbcbde5a371c6f9a8f01895 R a6e3d012f7b111fe3cf762bd37b890b8
U drh U drh
Z 59e808481ed95c39c5c7f4147ae52c5f Z 69daab0d3610fce7f9ad3f7d6b1dfdc6

2
manifest.uuid
View File

@@ -1 +1 @@
6996fb34445adedf463b66ed1f339ee1f27ce6e5 81f5ae13b2e23daee03151d32515387b7f5ba5e5

2
src/btree.c
View File

@@ -1652,7 +1652,7 @@ static int getAndInitPage(
rc = SQLITE_CORRUPT_BKPT; rc = SQLITE_CORRUPT_BKPT;
}else{ }else{
rc = btreeGetPage(pBt, pgno, ppPage, bReadonly); rc = btreeGetPage(pBt, pgno, ppPage, bReadonly);
if( rc==SQLITE_OK ){ if( rc==SQLITE_OK && (*ppPage)->isInit==0 ){
rc = btreeInitPage(*ppPage); rc = btreeInitPage(*ppPage);
if( rc!=SQLITE_OK ){ if( rc!=SQLITE_OK ){
releasePage(*ppPage); releasePage(*ppPage);