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

Change the name of IntegrityCk.mallocFailed to IntegrityCk.bOomFault to

Browse Source 
avoid confusion with the sqlite3 object field with the same name.

FossilOrigin-Name: 87c7d962581f4bb1224086701352850ede9847dc76235b33c7c2a35ef594d382
This commit is contained in:
drh
2020-06-29 18:30:49 +00:00
parent 2bfd35b8d2
commit 8ddf635811
4 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
manifest
View File

@@ -1,6 +1,6 @@
B 7a876209a678a34c198b54ceef9e3c041f128a14dc73357f6a57cadadaa6cf7b B 7a876209a678a34c198b54ceef9e3c041f128a14dc73357f6a57cadadaa6cf7b
C Add\stest\sscript\sto\sverify\sbusy-timeouts\sare\sworking\sfor\sSQLITE_ENABLE_SETLK_TIMEOUT\sbuilds. C Change\sthe\sname\sof\sIntegrityCk.mallocFailed\sto\sIntegrityCk.bOomFault\sto\navoid\sconfusion\swith\sthe\ssqlite3\sobject\sfield\swith\sthe\ssame\sname.
D 2020-06-29T17:52:53.862 D 2020-06-29T18:30:49.786
F Makefile.in 19374a5db06c3199ec1bab71ab74a103d8abf21053c05e9389255dc58083f806 F Makefile.in 19374a5db06c3199ec1bab71ab74a103d8abf21053c05e9389255dc58083f806
F Makefile.msc 48f5a3fc32672c09ad73795749f6253e406a31526935fbbffd8f021108d54574 F Makefile.msc 48f5a3fc32672c09ad73795749f6253e406a31526935fbbffd8f021108d54574
F autoconf/Makefile.am a8d1d24affe52ebf8d7ddcf91aa973fa0316618ab95bb68c87cabf8faf527dc8 F autoconf/Makefile.am a8d1d24affe52ebf8d7ddcf91aa973fa0316618ab95bb68c87cabf8faf527dc8
@@ -10,6 +10,8 @@ F ext/lsm1/lsm_unix.c 11e0a5c19d754a4e1d93dfad06de8cc201f10f886b8e61a4c599ed34e3
F ext/misc/decimal.c c1897f624893d1c12e3c879d97ca7d1c4a36cae10d32afe632779de78c4aaa4f F ext/misc/decimal.c c1897f624893d1c12e3c879d97ca7d1c4a36cae10d32afe632779de78c4aaa4f
F ext/misc/ieee754.c bb6bd8e9eeeda5a7ac82839fcab5c0b8156b0532165387cc5458a97f60047b5d F ext/misc/ieee754.c bb6bd8e9eeeda5a7ac82839fcab5c0b8156b0532165387cc5458a97f60047b5d
F main.mk b1cd0bc6aedad7ebb667b7f74f835f932f60ee33be2a5c3051fd93eb465f5c75 F main.mk b1cd0bc6aedad7ebb667b7f74f835f932f60ee33be2a5c3051fd93eb465f5c75
F src/btree.c e8e4a7e4727f0ead6433fdafeff347bf078fec39bee55a24441c3481e5b85164
F src/btreeInt.h 19267385aa3bc00067d48e0e4ba83ae82dc08b0c15a3b3df20ea653cb462b5bf
F src/build.c ba1bbe563a3dc02d5fed20537603181e5289c13ea30ae5e775f552e7557adbfa F src/build.c ba1bbe563a3dc02d5fed20537603181e5289c13ea30ae5e775f552e7557adbfa
F src/expr.c a3ab84399b3415f66d2d0c25f5bcd98ef465c0c07ea1f19bf2a418b1c8fcad74 F src/expr.c a3ab84399b3415f66d2d0c25f5bcd98ef465c0c07ea1f19bf2a418b1c8fcad74
F src/select.c bc25f48e49eca122c16c247e7d4697241156e7c32c735b219be667657aa017ef F src/select.c bc25f48e49eca122c16c247e7d4697241156e7c32c735b219be667657aa017ef
@@ -27,7 +29,7 @@ F tool/mksqlite3c.tcl f4ef476510eca4124c874a72029f1e01bc54a896b1724e8f9eef0d8bfa
F tool/mksqlite3h.tcl 1f5e4a1dbbbc43c83cc6e74fe32c6c620502240b66c7c0f33a51378e78fc4edf F tool/mksqlite3h.tcl 1f5e4a1dbbbc43c83cc6e74fe32c6c620502240b66c7c0f33a51378e78fc4edf
F tool/showlocks.c 9cc5e66d4ebbf2d194f39db2527ece92077e86ae627ddd233ee48e16e8142564 F tool/showlocks.c 9cc5e66d4ebbf2d194f39db2527ece92077e86ae627ddd233ee48e16e8142564
F tool/speed-check.sh 615cbdf50f1409ef3bbf9f682e396df80f49d97ed93ed3e61c8e91fae6afde58 F tool/speed-check.sh 615cbdf50f1409ef3bbf9f682e396df80f49d97ed93ed3e61c8e91fae6afde58
P 1b426603f05033bcee0331c6f664cd5ed2ebf8f5d4cde8c6673c7a699ff53bb1 P ada43e7c490bf72a50ee84e1db994e149744b2a943260449076b83d1874813b2
R 6c7789a7098efb29eff36caf8aa4c6fc R ad5c3efe8067f76e71e83d254e1b38a0
U dan U drh
Z 112b18c988addaa054b3697edfd4eb11 Z 4f978aff4a80dc385d65b8fa6dc71ff1

2
manifest.uuid
View File

@@ -1 +1 @@
ada43e7c490bf72a50ee84e1db994e149744b2a943260449076b83d1874813b2 87c7d962581f4bb1224086701352850ede9847dc76235b33c7c2a35ef594d382

12
src/btree.c
View File

@@ -9632,7 +9632,7 @@ static void checkAppendMsg(
sqlite3_str_vappendf(&pCheck->errMsg, zFormat, ap); sqlite3_str_vappendf(&pCheck->errMsg, zFormat, ap);
va_end(ap); va_end(ap);
if( pCheck->errMsg.accError==SQLITE_NOMEM ){ if( pCheck->errMsg.accError==SQLITE_NOMEM ){
pCheck->mallocFailed = 1; pCheck->bOomFault = 1;
} }
} }
#endif /* SQLITE_OMIT_INTEGRITY_CHECK */ #endif /* SQLITE_OMIT_INTEGRITY_CHECK */
@@ -9697,7 +9697,7 @@ static void checkPtrmap(
rc = ptrmapGet(pCheck->pBt, iChild, &ePtrmapType, &iPtrmapParent); rc = ptrmapGet(pCheck->pBt, iChild, &ePtrmapType, &iPtrmapParent);
if( rc!=SQLITE_OK ){ if( rc!=SQLITE_OK ){
if( rc==SQLITE_NOMEM || rc==SQLITE_IOERR_NOMEM ) pCheck->mallocFailed = 1; if( rc==SQLITE_NOMEM || rc==SQLITE_IOERR_NOMEM ) pCheck->bOomFault = 1;
checkAppendMsg(pCheck, "Failed to read ptrmap key=%d", iChild); checkAppendMsg(pCheck, "Failed to read ptrmap key=%d", iChild);
return; return;
} }
@@ -10142,7 +10142,7 @@ char *sqlite3BtreeIntegrityCheck(
sCheck.nPage = btreePagecount(sCheck.pBt); sCheck.nPage = btreePagecount(sCheck.pBt);
sCheck.mxErr = mxErr; sCheck.mxErr = mxErr;
sCheck.nErr = 0; sCheck.nErr = 0;
sCheck.mallocFailed = 0; sCheck.bOomFault = 0;
sCheck.zPfx = 0; sCheck.zPfx = 0;
sCheck.v1 = 0; sCheck.v1 = 0;
sCheck.v2 = 0; sCheck.v2 = 0;
@@ -10156,12 +10156,12 @@ char *sqlite3BtreeIntegrityCheck(
sCheck.aPgRef = sqlite3MallocZero((sCheck.nPage / 8)+ 1); sCheck.aPgRef = sqlite3MallocZero((sCheck.nPage / 8)+ 1);
if( !sCheck.aPgRef ){ if( !sCheck.aPgRef ){
sCheck.mallocFailed = 1; sCheck.bOomFault = 1;
goto integrity_ck_cleanup; goto integrity_ck_cleanup;
} }
sCheck.heap = (u32*)sqlite3PageMalloc( pBt->pageSize ); sCheck.heap = (u32*)sqlite3PageMalloc( pBt->pageSize );
if( sCheck.heap==0 ){ if( sCheck.heap==0 ){
sCheck.mallocFailed = 1; sCheck.bOomFault = 1;
goto integrity_ck_cleanup; goto integrity_ck_cleanup;
} }
@@ -10236,7 +10236,7 @@ char *sqlite3BtreeIntegrityCheck(
integrity_ck_cleanup: integrity_ck_cleanup:
sqlite3PageFree(sCheck.heap); sqlite3PageFree(sCheck.heap);
sqlite3_free(sCheck.aPgRef); sqlite3_free(sCheck.aPgRef);
if( sCheck.mallocFailed ){ if( sCheck.bOomFault ){
sqlite3_str_reset(&sCheck.errMsg); sqlite3_str_reset(&sCheck.errMsg);
sCheck.nErr++; sCheck.nErr++;
} }

2
src/btreeInt.h
View File

@@ -679,7 +679,7 @@ struct IntegrityCk {
Pgno nPage; /* Number of pages in the database */ Pgno nPage; /* Number of pages in the database */
int mxErr; /* Stop accumulating errors when this reaches zero */ int mxErr; /* Stop accumulating errors when this reaches zero */
int nErr; /* Number of messages written to zErrMsg so far */ int nErr; /* Number of messages written to zErrMsg so far */
int mallocFailed; /* A memory allocation error has occurred */ int bOomFault; /* A memory allocation error has occurred */
const char *zPfx; /* Error message prefix */ const char *zPfx; /* Error message prefix */
int v1, v2; /* Values for up to two %d fields in zPfx */ int v1, v2; /* Values for up to two %d fields in zPfx */
StrAccum errMsg; /* Accumulate the error message text here */ StrAccum errMsg; /* Accumulate the error message text here */