Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Remove a couple of incorrect assert statements so that the test suite will run with -DSQLITE_DEFAULT_CACHE_SIZE=0. |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA1: |
87614b62ace530761e0e1170ec5840b2 |
| User & Date: | drh 2011-11-12 16:46:55 |
Context
|
2011-11-14
| ||
| 03:00 | Forward port the 8-byte alignment fix from branch-3.7.9. (check-in: ebf6eb6e user: drh tags: trunk) | |
|
2011-11-12
| ||
| 16:46 | Remove a couple of incorrect assert statements so that the test suite will run with -DSQLITE_DEFAULT_CACHE_SIZE=0. (check-in: 87614b62 user: drh tags: trunk) | |
| 15:41 | Merge the windows xSyscall enhancements into trunk. (check-in: c1fab9ac user: drh tags: trunk) | |
Changes
Changes to src/test_pcache.c.
157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 |
/*
** Set the cache size
*/
static void testpcacheCachesize(sqlite3_pcache *pCache, int newSize){
testpcache *p = (testpcache*)pCache;
assert( p->iMagic==TESTPCACHE_VALID );
assert( newSize>=1 );
assert( testpcacheGlobal.pDummy!=0 );
assert( testpcacheGlobal.nInstance>0 );
}
/*
** Return the number of pages in the cache that are being used.
** This includes both pinned and unpinned pages.
|
< |
157 158 159 160 161 162 163 164 165 166 167 168 169 170 |
/*
** Set the cache size
*/
static void testpcacheCachesize(sqlite3_pcache *pCache, int newSize){
testpcache *p = (testpcache*)pCache;
assert( p->iMagic==TESTPCACHE_VALID );
assert( testpcacheGlobal.pDummy!=0 );
assert( testpcacheGlobal.nInstance>0 );
}
/*
** Return the number of pages in the cache that are being used.
** This includes both pinned and unpinned pages.
|
Changes to src/wal.c.
2306 2307 2308 2309 2310 2311 2312 2313 2314 2315 2316 2317 2318 2319 2320 |
if( rc!=SQLITE_OK ){
return rc;
}
nCollide = HASHTABLE_NSLOT;
for(iKey=walHash(pgno); aHash[iKey]; iKey=walNextHash(iKey)){
u32 iFrame = aHash[iKey] + iZero;
if( iFrame<=iLast && aPgno[aHash[iKey]]==pgno ){
assert( iFrame>iRead );
iRead = iFrame;
}
if( (nCollide--)==0 ){
return SQLITE_CORRUPT_BKPT;
}
}
}
|
| |
2306 2307 2308 2309 2310 2311 2312 2313 2314 2315 2316 2317 2318 2319 2320 |
if( rc!=SQLITE_OK ){
return rc;
}
nCollide = HASHTABLE_NSLOT;
for(iKey=walHash(pgno); aHash[iKey]; iKey=walNextHash(iKey)){
u32 iFrame = aHash[iKey] + iZero;
if( iFrame<=iLast && aPgno[aHash[iKey]]==pgno ){
/* assert( iFrame>iRead ); -- not true if there is corruption */
iRead = iFrame;
}
if( (nCollide--)==0 ){
return SQLITE_CORRUPT_BKPT;
}
}
}
|
Changes to test/wal.test.
412
413
414
415
416
417
418
419
420
421
422
423
424
425
....
1120
1121
1122
1123
1124
1125
1126
1127
1128
1129
1130
1131
1132
1133
|
# Run some "warm-body" tests to ensure that log-summary files with more
# than 256 entries (log summaries that contain index blocks) work Ok.
#
do_test wal-9.1 {
reopen_db
execsql {
CREATE TABLE t1(x PRIMARY KEY);
INSERT INTO t1 VALUES(blob(900));
INSERT INTO t1 VALUES(blob(900));
INSERT INTO t1 SELECT blob(900) FROM t1; /* 4 */
INSERT INTO t1 SELECT blob(900) FROM t1; /* 8 */
INSERT INTO t1 SELECT blob(900) FROM t1; /* 16 */
INSERT INTO t1 SELECT blob(900) FROM t1; /* 32 */
................................................................................
sqlite3_simulate_device -sectorsize $sectorsize
sqlite3 db test.db -vfs devsym
do_test wal-17.$tn.1 {
execsql {
PRAGMA auto_vacuum = 0;
PRAGMA page_size = 512;
PRAGMA journal_mode = WAL;
PRAGMA synchronous = FULL;
}
execsql {
BEGIN;
CREATE TABLE t(x);
}
|
>
>
|
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
....
1121
1122
1123
1124
1125
1126
1127
1128
1129
1130
1131
1132
1133
1134
1135
|
# Run some "warm-body" tests to ensure that log-summary files with more
# than 256 entries (log summaries that contain index blocks) work Ok.
#
do_test wal-9.1 {
reopen_db
execsql {
PRAGMA cache_size=2000;
CREATE TABLE t1(x PRIMARY KEY);
INSERT INTO t1 VALUES(blob(900));
INSERT INTO t1 VALUES(blob(900));
INSERT INTO t1 SELECT blob(900) FROM t1; /* 4 */
INSERT INTO t1 SELECT blob(900) FROM t1; /* 8 */
INSERT INTO t1 SELECT blob(900) FROM t1; /* 16 */
INSERT INTO t1 SELECT blob(900) FROM t1; /* 32 */
................................................................................
sqlite3_simulate_device -sectorsize $sectorsize
sqlite3 db test.db -vfs devsym
do_test wal-17.$tn.1 {
execsql {
PRAGMA auto_vacuum = 0;
PRAGMA page_size = 512;
PRAGMA cache_size = -2000;
PRAGMA journal_mode = WAL;
PRAGMA synchronous = FULL;
}
execsql {
BEGIN;
CREATE TABLE t(x);
}
|