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

Fix a couple of assert() statements that were failing with OOM error tests.

Browse Source 
FossilOrigin-Name: 8eb3d7d8360530f364bbbebac53e1f0e6753d924
This commit is contained in:
dan
2016-04-16 15:03:20 +00:00
parent f89157653a
commit ee65eea4af
3 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
manifest
View File

@@ -1,5 +1,5 @@
C Add\sthe\sexperimental\ssqlite3rbu_vacuum()\sAPI\sfunction.\sFor\sopening\san\sRBU\shandle\sthat\srebuilds\sa\sdatabase\sfrom\sscratch. C Fix\sa\scouple\sof\sassert()\sstatements\sthat\swere\sfailing\swith\sOOM\serror\stests.
D 2016-04-15T20:46:41.467 D 2016-04-16T15:03:20.537
F Makefile.in eba680121821b8a60940a81454316f47a341487a F Makefile.in eba680121821b8a60940a81454316f47a341487a
F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
F Makefile.msc 71b8b16cf9393f68e2e2035486ca104872558836 F Makefile.msc 71b8b16cf9393f68e2e2035486ca104872558836
@@ -330,7 +330,7 @@ F src/ctime.c 60e135af364d777a9ab41c97e5e89cd224da6198
F src/date.c 1cc9fb516ec9932c6fd4d2a0d2f8bc4480145c39 F src/date.c 1cc9fb516ec9932c6fd4d2a0d2f8bc4480145c39
F src/dbstat.c c845548d4346e606e2f2b7d2e714ace2b8a7dd1b F src/dbstat.c c845548d4346e606e2f2b7d2e714ace2b8a7dd1b
F src/delete.c 78eb999114ec04fcf1b7d123ccedb4b5b734930e F src/delete.c 78eb999114ec04fcf1b7d123ccedb4b5b734930e
F src/expr.c 17d4e745ef6a3fd2e4ef863f5f9a4912f1ba1198 F src/expr.c 8796c0739b2ad091e6779253f62aad6e767e2be1
F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
F src/fkey.c 4c0bd09e602b8ae8d36d81e31e4872d0b53c87bb F src/fkey.c 4c0bd09e602b8ae8d36d81e31e4872d0b53c87bb
F src/func.c 552d300265aed09eea21f68ac742a440550c0062 F src/func.c 552d300265aed09eea21f68ac742a440550c0062
@@ -1483,10 +1483,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
P 3e217d6265ecd16db783bed7ce1d9d0f9c4828bb P 0216b48f28042ad86711e00802c2da8ce9be3044
R d2c575fe1215bc1b298a105940b3f837 R 0603f47373db6aeb2d2c22dfe403e0e2
T *branch * rbu-vacuum
T *sym-rbu-vacuum *
T -sym-trunk *
U dan U dan
Z af92587ff7c9268b9a60aaab80a1a468 Z 6e5ab10ab6efe323abcf341183f13408

2
manifest.uuid
View File

@@ -1 +1 @@
0216b48f28042ad86711e00802c2da8ce9be3044 8eb3d7d8360530f364bbbebac53e1f0e6753d924

4
src/expr.c
View File

@@ -2360,7 +2360,7 @@ static void cacheEntryClear(Parse *pParse, struct yColCache *p){
} }
p->iReg = 0; p->iReg = 0;
pParse->nColCache--; pParse->nColCache--;
assert( cacheIsValid(pParse) ); assert( pParse->db->mallocFailed || cacheIsValid(pParse) );
} }
@@ -2405,7 +2405,7 @@ void sqlite3ExprCacheStore(Parse *pParse, int iTab, int iCol, int iReg){
p->tempReg = 0; p->tempReg = 0;
p->lru = pParse->iCacheCnt++; p->lru = pParse->iCacheCnt++;
pParse->nColCache++; pParse->nColCache++;
assert( cacheIsValid(pParse) ); assert( pParse->db->mallocFailed || cacheIsValid(pParse) );
return; return;
} }
} }