diff options
| author | dan <Dan Kennedy> | 2025-05-31 15:10:41 +0000 |
|---|---|---|
| committer | dan <Dan Kennedy> | 2025-05-31 15:10:41 +0000 |
| commit | 420233e37553f0c1539dbffeebd2e7be6de4be75 (patch) | |
| tree | 840e3089b1aae413bdbb65bafd2f03a7efb13fec /src | |
| parent | ded1959120db41174d720fc3a157cc648694d6f9 (diff) | |
| download | sqlite-420233e37553f0c1539dbffeebd2e7be6de4be75.tar.gz sqlite-420233e37553f0c1539dbffeebd2e7be6de4be75.zip | |
Fix assert() statements in os_unix.c and os_win.c. Allow walsetlk_recover.test to run in non-SQLITE_ENABLE_SNAPSHOT builds.
FossilOrigin-Name: 9f521ecda2b8d2f383cc84e308b3a4adfcf1bd6339eb834c8fa76c8704c861b7
Diffstat (limited to 'src')
| -rw-r--r-- | src/os_unix.c | 12 | ||||
| -rw-r--r-- | src/os_win.c | 11 |
2 files changed, 10 insertions, 13 deletions
diff --git a/src/os_unix.c b/src/os_unix.c index 5bbd7ceb6..784bc3517 100644 --- a/src/os_unix.c +++ b/src/os_unix.c @@ -5035,22 +5035,20 @@ static int unixShmLock( /* Check that, if this to be a blocking lock, no locks that occur later ** in the following list than the lock being obtained are already held: ** - ** 1. Checkpointer lock (ofst==1). - ** 2. Write lock (ofst==0). - ** 3. Read locks (ofst>=3 && ofst<SQLITE_SHM_NLOCK). + ** 1. Recovery lock (ofst==2). + ** 2. Checkpointer lock (ofst==1). + ** 3. Write lock (ofst==0). + ** 4. Read locks (ofst>=3 && ofst<SQLITE_SHM_NLOCK). ** ** In other words, if this is a blocking lock, none of the locks that ** occur later in the above list than the lock being obtained may be ** held. - ** - ** It is not permitted to block on the RECOVER lock if any other - ** locks are held. */ #if defined(SQLITE_ENABLE_SETLK_TIMEOUT) && defined(SQLITE_DEBUG) { u16 lockMask = (p->exclMask|p->sharedMask); assert( (flags & SQLITE_SHM_UNLOCK) || pDbFd->iBusyTimeout==0 || ( - (ofst!=2 || lockMask==0) /* not RECOVER */ + (ofst!=2 || lockMask==0) && (ofst!=1 || lockMask==0 || lockMask==2) && (ofst!=0 || lockMask<3) && (ofst<3 || lockMask<(1<<ofst)) diff --git a/src/os_win.c b/src/os_win.c index cd7e49190..c39b49e5e 100644 --- a/src/os_win.c +++ b/src/os_win.c @@ -4533,21 +4533,20 @@ static int winShmLock( /* Check that, if this to be a blocking lock, no locks that occur later ** in the following list than the lock being obtained are already held: ** - ** 1. Checkpointer lock (ofst==1). - ** 2. Write lock (ofst==0). - ** 3. Read locks (ofst>=3 && ofst<SQLITE_SHM_NLOCK). + ** 1. Recovery lock (ofst==2). + ** 2. Checkpointer lock (ofst==1). + ** 3. Write lock (ofst==0). + ** 4. Read locks (ofst>=3 && ofst<SQLITE_SHM_NLOCK). ** ** In other words, if this is a blocking lock, none of the locks that ** occur later in the above list than the lock being obtained may be ** held. - ** - ** It is not permitted to block on the RECOVER lock. */ #if defined(SQLITE_ENABLE_SETLK_TIMEOUT) && defined(SQLITE_DEBUG) { u16 lockMask = (p->exclMask|p->sharedMask); assert( (flags & SQLITE_SHM_UNLOCK) || pDbFd->iBusyTimeout==0 || ( - (ofst!=2) /* not RECOVER */ + (ofst!=2 || lockMask==0) && (ofst!=1 || lockMask==0 || lockMask==2) && (ofst!=0 || lockMask<3) && (ofst<3 || lockMask<(1<<ofst)) |