Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Fix compiler warnings. |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | begin-concurrent |
| Files: | files | file ages | folders |
| SHA3-256: |
44c760d150b494ddd88382360cfcc473 |
| User & Date: | drh 2017-07-20 19:08:35 |
Context
|
2017-07-20
| ||
| 19:28 | Minor fix to the concurrent.test module so that it works on windows. (check-in: 58553d61 user: drh tags: begin-concurrent) | |
| 19:08 | Fix compiler warnings. (check-in: 44c760d1 user: drh tags: begin-concurrent) | |
| 18:56 | Fix a faulty #ifdef on the previous check-in (check-in: 7355e742 user: drh tags: begin-concurrent) | |
Changes
Changes to src/btree.c.
4072 4073 4074 4075 4076 4077 4078 4079 4080 4081 4082 4083 4084 4085 4086 |
if( iNew==PENDING_BYTE_PAGE(pBt) ) iNew = ++(*pnCurrent);
rc = relocatePage(pBt, pPg, pEntry->eType, pEntry->parent, iNew, 1);
releasePageNotNull(pPg);
}else{
rc = allocateBtreePage(pBt, &pFree, &iNew, iFirst-1, BTALLOC_LE);
assert( rc!=SQLITE_OK || iNew<iFirst );
if( rc==SQLITE_OK ){
MemPage *pPg = 0;
releasePage(pFree);
btreeGetPage(pBt, iPg, &pPg, 0);
rc = relocatePage(pBt, pPg, pEntry->eType, pEntry->parent,iNew,1);
releasePage(pPg);
}
}
}
|
< |
4072 4073 4074 4075 4076 4077 4078 4079 4080 4081 4082 4083 4084 4085 |
if( iNew==PENDING_BYTE_PAGE(pBt) ) iNew = ++(*pnCurrent);
rc = relocatePage(pBt, pPg, pEntry->eType, pEntry->parent, iNew, 1);
releasePageNotNull(pPg);
}else{
rc = allocateBtreePage(pBt, &pFree, &iNew, iFirst-1, BTALLOC_LE);
assert( rc!=SQLITE_OK || iNew<iFirst );
if( rc==SQLITE_OK ){
releasePage(pFree);
btreeGetPage(pBt, iPg, &pPg, 0);
rc = relocatePage(pBt, pPg, pEntry->eType, pEntry->parent,iNew,1);
releasePage(pPg);
}
}
}
|
Changes to src/pager.c.
5470 5471 5472 5473 5474 5475 5476 5477 5478 5479 5480 5481 5482 5483 |
assert( assert_pager_state(pPager) );
assert( pPager->hasHeldSharedLock==1 );
#ifndef SQLITE_OMIT_CONCURRENT
/* If this is an CONCURRENT transaction and the page being read was
** present in the database file when the transaction was opened,
** mark it as read in the pAllRead vector. */
if( pPager->pAllRead && pgno<=pPager->dbOrigSize ){
rc = sqlite3BitvecSet(pPager->pAllRead, pgno);
if( rc!=SQLITE_OK ) goto pager_acquire_err;
}
#endif
if( pgno==0 ) return SQLITE_CORRUPT_BKPT;
|
> |
5470 5471 5472 5473 5474 5475 5476 5477 5478 5479 5480 5481 5482 5483 5484 |
assert( assert_pager_state(pPager) );
assert( pPager->hasHeldSharedLock==1 );
#ifndef SQLITE_OMIT_CONCURRENT
/* If this is an CONCURRENT transaction and the page being read was
** present in the database file when the transaction was opened,
** mark it as read in the pAllRead vector. */
pPg = 0;
if( pPager->pAllRead && pgno<=pPager->dbOrigSize ){
rc = sqlite3BitvecSet(pPager->pAllRead, pgno);
if( rc!=SQLITE_OK ) goto pager_acquire_err;
}
#endif
if( pgno==0 ) return SQLITE_CORRUPT_BKPT;
|
Changes to src/wal.c.
2895 2896 2897 2898 2899 2900 2901 2902 2903 2904 2905 2906 2907 2908 2909 2910 2911 |
for(iHash=walFramePage(iFirst); iHash<=iLastHash; iHash++){
volatile ht_slot *aHash;
volatile u32 *aPgno;
u32 iZero;
rc = walHashGet(pWal, iHash, &aHash, &aPgno, &iZero);
if( rc==SQLITE_OK ){
int i;
int iMin = (iFirst - iZero);
int iMax = (iHash==0) ? HASHTABLE_NPAGE_ONE : HASHTABLE_NPAGE;
if( iMin<1 ) iMin = 1;
if( iMax>head.mxFrame ) iMax = head.mxFrame;
for(i=iMin; rc==SQLITE_OK && i<=iMax; i++){
PgHdr *pPg;
if( aPgno[i]==1 ){
/* Check that the schema cookie has not been modified. If
** it has not, the commit can proceed. */
|
| > | | |
2895 2896 2897 2898 2899 2900 2901 2902 2903 2904 2905 2906 2907 2908 2909 2910 2911 2912 |
for(iHash=walFramePage(iFirst); iHash<=iLastHash; iHash++){
volatile ht_slot *aHash;
volatile u32 *aPgno;
u32 iZero;
rc = walHashGet(pWal, iHash, &aHash, &aPgno, &iZero);
if( rc==SQLITE_OK ){
u32 i, iMin, iMax;
assert( iFirst >= iZero );
iMin = (iFirst - iZero);
iMax = (iHash==0) ? HASHTABLE_NPAGE_ONE : HASHTABLE_NPAGE;
if( iMin<1 ) iMin = 1;
if( iMax>head.mxFrame ) iMax = head.mxFrame;
for(i=iMin; rc==SQLITE_OK && i<=iMax; i++){
PgHdr *pPg;
if( aPgno[i]==1 ){
/* Check that the schema cookie has not been modified. If
** it has not, the commit can proceed. */
|