database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-11-03 16:53:36 +03:00
Code Activity

Fix the Parse.aColCache column cache so that all of the valid entries are

Browse Source 
in the first Parse.nColCache slots.

FossilOrigin-Name: 6028502059ccbd3699637b7a70a6d8ce1b7c3dad
This commit is contained in:
drh
2016-09-30 20:22:27 +00:00
parent e05950d878
commit 9b40d13f43
4 changed files with 61 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
manifest
View File

@@ -1,5 +1,5 @@
C Another\ssimplification\sto\sthe\sParse\sobject. C Fix\sthe\sParse.aColCache\scolumn\scache\sso\sthat\sall\sof\sthe\svalid\sentries\sare\s\nin\sthe\sfirst\sParse.nColCache\sslots.
D 2016-09-30T19:14:32.049 D 2016-09-30T20:22:27.729
F Makefile.in 6fd48ffcf7c2deea7499062d1f3747f986c19678 F Makefile.in 6fd48ffcf7c2deea7499062d1f3747f986c19678
F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
F Makefile.msc 5151cc64c4c05f3455f4f692ad11410a810d937f F Makefile.msc 5151cc64c4c05f3455f4f692ad11410a810d937f
@@ -339,7 +339,7 @@ F src/ctime.c e77f3dc297b4b65c96da78b4ae4272fdfae863d7
F src/date.c 95c9a8d00767e7221a8e9a31f4e913fc8029bf6b F src/date.c 95c9a8d00767e7221a8e9a31f4e913fc8029bf6b
F src/dbstat.c 19ee7a4e89979d4df8e44cfac7a8f905ec89b77d F src/dbstat.c 19ee7a4e89979d4df8e44cfac7a8f905ec89b77d
F src/delete.c cb3f6300df24c26c609778b2731f82644b5532ec F src/delete.c cb3f6300df24c26c609778b2731f82644b5532ec
F src/expr.c a27090ab1d9d9901c64974c43588a38a486d6a55 F src/expr.c f0ea2e1a7af0047b71e40dfed6902249129710e5
F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
F src/fkey.c b9ca262f6ad4d030a3cab737ebf9b0b3c8b4ac80 F src/fkey.c b9ca262f6ad4d030a3cab737ebf9b0b3c8b4ac80
F src/func.c 29cc9acb170ec1387b9f63eb52cd85f8de96c771 F src/func.c 29cc9acb170ec1387b9f63eb52cd85f8de96c771
@@ -457,7 +457,7 @@ F src/vdbe.c 51e754eec26d892abc6279f5e949545af68ec1b3
F src/vdbe.h c044be7050ac6bf596eecc6ab159f5dbc020a3b7 F src/vdbe.h c044be7050ac6bf596eecc6ab159f5dbc020a3b7
F src/vdbeInt.h 581b737c2f6e413c555469480efe31796a71bcad F src/vdbeInt.h 581b737c2f6e413c555469480efe31796a71bcad
F src/vdbeapi.c 794f80669e9e3b9b3edc78d80c15968985c7bf21 F src/vdbeapi.c 794f80669e9e3b9b3edc78d80c15968985c7bf21
F src/vdbeaux.c 240fecf157b6a3deb3c68abe614ae30cb8e884cd F src/vdbeaux.c 5f97a1aed18b5b064407652654f73f3cd4836a87
F src/vdbeblob.c 3e82a797b60c3b9fed7b8de8c539ca7607874937 F src/vdbeblob.c 3e82a797b60c3b9fed7b8de8c539ca7607874937
F src/vdbemem.c 1c330522e6b6e4ddd2ff63c4c0dfafa20c3965a7 F src/vdbemem.c 1c330522e6b6e4ddd2ff63c4c0dfafa20c3965a7
F src/vdbesort.c 91fda3909326860382b0ca8aa251e609c6a9d62c F src/vdbesort.c 91fda3909326860382b0ca8aa251e609c6a9d62c
@@ -1525,7 +1525,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 814e41da3563eecf5514811bc8ab2df4f5cc0d4b P c1419727f5e4cb3ef63b5853b6ef3b1e53af0651
R 608d1a96b91ee96ffbbec71d9c1f3711 R 1c5f450e057ea86e47df56b91a0fd28e
U drh U drh
Z 828299b9894d67f8570c817a01bf6c81 Z 0c5e41f0df0638c8d6aea45323876192

2
manifest.uuid
View File

@@ -1 +1 @@
c1419727f5e4cb3ef63b5853b6ef3b1e53af0651 6028502059ccbd3699637b7a70a6d8ce1b7c3dad

102
src/expr.c
View File

@@ -2964,32 +2964,19 @@ static void codeInteger(Parse *pParse, Expr *pExpr, int negFlag, int iMem){
} }
} }
#if defined(SQLITE_DEBUG)
/* /*
** Verify the consistency of the column cache ** Erase column-cache entry number i
*/ */
static int cacheIsValid(Parse *pParse){ static void cacheEntryClear(Parse *pParse, int i){
int i, n; if( pParse->aColCache[i].tempReg ){
for(i=n=0; i<SQLITE_N_COLCACHE; i++){
if( pParse->aColCache[i].iReg>0 ) n++;
}
return n==pParse->nColCache;
}
#endif
/*
** Clear a cache entry.
*/
static void cacheEntryClear(Parse *pParse, struct yColCache *p){
if( p->tempReg ){
if( pParse->nTempReg<ArraySize(pParse->aTempReg) ){ if( pParse->nTempReg<ArraySize(pParse->aTempReg) ){
pParse->aTempReg[pParse->nTempReg++] = p->iReg; pParse->aTempReg[pParse->nTempReg++] = pParse->aColCache[i].iReg;
} }
p->tempReg = 0;
} }
p->iReg = 0;
pParse->nColCache--; pParse->nColCache--;
assert( pParse->db->mallocFailed || cacheIsValid(pParse) ); if( i<pParse->nColCache ){
pParse->aColCache[i] = pParse->aColCache[pParse->nColCache];
}
} }
@@ -3019,27 +3006,13 @@ void sqlite3ExprCacheStore(Parse *pParse, int iTab, int iCol, int iReg){
** that the object will never already be in cache. Verify this guarantee. ** that the object will never already be in cache. Verify this guarantee.
*/ */
#ifndef NDEBUG #ifndef NDEBUG
for(i=0, p=pParse->aColCache; i<SQLITE_N_COLCACHE; i++, p++){ for(i=0, p=pParse->aColCache; i<pParse->nColCache; i++, p++){
assert( p->iReg==0 || p->iTable!=iTab || p->iColumn!=iCol ); assert( p->iTable!=iTab || p->iColumn!=iCol );
} }
#endif #endif
/* Find an empty slot and replace it */ /* If the cache is already full, delete the least recently used entry */
for(i=0, p=pParse->aColCache; i<SQLITE_N_COLCACHE; i++, p++){ if( pParse->nColCache>=SQLITE_N_COLCACHE ){
if( p->iReg==0 ){
p->iLevel = pParse->iCacheLevel;
p->iTable = iTab;
p->iColumn = iCol;
p->iReg = iReg;
p->tempReg = 0;
p->lru = pParse->iCacheCnt++;
pParse->nColCache++;
assert( pParse->db->mallocFailed || cacheIsValid(pParse) );
return;
}
}
/* Replace the last recently used */
minLru = 0x7fffffff; minLru = 0x7fffffff;
idxLru = -1; idxLru = -1;
for(i=0, p=pParse->aColCache; i<SQLITE_N_COLCACHE; i++, p++){ for(i=0, p=pParse->aColCache; i<SQLITE_N_COLCACHE; i++, p++){
@@ -3048,17 +3021,18 @@ void sqlite3ExprCacheStore(Parse *pParse, int iTab, int iCol, int iReg){
minLru = p->lru; minLru = p->lru;
} }
} }
if( ALWAYS(idxLru>=0) ){
p = &pParse->aColCache[idxLru]; p = &pParse->aColCache[idxLru];
}else{
p = &pParse->aColCache[pParse->nColCache++];
}
/* Add the new entry to the end of the cache */
p->iLevel = pParse->iCacheLevel; p->iLevel = pParse->iCacheLevel;
p->iTable = iTab; p->iTable = iTab;
p->iColumn = iCol; p->iColumn = iCol;
p->iReg = iReg; p->iReg = iReg;
p->tempReg = 0; p->tempReg = 0;
p->lru = pParse->iCacheCnt++; p->lru = pParse->iCacheCnt++;
assert( cacheIsValid(pParse) );
return;
}
} }
/* /*
@@ -3066,13 +3040,14 @@ void sqlite3ExprCacheStore(Parse *pParse, int iTab, int iCol, int iReg){
** Purge the range of registers from the column cache. ** Purge the range of registers from the column cache.
*/ */
void sqlite3ExprCacheRemove(Parse *pParse, int iReg, int nReg){ void sqlite3ExprCacheRemove(Parse *pParse, int iReg, int nReg){
struct yColCache *p; int i = 0;
if( iReg<=0 || pParse->nColCache==0 ) return; while( i<pParse->nColCache ){
p = &pParse->aColCache[SQLITE_N_COLCACHE-1]; struct yColCache *p = &pParse->aColCache[i];
while(1){ if( p->iReg >= iReg && p->iReg < iReg+nReg ){
if( p->iReg >= iReg && p->iReg < iReg+nReg ) cacheEntryClear(pParse, p); cacheEntryClear(pParse, i);
if( p==pParse->aColCache ) break; }else{
p--; i++;
}
} }
} }
@@ -3096,8 +3071,7 @@ void sqlite3ExprCachePush(Parse *pParse){
** the cache to the state it was in prior the most recent Push. ** the cache to the state it was in prior the most recent Push.
*/ */
void sqlite3ExprCachePop(Parse *pParse){ void sqlite3ExprCachePop(Parse *pParse){
int i; int i = 0;
struct yColCache *p;
assert( pParse->iCacheLevel>=1 ); assert( pParse->iCacheLevel>=1 );
pParse->iCacheLevel--; pParse->iCacheLevel--;
#ifdef SQLITE_DEBUG #ifdef SQLITE_DEBUG
@@ -3105,9 +3079,11 @@ void sqlite3ExprCachePop(Parse *pParse){
printf("POP to %d\n", pParse->iCacheLevel); printf("POP to %d\n", pParse->iCacheLevel);
} }
#endif #endif
for(i=0, p=pParse->aColCache; i<SQLITE_N_COLCACHE; i++, p++){ while( i<pParse->nColCache ){
if( p->iReg && p->iLevel>pParse->iCacheLevel ){ if( pParse->aColCache[i].iLevel>pParse->iCacheLevel ){
cacheEntryClear(pParse, p); cacheEntryClear(pParse, i);
}else{
i++;
} }
} }
} }
@@ -3121,7 +3097,7 @@ void sqlite3ExprCachePop(Parse *pParse){
static void sqlite3ExprCachePinRegister(Parse *pParse, int iReg){ static void sqlite3ExprCachePinRegister(Parse *pParse, int iReg){
int i; int i;
struct yColCache *p; struct yColCache *p;
for(i=0, p=pParse->aColCache; i<SQLITE_N_COLCACHE; i++, p++){ for(i=0, p=pParse->aColCache; i<pParse->nColCache; i++, p++){
if( p->iReg==iReg ){ if( p->iReg==iReg ){
p->tempReg = 0; p->tempReg = 0;
} }
@@ -3199,7 +3175,7 @@ int sqlite3ExprCodeGetColumn(
int i; int i;
struct yColCache *p; struct yColCache *p;
for(i=0, p=pParse->aColCache; i<SQLITE_N_COLCACHE; i++, p++){ for(i=0, p=pParse->aColCache; i<pParse->nColCache; i++, p++){
if( p->iReg>0 && p->iTable==iTable && p->iColumn==iColumn ){ if( p->iReg>0 && p->iTable==iTable && p->iColumn==iColumn ){
p->lru = pParse->iCacheCnt++; p->lru = pParse->iCacheCnt++;
sqlite3ExprCachePinRegister(pParse, p->iReg); sqlite3ExprCachePinRegister(pParse, p->iReg);
@@ -3232,18 +3208,20 @@ void sqlite3ExprCodeGetColumnToReg(
*/ */
void sqlite3ExprCacheClear(Parse *pParse){ void sqlite3ExprCacheClear(Parse *pParse){
int i; int i;
struct yColCache *p;
#if SQLITE_DEBUG #if SQLITE_DEBUG
if( pParse->db->flags & SQLITE_VdbeAddopTrace ){ if( pParse->db->flags & SQLITE_VdbeAddopTrace ){
printf("CLEAR\n"); printf("CLEAR\n");
} }
#endif #endif
for(i=0, p=pParse->aColCache; i<SQLITE_N_COLCACHE; i++, p++){ for(i=0; i<pParse->nColCache; i++){
if( p->iReg ){ if( pParse->aColCache[i].tempReg
cacheEntryClear(pParse, p); && pParse->nTempReg<ArraySize(pParse->aTempReg)
){
pParse->aTempReg[pParse->nTempReg++] = pParse->aColCache[i].iReg;
} }
} }
pParse->nColCache = 0;
} }
/* /*
@@ -3275,7 +3253,7 @@ void sqlite3ExprCodeMove(Parse *pParse, int iFrom, int iTo, int nReg){
static int usedAsColumnCache(Parse *pParse, int iFrom, int iTo){ static int usedAsColumnCache(Parse *pParse, int iFrom, int iTo){
int i; int i;
struct yColCache *p; struct yColCache *p;
for(i=0, p=pParse->aColCache; i<SQLITE_N_COLCACHE; i++, p++){ for(i=0, p=pParse->aColCache; i<pParse->nColCache; i++, p++){
int r = p->iReg; int r = p->iReg;
if( r>=iFrom && r<=iTo ) return 1; /*NO_TEST*/ if( r>=iFrom && r<=iTo ) return 1; /*NO_TEST*/
} }
@@ -4971,7 +4949,7 @@ void sqlite3ReleaseTempReg(Parse *pParse, int iReg){
if( iReg && pParse->nTempReg<ArraySize(pParse->aTempReg) ){ if( iReg && pParse->nTempReg<ArraySize(pParse->aTempReg) ){
int i; int i;
struct yColCache *p; struct yColCache *p;
for(i=0, p=pParse->aColCache; i<SQLITE_N_COLCACHE; i++, p++){ for(i=0, p=pParse->aColCache; i<pParse->nColCache; i++, p++){
if( p->iReg==iReg ){ if( p->iReg==iReg ){
p->tempReg = 1; p->tempReg = 1;
return; return;

3
src/vdbeaux.c
View File

@@ -184,9 +184,8 @@ int sqlite3VdbeAddOp3(Vdbe *p, int op, int p1, int p2, int p3){
if( p->db->flags & SQLITE_VdbeAddopTrace ){ if( p->db->flags & SQLITE_VdbeAddopTrace ){
int jj, kk; int jj, kk;
Parse *pParse = p->pParse; Parse *pParse = p->pParse;
for(jj=kk=0; jj<SQLITE_N_COLCACHE; jj++){ for(jj=kk=0; jj<pParse->nColCache; jj++){
struct yColCache *x = pParse->aColCache + jj; struct yColCache *x = pParse->aColCache + jj;
if( x->iLevel>pParse->iCacheLevel || x->iReg==0 ) continue;
printf(" r[%d]={%d:%d}", x->iReg, x->iTable, x->iColumn); printf(" r[%d]={%d:%d}", x->iReg, x->iTable, x->iColumn);
kk++; kk++;
} }