SQLite: Check-in [6f3dad32]

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview

Comment:	Change a testcase() added by the previous checkin into an assert().
Downloads:	Tarball \| ZIP archive \| SQL archive
Timelines:	family \| ancestors \| descendants \| both \| trunk
Files:	files \| file ages \| folders
SHA1:	6f3dad32aa0e1e9ee374302c82bea9bd60d5854b
User & Date:	drh 2011-02-19 17:02:44

Context

2011-02-19
23:18		An SQLITE_PROTOCOL error counts as a locking error for verification purposes. check-in: e87d499a user: drh tags: trunk
17:02		Change a testcase() added by the previous checkin into an assert(). check-in: 6f3dad32 user: drh tags: trunk
16:51		Add testcase macros to verify that all return values from walTryBeginRead() are tested. check-in: 262b6fca user: drh tags: trunk

Changes

Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to src/wal.c.

    walUnlockShared(pWal, WAL_READ_LOCK(0));
    pWal->readLock = -1;
    cnt = 0;
    do{
      int notUsed;
      rc = walTryBeginRead(pWal, &notUsed, 1, ++cnt);
    }while( rc==WAL_RETRY );
    testcase( (rc&0xff)==SQLITE_BUSY );
    testcase( (rc&0xff)==SQLITE_IOERR );
    testcase( rc==SQLITE_PROTOCOL );
    testcase( rc==SQLITE_OK );
  }
  return rc;
}

    walUnlockShared(pWal, WAL_READ_LOCK(0));
    pWal->readLock = -1;
    cnt = 0;
    do{
      int notUsed;
      rc = walTryBeginRead(pWal, &notUsed, 1, ++cnt);
    }while( rc==WAL_RETRY );
    assert( (rc&0xff)!=SQLITE_BUSY ); /* BUSY not possible when useWal==1 */
    testcase( (rc&0xff)==SQLITE_IOERR );
    testcase( rc==SQLITE_PROTOCOL );
    testcase( rc==SQLITE_OK );
  }
  return rc;
}