From 6bd3faa09248a8ec70e706041afeac42610f443b Mon Sep 17 00:00:00 2001 From: dan Date: Fri, 22 Nov 2024 21:24:08 +0000 Subject: [PATCH 001/194] Supports SQLITE_ENABLE_SETLK_TIMEOUT on windows. Does not work properly yet. FossilOrigin-Name: 737ca8a9fb9dc74b28f2186d93c5101463497445d0fabba3def61fee29abf2c8 --- Makefile.msc | 10 + manifest | 27 +-- manifest.uuid | 2 +- src/mutex_w32.c | 16 +- src/os_unix.c | 1 - src/os_win.c | 472 ++++++++++++++++++++++++++++++++++----------- test/symlink2.test | 3 +- test/wal.test | 4 +- 8 files changed, 395 insertions(+), 140 deletions(-) diff --git a/Makefile.msc b/Makefile.msc index 32b8143768..c56f2d3051 100644 --- a/Makefile.msc +++ b/Makefile.msc @@ -292,6 +292,12 @@ SESSION = 0 RBU = 0 !ENDIF +# Set this to non-0 to enable support for blocking locks. +# +!IFNDEF SETLK_TIMEOUT +SETLK_TIMEOUT = 0 +!ENDIF + # Set the source code file to be used by executables and libraries when # they need the amalgamation. # @@ -448,6 +454,10 @@ EXT_FEATURE_FLAGS = !ENDIF !ENDIF +!IF $(SETLK_TIMEOUT)!=0 +OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_SETLK_TIMEOUT +!ENDIF + ############################################################################### ############################### END OF OPTIONS ################################ ############################################################################### diff --git a/manifest b/manifest index a1f3f97ae3..1a7b05d77f 100644 --- a/manifest +++ b/manifest @@ -1,11 +1,11 @@ -C Fix\sanother\sissue\sin\sargument\sexpansion\son\sWindows\sfor\stclsqlite3.c\sin\ninterpreter\smode.\s\sProblem\sintroduced\sby\scheck-in\s[9b87ea219bce5689]\sand\nunfixed\sby\s[cd942dce148c9d8f]. -D 2024-11-22T17:41:00.227 +C Supports\sSQLITE_ENABLE_SETLK_TIMEOUT\son\swindows.\sDoes\snot\swork\sproperly\syet. +D 2024-11-22T21:24:08.721 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d F Makefile.in 85f2c740cadf969abbd9a6210b8b76636dbf231b9d3efe977b060c3055fac5b9 F Makefile.linux-generic bd3e3cacd369821a6241d4ea1967395c962dfe3057e38cb0a435cee0e8b789d0 -F Makefile.msc a92237976eb92c5efaa0dd2524746aec12c196e12df8d4dbff9543a4648c3312 +F Makefile.msc 9a975438b8e06da44bc169b74aa9601cd48da52abd2c88e8a349c7d82b59d250 F README.md c3c0f19532ce28f6297a71870f3c7b424729f0e6d9ab889616d3587dd2332159 F VERSION 8dc0c3df15fd5ff0622f88fc483533fce990b1cbb2f5fb9fdfb4dbd71eef2889 F art/icon-243x273.gif 9750b734f82fdb3dc43127753d5e6fbf3b62c9f4e136c2fbf573b2f57ea87af5 @@ -751,15 +751,15 @@ F src/mutex.c 06bcd9c3dbf2d9b21fcd182606c00fafb9bfe0287983c8e17acd13d2c81a2fa9 F src/mutex.h a7b2293c48db5f27007c3bdb21d438873637d12658f5a0bf8ad025bb96803c4a F src/mutex_noop.c 9d4309c075ba9cc7249e19412d3d62f7f94839c4 F src/mutex_unix.c f7ee5a2061a4c11815a2bf4fc0e2bfa6fb8d9dc89390eb613ca0cec32fc9a3d1 -F src/mutex_w32.c 28f8d480387db5b2ef5248705dd4e19db0cfc12c3ba426695a7d2c45c48e6885 +F src/mutex_w32.c db182bf5aac08a16fbf5916d94974f5a11556fe150142fcabe36d6454e0d93a1 F src/notify.c 57c2d1a2805d6dee32acd5d250d928ab94e02d76369ae057dee7d445fd64e878 F src/os.c 509452169d5ea739723e213b8e2481cf0e587f0e88579a912d200db5269f5f6d F src/os.h 1ff5ae51d339d0e30d8a9d814f4b8f8e448169304d83a7ed9db66a65732f3e63 F src/os_common.h 6c0eb8dd40ef3e12fe585a13e709710267a258e2c8dd1c40b1948a1d14582e06 F src/os_kv.c 4d39e1f1c180b11162c6dc4aa8ad34053873a639bac6baae23272fc03349986a F src/os_setup.h 6011ad7af5db4e05155f385eb3a9b4470688de6f65d6166b8956e58a3d872107 -F src/os_unix.c d2edbd92b07a3f778c2defa8a2e9d75acceb6267bda56948c41e8cdda65224d6 -F src/os_win.c 49c7725b500f5867e8360e75eeb30f9d70b62fa1f05c8a101da627210578df32 +F src/os_unix.c d4a33e8fbd1c6eb722a21b6ce1eee1213ec856170a2f256d99f3d2978f054f5a +F src/os_win.c 2ed170fb6dba67952b7f07dfee71bb854463fb2fb51b0289fce5dec0fd075b0f F src/os_win.h 7b073010f1451abe501be30d12f6bc599824944a F src/pager.c 9656ad4e8331efb8a4f94f7a0c6440b98caea073950a367ea0c728a53b8e62c9 F src/pager.h 4b1140d691860de0be1347474c51fee07d5420bd7f802d38cbab8ea4ab9f538a @@ -1702,7 +1702,7 @@ F test/swarmvtab2.test c948cb2fdfc5b01d85e8f6d6504854202dc1a0782ab2a0ed61538f27c F test/swarmvtab3.test 41a3ab47cb7a834d4e5336425103b617410a67bb95d335ef536f887587ece073 F test/swarmvtabfault.test 8a67a9f27c61073a47990829e92bc0c64420a807cb642b15a25f6c788210ed95 F test/symlink.test 4368af0e213dd6e726a6240a16f2bb96a5a58f83f2d5d60652f27547b28cbf06 -F test/symlink2.test bf932ff7fe95c9dbb39d2a990df9098b0ea943233c97e40098e0a8d6b559a96f +F test/symlink2.test 0b7734533f198bbc46fb8ea984ffaea537c8ee949eaba8805a92ed9969573956 F test/sync.test 89539f4973c010eda5638407e71ca7fddbcd8e0594f4c9980229f804d4333092 F test/sync2.test 8f9f7d4f6d5be8ca8941a8dadcc4299e558cb6a1ff653a9469146c7a76ef2039 F test/syscall.test a067468b43b8cb2305e9f9fe414e5f40c875bb5d2cba5f00b8154396e95fcf37 @@ -1986,7 +1986,7 @@ F test/vtab_shared.test 5253bff2355a9a3f014c15337da7e177ab0ef8ad F test/vtabdistinct.test 7688f0889358f849fd60bbfde1ded38b014b18066076d4bfbb75395804dfe072 F test/vtabdrop.test 65d4cf6722972e5499bdaf0c0d70ee3b8133944a4e4bc31862563f32a7edca12 F test/vtabrhs1.test 9b5ecbc74a689500c33a4b2b36761f9bcc22fcc4e3f9d21066ee0c9c74cf5f6c -F test/wal.test 519c550255c78f55959e9159b93ebbfad2b4e9f36f5b76284da41f572f9d27da +F test/wal.test 3628a18ed2ba1cad58978802381f89e6076d225d5c93836d3eed464f867fa288 F test/wal2.test e89ca97593b5e92849039f6b68ce1719a853ef20fa22c669ec1ac452fbc31cab F test/wal3.test 5de023bb862fd1eb9d2ad26fa8d9c43abb5370582e5b08b2ae0d6f93661bc310 F test/wal4.test 4744e155cd6299c6bd99d3eab1c82f77db9cdb3c @@ -2199,8 +2199,11 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P 3d6ae13805bdba4c73b7443f20073264cdd157299cb911228600e1528a136bb1 -R f112fd2beffd3eb814301c3676676b3e -U drh -Z 113c5b5aab1719624bc6c7ebe0ae9b2d +P 0fe1622cec95b7ebecc127ee57a08113d3da1dadbe72c03a13d6751b3043e50f +R ee8b39ab71f10eb6a0db7f5e0c48bbd2 +T *branch * win32-enable-setlk +T *sym-win32-enable-setlk * +T -sym-trunk * +U dan +Z e8f9e025559e2dfd331c377d699a5f1c # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 8cd2bbe8d4..3a08657fec 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -0fe1622cec95b7ebecc127ee57a08113d3da1dadbe72c03a13d6751b3043e50f +737ca8a9fb9dc74b28f2186d93c5101463497445d0fabba3def61fee29abf2c8 diff --git a/src/mutex_w32.c b/src/mutex_w32.c index 7eb5b50be1..7b411018f5 100644 --- a/src/mutex_w32.c +++ b/src/mutex_w32.c @@ -314,22 +314,12 @@ static int winMutexTry(sqlite3_mutex *p){ /* ** The sqlite3_mutex_try() routine is very rarely used, and when it ** is used it is merely an optimization. So it is OK for it to always - ** fail. - ** - ** The TryEnterCriticalSection() interface is only available on WinNT. - ** And some windows compilers complain if you try to use it without - ** first doing some #defines that prevent SQLite from building on Win98. - ** For that reason, we will omit this optimization for now. See - ** ticket #2685. + ** fail on some platforms. But - it is required for ENABLE_SETLK_TIMEOUT + ** builds. */ #if defined(_WIN32_WINNT) && _WIN32_WINNT >= 0x0400 assert( winMutex_isInit==1 ); - assert( winMutex_isNt>=-1 && winMutex_isNt<=1 ); - if( winMutex_isNt<0 ){ - winMutex_isNt = sqlite3_win32_is_nt(); - } - assert( winMutex_isNt==0 || winMutex_isNt==1 ); - if( winMutex_isNt && TryEnterCriticalSection(&p->mutex) ){ + if( sqlite3_win32_is_nt() && TryEnterCriticalSection(&p->mutex) ){ #ifdef SQLITE_DEBUG p->owner = tid; p->nRef++; diff --git a/src/os_unix.c b/src/os_unix.c index b1996278c8..77855a8dd0 100644 --- a/src/os_unix.c +++ b/src/os_unix.c @@ -4290,7 +4290,6 @@ static int unixGetpagesize(void){ ** ** nRef ** -** The following fields are read-only after the object is created: ** ** hShm ** zFilename diff --git a/src/os_win.c b/src/os_win.c index 8ce1647f60..ff094e8d14 100644 --- a/src/os_win.c +++ b/src/os_win.c @@ -287,6 +287,9 @@ struct winFile { sqlite3_int64 mmapSize; /* Size of mapped region */ sqlite3_int64 mmapSizeMax; /* Configured FCNTL_MMAP_SIZE value */ #endif +#ifdef SQLITE_ENABLE_SETLK_TIMEOUT + unsigned iBusyTimeout; /* Wait this many millisec on locks */ +#endif }; /* @@ -1453,6 +1456,9 @@ int sqlite3_win32_is_nt(void){ } return osInterlockedCompareExchange(&sqlite3_os_type, 2, 2)==2; #elif SQLITE_TEST +#ifdef SQLITE_ENABLE_SETLK_TIMEOUT + return 1; +#endif return osInterlockedCompareExchange(&sqlite3_os_type, 2, 2)==2; #else /* @@ -2540,6 +2546,73 @@ static BOOL winLockFile( #endif } +/* +** Lock a region of nByte bytes starting at offset offset of file phFile. +** Take an EXCLUSIVE lock if parameter bExclusive is true, or a SHARED lock +** otherwise. If nMs is greater than zero and the lock cannot be obtained +** immediately, block for that many ms before giving up. +** +** If parameter pMutex is not NULL, then +** +** This function returns SQLITE_OK if the lock is obtained successfully. If +** some other process holds the lock, SQLITE_BUSY is returned if nMs==0, or +** SQLITE_BUSY_TIMEOUT otherwise. Or, if an error occurs, SQLITE_IOERR. +*/ +static int winLockFileTimeout( + LPHANDLE phFile, + sqlite3_mutex *pMutex, + DWORD offset, + DWORD nByte, + int bExcl, + int nMs +){ + DWORD flags = LOCKFILE_FAIL_IMMEDIATELY | (bExcl?LOCKFILE_EXCLUSIVE_LOCK:0); + int rc = SQLITE_OK; + BOOL ret; + +#if !defined(SQLITE_ENABLE_SETLK_TIMEOUT) + ret = winLockFile(phFile, flags, offset, 0, nByte, 0); +#else + if( !osIsNT() ){ + ret = winLockFile(phFile, flags, offset, 0, nByte, 0); + }else{ + OVERLAPPED ovlp; + memset(&ovlp, 0, sizeof(OVERLAPPED)); + ovlp.Offset = offset; + if( nMs>0 ){ + ovlp.hEvent = CreateEvent(NULL, TRUE, FALSE, NULL); + if( ovlp.hEvent==NULL ){ + return SQLITE_IOERR; + } + } + + ret = osLockFileEx(*phFile, flags, 0, nByte, 0, &ovlp); + + if( nMs>0 ){ + if( !ret ){ + DWORD res = WaitForSingleObject(ovlp.hEvent, (DWORD)nMs); + if( res==WAIT_OBJECT_0 ){ + /* Successfully obtained the lock. */ + ret = TRUE; + }else if( res==WAIT_TIMEOUT ){ + /* Timeout */ + rc = SQLITE_BUSY_TIMEOUT; + }else{ + /* Some other error has occurred */ + rc = SQLITE_IOERR; + } + } + CloseHandle(ovlp.hEvent); + } + } +#endif /* defined(SQLITE_ENABLE_SETLK_TIMEOUT) */ + + if( rc==SQLITE_OK && !ret ){ + rc = SQLITE_BUSY; + } + return rc; +} + /* ** Unlock a file region. */ @@ -3640,6 +3713,22 @@ static int winFileControl(sqlite3_file *id, int op, void *pArg){ return rc; } #endif + +#ifdef SQLITE_ENABLE_SETLK_TIMEOUT + case SQLITE_FCNTL_LOCK_TIMEOUT: { + int iOld = pFile->iBusyTimeout; +#if SQLITE_ENABLE_SETLK_TIMEOUT==1 + pFile->iBusyTimeout = *(int*)pArg; +#elif SQLITE_ENABLE_SETLK_TIMEOUT==2 + pFile->iBusyTimeout = !!(*(int*)pArg); +#else +# error "SQLITE_ENABLE_SETLK_TIMEOUT must be set to 1 or 2" +#endif + *(int*)pArg = iOld; + return SQLITE_OK; + } +#endif + } OSTRACE(("FCNTL file=%p, rc=SQLITE_NOTFOUND\n", pFile->h)); return SQLITE_NOTFOUND; @@ -3720,13 +3809,31 @@ static int winShmMutexHeld(void) { ** ** The following fields are read-only after the object is created: ** -** fid +** hFile ** zFilename ** ** Either winShmNode.mutex must be held or winShmNode.nRef==0 and ** winShmMutexHeld() is true when reading or writing any other field ** in this structure. ** +** aMutex[SQLITE_SHM_NLOCK]: +** Normally, when SQLITE_ENABLE_SETLK_TIMEOUT is not defined, mutex +** winShmNode.mutex is used to serialize calls to the xShmLock() +** method. +** +** For SQLITE_ENABLE_SETLK_TIMEOUT builds, xShmLock() only takes the +** mutexes in the aMutex[] array that correspond to locks being taken +** or released. This means that: +** +** * Modifying the winShmNode.pFirst list requires holding *all* +** the locks in the aMutex[] array. +** +** * Reads and writes to winShm.sharedMask and winShm.exclMask must +** use AtomicLoad() and AtomicStore(). This is because it may be +** read by other threads while it is being modified. +** +** TODO: winShmNode.mutex is held for the space of time when LockFileEx() +** is called on winShmNode.hFile. */ struct winShmNode { sqlite3_mutex *mutex; /* Mutex to access this object */ @@ -3747,11 +3854,38 @@ struct winShmNode { int nRef; /* Number of winShm objects pointing to this */ winShm *pFirst; /* All winShm objects pointing to this */ winShmNode *pNext; /* Next in list of all winShmNode objects */ +#ifdef SQLITE_ENABLE_SETLK_TIMEOUT + sqlite3_mutex *aMutex[SQLITE_SHM_NLOCK]; +#endif #if defined(SQLITE_DEBUG) || defined(SQLITE_HAVE_OS_TRACE) u8 nextShmId; /* Next available winShm.id value */ #endif }; +/* +** Enter/leave the mutex required to modify the winShmNode.pFirst list. +*/ +static void winShmListMutexEnter(winShmNode *pShmNode){ +#ifdef SQLITE_ENABLE_SETLK_TIMEOUT + int ii; + for(ii=0; iiaMutex[ii]); + } +#else + sqlite3_mutex_enter(pShmNode->mutex); +#endif +} +static void winShmListMutexLeave(winShmNode *pShmNode){ +#ifdef SQLITE_ENABLE_SETLK_TIMEOUT + int ii; + for(ii=0; iiaMutex[ii]); + } +#else + sqlite3_mutex_leave(pShmNode->mutex); +#endif +} + /* ** A global array of all winShmNode objects. ** @@ -3796,39 +3930,48 @@ struct winShm { #define WINSHM_RDLCK 2 #define WINSHM_WRLCK 3 static int winShmSystemLock( - winShmNode *pFile, /* Apply locks to this open shared-memory segment */ + winFile *pDbFd, /* Apply locks to this open shared-memory segment */ int lockType, /* WINSHM_UNLCK, WINSHM_RDLCK, or WINSHM_WRLCK */ int ofst, /* Offset to first byte to be locked/unlocked */ int nByte /* Number of bytes to lock or unlock */ ){ + winShmNode *pShmNode = pDbFd->pShm->pShmNode; int rc = 0; /* Result code form Lock/UnlockFileEx() */ /* Access to the winShmNode object is serialized by the caller */ - assert( pFile->nRef==0 || sqlite3_mutex_held(pFile->mutex) ); + /* assert( pShmNode->nRef==0 || sqlite3_mutex_held(pShmNode->mutex) ); */ OSTRACE(("SHM-LOCK file=%p, lock=%d, offset=%d, size=%d\n", - pFile->hFile.h, lockType, ofst, nByte)); + pShmNode->hFile.h, lockType, ofst, nByte)); /* Release/Acquire the system-level lock */ if( lockType==WINSHM_UNLCK ){ - rc = winUnlockFile(&pFile->hFile.h, ofst, 0, nByte, 0); + int ret = winUnlockFile(&pShmNode->hFile.h, ofst, 0, nByte, 0); + if( ret==0 ){ + pShmNode->lastErrno = osGetLastError(); + rc = SQLITE_ERROR; + } }else{ /* Initialize the locking parameters */ +#if SQLITE_ENABLE_SETLK_TIMEOUT + rc = winLockFileTimeout(&pShmNode->hFile.h, pShmNode->mutex, ofst, nByte, + (lockType==WINSHM_WRLCK), pDbFd->iBusyTimeout); +#else DWORD dwFlags = LOCKFILE_FAIL_IMMEDIATELY; if( lockType == WINSHM_WRLCK ) dwFlags |= LOCKFILE_EXCLUSIVE_LOCK; - rc = winLockFile(&pFile->hFile.h, dwFlags, ofst, 0, nByte, 0); - } - - if( rc!= 0 ){ - rc = SQLITE_OK; - }else{ - pFile->lastErrno = osGetLastError(); - rc = SQLITE_BUSY; + rc = winLockFile(&pShmNode->hFile.h, dwFlags, ofst, 0, nByte, 0); + if( rc!=0 ){ + rc = SQLITE_OK; + }else{ + pShmNode->lastErrno = osGetLastError(); + rc = SQLITE_BUSY; + } +#endif } OSTRACE(("SHM-LOCK file=%p, func=%s, errno=%lu, rc=%s\n", - pFile->hFile.h, (lockType == WINSHM_UNLCK) ? "winUnlockFile" : - "winLockFile", pFile->lastErrno, sqlite3ErrName(rc))); + pShmNode->hFile.h, (lockType == WINSHM_UNLCK) ? "winUnlockFile" : + "winLockFile", pShmNode->lastErrno, sqlite3ErrName(rc))); return rc; } @@ -3854,6 +3997,12 @@ static void winShmPurge(sqlite3_vfs *pVfs, int deleteFlag){ if( p->nRef==0 ){ int i; if( p->mutex ){ sqlite3_mutex_free(p->mutex); } +#ifdef SQLITE_ENABLE_SETLK_TIMEOUT + /* Free the contents of the winShmNode.aMutex[] array */ + for(i=0; iaMutex[i]); + } +#endif for(i=0; inRegion; i++){ BOOL bRc = osUnmapViewOfFile(p->aRegion[i].pMap); OSTRACE(("SHM-PURGE-UNMAP pid=%lu, region=%d, rc=%s\n", @@ -3886,34 +4035,35 @@ static void winShmPurge(sqlite3_vfs *pVfs, int deleteFlag){ } /* -** The DMS lock has not yet been taken on shm file pShmNode. Attempt to -** take it now. Return SQLITE_OK if successful, or an SQLite error -** code otherwise. +** The DMS lock has not yet been taken on the shm file attached to +** pDbFd. Attempt to take it now. Return SQLITE_OK if successful, or an +** SQLite error code otherwise. ** ** If the DMS cannot be locked because this is a readonly_shm=1 ** connection and no other process already holds a lock, return ** SQLITE_READONLY_CANTINIT and set pShmNode->isUnlocked=1. */ -static int winLockSharedMemory(winShmNode *pShmNode){ - int rc = winShmSystemLock(pShmNode, WINSHM_WRLCK, WIN_SHM_DMS, 1); +static int winLockSharedMemory(winFile *pDbFd){ + winShmNode *pShmNode = pDbFd->pShm->pShmNode; + int rc = winShmSystemLock(pDbFd, WINSHM_WRLCK, WIN_SHM_DMS, 1); if( rc==SQLITE_OK ){ if( pShmNode->isReadonly ){ pShmNode->isUnlocked = 1; - winShmSystemLock(pShmNode, WINSHM_UNLCK, WIN_SHM_DMS, 1); + winShmSystemLock(pDbFd, WINSHM_UNLCK, WIN_SHM_DMS, 1); return SQLITE_READONLY_CANTINIT; }else if( winTruncate((sqlite3_file*)&pShmNode->hFile, 0) ){ - winShmSystemLock(pShmNode, WINSHM_UNLCK, WIN_SHM_DMS, 1); + winShmSystemLock(pDbFd, WINSHM_UNLCK, WIN_SHM_DMS, 1); return winLogError(SQLITE_IOERR_SHMOPEN, osGetLastError(), "winLockSharedMemory", pShmNode->zFilename); } } if( rc==SQLITE_OK ){ - winShmSystemLock(pShmNode, WINSHM_UNLCK, WIN_SHM_DMS, 1); + winShmSystemLock(pDbFd, WINSHM_UNLCK, WIN_SHM_DMS, 1); } - return winShmSystemLock(pShmNode, WINSHM_RDLCK, WIN_SHM_DMS, 1); + return winShmSystemLock(pDbFd, WINSHM_RDLCK, WIN_SHM_DMS, 1); } /* @@ -3975,6 +4125,20 @@ static int winOpenSharedMemory(winFile *pDbFd){ rc = SQLITE_IOERR_NOMEM_BKPT; goto shm_open_err; } +#ifdef SQLITE_ENABLE_SETLK_TIMEOUT + /* If SETLK_TIMEOUT is defined, also allocate the array of mutexes + ** stored in pShmNode->aMutex[]. */ + { + int ii; + for(ii=0; iiaMutex[ii] = sqlite3_mutex_alloc(SQLITE_MUTEX_FAST); + if( pShmNode->aMutex[ii]==0 ){ + rc = SQLITE_IOERR_NOMEM_BKPT; + goto shm_open_err; + } + } + } +#endif } if( 0==sqlite3_uri_boolean(pDbFd->zPath, "readonly_shm", 0) ){ @@ -3992,7 +4156,10 @@ static int winOpenSharedMemory(winFile *pDbFd){ } if( outFlags==SQLITE_OPEN_READONLY ) pShmNode->isReadonly = 1; - rc = winLockSharedMemory(pShmNode); + p->pShmNode = pShmNode; + pDbFd->pShm = p; + rc = winLockSharedMemory(pDbFd); + pDbFd->pShm = 0; if( rc!=SQLITE_OK && rc!=SQLITE_READONLY_CANTINIT ) goto shm_open_err; } @@ -4012,15 +4179,16 @@ static int winOpenSharedMemory(winFile *pDbFd){ ** at pShmNode->pFirst. This must be done while holding the pShmNode->mutex ** mutex. */ - sqlite3_mutex_enter(pShmNode->mutex); + winShmListMutexEnter(pShmNode); p->pNext = pShmNode->pFirst; pShmNode->pFirst = p; - sqlite3_mutex_leave(pShmNode->mutex); + winShmListMutexLeave(pShmNode); return rc; /* Jump here on any error */ shm_open_err: - winShmSystemLock(pShmNode, WINSHM_UNLCK, WIN_SHM_DMS, 1); + + winUnlockFile(&pShmNode->hFile.h, WIN_SHM_DMS, 0, 1, 0); winShmPurge(pDbFd->pVfs, 0); /* This call frees pShmNode if required */ sqlite3_free(p); sqlite3_free(pNew); @@ -4048,14 +4216,14 @@ static int winShmUnmap( /* Remove connection p from the set of connections associated ** with pShmNode */ - sqlite3_mutex_enter(pShmNode->mutex); + winShmListMutexEnter(pShmNode); for(pp=&pShmNode->pFirst; (*pp)!=p; pp = &(*pp)->pNext){} *pp = p->pNext; + winShmListMutexLeave(pShmNode); /* Free the connection p */ sqlite3_free(p); pDbFd->pShm = 0; - sqlite3_mutex_leave(pShmNode->mutex); /* If pShmNode->nRef has reached 0, then close the underlying ** shared-memory file, too */ @@ -4084,7 +4252,7 @@ static int winShmLock( winShm *pX; /* For looping over all siblings */ winShmNode *pShmNode; int rc = SQLITE_OK; /* Result code */ - u16 mask; /* Mask of locks to take or release */ + u16 mask = (u16)((1U<<(ofst+n)) - (1U<pShmNode; @@ -4098,85 +4266,169 @@ static int winShmLock( || flags==(SQLITE_SHM_UNLOCK | SQLITE_SHM_EXCLUSIVE) ); assert( n==1 || (flags & SQLITE_SHM_EXCLUSIVE)!=0 ); - mask = (u16)((1U<<(ofst+n)) - (1U<1 || mask==(1<mutex); - if( flags & SQLITE_SHM_UNLOCK ){ - u16 allMask = 0; /* Mask of locks held by siblings */ - - /* See if any siblings hold this same lock */ - for(pX=pShmNode->pFirst; pX; pX=pX->pNext){ - if( pX==p ) continue; - assert( (pX->exclMask & (p->exclMask|p->sharedMask))==0 ); - allMask |= pX->sharedMask; - } - - /* Unlock the system-level locks */ - if( (mask & allMask)==0 ){ - rc = winShmSystemLock(pShmNode, WINSHM_UNLCK, ofst+WIN_SHM_BASE, n); - }else{ - rc = SQLITE_OK; - } - - /* Undo the local locks */ - if( rc==SQLITE_OK ){ - p->exclMask &= ~mask; - p->sharedMask &= ~mask; - } - }else if( flags & SQLITE_SHM_SHARED ){ - u16 allShared = 0; /* Union of locks held by connections other than "p" */ - - /* Find out which shared locks are already held by sibling connections. - ** If any sibling already holds an exclusive lock, go ahead and return - ** SQLITE_BUSY. - */ - for(pX=pShmNode->pFirst; pX; pX=pX->pNext){ - if( (pX->exclMask & mask)!=0 ){ - rc = SQLITE_BUSY; - break; - } - allShared |= pX->sharedMask; - } - - /* Get shared locks at the system level, if necessary */ - if( rc==SQLITE_OK ){ - if( (allShared & mask)==0 ){ - rc = winShmSystemLock(pShmNode, WINSHM_RDLCK, ofst+WIN_SHM_BASE, n); - }else{ - rc = SQLITE_OK; - } - } - - /* Get the local shared locks */ - if( rc==SQLITE_OK ){ - p->sharedMask |= mask; - } - }else{ - /* Make sure no sibling connections hold locks that will block this - ** lock. If any do, return SQLITE_BUSY right away. - */ - for(pX=pShmNode->pFirst; pX; pX=pX->pNext){ - if( (pX->exclMask & mask)!=0 || (pX->sharedMask & mask)!=0 ){ - rc = SQLITE_BUSY; - break; - } - } - - /* Get the exclusive locks at the system level. Then if successful - ** also mark the local connection as being locked. - */ - if( rc==SQLITE_OK ){ - rc = winShmSystemLock(pShmNode, WINSHM_WRLCK, ofst+WIN_SHM_BASE, n); - if( rc==SQLITE_OK ){ - assert( (p->sharedMask & mask)==0 ); - p->exclMask |= mask; - } - } + /* 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 && ofstexclMask|p->sharedMask); + assert( (flags & SQLITE_SHM_UNLOCK) || pDbFd->iBusyTimeout==0 || ( + (ofst!=2) /* not RECOVER */ + && (ofst!=1 || lockMask==0 || lockMask==2) + && (ofst!=0 || lockMask<3) + && (ofst<3 || lockMask<(1<mutex); - OSTRACE(("SHM-LOCK pid=%lu, id=%d, sharedMask=%03x, exclMask=%03x, rc=%s\n", - osGetCurrentProcessId(), p->id, p->sharedMask, p->exclMask, - sqlite3ErrName(rc))); +#endif + + /* Check if there is any work to do. There are three cases: + ** + ** a) An unlock operation where there are locks to unlock, + ** b) An shared lock where the requested lock is not already held + ** c) An exclusive lock where the requested lock is not already held + ** + ** The SQLite core never requests an exclusive lock that it already holds. + ** This is assert()ed below. + */ + assert( flags!=(SQLITE_SHM_EXCLUSIVE|SQLITE_SHM_LOCK) + || 0==(p->exclMask & mask) + ); + if( ((flags & SQLITE_SHM_UNLOCK) && ((p->exclMask|p->sharedMask) & mask)) + || (flags==(SQLITE_SHM_SHARED|SQLITE_SHM_LOCK) && 0==(p->sharedMask & mask)) + || (flags==(SQLITE_SHM_EXCLUSIVE|SQLITE_SHM_LOCK)) + ){ + + /* Take the required mutexes. In SETLK_TIMEOUT mode (blocking locks), if + ** this is an attempt on an exclusive lock use sqlite3_mutex_try(). If any + ** other thread is holding this mutex, then it is either holding or about + ** to hold a lock exclusive to the one being requested, and we may + ** therefore return SQLITE_BUSY to the caller. + ** + ** Doing this prevents some deadlock scenarios. For example, thread 1 may + ** be a checkpointer blocked waiting on the WRITER lock. And thread 2 + ** may be a normal SQL client upgrading to a write transaction. In this + ** case thread 2 does a non-blocking request for the WRITER lock. But - + ** if it were to use sqlite3_mutex_enter() then it would effectively + ** become a (doomed) blocking request, as thread 2 would block until thread + ** 1 obtained WRITER and released the mutex. Since thread 2 already holds + ** a lock on a read-locking slot at this point, this breaks the + ** anti-deadlock rules (see above). */ +#ifdef SQLITE_ENABLE_SETLK_TIMEOUT + int iMutex; + for(iMutex=ofst; iMutexaMutex[iMutex]); + if( rc!=SQLITE_OK ) break; + }else{ + sqlite3_mutex_enter(pShmNode->aMutex[iMutex]); + } + } +#else + sqlite3_mutex_enter(pShmNode->mutex); +#endif + + if( rc==SQLITE_OK ){ + if( flags & SQLITE_SHM_UNLOCK ){ + /* Case (a) - unlock. */ + u16 allMask = 0; /* Mask of locks held by siblings */ + + assert( (p->exclMask & p->sharedMask)==0 ); + assert( !(flags & SQLITE_SHM_EXCLUSIVE) || (p->exclMask & mask)==mask ); + assert( !(flags & SQLITE_SHM_SHARED) || (p->sharedMask & mask)==mask ); + + /* If this is a shared lock, check if any other connection in this + ** process is holding the same shared lock. If one or more are, then + ** do not unlock the system-level lock held on the file-handle. */ + if( flags & SQLITE_SHM_SHARED ){ + for(pX=pShmNode->pFirst; pX; pX=pX->pNext){ + if( pX==p ) continue; + allMask |= AtomicLoad(&pX->sharedMask); + } + } + if( (mask & allMask)==0 ){ + rc = winShmSystemLock(pDbFd, WINSHM_UNLCK, ofst+WIN_SHM_BASE, n); + } + + /* Undo the local locks */ + if( rc==SQLITE_OK ){ + AtomicStore(&p->exclMask, p->exclMask & ~mask); + AtomicStore(&p->sharedMask, p->sharedMask & ~mask); + } + }else if( flags & SQLITE_SHM_SHARED ){ + /* Case (b) - a shared lock. */ + int bLocked = 0; /* True if process already holds shared lock */ + assert( n==1 ); + + /* See what locks are held by other connections within this process. If + ** any are holding an EXCLUSIVE lock, then this call will return + ** SQLITE_BUSY. Or, if any are holding a SHARED lock, then there is no + ** need to obtain a new system-level lock. */ + for(pX=pShmNode->pFirst; pX; pX=pX->pNext){ + u16 mExcl = AtomicLoad(&pX->exclMask); + u16 mShared = AtomicLoad(&pX->sharedMask); + if( mExcl & mask ) rc = SQLITE_BUSY; + if( mShared & mask ){ + bLocked = 1; + } + } + + if( rc==SQLITE_OK && bLocked==0 ){ + rc = winShmSystemLock(pDbFd, WINSHM_RDLCK, ofst+WIN_SHM_BASE, n); + } + + /* Get the local shared lock */ + if( rc==SQLITE_OK ){ + AtomicStore(&p->sharedMask, p->sharedMask | mask); + } + }else{ + /* Case (c) - an exclusive lock. */ + assert( flags==(SQLITE_SHM_LOCK|SQLITE_SHM_EXCLUSIVE) ); + assert( (p->sharedMask & mask)==0 ); + assert( (p->exclMask & mask)==0 ); + + /* Make sure no sibling connections hold locks that will block this + ** lock. If any do, return SQLITE_BUSY right away. */ + for(pX=pShmNode->pFirst; pX; pX=pX->pNext){ + u16 mExcl = AtomicLoad(&pX->exclMask); + u16 mShared = AtomicLoad(&pX->sharedMask); + if( (mExcl|mShared) & mask ) rc = SQLITE_BUSY; + } + + /* Get the exclusive locks at the system level. If successful, + ** also update the in-memory values. */ + if( rc==SQLITE_OK ){ + rc = winShmSystemLock(pDbFd, WINSHM_WRLCK, ofst+WIN_SHM_BASE, n); + if( rc==SQLITE_OK ){ + AtomicStore(&p->exclMask, p->exclMask | mask); + } + } + } + } + + /* Release the mutex(es) taken at the top of this block */ +#ifdef SQLITE_ENABLE_SETLK_TIMEOUT + for(iMutex--; iMutex>=ofst; iMutex--){ + sqlite3_mutex_leave(pShmNode->aMutex[iMutex]); + } +#else + sqlite3_mutex_leave(pShmNode->mutex); +#endif + } + + OSTRACE(( + "SHM-LOCK(%d,%d,%d) pid=%lu, id=%d, sharedMask=%03x, exclMask=%03x, rc=%s\n", + ofst, n, flags, osGetCurrentProcessId(), p->id, p->sharedMask, p->exclMask, + sqlite3ErrName(rc))); return rc; } @@ -4238,7 +4490,7 @@ static int winShmMap( sqlite3_mutex_enter(pShmNode->mutex); if( pShmNode->isUnlocked ){ - rc = winLockSharedMemory(pShmNode); + rc = winLockSharedMemory(pDbFd); if( rc!=SQLITE_OK ) goto shmpage_out; pShmNode->isUnlocked = 0; } diff --git a/test/symlink2.test b/test/symlink2.test index 9a2237e4c0..3564e5c399 100644 --- a/test/symlink2.test +++ b/test/symlink2.test @@ -37,10 +37,11 @@ proc canCreateWin32Symlink {} { set link [file join $::testdir lnk[pid].sym] if {[file exists $link]} { return 0 } set target [info nameofexecutable] - if {[catch {createWin32Symlink $link $target}] == 0} { + if {[catch {createWin32Symlink $link $target} msg] == 0} { deleteWin32Symlink $link return 1 } + puts $msg return 0 } diff --git a/test/wal.test b/test/wal.test index 50988debe3..533e51c21b 100644 --- a/test/wal.test +++ b/test/wal.test @@ -506,7 +506,7 @@ do_multiclient_test tn { do_test wal-10.$tn.6 { sql3 {SELECT * FROM t1} } {1 2 3 4 5 6} - do_test wal-10.$tn.7 { + do_test wal-10.$tn.7a { sql2 COMMIT } {} @@ -521,7 +521,7 @@ do_multiclient_test tn { # to the database (as it is not locked and [db] is reading the latest # snapshot). # - do_test wal-10.$tn.7 { + do_test wal-10.$tn.7b { sql2 { BEGIN; INSERT INTO t1 VALUES(7, 8) ; } catchsql { INSERT INTO t1 VALUES(9, 10) } } {1 {database is locked}} From 1743c5f8369a58b90d212be840b12d88c658f47c Mon Sep 17 00:00:00 2001 From: dan Date: Mon, 25 Nov 2024 16:54:10 +0000 Subject: [PATCH 002/194] Fixes for code on this branch. Now appears to work, but is not tested well. FossilOrigin-Name: 0568fc6dde41dd29e85e697cd1865feb4db6aaae09d5e5100b3f97cab93590eb --- manifest | 15 ++++++--------- manifest.uuid | 2 +- src/os_win.c | 50 +++++++++++++++++++++++++++++++++++--------------- 3 files changed, 42 insertions(+), 25 deletions(-) diff --git a/manifest b/manifest index 1a7b05d77f..0179473058 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Supports\sSQLITE_ENABLE_SETLK_TIMEOUT\son\swindows.\sDoes\snot\swork\sproperly\syet. -D 2024-11-22T21:24:08.721 +C Fixes\sfor\scode\son\sthis\sbranch.\sNow\sappears\sto\swork,\sbut\sis\snot\stested\swell. +D 2024-11-25T16:54:10.680 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d @@ -759,7 +759,7 @@ F src/os_common.h 6c0eb8dd40ef3e12fe585a13e709710267a258e2c8dd1c40b1948a1d14582e F src/os_kv.c 4d39e1f1c180b11162c6dc4aa8ad34053873a639bac6baae23272fc03349986a F src/os_setup.h 6011ad7af5db4e05155f385eb3a9b4470688de6f65d6166b8956e58a3d872107 F src/os_unix.c d4a33e8fbd1c6eb722a21b6ce1eee1213ec856170a2f256d99f3d2978f054f5a -F src/os_win.c 2ed170fb6dba67952b7f07dfee71bb854463fb2fb51b0289fce5dec0fd075b0f +F src/os_win.c 89ba97de6b7b022a4955cc63cc75535ed8d792be8e68455c753996ebef7ec9ba F src/os_win.h 7b073010f1451abe501be30d12f6bc599824944a F src/pager.c 9656ad4e8331efb8a4f94f7a0c6440b98caea073950a367ea0c728a53b8e62c9 F src/pager.h 4b1140d691860de0be1347474c51fee07d5420bd7f802d38cbab8ea4ab9f538a @@ -2199,11 +2199,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P 0fe1622cec95b7ebecc127ee57a08113d3da1dadbe72c03a13d6751b3043e50f -R ee8b39ab71f10eb6a0db7f5e0c48bbd2 -T *branch * win32-enable-setlk -T *sym-win32-enable-setlk * -T -sym-trunk * +P 737ca8a9fb9dc74b28f2186d93c5101463497445d0fabba3def61fee29abf2c8 +R 67627b8a16f9542753e5ce4ea1a59b13 U dan -Z e8f9e025559e2dfd331c377d699a5f1c +Z aaacd08c676a64c2d5781697fad0f96f # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 3a08657fec..c9c2983cae 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -737ca8a9fb9dc74b28f2186d93c5101463497445d0fabba3def61fee29abf2c8 +0568fc6dde41dd29e85e697cd1865feb4db6aaae09d5e5100b3f97cab93590eb diff --git a/src/os_win.c b/src/os_win.c index ff094e8d14..be13d8348f 100644 --- a/src/os_win.c +++ b/src/os_win.c @@ -15,6 +15,11 @@ #include "sqliteInt.h" #if SQLITE_OS_WIN /* This file is used for Windows only */ +/* +** TODO: This must not clash with any other SQLITE_OPEN_XXX flag in sqlite3.h. +*/ +#define WIN32_OPEN_SHM 0x80000000 + /* ** Include code that is common to all os_*.c files */ @@ -2559,7 +2564,7 @@ static BOOL winLockFile( ** SQLITE_BUSY_TIMEOUT otherwise. Or, if an error occurs, SQLITE_IOERR. */ static int winLockFileTimeout( - LPHANDLE phFile, + HANDLE hFile, sqlite3_mutex *pMutex, DWORD offset, DWORD nByte, @@ -2571,37 +2576,43 @@ static int winLockFileTimeout( BOOL ret; #if !defined(SQLITE_ENABLE_SETLK_TIMEOUT) - ret = winLockFile(phFile, flags, offset, 0, nByte, 0); + ret = winLockFile(&hFile, flags, offset, 0, nByte, 0); #else if( !osIsNT() ){ - ret = winLockFile(phFile, flags, offset, 0, nByte, 0); + ret = winLockFile(&hFile, flags, offset, 0, nByte, 0); }else{ OVERLAPPED ovlp; memset(&ovlp, 0, sizeof(OVERLAPPED)); ovlp.Offset = offset; + if( nMs>0 ){ ovlp.hEvent = CreateEvent(NULL, TRUE, FALSE, NULL); if( ovlp.hEvent==NULL ){ return SQLITE_IOERR; } + flags &= ~LOCKFILE_FAIL_IMMEDIATELY; } - ret = osLockFileEx(*phFile, flags, 0, nByte, 0, &ovlp); - - if( nMs>0 ){ - if( !ret ){ - DWORD res = WaitForSingleObject(ovlp.hEvent, (DWORD)nMs); - if( res==WAIT_OBJECT_0 ){ - /* Successfully obtained the lock. */ - ret = TRUE; - }else if( res==WAIT_TIMEOUT ){ - /* Timeout */ + ret = osLockFileEx(hFile, flags, 0, nByte, 0, &ovlp); + if( !ret && nMs>0 && GetLastError()==ERROR_IO_PENDING ){ + DWORD res = WaitForSingleObject(ovlp.hEvent, (DWORD)nMs); + if( res==WAIT_OBJECT_0 ){ + /* Successfully obtained the lock. */ + ret = TRUE; + }else{ + if( res==WAIT_TIMEOUT ){ rc = SQLITE_BUSY_TIMEOUT; }else{ /* Some other error has occurred */ rc = SQLITE_IOERR; } + + /* Cancel the LockFileEx() if it is still pending. */ + CancelIo(hFile); } + } + + if( nMs>0 ){ CloseHandle(ovlp.hEvent); } } @@ -3954,7 +3965,7 @@ static int winShmSystemLock( }else{ /* Initialize the locking parameters */ #if SQLITE_ENABLE_SETLK_TIMEOUT - rc = winLockFileTimeout(&pShmNode->hFile.h, pShmNode->mutex, ofst, nByte, + rc = winLockFileTimeout(pShmNode->hFile.h, pShmNode->mutex, ofst, nByte, (lockType==WINSHM_WRLCK), pDbFd->iBusyTimeout); #else DWORD dwFlags = LOCKFILE_FAIL_IMMEDIATELY; @@ -4110,7 +4121,7 @@ static int winOpenSharedMemory(winFile *pDbFd){ if( pShmNode ){ sqlite3_free(pNew); }else{ - int inFlags = SQLITE_OPEN_WAL; + int inFlags = SQLITE_OPEN_WAL | WIN32_OPEN_SHM; int outFlags = 0; pShmNode = pNew; @@ -5443,6 +5454,15 @@ static int winOpen( dwFlagsAndAttributes |= FILE_FLAG_RANDOM_ACCESS; #endif + /* If we are really opening a *-shm file, and ENABLE_SETLK is defined, + ** open the file for overlapped-IO. This is to facilitate blocking locks + ** with timeouts, which use asynchronous IO on windows. */ +#ifdef SQLITE_ENABLE_SETLK_TIMEOUT + if( flags & WIN32_OPEN_SHM ){ + dwFlagsAndAttributes |= FILE_FLAG_OVERLAPPED; + } +#endif + if( osIsNT() ){ #if SQLITE_OS_WINRT CREATEFILE2_EXTENDED_PARAMETERS extendedParameters; From f6d267491cc0d453b7c6dddc4fdfadaf1285f40b Mon Sep 17 00:00:00 2001 From: dan Date: Mon, 25 Nov 2024 18:47:12 +0000 Subject: [PATCH 003/194] Ensure that file-handle winShmNode.hFile.h is used in a thread-safe manner. FossilOrigin-Name: 7a32b497ab16774021924a8536e1025a0a01740a6484f0de17623a69713511d8 --- manifest | 12 ++++++------ manifest.uuid | 2 +- src/os_win.c | 5 +++++ 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/manifest b/manifest index 0179473058..ef5b1b6e2a 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Fixes\sfor\scode\son\sthis\sbranch.\sNow\sappears\sto\swork,\sbut\sis\snot\stested\swell. -D 2024-11-25T16:54:10.680 +C Ensure\sthat\sfile-handle\swinShmNode.hFile.h\sis\sused\sin\sa\sthread-safe\smanner. +D 2024-11-25T18:47:12.655 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d @@ -759,7 +759,7 @@ F src/os_common.h 6c0eb8dd40ef3e12fe585a13e709710267a258e2c8dd1c40b1948a1d14582e F src/os_kv.c 4d39e1f1c180b11162c6dc4aa8ad34053873a639bac6baae23272fc03349986a F src/os_setup.h 6011ad7af5db4e05155f385eb3a9b4470688de6f65d6166b8956e58a3d872107 F src/os_unix.c d4a33e8fbd1c6eb722a21b6ce1eee1213ec856170a2f256d99f3d2978f054f5a -F src/os_win.c 89ba97de6b7b022a4955cc63cc75535ed8d792be8e68455c753996ebef7ec9ba +F src/os_win.c cb99f2aa71667d0e2a8ec3dc581e6d87e98d69e5f129a5a55682b8676c3335f5 F src/os_win.h 7b073010f1451abe501be30d12f6bc599824944a F src/pager.c 9656ad4e8331efb8a4f94f7a0c6440b98caea073950a367ea0c728a53b8e62c9 F src/pager.h 4b1140d691860de0be1347474c51fee07d5420bd7f802d38cbab8ea4ab9f538a @@ -2199,8 +2199,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P 737ca8a9fb9dc74b28f2186d93c5101463497445d0fabba3def61fee29abf2c8 -R 67627b8a16f9542753e5ce4ea1a59b13 +P 0568fc6dde41dd29e85e697cd1865feb4db6aaae09d5e5100b3f97cab93590eb +R 29dcaec0b27ea041629c89021b3c05a9 U dan -Z aaacd08c676a64c2d5781697fad0f96f +Z eadef2d7e6fcb938f86bea8ab56027fe # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index c9c2983cae..9e645cc8ba 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -0568fc6dde41dd29e85e697cd1865feb4db6aaae09d5e5100b3f97cab93590eb +7a32b497ab16774021924a8536e1025a0a01740a6484f0de17623a69713511d8 diff --git a/src/os_win.c b/src/os_win.c index be13d8348f..e7ed668584 100644 --- a/src/os_win.c +++ b/src/os_win.c @@ -2579,7 +2579,9 @@ static int winLockFileTimeout( ret = winLockFile(&hFile, flags, offset, 0, nByte, 0); #else if( !osIsNT() ){ + sqlite3_mutex_enter(pMutex); ret = winLockFile(&hFile, flags, offset, 0, nByte, 0); + sqlite3_mutex_leave(pMutex); }else{ OVERLAPPED ovlp; memset(&ovlp, 0, sizeof(OVERLAPPED)); @@ -2593,7 +2595,10 @@ static int winLockFileTimeout( flags &= ~LOCKFILE_FAIL_IMMEDIATELY; } + sqlite3_mutex_enter(pMutex); ret = osLockFileEx(hFile, flags, 0, nByte, 0, &ovlp); + sqlite3_mutex_leave(pMutex); + if( !ret && nMs>0 && GetLastError()==ERROR_IO_PENDING ){ DWORD res = WaitForSingleObject(ovlp.hEvent, (DWORD)nMs); if( res==WAIT_OBJECT_0 ){ From a1801314540a16f9cbf64f66f078d5065227b876 Mon Sep 17 00:00:00 2001 From: dan Date: Sat, 30 Nov 2024 20:00:54 +0000 Subject: [PATCH 004/194] On windows, use a separate handle for each connection for xShmLock() locks. FossilOrigin-Name: 272d552f126357d7bc16d84f13a4bea823abc6ef7faf90e3cffcedb68210f52a --- manifest | 12 +- manifest.uuid | 2 +- src/os_win.c | 715 +++++++++++++++++++++----------------------------- 3 files changed, 305 insertions(+), 424 deletions(-) diff --git a/manifest b/manifest index ef5b1b6e2a..c411fc8ac9 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Ensure\sthat\sfile-handle\swinShmNode.hFile.h\sis\sused\sin\sa\sthread-safe\smanner. -D 2024-11-25T18:47:12.655 +C On\swindows,\suse\sa\sseparate\shandle\sfor\seach\sconnection\sfor\sxShmLock()\slocks. +D 2024-11-30T20:00:54.166 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d @@ -759,7 +759,7 @@ F src/os_common.h 6c0eb8dd40ef3e12fe585a13e709710267a258e2c8dd1c40b1948a1d14582e F src/os_kv.c 4d39e1f1c180b11162c6dc4aa8ad34053873a639bac6baae23272fc03349986a F src/os_setup.h 6011ad7af5db4e05155f385eb3a9b4470688de6f65d6166b8956e58a3d872107 F src/os_unix.c d4a33e8fbd1c6eb722a21b6ce1eee1213ec856170a2f256d99f3d2978f054f5a -F src/os_win.c cb99f2aa71667d0e2a8ec3dc581e6d87e98d69e5f129a5a55682b8676c3335f5 +F src/os_win.c 723fde7bfc915a3651620337788a7c2120b216e057d1c70ffad15b6389a59ff1 F src/os_win.h 7b073010f1451abe501be30d12f6bc599824944a F src/pager.c 9656ad4e8331efb8a4f94f7a0c6440b98caea073950a367ea0c728a53b8e62c9 F src/pager.h 4b1140d691860de0be1347474c51fee07d5420bd7f802d38cbab8ea4ab9f538a @@ -2199,8 +2199,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P 0568fc6dde41dd29e85e697cd1865feb4db6aaae09d5e5100b3f97cab93590eb -R 29dcaec0b27ea041629c89021b3c05a9 +P 7a32b497ab16774021924a8536e1025a0a01740a6484f0de17623a69713511d8 +R aa1565a5ee340c089d18e4ebbcdc312d U dan -Z eadef2d7e6fcb938f86bea8ab56027fe +Z 8c1e110aa2184c18c39efa79a8266428 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 9e645cc8ba..2963ba4d75 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -7a32b497ab16774021924a8536e1025a0a01740a6484f0de17623a69713511d8 +272d552f126357d7bc16d84f13a4bea823abc6ef7faf90e3cffcedb68210f52a diff --git a/src/os_win.c b/src/os_win.c index e7ed668584..82ec15f3b9 100644 --- a/src/os_win.c +++ b/src/os_win.c @@ -15,11 +15,6 @@ #include "sqliteInt.h" #if SQLITE_OS_WIN /* This file is used for Windows only */ -/* -** TODO: This must not clash with any other SQLITE_OPEN_XXX flag in sqlite3.h. -*/ -#define WIN32_OPEN_SHM 0x80000000 - /* ** Include code that is common to all os_*.c files */ @@ -2552,20 +2547,17 @@ static BOOL winLockFile( } /* -** Lock a region of nByte bytes starting at offset offset of file phFile. +** Lock a region of nByte bytes starting at offset offset of file hFile. ** Take an EXCLUSIVE lock if parameter bExclusive is true, or a SHARED lock ** otherwise. If nMs is greater than zero and the lock cannot be obtained ** immediately, block for that many ms before giving up. ** -** If parameter pMutex is not NULL, then -** ** This function returns SQLITE_OK if the lock is obtained successfully. If ** some other process holds the lock, SQLITE_BUSY is returned if nMs==0, or ** SQLITE_BUSY_TIMEOUT otherwise. Or, if an error occurs, SQLITE_IOERR. */ static int winLockFileTimeout( HANDLE hFile, - sqlite3_mutex *pMutex, DWORD offset, DWORD nByte, int bExcl, @@ -2579,9 +2571,7 @@ static int winLockFileTimeout( ret = winLockFile(&hFile, flags, offset, 0, nByte, 0); #else if( !osIsNT() ){ - sqlite3_mutex_enter(pMutex); ret = winLockFile(&hFile, flags, offset, 0, nByte, 0); - sqlite3_mutex_leave(pMutex); }else{ OVERLAPPED ovlp; memset(&ovlp, 0, sizeof(OVERLAPPED)); @@ -2595,9 +2585,7 @@ static int winLockFileTimeout( flags &= ~LOCKFILE_FAIL_IMMEDIATELY; } - sqlite3_mutex_enter(pMutex); ret = osLockFileEx(hFile, flags, 0, nByte, 0, &ovlp); - sqlite3_mutex_leave(pMutex); if( !ret && nMs>0 && GetLastError()==ERROR_IO_PENDING ){ DWORD res = WaitForSingleObject(ovlp.hEvent, (DWORD)nMs); @@ -2618,7 +2606,7 @@ static int winLockFileTimeout( } if( nMs>0 ){ - CloseHandle(ovlp.hEvent); + osCloseHandle(ovlp.hEvent); } } #endif /* defined(SQLITE_ENABLE_SETLK_TIMEOUT) */ @@ -2660,6 +2648,11 @@ static BOOL winUnlockFile( #endif } +static int winHandleUnlock(HANDLE h, int iOff, int nByte){ + BOOL ret = winUnlockFile(&h, iOff, 0, nByte, 0); + return (ret ? SQLITE_OK : SQLITE_IOERR_UNLOCK); +} + /***************************************************************************** ** The next group of routines implement the I/O methods specified ** by the sqlite3_io_methods object. @@ -2673,66 +2666,70 @@ static BOOL winUnlockFile( #endif /* -** Move the current position of the file handle passed as the first -** argument to offset iOffset within the file. If successful, return 0. -** Otherwise, set pFile->lastErrno and return non-zero. +** Seek the file handle h to offset nByte of the file. +** +** If successful, return SQLITE_OK. Or, if an error occurs, return an SQLite +** error code. */ -static int winSeekFile(winFile *pFile, sqlite3_int64 iOffset){ +static int winHandleSeek(HANDLE h, sqlite3_int64 iOffset){ + int rc = SQLITE_OK; /* Return value */ + #if !SQLITE_OS_WINRT LONG upperBits; /* Most sig. 32 bits of new offset */ LONG lowerBits; /* Least sig. 32 bits of new offset */ DWORD dwRet; /* Value returned by SetFilePointer() */ - DWORD lastErrno; /* Value returned by GetLastError() */ - - OSTRACE(("SEEK file=%p, offset=%lld\n", pFile->h, iOffset)); upperBits = (LONG)((iOffset>>32) & 0x7fffffff); lowerBits = (LONG)(iOffset & 0xffffffff); + dwRet = osSetFilePointer(h, lowerBits, &upperBits, FILE_BEGIN); + /* API oddity: If successful, SetFilePointer() returns a dword ** containing the lower 32-bits of the new file-offset. Or, if it fails, ** it returns INVALID_SET_FILE_POINTER. However according to MSDN, ** INVALID_SET_FILE_POINTER may also be a valid new offset. So to determine ** whether an error has actually occurred, it is also necessary to call - ** GetLastError(). - */ - dwRet = osSetFilePointer(pFile->h, lowerBits, &upperBits, FILE_BEGIN); - - if( (dwRet==INVALID_SET_FILE_POINTER - && ((lastErrno = osGetLastError())!=NO_ERROR)) ){ - pFile->lastErrno = lastErrno; - winLogError(SQLITE_IOERR_SEEK, pFile->lastErrno, - "winSeekFile", pFile->zPath); - OSTRACE(("SEEK file=%p, rc=SQLITE_IOERR_SEEK\n", pFile->h)); - return 1; + ** GetLastError(). */ + if( dwRet==INVALID_SET_FILE_POINTER ){ + DWORD lastErrno = osGetLastError(); + if( lastErrno!=NO_ERROR ){ + rc = SQLITE_IOERR_SEEK; + } } - - OSTRACE(("SEEK file=%p, rc=SQLITE_OK\n", pFile->h)); - return 0; #else - /* - ** Same as above, except that this implementation works for WinRT. - */ - + /* This implementation works for WinRT. */ LARGE_INTEGER x; /* The new offset */ BOOL bRet; /* Value returned by SetFilePointerEx() */ x.QuadPart = iOffset; - bRet = osSetFilePointerEx(pFile->h, x, 0, FILE_BEGIN); + bRet = osSetFilePointerEx(h, x, 0, FILE_BEGIN); if(!bRet){ - pFile->lastErrno = osGetLastError(); - winLogError(SQLITE_IOERR_SEEK, pFile->lastErrno, - "winSeekFile", pFile->zPath); - OSTRACE(("SEEK file=%p, rc=SQLITE_IOERR_SEEK\n", pFile->h)); - return 1; + rc = SQLITE_IOERR_SEEK; } - - OSTRACE(("SEEK file=%p, rc=SQLITE_OK\n", pFile->h)); - return 0; #endif + + OSTRACE(("SEEK file=%p, offset=%lld rc=%s\n", h, iOffset, sqlite3ErrName(rc))); + return rc; } +/* +** Move the current position of the file handle passed as the first +** argument to offset iOffset within the file. If successful, return 0. +** Otherwise, set pFile->lastErrno and return non-zero. +*/ +static int winSeekFile(winFile *pFile, sqlite3_int64 iOffset){ + int rc; + + rc = winHandleSeek(pFile->h, iOffset); + if( rc!=SQLITE_OK ){ + pFile->lastErrno = osGetLastError(); + winLogError(rc, pFile->lastErrno, "winSeekFile", pFile->zPath); + } + return rc; +} + + #if SQLITE_MAX_MMAP_SIZE>0 /* Forward references to VFS helper methods used for memory mapped files */ static int winMapfile(winFile*, sqlite3_int64); @@ -2992,6 +2989,52 @@ static int winWrite( return SQLITE_OK; } +/* +** Truncate the file opened by handle h to nByte bytes in size. +*/ +static int winHandleTruncate(HANDLE h, sqlite3_int64 nByte){ + int rc = SQLITE_OK; /* Return code */ + rc = winHandleSeek(h, nByte); + if( rc==SQLITE_OK ){ + if( 0==osSetEndOfFile(h) ){ + rc = SQLITE_IOERR_TRUNCATE; + } + } + return rc; +} + +/* +** Determine the size in bytes of the file opened by the handle passed as +** the first argument. +*/ +static int winHandleSize(HANDLE h, sqlite3_int64 *pnByte){ + int rc = SQLITE_OK; + +#if SQLITE_OS_WINRT + FILE_STANDARD_INFO info; + BOOL b; + b = osGetFileInformationByHandleEx(h, FileStandardInfo, &info, sizeof(info)); + if( b ){ + *pnByte = info.EndOfFile.QuadPart; + }else{ + rc = SQLITE_IOERR_FSTAT; + } +#else + DWORD upperBits = 0; + DWORD lowerBits = 0; + DWORD lastErrno = 0; + + lowerBits = osGetFileSize(h, &upperBits); + *pnByte = (((sqlite3_int64)upperBits)<<32) + lowerBits; + + if( lowerBits==INVALID_FILE_SIZE && osGetLastError()!=NO_ERROR ){ + rc = SQLITE_IOERR_FSTAT; + } +#endif + + return rc; +} + /* ** Truncate an open file to a specified size */ @@ -3854,12 +3897,12 @@ static int winShmMutexHeld(void) { struct winShmNode { sqlite3_mutex *mutex; /* Mutex to access this object */ char *zFilename; /* Name of the file */ - winFile hFile; /* File handle from winOpen */ + HANDLE hSharedShm; /* File handle open on zFilename */ + int isUnlocked; /* DMS lock has not yet been obtained */ + int isReadonly; /* True if read-only */ int szRegion; /* Size of shared-memory regions */ int nRegion; /* Size of array apRegion */ - u8 isReadonly; /* True if read-only */ - u8 isUnlocked; /* True if no DMS lock held */ struct ShmRegion { HANDLE hMap; /* File handle from CreateFileMapping */ @@ -3870,38 +3913,12 @@ struct winShmNode { int nRef; /* Number of winShm objects pointing to this */ winShm *pFirst; /* All winShm objects pointing to this */ winShmNode *pNext; /* Next in list of all winShmNode objects */ -#ifdef SQLITE_ENABLE_SETLK_TIMEOUT - sqlite3_mutex *aMutex[SQLITE_SHM_NLOCK]; -#endif + #if defined(SQLITE_DEBUG) || defined(SQLITE_HAVE_OS_TRACE) u8 nextShmId; /* Next available winShm.id value */ #endif }; -/* -** Enter/leave the mutex required to modify the winShmNode.pFirst list. -*/ -static void winShmListMutexEnter(winShmNode *pShmNode){ -#ifdef SQLITE_ENABLE_SETLK_TIMEOUT - int ii; - for(ii=0; iiaMutex[ii]); - } -#else - sqlite3_mutex_enter(pShmNode->mutex); -#endif -} -static void winShmListMutexLeave(winShmNode *pShmNode){ -#ifdef SQLITE_ENABLE_SETLK_TIMEOUT - int ii; - for(ii=0; iiaMutex[ii]); - } -#else - sqlite3_mutex_leave(pShmNode->mutex); -#endif -} - /* ** A global array of all winShmNode objects. ** @@ -3925,9 +3942,10 @@ static winShmNode *winShmNodeList = 0; struct winShm { winShmNode *pShmNode; /* The underlying winShmNode object */ winShm *pNext; /* Next winShm with the same winShmNode */ - u8 hasMutex; /* True if holding the winShmNode mutex */ u16 sharedMask; /* Mask of shared locks held */ u16 exclMask; /* Mask of exclusive locks held */ + HANDLE hShm; /* File-handle on *-shm file. For locking. */ + int bReadonly; /* True if hShm is opened read-only */ #if defined(SQLITE_DEBUG) || defined(SQLITE_HAVE_OS_TRACE) u8 id; /* Id of this connection with its winShmNode */ #endif @@ -3939,59 +3957,6 @@ struct winShm { #define WIN_SHM_BASE ((22+SQLITE_SHM_NLOCK)*4) /* first lock byte */ #define WIN_SHM_DMS (WIN_SHM_BASE+SQLITE_SHM_NLOCK) /* deadman switch */ -/* -** Apply advisory locks for all n bytes beginning at ofst. -*/ -#define WINSHM_UNLCK 1 -#define WINSHM_RDLCK 2 -#define WINSHM_WRLCK 3 -static int winShmSystemLock( - winFile *pDbFd, /* Apply locks to this open shared-memory segment */ - int lockType, /* WINSHM_UNLCK, WINSHM_RDLCK, or WINSHM_WRLCK */ - int ofst, /* Offset to first byte to be locked/unlocked */ - int nByte /* Number of bytes to lock or unlock */ -){ - winShmNode *pShmNode = pDbFd->pShm->pShmNode; - int rc = 0; /* Result code form Lock/UnlockFileEx() */ - - /* Access to the winShmNode object is serialized by the caller */ - /* assert( pShmNode->nRef==0 || sqlite3_mutex_held(pShmNode->mutex) ); */ - - OSTRACE(("SHM-LOCK file=%p, lock=%d, offset=%d, size=%d\n", - pShmNode->hFile.h, lockType, ofst, nByte)); - - /* Release/Acquire the system-level lock */ - if( lockType==WINSHM_UNLCK ){ - int ret = winUnlockFile(&pShmNode->hFile.h, ofst, 0, nByte, 0); - if( ret==0 ){ - pShmNode->lastErrno = osGetLastError(); - rc = SQLITE_ERROR; - } - }else{ - /* Initialize the locking parameters */ -#if SQLITE_ENABLE_SETLK_TIMEOUT - rc = winLockFileTimeout(pShmNode->hFile.h, pShmNode->mutex, ofst, nByte, - (lockType==WINSHM_WRLCK), pDbFd->iBusyTimeout); -#else - DWORD dwFlags = LOCKFILE_FAIL_IMMEDIATELY; - if( lockType == WINSHM_WRLCK ) dwFlags |= LOCKFILE_EXCLUSIVE_LOCK; - rc = winLockFile(&pShmNode->hFile.h, dwFlags, ofst, 0, nByte, 0); - if( rc!=0 ){ - rc = SQLITE_OK; - }else{ - pShmNode->lastErrno = osGetLastError(); - rc = SQLITE_BUSY; - } -#endif - } - - OSTRACE(("SHM-LOCK file=%p, func=%s, errno=%lu, rc=%s\n", - pShmNode->hFile.h, (lockType == WINSHM_UNLCK) ? "winUnlockFile" : - "winLockFile", pShmNode->lastErrno, sqlite3ErrName(rc))); - - return rc; -} - /* Forward references to VFS methods */ static int winOpen(sqlite3_vfs*,const char*,sqlite3_file*,int,int*); static int winDelete(sqlite3_vfs *,const char*,int); @@ -4013,12 +3978,6 @@ static void winShmPurge(sqlite3_vfs *pVfs, int deleteFlag){ if( p->nRef==0 ){ int i; if( p->mutex ){ sqlite3_mutex_free(p->mutex); } -#ifdef SQLITE_ENABLE_SETLK_TIMEOUT - /* Free the contents of the winShmNode.aMutex[] array */ - for(i=0; iaMutex[i]); - } -#endif for(i=0; inRegion; i++){ BOOL bRc = osUnmapViewOfFile(p->aRegion[i].pMap); OSTRACE(("SHM-PURGE-UNMAP pid=%lu, region=%d, rc=%s\n", @@ -4029,10 +3988,8 @@ static void winShmPurge(sqlite3_vfs *pVfs, int deleteFlag){ osGetCurrentProcessId(), i, bRc ? "ok" : "failed")); UNUSED_VARIABLE_VALUE(bRc); } - if( p->hFile.h!=NULL && p->hFile.h!=INVALID_HANDLE_VALUE ){ - SimulateIOErrorBenign(1); - winClose((sqlite3_file *)&p->hFile); - SimulateIOErrorBenign(0); + if( p->hSharedShm!=NULL && p->hSharedShm!=INVALID_HANDLE_VALUE ){ + osCloseHandle(p->hSharedShm); } if( deleteFlag ){ SimulateIOErrorBenign(1); @@ -4051,43 +4008,118 @@ static void winShmPurge(sqlite3_vfs *pVfs, int deleteFlag){ } /* -** The DMS lock has not yet been taken on the shm file attached to -** pDbFd. Attempt to take it now. Return SQLITE_OK if successful, or an -** SQLite error code otherwise. -** -** If the DMS cannot be locked because this is a readonly_shm=1 -** connection and no other process already holds a lock, return -** SQLITE_READONLY_CANTINIT and set pShmNode->isUnlocked=1. +** The DMS lock has not yet been taken on the shm file associated with +** pShmNode. Take the lock. Truncate the *-shm file if required. +** Return SQLITE_OK if successful, or an SQLite error code otherwise. */ -static int winLockSharedMemory(winFile *pDbFd){ - winShmNode *pShmNode = pDbFd->pShm->pShmNode; - int rc = winShmSystemLock(pDbFd, WINSHM_WRLCK, WIN_SHM_DMS, 1); +static int winLockSharedMemory(winShmNode *pShmNode){ + HANDLE h = pShmNode->hSharedShm; + int rc = SQLITE_OK; + + rc = winLockFileTimeout(h, WIN_SHM_DMS, 1, 1, 0); + if( rc==SQLITE_OK ){ + /* We have an EXCLUSIVE lock on the DMS byte. This means that this + ** is the first process to open the file. Truncate it to zero bytes + ** in this case. */ + if( pShmNode->isReadonly ){ + rc = SQLITE_READONLY_CANTINIT; + }else{ + rc = winHandleTruncate(h, 0); + } + + /* Release the EXCLUSIVE lock acquired above. */ + winUnlockFile(&h, WIN_SHM_DMS, 0, 1, 0); + }else if( (rc & 0xFF)==SQLITE_BUSY ){ + rc = SQLITE_OK; + } if( rc==SQLITE_OK ){ - if( pShmNode->isReadonly ){ - pShmNode->isUnlocked = 1; - winShmSystemLock(pDbFd, WINSHM_UNLCK, WIN_SHM_DMS, 1); - return SQLITE_READONLY_CANTINIT; - }else if( winTruncate((sqlite3_file*)&pShmNode->hFile, 0) ){ - winShmSystemLock(pDbFd, WINSHM_UNLCK, WIN_SHM_DMS, 1); - return winLogError(SQLITE_IOERR_SHMOPEN, osGetLastError(), - "winLockSharedMemory", pShmNode->zFilename); + /* Take a SHARED lock on the DMS byte. */ + rc = winLockFileTimeout(h, WIN_SHM_DMS, 1, 0, 0); + if( rc==SQLITE_OK ){ + pShmNode->isUnlocked = 0; } } - if( rc==SQLITE_OK ){ - winShmSystemLock(pDbFd, WINSHM_UNLCK, WIN_SHM_DMS, 1); + return rc; +} + + +/* +** Convert a UTF-8 filename into whatever form the underlying +** operating system wants filenames in. Space to hold the result +** is obtained from malloc and must be freed by the calling +** function. +*/ +static void *winConvertFromUtf8Filename(const char *zFilename){ + void *zConverted = 0; + if( osIsNT() ){ + zConverted = winUtf8ToUnicode(zFilename); + } +#ifdef SQLITE_WIN32_HAS_ANSI + else{ + zConverted = winUtf8ToMbcs(zFilename, osAreFileApisANSI()); + } +#endif + /* caller will handle out of memory */ + return zConverted; +} + +static int winOpenFile( + const char *zUtf8, + int *pbReadonly, + HANDLE *ph +){ + int rc = SQLITE_OK; + void *zConverted = 0; + int bReadonly = *pbReadonly; + HANDLE h = INVALID_HANDLE_VALUE; + + /* Convert the filename to the system encoding. */ + zConverted = winConvertFromUtf8Filename(zUtf8); + if( zConverted==0 ){ + OSTRACE(("OPEN name=%s, rc=SQLITE_IOERR_NOMEM", zUtf8)); + rc = SQLITE_IOERR_NOMEM_BKPT; + goto winopenfile_out; } - return winShmSystemLock(pDbFd, WINSHM_RDLCK, WIN_SHM_DMS, 1); + /* Ensure the file we are trying to open is not actually a directory. */ + if( winIsDir(zConverted) ){ + OSTRACE(("OPEN name=%s, rc=SQLITE_CANTOPEN_ISDIR", zUtf8)); + rc = SQLITE_CANTOPEN_ISDIR; + goto winopenfile_out; + } + + /* TODO: platforms. + ** TODO: retry-on-ioerr. + */ + h = osCreateFileW((LPCWSTR)zConverted, /* lpFileName */ + (GENERIC_READ | (bReadonly ? 0 : GENERIC_WRITE)), /* dwDesiredAccess */ + FILE_SHARE_READ | FILE_SHARE_WRITE, /* dwShareMode */ + NULL, /* lpSecurityAttributes */ + OPEN_ALWAYS, /* dwCreationDisposition */ + FILE_ATTRIBUTE_NORMAL|FILE_FLAG_OVERLAPPED, + NULL + ); + if( h==INVALID_HANDLE_VALUE ){ + if( bReadonly==0 ){ + bReadonly = 1; + rc = winOpenFile(zUtf8, &bReadonly, &h); + }else{ + rc = SQLITE_CANTOPEN_BKPT; + } + } + + winopenfile_out: + sqlite3_free(zConverted); + *pbReadonly = bReadonly; + *ph = h; + return rc; } + /* ** Open the shared-memory area associated with database file pDbFd. -** -** When opening a new shared-memory file, if no other instances of that -** file are currently open, in this process or in other processes, then -** the file must be truncated to zero length or have its header cleared. */ static int winOpenSharedMemory(winFile *pDbFd){ struct winShm *p; /* The connection to be opened */ @@ -4099,8 +4131,7 @@ static int winOpenSharedMemory(winFile *pDbFd){ assert( pDbFd->pShm==0 ); /* Not previously opened */ /* Allocate space for the new sqlite3_shm object. Also speculatively - ** allocate space for a new winShmNode and filename. - */ + ** allocate space for a new winShmNode and filename. */ p = sqlite3MallocZero( sizeof(*p) ); if( p==0 ) return SQLITE_IOERR_NOMEM_BKPT; nName = sqlite3Strlen30(pDbFd->zPath); @@ -4110,105 +4141,74 @@ static int winOpenSharedMemory(winFile *pDbFd){ return SQLITE_IOERR_NOMEM_BKPT; } pNew->zFilename = (char*)&pNew[1]; + pNew->hSharedShm = INVALID_HANDLE_VALUE; + pNew->isUnlocked = 1; sqlite3_snprintf(nName+15, pNew->zFilename, "%s-shm", pDbFd->zPath); sqlite3FileSuffix3(pDbFd->zPath, pNew->zFilename); + /* Open a file-handle on the *-shm file for this connection. This file-handle + ** is only used for locking. The mapping of the *-shm file is created using the + ** shared file handle in winShmNode.hSharedShm. */ + p->bReadonly = sqlite3_uri_boolean(pDbFd->zPath, "readonly_shm", 0); + rc = winOpenFile(pNew->zFilename, &p->bReadonly, &p->hShm); + /* Look to see if there is an existing winShmNode that can be used. - ** If no matching winShmNode currently exists, create a new one. - */ + ** If no matching winShmNode currently exists, then create a new one. */ winShmEnterMutex(); for(pShmNode = winShmNodeList; pShmNode; pShmNode=pShmNode->pNext){ /* TBD need to come up with better match here. Perhaps - ** use FILE_ID_BOTH_DIR_INFO Structure. - */ + ** use FILE_ID_BOTH_DIR_INFO Structure. */ if( sqlite3StrICmp(pShmNode->zFilename, pNew->zFilename)==0 ) break; } - if( pShmNode ){ - sqlite3_free(pNew); - }else{ - int inFlags = SQLITE_OPEN_WAL | WIN32_OPEN_SHM; - int outFlags = 0; - + if( pShmNode==0 ){ pShmNode = pNew; - pNew = 0; - ((winFile*)(&pShmNode->hFile))->h = INVALID_HANDLE_VALUE; - pShmNode->pNext = winShmNodeList; - winShmNodeList = pShmNode; + /* Allocate a mutex for this winShmNode object, if one is required. */ if( sqlite3GlobalConfig.bCoreMutex ){ pShmNode->mutex = sqlite3_mutex_alloc(SQLITE_MUTEX_FAST); - if( pShmNode->mutex==0 ){ - rc = SQLITE_IOERR_NOMEM_BKPT; - goto shm_open_err; - } -#ifdef SQLITE_ENABLE_SETLK_TIMEOUT - /* If SETLK_TIMEOUT is defined, also allocate the array of mutexes - ** stored in pShmNode->aMutex[]. */ - { - int ii; - for(ii=0; iiaMutex[ii] = sqlite3_mutex_alloc(SQLITE_MUTEX_FAST); - if( pShmNode->aMutex[ii]==0 ){ - rc = SQLITE_IOERR_NOMEM_BKPT; - goto shm_open_err; - } - } - } -#endif + if( pShmNode->mutex==0 ) rc = SQLITE_IOERR_NOMEM_BKPT; } - if( 0==sqlite3_uri_boolean(pDbFd->zPath, "readonly_shm", 0) ){ - inFlags |= SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE; + /* Open a file-handle to use for mappings, and for the DMS lock. */ + if( rc==SQLITE_OK ){ + HANDLE h = INVALID_HANDLE_VALUE; + pShmNode->isReadonly = p->bReadonly; + rc = winOpenFile(pNew->zFilename, &pShmNode->isReadonly, &h); + pShmNode->hSharedShm = h; + } + + /* If successful, link the new winShmNode into the global list. If an + ** error occurred, free the object. */ + if( rc==SQLITE_OK ){ + pShmNode->pNext = winShmNodeList; + winShmNodeList = pShmNode; + pNew = 0; }else{ - inFlags |= SQLITE_OPEN_READONLY; + sqlite3_mutex_free(pShmNode->mutex); + if( pShmNode->hSharedShm!=INVALID_HANDLE_VALUE ){ + osCloseHandle(pShmNode->hSharedShm); + } } - rc = winOpen(pDbFd->pVfs, pShmNode->zFilename, - (sqlite3_file*)&pShmNode->hFile, - inFlags, &outFlags); - if( rc!=SQLITE_OK ){ - rc = winLogError(rc, osGetLastError(), "winOpenShm", - pShmNode->zFilename); - goto shm_open_err; - } - if( outFlags==SQLITE_OPEN_READONLY ) pShmNode->isReadonly = 1; - - p->pShmNode = pShmNode; - pDbFd->pShm = p; - rc = winLockSharedMemory(pDbFd); - pDbFd->pShm = 0; - if( rc!=SQLITE_OK && rc!=SQLITE_READONLY_CANTINIT ) goto shm_open_err; } - /* Make the new connection a child of the winShmNode */ - p->pShmNode = pShmNode; + /* If no error has occurred, link the winShm object to the winShmNode and + ** the winShm to pDbFd. */ + if( rc==SQLITE_OK ){ + p->pShmNode = pShmNode; + p->pNext = pShmNode->pFirst; + pShmNode->pFirst = p; + pShmNode->nRef++; #if defined(SQLITE_DEBUG) || defined(SQLITE_HAVE_OS_TRACE) - p->id = pShmNode->nextShmId++; + p->id = pShmNode->nextShmId++; #endif - pShmNode->nRef++; - pDbFd->pShm = p; + pDbFd->pShm = p; + }else{ + sqlite3_free(p); + } + + assert( rc!=SQLITE_OK || pShmNode->isUnlocked==0 || pShmNode->nRegion==0 ); winShmLeaveMutex(); - - /* The reference count on pShmNode has already been incremented under - ** the cover of the winShmEnterMutex() mutex and the pointer from the - ** new (struct winShm) object to the pShmNode has been set. All that is - ** left to do is to link the new object into the linked list starting - ** at pShmNode->pFirst. This must be done while holding the pShmNode->mutex - ** mutex. - */ - winShmListMutexEnter(pShmNode); - p->pNext = pShmNode->pFirst; - pShmNode->pFirst = p; - winShmListMutexLeave(pShmNode); - return rc; - - /* Jump here on any error */ -shm_open_err: - - winUnlockFile(&pShmNode->hFile.h, WIN_SHM_DMS, 0, 1, 0); - winShmPurge(pDbFd->pVfs, 0); /* This call frees pShmNode if required */ - sqlite3_free(p); sqlite3_free(pNew); - winShmLeaveMutex(); return rc; } @@ -4228,29 +4228,31 @@ static int winShmUnmap( pDbFd = (winFile*)fd; p = pDbFd->pShm; if( p==0 ) return SQLITE_OK; + if( p->hShm!=INVALID_HANDLE_VALUE ){ + osCloseHandle(p->hShm); + } + pShmNode = p->pShmNode; + winShmEnterMutex(); /* Remove connection p from the set of connections associated ** with pShmNode */ - winShmListMutexEnter(pShmNode); for(pp=&pShmNode->pFirst; (*pp)!=p; pp = &(*pp)->pNext){} *pp = p->pNext; - winShmListMutexLeave(pShmNode); - - /* Free the connection p */ - sqlite3_free(p); - pDbFd->pShm = 0; /* If pShmNode->nRef has reached 0, then close the underlying - ** shared-memory file, too */ - winShmEnterMutex(); + ** shared-memory file, too. */ assert( pShmNode->nRef>0 ); pShmNode->nRef--; if( pShmNode->nRef==0 ){ + assert( pShmNode->pFirst==0 ); winShmPurge(pDbFd->pVfs, deleteFlag); } winShmLeaveMutex(); + /* Free the connection p */ + sqlite3_free(p); + pDbFd->pShm = 0; return SQLITE_OK; } @@ -4265,7 +4267,6 @@ static int winShmLock( ){ winFile *pDbFd = (winFile*)fd; /* Connection holding shared memory */ winShm *p = pDbFd->pShm; /* The shared memory being locked */ - winShm *pX; /* For looping over all siblings */ winShmNode *pShmNode; int rc = SQLITE_OK; /* Result code */ u16 mask = (u16)((1U<<(ofst+n)) - (1U<exclMask & mask) ); @@ -4324,121 +4324,35 @@ static int winShmLock( || (flags==(SQLITE_SHM_EXCLUSIVE|SQLITE_SHM_LOCK)) ){ - /* Take the required mutexes. In SETLK_TIMEOUT mode (blocking locks), if - ** this is an attempt on an exclusive lock use sqlite3_mutex_try(). If any - ** other thread is holding this mutex, then it is either holding or about - ** to hold a lock exclusive to the one being requested, and we may - ** therefore return SQLITE_BUSY to the caller. - ** - ** Doing this prevents some deadlock scenarios. For example, thread 1 may - ** be a checkpointer blocked waiting on the WRITER lock. And thread 2 - ** may be a normal SQL client upgrading to a write transaction. In this - ** case thread 2 does a non-blocking request for the WRITER lock. But - - ** if it were to use sqlite3_mutex_enter() then it would effectively - ** become a (doomed) blocking request, as thread 2 would block until thread - ** 1 obtained WRITER and released the mutex. Since thread 2 already holds - ** a lock on a read-locking slot at this point, this breaks the - ** anti-deadlock rules (see above). */ -#ifdef SQLITE_ENABLE_SETLK_TIMEOUT - int iMutex; - for(iMutex=ofst; iMutexaMutex[iMutex]); - if( rc!=SQLITE_OK ) break; - }else{ - sqlite3_mutex_enter(pShmNode->aMutex[iMutex]); + if( flags & SQLITE_SHM_UNLOCK ){ + /* Case (a) - unlock. */ + + assert( (p->exclMask & p->sharedMask)==0 ); + assert( !(flags & SQLITE_SHM_EXCLUSIVE) || (p->exclMask & mask)==mask ); + assert( !(flags & SQLITE_SHM_SHARED) || (p->sharedMask & mask)==mask ); + + rc = winHandleUnlock(p->hShm, ofst+WIN_SHM_BASE, n); + + /* If successful, also clear the bits in sharedMask/exclMask */ + if( rc==SQLITE_OK ){ + p->exclMask = (p->exclMask & ~mask); + p->sharedMask = (p->sharedMask & ~mask); } - } -#else - sqlite3_mutex_enter(pShmNode->mutex); + }else{ + int bExcl = ((flags & SQLITE_SHM_EXCLUSIVE) ? 1 : 0); + int nMs = 0; +#ifdef SQLITE_ENABLE_SETLK_TIMEOUT + nMs = pDbFd->iBusyTimeout #endif - - if( rc==SQLITE_OK ){ - if( flags & SQLITE_SHM_UNLOCK ){ - /* Case (a) - unlock. */ - u16 allMask = 0; /* Mask of locks held by siblings */ - - assert( (p->exclMask & p->sharedMask)==0 ); - assert( !(flags & SQLITE_SHM_EXCLUSIVE) || (p->exclMask & mask)==mask ); - assert( !(flags & SQLITE_SHM_SHARED) || (p->sharedMask & mask)==mask ); - - /* If this is a shared lock, check if any other connection in this - ** process is holding the same shared lock. If one or more are, then - ** do not unlock the system-level lock held on the file-handle. */ - if( flags & SQLITE_SHM_SHARED ){ - for(pX=pShmNode->pFirst; pX; pX=pX->pNext){ - if( pX==p ) continue; - allMask |= AtomicLoad(&pX->sharedMask); - } - } - if( (mask & allMask)==0 ){ - rc = winShmSystemLock(pDbFd, WINSHM_UNLCK, ofst+WIN_SHM_BASE, n); - } - - /* Undo the local locks */ - if( rc==SQLITE_OK ){ - AtomicStore(&p->exclMask, p->exclMask & ~mask); - AtomicStore(&p->sharedMask, p->sharedMask & ~mask); - } - }else if( flags & SQLITE_SHM_SHARED ){ - /* Case (b) - a shared lock. */ - int bLocked = 0; /* True if process already holds shared lock */ - assert( n==1 ); - - /* See what locks are held by other connections within this process. If - ** any are holding an EXCLUSIVE lock, then this call will return - ** SQLITE_BUSY. Or, if any are holding a SHARED lock, then there is no - ** need to obtain a new system-level lock. */ - for(pX=pShmNode->pFirst; pX; pX=pX->pNext){ - u16 mExcl = AtomicLoad(&pX->exclMask); - u16 mShared = AtomicLoad(&pX->sharedMask); - if( mExcl & mask ) rc = SQLITE_BUSY; - if( mShared & mask ){ - bLocked = 1; - } - } - - if( rc==SQLITE_OK && bLocked==0 ){ - rc = winShmSystemLock(pDbFd, WINSHM_RDLCK, ofst+WIN_SHM_BASE, n); - } - - /* Get the local shared lock */ - if( rc==SQLITE_OK ){ - AtomicStore(&p->sharedMask, p->sharedMask | mask); - } - }else{ - /* Case (c) - an exclusive lock. */ - assert( flags==(SQLITE_SHM_LOCK|SQLITE_SHM_EXCLUSIVE) ); - assert( (p->sharedMask & mask)==0 ); - assert( (p->exclMask & mask)==0 ); - - /* Make sure no sibling connections hold locks that will block this - ** lock. If any do, return SQLITE_BUSY right away. */ - for(pX=pShmNode->pFirst; pX; pX=pX->pNext){ - u16 mExcl = AtomicLoad(&pX->exclMask); - u16 mShared = AtomicLoad(&pX->sharedMask); - if( (mExcl|mShared) & mask ) rc = SQLITE_BUSY; - } - - /* Get the exclusive locks at the system level. If successful, - ** also update the in-memory values. */ - if( rc==SQLITE_OK ){ - rc = winShmSystemLock(pDbFd, WINSHM_WRLCK, ofst+WIN_SHM_BASE, n); - if( rc==SQLITE_OK ){ - AtomicStore(&p->exclMask, p->exclMask | mask); - } + rc = winLockFileTimeout(p->hShm, ofst+WIN_SHM_BASE, n, bExcl, nMs); + if( rc==SQLITE_OK ){ + if( bExcl ){ + p->exclMask = (p->exclMask | mask); + }else{ + p->sharedMask = (p->sharedMask | mask); } } } - - /* Release the mutex(es) taken at the top of this block */ -#ifdef SQLITE_ENABLE_SETLK_TIMEOUT - for(iMutex--; iMutex>=ofst; iMutex--){ - sqlite3_mutex_leave(pShmNode->aMutex[iMutex]); - } -#else - sqlite3_mutex_leave(pShmNode->mutex); -#endif } OSTRACE(( @@ -4506,13 +4420,15 @@ static int winShmMap( sqlite3_mutex_enter(pShmNode->mutex); if( pShmNode->isUnlocked ){ - rc = winLockSharedMemory(pDbFd); + /* Take the DMS lock. */ + assert( pShmNode->nRegion==0 ); + rc = winLockSharedMemory(pShmNode); if( rc!=SQLITE_OK ) goto shmpage_out; - pShmNode->isUnlocked = 0; } - assert( szRegion==pShmNode->szRegion || pShmNode->nRegion==0 ); + assert( szRegion==pShmNode->szRegion || pShmNode->nRegion==0 ); if( pShmNode->nRegion<=iRegion ){ + HANDLE hShared = pShmNode->hSharedShm; struct ShmRegion *apNew; /* New aRegion[] array */ int nByte = (iRegion+1)*szRegion; /* Minimum required file size */ sqlite3_int64 sz; /* Current size of wal-index file */ @@ -4523,10 +4439,9 @@ static int winShmMap( ** Check to see if it has been allocated (i.e. if the wal-index file is ** large enough to contain the requested region). */ - rc = winFileSize((sqlite3_file *)&pShmNode->hFile, &sz); + rc = winHandleSize(hShared, &sz); if( rc!=SQLITE_OK ){ - rc = winLogError(SQLITE_IOERR_SHMSIZE, osGetLastError(), - "winShmMap1", pDbFd->zPath); + rc = winLogError(rc, osGetLastError(), "winShmMap1", pDbFd->zPath); goto shmpage_out; } @@ -4535,19 +4450,17 @@ static int winShmMap( ** zero, exit early. *pp will be set to NULL and SQLITE_OK returned. ** ** Alternatively, if isWrite is non-zero, use ftruncate() to allocate - ** the requested memory region. - */ + ** the requested memory region. */ if( !isWrite ) goto shmpage_out; - rc = winTruncate((sqlite3_file *)&pShmNode->hFile, nByte); + rc = winHandleTruncate(hShared, nByte); if( rc!=SQLITE_OK ){ - rc = winLogError(SQLITE_IOERR_SHMSIZE, osGetLastError(), - "winShmMap2", pDbFd->zPath); + rc = winLogError(rc, osGetLastError(), "winShmMap2", pDbFd->zPath); goto shmpage_out; } } /* Map the requested memory region into this processes address space. */ - apNew = (struct ShmRegion *)sqlite3_realloc64( + apNew = (struct ShmRegion*)sqlite3_realloc64( pShmNode->aRegion, (iRegion+1)*sizeof(apNew[0]) ); if( !apNew ){ @@ -4566,18 +4479,13 @@ static int winShmMap( void *pMap = 0; /* Mapped memory region */ #if SQLITE_OS_WINRT - hMap = osCreateFileMappingFromApp(pShmNode->hFile.h, - NULL, protect, nByte, NULL - ); + hMap = osCreateFileMappingFromApp(hShared, NULL, protect, nByte, NULL); #elif defined(SQLITE_WIN32_HAS_WIDE) - hMap = osCreateFileMappingW(pShmNode->hFile.h, - NULL, protect, 0, nByte, NULL - ); + hMap = osCreateFileMappingW(hShared, NULL, protect, 0, nByte, NULL); #elif defined(SQLITE_WIN32_HAS_ANSI) && SQLITE_WIN32_CREATEFILEMAPPINGA - hMap = osCreateFileMappingA(pShmNode->hFile.h, - NULL, protect, 0, nByte, NULL - ); + hMap = osCreateFileMappingA(hShared, NULL, protect, 0, nByte, NULL); #endif + OSTRACE(("SHM-MAP-CREATE pid=%lu, region=%d, size=%d, rc=%s\n", osGetCurrentProcessId(), pShmNode->nRegion, nByte, hMap ? "ok" : "failed")); @@ -4620,7 +4528,9 @@ shmpage_out: }else{ *pp = 0; } - if( pShmNode->isReadonly && rc==SQLITE_OK ) rc = SQLITE_READONLY; + if( pShmNode->isReadonly && rc==SQLITE_OK ){ + rc = SQLITE_READONLY; + } sqlite3_mutex_leave(pShmNode->mutex); return rc; } @@ -4961,26 +4871,6 @@ static char *winConvertToUtf8Filename(const void *zFilename){ } #endif -/* -** Convert a UTF-8 filename into whatever form the underlying -** operating system wants filenames in. Space to hold the result -** is obtained from malloc and must be freed by the calling -** function. -*/ -static void *winConvertFromUtf8Filename(const char *zFilename){ - void *zConverted = 0; - if( osIsNT() ){ - zConverted = winUtf8ToUnicode(zFilename); - } -#ifdef SQLITE_WIN32_HAS_ANSI - else{ - zConverted = winUtf8ToMbcs(zFilename, osAreFileApisANSI()); - } -#endif - /* caller will handle out of memory */ - return zConverted; -} - /* ** This function returns non-zero if the specified UTF-8 string buffer ** ends with a directory separator character or one was successfully @@ -5459,15 +5349,6 @@ static int winOpen( dwFlagsAndAttributes |= FILE_FLAG_RANDOM_ACCESS; #endif - /* If we are really opening a *-shm file, and ENABLE_SETLK is defined, - ** open the file for overlapped-IO. This is to facilitate blocking locks - ** with timeouts, which use asynchronous IO on windows. */ -#ifdef SQLITE_ENABLE_SETLK_TIMEOUT - if( flags & WIN32_OPEN_SHM ){ - dwFlagsAndAttributes |= FILE_FLAG_OVERLAPPED; - } -#endif - if( osIsNT() ){ #if SQLITE_OS_WINRT CREATEFILE2_EXTENDED_PARAMETERS extendedParameters; From 9d592359fea061435c20d5fc1161f0d8eb95e5b2 Mon Sep 17 00:00:00 2001 From: dan Date: Mon, 2 Dec 2024 20:48:17 +0000 Subject: [PATCH 005/194] Fix a problem with SQLITE_OS_WINRT builds. FossilOrigin-Name: baf43e8c7da6aacce874ec30d0c9e1dcb44c5ed9de2214099d42fbbd335d2e93 --- manifest | 16 ++++++++-------- manifest.uuid | 2 +- src/os_win.c | 17 +++++++++++++++++ src/test1.c | 5 +++++ src/test_quota.c | 4 ++++ 5 files changed, 35 insertions(+), 9 deletions(-) diff --git a/manifest b/manifest index c411fc8ac9..916afd3b58 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C On\swindows,\suse\sa\sseparate\shandle\sfor\seach\sconnection\sfor\sxShmLock()\slocks. -D 2024-11-30T20:00:54.166 +C Fix\sa\sproblem\swith\sSQLITE_OS_WINRT\sbuilds. +D 2024-12-02T20:48:17.522 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d @@ -759,7 +759,7 @@ F src/os_common.h 6c0eb8dd40ef3e12fe585a13e709710267a258e2c8dd1c40b1948a1d14582e F src/os_kv.c 4d39e1f1c180b11162c6dc4aa8ad34053873a639bac6baae23272fc03349986a F src/os_setup.h 6011ad7af5db4e05155f385eb3a9b4470688de6f65d6166b8956e58a3d872107 F src/os_unix.c d4a33e8fbd1c6eb722a21b6ce1eee1213ec856170a2f256d99f3d2978f054f5a -F src/os_win.c 723fde7bfc915a3651620337788a7c2120b216e057d1c70ffad15b6389a59ff1 +F src/os_win.c 87a6590fa43efbf64b58269fef10df5b766841603b6ac0bf025fac74901f45c7 F src/os_win.h 7b073010f1451abe501be30d12f6bc599824944a F src/pager.c 9656ad4e8331efb8a4f94f7a0c6440b98caea073950a367ea0c728a53b8e62c9 F src/pager.h 4b1140d691860de0be1347474c51fee07d5420bd7f802d38cbab8ea4ab9f538a @@ -785,7 +785,7 @@ F src/status.c cb11f8589a6912af2da3bb1ec509a94dd8ef27df4d4c1a97e0bcf2309ece972b F src/table.c 0f141b58a16de7e2fbe81c308379e7279f4c6b50eb08efeec5892794a0ba30d1 F src/tclsqlite.c 1c2f697cb12a1d49f5e0b448327f7cf614809423bb43753b2d97f87354298113 F src/tclsqlite.h 65e2c761446e1c9fa0342b7d2612a703483643c8b6a316d12a65b745a4727395 -F src/test1.c 2d507751bfb4aa254dc22588ef1e3c5c5cfcb2e636d0e6e1fa0bbd307669c2a8 +F src/test1.c 2c63b1f57d86104dcb12a722063b193031ed9e27268eacfc029c1a3c2997bc76 F src/test2.c 7ebc518e6735939d8979273a6f7b1d9b5702babf059f6ad62499f7f60a9eb9a3 F src/test3.c e7573aa0f78ee4e070a4bc8c3493941c1aa64d5c66d4825c74c0f055451f432b F src/test4.c 13e57ae7ec7a959ee180970aef09deed141252fe9bb07c61054f0dfa4f1dfd5d @@ -818,7 +818,7 @@ F src/test_mutex.c f10fcbc2086b19c7b0ddf2752caf2095e42be74d8d7f6093619445b43b1f7 F src/test_onefile.c f31e52e891c5fef6709b9fcef54ce660648a34172423a9cbdf4cbce3ba0049f4 F src/test_osinst.c 7aa3feaa3a1da1b5f75bde2ce958dbfe14ec484f065bb2b5b9727d8851fa089b F src/test_pcache.c 496da3f7e2ca66aefbc36bbf22138b1eff43ba0dff175c228b760fa020a37bd0 -F src/test_quota.c 07369655d24c3f3fbdbd8fd8f42e856a054a7497846ca1c83ed4be68152a251f +F src/test_quota.c 744552848d9c5c5de3920d1c44b03d425a4123a223310567a199c7e0d3fe80bf F src/test_quota.h 2a8ad1952d1d2ca9af0ce0465e56e6c023b5e15d F src/test_rtree.c d844d746a3cc027247318b970025a927f14772339c991f40e7911583ea5ed0d9 F src/test_schema.c b06d3ddc3edc173c143878f3edb869dd200d57d918ae2f38820534f9a5e3d7d9 @@ -2199,8 +2199,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P 7a32b497ab16774021924a8536e1025a0a01740a6484f0de17623a69713511d8 -R aa1565a5ee340c089d18e4ebbcdc312d +P 272d552f126357d7bc16d84f13a4bea823abc6ef7faf90e3cffcedb68210f52a +R e892c1228a636d88e5e0280f26d48ad6 U dan -Z 8c1e110aa2184c18c39efa79a8266428 +Z cbe84d70a2ef7e0a156c55e07ebb1ddb # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 2963ba4d75..93f35d5ecb 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -272d552f126357d7bc16d84f13a4bea823abc6ef7faf90e3cffcedb68210f52a +baf43e8c7da6aacce874ec30d0c9e1dcb44c5ed9de2214099d42fbbd335d2e93 diff --git a/src/os_win.c b/src/os_win.c index 82ec15f3b9..a02b0c5358 100644 --- a/src/os_win.c +++ b/src/os_win.c @@ -4093,6 +4093,22 @@ static int winOpenFile( /* TODO: platforms. ** TODO: retry-on-ioerr. */ +#if SQLITE_OS_WINRT + { + CREATEFILE2_EXTENDED_PARAMETERS extendedParameters; + memset(&extendedParameters, 0, sizeof(extendedParameters)); + extendedParameters.dwSize = sizeof(extendedParameters); + extendedParameters.dwFileAttributes = FILE_ATTRIBUTE_NORMAL; + extendedParameters.dwFileFlags = FILE_FLAG_OVERLAPPED; + extendedParameters.dwSecurityQosFlags = SECURITY_ANONYMOUS; + h = osCreateFile2((LPCWSTR)zConverted, + (GENERIC_READ | (bReadonly ? 0 : GENERIC_WRITE)),/* dwDesiredAccess */ + FILE_SHARE_READ | FILE_SHARE_WRITE, /* dwShareMode */ + OPEN_ALWAYS, /* dwCreationDisposition */ + &extendedParameters + ); + } +#else h = osCreateFileW((LPCWSTR)zConverted, /* lpFileName */ (GENERIC_READ | (bReadonly ? 0 : GENERIC_WRITE)), /* dwDesiredAccess */ FILE_SHARE_READ | FILE_SHARE_WRITE, /* dwShareMode */ @@ -4101,6 +4117,7 @@ static int winOpenFile( FILE_ATTRIBUTE_NORMAL|FILE_FLAG_OVERLAPPED, NULL ); +#endif if( h==INVALID_HANDLE_VALUE ){ if( bReadonly==0 ){ bReadonly = 1; diff --git a/src/test1.c b/src/test1.c index cf5d484e9e..613e8ca137 100644 --- a/src/test1.c +++ b/src/test1.c @@ -7979,6 +7979,10 @@ static int SQLITE_TCLAPI win32_file_lock( int objc, Tcl_Obj *CONST objv[] ){ +#ifdef SQLITE_OS_WINRT + Tcl_AppendResult(interp, "unsupported test command", (char*)0); + return TCL_ERROR; +#else static struct win32FileLocker x = { "win32_file_lock", 0, 0, 0, 0, 0 }; const char *zFilename; char zBuf[200]; @@ -8029,6 +8033,7 @@ static int SQLITE_TCLAPI win32_file_lock( } CloseHandle(ev); return TCL_OK; +#endif /* !SQLITE_OS_WINRT */ } #endif diff --git a/src/test_quota.c b/src/test_quota.c index 1bfc5ce11c..62d808a22b 100644 --- a/src/test_quota.c +++ b/src/test_quota.c @@ -389,7 +389,11 @@ static char *quota_utf8_to_mbcs(const char *zUtf8){ zTmpWide = (LPWSTR)sqlite3_malloc( (nWide+1)*sizeof(zTmpWide[0]) ); if( zTmpWide==0 ) return 0; MultiByteToWideChar(CP_UTF8, 0, zUtf8, -1, zTmpWide, nWide); +#ifdef SQLITE_OS_WINRT + codepage = CP_ACP; +#else codepage = AreFileApisANSI() ? CP_ACP : CP_OEMCP; +#endif nMbcs = WideCharToMultiByte(codepage, 0, zTmpWide, nWide, 0, 0, 0, 0); zMbcs = nMbcs ? (char*)sqlite3_malloc( nMbcs+1 ) : 0; if( zMbcs ){ From d4545bca73dde4fa2654fb4079918aa22899d1ad Mon Sep 17 00:00:00 2001 From: dan Date: Tue, 3 Dec 2024 15:19:02 +0000 Subject: [PATCH 006/194] Fix the lock_win32_file test command so that it works with winrt builds. FossilOrigin-Name: 5994656074b2db2c172f4c690c3b40cadd12e91d737fb91a03268148f8b49421 --- manifest | 12 ++++++------ manifest.uuid | 2 +- src/test1.c | 41 ++++++++++++++++++++++++----------------- 3 files changed, 31 insertions(+), 24 deletions(-) diff --git a/manifest b/manifest index 916afd3b58..29e46988c1 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Fix\sa\sproblem\swith\sSQLITE_OS_WINRT\sbuilds. -D 2024-12-02T20:48:17.522 +C Fix\sthe\slock_win32_file\stest\scommand\sso\sthat\sit\sworks\swith\swinrt\sbuilds. +D 2024-12-03T15:19:02.282 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d @@ -785,7 +785,7 @@ F src/status.c cb11f8589a6912af2da3bb1ec509a94dd8ef27df4d4c1a97e0bcf2309ece972b F src/table.c 0f141b58a16de7e2fbe81c308379e7279f4c6b50eb08efeec5892794a0ba30d1 F src/tclsqlite.c 1c2f697cb12a1d49f5e0b448327f7cf614809423bb43753b2d97f87354298113 F src/tclsqlite.h 65e2c761446e1c9fa0342b7d2612a703483643c8b6a316d12a65b745a4727395 -F src/test1.c 2c63b1f57d86104dcb12a722063b193031ed9e27268eacfc029c1a3c2997bc76 +F src/test1.c 325a66d5e52b84ba6b6d54f9d605e31a8304c395df0c589e0ade87fd2b7213b2 F src/test2.c 7ebc518e6735939d8979273a6f7b1d9b5702babf059f6ad62499f7f60a9eb9a3 F src/test3.c e7573aa0f78ee4e070a4bc8c3493941c1aa64d5c66d4825c74c0f055451f432b F src/test4.c 13e57ae7ec7a959ee180970aef09deed141252fe9bb07c61054f0dfa4f1dfd5d @@ -2199,8 +2199,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P 272d552f126357d7bc16d84f13a4bea823abc6ef7faf90e3cffcedb68210f52a -R e892c1228a636d88e5e0280f26d48ad6 +P baf43e8c7da6aacce874ec30d0c9e1dcb44c5ed9de2214099d42fbbd335d2e93 +R bc12e47014f586eacbbc427b6b22ac8d U dan -Z cbe84d70a2ef7e0a156c55e07ebb1ddb +Z 0816a4fec5e8db048747c6ae85732289 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 93f35d5ecb..2a3177d7be 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -baf43e8c7da6aacce874ec30d0c9e1dcb44c5ed9de2214099d42fbbd335d2e93 +5994656074b2db2c172f4c690c3b40cadd12e91d737fb91a03268148f8b49421 diff --git a/src/test1.c b/src/test1.c index 613e8ca137..57836abe1c 100644 --- a/src/test1.c +++ b/src/test1.c @@ -7928,7 +7928,7 @@ static int SQLITE_TCLAPI test_getrusage( */ struct win32FileLocker { char *evName; /* Name of event to signal thread startup */ - HANDLE h; /* Handle of the file to be locked */ + sqlite3_file *pFd; /* Handle of the file to be locked */ int delay1; /* Delay before locking */ int delay2; /* Delay before unlocking */ int ok; /* Finished ok */ @@ -7944,6 +7944,8 @@ struct win32FileLocker { */ static void SQLITE_CDECL win32_file_locker(void *pAppData){ struct win32FileLocker *p = (struct win32FileLocker*)pAppData; + sqlite3_file *pFd = p->pFd; + HANDLE h = INVALID_HANDLE_VALUE; if( p->evName ){ HANDLE ev = OpenEvent(EVENT_MODIFY_STATE, FALSE, p->evName); if ( ev ){ @@ -7952,15 +7954,17 @@ static void SQLITE_CDECL win32_file_locker(void *pAppData){ } } if( p->delay1 ) Sleep(p->delay1); - if( LockFile(p->h, 0, 0, 100000000, 0) ){ + pFd->pMethods->xFileControl(pFd, SQLITE_FCNTL_WIN32_GET_HANDLE, (void*)&h); + if( LockFile(h, 0, 0, 100000000, 0) ){ Sleep(p->delay2); - UnlockFile(p->h, 0, 0, 100000000, 0); + UnlockFile(h, 0, 0, 100000000, 0); p->ok = 1; }else{ p->err = 1; } - CloseHandle(p->h); - p->h = 0; + pFd->pMethods->xClose(pFd); + sqlite3_free(pFd); + p->pFd = 0; p->delay1 = 0; p->delay2 = 0; } @@ -7979,42 +7983,46 @@ static int SQLITE_TCLAPI win32_file_lock( int objc, Tcl_Obj *CONST objv[] ){ -#ifdef SQLITE_OS_WINRT - Tcl_AppendResult(interp, "unsupported test command", (char*)0); - return TCL_ERROR; -#else static struct win32FileLocker x = { "win32_file_lock", 0, 0, 0, 0, 0 }; const char *zFilename; char zBuf[200]; int retry = 0; HANDLE ev; DWORD wResult; + sqlite3_vfs *pVfs = 0; + int flags = SQLITE_OPEN_MAIN_DB | SQLITE_OPEN_READWRITE; if( objc!=4 && objc!=1 ){ Tcl_WrongNumArgs(interp, 1, objv, "FILENAME DELAY1 DELAY2"); return TCL_ERROR; } if( objc==1 ){ + HANDLE h = INVALID_HANDLE_VALUE; + if( x.pFd ){ + x.pFd->pMethods->xFileControl( + x.pFd, SQLITE_FCNTL_WIN32_GET_HANDLE, (void*)&h + ); + } sqlite3_snprintf(sizeof(zBuf), zBuf, "%d %d %d %d %d", - x.ok, x.err, x.delay1, x.delay2, x.h); + x.ok, x.err, x.delay1, x.delay2, h); Tcl_AppendResult(interp, zBuf, (char*)0); return TCL_OK; } - while( x.h && retry<30 ){ + while( x.pFd && retry<30 ){ retry++; Sleep(100); } - if( x.h ){ + if( x.pFd ){ Tcl_AppendResult(interp, "busy", (char*)0); return TCL_ERROR; } if( Tcl_GetIntFromObj(interp, objv[2], &x.delay1) ) return TCL_ERROR; if( Tcl_GetIntFromObj(interp, objv[3], &x.delay2) ) return TCL_ERROR; zFilename = Tcl_GetString(objv[1]); - x.h = CreateFile(zFilename, GENERIC_READ|GENERIC_WRITE, - FILE_SHARE_READ|FILE_SHARE_WRITE, 0, OPEN_ALWAYS, - FILE_ATTRIBUTE_NORMAL, 0); - if( !x.h ){ + + pVfs = sqlite3_vfs_find(0); + x.pFd = (sqlite3_file*)sqlite3_malloc(pVfs->szOsFile); + if( pVfs->xOpen(pVfs, zFilename, x.pFd, flags, &flags)!=SQLITE_OK ){ Tcl_AppendResult(interp, "cannot open file: ", zFilename, (char*)0); return TCL_ERROR; } @@ -8033,7 +8041,6 @@ static int SQLITE_TCLAPI win32_file_lock( } CloseHandle(ev); return TCL_OK; -#endif /* !SQLITE_OS_WINRT */ } #endif From 2d5ce92aae630c540a62c6c6dc89b9ca1625aa60 Mon Sep 17 00:00:00 2001 From: dan Date: Tue, 3 Dec 2024 19:09:54 +0000 Subject: [PATCH 007/194] Further test file tweaks to run with SQLITE_OS_WINRT builds. FossilOrigin-Name: 54853421ba012c192ee2a41873e6ba10e187a6ec2e23182ccbec56864604166f --- manifest | 16 ++++++++-------- manifest.uuid | 2 +- src/test_config.c | 6 ++++++ test/tester.tcl | 5 +++++ test/win32longpath.test | 7 ++++++- 5 files changed, 26 insertions(+), 10 deletions(-) diff --git a/manifest b/manifest index 29e46988c1..6828a73854 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Fix\sthe\slock_win32_file\stest\scommand\sso\sthat\sit\sworks\swith\swinrt\sbuilds. -D 2024-12-03T15:19:02.282 +C Further\stest\sfile\stweaks\sto\srun\swith\sSQLITE_OS_WINRT\sbuilds. +D 2024-12-03T19:09:54.391 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d @@ -798,7 +798,7 @@ F src/test_backup.c bd901e3c116c7f3b3bbbd4aae4ce87d99b400c9cbb0a9e7b4610af451d97 F src/test_bestindex.c 3401bee51665cbf7f9ed2552b5795452a8b86365e4c9ece745b54155a55670c6 F src/test_blob.c bcdf6a6c22d0bcc13c41479d63692ef413add2a4d30e1e26b9f74ab85b9fb4d5 F src/test_btree.c 28283787d32b8fa953eb77412ad0de2c9895260e4e5bd5a94b3c7411664f90d5 -F src/test_config.c bff5e1625c007f14a9ea4d346b6a741149b5e1f885c1c7ae69bb28a8ddade151 +F src/test_config.c e6823104dae529aff7ac62bc86b62d26103cb857162b08b0ba89d9140c63dedd F src/test_delete.c e2fe07646dff6300b48d49b2fee2fe192ed389e834dd635e3b3bac0ce0bf9f8f F src/test_demovfs.c 3efa2adf4f21e10d95521721687d5ca047aea91fa62dd8cc22ac9e5a9c942383 F src/test_devsym.c 649434ed34d0b03fbd5a6b42df80f0f9a7e53f94dd1710aad5dd8831e91c4e86 @@ -1719,7 +1719,7 @@ F test/temptable.test d2c9b87a54147161bcd1822e30c1d1cd891e5b30 F test/temptable2.test 76821347810ecc88203e6ef0dd6897b6036ac788e9dd3e6b04fd4d1631311a16 F test/temptable3.test d11a0974e52b347e45ee54ef1923c91ed91e4637 F test/temptrigger.test 38f0ca479b1822d3117069e014daabcaacefffcc -F test/tester.tcl 7b44f1a9b9a2de8112695b908afc21dd9a68cd2d44e84b73f1b27b53492c0d59 +F test/tester.tcl 2f900e8c912fbbaf381e69a92258fa6023ad0b4c8907e426bebbb4585da23c61 F test/testrunner.tcl 90ed8b6c2b26dc1f6af08aeb04670a5df86172f3d9828d8af000f972afa50061 x F test/testrunner_data.tcl ba4aeea28aa03cfa6fe7e57782ddecb7a7b91c3a0b3251583cb4f0ee002de6a6 F test/thread001.test a0985c117eab62c0c65526e9fa5d1360dd1cac5b03bde223902763274ce21899 @@ -2054,7 +2054,7 @@ F test/wherelimit3.test 22d73e046870cf8bbe15573eda6b432b07ebe64a88711f9f849c6b36 F test/widetab1.test c296a98e123762de79917350e45fa33fdf88577a2571eb3a64c8bf7e44ef74d1 F test/win32heap.test 10fd891266bd00af68671e702317726375e5407561d859be1aa04696f2aeee74 F test/win32lock.test e0924eb8daac02bf80e9da88930747bd44dd9b230b7759fed927b1655b467c9c -F test/win32longpath.test 304006024ca47104bf5a7415ef31ca83ecfc29351af202baf8588b880cffc116 +F test/win32longpath.test c5d149ab60a3052fa84b3df12ff655d703bfdfd48eed9854b14945d4d0bf3ddd F test/win32nolock.test ac4f08811a562e45a5755e661f45ca85892bdbbc F test/window1.test 79dc3b9a2226f622d7e104a1fc750d1c4c3c08d6147b59085bdbe05352947ffa F test/window2.tcl 492c125fa550cda1dd3555768a2303b3effbeceee215293adf8871efc25f1476 @@ -2199,8 +2199,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P baf43e8c7da6aacce874ec30d0c9e1dcb44c5ed9de2214099d42fbbd335d2e93 -R bc12e47014f586eacbbc427b6b22ac8d +P 5994656074b2db2c172f4c690c3b40cadd12e91d737fb91a03268148f8b49421 +R d48df35453e034ecc17b4554259c436f U dan -Z 0816a4fec5e8db048747c6ae85732289 +Z f2d0671bca92e4f8a85f640b4aa16212 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 2a3177d7be..d8e5d8ebae 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -5994656074b2db2c172f4c690c3b40cadd12e91d737fb91a03268148f8b49421 +54853421ba012c192ee2a41873e6ba10e187a6ec2e23182ccbec56864604166f diff --git a/src/test_config.c b/src/test_config.c index c8ce2ab88a..20d0faa50f 100644 --- a/src/test_config.c +++ b/src/test_config.c @@ -88,6 +88,12 @@ static void set_options(Tcl_Interp *interp){ Tcl_SetVar2(interp, "sqlite_options", "win32malloc", "0", TCL_GLOBAL_ONLY); #endif +#ifdef SQLITE_OS_WINRT + Tcl_SetVar2(interp, "sqlite_options", "winrt", "1", TCL_GLOBAL_ONLY); +#else + Tcl_SetVar2(interp, "sqlite_options", "winrt", "0", TCL_GLOBAL_ONLY); +#endif + #ifdef SQLITE_DEBUG Tcl_SetVar2(interp, "sqlite_options", "debug", "1", TCL_GLOBAL_ONLY); #else diff --git a/test/tester.tcl b/test/tester.tcl index b5f49ebde9..0792557619 100644 --- a/test/tester.tcl +++ b/test/tester.tcl @@ -1776,6 +1776,11 @@ proc crashsql {args} { # cfSync(), which can be different then what TCL uses by # default, so here we force it to the "nativename" format. set cfile [string map {\\ \\\\} [file nativename [file join [get_pwd] $crashfile]]] + ifcapable winrt { + # Except on winrt. Winrt has no way to transform a relative path into + # an absolute one, so it just uses the relative paths. + set cfile $crashfile + } set f [open crash.tcl w] puts $f "sqlite3_initialize ; sqlite3_shutdown" diff --git a/test/win32longpath.test b/test/win32longpath.test index 9ffea775e7..b948de79fa 100644 --- a/test/win32longpath.test +++ b/test/win32longpath.test @@ -115,7 +115,12 @@ do_test 1.6 { db3 close -foreach tn {1a 1b 1c 1d 1e 1f} { +# winrt platforms do not handle paths with unix-style '/' directory separators. +# +set lUri [list 1a 1b 1c 1d 1e 1f] +ifcapable winrt { set lUri [list 1a 1c 1e] } + +foreach tn $lUri { sqlite3 db3 $uri($tn) -vfs win32-longpath -uri 1 -translatefilename 0 do_test 1.7.$tn { From 23498de7bee3032e6d9f63ed120d5b26848bd290 Mon Sep 17 00:00:00 2001 From: dan Date: Tue, 3 Dec 2024 19:41:41 +0000 Subject: [PATCH 008/194] Back out minor changes not required by this branch. FossilOrigin-Name: 68c34ffd2332d89cb6400bce5dad350a6e48c395924b8380cbeb0dbe64141808 --- manifest | 20 ++++++++++---------- manifest.uuid | 2 +- src/mutex_w32.c | 16 +++++++++++++--- src/os_unix.c | 1 + src/os_win.c | 20 -------------------- test/symlink2.test | 3 +-- test/wal.test | 4 ++-- 7 files changed, 28 insertions(+), 38 deletions(-) diff --git a/manifest b/manifest index 0f87538b06..0c58e47c89 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Merge\slatest\strunk\sinto\sthis\sbranch. -D 2024-12-03T19:30:14.226 +C Back\sout\sminor\schanges\snot\srequired\sby\sthis\sbranch. +D 2024-12-03T19:41:41.500 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d @@ -754,15 +754,15 @@ F src/mutex.c 06bcd9c3dbf2d9b21fcd182606c00fafb9bfe0287983c8e17acd13d2c81a2fa9 F src/mutex.h a7b2293c48db5f27007c3bdb21d438873637d12658f5a0bf8ad025bb96803c4a F src/mutex_noop.c 9d4309c075ba9cc7249e19412d3d62f7f94839c4 F src/mutex_unix.c f7ee5a2061a4c11815a2bf4fc0e2bfa6fb8d9dc89390eb613ca0cec32fc9a3d1 -F src/mutex_w32.c db182bf5aac08a16fbf5916d94974f5a11556fe150142fcabe36d6454e0d93a1 +F src/mutex_w32.c 28f8d480387db5b2ef5248705dd4e19db0cfc12c3ba426695a7d2c45c48e6885 F src/notify.c 57c2d1a2805d6dee32acd5d250d928ab94e02d76369ae057dee7d445fd64e878 F src/os.c 509452169d5ea739723e213b8e2481cf0e587f0e88579a912d200db5269f5f6d F src/os.h 1ff5ae51d339d0e30d8a9d814f4b8f8e448169304d83a7ed9db66a65732f3e63 F src/os_common.h 6c0eb8dd40ef3e12fe585a13e709710267a258e2c8dd1c40b1948a1d14582e06 F src/os_kv.c 4d39e1f1c180b11162c6dc4aa8ad34053873a639bac6baae23272fc03349986a F src/os_setup.h 6011ad7af5db4e05155f385eb3a9b4470688de6f65d6166b8956e58a3d872107 -F src/os_unix.c d4a33e8fbd1c6eb722a21b6ce1eee1213ec856170a2f256d99f3d2978f054f5a -F src/os_win.c 87a6590fa43efbf64b58269fef10df5b766841603b6ac0bf025fac74901f45c7 +F src/os_unix.c d2edbd92b07a3f778c2defa8a2e9d75acceb6267bda56948c41e8cdda65224d6 +F src/os_win.c a47ad87a47d799783277edc56d99fdcaac2a2a503ba702b18d149d0c4cb125b7 F src/os_win.h 7b073010f1451abe501be30d12f6bc599824944a F src/pager.c 9656ad4e8331efb8a4f94f7a0c6440b98caea073950a367ea0c728a53b8e62c9 F src/pager.h 4b1140d691860de0be1347474c51fee07d5420bd7f802d38cbab8ea4ab9f538a @@ -1705,7 +1705,7 @@ F test/swarmvtab2.test c948cb2fdfc5b01d85e8f6d6504854202dc1a0782ab2a0ed61538f27c F test/swarmvtab3.test 41a3ab47cb7a834d4e5336425103b617410a67bb95d335ef536f887587ece073 F test/swarmvtabfault.test 8a67a9f27c61073a47990829e92bc0c64420a807cb642b15a25f6c788210ed95 F test/symlink.test 4368af0e213dd6e726a6240a16f2bb96a5a58f83f2d5d60652f27547b28cbf06 -F test/symlink2.test 0b7734533f198bbc46fb8ea984ffaea537c8ee949eaba8805a92ed9969573956 +F test/symlink2.test bf932ff7fe95c9dbb39d2a990df9098b0ea943233c97e40098e0a8d6b559a96f F test/sync.test 89539f4973c010eda5638407e71ca7fddbcd8e0594f4c9980229f804d4333092 F test/sync2.test 8f9f7d4f6d5be8ca8941a8dadcc4299e558cb6a1ff653a9469146c7a76ef2039 F test/syscall.test a067468b43b8cb2305e9f9fe414e5f40c875bb5d2cba5f00b8154396e95fcf37 @@ -1989,7 +1989,7 @@ F test/vtab_shared.test 5253bff2355a9a3f014c15337da7e177ab0ef8ad F test/vtabdistinct.test 7688f0889358f849fd60bbfde1ded38b014b18066076d4bfbb75395804dfe072 F test/vtabdrop.test 65d4cf6722972e5499bdaf0c0d70ee3b8133944a4e4bc31862563f32a7edca12 F test/vtabrhs1.test 9b5ecbc74a689500c33a4b2b36761f9bcc22fcc4e3f9d21066ee0c9c74cf5f6c -F test/wal.test 3628a18ed2ba1cad58978802381f89e6076d225d5c93836d3eed464f867fa288 +F test/wal.test 519c550255c78f55959e9159b93ebbfad2b4e9f36f5b76284da41f572f9d27da F test/wal2.test e89ca97593b5e92849039f6b68ce1719a853ef20fa22c669ec1ac452fbc31cab F test/wal3.test 5de023bb862fd1eb9d2ad26fa8d9c43abb5370582e5b08b2ae0d6f93661bc310 F test/wal4.test 4744e155cd6299c6bd99d3eab1c82f77db9cdb3c @@ -2202,8 +2202,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P 54853421ba012c192ee2a41873e6ba10e187a6ec2e23182ccbec56864604166f de7064d118c33aab0fff39d072593b287c291870b843d093045300bde464420f -R 3c243a933b362fd80871bde637111a1b +P eb13b8b3ef67ca8a252f7a4fd5a83ed31fefe68aa5ad8693d9d1f17218f4d176 +R 28e862b65e1c230b43e9a6086c499bb3 U dan -Z 9f9402747ee81462cbb1b0010bd49025 +Z c28b93b8951a4bd56ddee9ab67e53504 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 30c13113b4..22885b6453 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -eb13b8b3ef67ca8a252f7a4fd5a83ed31fefe68aa5ad8693d9d1f17218f4d176 +68c34ffd2332d89cb6400bce5dad350a6e48c395924b8380cbeb0dbe64141808 diff --git a/src/mutex_w32.c b/src/mutex_w32.c index 7b411018f5..7eb5b50be1 100644 --- a/src/mutex_w32.c +++ b/src/mutex_w32.c @@ -314,12 +314,22 @@ static int winMutexTry(sqlite3_mutex *p){ /* ** The sqlite3_mutex_try() routine is very rarely used, and when it ** is used it is merely an optimization. So it is OK for it to always - ** fail on some platforms. But - it is required for ENABLE_SETLK_TIMEOUT - ** builds. + ** fail. + ** + ** The TryEnterCriticalSection() interface is only available on WinNT. + ** And some windows compilers complain if you try to use it without + ** first doing some #defines that prevent SQLite from building on Win98. + ** For that reason, we will omit this optimization for now. See + ** ticket #2685. */ #if defined(_WIN32_WINNT) && _WIN32_WINNT >= 0x0400 assert( winMutex_isInit==1 ); - if( sqlite3_win32_is_nt() && TryEnterCriticalSection(&p->mutex) ){ + assert( winMutex_isNt>=-1 && winMutex_isNt<=1 ); + if( winMutex_isNt<0 ){ + winMutex_isNt = sqlite3_win32_is_nt(); + } + assert( winMutex_isNt==0 || winMutex_isNt==1 ); + if( winMutex_isNt && TryEnterCriticalSection(&p->mutex) ){ #ifdef SQLITE_DEBUG p->owner = tid; p->nRef++; diff --git a/src/os_unix.c b/src/os_unix.c index 77855a8dd0..b1996278c8 100644 --- a/src/os_unix.c +++ b/src/os_unix.c @@ -4290,6 +4290,7 @@ static int unixGetpagesize(void){ ** ** nRef ** +** The following fields are read-only after the object is created: ** ** hShm ** zFilename diff --git a/src/os_win.c b/src/os_win.c index a02b0c5358..c042ac162e 100644 --- a/src/os_win.c +++ b/src/os_win.c @@ -3874,25 +3874,6 @@ static int winShmMutexHeld(void) { ** Either winShmNode.mutex must be held or winShmNode.nRef==0 and ** winShmMutexHeld() is true when reading or writing any other field ** in this structure. -** -** aMutex[SQLITE_SHM_NLOCK]: -** Normally, when SQLITE_ENABLE_SETLK_TIMEOUT is not defined, mutex -** winShmNode.mutex is used to serialize calls to the xShmLock() -** method. -** -** For SQLITE_ENABLE_SETLK_TIMEOUT builds, xShmLock() only takes the -** mutexes in the aMutex[] array that correspond to locks being taken -** or released. This means that: -** -** * Modifying the winShmNode.pFirst list requires holding *all* -** the locks in the aMutex[] array. -** -** * Reads and writes to winShm.sharedMask and winShm.exclMask must -** use AtomicLoad() and AtomicStore(). This is because it may be -** read by other threads while it is being modified. -** -** TODO: winShmNode.mutex is held for the space of time when LockFileEx() -** is called on winShmNode.hFile. */ struct winShmNode { sqlite3_mutex *mutex; /* Mutex to access this object */ @@ -3913,7 +3894,6 @@ struct winShmNode { int nRef; /* Number of winShm objects pointing to this */ winShm *pFirst; /* All winShm objects pointing to this */ winShmNode *pNext; /* Next in list of all winShmNode objects */ - #if defined(SQLITE_DEBUG) || defined(SQLITE_HAVE_OS_TRACE) u8 nextShmId; /* Next available winShm.id value */ #endif diff --git a/test/symlink2.test b/test/symlink2.test index 3564e5c399..9a2237e4c0 100644 --- a/test/symlink2.test +++ b/test/symlink2.test @@ -37,11 +37,10 @@ proc canCreateWin32Symlink {} { set link [file join $::testdir lnk[pid].sym] if {[file exists $link]} { return 0 } set target [info nameofexecutable] - if {[catch {createWin32Symlink $link $target} msg] == 0} { + if {[catch {createWin32Symlink $link $target}] == 0} { deleteWin32Symlink $link return 1 } - puts $msg return 0 } diff --git a/test/wal.test b/test/wal.test index 533e51c21b..50988debe3 100644 --- a/test/wal.test +++ b/test/wal.test @@ -506,7 +506,7 @@ do_multiclient_test tn { do_test wal-10.$tn.6 { sql3 {SELECT * FROM t1} } {1 2 3 4 5 6} - do_test wal-10.$tn.7a { + do_test wal-10.$tn.7 { sql2 COMMIT } {} @@ -521,7 +521,7 @@ do_multiclient_test tn { # to the database (as it is not locked and [db] is reading the latest # snapshot). # - do_test wal-10.$tn.7b { + do_test wal-10.$tn.7 { sql2 { BEGIN; INSERT INTO t1 VALUES(7, 8) ; } catchsql { INSERT INTO t1 VALUES(9, 10) } } {1 {database is locked}} From 093c21342c9dc73e2c0c2f46569fd83ba47c9cfe Mon Sep 17 00:00:00 2001 From: dan Date: Wed, 4 Dec 2024 18:27:13 +0000 Subject: [PATCH 009/194] Assume an NT-based OS when running tests if sqlite_os_type is not set. FossilOrigin-Name: 22e4aeded0a6a691fc7026f3cd90836a289dfc994269f8576d01e28fa478902b --- manifest | 14 +++++++------- manifest.uuid | 2 +- src/os_win.c | 9 ++++----- src/test_config.c | 2 +- 4 files changed, 13 insertions(+), 14 deletions(-) diff --git a/manifest b/manifest index 0c58e47c89..06c4a71ab4 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Back\sout\sminor\schanges\snot\srequired\sby\sthis\sbranch. -D 2024-12-03T19:41:41.500 +C Assume\san\sNT-based\sOS\swhen\srunning\stests\sif\ssqlite_os_type\sis\snot\sset. +D 2024-12-04T18:27:13.386 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d @@ -762,7 +762,7 @@ F src/os_common.h 6c0eb8dd40ef3e12fe585a13e709710267a258e2c8dd1c40b1948a1d14582e F src/os_kv.c 4d39e1f1c180b11162c6dc4aa8ad34053873a639bac6baae23272fc03349986a F src/os_setup.h 6011ad7af5db4e05155f385eb3a9b4470688de6f65d6166b8956e58a3d872107 F src/os_unix.c d2edbd92b07a3f778c2defa8a2e9d75acceb6267bda56948c41e8cdda65224d6 -F src/os_win.c a47ad87a47d799783277edc56d99fdcaac2a2a503ba702b18d149d0c4cb125b7 +F src/os_win.c e9d334b8ef6e06ae61047d2bbbf129ecfd6e12a6bd94799792433fefb1eaead6 F src/os_win.h 7b073010f1451abe501be30d12f6bc599824944a F src/pager.c 9656ad4e8331efb8a4f94f7a0c6440b98caea073950a367ea0c728a53b8e62c9 F src/pager.h 4b1140d691860de0be1347474c51fee07d5420bd7f802d38cbab8ea4ab9f538a @@ -801,7 +801,7 @@ F src/test_backup.c bd901e3c116c7f3b3bbbd4aae4ce87d99b400c9cbb0a9e7b4610af451d97 F src/test_bestindex.c 3401bee51665cbf7f9ed2552b5795452a8b86365e4c9ece745b54155a55670c6 F src/test_blob.c bcdf6a6c22d0bcc13c41479d63692ef413add2a4d30e1e26b9f74ab85b9fb4d5 F src/test_btree.c 28283787d32b8fa953eb77412ad0de2c9895260e4e5bd5a94b3c7411664f90d5 -F src/test_config.c e6823104dae529aff7ac62bc86b62d26103cb857162b08b0ba89d9140c63dedd +F src/test_config.c fa43522c0cea6b2ec189a8ffd10031ca5698b934fedf392e8576785e20ac9df1 F src/test_delete.c e2fe07646dff6300b48d49b2fee2fe192ed389e834dd635e3b3bac0ce0bf9f8f F src/test_demovfs.c 3efa2adf4f21e10d95521721687d5ca047aea91fa62dd8cc22ac9e5a9c942383 F src/test_devsym.c 649434ed34d0b03fbd5a6b42df80f0f9a7e53f94dd1710aad5dd8831e91c4e86 @@ -2202,8 +2202,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P eb13b8b3ef67ca8a252f7a4fd5a83ed31fefe68aa5ad8693d9d1f17218f4d176 -R 28e862b65e1c230b43e9a6086c499bb3 +P 68c34ffd2332d89cb6400bce5dad350a6e48c395924b8380cbeb0dbe64141808 +R 573820f2880771fa214a52abc74c258b U dan -Z c28b93b8951a4bd56ddee9ab67e53504 +Z 10a87588cb4a8d127990ae3f081dbcc5 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 22885b6453..c697838ba8 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -68c34ffd2332d89cb6400bce5dad350a6e48c395924b8380cbeb0dbe64141808 +22e4aeded0a6a691fc7026f3cd90836a289dfc994269f8576d01e28fa478902b diff --git a/src/os_win.c b/src/os_win.c index c042ac162e..739be79b5a 100644 --- a/src/os_win.c +++ b/src/os_win.c @@ -1456,10 +1456,9 @@ int sqlite3_win32_is_nt(void){ } return osInterlockedCompareExchange(&sqlite3_os_type, 2, 2)==2; #elif SQLITE_TEST -#ifdef SQLITE_ENABLE_SETLK_TIMEOUT - return 1; -#endif - return osInterlockedCompareExchange(&sqlite3_os_type, 2, 2)==2; + return osInterlockedCompareExchange(&sqlite3_os_type, 2, 2)==2 + || osInterlockedCompareExchange(&sqlite3_os_type, 0, 0)==0 + ; #else /* ** NOTE: All sub-platforms where the GetVersionEx[AW] functions are @@ -4339,7 +4338,7 @@ static int winShmLock( int bExcl = ((flags & SQLITE_SHM_EXCLUSIVE) ? 1 : 0); int nMs = 0; #ifdef SQLITE_ENABLE_SETLK_TIMEOUT - nMs = pDbFd->iBusyTimeout + nMs = pDbFd->iBusyTimeout; #endif rc = winLockFileTimeout(p->hShm, ofst+WIN_SHM_BASE, n, bExcl, nMs); if( rc==SQLITE_OK ){ diff --git a/src/test_config.c b/src/test_config.c index 20d0faa50f..6ad7a90755 100644 --- a/src/test_config.c +++ b/src/test_config.c @@ -88,7 +88,7 @@ static void set_options(Tcl_Interp *interp){ Tcl_SetVar2(interp, "sqlite_options", "win32malloc", "0", TCL_GLOBAL_ONLY); #endif -#ifdef SQLITE_OS_WINRT +#if defined(SQLITE_OS_WINRT) && SQLITE_OS_WINRT Tcl_SetVar2(interp, "sqlite_options", "winrt", "1", TCL_GLOBAL_ONLY); #else Tcl_SetVar2(interp, "sqlite_options", "winrt", "0", TCL_GLOBAL_ONLY); From b9be2f63967d2c3dec61605e68359ccea8e0a235 Mon Sep 17 00:00:00 2001 From: dan Date: Wed, 4 Dec 2024 19:32:24 +0000 Subject: [PATCH 010/194] Fix filectrl.test so that it works with winrt builds. FossilOrigin-Name: 70b0cfb0493e3fe56645648b462cb035d0d791f95b2913b7622f08c1090338c0 --- manifest | 12 ++++++------ manifest.uuid | 2 +- test/filectrl.test | 12 +++++++----- 3 files changed, 14 insertions(+), 12 deletions(-) diff --git a/manifest b/manifest index 06c4a71ab4..60d679c81f 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Assume\san\sNT-based\sOS\swhen\srunning\stests\sif\ssqlite_os_type\sis\snot\sset. -D 2024-12-04T18:27:13.386 +C Fix\sfilectrl.test\sso\sthat\sit\sworks\swith\swinrt\sbuilds. +D 2024-12-04T19:32:24.081 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d @@ -1141,7 +1141,7 @@ F test/extension01.test 00d13cec817f331a687a243e0e5a2d87b0e358c9 F test/external_reader.test c7d34694f1b25c32d866f56ac80c1e29edddc42b4ef90cad589263ffac2cde0c F test/extraquick.test cb254400bd42bfb777ff675356aabf3287978f79 F test/fallocate.test 37a62e396a68eeede8f8d2ecf23573a80faceb630788d314d0a073d862616717 -F test/filectrl.test 6e871c2d35dead1d9a88e176e8d2ca094fec6bb3 +F test/filectrl.test 7e6788759997139632eb700765d5f73d53fc5ff5d9d778e773911750ab134321 F test/filefmt.test f393e80c4b8d493b7a7f8f3809a8425bbf4292af1f5140f01cb1427798a2bbd4 F test/filter1.test 590f8ba9a0cd0823b80d89ac75c5ce72276189cef9225d2436adaf1ee87f3727 F test/filter2.tcl 44e525497ce07382915f01bd29ffd0fa49dab3adb87253b5e5103ba8f93393e8 @@ -2202,8 +2202,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P 68c34ffd2332d89cb6400bce5dad350a6e48c395924b8380cbeb0dbe64141808 -R 573820f2880771fa214a52abc74c258b +P 22e4aeded0a6a691fc7026f3cd90836a289dfc994269f8576d01e28fa478902b +R 0432cd81cc749bbfe4d694b5aab9fdf8 U dan -Z 10a87588cb4a8d127990ae3f081dbcc5 +Z 8a3542a0971ab31c1355fe946ed43a29 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index c697838ba8..0ec8721a25 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -22e4aeded0a6a691fc7026f3cd90836a289dfc994269f8576d01e28fa478902b +70b0cfb0493e3fe56645648b462cb035d0d791f95b2913b7622f08c1090338c0 diff --git a/test/filectrl.test b/test/filectrl.test index 460b71e257..fee29e0442 100644 --- a/test/filectrl.test +++ b/test/filectrl.test @@ -36,11 +36,13 @@ do_test filectrl-1.5 { sqlite3 db test_control_lockproxy.db file_control_lockproxy_test db [get_pwd] } {} -do_test filectrl-1.6 { - sqlite3 db test.db - set fn [file_control_tempfilename db] - set fn -} {/etilqs_/} +ifcapable !winrt { + do_test filectrl-1.6 { + sqlite3 db test.db + set fn [file_control_tempfilename db] + set fn + } {/etilqs_/} +} db close forcedelete .test_control_lockproxy.db-conch test.proxy forcedelete test.db test2.db From 4ab343cb7cb672290bb7e35cca6ccb5cce2ffed8 Mon Sep 17 00:00:00 2001 From: dan Date: Mon, 9 Dec 2024 16:01:28 +0000 Subject: [PATCH 011/194] Enhance tests to ensure that blocking locks, and not calls to xSleep(), are being used by SQLITE_ENABLE_SETLK_TIMEOUT builds when they should be. FossilOrigin-Name: c892242bb642f7a6a961e310ed8b4f1e140f8ee32c00f50021c6011c6e7e1476 --- manifest | 18 +++++++-------- manifest.uuid | 2 +- src/os_win.c | 55 ++++++++++++++++++++++++++++++---------------- src/test_config.c | 7 ++++++ src/test_vfs.c | 8 ++++++- test/walsetlk.test | 40 +++++++++++++++++++++++++++++++-- 6 files changed, 98 insertions(+), 32 deletions(-) diff --git a/manifest b/manifest index 60d679c81f..76c631decd 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Fix\sfilectrl.test\sso\sthat\sit\sworks\swith\swinrt\sbuilds. -D 2024-12-04T19:32:24.081 +C Enhance\stests\sto\sensure\sthat\sblocking\slocks,\sand\snot\scalls\sto\sxSleep(),\sare\sbeing\sused\sby\sSQLITE_ENABLE_SETLK_TIMEOUT\sbuilds\swhen\sthey\sshould\sbe. +D 2024-12-09T16:01:28.611 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d @@ -762,7 +762,7 @@ F src/os_common.h 6c0eb8dd40ef3e12fe585a13e709710267a258e2c8dd1c40b1948a1d14582e F src/os_kv.c 4d39e1f1c180b11162c6dc4aa8ad34053873a639bac6baae23272fc03349986a F src/os_setup.h 6011ad7af5db4e05155f385eb3a9b4470688de6f65d6166b8956e58a3d872107 F src/os_unix.c d2edbd92b07a3f778c2defa8a2e9d75acceb6267bda56948c41e8cdda65224d6 -F src/os_win.c e9d334b8ef6e06ae61047d2bbbf129ecfd6e12a6bd94799792433fefb1eaead6 +F src/os_win.c 85c4d04e3d679a471c35172a58afa106040c26b9d6ba80be2efaf948c60be783 F src/os_win.h 7b073010f1451abe501be30d12f6bc599824944a F src/pager.c 9656ad4e8331efb8a4f94f7a0c6440b98caea073950a367ea0c728a53b8e62c9 F src/pager.h 4b1140d691860de0be1347474c51fee07d5420bd7f802d38cbab8ea4ab9f538a @@ -801,7 +801,7 @@ F src/test_backup.c bd901e3c116c7f3b3bbbd4aae4ce87d99b400c9cbb0a9e7b4610af451d97 F src/test_bestindex.c 3401bee51665cbf7f9ed2552b5795452a8b86365e4c9ece745b54155a55670c6 F src/test_blob.c bcdf6a6c22d0bcc13c41479d63692ef413add2a4d30e1e26b9f74ab85b9fb4d5 F src/test_btree.c 28283787d32b8fa953eb77412ad0de2c9895260e4e5bd5a94b3c7411664f90d5 -F src/test_config.c fa43522c0cea6b2ec189a8ffd10031ca5698b934fedf392e8576785e20ac9df1 +F src/test_config.c 7f412406592794636d6226268e26d413850a9f799bc5f3c01afc2820b165fca8 F src/test_delete.c e2fe07646dff6300b48d49b2fee2fe192ed389e834dd635e3b3bac0ce0bf9f8f F src/test_demovfs.c 3efa2adf4f21e10d95521721687d5ca047aea91fa62dd8cc22ac9e5a9c942383 F src/test_devsym.c 649434ed34d0b03fbd5a6b42df80f0f9a7e53f94dd1710aad5dd8831e91c4e86 @@ -832,7 +832,7 @@ F src/test_tclsh.c c01706ac60bd3176754d3ccd37da74c6ad97c2e14489f8ed71b497c1c0ac0 F src/test_tclvar.c ae873248a0188459b1c16ca7cc431265dacce524399e8b46725c2b3b7e048424 F src/test_thread.c d7a8bcea7445f37cc2a1f7f81dd6059634f45e0c61bfe80182b02872fb0328bb F src/test_vdbecov.c 5c426d9cd2b351f5f9ceb30cabf8c64a63bfcad644c507e0bd9ce2f6ae1a3bf3 -F src/test_vfs.c f298475e468c7e14945b20af885917181090c265aa3c4ade897849c9fbd396f2 +F src/test_vfs.c a19728c5930b5f5f415c664c57b029cba98c459fe70639aefcbfc4f70d544335 F src/test_windirent.c a895e2c068a06644eef91a7f0a32182445a893b9a0f33d0cdb4283dca2486ac1 F src/test_windirent.h da2e5b73c32d09905fbdd00f27cd802212a32a58ead882736fe4f5eb775ebc50 F src/test_window.c 6d80e11fba89a1796525e6f0048ff0c7789aa2c6b0b11c80827dc1437bd8ea72 @@ -2021,7 +2021,7 @@ F test/walro.test cb438d05ba0d191f10b688e39c4f0cd5b71569a1d1f4440e5bdf3c6880e08c F test/walro2.test 33955a6fd874dd9724005e17f77fef89d334b3171454a1256fe4941a96766cdc F test/walrofault.test c70cb6e308c443867701856cce92ad8288cd99488fa52afab77cca6cfd51af68 F test/walseh1.test bae700eb99519b6d5cd3f893c04759accc5a59c391d4189fe4dd6995a533442b -F test/walsetlk.test 34c901443b31ab720afc463f5b236c86ca5c4134402573dce91aa0761de8db5a +F test/walsetlk.test 18dcf274891bd93916ca4ba831078f89ef99388c6fdd495745443ed2c1b2f382 F test/walshared.test 42e3808582504878af237ea02c42ca793e8a0efaa19df7df26ac573370dbc7a3 F test/walslow.test 0c51843836c9dcf40a5ac05aa781bfb977b396ee2c872d92bd48b79d5dd9aa23 F test/walthread.test 14b20fcfa6ae152f5d8e12f5dc8a8a724b7ef189f5d8ef1e2ceab79f2af51747 @@ -2202,8 +2202,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P 22e4aeded0a6a691fc7026f3cd90836a289dfc994269f8576d01e28fa478902b -R 0432cd81cc749bbfe4d694b5aab9fdf8 +P 70b0cfb0493e3fe56645648b462cb035d0d791f95b2913b7622f08c1090338c0 +R 9de6f4b05e49f722496a553eef28dd0a U dan -Z 8a3542a0971ab31c1355fe946ed43a29 +Z b306d8cfc696ddcddaf2101fbec84ebb # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 0ec8721a25..84434c2dcf 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -70b0cfb0493e3fe56645648b462cb035d0d791f95b2913b7622f08c1090338c0 +c892242bb642f7a6a961e310ed8b4f1e140f8ee32c00f50021c6011c6e7e1476 diff --git a/src/os_win.c b/src/os_win.c index 739be79b5a..c5342b2d03 100644 --- a/src/os_win.c +++ b/src/os_win.c @@ -4044,10 +4044,13 @@ static void *winConvertFromUtf8Filename(const char *zFilename){ return zConverted; } -static int winOpenFile( - const char *zUtf8, - int *pbReadonly, - HANDLE *ph +/* +** This function is used to open a handle on a *-shm file. +*/ +static int winHandleOpen( + const char *zUtf8, /* File to open */ + int *pbReadonly, /* IN/OUT: True for readonly handle */ + HANDLE *ph /* OUT: New HANDLE for file */ ){ int rc = SQLITE_OK; void *zConverted = 0; @@ -4072,8 +4075,8 @@ static int winOpenFile( /* TODO: platforms. ** TODO: retry-on-ioerr. */ + if( osIsNT() ){ #if SQLITE_OS_WINRT - { CREATEFILE2_EXTENDED_PARAMETERS extendedParameters; memset(&extendedParameters, 0, sizeof(extendedParameters)); extendedParameters.dwSize = sizeof(extendedParameters); @@ -4086,21 +4089,35 @@ static int winOpenFile( OPEN_ALWAYS, /* dwCreationDisposition */ &extendedParameters ); - } #else - h = osCreateFileW((LPCWSTR)zConverted, /* lpFileName */ - (GENERIC_READ | (bReadonly ? 0 : GENERIC_WRITE)), /* dwDesiredAccess */ - FILE_SHARE_READ | FILE_SHARE_WRITE, /* dwShareMode */ - NULL, /* lpSecurityAttributes */ - OPEN_ALWAYS, /* dwCreationDisposition */ - FILE_ATTRIBUTE_NORMAL|FILE_FLAG_OVERLAPPED, - NULL - ); + h = osCreateFileW((LPCWSTR)zConverted, /* lpFileName */ + (GENERIC_READ | (bReadonly ? 0 : GENERIC_WRITE)), /* dwDesiredAccess */ + FILE_SHARE_READ | FILE_SHARE_WRITE, /* dwShareMode */ + NULL, /* lpSecurityAttributes */ + OPEN_ALWAYS, /* dwCreationDisposition */ + FILE_ATTRIBUTE_NORMAL|FILE_FLAG_OVERLAPPED, + NULL + ); #endif + }else{ + /* Due to pre-processor directives earlier in this file, + ** SQLITE_WIN32_HAS_ANSI is always defined if osIsNT() is false. */ +#ifdef SQLITE_WIN32_HAS_ANSI + h = osCreateFileA((LPCSTR)zConverted, + (GENERIC_READ | (bReadonly ? 0 : GENERIC_WRITE)), /* dwDesiredAccess */ + FILE_SHARE_READ | FILE_SHARE_WRITE, /* dwShareMode */ + NULL, /* lpSecurityAttributes */ + OPEN_ALWAYS, /* dwCreationDisposition */ + FILE_ATTRIBUTE_NORMAL|FILE_FLAG_OVERLAPPED, + NULL + ); +#endif + } + if( h==INVALID_HANDLE_VALUE ){ if( bReadonly==0 ){ bReadonly = 1; - rc = winOpenFile(zUtf8, &bReadonly, &h); + rc = winHandleOpen(zUtf8, &bReadonly, &h); }else{ rc = SQLITE_CANTOPEN_BKPT; } @@ -4143,10 +4160,10 @@ static int winOpenSharedMemory(winFile *pDbFd){ sqlite3FileSuffix3(pDbFd->zPath, pNew->zFilename); /* Open a file-handle on the *-shm file for this connection. This file-handle - ** is only used for locking. The mapping of the *-shm file is created using the - ** shared file handle in winShmNode.hSharedShm. */ + ** is only used for locking. The mapping of the *-shm file is created using + ** the shared file handle in winShmNode.hSharedShm. */ p->bReadonly = sqlite3_uri_boolean(pDbFd->zPath, "readonly_shm", 0); - rc = winOpenFile(pNew->zFilename, &p->bReadonly, &p->hShm); + rc = winHandleOpen(pNew->zFilename, &p->bReadonly, &p->hShm); /* Look to see if there is an existing winShmNode that can be used. ** If no matching winShmNode currently exists, then create a new one. */ @@ -4169,7 +4186,7 @@ static int winOpenSharedMemory(winFile *pDbFd){ if( rc==SQLITE_OK ){ HANDLE h = INVALID_HANDLE_VALUE; pShmNode->isReadonly = p->bReadonly; - rc = winOpenFile(pNew->zFilename, &pShmNode->isReadonly, &h); + rc = winHandleOpen(pNew->zFilename, &pShmNode->isReadonly, &h); pShmNode->hSharedShm = h; } diff --git a/src/test_config.c b/src/test_config.c index 6ad7a90755..bdfb31e7d8 100644 --- a/src/test_config.c +++ b/src/test_config.c @@ -787,6 +787,13 @@ Tcl_SetVar2(interp, "sqlite_options", "mergesort", "1", TCL_GLOBAL_ONLY); Tcl_SetVar2(interp, "sqlite_options", "windowfunc", "1", TCL_GLOBAL_ONLY); #endif +#if !defined(SQLITE_ENABLE_SETLK_TIMEOUT) + Tcl_SetVar2(interp, "sqlite_options", "setlk_timeout", "0", TCL_GLOBAL_ONLY); +#else + Tcl_SetVar2(interp, "sqlite_options", "setlk_timeout", + STRINGVALUE(SQLITE_ENABLE_SETLK_TIMEOUT), TCL_GLOBAL_ONLY); +#endif + #define LINKVAR(x) { \ static const int cv_ ## x = SQLITE_ ## x; \ Tcl_LinkVar(interp, "SQLITE_" #x, (char *)&(cv_ ## x), \ diff --git a/src/test_vfs.c b/src/test_vfs.c index 9f84b4f801..f75ef956b6 100644 --- a/src/test_vfs.c +++ b/src/test_vfs.c @@ -130,8 +130,9 @@ struct Testvfs { #define TESTVFS_LOCK_MASK 0x00040000 #define TESTVFS_CKLOCK_MASK 0x00080000 #define TESTVFS_FCNTL_MASK 0x00100000 +#define TESTVFS_SLEEP_MASK 0x00200000 -#define TESTVFS_ALL_MASK 0x001FFFFF +#define TESTVFS_ALL_MASK 0x003FFFFF #define TESTVFS_MAX_PAGES 1024 @@ -813,6 +814,10 @@ static int tvfsRandomness(sqlite3_vfs *pVfs, int nByte, char *zBufOut){ ** actually slept. */ static int tvfsSleep(sqlite3_vfs *pVfs, int nMicro){ + Testvfs *p = (Testvfs *)pVfs->pAppData; + if( p->pScript && (p->mask&TESTVFS_SLEEP_MASK) ){ + tvfsExecTcl(p, "xSleep", Tcl_NewIntObj(nMicro), 0, 0, 0); + } return sqlite3OsSleep(PARENTVFS(pVfs), nMicro); } @@ -1197,6 +1202,7 @@ static int SQLITE_TCLAPI testvfs_obj_cmd( { "xLock", TESTVFS_LOCK_MASK }, { "xCheckReservedLock", TESTVFS_CKLOCK_MASK }, { "xFileControl", TESTVFS_FCNTL_MASK }, + { "xSleep", TESTVFS_SLEEP_MASK }, }; Tcl_Obj **apElem = 0; Tcl_Size nElem = 0; diff --git a/test/walsetlk.test b/test/walsetlk.test index 1e09238226..23fcac59d2 100644 --- a/test/walsetlk.test +++ b/test/walsetlk.test @@ -80,6 +80,19 @@ db2 close #------------------------------------------------------------------------- do_multiclient_test tn { + + testvfs tvfs -fullshm 1 + db close + sqlite3 db test.db -vfs tvfs + tvfs script xSleep_callback + tvfs filter xSleep + + set ::sleep_count 0 + proc xSleep_callback {xSleep nMs} { + after [expr $nMs / 1000] + incr ::sleep_count + } + do_test 2.$tn.1 { sql1 { PRAGMA journal_mode = wal; @@ -132,7 +145,6 @@ do_multiclient_test tn { set us [lindex [time { catch {db eval "PRAGMA wal_checkpoint=RESTART"} }] 0] expr $us>1000000 && $us<4000000 } {1} - do_test 2.$tn.9 { sql3 { INSERT INTO t1 VALUES(11, 12); @@ -178,7 +190,31 @@ do_multiclient_test tn { set us [lindex [time { catch {db eval "PRAGMA wal_checkpoint=RESTART"} }] 0] expr $us>1000000 && $us<4000000 } {1} - + + db close + tvfs delete + + # Set bSleep to true if it is expected that the above used xSleep() to + # wait for locks. bSleep is true unless SQLITE_ENABLE_SETLK_TIMEOUT is + # set to 1 and either: + # + # * the OS is windows, or + # * the OS is unix and the tests were run with each connection + # in a separate process. + # + set bSleep 1 + if {$::sqlite_options(setlk_timeout)==1} { + if {$::tcl_platform(platform)=="windows"} { + set bSleep 0 + } + if {$::tcl_platform(platform)=="unix"} { + set bSleep [expr $tn==2] + } + } + + do_test 2.$tn.15.$bSleep { + expr $::sleep_count > 0 + } $bSleep } #------------------------------------------------------------------------- From 9c750fe3a3c70db6e596ebbf3a4bf8c442302231 Mon Sep 17 00:00:00 2001 From: dan Date: Mon, 9 Dec 2024 17:30:20 +0000 Subject: [PATCH 012/194] Test the case where a db connection blocks for a while and then successfully obtains the lock. FossilOrigin-Name: 9cbc97ff8411a672b572000e4509ac02b3d29911be5ce1bcf334ed8e2a91db77 --- manifest | 12 +++++----- manifest.uuid | 2 +- test/walsetlk.test | 55 +++++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 61 insertions(+), 8 deletions(-) diff --git a/manifest b/manifest index 76c631decd..4d1256ddc4 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Enhance\stests\sto\sensure\sthat\sblocking\slocks,\sand\snot\scalls\sto\sxSleep(),\sare\sbeing\sused\sby\sSQLITE_ENABLE_SETLK_TIMEOUT\sbuilds\swhen\sthey\sshould\sbe. -D 2024-12-09T16:01:28.611 +C Test\sthe\scase\swhere\sa\sdb\sconnection\sblocks\sfor\sa\swhile\sand\sthen\ssuccessfully\sobtains\sthe\slock. +D 2024-12-09T17:30:20.069 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d @@ -2021,7 +2021,7 @@ F test/walro.test cb438d05ba0d191f10b688e39c4f0cd5b71569a1d1f4440e5bdf3c6880e08c F test/walro2.test 33955a6fd874dd9724005e17f77fef89d334b3171454a1256fe4941a96766cdc F test/walrofault.test c70cb6e308c443867701856cce92ad8288cd99488fa52afab77cca6cfd51af68 F test/walseh1.test bae700eb99519b6d5cd3f893c04759accc5a59c391d4189fe4dd6995a533442b -F test/walsetlk.test 18dcf274891bd93916ca4ba831078f89ef99388c6fdd495745443ed2c1b2f382 +F test/walsetlk.test 910a8ef8cc500b0be5cf818e2fff7a4505186d33bf08147dc23e38f78d0b2016 F test/walshared.test 42e3808582504878af237ea02c42ca793e8a0efaa19df7df26ac573370dbc7a3 F test/walslow.test 0c51843836c9dcf40a5ac05aa781bfb977b396ee2c872d92bd48b79d5dd9aa23 F test/walthread.test 14b20fcfa6ae152f5d8e12f5dc8a8a724b7ef189f5d8ef1e2ceab79f2af51747 @@ -2202,8 +2202,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P 70b0cfb0493e3fe56645648b462cb035d0d791f95b2913b7622f08c1090338c0 -R 9de6f4b05e49f722496a553eef28dd0a +P c892242bb642f7a6a961e310ed8b4f1e140f8ee32c00f50021c6011c6e7e1476 +R c5bbc43d548daaa55d847d34080f9ae5 U dan -Z b306d8cfc696ddcddaf2101fbec84ebb +Z 080db00c6e437599cb3a53612222f7cd # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 84434c2dcf..364baa9b7a 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -c892242bb642f7a6a961e310ed8b4f1e140f8ee32c00f50021c6011c6e7e1476 +9cbc97ff8411a672b572000e4509ac02b3d29911be5ce1bcf334ed8e2a91db77 diff --git a/test/walsetlk.test b/test/walsetlk.test index 23fcac59d2..1f1c0b7c32 100644 --- a/test/walsetlk.test +++ b/test/walsetlk.test @@ -219,8 +219,20 @@ do_multiclient_test tn { #------------------------------------------------------------------------- reset_db -sqlite3 db2 test.db + +testvfs tvfs -fullshm 1 +tvfs script xSleep_callback +tvfs filter xSleep + +set ::sleep_count 0 +proc xSleep_callback {xSleep nMs} { + after [expr $nMs / 1000] + incr ::sleep_count +} + +sqlite3 db2 test.db -vfs tvfs db2 timeout 1000 + do_execsql_test 3.0 { PRAGMA journal_mode = wal; CREATE TABLE x1(x, y); @@ -232,4 +244,45 @@ do_test 3.1 { list [catch { db2 eval {BEGIN EXCLUSIVE} } msg] $msg } {1 {database is locked}} +do_execsql_test 3.2 { + COMMIT; +} + +testfixture_nb done { + sqlite3 db test.db + db eval { + BEGIN EXCLUSIVE; + INSERT INTO x1 VALUES(3, 4); + } + after 2000 + db eval { + COMMIT + } +} + +after 500 +db2 timeout 5000 +do_test 3.3 { + set t [lindex [time { db2 eval { BEGIN EXCLUSIVE } }] 0] + expr ($t>1000000) +} {1} + +set bExpect 0 +if {$::sqlite_options(setlk_timeout)==1} { + set bExpect 1 +} +do_test 3.4 { + expr {$::sleep_count > 0} +} $bExpect + +do_execsql_test -db db2 3.5 { + INSERT INTO x1 VALUES(5, 6); + COMMIT; + SELECT * FROM x1; +} {1 2 3 4 5 6} + +db2 close +tvfs delete + finish_test + From e5418e9dd3cf9c9c97a0d800b3f0bc664b3fba29 Mon Sep 17 00:00:00 2001 From: dan Date: Tue, 10 Dec 2024 18:12:59 +0000 Subject: [PATCH 013/194] Fix walsetlk.test to work on unix. FossilOrigin-Name: 798dff041be46d2d5014779c0855f60e6b2a142e9946bfb79061d7dff0bc3d27 --- manifest | 12 ++++++------ manifest.uuid | 2 +- test/walsetlk.test | 28 +++++++++++++++++++++++----- 3 files changed, 30 insertions(+), 12 deletions(-) diff --git a/manifest b/manifest index 933c5731be..f262cc8852 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Merge\slatest\strunk\schanges\sinto\sthis\sbranch. -D 2024-12-10T17:36:20.046 +C Fix\swalsetlk.test\sto\swork\son\sunix. +D 2024-12-10T18:12:59.802 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d @@ -2021,7 +2021,7 @@ F test/walro.test cb438d05ba0d191f10b688e39c4f0cd5b71569a1d1f4440e5bdf3c6880e08c F test/walro2.test 33955a6fd874dd9724005e17f77fef89d334b3171454a1256fe4941a96766cdc F test/walrofault.test c70cb6e308c443867701856cce92ad8288cd99488fa52afab77cca6cfd51af68 F test/walseh1.test bae700eb99519b6d5cd3f893c04759accc5a59c391d4189fe4dd6995a533442b -F test/walsetlk.test 502cd17ebd2b4fcb7a2f67c3612582ae9da416c756affb652064c16ce365c16d +F test/walsetlk.test e24dd0a7bba843a3f7da97b6571d0e7fa9133941e74bb75a1d89e172008df31c F test/walshared.test 42e3808582504878af237ea02c42ca793e8a0efaa19df7df26ac573370dbc7a3 F test/walslow.test 0c51843836c9dcf40a5ac05aa781bfb977b396ee2c872d92bd48b79d5dd9aa23 F test/walthread.test 14b20fcfa6ae152f5d8e12f5dc8a8a724b7ef189f5d8ef1e2ceab79f2af51747 @@ -2202,8 +2202,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P 9cbc97ff8411a672b572000e4509ac02b3d29911be5ce1bcf334ed8e2a91db77 0f3b484fd71fd77947a1de7c24f35f8eed2911d0565d03edb7970b8f3092a5da -R b4b044f08598c4c125c36b0936a05c1b +P d67a42d62555cf9294e11a04d3c7cfdf11ca7978d60fc085f5a73e36aff8313e +R f7af9d80a506351b36f5bd843c579062 U dan -Z 7839b247a1c08690f8454e1a17953ba8 +Z 1f09d6481c3b825c642e11d0b6e347e6 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 9ad9e4ac3f..9e8542b6bf 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -d67a42d62555cf9294e11a04d3c7cfdf11ca7978d60fc085f5a73e36aff8313e +798dff041be46d2d5014779c0855f60e6b2a142e9946bfb79061d7dff0bc3d27 diff --git a/test/walsetlk.test b/test/walsetlk.test index ae53976cf0..3a26d9a09a 100644 --- a/test/walsetlk.test +++ b/test/walsetlk.test @@ -18,6 +18,7 @@ source $testdir/lock_common.tcl set testprefix walsetlk ifcapable !wal {finish_test ; return } +if 0 { db timeout 1000 #------------------------------------------------------------------------- @@ -89,6 +90,7 @@ do_multiclient_test tn { set ::sleep_count 0 proc xSleep_callback {xSleep nMs} { + puts POOOOOOP after [expr $nMs / 1000] incr ::sleep_count } @@ -218,6 +220,7 @@ do_multiclient_test tn { } #------------------------------------------------------------------------- +} reset_db testvfs tvfs -fullshm 1 @@ -228,6 +231,7 @@ set ::sleep_count 0 proc xSleep_callback {xSleep nMs} { after [expr $nMs / 1000] incr ::sleep_count + breakpoint } sqlite3 db2 test.db -vfs tvfs @@ -240,15 +244,29 @@ do_execsql_test 3.0 { INSERT INTO x1 VALUES(1, 2); } {wal} -do_test 3.1 { +do_execsql_test -db db2 3.1a { + SELECT * FROM x1 +} {} + +do_test 3.1b { list [catch { db2 eval {BEGIN EXCLUSIVE} } msg] $msg } {1 {database is locked}} -do_execsql_test 3.2 { +# Set bExpect to true if calls to xSleep() are expected. Such calls are +# expected unless this is an SQLITE_ENABLE_SETLK_TIMEOUT=1 build. +set bExpect 1 +if {$tcl_platform(platform)=="windows" && $::sqlite_options(setlk_timeout)==1} { + set bExpect 0 +} +do_test 3.2 { + expr {$::sleep_count > 0} +} $bExpect +set ::sleep_count 0 + +do_execsql_test 3.3 { COMMIT; } - # Launch a non-blocking testfixture process to write-lock the # database for 2000 ms. testfixture_nb done { @@ -265,7 +283,7 @@ testfixture_nb done { after 500 db2 timeout 5000 -do_test 3.3 { +do_test 3.4 { set t [lindex [time { db2 eval { BEGIN EXCLUSIVE } }] 0] expr ($t>1000000) } {1} @@ -276,7 +294,7 @@ set bExpect 1 if {$::sqlite_options(setlk_timeout)==1} { set bExpect 0 } -do_test 3.4 { +do_test 3.5 { expr {$::sleep_count > 0} } $bExpect From d50eb9c9995109c10f832792bfb7d33c5273e0f6 Mon Sep 17 00:00:00 2001 From: dan Date: Tue, 10 Dec 2024 19:00:07 +0000 Subject: [PATCH 014/194] Ensure windows may block on a SHARED (but not EXCLUSIVE) DMS lock. FossilOrigin-Name: 55e4e7bb0074859e8c3e736e7eceb69af8408ce75135f5baa09e98aaf4e2a321 --- manifest | 14 +++++++------- manifest.uuid | 2 +- src/os_win.c | 46 +++++++++++++++++++++++++--------------------- test/walsetlk.test | 3 --- 4 files changed, 33 insertions(+), 32 deletions(-) diff --git a/manifest b/manifest index f262cc8852..4f8171101c 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Fix\swalsetlk.test\sto\swork\son\sunix. -D 2024-12-10T18:12:59.802 +C Ensure\swindows\smay\sblock\son\sa\sSHARED\s(but\snot\sEXCLUSIVE)\sDMS\slock. +D 2024-12-10T19:00:07.376 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d @@ -762,7 +762,7 @@ F src/os_common.h 6c0eb8dd40ef3e12fe585a13e709710267a258e2c8dd1c40b1948a1d14582e F src/os_kv.c 4d39e1f1c180b11162c6dc4aa8ad34053873a639bac6baae23272fc03349986a F src/os_setup.h 6011ad7af5db4e05155f385eb3a9b4470688de6f65d6166b8956e58a3d872107 F src/os_unix.c d2edbd92b07a3f778c2defa8a2e9d75acceb6267bda56948c41e8cdda65224d6 -F src/os_win.c 85c4d04e3d679a471c35172a58afa106040c26b9d6ba80be2efaf948c60be783 +F src/os_win.c c7a28dee9db7f4ca01aaf1f8561635870fc660581a5a7c8ecee6aa455829cf29 F src/os_win.h 7b073010f1451abe501be30d12f6bc599824944a F src/pager.c 9656ad4e8331efb8a4f94f7a0c6440b98caea073950a367ea0c728a53b8e62c9 F src/pager.h 4b1140d691860de0be1347474c51fee07d5420bd7f802d38cbab8ea4ab9f538a @@ -2021,7 +2021,7 @@ F test/walro.test cb438d05ba0d191f10b688e39c4f0cd5b71569a1d1f4440e5bdf3c6880e08c F test/walro2.test 33955a6fd874dd9724005e17f77fef89d334b3171454a1256fe4941a96766cdc F test/walrofault.test c70cb6e308c443867701856cce92ad8288cd99488fa52afab77cca6cfd51af68 F test/walseh1.test bae700eb99519b6d5cd3f893c04759accc5a59c391d4189fe4dd6995a533442b -F test/walsetlk.test e24dd0a7bba843a3f7da97b6571d0e7fa9133941e74bb75a1d89e172008df31c +F test/walsetlk.test 6e02311c7697cdc93610d24e8baaefe48592018cb5b317cba089c1bcd8d16f3a F test/walshared.test 42e3808582504878af237ea02c42ca793e8a0efaa19df7df26ac573370dbc7a3 F test/walslow.test 0c51843836c9dcf40a5ac05aa781bfb977b396ee2c872d92bd48b79d5dd9aa23 F test/walthread.test 14b20fcfa6ae152f5d8e12f5dc8a8a724b7ef189f5d8ef1e2ceab79f2af51747 @@ -2202,8 +2202,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P d67a42d62555cf9294e11a04d3c7cfdf11ca7978d60fc085f5a73e36aff8313e -R f7af9d80a506351b36f5bd843c579062 +P 798dff041be46d2d5014779c0855f60e6b2a142e9946bfb79061d7dff0bc3d27 +R d7fe08eda9a97ac9dd36271e2e66b9ad U dan -Z 1f09d6481c3b825c642e11d0b6e347e6 +Z 8b09a868e54db464087d18bec9270611 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 9e8542b6bf..3f3f3749c3 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -798dff041be46d2d5014779c0855f60e6b2a142e9946bfb79061d7dff0bc3d27 +55e4e7bb0074859e8c3e736e7eceb69af8408ce75135f5baa09e98aaf4e2a321 diff --git a/src/os_win.c b/src/os_win.c index c5342b2d03..00866dbf67 100644 --- a/src/os_win.c +++ b/src/os_win.c @@ -292,6 +292,12 @@ struct winFile { #endif }; +#ifdef SQLITE_ENABLE_SETLK_TIMEOUT +# define winFileBusyTimeout(pDbFd) pDbFd->iBusyTimeout +#else +# define winFileBusyTimeout(pDbFd) 0 +#endif + /* ** The winVfsAppData structure is used for the pAppData member for all of the ** Win32 VFS variants. @@ -2555,7 +2561,7 @@ static BOOL winLockFile( ** some other process holds the lock, SQLITE_BUSY is returned if nMs==0, or ** SQLITE_BUSY_TIMEOUT otherwise. Or, if an error occurs, SQLITE_IOERR. */ -static int winLockFileTimeout( +static int winHandleLockTimeout( HANDLE hFile, DWORD offset, DWORD nByte, @@ -2647,6 +2653,9 @@ static BOOL winUnlockFile( #endif } +/* +** Remove an nByte lock starting at offset iOff from HANDLE h. +*/ static int winHandleUnlock(HANDLE h, int iOff, int nByte){ BOOL ret = winUnlockFile(&h, iOff, 0, nByte, 0); return (ret ? SQLITE_OK : SQLITE_IOERR_UNLOCK); @@ -3867,12 +3876,17 @@ static int winShmMutexHeld(void) { ** ** The following fields are read-only after the object is created: ** -** hFile ** zFilename ** ** Either winShmNode.mutex must be held or winShmNode.nRef==0 and ** winShmMutexHeld() is true when reading or writing any other field ** in this structure. +** +** File-handle hSharedShm is used to (a) take the DMS lock, (b) truncate +** the *-shm file if the DMS-locking protocol demands it, and (c) map +** regions of the *-shm file into memory using MapViewOfFile() or +** similar. Other locks are taken by individual clients using the +** winShm.hShm handles. */ struct winShmNode { sqlite3_mutex *mutex; /* Mutex to access this object */ @@ -3907,16 +3921,8 @@ static winShmNode *winShmNodeList = 0; /* ** Structure used internally by this VFS to record the state of an -** open shared memory connection. -** -** The following fields are initialized when this object is created and -** are read-only thereafter: -** -** winShm.pShmNode -** winShm.id -** -** All other fields are read/write. The winShm.pShmNode->mutex must be held -** while accessing any read/write fields. +** open shared memory connection. There is one such structure for each +** winFile open on a wal mode database. */ struct winShm { winShmNode *pShmNode; /* The underlying winShmNode object */ @@ -3991,11 +3997,12 @@ static void winShmPurge(sqlite3_vfs *pVfs, int deleteFlag){ ** pShmNode. Take the lock. Truncate the *-shm file if required. ** Return SQLITE_OK if successful, or an SQLite error code otherwise. */ -static int winLockSharedMemory(winShmNode *pShmNode){ +static int winLockSharedMemory(winShmNode *pShmNode, int nMs){ HANDLE h = pShmNode->hSharedShm; int rc = SQLITE_OK; - rc = winLockFileTimeout(h, WIN_SHM_DMS, 1, 1, 0); + assert( sqlite3_mutex_held(pShmNode->mutex) ); + rc = winHandleLockTimeout(h, WIN_SHM_DMS, 1, 1, 0); if( rc==SQLITE_OK ){ /* We have an EXCLUSIVE lock on the DMS byte. This means that this ** is the first process to open the file. Truncate it to zero bytes @@ -4014,7 +4021,7 @@ static int winLockSharedMemory(winShmNode *pShmNode){ if( rc==SQLITE_OK ){ /* Take a SHARED lock on the DMS byte. */ - rc = winLockFileTimeout(h, WIN_SHM_DMS, 1, 0, 0); + rc = winHandleLockTimeout(h, WIN_SHM_DMS, 1, 0, nMs); if( rc==SQLITE_OK ){ pShmNode->isUnlocked = 0; } @@ -4353,11 +4360,8 @@ static int winShmLock( } }else{ int bExcl = ((flags & SQLITE_SHM_EXCLUSIVE) ? 1 : 0); - int nMs = 0; -#ifdef SQLITE_ENABLE_SETLK_TIMEOUT - nMs = pDbFd->iBusyTimeout; -#endif - rc = winLockFileTimeout(p->hShm, ofst+WIN_SHM_BASE, n, bExcl, nMs); + int nMs = winFileBusyTimeout(pDbFd); + rc = winHandleLockTimeout(p->hShm, ofst+WIN_SHM_BASE, n, bExcl, nMs); if( rc==SQLITE_OK ){ if( bExcl ){ p->exclMask = (p->exclMask | mask); @@ -4435,7 +4439,7 @@ static int winShmMap( if( pShmNode->isUnlocked ){ /* Take the DMS lock. */ assert( pShmNode->nRegion==0 ); - rc = winLockSharedMemory(pShmNode); + rc = winLockSharedMemory(pShmNode, winFileBusyTimeout(pDbFd)); if( rc!=SQLITE_OK ) goto shmpage_out; } diff --git a/test/walsetlk.test b/test/walsetlk.test index 3a26d9a09a..d67d53dd42 100644 --- a/test/walsetlk.test +++ b/test/walsetlk.test @@ -18,7 +18,6 @@ source $testdir/lock_common.tcl set testprefix walsetlk ifcapable !wal {finish_test ; return } -if 0 { db timeout 1000 #------------------------------------------------------------------------- @@ -90,7 +89,6 @@ do_multiclient_test tn { set ::sleep_count 0 proc xSleep_callback {xSleep nMs} { - puts POOOOOOP after [expr $nMs / 1000] incr ::sleep_count } @@ -220,7 +218,6 @@ do_multiclient_test tn { } #------------------------------------------------------------------------- -} reset_db testvfs tvfs -fullshm 1 From 7d32ec0a5cac45cc94ad060ed7f6e7f58fae63fd Mon Sep 17 00:00:00 2001 From: dan Date: Tue, 10 Dec 2024 21:24:28 +0000 Subject: [PATCH 015/194] Fix a problem with walsetlk.test on windows. FossilOrigin-Name: 704e6567c14a4a07a1a4d1fc2bd8a7f288b55b27508d23ba7f5c755c830c14ec --- manifest | 12 ++++++------ manifest.uuid | 2 +- test/walsetlk.test | 4 +++- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/manifest b/manifest index 4f8171101c..9d021c1455 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Ensure\swindows\smay\sblock\son\sa\sSHARED\s(but\snot\sEXCLUSIVE)\sDMS\slock. -D 2024-12-10T19:00:07.376 +C Fix\sa\sproblem\swith\swalsetlk.test\son\swindows. +D 2024-12-10T21:24:28.723 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d @@ -2021,7 +2021,7 @@ F test/walro.test cb438d05ba0d191f10b688e39c4f0cd5b71569a1d1f4440e5bdf3c6880e08c F test/walro2.test 33955a6fd874dd9724005e17f77fef89d334b3171454a1256fe4941a96766cdc F test/walrofault.test c70cb6e308c443867701856cce92ad8288cd99488fa52afab77cca6cfd51af68 F test/walseh1.test bae700eb99519b6d5cd3f893c04759accc5a59c391d4189fe4dd6995a533442b -F test/walsetlk.test 6e02311c7697cdc93610d24e8baaefe48592018cb5b317cba089c1bcd8d16f3a +F test/walsetlk.test 46b7ab42ac4498e549e4bb0b0e99f72ccd386bb20d8f3c2ee42363f09fab398e F test/walshared.test 42e3808582504878af237ea02c42ca793e8a0efaa19df7df26ac573370dbc7a3 F test/walslow.test 0c51843836c9dcf40a5ac05aa781bfb977b396ee2c872d92bd48b79d5dd9aa23 F test/walthread.test 14b20fcfa6ae152f5d8e12f5dc8a8a724b7ef189f5d8ef1e2ceab79f2af51747 @@ -2202,8 +2202,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P 798dff041be46d2d5014779c0855f60e6b2a142e9946bfb79061d7dff0bc3d27 -R d7fe08eda9a97ac9dd36271e2e66b9ad +P 55e4e7bb0074859e8c3e736e7eceb69af8408ce75135f5baa09e98aaf4e2a321 +R fc6eda57c88b8dbee00e08f5cd38d881 U dan -Z 8b09a868e54db464087d18bec9270611 +Z c836a38a8f9471fb3b026d0dce0ae730 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 3f3f3749c3..d354804d8c 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -55e4e7bb0074859e8c3e736e7eceb69af8408ce75135f5baa09e98aaf4e2a321 +704e6567c14a4a07a1a4d1fc2bd8a7f288b55b27508d23ba7f5c755c830c14ec diff --git a/test/walsetlk.test b/test/walsetlk.test index d67d53dd42..150a4748af 100644 --- a/test/walsetlk.test +++ b/test/walsetlk.test @@ -278,7 +278,9 @@ testfixture_nb done { } } -after 500 +after 500 {set ok 1} +vwait ok + db2 timeout 5000 do_test 3.4 { set t [lindex [time { db2 eval { BEGIN EXCLUSIVE } }] 0] From b1ad83a342914a32c136b168f68198fbe07ff52a Mon Sep 17 00:00:00 2001 From: dan Date: Wed, 11 Dec 2024 15:30:58 +0000 Subject: [PATCH 016/194] Ensure that all win32 API functions invocations in os_win.c are made via the function table. Fix asan error in test code. FossilOrigin-Name: 2ffdc799c63ff8858f2aa9177ca9c74be2df5d7594cb10fb0a233537d83fd563 --- manifest | 14 +++++++------- manifest.uuid | 2 +- src/os_win.c | 40 +++++++++++++++++++++++++++++++++------- src/test1.c | 19 +++++++++++++++---- 4 files changed, 56 insertions(+), 19 deletions(-) diff --git a/manifest b/manifest index 9d021c1455..3500b38ef8 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Fix\sa\sproblem\swith\swalsetlk.test\son\swindows. -D 2024-12-10T21:24:28.723 +C Ensure\sthat\sall\swin32\sAPI\sfunctions\sinvocations\sin\sos_win.c\sare\smade\svia\sthe\sfunction\stable.\sFix\sasan\serror\sin\stest\scode. +D 2024-12-11T15:30:58.684 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d @@ -762,7 +762,7 @@ F src/os_common.h 6c0eb8dd40ef3e12fe585a13e709710267a258e2c8dd1c40b1948a1d14582e F src/os_kv.c 4d39e1f1c180b11162c6dc4aa8ad34053873a639bac6baae23272fc03349986a F src/os_setup.h 6011ad7af5db4e05155f385eb3a9b4470688de6f65d6166b8956e58a3d872107 F src/os_unix.c d2edbd92b07a3f778c2defa8a2e9d75acceb6267bda56948c41e8cdda65224d6 -F src/os_win.c c7a28dee9db7f4ca01aaf1f8561635870fc660581a5a7c8ecee6aa455829cf29 +F src/os_win.c 49cd1fbdf60dd185ce25dd0d02b2670603c3e5edc9a8fb3f21585491c9d45e30 F src/os_win.h 7b073010f1451abe501be30d12f6bc599824944a F src/pager.c 9656ad4e8331efb8a4f94f7a0c6440b98caea073950a367ea0c728a53b8e62c9 F src/pager.h 4b1140d691860de0be1347474c51fee07d5420bd7f802d38cbab8ea4ab9f538a @@ -788,7 +788,7 @@ F src/status.c cb11f8589a6912af2da3bb1ec509a94dd8ef27df4d4c1a97e0bcf2309ece972b F src/table.c 0f141b58a16de7e2fbe81c308379e7279f4c6b50eb08efeec5892794a0ba30d1 F src/tclsqlite.c 90441d3cc16f966a23499d9096a3d2d971e5e8fddb4d1413b096b79c2b2cff07 F src/tclsqlite.h 65e2c761446e1c9fa0342b7d2612a703483643c8b6a316d12a65b745a4727395 -F src/test1.c 325a66d5e52b84ba6b6d54f9d605e31a8304c395df0c589e0ade87fd2b7213b2 +F src/test1.c 04f44c6f87d3c5ee0a07775601625c319835ef35ab5060d02bbe25e0ec996615 F src/test2.c 7ebc518e6735939d8979273a6f7b1d9b5702babf059f6ad62499f7f60a9eb9a3 F src/test3.c e7573aa0f78ee4e070a4bc8c3493941c1aa64d5c66d4825c74c0f055451f432b F src/test4.c 13e57ae7ec7a959ee180970aef09deed141252fe9bb07c61054f0dfa4f1dfd5d @@ -2202,8 +2202,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P 55e4e7bb0074859e8c3e736e7eceb69af8408ce75135f5baa09e98aaf4e2a321 -R fc6eda57c88b8dbee00e08f5cd38d881 +P 704e6567c14a4a07a1a4d1fc2bd8a7f288b55b27508d23ba7f5c755c830c14ec +R 1b1d5ac8540859f8a7b2d263d2f24a8d U dan -Z c836a38a8f9471fb3b026d0dce0ae730 +Z 95b5c408908f206ff5d85841ad8872eb # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index d354804d8c..4ec306133d 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -704e6567c14a4a07a1a4d1fc2bd8a7f288b55b27508d23ba7f5c755c830c14ec +2ffdc799c63ff8858f2aa9177ca9c74be2df5d7594cb10fb0a233537d83fd563 diff --git a/src/os_win.c b/src/os_win.c index 00866dbf67..7867c876e9 100644 --- a/src/os_win.c +++ b/src/os_win.c @@ -731,6 +731,12 @@ static struct win_syscall { #define osGetFullPathNameW ((DWORD(WINAPI*)(LPCWSTR,DWORD,LPWSTR, \ LPWSTR*))aSyscall[25].pCurrent) +/* +** For GetLastError(), MSDN says: +** +** Minimum supported client: Windows XP [desktop apps | UWP apps] +** Minimum supported server: Windows Server 2003 [desktop apps | UWP apps] +*/ { "GetLastError", (SYSCALL)GetLastError, 0 }, #define osGetLastError ((DWORD(WINAPI*)(VOID))aSyscall[26].pCurrent) @@ -1013,11 +1019,13 @@ static struct win_syscall { #define osCreateEventExW ((HANDLE(WINAPI*)(LPSECURITY_ATTRIBUTES,LPCWSTR, \ DWORD,DWORD))aSyscall[62].pCurrent) -#if !SQLITE_OS_WINRT +/* +** For WaitForSingleObject(), MSDN says: +** +** Minimum supported client: Windows XP [desktop apps | UWP apps] +** Minimum supported server: Windows Server 2003 [desktop apps | UWP apps] +*/ { "WaitForSingleObject", (SYSCALL)WaitForSingleObject, 0 }, -#else - { "WaitForSingleObject", (SYSCALL)0, 0 }, -#endif #define osWaitForSingleObject ((DWORD(WINAPI*)(HANDLE, \ DWORD))aSyscall[63].pCurrent) @@ -1164,6 +1172,24 @@ static struct win_syscall { #define osFlushViewOfFile \ ((BOOL(WINAPI*)(LPCVOID,SIZE_T))aSyscall[79].pCurrent) +/* +** If SQLITE_ENABLE_SETLK_TIMEOUT is defined, we require CreateEvent() +** to implement blocking locks with timeouts. MSDN says: +** +** Minimum supported client: Windows XP [desktop apps | UWP apps] +** Minimum supported server: Windows Server 2003 [desktop apps | UWP apps] +*/ +#ifdef SQLITE_ENABLE_SETLK_TIMEOUT + { "CreateEvent", (SYSCALL)CreateEvent, 0 }, +#else + { "CreateEvent", (SYSCALL)0, 0 }, +#endif + +#define osCreateEvent ( \ + (HANDLE(WINAPI*) (LPSECURITY_ATTRIBUTES,BOOL,BOOL,LPCSTR)) \ + aSyscall[80].pCurrent \ +) + }; /* End of the overrideable system calls */ /* @@ -2583,7 +2609,7 @@ static int winHandleLockTimeout( ovlp.Offset = offset; if( nMs>0 ){ - ovlp.hEvent = CreateEvent(NULL, TRUE, FALSE, NULL); + ovlp.hEvent = osCreateEvent(NULL, TRUE, FALSE, NULL); if( ovlp.hEvent==NULL ){ return SQLITE_IOERR; } @@ -2593,7 +2619,7 @@ static int winHandleLockTimeout( ret = osLockFileEx(hFile, flags, 0, nByte, 0, &ovlp); if( !ret && nMs>0 && GetLastError()==ERROR_IO_PENDING ){ - DWORD res = WaitForSingleObject(ovlp.hEvent, (DWORD)nMs); + DWORD res = osWaitForSingleObject(ovlp.hEvent, (DWORD)nMs); if( res==WAIT_OBJECT_0 ){ /* Successfully obtained the lock. */ ret = TRUE; @@ -6342,7 +6368,7 @@ int sqlite3_os_init(void){ /* Double-check that the aSyscall[] array has been constructed ** correctly. See ticket [bb3a86e890c8e96ab] */ - assert( ArraySize(aSyscall)==80 ); + assert( ArraySize(aSyscall)==81 ); /* get memory map allocation granularity */ memset(&winSysInfo, 0, sizeof(SYSTEM_INFO)); diff --git a/src/test1.c b/src/test1.c index 57836abe1c..ee99f8dadd 100644 --- a/src/test1.c +++ b/src/test1.c @@ -7984,13 +7984,16 @@ static int SQLITE_TCLAPI win32_file_lock( Tcl_Obj *CONST objv[] ){ static struct win32FileLocker x = { "win32_file_lock", 0, 0, 0, 0, 0 }; - const char *zFilename; + const char *zFilename = 0; + int nFilename = 0; + char *zTerm = 0; char zBuf[200]; int retry = 0; HANDLE ev; DWORD wResult; sqlite3_vfs *pVfs = 0; int flags = SQLITE_OPEN_MAIN_DB | SQLITE_OPEN_READWRITE; + int rc = SQLITE_OK; if( objc!=4 && objc!=1 ){ Tcl_WrongNumArgs(interp, 1, objv, "FILENAME DELAY1 DELAY2"); @@ -8018,11 +8021,19 @@ static int SQLITE_TCLAPI win32_file_lock( } if( Tcl_GetIntFromObj(interp, objv[2], &x.delay1) ) return TCL_ERROR; if( Tcl_GetIntFromObj(interp, objv[3], &x.delay2) ) return TCL_ERROR; - zFilename = Tcl_GetString(objv[1]); - pVfs = sqlite3_vfs_find(0); x.pFd = (sqlite3_file*)sqlite3_malloc(pVfs->szOsFile); - if( pVfs->xOpen(pVfs, zFilename, x.pFd, flags, &flags)!=SQLITE_OK ){ + + /* xOpen() must be passed a dual-nul-terminated string */ + zFilename = Tcl_GetStringFromObj(objv[1], &nFilename); + zTerm = (char*)sqlite3_malloc(nFilename+2); + memcpy(zTerm, zFilename, nFilename); + zTerm[nFilename] = 0; + zTerm[nFilename+1] = 0; + rc = pVfs->xOpen(pVfs, zTerm, x.pFd, flags, &flags); + sqlite3_free(zTerm); + + if( rc!=SQLITE_OK ){ Tcl_AppendResult(interp, "cannot open file: ", zFilename, (char*)0); return TCL_ERROR; } From d26bb375be00e62cd1cfb1a3f98cd227a9ceb28b Mon Sep 17 00:00:00 2001 From: dan Date: Thu, 12 Dec 2024 20:59:32 +0000 Subject: [PATCH 017/194] Fix a buffer overread in test code. Add test configurations for ENABLE_SETLK=1 and FOR_WINRT=1 builds to release testing. FossilOrigin-Name: b558db5db7e7c9aced1d24d74dc5ee2fab7cd04ec6570247c9c45723eb6f8fc0 --- manifest | 14 +++++++------- manifest.uuid | 2 +- src/test1.c | 12 ++++++------ test/testrunner_data.tcl | 7 +++++++ 4 files changed, 21 insertions(+), 14 deletions(-) diff --git a/manifest b/manifest index 3500b38ef8..ca31c80f3b 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Ensure\sthat\sall\swin32\sAPI\sfunctions\sinvocations\sin\sos_win.c\sare\smade\svia\sthe\sfunction\stable.\sFix\sasan\serror\sin\stest\scode. -D 2024-12-11T15:30:58.684 +C Fix\sa\sbuffer\soverread\sin\stest\scode.\sAdd\stest\sconfigurations\sfor\sENABLE_SETLK=1\sand\sFOR_WINRT=1\sbuilds\sto\srelease\stesting. +D 2024-12-12T20:59:32.595 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d @@ -788,7 +788,7 @@ F src/status.c cb11f8589a6912af2da3bb1ec509a94dd8ef27df4d4c1a97e0bcf2309ece972b F src/table.c 0f141b58a16de7e2fbe81c308379e7279f4c6b50eb08efeec5892794a0ba30d1 F src/tclsqlite.c 90441d3cc16f966a23499d9096a3d2d971e5e8fddb4d1413b096b79c2b2cff07 F src/tclsqlite.h 65e2c761446e1c9fa0342b7d2612a703483643c8b6a316d12a65b745a4727395 -F src/test1.c 04f44c6f87d3c5ee0a07775601625c319835ef35ab5060d02bbe25e0ec996615 +F src/test1.c 6c48aad3b093af9053d27ff0386c870806b2d170a445c1e569df781c4dc2e847 F src/test2.c 7ebc518e6735939d8979273a6f7b1d9b5702babf059f6ad62499f7f60a9eb9a3 F src/test3.c e7573aa0f78ee4e070a4bc8c3493941c1aa64d5c66d4825c74c0f055451f432b F src/test4.c 13e57ae7ec7a959ee180970aef09deed141252fe9bb07c61054f0dfa4f1dfd5d @@ -1724,7 +1724,7 @@ F test/temptable3.test d11a0974e52b347e45ee54ef1923c91ed91e4637 F test/temptrigger.test 38f0ca479b1822d3117069e014daabcaacefffcc F test/tester.tcl 2f900e8c912fbbaf381e69a92258fa6023ad0b4c8907e426bebbb4585da23c61 F test/testrunner.tcl 90ed8b6c2b26dc1f6af08aeb04670a5df86172f3d9828d8af000f972afa50061 x -F test/testrunner_data.tcl ba4aeea28aa03cfa6fe7e57782ddecb7a7b91c3a0b3251583cb4f0ee002de6a6 +F test/testrunner_data.tcl 1497914126bcf5749aa9b86268bd7636b027f7dcfac8746e7bcb89b97267a81c F test/thread001.test a0985c117eab62c0c65526e9fa5d1360dd1cac5b03bde223902763274ce21899 F test/thread002.test c24c83408e35ba5a952a3638b7ac03ccdf1ce4409289c54a050ac4c5f1de7502 F test/thread003.test ee4c9efc3b86a6a2767516a37bd64251272560a7 @@ -2202,8 +2202,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P 704e6567c14a4a07a1a4d1fc2bd8a7f288b55b27508d23ba7f5c755c830c14ec -R 1b1d5ac8540859f8a7b2d263d2f24a8d +P 2ffdc799c63ff8858f2aa9177ca9c74be2df5d7594cb10fb0a233537d83fd563 +R d7d2d15fbad0e5c9c96f44f5f5c65d63 U dan -Z 95b5c408908f206ff5d85841ad8872eb +Z 936045d7cbbb213a4b812b5b26e5263d # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 4ec306133d..d77def4889 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -2ffdc799c63ff8858f2aa9177ca9c74be2df5d7594cb10fb0a233537d83fd563 +b558db5db7e7c9aced1d24d74dc5ee2fab7cd04ec6570247c9c45723eb6f8fc0 diff --git a/src/test1.c b/src/test1.c index ee99f8dadd..4dcba97cdd 100644 --- a/src/test1.c +++ b/src/test1.c @@ -8024,13 +8024,13 @@ static int SQLITE_TCLAPI win32_file_lock( pVfs = sqlite3_vfs_find(0); x.pFd = (sqlite3_file*)sqlite3_malloc(pVfs->szOsFile); - /* xOpen() must be passed a dual-nul-terminated string */ + /* xOpen() must be passed a dual-nul-terminated string preceded in memory + ** by 4 0x00 bytes. */ zFilename = Tcl_GetStringFromObj(objv[1], &nFilename); - zTerm = (char*)sqlite3_malloc(nFilename+2); - memcpy(zTerm, zFilename, nFilename); - zTerm[nFilename] = 0; - zTerm[nFilename+1] = 0; - rc = pVfs->xOpen(pVfs, zTerm, x.pFd, flags, &flags); + zTerm = (char*)sqlite3_malloc(nFilename+6); + memset(zTerm, 0, nFilename+6); + memcpy(&zTerm[4], zFilename, nFilename); + rc = pVfs->xOpen(pVfs, &zTerm[4], x.pFd, flags, &flags); sqlite3_free(zTerm); if( rc!=SQLITE_OK ){ diff --git a/test/testrunner_data.tcl b/test/testrunner_data.tcl index 9abfb242da..c749481f51 100644 --- a/test/testrunner_data.tcl +++ b/test/testrunner_data.tcl @@ -37,6 +37,7 @@ namespace eval trd { set tcltest(win.Windows-Memdebug) veryquick set tcltest(win.Windows-Win32Heap) veryquick set tcltest(win.Windows-Sanitize) veryquick + set tcltest(win.Windows-WinRT) veryquick set tcltest(win.Default) full # Extra [make xyz] tests that should be run for various builds. @@ -353,11 +354,17 @@ namespace eval trd { set build(Windows-Win32Heap) { WIN32HEAP=1 DEBUG=4 + ENABLE_SETLK=1 } set build(Windows-Sanitize) { ASAN=1 } + set build(Windows-WinRT) { + FOR_WINRT=1 + ENABLE_SETLK=1 + -DSQLITE_TEMP_STORE=3 + } } From 800bf8fd938c4ffafd8640996f98a6cec3329f8d Mon Sep 17 00:00:00 2001 From: dan Date: Mon, 16 Dec 2024 15:13:34 +0000 Subject: [PATCH 018/194] Fix a problem on this branch causing a file-handle to be leaked following an OOM condition. FossilOrigin-Name: 5ca12dc964b2d8c3d11a2be5be7eac0dc994cec3a8b5fdfeac4ff8dde19a5a93 --- manifest | 12 ++++++------ manifest.uuid | 2 +- src/os_win.c | 5 ++++- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/manifest b/manifest index ca31c80f3b..2d446c80f1 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Fix\sa\sbuffer\soverread\sin\stest\scode.\sAdd\stest\sconfigurations\sfor\sENABLE_SETLK=1\sand\sFOR_WINRT=1\sbuilds\sto\srelease\stesting. -D 2024-12-12T20:59:32.595 +C Fix\sa\sproblem\son\sthis\sbranch\scausing\sa\sfile-handle\sto\sbe\sleaked\sfollowing\san\sOOM\scondition. +D 2024-12-16T15:13:34.704 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d @@ -762,7 +762,7 @@ F src/os_common.h 6c0eb8dd40ef3e12fe585a13e709710267a258e2c8dd1c40b1948a1d14582e F src/os_kv.c 4d39e1f1c180b11162c6dc4aa8ad34053873a639bac6baae23272fc03349986a F src/os_setup.h 6011ad7af5db4e05155f385eb3a9b4470688de6f65d6166b8956e58a3d872107 F src/os_unix.c d2edbd92b07a3f778c2defa8a2e9d75acceb6267bda56948c41e8cdda65224d6 -F src/os_win.c 49cd1fbdf60dd185ce25dd0d02b2670603c3e5edc9a8fb3f21585491c9d45e30 +F src/os_win.c 6f6bd231709a1bd46c815a2329da9555094b13508198b857db3464857b00b3f5 F src/os_win.h 7b073010f1451abe501be30d12f6bc599824944a F src/pager.c 9656ad4e8331efb8a4f94f7a0c6440b98caea073950a367ea0c728a53b8e62c9 F src/pager.h 4b1140d691860de0be1347474c51fee07d5420bd7f802d38cbab8ea4ab9f538a @@ -2202,8 +2202,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P 2ffdc799c63ff8858f2aa9177ca9c74be2df5d7594cb10fb0a233537d83fd563 -R d7d2d15fbad0e5c9c96f44f5f5c65d63 +P b558db5db7e7c9aced1d24d74dc5ee2fab7cd04ec6570247c9c45723eb6f8fc0 +R b9d249c9aa26e24c20dc18ed85158a12 U dan -Z 936045d7cbbb213a4b812b5b26e5263d +Z f55a7e113d76984967c653e65ab3a507 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index d77def4889..25806f59d9 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -b558db5db7e7c9aced1d24d74dc5ee2fab7cd04ec6570247c9c45723eb6f8fc0 +5ca12dc964b2d8c3d11a2be5be7eac0dc994cec3a8b5fdfeac4ff8dde19a5a93 diff --git a/src/os_win.c b/src/os_win.c index 7867c876e9..51171e07cb 100644 --- a/src/os_win.c +++ b/src/os_win.c @@ -4248,7 +4248,10 @@ static int winOpenSharedMemory(winFile *pDbFd){ p->id = pShmNode->nextShmId++; #endif pDbFd->pShm = p; - }else{ + }else if( p ){ + if( p->hShm!=INVALID_HANDLE_VALUE ){ + osCloseHandle(p->hShm); + } sqlite3_free(p); } From c978e390e6522cb48810f738fb6b36f96cceaa2c Mon Sep 17 00:00:00 2001 From: dan Date: Mon, 16 Dec 2024 19:31:30 +0000 Subject: [PATCH 019/194] Fix release test errors on winrt. FossilOrigin-Name: 39bebd50b80ceee321b1da837c72a20cdb26f06e4b726f23e3ddac877d9400a7 --- manifest | 12 ++++++------ manifest.uuid | 2 +- test/shell1.test | 13 +++++++++---- 3 files changed, 16 insertions(+), 11 deletions(-) diff --git a/manifest b/manifest index 2d446c80f1..baf0855e2a 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Fix\sa\sproblem\son\sthis\sbranch\scausing\sa\sfile-handle\sto\sbe\sleaked\sfollowing\san\sOOM\scondition. -D 2024-12-16T15:13:34.704 +C Fix\srelease\stest\serrors\son\swinrt. +D 2024-12-16T19:31:30.451 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d @@ -1634,7 +1634,7 @@ F test/sharedA.test 64bdd21216dda2c6a3bd3475348ccdc108160f34682c97f2f51c19fc0e21 F test/sharedB.test 1a84863d7a2204e0d42f2e1606577c5e92e4473fa37ea0f5bdf829e4bf8ee707 F test/shared_err.test 32634e404a3317eeb94abc7a099c556a346fdb8fb3858dbe222a4cbb8926a939 F test/sharedlock.test 5ede3c37439067c43b0198f580fd374ebf15d304 -F test/shell1.test 5d84e415adf7cc4edd5913c4f23c761104ff135b9c190fcf7b430a4cbca6cb65 +F test/shell1.test ccb26a0cb17a73406b5e4fe3c3260988a22f5c63680d8474b4d35e9bc195f3cb F test/shell2.test 01a01f76ed98088ce598794fbf5b359e148271541a8ddbf79d21cc353cc67a24 F test/shell3.test db1953a8e59d08e9240b7cc5948878e184f7eb2623591587f8fd1f1a5bd536d8 F test/shell4.test 522fdc628c55eff697b061504fb0a9e4e6dfc5d9087a633ab0f3dd11bcc4f807 @@ -2202,8 +2202,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P b558db5db7e7c9aced1d24d74dc5ee2fab7cd04ec6570247c9c45723eb6f8fc0 -R b9d249c9aa26e24c20dc18ed85158a12 +P 5ca12dc964b2d8c3d11a2be5be7eac0dc994cec3a8b5fdfeac4ff8dde19a5a93 +R 68f20f3dcabf678da64d7efc79e9ed69 U dan -Z f55a7e113d76984967c653e65ab3a507 +Z 0a548518470ec9c7acb934179f861770 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 25806f59d9..c5800500ff 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -5ca12dc964b2d8c3d11a2be5be7eac0dc994cec3a8b5fdfeac4ff8dde19a5a93 +39bebd50b80ceee321b1da837c72a20cdb26f06e4b726f23e3ddac877d9400a7 diff --git a/test/shell1.test b/test/shell1.test index a272295f55..722418c7ac 100644 --- a/test/shell1.test +++ b/test/shell1.test @@ -296,7 +296,9 @@ do_test shell1-3.2.4 { catchcmd "test.db" ".bail OFF BAD" } {1 {Usage: .bail on|off}} -ifcapable vtab { +# This test will not work on winrt, as winrt has no concept of the absolute +# paths that the test expects in the result. It uses relative paths only. +ifcapable vtab&&!winrt { # .databases List names and files of attached databases do_test shell1-3.3.1 { catchcmd "-csv test.db" ".databases" @@ -744,9 +746,12 @@ do_test shell1-3.26.6 { do_test shell1-3.27.1 { catchcmd "test.db" ".timer" } {1 {Usage: .timer on|off}} -do_test shell1-3.27.2 { - catchcmd "test.db" ".timer ON" -} {0 {}} +ifcapable !winrt { + # No timer support on winrt. + do_test shell1-3.27.2 { + catchcmd "test.db" ".timer ON" + } {0 {}} +} do_test shell1-3.27.3 { catchcmd "test.db" ".timer OFF" } {0 {}} From ce50282c3bf662c1e12d066bff869c53532a3d74 Mon Sep 17 00:00:00 2001 From: dan Date: Tue, 24 Dec 2024 14:44:38 +0000 Subject: [PATCH 020/194] Properly wait for asynchronous results for calls to LockFileEx() on FILE_FLAG_OVERLAPPED files even if LOCKFILE_FAIL_IMMEDIATELY, which usually causes LockFileEx() to return synchronously, is specified. FossilOrigin-Name: 35b3e73c5a9efa12f9bb0dad1721fce128cd1e3bcbc87027ee4ea685a12a70d5 --- manifest | 14 ++++---- manifest.uuid | 2 +- src/os_win.c | 97 ++++++++++++++++++++++++++++++++------------------- src/test1.c | 2 +- 4 files changed, 71 insertions(+), 44 deletions(-) diff --git a/manifest b/manifest index baf0855e2a..83b434611e 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Fix\srelease\stest\serrors\son\swinrt. -D 2024-12-16T19:31:30.451 +C Properly\swait\sfor\sasynchronous\sresults\sfor\scalls\sto\sLockFileEx()\son\sFILE_FLAG_OVERLAPPED\sfiles\seven\sif\sLOCKFILE_FAIL_IMMEDIATELY,\swhich\susually\scauses\sLockFileEx()\sto\sreturn\ssynchronously,\sis\sspecified. +D 2024-12-24T14:44:38.362 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d @@ -762,7 +762,7 @@ F src/os_common.h 6c0eb8dd40ef3e12fe585a13e709710267a258e2c8dd1c40b1948a1d14582e F src/os_kv.c 4d39e1f1c180b11162c6dc4aa8ad34053873a639bac6baae23272fc03349986a F src/os_setup.h 6011ad7af5db4e05155f385eb3a9b4470688de6f65d6166b8956e58a3d872107 F src/os_unix.c d2edbd92b07a3f778c2defa8a2e9d75acceb6267bda56948c41e8cdda65224d6 -F src/os_win.c 6f6bd231709a1bd46c815a2329da9555094b13508198b857db3464857b00b3f5 +F src/os_win.c 0f25f11cb81ce578a549f6df5240ea275118c536f8fff0d9f8d0e4d24e78f497 F src/os_win.h 7b073010f1451abe501be30d12f6bc599824944a F src/pager.c 9656ad4e8331efb8a4f94f7a0c6440b98caea073950a367ea0c728a53b8e62c9 F src/pager.h 4b1140d691860de0be1347474c51fee07d5420bd7f802d38cbab8ea4ab9f538a @@ -788,7 +788,7 @@ F src/status.c cb11f8589a6912af2da3bb1ec509a94dd8ef27df4d4c1a97e0bcf2309ece972b F src/table.c 0f141b58a16de7e2fbe81c308379e7279f4c6b50eb08efeec5892794a0ba30d1 F src/tclsqlite.c 90441d3cc16f966a23499d9096a3d2d971e5e8fddb4d1413b096b79c2b2cff07 F src/tclsqlite.h 65e2c761446e1c9fa0342b7d2612a703483643c8b6a316d12a65b745a4727395 -F src/test1.c 6c48aad3b093af9053d27ff0386c870806b2d170a445c1e569df781c4dc2e847 +F src/test1.c bed72f092f9aaebf50ee4919a02a26ab99a4f378ab334cb93d77e8adb82e4b77 F src/test2.c 7ebc518e6735939d8979273a6f7b1d9b5702babf059f6ad62499f7f60a9eb9a3 F src/test3.c e7573aa0f78ee4e070a4bc8c3493941c1aa64d5c66d4825c74c0f055451f432b F src/test4.c 13e57ae7ec7a959ee180970aef09deed141252fe9bb07c61054f0dfa4f1dfd5d @@ -2202,8 +2202,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P 5ca12dc964b2d8c3d11a2be5be7eac0dc994cec3a8b5fdfeac4ff8dde19a5a93 -R 68f20f3dcabf678da64d7efc79e9ed69 +P 39bebd50b80ceee321b1da837c72a20cdb26f06e4b726f23e3ddac877d9400a7 +R 12e3b22a0f00395166a9c60b15213ddc U dan -Z 0a548518470ec9c7acb934179f861770 +Z b09d557521f0d4b60a9610b79c0fe3aa # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index c5800500ff..11921b9ac4 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -39bebd50b80ceee321b1da837c72a20cdb26f06e4b726f23e3ddac877d9400a7 +35b3e73c5a9efa12f9bb0dad1721fce128cd1e3bcbc87027ee4ea685a12a70d5 diff --git a/src/os_win.c b/src/os_win.c index 51171e07cb..74be366588 100644 --- a/src/os_win.c +++ b/src/os_win.c @@ -1190,6 +1190,22 @@ static struct win_syscall { aSyscall[80].pCurrent \ ) +/* +** If SQLITE_ENABLE_SETLK_TIMEOUT is defined, we require CancelIo() +** for the case where a timeout expires and a lock request must be +** cancelled. +** +** Minimum supported client: Windows XP [desktop apps | UWP apps] +** Minimum supported server: Windows Server 2003 [desktop apps | UWP apps] +*/ +#ifdef SQLITE_ENABLE_SETLK_TIMEOUT + { "CancelIo", (SYSCALL)CancelIo, 0 }, +#else + { "CancelIo", (SYSCALL)0, 0 }, +#endif + +#define osCancelIo ((BOOL(WINAPI*)(HANDLE))aSyscall[81].pCurrent) + }; /* End of the overrideable system calls */ /* @@ -2598,9 +2614,6 @@ static int winHandleLockTimeout( int rc = SQLITE_OK; BOOL ret; -#if !defined(SQLITE_ENABLE_SETLK_TIMEOUT) - ret = winLockFile(&hFile, flags, offset, 0, nByte, 0); -#else if( !osIsNT() ){ ret = winLockFile(&hFile, flags, offset, 0, nByte, 0); }else{ @@ -2608,39 +2621,40 @@ static int winHandleLockTimeout( memset(&ovlp, 0, sizeof(OVERLAPPED)); ovlp.Offset = offset; +#ifdef SQLITE_ENABLE_SETLK_TIMEOUT if( nMs>0 ){ - ovlp.hEvent = osCreateEvent(NULL, TRUE, FALSE, NULL); - if( ovlp.hEvent==NULL ){ - return SQLITE_IOERR; - } flags &= ~LOCKFILE_FAIL_IMMEDIATELY; } + ovlp.hEvent = osCreateEvent(NULL, TRUE, FALSE, NULL); + if( ovlp.hEvent==NULL ){ + return SQLITE_IOERR_LOCK; + } +#endif ret = osLockFileEx(hFile, flags, 0, nByte, 0, &ovlp); - if( !ret && nMs>0 && GetLastError()==ERROR_IO_PENDING ){ - DWORD res = osWaitForSingleObject(ovlp.hEvent, (DWORD)nMs); +#ifdef SQLITE_ENABLE_SETLK_TIMEOUT + /* If SQLITE_ENABLE_SETLK_TIMEOUT is defined, then the file-handle was + ** opened with FILE_FLAG_OVERHEAD specified. In this case, the call to + ** LockFileEx() may fail because the request is still pending. This can + ** happen even if LOCKFILE_FAIL_IMMEDIATELY was specified. */ + if( !ret && GetLastError()==ERROR_IO_PENDING ){ + DWORD nDelay = (nMs ? nMs : INFINITE); + DWORD res = osWaitForSingleObject(ovlp.hEvent, nDelay); if( res==WAIT_OBJECT_0 ){ - /* Successfully obtained the lock. */ ret = TRUE; + }else if( res==WAIT_TIMEOUT ){ + rc = SQLITE_BUSY_TIMEOUT; }else{ - if( res==WAIT_TIMEOUT ){ - rc = SQLITE_BUSY_TIMEOUT; - }else{ - /* Some other error has occurred */ - rc = SQLITE_IOERR; - } - - /* Cancel the LockFileEx() if it is still pending. */ - CancelIo(hFile); + /* Some other error has occurred */ + rc = SQLITE_IOERR_LOCK; } + osCancelIo(hFile); } - if( nMs>0 ){ - osCloseHandle(ovlp.hEvent); - } + osCloseHandle(ovlp.hEvent); +#endif } -#endif /* defined(SQLITE_ENABLE_SETLK_TIMEOUT) */ if( rc==SQLITE_OK && !ret ){ rc = SQLITE_BUSY; @@ -3056,11 +3070,10 @@ static int winHandleSize(HANDLE h, sqlite3_int64 *pnByte){ #else DWORD upperBits = 0; DWORD lowerBits = 0; - DWORD lastErrno = 0; + assert( pnByte ); lowerBits = osGetFileSize(h, &upperBits); *pnByte = (((sqlite3_int64)upperBits)<<32) + lowerBits; - if( lowerBits==INVALID_FILE_SIZE && osGetLastError()!=NO_ERROR ){ rc = SQLITE_IOERR_FSTAT; } @@ -3069,6 +3082,15 @@ static int winHandleSize(HANDLE h, sqlite3_int64 *pnByte){ return rc; } +/* +** Close the handle passed as the only argument. +*/ +static void winHandleClose(HANDLE h){ + if( h!=INVALID_HANDLE_VALUE ){ + osCloseHandle(h); + } +} + /* ** Truncate an open file to a specified size */ @@ -3999,9 +4021,7 @@ static void winShmPurge(sqlite3_vfs *pVfs, int deleteFlag){ osGetCurrentProcessId(), i, bRc ? "ok" : "failed")); UNUSED_VARIABLE_VALUE(bRc); } - if( p->hSharedShm!=NULL && p->hSharedShm!=INVALID_HANDLE_VALUE ){ - osCloseHandle(p->hSharedShm); - } + winHandleClose(p->hSharedShm); if( deleteFlag ){ SimulateIOErrorBenign(1); sqlite3BeginBenignMalloc(); @@ -4079,6 +4099,9 @@ static void *winConvertFromUtf8Filename(const char *zFilename){ /* ** This function is used to open a handle on a *-shm file. +** +** If SQLITE_ENABLE_SETLK_TIMEOUT is defined at build time, then the file +** is opened with FILE_FLAG_OVERLAPPED specified. If not, it is not. */ static int winHandleOpen( const char *zUtf8, /* File to open */ @@ -4090,6 +4113,12 @@ static int winHandleOpen( int bReadonly = *pbReadonly; HANDLE h = INVALID_HANDLE_VALUE; +#ifdef SQLITE_ENABLE_SETLK_TIMEOUT + const DWORD flag_overlapped = FILE_FLAG_OVERLAPPED; +#else + const DWORD flag_overlapped = 0; +#endif + /* Convert the filename to the system encoding. */ zConverted = winConvertFromUtf8Filename(zUtf8); if( zConverted==0 ){ @@ -4114,7 +4143,7 @@ static int winHandleOpen( memset(&extendedParameters, 0, sizeof(extendedParameters)); extendedParameters.dwSize = sizeof(extendedParameters); extendedParameters.dwFileAttributes = FILE_ATTRIBUTE_NORMAL; - extendedParameters.dwFileFlags = FILE_FLAG_OVERLAPPED; + extendedParameters.dwFileFlags = flag_overlapped; extendedParameters.dwSecurityQosFlags = SECURITY_ANONYMOUS; h = osCreateFile2((LPCWSTR)zConverted, (GENERIC_READ | (bReadonly ? 0 : GENERIC_WRITE)),/* dwDesiredAccess */ @@ -4128,7 +4157,7 @@ static int winHandleOpen( FILE_SHARE_READ | FILE_SHARE_WRITE, /* dwShareMode */ NULL, /* lpSecurityAttributes */ OPEN_ALWAYS, /* dwCreationDisposition */ - FILE_ATTRIBUTE_NORMAL|FILE_FLAG_OVERLAPPED, + FILE_ATTRIBUTE_NORMAL|flag_overlapped, NULL ); #endif @@ -4141,7 +4170,7 @@ static int winHandleOpen( FILE_SHARE_READ | FILE_SHARE_WRITE, /* dwShareMode */ NULL, /* lpSecurityAttributes */ OPEN_ALWAYS, /* dwCreationDisposition */ - FILE_ATTRIBUTE_NORMAL|FILE_FLAG_OVERLAPPED, + FILE_ATTRIBUTE_NORMAL|flag_overlapped, NULL ); #endif @@ -4249,9 +4278,7 @@ static int winOpenSharedMemory(winFile *pDbFd){ #endif pDbFd->pShm = p; }else if( p ){ - if( p->hShm!=INVALID_HANDLE_VALUE ){ - osCloseHandle(p->hShm); - } + winHandleClose(p->hShm); sqlite3_free(p); } @@ -6371,7 +6398,7 @@ int sqlite3_os_init(void){ /* Double-check that the aSyscall[] array has been constructed ** correctly. See ticket [bb3a86e890c8e96ab] */ - assert( ArraySize(aSyscall)==81 ); + assert( ArraySize(aSyscall)==82 ); /* get memory map allocation granularity */ memset(&winSysInfo, 0, sizeof(SYSTEM_INFO)); diff --git a/src/test1.c b/src/test1.c index 4dcba97cdd..6a87116776 100644 --- a/src/test1.c +++ b/src/test1.c @@ -7985,7 +7985,7 @@ static int SQLITE_TCLAPI win32_file_lock( ){ static struct win32FileLocker x = { "win32_file_lock", 0, 0, 0, 0, 0 }; const char *zFilename = 0; - int nFilename = 0; + Tcl_Size nFilename = 0; char *zTerm = 0; char zBuf[200]; int retry = 0; From 362d51a159b80dbda87f0c745bb6c21cfe7cf0c7 Mon Sep 17 00:00:00 2001 From: dan Date: Thu, 26 Dec 2024 16:10:15 +0000 Subject: [PATCH 021/194] Omit code to link all winShm objects open on a single node into a list. This is no longer required. FossilOrigin-Name: b400ab4ba99d3ed7e90c93257d729563c630ef451017a702d42f322a4e57b663 --- manifest | 12 ++++++------ manifest.uuid | 2 +- src/os_win.c | 24 +++++++++--------------- 3 files changed, 16 insertions(+), 22 deletions(-) diff --git a/manifest b/manifest index 7c6ecd9e8a..c0f1ef3f7e 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Merge\strunk\schanges\sinto\sthis\sbranch. -D 2024-12-26T14:40:11.502 +C Omit\scode\sto\slink\sall\swinShm\sobjects\sopen\son\sa\ssingle\snode\sinto\sa\slist.\sThis\sis\sno\slonger\srequired. +D 2024-12-26T16:10:15.778 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d @@ -762,7 +762,7 @@ F src/os_common.h 6c0eb8dd40ef3e12fe585a13e709710267a258e2c8dd1c40b1948a1d14582e F src/os_kv.c 4d39e1f1c180b11162c6dc4aa8ad34053873a639bac6baae23272fc03349986a F src/os_setup.h 6011ad7af5db4e05155f385eb3a9b4470688de6f65d6166b8956e58a3d872107 F src/os_unix.c d2edbd92b07a3f778c2defa8a2e9d75acceb6267bda56948c41e8cdda65224d6 -F src/os_win.c 0f25f11cb81ce578a549f6df5240ea275118c536f8fff0d9f8d0e4d24e78f497 +F src/os_win.c 7c00dbf94389f45bd401ba86eded909ab4046cbba2013ae601204dd64d7183ee F src/os_win.h 7b073010f1451abe501be30d12f6bc599824944a F src/pager.c 2fdd489447aa6bb0f672973bacb801ced92225ca9a1c874ed9b856d2741dc54e F src/pager.h 6137149346e6c8a3ddc1eeb40aee46381e9bc8b0fcc6dda8a1efde993c2275b8 @@ -2202,8 +2202,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P 35b3e73c5a9efa12f9bb0dad1721fce128cd1e3bcbc87027ee4ea685a12a70d5 286559dfb3ad01fcf34360991a108dbe6bf81e7919c461ada6c691ee8f43868f -R 2b4e3b0d242bbe20c880b273db4a1cd4 +P 3e2893097c59820def88bb4739189c9c9a4f70a98a0a72b81959658f069715f6 +R c85f19f11ab416ccd96cccf1f405b727 U dan -Z c2317ca10c0b5155b798155cc241659f +Z 1b63c8668961ff43a02dc419f96e1501 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index e5fa12b673..5557d156b9 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -3e2893097c59820def88bb4739189c9c9a4f70a98a0a72b81959658f069715f6 +b400ab4ba99d3ed7e90c93257d729563c630ef451017a702d42f322a4e57b663 diff --git a/src/os_win.c b/src/os_win.c index 74be366588..eb2c053559 100644 --- a/src/os_win.c +++ b/src/os_win.c @@ -2649,6 +2649,8 @@ static int winHandleLockTimeout( /* Some other error has occurred */ rc = SQLITE_IOERR_LOCK; } + + /* If it is still pending, cancel the LockFileEx() call. */ osCancelIo(hFile); } @@ -3953,7 +3955,6 @@ struct winShmNode { DWORD lastErrno; /* The Windows errno from the last I/O error */ int nRef; /* Number of winShm objects pointing to this */ - winShm *pFirst; /* All winShm objects pointing to this */ winShmNode *pNext; /* Next in list of all winShmNode objects */ #if defined(SQLITE_DEBUG) || defined(SQLITE_HAVE_OS_TRACE) u8 nextShmId; /* Next available winShm.id value */ @@ -3974,7 +3975,6 @@ static winShmNode *winShmNodeList = 0; */ struct winShm { winShmNode *pShmNode; /* The underlying winShmNode object */ - winShm *pNext; /* Next winShm with the same winShmNode */ u16 sharedMask; /* Mask of shared locks held */ u16 exclMask; /* Mask of exclusive locks held */ HANDLE hShm; /* File-handle on *-shm file. For locking. */ @@ -4270,8 +4270,6 @@ static int winOpenSharedMemory(winFile *pDbFd){ ** the winShm to pDbFd. */ if( rc==SQLITE_OK ){ p->pShmNode = pShmNode; - p->pNext = pShmNode->pFirst; - pShmNode->pFirst = p; pShmNode->nRef++; #if defined(SQLITE_DEBUG) || defined(SQLITE_HAVE_OS_TRACE) p->id = pShmNode->nextShmId++; @@ -4299,7 +4297,6 @@ static int winShmUnmap( winFile *pDbFd; /* Database holding shared-memory */ winShm *p; /* The connection to be closed */ winShmNode *pShmNode; /* The underlying shared-memory file */ - winShm **pp; /* For looping over sibling connections */ pDbFd = (winFile*)fd; p = pDbFd->pShm; @@ -4311,17 +4308,11 @@ static int winShmUnmap( pShmNode = p->pShmNode; winShmEnterMutex(); - /* Remove connection p from the set of connections associated - ** with pShmNode */ - for(pp=&pShmNode->pFirst; (*pp)!=p; pp = &(*pp)->pNext){} - *pp = p->pNext; - /* If pShmNode->nRef has reached 0, then close the underlying ** shared-memory file, too. */ assert( pShmNode->nRef>0 ); pShmNode->nRef--; if( pShmNode->nRef==0 ){ - assert( pShmNode->pFirst==0 ); winShmPurge(pDbFd->pVfs, deleteFlag); } winShmLeaveMutex(); @@ -4345,7 +4336,7 @@ static int winShmLock( winShm *p = pDbFd->pShm; /* The shared memory being locked */ winShmNode *pShmNode; int rc = SQLITE_OK; /* Result code */ - u16 mask = (u16)((1U<<(ofst+n)) - (1U<pShmNode; @@ -4429,9 +4420,12 @@ static int winShmLock( } OSTRACE(( - "SHM-LOCK(%d,%d,%d) pid=%lu, id=%d, sharedMask=%03x, exclMask=%03x, rc=%s\n", - ofst, n, flags, osGetCurrentProcessId(), p->id, p->sharedMask, p->exclMask, - sqlite3ErrName(rc))); + "SHM-LOCK(%d,%d,%d) pid=%lu, id=%d, sharedMask=%03x, exclMask=%03x," + " rc=%s\n", + ofst, n, flags, + osGetCurrentProcessId(), p->id, p->sharedMask, p->exclMask, + sqlite3ErrName(rc)) + ); return rc; } From ff6bff4059235a583bd7b1c1928a956c4ed9b4f6 Mon Sep 17 00:00:00 2001 From: dan Date: Wed, 15 Jan 2025 12:45:38 +0000 Subject: [PATCH 022/194] Have windows SQLITE_ENABLE_SETLK_TIMEOUT builds block indefinitely if the busy-timeout is set to 0x7FFFFFFF. FossilOrigin-Name: daefcafe799ad7613cbdff1fb1e9d40659892906875b28fbc112abd7679e48ea --- manifest | 14 +++++++------- manifest.uuid | 2 +- src/os_win.c | 2 +- test/walsetlk.test | 41 ++++++++++++++++++++++++++++++++++++++++- 4 files changed, 49 insertions(+), 10 deletions(-) diff --git a/manifest b/manifest index c0f1ef3f7e..73dfd4e959 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Omit\scode\sto\slink\sall\swinShm\sobjects\sopen\son\sa\ssingle\snode\sinto\sa\slist.\sThis\sis\sno\slonger\srequired. -D 2024-12-26T16:10:15.778 +C Have\swindows\sSQLITE_ENABLE_SETLK_TIMEOUT\sbuilds\sblock\sindefinitely\sif\sthe\sbusy-timeout\sis\sset\sto\s0x7FFFFFFF. +D 2025-01-15T12:45:38.037 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d @@ -762,7 +762,7 @@ F src/os_common.h 6c0eb8dd40ef3e12fe585a13e709710267a258e2c8dd1c40b1948a1d14582e F src/os_kv.c 4d39e1f1c180b11162c6dc4aa8ad34053873a639bac6baae23272fc03349986a F src/os_setup.h 6011ad7af5db4e05155f385eb3a9b4470688de6f65d6166b8956e58a3d872107 F src/os_unix.c d2edbd92b07a3f778c2defa8a2e9d75acceb6267bda56948c41e8cdda65224d6 -F src/os_win.c 7c00dbf94389f45bd401ba86eded909ab4046cbba2013ae601204dd64d7183ee +F src/os_win.c 3dfb4a2464143d917d4a407c14706953a98a7ea211742a3039547df05bc3903b F src/os_win.h 7b073010f1451abe501be30d12f6bc599824944a F src/pager.c 2fdd489447aa6bb0f672973bacb801ced92225ca9a1c874ed9b856d2741dc54e F src/pager.h 6137149346e6c8a3ddc1eeb40aee46381e9bc8b0fcc6dda8a1efde993c2275b8 @@ -2021,7 +2021,7 @@ F test/walro.test cb438d05ba0d191f10b688e39c4f0cd5b71569a1d1f4440e5bdf3c6880e08c F test/walro2.test 33955a6fd874dd9724005e17f77fef89d334b3171454a1256fe4941a96766cdc F test/walrofault.test c70cb6e308c443867701856cce92ad8288cd99488fa52afab77cca6cfd51af68 F test/walseh1.test bae700eb99519b6d5cd3f893c04759accc5a59c391d4189fe4dd6995a533442b -F test/walsetlk.test 46b7ab42ac4498e549e4bb0b0e99f72ccd386bb20d8f3c2ee42363f09fab398e +F test/walsetlk.test 9c5b92f9a20252540fedf9ffa6ee3d1b8af08ea4b80d0144d9b88e6c0c1de80d F test/walshared.test 42e3808582504878af237ea02c42ca793e8a0efaa19df7df26ac573370dbc7a3 F test/walslow.test 0c51843836c9dcf40a5ac05aa781bfb977b396ee2c872d92bd48b79d5dd9aa23 F test/walthread.test 14b20fcfa6ae152f5d8e12f5dc8a8a724b7ef189f5d8ef1e2ceab79f2af51747 @@ -2202,8 +2202,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P 3e2893097c59820def88bb4739189c9c9a4f70a98a0a72b81959658f069715f6 -R c85f19f11ab416ccd96cccf1f405b727 +P b400ab4ba99d3ed7e90c93257d729563c630ef451017a702d42f322a4e57b663 +R 5c0bed857a50c43f376c97a6b2ec23d6 U dan -Z 1b63c8668961ff43a02dc419f96e1501 +Z 3a0a46e6f7f4d366b981494ea8c1d6b1 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 5557d156b9..16fe6006a7 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -b400ab4ba99d3ed7e90c93257d729563c630ef451017a702d42f322a4e57b663 +daefcafe799ad7613cbdff1fb1e9d40659892906875b28fbc112abd7679e48ea diff --git a/src/os_win.c b/src/os_win.c index eb2c053559..556b075f49 100644 --- a/src/os_win.c +++ b/src/os_win.c @@ -2639,7 +2639,7 @@ static int winHandleLockTimeout( ** LockFileEx() may fail because the request is still pending. This can ** happen even if LOCKFILE_FAIL_IMMEDIATELY was specified. */ if( !ret && GetLastError()==ERROR_IO_PENDING ){ - DWORD nDelay = (nMs ? nMs : INFINITE); + DWORD nDelay = (nMs==0 || nMs==0x7FFFFFFF ? INFINITE : nMs); DWORD res = osWaitForSingleObject(ovlp.hEvent, nDelay); if( res==WAIT_OBJECT_0 ){ ret = TRUE; diff --git a/test/walsetlk.test b/test/walsetlk.test index 150a4748af..d3fd050a63 100644 --- a/test/walsetlk.test +++ b/test/walsetlk.test @@ -297,12 +297,51 @@ do_test 3.5 { expr {$::sleep_count > 0} } $bExpect -do_execsql_test -db db2 3.5 { +do_execsql_test -db db2 3.6 { INSERT INTO x1 VALUES(5, 6); COMMIT; SELECT * FROM x1; } {1 2 3 4 5 6} +# Launch a non-blocking testfixture process to write-lock the +# database for 2000 ms. +testfixture_nb done { + sqlite3 db test.db + db eval { + BEGIN EXCLUSIVE; + INSERT INTO x1 VALUES(7, 8); + } + after 2000 + db eval { + COMMIT + } +} + +after 500 {set ok 1} +vwait ok + +db2 timeout 0x7FFFFFFF +do_test 3.7 { + set t [lindex [time { db2 eval { BEGIN EXCLUSIVE } }] 0] + expr ($t>1000000) +} {1} + +# Set bExpect to true if calls to xSleep() are expected. Such calls are +# expected unless this is an SQLITE_ENABLE_SETLK_TIMEOUT=1 build. +set bExpect 1 +if {$::sqlite_options(setlk_timeout)==1} { + set bExpect 0 +} +do_test 3.8 { + expr {$::sleep_count > 0} +} $bExpect + +do_execsql_test -db db2 3.9 { + INSERT INTO x1 VALUES(9, 10); + COMMIT; + SELECT * FROM x1; +} {1 2 3 4 5 6 7 8 9 10} + db2 close tvfs delete From 2539fb2bc57adebef779a13c18f788e14461f7c8 Mon Sep 17 00:00:00 2001 From: dan Date: Fri, 24 Jan 2025 15:49:47 +0000 Subject: [PATCH 023/194] Fix a race condition causing SQLite to use a busy-handler for an operation that should not. FossilOrigin-Name: 6ab9ed8eef77781898375038ab05fc6e5f46b745e4906691393b8b1d90570eb6 --- manifest | 13 ++++--- manifest.uuid | 2 +- src/wal.c | 7 +++- test/walsetlk2.test | 89 +++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 102 insertions(+), 9 deletions(-) create mode 100644 test/walsetlk2.test diff --git a/manifest b/manifest index 73dfd4e959..1248182490 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Have\swindows\sSQLITE_ENABLE_SETLK_TIMEOUT\sbuilds\sblock\sindefinitely\sif\sthe\sbusy-timeout\sis\sset\sto\s0x7FFFFFFF. -D 2025-01-15T12:45:38.037 +C Fix\sa\srace\scondition\scausing\sSQLite\sto\suse\sa\sbusy-handler\sfor\san\soperation\sthat\sshould\snot. +D 2025-01-24T15:49:47.933 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d @@ -858,7 +858,7 @@ F src/vdbetrace.c fe0bc29ebd4e02c8bc5c1945f1d2e6be5927ec12c06d89b03ef2a4def34bf8 F src/vdbevtab.c fc46b9cbd759dc013f0b3724549cc0d71379183c667df3a5988f7e2f1bd485f3 F src/vtab.c 316cd48e9320660db3047cd306cd056e4361180cebb4d0f10a39244e10c11422 F src/vxworks.h d2988f4e5a61a4dfe82c6524dd3d6e4f2ce3cdb9 -F src/wal.c 4e6181d8780ab0af2e1388d0754cbe6f2f04593d2b1ab6c41699a89942fd8997 +F src/wal.c 97c96c4eab27a409d2c710d8977a6b4917aebced14db2d63a451e9ca7b1f69bd F src/wal.h ba252daaa94f889f4b2c17c027e823d9be47ce39da1d3799886bbd51f0490452 F src/walker.c d5006d6b005e4ea7302ad390957a8d41ed83faa177e412f89bc5600a7462a014 F src/where.c 9ad3dea8003a8913da6a4ca8322e2fe30773f46e88a0d4fbf9db13bdb999efa2 @@ -2022,6 +2022,7 @@ F test/walro2.test 33955a6fd874dd9724005e17f77fef89d334b3171454a1256fe4941a96766 F test/walrofault.test c70cb6e308c443867701856cce92ad8288cd99488fa52afab77cca6cfd51af68 F test/walseh1.test bae700eb99519b6d5cd3f893c04759accc5a59c391d4189fe4dd6995a533442b F test/walsetlk.test 9c5b92f9a20252540fedf9ffa6ee3d1b8af08ea4b80d0144d9b88e6c0c1de80d +F test/walsetlk2.test f32134c673e207e5af3c888448f925d1f92c250bb367f0e5a76e4bce9d56f0af F test/walshared.test 42e3808582504878af237ea02c42ca793e8a0efaa19df7df26ac573370dbc7a3 F test/walslow.test 0c51843836c9dcf40a5ac05aa781bfb977b396ee2c872d92bd48b79d5dd9aa23 F test/walthread.test 14b20fcfa6ae152f5d8e12f5dc8a8a724b7ef189f5d8ef1e2ceab79f2af51747 @@ -2202,8 +2203,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P b400ab4ba99d3ed7e90c93257d729563c630ef451017a702d42f322a4e57b663 -R 5c0bed857a50c43f376c97a6b2ec23d6 +P daefcafe799ad7613cbdff1fb1e9d40659892906875b28fbc112abd7679e48ea +R a5b314ee32b527d33bb7a6211f7b128a U dan -Z 3a0a46e6f7f4d366b981494ea8c1d6b1 +Z 09f6f131877fb88e3c0a6b91e64a67d2 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 16fe6006a7..1506819b57 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -daefcafe799ad7613cbdff1fb1e9d40659892906875b28fbc112abd7679e48ea +6ab9ed8eef77781898375038ab05fc6e5f46b745e4906691393b8b1d90570eb6 diff --git a/src/wal.c b/src/wal.c index 42ce3cb97b..707acfca5a 100644 --- a/src/wal.c +++ b/src/wal.c @@ -3470,8 +3470,11 @@ int sqlite3WalBeginReadTransaction(Wal *pWal, int *pChanged){ ** read-lock. */ void sqlite3WalEndReadTransaction(Wal *pWal){ - sqlite3WalEndWriteTransaction(pWal); +#ifndef SQLITE_ENABLE_SETLK_TIMEOUT + assert( pWal->writeLock==0 || pWal->readLock<0 ); +#endif if( pWal->readLock>=0 ){ + sqlite3WalEndWriteTransaction(pWal); walUnlockShared(pWal, WAL_READ_LOCK(pWal->readLock)); pWal->readLock = -1; } @@ -3664,7 +3667,7 @@ int sqlite3WalBeginWriteTransaction(Wal *pWal){ ** read-transaction was even opened, making this call a no-op. ** Return early. */ if( pWal->writeLock ){ - assert( !memcmp(&pWal->hdr,(void *)walIndexHdr(pWal),sizeof(WalIndexHdr)) ); + assert( !memcmp(&pWal->hdr,(void*)pWal->apWiData[0],sizeof(WalIndexHdr)) ); return SQLITE_OK; } #endif diff --git a/test/walsetlk2.test b/test/walsetlk2.test new file mode 100644 index 0000000000..99366571d6 --- /dev/null +++ b/test/walsetlk2.test @@ -0,0 +1,89 @@ +# 2025 Jan 24 +# +# The author disclaims copyright to this source code. In place of +# a legal notice, here is a blessing: +# +# May you do good and not evil. +# May you find forgiveness for yourself and forgive others. +# May you share freely, never taking more than you give. +# +#*********************************************************************** +# +# TESTRUNNER: slow +# + +set testdir [file dirname $argv0] +source $testdir/tester.tcl +source $testdir/lock_common.tcl +set testprefix walsetlk2 + +ifcapable !wal {finish_test ; return } +ifcapable !setlk_timeout {finish_test ; return } + +#------------------------------------------------------------------------- +# Check that xShmLock calls are as expected for write transactions in +# setlk mode. +# +reset_db + +do_execsql_test 1.0 { + PRAGMA journal_mode = wal; + CREATE TABLE t1(a, b, c); + INSERT INTO t1 VALUES(1, 2, 3); +} {wal} +db close + +testvfs tvfs +tvfs script xShmLock_callback +tvfs filter xShmLock + +set ::xshmlock [list] +proc xShmLock_callback {method path name detail} { + lappend ::xshmlock $detail +} + +sqlite3 db test.db -vfs tvfs +db timeout 1000 + +do_execsql_test 1.1 { + SELECT * FROM t1 +} {1 2 3} + +do_execsql_test 1.2 { + INSERT INTO t1 VALUES(4, 5, 6); +} + +set ::xshmlock [list] +do_execsql_test 1.3 { + INSERT INTO t1 VALUES(7, 8, 9); +} + +do_test 1.4 { + set ::xshmlock +} [list \ + {0 1 lock exclusive} \ + {4 1 lock exclusive} {4 1 unlock exclusive} \ + {4 1 lock shared} \ + {0 1 unlock exclusive} \ + {4 1 unlock shared} +] + +do_execsql_test 1.5.1 { SELECT * FROM t1 } {1 2 3 4 5 6 7 8 9} +set ::xshmlock [list] +do_execsql_test 1.5.2 { + INSERT INTO t1 VALUES(10, 11, 12); +} +do_test 1.5.3 { + set ::xshmlock +} [list \ + {0 1 lock exclusive} \ + {4 1 lock shared} \ + {0 1 unlock exclusive} \ + {4 1 unlock shared} +] + +db close +tvfs delete + +finish_test + From 43aad25b1b535f1c8c44ae964bf53e40eb351378 Mon Sep 17 00:00:00 2001 From: dan Date: Mon, 27 Jan 2025 11:50:03 +0000 Subject: [PATCH 024/194] Add the sqlite3_setlk_timeout() API. For setting the timeout used by SQLITE_ENABLE_SETLK_TIMEOUT blocking locks without also setting the regular retry-based busy-timeout. FossilOrigin-Name: 4a7eb492797abb47b18b7dfc557aeae43a0dea5b861efc203398d5059b10d131 --- manifest | 22 ++++++------ manifest.uuid | 2 +- src/main.c | 16 +++++++++ src/sqlite.h.in | 24 +++++++++++++ src/sqliteInt.h | 3 ++ src/test1.c | 26 ++++++++++++++ src/wal.c | 2 +- test/walsetlk2.test | 82 +++++++++++++++++++++++++++++++++++++++++++++ 8 files changed, 164 insertions(+), 13 deletions(-) diff --git a/manifest b/manifest index 1248182490..728f27c15f 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Fix\sa\srace\scondition\scausing\sSQLite\sto\suse\sa\sbusy-handler\sfor\san\soperation\sthat\sshould\snot. -D 2025-01-24T15:49:47.933 +C Add\sthe\ssqlite3_setlk_timeout()\sAPI.\sFor\ssetting\sthe\stimeout\sused\sby\sSQLITE_ENABLE_SETLK_TIMEOUT\sblocking\slocks\swithout\salso\ssetting\sthe\sregular\sretry-based\sbusy-timeout. +D 2025-01-27T11:50:03.268 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d @@ -740,7 +740,7 @@ F src/insert.c f8d1a0f8ee258411009c6b7f2d93170e351bd19f5ad89d57e1180644297cbe70 F src/json.c 68a98c020c22127f2d65f08855f7fc7460ff352a6ce0b543d8931dde83319c22 F src/legacy.c d7874bc885906868cd51e6c2156698f2754f02d9eee1bae2d687323c3ca8e5aa F src/loadext.c 7432c944ff197046d67a1207790a1b13eec4548c85a9457eb0896bb3641dfb36 -F src/main.c a19dc8b47760ed95f3fbb255cfa8d3f7146b33c263eb4af05ab05e0115d161b9 +F src/main.c 101ea590be76fda296d12e6d8d1e9cc24f350b83cbf53e68b4f04484b90452a4 F src/malloc.c 410e570b30c26cc36e3372577df50f7a96ee3eed5b2b161c6b6b48773c650c5e F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645 F src/mem1.c 3bb59158c38e05f6270e761a9f435bf19827a264c13d1631c58b84bdc96d73b2 @@ -779,16 +779,16 @@ F src/resolve.c c8a5372b97b2a2e972a280676f06ddb5b74e885d3b1f5ce383f839907b57ef68 F src/rowset.c 8432130e6c344b3401a8874c3cb49fefe6873fec593294de077afea2dce5ec97 F src/select.c 83e88fbb36f89b6703b348777491619554f0fd6f917c9fdf51e4c2e9cda6c04e F src/shell.c.in ee54de10e9bd5572f689a6bc0c8e6fa58a8870e1670978ded44412d2715fd908 -F src/sqlite.h.in 6afbcaae44140216704a6c82e4c4ea4118c46d5f6573d6c5fa4fc901ed9d369e +F src/sqlite.h.in ae301ce156765e2601695375dfc787a53b844a2f1c5d359bb667b081d1b7d2e0 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8 F src/sqlite3ext.h 3f046c04ea3595d6bfda99b781926b17e672fd6d27da2ba6d8d8fc39981dcb54 -F src/sqliteInt.h 3f20dfb5ae54e787b2643edc0b5bae0cecddfb89988e28afdc3c0b05892e25cc +F src/sqliteInt.h ff8e68e74a61b4bf676d1a9503be2e6c2bc92699ec358bb5e201b1a466f1aa8e F src/sqliteLimit.h 1bbdbf72bd0411d003267ffebc59a262f061df5653027a75627d03f48ca30523 F src/status.c cb11f8589a6912af2da3bb1ec509a94dd8ef27df4d4c1a97e0bcf2309ece972b F src/table.c 0f141b58a16de7e2fbe81c308379e7279f4c6b50eb08efeec5892794a0ba30d1 F src/tclsqlite.c 90441d3cc16f966a23499d9096a3d2d971e5e8fddb4d1413b096b79c2b2cff07 F src/tclsqlite.h 65e2c761446e1c9fa0342b7d2612a703483643c8b6a316d12a65b745a4727395 -F src/test1.c bed72f092f9aaebf50ee4919a02a26ab99a4f378ab334cb93d77e8adb82e4b77 +F src/test1.c 64df9d5ad54521eb3c103f1253bf33ceddbc5fa931658d3701027a2ac86eb5e9 F src/test2.c 7ebc518e6735939d8979273a6f7b1d9b5702babf059f6ad62499f7f60a9eb9a3 F src/test3.c e7573aa0f78ee4e070a4bc8c3493941c1aa64d5c66d4825c74c0f055451f432b F src/test4.c 13e57ae7ec7a959ee180970aef09deed141252fe9bb07c61054f0dfa4f1dfd5d @@ -858,7 +858,7 @@ F src/vdbetrace.c fe0bc29ebd4e02c8bc5c1945f1d2e6be5927ec12c06d89b03ef2a4def34bf8 F src/vdbevtab.c fc46b9cbd759dc013f0b3724549cc0d71379183c667df3a5988f7e2f1bd485f3 F src/vtab.c 316cd48e9320660db3047cd306cd056e4361180cebb4d0f10a39244e10c11422 F src/vxworks.h d2988f4e5a61a4dfe82c6524dd3d6e4f2ce3cdb9 -F src/wal.c 97c96c4eab27a409d2c710d8977a6b4917aebced14db2d63a451e9ca7b1f69bd +F src/wal.c 20550245b9a82f94736e905ee7df8f549e1301ba40e9f2cb51139e36d49c3c0f F src/wal.h ba252daaa94f889f4b2c17c027e823d9be47ce39da1d3799886bbd51f0490452 F src/walker.c d5006d6b005e4ea7302ad390957a8d41ed83faa177e412f89bc5600a7462a014 F src/where.c 9ad3dea8003a8913da6a4ca8322e2fe30773f46e88a0d4fbf9db13bdb999efa2 @@ -2022,7 +2022,7 @@ F test/walro2.test 33955a6fd874dd9724005e17f77fef89d334b3171454a1256fe4941a96766 F test/walrofault.test c70cb6e308c443867701856cce92ad8288cd99488fa52afab77cca6cfd51af68 F test/walseh1.test bae700eb99519b6d5cd3f893c04759accc5a59c391d4189fe4dd6995a533442b F test/walsetlk.test 9c5b92f9a20252540fedf9ffa6ee3d1b8af08ea4b80d0144d9b88e6c0c1de80d -F test/walsetlk2.test f32134c673e207e5af3c888448f925d1f92c250bb367f0e5a76e4bce9d56f0af +F test/walsetlk2.test e80cac17de166d5c8e4e0d243452798431aceb76a0abc95bfdd09d718d7c3f3f F test/walshared.test 42e3808582504878af237ea02c42ca793e8a0efaa19df7df26ac573370dbc7a3 F test/walslow.test 0c51843836c9dcf40a5ac05aa781bfb977b396ee2c872d92bd48b79d5dd9aa23 F test/walthread.test 14b20fcfa6ae152f5d8e12f5dc8a8a724b7ef189f5d8ef1e2ceab79f2af51747 @@ -2203,8 +2203,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P daefcafe799ad7613cbdff1fb1e9d40659892906875b28fbc112abd7679e48ea -R a5b314ee32b527d33bb7a6211f7b128a +P 6ab9ed8eef77781898375038ab05fc6e5f46b745e4906691393b8b1d90570eb6 +R 7026d025d771964056775817385cabe6 U dan -Z 09f6f131877fb88e3c0a6b91e64a67d2 +Z d459230a6d531f1d8e43a532fde898d2 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 1506819b57..8adcd56dc8 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -6ab9ed8eef77781898375038ab05fc6e5f46b745e4906691393b8b1d90570eb6 +4a7eb492797abb47b18b7dfc557aeae43a0dea5b861efc203398d5059b10d131 diff --git a/src/main.c b/src/main.c index 1163deb6e3..c8344b43c0 100644 --- a/src/main.c +++ b/src/main.c @@ -1766,6 +1766,9 @@ int sqlite3_busy_handler( db->busyHandler.pBusyArg = pArg; db->busyHandler.nBusy = 0; db->busyTimeout = 0; +#ifdef SQLITE_ENABLE_SETLK_TIMEOUT + db->setlkTimeout = 0; +#endif sqlite3_mutex_leave(db->mutex); return SQLITE_OK; } @@ -1815,12 +1818,25 @@ int sqlite3_busy_timeout(sqlite3 *db, int ms){ sqlite3_busy_handler(db, (int(*)(void*,int))sqliteDefaultBusyCallback, (void*)db); db->busyTimeout = ms; +#ifdef SQLITE_ENABLE_SETLK_TIMEOUT + db->setlkTimeout = ms; +#endif }else{ sqlite3_busy_handler(db, 0, 0); } return SQLITE_OK; } +int sqlite3_setlk_timeout(sqlite3 *db, int ms){ +#ifdef SQLITE_ENABLE_API_ARMOR + if( !sqlite3SafetyCheckOk(db) ) return SQLITE_MISUSE_BKPT; +#endif +#ifdef SQLITE_ENABLE_SETLK_TIMEOUT + db->setlkTimeout = (ms>0 ? ms : 0); +#endif + return SQLITE_OK; +} + /* ** Cause any pending operation to stop at its earliest opportunity. */ diff --git a/src/sqlite.h.in b/src/sqlite.h.in index 9a117fa54e..c2a69bd2fc 100644 --- a/src/sqlite.h.in +++ b/src/sqlite.h.in @@ -2899,6 +2899,30 @@ int sqlite3_busy_handler(sqlite3*,int(*)(void*,int),void*); */ int sqlite3_busy_timeout(sqlite3*, int ms); +/* +** CAPI3REF: Set the Setlk Timeout +** METHOD: sqlite3 +** +** This routine is only useful in SQLITE_ENABLE_SETLK_TIMEOUT builds. If +** the VFS supports blocking locks, it sets the timeout in ms used by +** eligible locks taken on wal mode databases by the specified database +** handle. In non-SQLITE_ENABLE_SETLK_TIMEOUT builds, or if the VFS does +** not support blocking locks, this function is a no-op. +** +** Passing 0x7FFFFFFF to this function is interpreted by some VFS as "block +** indefinitely". Passing zero or less than zero disables blocking locks +** altogether. +** +** Internally, each SQLite database handle store two timeout values - the +** busy-timeout (used for rollback mode databases, or if the VFS does not +** support blocking locks) and the setlk-timeout (used for blocking locks +** on wal-mode databases). The sqlite3_busy_timeout() method sets both +** values, this function sets only the setlk-timeout value. Therefore, +** to configure separate busy-timeout and setlk-timeout values for a single +** database handle, call sqlite3_busy_timeout() followed by this function. +*/ +int sqlite3_setlk_timeout(sqlite3*, int ms); + /* ** CAPI3REF: Convenience Routines For Running Queries ** METHOD: sqlite3 diff --git a/src/sqliteInt.h b/src/sqliteInt.h index b8c9136a59..aa12b89764 100644 --- a/src/sqliteInt.h +++ b/src/sqliteInt.h @@ -1744,6 +1744,9 @@ struct sqlite3 { Savepoint *pSavepoint; /* List of active savepoints */ int nAnalysisLimit; /* Number of index rows to ANALYZE */ int busyTimeout; /* Busy handler timeout, in msec */ +#ifdef SQLITE_ENABLE_SETLK_TIMEOUT + int setlkTimeout; /* Blocking lock timeout, in msec */ +#endif int nSavepoint; /* Number of non-transaction savepoints */ int nStatement; /* Number of nested statement-transactions */ i64 nDeferredCons; /* Net deferred constraints this transaction. */ diff --git a/src/test1.c b/src/test1.c index 6a87116776..fb7607f101 100644 --- a/src/test1.c +++ b/src/test1.c @@ -5939,6 +5939,31 @@ static int SQLITE_TCLAPI test_busy_timeout( return TCL_OK; } +/* +** Usage: sqlite3_setlk_timeout DB MS +** +** Set the setlk timeout. +*/ +static int SQLITE_TCLAPI test_setlk_timeout( + void * clientData, + Tcl_Interp *interp, + int argc, + char **argv +){ + int rc, ms; + sqlite3 *db; + if( argc!=3 ){ + Tcl_AppendResult(interp, "wrong # args: should be \"", argv[0], + " DB", 0); + return TCL_ERROR; + } + if( getDbPointer(interp, argv[1], &db) ) return TCL_ERROR; + if( Tcl_GetInt(interp, argv[2], &ms) ) return TCL_ERROR; + rc = sqlite3_setlk_timeout(db, ms); + Tcl_AppendResult(interp, sqlite3ErrName(rc), 0); + return TCL_OK; +} + /* ** Usage: tcl_variable_type VARIABLENAME ** @@ -8862,6 +8887,7 @@ int Sqlitetest1_Init(Tcl_Interp *interp){ { "sqlite_delete_collation", (Tcl_CmdProc*)delete_collation }, { "sqlite3_get_autocommit", (Tcl_CmdProc*)get_autocommit }, { "sqlite3_busy_timeout", (Tcl_CmdProc*)test_busy_timeout }, + { "sqlite3_setlk_timeout", (Tcl_CmdProc*)test_setlk_timeout }, { "printf", (Tcl_CmdProc*)test_printf }, { "sqlite3IoTrace", (Tcl_CmdProc*)test_io_trace }, { "clang_sanitize_address", (Tcl_CmdProc*)clang_sanitize_address }, diff --git a/src/wal.c b/src/wal.c index 707acfca5a..5d6c0c62c6 100644 --- a/src/wal.c +++ b/src/wal.c @@ -2027,7 +2027,7 @@ static int walEnableBlockingMs(Wal *pWal, int nMs){ static int walEnableBlocking(Wal *pWal){ int res = 0; if( pWal->db ){ - int tmout = pWal->db->busyTimeout; + int tmout = pWal->db->setlkTimeout; if( tmout ){ res = walEnableBlockingMs(pWal, tmout); } diff --git a/test/walsetlk2.test b/test/walsetlk2.test index 99366571d6..3b8e60cd4f 100644 --- a/test/walsetlk2.test +++ b/test/walsetlk2.test @@ -85,5 +85,87 @@ do_test 1.5.3 { db close tvfs delete +#------------------------------------------------------------------------- +# Check that if sqlite3_setlk_timeout() is used, blocking locks timeout +# but other operations do not use the retry mechanism. +# +reset_db + +do_execsql_test 2.0 { + CREATE TABLE t1(a, b); + INSERT INTO t1 VALUES(1, 2), (3, 4); +} + +sqlite3_setlk_timeout db 2000 + +# Launch a non-blocking testfixture process to write-lock the +# database for 2000 ms. +testfixture_nb done { + sqlite3 db test.db + db eval { + BEGIN EXCLUSIVE; + INSERT INTO t1 VALUES(5, 6); + } + after 2000 + db eval { + COMMIT + } +} + +after 500 {set ok 1} +vwait ok + +do_catchsql_test 2.1 { + INSERT INTO t1 VALUES(7, 8); +} {1 {database is locked}} + +sqlite3_busy_timeout db 2000 + +do_catchsql_test 2.2 { + INSERT INTO t1 VALUES(7, 8); +} {0 {}} + +do_execsql_test 2.3 { + SELECT * FROM t1 +} {1 2 3 4 5 6 7 8} + +do_execsql_test 2.4 { + PRAGMA journal_mode = wal; +} {wal} + +db close +sqlite3 db test.db + +do_execsql_test 2.5 { + INSERT INTO t1 VALUES(9, 10); +} + +sqlite3_setlk_timeout db 2000 + +# Launch a non-blocking testfixture process to write-lock the +# database for 2000 ms. +testfixture_nb done { + sqlite3 db test.db + db eval { + BEGIN EXCLUSIVE; + INSERT INTO t1 VALUES(11, 12); + } + after 2000 + db eval { + COMMIT + } +} + +after 500 {set ok 1} +vwait ok + +do_catchsql_test 2.6 { + INSERT INTO t1 VALUES(13, 14); +} {0 {}} + +do_execsql_test 2.7 { + SELECT * FROM t1 +} {1 2 3 4 5 6 7 8 9 10 11 12 13 14} + finish_test From 8883deb30eb6c31a1150bbc839b5420a52116bd7 Mon Sep 17 00:00:00 2001 From: stephan Date: Wed, 29 Jan 2025 11:08:11 +0000 Subject: [PATCH 025/194] Add experimental support to pause/unpause an SAHPool OPFS VFS, as discussed in [forum:fe8cdb8431c32455|forum post fe8cdb8431c32455], the intent being enable a page to relinquish, perhaps temporarily, the VFS such that the VFS's storage can be accessed by another page/tab. FossilOrigin-Name: 1d2683fe9e4be01c3137e750900f54d287e7d96185e66924d24b50f4647e7ef1 --- ext/wasm/api/sqlite3-vfs-opfs-sahpool.c-pp.js | 71 ++++++++++++++++++- ext/wasm/tester1.c-pp.js | 8 ++- manifest | 19 ++--- manifest.uuid | 2 +- 4 files changed, 89 insertions(+), 11 deletions(-) diff --git a/ext/wasm/api/sqlite3-vfs-opfs-sahpool.c-pp.js b/ext/wasm/api/sqlite3-vfs-opfs-sahpool.c-pp.js index 6551b5c89c..ac18bd4543 100644 --- a/ext/wasm/api/sqlite3-vfs-opfs-sahpool.c-pp.js +++ b/ext/wasm/api/sqlite3-vfs-opfs-sahpool.c-pp.js @@ -832,12 +832,18 @@ globalThis.sqlite3ApiBootstrap.initializers.push(function(sqlite3){ Removes this object's sqlite3_vfs registration and shuts down this object, releasing all handles, mappings, and whatnot, including deleting its data directory. There is currently no - way to "revive" the object and reaquire its resources. + way to "revive" the object and reaquire its + resources. Similarly, there is no recovery strategy if removal + of any given SAH fails, so such errors are ignored by this + function. This function is intended primarily for testing. Resolves to true if it did its job, false if the VFS has already been shut down. + + @see pauseVfs() + @see unpauseVfs() */ async removeVfs(){ if(!this.#cVfs.pointer || !this.#dhOpaque) return false; @@ -860,6 +866,65 @@ globalThis.sqlite3ApiBootstrap.initializers.push(function(sqlite3){ } + /** + "Pauses" this VFS by unregistering it from SQLite and + relinquishing all open SAHs, leaving the associated files + intact. If this object is already paused, this is a + no-op. Returns this object. + + This function throws if any database handles are active, as the + alternative would be to invoke Undefined Behavior by closing + that file handle out from under the database. Similarly, + automatically closing any database handles opened by this VFS + would invoke Undefined Behavior in downstream code which is + holding those pointers. + + @see isPaused() + @see unpauseVfs() + */ + pauseVfs(){ + if(this.#mapS3FileToOFile_.size>0){ + toss("Cannot pause a VFS which has an opened database.") + } + if(this.#mapSAHToName.size>0){ + capi.sqlite3_vfs_unregister(this.vfsName); + this.releaseAccessHandles(); + } + return this; + } + + /** + Returns true if this pool is currently paused else false. + + @see pauseVfs() + @see unpauseVfs() + */ + isPaused(){ + return 0===this.#mapSAHToName.size; + } + + /** + "Unpauses" this VFS, reacquiring all SAH's and (if successful) + re-registering it with SQLite. This is a no-op if the VFS is + not currently paused. + + The returned Promise resolves to this function's argument, and + is intended solely for use by the OpfsSAHPoolUtil helper class. + + @see isPaused() + @see pauseVfs() + */ + async unpauseVfs(returnValue){ + if(0===this.#mapSAHToName.size){ + return this.acquireAccessHandles(false). + then(()=>{ + capi.sqlite3_vfs_register(this.#cVfs, 0); + return returnValue; + }); + } + return returnValue; + } + //! Documented elsewhere in this file. exportFile(name){ const sah = this.#mapFilenameToSAH.get(name) || toss("File not found:",name); @@ -984,6 +1049,10 @@ globalThis.sqlite3ApiBootstrap.initializers.push(function(sqlite3){ async removeVfs(){ return this.#p.removeVfs() } + pauseVfs(){ this.#p.pauseVfs(); return this; } + async unpauseVfs(){ return this.#p.unpauseVfs(this); } + isPaused(){ return this.#p.isPaused() } + }/* class OpfsSAHPoolUtil */; /** diff --git a/ext/wasm/tester1.c-pp.js b/ext/wasm/tester1.c-pp.js index a21a1c330e..f5fff0cfc4 100644 --- a/ext/wasm/tester1.c-pp.js +++ b/ext/wasm/tester1.c-pp.js @@ -3154,8 +3154,14 @@ globalThis.sqlite3InitModule = sqlite3InitModule; db.close(); T.assert(1 === u1.getFileCount()); db = new u2.OpfsSAHPoolDb(dbName); - T.assert(1 === u1.getFileCount()); + T.assert(1 === u1.getFileCount()) + .mustThrow(()=>u2.pauseVfs(), "Cannot pause VFS with opened db."); db.close(); + T.assert( u2===u2.pauseVfs() ) + .assert( u2.isPaused() ) + .assert( 0===capi.sqlite3_vfs_find(u2.vfsName) ) + .assert( u2===await u2.unpauseVfs() ) + .assert( 0!==capi.sqlite3_vfs_find(u2.vfsName) ); const fileNames = u1.getFileNames(); T.assert(1 === fileNames.length) .assert(dbName === fileNames[0]) diff --git a/manifest b/manifest index 39bf2bf6db..4224ec1f0e 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Enhance\sthe\sif()\sand\siif()\sSQL\sfunctions\sso\sthat\sthey\ssupport\sany\nnumber\sof\sarguments\sgreater\sthan\sor\sequal\sto\stwo.\nSuggested\sby\s[forum:/forumpost/40f7867f75f80|forum\spost\s40f7867f75f80]. -D 2025-01-28T20:32:48.256 +C Add\sexperimental\ssupport\sto\spause/unpause\san\sSAHPool\sOPFS\sVFS,\sas\sdiscussed\sin\s[forum:fe8cdb8431c32455|forum\spost\sfe8cdb8431c32455],\sthe\sintent\sbeing\senable\sa\spage\sto\srelinquish,\sperhaps\stemporarily,\sthe\sVFS\ssuch\sthat\sthe\sVFS's\sstorage\scan\sbe\saccessed\sby\sanother\spage/tab. +D 2025-01-29T11:08:11.315 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d @@ -645,7 +645,7 @@ F ext/wasm/api/sqlite3-api-worker1.c-pp.js 5cc22a3c0d52828cb32aad8691488719f47d2 F ext/wasm/api/sqlite3-license-version-header.js 0c807a421f0187e778dc1078f10d2994b915123c1223fe752b60afdcd1263f89 F ext/wasm/api/sqlite3-opfs-async-proxy.js 3774befd97cd1a5e2895c8225a894aad946848c6d9b4028acc988b5d123475af F ext/wasm/api/sqlite3-vfs-helper.c-pp.js 3f828cc66758acb40e9c5b4dcfd87fd478a14c8fb7f0630264e6c7fa0e57515d -F ext/wasm/api/sqlite3-vfs-opfs-sahpool.c-pp.js bb5e96cd0fd6e1e54538256433f1c60a4e3095063c4d1a79a8a022fc59be9571 +F ext/wasm/api/sqlite3-vfs-opfs-sahpool.c-pp.js 69755ca8d4fa8e71d5411e3eb08c3d73b5130b8cde547eb084ea806f398a1a24 F ext/wasm/api/sqlite3-vfs-opfs.c-pp.js 9b86ca2d8276cf919fbc9ba2a10e9786033b64f92c2db844d951804dee6c4b4e F ext/wasm/api/sqlite3-vtab-helper.c-pp.js e809739d71e8b35dfe1b55d24d91f02d04239e6aef7ca1ea92a15a29e704f616 F ext/wasm/api/sqlite3-wasm.c 83f5e9f998e9fa4261eb84e9f092210e3ffe03895119f5ded0429eb34ab9d2be @@ -696,7 +696,7 @@ F ext/wasm/test-opfs-vfs.html 1f2d672f3f3fce810dfd48a8d56914aba22e45c6834e262555 F ext/wasm/test-opfs-vfs.js 1618670e466f424aa289859fe0ec8ded223e42e9e69b5c851f809baaaca1a00c F ext/wasm/tester1-worker.html ebc4b820a128963afce328ecf63ab200bd923309eb939f4110510ab449e9814c F ext/wasm/tester1.c-pp.html 1c1bc78b858af2019e663b1a31e76657b73dc24bede28ca92fbe917c3a972af2 -F ext/wasm/tester1.c-pp.js 228101c290003423f0bfb66a6ebbfc6904fa7b1b69466e700c135f74ee83d62a +F ext/wasm/tester1.c-pp.js 7f239383c06078fe67919509f7e1691d3b970a5f6cd4dc4adab71bc8e6cf6fe8 F ext/wasm/tests/opfs/concurrency/index.html 657578a6e9ce1e9b8be951549ed93a6a471f4520a99e5b545928668f4285fb5e F ext/wasm/tests/opfs/concurrency/test.js d08889a5bb6e61937d0b8cbb78c9efbefbf65ad09f510589c779b7cc6a803a88 F ext/wasm/tests/opfs/concurrency/worker.js 0a8c1a3e6ebb38aabbee24f122693f1fb29d599948915c76906681bb7da1d3d2 @@ -2209,8 +2209,11 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P 437fb316389bc3c24c5cdb4d01edfc81e2c2e9f2b399fc2a95b05d279361d8ec -R 79d5061e2e3bbb1ea5ad89bea1a7b048 -U drh -Z 108486be1053ae42ce8d5fd32905dfdb +P fb76d184ee5afc41009c4023bb68b3ddd42c9235a79ec9695c26f5bbe9a1aa25 +R e66195e1cc783f35788121ca02ce3aa2 +T *branch * opfs-sahpool-pause +T *sym-opfs-sahpool-pause * +T -sym-trunk * Cancelled\sby\sbranch. +U stephan +Z 8366991e856ca53edfe28286f618bbf1 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index ae82b8d99e..f443bbd368 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -fb76d184ee5afc41009c4023bb68b3ddd42c9235a79ec9695c26f5bbe9a1aa25 +1d2683fe9e4be01c3137e750900f54d287e7d96185e66924d24b50f4647e7ef1 From cb46f1bb95ed8677e85207be7f667b0020d1f200 Mon Sep 17 00:00:00 2001 From: stephan Date: Wed, 29 Jan 2025 11:28:18 +0000 Subject: [PATCH 026/194] Simplify how OpfsSAHPoolUtil.unpauseVfs()'s returned promise is handled. FossilOrigin-Name: d651b8da5a84cd54d71f15bd34e4db685674ef73f26f5cc26b7af5321a2ec05e --- ext/wasm/api/sqlite3-vfs-opfs-sahpool.c-pp.js | 14 +++++--------- manifest | 15 ++++++--------- manifest.uuid | 2 +- 3 files changed, 12 insertions(+), 19 deletions(-) diff --git a/ext/wasm/api/sqlite3-vfs-opfs-sahpool.c-pp.js b/ext/wasm/api/sqlite3-vfs-opfs-sahpool.c-pp.js index ac18bd4543..153c171c3f 100644 --- a/ext/wasm/api/sqlite3-vfs-opfs-sahpool.c-pp.js +++ b/ext/wasm/api/sqlite3-vfs-opfs-sahpool.c-pp.js @@ -908,21 +908,17 @@ globalThis.sqlite3ApiBootstrap.initializers.push(function(sqlite3){ re-registering it with SQLite. This is a no-op if the VFS is not currently paused. - The returned Promise resolves to this function's argument, and - is intended solely for use by the OpfsSAHPoolUtil helper class. + The returned Promise resolves to this object. @see isPaused() @see pauseVfs() */ - async unpauseVfs(returnValue){ + async unpauseVfs(){ if(0===this.#mapSAHToName.size){ return this.acquireAccessHandles(false). - then(()=>{ - capi.sqlite3_vfs_register(this.#cVfs, 0); - return returnValue; - }); + then(()=>capi.sqlite3_vfs_register(this.#cVfs, 0),this); } - return returnValue; + return this; } //! Documented elsewhere in this file. @@ -1050,7 +1046,7 @@ globalThis.sqlite3ApiBootstrap.initializers.push(function(sqlite3){ async removeVfs(){ return this.#p.removeVfs() } pauseVfs(){ this.#p.pauseVfs(); return this; } - async unpauseVfs(){ return this.#p.unpauseVfs(this); } + async unpauseVfs(){ return this.#p.unpauseVfs().then(()=>this); } isPaused(){ return this.#p.isPaused() } }/* class OpfsSAHPoolUtil */; diff --git a/manifest b/manifest index 4224ec1f0e..e02024cfb4 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Add\sexperimental\ssupport\sto\spause/unpause\san\sSAHPool\sOPFS\sVFS,\sas\sdiscussed\sin\s[forum:fe8cdb8431c32455|forum\spost\sfe8cdb8431c32455],\sthe\sintent\sbeing\senable\sa\spage\sto\srelinquish,\sperhaps\stemporarily,\sthe\sVFS\ssuch\sthat\sthe\sVFS's\sstorage\scan\sbe\saccessed\sby\sanother\spage/tab. -D 2025-01-29T11:08:11.315 +C Simplify\show\sOpfsSAHPoolUtil.unpauseVfs()'s\sreturned\spromise\sis\shandled. +D 2025-01-29T11:28:18.640 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d @@ -645,7 +645,7 @@ F ext/wasm/api/sqlite3-api-worker1.c-pp.js 5cc22a3c0d52828cb32aad8691488719f47d2 F ext/wasm/api/sqlite3-license-version-header.js 0c807a421f0187e778dc1078f10d2994b915123c1223fe752b60afdcd1263f89 F ext/wasm/api/sqlite3-opfs-async-proxy.js 3774befd97cd1a5e2895c8225a894aad946848c6d9b4028acc988b5d123475af F ext/wasm/api/sqlite3-vfs-helper.c-pp.js 3f828cc66758acb40e9c5b4dcfd87fd478a14c8fb7f0630264e6c7fa0e57515d -F ext/wasm/api/sqlite3-vfs-opfs-sahpool.c-pp.js 69755ca8d4fa8e71d5411e3eb08c3d73b5130b8cde547eb084ea806f398a1a24 +F ext/wasm/api/sqlite3-vfs-opfs-sahpool.c-pp.js c8d6f02d834224290009d25876d2ec011cb9b8dc425e3a0761b7e55d9a67c24f F ext/wasm/api/sqlite3-vfs-opfs.c-pp.js 9b86ca2d8276cf919fbc9ba2a10e9786033b64f92c2db844d951804dee6c4b4e F ext/wasm/api/sqlite3-vtab-helper.c-pp.js e809739d71e8b35dfe1b55d24d91f02d04239e6aef7ca1ea92a15a29e704f616 F ext/wasm/api/sqlite3-wasm.c 83f5e9f998e9fa4261eb84e9f092210e3ffe03895119f5ded0429eb34ab9d2be @@ -2209,11 +2209,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P fb76d184ee5afc41009c4023bb68b3ddd42c9235a79ec9695c26f5bbe9a1aa25 -R e66195e1cc783f35788121ca02ce3aa2 -T *branch * opfs-sahpool-pause -T *sym-opfs-sahpool-pause * -T -sym-trunk * Cancelled\sby\sbranch. +P 1d2683fe9e4be01c3137e750900f54d287e7d96185e66924d24b50f4647e7ef1 +R 66a514dac494b6089e61caf69206dcd1 U stephan -Z 8366991e856ca53edfe28286f618bbf1 +Z 0fe942552ec304dc399f25e3701534d9 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index f443bbd368..056d267bf5 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -1d2683fe9e4be01c3137e750900f54d287e7d96185e66924d24b50f4647e7ef1 +d651b8da5a84cd54d71f15bd34e4db685674ef73f26f5cc26b7af5321a2ec05e From 462888819e3582e30c8a513285bd4d524a64f66e Mon Sep 17 00:00:00 2001 From: dan Date: Thu, 30 Jan 2025 15:26:16 +0000 Subject: [PATCH 027/194] Have sqlite3_enable_setlk(-1) configure indefinite blocking locks where they are supported. FossilOrigin-Name: 62009565d2f2a2c4d347e1da0d5b4ad43056742df47fd6ddb92e62f53a2b57f1 --- manifest | 22 ++++++------ manifest.uuid | 2 +- src/main.c | 6 +++- src/os_unix.c | 3 +- src/os_win.c | 27 +++++++++----- src/sqlite.h.in | 7 ++-- src/sqliteInt.h | 2 +- test/walsetlk2.test | 85 +++++++++++++++++++++++++++++++++++++++++++++ 8 files changed, 127 insertions(+), 27 deletions(-) diff --git a/manifest b/manifest index 728f27c15f..41ed9de005 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Add\sthe\ssqlite3_setlk_timeout()\sAPI.\sFor\ssetting\sthe\stimeout\sused\sby\sSQLITE_ENABLE_SETLK_TIMEOUT\sblocking\slocks\swithout\salso\ssetting\sthe\sregular\sretry-based\sbusy-timeout. -D 2025-01-27T11:50:03.268 +C Have\ssqlite3_enable_setlk(-1)\sconfigure\sindefinite\sblocking\slocks\swhere\sthey\sare\ssupported. +D 2025-01-30T15:26:16.127 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d @@ -740,7 +740,7 @@ F src/insert.c f8d1a0f8ee258411009c6b7f2d93170e351bd19f5ad89d57e1180644297cbe70 F src/json.c 68a98c020c22127f2d65f08855f7fc7460ff352a6ce0b543d8931dde83319c22 F src/legacy.c d7874bc885906868cd51e6c2156698f2754f02d9eee1bae2d687323c3ca8e5aa F src/loadext.c 7432c944ff197046d67a1207790a1b13eec4548c85a9457eb0896bb3641dfb36 -F src/main.c 101ea590be76fda296d12e6d8d1e9cc24f350b83cbf53e68b4f04484b90452a4 +F src/main.c a54dfdbfee90c8696e473c8fcd5ca1159aa56c096643a0983cc3f0ba4ad45baa F src/malloc.c 410e570b30c26cc36e3372577df50f7a96ee3eed5b2b161c6b6b48773c650c5e F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645 F src/mem1.c 3bb59158c38e05f6270e761a9f435bf19827a264c13d1631c58b84bdc96d73b2 @@ -761,8 +761,8 @@ F src/os.h 1ff5ae51d339d0e30d8a9d814f4b8f8e448169304d83a7ed9db66a65732f3e63 F src/os_common.h 6c0eb8dd40ef3e12fe585a13e709710267a258e2c8dd1c40b1948a1d14582e06 F src/os_kv.c 4d39e1f1c180b11162c6dc4aa8ad34053873a639bac6baae23272fc03349986a F src/os_setup.h 6011ad7af5db4e05155f385eb3a9b4470688de6f65d6166b8956e58a3d872107 -F src/os_unix.c d2edbd92b07a3f778c2defa8a2e9d75acceb6267bda56948c41e8cdda65224d6 -F src/os_win.c 3dfb4a2464143d917d4a407c14706953a98a7ea211742a3039547df05bc3903b +F src/os_unix.c 5d0d1788ffa3a43bfc47502e4baa36cf8507e478cd182298fc4974a7cca0954f +F src/os_win.c 79a1b02f483ec82ab8fb1b00cc003bff8a3c44bf8d7ea074992a4e0dda9488df F src/os_win.h 7b073010f1451abe501be30d12f6bc599824944a F src/pager.c 2fdd489447aa6bb0f672973bacb801ced92225ca9a1c874ed9b856d2741dc54e F src/pager.h 6137149346e6c8a3ddc1eeb40aee46381e9bc8b0fcc6dda8a1efde993c2275b8 @@ -779,10 +779,10 @@ F src/resolve.c c8a5372b97b2a2e972a280676f06ddb5b74e885d3b1f5ce383f839907b57ef68 F src/rowset.c 8432130e6c344b3401a8874c3cb49fefe6873fec593294de077afea2dce5ec97 F src/select.c 83e88fbb36f89b6703b348777491619554f0fd6f917c9fdf51e4c2e9cda6c04e F src/shell.c.in ee54de10e9bd5572f689a6bc0c8e6fa58a8870e1670978ded44412d2715fd908 -F src/sqlite.h.in ae301ce156765e2601695375dfc787a53b844a2f1c5d359bb667b081d1b7d2e0 +F src/sqlite.h.in 6958f27ef2f789bb724c2be8ee6edf5b2200e74bf638d2e58bdae9cfc6a55d5e F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8 F src/sqlite3ext.h 3f046c04ea3595d6bfda99b781926b17e672fd6d27da2ba6d8d8fc39981dcb54 -F src/sqliteInt.h ff8e68e74a61b4bf676d1a9503be2e6c2bc92699ec358bb5e201b1a466f1aa8e +F src/sqliteInt.h d718c8517bd0659e1d4239642fa4ff7e85e39bc32a2e33a18b470b362c485f63 F src/sqliteLimit.h 1bbdbf72bd0411d003267ffebc59a262f061df5653027a75627d03f48ca30523 F src/status.c cb11f8589a6912af2da3bb1ec509a94dd8ef27df4d4c1a97e0bcf2309ece972b F src/table.c 0f141b58a16de7e2fbe81c308379e7279f4c6b50eb08efeec5892794a0ba30d1 @@ -2022,7 +2022,7 @@ F test/walro2.test 33955a6fd874dd9724005e17f77fef89d334b3171454a1256fe4941a96766 F test/walrofault.test c70cb6e308c443867701856cce92ad8288cd99488fa52afab77cca6cfd51af68 F test/walseh1.test bae700eb99519b6d5cd3f893c04759accc5a59c391d4189fe4dd6995a533442b F test/walsetlk.test 9c5b92f9a20252540fedf9ffa6ee3d1b8af08ea4b80d0144d9b88e6c0c1de80d -F test/walsetlk2.test e80cac17de166d5c8e4e0d243452798431aceb76a0abc95bfdd09d718d7c3f3f +F test/walsetlk2.test def90f1c8cf47c5128bd3d12171ff1ed6c79f78dcb50c8c2cacf030fc78566a0 F test/walshared.test 42e3808582504878af237ea02c42ca793e8a0efaa19df7df26ac573370dbc7a3 F test/walslow.test 0c51843836c9dcf40a5ac05aa781bfb977b396ee2c872d92bd48b79d5dd9aa23 F test/walthread.test 14b20fcfa6ae152f5d8e12f5dc8a8a724b7ef189f5d8ef1e2ceab79f2af51747 @@ -2203,8 +2203,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P 6ab9ed8eef77781898375038ab05fc6e5f46b745e4906691393b8b1d90570eb6 -R 7026d025d771964056775817385cabe6 +P 4a7eb492797abb47b18b7dfc557aeae43a0dea5b861efc203398d5059b10d131 +R 742ff1ca774eae27b30e6d13698e33be U dan -Z d459230a6d531f1d8e43a532fde898d2 +Z 0c159766f95122a144fb984bb53f46a1 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 8adcd56dc8..18482d41b0 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -4a7eb492797abb47b18b7dfc557aeae43a0dea5b861efc203398d5059b10d131 +62009565d2f2a2c4d347e1da0d5b4ad43056742df47fd6ddb92e62f53a2b57f1 diff --git a/src/main.c b/src/main.c index c8344b43c0..c1799455fa 100644 --- a/src/main.c +++ b/src/main.c @@ -1827,12 +1827,16 @@ int sqlite3_busy_timeout(sqlite3 *db, int ms){ return SQLITE_OK; } +/* +** Set the setlk timeout value. +*/ int sqlite3_setlk_timeout(sqlite3 *db, int ms){ #ifdef SQLITE_ENABLE_API_ARMOR if( !sqlite3SafetyCheckOk(db) ) return SQLITE_MISUSE_BKPT; #endif + if( ms<-1 ) return SQLITE_RANGE; #ifdef SQLITE_ENABLE_SETLK_TIMEOUT - db->setlkTimeout = (ms>0 ? ms : 0); + db->setlkTimeout = ms; #endif return SQLITE_OK; } diff --git a/src/os_unix.c b/src/os_unix.c index b1996278c8..58e4952100 100644 --- a/src/os_unix.c +++ b/src/os_unix.c @@ -4038,8 +4038,9 @@ static int unixFileControl(sqlite3_file *id, int op, void *pArg){ #ifdef SQLITE_ENABLE_SETLK_TIMEOUT case SQLITE_FCNTL_LOCK_TIMEOUT: { int iOld = pFile->iBusyTimeout; + int iNew = *(int*)pArg; #if SQLITE_ENABLE_SETLK_TIMEOUT==1 - pFile->iBusyTimeout = *(int*)pArg; + pFile->iBusyTimeout = iNew<0 ? 0x7FFFFFFF : (unsigned)iNew; #elif SQLITE_ENABLE_SETLK_TIMEOUT==2 pFile->iBusyTimeout = !!(*(int*)pArg); #else diff --git a/src/os_win.c b/src/os_win.c index 556b075f49..751ba21481 100644 --- a/src/os_win.c +++ b/src/os_win.c @@ -288,7 +288,7 @@ struct winFile { sqlite3_int64 mmapSizeMax; /* Configured FCNTL_MMAP_SIZE value */ #endif #ifdef SQLITE_ENABLE_SETLK_TIMEOUT - unsigned iBusyTimeout; /* Wait this many millisec on locks */ + DWORD iBusyTimeout; /* Wait this many millisec on locks */ #endif }; @@ -2608,7 +2608,7 @@ static int winHandleLockTimeout( DWORD offset, DWORD nByte, int bExcl, - int nMs + DWORD nMs ){ DWORD flags = LOCKFILE_FAIL_IMMEDIATELY | (bExcl?LOCKFILE_EXCLUSIVE_LOCK:0); int rc = SQLITE_OK; @@ -2622,7 +2622,7 @@ static int winHandleLockTimeout( ovlp.Offset = offset; #ifdef SQLITE_ENABLE_SETLK_TIMEOUT - if( nMs>0 ){ + if( nMs!=0 ){ flags &= ~LOCKFILE_FAIL_IMMEDIATELY; } ovlp.hEvent = osCreateEvent(NULL, TRUE, FALSE, NULL); @@ -2637,9 +2637,17 @@ static int winHandleLockTimeout( /* If SQLITE_ENABLE_SETLK_TIMEOUT is defined, then the file-handle was ** opened with FILE_FLAG_OVERHEAD specified. In this case, the call to ** LockFileEx() may fail because the request is still pending. This can - ** happen even if LOCKFILE_FAIL_IMMEDIATELY was specified. */ + ** happen even if LOCKFILE_FAIL_IMMEDIATELY was specified. + ** + ** If nMs is 0, then LOCKFILE_FAIL_IMMEDIATELY was set in the flags + ** passed to LockFileEx(). In this case, if the operation is pending, + ** block indefinitely until it is finished. + ** + ** Otherwise, wait for up to nMs ms for the operation to finish. nMs + ** may be set to INFINITE. + */ if( !ret && GetLastError()==ERROR_IO_PENDING ){ - DWORD nDelay = (nMs==0 || nMs==0x7FFFFFFF ? INFINITE : nMs); + DWORD nDelay = (nMs==0 ? INFINITE : nMs); DWORD res = osWaitForSingleObject(ovlp.hEvent, nDelay); if( res==WAIT_OBJECT_0 ){ ret = TRUE; @@ -3834,10 +3842,11 @@ static int winFileControl(sqlite3_file *id, int op, void *pArg){ #ifdef SQLITE_ENABLE_SETLK_TIMEOUT case SQLITE_FCNTL_LOCK_TIMEOUT: { int iOld = pFile->iBusyTimeout; + int iNew = *(int*)pArg; #if SQLITE_ENABLE_SETLK_TIMEOUT==1 - pFile->iBusyTimeout = *(int*)pArg; + pFile->iBusyTimeout = (iNew < 0) ? INFINITE : (DWORD)iNew; #elif SQLITE_ENABLE_SETLK_TIMEOUT==2 - pFile->iBusyTimeout = !!(*(int*)pArg); + pFile->iBusyTimeout = (DWORD)(!!iNew); #else # error "SQLITE_ENABLE_SETLK_TIMEOUT must be set to 1 or 2" #endif @@ -4043,7 +4052,7 @@ static void winShmPurge(sqlite3_vfs *pVfs, int deleteFlag){ ** pShmNode. Take the lock. Truncate the *-shm file if required. ** Return SQLITE_OK if successful, or an SQLite error code otherwise. */ -static int winLockSharedMemory(winShmNode *pShmNode, int nMs){ +static int winLockSharedMemory(winShmNode *pShmNode, DWORD nMs){ HANDLE h = pShmNode->hSharedShm; int rc = SQLITE_OK; @@ -4407,7 +4416,7 @@ static int winShmLock( } }else{ int bExcl = ((flags & SQLITE_SHM_EXCLUSIVE) ? 1 : 0); - int nMs = winFileBusyTimeout(pDbFd); + DWORD nMs = winFileBusyTimeout(pDbFd); rc = winHandleLockTimeout(p->hShm, ofst+WIN_SHM_BASE, n, bExcl, nMs); if( rc==SQLITE_OK ){ if( bExcl ){ diff --git a/src/sqlite.h.in b/src/sqlite.h.in index c2a69bd2fc..68474ab71c 100644 --- a/src/sqlite.h.in +++ b/src/sqlite.h.in @@ -2909,9 +2909,10 @@ int sqlite3_busy_timeout(sqlite3*, int ms); ** handle. In non-SQLITE_ENABLE_SETLK_TIMEOUT builds, or if the VFS does ** not support blocking locks, this function is a no-op. ** -** Passing 0x7FFFFFFF to this function is interpreted by some VFS as "block -** indefinitely". Passing zero or less than zero disables blocking locks -** altogether. +** Passing 0 to this function disables blocking locks altogether. Passing +** -1 to this function requests that the VFS blocks for a long time - +** indefinitely if possible. The results of passing any other negative value +** are undefined. ** ** Internally, each SQLite database handle store two timeout values - the ** busy-timeout (used for rollback mode databases, or if the VFS does not diff --git a/src/sqliteInt.h b/src/sqliteInt.h index aa12b89764..631bb2a249 100644 --- a/src/sqliteInt.h +++ b/src/sqliteInt.h @@ -1745,7 +1745,7 @@ struct sqlite3 { int nAnalysisLimit; /* Number of index rows to ANALYZE */ int busyTimeout; /* Busy handler timeout, in msec */ #ifdef SQLITE_ENABLE_SETLK_TIMEOUT - int setlkTimeout; /* Blocking lock timeout, in msec */ + int setlkTimeout; /* Blocking lock timeout, in msec. -1 -> inf. */ #endif int nSavepoint; /* Number of non-transaction savepoints */ int nStatement; /* Number of nested statement-transactions */ diff --git a/test/walsetlk2.test b/test/walsetlk2.test index 3b8e60cd4f..a8258b5736 100644 --- a/test/walsetlk2.test +++ b/test/walsetlk2.test @@ -167,5 +167,90 @@ do_execsql_test 2.7 { SELECT * FROM t1 } {1 2 3 4 5 6 7 8 9 10 11 12 13 14} +#------------------------------------------------------------------------- +# Check that if sqlite3_setlk_timeout(-1) is called, blocking locks are +# enabled and last for a few seconds at least. Difficult to test that they +# really do block indefinitely. +# +reset_db + +do_execsql_test 3.0 { + PRAGMA journal_mode = wal; + CREATE TABLE t1(a INTEGER PRIMARY KEY, b); + INSERT INTO t1 VALUES(1, 'one'), (3, 'three'); +} {wal} + +sqlite3_setlk_timeout db -1 + +# Launch a non-blocking testfixture process to write-lock the +# database for 2000 ms. +testfixture_nb done { + sqlite3 db test.db + db eval { + BEGIN EXCLUSIVE; + INSERT INTO t1 VALUES(5, 'five'); + } + after 2000 + db eval { + COMMIT + } +} + +after 500 {set ok 1} +vwait ok + +breakpoint +do_catchsql_test 3.1 { + INSERT INTO t1 VALUES(7, 'seven'); +} {0 {}} + +# Launch another non-blocking testfixture process to write-lock the +# database for 2000 ms. +testfixture_nb done { + sqlite3 db test.db + db eval { + BEGIN EXCLUSIVE; + INSERT INTO t1 VALUES(9, 'nine'); + } + after 2000 + db eval { + COMMIT + } +} + +after 500 {set ok 1} +vwait ok + +do_catchsql_test 3.2 { + INSERT INTO t1 VALUES(9, 'ten'); +} {1 {UNIQUE constraint failed: t1.a}} + +do_execsql_test 3.3 { + SELECT * FROM t1 +} {1 one 3 three 5 five 7 seven 9 nine} + +db close + +# Launch another non-blocking testfixture process to write-lock the +# database for 2000 ms. +testfixture_nb done { + sqlite3 db test.db + db eval { + BEGIN EXCLUSIVE; + INSERT INTO t1 VALUES(11, 'eleven'); + } + after 2000 + db eval { + COMMIT + } +} + +sqlite3 db test.db +sqlite3_setlk_timeout db -1 +do_catchsql_test 3.4 { + INSERT INTO t1 VALUES(13, 'thirteen'); +} {0 {}} + + finish_test From df54ecb1bfaf1d6e514b534a9c647ffc72571684 Mon Sep 17 00:00:00 2001 From: dan Date: Thu, 30 Jan 2025 17:04:28 +0000 Subject: [PATCH 028/194] Fix a problem causing the write-lock to be held when it should not be in some circumstances following a SEH exception. FossilOrigin-Name: 7eb5accb7cf937fc967dcd86da0af813fb18a2697348bd231fbefd3c09b930ab --- manifest | 14 +++++++------- manifest.uuid | 2 +- src/wal.c | 16 ++++++++++++++-- test/walsetlk2.test | 4 ++++ 4 files changed, 26 insertions(+), 10 deletions(-) diff --git a/manifest b/manifest index 41ed9de005..fd640c9b35 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Have\ssqlite3_enable_setlk(-1)\sconfigure\sindefinite\sblocking\slocks\swhere\sthey\sare\ssupported. -D 2025-01-30T15:26:16.127 +C Fix\sa\sproblem\scausing\sthe\swrite-lock\sto\sbe\sheld\swhen\sit\sshould\snot\sbe\sin\ssome\scircumstances\sfollowing\sa\sSEH\sexception. +D 2025-01-30T17:04:28.336 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d @@ -858,7 +858,7 @@ F src/vdbetrace.c fe0bc29ebd4e02c8bc5c1945f1d2e6be5927ec12c06d89b03ef2a4def34bf8 F src/vdbevtab.c fc46b9cbd759dc013f0b3724549cc0d71379183c667df3a5988f7e2f1bd485f3 F src/vtab.c 316cd48e9320660db3047cd306cd056e4361180cebb4d0f10a39244e10c11422 F src/vxworks.h d2988f4e5a61a4dfe82c6524dd3d6e4f2ce3cdb9 -F src/wal.c 20550245b9a82f94736e905ee7df8f549e1301ba40e9f2cb51139e36d49c3c0f +F src/wal.c 6da5a05c124bad1e530cf83bafa07d28afdda20c28b276de49948ef8295d9e84 F src/wal.h ba252daaa94f889f4b2c17c027e823d9be47ce39da1d3799886bbd51f0490452 F src/walker.c d5006d6b005e4ea7302ad390957a8d41ed83faa177e412f89bc5600a7462a014 F src/where.c 9ad3dea8003a8913da6a4ca8322e2fe30773f46e88a0d4fbf9db13bdb999efa2 @@ -2022,7 +2022,7 @@ F test/walro2.test 33955a6fd874dd9724005e17f77fef89d334b3171454a1256fe4941a96766 F test/walrofault.test c70cb6e308c443867701856cce92ad8288cd99488fa52afab77cca6cfd51af68 F test/walseh1.test bae700eb99519b6d5cd3f893c04759accc5a59c391d4189fe4dd6995a533442b F test/walsetlk.test 9c5b92f9a20252540fedf9ffa6ee3d1b8af08ea4b80d0144d9b88e6c0c1de80d -F test/walsetlk2.test def90f1c8cf47c5128bd3d12171ff1ed6c79f78dcb50c8c2cacf030fc78566a0 +F test/walsetlk2.test 5ae8662a28c013e8df2ce975f9e3577a7f239aeb4622bb8d4d0ca8e16c0c132e F test/walshared.test 42e3808582504878af237ea02c42ca793e8a0efaa19df7df26ac573370dbc7a3 F test/walslow.test 0c51843836c9dcf40a5ac05aa781bfb977b396ee2c872d92bd48b79d5dd9aa23 F test/walthread.test 14b20fcfa6ae152f5d8e12f5dc8a8a724b7ef189f5d8ef1e2ceab79f2af51747 @@ -2203,8 +2203,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P 4a7eb492797abb47b18b7dfc557aeae43a0dea5b861efc203398d5059b10d131 -R 742ff1ca774eae27b30e6d13698e33be +P 62009565d2f2a2c4d347e1da0d5b4ad43056742df47fd6ddb92e62f53a2b57f1 +R 1ce6d89df3820633838b6629306f6da1 U dan -Z 0c159766f95122a144fb984bb53f46a1 +Z ed92d59f35c33d93aa0b00d0344b6f87 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 18482d41b0..240cfee238 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -62009565d2f2a2c4d347e1da0d5b4ad43056742df47fd6ddb92e62f53a2b57f1 +7eb5accb7cf937fc967dcd86da0af813fb18a2697348bd231fbefd3c09b930ab diff --git a/src/wal.c b/src/wal.c index 5d6c0c62c6..759ad8e10e 100644 --- a/src/wal.c +++ b/src/wal.c @@ -502,6 +502,11 @@ struct WalCkptInfo { /* ** An open write-ahead log file is represented by an instance of the ** following object. +** +** writeLock: +** This is usually set to 1 whenever the WRITER lock is held. However, +** if it is set to 2, then the WRITER lock is held but must be released +** by walHandleException() if a SEH exception is thrown. */ struct Wal { sqlite3_vfs *pVfs; /* The VFS used to create pDbFd */ @@ -2413,7 +2418,9 @@ static int walHandleException(Wal *pWal){ static const int S = 1; static const int E = (1<lockMask & ~( + u32 mUnlock; + if( pWal->writeLock==2 ) pWal->writeLock = 0; + mUnlock = pWal->lockMask & ~( (pWal->readLock<0 ? 0 : (S << WAL_READ_LOCK(pWal->readLock))) | (pWal->writeLock ? (E << WAL_WRITE_LOCK) : 0) | (pWal->ckptLock ? (E << WAL_CKPT_LOCK) : 0) @@ -2685,7 +2692,12 @@ static int walIndexReadHdr(Wal *pWal, int *pChanged){ if( bWriteLock || SQLITE_OK==(rc = walLockExclusive(pWal, WAL_WRITE_LOCK, 1)) ){ - pWal->writeLock = 1; + /* If the write-lock was just obtained, set writeLock to 2 instead of + ** the usual 1. This causes walIndexPage() to behave as if the + ** write-lock were held (so that it allocates new pages as required), + ** and walHandleException() to unlock the write-lock if a SEH exception + ** is thrown. */ + if( !bWriteLock ) pWal->writeLock = 2; if( SQLITE_OK==(rc = walIndexPage(pWal, 0, &page0)) ){ badHdr = walIndexTryHdr(pWal, pChanged); if( badHdr ){ diff --git a/test/walsetlk2.test b/test/walsetlk2.test index a8258b5736..7fadc97fbc 100644 --- a/test/walsetlk2.test +++ b/test/walsetlk2.test @@ -110,6 +110,7 @@ testfixture_nb done { db eval { COMMIT } + db close } after 500 {set ok 1} @@ -154,6 +155,7 @@ testfixture_nb done { db eval { COMMIT } + db close } after 500 {set ok 1} @@ -194,6 +196,7 @@ testfixture_nb done { db eval { COMMIT } + db close } after 500 {set ok 1} @@ -216,6 +219,7 @@ testfixture_nb done { db eval { COMMIT } + db close } after 500 {set ok 1} From 654c94d68382493144a5c34e25937d56ba6fe0da Mon Sep 17 00:00:00 2001 From: stephan Date: Fri, 31 Jan 2025 14:25:38 +0000 Subject: [PATCH 029/194] Cleanups in the opfs-sahpool VFS pause/unpause feature and its tests. FossilOrigin-Name: 184ba37702f63196deca91d273e798ca895fbb301938e6264bc82815a4e33149 --- ext/wasm/api/sqlite3-vfs-opfs-sahpool.c-pp.js | 97 +++++++++++++------ ext/wasm/tester1.c-pp.js | 13 ++- manifest | 14 +-- manifest.uuid | 2 +- 4 files changed, 87 insertions(+), 39 deletions(-) diff --git a/ext/wasm/api/sqlite3-vfs-opfs-sahpool.c-pp.js b/ext/wasm/api/sqlite3-vfs-opfs-sahpool.c-pp.js index 153c171c3f..39094a6f80 100644 --- a/ext/wasm/api/sqlite3-vfs-opfs-sahpool.c-pp.js +++ b/ext/wasm/api/sqlite3-vfs-opfs-sahpool.c-pp.js @@ -501,22 +501,10 @@ globalThis.sqlite3ApiBootstrap.initializers.push(function(sqlite3){ currently-opened client-specified filenames. */ getFileNames(){ const rc = []; - const iter = this.#mapFilenameToSAH.keys(); - for(const n of iter) rc.push(n); + for(const n of this.#mapFilenameToSAH.keys()) rc.push(n); return rc; } -// #createFileObject(sah,clientName,opaqueName){ -// const f = Object.assign(Object.create(null),{ -// clientName, opaqueName -// }); -// this.#mapSAHToMeta.set(sah, f); -// return f; -// } -// #unmapFileObject(sah){ -// this.#mapSAHToMeta.delete(sah); -// } - /** Adds n files to the pool's capacity. This change is persistent across settings. Returns a Promise which resolves @@ -557,8 +545,9 @@ globalThis.sqlite3ApiBootstrap.initializers.push(function(sqlite3){ } /** - Releases all currently-opened SAHs. The only legal - operation after this is acquireAccessHandles(). + Releases all currently-opened SAHs. The only legal operation + after this is acquireAccessHandles() or (if this is called from + pauseVfs()) either of isPaused() or unpauseVfs(). */ releaseAccessHandles(){ for(const ah of this.#mapSAHToName.keys()) ah.close(); @@ -568,17 +557,21 @@ globalThis.sqlite3ApiBootstrap.initializers.push(function(sqlite3){ } /** - Opens all files under this.vfsDir/this.#dhOpaque and acquires - a SAH for each. returns a Promise which resolves to no value - but completes once all SAHs are acquired. If acquiring an SAH - throws, SAHPool.$error will contain the corresponding - exception. + Opens all files under this.vfsDir/this.#dhOpaque and acquires a + SAH for each. Returns a Promise which resolves to no value but + completes once all SAHs are acquired. If acquiring an SAH + throws, this.$error will contain the corresponding Error + object. + + If it throws, it releases any SAHs which it may have + acquired before the exception was thrown, leaving the VFS in a + well-defined but unusable state. If clearFiles is true, the client-stored state of each file is cleared when its handle is acquired, including its name, flags, and any data stored after the metadata block. */ - async acquireAccessHandles(clearFiles){ + async acquireAccessHandles(clearFiles=false){ const files = []; for await (const [name,h] of this.#dhOpaque){ if('file'===h.kind){ @@ -859,7 +852,7 @@ globalThis.sqlite3ApiBootstrap.initializers.push(function(sqlite3){ ); this.#dhVfsRoot = this.#dhVfsParent = undefined; }catch(e){ - sqlite3.config.error(this.vfsName,"removeVfs() failed:",e); + sqlite3.config.error(this.vfsName,"removeVfs() failed with no recovery strategy:",e); /*otherwise ignored - there is no recovery strategy*/ } return true; @@ -872,19 +865,26 @@ globalThis.sqlite3ApiBootstrap.initializers.push(function(sqlite3){ intact. If this object is already paused, this is a no-op. Returns this object. - This function throws if any database handles are active, as the - alternative would be to invoke Undefined Behavior by closing - that file handle out from under the database. Similarly, - automatically closing any database handles opened by this VFS - would invoke Undefined Behavior in downstream code which is - holding those pointers. + This function throws if SQLite has any opened file handles + hosted by this VFS, as the alternative would be to invoke + Undefined Behavior by closing file handles out from under any + the library. Similarly, automatically closing any database + handles opened by this VFS would invoke Undefined Behavior in + downstream code which is holding those pointers. + + If this function throws due to open file handles then it has + no side effects. If the OPFS API throws while closing handles + then the VFS is left in an undefined state. @see isPaused() @see unpauseVfs() */ pauseVfs(){ if(this.#mapS3FileToOFile_.size>0){ - toss("Cannot pause a VFS which has an opened database.") + sqlite3.SQLite3Error.toss( + capi.SQLITE_MISUSE, "Cannot pause VFS", + this.vfsName,"because it has opened files." + ); } if(this.#mapSAHToName.size>0){ capi.sqlite3_vfs_unregister(this.vfsName); @@ -908,7 +908,9 @@ globalThis.sqlite3ApiBootstrap.initializers.push(function(sqlite3){ re-registering it with SQLite. This is a no-op if the VFS is not currently paused. - The returned Promise resolves to this object. + The returned Promise resolves to this object. See + acquireAccessHandles() for how it behaves if it throws due to + SAH acquisition failure. @see isPaused() @see pauseVfs() @@ -1282,6 +1284,41 @@ globalThis.sqlite3ApiBootstrap.initializers.push(function(sqlite3){ Clears all client-defined state of all SAHs and makes all of them available for re-use by the pool. Results are undefined if any such handles are currently in use, e.g. by an sqlite3 db. + + APIs specific to the "pause" capability (added in version 3.49): + + Summary: "pausing" the VFS disassociates it from SQLite and + relinquishes its SAHs so that they may be opened by another + instance of this VFS (running in a separate tab/page or Worker). + "Unpausing" it takes back control, if able. + + - pauseVfs() + + "Pauses" this VFS by unregistering it from SQLite and + relinquishing all open SAHs, leaving the associated files intact. + This enables pages/tabs to coordinate semi-concurrent usage of + this VFS. If this object is already paused, this is a + no-op. Returns this object. Throws if SQLite has any opened file + handles hosted by this VFS. If this function throws due to open + file handles then it has no side effects. If the OPFS API throws + while closing handles then the VFS is left in an undefined state. + + - isPaused() + + Returns true if this VFS is paused, else false. + + - [async] unpauseVfs() + + Restores the VFS to an active state after having called + pauseVfs() on it. This is a no-op if the VFS is not paused. The + returned Promise resolves to this object on success. A rejected + Promise means there was a problem reacquiring the SAH handles + (possibly because they're in use by another instance or have + since been removed). Generically speaking, there is recovery + strategy for that type of error, but if the problem is simply + that the OPFS files are locked, then a later attempt to unpause + it, made after the concurrent instance releases the SAHs, may + recover from the situation. */ sqlite3.installOpfsSAHPoolVfs = async function(options=Object.create(null)){ options = Object.assign(Object.create(null), optionDefaults, (options||{})); diff --git a/ext/wasm/tester1.c-pp.js b/ext/wasm/tester1.c-pp.js index f5fff0cfc4..969fcf067b 100644 --- a/ext/wasm/tester1.c-pp.js +++ b/ext/wasm/tester1.c-pp.js @@ -3155,12 +3155,23 @@ globalThis.sqlite3InitModule = sqlite3InitModule; T.assert(1 === u1.getFileCount()); db = new u2.OpfsSAHPoolDb(dbName); T.assert(1 === u1.getFileCount()) - .mustThrow(()=>u2.pauseVfs(), "Cannot pause VFS with opened db."); + .mustThrowMatching( + ()=>u1.pauseVfs(), + (err)=>{ + return capi.SQLITE_MISUSE===err.resultCode + && /^SQLITE_MISUSE: Cannot pause VFS /.test(err.message); + }, + "Cannot pause VFS with opened db." + ); db.close(); T.assert( u2===u2.pauseVfs() ) .assert( u2.isPaused() ) .assert( 0===capi.sqlite3_vfs_find(u2.vfsName) ) + .mustThrowMatching(()=>new u2.OpfsSAHPoolDb(dbName), + /.+no such vfs: .+/, + "VFS is not available") .assert( u2===await u2.unpauseVfs() ) + .assert( u2===await u1.unpauseVfs(), "unpause is a no-op if the VFS is not paused" ) .assert( 0!==capi.sqlite3_vfs_find(u2.vfsName) ); const fileNames = u1.getFileNames(); T.assert(1 === fileNames.length) diff --git a/manifest b/manifest index 78d794bcbc..6b7707a1c3 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Merge\strunk\sinto\sopfs-sahpool-pause\sbranch. -D 2025-01-31T12:39:07.019 +C Cleanups\sin\sthe\sopfs-sahpool\sVFS\spause/unpause\sfeature\sand\sits\stests. +D 2025-01-31T14:25:38.298 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d @@ -645,7 +645,7 @@ F ext/wasm/api/sqlite3-api-worker1.c-pp.js 5cc22a3c0d52828cb32aad8691488719f47d2 F ext/wasm/api/sqlite3-license-version-header.js 0c807a421f0187e778dc1078f10d2994b915123c1223fe752b60afdcd1263f89 F ext/wasm/api/sqlite3-opfs-async-proxy.js 3774befd97cd1a5e2895c8225a894aad946848c6d9b4028acc988b5d123475af F ext/wasm/api/sqlite3-vfs-helper.c-pp.js 3f828cc66758acb40e9c5b4dcfd87fd478a14c8fb7f0630264e6c7fa0e57515d -F ext/wasm/api/sqlite3-vfs-opfs-sahpool.c-pp.js c8d6f02d834224290009d25876d2ec011cb9b8dc425e3a0761b7e55d9a67c24f +F ext/wasm/api/sqlite3-vfs-opfs-sahpool.c-pp.js 4878cf2a19577093ea82b505f0b052147ca11d27575106c1bb30d2f58efc80a4 F ext/wasm/api/sqlite3-vfs-opfs.c-pp.js 9b86ca2d8276cf919fbc9ba2a10e9786033b64f92c2db844d951804dee6c4b4e F ext/wasm/api/sqlite3-vtab-helper.c-pp.js e809739d71e8b35dfe1b55d24d91f02d04239e6aef7ca1ea92a15a29e704f616 F ext/wasm/api/sqlite3-wasm.c 83f5e9f998e9fa4261eb84e9f092210e3ffe03895119f5ded0429eb34ab9d2be @@ -696,7 +696,7 @@ F ext/wasm/test-opfs-vfs.html 1f2d672f3f3fce810dfd48a8d56914aba22e45c6834e262555 F ext/wasm/test-opfs-vfs.js 1618670e466f424aa289859fe0ec8ded223e42e9e69b5c851f809baaaca1a00c F ext/wasm/tester1-worker.html ebc4b820a128963afce328ecf63ab200bd923309eb939f4110510ab449e9814c F ext/wasm/tester1.c-pp.html 1c1bc78b858af2019e663b1a31e76657b73dc24bede28ca92fbe917c3a972af2 -F ext/wasm/tester1.c-pp.js 7f239383c06078fe67919509f7e1691d3b970a5f6cd4dc4adab71bc8e6cf6fe8 +F ext/wasm/tester1.c-pp.js 0cda9a3180e743f4a42500cbcde1a14da920b34697eb4b05adedac0dab5381de F ext/wasm/tests/opfs/concurrency/index.html 657578a6e9ce1e9b8be951549ed93a6a471f4520a99e5b545928668f4285fb5e F ext/wasm/tests/opfs/concurrency/test.js d08889a5bb6e61937d0b8cbb78c9efbefbf65ad09f510589c779b7cc6a803a88 F ext/wasm/tests/opfs/concurrency/worker.js 0a8c1a3e6ebb38aabbee24f122693f1fb29d599948915c76906681bb7da1d3d2 @@ -2209,8 +2209,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P d651b8da5a84cd54d71f15bd34e4db685674ef73f26f5cc26b7af5321a2ec05e 56b618da9073db8b8d5dafa177a3c9e4c4d927bf512e14b0e6d23937f91ce4cf -R 0de3f6553f08e8afe4528e7b192214df +P 775a547eca2b0b3dbb6c03990236128a095cc34d28caec44b9a5072510c75b63 +R af1dcaea4b1a4f1eb6d1dba2bd937843 U stephan -Z 411d369a110121e7891ed7e96e9dfba9 +Z 577676d1355d687b76945b6366664411 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 49b6367688..77c1116482 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -775a547eca2b0b3dbb6c03990236128a095cc34d28caec44b9a5072510c75b63 +184ba37702f63196deca91d273e798ca895fbb301938e6264bc82815a4e33149 From cb0da053edf42e314af7802e65200d85fce3729e Mon Sep 17 00:00:00 2001 From: stephan Date: Fri, 31 Jan 2025 16:25:18 +0000 Subject: [PATCH 030/194] Add a small test app demonstrating cooperative semi-concurrency of the opfs-sahpool VFS using its un/pauseVfs() APIs. FossilOrigin-Name: 09570c55a23e5af76dd2153a5b28a493f498d7d4a08b0089f3074d0a2c5d3d29 --- ext/wasm/index.html | 4 + ext/wasm/tests/opfs/sahpool/index.html | 31 ++++ .../tests/opfs/sahpool/sahpool-pausing.js | 172 ++++++++++++++++++ ext/wasm/tests/opfs/sahpool/sahpool-worker.js | 89 +++++++++ manifest | 15 +- manifest.uuid | 2 +- 6 files changed, 306 insertions(+), 7 deletions(-) create mode 100644 ext/wasm/tests/opfs/sahpool/index.html create mode 100644 ext/wasm/tests/opfs/sahpool/sahpool-pausing.js create mode 100644 ext/wasm/tests/opfs/sahpool/sahpool-worker.js diff --git a/ext/wasm/index.html b/ext/wasm/index.html index 5d53b62d48..78ff1d91a8 100644 --- a/ext/wasm/index.html +++ b/ext/wasm/index.html @@ -119,6 +119,10 @@
  • OPFS concurrency tests using multiple workers.
    • +
  • OPFS SAHPool cooperative semi-concurrency + demonstrates usage of the OPFS SAHPool VFS's "pause" feature to coordinate + access to a database. +
  • WASMFS-specific tests which require that diff --git a/ext/wasm/tests/opfs/sahpool/index.html b/ext/wasm/tests/opfs/sahpool/index.html new file mode 100644 index 0000000000..f3d07f456a --- /dev/null +++ b/ext/wasm/tests/opfs/sahpool/index.html @@ -0,0 +1,31 @@ + + + + + + + + + sqlite3 tester: OpfsSAHPool Pausing + + +

    + +

    + This page provides a very basic demonstration of + "pausing" and "unpausing" the OPFS SAHPool VFS such that + multiple pages or workers can use it by coordinating which + handler may have it open at any given time. +

    +
    + + +
    +
    + + + + diff --git a/ext/wasm/tests/opfs/sahpool/sahpool-pausing.js b/ext/wasm/tests/opfs/sahpool/sahpool-pausing.js new file mode 100644 index 0000000000..737b2e8611 --- /dev/null +++ b/ext/wasm/tests/opfs/sahpool/sahpool-pausing.js @@ -0,0 +1,172 @@ +/* + 2022-10-12 + + The author disclaims copyright to this source code. In place of a + legal notice, here is a blessing: + + * May you do good and not evil. + * May you find forgiveness for yourself and forgive others. + * May you share freely, never taking more than you give. + + *********************************************************************** + + These tests are specific to the opfs-sahpool VFS and are limited to + demonstrating its pause/unpause capabilities. +*/ +'use strict'; +(function(self){ + let logClass; + + const mapToString = (v)=>{ + switch(typeof v){ + case 'number': case 'string': case 'boolean': + case 'undefined': case 'bigint': + return ''+v; + default: break; + } + if(null===v) return 'null'; + if(v instanceof Error){ + v = { + message: v.message, + stack: v.stack, + errorClass: v.name + }; + } + return JSON.stringify(v,undefined,2); + }; + const normalizeArgs = (args)=>args.map(mapToString); + console.log("Running in the UI thread."); + const logTarget = document.querySelector('#test-output'); + logClass = function(cssClass,...args){ + const ln = document.createElement('div'); + if(cssClass){ + for(const c of (Array.isArray(cssClass) ? cssClass : [cssClass])){ + ln.classList.add(c); + } + } + ln.append(document.createTextNode(normalizeArgs(args).join(' '))); + logTarget.append(ln); + }; + const cbReverse = document.querySelector('#cb-log-reverse'); + //cbReverse.setAttribute('checked','checked'); + const cbReverseKey = 'tester1:cb-log-reverse'; + const cbReverseIt = ()=>{ + logTarget.classList[cbReverse.checked ? 'add' : 'remove']('reverse'); + //localStorage.setItem(cbReverseKey, cbReverse.checked ? 1 : 0); + }; + cbReverse.addEventListener('change', cbReverseIt, true); + /*if(localStorage.getItem(cbReverseKey)){ + cbReverse.checked = !!(+localStorage.getItem(cbReverseKey)); + }*/ + cbReverseIt(); + + const log = (...args)=>{ + //console.log(...args); + logClass('',...args); + } + const warn = (...args)=>{ + console.warn(...args); + logClass('warning',...args); + } + const error = (...args)=>{ + console.error(...args); + logClass('error',...args); + }; + + const toss = (...args)=>{ + error(...args); + throw new Error(args.join(' ')); + }; + + const nextHandlerQueue = []; + + const endOfWork = (passed=true)=>{ + const eH = document.querySelector('#color-target'); + const eT = document.querySelector('title'); + if(passed){ + log("End of work chain. If you made it this far, you win."); + eH.innerText = 'PASS: '+eH.innerText; + eH.classList.add('tests-pass'); + eT.innerText = 'PASS: '+eT.innerText; + }else{ + eH.innerText = 'FAIL: '+eH.innerText; + eH.classList.add('tests-fail'); + eT.innerText = 'FAIL: '+eT.innerText; + } + }; + + const nextHandler = function(workerId,...msg){ + log(workerId,...msg); + (nextHandlerQueue.shift())(); + }; + + const postThen = function(W, msgType, callback){ + nextHandlerQueue.push(callback); + W.postMessage({type:msgType}); + }; + + const runTriangleOfDeath = function(W1, W2){ + postThen(W1, 'vfs-acquire', function(){ + postThen(W1, 'db-init', function(){ + postThen(W1, 'db-query', function(){ + postThen(W1, 'vfs-pause', function(){ + postThen(W2, 'vfs-acquire', function(){ + postThen(W2, 'db-query', function(){ + postThen(W2, 'vfs-remove', endOfWork); + }); + }); + }); + }); + }); + }); + }; + + const runTests = function(){ + log("Running sahpool pausing tests..."); + const wjs = 'sahpool-worker.js?sqlite3.dir=../../../jswasm'; + const W1 = new Worker(wjs+'&workerId=w1'), + W2 = new Worker(wjs+'&workerId=w2'); + W1.workerId = 'w1'; + W2.workerId = 'w2'; + let initCount = 0; + const onmessage = function({data}){ + //log("onmessage:",data); + switch(data.type){ + case 'vfs-acquired': + nextHandler(data.workerId, "VFS acquired"); + break; + case 'vfs-paused': + nextHandler(data.workerId, "VFS paused"); + break; + case 'vfs-unpaused': + nextHandler(data.workerId, 'VFS unpaused'); + break; + case 'vfs-removed': + nextHandler(data.workerId, 'VFS removed'); + break; + case 'db-inited': + nextHandler(data.workerId, 'db initialized'); + break; + case 'query-result': + nextHandler(data.workerId, 'query result', data.payload); + break; + case 'log': + log(data.workerId, ':', ...data.payload); + break; + case 'error': + error(data.workerId, ':', ...data.payload); + endOfWork(false); + break; + case 'initialized': + log(data.workerId, ': Worker initialized',...data.payload); + if( 2===++initCount ){ + runTriangleOfDeath(W1, W2); + } + break; + } + }; + W1.onmessage = W2.onmessage = onmessage; + }; + + runTests(); +})(globalThis); diff --git a/ext/wasm/tests/opfs/sahpool/sahpool-worker.js b/ext/wasm/tests/opfs/sahpool/sahpool-worker.js new file mode 100644 index 0000000000..11815f1bf4 --- /dev/null +++ b/ext/wasm/tests/opfs/sahpool/sahpool-worker.js @@ -0,0 +1,89 @@ +const searchParams = new URL(self.location.href).searchParams; +const workerId = searchParams.get('workerId'); +const wPost = (type,...args)=>postMessage({type, workerId, payload:args}); +const log = (...args)=>wPost('log',...args); +let capi, wasm, S, poolUtil; + +const sahPoolConfig = { + name: 'opfs-sahpool-pausable', + clearOnInit: false, + initialCapacity: 3 +}; + +importScripts(searchParams.get('sqlite3.dir') + '/sqlite3.js'); + +const sqlExec = function(sql){ + const db = new poolUtil.OpfsSAHPoolDb('/my.db'); + try{ + return db.exec(sql); + }finally{ + db.close(); + } +}; + +const clog = console.log.bind(console); +globalThis.onmessage = function({data}){ + clog(workerId+": onmessage:",data); + switch(data.type){ + case 'vfs-acquire': + if( poolUtil ){ + poolUtil.unpauseVfs().then(()=>wPost('vfs-unpaused')); + }else{ + S.installOpfsSAHPoolVfs(sahPoolConfig).then(pu=>{ + poolUtil = pu; + wPost('vfs-acquired'); + }); + } + break; + case 'db-init': + try{ + sqlExec([ + "DROP TABLE IF EXISTS mytable;", + "CREATE TABLE mytable(a);", + "INSERT INTO mytable(a) VALUES(11),(22),(33)" + ]); + wPost('db-inited'); + }catch(e){ + wPost('error',e.message); + } + break; + case 'db-query': { + const rc = sqlExec({ + sql: 'select * from mytable order by a', + rowMode: 'array', + returnValue: 'resultRows' + }); + wPost('query-result',rc); + break; + } + case 'vfs-remove': + poolUtil.removeVfs().then(()=>wPost('vfs-removed')); + break; + case 'vfs-pause': + poolUtil.pauseVfs(); + wPost('vfs-paused'); + break; + } +}; + +const hasOpfs = ()=>{ + return globalThis.FileSystemHandle + && globalThis.FileSystemDirectoryHandle + && globalThis.FileSystemFileHandle + && globalThis.FileSystemFileHandle.prototype.createSyncAccessHandle + && navigator?.storage?.getDirectory; +}; +if( !hasOpfs() ){ + wPost('error',"OPFS not detected"); +}else{ + globalThis.sqlite3InitModule().then(async function(sqlite3){ + S = sqlite3; + capi = S.capi; + wasm = S.wasm; + log("sqlite3 version:",capi.sqlite3_libversion(), + capi.sqlite3_sourceid()); + //return sqlite3.installOpfsSAHPoolVfs(sahPoolConfig).then(pu=>poolUtil=pu); + }).then(()=>{ + wPost('initialized'); + }); +} diff --git a/manifest b/manifest index 6b7707a1c3..66f90cf805 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Cleanups\sin\sthe\sopfs-sahpool\sVFS\spause/unpause\sfeature\sand\sits\stests. -D 2025-01-31T14:25:38.298 +C Add\sa\ssmall\stest\sapp\sdemonstrating\scooperative\ssemi-concurrency\sof\sthe\sopfs-sahpool\sVFS\susing\sits\sun/pauseVfs()\sAPIs. +D 2025-01-31T16:25:18.083 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d @@ -677,7 +677,7 @@ F ext/wasm/fiddle/fiddle-worker.js 850e66fce39b89d59e161d1abac43a181a4caa89ddeea F ext/wasm/fiddle/fiddle.js b444a5646a9aac9f3fc06c53d78af5e1912eb235d69a8e6010723e4eb0e9d4a1 F ext/wasm/fiddle/index.html c79b1741cbeba78f88af0a84cf5ec7de87a909a6a8d10a369b1f4824c66c2088 F ext/wasm/index-dist.html 56132399702b15d70c474c3f1952541e25cb0922942868f70daf188f024b3730 -F ext/wasm/index.html 10ff3ad190aadccb713109fa55a38e5c1f3c2a8cf05cd31783745bab3f184079 +F ext/wasm/index.html fd3b5185ae5c436626c939b40c274110f7a1d0c1d7c50588c1f449f9a038a9d8 F ext/wasm/jaccwabyt/jaccwabyt.js 1264710db3cfbcb6887d95665b7aeba60c1126eaef789ca4cf1a4a17d5bc7f54 F ext/wasm/jaccwabyt/jaccwabyt.md 59a20df389abcc3606eb4eaea7fb7ba14504beb3e345dbea9b99a0618ba3bec8 F ext/wasm/mkwasmbuilds.c d5885bacf2253bed913cdc7eb16b44f9c9e782133e10600652d1a78841c337af @@ -700,6 +700,9 @@ F ext/wasm/tester1.c-pp.js 0cda9a3180e743f4a42500cbcde1a14da920b34697eb4b05adeda F ext/wasm/tests/opfs/concurrency/index.html 657578a6e9ce1e9b8be951549ed93a6a471f4520a99e5b545928668f4285fb5e F ext/wasm/tests/opfs/concurrency/test.js d08889a5bb6e61937d0b8cbb78c9efbefbf65ad09f510589c779b7cc6a803a88 F ext/wasm/tests/opfs/concurrency/worker.js 0a8c1a3e6ebb38aabbee24f122693f1fb29d599948915c76906681bb7da1d3d2 +F ext/wasm/tests/opfs/sahpool/index.html be736567fd92d3ecb9754c145755037cbbd2bca01385e2732294b53f4c842328 +F ext/wasm/tests/opfs/sahpool/sahpool-pausing.js cd64dc1ea91e99a296eafffd806ce84b540b60010bc344f3ed2b95885a6a9900 +F ext/wasm/tests/opfs/sahpool/sahpool-worker.js a3c5ced52d34675cb2b413461c3ed185b1e9aef41eda1f5d22550ff737d057cd F ext/wasm/wasmfs.make 68999f5bd8c489239592d59a420f8c627c99169bbd6fa16a404751f757b9f702 F magic.txt 5ade0bc977aa135e79e3faaea894d5671b26107cc91e70783aa7dc83f22f3ba0 F main.mk 043987843e8365dbaf74dce60c11683b62e2bcfcb3122574c14a0324d37a72f3 @@ -2209,8 +2212,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P 775a547eca2b0b3dbb6c03990236128a095cc34d28caec44b9a5072510c75b63 -R af1dcaea4b1a4f1eb6d1dba2bd937843 +P 184ba37702f63196deca91d273e798ca895fbb301938e6264bc82815a4e33149 +R 811999f4e14055835b34337c582dd5f9 U stephan -Z 577676d1355d687b76945b6366664411 +Z 6cecf310c2a5b350f628459d87398b50 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 77c1116482..56f7745c3d 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -184ba37702f63196deca91d273e798ca895fbb301938e6264bc82815a4e33149 +09570c55a23e5af76dd2153a5b28a493f498d7d4a08b0089f3074d0a2c5d3d29 From a75321d73572305588d51d90a824f260f4b44681 Mon Sep 17 00:00:00 2001 From: stephan Date: Fri, 31 Jan 2025 16:34:52 +0000 Subject: [PATCH 031/194] Add the conventional license header to sahpool-worker.js and correct the date on the header in sahpool-pausing.js. FossilOrigin-Name: f7c3026b0d2e33cc4e3b906810d860b155b1ff714bbe4e1eb9ee392122217efa --- ext/wasm/tests/opfs/sahpool/sahpool-pausing.js | 2 +- ext/wasm/tests/opfs/sahpool/sahpool-worker.js | 15 +++++++++++++++ manifest | 14 +++++++------- manifest.uuid | 2 +- 4 files changed, 24 insertions(+), 9 deletions(-) diff --git a/ext/wasm/tests/opfs/sahpool/sahpool-pausing.js b/ext/wasm/tests/opfs/sahpool/sahpool-pausing.js index 737b2e8611..6a4cfbc9f2 100644 --- a/ext/wasm/tests/opfs/sahpool/sahpool-pausing.js +++ b/ext/wasm/tests/opfs/sahpool/sahpool-pausing.js @@ -1,5 +1,5 @@ /* - 2022-10-12 + 2025-01-31 The author disclaims copyright to this source code. In place of a legal notice, here is a blessing: diff --git a/ext/wasm/tests/opfs/sahpool/sahpool-worker.js b/ext/wasm/tests/opfs/sahpool/sahpool-worker.js index 11815f1bf4..592f159551 100644 --- a/ext/wasm/tests/opfs/sahpool/sahpool-worker.js +++ b/ext/wasm/tests/opfs/sahpool/sahpool-worker.js @@ -1,3 +1,18 @@ +/* + 2025-01-31 + + The author disclaims copyright to this source code. In place of a + legal notice, here is a blessing: + + * May you do good and not evil. + * May you find forgiveness for yourself and forgive others. + * May you share freely, never taking more than you give. + + *********************************************************************** + + This file is part of sahpool-pausing.js's demonstration of the + pause/unpause feature of the opfs-sahpool VFS. +*/ const searchParams = new URL(self.location.href).searchParams; const workerId = searchParams.get('workerId'); const wPost = (type,...args)=>postMessage({type, workerId, payload:args}); diff --git a/manifest b/manifest index 66f90cf805..8ee72d5491 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Add\sa\ssmall\stest\sapp\sdemonstrating\scooperative\ssemi-concurrency\sof\sthe\sopfs-sahpool\sVFS\susing\sits\sun/pauseVfs()\sAPIs. -D 2025-01-31T16:25:18.083 +C Add\sthe\sconventional\slicense\sheader\sto\ssahpool-worker.js\sand\scorrect\sthe\sdate\son\sthe\sheader\sin\ssahpool-pausing.js. +D 2025-01-31T16:34:52.960 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d @@ -701,8 +701,8 @@ F ext/wasm/tests/opfs/concurrency/index.html 657578a6e9ce1e9b8be951549ed93a6a471 F ext/wasm/tests/opfs/concurrency/test.js d08889a5bb6e61937d0b8cbb78c9efbefbf65ad09f510589c779b7cc6a803a88 F ext/wasm/tests/opfs/concurrency/worker.js 0a8c1a3e6ebb38aabbee24f122693f1fb29d599948915c76906681bb7da1d3d2 F ext/wasm/tests/opfs/sahpool/index.html be736567fd92d3ecb9754c145755037cbbd2bca01385e2732294b53f4c842328 -F ext/wasm/tests/opfs/sahpool/sahpool-pausing.js cd64dc1ea91e99a296eafffd806ce84b540b60010bc344f3ed2b95885a6a9900 -F ext/wasm/tests/opfs/sahpool/sahpool-worker.js a3c5ced52d34675cb2b413461c3ed185b1e9aef41eda1f5d22550ff737d057cd +F ext/wasm/tests/opfs/sahpool/sahpool-pausing.js 780952b64dcde74ced1bb74813c0f995b689130f93d0a589995c78a783ec88ac +F ext/wasm/tests/opfs/sahpool/sahpool-worker.js bd25a43fc2ab2d1bafd8f2854ad3943ef673f7c3be03e95ecf1612ff6e8e2a61 F ext/wasm/wasmfs.make 68999f5bd8c489239592d59a420f8c627c99169bbd6fa16a404751f757b9f702 F magic.txt 5ade0bc977aa135e79e3faaea894d5671b26107cc91e70783aa7dc83f22f3ba0 F main.mk 043987843e8365dbaf74dce60c11683b62e2bcfcb3122574c14a0324d37a72f3 @@ -2212,8 +2212,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P 184ba37702f63196deca91d273e798ca895fbb301938e6264bc82815a4e33149 -R 811999f4e14055835b34337c582dd5f9 +P 09570c55a23e5af76dd2153a5b28a493f498d7d4a08b0089f3074d0a2c5d3d29 +R bfbe4fbf82db0e350871f46cfbfa28ef U stephan -Z 6cecf310c2a5b350f628459d87398b50 +Z d959934b83791a6e7fb628c4c0368bb3 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 56f7745c3d..071eb4c7ef 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -09570c55a23e5af76dd2153a5b28a493f498d7d4a08b0089f3074d0a2c5d3d29 +f7c3026b0d2e33cc4e3b906810d860b155b1ff714bbe4e1eb9ee392122217efa From cee760907489075386e27c37fe6c86c835604857 Mon Sep 17 00:00:00 2001 From: stephan Date: Fri, 31 Jan 2025 17:47:47 +0000 Subject: [PATCH 032/194] Minor cleanups in the opfs-sahpool pause/unpause API demo. FossilOrigin-Name: e205cdc468e02eefdeb8d391d921aa2d4d28a8b7b87036d6d937a9928261a413 --- ext/wasm/api/sqlite3-worker1-promiser.c-pp.js | 4 +-- .../tests/opfs/sahpool/sahpool-pausing.js | 27 +++++++++++++------ manifest | 14 +++++----- manifest.uuid | 2 +- 4 files changed, 29 insertions(+), 18 deletions(-) diff --git a/ext/wasm/api/sqlite3-worker1-promiser.c-pp.js b/ext/wasm/api/sqlite3-worker1-promiser.c-pp.js index 55e497ead5..c043fd1486 100644 --- a/ext/wasm/api/sqlite3-worker1-promiser.c-pp.js +++ b/ext/wasm/api/sqlite3-worker1-promiser.c-pp.js @@ -335,8 +335,8 @@ sqlite3Worker1Promiser.v2 = function(config){ /** When built as a module, we export sqlite3Worker1Promiser.v2() instead of sqlite3Worker1Promise() because (A) its interface is more - conventional for ESM usage and (B) the ESM option export option for - this API did not exist until v2 was created, so there's no backwards + conventional for ESM usage and (B) the ESM export option for this + API did not exist until v2 was created, so there's no backwards incompatibility. */ export default sqlite3Worker1Promiser.v2; diff --git a/ext/wasm/tests/opfs/sahpool/sahpool-pausing.js b/ext/wasm/tests/opfs/sahpool/sahpool-pausing.js index 6a4cfbc9f2..1aa98d3cb3 100644 --- a/ext/wasm/tests/opfs/sahpool/sahpool-pausing.js +++ b/ext/wasm/tests/opfs/sahpool/sahpool-pausing.js @@ -12,9 +12,12 @@ These tests are specific to the opfs-sahpool VFS and are limited to demonstrating its pause/unpause capabilities. + + Most of this file is infrastructure for displaying results to the + user. Search for runTests() to find where the work actually starts. */ 'use strict'; -(function(self){ +(function(){ let logClass; const mapToString = (v)=>{ @@ -35,7 +38,6 @@ return JSON.stringify(v,undefined,2); }; const normalizeArgs = (args)=>args.map(mapToString); - console.log("Running in the UI thread."); const logTarget = document.querySelector('#test-output'); logClass = function(cssClass,...args){ const ln = document.createElement('div'); @@ -78,8 +80,6 @@ throw new Error(args.join(' ')); }; - const nextHandlerQueue = []; - const endOfWork = (passed=true)=>{ const eH = document.querySelector('#color-target'); const eT = document.querySelector('title'); @@ -95,6 +95,8 @@ } }; + const nextHandlerQueue = []; + const nextHandler = function(workerId,...msg){ log(workerId,...msg); (nextHandlerQueue.shift())(); @@ -105,7 +107,16 @@ W.postMessage({type:msgType}); }; - const runTriangleOfDeath = function(W1, W2){ + /** + Run a series of operations on an sahpool db spanning two workers. + This would arguably be more legible with Promises, but creating a + Promise-based communication channel for this purpose is left as + an exercise for the reader. An example of such a proxy can be + found in the SQLite source tree: + + https://sqlite.org/src/file/ext/wasm/api/sqlite3-worker1-promiser.c-pp.js + */ + const runPyramidOfDoom = function(W1, W2){ postThen(W1, 'vfs-acquire', function(){ postThen(W1, 'db-init', function(){ postThen(W1, 'db-query', function(){ @@ -122,7 +133,7 @@ }; const runTests = function(){ - log("Running sahpool pausing tests..."); + log("Running opfs-sahpool pausing tests..."); const wjs = 'sahpool-worker.js?sqlite3.dir=../../../jswasm'; const W1 = new Worker(wjs+'&workerId=w1'), W2 = new Worker(wjs+'&workerId=w2'); @@ -160,7 +171,7 @@ case 'initialized': log(data.workerId, ': Worker initialized',...data.payload); if( 2===++initCount ){ - runTriangleOfDeath(W1, W2); + runPyramidOfDoom(W1, W2); } break; } @@ -169,4 +180,4 @@ }; runTests(); -})(globalThis); +})(); diff --git a/manifest b/manifest index 8ee72d5491..eef00b8912 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Add\sthe\sconventional\slicense\sheader\sto\ssahpool-worker.js\sand\scorrect\sthe\sdate\son\sthe\sheader\sin\ssahpool-pausing.js. -D 2025-01-31T16:34:52.960 +C Minor\scleanups\sin\sthe\sopfs-sahpool\spause/unpause\sAPI\sdemo. +D 2025-01-31T17:47:47.173 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d @@ -649,7 +649,7 @@ F ext/wasm/api/sqlite3-vfs-opfs-sahpool.c-pp.js 4878cf2a19577093ea82b505f0b05214 F ext/wasm/api/sqlite3-vfs-opfs.c-pp.js 9b86ca2d8276cf919fbc9ba2a10e9786033b64f92c2db844d951804dee6c4b4e F ext/wasm/api/sqlite3-vtab-helper.c-pp.js e809739d71e8b35dfe1b55d24d91f02d04239e6aef7ca1ea92a15a29e704f616 F ext/wasm/api/sqlite3-wasm.c 83f5e9f998e9fa4261eb84e9f092210e3ffe03895119f5ded0429eb34ab9d2be -F ext/wasm/api/sqlite3-worker1-promiser.c-pp.js 46f303ba8ddd1b2f0a391798837beddfa72e8c897038c8047eda49ce7d5ed46b +F ext/wasm/api/sqlite3-worker1-promiser.c-pp.js bc65debfe43b81fc39fb25c40ad0cc1946bd82580fbf644351107b544d6177ee F ext/wasm/api/sqlite3-worker1.c-pp.js 5e8706c2c4af2a57fbcdc02f4e7ef79869971bc21bb8ede777687786ce1c92d5 F ext/wasm/batch-runner-sahpool.html e9a38fdeb36a13eac7b50241dfe7ae066fe3f51f5c0b0151e7baee5fce0d07a7 F ext/wasm/batch-runner-sahpool.js 54a3ac228e6c4703fe72fb65c897e19156263a51fe9b7e21d2834a45e876aabd @@ -701,7 +701,7 @@ F ext/wasm/tests/opfs/concurrency/index.html 657578a6e9ce1e9b8be951549ed93a6a471 F ext/wasm/tests/opfs/concurrency/test.js d08889a5bb6e61937d0b8cbb78c9efbefbf65ad09f510589c779b7cc6a803a88 F ext/wasm/tests/opfs/concurrency/worker.js 0a8c1a3e6ebb38aabbee24f122693f1fb29d599948915c76906681bb7da1d3d2 F ext/wasm/tests/opfs/sahpool/index.html be736567fd92d3ecb9754c145755037cbbd2bca01385e2732294b53f4c842328 -F ext/wasm/tests/opfs/sahpool/sahpool-pausing.js 780952b64dcde74ced1bb74813c0f995b689130f93d0a589995c78a783ec88ac +F ext/wasm/tests/opfs/sahpool/sahpool-pausing.js f264925cfc82155de38cecb3d204c36e0f6991460fff0cb7c15079454679a4e2 F ext/wasm/tests/opfs/sahpool/sahpool-worker.js bd25a43fc2ab2d1bafd8f2854ad3943ef673f7c3be03e95ecf1612ff6e8e2a61 F ext/wasm/wasmfs.make 68999f5bd8c489239592d59a420f8c627c99169bbd6fa16a404751f757b9f702 F magic.txt 5ade0bc977aa135e79e3faaea894d5671b26107cc91e70783aa7dc83f22f3ba0 @@ -2212,8 +2212,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P 09570c55a23e5af76dd2153a5b28a493f498d7d4a08b0089f3074d0a2c5d3d29 -R bfbe4fbf82db0e350871f46cfbfa28ef +P f7c3026b0d2e33cc4e3b906810d860b155b1ff714bbe4e1eb9ee392122217efa +R d3225c8561b09d79116dc329da2feefd U stephan -Z d959934b83791a6e7fb628c4c0368bb3 +Z 1cb85d7c9b9ce473d92184ec221c275c # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 071eb4c7ef..abe785492f 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -f7c3026b0d2e33cc4e3b906810d860b155b1ff714bbe4e1eb9ee392122217efa +e205cdc468e02eefdeb8d391d921aa2d4d28a8b7b87036d6d937a9928261a413 From 3cd34ab981ebed34bce66c19bb9144e40c6e9204 Mon Sep 17 00:00:00 2001 From: stephan Date: Mon, 3 Feb 2025 17:34:12 +0000 Subject: [PATCH 033/194] Rework [76c8435a] to eliminate automatic JS-to-WASM function conversions of sqlite3_set_auxdata() destructors because it can leads to leaks on every call of a UDF. This feature never worked before [76c8435a] but fixing it was ill-conceived because of the memory leakage it introduces. WASM function pointers can still be used as destructors in this context. FossilOrigin-Name: 3fb993af0caf041da934cea29c039b27c468be0b75bce1537a6425767cf9bf8d --- ext/wasm/api/sqlite3-api-glue.c-pp.js | 37 +++++++++++++++++---------- ext/wasm/tester1.c-pp.js | 6 ++--- manifest | 14 +++++----- manifest.uuid | 2 +- 4 files changed, 35 insertions(+), 24 deletions(-) diff --git a/ext/wasm/api/sqlite3-api-glue.c-pp.js b/ext/wasm/api/sqlite3-api-glue.c-pp.js index bcaff7243d..a40b832824 100644 --- a/ext/wasm/api/sqlite3-api-glue.c-pp.js +++ b/ext/wasm/api/sqlite3-api-glue.c-pp.js @@ -229,14 +229,15 @@ globalThis.sqlite3ApiBootstrap.initializers.push(function(sqlite3){ '*' ]], /** - 2025-02-03: We do not have a way to automatically clean up - destructors which are automatically converted from JS functions - via the final argument to sqlite3_set_auxdata(). Because of - that, it is strongly recommended that clients use - wasm.installFunction() to create such callbacks, then pass that - pointer to sqlite3_set_auxdata(). Relying on automated - conversions here will lead to leaks of JS/WASM proxy functions - because sqlite3_set_auxdata() is frequently called in UDFs. + We do not have a way to automatically clean up destructors + which are automatically converted from JS functions via the + final argument to sqlite3_set_auxdata(). Because of that, + automatic function conversion is not supported for this + function. Clients should use wasm.installFunction() to create + such callbacks, then pass that pointer to + sqlite3_set_auxdata(). Relying on automated conversions here + would lead to leaks of JS/WASM proxy functions because + sqlite3_set_auxdata() is frequently called in UDFs. The sqlite3.oo1.DB class's onclose handlers can be used for this purpose. For example: @@ -252,14 +253,24 @@ globalThis.sqlite3ApiBootstrap.initializers.push(function(sqlite3){ Then pass pAuxDtor as the final argument to appropriate sqlite3_set_auxdata() calls. + + Note that versions prior to 3.49.0 ostensibly had automatic + function conversion here but a typo prevented it from + working. Rather than fix it, it was removed because testing the + fix brought the huge potential for memory leaks to the + forefront. */ ["sqlite3_set_auxdata", undefined, [ "sqlite3_context*", "int", "*", - new wasm.xWrap.FuncPtrAdapter({ - name: 'xDestroyAuxData', - signature: 'v(p)', - contextKey: (argv, argIndex)=>argv[0/* sqlite3_context* */] - }) + true + ? "*" + : new wasm.xWrap.FuncPtrAdapter({ + /* If we can find a way to automate their cleanup, JS functions can + be auto-converted with this. */ + name: 'xDestroyAuxData', + signature: 'v(p)', + contextKey: (argv, argIndex)=>argv[0/* sqlite3_context* */] + }) ]], ["sqlite3_shutdown", undefined], ["sqlite3_sourceid", "string"], diff --git a/ext/wasm/tester1.c-pp.js b/ext/wasm/tester1.c-pp.js index 880edcec1d..9038d68328 100644 --- a/ext/wasm/tester1.c-pp.js +++ b/ext/wasm/tester1.c-pp.js @@ -3469,9 +3469,9 @@ globalThis.sqlite3InitModule = sqlite3InitModule; We do not currently an automated way to clean up auxdata finalizer functions (the 4th argument to sqlite3_set_auxdata()) which get automatically - converted from JS to WASM. Because of that, relying - on automated conversions for those is not - recommended. Instead, follow the pattern show in + converted from JS to WASM. Because of that, enabling + automated conversions here would lead to leaks more + often than not. Instead, follow the pattern show in this function: use wasm.installFunction() to create the function, then pass the resulting function pointer this function, and cleanup (at some point) diff --git a/manifest b/manifest index 54fc8aa8ae..a55702d8dd 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Add\sa\smore\scomplete\stest\sfor\s[76c8435a]\sand\sadd\ssome\scommentary\sabout\s(A)\sthe\sinability\sto\sautomatically\sclean\sup\sautomatically-generated\sWASM\sproxy\sfunctions\sfor\ssqlite3_set_auxdata()\sdestructors\sand\s(B)\show\sto\sdeal\swith\s(A)\sto\savoid\sleaking\sWASM\sproxy\sfunctions. -D 2025-02-03T14:55:56.185 +C Rework\s[76c8435a]\sto\seliminate\sautomatic\sJS-to-WASM\sfunction\sconversions\sof\ssqlite3_set_auxdata()\sdestructors\sbecause\sit\scan\sleads\sto\sleaks\son\severy\scall\sof\sa\sUDF.\sThis\sfeature\snever\sworked\sbefore\s[76c8435a]\sbut\sfixing\sit\swas\sill-conceived\sbecause\sof\sthe\smemory\sleakage\sit\sintroduces.\sWASM\sfunction\spointers\scan\sstill\sbe\sused\sas\sdestructors\sin\sthis\scontext. +D 2025-02-03T17:34:12.962 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d @@ -638,7 +638,7 @@ F ext/wasm/api/post-js-footer.js 365405929f41ca0e6d389ed8a8da3f3c93e11d3ef43a90a F ext/wasm/api/post-js-header.js 54b2b4294501b3866245cc94315a16f5424c0e87729d0fb610fba151593c6d26 F ext/wasm/api/pre-js.c-pp.js a614a2c82b12c4d96d8e3ba77330329efc53c4d56a8a7e60ade900f341866cfb F ext/wasm/api/sqlite3-api-cleanup.js 3ac1786e461ada63033143be8c3b00b26b939540661f3e839515bb92f2e35359 -F ext/wasm/api/sqlite3-api-glue.c-pp.js 6e2f2eaf681e342fcb047fcdd01d6e3c1b466fb9b45c1acc38676164a8b60f45 +F ext/wasm/api/sqlite3-api-glue.c-pp.js 5c0209e6a28164b4c2c1a34b0bb4aee3b7b1a264988d7e71fac08b8ede5b7ae3 F ext/wasm/api/sqlite3-api-oo1.c-pp.js f3a8e2004c6625d17946c11f2fb32008be78bc5207bf746fc77d59848813225f F ext/wasm/api/sqlite3-api-prologue.js 5ff913355b3144f1c9719d0406667fa6e13eb813c71ed7ce29440e2e65363e82 F ext/wasm/api/sqlite3-api-worker1.c-pp.js 5cc22a3c0d52828cb32aad8691488719f47d27567e63e8bc8b832d74371c352d @@ -696,7 +696,7 @@ F ext/wasm/test-opfs-vfs.html 1f2d672f3f3fce810dfd48a8d56914aba22e45c6834e262555 F ext/wasm/test-opfs-vfs.js 1618670e466f424aa289859fe0ec8ded223e42e9e69b5c851f809baaaca1a00c F ext/wasm/tester1-worker.html ebc4b820a128963afce328ecf63ab200bd923309eb939f4110510ab449e9814c F ext/wasm/tester1.c-pp.html 1c1bc78b858af2019e663b1a31e76657b73dc24bede28ca92fbe917c3a972af2 -F ext/wasm/tester1.c-pp.js fb8d0761daaa69bd40c8253cc2d6c8c37ada97e1751b7f07af7369842ba2aeae +F ext/wasm/tester1.c-pp.js 45000532cf83f23a52b31581c1db44bfb82e383b1b68703ae4d3d838de3a833e F ext/wasm/tests/opfs/concurrency/index.html 657578a6e9ce1e9b8be951549ed93a6a471f4520a99e5b545928668f4285fb5e F ext/wasm/tests/opfs/concurrency/test.js d08889a5bb6e61937d0b8cbb78c9efbefbf65ad09f510589c779b7cc6a803a88 F ext/wasm/tests/opfs/concurrency/worker.js 0a8c1a3e6ebb38aabbee24f122693f1fb29d599948915c76906681bb7da1d3d2 @@ -2209,8 +2209,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P 91ef45fc2902e46813366ec6b8317209f39f10e4a23c3808e33aceedab9da6c7 -R f2c90877762eddda2efda339cfb2ee34 +P d693c2dddbd10a2e0b77893b04b11502e30b768f1b06814105f7f35172845fb9 +R bdcc5096cc30e3d83fdf5d66602909e7 U stephan -Z 6cfffa02c18a4e52a298c977368cc8d7 +Z fd720e9f1383b7c5da4643ab36634ed7 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index c7225ebda1..01d5aa1d3c 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -d693c2dddbd10a2e0b77893b04b11502e30b768f1b06814105f7f35172845fb9 +3fb993af0caf041da934cea29c039b27c468be0b75bce1537a6425767cf9bf8d From c6281e48933587fe9dcc6e023babea4b7d4bf13c Mon Sep 17 00:00:00 2001 From: drh <> Date: Mon, 3 Feb 2025 17:45:41 +0000 Subject: [PATCH 034/194] New test case for test/fuzzdata8.db FossilOrigin-Name: 8a882f976e22100b91c7ca4119123f16ad5f03311f0a6dc17449bcdcff29618c --- manifest | 18 +++++++++--------- manifest.uuid | 2 +- test/fuzzdata8.db | Bin 4239360 -> 4241408 bytes 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/manifest b/manifest index 809b43bc20..4d31836afa 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Version\s3.48.0 -D 2025-01-14T11:05:00.186 +C New\stest\scase\sfor\stest/fuzzdata8.db +D 2025-02-03T17:45:41.279 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d @@ -1283,7 +1283,7 @@ F test/fuzzdata4.db b502c7d5498261715812dd8b3c2005bad08b3a26e6489414bd13926cd3e4 F test/fuzzdata5.db e35f64af17ec48926481cfaf3b3855e436bd40d1cfe2d59a9474cb4b748a52a5 F test/fuzzdata6.db b8725a5f5cf7a3b7241a9038e57ca7e7cc8c3f4d86b44bd770617bda245ab2b0 F test/fuzzdata7.db 0166b56fd7a6b9636a1d60ef0a060f86ddaecf99400a666bb6e5bbd7199ad1f2 -F test/fuzzdata8.db 4a53b6d077c6a5c23b609d8d3ac66996fa55ba3f8d02f9b6efdd0214a767a35a +F test/fuzzdata8.db deb6533e6dfdb5841eb6a56607bdb74986a57f5739f3975ea542a1f7e7e24d97 F test/fuzzer1.test 3d4c4b7e547aba5e5511a2991e3e3d07166cfbb8 F test/fuzzer2.test a85ef814ce071293bce1ad8dffa217cbbaad4c14 F test/fuzzerfault.test f64c4aef4c9e9edf1d6dc0d3f1e65dcc81e67c996403c88d14f09b74807a42bc @@ -2205,11 +2205,11 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P 315079b150b47e013e2cde4985bc39d24e0f6f6c6e60f9383fb8ea4ea897c67a -R 0ed0cfcc7f2bc831da5d62a3490571ed -T +sym-major-relase * -T +sym-relase * -T +sym-version-3.48.0 * +P d2fe6b05f38d9d7cd78c5d252e99ac59f1aea071d669830c1ffe4e8966e84010 +R 02fce09966e6e21a0a59cdeb994f84e8 +T *branch * fuzz-data +T *sym-fuzz-data * +T -sym-trunk * U drh -Z cc77aac977f98c5521d75f4212754ff8 +Z b5d75fe3951f12b9fb4038728f5d0116 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 582262f689..8024622a5d 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -d2fe6b05f38d9d7cd78c5d252e99ac59f1aea071d669830c1ffe4e8966e84010 +8a882f976e22100b91c7ca4119123f16ad5f03311f0a6dc17449bcdcff29618c diff --git a/test/fuzzdata8.db b/test/fuzzdata8.db index 3e34180071ede5e023878d8528fe65a8fd9d24b9..f03f3f27191ee07a1014d1babeca93242543de8f 100644 GIT binary patch delta 63340 zcmaHT30#%c^Y=Z^ayPcS?;D6Bh;VU55d>3n7uQ@7+;_pH)KuVJa?1on88sJ3E0L7H|NFjvKF_Gna+W#g%$fPl_uRZXAD36}5hkVbFL|+$@2YhKH_xd`M+~!N6R$KgbnM|(olk&tT zeo~(J$ZsII)<+5um-|Qo;!D0oBp>LC)E67Fa1eSd%f^vaj1>8h3f5m2QF(I)NTxI8my*A zBNHZ095>qA8gkc|n!&Lpp{mw%XHAPnk43YldfB)|?4r=1iD5XUg0u z&rk3qM8%GuFgI(;^yH|Svt~|+iX8{qd!c&RvPN`pp3zXeRq&`< z?C2dG727I0N!_hq*Ch48Zaw>T?KaFaHz7$qu0>l&Z9TwkD4=K+`QQnT8^JEeZpL-DIprtu7$;saI}Q>(lL- z!7<$j_U}tYd(sAZ=Ewg1j|HCRdUPAu%`-nPD|ta&mM5)WSLxrLp8cAG_H~^V&YcZa zvn)tE85#l6{j?#lXF*VReSDi}PoTJQN$SR8TSL~aWCx6EqHO}N#z%)jN!PH>rN9M2 z=I&-@;J0!nU~}vin%*)QWUbRALFPJ5B=bV`I*k!h?OHi}*V|};V>c5;7&FzN2S*>H z8GhX5v_i!aoq^sgU!pU@k=&%TCRt<0#mrye84?v}aMZl)>UijNBPs-1&hW$nS1QK-$0+PKcQlutGX%rUVWDQIe<{>qkBauhddAP2F=IijXJ*!n z35`7*KQC)~EEK;QYK0c1ycx#rHG*yc4a0sqI7y*y1Ae zuyJF!&Ln9$HtM&QQL!yOb8@CnnM?C!ZWeg;O zEsjS$7=>nXb9usez<0;GWcb?j}v62Q2UZQ70V(tV;ECcMrx`B zQ4nOW$e$C$a>iji(aqhiGs<| zo2YR!m2R`cCknFnJ4rc zN{XVHWYCSv=K2(ZtPryDjj7_IGSh!>P}PG)k9~7iXJJUu+^*4;lg2>6+E*;`6$gi964UIjF+|< z2jo9w4)kPdwkVkjk4@I3^2|~>U2{)hL6V+FmDF_(3Z^$buQ+^aLAJ3I3@Fn~zz=gY z9XaNzoU75P#4tg&b%~^`iOOb0xxP?A_8K&VYlhReR;W6!4-F=@OB-_J^1;3k&@RzT z6`QP_?+eDfC7N8u!YlJMyug~4Hr0NGR|_;v6)Xz!omw}vpP~st?<$QgSkwrzEg4ef za{@(T&3a8d&ze_m()1Aoy&$^*)$>DAp{Pu=K#W`af=`E` z+UHxsF$Yb?0oyeP6f7PFsMPCWOG}3WHhTCWkeUz_3T0=Uv~JAmK5!vY?S@5hjvT17 zDl~9zq%{Jado|xM=EbrC>re*QRyox$E!d&Q7xrsbaV!Dyms^t|wXLHgzWBCgInP=_ z{wk{tUGHjc^Q<*o=&Q4$^ROmAm>F^FDNO^XYPWoZ&p>NCG0;lZrt+-DrD7&@U)0ob ztbOGrO$R}=3bKPeBo(ZL=_!g#X-+-!fyZY-?-k86OqKMq%x9(*AvC`7BvSh|q;}HS zrT03}MMLM(HpkdH%@;gNhVoj?qsrSFo@Xh*p6QT@9e>t*&cTyrx^URsRM!zM{}I_6 z>b}=BVV$9Kl_aoL?gg86LT# zSCEsMrmf;wx6%=6ntX!x`w-C~$cn}XIR7D;a`oCg*1gi8wWPJpD0)k$hpJ1w3x>4U?h^Zxo(4jE zk~SQUmL;b^{VZ1qW+!Shl`I@NoUL`~b zvUef;ttNriSV7aDkH?IG+H%GQmk!pJh)u{gjgsu%K)gFxYvtJp6ozS=DaEFO>{JZY z>d4a1%GBOqs!=5_U!)*=Ben7Ex5jD*F;Vi>M#J^Cx_#h2qm9LDX3|$5lkJoVW8u2q=7!E@TQ#Kr z6dVM3FIsb@V%BkN98y6hhPK68lZrLNgr(Z^jAfQC*M1~M39?nsOO5SC$9?kH5X*-1B(%DYqYnSIFTxv0_W@W*I?oi^WsF%Jck$@ zE}a`w&uWkJY(6w}>0p2h&vZzDuq0gzi0|5A9BfX~rJ?lCuh+_%GVgV*FJ6$H2JM36Xeeu~^E4Jqok-_Ia=V3mOjv2lU{Ex~nFuvk z!kS^#FWNU1VuB!B*+%O2FsP^t6Y=A}v|Hq2Ye7~sxbbdHYh94EN4~T=+}BESA_5kh zT2B652Td4Wo0;rnI7Y53W1^qlTZ%=ew34+@>Bw3vgX>&~5o+{e2xRZ%ESM6k`;Zrx zdlM#ffa0EUeIR%o_cLrY>Jl+etMhYg1zZnnWe3kB?tJN>7D`xR<8Hv^$y^nJNjF_& zFXR4GS{;L)SG5_CcRlG4#=CT%F}4cQdg%(mb4Tleejk##Ido1t9$n$O+Z=lZt4vK( z$+jiy6qx=At)|jHB3}bfl2@D>M?=Tm#A8Ll;lW5&9O0g}?>0VD&5DcSR z>vYPZ9dmtc=s}~S5Ksc?Cth4h9WRFKt#x*Ex6$3=*&3)lt4+eriMkU!D}j7<)0UXf zN%slQ)`B)#7YV6hO;wnXs{2I2N+C2zHylUz(7nMkfchocc2M=YNx+moq$>)S%l+zb zh~KLYhO(7vIkr#NeXkJP3$k+E)Aq@=BipqZO+KHn@r@C_c7p6&;=j*e>4M}?EIXxr z$VuDEI=Wtk!e4?tc&UqoJ{RPQrGwGtuX6#t%#c@=q7P&3*;=& zHo>ULx@Jn&5&LE9T5+oK70>%zX9j|0>LfjAPY2f`tw-YU|=xFurfUu8r={UGZw~uE# z!FgI&iW}GJrYP8Mtp8P~VNf=+qZ~5NsJ+;0v+g~Py#@6TX)-0>QY#^|MCXMi@92W? z^DGmna&SW*_{znHk-BTOj`+D6Zth%lnz;N+iosWsTs1Fqo{+Vt7 z4yn-X<=K8H|4!EmhhNgY%kcg?x*|DCgWSWqsp7#coG%scAJ%Dkwy&~EM=sVo5Vl&H zSSM&=sVlt`I!tKWdi?mdkb6$;0NWbfB7FUnPOB8V2(rTg`#uZmw}b_hX}~_Ux`Ukf zHZ|Zq@cv4BzU?#J9iF`pOTN<$ks2^j$)3TgI$dX8e3#xj0%gDG-oRbAbi;Xe6wCh5 zU1R^PhcJw}s|%Nl-DvCrgPsq0`*=D0)Agy!s?8=}SMtRn>m5E7Xq9yN?>8o4=8w9q zOgv2WRYSuO-RJn#&$?)yeE>)6)NX9@yRMFB$H8$yJqh}LrHg`%<BgMOUp0M(FjgvyUnb`u2j@gWO#K(vtNH zvC^XN$+J_H4n3Lup5&oUe0slqz`;IU8L2-auwHnyxju~-&r&llfF?%Y9IA%s8_?NO z|ACVA#=5q8H^p$ScT6+02cyXw{9c0_}&tiV6-p8viX2p(;9hZ`v z&H3$ImtLRc>nq641o~K7!W$vuaZ?qP z7MLgi4cE`b=LYI`F!58W=S$d7V9Jp0_QAb_^+OcwYp5wOMIqhk$Z*1F{T7a024_b- zjdZ4du9~I8`KkJ;;?)hUef=SMn*Ia!RpoR&&9OQZvh`1Rb{&Pe(%&~wn6FP$2?L}} zCE%xNuIU{>euEY(^YuMB@ftPYHiWO!H^Z0${g*uZ25ML7Q=#H~*z=G&Emp*1%k|Bb z!a$mppgpQefb32B4mhM(zl#%Z(Z_dSRGI!c9Jy9srw|8|&qN!}RedIwZPNE=s_)mz ze1j+k6#_SbZr+5Xt@;zIg#ODOr zF0!Im^^NNZ&!5-FF;IWSH-*#??!1~lZ=ma!mM!tZ<*+Cwl@bN}1~DU?{o39JH-D(# zsT9epdm}?CWgb#g)tRxMD{J&i1U4LVKhx*&?6=BG`X-_D?_uIi^M|6JL^H{$6O&%2_JfQsv3BBWo_?-T!^Ry>00vsQ{ZrImPWlRgnM z>-5`#*b^w8uAuf#GVH)LPJ@-hyZ7}L#)&dK>M?ZT;llf-=i%^A`tF>_Fg%~XM#02I zMIzXL(|^Y}WHB*+GJNufUf?K(&+6Qag4qc%bsY9zMeCLPG*N)!V~%N<9T8JRFERtY zDB{sJQrT5EqTiQZk>k-s>HkkU8g{~iAcKJ^V5`aygK@!zi#$_8PPAY_hsI!1$w!N_ zd3sqS}-I$(D#7V z5A?I4XgeQ<=RAgXJPU!WPZX&TcF5FD>StFx8fl<_C=|N?rhgy3#+b7l)I8KbFEum_ z(_&+e@$0gq%;0&VZzkQ-V4623f`^)-nA1?-+MrizJ0!GipU|Nl>Mi!LK%&QPdei{8)->PNYLhB%X9RcV918Dw7LX;)lANYs*RybX$$ zD1ss7Grk|>_BL1{^|9f3^o}t!5yebFwwJ;J>KxKg-e*`f(Lf8pRyo;V5QMRUYy(_Z z5`t1xttVJ&ZHgUCsQ(7Cduxjzb4{oSWmc0K>NA>(&~m0BP3eAF^kqrtQMe~86+CNG zdO!WZC=HdfGTT75EF7|ild8VXx9Cf|8$N@5)0!$v>N<&#cZF|<74r;XN;V#<78?lA zDCy=Khw)1cHB9tS36Ut|8OZ!KMWI0YyBV+sE*zUKH$*DM2^9R$hIdsz9N#Q5jN)1J zziSSguQkY(Y%0cYGCX2pe39HY1-x6Rik8b?^i77XTPR%+yIk#?L{1BYZ!`t=#bB7X z)nHe)DC*{$NbX!?zXD$6gMraXMH??UbYk<$G6T6agc8>@Gs5mo1`TW~Fc~m;hv6dy zlW1&=885dksd0ufA`XEV4EzR2hnb#A(!|L@4(eyTX+-h6vWW@~okYAWo+p zlfpKiaTvLCdPqHB4aKS&1Njf_sI?tn_0W#(G3hhIDV}wN0o~;>=pEjqh6ByT@ClIl zbGQK(e%L%7>fdfc22Ca=p>SDJH34@wI@M#@k*N6$y?dJz6p=Tr89^g5F&P@Z=@eJm zyNLn2-!dHGLsGo$+D<v0dwS3GG`$tq@^=V+Bq6!oFoqT;OTm$qd%7ltFMgIzol- ze`lcGzB4rBhdu{2_c=MFFLb#v@1DUg!6F;WEJJZby6?svmXo;?G3V-=k+^^t)>zpju!Q4s@WnXaV3VtQw@aU##U zLG2t1sp*U4YH95`xsjc#~((q0mQqZ5WK%$aTkF z>C^{dP5_F%O3no7DpFF@==IO|W|Ichl0Kx6Kpb%~-Iqfu+6_4!3Adpan`8EHV<9J@ zLE=bYs5ijl)5gb8-$GPD*$2k?2&0YDIW`LG#u_~gVka3#Vs4hPK+VR${%;eF5dWuT zF{B2W4ny`WOBpUWZ(PP;!7SrSmI=r18!3XzHc|wagX03cVW{fbVQKAfWYFy0NM9A_q`Huks8ju!{xX%?2&$cq&#CKL0 z`*Ca%6x}pV!&$40Yk4*qb2=E69Q^R2TLB%9$Aq9~jqxU9Q$V|(%Y^Lv+&=JZ;0C~m zG@6fNwz$=>cNf-A{zsE2IQ(aZG-1=>s{~`pf48PL zC$)u)wM?7=U$r&Hf#;TSG}f;&PT?SBf!hlY6DdtpR%pxwjnQoZN0G5-D7`(iwKtKH z842Dt>XPCQ9ME~3I}YC~GMWh@(>4i)!h2j__@Q-(0x#?`wh>u2T%RHsKr`C747XMo ze^LoA2(s53S6X_tu~h(f2BQ!SIGPfv86H{NCh4bcQzhBSTB7@n;)wwJ)5b$2aAxb`#SECqY;#%)o^$j8Qp(099V-Uwg`nfX{jtOshvp%WR)k~pH$NMiAaHyB-5t^3qk5n`bC%*X`-!Q zHMW~*I?eEWw5ct}3ZdOp(+K){xxYyE@jAN#ow)3nE%1@cfpkg`y zAuJr-kpS4Gd=O-`HoYck=rMFUVKPIfIi{1W9Lvv|!dPj%Ne7SHnL5LnEh*%zoK*{W zcb+LNNF;#!RfjYY06deU$2AXP)a-OSYY~?XK%puvXo``@^aIBo&cYU zaeCVFR+(ta+kyL*n_4occr7IqI~SW`l>%iJKY^@UCR$sR)`ABcOfllF-M#!gx;C1w zGjThWz8kc+O_`XHW!}O;-cEB7tl4VHAspz!OBNSouP}@7)fe(m=Ln3wEHiAMb_{;U+uO&ETWpTqZvl`Yqx6V{U^!nVJ`A(!h{I zroHSSF8W#Dfy3mZrjHnV8*(O@3Z)6$iUZGdlL$#uO}Vf+#-xW)$4ze%kd!mcR0!u= znnp?^cY^|-lcv_J5>pdQ$qdszHhsV`q#T$uInGLx<6TJYV5-IsYfQUT6xL;bWh!Li zKGN4A$m(Q%6IOS(jDw51<%6aj9dgUl4TrwZ$@Z?=nC&nL3Y=ilC z%@Y|;|G@+ttAd=}sy+l?n+OOY5NK%xc~n1}$fNoIuE#JBM*ePEpk@l(!kM#}c!Uc4 z5E81*v!MnRu~5{@v=e)a=65;v5r)T^$1->&)szC+B@qg!nb%e>g~tkfS7k1jiaHZNhPq56*b7#_En zDZ_dOG+uKec5;|c^6V^xuh%xkX}_2<8B)rE0OVD@bkQ)XZD=SIJ!#e+7X41+xAnfc z8C3mlg33rUMJDGV?Y1czQo5PCfH&Rp7Ni@^VVKn2RL#J9*)#_-T9{vF7vOwvQ!BW# z%Nz#1lTFsFIsC5Py|c(!Skh13FrozvWmB)Sk4&L*XNHA-s}g849z~Oyu`x znC-ByJJCSKEQmDW`~-8kN}xRO@y2i~J;}UJJV*Wg6!H~8F|cn#j0RIWnHMX?AVK!l zTuDgWz4kfgj5WVZJN{1d25jET{54}=Ku)=78zD~?51#B}4pWK2ltOEV z^kpcMR*{}b3cg6!S5PgOLFsV8PFGQY;NTUa*OvX{dHKJx%kg1b=B0;|@WP2{T8nyXR1 z()<@=-$HR`Qv$YKWzJMe`R^l%QcvF_H2s)79qQ9*xPq?AcYt@CSt5{$x9PeISM_EW zjGplK^p;9}hG*YH?f2$*NPo>_#FRLy2jhP*_oJEqzeZZb#I5H0qDVROL#F>x-zlk< zJ9OO#_NDm%JkXm%{=2HJWOZfY17KIoW1+5x#s7D0PxhDvj<0_<8m>E9M8H>B9u1CE zXDN(Cw9o%&LzL8pAL#lCG)Lt_q%~&dF#D*v zgzzv(Gn(`9r7H6hp8Wz@?6%KtT<&JM0gt1jxeA4pK}Ij&a`3dcc_}7jl-hFW;w(Dcg$K23STw1 zDxG3}sq!;vg+4@0bIW56xv$NPu|FZ_xVaF$lg&Fh>~zh%Tp>`t|Lw+|w{E`qXQ^9+ zzKM^q{8#fBTEt(QYoKVNB^oP+n+1lM-+w0uNEB&@1$5Lk0hcXScoyBfC1wyyZHGYdAtBjP|yq-zjP_Lirr|5kDFsWm+OEnhSW@Yjq z$W6D5MzU*dIY>QjnFn5#JVc8NF8rs@v|_ zWjxs1TfQSauJ{l0Ye!(nAdOQ9$bJE2lSSW}Tk?u9@f46jc1+XNW~j8WqfZBL^h z*U)7|t>H`fjNcCb$-BPKKIT%T}qDCJMsXXs|Bf<#bCF!E2Z^+}xb|cN*HE zaGNO^idI-GP}R?z1a;>_iE<>9+u-^J%X5%^ORj*GItl|f4NPf@uMV>mDI}J}`+qyt z^Ub@^nq@h{l#bW5ej;9+Xw3C`=JI2qexbQUYPXp#CpL7oR5E;jf~6;seLy?KOuPAH z%Qp(my|D4`7pSM+~{0~pO~Ublb@mmrPfbWS!Jl7_@YYAPl;>AWB&q@5B+PVx=^G?L(-N^*^V3dsWhB$By)BG)Pw z`p1!c!JkEPrazP9_+0-e`YX#%X-UN>|8SD&{^v-h`3IA1P^B*_>*aiZnT{2m&EaRmva zeATD|Do)j>fQnOfD4-%#tqQ0JRZIaDp=we?KBK?g1{r{yot6nUiK~&8ypy5-^Dxl$0O)H?`Q%x>tMU9S5P`7Q< z28P}-ZIsr{Xufj2wIYO&7c52po{Dp}gVg6hDD(g4RoxhIs; zA7vIwf3!qlyM^F^I23kBf5*et-Ig|(_?G32f}r6nc~Cf{_B3VT(zh+SN+D8;AOnd# ziq|Q}c*L?ydnWC7a4fVVAeCCgpP@WMGu8;&JH=BMT^*uBOwP$iM2-Xk~MXB>d{zqDvM z)~@ohW4sMk2`E zvk*Zh6*m2594`SHUqWWDXa)9Yuw*GEs?(P;sjA-i#~&6sCrWGV83^ATy#i{cI{c{l z%kmS)y5h{HcFO5xcL`BrCuTiK^fsIsZ6`j~wY`q!cvNof##ncp+0s6V;WU+XJ;$Df znF)3ZPlB!2c-DjHp2}#*UgGEpb#3k2!ISQ6f!(y$z6y~TRe!mpHl*Sg7He}}>_Tnm z4dp*sDf)6)x2jn5n@^frIk6Yr?+4|JL<3ryTaT+Gmer0nkker80@JgSlo->>dXW(g zu8sAgC=#D)eGlnj57_Am4MlH9>jfr~d6Eyp1eN01kz<2l>thL@O|=p}I|TM= z9mIg>Y9$85P~2y9P_|Fi)B2EO&q2kfmx~osx+68aYni>s-#zGs1d}iDVt+BO!mU(gP_!TKAPy^xY2kqO2OI%A)z{by&YG z$-5>(#RmpA)?Ko8kV;O+N75Po=pa5 z>x11;W3ZJ#**vQW&rY_s=h+zC|3h$pB5>Wdei672sk5xdStjo9W~AHurfc<585;xj zWdSqWo;)pm1RQ~+NYLnP2Bad7N_^5Wi>-f((?6c%kHaxbtf5Rju4<~kC4n*dLnUPo zXzYGXt~Fj9K|L4`o(Xm%db#y0o)Jp>fepZ=cih12wN8Jamy=N_veK%Z0_B74lW^Kv>w2EDNwqFVJS!b& z?TN?!u&0qTqPIUIDR3Ir4z?18{ieY_4GTA0=gNszcm9Bth!oqcl)54QR(Xch?qL$t zY$fw1pHno|PyDU&VNY+Hq}w^mpYsz3thiO!Tj$<<`-?q~7 zo(;$5dC1zlYrUf&65WNfR$7r&)=t49F`~AlJ}ovHDO2I$*}Tdct4B^IBm8sgRVKbb zr7nbuwvn9TRY=O z!M1~EOQl)rgrfT3-Z))p1D-9z+6h)7R}n+gjWm1r2KulZ_peFnPX=_n^^nxrY^*O% z@&z8Pz~b53-c0ImJwsx5)(NZwdK|WUOnmuJe}5usUAFrHlAU}NhL5&Vsy_YgAT6$T zS%U*5yaM4_Ry$P1+nQmwNE^-T!jkf-?f>^GT*x846eJfrlBF5^R41VlJfg(D?Q92_ zxSG_l2Ev+Kua;Ex3HwtY&Lgj>>VSsW{_>}tCth{Va-L{#CwRoVn6^|Y<$#I^J# zK>4=RF;LT+bdi4CT~U(WTZ74cZIhG&QM-0FCT(b>nxkf@?Ew=@>6?wvP~_@$F!OR5 zUy`?-!bq9?RcKi2x^%E+iI+iGl&b;q#@qCu8Dsm2aLfD=Hi{yy?j=MMUm9y$!q{fW z&#)E3lW$xRs5#(T$_`fe(pgDW_B^SuEyVwI8xEG;dqni_k9h6D#YYY@h>v%XrIyLJ zLiT#M`C!rVY`$dkqreAc2XoGjAUGq(_B!$0#ET$+ z*kB_BWe0U(cS$*==d#txRje{4B#ZjC)%F>C3xzTpEwMdN!&&d*{p~iR1Xk9_t!=Tx z4%=zsnL&-(N(U<5vK>;1se5O2=aEoIQgMNeT2cYaHy9=XE+b%N#Br`TSyJ63>w)Z7K zGNa5n0yAoCuk-9Z$k^^&3xyd}v+bho4o9@M+AKRtbl*${qpsQd;gqjz8yPzUW4^Ib zYXUk%@tc7KG>l(GN=T&ReWJf2Ty}d1F2W&Uv;ACqJ$7e z6U2MRcC51AHeVFeXmJ0KV5d|ln`CbW?t{0H&^$NZhYwyJq$a(F6;|J{U ziQ^=LF?(%8Af&bZS5^zxDjnn@wy~3k_zC394W<1k(N1yhXSjN=laOXorIkq&ba9~M ziNl{8Tktz?%p?tGFCjeFBwR3hS2fb?TGblKbUpckN z-<1Xf%C{KOq?t2D;sMI9VosHP6c3rx?AzEiJa*A8d3Q7H59RDSu)Q5}u$SM0Yq_8lDi-jN3N zV?vbZZSK6vu*DktCC2Vx)x0F)c2yf*=GNc{ea=4LKx*GPdY|JjNGchF)Qt>1EYK&!!tu@N7y$rsV4!m;X$Qv zUbKebkGt%2*5Lt!j}Q3DtC5L^d+Vu?19k;h5*s{7o<%Av6?87AWr*ZiHNA?YJ ziCs!$w(!G_WztA`IPoX?{&y^&U_ZzZYwdkF_Q${Fv@ZR^?uK2{>_eqO)+*$^X{@)$ z1-^&6EB1Gke{LM=?_-@T3>t^RD7mYYoH%A{ z12t*nL#D5=)?&n6`*lWy!om-1>z{hB(rG@KLI#B&*&^Xd533sAHaYq*c#`b6gOh%= zzsfiTgCl*cFP5e`;&JcK(z+o(Hq7qDqb^66r_OCxiC;+WZ58wzVm%sI7f9>kMcOu> z*ee+wQgje@NlW8Xj~?>A2n|7ZoZ~u!+?)3N|4XMtsaXo7#Z9&4eoOCsooc1yGXL2n zI`JV>C^5UpS;WKUoH2y_pzo>SDr|( z1(o)*(qisHiy1p@ak}Xc!7zI`EZXWUfLx8ez4T7-e|zs$*sqDhAY0ZfJ)}`T5Exi#U)W1ytsode5k|aB$4rK^TRMt4IuH5(P{Kl_ zkzFON3WXMPRy!$h-+avW%(^r7Wtj1fW?SHi4s+H7o{$2N6flZG`y|I%rU!ONQzC89 zj>a)X8dD;78X)&4Ql~Vem1z#1r_*r%m%e-OyKW9UM~C4$z2-bY?(ARoml+P~?Whn4 zC=H+DpnPq*>@?7xe6O4%VnN8!N>c5T2e0okP|;1Ud7Aaen2I(7Amj!^g`rBUzi zqWtrQMRo`5Yfyy36HQQHq-{|AqFoOU7Lxhu^P|E6sf+BPkf{r5j(dhVh$U$U?YFjd zxM7qdPAT*kWIs1@@JPp$_)#i{!li8vE16h@bN6h2KSB0I<5}6dBlZ-?+{K5$Cdnw4 zPjqB3kpL})3(DF#cjLavj=?+~RI6TUr|i0BhJ!!_4^*$T{|5D|9Koo_aXjK!I99K= z#}lx7=EA?K${VLs4QR)!Pzl zgOx+5-oGp-(es9bNJYe&(J0rgOSgUxv;an1Wp}WYyT8dKc(vb+1?W*B|H|1W#%~SIHYV{sq_;S{a%1b zj+!Hm2XyF+n$iXn+Bu^cwybu1&e0D7Xm2>4z~ZeoKh!+7w1ldgj#S7^4LO1M5m_bH z4vJ?vhr}CTT9AYb`9P+=dekbRq+dSEc8sAy)DHFe|sLM8S4Pr zA00nHQmC~9RIGQbmOKvwCEC-S6#vR-f+n=5L*zB;a5{SQd87@h+D3&z(Li$x=ohcf>9{8+(xdjF-U6u(=K(xl=V(huJTa%t7B4wV5jfw>?C5Z+;jLP94zN8+ZDWC?+}&p!DK}8VkCb}BG@Rp zyc6mtD*auLWNr>(W;10A28n+mMOX+TWNnn`#){;QoA|_3`uuntL+aOXF1X=r}n2kn+91Kq^hmUVP6a9VAdbQ*V=RF&VSA~AIz+DnCRR>NEICY$>FN>I$sc^69BKN zr6`NGK;BKiHy|CW89C9Zmee}@*eE|8EqFo);wRaq%${Pv+f)5R2!|N4L)t9K>rHi% z*E@vx365X>a|(Cp?xd+Y6e=!IIsH^tC+_SO@*It#*Pa+KIL~2qgCm*!_cZ=JFdoAo zEmv9{>CT%9HUb7raJ~SSCptHyWw>)&kT_hBZ4Yi#h9{zP0*s#M%#}JedR24(Fszy2 zjORothmt{uPMtK^6_Mc~P!>e2?(Ely;OD8as<3c`lQiFdj?;y2PIHbDSSD0o@wCCM zOP!9@(Cn@5~D7I$d zrS;AhJe!8)L+qCs)@^n+;fN?%KHUB`RBRxeZgshHo^%$re6;;O%rM$tz$vdgi5rng zWZ;aF{S#B6@GWOE)tusFKOGx*ZHd&IuE6ba<|%WETKO{sSy|&2Rkp;cgbRC|5vo~d z#`>k>6U26u4%HL7qQYnPIuA2(0(Czdg$gIRP_rTPUF!l|{H}8;!FWXVmTo=|^;bL_ zAulIn3Y67)T;Q$sjKwLlLuiS9pF9|b%?(Lhml-bL-ZRc?0?WeHHO?GfoJZv@fP`nm z&tT@m{ohO+n<@6Te zfIpJgak$}zbE?Re;DB)QDKPJ6*DoAC`rhdi*#zP}IklWJuW*TfJoUSzV&X8U|H&C9 zQm#;ukFH0~*$kim#rcYy=!^}e3OXzI$Vo?Uh--hV3pF7SODSPWXIBhli>?yYOC{6& z6RCZp=wSdM{rmSO)IT~?8GNd6#fm;EdMPwiyXdH`(nZJqmO-_b__^6JZWm(ktBsA?j_KjpRM6TriqjOR#ic4~8Mnlmhm%3z3 z<}q;0*Qu~|TbENo6MH}>R}rTyd2gYAvLO2jSW9hcN&Upc017B+t5p3mm9RD;F`-ol zun%_8snxu;!Pp_yby_;L>Me8?8tR)5B!| zLd!P5;-0RK`2AoP<$O1mB&216H%&MVH8w*&WKWciB$U#T*v!(DG71UTrO>%4nc`LA z?ie};o z?>Lw+nK)BP#jaBv+gXw@{il-tkp!NtbJ4GO?81iquH%6zM-}gehId@4K$A_4{WiJY z;fcA}@Sf}VnMpMGu}tY^hxU*6 z&n&&>dLo^VRUC$f$?jEHROgz*vm?+j-A!!MTdt3J`O)$161?LuWQ2PJIXx$M4bHhk zD~CJQx@3QB1k``TZ-vtt?mal?2N#{>t;YN^H&3XW+g$|dmF_{1`f)UIfMkjfU_dk8 zi*0^)4OR-YVgHoz}SM*0*&(D;<)l()UNbpq@k z?Vf{+H11^tAJT8F@Xz402KQkF5hG`X^S33FJ&VATizzz--o#lbe&1a~SbWMLj0$&O z<_HWdZ_ams+@|h}sB7wOptG}(?{ZT%w7HvD#227pC_fZ5<03}j+p+Epr9g)!ZZw{> zr$HmL^a`)0b72JBZE5T7s`_GoTmKw-W2U4DVs`%L)3gwxO(<#)H1|_SZ;{XR_Zu3h zYwy;<@b>OE#MAV~C*WNfP1ERa6(8nG>Zb%lT%yeeDO26oBqe7ojw>KIW6)+Vk#brFuSxhL3sLYM#IL;VJ0w7O7#-E4N5Tdm_fn2sgS4<KxW2`h1ER8xA8gd z&p3h`k47fSQ<`wF}Nc{u-)d#ZT*P!s<=OkV2#fQeV=(KoPvURz38FL&SN*|#OtFFK*` zVSYE{PIKo&&6cE|lBS7Yx_z~qemCm7lJbFc(5%RPif4C9s$xkw85PT;VF8Qau-7mxPKMdk63)iIgOHV=aNT5<|H~NS@ccH zEbyRPS$e~51>YfeKKluBD&4Il3t)w8kDKzwjgOP?*Te1*p4gB1@d8ontLU^Q!HD7R zCiMGpzZoi^>~3%{xcb>%D*eMniH8r|dtl$|sd3;fZYsc@J4OZ0{K&mdqDGdta5sf2 zyO4_gf&~hd>Ra*6Dc+F|SjrSchrH;fz3r@<_O{n3+~8n3-8AlvbJx+2pW$ea$!|TyO*|W0iNsc2(|fa_v*Ab#{FaTq48wSt z-vG&Y$Yj{3z-M_%mf=2rz+yNRr=A%TwY44PPcyWHb;#^tc!?Kg817ZYLSUsy3Q%qD zE^csmhUwZEIMTcl5p9)EGlU{K1XO@~E9{*#Z76r9GmU!>GrWhD{ASP8P1$02DO5Yl zV4+?k4Ar#aJ69YxbAQI|GrRF54HG>8{`-dAo7J<$hZ85_M`w6bX)FTd}IfE3< z`S+^wv_Qz7$Dl|b zOQI2y@gt?@X3-_M9dEoXmi9*XOy-m~45x%N&abz1q?78NGcR`j11)>bPza{b>Y!O} zTfFGMkrI{}eiUmu!1damZz{BQg<-e==66L23UE?E@NE%O1}%cG=NevHW4I|ALb{dI zW-OimsP#rN{MMl@4gJOdGG(XX_BaJn!aasD(P}SR?Z$}#V-O!&n?0SY>J1;oDlt6g zGeb$V8a8#Bo@Bhn=-|Brj9@##e1d6cy0%k0!ML6hK=pz?G#eIA4TketHDtt_dQs__ zmMz4y`y1`z%+kQpOw)%OKThk6>R%fE;Hq6G}1A(;w>$Hh|8U%kg} z^cm-=IQ?hC=vcVA%sOLuSfz$3r{-!pe2pUG0X}%!t1H@u%RzKIHHr07iJspgNH>)T5CRTHI9l?$3w|95Zuaj z1OZAbej&ryR?!T7HWY?0&4vg~R&&PCl?tliR}WX4_$PmClSG);H3IPK@XI6RPs5*# zvBX3x`8+4vSSovHM|+;O>S;kcV+QT~#E?OAkENw>+pflwYPb>S7qx27&-;yf6*YZj zFw%;{Sa;$}lJ9CbzBl-^t*FUj{9#j$@sAkcuJYRb7onu*S2;CQr#B{ZQGX*mfnl2l z$$qUVx(g@0U|g?o-L=LbEZ#Ub-vo7h-gy(yY(H~%Za2huLV@vHVXYCy9C=0SCYry4 zRxR2zh2}nBEK$aB;}{bT8Ti7t)a=_5pJrYWmpx6K8EPek7v6RUa@< z=6h?56);uf>Ov8V$zOl772EIJsNC&E=+blME z{Xj}9e&=IjKSf;(h^KSoW+OzKiP;eP*K9DapaTI-vY6ch$|*LD;u8mq?Gy!M@CrLZ zP?i~Yfhp^6hV5zkICBvgJrhJQQJROSv{GxQs@|r1DCYrF4ObaVI0FqO=0W`FS4OV_ zL%Hfvrjd&L;tKUUV%(<80%vCGM@5fm^gR5iv9(6H0iBpl6>H6KWEK`(pB+eX;Dddm z^?<56m{Ls%{_cbGS;c*|eL0g4i)dQ-1rD!Iz)-dJh6Em|pqe$j|y zai8DpS5Z+yFE15%OjrO>nt4?F6Q*)YqPZ1cr7_*1QBrtClBt7ATVCS`w-H*5NWk2@ zHm1J9LVSL$KinG0504jvgEe7eqLzN>Va}xCDW*HPiXS+p#m>CSaUrm&ESYZkD-hY9u!myK|)2r1{!Hm&5Ed}B5=3q3X0aLqa6 z0eN^Xgsq`wDpfvguH3lZ^qp*G5kfD62=Waufds6Ji35RGYD$+`i%DtJ3U^}Di*ZT? zSNAp#g+%#aM}#Z=P}7%}cQxIvC{J*8u33Za)oA$?&#$q81$0kRb$|1^$T}%GYC6kl z*(OjePm%vcZ6-BbYo5-36&qCuiMY%>Ox9S!72T})Sd5wGX7WwdK?>XB6cbu0LRg^0G2j zAHzAvEJhrh515|dA4ZrUc6^rV51IcG8z+JK6-BwdW~$ zkCFJf0@GBD(vFhuH2tJq{?4dy+nA`|ppsi_euXzoGF>OF05vN(`5Wzz*c}H`lI7f0 zQu1NTd@7iQh#nWdTTsa9s!~lm#HrbaKc8xH2xGkDZ!M=T9$6mw$q1k99Q9df?8HlE zm?kTb-6dsfZljvqUX^6nZJfkowdTdLqg9-9(zF0u%Vnwp|6Hg+oQ98#nY47S=^hC4 znjbS4^R%!D0ZLa3S9wG%ns546xF2t8kK?ERNS>5v)%ywayMtyMJka|AWQXK0|j1IA@kaGen{?kLS`TpKpN zr26}iaEjEmTsz-*gZu(jf1eGzMAka4ecTALz-R6S{RXxl=dCuqsld{&w%pi6lioAO z^ZC&xm_q<55aDA?+O*cBR;$~`ME#h<_zFfKfbHo9@`X&*VlTadUo}^pG~SG}W3v&l zFbriD*oYd;LnxO`+aUt<=WCid^IlUuzBj(c(j%t(1uSop|3=MH!Z|S<5f;SSY}#sS zBRrIIUo>r_lIP5GxNofq(JVJ|g<_flVrG<4$Fp~t%7h(Yg<2%#gv_VOcPcHBKJ3>z zg^E(!C(zR$n(l((jQ^RKT7`G+HD#+H2`v0nWueMB(0lt9+tc{&I@1_!YzG_@PpAGp zEMe8Gslx9aPCkf`NMtx`x``GJHQje{-ZKU0?^5-H*bArfOfWqW6as@nctdWhE!?UZsNBVDT~I^(xLe zYQ7uBJBj82Fdj6_H0DxLT#S_xv&DP$Y)%ZP(c~WH_3DFf<%Ltp*wZ{k^YL2)!Z4X?ju>gytuT1(DDAi@S*9N5<`bqv*i$ak2o6m)?^7#{Pd47!o(*SAJyd+-{pR%w%o2fw_Hf;U zW}NWw!0yp&GjEw`9suWS%Fpfv<#dS|4An7^gqi|GQ8Z1&#*2v)1{j)e5cLAYbHQRr z&#R7@^C)Mp@o8TBsQISY=O59x$(p;5Pz( zgYi$4<_F4s)YzNWjnL#%QkPy(e0^gv3cNR%Gv77C$f5Of=4RzbUTN&L5}Qt(wsp(Q z;4O|*ZiR6uoj7k!q&}JExTU!oJ+;4IAY~Q`QB*tw*aPzn$M-TC{J?yz8ZyS_4W>L5S2mm1$`5~ra_`b~;k!s{-ov_Q$FV`G?pv0qQ?9bRn9a4Nmd#EqLRbrxyo5kyc$2vI&Yp!lixGP5)hk~ z|I=XZ6|J1(=G~?>Abv2pjLCgC7WP+%kDCqAYM4oCqqyP)V^6sbre8j3uL@{!up56f z9;T|_VzpfPsks0)rXYMEk~O~x)LH*WY!^2DZf?Xq36$H_+M9Ary?&DO#F(dSRa}hU z7eM$T-r8X93xmeJ#touXHRWbo=aQjO+xz0DPhySQVu};)et%6S97jb^zH0vcnXeHC z55$&Q4d)i=TZ3cpYj2^X|Mr6W_tW+j5^62yKCbToq%_3x1Nr*f{=<9QS-Qe%k#fuR zK*W#qiRH=;7LemQDm-BO6kgYkNn91ScZX~43)--NQBTdYvS*X;NXmBZXS5866JgI! zbQN6MNJ=cVbll{$oL8yg5~)q(+$6o=T`odWd9xlyHcK-t_b5qRT4xttHv!9UijqvF z`|Vy1ge>(kO5#^32rk>rGAdeW!_{A>3E3;Wu=fzDpy%{tX^*chO4x7lM~p9l%AIJ)HEx5j+lWu22^(JqI}yU zn{Ks~s)h67_XxCxxnRK6MZ(k;Fr{&Fk-qPxQ-O~%MYajw>&NxbkWaKAXk0oqTkQ8z zCEE+AWQr?>|C;1b;WX6Qt0>9roI{6~Y1@)visgu6VE+M|8r&$p5#bx1=h;;jY22(e zLQ|ME2B|imz(H&%=#ry*mS4 zxGf$wcq|(wR2iH+-f=3Ld_%OY;D4+227Fw7+>U7hcx7Dvise3GU|4tni|3)Wmia=e zS-(oxiE_5s3j{1>A|PVnSN0qDrVW;R<6|7c=u-qFzOc3q2msvpg}88H_WL--zq5bG zb=CIkBmh}lJ=L}Vc;OC5frNt3?zF_IxOj(Sj!JYnTNb;DYlmA(Riej-WI{KpeL?$^ z7=3*7ru~+kF=|lm$8#=D!6CVHgcER2Djg8pAMrDFTPWw0@ijqY&xZ2guw}o}iyP0H zdP!dJJ(bdXNu#+@a)1mD5SqA@$BdDUpG}Q1=6(V#8Wf)Rz2!L->;jW^8=<;BZh2qW z1(p_oh7d@RoAwxYC=7|rEsBy$h7oZ8AIr+rDOPlgF#ytN6j1$(!i#wCBiyIHw< zQ-X+^ejzgY5t^0TdIVRcSrg?*`-$r$4s1MRbw*S1k?v;7d`ZLQC!ApTsO-MSC#GP-x-(H*R-MFhm5iPq}N zo2raeJd|&-PEz0ShBu55E*9&xO6>KePg=t+PPAbXga@*A2%;sK7EsdmbO;|qrnmVS zr*)D_8A>ag%|HSkE091Q`Qh!yU3^w39`mWWiymBI$O^7-80C*JLe<~Rx-SmCxFB}Z zVSR4t$9LpdpBI*U{#wiVm!tbzMLKsT*pK6 ztk5QpB7ePQ2G1UDEfcnILswd-@th*-Z(vBqT7QgHgMC>slU7zoM;wD`#Z%T+P!MUy zR`dvaVL~SDd#Is0S}PrgMgBxcpS7dQ$AmNB7@8yM_NAtTSPeb%l(nPS9&mNlj-m3? zRwI`bSywCk;holQv9Q{!%5iq4ywlb~kv=z$l}Xlia65R~`X=w0Zv7%Q#xLSsiV%CE zN2t_SS{ zpwczaNF1)T8lvOwM8-Y-cv=~gnM%%YtR?)yDr=#*h@$q9p3uXtvCh-RfS%kOA^ZV+ zN2(iaP_yn0>uE)OH>wwN<5H`z+1_Z?$a?}JqZuj6wb+PaZXFcZYHQ6$wpdeDu|=ph z^{OTLP~9}_vL;cNblcZ_NM*AreEoLoCIu46FHJVH!iQpI+Afg>5#;DL0r)-In)y(? zO#eWnKfqtQP?ioQ*xGQ9z1H_t%7ZlILo05Hsk8n!TA9v21Z?;kl`8;t`lr^TD##sw z=xRI9(Fd)*xR|SAqG}?c+2!cU8>|WOGk0|lcLmG*IHEsQM~~dpXa%aj4^YpFn5^df z1*L80H>`~c>%OrPCYNM_ieh zXV}|boMoq?%%jpBF&&o}Y%!F6zDFz0xfE55xe&2|vs36~_JBfyZ`O1TieHHDvS1dg~el0T0+9ysO}I z?QGFdgC4LRfgNF2TSv9>B>7_;ow#A4Z6TP7+ieZJAlvq!5H}jn=(4C_ooyneFVUt@ zO|gC$8Ma$?^S)dgybhL7?L0>l^{%r){IsWAJSX+H{j7qS;HiA50P+Uf-i*fO7S*YG zNFxW^-iuS7A!U)xN;&PFP98SgRt>8_@<(eC32LNmb~J(%`s1{>^PRWao<)#CQnK{> z`LhBWth|_vcCgDzsi2k z@8P&3)@6ZBdy3MTf15%c4g z41RmM4MBBYr2HGS2&q5Q_G+|xl|K~dO1Z__UVK>X3<$yr4&O^kZIgusVBstFD&7#b z?TQn3UHmjstoqUP#pAY#+LyPq5BEmY%z#YeR~OoDRH;`0sx@TXt?A6=J8iH?9$jHu z4eLLu_|S%E-Iq@Mw~S%j21`JykF{F_>z zx(FQsI!Mgs+ee9+TSqxAXMZaCwwIr0tg<~C2Y=w)AHhiWx!Jx{q1h)i-%(X-{a$!k z*}_T{ubgTFA1%qEq*?ZZlyaOPqf6sy%)-mb31IRXf-SXwVSxMmkl8}3%<8?P|-IZ+S1_syK;jL zfp_=VU_kH|RkXEqXDqQ@!q(4d)YkHp)3$*Mw>n_^Re|?!?vY+g$aTG~Bfs&PEk7E5 zzq#M`f{n-*wkaBQE)+Poipjp4M;x==q-eIh?G3}-8Dyb|HSFtT&mhycwlCEi0n1h{ zoMvAEDWq6rz7>u-s@c?QikPo$TsYm{Ma7FgvfYb$P=k)!cghx0YPfI~Y6w1Sw4{$} zX{F9SmI{_>^#aVNL}9h+kpmG-vNmmODBJOTwM?l5hTpHs9N6{3k zf0Ca`w%?$M=?hoxNK6Eb4M9TQ1N0wKa<**-=jAxs!K)+N{sMJPx9>$f!`wIQ57Oc5 zw5j~G!G2dXto3Sdv1L-h&#*Vkv)HkFKcZ~6V>{(Mr0+`G7U-ZCKVUm>kxQAyl|vj| z<-qrGW4R+2oaJ4%Zam9tpQk8wq`YFkgI*6h@~MCWlTcoTGJsN-w`pUnKaD~!z=aKO3<~#;iNduTGJyPzumZVIk1%Bu zX#IWmd=X4h+ZgfcG0bv|gOkbaHW_6^`!ywhX#13Xdgl{Zx%_Q)0*Yag6;T{VHt87$@kB${w)6`F@@qzTA+tW!NFyn{UUy{+9C73~4l| zoxOl|s9L4*^2hBk=J=i(tF^l@q{0hl4+(CPquNLQ!Q!M?H`27a=ZH*iRD3iLUv_sjj6`C#@ z9d?+>yU+fq@;hwTZ8vlIGxj1xo3l9ra(bK%p1nc& zi;Fc5Smss!q3bAN;052?A5_69IDe<*CYo%rYk0TS(MiRN^DI6^bbX^LK8o_+x5(b1 zCOS1kKbISRvO^ISuTcJ8%TpI&mYYkw;? z=DL`urU+$@X%eB~<6|~=3q#8J6E4=cbRUWRU=!1L7G=~C{wryY<2WZxvqK~T6QcN7 z%704x5n)Dupnc=DJ}N({`Iz?2)%m$(s!d9*}QvJ6NWZ*JjUN zy3jI{zOvch-_+U>tx~jHdcBYf)O68b*!#~c=u|s%?nf!_ywmS@1sTTVP(N+TG{|p1ZoILE} zoJyUWd~ewYGC=tlWlUNfUF&wdjaZ2lk7}>E!pU3!DNPss)1sv$u2`tO3g_v3dlM(N z?j2UdxjY=Ay83XZ1=P@Bzn_-f=$OX~vK(qy5OGB>$K+@=4j|lZ)m&k_iIU#b9{(G7 zIdMXS7~htPXV`~aoWge@--@%x(iD>&YjL~dD^aE$t|GC6jUDKKgr+?iud=LKy58dY zUl`>!MfeN%v>d*YZ0=>zAjEk)b=O=(EtOO=*FMr+Lu%LX#Fjsw=UE;O;5Nw7$knv zGTlHvInmKpi1$h#(KOV+Zo)fcWi(p{etk5*5_LW5&C{sRKmIVz6E|VYaIU(Ve2a9 z!gv_x(ku|=JuM9vzx!qZ$Os|ktG6td0N_p$S9Bb0BF7*qIO%{|Y-&QxrVWmlBhJfL zI1yHhd2-%_RccrcM^P=S9VLW#y}s^Ps=qwU1C})Q65&m8)3!I%NO?NbGe0)#pRYj+^c- zJ)*?dT@DkepfQDV*6TJ3*aGB@l^39gB{RanJ8vAhaU$!<1w?EI_H)9{aNpzgF9q(D^%UsZ_8)UrBYRG_WFyiocpl)%GW7;3(Tf_HD2O zffmho43(d?9~JMnAECVGwc3qM&Ni@fgioAyjzWJH+Lo~))_Fw4&Z{4-h0T3Ik*!fy zx`qlj=-|1&)$uf3~%Do~kpLH&ZkHP7_QC?lf2ZlMFih4L|jH22J&ViyVM=qOn7HeYQ5r<0z z#nne2l{u5Csu(U~;+~)cc~4OMt;=;`*qFZ?VXeyBBqjb`j!~`^g6xcQRx9d}=wNgN zBN}dSTKJmr&Ub~GV)FneZmgW>+!3b~;5s;Gg+}=NuFHXeWuL#BqVkU+`V*1#x$|`A zQI&cun!Ans{hf#{G}F07qlRQFVsCW z{>ge%J2pP<%+M;g@X#gBDwXh7jh_Tt9w%&h);M?2&~#TdpFh{;X}N&zqU6t=r?_sd z)2Fa`xic$PxchDmNGLP2)Ee^r-o_x~6w$Viot>zv-f7~5mz>QiHH3fhleu=hxT@@_ zSDaH+upq3R=;{+q=Ts@Fh?(zNNQP6+6tVD&sP=AG0d+X<%%y^xT{^C+a^4WF6jQ|; zE`-(G;QT#K8O{E8o!CeBp!`&-C~eo_k}gNqIA0T{g~=Hyr!eqC_yD5a`#IU40uO+y zlg=-A+lS8U)G>t@qxlwm?3^wDo}(>U*)|Mc;O*Ya#&xqeBWA8_7amKEA3I-BKUg_B zJcbs3;w(}_SQkH?s_UH(K}X<(m2?ORGpK%z^F29(gc)4MZ4Wt5D#}CL{E{nC#fR5B zfdkSHJCDY|iV*!GoWN1%+-SJrmS(u-s4iTD)fC06{s%&hmXORh(_(rkY8qN!;hGSYl;V{iw4o=T*A;fxMdF zlF>-w=W*R%Z9qAS{y6DQ*L!lSJc7_=DY&`$ZkLnq*Snt8DB}>F*>zIYDy)t+MNO0O zgp<6qwY)=!ayqzp&d9RmPRGP{Wm$M8mSHjzqspMQNjO#J$MgF#1k6o1S_Vt?gwM-7cpfYRUP<_@%!%iJ z=af0{=i@Rvp0#C&o}0jB7ChIN!66{wm9lg^E6WfoH{q!=Xy+0ZmvzGP(Xx(shRZtO z`9N8FJSUf>;CW|RYdpu5CF41!ED6sMWpL+67+40aXhN?tkiiL8mBr)fEz{!ZD4PT6 zR)Vn%inD~&GJKDO4rS4Jwk}iQ*{V#zGr9~@(&}7zHlBZk;Yr=89`qJZ}i! zi09Doa6AWwZ@@DrJPgln;e0&(VR5#a!b9=w6uutM*5Sc;Mu)FMOkwRW;cG$t9}ZuG z=V#%5c-Dup8no|+u^P1RhJj7A8^ZYN+SOrv^{B34eD(i3V6TXlj53!5OHQ(sO^S+2 z>QshtCnc3l#51<+4#X5rJX z44$jXFe`~qmtj5nBtBk-nMi!J40DheF2fuomXu-ii8ISE`osszF#5!M%ZA`N zxeVh@oK$ulo`q$D@N6@-Y#{!ODZ}U!Z!H^uX<5LzTb+=H<~a0D&U@O~LGG-_sp9># z_FVqG6YL|-)M?5li>pzsz71YehKolJ<4D~nuW&rxKk=^CA=f^t zT9s=1ClCxERzZDyNnzTsQLBk*){hV(t*Pc*}cDC8`yehieL4bt=vCYcj(VaDjHj-&mp~F-{TVGJYBR zV_f@SwDeaS=-i^>ms9=^8Uw}7a20TPqHB(DPcN)+;c~~jT_fU@l~nSQa~FRw)df$V z7a&b`1}`4w_wbF=UF#u@=E8N(GKC+V<(eL+z7s;uK^G@d;6j9~ndh3PdFcgPc%ncw zGU)RKMERrmsFnDwrrH`D$C<~R^`He?(C#n+;>)x$-8EJqU>Lw$IG3N4xNHrg7lj)WgyQ`6o<+)1f^>kOhz-2>d!;7w= z$~w;P>rx}!-Ak@NR4{hUAK?OJyv7B}_;p}pR}&fDbZPkPS{KKO8x3F3Up6^<(rt8g z(^juDgkj8n=#r(0nfr(fH@TK8>em4L8@%}g*VO>t2c_EJ%`T3GHS0B-T@z{S@13;t z)@Il3e5l5y)2Q#kB;PMP`TV%6qomMiTX%b$AW1Yd>V4Ni?WQMthvAgJdiG_o#Pj1H zxb9QbZ=yRmfy~9NA079&;0pT|w=8#U0e$${%(Px zjSH8*9d)gai-CuDedI#}hW1o++-26h_d*~H0rn2*Cdr>2$E<0#t%?s%#(f+^ zW{vw-h5tC?(n6%YF~$wZc2doJkeQAcHyl=WQMFDJq=HPyJO*jpo1In)6m8Z7Q_Agt!(%^9G((!UEt=&pT~yd`5Dx6x+~l?O;2C)dgXO)UlLIeDi{ zINg%)F(<#D0p2COhx@3aKnlHAW}j`z-VZ-4BrHh}uBJatnK%!k;y>l&Pcv{uOo}a2 z8g|AXpyY!YQ0EVHL!A#>&et(t`)&yNdGSGCG3cHLeQvpvV95EV$hs-yr-FGtC;PVh z5h8MiuQU0EyA!y{pE*MoJcw&R{R6n@SVlQ)X~wwQQq9}$gG+C4!}IATcThP*_3xme zs_!%0l(WsP$I+gVp<=q(eYc`Og1t@javOT7+UqxR)%QLS<-YkXP#{>td&qBE=4rz@ zH+pMeO@2D#4>7PWanTTR@Uw?3F+@__9fAwDVezC$>@d6Q&DE3TwO4Ieoi#D zMK-1hLHv2m8wpM{$6^~x-Uai1}wDM&%UFY<+;@$82 zxi>RQZ}{Vy|qtLrcRasq%FJO}(!>FI(fDAe`4ri+x5a`P7%m!`Hgu z|I$SM8$u5LYl|ON#J-_!9c_ESm&n{QxDD1MTSL8N!cUw#4GHi)4;`SB zcc`>WkNL)k#qcxdPM0NjwUj)~xwB-#2Q3M|aBiurI#CtFzSWuCWrM%M;8qs`&*O?*TS!TKMlT!X*Ff_lYQ&BdZDcFIw~w5iqJj{T|Af+Jy%zV^rZg= z&FpezJtj-HqUt39gm|`i5aKz3tDlio-$B*96K?eNd`n-6RJ|;4JFojbxDhf{ujiP8 z2$jhzF>SL?1Rusn?B?srV_N%CWvj_#T;$K8^DhMs^Rg7*mx3zQwMHlwFXF5B@Wim8 zn+In_8>;xg+k?x`1VN`34agcME2mJ!69L?kchK7oQCkB^D&A)Fy(6>QQiT%gLJikt z8K@yP)QQ(Cp<$>xq@`**-nJQAj!Fi3Qn>T5te0i2_Eepph4X2!=(7VA=6h0TQKs)+ zX#f2dE*hDYuj2E=JTbzEG=;mq5D@J<8Bl;w7 z+bcRVjP!WEpf>A2P#ffP|3Ym# z`#(^d&e4L}$~{1B&i{$pbgutL)CQHt|3+;qJV6-kT^Y5#-~npO_`gw`4npQDqc&aU z|1)aS`ThrLd((3O#-TRCU5IFw}x7B)p+p_*& zahtAd3vS!(0dBkMGTio&2Uw%qm2jJ``@eD90a3cg|B2glJ+Fk@biFRaZC`tU+j?Jy z+rIGtw`Kni-1dX$x6hSun+_q;|Hf@i9^kgzOL5z24{%%G{~NdIuKovZ)AjowxJ}pp zAGl37fPmZXf#NgciD>1TE8#ULfiA~ux@%kTT1p1++Mxf5*K`PO`7gYt8+rb8>(#U)j*}5xd1_x{kn~HK_B`b5-Bo+(_@0qD!lw)#_cM|(M#X;&x!to* zLCX6)6vtD-zKUqdtBW*S0^b@@yQFPv+|RwhmqU5`BRQp%dlPuG75n`+C_L?#j72Kt zVJ`hl6dpY(($!op{X)DC)n}&A=htUKR1~EPb7_Mg7IcFZFRNfCTY6L$Ny$_To(wig z_q!oAiPFvE((hzWhfFh-%y2`=6Qz3uQN8@QwMy^(FF!QByF&d$i%)Z5SQe^_6ncgW=gar~k@sh*y3h@;!e28?+_c|+GpRX~C z->+`@zJ_Wa4@#zKCpwDHl8LXtu|3$Gw@wYf(XM8m*Gis*ET{sbbgxqGqF^rAg3LBt zv?Ev^O;vwJ8hTC6BKdX)>$yvo|7*x5N&+IbiEb^`&k4Br^^!n7=Ho@o$2w|G_H@F< ze1Srwyo{9fRM^@hxvB!dx(0S#RN1Cjnnmj+aw<<5V zw`!_?GSGo4U0J&#Jlpphyq#br%c)1jNDWR;9G!Z{o1(l40d=Nir|ySkb|~vE$rWti zoCIGDwrRJlUNT`Lf>vdv@#xmR7h$F{E~_<<>6PV@S(~W1tH;GnT|G$(Z+k^D9zKs2 zm&0Z~D1c>34tWAJNySX;cy$is5?(W_6Y= zZzknxPhjJa5I!w9Dft=Rriwp)DW%CYfiG4rvsV}@K;+~!60K#Jyo$)#-X{e`( zl8Upy8)bqwy1-6JC4_K)3i!HHQV?^{L(|e6tJyjj`*qW9bR)_k&pyiJy!zkVvO2s^RL!BWt*A?Tp zlNy)!TQV3KKtgjq_j{=3SRh_Z^)7DC_a&-0?|J_T$@Be(WAvGjYVPLdQ8HsyOUC=$ zJX$8KX-W8in+tujpq=gEZiE-?I{$Lf;D_9NyDV1KQfv=5--!g=1m^#aA%?`oX?wZ( z9#N)^Ewc%C?NI6W*m@^F^|e;9Z>q0W!m*E=r^$9|TH2}O=IJtFM@vFIH_ws@yIT@I z=H^o0Iap-h?7kDY_BP0ygbWd)MjrxsMCm@^<}z8KuB8GZQa&mZ_O~Q_%FPRraJkU1 zTEcUHn=3@t1ySKARC%8eXf5$|6>a~Qo0rI@8d{qAjGLd42}fHJ4s!D{nebgp!Xa*6 zDHD#jBzz97wM=O8mnZ}=AO!VMI=HsKB2!Pd6oX^?I+^f$O9I^4t7XF3mIQdRZ$!ez zyug3pgfk`62}x%2W}lS)tr7Ce+IM{^2*WFO2}FHz0AF)+t!zXeh%AI7+`LmJB()?Q zrFvZe)z-*rdn473ar0hTszXbuZ@9T036z%_m_WMM+`mw{Ju@Qaqpb@v`zznF@m}9y zn1OE$X*hFJ2qu>$xn7BnzGLJ4$PyC2G`R)7XX6Z+u%jj62R6=@3A_F2@HB~t{C*MB z^dlP|mN|P`iXLaou! zNToSry`@Y02)WtgK^ZbuhZviEMNZD*U<~UHg`jOHxY@0yg1>x;RQG0PP=SncfGE+> zeACj=|LN9_6 zI_j1)199aDQ8aIzJB=H5X2M4ivdWuf?S~-Xx*#2VUiR`E=Z+Csb*}|sqws5}3F@h) zNJGDK?l@U%E^1v673LxTbR_=_=S~p$0tGTq;86@k@!&?gNdZYV{=vDE0@uS&@{HSn zFrD+g{-vev7@EB~DCw;~Id`&bez5?mMUJ>k0(F*i@0BfY3%26A#>}7!=DWG~izI;? z8Mtvjrt?N`EY-DZ-Hz_kc;FEmrTdF&Rh}#=|2(rjgzcGcMl0tzcebcjb)5&pYnO%L z0TmdiD9K|%4Sf{nJ{&*{8Yy`k)10|VrGgPj?mP+DrJ~1`0x-Rba~~5~0$(!l<+qsT zRF9Z;eKhATlC>_%AM^go1WORZxlf4n3-ZSUsABOT*j#_Vn)WpYwW6|`bC-%j4exld z6xe&Oz@+jU>ti|hS=sKT!pZw#6!(45Evm+G?()D>3P0V-cNao;Qt4^$P=2mk*6pAt zUkVHqMYQxqbMP4}sh1d8x^VnAdE1~2BB4r>_OiImZbX;@0AI@n}dL8-y2&VC! z{jvy+R7V=oQ}VSQqd=ceg4l!*k|2bHD`u3w6@Q_GEGi+6EXUx6WvOY4-8VoL?9YuB$m39hc^J62k zu96Z;1>f(zfR9e?42%F#s899*s(Uup^g<#qD`Yqz1|Zk`~|8J|^( zwom!A)Ns_>m6{&)%b8B0#v458xPd0*BX^h3??P7jmJ0X&48A*S1IRhxPO7qoJevmk zeu|Bq2F$r4h8myp%jnd}WU#m&7Wi@p!05o$Huq44S3Kh{RMEn31A_(d9l6>iQTo41q67OhTrk@AqDo2S>aMcN zE3(Q$f#b)x(8k?zx}y007VPZ2&)EA$L{ z12s-Tk%s7CETrYkG;1W#xdEt=t` zrE*YZQ$`oA+2jU2QhuYmBjw!Yi{ZTC?or~f)>}AlH#)h%C(%fIj!{mm?P6K&v5nI8ge_}2SFtAJrH)!Rw>Q17PFJsIt}U`D7CL3Nk; z2C5M53UW@&&CnLU(J9)=pu%4RCcf+85Uy;wpsT}eQC=$iL-gDvd%lE^^oUxSWSrxM zv-MivF_7P?V1Q>V3e7`D)uJOm=baTDjb7xIiz)#8EMA{*4~FTJo`=Q+s`0usk{jYY zjmTbjQ&5)9;yk@9zC4oOmGhG1`wNlxt0FqM8L!F?_o73pJ`VZ*==Gr&0YSZhpgRLA zqfKy-vdtcX+^Ultq=X+KOTWr+^1e6R{{MSXz!E%4k89)dA=xOuIaCA`-ZgMF)s0j2 zqQj5jEZX;$`@iyV?Tzc~RGq15g!?mzt~VX?MT_gQlXEh=T`E5)Kb9du=p%H!0;K(Z z`JO|$om6HaHF)iB?o$GvOT`~Rhg$NnSScl=y^m1m$AWt(uTP*#U~XBauf!b}aQK^Y zcU+CAJYo_qVCddrEd8i)lB&bTRR6ak7;5vEnfQt^ez?pJAY+3YDtnC|+vplH9u-~w zAl5BV^H8~N2Xfv>(cqkiBAw!Ppmh**OujYn1k7lFf*~{xUM+eVL`I9JEj7&X8W@_p z|44YQ4p=q6geftm+-5Nx!U|NCgf2dJnAAC{IQrr}1;dt46q^~iunP~j5+JG%$^ zKSOu`+}tHHFJL`6y%49q;|);36n_k-9S!c110O{d9X)0``Hr{sMFkx=O5nh*a$axd z3a@7h4E~#gcAj-2I6MQp{2lY|_I;f^BkA_zK9F!>gR<4+xG37G0vhugc z^p7Uvhu${arIYV#wE6=?2@QL_Kgwk~hAXnsDsQV6%;=m?A_E)C6@5itc>_FYTz-%L zJ{9baD+Y+9hX49CJVqTVQ^~zsKFCvq+FL~Jq+MW3pFix)6tg~#D~5>jmvfez5<*90 zzqe7vFwf-68Oz(`?2PA%5fY;JMVr2CD4t(yACiaM?ObuQXtQLTrxll!`RA$-4Ygv7 zNUCh_v(kz_zC!*YEfgmw><+FNC$j2>09jAD3EJAfHFpHfUGAoG|K~C4`+*fn-m%Gs zCH})IafzHB(Ot+7-{`0PAiM4&-x6OA_YQ>KQ|NAwyZ@#Uz728|ck{WdP&DT4h(C=V z^|`;0srQf%*pR(FLLY+`N$`R!S?&K>L4?$Ey=Cbi{Rwoc5)!V4_L&BL{r!yhWW6cy zcJ!Gzy>AF?<(yLxP}H0W?3GzXzX9Np;_ds_lSE++v$}AY}{MU!e!#>Y|O~aS&SS}eR5z|56 z8JRzoy>GZNhRe_-xQA)vKkkD;`VRk&Xv9KjzR}wsUOAzLi&ily+;Ge%IS2g% zP5m>IRG5;M*?NeEYBF;<``!>l1K>s@AkXA;)5IKKh64A=(afTuNtpr8oB_^Dpuk9l z*?ex6tT5Y?NPBv?+whkweUT%44kf>rfth_+%G~WFHk5AB4HBei8e2`0J!_U81+eR4Z_3 zx+ic{1VAue?*;vPfmm9q2qs8RD}sUX2!-IQ6E&q^z2T~WS$TqLQ(6O0bqfGbJsII) z89eL=3D8prY8L22TgQ6)Uci5M$b)4G&AAQCS>0paOunu>I9Mhwr8##XvBiAlewjwN z)&gk_(S8Hv9E5=aM6vy%VTYQ#&JCeqUf>g9hdSpz!Ms)mACh&Rg{QhZot8h~9Y;AW zMl1&0iCmLu=c1Q_b_v>ZRJhh1RyG<@j1Z3@;(UY18oaWHjtZHQ`=uR%F z@Sd01D{0P?f;~+KvjO33e`&b-r`yIE30a@Cu%IQipx*ZE41OqUyeK9!hqgWE&Akj~ zE|rk4qB$!BWNIl z8Y(^%?8bd;S+z)=m=Q^Rg_13*wzOzLAVJu>T*_}U_|4rC%2#O)3pkFp!0{Rtzv>Nf z&p_5r;IOF~9l70dNNEssq4+UB%sg88+Nk)86G3T@qF+bFi~Iw5Xb;R6gUgJCu_|wC z>jU;Fxd~!su$QY8<#pcHQ6ybJpEAgk9$r5sURbFN$U26))uL{-uyjGef~$d~zE?u) zC5UfO@%f;GGlyhB>~n#uyqdpIhay0{Ny(a!GIo5=6;B|*0lauUmMPz>f0{)3<>^!c;y@JvHw7*ml%@@z7rnP zQTpAya+4_dH@8`m90a-ZKCOJ){kya&EgBmtr-DwZSYbyRArU{|m0M-=ms*itC%5W{ zymGt9x`1m3DR77mUacU!M8!t8L+}~Ur3^XYb`tQcgkdig{_buoIL{i4;ETveKjNZ$ zF%tse_Q&`eBB}eh=zcLje`DRP8NvQ4rH+ec$kM`MRG8JsS*Yit*|PMdDA$bqQ0%O z6iNLY*AfC5XYUp(0Cu9XfiJk|RasP6iBevNNYO93XuV9Wm#L|d)UUYc4UziPok94+ z9j4@Meuy5fb0>pC4pu?WGa_UXi=}~$U-%A#yPfGv6Yq^|Y!L5xo`8J+8r+-jz`qww zk&4dE_X$;z{sz4`Ijm)!B}3S{K7_`EH*Pz>{l{| z{O4GCKd6dUext^|5J7a@6NHbz?^N0mqM)?8AXvyVY|N3>9*?$-qx~=vjz%$Jfzw5f^sL!t1;&=A3+D4(#{k;>sSO2yrUUX&d zjS!ev&n`n!+Xi8=-<-snTjog@o6b%&5=%8l)dVg~YY(F)G@ppVspkM_I}C+DZOVj< zi8n5MVh=(*q{pyjI2usiWkXw#iH)QoFzh|P>%J{nCgIsKS!|t-1UggZPP~4}%fWfV z+dc|f5BFH(d869h$K72tl*r@4?K^@=P-rf#?y^Tz(Dgu8g;_?wVx1>14Nz8=<%K?B=6voVm*;nstDS~?#6 zTKA~U-(d%}AGf`}edL<>(bCL0z=mQ38;JTWoms@`)s30|$zPwjKKth#+J6oMS-6yC68#MPhCNPE3HOBc3nY`EA2+XfVzSZS2~P>L3IVly!r+1`EmDk zzJvqdjaI}#MjKgN*~s`Hx9)?kbjE2)EuD)4{GGpMZZ%8YxH8FjV|3jc-MP|*0%KPZ z3d$0rq8?n?%6Kim?zP*vvaL}tsjlF5uIy+OOsy;E$(0_XV0v9aFRql0g2K9jJGfFq z0cFnuIBovXPW8pk@`%x1Z@`xr@6N7!w-0bjjDmS}1$`+m84f6&(qycmJGru#@pMVu z(|%mp*C<$4SCCCvZ*)TPO1F&Ul{s8F(0E!__q0C%Z;XPqbp>~EJg&)VH&{!#{6E2}U#jq8TrC3?YAs zXDOc;EVnmHgW=q2RCcJYGI**MiORC4c@$1=kvYZqa41*KFF8`P_Qju ze##Q@n6=)#lYJ0B7^MA^Gc|{8v&YDK9N90phM2b7^ zr`L}q%%Y6D^o|rb*<=m1`iGN4&!PT-C_ncC>n99mw zl>B{;Y&S^{(2Qa^g~Ow~Fge}15c>^Hxi|uu3)*c@DUh7Rz14TfG5rvq*FD#ZL z#QWl??wCSoc<<6Xlr&M^0-i$hFQ(FCsH{r$9_QHi<)4w>m1q3ueG(V7VmVIKzZ)5w z^1ZK#@24S?t@5&XlE&4?FQM>_6DYPX%djWaOuE?j2dJGDXl%}3z zI(tsaNXBARQFTVfCG~NNpYH93q3}lW!n0l+;mfkTWt8`gyc($?Ea$`od6IJ8LTnAb zO2r|}`=-&w!dkxI_i3Y_k)nYawR}L&zBLH=Qj%s0Rtz_B+!yk4gU3%%)&XybobP&p zqFO9R3I4RdiGXvWvRTx}soU=zB0e)SPmx&ghrJSpBUqOXaj7AWL z*)L>+Q*)`{IA&FSM9^pL<9VTaO_tvtmfzj8}N!~Qdo$tjJX1wnZ*Rd7_xm zG5q+i-s#3Pe~l{V$!`z@N|WpJVYcW=41e@*Z(Df8L2faYd_xJYudn|h#&@lEGdUxa zUX=Zmw=aFa9|TwL^SW^ek5ZcOo)^6#;7h@d=!I?1Iomtm;KW8Q_|=Q`^j9bEvQ%iE z&Rp_?+|PVdzeEp(V}_$rbi*aO@u@-VCIC!`!NgPvi07L*xmex@_Zy>2%j7mjOItX; zr`Lfrrnl}>2T6jL?DE=P#lc8;7W)F`dE)=qu`U3gs_j~f174V_k$mRzxBR~N%gZgUX0%XF{uo2BS)2BUemv) zR)5a^(YqPp`Rpu)B3Mw^-ryHpUgyi51aXHAF28fbMl49#Q#-p01Ku`Udn?GTwU^3k z|SQar{IRrN|uhp4X!Q?9!VVMLFq88>&cGT2OXS0m4hZ63IhbDC^8n zCRX~C*5r6danO)<3Nm4hQ_{)lSFAkAsVoqwYb!$v01?|Yji!0YN=y1YAJsJNuE3p2 zSCWt(79TBag$hrmDd{4yZTW3VV{YC?IVWJ~PluGoR5c8F@;kYeMyz#E4w{j`c64uL z87;gUv~*mi)aMOu3aF&I8Ux`35#1*u~DC{xWq zgpa=)X9QF_mYQWK4lc`9h65I!{>V{Os%WP~@ofW?U1rlKUb@^4JvG>~!K*l_y0el@ z?*)|@8sA@ONU>d%226vLalneFOG_0Tga<2U&GwU-!!u>%v4tbSFvZROTxCCU*Ro}V zpyd=SBuZ;;H(L4F3?*S)7Fd+)Q#x_4amt$_ls~?Ss3;#5!2x#AW1#7enc#BnY{kn@ zO;QR070;HbqN*?H?b%8yl}*C%Etsj;**_gE*}js!BbCg|Oe$EcWUyYS0KMWYU0HuDr@m^eozlTklrO(dP3 z3BD)`l|xVslC(g9f^3Nb1=)A>?JNb3qRSLGihhrjUKTh%tyJDI*Z)D!o09k7xV-zv zjU?xK@UgJcG@D;7Q-D}=o_4QQCiAql%Clza0_ChzN_oZ0%7Y@>-m}xxn4G&z9qIL5 zrkCJJim{E_p!{Y+-2Iu40d~{4LixcgU8dc8U`KDfMf`wL@GWJo#0%a~CYgW~?|4fo z=0!V|0s+8O{vMPnr?)EQ62G}yX==Alx7I7#jes-2YE-=tTc287iMEyIm~oJMPdQ?J z7wha7^32vJQ?^%s4;Xtvg$ipF8(oZRf~zh!u~70JtqJAY)Tg+^VdW!9z`@Vc7a^-) zje@L#zro{2%iu1@lq-<}NBoG;XN4%ms@r+;Np#tI1#MhKx)CM8Zg~PA4#JHg|Dfb zAR=O*BAlt_@`#_6Rc2@d3+F(wn!gWSSan>vlXv{8#M-Sz^+fiPf^#-csY(6LYI$Ya ztS9-RNsW`N*HDF(Tp#G4vh$R35{9U~dO2NsAUTra8mZmr#YlBXM1*@(9{dM)Z_%63 zkrP^A^=7s`1WXZXQX7O%6?jJsFuyCl)qW+#H$k2 z5oRDPm1U^8^xcn&%*&goV+6ud!EEinT#>0hiX;`u>a&tH+F8)HEv-y$pGI+d^Ca%& zRPVQm3<4*o1HVNd3%QUO1H5bfyi_VXbjoh8ZnQ$h6BA2u6E*libWr!05k>D|wJYD| zR(A=N;f$W@ZFIUwjo|D|^>U=ZB0oGxR5zJ-_|@)aapj9a!d9z#9}f+y5S)!@#$DR| zG;FZiisyD$AypD7uRu+r1-*Pl6pmG0bT}88`)hitospZBOO7`?jEyO!aT;IgtNsyT z!LISC0Dm?HUFZCPDo~aiqM2so+N&$%&hj-OwB@JM1=l&Lv=%r0ZJ38TG*E*?^r z(4{nM3@>~^%f~Tjul9|Yz3Eh`>Cj-zQ&VhK+)8g_o@4|G~V~T8i21PJ+ww!M1`jSnzO1KSd z$cH8koAls#gp97&8ga|D>QK7{4!TC3DWm7D#FWWc|45MyF$`*q$1bVC}S` z`j&d{P7!5Kar3sSNmz7aRQwIHW4wl|am6=k8(#mdI!FK@#ph_S2>qbKA_N@w2a~%9 zA!ud)C3SzK)RkvcYOqO+Z=o|E_)YbhplK^_q2W?J|ALBx0c#EU*<|g0Se56i$kY3$ zx>)K?H7)fd+IUHg*_xrj#jgj&|E4JHvuFq4#>h2cEyGN)z6R|nqr29X%Ia&w;m{}r z;A)?JG~P)&?$)=Z0KEnCA;?OvL}TB;br ziSY3ssKLkoK8jzUx8%Z9tq`mBP;d-|*FbPKzEAr>0+v$VchWe{AFM4FD!P)x@wm=h zh|(J1)jAgRl%ye4u&q%;Ug*#u)=NfeTOzDL1iz+UA4p&k->$z#6-~6BJntb5iM;Ls z-MQo$(g68VKT!SrdZpS3`Ev_2C=K#x_mgU<^b_oX>kjBcIexO%#x8)nw;5C8Q-b{Z zQcQBB2#gs)1rh2yyuVNbz~M+LAEST4U(eE#pr#{Ns&)`z09uf+4FIX^UQGQ>bF>_x zs>`cM?MDliH?mU7uSxKapQo)c1F`*blo=U#OEqYM@)v01c*-K}533b8vgb!IR#<%# zKea-eZa}feARhe5FEQGPhrq|2y)E%qN=IV9YPZ5>`OTD*6itAc& zCh}TNSf>>=wA4E|MNqcaSoX-c7?V%cr<%iC&!a zuUVQ%p89G_PT#JbjFcu(NfOJw=t1ad$2|rRCHPV_dmvp^Ecb zf6C9rkt+PYI)J@@Xh=VYtMDOXKW1>{w8>hCTA!x82i0`CWL0h4#im!Ap_q#=)8K;{ zt-}X%HszJ6Syc6|_Bxe0)FxtnjQ!`l?!&na^c@ja1iZYLCWhgpF&&Cf`CKl^)Vr8y z#S>~jI70dw@B~>)hZE9DHA-x8Xg5V~D9z)lPHKWgeP^hT0f-B0&plJUhc39)fs|Y6 zkANqPX5+*2^$rq!+fr`^{3X{jTEC?iv`i{otHbB5OilZ{%M5|G*#rotnhrXwp>6bT zc1tr$y^oE^x#`# zlmy9E)3&gFpTz=u+ZE%CFGwA1%+#f8#uhba={EhEWL<~~ODSG%pmVUNzSoS@nI-2m zH)r!`;CVF>w^V%~ zU@M!%AvLc)OQ1Vl8XVJ$`wrH(MM}@p<)eBw4;Y~%mCFm{nWF;pZnO@6kX1C}Q~gO= zFi^9LVYv$DpE8_R*DpYo;ZypTlpCwwzb#*HY89x?`(Z+}=pXYhll4ZDwY>aaMM)I@ zhCP6Z&UTtW+?X{eFIduO3UT)>H7U(eyau~rv~&6t<@@>)F`8_Qw+aZ1^VZdBc?wPwd6y;p=a1t<7Uq6@Pr`F&?B zx{XaE^tujU=!NH%UG#Z-HIg21 zXuz%eU$Um~OPerzM1cE>AP(eP^v?zOQ;9>zmbzWXmb#fLbJa$4c%5Fr&+gQxMM5o? z^{AS`{Z7@LzGL};z4}TMv~M;0)eO4!u{M#hD=v<-rdjH3^a|PrH}qg&j7;Y-J6C5H zwS+8AGrB>sHTqTS_UCeoQaSFZeo?Y+0o89HYEOUepVIR@g}wTx*RRIdR_evP$yryl zx8e9wrX8iPAJ=0kd!DM2`8TOj{ZiCqtKpL04#N>!BeL`)+J=EO|nMVIs^aHZh*U-c!D?cYo8C~Ac~ z=_2uFkiY*;PcT{EMl0`7V4?HhyziOYW9XsRoWD@UpLz`tqn$PizV19FdV7eUCLmI};a=zHcmmt(>f-C}AI(O{o172P= z?XKTC#NFJ!Dzmw!#~>>BreOkI8WJDHX_>xUyEPr4M{~p}Ai(O&s9UJgld0w%ytWDNdtd7}dFT zf8WQ*(-gKg#T7Q+hb!zE3fr5yc-0+_Je;5B`3F;OAJ{Y7&-cGpdbtJMi68Nuw+MCF zM-2mX`zH-QXXoQSU!)ZgqzgoXSud5&^11D2OWPK~(D&Ni27M7lKIojj*f!gT6Z$tK zy$$rGwuhTOA@PgzeM3ypjxBs904>i#Us9Bm!8t2@uS?di(Vg!pt4q_?i1PG1sN&fa z5075yd(MnxlsQY2p_nQ2K{0cl%A-?os9)>**lfRm$&NXHKRn=uro74fUiQt5w0bah zn?#0LFCG5H7e(_cd@oopZBUEc?5^}3Ft+ZNK$!<~axSbJFE}DS=at`MxrnejkLu+L&gXa>Dmjq;!>cT#g?iao!o< zYWT*%=x+*8xL1Q+eC;cr)hu13oUKtKDgT)$B+WSID@8Ch#lHcpm)Mz65Yid8jsVvH z7J~h}Z?(;W5YAu3UD?ZzclP57>wMSN7BV?jdbvvxKu)X2U_fQTMvqXe#hMn!j{&;u zuRd5N%zU5MkHEu2P5qfB`t(m<8_7Zihtd)#JRo%?6(*-zD8>iun*3w-SD*?_jp89D zKk~0xsh~QoAq9Q5wj8$jam$b3`?}%@PF}7EuCV*>G9lBXG$VB!ZYmD{;s_|dJbi6h zqTx@FjUv&Hgn?09e%OxvF8fNvK)Scuo*)QOOi+Dg{pR}krj`jUe@=NR{?&jzD*q7J zXcx@>2DlTXLeXIH7r@2z6T7ei#UjIGx77BO+tojiXQla{6lo?UQyPxSagVxY3vvo1 zj%e=>L|PFOeZ?>MBX~Dc63VjJ_!obIW+H!$YmmTDj^lB%pG=5!E_l%eJ9V{v02Th? zDm0+osp3%}+YfE-UoDu|imH=Rw+OQT15dkuuxt%B^*Tbwh_xM?z*T!)izNy~`X>p( z2QtWABOx04NGrbwhVsR(WWMV*e`bUgd1cNUG!kgE(Q^|3u=sl)ztwDwLq$zka-{Wx z7Uth6PJu7Hf*t++05NO|{J2!_^&TK=&ya!s7fn(#zTC_oEB%w+8wOagS$LqwHU|u` zKcD<&|DNl#&lC2a*cNm-)em?RrIqua^q2iT{4I=LCh_IgqA~O)myUQ^9^%j_zaC*h zO!ir^y1Q`2I6n{+Q%m|4sg`Q*6T+?}=INH5q7 z0c6*jbfl^;TZHM!up^&)&+uBkA)&w0(#R!P7d3>a{Ku>sCYPJ3A5sJ;F<#;godUMc_~OV9bon@yo~ za`lhtgm8*LG>3lh?-3fj@-3EOORG#a9(&2Z%q(Tmss-tJbg6HQg{lwxeZ2N(|8zSb zj$GILrz9)1g0bD%6Biwnu2Xo40eAnfF|~U@0;XTxW(}A{`0;fFBfew{G!zLQ3r?gT zluCD{m+?a}fu)kEXC{2G+Y}>$Jt}&<;C?SEIGujL;2wc{4QS!PvDa;#N z1hUQ1-SA!?#oNWx8E47xTM@0;?F?*;lDg9Ac7ZY0J4;#>Wl_KOfeLGHyxET`JH|sS zUW$iM?ht@b&Sr}{@Tc&Gvt){Y`@@PDz#JPu>;H_+rdR97HQ-Uf=^Bl!0I}J zN?r-TR9+bPG7@^Mx61=CfX)uU0Qvx(SrbU12Ym6dbar!~Idxha*v{7ZfompculBtZ zz>Rca05{SHsbHVoMPU#vE#5h1qa8|hnoZNNn9IP zYPUkov3)Rllg<}61ma8)V?kQJj7y25AzfN%ZqMV(0%0h*FC;j4VP)W96a2&QNK{C>D^jZY*nz;?4r?}q(InKAMms+YbhS^LGr0%} z0Tw^>S5XVP{iDEk>m#W9Q7V7i-iVHjj(UI#PXzv`j|ua{SAiL3>tlHO1V$#QGw#XG zHazrPU|lUbcVLRm3S5U>we>A*8f?b-JzVn;O7?qTv)D!f1rs}y%X+v5!|&(!0QR=0 z`0}~HM-qSfM__A&G=NJi!6PPH(enC5cUkHo=IorU6``UK9f}NgvChEvPqXLuz!6BS zUd7NT>EIwqK`&*1yHR33^< z<<>2NGi_E}zt#$FJNf;zU_;5iaJjwc9yFXN$_QmJ^0f|*x6NNPvFL6~y>()PYQ?X% z4i1zY(7nVKj~qU>P5LBHI#l*a4LPMv@GCR?ucnv4ZE;+OAVo?gROo}9%6&#{{E{~_ z7%gzGRz;xtraT}VTyM56LN!Y%E5B8UI%c)4ddb`)XttLQA1)73yT(HSWSyH}^!NKWn(4BG&3HEcle7n5yyd3@1*m_j1ISOQJFCph1_ z1P!d9lH1du^J<@lRnZ~sX^Gm62^K-8>W}6ZCkF4sc6`wW+gZI>xJUI#8^pPjg20a} zn;ad-F;jv+LNxzW`+Oypk4+m!)s55Asd#Ge6CRNlTxF7;=QHivVjqdSW_ydzj0~ol zplvB=Y@d4znckGq_{Ua}6|jBU+*{EzM3TxWr?fQ`3zLFtj402kt)FGI2V=w+tM&I3*sJwGcr#=369;G)4CT@?Ju0J@HSk@-Dt- zUhp-u^fH%MY1judN`l7(1on*G4G~GaB)B6(`ws*+L`DHc@Ut=UpZG%sXYC%|SRKqZTQ{KzXfl3p(UILhCnJ^CrQ^Yd2!N!# z3+B;VCxlAOk@tHwytISz7Bqv%pBdW7)hB~+1Kqi}rXMh3+oiPRzP8Y2bELPk7ccHw z8gCiFqrVE`Zub_Q>7D>Avva}s%+lNBoEwA@;jv^y_5KjV)(!1Na!V&r6;jsnflI+z zHYu0;{ubP1vTjF3?<}5?FqH4V8Z3vR0@*j6z~?#~NCi?1(ezws9iK&=5_ew}3wg9c>6`zMu02vmN|pLGbehJ(+|6xRF?g>ncK9=(ym z4{oH;9|F^k-AG|L^pk)p+u1AB&15|U!amwOBViWOd(8?pmbN82^NbV82`ZQv-ovX# zgb%>6xqk>o6`*{~3>_wnWHILs6wQ8eGkKr>4|xUyPu@u0XE%~(jOnQx$r~M-90|wo zV18(-6m|MgQql06nfW1TK0}_~q4zcyCKS~XUYh7!Dx}aCMn;D@f+gQj$!F$CVzS;R@zMDqkI-)9 ze3CMS%Kj4^N0_n$Xu)k|KoOAp|v;YNWS4ntr!x~0I5ORN>xJ;M;# zjc+8Y$=_tvGOOv0R1FAUvPC>7)^oU4IMyGbzz-uX9)FP`?Of7cV>5|E>`7~LI+k-> z5=n;xSy;)bCVpU4c%>u(>$qh~O6k#*JL&VKVNI-Mf;U=882PIzqAWqG7#qIJoPuNw zIq%t0YquGywnL2^{x&5^)aj%d=_xS$M~4RRllkFU$d!h0kkDuR>B?}5@Ij4B<(zq; z@e+?M4=)fRA+BX@FXBG1rgQJ<;jVUR3>O!L3ryDLc-opPe@+hmMS9iKq1VMXh^&jP zpHL@3PtOmxL`E~NJQ>_(P}|FdlxCM_xRP$75VnPSaqX!5cyJPdxLqtS55s2No;#fj z9)%b9+@R1(#dY9L{?K~3(Uyk?n52$y5K3r9f04IKV$+LZOJu}Yu==?)!anpoyPpmp S!o|JP9 zBS;B?il7h_6cr?hpduwvEFi*v?ne2Q@B98f&z;CEr_4EL&dfXS+58$WmtXDWifx)` znM~bO_OJictD3eHqh-yfmK_+mUBMO~3{l?ZRSgQ0WHSCWpUn3pc=3~9Mi)mHPnSTK zNSB;01zk$IRCEQ=CA}L$S13LS4%66KDO9?noe{gz|XP3!@P2NP3;B8HEg*T3* z*V}?*zSl!?zBh*CEN?TC)4bG7VVt)K$+6zXBu9B0ksRTTB01dKfaCygB*}i>dL;XL zBS>a?-6VT@T_n4Eog}+@9V9#Fd8O(*dTk^Vyk?TEy#|sky?T<3y;_nDz2PL?-Y}95 zZxBhFS4mRqRget#iX?-*JV}+8BPn`Gj{;w?fTXNoK56V(!90?W3+9siyB)|6dB6-EzgJhMr8_5gat|ZTUyU1jqZ4#!- zJMHaAH;#KdkUZjTNAj>Yon(bKjpQD03dwSBGPTp}v&v+0g^$!F{^cWeiBEhwlB>Pc zWpR<0x-9y<)LC(wcMi#1FLhR&;+;V<+xsfXSG-e6cK1#p*}*%RWGl`)0m_<$4dGjQ z$1iFc=5HF#ok8wt_%l8zl7A{TIrQwyw;Vl@)|8+?H zz97sOWE&yf9-0gpTX_M4MD-(1&OfK7b0{d)W0hV~37L$sqiWJjxe z;B1Tf8>W&kwHM?Gvej*+o1J0YD;_oUcrRQ5CvEC9QJ|6(aH^iV7o4oHjDzQyoEq-C z)H=LjSBHf%4jwdCk5>l0X7e&ZRtlF^xYDpJT0M+0rN62AlpykgY=sPJXQ}&_Zm>3n z8<#C|>=CQ>b3$kf&uCabO+5m~$EnxzEDW+s^i9!|pnk4kB6`x)E~Zj%vU>$VcC@Wj z!~k$zafji_bafiXLi`=nzXk~kLH0J}{-BJ7;@RpL_-SZz7>r9%Lgtz%yHIhi7l;mC|I^(4~h{V}o9W{OV*clr>iL!Csl_LmV?eZb?u}aEEB@@JVw; zEKJS`Y6L|MQxf4~PLLDwrv(X66QZ%8yRZ6|oS8rcY7cCPQ_qA7P-ozugVjo&nPK1u z309!)G=Nj)vw~9iR#6qB$;4^f+x(5?y>64N~Xk< zIqEc?8U54M_XHLs>3MKTb!u=3z3E(G_o@WhhPIHoLp=)LpRI1gF}r`BTB{Pn1lg7a zlCnlCBa8FAp@QrUsBNqsK;K%R@^f8S2&p}u3aPiGk2eG~i`3)Ah-I_9!I-~DoyVBV zzeLRotbS=T%~$x%a&-d*YXAieG%kqGRfnQyjoKO_h6}RIL#4{61&YL~GIb2kqWoLc z-337_$i9VBvqICLc!zqn*mTWIuLi?*s=b^ldhu+png(P>pn;-f$eO^(NSch9d(>|$ zSTo2}1+9b4t?UZe;O6^6T5NC_lzrw2aT_FSm8DAe%D2unS5_|y3QtW@9TSu9-a ztF@rxjJhC%>2XVyx|UPLEg9(539?lQfmX5>{>y5oiW$&#U0uzwR{m;rq9B?D*}=|| z3YNjd6h)Rar_$eZdrj!Mt!~d$iLc4LMp_X<-7C+VYQBcF4r-h9o}~RYkQt?EgiU`? zf5EdPDF0IZ)PG;i^Qo)n z)E#-20`n7nTOOtrE)) zZ`BM_uy&Z9p-yGkUZttzSo_j}K{WS5G(UxkHbGWAGSGL`OG}1&t)z;yx_@?B7Us1G zvNi6yUVSrOqkue{CZBci+cg%IU>9Vs!K$l{z+!XYoCccTZo^|slXg-vSE-EfiS$`-#q}4&?Ro)4GQ#HFp$#!QzOnXfPoY;|^0yQ(8p_r4V z$x<>mUh1rA&Wn|VZA;{i=h(q-Qt+9Z*7axN| z2WrY0d%1M5rbMhqrfINb_Fl%jgEbbO^+zE~6QvX*1=-nXxMU@3J7uiqTc#RV;`G)R zWN)R_y}f6=rZ*F%y=V~JOxErP*Jqlhcw?d_l4pZabKjz6IJrQxnuCnlmj2S(9s(Mp zwG!+LHOn#MRn0*;8;03?H7%L+)kmE4N*3I-SzVCovYvvBUqXT*-)G5_idoCCY@~vW z46O?_Mipy-u`4wf7#mtztocBU5@gF~NR4fWp{q2f6|50nTBjlVJ9>G9x1k_g7g&pE z-JrS6#F13d7`X6*?gorL9@GcpH)$djVq-zJvb$77Cv@-Bv|xC3o2Gyhn+UQ?9Rjz3 zZY#lcTT@RmKjRlgd!wn={x3ec#jy#Hep{1|g?lu4JevsRdsVUcq*5d2A@!MYITWAK zBuc%U1ew2CYw*bXnwK~z`-h z6z@@Kpjb4zr6N^4%Y|6Z*bp;ntSgyRR#%Qqh0O1{4w$+%{yGO#%-8;pHJt>psUW-1 z^Iv_y{f{+0IEdM&xe8T#EkSVhGfljlwq@bfc*s8Lu*01wtqapGYfkfwtW?)TJzVUT z7z^R;wM`(Vd*TS#)Lxs8<}Woracm~2`3Bdp`kLmhLTDz)KCUx+YMV|4)sZ$OlE$hz zaXJ-0N2;?I_WnUr!Lzw_!wC}$$ON>zuQ|oBd60SE@+p2^qnWK>F_`g(M$VKAwrRZ0 z1=%^!6eKr>vLvm$u2||s1}Dy@V)HO|wRI?i;vtR%sJb2=g_VD4wkt%BAX^qEb-O=Q zRELZBk*M7)7h4Fjsy=mhtCFEB7s28_QK9IJFZ+wiFLkX|xQw+|dk${2!Cv#h57V zWyY34`peoPaMx|hLz3+X=K_uY89CA6|JUH*5D0r$7pY{ z<#?)IgIESnCnipZ98S{@pT}x{Rf=&mr@OvTK?n><(rT3}cTD%Tqz83=LO=r)3j%Jwh9Wg4VqzW2koakTMe36Z6u_b8mKU~v-VR3 zTLWP_?EoB-p?!;IYoTV5rZrUVH42#0hjc|jLAfs|f@Vcf2$U@gl4E>-?N17^wID0k zzG$CZGpKdk5Gf{D_trpfD?#>2!oQxuqJrcwEUVHy;iO%qgs$~a^lOM4KY6T)`PU>@ zW6~JyS%JNdxnnhRNL|0gTVTpwjffj3X~%GEBjgrn>SMzkZIqHFV$WIH7MyC!(iz?a zK~|DeS6|wAXJgp>Wk?X{=V~XbHm@7!jTdAG`URenYhjWHNpAWE|2%DZsF*CsPA`xi zO@NB-#xQU#)0U{VE{XNFrJZH8^k9T!N8Vi0!<$5#i}S^uHpWO#shV+MQ@#tEJWV7KC5WW?-Ln+WkD+4vtT?rMO|EcASFk#F}SXHG{Gl zZRC)3KFEVzw`q@XY!}pUx*|yaE=UPkuWLQ9;J7vzKi{Ek#UmOQM35MC-xtdD781s(E?N*vXy<;an(An%hP zJ6Jbp=i#<0twt%P3$kMY`#uF~Hirk4smJbLY7cVa+tdIA&okQct=F_a^6VX0P^0ZD zHDI)oHu%aPw5h!4r?=jPvcI%%;jVky0X#c~WlVR2{ihznG5Tk1gk0=EV;30o0?6Ob z%i*7{k5``9Wc0QtR~)hr^Jzej$b|1Hs)C+oTv_R z9j>pd=GiH*Ukn-pJ-*d8gbh2Xt=|i}h!CNpAbVX3Z$@H{MpwkK_xyU@$8w<)IR}tA zOFN*>H>l{Yal$~GZW}w}x9j2s@g;J01xW9xn}dG0t_#mT@JH&%>USppbo7h+@d5Yx ztiP%5xWKyL36CzF7tc{EKLK?MT_dO*qN_zmE8Tla))lLhbuNy5>`&9R6 zmF{-OeS>v<73@o>T28wi-D$&c)F|C%j(r7=b~+m9vAXF&tQTCEsv9p}Ti?>#6OyOt z-eXt&({(h(zCmG@?m5qHpfFGRTa7}#E?p&LNP9}aO;dlbvje#e8uTyKb>YP8)PP$M zu}K$&(aUvT^6Wdfv__W(6&J#1K-#pXBAzVPHBt(hG$}!ILKO=+TXl)pcfD>GCw@yG ze-DFq=w87=8+FwRu{XI)wBOv(WntM?T`#8kagEITGDV<5;3m+`TadI}cSgKJpWcPy z4Z2uJJs#8$sgP$OLLZ88>Kr&~XFaSutV`wCPyTmwYvp2J3Wz&P#r$n!p3TtzD4D_g zbk#uR^>DJbe`&_Sho9NvVCXZ=3LJS#_p3teC&+e@5xt|UTTXc4b6s-=L0|C=AT5-; zAi*6E>H4KvGrV{$ydjfHX$bp!Q&{-%En6IJ`b4)=DZWBI8!DCZDpE|9%Gl5TtGWdO zd60S6boo5{)nBcvFA9UC`I~)5HxjC^q(s90+qzxipGA|s17YYL-FW5WWlg*TUQF@) z+q!yCaWhN;`4bBrk9Z%`<4MUeou=ei%53|WilKN&t}dVymM zvR{g#P{&~ha=P2^zJhxQ4W6CGVlFRG*$c|6fpD!cM-Ge#6EgF3^HrMN~@JtT5jRiB>&3dCsK3J3$PzX=@ngj0Ql$Q8bS3L!5X>Ej1 zsOX_rfi+UUTN=HmRIm!tukmEjBK2g^f*|&HU1wPNyKX8JZ{@@BlSca1JPU^GPZenp ze%jbt>SqT$(Ns_2PzZE-t~-hzNA$-WRB`$lQbR*AJudnr4>`()CU7hCsRmuMl2ue>=k$i=$#;3HCR7YL0CicM=237#OE|X)+B`r zHrw=3P&3l`2%0K)QxK44fmSx-yA?9b8b1tD9It%sXRLQsl7(h)ATF~tVPle#;Q(_2#v zS*ycDD2p%#LCxp}A~c(!Pggo#6TMjydKBRfPXqVHlx{CRFi2x%^UuU&TZxl~50bC3-S| z^-)+Z{fz`x%SB*=Vtu4i97)j+?Ra-|191B~{a~Io{MV|(MjQ2VB^!q^TlG(w*sNIY z9SfefsEQ^_=6c7#mbdg?W%QCD?`ZN`AmR;UU}Fq{SGVhJ%ErYVy`#vVtLs<5t$aAJ zu~HG|A&*Xs^6$`-U(*!QuSOYQ_g1|cHZC{nF}Xtjfr2%M@&o!#*!3O#5uQMd+OcXg zEI6q5Le@C75vqUXRCxTDzLNxJ#QOEWLfUbC7*w3pXF&03y$Pxh>4P92^kJCg*BcnV z{+@oU$XcLqR$m+}j;BT?K>0F52e|&3z8;J9U)Hx1#0j)(PL^)>Cy!1CX-6$#Sb0@X zE<_x)Hy&0FZ4-}4*Ysz3mH?TZ(--Mk8a(v zb!>b~xD--P4=0z`?*aRZ>N~;hX=?(@SIS_x7F$n+M{D%7<0nIHLD(x$^?;K@hS%xB z{6~791dMFhVeW?m|IqK`St_iWUhlWk18JGyS(n-XbN&eC_91vpoQ6WqwKe#S> zs$OQWNREnzoLljwq7mLnN1?%zb?Er3!#k0z!`-%l+Ys=p1DI&mU2`0R6W8>K z;5Hd`;=^s|h|?X^@lZcSoc{^>%|B?tgF4;r&E|ks}Y{ zwbh0cY}eLsif0*+{i@Y~mNdg%o@GMpb*?#7Z7{^+xDJL5JbM|1&ITIR-f-#r7R}+^ zM|vxE?`}ZCU4YHB5QvmvxW%)+0FT0B0B7qb;O0JtQ9SDh!!~d6ATc;TjoQW&Ug%R?wQMQ z_UDGh3}(+XEMr6A305pzYiQ>embpMM`6cBM1@U_3-6VLl3B0 zBVU3;ha1uC&L7s zvc|B6XQMGU-Js;)zR#tAHs_;5(Y?WNi?K1FS;u8T&I4{gxYu);Ft7{F%wcc2f?(e+ zt|x>aHvEZIn++{RHV$%YMhLrzoO*c+z3z>VFI03#& zHZ%wKJ;M;JSz{Q-K}vzk15eTnCMW|#7N{LAGuYP|x=>O{oY>Nn;PH53J#j%LtKPFi z>I7GFJhIMUBD~B}KLm>IaXsLE%TNVgeA^HwvdM6B9D()fQHI61DuMR(ZFOrd z<0C_h00s^4k>QTimP!6Ih7eJhDMb_%I;0`JvY%r){*Mi71#u3AH_buwk%5rw`K=Ts z6<^bae#wxnoK@b>JDVO#(G7(g5&BqAe`**kPJd0|orSrd8dfq66az<1Y>I5;C;*XLB*Gxn`K6V6zWqkMnXs>#q~IH;GfBvX?Rl zjunyl{YS%r)o5gMQ20SwTXRb;O(s*a#t;uxm1NVV-7^#`*!;Rmdpt7udA0zkrt^65 z4?`R;=6PCrT0oomh7x@JsbMV7@}Wn8q4Mw#pUJ_^y`hq3i*6mwZ)x5V=)bv7V_fK6fY&P_R6F?L!>>2 zpfQKBnhPzYr%PxqNdE;v`g*1+iD*fMN8+DMOjTvR9^Wg_pOXvz2)K}3-Dr*0nRH#O3pupC=YHlAa6 zA=cQ6V=JKbRO4XGiZi~+vz0JMp0EgV&KkqvufN*7j6Wq9%{(iD;?Zs1#O-a3gB67L zT>4gSq|A?L5G3|CQo^Kzu~I<^w)F1C6TDbVT_McJYMP6A8OB1we6Vdt;~5T8ro9eu9^Bat8zRm)3--sr1qk=@Fqk z;<{K*D=5!WH2ELO31N6U+vw!jdRTGHNO_Hs#ydRQfU7E{h7>m?05zxmAW%+{(S`MMj1;7Af=ic-PPo^~n2f`w8@KXoGn7{u%b;Qj|31ta)rP>> zMSL&}O)|bAY3LcW{n%)NwsVaivMpGC*%;1BeriKKb_JV+blPJ#Ivn%b4SWze683xizo1>VuFtLzBNYL z``*I+#l~g~Dt4uWVd{EgQ>8!w{-=| zq1jh)ypI&2|1n($VC)g&ryLRPf`N^VHmIJ&H-t~J_&(5c0pAPr9_x~+c})$-I!u}zm!-+!hqQF#DSZE`ahHk-nDec%h>3eiUq>Lj zgK0ag>}ehW#b25_;LEp-!BS#&=sjaOFTO*s9K+aZ(`gPr{Mp!+@y8S5u;6FYXoeGi zH3G*@K<;i;cY?Bwgo+R#w6Y%gR!@!OTUEl%Xy!f~X__6xb8`uB&WC*-5BOmDXHu+U{%z|O*{TGL59?KV-a^&?Ox zm=dsUr0GMRor8!nO#__pmobYWWiJRzUjDMSF$``M76!$NhVg6XnQXA-H&fKwN)z~- znkYi~7}D<>8$(JDV>|HlH}8QAhbbJBdKynL@O)>S218q#wy{s(LT_UWxc;^&9J+Nh zc7(LvrdOac%%p~xJG6}UA2jLF-pcen$1cF7i{=<863j)gqP@8vOzC1I?|(GayuYWG zw)BEXBhE@Rm8%5G2cNDByE59F_KWAKx0j$m5gZNs%cIqp(!n%eDFz9$J<}yU-N(H> zOfPd{6}@&DbH|%rquu_1X+1W2+4MDIwdV9KSnM*1?0NlQq_ zB=vqq*Ht(bVv4~VHKurm0aEw7b+)kHFgcrYtDxVk&@(pPSl(a;Aw=*)s7uXhugjgon=@6xx&~W`g@C^?Df7 zfmt!{RZ}6yzJY?tljen6i{o9{hNM)YBsbtDlr-P$W*n75t5S2Y4o!B-V_0i>@Ew8=J`qLni$_ zxusIu^Xx~s^ouD5GIkjan9`c+!I)o7J!zi*kC7HJVY}&pC{phHUE_b%cUG$9d%Erc zyJ>nG9@WiLP2upOE*JR+x#yoDWPTgp5JD z!&HC^&zctS>=(%1X>^rtF_UjM*lgyo-38Mr#vVb$3{x5`C}K)j@rB7QB}#}eahLXx zsxyQuiA7(;SNzn&b?7)tWRM6uoI`QJQO7 z=)Wed&_7V^F+bywyJcdGJ%-%#rXuv@n09j5_IuM3g+O`#Lv`D3b-wA5)Gfl{#HU#P z%ruM^@hwvo6i+rc#)@o{z%c6`xUKwx=|@m^H6_5< z4y-%oisscE(Qjf$o7!NC()>P80G$wGmZ&q3Il;X9UqxS$3XsDAm#G)Hb4)>?elvPC zJ~W$8DwrAfyUop+D)@D^k0Nq^q}1qjjK*57TsPilqM3%)YtQTA|KbY~7KR}y8SshN}?f~Pi_Gz{Fw z%%idTtcg%Y`p(BfA-5M9xUzQ?@;ZwEWD&^oXl>pqvT$7WmuU(osh-^BmgbRQOEv#M z$lNMsegkPXt2y+yGZ%@1mD(?Xt!YR@H#5)&?dxNG#8<$8HL6>q@lsDH3X$tj<1kJC zuTBI?-z{}Q4>#gW$xsz%-XhgfUqN6Sjn-AX*5BNaa5l`%HZ|h@H4kl2wA+{r#jDI_ zsO)D-g6a!l#7&aP&2Y2a{0d}zCs)8SEyaKv2c|T@*R#yU3W+aq^lz6s-?R%YaxD>>HKi0@tR7cb`$qZZo}H{W z4Y+xhnZj)sl%F>Z1DZmu;A5UPt>&#vnfUuWvsEQHDeDHBooWiI^GyllSIQ$c4DvYy z+2Mb+2BI0i#dL6ecH@~fvSR1(WuB>Amx2FVM) zX(Uhia!9`8BetC4fNvtn-M$GVxBAADT#y+BwD6GDoB!hk3sUv^*2tAQM z@^vOz<9mtZ557($Z~BNfDF4dWf#g|VJCY}SX(adgQb}(25p7Vu%}2CBd8w~0$r4{) z68%}_YeRCSk9eQ*CB6ib`96Ypqdx-+sW?^F zLMl!bUr0r$JcU$*s!<^op^7M^B2<<_Dng|#q#{(oh4n}Zg;bF8X`!3sy+SHZd9lzz z@-T?kzNue7%sSrgCASj^w;Tnh45Q3&Tl{Eew<8$&>>MX+kJpE({{sy--E6 zL!p9XYN1FnsZbypU&xb;E96K<7BZ4fA2nU>_7Q?B5AbH?n*W1|`Ov2&!+O_86^nO# zRIzx&7e?|+AJv;De(s|wE`I8x>cxvbs$P8GrzCmGCntH-M~x8CM~x7-`=}9OxsR%s zMfynm|4E*z*@ZNSs+>X^KGmc`8a~yyLK;5R=)zcPbi>%7R&jCAuhzIhS~o*@f0_A? zAVv_?AX-AXh~Ku&tWh;y>-4#4L8VESHn5-)IZ+x~ddVF|nUEc3%7ipQVUL-xfu<-_ zNPnBbmV@RvOgLmdPmB@BmIp^bTBb1@7acR_DTVq{{20jbQM69!#`n#e#MqMQzIy%- z%+Hx9&8`-hdEdC3L)w05gE@TO+>^B=q{CE1Nv{agc&Pf?ac?t1(kFk_=O>8;BLmGbJwlv~J$pmzP@;@yUcSTyZs92-z&zo5|Q8FLh zp?sdGN3+LrS|xF0Ou=cTRk?_}>SFGvSvA^Y^LLhF}vpPSg;;}^w*OIhKc)n0A$BBN&5{B;KmK#jW zpo#}T!9JxMQl41$msIrF3io0xYN*VXHw90m<@=KS8zNMk)4Q;`+R{$K732dU_NS1| zQ2DLpbxa;-`G8}CK;yDLd_iiPk0&=KEeyCdgF#ah;({u>wFJuMTa5T|jwPOFL-4@; zkX}UNx^MX+a39iUT28Z}c%X-YZttJ2(Me@&2-G(Wn9KV7Md<_K_?DzdP+P5fq#{p9 zsgz+0Eq{vRKN{m}hQk(F!dOst<#=CHf?*2!Ny^Tw>weW@ON>a{gM2u+C)o^;7ia$k z)TW@|wPm*3_;jg7!BKu`N_QLWu*)s9!;S=vU7?4X&K3C?9MagA+Dd*70mCUW&5Eu+o8+E_jmJ)5#C9+1g9`8;6$$TL`<} zZnsUqqHUJxa^luqIBFp_#U2YKZ-~TIK2&OUe+go?kb#ru7LWJE((V2)ZX2cBQWXe20jwq?5i zk!7MNv=U@L2D}xdx!Q{p$y1Q$VS1WX$zjMd%b);jYL{JVzM1Ey=!<^8cH@GXtaLgX8g5GvwT|q~f3u>kgh3N|V$9#Wf+_aH84@JX?sD zCRvDKMKnzp(&XJ2=))pBupy}z+0KcUccsqeV9oj@i54%DFUD1KG~Jlg-x`KQ@vIhD z0=gru_n5f!-Cn+U)I?by1ekX6Wf(EaLJ9kfL%|wc8D$9xl<*ovjI-FFGTs`69h+Kd zTCXT6A0Pie7vUTZ>7`(~NOa2`eO~A!Oaexf*dxXIHWQaqlZqkSWBI0}vS$cBNVD!& zvNpK6i#3~LMgH#AtAdzBq`-DBKCh2sGOg=4aW#Fp7Rq<04TGv~N-JcXcU6>RbW>w; zU+Wm9K>V(qb;%kUsYa+CYJJGWHT2Cos9opmdNAu+8DEmWl>$qdd_B}|bY4AJwZOw5 zJjPiI`4g==P>-?xLV#t#a4Q86-}nj2#D(Ln3mAKy@^RK8c>cgy57kGVi`c;mZw4!= z%z0HRY$K6?UHXG%_ns03`~zNdaQ^Xw3}WJ)jijfWAg9b_I#|3UhcDUmH1NUZgSj6M zBq(FHbsLf0M#RN=T8;8};8KQDhpu^6;`)^lV^K$IBHv1zZ#ig|lFx4|wEn=eH*nSJ zhAsvdS6UZg@r;yI!kwq3GzI-@)ZI5By??_)_|9@`HwnblT-OuHZ%~_N#I`c)adfe@ zQYlX+(?c1+f99(JcdWO*!ZGk~wEiwgVS@)mVrXGu9F=yHOT%b7nV zG@JUi-FlhrLScuMme_8n3bNeA2Yajr38kzGv$Vp*3hOx{n?aSIKOse5x6eHYl+7z>z+oQ8@dAby0xJCa-`?E$vO9W=e_z%9dJ2;)Y7=IG!DV`#o%4Ty(}d zpC<&edskwlY;hQ-BG|q++=QoSN;P0(Haoo4o4U8RuVGpbnmVIZXuD*Pnk8^gev+

    vX^Pl|nvH{K=>1TOBe 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 From 9e639d249062d99788b6b10e022d79acc066c78a Mon Sep 17 00:00:00 2001 From: dan Date: Mon, 3 Feb 2025 17:54:55 +0000 Subject: [PATCH 035/194] Fix a use-after-free case in fts5 provoked by fuzzdata8.db. Tcl test case pending. FossilOrigin-Name: a4962df665084e423e020be9a2834b6886a8e3feb461cff5358b61398a2a20d2 --- ext/fts5/fts5_index.c | 16 +++++++++++----- manifest | 17 +++++++---------- manifest.uuid | 2 +- 3 files changed, 19 insertions(+), 16 deletions(-) diff --git a/ext/fts5/fts5_index.c b/ext/fts5/fts5_index.c index a8ac98b699..0b2d399f82 100644 --- a/ext/fts5/fts5_index.c +++ b/ext/fts5/fts5_index.c @@ -5466,8 +5466,11 @@ static void fts5DoSecureDelete( ** This is called as part of flushing a delete to disk in 'secure-delete' ** mode. It edits the segments within the database described by argument ** pStruct to remove the entries for term zTerm, rowid iRowid. +** +** Return SQLITE_OK if successful, or an SQLite error code if an error +** has occurred. Any error code is also stored in the Fts5Index handle. */ -static void fts5FlushSecureDelete( +static int fts5FlushSecureDelete( Fts5Index *p, Fts5Structure *pStruct, const char *zTerm, @@ -5512,6 +5515,7 @@ static void fts5FlushSecureDelete( } fts5MultiIterFree(pIter); + return p->rc; } @@ -5595,8 +5599,9 @@ static void fts5FlushOneHash(Fts5Index *p){ ** using fts5FlushSecureDelete(). */ if( bSecureDelete ){ if( eDetail==FTS5_DETAIL_NONE ){ - if( iOffrc!=SQLITE_OK || pDoclist[iOff]==0x01 ){ iOff++; continue; diff --git a/manifest b/manifest index 4d31836afa..427775cda2 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C New\stest\scase\sfor\stest/fuzzdata8.db -D 2025-02-03T17:45:41.279 +C Fix\sa\suse-after-free\scase\sin\sfts5\sprovoked\sby\sfuzzdata8.db.\sTcl\stest\scase\spending. +D 2025-02-03T17:54:55.366 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d @@ -112,7 +112,7 @@ F ext/fts5/fts5_buffer.c 0eec58bff585f1a44ea9147eae5da2447292080ea435957f7488c70 F ext/fts5/fts5_config.c e7d8dd062b44a66cd77e5a0f74f23a2354cd1f3f8575afb967b2773c3384f7f8 F ext/fts5/fts5_expr.c 69b8d976058512c07dfe86e229521b7a871768157bd1607cedf1a5038dfd72c9 F ext/fts5/fts5_hash.c adda4272be401566a6e0ba1acbe70ee5cb97fce944bc2e04dc707152a0ec91b1 -F ext/fts5/fts5_index.c f1f6da5938af616e0a5e54f0423a3134df95b9f17ac1c6ebf2e2e8132bbc75b9 +F ext/fts5/fts5_index.c 3f04b9bbcb211ad52c466396eb8de4a76506d08db31eb017df1eb69c02b6c5b3 F ext/fts5/fts5_main.c 9a1daef7247f9b8a50b4159323e340efa6b0e4bea4fcd83580480f94d4f2c888 F ext/fts5/fts5_storage.c 1ad05dab4830a4e2eaf2900bb143477f93bc17437093582f36f4b818809e88d8 F ext/fts5/fts5_tcl.c 7fb5a3d3404099075aaa2457307cb459bbc257c0de3dbd52b1e80a5b503e0329 @@ -2205,11 +2205,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P d2fe6b05f38d9d7cd78c5d252e99ac59f1aea071d669830c1ffe4e8966e84010 -R 02fce09966e6e21a0a59cdeb994f84e8 -T *branch * fuzz-data -T *sym-fuzz-data * -T -sym-trunk * -U drh -Z b5d75fe3951f12b9fb4038728f5d0116 +P 8a882f976e22100b91c7ca4119123f16ad5f03311f0a6dc17449bcdcff29618c +R 31351815235c0913d39613cb0514c8c6 +U dan +Z cc507b6dc0a3473a2a3bc1fa7ec940f9 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 8024622a5d..a6434c556d 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -8a882f976e22100b91c7ca4119123f16ad5f03311f0a6dc17449bcdcff29618c +a4962df665084e423e020be9a2834b6886a8e3feb461cff5358b61398a2a20d2 From 6e5802fc744d3345b03fa4bbce98c1889c8bcc54 Mon Sep 17 00:00:00 2001 From: stephan Date: Mon, 3 Feb 2025 18:01:42 +0000 Subject: [PATCH 036/194] Improve the JS-side sqlite3_set_auxdata() test to also trigger the case that the aux data actually gets reused. Test changes only, no library code. FossilOrigin-Name: 9f27379d860518e6e097a2c999da04176812260a61bf11fe495c3efd76971806 --- ext/wasm/tester1.c-pp.js | 18 ++++++++---------- manifest | 12 ++++++------ manifest.uuid | 2 +- 3 files changed, 15 insertions(+), 17 deletions(-) diff --git a/ext/wasm/tester1.c-pp.js b/ext/wasm/tester1.c-pp.js index 9038d68328..28d61de071 100644 --- a/ext/wasm/tester1.c-pp.js +++ b/ext/wasm/tester1.c-pp.js @@ -3445,7 +3445,6 @@ globalThis.sqlite3InitModule = sqlite3InitModule; const stack = wasm.pstack.pointer; const pAux = wasm.pstack.alloc(4); let pAuxDestructed = 0; - const args = []; const pAuxDtor = wasm.installFunction('v(p)', function(ptr){ //log("freeing auxdata"); ++pAuxDestructed; @@ -3457,10 +3456,11 @@ globalThis.sqlite3InitModule = sqlite3InitModule; wasm.uninstallFunction(pAuxDtor); } }; + let nAuxSet = 0 /* how many times we set aux data */; + let nAuxReused = 0 /* how many times we reused aux data */; try{ db.createFunction("auxtest",{ xFunc: function(pCx, x, y){ - args.push(x); T.assert(wasm.isPtr(pCx)); const localAux = capi.sqlite3_get_auxdata(pCx, 0); if( !localAux ){ @@ -3477,15 +3477,12 @@ globalThis.sqlite3InitModule = sqlite3InitModule; pointer this function, and cleanup (at some point) using wasm.uninstallFunction(). */ + ++nAuxSet; capi.sqlite3_set_auxdata(pCx, 0, pAux, pAuxDtor); }else{ - /* This is never actually hit in this example and it's - not entirely clear how to cause it to. The point of - this test, however, is to demonstrate that the - finalizer impl gets triggered, so we're not going to - fret over this at the moment. */ - //log("seen auxdata",localAux); + //log("reusing auxdata",localAux); T.assert(pAux===localAux); + ++nAuxReused; } return x; } @@ -3493,13 +3490,14 @@ globalThis.sqlite3InitModule = sqlite3InitModule; db.exec([ "create table t(a);", "insert into t(a) values(1),(2),(3);", - "select auxtest(a,a), auxtest(a,a) from t order by a" + "select auxtest(1,a), auxtest(1,a) from t order by a" ]); }finally{ db.close(); wasm.pstack.restore(stack); } - T.assert(6===args.length); + T.assert(nAuxSet>0).assert(nAuxReused>0) + .assert(6===nAuxReused+nAuxSet); T.assert(pAuxDestructed>0); T.assert(pAuxDtorDestructed); } diff --git a/manifest b/manifest index a55702d8dd..112bf1a5df 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Rework\s[76c8435a]\sto\seliminate\sautomatic\sJS-to-WASM\sfunction\sconversions\sof\ssqlite3_set_auxdata()\sdestructors\sbecause\sit\scan\sleads\sto\sleaks\son\severy\scall\sof\sa\sUDF.\sThis\sfeature\snever\sworked\sbefore\s[76c8435a]\sbut\sfixing\sit\swas\sill-conceived\sbecause\sof\sthe\smemory\sleakage\sit\sintroduces.\sWASM\sfunction\spointers\scan\sstill\sbe\sused\sas\sdestructors\sin\sthis\scontext. -D 2025-02-03T17:34:12.962 +C Improve\sthe\sJS-side\ssqlite3_set_auxdata()\stest\sto\salso\strigger\sthe\scase\sthat\sthe\saux\sdata\sactually\sgets\sreused.\sTest\schanges\sonly,\sno\slibrary\scode. +D 2025-02-03T18:01:42.876 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d @@ -696,7 +696,7 @@ F ext/wasm/test-opfs-vfs.html 1f2d672f3f3fce810dfd48a8d56914aba22e45c6834e262555 F ext/wasm/test-opfs-vfs.js 1618670e466f424aa289859fe0ec8ded223e42e9e69b5c851f809baaaca1a00c F ext/wasm/tester1-worker.html ebc4b820a128963afce328ecf63ab200bd923309eb939f4110510ab449e9814c F ext/wasm/tester1.c-pp.html 1c1bc78b858af2019e663b1a31e76657b73dc24bede28ca92fbe917c3a972af2 -F ext/wasm/tester1.c-pp.js 45000532cf83f23a52b31581c1db44bfb82e383b1b68703ae4d3d838de3a833e +F ext/wasm/tester1.c-pp.js 05a0143c44a4114aad0ed40ce73c528febc3e0d6b69f48a51c895d7030015b74 F ext/wasm/tests/opfs/concurrency/index.html 657578a6e9ce1e9b8be951549ed93a6a471f4520a99e5b545928668f4285fb5e F ext/wasm/tests/opfs/concurrency/test.js d08889a5bb6e61937d0b8cbb78c9efbefbf65ad09f510589c779b7cc6a803a88 F ext/wasm/tests/opfs/concurrency/worker.js 0a8c1a3e6ebb38aabbee24f122693f1fb29d599948915c76906681bb7da1d3d2 @@ -2209,8 +2209,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P d693c2dddbd10a2e0b77893b04b11502e30b768f1b06814105f7f35172845fb9 -R bdcc5096cc30e3d83fdf5d66602909e7 +P 3fb993af0caf041da934cea29c039b27c468be0b75bce1537a6425767cf9bf8d +R b579198e5351884de756285222a8e6ad U stephan -Z fd720e9f1383b7c5da4643ab36634ed7 +Z a4679fe65a08b67080b3faca6c413001 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 01d5aa1d3c..9f939bf3fd 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -3fb993af0caf041da934cea29c039b27c468be0b75bce1537a6425767cf9bf8d +9f27379d860518e6e097a2c999da04176812260a61bf11fe495c3efd76971806 From dbe48d3c8d5b8278b289d2f76066dacb29e2efd6 Mon Sep 17 00:00:00 2001 From: drh <> Date: Mon, 3 Feb 2025 18:36:05 +0000 Subject: [PATCH 037/194] Enhance fuzzcheck so that the --sqlid and --dbid options can specify a range of tests to be run. FossilOrigin-Name: cdd0af6f86e49ade1339ad5a3cc444400a9722a9efdf84a30b3ff9428b7ac36d --- manifest | 13 +++++------ manifest.uuid | 2 +- test/fuzzcheck.c | 57 +++++++++++++++++++++++++++++++++++------------- 3 files changed, 49 insertions(+), 23 deletions(-) diff --git a/manifest b/manifest index 6bc22b6c72..747c094a70 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Fix\sfor\sa\spotential\sUAF\sin\sFTS5. -D 2025-02-03T18:05:54.347 +C Enhance\sfuzzcheck\sso\sthat\sthe\s--sqlid\sand\s--dbid\soptions\scan\sspecify\sa\nrange\sof\stests\sto\sbe\srun. +D 2025-02-03T18:36:05.574 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d @@ -1277,7 +1277,7 @@ F test/fuzz3.test 70ba57260364b83e964707b9d4b5625284239768ab907dd387c740c0370ce3 F test/fuzz4.test c229bcdb45518a89e1d208a21343e061503460ac69fae1539320a89f572eb634 F test/fuzz_common.tcl b7197de6ed1ee8250a4f82d67876f4561b42ee8cbbfc6160dcb66331bad3f830 F test/fuzz_malloc.test f348276e732e814802e39f042b1f6da6362a610af73a528d8f76898fde6b22f2 -F test/fuzzcheck.c 1671559091b3e134ec807490f624d306b24bd9a8f03b12aa97e292f4b31e5d96 +F test/fuzzcheck.c 5445da3b9b509759dc91c7a3c8d660f4056e25ae85274d6fe40c372263ad0bd7 F test/fuzzdata1.db 3e86d9cf5aea68ddb8e27c02d7dfdaa226347426c7eb814918e4d95475bf8517 F test/fuzzdata2.db 128b3feeb78918d075c9b14b48610145a0dd4c8d6f1ca7c2870c7e425f5bf31f F test/fuzzdata3.db c6586d3e3cef0fbc18108f9bb649aa77bfc38aba @@ -2209,9 +2209,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P 9f27379d860518e6e097a2c999da04176812260a61bf11fe495c3efd76971806 a4962df665084e423e020be9a2834b6886a8e3feb461cff5358b61398a2a20d2 -R 0c55f60057cb31a548300850eb056c7d -T +closed a4962df665084e423e020be9a2834b6886a8e3feb461cff5358b61398a2a20d2 +P e33f2fedda17b4f3678fc23c438093c256b0c125da5f1ac42ecaf3d604d54b6a +R bf3f5a9cd383f24f2f19fa2e86a993c0 U drh -Z ecbc0f1712cef7fa05faf26775dcb9fc +Z ca078f36d189947e36e0ecf82c334d57 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 2be9591865..7e3b1689f6 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -e33f2fedda17b4f3678fc23c438093c256b0c125da5f1ac42ecaf3d604d54b6a +cdd0af6f86e49ade1339ad5a3cc444400a9722a9efdf84a30b3ff9428b7ac36d diff --git a/test/fuzzcheck.c b/test/fuzzcheck.c index 390d804df1..e6b9ed3bb7 100644 --- a/test/fuzzcheck.c +++ b/test/fuzzcheck.c @@ -507,7 +507,8 @@ static void writefileFunc( static void blobListLoadFromDb( sqlite3 *db, /* Read from this database */ const char *zSql, /* Query used to extract the blobs */ - int onlyId, /* Only load where id is this value */ + int firstId, /* First sqlid to load */ + int lastId, /* Last sqlid to load */ int *pN, /* OUT: Write number of blobs loaded here */ Blob **ppList /* OUT: Write the head of the blob list here */ ){ @@ -518,8 +519,9 @@ static void blobListLoadFromDb( int rc; char *z2; - if( onlyId>0 ){ - z2 = sqlite3_mprintf("%s WHERE rowid=%d", zSql, onlyId); + if( firstId>0 ){ + z2 = sqlite3_mprintf("%s WHERE rowid BETWEEN %d AND %d", zSql, + firstId, lastId); }else{ z2 = sqlite3_mprintf("%s", zSql); } @@ -1883,8 +1885,10 @@ int main(int argc, char **argv){ Blob *pDb; /* For looping over template databases */ int i; /* Loop index for the argv[] loop */ int dbSqlOnly = 0; /* Only use scripts that are dbsqlfuzz */ - int onlySqlid = -1; /* --sqlid */ - int onlyDbid = -1; /* --dbid */ + int firstSqlid = -1; /* First --sqlid range */ + int lastSqlid = 0x7fffffff; /* Last --sqlid range */ + int firstDbid = -1; /* --dbid */ + int lastDbid = 0x7fffffff; /* --dbid end */ int nativeFlag = 0; /* --native-vfs */ int rebuildFlag = 0; /* --rebuild */ int vdbeLimitFlag = 0; /* --limit-vdbe */ @@ -1942,8 +1946,18 @@ int main(int argc, char **argv){ cellSzCkFlag = 1; }else if( strcmp(z,"dbid")==0 ){ + const char *zDotDot; if( i>=argc-1 ) fatalError("missing arguments on %s", argv[i]); - onlyDbid = integerValue(argv[++i]); + i++; + zDotDot = strstr(argv[i], ".."); + if( zDotDot ){ + firstDbid = atoi(argv[i]); + if( zDotDot[2] ){ + lastDbid = atoi(&zDotDot[2]); + } + }else{ + lastDbid = firstDbid = integerValue(argv[++i]); + } }else if( strcmp(z,"export-db")==0 ){ if( i>=argc-1 ) fatalError("missing arguments on %s", argv[i]); @@ -2043,8 +2057,19 @@ int main(int argc, char **argv){ bTimer = 1; }else if( strcmp(z,"sqlid")==0 ){ + const char *zDotDot; if( i>=argc-1 ) fatalError("missing arguments on %s", argv[i]); - onlySqlid = integerValue(argv[++i]); + i++; + zDotDot = strstr(argv[i], ".."); + if( zDotDot ){ + firstSqlid = atoi(argv[i]); + if( zDotDot[2] ){ + lastSqlid = atoi(&zDotDot[2]); + } + }else{ + firstSqlid = integerValue(argv[++i]); + lastSqlid = firstSqlid; + } }else if( strcmp(z,"timeout")==0 ){ if( i>=argc-1 ) fatalError("missing arguments on %s", argv[i]); @@ -2292,13 +2317,14 @@ int main(int argc, char **argv){ const char *zExDb = "SELECT writefile(printf('%s/db%06d.db',?1,dbid),dbcontent)," " dbid, printf('%s/db%06d.db',?1,dbid), length(dbcontent)" - " FROM db WHERE ?2<0 OR dbid=?2;"; + " FROM db WHERE dbid BETWEEN ?2 AND ?3;"; rc = sqlite3_prepare_v2(db, zExDb, -1, &pStmt, 0); if( rc ) fatalError("cannot prepare statement [%s]: %s", zExDb, sqlite3_errmsg(db)); sqlite3_bind_text64(pStmt, 1, zExpDb, strlen(zExpDb), SQLITE_STATIC, SQLITE_UTF8); - sqlite3_bind_int(pStmt, 2, onlyDbid); + sqlite3_bind_int(pStmt, 2, firstDbid); + sqlite3_bind_int(pStmt, 3, lastDbid); while( sqlite3_step(pStmt)==SQLITE_ROW ){ printf("write db-%d (%d bytes) into %s\n", sqlite3_column_int(pStmt,1), @@ -2311,13 +2337,14 @@ int main(int argc, char **argv){ const char *zExSql = "SELECT writefile(printf('%s/sql%06d.txt',?1,sqlid),sqltext)," " sqlid, printf('%s/sql%06d.txt',?1,sqlid), length(sqltext)" - " FROM xsql WHERE ?2<0 OR sqlid=?2;"; + " FROM xsql WHERE sqlid BETWEEN ?2 AND ?3;"; rc = sqlite3_prepare_v2(db, zExSql, -1, &pStmt, 0); if( rc ) fatalError("cannot prepare statement [%s]: %s", zExSql, sqlite3_errmsg(db)); sqlite3_bind_text64(pStmt, 1, zExpSql, strlen(zExpSql), SQLITE_STATIC, SQLITE_UTF8); - sqlite3_bind_int(pStmt, 2, onlySqlid); + sqlite3_bind_int(pStmt, 2, firstSqlid); + sqlite3_bind_int(pStmt, 3, lastSqlid); while( sqlite3_step(pStmt)==SQLITE_ROW ){ printf("write sql-%d (%d bytes) into %s\n", sqlite3_column_int(pStmt,1), @@ -2333,11 +2360,11 @@ int main(int argc, char **argv){ /* Load all SQL script content and all initial database images from the ** source db */ - blobListLoadFromDb(db, "SELECT sqlid, sqltext FROM xsql", onlySqlid, - &g.nSql, &g.pFirstSql); + blobListLoadFromDb(db, "SELECT sqlid, sqltext FROM xsql", firstSqlid, + lastSqlid, &g.nSql, &g.pFirstSql); if( g.nSql==0 ) fatalError("need at least one SQL script"); - blobListLoadFromDb(db, "SELECT dbid, dbcontent FROM db", onlyDbid, - &g.nDb, &g.pFirstDb); + blobListLoadFromDb(db, "SELECT dbid, dbcontent FROM db", firstDbid, + lastDbid, &g.nDb, &g.pFirstDb); if( g.nDb==0 ){ g.pFirstDb = safe_realloc(0, sizeof(Blob)); memset(g.pFirstDb, 0, sizeof(Blob)); From 589796cd890c8be02a92dcbb3e2a0bcb248b6a75 Mon Sep 17 00:00:00 2001 From: drh <> Date: Mon, 3 Feb 2025 18:49:06 +0000 Subject: [PATCH 038/194] Fixes and improved documentation to the new --sqlid and --dbid range options in fuzzcheck. FossilOrigin-Name: 59e26632449163a36b803cc7027ed99c1f6b675dda6f0b2b12bbe55884923f08 --- manifest | 12 ++++++------ manifest.uuid | 2 +- test/fuzzcheck.c | 10 ++++++---- 3 files changed, 13 insertions(+), 11 deletions(-) diff --git a/manifest b/manifest index 747c094a70..5abab47021 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Enhance\sfuzzcheck\sso\sthat\sthe\s--sqlid\sand\s--dbid\soptions\scan\sspecify\sa\nrange\sof\stests\sto\sbe\srun. -D 2025-02-03T18:36:05.574 +C Fixes\sand\simproved\sdocumentation\sto\sthe\snew\s--sqlid\sand\s--dbid\srange\noptions\sin\sfuzzcheck. +D 2025-02-03T18:49:06.094 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d @@ -1277,7 +1277,7 @@ F test/fuzz3.test 70ba57260364b83e964707b9d4b5625284239768ab907dd387c740c0370ce3 F test/fuzz4.test c229bcdb45518a89e1d208a21343e061503460ac69fae1539320a89f572eb634 F test/fuzz_common.tcl b7197de6ed1ee8250a4f82d67876f4561b42ee8cbbfc6160dcb66331bad3f830 F test/fuzz_malloc.test f348276e732e814802e39f042b1f6da6362a610af73a528d8f76898fde6b22f2 -F test/fuzzcheck.c 5445da3b9b509759dc91c7a3c8d660f4056e25ae85274d6fe40c372263ad0bd7 +F test/fuzzcheck.c 6fc952750a69168dd5fea38b9d35cb38475bfda15c8acfd156ac09cd03ddbd3e F test/fuzzdata1.db 3e86d9cf5aea68ddb8e27c02d7dfdaa226347426c7eb814918e4d95475bf8517 F test/fuzzdata2.db 128b3feeb78918d075c9b14b48610145a0dd4c8d6f1ca7c2870c7e425f5bf31f F test/fuzzdata3.db c6586d3e3cef0fbc18108f9bb649aa77bfc38aba @@ -2209,8 +2209,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P e33f2fedda17b4f3678fc23c438093c256b0c125da5f1ac42ecaf3d604d54b6a -R bf3f5a9cd383f24f2f19fa2e86a993c0 +P cdd0af6f86e49ade1339ad5a3cc444400a9722a9efdf84a30b3ff9428b7ac36d +R 97da3e589df10edb12f045b63fd334d3 U drh -Z ca078f36d189947e36e0ecf82c334d57 +Z 5f22e1474f8086565da475538650b809 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 7e3b1689f6..a080a639ab 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -cdd0af6f86e49ade1339ad5a3cc444400a9722a9efdf84a30b3ff9428b7ac36d +59e26632449163a36b803cc7027ed99c1f6b675dda6f0b2b12bbe55884923f08 diff --git a/test/fuzzcheck.c b/test/fuzzcheck.c index e6b9ed3bb7..84e3f32895 100644 --- a/test/fuzzcheck.c +++ b/test/fuzzcheck.c @@ -1838,7 +1838,8 @@ static void showHelp(void){ "each database, checking for crashes and memory leaks.\n" "Options:\n" " --cell-size-check Set the PRAGMA cell_size_check=ON\n" -" --dbid N Use only the database where dbid=N\n" +" --dbid M..N Use only the databases where dbid between M and N\n" +" \"M..\" for M and afterwards. Just \"M\" for M only\n" " --export-db DIR Write databases to files(s) in DIR. Works with --dbid\n" " --export-sql DIR Write SQL to file(s) in DIR. Also works with --sqlid\n" " --help Show this help text\n" @@ -1863,7 +1864,8 @@ static void showHelp(void){ " --script Output CLI script instead of running tests\n" " --skip N Skip the first N test cases\n" " --spinner Use a spinner to show progress\n" -" --sqlid N Use only SQL where sqlid=N\n" +" --sqlid M..N Use only SQL where sqlid between M..N\n" +" \"M..\" for M and afterwards. Just \"M\" for M only\n" " --timeout N Maximum time for any one test in N millseconds\n" " -v|--verbose Increased output. Repeat for more output.\n" " --vdbe-debug Activate VDBE debugging.\n" @@ -1956,7 +1958,7 @@ int main(int argc, char **argv){ lastDbid = atoi(&zDotDot[2]); } }else{ - lastDbid = firstDbid = integerValue(argv[++i]); + lastDbid = firstDbid = integerValue(argv[i]); } }else if( strcmp(z,"export-db")==0 ){ @@ -2067,7 +2069,7 @@ int main(int argc, char **argv){ lastSqlid = atoi(&zDotDot[2]); } }else{ - firstSqlid = integerValue(argv[++i]); + firstSqlid = integerValue(argv[i]); lastSqlid = firstSqlid; } }else From 0d9f2a15f236dd87b05d33c8c1e09df1f4612b75 Mon Sep 17 00:00:00 2001 From: drh <> Date: Mon, 3 Feb 2025 21:04:21 +0000 Subject: [PATCH 039/194] The Parse.addrExplain field is never even if SQLITE_OMIT_EXPLAIN is defined. FossilOrigin-Name: 5d81a984c6aabb9fa9180efde8ca942b40f1ec18ff5a89f2fbb1252734f051d3 --- manifest | 13 ++++++------- manifest.uuid | 2 +- src/sqliteInt.h | 2 -- 3 files changed, 7 insertions(+), 10 deletions(-) diff --git a/manifest b/manifest index 6b13e86cc7..678cea2b49 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Enhance\sfuzzcheck\sso\sthat\sthe\s--sqlid\sand\s--dbid\soptions\scan\stake\sa\srange\nof\sIDs\sto\srun. -D 2025-02-03T18:53:02.874 +C The\sParse.addrExplain\sfield\sis\snever\seven\sif\sSQLITE_OMIT_EXPLAIN\sis\sdefined. +D 2025-02-03T21:04:21.029 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d @@ -785,7 +785,7 @@ F src/shell.c.in b377a59822f207106424f08aead37e78b609222e98f86f04cc8a03563ccf323 F src/sqlite.h.in cc9a2d5a719b7434e2699ff7c28a56209b8aa459b7f80ff1d4d7d8ac6ebfd96e F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8 F src/sqlite3ext.h 3f046c04ea3595d6bfda99b781926b17e672fd6d27da2ba6d8d8fc39981dcb54 -F src/sqliteInt.h 7f1b070ea3b4ab3c192be553810684f686fdb03f62f90afa2da64d4d61d91ec3 +F src/sqliteInt.h 9d7052c71f46ca3a1a4880ba4a62590da334651139a38327d488894d9c883f3b F src/sqliteLimit.h 1bbdbf72bd0411d003267ffebc59a262f061df5653027a75627d03f48ca30523 F src/status.c cb11f8589a6912af2da3bb1ec509a94dd8ef27df4d4c1a97e0bcf2309ece972b F src/table.c 0f141b58a16de7e2fbe81c308379e7279f4c6b50eb08efeec5892794a0ba30d1 @@ -2209,9 +2209,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P e33f2fedda17b4f3678fc23c438093c256b0c125da5f1ac42ecaf3d604d54b6a 59e26632449163a36b803cc7027ed99c1f6b675dda6f0b2b12bbe55884923f08 -R 97da3e589df10edb12f045b63fd334d3 -T +closed 59e26632449163a36b803cc7027ed99c1f6b675dda6f0b2b12bbe55884923f08 +P 408fa57f048e05a261fb62b45ae44b8a97c97fc01e3776124cbef6595df579d4 +R 19f75289781fc56c637c4500001f3f36 U drh -Z c70a3622de374067746199fda23d1690 +Z 6ac8bc953e7e25c0d28f52d6abec8109 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 486d200235..3958477534 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -408fa57f048e05a261fb62b45ae44b8a97c97fc01e3776124cbef6595df579d4 +5d81a984c6aabb9fa9180efde8ca942b40f1ec18ff5a89f2fbb1252734f051d3 diff --git a/src/sqliteInt.h b/src/sqliteInt.h index a37e0523ad..f47009c158 100644 --- a/src/sqliteInt.h +++ b/src/sqliteInt.h @@ -3914,9 +3914,7 @@ struct Parse { int nVtabLock; /* Number of virtual tables to lock */ #endif int nHeight; /* Expression tree height of current sub-select */ -#ifndef SQLITE_OMIT_EXPLAIN int addrExplain; /* Address of current OP_Explain opcode */ -#endif VList *pVList; /* Mapping between variable names and numbers */ Vdbe *pReprepare; /* VM being reprepared (sqlite3Reprepare()) */ const char *zTail; /* All SQL text past the last semicolon parsed */ From 31615637f39f2f31492aa3a0ccd658609b43409b Mon Sep 17 00:00:00 2001 From: drh <> Date: Mon, 3 Feb 2025 21:24:40 +0000 Subject: [PATCH 040/194] New dbsqlfuzz case added to fuzzdata8.db. FossilOrigin-Name: 7ee20cfc237229dbea7116149c0c35883f7b8087b9ccdce6dca16b6da1c6caf8 --- manifest | 15 +++++++++------ manifest.uuid | 2 +- test/fuzzdata8.db | Bin 4241408 -> 4248576 bytes 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/manifest b/manifest index 678cea2b49..068fb48754 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C The\sParse.addrExplain\sfield\sis\snever\seven\sif\sSQLITE_OMIT_EXPLAIN\sis\sdefined. -D 2025-02-03T21:04:21.029 +C New\sdbsqlfuzz\scase\sadded\sto\sfuzzdata8.db. +D 2025-02-03T21:24:40.271 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d @@ -1285,7 +1285,7 @@ F test/fuzzdata4.db b502c7d5498261715812dd8b3c2005bad08b3a26e6489414bd13926cd3e4 F test/fuzzdata5.db e35f64af17ec48926481cfaf3b3855e436bd40d1cfe2d59a9474cb4b748a52a5 F test/fuzzdata6.db b8725a5f5cf7a3b7241a9038e57ca7e7cc8c3f4d86b44bd770617bda245ab2b0 F test/fuzzdata7.db 0166b56fd7a6b9636a1d60ef0a060f86ddaecf99400a666bb6e5bbd7199ad1f2 -F test/fuzzdata8.db deb6533e6dfdb5841eb6a56607bdb74986a57f5739f3975ea542a1f7e7e24d97 +F test/fuzzdata8.db c6f9cb7d2b808fb10894afe53ef00f51e73e43baa7aabdba7e9af4713fc5b186 F test/fuzzer1.test 3d4c4b7e547aba5e5511a2991e3e3d07166cfbb8 F test/fuzzer2.test a85ef814ce071293bce1ad8dffa217cbbaad4c14 F test/fuzzerfault.test f64c4aef4c9e9edf1d6dc0d3f1e65dcc81e67c996403c88d14f09b74807a42bc @@ -2209,8 +2209,11 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P 408fa57f048e05a261fb62b45ae44b8a97c97fc01e3776124cbef6595df579d4 -R 19f75289781fc56c637c4500001f3f36 +P 5d81a984c6aabb9fa9180efde8ca942b40f1ec18ff5a89f2fbb1252734f051d3 +R e9d4a9b352c2eeead9d5e811b3c4d6de +T *branch * fuzzer-20250203 +T *sym-fuzzer-20250203 * +T -sym-trunk * U drh -Z 6ac8bc953e7e25c0d28f52d6abec8109 +Z 0c1224a47cf0d41d32dbe16a001a72b0 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 3958477534..a93fba674f 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -5d81a984c6aabb9fa9180efde8ca942b40f1ec18ff5a89f2fbb1252734f051d3 +7ee20cfc237229dbea7116149c0c35883f7b8087b9ccdce6dca16b6da1c6caf8 diff --git a/test/fuzzdata8.db b/test/fuzzdata8.db index f03f3f27191ee07a1014d1babeca93242543de8f..469df2c681a13064074d0a6e2fac0cf5939dbbcc 100644 GIT binary patch delta 40899 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 Date: Mon, 3 Feb 2025 23:19:42 +0000 Subject: [PATCH 041/194] Fix a potential UAF in FTS3. FossilOrigin-Name: 75f3d87448793fc7fd68d817874d561842e029a2d6c1ea4abcec39764cd38469 --- ext/fts3/fts3.c | 18 ++++++++++++++++++ ext/fts3/fts3Int.h | 1 + ext/fts3/fts3_snippet.c | 21 +++++++++++++++++++++ manifest | 16 ++++++++-------- manifest.uuid | 2 +- 5 files changed, 49 insertions(+), 9 deletions(-) diff --git a/ext/fts3/fts3.c b/ext/fts3/fts3.c index e58f256a48..2b2c3b8d26 100644 --- a/ext/fts3/fts3.c +++ b/ext/fts3/fts3.c @@ -5787,6 +5787,24 @@ static void fts3EvalRestart( } } +/* +** Expression node pExpr is an MSR phrase. This function restarts pExpr +** so that it is a regular phrase query, not an MSR. SQLITE_OK is returned +** if successful, or an SQLite error code otherwise. +*/ +int sqlite3Fts3MsrCancel(Fts3Cursor *pCsr, Fts3Expr *pExpr){ + int rc = SQLITE_OK; + if( pExpr->bEof==0 ){ + i64 iDocid = pExpr->iDocid; + fts3EvalRestart(pCsr, pExpr, &rc); + while( rc==SQLITE_OK && pExpr->iDocid!=iDocid ){ + fts3EvalNextRow(pCsr, pExpr, &rc); + if( pExpr->bEof ) rc = FTS_CORRUPT_VTAB; + } + } + return rc; +} + /* ** After allocating the Fts3Expr.aMI[] array for each phrase in the ** expression rooted at pExpr, the cursor iterates through all rows matched diff --git a/ext/fts3/fts3Int.h b/ext/fts3/fts3Int.h index 3b236faf49..77e6737af4 100644 --- a/ext/fts3/fts3Int.h +++ b/ext/fts3/fts3Int.h @@ -640,6 +640,7 @@ int sqlite3Fts3MsrIncrNext( int sqlite3Fts3EvalPhrasePoslist(Fts3Cursor *, Fts3Expr *, int iCol, char **); int sqlite3Fts3MsrOvfl(Fts3Cursor *, Fts3MultiSegReader *, int *); int sqlite3Fts3MsrIncrRestart(Fts3MultiSegReader *pCsr); +int sqlite3Fts3MsrCancel(Fts3Cursor*, Fts3Expr*); /* fts3_tokenize_vtab.c */ int sqlite3Fts3InitTok(sqlite3*, Fts3Hash *, void(*xDestroy)(void*)); diff --git a/ext/fts3/fts3_snippet.c b/ext/fts3/fts3_snippet.c index 80f62eb3bb..c79cca4a6d 100644 --- a/ext/fts3/fts3_snippet.c +++ b/ext/fts3/fts3_snippet.c @@ -1586,6 +1586,21 @@ static int fts3ExprTermOffsetInit(Fts3Expr *pExpr, int iPhrase, void *ctx){ return rc; } +/* +** If expression pExpr is a phrase expression that uses an MSR query, +** restart it as a regular, non-incremental query. Return SQLITE_OK +** if successful, or an SQLite error code otherwise. +*/ +static int fts3ExprRestartIfCb(Fts3Expr *pExpr, int iPhrase, void *ctx){ + TermOffsetCtx *p = (TermOffsetCtx*)ctx; + int rc = SQLITE_OK; + if( pExpr->pPhrase && pExpr->pPhrase->bIncr ){ + rc = sqlite3Fts3MsrCancel(p->pCsr, pExpr); + pExpr->pPhrase->bIncr = 0; + } + return rc; +} + /* ** Implementation of offsets() function. */ @@ -1622,6 +1637,12 @@ void sqlite3Fts3Offsets( sCtx.iDocid = pCsr->iPrevId; sCtx.pCsr = pCsr; + /* If a query restart will be required, do it here, rather than later of + ** after pointers to poslist buffers that may be invalidated by a restart + ** have been saved. */ + rc = sqlite3Fts3ExprIterate(pCsr->pExpr, fts3ExprRestartIfCb, (void*)&sCtx); + if( rc!=SQLITE_OK ) goto offsets_out; + /* Loop through the table columns, appending offset information to ** string-buffer res for each column. */ diff --git a/manifest b/manifest index 678cea2b49..abc313c536 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C The\sParse.addrExplain\sfield\sis\snever\seven\sif\sSQLITE_OMIT_EXPLAIN\sis\sdefined. -D 2025-02-03T21:04:21.029 +C Fix\sa\spotential\sUAF\sin\sFTS3. +D 2025-02-03T23:19:42.890 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d @@ -78,16 +78,16 @@ F ext/fts3/README.content b9078d0843a094d86af0d48dffbff13c906702b4c3558012e67b9c F ext/fts3/README.syntax a19711dc5458c20734b8e485e75fb1981ec2427a F ext/fts3/README.tokenizers b92bdeb8b46503f0dd301d364efc5ef59ef9fa8e2758b8e742f39fa93a2e422d F ext/fts3/README.txt 8c18f41574404623b76917b9da66fcb0ab38328d -F ext/fts3/fts3.c 9f8ce82bbf4ec0636e6170e58f17b04817fa4c39b2d5126ac06f005d485f6d5e +F ext/fts3/fts3.c b840ee915a6fb36571e3fe3c096e8a481a4a9cd8a35199a1b976b132b9f84ad3 F ext/fts3/fts3.h 3a10a0af180d502cecc50df77b1b22df142817fe -F ext/fts3/fts3Int.h 968f7d7cae541a6926146e9fd3fb2b2ccbd3845b7890a8ed03de0c06ac776682 +F ext/fts3/fts3Int.h 2fe7c76dfd7d46dff964d17d3f4c53bca2116cf5d6252552ebbc22e38afdf4e0 F ext/fts3/fts3_aux.c 7eab82a9cf0830f6551ba3abfdbe73ed39e322a4d3940ee82fbf723674ecd9f3 F ext/fts3/fts3_expr.c 365849a2a1185e19028a9db2d9f1ea63efe909a3a6aca7ec86fc26a13a60bd58 F ext/fts3/fts3_hash.c 8b6e31bfb0844c27dc6092c2620bdb1fca17ed613072db057d96952c6bdb48b7 F ext/fts3/fts3_hash.h 39cf6874dc239d6b4e30479b1975fe5b22a3caaf F ext/fts3/fts3_icu.c 305ce7fb6036484085b5556a9c8e62acdc7763f0f4cdf5fd538212a9f3720116 F ext/fts3/fts3_porter.c e19807ce0ae31c1c6e9898e89ecc93183d7ec224ea101af039722a4f49e5f2b8 -F ext/fts3/fts3_snippet.c c38117a2e4dcc9485a170a57a6134423955247b230fef7073c46fa9c51239540 +F ext/fts3/fts3_snippet.c 92196bd5941be0455f2c7e51c2f8280df49c7feb0615a0d1d4d045f2dcf60713 F ext/fts3/fts3_term.c 6a96027ad364001432545fe43322b6af04ed28bb5619ec51af1f59d0710d6d69 F ext/fts3/fts3_test.c 7a9cb3d61774134211bf4bfdf1adcb581a1a0377f2d050a121ae7ab44baef0e3 F ext/fts3/fts3_tokenize_vtab.c 7fd9ef364f257b97218b9c331f2378e307375c592f70fd541f714e747d944962 @@ -2209,8 +2209,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P 408fa57f048e05a261fb62b45ae44b8a97c97fc01e3776124cbef6595df579d4 -R 19f75289781fc56c637c4500001f3f36 +P 5d81a984c6aabb9fa9180efde8ca942b40f1ec18ff5a89f2fbb1252734f051d3 +R f1017abf167769f99bdff3069bfe9e53 U drh -Z 6ac8bc953e7e25c0d28f52d6abec8109 +Z dd1d75c4a0f7bb799c129e975f1e95da # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 3958477534..f7f780615a 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -5d81a984c6aabb9fa9180efde8ca942b40f1ec18ff5a89f2fbb1252734f051d3 +75f3d87448793fc7fd68d817874d561842e029a2d6c1ea4abcec39764cd38469 From 802b042f6ef89285bc0e72abc6866750757ce1b1 Mon Sep 17 00:00:00 2001 From: drh <> Date: Tue, 4 Feb 2025 02:38:23 +0000 Subject: [PATCH 042/194] Detect and report signed integer overflow in the sumInverse() routine, used by window functions. FossilOrigin-Name: 317e9a470fba2a4b717b9cb66488b8fccb44810a80f3a7deaf1ea81906e2b8d2 --- manifest | 13 ++++++------- manifest.uuid | 2 +- src/func.c | 5 ++++- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/manifest b/manifest index 19b66ba7a9..172ff7b118 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Test\scase\sfor\sthe\sFTS3\sfix\sin\sthe\sprevious\scheck-in. -D 2025-02-03T23:27:27.194 +C Detect\sand\sreport\ssigned\sinteger\soverflow\sin\sthe\ssumInverse()\sroutine,\nused\sby\swindow\sfunctions. +D 2025-02-04T02:38:23.009 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d @@ -733,7 +733,7 @@ F src/delete.c 03a77ba20e54f0f42ebd8eddf15411ed6bdb06a2c472ac4b6b336521bf7cea42 F src/expr.c 8705be31ee713aaa43c97d91399db09f16ee41b88250406eb99de6b47f550a98 F src/fault.c 460f3e55994363812d9d60844b2a6de88826e007 F src/fkey.c 928ed2517e8732113d2b9821aa37af639688d752f4ea9ac6e0e393d713eeb76f -F src/func.c f5b31c805679930cc5afcdfb1e657f9dd273053f52ff51133df5a448c519e5d9 +F src/func.c 0712a5b03fdfc8af0cda6d076bfe231b66388d3d5a28b46dc1a94b90d41cac6a F src/global.c a19e4b1ca1335f560e9560e590fc13081e21f670643367f99cb9e8f9dc7d615b F src/hash.c 9ee4269fb1d6632a6fecfb9479c93a1f29271bddbbaf215dd60420bcb80c7220 F src/hash.h 3340ab6e1d13e725571d7cee6d3e3135f0779a7d8e76a9ce0a85971fa3953c51 @@ -2209,9 +2209,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P 75f3d87448793fc7fd68d817874d561842e029a2d6c1ea4abcec39764cd38469 7ee20cfc237229dbea7116149c0c35883f7b8087b9ccdce6dca16b6da1c6caf8 -R b61fd031db99a855bc246d2ed8051e3b -T +closed 7ee20cfc237229dbea7116149c0c35883f7b8087b9ccdce6dca16b6da1c6caf8 +P 459d8f695ef868d0ec09920ab2035eebd36a66051f9905e2605f4600623faa47 +R 8b24f7285c9d92ca8cf04f526f040713 U drh -Z 68ed204a1a39b8731f0970e5a1459325 +Z fc7af611ca9f7a31dcf33650d3dd0378 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 8030ef34fe..f9f95d23cb 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -459d8f695ef868d0ec09920ab2035eebd36a66051f9905e2605f4600623faa47 +317e9a470fba2a4b717b9cb66488b8fccb44810a80f3a7deaf1ea81906e2b8d2 diff --git a/src/func.c b/src/func.c index bd25a44d4a..e8cd174e42 100644 --- a/src/func.c +++ b/src/func.c @@ -1869,7 +1869,10 @@ static void sumInverse(sqlite3_context *context, int argc, sqlite3_value**argv){ assert( p->cnt>0 ); p->cnt--; if( !p->approx ){ - p->iSum -= sqlite3_value_int64(argv[0]); + if( sqlite3SubInt64(&p->iSum, sqlite3_value_int64(argv[0])) ){ + p->ovrfl = 1; + p->approx = 1; + } }else if( type==SQLITE_INTEGER ){ i64 iVal = sqlite3_value_int64(argv[0]); if( iVal!=SMALLEST_INT64 ){ From b6859b6f2c3eedab12fb46b7295194c818420460 Mon Sep 17 00:00:00 2001 From: drh <> Date: Wed, 5 Feb 2025 12:02:43 +0000 Subject: [PATCH 043/194] Attempted improvements to the SQLITE_DBCONFIG_... documentation. FossilOrigin-Name: baac853871ad307b67b4d624b9ee47fc1313f1aa62c9f8072fb49e97aa33db94 --- manifest | 12 ++++++------ manifest.uuid | 2 +- src/sqlite.h.in | 44 +++++++++++++++++++++++++++++--------------- 3 files changed, 36 insertions(+), 22 deletions(-) diff --git a/manifest b/manifest index 172ff7b118..f5d136df4a 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Detect\sand\sreport\ssigned\sinteger\soverflow\sin\sthe\ssumInverse()\sroutine,\nused\sby\swindow\sfunctions. -D 2025-02-04T02:38:23.009 +C Attempted\simprovements\sto\sthe\sSQLITE_DBCONFIG_...\sdocumentation. +D 2025-02-05T12:02:43.871 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d @@ -782,7 +782,7 @@ F src/resolve.c c8a5372b97b2a2e972a280676f06ddb5b74e885d3b1f5ce383f839907b57ef68 F src/rowset.c 8432130e6c344b3401a8874c3cb49fefe6873fec593294de077afea2dce5ec97 F src/select.c 83e88fbb36f89b6703b348777491619554f0fd6f917c9fdf51e4c2e9cda6c04e F src/shell.c.in b377a59822f207106424f08aead37e78b609222e98f86f04cc8a03563ccf3237 -F src/sqlite.h.in cc9a2d5a719b7434e2699ff7c28a56209b8aa459b7f80ff1d4d7d8ac6ebfd96e +F src/sqlite.h.in d2902f13ace94d3d3609646bd6d12a2d7a4f6cbdf6a5a4097580ac305f54c3f0 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8 F src/sqlite3ext.h 3f046c04ea3595d6bfda99b781926b17e672fd6d27da2ba6d8d8fc39981dcb54 F src/sqliteInt.h 9d7052c71f46ca3a1a4880ba4a62590da334651139a38327d488894d9c883f3b @@ -2209,8 +2209,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P 459d8f695ef868d0ec09920ab2035eebd36a66051f9905e2605f4600623faa47 -R 8b24f7285c9d92ca8cf04f526f040713 +P 317e9a470fba2a4b717b9cb66488b8fccb44810a80f3a7deaf1ea81906e2b8d2 +R 70f9a2f7e68a73caf1fe72ecdb3d41d3 U drh -Z fc7af611ca9f7a31dcf33650d3dd0378 +Z 5ee06f9c240d54c68e35a361db8f0493 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index f9f95d23cb..af4c4d49c4 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -317e9a470fba2a4b717b9cb66488b8fccb44810a80f3a7deaf1ea81906e2b8d2 +baac853871ad307b67b4d624b9ee47fc1313f1aa62c9f8072fb49e97aa33db94 diff --git a/src/sqlite.h.in b/src/sqlite.h.in index 885f187a43..a9eb5fed72 100644 --- a/src/sqlite.h.in +++ b/src/sqlite.h.in @@ -2211,7 +2211,15 @@ struct sqlite3_mem_methods { ** CAPI3REF: Database Connection Configuration Options ** ** These constants are the available integer configuration options that -** can be passed as the second argument to the [sqlite3_db_config()] interface. +** can be passed as the second parameter to the [sqlite3_db_config()] interface. +** +** The [sqlite3_db_config()] interface is a var-args functions. It takes a +** variable number of parameters, though always at least two. The number of +** parameters passed into sqlite3_db_config() depends on which of these +** constants is given as the second parameter. This documentation page +** refers to parameters beyond the second as "arguments". Thus, when this +** page says "the N-th argument" it means "the N-th parameter past the +** configuration option" or "the (N+2)-th parameter to sqlite3_db_config()". ** ** New configuration options may be added in future releases of SQLite. ** Existing configuration options might be discontinued. Applications @@ -2228,7 +2236,9 @@ struct sqlite3_mem_methods { ** connection. ** The arguments to the SQLITE_DBCONFIG_LOOKASIDE option are not ** in the [DBCONFIG arguments|usual format]. -** The SQLITE_DBCONFIG_LOOKASIDE option takes three arguments, not two. +** The SQLITE_DBCONFIG_LOOKASIDE option takes three arguments, not two, +** so that a call to [sqlite3_db_config()] that uses SQLITE_DBCONFIG_LOOKASIDE +** should have a total of five parameters. ** ^The first argument (the third parameter to [sqlite3_db_config()] is a ** pointer to a memory buffer to use for lookaside memory. ** ^The first argument after the SQLITE_DBCONFIG_LOOKASIDE verb @@ -2330,12 +2340,13 @@ struct sqlite3_mem_methods { **

    ^This option is used to change the name of the "main" database ** schema. This option does not follow the ** [DBCONFIG arguments|usual SQLITE_DBCONFIG argument format]. -** This option takes exactly one argument, which ust be a pointer -** to a constant UTF8 string which will become the new schema name -** in place of "main". ^SQLite does not make a copy of the new main -** schema name string, so the application must ensure that the argument -** passed into SQLITE_DBCONFIG MAINDBNAME is unchanged -** until after the database connection closes. +** This option takes exactly one additional argument so that the +** [sqlite3_db_config()] call has a total of three parameters. The +** extra argument must be a pointer to a constant UTF8 string which +** will become the new schema name in place of "main". ^SQLite does +** not make a copy of the new main schema name string, so the application +** must ensure that the argument passed into SQLITE_DBCONFIG MAINDBNAME +** is unchanged until after the database connection closes. **
    ** ** [[SQLITE_DBCONFIG_NO_CKPT_ON_CLOSE]] @@ -2346,10 +2357,11 @@ struct sqlite3_mem_methods { ** connection being closed is the last open connection to the database), ** then SQLite performs a [checkpoint] before closing the connection and ** deletes the WAL file. The SQLITE_DBCONFIG_NO_CKPT_ON_CLOSE option can -** be used to override that behavior. The first parameter passed to this -** operation is an integer - positive to disable checkpoints-on-close, or -** zero (the default) to enable them, and negative to leave the setting unchanged. -** The second parameter is a pointer to an integer +** be used to override that behavior. The first argument passed to this +** operation (the third parameter to [sqlite3_db_config()]) is an integer +** which is positive to disable checkpoints-on-close, or zero (the default) +** to enable them, and negative to leave the setting unchanged. +** The second argument (the fourth parameter) is a pointer to an integer ** into which is written 0 or 1 to indicate whether checkpoints-on-close ** have been disabled - 0 if they are not disabled, 1 if they are. ** @@ -2587,9 +2599,11 @@ struct sqlite3_mem_methods { ** ** [[DBCONFIG arguments]]

    Arguments To SQLITE_DBCONFIG Options

    ** -**

    Most of the SQLITE_DBCONFIG options take two arguments: an integer -** and a pointer to an integer. If the first integer argument is 1, then -** the option becomes enabled. If the first integer argument is 0, then the +**

    Most of the SQLITE_DBCONFIG options take two arguments, so that the +** overall call to [sqlite3_db_config()] has a total of four parameters. +** The first argument (the third parameter to sqlite3_db_config()) is a integer. +** The second argument is a pointer to an integer. If the first argument is 1, +** then the option becomes enabled. If the first integer argument is 0, then the ** option is disabled. If the first argument is -1, then the option setting ** is unchanged. The second argument, the pointer to an integer, may be NULL. ** If the second argument is not NULL, then a value of 0 or 1 is written into From 97af1346f05ec5164751cbe69628636b1655bca3 Mon Sep 17 00:00:00 2001 From: stephan Date: Wed, 5 Feb 2025 12:49:15 +0000 Subject: [PATCH 044/194] Upstream JimTCL patch and minor tcl script tweaks to support (fconfigure -translation binary) for better cross-platform build portability. FossilOrigin-Name: 0974a17c4565f202777fc6203df20dca19acc1e8740ede15334783f41e3e5054 --- autosetup/jimsh0.c | 43 ++++++++++++++++++++++++++++++++++++++- manifest | 23 +++++++++++---------- manifest.uuid | 2 +- tool/mksqlite3c-noext.tcl | 2 +- tool/mksqlite3c.tcl | 2 +- tool/mksqlite3h.tcl | 2 +- tool/split-sqlite3c.tcl | 2 +- 7 files changed, 59 insertions(+), 17 deletions(-) diff --git a/autosetup/jimsh0.c b/autosetup/jimsh0.c index 84db85a207..4b9cf3eebf 100644 --- a/autosetup/jimsh0.c +++ b/autosetup/jimsh0.c @@ -75,6 +75,9 @@ extern "C" { #if defined(_WIN32) || defined(WIN32) +#ifndef STDIN_FILENO +#define STDIN_FILENO 0 +#endif #define HAVE_DLOPEN void *dlopen(const char *path, int mode); int dlclose(void *handle); @@ -1864,7 +1867,7 @@ int Jim_tclcompatInit(Jim_Interp *interp) " $f buffering $v\n" " }\n" " -tr* {\n" -"\n" +" $f translation $v\n" " }\n" " default {\n" " return -code error \"fconfigure: unknown option $n\"\n" @@ -2936,6 +2939,28 @@ static int aio_cmd_buffering(Jim_Interp *interp, int argc, Jim_Obj *const *argv) return JIM_OK; } +static int aio_cmd_translation(Jim_Interp *interp, int argc, Jim_Obj *const *argv) +{ + enum {OPT_BINARY, OPT_TEXT}; + static const char * const options[] = { + "binary", + "text", + NULL + }; + int opt; + + if (Jim_GetEnum(interp, argv[0], options, &opt, NULL, JIM_ERRMSG) != JIM_OK) { + return JIM_ERR; + } +#if defined(_setmode) && defined(O_BINARY) + else { + AioFile *af = Jim_CmdPrivData(interp); + _setmode(af->fh, opt == OPT_BINARY ? O_BINARY : O_TEXT); + } +#endif + return JIM_OK; +} + static int aio_cmd_readsize(Jim_Interp *interp, int argc, Jim_Obj *const *argv) { AioFile *af = Jim_CmdPrivData(interp); @@ -3145,6 +3170,13 @@ static const jim_subcmd_type aio_command_table[] = { 0, 2, + }, + { "translation", + "binary|text", + aio_cmd_translation, + 1, + 1, + }, { "readsize", "?size?", @@ -24342,6 +24374,10 @@ int Jim_InteractivePrompt(Jim_Interp *interp) #include +#ifdef HAVE_UNISTD_H +#include +#endif + extern int Jim_initjimshInit(Jim_Interp *interp); @@ -24425,6 +24461,10 @@ int main(int argc, char *const argv[]) } if (retcode != JIM_EXIT) { JimSetArgv(interp, 0, NULL); + if (!isatty(STDIN_FILENO)) { + + goto eval_stdin; + } retcode = Jim_InteractivePrompt(interp); } } @@ -24447,6 +24487,7 @@ int main(int argc, char *const argv[]) Jim_SetVariableStr(interp, "argv0", Jim_NewStringObj(interp, argv[1], -1)); JimSetArgv(interp, argc - 2, argv + 2); if (strcmp(argv[1], "-") == 0) { +eval_stdin: retcode = Jim_Eval(interp, "eval [info source [stdin read] stdin 1]"); } else { retcode = Jim_EvalFile(interp, argv[1]); diff --git a/manifest b/manifest index f5d136df4a..0f78ec938a 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Attempted\simprovements\sto\sthe\sSQLITE_DBCONFIG_...\sdocumentation. -D 2025-02-05T12:02:43.871 +C Upstream\sJimTCL\spatch\sand\sminor\stcl\sscript\stweaks\sto\ssupport\s(fconfigure\s-translation\sbinary)\sfor\sbetter\scross-platform\sbuild\sportability. +D 2025-02-05T12:49:15.023 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d @@ -47,7 +47,7 @@ F autosetup/cc-db.tcl 6e0ed90146197a5a05b245e649975c07c548e30926b218ca3e1d4dc034 F autosetup/cc-lib.tcl 493c5935b5dd3bf9bd4eca89b07c8b1b1a9356d61783035144e21795facf7360 F autosetup/cc-shared.tcl 4f024e94a47f427ba61de1739f6381ef0080210f9fae89112d5c1de1e5460d78 F autosetup/cc.tcl c0fcc50ca91deff8741e449ddad05bcd08268bc31177e613a6343bbd1fd3e45f -F autosetup/jimsh0.c d40e381ea4526a067590e7b91bd4b2efa6d4980d286f908054c647b3df4aee14 +F autosetup/jimsh0.c 5a74bdbf43c52289e3f482f3b9578db4bd657e88e8fe04b16c564d9fb710540a F autosetup/pkg-config.tcl 4e635bf39022ff65e0d5434339dd41503ea48fc53822c9c5bde88b02d3d952ba F autosetup/proj.tcl 9adf1539673cef15bff862d9360b479e6920cc2c0d85de707b0ba31c04ce4531 F autosetup/sqlite-config.tcl 00af5b9d94d580367bf01984b86397e8d35b74090427def9591a54ded0e1a287 @@ -2156,9 +2156,9 @@ F tool/mkpragmatab.tcl 32e359ccb21011958a821955254bd7a5fa7915d01a8c16fed91ffc8b4 F tool/mkshellc.tcl 9ce74de0fa904a2c56a96f8d8b5261246bacb0eaa8d7e184f9e18ff94145ebbc F tool/mksourceid.c 36aa8020014aed0836fd13c51d6dc9219b0df1761d6b5f58ff5b616211b079b9 F tool/mkspeedsql.tcl a1a334d288f7adfe6e996f2e712becf076745c97 -F tool/mksqlite3c-noext.tcl 4f7cfef5152b0c91920355cbfc1d608a4ad242cb819f1aea07f6d0274f584a7f -F tool/mksqlite3c.tcl 1b24a4388f544a7f42fc2d03f34422182d3b2263453f65f642890259566369c1 -F tool/mksqlite3h.tcl 3cc8f3fbb3eca38c899549385622637667254067d865a70ad16e0996c2fd3214 +F tool/mksqlite3c-noext.tcl 351c55256213154cabb051a3c870ef9f4487de905015141ae50dc7578a901b84 +F tool/mksqlite3c.tcl ba13086555b3cb835eba5e47a9250300ab85304d23fd1081abd3f29d8ab71a2b +F tool/mksqlite3h.tcl b05b85c32295bad3fe64807729693d1f19faed3c464c5faac6c53bb6b972ac2f F tool/mksqlite3internalh.tcl eb994013e833359137eb53a55acdad0b5ae1049b F tool/mksrczip.tcl 81efd9974dbb36005383f2cd655520057a2ae5aa85ac2441a80c7c28f803ac52 F tool/mktoolzip.tcl 34b4e92be544f820e2cc26f143f7d5aec511e826ec394cc82969a5dcf7c7a27c @@ -2187,7 +2187,7 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224 F tool/speedtest8inst1.c 7ce07da76b5e745783e703a834417d725b7d45fd F tool/spellsift.tcl 52b4b04dc4333c7ab024f09d9d66ed6b6f7c6eb00b38497a09f338fa55d40618 x -F tool/split-sqlite3c.tcl 5aa60643afca558bc732b1444ae81a522326f91e1dc5665b369c54f09e20de60 +F tool/split-sqlite3c.tcl 07e18a1d8cc3f6b3a4a1f3528e63c9b29a5c8a7bca0b8d394b231da464ce1247 F tool/sqldiff.c 2a0987d183027c795ced13d6749061c1d2f38e24eddb428f56fa64c3a8f51e4b F tool/sqlite3_analyzer.c.in fc7735c499d226a49d843d8209b2543e4e5229eeb71a674c331323a2217b65b4 F tool/sqlite3_rsync.c 9a1cca2ab1271c59b37a6493c15dc1bcd0ab9149197a9125926bc08dd26b83fb @@ -2209,8 +2209,9 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P 317e9a470fba2a4b717b9cb66488b8fccb44810a80f3a7deaf1ea81906e2b8d2 -R 70f9a2f7e68a73caf1fe72ecdb3d41d3 -U drh -Z 5ee06f9c240d54c68e35a361db8f0493 +P baac853871ad307b67b4d624b9ee47fc1313f1aa62c9f8072fb49e97aa33db94 +Q +fddcfbcafd1b343ee95960564bb57785b8af18aaae16969d83f1550d6868737e +R a7b74c08eab9f96c10b2c2a2b89f2fbf +U stephan +Z c6d765f25f632bd465da0fecb9f4261f # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index af4c4d49c4..f1bcc15a21 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -baac853871ad307b67b4d624b9ee47fc1313f1aa62c9f8072fb49e97aa33db94 +0974a17c4565f202777fc6203df20dca19acc1e8740ede15334783f41e3e5054 diff --git a/tool/mksqlite3c-noext.tcl b/tool/mksqlite3c-noext.tcl index 8452072564..1148b1c0d5 100644 --- a/tool/mksqlite3c-noext.tcl +++ b/tool/mksqlite3c-noext.tcl @@ -57,7 +57,7 @@ close $in # set out [open sqlite3.c w] # Force the output to use unix line endings, even on Windows. -fconfigure $out -translation lf +fconfigure $out -translation binary set today [clock format [clock seconds] -format "%Y-%m-%d %H:%M:%S UTC" -gmt 1] puts $out [subst \ {/****************************************************************************** diff --git a/tool/mksqlite3c.tcl b/tool/mksqlite3c.tcl index ddc1e58776..1d0f892363 100644 --- a/tool/mksqlite3c.tcl +++ b/tool/mksqlite3c.tcl @@ -88,7 +88,7 @@ set fname sqlite3.c if {$enable_recover} { set fname sqlite3r.c } set out [open $fname wb] # Force the output to use unix line endings, even on Windows. -fconfigure $out -translation lf +fconfigure $out -translation binary set today [clock format [clock seconds] -format "%Y-%m-%d %H:%M:%S UTC" -gmt 1] puts $out [subst \ {/****************************************************************************** diff --git a/tool/mksqlite3h.tcl b/tool/mksqlite3h.tcl index 8ef123bc72..b1d5ecdcd3 100644 --- a/tool/mksqlite3h.tcl +++ b/tool/mksqlite3h.tcl @@ -107,7 +107,7 @@ set declpattern5 \ {^ *([a-zA-Z][a-zA-Z_0-9 ]+ \**)(sqlite3rebaser_[_a-zA-Z0-9]+)(\(.*)$} # Force the output to use unix line endings, even on Windows. -fconfigure stdout -translation lf +fconfigure stdout -translation binary set filelist [subst { $TOP/src/sqlite.h.in diff --git a/tool/split-sqlite3c.tcl b/tool/split-sqlite3c.tcl index 0308431dab..de4db55a1b 100644 --- a/tool/split-sqlite3c.tcl +++ b/tool/split-sqlite3c.tcl @@ -15,7 +15,7 @@ set END {^/\*+ End of %s \*+/} set in [open sqlite3.c] set out1 [open sqlite3-all.c w] -fconfigure $out1 -translation lf +fconfigure $out1 -translation binary # Copy the header from sqlite3.c into sqlite3-all.c # From 6c074e5dc40e7375ea5cf985ca2ea508dacddf4e Mon Sep 17 00:00:00 2001 From: stephan Date: Wed, 5 Feb 2025 12:56:55 +0000 Subject: [PATCH 045/194] Summarize known incompatibilities/gotches between JimTCL and canonical TCL, and their workarounds. Doc changes only. FossilOrigin-Name: 60c932e67b886d4c050698f36e1d3fc04eb99473d62bb3b1585a97d90e27227e --- autosetup/README.md | 24 ++++++++++++++++++++++++ manifest | 13 ++++++------- manifest.uuid | 2 +- 3 files changed, 31 insertions(+), 8 deletions(-) diff --git a/autosetup/README.md b/autosetup/README.md index 19a16c943a..2d6cf723c0 100644 --- a/autosetup/README.md +++ b/autosetup/README.md @@ -196,6 +196,30 @@ APIs must not use `[file normalize]`, but autosetup provides a TCL-only implementation of `[file-normalize]` (note the dash) for portable use in the configure script. +Known TCL Incompatibilities +------------------------------------------------------------------------ + +A summary of known incompatibilities in JimTCL + +- **CRNL line endings**: prior to 2025-02-05 `fconfigure -translation ...` + was a no-op in JimTCL, and it emits CRNL line endings by default on + Windows. Since then, it supports `-translation binary`, which is + close enough to `-translation lf` for our purposes. When working + with files using the `open` command, it is important to use mode + `"rb"` or `"wb"`, as appropriate, so that the output does not get + CRNL-mangled on Windows. + +- **`file copy`** does not support multiple source files. See + [](/info/61f18c96183867fe) for a workaround. + +- **Regular expressions**: + + - Patterns treat `\nnn` octal values as back-references (which it + does not support). Those can be reformulated as demonstrated in + [](/info/aeac23359bb681c0). + + - `regsub` does not support the `\y` flag. A workaround is demonstrated + in [](/info/c2e5dd791cce3ec4). Design Conventions diff --git a/manifest b/manifest index 0f78ec938a..da809967ae 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Upstream\sJimTCL\spatch\sand\sminor\stcl\sscript\stweaks\sto\ssupport\s(fconfigure\s-translation\sbinary)\sfor\sbetter\scross-platform\sbuild\sportability. -D 2025-02-05T12:49:15.023 +C Summarize\sknown\sincompatibilities/gotches\sbetween\sJimTCL\sand\scanonical\sTCL,\sand\stheir\sworkarounds.\sDoc\schanges\sonly. +D 2025-02-05T12:56:55.992 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d @@ -37,7 +37,7 @@ F autoconf/tea/win/rules.vc 94a18c3e453535459b4a643983acca52fb8756e79055bd2ad4b0 F autoconf/tea/win/targets.vc 96a25a1fa6e9e9cfb348fd3760a5395b4ce8acafc8ed10f0412937ec200d5dbd F autosetup/LICENSE 41a26aebdd2cd185d1e2b210f71b7ce234496979f6b35aef2cbf6b80cbed4ce4 F autosetup/README.autosetup a78ff8c4a3d2636a4268736672a74bf14a82f42687fcf0631a70c516075c031e -F autosetup/README.md 2737c4eb44b022a694b1f93fb01c3b6c3a45b4f663e18490c2106643a77b39da +F autosetup/README.md b306314e8a87ccf873cb5b2a360c4a27bbf841df5b76f3acbd65322cff165476 F autosetup/autosetup df8b53928b1fe3c67db5bc77c8e1eb8160c1b6a26c370e9a06c68748f803b7e4 x F autosetup/autosetup-config.guess dfa101c5e8220e864d5e9c72a85e87110df60260d36cb951ad0a85d6d9eaa463 x F autosetup/autosetup-config.sub a38fb074d0dece01cf919e9fb534a26011608aa8fa606490864295328526cd73 x @@ -2209,9 +2209,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P baac853871ad307b67b4d624b9ee47fc1313f1aa62c9f8072fb49e97aa33db94 -Q +fddcfbcafd1b343ee95960564bb57785b8af18aaae16969d83f1550d6868737e -R a7b74c08eab9f96c10b2c2a2b89f2fbf +P 0974a17c4565f202777fc6203df20dca19acc1e8740ede15334783f41e3e5054 +R ac84e39b3790b8114a07b99fae22b35b U stephan -Z c6d765f25f632bd465da0fecb9f4261f +Z 5ac40daff7d720f4fde033e3e4223e0e # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index f1bcc15a21..46ead94eed 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -0974a17c4565f202777fc6203df20dca19acc1e8740ede15334783f41e3e5054 +60c932e67b886d4c050698f36e1d3fc04eb99473d62bb3b1585a97d90e27227e From 31c3599ed01897693912f92d36f3285e1f2471b4 Mon Sep 17 00:00:00 2001 From: drh <> Date: Wed, 5 Feb 2025 16:08:11 +0000 Subject: [PATCH 046/194] Fix a harmless unused-parameter compiler warning introduced by [75f3d8744879]. FossilOrigin-Name: 9f28f6694f97d5ee0345b45f9bf81e3fdce0990ce32fb9bdbbaac079126a67c9 --- ext/fts3/fts3_snippet.c | 1 + manifest | 14 +++++++------- manifest.uuid | 2 +- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/ext/fts3/fts3_snippet.c b/ext/fts3/fts3_snippet.c index c79cca4a6d..8a6ab8ea62 100644 --- a/ext/fts3/fts3_snippet.c +++ b/ext/fts3/fts3_snippet.c @@ -1594,6 +1594,7 @@ static int fts3ExprTermOffsetInit(Fts3Expr *pExpr, int iPhrase, void *ctx){ static int fts3ExprRestartIfCb(Fts3Expr *pExpr, int iPhrase, void *ctx){ TermOffsetCtx *p = (TermOffsetCtx*)ctx; int rc = SQLITE_OK; + UNUSED_PARAMETER(iPhrase); if( pExpr->pPhrase && pExpr->pPhrase->bIncr ){ rc = sqlite3Fts3MsrCancel(p->pCsr, pExpr); pExpr->pPhrase->bIncr = 0; diff --git a/manifest b/manifest index da809967ae..d0ed9ae692 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Summarize\sknown\sincompatibilities/gotches\sbetween\sJimTCL\sand\scanonical\sTCL,\sand\stheir\sworkarounds.\sDoc\schanges\sonly. -D 2025-02-05T12:56:55.992 +C Fix\sa\sharmless\sunused-parameter\scompiler\swarning\sintroduced\sby\s[75f3d8744879]. +D 2025-02-05T16:08:11.074 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d @@ -87,7 +87,7 @@ F ext/fts3/fts3_hash.c 8b6e31bfb0844c27dc6092c2620bdb1fca17ed613072db057d96952c6 F ext/fts3/fts3_hash.h 39cf6874dc239d6b4e30479b1975fe5b22a3caaf F ext/fts3/fts3_icu.c 305ce7fb6036484085b5556a9c8e62acdc7763f0f4cdf5fd538212a9f3720116 F ext/fts3/fts3_porter.c e19807ce0ae31c1c6e9898e89ecc93183d7ec224ea101af039722a4f49e5f2b8 -F ext/fts3/fts3_snippet.c 92196bd5941be0455f2c7e51c2f8280df49c7feb0615a0d1d4d045f2dcf60713 +F ext/fts3/fts3_snippet.c 7a3d5e2cefbb1cb51fb9c65458670cc269647ede18e1ffd57b513f9b4ec10c3e F ext/fts3/fts3_term.c 6a96027ad364001432545fe43322b6af04ed28bb5619ec51af1f59d0710d6d69 F ext/fts3/fts3_test.c 7a9cb3d61774134211bf4bfdf1adcb581a1a0377f2d050a121ae7ab44baef0e3 F ext/fts3/fts3_tokenize_vtab.c 7fd9ef364f257b97218b9c331f2378e307375c592f70fd541f714e747d944962 @@ -2209,8 +2209,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P 0974a17c4565f202777fc6203df20dca19acc1e8740ede15334783f41e3e5054 -R ac84e39b3790b8114a07b99fae22b35b -U stephan -Z 5ac40daff7d720f4fde033e3e4223e0e +P 60c932e67b886d4c050698f36e1d3fc04eb99473d62bb3b1585a97d90e27227e +R 84a73aa92675a2727074c491235ee053 +U drh +Z 84a578fb1294f91eaec33c542173ac0d # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 46ead94eed..0704181ca7 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -60c932e67b886d4c050698f36e1d3fc04eb99473d62bb3b1585a97d90e27227e +9f28f6694f97d5ee0345b45f9bf81e3fdce0990ce32fb9bdbbaac079126a67c9 From 659bafd05dee789298074283ce857e27e65ef675 Mon Sep 17 00:00:00 2001 From: drh <> Date: Thu, 6 Feb 2025 11:55:18 +0000 Subject: [PATCH 047/194] Version 3.49.0 FossilOrigin-Name: 4a7dd425dc2a0e5082a9049c9b4a9d4f199a71583d014c24b4cfe276c5a77cde --- manifest | 11 +++++++---- manifest.uuid | 2 +- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/manifest b/manifest index d0ed9ae692..d38d362fbb 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Fix\sa\sharmless\sunused-parameter\scompiler\swarning\sintroduced\sby\s[75f3d8744879]. -D 2025-02-05T16:08:11.074 +C Version\s3.49.0 +D 2025-02-06T11:55:18.769 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d @@ -2209,8 +2209,11 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P 60c932e67b886d4c050698f36e1d3fc04eb99473d62bb3b1585a97d90e27227e +P 9f28f6694f97d5ee0345b45f9bf81e3fdce0990ce32fb9bdbbaac079126a67c9 R 84a73aa92675a2727074c491235ee053 +T +sym-major-release * +T +sym-release * +T +sym-version-3.49.0 * U drh -Z 84a578fb1294f91eaec33c542173ac0d +Z 345e0ae7aa6443f7f8d274ba6f526736 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 0704181ca7..71c984af80 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -9f28f6694f97d5ee0345b45f9bf81e3fdce0990ce32fb9bdbbaac079126a67c9 +4a7dd425dc2a0e5082a9049c9b4a9d4f199a71583d014c24b4cfe276c5a77cde From 3c013479c3884f5f996bc914a7fd32df84b867d8 Mon Sep 17 00:00:00 2001 From: stephan Date: Thu, 6 Feb 2025 13:18:49 +0000 Subject: [PATCH 048/194] Fix a dependencies/order-of-operations bug in ext/wasm/GNUmakefile which causes creation of files filtered via c-pp to fail if the ext/wasm/jswasm dir did not exist beforehand. FossilOrigin-Name: 4bac76138853a89484d3ac0486a9ed5143aa671b13b4b3abb704c1487213b388 --- ext/wasm/GNUmakefile | 1 + manifest | 17 +++++++---------- manifest.uuid | 2 +- 3 files changed, 9 insertions(+), 11 deletions(-) diff --git a/ext/wasm/GNUmakefile b/ext/wasm/GNUmakefile index 3e9621c6d2..dc8ea54fd4 100644 --- a/ext/wasm/GNUmakefile +++ b/ext/wasm/GNUmakefile @@ -425,6 +425,7 @@ define SQLITE.CALL.C-PP.FILTER # $2 = Output file: c-pp -o $(2).js # $3 = optional c-pp -D... flags $(2): $(1) $$(MAKEFILE) $$(bin.c-pp) + mkdir -p $$(dir $$@) $$(bin.c-pp) -f $(1) -o $$@ $(3) $(SQLITE.CALL.C-PP.FILTER.global) #CLEAN_FILES += $(2) endef diff --git a/manifest b/manifest index d38d362fbb..334058434b 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Version\s3.49.0 -D 2025-02-06T11:55:18.769 +C Fix\sa\sdependencies/order-of-operations\sbug\sin\sext/wasm/GNUmakefile\swhich\scauses\screation\sof\sfiles\sfiltered\svia\sc-pp\sto\sfail\sif\sthe\sext/wasm/jswasm\sdir\sdid\snot\sexist\sbeforehand. +D 2025-02-06T13:18:49.829 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d @@ -619,7 +619,7 @@ F ext/session/sqlite3session.c 52a680dbb03c4734748b215d95987fb4d95ab23baaf053a01 F ext/session/sqlite3session.h 683ccbf16e2c2521661fc4c1cf918ce57002039efbcabcd8097fa4bca569104b F ext/session/test_session.c 12e0a2c15fd60f92da4bb29c697c9177ff0c0dbcdc5129a54c47e999f147937a F ext/wasm/EXPORTED_FUNCTIONS.fiddle.in 27450c8b8c70875a260aca55435ec927068b34cef801a96205adb81bdcefc65c -F ext/wasm/GNUmakefile 47f121d057c08ba49443c06c1c51ba2572e3d5d28a06c968cf0b2ccd5878c3d3 +F ext/wasm/GNUmakefile 7d1076680e687d01e0f4f343624db4e00e31edbe67bd0cb2e3ad8ecea98a3cae F ext/wasm/README-dist.txt f01081a850ce38a56706af6b481e3a7878e24e42b314cfcd4b129f0f8427066a F ext/wasm/README.md b89605f65661cf35bf034ff6d43e448cc169b8017fc105d498e33b81218b482c F ext/wasm/SQLTester/GNUmakefile e0794f676d55819951bbfae45cc5e8d7818dc460492dc317ce7f0d2eca15caff @@ -2209,11 +2209,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P 9f28f6694f97d5ee0345b45f9bf81e3fdce0990ce32fb9bdbbaac079126a67c9 -R 84a73aa92675a2727074c491235ee053 -T +sym-major-release * -T +sym-release * -T +sym-version-3.49.0 * -U drh -Z 345e0ae7aa6443f7f8d274ba6f526736 +P 4a7dd425dc2a0e5082a9049c9b4a9d4f199a71583d014c24b4cfe276c5a77cde +R ace1a556cd2682c15f244d0a70c9d1c1 +U stephan +Z e2303326f9884746fc80a4c5bceed35d # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 71c984af80..ee3aa0d336 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -4a7dd425dc2a0e5082a9049c9b4a9d4f199a71583d014c24b4cfe276c5a77cde +4bac76138853a89484d3ac0486a9ed5143aa671b13b4b3abb704c1487213b388 From 01bfe2a53114761f0afa301e5d17d00d99e789c4 Mon Sep 17 00:00:00 2001 From: stephan Date: Thu, 6 Feb 2025 13:36:31 +0000 Subject: [PATCH 049/194] Bump version number to 3.50.0 for the next dev cycle. FossilOrigin-Name: 46d08071f3f9fef78bc2444b52060e0e7de8c357a2aa213ac13c565e33acc4a0 --- VERSION | 2 +- manifest | 12 ++++++------ manifest.uuid | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/VERSION b/VERSION index 549b777ead..ca25ff637a 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -3.49.0 +3.50.0 diff --git a/manifest b/manifest index 334058434b..1f8d299de4 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Fix\sa\sdependencies/order-of-operations\sbug\sin\sext/wasm/GNUmakefile\swhich\scauses\screation\sof\sfiles\sfiltered\svia\sc-pp\sto\sfail\sif\sthe\sext/wasm/jswasm\sdir\sdid\snot\sexist\sbeforehand. -D 2025-02-06T13:18:49.829 +C Bump\sversion\snumber\sto\s3.50.0\sfor\sthe\snext\sdev\scycle. +D 2025-02-06T13:36:31.028 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d @@ -7,7 +7,7 @@ F Makefile.in 38485d15d9190cdad0d7bee25af7b442028865964025dcc61f40fd8d6e369cfc F Makefile.linux-generic bd3e3cacd369821a6241d4ea1967395c962dfe3057e38cb0a435cee0e8b789d0 F Makefile.msc a9b95ae9807e17f9b0734ebe97d68032141c3f95286bb64593cb73b206f043cf F README.md c3c0f19532ce28f6297a71870f3c7b424729f0e6d9ab889616d3587dd2332159 -F VERSION 01f7606130e48fd58a74d1e45e565f2674819d6eadbc219d328d94bb3362b818 +F VERSION 001dea55eb8304ec9130b6b44a32d3fc349f279d45a7e224fc0730c3cb8e2372 F art/icon-243x273.gif 9750b734f82fdb3dc43127753d5e6fbf3b62c9f4e136c2fbf573b2f57ea87af5 F art/icon-80x90.gif 65509ce3e5f86a9cd64fe7fca2d23954199f31fe44c1e09e208c80fb83d87031 F art/sqlite370.eps aa97a671332b432a54e1d74ff5e8775be34200c2 @@ -2209,8 +2209,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P 4a7dd425dc2a0e5082a9049c9b4a9d4f199a71583d014c24b4cfe276c5a77cde -R ace1a556cd2682c15f244d0a70c9d1c1 +P 4bac76138853a89484d3ac0486a9ed5143aa671b13b4b3abb704c1487213b388 +R b5d195e43beae1111c42ac081a32392a U stephan -Z e2303326f9884746fc80a4c5bceed35d +Z ceb27f6deb0f1234888251cc1a8b6e99 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index ee3aa0d336..367bfe7636 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -4bac76138853a89484d3ac0486a9ed5143aa671b13b4b3abb704c1487213b388 +46d08071f3f9fef78bc2444b52060e0e7de8c357a2aa213ac13c565e33acc4a0 From 65552a7ae1c77f627f7667837580c44baa1ba3ef Mon Sep 17 00:00:00 2001 From: drh <> Date: Thu, 6 Feb 2025 17:10:38 +0000 Subject: [PATCH 050/194] Fix a harmless typo in a comment. FossilOrigin-Name: ed82272904deb37640286448e03153316f828c629547a615a504af1d7ec5a278 --- manifest | 14 +++++++------- manifest.uuid | 2 +- src/insert.c | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/manifest b/manifest index 1f8d299de4..1d31210c3e 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Bump\sversion\snumber\sto\s3.50.0\sfor\sthe\snext\sdev\scycle. -D 2025-02-06T13:36:31.028 +C Fix\sa\sharmless\stypo\sin\sa\scomment. +D 2025-02-06T17:10:38.852 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d @@ -739,7 +739,7 @@ F src/hash.c 9ee4269fb1d6632a6fecfb9479c93a1f29271bddbbaf215dd60420bcb80c7220 F src/hash.h 3340ab6e1d13e725571d7cee6d3e3135f0779a7d8e76a9ce0a85971fa3953c51 F src/hwtime.h f9c2dfb84dce7acf95ce6d289e46f5f9d3d1afd328e53da8f8e9008e3b3caae6 F src/in-operator.md 10cd8f4bcd225a32518407c2fb2484089112fd71 -F src/insert.c db8bfff30fd7f71812651df3ddf5d1624b9e19104b31e349cd9055bbc9d622c4 +F src/insert.c ccadada52dc508ab8229e343425ab2504db57cfcdf8271f0f9ce1c2c6cad97c1 F src/json.c 68a98c020c22127f2d65f08855f7fc7460ff352a6ce0b543d8931dde83319c22 F src/legacy.c d7874bc885906868cd51e6c2156698f2754f02d9eee1bae2d687323c3ca8e5aa F src/loadext.c 7432c944ff197046d67a1207790a1b13eec4548c85a9457eb0896bb3641dfb36 @@ -2209,8 +2209,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P 4bac76138853a89484d3ac0486a9ed5143aa671b13b4b3abb704c1487213b388 -R b5d195e43beae1111c42ac081a32392a -U stephan -Z ceb27f6deb0f1234888251cc1a8b6e99 +P 46d08071f3f9fef78bc2444b52060e0e7de8c357a2aa213ac13c565e33acc4a0 +R c4f19381dd3461bfce62af076631de2d +U drh +Z 430f69c01ee43f942d60706245b3b05a # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 367bfe7636..d648338bf7 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -46d08071f3f9fef78bc2444b52060e0e7de8c357a2aa213ac13c565e33acc4a0 +ed82272904deb37640286448e03153316f828c629547a615a504af1d7ec5a278 diff --git a/src/insert.c b/src/insert.c index 83baeece64..e2d910fce4 100644 --- a/src/insert.c +++ b/src/insert.c @@ -1394,7 +1394,7 @@ void sqlite3Insert( continue; }else if( pColumn==0 ){ /* Hidden columns that are not explicitly named in the INSERT - ** get there default value */ + ** get their default value */ sqlite3ExprCodeFactorable(pParse, sqlite3ColumnExpr(pTab, &pTab->aCol[i]), iRegStore); From 038424727b4fef582dfb6f6badbcadb39039e39c Mon Sep 17 00:00:00 2001 From: drh <> Date: Thu, 6 Feb 2025 17:29:14 +0000 Subject: [PATCH 051/194] Adjust the test/speedtest.tcl script so that it uses an on-disk database rather than an in-memory database. FossilOrigin-Name: e93d7aa1db9bdbf1996c4c168e67284177e384b7acf176d74a0458258faab05c --- manifest | 12 ++++++------ manifest.uuid | 2 +- test/speedtest.tcl | 5 +++++ 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/manifest b/manifest index 1d31210c3e..27e4110605 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Fix\sa\sharmless\stypo\sin\sa\scomment. -D 2025-02-06T17:10:38.852 +C Adjust\sthe\stest/speedtest.tcl\sscript\sso\sthat\sit\suses\san\son-disk\sdatabase\nrather\sthan\san\sin-memory\sdatabase. +D 2025-02-06T17:29:14.625 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d @@ -1680,7 +1680,7 @@ F test/speed4.test abc0ad3399dcf9703abed2fff8705e4f8e416715 F test/speed4p.explain 6b5f104ebeb34a038b2f714150f51d01143e59aa F test/speed4p.test 377a0c48e5a92e0b11c1c5ebb1bc9d83a7312c922bc0cb05970ef5d6a96d1f0c F test/speedtest.md ee958457ae1b729d9715ae33c0320600000bf1d9ddea1a88dcf79f56729d6fad -F test/speedtest.tcl 8a9362c1e429318e741b91d26888e7edcc326f98c3aea505ffd618cc5b9e7f0a x +F test/speedtest.tcl 185f80f8db275852746e8150137b31ba4aaa1c9a1ecb1e35a3b66cd3f31783b9 x F test/speedtest1.c 204acd8af326bbca2c28f68166635d4574381f4cabbac1bc243663f5dcc5051d F test/spellfix.test 951a6405d49d1a23d6b78027d3877b4a33eeb8221dcab5704b499755bb4f552e F test/spellfix2.test dfc8f519a3fc204cb2dfa8b4f29821ae90f6f8c3 @@ -2209,8 +2209,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P 46d08071f3f9fef78bc2444b52060e0e7de8c357a2aa213ac13c565e33acc4a0 -R c4f19381dd3461bfce62af076631de2d +P ed82272904deb37640286448e03153316f828c629547a615a504af1d7ec5a278 +R 3389deb8f0facbb95e58d6e9fc976f10 U drh -Z 430f69c01ee43f942d60706245b3b05a +Z 9628165988950eefdec8a4b63484fc0a # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index d648338bf7..a345c88775 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -ed82272904deb37640286448e03153316f828c629547a615a504af1d7ec5a278 +e93d7aa1db9bdbf1996c4c168e67284177e384b7acf176d74a0458258faab05c diff --git a/test/speedtest.tcl b/test/speedtest.tcl index 93b407c94e..d201297158 100755 --- a/test/speedtest.tcl +++ b/test/speedtest.tcl @@ -174,9 +174,14 @@ if {!$dryrun} { } lappend speedtestflags --testset $testset set stcmd [list valgrind --tool=cachegrind ./speedtest1 {*}$speedtestflags] +lappend stcmd speedtest1.db lappend stcmd >valgrind-out.txt 2>valgrind-err.txt puts $stcmd if {!$dryrun} { + foreach file {speedtest1.db speedtest1.db-journal speedtest1.db-wal + speedtest1.db-shm} { + if {[file exists $file]} {file delete $file} + } exec {*}$stcmd } From 6b3010a1344835e1c57f736cdb06c35ebefd24f0 Mon Sep 17 00:00:00 2001 From: stephan Date: Fri, 7 Feb 2025 01:43:05 +0000 Subject: [PATCH 052/194] Bump TEA configure.ac version number. FossilOrigin-Name: a1a9c780d1f1b47b0408397edded9c5d230c7b144207ad142d06c048792d31fa --- autoconf/tea/configure.ac | 2 +- manifest | 14 +++++++------- manifest.uuid | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/autoconf/tea/configure.ac b/autoconf/tea/configure.ac index e653798fc5..d3952707a2 100644 --- a/autoconf/tea/configure.ac +++ b/autoconf/tea/configure.ac @@ -19,7 +19,7 @@ dnl to configure the system for the local environment. # so that we create the export library with the dll. #----------------------------------------------------------------------- -AC_INIT([sqlite],[3.49.0]) +AC_INIT([sqlite],[3.50.0]) #-------------------------------------------------------------------- # Call TEA_INIT as the first TEA_ macro to set up initial vars. diff --git a/manifest b/manifest index 27e4110605..cad7d41db4 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Adjust\sthe\stest/speedtest.tcl\sscript\sso\sthat\sit\suses\san\son-disk\sdatabase\nrather\sthan\san\sin-memory\sdatabase. -D 2025-02-06T17:29:14.625 +C Bump\sTEA\sconfigure.ac\sversion\snumber. +D 2025-02-07T01:43:05.809 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d @@ -24,7 +24,7 @@ F autoconf/auto.def 23bc095a3890c0ca334abf7ef67d1c8af4c22c12832bcc738015e868d54f F autoconf/tea/Makefile.in ba0556fee8da09c066bad85a4457904e46ee2c2eabaa309c0e83a78f2f151a8e F autoconf/tea/README.txt 61e62e519579e4a112791354d6d440f8b51ea6db3b0bab58d59f29df42d2dfe3 F autoconf/tea/aclocal.m4 52c47aac44ce0ddb1f918b6993e8beb8eee88f43 -F autoconf/tea/configure.ac d22326594f005a493a7857cb4ad2496b91480101be731d7f0541bb8d7eba22a2 +F autoconf/tea/configure.ac 830cb2af5a3888312d0fd88402c2509d551d60e4c03f0481006a07c78313ef12 F autoconf/tea/doc/sqlite3.n e1fe45d4f5286ee3d0ccc877aca2a0def488e9bb F autoconf/tea/license.terms 13bd403c9610fd2b76ece0ab50c4c5eda933d523 F autoconf/tea/pkgIndex.tcl.in 55aec3c6d7e9a1de9b8d2fdc9c27fd055da3ac3a51b572195e2ae7300bcfd3a2 @@ -2209,8 +2209,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P ed82272904deb37640286448e03153316f828c629547a615a504af1d7ec5a278 -R 3389deb8f0facbb95e58d6e9fc976f10 -U drh -Z 9628165988950eefdec8a4b63484fc0a +P e93d7aa1db9bdbf1996c4c168e67284177e384b7acf176d74a0458258faab05c +R 862fe61394e7b3cb4c5d861b55c28308 +U stephan +Z 4a5b39d46ead9ead0e536423680a6ea5 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index a345c88775..0a49cc208d 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -e93d7aa1db9bdbf1996c4c168e67284177e384b7acf176d74a0458258faab05c +a1a9c780d1f1b47b0408397edded9c5d230c7b144207ad142d06c048792d31fa From 4192a95d23f828bb556b8602ac4df6edeb002ffc Mon Sep 17 00:00:00 2001 From: stephan Date: Fri, 7 Feb 2025 11:15:58 +0000 Subject: [PATCH 053/194] Fix out-of-tree builds of the autoconf bundle, as reported in [forum:a0cd0beb1baa6bef|forum post a0cd0beb1baa6bef]. FossilOrigin-Name: d47964a65bcfd4bc0b06baca281467a0b7fc87eba912a19c0974f63a54928ff8 --- autoconf/Makefile.in | 27 ++++++++++++++++++--------- manifest | 12 ++++++------ manifest.uuid | 2 +- 3 files changed, 25 insertions(+), 16 deletions(-) diff --git a/autoconf/Makefile.in b/autoconf/Makefile.in index 0c97f16321..1229a72117 100644 --- a/autoconf/Makefile.in +++ b/autoconf/Makefile.in @@ -1,8 +1,17 @@ ######################################################################## # This is a main makefile for the "autoconf" bundle of SQLite. This is # a trimmed-down version of the canonical makefile, devoid of most -# documentation. For the full docs, see 'main.mk' in the canonical +# documentation. For the full docs, see /main.mk in the canonical # source tree. +# +# Maintenance reminders: +# +# - To keep this working with an out-of-tree build, be sure to prefix +# input file names with $(TOP)/ where appropriate (which is most +# places). +# +# - The original/canonical recipes can be found in /main.mk in the +# canonical source tree. all: TOP = @abs_top_srcdir@ @@ -123,8 +132,8 @@ LDFLAGS.libsqlite3 = \ LDFLAGS.libsqlite3.soname = @LDFLAGS_LIBSQLITE3_SONAME@ CFLAGS.libsqlite3 = -I. $(CFLAGS.core) $(CFLAGS.icu) $(OPT_FEATURE_FLAGS) -sqlite3.o: sqlite3.h sqlite3.c - $(CC) -c sqlite3.c -o $@ $(CFLAGS) $(CFLAGS.libsqlite3) +sqlite3.o: $(TOP)/sqlite3.h $(TOP)/sqlite3.c + $(CC) -c $(TOP)/sqlite3.c -o $@ $(CFLAGS) $(CFLAGS.libsqlite3) libsqlite3.LIB = libsqlite3$(T.lib) libsqlite3.SO = libsqlite3$(T.dll) @@ -169,9 +178,9 @@ install-lib: install-lib-$(ENABLE_LIB_STATIC) install: install-lib -sqlite3$(T.exe): shell.c sqlite3.c +sqlite3$(T.exe): $(TOP)/shell.c $(TOP)/sqlite3.c $(CC) -o $@ \ - shell.c sqlite3.c \ + $(TOP)/shell.c $(TOP)/sqlite3.c \ -I. $(OPT_FEATURE_FLAGS) $(SHELL_OPT) \ $(CFLAGS) $(CFLAGS.readline) $(CFLAGS.icu) \ $(LDFLAGS) $(LDFLAGS.libsqlite3) $(LDFLAGS.readline) @@ -181,16 +190,16 @@ install-shell: sqlite3$(T.exe) $(install-dir.bin) $(INSTALL.strip) sqlite3$(T.exe) "$(install-dir.bin)" install: install-shell -install-headers: sqlite3.h $(install-dir.include) - $(INSTALL.noexec) sqlite3.h sqlite3ext.h "$(install-dir.include)" +install-headers: $(TOP)/sqlite3.h $(install-dir.include) + $(INSTALL.noexec) $(TOP)/sqlite3.h $(TOP)/sqlite3ext.h "$(install-dir.include)" install: install-headers install-pc: sqlite3.pc $(install-dir.pkgconfig) $(INSTALL.noexec) sqlite3.pc "$(install-dir.pkgconfig)" install: install-pc -install-man1: sqlite3.1 $(install-dir.man1) - $(INSTALL.noexec) sqlite3.1 "$(install-dir.man1)" +install-man1: $(TOP)/sqlite3.1 $(install-dir.man1) + $(INSTALL.noexec) $(TOP)/sqlite3.1 "$(install-dir.man1)" install: install-man1 clean: diff --git a/manifest b/manifest index cad7d41db4..58056cf593 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Bump\sTEA\sconfigure.ac\sversion\snumber. -D 2025-02-07T01:43:05.809 +C Fix\sout-of-tree\sbuilds\sof\sthe\sautoconf\sbundle,\sas\sreported\sin\s[forum:a0cd0beb1baa6bef|forum\spost\sa0cd0beb1baa6bef]. +D 2025-02-07T11:15:58.181 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d @@ -16,7 +16,7 @@ F art/sqlite370.jpg d512473dae7e378a67e28ff96a34da7cb331def2 F art/sqlite370.svg 40b7e2fe8aac3add5d56dd86ab8d427a4eca5bcb3fe4f8946cb3794e1821d531 F auto.def e7e92090c98aeb0174d29988c259834eb1b71ae1ea927015c3ef300f6f9b68ae F autoconf/Makefile.fallback 22fe523eb36dfce31e0f6349f782eb084e86a5620b2b0b4f84a2d6133f53f5ac -F autoconf/Makefile.in 56697ad25ecf23afa317148b06bdc14f85960b42e5ec434ac1ba87f63a3cb789 +F autoconf/Makefile.in 1748696041b706722fcc2289630aec596e556e10677914ec1dd5de9c627324fa F autoconf/Makefile.msc 0a071367537dc395285a5d624ac4f99f3a387b27cc5e89752423c0499e15aec4 F autoconf/README.first f1d3876e9a7852c22f275a6f06814e64934cecbc0b5b9617d64849094c1fd136 F autoconf/README.txt 7f01dc3915e2d68f329011073662369e62a0938a2c69398807823c57591cb288 @@ -2209,8 +2209,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P e93d7aa1db9bdbf1996c4c168e67284177e384b7acf176d74a0458258faab05c -R 862fe61394e7b3cb4c5d861b55c28308 +P a1a9c780d1f1b47b0408397edded9c5d230c7b144207ad142d06c048792d31fa +R b8a9ec2caf630431b78b8fafa6d467ea U stephan -Z 4a5b39d46ead9ead0e536423680a6ea5 +Z 0e72d164ec413ce5120bfc7018dcffe2 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 0a49cc208d..f997b3b722 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -a1a9c780d1f1b47b0408397edded9c5d230c7b144207ad142d06c048792d31fa +d47964a65bcfd4bc0b06baca281467a0b7fc87eba912a19c0974f63a54928ff8 From d8452a9517c42a917c7f95aecde1f976f9d876ba Mon Sep 17 00:00:00 2001 From: stephan Date: Fri, 7 Feb 2025 12:33:48 +0000 Subject: [PATCH 054/194] Reorder a piece of ext/wasm/GNUmakefile to correct the timing of various var accesses. Fixes a problem [https://github.com/sqlite/sqlite-wasm/pull/99|reported in the downstream npm subproject] and explains the confusion in [4aa025a943a4024094b9] (which has been reverted). FossilOrigin-Name: 65798c09a00662a3598f01571d6f3a2dc750c3d0b127c344590539244afe4aa7 --- ext/wasm/GNUmakefile | 46 ++++++++++++++++++++++------------------- ext/wasm/index.html | 4 ++-- ext/wasm/mkwasmbuilds.c | 1 + manifest | 16 +++++++------- manifest.uuid | 2 +- 5 files changed, 37 insertions(+), 32 deletions(-) diff --git a/ext/wasm/GNUmakefile b/ext/wasm/GNUmakefile index dc8ea54fd4..4369635cf2 100644 --- a/ext/wasm/GNUmakefile +++ b/ext/wasm/GNUmakefile @@ -910,6 +910,31 @@ sqlite3-worker1-promiser.js := $(dir.dout)/sqlite3-worker1-promiser.js sqlite3-worker1-promiser.mjs := $(dir.dout)/sqlite3-worker1-promiser.mjs sqlite3-worker1-bundler-friendly.mjs := $(dir.dout)/sqlite3-worker1-bundler-friendly.mjs sqlite3-worker1-promiser-bundler-friendly.js := $(dir.dout)/sqlite3-worker1-promiser-bundler-friendly.js + +ifneq (1,$(MAKING_CLEAN)) +# This block MUST come between the above definitions of +# sqlite3-...js/mjs and the $(eval) calls below this block which use +# SQLITE.CALL.C-PP.FILTER. +######################################################################## +# bin.mkwb is used for generating some of the makefile code for the +# various wasm builds. It used to be generated in this makefile via a +# difficult-to-read/maintain block of $(eval)'d code. Attempts were +# made to generate it from tcl and bash (shell) but having to escape +# the $ references in those languages made it just as illegible as the +# native makefile code. Somewhat surprisingly, moving that code generation +# to C makes it slightly less illegible than the previous 3 options. +bin.mkwb := ./mkwasmbuilds +$(bin.mkwb): $(bin.mkwb).c $(MAKEFILE) + $(CC) -o $@ $< +DISTCLEAN_FILES += $(bin.mkwb) +.wasmbuilds.make: $(bin.mkwb) + @rm -f $@ + $(bin.mkwb) > $@ + @chmod -w $@ +-include .wasmbuilds.make +endif +DISTCLEAN_FILES += .wasmbuilds.make + $(eval $(call SQLITE.CALL.C-PP.FILTER,$(sqlite3-worker1.js.in),$(sqlite3-worker1.js))) $(eval $(call SQLITE.CALL.C-PP.FILTER,$(sqlite3-worker1.js.in),$(sqlite3-worker1-bundler-friendly.mjs),\ $(c-pp.D.sqlite3-bundler-friendly))) @@ -941,27 +966,6 @@ sqlite3-api.ext.jses += \ all quick: $(sqlite3-api.ext.jses) q: quick -ifneq (1,$(MAKING_CLEAN)) -######################################################################## -# bin.mkwb is used for generating some of the makefile code for the -# various wasm builds. It used to be generated in this makefile via a -# difficult-to-read/maintain block of $(eval)'d code. Attempts were -# made to generate it from tcl and bash (shell) but having to escape -# the $ references in those languages made it just as illegible as the -# native makefile code. Somewhat surprisingly, moving that code generation -# to C makes it slightly less illegible than the previous 3 options. -bin.mkwb := ./mkwasmbuilds -$(bin.mkwb): $(bin.mkwb).c $(MAKEFILE) - $(CC) -o $@ $< -DISTCLEAN_FILES += $(bin.mkwb) -.wasmbuilds.make: $(bin.mkwb) - @rm -f $@ - $(bin.mkwb) > $@ - @chmod -w $@ --include .wasmbuilds.make -endif -DISTCLEAN_FILES += .wasmbuilds.make - ######################################################################## # batch-runner.js is part of one of the test apps which reads in SQL # dumps generated by $(speedtest1) and executes them. diff --git a/ext/wasm/index.html b/ext/wasm/index.html index 5d53b62d48..a3d41f1a9c 100644 --- a/ext/wasm/index.html +++ b/ext/wasm/index.html @@ -84,8 +84,8 @@ wrapper is significantly easier to use, however.

  • demo-worker1-promiser: a demo of the Promise-based wrapper of the Worker1 API.
    • - +
  • demo-worker1-promiser-esm: + same as the previous demo except loads the promiser from an ESM module.
  • speedtest1 ports (sqlite3's primary benchmarking tool)... diff --git a/ext/wasm/mkwasmbuilds.c b/ext/wasm/mkwasmbuilds.c index 1e09f83c01..e762b572cd 100644 --- a/ext/wasm/mkwasmbuilds.c +++ b/ext/wasm/mkwasmbuilds.c @@ -274,6 +274,7 @@ static void mk_lib_mode(const char *zName /* build name */, if( !zEmcc ) zEmcc = ""; pf("%s# Begin build [%s-%s]\n", zBanner, zNM); + pf("# zApiJsOut=%s\n# zJsOut=%s\n# zCmppD=%s\n", zApiJsOut, zJsOut, zCmppD); pf("$(info Setting up build [%s-%s]: %s)\n", zNM, zJsOut); mk_pre_post(zNM, zCmppD); pf("\nemcc.flags.%s.%s ?=\n", zNM); diff --git a/manifest b/manifest index 58056cf593..d5d82d5ef5 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Fix\sout-of-tree\sbuilds\sof\sthe\sautoconf\sbundle,\sas\sreported\sin\s[forum:a0cd0beb1baa6bef|forum\spost\sa0cd0beb1baa6bef]. -D 2025-02-07T11:15:58.181 +C Reorder\sa\spiece\sof\sext/wasm/GNUmakefile\sto\scorrect\sthe\stiming\sof\svarious\svar\saccesses.\sFixes\sa\sproblem\s[https://github.com/sqlite/sqlite-wasm/pull/99|reported\sin\sthe\sdownstream\snpm\ssubproject]\sand\sexplains\sthe\sconfusion\sin\s[4aa025a943a4024094b9]\s(which\shas\sbeen\sreverted). +D 2025-02-07T12:33:48.387 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d @@ -619,7 +619,7 @@ F ext/session/sqlite3session.c 52a680dbb03c4734748b215d95987fb4d95ab23baaf053a01 F ext/session/sqlite3session.h 683ccbf16e2c2521661fc4c1cf918ce57002039efbcabcd8097fa4bca569104b F ext/session/test_session.c 12e0a2c15fd60f92da4bb29c697c9177ff0c0dbcdc5129a54c47e999f147937a F ext/wasm/EXPORTED_FUNCTIONS.fiddle.in 27450c8b8c70875a260aca55435ec927068b34cef801a96205adb81bdcefc65c -F ext/wasm/GNUmakefile 7d1076680e687d01e0f4f343624db4e00e31edbe67bd0cb2e3ad8ecea98a3cae +F ext/wasm/GNUmakefile df23a3cb3bfb13f17fc76132a0127a89e2ad64f46b71efee9743929cfd52d441 F ext/wasm/README-dist.txt f01081a850ce38a56706af6b481e3a7878e24e42b314cfcd4b129f0f8427066a F ext/wasm/README.md b89605f65661cf35bf034ff6d43e448cc169b8017fc105d498e33b81218b482c F ext/wasm/SQLTester/GNUmakefile e0794f676d55819951bbfae45cc5e8d7818dc460492dc317ce7f0d2eca15caff @@ -677,10 +677,10 @@ F ext/wasm/fiddle/fiddle-worker.js 850e66fce39b89d59e161d1abac43a181a4caa89ddeea F ext/wasm/fiddle/fiddle.js b444a5646a9aac9f3fc06c53d78af5e1912eb235d69a8e6010723e4eb0e9d4a1 F ext/wasm/fiddle/index.html c79b1741cbeba78f88af0a84cf5ec7de87a909a6a8d10a369b1f4824c66c2088 F ext/wasm/index-dist.html 56132399702b15d70c474c3f1952541e25cb0922942868f70daf188f024b3730 -F ext/wasm/index.html 10ff3ad190aadccb713109fa55a38e5c1f3c2a8cf05cd31783745bab3f184079 +F ext/wasm/index.html e4bbffdb3d40eff12b3f9c7abedef91787e2935620b7f8d40f2c774b80ad8fa9 F ext/wasm/jaccwabyt/jaccwabyt.js 1264710db3cfbcb6887d95665b7aeba60c1126eaef789ca4cf1a4a17d5bc7f54 F ext/wasm/jaccwabyt/jaccwabyt.md 59a20df389abcc3606eb4eaea7fb7ba14504beb3e345dbea9b99a0618ba3bec8 -F ext/wasm/mkwasmbuilds.c d5885bacf2253bed913cdc7eb16b44f9c9e782133e10600652d1a78841c337af +F ext/wasm/mkwasmbuilds.c 954fe4242e877aeb60de44070628f5215ff51e5d102db6e2cb7da8c21e9e3401 F ext/wasm/module-symbols.html dc476b403369b26a1a23773e13b80f41b9a49f0825e81435fe3600a7cfbbe337 F ext/wasm/scratchpad-wasmfs.html a3d7388f3c4b263676b58b526846e9d02dfcb4014ff29d3a5040935286af5b96 F ext/wasm/scratchpad-wasmfs.mjs 66034b9256b218de59248aad796760a1584c1dd842231505895eff00dbd57c63 @@ -2209,8 +2209,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P a1a9c780d1f1b47b0408397edded9c5d230c7b144207ad142d06c048792d31fa -R b8a9ec2caf630431b78b8fafa6d467ea +P d47964a65bcfd4bc0b06baca281467a0b7fc87eba912a19c0974f63a54928ff8 +R bc3b5d925c6179c0542f51782afdf047 U stephan -Z 0e72d164ec413ce5120bfc7018dcffe2 +Z 4ad5c2be721c326cfa9c17d54c17536c # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index f997b3b722..778ccade2d 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -d47964a65bcfd4bc0b06baca281467a0b7fc87eba912a19c0974f63a54928ff8 +65798c09a00662a3598f01571d6f3a2dc750c3d0b127c344590539244afe4aa7 From 7a7002143c893ca06035ddc15c71f095a6b95849 Mon Sep 17 00:00:00 2001 From: stephan Date: Fri, 7 Feb 2025 12:58:09 +0000 Subject: [PATCH 055/194] configure: change extension of static libraries from .lib to .a on msys/cygwin, as per discussion in [forum:02db2d4240|forum post 02db2d4240]. Replace unidiomatic JS-style use of inner procs in autosetup/proj.tcl with TCL lambdas. FossilOrigin-Name: 46f51e2a3707614a2b3ca6261bc6e0e8835477fdb7cbcf2f06b20cdebde2bab9 --- autosetup/proj.tcl | 20 +++++++++++--------- manifest | 12 ++++++------ manifest.uuid | 2 +- 3 files changed, 18 insertions(+), 16 deletions(-) diff --git a/autosetup/proj.tcl b/autosetup/proj.tcl index 88da2112cf..5eeec0afb9 100644 --- a/autosetup/proj.tcl +++ b/autosetup/proj.tcl @@ -760,7 +760,7 @@ proc proj-exe-extension {} { # Trivia: for .dylib files, the linker needs the -dynamiclib flag # instead of -shared. proc proj-dll-extension {} { - proc inner {key} { + set inner {{key} { switch -glob -- [get-define $key] { *apple* { return ".dylib" @@ -772,9 +772,9 @@ proc proj-dll-extension {} { return ".so" } } - } - define BUILD_DLLEXT [inner build] - define TARGET_DLLEXT [inner host] + }} + define BUILD_DLLEXT [apply $inner build] + define TARGET_DLLEXT [apply $inner host] } ######################################################################## @@ -784,18 +784,20 @@ proc proj-dll-extension {} { # BUILD_LIBEXT and TARGET_LIBEXT to the conventional static library # extension for the being-built-on resp. the target platform. proc proj-lib-extension {} { - proc inner {key} { + set inner {{key} { switch -glob -- [get-define $key] { *-*-ming* - *-*-cygwin - *-*-msys { - return ".lib" + return ".a" + # ^^^ this was ".lib" until 2025-02-07. See + # https://sqlite.org/forum/forumpost/02db2d4240 } default { return ".a" } } - } - define BUILD_LIBEXT [inner build] - define TARGET_LIBEXT [inner host] + }} + define BUILD_LIBEXT [apply $inner build] + define TARGET_LIBEXT [apply $inner host] } ######################################################################## diff --git a/manifest b/manifest index d5d82d5ef5..29a95f233f 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Reorder\sa\spiece\sof\sext/wasm/GNUmakefile\sto\scorrect\sthe\stiming\sof\svarious\svar\saccesses.\sFixes\sa\sproblem\s[https://github.com/sqlite/sqlite-wasm/pull/99|reported\sin\sthe\sdownstream\snpm\ssubproject]\sand\sexplains\sthe\sconfusion\sin\s[4aa025a943a4024094b9]\s(which\shas\sbeen\sreverted). -D 2025-02-07T12:33:48.387 +C configure:\schange\sextension\sof\sstatic\slibraries\sfrom\s.lib\sto\s.a\son\smsys/cygwin,\sas\sper\sdiscussion\sin\s[forum:02db2d4240|forum\spost\s02db2d4240].\sReplace\sunidiomatic\sJS-style\suse\sof\sinner\sprocs\sin\sautosetup/proj.tcl\swith\sTCL\slambdas. +D 2025-02-07T12:58:09.364 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d @@ -49,7 +49,7 @@ F autosetup/cc-shared.tcl 4f024e94a47f427ba61de1739f6381ef0080210f9fae89112d5c1d F autosetup/cc.tcl c0fcc50ca91deff8741e449ddad05bcd08268bc31177e613a6343bbd1fd3e45f F autosetup/jimsh0.c 5a74bdbf43c52289e3f482f3b9578db4bd657e88e8fe04b16c564d9fb710540a F autosetup/pkg-config.tcl 4e635bf39022ff65e0d5434339dd41503ea48fc53822c9c5bde88b02d3d952ba -F autosetup/proj.tcl 9adf1539673cef15bff862d9360b479e6920cc2c0d85de707b0ba31c04ce4531 +F autosetup/proj.tcl af5290ee128ce82dd178a474a9dcfaa7e503c88f0709d916cc6079d9b8c801f4 F autosetup/sqlite-config.tcl 00af5b9d94d580367bf01984b86397e8d35b74090427def9591a54ded0e1a287 F autosetup/system.tcl 51d4be76cd9a9074704b584e5c9cbba616202c8468cf9ba8a4f8294a7ab1dba9 F configure 9a00b21dfd13757bbfb8d89b30660a89ec1f8f3a79402b8f9f9b6fc475c3303a x @@ -2209,8 +2209,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P d47964a65bcfd4bc0b06baca281467a0b7fc87eba912a19c0974f63a54928ff8 -R bc3b5d925c6179c0542f51782afdf047 +P 65798c09a00662a3598f01571d6f3a2dc750c3d0b127c344590539244afe4aa7 +R dbe2a8083128cb507b4a3778dff39744 U stephan -Z 4ad5c2be721c326cfa9c17d54c17536c +Z 17346bc038bd674448e57b726746aecf # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 778ccade2d..d18bacd0ca 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -65798c09a00662a3598f01571d6f3a2dc750c3d0b127c344590539244afe4aa7 +46f51e2a3707614a2b3ca6261bc6e0e8835477fdb7cbcf2f06b20cdebde2bab9 From ede1690cce75ecd6fb965c2ff99c54f92e694ed6 Mon Sep 17 00:00:00 2001 From: drh <> Date: Fri, 7 Feb 2025 13:37:15 +0000 Subject: [PATCH 056/194] Reduce the amount of memset() needed to initialize the Parse object. FossilOrigin-Name: 284538d8486ef3e9bee1ab980043b53c144743c31b984be13a5cc137e7cbec31 --- manifest | 16 ++++++++-------- manifest.uuid | 2 +- src/sqliteInt.h | 4 ++-- src/trigger.c | 2 ++ 4 files changed, 13 insertions(+), 11 deletions(-) diff --git a/manifest b/manifest index 29a95f233f..57aee4069f 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C configure:\schange\sextension\sof\sstatic\slibraries\sfrom\s.lib\sto\s.a\son\smsys/cygwin,\sas\sper\sdiscussion\sin\s[forum:02db2d4240|forum\spost\s02db2d4240].\sReplace\sunidiomatic\sJS-style\suse\sof\sinner\sprocs\sin\sautosetup/proj.tcl\swith\sTCL\slambdas. -D 2025-02-07T12:58:09.364 +C Reduce\sthe\samount\sof\smemset()\sneeded\sto\sinitialize\sthe\sParse\sobject. +D 2025-02-07T13:37:15.659 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d @@ -785,7 +785,7 @@ F src/shell.c.in b377a59822f207106424f08aead37e78b609222e98f86f04cc8a03563ccf323 F src/sqlite.h.in d2902f13ace94d3d3609646bd6d12a2d7a4f6cbdf6a5a4097580ac305f54c3f0 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8 F src/sqlite3ext.h 3f046c04ea3595d6bfda99b781926b17e672fd6d27da2ba6d8d8fc39981dcb54 -F src/sqliteInt.h 9d7052c71f46ca3a1a4880ba4a62590da334651139a38327d488894d9c883f3b +F src/sqliteInt.h d85806d6d66210ddf8b14158c6301608ca6abfa952b5a8e57c9852926a4c9728 F src/sqliteLimit.h 1bbdbf72bd0411d003267ffebc59a262f061df5653027a75627d03f48ca30523 F src/status.c cb11f8589a6912af2da3bb1ec509a94dd8ef27df4d4c1a97e0bcf2309ece972b F src/table.c 0f141b58a16de7e2fbe81c308379e7279f4c6b50eb08efeec5892794a0ba30d1 @@ -843,7 +843,7 @@ F src/test_wsd.c 41cadfd9d97fe8e3e4e44f61a4a8ccd6f7ca8fe9 F src/threads.c 4ae07fa022a3dc7c5beb373cf744a85d3c5c6c3c F src/tokenize.c 375a772e2342274f4bf73605a70633237da09deed00a9bf4c4816a56777ea7c9 F src/treeview.c d85ce76e6d1498d781957c07cb234da6d77ce0ed2d196480d516f54dabc62279 -F src/trigger.c 247e2d712d5edc6021d52a169f6ac9a9c10d7144bc4ac7ea06c1ed2aa414659f +F src/trigger.c 9f887ae4d3077d9de67d312e1da12f57e8b3a598468876bb3b8ccc6c1bca2eb1 F src/update.c 0e01aa6a3edf9ec112b33eb714b9016a81241497b1fb7c3e74332f4f71756508 F src/upsert.c 215328c3f91623c520ec8672c44323553f12caeb4f01b1090ebdca99fdf7b4f1 F src/utf.c 8b29d9a5956569ea2700f869669b8ef67a9662ee5e724ff77ab3c387e27094ba @@ -2209,8 +2209,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P 65798c09a00662a3598f01571d6f3a2dc750c3d0b127c344590539244afe4aa7 -R dbe2a8083128cb507b4a3778dff39744 -U stephan -Z 17346bc038bd674448e57b726746aecf +P 46f51e2a3707614a2b3ca6261bc6e0e8835477fdb7cbcf2f06b20cdebde2bab9 +R 2ea5c3310ea580989e316d82762bea3d +U drh +Z 9a2383046899765f80ff4490e5ed6b3d # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index d18bacd0ca..7872bfc017 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -46f51e2a3707614a2b3ca6261bc6e0e8835477fdb7cbcf2f06b20cdebde2bab9 +284538d8486ef3e9bee1ab980043b53c144743c31b984be13a5cc137e7cbec31 diff --git a/src/sqliteInt.h b/src/sqliteInt.h index f47009c158..bbef593dfa 100644 --- a/src/sqliteInt.h +++ b/src/sqliteInt.h @@ -3879,8 +3879,6 @@ struct Parse { int addrCrTab; /* Address of OP_CreateBtree on CREATE TABLE */ Returning *pReturning; /* The RETURNING clause */ } u1; - u32 oldmask; /* Mask of old.* columns referenced */ - u32 newmask; /* Mask of new.* columns referenced */ LogEst nQueryLoop; /* Est number of iterations of a query (10*log2(N)) */ u8 eTriggerOp; /* TK_UPDATE, TK_INSERT or TK_DELETE */ u8 bReturning; /* Coding a RETURNING trigger */ @@ -3897,6 +3895,8 @@ struct Parse { int aTempReg[8]; /* Holding area for temporary registers */ Parse *pOuterParse; /* Outer Parse object when nested */ Token sNameToken; /* Token with unqualified schema object name */ + u32 oldmask; /* Mask of old.* columns referenced */ + u32 newmask; /* Mask of new.* columns referenced */ /************************************************************************ ** Above is constant between recursions. Below is reset before and after diff --git a/src/trigger.c b/src/trigger.c index e306a2e664..e7b75d344a 100644 --- a/src/trigger.c +++ b/src/trigger.c @@ -1277,6 +1277,8 @@ static TriggerPrg *codeRowTrigger( sSubParse.eTriggerOp = pTrigger->op; sSubParse.nQueryLoop = pParse->nQueryLoop; sSubParse.prepFlags = pParse->prepFlags; + sSubParse.oldmask = 0; + sSubParse.newmask = 0; v = sqlite3GetVdbe(&sSubParse); if( v ){ From 189a4a0bbbc81781c2ee8aaf3f31cf55f67085e9 Mon Sep 17 00:00:00 2001 From: stephan Date: Fri, 7 Feb 2025 14:44:31 +0000 Subject: [PATCH 057/194] Mac-specific build fixes discussed in [forum:9dfd5b8fd525a5d7|forum thread 9dfd5b8fd525a5d7]: rename dylib links and add legacy-compatibility versioning stamps to libsqlite3.dylib. FossilOrigin-Name: 668bcf327a82a63d45be8cf38fdddc855dbcefdedf6c208e091eb7e2d244929d --- Makefile.in | 2 ++ auto.def | 5 ++-- autoconf/Makefile.in | 26 ++++++++++++++++----- autoconf/auto.def | 3 +-- autosetup/jimsh0.c | 32 ++++++++++++-------------- autosetup/sqlite-config.tcl | 46 ++++++++++++++++++++++++++++++++++++- main.mk | 21 +++++++++++++---- manifest | 26 ++++++++++----------- manifest.uuid | 2 +- 9 files changed, 116 insertions(+), 47 deletions(-) diff --git a/Makefile.in b/Makefile.in index 15e61217f2..f514046e00 100644 --- a/Makefile.in +++ b/Makefile.in @@ -121,6 +121,8 @@ LDFLAGS.icu = @LDFLAGS_ICU@ CFLAGS.icu = @CFLAGS_ICU@ LDFLAGS.libsqlite3.soname = @LDFLAGS_LIBSQLITE3_SONAME@ # soname: see https://sqlite.org/src/forumpost/5a3b44f510df8ded +LDFLAGS.libsqlite3.os-specific = @LDFLAGS_MAC_CVERSION@ +# os-specific: see https://sqlite.org/forum/forumpost/9dfd5b8fd525a5d7 ENABLE_SHARED = @ENABLE_SHARED@ ENABLE_STATIC = @ENABLE_STATIC@ HAVE_WASI_SDK = @HAVE_WASI_SDK@ diff --git a/auto.def b/auto.def index 52c758850c..3a5a2f64c1 100644 --- a/auto.def +++ b/auto.def @@ -230,7 +230,7 @@ proj-if-opt-truthy dev { define CFLAGS [get-env CFLAGS {-O0 -g}] # -------------^^^^^^^ intentionally using [get-env] instead of # [proj-get-env] here because [sqlite-setup-default-cflags] uses - # [proj-get-env]. + # [proj-get-env] and we want this to supercede that. } sqlite-check-common-bins ;# must come before [sqlite-handle-wasi-sdk] @@ -275,6 +275,5 @@ sqlite-handle-load-extension sqlite-handle-math sqlite-handle-icu sqlite-handle-emsdk -sqlite-process-dot-in-files -sqlite-post-config-validation +sqlite-common-late-stage-config sqlite-dump-defines diff --git a/autoconf/Makefile.in b/autoconf/Makefile.in index 1229a72117..0270b9a1db 100644 --- a/autoconf/Makefile.in +++ b/autoconf/Makefile.in @@ -69,7 +69,6 @@ LDFLAGS.readline = @LDFLAGS_READLINE@ CFLAGS.readline = @CFLAGS_READLINE@ LDFLAGS.icu = @LDFLAGS_ICU@ CFLAGS.icu = @CFLAGS_ICU@ -LDFLAGS.libsqlite3.soname = @LDFLAGS_LIBSQLITE3_SONAME@ # When cross-compiling, we need to avoid the -s flag because it only # works on the build host's platform. @@ -124,12 +123,16 @@ SHELL_OPT ?= @OPT_SHELL@ # OPT_FEATURE_FLAGS = @OPT_FEATURE_FLAGS@ +LDFLAGS.libsqlite3.soname = @LDFLAGS_LIBSQLITE3_SONAME@ +# soname: see https://sqlite.org/src/forumpost/5a3b44f510df8ded +LDFLAGS.libsqlite3.os-specific = @LDFLAGS_MAC_CVERSION@ +# os-specific: see https://sqlite.org/forum/forumpost/9dfd5b8fd525a5d7 + LDFLAGS.libsqlite3 = \ $(LDFLAGS.rpath) $(LDFLAGS.pthread) \ $(LDFLAGS.math) $(LDFLAGS.dlopen) \ $(LDFLAGS.zlib) $(LDFLAGS.icu) \ $(LDFLAGS.configure) -LDFLAGS.libsqlite3.soname = @LDFLAGS_LIBSQLITE3_SONAME@ CFLAGS.libsqlite3 = -I. $(CFLAGS.core) $(CFLAGS.icu) $(OPT_FEATURE_FLAGS) sqlite3.o: $(TOP)/sqlite3.h $(TOP)/sqlite3.c @@ -140,7 +143,8 @@ libsqlite3.SO = libsqlite3$(T.dll) $(libsqlite3.SO): sqlite3.o $(CC) -o $@ sqlite3.o $(LDFLAGS.shlib) \ - $(LDFLAGS) $(LDFLAGS.libsqlite3) $(LDFLAGS.libsqlite3.soname) + $(LDFLAGS) $(LDFLAGS.libsqlite3) \ + $(LDFLAGS.libsqlite3.os-specific) $(LDFLAGS.libsqlite3.soname) all: $(libsqlite3.SO) $(libsqlite3.LIB): sqlite3.o @@ -149,8 +153,16 @@ all: $(libsqlite3.LIB) install-so-1: $(install-dir.lib) $(libsqlite3.SO) $(INSTALL) $(libsqlite3.SO) "$(install-dir.lib)" - @echo "Setting up $(libsqlite3.SO) symlinks..."; \ - cd "$(install-dir.lib)" || exit $$?; \ + @echo "Setting up $(libsqlite3.SO) version symlinks..."; \ + cd "$(install-dir.lib)" || exit $$?; \ + if [ x.dylib = x$(T.dll) ]; then \ + rm -f libsqlite3.0$(T.dll) libsqlite3.$(PACKAGE_VERSION)$(T.dll) || exit $$?; \ + dllname=libsqlite3.$(PACKAGE_VERSION)$(T.dll); \ + mv $(libsqlite3.SO) $$dllname || exit $$?; \ + ln -s $$dllname $(libsqlite3.SO) || exit $$?; \ + ln -s $$dllname libsqlite3.0$(T.dll) || exit $$?; \ + ls -la $$dllname $(libsqlite3.SO) libsqlite3.0$(T.dll); \ + else \ rm -f $(libsqlite3.SO).0 $(libsqlite3.SO).$(PACKAGE_VERSION) || exit $$?; \ mv $(libsqlite3.SO) $(libsqlite3.SO).$(PACKAGE_VERSION) || exit $$?; \ ln -s $(libsqlite3.SO).$(PACKAGE_VERSION) $(libsqlite3.SO) || exit $$?; \ @@ -166,7 +178,9 @@ install-so-1: $(install-dir.lib) $(libsqlite3.SO) rm -f libsqlite3.la $(libsqlite3.SO).0.8.6 || exit $$?; \ ln -s $(libsqlite3.SO).$(PACKAGE_VERSION) $(libsqlite3.SO).0.8.6 || exit $$?; \ ls -la $(libsqlite3.SO).0.8.6; \ - fi + fi; \ + fi + install-so-0 install-so-: install-so: install-so-$(ENABLE_LIB_SHARED) install: install-so diff --git a/autoconf/auto.def b/autoconf/auto.def index 12eb3d75c3..72f50094b8 100644 --- a/autoconf/auto.def +++ b/autoconf/auto.def @@ -94,5 +94,4 @@ sqlite-handle-icu define ENABLE_LIB_SHARED [opt-bool shared] define ENABLE_LIB_STATIC [opt-bool static] -sqlite-process-dot-in-files -sqlite-post-config-validation +sqlite-common-late-stage-config diff --git a/autosetup/jimsh0.c b/autosetup/jimsh0.c index 4b9cf3eebf..0526b9a446 100644 --- a/autosetup/jimsh0.c +++ b/autosetup/jimsh0.c @@ -75,9 +75,6 @@ extern "C" { #if defined(_WIN32) || defined(WIN32) -#ifndef STDIN_FILENO -#define STDIN_FILENO 0 -#endif #define HAVE_DLOPEN void *dlopen(const char *path, int mode); int dlclose(void *handle); @@ -1201,6 +1198,11 @@ int Jim_OpenForRead(const char *filename); #define Jim_FileStat _fstat64 #define Jim_Lseek _lseeki64 #define O_TEXT _O_TEXT + #define O_BINARY _O_BINARY + #define Jim_SetMode _setmode + #ifndef STDIN_FILENO + #define STDIN_FILENO 0 + #endif #else #if defined(HAVE_STAT64) @@ -2941,22 +2943,22 @@ static int aio_cmd_buffering(Jim_Interp *interp, int argc, Jim_Obj *const *argv) static int aio_cmd_translation(Jim_Interp *interp, int argc, Jim_Obj *const *argv) { - enum {OPT_BINARY, OPT_TEXT}; + enum {OPT_BINARY, OPT_TEXT}; static const char * const options[] = { "binary", "text", NULL }; - int opt; + int opt; - if (Jim_GetEnum(interp, argv[0], options, &opt, NULL, JIM_ERRMSG) != JIM_OK) { - return JIM_ERR; - } -#if defined(_setmode) && defined(O_BINARY) - else { - AioFile *af = Jim_CmdPrivData(interp); - _setmode(af->fh, opt == OPT_BINARY ? O_BINARY : O_TEXT); - } + if (Jim_GetEnum(interp, argv[0], options, &opt, NULL, JIM_ERRMSG) != JIM_OK) { + return JIM_ERR; + } +#if defined(Jim_SetMode) + else { + AioFile *af = Jim_CmdPrivData(interp); + Jim_SetMode(af->fd, opt == OPT_BINARY ? O_BINARY : O_TEXT); + } #endif return JIM_OK; } @@ -24374,10 +24376,6 @@ int Jim_InteractivePrompt(Jim_Interp *interp) #include -#ifdef HAVE_UNISTD_H -#include -#endif - extern int Jim_initjimshInit(Jim_Interp *interp); diff --git a/autosetup/sqlite-config.tcl b/autosetup/sqlite-config.tcl index 9f300e317d..cabb32aac0 100644 --- a/autosetup/sqlite-config.tcl +++ b/autosetup/sqlite-config.tcl @@ -43,7 +43,10 @@ set sqliteConfig(is-cross-compiling) [proj-is-cross-compiling] ######################################################################## # Runs some common initialization which must happen immediately after -# autosetup's [options] function is called. +# autosetup's [options] function is called. This is also a convenient +# place to put some generic pieces common to both the canonical +# top-level build and the "autoconf" build, but it's not intended to +# be a catch-all dumping ground for such. proc sqlite-post-options-init {} { # # Carry values from hidden --flag aliases over to their canonical @@ -861,6 +864,47 @@ proc sqlite-handle-math {} { } } +######################################################################## +# If this OS looks like a Mac, checks for the Mac-specific +# -current_version and -compatibility_version linker flags. Defines +# LDFLAGS_MAC_CVERSION to an empty string and returns 0 if they're not +# supported, else defines that to the linker flags and returns 1. +# +# We don't check this on non-Macs because this whole thing is a +# libtool compatibility kludge to account for a version stamp which +# libtool applied only on Mac platforms. +# +# Based on https://sqlite.org/forum/forumpost/9dfd5b8fd525a5d7. +proc sqlite-check-mac-cversion {} { + define LDFLAGS_MAC_CVERSION "" + set rc 0 + if {[proj-looks-like-mac]} { + cc-with {} { + # These version numbers are historical libtool-defined values, not + # library-defined ones + if {[cc-check-flags "-Wl,-current_version,9.6.0"] + && [cc-check-flags "-Wl,-compatibility_version,9.0.0"]} { + define LDFLAGS_MAC_CVERSION "-Wl,-compatibility_version,9.0.0 -Wl,-current_version,9.6.0" + set rc 1 + } elseif {[cc-check-flags "-compatibility_version 9.0.0"] + && [cc-check-flags "-current_version 9.6.0"]} { + define LDFLAGS_MAC_CVERSION "-compatibility_version 9.0.0 -current_version 9.6.0" + set rc 1 + } + } + } + return $rc +} + +######################################################################## +# Performs late-stage config steps common to both the canonical and +# autoconf bundle builds. +proc sqlite-common-late-stage-config {} { + sqlite-check-mac-cversion + sqlite-process-dot-in-files + sqlite-post-config-validation +} + ######################################################################## # Perform some late-stage work and generate the configure-process # output file(s). diff --git a/main.mk b/main.mk index 00632a5d5c..38d1ba5f56 100644 --- a/main.mk +++ b/main.mk @@ -166,6 +166,7 @@ LDFLAGS.shlib ?= -shared LDFLAGS.icu ?= # -licui18n -licuuc -licudata CFLAGS.icu ?= LDFLAGS.libsqlite3.soname ?= # see https://sqlite.org/src/forumpost/5a3b44f510df8ded +LDFLAGS.libsqlite3.os-specific ?= # see https://sqlite.org/forum/forumpost/9dfd5b8fd525a5d7 # libreadline (or a workalike): # To activate readline in the shell: SHELL_OPT = -DHAVE_READLINE=1 LDFLAGS.readline ?= -lreadline # these vary across platforms @@ -1411,7 +1412,7 @@ all: lib # $(libsqlite3.SO): $(LIBOBJ) $(T.link.shared) -o $@ $(LIBOBJ) $(LDFLAGS.libsqlite3) \ - $(LDFLAGS.libsqlite3.soname) + $(LDFLAGS.libsqlite3.os-specific) $(LDFLAGS.libsqlite3.soname) $(libsqlite3.SO)-1: $(libsqlite3.SO) $(libsqlite3.SO)-0 $(libsqlite3.SO)-: so: $(libsqlite3.SO)-$(ENABLE_SHARED) @@ -1429,6 +1430,9 @@ all: so # unnecessary unless we want to set SONAME to libsqlite3.so.3, which # is also unnecessary. # +# N.B. different transformations are applied on systems where $(T.dll) +# is ".dylib" and none of the following docs apply on such systems. +# # The link named libsqlite3.so.0 is provided in an attempt to reduce # downstream disruption when performing upgrades from pre-3.48 to a # version 3.48 or higher. That name is considered a legacy remnant @@ -1465,8 +1469,16 @@ all: so # install-so-1: $(install-dir.lib) $(libsqlite3.SO) $(INSTALL) $(libsqlite3.SO) "$(install-dir.lib)" - @echo "Setting up $(libsqlite3.SO) symlinks..."; \ - cd "$(install-dir.lib)" || exit $$?; \ + @echo "Setting up $(libsqlite3.SO) version symlinks..."; \ + cd "$(install-dir.lib)" || exit $$?; \ + if [ x.dylib = x$(T.dll) ]; then \ + rm -f libsqlite3.0$(T.dll) libsqlite3.$(PACKAGE_VERSION)$(T.dll) || exit $$?; \ + dllname=libsqlite3.$(PACKAGE_VERSION)$(T.dll); \ + mv $(libsqlite3.SO) $$dllname || exit $$?; \ + ln -s $$dllname $(libsqlite3.SO) || exit $$?; \ + ln -s $$dllname libsqlite3.0$(T.dll) || exit $$?; \ + ls -la $$dllname $(libsqlite3.SO) libsqlite3.0$(T.dll); \ + else \ rm -f $(libsqlite3.SO).0 $(libsqlite3.SO).$(PACKAGE_VERSION) || exit $$?; \ mv $(libsqlite3.SO) $(libsqlite3.SO).$(PACKAGE_VERSION) || exit $$?; \ ln -s $(libsqlite3.SO).$(PACKAGE_VERSION) $(libsqlite3.SO) || exit $$?; \ @@ -1482,7 +1494,8 @@ install-so-1: $(install-dir.lib) $(libsqlite3.SO) rm -f libsqlite3.la $(libsqlite3.SO).0.8.6 || exit $$?; \ ln -s $(libsqlite3.SO).$(PACKAGE_VERSION) $(libsqlite3.SO).0.8.6 || exit $$?; \ ls -la $(libsqlite3.SO).0.8.6; \ - fi + fi; \ + fi install-so-0 install-so-: install-so: install-so-$(ENABLE_SHARED) install: install-so diff --git a/manifest b/manifest index 57aee4069f..09675a6203 100644 --- a/manifest +++ b/manifest @@ -1,9 +1,9 @@ -C Reduce\sthe\samount\sof\smemset()\sneeded\sto\sinitialize\sthe\sParse\sobject. -D 2025-02-07T13:37:15.659 +C Mac-specific\sbuild\sfixes\sdiscussed\sin\s[forum:9dfd5b8fd525a5d7|forum\sthread\s9dfd5b8fd525a5d7]:\srename\sdylib\slinks\sand\sadd\slegacy-compatibility\sversioning\sstamps\sto\slibsqlite3.dylib. +D 2025-02-07T14:44:31.113 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d -F Makefile.in 38485d15d9190cdad0d7bee25af7b442028865964025dcc61f40fd8d6e369cfc +F Makefile.in 85ed87882b5d3fd11e6403212f2120e5e07d341bc96a101cfa9475901edd0754 F Makefile.linux-generic bd3e3cacd369821a6241d4ea1967395c962dfe3057e38cb0a435cee0e8b789d0 F Makefile.msc a9b95ae9807e17f9b0734ebe97d68032141c3f95286bb64593cb73b206f043cf F README.md c3c0f19532ce28f6297a71870f3c7b424729f0e6d9ab889616d3587dd2332159 @@ -14,13 +14,13 @@ F art/sqlite370.eps aa97a671332b432a54e1d74ff5e8775be34200c2 F art/sqlite370.ico af56c1d00fee7cd4753e8631ed60703ed0fc6e90 F art/sqlite370.jpg d512473dae7e378a67e28ff96a34da7cb331def2 F art/sqlite370.svg 40b7e2fe8aac3add5d56dd86ab8d427a4eca5bcb3fe4f8946cb3794e1821d531 -F auto.def e7e92090c98aeb0174d29988c259834eb1b71ae1ea927015c3ef300f6f9b68ae +F auto.def fdd6965e06bce02a8b9f9ed57a52d05bcbec4b56e4bef2174866bb5713c65fda F autoconf/Makefile.fallback 22fe523eb36dfce31e0f6349f782eb084e86a5620b2b0b4f84a2d6133f53f5ac -F autoconf/Makefile.in 1748696041b706722fcc2289630aec596e556e10677914ec1dd5de9c627324fa +F autoconf/Makefile.in be23c54eef87e6a64d875f96f6cf60a871219c50b04a955ebbd1aac48b4c738e F autoconf/Makefile.msc 0a071367537dc395285a5d624ac4f99f3a387b27cc5e89752423c0499e15aec4 F autoconf/README.first f1d3876e9a7852c22f275a6f06814e64934cecbc0b5b9617d64849094c1fd136 F autoconf/README.txt 7f01dc3915e2d68f329011073662369e62a0938a2c69398807823c57591cb288 -F autoconf/auto.def 23bc095a3890c0ca334abf7ef67d1c8af4c22c12832bcc738015e868d54fe9d7 +F autoconf/auto.def 71dde17158afcd6fb097b66853371991bb6ca5517b034e2efa9f0c47a2e730f2 F autoconf/tea/Makefile.in ba0556fee8da09c066bad85a4457904e46ee2c2eabaa309c0e83a78f2f151a8e F autoconf/tea/README.txt 61e62e519579e4a112791354d6d440f8b51ea6db3b0bab58d59f29df42d2dfe3 F autoconf/tea/aclocal.m4 52c47aac44ce0ddb1f918b6993e8beb8eee88f43 @@ -47,10 +47,10 @@ F autosetup/cc-db.tcl 6e0ed90146197a5a05b245e649975c07c548e30926b218ca3e1d4dc034 F autosetup/cc-lib.tcl 493c5935b5dd3bf9bd4eca89b07c8b1b1a9356d61783035144e21795facf7360 F autosetup/cc-shared.tcl 4f024e94a47f427ba61de1739f6381ef0080210f9fae89112d5c1de1e5460d78 F autosetup/cc.tcl c0fcc50ca91deff8741e449ddad05bcd08268bc31177e613a6343bbd1fd3e45f -F autosetup/jimsh0.c 5a74bdbf43c52289e3f482f3b9578db4bd657e88e8fe04b16c564d9fb710540a +F autosetup/jimsh0.c 6573f6bc6ff204de0139692648d7037ca0b6c067bac83a7b4e087f20a86866a4 F autosetup/pkg-config.tcl 4e635bf39022ff65e0d5434339dd41503ea48fc53822c9c5bde88b02d3d952ba F autosetup/proj.tcl af5290ee128ce82dd178a474a9dcfaa7e503c88f0709d916cc6079d9b8c801f4 -F autosetup/sqlite-config.tcl 00af5b9d94d580367bf01984b86397e8d35b74090427def9591a54ded0e1a287 +F autosetup/sqlite-config.tcl f64aff26763e9ea021aabac222d43a9e0107b45f6de82972b93411fe36ef566b F autosetup/system.tcl 51d4be76cd9a9074704b584e5c9cbba616202c8468cf9ba8a4f8294a7ab1dba9 F configure 9a00b21dfd13757bbfb8d89b30660a89ec1f8f3a79402b8f9f9b6fc475c3303a x F contrib/sqlitecon.tcl 210a913ad63f9f991070821e599d600bd913e0ad @@ -702,7 +702,7 @@ F ext/wasm/tests/opfs/concurrency/test.js d08889a5bb6e61937d0b8cbb78c9efbefbf65a F ext/wasm/tests/opfs/concurrency/worker.js 0a8c1a3e6ebb38aabbee24f122693f1fb29d599948915c76906681bb7da1d3d2 F ext/wasm/wasmfs.make 68999f5bd8c489239592d59a420f8c627c99169bbd6fa16a404751f757b9f702 F magic.txt 5ade0bc977aa135e79e3faaea894d5671b26107cc91e70783aa7dc83f22f3ba0 -F main.mk 8cfe182232ac7bbc87530792db6f31c09f2a2f35e9887d0412978746efe42ea9 +F main.mk 70e140c6825aef1ac94c879db7db188be461db15d40e4d9cd9b3e444c2868e21 F mptest/config01.test 3c6adcbc50b991866855f1977ff172eb6d901271 F mptest/config02.test 4415dfe36c48785f751e16e32c20b077c28ae504 F mptest/crash01.test 61e61469e257df0850df4293d7d4d6c2af301421 @@ -2209,8 +2209,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P 46f51e2a3707614a2b3ca6261bc6e0e8835477fdb7cbcf2f06b20cdebde2bab9 -R 2ea5c3310ea580989e316d82762bea3d -U drh -Z 9a2383046899765f80ff4490e5ed6b3d +P 284538d8486ef3e9bee1ab980043b53c144743c31b984be13a5cc137e7cbec31 +R a5275e98c179fe183ddd026b19c342d8 +U stephan +Z 6ccb26b8380cae53c605eba31ac4066e # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 7872bfc017..43c7b78aae 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -284538d8486ef3e9bee1ab980043b53c144743c31b984be13a5cc137e7cbec31 +668bcf327a82a63d45be8cf38fdddc855dbcefdedf6c208e091eb7e2d244929d From 7fd936e5ed08c3bae9207c092a22a5c98520a3cb Mon Sep 17 00:00:00 2001 From: drh <> Date: Fri, 7 Feb 2025 15:49:21 +0000 Subject: [PATCH 058/194] Further reduction in the amount of memset() needed to initialize the Parse object. FossilOrigin-Name: 45e462c0060e51c3375a226d636148e3415ee6020e544ecc84861c7aef4ecf7b --- manifest | 24 ++++++++++++------------ manifest.uuid | 2 +- src/analyze.c | 3 ++- src/build.c | 45 ++++++++++++++++++++++++++++----------------- src/parse.y | 23 +++++++++++++++++++---- src/sqliteInt.h | 20 +++++++++++++------- src/trigger.c | 6 ++++-- src/vtab.c | 5 +++-- 8 files changed, 82 insertions(+), 46 deletions(-) diff --git a/manifest b/manifest index 09675a6203..aa76df4c1f 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Mac-specific\sbuild\sfixes\sdiscussed\sin\s[forum:9dfd5b8fd525a5d7|forum\sthread\s9dfd5b8fd525a5d7]:\srename\sdylib\slinks\sand\sadd\slegacy-compatibility\sversioning\sstamps\sto\slibsqlite3.dylib. -D 2025-02-07T14:44:31.113 +C Further\sreduction\sin\sthe\samount\sof\smemset()\sneeded\sto\sinitialize\sthe\sParse\nobject. +D 2025-02-07T15:49:21.109 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d @@ -713,7 +713,7 @@ F sqlite.pc.in 42b7bf0d02e08b9e77734a47798d1a55a9e0716b F sqlite3.1 acdff36db796e2d00225b911d3047d580cd136547298435426ce9d40347973cc F sqlite3.pc.in 0977c03a4da7c4204bd60e784a0efb8d51a190448aba78a4e973fe7192bdaf03 F src/alter.c aa93e37e4a36a0525bbb2a2aeda20d2018f0aa995542c7dc658e031375e3f532 -F src/analyze.c 9a8b67239d899ac12289db5db3f5bfe7f7a0ad1277f80f87ead1d048085876eb +F src/analyze.c 0823d2edb3ce564157e9d62714cc729027933209b712e95fbabb23e47fff0aec F src/attach.c 3a5cb9ee4aad6c5b22268287340a4f2f7b07959b7a522201be30fee23cd802e9 F src/auth.c 54ab9c6c5803b47c0d45b76ce27eff22a03b4b1f767c5945a3a4eb13aa4c78dc F src/backup.c 5c97e8023aab1ce14a42387eb3ae00ba5a0644569e3476f38661fa6f824c3523 @@ -722,7 +722,7 @@ F src/btmutex.c 79a43670447eacc651519a429f6ece9fd638563cf95b469d6891185ddae2b522 F src/btree.c 63ca6b647342e8cef643863cd0962a542f133e1069460725ba4461dcda92b03c F src/btree.h 18e5e7b2124c23426a283523e5f31a4bff029131b795bb82391f9d2f3136fc50 F src/btreeInt.h 98aadb6dcb77b012cab2574d6a728fad56b337fc946839b9898c4b4c969e30b6 -F src/build.c 357f98cdd9fe93f86e93ad3324fd224492480e48506c0c7db8ae3a94f3b5c5ee +F src/build.c cac3aa87f3bf137e12c77194150fb05c949d36a12177fd3acccdaa3669ca9744 F src/callback.c acae8c8dddda41ee85cfdf19b926eefe830f371069f8aadca3aa39adf5b1c859 F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e F src/ctime.c d35723024b963edce9c0fad5b3303e8bb9266083784844baed10a6dedfe26f3b @@ -769,7 +769,7 @@ F src/os_win.c 49c7725b500f5867e8360e75eeb30f9d70b62fa1f05c8a101da627210578df32 F src/os_win.h 7b073010f1451abe501be30d12f6bc599824944a F src/pager.c 3a1c4e7f69af482e33c8cba8a75afe0dda0ea6391240adac22b040ce1bdeef44 F src/pager.h 6137149346e6c8a3ddc1eeb40aee46381e9bc8b0fcc6dda8a1efde993c2275b8 -F src/parse.y 5dce477d23c6cd41da97ff9bc4ef93fba0e0a0aaa72a15ddb8a3f71618d76cac +F src/parse.y f84673f1454e2bcf517623d4346e67fb2d73e57826ea103681ad5848238f6029 F src/pcache.c 588cc3c5ccaaadde689ed35ce5c5c891a1f7b1f4d1f56f6cf0143b74d8ee6484 F src/pcache.h 1497ce1b823cf00094bb0cf3bac37b345937e6f910890c626b16512316d3abf5 F src/pcache1.c 49516ad7718a3626f28f710fa7448ef1fce3c07fd169acbb4817341950264319 @@ -785,7 +785,7 @@ F src/shell.c.in b377a59822f207106424f08aead37e78b609222e98f86f04cc8a03563ccf323 F src/sqlite.h.in d2902f13ace94d3d3609646bd6d12a2d7a4f6cbdf6a5a4097580ac305f54c3f0 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8 F src/sqlite3ext.h 3f046c04ea3595d6bfda99b781926b17e672fd6d27da2ba6d8d8fc39981dcb54 -F src/sqliteInt.h d85806d6d66210ddf8b14158c6301608ca6abfa952b5a8e57c9852926a4c9728 +F src/sqliteInt.h 51f674754f9424d8ec67c3955d1d161d8b31f30d54dd7032408e08ddc9199236 F src/sqliteLimit.h 1bbdbf72bd0411d003267ffebc59a262f061df5653027a75627d03f48ca30523 F src/status.c cb11f8589a6912af2da3bb1ec509a94dd8ef27df4d4c1a97e0bcf2309ece972b F src/table.c 0f141b58a16de7e2fbe81c308379e7279f4c6b50eb08efeec5892794a0ba30d1 @@ -843,7 +843,7 @@ F src/test_wsd.c 41cadfd9d97fe8e3e4e44f61a4a8ccd6f7ca8fe9 F src/threads.c 4ae07fa022a3dc7c5beb373cf744a85d3c5c6c3c F src/tokenize.c 375a772e2342274f4bf73605a70633237da09deed00a9bf4c4816a56777ea7c9 F src/treeview.c d85ce76e6d1498d781957c07cb234da6d77ce0ed2d196480d516f54dabc62279 -F src/trigger.c 9f887ae4d3077d9de67d312e1da12f57e8b3a598468876bb3b8ccc6c1bca2eb1 +F src/trigger.c da3c25786870d8bf97cd46b493374c2375d1abaf20a9b0f5f8629a3f2f2ce383 F src/update.c 0e01aa6a3edf9ec112b33eb714b9016a81241497b1fb7c3e74332f4f71756508 F src/upsert.c 215328c3f91623c520ec8672c44323553f12caeb4f01b1090ebdca99fdf7b4f1 F src/utf.c 8b29d9a5956569ea2700f869669b8ef67a9662ee5e724ff77ab3c387e27094ba @@ -859,7 +859,7 @@ F src/vdbemem.c 977438546df236c6a3e7d8b4fe86c0643c13b89b00235db1f11c3a91a4796d30 F src/vdbesort.c d0a3c7056c081703c8b6d91ad60f17da5e062a5c64bf568ed0fa1b5f4cae311f F src/vdbetrace.c fe0bc29ebd4e02c8bc5c1945f1d2e6be5927ec12c06d89b03ef2a4def34bf823 F src/vdbevtab.c fc46b9cbd759dc013f0b3724549cc0d71379183c667df3a5988f7e2f1bd485f3 -F src/vtab.c bd4ab699ac4d1ee6da7339d3fbbb5edf23d9737c1fd322ccd75984329d070472 +F src/vtab.c 828221bdbeaaa6d62126ee6d07fd4ec0d09dcaea846f87ad01944d8b7e548859 F src/vxworks.h d2988f4e5a61a4dfe82c6524dd3d6e4f2ce3cdb9 F src/wal.c 4e6181d8780ab0af2e1388d0754cbe6f2f04593d2b1ab6c41699a89942fd8997 F src/wal.h ba252daaa94f889f4b2c17c027e823d9be47ce39da1d3799886bbd51f0490452 @@ -2209,8 +2209,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P 284538d8486ef3e9bee1ab980043b53c144743c31b984be13a5cc137e7cbec31 -R a5275e98c179fe183ddd026b19c342d8 -U stephan -Z 6ccb26b8380cae53c605eba31ac4066e +P 668bcf327a82a63d45be8cf38fdddc855dbcefdedf6c208e091eb7e2d244929d +R 24656f83648801915afdc285804c022a +U drh +Z 40d028d63f40c912276ee2b133ee3ab3 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 43c7b78aae..8fe517c65e 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -668bcf327a82a63d45be8cf38fdddc855dbcefdedf6c208e091eb7e2d244929d +45e462c0060e51c3375a226d636148e3415ee6020e544ecc84861c7aef4ecf7b diff --git a/src/analyze.c b/src/analyze.c index 9213c202b7..799d43924c 100644 --- a/src/analyze.c +++ b/src/analyze.c @@ -215,7 +215,8 @@ static void openStatTable( sqlite3NestedParse(pParse, "CREATE TABLE %Q.%s(%s)", pDb->zDbSName, zTab, aTable[i].zCols ); - aRoot[i] = (u32)pParse->regRoot; + assert( pParse->isCreate || pParse->nErr ); + aRoot[i] = (u32)pParse->u1.cr.regRoot; aCreateTbl[i] = OPFLAG_P2ISREG; } }else{ diff --git a/src/build.c b/src/build.c index cc29610e0a..986107f48d 100644 --- a/src/build.c +++ b/src/build.c @@ -168,10 +168,12 @@ void sqlite3FinishCoding(Parse *pParse){ || sqlite3VdbeAssertMayAbort(v, pParse->mayAbort)); if( v ){ if( pParse->bReturning ){ - Returning *pReturning = pParse->u1.pReturning; + Returning *pReturning; int addrRewind; int reg; + assert( !pParse->isCreate ); + pReturning = pParse->u1.d.pReturning; if( pReturning->nRetCol ){ sqlite3VdbeAddOp0(v, OP_FkCheck); addrRewind = @@ -247,7 +249,9 @@ void sqlite3FinishCoding(Parse *pParse){ } if( pParse->bReturning ){ - Returning *pRet = pParse->u1.pReturning; + Returning *pRet; + assert( !pParse->isCreate ); + pRet = pParse->u1.d.pReturning; if( pRet->nRetCol ){ sqlite3VdbeAddOp2(v, OP_OpenEphemeral, pRet->iRetCur, pRet->nRetCol); } @@ -1319,8 +1323,9 @@ void sqlite3StartTable( /* If the file format and encoding in the database have not been set, ** set them now. */ - reg1 = pParse->regRowid = ++pParse->nMem; - reg2 = pParse->regRoot = ++pParse->nMem; + assert( pParse->isCreate ); + reg1 = pParse->u1.cr.regRowid = ++pParse->nMem; + reg2 = pParse->u1.cr.regRoot = ++pParse->nMem; reg3 = ++pParse->nMem; sqlite3VdbeAddOp3(v, OP_ReadCookie, iDb, reg3, BTREE_FILE_FORMAT); sqlite3VdbeUsesBtree(v, iDb); @@ -1335,8 +1340,8 @@ void sqlite3StartTable( ** The record created does not contain anything yet. It will be replaced ** by the real entry in code generated at sqlite3EndTable(). ** - ** The rowid for the new entry is left in register pParse->regRowid. - ** The root page number of the new table is left in reg pParse->regRoot. + ** The rowid for the new entry is left in register pParse->u1.cr.regRowid. + ** The root page of the new table is left in reg pParse->u1.cr.regRoot. ** The rowid and root page number values are needed by the code that ** sqlite3EndTable will generate. */ @@ -1347,7 +1352,7 @@ void sqlite3StartTable( #endif { assert( !pParse->bReturning ); - pParse->u1.addrCrTab = + pParse->u1.cr.addrCrTab = sqlite3VdbeAddOp3(v, OP_CreateBtree, iDb, reg2, BTREE_INTKEY); } sqlite3OpenSchemaTable(pParse, iDb); @@ -1425,7 +1430,8 @@ void sqlite3AddReturning(Parse *pParse, ExprList *pList){ sqlite3ExprListDelete(db, pList); return; } - pParse->u1.pReturning = pRet; + assert( !pParse->isCreate ); + pParse->u1.d.pReturning = pRet; pRet->pParse = pParse; pRet->pReturnEL = pList; sqlite3ParserAddCleanup(pParse, sqlite3DeleteReturning, pRet); @@ -1564,7 +1570,8 @@ void sqlite3AddColumn(Parse *pParse, Token sName, Token sType){ } p->nCol++; p->nNVCol++; - pParse->constraintName.n = 0; + assert( pParse->isCreate ); + pParse->u1.cr.constraintName.n = 0; } /* @@ -1888,8 +1895,10 @@ void sqlite3AddCheckConstraint( && !sqlite3BtreeIsReadonly(db->aDb[db->init.iDb].pBt) ){ pTab->pCheck = sqlite3ExprListAppend(pParse, pTab->pCheck, pCheckExpr); - if( pParse->constraintName.n ){ - sqlite3ExprListSetName(pParse, pTab->pCheck, &pParse->constraintName, 1); + assert( pParse->isCreate ); + if( pParse->u1.cr.constraintName.n ){ + sqlite3ExprListSetName(pParse, pTab->pCheck, + &pParse->u1.cr.constraintName, 1); }else{ Token t; for(zStart++; sqlite3Isspace(zStart[0]); zStart++){} @@ -2339,9 +2348,9 @@ static void convertToWithoutRowidTable(Parse *pParse, Table *pTab){ ** into BTREE_BLOBKEY. */ assert( !pParse->bReturning ); - if( pParse->u1.addrCrTab ){ + if( pParse->u1.cr.addrCrTab ){ assert( v ); - sqlite3VdbeChangeP3(v, pParse->u1.addrCrTab, BTREE_BLOBKEY); + sqlite3VdbeChangeP3(v, pParse->u1.cr.addrCrTab, BTREE_BLOBKEY); } /* Locate the PRIMARY KEY index. Or, if this table was originally @@ -2781,7 +2790,7 @@ void sqlite3EndTable( /* If this is a CREATE TABLE xx AS SELECT ..., execute the SELECT ** statement to populate the new table. The root-page number for the - ** new table is in register pParse->regRoot. + ** new table is in register pParse->u1.cr.regRoot. ** ** Once the SELECT has been coded by sqlite3Select(), it is in a ** suitable state to query for the column names and types to be used @@ -2812,7 +2821,8 @@ void sqlite3EndTable( regRec = ++pParse->nMem; regRowid = ++pParse->nMem; sqlite3MayAbort(pParse); - sqlite3VdbeAddOp3(v, OP_OpenWrite, iCsr, pParse->regRoot, iDb); + assert( pParse->isCreate ); + sqlite3VdbeAddOp3(v, OP_OpenWrite, iCsr, pParse->u1.cr.regRoot, iDb); sqlite3VdbeChangeP5(v, OPFLAG_P2ISREG); addrTop = sqlite3VdbeCurrentAddr(v) + 1; sqlite3VdbeAddOp3(v, OP_InitCoroutine, regYield, 0, addrTop); @@ -2857,6 +2867,7 @@ void sqlite3EndTable( ** schema table. We just need to update that slot with all ** the information we've collected. */ + assert( pParse->isCreate ); sqlite3NestedParse(pParse, "UPDATE %Q." LEGACY_SCHEMA_TABLE " SET type='%s', name=%Q, tbl_name=%Q, rootpage=#%d, sql=%Q" @@ -2865,9 +2876,9 @@ void sqlite3EndTable( zType, p->zName, p->zName, - pParse->regRoot, + pParse->u1.cr.regRoot, zStmt, - pParse->regRowid + pParse->u1.cr.regRowid ); sqlite3DbFree(db, zStmt); sqlite3ChangeCookie(pParse, iDb); diff --git a/src/parse.y b/src/parse.y index e9e2c62e61..76c9a8e4ed 100644 --- a/src/parse.y +++ b/src/parse.y @@ -62,6 +62,11 @@ %include { #include "sqliteInt.h" +/* +** Verify that the pParse->isCreate field is set +*/ +#define ASSERT_IS_CREATE assert(pParse->isCreate) + /* ** Disable all error recovery processing in the parser push-down ** automaton. @@ -125,6 +130,10 @@ static void parserSyntaxError(Parse *pParse, Token *p){ static void disableLookaside(Parse *pParse){ sqlite3 *db = pParse->db; pParse->disableLookaside++; +#ifdef SQLITE_DEBUG + pParse->isCreate = 1; +#endif + memset(&pParse->u1.cr, 0, sizeof(pParse->u1.cr)); DisableLookaside; } @@ -197,7 +206,9 @@ cmd ::= create_table create_table_args. create_table ::= createkw temp(T) TABLE ifnotexists(E) nm(Y) dbnm(Z). { sqlite3StartTable(pParse,&Y,&Z,T,0,0,E); } -createkw(A) ::= CREATE(A). {disableLookaside(pParse);} +createkw(A) ::= CREATE(A). { + disableLookaside(pParse); +} %type ifnotexists {int} ifnotexists(A) ::= . {A = 0;} @@ -373,7 +384,7 @@ scantok(A) ::= . { // carglist ::= carglist ccons. carglist ::= . -ccons ::= CONSTRAINT nm(X). {pParse->constraintName = X;} +ccons ::= CONSTRAINT nm(X). {ASSERT_IS_CREATE; pParse->u1.cr.constraintName = X;} ccons ::= DEFAULT scantok(A) term(X). {sqlite3AddDefaultValue(pParse,X,A.z,&A.z[A.n]);} ccons ::= DEFAULT LP(A) expr(X) RP(Z). @@ -448,9 +459,9 @@ conslist_opt(A) ::= . {A.n = 0; A.z = 0;} conslist_opt(A) ::= COMMA(A) conslist. conslist ::= conslist tconscomma tcons. conslist ::= tcons. -tconscomma ::= COMMA. {pParse->constraintName.n = 0;} +tconscomma ::= COMMA. {ASSERT_IS_CREATE; pParse->u1.cr.constraintName.n = 0;} tconscomma ::= . -tcons ::= CONSTRAINT nm(X). {pParse->constraintName = X;} +tcons ::= CONSTRAINT nm(X). {ASSERT_IS_CREATE; pParse->u1.cr.constraintName = X;} tcons ::= PRIMARY KEY LP sortlist(X) autoinc(I) RP onconf(R). {sqlite3AddPrimaryKey(pParse,X,R,I,0);} tcons ::= UNIQUE LP sortlist(X) RP onconf(R). @@ -1659,6 +1670,10 @@ trigger_decl(A) ::= temp(T) TRIGGER ifnotexists(NOERR) nm(B) dbnm(Z) ON fullname(E) foreach_clause when_clause(G). { sqlite3BeginTrigger(pParse, &B, &Z, C, D.a, D.b, E, G, T, NOERR); A = (Z.n==0?B:Z); /*A-overwrites-T*/ +#ifdef SQLITE_DEBUG + assert( pParse->isCreate ); /* Set by createkw reduce action */ + pParse->isCreate = 0; /* But, should not be set for CREATE TRIGGER */ +#endif } %type trigger_time {int} diff --git a/src/sqliteInt.h b/src/sqliteInt.h index bbef593dfa..acc36f07c0 100644 --- a/src/sqliteInt.h +++ b/src/sqliteInt.h @@ -3841,6 +3841,8 @@ struct Parse { #endif #ifdef SQLITE_DEBUG u8 ifNotExists; /* Might be true if IF NOT EXISTS. Assert()s only */ + u8 isCreate; /* CREATE TABLE, INDEX, or VIEW (but not TRIGGER) + ** and ALTER TABLE ADD COLUMN. */ #endif int nRangeReg; /* Size of the temporary register block */ int iRangeReg; /* First register in temporary register block */ @@ -3856,11 +3858,8 @@ struct Parse { ExprList *pConstExpr;/* Constant expressions */ IndexedExpr *pIdxEpr;/* List of expressions used by active indexes */ IndexedExpr *pIdxPartExpr; /* Exprs constrained by index WHERE clauses */ - Token constraintName;/* Name of the constraint currently being parsed */ yDbMask writeMask; /* Start a write transaction on these databases */ yDbMask cookieMask; /* Bitmask of schema verified databases */ - int regRowid; /* Register holding rowid of CREATE TABLE entry */ - int regRoot; /* Register holding root page number for new objects */ int nMaxArg; /* Max args passed to user function by sub-program */ int nSelect; /* Number of SELECT stmts. Counter for Select.selId */ #ifndef SQLITE_OMIT_PROGRESS_CALLBACK @@ -3875,10 +3874,6 @@ struct Parse { Table *pTriggerTab; /* Table triggers are being coded for */ TriggerPrg *pTriggerPrg; /* Linked list of coded triggers */ ParseCleanup *pCleanup; /* List of cleanup operations to run after parse */ - union { - int addrCrTab; /* Address of OP_CreateBtree on CREATE TABLE */ - Returning *pReturning; /* The RETURNING clause */ - } u1; LogEst nQueryLoop; /* Est number of iterations of a query (10*log2(N)) */ u8 eTriggerOp; /* TK_UPDATE, TK_INSERT or TK_DELETE */ u8 bReturning; /* Coding a RETURNING trigger */ @@ -3897,6 +3892,17 @@ struct Parse { Token sNameToken; /* Token with unqualified schema object name */ u32 oldmask; /* Mask of old.* columns referenced */ u32 newmask; /* Mask of new.* columns referenced */ + union { + struct { /* These fields available when isCreate is true */ + int addrCrTab; /* Address of OP_CreateBtree on CREATE TABLE */ + int regRowid; /* Register holding rowid of CREATE TABLE entry */ + int regRoot; /* Register holding root page for new objects */ + Token constraintName; /* Name of the constraint currently being parsed */ + } cr; + struct { /* These fields available to all other statements */ + Returning *pReturning; /* The RETURNING clause */ + } d; + } u1; /************************************************************************ ** Above is constant between recursions. Below is reset before and after diff --git a/src/trigger.c b/src/trigger.c index e7b75d344a..604c3ab42f 100644 --- a/src/trigger.c +++ b/src/trigger.c @@ -70,7 +70,8 @@ Trigger *sqlite3TriggerList(Parse *pParse, Table *pTab){ assert( pParse->db->pVtabCtx==0 ); #endif assert( pParse->bReturning ); - assert( &(pParse->u1.pReturning->retTrig) == pTrig ); + assert( !pParse->isCreate ); + assert( &(pParse->u1.d.pReturning->retTrig) == pTrig ); pTrig->table = pTab->zName; pTrig->pTabSchema = pTab->pSchema; pTrig->pNext = pList; @@ -1047,7 +1048,8 @@ static void codeReturningTrigger( return; } assert( db->pParse==pParse ); - pReturning = pParse->u1.pReturning; + assert( !pParse->isCreate ); + pReturning = pParse->u1.d.pReturning; if( pTrigger != &(pReturning->retTrig) ){ /* This RETURNING trigger is for a different statement */ return; diff --git a/src/vtab.c b/src/vtab.c index 09f0c2d7f1..e40f60873a 100644 --- a/src/vtab.c +++ b/src/vtab.c @@ -479,11 +479,12 @@ void sqlite3VtabFinishParse(Parse *pParse, Token *pEnd){ ** schema table. We just need to update that slot with all ** the information we've collected. ** - ** The VM register number pParse->regRowid holds the rowid of an + ** The VM register number pParse->u1.cr.regRowid holds the rowid of an ** entry in the sqlite_schema table that was created for this vtab ** by sqlite3StartTable(). */ iDb = sqlite3SchemaToIndex(db, pTab->pSchema); + assert( pParse->isCreate ); sqlite3NestedParse(pParse, "UPDATE %Q." LEGACY_SCHEMA_TABLE " " "SET type='table', name=%Q, tbl_name=%Q, rootpage=0, sql=%Q " @@ -492,7 +493,7 @@ void sqlite3VtabFinishParse(Parse *pParse, Token *pEnd){ pTab->zName, pTab->zName, zStmt, - pParse->regRowid + pParse->u1.cr.regRowid ); v = sqlite3GetVdbe(pParse); sqlite3ChangeCookie(pParse, iDb); From 84b0f221f4e92139077d8246cc373e8264224a97 Mon Sep 17 00:00:00 2001 From: drh <> Date: Fri, 7 Feb 2025 19:09:20 +0000 Subject: [PATCH 059/194] Fix comments on the Parse.nMaxArgs field so that they are correct. Add assert()s to ensure they are correct. Other Parse changes to reduce the amount of memset() needed to initialize it. FossilOrigin-Name: c56092507c96723030589ddd9121bc993d615a7acd453305fc3b1dbb9e30554c --- manifest | 20 ++++++++++---------- manifest.uuid | 2 +- src/sqliteInt.h | 20 ++++++++++---------- src/vdbe.c | 2 ++ src/vdbeInt.h | 3 ++- src/vdbeaux.c | 23 +++++++++++++++-------- src/wherecode.c | 3 +++ 7 files changed, 43 insertions(+), 30 deletions(-) diff --git a/manifest b/manifest index aa76df4c1f..23bd8c8395 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Further\sreduction\sin\sthe\samount\sof\smemset()\sneeded\sto\sinitialize\sthe\sParse\nobject. -D 2025-02-07T15:49:21.109 +C Fix\scomments\son\sthe\sParse.nMaxArgs\sfield\sso\sthat\sthey\sare\scorrect.\s\sAdd\nassert()s\sto\sensure\sthey\sare\scorrect.\s\sOther\sParse\schanges\sto\sreduce\sthe\namount\sof\smemset()\sneeded\sto\sinitialize\sit. +D 2025-02-07T19:09:20.404 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d @@ -785,7 +785,7 @@ F src/shell.c.in b377a59822f207106424f08aead37e78b609222e98f86f04cc8a03563ccf323 F src/sqlite.h.in d2902f13ace94d3d3609646bd6d12a2d7a4f6cbdf6a5a4097580ac305f54c3f0 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8 F src/sqlite3ext.h 3f046c04ea3595d6bfda99b781926b17e672fd6d27da2ba6d8d8fc39981dcb54 -F src/sqliteInt.h 51f674754f9424d8ec67c3955d1d161d8b31f30d54dd7032408e08ddc9199236 +F src/sqliteInt.h f576f21641e8667779424003e552e79a3d3c7e824421f954ef73fce44040581c F src/sqliteLimit.h 1bbdbf72bd0411d003267ffebc59a262f061df5653027a75627d03f48ca30523 F src/status.c cb11f8589a6912af2da3bb1ec509a94dd8ef27df4d4c1a97e0bcf2309ece972b F src/table.c 0f141b58a16de7e2fbe81c308379e7279f4c6b50eb08efeec5892794a0ba30d1 @@ -849,11 +849,11 @@ F src/upsert.c 215328c3f91623c520ec8672c44323553f12caeb4f01b1090ebdca99fdf7b4f1 F src/utf.c 8b29d9a5956569ea2700f869669b8ef67a9662ee5e724ff77ab3c387e27094ba F src/util.c e5f6a5eeaa26b69054a43bbd0048cfe3d2851f6961052b35aed8f695df922850 F src/vacuum.c b763b6457bd058d2072ef9364832351fd8d11e8abf70cbb349657360f7d55c40 -F src/vdbe.c b428a751953c0c2ff85e3e152ec16e29d488895cd541c8c20876ff9f3bf6978a +F src/vdbe.c b98d86de7f0e6c02fb14e0e1ae8feab6aa84669d389771a848e23f59eb70dcad F src/vdbe.h 3d26d5c7660c5c7bd33ffb0d8784615072d8b23c81f8110870efe2631136bc89 -F src/vdbeInt.h 895b1ab7536f018d3d70d690f6c0adbd1062b6dddce1c2cad912927856d4033c +F src/vdbeInt.h 7abc3ce9732fd487ee2544b478ac0526dca443d6d470fc34784d3122d378cf3e F src/vdbeapi.c 82fe278a7c71b653235c6f9fb5de0b5de589908dfcb011ba2a782e8becf06f86 -F src/vdbeaux.c 885e16100597507fbbe09d82cbb963bff3fd8a9c1e358dc4f463fc95feb18e8b +F src/vdbeaux.c 541d3d232714455960eab4ed10b34cb48b4bcd565d7539ef31092f5e73648e6b F src/vdbeblob.c 255be187436da38b01f276c02e6a08103489bbe2a7c6c21537b7aecbe0e1f797 F src/vdbemem.c 977438546df236c6a3e7d8b4fe86c0643c13b89b00235db1f11c3a91a4796d30 F src/vdbesort.c d0a3c7056c081703c8b6d91ad60f17da5e062a5c64bf568ed0fa1b5f4cae311f @@ -866,7 +866,7 @@ F src/wal.h ba252daaa94f889f4b2c17c027e823d9be47ce39da1d3799886bbd51f0490452 F src/walker.c d5006d6b005e4ea7302ad390957a8d41ed83faa177e412f89bc5600a7462a014 F src/where.c 09dc313e7223ca1217c39c7026b00f16ff449a8323511a762fcba7863a00f4cd F src/whereInt.h d20cddddb1d61b18d5cb1fcfa9b77fbeebbc4afe44d996e603452a23b3009ee1 -F src/wherecode.c 0c3d3199a2b769a5e2bb70feb5003dc85b3d86842ecaf903a47f2b4205ca5dab +F src/wherecode.c 5baa06f0daae7d38aca1d4814030b82ad4f127fe6bad18f0644776a474f6088b F src/whereexpr.c 2415c8eee5ff89a8b709d7d83d71c1ff986cd720d0520057e1d8a5371339012a F src/window.c 2bf01f9941a64fbcead61a0e3cb5db3fca5094b30d2ff0d23274c2a81d2e2385 F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2 @@ -2209,8 +2209,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P 668bcf327a82a63d45be8cf38fdddc855dbcefdedf6c208e091eb7e2d244929d -R 24656f83648801915afdc285804c022a +P 45e462c0060e51c3375a226d636148e3415ee6020e544ecc84861c7aef4ecf7b +R 07888caf6f9e73972781470e8ad03e81 U drh -Z 40d028d63f40c912276ee2b133ee3ab3 +Z 434b297f89532d0b5b94eab3e74d43a4 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 8fe517c65e..fb16c00a62 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -45e462c0060e51c3375a226d636148e3415ee6020e544ecc84861c7aef4ecf7b +c56092507c96723030589ddd9121bc993d615a7acd453305fc3b1dbb9e30554c diff --git a/src/sqliteInt.h b/src/sqliteInt.h index acc36f07c0..359ed1b6b1 100644 --- a/src/sqliteInt.h +++ b/src/sqliteInt.h @@ -3823,19 +3823,20 @@ struct Parse { char *zErrMsg; /* An error message */ Vdbe *pVdbe; /* An engine for executing database bytecode */ int rc; /* Return code from execution */ - u8 colNamesSet; /* TRUE after OP_ColumnName has been issued to pVdbe */ - u8 checkSchema; /* Causes schema cookie check after an error */ + LogEst nQueryLoop; /* Est number of iterations of a query (10*log2(N)) */ u8 nested; /* Number of nested calls to the parser/code generator */ u8 nTempReg; /* Number of temporary registers in aTempReg[] */ u8 isMultiWrite; /* True if statement may modify/insert multiple rows */ u8 mayAbort; /* True if statement may throw an ABORT exception */ u8 hasCompound; /* Need to invoke convertCompoundSelectToSubquery() */ - u8 okConstFactor; /* OK to factor out constants */ u8 disableLookaside; /* Number of times lookaside has been disabled */ u8 prepFlags; /* SQLITE_PREPARE_* flags */ u8 withinRJSubrtn; /* Nesting level for RIGHT JOIN body subroutines */ - u8 bHasWith; /* True if statement contains WITH */ u8 mSubrtnSig; /* mini Bloom filter on available SubrtnSig.selId */ + u8 eTriggerOp; /* TK_UPDATE, TK_INSERT or TK_DELETE */ + u8 bReturning; /* Coding a RETURNING trigger */ + u8 eOrconf; /* Default ON CONFLICT policy for trigger steps */ + u8 disableTriggers; /* True to disable triggers */ #if defined(SQLITE_DEBUG) || defined(SQLITE_COVERAGE_TEST) u8 earlyCleanup; /* OOM inside sqlite3ParserAddCleanup() */ #endif @@ -3844,6 +3845,10 @@ struct Parse { u8 isCreate; /* CREATE TABLE, INDEX, or VIEW (but not TRIGGER) ** and ALTER TABLE ADD COLUMN. */ #endif + u8 colNamesSet :1; /* TRUE after OP_ColumnName has been issued to pVdbe */ + u8 bHasWith :1; /* True if statement contains WITH */ + u8 okConstFactor :1; /* OK to factor out constants */ + u8 checkSchema :1; /* Causes schema cookie check after an error */ int nRangeReg; /* Size of the temporary register block */ int iRangeReg; /* First register in temporary register block */ int nErr; /* Number of errors seen */ @@ -3860,7 +3865,7 @@ struct Parse { IndexedExpr *pIdxPartExpr; /* Exprs constrained by index WHERE clauses */ yDbMask writeMask; /* Start a write transaction on these databases */ yDbMask cookieMask; /* Bitmask of schema verified databases */ - int nMaxArg; /* Max args passed to user function by sub-program */ + int nMaxArg; /* Max args to xUpdate and xFilter vtab methods */ int nSelect; /* Number of SELECT stmts. Counter for Select.selId */ #ifndef SQLITE_OMIT_PROGRESS_CALLBACK u32 nProgressSteps; /* xProgress steps taken during sqlite3_prepare() */ @@ -3874,11 +3879,6 @@ struct Parse { Table *pTriggerTab; /* Table triggers are being coded for */ TriggerPrg *pTriggerPrg; /* Linked list of coded triggers */ ParseCleanup *pCleanup; /* List of cleanup operations to run after parse */ - LogEst nQueryLoop; /* Est number of iterations of a query (10*log2(N)) */ - u8 eTriggerOp; /* TK_UPDATE, TK_INSERT or TK_DELETE */ - u8 bReturning; /* Coding a RETURNING trigger */ - u8 eOrconf; /* Default ON CONFLICT policy for trigger steps */ - u8 disableTriggers; /* True to disable triggers */ /************************************************************************** ** Fields above must be initialized to zero. The fields that follow, diff --git a/src/vdbe.c b/src/vdbe.c index d41ac8d517..ec871c5a6e 100644 --- a/src/vdbe.c +++ b/src/vdbe.c @@ -8363,6 +8363,7 @@ case OP_VFilter: { /* jump, ncycle */ /* Invoke the xFilter method */ apArg = p->apArg; + assert( nArg<=p->napArg ); for(i = 0; ivtabOnConflict; apArg = p->apArg; pX = &aMem[pOp->p3]; + assert( nArg<=p->napArg ); for(i=0; ipParse; int *aLabel = pParse->aLabel; @@ -916,15 +916,19 @@ static void resolveP2Values(Vdbe *p, int *pMaxFuncArgs){ } #ifndef SQLITE_OMIT_VIRTUALTABLE case OP_VUpdate: { - if( pOp->p2>nMaxArgs ) nMaxArgs = pOp->p2; + if( pOp->p2>nMaxVtabArgs ) nMaxVtabArgs = pOp->p2; break; } case OP_VFilter: { int n; + /* The instruction immediately prior to VFilter will be an + ** OP_Integer that sets the "argc" value for the VFilter. See + ** the code where OP_VFilter is generated at tag-20250207a. */ assert( (pOp - p->aOp) >= 3 ); assert( pOp[-1].opcode==OP_Integer ); + assert( pOp[-1].p2==pOp->p3+1 ); n = pOp[-1].p1; - if( n>nMaxArgs ) nMaxArgs = n; + if( n>nMaxVtabArgs ) nMaxVtabArgs = n; /* Fall through into the default case */ /* no break */ deliberate_fall_through } @@ -965,7 +969,7 @@ resolve_p2_values_loop_exit: pParse->aLabel = 0; } pParse->nLabel = 0; - *pMaxFuncArgs = nMaxArgs; + *pMaxVtabArgs = nMaxVtabArgs; assert( p->bIsReader!=0 || DbMaskAllZero(p->btreeMask) ); } @@ -2643,7 +2647,7 @@ void sqlite3VdbeMakeReady( int nVar; /* Number of parameters */ int nMem; /* Number of VM memory registers */ int nCursor; /* Number of cursors required */ - int nArg; /* Number of arguments in subprograms */ + int nArg; /* Max number args to xFilter or xUpdate */ int n; /* Loop counter */ struct ReusableSpace x; /* Reusable bulk memory */ @@ -2715,6 +2719,9 @@ void sqlite3VdbeMakeReady( p->apCsr = allocSpace(&x, p->apCsr, nCursor*sizeof(VdbeCursor*)); } } +#ifdef SQLITE_DEBUG + p->napArg = nArg; +#endif if( db->mallocFailed ){ p->nVar = 0; diff --git a/src/wherecode.c b/src/wherecode.c index 045653aac8..1a0cdc6d71 100644 --- a/src/wherecode.c +++ b/src/wherecode.c @@ -1608,6 +1608,9 @@ Bitmask sqlite3WhereCodeOneLoopStart( } sqlite3VdbeAddOp2(v, OP_Integer, pLoop->u.vtab.idxNum, iReg); sqlite3VdbeAddOp2(v, OP_Integer, nConstraint, iReg+1); + /* The instruction immediately prior to OP_VFilter must be an OP_Integer + ** that sets the "argc" value for xVFilter. This is necessary for + ** resolveP2() to work correctly. See tag-20250207a. */ sqlite3VdbeAddOp4(v, OP_VFilter, iCur, addrNotFound, iReg, pLoop->u.vtab.idxStr, pLoop->u.vtab.needFree ? P4_DYNAMIC : P4_STATIC); From 7df570421c5522fff619ac526d27f8d16a4ad247 Mon Sep 17 00:00:00 2001 From: stephan Date: Fri, 7 Feb 2025 19:18:20 +0000 Subject: [PATCH 060/194] build: work around a report of (install -d DIR) failing in one environment if DIR already exists. FossilOrigin-Name: 8f7b7840d48c391d43ac034ebfee9227dc1c2800adda24f02f3d3bb942f4380e --- autoconf/Makefile.in | 3 ++- main.mk | 3 ++- manifest | 17 +++++++++-------- manifest.uuid | 2 +- 4 files changed, 14 insertions(+), 11 deletions(-) diff --git a/autoconf/Makefile.in b/autoconf/Makefile.in index 0270b9a1db..b41c03e76c 100644 --- a/autoconf/Makefile.in +++ b/autoconf/Makefile.in @@ -86,7 +86,8 @@ install-dir.all = $(install-dir.bin) $(install-dir.include) \ $(install-dir.lib) $(install-dir.man1) \ $(install-dir.pkgconfig) $(install-dir.all): - $(INSTALL) -d "$@" + if [ ! -d "$@" ]; then $(INSTALL) -d "$@"; fi +# ^^^^ on some platforms, install -d fails if the target already exists. # diff --git a/main.mk b/main.mk index 38d1ba5f56..27b8848879 100644 --- a/main.mk +++ b/main.mk @@ -435,7 +435,8 @@ install-dir.all = $(install-dir.bin) $(install-dir.include) \ $(install-dir.lib) $(install-dir.man1) \ $(install-dir.pkgconfig) $(install-dir.all): - $(INSTALL) -d "$@" + if [ ! -d "$@" ]; then $(INSTALL) -d "$@"; fi +# ^^^^ on some platforms, install -d fails if the target already exists. # # After jimsh is compiled, we run some sanity checks to ensure that diff --git a/manifest b/manifest index 23bd8c8395..7e646eaf0b 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Fix\scomments\son\sthe\sParse.nMaxArgs\sfield\sso\sthat\sthey\sare\scorrect.\s\sAdd\nassert()s\sto\sensure\sthey\sare\scorrect.\s\sOther\sParse\schanges\sto\sreduce\sthe\namount\sof\smemset()\sneeded\sto\sinitialize\sit. -D 2025-02-07T19:09:20.404 +C build:\swork\saround\sa\sreport\sof\s(install\s-d\sDIR)\sfailing\sin\sone\senvironment\sif\sDIR\salready\sexists. +D 2025-02-07T19:18:20.610 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d @@ -16,7 +16,7 @@ F art/sqlite370.jpg d512473dae7e378a67e28ff96a34da7cb331def2 F art/sqlite370.svg 40b7e2fe8aac3add5d56dd86ab8d427a4eca5bcb3fe4f8946cb3794e1821d531 F auto.def fdd6965e06bce02a8b9f9ed57a52d05bcbec4b56e4bef2174866bb5713c65fda F autoconf/Makefile.fallback 22fe523eb36dfce31e0f6349f782eb084e86a5620b2b0b4f84a2d6133f53f5ac -F autoconf/Makefile.in be23c54eef87e6a64d875f96f6cf60a871219c50b04a955ebbd1aac48b4c738e +F autoconf/Makefile.in ee765abbb5de7281932f8ea14123cd5a854a05cab692f39626af89a371bee81f F autoconf/Makefile.msc 0a071367537dc395285a5d624ac4f99f3a387b27cc5e89752423c0499e15aec4 F autoconf/README.first f1d3876e9a7852c22f275a6f06814e64934cecbc0b5b9617d64849094c1fd136 F autoconf/README.txt 7f01dc3915e2d68f329011073662369e62a0938a2c69398807823c57591cb288 @@ -702,7 +702,7 @@ F ext/wasm/tests/opfs/concurrency/test.js d08889a5bb6e61937d0b8cbb78c9efbefbf65a F ext/wasm/tests/opfs/concurrency/worker.js 0a8c1a3e6ebb38aabbee24f122693f1fb29d599948915c76906681bb7da1d3d2 F ext/wasm/wasmfs.make 68999f5bd8c489239592d59a420f8c627c99169bbd6fa16a404751f757b9f702 F magic.txt 5ade0bc977aa135e79e3faaea894d5671b26107cc91e70783aa7dc83f22f3ba0 -F main.mk 70e140c6825aef1ac94c879db7db188be461db15d40e4d9cd9b3e444c2868e21 +F main.mk 0e3695222412c9388d8e7db612249cd0cd02722c62a16c48be7c77a7639628a8 F mptest/config01.test 3c6adcbc50b991866855f1977ff172eb6d901271 F mptest/config02.test 4415dfe36c48785f751e16e32c20b077c28ae504 F mptest/crash01.test 61e61469e257df0850df4293d7d4d6c2af301421 @@ -2209,8 +2209,9 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P 45e462c0060e51c3375a226d636148e3415ee6020e544ecc84861c7aef4ecf7b -R 07888caf6f9e73972781470e8ad03e81 -U drh -Z 434b297f89532d0b5b94eab3e74d43a4 +P c56092507c96723030589ddd9121bc993d615a7acd453305fc3b1dbb9e30554c +Q +4bc6fe30c967e4f15e2c154a1af5434bfecd89cab0e4d040a5bf68c8ce47a546 +R 7551ae18ae903d03005b95f880daf40a +U stephan +Z 025070a553bc5509ae846762654dc19b # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index fb16c00a62..5455a6525b 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -c56092507c96723030589ddd9121bc993d615a7acd453305fc3b1dbb9e30554c +8f7b7840d48c391d43ac034ebfee9227dc1c2800adda24f02f3d3bb942f4380e From f62d053b49c287544c9b807cf9a067b7dca252fa Mon Sep 17 00:00:00 2001 From: drh <> Date: Sat, 8 Feb 2025 11:15:41 +0000 Subject: [PATCH 061/194] Improvements to the hash table used to store symbols in the schema, so that it works better (requires fewer calls to sqlite3StrICmp()) for large schemas, and uses less code space. FossilOrigin-Name: 0318b68c845c84eded757c67f820e1783551574ac9e5670be640c4bfe22a934b --- manifest | 17 ++++++++++------- manifest.uuid | 2 +- src/hash.c | 43 +++++++++++++++++++++++-------------------- src/hash.h | 1 + 4 files changed, 35 insertions(+), 28 deletions(-) diff --git a/manifest b/manifest index 23bd8c8395..dedc3aa948 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Fix\scomments\son\sthe\sParse.nMaxArgs\sfield\sso\sthat\sthey\sare\scorrect.\s\sAdd\nassert()s\sto\sensure\sthey\sare\scorrect.\s\sOther\sParse\schanges\sto\sreduce\sthe\namount\sof\smemset()\sneeded\sto\sinitialize\sit. -D 2025-02-07T19:09:20.404 +C Improvements\sto\sthe\shash\stable\sused\sto\sstore\ssymbols\sin\sthe\sschema,\sso\sthat\nit\sworks\sbetter\s(requires\sfewer\scalls\sto\ssqlite3StrICmp())\sfor\slarge\sschemas,\nand\suses\sless\scode\sspace. +D 2025-02-08T11:15:41.775 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d @@ -735,8 +735,8 @@ F src/fault.c 460f3e55994363812d9d60844b2a6de88826e007 F src/fkey.c 928ed2517e8732113d2b9821aa37af639688d752f4ea9ac6e0e393d713eeb76f F src/func.c 0712a5b03fdfc8af0cda6d076bfe231b66388d3d5a28b46dc1a94b90d41cac6a F src/global.c a19e4b1ca1335f560e9560e590fc13081e21f670643367f99cb9e8f9dc7d615b -F src/hash.c 9ee4269fb1d6632a6fecfb9479c93a1f29271bddbbaf215dd60420bcb80c7220 -F src/hash.h 3340ab6e1d13e725571d7cee6d3e3135f0779a7d8e76a9ce0a85971fa3953c51 +F src/hash.c ab8e8cf8733ccef6fd00831fff56a0fbdfa886505c08778338b8d0dc2f9d003d +F src/hash.h 46b92795a95bfefb210f52f0c316e9d7cdbcdd7e7fcfb0d8be796d3a5767cddf F src/hwtime.h f9c2dfb84dce7acf95ce6d289e46f5f9d3d1afd328e53da8f8e9008e3b3caae6 F src/in-operator.md 10cd8f4bcd225a32518407c2fb2484089112fd71 F src/insert.c ccadada52dc508ab8229e343425ab2504db57cfcdf8271f0f9ce1c2c6cad97c1 @@ -2209,8 +2209,11 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P 45e462c0060e51c3375a226d636148e3415ee6020e544ecc84861c7aef4ecf7b -R 07888caf6f9e73972781470e8ad03e81 +P c56092507c96723030589ddd9121bc993d615a7acd453305fc3b1dbb9e30554c +R 51c0e52e763f3a11eebcce49c33f5a3b +T *branch * hash-improvements +T *sym-hash-improvements * +T -sym-trunk * U drh -Z 434b297f89532d0b5b94eab3e74d43a4 +Z 9b37fd3883a56be3a46fd4cef0eab379 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index fb16c00a62..764f1c6d8a 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -c56092507c96723030589ddd9121bc993d615a7acd453305fc3b1dbb9e30554c +0318b68c845c84eded757c67f820e1783551574ac9e5670be640c4bfe22a934b diff --git a/src/hash.c b/src/hash.c index 8ec043f119..c822cb5f1f 100644 --- a/src/hash.c +++ b/src/hash.c @@ -55,11 +55,19 @@ void sqlite3HashClear(Hash *pH){ static unsigned int strHash(const char *z){ unsigned int h = 0; unsigned char c; - while( (c = (unsigned char)*z++)!=0 ){ /*OPTIMIZATION-IF-TRUE*/ + while( z[0] ){ /*OPTIMIZATION-IF-TRUE*/ /* Knuth multiplicative hashing. (Sorting & Searching, p. 510). ** 0x9e3779b1 is 2654435761 which is the closest prime number to - ** (2**32)*golden_ratio, where golden_ratio = (sqrt(5) - 1)/2. */ - h += sqlite3UpperToLower[c]; + ** (2**32)*golden_ratio, where golden_ratio = (sqrt(5) - 1)/2. + ** + ** Only bits 0xdf for ASCII and bits 0xbf for EBCDIC each octet are + ** hashed since the omitted bits determine the upper/lower case difference. + */ +#ifdef SQLITE_EBCDIC + h += 0xbf & (unsigned char)*(z++); +#else + h += 0xdf & (unsigned char)*(z++); +#endif h *= 0x9e3779b1; } return h; @@ -132,9 +140,8 @@ static int rehash(Hash *pH, unsigned int new_size){ pH->htsize = new_size = sqlite3MallocSize(new_ht)/sizeof(struct _ht); memset(new_ht, 0, new_size*sizeof(struct _ht)); for(elem=pH->first, pH->first=0; elem; elem = next_elem){ - unsigned int h = strHash(elem->pKey) % new_size; next_elem = elem->next; - insertElement(pH, &new_ht[h], elem); + insertElement(pH, &new_ht[elem->h % new_size], elem); } return 1; } @@ -154,21 +161,20 @@ static HashElem *findElementWithHash( unsigned int h; /* The computed hash */ static HashElem nullElement = { 0, 0, 0, 0 }; + h = strHash(pKey); if( pH->ht ){ /*OPTIMIZATION-IF-TRUE*/ struct _ht *pEntry; - h = strHash(pKey) % pH->htsize; - pEntry = &pH->ht[h]; + pEntry = &pH->ht[h % pH->htsize]; elem = pEntry->chain; count = pEntry->count; }else{ - h = 0; elem = pH->first; count = pH->count; } if( pHash ) *pHash = h; while( count ){ assert( elem!=0 ); - if( sqlite3StrICmp(elem->pKey,pKey)==0 ){ + if( h==elem->h && sqlite3StrICmp(elem->pKey,pKey)==0 ){ return elem; } elem = elem->next; @@ -180,10 +186,9 @@ static HashElem *findElementWithHash( /* Remove a single entry from the hash table given a pointer to that ** element and a hash on the element's key. */ -static void removeElementGivenHash( +static void removeElement( Hash *pH, /* The pH containing "elem" */ - HashElem* elem, /* The element to be removed from the pH */ - unsigned int h /* Hash value for the element */ + HashElem *elem /* The element to be removed from the pH */ ){ struct _ht *pEntry; if( elem->prev ){ @@ -195,7 +200,7 @@ static void removeElementGivenHash( elem->next->prev = elem->prev; } if( pH->ht ){ - pEntry = &pH->ht[h]; + pEntry = &pH->ht[elem->h % pH->htsize]; if( pEntry->chain==elem ){ pEntry->chain = elem->next; } @@ -246,7 +251,7 @@ void *sqlite3HashInsert(Hash *pH, const char *pKey, void *data){ if( elem->data ){ void *old_data = elem->data; if( data==0 ){ - removeElementGivenHash(pH,elem,h); + removeElement(pH,elem); }else{ elem->data = data; elem->pKey = pKey; @@ -257,14 +262,12 @@ void *sqlite3HashInsert(Hash *pH, const char *pKey, void *data){ new_elem = (HashElem*)sqlite3Malloc( sizeof(HashElem) ); if( new_elem==0 ) return data; new_elem->pKey = pKey; + new_elem->h = h; new_elem->data = data; pH->count++; - if( pH->count>=10 && pH->count > 2*pH->htsize ){ - if( rehash(pH, pH->count*2) ){ - assert( pH->htsize>0 ); - h = strHash(pKey) % pH->htsize; - } + if( pH->count>=5 && pH->count > 2*pH->htsize ){ + rehash(pH, pH->count*3); } - insertElement(pH, pH->ht ? &pH->ht[h] : 0, new_elem); + insertElement(pH, pH->ht ? &pH->ht[new_elem->h % pH->htsize] : 0, new_elem); return 0; } diff --git a/src/hash.h b/src/hash.h index 3f491e45c0..cff65d6e50 100644 --- a/src/hash.h +++ b/src/hash.h @@ -60,6 +60,7 @@ struct HashElem { HashElem *next, *prev; /* Next and previous elements in the table */ void *data; /* Data associated with this element */ const char *pKey; /* Key associated with this element */ + unsigned int h; /* hash for pKey */ }; /* From 03c65171b8ff533b28927a1e5fb7939b87077de0 Mon Sep 17 00:00:00 2001 From: drh <> Date: Sat, 8 Feb 2025 13:34:19 +0000 Subject: [PATCH 062/194] Fix GCC-isms and compiler warnings introduced by recent check-ins [c56092507c967230] and [6e57848fe1e0e2b5]. FossilOrigin-Name: 91102c04375f83cffcd0f3204870e476636f651710e9e6fb773cf74085ef7636 --- manifest | 17 ++++++++--------- manifest.uuid | 2 +- src/hash.c | 3 +-- src/sqliteInt.h | 13 +++++++++---- src/vdbeInt.h | 4 ---- 5 files changed, 19 insertions(+), 20 deletions(-) diff --git a/manifest b/manifest index dba09df8c1..910bb3ea65 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Improvements\sto\sthe\ssymbol\stable\shash:\sfaster\slookups\swith\sfewer\scalls\sto\nsqlite3StrICmp()\sfor\sschemas\swith\smany\ssymbols\sand\slarge\snames. -D 2025-02-08T12:04:25.764 +C Fix\sGCC-isms\sand\scompiler\swarnings\sintroduced\sby\srecent\scheck-ins\n[c56092507c967230]\sand\s[6e57848fe1e0e2b5]. +D 2025-02-08T13:34:19.496 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d @@ -735,7 +735,7 @@ F src/fault.c 460f3e55994363812d9d60844b2a6de88826e007 F src/fkey.c 928ed2517e8732113d2b9821aa37af639688d752f4ea9ac6e0e393d713eeb76f F src/func.c 0712a5b03fdfc8af0cda6d076bfe231b66388d3d5a28b46dc1a94b90d41cac6a F src/global.c a19e4b1ca1335f560e9560e590fc13081e21f670643367f99cb9e8f9dc7d615b -F src/hash.c ab8e8cf8733ccef6fd00831fff56a0fbdfa886505c08778338b8d0dc2f9d003d +F src/hash.c 73934a7f7ab1cb110614a9388cb516893b0cf5b7b69e4fd1a0780ac4ce166be7 F src/hash.h 46b92795a95bfefb210f52f0c316e9d7cdbcdd7e7fcfb0d8be796d3a5767cddf F src/hwtime.h f9c2dfb84dce7acf95ce6d289e46f5f9d3d1afd328e53da8f8e9008e3b3caae6 F src/in-operator.md 10cd8f4bcd225a32518407c2fb2484089112fd71 @@ -785,7 +785,7 @@ F src/shell.c.in b377a59822f207106424f08aead37e78b609222e98f86f04cc8a03563ccf323 F src/sqlite.h.in d2902f13ace94d3d3609646bd6d12a2d7a4f6cbdf6a5a4097580ac305f54c3f0 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8 F src/sqlite3ext.h 3f046c04ea3595d6bfda99b781926b17e672fd6d27da2ba6d8d8fc39981dcb54 -F src/sqliteInt.h f576f21641e8667779424003e552e79a3d3c7e824421f954ef73fce44040581c +F src/sqliteInt.h 7585b45f585c82f803ab89ccd475819c6dfb9eae0dc2afcae62c9d894137e0e8 F src/sqliteLimit.h 1bbdbf72bd0411d003267ffebc59a262f061df5653027a75627d03f48ca30523 F src/status.c cb11f8589a6912af2da3bb1ec509a94dd8ef27df4d4c1a97e0bcf2309ece972b F src/table.c 0f141b58a16de7e2fbe81c308379e7279f4c6b50eb08efeec5892794a0ba30d1 @@ -851,7 +851,7 @@ F src/util.c e5f6a5eeaa26b69054a43bbd0048cfe3d2851f6961052b35aed8f695df922850 F src/vacuum.c b763b6457bd058d2072ef9364832351fd8d11e8abf70cbb349657360f7d55c40 F src/vdbe.c b98d86de7f0e6c02fb14e0e1ae8feab6aa84669d389771a848e23f59eb70dcad F src/vdbe.h 3d26d5c7660c5c7bd33ffb0d8784615072d8b23c81f8110870efe2631136bc89 -F src/vdbeInt.h 7abc3ce9732fd487ee2544b478ac0526dca443d6d470fc34784d3122d378cf3e +F src/vdbeInt.h 078b1c15b26587b54c1c1879d0d2f4dec812b9de4c337fed9faf73fbcc3bf091 F src/vdbeapi.c 82fe278a7c71b653235c6f9fb5de0b5de589908dfcb011ba2a782e8becf06f86 F src/vdbeaux.c 541d3d232714455960eab4ed10b34cb48b4bcd565d7539ef31092f5e73648e6b F src/vdbeblob.c 255be187436da38b01f276c02e6a08103489bbe2a7c6c21537b7aecbe0e1f797 @@ -2209,9 +2209,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P 8f7b7840d48c391d43ac034ebfee9227dc1c2800adda24f02f3d3bb942f4380e 0318b68c845c84eded757c67f820e1783551574ac9e5670be640c4bfe22a934b -R 50206c8b661a5653165b14de78589549 -T +closed 0318b68c845c84eded757c67f820e1783551574ac9e5670be640c4bfe22a934b +P 6e57848fe1e0e2b533dd65c2bc5fbac660202cf91cb94ac5468a3434e367a087 +R 2c411617d97350770bd64ca35d94ddfa U drh -Z 088e4d406ab0098b87fcdd617d96f661 +Z 8dddf39b318eaf54797fe9748f81eadf # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 9320ac90f4..c4ad2d2b75 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -6e57848fe1e0e2b533dd65c2bc5fbac660202cf91cb94ac5468a3434e367a087 +91102c04375f83cffcd0f3204870e476636f651710e9e6fb773cf74085ef7636 diff --git a/src/hash.c b/src/hash.c index c822cb5f1f..8cc6c09663 100644 --- a/src/hash.c +++ b/src/hash.c @@ -54,7 +54,6 @@ void sqlite3HashClear(Hash *pH){ */ static unsigned int strHash(const char *z){ unsigned int h = 0; - unsigned char c; while( z[0] ){ /*OPTIMIZATION-IF-TRUE*/ /* Knuth multiplicative hashing. (Sorting & Searching, p. 510). ** 0x9e3779b1 is 2654435761 which is the closest prime number to @@ -159,7 +158,7 @@ static HashElem *findElementWithHash( HashElem *elem; /* Used to loop thru the element list */ unsigned int count; /* Number of elements left to test */ unsigned int h; /* The computed hash */ - static HashElem nullElement = { 0, 0, 0, 0 }; + static HashElem nullElement = { 0, 0, 0, 0, 0 }; h = strHash(pKey); if( pH->ht ){ /*OPTIMIZATION-IF-TRUE*/ diff --git a/src/sqliteInt.h b/src/sqliteInt.h index 359ed1b6b1..e46744a129 100644 --- a/src/sqliteInt.h +++ b/src/sqliteInt.h @@ -843,6 +843,11 @@ typedef INT16_TYPE i16; /* 2-byte signed integer */ typedef UINT8_TYPE u8; /* 1-byte unsigned integer */ typedef INT8_TYPE i8; /* 1-byte signed integer */ +/* A bitfield type for use inside of structures. Always follow with :N where +** N is the number of bits. +*/ +typedef unsigned bft; /* Bit Field Type */ + /* ** SQLITE_MAX_U32 is a u64 constant that is the maximum u64 value ** that can be stored in a u32 without loss of data. The value @@ -3845,10 +3850,10 @@ struct Parse { u8 isCreate; /* CREATE TABLE, INDEX, or VIEW (but not TRIGGER) ** and ALTER TABLE ADD COLUMN. */ #endif - u8 colNamesSet :1; /* TRUE after OP_ColumnName has been issued to pVdbe */ - u8 bHasWith :1; /* True if statement contains WITH */ - u8 okConstFactor :1; /* OK to factor out constants */ - u8 checkSchema :1; /* Causes schema cookie check after an error */ + bft colNamesSet :1; /* TRUE after OP_ColumnName has been issued to pVdbe */ + bft bHasWith :1; /* True if statement contains WITH */ + bft okConstFactor :1; /* OK to factor out constants */ + bft checkSchema :1; /* Causes schema cookie check after an error */ int nRangeReg; /* Size of the temporary register block */ int iRangeReg; /* First register in temporary register block */ int nErr; /* Number of errors seen */ diff --git a/src/vdbeInt.h b/src/vdbeInt.h index ecc757dd0d..12af827268 100644 --- a/src/vdbeInt.h +++ b/src/vdbeInt.h @@ -398,10 +398,6 @@ struct sqlite3_context { sqlite3_value *argv[1]; /* Argument set */ }; -/* A bitfield type for use inside of structures. Always follow with :N where -** N is the number of bits. -*/ -typedef unsigned bft; /* Bit Field Type */ /* The ScanStatus object holds a single value for the ** sqlite3_stmt_scanstatus() interface. From 9d90a3af2fa1108ee3c914f9cb5b602bfb04949d Mon Sep 17 00:00:00 2001 From: drh <> Date: Sat, 8 Feb 2025 14:15:42 +0000 Subject: [PATCH 063/194] Use the sqlite3ColumnIndex() routine to look up a column in a table, rather than using a custom loop. Performance improvement, size reduction, and complexity decrease. FossilOrigin-Name: 351dbbc2bf0b23efdc625ddaa5dc2239cf2990addf071a04bd41612b341de8c8 --- manifest | 26 +++++++-------- manifest.uuid | 2 +- src/alter.c | 6 ++-- src/build.c | 27 ++++++--------- src/expr.c | 8 +---- src/insert.c | 36 +++++++++----------- src/main.c | 9 ++--- src/resolve.c | 90 ++++++++++++++++++++++---------------------------- src/update.c | 46 +++++++++++--------------- src/vdbeblob.c | 8 ++--- 10 files changed, 106 insertions(+), 152 deletions(-) diff --git a/manifest b/manifest index 910bb3ea65..adfd9058d8 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Fix\sGCC-isms\sand\scompiler\swarnings\sintroduced\sby\srecent\scheck-ins\n[c56092507c967230]\sand\s[6e57848fe1e0e2b5]. -D 2025-02-08T13:34:19.496 +C Use\sthe\ssqlite3ColumnIndex()\sroutine\sto\slook\sup\sa\scolumn\sin\sa\stable,\srather\nthan\susing\sa\scustom\sloop.\s\sPerformance\simprovement,\ssize\sreduction,\sand\ncomplexity\sdecrease. +D 2025-02-08T14:15:42.707 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d @@ -712,7 +712,7 @@ F mptest/multiwrite01.test dab5c5f8f9534971efce679152c5146da265222d F sqlite.pc.in 42b7bf0d02e08b9e77734a47798d1a55a9e0716b F sqlite3.1 acdff36db796e2d00225b911d3047d580cd136547298435426ce9d40347973cc F sqlite3.pc.in 0977c03a4da7c4204bd60e784a0efb8d51a190448aba78a4e973fe7192bdaf03 -F src/alter.c aa93e37e4a36a0525bbb2a2aeda20d2018f0aa995542c7dc658e031375e3f532 +F src/alter.c 1751e231d8385067fa0d0145f0d461a092db6bd3d7edbfc3172db625aceccd9a F src/analyze.c 0823d2edb3ce564157e9d62714cc729027933209b712e95fbabb23e47fff0aec F src/attach.c 3a5cb9ee4aad6c5b22268287340a4f2f7b07959b7a522201be30fee23cd802e9 F src/auth.c 54ab9c6c5803b47c0d45b76ce27eff22a03b4b1f767c5945a3a4eb13aa4c78dc @@ -722,7 +722,7 @@ F src/btmutex.c 79a43670447eacc651519a429f6ece9fd638563cf95b469d6891185ddae2b522 F src/btree.c 63ca6b647342e8cef643863cd0962a542f133e1069460725ba4461dcda92b03c F src/btree.h 18e5e7b2124c23426a283523e5f31a4bff029131b795bb82391f9d2f3136fc50 F src/btreeInt.h 98aadb6dcb77b012cab2574d6a728fad56b337fc946839b9898c4b4c969e30b6 -F src/build.c cac3aa87f3bf137e12c77194150fb05c949d36a12177fd3acccdaa3669ca9744 +F src/build.c 48796a45299dbdf6331bc1bf2eb5319330980f469c1eaaed17d487a381cea488 F src/callback.c acae8c8dddda41ee85cfdf19b926eefe830f371069f8aadca3aa39adf5b1c859 F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e F src/ctime.c d35723024b963edce9c0fad5b3303e8bb9266083784844baed10a6dedfe26f3b @@ -730,7 +730,7 @@ F src/date.c 842c08ac143a56a627b05ac51d68624f2b7b03e3b4cba596205e735eed64ee57 F src/dbpage.c 2e677acb658a29965e55398bbc61161cb7819da538057c8032adac7ab8e4a8c0 F src/dbstat.c 73362c0df0f40ad5523a6f5501224959d0976757b511299bf892313e79d14f5c F src/delete.c 03a77ba20e54f0f42ebd8eddf15411ed6bdb06a2c472ac4b6b336521bf7cea42 -F src/expr.c 8705be31ee713aaa43c97d91399db09f16ee41b88250406eb99de6b47f550a98 +F src/expr.c 15fabfb67261e298a39fe61457f3cfa24148d9ca8d02f4dff385feb5cf523ea7 F src/fault.c 460f3e55994363812d9d60844b2a6de88826e007 F src/fkey.c 928ed2517e8732113d2b9821aa37af639688d752f4ea9ac6e0e393d713eeb76f F src/func.c 0712a5b03fdfc8af0cda6d076bfe231b66388d3d5a28b46dc1a94b90d41cac6a @@ -739,11 +739,11 @@ F src/hash.c 73934a7f7ab1cb110614a9388cb516893b0cf5b7b69e4fd1a0780ac4ce166be7 F src/hash.h 46b92795a95bfefb210f52f0c316e9d7cdbcdd7e7fcfb0d8be796d3a5767cddf F src/hwtime.h f9c2dfb84dce7acf95ce6d289e46f5f9d3d1afd328e53da8f8e9008e3b3caae6 F src/in-operator.md 10cd8f4bcd225a32518407c2fb2484089112fd71 -F src/insert.c ccadada52dc508ab8229e343425ab2504db57cfcdf8271f0f9ce1c2c6cad97c1 +F src/insert.c 05e04ef637cbc0dccb9a5c5d188a5a2608891e554c8ec17c7a71afe2cf896a06 F src/json.c 68a98c020c22127f2d65f08855f7fc7460ff352a6ce0b543d8931dde83319c22 F src/legacy.c d7874bc885906868cd51e6c2156698f2754f02d9eee1bae2d687323c3ca8e5aa F src/loadext.c 7432c944ff197046d67a1207790a1b13eec4548c85a9457eb0896bb3641dfb36 -F src/main.c 59bdd8d9bbdb3a746eaef14d611ddd5638aa18acef7c5e3271e815dbd215a1af +F src/main.c b99d15d843f7a86adbec855de77b1656dde07359722ef63a9d9393678dbb58d1 F src/malloc.c 410e570b30c26cc36e3372577df50f7a96ee3eed5b2b161c6b6b48773c650c5e F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645 F src/mem1.c 3bb59158c38e05f6270e761a9f435bf19827a264c13d1631c58b84bdc96d73b2 @@ -778,7 +778,7 @@ F src/pragma.h e690a356c18e98414d2e870ea791c1be1545a714ba623719deb63f7f226d8bb7 F src/prepare.c 1832be043fce7d489959aae6f994c452d023914714c4d5457beaed51c0f3d126 F src/printf.c 96f7f8baeedc7639da94e4e7a4a2c200e2537c4eec9e5e1c2ffc821f40eb3105 F src/random.c 606b00941a1d7dd09c381d3279a058d771f406c5213c9932bbd93d5587be4b9c -F src/resolve.c c8a5372b97b2a2e972a280676f06ddb5b74e885d3b1f5ce383f839907b57ef68 +F src/resolve.c 626c24b258b111f75c22107aa5614ad89810df3026f5ca071116d3fe75925c75 F src/rowset.c 8432130e6c344b3401a8874c3cb49fefe6873fec593294de077afea2dce5ec97 F src/select.c 83e88fbb36f89b6703b348777491619554f0fd6f917c9fdf51e4c2e9cda6c04e F src/shell.c.in b377a59822f207106424f08aead37e78b609222e98f86f04cc8a03563ccf3237 @@ -844,7 +844,7 @@ F src/threads.c 4ae07fa022a3dc7c5beb373cf744a85d3c5c6c3c F src/tokenize.c 375a772e2342274f4bf73605a70633237da09deed00a9bf4c4816a56777ea7c9 F src/treeview.c d85ce76e6d1498d781957c07cb234da6d77ce0ed2d196480d516f54dabc62279 F src/trigger.c da3c25786870d8bf97cd46b493374c2375d1abaf20a9b0f5f8629a3f2f2ce383 -F src/update.c 0e01aa6a3edf9ec112b33eb714b9016a81241497b1fb7c3e74332f4f71756508 +F src/update.c 3e5e7ff66fa19ebe4d1b113d480639a24cc1175adbefabbd1a948a07f28e37cf F src/upsert.c 215328c3f91623c520ec8672c44323553f12caeb4f01b1090ebdca99fdf7b4f1 F src/utf.c 8b29d9a5956569ea2700f869669b8ef67a9662ee5e724ff77ab3c387e27094ba F src/util.c e5f6a5eeaa26b69054a43bbd0048cfe3d2851f6961052b35aed8f695df922850 @@ -854,7 +854,7 @@ F src/vdbe.h 3d26d5c7660c5c7bd33ffb0d8784615072d8b23c81f8110870efe2631136bc89 F src/vdbeInt.h 078b1c15b26587b54c1c1879d0d2f4dec812b9de4c337fed9faf73fbcc3bf091 F src/vdbeapi.c 82fe278a7c71b653235c6f9fb5de0b5de589908dfcb011ba2a782e8becf06f86 F src/vdbeaux.c 541d3d232714455960eab4ed10b34cb48b4bcd565d7539ef31092f5e73648e6b -F src/vdbeblob.c 255be187436da38b01f276c02e6a08103489bbe2a7c6c21537b7aecbe0e1f797 +F src/vdbeblob.c 9166b6eb7054e5da82e35255892fb1ed551355a4716452539e8e3ac14f25fbe3 F src/vdbemem.c 977438546df236c6a3e7d8b4fe86c0643c13b89b00235db1f11c3a91a4796d30 F src/vdbesort.c d0a3c7056c081703c8b6d91ad60f17da5e062a5c64bf568ed0fa1b5f4cae311f F src/vdbetrace.c fe0bc29ebd4e02c8bc5c1945f1d2e6be5927ec12c06d89b03ef2a4def34bf823 @@ -2209,8 +2209,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P 6e57848fe1e0e2b533dd65c2bc5fbac660202cf91cb94ac5468a3434e367a087 -R 2c411617d97350770bd64ca35d94ddfa +P 91102c04375f83cffcd0f3204870e476636f651710e9e6fb773cf74085ef7636 +R 3617bbdf30502e1c991c0fb4581bc1ec U drh -Z 8dddf39b318eaf54797fe9748f81eadf +Z 863c9742465b0aa338b6dd538c7f9637 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index c4ad2d2b75..a40ac617bb 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -91102c04375f83cffcd0f3204870e476636f651710e9e6fb773cf74085ef7636 +351dbbc2bf0b23efdc625ddaa5dc2239cf2990addf071a04bd41612b341de8c8 diff --git a/src/alter.c b/src/alter.c index ff20757589..5f706b513f 100644 --- a/src/alter.c +++ b/src/alter.c @@ -632,10 +632,8 @@ void sqlite3AlterRenameColumn( ** altered. Set iCol to be the index of the column being renamed */ zOld = sqlite3NameFromToken(db, pOld); if( !zOld ) goto exit_rename_column; - for(iCol=0; iColnCol; iCol++){ - if( 0==sqlite3StrICmp(pTab->aCol[iCol].zCnName, zOld) ) break; - } - if( iCol==pTab->nCol ){ + iCol = sqlite3ColumnIndex(pTab, zOld); + if( iCol<0 ){ sqlite3ErrorMsg(pParse, "no such column: \"%T\"", pOld); goto exit_rename_column; } diff --git a/src/build.c b/src/build.c index 986107f48d..2e28af2d1f 100644 --- a/src/build.c +++ b/src/build.c @@ -1473,7 +1473,6 @@ void sqlite3AddColumn(Parse *pParse, Token sName, Token sType){ char *zType; Column *pCol; sqlite3 *db = pParse->db; - u8 hName; Column *aNew; u8 eType = COLTYPE_CUSTOM; u8 szEst = 1; @@ -1527,13 +1526,11 @@ void sqlite3AddColumn(Parse *pParse, Token sName, Token sType){ memcpy(z, sName.z, sName.n); z[sName.n] = 0; sqlite3Dequote(z); - hName = sqlite3StrIHash(z); - for(i=0; inCol; i++){ - if( p->aCol[i].hName==hName && sqlite3StrICmp(z, p->aCol[i].zCnName)==0 ){ - sqlite3ErrorMsg(pParse, "duplicate column name: %s", z); - sqlite3DbFree(db, z); - return; - } + i = sqlite3ColumnIndex(p, z); + if( i>=0 ){ + sqlite3ErrorMsg(pParse, "duplicate column name: %s", z); + sqlite3DbFree(db, z); + return; } aNew = sqlite3DbRealloc(db,p->aCol,((i64)p->nCol+1)*sizeof(p->aCol[0])); if( aNew==0 ){ @@ -1544,7 +1541,7 @@ void sqlite3AddColumn(Parse *pParse, Token sName, Token sType){ pCol = &p->aCol[p->nCol]; memset(pCol, 0, sizeof(p->aCol[0])); pCol->zCnName = z; - pCol->hName = hName; + pCol->hName = sqlite3StrIHash(z); sqlite3ColumnPropertiesFromName(p, pCol); if( sType.n==0 ){ @@ -1835,15 +1832,11 @@ void sqlite3AddPrimaryKey( assert( pCExpr!=0 ); sqlite3StringToId(pCExpr); if( pCExpr->op==TK_ID ){ - const char *zCName; assert( !ExprHasProperty(pCExpr, EP_IntValue) ); - zCName = pCExpr->u.zToken; - for(iCol=0; iColnCol; iCol++){ - if( sqlite3StrICmp(zCName, pTab->aCol[iCol].zCnName)==0 ){ - pCol = &pTab->aCol[iCol]; - makeColumnPartOfPrimaryKey(pParse, pCol); - break; - } + iCol = sqlite3ColumnIndex(pTab, pCExpr->u.zToken); + if( iCol>=0 ){ + pCol = &pTab->aCol[iCol]; + makeColumnPartOfPrimaryKey(pParse, pCol); } } } diff --git a/src/expr.c b/src/expr.c index 8f898a1e3b..df47e34593 100644 --- a/src/expr.c +++ b/src/expr.c @@ -2966,13 +2966,7 @@ const char *sqlite3RowidAlias(Table *pTab){ int ii; assert( VisibleRowid(pTab) ); for(ii=0; iinCol; iCol++){ - if( sqlite3_stricmp(azOpt[ii], pTab->aCol[iCol].zCnName)==0 ) break; - } - if( iCol==pTab->nCol ){ - return azOpt[ii]; - } + if( sqlite3ColumnIndex(pTab, azOpt[ii])<0 ) return azOpt[ii]; } return 0; } diff --git a/src/insert.c b/src/insert.c index e2d910fce4..c1ca1897ed 100644 --- a/src/insert.c +++ b/src/insert.c @@ -1075,28 +1075,22 @@ void sqlite3Insert( aTabColMap = sqlite3DbMallocZero(db, pTab->nCol*sizeof(int)); if( aTabColMap==0 ) goto insert_cleanup; for(i=0; inId; i++){ - const char *zCName = pColumn->a[i].zName; - u8 hName = sqlite3StrIHash(zCName); - for(j=0; jnCol; j++){ - if( pTab->aCol[j].hName!=hName ) continue; - if( sqlite3StrICmp(zCName, pTab->aCol[j].zCnName)==0 ){ - if( aTabColMap[j]==0 ) aTabColMap[j] = i+1; - if( i!=j ) bIdListInOrder = 0; - if( j==pTab->iPKey ){ - ipkColumn = i; assert( !withoutRowid ); - } -#ifndef SQLITE_OMIT_GENERATED_COLUMNS - if( pTab->aCol[j].colFlags & (COLFLAG_STORED|COLFLAG_VIRTUAL) ){ - sqlite3ErrorMsg(pParse, - "cannot INSERT into generated column \"%s\"", - pTab->aCol[j].zCnName); - goto insert_cleanup; - } -#endif - break; + j = sqlite3ColumnIndex(pTab, pColumn->a[i].zName); + if( j>=0 ){ + if( aTabColMap[j]==0 ) aTabColMap[j] = i+1; + if( i!=j ) bIdListInOrder = 0; + if( j==pTab->iPKey ){ + ipkColumn = i; assert( !withoutRowid ); } - } - if( j>=pTab->nCol ){ +#ifndef SQLITE_OMIT_GENERATED_COLUMNS + if( pTab->aCol[j].colFlags & (COLFLAG_STORED|COLFLAG_VIRTUAL) ){ + sqlite3ErrorMsg(pParse, + "cannot INSERT into generated column \"%s\"", + pTab->aCol[j].zCnName); + goto insert_cleanup; + } +#endif + }else{ if( sqlite3IsRowid(pColumn->a[i].zName) && !withoutRowid ){ ipkColumn = i; bIdListInOrder = 0; diff --git a/src/main.c b/src/main.c index 6a9d03d87c..17d0cd434a 100644 --- a/src/main.c +++ b/src/main.c @@ -3943,13 +3943,10 @@ int sqlite3_table_column_metadata( if( zColumnName==0 ){ /* Query for existence of table only */ }else{ - for(iCol=0; iColnCol; iCol++){ + iCol = sqlite3ColumnIndex(pTab, zColumnName); + if( iCol>=0 ){ pCol = &pTab->aCol[iCol]; - if( 0==sqlite3StrICmp(pCol->zCnName, zColumnName) ){ - break; - } - } - if( iCol==pTab->nCol ){ + }else{ if( HasRowid(pTab) && sqlite3IsRowid(zColumnName) ){ iCol = pTab->iPKey; pCol = iCol>=0 ? &pTab->aCol[iCol] : 0; diff --git a/src/resolve.c b/src/resolve.c index d6a5144af8..54ce4fb1ea 100644 --- a/src/resolve.c +++ b/src/resolve.c @@ -294,7 +294,6 @@ static int lookupName( Schema *pSchema = 0; /* Schema of the expression */ int eNewExprOp = TK_COLUMN; /* New value for pExpr->op on success */ Table *pTab = 0; /* Table holding the row */ - Column *pCol; /* A column of pTab */ ExprList *pFJMatch = 0; /* Matches for FULL JOIN .. USING */ const char *zCol = pRight->u.zToken; @@ -345,7 +344,6 @@ static int lookupName( if( pSrcList ){ for(i=0, pItem=pSrcList->a; inSrc; i++, pItem++){ - u8 hCol; pTab = pItem->pSTab; assert( pTab!=0 && pTab->zName!=0 ); assert( pTab->nCol>0 || pParse->nErr ); @@ -433,43 +431,38 @@ static int lookupName( sqlite3RenameTokenRemap(pParse, 0, (void*)&pExpr->y.pTab); } } - hCol = sqlite3StrIHash(zCol); - for(j=0, pCol=pTab->aCol; jnCol; j++, pCol++){ - if( pCol->hName==hCol - && sqlite3StrICmp(pCol->zCnName, zCol)==0 - ){ - if( cnt>0 ){ - if( pItem->fg.isUsing==0 - || sqlite3IdListIndex(pItem->u3.pUsing, zCol)<0 - ){ - /* Two or more tables have the same column name which is - ** not joined by USING. This is an error. Signal as much - ** by clearing pFJMatch and letting cnt go above 1. */ - sqlite3ExprListDelete(db, pFJMatch); - pFJMatch = 0; - }else - if( (pItem->fg.jointype & JT_RIGHT)==0 ){ - /* An INNER or LEFT JOIN. Use the left-most table */ - continue; - }else - if( (pItem->fg.jointype & JT_LEFT)==0 ){ - /* A RIGHT JOIN. Use the right-most table */ - cnt = 0; - sqlite3ExprListDelete(db, pFJMatch); - pFJMatch = 0; - }else{ - /* For a FULL JOIN, we must construct a coalesce() func */ - extendFJMatch(pParse, &pFJMatch, pMatch, pExpr->iColumn); - } + j = sqlite3ColumnIndex(pTab, zCol); + if( j>=0 ){ + if( cnt>0 ){ + if( pItem->fg.isUsing==0 + || sqlite3IdListIndex(pItem->u3.pUsing, zCol)<0 + ){ + /* Two or more tables have the same column name which is + ** not joined by USING. This is an error. Signal as much + ** by clearing pFJMatch and letting cnt go above 1. */ + sqlite3ExprListDelete(db, pFJMatch); + pFJMatch = 0; + }else + if( (pItem->fg.jointype & JT_RIGHT)==0 ){ + /* An INNER or LEFT JOIN. Use the left-most table */ + continue; + }else + if( (pItem->fg.jointype & JT_LEFT)==0 ){ + /* A RIGHT JOIN. Use the right-most table */ + cnt = 0; + sqlite3ExprListDelete(db, pFJMatch); + pFJMatch = 0; + }else{ + /* For a FULL JOIN, we must construct a coalesce() func */ + extendFJMatch(pParse, &pFJMatch, pMatch, pExpr->iColumn); } - cnt++; - pMatch = pItem; - /* Substitute the rowid (column -1) for the INTEGER PRIMARY KEY */ - pExpr->iColumn = j==pTab->iPKey ? -1 : (i16)j; - if( pItem->fg.isNestedFrom ){ - sqlite3SrcItemColumnUsed(pItem, j); - } - break; + } + cnt++; + pMatch = pItem; + /* Substitute the rowid (column -1) for the INTEGER PRIMARY KEY */ + pExpr->iColumn = j==pTab->iPKey ? -1 : (i16)j; + if( pItem->fg.isNestedFrom ){ + sqlite3SrcItemColumnUsed(pItem, j); } } if( 0==cnt && VisibleRowid(pTab) ){ @@ -559,23 +552,18 @@ static int lookupName( if( pTab ){ int iCol; - u8 hCol = sqlite3StrIHash(zCol); pSchema = pTab->pSchema; cntTab++; - for(iCol=0, pCol=pTab->aCol; iColnCol; iCol++, pCol++){ - if( pCol->hName==hCol - && sqlite3StrICmp(pCol->zCnName, zCol)==0 - ){ - if( iCol==pTab->iPKey ){ - iCol = -1; - } - break; + iCol = sqlite3ColumnIndex(pTab, zCol); + if( iCol>=0 ){ + if( pTab->iPKey==iCol ) iCol = -1; + }else{ + if( sqlite3IsRowid(zCol) && VisibleRowid(pTab) ){ + iCol = -1; + }else{ + iCol = pTab->nCol; } } - if( iCol>=pTab->nCol && sqlite3IsRowid(zCol) && VisibleRowid(pTab) ){ - /* IMP: R-51414-32910 */ - iCol = -1; - } if( iColnCol ){ cnt++; pMatch = 0; diff --git a/src/update.c b/src/update.c index a8e7f77803..979afea1f5 100644 --- a/src/update.c +++ b/src/update.c @@ -465,38 +465,32 @@ void sqlite3Update( */ chngRowid = chngPk = 0; for(i=0; inExpr; i++){ - u8 hCol = sqlite3StrIHash(pChanges->a[i].zEName); /* If this is an UPDATE with a FROM clause, do not resolve expressions ** here. The call to sqlite3Select() below will do that. */ if( nChangeFrom==0 && sqlite3ResolveExprNames(&sNC, pChanges->a[i].pExpr) ){ goto update_cleanup; } - for(j=0; jnCol; j++){ - if( pTab->aCol[j].hName==hCol - && sqlite3StrICmp(pTab->aCol[j].zCnName, pChanges->a[i].zEName)==0 - ){ - if( j==pTab->iPKey ){ - chngRowid = 1; - pRowidExpr = pChanges->a[i].pExpr; - iRowidExpr = i; - }else if( pPk && (pTab->aCol[j].colFlags & COLFLAG_PRIMKEY)!=0 ){ - chngPk = 1; - } -#ifndef SQLITE_OMIT_GENERATED_COLUMNS - else if( pTab->aCol[j].colFlags & COLFLAG_GENERATED ){ - testcase( pTab->aCol[j].colFlags & COLFLAG_VIRTUAL ); - testcase( pTab->aCol[j].colFlags & COLFLAG_STORED ); - sqlite3ErrorMsg(pParse, - "cannot UPDATE generated column \"%s\"", - pTab->aCol[j].zCnName); - goto update_cleanup; - } -#endif - aXRef[j] = i; - break; + j = sqlite3ColumnIndex(pTab, pChanges->a[i].zEName); + if( j>=0 ){ + if( j==pTab->iPKey ){ + chngRowid = 1; + pRowidExpr = pChanges->a[i].pExpr; + iRowidExpr = i; + }else if( pPk && (pTab->aCol[j].colFlags & COLFLAG_PRIMKEY)!=0 ){ + chngPk = 1; } - } - if( j>=pTab->nCol ){ +#ifndef SQLITE_OMIT_GENERATED_COLUMNS + else if( pTab->aCol[j].colFlags & COLFLAG_GENERATED ){ + testcase( pTab->aCol[j].colFlags & COLFLAG_VIRTUAL ); + testcase( pTab->aCol[j].colFlags & COLFLAG_STORED ); + sqlite3ErrorMsg(pParse, + "cannot UPDATE generated column \"%s\"", + pTab->aCol[j].zCnName); + goto update_cleanup; + } +#endif + aXRef[j] = i; + }else{ if( pPk==0 && sqlite3IsRowid(pChanges->a[i].zEName) ){ j = -1; chngRowid = 1; diff --git a/src/vdbeblob.c b/src/vdbeblob.c index 6cb36da37a..79698d0af4 100644 --- a/src/vdbeblob.c +++ b/src/vdbeblob.c @@ -192,12 +192,8 @@ int sqlite3_blob_open( pBlob->zDb = db->aDb[sqlite3SchemaToIndex(db, pTab->pSchema)].zDbSName; /* Now search pTab for the exact column. */ - for(iCol=0; iColnCol; iCol++) { - if( sqlite3StrICmp(pTab->aCol[iCol].zCnName, zColumn)==0 ){ - break; - } - } - if( iCol==pTab->nCol ){ + iCol = sqlite3ColumnIndex(pTab, zColumn); + if( iCol<0 ){ sqlite3DbFree(db, zErr); zErr = sqlite3MPrintf(db, "no such column: \"%s\"", zColumn); rc = SQLITE_ERROR; From 66172ceb890bb0e6a03478f02b5603335abdfe1e Mon Sep 17 00:00:00 2001 From: drh <> Date: Sat, 8 Feb 2025 16:16:08 +0000 Subject: [PATCH 064/194] Put a 16-byte hash table for column names on each Table object, to speed up column name lookups. FossilOrigin-Name: 11eb8f99e5c4974cb6ba39e5bbc99f6b88b9e01006b70d5fea85c2a6d4f7044f --- manifest | 16 ++++++++-------- manifest.uuid | 2 +- src/build.c | 4 ++++ src/select.c | 28 +++++++++++++++++++++++++--- src/sqliteInt.h | 1 + 5 files changed, 39 insertions(+), 12 deletions(-) diff --git a/manifest b/manifest index adfd9058d8..66664febff 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Use\sthe\ssqlite3ColumnIndex()\sroutine\sto\slook\sup\sa\scolumn\sin\sa\stable,\srather\nthan\susing\sa\scustom\sloop.\s\sPerformance\simprovement,\ssize\sreduction,\sand\ncomplexity\sdecrease. -D 2025-02-08T14:15:42.707 +C Put\sa\s16-byte\shash\stable\sfor\scolumn\snames\son\seach\sTable\sobject,\sto\sspeed\nup\scolumn\sname\slookups. +D 2025-02-08T16:16:08.621 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d @@ -722,7 +722,7 @@ F src/btmutex.c 79a43670447eacc651519a429f6ece9fd638563cf95b469d6891185ddae2b522 F src/btree.c 63ca6b647342e8cef643863cd0962a542f133e1069460725ba4461dcda92b03c F src/btree.h 18e5e7b2124c23426a283523e5f31a4bff029131b795bb82391f9d2f3136fc50 F src/btreeInt.h 98aadb6dcb77b012cab2574d6a728fad56b337fc946839b9898c4b4c969e30b6 -F src/build.c 48796a45299dbdf6331bc1bf2eb5319330980f469c1eaaed17d487a381cea488 +F src/build.c 83c43ddb517a15673d1dc17f88ea8cd1db06e0d277e6dc666ac8985017a99ac5 F src/callback.c acae8c8dddda41ee85cfdf19b926eefe830f371069f8aadca3aa39adf5b1c859 F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e F src/ctime.c d35723024b963edce9c0fad5b3303e8bb9266083784844baed10a6dedfe26f3b @@ -780,12 +780,12 @@ F src/printf.c 96f7f8baeedc7639da94e4e7a4a2c200e2537c4eec9e5e1c2ffc821f40eb3105 F src/random.c 606b00941a1d7dd09c381d3279a058d771f406c5213c9932bbd93d5587be4b9c F src/resolve.c 626c24b258b111f75c22107aa5614ad89810df3026f5ca071116d3fe75925c75 F src/rowset.c 8432130e6c344b3401a8874c3cb49fefe6873fec593294de077afea2dce5ec97 -F src/select.c 83e88fbb36f89b6703b348777491619554f0fd6f917c9fdf51e4c2e9cda6c04e +F src/select.c 5c8ac3f0b7dd72745719f0137119a6f9016a9c2633a7351ef11c00a43b4c0944 F src/shell.c.in b377a59822f207106424f08aead37e78b609222e98f86f04cc8a03563ccf3237 F src/sqlite.h.in d2902f13ace94d3d3609646bd6d12a2d7a4f6cbdf6a5a4097580ac305f54c3f0 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8 F src/sqlite3ext.h 3f046c04ea3595d6bfda99b781926b17e672fd6d27da2ba6d8d8fc39981dcb54 -F src/sqliteInt.h 7585b45f585c82f803ab89ccd475819c6dfb9eae0dc2afcae62c9d894137e0e8 +F src/sqliteInt.h 8cbfef6c26efd539eb93011905f4d3ce7fdb77475d1280764d86f9e7954c464b F src/sqliteLimit.h 1bbdbf72bd0411d003267ffebc59a262f061df5653027a75627d03f48ca30523 F src/status.c cb11f8589a6912af2da3bb1ec509a94dd8ef27df4d4c1a97e0bcf2309ece972b F src/table.c 0f141b58a16de7e2fbe81c308379e7279f4c6b50eb08efeec5892794a0ba30d1 @@ -2209,8 +2209,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P 91102c04375f83cffcd0f3204870e476636f651710e9e6fb773cf74085ef7636 -R 3617bbdf30502e1c991c0fb4581bc1ec +P 351dbbc2bf0b23efdc625ddaa5dc2239cf2990addf071a04bd41612b341de8c8 +R cda99bdc5b1dd85ef2acf18a1826a5a1 U drh -Z 863c9742465b0aa338b6dd538c7f9637 +Z c5517dc029ab4cf78c2ac97792e86679 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index a40ac617bb..c62113f3d6 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -351dbbc2bf0b23efdc625ddaa5dc2239cf2990addf071a04bd41612b341de8c8 +11eb8f99e5c4974cb6ba39e5bbc99f6b88b9e01006b70d5fea85c2a6d4f7044f diff --git a/src/build.c b/src/build.c index 2e28af2d1f..7b80425291 100644 --- a/src/build.c +++ b/src/build.c @@ -1565,6 +1565,10 @@ void sqlite3AddColumn(Parse *pParse, Token sName, Token sType){ pCol->affinity = sqlite3AffinityType(zType, pCol); pCol->colFlags |= COLFLAG_HASTYPE; } + if( p->nCol<=0xff ){ + u8 h = pCol->hName % sizeof(p->aHx); + p->aHx[h] = p->nCol; + } p->nCol++; p->nNVCol++; assert( pParse->isCreate ); diff --git a/src/select.c b/src/select.c index cf25c8e678..e848c46a39 100644 --- a/src/select.c +++ b/src/select.c @@ -319,10 +319,32 @@ int sqlite3JoinType(Parse *pParse, Token *pA, Token *pB, Token *pC){ */ int sqlite3ColumnIndex(Table *pTab, const char *zCol){ int i; - u8 h = sqlite3StrIHash(zCol); + u8 h; Column *pCol; - for(pCol=pTab->aCol, i=0; inCol; pCol++, i++){ - if( pCol->hName==h && sqlite3StrICmp(pCol->zCnName, zCol)==0 ) return i; + + if( pTab->nCol==0 ){ + return -1; + } + h = sqlite3StrIHash(zCol); + + i = pTab->aHx[h % sizeof(pTab->aHx)]; + assert( inCol ); + if( pTab->aCol[i].hName==h + && sqlite3StrICmp(pTab->aCol[i].zCnName, zCol)==0 + ){ + return i; + } + pCol = pTab->aCol; + i = 0; + while( 1 /*exit-by-break*/ ){ + if( pCol->hName==h + && sqlite3StrICmp(pCol->zCnName, zCol)==0 + ){ + return i; + } + i++; + if( i>=pTab->nCol ) break; + pCol++; } return -1; } diff --git a/src/sqliteInt.h b/src/sqliteInt.h index e46744a129..c8ecaf8571 100644 --- a/src/sqliteInt.h +++ b/src/sqliteInt.h @@ -2431,6 +2431,7 @@ struct Table { } u; Trigger *pTrigger; /* List of triggers on this object */ Schema *pSchema; /* Schema that contains this table */ + u8 aHx[16]; /* Column aHt[K%sizeof(aHt)] might have hash K */ }; /* From 5b0b8653b665a02686d80ec67f0d93de522f82e5 Mon Sep 17 00:00:00 2001 From: drh <> Date: Sun, 9 Feb 2025 00:54:56 +0000 Subject: [PATCH 065/194] Add the "star" testset to speedtest1. Include it as part of "mix1". FossilOrigin-Name: f1345b84eaae5404268df1d0449c409fe5c4a4f9742bd67a75c7333c8c9cd597 --- manifest | 12 ++--- manifest.uuid | 2 +- test/speedtest1.c | 120 ++++++++++++++++++++++++++++++++++++++++++++-- 3 files changed, 122 insertions(+), 12 deletions(-) diff --git a/manifest b/manifest index 66664febff..a6ff85864c 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Put\sa\s16-byte\shash\stable\sfor\scolumn\snames\son\seach\sTable\sobject,\sto\sspeed\nup\scolumn\sname\slookups. -D 2025-02-08T16:16:08.621 +C Add\sthe\s"star"\stestset\sto\sspeedtest1.\s\sInclude\sit\sas\spart\sof\s"mix1". +D 2025-02-09T00:54:56.995 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d @@ -1681,7 +1681,7 @@ F test/speed4p.explain 6b5f104ebeb34a038b2f714150f51d01143e59aa F test/speed4p.test 377a0c48e5a92e0b11c1c5ebb1bc9d83a7312c922bc0cb05970ef5d6a96d1f0c F test/speedtest.md ee958457ae1b729d9715ae33c0320600000bf1d9ddea1a88dcf79f56729d6fad F test/speedtest.tcl 185f80f8db275852746e8150137b31ba4aaa1c9a1ecb1e35a3b66cd3f31783b9 x -F test/speedtest1.c 204acd8af326bbca2c28f68166635d4574381f4cabbac1bc243663f5dcc5051d +F test/speedtest1.c ef340d391366afc875d11fc59332601c470154352b0db836b2cba813999a8fb4 F test/spellfix.test 951a6405d49d1a23d6b78027d3877b4a33eeb8221dcab5704b499755bb4f552e F test/spellfix2.test dfc8f519a3fc204cb2dfa8b4f29821ae90f6f8c3 F test/spellfix3.test 0f9efaaa502a0e0a09848028518a6fb096c8ad33 @@ -2209,8 +2209,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P 351dbbc2bf0b23efdc625ddaa5dc2239cf2990addf071a04bd41612b341de8c8 -R cda99bdc5b1dd85ef2acf18a1826a5a1 +P 11eb8f99e5c4974cb6ba39e5bbc99f6b88b9e01006b70d5fea85c2a6d4f7044f +R 1a1bec3385a102a8e6f260d5d8c260d8 U drh -Z c5517dc029ab4cf78c2ac97792e86679 +Z 34712e1b605bf59fda97cb6a7434984c # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index c62113f3d6..ac22274f1b 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -11eb8f99e5c4974cb6ba39e5bbc99f6b88b9e01006b70d5fea85c2a6d4f7044f +f1345b84eaae5404268df1d0449c409fe5c4a4f9742bd67a75c7333c8c9cd597 diff --git a/test/speedtest1.c b/test/speedtest1.c index 9d8ddc4545..c6d5fd4a10 100644 --- a/test/speedtest1.c +++ b/test/speedtest1.c @@ -64,10 +64,9 @@ static const char zHelp[] = " --stats Show statistics at the end\n" " --stmtscanstatus Activate SQLITE_DBCONFIG_STMT_SCANSTATUS\n" " --temp N N from 0 to 9. 0: no temp table. 9: all temp tables\n" - " --testset T Run test-set T (main, cte, rtree, orm, fp, json," - " debug)\n" - " Can be a comma-separated list of values, with /SCALE\n" - " suffixes or macro \"mix1\"\n" + " --testset T Run test-set T (main, cte, rtree, orm, fp, json,\n" + " star, debug). Can be a comma-separated list of\n" + " values, with /SCALE suffixes or macro \"mix1\"\n" " --trace Turn on SQL tracing\n" " --threads N Use up to N threads for sorting\n" " --utf16be Set text encoding to UTF-16BE\n" @@ -1458,6 +1457,114 @@ void testset_fp(void){ speedtest1_end_test(); } +/* +** A testset for star-schema queries. +*/ +void testset_star(void){ + int n; + int i; + n = g.szTest*50; + speedtest1_begin_test(100, "Create a fact table with %d entries", n); + speedtest1_exec( + "CREATE TABLE facttab(" + " attr01 INT," + " attr02 INT," + " attr03 INT," + " data01 TEXT," + " attr04 INT," + " attr05 INT," + " attr06 INT," + " attr07 INT," + " attr08 INT," + " factid INTEGER PRIMARY KEY," + " data02 TEXT" + ");" + ); + speedtest1_exec( + "WITH RECURSIVE counter(nnn) AS" + "(VALUES(1) UNION ALL SELECT nnn+1 FROM counter WHERE nnn<%d)" + "INSERT INTO facttab(attr01,attr02,attr03,attr04,attr05," + "attr06,attr07,attr08,data01,data02)" + "SELECT random()%%12, random()%%13, random()%%14, random()%%15," + "random()%%16, random()%%17, random()%%18, random()%%19," + "concat('data-',nnn), format('%%x',random()) FROM counter;", + n + ); + speedtest1_end_test(); + + speedtest1_begin_test(110, "Create indexes on all attributes columns"); + for(i=1; i<=8; i++){ + speedtest1_exec( + "CREATE INDEX fact_attr%02d ON facttab(attr%02d)", i, i + ); + } + speedtest1_end_test(); + + speedtest1_begin_test(120, "Create dimension tables"); + for(i=1; i<=8; i++){ + speedtest1_exec( + "CREATE TABLE dimension%02d(" + "beta%02d INT, " + "content%02d TEXT, " + "rate%02d REAL)", + i, i, i, i + ); + speedtest1_exec( + "WITH RECURSIVE ctr(nn) AS" + " (VALUES(1) UNION ALL SELECT nn+1 FROM ctr WHERE nn<%d)" + " INSERT INTO dimension%02d" + " SELECT nn%%(%d), concat('content-%02d-',nn)," + " (random()%%10000)*0.125 FROM ctr;", + 4*(i+1), i, 2*(i+1), i + ); + if( i&2 ){ + speedtest1_exec( + "CREATE INDEX dim%02d ON dimension%02d(beta%02d);", + i, i, i + ); + }else{ + speedtest1_exec( + "CREATE INDEX dim%02d ON dimension%02d(beta%02d,content%02d);", + i, i, i, i + ); + } + } + speedtest1_end_test(); + + speedtest1_begin_test(130, "Star query over the entire fact table"); + speedtest1_exec( + "SELECT count(*), max(content04), min(content03), sum(rate04), avg(rate05)" + " FROM facttab, dimension01, dimension02, dimension03, dimension04," + " dimension05, dimension06, dimension07, dimension08" + " WHERE attr01=beta01" + " AND attr02=beta02" + " AND attr03=beta03" + " AND attr04=beta04" + " AND attr05=beta05" + " AND attr06=beta06" + " AND attr07=beta07" + " AND attr08=beta08" + ";" + ); + speedtest1_end_test(); + + speedtest1_begin_test(130, "Star query with LEFT JOINs"); + speedtest1_exec( + "SELECT count(*), max(content04), min(content03), sum(rate04), avg(rate05)" + " FROM facttab LEFT JOIN dimension01 ON attr01=beta01" + " LEFT JOIN dimension02 ON attr02=beta02" + " JOIN dimension03 ON attr03=beta03" + " JOIN dimension04 ON attr04=beta04" + " JOIN dimension05 ON attr05=beta05" + " LEFT JOIN dimension06 ON attr06=beta06" + " JOIN dimension07 ON attr07=beta07" + " JOIN dimension08 ON attr08=beta08" + " WHERE facttab.data01 LIKE 'data-9%%'" + ";" + ); + speedtest1_end_test(); +} + #ifdef SQLITE_ENABLE_RTREE /* Generate two numbers between 1 and mx. The first number is less than ** the second. Usually the numbers are near each other but can sometimes @@ -2560,7 +2667,8 @@ int main(int argc, char **argv){ } g.eTemp = argv[i][0] - '0'; }else if( strcmp(z,"testset")==0 ){ - static char zMix1Tests[] = "main,orm/25,cte/20,json,fp/3,parsenumber/25,rtree/10"; + static char zMix1Tests[] = + "main,orm/25,cte/20,json,fp/3,parsenumber/25,rtree/10,star"; ARGC_VALUE_CHECK(1); zTSet = argv[++i]; if( strcmp(zTSet,"mix1")==0 ) zTSet = zMix1Tests; @@ -2749,6 +2857,8 @@ int main(int argc, char **argv){ testset_orm(); }else if( strcmp(zThisTest,"cte")==0 ){ testset_cte(); + }else if( strcmp(zThisTest,"star")==0 ){ + testset_star(); }else if( strcmp(zThisTest,"fp")==0 ){ testset_fp(); }else if( strcmp(zThisTest,"json")==0 ){ From 3e06f2d79b15754999892a4ded6a7585520294a6 Mon Sep 17 00:00:00 2001 From: stephan Date: Sun, 9 Feb 2025 01:25:00 +0000 Subject: [PATCH 066/194] configure: when transfering ENABLE/OMIT flags from CFLAGS to OPT_FEATURE_FLAGS, also do the same for CPPFLAGS and remove those ENABLE/OMIT flags from CFLAGS/CPPFLAGS to mimic legacy build behavior. Strip ENABLE/OMIT flags from BUILD_CFLAGS but do not transfer those to OPT_FEATURE_FLAGS, also to mimic legacy behavior. This is the second part of a fix discussed at [forum:9801e54665afd728|forum post 9801e54665afd728]. FossilOrigin-Name: 16d307cc6c1e203900e7a2dc0730fc0e453946622a2114a07d64ebb99045cfbf --- autosetup/sqlite-config.tcl | 36 ++++++++++++++++++++++++++++++------ manifest | 14 +++++++------- manifest.uuid | 2 +- 3 files changed, 38 insertions(+), 14 deletions(-) diff --git a/autosetup/sqlite-config.tcl b/autosetup/sqlite-config.tcl index cabb32aac0..2a73548662 100644 --- a/autosetup/sqlite-config.tcl +++ b/autosetup/sqlite-config.tcl @@ -230,23 +230,47 @@ proc sqlite-setup-default-cflags {} { # BUILD_CFLAGS is the CFLAGS for CC_FOR_BUILD. define BUILD_CFLAGS [proj-get-env BUILD_CFLAGS {-g}] - # Copy all CFLAGS entries matching -DSQLITE_OMIT* and + # Copy all CFLAGS and CPPFLAGS entries matching -DSQLITE_OMIT* and # -DSQLITE_ENABLE* to OPT_FEATURE_FLAGS. This behavior is derived # from the legacy build and was missing the 3.48.0 release (the # initial Autosetup port). # https://sqlite.org/forum/forumpost/9801e54665afd728 # + # Handling of CPPFLAGS, as well as removing ENABLE/OMIT from + # CFLAGS/CPPFLAGS, was missing in the 3.49.0 release as well. + # # If any configure flags for features are in conflict with - # CFLAGS-specified feature flags, all bets are off. There are no - # guarantees about which one will take precedence. - foreach cf [get-define CFLAGS ""] { + # CFLAGS/CPPFLAGS-specified feature flags, all bets are off. There + # are no guarantees about which one will take precedence. + foreach flagDef {CFLAGS CPPFLAGS} { + set tmp "" + foreach cf [get-define $flagDef ""] { + switch -glob -- $cf { + -DSQLITE_OMIT* - + -DSQLITE_ENABLE* { + sqlite-add-feature-flag $cf + } + default { + lappend tmp $cf + } + } + } + define $flagDef $tmp + } + + # Strip all SQLITE_ENABLE/OMIT flags from BUILD_CFLAGS, + # for compatibility with the legacy build. + set tmp "" + foreach cf [get-define BUILD_CFLAGS ""] { switch -glob -- $cf { -DSQLITE_OMIT* - - -DSQLITE_ENABLE* { - sqlite-add-feature-flag $cf + -DSQLITE_ENABLE* {} + default { + lappend tmp $cf } } } + define BUILD_CFLAGS $tmp } ######################################################################## diff --git a/manifest b/manifest index a6ff85864c..3de37a6e66 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Add\sthe\s"star"\stestset\sto\sspeedtest1.\s\sInclude\sit\sas\spart\sof\s"mix1". -D 2025-02-09T00:54:56.995 +C configure:\swhen\stransfering\sENABLE/OMIT\sflags\sfrom\sCFLAGS\sto\sOPT_FEATURE_FLAGS,\salso\sdo\sthe\ssame\sfor\sCPPFLAGS\sand\sremove\sthose\sENABLE/OMIT\sflags\sfrom\sCFLAGS/CPPFLAGS\sto\smimic\slegacy\sbuild\sbehavior.\sStrip\sENABLE/OMIT\sflags\sfrom\sBUILD_CFLAGS\sbut\sdo\snot\stransfer\sthose\sto\sOPT_FEATURE_FLAGS,\salso\sto\smimic\slegacy\sbehavior.\sThis\sis\sthe\ssecond\spart\sof\sa\sfix\sdiscussed\sat\s[forum:9801e54665afd728|forum\spost\s9801e54665afd728]. +D 2025-02-09T01:25:00.990 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d @@ -50,7 +50,7 @@ F autosetup/cc.tcl c0fcc50ca91deff8741e449ddad05bcd08268bc31177e613a6343bbd1fd3e F autosetup/jimsh0.c 6573f6bc6ff204de0139692648d7037ca0b6c067bac83a7b4e087f20a86866a4 F autosetup/pkg-config.tcl 4e635bf39022ff65e0d5434339dd41503ea48fc53822c9c5bde88b02d3d952ba F autosetup/proj.tcl af5290ee128ce82dd178a474a9dcfaa7e503c88f0709d916cc6079d9b8c801f4 -F autosetup/sqlite-config.tcl f64aff26763e9ea021aabac222d43a9e0107b45f6de82972b93411fe36ef566b +F autosetup/sqlite-config.tcl d2c6467c557ec0437f2115e94fbe7a77af2d3e6d34b98b8ad85212f5cb890332 F autosetup/system.tcl 51d4be76cd9a9074704b584e5c9cbba616202c8468cf9ba8a4f8294a7ab1dba9 F configure 9a00b21dfd13757bbfb8d89b30660a89ec1f8f3a79402b8f9f9b6fc475c3303a x F contrib/sqlitecon.tcl 210a913ad63f9f991070821e599d600bd913e0ad @@ -2209,8 +2209,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P 11eb8f99e5c4974cb6ba39e5bbc99f6b88b9e01006b70d5fea85c2a6d4f7044f -R 1a1bec3385a102a8e6f260d5d8c260d8 -U drh -Z 34712e1b605bf59fda97cb6a7434984c +P f1345b84eaae5404268df1d0449c409fe5c4a4f9742bd67a75c7333c8c9cd597 +R 303d972057cca0b1b2eb8945cbdc8b8b +U stephan +Z 7b9d892b6b2cefdb6b9041463ba9bb8b # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index ac22274f1b..db22146b7e 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -f1345b84eaae5404268df1d0449c409fe5c4a4f9742bd67a75c7333c8c9cd597 +16d307cc6c1e203900e7a2dc0730fc0e453946622a2114a07d64ebb99045cfbf From f85818268965207d7682438132d51195d4e28bf0 Mon Sep 17 00:00:00 2001 From: stephan Date: Sun, 9 Feb 2025 02:41:35 +0000 Subject: [PATCH 067/194] JS: add a mechanism to the Worker1 exec API to fetch the last_insert_rowid(), as requested in [forum:56bc35390183f5d5|forum post 56bc353901]. FossilOrigin-Name: c22c48360756b1c7e2f5a9c01aff799bc188e100d364931de0dc3686e5de57a9 --- ext/wasm/api/sqlite3-api-worker1.c-pp.js | 25 +++++++++++++++++++----- ext/wasm/demo-worker1-promiser.c-pp.js | 5 ++++- ext/wasm/demo-worker1.js | 5 ++++- manifest | 16 +++++++-------- manifest.uuid | 2 +- 5 files changed, 37 insertions(+), 16 deletions(-) diff --git a/ext/wasm/api/sqlite3-api-worker1.c-pp.js b/ext/wasm/api/sqlite3-api-worker1.c-pp.js index 9918625459..5e088f4384 100644 --- a/ext/wasm/api/sqlite3-api-worker1.c-pp.js +++ b/ext/wasm/api/sqlite3-api-worker1.c-pp.js @@ -279,11 +279,11 @@ The arguments are in the same form accepted by oo1.DB.exec(), with the exceptions noted below. - If the `countChanges` arguments property (added in version 3.43) is - truthy then the `result` property contained by the returned object - will have a `changeCount` property which holds the number of changes - made by the provided SQL. Because the SQL may contain an arbitrary - number of statements, the `changeCount` is calculated by calling + If `args.countChanges` (added in version 3.43) is truthy then the + `result` property contained by the returned object will have a + `changeCount` property which holds the number of changes made by the + provided SQL. Because the SQL may contain an arbitrary number of + statements, the `changeCount` is calculated by calling `sqlite3_total_changes()` before and after the SQL is evaluated. If the value of `countChanges` is 64 then the `changeCount` property will be returned as a 64-bit integer in the form of a BigInt (noting @@ -292,6 +292,15 @@ calling `sqlite3_total_changes64()` before and after the SQL is evaluated. + If the `args.lastInsertRowId` (added in version 3.50.0) is truthy + then the `result` property contained by the returned object will + have a `lastInsertRowId` will hold a BigInt-type value corresponding + to the result of sqlite3_last_insert_rowid(). This value is only + fetched once, after the SQL is run, regardless of how many + statements the SQL contains. This API has no idea whether the SQL + contains any INSERTs, so it is up to the client to apply/rely on + this property only when it makes sense to do so. + A function-type args.callback property cannot cross the window/Worker boundary, so is not useful here. If args.callback is a string then it is assumed to be a @@ -542,6 +551,12 @@ sqlite3.initWorker1API = function(){ if(undefined !== changeCount){ rc.changeCount = db.changes(true,64===rc.countChanges) - changeCount; } + const lastInsertRowId = !!rc.lastInsertRowId + ? sqlite3.capi.sqlite3_last_insert_rowid(db) + : undefined; + if( undefined!==lastInsertRowId ){ + rc.lastInsertRowId = lastInsertRowId; + } if(rc.callback instanceof Function){ rc.callback = theCallback; /* Post a sentinel message to tell the client that the end diff --git a/ext/wasm/demo-worker1-promiser.c-pp.js b/ext/wasm/demo-worker1-promiser.c-pp.js index f6fc9568ae..0b8557b826 100644 --- a/ext/wasm/demo-worker1-promiser.c-pp.js +++ b/ext/wasm/demo-worker1-promiser.c-pp.js @@ -115,6 +115,7 @@ delete globalThis.sqlite3Worker1Promiser; "insert into t(a,b) values(1,2),(3,4),(5,6)" ].join(';'), resultRows: [], columnNames: [], + lastInsertRowId: true, countChanges: sqConfig.bigIntEnabled ? 64 : true }, function(ev){ ev = ev.result; @@ -122,7 +123,9 @@ delete globalThis.sqlite3Worker1Promiser; .assert(0===ev.columnNames.length) .assert(sqConfig.bigIntEnabled ? (3n===ev.changeCount) - : (3===ev.changeCount)); + : (3===ev.changeCount)) + .assert('bigint'===typeof ev.lastInsertRowId) + .assert(ev.lastInsertRowId>=3); }); await wtest('exec',{ diff --git a/ext/wasm/demo-worker1.js b/ext/wasm/demo-worker1.js index 60f5e8dec0..1a05cc7ac2 100644 --- a/ext/wasm/demo-worker1.js +++ b/ext/wasm/demo-worker1.js @@ -156,11 +156,14 @@ sql: ["create table t(a,b);", "insert into t(a,b) values(1,2),(3,4),(5,6)" ], + lastInsertRowId: true, resultRows: [], columnNames: [] }, function(ev){ ev = ev.result; T.assert(0===ev.resultRows.length) - .assert(0===ev.columnNames.length); + .assert(0===ev.columnNames.length) + .assert('bigint'===typeof ev.lastInsertRowId) + .assert(ev.lastInsertRowId>=3); }); runOneTest('exec',{ sql: 'select a a, b b from t order by a', diff --git a/manifest b/manifest index 3de37a6e66..c61d26c043 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C configure:\swhen\stransfering\sENABLE/OMIT\sflags\sfrom\sCFLAGS\sto\sOPT_FEATURE_FLAGS,\salso\sdo\sthe\ssame\sfor\sCPPFLAGS\sand\sremove\sthose\sENABLE/OMIT\sflags\sfrom\sCFLAGS/CPPFLAGS\sto\smimic\slegacy\sbuild\sbehavior.\sStrip\sENABLE/OMIT\sflags\sfrom\sBUILD_CFLAGS\sbut\sdo\snot\stransfer\sthose\sto\sOPT_FEATURE_FLAGS,\salso\sto\smimic\slegacy\sbehavior.\sThis\sis\sthe\ssecond\spart\sof\sa\sfix\sdiscussed\sat\s[forum:9801e54665afd728|forum\spost\s9801e54665afd728]. -D 2025-02-09T01:25:00.990 +C JS:\sadd\sa\smechanism\sto\sthe\sWorker1\sexec\sAPI\sto\sfetch\sthe\slast_insert_rowid(),\sas\srequested\sin\s[forum:56bc35390183f5d5|forum\spost\s56bc353901]. +D 2025-02-09T02:41:35.084 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d @@ -641,7 +641,7 @@ F ext/wasm/api/sqlite3-api-cleanup.js 3ac1786e461ada63033143be8c3b00b26b93954066 F ext/wasm/api/sqlite3-api-glue.c-pp.js 5c0209e6a28164b4c2c1a34b0bb4aee3b7b1a264988d7e71fac08b8ede5b7ae3 F ext/wasm/api/sqlite3-api-oo1.c-pp.js f3a8e2004c6625d17946c11f2fb32008be78bc5207bf746fc77d59848813225f F ext/wasm/api/sqlite3-api-prologue.js 5ff913355b3144f1c9719d0406667fa6e13eb813c71ed7ce29440e2e65363e82 -F ext/wasm/api/sqlite3-api-worker1.c-pp.js 5cc22a3c0d52828cb32aad8691488719f47d27567e63e8bc8b832d74371c352d +F ext/wasm/api/sqlite3-api-worker1.c-pp.js f646a65257973b8c4481f8a6a216370b85644f23e64b126e7ae113570587c0ab F ext/wasm/api/sqlite3-license-version-header.js 0c807a421f0187e778dc1078f10d2994b915123c1223fe752b60afdcd1263f89 F ext/wasm/api/sqlite3-opfs-async-proxy.js 3774befd97cd1a5e2895c8225a894aad946848c6d9b4028acc988b5d123475af F ext/wasm/api/sqlite3-vfs-helper.c-pp.js 3f828cc66758acb40e9c5b4dcfd87fd478a14c8fb7f0630264e6c7fa0e57515d @@ -667,9 +667,9 @@ F ext/wasm/demo-123.js c7b3cca50c55841c381a9ca4f9396e5bbdc6114273d0b10a43e378e32 F ext/wasm/demo-jsstorage.html 409c4be4af5f207fb2877160724b91b33ea36a3cd8c204e8da1acb828ffe588e F ext/wasm/demo-jsstorage.js 44e3ae7ec2483b6c511384c3c290beb6f305c721186bcf5398ca4e00004a06b8 F ext/wasm/demo-worker1-promiser.c-pp.html 635cf90685805e21772a5f7a35d1ace80f98a9ef7c42ff04d7a125ddca7e5db8 -F ext/wasm/demo-worker1-promiser.c-pp.js fcc628cb42fcfaf07d250477801de1e6deb1e319d003976612a0db8d76b9fccc +F ext/wasm/demo-worker1-promiser.c-pp.js af168699d3cab1c27ad2364ebe06cd49db300bdbf404e23b00d5742ed52816ba F ext/wasm/demo-worker1.html 2c178c1890a2beb5a5fecb1453e796d067a4b8d3d2a04d65ca2eb1ab2c68ef5d -F ext/wasm/demo-worker1.js 836bece8615b17b1b572584f7b15912236a5947fe8c68b98d2737d7e287447ef +F ext/wasm/demo-worker1.js 08720227e98fa5b44761cf6e219269cee3e9dd0421d8d91459535da776950314 F ext/wasm/dist.make 92ef4ffe33022a50f92d602acabad10bd8dd91759f3eb7df27fc6d7d37072b96 F ext/wasm/example_extra_init.c 2347cd69d19d839ef4e5e77b7855103a7fe3ef2af86f2e8c95839afd8b05862f F ext/wasm/fiddle.make d4969f0322a582c57a22ce3541f10a5b09a609d14eab32891f613f43b3c14d8b @@ -2209,8 +2209,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P f1345b84eaae5404268df1d0449c409fe5c4a4f9742bd67a75c7333c8c9cd597 -R 303d972057cca0b1b2eb8945cbdc8b8b +P 16d307cc6c1e203900e7a2dc0730fc0e453946622a2114a07d64ebb99045cfbf +R 5520495f3ccea7918b4a343a7efb2785 U stephan -Z 7b9d892b6b2cefdb6b9041463ba9bb8b +Z 1bf6695082490bb2a22dcd9297477549 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index db22146b7e..cfcb1b16c1 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -16d307cc6c1e203900e7a2dc0730fc0e453946622a2114a07d64ebb99045cfbf +c22c48360756b1c7e2f5a9c01aff799bc188e100d364931de0dc3686e5de57a9 From 00bc96c05c9fb6294c4785037e9ad67e72fcf882 Mon Sep 17 00:00:00 2001 From: stephan Date: Sun, 9 Feb 2025 03:24:00 +0000 Subject: [PATCH 068/194] wasm: when building in -O0 mode (typical dev mode), use -sASSERTIONS=2, else -sASSERTIONS=0, in response [https://github.com/emscripten-core/emscripten/pull/23629/commits/7e3e35cbff9c5688eacb3cddc5045f872d744efd|Emscripten checkin 7e3e35cbff9], which adds assertions to check for the condition reported in [https://github.com/emscripten-core/emscripten/issues/23420|Emscripten ticket 23420]. Update some unrelated JS-side internal docs. FossilOrigin-Name: 1f554610ba5d9d474ec4570bb7ca09125fd2cdfb4976530a4227cc6ebdf3a962 --- ext/wasm/GNUmakefile | 6 ++++++ ext/wasm/api/post-js-header.js | 10 +++++----- ext/wasm/api/sqlite3-api-prologue.js | 12 ++++++------ manifest | 16 ++++++++-------- manifest.uuid | 2 +- 5 files changed, 26 insertions(+), 20 deletions(-) diff --git a/ext/wasm/GNUmakefile b/ext/wasm/GNUmakefile index 4369635cf2..e18ec074c6 100644 --- a/ext/wasm/GNUmakefile +++ b/ext/wasm/GNUmakefile @@ -619,6 +619,12 @@ emcc.exportedRuntimeMethods := \ emcc.jsflags += $(emcc.exportedRuntimeMethods) emcc.jsflags += -sUSE_CLOSURE_COMPILER=0 emcc.jsflags += -sIMPORTED_MEMORY +ifeq (,$(filter -O0,$(emcc_opt))) +emcc.assert ?= 0 +else +emcc.assert ?= 2 +endif +emcc.jsflags += -sASSERTIONS=$(emcc.assert) emcc.jsflags += -sSTRICT_JS=0 # STRICT_JS disabled due to: # https://github.com/emscripten-core/emscripten/issues/18610 diff --git a/ext/wasm/api/post-js-header.js b/ext/wasm/api/post-js-header.js index a543c14f3a..77e3cd227c 100644 --- a/ext/wasm/api/post-js-header.js +++ b/ext/wasm/api/post-js-header.js @@ -8,16 +8,16 @@ point the sqlite3 JS API bits will get set up. */ Module.runSQLite3PostLoadInit = function(EmscriptenModule/*the Emscripten-style module object*/){ - /** ^^^ As don't use Module.postRun, as that runs a different time + /** ^^^ Don't use Module.postRun, as that runs a different time depending on whether this file is built with emcc 3.1.x or 4.0.x. This function name is intentionally obnoxiously verbose to ensure that we don't collide with current and future Emscripten symbol names. */ 'use strict'; - //console.warn("This is the start of the Module.postRun handler."); + //console.warn("This is the start of Module.runSQLite3PostLoadInit()"); /* This function will contain at least the following: - - post-js-header.js (this file) + - post-js-header.js => this file - sqlite3-api-prologue.js => Bootstrapping bits to attach the rest to - common/whwasmutil.js => Replacements for much of Emscripten's glue - jaccwabyt/jaccwabyt.js => Jaccwabyt (C/JS struct binding) @@ -26,8 +26,8 @@ Module.runSQLite3PostLoadInit = function(EmscriptenModule/*the Emscripten-style - sqlite3-api-worker1.js => Worker-based API - sqlite3-vfs-helper.c-pp.js => Utilities for VFS impls - sqlite3-vtab-helper.c-pp.js => Utilities for virtual table impls - - sqlite3-vfs-opfs.c-pp.js => OPFS VFS + - sqlite3-vfs-opfs.c-pp.js => OPFS VFS - sqlite3-vfs-opfs-sahpool.c-pp.js => OPFS SAHPool VFS - sqlite3-api-cleanup.js => final API cleanup - - post-js-footer.js => closes this postRun() function + - post-js-footer.js => closes this function */ diff --git a/ext/wasm/api/sqlite3-api-prologue.js b/ext/wasm/api/sqlite3-api-prologue.js index 277efa14ab..6b032be84d 100644 --- a/ext/wasm/api/sqlite3-api-prologue.js +++ b/ext/wasm/api/sqlite3-api-prologue.js @@ -12,12 +12,12 @@ This file is intended to be combined at build-time with other related code, most notably a header and footer which wraps this - whole file into an Emscripten Module.postRun()-style handler. The - sqlite3 JS API has no hard requirements on Emscripten and does not - expose any Emscripten APIs to clients. It is structured such that - its build can be tweaked to include it in arbitrary WASM - environments which can supply the necessary underlying features - (e.g. a POSIX file I/O layer). + whole file into a single callback which can be run after Emscripten + loads the corresponding WASM module. The sqlite3 JS API has no hard + requirements on Emscripten and does not expose any Emscripten APIs + to clients. It is structured such that its build can be tweaked to + include it in arbitrary WASM environments which can supply the + necessary underlying features (e.g. a POSIX file I/O layer). Main project home page: https://sqlite.org diff --git a/manifest b/manifest index c61d26c043..5332ffd8f1 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C JS:\sadd\sa\smechanism\sto\sthe\sWorker1\sexec\sAPI\sto\sfetch\sthe\slast_insert_rowid(),\sas\srequested\sin\s[forum:56bc35390183f5d5|forum\spost\s56bc353901]. -D 2025-02-09T02:41:35.084 +C wasm:\swhen\sbuilding\sin\s-O0\smode\s(typical\sdev\smode),\suse\s-sASSERTIONS=2,\selse\s-sASSERTIONS=0,\sin\sresponse\s[https://github.com/emscripten-core/emscripten/pull/23629/commits/7e3e35cbff9c5688eacb3cddc5045f872d744efd|Emscripten\scheckin\s7e3e35cbff9],\swhich\sadds\sassertions\sto\scheck\sfor\sthe\scondition\sreported\sin\s[https://github.com/emscripten-core/emscripten/issues/23420|Emscripten\sticket\s23420].\sUpdate\ssome\sunrelated\sJS-side\sinternal\sdocs. +D 2025-02-09T03:24:00.963 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d @@ -619,7 +619,7 @@ F ext/session/sqlite3session.c 52a680dbb03c4734748b215d95987fb4d95ab23baaf053a01 F ext/session/sqlite3session.h 683ccbf16e2c2521661fc4c1cf918ce57002039efbcabcd8097fa4bca569104b F ext/session/test_session.c 12e0a2c15fd60f92da4bb29c697c9177ff0c0dbcdc5129a54c47e999f147937a F ext/wasm/EXPORTED_FUNCTIONS.fiddle.in 27450c8b8c70875a260aca55435ec927068b34cef801a96205adb81bdcefc65c -F ext/wasm/GNUmakefile df23a3cb3bfb13f17fc76132a0127a89e2ad64f46b71efee9743929cfd52d441 +F ext/wasm/GNUmakefile 654f27c0735e83c63f541b1964ef0f57423ceb71b05146de90c56b2f534f7b3b F ext/wasm/README-dist.txt f01081a850ce38a56706af6b481e3a7878e24e42b314cfcd4b129f0f8427066a F ext/wasm/README.md b89605f65661cf35bf034ff6d43e448cc169b8017fc105d498e33b81218b482c F ext/wasm/SQLTester/GNUmakefile e0794f676d55819951bbfae45cc5e8d7818dc460492dc317ce7f0d2eca15caff @@ -635,12 +635,12 @@ F ext/wasm/api/README.md c64ec8e84449c069e0217706d9d7d31b3bd53627228b2ba0c3cddbd F ext/wasm/api/extern-post-js.c-pp.js 3fcd904f1204685dea84e5ae90d8b7e65a1dcebab1e838386d8328b74cce46c9 F ext/wasm/api/extern-pre-js.js cc61c09c7a24a07dbecb4c352453c3985170cec12b4e7e7e7a4d11d43c5c8f41 F ext/wasm/api/post-js-footer.js 365405929f41ca0e6d389ed8a8da3f3c93e11d3ef43a90ae151e37fa9f75bf41 -F ext/wasm/api/post-js-header.js 54b2b4294501b3866245cc94315a16f5424c0e87729d0fb610fba151593c6d26 +F ext/wasm/api/post-js-header.js 53740d824e5d9027eb1e6fd59e216abbd2136740ce260ea5f0699ff2acb0a701 F ext/wasm/api/pre-js.c-pp.js a614a2c82b12c4d96d8e3ba77330329efc53c4d56a8a7e60ade900f341866cfb F ext/wasm/api/sqlite3-api-cleanup.js 3ac1786e461ada63033143be8c3b00b26b939540661f3e839515bb92f2e35359 F ext/wasm/api/sqlite3-api-glue.c-pp.js 5c0209e6a28164b4c2c1a34b0bb4aee3b7b1a264988d7e71fac08b8ede5b7ae3 F ext/wasm/api/sqlite3-api-oo1.c-pp.js f3a8e2004c6625d17946c11f2fb32008be78bc5207bf746fc77d59848813225f -F ext/wasm/api/sqlite3-api-prologue.js 5ff913355b3144f1c9719d0406667fa6e13eb813c71ed7ce29440e2e65363e82 +F ext/wasm/api/sqlite3-api-prologue.js 9e7d89a2c0d02b8b2052a62757a89f1e7e4dbcc0d9cd3f2dafa896786954dad2 F ext/wasm/api/sqlite3-api-worker1.c-pp.js f646a65257973b8c4481f8a6a216370b85644f23e64b126e7ae113570587c0ab F ext/wasm/api/sqlite3-license-version-header.js 0c807a421f0187e778dc1078f10d2994b915123c1223fe752b60afdcd1263f89 F ext/wasm/api/sqlite3-opfs-async-proxy.js 3774befd97cd1a5e2895c8225a894aad946848c6d9b4028acc988b5d123475af @@ -2209,8 +2209,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P 16d307cc6c1e203900e7a2dc0730fc0e453946622a2114a07d64ebb99045cfbf -R 5520495f3ccea7918b4a343a7efb2785 +P c22c48360756b1c7e2f5a9c01aff799bc188e100d364931de0dc3686e5de57a9 +R 28b52c82e3748c1458cec26f6dc126a2 U stephan -Z 1bf6695082490bb2a22dcd9297477549 +Z f11611286d8691d31123798a11e49271 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index cfcb1b16c1..5585f98c01 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -c22c48360756b1c7e2f5a9c01aff799bc188e100d364931de0dc3686e5de57a9 +1f554610ba5d9d474ec4570bb7ca09125fd2cdfb4976530a4227cc6ebdf3a962 From e108f97256c2cc60f21edc171ccfcd5eebdf2865 Mon Sep 17 00:00:00 2001 From: stephan Date: Sun, 9 Feb 2025 04:16:01 +0000 Subject: [PATCH 069/194] wasm: add some build-time validation to ensure that the problem fixed in [65798c09a00662a3] does not recur. Ensure that files generated via mkwasmbuilds.c have the generated makefile as a dependency. FossilOrigin-Name: 55e01365946b3432e93da5c08200e476e2a134c98b963b4170e4dfae8408a005 --- ext/wasm/GNUmakefile | 6 +++--- ext/wasm/mkwasmbuilds.c | 23 +++++++++++++++++------ manifest | 15 ++++++++------- manifest.uuid | 2 +- 4 files changed, 29 insertions(+), 17 deletions(-) diff --git a/ext/wasm/GNUmakefile b/ext/wasm/GNUmakefile index e18ec074c6..c9852e389c 100644 --- a/ext/wasm/GNUmakefile +++ b/ext/wasm/GNUmakefile @@ -165,7 +165,7 @@ dir.wasmfs := $(dir.dout) MKDIR.bld := $(dir.tmp) $(MKDIR.bld): - -mkdir -p $@ $(dir.dout) + @mkdir -p $@ $(dir.dout) CLEAN_FILES += *~ $(dir.jacc)/*~ $(dir.api)/*~ $(dir.common)/*~ $(dir.fiddle)/*~ \ $(dir.fiddle-debug)/* $(dir.dout)/* $(dir.tmp)/* @@ -424,8 +424,8 @@ define SQLITE.CALL.C-PP.FILTER # $1 = Input file: c-pp -f $(1).js # $2 = Output file: c-pp -o $(2).js # $3 = optional c-pp -D... flags -$(2): $(1) $$(MAKEFILE) $$(bin.c-pp) - mkdir -p $$(dir $$@) +$(2): $(1) $$(MAKEFILE_LIST) $$(bin.c-pp) + @mkdir -p $$(dir $$@) $$(bin.c-pp) -f $(1) -o $$@ $(3) $(SQLITE.CALL.C-PP.FILTER.global) #CLEAN_FILES += $(2) endef diff --git a/ext/wasm/mkwasmbuilds.c b/ext/wasm/mkwasmbuilds.c index e762b572cd..91c03b6d42 100644 --- a/ext/wasm/mkwasmbuilds.c +++ b/ext/wasm/mkwasmbuilds.c @@ -151,7 +151,7 @@ static void mk_pre_post(const char *zName /* build name */, /* --pre-js=... */ pf("pre-js.js.%s-%s := $(dir.tmp)/pre-js.%s-%s.js\n", zNM, zNM); - pf("$(pre-js.js.%s-%s): $(MAKEFILE)\n", zNM); + pf("$(pre-js.js.%s-%s): $(MAKEFILE_LIST)\n", zNM); #if 1 pf("$(eval $(call SQLITE.CALL.C-PP.FILTER,$(pre-js.js.in),$(pre-js.js.%s-%s)," "$(c-pp.D.%s-%s)))\n", zNM, zNM); @@ -218,7 +218,7 @@ static void mk_fiddle(){ pf("fiddle-module.js%s := %s/fiddle-module.js\n", zTail, zDir); pf("fiddle-module.wasm%s := " "$(subst .js,.wasm,$(fiddle-module.js%s))\n", zTail, zTail); - pf("$(fiddle-module.js%s):%s $(MAKEFILE) $(MAKEFILE.fiddle) " + pf("$(fiddle-module.js%s):%s $(MAKEFILE_LIST) $(MAKEFILE.fiddle) " "$(EXPORTED_FUNCTIONS.fiddle) " "$(fiddle.cses) $(pre-post-fiddle-module-vanilla.deps) " "$(SOAP.js)\n", @@ -285,7 +285,7 @@ static void mk_lib_mode(const char *zName /* build name */, zApiJsOut, zCmppD); /* target zJsOut */ - pf("%s: %s $(MAKEFILE) $(sqlite3-wasm.cfiles) $(EXPORTED_FUNCTIONS.api) " + pf("%s: %s $(MAKEFILE_LIST) $(sqlite3-wasm.cfiles) $(EXPORTED_FUNCTIONS.api) " "$(pre-post-%s-%s.deps) " "$(sqlite3-api.ext.jses)" /* ^^^ maintenance reminder: we set these as deps so that they @@ -304,9 +304,10 @@ static void mk_lib_mode(const char *zName /* build name */, "\t\t$(cflags.%s) $(cflags.%s.%s) \\\n" "\t\t$(cflags.wasm_extra_init) $(sqlite3-wasm.cfiles)\n", zName, zNM); if( bIsEsm ){ - /* TODO? Replace this CALL with the corresponding makefile code. - ** OTOH, we also use this $(call) in the speedtest1-wasmfs build, - ** which is not part of the rules emitted by this program. */ + /* TODO? Replace this $(call) with the corresponding makefile + ** code. OTOH, we also use this $(call) in the speedtest1-wasmfs + ** build, which is not part of the rules emitted by this + ** program. */ pf("\t@$(call SQLITE.CALL.xJS.ESM-EXPORT-DEFAULT,1,%d)\n", 0==strcmp("sqlite3-wasmfs", zName) ? 1 : 0); } @@ -338,6 +339,16 @@ static void mk_lib_mode(const char *zName /* build name */, /* ^^^^^^ reminder: Mac/BSD sed has no -i flag */ zNM, zName); pf("\t@ls -la $@\n"); + if( 0==strcmp("bundler-friendly", zMode) ){ + /* Avoid a 3rd occurance of the bug fixed by 65798c09a00662a3, + ** which was (in two cases) caused by makefile refactoring and + ** not recognized until after a release was made with the broken + ** sqlite3-bundler-friendly.mjs: */ + pf("\t@if grep -e '^ *importScripts(' $@; " + "then echo 'ERROR: bug fixed in 65798c09a00662a3 has re-appeared'; " + "exit 1; fi;\n"); + } + }else{ pf("\t@ls -la %s $@\n", zWasmOut); } diff --git a/manifest b/manifest index 5332ffd8f1..1172e83ce6 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C wasm:\swhen\sbuilding\sin\s-O0\smode\s(typical\sdev\smode),\suse\s-sASSERTIONS=2,\selse\s-sASSERTIONS=0,\sin\sresponse\s[https://github.com/emscripten-core/emscripten/pull/23629/commits/7e3e35cbff9c5688eacb3cddc5045f872d744efd|Emscripten\scheckin\s7e3e35cbff9],\swhich\sadds\sassertions\sto\scheck\sfor\sthe\scondition\sreported\sin\s[https://github.com/emscripten-core/emscripten/issues/23420|Emscripten\sticket\s23420].\sUpdate\ssome\sunrelated\sJS-side\sinternal\sdocs. -D 2025-02-09T03:24:00.963 +C wasm:\sadd\ssome\sbuild-time\svalidation\sto\sensure\sthat\sthe\sproblem\sfixed\sin\s[65798c09a00662a3]\sdoes\snot\srecur.\sEnsure\sthat\sfiles\sgenerated\svia\smkwasmbuilds.c\shave\sthe\sgenerated\smakefile\sas\sa\sdependency. +D 2025-02-09T04:16:01.518 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d @@ -619,7 +619,7 @@ F ext/session/sqlite3session.c 52a680dbb03c4734748b215d95987fb4d95ab23baaf053a01 F ext/session/sqlite3session.h 683ccbf16e2c2521661fc4c1cf918ce57002039efbcabcd8097fa4bca569104b F ext/session/test_session.c 12e0a2c15fd60f92da4bb29c697c9177ff0c0dbcdc5129a54c47e999f147937a F ext/wasm/EXPORTED_FUNCTIONS.fiddle.in 27450c8b8c70875a260aca55435ec927068b34cef801a96205adb81bdcefc65c -F ext/wasm/GNUmakefile 654f27c0735e83c63f541b1964ef0f57423ceb71b05146de90c56b2f534f7b3b +F ext/wasm/GNUmakefile 06e0556e9840fd3d8870997025c2507ace9ba7bf11195f770295fc7947dfc1b5 F ext/wasm/README-dist.txt f01081a850ce38a56706af6b481e3a7878e24e42b314cfcd4b129f0f8427066a F ext/wasm/README.md b89605f65661cf35bf034ff6d43e448cc169b8017fc105d498e33b81218b482c F ext/wasm/SQLTester/GNUmakefile e0794f676d55819951bbfae45cc5e8d7818dc460492dc317ce7f0d2eca15caff @@ -680,7 +680,7 @@ F ext/wasm/index-dist.html 56132399702b15d70c474c3f1952541e25cb0922942868f70daf1 F ext/wasm/index.html e4bbffdb3d40eff12b3f9c7abedef91787e2935620b7f8d40f2c774b80ad8fa9 F ext/wasm/jaccwabyt/jaccwabyt.js 1264710db3cfbcb6887d95665b7aeba60c1126eaef789ca4cf1a4a17d5bc7f54 F ext/wasm/jaccwabyt/jaccwabyt.md 59a20df389abcc3606eb4eaea7fb7ba14504beb3e345dbea9b99a0618ba3bec8 -F ext/wasm/mkwasmbuilds.c 954fe4242e877aeb60de44070628f5215ff51e5d102db6e2cb7da8c21e9e3401 +F ext/wasm/mkwasmbuilds.c baf6636e139e2c1e3b56e8dc26073ec80f6d14ae1876b023985315f43ccf312b F ext/wasm/module-symbols.html dc476b403369b26a1a23773e13b80f41b9a49f0825e81435fe3600a7cfbbe337 F ext/wasm/scratchpad-wasmfs.html a3d7388f3c4b263676b58b526846e9d02dfcb4014ff29d3a5040935286af5b96 F ext/wasm/scratchpad-wasmfs.mjs 66034b9256b218de59248aad796760a1584c1dd842231505895eff00dbd57c63 @@ -2209,8 +2209,9 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P c22c48360756b1c7e2f5a9c01aff799bc188e100d364931de0dc3686e5de57a9 -R 28b52c82e3748c1458cec26f6dc126a2 +P 1f554610ba5d9d474ec4570bb7ca09125fd2cdfb4976530a4227cc6ebdf3a962 +Q +012b308b04e6a9e3acbb842317b01b4b91ac165b925918cf20c1f52d045a6ec0 +R 808b1c99ce5bd703201eda0df9bba093 U stephan -Z f11611286d8691d31123798a11e49271 +Z 6ac45fbba274f684a5ae3627af8e6a38 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 5585f98c01..f2651eae98 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -1f554610ba5d9d474ec4570bb7ca09125fd2cdfb4976530a4227cc6ebdf3a962 +55e01365946b3432e93da5c08200e476e2a134c98b963b4170e4dfae8408a005 From 63f49265244842f04ae40d14df0bc8b434ca85e1 Mon Sep 17 00:00:00 2001 From: stephan Date: Sun, 9 Feb 2025 04:38:56 +0000 Subject: [PATCH 070/194] configure: if the linker supports --out-implib, generate libsqlite3.X.a, where X is the platform's DLL file extension. Discussion in/around [forum:0c7fc097b2|forum post 0c7fc097b2]. FossilOrigin-Name: 6092b0b86bf93a3d58a83774b6d07ef9735e6c8a0f2ac2d0a6d263c2e9f1e3ca --- Makefile.in | 6 ++++-- autosetup/sqlite-config.tcl | 22 ++++++++++++++++++++++ main.mk | 2 +- manifest | 17 ++++++++--------- manifest.uuid | 2 +- 5 files changed, 36 insertions(+), 13 deletions(-) diff --git a/Makefile.in b/Makefile.in index f514046e00..b932f56e20 100644 --- a/Makefile.in +++ b/Makefile.in @@ -121,8 +121,10 @@ LDFLAGS.icu = @LDFLAGS_ICU@ CFLAGS.icu = @CFLAGS_ICU@ LDFLAGS.libsqlite3.soname = @LDFLAGS_LIBSQLITE3_SONAME@ # soname: see https://sqlite.org/src/forumpost/5a3b44f510df8ded -LDFLAGS.libsqlite3.os-specific = @LDFLAGS_MAC_CVERSION@ -# os-specific: see https://sqlite.org/forum/forumpost/9dfd5b8fd525a5d7 +LDFLAGS.libsqlite3.os-specific = @LDFLAGS_MAC_CVERSION@ @LDFLAGS_OUT_IMPLIB@ +# os-specific: see +# - https://sqlite.org/forum/forumpost/9dfd5b8fd525a5d7 +# - https://sqlite.org/forum/forumpost/0c7fc097b2 ENABLE_SHARED = @ENABLE_SHARED@ ENABLE_STATIC = @ENABLE_STATIC@ HAVE_WASI_SDK = @HAVE_WASI_SDK@ diff --git a/autosetup/sqlite-config.tcl b/autosetup/sqlite-config.tcl index 2a73548662..f1888084e4 100644 --- a/autosetup/sqlite-config.tcl +++ b/autosetup/sqlite-config.tcl @@ -920,11 +920,33 @@ proc sqlite-check-mac-cversion {} { return $rc } +######################################################################## +# Define LDFLAGS_OUT_IMPLIB to either an empty string or to a +# -Wl,... flag for the platform-specific --out-implib flag, which is +# used for building an "import library .dll.a" file on some platforms +# (e.g. mingw). Returns 1 if supported, else 0. +# +# Added in response to: https://sqlite.org/forum/forumpost/0c7fc097b2 +proc sqlite-check-out-implib {} { + define LDFLAGS_OUT_IMPLIB "" + set rc 0 + cc-with {} { + set dll "libsqlite3[get-define TARGET_DLLEXT]" + set flags "-Wl,--out-implib,${dll}.a" + if {[cc-check-flags $flags]} { + define LDFLAGS_OUT_IMPLIB $flags + set rc 1 + } + } + return $rc +} + ######################################################################## # Performs late-stage config steps common to both the canonical and # autoconf bundle builds. proc sqlite-common-late-stage-config {} { sqlite-check-mac-cversion + sqlite-check-out-implib sqlite-process-dot-in-files sqlite-post-config-validation } diff --git a/main.mk b/main.mk index 27b8848879..f5d8185f71 100644 --- a/main.mk +++ b/main.mk @@ -2332,7 +2332,7 @@ tidy: tidy-. rm -f lemon$(B.exe) sqlite*.tar.gz rm -f mkkeywordhash$(B.exe) mksourceid$(B.exe) rm -f parse.* fts5parse.* - rm -f $(libsqlite3.SO) $(libsqlite3.LIB) $(libtclsqlite3.SO) + rm -f $(libsqlite3.SO) $(libsqlite3.LIB) $(libtclsqlite3.SO) libsqlite3$(T.dll).a rm -f tclsqlite3$(T.exe) $(TESTPROGS) rm -f LogEst$(T.exe) fts3view$(T.exe) rollback-test$(T.exe) showdb$(T.exe) rm -f showjournal$(T.exe) showstat4$(T.exe) showwal$(T.exe) speedtest1$(T.exe) diff --git a/manifest b/manifest index 1172e83ce6..ea5197a572 100644 --- a/manifest +++ b/manifest @@ -1,9 +1,9 @@ -C wasm:\sadd\ssome\sbuild-time\svalidation\sto\sensure\sthat\sthe\sproblem\sfixed\sin\s[65798c09a00662a3]\sdoes\snot\srecur.\sEnsure\sthat\sfiles\sgenerated\svia\smkwasmbuilds.c\shave\sthe\sgenerated\smakefile\sas\sa\sdependency. -D 2025-02-09T04:16:01.518 +C configure:\sif\sthe\slinker\ssupports\s--out-implib,\sgenerate\slibsqlite3.X.a,\swhere\sX\sis\sthe\splatform's\sDLL\sfile\sextension.\sDiscussion\sin/around\s[forum:0c7fc097b2|forum\spost\s0c7fc097b2]. +D 2025-02-09T04:38:56.042 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d -F Makefile.in 85ed87882b5d3fd11e6403212f2120e5e07d341bc96a101cfa9475901edd0754 +F Makefile.in 63c4d6e535dac4b7f6a6ffa566c96e3d68fa7f244799c38ee1e3d59305c5b55b F Makefile.linux-generic bd3e3cacd369821a6241d4ea1967395c962dfe3057e38cb0a435cee0e8b789d0 F Makefile.msc a9b95ae9807e17f9b0734ebe97d68032141c3f95286bb64593cb73b206f043cf F README.md c3c0f19532ce28f6297a71870f3c7b424729f0e6d9ab889616d3587dd2332159 @@ -50,7 +50,7 @@ F autosetup/cc.tcl c0fcc50ca91deff8741e449ddad05bcd08268bc31177e613a6343bbd1fd3e F autosetup/jimsh0.c 6573f6bc6ff204de0139692648d7037ca0b6c067bac83a7b4e087f20a86866a4 F autosetup/pkg-config.tcl 4e635bf39022ff65e0d5434339dd41503ea48fc53822c9c5bde88b02d3d952ba F autosetup/proj.tcl af5290ee128ce82dd178a474a9dcfaa7e503c88f0709d916cc6079d9b8c801f4 -F autosetup/sqlite-config.tcl d2c6467c557ec0437f2115e94fbe7a77af2d3e6d34b98b8ad85212f5cb890332 +F autosetup/sqlite-config.tcl 6bff327462d34d2d9fe45738b0be70b80cf709de91b8c3b8a921cbdc2f05f6ff F autosetup/system.tcl 51d4be76cd9a9074704b584e5c9cbba616202c8468cf9ba8a4f8294a7ab1dba9 F configure 9a00b21dfd13757bbfb8d89b30660a89ec1f8f3a79402b8f9f9b6fc475c3303a x F contrib/sqlitecon.tcl 210a913ad63f9f991070821e599d600bd913e0ad @@ -702,7 +702,7 @@ F ext/wasm/tests/opfs/concurrency/test.js d08889a5bb6e61937d0b8cbb78c9efbefbf65a F ext/wasm/tests/opfs/concurrency/worker.js 0a8c1a3e6ebb38aabbee24f122693f1fb29d599948915c76906681bb7da1d3d2 F ext/wasm/wasmfs.make 68999f5bd8c489239592d59a420f8c627c99169bbd6fa16a404751f757b9f702 F magic.txt 5ade0bc977aa135e79e3faaea894d5671b26107cc91e70783aa7dc83f22f3ba0 -F main.mk 0e3695222412c9388d8e7db612249cd0cd02722c62a16c48be7c77a7639628a8 +F main.mk 7c9df07a41c406a5fbe4e7e4021f29fa4f18821d61354721fd0435fc24f95321 F mptest/config01.test 3c6adcbc50b991866855f1977ff172eb6d901271 F mptest/config02.test 4415dfe36c48785f751e16e32c20b077c28ae504 F mptest/crash01.test 61e61469e257df0850df4293d7d4d6c2af301421 @@ -2209,9 +2209,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P 1f554610ba5d9d474ec4570bb7ca09125fd2cdfb4976530a4227cc6ebdf3a962 -Q +012b308b04e6a9e3acbb842317b01b4b91ac165b925918cf20c1f52d045a6ec0 -R 808b1c99ce5bd703201eda0df9bba093 +P 55e01365946b3432e93da5c08200e476e2a134c98b963b4170e4dfae8408a005 +R e1eadfc29a299ad14b7e6250e28c0f67 U stephan -Z 6ac45fbba274f684a5ae3627af8e6a38 +Z 4dcc7ba8a1a116665e01ae1e0e3cb31a # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index f2651eae98..474bb40f6f 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -55e01365946b3432e93da5c08200e476e2a134c98b963b4170e4dfae8408a005 +6092b0b86bf93a3d58a83774b6d07ef9735e6c8a0f2ac2d0a6d263c2e9f1e3ca From 79d0aa6f56dfdbe2acdc682ba9ebe1deb87fe438 Mon Sep 17 00:00:00 2001 From: stephan Date: Sun, 9 Feb 2025 05:30:47 +0000 Subject: [PATCH 071/194] Apply [6092b0b8] to autoconf/Makefile.in. FossilOrigin-Name: 9ae245cff49716e4c0bbd3fbb3f82276e5fb54d595d1e1d9a452edef45d7740f --- autoconf/Makefile.in | 6 ++++-- manifest | 12 ++++++------ manifest.uuid | 2 +- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/autoconf/Makefile.in b/autoconf/Makefile.in index b41c03e76c..1677c751ee 100644 --- a/autoconf/Makefile.in +++ b/autoconf/Makefile.in @@ -126,8 +126,10 @@ OPT_FEATURE_FLAGS = @OPT_FEATURE_FLAGS@ LDFLAGS.libsqlite3.soname = @LDFLAGS_LIBSQLITE3_SONAME@ # soname: see https://sqlite.org/src/forumpost/5a3b44f510df8ded -LDFLAGS.libsqlite3.os-specific = @LDFLAGS_MAC_CVERSION@ -# os-specific: see https://sqlite.org/forum/forumpost/9dfd5b8fd525a5d7 +LDFLAGS.libsqlite3.os-specific = @LDFLAGS_MAC_CVERSION@ @LDFLAGS_OUT_IMPLIB@ +# os-specific: see +# - https://sqlite.org/forum/forumpost/9dfd5b8fd525a5d7 +# - https://sqlite.org/forum/forumpost/0c7fc097b2 LDFLAGS.libsqlite3 = \ $(LDFLAGS.rpath) $(LDFLAGS.pthread) \ diff --git a/manifest b/manifest index ea5197a572..1a5a36f8ee 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C configure:\sif\sthe\slinker\ssupports\s--out-implib,\sgenerate\slibsqlite3.X.a,\swhere\sX\sis\sthe\splatform's\sDLL\sfile\sextension.\sDiscussion\sin/around\s[forum:0c7fc097b2|forum\spost\s0c7fc097b2]. -D 2025-02-09T04:38:56.042 +C Apply\s[6092b0b8]\sto\sautoconf/Makefile.in. +D 2025-02-09T05:30:47.201 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d @@ -16,7 +16,7 @@ F art/sqlite370.jpg d512473dae7e378a67e28ff96a34da7cb331def2 F art/sqlite370.svg 40b7e2fe8aac3add5d56dd86ab8d427a4eca5bcb3fe4f8946cb3794e1821d531 F auto.def fdd6965e06bce02a8b9f9ed57a52d05bcbec4b56e4bef2174866bb5713c65fda F autoconf/Makefile.fallback 22fe523eb36dfce31e0f6349f782eb084e86a5620b2b0b4f84a2d6133f53f5ac -F autoconf/Makefile.in ee765abbb5de7281932f8ea14123cd5a854a05cab692f39626af89a371bee81f +F autoconf/Makefile.in 916e354c3d3b1169daff2053c299f38e41cf4205abfbbd432a9bd544d1f9ca31 F autoconf/Makefile.msc 0a071367537dc395285a5d624ac4f99f3a387b27cc5e89752423c0499e15aec4 F autoconf/README.first f1d3876e9a7852c22f275a6f06814e64934cecbc0b5b9617d64849094c1fd136 F autoconf/README.txt 7f01dc3915e2d68f329011073662369e62a0938a2c69398807823c57591cb288 @@ -2209,8 +2209,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P 55e01365946b3432e93da5c08200e476e2a134c98b963b4170e4dfae8408a005 -R e1eadfc29a299ad14b7e6250e28c0f67 +P 6092b0b86bf93a3d58a83774b6d07ef9735e6c8a0f2ac2d0a6d263c2e9f1e3ca +R 8546c978240013284036f5addd99955c U stephan -Z 4dcc7ba8a1a116665e01ae1e0e3cb31a +Z bd5a02db20f1b0dda736d80da15a42fa # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 474bb40f6f..0491610ca3 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -6092b0b86bf93a3d58a83774b6d07ef9735e6c8a0f2ac2d0a6d263c2e9f1e3ca +9ae245cff49716e4c0bbd3fbb3f82276e5fb54d595d1e1d9a452edef45d7740f From b85b7f257dc760768172c30d5b8d442737d7dec9 Mon Sep 17 00:00:00 2001 From: stephan Date: Sun, 9 Feb 2025 05:37:25 +0000 Subject: [PATCH 072/194] Update the 'clean' rules for autoconf/Makefile.in to account for [6092b0b8]. FossilOrigin-Name: f3a35fdc9113ad5f1fed6a2f474aee670e1793d355475a7971d376bf33823cc4 --- autoconf/Makefile.in | 2 +- manifest | 12 ++++++------ manifest.uuid | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/autoconf/Makefile.in b/autoconf/Makefile.in index 1677c751ee..16e60879ea 100644 --- a/autoconf/Makefile.in +++ b/autoconf/Makefile.in @@ -221,7 +221,7 @@ install: install-man1 clean: rm -f *.o sqlite3$(T.exe) - rm -f $(libsqlite3.LIB) $(libsqlite3.SO) + rm -f $(libsqlite3.LIB) $(libsqlite3.SO) $(libsqlite3.SO).a distclean: clean rm -f jimsh0$(T.exe) config.* sqlite3.pc diff --git a/manifest b/manifest index 1a5a36f8ee..da0b642c00 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Apply\s[6092b0b8]\sto\sautoconf/Makefile.in. -D 2025-02-09T05:30:47.201 +C Update\sthe\s'clean'\srules\sfor\sautoconf/Makefile.in\sto\saccount\sfor\s[6092b0b8]. +D 2025-02-09T05:37:25.111 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d @@ -16,7 +16,7 @@ F art/sqlite370.jpg d512473dae7e378a67e28ff96a34da7cb331def2 F art/sqlite370.svg 40b7e2fe8aac3add5d56dd86ab8d427a4eca5bcb3fe4f8946cb3794e1821d531 F auto.def fdd6965e06bce02a8b9f9ed57a52d05bcbec4b56e4bef2174866bb5713c65fda F autoconf/Makefile.fallback 22fe523eb36dfce31e0f6349f782eb084e86a5620b2b0b4f84a2d6133f53f5ac -F autoconf/Makefile.in 916e354c3d3b1169daff2053c299f38e41cf4205abfbbd432a9bd544d1f9ca31 +F autoconf/Makefile.in f706b48abb13553ecc5034d5fc296d424fd36d73c222285b7590004dec508925 F autoconf/Makefile.msc 0a071367537dc395285a5d624ac4f99f3a387b27cc5e89752423c0499e15aec4 F autoconf/README.first f1d3876e9a7852c22f275a6f06814e64934cecbc0b5b9617d64849094c1fd136 F autoconf/README.txt 7f01dc3915e2d68f329011073662369e62a0938a2c69398807823c57591cb288 @@ -2209,8 +2209,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P 6092b0b86bf93a3d58a83774b6d07ef9735e6c8a0f2ac2d0a6d263c2e9f1e3ca -R 8546c978240013284036f5addd99955c +P 9ae245cff49716e4c0bbd3fbb3f82276e5fb54d595d1e1d9a452edef45d7740f +R cdceaad430550f7ec94e5d96f00f7ab4 U stephan -Z bd5a02db20f1b0dda736d80da15a42fa +Z 4725199d04d2eeff317384520a0a53f5 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 0491610ca3..f76b8288c0 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -9ae245cff49716e4c0bbd3fbb3f82276e5fb54d595d1e1d9a452edef45d7740f +f3a35fdc9113ad5f1fed6a2f474aee670e1793d355475a7971d376bf33823cc4 From 3bdebaeabb4266be82ad1ab06fd5e901f5dcba72 Mon Sep 17 00:00:00 2001 From: drh <> Date: Sun, 9 Feb 2025 19:49:46 +0000 Subject: [PATCH 073/194] Performance and size optimization for the sqlite3ColumnIndex() routine. FossilOrigin-Name: a93e3fe0ee8f98a7ec0dfb2e1abf432cc9d5f9d3ad345b5db261475215d43df9 --- manifest | 16 ++++++++-------- manifest.uuid | 2 +- src/build.c | 3 +-- src/select.c | 25 +++++++++++++------------ 4 files changed, 23 insertions(+), 23 deletions(-) diff --git a/manifest b/manifest index da0b642c00..4b5d165af9 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Update\sthe\s'clean'\srules\sfor\sautoconf/Makefile.in\sto\saccount\sfor\s[6092b0b8]. -D 2025-02-09T05:37:25.111 +C Performance\sand\ssize\soptimization\sfor\sthe\ssqlite3ColumnIndex()\sroutine. +D 2025-02-09T19:49:46.297 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d @@ -722,7 +722,7 @@ F src/btmutex.c 79a43670447eacc651519a429f6ece9fd638563cf95b469d6891185ddae2b522 F src/btree.c 63ca6b647342e8cef643863cd0962a542f133e1069460725ba4461dcda92b03c F src/btree.h 18e5e7b2124c23426a283523e5f31a4bff029131b795bb82391f9d2f3136fc50 F src/btreeInt.h 98aadb6dcb77b012cab2574d6a728fad56b337fc946839b9898c4b4c969e30b6 -F src/build.c 83c43ddb517a15673d1dc17f88ea8cd1db06e0d277e6dc666ac8985017a99ac5 +F src/build.c 602fc45ea6301a3dc03ec20a9f9b294c492b7e1766ae96651f2ba8044dc445a6 F src/callback.c acae8c8dddda41ee85cfdf19b926eefe830f371069f8aadca3aa39adf5b1c859 F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e F src/ctime.c d35723024b963edce9c0fad5b3303e8bb9266083784844baed10a6dedfe26f3b @@ -780,7 +780,7 @@ F src/printf.c 96f7f8baeedc7639da94e4e7a4a2c200e2537c4eec9e5e1c2ffc821f40eb3105 F src/random.c 606b00941a1d7dd09c381d3279a058d771f406c5213c9932bbd93d5587be4b9c F src/resolve.c 626c24b258b111f75c22107aa5614ad89810df3026f5ca071116d3fe75925c75 F src/rowset.c 8432130e6c344b3401a8874c3cb49fefe6873fec593294de077afea2dce5ec97 -F src/select.c 5c8ac3f0b7dd72745719f0137119a6f9016a9c2633a7351ef11c00a43b4c0944 +F src/select.c 57893cc8b099f231f7ed5b84faff14841f2aabb4776e32e17fae00aeae0a8993 F src/shell.c.in b377a59822f207106424f08aead37e78b609222e98f86f04cc8a03563ccf3237 F src/sqlite.h.in d2902f13ace94d3d3609646bd6d12a2d7a4f6cbdf6a5a4097580ac305f54c3f0 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8 @@ -2209,8 +2209,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P 9ae245cff49716e4c0bbd3fbb3f82276e5fb54d595d1e1d9a452edef45d7740f -R cdceaad430550f7ec94e5d96f00f7ab4 -U stephan -Z 4725199d04d2eeff317384520a0a53f5 +P f3a35fdc9113ad5f1fed6a2f474aee670e1793d355475a7971d376bf33823cc4 +R 07cb4b330390fc770f5d5e73fded3930 +U drh +Z 8439106cb5dd02e83a92bb726a395093 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index f76b8288c0..bd2f91ec8d 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -f3a35fdc9113ad5f1fed6a2f474aee670e1793d355475a7971d376bf33823cc4 +a93e3fe0ee8f98a7ec0dfb2e1abf432cc9d5f9d3ad345b5db261475215d43df9 diff --git a/src/build.c b/src/build.c index 7b80425291..8f64d5ec30 100644 --- a/src/build.c +++ b/src/build.c @@ -1526,8 +1526,7 @@ void sqlite3AddColumn(Parse *pParse, Token sName, Token sType){ memcpy(z, sName.z, sName.n); z[sName.n] = 0; sqlite3Dequote(z); - i = sqlite3ColumnIndex(p, z); - if( i>=0 ){ + if( p->nCol && sqlite3ColumnIndex(p, z)>=0 ){ sqlite3ErrorMsg(pParse, "duplicate column name: %s", z); sqlite3DbFree(db, z); return; diff --git a/src/select.c b/src/select.c index e848c46a39..e47a9b6be2 100644 --- a/src/select.c +++ b/src/select.c @@ -320,31 +320,32 @@ int sqlite3JoinType(Parse *pParse, Token *pA, Token *pB, Token *pC){ int sqlite3ColumnIndex(Table *pTab, const char *zCol){ int i; u8 h; - Column *pCol; + const Column *aCol; + int nCol; - if( pTab->nCol==0 ){ - return -1; - } h = sqlite3StrIHash(zCol); + aCol = pTab->aCol; + nCol = pTab->nCol; + /* See if the aHx gives us a lucky match */ i = pTab->aHx[h % sizeof(pTab->aHx)]; - assert( inCol ); - if( pTab->aCol[i].hName==h - && sqlite3StrICmp(pTab->aCol[i].zCnName, zCol)==0 + assert( iaCol; + + /* No lucky match from the hash table. Do a full search. */ i = 0; while( 1 /*exit-by-break*/ ){ - if( pCol->hName==h - && sqlite3StrICmp(pCol->zCnName, zCol)==0 + if( aCol[i].hName==h + && sqlite3StrICmp(aCol[i].zCnName, zCol)==0 ){ return i; } i++; - if( i>=pTab->nCol ) break; - pCol++; + if( i>=nCol ) break; } return -1; } From 3efac4aa782fa58857de1018152305e3d7a7c3eb Mon Sep 17 00:00:00 2001 From: drh <> Date: Sun, 9 Feb 2025 20:23:29 +0000 Subject: [PATCH 074/194] Performance optimization to the substr() SQL function. FossilOrigin-Name: ce228ce3d0132ad758b5b7464fcf22ae5976df3c02ec948280cc76290c79ed0b --- manifest | 12 ++++++------ manifest.uuid | 2 +- src/func.c | 25 ++++++++++++------------- 3 files changed, 19 insertions(+), 20 deletions(-) diff --git a/manifest b/manifest index 4b5d165af9..98df1c108a 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Performance\sand\ssize\soptimization\sfor\sthe\ssqlite3ColumnIndex()\sroutine. -D 2025-02-09T19:49:46.297 +C Performance\soptimization\sto\sthe\ssubstr()\sSQL\sfunction. +D 2025-02-09T20:23:29.902 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d @@ -733,7 +733,7 @@ F src/delete.c 03a77ba20e54f0f42ebd8eddf15411ed6bdb06a2c472ac4b6b336521bf7cea42 F src/expr.c 15fabfb67261e298a39fe61457f3cfa24148d9ca8d02f4dff385feb5cf523ea7 F src/fault.c 460f3e55994363812d9d60844b2a6de88826e007 F src/fkey.c 928ed2517e8732113d2b9821aa37af639688d752f4ea9ac6e0e393d713eeb76f -F src/func.c 0712a5b03fdfc8af0cda6d076bfe231b66388d3d5a28b46dc1a94b90d41cac6a +F src/func.c b2fb33139972d7d65640b27ea962a49f1616265428001090cab39fcf270228e1 F src/global.c a19e4b1ca1335f560e9560e590fc13081e21f670643367f99cb9e8f9dc7d615b F src/hash.c 73934a7f7ab1cb110614a9388cb516893b0cf5b7b69e4fd1a0780ac4ce166be7 F src/hash.h 46b92795a95bfefb210f52f0c316e9d7cdbcdd7e7fcfb0d8be796d3a5767cddf @@ -2209,8 +2209,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P f3a35fdc9113ad5f1fed6a2f474aee670e1793d355475a7971d376bf33823cc4 -R 07cb4b330390fc770f5d5e73fded3930 +P a93e3fe0ee8f98a7ec0dfb2e1abf432cc9d5f9d3ad345b5db261475215d43df9 +R 6458c5e9c4d2d7940a949acd5df2c6a3 U drh -Z 8439106cb5dd02e83a92bb726a395093 +Z 384512ae3dd3c9dcc3fa9d0daadac731 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index bd2f91ec8d..468eacb582 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -a93e3fe0ee8f98a7ec0dfb2e1abf432cc9d5f9d3ad345b5db261475215d43df9 +ce228ce3d0132ad758b5b7464fcf22ae5976df3c02ec948280cc76290c79ed0b diff --git a/src/func.c b/src/func.c index e8cd174e42..52462b4682 100644 --- a/src/func.c +++ b/src/func.c @@ -356,11 +356,6 @@ static void substrFunc( i64 p1, p2; assert( argc==3 || argc==2 ); - if( sqlite3_value_type(argv[1])==SQLITE_NULL - || (argc==3 && sqlite3_value_type(argv[2])==SQLITE_NULL) - ){ - return; - } p0type = sqlite3_value_type(argv[0]); p1 = sqlite3_value_int64(argv[1]); if( p0type==SQLITE_BLOB ){ @@ -378,19 +373,23 @@ static void substrFunc( } } } -#ifdef SQLITE_SUBSTR_COMPATIBILITY - /* If SUBSTR_COMPATIBILITY is defined then substr(X,0,N) work the same as - ** as substr(X,1,N) - it returns the first N characters of X. This - ** is essentially a back-out of the bug-fix in check-in [5fc125d362df4b8] - ** from 2009-02-02 for compatibility of applications that exploited the - ** old buggy behavior. */ - if( p1==0 ) p1 = 1; /* */ -#endif if( argc==3 ){ p2 = sqlite3_value_int64(argv[2]); + if( p2==0 && sqlite3_value_type(argv[2])==SQLITE_NULL ) return; }else{ p2 = sqlite3_context_db_handle(context)->aLimit[SQLITE_LIMIT_LENGTH]; } + if( p1==0 ){ +#ifdef SQLITE_SUBSTR_COMPATIBILITY + /* If SUBSTR_COMPATIBILITY is defined then substr(X,0,N) work the same as + ** as substr(X,1,N) - it returns the first N characters of X. This + ** is essentially a back-out of the bug-fix in check-in [5fc125d362df4b8] + ** from 2009-02-02 for compatibility of applications that exploited the + ** old buggy behavior. */ + p1 = 1; /* */ +#endif + if( sqlite3_value_type(argv[1])==SQLITE_NULL ) return; + } if( p1<0 ){ p1 += len; if( p1<0 ){ From 93df8109fc188b35968fa3a4d51400866399fd7c Mon Sep 17 00:00:00 2001 From: drh <> Date: Mon, 10 Feb 2025 00:20:50 +0000 Subject: [PATCH 075/194] Small performance increase in jsonTranslateBlobToText(). FossilOrigin-Name: 3b1dcac2eeaf5f97450919f2a6eed74a4d54fb2b812bdb4a580f79d075e99dfe --- manifest | 12 ++++++------ manifest.uuid | 2 +- src/json.c | 9 ++++++--- 3 files changed, 13 insertions(+), 10 deletions(-) diff --git a/manifest b/manifest index 98df1c108a..ac641f9971 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Performance\soptimization\sto\sthe\ssubstr()\sSQL\sfunction. -D 2025-02-09T20:23:29.902 +C Small\sperformance\sincrease\sin\sjsonTranslateBlobToText(). +D 2025-02-10T00:20:50.032 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d @@ -740,7 +740,7 @@ F src/hash.h 46b92795a95bfefb210f52f0c316e9d7cdbcdd7e7fcfb0d8be796d3a5767cddf F src/hwtime.h f9c2dfb84dce7acf95ce6d289e46f5f9d3d1afd328e53da8f8e9008e3b3caae6 F src/in-operator.md 10cd8f4bcd225a32518407c2fb2484089112fd71 F src/insert.c 05e04ef637cbc0dccb9a5c5d188a5a2608891e554c8ec17c7a71afe2cf896a06 -F src/json.c 68a98c020c22127f2d65f08855f7fc7460ff352a6ce0b543d8931dde83319c22 +F src/json.c 50d0032812673d304b66fa7c2dbc86207e7e78505c69d85521c762f52ac37329 F src/legacy.c d7874bc885906868cd51e6c2156698f2754f02d9eee1bae2d687323c3ca8e5aa F src/loadext.c 7432c944ff197046d67a1207790a1b13eec4548c85a9457eb0896bb3641dfb36 F src/main.c b99d15d843f7a86adbec855de77b1656dde07359722ef63a9d9393678dbb58d1 @@ -2209,8 +2209,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P a93e3fe0ee8f98a7ec0dfb2e1abf432cc9d5f9d3ad345b5db261475215d43df9 -R 6458c5e9c4d2d7940a949acd5df2c6a3 +P ce228ce3d0132ad758b5b7464fcf22ae5976df3c02ec948280cc76290c79ed0b +R 121930a1cd26bde82bd8ad52b6e51587 U drh -Z 384512ae3dd3c9dcc3fa9d0daadac731 +Z f5ec5ef9a94161cf3474a090fcd2095c # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 468eacb582..afadd4872d 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -ce228ce3d0132ad758b5b7464fcf22ae5976df3c02ec948280cc76290c79ed0b +3b1dcac2eeaf5f97450919f2a6eed74a4d54fb2b812bdb4a580f79d075e99dfe diff --git a/src/json.c b/src/json.c index a0a075e66c..2517f6c31c 100644 --- a/src/json.c +++ b/src/json.c @@ -2199,9 +2199,12 @@ static u32 jsonTranslateBlobToText( } case JSONB_TEXT: case JSONB_TEXTJ: { - jsonAppendChar(pOut, '"'); - jsonAppendRaw(pOut, (const char*)&pParse->aBlob[i+n], sz); - jsonAppendChar(pOut, '"'); + if( pOut->nUsed+sz+2<=pOut->nAlloc || jsonStringGrow(pOut, sz+2)==0 ){ + pOut->zBuf[pOut->nUsed] = '"'; + memcpy(pOut->zBuf+pOut->nUsed+1,(const char*)&pParse->aBlob[i+n],sz); + pOut->zBuf[pOut->nUsed+sz+1] = '"'; + pOut->nUsed += sz+2; + } break; } case JSONB_TEXT5: { From a0d35d44e4382e761943b263b9183234d44f1f0b Mon Sep 17 00:00:00 2001 From: drh <> Date: Mon, 10 Feb 2025 11:16:37 +0000 Subject: [PATCH 076/194] Convert some expensive NEVER() and ASSERT() macros into assert()s. FossilOrigin-Name: 4aad891802d9d87f1ff3cbbf4bc70fa242c6782088189a2bd5d6f8863f552d29 --- manifest | 16 ++++++++-------- manifest.uuid | 2 +- src/json.c | 9 +++------ src/util.c | 6 +++++- src/vdbemem.c | 2 +- 5 files changed, 18 insertions(+), 17 deletions(-) diff --git a/manifest b/manifest index ac641f9971..7ca924c8b2 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Small\sperformance\sincrease\sin\sjsonTranslateBlobToText(). -D 2025-02-10T00:20:50.032 +C Convert\ssome\sexpensive\sNEVER()\sand\sASSERT()\smacros\sinto\sassert()s. +D 2025-02-10T11:16:37.391 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d @@ -740,7 +740,7 @@ F src/hash.h 46b92795a95bfefb210f52f0c316e9d7cdbcdd7e7fcfb0d8be796d3a5767cddf F src/hwtime.h f9c2dfb84dce7acf95ce6d289e46f5f9d3d1afd328e53da8f8e9008e3b3caae6 F src/in-operator.md 10cd8f4bcd225a32518407c2fb2484089112fd71 F src/insert.c 05e04ef637cbc0dccb9a5c5d188a5a2608891e554c8ec17c7a71afe2cf896a06 -F src/json.c 50d0032812673d304b66fa7c2dbc86207e7e78505c69d85521c762f52ac37329 +F src/json.c 2663a0c7e574cb928de944720dcdcc11c931877d877549b8f1258a4002efd6f7 F src/legacy.c d7874bc885906868cd51e6c2156698f2754f02d9eee1bae2d687323c3ca8e5aa F src/loadext.c 7432c944ff197046d67a1207790a1b13eec4548c85a9457eb0896bb3641dfb36 F src/main.c b99d15d843f7a86adbec855de77b1656dde07359722ef63a9d9393678dbb58d1 @@ -847,7 +847,7 @@ F src/trigger.c da3c25786870d8bf97cd46b493374c2375d1abaf20a9b0f5f8629a3f2f2ce383 F src/update.c 3e5e7ff66fa19ebe4d1b113d480639a24cc1175adbefabbd1a948a07f28e37cf F src/upsert.c 215328c3f91623c520ec8672c44323553f12caeb4f01b1090ebdca99fdf7b4f1 F src/utf.c 8b29d9a5956569ea2700f869669b8ef67a9662ee5e724ff77ab3c387e27094ba -F src/util.c e5f6a5eeaa26b69054a43bbd0048cfe3d2851f6961052b35aed8f695df922850 +F src/util.c 9ff6470dabcf943fd796d2da766c98bd328c8f6fe036a31e5b338e628603f989 F src/vacuum.c b763b6457bd058d2072ef9364832351fd8d11e8abf70cbb349657360f7d55c40 F src/vdbe.c b98d86de7f0e6c02fb14e0e1ae8feab6aa84669d389771a848e23f59eb70dcad F src/vdbe.h 3d26d5c7660c5c7bd33ffb0d8784615072d8b23c81f8110870efe2631136bc89 @@ -855,7 +855,7 @@ F src/vdbeInt.h 078b1c15b26587b54c1c1879d0d2f4dec812b9de4c337fed9faf73fbcc3bf091 F src/vdbeapi.c 82fe278a7c71b653235c6f9fb5de0b5de589908dfcb011ba2a782e8becf06f86 F src/vdbeaux.c 541d3d232714455960eab4ed10b34cb48b4bcd565d7539ef31092f5e73648e6b F src/vdbeblob.c 9166b6eb7054e5da82e35255892fb1ed551355a4716452539e8e3ac14f25fbe3 -F src/vdbemem.c 977438546df236c6a3e7d8b4fe86c0643c13b89b00235db1f11c3a91a4796d30 +F src/vdbemem.c 4af21a948820259ced96e3d46d70f9af347afa2deb7cb60a8b3981d5748e4279 F src/vdbesort.c d0a3c7056c081703c8b6d91ad60f17da5e062a5c64bf568ed0fa1b5f4cae311f F src/vdbetrace.c fe0bc29ebd4e02c8bc5c1945f1d2e6be5927ec12c06d89b03ef2a4def34bf823 F src/vdbevtab.c fc46b9cbd759dc013f0b3724549cc0d71379183c667df3a5988f7e2f1bd485f3 @@ -2209,8 +2209,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P ce228ce3d0132ad758b5b7464fcf22ae5976df3c02ec948280cc76290c79ed0b -R 121930a1cd26bde82bd8ad52b6e51587 +P 3b1dcac2eeaf5f97450919f2a6eed74a4d54fb2b812bdb4a580f79d075e99dfe +R 47d7be136c4f4c146dd38f56c85a1064 U drh -Z f5ec5ef9a94161cf3474a090fcd2095c +Z 9dd82a4bb1074323ccd62faaa22b0ea3 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index afadd4872d..7692f2ba23 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -3b1dcac2eeaf5f97450919f2a6eed74a4d54fb2b812bdb4a580f79d075e99dfe +4aad891802d9d87f1ff3cbbf4bc70fa242c6782088189a2bd5d6f8863f552d29 diff --git a/src/json.c b/src/json.c index 2517f6c31c..47a9c875e7 100644 --- a/src/json.c +++ b/src/json.c @@ -2054,10 +2054,7 @@ static u32 jsonbPayloadSize(const JsonParse *pParse, u32 i, u32 *pSz){ u8 x; u32 sz; u32 n; - if( NEVER(i>pParse->nBlob) ){ - *pSz = 0; - return 0; - } + assert( i<=pParse->nBlob ); x = pParse->aBlob[i]>>4; if( x<=11 ){ sz = x; @@ -2101,8 +2098,8 @@ static u32 jsonbPayloadSize(const JsonParse *pParse, u32 i, u32 *pSz){ if( (i64)i+sz+n > pParse->nBlob && (i64)i+sz+n > pParse->nBlob-pParse->delta ){ - sz = 0; - n = 0; + *pSz = 0; + return 0; } *pSz = sz; return n; diff --git a/src/util.c b/src/util.c index ecce460e01..703ef0a23a 100644 --- a/src/util.c +++ b/src/util.c @@ -1130,7 +1130,11 @@ void sqlite3FpDecode(FpDecode *p, double r, int iRound, int mxRound){ } p->z = &p->zBuf[i+1]; assert( i+p->n < sizeof(p->zBuf) ); - while( ALWAYS(p->n>0) && p->z[p->n-1]=='0' ){ p->n--; } + assert( p->n>0 ); + while( p->z[p->n-1]=='0' ){ + p->n--; + assert( p->n>0 ); + } } /* diff --git a/src/vdbemem.c b/src/vdbemem.c index 38ba5abe80..61298d10ff 100644 --- a/src/vdbemem.c +++ b/src/vdbemem.c @@ -327,7 +327,7 @@ void sqlite3VdbeMemZeroTerminateIfAble(Mem *pMem){ return; } if( pMem->enc!=SQLITE_UTF8 ) return; - if( NEVER(pMem->z==0) ) return; + assert( pMem->z!=0 ); if( pMem->flags & MEM_Dyn ){ if( pMem->xDel==sqlite3_free && sqlite3_msize(pMem->z) >= (u64)(pMem->n+1) From 3ea05b5b4f219a0cadb5d573bf73c0818cee02cf Mon Sep 17 00:00:00 2001 From: stephan Date: Mon, 10 Feb 2025 15:01:14 +0000 Subject: [PATCH 077/194] configure: when dlopen() is not found, only fail fatally if --enable-loadable-module is explicitly provided, else warn instead. Based on discussion around [forum:2efe9c33bd9021ca|forum post 2efe9c33bd9021ca]. Update proj-indented-notice to behave like its docs say it should when the -error flag is used. FossilOrigin-Name: f28e52cbf9e80cb5a1cde7cba099e2c2b6787a77263796e4f9febf3f30bc99dc --- autosetup/proj.tcl | 7 ++++-- autosetup/sqlite-config.tcl | 47 +++++++++++++++++++++++++++++++------ manifest | 16 ++++++------- manifest.uuid | 2 +- 4 files changed, 54 insertions(+), 18 deletions(-) diff --git a/autosetup/proj.tcl b/autosetup/proj.tcl index 5eeec0afb9..6a1960f603 100644 --- a/autosetup/proj.tcl +++ b/autosetup/proj.tcl @@ -114,11 +114,13 @@ proc proj-bold {str} { # # If the -notice flag it used then it emits using [user-notice], which # means its rendering will (A) go to stderr and (B) be delayed until -# the next time autosetup goes to output a message. If -notice -# is not used, it will send the message to stdout without delay. +# the next time autosetup goes to output a message. # # If the -error flag is provided then it renders the message # immediately to stderr and then exits. +# +# If neither -notice nor -error are used, the message will be sent to +# stdout without delay. proc proj-indented-notice {args} { set fErr "" set outFunc "puts" @@ -126,6 +128,7 @@ proc proj-indented-notice {args} { switch -exact -- [lindex $args 0] { -error { set args [lassign $args fErr] + set outFunc "user-notice" } -notice { set args [lassign $args -] diff --git a/autosetup/sqlite-config.tcl b/autosetup/sqlite-config.tcl index f1888084e4..904c439e0b 100644 --- a/autosetup/sqlite-config.tcl +++ b/autosetup/sqlite-config.tcl @@ -855,20 +855,53 @@ proc sqlite-handle-icu {} { ######################################################################## -# Handles the --enable-load-extension flag. +# Handles the --enable-load-extension flag. Returns 1 if the support +# is enabled, else 0. If support for that feature is not found, a +# fatal error is triggered if --enable-load-extension is explicitly +# provided, else a loud warning is instead emited. If +# --disable-load-extension is used, no check is performed. +# +# Makes the following environment changes: +# +# - defines LDFLAGS_DLOPEN to any linker flags needed for this +# feature. It may legally be empty on some systems where dlopen() +# is in libc. +# +# - If the feature is not available, adds +# -DSQLITE_OMIT_LOAD_EXTENSION=1 to the feature flags list. proc sqlite-handle-load-extension {} { + define LDFLAGS_DLOPEN "" + set found 0 proj-if-opt-truthy load-extension { - if {[proj-check-function-in-lib dlopen dl]} { + set found [proj-check-function-in-lib dlopen dl] + if {$found} { define LDFLAGS_DLOPEN [get-define lib_dlopen] undefine lib_dlopen } else { - user-error "dlopen() not found. Use --disable-load-extension to bypass this check." + if {[proj-opt-was-provided load-extension]} { + # Explicit --enable-load-extension: fail if not found + proj-indented-notice -error { + --enable-load-extension was provided but dlopen() + not found. Use --disable-load-extension to bypass this + check. + } + } else { + # It was implicitly enabled: warn if not found + proj-indented-notice { + WARNING: dlopen() not found, so loadable module support will + be disabled. Use --disable-load-extension to bypass this + check. + } + } } - } { - define LDFLAGS_DLOPEN "" - sqlite-add-feature-flag {-DSQLITE_OMIT_LOAD_EXTENSION=1} - msg-result "Disabling loadable extensions." } + if {$found} { + msg-result "Loadable extension support enabled." + } else { + msg-result "Disabling loadable extension support. Use --enable-load-extensions to enable them." + sqlite-add-feature-flag {-DSQLITE_OMIT_LOAD_EXTENSION=1} + } + return $found } ######################################################################## diff --git a/manifest b/manifest index 7ca924c8b2..3221103887 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Convert\ssome\sexpensive\sNEVER()\sand\sASSERT()\smacros\sinto\sassert()s. -D 2025-02-10T11:16:37.391 +C configure:\swhen\sdlopen()\sis\snot\sfound,\sonly\sfail\sfatally\sif\s--enable-loadable-module\sis\sexplicitly\sprovided,\selse\swarn\sinstead.\sBased\son\sdiscussion\saround\s[forum:2efe9c33bd9021ca|forum\spost\s2efe9c33bd9021ca].\sUpdate\sproj-indented-notice\sto\sbehave\slike\sits\sdocs\ssay\sit\sshould\swhen\sthe\s-error\sflag\sis\sused. +D 2025-02-10T15:01:14.412 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d @@ -49,8 +49,8 @@ F autosetup/cc-shared.tcl 4f024e94a47f427ba61de1739f6381ef0080210f9fae89112d5c1d F autosetup/cc.tcl c0fcc50ca91deff8741e449ddad05bcd08268bc31177e613a6343bbd1fd3e45f F autosetup/jimsh0.c 6573f6bc6ff204de0139692648d7037ca0b6c067bac83a7b4e087f20a86866a4 F autosetup/pkg-config.tcl 4e635bf39022ff65e0d5434339dd41503ea48fc53822c9c5bde88b02d3d952ba -F autosetup/proj.tcl af5290ee128ce82dd178a474a9dcfaa7e503c88f0709d916cc6079d9b8c801f4 -F autosetup/sqlite-config.tcl 6bff327462d34d2d9fe45738b0be70b80cf709de91b8c3b8a921cbdc2f05f6ff +F autosetup/proj.tcl 42119a2e899e319b92f3159952b7ef7219c82cb45eeb636aaf8d909def8150f8 +F autosetup/sqlite-config.tcl 341c2751f42c6c8eeeae50bec13d2bb28db73ca2c8b9b97598332aed02e0a71b F autosetup/system.tcl 51d4be76cd9a9074704b584e5c9cbba616202c8468cf9ba8a4f8294a7ab1dba9 F configure 9a00b21dfd13757bbfb8d89b30660a89ec1f8f3a79402b8f9f9b6fc475c3303a x F contrib/sqlitecon.tcl 210a913ad63f9f991070821e599d600bd913e0ad @@ -2209,8 +2209,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P 3b1dcac2eeaf5f97450919f2a6eed74a4d54fb2b812bdb4a580f79d075e99dfe -R 47d7be136c4f4c146dd38f56c85a1064 -U drh -Z 9dd82a4bb1074323ccd62faaa22b0ea3 +P 4aad891802d9d87f1ff3cbbf4bc70fa242c6782088189a2bd5d6f8863f552d29 +R 0e46282cf2ae1fcf5877508517bc3bb3 +U stephan +Z 8b12a9b798d6d21e89b61eb16ecc7324 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 7692f2ba23..94b9a5b26c 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -4aad891802d9d87f1ff3cbbf4bc70fa242c6782088189a2bd5d6f8863f552d29 +f28e52cbf9e80cb5a1cde7cba099e2c2b6787a77263796e4f9febf3f30bc99dc From 9dfc2c61ec7125898dfdceab43fc5a83b87ebc7a Mon Sep 17 00:00:00 2001 From: stephan Date: Mon, 10 Feb 2025 15:58:22 +0000 Subject: [PATCH 078/194] Add jimsh.exe and jimsh0.exe to the clean rules in Makefile.msc so that stale builds of those files from msys2 and friends do not cause mysterious build errors. FossilOrigin-Name: 44b4e4db321815c6fc0327ed7b97df868833654411e882b70f54ad3f6d212987 --- Makefile.msc | 1 + manifest | 12 ++++++------ manifest.uuid | 2 +- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/Makefile.msc b/Makefile.msc index c1a8f88b6e..93b0935b1e 100644 --- a/Makefile.msc +++ b/Makefile.msc @@ -2846,4 +2846,5 @@ clean: del /Q fts5.* fts5parse.* 2>NUL del /Q lsm.h lsm1.c 2>NUL del /q src-verify.exe 2>NUL + del /q jimsh.exe jimsh0.exe 2>NUL # <> diff --git a/manifest b/manifest index 3221103887..356f131170 100644 --- a/manifest +++ b/manifest @@ -1,11 +1,11 @@ -C configure:\swhen\sdlopen()\sis\snot\sfound,\sonly\sfail\sfatally\sif\s--enable-loadable-module\sis\sexplicitly\sprovided,\selse\swarn\sinstead.\sBased\son\sdiscussion\saround\s[forum:2efe9c33bd9021ca|forum\spost\s2efe9c33bd9021ca].\sUpdate\sproj-indented-notice\sto\sbehave\slike\sits\sdocs\ssay\sit\sshould\swhen\sthe\s-error\sflag\sis\sused. -D 2025-02-10T15:01:14.412 +C Add\sjimsh.exe\sand\sjimsh0.exe\sto\sthe\sclean\srules\sin\sMakefile.msc\sso\sthat\sstale\sbuilds\sof\sthose\sfiles\sfrom\smsys2\sand\sfriends\sdo\snot\scause\smysterious\sbuild\serrors. +D 2025-02-10T15:58:22.800 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d F Makefile.in 63c4d6e535dac4b7f6a6ffa566c96e3d68fa7f244799c38ee1e3d59305c5b55b F Makefile.linux-generic bd3e3cacd369821a6241d4ea1967395c962dfe3057e38cb0a435cee0e8b789d0 -F Makefile.msc a9b95ae9807e17f9b0734ebe97d68032141c3f95286bb64593cb73b206f043cf +F Makefile.msc 990e4ea94a417135d1b2fd35550997c3f40fc1758bd7546bd17c0f4312f0babc F README.md c3c0f19532ce28f6297a71870f3c7b424729f0e6d9ab889616d3587dd2332159 F VERSION 001dea55eb8304ec9130b6b44a32d3fc349f279d45a7e224fc0730c3cb8e2372 F art/icon-243x273.gif 9750b734f82fdb3dc43127753d5e6fbf3b62c9f4e136c2fbf573b2f57ea87af5 @@ -2209,8 +2209,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P 4aad891802d9d87f1ff3cbbf4bc70fa242c6782088189a2bd5d6f8863f552d29 -R 0e46282cf2ae1fcf5877508517bc3bb3 +P f28e52cbf9e80cb5a1cde7cba099e2c2b6787a77263796e4f9febf3f30bc99dc +R 9884f4a919e7e313dc0ab42868810e5c U stephan -Z 8b12a9b798d6d21e89b61eb16ecc7324 +Z 6aa92bc3b567c51b695c0a3eafdd20c2 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 94b9a5b26c..024fc6f4cf 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -f28e52cbf9e80cb5a1cde7cba099e2c2b6787a77263796e4f9febf3f30bc99dc +44b4e4db321815c6fc0327ed7b97df868833654411e882b70f54ad3f6d212987 From dadd0b4085fc6d76b0100f60c50d5fe95850aa77 Mon Sep 17 00:00:00 2001 From: drh <> Date: Mon, 10 Feb 2025 16:13:56 +0000 Subject: [PATCH 079/194] Enhance speedtest1 with a new testset that calls sqlite3_open() and uses the connection many times. FossilOrigin-Name: ce307addb0c7cf72e4cca066521df6e15d1220bce303a3796a794a2ae5fa95b3 --- manifest | 14 +- manifest.uuid | 2 +- test/speedtest1.c | 481 ++++++++++++++++++++++++++++++++++++++++++++-- 3 files changed, 474 insertions(+), 23 deletions(-) diff --git a/manifest b/manifest index 356f131170..8a2dd3ba43 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Add\sjimsh.exe\sand\sjimsh0.exe\sto\sthe\sclean\srules\sin\sMakefile.msc\sso\sthat\sstale\sbuilds\sof\sthose\sfiles\sfrom\smsys2\sand\sfriends\sdo\snot\scause\smysterious\sbuild\serrors. -D 2025-02-10T15:58:22.800 +C Enhance\sspeedtest1\swith\sa\snew\stestset\sthat\scalls\ssqlite3_open()\sand\suses\sthe\nconnection\smany\stimes. +D 2025-02-10T16:13:56.580 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d @@ -1681,7 +1681,7 @@ F test/speed4p.explain 6b5f104ebeb34a038b2f714150f51d01143e59aa F test/speed4p.test 377a0c48e5a92e0b11c1c5ebb1bc9d83a7312c922bc0cb05970ef5d6a96d1f0c F test/speedtest.md ee958457ae1b729d9715ae33c0320600000bf1d9ddea1a88dcf79f56729d6fad F test/speedtest.tcl 185f80f8db275852746e8150137b31ba4aaa1c9a1ecb1e35a3b66cd3f31783b9 x -F test/speedtest1.c ef340d391366afc875d11fc59332601c470154352b0db836b2cba813999a8fb4 +F test/speedtest1.c abcce434642f8f1e1be530d25d8e7d7862360236d7a8e4f626521bc3263bd38c F test/spellfix.test 951a6405d49d1a23d6b78027d3877b4a33eeb8221dcab5704b499755bb4f552e F test/spellfix2.test dfc8f519a3fc204cb2dfa8b4f29821ae90f6f8c3 F test/spellfix3.test 0f9efaaa502a0e0a09848028518a6fb096c8ad33 @@ -2209,8 +2209,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P f28e52cbf9e80cb5a1cde7cba099e2c2b6787a77263796e4f9febf3f30bc99dc -R 9884f4a919e7e313dc0ab42868810e5c -U stephan -Z 6aa92bc3b567c51b695c0a3eafdd20c2 +P 44b4e4db321815c6fc0327ed7b97df868833654411e882b70f54ad3f6d212987 +R 6770e3052628a73d65a1abe270e15306 +U drh +Z b145be6a514a8b9ab22ab7f6982431ae # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 024fc6f4cf..2351f8f438 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -44b4e4db321815c6fc0327ed7b97df868833654411e882b70f54ad3f6d212987 +ce307addb0c7cf72e4cca066521df6e15d1220bce303a3796a794a2ae5fa95b3 diff --git a/test/speedtest1.c b/test/speedtest1.c index c6d5fd4a10..a03bdbb73b 100644 --- a/test/speedtest1.c +++ b/test/speedtest1.c @@ -65,8 +65,8 @@ static const char zHelp[] = " --stmtscanstatus Activate SQLITE_DBCONFIG_STMT_SCANSTATUS\n" " --temp N N from 0 to 9. 0: no temp table. 9: all temp tables\n" " --testset T Run test-set T (main, cte, rtree, orm, fp, json,\n" - " star, debug). Can be a comma-separated list of\n" - " values, with /SCALE suffixes or macro \"mix1\"\n" + " star, app, debug). Can be a comma-separated list\n" + " of values, with /SCALE suffixes or macro \"mix1\"\n" " --trace Turn on SQL tracing\n" " --threads N Use up to N threads for sorting\n" " --utf16be Set text encoding to UTF-16BE\n" @@ -112,6 +112,8 @@ struct HashContext { /* All global state is held in this structure */ static struct Global { sqlite3 *db; /* The open database connection */ + const char *zDbName; /* Name of the database file */ + const char *zVfs; /* --vfs NAME */ sqlite3_stmt *pStmt; /* Current SQL statement */ sqlite3_int64 iStart; /* Start-time for the current test */ sqlite3_int64 iTotal; /* Total time */ @@ -1565,6 +1567,453 @@ void testset_star(void){ speedtest1_end_test(); } +/* +** Tests that simulate an application opening and closing an SQLite database +** frequently. Fossil is used as the model. The focus here is on rapidly +** parsing the database schema and rapidly generating prepared statements, +** in other words, rapid start-up of Fossil-like applications. +** +** The same database has no data, so the performance of sqlite3_step() is +** not significant to this testset. +*/ +static void testset_app(void){ + int i, n; + speedtest1_begin_test(100, "Generate a Fossil-like database schema"); + speedtest1_exec( + "BEGIN;" + "CREATE TABLE blob(\n" + " rid INTEGER PRIMARY KEY,\n" + " rcvid INTEGER,\n" + " size INTEGER,\n" + " uuid TEXT UNIQUE NOT NULL,\n" + " content BLOB,\n" + " CHECK( length(uuid)>=40 AND rid>0 )\n" + ");\n" + "CREATE TABLE delta(\n" + " rid INTEGER PRIMARY KEY,\n" + " srcid INTEGER NOT NULL REFERENCES blob\n" + ");\n" + "CREATE TABLE rcvfrom(\n" + " rcvid INTEGER PRIMARY KEY,\n" + " uid INTEGER REFERENCES user,\n" + " mtime DATETIME,\n" + " nonce TEXT UNIQUE,\n" + " ipaddr TEXT\n" + ");\n" + "CREATE TABLE private(rid INTEGER PRIMARY KEY);\n" + "CREATE TABLE accesslog(\n" + " uname TEXT,\n" + " ipaddr TEXT,\n" + " success BOOLEAN,\n" + " mtime TIMESTAMP\n" + ");\n" + "CREATE TABLE user(\n" + " uid INTEGER PRIMARY KEY,\n" + " login TEXT UNIQUE,\n" + " pw TEXT,\n" + " cap TEXT,\n" + " cookie TEXT,\n" + " ipaddr TEXT,\n" + " cexpire DATETIME,\n" + " info TEXT,\n" + " mtime DATE,\n" + " photo BLOB\n" + ", jx TEXT DEFAULT '{}');\n" + "CREATE TABLE reportfmt(\n" + " rn INTEGER PRIMARY KEY,\n" + " owner TEXT,\n" + " title TEXT UNIQUE,\n" + " mtime INTEGER,\n" + " cols TEXT,\n" + " sqlcode TEXT\n" + ", jx TEXT DEFAULT '{}');\n" + "CREATE TABLE config(\n" + " name TEXT PRIMARY KEY NOT NULL,\n" + " value CLOB, mtime INTEGER,\n" + " CHECK( typeof(name)='text' AND length(name)>=1 )\n" + ") WITHOUT ROWID;\n" + "CREATE TABLE shun(uuid PRIMARY KEY, mtime INTEGER, scom TEXT)\n" + " WITHOUT ROWID;\n" + "CREATE TABLE concealed(\n" + " hash TEXT PRIMARY KEY,\n" + " content TEXT\n" + ", mtime INTEGER) WITHOUT ROWID;\n" + "CREATE TABLE admin_log(\n" + " id INTEGER PRIMARY KEY,\n" + " time INTEGER, -- Seconds since 1970\n" + " page TEXT, -- path of page\n" + " who TEXT, -- User who made the change\n" + " what TEXT -- What changed\n" + ");\n" + "CREATE TABLE unversioned(\n" + " name TEXT PRIMARY KEY,\n" + " rcvid INTEGER,\n" + " mtime DATETIME,\n" + " hash TEXT,\n" + " sz INTEGER,\n" + " encoding INT,\n" + " content BLOB\n" + ") WITHOUT ROWID;\n" + "CREATE TABLE subscriber(\n" + " subscriberId INTEGER PRIMARY KEY,\n" + " subscriberCode BLOB DEFAULT (randomblob(32)) UNIQUE,\n" + " semail TEXT UNIQUE COLLATE nocase,\n" + " suname TEXT,\n" + " sverified BOOLEAN DEFAULT true,\n" + " sdonotcall BOOLEAN,\n" + " sdigest BOOLEAN,\n" + " ssub TEXT,\n" + " sctime INTDATE,\n" + " mtime INTDATE,\n" + " smip TEXT\n" + ", lastContact INT);\n" + "CREATE TABLE pending_alert(\n" + " eventid TEXT PRIMARY KEY,\n" + " sentSep BOOLEAN DEFAULT false,\n" + " sentDigest BOOLEAN DEFAULT false\n" + ", sentMod BOOLEAN DEFAULT false) WITHOUT ROWID;\n" + "CREATE TABLE filename(\n" + " fnid INTEGER PRIMARY KEY,\n" + " name TEXT UNIQUE\n" + ") STRICT;\n" + "CREATE TABLE mlink(\n" + " mid INTEGER,\n" + " fid INTEGER,\n" + " pmid INTEGER,\n" + " pid INTEGER,\n" + " fnid INTEGER REFERENCES filename,\n" + " pfnid INTEGER,\n" + " mperm INTEGER,\n" + " isaux INT DEFAULT 0\n" + ") STRICT;\n" + "CREATE TABLE plink(\n" + " pid INTEGER REFERENCES blob,\n" + " cid INTEGER REFERENCES blob,\n" + " isprim INT,\n" + " mtime REAL,\n" + " baseid INTEGER REFERENCES blob,\n" + " UNIQUE(pid, cid)\n" + ") STRICT;\n" + "CREATE TABLE leaf(rid INTEGER PRIMARY KEY);\n" + "CREATE TABLE event(\n" + " type TEXT,\n" + " mtime REAL,\n" + " objid INTEGER PRIMARY KEY,\n" + " tagid INTEGER,\n" + " uid INTEGER REFERENCES user,\n" + " bgcolor TEXT,\n" + " euser TEXT,\n" + " user TEXT,\n" + " ecomment TEXT,\n" + " comment TEXT,\n" + " brief TEXT,\n" + " omtime REAL\n" + ") STRICT;\n" + "CREATE TABLE phantom(\n" + " rid INTEGER PRIMARY KEY\n" + ");\n" + "CREATE TABLE orphan(\n" + " rid INTEGER PRIMARY KEY,\n" + " baseline INTEGER\n" + ") STRICT;\n" + "CREATE TABLE unclustered(\n" + " rid INTEGER PRIMARY KEY\n" + ");\n" + "CREATE TABLE unsent(\n" + " rid INTEGER PRIMARY KEY\n" + ");\n" + "CREATE TABLE tag(\n" + " tagid INTEGER PRIMARY KEY,\n" + " tagname TEXT UNIQUE\n" + ") STRICT;\n" + "CREATE TABLE tagxref(\n" + " tagid INTEGER REFERENCES tag,\n" + " tagtype INTEGER,\n" + " srcid INTEGER REFERENCES blob,\n" + " origid INTEGER REFERENCES blob,\n" + " value TEXT,\n" + " mtime REAL,\n" + " rid INTEGER REFERENCES blob,\n" + " UNIQUE(rid, tagid)\n" + ") STRICT;\n" + "CREATE TABLE backlink(\n" + " target TEXT,\n" + " srctype INT,\n" + " srcid INT,\n" + " mtime REAL,\n" + " UNIQUE(target, srctype, srcid)\n" + ") STRICT;\n" + "CREATE TABLE attachment(\n" + " attachid INTEGER PRIMARY KEY,\n" + " isLatest INT DEFAULT 0,\n" + " mtime REAL,\n" + " src TEXT,\n" + " target TEXT,\n" + " filename TEXT,\n" + " comment TEXT,\n" + " user TEXT\n" + ") STRICT;\n" + "CREATE TABLE cherrypick(\n" + " parentid INT,\n" + " childid INT,\n" + " isExclude INT DEFAULT false,\n" + " PRIMARY KEY(parentid, childid)\n" + ") WITHOUT ROWID, STRICT;\n" + "CREATE TABLE vcache(\n" + " vid INTEGER, -- check-in ID\n" + " fname TEXT, -- filename\n" + " rid INTEGER, -- artifact ID\n" + " PRIMARY KEY(vid,fname)\n" + ") WITHOUT ROWID;\n" + "CREATE TABLE synclog(\n" + " sfrom TEXT,\n" + " sto TEXT,\n" + " stime INT NOT NULL,\n" + " stype TEXT,\n" + " PRIMARY KEY(sfrom,sto)\n" + ") WITHOUT ROWID;\n" + "CREATE TABLE chat(\n" + " msgid INTEGER PRIMARY KEY AUTOINCREMENT,\n" + " mtime JULIANDAY,\n" + " lmtime TEXT,\n" + " xfrom TEXT,\n" + " xmsg TEXT,\n" + " fname TEXT,\n" + " fmime TEXT,\n" + " mdel INT,\n" + " file BLOB\n" + ");\n" + "CREATE TABLE ftsdocs(\n" + " rowid INTEGER PRIMARY KEY,\n" + " type CHAR(1),\n" + " rid INTEGER,\n" + " name TEXT,\n" + " idxed BOOLEAN,\n" + " label TEXT,\n" + " url TEXT,\n" + " mtime DATE,\n" + " bx TEXT,\n" + " UNIQUE(type,rid)\n" + ");\n" + "CREATE TABLE ticket(\n" + " -- Do not change any column that begins with tkt_\n" + " tkt_id INTEGER PRIMARY KEY,\n" + " tkt_uuid TEXT UNIQUE,\n" + " tkt_mtime DATE,\n" + " tkt_ctime DATE,\n" + " -- Add as many fields as required below this line\n" + " type TEXT,\n" + " status TEXT,\n" + " subsystem TEXT,\n" + " priority TEXT,\n" + " severity TEXT,\n" + " foundin TEXT,\n" + " private_contact TEXT,\n" + " resolution TEXT,\n" + " title TEXT,\n" + " comment TEXT\n" + ");\n" + "CREATE TABLE ticketchng(\n" + " -- Do not change any column that begins with tkt_\n" + " tkt_id INTEGER REFERENCES ticket,\n" + " tkt_rid INTEGER REFERENCES blob,\n" + " tkt_mtime DATE,\n" + " tkt_user TEXT,\n" + " -- Add as many fields as required below this line\n" + " login TEXT,\n" + " username TEXT,\n" + " mimetype TEXT,\n" + " icomment TEXT\n" + ");\n" + "CREATE TABLE forumpost(\n" + " fpid INTEGER PRIMARY KEY,\n" + " froot INT,\n" + " fprev INT,\n" + " firt INT,\n" + " fmtime REAL\n" + ");\n" + "CREATE INDEX delta_i1 ON delta(srcid);\n" + "CREATE INDEX blob_rcvid ON blob(rcvid);\n" + "CREATE INDEX subscriberUname\n" + " ON subscriber(suname) WHERE suname IS NOT NULL;\n" + "CREATE INDEX mlink_i1 ON mlink(mid);\n" + "CREATE INDEX mlink_i2 ON mlink(fnid);\n" + "CREATE INDEX mlink_i3 ON mlink(fid);\n" + "CREATE INDEX mlink_i4 ON mlink(pid);\n" + "CREATE INDEX plink_i2 ON plink(cid,pid);\n" + "CREATE INDEX event_i1 ON event(mtime);\n" + "CREATE INDEX orphan_baseline ON orphan(baseline);\n" + "CREATE INDEX tagxref_i1 ON tagxref(tagid, mtime);\n" + "CREATE INDEX backlink_src ON backlink(srcid, srctype);\n" + "CREATE INDEX attachment_idx1 ON attachment(target, filename, mtime);\n" + "CREATE INDEX attachment_idx2 ON attachment(src);\n" + "CREATE INDEX cherrypick_cid ON cherrypick(childid);\n" + "CREATE INDEX ftsdocIdxed ON ftsdocs(type,rid,name) WHERE idxed==0;\n" + "CREATE INDEX ftsdocName ON ftsdocs(name) WHERE type='w';\n" + "CREATE INDEX ticketchng_idx1 ON ticketchng(tkt_id, tkt_mtime);\n" + "CREATE INDEX forumthread ON forumpost(froot,fmtime);\n" + "CREATE VIEW artifact(rid,rcvid,size,atype,srcid,hash,content) AS\n" + " SELECT blob.rid,rcvid,size,1,srcid,uuid,content\n" + " FROM blob LEFT JOIN delta ON (blob.rid=delta.rid);\n" + "CREATE VIEW ftscontent AS\n" + " SELECT rowid, type, rid, name, idxed, label, url, mtime,\n" + " title(type,rid,name) AS 'title', body(type,rid,name) AS 'body'\n" + " FROM ftsdocs;\n" + ); + if( sqlite3_compileoption_used("ENABLE_FTS5") ){ + speedtest1_exec( + "CREATE VIRTUAL TABLE ftsidx\n" + " USING fts5(content=\"ftscontent\", title, body);\n" + "CREATE VIRTUAL TABLE chatfts1 USING fts5(\n" + " xmsg, content=chat, content_rowid=msgid,tokenize=porter);\n" + ); + }else{ + speedtest1_exec( + "CREATE TABLE ftsidx_data(id INTEGER PRIMARY KEY, block BLOB);\n" + "CREATE TABLE ftsidx_idx(segid, term, pgno, PRIMARY KEY(segid, term))\n" + " WITHOUT ROWID;\n" + "CREATE TABLE ftsidx_docsize(id INTEGER PRIMARY KEY, sz BLOB);\n" + "CREATE TABLE ftsidx_config(k PRIMARY KEY, v) WITHOUT ROWID;\n" + "CREATE TABLE chatfts1_data(id INTEGER PRIMARY KEY, block BLOB);\n" + "CREATE TABLE chatfts1_idx(segid, term, pgno, PRIMARY KEY(segid, term))\n" + " WITHOUT ROWID;\n" + "CREATE TABLE chatfts1_docsize(id INTEGER PRIMARY KEY, sz BLOB);\n" + "CREATE TABLE chatfts1_config(k PRIMARY KEY, v) WITHOUT ROWID;\n" + ); + } + speedtest1_exec( + "ANALYZE sqlite_schema;\n" + "INSERT INTO sqlite_stat1(tbl,idx,stat) VALUES\n" + " ('ftsidx_config','ftsidx_config','1 1'),\n" + " ('ftsidx_idx','ftsidx_idx','4215 401 1'),\n" + " ('user','sqlite_autoindex_user_1','25 1'),\n" + " ('phantom',NULL,'26'),\n" + " ('reportfmt','sqlite_autoindex_reportfmt_1','9 1'),\n" + " ('rcvfrom','sqlite_autoindex_rcvfrom_1','18445 401'),\n" + " ('private',NULL,'99'),\n" + " ('mlink','mlink_i4','116678 401'),\n" + " ('mlink','mlink_i3','121212 2'),\n" + " ('mlink','mlink_i2','106372 401'),\n" + " ('mlink','mlink_i1','99298 5'),\n" + " ('ftsidx_data',NULL,'3795'),\n" + " ('leaf',NULL,'1559'),\n" + " ('delta','delta_i1','66340 1'),\n" + " ('unversioned','unversioned','3 1'),\n" + " ('pending_alert','pending_alert','3 1'),\n" + " ('cherrypick','cherrypick_cid','680 2'),\n" + " ('cherrypick','cherrypick','628 1 1'),\n" + " ('config','config','128 1'),\n" + " ('ftsidx_docsize',NULL,'33848'),\n" + " ('event','event_i1','36096 1'),\n" + " ('plink','plink_i2','38236 1 1'),\n" + " ('plink','sqlite_autoindex_plink_1','38357 1 1'),\n" + " ('shun','shun','10 1'),\n" + " ('concealed','concealed','110 1'),\n" + " ('vcache','vcache','1888 401 1'),\n" + " ('ftsdocs','ftsdocName','19 1'),\n" + " ('ftsdocs','ftsdocIdxed','168 84 1 1'),\n" + " ('ftsdocs','sqlite_autoindex_ftsdocs_1','37312 401 1'),\n" + " ('subscriber','subscriberUname','5 1'),\n" + " ('subscriber','sqlite_autoindex_subscriber_2','37 1'),\n" + " ('subscriber','sqlite_autoindex_subscriber_1','37 1'),\n" + " ('tag','sqlite_autoindex_tag_1','2990 1'),\n" + " ('filename','sqlite_autoindex_filename_1','3168 1'),\n" + " ('chat',NULL,'56124'),\n" + " ('tagxref','tagxref_i1','40992 401 2'),\n" + " ('tagxref','sqlite_autoindex_tagxref_1','79233 3 1'),\n" + " ('attachment','attachment_idx2','11 1'),\n" + " ('attachment','attachment_idx1','11 2 2 1'),\n" + " ('blob','blob_rcvid','128240 201'),\n" + " ('blob','sqlite_autoindex_blob_1','126480 1'),\n" + " ('synclog','synclog','12 3 1'),\n" + " ('backlink','backlink_src','2160 2 2'),\n" + " ('backlink','sqlite_autoindex_backlink_1','2340 2 2 1'),\n" + " ('accesslog',NULL,'38'),\n" + " ('chatfts1_config','chatfts1_config','1 1'),\n" + " ('chatfts1_idx','chatfts1_idx','688 230 1'),\n" + " ('ticket','sqlite_autoindex_ticket_1','794 1'),\n" + " ('ticketchng','ticketchng_idx1','2089 3 1'),\n" + " ('forumpost','forumthread','4 4 1'),\n" + " ('unclustered',NULL,'12');\n" + "COMMIT;" + ); + speedtest1_end_test(); + + n = g.szTest*3; + speedtest1_begin_test(110, "Open and use the database %d times", n); + for(i=0; i=$date OR parent.pid=$pid)\n" + " ORDER BY mtime DESC LIMIT 10\n" + " )\n" + " INSERT OR IGNORE INTO ok SELECT rid FROM ancestor;" + ); + sqlite3_close(dbAux); + g.db = dbMain; + } + speedtest1_end_test(); +} + #ifdef SQLITE_ENABLE_RTREE /* Generate two numbers between 1 and mx. The first number is less than ** the second. Usually the numbers are near each other but can sometimes @@ -2512,10 +2961,8 @@ int main(int argc, char **argv){ int openFlags = SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE ; /* SQLITE_OPEN_xxx flags. */ char *zTSet = "main"; /* Which --testset torun */ - const char * zVfs = 0; /* --vfs NAME */ int doTrace = 0; /* True for --trace */ const char *zEncoding = 0; /* --utf16be or --utf16le */ - const char *zDbName = 0; /* Name of the test database */ void *pHeap = 0; /* Allocated heap space */ void *pLook = 0; /* Allocated lookaside space */ @@ -2542,6 +2989,8 @@ int main(int argc, char **argv){ sqlite3_libversion(), sqlite3_sourceid()); /* Process command-line arguments */ + g.zDbName = 0; + g.zVfs = 0; g.zWR = ""; g.zNN = ""; g.zPK = "UNIQUE"; @@ -2668,7 +3117,7 @@ int main(int argc, char **argv){ g.eTemp = argv[i][0] - '0'; }else if( strcmp(z,"testset")==0 ){ static char zMix1Tests[] = - "main,orm/25,cte/20,json,fp/3,parsenumber/25,rtree/10,star"; + "main,orm/25,cte/20,json,fp/3,parsenumber/25,rtree/10,star,app"; ARGC_VALUE_CHECK(1); zTSet = argv[++i]; if( strcmp(zTSet,"mix1")==0 ) zTSet = zMix1Tests; @@ -2688,7 +3137,7 @@ int main(int argc, char **argv){ #endif }else if( strcmp(z,"vfs")==0 ){ ARGC_VALUE_CHECK(1); - zVfs = argv[++i]; + g.zVfs = argv[++i]; }else if( strcmp(z,"reserve")==0 ){ ARGC_VALUE_CHECK(1); g.nReserve = atoi(argv[++i]); @@ -2718,8 +3167,8 @@ int main(int argc, char **argv){ fatal_error("unknown option: %s\nUse \"%s -?\" for help\n", argv[i], argv[0]); } - }else if( zDbName==0 ){ - zDbName = argv[i]; + }else if( g.zDbName==0 ){ + g.zDbName = argv[i]; }else{ fatal_error("surplus argument: %s\nUse \"%s -?\" for help\n", argv[i], argv[0]); @@ -2748,8 +3197,8 @@ int main(int argc, char **argv){ #endif sqlite3_initialize(); - if( zDbName!=0 ){ - sqlite3_vfs *pVfs = sqlite3_vfs_find(zVfs); + if( g.zDbName!=0 ){ + sqlite3_vfs *pVfs = sqlite3_vfs_find(g.zVfs); /* For some VFSes, e.g. opfs, unlink() is not sufficient. Use the ** selected (or default) VFS's xDelete method to delete the ** database. This is specifically important for the "opfs" VFS @@ -2757,15 +3206,15 @@ int main(int argc, char **argv){ ** can be cleaned up properly. For historical compatibility, we'll ** also simply unlink(). */ if( pVfs!=0 ){ - pVfs->xDelete(pVfs, zDbName, 1); + pVfs->xDelete(pVfs, g.zDbName, 1); } - unlink(zDbName); + unlink(g.zDbName); } /* Open the database and the input file */ - if( sqlite3_open_v2(memDb ? ":memory:" : zDbName, &g.db, - openFlags, zVfs) ){ - fatal_error("Cannot open database file: %s\n", zDbName); + if( sqlite3_open_v2(memDb ? ":memory:" : g.zDbName, &g.db, + openFlags, g.zVfs) ){ + fatal_error("Cannot open database file: %s\n", g.zDbName); } #if SQLITE_VERSION_NUMBER>=3006001 if( nLook>0 && szLook>0 ){ @@ -2859,6 +3308,8 @@ int main(int argc, char **argv){ testset_cte(); }else if( strcmp(zThisTest,"star")==0 ){ testset_star(); + }else if( strcmp(zThisTest,"app")==0 ){ + testset_app(); }else if( strcmp(zThisTest,"fp")==0 ){ testset_fp(); }else if( strcmp(zThisTest,"json")==0 ){ From 8f79342f6aeb47bfb59b17e82423587378593a66 Mon Sep 17 00:00:00 2001 From: drh <> Date: Mon, 10 Feb 2025 16:34:30 +0000 Subject: [PATCH 080/194] Make the "mix1" testset the default for speedtest1. FossilOrigin-Name: 7a0c3d0e14984dd49a7c1e824b9e50564094ad57c43182bfec7624a55815f961 --- manifest | 12 ++++++------ manifest.uuid | 2 +- test/speedtest1.c | 10 ++++++---- 3 files changed, 13 insertions(+), 11 deletions(-) diff --git a/manifest b/manifest index 8a2dd3ba43..f647110054 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Enhance\sspeedtest1\swith\sa\snew\stestset\sthat\scalls\ssqlite3_open()\sand\suses\sthe\nconnection\smany\stimes. -D 2025-02-10T16:13:56.580 +C Make\sthe\s"mix1"\stestset\sthe\sdefault\sfor\sspeedtest1. +D 2025-02-10T16:34:30.128 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d @@ -1681,7 +1681,7 @@ F test/speed4p.explain 6b5f104ebeb34a038b2f714150f51d01143e59aa F test/speed4p.test 377a0c48e5a92e0b11c1c5ebb1bc9d83a7312c922bc0cb05970ef5d6a96d1f0c F test/speedtest.md ee958457ae1b729d9715ae33c0320600000bf1d9ddea1a88dcf79f56729d6fad F test/speedtest.tcl 185f80f8db275852746e8150137b31ba4aaa1c9a1ecb1e35a3b66cd3f31783b9 x -F test/speedtest1.c abcce434642f8f1e1be530d25d8e7d7862360236d7a8e4f626521bc3263bd38c +F test/speedtest1.c 132cd5ba064f48910bb4b68337442b0ef419218c8de9e9855f66d98015286ddb F test/spellfix.test 951a6405d49d1a23d6b78027d3877b4a33eeb8221dcab5704b499755bb4f552e F test/spellfix2.test dfc8f519a3fc204cb2dfa8b4f29821ae90f6f8c3 F test/spellfix3.test 0f9efaaa502a0e0a09848028518a6fb096c8ad33 @@ -2209,8 +2209,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P 44b4e4db321815c6fc0327ed7b97df868833654411e882b70f54ad3f6d212987 -R 6770e3052628a73d65a1abe270e15306 +P ce307addb0c7cf72e4cca066521df6e15d1220bce303a3796a794a2ae5fa95b3 +R 7ff52f027efda91f136a0ad19e93519e U drh -Z b145be6a514a8b9ab22ab7f6982431ae +Z 3d75c6193c4df011902dd598934d5c2c # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 2351f8f438..be6b3b23b4 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -ce307addb0c7cf72e4cca066521df6e15d1220bce303a3796a794a2ae5fa95b3 +7a0c3d0e14984dd49a7c1e824b9e50564094ad57c43182bfec7624a55815f961 diff --git a/test/speedtest1.c b/test/speedtest1.c index a03bdbb73b..b49c70098f 100644 --- a/test/speedtest1.c +++ b/test/speedtest1.c @@ -2960,7 +2960,7 @@ int main(int argc, char **argv){ int memDb = 0; /* --memdb. Use an in-memory database */ int openFlags = SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE ; /* SQLITE_OPEN_xxx flags. */ - char *zTSet = "main"; /* Which --testset torun */ + char *zTSet = "mix1"; /* Which --testset torun */ int doTrace = 0; /* True for --trace */ const char *zEncoding = 0; /* --utf16be or --utf16le */ @@ -2971,6 +2971,10 @@ int main(int argc, char **argv){ int i; /* Loop counter */ int rc; /* API return code */ + /* "mix1" is a macro testset: */ + static char zMix1Tests[] = + "main,orm/25,cte/20,json,fp/3,parsenumber/25,rtree/10,star,app"; + #ifdef SQLITE_SPEEDTEST1_WASM /* Resetting all state is important for the WASM build, which may ** call main() multiple times. */ @@ -3116,11 +3120,8 @@ int main(int argc, char **argv){ } g.eTemp = argv[i][0] - '0'; }else if( strcmp(z,"testset")==0 ){ - static char zMix1Tests[] = - "main,orm/25,cte/20,json,fp/3,parsenumber/25,rtree/10,star,app"; ARGC_VALUE_CHECK(1); zTSet = argv[++i]; - if( strcmp(zTSet,"mix1")==0 ) zTSet = zMix1Tests; }else if( strcmp(z,"trace")==0 ){ doTrace = 1; }else if( strcmp(z,"threads")==0 ){ @@ -3272,6 +3273,7 @@ int main(int argc, char **argv){ } if( g.bExplain ) printf(".explain\n.echo on\n"); + if( strcmp(zTSet,"mix1")==0 ) zTSet = zMix1Tests; do{ char *zThisTest = zTSet; char *zSep; From b2972b8c6f864c99659ff469055a16db3ec34dd3 Mon Sep 17 00:00:00 2001 From: stephan Date: Mon, 10 Feb 2025 18:41:46 +0000 Subject: [PATCH 081/194] Minor autosetup doc tweaks. FossilOrigin-Name: bb53beb267ee5f5836020a58f32f1bed8deb587890eef9a6e034dad53f8c3f42 --- autosetup/proj.tcl | 6 +++--- manifest | 14 +++++++------- manifest.uuid | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/autosetup/proj.tcl b/autosetup/proj.tcl index 6a1960f603..fdfbf3a5ed 100644 --- a/autosetup/proj.tcl +++ b/autosetup/proj.tcl @@ -184,8 +184,8 @@ proc proj-lshift_ {listVar {count 1}} { ######################################################################## # Expects to receive string input, which it splits on newlines, strips -# out any lines which begin with an number of whitespace followed by a -# '#', and returns a value containing the [append]ed results of each +# out any lines which begin with any number of whitespace followed by +# a '#', and returns a value containing the [append]ed results of each # remaining line with a \n between each. proc proj-strip-hash-comments {val} { set x {} @@ -203,7 +203,7 @@ proc proj-strip-hash-comments {val} { # A proxy for cc-check-function-in-lib which does not make any global # changes to the LIBS define. Returns the result of # cc-check-function-in-lib (i.e. true or false). The resulting linker -# flags are stored in ${lib_${function}}. +# flags are stored in the [define] named lib_${function}. proc proj-check-function-in-lib {function libs {otherlibs {}}} { set found 0 define-push {LIBS} { diff --git a/manifest b/manifest index f647110054..42a7ffe1d2 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Make\sthe\s"mix1"\stestset\sthe\sdefault\sfor\sspeedtest1. -D 2025-02-10T16:34:30.128 +C Minor\sautosetup\sdoc\stweaks. +D 2025-02-10T18:41:46.630 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d @@ -49,7 +49,7 @@ F autosetup/cc-shared.tcl 4f024e94a47f427ba61de1739f6381ef0080210f9fae89112d5c1d F autosetup/cc.tcl c0fcc50ca91deff8741e449ddad05bcd08268bc31177e613a6343bbd1fd3e45f F autosetup/jimsh0.c 6573f6bc6ff204de0139692648d7037ca0b6c067bac83a7b4e087f20a86866a4 F autosetup/pkg-config.tcl 4e635bf39022ff65e0d5434339dd41503ea48fc53822c9c5bde88b02d3d952ba -F autosetup/proj.tcl 42119a2e899e319b92f3159952b7ef7219c82cb45eeb636aaf8d909def8150f8 +F autosetup/proj.tcl cef1e0aa0f2dee2042af66f28c97a9445f84d55d858ba9db4f6116846a1a325f F autosetup/sqlite-config.tcl 341c2751f42c6c8eeeae50bec13d2bb28db73ca2c8b9b97598332aed02e0a71b F autosetup/system.tcl 51d4be76cd9a9074704b584e5c9cbba616202c8468cf9ba8a4f8294a7ab1dba9 F configure 9a00b21dfd13757bbfb8d89b30660a89ec1f8f3a79402b8f9f9b6fc475c3303a x @@ -2209,8 +2209,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P ce307addb0c7cf72e4cca066521df6e15d1220bce303a3796a794a2ae5fa95b3 -R 7ff52f027efda91f136a0ad19e93519e -U drh -Z 3d75c6193c4df011902dd598934d5c2c +P 7a0c3d0e14984dd49a7c1e824b9e50564094ad57c43182bfec7624a55815f961 +R d2d2e8c6e583d1621c49ccc900539cec +U stephan +Z 67e48a24ab45c6698c52d6bd11ee89d3 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index be6b3b23b4..f29a5355c0 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -7a0c3d0e14984dd49a7c1e824b9e50564094ad57c43182bfec7624a55815f961 +bb53beb267ee5f5836020a58f32f1bed8deb587890eef9a6e034dad53f8c3f42 From 6cc36dfb16fcf101ec7e1f7dcebe4731233c96ea Mon Sep 17 00:00:00 2001 From: drh <> Date: Mon, 10 Feb 2025 19:12:18 +0000 Subject: [PATCH 082/194] Add the --size option to the test/speedtest.tcl script. FossilOrigin-Name: 6b9007cb30257ca97de74dec1df47f46f238f034083517a51c24334e4bd30663 --- manifest | 14 +++++++------- manifest.uuid | 2 +- test/speedtest.tcl | 9 +++++++++ 3 files changed, 17 insertions(+), 8 deletions(-) diff --git a/manifest b/manifest index 42a7ffe1d2..b4d216617b 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Minor\sautosetup\sdoc\stweaks. -D 2025-02-10T18:41:46.630 +C Add\sthe\s--size\soption\sto\sthe\stest/speedtest.tcl\sscript. +D 2025-02-10T19:12:18.297 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d @@ -1680,7 +1680,7 @@ F test/speed4.test abc0ad3399dcf9703abed2fff8705e4f8e416715 F test/speed4p.explain 6b5f104ebeb34a038b2f714150f51d01143e59aa F test/speed4p.test 377a0c48e5a92e0b11c1c5ebb1bc9d83a7312c922bc0cb05970ef5d6a96d1f0c F test/speedtest.md ee958457ae1b729d9715ae33c0320600000bf1d9ddea1a88dcf79f56729d6fad -F test/speedtest.tcl 185f80f8db275852746e8150137b31ba4aaa1c9a1ecb1e35a3b66cd3f31783b9 x +F test/speedtest.tcl 926d1e168f4a14e6fb68c5dc174de743536b547f365264bd5bac533b3621a4a0 x F test/speedtest1.c 132cd5ba064f48910bb4b68337442b0ef419218c8de9e9855f66d98015286ddb F test/spellfix.test 951a6405d49d1a23d6b78027d3877b4a33eeb8221dcab5704b499755bb4f552e F test/spellfix2.test dfc8f519a3fc204cb2dfa8b4f29821ae90f6f8c3 @@ -2209,8 +2209,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P 7a0c3d0e14984dd49a7c1e824b9e50564094ad57c43182bfec7624a55815f961 -R d2d2e8c6e583d1621c49ccc900539cec -U stephan -Z 67e48a24ab45c6698c52d6bd11ee89d3 +P bb53beb267ee5f5836020a58f32f1bed8deb587890eef9a6e034dad53f8c3f42 +R 00ccd32b91c1afa4d9f2520464e4c3e9 +U drh +Z c42977e3dfb38afa1042e7b43c0552ba # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index f29a5355c0..35a3e68b45 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -bb53beb267ee5f5836020a58f32f1bed8deb587890eef9a6e034dad53f8c3f42 +6b9007cb30257ca97de74dec1df47f46f238f034083517a51c24334e4bd30663 diff --git a/test/speedtest.tcl b/test/speedtest.tcl index d201297158..1ad92d9ab0 100755 --- a/test/speedtest.tcl +++ b/test/speedtest.tcl @@ -27,6 +27,7 @@ Other options include: --lookaside N SZ Lookahead uses N slots of SZ bytes each. --pagesize N Use N as the page size. --quiet | -q "Quite". Put results in file but don't pop up editor + --size N Change the test size. 100 means 100%. Default: 5. --testset TEST Specify the specific testset to use. The default is "mix1". Other options include: "main", "json", "cte", "orm", "fp", "rtree". @@ -78,6 +79,14 @@ for {set i 0} {$i<[llength $argv]} {incr i} { incr i set testset [lindex $argv $i] } + -size - + --size { + incr i + set newsize [lindex $argv $i] + if {$newsize<1} {set newsize 1} + set speedtestflags \ + [regsub {.-size \d+} $speedtestflags "-size $newsize"] + } -n - -dryrun - --dryrun { From 0a4af54a7e67e3cf87a7cec44d80870f5df260cf Mon Sep 17 00:00:00 2001 From: drh <> Date: Mon, 10 Feb 2025 19:48:13 +0000 Subject: [PATCH 083/194] Remove a pointless line of code. FossilOrigin-Name: 57b2b812c8c5524f315e20cee0e6a12a3b1635aeb42925bf891532a7029d0eb0 --- manifest | 12 ++++++------ manifest.uuid | 2 +- src/expr.c | 1 - 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/manifest b/manifest index b4d216617b..68312e890c 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Add\sthe\s--size\soption\sto\sthe\stest/speedtest.tcl\sscript. -D 2025-02-10T19:12:18.297 +C Remove\sa\spointless\sline\sof\scode. +D 2025-02-10T19:48:13.176 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d @@ -730,7 +730,7 @@ F src/date.c 842c08ac143a56a627b05ac51d68624f2b7b03e3b4cba596205e735eed64ee57 F src/dbpage.c 2e677acb658a29965e55398bbc61161cb7819da538057c8032adac7ab8e4a8c0 F src/dbstat.c 73362c0df0f40ad5523a6f5501224959d0976757b511299bf892313e79d14f5c F src/delete.c 03a77ba20e54f0f42ebd8eddf15411ed6bdb06a2c472ac4b6b336521bf7cea42 -F src/expr.c 15fabfb67261e298a39fe61457f3cfa24148d9ca8d02f4dff385feb5cf523ea7 +F src/expr.c ca943270395374afc65256ce86cdb152a22fa6ff146895175833b89ba870e117 F src/fault.c 460f3e55994363812d9d60844b2a6de88826e007 F src/fkey.c 928ed2517e8732113d2b9821aa37af639688d752f4ea9ac6e0e393d713eeb76f F src/func.c b2fb33139972d7d65640b27ea962a49f1616265428001090cab39fcf270228e1 @@ -2209,8 +2209,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P bb53beb267ee5f5836020a58f32f1bed8deb587890eef9a6e034dad53f8c3f42 -R 00ccd32b91c1afa4d9f2520464e4c3e9 +P 6b9007cb30257ca97de74dec1df47f46f238f034083517a51c24334e4bd30663 +R 6d33e5e79434d78cc0854681af5e3875 U drh -Z c42977e3dfb38afa1042e7b43c0552ba +Z 4cd996db652c357ad0cb2f7e1b69e405 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 35a3e68b45..862aaf2925 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -6b9007cb30257ca97de74dec1df47f46f238f034083517a51c24334e4bd30663 +57b2b812c8c5524f315e20cee0e6a12a3b1635aeb42925bf891532a7029d0eb0 diff --git a/src/expr.c b/src/expr.c index df47e34593..3011fcd9ad 100644 --- a/src/expr.c +++ b/src/expr.c @@ -1849,7 +1849,6 @@ ExprList *sqlite3ExprListDup(sqlite3 *db, const ExprList *p, int flags){ } pItem->zEName = sqlite3DbStrDup(db, pOldItem->zEName); pItem->fg = pOldItem->fg; - pItem->fg.done = 0; pItem->u = pOldItem->u; } return pNew; From 2d878947004909b22c2057eb124b9d00fabe8d82 Mon Sep 17 00:00:00 2001 From: dan Date: Mon, 10 Feb 2025 20:46:14 +0000 Subject: [PATCH 084/194] Experimental change to allow clients to block when taking a SHARED lock to connect to a wal mode database. FossilOrigin-Name: d2d6a000fb9bf8097e0ce9979685408d183be3ab785ceeb11ec1f97a81a83e41 --- manifest | 27 ++++----- manifest.uuid | 2 +- src/attach.c | 7 +++ src/main.c | 14 ++++- src/os_unix.c | 15 ++++- src/os_win.c | 19 +++++-- src/sqlite.h.in | 21 ++++++- src/sqliteInt.h | 1 + src/test1.c | 23 ++++++-- test/lock_common.tcl | 1 + test/walsetlk3.test | 130 +++++++++++++++++++++++++++++++++++++++++++ 11 files changed, 231 insertions(+), 29 deletions(-) create mode 100644 test/walsetlk3.test diff --git a/manifest b/manifest index fd640c9b35..32d9f7e9f4 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Fix\sa\sproblem\scausing\sthe\swrite-lock\sto\sbe\sheld\swhen\sit\sshould\snot\sbe\sin\ssome\scircumstances\sfollowing\sa\sSEH\sexception. -D 2025-01-30T17:04:28.336 +C Experimental\schange\sto\sallow\sclients\sto\sblock\swhen\staking\sa\sSHARED\slock\sto\sconnect\sto\sa\swal\smode\sdatabase. +D 2025-02-10T20:46:14.679 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d @@ -711,7 +711,7 @@ F sqlite3.1 acdff36db796e2d00225b911d3047d580cd136547298435426ce9d40347973cc F sqlite3.pc.in 0977c03a4da7c4204bd60e784a0efb8d51a190448aba78a4e973fe7192bdaf03 F src/alter.c aa93e37e4a36a0525bbb2a2aeda20d2018f0aa995542c7dc658e031375e3f532 F src/analyze.c 9a8b67239d899ac12289db5db3f5bfe7f7a0ad1277f80f87ead1d048085876eb -F src/attach.c f35bb8cc1fcdde8f6815a7ef09ae413bcac71821d530796800ba24b3c7da1e80 +F src/attach.c f541c1fb59e56a1c8ba6b023d5e1844448b499fac669d2cbca18be7b6e7d4998 F src/auth.c 54ab9c6c5803b47c0d45b76ce27eff22a03b4b1f767c5945a3a4eb13aa4c78dc F src/backup.c 5c97e8023aab1ce14a42387eb3ae00ba5a0644569e3476f38661fa6f824c3523 F src/bitvec.c 9eac5f42c11914d5ef00a75605bb205e934f435c579687f985f1f8b0995c8645 @@ -740,7 +740,7 @@ F src/insert.c f8d1a0f8ee258411009c6b7f2d93170e351bd19f5ad89d57e1180644297cbe70 F src/json.c 68a98c020c22127f2d65f08855f7fc7460ff352a6ce0b543d8931dde83319c22 F src/legacy.c d7874bc885906868cd51e6c2156698f2754f02d9eee1bae2d687323c3ca8e5aa F src/loadext.c 7432c944ff197046d67a1207790a1b13eec4548c85a9457eb0896bb3641dfb36 -F src/main.c a54dfdbfee90c8696e473c8fcd5ca1159aa56c096643a0983cc3f0ba4ad45baa +F src/main.c ad702f1ad48cd82f700b3e1b28b523154488874655cbd39bc9336d0bb2e8f728 F src/malloc.c 410e570b30c26cc36e3372577df50f7a96ee3eed5b2b161c6b6b48773c650c5e F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645 F src/mem1.c 3bb59158c38e05f6270e761a9f435bf19827a264c13d1631c58b84bdc96d73b2 @@ -761,8 +761,8 @@ F src/os.h 1ff5ae51d339d0e30d8a9d814f4b8f8e448169304d83a7ed9db66a65732f3e63 F src/os_common.h 6c0eb8dd40ef3e12fe585a13e709710267a258e2c8dd1c40b1948a1d14582e06 F src/os_kv.c 4d39e1f1c180b11162c6dc4aa8ad34053873a639bac6baae23272fc03349986a F src/os_setup.h 6011ad7af5db4e05155f385eb3a9b4470688de6f65d6166b8956e58a3d872107 -F src/os_unix.c 5d0d1788ffa3a43bfc47502e4baa36cf8507e478cd182298fc4974a7cca0954f -F src/os_win.c 79a1b02f483ec82ab8fb1b00cc003bff8a3c44bf8d7ea074992a4e0dda9488df +F src/os_unix.c e15305b49518d2e2cd405d14ede027a7ca52679d4d31b25635fb88d545211feb +F src/os_win.c 48c536ebd662a4b39623fffba41d95234854ddfbea4865d03fef1f51c29da187 F src/os_win.h 7b073010f1451abe501be30d12f6bc599824944a F src/pager.c 2fdd489447aa6bb0f672973bacb801ced92225ca9a1c874ed9b856d2741dc54e F src/pager.h 6137149346e6c8a3ddc1eeb40aee46381e9bc8b0fcc6dda8a1efde993c2275b8 @@ -779,16 +779,16 @@ F src/resolve.c c8a5372b97b2a2e972a280676f06ddb5b74e885d3b1f5ce383f839907b57ef68 F src/rowset.c 8432130e6c344b3401a8874c3cb49fefe6873fec593294de077afea2dce5ec97 F src/select.c 83e88fbb36f89b6703b348777491619554f0fd6f917c9fdf51e4c2e9cda6c04e F src/shell.c.in ee54de10e9bd5572f689a6bc0c8e6fa58a8870e1670978ded44412d2715fd908 -F src/sqlite.h.in 6958f27ef2f789bb724c2be8ee6edf5b2200e74bf638d2e58bdae9cfc6a55d5e +F src/sqlite.h.in 78a34c8c6564ae43b16322bac5e843167ef97f5084c9c663684f67576ddcbcb2 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8 F src/sqlite3ext.h 3f046c04ea3595d6bfda99b781926b17e672fd6d27da2ba6d8d8fc39981dcb54 -F src/sqliteInt.h d718c8517bd0659e1d4239642fa4ff7e85e39bc32a2e33a18b470b362c485f63 +F src/sqliteInt.h b6e49765628a6b74e2c47a4e19f5245fa226ef32c6abc1b82849af8107a6b042 F src/sqliteLimit.h 1bbdbf72bd0411d003267ffebc59a262f061df5653027a75627d03f48ca30523 F src/status.c cb11f8589a6912af2da3bb1ec509a94dd8ef27df4d4c1a97e0bcf2309ece972b F src/table.c 0f141b58a16de7e2fbe81c308379e7279f4c6b50eb08efeec5892794a0ba30d1 F src/tclsqlite.c 90441d3cc16f966a23499d9096a3d2d971e5e8fddb4d1413b096b79c2b2cff07 F src/tclsqlite.h 65e2c761446e1c9fa0342b7d2612a703483643c8b6a316d12a65b745a4727395 -F src/test1.c 64df9d5ad54521eb3c103f1253bf33ceddbc5fa931658d3701027a2ac86eb5e9 +F src/test1.c 1be101915405d022cef33bf7a13bdc0753015785de409a028b393fd4b8c7fc9b F src/test2.c 7ebc518e6735939d8979273a6f7b1d9b5702babf059f6ad62499f7f60a9eb9a3 F src/test3.c e7573aa0f78ee4e070a4bc8c3493941c1aa64d5c66d4825c74c0f055451f432b F src/test4.c 13e57ae7ec7a959ee180970aef09deed141252fe9bb07c61054f0dfa4f1dfd5d @@ -1413,7 +1413,7 @@ F test/lock4.test 27143363eda1622f03c133efc8db808fc331afd973486cb571ea71cd717d37 F test/lock5.test 583cae05992af0f66607286917f7d5f8aed3b6053c52df5994efb98f2a8fdbaf F test/lock6.test ad5b387a3a8096afd3c68a55b9535056431b0cf5 F test/lock7.test 49f1eaff1cdc491cc5dee3669f3c671d9f172431 -F test/lock_common.tcl 2f3f7f2e9637f93ccf609df48ef5b27a50278b6b1cd752b445d52262e5841413 +F test/lock_common.tcl f33b7fbc275be25a6f2863b4cc8af35278e24d127a3f734825477bf223b05ffe F test/lookaside.test 5a828e7256f1ee4da8e1bdaa03373a3ccdb0f1ff98dfa82e9b76cb41a45b1083 F test/main.test e8752d76233b1c8906cd2c98ad920dba868bd63c87d51d8a2ea5e9cba55dd496 F test/make-where7.tcl 05c16b5d4f5d6512881dfec560cb793915932ef9 @@ -2023,6 +2023,7 @@ F test/walrofault.test c70cb6e308c443867701856cce92ad8288cd99488fa52afab77cca6cf F test/walseh1.test bae700eb99519b6d5cd3f893c04759accc5a59c391d4189fe4dd6995a533442b F test/walsetlk.test 9c5b92f9a20252540fedf9ffa6ee3d1b8af08ea4b80d0144d9b88e6c0c1de80d F test/walsetlk2.test 5ae8662a28c013e8df2ce975f9e3577a7f239aeb4622bb8d4d0ca8e16c0c132e +F test/walsetlk3.test 520633cb23561e960d3100b23f9da692f0cce2ffd650d72e2d06163e6c2d228b F test/walshared.test 42e3808582504878af237ea02c42ca793e8a0efaa19df7df26ac573370dbc7a3 F test/walslow.test 0c51843836c9dcf40a5ac05aa781bfb977b396ee2c872d92bd48b79d5dd9aa23 F test/walthread.test 14b20fcfa6ae152f5d8e12f5dc8a8a724b7ef189f5d8ef1e2ceab79f2af51747 @@ -2203,8 +2204,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P 62009565d2f2a2c4d347e1da0d5b4ad43056742df47fd6ddb92e62f53a2b57f1 -R 1ce6d89df3820633838b6629306f6da1 +P 7eb5accb7cf937fc967dcd86da0af813fb18a2697348bd231fbefd3c09b930ab +R a7261f9e35c03d513b32b9d4fcb3d611 U dan -Z ed92d59f35c33d93aa0b00d0344b6f87 +Z c73a12f9f64486e78d8e69c08a89db7b # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 240cfee238..27fe52162f 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -7eb5accb7cf937fc967dcd86da0af813fb18a2697348bd231fbefd3c09b930ab +d2d6a000fb9bf8097e0ce9979685408d183be3ab785ceeb11ec1f97a81a83e41 diff --git a/src/attach.c b/src/attach.c index 9f23dce1ed..3ade237b5c 100644 --- a/src/attach.c +++ b/src/attach.c @@ -221,6 +221,13 @@ static void attachFunc( sqlite3BtreeEnterAll(db); db->init.iDb = 0; db->mDbFlags &= ~(DBFLAG_SchemaKnownOk); +#ifdef SQLITE_ENABLE_SETLK_TIMEOUT + if( db->setlkFlags & SQLITE_SETLK_BLOCK_ON_CONNECT ){ + int val = 1; + sqlite3_file *fd = sqlite3PagerFile(sqlite3BtreePager(pNew->pBt)); + sqlite3OsFileControlHint(fd, SQLITE_FCNTL_BLOCK_ON_CONNECT, &val); + } +#endif if( !REOPEN_AS_MEMDB(db) ){ rc = sqlite3Init(db, &zErrDyn); } diff --git a/src/main.c b/src/main.c index c1799455fa..8cd0303c4d 100644 --- a/src/main.c +++ b/src/main.c @@ -1830,13 +1830,25 @@ int sqlite3_busy_timeout(sqlite3 *db, int ms){ /* ** Set the setlk timeout value. */ -int sqlite3_setlk_timeout(sqlite3 *db, int ms){ +int sqlite3_setlk_timeout(sqlite3 *db, int ms, int flags){ + int iDb; + int bBOC = ((flags & SQLITE_SETLK_BLOCK_ON_CONNECT) ? 1 : 0); #ifdef SQLITE_ENABLE_API_ARMOR if( !sqlite3SafetyCheckOk(db) ) return SQLITE_MISUSE_BKPT; #endif if( ms<-1 ) return SQLITE_RANGE; #ifdef SQLITE_ENABLE_SETLK_TIMEOUT db->setlkTimeout = ms; + db->setlkFlags = flags; + sqlite3BtreeEnterAll(db); + for(iDb=0; iDbnDb; iDb++){ + Btree *pBt = db->aDb[iDb].pBt; + if( pBt ){ + sqlite3_file *fd = sqlite3PagerFile(sqlite3BtreePager(pBt)); + sqlite3OsFileControlHint(fd, SQLITE_FCNTL_BLOCK_ON_CONNECT, (void*)&bBOC); + } + } + sqlite3BtreeLeaveAll(db); #endif return SQLITE_OK; } diff --git a/src/os_unix.c b/src/os_unix.c index 58e4952100..7f92c5234d 100644 --- a/src/os_unix.c +++ b/src/os_unix.c @@ -284,6 +284,7 @@ struct unixFile { #endif #ifdef SQLITE_ENABLE_SETLK_TIMEOUT unsigned iBusyTimeout; /* Wait this many millisec on locks */ + int bBlockOnConnect; /* True to block for SHARED locks */ #endif #if OS_VXWORKS struct vxworksFileId *pId; /* Unique file ID */ @@ -1677,6 +1678,13 @@ static int unixFileLock(unixFile *pFile, struct flock *pLock){ rc = 0; } }else{ +#ifdef SQLITE_ENABLE_SETLK_TIMEOUT + if( pFile->bBlockOnConnect && pLock->l_type==F_RDLCK + && pLock->l_start==SHARED_FIRST && pLock->l_len==SHARED_SIZE + ){ + rc = osFcntl(pFile->h, F_SETLKW, pLock); + }else +#endif rc = osSetPosixAdvisoryLock(pFile->h, pLock, pFile); } return rc; @@ -4049,7 +4057,12 @@ static int unixFileControl(sqlite3_file *id, int op, void *pArg){ *(int*)pArg = iOld; return SQLITE_OK; } -#endif + case SQLITE_FCNTL_BLOCK_ON_CONNECT: { + int iNew = *(int*)pArg; + pFile->bBlockOnConnect = iNew; + return SQLITE_OK; + } +#endif /* SQLITE_ENABLE_SETLK_TIMEOUT */ #if SQLITE_MAX_MMAP_SIZE>0 case SQLITE_FCNTL_MMAP_SIZE: { i64 newLimit = *(i64*)pArg; diff --git a/src/os_win.c b/src/os_win.c index 751ba21481..f7a295aa9b 100644 --- a/src/os_win.c +++ b/src/os_win.c @@ -289,6 +289,7 @@ struct winFile { #endif #ifdef SQLITE_ENABLE_SETLK_TIMEOUT DWORD iBusyTimeout; /* Wait this many millisec on locks */ + int bBlockOnConnect; #endif }; @@ -3356,8 +3357,9 @@ static int winFileSize(sqlite3_file *id, sqlite3_int64 *pSize){ ** Different API routines are called depending on whether or not this ** is Win9x or WinNT. */ -static int winGetReadLock(winFile *pFile){ +static int winGetReadLock(winFile *pFile, int bBlock){ int res; + DWORD mask = ~(bBlock ? LOCKFILE_FAIL_IMMEDIATELY : 0); OSTRACE(("READ-LOCK file=%p, lock=%d\n", pFile->h, pFile->locktype)); if( osIsNT() ){ #if SQLITE_OS_WINCE @@ -3367,7 +3369,7 @@ static int winGetReadLock(winFile *pFile){ */ res = winceLockFile(&pFile->h, SHARED_FIRST, 0, 1, 0); #else - res = winLockFile(&pFile->h, SQLITE_LOCKFILEEX_FLAGS, SHARED_FIRST, 0, + res = winLockFile(&pFile->h, SQLITE_LOCKFILEEX_FLAGS&mask, SHARED_FIRST, 0, SHARED_SIZE, 0); #endif } @@ -3376,7 +3378,7 @@ static int winGetReadLock(winFile *pFile){ int lk; sqlite3_randomness(sizeof(lk), &lk); pFile->sharedLockByte = (short)((lk & 0x7fffffff)%(SHARED_SIZE - 1)); - res = winLockFile(&pFile->h, SQLITE_LOCKFILE_FLAGS, + res = winLockFile(&pFile->h, SQLITE_LOCKFILE_FLAGS&mask, SHARED_FIRST+pFile->sharedLockByte, 0, 1, 0); } #endif @@ -3510,7 +3512,7 @@ static int winLock(sqlite3_file *id, int locktype){ */ if( locktype==SHARED_LOCK && res ){ assert( pFile->locktype==NO_LOCK ); - res = winGetReadLock(pFile); + res = winGetReadLock(pFile, pFile->bBlockOnConnect); if( res ){ newLocktype = SHARED_LOCK; }else{ @@ -3548,7 +3550,7 @@ static int winLock(sqlite3_file *id, int locktype){ newLocktype = EXCLUSIVE_LOCK; }else{ lastErrno = osGetLastError(); - winGetReadLock(pFile); + winGetReadLock(pFile, 0); } } @@ -3853,7 +3855,12 @@ static int winFileControl(sqlite3_file *id, int op, void *pArg){ *(int*)pArg = iOld; return SQLITE_OK; } -#endif + case SQLITE_FCNTL_BLOCK_ON_CONNECT: { + int iNew = *(int*)pArg; + pFile->bBlockOnConnect = iNew; + return SQLITE_OK; + } +#endif /* SQLITE_ENABLE_SETLK_TIMEOUT */ } OSTRACE(("FCNTL file=%p, rc=SQLITE_NOTFOUND\n", pFile->h)); diff --git a/src/sqlite.h.in b/src/sqlite.h.in index 68474ab71c..d053eb7d7e 100644 --- a/src/sqlite.h.in +++ b/src/sqlite.h.in @@ -1163,6 +1163,11 @@ struct sqlite3_io_methods { ** the value that M is to be set to. Before returning, the 32-bit signed ** integer is overwritten with the previous value of M. ** +**
  • [[SQLITE_FCNTL_BLOCK_ON_CONNECT]] +** The [SQLITE_FCNTL_BLOCK_ON_CONNECT] opcode is used to configure the +** VFS to block when taking SHARED locks. This is used to implement the +** functionality associated with SQLITE_SETLK_BLOCK_ON_CONNECT. +** **
  • [[SQLITE_FCNTL_DATA_VERSION]] ** The [SQLITE_FCNTL_DATA_VERSION] opcode is used to detect changes to ** a database file. The argument is a pointer to a 32-bit unsigned integer. @@ -1259,6 +1264,7 @@ struct sqlite3_io_methods { #define SQLITE_FCNTL_CKSM_FILE 41 #define SQLITE_FCNTL_RESET_CACHE 42 #define SQLITE_FCNTL_NULL_IO 43 +#define SQLITE_FCNTL_BLOCK_ON_CONNECT 44 /* deprecated names */ #define SQLITE_GET_LOCKPROXYFILE SQLITE_FCNTL_GET_LOCKPROXYFILE @@ -2921,8 +2927,21 @@ int sqlite3_busy_timeout(sqlite3*, int ms); ** values, this function sets only the setlk-timeout value. Therefore, ** to configure separate busy-timeout and setlk-timeout values for a single ** database handle, call sqlite3_busy_timeout() followed by this function. +** +** Whenever the number of connections to a wal mode database falls from +** 1 to 0, the last connection takes an exclusive lock on the database, +** then checkpoints and deletes the wal file. While it is doing this, any +** new connection that tries to read from the database fails with an +** SQLITE_BUSY error. Or, if the SQLITE_SETLK_BLOCK_ON_CONNECT flag is +** passed to this API, the new connection blocks until the exclusive lock +** has been released. */ -int sqlite3_setlk_timeout(sqlite3*, int ms); +int sqlite3_setlk_timeout(sqlite3*, int ms, int flags); + +/* +** CAPI3REF: Flags for sqlite3_setlk_timeout() +*/ +#define SQLITE_SETLK_BLOCK_ON_CONNECT 0x01 /* ** CAPI3REF: Convenience Routines For Running Queries diff --git a/src/sqliteInt.h b/src/sqliteInt.h index 631bb2a249..f56625cef0 100644 --- a/src/sqliteInt.h +++ b/src/sqliteInt.h @@ -1746,6 +1746,7 @@ struct sqlite3 { int busyTimeout; /* Busy handler timeout, in msec */ #ifdef SQLITE_ENABLE_SETLK_TIMEOUT int setlkTimeout; /* Blocking lock timeout, in msec. -1 -> inf. */ + int setlkFlags; /* Flags passed to setlk_timeout() */ #endif int nSavepoint; /* Number of non-transaction savepoints */ int nStatement; /* Number of nested statement-transactions */ diff --git a/src/test1.c b/src/test1.c index fb7607f101..a0ca93d10c 100644 --- a/src/test1.c +++ b/src/test1.c @@ -5940,7 +5940,7 @@ static int SQLITE_TCLAPI test_busy_timeout( } /* -** Usage: sqlite3_setlk_timeout DB MS +** Usage: sqlite3_setlk_timeout ?-blockonconnect? DB MS ** ** Set the setlk timeout. */ @@ -5952,14 +5952,25 @@ static int SQLITE_TCLAPI test_setlk_timeout( ){ int rc, ms; sqlite3 *db; - if( argc!=3 ){ + int bBlockOnConnect = 0; + + if( argc==4 ){ + const char *zArg = argv[1]; + int nArg = strlen(zArg); + if( nArg>=2 && nArg<=15 && memcmp(zArg, "-blockonconnect", nArg)==0 ){ + bBlockOnConnect = 1; + } + } + if( argc!=(3+bBlockOnConnect) ){ Tcl_AppendResult(interp, "wrong # args: should be \"", argv[0], - " DB", 0); + " ?-blockonconnect? DB MS", 0); return TCL_ERROR; } - if( getDbPointer(interp, argv[1], &db) ) return TCL_ERROR; - if( Tcl_GetInt(interp, argv[2], &ms) ) return TCL_ERROR; - rc = sqlite3_setlk_timeout(db, ms); + if( getDbPointer(interp, argv[argc-2], &db) ) return TCL_ERROR; + if( Tcl_GetInt(interp, argv[argc-1], &ms) ) return TCL_ERROR; + rc = sqlite3_setlk_timeout( + db, ms, (bBlockOnConnect ? SQLITE_SETLK_BLOCK_ON_CONNECT : 0) + ); Tcl_AppendResult(interp, sqlite3ErrName(rc), 0); return TCL_OK; } diff --git a/test/lock_common.tcl b/test/lock_common.tcl index 3e1821bab0..9504a8c046 100644 --- a/test/lock_common.tcl +++ b/test/lock_common.tcl @@ -145,6 +145,7 @@ proc testfixture_nb_cb {varname chan} { } if { $line == "OVER" } { + global $varname set $varname [lindex $::tfnb($chan) 1] unset ::tfnb($chan) close $chan diff --git a/test/walsetlk3.test b/test/walsetlk3.test new file mode 100644 index 0000000000..cbd2f7247e --- /dev/null +++ b/test/walsetlk3.test @@ -0,0 +1,130 @@ +# 2020 May 06 +# +# The author disclaims copyright to this source code. In place of +# a legal notice, here is a blessing: +# +# May you do good and not evil. +# May you find forgiveness for yourself and forgive others. +# May you share freely, never taking more than you give. +# +#*********************************************************************** +# +# TESTRUNNER: slow +# + +set testdir [file dirname $argv0] +source $testdir/tester.tcl +source $testdir/lock_common.tcl +set testprefix walsetlk3 + +ifcapable !wal {finish_test ; return } + +do_execsql_test 1.0 { + CREATE TABLE t1(x, y); + PRAGMA journal_mode = wal; + INSERT INTO t1 VALUES(1, 2); + INSERT INTO t1 VALUES(3, 4); +} {wal} + +db close + +proc sql_block_on_close {sql} { + testfixture_nb done [string map [list %SQL% $sql] { + testvfs tvfs + tvfs script xWrite + tvfs filter xWrite + + set ::delay_done 0 + proc xWrite {method fname args} { + if {[file tail $fname]=="test.db" && $::delay_done==0} { + after 3000 + set ::delay_done 1 + } + return 0 + } + + sqlite3 db test.db -vfs tvfs + db eval {%SQL%} + db close + }] +} + +# Start a second process that writes to the db, then blocks within the +# [db close] holding an EXCLUSIVE on the db in order to checkpoint and +# delete the wal file. Then try to read the db. +# +# Without the SQLITE_SETLK_BLOCK_ON_CONNECT flag, this should fail with +# SQLITE_BUSY. +# +sql_block_on_close { + INSERT INTO t1 VALUES(5, 6); + INSERT INTO t1 VALUES(7, 8); +} +after 500 +sqlite3 db test.db +sqlite3_setlk_timeout db 2000 +do_catchsql_test 1.1 { + SELECT * FROM t1 +} {1 {database is locked}} + +vwait ::done + +# But with SQLITE_SETLK_BLOCK_ON_CONNECT flag, it should succeed. +# +sql_block_on_close { + INSERT INTO t1 VALUES(9, 10); + INSERT INTO t1 VALUES(11, 12); +} +after 500 +sqlite3 db test.db +sqlite3_setlk_timeout -block db 2000 +do_catchsql_test 1.2 { + SELECT * FROM t1 +} {0 {1 2 3 4 5 6 7 8 9 10 11 12}} + +vwait ::done + +#------------------------------------------------------------------------- +# Check that the SQLITE_SETLK_BLOCK_ON_CONNECT does not cause connections +# to block when taking a SHARED lock on a rollback mode database. +# +reset_db +do_execsql_test 2.1 { + CREATE TABLE x1(a); + INSERT INTO x1 VALUES(1), (2), (3); +} + +proc sql_block_on_write {sql} { + testfixture_nb done [string map [list %SQL% $sql] { + sqlite3 db test.db + db eval "BEGIN EXCLUSIVE" + db eval {%SQL%} + after 3000 + db eval COMMIT + db close + }] +} + +db close +sql_block_on_write { + INSERT INTO x1 VALUES(4); +} + +after 500 + +sqlite3 db test.db +sqlite3_setlk_timeout -block db 2000 + +do_catchsql_test 2.2 { + SELECT * FROM x1 +} {1 {database is locked}} + +vwait ::done +after 500 + +do_catchsql_test 2.3 { + SELECT * FROM x1 +} {0 {1 2 3 4}} + +finish_test + From df9b89932f39a84da9f88603d80b5a1fa9f0e771 Mon Sep 17 00:00:00 2001 From: stephan Date: Tue, 11 Feb 2025 13:00:40 +0000 Subject: [PATCH 085/194] Adapt [https://fossil-scm.org/home/info/3bff7b92d6d|Fossil SCM patch 3bff7b92d6d], applying -lrt for platforms which need it for one of {fdatasync, nanosleep}. FossilOrigin-Name: 1768de6e9e2c6ff3a9ee29fa6f488fb3d23a3599195ac7d1b09e61c02b7d18b3 --- Makefile.in | 1 + autoconf/Makefile.in | 3 ++- autosetup/sqlite-config.tcl | 12 +++++++++--- main.mk | 3 ++- manifest | 20 ++++++++++---------- manifest.uuid | 2 +- 6 files changed, 25 insertions(+), 16 deletions(-) diff --git a/Makefile.in b/Makefile.in index b932f56e20..59a62d0618 100644 --- a/Makefile.in +++ b/Makefile.in @@ -118,6 +118,7 @@ LDFLAGS.dlopen = @LDFLAGS_DLOPEN@ LDFLAGS.readline = @LDFLAGS_READLINE@ CFLAGS.readline = @CFLAGS_READLINE@ LDFLAGS.icu = @LDFLAGS_ICU@ +LDFLAGS.rt = @LDFLAGS_RT@ CFLAGS.icu = @CFLAGS_ICU@ LDFLAGS.libsqlite3.soname = @LDFLAGS_LIBSQLITE3_SONAME@ # soname: see https://sqlite.org/src/forumpost/5a3b44f510df8ded diff --git a/autoconf/Makefile.in b/autoconf/Makefile.in index 16e60879ea..8e09b9c610 100644 --- a/autoconf/Makefile.in +++ b/autoconf/Makefile.in @@ -67,6 +67,7 @@ LDFLAGS.pthread = @LDFLAGS_PTHREAD@ LDFLAGS.dlopen = @LDFLAGS_DLOPEN@ LDFLAGS.readline = @LDFLAGS_READLINE@ CFLAGS.readline = @CFLAGS_READLINE@ +LDFLAGS.rt = @LDFLAGS_RT@ LDFLAGS.icu = @LDFLAGS_ICU@ CFLAGS.icu = @CFLAGS_ICU@ @@ -135,7 +136,7 @@ LDFLAGS.libsqlite3 = \ $(LDFLAGS.rpath) $(LDFLAGS.pthread) \ $(LDFLAGS.math) $(LDFLAGS.dlopen) \ $(LDFLAGS.zlib) $(LDFLAGS.icu) \ - $(LDFLAGS.configure) + $(LDFLAGS.rt) $(LDFLAGS.configure) CFLAGS.libsqlite3 = -I. $(CFLAGS.core) $(CFLAGS.icu) $(OPT_FEATURE_FLAGS) sqlite3.o: $(TOP)/sqlite3.h $(TOP)/sqlite3.c diff --git a/autosetup/sqlite-config.tcl b/autosetup/sqlite-config.tcl index 904c439e0b..040d8d8b2d 100644 --- a/autosetup/sqlite-config.tcl +++ b/autosetup/sqlite-config.tcl @@ -187,9 +187,15 @@ proc sqlite-check-common-system-deps {} { cc-check-functions gmtime_r isnan localtime_r localtime_s \ malloc_usable_size strchrnul usleep utime pread pread64 pwrite pwrite64 - proj-check-function-in-lib fdatasync rt - define LDFLAGS_FDATASYNC [get-define lib_fdatasync] - undefine lib_fdatasync + set ldrt "" + # Collapse funcs from librt into LDFLAGS_RT. + # Some systems (ex: SunOS) require -lrt in order to use nanosleep + foreach func {fdatasync nanosleep} { + if {[proj-check-function-in-lib $func rt]} { + lappend ldrt [get-define lib_${func}] + } + } + define LDFLAGS_RT [join [lsort -unique $ldrt] ""] # # Check for needed/wanted headers diff --git a/main.mk b/main.mk index f5d8185f71..9eec5495ee 100644 --- a/main.mk +++ b/main.mk @@ -163,6 +163,7 @@ LDFLAGS.rpath ?= -Wl,-rpath -Wl,$(prefix)/lib LDFLAGS.pthread ?= -lpthread LDFLAGS.dlopen ?= -ldl LDFLAGS.shlib ?= -shared +LDFLAGS.rt ?= # nanosleep on some platforms LDFLAGS.icu ?= # -licui18n -licuuc -licudata CFLAGS.icu ?= LDFLAGS.libsqlite3.soname ?= # see https://sqlite.org/src/forumpost/5a3b44f510df8ded @@ -413,7 +414,7 @@ LDFLAGS.libsqlite3 = \ $(LDFLAGS.rpath) $(LDFLAGS.pthread) \ $(LDFLAGS.math) $(LDFLAGS.dlopen) \ $(LDFLAGS.zlib) $(LDFLAGS.icu) \ - $(LDFLAGS.configure) + $(LDFLAGS.rt) $(LDFLAGS.configure) # # $(install-dir.XYZ) = dirs for installation. diff --git a/manifest b/manifest index 68312e890c..f9ac5ccf3a 100644 --- a/manifest +++ b/manifest @@ -1,9 +1,9 @@ -C Remove\sa\spointless\sline\sof\scode. -D 2025-02-10T19:48:13.176 +C Adapt\s[https://fossil-scm.org/home/info/3bff7b92d6d|Fossil\sSCM\spatch\s3bff7b92d6d],\sapplying\s-lrt\sfor\splatforms\swhich\sneed\sit\sfor\sone\sof\s{fdatasync,\snanosleep}. +D 2025-02-11T13:00:40.707 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d -F Makefile.in 63c4d6e535dac4b7f6a6ffa566c96e3d68fa7f244799c38ee1e3d59305c5b55b +F Makefile.in aa869faf7ca086f35c9b3e974fddc7fd65ed2dc45a246b1a94e6f9fdc99b0ed5 F Makefile.linux-generic bd3e3cacd369821a6241d4ea1967395c962dfe3057e38cb0a435cee0e8b789d0 F Makefile.msc 990e4ea94a417135d1b2fd35550997c3f40fc1758bd7546bd17c0f4312f0babc F README.md c3c0f19532ce28f6297a71870f3c7b424729f0e6d9ab889616d3587dd2332159 @@ -16,7 +16,7 @@ F art/sqlite370.jpg d512473dae7e378a67e28ff96a34da7cb331def2 F art/sqlite370.svg 40b7e2fe8aac3add5d56dd86ab8d427a4eca5bcb3fe4f8946cb3794e1821d531 F auto.def fdd6965e06bce02a8b9f9ed57a52d05bcbec4b56e4bef2174866bb5713c65fda F autoconf/Makefile.fallback 22fe523eb36dfce31e0f6349f782eb084e86a5620b2b0b4f84a2d6133f53f5ac -F autoconf/Makefile.in f706b48abb13553ecc5034d5fc296d424fd36d73c222285b7590004dec508925 +F autoconf/Makefile.in 7bd73a4c8cd89025cbc92b4f887c6fd1b8cd8ecbe62c4ac1f36ac84d04043479 F autoconf/Makefile.msc 0a071367537dc395285a5d624ac4f99f3a387b27cc5e89752423c0499e15aec4 F autoconf/README.first f1d3876e9a7852c22f275a6f06814e64934cecbc0b5b9617d64849094c1fd136 F autoconf/README.txt 7f01dc3915e2d68f329011073662369e62a0938a2c69398807823c57591cb288 @@ -50,7 +50,7 @@ F autosetup/cc.tcl c0fcc50ca91deff8741e449ddad05bcd08268bc31177e613a6343bbd1fd3e F autosetup/jimsh0.c 6573f6bc6ff204de0139692648d7037ca0b6c067bac83a7b4e087f20a86866a4 F autosetup/pkg-config.tcl 4e635bf39022ff65e0d5434339dd41503ea48fc53822c9c5bde88b02d3d952ba F autosetup/proj.tcl cef1e0aa0f2dee2042af66f28c97a9445f84d55d858ba9db4f6116846a1a325f -F autosetup/sqlite-config.tcl 341c2751f42c6c8eeeae50bec13d2bb28db73ca2c8b9b97598332aed02e0a71b +F autosetup/sqlite-config.tcl 9b3ae79286705077003f0b54bb9d2cd388f9bef5017707cc73f0f90ba56ce865 F autosetup/system.tcl 51d4be76cd9a9074704b584e5c9cbba616202c8468cf9ba8a4f8294a7ab1dba9 F configure 9a00b21dfd13757bbfb8d89b30660a89ec1f8f3a79402b8f9f9b6fc475c3303a x F contrib/sqlitecon.tcl 210a913ad63f9f991070821e599d600bd913e0ad @@ -702,7 +702,7 @@ F ext/wasm/tests/opfs/concurrency/test.js d08889a5bb6e61937d0b8cbb78c9efbefbf65a F ext/wasm/tests/opfs/concurrency/worker.js 0a8c1a3e6ebb38aabbee24f122693f1fb29d599948915c76906681bb7da1d3d2 F ext/wasm/wasmfs.make 68999f5bd8c489239592d59a420f8c627c99169bbd6fa16a404751f757b9f702 F magic.txt 5ade0bc977aa135e79e3faaea894d5671b26107cc91e70783aa7dc83f22f3ba0 -F main.mk 7c9df07a41c406a5fbe4e7e4021f29fa4f18821d61354721fd0435fc24f95321 +F main.mk c85055d36c36c188cee94cabe2e252cd912d10d1a9d62af477e855533b9531b2 F mptest/config01.test 3c6adcbc50b991866855f1977ff172eb6d901271 F mptest/config02.test 4415dfe36c48785f751e16e32c20b077c28ae504 F mptest/crash01.test 61e61469e257df0850df4293d7d4d6c2af301421 @@ -2209,8 +2209,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P 6b9007cb30257ca97de74dec1df47f46f238f034083517a51c24334e4bd30663 -R 6d33e5e79434d78cc0854681af5e3875 -U drh -Z 4cd996db652c357ad0cb2f7e1b69e405 +P 57b2b812c8c5524f315e20cee0e6a12a3b1635aeb42925bf891532a7029d0eb0 +R 914d530882ce85285895c4ba17cd5bb4 +U stephan +Z 452df3b98ff1feca6a8fd2421b0c5ff6 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 862aaf2925..834fa7d6b4 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -57b2b812c8c5524f315e20cee0e6a12a3b1635aeb42925bf891532a7029d0eb0 +1768de6e9e2c6ff3a9ee29fa6f488fb3d23a3599195ac7d1b09e61c02b7d18b3 From 62e1d44846baa68cdfcdcbdd58fcb4483cc5de47 Mon Sep 17 00:00:00 2001 From: stephan Date: Tue, 11 Feb 2025 13:13:46 +0000 Subject: [PATCH 086/194] Make the --out-implib support ([6092b0b86bf93a3d]) specifically opt-in because the feature check for it passes on some platforms where it is not recognized at link-time. FossilOrigin-Name: 75535f2355b3b2e83dd57f4c30340af98c8dbcfe6ff1e9be17d23bd30d7d766c --- auto.def | 8 ++++++-- autoconf/auto.def | 4 ++++ autosetup/sqlite-config.tcl | 19 +++++++++++++------ manifest | 16 ++++++++-------- manifest.uuid | 2 +- 5 files changed, 32 insertions(+), 17 deletions(-) diff --git a/auto.def b/auto.def index 3a5a2f64c1..6274d79b68 100644 --- a/auto.def +++ b/auto.def @@ -198,6 +198,9 @@ set flags { gcov=0 => {Enable coverage testing using gcov} linemacros => {Enable #line macros in the amalgamation} dynlink-tools => {Dynamically link libsqlite3 to certain tools which normally statically embed it.} + dump-defines=0 => {Dump autosetup defines to $::sqliteConfig(dump-defines-txt) (for build debugging)} + # + # soname:=legacy => # --soname has a long story behind it: https://sqlite.org/src/forumpost/5a3b44f510df8ded {SONAME for libsqlite3.so. "none", or not using this flag, sets no @@ -207,8 +210,9 @@ set flags { suffix which gets applied to "libsqlite3.so.", e.g. --soname=9.10 equates to "libsqlite3.so.9.10". } - dump-defines=0 => {Dump autosetup defines to $::sqliteConfig(dump-defines-txt) (for build debugging)} - # + out-implib=0 => + {Enable use of --out-implib linker flag to generate an "import library" for the DLL} + # } if {"" ne $::sqliteConfig(dump-defines-json)} { lappend flags \ diff --git a/autoconf/auto.def b/autoconf/auto.def index 72f50094b8..42af1b459b 100644 --- a/autoconf/auto.def +++ b/autoconf/auto.def @@ -66,6 +66,7 @@ options { performance-critical loops. Never use --debug for production builds.} # + # soname:=legacy => # --soname has a long story behind it: https://sqlite.org/src/forumpost/5a3b44f510df8ded {SONAME for libsqlite3.so. "none", or not using this flag, sets no @@ -75,6 +76,9 @@ options { suffix which gets applied to "libsqlite3.so.", e.g. --soname=9.10 equates to "libsqlite3.so.9.10". } + out-implib=0 => + {Enable use of --out-implib linker flag to generate an "import library" for the DLL} + # } sqlite-post-options-init diff --git a/autosetup/sqlite-config.tcl b/autosetup/sqlite-config.tcl index 040d8d8b2d..1aaa8af374 100644 --- a/autosetup/sqlite-config.tcl +++ b/autosetup/sqlite-config.tcl @@ -965,16 +965,23 @@ proc sqlite-check-mac-cversion {} { # used for building an "import library .dll.a" file on some platforms # (e.g. mingw). Returns 1 if supported, else 0. # +# If the configure flag --out-implib is not used then this is a no-op. +# The feature is specifically opt-in because on some platforms the +# feature test will pass but using that flag will fail at link-time +# (e.g. OpenBSD). +# # Added in response to: https://sqlite.org/forum/forumpost/0c7fc097b2 proc sqlite-check-out-implib {} { define LDFLAGS_OUT_IMPLIB "" set rc 0 - cc-with {} { - set dll "libsqlite3[get-define TARGET_DLLEXT]" - set flags "-Wl,--out-implib,${dll}.a" - if {[cc-check-flags $flags]} { - define LDFLAGS_OUT_IMPLIB $flags - set rc 1 + if {[proj-opt-was-provided out-implib]} { + cc-with {} { + set dll "libsqlite3[get-define TARGET_DLLEXT]" + set flags "-Wl,--out-implib,${dll}.a" + if {[cc-check-flags $flags]} { + define LDFLAGS_OUT_IMPLIB $flags + set rc 1 + } } } return $rc diff --git a/manifest b/manifest index f9ac5ccf3a..77a1282113 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Adapt\s[https://fossil-scm.org/home/info/3bff7b92d6d|Fossil\sSCM\spatch\s3bff7b92d6d],\sapplying\s-lrt\sfor\splatforms\swhich\sneed\sit\sfor\sone\sof\s{fdatasync,\snanosleep}. -D 2025-02-11T13:00:40.707 +C Make\sthe\s--out-implib\ssupport\s([6092b0b86bf93a3d])\sspecifically\sopt-in\sbecause\sthe\sfeature\scheck\sfor\sit\spasses\son\ssome\splatforms\swhere\sit\sis\snot\srecognized\sat\slink-time. +D 2025-02-11T13:13:46.626 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d @@ -14,13 +14,13 @@ F art/sqlite370.eps aa97a671332b432a54e1d74ff5e8775be34200c2 F art/sqlite370.ico af56c1d00fee7cd4753e8631ed60703ed0fc6e90 F art/sqlite370.jpg d512473dae7e378a67e28ff96a34da7cb331def2 F art/sqlite370.svg 40b7e2fe8aac3add5d56dd86ab8d427a4eca5bcb3fe4f8946cb3794e1821d531 -F auto.def fdd6965e06bce02a8b9f9ed57a52d05bcbec4b56e4bef2174866bb5713c65fda +F auto.def ccf74471ec89edfd5bf942fd6d60fc8ce09f7aa7527d668a1ac44d1bbbcb412d F autoconf/Makefile.fallback 22fe523eb36dfce31e0f6349f782eb084e86a5620b2b0b4f84a2d6133f53f5ac F autoconf/Makefile.in 7bd73a4c8cd89025cbc92b4f887c6fd1b8cd8ecbe62c4ac1f36ac84d04043479 F autoconf/Makefile.msc 0a071367537dc395285a5d624ac4f99f3a387b27cc5e89752423c0499e15aec4 F autoconf/README.first f1d3876e9a7852c22f275a6f06814e64934cecbc0b5b9617d64849094c1fd136 F autoconf/README.txt 7f01dc3915e2d68f329011073662369e62a0938a2c69398807823c57591cb288 -F autoconf/auto.def 71dde17158afcd6fb097b66853371991bb6ca5517b034e2efa9f0c47a2e730f2 +F autoconf/auto.def f468a32e6f57c52390e0fe2466974d0afaa1b0fc1d51cbacb4cb3950bd089f67 F autoconf/tea/Makefile.in ba0556fee8da09c066bad85a4457904e46ee2c2eabaa309c0e83a78f2f151a8e F autoconf/tea/README.txt 61e62e519579e4a112791354d6d440f8b51ea6db3b0bab58d59f29df42d2dfe3 F autoconf/tea/aclocal.m4 52c47aac44ce0ddb1f918b6993e8beb8eee88f43 @@ -50,7 +50,7 @@ F autosetup/cc.tcl c0fcc50ca91deff8741e449ddad05bcd08268bc31177e613a6343bbd1fd3e F autosetup/jimsh0.c 6573f6bc6ff204de0139692648d7037ca0b6c067bac83a7b4e087f20a86866a4 F autosetup/pkg-config.tcl 4e635bf39022ff65e0d5434339dd41503ea48fc53822c9c5bde88b02d3d952ba F autosetup/proj.tcl cef1e0aa0f2dee2042af66f28c97a9445f84d55d858ba9db4f6116846a1a325f -F autosetup/sqlite-config.tcl 9b3ae79286705077003f0b54bb9d2cd388f9bef5017707cc73f0f90ba56ce865 +F autosetup/sqlite-config.tcl 62fd6e8782ecfb9f8e54cf2860e590ce9d8692218f03cfa8b25e87ff6b1d0b9b F autosetup/system.tcl 51d4be76cd9a9074704b584e5c9cbba616202c8468cf9ba8a4f8294a7ab1dba9 F configure 9a00b21dfd13757bbfb8d89b30660a89ec1f8f3a79402b8f9f9b6fc475c3303a x F contrib/sqlitecon.tcl 210a913ad63f9f991070821e599d600bd913e0ad @@ -2209,8 +2209,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P 57b2b812c8c5524f315e20cee0e6a12a3b1635aeb42925bf891532a7029d0eb0 -R 914d530882ce85285895c4ba17cd5bb4 +P 1768de6e9e2c6ff3a9ee29fa6f488fb3d23a3599195ac7d1b09e61c02b7d18b3 +R fdc42f738677b90118628cf2f1a344a1 U stephan -Z 452df3b98ff1feca6a8fd2421b0c5ff6 +Z 712b8acba7b833aec2f3ddadc507080f # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 834fa7d6b4..d8bcef0a58 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -1768de6e9e2c6ff3a9ee29fa6f488fb3d23a3599195ac7d1b09e61c02b7d18b3 +75535f2355b3b2e83dd57f4c30340af98c8dbcfe6ff1e9be17d23bd30d7d766c From ba8e3ca139f65c7cae79bcf905032705ddd765f7 Mon Sep 17 00:00:00 2001 From: stephan Date: Tue, 11 Feb 2025 17:10:10 +0000 Subject: [PATCH 087/194] Move the configure flags definition and handling into autosetup/sqlite-config.tcl to avoid duplication between auto.def and autoconf/auto.def while still giving us a way to filter the canonical-tree-only flags out of the autoconf build. FossilOrigin-Name: 9978c87139b7b04208fd1f62121fc4e1e2080723fde69a2bbdca88769f4baf22 --- auto.def | 212 +----------------------------- autoconf/auto.def | 75 +---------- autosetup/sqlite-config.tcl | 251 ++++++++++++++++++++++++++++++++++-- manifest | 16 +-- manifest.uuid | 2 +- 5 files changed, 250 insertions(+), 306 deletions(-) diff --git a/auto.def b/auto.def index 6274d79b68..d9fa7018a3 100644 --- a/auto.def +++ b/auto.def @@ -12,217 +12,9 @@ # # JimTCL: https://jim.tcl.tk # + use sqlite-config - -if {[string first " " $autosetup(srcdir)] != -1} { - user-error "The pathname of the source tree\ - may not contain space characters" -} -if {[string first " " $autosetup(builddir)] != -1} { - user-error "The pathname of the build directory\ - may not contain space characters" -} - - -######################################################################## -# Regarding flag compatibility with the historical autotool configure -# script: -# -# A very long story made short, autosetup's --flag handling has -# some behaviors which make it impossible to implement 100% identical -# flags compared to the historical autotools build. The differences -# are documented here: -# -# 1) --debug is used by autosetup itself, but we patch it because -# decades of muscle memory expect --debug to apply to this code, -# not the configure script (details are in autosetup/README.md). -# -# 2) In autosetup, all flags starting with (--enable, --disable) are -# forced to be booleans and receive special handling in how they're -# resolved. Because of that we have to rename: -# -# 2.1) --enable-tempstore[=no] to --with-tempstore[=no], noting that -# it has four legal values, not two. -# -######################################################################## -# A gentle introduction to flags handling in autosetup -# -# Reference: https://msteveb.github.io/autosetup/developer/ -# -# All configure flags must be described in an 'options' call, which -# must appear very early on in this script. The general syntax is: -# -# FLAG => {Help text} -# -# Where FLAG can have any of the following formats: -# -# boolopt => "a boolean option which defaults to disabled" -# boolopt2=1 => "a boolean option which defaults to enabled" -# stringopt: => "an option which takes an argument, e.g. --stringopt=value" -# stringopt2:=value => "an option where the argument is optional and defaults to 'value'" -# optalias booltopt3 => "a boolean with a hidden alias. --optalias is not shown in --help" -# -# Autosetup does no small amount of specialized handling for flags, -# especially booleans. Each bool-type --FLAG implicitly gets -# --enable-FLAG and --disable-FLAG forms. e.g. we define a flag -# "readline", which will be interpreted in one of two ways, depending -# on how it's invoked and how its default is defined: -# -# --enable-readline ==> boolean true -# --disable-readline ==> boolean false -# -# Passing --readline or --readline=1 is equivalent to passing -# --enable-readline, and --readline=0 is equivalent to -# --disable-readline. -# -# The behavior described above can lead lead to some confusion when -# writing help text. For example: -# -# options { json=1 {Disable JSON functions} } -# -# The reason the help text says "disable" is because a boolean option -# which defaults to true is, in the --help text, rendered as: -# -# --disable-json Disable JSON functions -# -# Whereas a bool flag which defaults to false will instead render as: -# -# --enable-FLAG -# -# Non-boolean flags, in contrast, use the names specifically given to -# them in the [options] invocation. e.g. "with-tcl" is the --with-tcl -# flag. -# -# Fetching values for flags: -# -# booleans: use one of: -# - [opt-bool FLAG] is autosetup's built-in command for this, but we -# have some convenience variants: -# - [proj-opt-truthy FLAG] -# - [proj-opt-if-truthy FLAG {THEN} {ELSE}] -# -# Non-boolean (i.e. string) flags: -# - [opt-val FLAG ?default?] -# - [opt-str ...] - see the docs in ./autosetup/autosetup -# -######################################################################## -set flags { - # When writing {help text blocks}, be aware that autosetup formats - # them differently (left-aligned, directly under the --flag) if the - # block starts with a newline. It does NOT expand vars and commands, - # but we use a [subst] call below which will replace (only) var - # refs. - - # - shared=1 => {Disable build of shared libary} - static=1 => {Disable build of static library (mostly)} - amalgamation=1 => {Disable the amalgamation and instead build all files separately.} - # - # - threadsafe=1 => {Disable mutexing} - with-tempstore:=no => {Use an in-RAM database for temporary tables: never,no,yes,always} - largefile=1 => {Disable large file support} - load-extension=1 => {Disable loading of external extensions} - math=1 => {Disable math functions} - json=1 => {Disable JSON functions} - memsys5 => {Enable MEMSYS5} - memsys3 => {Enable MEMSYS3} - fts3 => {Enable the FTS3 extension} - fts4 => {Enable the FTS4 extension} - fts5 => {Enable the FTS5 extension} - update-limit => {Enable the UPDATE/DELETE LIMIT clause} - geopoly => {Enable the GEOPOLY extension} - rtree => {Enable the RTREE extension} - session => {Enable the SESSION extension} - all => {Enable FTS4, FTS5, Geopoly, RTree, Sessions} - # - # - with-tcl:DIR => - {Directory containing tclConfig.sh or a directory one level up from - that, from which we can derive a directory containing tclConfig.sh. - A dir name of "prefix" is equivalent to the directory specified by - the --prefix flag.} - with-tclsh:PATH => - {Full pathname of tclsh to use. It is used for (A) trying to find - tclConfig.sh and (B) all TCL-based code generation. Warning: if - its containing dir has multiple tclsh versions, it may select the - wrong tclConfig.sh!} - tcl=1 => - {Disable components which require TCL, including all tests. - This tree requires TCL for code generation but can use the in-tree - copy of autosetup/jimsh0.c for that. The SQLite TCL extension and the - test code require a canonical tclsh.} - # - # - readline=1 => {Disable readline support} - # --with-readline-lib is a backwards-compatible alias for - # --with-readline-ldflags - with-readline-lib: - with-readline-ldflags:=auto - => {Readline LDFLAGS, e.g. -lreadline -lncurses} - # --with-readline-inc is a backwards-compatible alias for - # --with-readline-cflags. - with-readline-inc: - with-readline-cflags:=auto - => {Readline CFLAGS, e.g. -I/path/to/includes} - with-readline-header:PATH - => {Full path to readline.h, from which --with-readline-cflags will be derived} - with-linenoise:DIR => {Source directory for linenoise.c and linenoise.h} - editline=0 => {Enable BSD editline support} - # - # - with-icu-ldflags:LDFLAGS - => {Enable SQLITE_ENABLE_ICU and add the given linker flags for the ICU libraries} - with-icu-cflags:CFLAGS - => {Apply extra CFLAGS/CPPFLAGS necessary for building with ICU. e.g. -I/usr/local/include} - with-icu-config:=auto => {Enable SQLITE_ENABLE_ICU. Value must be one of: auto, pkg-config, /path/to/icu-config} - icu-collations=0 => {Enable SQLITE_ENABLE_ICU_COLLATIONS. Requires --with-icu-ldflags=... or --with-icu-config} - # - # - with-wasi-sdk:=/opt/wasi-sdk - => {Top-most dir of the wasi-sdk for a WASI build} - with-emsdk:=auto => {Top-most dir of the Emscripten SDK installation. Default = EMSDK env var.} - # - # - # Note that using the --debug/--enable-debug flag here requires patching - # autosetup/autosetup to rename the --debug to --autosetup-debug. - with-debug=0 - debug=0 => - {Enable debug build flags. This option will impact performance by - as much as 4x, as it includes large numbers of assert()s in - performance-critical loops. Never use --debug for production - builds.} - scanstatus => {Enable the SQLITE_ENABLE_STMT_SCANSTATUS feature flag} - dev => {Enable dev-mode build: automatically enables certain other flags} - test-status => {Enable status of tests} - gcov=0 => {Enable coverage testing using gcov} - linemacros => {Enable #line macros in the amalgamation} - dynlink-tools => {Dynamically link libsqlite3 to certain tools which normally statically embed it.} - dump-defines=0 => {Dump autosetup defines to $::sqliteConfig(dump-defines-txt) (for build debugging)} - # - # - soname:=legacy => - # --soname has a long story behind it: https://sqlite.org/src/forumpost/5a3b44f510df8ded - {SONAME for libsqlite3.so. "none", or not using this flag, sets no - soname. "legacy" sets it to its historical value of - libsqlite3.so.0. A value matching the glob "libsqlite3.*" sets - it to that literal value. Any other value is assumed to be a - suffix which gets applied to "libsqlite3.so.", - e.g. --soname=9.10 equates to "libsqlite3.so.9.10". - } - out-implib=0 => - {Enable use of --out-implib linker flag to generate an "import library" for the DLL} - # -} -if {"" ne $::sqliteConfig(dump-defines-json)} { - lappend flags \ - defines-json-include-lowercase=0 \ - => {Include lower-case defines (primarily system paths) in $::sqliteConfig(dump-defines-json)} -} - -options [subst -nobackslashes -nocommands $flags] -unset flags -sqlite-post-options-init +sqlite-config-bootstrap canonical sqlite-setup-default-cflags proj-if-opt-truthy dev { diff --git a/autoconf/auto.def b/autoconf/auto.def index 42af1b459b..8732f74137 100644 --- a/autoconf/auto.def +++ b/autoconf/auto.def @@ -8,80 +8,7 @@ # included in this source tree as ./autosetup/jimsh0.c. # use sqlite-config - -options { - # - static=1 => {Disable build of static library} - shared=1 => {Disable build of shared library} - # - # - threadsafe=1 => {Disable mutexing} - with-tempstore:=no => {Use an in-RAM database for temporary tables: never,no,yes,always} - load-extension=1 => {Disable loading of external extensions} - math=1 => {Disable math functions} - json=1 => {Disable JSON functions} - memsys5 => {Enable MEMSYS5} - memsys3 => {Enable MEMSYS3} - fts3 => {Enable the FTS3 extension} - fts4 => {Enable the FTS4 extension} - fts5 => {Enable the FTS5 extension} - update-limit => {Enable the UPDATE/DELETE LIMIT clause} - geopoly => {Enable the GEOPOLY extension} - rtree => {Enable the RTREE extension} - session => {Enable the SESSION extension} - all => {Enable FTS4, FTS5, Geopoly, RTree, Sessions} - # - # - readline=1 => {Disable readline support} - # --with-readline-lib is a backwards-compatible alias for - # --with-readline-ldflags - with-readline-lib: - with-readline-ldflags:=auto - => {Readline LDFLAGS, e.g. -lreadline -lncurses} - # --with-readline-inc is a backwards-compatible alias for - # --with-readline-cflags. - with-readline-inc: - with-readline-cflags:=auto - => {Readline CFLAGS, e.g. -I/path/to/includes} - with-readline-header:PATH - => {Full path to readline.h, from which --with-readline-cflags will be derived} - with-linenoise:DIR => {Source directory for linenoise.c and linenoise.h} - editline=0 => {Enable BSD editline support} - # - # - with-icu-ldflags:LDFLAGS - => {Enable SQLITE_ENABLE_ICU and add the given linker flags for the ICU libraries} - with-icu-cflags:CFLAGS - => {Apply extra CFLAGS/CPPFLAGS necessary for building with ICU. e.g. -I/usr/local/include} - with-icu-config:=auto => {Enable SQLITE_ENABLE_ICU. Value must be one of: auto, pkg-config, /path/to/icu-config} - icu-collations=0 => {Enable SQLITE_ENABLE_ICU_COLLATIONS. Requires --with-icu-ldflags=... or --with-icu-config} - # - # - # Note that using the --debug/--enable-debug flag here requires patching - # autosetup/autosetup to rename the --debug to --autosetup-debug. - with-debug=0 - debug=0 => - {Enable debug build flags. This option will impact performance by - as much as 4x, as it includes large numbers of assert()s in - performance-critical loops. Never use --debug for production - builds.} - # - # - soname:=legacy => - # --soname has a long story behind it: https://sqlite.org/src/forumpost/5a3b44f510df8ded - {SONAME for libsqlite3.so. "none", or not using this flag, sets no - soname. "legacy" sets it to its historical value of - libsqlite3.so.0. A value matching the glob "libsqlite3.*" sets - it to that literal value. Any other value is assumed to be a - suffix which gets applied to "libsqlite3.so.", - e.g. --soname=9.10 equates to "libsqlite3.so.9.10". - } - out-implib=0 => - {Enable use of --out-implib linker flag to generate an "import library" for the DLL} - # -} - -sqlite-post-options-init +sqlite-config-bootstrap autoconf sqlite-check-common-bins sqlite-check-common-system-deps proj-check-rpath diff --git a/autosetup/sqlite-config.tcl b/autosetup/sqlite-config.tcl index 1aaa8af374..f474fe7b82 100644 --- a/autosetup/sqlite-config.tcl +++ b/autosetup/sqlite-config.tcl @@ -3,6 +3,15 @@ # that they can be reused in the TEA sub-tree. This file requires # functions from proj.tcl. +if {[string first " " $autosetup(srcdir)] != -1} { + user-error "The pathname of the source tree\ + may not contain space characters" +} +if {[string first " " $autosetup(builddir)] != -1} { + user-error "The pathname of the build directory\ + may not contain space characters" +} + use cc cc-db cc-shared cc-lib pkg-config proj # @@ -22,15 +31,6 @@ array set sqliteConfig [proj-strip-hash-comments { # Output file for --dump-defines. Intended only for build debugging # and not part of the public build interface. dump-defines-txt ./config.defines.txt - # - # Output file for --dump-defines-json. This is the autosetup - # counterpart of the historical "DEFS" var which was generated by - # the autotools in the pre-processed autotools builds (but not in - # the canonical tree). Generation of this file is disabled (via an - # empty file name) until/unless someone voices a specific interest - # in it. The original motivating use case is handled fine by - # sqlite_cfg.h. - dump-defines-json "" }] # @@ -41,6 +41,231 @@ array set sqliteConfig [proj-strip-hash-comments { # set sqliteConfig(is-cross-compiling) [proj-is-cross-compiling] +######################################################################## +# Processes all configure --flags for this build $buildMode must be +# either "canonical" or "autoconf", and others may be added in the +# future. +proc sqlite-config-bootstrap {buildMode} { + if {$buildMode ni {canonical autoconf}} { + user-error "Invalid build mode: $buildMode. Expecting one of: canonical, autoconf" + } + ######################################################################## + # A gentle introduction to flags handling in autosetup + # + # Reference: https://msteveb.github.io/autosetup/developer/ + # + # All configure flags must be described in an 'options' call. The + # general syntax is: + # + # FLAG => {Help text} + # + # Where FLAG can have any of the following formats: + # + # boolopt => "a boolean option which defaults to disabled" + # boolopt2=1 => "a boolean option which defaults to enabled" + # stringopt: => "an option which takes an argument, e.g. --stringopt=value" + # stringopt2:=value => "an option where the argument is optional and defaults to 'value'" + # optalias booltopt3 => "a boolean with a hidden alias. --optalias is not shown in --help" + # + # Autosetup does no small amount of specialized handling for flags, + # especially booleans. Each bool-type --FLAG implicitly gets + # --enable-FLAG and --disable-FLAG forms. That can lead lead to some + # confusion when writing help text. For example: + # + # options { json=1 {Disable JSON functions} } + # + # The reason the help text says "disable" is because a boolean option + # which defaults to true is, in the --help text, rendered as: + # + # --disable-json Disable JSON functions + # + # Whereas a bool flag which defaults to false will instead render as: + # + # --enable-FLAG + # + # Non-boolean flags, in contrast, use the names specifically given to + # them in the [options] invocation. e.g. "with-tcl" is the --with-tcl + # flag. + # + # Fetching values for flags: + # + # booleans: use one of: + # - [opt-bool FLAG] is autosetup's built-in command for this, but we + # have some convenience variants: + # - [proj-opt-truthy FLAG] + # - [proj-opt-if-truthy FLAG {THEN} {ELSE}] + # + # Non-boolean (i.e. string) flags: + # - [opt-val FLAG ?default?] + # - [opt-str ...] - see the docs in ./autosetup/autosetup + # + # [proj-opt-was-provided] can be used to determine whether a flag was + # explicitly provided, which is often useful for distinguishing from + # the case of a default value. + ######################################################################## + set allFlags { + # Structure: a list of M {Z}, where M is a descriptive option + # group name and Z is a list of X Y pairs. X is a list of + # $buildMode name(s) to which these flags apply, or {*} to apply + # to all builds. Y is a {block} in the form expected by + # autosetup's [options] command. Each block which is applicable + # to $buildMode is appended to a new list before that list is + # passed on to [options]. The order of each Y and sub-Y is + # retained, which is significant for rendering of --help. + + # When writing {help text blocks}, be aware that autosetup formats + # them differently (left-aligned, directly under the --flag) if the + # block starts with a newline. It does NOT expand vars and commands, + # but we use a [subst] call below which will replace (only) var + # refs. + + build-modes { + {*} { + shared=1 => {Disable build of shared libary} + static=1 => {Disable build of static library (mostly)} + } + {canonical} { + amalgamation=1 => {Disable the amalgamation and instead build all files separately.} + } + } + + lib-features { + {*} { + threadsafe=1 => {Disable mutexing} + with-tempstore:=no => {Use an in-RAM database for temporary tables: never,no,yes,always} + largefile=1 => {Disable large file support} + load-extension=1 => {Disable loading of external extensions} + math=1 => {Disable math functions} + json=1 => {Disable JSON functions} + memsys5 => {Enable MEMSYS5} + memsys3 => {Enable MEMSYS3} + fts3 => {Enable the FTS3 extension} + fts4 => {Enable the FTS4 extension} + fts5 => {Enable the FTS5 extension} + update-limit => {Enable the UPDATE/DELETE LIMIT clause} + geopoly => {Enable the GEOPOLY extension} + rtree => {Enable the RTREE extension} + session => {Enable the SESSION extension} + all => {Enable FTS4, FTS5, Geopoly, RTree, Sessions} + } + } + + tcl { + {canonical} { + with-tcl:DIR => + {Directory containing tclConfig.sh or a directory one level up from + that, from which we can derive a directory containing tclConfig.sh. + A dir name of "prefix" is equivalent to the directory specified by + the --prefix flag.} + with-tclsh:PATH => + {Full pathname of tclsh to use. It is used for (A) trying to find + tclConfig.sh and (B) all TCL-based code generation. Warning: if + its containing dir has multiple tclsh versions, it may select the + wrong tclConfig.sh!} + tcl=1 => + {Disable components which require TCL, including all tests. + This tree requires TCL for code generation but can use the in-tree + copy of autosetup/jimsh0.c for that. The SQLite TCL extension and the + test code require a canonical tclsh.} + } + } + + line-editing { + {*} { + readline=1 => {Disable readline support} + # --with-readline-lib is a backwards-compatible alias for + # --with-readline-ldflags + with-readline-lib: + with-readline-ldflags:=auto + => {Readline LDFLAGS, e.g. -lreadline -lncurses} + # --with-readline-inc is a backwards-compatible alias for + # --with-readline-cflags. + with-readline-inc: + with-readline-cflags:=auto + => {Readline CFLAGS, e.g. -I/path/to/includes} + with-readline-header:PATH + => {Full path to readline.h, from which --with-readline-cflags will be derived} + with-linenoise:DIR => {Source directory for linenoise.c and linenoise.h} + editline=0 => {Enable BSD editline support} + } + } + + icu { + {*} { + with-icu-ldflags:LDFLAGS + => {Enable SQLITE_ENABLE_ICU and add the given linker flags for the ICU libraries} + with-icu-cflags:CFLAGS + => {Apply extra CFLAGS/CPPFLAGS necessary for building with ICU. e.g. -I/usr/local/include} + with-icu-config:=auto => {Enable SQLITE_ENABLE_ICU. Value must be one of: auto, pkg-config, /path/to/icu-config} + icu-collations=0 => {Enable SQLITE_ENABLE_ICU_COLLATIONS. Requires --with-icu-ldflags=... or --with-icu-config} + } + } + + alternative-builds { + {canonical} { + with-wasi-sdk:=/opt/wasi-sdk + => {Top-most dir of the wasi-sdk for a WASI build} + with-emsdk:=auto => {Top-most dir of the Emscripten SDK installation. Default = EMSDK env var.} + } + } + + # Note that using the --debug/--enable-debug flag here requires patching + # autosetup/autosetup to rename the --debug to --autosetup-debug. + developer { + {*} { + with-debug=0 + debug=0 => + {Enable debug build flags. This option will impact performance by + as much as 4x, as it includes large numbers of assert()s in + performance-critical loops. Never use --debug for production + builds.} + scanstatus => {Enable the SQLITE_ENABLE_STMT_SCANSTATUS feature flag} + } + {canonical} { + dev => {Enable dev-mode build: automatically enables certain other flags} + test-status => {Enable status of tests} + gcov=0 => {Enable coverage testing using gcov} + linemacros => {Enable #line macros in the amalgamation} + dynlink-tools => {Dynamically link libsqlite3 to certain tools which normally statically embed it.} + } + {*} { + dump-defines=0 => {Dump autosetup defines to $::sqliteConfig(dump-defines-txt) (for build debugging)} + } + } + + packaging { + {*} { + # soname: https://sqlite.org/src/forumpost/5a3b44f510df8ded + soname:=legacy => + {SONAME for libsqlite3.so. "none", or not using this flag, sets no + soname. "legacy" sets it to its historical value of + libsqlite3.so.0. A value matching the glob "libsqlite3.*" sets + it to that literal value. Any other value is assumed to be a + suffix which gets applied to "libsqlite3.so.", + e.g. --soname=9.10 equates to "libsqlite3.so.9.10". + } + out-implib=0 => + {Enable use of --out-implib linker flag to generate an "import library" for the DLL} + } + } + }; # $allOpts + + set opts {} + foreach {group XY} [subst -nobackslashes -nocommands [proj-strip-hash-comments $allFlags]] { + foreach {X Y} $XY { + if { $buildMode in $X || "*" in $X } { + foreach y $Y { + lappend opts $y + } + } + } + } + #puts "options = $opts" + #exit 0 + options $opts + sqlite-post-options-init +}; # sqlite-config-bootstrap + ######################################################################## # Runs some common initialization which must happen immediately after # autosetup's [options] function is called. This is also a convenient @@ -1472,10 +1697,10 @@ proc sqlite-dump-defines {} { -array {*.list} -auto {OPT_* PACKAGE_* HAVE_*} } - if {[opt-bool defines-json-include-lowercase]} { - lappend dumpDefsOpt -none {lib_*} ; # remnants from proj-check-function-in-lib and friends - lappend dumpDefsOpt -auto {[a-z]*} - } +# if {$::sqliteConfig(dump-defines-json-include-lowercase)} { +# lappend dumpDefsOpt -none {lib_*} ; # remnants from proj-check-function-in-lib and friends +# lappend dumpDefsOpt -auto {[a-z]*} +# } lappend dumpDefsOpt -none * proj-dump-defs-json $::sqliteConfig(dump-defines-json) {*}$dumpDefsOpt undefine OPT_FEATURE_FLAGS.list diff --git a/manifest b/manifest index 77a1282113..4248868afc 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Make\sthe\s--out-implib\ssupport\s([6092b0b86bf93a3d])\sspecifically\sopt-in\sbecause\sthe\sfeature\scheck\sfor\sit\spasses\son\ssome\splatforms\swhere\sit\sis\snot\srecognized\sat\slink-time. -D 2025-02-11T13:13:46.626 +C Move\sthe\sconfigure\sflags\sdefinition\sand\shandling\sinto\sautosetup/sqlite-config.tcl\sto\savoid\sduplication\sbetween\sauto.def\sand\sautoconf/auto.def\swhile\sstill\sgiving\sus\sa\sway\sto\sfilter\sthe\scanonical-tree-only\sflags\sout\sof\sthe\sautoconf\sbuild. +D 2025-02-11T17:10:10.238 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d @@ -14,13 +14,13 @@ F art/sqlite370.eps aa97a671332b432a54e1d74ff5e8775be34200c2 F art/sqlite370.ico af56c1d00fee7cd4753e8631ed60703ed0fc6e90 F art/sqlite370.jpg d512473dae7e378a67e28ff96a34da7cb331def2 F art/sqlite370.svg 40b7e2fe8aac3add5d56dd86ab8d427a4eca5bcb3fe4f8946cb3794e1821d531 -F auto.def ccf74471ec89edfd5bf942fd6d60fc8ce09f7aa7527d668a1ac44d1bbbcb412d +F auto.def d06ef819324fc157e231413ad55d1cb26ad4d83bfafa14a1daa3b9d97e33e771 F autoconf/Makefile.fallback 22fe523eb36dfce31e0f6349f782eb084e86a5620b2b0b4f84a2d6133f53f5ac F autoconf/Makefile.in 7bd73a4c8cd89025cbc92b4f887c6fd1b8cd8ecbe62c4ac1f36ac84d04043479 F autoconf/Makefile.msc 0a071367537dc395285a5d624ac4f99f3a387b27cc5e89752423c0499e15aec4 F autoconf/README.first f1d3876e9a7852c22f275a6f06814e64934cecbc0b5b9617d64849094c1fd136 F autoconf/README.txt 7f01dc3915e2d68f329011073662369e62a0938a2c69398807823c57591cb288 -F autoconf/auto.def f468a32e6f57c52390e0fe2466974d0afaa1b0fc1d51cbacb4cb3950bd089f67 +F autoconf/auto.def db6c33338294a8b10e205a9081c540b90620b12d916c2fd728a8939fb6fdd97b F autoconf/tea/Makefile.in ba0556fee8da09c066bad85a4457904e46ee2c2eabaa309c0e83a78f2f151a8e F autoconf/tea/README.txt 61e62e519579e4a112791354d6d440f8b51ea6db3b0bab58d59f29df42d2dfe3 F autoconf/tea/aclocal.m4 52c47aac44ce0ddb1f918b6993e8beb8eee88f43 @@ -50,7 +50,7 @@ F autosetup/cc.tcl c0fcc50ca91deff8741e449ddad05bcd08268bc31177e613a6343bbd1fd3e F autosetup/jimsh0.c 6573f6bc6ff204de0139692648d7037ca0b6c067bac83a7b4e087f20a86866a4 F autosetup/pkg-config.tcl 4e635bf39022ff65e0d5434339dd41503ea48fc53822c9c5bde88b02d3d952ba F autosetup/proj.tcl cef1e0aa0f2dee2042af66f28c97a9445f84d55d858ba9db4f6116846a1a325f -F autosetup/sqlite-config.tcl 62fd6e8782ecfb9f8e54cf2860e590ce9d8692218f03cfa8b25e87ff6b1d0b9b +F autosetup/sqlite-config.tcl 297f5b10a46b46d0dd417a937595916d3868c5fe70af59d7c52516d0b31d6956 F autosetup/system.tcl 51d4be76cd9a9074704b584e5c9cbba616202c8468cf9ba8a4f8294a7ab1dba9 F configure 9a00b21dfd13757bbfb8d89b30660a89ec1f8f3a79402b8f9f9b6fc475c3303a x F contrib/sqlitecon.tcl 210a913ad63f9f991070821e599d600bd913e0ad @@ -2209,8 +2209,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P 1768de6e9e2c6ff3a9ee29fa6f488fb3d23a3599195ac7d1b09e61c02b7d18b3 -R fdc42f738677b90118628cf2f1a344a1 +P 75535f2355b3b2e83dd57f4c30340af98c8dbcfe6ff1e9be17d23bd30d7d766c +R b6935973a927dd6f6aec058ecd42249d U stephan -Z 712b8acba7b833aec2f3ddadc507080f +Z 9498d37db1e807d01c315ee284e7bf43 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index d8bcef0a58..0f5e4505b2 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -75535f2355b3b2e83dd57f4c30340af98c8dbcfe6ff1e9be17d23bd30d7d766c +9978c87139b7b04208fd1f62121fc4e1e2080723fde69a2bbdca88769f4baf22 From db253d086235cab3912cf5ae534e7e90dc2b2531 Mon Sep 17 00:00:00 2001 From: stephan Date: Tue, 11 Feb 2025 17:20:12 +0000 Subject: [PATCH 088/194] Rename a configure-internal function and fix handling of --dump-defines for the autoconf bundle. FossilOrigin-Name: 6aa54cc180e034a10d8fc8f8b0c13d7bc0c94509b4240ac855121d501853768f --- auto.def | 3 +-- autoconf/auto.def | 2 +- autosetup/sqlite-config.tcl | 8 +++++++- manifest | 16 ++++++++-------- manifest.uuid | 2 +- 5 files changed, 18 insertions(+), 13 deletions(-) diff --git a/auto.def b/auto.def index d9fa7018a3..981b455954 100644 --- a/auto.def +++ b/auto.def @@ -71,5 +71,4 @@ sqlite-handle-load-extension sqlite-handle-math sqlite-handle-icu sqlite-handle-emsdk -sqlite-common-late-stage-config -sqlite-dump-defines +sqlite-config-finalize diff --git a/autoconf/auto.def b/autoconf/auto.def index 8732f74137..c2e02fe3d8 100644 --- a/autoconf/auto.def +++ b/autoconf/auto.def @@ -25,4 +25,4 @@ sqlite-handle-icu define ENABLE_LIB_SHARED [opt-bool shared] define ENABLE_LIB_STATIC [opt-bool static] -sqlite-common-late-stage-config +sqlite-config-finalize diff --git a/autosetup/sqlite-config.tcl b/autosetup/sqlite-config.tcl index f474fe7b82..3d3f892bf0 100644 --- a/autosetup/sqlite-config.tcl +++ b/autosetup/sqlite-config.tcl @@ -31,6 +31,11 @@ array set sqliteConfig [proj-strip-hash-comments { # Output file for --dump-defines. Intended only for build debugging # and not part of the public build interface. dump-defines-txt ./config.defines.txt + # + # If not empty then --dump-defines will dump not only + # (dump-defines-txt) but also a JSON file named after this option's + # value. + dump-defines-json "" }] # @@ -1215,11 +1220,12 @@ proc sqlite-check-out-implib {} { ######################################################################## # Performs late-stage config steps common to both the canonical and # autoconf bundle builds. -proc sqlite-common-late-stage-config {} { +proc sqlite-config-finalize {} { sqlite-check-mac-cversion sqlite-check-out-implib sqlite-process-dot-in-files sqlite-post-config-validation + sqlite-dump-defines } ######################################################################## diff --git a/manifest b/manifest index 4248868afc..615d5d04e7 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Move\sthe\sconfigure\sflags\sdefinition\sand\shandling\sinto\sautosetup/sqlite-config.tcl\sto\savoid\sduplication\sbetween\sauto.def\sand\sautoconf/auto.def\swhile\sstill\sgiving\sus\sa\sway\sto\sfilter\sthe\scanonical-tree-only\sflags\sout\sof\sthe\sautoconf\sbuild. -D 2025-02-11T17:10:10.238 +C Rename\sa\sconfigure-internal\sfunction\sand\sfix\shandling\sof\s--dump-defines\sfor\sthe\sautoconf\sbundle. +D 2025-02-11T17:20:12.606 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d @@ -14,13 +14,13 @@ F art/sqlite370.eps aa97a671332b432a54e1d74ff5e8775be34200c2 F art/sqlite370.ico af56c1d00fee7cd4753e8631ed60703ed0fc6e90 F art/sqlite370.jpg d512473dae7e378a67e28ff96a34da7cb331def2 F art/sqlite370.svg 40b7e2fe8aac3add5d56dd86ab8d427a4eca5bcb3fe4f8946cb3794e1821d531 -F auto.def d06ef819324fc157e231413ad55d1cb26ad4d83bfafa14a1daa3b9d97e33e771 +F auto.def 74ec59fbf7de5038aa9c3d0b1e0fea67e128e432ff9d84472c4016b08ec3d60b F autoconf/Makefile.fallback 22fe523eb36dfce31e0f6349f782eb084e86a5620b2b0b4f84a2d6133f53f5ac F autoconf/Makefile.in 7bd73a4c8cd89025cbc92b4f887c6fd1b8cd8ecbe62c4ac1f36ac84d04043479 F autoconf/Makefile.msc 0a071367537dc395285a5d624ac4f99f3a387b27cc5e89752423c0499e15aec4 F autoconf/README.first f1d3876e9a7852c22f275a6f06814e64934cecbc0b5b9617d64849094c1fd136 F autoconf/README.txt 7f01dc3915e2d68f329011073662369e62a0938a2c69398807823c57591cb288 -F autoconf/auto.def db6c33338294a8b10e205a9081c540b90620b12d916c2fd728a8939fb6fdd97b +F autoconf/auto.def 1900a63cfa18e662b16d912c849ea81609a90b5fe00cea54955a41572e2c2cd0 F autoconf/tea/Makefile.in ba0556fee8da09c066bad85a4457904e46ee2c2eabaa309c0e83a78f2f151a8e F autoconf/tea/README.txt 61e62e519579e4a112791354d6d440f8b51ea6db3b0bab58d59f29df42d2dfe3 F autoconf/tea/aclocal.m4 52c47aac44ce0ddb1f918b6993e8beb8eee88f43 @@ -50,7 +50,7 @@ F autosetup/cc.tcl c0fcc50ca91deff8741e449ddad05bcd08268bc31177e613a6343bbd1fd3e F autosetup/jimsh0.c 6573f6bc6ff204de0139692648d7037ca0b6c067bac83a7b4e087f20a86866a4 F autosetup/pkg-config.tcl 4e635bf39022ff65e0d5434339dd41503ea48fc53822c9c5bde88b02d3d952ba F autosetup/proj.tcl cef1e0aa0f2dee2042af66f28c97a9445f84d55d858ba9db4f6116846a1a325f -F autosetup/sqlite-config.tcl 297f5b10a46b46d0dd417a937595916d3868c5fe70af59d7c52516d0b31d6956 +F autosetup/sqlite-config.tcl 40107b6a75a2ee367359b2adeb2221e118f5dfa6f10b0a0c0f237fc59fbedef3 F autosetup/system.tcl 51d4be76cd9a9074704b584e5c9cbba616202c8468cf9ba8a4f8294a7ab1dba9 F configure 9a00b21dfd13757bbfb8d89b30660a89ec1f8f3a79402b8f9f9b6fc475c3303a x F contrib/sqlitecon.tcl 210a913ad63f9f991070821e599d600bd913e0ad @@ -2209,8 +2209,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P 75535f2355b3b2e83dd57f4c30340af98c8dbcfe6ff1e9be17d23bd30d7d766c -R b6935973a927dd6f6aec058ecd42249d +P 9978c87139b7b04208fd1f62121fc4e1e2080723fde69a2bbdca88769f4baf22 +R 76e33179af2e988165dad18e5266ff58 U stephan -Z 9498d37db1e807d01c315ee284e7bf43 +Z 2f25ba1e1af4da40884b8449b6a5c47c # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 0f5e4505b2..37bfe81875 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -9978c87139b7b04208fd1f62121fc4e1e2080723fde69a2bbdca88769f4baf22 +6aa54cc180e034a10d8fc8f8b0c13d7bc0c94509b4240ac855121d501853768f From 833dd3daff87be91150c6b76da0c7a05afe50c0c Mon Sep 17 00:00:00 2001 From: dan Date: Tue, 11 Feb 2025 18:29:35 +0000 Subject: [PATCH 089/194] Fix "unused variable" warnings in os_unix.c and os_win.c. FossilOrigin-Name: 8e809632ba3bb20b7ec23ce9e6ca659c57cf1338b1fe8c33502c5f3161061dd2 --- manifest | 16 ++++++++-------- manifest.uuid | 2 +- src/os_unix.c | 2 +- src/os_win.c | 2 +- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/manifest b/manifest index 75514bd2c6..f6777992c7 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Merge\slatest\schanges\sfrom\strunk\sinto\sthis\sbranch. -D 2025-02-11T17:10:46.191 +C Fix\s"unused\svariable"\swarnings\sin\sos_unix.c\sand\sos_win.c. +D 2025-02-11T18:29:35.601 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d @@ -16,7 +16,7 @@ F art/sqlite370.jpg d512473dae7e378a67e28ff96a34da7cb331def2 F art/sqlite370.svg 40b7e2fe8aac3add5d56dd86ab8d427a4eca5bcb3fe4f8946cb3794e1821d531 F auto.def ccf74471ec89edfd5bf942fd6d60fc8ce09f7aa7527d668a1ac44d1bbbcb412d F autoconf/Makefile.fallback 22fe523eb36dfce31e0f6349f782eb084e86a5620b2b0b4f84a2d6133f53f5ac -F autoconf/Makefile.in 7bd73a4c8cd89025cbc92b4f887c6fd1b8cd8ecbe62c4ac1f36ac84d04043479 w autoconf/Makefile.am +F autoconf/Makefile.in 7bd73a4c8cd89025cbc92b4f887c6fd1b8cd8ecbe62c4ac1f36ac84d04043479 F autoconf/Makefile.msc 0a071367537dc395285a5d624ac4f99f3a387b27cc5e89752423c0499e15aec4 F autoconf/README.first f1d3876e9a7852c22f275a6f06814e64934cecbc0b5b9617d64849094c1fd136 F autoconf/README.txt 7f01dc3915e2d68f329011073662369e62a0938a2c69398807823c57591cb288 @@ -764,8 +764,8 @@ F src/os.h 1ff5ae51d339d0e30d8a9d814f4b8f8e448169304d83a7ed9db66a65732f3e63 F src/os_common.h 6c0eb8dd40ef3e12fe585a13e709710267a258e2c8dd1c40b1948a1d14582e06 F src/os_kv.c 4d39e1f1c180b11162c6dc4aa8ad34053873a639bac6baae23272fc03349986a F src/os_setup.h 6011ad7af5db4e05155f385eb3a9b4470688de6f65d6166b8956e58a3d872107 -F src/os_unix.c 49ee8571f42e1bfddc7d56829f68bce86f00c3000240ffbed0f49170631136ae -F src/os_win.c 48c536ebd662a4b39623fffba41d95234854ddfbea4865d03fef1f51c29da187 +F src/os_unix.c 1e887f1f926a76a65ebcef79aa6da76e369ad7f899fa211c6ee56ff953c098a2 +F src/os_win.c 84502044e9d064c54f1931e015ef49a4804114e80cc75461c5bda357070bc596 F src/os_win.h 7b073010f1451abe501be30d12f6bc599824944a F src/pager.c 3a1c4e7f69af482e33c8cba8a75afe0dda0ea6391240adac22b040ce1bdeef44 F src/pager.h 6137149346e6c8a3ddc1eeb40aee46381e9bc8b0fcc6dda8a1efde993c2275b8 @@ -2211,8 +2211,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P d2d6a000fb9bf8097e0ce9979685408d183be3ab785ceeb11ec1f97a81a83e41 75535f2355b3b2e83dd57f4c30340af98c8dbcfe6ff1e9be17d23bd30d7d766c -R 4f8d4a49a69f37717318dd9062d1384e +P e5ec5bb9f4dc3e02db7ab0e49686f47617af75d3f7d4ab23288a1aea4a693e59 +R cd93c7dbc68ed42af0ea6345d25217a0 U dan -Z 6f5c2c68e6ed575542ad7a68cf45ae3a +Z 4758547541b3fb9f6b2874ae87ffc5c6 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 315c9000b9..52cfe040be 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -e5ec5bb9f4dc3e02db7ab0e49686f47617af75d3f7d4ab23288a1aea4a693e59 +8e809632ba3bb20b7ec23ce9e6ca659c57cf1338b1fe8c33502c5f3161061dd2 diff --git a/src/os_unix.c b/src/os_unix.c index 02fe7c819c..78512cb061 100644 --- a/src/os_unix.c +++ b/src/os_unix.c @@ -5045,7 +5045,7 @@ static int unixShmLock( ** ** It is not permitted to block on the RECOVER lock. */ -#ifdef SQLITE_ENABLE_SETLK_TIMEOUT +#if defined(SQLITE_ENABLE_SETLK_TIMEOUT) && defined(SQLITE_DEBUG) { u16 lockMask = (p->exclMask|p->sharedMask); assert( (flags & SQLITE_SHM_UNLOCK) || pDbFd->iBusyTimeout==0 || ( diff --git a/src/os_win.c b/src/os_win.c index f7a295aa9b..88701d5d13 100644 --- a/src/os_win.c +++ b/src/os_win.c @@ -4379,7 +4379,7 @@ static int winShmLock( ** ** It is not permitted to block on the RECOVER lock. */ -#ifdef SQLITE_ENABLE_SETLK_TIMEOUT +#if defined(SQLITE_ENABLE_SETLK_TIMEOUT) && defined(SQLITE_DEBUG) { u16 lockMask = (p->exclMask|p->sharedMask); assert( (flags & SQLITE_SHM_UNLOCK) || pDbFd->iBusyTimeout==0 || ( From e5769f6525ef93e668ff398fc930437cbe5bca10 Mon Sep 17 00:00:00 2001 From: dan Date: Tue, 11 Feb 2025 18:32:22 +0000 Subject: [PATCH 090/194] Update tool/mkctimec.tcl so that sqlite3_compileoption_xxx() APIs report on the SQLITE_ENABLE_SETLK_TIMEOUT option. FossilOrigin-Name: 303e8009ab59aad32030407baf3eff9443f7f9bed7947218b78293b06bba1737 --- manifest | 14 +++++++------- manifest.uuid | 2 +- src/ctime.c | 3 +++ tool/mkctimec.tcl | 1 + 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/manifest b/manifest index f6777992c7..f65979cb3f 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Fix\s"unused\svariable"\swarnings\sin\sos_unix.c\sand\sos_win.c. -D 2025-02-11T18:29:35.601 +C Update\stool/mkctimec.tcl\sso\sthat\ssqlite3_compileoption_xxx()\sAPIs\sreport\son\sthe\sSQLITE_ENABLE_SETLK_TIMEOUT\soption. +D 2025-02-11T18:32:22.367 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d @@ -725,7 +725,7 @@ F src/btreeInt.h 98aadb6dcb77b012cab2574d6a728fad56b337fc946839b9898c4b4c969e30b F src/build.c 602fc45ea6301a3dc03ec20a9f9b294c492b7e1766ae96651f2ba8044dc445a6 F src/callback.c acae8c8dddda41ee85cfdf19b926eefe830f371069f8aadca3aa39adf5b1c859 F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e -F src/ctime.c d35723024b963edce9c0fad5b3303e8bb9266083784844baed10a6dedfe26f3b +F src/ctime.c 9bdeec80f0baa804802c42c92a80edfcc018cd0687bf1a6636ac18bf10978e9d F src/date.c 842c08ac143a56a627b05ac51d68624f2b7b03e3b4cba596205e735eed64ee57 F src/dbpage.c 2e677acb658a29965e55398bbc61161cb7819da538057c8032adac7ab8e4a8c0 F src/dbstat.c 73362c0df0f40ad5523a6f5501224959d0976757b511299bf892313e79d14f5c @@ -2148,7 +2148,7 @@ F tool/merge-test.tcl de76b62f2de2a92d4c1ca4f976bce0aea6899e0229e250479b229b2a19 F tool/mkamalzip.tcl 8aa5ebe7973c8b8774062d34e15fea9815c4cc2ceea3a9b184695f005910876a F tool/mkautoconfamal.sh 14d2144043c6455958012f92324f4ce7c90a261b5daa2f2c7509498468475f8d F tool/mkccode.tcl 210159febe0ef0ecbc53c79833500663ceaba0115b2b374405818dc835b5f84b x -F tool/mkctimec.tcl ef6a67ec82e5b6fc19152a4c79f237227b18bf67ff16d155bac7adb94355d9cf x +F tool/mkctimec.tcl f756fba55fcfb62dcc24c470a521ad47b8e522320d6dbeaf607c43fbca2b2f66 x F tool/mkkeywordhash.c 6b0be901c47f9ad42215fc995eb2f4384ac49213b1fba395102ec3e999acf559 F tool/mkmsvcmin.tcl d76c45efda1cce2d4005bcea7b8a22bb752e3256009f331120fb4fecb14ebb7a F tool/mkopcodec.tcl 33d20791e191df43209b77d37f0ff0904620b28465cca6990cf8d60da61a07ef @@ -2211,8 +2211,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P e5ec5bb9f4dc3e02db7ab0e49686f47617af75d3f7d4ab23288a1aea4a693e59 -R cd93c7dbc68ed42af0ea6345d25217a0 +P 8e809632ba3bb20b7ec23ce9e6ca659c57cf1338b1fe8c33502c5f3161061dd2 +R 0d8181912c6739bfd5e49e604de13386 U dan -Z 4758547541b3fb9f6b2874ae87ffc5c6 +Z 7d39383234846ecfbdbe2d30db37f4f9 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 52cfe040be..13e47aeedd 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -8e809632ba3bb20b7ec23ce9e6ca659c57cf1338b1fe8c33502c5f3161061dd2 +303e8009ab59aad32030407baf3eff9443f7f9bed7947218b78293b06bba1737 diff --git a/src/ctime.c b/src/ctime.c index 9f358bd27f..835c71936c 100644 --- a/src/ctime.c +++ b/src/ctime.c @@ -316,6 +316,9 @@ static const char * const sqlite3azCompileOpt[] = { #ifdef SQLITE_ENABLE_SESSION "ENABLE_SESSION", #endif +#ifdef SQLITE_ENABLE_SETLK_TIMEOUT + "ENABLE_SETLK_TIMEOUT", +#endif #ifdef SQLITE_ENABLE_SNAPSHOT "ENABLE_SNAPSHOT", #endif diff --git a/tool/mkctimec.tcl b/tool/mkctimec.tcl index 69d25c678e..9db8e40d25 100755 --- a/tool/mkctimec.tcl +++ b/tool/mkctimec.tcl @@ -167,6 +167,7 @@ set boolean_defnil_options { SQLITE_ENABLE_RBU SQLITE_ENABLE_RTREE SQLITE_ENABLE_SESSION + SQLITE_ENABLE_SETLK_TIMEOUT SQLITE_ENABLE_SNAPSHOT SQLITE_ENABLE_SORTER_REFERENCES SQLITE_ENABLE_SQLLOG From 374c6a451e09bc6c14ef7e671bf4c788bfdfefef Mon Sep 17 00:00:00 2001 From: drh <> Date: Tue, 11 Feb 2025 19:40:19 +0000 Subject: [PATCH 091/194] Omit the src/ctime.c source file, since it is automatically generated by a TCL script. Instead, add rules to the various makefiles to generate ctime.c on demand. FossilOrigin-Name: 958bb5de7c484cc503c38d38d51a30f679244fd364df5cbfc1992e36995b2ff9 --- Makefile.msc | 11 +- main.mk | 12 +- manifest | 21 +- manifest.uuid | 2 +- src/ctime.c | 796 ----------------------------------------- tool/mkctimec.tcl | 10 +- tool/srctree-check.tcl | 17 - 7 files changed, 31 insertions(+), 838 deletions(-) delete mode 100644 src/ctime.c diff --git a/Makefile.msc b/Makefile.msc index 93b0935b1e..3618ae0bcc 100644 --- a/Makefile.msc +++ b/Makefile.msc @@ -1396,7 +1396,7 @@ SRC00 = \ $(TOP)\src\build.c \ $(TOP)\src\callback.c \ $(TOP)\src\complete.c \ - $(TOP)\src\ctime.c \ + ctime.c \ $(TOP)\src\date.c \ $(TOP)\src\dbpage.c \ $(TOP)\src\dbstat.c \ @@ -2099,8 +2099,11 @@ callback.lo: $(TOP)\src\callback.c $(HDR) complete.lo: $(TOP)\src\complete.c $(HDR) $(LTCOMPILE) $(CORE_COMPILE_OPTS) -c $(TOP)\src\complete.c -ctime.lo: $(TOP)\src\ctime.c $(HDR) - $(LTCOMPILE) $(CORE_COMPILE_OPTS) -c $(TOP)\src\ctime.c +ctime.c: $(TOP)\tool\mkctimec.tcl $(JIM_TCLSH) + $(JIM_TCLSH) $(TOP)\tool\mkctimec.tcl + +ctime.lo: ctime.c $(HDR) + $(LTCOMPILE) $(CORE_COMPILE_OPTS) -c ctime.c date.lo: $(TOP)\src\date.c $(HDR) $(LTCOMPILE) $(CORE_COMPILE_OPTS) -c $(TOP)\src\date.c @@ -2812,7 +2815,7 @@ moreclean: clean clean: del /Q *.exp *.lo *.ilk *.lib *.obj *.ncb *.pdb *.sdf *.suo 2>NUL del /Q *.bsc *.cod *.da *.bb *.bbg *.vc gmon.out 2>NUL - del /Q sqlite3.def tclsqlite3.def 2>NUL + del /Q sqlite3.def tclsqlite3.def ctime.c 2>NUL del /Q $(SQLITE3EXE) $(SQLITE3DLL) Replace.exe 2>NUL # <> del /Q $(SQLITE3TCLDLL) pkgIndex.tcl 2>NUL diff --git a/main.mk b/main.mk index 9eec5495ee..82f44a0306 100644 --- a/main.mk +++ b/main.mk @@ -548,7 +548,7 @@ SRC = \ $(TOP)/src/build.c \ $(TOP)/src/callback.c \ $(TOP)/src/complete.c \ - $(TOP)/src/ctime.c \ + ctime.c \ $(TOP)/src/date.c \ $(TOP)/src/dbpage.c \ $(TOP)/src/dbstat.c \ @@ -792,7 +792,7 @@ TESTSRC2 = \ $(TOP)/src/bitvec.c \ $(TOP)/src/btree.c \ $(TOP)/src/build.c \ - $(TOP)/src/ctime.c \ + ctime.c \ $(TOP)/src/date.c \ $(TOP)/src/dbpage.c \ $(TOP)/src/dbstat.c \ @@ -1137,8 +1137,11 @@ callback.o: $(TOP)/src/callback.c $(DEPS_OBJ_COMMON) complete.o: $(TOP)/src/complete.c $(DEPS_OBJ_COMMON) $(T.cc.sqlite) -c $(TOP)/src/complete.c -ctime.o: $(TOP)/src/ctime.c $(DEPS_OBJ_COMMON) - $(T.cc.sqlite) -c $(TOP)/src/ctime.c +ctime.c: $(TOP)/tool/mkctimec.tcl + $(TCLSH_CMD) $(TOP)/tool/mkctimec.tcl + +ctime.o: ctime.c $(DEPS_OBJ_COMMON) + $(T.cc.sqlite) -c ctime.c date.o: $(TOP)/src/date.c $(DEPS_OBJ_COMMON) $(T.cc.sqlite) -c $(TOP)/src/date.c @@ -2353,6 +2356,7 @@ tidy: tidy-. rm -f src-verify$(B.exe) rm -f tclsqlite3.c has_tclsh* $(T.tcl.env.sh) rm -f sqlite3rc.h sqlite3.def + rm -f ctime.c # # Removes build products and test logs. Retains ./configure outputs. diff --git a/manifest b/manifest index 615d5d04e7..9c05778077 100644 --- a/manifest +++ b/manifest @@ -1,11 +1,11 @@ -C Rename\sa\sconfigure-internal\sfunction\sand\sfix\shandling\sof\s--dump-defines\sfor\sthe\sautoconf\sbundle. -D 2025-02-11T17:20:12.606 +C Omit\sthe\ssrc/ctime.c\ssource\sfile,\ssince\sit\sis\sautomatically\sgenerated\sby\sa\sTCL\nscript.\s\sInstead,\sadd\srules\sto\sthe\svarious\smakefiles\sto\sgenerate\sctime.c\son\ndemand. +D 2025-02-11T19:40:19.136 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d F Makefile.in aa869faf7ca086f35c9b3e974fddc7fd65ed2dc45a246b1a94e6f9fdc99b0ed5 F Makefile.linux-generic bd3e3cacd369821a6241d4ea1967395c962dfe3057e38cb0a435cee0e8b789d0 -F Makefile.msc 990e4ea94a417135d1b2fd35550997c3f40fc1758bd7546bd17c0f4312f0babc +F Makefile.msc 3715ce0974666c8cafe391e2383a902956b983aa08bfea1cd57e98ddd27a35bb F README.md c3c0f19532ce28f6297a71870f3c7b424729f0e6d9ab889616d3587dd2332159 F VERSION 001dea55eb8304ec9130b6b44a32d3fc349f279d45a7e224fc0730c3cb8e2372 F art/icon-243x273.gif 9750b734f82fdb3dc43127753d5e6fbf3b62c9f4e136c2fbf573b2f57ea87af5 @@ -702,7 +702,7 @@ F ext/wasm/tests/opfs/concurrency/test.js d08889a5bb6e61937d0b8cbb78c9efbefbf65a F ext/wasm/tests/opfs/concurrency/worker.js 0a8c1a3e6ebb38aabbee24f122693f1fb29d599948915c76906681bb7da1d3d2 F ext/wasm/wasmfs.make 68999f5bd8c489239592d59a420f8c627c99169bbd6fa16a404751f757b9f702 F magic.txt 5ade0bc977aa135e79e3faaea894d5671b26107cc91e70783aa7dc83f22f3ba0 -F main.mk c85055d36c36c188cee94cabe2e252cd912d10d1a9d62af477e855533b9531b2 +F main.mk b7d36efaac04a13a85008c694762bf7b58de748dc1565c70a4dd797a944c9f9b F mptest/config01.test 3c6adcbc50b991866855f1977ff172eb6d901271 F mptest/config02.test 4415dfe36c48785f751e16e32c20b077c28ae504 F mptest/crash01.test 61e61469e257df0850df4293d7d4d6c2af301421 @@ -725,7 +725,6 @@ F src/btreeInt.h 98aadb6dcb77b012cab2574d6a728fad56b337fc946839b9898c4b4c969e30b F src/build.c 602fc45ea6301a3dc03ec20a9f9b294c492b7e1766ae96651f2ba8044dc445a6 F src/callback.c acae8c8dddda41ee85cfdf19b926eefe830f371069f8aadca3aa39adf5b1c859 F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e -F src/ctime.c d35723024b963edce9c0fad5b3303e8bb9266083784844baed10a6dedfe26f3b F src/date.c 842c08ac143a56a627b05ac51d68624f2b7b03e3b4cba596205e735eed64ee57 F src/dbpage.c 2e677acb658a29965e55398bbc61161cb7819da538057c8032adac7ab8e4a8c0 F src/dbstat.c 73362c0df0f40ad5523a6f5501224959d0976757b511299bf892313e79d14f5c @@ -2146,7 +2145,7 @@ F tool/merge-test.tcl de76b62f2de2a92d4c1ca4f976bce0aea6899e0229e250479b229b2a19 F tool/mkamalzip.tcl 8aa5ebe7973c8b8774062d34e15fea9815c4cc2ceea3a9b184695f005910876a F tool/mkautoconfamal.sh 14d2144043c6455958012f92324f4ce7c90a261b5daa2f2c7509498468475f8d F tool/mkccode.tcl 210159febe0ef0ecbc53c79833500663ceaba0115b2b374405818dc835b5f84b x -F tool/mkctimec.tcl ef6a67ec82e5b6fc19152a4c79f237227b18bf67ff16d155bac7adb94355d9cf x +F tool/mkctimec.tcl b57ab5c43cf6a46ba4030027da1cc73d7839e7b78da3b328545bc941bb62360b x F tool/mkkeywordhash.c 6b0be901c47f9ad42215fc995eb2f4384ac49213b1fba395102ec3e999acf559 F tool/mkmsvcmin.tcl d76c45efda1cce2d4005bcea7b8a22bb752e3256009f331120fb4fecb14ebb7a F tool/mkopcodec.tcl 33d20791e191df43209b77d37f0ff0904620b28465cca6990cf8d60da61a07ef @@ -2195,7 +2194,7 @@ F tool/sqltclsh.c.in 1bcc2e9da58fadf17b0bf6a50e68c1159e602ce057210b655d50bad5aaa F tool/sqltclsh.tcl 862f4cf1418df5e1315b5db3b5ebe88969e2a784525af5fbf9596592f14ed848 F tool/src-verify.c d00f93263aa2fa6ba0cba0106d95458e6effb94fdb5fc634f56834f90c05bbb4 F tool/srcck1.c 371de5363b70154012955544f86fdee8f6e5326f -F tool/srctree-check.tcl 1f1f505835a4beca64c1751a7ebec5c41a1ddf22b1e80481345b95059eef6583 +F tool/srctree-check.tcl 5e40c7beaca50c3f29cd9c3aa8d6c9256359690ea0989174f097ace92d6390c2 F tool/stack_usage.tcl f8e71b92cdb099a147dad572375595eae55eca43 F tool/stripccomments.c dfe9cc03cf87728ac9836be30763f8aa52b82caca0780b3d3f3572e4643b01d3 F tool/symbols-mingw.sh 4dbcea7e74768305384c9fd2ed2b41bbf9f0414d @@ -2209,8 +2208,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P 9978c87139b7b04208fd1f62121fc4e1e2080723fde69a2bbdca88769f4baf22 -R 76e33179af2e988165dad18e5266ff58 -U stephan -Z 2f25ba1e1af4da40884b8449b6a5c47c +P 6aa54cc180e034a10d8fc8f8b0c13d7bc0c94509b4240ac855121d501853768f +R e691176b85b17541b0449680ba0ba564 +U drh +Z 88df15dbb3e7e15a4c35762ecebc556a # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 37bfe81875..25b7683b02 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -6aa54cc180e034a10d8fc8f8b0c13d7bc0c94509b4240ac855121d501853768f +958bb5de7c484cc503c38d38d51a30f679244fd364df5cbfc1992e36995b2ff9 diff --git a/src/ctime.c b/src/ctime.c deleted file mode 100644 index 9f358bd27f..0000000000 --- a/src/ctime.c +++ /dev/null @@ -1,796 +0,0 @@ -/* DO NOT EDIT! -** This file is automatically generated by the script in the canonical -** SQLite source tree at tool/mkctimec.tcl. -** -** To modify this header, edit any of the various lists in that script -** which specify categories of generated conditionals in this file. -*/ - -/* -** 2010 February 23 -** -** The author disclaims copyright to this source code. In place of -** a legal notice, here is a blessing: -** -** May you do good and not evil. -** May you find forgiveness for yourself and forgive others. -** May you share freely, never taking more than you give. -** -************************************************************************* -** -** This file implements routines used to report what compile-time options -** SQLite was built with. -*/ -#ifndef SQLITE_OMIT_COMPILEOPTION_DIAGS /* IMP: R-16824-07538 */ - -/* -** Include the configuration header output by 'configure' if we're using the -** autoconf-based build -*/ -#if defined(_HAVE_SQLITE_CONFIG_H) && !defined(SQLITECONFIG_H) -#include "sqlite_cfg.h" -#define SQLITECONFIG_H 1 -#endif - -/* These macros are provided to "stringify" the value of the define -** for those options in which the value is meaningful. */ -#define CTIMEOPT_VAL_(opt) #opt -#define CTIMEOPT_VAL(opt) CTIMEOPT_VAL_(opt) - -/* Like CTIMEOPT_VAL, but especially for SQLITE_DEFAULT_LOOKASIDE. This -** option requires a separate macro because legal values contain a single -** comma. e.g. (-DSQLITE_DEFAULT_LOOKASIDE="100,100") */ -#define CTIMEOPT_VAL2_(opt1,opt2) #opt1 "," #opt2 -#define CTIMEOPT_VAL2(opt) CTIMEOPT_VAL2_(opt) -#include "sqliteInt.h" - -/* -** An array of names of all compile-time options. This array should -** be sorted A-Z. -** -** This array looks large, but in a typical installation actually uses -** only a handful of compile-time options, so most times this array is usually -** rather short and uses little memory space. -*/ -static const char * const sqlite3azCompileOpt[] = { - -#ifdef SQLITE_32BIT_ROWID - "32BIT_ROWID", -#endif -#ifdef SQLITE_4_BYTE_ALIGNED_MALLOC - "4_BYTE_ALIGNED_MALLOC", -#endif -#ifdef SQLITE_ALLOW_COVERING_INDEX_SCAN -# if SQLITE_ALLOW_COVERING_INDEX_SCAN != 1 - "ALLOW_COVERING_INDEX_SCAN=" CTIMEOPT_VAL(SQLITE_ALLOW_COVERING_INDEX_SCAN), -# endif -#endif -#ifdef SQLITE_ALLOW_ROWID_IN_VIEW - "ALLOW_ROWID_IN_VIEW", -#endif -#ifdef SQLITE_ALLOW_URI_AUTHORITY - "ALLOW_URI_AUTHORITY", -#endif -#ifdef SQLITE_ATOMIC_INTRINSICS - "ATOMIC_INTRINSICS=" CTIMEOPT_VAL(SQLITE_ATOMIC_INTRINSICS), -#endif -#ifdef SQLITE_BITMASK_TYPE - "BITMASK_TYPE=" CTIMEOPT_VAL(SQLITE_BITMASK_TYPE), -#endif -#ifdef SQLITE_BUG_COMPATIBLE_20160819 - "BUG_COMPATIBLE_20160819", -#endif -#ifdef SQLITE_CASE_SENSITIVE_LIKE - "CASE_SENSITIVE_LIKE", -#endif -#ifdef SQLITE_CHECK_PAGES - "CHECK_PAGES", -#endif -#if defined(__clang__) && defined(__clang_major__) - "COMPILER=clang-" CTIMEOPT_VAL(__clang_major__) "." - CTIMEOPT_VAL(__clang_minor__) "." - CTIMEOPT_VAL(__clang_patchlevel__), -#elif defined(_MSC_VER) - "COMPILER=msvc-" CTIMEOPT_VAL(_MSC_VER), -#elif defined(__GNUC__) && defined(__VERSION__) - "COMPILER=gcc-" __VERSION__, -#endif -#ifdef SQLITE_COVERAGE_TEST - "COVERAGE_TEST", -#endif -#ifdef SQLITE_DEBUG - "DEBUG", -#endif -#ifdef SQLITE_DEFAULT_AUTOMATIC_INDEX - "DEFAULT_AUTOMATIC_INDEX", -#endif -#ifdef SQLITE_DEFAULT_AUTOVACUUM - "DEFAULT_AUTOVACUUM", -#endif -#ifdef SQLITE_DEFAULT_CACHE_SIZE - "DEFAULT_CACHE_SIZE=" CTIMEOPT_VAL(SQLITE_DEFAULT_CACHE_SIZE), -#endif -#ifdef SQLITE_DEFAULT_CKPTFULLFSYNC - "DEFAULT_CKPTFULLFSYNC", -#endif -#ifdef SQLITE_DEFAULT_FILE_FORMAT - "DEFAULT_FILE_FORMAT=" CTIMEOPT_VAL(SQLITE_DEFAULT_FILE_FORMAT), -#endif -#ifdef SQLITE_DEFAULT_FILE_PERMISSIONS - "DEFAULT_FILE_PERMISSIONS=" CTIMEOPT_VAL(SQLITE_DEFAULT_FILE_PERMISSIONS), -#endif -#ifdef SQLITE_DEFAULT_FOREIGN_KEYS - "DEFAULT_FOREIGN_KEYS", -#endif -#ifdef SQLITE_DEFAULT_JOURNAL_SIZE_LIMIT - "DEFAULT_JOURNAL_SIZE_LIMIT=" CTIMEOPT_VAL(SQLITE_DEFAULT_JOURNAL_SIZE_LIMIT), -#endif -#ifdef SQLITE_DEFAULT_LOCKING_MODE - "DEFAULT_LOCKING_MODE=" CTIMEOPT_VAL(SQLITE_DEFAULT_LOCKING_MODE), -#endif -#ifdef SQLITE_DEFAULT_LOOKASIDE - "DEFAULT_LOOKASIDE=" CTIMEOPT_VAL2(SQLITE_DEFAULT_LOOKASIDE), -#endif -#ifdef SQLITE_DEFAULT_MEMSTATUS -# if SQLITE_DEFAULT_MEMSTATUS != 1 - "DEFAULT_MEMSTATUS=" CTIMEOPT_VAL(SQLITE_DEFAULT_MEMSTATUS), -# endif -#endif -#ifdef SQLITE_DEFAULT_MMAP_SIZE - "DEFAULT_MMAP_SIZE=" CTIMEOPT_VAL(SQLITE_DEFAULT_MMAP_SIZE), -#endif -#ifdef SQLITE_DEFAULT_PAGE_SIZE - "DEFAULT_PAGE_SIZE=" CTIMEOPT_VAL(SQLITE_DEFAULT_PAGE_SIZE), -#endif -#ifdef SQLITE_DEFAULT_PCACHE_INITSZ - "DEFAULT_PCACHE_INITSZ=" CTIMEOPT_VAL(SQLITE_DEFAULT_PCACHE_INITSZ), -#endif -#ifdef SQLITE_DEFAULT_PROXYDIR_PERMISSIONS - "DEFAULT_PROXYDIR_PERMISSIONS=" CTIMEOPT_VAL(SQLITE_DEFAULT_PROXYDIR_PERMISSIONS), -#endif -#ifdef SQLITE_DEFAULT_RECURSIVE_TRIGGERS - "DEFAULT_RECURSIVE_TRIGGERS", -#endif -#ifdef SQLITE_DEFAULT_ROWEST - "DEFAULT_ROWEST=" CTIMEOPT_VAL(SQLITE_DEFAULT_ROWEST), -#endif -#ifdef SQLITE_DEFAULT_SECTOR_SIZE - "DEFAULT_SECTOR_SIZE=" CTIMEOPT_VAL(SQLITE_DEFAULT_SECTOR_SIZE), -#endif -#ifdef SQLITE_DEFAULT_SYNCHRONOUS - "DEFAULT_SYNCHRONOUS=" CTIMEOPT_VAL(SQLITE_DEFAULT_SYNCHRONOUS), -#endif -#ifdef SQLITE_DEFAULT_WAL_AUTOCHECKPOINT - "DEFAULT_WAL_AUTOCHECKPOINT=" CTIMEOPT_VAL(SQLITE_DEFAULT_WAL_AUTOCHECKPOINT), -#endif -#ifdef SQLITE_DEFAULT_WAL_SYNCHRONOUS - "DEFAULT_WAL_SYNCHRONOUS=" CTIMEOPT_VAL(SQLITE_DEFAULT_WAL_SYNCHRONOUS), -#endif -#ifdef SQLITE_DEFAULT_WORKER_THREADS - "DEFAULT_WORKER_THREADS=" CTIMEOPT_VAL(SQLITE_DEFAULT_WORKER_THREADS), -#endif -#ifdef SQLITE_DIRECT_OVERFLOW_READ - "DIRECT_OVERFLOW_READ", -#endif -#ifdef SQLITE_DISABLE_DIRSYNC - "DISABLE_DIRSYNC", -#endif -#ifdef SQLITE_DISABLE_FTS3_UNICODE - "DISABLE_FTS3_UNICODE", -#endif -#ifdef SQLITE_DISABLE_FTS4_DEFERRED - "DISABLE_FTS4_DEFERRED", -#endif -#ifdef SQLITE_DISABLE_INTRINSIC - "DISABLE_INTRINSIC", -#endif -#ifdef SQLITE_DISABLE_LFS - "DISABLE_LFS", -#endif -#ifdef SQLITE_DISABLE_PAGECACHE_OVERFLOW_STATS - "DISABLE_PAGECACHE_OVERFLOW_STATS", -#endif -#ifdef SQLITE_DISABLE_SKIPAHEAD_DISTINCT - "DISABLE_SKIPAHEAD_DISTINCT", -#endif -#ifdef SQLITE_DQS - "DQS=" CTIMEOPT_VAL(SQLITE_DQS), -#endif -#ifdef SQLITE_ENABLE_8_3_NAMES - "ENABLE_8_3_NAMES=" CTIMEOPT_VAL(SQLITE_ENABLE_8_3_NAMES), -#endif -#ifdef SQLITE_ENABLE_API_ARMOR - "ENABLE_API_ARMOR", -#endif -#ifdef SQLITE_ENABLE_ATOMIC_WRITE - "ENABLE_ATOMIC_WRITE", -#endif -#ifdef SQLITE_ENABLE_BATCH_ATOMIC_WRITE - "ENABLE_BATCH_ATOMIC_WRITE", -#endif -#ifdef SQLITE_ENABLE_BYTECODE_VTAB - "ENABLE_BYTECODE_VTAB", -#endif -#ifdef SQLITE_ENABLE_CEROD - "ENABLE_CEROD=" CTIMEOPT_VAL(SQLITE_ENABLE_CEROD), -#endif -#ifdef SQLITE_ENABLE_COLUMN_METADATA - "ENABLE_COLUMN_METADATA", -#endif -#ifdef SQLITE_ENABLE_COLUMN_USED_MASK - "ENABLE_COLUMN_USED_MASK", -#endif -#ifdef SQLITE_ENABLE_COSTMULT - "ENABLE_COSTMULT", -#endif -#ifdef SQLITE_ENABLE_CURSOR_HINTS - "ENABLE_CURSOR_HINTS", -#endif -#ifdef SQLITE_ENABLE_DBPAGE_VTAB - "ENABLE_DBPAGE_VTAB", -#endif -#ifdef SQLITE_ENABLE_DBSTAT_VTAB - "ENABLE_DBSTAT_VTAB", -#endif -#ifdef SQLITE_ENABLE_EXPENSIVE_ASSERT - "ENABLE_EXPENSIVE_ASSERT", -#endif -#ifdef SQLITE_ENABLE_EXPLAIN_COMMENTS - "ENABLE_EXPLAIN_COMMENTS", -#endif -#ifdef SQLITE_ENABLE_FTS3 - "ENABLE_FTS3", -#endif -#ifdef SQLITE_ENABLE_FTS3_PARENTHESIS - "ENABLE_FTS3_PARENTHESIS", -#endif -#ifdef SQLITE_ENABLE_FTS3_TOKENIZER - "ENABLE_FTS3_TOKENIZER", -#endif -#ifdef SQLITE_ENABLE_FTS4 - "ENABLE_FTS4", -#endif -#ifdef SQLITE_ENABLE_FTS5 - "ENABLE_FTS5", -#endif -#ifdef SQLITE_ENABLE_GEOPOLY - "ENABLE_GEOPOLY", -#endif -#ifdef SQLITE_ENABLE_HIDDEN_COLUMNS - "ENABLE_HIDDEN_COLUMNS", -#endif -#ifdef SQLITE_ENABLE_ICU - "ENABLE_ICU", -#endif -#ifdef SQLITE_ENABLE_IOTRACE - "ENABLE_IOTRACE", -#endif -#ifdef SQLITE_ENABLE_LOAD_EXTENSION - "ENABLE_LOAD_EXTENSION", -#endif -#ifdef SQLITE_ENABLE_LOCKING_STYLE - "ENABLE_LOCKING_STYLE=" CTIMEOPT_VAL(SQLITE_ENABLE_LOCKING_STYLE), -#endif -#ifdef SQLITE_ENABLE_MATH_FUNCTIONS - "ENABLE_MATH_FUNCTIONS", -#endif -#ifdef SQLITE_ENABLE_MEMORY_MANAGEMENT - "ENABLE_MEMORY_MANAGEMENT", -#endif -#ifdef SQLITE_ENABLE_MEMSYS3 - "ENABLE_MEMSYS3", -#endif -#ifdef SQLITE_ENABLE_MEMSYS5 - "ENABLE_MEMSYS5", -#endif -#ifdef SQLITE_ENABLE_MULTIPLEX - "ENABLE_MULTIPLEX", -#endif -#ifdef SQLITE_ENABLE_NORMALIZE - "ENABLE_NORMALIZE", -#endif -#ifdef SQLITE_ENABLE_NULL_TRIM - "ENABLE_NULL_TRIM", -#endif -#ifdef SQLITE_ENABLE_OFFSET_SQL_FUNC - "ENABLE_OFFSET_SQL_FUNC", -#endif -#ifdef SQLITE_ENABLE_ORDERED_SET_AGGREGATES - "ENABLE_ORDERED_SET_AGGREGATES", -#endif -#ifdef SQLITE_ENABLE_OVERSIZE_CELL_CHECK - "ENABLE_OVERSIZE_CELL_CHECK", -#endif -#ifdef SQLITE_ENABLE_PREUPDATE_HOOK - "ENABLE_PREUPDATE_HOOK", -#endif -#ifdef SQLITE_ENABLE_QPSG - "ENABLE_QPSG", -#endif -#ifdef SQLITE_ENABLE_RBU - "ENABLE_RBU", -#endif -#ifdef SQLITE_ENABLE_RTREE - "ENABLE_RTREE", -#endif -#ifdef SQLITE_ENABLE_SESSION - "ENABLE_SESSION", -#endif -#ifdef SQLITE_ENABLE_SNAPSHOT - "ENABLE_SNAPSHOT", -#endif -#ifdef SQLITE_ENABLE_SORTER_REFERENCES - "ENABLE_SORTER_REFERENCES", -#endif -#ifdef SQLITE_ENABLE_SQLLOG - "ENABLE_SQLLOG", -#endif -#ifdef SQLITE_ENABLE_STAT4 - "ENABLE_STAT4", -#endif -#ifdef SQLITE_ENABLE_STMTVTAB - "ENABLE_STMTVTAB", -#endif -#ifdef SQLITE_ENABLE_STMT_SCANSTATUS - "ENABLE_STMT_SCANSTATUS", -#endif -#ifdef SQLITE_ENABLE_TREETRACE - "ENABLE_TREETRACE", -#endif -#ifdef SQLITE_ENABLE_UNKNOWN_SQL_FUNCTION - "ENABLE_UNKNOWN_SQL_FUNCTION", -#endif -#ifdef SQLITE_ENABLE_UNLOCK_NOTIFY - "ENABLE_UNLOCK_NOTIFY", -#endif -#ifdef SQLITE_ENABLE_UPDATE_DELETE_LIMIT - "ENABLE_UPDATE_DELETE_LIMIT", -#endif -#ifdef SQLITE_ENABLE_URI_00_ERROR - "ENABLE_URI_00_ERROR", -#endif -#ifdef SQLITE_ENABLE_VFSTRACE - "ENABLE_VFSTRACE", -#endif -#ifdef SQLITE_ENABLE_WHERETRACE - "ENABLE_WHERETRACE", -#endif -#ifdef SQLITE_ENABLE_ZIPVFS - "ENABLE_ZIPVFS", -#endif -#ifdef SQLITE_EXPLAIN_ESTIMATED_ROWS - "EXPLAIN_ESTIMATED_ROWS", -#endif -#ifdef SQLITE_EXTRA_AUTOEXT - "EXTRA_AUTOEXT=" CTIMEOPT_VAL(SQLITE_EXTRA_AUTOEXT), -#endif -#ifdef SQLITE_EXTRA_IFNULLROW - "EXTRA_IFNULLROW", -#endif -#ifdef SQLITE_EXTRA_INIT - "EXTRA_INIT=" CTIMEOPT_VAL(SQLITE_EXTRA_INIT), -#endif -#ifdef SQLITE_EXTRA_SHUTDOWN - "EXTRA_SHUTDOWN=" CTIMEOPT_VAL(SQLITE_EXTRA_SHUTDOWN), -#endif -#ifdef SQLITE_FTS3_MAX_EXPR_DEPTH - "FTS3_MAX_EXPR_DEPTH=" CTIMEOPT_VAL(SQLITE_FTS3_MAX_EXPR_DEPTH), -#endif -#ifdef SQLITE_FTS5_ENABLE_TEST_MI - "FTS5_ENABLE_TEST_MI", -#endif -#ifdef SQLITE_FTS5_NO_WITHOUT_ROWID - "FTS5_NO_WITHOUT_ROWID", -#endif -#if HAVE_ISNAN || SQLITE_HAVE_ISNAN - "HAVE_ISNAN", -#endif -#ifdef SQLITE_HOMEGROWN_RECURSIVE_MUTEX -# if SQLITE_HOMEGROWN_RECURSIVE_MUTEX != 1 - "HOMEGROWN_RECURSIVE_MUTEX=" CTIMEOPT_VAL(SQLITE_HOMEGROWN_RECURSIVE_MUTEX), -# endif -#endif -#ifdef SQLITE_IGNORE_AFP_LOCK_ERRORS - "IGNORE_AFP_LOCK_ERRORS", -#endif -#ifdef SQLITE_IGNORE_FLOCK_LOCK_ERRORS - "IGNORE_FLOCK_LOCK_ERRORS", -#endif -#ifdef SQLITE_INLINE_MEMCPY - "INLINE_MEMCPY", -#endif -#ifdef SQLITE_INT64_TYPE - "INT64_TYPE", -#endif -#ifdef SQLITE_INTEGRITY_CHECK_ERROR_MAX - "INTEGRITY_CHECK_ERROR_MAX=" CTIMEOPT_VAL(SQLITE_INTEGRITY_CHECK_ERROR_MAX), -#endif -#ifdef SQLITE_LEGACY_JSON_VALID - "LEGACY_JSON_VALID", -#endif -#ifdef SQLITE_LIKE_DOESNT_MATCH_BLOBS - "LIKE_DOESNT_MATCH_BLOBS", -#endif -#ifdef SQLITE_LOCK_TRACE - "LOCK_TRACE", -#endif -#ifdef SQLITE_LOG_CACHE_SPILL - "LOG_CACHE_SPILL", -#endif -#ifdef SQLITE_MALLOC_SOFT_LIMIT - "MALLOC_SOFT_LIMIT=" CTIMEOPT_VAL(SQLITE_MALLOC_SOFT_LIMIT), -#endif -#ifdef SQLITE_MAX_ATTACHED - "MAX_ATTACHED=" CTIMEOPT_VAL(SQLITE_MAX_ATTACHED), -#endif -#ifdef SQLITE_MAX_COLUMN - "MAX_COLUMN=" CTIMEOPT_VAL(SQLITE_MAX_COLUMN), -#endif -#ifdef SQLITE_MAX_COMPOUND_SELECT - "MAX_COMPOUND_SELECT=" CTIMEOPT_VAL(SQLITE_MAX_COMPOUND_SELECT), -#endif -#ifdef SQLITE_MAX_DEFAULT_PAGE_SIZE - "MAX_DEFAULT_PAGE_SIZE=" CTIMEOPT_VAL(SQLITE_MAX_DEFAULT_PAGE_SIZE), -#endif -#ifdef SQLITE_MAX_EXPR_DEPTH - "MAX_EXPR_DEPTH=" CTIMEOPT_VAL(SQLITE_MAX_EXPR_DEPTH), -#endif -#ifdef SQLITE_MAX_FUNCTION_ARG - "MAX_FUNCTION_ARG=" CTIMEOPT_VAL(SQLITE_MAX_FUNCTION_ARG), -#endif -#ifdef SQLITE_MAX_LENGTH - "MAX_LENGTH=" CTIMEOPT_VAL(SQLITE_MAX_LENGTH), -#endif -#ifdef SQLITE_MAX_LIKE_PATTERN_LENGTH - "MAX_LIKE_PATTERN_LENGTH=" CTIMEOPT_VAL(SQLITE_MAX_LIKE_PATTERN_LENGTH), -#endif -#ifdef SQLITE_MAX_MEMORY - "MAX_MEMORY=" CTIMEOPT_VAL(SQLITE_MAX_MEMORY), -#endif -#ifdef SQLITE_MAX_MMAP_SIZE - "MAX_MMAP_SIZE=" CTIMEOPT_VAL(SQLITE_MAX_MMAP_SIZE), -#endif -#ifdef SQLITE_MAX_MMAP_SIZE_ - "MAX_MMAP_SIZE_=" CTIMEOPT_VAL(SQLITE_MAX_MMAP_SIZE_), -#endif -#ifdef SQLITE_MAX_PAGE_COUNT - "MAX_PAGE_COUNT=" CTIMEOPT_VAL(SQLITE_MAX_PAGE_COUNT), -#endif -#ifdef SQLITE_MAX_PAGE_SIZE - "MAX_PAGE_SIZE=" CTIMEOPT_VAL(SQLITE_MAX_PAGE_SIZE), -#endif -#ifdef SQLITE_MAX_SCHEMA_RETRY - "MAX_SCHEMA_RETRY=" CTIMEOPT_VAL(SQLITE_MAX_SCHEMA_RETRY), -#endif -#ifdef SQLITE_MAX_SQL_LENGTH - "MAX_SQL_LENGTH=" CTIMEOPT_VAL(SQLITE_MAX_SQL_LENGTH), -#endif -#ifdef SQLITE_MAX_TRIGGER_DEPTH - "MAX_TRIGGER_DEPTH=" CTIMEOPT_VAL(SQLITE_MAX_TRIGGER_DEPTH), -#endif -#ifdef SQLITE_MAX_VARIABLE_NUMBER - "MAX_VARIABLE_NUMBER=" CTIMEOPT_VAL(SQLITE_MAX_VARIABLE_NUMBER), -#endif -#ifdef SQLITE_MAX_VDBE_OP - "MAX_VDBE_OP=" CTIMEOPT_VAL(SQLITE_MAX_VDBE_OP), -#endif -#ifdef SQLITE_MAX_WORKER_THREADS - "MAX_WORKER_THREADS=" CTIMEOPT_VAL(SQLITE_MAX_WORKER_THREADS), -#endif -#ifdef SQLITE_MEMDEBUG - "MEMDEBUG", -#endif -#ifdef SQLITE_MIXED_ENDIAN_64BIT_FLOAT - "MIXED_ENDIAN_64BIT_FLOAT", -#endif -#ifdef SQLITE_MMAP_READWRITE - "MMAP_READWRITE", -#endif -#ifdef SQLITE_MUTEX_NOOP - "MUTEX_NOOP", -#endif -#ifdef SQLITE_MUTEX_OMIT - "MUTEX_OMIT", -#endif -#ifdef SQLITE_MUTEX_PTHREADS - "MUTEX_PTHREADS", -#endif -#ifdef SQLITE_MUTEX_W32 - "MUTEX_W32", -#endif -#ifdef SQLITE_NEED_ERR_NAME - "NEED_ERR_NAME", -#endif -#ifdef SQLITE_NO_SYNC - "NO_SYNC", -#endif -#ifdef SQLITE_OMIT_ALTERTABLE - "OMIT_ALTERTABLE", -#endif -#ifdef SQLITE_OMIT_ANALYZE - "OMIT_ANALYZE", -#endif -#ifdef SQLITE_OMIT_ATTACH - "OMIT_ATTACH", -#endif -#ifdef SQLITE_OMIT_AUTHORIZATION - "OMIT_AUTHORIZATION", -#endif -#ifdef SQLITE_OMIT_AUTOINCREMENT - "OMIT_AUTOINCREMENT", -#endif -#ifdef SQLITE_OMIT_AUTOINIT - "OMIT_AUTOINIT", -#endif -#ifdef SQLITE_OMIT_AUTOMATIC_INDEX - "OMIT_AUTOMATIC_INDEX", -#endif -#ifdef SQLITE_OMIT_AUTORESET - "OMIT_AUTORESET", -#endif -#ifdef SQLITE_OMIT_AUTOVACUUM - "OMIT_AUTOVACUUM", -#endif -#ifdef SQLITE_OMIT_BETWEEN_OPTIMIZATION - "OMIT_BETWEEN_OPTIMIZATION", -#endif -#ifdef SQLITE_OMIT_BLOB_LITERAL - "OMIT_BLOB_LITERAL", -#endif -#ifdef SQLITE_OMIT_CAST - "OMIT_CAST", -#endif -#ifdef SQLITE_OMIT_CHECK - "OMIT_CHECK", -#endif -#ifdef SQLITE_OMIT_COMPLETE - "OMIT_COMPLETE", -#endif -#ifdef SQLITE_OMIT_COMPOUND_SELECT - "OMIT_COMPOUND_SELECT", -#endif -#ifdef SQLITE_OMIT_CONFLICT_CLAUSE - "OMIT_CONFLICT_CLAUSE", -#endif -#ifdef SQLITE_OMIT_CTE - "OMIT_CTE", -#endif -#if defined(SQLITE_OMIT_DATETIME_FUNCS) || defined(SQLITE_OMIT_FLOATING_POINT) - "OMIT_DATETIME_FUNCS", -#endif -#ifdef SQLITE_OMIT_DECLTYPE - "OMIT_DECLTYPE", -#endif -#ifdef SQLITE_OMIT_DEPRECATED - "OMIT_DEPRECATED", -#endif -#ifdef SQLITE_OMIT_DESERIALIZE - "OMIT_DESERIALIZE", -#endif -#ifdef SQLITE_OMIT_DISKIO - "OMIT_DISKIO", -#endif -#ifdef SQLITE_OMIT_EXPLAIN - "OMIT_EXPLAIN", -#endif -#ifdef SQLITE_OMIT_FLAG_PRAGMAS - "OMIT_FLAG_PRAGMAS", -#endif -#ifdef SQLITE_OMIT_FLOATING_POINT - "OMIT_FLOATING_POINT", -#endif -#ifdef SQLITE_OMIT_FOREIGN_KEY - "OMIT_FOREIGN_KEY", -#endif -#ifdef SQLITE_OMIT_GET_TABLE - "OMIT_GET_TABLE", -#endif -#ifdef SQLITE_OMIT_HEX_INTEGER - "OMIT_HEX_INTEGER", -#endif -#ifdef SQLITE_OMIT_INCRBLOB - "OMIT_INCRBLOB", -#endif -#ifdef SQLITE_OMIT_INTEGRITY_CHECK - "OMIT_INTEGRITY_CHECK", -#endif -#ifdef SQLITE_OMIT_INTROSPECTION_PRAGMAS - "OMIT_INTROSPECTION_PRAGMAS", -#endif -#ifdef SQLITE_OMIT_JSON - "OMIT_JSON", -#endif -#ifdef SQLITE_OMIT_LIKE_OPTIMIZATION - "OMIT_LIKE_OPTIMIZATION", -#endif -#ifdef SQLITE_OMIT_LOAD_EXTENSION - "OMIT_LOAD_EXTENSION", -#endif -#ifdef SQLITE_OMIT_LOCALTIME - "OMIT_LOCALTIME", -#endif -#ifdef SQLITE_OMIT_LOOKASIDE - "OMIT_LOOKASIDE", -#endif -#ifdef SQLITE_OMIT_MEMORYDB - "OMIT_MEMORYDB", -#endif -#ifdef SQLITE_OMIT_OR_OPTIMIZATION - "OMIT_OR_OPTIMIZATION", -#endif -#ifdef SQLITE_OMIT_PAGER_PRAGMAS - "OMIT_PAGER_PRAGMAS", -#endif -#ifdef SQLITE_OMIT_PARSER_TRACE - "OMIT_PARSER_TRACE", -#endif -#ifdef SQLITE_OMIT_POPEN - "OMIT_POPEN", -#endif -#ifdef SQLITE_OMIT_PRAGMA - "OMIT_PRAGMA", -#endif -#ifdef SQLITE_OMIT_PROGRESS_CALLBACK - "OMIT_PROGRESS_CALLBACK", -#endif -#ifdef SQLITE_OMIT_QUICKBALANCE - "OMIT_QUICKBALANCE", -#endif -#ifdef SQLITE_OMIT_REINDEX - "OMIT_REINDEX", -#endif -#ifdef SQLITE_OMIT_SCHEMA_PRAGMAS - "OMIT_SCHEMA_PRAGMAS", -#endif -#ifdef SQLITE_OMIT_SCHEMA_VERSION_PRAGMAS - "OMIT_SCHEMA_VERSION_PRAGMAS", -#endif -#ifdef SQLITE_OMIT_SEH - "OMIT_SEH", -#endif -#ifdef SQLITE_OMIT_SHARED_CACHE - "OMIT_SHARED_CACHE", -#endif -#ifdef SQLITE_OMIT_SHUTDOWN_DIRECTORIES - "OMIT_SHUTDOWN_DIRECTORIES", -#endif -#ifdef SQLITE_OMIT_SUBQUERY - "OMIT_SUBQUERY", -#endif -#ifdef SQLITE_OMIT_TCL_VARIABLE - "OMIT_TCL_VARIABLE", -#endif -#ifdef SQLITE_OMIT_TEMPDB - "OMIT_TEMPDB", -#endif -#ifdef SQLITE_OMIT_TEST_CONTROL - "OMIT_TEST_CONTROL", -#endif -#ifdef SQLITE_OMIT_TRACE -# if SQLITE_OMIT_TRACE != 1 - "OMIT_TRACE=" CTIMEOPT_VAL(SQLITE_OMIT_TRACE), -# endif -#endif -#ifdef SQLITE_OMIT_TRIGGER - "OMIT_TRIGGER", -#endif -#ifdef SQLITE_OMIT_TRUNCATE_OPTIMIZATION - "OMIT_TRUNCATE_OPTIMIZATION", -#endif -#ifdef SQLITE_OMIT_UTF16 - "OMIT_UTF16", -#endif -#ifdef SQLITE_OMIT_VACUUM - "OMIT_VACUUM", -#endif -#ifdef SQLITE_OMIT_VIEW - "OMIT_VIEW", -#endif -#ifdef SQLITE_OMIT_VIRTUALTABLE - "OMIT_VIRTUALTABLE", -#endif -#ifdef SQLITE_OMIT_WAL - "OMIT_WAL", -#endif -#ifdef SQLITE_OMIT_WSD - "OMIT_WSD", -#endif -#ifdef SQLITE_OMIT_XFER_OPT - "OMIT_XFER_OPT", -#endif -#ifdef SQLITE_PERFORMANCE_TRACE - "PERFORMANCE_TRACE", -#endif -#ifdef SQLITE_POWERSAFE_OVERWRITE -# if SQLITE_POWERSAFE_OVERWRITE != 1 - "POWERSAFE_OVERWRITE=" CTIMEOPT_VAL(SQLITE_POWERSAFE_OVERWRITE), -# endif -#endif -#ifdef SQLITE_PREFER_PROXY_LOCKING - "PREFER_PROXY_LOCKING", -#endif -#ifdef SQLITE_PROXY_DEBUG - "PROXY_DEBUG", -#endif -#ifdef SQLITE_REVERSE_UNORDERED_SELECTS - "REVERSE_UNORDERED_SELECTS", -#endif -#ifdef SQLITE_RTREE_INT_ONLY - "RTREE_INT_ONLY", -#endif -#ifdef SQLITE_SECURE_DELETE - "SECURE_DELETE", -#endif -#ifdef SQLITE_SMALL_STACK - "SMALL_STACK", -#endif -#ifdef SQLITE_SORTER_PMASZ - "SORTER_PMASZ=" CTIMEOPT_VAL(SQLITE_SORTER_PMASZ), -#endif -#ifdef SQLITE_SOUNDEX - "SOUNDEX", -#endif -#ifdef SQLITE_STAT4_SAMPLES - "STAT4_SAMPLES=" CTIMEOPT_VAL(SQLITE_STAT4_SAMPLES), -#endif -#ifdef SQLITE_STMTJRNL_SPILL - "STMTJRNL_SPILL=" CTIMEOPT_VAL(SQLITE_STMTJRNL_SPILL), -#endif -#ifdef SQLITE_SUBSTR_COMPATIBILITY - "SUBSTR_COMPATIBILITY", -#endif -#if (!defined(SQLITE_WIN32_MALLOC) \ - && !defined(SQLITE_ZERO_MALLOC) \ - && !defined(SQLITE_MEMDEBUG) \ - ) || defined(SQLITE_SYSTEM_MALLOC) - "SYSTEM_MALLOC", -#endif -#ifdef SQLITE_TCL - "TCL", -#endif -#ifdef SQLITE_TEMP_STORE - "TEMP_STORE=" CTIMEOPT_VAL(SQLITE_TEMP_STORE), -#endif -#ifdef SQLITE_TEST - "TEST", -#endif -#if defined(SQLITE_THREADSAFE) - "THREADSAFE=" CTIMEOPT_VAL(SQLITE_THREADSAFE), -#elif defined(THREADSAFE) - "THREADSAFE=" CTIMEOPT_VAL(THREADSAFE), -#else - "THREADSAFE=1", -#endif -#ifdef SQLITE_UNLINK_AFTER_CLOSE - "UNLINK_AFTER_CLOSE", -#endif -#ifdef SQLITE_UNTESTABLE - "UNTESTABLE", -#endif -#ifdef SQLITE_USE_ALLOCA - "USE_ALLOCA", -#endif -#ifdef SQLITE_USE_FCNTL_TRACE - "USE_FCNTL_TRACE", -#endif -#ifdef SQLITE_USE_URI - "USE_URI", -#endif -#ifdef SQLITE_VDBE_COVERAGE - "VDBE_COVERAGE", -#endif -#ifdef SQLITE_WIN32_MALLOC - "WIN32_MALLOC", -#endif -#ifdef SQLITE_ZERO_MALLOC - "ZERO_MALLOC", -#endif - -} ; - -const char **sqlite3CompileOptions(int *pnOpt){ - *pnOpt = sizeof(sqlite3azCompileOpt) / sizeof(sqlite3azCompileOpt[0]); - return (const char**)sqlite3azCompileOpt; -} - -#endif /* SQLITE_OMIT_COMPILEOPTION_DIAGS */ diff --git a/tool/mkctimec.tcl b/tool/mkctimec.tcl index 69d25c678e..1a845b00bf 100755 --- a/tool/mkctimec.tcl +++ b/tool/mkctimec.tcl @@ -4,13 +4,13 @@ # # const char **azCompileOpt[] # -# definition used in src/ctime.c, run this script from -# the checkout root. It generates src/ctime.c . +# definition used in ctime.c, run this script from +# the checkout root. It generates ctime.c . # -# Results are normally written into src/ctime.c. But if an argument is +# Results are normally written into ctime.c. But if an argument is # provided, results are written there instead. Examples: # -# tclsh tool/mkctimec.tcl ;# <-- results to src/ctime.c +# tclsh tool/mkctimec.tcl ;# <-- ctime.c # # tclsh tool/mkctimec.tcl /dev/tty ;# <-- results to the terminal # @@ -440,7 +440,7 @@ foreach v $value2_options { if {$argc>0} { set destfile [lindex $argv 0] } else { - set destfile "[file dir [file dir [file normal $argv0]]]/src/ctime.c" + set destfile ctime.c puts "Overwriting $destfile..." } diff --git a/tool/srctree-check.tcl b/tool/srctree-check.tcl index b65e223db9..918f12a9d6 100644 --- a/tool/srctree-check.tcl +++ b/tool/srctree-check.tcl @@ -4,7 +4,6 @@ # various aspects of the source tree are up-to-date. Items checked include: # # * Makefile.msc and autoconf/Makefile.msc agree -# * src/ctime.tcl is consistent with tool/mkctimec.tcl # * VERSION agrees with autoconf/tea/configure.ac # * src/pragma.h agrees with tool/mkpragmatab.tcl # @@ -74,19 +73,3 @@ if {$f1 != $f2} { puts "...... Fix: tclsh tool/mkpragmatab.tcl" incr NERR } - -######################### src/ctime.c ######################################## - -set f1 [readfile $ROOT/src/ctime.c] -exec $TCLSH $ROOT/tool/mkctimec.tcl tmp3.txt -set f2 [readfile tmp3.txt] -file delete tmp3.txt -if {$f1 != $f2} { - puts "ERROR: ./src/ctime.c does not agree with ./tool/mkctimec.tcl" - puts "..... Fix: tclsh tool/mkctimec.tcl" - incr NERR -} - -# If any errors are seen, exit 1 so that the build will fail. -# -if {$NERR>0} {exit 1} From cd56ad4ccb42b598f3422f2c554a6feaa5c10951 Mon Sep 17 00:00:00 2001 From: drh <> Date: Tue, 11 Feb 2025 19:54:13 +0000 Subject: [PATCH 092/194] Omit the src/pragma.h file. It is generated by the tool/mkpragmatab.tcl script. The makefiles now know how to build this file for themselves. FossilOrigin-Name: 9709ed1cdfa17f690ffd4ec8cfc54efefec8352143c1d8b701f09299bd7eef6e --- Makefile.msc | 9 +- autoconf/Makefile.msc | 2 +- main.mk | 13 +- manifest | 21 +- manifest.uuid | 2 +- src/pragma.h | 660 ----------------------------------------- tool/mkpragmatab.tcl | 8 +- tool/srctree-check.tcl | 13 - 8 files changed, 30 insertions(+), 698 deletions(-) delete mode 100644 src/pragma.h diff --git a/Makefile.msc b/Makefile.msc index 3618ae0bcc..05fff146bc 100644 --- a/Makefile.msc +++ b/Makefile.msc @@ -1495,7 +1495,7 @@ SRC04 = \ SRC05 = \ $(TOP)\src\pager.h \ $(TOP)\src\pcache.h \ - $(TOP)\src\pragma.h \ + pragma.h \ $(TOP)\src\sqlite.h.in \ $(TOP)\src\sqlite3ext.h \ $(TOP)\src\sqliteInt.h \ @@ -1698,7 +1698,7 @@ HDR = \ $(TOP)\src\pager.h \ $(TOP)\src\pcache.h \ parse.h \ - $(TOP)\src\pragma.h \ + pragma.h \ $(SQLITE3H) \ sqlite3ext.h \ $(TOP)\src\sqliteInt.h \ @@ -2336,6 +2336,9 @@ parse.c: $(TOP)\src\parse.y lemon.exe copy /B parse.y +,, .\lemon.exe $(REQ_FEATURE_FLAGS) $(OPT_FEATURE_FLAGS) $(EXT_FEATURE_FLAGS) $(OPTS) -S parse.y +pragma.h: $(TOP)\tool\mkpragmatab.tcl $(JIM_TCLSH) + $(JIM_TCLSH) $(TOP)\tool\mkpragmatab.tcl + $(SQLITE3H): $(TOP)\src\sqlite.h.in $(TOP)\manifest mksourceid.exe $(TOP)\VERSION $(JIM_TCLSH) $(JIM_TCLSH) $(TOP)\tool\mksqlite3h.tcl "$(TOP:\=/)" -o $(SQLITE3H) $(MKSQLITE3H_ARGS) @@ -2815,7 +2818,7 @@ moreclean: clean clean: del /Q *.exp *.lo *.ilk *.lib *.obj *.ncb *.pdb *.sdf *.suo 2>NUL del /Q *.bsc *.cod *.da *.bb *.bbg *.vc gmon.out 2>NUL - del /Q sqlite3.def tclsqlite3.def ctime.c 2>NUL + del /Q sqlite3.def tclsqlite3.def ctime.c pragma.h 2>NUL del /Q $(SQLITE3EXE) $(SQLITE3DLL) Replace.exe 2>NUL # <> del /Q $(SQLITE3TCLDLL) pkgIndex.tcl 2>NUL diff --git a/autoconf/Makefile.msc b/autoconf/Makefile.msc index 47e0a83af8..f891036a14 100644 --- a/autoconf/Makefile.msc +++ b/autoconf/Makefile.msc @@ -1088,5 +1088,5 @@ $(LIBRESOBJS): $(TOP)\sqlite3.rc rcver.vc $(SQLITE3H) clean: del /Q *.exp *.lo *.ilk *.lib *.obj *.ncb *.pdb *.sdf *.suo 2>NUL del /Q *.bsc *.cod *.da *.bb *.bbg *.vc gmon.out 2>NUL - del /Q sqlite3.def tclsqlite3.def 2>NUL + del /Q sqlite3.def tclsqlite3.def ctime.c 2>NUL del /Q $(SQLITE3EXE) $(SQLITE3DLL) Replace.exe 2>NUL diff --git a/main.mk b/main.mk index 82f44a0306..615dc97fb5 100644 --- a/main.mk +++ b/main.mk @@ -596,7 +596,7 @@ SRC = \ $(TOP)/src/pcache.h \ $(TOP)/src/pcache1.c \ $(TOP)/src/pragma.c \ - $(TOP)/src/pragma.h \ + pragma.h \ $(TOP)/src/prepare.c \ $(TOP)/src/printf.c \ $(TOP)/src/random.c \ @@ -857,7 +857,7 @@ HDR = \ $(TOP)/src/pager.h \ $(TOP)/src/pcache.h \ parse.h \ - $(TOP)/src/pragma.h \ + pragma.h \ sqlite3.h \ $(TOP)/src/sqlite3ext.h \ $(TOP)/src/sqliteInt.h \ @@ -1137,8 +1137,8 @@ callback.o: $(TOP)/src/callback.c $(DEPS_OBJ_COMMON) complete.o: $(TOP)/src/complete.c $(DEPS_OBJ_COMMON) $(T.cc.sqlite) -c $(TOP)/src/complete.c -ctime.c: $(TOP)/tool/mkctimec.tcl - $(TCLSH_CMD) $(TOP)/tool/mkctimec.tcl +ctime.c: $(TOP)/tool/mkctimec.tcl $(B.tclsh) + $(B.tclsh) $(TOP)/tool/mkctimec.tcl ctime.o: ctime.c $(DEPS_OBJ_COMMON) $(T.cc.sqlite) -c ctime.c @@ -1385,6 +1385,9 @@ parse.c: $(TOP)/src/parse.y lemon$(B.exe) cp $(TOP)/src/parse.y . ./lemon$(B.exe) $(OPT_FEATURE_FLAGS) $(OPTS) -S parse.y +pragma.h: $(TOP)/tool/mkpragmatab.tcl $(B.tclsh) + $(B.tclsh) $(TOP)/tool/mkpragmatab.tcl + sqlite3rc.h: $(TOP)/src/sqlite3.rc $(TOP)/VERSION $(B.tclsh) echo '#ifndef SQLITE_RESOURCE_VERSION' >$@ echo -n '#define SQLITE_RESOURCE_VERSION ' >>$@ @@ -2356,7 +2359,7 @@ tidy: tidy-. rm -f src-verify$(B.exe) rm -f tclsqlite3.c has_tclsh* $(T.tcl.env.sh) rm -f sqlite3rc.h sqlite3.def - rm -f ctime.c + rm -f ctime.c pragma.h # # Removes build products and test logs. Retains ./configure outputs. diff --git a/manifest b/manifest index 9c05778077..e71a53be0b 100644 --- a/manifest +++ b/manifest @@ -1,11 +1,11 @@ -C Omit\sthe\ssrc/ctime.c\ssource\sfile,\ssince\sit\sis\sautomatically\sgenerated\sby\sa\sTCL\nscript.\s\sInstead,\sadd\srules\sto\sthe\svarious\smakefiles\sto\sgenerate\sctime.c\son\ndemand. -D 2025-02-11T19:40:19.136 +C Omit\sthe\ssrc/pragma.h\sfile.\s\sIt\sis\sgenerated\sby\sthe\stool/mkpragmatab.tcl\sscript.\nThe\smakefiles\snow\sknow\show\sto\sbuild\sthis\sfile\sfor\sthemselves. +D 2025-02-11T19:54:13.594 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d F Makefile.in aa869faf7ca086f35c9b3e974fddc7fd65ed2dc45a246b1a94e6f9fdc99b0ed5 F Makefile.linux-generic bd3e3cacd369821a6241d4ea1967395c962dfe3057e38cb0a435cee0e8b789d0 -F Makefile.msc 3715ce0974666c8cafe391e2383a902956b983aa08bfea1cd57e98ddd27a35bb +F Makefile.msc 50c656e096ae49ccf9e5e88b4995f0a155f231ebae5b6d185cc64ce99d728a83 F README.md c3c0f19532ce28f6297a71870f3c7b424729f0e6d9ab889616d3587dd2332159 F VERSION 001dea55eb8304ec9130b6b44a32d3fc349f279d45a7e224fc0730c3cb8e2372 F art/icon-243x273.gif 9750b734f82fdb3dc43127753d5e6fbf3b62c9f4e136c2fbf573b2f57ea87af5 @@ -17,7 +17,7 @@ F art/sqlite370.svg 40b7e2fe8aac3add5d56dd86ab8d427a4eca5bcb3fe4f8946cb3794e1821 F auto.def 74ec59fbf7de5038aa9c3d0b1e0fea67e128e432ff9d84472c4016b08ec3d60b F autoconf/Makefile.fallback 22fe523eb36dfce31e0f6349f782eb084e86a5620b2b0b4f84a2d6133f53f5ac F autoconf/Makefile.in 7bd73a4c8cd89025cbc92b4f887c6fd1b8cd8ecbe62c4ac1f36ac84d04043479 -F autoconf/Makefile.msc 0a071367537dc395285a5d624ac4f99f3a387b27cc5e89752423c0499e15aec4 +F autoconf/Makefile.msc 4f09fead3bf7de337242896f107c5d03cd8f7b39754315ab091a2e4d02892c40 F autoconf/README.first f1d3876e9a7852c22f275a6f06814e64934cecbc0b5b9617d64849094c1fd136 F autoconf/README.txt 7f01dc3915e2d68f329011073662369e62a0938a2c69398807823c57591cb288 F autoconf/auto.def 1900a63cfa18e662b16d912c849ea81609a90b5fe00cea54955a41572e2c2cd0 @@ -702,7 +702,7 @@ F ext/wasm/tests/opfs/concurrency/test.js d08889a5bb6e61937d0b8cbb78c9efbefbf65a F ext/wasm/tests/opfs/concurrency/worker.js 0a8c1a3e6ebb38aabbee24f122693f1fb29d599948915c76906681bb7da1d3d2 F ext/wasm/wasmfs.make 68999f5bd8c489239592d59a420f8c627c99169bbd6fa16a404751f757b9f702 F magic.txt 5ade0bc977aa135e79e3faaea894d5671b26107cc91e70783aa7dc83f22f3ba0 -F main.mk b7d36efaac04a13a85008c694762bf7b58de748dc1565c70a4dd797a944c9f9b +F main.mk ecf4b449c742eaa3a872a5cd0e8e5c19e2dccfe3b5b0ccafd0c926dc1030c661 F mptest/config01.test 3c6adcbc50b991866855f1977ff172eb6d901271 F mptest/config02.test 4415dfe36c48785f751e16e32c20b077c28ae504 F mptest/crash01.test 61e61469e257df0850df4293d7d4d6c2af301421 @@ -773,7 +773,6 @@ F src/pcache.c 588cc3c5ccaaadde689ed35ce5c5c891a1f7b1f4d1f56f6cf0143b74d8ee6484 F src/pcache.h 1497ce1b823cf00094bb0cf3bac37b345937e6f910890c626b16512316d3abf5 F src/pcache1.c 49516ad7718a3626f28f710fa7448ef1fce3c07fd169acbb4817341950264319 F src/pragma.c ce1182217aa540e034c6da2f17515e3706bf52c837e8222361be9ccd7a9d495a -F src/pragma.h e690a356c18e98414d2e870ea791c1be1545a714ba623719deb63f7f226d8bb7 F src/prepare.c 1832be043fce7d489959aae6f994c452d023914714c4d5457beaed51c0f3d126 F src/printf.c 96f7f8baeedc7639da94e4e7a4a2c200e2537c4eec9e5e1c2ffc821f40eb3105 F src/random.c 606b00941a1d7dd09c381d3279a058d771f406c5213c9932bbd93d5587be4b9c @@ -2151,7 +2150,7 @@ F tool/mkmsvcmin.tcl d76c45efda1cce2d4005bcea7b8a22bb752e3256009f331120fb4fecb14 F tool/mkopcodec.tcl 33d20791e191df43209b77d37f0ff0904620b28465cca6990cf8d60da61a07ef F tool/mkopcodeh.tcl 2b4e6967a670ef21bf53a164964c35c6163277d002a4c6f56fa231d68c88d023 F tool/mkopts.tcl 680f785fdb09729fd9ac50632413da4eadbdf9071535e3f26d03795828ab07fa -F tool/mkpragmatab.tcl 32e359ccb21011958a821955254bd7a5fa7915d01a8c16fed91ffc8b40cb4adf +F tool/mkpragmatab.tcl 365ff4c0367b2fa686fdb20a1a03e36c697959c1ca854fc82af42b9056170893 F tool/mkshellc.tcl 9ce74de0fa904a2c56a96f8d8b5261246bacb0eaa8d7e184f9e18ff94145ebbc F tool/mksourceid.c 36aa8020014aed0836fd13c51d6dc9219b0df1761d6b5f58ff5b616211b079b9 F tool/mkspeedsql.tcl a1a334d288f7adfe6e996f2e712becf076745c97 @@ -2194,7 +2193,7 @@ F tool/sqltclsh.c.in 1bcc2e9da58fadf17b0bf6a50e68c1159e602ce057210b655d50bad5aaa F tool/sqltclsh.tcl 862f4cf1418df5e1315b5db3b5ebe88969e2a784525af5fbf9596592f14ed848 F tool/src-verify.c d00f93263aa2fa6ba0cba0106d95458e6effb94fdb5fc634f56834f90c05bbb4 F tool/srcck1.c 371de5363b70154012955544f86fdee8f6e5326f -F tool/srctree-check.tcl 5e40c7beaca50c3f29cd9c3aa8d6c9256359690ea0989174f097ace92d6390c2 +F tool/srctree-check.tcl 4e635aed7dd8198d2b212353823d4b10b380211bf9a8287921ec6b2b773ca097 F tool/stack_usage.tcl f8e71b92cdb099a147dad572375595eae55eca43 F tool/stripccomments.c dfe9cc03cf87728ac9836be30763f8aa52b82caca0780b3d3f3572e4643b01d3 F tool/symbols-mingw.sh 4dbcea7e74768305384c9fd2ed2b41bbf9f0414d @@ -2208,8 +2207,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P 6aa54cc180e034a10d8fc8f8b0c13d7bc0c94509b4240ac855121d501853768f -R e691176b85b17541b0449680ba0ba564 +P 958bb5de7c484cc503c38d38d51a30f679244fd364df5cbfc1992e36995b2ff9 +R c612f3371ab876eff4ecd15f96d1d3bd U drh -Z 88df15dbb3e7e15a4c35762ecebc556a +Z d8718e46243e2a0107a59b8d9076cbbd # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 25b7683b02..3c2620d3c5 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -958bb5de7c484cc503c38d38d51a30f679244fd364df5cbfc1992e36995b2ff9 +9709ed1cdfa17f690ffd4ec8cfc54efefec8352143c1d8b701f09299bd7eef6e diff --git a/src/pragma.h b/src/pragma.h deleted file mode 100644 index 7270db1db4..0000000000 --- a/src/pragma.h +++ /dev/null @@ -1,660 +0,0 @@ -/* DO NOT EDIT! -** This file is automatically generated by the script at -** ../tool/mkpragmatab.tcl. To update the set of pragmas, edit -** that script and rerun it. -*/ - -/* The various pragma types */ -#define PragTyp_ACTIVATE_EXTENSIONS 0 -#define PragTyp_ANALYSIS_LIMIT 1 -#define PragTyp_HEADER_VALUE 2 -#define PragTyp_AUTO_VACUUM 3 -#define PragTyp_FLAG 4 -#define PragTyp_BUSY_TIMEOUT 5 -#define PragTyp_CACHE_SIZE 6 -#define PragTyp_CACHE_SPILL 7 -#define PragTyp_CASE_SENSITIVE_LIKE 8 -#define PragTyp_COLLATION_LIST 9 -#define PragTyp_COMPILE_OPTIONS 10 -#define PragTyp_DATA_STORE_DIRECTORY 11 -#define PragTyp_DATABASE_LIST 12 -#define PragTyp_DEFAULT_CACHE_SIZE 13 -#define PragTyp_ENCODING 14 -#define PragTyp_FOREIGN_KEY_CHECK 15 -#define PragTyp_FOREIGN_KEY_LIST 16 -#define PragTyp_FUNCTION_LIST 17 -#define PragTyp_HARD_HEAP_LIMIT 18 -#define PragTyp_INCREMENTAL_VACUUM 19 -#define PragTyp_INDEX_INFO 20 -#define PragTyp_INDEX_LIST 21 -#define PragTyp_INTEGRITY_CHECK 22 -#define PragTyp_JOURNAL_MODE 23 -#define PragTyp_JOURNAL_SIZE_LIMIT 24 -#define PragTyp_LOCK_PROXY_FILE 25 -#define PragTyp_LOCKING_MODE 26 -#define PragTyp_PAGE_COUNT 27 -#define PragTyp_MMAP_SIZE 28 -#define PragTyp_MODULE_LIST 29 -#define PragTyp_OPTIMIZE 30 -#define PragTyp_PAGE_SIZE 31 -#define PragTyp_PRAGMA_LIST 32 -#define PragTyp_SECURE_DELETE 33 -#define PragTyp_SHRINK_MEMORY 34 -#define PragTyp_SOFT_HEAP_LIMIT 35 -#define PragTyp_SYNCHRONOUS 36 -#define PragTyp_TABLE_INFO 37 -#define PragTyp_TABLE_LIST 38 -#define PragTyp_TEMP_STORE 39 -#define PragTyp_TEMP_STORE_DIRECTORY 40 -#define PragTyp_THREADS 41 -#define PragTyp_WAL_AUTOCHECKPOINT 42 -#define PragTyp_WAL_CHECKPOINT 43 -#define PragTyp_LOCK_STATUS 44 -#define PragTyp_STATS 45 - -/* Property flags associated with various pragma. */ -#define PragFlg_NeedSchema 0x01 /* Force schema load before running */ -#define PragFlg_NoColumns 0x02 /* OP_ResultRow called with zero columns */ -#define PragFlg_NoColumns1 0x04 /* zero columns if RHS argument is present */ -#define PragFlg_ReadOnly 0x08 /* Read-only HEADER_VALUE */ -#define PragFlg_Result0 0x10 /* Acts as query when no argument */ -#define PragFlg_Result1 0x20 /* Acts as query when has one argument */ -#define PragFlg_SchemaOpt 0x40 /* Schema restricts name search if present */ -#define PragFlg_SchemaReq 0x80 /* Schema required - "main" is default */ - -/* Names of columns for pragmas that return multi-column result -** or that return single-column results where the name of the -** result column is different from the name of the pragma -*/ -static const char *const pragCName[] = { - /* 0 */ "id", /* Used by: foreign_key_list */ - /* 1 */ "seq", - /* 2 */ "table", - /* 3 */ "from", - /* 4 */ "to", - /* 5 */ "on_update", - /* 6 */ "on_delete", - /* 7 */ "match", - /* 8 */ "cid", /* Used by: table_xinfo */ - /* 9 */ "name", - /* 10 */ "type", - /* 11 */ "notnull", - /* 12 */ "dflt_value", - /* 13 */ "pk", - /* 14 */ "hidden", - /* table_info reuses 8 */ - /* 15 */ "schema", /* Used by: table_list */ - /* 16 */ "name", - /* 17 */ "type", - /* 18 */ "ncol", - /* 19 */ "wr", - /* 20 */ "strict", - /* 21 */ "seqno", /* Used by: index_xinfo */ - /* 22 */ "cid", - /* 23 */ "name", - /* 24 */ "desc", - /* 25 */ "coll", - /* 26 */ "key", - /* 27 */ "name", /* Used by: function_list */ - /* 28 */ "builtin", - /* 29 */ "type", - /* 30 */ "enc", - /* 31 */ "narg", - /* 32 */ "flags", - /* 33 */ "tbl", /* Used by: stats */ - /* 34 */ "idx", - /* 35 */ "wdth", - /* 36 */ "hght", - /* 37 */ "flgs", - /* 38 */ "seq", /* Used by: index_list */ - /* 39 */ "name", - /* 40 */ "unique", - /* 41 */ "origin", - /* 42 */ "partial", - /* 43 */ "table", /* Used by: foreign_key_check */ - /* 44 */ "rowid", - /* 45 */ "parent", - /* 46 */ "fkid", - /* index_info reuses 21 */ - /* 47 */ "seq", /* Used by: database_list */ - /* 48 */ "name", - /* 49 */ "file", - /* 50 */ "busy", /* Used by: wal_checkpoint */ - /* 51 */ "log", - /* 52 */ "checkpointed", - /* collation_list reuses 38 */ - /* 53 */ "database", /* Used by: lock_status */ - /* 54 */ "status", - /* 55 */ "cache_size", /* Used by: default_cache_size */ - /* module_list pragma_list reuses 9 */ - /* 56 */ "timeout", /* Used by: busy_timeout */ -}; - -/* Definitions of all built-in pragmas */ -typedef struct PragmaName { - const char *const zName; /* Name of pragma */ - u8 ePragTyp; /* PragTyp_XXX value */ - u8 mPragFlg; /* Zero or more PragFlg_XXX values */ - u8 iPragCName; /* Start of column names in pragCName[] */ - u8 nPragCName; /* Num of col names. 0 means use pragma name */ - u64 iArg; /* Extra argument */ -} PragmaName; -static const PragmaName aPragmaName[] = { -#if defined(SQLITE_ENABLE_CEROD) - {/* zName: */ "activate_extensions", - /* ePragTyp: */ PragTyp_ACTIVATE_EXTENSIONS, - /* ePragFlg: */ 0, - /* ColNames: */ 0, 0, - /* iArg: */ 0 }, -#endif - {/* zName: */ "analysis_limit", - /* ePragTyp: */ PragTyp_ANALYSIS_LIMIT, - /* ePragFlg: */ PragFlg_Result0, - /* ColNames: */ 0, 0, - /* iArg: */ 0 }, -#if !defined(SQLITE_OMIT_SCHEMA_VERSION_PRAGMAS) - {/* zName: */ "application_id", - /* ePragTyp: */ PragTyp_HEADER_VALUE, - /* ePragFlg: */ PragFlg_NoColumns1|PragFlg_Result0, - /* ColNames: */ 0, 0, - /* iArg: */ BTREE_APPLICATION_ID }, -#endif -#if !defined(SQLITE_OMIT_AUTOVACUUM) - {/* zName: */ "auto_vacuum", - /* ePragTyp: */ PragTyp_AUTO_VACUUM, - /* ePragFlg: */ PragFlg_NeedSchema|PragFlg_Result0|PragFlg_SchemaReq|PragFlg_NoColumns1, - /* ColNames: */ 0, 0, - /* iArg: */ 0 }, -#endif -#if !defined(SQLITE_OMIT_FLAG_PRAGMAS) -#if !defined(SQLITE_OMIT_AUTOMATIC_INDEX) - {/* zName: */ "automatic_index", - /* ePragTyp: */ PragTyp_FLAG, - /* ePragFlg: */ PragFlg_Result0|PragFlg_NoColumns1, - /* ColNames: */ 0, 0, - /* iArg: */ SQLITE_AutoIndex }, -#endif -#endif - {/* zName: */ "busy_timeout", - /* ePragTyp: */ PragTyp_BUSY_TIMEOUT, - /* ePragFlg: */ PragFlg_Result0, - /* ColNames: */ 56, 1, - /* iArg: */ 0 }, -#if !defined(SQLITE_OMIT_PAGER_PRAGMAS) - {/* zName: */ "cache_size", - /* ePragTyp: */ PragTyp_CACHE_SIZE, - /* ePragFlg: */ PragFlg_NeedSchema|PragFlg_Result0|PragFlg_SchemaReq|PragFlg_NoColumns1, - /* ColNames: */ 0, 0, - /* iArg: */ 0 }, -#endif -#if !defined(SQLITE_OMIT_FLAG_PRAGMAS) - {/* zName: */ "cache_spill", - /* ePragTyp: */ PragTyp_CACHE_SPILL, - /* ePragFlg: */ PragFlg_Result0|PragFlg_SchemaReq|PragFlg_NoColumns1, - /* ColNames: */ 0, 0, - /* iArg: */ 0 }, -#endif -#if !defined(SQLITE_OMIT_CASE_SENSITIVE_LIKE_PRAGMA) - {/* zName: */ "case_sensitive_like", - /* ePragTyp: */ PragTyp_CASE_SENSITIVE_LIKE, - /* ePragFlg: */ PragFlg_NoColumns, - /* ColNames: */ 0, 0, - /* iArg: */ 0 }, -#endif - {/* zName: */ "cell_size_check", - /* ePragTyp: */ PragTyp_FLAG, - /* ePragFlg: */ PragFlg_Result0|PragFlg_NoColumns1, - /* ColNames: */ 0, 0, - /* iArg: */ SQLITE_CellSizeCk }, -#if !defined(SQLITE_OMIT_FLAG_PRAGMAS) - {/* zName: */ "checkpoint_fullfsync", - /* ePragTyp: */ PragTyp_FLAG, - /* ePragFlg: */ PragFlg_Result0|PragFlg_NoColumns1, - /* ColNames: */ 0, 0, - /* iArg: */ SQLITE_CkptFullFSync }, -#endif -#if !defined(SQLITE_OMIT_SCHEMA_PRAGMAS) - {/* zName: */ "collation_list", - /* ePragTyp: */ PragTyp_COLLATION_LIST, - /* ePragFlg: */ PragFlg_Result0, - /* ColNames: */ 38, 2, - /* iArg: */ 0 }, -#endif -#if !defined(SQLITE_OMIT_COMPILEOPTION_DIAGS) - {/* zName: */ "compile_options", - /* ePragTyp: */ PragTyp_COMPILE_OPTIONS, - /* ePragFlg: */ PragFlg_Result0, - /* ColNames: */ 0, 0, - /* iArg: */ 0 }, -#endif -#if !defined(SQLITE_OMIT_FLAG_PRAGMAS) - {/* zName: */ "count_changes", - /* ePragTyp: */ PragTyp_FLAG, - /* ePragFlg: */ PragFlg_Result0|PragFlg_NoColumns1, - /* ColNames: */ 0, 0, - /* iArg: */ SQLITE_CountRows }, -#endif -#if !defined(SQLITE_OMIT_PAGER_PRAGMAS) && SQLITE_OS_WIN - {/* zName: */ "data_store_directory", - /* ePragTyp: */ PragTyp_DATA_STORE_DIRECTORY, - /* ePragFlg: */ PragFlg_NoColumns1, - /* ColNames: */ 0, 0, - /* iArg: */ 0 }, -#endif -#if !defined(SQLITE_OMIT_SCHEMA_VERSION_PRAGMAS) - {/* zName: */ "data_version", - /* ePragTyp: */ PragTyp_HEADER_VALUE, - /* ePragFlg: */ PragFlg_ReadOnly|PragFlg_Result0, - /* ColNames: */ 0, 0, - /* iArg: */ BTREE_DATA_VERSION }, -#endif -#if !defined(SQLITE_OMIT_SCHEMA_PRAGMAS) - {/* zName: */ "database_list", - /* ePragTyp: */ PragTyp_DATABASE_LIST, - /* ePragFlg: */ PragFlg_Result0, - /* ColNames: */ 47, 3, - /* iArg: */ 0 }, -#endif -#if !defined(SQLITE_OMIT_PAGER_PRAGMAS) && !defined(SQLITE_OMIT_DEPRECATED) - {/* zName: */ "default_cache_size", - /* ePragTyp: */ PragTyp_DEFAULT_CACHE_SIZE, - /* ePragFlg: */ PragFlg_NeedSchema|PragFlg_Result0|PragFlg_SchemaReq|PragFlg_NoColumns1, - /* ColNames: */ 55, 1, - /* iArg: */ 0 }, -#endif -#if !defined(SQLITE_OMIT_FLAG_PRAGMAS) -#if !defined(SQLITE_OMIT_FOREIGN_KEY) && !defined(SQLITE_OMIT_TRIGGER) - {/* zName: */ "defer_foreign_keys", - /* ePragTyp: */ PragTyp_FLAG, - /* ePragFlg: */ PragFlg_Result0|PragFlg_NoColumns1, - /* ColNames: */ 0, 0, - /* iArg: */ SQLITE_DeferFKs }, -#endif -#endif -#if !defined(SQLITE_OMIT_FLAG_PRAGMAS) - {/* zName: */ "empty_result_callbacks", - /* ePragTyp: */ PragTyp_FLAG, - /* ePragFlg: */ PragFlg_Result0|PragFlg_NoColumns1, - /* ColNames: */ 0, 0, - /* iArg: */ SQLITE_NullCallback }, -#endif -#if !defined(SQLITE_OMIT_UTF16) - {/* zName: */ "encoding", - /* ePragTyp: */ PragTyp_ENCODING, - /* ePragFlg: */ PragFlg_Result0|PragFlg_NoColumns1, - /* ColNames: */ 0, 0, - /* iArg: */ 0 }, -#endif -#if !defined(SQLITE_OMIT_FOREIGN_KEY) && !defined(SQLITE_OMIT_TRIGGER) - {/* zName: */ "foreign_key_check", - /* ePragTyp: */ PragTyp_FOREIGN_KEY_CHECK, - /* ePragFlg: */ PragFlg_NeedSchema|PragFlg_Result0|PragFlg_Result1|PragFlg_SchemaOpt, - /* ColNames: */ 43, 4, - /* iArg: */ 0 }, -#endif -#if !defined(SQLITE_OMIT_FOREIGN_KEY) - {/* zName: */ "foreign_key_list", - /* ePragTyp: */ PragTyp_FOREIGN_KEY_LIST, - /* ePragFlg: */ PragFlg_NeedSchema|PragFlg_Result1|PragFlg_SchemaOpt, - /* ColNames: */ 0, 8, - /* iArg: */ 0 }, -#endif -#if !defined(SQLITE_OMIT_FLAG_PRAGMAS) -#if !defined(SQLITE_OMIT_FOREIGN_KEY) && !defined(SQLITE_OMIT_TRIGGER) - {/* zName: */ "foreign_keys", - /* ePragTyp: */ PragTyp_FLAG, - /* ePragFlg: */ PragFlg_Result0|PragFlg_NoColumns1, - /* ColNames: */ 0, 0, - /* iArg: */ SQLITE_ForeignKeys }, -#endif -#endif -#if !defined(SQLITE_OMIT_SCHEMA_VERSION_PRAGMAS) - {/* zName: */ "freelist_count", - /* ePragTyp: */ PragTyp_HEADER_VALUE, - /* ePragFlg: */ PragFlg_ReadOnly|PragFlg_Result0, - /* ColNames: */ 0, 0, - /* iArg: */ BTREE_FREE_PAGE_COUNT }, -#endif -#if !defined(SQLITE_OMIT_FLAG_PRAGMAS) - {/* zName: */ "full_column_names", - /* ePragTyp: */ PragTyp_FLAG, - /* ePragFlg: */ PragFlg_Result0|PragFlg_NoColumns1, - /* ColNames: */ 0, 0, - /* iArg: */ SQLITE_FullColNames }, - {/* zName: */ "fullfsync", - /* ePragTyp: */ PragTyp_FLAG, - /* ePragFlg: */ PragFlg_Result0|PragFlg_NoColumns1, - /* ColNames: */ 0, 0, - /* iArg: */ SQLITE_FullFSync }, -#endif -#if !defined(SQLITE_OMIT_SCHEMA_PRAGMAS) -#if !defined(SQLITE_OMIT_INTROSPECTION_PRAGMAS) - {/* zName: */ "function_list", - /* ePragTyp: */ PragTyp_FUNCTION_LIST, - /* ePragFlg: */ PragFlg_Result0, - /* ColNames: */ 27, 6, - /* iArg: */ 0 }, -#endif -#endif - {/* zName: */ "hard_heap_limit", - /* ePragTyp: */ PragTyp_HARD_HEAP_LIMIT, - /* ePragFlg: */ PragFlg_Result0, - /* ColNames: */ 0, 0, - /* iArg: */ 0 }, -#if !defined(SQLITE_OMIT_FLAG_PRAGMAS) -#if !defined(SQLITE_OMIT_CHECK) - {/* zName: */ "ignore_check_constraints", - /* ePragTyp: */ PragTyp_FLAG, - /* ePragFlg: */ PragFlg_Result0|PragFlg_NoColumns1, - /* ColNames: */ 0, 0, - /* iArg: */ SQLITE_IgnoreChecks }, -#endif -#endif -#if !defined(SQLITE_OMIT_AUTOVACUUM) - {/* zName: */ "incremental_vacuum", - /* ePragTyp: */ PragTyp_INCREMENTAL_VACUUM, - /* ePragFlg: */ PragFlg_NeedSchema|PragFlg_NoColumns, - /* ColNames: */ 0, 0, - /* iArg: */ 0 }, -#endif -#if !defined(SQLITE_OMIT_SCHEMA_PRAGMAS) - {/* zName: */ "index_info", - /* ePragTyp: */ PragTyp_INDEX_INFO, - /* ePragFlg: */ PragFlg_NeedSchema|PragFlg_Result1|PragFlg_SchemaOpt, - /* ColNames: */ 21, 3, - /* iArg: */ 0 }, - {/* zName: */ "index_list", - /* ePragTyp: */ PragTyp_INDEX_LIST, - /* ePragFlg: */ PragFlg_NeedSchema|PragFlg_Result1|PragFlg_SchemaOpt, - /* ColNames: */ 38, 5, - /* iArg: */ 0 }, - {/* zName: */ "index_xinfo", - /* ePragTyp: */ PragTyp_INDEX_INFO, - /* ePragFlg: */ PragFlg_NeedSchema|PragFlg_Result1|PragFlg_SchemaOpt, - /* ColNames: */ 21, 6, - /* iArg: */ 1 }, -#endif -#if !defined(SQLITE_OMIT_INTEGRITY_CHECK) - {/* zName: */ "integrity_check", - /* ePragTyp: */ PragTyp_INTEGRITY_CHECK, - /* ePragFlg: */ PragFlg_NeedSchema|PragFlg_Result0|PragFlg_Result1|PragFlg_SchemaOpt, - /* ColNames: */ 0, 0, - /* iArg: */ 0 }, -#endif -#if !defined(SQLITE_OMIT_PAGER_PRAGMAS) - {/* zName: */ "journal_mode", - /* ePragTyp: */ PragTyp_JOURNAL_MODE, - /* ePragFlg: */ PragFlg_NeedSchema|PragFlg_Result0|PragFlg_SchemaReq, - /* ColNames: */ 0, 0, - /* iArg: */ 0 }, - {/* zName: */ "journal_size_limit", - /* ePragTyp: */ PragTyp_JOURNAL_SIZE_LIMIT, - /* ePragFlg: */ PragFlg_Result0|PragFlg_SchemaReq, - /* ColNames: */ 0, 0, - /* iArg: */ 0 }, -#endif -#if !defined(SQLITE_OMIT_FLAG_PRAGMAS) - {/* zName: */ "legacy_alter_table", - /* ePragTyp: */ PragTyp_FLAG, - /* ePragFlg: */ PragFlg_Result0|PragFlg_NoColumns1, - /* ColNames: */ 0, 0, - /* iArg: */ SQLITE_LegacyAlter }, -#endif -#if !defined(SQLITE_OMIT_PAGER_PRAGMAS) && SQLITE_ENABLE_LOCKING_STYLE - {/* zName: */ "lock_proxy_file", - /* ePragTyp: */ PragTyp_LOCK_PROXY_FILE, - /* ePragFlg: */ PragFlg_NoColumns1, - /* ColNames: */ 0, 0, - /* iArg: */ 0 }, -#endif -#if defined(SQLITE_DEBUG) || defined(SQLITE_TEST) - {/* zName: */ "lock_status", - /* ePragTyp: */ PragTyp_LOCK_STATUS, - /* ePragFlg: */ PragFlg_Result0, - /* ColNames: */ 53, 2, - /* iArg: */ 0 }, -#endif -#if !defined(SQLITE_OMIT_PAGER_PRAGMAS) - {/* zName: */ "locking_mode", - /* ePragTyp: */ PragTyp_LOCKING_MODE, - /* ePragFlg: */ PragFlg_Result0|PragFlg_SchemaReq, - /* ColNames: */ 0, 0, - /* iArg: */ 0 }, - {/* zName: */ "max_page_count", - /* ePragTyp: */ PragTyp_PAGE_COUNT, - /* ePragFlg: */ PragFlg_NeedSchema|PragFlg_Result0|PragFlg_SchemaReq, - /* ColNames: */ 0, 0, - /* iArg: */ 0 }, - {/* zName: */ "mmap_size", - /* ePragTyp: */ PragTyp_MMAP_SIZE, - /* ePragFlg: */ 0, - /* ColNames: */ 0, 0, - /* iArg: */ 0 }, -#endif -#if !defined(SQLITE_OMIT_SCHEMA_PRAGMAS) -#if !defined(SQLITE_OMIT_VIRTUALTABLE) -#if !defined(SQLITE_OMIT_INTROSPECTION_PRAGMAS) - {/* zName: */ "module_list", - /* ePragTyp: */ PragTyp_MODULE_LIST, - /* ePragFlg: */ PragFlg_Result0, - /* ColNames: */ 9, 1, - /* iArg: */ 0 }, -#endif -#endif -#endif - {/* zName: */ "optimize", - /* ePragTyp: */ PragTyp_OPTIMIZE, - /* ePragFlg: */ PragFlg_Result1|PragFlg_NeedSchema, - /* ColNames: */ 0, 0, - /* iArg: */ 0 }, -#if !defined(SQLITE_OMIT_PAGER_PRAGMAS) - {/* zName: */ "page_count", - /* ePragTyp: */ PragTyp_PAGE_COUNT, - /* ePragFlg: */ PragFlg_NeedSchema|PragFlg_Result0|PragFlg_SchemaReq, - /* ColNames: */ 0, 0, - /* iArg: */ 0 }, - {/* zName: */ "page_size", - /* ePragTyp: */ PragTyp_PAGE_SIZE, - /* ePragFlg: */ PragFlg_Result0|PragFlg_SchemaReq|PragFlg_NoColumns1, - /* ColNames: */ 0, 0, - /* iArg: */ 0 }, -#endif -#if !defined(SQLITE_OMIT_FLAG_PRAGMAS) -#if defined(SQLITE_DEBUG) - {/* zName: */ "parser_trace", - /* ePragTyp: */ PragTyp_FLAG, - /* ePragFlg: */ PragFlg_Result0|PragFlg_NoColumns1, - /* ColNames: */ 0, 0, - /* iArg: */ SQLITE_ParserTrace }, -#endif -#endif -#if !defined(SQLITE_OMIT_INTROSPECTION_PRAGMAS) - {/* zName: */ "pragma_list", - /* ePragTyp: */ PragTyp_PRAGMA_LIST, - /* ePragFlg: */ PragFlg_Result0, - /* ColNames: */ 9, 1, - /* iArg: */ 0 }, -#endif -#if !defined(SQLITE_OMIT_FLAG_PRAGMAS) - {/* zName: */ "query_only", - /* ePragTyp: */ PragTyp_FLAG, - /* ePragFlg: */ PragFlg_Result0|PragFlg_NoColumns1, - /* ColNames: */ 0, 0, - /* iArg: */ SQLITE_QueryOnly }, -#endif -#if !defined(SQLITE_OMIT_INTEGRITY_CHECK) - {/* zName: */ "quick_check", - /* ePragTyp: */ PragTyp_INTEGRITY_CHECK, - /* ePragFlg: */ PragFlg_NeedSchema|PragFlg_Result0|PragFlg_Result1|PragFlg_SchemaOpt, - /* ColNames: */ 0, 0, - /* iArg: */ 0 }, -#endif -#if !defined(SQLITE_OMIT_FLAG_PRAGMAS) - {/* zName: */ "read_uncommitted", - /* ePragTyp: */ PragTyp_FLAG, - /* ePragFlg: */ PragFlg_Result0|PragFlg_NoColumns1, - /* ColNames: */ 0, 0, - /* iArg: */ SQLITE_ReadUncommit }, - {/* zName: */ "recursive_triggers", - /* ePragTyp: */ PragTyp_FLAG, - /* ePragFlg: */ PragFlg_Result0|PragFlg_NoColumns1, - /* ColNames: */ 0, 0, - /* iArg: */ SQLITE_RecTriggers }, - {/* zName: */ "reverse_unordered_selects", - /* ePragTyp: */ PragTyp_FLAG, - /* ePragFlg: */ PragFlg_Result0|PragFlg_NoColumns1, - /* ColNames: */ 0, 0, - /* iArg: */ SQLITE_ReverseOrder }, -#endif -#if !defined(SQLITE_OMIT_SCHEMA_VERSION_PRAGMAS) - {/* zName: */ "schema_version", - /* ePragTyp: */ PragTyp_HEADER_VALUE, - /* ePragFlg: */ PragFlg_NoColumns1|PragFlg_Result0, - /* ColNames: */ 0, 0, - /* iArg: */ BTREE_SCHEMA_VERSION }, -#endif -#if !defined(SQLITE_OMIT_PAGER_PRAGMAS) - {/* zName: */ "secure_delete", - /* ePragTyp: */ PragTyp_SECURE_DELETE, - /* ePragFlg: */ PragFlg_Result0, - /* ColNames: */ 0, 0, - /* iArg: */ 0 }, -#endif -#if !defined(SQLITE_OMIT_FLAG_PRAGMAS) - {/* zName: */ "short_column_names", - /* ePragTyp: */ PragTyp_FLAG, - /* ePragFlg: */ PragFlg_Result0|PragFlg_NoColumns1, - /* ColNames: */ 0, 0, - /* iArg: */ SQLITE_ShortColNames }, -#endif - {/* zName: */ "shrink_memory", - /* ePragTyp: */ PragTyp_SHRINK_MEMORY, - /* ePragFlg: */ PragFlg_NoColumns, - /* ColNames: */ 0, 0, - /* iArg: */ 0 }, - {/* zName: */ "soft_heap_limit", - /* ePragTyp: */ PragTyp_SOFT_HEAP_LIMIT, - /* ePragFlg: */ PragFlg_Result0, - /* ColNames: */ 0, 0, - /* iArg: */ 0 }, -#if !defined(SQLITE_OMIT_FLAG_PRAGMAS) -#if defined(SQLITE_DEBUG) - {/* zName: */ "sql_trace", - /* ePragTyp: */ PragTyp_FLAG, - /* ePragFlg: */ PragFlg_Result0|PragFlg_NoColumns1, - /* ColNames: */ 0, 0, - /* iArg: */ SQLITE_SqlTrace }, -#endif -#endif -#if !defined(SQLITE_OMIT_SCHEMA_PRAGMAS) && defined(SQLITE_DEBUG) - {/* zName: */ "stats", - /* ePragTyp: */ PragTyp_STATS, - /* ePragFlg: */ PragFlg_NeedSchema|PragFlg_Result0|PragFlg_SchemaReq, - /* ColNames: */ 33, 5, - /* iArg: */ 0 }, -#endif -#if !defined(SQLITE_OMIT_PAGER_PRAGMAS) - {/* zName: */ "synchronous", - /* ePragTyp: */ PragTyp_SYNCHRONOUS, - /* ePragFlg: */ PragFlg_NeedSchema|PragFlg_Result0|PragFlg_SchemaReq|PragFlg_NoColumns1, - /* ColNames: */ 0, 0, - /* iArg: */ 0 }, -#endif -#if !defined(SQLITE_OMIT_SCHEMA_PRAGMAS) - {/* zName: */ "table_info", - /* ePragTyp: */ PragTyp_TABLE_INFO, - /* ePragFlg: */ PragFlg_NeedSchema|PragFlg_Result1|PragFlg_SchemaOpt, - /* ColNames: */ 8, 6, - /* iArg: */ 0 }, - {/* zName: */ "table_list", - /* ePragTyp: */ PragTyp_TABLE_LIST, - /* ePragFlg: */ PragFlg_NeedSchema|PragFlg_Result1, - /* ColNames: */ 15, 6, - /* iArg: */ 0 }, - {/* zName: */ "table_xinfo", - /* ePragTyp: */ PragTyp_TABLE_INFO, - /* ePragFlg: */ PragFlg_NeedSchema|PragFlg_Result1|PragFlg_SchemaOpt, - /* ColNames: */ 8, 7, - /* iArg: */ 1 }, -#endif -#if !defined(SQLITE_OMIT_PAGER_PRAGMAS) - {/* zName: */ "temp_store", - /* ePragTyp: */ PragTyp_TEMP_STORE, - /* ePragFlg: */ PragFlg_Result0|PragFlg_NoColumns1, - /* ColNames: */ 0, 0, - /* iArg: */ 0 }, - {/* zName: */ "temp_store_directory", - /* ePragTyp: */ PragTyp_TEMP_STORE_DIRECTORY, - /* ePragFlg: */ PragFlg_NoColumns1, - /* ColNames: */ 0, 0, - /* iArg: */ 0 }, -#endif - {/* zName: */ "threads", - /* ePragTyp: */ PragTyp_THREADS, - /* ePragFlg: */ PragFlg_Result0, - /* ColNames: */ 0, 0, - /* iArg: */ 0 }, -#if !defined(SQLITE_OMIT_FLAG_PRAGMAS) - {/* zName: */ "trusted_schema", - /* ePragTyp: */ PragTyp_FLAG, - /* ePragFlg: */ PragFlg_Result0|PragFlg_NoColumns1, - /* ColNames: */ 0, 0, - /* iArg: */ SQLITE_TrustedSchema }, -#endif -#if !defined(SQLITE_OMIT_SCHEMA_VERSION_PRAGMAS) - {/* zName: */ "user_version", - /* ePragTyp: */ PragTyp_HEADER_VALUE, - /* ePragFlg: */ PragFlg_NoColumns1|PragFlg_Result0, - /* ColNames: */ 0, 0, - /* iArg: */ BTREE_USER_VERSION }, -#endif -#if !defined(SQLITE_OMIT_FLAG_PRAGMAS) -#if defined(SQLITE_DEBUG) - {/* zName: */ "vdbe_addoptrace", - /* ePragTyp: */ PragTyp_FLAG, - /* ePragFlg: */ PragFlg_Result0|PragFlg_NoColumns1, - /* ColNames: */ 0, 0, - /* iArg: */ SQLITE_VdbeAddopTrace }, - {/* zName: */ "vdbe_debug", - /* ePragTyp: */ PragTyp_FLAG, - /* ePragFlg: */ PragFlg_Result0|PragFlg_NoColumns1, - /* ColNames: */ 0, 0, - /* iArg: */ SQLITE_SqlTrace|SQLITE_VdbeListing|SQLITE_VdbeTrace }, - {/* zName: */ "vdbe_eqp", - /* ePragTyp: */ PragTyp_FLAG, - /* ePragFlg: */ PragFlg_Result0|PragFlg_NoColumns1, - /* ColNames: */ 0, 0, - /* iArg: */ SQLITE_VdbeEQP }, - {/* zName: */ "vdbe_listing", - /* ePragTyp: */ PragTyp_FLAG, - /* ePragFlg: */ PragFlg_Result0|PragFlg_NoColumns1, - /* ColNames: */ 0, 0, - /* iArg: */ SQLITE_VdbeListing }, - {/* zName: */ "vdbe_trace", - /* ePragTyp: */ PragTyp_FLAG, - /* ePragFlg: */ PragFlg_Result0|PragFlg_NoColumns1, - /* ColNames: */ 0, 0, - /* iArg: */ SQLITE_VdbeTrace }, -#endif -#endif -#if !defined(SQLITE_OMIT_WAL) - {/* zName: */ "wal_autocheckpoint", - /* ePragTyp: */ PragTyp_WAL_AUTOCHECKPOINT, - /* ePragFlg: */ 0, - /* ColNames: */ 0, 0, - /* iArg: */ 0 }, - {/* zName: */ "wal_checkpoint", - /* ePragTyp: */ PragTyp_WAL_CHECKPOINT, - /* ePragFlg: */ PragFlg_NeedSchema, - /* ColNames: */ 50, 3, - /* iArg: */ 0 }, -#endif -#if !defined(SQLITE_OMIT_FLAG_PRAGMAS) - {/* zName: */ "writable_schema", - /* ePragTyp: */ PragTyp_FLAG, - /* ePragFlg: */ PragFlg_Result0|PragFlg_NoColumns1, - /* ColNames: */ 0, 0, - /* iArg: */ SQLITE_WriteSchema|SQLITE_NoSchemaError }, -#endif -}; -/* Number of pragmas: 68 on by default, 78 total. */ diff --git a/tool/mkpragmatab.tcl b/tool/mkpragmatab.tcl index 2b5b6fdcdb..81ef0ea002 100644 --- a/tool/mkpragmatab.tcl +++ b/tool/mkpragmatab.tcl @@ -4,16 +4,16 @@ # # To add new pragmas, first add the name and other relevant attributes # of the pragma to the "pragma_def" object below. Then run this script -# to generate the ../src/pragma.h header file that contains macros and +# to generate the pragma.h header file that contains macros and # the lookup table needed for pragma name lookup in the pragma.c module. # Then add the extra "case PragTyp_XXXXX:" and subsequent code for the # new pragma in ../src/pragma.c. # -# The results are normally written into the ../src/pragma.h file. However, +# The results are normally written into the pragma.h file. However, # if an alternative output file name is provided as an argument, then # results are written into the alternative. For example: # -# tclsh tool/mkpragmatab.tcl ;# <--- Results to src/pragma.h +# tclsh tool/mkpragmatab.tcl ;# <--- Results to pragma.h # # tclsh tool/mkpragmatab.tcl /dev/tty ;# <-- results to terminal # @@ -413,7 +413,7 @@ set pragma_def { if {$argc>0} { set destfile [lindex $argv 0] } else { - set destfile "[file dir [file dir [file normal $argv0]]]/src/pragma.h" + set destfile "pragma.h" puts "Overwriting $destfile with new pragma table..." } set fd [open $destfile wb] diff --git a/tool/srctree-check.tcl b/tool/srctree-check.tcl index 918f12a9d6..b16bd924a0 100644 --- a/tool/srctree-check.tcl +++ b/tool/srctree-check.tcl @@ -5,7 +5,6 @@ # # * Makefile.msc and autoconf/Makefile.msc agree # * VERSION agrees with autoconf/tea/configure.ac -# * src/pragma.h agrees with tool/mkpragmatab.tcl # # Other tests might be added later. # @@ -61,15 +60,3 @@ if {$f1 != $f2} { puts "...... Fix: tclsh tool/mkmsvcmin.tcl" incr NERR } - -######################### src/pragma.h ######################################## - -set f1 [readfile $ROOT/src/pragma.h] -exec $TCLSH $ROOT/tool/mkpragmatab.tcl tmp2.txt -set f2 [readfile tmp2.txt] -file delete tmp2.txt -if {$f1 != $f2} { - puts "ERROR: ./src/pragma.h does not agree with ./tool/mkpragmatab.tcl" - puts "...... Fix: tclsh tool/mkpragmatab.tcl" - incr NERR -} From 41f29806a1c59fec8109e4d8ab3d7d52e0036834 Mon Sep 17 00:00:00 2001 From: dan Date: Wed, 12 Feb 2025 08:07:10 +0000 Subject: [PATCH 093/194] Fix test script errors in walsetlk3.test. Tests still don't all pass. FossilOrigin-Name: 56eb4114f8bf9971960998ae0b79352767657ee19b5bdfec5149906e72ba170f --- manifest | 14 +++++++------- manifest.uuid | 2 +- src/os_win.c | 2 +- test/walsetlk3.test | 12 ++++++++---- 4 files changed, 17 insertions(+), 13 deletions(-) diff --git a/manifest b/manifest index f65979cb3f..bf3ca55e5e 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Update\stool/mkctimec.tcl\sso\sthat\ssqlite3_compileoption_xxx()\sAPIs\sreport\son\sthe\sSQLITE_ENABLE_SETLK_TIMEOUT\soption. -D 2025-02-11T18:32:22.367 +C Fix\stest\sscript\serrors\sin\swalsetlk3.test.\sTests\sstill\sdon't\sall\spass. +D 2025-02-12T08:07:10.218 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d @@ -765,7 +765,7 @@ F src/os_common.h 6c0eb8dd40ef3e12fe585a13e709710267a258e2c8dd1c40b1948a1d14582e F src/os_kv.c 4d39e1f1c180b11162c6dc4aa8ad34053873a639bac6baae23272fc03349986a F src/os_setup.h 6011ad7af5db4e05155f385eb3a9b4470688de6f65d6166b8956e58a3d872107 F src/os_unix.c 1e887f1f926a76a65ebcef79aa6da76e369ad7f899fa211c6ee56ff953c098a2 -F src/os_win.c 84502044e9d064c54f1931e015ef49a4804114e80cc75461c5bda357070bc596 +F src/os_win.c 68a2b90772c7510f4dd826b6e8c79c9d4f648ea98cdd7677e7fb3dec1db26ebc F src/os_win.h 7b073010f1451abe501be30d12f6bc599824944a F src/pager.c 3a1c4e7f69af482e33c8cba8a75afe0dda0ea6391240adac22b040ce1bdeef44 F src/pager.h 6137149346e6c8a3ddc1eeb40aee46381e9bc8b0fcc6dda8a1efde993c2275b8 @@ -2028,7 +2028,7 @@ F test/walrofault.test c70cb6e308c443867701856cce92ad8288cd99488fa52afab77cca6cf F test/walseh1.test bae700eb99519b6d5cd3f893c04759accc5a59c391d4189fe4dd6995a533442b F test/walsetlk.test 9c5b92f9a20252540fedf9ffa6ee3d1b8af08ea4b80d0144d9b88e6c0c1de80d F test/walsetlk2.test 5ae8662a28c013e8df2ce975f9e3577a7f239aeb4622bb8d4d0ca8e16c0c132e -F test/walsetlk3.test 7ac01cb6ca9640081fbb5c59170172b85fbaf9e7a8a1e678a38e21df5d55721e +F test/walsetlk3.test 1b82bd92dea7e58f498b4399b0b3d26773dd8ac5c74205ce4a23c207cb8e85fe F test/walshared.test 42e3808582504878af237ea02c42ca793e8a0efaa19df7df26ac573370dbc7a3 F test/walslow.test 0c51843836c9dcf40a5ac05aa781bfb977b396ee2c872d92bd48b79d5dd9aa23 F test/walthread.test 14b20fcfa6ae152f5d8e12f5dc8a8a724b7ef189f5d8ef1e2ceab79f2af51747 @@ -2211,8 +2211,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P 8e809632ba3bb20b7ec23ce9e6ca659c57cf1338b1fe8c33502c5f3161061dd2 -R 0d8181912c6739bfd5e49e604de13386 +P 303e8009ab59aad32030407baf3eff9443f7f9bed7947218b78293b06bba1737 +R 92a553ba4589551655030e50133e0a04 U dan -Z 7d39383234846ecfbdbe2d30db37f4f9 +Z ac5c8a11b435d673fdcd5b48f8d17f0d # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 13e47aeedd..7e9c7e3039 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -303e8009ab59aad32030407baf3eff9443f7f9bed7947218b78293b06bba1737 +56eb4114f8bf9971960998ae0b79352767657ee19b5bdfec5149906e72ba170f diff --git a/src/os_win.c b/src/os_win.c index 88701d5d13..1d090dbf42 100644 --- a/src/os_win.c +++ b/src/os_win.c @@ -3630,7 +3630,7 @@ static int winUnlock(sqlite3_file *id, int locktype){ type = pFile->locktype; if( type>=EXCLUSIVE_LOCK ){ winUnlockFile(&pFile->h, SHARED_FIRST, 0, SHARED_SIZE, 0); - if( locktype==SHARED_LOCK && !winGetReadLock(pFile) ){ + if( locktype==SHARED_LOCK && !winGetReadLock(pFile, 0) ){ /* This should never happen. We should always be able to ** reacquire the read lock */ rc = winLogError(SQLITE_IOERR_UNLOCK, osGetLastError(), diff --git a/test/walsetlk3.test b/test/walsetlk3.test index efd5cdf92d..b091b183d8 100644 --- a/test/walsetlk3.test +++ b/test/walsetlk3.test @@ -61,7 +61,8 @@ sql_block_on_close { INSERT INTO t1 VALUES(5, 6); INSERT INTO t1 VALUES(7, 8); } -after 500 +after 500 {set ok 1} +vwait ok sqlite3 db test.db sqlite3_setlk_timeout db 2000 do_catchsql_test 1.1 { @@ -76,7 +77,8 @@ sql_block_on_close { INSERT INTO t1 VALUES(9, 10); INSERT INTO t1 VALUES(11, 12); } -after 500 +after 500 {set ok 1} +vwait ok sqlite3 db test.db sqlite3_setlk_timeout -block db 2000 do_catchsql_test 1.2 { @@ -111,7 +113,8 @@ sql_block_on_write { INSERT INTO x1 VALUES(4); } -after 500 +after 500 {set ok 1} +vwait ok sqlite3 db test.db sqlite3_setlk_timeout -block db 2000 @@ -121,7 +124,8 @@ do_catchsql_test 2.2 { } {1 {database is locked}} vwait ::done -after 500 +after 500 {set ok 1} +vwait ok do_catchsql_test 2.3 { SELECT * FROM x1 From 56ff8df023aef7b63d755bf5e1fc2841d335f94b Mon Sep 17 00:00:00 2001 From: stephan Date: Wed, 12 Feb 2025 14:51:02 +0000 Subject: [PATCH 094/194] Tiny tcl comment tweaks. No functional changes. FossilOrigin-Name: da94e551c0ed354ae782c89fd9495d607b77ad7572d90c41ceac12bd6ec4c31b --- auto.def | 2 +- autoconf/auto.def | 2 +- autosetup/sqlite-config.tcl | 2 +- manifest | 18 +++++++++--------- manifest.uuid | 2 +- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/auto.def b/auto.def index 981b455954..4528293cd7 100644 --- a/auto.def +++ b/auto.def @@ -1,4 +1,4 @@ -#/do/not/tclsh +#!/do/not/tclsh # ^^^ help out editors which guess this file's content type. # # This is the main autosetup-compatible configure script for the diff --git a/autoconf/auto.def b/autoconf/auto.def index c2e02fe3d8..bb8710378f 100644 --- a/autoconf/auto.def +++ b/autoconf/auto.def @@ -1,4 +1,4 @@ -#/do/not/tclsh +#!/do/not/tclsh # ^^^ help out editors which guess this file's content type. # # This is the main autosetup-compatible configure script for the diff --git a/autosetup/sqlite-config.tcl b/autosetup/sqlite-config.tcl index 3d3f892bf0..108edaa1c1 100644 --- a/autosetup/sqlite-config.tcl +++ b/autosetup/sqlite-config.tcl @@ -130,7 +130,7 @@ proc sqlite-config-bootstrap {buildMode} { static=1 => {Disable build of static library (mostly)} } {canonical} { - amalgamation=1 => {Disable the amalgamation and instead build all files separately.} + amalgamation=1 => {Disable the amalgamation and instead build all files separately} } } diff --git a/manifest b/manifest index e71a53be0b..d99039541a 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Omit\sthe\ssrc/pragma.h\sfile.\s\sIt\sis\sgenerated\sby\sthe\stool/mkpragmatab.tcl\sscript.\nThe\smakefiles\snow\sknow\show\sto\sbuild\sthis\sfile\sfor\sthemselves. -D 2025-02-11T19:54:13.594 +C Tiny\stcl\scomment\stweaks.\sNo\sfunctional\schanges. +D 2025-02-12T14:51:02.700 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d @@ -14,13 +14,13 @@ F art/sqlite370.eps aa97a671332b432a54e1d74ff5e8775be34200c2 F art/sqlite370.ico af56c1d00fee7cd4753e8631ed60703ed0fc6e90 F art/sqlite370.jpg d512473dae7e378a67e28ff96a34da7cb331def2 F art/sqlite370.svg 40b7e2fe8aac3add5d56dd86ab8d427a4eca5bcb3fe4f8946cb3794e1821d531 -F auto.def 74ec59fbf7de5038aa9c3d0b1e0fea67e128e432ff9d84472c4016b08ec3d60b +F auto.def 542572667678019e75e16c3e970bfb9358abed9a6ec70f3715997dd9a04b7fd9 F autoconf/Makefile.fallback 22fe523eb36dfce31e0f6349f782eb084e86a5620b2b0b4f84a2d6133f53f5ac F autoconf/Makefile.in 7bd73a4c8cd89025cbc92b4f887c6fd1b8cd8ecbe62c4ac1f36ac84d04043479 F autoconf/Makefile.msc 4f09fead3bf7de337242896f107c5d03cd8f7b39754315ab091a2e4d02892c40 F autoconf/README.first f1d3876e9a7852c22f275a6f06814e64934cecbc0b5b9617d64849094c1fd136 F autoconf/README.txt 7f01dc3915e2d68f329011073662369e62a0938a2c69398807823c57591cb288 -F autoconf/auto.def 1900a63cfa18e662b16d912c849ea81609a90b5fe00cea54955a41572e2c2cd0 +F autoconf/auto.def 9af634c6d51fa4b82c9bb61b51249ca087f2cbe09c7c3c31f920759082a1ffdb F autoconf/tea/Makefile.in ba0556fee8da09c066bad85a4457904e46ee2c2eabaa309c0e83a78f2f151a8e F autoconf/tea/README.txt 61e62e519579e4a112791354d6d440f8b51ea6db3b0bab58d59f29df42d2dfe3 F autoconf/tea/aclocal.m4 52c47aac44ce0ddb1f918b6993e8beb8eee88f43 @@ -50,7 +50,7 @@ F autosetup/cc.tcl c0fcc50ca91deff8741e449ddad05bcd08268bc31177e613a6343bbd1fd3e F autosetup/jimsh0.c 6573f6bc6ff204de0139692648d7037ca0b6c067bac83a7b4e087f20a86866a4 F autosetup/pkg-config.tcl 4e635bf39022ff65e0d5434339dd41503ea48fc53822c9c5bde88b02d3d952ba F autosetup/proj.tcl cef1e0aa0f2dee2042af66f28c97a9445f84d55d858ba9db4f6116846a1a325f -F autosetup/sqlite-config.tcl 40107b6a75a2ee367359b2adeb2221e118f5dfa6f10b0a0c0f237fc59fbedef3 +F autosetup/sqlite-config.tcl bdafc3585865ada5d9a0f2b462e21ea735d49d82353fdfb641cf6f841f8eae9e F autosetup/system.tcl 51d4be76cd9a9074704b584e5c9cbba616202c8468cf9ba8a4f8294a7ab1dba9 F configure 9a00b21dfd13757bbfb8d89b30660a89ec1f8f3a79402b8f9f9b6fc475c3303a x F contrib/sqlitecon.tcl 210a913ad63f9f991070821e599d600bd913e0ad @@ -2207,8 +2207,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P 958bb5de7c484cc503c38d38d51a30f679244fd364df5cbfc1992e36995b2ff9 -R c612f3371ab876eff4ecd15f96d1d3bd -U drh -Z d8718e46243e2a0107a59b8d9076cbbd +P 9709ed1cdfa17f690ffd4ec8cfc54efefec8352143c1d8b701f09299bd7eef6e +R 2e6463fde99e2450982f05262b049e36 +U stephan +Z 11dbfcf3ee53aaad351b744d008979f9 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 3c2620d3c5..fb3fb9c21f 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -9709ed1cdfa17f690ffd4ec8cfc54efefec8352143c1d8b701f09299bd7eef6e +da94e551c0ed354ae782c89fd9495d607b77ad7572d90c41ceac12bd6ec4c31b From f3e24d08753e6bea3b8a77c097fd3d1a1f138a36 Mon Sep 17 00:00:00 2001 From: dan Date: Wed, 12 Feb 2025 15:31:26 +0000 Subject: [PATCH 095/194] Remove old function declaration accidentally left in sqlite3session.h. FossilOrigin-Name: 0cfbe349d4b740f3d2be8c714cf679901fc2465db4c64e4c3742da700d82f4e7 --- ext/session/sqlite3session.h | 13 ------------- manifest | 14 +++++++------- manifest.uuid | 2 +- 3 files changed, 8 insertions(+), 21 deletions(-) diff --git a/ext/session/sqlite3session.h b/ext/session/sqlite3session.h index f950d419b5..919365b14f 100644 --- a/ext/session/sqlite3session.h +++ b/ext/session/sqlite3session.h @@ -883,19 +883,6 @@ int sqlite3changeset_concat( void **ppOut /* OUT: Buffer containing output changeset */ ); - -/* -** CAPI3REF: Upgrade the Schema of a Changeset/Patchset -*/ -int sqlite3changeset_upgrade( - sqlite3 *db, - const char *zDb, - int nIn, const void *pIn, /* Input changeset */ - int *pnOut, void **ppOut /* OUT: Inverse of input */ -); - - - /* ** CAPI3REF: Changegroup Handle ** diff --git a/manifest b/manifest index d99039541a..716b9c746b 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Tiny\stcl\scomment\stweaks.\sNo\sfunctional\schanges. -D 2025-02-12T14:51:02.700 +C Remove\sold\sfunction\sdeclaration\saccidentally\sleft\sin\ssqlite3session.h. +D 2025-02-12T15:31:26.463 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d @@ -616,7 +616,7 @@ F ext/session/sessionsize.test 8fcf4685993c3dbaa46a24183940ab9f5aa9ed0d23e5fb63b F ext/session/sessionstat1.test 5e718d5888c0c49bbb33a7a4f816366db85f59f6a4f97544a806421b85dc2dec F ext/session/sessionwor.test 6fd9a2256442cebde5b2284936ae9e0d54bde692d0f5fd009ecef8511f4cf3fc F ext/session/sqlite3session.c 52a680dbb03c4734748b215d95987fb4d95ab23baaf053a01ac2626610963b58 -F ext/session/sqlite3session.h 683ccbf16e2c2521661fc4c1cf918ce57002039efbcabcd8097fa4bca569104b +F ext/session/sqlite3session.h aa5de3ec8ef0e5313e9f65dafd69e8ba292d170f07b57da9200c040068dab061 F ext/session/test_session.c 12e0a2c15fd60f92da4bb29c697c9177ff0c0dbcdc5129a54c47e999f147937a F ext/wasm/EXPORTED_FUNCTIONS.fiddle.in 27450c8b8c70875a260aca55435ec927068b34cef801a96205adb81bdcefc65c F ext/wasm/GNUmakefile 06e0556e9840fd3d8870997025c2507ace9ba7bf11195f770295fc7947dfc1b5 @@ -2207,8 +2207,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P 9709ed1cdfa17f690ffd4ec8cfc54efefec8352143c1d8b701f09299bd7eef6e -R 2e6463fde99e2450982f05262b049e36 -U stephan -Z 11dbfcf3ee53aaad351b744d008979f9 +P da94e551c0ed354ae782c89fd9495d607b77ad7572d90c41ceac12bd6ec4c31b +R 6f7f1710621940ea4683c778ed859375 +U dan +Z 8c9d99e3c5ea71beb7debabd9d22f723 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index fb3fb9c21f..d19a148ee4 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -da94e551c0ed354ae782c89fd9495d607b77ad7572d90c41ceac12bd6ec4c31b +0cfbe349d4b740f3d2be8c714cf679901fc2465db4c64e4c3742da700d82f4e7 From 1be96b44c198a20f8fd567b319ba9fcb82ffa09e Mon Sep 17 00:00:00 2001 From: stephan Date: Wed, 12 Feb 2025 16:59:07 +0000 Subject: [PATCH 096/194] configure --help cleanups and eliminate the use of a JS-esque inner function in sqlite-config.tcl. No functional changes. FossilOrigin-Name: 6df859cd18ded3ca64a184e45709503dd9b6a3f65e7611d3352f0bad288400f4 --- autosetup/sqlite-config.tcl | 153 +++++++++++++++++++++--------------- manifest | 14 ++-- manifest.uuid | 2 +- 3 files changed, 99 insertions(+), 70 deletions(-) diff --git a/autosetup/sqlite-config.tcl b/autosetup/sqlite-config.tcl index 108edaa1c1..14cdcf5da1 100644 --- a/autosetup/sqlite-config.tcl +++ b/autosetup/sqlite-config.tcl @@ -109,21 +109,26 @@ proc sqlite-config-bootstrap {buildMode} { # the case of a default value. ######################################################################## set allFlags { - # Structure: a list of M {Z}, where M is a descriptive option - # group name and Z is a list of X Y pairs. X is a list of - # $buildMode name(s) to which these flags apply, or {*} to apply + # Structure: a list of M {Z} pairs, where M is a descriptive + # option group name and Z is a list of X Y pairs. X is a list of + # $buildMode name(s) to which the Y flags apply, or {*} to apply # to all builds. Y is a {block} in the form expected by # autosetup's [options] command. Each block which is applicable # to $buildMode is appended to a new list before that list is # passed on to [options]. The order of each Y and sub-Y is # retained, which is significant for rendering of --help. - # When writing {help text blocks}, be aware that autosetup formats - # them differently (left-aligned, directly under the --flag) if the - # block starts with a newline. It does NOT expand vars and commands, - # but we use a [subst] call below which will replace (only) var - # refs. + # When writing {help text blocks}, be aware that: + # + # A) autosetup formats them differently if the {block} starts with + # a newline: it starts left-aligned, directly under the --flag, and + # the rest of the block is pasted verbatim rather than + # pretty-printed. + # + # B) Vars and commands are NOT expanded, but we use a [subst] call + # below which will replace (only) var refs. + # Options for how to build the library build-modes { {*} { shared=1 => {Disable build of shared libary} @@ -134,11 +139,14 @@ proc sqlite-config-bootstrap {buildMode} { } } + # Library-level features and defaults lib-features { {*} { threadsafe=1 => {Disable mutexing} with-tempstore:=no => {Use an in-RAM database for temporary tables: never,no,yes,always} largefile=1 => {Disable large file support} + # ^^^ It's not clear that this actually does anything, as + # HAVE_LFS is not checked anywhere in the .c/.h/.in files. load-extension=1 => {Disable loading of external extensions} math=1 => {Disable math functions} json=1 => {Disable JSON functions} @@ -155,108 +163,130 @@ proc sqlite-config-bootstrap {buildMode} { } } + # Options for TCL support tcl { {canonical} { - with-tcl:DIR => - {Directory containing tclConfig.sh or a directory one level up from - that, from which we can derive a directory containing tclConfig.sh. - A dir name of "prefix" is equivalent to the directory specified by - the --prefix flag.} - with-tclsh:PATH => - {Full pathname of tclsh to use. It is used for (A) trying to find - tclConfig.sh and (B) all TCL-based code generation. Warning: if - its containing dir has multiple tclsh versions, it may select the - wrong tclConfig.sh!} - tcl=1 => - {Disable components which require TCL, including all tests. - This tree requires TCL for code generation but can use the in-tree - copy of autosetup/jimsh0.c for that. The SQLite TCL extension and the - test code require a canonical tclsh.} + with-tcl:DIR + => {Directory containing tclConfig.sh or a directory one level up from + that, from which we can derive a directory containing tclConfig.sh. + A dir name of "prefix" is equivalent to the directory specified by + the --prefix flag.} + with-tclsh:PATH + => {Full pathname of tclsh to use. It is used for (A) trying to find + tclConfig.sh and (B) all TCL-based code generation. Warning: if + its containing dir has multiple tclsh versions, it may select the + wrong tclConfig.sh!} + tcl=1 + => {Disable components which require TCL, including all tests. + This tree requires TCL for code generation but can use the in-tree + copy of autosetup/jimsh0.c for that. The SQLite TCL extension and the + test code require a canonical tclsh.} } } + # Options for line-editing modes for the CLI shell line-editing { {*} { - readline=1 => {Disable readline support} + readline=1 + => {Disable readline support} # --with-readline-lib is a backwards-compatible alias for # --with-readline-ldflags with-readline-lib: with-readline-ldflags:=auto - => {Readline LDFLAGS, e.g. -lreadline -lncurses} + => {Readline LDFLAGS, e.g. -lreadline -lncurses} # --with-readline-inc is a backwards-compatible alias for # --with-readline-cflags. with-readline-inc: with-readline-cflags:=auto - => {Readline CFLAGS, e.g. -I/path/to/includes} + => {Readline CFLAGS, e.g. -I/path/to/includes} with-readline-header:PATH - => {Full path to readline.h, from which --with-readline-cflags will be derived} - with-linenoise:DIR => {Source directory for linenoise.c and linenoise.h} - editline=0 => {Enable BSD editline support} + => {Full path to readline.h, from which --with-readline-cflags will be derived} + with-linenoise:DIR + => {Source directory for linenoise.c and linenoise.h} + editline=0 + => {Enable BSD editline support} } } + # Options for ICU: International Components for Unicode icu { {*} { with-icu-ldflags:LDFLAGS - => {Enable SQLITE_ENABLE_ICU and add the given linker flags for the ICU libraries} + => {Enable SQLITE_ENABLE_ICU and add the given linker flags for the + ICU libraries} with-icu-cflags:CFLAGS - => {Apply extra CFLAGS/CPPFLAGS necessary for building with ICU. e.g. -I/usr/local/include} - with-icu-config:=auto => {Enable SQLITE_ENABLE_ICU. Value must be one of: auto, pkg-config, /path/to/icu-config} - icu-collations=0 => {Enable SQLITE_ENABLE_ICU_COLLATIONS. Requires --with-icu-ldflags=... or --with-icu-config} + => {Apply extra CFLAGS/CPPFLAGS necessary for building with ICU. + e.g. -I/usr/local/include} + with-icu-config:=auto + => {Enable SQLITE_ENABLE_ICU. Value must be one of: auto, pkg-config, + /path/to/icu-config} + icu-collations=0 + => {Enable SQLITE_ENABLE_ICU_COLLATIONS. Requires --with-icu-ldflags=... + or --with-icu-config} } } + # Options for exotic/alternative build modes alternative-builds { {canonical} { with-wasi-sdk:=/opt/wasi-sdk - => {Top-most dir of the wasi-sdk for a WASI build} - with-emsdk:=auto => {Top-most dir of the Emscripten SDK installation. Default = EMSDK env var.} + => {Top-most dir of the wasi-sdk for a WASI build} + with-emsdk:=auto + => {Top-most dir of the Emscripten SDK installation. + Default = EMSDK env var.} } } - # Note that using the --debug/--enable-debug flag here requires patching - # autosetup/autosetup to rename the --debug to --autosetup-debug. + # Options mostly for sqlite's own development developer { {*} { + # Note that using the --debug/--enable-debug flag here + # requires patching autosetup/autosetup to rename the --debug + # to --autosetup-debug. with-debug=0 - debug=0 => - {Enable debug build flags. This option will impact performance by - as much as 4x, as it includes large numbers of assert()s in - performance-critical loops. Never use --debug for production - builds.} - scanstatus => {Enable the SQLITE_ENABLE_STMT_SCANSTATUS feature flag} + debug=0 + => {Enable debug build flags. This option will impact performance by + as much as 4x, as it includes large numbers of assert()s in + performance-critical loops. Never use --debug for production + builds.} + scanstatus + => {Enable the SQLITE_ENABLE_STMT_SCANSTATUS feature flag} } {canonical} { dev => {Enable dev-mode build: automatically enables certain other flags} test-status => {Enable status of tests} gcov=0 => {Enable coverage testing using gcov} linemacros => {Enable #line macros in the amalgamation} - dynlink-tools => {Dynamically link libsqlite3 to certain tools which normally statically embed it.} + dynlink-tools => {Dynamically link libsqlite3 to certain tools which normally statically embed it} } {*} { dump-defines=0 => {Dump autosetup defines to $::sqliteConfig(dump-defines-txt) (for build debugging)} } } + # Options specifically for downstream package maintainers packaging { {*} { # soname: https://sqlite.org/src/forumpost/5a3b44f510df8ded - soname:=legacy => - {SONAME for libsqlite3.so. "none", or not using this flag, sets no - soname. "legacy" sets it to its historical value of - libsqlite3.so.0. A value matching the glob "libsqlite3.*" sets - it to that literal value. Any other value is assumed to be a - suffix which gets applied to "libsqlite3.so.", - e.g. --soname=9.10 equates to "libsqlite3.so.9.10". - } - out-implib=0 => - {Enable use of --out-implib linker flag to generate an "import library" for the DLL} + soname:=legacy + => {SONAME for libsqlite3.so. "none", or not using this flag, sets no + soname. "legacy" sets it to its historical value of + libsqlite3.so.0. A value matching the glob "libsqlite3.*" sets + it to that literal value. Any other value is assumed to be a + suffix which gets applied to "libsqlite3.so.", + e.g. --soname=9.10 equates to "libsqlite3.so.9.10".} + # out-implib: https://sqlite.org/forum/forumpost/0c7fc097b2 + out-implib=0 + => {Enable use of --out-implib linker flag to generate an + "import library" for the DLL} } } }; # $allOpts + # Filter allOpts to create the set of [options] legal for this build set opts {} - foreach {group XY} [subst -nobackslashes -nocommands [proj-strip-hash-comments $allFlags]] { + foreach {group XY} [subst -nobackslashes -nocommands \ + [proj-strip-hash-comments $allFlags]] { foreach {X Y} $XY { if { $buildMode in $X || "*" in $X } { foreach y $Y { @@ -265,8 +295,7 @@ proc sqlite-config-bootstrap {buildMode} { } } } - #puts "options = $opts" - #exit 0 + #puts "options = $opts"; exit 0 options $opts sqlite-post-options-init }; # sqlite-config-bootstrap @@ -334,19 +363,19 @@ proc sqlite-autoreconfig {} { # configure script with the same arguments it was initially invoked # with. This can be used to automatically reconfigure # - proc squote {arg} { + set squote {{arg} { # Wrap $arg in single-quotes if it looks like it might need that # to avoid mis-handling as a shell argument. We assume that $arg # will never contain any single-quote characters. if {[string match {*[ &;$*"]*} $arg]} { return '$arg' } return $arg - } - define-append SQLITE_AUTORECONFIG cd [squote $::autosetup(builddir)] && [squote $::autosetup(srcdir)/configure] + }} + define-append SQLITE_AUTORECONFIG cd [apply $squote $::autosetup(builddir)] \ + && [apply $squote $::autosetup(srcdir)/configure] #{*}$::autosetup(argv) breaks with --flag='val with spaces', so... foreach arg $::autosetup(argv) { - define-append SQLITE_AUTORECONFIG [squote $arg] + define-append SQLITE_AUTORECONFIG [apply $squote $arg] } - rename squote "" } define OPT_FEATURE_FLAGS {} ; # -DSQLITE_OMIT/ENABLE flags. diff --git a/manifest b/manifest index 716b9c746b..7b764e1e9f 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Remove\sold\sfunction\sdeclaration\saccidentally\sleft\sin\ssqlite3session.h. -D 2025-02-12T15:31:26.463 +C configure\s--help\scleanups\sand\seliminate\sthe\suse\sof\sa\sJS-esque\sinner\sfunction\sin\ssqlite-config.tcl.\sNo\sfunctional\schanges. +D 2025-02-12T16:59:07.174 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d @@ -50,7 +50,7 @@ F autosetup/cc.tcl c0fcc50ca91deff8741e449ddad05bcd08268bc31177e613a6343bbd1fd3e F autosetup/jimsh0.c 6573f6bc6ff204de0139692648d7037ca0b6c067bac83a7b4e087f20a86866a4 F autosetup/pkg-config.tcl 4e635bf39022ff65e0d5434339dd41503ea48fc53822c9c5bde88b02d3d952ba F autosetup/proj.tcl cef1e0aa0f2dee2042af66f28c97a9445f84d55d858ba9db4f6116846a1a325f -F autosetup/sqlite-config.tcl bdafc3585865ada5d9a0f2b462e21ea735d49d82353fdfb641cf6f841f8eae9e +F autosetup/sqlite-config.tcl ece913b7bb1efbabdd44fd787c0e4d2fd462d3019cc079a5e6bbe43c83d302b3 F autosetup/system.tcl 51d4be76cd9a9074704b584e5c9cbba616202c8468cf9ba8a4f8294a7ab1dba9 F configure 9a00b21dfd13757bbfb8d89b30660a89ec1f8f3a79402b8f9f9b6fc475c3303a x F contrib/sqlitecon.tcl 210a913ad63f9f991070821e599d600bd913e0ad @@ -2207,8 +2207,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P da94e551c0ed354ae782c89fd9495d607b77ad7572d90c41ceac12bd6ec4c31b -R 6f7f1710621940ea4683c778ed859375 -U dan -Z 8c9d99e3c5ea71beb7debabd9d22f723 +P 0cfbe349d4b740f3d2be8c714cf679901fc2465db4c64e4c3742da700d82f4e7 +R c7fed59cac15bf384efc445c22702858 +U stephan +Z 6f4cb9af43d8857f0cc800aca12dd8f2 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index d19a148ee4..0ca67e3513 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -0cfbe349d4b740f3d2be8c714cf679901fc2465db4c64e4c3742da700d82f4e7 +6df859cd18ded3ca64a184e45709503dd9b6a3f65e7611d3352f0bad288400f4 From 8bbce21ed7d9d336e2c366d5adb8300f20c7b0f2 Mon Sep 17 00:00:00 2001 From: dan Date: Wed, 12 Feb 2025 17:21:24 +0000 Subject: [PATCH 097/194] Have the win32 VFS take a temporary shared lock (instead of the current exclusive) on the pending-byte when taking a SHARED lock on a db. Do not lock the pending-byte at all when taking an EXCLUSIVE lock if RESERVED is not already held. FossilOrigin-Name: 5127509abb10cb1da35b9874ea63e0c2f882b10567606e2bdd636a50811a693c --- manifest | 12 ++++++------ manifest.uuid | 2 +- src/os_win.c | 42 +++++++++++++++++++++++++++--------------- 3 files changed, 34 insertions(+), 22 deletions(-) diff --git a/manifest b/manifest index bf3ca55e5e..4a25dc1e69 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Fix\stest\sscript\serrors\sin\swalsetlk3.test.\sTests\sstill\sdon't\sall\spass. -D 2025-02-12T08:07:10.218 +C Have\sthe\swin32\sVFS\stake\sa\stemporary\sshared\slock\s(instead\sof\sthe\scurrent\sexclusive)\son\sthe\spending-byte\swhen\staking\sa\sSHARED\slock\son\sa\sdb.\sDo\snot\slock\sthe\spending-byte\sat\sall\swhen\staking\san\sEXCLUSIVE\slock\sif\sRESERVED\sis\snot\salready\sheld. +D 2025-02-12T17:21:24.919 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d @@ -765,7 +765,7 @@ F src/os_common.h 6c0eb8dd40ef3e12fe585a13e709710267a258e2c8dd1c40b1948a1d14582e F src/os_kv.c 4d39e1f1c180b11162c6dc4aa8ad34053873a639bac6baae23272fc03349986a F src/os_setup.h 6011ad7af5db4e05155f385eb3a9b4470688de6f65d6166b8956e58a3d872107 F src/os_unix.c 1e887f1f926a76a65ebcef79aa6da76e369ad7f899fa211c6ee56ff953c098a2 -F src/os_win.c 68a2b90772c7510f4dd826b6e8c79c9d4f648ea98cdd7677e7fb3dec1db26ebc +F src/os_win.c 9f6120d7492e6302e509c97f7eda435319e7f3446325547b377edfeb7f477fd1 F src/os_win.h 7b073010f1451abe501be30d12f6bc599824944a F src/pager.c 3a1c4e7f69af482e33c8cba8a75afe0dda0ea6391240adac22b040ce1bdeef44 F src/pager.h 6137149346e6c8a3ddc1eeb40aee46381e9bc8b0fcc6dda8a1efde993c2275b8 @@ -2211,8 +2211,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P 303e8009ab59aad32030407baf3eff9443f7f9bed7947218b78293b06bba1737 -R 92a553ba4589551655030e50133e0a04 +P 56eb4114f8bf9971960998ae0b79352767657ee19b5bdfec5149906e72ba170f +R 98fe0af89da0584abe14ea6f46e29724 U dan -Z ac5c8a11b435d673fdcd5b48f8d17f0d +Z 8a00be751ab6519922142a79f577f298 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 7e9c7e3039..ed284c5676 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -56eb4114f8bf9971960998ae0b79352767657ee19b5bdfec5149906e72ba170f +5127509abb10cb1da35b9874ea63e0c2f882b10567606e2bdd636a50811a693c diff --git a/src/os_win.c b/src/os_win.c index 1d090dbf42..eb06f03c72 100644 --- a/src/os_win.c +++ b/src/os_win.c @@ -3473,39 +3473,51 @@ static int winLock(sqlite3_file *id, int locktype){ assert( locktype!=PENDING_LOCK ); assert( locktype!=RESERVED_LOCK || pFile->locktype==SHARED_LOCK ); - /* Lock the PENDING_LOCK byte if we need to acquire a PENDING lock or + /* Lock the PENDING_LOCK byte if we need to acquire an EXCLUSIVE lock or ** a SHARED lock. If we are acquiring a SHARED lock, the acquisition of ** the PENDING_LOCK byte is temporary. */ newLocktype = pFile->locktype; - if( pFile->locktype==NO_LOCK - || (locktype==EXCLUSIVE_LOCK && pFile->locktype<=RESERVED_LOCK) + if( locktype==SHARED_LOCK + || (locktype==EXCLUSIVE_LOCK && pFile->locktype==RESERVED_LOCK) ){ int cnt = 3; - while( cnt-->0 && (res = winLockFile(&pFile->h, SQLITE_LOCKFILE_FLAGS, - PENDING_BYTE, 0, 1, 0))==0 ){ + + /* Flags for the LockFileEx() call. This should be an exclusive lock if + ** this call is to obtain EXCLUSIVE, or a shared lock if this call is to + ** obtain SHARED. */ + int flags = LOCKFILE_FAIL_IMMEDIATELY; + if( locktype==EXCLUSIVE_LOCK ){ + flags |= LOCKFILE_EXCLUSIVE_LOCK; + } + while( cnt>0 ){ /* Try 3 times to get the pending lock. This is needed to work ** around problems caused by indexing and/or anti-virus software on ** Windows systems. + ** ** If you are using this code as a model for alternative VFSes, do not - ** copy this retry logic. It is a hack intended for Windows only. - */ + ** copy this retry logic. It is a hack intended for Windows only. */ + res = winLockFile(&pFile->h, flags, PENDING_BYTE, 0, 1, 0); + if( res ) break; + lastErrno = osGetLastError(); - OSTRACE(("LOCK-PENDING-FAIL file=%p, count=%d, result=%d\n", - pFile->h, cnt, res)); + OSTRACE(("LOCK-PENDING-FAIL file=%p, count=%d, result=%d\n", + pFile->h, cnt, res + )); + if( lastErrno==ERROR_INVALID_HANDLE ){ pFile->lastErrno = lastErrno; rc = SQLITE_IOERR_LOCK; - OSTRACE(("LOCK-FAIL file=%p, count=%d, rc=%s\n", - pFile->h, cnt, sqlite3ErrName(rc))); + OSTRACE(("LOCK-FAIL file=%p, count=%d, rc=%s\n", + pFile->h, cnt, sqlite3ErrName(rc) + )); return rc; } - if( cnt ) sqlite3_win32_sleep(1); + + cnt--; + if( cnt>0 ) sqlite3_win32_sleep(1); } gotPendingLock = res; - if( !res ){ - lastErrno = osGetLastError(); - } } /* Acquire a shared lock From 25367c1eb04aa55b47d1e253e5e85cf9e6d7228b Mon Sep 17 00:00:00 2001 From: dan Date: Wed, 12 Feb 2025 20:19:57 +0000 Subject: [PATCH 098/194] Fix a few 32-bit overflow problems in showdb.c. FossilOrigin-Name: 9377766647eeaa575d646cf5f66c3163ef7074930aa5c3b11073e6b1e90ce799 --- manifest | 14 +++++++------- manifest.uuid | 2 +- tool/showdb.c | 7 ++++--- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/manifest b/manifest index 7b764e1e9f..d046f2682d 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C configure\s--help\scleanups\sand\seliminate\sthe\suse\sof\sa\sJS-esque\sinner\sfunction\sin\ssqlite-config.tcl.\sNo\sfunctional\schanges. -D 2025-02-12T16:59:07.174 +C Fix\sa\sfew\s32-bit\soverflow\sproblems\sin\sshowdb.c. +D 2025-02-12T20:19:57.718 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d @@ -2170,7 +2170,7 @@ F tool/replace.tcl 511c61acfe563dfb58675efb4628bb158a13d48ff8322123ac447e9d25a82 F tool/restore_jrnl.tcl 1079ecba47cc82fa82115b81c1f68097ab1f956f357ee8da5fc4b2589af6bd98 F tool/rollback-test.c 9fc98427d1e23e84429d7e6d07d9094fbdec65a5 F tool/run-speed-test.sh f95d19fd669b68c4c38b6b475242841d47c66076 -F tool/showdb.c 81b04bfaa9a63665f75945947323aa68b820570aa156b1574f440fc8276092c6 +F tool/showdb.c 3956d71e5193162609a60e8c9edfcf09274c00cfea2b1d221261427adb2b5cca F tool/showjournal.c 5bad7ae8784a43d2b270d953060423b8bd480818 F tool/showlocks.c 9cc5e66d4ebbf2d194f39db2527ece92077e86ae627ddd233ee48e16e8142564 F tool/showshm.c a0ab6ec32dd1f11218ca2a4018f8fb875b59414801ab8ceed8b2e69b7b45a809 @@ -2207,8 +2207,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P 0cfbe349d4b740f3d2be8c714cf679901fc2465db4c64e4c3742da700d82f4e7 -R c7fed59cac15bf384efc445c22702858 -U stephan -Z 6f4cb9af43d8857f0cc800aca12dd8f2 +P 6df859cd18ded3ca64a184e45709503dd9b6a3f65e7611d3352f0bad288400f4 +R ccf520bbb9a2866ca6aec9263e29fec3 +U dan +Z 06705c2bc45432ef657decbbc71b836f # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 0ca67e3513..84fa86757b 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -6df859cd18ded3ca64a184e45709503dd9b6a3f65e7611d3352f0bad288400f4 +9377766647eeaa575d646cf5f66c3163ef7074930aa5c3b11073e6b1e90ce799 diff --git a/tool/showdb.c b/tool/showdb.c index 12c2e271b7..f0bd9737cf 100644 --- a/tool/showdb.c +++ b/tool/showdb.c @@ -27,7 +27,7 @@ typedef sqlite3_uint64 u64; /* unsigned 64-bit */ static struct GlobalData { - u32 pagesize; /* Size of a database page */ + i64 pagesize; /* Size of a database page */ int dbfd; /* File descriptor for reading the DB */ u32 mxPage; /* Last page number */ int perLine; /* HEX elements to print per line */ @@ -1178,7 +1178,7 @@ int main(int argc, char **argv){ if( g.pagesize==0 ) g.pagesize = 1024; sqlite3_free(zPgSz); - printf("Pagesize: %d\n", g.pagesize); + printf("Pagesize: %d\n", (int)g.pagesize); g.mxPage = (u32)((szFile+g.pagesize-1)/g.pagesize); printf("Available pages: 1..%u\n", g.mxPage); @@ -1218,7 +1218,8 @@ int main(int argc, char **argv){ iEnd = strtol(&zLeft[2], 0, 0); checkPageValidity(iEnd); }else if( zLeft && zLeft[0]=='b' ){ - int ofst, nByte, hdrSize; + i64 ofst; + int nByte, hdrSize; unsigned char *a; if( iStart==1 ){ ofst = hdrSize = 100; From 5087eacb18b6e89291abc15c2818832ae99fd3cc Mon Sep 17 00:00:00 2001 From: dan Date: Thu, 13 Feb 2025 14:47:25 +0000 Subject: [PATCH 099/194] Ensure the counts of "deferred FK violations" and "deferred immediate FK violations" are kept separate when "PRAGMA defer_foreign_keys" is used. FossilOrigin-Name: c5190b0fd9bd76653fb7bb08e931699e42c88cef8a00352360d091948cda93a2 --- manifest | 16 ++++++++-------- manifest.uuid | 2 +- src/pragma.c | 5 ++++- src/vdbe.c | 10 ++++++---- test/fkey6.test | 30 ++++++++++++++++++++++++++++++ 5 files changed, 49 insertions(+), 14 deletions(-) diff --git a/manifest b/manifest index d046f2682d..ecfcfa1a08 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Fix\sa\sfew\s32-bit\soverflow\sproblems\sin\sshowdb.c. -D 2025-02-12T20:19:57.718 +C Ensure\sthe\scounts\sof\s"deferred\sFK\sviolations"\sand\s"deferred\simmediate\sFK\sviolations"\sare\skept\sseparate\swhen\s"PRAGMA\sdefer_foreign_keys"\sis\sused. +D 2025-02-13T14:47:25.229 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d @@ -772,7 +772,7 @@ F src/parse.y f84673f1454e2bcf517623d4346e67fb2d73e57826ea103681ad5848238f6029 F src/pcache.c 588cc3c5ccaaadde689ed35ce5c5c891a1f7b1f4d1f56f6cf0143b74d8ee6484 F src/pcache.h 1497ce1b823cf00094bb0cf3bac37b345937e6f910890c626b16512316d3abf5 F src/pcache1.c 49516ad7718a3626f28f710fa7448ef1fce3c07fd169acbb4817341950264319 -F src/pragma.c ce1182217aa540e034c6da2f17515e3706bf52c837e8222361be9ccd7a9d495a +F src/pragma.c c7ada272232e1182c4536d9637fa7b955a10bc1bd8d5a87d4dc9309dab827791 F src/prepare.c 1832be043fce7d489959aae6f994c452d023914714c4d5457beaed51c0f3d126 F src/printf.c 96f7f8baeedc7639da94e4e7a4a2c200e2537c4eec9e5e1c2ffc821f40eb3105 F src/random.c 606b00941a1d7dd09c381d3279a058d771f406c5213c9932bbd93d5587be4b9c @@ -847,7 +847,7 @@ F src/upsert.c 215328c3f91623c520ec8672c44323553f12caeb4f01b1090ebdca99fdf7b4f1 F src/utf.c 8b29d9a5956569ea2700f869669b8ef67a9662ee5e724ff77ab3c387e27094ba F src/util.c 9ff6470dabcf943fd796d2da766c98bd328c8f6fe036a31e5b338e628603f989 F src/vacuum.c b763b6457bd058d2072ef9364832351fd8d11e8abf70cbb349657360f7d55c40 -F src/vdbe.c b98d86de7f0e6c02fb14e0e1ae8feab6aa84669d389771a848e23f59eb70dcad +F src/vdbe.c 063763e08f1ad00890b7377fc663dbccec85a47630f5d2bbb13f3fdf77e06f78 F src/vdbe.h 3d26d5c7660c5c7bd33ffb0d8784615072d8b23c81f8110870efe2631136bc89 F src/vdbeInt.h 078b1c15b26587b54c1c1879d0d2f4dec812b9de4c337fed9faf73fbcc3bf091 F src/vdbeapi.c 82fe278a7c71b653235c6f9fb5de0b5de589908dfcb011ba2a782e8becf06f86 @@ -1153,7 +1153,7 @@ F test/fkey2.test 1063d65e5923c054cfb8f0555a92a3ae0fa8c067275a33ee1715bd856cdb30 F test/fkey3.test 76d475c80b84ee7a5d062e56ccb6ea68882e2b49 F test/fkey4.test 86446017011273aad8f9a99c1a65019e7bd9ca9d F test/fkey5.test 6727452e163a427147e84e739da18713da553d79f9783559b04fdcd36d5c7421 -F test/fkey6.test ebd11efb00b9c70b57f4c6b6184445145c96e320329bd90a175036570c5b25ca +F test/fkey6.test 1e0874ba15f8ed1e14a1d0a40fc8fb90a9912f4c82ea220a43137d4d9eff4d69 F test/fkey7.test 64fb28da03da5dfe3cdef5967aa7e832c2507bf7fb8f0780cacbca1f2338d031 F test/fkey8.test 51deda7f1a1448bca95875e4a6e1a3a75b4bd7215e924e845bd60de60e4d84bf F test/fkey_malloc.test 594a7ea1fbab553c036c70813cd8bd9407d63749 @@ -2207,8 +2207,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P 6df859cd18ded3ca64a184e45709503dd9b6a3f65e7611d3352f0bad288400f4 -R ccf520bbb9a2866ca6aec9263e29fec3 +P 9377766647eeaa575d646cf5f66c3163ef7074930aa5c3b11073e6b1e90ce799 +R 83e471c75257ae61568ff2a0fb629999 U dan -Z 06705c2bc45432ef657decbbc71b836f +Z e4f9c0246de36460838c8b5d3a4c9bbe # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 84fa86757b..3179d7a518 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -9377766647eeaa575d646cf5f66c3163ef7074930aa5c3b11073e6b1e90ce799 +c5190b0fd9bd76653fb7bb08e931699e42c88cef8a00352360d091948cda93a2 diff --git a/src/pragma.c b/src/pragma.c index 291ccf7af1..f1a922d1ac 100644 --- a/src/pragma.c +++ b/src/pragma.c @@ -1153,7 +1153,10 @@ void sqlite3Pragma( } }else{ db->flags &= ~mask; - if( mask==SQLITE_DeferFKs ) db->nDeferredImmCons = 0; + if( mask==SQLITE_DeferFKs ){ + db->nDeferredImmCons = 0; + db->nDeferredCons = 0; + } if( (mask & SQLITE_WriteSchema)!=0 && sqlite3_stricmp(zRight, "reset")==0 ){ diff --git a/src/vdbe.c b/src/vdbe.c index ec871c5a6e..6d7769173f 100644 --- a/src/vdbe.c +++ b/src/vdbe.c @@ -7483,12 +7483,14 @@ case OP_Param: { /* out2 */ ** statement counter is incremented (immediate foreign key constraints). */ case OP_FkCounter: { - if( db->flags & SQLITE_DeferFKs ){ - db->nDeferredImmCons += pOp->p2; - }else if( pOp->p1 ){ + if( pOp->p1 ){ db->nDeferredCons += pOp->p2; }else{ - p->nFkConstraint += pOp->p2; + if( db->flags & SQLITE_DeferFKs ){ + db->nDeferredImmCons += pOp->p2; + }else{ + p->nFkConstraint += pOp->p2; + } } break; } diff --git a/test/fkey6.test b/test/fkey6.test index 72de926b52..7cdc8ab0ae 100644 --- a/test/fkey6.test +++ b/test/fkey6.test @@ -267,5 +267,35 @@ do_execsql_test 5.1 { COMMIT; } +#------------------------------------------------------------------------- +# +reset_db + +do_execsql_test 6.1 { + PRAGMA writable_schema = 1; + INSERT INTO sqlite_schema + VALUES('table', 't1', 't1', 2, 'CREATE TABLE t1(x INTEGER PRIMARY KEY)'); +} +db close +sqlite3 db test.db +do_execsql_test 6.1 { + PRAGMA foreign_keys = 1; + PRAGMA writable_schema = 1; +} +do_execsql_test 6.2 { + CREATE TABLE t2( + y INTEGER PRIMARY KEY, + z INTEGER REFERENCES t1(x) DEFERRABLE INITIALLY DEFERRED + ); +} +do_execsql_test 6.3 { + BEGIN; + INSERT INTO t2 VALUES(1,0),(2,1); + CREATE VIRTUAL TABLE t3 USING fts5(a, b, content='', tokendata=1); + INSERT INTO t3 VALUES(3,3); + PRAGMA defer_foreign_keys=ON; + DELETE FROM t2; + COMMIT; +} finish_test From e89f31f19ab45dcb939a1ecf0ef5113b27a25868 Mon Sep 17 00:00:00 2001 From: stephan Date: Thu, 13 Feb 2025 16:20:05 +0000 Subject: [PATCH 100/194] When using the --out-implib build option, install the generated .dll.a file to PREFIX/lib. FossilOrigin-Name: 0dadea0ec86b6ac74281915433e41ae66cc20547d9882c4be2933a24c8287927 --- autoconf/Makefile.in | 5 ++++- main.mk | 10 +++++++--- manifest | 16 ++++++++-------- manifest.uuid | 2 +- 4 files changed, 20 insertions(+), 13 deletions(-) diff --git a/autoconf/Makefile.in b/autoconf/Makefile.in index 8e09b9c610..c6cde3c181 100644 --- a/autoconf/Makefile.in +++ b/autoconf/Makefile.in @@ -157,6 +157,9 @@ all: $(libsqlite3.LIB) install-so-1: $(install-dir.lib) $(libsqlite3.SO) $(INSTALL) $(libsqlite3.SO) "$(install-dir.lib)" + @if [ -f $(libsqlite3.SO).a ]; then \ + $(INSTALL) $(libsqlite3.SO).a "$(install-dir.lib)"; \ + fi @echo "Setting up $(libsqlite3.SO) version symlinks..."; \ cd "$(install-dir.lib)" || exit $$?; \ if [ x.dylib = x$(T.dll) ]; then \ @@ -171,7 +174,7 @@ install-so-1: $(install-dir.lib) $(libsqlite3.SO) mv $(libsqlite3.SO) $(libsqlite3.SO).$(PACKAGE_VERSION) || exit $$?; \ ln -s $(libsqlite3.SO).$(PACKAGE_VERSION) $(libsqlite3.SO) || exit $$?; \ ln -s $(libsqlite3.SO).$(PACKAGE_VERSION) $(libsqlite3.SO).0 || exit $$?; \ - ls -la $(libsqlite3.SO) $(libsqlite3.SO).[03]*; \ + ls -la $(libsqlite3.SO) $(libsqlite3.SO).[a03]*; \ if [ -e $(libsqlite3.SO).0.8.6 ]; then \ echo "ACHTUNG: legacy libtool-compatible install found. Re-linking it..."; \ rm -f libsqlite3.la $(libsqlite3.SO).0.8.6 || exit $$?; \ diff --git a/main.mk b/main.mk index 615dc97fb5..a63fa2a814 100644 --- a/main.mk +++ b/main.mk @@ -1477,6 +1477,9 @@ all: so # install-so-1: $(install-dir.lib) $(libsqlite3.SO) $(INSTALL) $(libsqlite3.SO) "$(install-dir.lib)" + @if [ -f $(libsqlite3.SO).a ]; then \ + $(INSTALL) $(libsqlite3.SO).a "$(install-dir.lib)"; \ + fi @echo "Setting up $(libsqlite3.SO) version symlinks..."; \ cd "$(install-dir.lib)" || exit $$?; \ if [ x.dylib = x$(T.dll) ]; then \ @@ -1491,7 +1494,7 @@ install-so-1: $(install-dir.lib) $(libsqlite3.SO) mv $(libsqlite3.SO) $(libsqlite3.SO).$(PACKAGE_VERSION) || exit $$?; \ ln -s $(libsqlite3.SO).$(PACKAGE_VERSION) $(libsqlite3.SO) || exit $$?; \ ln -s $(libsqlite3.SO).$(PACKAGE_VERSION) $(libsqlite3.SO).0 || exit $$?; \ - ls -la $(libsqlite3.SO) $(libsqlite3.SO).[03]*; \ + ls -la $(libsqlite3.SO) $(libsqlite3.SO).[a03]*; \ if [ -e $(libsqlite3.SO).0.8.6 ]; then \ echo "ACHTUNG: legacy libtool-compatible install found. Re-linking it..."; \ rm -f libsqlite3.la $(libsqlite3.SO).0.8.6 || exit $$?; \ @@ -1504,6 +1507,7 @@ install-so-1: $(install-dir.lib) $(libsqlite3.SO) ls -la $(libsqlite3.SO).0.8.6; \ fi; \ fi + install-so-0 install-so-: install-so: install-so-$(ENABLE_SHARED) install: install-so @@ -2339,7 +2343,7 @@ tidy: tidy-. rm -f lemon$(B.exe) sqlite*.tar.gz rm -f mkkeywordhash$(B.exe) mksourceid$(B.exe) rm -f parse.* fts5parse.* - rm -f $(libsqlite3.SO) $(libsqlite3.LIB) $(libtclsqlite3.SO) libsqlite3$(T.dll).a + rm -f $(libsqlite3.SO) $(libsqlite3.LIB) $(libtclsqlite3.SO) $(libsqlite3.SO).a rm -f tclsqlite3$(T.exe) $(TESTPROGS) rm -f LogEst$(T.exe) fts3view$(T.exe) rollback-test$(T.exe) showdb$(T.exe) rm -f showjournal$(T.exe) showstat4$(T.exe) showwal$(T.exe) speedtest1$(T.exe) @@ -2374,7 +2378,7 @@ distclean: distclean-. clean # Show important variable settings. -show-variables: +show-variables: @echo "CC = $(CC)" @echo "B.cc = $(B.cc)" @echo "T.cc = $(T.cc)" diff --git a/manifest b/manifest index ecfcfa1a08..da6a8bb7bd 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Ensure\sthe\scounts\sof\s"deferred\sFK\sviolations"\sand\s"deferred\simmediate\sFK\sviolations"\sare\skept\sseparate\swhen\s"PRAGMA\sdefer_foreign_keys"\sis\sused. -D 2025-02-13T14:47:25.229 +C When\susing\sthe\s--out-implib\sbuild\soption,\sinstall\sthe\sgenerated\s.dll.a\sfile\sto\sPREFIX/lib. +D 2025-02-13T16:20:05.290 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d @@ -16,7 +16,7 @@ F art/sqlite370.jpg d512473dae7e378a67e28ff96a34da7cb331def2 F art/sqlite370.svg 40b7e2fe8aac3add5d56dd86ab8d427a4eca5bcb3fe4f8946cb3794e1821d531 F auto.def 542572667678019e75e16c3e970bfb9358abed9a6ec70f3715997dd9a04b7fd9 F autoconf/Makefile.fallback 22fe523eb36dfce31e0f6349f782eb084e86a5620b2b0b4f84a2d6133f53f5ac -F autoconf/Makefile.in 7bd73a4c8cd89025cbc92b4f887c6fd1b8cd8ecbe62c4ac1f36ac84d04043479 +F autoconf/Makefile.in 0c71fcc6b2bd1703799a8e5b8f137ba64aad9bdee43c3cc23598cd0d6ce95715 F autoconf/Makefile.msc 4f09fead3bf7de337242896f107c5d03cd8f7b39754315ab091a2e4d02892c40 F autoconf/README.first f1d3876e9a7852c22f275a6f06814e64934cecbc0b5b9617d64849094c1fd136 F autoconf/README.txt 7f01dc3915e2d68f329011073662369e62a0938a2c69398807823c57591cb288 @@ -702,7 +702,7 @@ F ext/wasm/tests/opfs/concurrency/test.js d08889a5bb6e61937d0b8cbb78c9efbefbf65a F ext/wasm/tests/opfs/concurrency/worker.js 0a8c1a3e6ebb38aabbee24f122693f1fb29d599948915c76906681bb7da1d3d2 F ext/wasm/wasmfs.make 68999f5bd8c489239592d59a420f8c627c99169bbd6fa16a404751f757b9f702 F magic.txt 5ade0bc977aa135e79e3faaea894d5671b26107cc91e70783aa7dc83f22f3ba0 -F main.mk ecf4b449c742eaa3a872a5cd0e8e5c19e2dccfe3b5b0ccafd0c926dc1030c661 +F main.mk a127ee141eb7db341d0c949a743a45d1b068b31ac3f1f09cf3b2870b2f18739f F mptest/config01.test 3c6adcbc50b991866855f1977ff172eb6d901271 F mptest/config02.test 4415dfe36c48785f751e16e32c20b077c28ae504 F mptest/crash01.test 61e61469e257df0850df4293d7d4d6c2af301421 @@ -2207,8 +2207,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P 9377766647eeaa575d646cf5f66c3163ef7074930aa5c3b11073e6b1e90ce799 -R 83e471c75257ae61568ff2a0fb629999 -U dan -Z e4f9c0246de36460838c8b5d3a4c9bbe +P c5190b0fd9bd76653fb7bb08e931699e42c88cef8a00352360d091948cda93a2 +R f439c2b5346ac4c6cf58b3b95ae0e844 +U stephan +Z 52b2d5f34b70aec8885831f59cc359bf # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 3179d7a518..c2065efdfe 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -c5190b0fd9bd76653fb7bb08e931699e42c88cef8a00352360d091948cda93a2 +0dadea0ec86b6ac74281915433e41ae66cc20547d9882c4be2933a24c8287927 From f338ab20efd7d06c9b1553a68ca07be31e568d28 Mon Sep 17 00:00:00 2001 From: drh <> Date: Fri, 14 Feb 2025 10:28:28 +0000 Subject: [PATCH 101/194] Fix test cases added for [d7b90d92ffbfc61f] so that they also work when compiling with ICU support. [forum:/forumpost/2ca8a09a7e|Forum post 2ca8a09a7e] FossilOrigin-Name: 5964616dc9de9323fddfede0ded29ee135498c8760017ce1158461f596fe6914 --- manifest | 14 +++++++------- manifest.uuid | 2 +- test/like3.test | 8 ++++++++ 3 files changed, 16 insertions(+), 8 deletions(-) diff --git a/manifest b/manifest index da6a8bb7bd..192970f34b 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C When\susing\sthe\s--out-implib\sbuild\soption,\sinstall\sthe\sgenerated\s.dll.a\sfile\sto\sPREFIX/lib. -D 2025-02-13T16:20:05.290 +C Fix\stest\scases\sadded\sfor\s[d7b90d92ffbfc61f]\sso\sthat\sthey\salso\swork\swhen\ncompiling\swith\sICU\ssupport.\n[forum:/forumpost/2ca8a09a7e|Forum\spost\s2ca8a09a7e] +D 2025-02-14T10:28:28.618 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d @@ -1399,7 +1399,7 @@ F test/laststmtchanges.test ae613f53819206b3222771828d024154d51db200 F test/lemon-test01.y 70110eff607ab137ccc851edb2bc7e14a6d4f246b5d2d25f82a60b69d87a9ff2 F test/like.test b3ea2ba3558199aa8f25a42ddeb54772e234fab50868c9f066047acdbda8fc58 F test/like2.test d3be15fefee3e02fc88942a9b98f26c5339bbdef7783c90023c092c4955fe3d3 -F test/like3.test b21284df226d6028feeb4dcc56ad9d32673d82c14a63f15f25471292c36491e7 +F test/like3.test 1179fef50a9baa22767a431244aeefbf29f36606f0f854d4ab9e1d2fecf97dd3 F test/limit.test 350f5d03c29e7dff9a2cde016f84f8d368d40bcd02fa2b2a52fa10c4bf3cbfaf F test/limit2.test 9409b033284642a859fafc95f29a5a6a557bd57c1f0d7c3f554bd64ed69df77e F test/literal.test a65dca9fef86e51b8e45544268e37abbd4bb94ba35fd65f6fdcab2f288cd8f79 @@ -2207,8 +2207,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P c5190b0fd9bd76653fb7bb08e931699e42c88cef8a00352360d091948cda93a2 -R f439c2b5346ac4c6cf58b3b95ae0e844 -U stephan -Z 52b2d5f34b70aec8885831f59cc359bf +P 0dadea0ec86b6ac74281915433e41ae66cc20547d9882c4be2933a24c8287927 +R 2aa968ae6750fa58cc8b9f9ab1460920 +U drh +Z d2f9f0edcea4c1ead34b1dd8879b3a1a # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index c2065efdfe..666aafe40e 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -0dadea0ec86b6ac74281915433e41ae66cc20547d9882c4be2933a24c8287927 +5964616dc9de9323fddfede0ded29ee135498c8760017ce1158461f596fe6914 diff --git a/test/like3.test b/test/like3.test index 0b28574376..01d19a54f6 100644 --- a/test/like3.test +++ b/test/like3.test @@ -304,11 +304,19 @@ ifcapable utf16 { #------------------------------------------------------------------------- reset_db +# See forum thread https://sqlite.org/forum/info/d7b90d92ffbfc61f foreach enc { UTF-8 UTF-16le UTF-16be } { + ifcapable icu { + if {$enc=="UTF-8"} { + # The invalid UTF8 used in these tests is incompatible with ICU + # https://sqlite.org/forum/forumpost/2ca8a09a7e + continue + } + } foreach {tn expr} { 1 "CAST (X'FF' AS TEXT)" 2 "CAST (X'FFBF' AS TEXT)" From e3157582bf32324d37078f828509e91008aded2d Mon Sep 17 00:00:00 2001 From: stephan Date: Fri, 14 Feb 2025 16:42:37 +0000 Subject: [PATCH 102/194] ICU config support: add more details to error messages and correct a typo which would cause a configure crash if --with-icu-config=X refered to a non-executable X. FossilOrigin-Name: ff508926651d632d86081ccde89d3367c89538dde469e9e925540d634ac8a416 --- autosetup/sqlite-config.tcl | 18 ++++++++++++++---- manifest | 14 +++++++------- manifest.uuid | 2 +- 3 files changed, 22 insertions(+), 12 deletions(-) diff --git a/autosetup/sqlite-config.tcl b/autosetup/sqlite-config.tcl index 14cdcf5da1..1616b10920 100644 --- a/autosetup/sqlite-config.tcl +++ b/autosetup/sqlite-config.tcl @@ -213,7 +213,7 @@ proc sqlite-config-bootstrap {buildMode} { {*} { with-icu-ldflags:LDFLAGS => {Enable SQLITE_ENABLE_ICU and add the given linker flags for the - ICU libraries} + ICU libraries. e.g. on Ubuntu systems, try '-licui18n -licuuc -licudata'.} with-icu-cflags:CFLAGS => {Apply extra CFLAGS/CPPFLAGS necessary for building with ICU. e.g. -I/usr/local/include} @@ -1062,6 +1062,7 @@ proc sqlite-handle-icu {} { define LDFLAGS_ICU [join [opt-val with-icu-ldflags ""]] define CFLAGS_ICU [join [opt-val with-icu-cflags ""]] if {[proj-opt-was-provided with-icu-config]} { + msg-result "Checking for ICU support..." set icuConfigBin [opt-val with-icu-config] set tryIcuConfigBin 1; # set to 0 if we end up using pkg-config if {"auto" eq $icuConfigBin || "pkg-config" eq $icuConfigBin} { @@ -1085,19 +1086,28 @@ proc sqlite-handle-icu {} { /usr/local/bin/icu-config \ /usr/bin/icu-config] if {"" eq $icuConfigBin} { - proj-fatal "--with-icu-config=auto cannot find (pkg-config icu-io) or icu-config binary" + proj-indented-notice -error { + --with-icu-config=auto cannot find (pkg-config icu-io) or icu-config binary. + On Ubuntu-like systems try: + --with-icu-ldflags='-licui18n -licuuc -licudata' + } } } if {[file-isexec $icuConfigBin]} { set x [exec $icuConfigBin --ldflags] if {"" eq $x} { - proj-fatal "$icuConfigBin --ldflags returned no data" + proj-indented-notice -error \ + [subst { + $icuConfigBin --ldflags returned no data. + On Ubuntu-like systems try: + --with-icu-ldflags='-licui18n -licuuc -licudata' + }] } define-append LDFLAGS_ICU $x set x [exec $icuConfigBin --cppflags] define-append CFLAGS_ICU $x } else { - proj-fatal "--with-icu-config=$bin does not refer to an executable" + proj-fatal "--with-icu-config=$icuConfigBin does not refer to an executable" } } } diff --git a/manifest b/manifest index 192970f34b..9b1a8780b3 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Fix\stest\scases\sadded\sfor\s[d7b90d92ffbfc61f]\sso\sthat\sthey\salso\swork\swhen\ncompiling\swith\sICU\ssupport.\n[forum:/forumpost/2ca8a09a7e|Forum\spost\s2ca8a09a7e] -D 2025-02-14T10:28:28.618 +C ICU\sconfig\ssupport:\sadd\smore\sdetails\sto\serror\smessages\sand\scorrect\sa\stypo\swhich\swould\scause\sa\sconfigure\scrash\sif\s--with-icu-config=X\srefered\sto\sa\snon-executable\sX. +D 2025-02-14T16:42:37.638 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d @@ -50,7 +50,7 @@ F autosetup/cc.tcl c0fcc50ca91deff8741e449ddad05bcd08268bc31177e613a6343bbd1fd3e F autosetup/jimsh0.c 6573f6bc6ff204de0139692648d7037ca0b6c067bac83a7b4e087f20a86866a4 F autosetup/pkg-config.tcl 4e635bf39022ff65e0d5434339dd41503ea48fc53822c9c5bde88b02d3d952ba F autosetup/proj.tcl cef1e0aa0f2dee2042af66f28c97a9445f84d55d858ba9db4f6116846a1a325f -F autosetup/sqlite-config.tcl ece913b7bb1efbabdd44fd787c0e4d2fd462d3019cc079a5e6bbe43c83d302b3 +F autosetup/sqlite-config.tcl c0a5e95b10d8168eb0f942a9d46b1b6a31a06a19991a294d2eace6b0a9d7e897 F autosetup/system.tcl 51d4be76cd9a9074704b584e5c9cbba616202c8468cf9ba8a4f8294a7ab1dba9 F configure 9a00b21dfd13757bbfb8d89b30660a89ec1f8f3a79402b8f9f9b6fc475c3303a x F contrib/sqlitecon.tcl 210a913ad63f9f991070821e599d600bd913e0ad @@ -2207,8 +2207,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P 0dadea0ec86b6ac74281915433e41ae66cc20547d9882c4be2933a24c8287927 -R 2aa968ae6750fa58cc8b9f9ab1460920 -U drh -Z d2f9f0edcea4c1ead34b1dd8879b3a1a +P 5964616dc9de9323fddfede0ded29ee135498c8760017ce1158461f596fe6914 +R 8f2beaf5ac609f50ce863af5a49fb8f4 +U stephan +Z a0a82d139cbfe850e3642558116bae4d # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 666aafe40e..ac337f3b52 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -5964616dc9de9323fddfede0ded29ee135498c8760017ce1158461f596fe6914 +ff508926651d632d86081ccde89d3367c89538dde469e9e925540d634ac8a416 From a09fd7b91330616b1ec31546c21550449b184661 Mon Sep 17 00:00:00 2001 From: stephan Date: Fri, 14 Feb 2025 17:21:05 +0000 Subject: [PATCH 103/194] Work around a autosetup --help bug which only(?) triggers on tcl 8.6, introduced by [9978c87139b7b042] and reported upstream as [https://github.com/msteveb/autosetup/issues/73|ticket #73]. Summary: calling 'options' from a proc, instead of the global scope, triggers an error about an invalid use of 'break'. FossilOrigin-Name: 6a21d6a2ed627ba0a864bef85369ed17553b808ae5c19891fa1f70505dfcbe39 --- auto.def | 10 ++++++++-- autoconf/auto.def | 9 ++++++++- autosetup/sqlite-config.tcl | 11 ++++++++--- manifest | 16 ++++++++-------- manifest.uuid | 2 +- 5 files changed, 33 insertions(+), 15 deletions(-) diff --git a/auto.def b/auto.def index 4528293cd7..455b246e09 100644 --- a/auto.def +++ b/auto.def @@ -14,8 +14,14 @@ # use sqlite-config -sqlite-config-bootstrap canonical - +if {0} { + sqlite-config-bootstrap canonical +} else { + set sq3options [sqlite-config-bootstrap canonical] + options $sq3options + unset sq3options + sqlite-post-options-init +} sqlite-setup-default-cflags proj-if-opt-truthy dev { # --enable-dev needs to come early so that the downstream tests diff --git a/autoconf/auto.def b/autoconf/auto.def index bb8710378f..7e154caa32 100644 --- a/autoconf/auto.def +++ b/autoconf/auto.def @@ -8,7 +8,14 @@ # included in this source tree as ./autosetup/jimsh0.c. # use sqlite-config -sqlite-config-bootstrap autoconf +if {0} { + sqlite-config-bootstrap autoconf +} else { + set sq3options [sqlite-config-bootstrap autoconf] + options $sq3options + unset sq3options + sqlite-post-options-init +} sqlite-check-common-bins sqlite-check-common-system-deps proj-check-rpath diff --git a/autosetup/sqlite-config.tcl b/autosetup/sqlite-config.tcl index 1616b10920..338eb2408b 100644 --- a/autosetup/sqlite-config.tcl +++ b/autosetup/sqlite-config.tcl @@ -295,9 +295,14 @@ proc sqlite-config-bootstrap {buildMode} { } } } - #puts "options = $opts"; exit 0 - options $opts - sqlite-post-options-init + if {0} { + #puts "options = $opts"; exit 0 + options $opts + sqlite-post-options-init + } else { + # Workaround for https://github.com/msteveb/autosetup/issues/73 + return $opts + } }; # sqlite-config-bootstrap ######################################################################## diff --git a/manifest b/manifest index 9b1a8780b3..ec9077572f 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C ICU\sconfig\ssupport:\sadd\smore\sdetails\sto\serror\smessages\sand\scorrect\sa\stypo\swhich\swould\scause\sa\sconfigure\scrash\sif\s--with-icu-config=X\srefered\sto\sa\snon-executable\sX. -D 2025-02-14T16:42:37.638 +C Work\saround\sa\sautosetup\s--help\sbug\swhich\sonly(?)\striggers\son\stcl\s8.6,\sintroduced\sby\s[9978c87139b7b042]\sand\sreported\supstream\sas\s[https://github.com/msteveb/autosetup/issues/73|ticket\s#73].\sSummary:\scalling\s'options'\sfrom\sa\sproc,\sinstead\sof\sthe\sglobal\sscope,\striggers\san\serror\sabout\san\sinvalid\suse\sof\s'break'. +D 2025-02-14T17:21:05.787 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d @@ -14,13 +14,13 @@ F art/sqlite370.eps aa97a671332b432a54e1d74ff5e8775be34200c2 F art/sqlite370.ico af56c1d00fee7cd4753e8631ed60703ed0fc6e90 F art/sqlite370.jpg d512473dae7e378a67e28ff96a34da7cb331def2 F art/sqlite370.svg 40b7e2fe8aac3add5d56dd86ab8d427a4eca5bcb3fe4f8946cb3794e1821d531 -F auto.def 542572667678019e75e16c3e970bfb9358abed9a6ec70f3715997dd9a04b7fd9 +F auto.def 559f8f904a63950fcbe8d5692141ea4e5bf6b1e38ffb25b89a572d829d8ea648 F autoconf/Makefile.fallback 22fe523eb36dfce31e0f6349f782eb084e86a5620b2b0b4f84a2d6133f53f5ac F autoconf/Makefile.in 0c71fcc6b2bd1703799a8e5b8f137ba64aad9bdee43c3cc23598cd0d6ce95715 F autoconf/Makefile.msc 4f09fead3bf7de337242896f107c5d03cd8f7b39754315ab091a2e4d02892c40 F autoconf/README.first f1d3876e9a7852c22f275a6f06814e64934cecbc0b5b9617d64849094c1fd136 F autoconf/README.txt 7f01dc3915e2d68f329011073662369e62a0938a2c69398807823c57591cb288 -F autoconf/auto.def 9af634c6d51fa4b82c9bb61b51249ca087f2cbe09c7c3c31f920759082a1ffdb +F autoconf/auto.def ef517ef2bb4445b0df5644ef06ba414538192f6e62ad4c03f56d8041a9a78d88 F autoconf/tea/Makefile.in ba0556fee8da09c066bad85a4457904e46ee2c2eabaa309c0e83a78f2f151a8e F autoconf/tea/README.txt 61e62e519579e4a112791354d6d440f8b51ea6db3b0bab58d59f29df42d2dfe3 F autoconf/tea/aclocal.m4 52c47aac44ce0ddb1f918b6993e8beb8eee88f43 @@ -50,7 +50,7 @@ F autosetup/cc.tcl c0fcc50ca91deff8741e449ddad05bcd08268bc31177e613a6343bbd1fd3e F autosetup/jimsh0.c 6573f6bc6ff204de0139692648d7037ca0b6c067bac83a7b4e087f20a86866a4 F autosetup/pkg-config.tcl 4e635bf39022ff65e0d5434339dd41503ea48fc53822c9c5bde88b02d3d952ba F autosetup/proj.tcl cef1e0aa0f2dee2042af66f28c97a9445f84d55d858ba9db4f6116846a1a325f -F autosetup/sqlite-config.tcl c0a5e95b10d8168eb0f942a9d46b1b6a31a06a19991a294d2eace6b0a9d7e897 +F autosetup/sqlite-config.tcl 6a2f007f7c190a0077b99bd442d5bd41638f3d329c08a045653e096f21c9d16d F autosetup/system.tcl 51d4be76cd9a9074704b584e5c9cbba616202c8468cf9ba8a4f8294a7ab1dba9 F configure 9a00b21dfd13757bbfb8d89b30660a89ec1f8f3a79402b8f9f9b6fc475c3303a x F contrib/sqlitecon.tcl 210a913ad63f9f991070821e599d600bd913e0ad @@ -2207,8 +2207,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P 5964616dc9de9323fddfede0ded29ee135498c8760017ce1158461f596fe6914 -R 8f2beaf5ac609f50ce863af5a49fb8f4 +P ff508926651d632d86081ccde89d3367c89538dde469e9e925540d634ac8a416 +R f4836849041855b59c987e999995c2b8 U stephan -Z a0a82d139cbfe850e3642558116bae4d +Z 3d0710da40d3f26ab6ec370f0db703f9 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index ac337f3b52..67eb80d7f6 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -ff508926651d632d86081ccde89d3367c89538dde469e9e925540d634ac8a416 +6a21d6a2ed627ba0a864bef85369ed17553b808ae5c19891fa1f70505dfcbe39 From b0c987967f9b94eb08c0f1b202fbed079c3f5d42 Mon Sep 17 00:00:00 2001 From: stephan Date: Fri, 14 Feb 2025 17:52:57 +0000 Subject: [PATCH 104/194] Simplify the --help workaround introduced in [6a21d6a2ed]. FossilOrigin-Name: b0928f2043ed2a5d445c65f0d7271431e182f5a6fcd24ddcd57ea1cdcf4bbaa2 --- auto.def | 4 +--- autoconf/auto.def | 4 +--- manifest | 14 +++++++------- manifest.uuid | 2 +- 4 files changed, 10 insertions(+), 14 deletions(-) diff --git a/auto.def b/auto.def index 455b246e09..8a964ad75c 100644 --- a/auto.def +++ b/auto.def @@ -17,9 +17,7 @@ use sqlite-config if {0} { sqlite-config-bootstrap canonical } else { - set sq3options [sqlite-config-bootstrap canonical] - options $sq3options - unset sq3options + options [sqlite-config-bootstrap canonical] sqlite-post-options-init } sqlite-setup-default-cflags diff --git a/autoconf/auto.def b/autoconf/auto.def index 7e154caa32..ccbaaa89ee 100644 --- a/autoconf/auto.def +++ b/autoconf/auto.def @@ -11,9 +11,7 @@ use sqlite-config if {0} { sqlite-config-bootstrap autoconf } else { - set sq3options [sqlite-config-bootstrap autoconf] - options $sq3options - unset sq3options + options [sqlite-config-bootstrap autoconf] sqlite-post-options-init } sqlite-check-common-bins diff --git a/manifest b/manifest index ec9077572f..4ae8152a9e 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Work\saround\sa\sautosetup\s--help\sbug\swhich\sonly(?)\striggers\son\stcl\s8.6,\sintroduced\sby\s[9978c87139b7b042]\sand\sreported\supstream\sas\s[https://github.com/msteveb/autosetup/issues/73|ticket\s#73].\sSummary:\scalling\s'options'\sfrom\sa\sproc,\sinstead\sof\sthe\sglobal\sscope,\striggers\san\serror\sabout\san\sinvalid\suse\sof\s'break'. -D 2025-02-14T17:21:05.787 +C Simplify\sthe\s--help\sworkaround\sintroduced\sin\s[6a21d6a2ed]. +D 2025-02-14T17:52:57.730 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d @@ -14,13 +14,13 @@ F art/sqlite370.eps aa97a671332b432a54e1d74ff5e8775be34200c2 F art/sqlite370.ico af56c1d00fee7cd4753e8631ed60703ed0fc6e90 F art/sqlite370.jpg d512473dae7e378a67e28ff96a34da7cb331def2 F art/sqlite370.svg 40b7e2fe8aac3add5d56dd86ab8d427a4eca5bcb3fe4f8946cb3794e1821d531 -F auto.def 559f8f904a63950fcbe8d5692141ea4e5bf6b1e38ffb25b89a572d829d8ea648 +F auto.def 6120063c2901500ee7ff662dee63f234fe24e546c9c0292c3fcb3beb9c2e59f5 F autoconf/Makefile.fallback 22fe523eb36dfce31e0f6349f782eb084e86a5620b2b0b4f84a2d6133f53f5ac F autoconf/Makefile.in 0c71fcc6b2bd1703799a8e5b8f137ba64aad9bdee43c3cc23598cd0d6ce95715 F autoconf/Makefile.msc 4f09fead3bf7de337242896f107c5d03cd8f7b39754315ab091a2e4d02892c40 F autoconf/README.first f1d3876e9a7852c22f275a6f06814e64934cecbc0b5b9617d64849094c1fd136 F autoconf/README.txt 7f01dc3915e2d68f329011073662369e62a0938a2c69398807823c57591cb288 -F autoconf/auto.def ef517ef2bb4445b0df5644ef06ba414538192f6e62ad4c03f56d8041a9a78d88 +F autoconf/auto.def c160516ad490b00fad64235323ff18323a6a6523607d2a9705f2ec38ea2f5c33 F autoconf/tea/Makefile.in ba0556fee8da09c066bad85a4457904e46ee2c2eabaa309c0e83a78f2f151a8e F autoconf/tea/README.txt 61e62e519579e4a112791354d6d440f8b51ea6db3b0bab58d59f29df42d2dfe3 F autoconf/tea/aclocal.m4 52c47aac44ce0ddb1f918b6993e8beb8eee88f43 @@ -2207,8 +2207,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P ff508926651d632d86081ccde89d3367c89538dde469e9e925540d634ac8a416 -R f4836849041855b59c987e999995c2b8 +P 6a21d6a2ed627ba0a864bef85369ed17553b808ae5c19891fa1f70505dfcbe39 +R ccbb8a55e81df7376a41b6d85d79a9b1 U stephan -Z 3d0710da40d3f26ab6ec370f0db703f9 +Z 440d189d3f6211449eb539edd8ee3916 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 67eb80d7f6..47d8d4598b 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -6a21d6a2ed627ba0a864bef85369ed17553b808ae5c19891fa1f70505dfcbe39 +b0928f2043ed2a5d445c65f0d7271431e182f5a6fcd24ddcd57ea1cdcf4bbaa2 From d04782206bbd7f3d6dffee706c23bc45e4a99503 Mon Sep 17 00:00:00 2001 From: stephan Date: Fri, 14 Feb 2025 18:06:28 +0000 Subject: [PATCH 105/194] Make failure to find pthreads support non-fatal unless --enable-threadsafe is specifically passed in. Build regression reported in [8e0fdb8c0d]. FossilOrigin-Name: 806ad1ac173d7c0d6d94bfccd3b961fc5c9541b32773c063a8c4082380d7a90d --- autosetup/sqlite-config.tcl | 29 ++++++++++++++++------------- manifest | 12 ++++++------ manifest.uuid | 2 +- 3 files changed, 23 insertions(+), 20 deletions(-) diff --git a/autosetup/sqlite-config.tcl b/autosetup/sqlite-config.tcl index 338eb2408b..1c0e859042 100644 --- a/autosetup/sqlite-config.tcl +++ b/autosetup/sqlite-config.tcl @@ -680,29 +680,32 @@ proc sqlite-handle-soname {} { } ######################################################################## -# If --enable-thresafe is set, this adds -DSQLITE_THREADSAFE=1 to +# If --enable-threadsafe is set, this adds -DSQLITE_THREADSAFE=1 to # OPT_FEATURE_FLAGS and sets LDFLAGS_PTHREAD to the linker flags -# needed for linking pthread. If --enable-threadsafe is not set, adds -# -DSQLITE_THREADSAFE=0 to OPT_FEATURE_FLAGS and sets LDFLAGS_PTHREAD -# to an empty string. +# needed for linking pthread (possibly an empty string). If +# --enable-threadsafe is not set, adds -DSQLITE_THREADSAFE=0 to +# OPT_FEATURE_FLAGS and sets LDFLAGS_PTHREAD to an empty string. proc sqlite-handle-threadsafe {} { msg-checking "Support threadsafe operation? " + define LDFLAGS_PTHREAD "" + set enable 0 proj-if-opt-truthy threadsafe { - msg-result yes - sqlite-add-feature-flag -DSQLITE_THREADSAFE=1 - if {![proj-check-function-in-lib pthread_create pthread] - || ![proj-check-function-in-lib pthread_mutexattr_init pthread]} { - user-error "Missing required pthread bits" + if {[proj-check-function-in-lib pthread_create pthread] + && [proj-check-function-in-lib pthread_mutexattr_init pthread]} { + set enable 1 + define LDFLAGS_PTHREAD [get-define lib_pthread_create] + undefine lib_pthread_create + undefine lib_pthread_mutexattr_init + } elseif {[proj-opt-was-provided threadsafe]} { + user-error "Missing required pthread libraries. Use --disable-threadsafe to disable this check." } - define LDFLAGS_PTHREAD [get-define lib_pthread_create] - undefine lib_pthread_create # Recall that LDFLAGS_PTHREAD might be empty even if pthreads if # found because it's in -lc on some platforms. } { msg-result no - sqlite-add-feature-flag -DSQLITE_THREADSAFE=0 - define LDFLAGS_PTHREAD "" } + sqlite-add-feature-flag -DSQLITE_THREADSAFE=${enable} + return $enable } ######################################################################## diff --git a/manifest b/manifest index 4ae8152a9e..ac1e73bf34 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Simplify\sthe\s--help\sworkaround\sintroduced\sin\s[6a21d6a2ed]. -D 2025-02-14T17:52:57.730 +C Make\sfailure\sto\sfind\spthreads\ssupport\snon-fatal\sunless\s--enable-threadsafe\sis\sspecifically\spassed\sin.\sBuild\sregression\sreported\sin\s[8e0fdb8c0d]. +D 2025-02-14T18:06:28.632 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d @@ -50,7 +50,7 @@ F autosetup/cc.tcl c0fcc50ca91deff8741e449ddad05bcd08268bc31177e613a6343bbd1fd3e F autosetup/jimsh0.c 6573f6bc6ff204de0139692648d7037ca0b6c067bac83a7b4e087f20a86866a4 F autosetup/pkg-config.tcl 4e635bf39022ff65e0d5434339dd41503ea48fc53822c9c5bde88b02d3d952ba F autosetup/proj.tcl cef1e0aa0f2dee2042af66f28c97a9445f84d55d858ba9db4f6116846a1a325f -F autosetup/sqlite-config.tcl 6a2f007f7c190a0077b99bd442d5bd41638f3d329c08a045653e096f21c9d16d +F autosetup/sqlite-config.tcl 9d193c15975228021821cb3eed667491c6de340baf26d5b21a2ad861187d4936 F autosetup/system.tcl 51d4be76cd9a9074704b584e5c9cbba616202c8468cf9ba8a4f8294a7ab1dba9 F configure 9a00b21dfd13757bbfb8d89b30660a89ec1f8f3a79402b8f9f9b6fc475c3303a x F contrib/sqlitecon.tcl 210a913ad63f9f991070821e599d600bd913e0ad @@ -2207,8 +2207,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P 6a21d6a2ed627ba0a864bef85369ed17553b808ae5c19891fa1f70505dfcbe39 -R ccbb8a55e81df7376a41b6d85d79a9b1 +P b0928f2043ed2a5d445c65f0d7271431e182f5a6fcd24ddcd57ea1cdcf4bbaa2 +R deb7bf34e9c57df9897124263106b638 U stephan -Z 440d189d3f6211449eb539edd8ee3916 +Z 5ed369aff0b10c102cba383c3de65e06 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 47d8d4598b..cc8dc2bf44 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -b0928f2043ed2a5d445c65f0d7271431e182f5a6fcd24ddcd57ea1cdcf4bbaa2 +806ad1ac173d7c0d6d94bfccd3b961fc5c9541b32773c063a8c4082380d7a90d From 6b5599726b752e72763d857a25897b8af882aed7 Mon Sep 17 00:00:00 2001 From: stephan Date: Fri, 14 Feb 2025 18:17:31 +0000 Subject: [PATCH 106/194] More informative output for the pthread feature test. FossilOrigin-Name: 01b9ed73ca6e72411dcf5a81f445c15c5bc42fa068fc7eca485ac72635b9d2fc --- autosetup/sqlite-config.tcl | 5 ++++- manifest | 12 ++++++------ manifest.uuid | 2 +- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/autosetup/sqlite-config.tcl b/autosetup/sqlite-config.tcl index 1c0e859042..d70220723f 100644 --- a/autosetup/sqlite-config.tcl +++ b/autosetup/sqlite-config.tcl @@ -690,6 +690,7 @@ proc sqlite-handle-threadsafe {} { define LDFLAGS_PTHREAD "" set enable 0 proj-if-opt-truthy threadsafe { + msg-result "Checking for libs..." if {[proj-check-function-in-lib pthread_create pthread] && [proj-check-function-in-lib pthread_mutexattr_init pthread]} { set enable 1 @@ -698,11 +699,13 @@ proc sqlite-handle-threadsafe {} { undefine lib_pthread_mutexattr_init } elseif {[proj-opt-was-provided threadsafe]} { user-error "Missing required pthread libraries. Use --disable-threadsafe to disable this check." + } else { + msg-result "pthread support not detected" } # Recall that LDFLAGS_PTHREAD might be empty even if pthreads if # found because it's in -lc on some platforms. } { - msg-result no + msg-result "Disabled using --disable-threadsafe" } sqlite-add-feature-flag -DSQLITE_THREADSAFE=${enable} return $enable diff --git a/manifest b/manifest index ac1e73bf34..17137cbb99 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Make\sfailure\sto\sfind\spthreads\ssupport\snon-fatal\sunless\s--enable-threadsafe\sis\sspecifically\spassed\sin.\sBuild\sregression\sreported\sin\s[8e0fdb8c0d]. -D 2025-02-14T18:06:28.632 +C More\sinformative\soutput\sfor\sthe\spthread\sfeature\stest. +D 2025-02-14T18:17:31.710 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d @@ -50,7 +50,7 @@ F autosetup/cc.tcl c0fcc50ca91deff8741e449ddad05bcd08268bc31177e613a6343bbd1fd3e F autosetup/jimsh0.c 6573f6bc6ff204de0139692648d7037ca0b6c067bac83a7b4e087f20a86866a4 F autosetup/pkg-config.tcl 4e635bf39022ff65e0d5434339dd41503ea48fc53822c9c5bde88b02d3d952ba F autosetup/proj.tcl cef1e0aa0f2dee2042af66f28c97a9445f84d55d858ba9db4f6116846a1a325f -F autosetup/sqlite-config.tcl 9d193c15975228021821cb3eed667491c6de340baf26d5b21a2ad861187d4936 +F autosetup/sqlite-config.tcl 48c55d221189cda985cadd81a88d5a046d327db6e8c5f7395bfde577040ba59f F autosetup/system.tcl 51d4be76cd9a9074704b584e5c9cbba616202c8468cf9ba8a4f8294a7ab1dba9 F configure 9a00b21dfd13757bbfb8d89b30660a89ec1f8f3a79402b8f9f9b6fc475c3303a x F contrib/sqlitecon.tcl 210a913ad63f9f991070821e599d600bd913e0ad @@ -2207,8 +2207,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P b0928f2043ed2a5d445c65f0d7271431e182f5a6fcd24ddcd57ea1cdcf4bbaa2 -R deb7bf34e9c57df9897124263106b638 +P 806ad1ac173d7c0d6d94bfccd3b961fc5c9541b32773c063a8c4082380d7a90d +R 09a63536408c62281d4a45ffc0125d28 U stephan -Z 5ed369aff0b10c102cba383c3de65e06 +Z fe9efd4025c936400a0447a11687e271 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index cc8dc2bf44..d3ca8dc79f 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -806ad1ac173d7c0d6d94bfccd3b961fc5c9541b32773c063a8c4082380d7a90d +01b9ed73ca6e72411dcf5a81f445c15c5bc42fa068fc7eca485ac72635b9d2fc From 4e87ddc105c16f6557f041cc4426fbe72e5642ab Mon Sep 17 00:00:00 2001 From: stephan Date: Sat, 15 Feb 2025 14:12:24 +0000 Subject: [PATCH 107/194] A cleaner workaround for [6a21d6a2], provided by autosetup's creator. FossilOrigin-Name: 334ed723d0fc0b202f79a9746459181f637ca99c54864a4aa11629eecb4b8d0c --- auto.def | 7 +------ autoconf/auto.def | 7 +------ autosetup/sqlite-config.tcl | 14 +++++++------- manifest | 16 ++++++++-------- manifest.uuid | 2 +- 5 files changed, 18 insertions(+), 28 deletions(-) diff --git a/auto.def b/auto.def index 8a964ad75c..9df87f579a 100644 --- a/auto.def +++ b/auto.def @@ -14,12 +14,7 @@ # use sqlite-config -if {0} { - sqlite-config-bootstrap canonical -} else { - options [sqlite-config-bootstrap canonical] - sqlite-post-options-init -} +sqlite-config-bootstrap canonical sqlite-setup-default-cflags proj-if-opt-truthy dev { # --enable-dev needs to come early so that the downstream tests diff --git a/autoconf/auto.def b/autoconf/auto.def index ccbaaa89ee..bb8710378f 100644 --- a/autoconf/auto.def +++ b/autoconf/auto.def @@ -8,12 +8,7 @@ # included in this source tree as ./autosetup/jimsh0.c. # use sqlite-config -if {0} { - sqlite-config-bootstrap autoconf -} else { - options [sqlite-config-bootstrap autoconf] - sqlite-post-options-init -} +sqlite-config-bootstrap autoconf sqlite-check-common-bins sqlite-check-common-system-deps proj-check-rpath diff --git a/autosetup/sqlite-config.tcl b/autosetup/sqlite-config.tcl index d70220723f..ccb114868c 100644 --- a/autosetup/sqlite-config.tcl +++ b/autosetup/sqlite-config.tcl @@ -295,14 +295,14 @@ proc sqlite-config-bootstrap {buildMode} { } } } - if {0} { - #puts "options = $opts"; exit 0 - options $opts - sqlite-post-options-init - } else { - # Workaround for https://github.com/msteveb/autosetup/issues/73 - return $opts + #lappend opts "soname:=duplicateEntry => {x}"; #just testing + if {[catch {options $opts}]} { + # Workaround for + # where [options] behaves oddly on _some_ TCL builds when it's + # called from deeper than the global scope. + return -code break } + sqlite-post-options-init }; # sqlite-config-bootstrap ######################################################################## diff --git a/manifest b/manifest index 17137cbb99..60ccc5f65f 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C More\sinformative\soutput\sfor\sthe\spthread\sfeature\stest. -D 2025-02-14T18:17:31.710 +C A\scleaner\sworkaround\sfor\s[6a21d6a2],\sprovided\sby\sautosetup's\screator. +D 2025-02-15T14:12:24.766 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d @@ -14,13 +14,13 @@ F art/sqlite370.eps aa97a671332b432a54e1d74ff5e8775be34200c2 F art/sqlite370.ico af56c1d00fee7cd4753e8631ed60703ed0fc6e90 F art/sqlite370.jpg d512473dae7e378a67e28ff96a34da7cb331def2 F art/sqlite370.svg 40b7e2fe8aac3add5d56dd86ab8d427a4eca5bcb3fe4f8946cb3794e1821d531 -F auto.def 6120063c2901500ee7ff662dee63f234fe24e546c9c0292c3fcb3beb9c2e59f5 +F auto.def eddf6aef976e2c1a56c0accc3244945e0b22ec6799074c40be160e5a9a5662b0 F autoconf/Makefile.fallback 22fe523eb36dfce31e0f6349f782eb084e86a5620b2b0b4f84a2d6133f53f5ac F autoconf/Makefile.in 0c71fcc6b2bd1703799a8e5b8f137ba64aad9bdee43c3cc23598cd0d6ce95715 F autoconf/Makefile.msc 4f09fead3bf7de337242896f107c5d03cd8f7b39754315ab091a2e4d02892c40 F autoconf/README.first f1d3876e9a7852c22f275a6f06814e64934cecbc0b5b9617d64849094c1fd136 F autoconf/README.txt 7f01dc3915e2d68f329011073662369e62a0938a2c69398807823c57591cb288 -F autoconf/auto.def c160516ad490b00fad64235323ff18323a6a6523607d2a9705f2ec38ea2f5c33 +F autoconf/auto.def 9af634c6d51fa4b82c9bb61b51249ca087f2cbe09c7c3c31f920759082a1ffdb F autoconf/tea/Makefile.in ba0556fee8da09c066bad85a4457904e46ee2c2eabaa309c0e83a78f2f151a8e F autoconf/tea/README.txt 61e62e519579e4a112791354d6d440f8b51ea6db3b0bab58d59f29df42d2dfe3 F autoconf/tea/aclocal.m4 52c47aac44ce0ddb1f918b6993e8beb8eee88f43 @@ -50,7 +50,7 @@ F autosetup/cc.tcl c0fcc50ca91deff8741e449ddad05bcd08268bc31177e613a6343bbd1fd3e F autosetup/jimsh0.c 6573f6bc6ff204de0139692648d7037ca0b6c067bac83a7b4e087f20a86866a4 F autosetup/pkg-config.tcl 4e635bf39022ff65e0d5434339dd41503ea48fc53822c9c5bde88b02d3d952ba F autosetup/proj.tcl cef1e0aa0f2dee2042af66f28c97a9445f84d55d858ba9db4f6116846a1a325f -F autosetup/sqlite-config.tcl 48c55d221189cda985cadd81a88d5a046d327db6e8c5f7395bfde577040ba59f +F autosetup/sqlite-config.tcl 17b5417841c402dcf8f656749be6fcff651f3360c48afcdc01aad375fe414fec F autosetup/system.tcl 51d4be76cd9a9074704b584e5c9cbba616202c8468cf9ba8a4f8294a7ab1dba9 F configure 9a00b21dfd13757bbfb8d89b30660a89ec1f8f3a79402b8f9f9b6fc475c3303a x F contrib/sqlitecon.tcl 210a913ad63f9f991070821e599d600bd913e0ad @@ -2207,8 +2207,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P 806ad1ac173d7c0d6d94bfccd3b961fc5c9541b32773c063a8c4082380d7a90d -R 09a63536408c62281d4a45ffc0125d28 +P 01b9ed73ca6e72411dcf5a81f445c15c5bc42fa068fc7eca485ac72635b9d2fc +R 4a76560a1c5bc38f5777d5f7ba110253 U stephan -Z fe9efd4025c936400a0447a11687e271 +Z 15f10168d95dbdd3c940ff559a29ad5c # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index d3ca8dc79f..db6cfe8045 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -01b9ed73ca6e72411dcf5a81f445c15c5bc42fa068fc7eca485ac72635b9d2fc +334ed723d0fc0b202f79a9746459181f637ca99c54864a4aa11629eecb4b8d0c From 984f699ccb04322a5edee5f9ebda7131e2493558 Mon Sep 17 00:00:00 2001 From: stephan Date: Sat, 15 Feb 2025 16:12:28 +0000 Subject: [PATCH 108/194] DLL installation rules no longer create versioned symlinks on platforms where the DLL extension is '.dll' (cygwin, msys2, etc.), as suggested in [forum:28bb79638844c328|forum post 28bb79638844c328]. FossilOrigin-Name: d743410665df8ba962db6e1f245d929b005d0add77be95af3c3c7f87a1c758fb --- autoconf/Makefile.in | 9 ++++++--- main.mk | 23 ++++++++++++----------- manifest | 14 +++++++------- manifest.uuid | 2 +- 4 files changed, 26 insertions(+), 22 deletions(-) diff --git a/autoconf/Makefile.in b/autoconf/Makefile.in index c6cde3c181..65108ee5d0 100644 --- a/autoconf/Makefile.in +++ b/autoconf/Makefile.in @@ -87,7 +87,7 @@ install-dir.all = $(install-dir.bin) $(install-dir.include) \ $(install-dir.lib) $(install-dir.man1) \ $(install-dir.pkgconfig) $(install-dir.all): - if [ ! -d "$@" ]; then $(INSTALL) -d "$@"; fi + @if [ ! -d "$@" ]; then set -x; $(INSTALL) -d "$@"; fi # ^^^^ on some platforms, install -d fails if the target already exists. @@ -161,8 +161,10 @@ install-so-1: $(install-dir.lib) $(libsqlite3.SO) $(INSTALL) $(libsqlite3.SO).a "$(install-dir.lib)"; \ fi @echo "Setting up $(libsqlite3.SO) version symlinks..."; \ - cd "$(install-dir.lib)" || exit $$?; \ - if [ x.dylib = x$(T.dll) ]; then \ + if [ x.dll = x$(T.dll) ]; then \ + echo "No library symlinks needed on this platform"; \ + elif [ x.dylib = x$(T.dll) ]; then \ + cd "$(install-dir.lib)" || exit $$?; \ rm -f libsqlite3.0$(T.dll) libsqlite3.$(PACKAGE_VERSION)$(T.dll) || exit $$?; \ dllname=libsqlite3.$(PACKAGE_VERSION)$(T.dll); \ mv $(libsqlite3.SO) $$dllname || exit $$?; \ @@ -170,6 +172,7 @@ install-so-1: $(install-dir.lib) $(libsqlite3.SO) ln -s $$dllname libsqlite3.0$(T.dll) || exit $$?; \ ls -la $$dllname $(libsqlite3.SO) libsqlite3.0$(T.dll); \ else \ + cd "$(install-dir.lib)" || exit $$?; \ rm -f $(libsqlite3.SO).0 $(libsqlite3.SO).$(PACKAGE_VERSION) || exit $$?; \ mv $(libsqlite3.SO) $(libsqlite3.SO).$(PACKAGE_VERSION) || exit $$?; \ ln -s $(libsqlite3.SO).$(PACKAGE_VERSION) $(libsqlite3.SO) || exit $$?; \ diff --git a/main.mk b/main.mk index a63fa2a814..00e519d216 100644 --- a/main.mk +++ b/main.mk @@ -436,7 +436,7 @@ install-dir.all = $(install-dir.bin) $(install-dir.include) \ $(install-dir.lib) $(install-dir.man1) \ $(install-dir.pkgconfig) $(install-dir.all): - if [ ! -d "$@" ]; then $(INSTALL) -d "$@"; fi + @if [ ! -d "$@" ]; then set -x; $(INSTALL) -d "$@"; fi # ^^^^ on some platforms, install -d fails if the target already exists. # @@ -1427,19 +1427,17 @@ so: $(libsqlite3.SO)-$(ENABLE_SHARED) all: so # -# Install the $(libsqlite3.SO) as $(libsqlite3.SO).$(PACKAGE_VERSION) -# and create symlinks which point to it: +# On most Unix-like platforms, install the $(libsqlite3.SO) as +# $(libsqlite3.SO).$(PACKAGE_VERSION) and create symlinks which point +# to it: # # - libsqlite3.so.$(PACKAGE_VERSION) # - libsqlite3.so.0 =symlink-> libsqlite3.so.$(PACKAGE_VERSION) (see below) # - libsqlite3.so =symlink-> libsqlite3.so.3 # -# N.B. we initially had a link named libsqlite3.so.3 but it's -# unnecessary unless we want to set SONAME to libsqlite3.so.3, which -# is also unnecessary. -# -# N.B. different transformations are applied on systems where $(T.dll) -# is ".dylib" and none of the following docs apply on such systems. +# The symlinks are not added on platforms where $(T.dll) is ".dll", +# and different transformations take place on platforms where $(T.dll) +# is ".dylib". # # The link named libsqlite3.so.0 is provided in an attempt to reduce # downstream disruption when performing upgrades from pre-3.48 to a @@ -1481,8 +1479,10 @@ install-so-1: $(install-dir.lib) $(libsqlite3.SO) $(INSTALL) $(libsqlite3.SO).a "$(install-dir.lib)"; \ fi @echo "Setting up $(libsqlite3.SO) version symlinks..."; \ - cd "$(install-dir.lib)" || exit $$?; \ - if [ x.dylib = x$(T.dll) ]; then \ + if [ x.dll = x$(T.dll) ]; then \ + echo "No library symlinks needed on this platform"; \ + elif [ x.dylib = x$(T.dll) ]; then \ + cd "$(install-dir.lib)" || exit $$?; \ rm -f libsqlite3.0$(T.dll) libsqlite3.$(PACKAGE_VERSION)$(T.dll) || exit $$?; \ dllname=libsqlite3.$(PACKAGE_VERSION)$(T.dll); \ mv $(libsqlite3.SO) $$dllname || exit $$?; \ @@ -1490,6 +1490,7 @@ install-so-1: $(install-dir.lib) $(libsqlite3.SO) ln -s $$dllname libsqlite3.0$(T.dll) || exit $$?; \ ls -la $$dllname $(libsqlite3.SO) libsqlite3.0$(T.dll); \ else \ + cd "$(install-dir.lib)" || exit $$?; \ rm -f $(libsqlite3.SO).0 $(libsqlite3.SO).$(PACKAGE_VERSION) || exit $$?; \ mv $(libsqlite3.SO) $(libsqlite3.SO).$(PACKAGE_VERSION) || exit $$?; \ ln -s $(libsqlite3.SO).$(PACKAGE_VERSION) $(libsqlite3.SO) || exit $$?; \ diff --git a/manifest b/manifest index 60ccc5f65f..9f60cfd2ce 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C A\scleaner\sworkaround\sfor\s[6a21d6a2],\sprovided\sby\sautosetup's\screator. -D 2025-02-15T14:12:24.766 +C DLL\sinstallation\srules\sno\slonger\screate\sversioned\ssymlinks\son\splatforms\swhere\sthe\sDLL\sextension\sis\s'.dll'\s(cygwin,\smsys2,\setc.),\sas\ssuggested\sin\s[forum:28bb79638844c328|forum\spost\s28bb79638844c328]. +D 2025-02-15T16:12:28.303 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d @@ -16,7 +16,7 @@ F art/sqlite370.jpg d512473dae7e378a67e28ff96a34da7cb331def2 F art/sqlite370.svg 40b7e2fe8aac3add5d56dd86ab8d427a4eca5bcb3fe4f8946cb3794e1821d531 F auto.def eddf6aef976e2c1a56c0accc3244945e0b22ec6799074c40be160e5a9a5662b0 F autoconf/Makefile.fallback 22fe523eb36dfce31e0f6349f782eb084e86a5620b2b0b4f84a2d6133f53f5ac -F autoconf/Makefile.in 0c71fcc6b2bd1703799a8e5b8f137ba64aad9bdee43c3cc23598cd0d6ce95715 +F autoconf/Makefile.in 40106236dd97053cbeed7f47880375fb402c89f6dc7b8effe363c791f8ef3ca3 F autoconf/Makefile.msc 4f09fead3bf7de337242896f107c5d03cd8f7b39754315ab091a2e4d02892c40 F autoconf/README.first f1d3876e9a7852c22f275a6f06814e64934cecbc0b5b9617d64849094c1fd136 F autoconf/README.txt 7f01dc3915e2d68f329011073662369e62a0938a2c69398807823c57591cb288 @@ -702,7 +702,7 @@ F ext/wasm/tests/opfs/concurrency/test.js d08889a5bb6e61937d0b8cbb78c9efbefbf65a F ext/wasm/tests/opfs/concurrency/worker.js 0a8c1a3e6ebb38aabbee24f122693f1fb29d599948915c76906681bb7da1d3d2 F ext/wasm/wasmfs.make 68999f5bd8c489239592d59a420f8c627c99169bbd6fa16a404751f757b9f702 F magic.txt 5ade0bc977aa135e79e3faaea894d5671b26107cc91e70783aa7dc83f22f3ba0 -F main.mk a127ee141eb7db341d0c949a743a45d1b068b31ac3f1f09cf3b2870b2f18739f +F main.mk 840f0b3ac055a026930e52eb9d6300753e91ddd9fcbafe30395201908ad35e61 F mptest/config01.test 3c6adcbc50b991866855f1977ff172eb6d901271 F mptest/config02.test 4415dfe36c48785f751e16e32c20b077c28ae504 F mptest/crash01.test 61e61469e257df0850df4293d7d4d6c2af301421 @@ -2207,8 +2207,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P 01b9ed73ca6e72411dcf5a81f445c15c5bc42fa068fc7eca485ac72635b9d2fc -R 4a76560a1c5bc38f5777d5f7ba110253 +P 334ed723d0fc0b202f79a9746459181f637ca99c54864a4aa11629eecb4b8d0c +R 09a6356f5a88db966518edd4cb1e0940 U stephan -Z 15f10168d95dbdd3c940ff559a29ad5c +Z b289b7542f84beb5087c6c73ca65d385 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index db6cfe8045..5f6eb79423 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -334ed723d0fc0b202f79a9746459181f637ca99c54864a4aa11629eecb4b8d0c +d743410665df8ba962db6e1f245d929b005d0add77be95af3c3c7f87a1c758fb From 4a1c44eea7d9f3d444f9aa2b743edce2c3c42ad0 Mon Sep 17 00:00:00 2001 From: stephan Date: Sat, 15 Feb 2025 16:24:05 +0000 Subject: [PATCH 109/194] Automate update of the library version number in autoconf/tea/configure.ac as part of the tool/mkautoconfamal.sh process, per /chat discussion. FossilOrigin-Name: be265559a334eda127862ae54edb58c46051f74445642daa84a9f61a81df1bac --- autoconf/Makefile.in | 1 + autoconf/tea/{configure.ac => configure.ac.in} | 2 +- manifest | 16 ++++++++-------- manifest.uuid | 2 +- tool/mkautoconfamal.sh | 14 ++++++++------ 5 files changed, 19 insertions(+), 16 deletions(-) rename autoconf/tea/{configure.ac => configure.ac.in} (99%) diff --git a/autoconf/Makefile.in b/autoconf/Makefile.in index 65108ee5d0..d7cc0e946f 100644 --- a/autoconf/Makefile.in +++ b/autoconf/Makefile.in @@ -249,6 +249,7 @@ dist: rm -fr $(dist_name) mkdir -p $(dist_name) cp -rp $(DIST_FILES) $(dist_name)/. + rm -f $(dist_name)/tea/configure.ac.in tar czf $(dist_tarball) $(dist_name) rm -fr $(dist_name) ls -l $(dist_tarball) diff --git a/autoconf/tea/configure.ac b/autoconf/tea/configure.ac.in similarity index 99% rename from autoconf/tea/configure.ac rename to autoconf/tea/configure.ac.in index d3952707a2..a13a1e7615 100644 --- a/autoconf/tea/configure.ac +++ b/autoconf/tea/configure.ac.in @@ -19,7 +19,7 @@ dnl to configure the system for the local environment. # so that we create the export library with the dll. #----------------------------------------------------------------------- -AC_INIT([sqlite],[3.50.0]) +AC_INIT([sqlite],[@VERSION@]) #-------------------------------------------------------------------- # Call TEA_INIT as the first TEA_ macro to set up initial vars. diff --git a/manifest b/manifest index 9f60cfd2ce..5bc360dce6 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C DLL\sinstallation\srules\sno\slonger\screate\sversioned\ssymlinks\son\splatforms\swhere\sthe\sDLL\sextension\sis\s'.dll'\s(cygwin,\smsys2,\setc.),\sas\ssuggested\sin\s[forum:28bb79638844c328|forum\spost\s28bb79638844c328]. -D 2025-02-15T16:12:28.303 +C Automate\supdate\sof\sthe\slibrary\sversion\snumber\sin\sautoconf/tea/configure.ac\sas\spart\sof\sthe\stool/mkautoconfamal.sh\sprocess,\sper\s/chat\sdiscussion. +D 2025-02-15T16:24:05.242 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d @@ -16,7 +16,7 @@ F art/sqlite370.jpg d512473dae7e378a67e28ff96a34da7cb331def2 F art/sqlite370.svg 40b7e2fe8aac3add5d56dd86ab8d427a4eca5bcb3fe4f8946cb3794e1821d531 F auto.def eddf6aef976e2c1a56c0accc3244945e0b22ec6799074c40be160e5a9a5662b0 F autoconf/Makefile.fallback 22fe523eb36dfce31e0f6349f782eb084e86a5620b2b0b4f84a2d6133f53f5ac -F autoconf/Makefile.in 40106236dd97053cbeed7f47880375fb402c89f6dc7b8effe363c791f8ef3ca3 +F autoconf/Makefile.in 5e5ab43450b27e7247a0066f0606c5471e72f935c59ac3ba40038e23ebce92d5 F autoconf/Makefile.msc 4f09fead3bf7de337242896f107c5d03cd8f7b39754315ab091a2e4d02892c40 F autoconf/README.first f1d3876e9a7852c22f275a6f06814e64934cecbc0b5b9617d64849094c1fd136 F autoconf/README.txt 7f01dc3915e2d68f329011073662369e62a0938a2c69398807823c57591cb288 @@ -24,7 +24,7 @@ F autoconf/auto.def 9af634c6d51fa4b82c9bb61b51249ca087f2cbe09c7c3c31f920759082a1 F autoconf/tea/Makefile.in ba0556fee8da09c066bad85a4457904e46ee2c2eabaa309c0e83a78f2f151a8e F autoconf/tea/README.txt 61e62e519579e4a112791354d6d440f8b51ea6db3b0bab58d59f29df42d2dfe3 F autoconf/tea/aclocal.m4 52c47aac44ce0ddb1f918b6993e8beb8eee88f43 -F autoconf/tea/configure.ac 830cb2af5a3888312d0fd88402c2509d551d60e4c03f0481006a07c78313ef12 +F autoconf/tea/configure.ac.in da18360dfdeac7414fa8deb549f3d65aeca0ae1150ff1a8b902019b39ce019a4 w autoconf/tea/configure.ac F autoconf/tea/doc/sqlite3.n e1fe45d4f5286ee3d0ccc877aca2a0def488e9bb F autoconf/tea/license.terms 13bd403c9610fd2b76ece0ab50c4c5eda933d523 F autoconf/tea/pkgIndex.tcl.in 55aec3c6d7e9a1de9b8d2fdc9c27fd055da3ac3a51b572195e2ae7300bcfd3a2 @@ -2142,7 +2142,7 @@ F tool/logest.c c34e5944318415de513d29a6098df247a9618c96d83c38d4abd88641fe46e669 F tool/max-limits.c cbb635fbb37ae4d05f240bfb5b5270bb63c54439 F tool/merge-test.tcl de76b62f2de2a92d4c1ca4f976bce0aea6899e0229e250479b229b2a1914b176 F tool/mkamalzip.tcl 8aa5ebe7973c8b8774062d34e15fea9815c4cc2ceea3a9b184695f005910876a -F tool/mkautoconfamal.sh 14d2144043c6455958012f92324f4ce7c90a261b5daa2f2c7509498468475f8d +F tool/mkautoconfamal.sh c5e65fa1c922f2e3b3e4f6cd0331ec7d84bdef085f32cb1c46673cdf95ec8090 F tool/mkccode.tcl 210159febe0ef0ecbc53c79833500663ceaba0115b2b374405818dc835b5f84b x F tool/mkctimec.tcl b57ab5c43cf6a46ba4030027da1cc73d7839e7b78da3b328545bc941bb62360b x F tool/mkkeywordhash.c 6b0be901c47f9ad42215fc995eb2f4384ac49213b1fba395102ec3e999acf559 @@ -2207,8 +2207,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P 334ed723d0fc0b202f79a9746459181f637ca99c54864a4aa11629eecb4b8d0c -R 09a6356f5a88db966518edd4cb1e0940 +P d743410665df8ba962db6e1f245d929b005d0add77be95af3c3c7f87a1c758fb +R f10f58ea0cc54a3a2f87d5e937cce9f5 U stephan -Z b289b7542f84beb5087c6c73ca65d385 +Z 7cd96ea5b5e041e12c38e608e87b6e81 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 5f6eb79423..d8fe83f80f 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -d743410665df8ba962db6e1f245d929b005d0add77be95af3c3c7f87a1c758fb +be265559a334eda127862ae54edb58c46051f74445642daa84a9f61a81df1bac diff --git a/tool/mkautoconfamal.sh b/tool/mkautoconfamal.sh index c26ca47bf1..c26ac8c73c 100644 --- a/tool/mkautoconfamal.sh +++ b/tool/mkautoconfamal.sh @@ -25,10 +25,14 @@ VERSION=`cat $TOP/VERSION` HASH=`cut -c1-10 $TOP/manifest.uuid` DATETIME=`grep '^D' $TOP/manifest | tr -c -d '[0-9]' | cut -c1-12` -# Verify that the version number in the TEA autoconf file is correct. -# Fail with an error if not. +# Inject the current version into the TEA autoconf file. # -if grep $VERSION $TOP/autoconf/tea/configure.ac +sed -e "s/@VERSION@/$VERSION/" \ + < $TOP/autoconf/tea/configure.ac.in \ + > $TOP/autoconf/tea/configure.ac +# And then verify that that worked... +# +if grep $VERSION $TOP/autoconf/tea/configure.ac > /dev/null then echo "TEA version number ok" else echo "TEA version number mismatch. Should be $VERSION"; exit 1 fi @@ -91,10 +95,8 @@ cat < tea/generic/tclsqlite3.c EOF cat $TOP/src/tclsqlite.c >> tea/generic/tclsqlite3.c -sed "s/AC_INIT(\[sqlite\], .*)/AC_INIT([sqlite], [$VERSION])/" tea/configure.ac > tmp -mv tmp tea/configure.ac - cd tea +rm -f configure.ac.in autoconf rm -rf autom4te.cache From ac729894be0d60e9bf298b3c45611a4bf7b74b1c Mon Sep 17 00:00:00 2001 From: stephan Date: Sat, 15 Feb 2025 17:29:56 +0000 Subject: [PATCH 110/194] Remove tea version check from tool/srctree-check.tcl, as it's obsoleted by [be265559]. FossilOrigin-Name: 1860ea060bd373f49d0b5d41367409a4607e9a0a0cb606af99927af15de1e21e --- manifest | 14 +++++++------- manifest.uuid | 2 +- tool/srctree-check.tcl | 15 --------------- 3 files changed, 8 insertions(+), 23 deletions(-) diff --git a/manifest b/manifest index 5bc360dce6..2f7a6368f8 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Automate\supdate\sof\sthe\slibrary\sversion\snumber\sin\sautoconf/tea/configure.ac\sas\spart\sof\sthe\stool/mkautoconfamal.sh\sprocess,\sper\s/chat\sdiscussion. -D 2025-02-15T16:24:05.242 +C Remove\stea\sversion\scheck\sfrom\stool/srctree-check.tcl,\sas\sit's\sobsoleted\sby\s[be265559]. +D 2025-02-15T17:29:56.489 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d @@ -24,7 +24,7 @@ F autoconf/auto.def 9af634c6d51fa4b82c9bb61b51249ca087f2cbe09c7c3c31f920759082a1 F autoconf/tea/Makefile.in ba0556fee8da09c066bad85a4457904e46ee2c2eabaa309c0e83a78f2f151a8e F autoconf/tea/README.txt 61e62e519579e4a112791354d6d440f8b51ea6db3b0bab58d59f29df42d2dfe3 F autoconf/tea/aclocal.m4 52c47aac44ce0ddb1f918b6993e8beb8eee88f43 -F autoconf/tea/configure.ac.in da18360dfdeac7414fa8deb549f3d65aeca0ae1150ff1a8b902019b39ce019a4 w autoconf/tea/configure.ac +F autoconf/tea/configure.ac.in da18360dfdeac7414fa8deb549f3d65aeca0ae1150ff1a8b902019b39ce019a4 F autoconf/tea/doc/sqlite3.n e1fe45d4f5286ee3d0ccc877aca2a0def488e9bb F autoconf/tea/license.terms 13bd403c9610fd2b76ece0ab50c4c5eda933d523 F autoconf/tea/pkgIndex.tcl.in 55aec3c6d7e9a1de9b8d2fdc9c27fd055da3ac3a51b572195e2ae7300bcfd3a2 @@ -2193,7 +2193,7 @@ F tool/sqltclsh.c.in 1bcc2e9da58fadf17b0bf6a50e68c1159e602ce057210b655d50bad5aaa F tool/sqltclsh.tcl 862f4cf1418df5e1315b5db3b5ebe88969e2a784525af5fbf9596592f14ed848 F tool/src-verify.c d00f93263aa2fa6ba0cba0106d95458e6effb94fdb5fc634f56834f90c05bbb4 F tool/srcck1.c 371de5363b70154012955544f86fdee8f6e5326f -F tool/srctree-check.tcl 4e635aed7dd8198d2b212353823d4b10b380211bf9a8287921ec6b2b773ca097 +F tool/srctree-check.tcl fa4d82dd3e8a38d5cbce7d6ade8abef2f42b9eca0394484d521dc8d086739460 F tool/stack_usage.tcl f8e71b92cdb099a147dad572375595eae55eca43 F tool/stripccomments.c dfe9cc03cf87728ac9836be30763f8aa52b82caca0780b3d3f3572e4643b01d3 F tool/symbols-mingw.sh 4dbcea7e74768305384c9fd2ed2b41bbf9f0414d @@ -2207,8 +2207,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P d743410665df8ba962db6e1f245d929b005d0add77be95af3c3c7f87a1c758fb -R f10f58ea0cc54a3a2f87d5e937cce9f5 +P be265559a334eda127862ae54edb58c46051f74445642daa84a9f61a81df1bac +R ec0de275110a891612615fec90c077b9 U stephan -Z 7cd96ea5b5e041e12c38e608e87b6e81 +Z db33573bd4969af02b51c5852b05ae57 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index d8fe83f80f..99249bbdb0 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -be265559a334eda127862ae54edb58c46051f74445642daa84a9f61a81df1bac +1860ea060bd373f49d0b5d41367409a4607e9a0a0cb606af99927af15de1e21e diff --git a/tool/srctree-check.tcl b/tool/srctree-check.tcl index b16bd924a0..921bb0976e 100644 --- a/tool/srctree-check.tcl +++ b/tool/srctree-check.tcl @@ -34,21 +34,6 @@ set TCLSH [info nameofexe] # set NERR 0 -######################### autoconf/tea/configure.ac ########################### - -set confac [readfile $ROOT/autoconf/tea/configure.ac] -set vers [readfile $ROOT/VERSION] -set pattern {AC_INIT([sqlite],[} -append pattern [string trim $vers] -append pattern {])} -if {[string first $pattern $confac]<=0} { - puts "ERROR: ./autoconf/tea/configure.ac does not agree with ./VERSION" - puts "...... Fix: manually edit ./autoconf/tea/configure.ac and put the" - puts "...... correct version number in AC_INIT()" - incr NERR -} -unset confac - ######################### autoconf/Makefile.msc ############################### set f1 [readfile $ROOT/autoconf/Makefile.msc] From f4fc2ee20311a0a5141726c71d318ab52001c974 Mon Sep 17 00:00:00 2001 From: drh <> Date: Sun, 16 Feb 2025 10:57:25 +0000 Subject: [PATCH 111/194] Add a typecast to avoid 32-bit integer overflow in the concat_ws() function with an enormous separator values and many arguments. FossilOrigin-Name: 498e3f1cf57f164fbd8380e92bf91b9f26d6aa05d092fcd135d754abf1e5b1b5 --- manifest | 14 +++++++------- manifest.uuid | 2 +- src/func.c | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/manifest b/manifest index 2f7a6368f8..9f03427425 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Remove\stea\sversion\scheck\sfrom\stool/srctree-check.tcl,\sas\sit's\sobsoleted\sby\s[be265559]. -D 2025-02-15T17:29:56.489 +C Add\sa\stypecast\sto\savoid\s32-bit\sinteger\soverflow\sin\sthe\sconcat_ws()\nfunction\swith\san\senormous\sseparator\svalues\sand\smany\sarguments. +D 2025-02-16T10:57:25.604 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d @@ -732,7 +732,7 @@ F src/delete.c 03a77ba20e54f0f42ebd8eddf15411ed6bdb06a2c472ac4b6b336521bf7cea42 F src/expr.c ca943270395374afc65256ce86cdb152a22fa6ff146895175833b89ba870e117 F src/fault.c 460f3e55994363812d9d60844b2a6de88826e007 F src/fkey.c 928ed2517e8732113d2b9821aa37af639688d752f4ea9ac6e0e393d713eeb76f -F src/func.c b2fb33139972d7d65640b27ea962a49f1616265428001090cab39fcf270228e1 +F src/func.c 838bb4c02065daef6ef359cf294e6b6f95a73d4ff0159240a4710478bae80e1c F src/global.c a19e4b1ca1335f560e9560e590fc13081e21f670643367f99cb9e8f9dc7d615b F src/hash.c 73934a7f7ab1cb110614a9388cb516893b0cf5b7b69e4fd1a0780ac4ce166be7 F src/hash.h 46b92795a95bfefb210f52f0c316e9d7cdbcdd7e7fcfb0d8be796d3a5767cddf @@ -2207,8 +2207,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P be265559a334eda127862ae54edb58c46051f74445642daa84a9f61a81df1bac -R ec0de275110a891612615fec90c077b9 -U stephan -Z db33573bd4969af02b51c5852b05ae57 +P 1860ea060bd373f49d0b5d41367409a4607e9a0a0cb606af99927af15de1e21e +R a83683a53b87e7c1a91cc72d41480630 +U drh +Z e32688ad6baa8e44c1d5b0c7282d0615 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 99249bbdb0..f4fea86bdd 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -1860ea060bd373f49d0b5d41367409a4607e9a0a0cb606af99927af15de1e21e +498e3f1cf57f164fbd8380e92bf91b9f26d6aa05d092fcd135d754abf1e5b1b5 diff --git a/src/func.c b/src/func.c index 52462b4682..222c9ac64a 100644 --- a/src/func.c +++ b/src/func.c @@ -1570,7 +1570,7 @@ static void concatFuncCore( for(i=0; i Date: Sun, 16 Feb 2025 13:13:19 +0000 Subject: [PATCH 112/194] API naming typo reported in [forum:416f2d8dec|forum post 416f2d8dec]. No functional changes. FossilOrigin-Name: 0cfb9e234e116741d01b65d0abf18210e495276319fb08ec6e40d3f2e698956d --- ext/jni/src/org/sqlite/jni/capi/CApi.java | 12 ++++++------ manifest | 14 +++++++------- manifest.uuid | 2 +- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/ext/jni/src/org/sqlite/jni/capi/CApi.java b/ext/jni/src/org/sqlite/jni/capi/CApi.java index b5d08306e2..3387282378 100644 --- a/ext/jni/src/org/sqlite/jni/capi/CApi.java +++ b/ext/jni/src/org/sqlite/jni/capi/CApi.java @@ -199,16 +199,16 @@ public final class CApi { } private static native sqlite3_backup sqlite3_backup_init( - @NotNull long ptrToDbDest, @NotNull String destTableName, - @NotNull long ptrToDbSrc, @NotNull String srcTableName + @NotNull long ptrToDbDest, @NotNull String destSchemaName, + @NotNull long ptrToDbSrc, @NotNull String srcSchemaName ); public static sqlite3_backup sqlite3_backup_init( - @NotNull sqlite3 dbDest, @NotNull String destTableName, - @NotNull sqlite3 dbSrc, @NotNull String srcTableName + @NotNull sqlite3 dbDest, @NotNull String destSchemaName, + @NotNull sqlite3 dbSrc, @NotNull String srcSchemaName ){ - return sqlite3_backup_init( dbDest.getNativePointer(), destTableName, - dbSrc.getNativePointer(), srcTableName ); + return sqlite3_backup_init( dbDest.getNativePointer(), destSchemaName, + dbSrc.getNativePointer(), srcSchemaName ); } private static native int sqlite3_backup_pagecount(@NotNull long ptrToBackup); diff --git a/manifest b/manifest index 9f03427425..aaf0236700 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Add\sa\stypecast\sto\savoid\s32-bit\sinteger\soverflow\sin\sthe\sconcat_ws()\nfunction\swith\san\senormous\sseparator\svalues\sand\smany\sarguments. -D 2025-02-16T10:57:25.604 +C API\snaming\stypo\sreported\sin\s[forum:416f2d8dec|forum\spost\s416f2d8dec].\sNo\sfunctional\schanges. +D 2025-02-16T13:13:19.874 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d @@ -298,7 +298,7 @@ F ext/jni/src/org/sqlite/jni/capi/AggregateFunction.java 0b72cdff61533b564d65b63 F ext/jni/src/org/sqlite/jni/capi/AuthorizerCallback.java c045a5b47e02bb5f1af91973814a905f12048c428a3504fbc5266d1c1be3de5a F ext/jni/src/org/sqlite/jni/capi/AutoExtensionCallback.java 74cc4998a73d6563542ecb90804a3c4f4e828cb4bd69e61226d1a51f4646e759 F ext/jni/src/org/sqlite/jni/capi/BusyHandlerCallback.java 7b8e19810c42b0ad21a04b5d8c804b32ee5905d137148703f16a75b612c380ca -F ext/jni/src/org/sqlite/jni/capi/CApi.java 27bbd944ea8c147afd25b93f17dc397f3627611ebe2878944a32ffeffc98e99e +F ext/jni/src/org/sqlite/jni/capi/CApi.java 8620c652138b84af795fd65bc200028590f533407c093d4355f9524dc594c004 F ext/jni/src/org/sqlite/jni/capi/CallbackProxy.java 57e2d275dcebe690b1fc1f3d34eb96879b2d7039bce30b563aee547bf45d8a8b F ext/jni/src/org/sqlite/jni/capi/CollationCallback.java e29bcfc540fdd343e2f5cca4d27235113f2886acb13380686756d5cabdfd065a F ext/jni/src/org/sqlite/jni/capi/CollationNeededCallback.java 5bfa226a8e7a92e804fd52d6e42b4c7b875fa7a94f8e2c330af8cc244a8920ab @@ -2207,8 +2207,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P 1860ea060bd373f49d0b5d41367409a4607e9a0a0cb606af99927af15de1e21e -R a83683a53b87e7c1a91cc72d41480630 -U drh -Z e32688ad6baa8e44c1d5b0c7282d0615 +P 498e3f1cf57f164fbd8380e92bf91b9f26d6aa05d092fcd135d754abf1e5b1b5 +R 4e1e370efca67eead8ee775d6ab0dd45 +U stephan +Z 1f778f59dd3029d05607c051f27c5963 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index f4fea86bdd..274efd1e8c 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -498e3f1cf57f164fbd8380e92bf91b9f26d6aa05d092fcd135d754abf1e5b1b5 +0cfb9e234e116741d01b65d0abf18210e495276319fb08ec6e40d3f2e698956d From 4b1c8362e756d44a6227b7054bb07b9d65a35374 Mon Sep 17 00:00:00 2001 From: stephan Date: Sun, 16 Feb 2025 13:49:18 +0000 Subject: [PATCH 113/194] Update autoconf/Makefile.msc from tool/mkmsvcmin.tcl. FossilOrigin-Name: 9ffe94d2ea0b3679c3d2657e2c3b67f84c09e9bcbbe0a13c76d58858df367d1b --- autoconf/Makefile.msc | 2 +- manifest | 12 ++++++------ manifest.uuid | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/autoconf/Makefile.msc b/autoconf/Makefile.msc index f891036a14..538cc43a4b 100644 --- a/autoconf/Makefile.msc +++ b/autoconf/Makefile.msc @@ -1088,5 +1088,5 @@ $(LIBRESOBJS): $(TOP)\sqlite3.rc rcver.vc $(SQLITE3H) clean: del /Q *.exp *.lo *.ilk *.lib *.obj *.ncb *.pdb *.sdf *.suo 2>NUL del /Q *.bsc *.cod *.da *.bb *.bbg *.vc gmon.out 2>NUL - del /Q sqlite3.def tclsqlite3.def ctime.c 2>NUL + del /Q sqlite3.def tclsqlite3.def ctime.c pragma.h 2>NUL del /Q $(SQLITE3EXE) $(SQLITE3DLL) Replace.exe 2>NUL diff --git a/manifest b/manifest index aaf0236700..afcb520cfa 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C API\snaming\stypo\sreported\sin\s[forum:416f2d8dec|forum\spost\s416f2d8dec].\sNo\sfunctional\schanges. -D 2025-02-16T13:13:19.874 +C Update\sautoconf/Makefile.msc\sfrom\stool/mkmsvcmin.tcl. +D 2025-02-16T13:49:18.989 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d @@ -17,7 +17,7 @@ F art/sqlite370.svg 40b7e2fe8aac3add5d56dd86ab8d427a4eca5bcb3fe4f8946cb3794e1821 F auto.def eddf6aef976e2c1a56c0accc3244945e0b22ec6799074c40be160e5a9a5662b0 F autoconf/Makefile.fallback 22fe523eb36dfce31e0f6349f782eb084e86a5620b2b0b4f84a2d6133f53f5ac F autoconf/Makefile.in 5e5ab43450b27e7247a0066f0606c5471e72f935c59ac3ba40038e23ebce92d5 -F autoconf/Makefile.msc 4f09fead3bf7de337242896f107c5d03cd8f7b39754315ab091a2e4d02892c40 +F autoconf/Makefile.msc 1249e425a24859c7b3f17575275247df9eec3bddc0d1d7e73941f1abdbb95a92 F autoconf/README.first f1d3876e9a7852c22f275a6f06814e64934cecbc0b5b9617d64849094c1fd136 F autoconf/README.txt 7f01dc3915e2d68f329011073662369e62a0938a2c69398807823c57591cb288 F autoconf/auto.def 9af634c6d51fa4b82c9bb61b51249ca087f2cbe09c7c3c31f920759082a1ffdb @@ -2207,8 +2207,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P 498e3f1cf57f164fbd8380e92bf91b9f26d6aa05d092fcd135d754abf1e5b1b5 -R 4e1e370efca67eead8ee775d6ab0dd45 +P 0cfb9e234e116741d01b65d0abf18210e495276319fb08ec6e40d3f2e698956d +R 9c4f553142a0ea668666d37befbf6bf0 U stephan -Z 1f778f59dd3029d05607c051f27c5963 +Z 4091a24d92e7409613201f686c9db113 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 274efd1e8c..d99bcbb45f 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -0cfb9e234e116741d01b65d0abf18210e495276319fb08ec6e40d3f2e698956d +9ffe94d2ea0b3679c3d2657e2c3b67f84c09e9bcbbe0a13c76d58858df367d1b From c2d56ea4ea131ee09d0dbd09e96ba5d511d96ee0 Mon Sep 17 00:00:00 2001 From: stephan Date: Sun, 16 Feb 2025 18:14:05 +0000 Subject: [PATCH 114/194] Re-add the --disable-static-shell configure feature to the autoconf bundle. It got lost in the autoconf-to-autosetup port, as reported in [forum:cc219ee7044|forum post cc219ee7044]. FossilOrigin-Name: 47e817f663468ce08dae4965b7ecacefb921a77398ec958b35bf5cedee767e24 --- autoconf/Makefile.in | 15 ++++++++++++--- autoconf/auto.def | 1 + autosetup/sqlite-config.tcl | 4 ++++ manifest | 16 ++++++++-------- manifest.uuid | 2 +- 5 files changed, 26 insertions(+), 12 deletions(-) diff --git a/autoconf/Makefile.in b/autoconf/Makefile.in index d7cc0e946f..b186f498b9 100644 --- a/autoconf/Makefile.in +++ b/autoconf/Makefile.in @@ -202,12 +202,21 @@ install-lib: install-lib-$(ENABLE_LIB_STATIC) install: install-lib -sqlite3$(T.exe): $(TOP)/shell.c $(TOP)/sqlite3.c +# Flags to link the shell app either directly against sqlite3.c +# (ENABLE_STATIC_SHELL==1) or libsqlite3.so (ENABLE_STATIC_SHELL==0). +# +ENABLE_STATIC_SHELL = @ENABLE_STATIC_SHELL@ +sqlite3-shell-link-flags.1 = $(TOP)/sqlite3.c $(LDFLAGS.libsqlite3) +sqlite3-shell-link-flags.0 = -L. -lsqlite3 $(LDFLAGS.zlib) +sqlite3-shell-deps.1 = $(TOP)/sqlite3.c +sqlite3-shell-deps.0 = $(libsqlite3.SO) +sqlite3$(T.exe): $(TOP)/shell.c $(sqlite3-shell-deps.$(ENABLE_STATIC_SHELL)) $(CC) -o $@ \ - $(TOP)/shell.c $(TOP)/sqlite3.c \ + $(TOP)/shell.c $(sqlite3-shell-link-flags.$(ENABLE_STATIC_SHELL)) \ -I. $(OPT_FEATURE_FLAGS) $(SHELL_OPT) \ $(CFLAGS) $(CFLAGS.readline) $(CFLAGS.icu) \ - $(LDFLAGS) $(LDFLAGS.libsqlite3) $(LDFLAGS.readline) + $(LDFLAGS) $(LDFLAGS.readline) + all: sqlite3$(T.exe) install-shell: sqlite3$(T.exe) $(install-dir.bin) diff --git a/autoconf/auto.def b/autoconf/auto.def index bb8710378f..099b52aff7 100644 --- a/autoconf/auto.def +++ b/autoconf/auto.def @@ -22,6 +22,7 @@ sqlite-handle-load-extension sqlite-handle-math sqlite-handle-icu +define ENABLE_STATIC_SHELL [opt-bool static-shell] define ENABLE_LIB_SHARED [opt-bool shared] define ENABLE_LIB_STATIC [opt-bool static] diff --git a/autosetup/sqlite-config.tcl b/autosetup/sqlite-config.tcl index ccb114868c..4416372951 100644 --- a/autosetup/sqlite-config.tcl +++ b/autosetup/sqlite-config.tcl @@ -259,6 +259,10 @@ proc sqlite-config-bootstrap {buildMode} { linemacros => {Enable #line macros in the amalgamation} dynlink-tools => {Dynamically link libsqlite3 to certain tools which normally statically embed it} } + {autoconf} { + # --disable-static-shell: https://sqlite.org/forum/forumpost/cc219ee704 + static-shell=1 => {Link the sqlite3 shell app against the DLL instead of embedding sqlite3.c} + } {*} { dump-defines=0 => {Dump autosetup defines to $::sqliteConfig(dump-defines-txt) (for build debugging)} } diff --git a/manifest b/manifest index afcb520cfa..8d78e7da63 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Update\sautoconf/Makefile.msc\sfrom\stool/mkmsvcmin.tcl. -D 2025-02-16T13:49:18.989 +C Re-add\sthe\s--disable-static-shell\sconfigure\sfeature\sto\sthe\sautoconf\sbundle.\sIt\sgot\slost\sin\sthe\sautoconf-to-autosetup\sport,\sas\sreported\sin\s[forum:cc219ee7044|forum\spost\scc219ee7044]. +D 2025-02-16T18:14:05.950 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d @@ -16,11 +16,11 @@ F art/sqlite370.jpg d512473dae7e378a67e28ff96a34da7cb331def2 F art/sqlite370.svg 40b7e2fe8aac3add5d56dd86ab8d427a4eca5bcb3fe4f8946cb3794e1821d531 F auto.def eddf6aef976e2c1a56c0accc3244945e0b22ec6799074c40be160e5a9a5662b0 F autoconf/Makefile.fallback 22fe523eb36dfce31e0f6349f782eb084e86a5620b2b0b4f84a2d6133f53f5ac -F autoconf/Makefile.in 5e5ab43450b27e7247a0066f0606c5471e72f935c59ac3ba40038e23ebce92d5 +F autoconf/Makefile.in 491e16a002c19263af3aeba857ca4619d2e8ad8550f6c9cea89ba0385fdd4344 F autoconf/Makefile.msc 1249e425a24859c7b3f17575275247df9eec3bddc0d1d7e73941f1abdbb95a92 F autoconf/README.first f1d3876e9a7852c22f275a6f06814e64934cecbc0b5b9617d64849094c1fd136 F autoconf/README.txt 7f01dc3915e2d68f329011073662369e62a0938a2c69398807823c57591cb288 -F autoconf/auto.def 9af634c6d51fa4b82c9bb61b51249ca087f2cbe09c7c3c31f920759082a1ffdb +F autoconf/auto.def 3a318c4898024b35ed61a4876a42e3dcc313f93bd8486874d1ad498b88643d1a F autoconf/tea/Makefile.in ba0556fee8da09c066bad85a4457904e46ee2c2eabaa309c0e83a78f2f151a8e F autoconf/tea/README.txt 61e62e519579e4a112791354d6d440f8b51ea6db3b0bab58d59f29df42d2dfe3 F autoconf/tea/aclocal.m4 52c47aac44ce0ddb1f918b6993e8beb8eee88f43 @@ -50,7 +50,7 @@ F autosetup/cc.tcl c0fcc50ca91deff8741e449ddad05bcd08268bc31177e613a6343bbd1fd3e F autosetup/jimsh0.c 6573f6bc6ff204de0139692648d7037ca0b6c067bac83a7b4e087f20a86866a4 F autosetup/pkg-config.tcl 4e635bf39022ff65e0d5434339dd41503ea48fc53822c9c5bde88b02d3d952ba F autosetup/proj.tcl cef1e0aa0f2dee2042af66f28c97a9445f84d55d858ba9db4f6116846a1a325f -F autosetup/sqlite-config.tcl 17b5417841c402dcf8f656749be6fcff651f3360c48afcdc01aad375fe414fec +F autosetup/sqlite-config.tcl 671b79027b162b9d945367d288cf82a9f6c7bd834c7b6812a24084f9ecf763ea F autosetup/system.tcl 51d4be76cd9a9074704b584e5c9cbba616202c8468cf9ba8a4f8294a7ab1dba9 F configure 9a00b21dfd13757bbfb8d89b30660a89ec1f8f3a79402b8f9f9b6fc475c3303a x F contrib/sqlitecon.tcl 210a913ad63f9f991070821e599d600bd913e0ad @@ -2207,8 +2207,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P 0cfb9e234e116741d01b65d0abf18210e495276319fb08ec6e40d3f2e698956d -R 9c4f553142a0ea668666d37befbf6bf0 +P 9ffe94d2ea0b3679c3d2657e2c3b67f84c09e9bcbbe0a13c76d58858df367d1b +R 98921f713d8fbfbddc4ac85a3af675c9 U stephan -Z 4091a24d92e7409613201f686c9db113 +Z e6ed162aea3b5e30451735f568dc1c13 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index d99bcbb45f..dbd9d9bc69 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -9ffe94d2ea0b3679c3d2657e2c3b67f84c09e9bcbbe0a13c76d58858df367d1b +47e817f663468ce08dae4965b7ecacefb921a77398ec958b35bf5cedee767e24 From 3cc3898e13e903e620f9e471313fc4f290dc5c14 Mon Sep 17 00:00:00 2001 From: stephan Date: Sun, 16 Feb 2025 19:16:09 +0000 Subject: [PATCH 115/194] Internal reordering/re-grouping of some configure flags. No functional changes. FossilOrigin-Name: 0c085a5ab51d6ac793a147a865bd086b1a6a572932c251b38d3854e4ea802f8d --- autosetup/sqlite-config.tcl | 44 ++++++++++++++++++------------------- manifest | 12 +++++----- manifest.uuid | 2 +- 3 files changed, 29 insertions(+), 29 deletions(-) diff --git a/autosetup/sqlite-config.tcl b/autosetup/sqlite-config.tcl index 4416372951..7d9a9ea84b 100644 --- a/autosetup/sqlite-config.tcl +++ b/autosetup/sqlite-config.tcl @@ -237,6 +237,28 @@ proc sqlite-config-bootstrap {buildMode} { } } + # Options primarily for downstream packagers/package maintainers + packaging { + {autoconf} { + # --disable-static-shell: https://sqlite.org/forum/forumpost/cc219ee704 + static-shell=1 => {Link the sqlite3 shell app against the DLL instead of embedding sqlite3.c} + } + {*} { + # soname: https://sqlite.org/src/forumpost/5a3b44f510df8ded + soname:=legacy + => {SONAME for libsqlite3.so. "none", or not using this flag, sets no + soname. "legacy" sets it to its historical value of + libsqlite3.so.0. A value matching the glob "libsqlite3.*" sets + it to that literal value. Any other value is assumed to be a + suffix which gets applied to "libsqlite3.so.", + e.g. --soname=9.10 equates to "libsqlite3.so.9.10".} + # out-implib: https://sqlite.org/forum/forumpost/0c7fc097b2 + out-implib=0 + => {Enable use of --out-implib linker flag to generate an + "import library" for the DLL} + } + } + # Options mostly for sqlite's own development developer { {*} { @@ -259,32 +281,10 @@ proc sqlite-config-bootstrap {buildMode} { linemacros => {Enable #line macros in the amalgamation} dynlink-tools => {Dynamically link libsqlite3 to certain tools which normally statically embed it} } - {autoconf} { - # --disable-static-shell: https://sqlite.org/forum/forumpost/cc219ee704 - static-shell=1 => {Link the sqlite3 shell app against the DLL instead of embedding sqlite3.c} - } {*} { dump-defines=0 => {Dump autosetup defines to $::sqliteConfig(dump-defines-txt) (for build debugging)} } } - - # Options specifically for downstream package maintainers - packaging { - {*} { - # soname: https://sqlite.org/src/forumpost/5a3b44f510df8ded - soname:=legacy - => {SONAME for libsqlite3.so. "none", or not using this flag, sets no - soname. "legacy" sets it to its historical value of - libsqlite3.so.0. A value matching the glob "libsqlite3.*" sets - it to that literal value. Any other value is assumed to be a - suffix which gets applied to "libsqlite3.so.", - e.g. --soname=9.10 equates to "libsqlite3.so.9.10".} - # out-implib: https://sqlite.org/forum/forumpost/0c7fc097b2 - out-implib=0 - => {Enable use of --out-implib linker flag to generate an - "import library" for the DLL} - } - } }; # $allOpts # Filter allOpts to create the set of [options] legal for this build diff --git a/manifest b/manifest index 8d78e7da63..1c68ce988d 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Re-add\sthe\s--disable-static-shell\sconfigure\sfeature\sto\sthe\sautoconf\sbundle.\sIt\sgot\slost\sin\sthe\sautoconf-to-autosetup\sport,\sas\sreported\sin\s[forum:cc219ee7044|forum\spost\scc219ee7044]. -D 2025-02-16T18:14:05.950 +C Internal\sreordering/re-grouping\sof\ssome\sconfigure\sflags.\sNo\sfunctional\schanges. +D 2025-02-16T19:16:09.834 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d @@ -50,7 +50,7 @@ F autosetup/cc.tcl c0fcc50ca91deff8741e449ddad05bcd08268bc31177e613a6343bbd1fd3e F autosetup/jimsh0.c 6573f6bc6ff204de0139692648d7037ca0b6c067bac83a7b4e087f20a86866a4 F autosetup/pkg-config.tcl 4e635bf39022ff65e0d5434339dd41503ea48fc53822c9c5bde88b02d3d952ba F autosetup/proj.tcl cef1e0aa0f2dee2042af66f28c97a9445f84d55d858ba9db4f6116846a1a325f -F autosetup/sqlite-config.tcl 671b79027b162b9d945367d288cf82a9f6c7bd834c7b6812a24084f9ecf763ea +F autosetup/sqlite-config.tcl e1d65cc632e1de94ff39618ac82b649f2062f674ca36dae78ab3573cab096761 F autosetup/system.tcl 51d4be76cd9a9074704b584e5c9cbba616202c8468cf9ba8a4f8294a7ab1dba9 F configure 9a00b21dfd13757bbfb8d89b30660a89ec1f8f3a79402b8f9f9b6fc475c3303a x F contrib/sqlitecon.tcl 210a913ad63f9f991070821e599d600bd913e0ad @@ -2207,8 +2207,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P 9ffe94d2ea0b3679c3d2657e2c3b67f84c09e9bcbbe0a13c76d58858df367d1b -R 98921f713d8fbfbddc4ac85a3af675c9 +P 47e817f663468ce08dae4965b7ecacefb921a77398ec958b35bf5cedee767e24 +R 969cb5a3f034581c276e9924fba081e4 U stephan -Z e6ed162aea3b5e30451735f568dc1c13 +Z e3597b532b91bea5961ce10f269dd158 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index dbd9d9bc69..70121ce06d 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -47e817f663468ce08dae4965b7ecacefb921a77398ec958b35bf5cedee767e24 +0c085a5ab51d6ac793a147a865bd086b1a6a572932c251b38d3854e4ea802f8d From 59c64e086abcd938662c63a331683f34a39f696a Mon Sep 17 00:00:00 2001 From: drh <> Date: Mon, 17 Feb 2025 10:58:23 +0000 Subject: [PATCH 116/194] Fix a typo (a missing ")") in a comment that is used to generate documentation. No changes to code. FossilOrigin-Name: ea21685658df8246551650666ff59945ac27271b10a675104cbadaf57d48595f --- manifest | 14 +++++++------- manifest.uuid | 2 +- src/sqlite.h.in | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/manifest b/manifest index 1c68ce988d..836882a5fa 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Internal\sreordering/re-grouping\sof\ssome\sconfigure\sflags.\sNo\sfunctional\schanges. -D 2025-02-16T19:16:09.834 +C Fix\sa\stypo\s(a\smissing\s")")\sin\sa\scomment\sthat\sis\sused\sto\sgenerate\ndocumentation.\s\sNo\schanges\sto\scode. +D 2025-02-17T10:58:23.329 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d @@ -780,7 +780,7 @@ F src/resolve.c 626c24b258b111f75c22107aa5614ad89810df3026f5ca071116d3fe75925c75 F src/rowset.c 8432130e6c344b3401a8874c3cb49fefe6873fec593294de077afea2dce5ec97 F src/select.c 57893cc8b099f231f7ed5b84faff14841f2aabb4776e32e17fae00aeae0a8993 F src/shell.c.in b377a59822f207106424f08aead37e78b609222e98f86f04cc8a03563ccf3237 -F src/sqlite.h.in d2902f13ace94d3d3609646bd6d12a2d7a4f6cbdf6a5a4097580ac305f54c3f0 +F src/sqlite.h.in 16e92876a50762b860e8855dadb3448880aaaa8da42b7b5a73d7a5afff54305e F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8 F src/sqlite3ext.h 3f046c04ea3595d6bfda99b781926b17e672fd6d27da2ba6d8d8fc39981dcb54 F src/sqliteInt.h 8cbfef6c26efd539eb93011905f4d3ce7fdb77475d1280764d86f9e7954c464b @@ -2207,8 +2207,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P 47e817f663468ce08dae4965b7ecacefb921a77398ec958b35bf5cedee767e24 -R 969cb5a3f034581c276e9924fba081e4 -U stephan -Z e3597b532b91bea5961ce10f269dd158 +P 0c085a5ab51d6ac793a147a865bd086b1a6a572932c251b38d3854e4ea802f8d +R b319f27049b560368bfb8eee14269c8c +U drh +Z 1ed7fde276b92255807656366cd0eace # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 70121ce06d..5c4a155602 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -0c085a5ab51d6ac793a147a865bd086b1a6a572932c251b38d3854e4ea802f8d +ea21685658df8246551650666ff59945ac27271b10a675104cbadaf57d48595f diff --git a/src/sqlite.h.in b/src/sqlite.h.in index a9eb5fed72..52968a20c7 100644 --- a/src/sqlite.h.in +++ b/src/sqlite.h.in @@ -2239,7 +2239,7 @@ struct sqlite3_mem_methods { ** The SQLITE_DBCONFIG_LOOKASIDE option takes three arguments, not two, ** so that a call to [sqlite3_db_config()] that uses SQLITE_DBCONFIG_LOOKASIDE ** should have a total of five parameters. -** ^The first argument (the third parameter to [sqlite3_db_config()] is a +** ^The first argument (the third parameter to [sqlite3_db_config()]) is a ** pointer to a memory buffer to use for lookaside memory. ** ^The first argument after the SQLITE_DBCONFIG_LOOKASIDE verb ** may be NULL in which case SQLite will allocate the From 56d2fd008b108109f489339f5fd55212bb50afd4 Mon Sep 17 00:00:00 2001 From: drh <> Date: Mon, 17 Feb 2025 14:16:49 +0000 Subject: [PATCH 117/194] Harden the SQLITE_DBCONFIG_LOOKASIDE interface against misuse, such as described in [forum:/forumpost/48f365daec|forum post 48f365daec]. Enhancements to the SQLITE_DBCONFIG_LOOKASIDE documentation. Test cases in TH3. FossilOrigin-Name: 1ec4c308c76c69fba031184254fc3340f07607cfbf8342b13713ab445563d377 --- manifest | 14 +++++------ manifest.uuid | 2 +- src/main.c | 42 ++++++++++++++++++++------------- src/sqlite.h.in | 62 +++++++++++++++++++++++++++++++++---------------- 4 files changed, 76 insertions(+), 44 deletions(-) diff --git a/manifest b/manifest index 836882a5fa..a4fe1e8034 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Fix\sa\stypo\s(a\smissing\s")")\sin\sa\scomment\sthat\sis\sused\sto\sgenerate\ndocumentation.\s\sNo\schanges\sto\scode. -D 2025-02-17T10:58:23.329 +C Harden\sthe\sSQLITE_DBCONFIG_LOOKASIDE\sinterface\sagainst\smisuse,\ssuch\sas\ndescribed\sin\s[forum:/forumpost/48f365daec|forum\spost\s48f365daec].\s\sEnhancements\nto\sthe\sSQLITE_DBCONFIG_LOOKASIDE\sdocumentation.\s\sTest\scases\sin\sTH3. +D 2025-02-17T14:16:49.747 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d @@ -742,7 +742,7 @@ F src/insert.c 05e04ef637cbc0dccb9a5c5d188a5a2608891e554c8ec17c7a71afe2cf896a06 F src/json.c 2663a0c7e574cb928de944720dcdcc11c931877d877549b8f1258a4002efd6f7 F src/legacy.c d7874bc885906868cd51e6c2156698f2754f02d9eee1bae2d687323c3ca8e5aa F src/loadext.c 7432c944ff197046d67a1207790a1b13eec4548c85a9457eb0896bb3641dfb36 -F src/main.c b99d15d843f7a86adbec855de77b1656dde07359722ef63a9d9393678dbb58d1 +F src/main.c 2650f54f7c2aa2c53cc61b571bad9c7c32d60400e3f6a270bd444f5d76e03eb8 F src/malloc.c 410e570b30c26cc36e3372577df50f7a96ee3eed5b2b161c6b6b48773c650c5e F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645 F src/mem1.c 3bb59158c38e05f6270e761a9f435bf19827a264c13d1631c58b84bdc96d73b2 @@ -780,7 +780,7 @@ F src/resolve.c 626c24b258b111f75c22107aa5614ad89810df3026f5ca071116d3fe75925c75 F src/rowset.c 8432130e6c344b3401a8874c3cb49fefe6873fec593294de077afea2dce5ec97 F src/select.c 57893cc8b099f231f7ed5b84faff14841f2aabb4776e32e17fae00aeae0a8993 F src/shell.c.in b377a59822f207106424f08aead37e78b609222e98f86f04cc8a03563ccf3237 -F src/sqlite.h.in 16e92876a50762b860e8855dadb3448880aaaa8da42b7b5a73d7a5afff54305e +F src/sqlite.h.in 8d4486fb28a90de818ac1e8c6206ea458e7de6bd8e0dfa3d554494f155be8c01 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8 F src/sqlite3ext.h 3f046c04ea3595d6bfda99b781926b17e672fd6d27da2ba6d8d8fc39981dcb54 F src/sqliteInt.h 8cbfef6c26efd539eb93011905f4d3ce7fdb77475d1280764d86f9e7954c464b @@ -2207,8 +2207,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P 0c085a5ab51d6ac793a147a865bd086b1a6a572932c251b38d3854e4ea802f8d -R b319f27049b560368bfb8eee14269c8c +P ea21685658df8246551650666ff59945ac27271b10a675104cbadaf57d48595f +R 178cf752f8b81a96b68c7190d2092e4d U drh -Z 1ed7fde276b92255807656366cd0eace +Z b489b8d8bee8421d4edf281585fd7758 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 5c4a155602..f2fb8fb0d3 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -ea21685658df8246551650666ff59945ac27271b10a675104cbadaf57d48595f +1ec4c308c76c69fba031184254fc3340f07607cfbf8342b13713ab445563d377 diff --git a/src/main.c b/src/main.c index 17d0cd434a..28a7216405 100644 --- a/src/main.c +++ b/src/main.c @@ -759,17 +759,22 @@ int sqlite3_config(int op, ...){ ** If lookaside is already active, return SQLITE_BUSY. ** ** The sz parameter is the number of bytes in each lookaside slot. -** The cnt parameter is the number of slots. If pStart is NULL the -** space for the lookaside memory is obtained from sqlite3_malloc(). -** If pStart is not NULL then it is sz*cnt bytes of memory to use for -** the lookaside memory. +** The cnt parameter is the number of slots. If pBuf is NULL the +** space for the lookaside memory is obtained from sqlite3_malloc() +** or similar. If pBuf is not NULL then it is sz*cnt bytes of memory +** to use for the lookaside memory. */ -static int setupLookaside(sqlite3 *db, void *pBuf, int sz, int cnt){ +static int setupLookaside( + sqlite3 *db, /* Database connection being configured */ + void *pBuf, /* Memory to use for lookaside. May be NULL */ + int sz, /* Desired size of each lookaside memory slot */ + int cnt /* Number of slots to allocate */ +){ #ifndef SQLITE_OMIT_LOOKASIDE - void *pStart; - sqlite3_int64 szAlloc = sz*(sqlite3_int64)cnt; - int nBig; /* Number of full-size slots */ - int nSm; /* Number smaller LOOKASIDE_SMALL-byte slots */ + void *pStart; /* Start of the lookaside buffer */ + sqlite3_int64 szAlloc; /* Total space set aside for lookaside memory */ + int nBig; /* Number of full-size slots */ + int nSm; /* Number smaller LOOKASIDE_SMALL-byte slots */ if( sqlite3LookasideUsed(db,0)>0 ){ return SQLITE_BUSY; @@ -782,17 +787,22 @@ static int setupLookaside(sqlite3 *db, void *pBuf, int sz, int cnt){ sqlite3_free(db->lookaside.pStart); } /* The size of a lookaside slot after ROUNDDOWN8 needs to be larger - ** than a pointer to be useful. + ** than a pointer and small enough to fit in a u16. */ - sz = ROUNDDOWN8(sz); /* IMP: R-33038-09382 */ + sz = ROUNDDOWN8(sz); if( sz<=(int)sizeof(LookasideSlot*) ) sz = 0; - if( cnt<0 ) cnt = 0; - if( sz==0 || cnt==0 ){ + if( sz>65528 ) sz = 65528; + /* Count must be at least 1 to be useful, but not so large as to use + ** more than 0x7fff0000 total bytes for lookaside. */ + if( cnt<1 ) cnt = 0; + if( sz>0 && cnt>(0x7fff0000/sz) ) cnt = 0x7fff0000/sz; + szAlloc = (i64)sz*(i64)cnt; + if( szAlloc==0 ){ sz = 0; pStart = 0; }else if( pBuf==0 ){ sqlite3BeginBenignMalloc(); - pStart = sqlite3Malloc( szAlloc ); /* IMP: R-61949-35727 */ + pStart = sqlite3Malloc( szAlloc ); sqlite3EndBenignMalloc(); if( pStart ) szAlloc = sqlite3MallocSize(pStart); }else{ @@ -801,10 +811,10 @@ static int setupLookaside(sqlite3 *db, void *pBuf, int sz, int cnt){ #ifndef SQLITE_OMIT_TWOSIZE_LOOKASIDE if( sz>=LOOKASIDE_SMALL*3 ){ nBig = szAlloc/(3*LOOKASIDE_SMALL+sz); - nSm = (szAlloc - sz*nBig)/LOOKASIDE_SMALL; + nSm = (szAlloc - (i64)sz*(i64)nBig)/LOOKASIDE_SMALL; }else if( sz>=LOOKASIDE_SMALL*2 ){ nBig = szAlloc/(LOOKASIDE_SMALL+sz); - nSm = (szAlloc - sz*nBig)/LOOKASIDE_SMALL; + nSm = (szAlloc - (i64)sz*(i64)nBig)/LOOKASIDE_SMALL; }else #endif /* SQLITE_OMIT_TWOSIZE_LOOKASIDE */ if( sz>0 ){ diff --git a/src/sqlite.h.in b/src/sqlite.h.in index 52968a20c7..43cc4962e9 100644 --- a/src/sqlite.h.in +++ b/src/sqlite.h.in @@ -1989,13 +1989,16 @@ struct sqlite3_mem_methods { ** ** [[SQLITE_CONFIG_LOOKASIDE]]
    SQLITE_CONFIG_LOOKASIDE
    **
    ^(The SQLITE_CONFIG_LOOKASIDE option takes two arguments that determine -** the default size of lookaside memory on each [database connection]. +** the default size of [lookaside memory] on each [database connection]. ** The first argument is the -** size of each lookaside buffer slot and the second is the number of -** slots allocated to each database connection.)^ ^(SQLITE_CONFIG_LOOKASIDE -** sets the default lookaside size. The [SQLITE_DBCONFIG_LOOKASIDE] -** option to [sqlite3_db_config()] can be used to change the lookaside -** configuration on individual connections.)^
    +** size of each lookaside buffer slot ("sz") and the second is the number of +** slots allocated to each database connection ("cnt").)^ +** ^(SQLITE_CONFIG_LOOKASIDE sets the default lookaside size. +** The [SQLITE_DBCONFIG_LOOKASIDE] option to [sqlite3_db_config()] can +** be used to change the lookaside configuration on individual connections.)^ +** The [-DSQLITE_DEFAULT_LOOKASIDE] option can be used to change the +** default lookaside configuration at compile-time. +** ** ** [[SQLITE_CONFIG_PCACHE2]]
    SQLITE_CONFIG_PCACHE2
    **
    ^(The SQLITE_CONFIG_PCACHE2 option takes a single argument which is @@ -2232,31 +2235,50 @@ struct sqlite3_mem_methods { ** [[SQLITE_DBCONFIG_LOOKASIDE]] **
    SQLITE_DBCONFIG_LOOKASIDE
    **
    The SQLITE_DBCONFIG_LOOKASIDE option is used to adjust the -** configuration of the lookaside memory allocator within a database +** configuration of the [lookaside memory allocator] within a database ** connection. ** The arguments to the SQLITE_DBCONFIG_LOOKASIDE option are not ** in the [DBCONFIG arguments|usual format]. ** The SQLITE_DBCONFIG_LOOKASIDE option takes three arguments, not two, ** so that a call to [sqlite3_db_config()] that uses SQLITE_DBCONFIG_LOOKASIDE ** should have a total of five parameters. -** ^The first argument (the third parameter to [sqlite3_db_config()]) is a +**
      +**

    1. The first argument ("buf") is a ** pointer to a memory buffer to use for lookaside memory. -** ^The first argument after the SQLITE_DBCONFIG_LOOKASIDE verb -** may be NULL in which case SQLite will allocate the -** lookaside buffer itself using [sqlite3_malloc()]. ^The second argument is the -** size of each lookaside buffer slot. ^The third argument is the number of -** slots. The size of the buffer in the first argument must be greater than -** or equal to the product of the second and third arguments. The buffer -** must be aligned to an 8-byte boundary. ^If the second argument to -** SQLITE_DBCONFIG_LOOKASIDE is not a multiple of 8, it is internally -** rounded down to the next smaller multiple of 8. ^(The lookaside memory +** The first argument may be NULL in which case SQLite will allocate the +** lookaside buffer itself using [sqlite3_malloc()]. +**

    2. The second argument ("sz") is the +** size of each lookaside buffer slot. Lookaside is disabled if "sz" +** is less than 8. The "sz" argument should be a multiple of 8 less than +** 65536. If "sz" does not meet this constraint, it is reduced in size until +** it does. +**

    3. The third argument ("cnt") is the number of slots. Lookaside is disabled +** if "cnt"is less than 1. The "cnt" value will be reduced, if necessary, so +** that the product of "sz" and "cnt" does not exceed 2,147,418,112. The "cnt" +** parameter is usually chosen so that the product of "sz" and "cnt" is less +** than 1,000,000. +**

    +**

    If the "buf" argument is not NULL, then it must +** point to a memory buffer with a size that is greater than +** or equal to the product of "sz" and "cnt". +** The buffer must be aligned to an 8-byte boundary. +** The lookaside memory ** configuration for a database connection can only be changed when that ** connection is not currently using lookaside memory, or in other words -** when the "current value" returned by -** [sqlite3_db_status](D,[SQLITE_DBSTATUS_LOOKASIDE_USED],...) is zero. +** when the value returned by [SQLITE_DBSTATUS_LOOKASIDE_USED] is zero. ** Any attempt to change the lookaside memory configuration when lookaside ** memory is in use leaves the configuration unchanged and returns -** [SQLITE_BUSY].)^

    +** [SQLITE_BUSY]. +** If the "buf" argument is NULL and an attempt +** to allocate memory based on "sz" and "cnt" fails, then +** lookaside is silently disabled. +**

    +** The [SQLITE_CONFIG_LOOKASIDE] configuration option can be used to set the +** default lookaside configuration at initialization. The +** [-DSQLITE_DEFAULT_LOOKASIDE] option can be used to set the default lookaside +** configuration at compile-time. Typical values for lookaside are 1200 for +** "sz" and 40 to 100 for "cnt". +** ** ** [[SQLITE_DBCONFIG_ENABLE_FKEY]] **

    SQLITE_DBCONFIG_ENABLE_FKEY
    From f6757b305a57c7df59e7b8de134946c7d35b4914 Mon Sep 17 00:00:00 2001 From: stephan Date: Mon, 17 Feb 2025 16:04:21 +0000 Subject: [PATCH 118/194] Replace TEXE (legacy name) with T.exe (3.48+ name) in two places in makefiles. This fixes distclean of jimsh.exe in the canonical build in non-native Windows environments. FossilOrigin-Name: edb8a78c0238f085eefbf86aa7777528f36f3400d4ef096ffd6855cf3321a97b --- Makefile.in | 2 +- main.mk | 2 +- manifest | 16 ++++++++-------- manifest.uuid | 2 +- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Makefile.in b/Makefile.in index 59a62d0618..1ff791c8ab 100644 --- a/Makefile.in +++ b/Makefile.in @@ -147,7 +147,7 @@ T.cc.sqlite += -D_HAVE_SQLITE_CONFIG_H -DBUILD_sqlite # shell command. # CFLAGS.jimsh = @CFLAGS_JIMSH@ -JIMSH = ./jimsh$(TEXE) +JIMSH = ./jimsh$(T.exe) # # $(B.tclsh) is documented in main.mk. diff --git a/main.mk b/main.mk index 00e519d216..6081fbdfd8 100644 --- a/main.mk +++ b/main.mk @@ -1708,7 +1708,7 @@ fuzztest: fuzzcheck$(T.exe) $(FUZZDATA) sessionfuzz$(T.exe) ./fuzzcheck$(T.exe) $(FUZZDATA) ./sessionfuzz$(T.exe) run $(TOP)/test/sessionfuzz-data1.db -valgrindfuzz: fuzzcheck$(TEXT) $(FUZZDATA) sessionfuzz$(T.exe) +valgrindfuzz: fuzzcheck$(T.exe) $(FUZZDATA) sessionfuzz$(T.exe) valgrind ./fuzzcheck$(T.exe) --cell-size-check --limit-mem 10M $(FUZZDATA) valgrind ./sessionfuzz$(T.exe) run $(TOP)/test/sessionfuzz-data1.db diff --git a/manifest b/manifest index a4fe1e8034..89d17bb2ce 100644 --- a/manifest +++ b/manifest @@ -1,9 +1,9 @@ -C Harden\sthe\sSQLITE_DBCONFIG_LOOKASIDE\sinterface\sagainst\smisuse,\ssuch\sas\ndescribed\sin\s[forum:/forumpost/48f365daec|forum\spost\s48f365daec].\s\sEnhancements\nto\sthe\sSQLITE_DBCONFIG_LOOKASIDE\sdocumentation.\s\sTest\scases\sin\sTH3. -D 2025-02-17T14:16:49.747 +C Replace\sTEXE\s(legacy\sname)\swith\sT.exe\s(3.48+\sname)\sin\stwo\splaces\sin\smakefiles.\sThis\sfixes\sdistclean\sof\sjimsh.exe\sin\sthe\scanonical\sbuild\sin\snon-native\sWindows\senvironments. +D 2025-02-17T16:04:21.900 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d -F Makefile.in aa869faf7ca086f35c9b3e974fddc7fd65ed2dc45a246b1a94e6f9fdc99b0ed5 +F Makefile.in 80be2e281d4647ac15a5bac15d5d20fc76d1cfb3f3f6dc01d1a26e3346a5042a F Makefile.linux-generic bd3e3cacd369821a6241d4ea1967395c962dfe3057e38cb0a435cee0e8b789d0 F Makefile.msc 50c656e096ae49ccf9e5e88b4995f0a155f231ebae5b6d185cc64ce99d728a83 F README.md c3c0f19532ce28f6297a71870f3c7b424729f0e6d9ab889616d3587dd2332159 @@ -702,7 +702,7 @@ F ext/wasm/tests/opfs/concurrency/test.js d08889a5bb6e61937d0b8cbb78c9efbefbf65a F ext/wasm/tests/opfs/concurrency/worker.js 0a8c1a3e6ebb38aabbee24f122693f1fb29d599948915c76906681bb7da1d3d2 F ext/wasm/wasmfs.make 68999f5bd8c489239592d59a420f8c627c99169bbd6fa16a404751f757b9f702 F magic.txt 5ade0bc977aa135e79e3faaea894d5671b26107cc91e70783aa7dc83f22f3ba0 -F main.mk 840f0b3ac055a026930e52eb9d6300753e91ddd9fcbafe30395201908ad35e61 +F main.mk 323e71cd79e49c9e33d39b6558694a71c08973d9ac3ee4f211aa32e58bd876f5 F mptest/config01.test 3c6adcbc50b991866855f1977ff172eb6d901271 F mptest/config02.test 4415dfe36c48785f751e16e32c20b077c28ae504 F mptest/crash01.test 61e61469e257df0850df4293d7d4d6c2af301421 @@ -2207,8 +2207,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P ea21685658df8246551650666ff59945ac27271b10a675104cbadaf57d48595f -R 178cf752f8b81a96b68c7190d2092e4d -U drh -Z b489b8d8bee8421d4edf281585fd7758 +P 1ec4c308c76c69fba031184254fc3340f07607cfbf8342b13713ab445563d377 +R 04096de493525d9bda4b4505f3bd6b4f +U stephan +Z fb1f31bb07ada248f4e4b04a26bc9aeb # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index f2fb8fb0d3..1b2fe3d822 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -1ec4c308c76c69fba031184254fc3340f07607cfbf8342b13713ab445563d377 +edb8a78c0238f085eefbf86aa7777528f36f3400d4ef096ffd6855cf3321a97b From ad5dcff53bfb93d0e2ce8165fc2d63f83edd4c79 Mon Sep 17 00:00:00 2001 From: stephan Date: Mon, 17 Feb 2025 16:14:15 +0000 Subject: [PATCH 119/194] Add two generated files to the distclean rules of the autoconf bundle. FossilOrigin-Name: b59d0ebb22e4ca2f3a7a73dd49a0c142dbca538cb1b4eafd35a78bac87c6c456 --- autoconf/Makefile.in | 2 +- manifest | 12 ++++++------ manifest.uuid | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/autoconf/Makefile.in b/autoconf/Makefile.in index b186f498b9..d494e9d1e0 100644 --- a/autoconf/Makefile.in +++ b/autoconf/Makefile.in @@ -240,7 +240,7 @@ clean: rm -f $(libsqlite3.LIB) $(libsqlite3.SO) $(libsqlite3.SO).a distclean: clean - rm -f jimsh0$(T.exe) config.* sqlite3.pc + rm -f jimsh0$(T.exe) config.* sqlite3.pc sqlite_cfg.h Makefile DIST_FILES := \ README.txt VERSION \ diff --git a/manifest b/manifest index 89d17bb2ce..826c33b244 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Replace\sTEXE\s(legacy\sname)\swith\sT.exe\s(3.48+\sname)\sin\stwo\splaces\sin\smakefiles.\sThis\sfixes\sdistclean\sof\sjimsh.exe\sin\sthe\scanonical\sbuild\sin\snon-native\sWindows\senvironments. -D 2025-02-17T16:04:21.900 +C Add\stwo\sgenerated\sfiles\sto\sthe\sdistclean\srules\sof\sthe\sautoconf\sbundle. +D 2025-02-17T16:14:15.880 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d @@ -16,7 +16,7 @@ F art/sqlite370.jpg d512473dae7e378a67e28ff96a34da7cb331def2 F art/sqlite370.svg 40b7e2fe8aac3add5d56dd86ab8d427a4eca5bcb3fe4f8946cb3794e1821d531 F auto.def eddf6aef976e2c1a56c0accc3244945e0b22ec6799074c40be160e5a9a5662b0 F autoconf/Makefile.fallback 22fe523eb36dfce31e0f6349f782eb084e86a5620b2b0b4f84a2d6133f53f5ac -F autoconf/Makefile.in 491e16a002c19263af3aeba857ca4619d2e8ad8550f6c9cea89ba0385fdd4344 +F autoconf/Makefile.in 844bc155e1c02075821530b2b4d996ab3d162e647352bb6e2895f3d0e64ad988 F autoconf/Makefile.msc 1249e425a24859c7b3f17575275247df9eec3bddc0d1d7e73941f1abdbb95a92 F autoconf/README.first f1d3876e9a7852c22f275a6f06814e64934cecbc0b5b9617d64849094c1fd136 F autoconf/README.txt 7f01dc3915e2d68f329011073662369e62a0938a2c69398807823c57591cb288 @@ -2207,8 +2207,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P 1ec4c308c76c69fba031184254fc3340f07607cfbf8342b13713ab445563d377 -R 04096de493525d9bda4b4505f3bd6b4f +P edb8a78c0238f085eefbf86aa7777528f36f3400d4ef096ffd6855cf3321a97b +R 35984cc59a3a13710af92ec281a18a95 U stephan -Z fb1f31bb07ada248f4e4b04a26bc9aeb +Z b005a16738a1a2fa13fe8f4e242441b2 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 1b2fe3d822..3431f51c49 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -edb8a78c0238f085eefbf86aa7777528f36f3400d4ef096ffd6855cf3321a97b +b59d0ebb22e4ca2f3a7a73dd49a0c142dbca538cb1b4eafd35a78bac87c6c456 From ef86b942b9ffbfc2086da7865effea3e7950c7a0 Mon Sep 17 00:00:00 2001 From: drh <> Date: Mon, 17 Feb 2025 17:33:14 +0000 Subject: [PATCH 120/194] Code changes that make it easier to prove that no 32-bit integer overflows happen during memory allocation. No problems fixed; this change is just to make future maintenance easier. FossilOrigin-Name: 215650a5a1d55bdbca9c92524804a1a54456a17f42a17e53747b21a6507506f5 --- manifest | 50 ++++++++++++++++++++++++------------------------- manifest.uuid | 2 +- src/analyze.c | 2 +- src/attach.c | 2 +- src/bitvec.c | 2 +- src/btree.c | 5 +++-- src/build.c | 24 ++++++++++++++++-------- src/expr.c | 2 +- src/func.c | 2 +- src/memdb.c | 4 ++-- src/os_win.c | 19 +++++++++---------- src/pager.c | 30 ++++++++++++++++------------- src/pcache1.c | 8 ++++---- src/printf.c | 2 +- src/sqliteInt.h | 8 ++++++++ src/vdbe.c | 10 +++++----- src/vdbeapi.c | 7 +++++-- src/vdbeaux.c | 5 +++-- src/vdbemem.c | 4 ++-- src/vdbesort.c | 6 ++++-- src/wal.c | 2 +- 21 files changed, 111 insertions(+), 85 deletions(-) diff --git a/manifest b/manifest index 826c33b244..1e1fb70b59 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Add\stwo\sgenerated\sfiles\sto\sthe\sdistclean\srules\sof\sthe\sautoconf\sbundle. -D 2025-02-17T16:14:15.880 +C Code\schanges\sthat\smake\sit\seasier\sto\sprove\sthat\sno\s32-bit\sinteger\soverflows\nhappen\sduring\smemory\sallocation.\s\sNo\sproblems\sfixed;\sthis\schange\sis\sjust\nto\smake\sfuture\smaintenance\seasier. +D 2025-02-17T17:33:14.937 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d @@ -713,26 +713,26 @@ F sqlite.pc.in 42b7bf0d02e08b9e77734a47798d1a55a9e0716b F sqlite3.1 acdff36db796e2d00225b911d3047d580cd136547298435426ce9d40347973cc F sqlite3.pc.in 0977c03a4da7c4204bd60e784a0efb8d51a190448aba78a4e973fe7192bdaf03 F src/alter.c 1751e231d8385067fa0d0145f0d461a092db6bd3d7edbfc3172db625aceccd9a -F src/analyze.c 0823d2edb3ce564157e9d62714cc729027933209b712e95fbabb23e47fff0aec -F src/attach.c 3a5cb9ee4aad6c5b22268287340a4f2f7b07959b7a522201be30fee23cd802e9 +F src/analyze.c 6d27b425a16817975e6a4f8501e531d13dd1bf4b53bff2329dbc1f301aeef82d +F src/attach.c c36d9d82811e2274bd06bf3b34459e36d8ae8a7f32efa5cbf3f890eef08a9987 F src/auth.c 54ab9c6c5803b47c0d45b76ce27eff22a03b4b1f767c5945a3a4eb13aa4c78dc F src/backup.c 5c97e8023aab1ce14a42387eb3ae00ba5a0644569e3476f38661fa6f824c3523 -F src/bitvec.c 9eac5f42c11914d5ef00a75605bb205e934f435c579687f985f1f8b0995c8645 +F src/bitvec.c d64aa60cd5f2721ebd6c155b3ac5ff7342086bead485239d57342cdfdccb9f50 F src/btmutex.c 79a43670447eacc651519a429f6ece9fd638563cf95b469d6891185ddae2b522 -F src/btree.c 63ca6b647342e8cef643863cd0962a542f133e1069460725ba4461dcda92b03c +F src/btree.c 9316859aa5f14bde4a3719ffb1570219e51c5de433221e38b87ea19db868aedf F src/btree.h 18e5e7b2124c23426a283523e5f31a4bff029131b795bb82391f9d2f3136fc50 F src/btreeInt.h 98aadb6dcb77b012cab2574d6a728fad56b337fc946839b9898c4b4c969e30b6 -F src/build.c 602fc45ea6301a3dc03ec20a9f9b294c492b7e1766ae96651f2ba8044dc445a6 +F src/build.c 2fa35745a279e2a17eec6df67a3cd35d456c136a7f5c75e80bdd6c5658423b60 F src/callback.c acae8c8dddda41ee85cfdf19b926eefe830f371069f8aadca3aa39adf5b1c859 F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e F src/date.c 842c08ac143a56a627b05ac51d68624f2b7b03e3b4cba596205e735eed64ee57 F src/dbpage.c 2e677acb658a29965e55398bbc61161cb7819da538057c8032adac7ab8e4a8c0 F src/dbstat.c 73362c0df0f40ad5523a6f5501224959d0976757b511299bf892313e79d14f5c F src/delete.c 03a77ba20e54f0f42ebd8eddf15411ed6bdb06a2c472ac4b6b336521bf7cea42 -F src/expr.c ca943270395374afc65256ce86cdb152a22fa6ff146895175833b89ba870e117 +F src/expr.c 6e0635f3e3761f368d10e77d26d29a1a521ab208f1be66e84c13354ffbcf5ad2 F src/fault.c 460f3e55994363812d9d60844b2a6de88826e007 F src/fkey.c 928ed2517e8732113d2b9821aa37af639688d752f4ea9ac6e0e393d713eeb76f -F src/func.c 838bb4c02065daef6ef359cf294e6b6f95a73d4ff0159240a4710478bae80e1c +F src/func.c 6c8b7bbdc5b588f3cfc79ed5effcfd3031758f5034c464fcd8891e8010b4d317 F src/global.c a19e4b1ca1335f560e9560e590fc13081e21f670643367f99cb9e8f9dc7d615b F src/hash.c 73934a7f7ab1cb110614a9388cb516893b0cf5b7b69e4fd1a0780ac4ce166be7 F src/hash.h 46b92795a95bfefb210f52f0c316e9d7cdbcdd7e7fcfb0d8be796d3a5767cddf @@ -749,7 +749,7 @@ F src/mem1.c 3bb59158c38e05f6270e761a9f435bf19827a264c13d1631c58b84bdc96d73b2 F src/mem2.c c8bfc9446fd0798bddd495eb5d9dbafa7d4b7287d8c22d50a83ac9daa26d8a75 F src/mem3.c 30301196cace2a085cbedee1326a49f4b26deff0af68774ca82c1f7c06fda4f6 F src/mem5.c b7da5c10a726aacacc9ad7cdcb0667deec643e117591cc69cf9b4b9e7f3e96ff -F src/memdb.c 16679def118b5fd75292a253166d3feba3ec9c6189205bf209643ecdb2174ecc +F src/memdb.c a3feb427cdd4036ea2db0ba56d152f14c8212ca760ccb05fb7aa49ff6b897df3 F src/memjournal.c c283c6c95d940eb9dc70f1863eef3ee40382dbd35e5a1108026e7817c206e8a0 F src/msvc.h 80b35f95d93bf996ccb3e498535255f2ef1118c78764719a7cd15ab4106ccac9 F src/mutex.c 06bcd9c3dbf2d9b21fcd182606c00fafb9bfe0287983c8e17acd13d2c81a2fa9 @@ -764,17 +764,17 @@ F src/os_common.h 6c0eb8dd40ef3e12fe585a13e709710267a258e2c8dd1c40b1948a1d14582e F src/os_kv.c 4d39e1f1c180b11162c6dc4aa8ad34053873a639bac6baae23272fc03349986a F src/os_setup.h 6011ad7af5db4e05155f385eb3a9b4470688de6f65d6166b8956e58a3d872107 F src/os_unix.c 4c73f89479d90412cb736a180e9ef89ac1495a158753a7f5de1260c197bc8e1f -F src/os_win.c 49c7725b500f5867e8360e75eeb30f9d70b62fa1f05c8a101da627210578df32 +F src/os_win.c 2423a45e70c2cda01bfc84106f7e9f34feb1add42121ab2e35a67ba24589ac52 F src/os_win.h 7b073010f1451abe501be30d12f6bc599824944a -F src/pager.c 3a1c4e7f69af482e33c8cba8a75afe0dda0ea6391240adac22b040ce1bdeef44 +F src/pager.c 8d73e7a0ebbecd8bb4996ff285cc055cec56b7e3edb5a4609d0748e0fa39d28a F src/pager.h 6137149346e6c8a3ddc1eeb40aee46381e9bc8b0fcc6dda8a1efde993c2275b8 F src/parse.y f84673f1454e2bcf517623d4346e67fb2d73e57826ea103681ad5848238f6029 F src/pcache.c 588cc3c5ccaaadde689ed35ce5c5c891a1f7b1f4d1f56f6cf0143b74d8ee6484 F src/pcache.h 1497ce1b823cf00094bb0cf3bac37b345937e6f910890c626b16512316d3abf5 -F src/pcache1.c 49516ad7718a3626f28f710fa7448ef1fce3c07fd169acbb4817341950264319 +F src/pcache1.c 78d4935e510f7bed0fdd1a3f742c0e663b36a795f9dc7411161dc22bdae1245e F src/pragma.c c7ada272232e1182c4536d9637fa7b955a10bc1bd8d5a87d4dc9309dab827791 F src/prepare.c 1832be043fce7d489959aae6f994c452d023914714c4d5457beaed51c0f3d126 -F src/printf.c 96f7f8baeedc7639da94e4e7a4a2c200e2537c4eec9e5e1c2ffc821f40eb3105 +F src/printf.c b9ac740dfaf68552f5da1266be28ae2824b53a6b73d93425f7c6b2ef62457cbb F src/random.c 606b00941a1d7dd09c381d3279a058d771f406c5213c9932bbd93d5587be4b9c F src/resolve.c 626c24b258b111f75c22107aa5614ad89810df3026f5ca071116d3fe75925c75 F src/rowset.c 8432130e6c344b3401a8874c3cb49fefe6873fec593294de077afea2dce5ec97 @@ -783,7 +783,7 @@ F src/shell.c.in b377a59822f207106424f08aead37e78b609222e98f86f04cc8a03563ccf323 F src/sqlite.h.in 8d4486fb28a90de818ac1e8c6206ea458e7de6bd8e0dfa3d554494f155be8c01 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8 F src/sqlite3ext.h 3f046c04ea3595d6bfda99b781926b17e672fd6d27da2ba6d8d8fc39981dcb54 -F src/sqliteInt.h 8cbfef6c26efd539eb93011905f4d3ce7fdb77475d1280764d86f9e7954c464b +F src/sqliteInt.h 020aff180111b7dfe5bbdf8e59e8595c195b956488e9ca955f876cb7482e6de5 F src/sqliteLimit.h 1bbdbf72bd0411d003267ffebc59a262f061df5653027a75627d03f48ca30523 F src/status.c cb11f8589a6912af2da3bb1ec509a94dd8ef27df4d4c1a97e0bcf2309ece972b F src/table.c 0f141b58a16de7e2fbe81c308379e7279f4c6b50eb08efeec5892794a0ba30d1 @@ -847,19 +847,19 @@ F src/upsert.c 215328c3f91623c520ec8672c44323553f12caeb4f01b1090ebdca99fdf7b4f1 F src/utf.c 8b29d9a5956569ea2700f869669b8ef67a9662ee5e724ff77ab3c387e27094ba F src/util.c 9ff6470dabcf943fd796d2da766c98bd328c8f6fe036a31e5b338e628603f989 F src/vacuum.c b763b6457bd058d2072ef9364832351fd8d11e8abf70cbb349657360f7d55c40 -F src/vdbe.c 063763e08f1ad00890b7377fc663dbccec85a47630f5d2bbb13f3fdf77e06f78 +F src/vdbe.c e7567bed441a53c4ceb48d2bdf3d1747677fc296a91e8d2a0fe8facdb9b890ce F src/vdbe.h 3d26d5c7660c5c7bd33ffb0d8784615072d8b23c81f8110870efe2631136bc89 F src/vdbeInt.h 078b1c15b26587b54c1c1879d0d2f4dec812b9de4c337fed9faf73fbcc3bf091 -F src/vdbeapi.c 82fe278a7c71b653235c6f9fb5de0b5de589908dfcb011ba2a782e8becf06f86 -F src/vdbeaux.c 541d3d232714455960eab4ed10b34cb48b4bcd565d7539ef31092f5e73648e6b +F src/vdbeapi.c cb8eb9e41a16f5fa3ce5b8f3910edfbba336d10156cfb7a79f92cf7bf443977b +F src/vdbeaux.c d7ef1a0a7233589d789eda1ba9ffa4b0ea61fca9651e4f47fb4250d03d62bcaf F src/vdbeblob.c 9166b6eb7054e5da82e35255892fb1ed551355a4716452539e8e3ac14f25fbe3 -F src/vdbemem.c 4af21a948820259ced96e3d46d70f9af347afa2deb7cb60a8b3981d5748e4279 -F src/vdbesort.c d0a3c7056c081703c8b6d91ad60f17da5e062a5c64bf568ed0fa1b5f4cae311f +F src/vdbemem.c 571ae3116dbf840a62c4aaa6bc09d577dfef8ad4d3978cf37275bb5f9653217b +F src/vdbesort.c 3e8e6340ec5f68909a975031081102471300eaec9791d081b5443822e1061cda F src/vdbetrace.c fe0bc29ebd4e02c8bc5c1945f1d2e6be5927ec12c06d89b03ef2a4def34bf823 F src/vdbevtab.c fc46b9cbd759dc013f0b3724549cc0d71379183c667df3a5988f7e2f1bd485f3 F src/vtab.c 828221bdbeaaa6d62126ee6d07fd4ec0d09dcaea846f87ad01944d8b7e548859 F src/vxworks.h d2988f4e5a61a4dfe82c6524dd3d6e4f2ce3cdb9 -F src/wal.c 4e6181d8780ab0af2e1388d0754cbe6f2f04593d2b1ab6c41699a89942fd8997 +F src/wal.c cefdffc112c767c79596d9c0d15cb4de27071132e9b8a0fce323b140cd4af683 F src/wal.h ba252daaa94f889f4b2c17c027e823d9be47ce39da1d3799886bbd51f0490452 F src/walker.c d5006d6b005e4ea7302ad390957a8d41ed83faa177e412f89bc5600a7462a014 F src/where.c 09dc313e7223ca1217c39c7026b00f16ff449a8323511a762fcba7863a00f4cd @@ -2207,8 +2207,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P edb8a78c0238f085eefbf86aa7777528f36f3400d4ef096ffd6855cf3321a97b -R 35984cc59a3a13710af92ec281a18a95 -U stephan -Z b005a16738a1a2fa13fe8f4e242441b2 +P b59d0ebb22e4ca2f3a7a73dd49a0c142dbca538cb1b4eafd35a78bac87c6c456 +R a324a0ad4ec5bff22beea8348186f31d +U drh +Z e55663a48a3fa77210e8f8e7032e8f31 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 3431f51c49..cab7456372 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -b59d0ebb22e4ca2f3a7a73dd49a0c142dbca538cb1b4eafd35a78bac87c6c456 +215650a5a1d55bdbca9c92524804a1a54456a17f42a17e53747b21a6507506f5 diff --git a/src/analyze.c b/src/analyze.c index 799d43924c..58cea90caa 100644 --- a/src/analyze.c +++ b/src/analyze.c @@ -407,7 +407,7 @@ static void statInit( int nCol; /* Number of columns in index being sampled */ int nKeyCol; /* Number of key columns */ int nColUp; /* nCol rounded up for alignment */ - int n; /* Bytes of space to allocate */ + i64 n; /* Bytes of space to allocate */ sqlite3 *db = sqlite3_context_db_handle(context); /* Database connection */ #ifdef SQLITE_ENABLE_STAT4 /* Maximum number of samples. 0 if STAT4 data is not collected */ diff --git a/src/attach.c b/src/attach.c index 399a6cb537..f6c224710d 100644 --- a/src/attach.c +++ b/src/attach.c @@ -156,7 +156,7 @@ static void attachFunc( if( aNew==0 ) return; memcpy(aNew, db->aDb, sizeof(db->aDb[0])*2); }else{ - aNew = sqlite3DbRealloc(db, db->aDb, sizeof(db->aDb[0])*(db->nDb+1) ); + aNew = sqlite3DbRealloc(db, db->aDb, sizeof(db->aDb[0])*(1+(i64)db->nDb)); if( aNew==0 ) return; } db->aDb = aNew; diff --git a/src/bitvec.c b/src/bitvec.c index 13f87d5676..32bfade115 100644 --- a/src/bitvec.c +++ b/src/bitvec.c @@ -344,7 +344,7 @@ int sqlite3BitvecBuiltinTest(int sz, int *aOp){ /* Allocate the Bitvec to be tested and a linear array of ** bits to act as the reference */ pBitvec = sqlite3BitvecCreate( sz ); - pV = sqlite3MallocZero( (sz+7)/8 + 1 ); + pV = sqlite3MallocZero( (7+(i64)sz)/8 + 1 ); pTmpSpace = sqlite3_malloc64(BITVEC_SZ); if( pBitvec==0 || pV==0 || pTmpSpace==0 ) goto bitvec_end; diff --git a/src/btree.c b/src/btree.c index 49eb1d8037..97fbdf8d21 100644 --- a/src/btree.c +++ b/src/btree.c @@ -729,7 +729,7 @@ static int saveCursorKey(BtCursor *pCur){ ** below. */ void *pKey; pCur->nKey = sqlite3BtreePayloadSize(pCur); - pKey = sqlite3Malloc( pCur->nKey + 9 + 8 ); + pKey = sqlite3Malloc( ((i64)pCur->nKey) + 9 + 8 ); if( pKey ){ rc = sqlite3BtreePayload(pCur, 0, (int)pCur->nKey, pKey); if( rc==SQLITE_OK ){ @@ -6100,7 +6100,7 @@ bypass_moveto_root: rc = SQLITE_CORRUPT_PAGE(pPage); goto moveto_index_finish; } - pCellKey = sqlite3Malloc( nCell+nOverrun ); + pCellKey = sqlite3Malloc( (u64)nCell+(u64)nOverrun ); if( pCellKey==0 ){ rc = SQLITE_NOMEM_BKPT; goto moveto_index_finish; @@ -11289,6 +11289,7 @@ int sqlite3BtreeIsInBackup(Btree *p){ */ void *sqlite3BtreeSchema(Btree *p, int nBytes, void(*xFree)(void *)){ BtShared *pBt = p->pBt; + assert( nBytes==0 || nBytes==sizeof(Schema) ); sqlite3BtreeEnter(p); if( !pBt->pSchema && nBytes ){ pBt->pSchema = sqlite3DbMallocZero(0, nBytes); diff --git a/src/build.c b/src/build.c index 8f64d5ec30..986201bfb4 100644 --- a/src/build.c +++ b/src/build.c @@ -68,6 +68,7 @@ static SQLITE_NOINLINE void lockTable( } } + assert( pToplevel->nTableLock < 0x7fff0000 ); nBytes = sizeof(TableLock) * (pToplevel->nTableLock+1); pToplevel->aTableLock = sqlite3DbReallocOrFree(pToplevel->db, pToplevel->aTableLock, nBytes); @@ -2089,7 +2090,8 @@ static void identPut(char *z, int *pIdx, char *zSignedIdent){ ** from sqliteMalloc() and must be freed by the calling function. */ static char *createTableStmt(sqlite3 *db, Table *p){ - int i, k, n; + int i, k, len; + i64 n; char *zStmt; char *zSep, *zSep2, *zEnd; Column *pCol; @@ -2113,8 +2115,9 @@ static char *createTableStmt(sqlite3 *db, Table *p){ sqlite3OomFault(db); return 0; } - sqlite3_snprintf(n, zStmt, "CREATE TABLE "); - k = sqlite3Strlen30(zStmt); + assert( n>14 && n<=0x7fffffff ); + memcpy(zStmt, "CREATE TABLE ", 13); + k = 13; identPut(zStmt, &k, p->zName); zStmt[k++] = '('; for(pCol=p->aCol, i=0; inCol; i++, pCol++){ @@ -2126,13 +2129,15 @@ static char *createTableStmt(sqlite3 *db, Table *p){ /* SQLITE_AFF_REAL */ " REAL", /* SQLITE_AFF_FLEXNUM */ " NUM", }; - int len; const char *zType; - sqlite3_snprintf(n-k, &zStmt[k], zSep); - k += sqlite3Strlen30(&zStmt[k]); + len = sqlite3Strlen30(zSep); + assert( k+lenzCnName); + assert( kaffinity-SQLITE_AFF_BLOB >= 0 ); assert( pCol->affinity-SQLITE_AFF_BLOB < ArraySize(azType) ); testcase( pCol->affinity==SQLITE_AFF_BLOB ); @@ -2147,11 +2152,14 @@ static char *createTableStmt(sqlite3 *db, Table *p){ assert( pCol->affinity==SQLITE_AFF_BLOB || pCol->affinity==SQLITE_AFF_FLEXNUM || pCol->affinity==sqlite3AffinityType(zType, 0) ); + assert( k+lenop==TK_IN ); - zRet = sqlite3DbMallocRaw(pParse->db, nVal+1); + zRet = sqlite3DbMallocRaw(pParse->db, 1+(i64)nVal); if( zRet ){ int i; for(i=0; izPath); - pNew = sqlite3MallocZero( sizeof(*pShmNode) + nName + 17 ); + pNew = sqlite3MallocZero( sizeof(*pShmNode) + (i64)nName + 17 ); if( pNew==0 ){ sqlite3_free(p); return SQLITE_IOERR_NOMEM_BKPT; @@ -4759,7 +4759,7 @@ static int winGetTempname(sqlite3_vfs *pVfs, char **pzBuf){ size_t i, j; DWORD pid; int nPre = sqlite3Strlen30(SQLITE_TEMP_FILE_PREFIX); - int nMax, nBuf, nDir, nLen; + i64 nMax, nBuf, nDir, nLen; char *zBuf; /* It's odd to simulate an io-error here, but really this is just @@ -4771,7 +4771,8 @@ static int winGetTempname(sqlite3_vfs *pVfs, char **pzBuf){ /* Allocate a temporary buffer to store the fully qualified file ** name for the temporary file. If this fails, we cannot continue. */ - nMax = pVfs->mxPathname; nBuf = nMax + 2; + nMax = pVfs->mxPathname; + nBuf = 2 + (i64)nMax; zBuf = sqlite3MallocZero( nBuf ); if( !zBuf ){ OSTRACE(("TEMP-FILENAME rc=SQLITE_IOERR_NOMEM\n")); @@ -5630,7 +5631,7 @@ static int winFullPathnameNoMutex( ** for converting the relative path name to an absolute ** one by prepending the data directory and a slash. */ - char *zOut = sqlite3MallocZero( pVfs->mxPathname+1 ); + char *zOut = sqlite3MallocZero( 1+(u64)pVfs->mxPathname ); if( !zOut ){ return SQLITE_IOERR_NOMEM_BKPT; } @@ -5725,13 +5726,12 @@ static int winFullPathnameNoMutex( return winLogError(SQLITE_CANTOPEN_FULLPATH, osGetLastError(), "winFullPathname1", zRelative); } - nByte += 3; - zTemp = sqlite3MallocZero( nByte*sizeof(zTemp[0]) ); + zTemp = sqlite3MallocZero( nByte*sizeof(zTemp[0]) + 3*sizeof(zTemp[0]) ); if( zTemp==0 ){ sqlite3_free(zConverted); return SQLITE_IOERR_NOMEM_BKPT; } - nByte = osGetFullPathNameW((LPCWSTR)zConverted, nByte, zTemp, 0); + nByte = osGetFullPathNameW((LPCWSTR)zConverted, nByte+3, zTemp, 0); if( nByte==0 ){ sqlite3_free(zConverted); sqlite3_free(zTemp); @@ -5751,13 +5751,12 @@ static int winFullPathnameNoMutex( return winLogError(SQLITE_CANTOPEN_FULLPATH, osGetLastError(), "winFullPathname3", zRelative); } - nByte += 3; - zTemp = sqlite3MallocZero( nByte*sizeof(zTemp[0]) ); + zTemp = sqlite3MallocZero( nByte*sizeof(zTemp[0]) + 3*sizeof(zTemp[0]) ); if( zTemp==0 ){ sqlite3_free(zConverted); return SQLITE_IOERR_NOMEM_BKPT; } - nByte = osGetFullPathNameA((char*)zConverted, nByte, zTemp, 0); + nByte = osGetFullPathNameA((char*)zConverted, nByte+3, zTemp, 0); if( nByte==0 ){ sqlite3_free(zConverted); sqlite3_free(zTemp); diff --git a/src/pager.c b/src/pager.c index ecec892b45..5d279001e7 100644 --- a/src/pager.c +++ b/src/pager.c @@ -1291,7 +1291,7 @@ static void checkPage(PgHdr *pPg){ ** If an error occurs while reading from the journal file, an SQLite ** error code is returned. */ -static int readSuperJournal(sqlite3_file *pJrnl, char *zSuper, u32 nSuper){ +static int readSuperJournal(sqlite3_file *pJrnl, char *zSuper, u64 nSuper){ int rc; /* Return code */ u32 len; /* Length in bytes of super-journal name */ i64 szJ; /* Total size in bytes of journal file pJrnl */ @@ -2527,12 +2527,12 @@ static int pager_delsuper(Pager *pPager, const char *zSuper){ char *zJournal; /* Pointer to one journal within MJ file */ char *zSuperPtr; /* Space to hold super-journal filename */ char *zFree = 0; /* Free this buffer */ - int nSuperPtr; /* Amount of space allocated to zSuperPtr[] */ + i64 nSuperPtr; /* Amount of space allocated to zSuperPtr[] */ /* Allocate space for both the pJournal and pSuper file descriptors. ** If successful, open the super-journal file for reading. */ - pSuper = (sqlite3_file *)sqlite3MallocZero(pVfs->szOsFile * 2); + pSuper = (sqlite3_file *)sqlite3MallocZero(2 * (i64)pVfs->szOsFile); if( !pSuper ){ rc = SQLITE_NOMEM_BKPT; pJournal = 0; @@ -2550,11 +2550,14 @@ static int pager_delsuper(Pager *pPager, const char *zSuper){ */ rc = sqlite3OsFileSize(pSuper, &nSuperJournal); if( rc!=SQLITE_OK ) goto delsuper_out; - nSuperPtr = pVfs->mxPathname+1; + nSuperPtr = 1 + (i64)pVfs->mxPathname; + assert( nSuperJournal>=0 && nSuperPtr>0 ); zFree = sqlite3Malloc(4 + nSuperJournal + nSuperPtr + 2); if( !zFree ){ rc = SQLITE_NOMEM_BKPT; goto delsuper_out; + }else{ + assert( nSuperJournal<=0x7fffffff ); } zFree[0] = zFree[1] = zFree[2] = zFree[3] = 0; zSuperJournal = &zFree[4]; @@ -2815,7 +2818,7 @@ static int pager_playback(Pager *pPager, int isHot){ ** for pageSize. */ zSuper = pPager->pTmpSpace; - rc = readSuperJournal(pPager->jfd, zSuper, pPager->pVfs->mxPathname+1); + rc = readSuperJournal(pPager->jfd, zSuper, 1+(i64)pPager->pVfs->mxPathname); if( rc==SQLITE_OK && zSuper[0] ){ rc = sqlite3OsAccess(pVfs, zSuper, SQLITE_ACCESS_EXISTS, &res); } @@ -2954,7 +2957,7 @@ end_playback: ** which case it requires 4 0x00 bytes in memory immediately before ** the filename. */ zSuper = &pPager->pTmpSpace[4]; - rc = readSuperJournal(pPager->jfd, zSuper, pPager->pVfs->mxPathname+1); + rc = readSuperJournal(pPager->jfd, zSuper, 1+(i64)pPager->pVfs->mxPathname); testcase( rc!=SQLITE_OK ); } if( rc==SQLITE_OK @@ -4724,6 +4727,7 @@ int sqlite3PagerOpen( u32 szPageDflt = SQLITE_DEFAULT_PAGE_SIZE; /* Default page size */ const char *zUri = 0; /* URI args to copy */ int nUriByte = 1; /* Number of bytes of URI args at *zUri */ + /* Figure out how much space is required for each journal file-handle ** (there are two of them, the main journal and the sub-journal). */ @@ -4750,8 +4754,8 @@ int sqlite3PagerOpen( */ if( zFilename && zFilename[0] ){ const char *z; - nPathname = pVfs->mxPathname+1; - zPathname = sqlite3DbMallocRaw(0, nPathname*2); + nPathname = pVfs->mxPathname + 1; + zPathname = sqlite3DbMallocRaw(0, 2*(i64)nPathname); if( zPathname==0 ){ return SQLITE_NOMEM_BKPT; } @@ -4838,14 +4842,14 @@ int sqlite3PagerOpen( ROUND8(sizeof(*pPager)) + /* Pager structure */ ROUND8(pcacheSize) + /* PCache object */ ROUND8(pVfs->szOsFile) + /* The main db file */ - journalFileSize * 2 + /* The two journal files */ + (u64)journalFileSize * 2 + /* The two journal files */ SQLITE_PTRSIZE + /* Space to hold a pointer */ 4 + /* Database prefix */ - nPathname + 1 + /* database filename */ - nUriByte + /* query parameters */ - nPathname + 8 + 1 + /* Journal filename */ + (u64)nPathname + 1 + /* database filename */ + (u64)nUriByte + /* query parameters */ + (u64)nPathname + 8 + 1 + /* Journal filename */ #ifndef SQLITE_OMIT_WAL - nPathname + 4 + 1 + /* WAL filename */ + (u64)nPathname + 4 + 1 + /* WAL filename */ #endif 3 /* Terminator */ ); diff --git a/src/pcache1.c b/src/pcache1.c index a0a8c7e28c..88a7b3a0b4 100644 --- a/src/pcache1.c +++ b/src/pcache1.c @@ -538,12 +538,12 @@ static int pcache1UnderMemoryPressure(PCache1 *pCache){ */ static void pcache1ResizeHash(PCache1 *p){ PgHdr1 **apNew; - unsigned int nNew; - unsigned int i; + u64 nNew; + u32 i; assert( sqlite3_mutex_held(p->pGroup->mutex) ); - nNew = p->nHash*2; + nNew = 2*(u64)p->nHash; if( nNew<256 ){ nNew = 256; } @@ -766,7 +766,7 @@ static void pcache1Destroy(sqlite3_pcache *p); static sqlite3_pcache *pcache1Create(int szPage, int szExtra, int bPurgeable){ PCache1 *pCache; /* The newly created page cache */ PGroup *pGroup; /* The group the new page cache will belong to */ - int sz; /* Bytes of memory required to allocate the new cache */ + i64 sz; /* Bytes of memory required to allocate the new cache */ assert( (szPage & (szPage-1))==0 && szPage>=512 && szPage<=65536 ); assert( szExtra < 300 ); diff --git a/src/printf.c b/src/printf.c index 71363f91b4..97f93dc157 100644 --- a/src/printf.c +++ b/src/printf.c @@ -1057,7 +1057,7 @@ void sqlite3_str_appendall(sqlite3_str *p, const char *z){ static SQLITE_NOINLINE char *strAccumFinishRealloc(StrAccum *p){ char *zText; assert( p->mxAlloc>0 && !isMalloced(p) ); - zText = sqlite3DbMallocRaw(p->db, p->nChar+1 ); + zText = sqlite3DbMallocRaw(p->db, 1+(u64)p->nChar ); if( zText ){ memcpy(zText, p->zText, p->nChar+1); p->printfFlags |= SQLITE_PRINTF_MALLOCED; diff --git a/src/sqliteInt.h b/src/sqliteInt.h index c8ecaf8571..6ebd8eb4fe 100644 --- a/src/sqliteInt.h +++ b/src/sqliteInt.h @@ -1016,6 +1016,14 @@ typedef INT16_TYPE LogEst; #define LARGEST_UINT64 (0xffffffff|(((u64)0xffffffff)<<32)) #define SMALLEST_INT64 (((i64)-1) - LARGEST_INT64) +/* +** Macro SMXV(n) return the maximum value that can be held in variable n, +** assuming n is a signed integer type. UMXV(n) is similar for unsigned +** integer types. +*/ +#define SMXV(n) ((((i64)1)<<(sizeof(n)-1))-1) +#define UMXV(n) ((((i64)1)<<(sizeof(n)))-1) + /* ** Round up a number to the next larger multiple of 8. This is used ** to force 8-byte alignment on 64-bit architectures. diff --git a/src/vdbe.c b/src/vdbe.c index 6d7769173f..b78a0aabf2 100644 --- a/src/vdbe.c +++ b/src/vdbe.c @@ -276,7 +276,7 @@ static VdbeCursor *allocateCursor( */ Mem *pMem = iCur>0 ? &p->aMem[p->nMem-iCur] : p->aMem; - int nByte; + i64 nByte; VdbeCursor *pCx = 0; nByte = ROUND8P(sizeof(VdbeCursor)) + 2*sizeof(u32)*nField + @@ -304,7 +304,7 @@ static VdbeCursor *allocateCursor( pMem->szMalloc = 0; return 0; } - pMem->szMalloc = nByte; + pMem->szMalloc = (int)nByte; } p->apCsr[iCur] = pCx = (VdbeCursor*)pMem->zMalloc; @@ -7325,7 +7325,7 @@ case OP_RowSetTest: { /* jump, in1, in3 */ */ case OP_Program: { /* jump0 */ int nMem; /* Number of memory registers for sub-program */ - int nByte; /* Bytes of runtime space required for sub-program */ + i64 nByte; /* Bytes of runtime space required for sub-program */ Mem *pRt; /* Register to allocate runtime space */ Mem *pMem; /* Used to iterate through memory cells */ Mem *pEnd; /* Last memory cell in new array */ @@ -7376,7 +7376,7 @@ case OP_Program: { /* jump0 */ nByte = ROUND8(sizeof(VdbeFrame)) + nMem * sizeof(Mem) + pProgram->nCsr * sizeof(VdbeCursor*) - + (pProgram->nOp + 7)/8; + + (7 + (i64)pProgram->nOp)/8; pFrame = sqlite3DbMallocZero(db, nByte); if( !pFrame ){ goto no_mem; @@ -7384,7 +7384,7 @@ case OP_Program: { /* jump0 */ sqlite3VdbeMemRelease(pRt); pRt->flags = MEM_Blob|MEM_Dyn; pRt->z = (char*)pFrame; - pRt->n = nByte; + pRt->n = (int)nByte; pRt->xDel = sqlite3VdbeFrameMemDel; pFrame->v = p; diff --git a/src/vdbeapi.c b/src/vdbeapi.c index 0dc09d501e..31880d85b5 100644 --- a/src/vdbeapi.c +++ b/src/vdbeapi.c @@ -2233,7 +2233,9 @@ int sqlite3_preupdate_old(sqlite3 *db, int iIdx, sqlite3_value **ppValue){ Column *pCol = &p->pTab->aCol[iIdx]; if( pCol->iDflt>0 ){ if( p->apDflt==0 ){ - int nByte = sizeof(sqlite3_value*)*p->pTab->nCol; + int nByte; + assert( sizeof(sqlite3_value*)*UMXV(p->pTab->nCol) < 0x7fffffff ); + nByte = sizeof(sqlite3_value*)*p->pTab->nCol; p->apDflt = (sqlite3_value**)sqlite3DbMallocZero(db, nByte); if( p->apDflt==0 ) goto preupdate_old_out; } @@ -2383,7 +2385,8 @@ int sqlite3_preupdate_new(sqlite3 *db, int iIdx, sqlite3_value **ppValue){ */ assert( p->op==SQLITE_UPDATE ); if( !p->aNew ){ - p->aNew = (Mem *)sqlite3DbMallocZero(db, sizeof(Mem) * p->pCsr->nField); + assert( sizeof(Mem)*UMXV(p->pCsr->nField) < 0x7fffffff ); + p->aNew = (Mem *)sqlite3DbMallocZero(db, sizeof(Mem)*p->pCsr->nField); if( !p->aNew ){ rc = SQLITE_NOMEM; goto preupdate_new_out; diff --git a/src/vdbeaux.c b/src/vdbeaux.c index cf661eb9cb..6a8db6f394 100644 --- a/src/vdbeaux.c +++ b/src/vdbeaux.c @@ -726,7 +726,7 @@ static Op *opIterNext(VdbeOpIter *p){ } if( pRet->p4type==P4_SUBPROGRAM ){ - int nByte = (p->nSub+1)*sizeof(SubProgram*); + i64 nByte = (1+(u64)p->nSub)*sizeof(SubProgram*); int j; for(j=0; jnSub; j++){ if( p->apSub[j]==pRet->p4.pProgram ) break; @@ -1198,7 +1198,7 @@ void sqlite3VdbeScanStatus( const char *zName /* Name of table or index being scanned */ ){ if( IS_STMT_SCANSTATUS(p->db) ){ - sqlite3_int64 nByte = (p->nScan+1) * sizeof(ScanStatus); + i64 nByte = (1+(i64)p->nScan) * sizeof(ScanStatus); ScanStatus *aNew; aNew = (ScanStatus*)sqlite3DbRealloc(p->db, p->aScan, nByte); if( aNew ){ @@ -4219,6 +4219,7 @@ UnpackedRecord *sqlite3VdbeAllocUnpackedRecord( ){ UnpackedRecord *p; /* Unpacked record to return */ int nByte; /* Number of bytes required for *p */ + assert( sizeof(UnpackedRecord) + sizeof(Mem)*65536 < 0x7fffffff ); nByte = ROUND8P(sizeof(UnpackedRecord)) + sizeof(Mem)*(pKeyInfo->nKeyField+1); p = (UnpackedRecord *)sqlite3DbMallocRaw(pKeyInfo->db, nByte); if( !p ) return 0; diff --git a/src/vdbemem.c b/src/vdbemem.c index 61298d10ff..8534849432 100644 --- a/src/vdbemem.c +++ b/src/vdbemem.c @@ -1440,7 +1440,7 @@ static sqlite3_value *valueNew(sqlite3 *db, struct ValueNewStat4Ctx *p){ if( pRec==0 ){ Index *pIdx = p->pIdx; /* Index being probed */ - int nByte; /* Bytes of space to allocate */ + i64 nByte; /* Bytes of space to allocate */ int i; /* Counter variable */ int nCol = pIdx->nColumn; /* Number of index columns including rowid */ @@ -1506,7 +1506,7 @@ static int valueFromFunction( ){ sqlite3_context ctx; /* Context object for function invocation */ sqlite3_value **apVal = 0; /* Function arguments */ - int nVal = 0; /* Size of apVal[] array */ + int nVal = 0; /* Number of function arguments */ FuncDef *pFunc = 0; /* Function definition */ sqlite3_value *pVal = 0; /* New value */ int rc = SQLITE_OK; /* Return code */ diff --git a/src/vdbesort.c b/src/vdbesort.c index 239c0a0f36..5774537b81 100644 --- a/src/vdbesort.c +++ b/src/vdbesort.c @@ -936,7 +936,7 @@ int sqlite3VdbeSorterInit( VdbeSorter *pSorter; /* The new sorter */ KeyInfo *pKeyInfo; /* Copy of pCsr->pKeyInfo with db==0 */ int szKeyInfo; /* Size of pCsr->pKeyInfo in bytes */ - int sz; /* Size of pSorter in bytes */ + i64 sz; /* Size of pSorter in bytes */ int rc = SQLITE_OK; #if SQLITE_MAX_WORKER_THREADS==0 # define nWorker 0 @@ -964,6 +964,8 @@ int sqlite3VdbeSorterInit( assert( pCsr->pKeyInfo ); assert( !pCsr->isEphemeral ); assert( pCsr->eCurType==CURTYPE_SORTER ); + assert( sizeof(KeyInfo) + UMXV(pCsr->pKeyInfo->nKeyField)*sizeof(CollSeq*) + < 0x7fffffff ); szKeyInfo = sizeof(KeyInfo) + (pCsr->pKeyInfo->nKeyField-1)*sizeof(CollSeq*); sz = sizeof(VdbeSorter) + nWorker * sizeof(SortSubtask); @@ -1177,7 +1179,7 @@ static int vdbeSorterJoinAll(VdbeSorter *pSorter, int rcin){ */ static MergeEngine *vdbeMergeEngineNew(int nReader){ int N = 2; /* Smallest power of two >= nReader */ - int nByte; /* Total bytes of space to allocate */ + i64 nByte; /* Total bytes of space to allocate */ MergeEngine *pNew; /* Pointer to allocated object to return */ assert( nReader<=SORTER_MAX_MERGE_COUNT ); diff --git a/src/wal.c b/src/wal.c index 42ce3cb97b..0b4510e179 100644 --- a/src/wal.c +++ b/src/wal.c @@ -753,7 +753,7 @@ static SQLITE_NOINLINE int walIndexPageRealloc( /* Enlarge the pWal->apWiData[] array if required */ if( pWal->nWiData<=iPage ){ - sqlite3_int64 nByte = sizeof(u32*)*(iPage+1); + sqlite3_int64 nByte = sizeof(u32*)*(1+(i64)iPage); volatile u32 **apNew; apNew = (volatile u32 **)sqlite3Realloc((void *)pWal->apWiData, nByte); if( !apNew ){ From 7bfa4452a3cc9b57d970938cbc642cb48024a2a7 Mon Sep 17 00:00:00 2001 From: drh <> Date: Mon, 17 Feb 2025 18:09:24 +0000 Subject: [PATCH 121/194] Additional changes making it easier to prove that integer overflow does not occur. No problems found. FossilOrigin-Name: e846743a875430a5c51d41f00ac9532214f97d9925e6261113b63580f92369fc --- ext/fts3/fts3.c | 2 +- ext/fts3/fts3_expr.c | 2 +- ext/fts5/fts5_index.c | 9 +++++---- ext/fts5/fts5_vocab.c | 6 +++--- manifest | 20 ++++++++++---------- manifest.uuid | 2 +- src/json.c | 7 ++++--- 7 files changed, 25 insertions(+), 23 deletions(-) diff --git a/ext/fts3/fts3.c b/ext/fts3/fts3.c index 2b2c3b8d26..d5db2a3dd1 100644 --- a/ext/fts3/fts3.c +++ b/ext/fts3/fts3.c @@ -4438,7 +4438,7 @@ static int fts3EvalDeferredPhrase(Fts3Cursor *pCsr, Fts3Phrase *pPhrase){ nDistance = iPrev - nMaxUndeferred; } - aOut = (char *)sqlite3Fts3MallocZero(nPoslist+FTS3_BUFFER_PADDING); + aOut = (char *)sqlite3Fts3MallocZero(((i64)nPoslist)+FTS3_BUFFER_PADDING); if( !aOut ){ sqlite3_free(aPoslist); return SQLITE_NOMEM; diff --git a/ext/fts3/fts3_expr.c b/ext/fts3/fts3_expr.c index 9e201b1684..ce4282dea5 100644 --- a/ext/fts3/fts3_expr.c +++ b/ext/fts3/fts3_expr.c @@ -283,7 +283,7 @@ static int getNextString( Fts3Expr *p = 0; sqlite3_tokenizer_cursor *pCursor = 0; char *zTemp = 0; - int nTemp = 0; + i64 nTemp = 0; const int nSpace = sizeof(Fts3Expr) + sizeof(Fts3Phrase); int nToken = 0; diff --git a/ext/fts5/fts5_index.c b/ext/fts5/fts5_index.c index f56aa82e8c..3ac5008502 100644 --- a/ext/fts5/fts5_index.c +++ b/ext/fts5/fts5_index.c @@ -5206,7 +5206,7 @@ static void fts5DoSecureDelete( int iDelKeyOff = 0; /* Offset of deleted key, if any */ nIdx = nPg-iPgIdx; - aIdx = sqlite3Fts5MallocZero(&p->rc, nIdx+16); + aIdx = sqlite3Fts5MallocZero(&p->rc, ((i64)nIdx)+16); if( p->rc ) return; memcpy(aIdx, &aPg[iPgIdx], nIdx); @@ -5800,7 +5800,7 @@ static Fts5Structure *fts5IndexOptimizeStruct( assert( pStruct->aLevel[i].nMerge<=nThis ); } - nByte += (pStruct->nLevel+1) * sizeof(Fts5StructureLevel); + nByte += (((i64)pStruct->nLevel)+1) * sizeof(Fts5StructureLevel); pNew = (Fts5Structure*)sqlite3Fts5MallocZero(&p->rc, nByte); if( pNew ){ @@ -6688,7 +6688,8 @@ static void fts5SetupPrefixIter( } } - pData = fts5IdxMalloc(p, sizeof(*pData)+s.doclist.n+FTS5_DATA_ZERO_PADDING); + pData = fts5IdxMalloc(p, sizeof(*pData) + + ((i64)s.doclist.n)+FTS5_DATA_ZERO_PADDING); assert( pData!=0 || p->rc!=SQLITE_OK ); if( pData ){ pData->p = (u8*)&pData[1]; @@ -8912,7 +8913,7 @@ static void fts5DecodeFunction( ** buffer overreads even if the record is corrupt. */ n = sqlite3_value_bytes(apVal[1]); aBlob = sqlite3_value_blob(apVal[1]); - nSpace = n + FTS5_DATA_ZERO_PADDING; + nSpace = ((i64)n) + FTS5_DATA_ZERO_PADDING; a = (u8*)sqlite3Fts5MallocZero(&rc, nSpace); if( a==0 ) goto decode_out; if( n>0 ) memcpy(a, aBlob, n); diff --git a/ext/fts5/fts5_vocab.c b/ext/fts5/fts5_vocab.c index fb280567f4..b157ab0d97 100644 --- a/ext/fts5/fts5_vocab.c +++ b/ext/fts5/fts5_vocab.c @@ -193,12 +193,12 @@ static int fts5VocabInitVtab( *pzErr = sqlite3_mprintf("wrong number of vtable arguments"); rc = SQLITE_ERROR; }else{ - int nByte; /* Bytes of space to allocate */ + i64 nByte; /* Bytes of space to allocate */ const char *zDb = bDb ? argv[3] : argv[1]; const char *zTab = bDb ? argv[4] : argv[3]; const char *zType = bDb ? argv[5] : argv[4]; - int nDb = (int)strlen(zDb)+1; - int nTab = (int)strlen(zTab)+1; + i64 nDb = strlen(zDb)+1; + i64 nTab = strlen(zTab)+1; int eType = 0; rc = fts5VocabTableType(zType, pzErr, &eType); diff --git a/manifest b/manifest index 1e1fb70b59..3d8c78ede6 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Code\schanges\sthat\smake\sit\seasier\sto\sprove\sthat\sno\s32-bit\sinteger\soverflows\nhappen\sduring\smemory\sallocation.\s\sNo\sproblems\sfixed;\sthis\schange\sis\sjust\nto\smake\sfuture\smaintenance\seasier. -D 2025-02-17T17:33:14.937 +C Additional\schanges\smaking\sit\seasier\sto\sprove\sthat\sinteger\soverflow\sdoes\snot\noccur.\s\sNo\sproblems\sfound. +D 2025-02-17T18:09:24.766 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d @@ -78,11 +78,11 @@ F ext/fts3/README.content b9078d0843a094d86af0d48dffbff13c906702b4c3558012e67b9c F ext/fts3/README.syntax a19711dc5458c20734b8e485e75fb1981ec2427a F ext/fts3/README.tokenizers b92bdeb8b46503f0dd301d364efc5ef59ef9fa8e2758b8e742f39fa93a2e422d F ext/fts3/README.txt 8c18f41574404623b76917b9da66fcb0ab38328d -F ext/fts3/fts3.c b840ee915a6fb36571e3fe3c096e8a481a4a9cd8a35199a1b976b132b9f84ad3 +F ext/fts3/fts3.c 1da0265e8798f335165d54959459eeb69b6d32f586f85cf8795ab5d3b1292dcb F ext/fts3/fts3.h 3a10a0af180d502cecc50df77b1b22df142817fe F ext/fts3/fts3Int.h 2fe7c76dfd7d46dff964d17d3f4c53bca2116cf5d6252552ebbc22e38afdf4e0 F ext/fts3/fts3_aux.c 7eab82a9cf0830f6551ba3abfdbe73ed39e322a4d3940ee82fbf723674ecd9f3 -F ext/fts3/fts3_expr.c 365849a2a1185e19028a9db2d9f1ea63efe909a3a6aca7ec86fc26a13a60bd58 +F ext/fts3/fts3_expr.c ebf7f2adead8cc54bc91deb41cb4a156874003078116f76631d65b87ff47464d F ext/fts3/fts3_hash.c 8b6e31bfb0844c27dc6092c2620bdb1fca17ed613072db057d96952c6bdb48b7 F ext/fts3/fts3_hash.h 39cf6874dc239d6b4e30479b1975fe5b22a3caaf F ext/fts3/fts3_icu.c 305ce7fb6036484085b5556a9c8e62acdc7763f0f4cdf5fd538212a9f3720116 @@ -112,7 +112,7 @@ F ext/fts5/fts5_buffer.c 0eec58bff585f1a44ea9147eae5da2447292080ea435957f7488c70 F ext/fts5/fts5_config.c e7d8dd062b44a66cd77e5a0f74f23a2354cd1f3f8575afb967b2773c3384f7f8 F ext/fts5/fts5_expr.c 69b8d976058512c07dfe86e229521b7a871768157bd1607cedf1a5038dfd72c9 F ext/fts5/fts5_hash.c adda4272be401566a6e0ba1acbe70ee5cb97fce944bc2e04dc707152a0ec91b1 -F ext/fts5/fts5_index.c f1eec0931548b529ddd7ebd274eaef37de7461fe2b0ebdc9818f37324bdf9494 +F ext/fts5/fts5_index.c b7827b32e0e1e1ff7d7cb27c5d0480426a01c8ec4e89fd7e106bb463e2b63dd1 F ext/fts5/fts5_main.c 9a1daef7247f9b8a50b4159323e340efa6b0e4bea4fcd83580480f94d4f2c888 F ext/fts5/fts5_storage.c 1ad05dab4830a4e2eaf2900bb143477f93bc17437093582f36f4b818809e88d8 F ext/fts5/fts5_tcl.c 7fb5a3d3404099075aaa2457307cb459bbc257c0de3dbd52b1e80a5b503e0329 @@ -121,7 +121,7 @@ F ext/fts5/fts5_test_tok.c 3cb0a9b508b30d17ef025ccddd26ae3dc8ddffbe76c057616e59a F ext/fts5/fts5_tokenize.c 49aea8cc400a690a6c4f83c4cedc67f4f8830c6789c4ee343404f62bcaebca7b F ext/fts5/fts5_unicode2.c 6f9b0fb79a8facaed76628ffd4eb9c16d7f2b84b52872784f617cf3422a9b043 F ext/fts5/fts5_varint.c e64d2113f6e1bfee0032972cffc1207b77af63319746951bf1d09885d1dadf80 -F ext/fts5/fts5_vocab.c e4830b00809e5da53bc10f93adc59e321407b0f801c7f4167c0e47f5552267e0 +F ext/fts5/fts5_vocab.c ff0441c4ea165081e8152dec6d29056faa0cdc281a9f218a00e3d7aacc1958bc F ext/fts5/fts5parse.y eb526940f892ade5693f22ffd6c4f2702543a9059942772526eac1fde256bb05 F ext/fts5/mkportersteps.tcl 5acf962d2e0074f701620bb5308155fa1e4a63ba F ext/fts5/test/fts5_common.tcl c5aa7cf7148b6dcffb5b61520ae18212baf169936af734ab265143f59db328fe @@ -739,7 +739,7 @@ F src/hash.h 46b92795a95bfefb210f52f0c316e9d7cdbcdd7e7fcfb0d8be796d3a5767cddf F src/hwtime.h f9c2dfb84dce7acf95ce6d289e46f5f9d3d1afd328e53da8f8e9008e3b3caae6 F src/in-operator.md 10cd8f4bcd225a32518407c2fb2484089112fd71 F src/insert.c 05e04ef637cbc0dccb9a5c5d188a5a2608891e554c8ec17c7a71afe2cf896a06 -F src/json.c 2663a0c7e574cb928de944720dcdcc11c931877d877549b8f1258a4002efd6f7 +F src/json.c 5abb5cb782e74451a8882f6b7ee4d5e629246642262660bd1980a5e1b796258d F src/legacy.c d7874bc885906868cd51e6c2156698f2754f02d9eee1bae2d687323c3ca8e5aa F src/loadext.c 7432c944ff197046d67a1207790a1b13eec4548c85a9457eb0896bb3641dfb36 F src/main.c 2650f54f7c2aa2c53cc61b571bad9c7c32d60400e3f6a270bd444f5d76e03eb8 @@ -2207,8 +2207,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P b59d0ebb22e4ca2f3a7a73dd49a0c142dbca538cb1b4eafd35a78bac87c6c456 -R a324a0ad4ec5bff22beea8348186f31d +P 215650a5a1d55bdbca9c92524804a1a54456a17f42a17e53747b21a6507506f5 +R 051727f689eef9866e97198933e64087 U drh -Z e55663a48a3fa77210e8f8e7032e8f31 +Z 6482d56e78ea7ae46b1be7711d2aadc0 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index cab7456372..4265221c97 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -215650a5a1d55bdbca9c92524804a1a54456a17f42a17e53747b21a6507506f5 +e846743a875430a5c51d41f00ac9532214f97d9925e6261113b63580f92369fc diff --git a/src/json.c b/src/json.c index 47a9c875e7..97bf25b2dd 100644 --- a/src/json.c +++ b/src/json.c @@ -1086,7 +1086,7 @@ static void jsonWrongNumArgs( */ static int jsonBlobExpand(JsonParse *pParse, u32 N){ u8 *aNew; - u32 t; + u64 t; assert( N>pParse->nBlobAlloc ); if( pParse->nBlobAlloc==0 ){ t = 100; @@ -1096,8 +1096,9 @@ static int jsonBlobExpand(JsonParse *pParse, u32 N){ if( tdb, pParse->aBlob, t); if( aNew==0 ){ pParse->oom = 1; return 1; } + assert( t<0x7fffffff ); pParse->aBlob = aNew; - pParse->nBlobAlloc = t; + pParse->nBlobAlloc = (u32)t; return 0; } @@ -3116,7 +3117,7 @@ static void jsonReturnFromBlob( char *zOut; u32 nOut = sz; z = (const char*)&pParse->aBlob[i+n]; - zOut = sqlite3DbMallocRaw(db, nOut+1); + zOut = sqlite3DbMallocRaw(db, ((u64)nOut)+1); if( zOut==0 ) goto returnfromblob_oom; for(iIn=iOut=0; iIn Date: Mon, 17 Feb 2025 19:44:45 +0000 Subject: [PATCH 122/194] Fix problems in test script fkey6.test. FossilOrigin-Name: 088e476519c2c759ba9387cb18eaad7c042cc37e45e96237d3125ba33ee3633a --- manifest | 14 ++++++------- manifest.uuid | 2 +- test/fkey6.test | 53 +++++++++++++++++++++++++++---------------------- 3 files changed, 37 insertions(+), 32 deletions(-) diff --git a/manifest b/manifest index 3d8c78ede6..e98c2b76af 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Additional\schanges\smaking\sit\seasier\sto\sprove\sthat\sinteger\soverflow\sdoes\snot\noccur.\s\sNo\sproblems\sfound. -D 2025-02-17T18:09:24.766 +C Fix\sproblems\sin\stest\sscript\sfkey6.test. +D 2025-02-17T19:44:45.980 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d @@ -1153,7 +1153,7 @@ F test/fkey2.test 1063d65e5923c054cfb8f0555a92a3ae0fa8c067275a33ee1715bd856cdb30 F test/fkey3.test 76d475c80b84ee7a5d062e56ccb6ea68882e2b49 F test/fkey4.test 86446017011273aad8f9a99c1a65019e7bd9ca9d F test/fkey5.test 6727452e163a427147e84e739da18713da553d79f9783559b04fdcd36d5c7421 -F test/fkey6.test 1e0874ba15f8ed1e14a1d0a40fc8fb90a9912f4c82ea220a43137d4d9eff4d69 +F test/fkey6.test 668a7299e75899b0a3342c36df655be57f76a05aca3544bda939a6e676e2f000 F test/fkey7.test 64fb28da03da5dfe3cdef5967aa7e832c2507bf7fb8f0780cacbca1f2338d031 F test/fkey8.test 51deda7f1a1448bca95875e4a6e1a3a75b4bd7215e924e845bd60de60e4d84bf F test/fkey_malloc.test 594a7ea1fbab553c036c70813cd8bd9407d63749 @@ -2207,8 +2207,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P 215650a5a1d55bdbca9c92524804a1a54456a17f42a17e53747b21a6507506f5 -R 051727f689eef9866e97198933e64087 -U drh -Z 6482d56e78ea7ae46b1be7711d2aadc0 +P e846743a875430a5c51d41f00ac9532214f97d9925e6261113b63580f92369fc +R bf9a2dfadfc67dccdfbf52fd5d450169 +U dan +Z 6cfd174e1e1a340132d02a73b4dc4571 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 4265221c97..d45c550bf9 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -e846743a875430a5c51d41f00ac9532214f97d9925e6261113b63580f92369fc +088e476519c2c759ba9387cb18eaad7c042cc37e45e96237d3125ba33ee3633a diff --git a/test/fkey6.test b/test/fkey6.test index 7cdc8ab0ae..415daeaf3e 100644 --- a/test/fkey6.test +++ b/test/fkey6.test @@ -271,31 +271,36 @@ do_execsql_test 5.1 { # reset_db -do_execsql_test 6.1 { - PRAGMA writable_schema = 1; - INSERT INTO sqlite_schema - VALUES('table', 't1', 't1', 2, 'CREATE TABLE t1(x INTEGER PRIMARY KEY)'); +ifcapable fts5 { +if {[permutation]!="inmemory_journal"} { + do_execsql_test 6.1 { + PRAGMA auto_vacuum = 0; + PRAGMA writable_schema = 1; + INSERT INTO sqlite_schema + VALUES('table', 't1', 't1', 2, 'CREATE TABLE t1(x INTEGER PRIMARY KEY)'); + } + db close + sqlite3 db test.db + do_execsql_test 6.1 { + PRAGMA foreign_keys = 1; + PRAGMA writable_schema = 1; + } + do_execsql_test 6.2 { + CREATE TABLE t2( + y INTEGER PRIMARY KEY, + z INTEGER REFERENCES t1(x) DEFERRABLE INITIALLY DEFERRED + ); + } + do_execsql_test 6.3 { + BEGIN; + INSERT INTO t2 VALUES(1,0),(2,1); + CREATE VIRTUAL TABLE t3 USING fts5(a, b, content='', tokendata=1); + INSERT INTO t3 VALUES(3,3); + PRAGMA defer_foreign_keys=ON; + DELETE FROM t2; + COMMIT; + } } -db close -sqlite3 db test.db -do_execsql_test 6.1 { - PRAGMA foreign_keys = 1; - PRAGMA writable_schema = 1; -} -do_execsql_test 6.2 { - CREATE TABLE t2( - y INTEGER PRIMARY KEY, - z INTEGER REFERENCES t1(x) DEFERRABLE INITIALLY DEFERRED - ); -} -do_execsql_test 6.3 { - BEGIN; - INSERT INTO t2 VALUES(1,0),(2,1); - CREATE VIRTUAL TABLE t3 USING fts5(a, b, content='', tokendata=1); - INSERT INTO t3 VALUES(3,3); - PRAGMA defer_foreign_keys=ON; - DELETE FROM t2; - COMMIT; } finish_test From 21212923f276c11aaa048819779853a19c3d6636 Mon Sep 17 00:00:00 2001 From: drh <> Date: Mon, 17 Feb 2025 20:13:20 +0000 Subject: [PATCH 123/194] Add an ORDER BY to a test case for skip-scan to make the output consistent. FossilOrigin-Name: 9c9c19414ac243ce48a34bf13a08bff54a465e54a0c09ded50508b8d4bdba227 --- manifest | 14 +++++++------- manifest.uuid | 2 +- test/skipscan6.test | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/manifest b/manifest index e98c2b76af..6b0a647388 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Fix\sproblems\sin\stest\sscript\sfkey6.test. -D 2025-02-17T19:44:45.980 +C Add\san\sORDER\sBY\sto\sa\stest\scase\sfor\sskip-scan\sto\smake\sthe\soutput\sconsistent. +D 2025-02-17T20:13:20.679 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d @@ -1653,7 +1653,7 @@ F test/skipscan1.test 9cbbb6575517b15292bd87ee85b853bbd3cd4b4735d69b0f083020cec1 F test/skipscan2.test b032ed3e0ba5caa4df6c43ef22c31566aac67783bc031869155989a7ccdb5bd5 F test/skipscan3.test ec5bab3f81c7038b43450e7b3062e04a198bdbb5 F test/skipscan5.test 0672103fd2c8f96bd114133f356192b35ece45c794fe3677e1d9e5e3104a608e -F test/skipscan6.test bddbb35dd335e2d21b7791a61e3b2e1f3255dc307ce80aa6fe19cc298e6feb13 +F test/skipscan6.test e2b256cf5d538a605beb97dc97ca5e2836dfc24c5e1d9b7a09e13c069a3b8b49 F test/snapshot.test a504f2e7009f512ef66c719f0ea1c55a556bdaf1e1312c80a04d46fc1a3e9632 F test/snapshot2.test 8d6ff5dd9cc503f6e12d408a30409c3f9c653507b24408d9cd7195931c89bc54 F test/snapshot3.test 41350216abc6c7da37113ad462259c070786e5ad70bdc8709daaed148b1b3a2c @@ -2207,8 +2207,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P e846743a875430a5c51d41f00ac9532214f97d9925e6261113b63580f92369fc -R bf9a2dfadfc67dccdfbf52fd5d450169 -U dan -Z 6cfd174e1e1a340132d02a73b4dc4571 +P 088e476519c2c759ba9387cb18eaad7c042cc37e45e96237d3125ba33ee3633a +R ac29bfbe7732fa69155d4757aa0d3755 +U drh +Z ae23d3651ecb8ceaf7a4973c35e0c2db # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index d45c550bf9..f3d1660e17 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -088e476519c2c759ba9387cb18eaad7c042cc37e45e96237d3125ba33ee3633a +9c9c19414ac243ce48a34bf13a08bff54a465e54a0c09ded50508b8d4bdba227 diff --git a/test/skipscan6.test b/test/skipscan6.test index 4f592bc0e0..a97f440eef 100644 --- a/test/skipscan6.test +++ b/test/skipscan6.test @@ -167,10 +167,10 @@ do_execsql_test 3.0 { INSERT INTO t2 SELECT * FROM t3; ANALYZE; - SELECT * FROM sqlite_stat1; + SELECT * FROM sqlite_stat1 ORDER BY +idx; } { - t2 t2_ba {100 20 1 1} t2 t2_a {100 1} + t2 t2_ba {100 20 1 1} t3 t3_a {100 1} t3 t3_ba {100 20 1 1} } From 9ef8399055aaf10f623be8b900ac0c895c783b9c Mon Sep 17 00:00:00 2001 From: stephan Date: Tue, 18 Feb 2025 01:16:26 +0000 Subject: [PATCH 124/194] Update path on the web server for test/snapshot instances of fiddle. FossilOrigin-Name: 57caa3136d1bfca06e4f2285734a4977b8d3fa1f75bf87453b975867e9de38fc --- ext/wasm/fiddle.make | 2 +- manifest | 14 +++++++------- manifest.uuid | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/ext/wasm/fiddle.make b/ext/wasm/fiddle.make index 2a43959e2b..8110384a6e 100644 --- a/ext/wasm/fiddle.make +++ b/ext/wasm/fiddle.make @@ -91,7 +91,7 @@ all: fiddle fiddle_remote ?= ifeq (,$(fiddle_remote)) ifneq (,$(wildcard /home/stephan)) - fiddle_remote = wh:www/wh/sqlite3/. + fiddle_remote = wh:www/wasm-testing/fiddle/. else ifneq (,$(wildcard /home/drh)) #fiddle_remote = if appropriate, add that user@host:/path here endif diff --git a/manifest b/manifest index 6b0a647388..a37fef62de 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Add\san\sORDER\sBY\sto\sa\stest\scase\sfor\sskip-scan\sto\smake\sthe\soutput\sconsistent. -D 2025-02-17T20:13:20.679 +C Update\spath\son\sthe\sweb\sserver\sfor\stest/snapshot\sinstances\sof\sfiddle. +D 2025-02-18T01:16:26.885 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d @@ -672,7 +672,7 @@ F ext/wasm/demo-worker1.html 2c178c1890a2beb5a5fecb1453e796d067a4b8d3d2a04d65ca2 F ext/wasm/demo-worker1.js 08720227e98fa5b44761cf6e219269cee3e9dd0421d8d91459535da776950314 F ext/wasm/dist.make 92ef4ffe33022a50f92d602acabad10bd8dd91759f3eb7df27fc6d7d37072b96 F ext/wasm/example_extra_init.c 2347cd69d19d839ef4e5e77b7855103a7fe3ef2af86f2e8c95839afd8b05862f -F ext/wasm/fiddle.make d4969f0322a582c57a22ce3541f10a5b09a609d14eab32891f613f43b3c14d8b +F ext/wasm/fiddle.make c6d7a3d6cc03bb5f21acb295c1233820d0dbf5c6a89b28dc2e093edcc001c45a F ext/wasm/fiddle/fiddle-worker.js 850e66fce39b89d59e161d1abac43a181a4caa89ddeea162765d660277cd84ce F ext/wasm/fiddle/fiddle.js b444a5646a9aac9f3fc06c53d78af5e1912eb235d69a8e6010723e4eb0e9d4a1 F ext/wasm/fiddle/index.html c79b1741cbeba78f88af0a84cf5ec7de87a909a6a8d10a369b1f4824c66c2088 @@ -2207,8 +2207,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P 088e476519c2c759ba9387cb18eaad7c042cc37e45e96237d3125ba33ee3633a -R ac29bfbe7732fa69155d4757aa0d3755 -U drh -Z ae23d3651ecb8ceaf7a4973c35e0c2db +P 9c9c19414ac243ce48a34bf13a08bff54a465e54a0c09ded50508b8d4bdba227 +R c1357609bb5713a7e3d612d7117e08d1 +U stephan +Z d5c65d18a9c1aa9330f1639d76c6628b # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index f3d1660e17..4a2d06e29c 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -9c9c19414ac243ce48a34bf13a08bff54a465e54a0c09ded50508b8d4bdba227 +57caa3136d1bfca06e4f2285734a4977b8d3fa1f75bf87453b975867e9de38fc From eb3a069fc82e53a40ea63076d66ab113a3b2b0c6 Mon Sep 17 00:00:00 2001 From: dan Date: Tue, 18 Feb 2025 15:11:30 +0000 Subject: [PATCH 125/194] Have SQLITE_FTS5_ENABLE_TEST_MI builds avoid reading the database schema from within sqlite3_open(). FossilOrigin-Name: 15dc524fd4113026cc542140c39c1c8f9e052d36946f0c599f282d9ac27efdab --- ext/fts5/fts5_main.c | 4 ++-- ext/fts5/fts5_test_mi.c | 32 ++++++++++++++++++++++---------- ext/fts5/test/fts5matchinfo.test | 22 ++++++++++++++++++++++ manifest | 18 +++++++++--------- manifest.uuid | 2 +- 5 files changed, 56 insertions(+), 22 deletions(-) diff --git a/ext/fts5/fts5_main.c b/ext/fts5/fts5_main.c index 9f504bb3a3..4d5e3cd4f3 100644 --- a/ext/fts5/fts5_main.c +++ b/ext/fts5/fts5_main.c @@ -3801,8 +3801,8 @@ static int fts5Init(sqlite3 *db){ ** its entry point to enable the matchinfo() demo. */ #ifdef SQLITE_FTS5_ENABLE_TEST_MI if( rc==SQLITE_OK ){ - extern int sqlite3Fts5TestRegisterMatchinfo(sqlite3*); - rc = sqlite3Fts5TestRegisterMatchinfo(db); + extern int sqlite3Fts5TestRegisterMatchinfoAPI(fts5_api*); + rc = sqlite3Fts5TestRegisterMatchinfoAPI(&pGlobal->api); } #endif diff --git a/ext/fts5/fts5_test_mi.c b/ext/fts5/fts5_test_mi.c index 6f2d6e7ea2..f56c890cd7 100644 --- a/ext/fts5/fts5_test_mi.c +++ b/ext/fts5/fts5_test_mi.c @@ -393,17 +393,13 @@ static void fts5MatchinfoFunc( } } -int sqlite3Fts5TestRegisterMatchinfo(sqlite3 *db){ - int rc; /* Return code */ - fts5_api *pApi; /* FTS5 API functions */ +/* +** Register "matchinfo" with global API object pApi. +*/ +int sqlite3Fts5TestRegisterMatchinfoAPI(fts5_api *pApi){ + int rc; - /* Extract the FTS5 API pointer from the database handle. The - ** fts5_api_from_db() function above is copied verbatim from the - ** FTS5 documentation. Refer there for details. */ - rc = fts5_api_from_db(db, &pApi); - if( rc!=SQLITE_OK ) return rc; - - /* If fts5_api_from_db() returns NULL, then either FTS5 is not registered + /* If fts5_api_from_db() returned NULL, then either FTS5 is not registered ** with this database handle, or an error (OOM perhaps?) has occurred. ** ** Also check that the fts5_api object is version 2 or newer. @@ -418,4 +414,20 @@ int sqlite3Fts5TestRegisterMatchinfo(sqlite3 *db){ return rc; } +/* +** Register "matchinfo" with database handle db. +*/ +int sqlite3Fts5TestRegisterMatchinfo(sqlite3 *db){ + int rc; /* Return code */ + fts5_api *pApi; /* FTS5 API functions */ + + /* Extract the FTS5 API pointer from the database handle. The + ** fts5_api_from_db() function above is copied verbatim from the + ** FTS5 documentation. Refer there for details. */ + rc = fts5_api_from_db(db, &pApi); + if( rc!=SQLITE_OK ) return rc; + + return sqlite3Fts5TestRegisterMatchinfoAPI(pApi); +} + #endif /* SQLITE_ENABLE_FTS5 */ diff --git a/ext/fts5/test/fts5matchinfo.test b/ext/fts5/test/fts5matchinfo.test index 93361a5fe7..f81b076c18 100644 --- a/ext/fts5/test/fts5matchinfo.test +++ b/ext/fts5/test/fts5matchinfo.test @@ -520,4 +520,26 @@ do_execsql_test 15.3 { {columnsize {1 1} columntext {c d} columntotalsize {2 2} poslist {} tokenize {c d} rowcount 2} } +#------------------------------------------------------------------------- +# +reset_db +do_execsql_test 16.0 { + CREATE TABLE t1(x); + BEGIN EXCLUSIVE; +} + +sqlite3 db2 test.db +do_test 16.1 { + catchsql { SELECT * FROM t1 } db2 +} {1 {database is locked}} + +do_execsql_test 16.2 { + ROLLBACK; +} + +do_test 16.3 { + catchsql { SELECT * FROM t1 } db2 +} {0 {}} + finish_test + diff --git a/manifest b/manifest index a37fef62de..f4faa2a67f 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Update\spath\son\sthe\sweb\sserver\sfor\stest/snapshot\sinstances\sof\sfiddle. -D 2025-02-18T01:16:26.885 +C Have\sSQLITE_FTS5_ENABLE_TEST_MI\sbuilds\savoid\sreading\sthe\sdatabase\sschema\sfrom\nwithin\ssqlite3_open(). +D 2025-02-18T15:11:30.645 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d @@ -113,10 +113,10 @@ F ext/fts5/fts5_config.c e7d8dd062b44a66cd77e5a0f74f23a2354cd1f3f8575afb967b2773 F ext/fts5/fts5_expr.c 69b8d976058512c07dfe86e229521b7a871768157bd1607cedf1a5038dfd72c9 F ext/fts5/fts5_hash.c adda4272be401566a6e0ba1acbe70ee5cb97fce944bc2e04dc707152a0ec91b1 F ext/fts5/fts5_index.c b7827b32e0e1e1ff7d7cb27c5d0480426a01c8ec4e89fd7e106bb463e2b63dd1 -F ext/fts5/fts5_main.c 9a1daef7247f9b8a50b4159323e340efa6b0e4bea4fcd83580480f94d4f2c888 +F ext/fts5/fts5_main.c b0e95a793f3c649d313c536269403e1a413ee665223adb5f8196edd2bc1146f7 F ext/fts5/fts5_storage.c 1ad05dab4830a4e2eaf2900bb143477f93bc17437093582f36f4b818809e88d8 F ext/fts5/fts5_tcl.c 7fb5a3d3404099075aaa2457307cb459bbc257c0de3dbd52b1e80a5b503e0329 -F ext/fts5/fts5_test_mi.c 08c11ec968148d4cb4119d96d819f8c1f329812c568bac3684f5464be177d3ee +F ext/fts5/fts5_test_mi.c d35fdd50db99a775a040fb57127a45adc968e97da94ae784eec664256ac86db2 F ext/fts5/fts5_test_tok.c 3cb0a9b508b30d17ef025ccddd26ae3dc8ddffbe76c057616e59a9aa85d36f3b F ext/fts5/fts5_tokenize.c 49aea8cc400a690a6c4f83c4cedc67f4f8830c6789c4ee343404f62bcaebca7b F ext/fts5/fts5_unicode2.c 6f9b0fb79a8facaed76628ffd4eb9c16d7f2b84b52872784f617cf3422a9b043 @@ -203,7 +203,7 @@ F ext/fts5/test/fts5lastrowid.test f36298a1fb9f988bde060a274a7ce638faa9c38a31400 F ext/fts5/test/fts5leftjoin.test c0b4cafb9661379e576dc4405c0891d8fcc2782680740513c4d1fc114b43d4ad F ext/fts5/test/fts5limits.test 8ab67cf5d311c124b6ceb0062d0297767176df4572d955fce79fa43004dff01c F ext/fts5/test/fts5locale.test 83ba7ee12628b540d3098f39c39c1de0c0440eddff8f7512c8c698d0c4a3ae3c -F ext/fts5/test/fts5matchinfo.test 877520582feb86bbfd95ab780099bcba4526f18ac75ee34979144cf86ba3a5a3 +F ext/fts5/test/fts5matchinfo.test 7806f6d521bb49bcb54fff88a50f137866f7000c96ccfd28500caa47b63cb0aa F ext/fts5/test/fts5merge.test 2654df0bcdb2d117c2d38b6aeb0168061be01c643f9e9194b36c43a2970e8082 F ext/fts5/test/fts5merge2.test 3ebad1a59d6ad3fb66eff6523a09e95dc6367cbefb3cd73196801dea0425c8e2 F ext/fts5/test/fts5misc.test f4dee7da898d605a6488c5b7afaace3158ed6bb9addff78faa1b37b402b77fb9 @@ -2207,8 +2207,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P 9c9c19414ac243ce48a34bf13a08bff54a465e54a0c09ded50508b8d4bdba227 -R c1357609bb5713a7e3d612d7117e08d1 -U stephan -Z d5c65d18a9c1aa9330f1639d76c6628b +P 57caa3136d1bfca06e4f2285734a4977b8d3fa1f75bf87453b975867e9de38fc +R 35202329cbe88699b6bddc518439e5e7 +U dan +Z 2607e4e091da584eea58069e1dc59b17 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 4a2d06e29c..1217ba4cdf 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -57caa3136d1bfca06e4f2285734a4977b8d3fa1f75bf87453b975867e9de38fc +15dc524fd4113026cc542140c39c1c8f9e052d36946f0c599f282d9ac27efdab From 2e132a4c04563e9fc0c3369e82564c77d8c53f94 Mon Sep 17 00:00:00 2001 From: stephan Date: Wed, 19 Feb 2025 13:02:23 +0000 Subject: [PATCH 126/194] Slight tweak to the CLI shell help output to help convey that it can accept multiple SQL arguments, as suggested in [forum:20e617feee|forum post 20e617feee]. FossilOrigin-Name: 82fc67070f9aff0065c07cbeed40f4321e03617bdc3e517adc58a2d96e6e3e49 --- manifest | 14 +++++++------- manifest.uuid | 2 +- src/shell.c.in | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/manifest b/manifest index f4faa2a67f..b7a6cddd09 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Have\sSQLITE_FTS5_ENABLE_TEST_MI\sbuilds\savoid\sreading\sthe\sdatabase\sschema\sfrom\nwithin\ssqlite3_open(). -D 2025-02-18T15:11:30.645 +C Slight\stweak\sto\sthe\sCLI\sshell\shelp\soutput\sto\shelp\sconvey\sthat\sit\scan\saccept\smultiple\sSQL\sarguments,\sas\ssuggested\sin\s[forum:20e617feee|forum\spost\s20e617feee]. +D 2025-02-19T13:02:23.660 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d @@ -779,7 +779,7 @@ F src/random.c 606b00941a1d7dd09c381d3279a058d771f406c5213c9932bbd93d5587be4b9c F src/resolve.c 626c24b258b111f75c22107aa5614ad89810df3026f5ca071116d3fe75925c75 F src/rowset.c 8432130e6c344b3401a8874c3cb49fefe6873fec593294de077afea2dce5ec97 F src/select.c 57893cc8b099f231f7ed5b84faff14841f2aabb4776e32e17fae00aeae0a8993 -F src/shell.c.in b377a59822f207106424f08aead37e78b609222e98f86f04cc8a03563ccf3237 +F src/shell.c.in b6c1ef047b76b59db06cc9dcf56a5c65255891990893fb14ab99c7eb8f92879a F src/sqlite.h.in 8d4486fb28a90de818ac1e8c6206ea458e7de6bd8e0dfa3d554494f155be8c01 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8 F src/sqlite3ext.h 3f046c04ea3595d6bfda99b781926b17e672fd6d27da2ba6d8d8fc39981dcb54 @@ -2207,8 +2207,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P 57caa3136d1bfca06e4f2285734a4977b8d3fa1f75bf87453b975867e9de38fc -R 35202329cbe88699b6bddc518439e5e7 -U dan -Z 2607e4e091da584eea58069e1dc59b17 +P 15dc524fd4113026cc542140c39c1c8f9e052d36946f0c599f282d9ac27efdab +R 5355147b27dea2558cd54c419c7d5a9d +U stephan +Z 46dc12b85b22276ab11cf09c637f56a9 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 1217ba4cdf..cfd1c85c6a 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -15dc524fd4113026cc542140c39c1c8f9e052d36946f0c599f282d9ac27efdab +82fc67070f9aff0065c07cbeed40f4321e03617bdc3e517adc58a2d96e6e3e49 diff --git a/src/shell.c.in b/src/shell.c.in index fcc9316b00..2337504a64 100644 --- a/src/shell.c.in +++ b/src/shell.c.in @@ -12633,7 +12633,7 @@ static const char zOptions[] = #endif ; static void usage(int showDetail){ - sqlite3_fprintf(stderr,"Usage: %s [OPTIONS] [FILENAME [SQL]]\n" + sqlite3_fprintf(stderr,"Usage: %s [OPTIONS] [FILENAME [SQL...]]\n" "FILENAME is the name of an SQLite database. A new database is created\n" "if the file does not previously exist. Defaults to :memory:.\n", Argv0); if( showDetail ){ From eb0d2e7bc6b9ef56cea4e85cfb56b2d194befd5d Mon Sep 17 00:00:00 2001 From: stephan Date: Wed, 19 Feb 2025 13:05:33 +0000 Subject: [PATCH 127/194] Increase default CLI shell .prompt buffer length to 128 bytes, based on discussion in [forum:362f185a6aa|forum post 362f185a6aa]. FossilOrigin-Name: 628407f03d4bfb7499f0e6e2197089edf859380a3c4e6fecc517390327718141 --- manifest | 12 ++++++------ manifest.uuid | 2 +- src/shell.c.in | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/manifest b/manifest index b7a6cddd09..e03870ce0a 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Slight\stweak\sto\sthe\sCLI\sshell\shelp\soutput\sto\shelp\sconvey\sthat\sit\scan\saccept\smultiple\sSQL\sarguments,\sas\ssuggested\sin\s[forum:20e617feee|forum\spost\s20e617feee]. -D 2025-02-19T13:02:23.660 +C Increase\sdefault\sCLI\sshell\s.prompt\sbuffer\slength\sto\s128\sbytes,\sbased\son\sdiscussion\sin\s[forum:362f185a6aa|forum\spost\s362f185a6aa]. +D 2025-02-19T13:05:33.746 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d @@ -779,7 +779,7 @@ F src/random.c 606b00941a1d7dd09c381d3279a058d771f406c5213c9932bbd93d5587be4b9c F src/resolve.c 626c24b258b111f75c22107aa5614ad89810df3026f5ca071116d3fe75925c75 F src/rowset.c 8432130e6c344b3401a8874c3cb49fefe6873fec593294de077afea2dce5ec97 F src/select.c 57893cc8b099f231f7ed5b84faff14841f2aabb4776e32e17fae00aeae0a8993 -F src/shell.c.in b6c1ef047b76b59db06cc9dcf56a5c65255891990893fb14ab99c7eb8f92879a +F src/shell.c.in bf997e43faaa1ef0ff78d4d7b9be6a9430cf1edda9a47a14e7fef646fcb459af F src/sqlite.h.in 8d4486fb28a90de818ac1e8c6206ea458e7de6bd8e0dfa3d554494f155be8c01 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8 F src/sqlite3ext.h 3f046c04ea3595d6bfda99b781926b17e672fd6d27da2ba6d8d8fc39981dcb54 @@ -2207,8 +2207,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P 15dc524fd4113026cc542140c39c1c8f9e052d36946f0c599f282d9ac27efdab -R 5355147b27dea2558cd54c419c7d5a9d +P 82fc67070f9aff0065c07cbeed40f4321e03617bdc3e517adc58a2d96e6e3e49 +R be54da7cd01ca59f1b81e516853a22f2 U stephan -Z 46dc12b85b22276ab11cf09c637f56a9 +Z 3cdd2336da3d5e5560137a38998c10e6 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index cfd1c85c6a..bfbc8a28b3 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -82fc67070f9aff0065c07cbeed40f4321e03617bdc3e517adc58a2d96e6e3e49 +628407f03d4bfb7499f0e6e2197089edf859380a3c4e6fecc517390327718141 diff --git a/src/shell.c.in b/src/shell.c.in index 2337504a64..f12d360b9b 100644 --- a/src/shell.c.in +++ b/src/shell.c.in @@ -470,7 +470,7 @@ static char *Argv0; ** Prompt strings. Initialized in main. Settable with ** .prompt main continue */ -#define PROMPT_LEN_MAX 20 +#define PROMPT_LEN_MAX 128 /* First line prompt. default: "sqlite> " */ static char mainPrompt[PROMPT_LEN_MAX]; /* Continuation prompt. default: " ...> " */ From f8a9f455956933e08d7f5c5d7f409906c7391862 Mon Sep 17 00:00:00 2001 From: stephan Date: Thu, 20 Feb 2025 03:27:47 +0000 Subject: [PATCH 128/194] configure: when running proj-check-function-in-lib, strip -Werror from CFLAGS for the duration of the test. This enables CFLAGS='-Wall -Werror' and the like to be passed to configure without breaking these configure-time checks. FossilOrigin-Name: 4ae9d6c642295e3a0c1732dacf7c18ecacd39d3e74e38381ac5531c8396f5f1c --- autosetup/proj.tcl | 36 +++++++++++++++++++++++++++++++----- manifest | 12 ++++++------ manifest.uuid | 2 +- 3 files changed, 38 insertions(+), 12 deletions(-) diff --git a/autosetup/proj.tcl b/autosetup/proj.tcl index fdfbf3a5ed..c81fe910d0 100644 --- a/autosetup/proj.tcl +++ b/autosetup/proj.tcl @@ -197,16 +197,42 @@ proc proj-strip-hash-comments {val} { return $x } +######################################################################## +# @proj-cflags-without-werror +# +# Fetches [define $var], strips out any -Werror entries, and returns +# the new value. This is intended for temporarily stripping -Werror +# from CFLAGS or CPPFLAGS within the scope of a [define-push] block. +proc proj-cflags-without-werror {{var CFLAGS}} { + set rv {} + foreach f [get-define $var ""] { + switch -exact -- $f { + -Werror {} + default { lappend rv $f } + } + } + return [join $rv " "] +} + ######################################################################## # @proj-check-function-in-lib # -# A proxy for cc-check-function-in-lib which does not make any global -# changes to the LIBS define. Returns the result of -# cc-check-function-in-lib (i.e. true or false). The resulting linker -# flags are stored in the [define] named lib_${function}. +# A proxy for cc-check-function-in-lib with the following differences: +# +# - Does not make any global changes to the LIBS define. +# +# - Strips out -W... warning flags from CFLAGS before running the +# test, as these feature tests will often fail if -Werror is used. +# +# Returns the result of cc-check-function-in-lib (i.e. true or false). +# The resulting linker flags are stored in the [define] named +# lib_${function}. proc proj-check-function-in-lib {function libs {otherlibs {}}} { set found 0 - define-push {LIBS} { + define-push {LIBS CFLAGS} { + #puts "CFLAGS before=[get-define CFLAGS]" + define CFLAGS [proj-cflags-without-werror] + #puts "CFLAGS after =[get-define CFLAGS]" set found [cc-check-function-in-lib $function $libs $otherlibs] } return $found diff --git a/manifest b/manifest index e03870ce0a..820f3bc2dc 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Increase\sdefault\sCLI\sshell\s.prompt\sbuffer\slength\sto\s128\sbytes,\sbased\son\sdiscussion\sin\s[forum:362f185a6aa|forum\spost\s362f185a6aa]. -D 2025-02-19T13:05:33.746 +C configure:\swhen\srunning\sproj-check-function-in-lib,\sstrip\s-Werror\sfrom\sCFLAGS\sfor\sthe\sduration\sof\sthe\stest.\sThis\senables\sCFLAGS='-Wall\s-Werror'\sand\sthe\slike\sto\sbe\spassed\sto\sconfigure\swithout\sbreaking\sthese\sconfigure-time\schecks. +D 2025-02-20T03:27:47.397 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d @@ -49,7 +49,7 @@ F autosetup/cc-shared.tcl 4f024e94a47f427ba61de1739f6381ef0080210f9fae89112d5c1d F autosetup/cc.tcl c0fcc50ca91deff8741e449ddad05bcd08268bc31177e613a6343bbd1fd3e45f F autosetup/jimsh0.c 6573f6bc6ff204de0139692648d7037ca0b6c067bac83a7b4e087f20a86866a4 F autosetup/pkg-config.tcl 4e635bf39022ff65e0d5434339dd41503ea48fc53822c9c5bde88b02d3d952ba -F autosetup/proj.tcl cef1e0aa0f2dee2042af66f28c97a9445f84d55d858ba9db4f6116846a1a325f +F autosetup/proj.tcl 90cec210224dde699f3bee756d88c2477044f713db8a38112e695ec02e531eeb F autosetup/sqlite-config.tcl e1d65cc632e1de94ff39618ac82b649f2062f674ca36dae78ab3573cab096761 F autosetup/system.tcl 51d4be76cd9a9074704b584e5c9cbba616202c8468cf9ba8a4f8294a7ab1dba9 F configure 9a00b21dfd13757bbfb8d89b30660a89ec1f8f3a79402b8f9f9b6fc475c3303a x @@ -2207,8 +2207,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P 82fc67070f9aff0065c07cbeed40f4321e03617bdc3e517adc58a2d96e6e3e49 -R be54da7cd01ca59f1b81e516853a22f2 +P 628407f03d4bfb7499f0e6e2197089edf859380a3c4e6fecc517390327718141 +R 0566dfd2338327afb5cc1d164e7ce94d U stephan -Z 3cdd2336da3d5e5560137a38998c10e6 +Z b470bbb1231ec7883dd8df58ba06834f # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index bfbc8a28b3..d915946f6d 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -628407f03d4bfb7499f0e6e2197089edf859380a3c4e6fecc517390327718141 +4ae9d6c642295e3a0c1732dacf7c18ecacd39d3e74e38381ac5531c8396f5f1c From b42310a6b9a1b0635155de3a2c53aac4c73417a7 Mon Sep 17 00:00:00 2001 From: stephan Date: Thu, 20 Feb 2025 04:45:02 +0000 Subject: [PATCH 129/194] wasm makefile docs: make explicit that the node.js-for-node.js builds (as opposed to the node.js-for-browser builds) are both untested and unsupported. FossilOrigin-Name: e1f184889fef4603d61d306c8c0dc86df616290ccf73dbd871fa27bd99e5e5c9 --- ext/wasm/GNUmakefile | 3 ++- manifest | 13 ++++++------- manifest.uuid | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/ext/wasm/GNUmakefile b/ext/wasm/GNUmakefile index 572a3cd338..522ff1615a 100644 --- a/ext/wasm/GNUmakefile +++ b/ext/wasm/GNUmakefile @@ -136,8 +136,9 @@ JS_BUILD_NAMES := sqlite3 sqlite3-wasmfs # target of browsers. # # - node = for use by node.js for node.js, as opposed to by node.js on -# behalf o browser-side code (use bundler-friendly for that). Note +# behalf of browser-side code (use bundler-friendly for that). Note # that persistent storage (OPFS) is not available in these builds. +# These builds are UNTESTED and UNSUPPORTED! # JS_BUILD_MODES := vanilla esm bunder-friendly node diff --git a/manifest b/manifest index aa980f3b58..4343869548 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Add\sthe\spause/unpause\scapability\sto\sthe\sopfs-sahpool\sVFS,\sas\sdiscussed\sin\s[forum:fe8cdb8431c|forum\sthread\sfe8cdb8431c].\sSummary:\sthis\sgives\sclients\sa\sway\sto\seke\ssome\sdegree\sof\smulti-page/tab/Worker\sconcurrency\sout\sof\sthis\sVFS\sbut\srequires\sthat\scoordination\sto\sbe\simplemented\sclient-side,\se.g.\svia\sa\sSharedWorker\sor\sWebLocks. -D 2025-02-20T04:14:26.736 +C wasm\smakefile\sdocs:\smake\sexplicit\sthat\sthe\snode.js-for-node.js\sbuilds\s(as\sopposed\sto\sthe\snode.js-for-browser\sbuilds)\sare\sboth\suntested\sand\sunsupported. +D 2025-02-20T04:45:02.076 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d @@ -619,7 +619,7 @@ F ext/session/sqlite3session.c 52a680dbb03c4734748b215d95987fb4d95ab23baaf053a01 F ext/session/sqlite3session.h aa5de3ec8ef0e5313e9f65dafd69e8ba292d170f07b57da9200c040068dab061 F ext/session/test_session.c 12e0a2c15fd60f92da4bb29c697c9177ff0c0dbcdc5129a54c47e999f147937a F ext/wasm/EXPORTED_FUNCTIONS.fiddle.in 27450c8b8c70875a260aca55435ec927068b34cef801a96205adb81bdcefc65c -F ext/wasm/GNUmakefile 7889f9c5bab69233a65109e2bd00d627cab7470060e1b13b37781ac1b127f6c6 +F ext/wasm/GNUmakefile afecad95600b0361865a81c4490743f54fd2a5a4db64e50b361a9db0cb0553f5 F ext/wasm/README-dist.txt f01081a850ce38a56706af6b481e3a7878e24e42b314cfcd4b129f0f8427066a F ext/wasm/README.md b89605f65661cf35bf034ff6d43e448cc169b8017fc105d498e33b81218b482c F ext/wasm/SQLTester/GNUmakefile e0794f676d55819951bbfae45cc5e8d7818dc460492dc317ce7f0d2eca15caff @@ -2210,9 +2210,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P 4ae9d6c642295e3a0c1732dacf7c18ecacd39d3e74e38381ac5531c8396f5f1c e205cdc468e02eefdeb8d391d921aa2d4d28a8b7b87036d6d937a9928261a413 -R 224600d4f738e50568ab6b26e5819abb -T +closed e205cdc468e02eefdeb8d391d921aa2d4d28a8b7b87036d6d937a9928261a413 Closed\sby\sintegrate-merge. +P b5dbd521951e129b4dec69f191a872500dbf387b34a8479ad58b053ffcccbab9 +R 9e14f25c151c1ed248cfdda16fbb7871 U stephan -Z 8b67a5570124816c376abd5faa1b9b7a +Z a5f06d7dda0edaff65b376e4feee5c8b # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 5a2129b963..cad68956a7 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -b5dbd521951e129b4dec69f191a872500dbf387b34a8479ad58b053ffcccbab9 +e1f184889fef4603d61d306c8c0dc86df616290ccf73dbd871fa27bd99e5e5c9 From 9e632f5512dd3de93d3db8fc73603943c2abdc77 Mon Sep 17 00:00:00 2001 From: stephan Date: Thu, 20 Feb 2025 05:39:18 +0000 Subject: [PATCH 130/194] wasm: do not build the (untested/unsupported) node-for-node build by default, to cut build time by about 15%. Adjacent cleanups in mkwasmbuilds.c. FossilOrigin-Name: e4539ebebd89840b76f5a0626393299100685a38f45546a0bf7a62e4df56f863 --- ext/wasm/GNUmakefile | 11 ++++---- ext/wasm/mkwasmbuilds.c | 62 ++++++++++++++++++++++++++++------------- manifest | 14 +++++----- manifest.uuid | 2 +- 4 files changed, 57 insertions(+), 32 deletions(-) diff --git a/ext/wasm/GNUmakefile b/ext/wasm/GNUmakefile index 522ff1615a..42fdb072d3 100644 --- a/ext/wasm/GNUmakefile +++ b/ext/wasm/GNUmakefile @@ -892,12 +892,13 @@ EXPORTED_FUNCTIONS.fiddle := $(dir.tmp)/EXPORTED_FUNCTIONS.fiddle ######################################################################## ######################################################################## # We have to ensure that we do not build $(sqlite3*.*js) in parallel -# because they all result in the creation of $(sqlite3.wasm). We have -# no way to build just a .[m]js file without also building the .wasm -# file because the generated .[m]js file has to include info about the -# imports needed by the wasm file, so they have to be built +# for any builds which result in the creation of $(sqlite3.wasm). We +# have no way to build just a .[m]js file without also building the +# .wasm file because the generated .[m]js file has to include info +# about the imports needed by the wasm file, so they have to be built # together. i.e. we're building $(sqlite3.wasm) multiple times, but -# that's unavoidable (and harmless, just a waste of build time). +# that's unavoidable (and harmless, but is a significant waste of +# build time). $(sqlite3.wasm): $(sqlite3.js) $(sqlite3.mjs): $(sqlite3.js) $(sqlite3-bundler-friendly.mjs): $(sqlite3.mjs) diff --git a/ext/wasm/mkwasmbuilds.c b/ext/wasm/mkwasmbuilds.c index 91c03b6d42..4910379101 100644 --- a/ext/wasm/mkwasmbuilds.c +++ b/ext/wasm/mkwasmbuilds.c @@ -135,6 +135,24 @@ static void mk_prologue(void){ } } +/* +** Flags for use with the 3rd argument to mk_pre_post() and +** mk_lib_mode(). +*/ +enum LibModeFlags { + /* Indicates an ESM module build. */ + LIBMODE_ESM = 0x01, + /* Indicates a "bundler-friendly" build mode. */ + LIBMODE_BUNDLER_FRIENDLY = 0x02 | LIBMODE_ESM, + /* Indicates to _not_ add this build to the 'all' target. */ + LIBMODE_DONT_ADD_TO_ALL = 0x04, + /* Indicates a node.js-for-node.js build (untested and + ** unsupported). */ + LIBMODE_NODEJS = 0x08, + /* Indicates a wasmfs build (untested and unsupported). */ + LIBMODE_WASMFS = 0x10 | LIBMODE_ESM +}; + /* ** Emits makefile code for setting up values for the --pre-js=FILE, ** --post-js=FILE, and --extern-post-js=FILE emcc flags, as well as @@ -142,6 +160,7 @@ static void mk_prologue(void){ */ static void mk_pre_post(const char *zName /* build name */, const char *zMode /* build mode */, + int flags /* LIBMODE_... mask */, const char *zCmppD /* optional -D flags for c-pp for the ** --pre/--post-js files. */){ pf("%s# Begin --pre/--post flags for %s-%s\n", zBanner, zNM); @@ -166,9 +185,10 @@ static void mk_pre_post(const char *zName /* build name */, pf("\tcp $(pre-js.js.%s-%s.intermediary) $@\n", zNM); /* Amend $(pre-js.js.zName-zMode) for all targets except the plain - ** "sqlite3" build... */ + ** "sqlite3" and the "sqlite3-wasmfs" builds... */ if( 0!=strcmp("sqlite3-wasmfs", zName) && 0!=strcmp("sqlite3", zName) ){ +#error "This part ^^^ is needs adapting for use with the LIBMODE_... flags" pf("\t@echo 'Module[xNameOfInstantiateWasm].uri = " "\"%s.wasm\";' >> $@\n", zName); } @@ -209,7 +229,7 @@ static void mk_pre_post(const char *zName /* build name */, static void mk_fiddle(){ int i = 0; - mk_pre_post("fiddle-module","vanilla", 0); + mk_pre_post("fiddle-module","vanilla", 0, 0); for( ; i < 2; ++i ){ const char *zTail = i ? ".debug" : ""; const char *zDir = i ? "$(dir.fiddle-debug)" : "$(dir.fiddle)"; @@ -257,7 +277,7 @@ static void mk_fiddle(){ */ static void mk_lib_mode(const char *zName /* build name */, const char *zMode /* build mode */, - int bIsEsm /* true only for ESM build */, + int flags /* LIBMODE_... mask */, const char *zApiJsOut /* name of generated sqlite3-api.js/.mjs */, const char *zJsOut /* name of generated sqlite3.js/.mjs */, const char *zCmppD /* extra -D flags for c-pp */, @@ -276,7 +296,7 @@ static void mk_lib_mode(const char *zName /* build name */, pf("%s# Begin build [%s-%s]\n", zBanner, zNM); pf("# zApiJsOut=%s\n# zJsOut=%s\n# zCmppD=%s\n", zApiJsOut, zJsOut, zCmppD); pf("$(info Setting up build [%s-%s]: %s)\n", zNM, zJsOut); - mk_pre_post(zNM, zCmppD); + mk_pre_post(zNM, flags, zCmppD); pf("\nemcc.flags.%s.%s ?=\n", zNM); if( zEmcc[0] ){ pf("emcc.flags.%s.%s += %s\n", zNM, zEmcc); @@ -303,13 +323,13 @@ static void mk_lib_mode(const char *zName /* build name */, pf("\t\t$(cflags.common) $(SQLITE_OPT) \\\n" "\t\t$(cflags.%s) $(cflags.%s.%s) \\\n" "\t\t$(cflags.wasm_extra_init) $(sqlite3-wasm.cfiles)\n", zName, zNM); - if( bIsEsm ){ + if( LIBMODE_ESM & flags ){ /* TODO? Replace this $(call) with the corresponding makefile ** code. OTOH, we also use this $(call) in the speedtest1-wasmfs ** build, which is not part of the rules emitted by this ** program. */ pf("\t@$(call SQLITE.CALL.xJS.ESM-EXPORT-DEFAULT,1,%d)\n", - 0==strcmp("sqlite3-wasmfs", zName) ? 1 : 0); + (LIBMODE_WASMFS & flags) ? 1 : 0); } pf("\t@chmod -x %s; \\\n" "\t\t$(maybe-wasm-strip) %s;\n", @@ -331,15 +351,15 @@ static void mk_lib_mode(const char *zName /* build name */, ** resulting .wasm file is identical for all builds for which zEmcc ** is empty. */ - if( 0==strcmp("bundler-friendly", zMode) - || 0==strcmp("node", zMode) ){ + if( (LIBMODE_BUNDLER_FRIENDLY & flags) + || (LIBMODE_NODEJS & flags) ){ pf("\t@echo 'Patching $@ for %s.wasm...'; \\\n", zName); pf("\t\trm -f %s; \\\n", zWasmOut); pf("\t\tsed -i -e 's/%s-%s.wasm/%s.wasm/g' $@ || exit;\n", /* ^^^^^^ reminder: Mac/BSD sed has no -i flag */ zNM, zName); pf("\t@ls -la $@\n"); - if( 0==strcmp("bundler-friendly", zMode) ){ + if( LIBMODE_BUNDLER_FRIENDLY & flags ){ /* Avoid a 3rd occurance of the bug fixed by 65798c09a00662a3, ** which was (in two cases) caused by makefile refactoring and ** not recognized until after a release was made with the broken @@ -352,9 +372,7 @@ static void mk_lib_mode(const char *zName /* build name */, }else{ pf("\t@ls -la %s $@\n", zWasmOut); } - if( 0!=strcmp("sqlite3-wasmfs", zName) ){ - /* The sqlite3-wasmfs build is optional and needs to be invoked - ** conditionally using info we don't have here. */ + if( 0==(LIBMODE_DONT_ADD_TO_ALL & flags) ){ pf("all: %s\n", zJsOut); } pf("# End build [%s-%s]%s", zNM, zBanner); @@ -366,22 +384,28 @@ int main(void){ mk_prologue(); mk_lib_mode("sqlite3", "vanilla", 0, "$(sqlite3-api.js)", "$(sqlite3.js)", 0, 0); - mk_lib_mode("sqlite3", "esm", 1, + mk_lib_mode("sqlite3", "esm", LIBMODE_ESM, "$(sqlite3-api.mjs)", "$(sqlite3.mjs)", "-Dtarget=es6-module", 0); - mk_lib_mode("sqlite3", "bundler-friendly", 1, - "$(sqlite3-api-bundler-friendly.mjs)", "$(sqlite3-bundler-friendly.mjs)", + mk_lib_mode("sqlite3", "bundler-friendly", LIBMODE_BUNDLER_FRIENDLY, + "$(sqlite3-api-bundler-friendly.mjs)", + "$(sqlite3-bundler-friendly.mjs)", "$(c-pp.D.sqlite3-esm) -Dtarget=es6-bundler-friendly", 0); - mk_lib_mode("sqlite3" , "node", 1, + mk_lib_mode("sqlite3" , "node", + LIBMODE_NODEJS | LIBMODE_DONT_ADD_TO_ALL, "$(sqlite3-api-node.mjs)", "$(sqlite3-node.mjs)", "$(c-pp.D.sqlite3-bundler-friendly) -Dtarget=node", 0); - mk_lib_mode("sqlite3-wasmfs", "esm" ,1, + mk_lib_mode("sqlite3-wasmfs", "esm" , + LIBMODE_WASMFS | LIBMODE_DONT_ADD_TO_ALL, + /* The sqlite3-wasmfs build is optional and needs to be invoked + ** conditionally using info we don't have here. */ "$(sqlite3-api-wasmfs.mjs)", "$(sqlite3-wasmfs.mjs)", "$(c-pp.D.sqlite3-bundler-friendly) -Dwasmfs", "-sEXPORT_ES6 -sUSE_ES6_IMPORT_META"); mk_fiddle(); - mk_pre_post("speedtest1","vanilla", 0); - mk_pre_post("speedtest1-wasmfs","esm", "$(c-pp.D.sqlite3-bundler-friendly) -Dwasmfs"); + mk_pre_post("speedtest1","vanilla", 0, 0); + mk_pre_post("speedtest1-wasmfs","esm", 0, + "$(c-pp.D.sqlite3-bundler-friendly) -Dwasmfs"); return rc; } diff --git a/manifest b/manifest index 4343869548..dac984b02e 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C wasm\smakefile\sdocs:\smake\sexplicit\sthat\sthe\snode.js-for-node.js\sbuilds\s(as\sopposed\sto\sthe\snode.js-for-browser\sbuilds)\sare\sboth\suntested\sand\sunsupported. -D 2025-02-20T04:45:02.076 +C wasm:\sdo\snot\sbuild\sthe\s(untested/unsupported)\snode-for-node\sbuild\sby\sdefault,\sto\scut\sbuild\stime\sby\sabout\s15%.\sAdjacent\scleanups\sin\smkwasmbuilds.c. +D 2025-02-20T05:39:18.599 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d @@ -619,7 +619,7 @@ F ext/session/sqlite3session.c 52a680dbb03c4734748b215d95987fb4d95ab23baaf053a01 F ext/session/sqlite3session.h aa5de3ec8ef0e5313e9f65dafd69e8ba292d170f07b57da9200c040068dab061 F ext/session/test_session.c 12e0a2c15fd60f92da4bb29c697c9177ff0c0dbcdc5129a54c47e999f147937a F ext/wasm/EXPORTED_FUNCTIONS.fiddle.in 27450c8b8c70875a260aca55435ec927068b34cef801a96205adb81bdcefc65c -F ext/wasm/GNUmakefile afecad95600b0361865a81c4490743f54fd2a5a4db64e50b361a9db0cb0553f5 +F ext/wasm/GNUmakefile c6a98150911c8f882aa75a9fbf148b124c59b22078799f9f9c6061bfbb128a33 F ext/wasm/README-dist.txt f01081a850ce38a56706af6b481e3a7878e24e42b314cfcd4b129f0f8427066a F ext/wasm/README.md b89605f65661cf35bf034ff6d43e448cc169b8017fc105d498e33b81218b482c F ext/wasm/SQLTester/GNUmakefile e0794f676d55819951bbfae45cc5e8d7818dc460492dc317ce7f0d2eca15caff @@ -680,7 +680,7 @@ F ext/wasm/index-dist.html 56132399702b15d70c474c3f1952541e25cb0922942868f70daf1 F ext/wasm/index.html bcaa00eca521b372a6a62c7e7b17a870b0fcdf3e418a5921df1fd61e5344080d F ext/wasm/jaccwabyt/jaccwabyt.js 1264710db3cfbcb6887d95665b7aeba60c1126eaef789ca4cf1a4a17d5bc7f54 F ext/wasm/jaccwabyt/jaccwabyt.md 59a20df389abcc3606eb4eaea7fb7ba14504beb3e345dbea9b99a0618ba3bec8 -F ext/wasm/mkwasmbuilds.c baf6636e139e2c1e3b56e8dc26073ec80f6d14ae1876b023985315f43ccf312b +F ext/wasm/mkwasmbuilds.c 57ce3c6e30c17078586dde9b5dec946f6a2d08f195067d4b6feefbc0bf1e0a4b F ext/wasm/module-symbols.html dc476b403369b26a1a23773e13b80f41b9a49f0825e81435fe3600a7cfbbe337 F ext/wasm/scratchpad-wasmfs.html a3d7388f3c4b263676b58b526846e9d02dfcb4014ff29d3a5040935286af5b96 F ext/wasm/scratchpad-wasmfs.mjs 66034b9256b218de59248aad796760a1584c1dd842231505895eff00dbd57c63 @@ -2210,8 +2210,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P b5dbd521951e129b4dec69f191a872500dbf387b34a8479ad58b053ffcccbab9 -R 9e14f25c151c1ed248cfdda16fbb7871 +P e1f184889fef4603d61d306c8c0dc86df616290ccf73dbd871fa27bd99e5e5c9 +R 84806d4092a27a5838a354dffcfb957d U stephan -Z a5f06d7dda0edaff65b376e4feee5c8b +Z 323bb73cbee281d90dd439bde340e242 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index cad68956a7..891b7eaeca 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -e1f184889fef4603d61d306c8c0dc86df616290ccf73dbd871fa27bd99e5e5c9 +e4539ebebd89840b76f5a0626393299100685a38f45546a0bf7a62e4df56f863 From 2a300a2853cf0f460563ecd491ec89d5c3717756 Mon Sep 17 00:00:00 2001 From: stephan Date: Thu, 20 Feb 2025 16:45:45 +0000 Subject: [PATCH 131/194] Fix autoconf bundle to honor the --disable-static and --disable-shared flags, as reported in [forum:ae5bd8a84b|forum post ae5bd8a84b]. Problem introduced in 3.49.0. FossilOrigin-Name: 56027220cc15b69cb98ba5360ffd3718c997e10d51e30eebeff14f0dc358d103 --- autoconf/Makefile.in | 8 ++++++-- manifest | 12 ++++++------ manifest.uuid | 2 +- 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/autoconf/Makefile.in b/autoconf/Makefile.in index d494e9d1e0..8a9c2c7b3f 100644 --- a/autoconf/Makefile.in +++ b/autoconf/Makefile.in @@ -149,11 +149,15 @@ $(libsqlite3.SO): sqlite3.o $(CC) -o $@ sqlite3.o $(LDFLAGS.shlib) \ $(LDFLAGS) $(LDFLAGS.libsqlite3) \ $(LDFLAGS.libsqlite3.os-specific) $(LDFLAGS.libsqlite3.soname) -all: $(libsqlite3.SO) +$(libsqlite3.SO)-1: $(libsqlite3.SO) +$(libsqlite3.SO)-0: +all: $(libsqlite3.SO)-$(ENABLE_LIB_SHARED) $(libsqlite3.LIB): sqlite3.o $(AR) $(AR.flags) $@ sqlite3.o -all: $(libsqlite3.LIB) +$(libsqlite3.LIB)-1: $(libsqlite3.LIB) +$(libsqlite3.LIB)-0: +all: $(libsqlite3.LIB)-$(ENABLE_LIB_STATIC) install-so-1: $(install-dir.lib) $(libsqlite3.SO) $(INSTALL) $(libsqlite3.SO) "$(install-dir.lib)" diff --git a/manifest b/manifest index dac984b02e..b3754afc40 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C wasm:\sdo\snot\sbuild\sthe\s(untested/unsupported)\snode-for-node\sbuild\sby\sdefault,\sto\scut\sbuild\stime\sby\sabout\s15%.\sAdjacent\scleanups\sin\smkwasmbuilds.c. -D 2025-02-20T05:39:18.599 +C Fix\sautoconf\sbundle\sto\shonor\sthe\s--disable-static\sand\s--disable-shared\sflags,\sas\sreported\sin\s[forum:ae5bd8a84b|forum\spost\sae5bd8a84b].\sProblem\sintroduced\sin\s3.49.0. +D 2025-02-20T16:45:45.335 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d @@ -16,7 +16,7 @@ F art/sqlite370.jpg d512473dae7e378a67e28ff96a34da7cb331def2 F art/sqlite370.svg 40b7e2fe8aac3add5d56dd86ab8d427a4eca5bcb3fe4f8946cb3794e1821d531 F auto.def eddf6aef976e2c1a56c0accc3244945e0b22ec6799074c40be160e5a9a5662b0 F autoconf/Makefile.fallback 22fe523eb36dfce31e0f6349f782eb084e86a5620b2b0b4f84a2d6133f53f5ac -F autoconf/Makefile.in 844bc155e1c02075821530b2b4d996ab3d162e647352bb6e2895f3d0e64ad988 +F autoconf/Makefile.in ed042ba44540e67e17b1e7bd787e8118a9d14664ba8049966ec9bc54a10676ce F autoconf/Makefile.msc 1249e425a24859c7b3f17575275247df9eec3bddc0d1d7e73941f1abdbb95a92 F autoconf/README.first f1d3876e9a7852c22f275a6f06814e64934cecbc0b5b9617d64849094c1fd136 F autoconf/README.txt 7f01dc3915e2d68f329011073662369e62a0938a2c69398807823c57591cb288 @@ -2210,8 +2210,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P e1f184889fef4603d61d306c8c0dc86df616290ccf73dbd871fa27bd99e5e5c9 -R 84806d4092a27a5838a354dffcfb957d +P e4539ebebd89840b76f5a0626393299100685a38f45546a0bf7a62e4df56f863 +R 34877b8b42b297ff0e60f31b146ccdd9 U stephan -Z 323bb73cbee281d90dd439bde340e242 +Z 1623c39947cf064dc746ab5f77cf216c # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 891b7eaeca..d46913efa2 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -e4539ebebd89840b76f5a0626393299100685a38f45546a0bf7a62e4df56f863 +56027220cc15b69cb98ba5360ffd3718c997e10d51e30eebeff14f0dc358d103 From a80089c5167856f0aadc9c878bd65843df724c06 Mon Sep 17 00:00:00 2001 From: stephan Date: Thu, 20 Feb 2025 17:14:40 +0000 Subject: [PATCH 132/194] configure: automatically fail the check for rpath on AIX systems and provide a --disable-rpath flag as a fallback for use on platforms which pass the configure-time rpath check but then fail at link-time. Based on discussion in [forum:ae5bd8a84b|forum thread ae5bd8a84b]. FossilOrigin-Name: a15e0f6802a5ba7bc5a7a70d6a162ea4548b49b132a5ac31263e64c388bbafcb --- auto.def | 2 +- autoconf/auto.def | 2 +- autosetup/proj.tcl | 18 ++++++++++++++---- autosetup/sqlite-config.tcl | 14 ++++++++++++++ manifest | 18 +++++++++--------- manifest.uuid | 2 +- 6 files changed, 40 insertions(+), 16 deletions(-) diff --git a/auto.def b/auto.def index 9df87f579a..84dfa824c2 100644 --- a/auto.def +++ b/auto.def @@ -59,7 +59,7 @@ proj-define-for-opt linemacros AMALGAMATION_LINE_MACROS \ define LINK_TOOLS_DYNAMICALLY [proj-opt-was-provided dynlink-tools] -proj-check-rpath +sqlite-handle-rpath sqlite-handle-soname sqlite-handle-debug sqlite-handle-tcl diff --git a/autoconf/auto.def b/autoconf/auto.def index 099b52aff7..069f3e931f 100644 --- a/autoconf/auto.def +++ b/autoconf/auto.def @@ -11,7 +11,7 @@ use sqlite-config sqlite-config-bootstrap autoconf sqlite-check-common-bins sqlite-check-common-system-deps -proj-check-rpath +sqlite-handle-rpath sqlite-handle-soname sqlite-setup-default-cflags sqlite-handle-debug diff --git a/autosetup/proj.tcl b/autosetup/proj.tcl index c81fe910d0..210c79b428 100644 --- a/autosetup/proj.tcl +++ b/autosetup/proj.tcl @@ -947,9 +947,20 @@ proc proj-check-emsdk {} { # # Achtung: we have seen platforms which report that a given option # checked here will work but then fails at build-time, and the current -# order of checks reflects that. +# order of checks reflects that. Similarly, platforms which are known +# to report success here but fail to handle this flag at link-time are +# special-cased here to behave as if the check failed. proc proj-check-rpath {} { - set rc 1 + switch -glob -- [get-define host] { + *-*-aix* { + # Skip this check on platform(s) where we know it to pass at + # this step but fail at build-time, as a workaround for + # https://sqlite.org/forum/forumpost/ae5bd8a84b until we can + # find a more reliable approach. + define LDFLAGS_RPATH "" + return 0 + } + } if {[proj-opt-was-provided libdir] || [proj-opt-was-provided exec-prefix]} { set lp "[get-define libdir]" @@ -971,10 +982,9 @@ proc proj-check-rpath {} { define LDFLAGS_RPATH "-Wl,-R$lp" } else { define LDFLAGS_RPATH "" - set rc 0 } } - return $rc + expr {"" ne [get-define LDFLAGS_RPATH]} } ######################################################################## diff --git a/autosetup/sqlite-config.tcl b/autosetup/sqlite-config.tcl index 7d9a9ea84b..be2522fb12 100644 --- a/autosetup/sqlite-config.tcl +++ b/autosetup/sqlite-config.tcl @@ -244,6 +244,9 @@ proc sqlite-config-bootstrap {buildMode} { static-shell=1 => {Link the sqlite3 shell app against the DLL instead of embedding sqlite3.c} } {*} { + # rpath: https://sqlite.org/forum/forumpost/fa3a6ed858 + rpath=1 + => {Disable checking for rpath support} # soname: https://sqlite.org/src/forumpost/5a3b44f510df8ded soname:=legacy => {SONAME for libsqlite3.so. "none", or not using this flag, sets no @@ -644,6 +647,17 @@ proc sqlite-handle-debug {} { } } +######################################################################## +# If the --disable-rpath flag is used, this [define]s LDFLAGS_RPATH to +# an empty string, else it invokes [proj-check-rpath]. +proc sqlite-handle-rpath {} { + proj-if-opt-truthy rpath { + proj-check-rpath + } { + define LDFLAGS_RPATH "" + } +} + ######################################################################## # "soname" for libsqlite3.so. See discussion at: # https://sqlite.org/src/forumpost/5a3b44f510df8ded diff --git a/manifest b/manifest index b3754afc40..6e5b6edfe0 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Fix\sautoconf\sbundle\sto\shonor\sthe\s--disable-static\sand\s--disable-shared\sflags,\sas\sreported\sin\s[forum:ae5bd8a84b|forum\spost\sae5bd8a84b].\sProblem\sintroduced\sin\s3.49.0. -D 2025-02-20T16:45:45.335 +C configure:\sautomatically\sfail\sthe\scheck\sfor\srpath\son\sAIX\ssystems\sand\sprovide\sa\s--disable-rpath\sflag\sas\sa\sfallback\sfor\suse\son\splatforms\swhich\spass\sthe\sconfigure-time\srpath\scheck\sbut\sthen\sfail\sat\slink-time.\sBased\son\sdiscussion\sin\s[forum:ae5bd8a84b|forum\sthread\sae5bd8a84b]. +D 2025-02-20T17:14:40.228 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d @@ -14,13 +14,13 @@ F art/sqlite370.eps aa97a671332b432a54e1d74ff5e8775be34200c2 F art/sqlite370.ico af56c1d00fee7cd4753e8631ed60703ed0fc6e90 F art/sqlite370.jpg d512473dae7e378a67e28ff96a34da7cb331def2 F art/sqlite370.svg 40b7e2fe8aac3add5d56dd86ab8d427a4eca5bcb3fe4f8946cb3794e1821d531 -F auto.def eddf6aef976e2c1a56c0accc3244945e0b22ec6799074c40be160e5a9a5662b0 +F auto.def 9e4315ae57d558c033a7bfb1f3ba0e9e0117147516b8c78c06276663b83b8cad F autoconf/Makefile.fallback 22fe523eb36dfce31e0f6349f782eb084e86a5620b2b0b4f84a2d6133f53f5ac F autoconf/Makefile.in ed042ba44540e67e17b1e7bd787e8118a9d14664ba8049966ec9bc54a10676ce F autoconf/Makefile.msc 1249e425a24859c7b3f17575275247df9eec3bddc0d1d7e73941f1abdbb95a92 F autoconf/README.first f1d3876e9a7852c22f275a6f06814e64934cecbc0b5b9617d64849094c1fd136 F autoconf/README.txt 7f01dc3915e2d68f329011073662369e62a0938a2c69398807823c57591cb288 -F autoconf/auto.def 3a318c4898024b35ed61a4876a42e3dcc313f93bd8486874d1ad498b88643d1a +F autoconf/auto.def 64c1a116162da18783a5467b49e539538f7013ea50ae192f182987b5c2f66f9e F autoconf/tea/Makefile.in ba0556fee8da09c066bad85a4457904e46ee2c2eabaa309c0e83a78f2f151a8e F autoconf/tea/README.txt 61e62e519579e4a112791354d6d440f8b51ea6db3b0bab58d59f29df42d2dfe3 F autoconf/tea/aclocal.m4 52c47aac44ce0ddb1f918b6993e8beb8eee88f43 @@ -49,8 +49,8 @@ F autosetup/cc-shared.tcl 4f024e94a47f427ba61de1739f6381ef0080210f9fae89112d5c1d F autosetup/cc.tcl c0fcc50ca91deff8741e449ddad05bcd08268bc31177e613a6343bbd1fd3e45f F autosetup/jimsh0.c 6573f6bc6ff204de0139692648d7037ca0b6c067bac83a7b4e087f20a86866a4 F autosetup/pkg-config.tcl 4e635bf39022ff65e0d5434339dd41503ea48fc53822c9c5bde88b02d3d952ba -F autosetup/proj.tcl 90cec210224dde699f3bee756d88c2477044f713db8a38112e695ec02e531eeb -F autosetup/sqlite-config.tcl e1d65cc632e1de94ff39618ac82b649f2062f674ca36dae78ab3573cab096761 +F autosetup/proj.tcl 57dadc3b9a1e88e8450d1e81b2fdb22d3abf3862f22730cec4441ee346c95d8e +F autosetup/sqlite-config.tcl 87732c140cce3327b709d1f7746c999149500fd28682dff384da58af68c844b0 F autosetup/system.tcl 51d4be76cd9a9074704b584e5c9cbba616202c8468cf9ba8a4f8294a7ab1dba9 F configure 9a00b21dfd13757bbfb8d89b30660a89ec1f8f3a79402b8f9f9b6fc475c3303a x F contrib/sqlitecon.tcl 210a913ad63f9f991070821e599d600bd913e0ad @@ -2210,8 +2210,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P e4539ebebd89840b76f5a0626393299100685a38f45546a0bf7a62e4df56f863 -R 34877b8b42b297ff0e60f31b146ccdd9 +P 56027220cc15b69cb98ba5360ffd3718c997e10d51e30eebeff14f0dc358d103 +R f3ae16535d715f2c6ddf37b01c3a97d9 U stephan -Z 1623c39947cf064dc746ab5f77cf216c +Z e0fc1942290bf1287975667fbad9ae43 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index d46913efa2..72543de028 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -56027220cc15b69cb98ba5360ffd3718c997e10d51e30eebeff14f0dc358d103 +a15e0f6802a5ba7bc5a7a70d6a162ea4548b49b132a5ac31263e64c388bbafcb From 220260b8965eb264cab8cb5ee42baacb08ef1eb4 Mon Sep 17 00:00:00 2001 From: stephan Date: Fri, 21 Feb 2025 03:19:21 +0000 Subject: [PATCH 133/194] configure: in several places where support for -Wl,... linker flags are checked, ensure that the check invokes the linker (not just the compiler) to avoid false positives. This allows us to remove the AIX-specific handling and --disable-rpath bits added in [a15e0f680], as well as make several similar checks more robust. FossilOrigin-Name: 4e81e2c707a954dcda6219dc94e2b96dd0c9907bd4beab28adad51d488b7d739 --- auto.def | 2 +- autoconf/auto.def | 2 +- autosetup/proj.tcl | 20 ++------------------ autosetup/sqlite-config.tcl | 30 +++++++++++------------------- manifest | 18 +++++++++--------- manifest.uuid | 2 +- 6 files changed, 25 insertions(+), 49 deletions(-) diff --git a/auto.def b/auto.def index 84dfa824c2..9df87f579a 100644 --- a/auto.def +++ b/auto.def @@ -59,7 +59,7 @@ proj-define-for-opt linemacros AMALGAMATION_LINE_MACROS \ define LINK_TOOLS_DYNAMICALLY [proj-opt-was-provided dynlink-tools] -sqlite-handle-rpath +proj-check-rpath sqlite-handle-soname sqlite-handle-debug sqlite-handle-tcl diff --git a/autoconf/auto.def b/autoconf/auto.def index 069f3e931f..099b52aff7 100644 --- a/autoconf/auto.def +++ b/autoconf/auto.def @@ -11,7 +11,7 @@ use sqlite-config sqlite-config-bootstrap autoconf sqlite-check-common-bins sqlite-check-common-system-deps -sqlite-handle-rpath +proj-check-rpath sqlite-handle-soname sqlite-setup-default-cflags sqlite-handle-debug diff --git a/autosetup/proj.tcl b/autosetup/proj.tcl index 210c79b428..c11b05d5f7 100644 --- a/autosetup/proj.tcl +++ b/autosetup/proj.tcl @@ -944,23 +944,7 @@ proc proj-check-emsdk {} { # --exec-prefix=... or --libdir=... are explicitly passed to # configure then [get-define libdir] is used (noting that it derives # from exec-prefix by default). -# -# Achtung: we have seen platforms which report that a given option -# checked here will work but then fails at build-time, and the current -# order of checks reflects that. Similarly, platforms which are known -# to report success here but fail to handle this flag at link-time are -# special-cased here to behave as if the check failed. proc proj-check-rpath {} { - switch -glob -- [get-define host] { - *-*-aix* { - # Skip this check on platform(s) where we know it to pass at - # this step but fail at build-time, as a workaround for - # https://sqlite.org/forum/forumpost/ae5bd8a84b until we can - # find a more reliable approach. - define LDFLAGS_RPATH "" - return 0 - } - } if {[proj-opt-was-provided libdir] || [proj-opt-was-provided exec-prefix]} { set lp "[get-define libdir]" @@ -971,7 +955,7 @@ proc proj-check-rpath {} { # CFLAGS or LIBS or whatever it is that cc-check-flags updates) then # downstream tests may fail because the resulting rpath gets # implicitly injected into them. - cc-with {} { + cc-with {-link 1} { if {[cc-check-flags "-rpath $lp"]} { define LDFLAGS_RPATH "-rpath $lp" } elseif {[cc-check-flags "-Wl,-rpath,$lp"]} { @@ -1001,7 +985,7 @@ proc proj-check-rpath {} { # potentially avoid some end-user confusion by using their own lib's # name here (which shows up in the "checking..." output). proc proj-check-soname {{libname "libfoo.so.0"}} { - cc-with {} { + cc-with {-link 1} { if {[cc-check-flags "-Wl,-soname,${libname}"]} { define LDFLAGS_SONAME_PREFIX "-Wl,-soname," return 1 diff --git a/autosetup/sqlite-config.tcl b/autosetup/sqlite-config.tcl index be2522fb12..856be4cabc 100644 --- a/autosetup/sqlite-config.tcl +++ b/autosetup/sqlite-config.tcl @@ -244,9 +244,6 @@ proc sqlite-config-bootstrap {buildMode} { static-shell=1 => {Link the sqlite3 shell app against the DLL instead of embedding sqlite3.c} } {*} { - # rpath: https://sqlite.org/forum/forumpost/fa3a6ed858 - rpath=1 - => {Disable checking for rpath support} # soname: https://sqlite.org/src/forumpost/5a3b44f510df8ded soname:=legacy => {SONAME for libsqlite3.so. "none", or not using this flag, sets no @@ -647,17 +644,6 @@ proc sqlite-handle-debug {} { } } -######################################################################## -# If the --disable-rpath flag is used, this [define]s LDFLAGS_RPATH to -# an empty string, else it invokes [proj-check-rpath]. -proc sqlite-handle-rpath {} { - proj-if-opt-truthy rpath { - proj-check-rpath - } { - define LDFLAGS_RPATH "" - } -} - ######################################################################## # "soname" for libsqlite3.so. See discussion at: # https://sqlite.org/src/forumpost/5a3b44f510df8ded @@ -1240,7 +1226,7 @@ proc sqlite-check-mac-cversion {} { define LDFLAGS_MAC_CVERSION "" set rc 0 if {[proj-looks-like-mac]} { - cc-with {} { + cc-with {-link 1} { # These version numbers are historical libtool-defined values, not # library-defined ones if {[cc-check-flags "-Wl,-current_version,9.6.0"] @@ -1264,16 +1250,19 @@ proc sqlite-check-mac-cversion {} { # (e.g. mingw). Returns 1 if supported, else 0. # # If the configure flag --out-implib is not used then this is a no-op. -# The feature is specifically opt-in because on some platforms the -# feature test will pass but using that flag will fail at link-time -# (e.g. OpenBSD). +# If that flag is used but the capability is not available, a fatal +# error is triggered. +# +# This feature is specifically opt-in because it's supported on far +# more platforms than actually need it and enabling it causes creation +# of libsqlite3.so.a files which are unnecessary in most environments. # # Added in response to: https://sqlite.org/forum/forumpost/0c7fc097b2 proc sqlite-check-out-implib {} { define LDFLAGS_OUT_IMPLIB "" set rc 0 if {[proj-opt-was-provided out-implib]} { - cc-with {} { + cc-with {-link 1} { set dll "libsqlite3[get-define TARGET_DLLEXT]" set flags "-Wl,--out-implib,${dll}.a" if {[cc-check-flags $flags]} { @@ -1281,6 +1270,9 @@ proc sqlite-check-out-implib {} { set rc 1 } } + if {!$rc} { + user-error "--out-implib is not supported on this platform" + } } return $rc } diff --git a/manifest b/manifest index 6e5b6edfe0..89f3436486 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C configure:\sautomatically\sfail\sthe\scheck\sfor\srpath\son\sAIX\ssystems\sand\sprovide\sa\s--disable-rpath\sflag\sas\sa\sfallback\sfor\suse\son\splatforms\swhich\spass\sthe\sconfigure-time\srpath\scheck\sbut\sthen\sfail\sat\slink-time.\sBased\son\sdiscussion\sin\s[forum:ae5bd8a84b|forum\sthread\sae5bd8a84b]. -D 2025-02-20T17:14:40.228 +C configure:\sin\sseveral\splaces\swhere\ssupport\sfor\s-Wl,...\slinker\sflags\sare\schecked,\sensure\sthat\sthe\scheck\sinvokes\sthe\slinker\s(not\sjust\sthe\scompiler)\sto\savoid\sfalse\spositives.\sThis\sallows\sus\sto\sremove\sthe\sAIX-specific\shandling\sand\s--disable-rpath\sbits\sadded\sin\s[a15e0f680],\sas\swell\sas\smake\sseveral\ssimilar\schecks\smore\srobust. +D 2025-02-21T03:19:21.417 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d @@ -14,13 +14,13 @@ F art/sqlite370.eps aa97a671332b432a54e1d74ff5e8775be34200c2 F art/sqlite370.ico af56c1d00fee7cd4753e8631ed60703ed0fc6e90 F art/sqlite370.jpg d512473dae7e378a67e28ff96a34da7cb331def2 F art/sqlite370.svg 40b7e2fe8aac3add5d56dd86ab8d427a4eca5bcb3fe4f8946cb3794e1821d531 -F auto.def 9e4315ae57d558c033a7bfb1f3ba0e9e0117147516b8c78c06276663b83b8cad +F auto.def eddf6aef976e2c1a56c0accc3244945e0b22ec6799074c40be160e5a9a5662b0 F autoconf/Makefile.fallback 22fe523eb36dfce31e0f6349f782eb084e86a5620b2b0b4f84a2d6133f53f5ac F autoconf/Makefile.in ed042ba44540e67e17b1e7bd787e8118a9d14664ba8049966ec9bc54a10676ce F autoconf/Makefile.msc 1249e425a24859c7b3f17575275247df9eec3bddc0d1d7e73941f1abdbb95a92 F autoconf/README.first f1d3876e9a7852c22f275a6f06814e64934cecbc0b5b9617d64849094c1fd136 F autoconf/README.txt 7f01dc3915e2d68f329011073662369e62a0938a2c69398807823c57591cb288 -F autoconf/auto.def 64c1a116162da18783a5467b49e539538f7013ea50ae192f182987b5c2f66f9e +F autoconf/auto.def 3a318c4898024b35ed61a4876a42e3dcc313f93bd8486874d1ad498b88643d1a F autoconf/tea/Makefile.in ba0556fee8da09c066bad85a4457904e46ee2c2eabaa309c0e83a78f2f151a8e F autoconf/tea/README.txt 61e62e519579e4a112791354d6d440f8b51ea6db3b0bab58d59f29df42d2dfe3 F autoconf/tea/aclocal.m4 52c47aac44ce0ddb1f918b6993e8beb8eee88f43 @@ -49,8 +49,8 @@ F autosetup/cc-shared.tcl 4f024e94a47f427ba61de1739f6381ef0080210f9fae89112d5c1d F autosetup/cc.tcl c0fcc50ca91deff8741e449ddad05bcd08268bc31177e613a6343bbd1fd3e45f F autosetup/jimsh0.c 6573f6bc6ff204de0139692648d7037ca0b6c067bac83a7b4e087f20a86866a4 F autosetup/pkg-config.tcl 4e635bf39022ff65e0d5434339dd41503ea48fc53822c9c5bde88b02d3d952ba -F autosetup/proj.tcl 57dadc3b9a1e88e8450d1e81b2fdb22d3abf3862f22730cec4441ee346c95d8e -F autosetup/sqlite-config.tcl 87732c140cce3327b709d1f7746c999149500fd28682dff384da58af68c844b0 +F autosetup/proj.tcl cd6134e98d06ab4ae3be746d185dcdbf5180bfa049fe46a6726e703f56ea2f9c +F autosetup/sqlite-config.tcl 9d1e3bbc561af5f8705f96c0f48252112d3e2d3356383f5529f7f9f7b51afb65 F autosetup/system.tcl 51d4be76cd9a9074704b584e5c9cbba616202c8468cf9ba8a4f8294a7ab1dba9 F configure 9a00b21dfd13757bbfb8d89b30660a89ec1f8f3a79402b8f9f9b6fc475c3303a x F contrib/sqlitecon.tcl 210a913ad63f9f991070821e599d600bd913e0ad @@ -2210,8 +2210,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P 56027220cc15b69cb98ba5360ffd3718c997e10d51e30eebeff14f0dc358d103 -R f3ae16535d715f2c6ddf37b01c3a97d9 +P a15e0f6802a5ba7bc5a7a70d6a162ea4548b49b132a5ac31263e64c388bbafcb +R 42c23a2d2b7be27c2c7a4de01b0af4e3 U stephan -Z e0fc1942290bf1287975667fbad9ae43 +Z 369390f432e27c3785cf51965afea95c # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 72543de028..b9eb88d3ff 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -a15e0f6802a5ba7bc5a7a70d6a162ea4548b49b132a5ac31263e64c388bbafcb +4e81e2c707a954dcda6219dc94e2b96dd0c9907bd4beab28adad51d488b7d739 From ce25007db8df01e3271486574d520d4dea4cf97a Mon Sep 17 00:00:00 2001 From: drh <> Date: Fri, 21 Feb 2025 17:03:22 +0000 Subject: [PATCH 134/194] Detect when a UNIQUE or PRIMARY KEY on a WITHOUT ROWID table would need to use more than SQLITE_LIMIT_COLUMN columns and raise an error. Also include some unrelated compiler warning fixes. FossilOrigin-Name: d7729dbbf231d57cbcaaa5004d0a9c4957f112dd6520052995b232aa521c0ca3 --- manifest | 34 +++++++++++++++++----------------- manifest.uuid | 2 +- src/alter.c | 34 +++++++++++++++++++++------------- src/build.c | 22 +++++++++++++++++----- src/expr.c | 2 +- src/insert.c | 2 +- src/parse.y | 4 ++-- src/select.c | 12 ++++++------ src/sqliteInt.h | 10 +++++----- src/sqliteLimit.h | 6 ++++-- src/status.c | 7 ++++--- src/window.c | 2 +- test/without_rowid1.test | 20 ++++++++++++++++++++ 13 files changed, 100 insertions(+), 57 deletions(-) diff --git a/manifest b/manifest index 89f3436486..bb9dfef35a 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C configure:\sin\sseveral\splaces\swhere\ssupport\sfor\s-Wl,...\slinker\sflags\sare\schecked,\sensure\sthat\sthe\scheck\sinvokes\sthe\slinker\s(not\sjust\sthe\scompiler)\sto\savoid\sfalse\spositives.\sThis\sallows\sus\sto\sremove\sthe\sAIX-specific\shandling\sand\s--disable-rpath\sbits\sadded\sin\s[a15e0f680],\sas\swell\sas\smake\sseveral\ssimilar\schecks\smore\srobust. -D 2025-02-21T03:19:21.417 +C Detect\swhen\sa\sUNIQUE\sor\sPRIMARY\sKEY\son\sa\sWITHOUT\sROWID\stable\swould\sneed\nto\suse\smore\sthan\sSQLITE_LIMIT_COLUMN\scolumns\sand\sraise\san\serror.\nAlso\sinclude\ssome\sunrelated\scompiler\swarning\sfixes. +D 2025-02-21T17:03:22.433 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d @@ -715,7 +715,7 @@ F mptest/multiwrite01.test dab5c5f8f9534971efce679152c5146da265222d F sqlite.pc.in 42b7bf0d02e08b9e77734a47798d1a55a9e0716b F sqlite3.1 acdff36db796e2d00225b911d3047d580cd136547298435426ce9d40347973cc F sqlite3.pc.in 0977c03a4da7c4204bd60e784a0efb8d51a190448aba78a4e973fe7192bdaf03 -F src/alter.c 1751e231d8385067fa0d0145f0d461a092db6bd3d7edbfc3172db625aceccd9a +F src/alter.c 04cad1defb7262937e586b0529f3a524ac825aa283341e326546cf08de35b209 F src/analyze.c 6d27b425a16817975e6a4f8501e531d13dd1bf4b53bff2329dbc1f301aeef82d F src/attach.c c36d9d82811e2274bd06bf3b34459e36d8ae8a7f32efa5cbf3f890eef08a9987 F src/auth.c 54ab9c6c5803b47c0d45b76ce27eff22a03b4b1f767c5945a3a4eb13aa4c78dc @@ -725,14 +725,14 @@ F src/btmutex.c 79a43670447eacc651519a429f6ece9fd638563cf95b469d6891185ddae2b522 F src/btree.c 9316859aa5f14bde4a3719ffb1570219e51c5de433221e38b87ea19db868aedf F src/btree.h 18e5e7b2124c23426a283523e5f31a4bff029131b795bb82391f9d2f3136fc50 F src/btreeInt.h 98aadb6dcb77b012cab2574d6a728fad56b337fc946839b9898c4b4c969e30b6 -F src/build.c 2fa35745a279e2a17eec6df67a3cd35d456c136a7f5c75e80bdd6c5658423b60 +F src/build.c c2bcfc7e5072a743a051699f06329ee206299729adf4323fed9be8aa2d64af73 F src/callback.c acae8c8dddda41ee85cfdf19b926eefe830f371069f8aadca3aa39adf5b1c859 F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e F src/date.c 842c08ac143a56a627b05ac51d68624f2b7b03e3b4cba596205e735eed64ee57 F src/dbpage.c 2e677acb658a29965e55398bbc61161cb7819da538057c8032adac7ab8e4a8c0 F src/dbstat.c 73362c0df0f40ad5523a6f5501224959d0976757b511299bf892313e79d14f5c F src/delete.c 03a77ba20e54f0f42ebd8eddf15411ed6bdb06a2c472ac4b6b336521bf7cea42 -F src/expr.c 6e0635f3e3761f368d10e77d26d29a1a521ab208f1be66e84c13354ffbcf5ad2 +F src/expr.c 6769d3f0ca9b1792e883e3ff21fdc5ca0033cece65571ebbf9d8b8fe2f47cd27 F src/fault.c 460f3e55994363812d9d60844b2a6de88826e007 F src/fkey.c 928ed2517e8732113d2b9821aa37af639688d752f4ea9ac6e0e393d713eeb76f F src/func.c 6c8b7bbdc5b588f3cfc79ed5effcfd3031758f5034c464fcd8891e8010b4d317 @@ -741,7 +741,7 @@ F src/hash.c 73934a7f7ab1cb110614a9388cb516893b0cf5b7b69e4fd1a0780ac4ce166be7 F src/hash.h 46b92795a95bfefb210f52f0c316e9d7cdbcdd7e7fcfb0d8be796d3a5767cddf F src/hwtime.h f9c2dfb84dce7acf95ce6d289e46f5f9d3d1afd328e53da8f8e9008e3b3caae6 F src/in-operator.md 10cd8f4bcd225a32518407c2fb2484089112fd71 -F src/insert.c 05e04ef637cbc0dccb9a5c5d188a5a2608891e554c8ec17c7a71afe2cf896a06 +F src/insert.c a5f0366266be993ebf533808f22cb7a788624805b55bc45424ceed3f48c54a16 F src/json.c 5abb5cb782e74451a8882f6b7ee4d5e629246642262660bd1980a5e1b796258d F src/legacy.c d7874bc885906868cd51e6c2156698f2754f02d9eee1bae2d687323c3ca8e5aa F src/loadext.c 7432c944ff197046d67a1207790a1b13eec4548c85a9457eb0896bb3641dfb36 @@ -771,7 +771,7 @@ F src/os_win.c 2423a45e70c2cda01bfc84106f7e9f34feb1add42121ab2e35a67ba24589ac52 F src/os_win.h 7b073010f1451abe501be30d12f6bc599824944a F src/pager.c 8d73e7a0ebbecd8bb4996ff285cc055cec56b7e3edb5a4609d0748e0fa39d28a F src/pager.h 6137149346e6c8a3ddc1eeb40aee46381e9bc8b0fcc6dda8a1efde993c2275b8 -F src/parse.y f84673f1454e2bcf517623d4346e67fb2d73e57826ea103681ad5848238f6029 +F src/parse.y 4e62b0b301673d404b8aff7c9d84ee8636e5ff59f45c90cdce4c8845a1289837 F src/pcache.c 588cc3c5ccaaadde689ed35ce5c5c891a1f7b1f4d1f56f6cf0143b74d8ee6484 F src/pcache.h 1497ce1b823cf00094bb0cf3bac37b345937e6f910890c626b16512316d3abf5 F src/pcache1.c 78d4935e510f7bed0fdd1a3f742c0e663b36a795f9dc7411161dc22bdae1245e @@ -781,14 +781,14 @@ F src/printf.c b9ac740dfaf68552f5da1266be28ae2824b53a6b73d93425f7c6b2ef62457cbb F src/random.c 606b00941a1d7dd09c381d3279a058d771f406c5213c9932bbd93d5587be4b9c F src/resolve.c 626c24b258b111f75c22107aa5614ad89810df3026f5ca071116d3fe75925c75 F src/rowset.c 8432130e6c344b3401a8874c3cb49fefe6873fec593294de077afea2dce5ec97 -F src/select.c 57893cc8b099f231f7ed5b84faff14841f2aabb4776e32e17fae00aeae0a8993 +F src/select.c a076f7db3a0fcbd9f710d7746cfc07e0b3baadee45eb3136bedc29c598ef8f1c F src/shell.c.in bf997e43faaa1ef0ff78d4d7b9be6a9430cf1edda9a47a14e7fef646fcb459af F src/sqlite.h.in 8d4486fb28a90de818ac1e8c6206ea458e7de6bd8e0dfa3d554494f155be8c01 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8 F src/sqlite3ext.h 3f046c04ea3595d6bfda99b781926b17e672fd6d27da2ba6d8d8fc39981dcb54 -F src/sqliteInt.h 020aff180111b7dfe5bbdf8e59e8595c195b956488e9ca955f876cb7482e6de5 -F src/sqliteLimit.h 1bbdbf72bd0411d003267ffebc59a262f061df5653027a75627d03f48ca30523 -F src/status.c cb11f8589a6912af2da3bb1ec509a94dd8ef27df4d4c1a97e0bcf2309ece972b +F src/sqliteInt.h a5c850981cff99331b2ed48d519fb54a47f5f91c680e2cab64d91e259685de69 +F src/sqliteLimit.h b963c1e8c48791cc5cf733bb33e4741d0fbb7d0650cc2344cce5e4c17be4e8fd +F src/status.c 0e72e4f6be6ccfde2488eb63210297e75f569f3ce9920f6c3d77590ec6ce5ffd F src/table.c 0f141b58a16de7e2fbe81c308379e7279f4c6b50eb08efeec5892794a0ba30d1 F src/tclsqlite.c 5c1e367e26711044730c93d4b81312170918a8d1fe811f45be740ab48f7de8c1 F src/tclsqlite.h 65e2c761446e1c9fa0342b7d2612a703483643c8b6a316d12a65b745a4727395 @@ -869,7 +869,7 @@ F src/where.c 09dc313e7223ca1217c39c7026b00f16ff449a8323511a762fcba7863a00f4cd F src/whereInt.h d20cddddb1d61b18d5cb1fcfa9b77fbeebbc4afe44d996e603452a23b3009ee1 F src/wherecode.c 5baa06f0daae7d38aca1d4814030b82ad4f127fe6bad18f0644776a474f6088b F src/whereexpr.c 2415c8eee5ff89a8b709d7d83d71c1ff986cd720d0520057e1d8a5371339012a -F src/window.c 2bf01f9941a64fbcead61a0e3cb5db3fca5094b30d2ff0d23274c2a81d2e2385 +F src/window.c d01227141f622f24fbe36ca105fbe6ef023f9fd98f1ccd65da95f88886565db5 F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2 F test/affinity2.test ce1aafc86e110685b324e9a763eab4f2a73f737842ec3b687bd965867de90627 F test/affinity3.test f094773025eddf31135c7ad4cde722b7696f8eb07b97511f98585addf2a510a9 @@ -2095,7 +2095,7 @@ F test/with4.test 257be66c0c67fee1defbbac0f685c3465e2cad037f21ce65f23f86084f1982 F test/with5.test 6248213c41fab36290b5b73aa3f937309dfba337004d9d8434c3fabc8c7d4be8 F test/with6.test 281e4861b5e517f6c3c2f08517a520c1e2ee7c11966545d3901f258a4fe8ef76 F test/withM.test 693b61765f2b387b5e3e24a4536e2e82de15ff64 -F test/without_rowid1.test a5210b8770dc4736bca4e74bc96588f43025ad03ad6a80f885afd36d9890e217 +F test/without_rowid1.test 7120af676485e68930d3e513d083f3644622893477901f55eec954387125d550 F test/without_rowid2.test af260339f79d13cb220288b67cd287fbcf81ad99 F test/without_rowid3.test 39ab0dd773eaa62e59b17093f875327630f54c4145458f6d2b053d68d4b2f67b F test/without_rowid4.test 4e08bcbaee0399f35d58b5581881e7a6243d458a @@ -2210,8 +2210,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P a15e0f6802a5ba7bc5a7a70d6a162ea4548b49b132a5ac31263e64c388bbafcb -R 42c23a2d2b7be27c2c7a4de01b0af4e3 -U stephan -Z 369390f432e27c3785cf51965afea95c +P 4e81e2c707a954dcda6219dc94e2b96dd0c9907bd4beab28adad51d488b7d739 +R 92107357485b715229de5818697d5fcf +U drh +Z 4c75b5945df64c93f9907a88e623cba4 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index b9eb88d3ff..6c0f837bd5 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -4e81e2c707a954dcda6219dc94e2b96dd0c9907bd4beab28adad51d488b7d739 +d7729dbbf231d57cbcaaa5004d0a9c4957f112dd6520052995b232aa521c0ca3 diff --git a/src/alter.c b/src/alter.c index 5f706b513f..3c8a6c3a18 100644 --- a/src/alter.c +++ b/src/alter.c @@ -531,13 +531,13 @@ void sqlite3AlterBeginAddColumn(Parse *pParse, SrcList *pSrc){ assert( pNew->nCol>0 ); nAlloc = (((pNew->nCol-1)/8)*8)+8; assert( nAlloc>=pNew->nCol && nAlloc%8==0 && nAlloc-pNew->nCol<8 ); - pNew->aCol = (Column*)sqlite3DbMallocZero(db, sizeof(Column)*nAlloc); + pNew->aCol = (Column*)sqlite3DbMallocZero(db, sizeof(Column)*(u32)nAlloc); pNew->zName = sqlite3MPrintf(db, "sqlite_altertab_%s", pTab->zName); if( !pNew->aCol || !pNew->zName ){ assert( db->mallocFailed ); goto exit_begin_add_column; } - memcpy(pNew->aCol, pTab->aCol, sizeof(Column)*pNew->nCol); + memcpy(pNew->aCol, pTab->aCol, sizeof(Column)*(size_t)pNew->nCol); for(i=0; inCol; i++){ Column *pCol = &pNew->aCol[i]; pCol->zCnName = sqlite3DbStrDup(db, pCol->zCnName); @@ -1144,7 +1144,13 @@ static int renameParseSql( if( sqlite3StrNICmp(zSql,"CREATE ",7)!=0 ){ return SQLITE_CORRUPT_BKPT; } - db->init.iDb = bTemp ? 1 : sqlite3FindDbName(db, zDb); + if( bTemp ){ + db->init.iDb = 1; + }else{ + int iDb = sqlite3FindDbName(db, zDb); + assert( iDb>=0 && iDb<=0xff ); + db->init.iDb = (u8)iDb; + } p->eParseMode = PARSE_MODE_RENAME; p->db = db; p->nQueryLoop = 1; @@ -1211,10 +1217,11 @@ static int renameEditSql( nQuot = sqlite3Strlen30(zQuot)-1; } - assert( nQuot>=nNew ); - zOut = sqlite3DbMallocZero(db, nSql + pRename->nList*nQuot + 1); + assert( nQuot>=nNew && nSql>0 && nNew>0 ); + zOut = sqlite3DbMallocZero(db, (u64)(nSql + pRename->nList*nQuot + 1)); }else{ - zOut = (char*)sqlite3DbMallocZero(db, (nSql*2+1) * 3); + assert( nSql>0 ); + zOut = (char*)sqlite3DbMallocZero(db, (u64)(nSql*2+1) * 3); if( zOut ){ zBuf1 = &zOut[nSql*2+1]; zBuf2 = &zOut[nSql*4+2]; @@ -1226,16 +1233,17 @@ static int renameEditSql( ** with the new column name, or with single-quoted versions of themselves. ** All that remains is to construct and return the edited SQL string. */ if( zOut ){ - int nOut = nSql; - memcpy(zOut, zSql, nSql); + i64 nOut = nSql; + assert( nSql>0 ); + memcpy(zOut, zSql, (size_t)nSql); while( pRename->pList ){ int iOff; /* Offset of token to replace in zOut */ - u32 nReplace; + i64 nReplace; const char *zReplace; RenameToken *pBest = renameColumnTokenNext(pRename); if( zNew ){ - if( bQuote==0 && sqlite3IsIdChar(*pBest->t.z) ){ + if( bQuote==0 && sqlite3IsIdChar(*(u8*)pBest->t.z) ){ nReplace = nNew; zReplace = zNew; }else{ @@ -1547,7 +1555,7 @@ static void renameColumnFunc( if( sParse.pNewTable ){ if( IsView(sParse.pNewTable) ){ Select *pSelect = sParse.pNewTable->u.view.pSelect; - pSelect->selFlags &= ~SF_View; + pSelect->selFlags &= ~(u32)SF_View; sParse.rc = SQLITE_OK; sqlite3SelectPrep(&sParse, pSelect, 0); rc = (db->mallocFailed ? SQLITE_NOMEM : sParse.rc); @@ -1765,7 +1773,7 @@ static void renameTableFunc( sNC.pParse = &sParse; assert( pSelect->selFlags & SF_View ); - pSelect->selFlags &= ~SF_View; + pSelect->selFlags &= ~(u32)SF_View; sqlite3SelectPrep(&sParse, pTab->u.view.pSelect, &sNC); if( sParse.nErr ){ rc = sParse.rc; @@ -1938,7 +1946,7 @@ static void renameQuotefixFunc( if( sParse.pNewTable ){ if( IsView(sParse.pNewTable) ){ Select *pSelect = sParse.pNewTable->u.view.pSelect; - pSelect->selFlags &= ~SF_View; + pSelect->selFlags &= ~(u32)SF_View; sParse.rc = SQLITE_OK; sqlite3SelectPrep(&sParse, pSelect, 0); rc = (db->mallocFailed ? SQLITE_NOMEM : sParse.rc); diff --git a/src/build.c b/src/build.c index 986201bfb4..18bf27b833 100644 --- a/src/build.c +++ b/src/build.c @@ -1067,10 +1067,16 @@ Index *sqlite3PrimaryKeyIndex(Table *pTab){ ** find the (first) offset of that column in index pIdx. Or return -1 ** if column iCol is not used in index pIdx. */ -i16 sqlite3TableColumnToIndex(Index *pIdx, i16 iCol){ +i16 sqlite3TableColumnToIndex(Index *pIdx, int iCol){ int i; + i16 iCol16; + assert( iCol>=(-1) && iCol<=SQLITE_MAX_COLUMN ); + assert( pIdx->nColumn<=SQLITE_MAX_COLUMN ); + iCol16 = iCol; for(i=0; inColumn; i++){ - if( iCol==pIdx->aiColumn[i] ) return i; + if( iCol16==pIdx->aiColumn[i] ){ + return i; + } } return -1; } @@ -2167,10 +2173,16 @@ static char *createTableStmt(sqlite3 *db, Table *p){ ** Resize an Index object to hold N columns total. Return SQLITE_OK ** on success and SQLITE_NOMEM on an OOM error. */ -static int resizeIndexObject(sqlite3 *db, Index *pIdx, int N){ +static int resizeIndexObject(Parse *pParse, Index *pIdx, int N){ char *zExtra; int nByte; + sqlite3 *db; if( pIdx->nColumn>=N ) return SQLITE_OK; + db = pParse->db; + if( N>db->aLimit[SQLITE_LIMIT_COLUMN] ){ + sqlite3ErrorMsg(pParse, "too many columns on %s", pIdx->zName); + return SQLITE_ERROR; + } assert( pIdx->isResized==0 ); nByte = (sizeof(char*) + sizeof(LogEst) + sizeof(i16) + 1)*N; zExtra = sqlite3DbMallocZero(db, nByte); @@ -2440,7 +2452,7 @@ static void convertToWithoutRowidTable(Parse *pParse, Table *pTab){ pIdx->nColumn = pIdx->nKeyCol; continue; } - if( resizeIndexObject(db, pIdx, pIdx->nKeyCol+n) ) return; + if( resizeIndexObject(pParse, pIdx, pIdx->nKeyCol+n) ) return; for(i=0, j=pIdx->nKeyCol; inKeyCol, pPk, i) ){ testcase( hasColumn(pIdx->aiColumn, pIdx->nKeyCol, pPk->aiColumn[i]) ); @@ -2464,7 +2476,7 @@ static void convertToWithoutRowidTable(Parse *pParse, Table *pTab){ if( !hasColumn(pPk->aiColumn, nPk, i) && (pTab->aCol[i].colFlags & COLFLAG_VIRTUAL)==0 ) nExtra++; } - if( resizeIndexObject(db, pPk, nPk+nExtra) ) return; + if( resizeIndexObject(pParse, pPk, nPk+nExtra) ) return; for(i=0, j=nPk; inCol; i++){ if( !hasColumn(pPk->aiColumn, j, i) && (pTab->aCol[i].colFlags & COLFLAG_VIRTUAL)==0 diff --git a/src/expr.c b/src/expr.c index 0f86e126de..f6b5729b4b 100644 --- a/src/expr.c +++ b/src/expr.c @@ -1963,7 +1963,7 @@ Select *sqlite3SelectDup(sqlite3 *db, const Select *pDup, int flags){ pNew->pLimit = sqlite3ExprDup(db, p->pLimit, flags); pNew->iLimit = 0; pNew->iOffset = 0; - pNew->selFlags = p->selFlags & ~SF_UsesEphemeral; + pNew->selFlags = p->selFlags & ~(u32)SF_UsesEphemeral; pNew->addrOpenEphm[0] = -1; pNew->addrOpenEphm[1] = -1; pNew->nSelectRow = p->nSelectRow; diff --git a/src/insert.c b/src/insert.c index c1ca1897ed..7dc9bfd8b1 100644 --- a/src/insert.c +++ b/src/insert.c @@ -693,7 +693,7 @@ Select *sqlite3MultiValues(Parse *pParse, Select *pLeft, ExprList *pRow){ f = (f & pLeft->selFlags); } pSelect = sqlite3SelectNew(pParse, pRow, 0, 0, 0, 0, 0, f, 0); - pLeft->selFlags &= ~SF_MultiValue; + pLeft->selFlags &= ~(u32)SF_MultiValue; if( pSelect ){ pSelect->op = TK_ALL; pSelect->pPrior = pLeft; diff --git a/src/parse.y b/src/parse.y index 76c9a8e4ed..65a15f8c49 100644 --- a/src/parse.y +++ b/src/parse.y @@ -617,8 +617,8 @@ selectnowith(A) ::= selectnowith(A) multiselect_op(Y) oneselect(Z). { if( pRhs ){ pRhs->op = (u8)Y; pRhs->pPrior = pLhs; - if( ALWAYS(pLhs) ) pLhs->selFlags &= ~SF_MultiValue; - pRhs->selFlags &= ~SF_MultiValue; + if( ALWAYS(pLhs) ) pLhs->selFlags &= ~(u32)SF_MultiValue; + pRhs->selFlags &= ~(u32)SF_MultiValue; if( Y!=TK_ALL ) pParse->hasCompound = 1; }else{ sqlite3SelectDelete(pParse->db, pLhs); diff --git a/src/select.c b/src/select.c index e47a9b6be2..e7db195333 100644 --- a/src/select.c +++ b/src/select.c @@ -5646,7 +5646,7 @@ static int convertCompoundSelectToSubquery(Walker *pWalker, Select *p){ #ifndef SQLITE_OMIT_WINDOWFUNC p->pWinDefn = 0; #endif - p->selFlags &= ~SF_Compound; + p->selFlags &= ~(u32)SF_Compound; assert( (p->selFlags & SF_Converted)==0 ); p->selFlags |= SF_Converted; assert( pNew->pPrior!=0 ); @@ -7252,7 +7252,7 @@ static int countOfViewOptimization(Parse *pParse, Select *p){ pSub->pPrior = 0; pSub->pNext = 0; pSub->selFlags |= SF_Aggregate; - pSub->selFlags &= ~SF_Compound; + pSub->selFlags &= ~(u32)SF_Compound; pSub->nSelectRow = 0; sqlite3ParserAddCleanup(pParse, sqlite3ExprListDeleteGeneric, pSub->pEList); pTerm = pPrior ? sqlite3ExprDup(db, pCount, 0) : pCount; @@ -7267,7 +7267,7 @@ static int countOfViewOptimization(Parse *pParse, Select *p){ pSub = pPrior; } p->pEList->a[0].pExpr = pExpr; - p->selFlags &= ~SF_Aggregate; + p->selFlags &= ~(u32)SF_Aggregate; #if TREETRACE_ENABLED if( sqlite3TreeTrace & 0x200 ){ @@ -7474,7 +7474,7 @@ int sqlite3Select( testcase( pParse->earlyCleanup ); p->pOrderBy = 0; } - p->selFlags &= ~SF_Distinct; + p->selFlags &= ~(u32)SF_Distinct; p->selFlags |= SF_NoopOrderBy; } sqlite3SelectPrep(pParse, p, 0); @@ -7513,7 +7513,7 @@ int sqlite3Select( ** and leaving this flag set can cause errors if a compound sub-query ** in p->pSrc is flattened into this query and this function called ** again as part of compound SELECT processing. */ - p->selFlags &= ~SF_UFSrcCheck; + p->selFlags &= ~(u32)SF_UFSrcCheck; } if( pDest->eDest==SRT_Output ){ @@ -8002,7 +8002,7 @@ int sqlite3Select( && p->pWin==0 #endif ){ - p->selFlags &= ~SF_Distinct; + p->selFlags &= ~(u32)SF_Distinct; pGroupBy = p->pGroupBy = sqlite3ExprListDup(db, pEList, 0); if( pGroupBy ){ for(i=0; inExpr; i++){ diff --git a/src/sqliteInt.h b/src/sqliteInt.h index 6ebd8eb4fe..d4b9983091 100644 --- a/src/sqliteInt.h +++ b/src/sqliteInt.h @@ -3097,10 +3097,10 @@ struct Expr { /* Macros can be used to test, set, or clear bits in the ** Expr.flags field. */ -#define ExprHasProperty(E,P) (((E)->flags&(P))!=0) -#define ExprHasAllProperty(E,P) (((E)->flags&(P))==(P)) -#define ExprSetProperty(E,P) (E)->flags|=(P) -#define ExprClearProperty(E,P) (E)->flags&=~(P) +#define ExprHasProperty(E,P) (((E)->flags&(u32)(P))!=0) +#define ExprHasAllProperty(E,P) (((E)->flags&(u32)(P))==(u32)(P)) +#define ExprSetProperty(E,P) (E)->flags|=(u32)(P) +#define ExprClearProperty(E,P) (E)->flags&=~(u32)(P) #define ExprAlwaysTrue(E) (((E)->flags&(EP_OuterON|EP_IsTrue))==EP_IsTrue) #define ExprAlwaysFalse(E) (((E)->flags&(EP_OuterON|EP_IsFalse))==EP_IsFalse) #define ExprIsFullSize(E) (((E)->flags&(EP_Reduced|EP_TokenOnly))==0) @@ -4908,7 +4908,7 @@ void sqlite3SubqueryColumnTypes(Parse*,Table*,Select*,char); Table *sqlite3ResultSetOfSelect(Parse*,Select*,char); void sqlite3OpenSchemaTable(Parse *, int); Index *sqlite3PrimaryKeyIndex(Table*); -i16 sqlite3TableColumnToIndex(Index*, i16); +i16 sqlite3TableColumnToIndex(Index*, int); #ifdef SQLITE_OMIT_GENERATED_COLUMNS # define sqlite3TableColumnToStorage(T,X) (X) /* No-op pass-through */ # define sqlite3StorageColumnToTable(T,X) (X) /* No-op pass-through */ diff --git a/src/sqliteLimit.h b/src/sqliteLimit.h index 620b0f8e5a..0d15b31822 100644 --- a/src/sqliteLimit.h +++ b/src/sqliteLimit.h @@ -36,14 +36,16 @@ ** * Terms in the GROUP BY or ORDER BY clauses of a SELECT statement. ** * Terms in the VALUES clause of an INSERT statement ** -** The hard upper limit here is 32676. Most database people will +** The hard upper limit here is 32767. Most database people will ** tell you that in a well-normalized database, you usually should ** not have more than a dozen or so columns in any table. And if ** that is the case, there is no point in having more than a few ** dozen values in any of the other situations described above. */ -#ifndef SQLITE_MAX_COLUMN +#if !defined(SQLITE_MAX_COLUMN) # define SQLITE_MAX_COLUMN 2000 +#elif SQLITE_MAX_COLUMN>32767 +# error SQLITE_MAX_COLUMN may not exceed 32767 #endif /* diff --git a/src/status.c b/src/status.c index a462c94293..b0a47c7f85 100644 --- a/src/status.c +++ b/src/status.c @@ -192,8 +192,9 @@ int sqlite3LookasideUsed(sqlite3 *db, int *pHighwater){ nInit += countLookasideSlots(db->lookaside.pSmallInit); nFree += countLookasideSlots(db->lookaside.pSmallFree); #endif /* SQLITE_OMIT_TWOSIZE_LOOKASIDE */ - if( pHighwater ) *pHighwater = db->lookaside.nSlot - nInit; - return db->lookaside.nSlot - (nInit+nFree); + assert( db->lookaside.nSlot >= nInit+nFree ); + if( pHighwater ) *pHighwater = (int)(db->lookaside.nSlot - nInit); + return (int)(db->lookaside.nSlot - (nInit+nFree)); } /* @@ -246,7 +247,7 @@ int sqlite3_db_status( assert( (op-SQLITE_DBSTATUS_LOOKASIDE_HIT)>=0 ); assert( (op-SQLITE_DBSTATUS_LOOKASIDE_HIT)<3 ); *pCurrent = 0; - *pHighwater = db->lookaside.anStat[op - SQLITE_DBSTATUS_LOOKASIDE_HIT]; + *pHighwater = (int)db->lookaside.anStat[op-SQLITE_DBSTATUS_LOOKASIDE_HIT]; if( resetFlag ){ db->lookaside.anStat[op - SQLITE_DBSTATUS_LOOKASIDE_HIT] = 0; } diff --git a/src/window.c b/src/window.c index 8373e36413..948b0728af 100644 --- a/src/window.c +++ b/src/window.c @@ -995,7 +995,7 @@ int sqlite3WindowRewrite(Parse *pParse, Select *p){ p->pWhere = 0; p->pGroupBy = 0; p->pHaving = 0; - p->selFlags &= ~SF_Aggregate; + p->selFlags &= ~(u32)SF_Aggregate; p->selFlags |= SF_WinRewrite; /* Create the ORDER BY clause for the sub-select. This is the concatenation diff --git a/test/without_rowid1.test b/test/without_rowid1.test index 3c33f733a1..0095fab0c0 100644 --- a/test/without_rowid1.test +++ b/test/without_rowid1.test @@ -487,4 +487,24 @@ ifcapable altertable { SELECT name FROM sqlite_sequence ORDER BY +name; } {a c0 c2} } + +# Ensure that the number of columns in an index on a WITHOUT ROWID +# table does not exceed SQLITE_LIMIT_COLUMN. +# +reset_db +sqlite3_limit db SQLITE_LIMIT_COLUMN 8 +do_catchsql_test 16.1 { + CREATE TABLE t1( + c1,c2,c3,c4,c5,c6,c7,c8, + PRIMARY KEY(c1,c2,c1 COLLATE NOCASE) + ) WITHOUT ROWID; +} {1 {too many columns on sqlite_autoindex_t1_1}} +do_catchsql_test 16.2 { + CREATE TABLE t1( + c1,c2,c3,c4,c5,c6,c7,c8, + PRIMARY KEY(c1,c2), + UNIQUE(c3,c4,c5,c6,c7,c8,c3 COLLATE nocase) + ) WITHOUT ROWID; +} {1 {too many columns on sqlite_autoindex_t1_2}} + finish_test From d9959bf48b13bffda4c073de17eb13752b9cb5c9 Mon Sep 17 00:00:00 2001 From: stephan Date: Fri, 21 Feb 2025 20:22:56 +0000 Subject: [PATCH 135/194] Makefile-internal var renaming in prep for pending portability-related changes in the handling of DLLs. No functional/build interface changes. FossilOrigin-Name: ebf41fc90aa9fb1bb96239145c0cdd06eced391499975c71734610996d088641 --- autoconf/Makefile.in | 54 ++++++++++++++-------------- main.mk | 84 +++++++++++++++++++++++++------------------- manifest | 16 ++++----- manifest.uuid | 2 +- 4 files changed, 84 insertions(+), 72 deletions(-) diff --git a/autoconf/Makefile.in b/autoconf/Makefile.in index 8a9c2c7b3f..5a357dc9e7 100644 --- a/autoconf/Makefile.in +++ b/autoconf/Makefile.in @@ -143,15 +143,15 @@ sqlite3.o: $(TOP)/sqlite3.h $(TOP)/sqlite3.c $(CC) -c $(TOP)/sqlite3.c -o $@ $(CFLAGS) $(CFLAGS.libsqlite3) libsqlite3.LIB = libsqlite3$(T.lib) -libsqlite3.SO = libsqlite3$(T.dll) +libsqlite3.DLL = libsqlite3$(T.dll) -$(libsqlite3.SO): sqlite3.o +$(libsqlite3.DLL): sqlite3.o $(CC) -o $@ sqlite3.o $(LDFLAGS.shlib) \ $(LDFLAGS) $(LDFLAGS.libsqlite3) \ $(LDFLAGS.libsqlite3.os-specific) $(LDFLAGS.libsqlite3.soname) -$(libsqlite3.SO)-1: $(libsqlite3.SO) -$(libsqlite3.SO)-0: -all: $(libsqlite3.SO)-$(ENABLE_LIB_SHARED) +$(libsqlite3.DLL)-1: $(libsqlite3.DLL) +$(libsqlite3.DLL)-0: +all: $(libsqlite3.DLL)-$(ENABLE_LIB_SHARED) $(libsqlite3.LIB): sqlite3.o $(AR) $(AR.flags) $@ sqlite3.o @@ -159,39 +159,39 @@ $(libsqlite3.LIB)-1: $(libsqlite3.LIB) $(libsqlite3.LIB)-0: all: $(libsqlite3.LIB)-$(ENABLE_LIB_STATIC) -install-so-1: $(install-dir.lib) $(libsqlite3.SO) - $(INSTALL) $(libsqlite3.SO) "$(install-dir.lib)" - @if [ -f $(libsqlite3.SO).a ]; then \ - $(INSTALL) $(libsqlite3.SO).a "$(install-dir.lib)"; \ +install-so-1: $(install-dir.lib) $(libsqlite3.DLL) + $(INSTALL) $(libsqlite3.DLL) "$(install-dir.lib)" + @if [ -f $(libsqlite3.DLL).a ]; then \ + $(INSTALL) $(libsqlite3.DLL).a "$(install-dir.lib)"; \ fi - @echo "Setting up $(libsqlite3.SO) version symlinks..."; \ + @echo "Setting up $(libsqlite3.DLL) version symlinks..."; \ if [ x.dll = x$(T.dll) ]; then \ echo "No library symlinks needed on this platform"; \ elif [ x.dylib = x$(T.dll) ]; then \ cd "$(install-dir.lib)" || exit $$?; \ rm -f libsqlite3.0$(T.dll) libsqlite3.$(PACKAGE_VERSION)$(T.dll) || exit $$?; \ dllname=libsqlite3.$(PACKAGE_VERSION)$(T.dll); \ - mv $(libsqlite3.SO) $$dllname || exit $$?; \ - ln -s $$dllname $(libsqlite3.SO) || exit $$?; \ + mv $(libsqlite3.DLL) $$dllname || exit $$?; \ + ln -s $$dllname $(libsqlite3.DLL) || exit $$?; \ ln -s $$dllname libsqlite3.0$(T.dll) || exit $$?; \ - ls -la $$dllname $(libsqlite3.SO) libsqlite3.0$(T.dll); \ + ls -la $$dllname $(libsqlite3.DLL) libsqlite3.0$(T.dll); \ else \ cd "$(install-dir.lib)" || exit $$?; \ - rm -f $(libsqlite3.SO).0 $(libsqlite3.SO).$(PACKAGE_VERSION) || exit $$?; \ - mv $(libsqlite3.SO) $(libsqlite3.SO).$(PACKAGE_VERSION) || exit $$?; \ - ln -s $(libsqlite3.SO).$(PACKAGE_VERSION) $(libsqlite3.SO) || exit $$?; \ - ln -s $(libsqlite3.SO).$(PACKAGE_VERSION) $(libsqlite3.SO).0 || exit $$?; \ - ls -la $(libsqlite3.SO) $(libsqlite3.SO).[a03]*; \ - if [ -e $(libsqlite3.SO).0.8.6 ]; then \ + rm -f $(libsqlite3.DLL).0 $(libsqlite3.DLL).$(PACKAGE_VERSION) || exit $$?; \ + mv $(libsqlite3.DLL) $(libsqlite3.DLL).$(PACKAGE_VERSION) || exit $$?; \ + ln -s $(libsqlite3.DLL).$(PACKAGE_VERSION) $(libsqlite3.DLL) || exit $$?; \ + ln -s $(libsqlite3.DLL).$(PACKAGE_VERSION) $(libsqlite3.DLL).0 || exit $$?; \ + ls -la $(libsqlite3.DLL) $(libsqlite3.DLL).[a03]*; \ + if [ -e $(libsqlite3.DLL).0.8.6 ]; then \ echo "ACHTUNG: legacy libtool-compatible install found. Re-linking it..."; \ - rm -f libsqlite3.la $(libsqlite3.SO).0.8.6 || exit $$?; \ - ln -s $(libsqlite3.SO).$(PACKAGE_VERSION) $(libsqlite3.SO).0.8.6 || exit $$?; \ - ls -la $(libsqlite3.SO).0.8.6; \ + rm -f libsqlite3.la $(libsqlite3.DLL).0.8.6 || exit $$?; \ + ln -s $(libsqlite3.DLL).$(PACKAGE_VERSION) $(libsqlite3.DLL).0.8.6 || exit $$?; \ + ls -la $(libsqlite3.DLL).0.8.6; \ elif [ x1 = "x$(INSTALL_SO_086_LINK)" ]; then \ echo "ACHTUNG: installing legacy libtool-style links because INSTALL_SO_086_LINK=1"; \ - rm -f libsqlite3.la $(libsqlite3.SO).0.8.6 || exit $$?; \ - ln -s $(libsqlite3.SO).$(PACKAGE_VERSION) $(libsqlite3.SO).0.8.6 || exit $$?; \ - ls -la $(libsqlite3.SO).0.8.6; \ + rm -f libsqlite3.la $(libsqlite3.DLL).0.8.6 || exit $$?; \ + ln -s $(libsqlite3.DLL).$(PACKAGE_VERSION) $(libsqlite3.DLL).0.8.6 || exit $$?; \ + ls -la $(libsqlite3.DLL).0.8.6; \ fi; \ fi @@ -213,7 +213,7 @@ ENABLE_STATIC_SHELL = @ENABLE_STATIC_SHELL@ sqlite3-shell-link-flags.1 = $(TOP)/sqlite3.c $(LDFLAGS.libsqlite3) sqlite3-shell-link-flags.0 = -L. -lsqlite3 $(LDFLAGS.zlib) sqlite3-shell-deps.1 = $(TOP)/sqlite3.c -sqlite3-shell-deps.0 = $(libsqlite3.SO) +sqlite3-shell-deps.0 = $(libsqlite3.DLL) sqlite3$(T.exe): $(TOP)/shell.c $(sqlite3-shell-deps.$(ENABLE_STATIC_SHELL)) $(CC) -o $@ \ $(TOP)/shell.c $(sqlite3-shell-link-flags.$(ENABLE_STATIC_SHELL)) \ @@ -241,7 +241,7 @@ install: install-man1 clean: rm -f *.o sqlite3$(T.exe) - rm -f $(libsqlite3.LIB) $(libsqlite3.SO) $(libsqlite3.SO).a + rm -f $(libsqlite3.LIB) $(libsqlite3.DLL) $(libsqlite3.DLL).a distclean: clean rm -f jimsh0$(T.exe) config.* sqlite3.pc sqlite_cfg.h Makefile diff --git a/main.mk b/main.mk index 6081fbdfd8..9cc31a8fa8 100644 --- a/main.mk +++ b/main.mk @@ -191,13 +191,13 @@ INSTALL ?= install # # $(ENABLE_SHARED) = # -# 1 if libsqlite3.$(T.dll) should be built. +# 1 if libsqlite3$(T.dll) should be built. # ENABLE_SHARED ?= 1 # # $(ENABLE_STATIC) = # -# 1 if libsqlite3.$(T.lib) should be built. Some components, +# 1 if libsqlite3$(T.lib) should be built. Some components, # e.g. libtclsqlite3 and some test apps, implicitly require the static # library and will ignore this preference. # @@ -220,7 +220,7 @@ USE_AMALGAMATION ?= 1 # may require that the user specifically prepend "." to their # $LD_LIBRARY_PATH so that the dynamic linker does not pick up a # libsqlite3.so from outside the source tree. Alternately, symlinking -# the in-build-tree $(libsqlite3.SO) to some dir in the system's +# the in-build-tree $(libsqlite3.DLL) to some dir in the system's # library path will work for giving the apps access to the in-tree # DLL. # @@ -1052,8 +1052,20 @@ T.link.tcl = $(T.tcl.env.source); $(T.link) cp fts5.c fts5.h tsrc touch .target_source +# +# libsqlite3.DLL.basename = the base name of the resulting DLL. This +# is typically libsqlite3 but varies wildly on Unix-like Windows +# environments (msys, cygwin, and friends). +# +libsqlite3.DLL.basename ?= libsqlite3 +# +# libsqlite3.LIB => the static library +# libsqlite3.LIB = libsqlite3$(T.lib) -libsqlite3.SO = libsqlite3$(T.dll) +# +# libsqlite3.LIB => the DLL library +# +libsqlite3.DLL = $(libsqlite3.DLL.basename)$(T.dll) # Rules to build the LEMON compiler generator # @@ -1360,9 +1372,9 @@ tclsqlite-shell.o: $(T.tcl.env.sh) $(TOP)/src/tclsqlite.c $(DEPS_OBJ_COMMON) tclsqlite-stubs.o: $(T.tcl.env.sh) $(TOP)/src/tclsqlite.c $(DEPS_OBJ_COMMON) $(T.compile.tcl) -DUSE_TCL_STUBS=1 -o $@ -c $(TOP)/src/tclsqlite.c $$TCL_INCLUDE_SPEC -tclsqlite3$(T.exe): $(T.tcl.env.sh) tclsqlite-shell.o $(libsqlite3.SO) +tclsqlite3$(T.exe): $(T.tcl.env.sh) tclsqlite-shell.o $(libsqlite3.DLL) $(T.link.tcl) -o $@ tclsqlite-shell.o \ - $(libsqlite3.SO) $$TCL_INCLUDE_SPEC $$TCL_LIB_SPEC \ + $(libsqlite3.DLL) $$TCL_INCLUDE_SPEC $$TCL_LIB_SPEC \ $(LDFLAGS.libsqlite3) tclsqlite3$(T.exe)-1: tclsqlite3$(T.exe) tclsqlite3$(T.exe)-0 tclsqlite3$(T.exe)-: @@ -1418,17 +1430,17 @@ all: lib # # Dynamic libsqlite3 # -$(libsqlite3.SO): $(LIBOBJ) +$(libsqlite3.DLL): $(LIBOBJ) $(T.link.shared) -o $@ $(LIBOBJ) $(LDFLAGS.libsqlite3) \ $(LDFLAGS.libsqlite3.os-specific) $(LDFLAGS.libsqlite3.soname) -$(libsqlite3.SO)-1: $(libsqlite3.SO) -$(libsqlite3.SO)-0 $(libsqlite3.SO)-: -so: $(libsqlite3.SO)-$(ENABLE_SHARED) +$(libsqlite3.DLL)-1: $(libsqlite3.DLL) +$(libsqlite3.DLL)-0 $(libsqlite3.DLL)-: +so: $(libsqlite3.DLL)-$(ENABLE_SHARED) all: so # -# On most Unix-like platforms, install the $(libsqlite3.SO) as -# $(libsqlite3.SO).$(PACKAGE_VERSION) and create symlinks which point +# On most Unix-like platforms, install the $(libsqlite3.DLL) as +# $(libsqlite3.DLL).$(PACKAGE_VERSION) and create symlinks which point # to it: # # - libsqlite3.so.$(PACKAGE_VERSION) @@ -1459,7 +1471,7 @@ all: so # 1) If libsqlite3.so.0.8.6 is found in the target installation # directory then it is re-linked to point to the newer-style # names. We cannot retain both the old and new installation because -# they both share the high-level name $(libsqlite3.SO). The +# they both share the high-level name $(libsqlite3.DLL). The # down-side of this is that it may upset packaging tools when we # replace libsqlite3.so (from a legacy package) with a new symlink. # @@ -1473,39 +1485,39 @@ all: so # In either case, libsqlite3.la, if found, is deleted because it would # contain stale state, refering to non-libtool-generated libraries. # -install-so-1: $(install-dir.lib) $(libsqlite3.SO) - $(INSTALL) $(libsqlite3.SO) "$(install-dir.lib)" - @if [ -f $(libsqlite3.SO).a ]; then \ - $(INSTALL) $(libsqlite3.SO).a "$(install-dir.lib)"; \ +install-so-1: $(install-dir.lib) $(libsqlite3.DLL) + $(INSTALL) $(libsqlite3.DLL) "$(install-dir.lib)" + @if [ -f $(libsqlite3.DLL).a ]; then \ + $(INSTALL) $(libsqlite3.DLL).a "$(install-dir.lib)"; \ fi - @echo "Setting up $(libsqlite3.SO) version symlinks..."; \ + @echo "Setting up $(libsqlite3.DLL) version symlinks..."; \ if [ x.dll = x$(T.dll) ]; then \ echo "No library symlinks needed on this platform"; \ elif [ x.dylib = x$(T.dll) ]; then \ cd "$(install-dir.lib)" || exit $$?; \ rm -f libsqlite3.0$(T.dll) libsqlite3.$(PACKAGE_VERSION)$(T.dll) || exit $$?; \ dllname=libsqlite3.$(PACKAGE_VERSION)$(T.dll); \ - mv $(libsqlite3.SO) $$dllname || exit $$?; \ - ln -s $$dllname $(libsqlite3.SO) || exit $$?; \ + mv $(libsqlite3.DLL) $$dllname || exit $$?; \ + ln -s $$dllname $(libsqlite3.DLL) || exit $$?; \ ln -s $$dllname libsqlite3.0$(T.dll) || exit $$?; \ - ls -la $$dllname $(libsqlite3.SO) libsqlite3.0$(T.dll); \ + ls -la $$dllname $(libsqlite3.DLL) libsqlite3.0$(T.dll); \ else \ cd "$(install-dir.lib)" || exit $$?; \ - rm -f $(libsqlite3.SO).0 $(libsqlite3.SO).$(PACKAGE_VERSION) || exit $$?; \ - mv $(libsqlite3.SO) $(libsqlite3.SO).$(PACKAGE_VERSION) || exit $$?; \ - ln -s $(libsqlite3.SO).$(PACKAGE_VERSION) $(libsqlite3.SO) || exit $$?; \ - ln -s $(libsqlite3.SO).$(PACKAGE_VERSION) $(libsqlite3.SO).0 || exit $$?; \ - ls -la $(libsqlite3.SO) $(libsqlite3.SO).[a03]*; \ - if [ -e $(libsqlite3.SO).0.8.6 ]; then \ + rm -f $(libsqlite3.DLL).0 $(libsqlite3.DLL).$(PACKAGE_VERSION) || exit $$?; \ + mv $(libsqlite3.DLL) $(libsqlite3.DLL).$(PACKAGE_VERSION) || exit $$?; \ + ln -s $(libsqlite3.DLL).$(PACKAGE_VERSION) $(libsqlite3.DLL) || exit $$?; \ + ln -s $(libsqlite3.DLL).$(PACKAGE_VERSION) $(libsqlite3.DLL).0 || exit $$?; \ + ls -la $(libsqlite3.DLL) $(libsqlite3.DLL).[a03]*; \ + if [ -e $(libsqlite3.DLL).0.8.6 ]; then \ echo "ACHTUNG: legacy libtool-compatible install found. Re-linking it..."; \ - rm -f libsqlite3.la $(libsqlite3.SO).0.8.6 || exit $$?; \ - ln -s $(libsqlite3.SO).$(PACKAGE_VERSION) $(libsqlite3.SO).0.8.6 || exit $$?; \ - ls -la $(libsqlite3.SO).0.8.6; \ + rm -f libsqlite3.la $(libsqlite3.DLL).0.8.6 || exit $$?; \ + ln -s $(libsqlite3.DLL).$(PACKAGE_VERSION) $(libsqlite3.DLL).0.8.6 || exit $$?; \ + ls -la $(libsqlite3.DLL).0.8.6; \ elif [ x1 = "x$(INSTALL_SO_086_LINK)" ]; then \ echo "ACHTUNG: installing legacy libtool-style links because INSTALL_SO_086_LINK=1"; \ - rm -f libsqlite3.la $(libsqlite3.SO).0.8.6 || exit $$?; \ - ln -s $(libsqlite3.SO).$(PACKAGE_VERSION) $(libsqlite3.SO).0.8.6 || exit $$?; \ - ls -la $(libsqlite3.SO).0.8.6; \ + rm -f libsqlite3.la $(libsqlite3.DLL).0.8.6 || exit $$?; \ + ln -s $(libsqlite3.DLL).$(PACKAGE_VERSION) $(libsqlite3.DLL).0.8.6 || exit $$?; \ + ls -la $(libsqlite3.DLL).0.8.6; \ fi; \ fi @@ -1804,7 +1816,7 @@ sqlite3_analyzer.c: sqlite3.c $(TOP)/src/tclsqlite.c $(TOP)/tool/spaceanal.tcl \ # sqlite3_analyzer.flags.1 = -L. -lsqlite3 sqlite3_analyzer.flags.0 = $(LDFLAGS.libsqlite3) -sqlite3_analyzer.deps.1 = $(libsqlite3.SO) +sqlite3_analyzer.deps.1 = $(libsqlite3.DLL) sqlite3_analyzer.deps.0 = sqlite3_analyzer$(T.exe): $(T.tcl.env.sh) sqlite3_analyzer.c \ $(sqlite3_analyzer.deps.$(LINK_TOOLS_DYNAMICALLY)) @@ -2051,7 +2063,7 @@ install: install-shell-$(HAVE_WASI_SDK) # sqldiff.0.deps = $(TOP)/tool/sqldiff.c $(TOP)/ext/misc/sqlite3_stdio.h sqlite3.o sqlite3.h sqldiff.0.rules = $(T.link) -o $@ $(TOP)/tool/sqldiff.c sqlite3.o $(LDFLAGS.libsqlite3) -sqldiff.1.deps = $(TOP)/tool/sqldiff.c $(TOP)/ext/misc/sqlite3_stdio.h $(libsqlite3.SO) +sqldiff.1.deps = $(TOP)/tool/sqldiff.c $(TOP)/ext/misc/sqlite3_stdio.h $(libsqlite3.DLL) sqldiff.1.rules = $(T.link) -o $@ $(TOP)/tool/sqldiff.c -L. -lsqlite3 $(LDFLAGS.configure) sqldiff$(T.exe): $(sqldiff.$(LINK_TOOLS_DYNAMICALLY).deps) $(sqldiff.$(LINK_TOOLS_DYNAMICALLY).rules) @@ -2344,7 +2356,7 @@ tidy: tidy-. rm -f lemon$(B.exe) sqlite*.tar.gz rm -f mkkeywordhash$(B.exe) mksourceid$(B.exe) rm -f parse.* fts5parse.* - rm -f $(libsqlite3.SO) $(libsqlite3.LIB) $(libtclsqlite3.SO) $(libsqlite3.SO).a + rm -f $(libsqlite3.DLL) $(libsqlite3.LIB) $(libtclsqlite3.SO) $(libsqlite3.DLL).a rm -f tclsqlite3$(T.exe) $(TESTPROGS) rm -f LogEst$(T.exe) fts3view$(T.exe) rollback-test$(T.exe) showdb$(T.exe) rm -f showjournal$(T.exe) showstat4$(T.exe) showwal$(T.exe) speedtest1$(T.exe) diff --git a/manifest b/manifest index bb9dfef35a..0a89891bbe 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Detect\swhen\sa\sUNIQUE\sor\sPRIMARY\sKEY\son\sa\sWITHOUT\sROWID\stable\swould\sneed\nto\suse\smore\sthan\sSQLITE_LIMIT_COLUMN\scolumns\sand\sraise\san\serror.\nAlso\sinclude\ssome\sunrelated\scompiler\swarning\sfixes. -D 2025-02-21T17:03:22.433 +C Makefile-internal\svar\srenaming\sin\sprep\sfor\spending\sportability-related\schanges\sin\sthe\shandling\sof\sDLLs.\sNo\sfunctional/build\sinterface\schanges. +D 2025-02-21T20:22:56.972 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d @@ -16,7 +16,7 @@ F art/sqlite370.jpg d512473dae7e378a67e28ff96a34da7cb331def2 F art/sqlite370.svg 40b7e2fe8aac3add5d56dd86ab8d427a4eca5bcb3fe4f8946cb3794e1821d531 F auto.def eddf6aef976e2c1a56c0accc3244945e0b22ec6799074c40be160e5a9a5662b0 F autoconf/Makefile.fallback 22fe523eb36dfce31e0f6349f782eb084e86a5620b2b0b4f84a2d6133f53f5ac -F autoconf/Makefile.in ed042ba44540e67e17b1e7bd787e8118a9d14664ba8049966ec9bc54a10676ce +F autoconf/Makefile.in d376f623fa747798e40f7fcb23f9392e4f87610daa8425673ab83a8f33578b65 F autoconf/Makefile.msc 1249e425a24859c7b3f17575275247df9eec3bddc0d1d7e73941f1abdbb95a92 F autoconf/README.first f1d3876e9a7852c22f275a6f06814e64934cecbc0b5b9617d64849094c1fd136 F autoconf/README.txt 7f01dc3915e2d68f329011073662369e62a0938a2c69398807823c57591cb288 @@ -705,7 +705,7 @@ F ext/wasm/tests/opfs/sahpool/sahpool-pausing.js f264925cfc82155de38cecb3d204c36 F ext/wasm/tests/opfs/sahpool/sahpool-worker.js bd25a43fc2ab2d1bafd8f2854ad3943ef673f7c3be03e95ecf1612ff6e8e2a61 F ext/wasm/wasmfs.make 68999f5bd8c489239592d59a420f8c627c99169bbd6fa16a404751f757b9f702 F magic.txt 5ade0bc977aa135e79e3faaea894d5671b26107cc91e70783aa7dc83f22f3ba0 -F main.mk 323e71cd79e49c9e33d39b6558694a71c08973d9ac3ee4f211aa32e58bd876f5 +F main.mk 53df76bae4f2538a086fa39b6eb9a4238b9551895b2bde3b14187fa246ca0336 F mptest/config01.test 3c6adcbc50b991866855f1977ff172eb6d901271 F mptest/config02.test 4415dfe36c48785f751e16e32c20b077c28ae504 F mptest/crash01.test 61e61469e257df0850df4293d7d4d6c2af301421 @@ -2210,8 +2210,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P 4e81e2c707a954dcda6219dc94e2b96dd0c9907bd4beab28adad51d488b7d739 -R 92107357485b715229de5818697d5fcf -U drh -Z 4c75b5945df64c93f9907a88e623cba4 +P d7729dbbf231d57cbcaaa5004d0a9c4957f112dd6520052995b232aa521c0ca3 +R 9fa57efe9e24b037978a77954d886617 +U stephan +Z 3e199b62ebb0fe5383698c3c45ceb587 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 6c0f837bd5..e261d3c10b 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -d7729dbbf231d57cbcaaa5004d0a9c4957f112dd6520052995b232aa521c0ca3 +ebf41fc90aa9fb1bb96239145c0cdd06eced391499975c71734610996d088641 From 72b119d5e4f3cab721ddab96d22b168ce71ea014 Mon Sep 17 00:00:00 2001 From: stephan Date: Fri, 21 Feb 2025 20:28:44 +0000 Subject: [PATCH 136/194] Extend --out-implib to optionally specify the import lib's name. Add as-yet-unused internals for specifying the DLL's base name (which differs across the Windows-side Unix-esque environments). FossilOrigin-Name: 12a55d343f9663acb68cd0f75fbb6c9ab67f4f88ad296e3e266f12d91522dd19 --- Makefile.in | 2 + autosetup/sqlite-config.tcl | 88 +++++++++++++++++++++++++++++-------- manifest | 17 ++++--- manifest.uuid | 2 +- 4 files changed, 82 insertions(+), 27 deletions(-) diff --git a/Makefile.in b/Makefile.in index 1ff791c8ab..99b3a8c8d1 100644 --- a/Makefile.in +++ b/Makefile.in @@ -126,6 +126,8 @@ LDFLAGS.libsqlite3.os-specific = @LDFLAGS_MAC_CVERSION@ @LDFLAGS_OUT_IMPLIB@ # os-specific: see # - https://sqlite.org/forum/forumpost/9dfd5b8fd525a5d7 # - https://sqlite.org/forum/forumpost/0c7fc097b2 +# dll.basename: see https://sqlite.org/forum/forumpost/828fdfe904 +#libsqlite3.DLL.basename = @ SQLITE_DLL_BASENAME @ ENABLE_SHARED = @ENABLE_SHARED@ ENABLE_STATIC = @ENABLE_STATIC@ HAVE_WASI_SDK = @HAVE_WASI_SDK@ diff --git a/autosetup/sqlite-config.tcl b/autosetup/sqlite-config.tcl index 856be4cabc..6dc1534314 100644 --- a/autosetup/sqlite-config.tcl +++ b/autosetup/sqlite-config.tcl @@ -51,9 +51,11 @@ set sqliteConfig(is-cross-compiling) [proj-is-cross-compiling] # either "canonical" or "autoconf", and others may be added in the # future. proc sqlite-config-bootstrap {buildMode} { - if {$buildMode ni {canonical autoconf}} { - user-error "Invalid build mode: $buildMode. Expecting one of: canonical, autoconf" + set allBuildModes {canonical autoconf} + if {$buildMode ni $allBuildModes} { + user-error "Invalid build mode: $buildMode. Expecting one of: $allBuildModes" } + set ::sqliteConfig(build-mode) $buildMode ######################################################################## # A gentle introduction to flags handling in autosetup # @@ -241,9 +243,16 @@ proc sqlite-config-bootstrap {buildMode} { packaging { {autoconf} { # --disable-static-shell: https://sqlite.org/forum/forumpost/cc219ee704 - static-shell=1 => {Link the sqlite3 shell app against the DLL instead of embedding sqlite3.c} + static-shell=1 + => {Link the sqlite3 shell app against the DLL instead of embedding sqlite3.c} } {*} { + # dll-basename: https://sqlite.org/forum/forumpost/828fdfe904 +# dll-basename:=auto +# => {Secifies the base name of the resulting DLL file, defaulting to a +# platform-depending name (libsqlite3 on my Unix-style platforms). +# e.g. --dll-basename=msys-sqlite3-0 +# } # soname: https://sqlite.org/src/forumpost/5a3b44f510df8ded soname:=legacy => {SONAME for libsqlite3.so. "none", or not using this flag, sets no @@ -253,9 +262,11 @@ proc sqlite-config-bootstrap {buildMode} { suffix which gets applied to "libsqlite3.so.", e.g. --soname=9.10 equates to "libsqlite3.so.9.10".} # out-implib: https://sqlite.org/forum/forumpost/0c7fc097b2 - out-implib=0 + out-implib:=auto => {Enable use of --out-implib linker flag to generate an - "import library" for the DLL} + "import library" for the DLL. The output's base name name is + specified by the value, with "auto" meaning to figure out a + name automatically.} } } @@ -263,8 +274,9 @@ proc sqlite-config-bootstrap {buildMode} { developer { {*} { # Note that using the --debug/--enable-debug flag here - # requires patching autosetup/autosetup to rename the --debug - # to --autosetup-debug. + # requires patching autosetup/autosetup to rename its builtin + # --debug to --autosetup-debug. See details in + # autosetup/README.md. with-debug=0 debug=0 => {Enable debug build flags. This option will impact performance by @@ -275,11 +287,16 @@ proc sqlite-config-bootstrap {buildMode} { => {Enable the SQLITE_ENABLE_STMT_SCANSTATUS feature flag} } {canonical} { - dev => {Enable dev-mode build: automatically enables certain other flags} - test-status => {Enable status of tests} - gcov=0 => {Enable coverage testing using gcov} - linemacros => {Enable #line macros in the amalgamation} - dynlink-tools => {Dynamically link libsqlite3 to certain tools which normally statically embed it} + dev + => {Enable dev-mode build: automatically enables certain other flags} + test-status + => {Enable status of tests} + gcov=0 + => {Enable coverage testing using gcov} + linemacros + => {Enable #line macros in the amalgamation} + dynlink-tools + => {Dynamically link libsqlite3 to certain tools which normally statically embed it} } {*} { dump-defines=0 => {Dump autosetup defines to $::sqliteConfig(dump-defines-txt) (for build debugging)} @@ -970,7 +987,7 @@ proc sqlite-check-line-editing {} { set rlLib "" if {"" ne $rlInc} { set rlLib [opt-val with-readline-ldflags] - if {"" eq $rlLib || "auto" eq $rlLib} { + if {$rlLib eq "auto" || $rlLib eq ""} { set rlLib "" set libTerm "" if {[proj-check-function-in-lib tgetent "$editLibName ncurses curses termcap"]} { @@ -1222,7 +1239,7 @@ proc sqlite-handle-math {} { # libtool applied only on Mac platforms. # # Based on https://sqlite.org/forum/forumpost/9dfd5b8fd525a5d7. -proc sqlite-check-mac-cversion {} { +proc sqlite-handle-mac-cversion {} { define LDFLAGS_MAC_CVERSION "" set rc 0 if {[proj-looks-like-mac]} { @@ -1247,7 +1264,7 @@ proc sqlite-check-mac-cversion {} { # Define LDFLAGS_OUT_IMPLIB to either an empty string or to a # -Wl,... flag for the platform-specific --out-implib flag, which is # used for building an "import library .dll.a" file on some platforms -# (e.g. mingw). Returns 1 if supported, else 0. +# (e.g. mingw). Returns 1 if supported, else 0. The actual # # If the configure flag --out-implib is not used then this is a no-op. # If that flag is used but the capability is not available, a fatal @@ -1258,12 +1275,23 @@ proc sqlite-check-mac-cversion {} { # of libsqlite3.so.a files which are unnecessary in most environments. # # Added in response to: https://sqlite.org/forum/forumpost/0c7fc097b2 -proc sqlite-check-out-implib {} { +# +# Platform notes: +# +# - cygwin packages historically install no .dll.a file. +# +# - msys2 packages historically install /usr/lib/libsqlite3.dll.a +# despite the DLL being in /usr/bin/msys-sqlite3-0.dll. +proc sqlite-handle-out-implib {} { define LDFLAGS_OUT_IMPLIB "" set rc 0 if {[proj-opt-was-provided out-implib]} { + set dn [join [opt-val out-implib] ""] + if {$dn in {auto ""}} { + set dn "libsqlite3" ;# [get-define SQLITE_DLL_BASENAME] + } cc-with {-link 1} { - set dll "libsqlite3[get-define TARGET_DLLEXT]" + set dll "${dn}[get-define TARGET_DLLEXT]" set flags "-Wl,--out-implib,${dll}.a" if {[cc-check-flags $flags]} { define LDFLAGS_OUT_IMPLIB $flags @@ -1281,8 +1309,9 @@ proc sqlite-check-out-implib {} { # Performs late-stage config steps common to both the canonical and # autoconf bundle builds. proc sqlite-config-finalize {} { - sqlite-check-mac-cversion - sqlite-check-out-implib + #sqlite-handle-dll-basename + sqlite-handle-out-implib + sqlite-handle-mac-cversion sqlite-process-dot-in-files sqlite-post-config-validation sqlite-dump-defines @@ -1738,6 +1767,27 @@ proc sqlite-handle-tcl {} { msg-result "TCL for code generation: [sqlite-determine-codegen-tcl]" } +######################################################################## +# Handles the --dll-basename configure flag. [define]'s +# SQLITE_DLL_BASENAME to the build's perferred base name (minus +# extension). +proc sqlite-handle-dll-basename {} { + set dn [opt-val dll-basename] + if {$rn in {auto ""}} { + switch -glob -- [get-define host] { + *-*-cygwin* { set dn cygsqlite3-0 } + *-*-ming* { set dn libsqlite3-0 } + *-*-msys* { set dn msys-sqlite3-0 } + default { set dn libsqlite3 } + } + } + define SQLITE_DLL_BASENAME $dn +} + +# TODO? Figure out whether the DLL needs to go under /lib or /bin +# (msys, cygwin, etc). +# proc sqlite-handle-dll-install-dir {} {} + ######################################################################## # If the --dump-defines configure flag is provided then emit a list of # all [define] values to config.defines.txt, else do nothing. diff --git a/manifest b/manifest index 0a89891bbe..b3770f3396 100644 --- a/manifest +++ b/manifest @@ -1,9 +1,9 @@ -C Makefile-internal\svar\srenaming\sin\sprep\sfor\spending\sportability-related\schanges\sin\sthe\shandling\sof\sDLLs.\sNo\sfunctional/build\sinterface\schanges. -D 2025-02-21T20:22:56.972 +C Extend\s--out-implib\sto\soptionally\sspecify\sthe\simport\slib's\sname.\sAdd\sas-yet-unused\sinternals\sfor\sspecifying\sthe\sDLL's\sbase\sname\s(which\sdiffers\sacross\sthe\sWindows-side\sUnix-esque\senvironments). +D 2025-02-21T20:28:44.646 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d -F Makefile.in 80be2e281d4647ac15a5bac15d5d20fc76d1cfb3f3f6dc01d1a26e3346a5042a +F Makefile.in 2d87dc1a64add400f047d0357f8f30e73b890aa5076b7f8f7d02cd1f3557beb1 F Makefile.linux-generic bd3e3cacd369821a6241d4ea1967395c962dfe3057e38cb0a435cee0e8b789d0 F Makefile.msc 50c656e096ae49ccf9e5e88b4995f0a155f231ebae5b6d185cc64ce99d728a83 F README.md c3c0f19532ce28f6297a71870f3c7b424729f0e6d9ab889616d3587dd2332159 @@ -50,7 +50,7 @@ F autosetup/cc.tcl c0fcc50ca91deff8741e449ddad05bcd08268bc31177e613a6343bbd1fd3e F autosetup/jimsh0.c 6573f6bc6ff204de0139692648d7037ca0b6c067bac83a7b4e087f20a86866a4 F autosetup/pkg-config.tcl 4e635bf39022ff65e0d5434339dd41503ea48fc53822c9c5bde88b02d3d952ba F autosetup/proj.tcl cd6134e98d06ab4ae3be746d185dcdbf5180bfa049fe46a6726e703f56ea2f9c -F autosetup/sqlite-config.tcl 9d1e3bbc561af5f8705f96c0f48252112d3e2d3356383f5529f7f9f7b51afb65 +F autosetup/sqlite-config.tcl c6c9ad74147e5f0ae39f0e5e207c4a8140066982c7eb21c68dd4b6483f85968e F autosetup/system.tcl 51d4be76cd9a9074704b584e5c9cbba616202c8468cf9ba8a4f8294a7ab1dba9 F configure 9a00b21dfd13757bbfb8d89b30660a89ec1f8f3a79402b8f9f9b6fc475c3303a x F contrib/sqlitecon.tcl 210a913ad63f9f991070821e599d600bd913e0ad @@ -2210,8 +2210,11 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P d7729dbbf231d57cbcaaa5004d0a9c4957f112dd6520052995b232aa521c0ca3 -R 9fa57efe9e24b037978a77954d886617 +P ebf41fc90aa9fb1bb96239145c0cdd06eced391499975c71734610996d088641 +R b539368d0fe58a110d27ce4df6690ee7 +T *branch * configure-dll-support +T *sym-configure-dll-support * +T -sym-trunk * Cancelled\sby\sbranch. U stephan -Z 3e199b62ebb0fe5383698c3c45ceb587 +Z d83368e818c74940a16d5a2f7cf79842 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index e261d3c10b..7217eed5fe 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -ebf41fc90aa9fb1bb96239145c0cdd06eced391499975c71734610996d088641 +12a55d343f9663acb68cd0f75fbb6c9ab67f4f88ad296e3e266f12d91522dd19 From cc803b209f2ffa9dcaad43c37eb8ccafaed199bd Mon Sep 17 00:00:00 2001 From: drh <> Date: Fri, 21 Feb 2025 20:35:37 +0000 Subject: [PATCH 137/194] The number of declared columns in an index is limited to SQLITE_LIMIT_COLUMN. But the actual number of columns in the implementation might need to be twice as much to account for the primary key at the end. Ensure that the code is able to deal with this. This is a correction to check-in [d7729dbbf231d57c]. FossilOrigin-Name: 5822feec43be9352fd87bf9968c39c0218e01ab5fe3ba50431ae21cba79e6c89 --- manifest | 22 +++++++++++----------- manifest.uuid | 2 +- src/build.c | 23 ++++++++++++----------- src/sqliteInt.h | 6 +++--- src/sqliteLimit.h | 6 ++++++ src/where.c | 2 ++ test/without_rowid1.test | 19 ++++++++++++++----- 7 files changed, 49 insertions(+), 31 deletions(-) diff --git a/manifest b/manifest index 0a89891bbe..eb3b50595e 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Makefile-internal\svar\srenaming\sin\sprep\sfor\spending\sportability-related\schanges\sin\sthe\shandling\sof\sDLLs.\sNo\sfunctional/build\sinterface\schanges. -D 2025-02-21T20:22:56.972 +C The\snumber\sof\sdeclared\scolumns\sin\san\sindex\sis\slimited\sto\sSQLITE_LIMIT_COLUMN.\nBut\sthe\sactual\snumber\sof\scolumns\sin\sthe\simplementation\smight\sneed\sto\sbe\ntwice\sas\smuch\sto\saccount\sfor\sthe\sprimary\skey\sat\sthe\send.\s\sEnsure\sthat\sthe\ncode\sis\sable\sto\sdeal\swith\sthis.\s\sThis\sis\sa\scorrection\sto\ncheck-in\s[d7729dbbf231d57c]. +D 2025-02-21T20:35:37.743 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d @@ -725,7 +725,7 @@ F src/btmutex.c 79a43670447eacc651519a429f6ece9fd638563cf95b469d6891185ddae2b522 F src/btree.c 9316859aa5f14bde4a3719ffb1570219e51c5de433221e38b87ea19db868aedf F src/btree.h 18e5e7b2124c23426a283523e5f31a4bff029131b795bb82391f9d2f3136fc50 F src/btreeInt.h 98aadb6dcb77b012cab2574d6a728fad56b337fc946839b9898c4b4c969e30b6 -F src/build.c c2bcfc7e5072a743a051699f06329ee206299729adf4323fed9be8aa2d64af73 +F src/build.c 20793695ef64d2d0c147501e37f344f828f09f16d346a987b516316186030996 F src/callback.c acae8c8dddda41ee85cfdf19b926eefe830f371069f8aadca3aa39adf5b1c859 F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e F src/date.c 842c08ac143a56a627b05ac51d68624f2b7b03e3b4cba596205e735eed64ee57 @@ -786,8 +786,8 @@ F src/shell.c.in bf997e43faaa1ef0ff78d4d7b9be6a9430cf1edda9a47a14e7fef646fcb459a F src/sqlite.h.in 8d4486fb28a90de818ac1e8c6206ea458e7de6bd8e0dfa3d554494f155be8c01 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8 F src/sqlite3ext.h 3f046c04ea3595d6bfda99b781926b17e672fd6d27da2ba6d8d8fc39981dcb54 -F src/sqliteInt.h a5c850981cff99331b2ed48d519fb54a47f5f91c680e2cab64d91e259685de69 -F src/sqliteLimit.h b963c1e8c48791cc5cf733bb33e4741d0fbb7d0650cc2344cce5e4c17be4e8fd +F src/sqliteInt.h e74f0ea0bc4d3c16afd5004557b264137d6f1d61d2a1ff2a49877b0589945462 +F src/sqliteLimit.h 6d817c28a8f19af95e6f4921933b7fbbca48a962bce0eb0ec81e8bb3ef38e68b F src/status.c 0e72e4f6be6ccfde2488eb63210297e75f569f3ce9920f6c3d77590ec6ce5ffd F src/table.c 0f141b58a16de7e2fbe81c308379e7279f4c6b50eb08efeec5892794a0ba30d1 F src/tclsqlite.c 5c1e367e26711044730c93d4b81312170918a8d1fe811f45be740ab48f7de8c1 @@ -865,7 +865,7 @@ F src/vxworks.h d2988f4e5a61a4dfe82c6524dd3d6e4f2ce3cdb9 F src/wal.c cefdffc112c767c79596d9c0d15cb4de27071132e9b8a0fce323b140cd4af683 F src/wal.h ba252daaa94f889f4b2c17c027e823d9be47ce39da1d3799886bbd51f0490452 F src/walker.c d5006d6b005e4ea7302ad390957a8d41ed83faa177e412f89bc5600a7462a014 -F src/where.c 09dc313e7223ca1217c39c7026b00f16ff449a8323511a762fcba7863a00f4cd +F src/where.c 12cca5dfbe96e2589f951c43c0720fc58e52611787c37d85a0d9c10376202e8b F src/whereInt.h d20cddddb1d61b18d5cb1fcfa9b77fbeebbc4afe44d996e603452a23b3009ee1 F src/wherecode.c 5baa06f0daae7d38aca1d4814030b82ad4f127fe6bad18f0644776a474f6088b F src/whereexpr.c 2415c8eee5ff89a8b709d7d83d71c1ff986cd720d0520057e1d8a5371339012a @@ -2095,7 +2095,7 @@ F test/with4.test 257be66c0c67fee1defbbac0f685c3465e2cad037f21ce65f23f86084f1982 F test/with5.test 6248213c41fab36290b5b73aa3f937309dfba337004d9d8434c3fabc8c7d4be8 F test/with6.test 281e4861b5e517f6c3c2f08517a520c1e2ee7c11966545d3901f258a4fe8ef76 F test/withM.test 693b61765f2b387b5e3e24a4536e2e82de15ff64 -F test/without_rowid1.test 7120af676485e68930d3e513d083f3644622893477901f55eec954387125d550 +F test/without_rowid1.test 545a98bde0dc641cce8d361cd589677a70561f36f9033ae48de8ae37418d6ce2 F test/without_rowid2.test af260339f79d13cb220288b67cd287fbcf81ad99 F test/without_rowid3.test 39ab0dd773eaa62e59b17093f875327630f54c4145458f6d2b053d68d4b2f67b F test/without_rowid4.test 4e08bcbaee0399f35d58b5581881e7a6243d458a @@ -2210,8 +2210,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P d7729dbbf231d57cbcaaa5004d0a9c4957f112dd6520052995b232aa521c0ca3 -R 9fa57efe9e24b037978a77954d886617 -U stephan -Z 3e199b62ebb0fe5383698c3c45ceb587 +P ebf41fc90aa9fb1bb96239145c0cdd06eced391499975c71734610996d088641 +R ea801290870a4070bffe00dffce34b68 +U drh +Z e1106d68193ec85ec463ffb759ee622e # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index e261d3c10b..83f71c4a07 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -ebf41fc90aa9fb1bb96239145c0cdd06eced391499975c71734610996d088641 +5822feec43be9352fd87bf9968c39c0218e01ab5fe3ba50431ae21cba79e6c89 diff --git a/src/build.c b/src/build.c index 18bf27b833..907494b193 100644 --- a/src/build.c +++ b/src/build.c @@ -1067,7 +1067,7 @@ Index *sqlite3PrimaryKeyIndex(Table *pTab){ ** find the (first) offset of that column in index pIdx. Or return -1 ** if column iCol is not used in index pIdx. */ -i16 sqlite3TableColumnToIndex(Index *pIdx, int iCol){ +int sqlite3TableColumnToIndex(Index *pIdx, int iCol){ int i; i16 iCol16; assert( iCol>=(-1) && iCol<=SQLITE_MAX_COLUMN ); @@ -2175,16 +2175,15 @@ static char *createTableStmt(sqlite3 *db, Table *p){ */ static int resizeIndexObject(Parse *pParse, Index *pIdx, int N){ char *zExtra; - int nByte; + u64 nByte; sqlite3 *db; if( pIdx->nColumn>=N ) return SQLITE_OK; db = pParse->db; - if( N>db->aLimit[SQLITE_LIMIT_COLUMN] ){ - sqlite3ErrorMsg(pParse, "too many columns on %s", pIdx->zName); - return SQLITE_ERROR; - } + assert( N>0 ); + assert( N <= SQLITE_MAX_COLUMN*2 /* tag-20250221-1 */ ); + testcase( N==2*pParse->db->aLimit[SQLITE_LIMIT_COLUMN] ); assert( pIdx->isResized==0 ); - nByte = (sizeof(char*) + sizeof(LogEst) + sizeof(i16) + 1)*N; + nByte = (sizeof(char*) + sizeof(LogEst) + sizeof(i16) + 1)*(u64)N; zExtra = sqlite3DbMallocZero(db, nByte); if( zExtra==0 ) return SQLITE_NOMEM_BKPT; memcpy(zExtra, pIdx->azColl, sizeof(char*)*pIdx->nColumn); @@ -2198,7 +2197,7 @@ static int resizeIndexObject(Parse *pParse, Index *pIdx, int N){ zExtra += sizeof(i16)*N; memcpy(zExtra, pIdx->aSortOrder, pIdx->nColumn); pIdx->aSortOrder = (u8*)zExtra; - pIdx->nColumn = N; + pIdx->nColumn = (u16)N; /* See tag-20250221-1 above for proof of safety */ pIdx->isResized = 1; return SQLITE_OK; } @@ -3860,13 +3859,14 @@ static void sqlite3RefillIndex(Parse *pParse, Index *pIndex, int memRootPage){ */ Index *sqlite3AllocateIndexObject( sqlite3 *db, /* Database connection */ - i16 nCol, /* Total number of columns in the index */ + int nCol, /* Total number of columns in the index */ int nExtra, /* Number of bytes of extra space to alloc */ char **ppExtra /* Pointer to the "extra" space */ ){ Index *p; /* Allocated index object */ i64 nByte; /* Bytes of space for Index object + arrays */ + assert( nCol <= 2*db->aLimit[SQLITE_LIMIT_COLUMN] ); nByte = ROUND8(sizeof(Index)) + /* Index structure */ ROUND8(sizeof(char*)*nCol) + /* Index.azColl */ ROUND8(sizeof(LogEst)*(nCol+1) + /* Index.aiRowLogEst */ @@ -3879,8 +3879,9 @@ Index *sqlite3AllocateIndexObject( p->aiRowLogEst = (LogEst*)pExtra; pExtra += sizeof(LogEst)*(nCol+1); p->aiColumn = (i16*)pExtra; pExtra += sizeof(i16)*nCol; p->aSortOrder = (u8*)pExtra; - p->nColumn = nCol; - p->nKeyCol = nCol - 1; + assert( nCol>0 ); + p->nColumn = (u16)nCol; + p->nKeyCol = (u16)(nCol - 1); *ppExtra = ((char*)p) + nByte; } return p; diff --git a/src/sqliteInt.h b/src/sqliteInt.h index d4b9983091..de3ce7aa29 100644 --- a/src/sqliteInt.h +++ b/src/sqliteInt.h @@ -2759,7 +2759,7 @@ struct Index { Pgno tnum; /* DB Page containing root of this index */ LogEst szIdxRow; /* Estimated average row size in bytes */ u16 nKeyCol; /* Number of columns forming the key */ - u16 nColumn; /* Number of columns stored in the index */ + u16 nColumn; /* Nr columns in btree. Can be 2*Table.nCol */ u8 onError; /* OE_Abort, OE_Ignore, OE_Replace, or OE_None */ unsigned idxType:2; /* 0:Normal 1:UNIQUE, 2:PRIMARY KEY, 3:IPK */ unsigned bUnordered:1; /* Use this index for == or IN queries only */ @@ -4908,7 +4908,7 @@ void sqlite3SubqueryColumnTypes(Parse*,Table*,Select*,char); Table *sqlite3ResultSetOfSelect(Parse*,Select*,char); void sqlite3OpenSchemaTable(Parse *, int); Index *sqlite3PrimaryKeyIndex(Table*); -i16 sqlite3TableColumnToIndex(Index*, int); +int sqlite3TableColumnToIndex(Index*, int); #ifdef SQLITE_OMIT_GENERATED_COLUMNS # define sqlite3TableColumnToStorage(T,X) (X) /* No-op pass-through */ # define sqlite3StorageColumnToTable(T,X) (X) /* No-op pass-through */ @@ -5006,7 +5006,7 @@ void sqlite3SrcListAssignCursors(Parse*, SrcList*); void sqlite3IdListDelete(sqlite3*, IdList*); void sqlite3ClearOnOrUsing(sqlite3*, OnOrUsing*); void sqlite3SrcListDelete(sqlite3*, SrcList*); -Index *sqlite3AllocateIndexObject(sqlite3*,i16,int,char**); +Index *sqlite3AllocateIndexObject(sqlite3*,int,int,char**); void sqlite3CreateIndex(Parse*,Token*,Token*,SrcList*,ExprList*,int,Token*, Expr*, int, int, u8); void sqlite3DropIndex(Parse*, SrcList*, int); diff --git a/src/sqliteLimit.h b/src/sqliteLimit.h index 0d15b31822..ec774889b5 100644 --- a/src/sqliteLimit.h +++ b/src/sqliteLimit.h @@ -41,6 +41,12 @@ ** not have more than a dozen or so columns in any table. And if ** that is the case, there is no point in having more than a few ** dozen values in any of the other situations described above. +** +** An index can only have SQLITE_MAX_COLUMN columns from the user +** point of view, but the underlying b-tree that implements the index +** might have up to twice as many columns in a WITHOUT ROWID table, +** since must also store the primary key at the end. Hence the +** column count for Index is u16 instead of i16. */ #if !defined(SQLITE_MAX_COLUMN) # define SQLITE_MAX_COLUMN 2000 diff --git a/src/where.c b/src/where.c index 5cb52b8adb..1275250067 100644 --- a/src/where.c +++ b/src/where.c @@ -1104,6 +1104,8 @@ static SQLITE_NOINLINE void constructAutomaticIndex( } /* Construct the Index object to describe this index */ + assert( nKeyCol <= pTable->nCol + MAX(0, pTable->nCol - BMS + 1) ); + /* ^-- This guarantees that the number of index columns will fit in the u16 */ pIdx = sqlite3AllocateIndexObject(pParse->db, nKeyCol+HasRowid(pTable), 0, &zNotUsed); if( pIdx==0 ) goto end_auto_index_create; diff --git a/test/without_rowid1.test b/test/without_rowid1.test index 0095fab0c0..5d0bc81105 100644 --- a/test/without_rowid1.test +++ b/test/without_rowid1.test @@ -493,18 +493,27 @@ ifcapable altertable { # reset_db sqlite3_limit db SQLITE_LIMIT_COLUMN 8 -do_catchsql_test 16.1 { +do_execsql_test 16.1 { CREATE TABLE t1( c1,c2,c3,c4,c5,c6,c7,c8, PRIMARY KEY(c1,c2,c1 COLLATE NOCASE) ) WITHOUT ROWID; -} {1 {too many columns on sqlite_autoindex_t1_1}} -do_catchsql_test 16.2 { - CREATE TABLE t1( +} {} +do_execsql_test 16.2 { + CREATE TABLE t2( + c1,c2,c3,c4,c5,c6,c7,c8, + PRIMARY KEY(c1 COLLATE nocase,c1 COLLATE rtrim, + c2 COLLATE nocase,c2 COLLATE rtrim, + c3 COLLATE nocase,c3 COLLATE rtrim, + c4 COLLATE nocase,c4 COLLATE rtrim) + ) WITHOUT ROWID; +} {} +do_execsql_test 16.3 { + CREATE TABLE t3( c1,c2,c3,c4,c5,c6,c7,c8, PRIMARY KEY(c1,c2), UNIQUE(c3,c4,c5,c6,c7,c8,c3 COLLATE nocase) ) WITHOUT ROWID; -} {1 {too many columns on sqlite_autoindex_t1_2}} +} {} finish_test From 4d58d3938a46d9f1239873157b2e343ef09025a3 Mon Sep 17 00:00:00 2001 From: stephan Date: Fri, 21 Feb 2025 21:58:32 +0000 Subject: [PATCH 138/194] Add --dll-basename flag to give clients control over the DLL's base name. Split the DLL installation makefile rules into digestible, platform-specific chunks. On Windows-side Unix-like environments, install the DLL into the bin dir. Requires testing and feedback from those platforms' package maintainers to confirm it follows the expectated conventions. FossilOrigin-Name: 8d5fed807b7151dcb79b97cfc2da0e8ac3586a0bf8b4c28967ad4cffafa53c08 --- Makefile.in | 4 +- autoconf/Makefile.in | 91 ++++++++++++++++++------------- autosetup/proj.tcl | 9 ++++ autosetup/sqlite-config.tcl | 98 ++++++++++++++++++++++----------- main.mk | 105 ++++++++++++++++++++++-------------- manifest | 23 ++++---- manifest.uuid | 2 +- 7 files changed, 209 insertions(+), 123 deletions(-) diff --git a/Makefile.in b/Makefile.in index 99b3a8c8d1..3178028d81 100644 --- a/Makefile.in +++ b/Makefile.in @@ -126,11 +126,13 @@ LDFLAGS.libsqlite3.os-specific = @LDFLAGS_MAC_CVERSION@ @LDFLAGS_OUT_IMPLIB@ # os-specific: see # - https://sqlite.org/forum/forumpost/9dfd5b8fd525a5d7 # - https://sqlite.org/forum/forumpost/0c7fc097b2 +libsqlite3.DLL.basename = @SQLITE_DLL_BASENAME@ +libsqlite3.out.implib = @SQLITE_OUT_IMPLIB@ # dll.basename: see https://sqlite.org/forum/forumpost/828fdfe904 -#libsqlite3.DLL.basename = @ SQLITE_DLL_BASENAME @ ENABLE_SHARED = @ENABLE_SHARED@ ENABLE_STATIC = @ENABLE_STATIC@ HAVE_WASI_SDK = @HAVE_WASI_SDK@ +libsqlite3.DLL.install-rules = @SQLITE_DLL_INSTALL_RULES@ T.cc.sqlite = $(T.cc) @TARGET_DEBUG@ diff --git a/autoconf/Makefile.in b/autoconf/Makefile.in index 5a357dc9e7..d520779915 100644 --- a/autoconf/Makefile.in +++ b/autoconf/Makefile.in @@ -143,7 +143,10 @@ sqlite3.o: $(TOP)/sqlite3.h $(TOP)/sqlite3.c $(CC) -c $(TOP)/sqlite3.c -o $@ $(CFLAGS) $(CFLAGS.libsqlite3) libsqlite3.LIB = libsqlite3$(T.lib) -libsqlite3.DLL = libsqlite3$(T.dll) +libsqlite3.DLL.basename = @SQLITE_DLL_BASENAME@ +libsqlite3.out.implib = @SQLITE_OUT_IMPLIB@ +libsqlite3.DLL = $(libsqlite3.DLL.basename)$(T.dll) +libsqlite3.DLL.install-rules = @SQLITE_DLL_INSTALL_RULES@ $(libsqlite3.DLL): sqlite3.o $(CC) -o $@ sqlite3.o $(LDFLAGS.shlib) \ @@ -159,45 +162,59 @@ $(libsqlite3.LIB)-1: $(libsqlite3.LIB) $(libsqlite3.LIB)-0: all: $(libsqlite3.LIB)-$(ENABLE_LIB_STATIC) -install-so-1: $(install-dir.lib) $(libsqlite3.DLL) - $(INSTALL) $(libsqlite3.DLL) "$(install-dir.lib)" - @if [ -f $(libsqlite3.DLL).a ]; then \ - $(INSTALL) $(libsqlite3.DLL).a "$(install-dir.lib)"; \ - fi - @echo "Setting up $(libsqlite3.DLL) version symlinks..."; \ - if [ x.dll = x$(T.dll) ]; then \ - echo "No library symlinks needed on this platform"; \ - elif [ x.dylib = x$(T.dll) ]; then \ - cd "$(install-dir.lib)" || exit $$?; \ - rm -f libsqlite3.0$(T.dll) libsqlite3.$(PACKAGE_VERSION)$(T.dll) || exit $$?; \ - dllname=libsqlite3.$(PACKAGE_VERSION)$(T.dll); \ - mv $(libsqlite3.DLL) $$dllname || exit $$?; \ - ln -s $$dllname $(libsqlite3.DLL) || exit $$?; \ - ln -s $$dllname libsqlite3.0$(T.dll) || exit $$?; \ - ls -la $$dllname $(libsqlite3.DLL) libsqlite3.0$(T.dll); \ - else \ - cd "$(install-dir.lib)" || exit $$?; \ - rm -f $(libsqlite3.DLL).0 $(libsqlite3.DLL).$(PACKAGE_VERSION) || exit $$?; \ - mv $(libsqlite3.DLL) $(libsqlite3.DLL).$(PACKAGE_VERSION) || exit $$?; \ - ln -s $(libsqlite3.DLL).$(PACKAGE_VERSION) $(libsqlite3.DLL) || exit $$?; \ - ln -s $(libsqlite3.DLL).$(PACKAGE_VERSION) $(libsqlite3.DLL).0 || exit $$?; \ - ls -la $(libsqlite3.DLL) $(libsqlite3.DLL).[a03]*; \ - if [ -e $(libsqlite3.DLL).0.8.6 ]; then \ - echo "ACHTUNG: legacy libtool-compatible install found. Re-linking it..."; \ - rm -f libsqlite3.la $(libsqlite3.DLL).0.8.6 || exit $$?; \ - ln -s $(libsqlite3.DLL).$(PACKAGE_VERSION) $(libsqlite3.DLL).0.8.6 || exit $$?; \ - ls -la $(libsqlite3.DLL).0.8.6; \ - elif [ x1 = "x$(INSTALL_SO_086_LINK)" ]; then \ - echo "ACHTUNG: installing legacy libtool-style links because INSTALL_SO_086_LINK=1"; \ - rm -f libsqlite3.la $(libsqlite3.DLL).0.8.6 || exit $$?; \ - ln -s $(libsqlite3.DLL).$(PACKAGE_VERSION) $(libsqlite3.DLL).0.8.6 || exit $$?; \ - ls -la $(libsqlite3.DLL).0.8.6; \ +# +# Maintenance reminder: the install-dll-... rules must be kept in sync +# with the main copies rom /main.mk. +# +install-dll-out-implib: $(install-dir.lib) $(libsqlite3.DLL) + @if [ x != "x$(libsqlite3.out.implib)"; then \ + if [ -f "$(libsqlite3.out.implib)" ]; then \ + $(INSTALL) $(libsqlite3.out.implib) "$(install-dir.lib)"; \ fi; \ fi -install-so-0 install-so-: -install-so: install-so-$(ENABLE_LIB_SHARED) -install: install-so +install-dll-unix-generic: install-dll-out-implib + $(INSTALL) $(libsqlite3.DLL) "$(install-dir.lib)" + @echo "Setting up $(libsqlite3.DLL) version symlinks..."; \ + cd "$(install-dir.lib)" || exit $$?; \ + rm -f $(libsqlite3.DLL).0 $(libsqlite3.DLL).$(PACKAGE_VERSION) || exit $$?; \ + mv $(libsqlite3.DLL) $(libsqlite3.DLL).$(PACKAGE_VERSION) || exit $$?; \ + ln -s $(libsqlite3.DLL).$(PACKAGE_VERSION) $(libsqlite3.DLL) || exit $$?; \ + ln -s $(libsqlite3.DLL).$(PACKAGE_VERSION) $(libsqlite3.DLL).0 || exit $$?; \ + ls -la $(libsqlite3.DLL) $(libsqlite3.DLL).[a03]*; \ + if [ -e $(libsqlite3.DLL).0.8.6 ]; then \ + echo "ACHTUNG: legacy libtool-compatible install found. Re-linking it..."; \ + rm -f libsqlite3.la $(libsqlite3.DLL).0.8.6 || exit $$?; \ + ln -s $(libsqlite3.DLL).$(PACKAGE_VERSION) $(libsqlite3.DLL).0.8.6 || exit $$?; \ + ls -la $(libsqlite3.DLL).0.8.6; \ + elif [ x1 = "x$(INSTALL_SO_086_LINK)" ]; then \ + echo "ACHTUNG: installing legacy libtool-style links because INSTALL_SO_086_LINK=1"; \ + rm -f libsqlite3.la $(libsqlite3.DLL).0.8.6 || exit $$?; \ + ln -s $(libsqlite3.DLL).$(PACKAGE_VERSION) $(libsqlite3.DLL).0.8.6 || exit $$?; \ + ls -la $(libsqlite3.DLL).0.8.6; \ + fi + +install-dll-msys: install-dll-out-implib + $(INSTALL) $(libsqlite3.DLL) "$(install-dir.bin)" +# ----------------------------------------------^^^ yes, bin +install-dll-mingw: install-dll-msys +install-dll-cygwin: install-dll-msys + +install-dll-darwin: $(install-dir.lib) $(libsqlite3.DLL) + $(INSTALL) $(libsqlite3.DLL) "$(install-dir.lib)" + @echo "Setting up $(libsqlite3.DLL) version symlinks..."; \ + cd "$(install-dir.lib)" || exit $$?; \ + rm -f libsqlite3.0$(T.dll) libsqlite3.$(PACKAGE_VERSION)$(T.dll) || exit $$?; \ + dllname=libsqlite3.$(PACKAGE_VERSION)$(T.dll); \ + mv $(libsqlite3.DLL) $$dllname || exit $$?; \ + ln -s $$dllname $(libsqlite3.DLL) || exit $$?; \ + ln -s $$dllname libsqlite3.0$(T.dll) || exit $$?; \ + ls -la $$dllname $(libsqlite3.DLL) libsqlite3.0$(T.dll) + +install-dll-1: install-dll-$(libsqlite3.DLL.install-rules) +install-dll-0 install-dll-: +install-dll: install-dll-$(ENABLE_LIB_SHARED) +install: install-dll install-lib-1: $(install-dir.lib) $(libsqlite3.LIB) $(INSTALL.noexec) $(libsqlite3.LIB) "$(install-dir.lib)" diff --git a/autosetup/proj.tcl b/autosetup/proj.tcl index c11b05d5f7..f228dce217 100644 --- a/autosetup/proj.tcl +++ b/autosetup/proj.tcl @@ -389,6 +389,15 @@ proc proj-opt-set {flag {val 1}} { return $val } +######################################################################## +# @proj-opt-exists flag +# +# Returns 1 if the given flag has been defined as a legal configure +# option, else returns 0. +proc proj-opt-exists {flag} { + expr {$flag in $::autosetup(options)}; +} + ######################################################################## # @proj-val-truthy val # diff --git a/autosetup/sqlite-config.tcl b/autosetup/sqlite-config.tcl index 6dc1534314..d37148819c 100644 --- a/autosetup/sqlite-config.tcl +++ b/autosetup/sqlite-config.tcl @@ -231,6 +231,8 @@ proc sqlite-config-bootstrap {buildMode} { # Options for exotic/alternative build modes alternative-builds { {canonical} { + # Potential TODO: add --with-wasi-sdk support to the autoconf + # build with-wasi-sdk:=/opt/wasi-sdk => {Top-most dir of the wasi-sdk for a WASI build} with-emsdk:=auto @@ -247,12 +249,6 @@ proc sqlite-config-bootstrap {buildMode} { => {Link the sqlite3 shell app against the DLL instead of embedding sqlite3.c} } {*} { - # dll-basename: https://sqlite.org/forum/forumpost/828fdfe904 -# dll-basename:=auto -# => {Secifies the base name of the resulting DLL file, defaulting to a -# platform-depending name (libsqlite3 on my Unix-style platforms). -# e.g. --dll-basename=msys-sqlite3-0 -# } # soname: https://sqlite.org/src/forumpost/5a3b44f510df8ded soname:=legacy => {SONAME for libsqlite3.so. "none", or not using this flag, sets no @@ -261,6 +257,13 @@ proc sqlite-config-bootstrap {buildMode} { it to that literal value. Any other value is assumed to be a suffix which gets applied to "libsqlite3.so.", e.g. --soname=9.10 equates to "libsqlite3.so.9.10".} + # dll-basename: https://sqlite.org/forum/forumpost/828fdfe904 + dll-basename:=auto + => {Specifies the base name of the resulting DLL file, defaulting to a + platform-depending name (libsqlite3 on most Unix-style platforms). + If not provided, libsqlite3 is assumed, but if provided without a + value then a platform-dependent default is used. + e.g. --dll-basename=msys-sqlite3-0} # out-implib: https://sqlite.org/forum/forumpost/0c7fc097b2 out-implib:=auto => {Enable use of --out-implib linker flag to generate an @@ -1261,10 +1264,33 @@ proc sqlite-handle-mac-cversion {} { } ######################################################################## -# Define LDFLAGS_OUT_IMPLIB to either an empty string or to a +# Handles the --dll-basename configure flag. [define]'s +# SQLITE_DLL_BASENAME to the build's preferred base name (minus +# extension). +proc sqlite-handle-dll-basename {} { + if {[proj-opt-exists dll-basename]} { + set dn [join [opt-val dll-basename] ""] + } else { + set dn auto + } + if {$dn in {auto ""}} { + switch -glob -- [get-define host] { + *-*-cygwin* { set dn cygsqlite3-0 } + *-*-ming* { set dn libsqlite3-0 } + *-*-msys* { set dn msys-sqlite3-0 } + default { set dn libsqlite3 } + } + } + define SQLITE_DLL_BASENAME $dn +} + +######################################################################## +# [define]s LDFLAGS_OUT_IMPLIB to either an empty string or to a # -Wl,... flag for the platform-specific --out-implib flag, which is # used for building an "import library .dll.a" file on some platforms -# (e.g. mingw). Returns 1 if supported, else 0. The actual +# (e.g. msys2, mingw). Returns 1 if supported, else 0. +# +# The name of the import library is [define]d in SQLITE_OUT_IMPLIB. # # If the configure flag --out-implib is not used then this is a no-op. # If that flag is used but the capability is not available, a fatal @@ -1283,18 +1309,21 @@ proc sqlite-handle-mac-cversion {} { # - msys2 packages historically install /usr/lib/libsqlite3.dll.a # despite the DLL being in /usr/bin/msys-sqlite3-0.dll. proc sqlite-handle-out-implib {} { + sqlite-handle-dll-basename define LDFLAGS_OUT_IMPLIB "" + define SQLITE_OUT_IMPLIB "" set rc 0 if {[proj-opt-was-provided out-implib]} { - set dn [join [opt-val out-implib] ""] - if {$dn in {auto ""}} { - set dn "libsqlite3" ;# [get-define SQLITE_DLL_BASENAME] + set olBaseName [join [opt-val out-implib] ""] + if {$olBaseName in {auto ""}} { + set olBaseName "libsqlite3" ;# [get-define SQLITE_DLL_BASENAME] } cc-with {-link 1} { - set dll "${dn}[get-define TARGET_DLLEXT]" + set dll "${olBaseName}[get-define TARGET_DLLEXT]" set flags "-Wl,--out-implib,${dll}.a" if {[cc-check-flags $flags]} { define LDFLAGS_OUT_IMPLIB $flags + define SQLITE_OUT_IMPLIB ${dll}.a set rc 1 } } @@ -1305,11 +1334,37 @@ proc sqlite-handle-out-implib {} { return $rc } +######################################################################## +# [define] SQLITE_DLL_INSTALL_RULES to a symbolic name of a set of +# "make install" rules to use. The makefile is tasked with with +# providing rules named install-dll-NAME which runs the installation +# for that set, as well as providing a rule named install-dll which +# resolves to install-dll-NAME (perhaps indirectly, depending on +# whether the DLL is (de)activated). +proc sqlite-determine-dll-install-rules {} { + set n unix-generic + switch -glob -- [get-define host] { + *-*-cygwin* { set n cygwin } + *-*-ming* { set n mingw } + *-*-msys* { set n msys } + *apple* - + *darwin* { set n darwin } + } + define SQLITE_DLL_INSTALL_RULES $n +} + ######################################################################## # Performs late-stage config steps common to both the canonical and # autoconf bundle builds. proc sqlite-config-finalize {} { - #sqlite-handle-dll-basename +# Pending: move some of the auto.def code into this switch +# switch -exact -- $::sqliteConfig(build-mode) { +# canonical { +# } +# autoconf { +# } +# } + sqlite-determine-dll-install-rules sqlite-handle-out-implib sqlite-handle-mac-cversion sqlite-process-dot-in-files @@ -1767,23 +1822,6 @@ proc sqlite-handle-tcl {} { msg-result "TCL for code generation: [sqlite-determine-codegen-tcl]" } -######################################################################## -# Handles the --dll-basename configure flag. [define]'s -# SQLITE_DLL_BASENAME to the build's perferred base name (minus -# extension). -proc sqlite-handle-dll-basename {} { - set dn [opt-val dll-basename] - if {$rn in {auto ""}} { - switch -glob -- [get-define host] { - *-*-cygwin* { set dn cygsqlite3-0 } - *-*-ming* { set dn libsqlite3-0 } - *-*-msys* { set dn msys-sqlite3-0 } - default { set dn libsqlite3 } - } - } - define SQLITE_DLL_BASENAME $dn -} - # TODO? Figure out whether the DLL needs to go under /lib or /bin # (msys, cygwin, etc). # proc sqlite-handle-dll-install-dir {} {} diff --git a/main.mk b/main.mk index 9cc31a8fa8..fd81dd84f4 100644 --- a/main.mk +++ b/main.mk @@ -1055,17 +1055,31 @@ T.link.tcl = $(T.tcl.env.source); $(T.link) # # libsqlite3.DLL.basename = the base name of the resulting DLL. This # is typically libsqlite3 but varies wildly on Unix-like Windows -# environments (msys, cygwin, and friends). +# environments (msys, cygwin, and friends). Conversely, the base name +# of the static library ($(libsqlite3.LIB)) is constant on all tested +# platforms. # libsqlite3.DLL.basename ?= libsqlite3 # +# libsqlite3.DLL => the DLL library +# +libsqlite3.DLL = $(libsqlite3.DLL.basename)$(T.dll) +# +# libsqlite3.out.implib => "import library" file generated by the +# --out-implib linker flag. Not commonly used on Unix systems but is +# on the Windows-side Unix-esque environments and typically as a value +# of "libsqlite3.dll.a". +# +libsqlite3.out.implib ?= +# # libsqlite3.LIB => the static library # libsqlite3.LIB = libsqlite3$(T.lib) + # -# libsqlite3.LIB => the DLL library -# -libsqlite3.DLL = $(libsqlite3.DLL.basename)$(T.dll) +# libsqlite3.DLL.install-rules => the suffix of the symoblic name of +# the makefile rules for installing the DLL. +libsqlite3.DLL.install-rules ?= unix-generic # Rules to build the LEMON compiler generator # @@ -1485,45 +1499,54 @@ all: so # In either case, libsqlite3.la, if found, is deleted because it would # contain stale state, refering to non-libtool-generated libraries. # -install-so-1: $(install-dir.lib) $(libsqlite3.DLL) - $(INSTALL) $(libsqlite3.DLL) "$(install-dir.lib)" - @if [ -f $(libsqlite3.DLL).a ]; then \ - $(INSTALL) $(libsqlite3.DLL).a "$(install-dir.lib)"; \ - fi - @echo "Setting up $(libsqlite3.DLL) version symlinks..."; \ - if [ x.dll = x$(T.dll) ]; then \ - echo "No library symlinks needed on this platform"; \ - elif [ x.dylib = x$(T.dll) ]; then \ - cd "$(install-dir.lib)" || exit $$?; \ - rm -f libsqlite3.0$(T.dll) libsqlite3.$(PACKAGE_VERSION)$(T.dll) || exit $$?; \ - dllname=libsqlite3.$(PACKAGE_VERSION)$(T.dll); \ - mv $(libsqlite3.DLL) $$dllname || exit $$?; \ - ln -s $$dllname $(libsqlite3.DLL) || exit $$?; \ - ln -s $$dllname libsqlite3.0$(T.dll) || exit $$?; \ - ls -la $$dllname $(libsqlite3.DLL) libsqlite3.0$(T.dll); \ - else \ - cd "$(install-dir.lib)" || exit $$?; \ - rm -f $(libsqlite3.DLL).0 $(libsqlite3.DLL).$(PACKAGE_VERSION) || exit $$?; \ - mv $(libsqlite3.DLL) $(libsqlite3.DLL).$(PACKAGE_VERSION) || exit $$?; \ - ln -s $(libsqlite3.DLL).$(PACKAGE_VERSION) $(libsqlite3.DLL) || exit $$?; \ - ln -s $(libsqlite3.DLL).$(PACKAGE_VERSION) $(libsqlite3.DLL).0 || exit $$?; \ - ls -la $(libsqlite3.DLL) $(libsqlite3.DLL).[a03]*; \ - if [ -e $(libsqlite3.DLL).0.8.6 ]; then \ - echo "ACHTUNG: legacy libtool-compatible install found. Re-linking it..."; \ - rm -f libsqlite3.la $(libsqlite3.DLL).0.8.6 || exit $$?; \ - ln -s $(libsqlite3.DLL).$(PACKAGE_VERSION) $(libsqlite3.DLL).0.8.6 || exit $$?; \ - ls -la $(libsqlite3.DLL).0.8.6; \ - elif [ x1 = "x$(INSTALL_SO_086_LINK)" ]; then \ - echo "ACHTUNG: installing legacy libtool-style links because INSTALL_SO_086_LINK=1"; \ - rm -f libsqlite3.la $(libsqlite3.DLL).0.8.6 || exit $$?; \ - ln -s $(libsqlite3.DLL).$(PACKAGE_VERSION) $(libsqlite3.DLL).0.8.6 || exit $$?; \ - ls -la $(libsqlite3.DLL).0.8.6; \ - fi; \ + +install-dll-out-implib: $(install-dir.lib) $(libsqlite3.DLL) + if [ x != "x$(libsqlite3.out.implib)" ] && [ -f "$(libsqlite3.out.implib)" ]; then \ + $(INSTALL) $(libsqlite3.out.implib) "$(install-dir.lib)"; \ fi -install-so-0 install-so-: -install-so: install-so-$(ENABLE_SHARED) -install: install-so +install-dll-unix-generic: install-dll-out-implib + $(INSTALL) $(libsqlite3.DLL) "$(install-dir.lib)" + @echo "Setting up $(libsqlite3.DLL) version symlinks..."; \ + cd "$(install-dir.lib)" || exit $$?; \ + rm -f $(libsqlite3.DLL).0 $(libsqlite3.DLL).$(PACKAGE_VERSION) || exit $$?; \ + mv $(libsqlite3.DLL) $(libsqlite3.DLL).$(PACKAGE_VERSION) || exit $$?; \ + ln -s $(libsqlite3.DLL).$(PACKAGE_VERSION) $(libsqlite3.DLL) || exit $$?; \ + ln -s $(libsqlite3.DLL).$(PACKAGE_VERSION) $(libsqlite3.DLL).0 || exit $$?; \ + ls -la $(libsqlite3.DLL) $(libsqlite3.DLL).[a03]*; \ + if [ -e $(libsqlite3.DLL).0.8.6 ]; then \ + echo "ACHTUNG: legacy libtool-compatible install found. Re-linking it..."; \ + rm -f libsqlite3.la $(libsqlite3.DLL).0.8.6 || exit $$?; \ + ln -s $(libsqlite3.DLL).$(PACKAGE_VERSION) $(libsqlite3.DLL).0.8.6 || exit $$?; \ + ls -la $(libsqlite3.DLL).0.8.6; \ + elif [ x1 = "x$(INSTALL_SO_086_LINK)" ]; then \ + echo "ACHTUNG: installing legacy libtool-style links because INSTALL_SO_086_LINK=1"; \ + rm -f libsqlite3.la $(libsqlite3.DLL).0.8.6 || exit $$?; \ + ln -s $(libsqlite3.DLL).$(PACKAGE_VERSION) $(libsqlite3.DLL).0.8.6 || exit $$?; \ + ls -la $(libsqlite3.DLL).0.8.6; \ + fi + +install-dll-msys: install-dll-out-implib + $(INSTALL) $(libsqlite3.DLL) "$(install-dir.bin)" +# ----------------------------------------------^^^ yes, bin +install-dll-mingw: install-dll-msys +install-dll-cygwin: install-dll-msys + +install-dll-darwin: $(install-dir.lib) $(libsqlite3.DLL) + $(INSTALL) $(libsqlite3.DLL) "$(install-dir.lib)" + @echo "Setting up $(libsqlite3.DLL) version symlinks..."; \ + cd "$(install-dir.lib)" || exit $$?; \ + rm -f libsqlite3.0$(T.dll) libsqlite3.$(PACKAGE_VERSION)$(T.dll) || exit $$?; \ + dllname=libsqlite3.$(PACKAGE_VERSION)$(T.dll); \ + mv $(libsqlite3.DLL) $$dllname || exit $$?; \ + ln -s $$dllname $(libsqlite3.DLL) || exit $$?; \ + ln -s $$dllname libsqlite3.0$(T.dll) || exit $$?; \ + ls -la $$dllname $(libsqlite3.DLL) libsqlite3.0$(T.dll) + +install-dll-1: install-dll-$(libsqlite3.DLL.install-rules) +install-dll-0 install-dll-: +install-dll: install-dll-$(ENABLE_SHARED) +install: install-dll # # Install $(libsqlite3.LIB) diff --git a/manifest b/manifest index b3770f3396..f87e25144e 100644 --- a/manifest +++ b/manifest @@ -1,9 +1,9 @@ -C Extend\s--out-implib\sto\soptionally\sspecify\sthe\simport\slib's\sname.\sAdd\sas-yet-unused\sinternals\sfor\sspecifying\sthe\sDLL's\sbase\sname\s(which\sdiffers\sacross\sthe\sWindows-side\sUnix-esque\senvironments). -D 2025-02-21T20:28:44.646 +C Add\s--dll-basename\sflag\sto\sgive\sclients\scontrol\sover\sthe\sDLL's\sbase\sname.\sSplit\sthe\sDLL\sinstallation\smakefile\srules\sinto\sdigestible,\splatform-specific\schunks.\sOn\sWindows-side\sUnix-like\senvironments,\sinstall\sthe\sDLL\sinto\sthe\sbin\sdir.\sRequires\stesting\sand\sfeedback\sfrom\sthose\splatforms'\spackage\smaintainers\sto\sconfirm\sit\sfollows\sthe\sexpectated\sconventions. +D 2025-02-21T21:58:32.801 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d -F Makefile.in 2d87dc1a64add400f047d0357f8f30e73b890aa5076b7f8f7d02cd1f3557beb1 +F Makefile.in 367abe20304ed8b467477be68ab9110daeef8d63186789706e66d4b7c73bc561 F Makefile.linux-generic bd3e3cacd369821a6241d4ea1967395c962dfe3057e38cb0a435cee0e8b789d0 F Makefile.msc 50c656e096ae49ccf9e5e88b4995f0a155f231ebae5b6d185cc64ce99d728a83 F README.md c3c0f19532ce28f6297a71870f3c7b424729f0e6d9ab889616d3587dd2332159 @@ -16,7 +16,7 @@ F art/sqlite370.jpg d512473dae7e378a67e28ff96a34da7cb331def2 F art/sqlite370.svg 40b7e2fe8aac3add5d56dd86ab8d427a4eca5bcb3fe4f8946cb3794e1821d531 F auto.def eddf6aef976e2c1a56c0accc3244945e0b22ec6799074c40be160e5a9a5662b0 F autoconf/Makefile.fallback 22fe523eb36dfce31e0f6349f782eb084e86a5620b2b0b4f84a2d6133f53f5ac -F autoconf/Makefile.in d376f623fa747798e40f7fcb23f9392e4f87610daa8425673ab83a8f33578b65 +F autoconf/Makefile.in 950a7afa36f4b91caf468ab55981f67d6ff9fea014156474af6bf9b9f4218926 F autoconf/Makefile.msc 1249e425a24859c7b3f17575275247df9eec3bddc0d1d7e73941f1abdbb95a92 F autoconf/README.first f1d3876e9a7852c22f275a6f06814e64934cecbc0b5b9617d64849094c1fd136 F autoconf/README.txt 7f01dc3915e2d68f329011073662369e62a0938a2c69398807823c57591cb288 @@ -49,8 +49,8 @@ F autosetup/cc-shared.tcl 4f024e94a47f427ba61de1739f6381ef0080210f9fae89112d5c1d F autosetup/cc.tcl c0fcc50ca91deff8741e449ddad05bcd08268bc31177e613a6343bbd1fd3e45f F autosetup/jimsh0.c 6573f6bc6ff204de0139692648d7037ca0b6c067bac83a7b4e087f20a86866a4 F autosetup/pkg-config.tcl 4e635bf39022ff65e0d5434339dd41503ea48fc53822c9c5bde88b02d3d952ba -F autosetup/proj.tcl cd6134e98d06ab4ae3be746d185dcdbf5180bfa049fe46a6726e703f56ea2f9c -F autosetup/sqlite-config.tcl c6c9ad74147e5f0ae39f0e5e207c4a8140066982c7eb21c68dd4b6483f85968e +F autosetup/proj.tcl 3124addb1a46c7d9c8c38a3016cd23797185c3fd977570728397aaa9eadd0039 +F autosetup/sqlite-config.tcl 4e546e42a7fb279b41edd3399bd61e3d40586b2c4802cbe43891c780298dda5b F autosetup/system.tcl 51d4be76cd9a9074704b584e5c9cbba616202c8468cf9ba8a4f8294a7ab1dba9 F configure 9a00b21dfd13757bbfb8d89b30660a89ec1f8f3a79402b8f9f9b6fc475c3303a x F contrib/sqlitecon.tcl 210a913ad63f9f991070821e599d600bd913e0ad @@ -705,7 +705,7 @@ F ext/wasm/tests/opfs/sahpool/sahpool-pausing.js f264925cfc82155de38cecb3d204c36 F ext/wasm/tests/opfs/sahpool/sahpool-worker.js bd25a43fc2ab2d1bafd8f2854ad3943ef673f7c3be03e95ecf1612ff6e8e2a61 F ext/wasm/wasmfs.make 68999f5bd8c489239592d59a420f8c627c99169bbd6fa16a404751f757b9f702 F magic.txt 5ade0bc977aa135e79e3faaea894d5671b26107cc91e70783aa7dc83f22f3ba0 -F main.mk 53df76bae4f2538a086fa39b6eb9a4238b9551895b2bde3b14187fa246ca0336 +F main.mk 9c4b47a2dd1f75c71570b17758e0dc07ecf1a00011c62650a9fa102776619738 F mptest/config01.test 3c6adcbc50b991866855f1977ff172eb6d901271 F mptest/config02.test 4415dfe36c48785f751e16e32c20b077c28ae504 F mptest/crash01.test 61e61469e257df0850df4293d7d4d6c2af301421 @@ -2210,11 +2210,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P ebf41fc90aa9fb1bb96239145c0cdd06eced391499975c71734610996d088641 -R b539368d0fe58a110d27ce4df6690ee7 -T *branch * configure-dll-support -T *sym-configure-dll-support * -T -sym-trunk * Cancelled\sby\sbranch. +P 12a55d343f9663acb68cd0f75fbb6c9ab67f4f88ad296e3e266f12d91522dd19 +R 04a1ae38e3a281f33d8df2618ff417dc U stephan -Z d83368e818c74940a16d5a2f7cf79842 +Z 14104c089c02833f5f00be9f4a410169 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 7217eed5fe..baeb4ebc4c 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -12a55d343f9663acb68cd0f75fbb6c9ab67f4f88ad296e3e266f12d91522dd19 +8d5fed807b7151dcb79b97cfc2da0e8ac3586a0bf8b4c28967ad4cffafa53c08 From c580663329dfde127459de60e8c727d4ff4f455c Mon Sep 17 00:00:00 2001 From: stephan Date: Fri, 21 Feb 2025 22:35:10 +0000 Subject: [PATCH 139/194] Ensure that the prefix/bin dir exists on msys/cygwin installations before installing the DLL there. FossilOrigin-Name: 5ecbe7ddc48f688b1a511a86f81e7fb8ad3a559c2d513738c839f4d37c63db1c --- autoconf/Makefile.in | 2 +- manifest | 12 ++++++------ manifest.uuid | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/autoconf/Makefile.in b/autoconf/Makefile.in index d520779915..a7cc840dc6 100644 --- a/autoconf/Makefile.in +++ b/autoconf/Makefile.in @@ -194,7 +194,7 @@ install-dll-unix-generic: install-dll-out-implib ls -la $(libsqlite3.DLL).0.8.6; \ fi -install-dll-msys: install-dll-out-implib +install-dll-msys: install-dll-out-implib "$(install-dir.bin)" $(INSTALL) $(libsqlite3.DLL) "$(install-dir.bin)" # ----------------------------------------------^^^ yes, bin install-dll-mingw: install-dll-msys diff --git a/manifest b/manifest index f87e25144e..039782390a 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Add\s--dll-basename\sflag\sto\sgive\sclients\scontrol\sover\sthe\sDLL's\sbase\sname.\sSplit\sthe\sDLL\sinstallation\smakefile\srules\sinto\sdigestible,\splatform-specific\schunks.\sOn\sWindows-side\sUnix-like\senvironments,\sinstall\sthe\sDLL\sinto\sthe\sbin\sdir.\sRequires\stesting\sand\sfeedback\sfrom\sthose\splatforms'\spackage\smaintainers\sto\sconfirm\sit\sfollows\sthe\sexpectated\sconventions. -D 2025-02-21T21:58:32.801 +C Ensure\sthat\sthe\sprefix/bin\sdir\sexists\son\smsys/cygwin\sinstallations\sbefore\sinstalling\sthe\sDLL\sthere. +D 2025-02-21T22:35:10.100 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d @@ -16,7 +16,7 @@ F art/sqlite370.jpg d512473dae7e378a67e28ff96a34da7cb331def2 F art/sqlite370.svg 40b7e2fe8aac3add5d56dd86ab8d427a4eca5bcb3fe4f8946cb3794e1821d531 F auto.def eddf6aef976e2c1a56c0accc3244945e0b22ec6799074c40be160e5a9a5662b0 F autoconf/Makefile.fallback 22fe523eb36dfce31e0f6349f782eb084e86a5620b2b0b4f84a2d6133f53f5ac -F autoconf/Makefile.in 950a7afa36f4b91caf468ab55981f67d6ff9fea014156474af6bf9b9f4218926 +F autoconf/Makefile.in e734c1de8803b9bf3d06610c392c16bdaf8db0d6ee913aa5562c8ad866fcd7aa F autoconf/Makefile.msc 1249e425a24859c7b3f17575275247df9eec3bddc0d1d7e73941f1abdbb95a92 F autoconf/README.first f1d3876e9a7852c22f275a6f06814e64934cecbc0b5b9617d64849094c1fd136 F autoconf/README.txt 7f01dc3915e2d68f329011073662369e62a0938a2c69398807823c57591cb288 @@ -2210,8 +2210,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P 12a55d343f9663acb68cd0f75fbb6c9ab67f4f88ad296e3e266f12d91522dd19 -R 04a1ae38e3a281f33d8df2618ff417dc +P 8d5fed807b7151dcb79b97cfc2da0e8ac3586a0bf8b4c28967ad4cffafa53c08 +R 8adda8c0250211beca8748d3a1322259 U stephan -Z 14104c089c02833f5f00be9f4a410169 +Z aedab870e52a96b29814c375cb30235a # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index baeb4ebc4c..4463056a9a 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -8d5fed807b7151dcb79b97cfc2da0e8ac3586a0bf8b4c28967ad4cffafa53c08 +5ecbe7ddc48f688b1a511a86f81e7fb8ad3a559c2d513738c839f4d37c63db1c From 2a9812ce49afa9b1af5949d9de9888cd9c189eb8 Mon Sep 17 00:00:00 2001 From: stephan Date: Fri, 21 Feb 2025 22:39:48 +0000 Subject: [PATCH 140/194] Fix another deps problem for msys installs. FossilOrigin-Name: b0b9e92599dd4fbe2aafacf41eef5fecfce3295b025dad799a292e78f5e370c2 --- autoconf/Makefile.in | 2 +- manifest | 12 ++++++------ manifest.uuid | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/autoconf/Makefile.in b/autoconf/Makefile.in index a7cc840dc6..ac9a7bd7eb 100644 --- a/autoconf/Makefile.in +++ b/autoconf/Makefile.in @@ -194,7 +194,7 @@ install-dll-unix-generic: install-dll-out-implib ls -la $(libsqlite3.DLL).0.8.6; \ fi -install-dll-msys: install-dll-out-implib "$(install-dir.bin)" +install-dll-msys: install-dll-out-implib $(install-dir.bin) $(INSTALL) $(libsqlite3.DLL) "$(install-dir.bin)" # ----------------------------------------------^^^ yes, bin install-dll-mingw: install-dll-msys diff --git a/manifest b/manifest index 039782390a..5352dc54f3 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Ensure\sthat\sthe\sprefix/bin\sdir\sexists\son\smsys/cygwin\sinstallations\sbefore\sinstalling\sthe\sDLL\sthere. -D 2025-02-21T22:35:10.100 +C Fix\sanother\sdeps\sproblem\sfor\smsys\sinstalls. +D 2025-02-21T22:39:48.403 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d @@ -16,7 +16,7 @@ F art/sqlite370.jpg d512473dae7e378a67e28ff96a34da7cb331def2 F art/sqlite370.svg 40b7e2fe8aac3add5d56dd86ab8d427a4eca5bcb3fe4f8946cb3794e1821d531 F auto.def eddf6aef976e2c1a56c0accc3244945e0b22ec6799074c40be160e5a9a5662b0 F autoconf/Makefile.fallback 22fe523eb36dfce31e0f6349f782eb084e86a5620b2b0b4f84a2d6133f53f5ac -F autoconf/Makefile.in e734c1de8803b9bf3d06610c392c16bdaf8db0d6ee913aa5562c8ad866fcd7aa +F autoconf/Makefile.in 1683f910febd935d1c4f82de1fabfff4b821102896ddd594fcb7a9a655ab5e7b F autoconf/Makefile.msc 1249e425a24859c7b3f17575275247df9eec3bddc0d1d7e73941f1abdbb95a92 F autoconf/README.first f1d3876e9a7852c22f275a6f06814e64934cecbc0b5b9617d64849094c1fd136 F autoconf/README.txt 7f01dc3915e2d68f329011073662369e62a0938a2c69398807823c57591cb288 @@ -2210,8 +2210,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P 8d5fed807b7151dcb79b97cfc2da0e8ac3586a0bf8b4c28967ad4cffafa53c08 -R 8adda8c0250211beca8748d3a1322259 +P 5ecbe7ddc48f688b1a511a86f81e7fb8ad3a559c2d513738c839f4d37c63db1c +R 9dc596cb5274a979a7368672e2959264 U stephan -Z aedab870e52a96b29814c375cb30235a +Z 8889604465e41281de16a5d57b51c6d2 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 4463056a9a..0697befd80 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -5ecbe7ddc48f688b1a511a86f81e7fb8ad3a559c2d513738c839f4d37c63db1c +b0b9e92599dd4fbe2aafacf41eef5fecfce3295b025dad799a292e78f5e370c2 From f8c2382d70d5029c8bdf471cf08559c8db7a9fe7 Mon Sep 17 00:00:00 2001 From: stephan Date: Fri, 21 Feb 2025 22:46:18 +0000 Subject: [PATCH 141/194] Only use the platform-specific --dll-basename if that option is explicitly provided, else use libsqlite3. FossilOrigin-Name: 69bacfdce5d99ba532feb30d19ccea9ef49ed3bbf33e44d41bb8740811f5b0cf --- autosetup/sqlite-config.tcl | 4 ++-- manifest | 12 ++++++------ manifest.uuid | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/autosetup/sqlite-config.tcl b/autosetup/sqlite-config.tcl index d37148819c..3f28d47f99 100644 --- a/autosetup/sqlite-config.tcl +++ b/autosetup/sqlite-config.tcl @@ -1268,10 +1268,10 @@ proc sqlite-handle-mac-cversion {} { # SQLITE_DLL_BASENAME to the build's preferred base name (minus # extension). proc sqlite-handle-dll-basename {} { - if {[proj-opt-exists dll-basename]} { + if {[proj-opt-was-provided dll-basename]} { set dn [join [opt-val dll-basename] ""] } else { - set dn auto + set dn libsqlite3 } if {$dn in {auto ""}} { switch -glob -- [get-define host] { diff --git a/manifest b/manifest index 5352dc54f3..6e81851053 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Fix\sanother\sdeps\sproblem\sfor\smsys\sinstalls. -D 2025-02-21T22:39:48.403 +C Only\suse\sthe\splatform-specific\s--dll-basename\sif\sthat\soption\sis\sexplicitly\sprovided,\selse\suse\slibsqlite3. +D 2025-02-21T22:46:18.529 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d @@ -50,7 +50,7 @@ F autosetup/cc.tcl c0fcc50ca91deff8741e449ddad05bcd08268bc31177e613a6343bbd1fd3e F autosetup/jimsh0.c 6573f6bc6ff204de0139692648d7037ca0b6c067bac83a7b4e087f20a86866a4 F autosetup/pkg-config.tcl 4e635bf39022ff65e0d5434339dd41503ea48fc53822c9c5bde88b02d3d952ba F autosetup/proj.tcl 3124addb1a46c7d9c8c38a3016cd23797185c3fd977570728397aaa9eadd0039 -F autosetup/sqlite-config.tcl 4e546e42a7fb279b41edd3399bd61e3d40586b2c4802cbe43891c780298dda5b +F autosetup/sqlite-config.tcl a7428c7fd318b9732146327c65ecd522f7683887cca18652d43a4de83cddfeed F autosetup/system.tcl 51d4be76cd9a9074704b584e5c9cbba616202c8468cf9ba8a4f8294a7ab1dba9 F configure 9a00b21dfd13757bbfb8d89b30660a89ec1f8f3a79402b8f9f9b6fc475c3303a x F contrib/sqlitecon.tcl 210a913ad63f9f991070821e599d600bd913e0ad @@ -2210,8 +2210,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P 5ecbe7ddc48f688b1a511a86f81e7fb8ad3a559c2d513738c839f4d37c63db1c -R 9dc596cb5274a979a7368672e2959264 +P b0b9e92599dd4fbe2aafacf41eef5fecfce3295b025dad799a292e78f5e370c2 +R 40d16a9b1cd7cd36c61a7c55c16e1901 U stephan -Z 8889604465e41281de16a5d57b51c6d2 +Z ee2b69cb3613f49bba235dd4d97246af # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 0697befd80..6a91b59c48 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -b0b9e92599dd4fbe2aafacf41eef5fecfce3295b025dad799a292e78f5e370c2 +69bacfdce5d99ba532feb30d19ccea9ef49ed3bbf33e44d41bb8740811f5b0cf From a8d6fcf40d72ae0157bfce8b8d0f3099f7f8a744 Mon Sep 17 00:00:00 2001 From: stephan Date: Fri, 21 Feb 2025 23:27:03 +0000 Subject: [PATCH 142/194] Configure docs/help text tweaks. No functional changes. FossilOrigin-Name: 701cc1aff423b87996134801abbbcd06d529bbf522c725837844b6aea406fb1c --- autosetup/sqlite-config.tcl | 14 +++++++++----- manifest | 12 ++++++------ manifest.uuid | 2 +- 3 files changed, 16 insertions(+), 12 deletions(-) diff --git a/autosetup/sqlite-config.tcl b/autosetup/sqlite-config.tcl index 3f28d47f99..ab9bf83902 100644 --- a/autosetup/sqlite-config.tcl +++ b/autosetup/sqlite-config.tcl @@ -267,9 +267,9 @@ proc sqlite-config-bootstrap {buildMode} { # out-implib: https://sqlite.org/forum/forumpost/0c7fc097b2 out-implib:=auto => {Enable use of --out-implib linker flag to generate an - "import library" for the DLL. The output's base name name is - specified by the value, with "auto" meaning to figure out a - name automatically.} + "import library" for the DLL. The output's base name name is + specified by the value, with "auto" meaning to figure out a + name automatically.} } } @@ -1265,8 +1265,10 @@ proc sqlite-handle-mac-cversion {} { ######################################################################## # Handles the --dll-basename configure flag. [define]'s -# SQLITE_DLL_BASENAME to the build's preferred base name (minus -# extension). +# SQLITE_DLL_BASENAME to the DLL's preferred base name (minus +# extension). If --dll-basename is not provided then this is always +# "libsqlite3", otherwise it may use a different value based on the +# value of [get-define host]. proc sqlite-handle-dll-basename {} { if {[proj-opt-was-provided dll-basename]} { set dn [join [opt-val dll-basename] ""] @@ -1341,6 +1343,8 @@ proc sqlite-handle-out-implib {} { # for that set, as well as providing a rule named install-dll which # resolves to install-dll-NAME (perhaps indirectly, depending on # whether the DLL is (de)activated). +# +# The default value is "unix-generic". proc sqlite-determine-dll-install-rules {} { set n unix-generic switch -glob -- [get-define host] { diff --git a/manifest b/manifest index 6e81851053..3ee9115f4a 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Only\suse\sthe\splatform-specific\s--dll-basename\sif\sthat\soption\sis\sexplicitly\sprovided,\selse\suse\slibsqlite3. -D 2025-02-21T22:46:18.529 +C Configure\sdocs/help\stext\stweaks.\sNo\sfunctional\schanges. +D 2025-02-21T23:27:03.552 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d @@ -50,7 +50,7 @@ F autosetup/cc.tcl c0fcc50ca91deff8741e449ddad05bcd08268bc31177e613a6343bbd1fd3e F autosetup/jimsh0.c 6573f6bc6ff204de0139692648d7037ca0b6c067bac83a7b4e087f20a86866a4 F autosetup/pkg-config.tcl 4e635bf39022ff65e0d5434339dd41503ea48fc53822c9c5bde88b02d3d952ba F autosetup/proj.tcl 3124addb1a46c7d9c8c38a3016cd23797185c3fd977570728397aaa9eadd0039 -F autosetup/sqlite-config.tcl a7428c7fd318b9732146327c65ecd522f7683887cca18652d43a4de83cddfeed +F autosetup/sqlite-config.tcl 39c5431be1a2166d830ce73c5d779ea8434fd8216ffca80d979c3e58068a9b5d F autosetup/system.tcl 51d4be76cd9a9074704b584e5c9cbba616202c8468cf9ba8a4f8294a7ab1dba9 F configure 9a00b21dfd13757bbfb8d89b30660a89ec1f8f3a79402b8f9f9b6fc475c3303a x F contrib/sqlitecon.tcl 210a913ad63f9f991070821e599d600bd913e0ad @@ -2210,8 +2210,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P b0b9e92599dd4fbe2aafacf41eef5fecfce3295b025dad799a292e78f5e370c2 -R 40d16a9b1cd7cd36c61a7c55c16e1901 +P 69bacfdce5d99ba532feb30d19ccea9ef49ed3bbf33e44d41bb8740811f5b0cf +R d128dc6b4d3d39ba8d20e9bdf5c6528e U stephan -Z ee2b69cb3613f49bba235dd4d97246af +Z 6e0a21859e8ea82bbc0093d5a328d7fd # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 6a91b59c48..60ceb84b87 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -69bacfdce5d99ba532feb30d19ccea9ef49ed3bbf33e44d41bb8740811f5b0cf +701cc1aff423b87996134801abbbcd06d529bbf522c725837844b6aea406fb1c From 449c552b7c7d57b67a64a705ceddbe2e1b133de7 Mon Sep 17 00:00:00 2001 From: stephan Date: Fri, 21 Feb 2025 23:43:10 +0000 Subject: [PATCH 143/194] Rename configure-defined ENABLE_SHARED/STATIC makefile vars to ENABLE_LIB_... so that they're consistent between the canonical and autoconf builds (baby steps towards further configure code consolidation). FossilOrigin-Name: a7647fd07792ef32697c7ba8ab6348593c2a5c4cedf673b155206da6aae799f8 --- Makefile.in | 4 ++-- auto.def | 4 ++-- main.mk | 16 ++++++++-------- manifest | 16 ++++++++-------- manifest.uuid | 2 +- 5 files changed, 21 insertions(+), 21 deletions(-) diff --git a/Makefile.in b/Makefile.in index 3178028d81..6957c0d447 100644 --- a/Makefile.in +++ b/Makefile.in @@ -129,8 +129,8 @@ LDFLAGS.libsqlite3.os-specific = @LDFLAGS_MAC_CVERSION@ @LDFLAGS_OUT_IMPLIB@ libsqlite3.DLL.basename = @SQLITE_DLL_BASENAME@ libsqlite3.out.implib = @SQLITE_OUT_IMPLIB@ # dll.basename: see https://sqlite.org/forum/forumpost/828fdfe904 -ENABLE_SHARED = @ENABLE_SHARED@ -ENABLE_STATIC = @ENABLE_STATIC@ +ENABLE_LIB_SHARED = @ENABLE_LIB_SHARED@ +ENABLE_LIB_STATIC = @ENABLE_LIB_STATIC@ HAVE_WASI_SDK = @HAVE_WASI_SDK@ libsqlite3.DLL.install-rules = @SQLITE_DLL_INSTALL_RULES@ diff --git a/auto.def b/auto.def index 9df87f579a..0b89ab1890 100644 --- a/auto.def +++ b/auto.def @@ -40,9 +40,9 @@ if {[opt-bool largefile]} { cc-check-lfs } -proj-define-for-opt shared ENABLE_SHARED "Build shared library?" +proj-define-for-opt shared ENABLE_LIB_SHARED "Build shared library?" -if {![proj-define-for-opt static ENABLE_STATIC \ +if {![proj-define-for-opt static ENABLE_LIB_STATIC \ "Build static library?"]} { proj-warn "Static lib build may be implicitly re-activated by other components, e.g. some test apps." } diff --git a/main.mk b/main.mk index fd81dd84f4..007061e0ad 100644 --- a/main.mk +++ b/main.mk @@ -189,19 +189,19 @@ CFLAGS.readline ?= -I$(prefix)/include # INSTALL ?= install # -# $(ENABLE_SHARED) = +# $(ENABLE_LIB_SHARED) = # # 1 if libsqlite3$(T.dll) should be built. # -ENABLE_SHARED ?= 1 +ENABLE_LIB_SHARED ?= 1 # -# $(ENABLE_STATIC) = +# $(ENABLE_LIB_STATIC) = # # 1 if libsqlite3$(T.lib) should be built. Some components, # e.g. libtclsqlite3 and some test apps, implicitly require the static # library and will ignore this preference. # -ENABLE_STATIC ?= 1 +ENABLE_LIB_STATIC ?= 1 # # $(USE_AMALGAMATION) # @@ -1438,7 +1438,7 @@ $(libsqlite3.LIB): $(LIBOBJ) $(AR) $(AR.flags) $@ $(LIBOBJ) $(libsqlite3.LIB)-1: $(libsqlite3.LIB) $(libsqlite3.LIB)-0 $(libsqlite3.LIB)-: -lib: $(libsqlite3.LIB)-$(ENABLE_STATIC) +lib: $(libsqlite3.LIB)-$(ENABLE_LIB_STATIC) all: lib # @@ -1449,7 +1449,7 @@ $(libsqlite3.DLL): $(LIBOBJ) $(LDFLAGS.libsqlite3.os-specific) $(LDFLAGS.libsqlite3.soname) $(libsqlite3.DLL)-1: $(libsqlite3.DLL) $(libsqlite3.DLL)-0 $(libsqlite3.DLL)-: -so: $(libsqlite3.DLL)-$(ENABLE_SHARED) +so: $(libsqlite3.DLL)-$(ENABLE_LIB_SHARED) all: so # @@ -1545,7 +1545,7 @@ install-dll-darwin: $(install-dir.lib) $(libsqlite3.DLL) install-dll-1: install-dll-$(libsqlite3.DLL.install-rules) install-dll-0 install-dll-: -install-dll: install-dll-$(ENABLE_SHARED) +install-dll: install-dll-$(ENABLE_LIB_SHARED) install: install-dll # @@ -1554,7 +1554,7 @@ install: install-dll install-lib-1: $(install-dir.lib) $(libsqlite3.LIB) $(INSTALL.noexec) $(libsqlite3.LIB) "$(install-dir.lib)" install-lib-0 install-lib-: -install-lib: install-lib-$(ENABLE_STATIC) +install-lib: install-lib-$(ENABLE_LIB_STATIC) install: install-lib # diff --git a/manifest b/manifest index 3ee9115f4a..c1925de937 100644 --- a/manifest +++ b/manifest @@ -1,9 +1,9 @@ -C Configure\sdocs/help\stext\stweaks.\sNo\sfunctional\schanges. -D 2025-02-21T23:27:03.552 +C Rename\sconfigure-defined\sENABLE_SHARED/STATIC\smakefile\svars\sto\sENABLE_LIB_...\sso\sthat\sthey're\sconsistent\sbetween\sthe\scanonical\sand\sautoconf\sbuilds\s(baby\ssteps\stowards\sfurther\sconfigure\scode\sconsolidation). +D 2025-02-21T23:43:10.891 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d -F Makefile.in 367abe20304ed8b467477be68ab9110daeef8d63186789706e66d4b7c73bc561 +F Makefile.in b2b4b30fd8c1be9713861c501f8035b57845c54ac42c4276452d5eb94e9ea3eb F Makefile.linux-generic bd3e3cacd369821a6241d4ea1967395c962dfe3057e38cb0a435cee0e8b789d0 F Makefile.msc 50c656e096ae49ccf9e5e88b4995f0a155f231ebae5b6d185cc64ce99d728a83 F README.md c3c0f19532ce28f6297a71870f3c7b424729f0e6d9ab889616d3587dd2332159 @@ -14,7 +14,7 @@ F art/sqlite370.eps aa97a671332b432a54e1d74ff5e8775be34200c2 F art/sqlite370.ico af56c1d00fee7cd4753e8631ed60703ed0fc6e90 F art/sqlite370.jpg d512473dae7e378a67e28ff96a34da7cb331def2 F art/sqlite370.svg 40b7e2fe8aac3add5d56dd86ab8d427a4eca5bcb3fe4f8946cb3794e1821d531 -F auto.def eddf6aef976e2c1a56c0accc3244945e0b22ec6799074c40be160e5a9a5662b0 +F auto.def 3875d07903dde3aadf396ce008b7eee2fec3aa61843d745b4fb574ce3797b2ac F autoconf/Makefile.fallback 22fe523eb36dfce31e0f6349f782eb084e86a5620b2b0b4f84a2d6133f53f5ac F autoconf/Makefile.in 1683f910febd935d1c4f82de1fabfff4b821102896ddd594fcb7a9a655ab5e7b F autoconf/Makefile.msc 1249e425a24859c7b3f17575275247df9eec3bddc0d1d7e73941f1abdbb95a92 @@ -705,7 +705,7 @@ F ext/wasm/tests/opfs/sahpool/sahpool-pausing.js f264925cfc82155de38cecb3d204c36 F ext/wasm/tests/opfs/sahpool/sahpool-worker.js bd25a43fc2ab2d1bafd8f2854ad3943ef673f7c3be03e95ecf1612ff6e8e2a61 F ext/wasm/wasmfs.make 68999f5bd8c489239592d59a420f8c627c99169bbd6fa16a404751f757b9f702 F magic.txt 5ade0bc977aa135e79e3faaea894d5671b26107cc91e70783aa7dc83f22f3ba0 -F main.mk 9c4b47a2dd1f75c71570b17758e0dc07ecf1a00011c62650a9fa102776619738 +F main.mk adfc8d55db64c8dd3e89c74611c2f8be15b204b68338133763df8eb8d7faa344 F mptest/config01.test 3c6adcbc50b991866855f1977ff172eb6d901271 F mptest/config02.test 4415dfe36c48785f751e16e32c20b077c28ae504 F mptest/crash01.test 61e61469e257df0850df4293d7d4d6c2af301421 @@ -2210,8 +2210,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P 69bacfdce5d99ba532feb30d19ccea9ef49ed3bbf33e44d41bb8740811f5b0cf -R d128dc6b4d3d39ba8d20e9bdf5c6528e +P 701cc1aff423b87996134801abbbcd06d529bbf522c725837844b6aea406fb1c +R cfd59444de14c58c3b0cb91971c70398 U stephan -Z 6e0a21859e8ea82bbc0093d5a328d7fd +Z 2a8d0ab48d4f7aa807a9bebec4fae941 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 60ceb84b87..f5a4cf1f9c 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -701cc1aff423b87996134801abbbcd06d529bbf522c725837844b6aea406fb1c +a7647fd07792ef32697c7ba8ab6348593c2a5c4cedf673b155206da6aae799f8 From c3d72a5587ec1d0c4049b3e095d4c40d53d41134 Mon Sep 17 00:00:00 2001 From: stephan Date: Sat, 22 Feb 2025 00:01:30 +0000 Subject: [PATCH 144/194] Fix installation rules for import lib in the autoconf bundle, broken by recent refactoring in this branch. FossilOrigin-Name: 95b71fc7e9887833f03f84c37b94385012a6ae76b86cd079372f1752833e0f5d --- autoconf/Makefile.in | 6 ++---- manifest | 12 ++++++------ manifest.uuid | 2 +- 3 files changed, 9 insertions(+), 11 deletions(-) diff --git a/autoconf/Makefile.in b/autoconf/Makefile.in index ac9a7bd7eb..ea0c45a3a8 100644 --- a/autoconf/Makefile.in +++ b/autoconf/Makefile.in @@ -167,10 +167,8 @@ all: $(libsqlite3.LIB)-$(ENABLE_LIB_STATIC) # with the main copies rom /main.mk. # install-dll-out-implib: $(install-dir.lib) $(libsqlite3.DLL) - @if [ x != "x$(libsqlite3.out.implib)"; then \ - if [ -f "$(libsqlite3.out.implib)" ]; then \ - $(INSTALL) $(libsqlite3.out.implib) "$(install-dir.lib)"; \ - fi; \ + if [ x != "x$(libsqlite3.out.implib)" ] && [ -f "$(libsqlite3.out.implib)" ]; then \ + $(INSTALL) $(libsqlite3.out.implib) "$(install-dir.lib)"; \ fi install-dll-unix-generic: install-dll-out-implib diff --git a/manifest b/manifest index c1925de937..1add228687 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Rename\sconfigure-defined\sENABLE_SHARED/STATIC\smakefile\svars\sto\sENABLE_LIB_...\sso\sthat\sthey're\sconsistent\sbetween\sthe\scanonical\sand\sautoconf\sbuilds\s(baby\ssteps\stowards\sfurther\sconfigure\scode\sconsolidation). -D 2025-02-21T23:43:10.891 +C Fix\sinstallation\srules\sfor\simport\slib\sin\sthe\sautoconf\sbundle,\sbroken\sby\srecent\srefactoring\sin\sthis\sbranch. +D 2025-02-22T00:01:30.550 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d @@ -16,7 +16,7 @@ F art/sqlite370.jpg d512473dae7e378a67e28ff96a34da7cb331def2 F art/sqlite370.svg 40b7e2fe8aac3add5d56dd86ab8d427a4eca5bcb3fe4f8946cb3794e1821d531 F auto.def 3875d07903dde3aadf396ce008b7eee2fec3aa61843d745b4fb574ce3797b2ac F autoconf/Makefile.fallback 22fe523eb36dfce31e0f6349f782eb084e86a5620b2b0b4f84a2d6133f53f5ac -F autoconf/Makefile.in 1683f910febd935d1c4f82de1fabfff4b821102896ddd594fcb7a9a655ab5e7b +F autoconf/Makefile.in d4bc4b3e0680c9f9cd8633279e597abb5f29fa58f29950e49dbf359e1c553720 F autoconf/Makefile.msc 1249e425a24859c7b3f17575275247df9eec3bddc0d1d7e73941f1abdbb95a92 F autoconf/README.first f1d3876e9a7852c22f275a6f06814e64934cecbc0b5b9617d64849094c1fd136 F autoconf/README.txt 7f01dc3915e2d68f329011073662369e62a0938a2c69398807823c57591cb288 @@ -2210,8 +2210,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P 701cc1aff423b87996134801abbbcd06d529bbf522c725837844b6aea406fb1c -R cfd59444de14c58c3b0cb91971c70398 +P a7647fd07792ef32697c7ba8ab6348593c2a5c4cedf673b155206da6aae799f8 +R 2e03e2a46eda75fb7824ca457ccfbcf4 U stephan -Z 2a8d0ab48d4f7aa807a9bebec4fae941 +Z e919d723d6d10d5de9ca8edf111b0dd8 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index f5a4cf1f9c..8a03021ade 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -a7647fd07792ef32697c7ba8ab6348593c2a5c4cedf673b155206da6aae799f8 +95b71fc7e9887833f03f84c37b94385012a6ae76b86cd079372f1752833e0f5d From 447f1c231284a8aad15350b67f42a9a417fc5ade Mon Sep 17 00:00:00 2001 From: drh <> Date: Sat, 22 Feb 2025 11:40:29 +0000 Subject: [PATCH 145/194] Fix an incorrect assert added by [d7729dbbf231d57c]. FossilOrigin-Name: eeea11278bdebe336f0c30fbad79e30e3456ab67dae46abdd5f9951ea1b61bed --- manifest | 12 ++++++------ manifest.uuid | 2 +- src/alter.c | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/manifest b/manifest index eb3b50595e..18e40f74c5 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C The\snumber\sof\sdeclared\scolumns\sin\san\sindex\sis\slimited\sto\sSQLITE_LIMIT_COLUMN.\nBut\sthe\sactual\snumber\sof\scolumns\sin\sthe\simplementation\smight\sneed\sto\sbe\ntwice\sas\smuch\sto\saccount\sfor\sthe\sprimary\skey\sat\sthe\send.\s\sEnsure\sthat\sthe\ncode\sis\sable\sto\sdeal\swith\sthis.\s\sThis\sis\sa\scorrection\sto\ncheck-in\s[d7729dbbf231d57c]. -D 2025-02-21T20:35:37.743 +C Fix\san\sincorrect\sassert\sadded\sby\s[d7729dbbf231d57c]. +D 2025-02-22T11:40:29.226 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d @@ -715,7 +715,7 @@ F mptest/multiwrite01.test dab5c5f8f9534971efce679152c5146da265222d F sqlite.pc.in 42b7bf0d02e08b9e77734a47798d1a55a9e0716b F sqlite3.1 acdff36db796e2d00225b911d3047d580cd136547298435426ce9d40347973cc F sqlite3.pc.in 0977c03a4da7c4204bd60e784a0efb8d51a190448aba78a4e973fe7192bdaf03 -F src/alter.c 04cad1defb7262937e586b0529f3a524ac825aa283341e326546cf08de35b209 +F src/alter.c 918875586d26036ee06532dd80b83032a34330da00337877d52eda3fa5054d9f F src/analyze.c 6d27b425a16817975e6a4f8501e531d13dd1bf4b53bff2329dbc1f301aeef82d F src/attach.c c36d9d82811e2274bd06bf3b34459e36d8ae8a7f32efa5cbf3f890eef08a9987 F src/auth.c 54ab9c6c5803b47c0d45b76ce27eff22a03b4b1f767c5945a3a4eb13aa4c78dc @@ -2210,8 +2210,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P ebf41fc90aa9fb1bb96239145c0cdd06eced391499975c71734610996d088641 -R ea801290870a4070bffe00dffce34b68 +P 5822feec43be9352fd87bf9968c39c0218e01ab5fe3ba50431ae21cba79e6c89 +R 0951bff81e7aa0574e1251461ca59296 U drh -Z e1106d68193ec85ec463ffb759ee622e +Z cf8ddfba345e5495dfdc5bc22e0f71a8 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 83f71c4a07..9c95d8c898 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -5822feec43be9352fd87bf9968c39c0218e01ab5fe3ba50431ae21cba79e6c89 +eeea11278bdebe336f0c30fbad79e30e3456ab67dae46abdd5f9951ea1b61bed diff --git a/src/alter.c b/src/alter.c index 3c8a6c3a18..43b266790d 100644 --- a/src/alter.c +++ b/src/alter.c @@ -1217,7 +1217,7 @@ static int renameEditSql( nQuot = sqlite3Strlen30(zQuot)-1; } - assert( nQuot>=nNew && nSql>0 && nNew>0 ); + assert( nQuot>=nNew && nSql>=0 && nNew>=0 ); zOut = sqlite3DbMallocZero(db, (u64)(nSql + pRename->nList*nQuot + 1)); }else{ assert( nSql>0 ); From 8b0240ea72da29c121d84d4ca8b296120a37c505 Mon Sep 17 00:00:00 2001 From: stephan Date: Sat, 22 Feb 2025 14:53:00 +0000 Subject: [PATCH 146/194] tool/mksqlite3h.tcl: when invoking the mksourceid binary, add a .exe to it, if needed, to appease msys2. FossilOrigin-Name: 08c9e56f6082bb609a42f0e34c83542fe8b682757bc45616810d91491950fd0f --- manifest | 12 ++++++------ manifest.uuid | 2 +- tool/mksqlite3h.tcl | 8 +++++++- 3 files changed, 14 insertions(+), 8 deletions(-) diff --git a/manifest b/manifest index 1add228687..99629930b4 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Fix\sinstallation\srules\sfor\simport\slib\sin\sthe\sautoconf\sbundle,\sbroken\sby\srecent\srefactoring\sin\sthis\sbranch. -D 2025-02-22T00:01:30.550 +C tool/mksqlite3h.tcl:\swhen\sinvoking\sthe\smksourceid\sbinary,\sadd\sa\s.exe\sto\sit,\sif\sneeded,\sto\sappease\smsys2. +D 2025-02-22T14:53:00.893 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d @@ -2159,7 +2159,7 @@ F tool/mksourceid.c 36aa8020014aed0836fd13c51d6dc9219b0df1761d6b5f58ff5b616211b0 F tool/mkspeedsql.tcl a1a334d288f7adfe6e996f2e712becf076745c97 F tool/mksqlite3c-noext.tcl 351c55256213154cabb051a3c870ef9f4487de905015141ae50dc7578a901b84 F tool/mksqlite3c.tcl ba13086555b3cb835eba5e47a9250300ab85304d23fd1081abd3f29d8ab71a2b -F tool/mksqlite3h.tcl b05b85c32295bad3fe64807729693d1f19faed3c464c5faac6c53bb6b972ac2f +F tool/mksqlite3h.tcl 2275e7bf25a9ee31b10bef8305641b63a293955245a22967ca6ea77b336cac78 F tool/mksqlite3internalh.tcl eb994013e833359137eb53a55acdad0b5ae1049b F tool/mksrczip.tcl 81efd9974dbb36005383f2cd655520057a2ae5aa85ac2441a80c7c28f803ac52 F tool/mktoolzip.tcl 34b4e92be544f820e2cc26f143f7d5aec511e826ec394cc82969a5dcf7c7a27c @@ -2210,8 +2210,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P a7647fd07792ef32697c7ba8ab6348593c2a5c4cedf673b155206da6aae799f8 -R 2e03e2a46eda75fb7824ca457ccfbcf4 +P 95b71fc7e9887833f03f84c37b94385012a6ae76b86cd079372f1752833e0f5d +R 6ff9b839648f0f2fb665b46169234265 U stephan -Z e919d723d6d10d5de9ca8edf111b0dd8 +Z d4df9033ee40561e703d0422024e5649 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 8a03021ade..51b2a6afad 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -95b71fc7e9887833f03f84c37b94385012a6ae76b86cd079372f1752833e0f5d +08c9e56f6082bb609a42f0e34c83542fe8b682757bc45616810d91491950fd0f diff --git a/tool/mksqlite3h.tcl b/tool/mksqlite3h.tcl index b1d5ecdcd3..d64490f9b4 100644 --- a/tool/mksqlite3h.tcl +++ b/tool/mksqlite3h.tcl @@ -82,7 +82,13 @@ set nVersion [eval format "%d%03d%03d" [split $zVersion .]] set PWD [pwd] cd $TOP set tmpfile $PWD/tmp-[clock millisec]-[expr {int(rand()*100000000000)}].txt -exec $PWD/mksourceid manifest > $tmpfile +set mksourceid $PWD/mksourceid +if {![file exists $mksourceid] && [file exists ${mksourceid}.exe]} { + # Workaround for Windows-based Unix-like environments + # https://sqlite.org/forum/forumpost/41ba710dd9943453 + set mksourceid mksourceid.exe +} +exec $mksourceid manifest > $tmpfile set fd [open $tmpfile rb] set zSourceId [string trim [read $fd]] close $fd From df5d5faebe6a239b919b7e532509c7b89104c8c8 Mon Sep 17 00:00:00 2001 From: stephan Date: Sat, 22 Feb 2025 14:53:31 +0000 Subject: [PATCH 147/194] Random non-functional configure script cleanups. FossilOrigin-Name: 2ee73109809e7d4a9d203cfa42f29c62837c06dc414f9dbf17ce00d9bbb5a883 --- autosetup/proj.tcl | 1 - autosetup/sqlite-config.tcl | 17 +++++++---------- manifest | 14 +++++++------- manifest.uuid | 2 +- 4 files changed, 15 insertions(+), 19 deletions(-) diff --git a/autosetup/proj.tcl b/autosetup/proj.tcl index f228dce217..52b410fd6a 100644 --- a/autosetup/proj.tcl +++ b/autosetup/proj.tcl @@ -379,7 +379,6 @@ proc proj-opt-was-provided {key} { # # Returns $val. proc proj-opt-set {flag {val 1}} { - global autosetup if {$flag ni $::autosetup(options)} { # We have to add this to autosetup(options) or else future calls # to [opt-bool $flag] will fail validation of $flag. diff --git a/autosetup/sqlite-config.tcl b/autosetup/sqlite-config.tcl index ab9bf83902..cd38d0c179 100644 --- a/autosetup/sqlite-config.tcl +++ b/autosetup/sqlite-config.tcl @@ -1337,12 +1337,13 @@ proc sqlite-handle-out-implib {} { } ######################################################################## -# [define] SQLITE_DLL_INSTALL_RULES to a symbolic name of a set of -# "make install" rules to use. The makefile is tasked with with -# providing rules named install-dll-NAME which runs the installation -# for that set, as well as providing a rule named install-dll which -# resolves to install-dll-NAME (perhaps indirectly, depending on -# whether the DLL is (de)activated). +# [define]s SQLITE_DLL_INSTALL_RULES to a symbolic name of a set of +# "make install" rules to use for installation of the DLL +# deliverable. The makefile is tasked with with providing rules named +# install-dll-NAME which runs the installation for that set, as well +# as providing a rule named install-dll which resolves to +# install-dll-NAME (perhaps indirectly, depending on whether the DLL +# is (de)activated). # # The default value is "unix-generic". proc sqlite-determine-dll-install-rules {} { @@ -1826,10 +1827,6 @@ proc sqlite-handle-tcl {} { msg-result "TCL for code generation: [sqlite-determine-codegen-tcl]" } -# TODO? Figure out whether the DLL needs to go under /lib or /bin -# (msys, cygwin, etc). -# proc sqlite-handle-dll-install-dir {} {} - ######################################################################## # If the --dump-defines configure flag is provided then emit a list of # all [define] values to config.defines.txt, else do nothing. diff --git a/manifest b/manifest index 99629930b4..21486b878b 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C tool/mksqlite3h.tcl:\swhen\sinvoking\sthe\smksourceid\sbinary,\sadd\sa\s.exe\sto\sit,\sif\sneeded,\sto\sappease\smsys2. -D 2025-02-22T14:53:00.893 +C Random\snon-functional\sconfigure\sscript\scleanups. +D 2025-02-22T14:53:31.061 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d @@ -49,8 +49,8 @@ F autosetup/cc-shared.tcl 4f024e94a47f427ba61de1739f6381ef0080210f9fae89112d5c1d F autosetup/cc.tcl c0fcc50ca91deff8741e449ddad05bcd08268bc31177e613a6343bbd1fd3e45f F autosetup/jimsh0.c 6573f6bc6ff204de0139692648d7037ca0b6c067bac83a7b4e087f20a86866a4 F autosetup/pkg-config.tcl 4e635bf39022ff65e0d5434339dd41503ea48fc53822c9c5bde88b02d3d952ba -F autosetup/proj.tcl 3124addb1a46c7d9c8c38a3016cd23797185c3fd977570728397aaa9eadd0039 -F autosetup/sqlite-config.tcl 39c5431be1a2166d830ce73c5d779ea8434fd8216ffca80d979c3e58068a9b5d +F autosetup/proj.tcl 04fd2d110b6464f7a2847380a39bed647c2646a868a4ed60f7a625e52a9a8b20 +F autosetup/sqlite-config.tcl 2422f6fd2cd2120e8812c0e6e4f6d2cb888cc6312a49f265834d0913c09fa6b9 F autosetup/system.tcl 51d4be76cd9a9074704b584e5c9cbba616202c8468cf9ba8a4f8294a7ab1dba9 F configure 9a00b21dfd13757bbfb8d89b30660a89ec1f8f3a79402b8f9f9b6fc475c3303a x F contrib/sqlitecon.tcl 210a913ad63f9f991070821e599d600bd913e0ad @@ -2210,8 +2210,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P 95b71fc7e9887833f03f84c37b94385012a6ae76b86cd079372f1752833e0f5d -R 6ff9b839648f0f2fb665b46169234265 +P 08c9e56f6082bb609a42f0e34c83542fe8b682757bc45616810d91491950fd0f +R 3208ed004b6e716ce6b17ce27009887c U stephan -Z d4df9033ee40561e703d0422024e5649 +Z 3a85d85ac087bda321c6e7dc9381c222 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 51b2a6afad..11333122b3 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -08c9e56f6082bb609a42f0e34c83542fe8b682757bc45616810d91491950fd0f +2ee73109809e7d4a9d203cfa42f29c62837c06dc414f9dbf17ce00d9bbb5a883 From 1ad8df3c6b0f1a548afb83cd7b6ecfbc29fbd6af Mon Sep 17 00:00:00 2001 From: stephan Date: Sat, 22 Feb 2025 14:58:20 +0000 Subject: [PATCH 148/194] Ensure that [08c9e56f60] uses an absolute path when appending .exe to mksourceid. FossilOrigin-Name: 906d27f7a645833595f02ddf05892703783d89116b1009f04e0b71679ff34a8b --- manifest | 12 ++++++------ manifest.uuid | 2 +- tool/mksqlite3h.tcl | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/manifest b/manifest index 21486b878b..d88823fd31 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Random\snon-functional\sconfigure\sscript\scleanups. -D 2025-02-22T14:53:31.061 +C Ensure\sthat\s[08c9e56f60]\suses\san\sabsolute\spath\swhen\sappending\s.exe\sto\smksourceid. +D 2025-02-22T14:58:20.584 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d @@ -2159,7 +2159,7 @@ F tool/mksourceid.c 36aa8020014aed0836fd13c51d6dc9219b0df1761d6b5f58ff5b616211b0 F tool/mkspeedsql.tcl a1a334d288f7adfe6e996f2e712becf076745c97 F tool/mksqlite3c-noext.tcl 351c55256213154cabb051a3c870ef9f4487de905015141ae50dc7578a901b84 F tool/mksqlite3c.tcl ba13086555b3cb835eba5e47a9250300ab85304d23fd1081abd3f29d8ab71a2b -F tool/mksqlite3h.tcl 2275e7bf25a9ee31b10bef8305641b63a293955245a22967ca6ea77b336cac78 +F tool/mksqlite3h.tcl 989948c6a26e188e673d7c2f2f093ea3acd816ad6ac65bab596280075c8f3a45 F tool/mksqlite3internalh.tcl eb994013e833359137eb53a55acdad0b5ae1049b F tool/mksrczip.tcl 81efd9974dbb36005383f2cd655520057a2ae5aa85ac2441a80c7c28f803ac52 F tool/mktoolzip.tcl 34b4e92be544f820e2cc26f143f7d5aec511e826ec394cc82969a5dcf7c7a27c @@ -2210,8 +2210,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P 08c9e56f6082bb609a42f0e34c83542fe8b682757bc45616810d91491950fd0f -R 3208ed004b6e716ce6b17ce27009887c +P 2ee73109809e7d4a9d203cfa42f29c62837c06dc414f9dbf17ce00d9bbb5a883 +R 9554fb958ccc8ca614713f13fcd64b48 U stephan -Z 3a85d85ac087bda321c6e7dc9381c222 +Z 090a992d630fbdcddf86913e7feb0d82 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 11333122b3..a35d7ed921 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -2ee73109809e7d4a9d203cfa42f29c62837c06dc414f9dbf17ce00d9bbb5a883 +906d27f7a645833595f02ddf05892703783d89116b1009f04e0b71679ff34a8b diff --git a/tool/mksqlite3h.tcl b/tool/mksqlite3h.tcl index d64490f9b4..6bbfa8c8bc 100644 --- a/tool/mksqlite3h.tcl +++ b/tool/mksqlite3h.tcl @@ -86,7 +86,7 @@ set mksourceid $PWD/mksourceid if {![file exists $mksourceid] && [file exists ${mksourceid}.exe]} { # Workaround for Windows-based Unix-like environments # https://sqlite.org/forum/forumpost/41ba710dd9943453 - set mksourceid mksourceid.exe + set mksourceid ${mksourceid}.exe } exec $mksourceid manifest > $tmpfile set fd [open $tmpfile rb] From 524b8a6df23004e7f4c3bf00f4e505af6f72805c Mon Sep 17 00:00:00 2001 From: stephan Date: Sat, 22 Feb 2025 16:31:16 +0000 Subject: [PATCH 149/194] On unix-on-windows platforms, if either of --out-implib or --dll-basename are not provided, auto-enable them. Add the 'none' special value to those flags to specifically disable the environment-specific handling of those flags. FossilOrigin-Name: 486400801a4540392c04d805a47df5249c4010b1a5fbac91900db6149374c274 --- Makefile.in | 2 +- autosetup/sqlite-config.tcl | 118 ++++++++++++++++++++++++++++-------- manifest | 14 ++--- manifest.uuid | 2 +- 4 files changed, 102 insertions(+), 34 deletions(-) diff --git a/Makefile.in b/Makefile.in index 6957c0d447..b836bf5d3d 100644 --- a/Makefile.in +++ b/Makefile.in @@ -127,8 +127,8 @@ LDFLAGS.libsqlite3.os-specific = @LDFLAGS_MAC_CVERSION@ @LDFLAGS_OUT_IMPLIB@ # - https://sqlite.org/forum/forumpost/9dfd5b8fd525a5d7 # - https://sqlite.org/forum/forumpost/0c7fc097b2 libsqlite3.DLL.basename = @SQLITE_DLL_BASENAME@ +# DLL.basename: see https://sqlite.org/forum/forumpost/828fdfe904 libsqlite3.out.implib = @SQLITE_OUT_IMPLIB@ -# dll.basename: see https://sqlite.org/forum/forumpost/828fdfe904 ENABLE_LIB_SHARED = @ENABLE_LIB_SHARED@ ENABLE_LIB_STATIC = @ENABLE_LIB_STATIC@ HAVE_WASI_SDK = @HAVE_WASI_SDK@ diff --git a/autosetup/sqlite-config.tcl b/autosetup/sqlite-config.tcl index cd38d0c179..2a8a964c23 100644 --- a/autosetup/sqlite-config.tcl +++ b/autosetup/sqlite-config.tcl @@ -261,15 +261,17 @@ proc sqlite-config-bootstrap {buildMode} { dll-basename:=auto => {Specifies the base name of the resulting DLL file, defaulting to a platform-depending name (libsqlite3 on most Unix-style platforms). - If not provided, libsqlite3 is assumed, but if provided without a - value then a platform-dependent default is used. - e.g. --dll-basename=msys-sqlite3-0} + If not provided, libsqlite3 is usually assumed but on some platforms + a platform-dependent default is used. Use "none" to explicitly + disable platform-dependent defaults on platforms where "auto" is + implicitly used if this flag is not provided.} # out-implib: https://sqlite.org/forum/forumpost/0c7fc097b2 out-implib:=auto => {Enable use of --out-implib linker flag to generate an "import library" for the DLL. The output's base name name is specified by the value, with "auto" meaning to figure out a - name automatically.} + name automatically. Use "none" to explicitly disable the + feature on platforms where it is implicitly on if not provided.} } } @@ -1272,6 +1274,7 @@ proc sqlite-handle-mac-cversion {} { proc sqlite-handle-dll-basename {} { if {[proj-opt-was-provided dll-basename]} { set dn [join [opt-val dll-basename] ""] + if {$dn eq "none"} { set dn libsqlite3 } } else { set dn libsqlite3 } @@ -1320,23 +1323,52 @@ proc sqlite-handle-out-implib {} { if {$olBaseName in {auto ""}} { set olBaseName "libsqlite3" ;# [get-define SQLITE_DLL_BASENAME] } - cc-with {-link 1} { - set dll "${olBaseName}[get-define TARGET_DLLEXT]" - set flags "-Wl,--out-implib,${dll}.a" - if {[cc-check-flags $flags]} { - define LDFLAGS_OUT_IMPLIB $flags - define SQLITE_OUT_IMPLIB ${dll}.a - set rc 1 + if {$olBaseName ne "none"} { + cc-with {-link 1} { + set dll "${olBaseName}[get-define TARGET_DLLEXT]" + set flags "-Wl,--out-implib,${dll}.a" + if {[cc-check-flags $flags]} { + define LDFLAGS_OUT_IMPLIB $flags + define SQLITE_OUT_IMPLIB ${dll}.a + set rc 1 + } + } + if {!$rc} { + user-error "--out-implib is not supported on this platform" } - } - if {!$rc} { - user-error "--out-implib is not supported on this platform" } } return $rc } ######################################################################## +# If the given platform identifier (defaulting to [get-define host]) +# appears to be one of the Unix-on-Windows environments, returns a +# brief symbolic name for that environment, else returns an empty +# string. +# +# It does not distinguish between msys and msys2, returning msys for +# both. The build does not, as of this writing, specifically support +# msys v1. +proc sqlite-env-is-unix-on-windows {{envTuple ""}} { + if {"" eq $envTuple} { + set envTuple [get-define host] + } + switch -glob -- $envTuple { + *-*-cygwin* { return cygwin } + *-*-ming* { return mingw } + *-*-msys* { return msys } + } + return ""; +} + +######################################################################## +# Performs various tweaks to the build which are only relevant on +# certain platforms, e.g. Mac and "Unix on Windows" platforms (msys2, +# cygwin, ...). +# +# DLL installation: +# # [define]s SQLITE_DLL_INSTALL_RULES to a symbolic name of a set of # "make install" rules to use for installation of the DLL # deliverable. The makefile is tasked with with providing rules named @@ -1346,16 +1378,54 @@ proc sqlite-handle-out-implib {} { # is (de)activated). # # The default value is "unix-generic". -proc sqlite-determine-dll-install-rules {} { - set n unix-generic - switch -glob -- [get-define host] { - *-*-cygwin* { set n cygwin } - *-*-ming* { set n mingw } - *-*-msys* { set n msys } +# +# --out-implib: +# +# On platforms where an "import library" is conventionally used but +# --out-implib was not explicitly used, automatically add that flag. +# +# --dll-basename: +# +# On the same platforms addressed by --out-implib, if --dll-basename +# is not specified, --dll-basename=auto is implied. +proc sqlite-handle-env-quirks {} { + set instName unix-generic; # name of installation rules set + set autoDll 0; # true if --out-implib/--dll-basename should be implied + set host [get-define host] + switch -glob -- $host { *apple* - - *darwin* { set n darwin } + *darwin* { set instName darwin } + default { + set x [sqlite-env-is-unix-on-windows $host] + if {"" ne $x} { + set instName $x + set autoDll 1 + } + } } - define SQLITE_DLL_INSTALL_RULES $n + define SQLITE_DLL_INSTALL_RULES $instName + if {$autoDll} { + if {![proj-opt-was-provided out-implib]} { + # Imply --out-implib=auto + proj-indented-notice [subst -nocommands -nobackslashes { + NOTICE: auto-enabling --out-implib for $host. + Use --out-implib=none to disable it or --out-implib=auto + to squelch this notice. + }] + proj-opt-set out-implib auto + } + if {![proj-opt-was-provided dll-basename]} { + # Imply --dll-basename=auto + proj-indented-notice [subst -nocommands -nobackslashes { + NOTICE: auto-enabling --dll-basename for $host. + Use --dll-basename=none to disable it or --dll-basename=auto + to squelch this notice. + }] + proj-opt-set dll-basename auto + } + } + sqlite-handle-out-implib + sqlite-handle-mac-cversion } ######################################################################## @@ -1369,9 +1439,7 @@ proc sqlite-config-finalize {} { # autoconf { # } # } - sqlite-determine-dll-install-rules - sqlite-handle-out-implib - sqlite-handle-mac-cversion + sqlite-handle-env-quirks sqlite-process-dot-in-files sqlite-post-config-validation sqlite-dump-defines diff --git a/manifest b/manifest index d88823fd31..1b7f04d52c 100644 --- a/manifest +++ b/manifest @@ -1,9 +1,9 @@ -C Ensure\sthat\s[08c9e56f60]\suses\san\sabsolute\spath\swhen\sappending\s.exe\sto\smksourceid. -D 2025-02-22T14:58:20.584 +C On\sunix-on-windows\splatforms,\sif\seither\sof\s--out-implib\sor\s--dll-basename\sare\snot\sprovided,\sauto-enable\sthem.\sAdd\sthe\s'none'\sspecial\svalue\sto\sthose\sflags\sto\sspecifically\sdisable\sthe\senvironment-specific\shandling\sof\sthose\sflags. +D 2025-02-22T16:31:16.755 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d -F Makefile.in b2b4b30fd8c1be9713861c501f8035b57845c54ac42c4276452d5eb94e9ea3eb +F Makefile.in 18fe2ad1e0da1fc98843d53c48a5ee7e180eacccdae532e1bad9f95d4fabde7d F Makefile.linux-generic bd3e3cacd369821a6241d4ea1967395c962dfe3057e38cb0a435cee0e8b789d0 F Makefile.msc 50c656e096ae49ccf9e5e88b4995f0a155f231ebae5b6d185cc64ce99d728a83 F README.md c3c0f19532ce28f6297a71870f3c7b424729f0e6d9ab889616d3587dd2332159 @@ -50,7 +50,7 @@ F autosetup/cc.tcl c0fcc50ca91deff8741e449ddad05bcd08268bc31177e613a6343bbd1fd3e F autosetup/jimsh0.c 6573f6bc6ff204de0139692648d7037ca0b6c067bac83a7b4e087f20a86866a4 F autosetup/pkg-config.tcl 4e635bf39022ff65e0d5434339dd41503ea48fc53822c9c5bde88b02d3d952ba F autosetup/proj.tcl 04fd2d110b6464f7a2847380a39bed647c2646a868a4ed60f7a625e52a9a8b20 -F autosetup/sqlite-config.tcl 2422f6fd2cd2120e8812c0e6e4f6d2cb888cc6312a49f265834d0913c09fa6b9 +F autosetup/sqlite-config.tcl f5ced060a400ab0758c560347466083ea3ea822db260b40c3266d62a9812313a F autosetup/system.tcl 51d4be76cd9a9074704b584e5c9cbba616202c8468cf9ba8a4f8294a7ab1dba9 F configure 9a00b21dfd13757bbfb8d89b30660a89ec1f8f3a79402b8f9f9b6fc475c3303a x F contrib/sqlitecon.tcl 210a913ad63f9f991070821e599d600bd913e0ad @@ -2210,8 +2210,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P 2ee73109809e7d4a9d203cfa42f29c62837c06dc414f9dbf17ce00d9bbb5a883 -R 9554fb958ccc8ca614713f13fcd64b48 +P 906d27f7a645833595f02ddf05892703783d89116b1009f04e0b71679ff34a8b +R 38c1112c07cd683cb8ec01f377bddc57 U stephan -Z 090a992d630fbdcddf86913e7feb0d82 +Z 51cfa32526ca2c68d3558aae78fd6a9a # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index a35d7ed921..01c0d0c3fc 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -906d27f7a645833595f02ddf05892703783d89116b1009f04e0b71679ff34a8b +486400801a4540392c04d805a47df5249c4010b1a5fbac91900db6149374c274 From c071c47b51f39e2a186dbb87e1b7347d5590986d Mon Sep 17 00:00:00 2001 From: drh <> Date: Sat, 22 Feb 2025 16:44:14 +0000 Subject: [PATCH 150/194] Tamp down various harmless compiler warnings. Use "int" in places instead of "u16" or "i16" since the compiler complains less and generates faster code. FossilOrigin-Name: 742827f049768c4f69ccdfaadfad339aaad3bc126d3a68b90cfea01d825bf7ce --- manifest | 22 +++++++-------- manifest.uuid | 2 +- src/alter.c | 10 ++++--- src/analyze.c | 2 +- src/bitvec.c | 6 ++--- src/btmutex.c | 2 +- src/btree.c | 73 +++++++++++++++++++++++++++++--------------------- src/btreeInt.h | 6 +++++ 8 files changed, 71 insertions(+), 52 deletions(-) diff --git a/manifest b/manifest index 18e40f74c5..f2b2a13a57 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Fix\san\sincorrect\sassert\sadded\sby\s[d7729dbbf231d57c]. -D 2025-02-22T11:40:29.226 +C Tamp\sdown\svarious\sharmless\scompiler\swarnings.\s\sUse\s"int"\sin\splaces\sinstead\nof\s"u16"\sor\s"i16"\ssince\sthe\scompiler\scomplains\sless\sand\sgenerates\sfaster\ncode. +D 2025-02-22T16:44:14.174 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d @@ -715,16 +715,16 @@ F mptest/multiwrite01.test dab5c5f8f9534971efce679152c5146da265222d F sqlite.pc.in 42b7bf0d02e08b9e77734a47798d1a55a9e0716b F sqlite3.1 acdff36db796e2d00225b911d3047d580cd136547298435426ce9d40347973cc F sqlite3.pc.in 0977c03a4da7c4204bd60e784a0efb8d51a190448aba78a4e973fe7192bdaf03 -F src/alter.c 918875586d26036ee06532dd80b83032a34330da00337877d52eda3fa5054d9f -F src/analyze.c 6d27b425a16817975e6a4f8501e531d13dd1bf4b53bff2329dbc1f301aeef82d +F src/alter.c 0d2122ade76617b7cca383428d0881a9821ef8ddaf9cce6ff91d69a215614b95 +F src/analyze.c 13895d4da6ac857d95d3291dc607d492eba3ea1cbc3bc04baaa0383fbc1bb3d4 F src/attach.c c36d9d82811e2274bd06bf3b34459e36d8ae8a7f32efa5cbf3f890eef08a9987 F src/auth.c 54ab9c6c5803b47c0d45b76ce27eff22a03b4b1f767c5945a3a4eb13aa4c78dc F src/backup.c 5c97e8023aab1ce14a42387eb3ae00ba5a0644569e3476f38661fa6f824c3523 -F src/bitvec.c d64aa60cd5f2721ebd6c155b3ac5ff7342086bead485239d57342cdfdccb9f50 -F src/btmutex.c 79a43670447eacc651519a429f6ece9fd638563cf95b469d6891185ddae2b522 -F src/btree.c 9316859aa5f14bde4a3719ffb1570219e51c5de433221e38b87ea19db868aedf +F src/bitvec.c 782cc29b42b47e7ec6348eb0aaf9ffe60063f498387e7249f458d445af4b53e9 +F src/btmutex.c 30dada73a819a1ef5b7583786370dce1842e12e1ad941e4d05ac29695528daea +F src/btree.c 00fcee37947641f48d4b529d96143e74d056b7afa8f26d61292c90ee59c056b2 F src/btree.h 18e5e7b2124c23426a283523e5f31a4bff029131b795bb82391f9d2f3136fc50 -F src/btreeInt.h 98aadb6dcb77b012cab2574d6a728fad56b337fc946839b9898c4b4c969e30b6 +F src/btreeInt.h 9c0f9ea5c9b5f4dcaea18111d43efe95f2ac276cd86d770dce10fd99ccc93886 F src/build.c 20793695ef64d2d0c147501e37f344f828f09f16d346a987b516316186030996 F src/callback.c acae8c8dddda41ee85cfdf19b926eefe830f371069f8aadca3aa39adf5b1c859 F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e @@ -2210,8 +2210,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P 5822feec43be9352fd87bf9968c39c0218e01ab5fe3ba50431ae21cba79e6c89 -R 0951bff81e7aa0574e1251461ca59296 +P eeea11278bdebe336f0c30fbad79e30e3456ab67dae46abdd5f9951ea1b61bed +R 8078ee78be0e4d7d18ee35dbad7406fe U drh -Z cf8ddfba345e5495dfdc5bc22e0f71a8 +Z 2ee0c7ad1f2d8a9853a04c1df0464ab5 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 9c95d8c898..5eab3882ff 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -eeea11278bdebe336f0c30fbad79e30e3456ab67dae46abdd5f9951ea1b61bed +742827f049768c4f69ccdfaadfad339aaad3bc126d3a68b90cfea01d825bf7ce diff --git a/src/alter.c b/src/alter.c index 43b266790d..8192571662 100644 --- a/src/alter.c +++ b/src/alter.c @@ -1261,14 +1261,15 @@ static int renameEditSql( memcpy(zBuf1, pBest->t.z, pBest->t.n); zBuf1[pBest->t.n] = 0; sqlite3Dequote(zBuf1); - sqlite3_snprintf(nSql*2, zBuf2, "%Q%s", zBuf1, + assert( nSql < 0x15555554 /* otherwise malloc would have failed */ ); + sqlite3_snprintf((int)(nSql*2), zBuf2, "%Q%s", zBuf1, pBest->t.z[pBest->t.n]=='\'' ? " " : "" ); zReplace = zBuf2; nReplace = sqlite3Strlen30(zReplace); } - iOff = pBest->t.z - zSql; + iOff = (int)(pBest->t.z - zSql); if( pBest->t.n!=nReplace ){ memmove(&zOut[iOff + nReplace], &zOut[iOff + pBest->t.n], nOut - (iOff + pBest->t.n) @@ -1294,11 +1295,12 @@ static int renameEditSql( ** Set all pEList->a[].fg.eEName fields in the expression-list to val. */ static void renameSetENames(ExprList *pEList, int val){ + assert( val==ENAME_NAME || val==ENAME_TAB || val==ENAME_SPAN ); if( pEList ){ int i; for(i=0; inExpr; i++){ assert( val==ENAME_NAME || pEList->a[i].fg.eEName==ENAME_NAME ); - pEList->a[i].fg.eEName = val; + pEList->a[i].fg.eEName = val&0x3; } } } @@ -2045,7 +2047,7 @@ static void renameTableTest( if( zDb && zInput ){ int rc; Parse sParse; - int flags = db->flags; + u64 flags = db->flags; if( bNoDQS ) db->flags &= ~(SQLITE_DqsDML|SQLITE_DqsDDL); rc = renameParseSql(&sParse, zDb, db, zInput, bTemp); db->flags |= (flags & (SQLITE_DqsDML|SQLITE_DqsDDL)); diff --git a/src/analyze.c b/src/analyze.c index 58cea90caa..8ca0e3e74c 100644 --- a/src/analyze.c +++ b/src/analyze.c @@ -443,7 +443,7 @@ static void statInit( p->db = db; p->nEst = sqlite3_value_int64(argv[2]); p->nRow = 0; - p->nLimit = sqlite3_value_int64(argv[3]); + p->nLimit = sqlite3_value_int(argv[3]); p->nCol = nCol; p->nKeyCol = nKeyCol; p->nSkipAhead = 0; diff --git a/src/bitvec.c b/src/bitvec.c index 32bfade115..30c4dc7b8e 100644 --- a/src/bitvec.c +++ b/src/bitvec.c @@ -67,7 +67,7 @@ ** no fewer collisions than the no-op *1. */ #define BITVEC_HASH(X) (((X)*1)%BITVEC_NINT) -#define BITVEC_NPTR (BITVEC_USIZE/sizeof(Bitvec *)) +#define BITVEC_NPTR ((u32)(BITVEC_USIZE/sizeof(Bitvec *))) /* @@ -250,7 +250,7 @@ void sqlite3BitvecClear(Bitvec *p, u32 i, void *pBuf){ } } if( p->iSize<=BITVEC_NBIT ){ - p->u.aBitmap[i/BITVEC_SZELEM] &= ~(1 << (i&(BITVEC_SZELEM-1))); + p->u.aBitmap[i/BITVEC_SZELEM] &= ~(BITVEC_TELEM)(1<<(i&(BITVEC_SZELEM-1))); }else{ unsigned int j; u32 *aiValues = pBuf; @@ -301,7 +301,7 @@ u32 sqlite3BitvecSize(Bitvec *p){ ** individual bits within V. */ #define SETBIT(V,I) V[I>>3] |= (1<<(I&7)) -#define CLEARBIT(V,I) V[I>>3] &= ~(1<<(I&7)) +#define CLEARBIT(V,I) V[I>>3] &= ~(BITVEC_TELEM)(1<<(I&7)) #define TESTBIT(V,I) (V[I>>3]&(1<<(I&7)))!=0 /* diff --git a/src/btmutex.c b/src/btmutex.c index 232831e037..620047c151 100644 --- a/src/btmutex.c +++ b/src/btmutex.c @@ -185,7 +185,7 @@ int sqlite3BtreeHoldsMutex(Btree *p){ */ static void SQLITE_NOINLINE btreeEnterAll(sqlite3 *db){ int i; - int skipOk = 1; + u8 skipOk = 1; Btree *p; assert( sqlite3_mutex_held(db->mutex) ); for(i=0; inDb; i++){ diff --git a/src/btree.c b/src/btree.c index 97fbdf8d21..1bd59a1b1f 100644 --- a/src/btree.c +++ b/src/btree.c @@ -1019,7 +1019,7 @@ void sqlite3BtreeCursorHint(BtCursor *pCur, int eHintType, ...){ */ void sqlite3BtreeCursorHintFlags(BtCursor *pCur, unsigned x){ assert( x==BTREE_SEEK_EQ || x==BTREE_BULKLOAD || x==0 ); - pCur->hints = x; + pCur->hints = (u8)x; } @@ -1213,14 +1213,15 @@ static SQLITE_NOINLINE void btreeParseCellAdjustSizeForOverflow( static int btreePayloadToLocal(MemPage *pPage, i64 nPayload){ int maxLocal; /* Maximum amount of payload held locally */ maxLocal = pPage->maxLocal; + assert( nPayload>=0 ); if( nPayload<=maxLocal ){ - return nPayload; + return (int)nPayload; }else{ int minLocal; /* Minimum amount of payload held locally */ int surplus; /* Overflow payload available for local storage */ minLocal = pPage->minLocal; - surplus = minLocal + (nPayload - minLocal)%(pPage->pBt->usableSize-4); - return ( surplus <= maxLocal ) ? surplus : minLocal; + surplus = (int)(minLocal +(nPayload - minLocal)%(pPage->pBt->usableSize-4)); + return (surplus <= maxLocal) ? surplus : minLocal; } } @@ -1330,11 +1331,13 @@ static void btreeParseCellPtr( pInfo->pPayload = pIter; testcase( nPayload==pPage->maxLocal ); testcase( nPayload==(u32)pPage->maxLocal+1 ); + assert( nPayload>=0 ); + assert( pPage->maxLocal <= BT_MAX_LOCAL ); if( nPayload<=pPage->maxLocal ){ /* This is the (easy) common case where the entire payload fits ** on the local page. No overflow is required. */ - pInfo->nSize = nPayload + (u16)(pIter - pCell); + pInfo->nSize = (u16)nPayload + (u16)(pIter - pCell); if( pInfo->nSize<4 ) pInfo->nSize = 4; pInfo->nLocal = (u16)nPayload; }else{ @@ -1367,11 +1370,13 @@ static void btreeParseCellPtrIndex( pInfo->pPayload = pIter; testcase( nPayload==pPage->maxLocal ); testcase( nPayload==(u32)pPage->maxLocal+1 ); + assert( nPayload>=0 ); + assert( pPage->maxLocal <= BT_MAX_LOCAL ); if( nPayload<=pPage->maxLocal ){ /* This is the (easy) common case where the entire payload fits ** on the local page. No overflow is required. */ - pInfo->nSize = nPayload + (u16)(pIter - pCell); + pInfo->nSize = (u16)nPayload + (u16)(pIter - pCell); if( pInfo->nSize<4 ) pInfo->nSize = 4; pInfo->nLocal = (u16)nPayload; }else{ @@ -1910,14 +1915,14 @@ static SQLITE_INLINE int allocateSpace(MemPage *pPage, int nByte, int *pIdx){ ** at the end of the page. So do additional corruption checks inside this ** routine and return SQLITE_CORRUPT if any problems are found. */ -static int freeSpace(MemPage *pPage, u16 iStart, u16 iSize){ - u16 iPtr; /* Address of ptr to next freeblock */ - u16 iFreeBlk; /* Address of the next freeblock */ +static int freeSpace(MemPage *pPage, int iStart, int iSize){ + int iPtr; /* Address of ptr to next freeblock */ + int iFreeBlk; /* Address of the next freeblock */ u8 hdr; /* Page header size. 0 or 100 */ - u8 nFrag = 0; /* Reduction in fragmentation */ - u16 iOrigSize = iSize; /* Original value of iSize */ - u16 x; /* Offset to cell content area */ - u32 iEnd = iStart + iSize; /* First byte past the iStart buffer */ + int nFrag = 0; /* Reduction in fragmentation */ + int iOrigSize = iSize; /* Original value of iSize */ + int x; /* Offset to cell content area */ + int iEnd = iStart + iSize; /* First byte past the iStart buffer */ unsigned char *data = pPage->aData; /* Page content */ u8 *pTmp; /* Temporary ptr into data[] */ @@ -1944,7 +1949,7 @@ static int freeSpace(MemPage *pPage, u16 iStart, u16 iSize){ } iPtr = iFreeBlk; } - if( iFreeBlk>pPage->pBt->usableSize-4 ){ /* TH3: corrupt081.100 */ + if( iFreeBlk>(int)pPage->pBt->usableSize-4 ){ /* TH3: corrupt081.100 */ return SQLITE_CORRUPT_PAGE(pPage); } assert( iFreeBlk>iPtr || iFreeBlk==0 || CORRUPT_DB ); @@ -1959,7 +1964,7 @@ static int freeSpace(MemPage *pPage, u16 iStart, u16 iSize){ nFrag = iFreeBlk - iEnd; if( iEnd>iFreeBlk ) return SQLITE_CORRUPT_PAGE(pPage); iEnd = iFreeBlk + get2byte(&data[iFreeBlk+2]); - if( iEnd > pPage->pBt->usableSize ){ + if( iEnd > (int)pPage->pBt->usableSize ){ return SQLITE_CORRUPT_PAGE(pPage); } iSize = iEnd - iStart; @@ -1980,7 +1985,7 @@ static int freeSpace(MemPage *pPage, u16 iStart, u16 iSize){ } } if( nFrag>data[hdr+7] ) return SQLITE_CORRUPT_PAGE(pPage); - data[hdr+7] -= nFrag; + data[hdr+7] -= (u8)nFrag; } pTmp = &data[hdr+5]; x = get2byte(pTmp); @@ -2001,7 +2006,8 @@ static int freeSpace(MemPage *pPage, u16 iStart, u16 iSize){ /* Insert the new freeblock into the freelist */ put2byte(&data[iPtr], iStart); put2byte(&data[iStart], iFreeBlk); - put2byte(&data[iStart+2], iSize); + assert( iSize>=0 && iSize<=0xffff ); + put2byte(&data[iStart+2], (u16)iSize); } pPage->nFree += iOrigSize; return SQLITE_OK; @@ -2227,7 +2233,7 @@ static int btreeInitPage(MemPage *pPage){ assert( pBt->pageSize>=512 && pBt->pageSize<=65536 ); pPage->maskPage = (u16)(pBt->pageSize - 1); pPage->nOverflow = 0; - pPage->cellOffset = pPage->hdrOffset + 8 + pPage->childPtrSize; + pPage->cellOffset = (u16)(pPage->hdrOffset + 8 + pPage->childPtrSize); pPage->aCellIdx = data + pPage->childPtrSize + 8; pPage->aDataEnd = pPage->aData + pBt->pageSize; pPage->aDataOfst = pPage->aData + pPage->childPtrSize; @@ -2261,8 +2267,8 @@ static int btreeInitPage(MemPage *pPage){ static void zeroPage(MemPage *pPage, int flags){ unsigned char *data = pPage->aData; BtShared *pBt = pPage->pBt; - u8 hdr = pPage->hdrOffset; - u16 first; + int hdr = pPage->hdrOffset; + int first; assert( sqlite3PagerPagenumber(pPage->pDbPage)==pPage->pgno || CORRUPT_DB ); assert( sqlite3PagerGetExtra(pPage->pDbPage) == (void*)pPage ); @@ -2279,7 +2285,7 @@ static void zeroPage(MemPage *pPage, int flags){ put2byte(&data[hdr+5], pBt->usableSize); pPage->nFree = (u16)(pBt->usableSize - first); decodeFlags(pPage, flags); - pPage->cellOffset = first; + pPage->cellOffset = (u16)first; pPage->aDataEnd = &data[pBt->pageSize]; pPage->aCellIdx = &data[first]; pPage->aDataOfst = &data[pPage->childPtrSize]; @@ -3065,7 +3071,7 @@ int sqlite3BtreeSetPageSize(Btree *p, int pageSize, int nReserve, int iFix){ BtShared *pBt = p->pBt; assert( nReserve>=0 && nReserve<=255 ); sqlite3BtreeEnter(p); - pBt->nReserveWanted = nReserve; + pBt->nReserveWanted = (u8)nReserve; x = pBt->pageSize - pBt->usableSize; if( nReservebtsFlags & BTS_PAGESIZE_FIXED ){ @@ -3171,7 +3177,7 @@ int sqlite3BtreeSecureDelete(Btree *p, int newFlag){ assert( BTS_FAST_SECURE==(BTS_OVERWRITE|BTS_SECURE_DELETE) ); if( newFlag>=0 ){ p->pBt->btsFlags &= ~BTS_FAST_SECURE; - p->pBt->btsFlags |= BTS_SECURE_DELETE*newFlag; + p->pBt->btsFlags |= (u16)(BTS_SECURE_DELETE*newFlag); } b = (p->pBt->btsFlags & BTS_FAST_SECURE)/BTS_SECURE_DELETE; sqlite3BtreeLeave(p); @@ -7619,7 +7625,8 @@ static int rebuildPage( } /* The pPg->nFree field is now set incorrectly. The caller will fix it. */ - pPg->nCell = nCell; + assert( nCell < 10922 ); + pPg->nCell = (u16)nCell; pPg->nOverflow = 0; put2byte(&aData[hdr+1], 0); @@ -7866,9 +7873,13 @@ static int editPage( if( pageInsertArray( pPg, pBegin, &pData, pCellptr, iNew+nCell, nNew-nCell, pCArray - ) ) goto editpage_fail; + ) + ){ + goto editpage_fail; + } - pPg->nCell = nNew; + assert( nNew < 10922 ); + pPg->nCell = (u16)nNew; pPg->nOverflow = 0; put2byte(&aData[hdr+3], pPg->nCell); @@ -8177,7 +8188,7 @@ static int balance_nonroot( int pageFlags; /* Value of pPage->aData[0] */ int iSpace1 = 0; /* First unused byte of aSpace1[] */ int iOvflSpace = 0; /* First unused byte of aOvflSpace[] */ - int szScratch; /* Size of scratch memory requested */ + u64 szScratch; /* Size of scratch memory requested */ MemPage *apOld[NB]; /* pPage and up to two siblings */ MemPage *apNew[NB+2]; /* pPage and up to NB siblings after balancing */ u8 *pRight; /* Location in parent of right-sibling pointer */ @@ -9462,7 +9473,7 @@ int sqlite3BtreeInsert( if( pCur->info.nKey==pX->nKey ){ BtreePayload x2; x2.pData = pX->pKey; - x2.nData = pX->nKey; + x2.nData = (int)pX->nKey; assert( pX->nKey<=0x7fffffff ); x2.nZero = 0; return btreeOverwriteCell(pCur, &x2); } @@ -9643,7 +9654,7 @@ int sqlite3BtreeTransferRow(BtCursor *pDest, BtCursor *pSrc, i64 iKey){ getCellInfo(pSrc); if( pSrc->info.nPayload<0x80 ){ - *(aOut++) = pSrc->info.nPayload; + *(aOut++) = (u8)pSrc->info.nPayload; }else{ aOut += sqlite3PutVarint(aOut, pSrc->info.nPayload); } @@ -9656,7 +9667,7 @@ int sqlite3BtreeTransferRow(BtCursor *pDest, BtCursor *pSrc, i64 iKey){ nRem = pSrc->info.nPayload; if( nIn==nRem && nInpPage->maxLocal ){ memcpy(aOut, aIn, nIn); - pBt->nPreformatSize = nIn + (aOut - pBt->pTmpSpace); + pBt->nPreformatSize = nIn + (int)(aOut - pBt->pTmpSpace); return SQLITE_OK; }else{ int rc = SQLITE_OK; @@ -9668,7 +9679,7 @@ int sqlite3BtreeTransferRow(BtCursor *pDest, BtCursor *pSrc, i64 iKey){ u32 nOut; /* Size of output buffer aOut[] */ nOut = btreePayloadToLocal(pDest->pPage, pSrc->info.nPayload); - pBt->nPreformatSize = nOut + (aOut - pBt->pTmpSpace); + pBt->nPreformatSize = (int)nOut + (int)(aOut - pBt->pTmpSpace); if( nOutinfo.nPayload ){ pPgnoOut = &aOut[nOut]; pBt->nPreformatSize += 4; diff --git a/src/btreeInt.h b/src/btreeInt.h index 1213297253..17e3a1add5 100644 --- a/src/btreeInt.h +++ b/src/btreeInt.h @@ -496,6 +496,12 @@ struct CellInfo { */ #define BTCURSOR_MAX_DEPTH 20 +/* +** Maximum amount of storage local to a database page, regardless of +** page size. +*/ +#define BT_MAX_LOCAL 65501 /* 65536 - 35 */ + /* ** A cursor is a pointer to a particular entry within a particular ** b-tree within a database file. From cbdbf534a3d9ae1d4da728b3c3f2d3d6fdb39c72 Mon Sep 17 00:00:00 2001 From: stephan Date: Sat, 22 Feb 2025 17:30:08 +0000 Subject: [PATCH 151/194] Replace --dll-basename=none with --dll-basename=default. FossilOrigin-Name: 35b1c32f80b9aed04776508683a1828fd5777ee8bb0e42e593557ae3cca558e4 --- autosetup/sqlite-config.tcl | 4 ++-- manifest | 12 ++++++------ manifest.uuid | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/autosetup/sqlite-config.tcl b/autosetup/sqlite-config.tcl index 2a8a964c23..0b77e0a9ef 100644 --- a/autosetup/sqlite-config.tcl +++ b/autosetup/sqlite-config.tcl @@ -262,7 +262,7 @@ proc sqlite-config-bootstrap {buildMode} { => {Specifies the base name of the resulting DLL file, defaulting to a platform-depending name (libsqlite3 on most Unix-style platforms). If not provided, libsqlite3 is usually assumed but on some platforms - a platform-dependent default is used. Use "none" to explicitly + a platform-dependent default is used. Use "default" to explicitly disable platform-dependent defaults on platforms where "auto" is implicitly used if this flag is not provided.} # out-implib: https://sqlite.org/forum/forumpost/0c7fc097b2 @@ -1274,7 +1274,7 @@ proc sqlite-handle-mac-cversion {} { proc sqlite-handle-dll-basename {} { if {[proj-opt-was-provided dll-basename]} { set dn [join [opt-val dll-basename] ""] - if {$dn eq "none"} { set dn libsqlite3 } + if {$dn in {none default}} { set dn libsqlite3 } } else { set dn libsqlite3 } diff --git a/manifest b/manifest index 1b7f04d52c..d459f96d0d 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C On\sunix-on-windows\splatforms,\sif\seither\sof\s--out-implib\sor\s--dll-basename\sare\snot\sprovided,\sauto-enable\sthem.\sAdd\sthe\s'none'\sspecial\svalue\sto\sthose\sflags\sto\sspecifically\sdisable\sthe\senvironment-specific\shandling\sof\sthose\sflags. -D 2025-02-22T16:31:16.755 +C Replace\s--dll-basename=none\swith\s--dll-basename=default. +D 2025-02-22T17:30:08.875 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d @@ -50,7 +50,7 @@ F autosetup/cc.tcl c0fcc50ca91deff8741e449ddad05bcd08268bc31177e613a6343bbd1fd3e F autosetup/jimsh0.c 6573f6bc6ff204de0139692648d7037ca0b6c067bac83a7b4e087f20a86866a4 F autosetup/pkg-config.tcl 4e635bf39022ff65e0d5434339dd41503ea48fc53822c9c5bde88b02d3d952ba F autosetup/proj.tcl 04fd2d110b6464f7a2847380a39bed647c2646a868a4ed60f7a625e52a9a8b20 -F autosetup/sqlite-config.tcl f5ced060a400ab0758c560347466083ea3ea822db260b40c3266d62a9812313a +F autosetup/sqlite-config.tcl 92766017fe7fd47a0079b5b1714ff9efaeb1af6fe8703af42c74dd56543797c9 F autosetup/system.tcl 51d4be76cd9a9074704b584e5c9cbba616202c8468cf9ba8a4f8294a7ab1dba9 F configure 9a00b21dfd13757bbfb8d89b30660a89ec1f8f3a79402b8f9f9b6fc475c3303a x F contrib/sqlitecon.tcl 210a913ad63f9f991070821e599d600bd913e0ad @@ -2210,8 +2210,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P 906d27f7a645833595f02ddf05892703783d89116b1009f04e0b71679ff34a8b -R 38c1112c07cd683cb8ec01f377bddc57 +P 486400801a4540392c04d805a47df5249c4010b1a5fbac91900db6149374c274 +R c02b6d4df01e25663d70fb8eca066eef U stephan -Z 51cfa32526ca2c68d3558aae78fd6a9a +Z bf9a58df58c6b3fa7bf4b00e65c449d1 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 01c0d0c3fc..307098be3a 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -486400801a4540392c04d805a47df5249c4010b1a5fbac91900db6149374c274 +35b1c32f80b9aed04776508683a1828fd5777ee8bb0e42e593557ae3cca558e4 From fdb2bdc2a3c7039aa5d7f73d07268e82b13ec1fc Mon Sep 17 00:00:00 2001 From: stephan Date: Sat, 22 Feb 2025 17:33:18 +0000 Subject: [PATCH 152/194] Update the help text to account for [35b1c32f80b9]. FossilOrigin-Name: f2e7355d87450f9a4d98390cf9d830e9902105048f9308e02c597190ecf2a594 --- autosetup/sqlite-config.tcl | 8 ++++---- manifest | 12 ++++++------ manifest.uuid | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/autosetup/sqlite-config.tcl b/autosetup/sqlite-config.tcl index 0b77e0a9ef..003c567ca6 100644 --- a/autosetup/sqlite-config.tcl +++ b/autosetup/sqlite-config.tcl @@ -1409,8 +1409,8 @@ proc sqlite-handle-env-quirks {} { # Imply --out-implib=auto proj-indented-notice [subst -nocommands -nobackslashes { NOTICE: auto-enabling --out-implib for $host. - Use --out-implib=none to disable it or --out-implib=auto - to squelch this notice. + Use --out-implib=none to disable this special case + or --out-implib=auto to squelch this notice. }] proj-opt-set out-implib auto } @@ -1418,8 +1418,8 @@ proc sqlite-handle-env-quirks {} { # Imply --dll-basename=auto proj-indented-notice [subst -nocommands -nobackslashes { NOTICE: auto-enabling --dll-basename for $host. - Use --dll-basename=none to disable it or --dll-basename=auto - to squelch this notice. + Use --dll-basename=default to disable this special case + or --dll-basename=auto to squelch this notice. }] proj-opt-set dll-basename auto } diff --git a/manifest b/manifest index d459f96d0d..02ed307402 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Replace\s--dll-basename=none\swith\s--dll-basename=default. -D 2025-02-22T17:30:08.875 +C Update\sthe\shelp\stext\sto\saccount\sfor\s[35b1c32f80b9]. +D 2025-02-22T17:33:18.554 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d @@ -50,7 +50,7 @@ F autosetup/cc.tcl c0fcc50ca91deff8741e449ddad05bcd08268bc31177e613a6343bbd1fd3e F autosetup/jimsh0.c 6573f6bc6ff204de0139692648d7037ca0b6c067bac83a7b4e087f20a86866a4 F autosetup/pkg-config.tcl 4e635bf39022ff65e0d5434339dd41503ea48fc53822c9c5bde88b02d3d952ba F autosetup/proj.tcl 04fd2d110b6464f7a2847380a39bed647c2646a868a4ed60f7a625e52a9a8b20 -F autosetup/sqlite-config.tcl 92766017fe7fd47a0079b5b1714ff9efaeb1af6fe8703af42c74dd56543797c9 +F autosetup/sqlite-config.tcl 8cd7b6963d2d6561595389171c4d7495b61095706df9ad80e677c9920da10680 F autosetup/system.tcl 51d4be76cd9a9074704b584e5c9cbba616202c8468cf9ba8a4f8294a7ab1dba9 F configure 9a00b21dfd13757bbfb8d89b30660a89ec1f8f3a79402b8f9f9b6fc475c3303a x F contrib/sqlitecon.tcl 210a913ad63f9f991070821e599d600bd913e0ad @@ -2210,8 +2210,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P 486400801a4540392c04d805a47df5249c4010b1a5fbac91900db6149374c274 -R c02b6d4df01e25663d70fb8eca066eef +P 35b1c32f80b9aed04776508683a1828fd5777ee8bb0e42e593557ae3cca558e4 +R 44a6434da0b2aec6a0e3c6807bb35211 U stephan -Z bf9a58df58c6b3fa7bf4b00e65c449d1 +Z e1feccfa91581cfed3261c34760f8a9d # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 307098be3a..27fbc1ee3e 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -35b1c32f80b9aed04776508683a1828fd5777ee8bb0e42e593557ae3cca558e4 +f2e7355d87450f9a4d98390cf9d830e9902105048f9308e02c597190ecf2a594 From 4d70dbad57c2099aac75a46b3dfb646df09587aa Mon Sep 17 00:00:00 2001 From: drh <> Date: Sat, 22 Feb 2025 23:18:38 +0000 Subject: [PATCH 153/194] Prototype implementation of the unistr() SQL function. FossilOrigin-Name: 7cc302de05ed2a973372c05f55b048bf99af3d2590dd29f6fd0f379fb451aa0e --- manifest | 15 +++--- manifest.uuid | 2 +- src/func.c | 127 ++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 137 insertions(+), 7 deletions(-) diff --git a/manifest b/manifest index f2b2a13a57..6f0eef751f 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Tamp\sdown\svarious\sharmless\scompiler\swarnings.\s\sUse\s"int"\sin\splaces\sinstead\nof\s"u16"\sor\s"i16"\ssince\sthe\scompiler\scomplains\sless\sand\sgenerates\sfaster\ncode. -D 2025-02-22T16:44:14.174 +C Prototype\simplementation\sof\sthe\sunistr()\sSQL\sfunction. +D 2025-02-22T23:18:38.072 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d @@ -735,7 +735,7 @@ F src/delete.c 03a77ba20e54f0f42ebd8eddf15411ed6bdb06a2c472ac4b6b336521bf7cea42 F src/expr.c 6769d3f0ca9b1792e883e3ff21fdc5ca0033cece65571ebbf9d8b8fe2f47cd27 F src/fault.c 460f3e55994363812d9d60844b2a6de88826e007 F src/fkey.c 928ed2517e8732113d2b9821aa37af639688d752f4ea9ac6e0e393d713eeb76f -F src/func.c 6c8b7bbdc5b588f3cfc79ed5effcfd3031758f5034c464fcd8891e8010b4d317 +F src/func.c ddfb4f3b8d2fbbe46dbe2bb28c9c79fc1defb7855975dfd851f2dd8417cc70be F src/global.c a19e4b1ca1335f560e9560e590fc13081e21f670643367f99cb9e8f9dc7d615b F src/hash.c 73934a7f7ab1cb110614a9388cb516893b0cf5b7b69e4fd1a0780ac4ce166be7 F src/hash.h 46b92795a95bfefb210f52f0c316e9d7cdbcdd7e7fcfb0d8be796d3a5767cddf @@ -2210,8 +2210,11 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P eeea11278bdebe336f0c30fbad79e30e3456ab67dae46abdd5f9951ea1b61bed -R 8078ee78be0e4d7d18ee35dbad7406fe +P 742827f049768c4f69ccdfaadfad339aaad3bc126d3a68b90cfea01d825bf7ce +R 487d823b2a97be800308516e5c94d276 +T *branch * unistr +T *sym-unistr * +T -sym-trunk * U drh -Z 2ee0c7ad1f2d8a9853a04c1df0464ab5 +Z f399533fbf6bd526a1da3885c8fdaf47 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 5eab3882ff..080a91b1b8 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -742827f049768c4f69ccdfaadfad339aaad3bc126d3a68b90cfea01d825bf7ce +7cc302de05ed2a973372c05f55b048bf99af3d2590dd29f6fd0f379fb451aa0e diff --git a/src/func.c b/src/func.c index 5784b75e2b..c80ac915a7 100644 --- a/src/func.c +++ b/src/func.c @@ -1149,6 +1149,132 @@ void sqlite3QuoteValue(StrAccum *pStr, sqlite3_value *pValue){ } } +/* +** Write a single UTF8 character whose value if v into the +** buffer starting at zOut. Return the number of bytes needed +** to encode that character. +*/ +static int appendOneUtf8Char(char *zOut, u32 v){ + if( v<0x00080 ){ + zOut[0] = (u8)(v & 0xff); + return 1; + } + if( v<0x00800 ){ + zOut[0] = 0xc0 + (u8)((v>>6) & 0x1f); + zOut[1] = 0x80 + (u8)(v & 0x3f); + return 2; + } + if( v<0x10000 ){ + zOut[0] = 0xe0 + (u8)((v>>12) & 0x0f); + zOut[1] = 0x80 + (u8)((v>>6) & 0x3f); + zOut[2] = 0x80 + (u8)(v & 0x3f); + return 3; + } + zOut[0] = 0xf0 + (u8)((v>>18) & 0x07); + zOut[1] = 0x80 + (u8)((v>>12) & 0x3f); + zOut[2] = 0x80 + (u8)((v>>6) & 0x3f); + zOut[3] = 0x80 + (u8)(v & 0x3f); + return 4; +} + +/* +** Return true if z[] begins with N hexadecimal digits, and write +** a decoding of those digits into *pVal. Or return false if any +** one of the first N characters in z[] is not a hexadecimal digit. +*/ +static int isNHex(const char *z, int N, u32 *pVal){ + int i; + int v = 0; + for(i=0; i0 ){ + memmove(&zOut[j], &zIn[i], n); + j += n; + i += n; + } + if( zIn[i+1]=='\\' ){ + i += 2; + zOut[j++] = '\\'; + }else if( sqlite3Isxdigit(zIn[i+1]) ){ + if( !isNHex(&zIn[i+1], 4, &v) ) goto unistr_error; + i += 5; + j += appendOneUtf8Char(&zOut[j], v); + }else if( zIn[i+1]=='+' ){ + if( !isNHex(&zIn[i+2], 6, &v) ) goto unistr_error; + i += 8; + j += appendOneUtf8Char(&zOut[j], v); + }else if( zIn[i+1]=='u' ){ + if( !isNHex(&zIn[i+2], 4, &v) ) goto unistr_error; + i += 6; + j += appendOneUtf8Char(&zOut[j], v); + }else if( zIn[i+1]=='U' ){ + if( !isNHex(&zIn[i+2], 8, &v) ) goto unistr_error; + i += 10; + j += appendOneUtf8Char(&zOut[j], v); + }else{ + goto unistr_error; + } + } + zOut[j] = 0; + sqlite3_result_text64(context, zOut, j, sqlite3_free, SQLITE_UTF8); + return; + +unistr_error: + sqlite3_free(zOut); + sqlite3_result_error(context, "invalid Unicode escape", -1); + return; +} + + /* ** Implementation of the QUOTE() function. ** @@ -2736,6 +2862,7 @@ void sqlite3RegisterBuiltinFunctions(void){ DFUNCTION(sqlite_version, 0, 0, 0, versionFunc ), DFUNCTION(sqlite_source_id, 0, 0, 0, sourceidFunc ), FUNCTION(sqlite_log, 2, 0, 0, errlogFunc ), + FUNCTION(unistr, 1, 0, 0, unistrFunc ), FUNCTION(quote, 1, 0, 0, quoteFunc ), VFUNCTION(last_insert_rowid, 0, 0, 0, last_insert_rowid), VFUNCTION(changes, 0, 0, 0, changes ), From 07ce1820a01c297a82e9e9d0d808356cd6f7d848 Mon Sep 17 00:00:00 2001 From: drh <> Date: Sun, 23 Feb 2025 00:09:24 +0000 Subject: [PATCH 154/194] Enhance the %Q, %q, and %w printf conversions so that if the alternate-form flag # is present, they transform backslash and control characters into unistr()-style backslash escape codes. FossilOrigin-Name: ffbfcc2bbb57f02aa5ee813e7a25a2a014e3353a10f6bccb609075a5b63545d7 --- manifest | 15 ++++++--------- manifest.uuid | 2 +- src/printf.c | 25 ++++++++++++++++++++++++- 3 files changed, 31 insertions(+), 11 deletions(-) diff --git a/manifest b/manifest index 6f0eef751f..73208a8d34 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Prototype\simplementation\sof\sthe\sunistr()\sSQL\sfunction. -D 2025-02-22T23:18:38.072 +C Enhance\sthe\s%Q,\s%q,\sand\s%w\sprintf\sconversions\sso\sthat\sif\sthe\salternate-form\nflag\s#\sis\spresent,\sthey\stransform\sbackslash\sand\scontrol\scharacters\sinto\nunistr()-style\sbackslash\sescape\scodes. +D 2025-02-23T00:09:24.456 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d @@ -777,7 +777,7 @@ F src/pcache.h 1497ce1b823cf00094bb0cf3bac37b345937e6f910890c626b16512316d3abf5 F src/pcache1.c 78d4935e510f7bed0fdd1a3f742c0e663b36a795f9dc7411161dc22bdae1245e F src/pragma.c c7ada272232e1182c4536d9637fa7b955a10bc1bd8d5a87d4dc9309dab827791 F src/prepare.c 1832be043fce7d489959aae6f994c452d023914714c4d5457beaed51c0f3d126 -F src/printf.c b9ac740dfaf68552f5da1266be28ae2824b53a6b73d93425f7c6b2ef62457cbb +F src/printf.c 41f5ccdec1d9db821903e37181b9bf5ecc07748e4b48d99f830edb6433971187 F src/random.c 606b00941a1d7dd09c381d3279a058d771f406c5213c9932bbd93d5587be4b9c F src/resolve.c 626c24b258b111f75c22107aa5614ad89810df3026f5ca071116d3fe75925c75 F src/rowset.c 8432130e6c344b3401a8874c3cb49fefe6873fec593294de077afea2dce5ec97 @@ -2210,11 +2210,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P 742827f049768c4f69ccdfaadfad339aaad3bc126d3a68b90cfea01d825bf7ce -R 487d823b2a97be800308516e5c94d276 -T *branch * unistr -T *sym-unistr * -T -sym-trunk * +P 7cc302de05ed2a973372c05f55b048bf99af3d2590dd29f6fd0f379fb451aa0e +R 4bc2cfded966113e2805f8612a2c2a29 U drh -Z f399533fbf6bd526a1da3885c8fdaf47 +Z 4e1c6c3e8807d851d73b039b2ed1c034 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 080a91b1b8..6d9422e694 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -7cc302de05ed2a973372c05f55b048bf99af3d2590dd29f6fd0f379fb451aa0e +ffbfcc2bbb57f02aa5ee813e7a25a2a014e3353a10f6bccb609075a5b63545d7 diff --git a/src/printf.c b/src/printf.c index 97f93dc157..4f4072243d 100644 --- a/src/printf.c +++ b/src/printf.c @@ -799,6 +799,17 @@ void sqlite3_str_vappendf( while( (escarg[i+1]&0xc0)==0x80 ){ i++; } } } + if( flag_alternateform ){ + /* for %#q, %#Q, and %#w, do unistr()-style backslash escapes for + ** all control characters, and for backslash itself */ + for(k=0; ketBUFSIZE ){ @@ -812,7 +823,19 @@ void sqlite3_str_vappendf( k = i; for(i=0; i=0x10 ? '1' : '0'; + bufpt[j++] = "0123456789abcdef"[ch&0xf]; + } + } } if( needQuote ) bufpt[j++] = q; bufpt[j] = 0; From a3283ec1357ae8a3f5ccaa7537a475d42d53f881 Mon Sep 17 00:00:00 2001 From: drh <> Date: Sun, 23 Feb 2025 11:48:07 +0000 Subject: [PATCH 155/194] The %#Q conversion now adds unistr('...') around the converted string if escape characters were inserted. %#w now works just like %w as escape sequences inside of identifiers are not recognized. FossilOrigin-Name: 997391d42079783e294836f714ccd9526ecc442c8dbf8212d72cd17c67e7158a --- manifest | 12 ++++---- manifest.uuid | 2 +- src/printf.c | 85 +++++++++++++++++++++++++++++++++++---------------- 3 files changed, 66 insertions(+), 33 deletions(-) diff --git a/manifest b/manifest index 73208a8d34..82f49876ad 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Enhance\sthe\s%Q,\s%q,\sand\s%w\sprintf\sconversions\sso\sthat\sif\sthe\salternate-form\nflag\s#\sis\spresent,\sthey\stransform\sbackslash\sand\scontrol\scharacters\sinto\nunistr()-style\sbackslash\sescape\scodes. -D 2025-02-23T00:09:24.456 +C The\s%#Q\sconversion\snow\sadds\sunistr('...')\saround\sthe\sconverted\sstring\sif\nescape\scharacters\swere\sinserted.\s\s%#w\snow\sworks\sjust\slike\s%w\sas\sescape\nsequences\sinside\sof\sidentifiers\sare\snot\srecognized. +D 2025-02-23T11:48:07.678 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d @@ -777,7 +777,7 @@ F src/pcache.h 1497ce1b823cf00094bb0cf3bac37b345937e6f910890c626b16512316d3abf5 F src/pcache1.c 78d4935e510f7bed0fdd1a3f742c0e663b36a795f9dc7411161dc22bdae1245e F src/pragma.c c7ada272232e1182c4536d9637fa7b955a10bc1bd8d5a87d4dc9309dab827791 F src/prepare.c 1832be043fce7d489959aae6f994c452d023914714c4d5457beaed51c0f3d126 -F src/printf.c 41f5ccdec1d9db821903e37181b9bf5ecc07748e4b48d99f830edb6433971187 +F src/printf.c 743e31d168ad01ecc93a7303c07ef5ac741c4b8342b88e7cda428dbd2b4d9844 F src/random.c 606b00941a1d7dd09c381d3279a058d771f406c5213c9932bbd93d5587be4b9c F src/resolve.c 626c24b258b111f75c22107aa5614ad89810df3026f5ca071116d3fe75925c75 F src/rowset.c 8432130e6c344b3401a8874c3cb49fefe6873fec593294de077afea2dce5ec97 @@ -2210,8 +2210,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P 7cc302de05ed2a973372c05f55b048bf99af3d2590dd29f6fd0f379fb451aa0e -R 4bc2cfded966113e2805f8612a2c2a29 +P ffbfcc2bbb57f02aa5ee813e7a25a2a014e3353a10f6bccb609075a5b63545d7 +R b7621246db8a84c2bec12427fadf6f60 U drh -Z 4e1c6c3e8807d851d73b039b2ed1c034 +Z bdb58a5a11dd9515f24e08ce18cb765e # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 6d9422e694..24c7fa98d0 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -ffbfcc2bbb57f02aa5ee813e7a25a2a014e3353a10f6bccb609075a5b63545d7 +997391d42079783e294836f714ccd9526ecc442c8dbf8212d72cd17c67e7158a diff --git a/src/printf.c b/src/printf.c index 4f4072243d..2b4ccf259d 100644 --- a/src/printf.c +++ b/src/printf.c @@ -25,17 +25,17 @@ #define etPERCENT 7 /* Percent symbol. %% */ #define etCHARX 8 /* Characters. %c */ /* The rest are extensions, not normally found in printf() */ -#define etSQLESCAPE 9 /* Strings with '\'' doubled. %q */ -#define etSQLESCAPE2 10 /* Strings with '\'' doubled and enclosed in '', - NULL pointers replaced by SQL NULL. %Q */ -#define etTOKEN 11 /* a pointer to a Token structure */ -#define etSRCITEM 12 /* a pointer to a SrcItem */ -#define etPOINTER 13 /* The %p conversion */ -#define etSQLESCAPE3 14 /* %w -> Strings with '\"' doubled */ -#define etORDINAL 15 /* %r -> 1st, 2nd, 3rd, 4th, etc. English only */ -#define etDECIMAL 16 /* %d or %u, but not %x, %o */ +#define etESCAPE_q 9 /* Strings with '\'' doubled. %q */ +#define etESCAPE_Q 10 /* Strings with '\'' doubled and enclosed in '', + NULL pointers replaced by SQL NULL. %Q */ +#define etTOKEN 11 /* a pointer to a Token structure */ +#define etSRCITEM 12 /* a pointer to a SrcItem */ +#define etPOINTER 13 /* The %p conversion */ +#define etESCAPE_w 14 /* %w -> Strings with '\"' doubled */ +#define etORDINAL 15 /* %r -> 1st, 2nd, 3rd, 4th, etc. English only */ +#define etDECIMAL 16 /* %d or %u, but not %x, %o */ -#define etINVALID 17 /* Any unrecognized conversion type */ +#define etINVALID 17 /* Any unrecognized conversion type */ /* @@ -74,9 +74,9 @@ static const et_info fmtinfo[] = { { 's', 0, 4, etSTRING, 0, 0 }, { 'g', 0, 1, etGENERIC, 30, 0 }, { 'z', 0, 4, etDYNSTRING, 0, 0 }, - { 'q', 0, 4, etSQLESCAPE, 0, 0 }, - { 'Q', 0, 4, etSQLESCAPE2, 0, 0 }, - { 'w', 0, 4, etSQLESCAPE3, 0, 0 }, + { 'q', 0, 4, etESCAPE_q, 0, 0 }, + { 'Q', 0, 4, etESCAPE_Q, 0, 0 }, + { 'w', 0, 4, etESCAPE_w, 0, 0 }, { 'c', 0, 0, etCHARX, 0, 0 }, { 'o', 8, 0, etRADIX, 0, 2 }, { 'u', 10, 0, etDECIMAL, 0, 0 }, @@ -771,14 +771,14 @@ void sqlite3_str_vappendf( while( ii>=0 ) if( (bufpt[ii--] & 0xc0)==0x80 ) width++; } break; - case etSQLESCAPE: /* %q: Escape ' characters */ - case etSQLESCAPE2: /* %Q: Escape ' and enclose in '...' */ - case etSQLESCAPE3: { /* %w: Escape " characters */ + case etESCAPE_q: /* %q: Escape ' characters */ + case etESCAPE_Q: /* %Q: Escape ' and enclose in '...' */ + case etESCAPE_w: { /* %w: Escape " characters */ i64 i, j, k, n; - int needQuote, isnull; + int isnull, needQuote = 0; char ch; - char q = ((xtype==etSQLESCAPE3)?'"':'\''); /* Quote character */ char *escarg; + char q; if( bArgList ){ escarg = getTextArg(pArgList); @@ -786,7 +786,17 @@ void sqlite3_str_vappendf( escarg = va_arg(ap,char*); } isnull = escarg==0; - if( isnull ) escarg = (xtype==etSQLESCAPE2 ? "NULL" : "(NULL)"); + if( xtype==etESCAPE_w ){ + q = '"'; + flag_alternateform = 0; + }else{ + q = '\''; + } + if( isnull ){ + escarg = (xtype==etESCAPE_Q ? "NULL" : "(NULL)"); + }else if( xtype==etESCAPE_Q ){ + needQuote = 1; + } /* For %q, %Q, and %w, the precision is the number of bytes (or ** characters if the ! flags is present) to use from the input. ** Because of the extra quoting characters inserted, the number @@ -800,17 +810,29 @@ void sqlite3_str_vappendf( } } if( flag_alternateform ){ - /* for %#q, %#Q, and %#w, do unistr()-style backslash escapes for - ** all control characters, and for backslash itself */ + /* For %#q, do unistr()-style backslash escapes for + ** all control characters, and for backslash itself. + ** For %#Q, do the same but only if there is at least + ** one control character. */ + u32 nBack = 0; + u32 nCtrl = 0; for(k=0; ketBUFSIZE ){ bufpt = zExtra = printfTempBuf(pAccum, n); @@ -819,7 +841,14 @@ void sqlite3_str_vappendf( bufpt = buf; } j = 0; - if( needQuote ) bufpt[j++] = q; + if( needQuote ){ + if( needQuote==2 ){ + memcpy(&bufpt[j], "unistr('", 8); + j += 8; + }else{ + bufpt[j++] = '\''; + } + } k = i; for(i=0; i=0x10 ? '1' : '0'; @@ -837,7 +867,10 @@ void sqlite3_str_vappendf( } } } - if( needQuote ) bufpt[j++] = q; + if( needQuote ){ + bufpt[j++] = '\''; + if( needQuote==2 ) bufpt[j++] = ')'; + } bufpt[j] = 0; length = j; goto adjust_width_for_utf8; From 43aeed3fec8f1c81f644d6ebe3f6934ff53ffab7 Mon Sep 17 00:00:00 2001 From: stephan Date: Sun, 23 Feb 2025 15:34:05 +0000 Subject: [PATCH 156/194] Internal configure doc cleanups. Apply the [5ecbe7ddc4] unix-on-windows DLL install dir fix to the canonical build. FossilOrigin-Name: 51b9812df9087ec0aa7656178a069ddf2d60dcffa5ab0de57a84bd412b2f71c7 --- autosetup/proj.tcl | 2 +- autosetup/sqlite-config.tcl | 26 ++++++++++++++------------ main.mk | 9 +++++---- manifest | 16 ++++++++-------- manifest.uuid | 2 +- 5 files changed, 29 insertions(+), 26 deletions(-) diff --git a/autosetup/proj.tcl b/autosetup/proj.tcl index 52b410fd6a..edd1b03351 100644 --- a/autosetup/proj.tcl +++ b/autosetup/proj.tcl @@ -1166,7 +1166,7 @@ proc proj-xfer-options-aliases {mapping} { ######################################################################## # Arguable/debatable... # -# When _not_ cross-compiling and CC_FOR_BUILD is _not_ explcitely +# When _not_ cross-compiling and CC_FOR_BUILD is _not_ explicitly # specified, force CC_FOR_BUILD to be the same as CC, so that: # # ./configure CC=clang diff --git a/autosetup/sqlite-config.tcl b/autosetup/sqlite-config.tcl index 003c567ca6..e2e99ef234 100644 --- a/autosetup/sqlite-config.tcl +++ b/autosetup/sqlite-config.tcl @@ -1314,7 +1314,6 @@ proc sqlite-handle-dll-basename {} { # - msys2 packages historically install /usr/lib/libsqlite3.dll.a # despite the DLL being in /usr/bin/msys-sqlite3-0.dll. proc sqlite-handle-out-implib {} { - sqlite-handle-dll-basename define LDFLAGS_OUT_IMPLIB "" define SQLITE_OUT_IMPLIB "" set rc 0 @@ -1367,10 +1366,10 @@ proc sqlite-env-is-unix-on-windows {{envTuple ""}} { # certain platforms, e.g. Mac and "Unix on Windows" platforms (msys2, # cygwin, ...). # -# DLL installation: +# 1) DLL installation: # -# [define]s SQLITE_DLL_INSTALL_RULES to a symbolic name of a set of -# "make install" rules to use for installation of the DLL +# [define]s SQLITE_DLL_INSTALL_RULES to a symbolic name suffix for a +# set of "make install" rules to use for installation of the DLL # deliverable. The makefile is tasked with with providing rules named # install-dll-NAME which runs the installation for that set, as well # as providing a rule named install-dll which resolves to @@ -1379,12 +1378,14 @@ proc sqlite-env-is-unix-on-windows {{envTuple ""}} { # # The default value is "unix-generic". # -# --out-implib: +# 2) --out-implib: # # On platforms where an "import library" is conventionally used but # --out-implib was not explicitly used, automatically add that flag. +# This conventionally applies to the "Unix on Windows" environments +# like msys and cygwin. # -# --dll-basename: +# 3) --dll-basename: # # On the same platforms addressed by --out-implib, if --dll-basename # is not specified, --dll-basename=auto is implied. @@ -1408,7 +1409,7 @@ proc sqlite-handle-env-quirks {} { if {![proj-opt-was-provided out-implib]} { # Imply --out-implib=auto proj-indented-notice [subst -nocommands -nobackslashes { - NOTICE: auto-enabling --out-implib for $host. + NOTICE: auto-enabling --out-implib for environment [$host]. Use --out-implib=none to disable this special case or --out-implib=auto to squelch this notice. }] @@ -1417,13 +1418,14 @@ proc sqlite-handle-env-quirks {} { if {![proj-opt-was-provided dll-basename]} { # Imply --dll-basename=auto proj-indented-notice [subst -nocommands -nobackslashes { - NOTICE: auto-enabling --dll-basename for $host. + NOTICE: auto-enabling --dll-basename for environment [$host]. Use --dll-basename=default to disable this special case or --dll-basename=auto to squelch this notice. }] proj-opt-set dll-basename auto } } + sqlite-handle-dll-basename sqlite-handle-out-implib sqlite-handle-mac-cversion } @@ -1696,9 +1698,9 @@ proc sqlite-check-tcl {} { proj-fatal "No tclConfig.sh found under ${with_tcl}" } } else { - # If we have not yet found a tclConfig.sh file, look in - # $libdir which is set automatically by autosetup or by the - # --prefix command-line option. See + # If we have not yet found a tclConfig.sh file, look in $libdir + # which is set automatically by autosetup or via the --prefix + # command-line option. See # https://sqlite.org/forum/forumpost/e04e693439a22457 set libdir [get-define libdir] if {[file readable "${libdir}/tclConfig.sh"]} { @@ -1884,7 +1886,7 @@ proc sqlite-determine-codegen-tcl {} { } define BTCLSH "\$(TCLSH_CMD)" } - }; # CC swap-out + }; # /define-push $flagsToRestore return $cgtcl }; # sqlite-determine-codegen-tcl diff --git a/main.mk b/main.mk index 007061e0ad..839d29af9e 100644 --- a/main.mk +++ b/main.mk @@ -1452,6 +1452,8 @@ $(libsqlite3.DLL)-0 $(libsqlite3.DLL)-: so: $(libsqlite3.DLL)-$(ENABLE_LIB_SHARED) all: so +# +# DLL installation... # # On most Unix-like platforms, install the $(libsqlite3.DLL) as # $(libsqlite3.DLL).$(PACKAGE_VERSION) and create symlinks which point @@ -1461,9 +1463,8 @@ all: so # - libsqlite3.so.0 =symlink-> libsqlite3.so.$(PACKAGE_VERSION) (see below) # - libsqlite3.so =symlink-> libsqlite3.so.3 # -# The symlinks are not added on platforms where $(T.dll) is ".dll", -# and different transformations take place on platforms where $(T.dll) -# is ".dylib". +# Different rules apply for platforms where $(T.dll)==.dylib and for +# the "Unix on Windows" environments. # # The link named libsqlite3.so.0 is provided in an attempt to reduce # downstream disruption when performing upgrades from pre-3.48 to a @@ -1526,7 +1527,7 @@ install-dll-unix-generic: install-dll-out-implib ls -la $(libsqlite3.DLL).0.8.6; \ fi -install-dll-msys: install-dll-out-implib +install-dll-msys: install-dll-out-implib $(install-dir.bin) $(INSTALL) $(libsqlite3.DLL) "$(install-dir.bin)" # ----------------------------------------------^^^ yes, bin install-dll-mingw: install-dll-msys diff --git a/manifest b/manifest index 02ed307402..e96c6d43b2 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Update\sthe\shelp\stext\sto\saccount\sfor\s[35b1c32f80b9]. -D 2025-02-22T17:33:18.554 +C Internal\sconfigure\sdoc\scleanups.\sApply\sthe\s[5ecbe7ddc4]\sunix-on-windows\sDLL\sinstall\sdir\sfix\sto\sthe\scanonical\sbuild. +D 2025-02-23T15:34:05.604 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d @@ -49,8 +49,8 @@ F autosetup/cc-shared.tcl 4f024e94a47f427ba61de1739f6381ef0080210f9fae89112d5c1d F autosetup/cc.tcl c0fcc50ca91deff8741e449ddad05bcd08268bc31177e613a6343bbd1fd3e45f F autosetup/jimsh0.c 6573f6bc6ff204de0139692648d7037ca0b6c067bac83a7b4e087f20a86866a4 F autosetup/pkg-config.tcl 4e635bf39022ff65e0d5434339dd41503ea48fc53822c9c5bde88b02d3d952ba -F autosetup/proj.tcl 04fd2d110b6464f7a2847380a39bed647c2646a868a4ed60f7a625e52a9a8b20 -F autosetup/sqlite-config.tcl 8cd7b6963d2d6561595389171c4d7495b61095706df9ad80e677c9920da10680 +F autosetup/proj.tcl 9b5d7b984cbbbdcc5388a80cd3f8149c79fe135a69f6ef067dbce5cae6edcc77 +F autosetup/sqlite-config.tcl caf7f974d69b90fd6d53f6ffaae4fb468e9f44d4b23764fd8245b9ba36f64bb9 F autosetup/system.tcl 51d4be76cd9a9074704b584e5c9cbba616202c8468cf9ba8a4f8294a7ab1dba9 F configure 9a00b21dfd13757bbfb8d89b30660a89ec1f8f3a79402b8f9f9b6fc475c3303a x F contrib/sqlitecon.tcl 210a913ad63f9f991070821e599d600bd913e0ad @@ -705,7 +705,7 @@ F ext/wasm/tests/opfs/sahpool/sahpool-pausing.js f264925cfc82155de38cecb3d204c36 F ext/wasm/tests/opfs/sahpool/sahpool-worker.js bd25a43fc2ab2d1bafd8f2854ad3943ef673f7c3be03e95ecf1612ff6e8e2a61 F ext/wasm/wasmfs.make 68999f5bd8c489239592d59a420f8c627c99169bbd6fa16a404751f757b9f702 F magic.txt 5ade0bc977aa135e79e3faaea894d5671b26107cc91e70783aa7dc83f22f3ba0 -F main.mk adfc8d55db64c8dd3e89c74611c2f8be15b204b68338133763df8eb8d7faa344 +F main.mk 4be69e88cfe2fb9091a07ad5debaaac7bf15fcbd373ade62146440606aa42344 F mptest/config01.test 3c6adcbc50b991866855f1977ff172eb6d901271 F mptest/config02.test 4415dfe36c48785f751e16e32c20b077c28ae504 F mptest/crash01.test 61e61469e257df0850df4293d7d4d6c2af301421 @@ -2210,8 +2210,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P 35b1c32f80b9aed04776508683a1828fd5777ee8bb0e42e593557ae3cca558e4 -R 44a6434da0b2aec6a0e3c6807bb35211 +P f2e7355d87450f9a4d98390cf9d830e9902105048f9308e02c597190ecf2a594 +R fffbf6acb18ecfeac90b7b2e01746be5 U stephan -Z e1feccfa91581cfed3261c34760f8a9d +Z 91c7527af047fb17603dad8a953d6c86 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 27fbc1ee3e..4d0f7f6be2 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -f2e7355d87450f9a4d98390cf9d830e9902105048f9308e02c597190ecf2a594 +51b9812df9087ec0aa7656178a069ddf2d60dcffa5ab0de57a84bd412b2f71c7 From 7b90beebd5dcdb6c2487f803989567584f16f3cb Mon Sep 17 00:00:00 2001 From: stephan Date: Sun, 23 Feb 2025 17:24:55 +0000 Subject: [PATCH 157/194] Internal cleanups to how certain linker flags are tested. FossilOrigin-Name: 6743e3e5b87f1d2308ec8cebef3c7ecccddafdace107630e0d8feee2b089d105 --- Makefile.in | 3 ++- autosetup/proj.tcl | 51 ++++++++++++++++++++++++++++--------- autosetup/sqlite-config.tcl | 4 +-- main.mk | 3 ++- manifest | 18 ++++++------- manifest.uuid | 2 +- 6 files changed, 55 insertions(+), 26 deletions(-) diff --git a/Makefile.in b/Makefile.in index b836bf5d3d..7926aa84dd 100644 --- a/Makefile.in +++ b/Makefile.in @@ -79,7 +79,7 @@ libdir = @libdir@ INSTALL = @BIN_INSTALL@ AR = @AR@ -AR.flags = cr # TODO? Add a configure test to determine this? +AR.flags = cr CC = @CC@ B.cc = @CC_FOR_BUILD@ @BUILD_CFLAGS@ T.cc = $(CC) @@ -129,6 +129,7 @@ LDFLAGS.libsqlite3.os-specific = @LDFLAGS_MAC_CVERSION@ @LDFLAGS_OUT_IMPLIB@ libsqlite3.DLL.basename = @SQLITE_DLL_BASENAME@ # DLL.basename: see https://sqlite.org/forum/forumpost/828fdfe904 libsqlite3.out.implib = @SQLITE_OUT_IMPLIB@ +# libsqlite3.out.implib => the output filename part of LDFLAGS_OUT_IMPLIB. ENABLE_LIB_SHARED = @ENABLE_LIB_SHARED@ ENABLE_LIB_STATIC = @ENABLE_LIB_STATIC@ HAVE_WASI_SDK = @HAVE_WASI_SDK@ diff --git a/autosetup/proj.tcl b/autosetup/proj.tcl index edd1b03351..94e940a72d 100644 --- a/autosetup/proj.tcl +++ b/autosetup/proj.tcl @@ -941,6 +941,35 @@ proc proj-check-emsdk {} { return $rc } +######################################################################## +# @proj-cc-check-Wl-flag ?flag ?args?? +# +# Checks whether the given linker flag (and optional arguments) can be +# passed from the compiler to the linker using one of these formats: +# +# - -Wl,flag[,arg1[,...argN]] +# - -Wl,flag -Wl,arg1 ...-Wl,argN +# +# If so, that flag string is returned, else an empty string is +# returned. +proc proj-cc-check-Wl-flag {args} { + cc-with {-link 1} { + # Try -Wl,flag,...args + set fli "-Wl" + foreach f $args { append fli ",$f" } + if {[cc-check-flags $fli]} { + return $fli + } + # Try -Wl,flag -Wl,arg1 ...-Wl,argN + set fli "" + foreach f $args { append fli "-Wl,$f " } + if {[cc-check-flags $fli]} { + return [string trim $fli] + } + return "" + } +} + ######################################################################## # @proj-check-rpath # @@ -966,14 +995,12 @@ proc proj-check-rpath {} { cc-with {-link 1} { if {[cc-check-flags "-rpath $lp"]} { define LDFLAGS_RPATH "-rpath $lp" - } elseif {[cc-check-flags "-Wl,-rpath,$lp"]} { - define LDFLAGS_RPATH "-Wl,-rpath,$lp" - } elseif {[cc-check-flags "-Wl,-rpath -Wl,$lp"]} { - define LDFLAGS_RPATH "-Wl,-rpath -Wl,$lp" - } elseif {[cc-check-flags -Wl,-R$lp]} { - define LDFLAGS_RPATH "-Wl,-R$lp" } else { - define LDFLAGS_RPATH "" + set wl [proj-cc-check-Wl-flag -rpath $lp] + if {"" eq $wl} { + set wl [proj-cc-check-Wl-flag -R$lp] + } + define LDFLAGS_RPATH $wl } } expr {"" ne [get-define LDFLAGS_RPATH]} @@ -1219,11 +1246,11 @@ proc proj-which-linenoise {dotH} { # # In that make invocation, $(libdir) would, at make-time, normally be # hard-coded to /foo/lib, rather than /blah/lib. That happens because -# the autosetup exports conventional $prefix-based values for the -# numerous autoconfig-compatible XYZdir vars at configure-time. What -# we would normally want, however, is that --libdir derives from the -# make-time $(prefix). The distinction between configure-time and -# make-time is the significant factor there. +# autosetup exports conventional $prefix-based values for the numerous +# autoconfig-compatible XYZdir vars at configure-time. What we would +# normally want, however, is that --libdir derives from the make-time +# $(prefix). The distinction between configure-time and make-time is +# the significant factor there. # # This function attempts to reconcile those vars in such a way that # they will derive, at make-time, from $(prefix) in a conventional diff --git a/autosetup/sqlite-config.tcl b/autosetup/sqlite-config.tcl index e2e99ef234..a0e197be74 100644 --- a/autosetup/sqlite-config.tcl +++ b/autosetup/sqlite-config.tcl @@ -1325,8 +1325,8 @@ proc sqlite-handle-out-implib {} { if {$olBaseName ne "none"} { cc-with {-link 1} { set dll "${olBaseName}[get-define TARGET_DLLEXT]" - set flags "-Wl,--out-implib,${dll}.a" - if {[cc-check-flags $flags]} { + set flags [proj-cc-check-Wl-flag --out-implib ${dll}.a] + if {"" ne $flags} { define LDFLAGS_OUT_IMPLIB $flags define SQLITE_OUT_IMPLIB ${dll}.a set rc 1 diff --git a/main.mk b/main.mk index 839d29af9e..e83f354de7 100644 --- a/main.mk +++ b/main.mk @@ -1068,7 +1068,8 @@ libsqlite3.DLL = $(libsqlite3.DLL.basename)$(T.dll) # libsqlite3.out.implib => "import library" file generated by the # --out-implib linker flag. Not commonly used on Unix systems but is # on the Windows-side Unix-esque environments and typically as a value -# of "libsqlite3.dll.a". +# of "libsqlite3.dll.a". It is expected to match the filename, if any, +# provided by the -Wl,--out-implib,FILENAME flag. # libsqlite3.out.implib ?= # diff --git a/manifest b/manifest index e96c6d43b2..b729d4efc7 100644 --- a/manifest +++ b/manifest @@ -1,9 +1,9 @@ -C Internal\sconfigure\sdoc\scleanups.\sApply\sthe\s[5ecbe7ddc4]\sunix-on-windows\sDLL\sinstall\sdir\sfix\sto\sthe\scanonical\sbuild. -D 2025-02-23T15:34:05.604 +C Internal\scleanups\sto\show\scertain\slinker\sflags\sare\stested. +D 2025-02-23T17:24:55.929 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d -F Makefile.in 18fe2ad1e0da1fc98843d53c48a5ee7e180eacccdae532e1bad9f95d4fabde7d +F Makefile.in 4ff9b301b59c66ef9d11c8d133cc62e09173bad4abc7d5eb801e45d5527f8fe6 F Makefile.linux-generic bd3e3cacd369821a6241d4ea1967395c962dfe3057e38cb0a435cee0e8b789d0 F Makefile.msc 50c656e096ae49ccf9e5e88b4995f0a155f231ebae5b6d185cc64ce99d728a83 F README.md c3c0f19532ce28f6297a71870f3c7b424729f0e6d9ab889616d3587dd2332159 @@ -49,8 +49,8 @@ F autosetup/cc-shared.tcl 4f024e94a47f427ba61de1739f6381ef0080210f9fae89112d5c1d F autosetup/cc.tcl c0fcc50ca91deff8741e449ddad05bcd08268bc31177e613a6343bbd1fd3e45f F autosetup/jimsh0.c 6573f6bc6ff204de0139692648d7037ca0b6c067bac83a7b4e087f20a86866a4 F autosetup/pkg-config.tcl 4e635bf39022ff65e0d5434339dd41503ea48fc53822c9c5bde88b02d3d952ba -F autosetup/proj.tcl 9b5d7b984cbbbdcc5388a80cd3f8149c79fe135a69f6ef067dbce5cae6edcc77 -F autosetup/sqlite-config.tcl caf7f974d69b90fd6d53f6ffaae4fb468e9f44d4b23764fd8245b9ba36f64bb9 +F autosetup/proj.tcl cc300c15633cb2835eb52c235c5abfd2de0e8e989e9b650e82df3c1d3b856d22 +F autosetup/sqlite-config.tcl 6e25eed0ccf045d3593b18dab090bc6c9c787d966499c37561087733f91c7d5f F autosetup/system.tcl 51d4be76cd9a9074704b584e5c9cbba616202c8468cf9ba8a4f8294a7ab1dba9 F configure 9a00b21dfd13757bbfb8d89b30660a89ec1f8f3a79402b8f9f9b6fc475c3303a x F contrib/sqlitecon.tcl 210a913ad63f9f991070821e599d600bd913e0ad @@ -705,7 +705,7 @@ F ext/wasm/tests/opfs/sahpool/sahpool-pausing.js f264925cfc82155de38cecb3d204c36 F ext/wasm/tests/opfs/sahpool/sahpool-worker.js bd25a43fc2ab2d1bafd8f2854ad3943ef673f7c3be03e95ecf1612ff6e8e2a61 F ext/wasm/wasmfs.make 68999f5bd8c489239592d59a420f8c627c99169bbd6fa16a404751f757b9f702 F magic.txt 5ade0bc977aa135e79e3faaea894d5671b26107cc91e70783aa7dc83f22f3ba0 -F main.mk 4be69e88cfe2fb9091a07ad5debaaac7bf15fcbd373ade62146440606aa42344 +F main.mk 2c93ed0030ef1a3ac2c7e40d619ae46771556b396bf5f9b0abac445a8026b3cb F mptest/config01.test 3c6adcbc50b991866855f1977ff172eb6d901271 F mptest/config02.test 4415dfe36c48785f751e16e32c20b077c28ae504 F mptest/crash01.test 61e61469e257df0850df4293d7d4d6c2af301421 @@ -2210,8 +2210,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P f2e7355d87450f9a4d98390cf9d830e9902105048f9308e02c597190ecf2a594 -R fffbf6acb18ecfeac90b7b2e01746be5 +P 51b9812df9087ec0aa7656178a069ddf2d60dcffa5ab0de57a84bd412b2f71c7 +R 15336fe4227f08479deb26ef0e52e0d5 U stephan -Z 91c7527af047fb17603dad8a953d6c86 +Z d5c8e4d30229fa6cfc71221c7f3f2246 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 4d0f7f6be2..b2825f915f 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -51b9812df9087ec0aa7656178a069ddf2d60dcffa5ab0de57a84bd412b2f71c7 +6743e3e5b87f1d2308ec8cebef3c7ecccddafdace107630e0d8feee2b089d105 From 8f2e95fa6c0279d405d72cd3f0e106bf514f0545 Mon Sep 17 00:00:00 2001 From: stephan Date: Sun, 23 Feb 2025 17:55:41 +0000 Subject: [PATCH 158/194] Add (disabled) infrastructure for disabling use of the rpath linker flag. This is a proactive precautionary measure because how the rpath is used does not match up with what the unix-on-windows environments do with their DLLs. FossilOrigin-Name: 38ba8e837c2679f12a4019612f7188cb4afffd43cef7af4a4aa02e62c20885ac --- auto.def | 2 +- autoconf/auto.def | 2 +- autosetup/sqlite-config.tcl | 12 ++++++++++++ manifest | 16 ++++++++-------- manifest.uuid | 2 +- 5 files changed, 23 insertions(+), 11 deletions(-) diff --git a/auto.def b/auto.def index 0b89ab1890..6dab95eaa0 100644 --- a/auto.def +++ b/auto.def @@ -59,7 +59,7 @@ proj-define-for-opt linemacros AMALGAMATION_LINE_MACROS \ define LINK_TOOLS_DYNAMICALLY [proj-opt-was-provided dynlink-tools] -proj-check-rpath +sqlite-handle-rpath sqlite-handle-soname sqlite-handle-debug sqlite-handle-tcl diff --git a/autoconf/auto.def b/autoconf/auto.def index 099b52aff7..069f3e931f 100644 --- a/autoconf/auto.def +++ b/autoconf/auto.def @@ -11,7 +11,7 @@ use sqlite-config sqlite-config-bootstrap autoconf sqlite-check-common-bins sqlite-check-common-system-deps -proj-check-rpath +sqlite-handle-rpath sqlite-handle-soname sqlite-setup-default-cflags sqlite-handle-debug diff --git a/autosetup/sqlite-config.tcl b/autosetup/sqlite-config.tcl index a0e197be74..d32119e755 100644 --- a/autosetup/sqlite-config.tcl +++ b/autosetup/sqlite-config.tcl @@ -249,6 +249,7 @@ proc sqlite-config-bootstrap {buildMode} { => {Link the sqlite3 shell app against the DLL instead of embedding sqlite3.c} } {*} { + #rpath=1 => {Disable use of the rpath linker flag} # soname: https://sqlite.org/src/forumpost/5a3b44f510df8ded soname:=legacy => {SONAME for libsqlite3.so. "none", or not using this flag, sets no @@ -1897,6 +1898,17 @@ proc sqlite-handle-tcl {} { msg-result "TCL for code generation: [sqlite-determine-codegen-tcl]" } +######################################################################## +# Handle the --enable/disable-rpath flag. +proc sqlite-handle-rpath {} { +# if {[proj-opt-truthy rpath]} { + proj-check-rpath +# } else { +# msg-result "Disabling use of rpath." +# define LDFLAGS_RPATH "" +# } +} + ######################################################################## # If the --dump-defines configure flag is provided then emit a list of # all [define] values to config.defines.txt, else do nothing. diff --git a/manifest b/manifest index b729d4efc7..6b1eb30ec4 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Internal\scleanups\sto\show\scertain\slinker\sflags\sare\stested. -D 2025-02-23T17:24:55.929 +C Add\s(disabled)\sinfrastructure\sfor\sdisabling\suse\sof\sthe\srpath\slinker\sflag.\sThis\sis\sa\sproactive\sprecautionary\smeasure\sbecause\show\sthe\srpath\sis\sused\sdoes\snot\smatch\sup\swith\swhat\sthe\sunix-on-windows\senvironments\sdo\swith\stheir\sDLLs. +D 2025-02-23T17:55:41.504 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d @@ -14,13 +14,13 @@ F art/sqlite370.eps aa97a671332b432a54e1d74ff5e8775be34200c2 F art/sqlite370.ico af56c1d00fee7cd4753e8631ed60703ed0fc6e90 F art/sqlite370.jpg d512473dae7e378a67e28ff96a34da7cb331def2 F art/sqlite370.svg 40b7e2fe8aac3add5d56dd86ab8d427a4eca5bcb3fe4f8946cb3794e1821d531 -F auto.def 3875d07903dde3aadf396ce008b7eee2fec3aa61843d745b4fb574ce3797b2ac +F auto.def 37cd272e5a2179b4ae99511a0c70e724b24720ccb69e8238d800b52106537782 F autoconf/Makefile.fallback 22fe523eb36dfce31e0f6349f782eb084e86a5620b2b0b4f84a2d6133f53f5ac F autoconf/Makefile.in d4bc4b3e0680c9f9cd8633279e597abb5f29fa58f29950e49dbf359e1c553720 F autoconf/Makefile.msc 1249e425a24859c7b3f17575275247df9eec3bddc0d1d7e73941f1abdbb95a92 F autoconf/README.first f1d3876e9a7852c22f275a6f06814e64934cecbc0b5b9617d64849094c1fd136 F autoconf/README.txt 7f01dc3915e2d68f329011073662369e62a0938a2c69398807823c57591cb288 -F autoconf/auto.def 3a318c4898024b35ed61a4876a42e3dcc313f93bd8486874d1ad498b88643d1a +F autoconf/auto.def 64c1a116162da18783a5467b49e539538f7013ea50ae192f182987b5c2f66f9e F autoconf/tea/Makefile.in ba0556fee8da09c066bad85a4457904e46ee2c2eabaa309c0e83a78f2f151a8e F autoconf/tea/README.txt 61e62e519579e4a112791354d6d440f8b51ea6db3b0bab58d59f29df42d2dfe3 F autoconf/tea/aclocal.m4 52c47aac44ce0ddb1f918b6993e8beb8eee88f43 @@ -50,7 +50,7 @@ F autosetup/cc.tcl c0fcc50ca91deff8741e449ddad05bcd08268bc31177e613a6343bbd1fd3e F autosetup/jimsh0.c 6573f6bc6ff204de0139692648d7037ca0b6c067bac83a7b4e087f20a86866a4 F autosetup/pkg-config.tcl 4e635bf39022ff65e0d5434339dd41503ea48fc53822c9c5bde88b02d3d952ba F autosetup/proj.tcl cc300c15633cb2835eb52c235c5abfd2de0e8e989e9b650e82df3c1d3b856d22 -F autosetup/sqlite-config.tcl 6e25eed0ccf045d3593b18dab090bc6c9c787d966499c37561087733f91c7d5f +F autosetup/sqlite-config.tcl ecdf12a482eb4779e7af48f917d31742ea881ad4ab989518c83e3400d9f8106f F autosetup/system.tcl 51d4be76cd9a9074704b584e5c9cbba616202c8468cf9ba8a4f8294a7ab1dba9 F configure 9a00b21dfd13757bbfb8d89b30660a89ec1f8f3a79402b8f9f9b6fc475c3303a x F contrib/sqlitecon.tcl 210a913ad63f9f991070821e599d600bd913e0ad @@ -2210,8 +2210,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P 51b9812df9087ec0aa7656178a069ddf2d60dcffa5ab0de57a84bd412b2f71c7 -R 15336fe4227f08479deb26ef0e52e0d5 +P 6743e3e5b87f1d2308ec8cebef3c7ecccddafdace107630e0d8feee2b089d105 +R 7d127e615bad8c717008fb489a6a8fc9 U stephan -Z d5c8e4d30229fa6cfc71221c7f3f2246 +Z 0e93340d6bf9288ab7f192200f1e64eb # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index b2825f915f..66386092c6 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -6743e3e5b87f1d2308ec8cebef3c7ecccddafdace107630e0d8feee2b089d105 +38ba8e837c2679f12a4019612f7188cb4afffd43cef7af4a4aa02e62c20885ac From 8d15d7ed68a96a214a57b394dcb61646011417f2 Mon Sep 17 00:00:00 2001 From: drh <> Date: Sun, 23 Feb 2025 20:20:56 +0000 Subject: [PATCH 159/194] Work toward VT100-safe output from the CLI by default. FossilOrigin-Name: 44c44620e8648a4265053f194e32b3a5c65d25b4f1fff61ef9b944e7cb0ed624 --- manifest | 14 ++--- manifest.uuid | 2 +- src/shell.c.in | 135 ++++++++++++++++++++++++++++++++++++++++++++--- test/shell1.test | 2 +- 4 files changed, 136 insertions(+), 17 deletions(-) diff --git a/manifest b/manifest index 82f49876ad..bb780263ec 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C The\s%#Q\sconversion\snow\sadds\sunistr('...')\saround\sthe\sconverted\sstring\sif\nescape\scharacters\swere\sinserted.\s\s%#w\snow\sworks\sjust\slike\s%w\sas\sescape\nsequences\sinside\sof\sidentifiers\sare\snot\srecognized. -D 2025-02-23T11:48:07.678 +C Work\stoward\sVT100-safe\soutput\sfrom\sthe\sCLI\sby\sdefault. +D 2025-02-23T20:20:56.015 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d @@ -782,7 +782,7 @@ F src/random.c 606b00941a1d7dd09c381d3279a058d771f406c5213c9932bbd93d5587be4b9c F src/resolve.c 626c24b258b111f75c22107aa5614ad89810df3026f5ca071116d3fe75925c75 F src/rowset.c 8432130e6c344b3401a8874c3cb49fefe6873fec593294de077afea2dce5ec97 F src/select.c a076f7db3a0fcbd9f710d7746cfc07e0b3baadee45eb3136bedc29c598ef8f1c -F src/shell.c.in bf997e43faaa1ef0ff78d4d7b9be6a9430cf1edda9a47a14e7fef646fcb459af +F src/shell.c.in b1ee6353204a6b543a9e07d44339473db5d3b71c63ca05bbb452391948b66682 F src/sqlite.h.in 8d4486fb28a90de818ac1e8c6206ea458e7de6bd8e0dfa3d554494f155be8c01 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8 F src/sqlite3ext.h 3f046c04ea3595d6bfda99b781926b17e672fd6d27da2ba6d8d8fc39981dcb54 @@ -1638,7 +1638,7 @@ F test/sharedA.test 64bdd21216dda2c6a3bd3475348ccdc108160f34682c97f2f51c19fc0e21 F test/sharedB.test 1a84863d7a2204e0d42f2e1606577c5e92e4473fa37ea0f5bdf829e4bf8ee707 F test/shared_err.test 32634e404a3317eeb94abc7a099c556a346fdb8fb3858dbe222a4cbb8926a939 F test/sharedlock.test 5ede3c37439067c43b0198f580fd374ebf15d304 -F test/shell1.test 5d84e415adf7cc4edd5913c4f23c761104ff135b9c190fcf7b430a4cbca6cb65 +F test/shell1.test 069ad46cc5e576207e684168777b9d093ad419f4573ea96c47cba9d97b344ba9 F test/shell2.test 01a01f76ed98088ce598794fbf5b359e148271541a8ddbf79d21cc353cc67a24 F test/shell3.test db1953a8e59d08e9240b7cc5948878e184f7eb2623591587f8fd1f1a5bd536d8 F test/shell4.test 522fdc628c55eff697b061504fb0a9e4e6dfc5d9087a633ab0f3dd11bcc4f807 @@ -2210,8 +2210,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P ffbfcc2bbb57f02aa5ee813e7a25a2a014e3353a10f6bccb609075a5b63545d7 -R b7621246db8a84c2bec12427fadf6f60 +P 997391d42079783e294836f714ccd9526ecc442c8dbf8212d72cd17c67e7158a +R fb09ed0e2944dd462b4d95bf157b726f U drh -Z bdb58a5a11dd9515f24e08ce18cb765e +Z 547baf0b0b8287880898ad372e983fdc # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 24c7fa98d0..2b72ba5769 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -997391d42079783e294836f714ccd9526ecc442c8dbf8212d72cd17c67e7158a +44c44620e8648a4265053f194e32b3a5c65d25b4f1fff61ef9b944e7cb0ed624 diff --git a/src/shell.c.in b/src/shell.c.in index f12d360b9b..a8ea0dd2ad 100644 --- a/src/shell.c.in +++ b/src/shell.c.in @@ -1446,6 +1446,7 @@ struct ShellState { u8 bSafeModePersist; /* The long-term value of bSafeMode */ u8 eRestoreState; /* See comments above doAutoDetectRestore() */ u8 crlfMode; /* Do NL-to-CRLF translations when enabled (maybe) */ + u8 eEscMode; /* Escape mode for text output */ ColModeOpts cmOpts; /* Option values affecting columnar mode output */ unsigned statsOn; /* True to display memory stats before each finalize */ unsigned mEqpLines; /* Mask of vertical lines in the EQP output graph */ @@ -1546,6 +1547,11 @@ static ShellState shellState; ** top-level SQL statement */ #define SHELL_PROGRESS_ONCE 0x04 /* Cancel the --limit after firing once */ +/* Allowed values for ShellState.eEscMode +*/ +#define SHELL_ESC_GRAPHIC 0 /* Substitute U+2400 graphics */ +#define SHELL_ESC_OFF 1 /* Send characters verbatim */ + /* ** These are the allowed shellFlgs values */ @@ -2154,6 +2160,84 @@ static void output_json_string(FILE *out, const char *z, i64 n){ sqlite3_fputs(zq, out); } +/* +** Escape the input string if it is needed and in accordance with +** eEscMode. +** +** Escaping is needed if the string contains any control characters +** other than \t, \n, and \r\n +** +** If no escaping is needed (the common case) then set *ppFree to NULL +** and return the original string. If escapingn is needed, write the +** escaped string into memory obtained from sqlite3_malloc64() or the +** equivalent, and return the new string and set *ppFree to the new string +** as well. +** +** The caller is responsible for freeing *ppFree if it is non-NULL in order +** to reclaim memory. +*/ +static const char *escapeOutput( + ShellState *p, + const char *zInX, + char **ppFree +){ + i64 i, j; + i64 nCtrl = 0; + unsigned char *zIn; + unsigned char c; + unsigned char *zOut; + + + /* No escaping if disabled */ + if( p->eEscMode==SHELL_ESC_OFF ){ + *ppFree = 0; + return zInX; + } + + /* Count the number of control characters in the string. */ + zIn = (unsigned char*)zInX; + for(i=0; (c = zIn[i])!=0; i++){ + if( c<=0x1f + && c!='\t' + && c!='\n' + && (c!='\r' || zIn[i+1]!='\n') + ){ + nCtrl++; + } + } + if( nCtrl==0 ){ + *ppFree = 0; + return zInX; + } + zOut = sqlite3_malloc64( i + 2*nCtrl + 1 ); + shell_check_oom(zOut); + for(i=j=0; (c = zIn[i])!=0; i++){ + if( c>0x1f + || c=='\t' + || c=='\n' + || (c=='\r' && zIn[i+1]=='\n') + ){ + continue; + } + if( i>0 ){ + memcpy(&zOut[j], zIn, i); + j += i; + } + zIn += i+1; + i = -1; + zOut[j++] = 0xe2; + zOut[j++] = 0x90; + zOut[j++] = 0x80+c; + } + if( i>0 ){ + memcpy(&zOut[j], zIn, i); + j += i; + } + zOut[j] = 0; + *ppFree = (char*)zOut; + return (char*)zOut; +} + /* ** Output the given string with characters that are special to ** HTML escaped. @@ -2597,8 +2681,12 @@ static int shell_callback( } if( p->cnt++>0 ) sqlite3_fputs(p->rowSeparator, p->out); for(i=0; inullValue, &pFree); sqlite3_fprintf(p->out, "%*s = %s%s", w, azCol[i], - azArg[i] ? azArg[i] : p->nullValue, p->rowSeparator); + pDisplay, p->rowSeparator); + if( pFree ) sqlite3_free(pFree); } break; } @@ -2730,15 +2818,23 @@ static int shell_callback( case MODE_List: { if( p->cnt++==0 && p->showHeader ){ for(i=0; iout, "%s%s", azCol[i], + char *z = azCol[i]; + char *pFree; + const char *zOut = escapeOutput(p, z, &pFree); + sqlite3_fprintf(p->out, "%s%s", zOut, i==nArg-1 ? p->rowSeparator : p->colSeparator); + if( pFree ) sqlite3_free(pFree); } } if( azArg==0 ) break; for(i=0; inullValue; - sqlite3_fputs(z, p->out); + zOut = escapeOutput(p, z, &pFree); + sqlite3_fputs(zOut, p->out); + if( pFree ) sqlite3_free(pFree); sqlite3_fputs((icolSeparator : p->rowSeparator, p->out); } break; @@ -3891,6 +3987,7 @@ static char *translateForDisplayAndDup( j++; continue; } + if( c==0 || c=='\n' || (c=='\r' && z[i+1]=='\n') ) break; if( c=='\t' ){ do{ n++; @@ -3899,7 +3996,9 @@ static char *translateForDisplayAndDup( i++; continue; } - break; + n++; + j += 3; + i++; } if( n>=mxWidth && bWordWrap ){ /* Perhaps try to back up to a better place to break the line */ @@ -3946,6 +4045,7 @@ static char *translateForDisplayAndDup( zOut[j++] = z[i++]; continue; } + if( c==0 ) break; if( z[i]=='\t' ){ do{ n++; @@ -3954,7 +4054,10 @@ static char *translateForDisplayAndDup( i++; continue; } - break; + zOut[j++] = 0xe2; + zOut[j++] = 0x90; + zOut[j++] = 0x80 + c; + i++; } zOut[j] = 0; return (char*)zOut; @@ -9792,6 +9895,10 @@ static int do_meta_command(char *zLine, ShellState *p){ cmOpts.bQuote = 1; }else if( optionMatch(z,"noquote") ){ cmOpts.bQuote = 0; + }else if( optionMatch(z,"escape") ){ + p->eEscMode = SHELL_ESC_GRAPHIC; + }else if( optionMatch(z,"noescape") ){ + p->eEscMode = SHELL_ESC_OFF; }else if( zMode==0 ){ zMode = z; /* Apply defaults for qbox pseudo-mode. If that @@ -9825,13 +9932,19 @@ static int do_meta_command(char *zLine, ShellState *p){ || (p->mode>=MODE_Markdown && p->mode<=MODE_Box) ){ sqlite3_fprintf(p->out, - "current output mode: %s --wrap %d --wordwrap %s --%squote\n", + "current output mode: %s --wrap %d --wordwrap %s " + "--%squote --%sescape\n", modeDescr[p->mode], p->cmOpts.iWrap, p->cmOpts.bWordWrap ? "on" : "off", - p->cmOpts.bQuote ? "" : "no"); + p->cmOpts.bQuote ? "" : "no", + p->eEscMode ? "no" : "" + ); }else{ sqlite3_fprintf(p->out, - "current output mode: %s\n", modeDescr[p->mode]); + "current output mode: %s --%sescape\n", + modeDescr[p->mode], + p->eEscMode ? "no" : "" + ); } zMode = modeDescr[p->mode]; } @@ -12586,6 +12699,7 @@ static const char zOptions[] = " -deserialize open the database using sqlite3_deserialize()\n" #endif " -echo print inputs before execution\n" + " -escape print control character XX as U+24XX\n" " -init FILENAME read/process named file\n" " -[no]header turn headers on or off\n" #if defined(SQLITE_ENABLE_MEMSYS3) || defined(SQLITE_ENABLE_MEMSYS5) @@ -12608,6 +12722,7 @@ static const char zOptions[] = " -multiplex enable the multiplexor VFS\n" #endif " -newline SEP set output row separator. Default: '\\n'\n" + " -noescape output control characters unmodified\n" " -nofollow refuse to open symbolic links to database files\n" " -nonce STRING set the safe-mode escape nonce\n" " -no-rowid-in-view Disable rowid-in-view using sqlite3_config()\n" @@ -13118,6 +13233,10 @@ int SQLITE_CDECL wmain(int argc, wchar_t **wargv){ }else if( cli_strcmp(z,"-csv")==0 ){ data.mode = MODE_Csv; memcpy(data.colSeparator,",",2); + }else if( cli_strcmp(z,"-noescape")==0 ){ + data.eEscMode = SHELL_ESC_OFF; + }else if( cli_strcmp(z,"-escape")==0 ){ + data.eEscMode = SHELL_ESC_GRAPHIC; #ifdef SQLITE_HAVE_ZLIB }else if( cli_strcmp(z,"-zip")==0 ){ data.openMode = SHELL_OPEN_ZIPFILE; diff --git a/test/shell1.test b/test/shell1.test index a272295f55..6189ff83a0 100644 --- a/test/shell1.test +++ b/test/shell1.test @@ -450,7 +450,7 @@ do_test shell1-3.12.3 { # tcl TCL list elements do_test shell1-3.13.1 { catchcmd "test.db" ".mode" -} {0 {current output mode: list}} +} {0 {current output mode: list --escape}} do_test shell1-3.13.2 { catchcmd "test.db" ".mode FOO" } {1 {Error: mode should be one of: ascii box column csv html insert json line list markdown qbox quote table tabs tcl}} From 9ba963f03530b2d0817d5b89c8e35e8b36430290 Mon Sep 17 00:00:00 2001 From: drh <> Date: Sun, 23 Feb 2025 20:50:37 +0000 Subject: [PATCH 160/194] Further improvements to control-character escapes in the CLI. FossilOrigin-Name: 9c2f974c17e3dfac78f3808fdfe916f7617cfdaa64430af38eae21bd6592e6f5 --- manifest | 12 ++--- manifest.uuid | 2 +- src/shell.c.in | 127 +++++++++++++++---------------------------------- 3 files changed, 46 insertions(+), 95 deletions(-) diff --git a/manifest b/manifest index bb780263ec..2225ae1b75 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Work\stoward\sVT100-safe\soutput\sfrom\sthe\sCLI\sby\sdefault. -D 2025-02-23T20:20:56.015 +C Further\simprovements\sto\scontrol-character\sescapes\sin\sthe\sCLI. +D 2025-02-23T20:50:37.078 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d @@ -782,7 +782,7 @@ F src/random.c 606b00941a1d7dd09c381d3279a058d771f406c5213c9932bbd93d5587be4b9c F src/resolve.c 626c24b258b111f75c22107aa5614ad89810df3026f5ca071116d3fe75925c75 F src/rowset.c 8432130e6c344b3401a8874c3cb49fefe6873fec593294de077afea2dce5ec97 F src/select.c a076f7db3a0fcbd9f710d7746cfc07e0b3baadee45eb3136bedc29c598ef8f1c -F src/shell.c.in b1ee6353204a6b543a9e07d44339473db5d3b71c63ca05bbb452391948b66682 +F src/shell.c.in 46794cfa6cdd9b0bbbe35fcf7726ac1f5f7f61bb8f6578ec12ceeab5e0242108 F src/sqlite.h.in 8d4486fb28a90de818ac1e8c6206ea458e7de6bd8e0dfa3d554494f155be8c01 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8 F src/sqlite3ext.h 3f046c04ea3595d6bfda99b781926b17e672fd6d27da2ba6d8d8fc39981dcb54 @@ -2210,8 +2210,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P 997391d42079783e294836f714ccd9526ecc442c8dbf8212d72cd17c67e7158a -R fb09ed0e2944dd462b4d95bf157b726f +P 44c44620e8648a4265053f194e32b3a5c65d25b4f1fff61ef9b944e7cb0ed624 +R b68c8cdbf574035092ab2e3bfafec994 U drh -Z 547baf0b0b8287880898ad372e983fdc +Z 1875645df727b6997bdc49f0eb677111 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 2b72ba5769..a486e0cfcf 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -44c44620e8648a4265053f194e32b3a5c65d25b4f1fff61ef9b944e7cb0ed624 +9c2f974c17e3dfac78f3808fdfe916f7617cfdaa64430af38eae21bd6592e6f5 diff --git a/src/shell.c.in b/src/shell.c.in index a8ea0dd2ad..515da6adae 100644 --- a/src/shell.c.in +++ b/src/shell.c.in @@ -1888,60 +1888,62 @@ static void output_hex_blob(FILE *out, const void *pBlob, int nBlob){ sqlite3_free(zStr); } -/* -** Find a string that is not found anywhere in z[]. Return a pointer -** to that string. -** -** Try to use zA and zB first. If both of those are already found in z[] -** then make up some string and store it in the buffer zBuf. -*/ -static const char *unused_string( - const char *z, /* Result must not appear anywhere in z */ - const char *zA, const char *zB, /* Try these first */ - char *zBuf /* Space to store a generated string */ -){ - unsigned i = 0; - if( strstr(z, zA)==0 ) return zA; - if( strstr(z, zB)==0 ) return zB; - do{ - sqlite3_snprintf(20,zBuf,"(%s%u)", zA, i++); - }while( strstr(z,zBuf)!=0 ); - return zBuf; -} - /* ** Output the given string as a quoted string using SQL quoting conventions. ** ** See also: output_quoted_escaped_string() */ -static void output_quoted_string(ShellState *p, const char *z){ +static void output_quoted_string(ShellState *p, const char *zInX){ int i; - char c; + int needUnistr = 0; + int needDblQuote = 0; + const unsigned char *z = (const unsigned char*)zInX; + unsigned char c; FILE *out = p->out; sqlite3_fsetmode(out, _O_BINARY); if( z==0 ) return; - for(i=0; (c = z[i])!=0 && c!='\''; i++){} - if( c==0 ){ + for(i=0; (c = z[i])!=0; i++){ + if( c=='\'' ){ needDblQuote = 1; } + if( c>0x1f ) continue; + if( c=='\t' || c=='\n' ) continue; + if( c=='\r' && z[i+1]=='\n' ) continue; + needUnistr = 1; + break; + } + if( needDblQuote==0 && needUnistr==0 ){ sqlite3_fprintf(out, "'%s'",z); }else{ - sqlite3_fputs("'", out); + if( needUnistr ){ + sqlite3_fputs("unistr('", out); + }else{ + sqlite3_fputs("'", out); + } while( *z ){ - for(i=0; (c = z[i])!=0 && c!='\''; i++){} - if( c=='\'' ) i++; + for(i=0; (c = z[i])!=0; i++){ + if( c=='\'' ) break; + if( c>0x1f ) continue; + if( c=='\t' || c=='\n' ) continue; + if( c=='\r' && z[i+1]=='\n' ) continue; + break; + } if( i ){ sqlite3_fprintf(out, "%.*s", i, z); z += i; } + if( c==0 ) break; if( c=='\'' ){ - sqlite3_fputs("'", out); + sqlite3_fputs("''", out); continue; - } - if( c==0 ){ - break; + }else{ + sqlite3_fprintf(out, "\\u%04x", c); } z++; } - sqlite3_fputs("'", out); + if( needUnistr ){ + sqlite3_fputs("')", out); + }else{ + sqlite3_fputs("'", out); + } } setCrlfMode(p); } @@ -1956,61 +1958,10 @@ static void output_quoted_string(ShellState *p, const char *z){ ** escape mechanism. */ static void output_quoted_escaped_string(ShellState *p, const char *z){ - int i; - char c; - FILE *out = p->out; + char *zEscaped = sqlite3_mprintf("%#Q", z); sqlite3_fsetmode(out, _O_BINARY); - for(i=0; (c = z[i])!=0 && c!='\'' && c!='\n' && c!='\r'; i++){} - if( c==0 ){ - sqlite3_fprintf(out, "'%s'",z); - }else{ - const char *zNL = 0; - const char *zCR = 0; - int nNL = 0; - int nCR = 0; - char zBuf1[20], zBuf2[20]; - for(i=0; z[i]; i++){ - if( z[i]=='\n' ) nNL++; - if( z[i]=='\r' ) nCR++; - } - if( nNL ){ - sqlite3_fputs("replace(", out); - zNL = unused_string(z, "\\n", "\\012", zBuf1); - } - if( nCR ){ - sqlite3_fputs("replace(", out); - zCR = unused_string(z, "\\r", "\\015", zBuf2); - } - sqlite3_fputs("'", out); - while( *z ){ - for(i=0; (c = z[i])!=0 && c!='\n' && c!='\r' && c!='\''; i++){} - if( c=='\'' ) i++; - if( i ){ - sqlite3_fprintf(out, "%.*s", i, z); - z += i; - } - if( c=='\'' ){ - sqlite3_fputs("'", out); - continue; - } - if( c==0 ){ - break; - } - z++; - if( c=='\n' ){ - sqlite3_fputs(zNL, out); - continue; - } - sqlite3_fputs(zCR, out); - } - sqlite3_fputs("'", out); - if( nCR ){ - sqlite3_fprintf(out, ",'%s',char(13))", zCR); - } - if( nNL ){ - sqlite3_fprintf(out, ",'%s',char(10))", zNL); - } - } + sqlite3_fputs(zEscaped, p->out); + sqlite3_free(zEscaped); setCrlfMode(p); } @@ -4077,7 +4028,7 @@ static char *quoted_column(sqlite3_stmt *pStmt, int i){ return sqlite3_mprintf("%s",sqlite3_column_text(pStmt,i)); } case SQLITE_TEXT: { - return sqlite3_mprintf("%Q",sqlite3_column_text(pStmt,i)); + return sqlite3_mprintf("%#Q",sqlite3_column_text(pStmt,i)); } case SQLITE_BLOB: { int j; From 96a65cc4747cd79cf7966d03a876230c7c9ddcde Mon Sep 17 00:00:00 2001 From: drh <> Date: Mon, 24 Feb 2025 00:18:12 +0000 Subject: [PATCH 161/194] Three different --escape modes: symbol, ascii, off. FossilOrigin-Name: b5adb52fc0dc1838cb9c66cff422f2b8ec147e546cf909dd3c48731fa1edfe50 --- manifest | 14 ++++---- manifest.uuid | 2 +- src/shell.c.in | 94 +++++++++++++++++++++++++++++++++++++----------- test/shell1.test | 2 +- 4 files changed, 82 insertions(+), 30 deletions(-) diff --git a/manifest b/manifest index 2225ae1b75..388bc72c57 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Further\simprovements\sto\scontrol-character\sescapes\sin\sthe\sCLI. -D 2025-02-23T20:50:37.078 +C Three\sdifferent\s--escape\smodes:\s\ssymbol,\sascii,\soff. +D 2025-02-24T00:18:12.616 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d @@ -782,7 +782,7 @@ F src/random.c 606b00941a1d7dd09c381d3279a058d771f406c5213c9932bbd93d5587be4b9c F src/resolve.c 626c24b258b111f75c22107aa5614ad89810df3026f5ca071116d3fe75925c75 F src/rowset.c 8432130e6c344b3401a8874c3cb49fefe6873fec593294de077afea2dce5ec97 F src/select.c a076f7db3a0fcbd9f710d7746cfc07e0b3baadee45eb3136bedc29c598ef8f1c -F src/shell.c.in 46794cfa6cdd9b0bbbe35fcf7726ac1f5f7f61bb8f6578ec12ceeab5e0242108 +F src/shell.c.in e846d86150299b4f49ee4ee6a2f3b59d9460c7dda9280b6046d80778b513deec F src/sqlite.h.in 8d4486fb28a90de818ac1e8c6206ea458e7de6bd8e0dfa3d554494f155be8c01 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8 F src/sqlite3ext.h 3f046c04ea3595d6bfda99b781926b17e672fd6d27da2ba6d8d8fc39981dcb54 @@ -1638,7 +1638,7 @@ F test/sharedA.test 64bdd21216dda2c6a3bd3475348ccdc108160f34682c97f2f51c19fc0e21 F test/sharedB.test 1a84863d7a2204e0d42f2e1606577c5e92e4473fa37ea0f5bdf829e4bf8ee707 F test/shared_err.test 32634e404a3317eeb94abc7a099c556a346fdb8fb3858dbe222a4cbb8926a939 F test/sharedlock.test 5ede3c37439067c43b0198f580fd374ebf15d304 -F test/shell1.test 069ad46cc5e576207e684168777b9d093ad419f4573ea96c47cba9d97b344ba9 +F test/shell1.test b9e7b85af3aa614536786f593684ca5317e356821ad505dad32afc2ea0e99f12 F test/shell2.test 01a01f76ed98088ce598794fbf5b359e148271541a8ddbf79d21cc353cc67a24 F test/shell3.test db1953a8e59d08e9240b7cc5948878e184f7eb2623591587f8fd1f1a5bd536d8 F test/shell4.test 522fdc628c55eff697b061504fb0a9e4e6dfc5d9087a633ab0f3dd11bcc4f807 @@ -2210,8 +2210,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P 44c44620e8648a4265053f194e32b3a5c65d25b4f1fff61ef9b944e7cb0ed624 -R b68c8cdbf574035092ab2e3bfafec994 +P 9c2f974c17e3dfac78f3808fdfe916f7617cfdaa64430af38eae21bd6592e6f5 +R 76a86dfe0f25913e8833da92cffca725 U drh -Z 1875645df727b6997bdc49f0eb677111 +Z b3eaebce72752a9b1304ed1c64dcf320 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index a486e0cfcf..890ec996a0 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -9c2f974c17e3dfac78f3808fdfe916f7617cfdaa64430af38eae21bd6592e6f5 +b5adb52fc0dc1838cb9c66cff422f2b8ec147e546cf909dd3c48731fa1edfe50 diff --git a/src/shell.c.in b/src/shell.c.in index 515da6adae..3bc8d27173 100644 --- a/src/shell.c.in +++ b/src/shell.c.in @@ -1549,8 +1549,11 @@ static ShellState shellState; /* Allowed values for ShellState.eEscMode */ -#define SHELL_ESC_GRAPHIC 0 /* Substitute U+2400 graphics */ -#define SHELL_ESC_OFF 1 /* Send characters verbatim */ +#define SHELL_ESC_SYMBOL 0 /* Substitute U+2400 graphics */ +#define SHELL_ESC_ASCII 1 /* Substitute ^Y for X where Y=X+0x40 */ +#define SHELL_ESC_OFF 2 /* Send characters verbatim */ + +static const char *shell_EscModeNames[] = { "symbol", "ascii", "off" }; /* ** These are the allowed shellFlgs values @@ -2160,7 +2163,8 @@ static const char *escapeOutput( *ppFree = 0; return zInX; } - zOut = sqlite3_malloc64( i + 2*nCtrl + 1 ); + if( p->eEscMode==SHELL_ESC_SYMBOL ) nCtrl *= 2; + zOut = sqlite3_malloc64( i + nCtrl + 1 ); shell_check_oom(zOut); for(i=j=0; (c = zIn[i])!=0; i++){ if( c>0x1f @@ -2176,9 +2180,17 @@ static const char *escapeOutput( } zIn += i+1; i = -1; - zOut[j++] = 0xe2; - zOut[j++] = 0x90; - zOut[j++] = 0x80+c; + switch( p->eEscMode ){ + case SHELL_ESC_SYMBOL: + zOut[j++] = 0xe2; + zOut[j++] = 0x90; + zOut[j++] = 0x80+c; + break; + case SHELL_ESC_ASCII: + zOut[j++] = '^'; + zOut[j++] = 0x40+c; + break; + } } if( i>0 ){ memcpy(&zOut[j], zIn, i); @@ -9833,28 +9845,50 @@ static int do_meta_command(char *zLine, ShellState *p){ const char *zMode = 0; const char *zTabname = 0; int i, n2; + int chng = 0; ColModeOpts cmOpts = ColModeOpts_default; for(i=1; ieEscMode = SHELL_ESC_GRAPHIC; - }else if( optionMatch(z,"noescape") ){ - p->eEscMode = SHELL_ESC_OFF; + chng = 1; + }else if( optionMatch(z,"escape") && i+1eEscMode = k; + chng = 1; + break; + } + } + if( k>=ArraySize(shell_EscModeNames) ){ + sqlite3_fprintf(stderr, "unknown escape mod \"%s\" - choices:", zEsc); + for(k=0; kmode==MODE_Column || (p->mode>=MODE_Markdown && p->mode<=MODE_Box) ){ sqlite3_fprintf(p->out, "current output mode: %s --wrap %d --wordwrap %s " - "--%squote --%sescape\n", + "--%squote --escape %s\n", modeDescr[p->mode], p->cmOpts.iWrap, p->cmOpts.bWordWrap ? "on" : "off", p->cmOpts.bQuote ? "" : "no", - p->eEscMode ? "no" : "" + shell_EscModeNames[p->eEscMode] ); }else{ sqlite3_fprintf(p->out, - "current output mode: %s --%sescape\n", + "current output mode: %s --escape %s\n", modeDescr[p->mode], - p->eEscMode ? "no" : "" + shell_EscModeNames[p->eEscMode] ); } + } + if( zMode==0 ){ zMode = modeDescr[p->mode]; } n2 = strlen30(zMode); @@ -12650,7 +12687,7 @@ static const char zOptions[] = " -deserialize open the database using sqlite3_deserialize()\n" #endif " -echo print inputs before execution\n" - " -escape print control character XX as U+24XX\n" + " -escape MODE ctrl-char escape mode, one of: symbol, ascii, off\n" " -init FILENAME read/process named file\n" " -[no]header turn headers on or off\n" #if defined(SQLITE_ENABLE_MEMSYS3) || defined(SQLITE_ENABLE_MEMSYS5) @@ -12673,7 +12710,6 @@ static const char zOptions[] = " -multiplex enable the multiplexor VFS\n" #endif " -newline SEP set output row separator. Default: '\\n'\n" - " -noescape output control characters unmodified\n" " -nofollow refuse to open symbolic links to database files\n" " -nonce STRING set the safe-mode escape nonce\n" " -no-rowid-in-view Disable rowid-in-view using sqlite3_config()\n" @@ -13085,6 +13121,9 @@ int SQLITE_CDECL wmain(int argc, wchar_t **wargv){ ShellSetFlag(&data,SHFLG_TestingMode); }else if( cli_strcmp(z,"-safe")==0 ){ /* no-op - catch this on the second pass */ + }else if( cli_strcmp(z,"-escape")==0 && i+1=ArraySize(shell_EscModeNames) ){ + sqlite3_fprintf(stderr, "unknown escape mode \"%s\" - choices:", zEsc); + for(k=0; k Date: Mon, 24 Feb 2025 00:40:36 +0000 Subject: [PATCH 162/194] Make column output modes in the CLI responsive to the --escape setting. FossilOrigin-Name: 14ff5557d450475ad959f8c753c0cecb85dfca7346fcacd91da16e4d36e30508 --- manifest | 12 ++++++------ manifest.uuid | 2 +- src/shell.c.in | 22 +++++++++++++++++----- 3 files changed, 24 insertions(+), 12 deletions(-) diff --git a/manifest b/manifest index 388bc72c57..640183e406 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Three\sdifferent\s--escape\smodes:\s\ssymbol,\sascii,\soff. -D 2025-02-24T00:18:12.616 +C Make\scolumn\soutput\smodes\sin\sthe\sCLI\sresponsive\sto\sthe\s--escape\ssetting. +D 2025-02-24T00:40:36.130 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d @@ -782,7 +782,7 @@ F src/random.c 606b00941a1d7dd09c381d3279a058d771f406c5213c9932bbd93d5587be4b9c F src/resolve.c 626c24b258b111f75c22107aa5614ad89810df3026f5ca071116d3fe75925c75 F src/rowset.c 8432130e6c344b3401a8874c3cb49fefe6873fec593294de077afea2dce5ec97 F src/select.c a076f7db3a0fcbd9f710d7746cfc07e0b3baadee45eb3136bedc29c598ef8f1c -F src/shell.c.in e846d86150299b4f49ee4ee6a2f3b59d9460c7dda9280b6046d80778b513deec +F src/shell.c.in 93b115083f702bfef5b4cfabc908ff7c56275a8eb43837695940e953cd98b1d6 F src/sqlite.h.in 8d4486fb28a90de818ac1e8c6206ea458e7de6bd8e0dfa3d554494f155be8c01 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8 F src/sqlite3ext.h 3f046c04ea3595d6bfda99b781926b17e672fd6d27da2ba6d8d8fc39981dcb54 @@ -2210,8 +2210,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P 9c2f974c17e3dfac78f3808fdfe916f7617cfdaa64430af38eae21bd6592e6f5 -R 76a86dfe0f25913e8833da92cffca725 +P b5adb52fc0dc1838cb9c66cff422f2b8ec147e546cf909dd3c48731fa1edfe50 +R e22b9c730b45578a252088be598cc957 U drh -Z b3eaebce72752a9b1304ed1c64dcf320 +Z 0141780f340c58ec2ae1b4be639dc53e # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 890ec996a0..fc19a63267 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -b5adb52fc0dc1838cb9c66cff422f2b8ec147e546cf909dd3c48731fa1edfe50 +14ff5557d450475ad959f8c753c0cecb85dfca7346fcacd91da16e4d36e30508 diff --git a/src/shell.c.in b/src/shell.c.in index 3bc8d27173..401c4bcc05 100644 --- a/src/shell.c.in +++ b/src/shell.c.in @@ -3916,6 +3916,7 @@ static void print_box_row_separator( ** the last line, write a NULL into *pzTail. (*pzTail is not allocated.) */ static char *translateForDisplayAndDup( + ShellState *p, /* To access current settings */ const unsigned char *z, /* Input text to be transformed */ const unsigned char **pzTail, /* OUT: Tail of the input for next line */ int mxWidth, /* Max width. 0 means no limit */ @@ -4017,9 +4018,20 @@ static char *translateForDisplayAndDup( i++; continue; } - zOut[j++] = 0xe2; - zOut[j++] = 0x90; - zOut[j++] = 0x80 + c; + switch( p->eEscMode ){ + case SHELL_ESC_SYMBOL: + zOut[j++] = 0xe2; + zOut[j++] = 0x90; + zOut[j++] = 0x80 + c; + break; + case SHELL_ESC_ASCII: + zOut[j++] = '^'; + zOut[j++] = 0x40 + c; + break; + case SHELL_ESC_OFF: + zOut[j++] = c; + break; + } i++; } zOut[j] = 0; @@ -4132,7 +4144,7 @@ static void exec_prepared_stmt_columnar( if( wx<0 ) wx = -wx; uz = (const unsigned char*)sqlite3_column_name(pStmt,i); if( uz==0 ) uz = (u8*)""; - azData[i] = translateForDisplayAndDup(uz, &zNotUsed, wx, bw); + azData[i] = translateForDisplayAndDup(p, uz, &zNotUsed, wx, bw); } do{ int useNextLine = bNextLine; @@ -4164,7 +4176,7 @@ static void exec_prepared_stmt_columnar( if( uz==0 ) uz = (u8*)zShowNull; } azData[nRow*nColumn + i] - = translateForDisplayAndDup(uz, &azNextLine[i], wx, bw); + = translateForDisplayAndDup(p, uz, &azNextLine[i], wx, bw); if( azNextLine[i] ){ bNextLine = 1; abRowDiv[nRow-1] = 0; From 09591b78ae28c6bb385ae96fef44edfb52454830 Mon Sep 17 00:00:00 2001 From: stephan Date: Mon, 24 Feb 2025 04:47:34 +0000 Subject: [PATCH 163/194] Update jimsh0.c from upstream autosetup to address [https://github.com/msteveb/autosetup/issues/75|autosetup ticket #75], triggered by this build in the Gentoo project. FossilOrigin-Name: ffd05de8a3b7cab1b8e91b99da74b43ec5a7b91c78dcfd7cf338b66126e30a56 --- autosetup/jimsh0.c | 20 ++++++++------------ manifest | 12 ++++++------ manifest.uuid | 2 +- 3 files changed, 15 insertions(+), 19 deletions(-) diff --git a/autosetup/jimsh0.c b/autosetup/jimsh0.c index 0526b9a446..1a6453d0c8 100644 --- a/autosetup/jimsh0.c +++ b/autosetup/jimsh0.c @@ -1252,6 +1252,14 @@ int Jim_OpenForRead(const char *filename); #endif +# ifndef MAXPATHLEN +# ifdef PATH_MAX +# define MAXPATHLEN PATH_MAX +# else +# define MAXPATHLEN JIM_PATH_LEN +# endif +# endif + int Jim_FileStoreStatData(Jim_Interp *interp, Jim_Obj *varName, const jim_stat_t *sb); @@ -2088,10 +2096,6 @@ enum wbuftype { #define UNIX_SOCKETS 0 #endif -#ifndef MAXPATHLEN -#define MAXPATHLEN JIM_PATH_LEN -#endif - @@ -4173,14 +4177,6 @@ int Jim_regexpInit(Jim_Interp *interp) #define S_ISDIR(m) (((m) & S_IFMT) == S_IFDIR) #endif -# ifndef MAXPATHLEN -# ifdef PATH_MAX -# define MAXPATHLEN PATH_MAX -# else -# define MAXPATHLEN JIM_PATH_LEN -# endif -# endif - #if defined(__MINGW32__) || defined(__MSYS__) || defined(_MSC_VER) #define ISWINDOWS 1 diff --git a/manifest b/manifest index 6b1eb30ec4..fd660a7982 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Add\s(disabled)\sinfrastructure\sfor\sdisabling\suse\sof\sthe\srpath\slinker\sflag.\sThis\sis\sa\sproactive\sprecautionary\smeasure\sbecause\show\sthe\srpath\sis\sused\sdoes\snot\smatch\sup\swith\swhat\sthe\sunix-on-windows\senvironments\sdo\swith\stheir\sDLLs. -D 2025-02-23T17:55:41.504 +C Update\sjimsh0.c\sfrom\supstream\sautosetup\sto\saddress\s[https://github.com/msteveb/autosetup/issues/75|autosetup\sticket\s#75],\striggered\sby\sthis\sbuild\sin\sthe\sGentoo\sproject. +D 2025-02-24T04:47:34.727 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d @@ -47,7 +47,7 @@ F autosetup/cc-db.tcl 6e0ed90146197a5a05b245e649975c07c548e30926b218ca3e1d4dc034 F autosetup/cc-lib.tcl 493c5935b5dd3bf9bd4eca89b07c8b1b1a9356d61783035144e21795facf7360 F autosetup/cc-shared.tcl 4f024e94a47f427ba61de1739f6381ef0080210f9fae89112d5c1de1e5460d78 F autosetup/cc.tcl c0fcc50ca91deff8741e449ddad05bcd08268bc31177e613a6343bbd1fd3e45f -F autosetup/jimsh0.c 6573f6bc6ff204de0139692648d7037ca0b6c067bac83a7b4e087f20a86866a4 +F autosetup/jimsh0.c a57c16e65dcffc9c76e496757cb3f7fb47e01ecbd1631a0a5e01751fc856f049 F autosetup/pkg-config.tcl 4e635bf39022ff65e0d5434339dd41503ea48fc53822c9c5bde88b02d3d952ba F autosetup/proj.tcl cc300c15633cb2835eb52c235c5abfd2de0e8e989e9b650e82df3c1d3b856d22 F autosetup/sqlite-config.tcl ecdf12a482eb4779e7af48f917d31742ea881ad4ab989518c83e3400d9f8106f @@ -2210,8 +2210,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P 6743e3e5b87f1d2308ec8cebef3c7ecccddafdace107630e0d8feee2b089d105 -R 7d127e615bad8c717008fb489a6a8fc9 +P 38ba8e837c2679f12a4019612f7188cb4afffd43cef7af4a4aa02e62c20885ac +R 4c0aa0676d1a4513bf4ed482d0d66271 U stephan -Z 0e93340d6bf9288ab7f192200f1e64eb +Z f85c47e7c816fa6b50a85716ddc8c88a # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 66386092c6..9936289a52 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -38ba8e837c2679f12a4019612f7188cb4afffd43cef7af4a4aa02e62c20885ac +ffd05de8a3b7cab1b8e91b99da74b43ec5a7b91c78dcfd7cf338b66126e30a56 From a63dee09a6184dea956a2d91d9a43a1c97971ec4 Mon Sep 17 00:00:00 2001 From: stephan Date: Mon, 24 Feb 2025 05:10:09 +0000 Subject: [PATCH 164/194] Add some internal notes about potential changes for the rpath flag handling. FossilOrigin-Name: 6f904f0695c7e3396522c061170d6201b256af0294afeefcf8b6672e3ba15987 --- autosetup/sqlite-config.tcl | 12 +++++++++++- manifest | 12 ++++++------ manifest.uuid | 2 +- 3 files changed, 18 insertions(+), 8 deletions(-) diff --git a/autosetup/sqlite-config.tcl b/autosetup/sqlite-config.tcl index d32119e755..cca6f9075b 100644 --- a/autosetup/sqlite-config.tcl +++ b/autosetup/sqlite-config.tcl @@ -249,6 +249,7 @@ proc sqlite-config-bootstrap {buildMode} { => {Link the sqlite3 shell app against the DLL instead of embedding sqlite3.c} } {*} { + # A potential TODO without a current use case: #rpath=1 => {Disable use of the rpath linker flag} # soname: https://sqlite.org/src/forumpost/5a3b44f510df8ded soname:=legacy @@ -1901,8 +1902,17 @@ proc sqlite-handle-tcl {} { ######################################################################## # Handle the --enable/disable-rpath flag. proc sqlite-handle-rpath {} { + proj-check-rpath + # autosetup/cc-chared.tcl sets the rpath flag definition in + # [get-define SH_LINKRPATH], but it does so on a per-platform basis + # rather than as a compiler check. Though we should do a proper + # compiler check (as proj-check-rpath does), we may want to consider + # adopting its approach of clearing the rpath flags for environments + # for which sqlite-env-is-unix-on-windows returns a non-empty + # string. + # if {[proj-opt-truthy rpath]} { - proj-check-rpath +# proj-check-rpath # } else { # msg-result "Disabling use of rpath." # define LDFLAGS_RPATH "" diff --git a/manifest b/manifest index fd660a7982..9af16dd0e4 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Update\sjimsh0.c\sfrom\supstream\sautosetup\sto\saddress\s[https://github.com/msteveb/autosetup/issues/75|autosetup\sticket\s#75],\striggered\sby\sthis\sbuild\sin\sthe\sGentoo\sproject. -D 2025-02-24T04:47:34.727 +C Add\ssome\sinternal\snotes\sabout\spotential\schanges\sfor\sthe\srpath\sflag\shandling. +D 2025-02-24T05:10:09.506 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d @@ -50,7 +50,7 @@ F autosetup/cc.tcl c0fcc50ca91deff8741e449ddad05bcd08268bc31177e613a6343bbd1fd3e F autosetup/jimsh0.c a57c16e65dcffc9c76e496757cb3f7fb47e01ecbd1631a0a5e01751fc856f049 F autosetup/pkg-config.tcl 4e635bf39022ff65e0d5434339dd41503ea48fc53822c9c5bde88b02d3d952ba F autosetup/proj.tcl cc300c15633cb2835eb52c235c5abfd2de0e8e989e9b650e82df3c1d3b856d22 -F autosetup/sqlite-config.tcl ecdf12a482eb4779e7af48f917d31742ea881ad4ab989518c83e3400d9f8106f +F autosetup/sqlite-config.tcl 3e6815229a2e43d0ceb35c051ccdb7888feacc6ff94ed9da9dca1d81494ca105 F autosetup/system.tcl 51d4be76cd9a9074704b584e5c9cbba616202c8468cf9ba8a4f8294a7ab1dba9 F configure 9a00b21dfd13757bbfb8d89b30660a89ec1f8f3a79402b8f9f9b6fc475c3303a x F contrib/sqlitecon.tcl 210a913ad63f9f991070821e599d600bd913e0ad @@ -2210,8 +2210,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P 38ba8e837c2679f12a4019612f7188cb4afffd43cef7af4a4aa02e62c20885ac -R 4c0aa0676d1a4513bf4ed482d0d66271 +P ffd05de8a3b7cab1b8e91b99da74b43ec5a7b91c78dcfd7cf338b66126e30a56 +R eeeefd36d893cc55dc27e27479712352 U stephan -Z f85c47e7c816fa6b50a85716ddc8c88a +Z 2cdb20385f544083be489e48d188981f # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 9936289a52..bca7853b2c 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -ffd05de8a3b7cab1b8e91b99da74b43ec5a7b91c78dcfd7cf338b66126e30a56 +6f904f0695c7e3396522c061170d6201b256af0294afeefcf8b6672e3ba15987 From 644b99641fe52f992cd8a9ca4a1f1be3d9e1de45 Mon Sep 17 00:00:00 2001 From: stephan Date: Mon, 24 Feb 2025 07:06:36 +0000 Subject: [PATCH 165/194] Configure-internal doc tweaks. Fix the distclean rules for libsqlite3.dll.a on msys/cygwin/mingw, broken when the DLL basename was changed for those platforms. FossilOrigin-Name: 8641e2c7c868be67ebb367fe7c8ceeee0e0d96574c164191ce9e340e7a527f49 --- autoconf/Makefile.in | 2 +- autosetup/sqlite-config.tcl | 30 +++++++++++++++++------------- main.mk | 2 +- manifest | 16 ++++++++-------- manifest.uuid | 2 +- 5 files changed, 28 insertions(+), 24 deletions(-) diff --git a/autoconf/Makefile.in b/autoconf/Makefile.in index ea0c45a3a8..f74c71d674 100644 --- a/autoconf/Makefile.in +++ b/autoconf/Makefile.in @@ -256,7 +256,7 @@ install: install-man1 clean: rm -f *.o sqlite3$(T.exe) - rm -f $(libsqlite3.LIB) $(libsqlite3.DLL) $(libsqlite3.DLL).a + rm -f $(libsqlite3.LIB) $(libsqlite3.DLL) libsqlite3$(T.dll).a distclean: clean rm -f jimsh0$(T.exe) config.* sqlite3.pc sqlite_cfg.h Makefile diff --git a/autosetup/sqlite-config.tcl b/autosetup/sqlite-config.tcl index cca6f9075b..796fd5a405 100644 --- a/autosetup/sqlite-config.tcl +++ b/autosetup/sqlite-config.tcl @@ -264,16 +264,17 @@ proc sqlite-config-bootstrap {buildMode} { => {Specifies the base name of the resulting DLL file, defaulting to a platform-depending name (libsqlite3 on most Unix-style platforms). If not provided, libsqlite3 is usually assumed but on some platforms - a platform-dependent default is used. Use "default" to explicitly - disable platform-dependent defaults on platforms where "auto" is - implicitly used if this flag is not provided.} + a platform-dependent default is used. On some platforms this flag + gets automatically enabled if it is not provided. Use "default" to + explicitly disable platform-dependent activation on such systems.} # out-implib: https://sqlite.org/forum/forumpost/0c7fc097b2 out-implib:=auto => {Enable use of --out-implib linker flag to generate an "import library" for the DLL. The output's base name name is specified by the value, with "auto" meaning to figure out a - name automatically. Use "none" to explicitly disable the - feature on platforms where it is implicitly on if not provided.} + name automatically. On some platforms this flag gets + automatically enabled if it is not provided. Use "none" to + explicitly disable this feature on such platforms.} } } @@ -283,7 +284,7 @@ proc sqlite-config-bootstrap {buildMode} { # Note that using the --debug/--enable-debug flag here # requires patching autosetup/autosetup to rename its builtin # --debug to --autosetup-debug. See details in - # autosetup/README.md. + # autosetup/README.md#patching. with-debug=0 debug=0 => {Enable debug build flags. This option will impact performance by @@ -306,7 +307,9 @@ proc sqlite-config-bootstrap {buildMode} { => {Dynamically link libsqlite3 to certain tools which normally statically embed it} } {*} { - dump-defines=0 => {Dump autosetup defines to $::sqliteConfig(dump-defines-txt) (for build debugging)} + dump-defines=0 + => {Dump autosetup defines to $::sqliteConfig(dump-defines-txt) + (for build debugging)} } } }; # $allOpts @@ -1282,9 +1285,9 @@ proc sqlite-handle-dll-basename {} { } if {$dn in {auto ""}} { switch -glob -- [get-define host] { - *-*-cygwin* { set dn cygsqlite3-0 } + *-*-cygwin { set dn cygsqlite3-0 } *-*-ming* { set dn libsqlite3-0 } - *-*-msys* { set dn msys-sqlite3-0 } + *-*-msys { set dn msys-sqlite3-0 } default { set dn libsqlite3 } } } @@ -1355,12 +1358,13 @@ proc sqlite-env-is-unix-on-windows {{envTuple ""}} { if {"" eq $envTuple} { set envTuple [get-define host] } + set name "" switch -glob -- $envTuple { - *-*-cygwin* { return cygwin } - *-*-ming* { return mingw } - *-*-msys* { return msys } + *-*-cygwin { set name cygwin } + *-*-ming* { set name mingw } + *-*-msys { set name msys } } - return ""; + return $name; } ######################################################################## diff --git a/main.mk b/main.mk index e83f354de7..7cbd88bfac 100644 --- a/main.mk +++ b/main.mk @@ -2381,7 +2381,7 @@ tidy: tidy-. rm -f lemon$(B.exe) sqlite*.tar.gz rm -f mkkeywordhash$(B.exe) mksourceid$(B.exe) rm -f parse.* fts5parse.* - rm -f $(libsqlite3.DLL) $(libsqlite3.LIB) $(libtclsqlite3.SO) $(libsqlite3.DLL).a + rm -f $(libsqlite3.DLL) $(libsqlite3.LIB) $(libtclsqlite3.SO) libsqlite3$(T.dll).a rm -f tclsqlite3$(T.exe) $(TESTPROGS) rm -f LogEst$(T.exe) fts3view$(T.exe) rollback-test$(T.exe) showdb$(T.exe) rm -f showjournal$(T.exe) showstat4$(T.exe) showwal$(T.exe) speedtest1$(T.exe) diff --git a/manifest b/manifest index 9af16dd0e4..f840036d3b 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Add\ssome\sinternal\snotes\sabout\spotential\schanges\sfor\sthe\srpath\sflag\shandling. -D 2025-02-24T05:10:09.506 +C Configure-internal\sdoc\stweaks.\sFix\sthe\sdistclean\srules\sfor\slibsqlite3.dll.a\son\smsys/cygwin/mingw,\sbroken\swhen\sthe\sDLL\sbasename\swas\schanged\sfor\sthose\splatforms. +D 2025-02-24T07:06:36.064 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d @@ -16,7 +16,7 @@ F art/sqlite370.jpg d512473dae7e378a67e28ff96a34da7cb331def2 F art/sqlite370.svg 40b7e2fe8aac3add5d56dd86ab8d427a4eca5bcb3fe4f8946cb3794e1821d531 F auto.def 37cd272e5a2179b4ae99511a0c70e724b24720ccb69e8238d800b52106537782 F autoconf/Makefile.fallback 22fe523eb36dfce31e0f6349f782eb084e86a5620b2b0b4f84a2d6133f53f5ac -F autoconf/Makefile.in d4bc4b3e0680c9f9cd8633279e597abb5f29fa58f29950e49dbf359e1c553720 +F autoconf/Makefile.in c9a7007181df2a07d08bd63c6ba395ed38705aa218789726951aabebec32ee27 F autoconf/Makefile.msc 1249e425a24859c7b3f17575275247df9eec3bddc0d1d7e73941f1abdbb95a92 F autoconf/README.first f1d3876e9a7852c22f275a6f06814e64934cecbc0b5b9617d64849094c1fd136 F autoconf/README.txt 7f01dc3915e2d68f329011073662369e62a0938a2c69398807823c57591cb288 @@ -50,7 +50,7 @@ F autosetup/cc.tcl c0fcc50ca91deff8741e449ddad05bcd08268bc31177e613a6343bbd1fd3e F autosetup/jimsh0.c a57c16e65dcffc9c76e496757cb3f7fb47e01ecbd1631a0a5e01751fc856f049 F autosetup/pkg-config.tcl 4e635bf39022ff65e0d5434339dd41503ea48fc53822c9c5bde88b02d3d952ba F autosetup/proj.tcl cc300c15633cb2835eb52c235c5abfd2de0e8e989e9b650e82df3c1d3b856d22 -F autosetup/sqlite-config.tcl 3e6815229a2e43d0ceb35c051ccdb7888feacc6ff94ed9da9dca1d81494ca105 +F autosetup/sqlite-config.tcl e55569f6ab09a19af7b89c71c20b77b13c8594c9dd6ef2b4463611b8ee76b927 F autosetup/system.tcl 51d4be76cd9a9074704b584e5c9cbba616202c8468cf9ba8a4f8294a7ab1dba9 F configure 9a00b21dfd13757bbfb8d89b30660a89ec1f8f3a79402b8f9f9b6fc475c3303a x F contrib/sqlitecon.tcl 210a913ad63f9f991070821e599d600bd913e0ad @@ -705,7 +705,7 @@ F ext/wasm/tests/opfs/sahpool/sahpool-pausing.js f264925cfc82155de38cecb3d204c36 F ext/wasm/tests/opfs/sahpool/sahpool-worker.js bd25a43fc2ab2d1bafd8f2854ad3943ef673f7c3be03e95ecf1612ff6e8e2a61 F ext/wasm/wasmfs.make 68999f5bd8c489239592d59a420f8c627c99169bbd6fa16a404751f757b9f702 F magic.txt 5ade0bc977aa135e79e3faaea894d5671b26107cc91e70783aa7dc83f22f3ba0 -F main.mk 2c93ed0030ef1a3ac2c7e40d619ae46771556b396bf5f9b0abac445a8026b3cb +F main.mk 47722beae213a94638819c60c3c560ab4d61f93dcb760980df4cdb105e383089 F mptest/config01.test 3c6adcbc50b991866855f1977ff172eb6d901271 F mptest/config02.test 4415dfe36c48785f751e16e32c20b077c28ae504 F mptest/crash01.test 61e61469e257df0850df4293d7d4d6c2af301421 @@ -2210,8 +2210,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P ffd05de8a3b7cab1b8e91b99da74b43ec5a7b91c78dcfd7cf338b66126e30a56 -R eeeefd36d893cc55dc27e27479712352 +P 6f904f0695c7e3396522c061170d6201b256af0294afeefcf8b6672e3ba15987 +R cf9fc5d44286845f3980ae6c5b3ec3e6 U stephan -Z 2cdb20385f544083be489e48d188981f +Z 5fd2d1e9c016bedf0db0ccd156948622 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index bca7853b2c..1632237ee3 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -6f904f0695c7e3396522c061170d6201b256af0294afeefcf8b6672e3ba15987 +8641e2c7c868be67ebb367fe7c8ceeee0e0d96574c164191ce9e340e7a527f49 From 3111c4687f101251d11a391ab41b532c3ec85744 Mon Sep 17 00:00:00 2001 From: stephan Date: Mon, 24 Feb 2025 08:42:40 +0000 Subject: [PATCH 166/194] Further consolidation of the main auto.def and the autoconf auto.def content into sqlite-config.tcl. FossilOrigin-Name: 76a4efa9668791f23de8d4db1788708891f5efa01ba73bced6abfc54391c3b28 --- auto.def | 21 +++++---------------- autoconf/auto.def | 21 +++++---------------- autosetup/proj.tcl | 2 +- autosetup/sqlite-config.tcl | 12 ++++++++++++ manifest | 18 +++++++++--------- manifest.uuid | 2 +- 6 files changed, 33 insertions(+), 43 deletions(-) diff --git a/auto.def b/auto.def index 6dab95eaa0..f868851e3d 100644 --- a/auto.def +++ b/auto.def @@ -4,18 +4,17 @@ # This is the main autosetup-compatible configure script for the # SQLite project. # -# This script should be kept compatible with JimTCL, a copy of which -# is included in this source tree as ./autosetup/jimsh0.c. The number -# of incompatibilities between canonical TCL and JimTCL is very low -# and alternative formulations of incompatible constructs have, so -# far, been easy to find. +# This script and all of its dependencies must be kept compatible with +# JimTCL, a copy of which is included in this source tree as +# ./autosetup/jimsh0.c. The number of incompatibilities between +# canonical TCL and JimTCL is very low and alternative formulations of +# incompatible constructs have, so far, been easy to find. # # JimTCL: https://jim.tcl.tk # use sqlite-config sqlite-config-bootstrap canonical -sqlite-setup-default-cflags proj-if-opt-truthy dev { # --enable-dev needs to come early so that the downstream tests # which check for the following flags use their updated state. @@ -27,7 +26,6 @@ proj-if-opt-truthy dev { # [proj-get-env] here because [sqlite-setup-default-cflags] uses # [proj-get-env] and we want this to supercede that. } - sqlite-check-common-bins ;# must come before [sqlite-handle-wasi-sdk] sqlite-handle-wasi-sdk ;# must run relatively early, as it changes the environment sqlite-check-common-system-deps @@ -59,15 +57,6 @@ proj-define-for-opt linemacros AMALGAMATION_LINE_MACROS \ define LINK_TOOLS_DYNAMICALLY [proj-opt-was-provided dynlink-tools] -sqlite-handle-rpath -sqlite-handle-soname -sqlite-handle-debug sqlite-handle-tcl -sqlite-handle-threadsafe -sqlite-handle-tempstore -sqlite-handle-line-editing -sqlite-handle-load-extension -sqlite-handle-math -sqlite-handle-icu sqlite-handle-emsdk sqlite-config-finalize diff --git a/autoconf/auto.def b/autoconf/auto.def index 069f3e931f..8ba5bb6199 100644 --- a/autoconf/auto.def +++ b/autoconf/auto.def @@ -4,26 +4,15 @@ # This is the main autosetup-compatible configure script for the # "autoconf" bundle of the SQLite project. # -# This script must be kept compatible with JimTCL, a copy of which is -# included in this source tree as ./autosetup/jimsh0.c. +# This script and all of its dependencies must be kept compatible with +# JimTCL, a copy of which is included in this source tree as +# ./autosetup/jimsh0.c. # use sqlite-config sqlite-config-bootstrap autoconf -sqlite-check-common-bins -sqlite-check-common-system-deps -sqlite-handle-rpath -sqlite-handle-soname -sqlite-setup-default-cflags -sqlite-handle-debug -sqlite-handle-threadsafe -sqlite-handle-tempstore -sqlite-handle-line-editing -sqlite-handle-load-extension -sqlite-handle-math -sqlite-handle-icu - define ENABLE_STATIC_SHELL [opt-bool static-shell] define ENABLE_LIB_SHARED [opt-bool shared] define ENABLE_LIB_STATIC [opt-bool static] - +sqlite-check-common-bins +sqlite-check-common-system-deps sqlite-config-finalize diff --git a/autosetup/proj.tcl b/autosetup/proj.tcl index 94e940a72d..adf31a1ad6 100644 --- a/autosetup/proj.tcl +++ b/autosetup/proj.tcl @@ -1201,7 +1201,7 @@ proc proj-xfer-options-aliases {mapping} { # will use CC_FOR_BUILD=clang, instead of cc, for building in-tree # tools. This is based off of an email discussion and is thought to # be likely to cause less confusion than seeing 'cc' invocations -# will when the user passes CC=clang. +# when when the user passes CC=clang. # # Sidebar: if we do this before the cc package is installed, it gets # reverted by that package. Ergo, the cc package init will tell the diff --git a/autosetup/sqlite-config.tcl b/autosetup/sqlite-config.tcl index 796fd5a405..14f515a2a2 100644 --- a/autosetup/sqlite-config.tcl +++ b/autosetup/sqlite-config.tcl @@ -13,6 +13,7 @@ if {[string first " " $autosetup(builddir)] != -1} { } use cc cc-db cc-shared cc-lib pkg-config proj +#proj-redefine-cc-for-build; # arguable # # Object for communicating config-time state across various @@ -364,6 +365,7 @@ proc sqlite-post-options-init {} { } set ::sqliteConfig(msg-debug-enabled) [proj-val-truthy [get-env msg-debug 0]] sqlite-setup-package-info + sqlite-setup-default-cflags } ######################################################################## @@ -1447,6 +1449,16 @@ proc sqlite-config-finalize {} { # autoconf { # } # } + + sqlite-handle-debug + sqlite-handle-rpath + sqlite-handle-soname + sqlite-handle-threadsafe + sqlite-handle-tempstore + sqlite-handle-line-editing + sqlite-handle-load-extension + sqlite-handle-math + sqlite-handle-icu sqlite-handle-env-quirks sqlite-process-dot-in-files sqlite-post-config-validation diff --git a/manifest b/manifest index f840036d3b..fecfd56977 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Configure-internal\sdoc\stweaks.\sFix\sthe\sdistclean\srules\sfor\slibsqlite3.dll.a\son\smsys/cygwin/mingw,\sbroken\swhen\sthe\sDLL\sbasename\swas\schanged\sfor\sthose\splatforms. -D 2025-02-24T07:06:36.064 +C Further\sconsolidation\sof\sthe\smain\sauto.def\sand\sthe\sautoconf\sauto.def\scontent\sinto\ssqlite-config.tcl. +D 2025-02-24T08:42:40.698 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d @@ -14,13 +14,13 @@ F art/sqlite370.eps aa97a671332b432a54e1d74ff5e8775be34200c2 F art/sqlite370.ico af56c1d00fee7cd4753e8631ed60703ed0fc6e90 F art/sqlite370.jpg d512473dae7e378a67e28ff96a34da7cb331def2 F art/sqlite370.svg 40b7e2fe8aac3add5d56dd86ab8d427a4eca5bcb3fe4f8946cb3794e1821d531 -F auto.def 37cd272e5a2179b4ae99511a0c70e724b24720ccb69e8238d800b52106537782 +F auto.def 165e8e8270b8256db1dd065e8a2f3b7af612421e8a23b8fe08b74d7cbbf12043 F autoconf/Makefile.fallback 22fe523eb36dfce31e0f6349f782eb084e86a5620b2b0b4f84a2d6133f53f5ac F autoconf/Makefile.in c9a7007181df2a07d08bd63c6ba395ed38705aa218789726951aabebec32ee27 F autoconf/Makefile.msc 1249e425a24859c7b3f17575275247df9eec3bddc0d1d7e73941f1abdbb95a92 F autoconf/README.first f1d3876e9a7852c22f275a6f06814e64934cecbc0b5b9617d64849094c1fd136 F autoconf/README.txt 7f01dc3915e2d68f329011073662369e62a0938a2c69398807823c57591cb288 -F autoconf/auto.def 64c1a116162da18783a5467b49e539538f7013ea50ae192f182987b5c2f66f9e +F autoconf/auto.def 9d744a4eb4c8df797580d45c7c0be373f57a66eb26c28d4176fb50f0bddb2c0f F autoconf/tea/Makefile.in ba0556fee8da09c066bad85a4457904e46ee2c2eabaa309c0e83a78f2f151a8e F autoconf/tea/README.txt 61e62e519579e4a112791354d6d440f8b51ea6db3b0bab58d59f29df42d2dfe3 F autoconf/tea/aclocal.m4 52c47aac44ce0ddb1f918b6993e8beb8eee88f43 @@ -49,8 +49,8 @@ F autosetup/cc-shared.tcl 4f024e94a47f427ba61de1739f6381ef0080210f9fae89112d5c1d F autosetup/cc.tcl c0fcc50ca91deff8741e449ddad05bcd08268bc31177e613a6343bbd1fd3e45f F autosetup/jimsh0.c a57c16e65dcffc9c76e496757cb3f7fb47e01ecbd1631a0a5e01751fc856f049 F autosetup/pkg-config.tcl 4e635bf39022ff65e0d5434339dd41503ea48fc53822c9c5bde88b02d3d952ba -F autosetup/proj.tcl cc300c15633cb2835eb52c235c5abfd2de0e8e989e9b650e82df3c1d3b856d22 -F autosetup/sqlite-config.tcl e55569f6ab09a19af7b89c71c20b77b13c8594c9dd6ef2b4463611b8ee76b927 +F autosetup/proj.tcl e69b91f814ea510057ce7663845de703c3746d71cff9a0db6b2563ee3e7fd25e +F autosetup/sqlite-config.tcl 02641273a8b03e76e90099acf3879661962ecea09034812cc73d3bec83bb38c6 F autosetup/system.tcl 51d4be76cd9a9074704b584e5c9cbba616202c8468cf9ba8a4f8294a7ab1dba9 F configure 9a00b21dfd13757bbfb8d89b30660a89ec1f8f3a79402b8f9f9b6fc475c3303a x F contrib/sqlitecon.tcl 210a913ad63f9f991070821e599d600bd913e0ad @@ -2210,8 +2210,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P 6f904f0695c7e3396522c061170d6201b256af0294afeefcf8b6672e3ba15987 -R cf9fc5d44286845f3980ae6c5b3ec3e6 +P 8641e2c7c868be67ebb367fe7c8ceeee0e0d96574c164191ce9e340e7a527f49 +R 818a30faa9e290412a92ac5e650b3758 U stephan -Z 5fd2d1e9c016bedf0db0ccd156948622 +Z 9054f5a6c6f9641c08e70f76bffc8fa1 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 1632237ee3..6674ad5ea6 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -8641e2c7c868be67ebb367fe7c8ceeee0e0d96574c164191ce9e340e7a527f49 +76a4efa9668791f23de8d4db1788708891f5efa01ba73bced6abfc54391c3b28 From ed36fb77e96df2691e7803026909c36fb08442c2 Mon Sep 17 00:00:00 2001 From: stephan Date: Mon, 24 Feb 2025 10:30:59 +0000 Subject: [PATCH 167/194] Move the configure output about the SQLite version and build dirs up, so that they appear before any tests for the C compiler and such. FossilOrigin-Name: 83e0f3d138abf33751f735169aee752ba1677c5df37c3947f2c8be3ea3629822 --- autosetup/sqlite-config.tcl | 37 +++++++++++++++++++------------------ manifest | 12 ++++++------ manifest.uuid | 2 +- 3 files changed, 26 insertions(+), 25 deletions(-) diff --git a/autosetup/sqlite-config.tcl b/autosetup/sqlite-config.tcl index 14f515a2a2..a1347660df 100644 --- a/autosetup/sqlite-config.tcl +++ b/autosetup/sqlite-config.tcl @@ -12,7 +12,25 @@ if {[string first " " $autosetup(builddir)] != -1} { may not contain space characters" } -use cc cc-db cc-shared cc-lib pkg-config proj +use proj +######################################################################## +# Set up PACKAGE_NAME and related defines and emit some useful +# bootstrapping info to the user. +proc sqlite-setup-package-info {} { + set srcdir $::autosetup(srcdir) + set PACKAGE_VERSION [proj-file-content -trim $srcdir/VERSION] + define PACKAGE_NAME "sqlite" + define PACKAGE_URL {https://sqlite.org} + define PACKAGE_VERSION $PACKAGE_VERSION + define PACKAGE_STRING "[get-define PACKAGE_NAME] $PACKAGE_VERSION" + define PACKAGE_BUGREPORT [get-define PACKAGE_URL]/forum + msg-result "Configuring SQLite version $PACKAGE_VERSION" + msg-result "Source dir = $srcdir" + msg-result "Build dir = $::autosetup(builddir)" +} +sqlite-setup-package-info + +use cc cc-db cc-shared cc-lib pkg-config #proj-redefine-cc-for-build; # arguable # @@ -364,26 +382,9 @@ proc sqlite-post-options-init {} { define SQLITE_OS_WIN 0 } set ::sqliteConfig(msg-debug-enabled) [proj-val-truthy [get-env msg-debug 0]] - sqlite-setup-package-info sqlite-setup-default-cflags } -######################################################################## -# Called by [sqlite-post-options-init] to set up PACKAGE_NAME and -# related defines. -proc sqlite-setup-package-info {} { - set srcdir $::autosetup(srcdir) - set PACKAGE_VERSION [proj-file-content -trim $srcdir/VERSION] - define PACKAGE_NAME "sqlite" - define PACKAGE_URL {https://sqlite.org} - define PACKAGE_VERSION $PACKAGE_VERSION - define PACKAGE_STRING "[get-define PACKAGE_NAME] $PACKAGE_VERSION" - define PACKAGE_BUGREPORT [get-define PACKAGE_URL]/forum - msg-result "Source dir = $srcdir" - msg-result "Build dir = $::autosetup(builddir)" - msg-result "Configuring SQLite version $PACKAGE_VERSION" -} - ######################################################################## # Internal config-time debugging output routine. It generates no # output unless msg-debug=1 is passed to the configure script. diff --git a/manifest b/manifest index fecfd56977..418d0d510e 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Further\sconsolidation\sof\sthe\smain\sauto.def\sand\sthe\sautoconf\sauto.def\scontent\sinto\ssqlite-config.tcl. -D 2025-02-24T08:42:40.698 +C Move\sthe\sconfigure\soutput\sabout\sthe\sSQLite\sversion\sand\sbuild\sdirs\sup,\sso\sthat\sthey\sappear\sbefore\sany\stests\sfor\sthe\sC\scompiler\sand\ssuch. +D 2025-02-24T10:30:59.511 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d @@ -50,7 +50,7 @@ F autosetup/cc.tcl c0fcc50ca91deff8741e449ddad05bcd08268bc31177e613a6343bbd1fd3e F autosetup/jimsh0.c a57c16e65dcffc9c76e496757cb3f7fb47e01ecbd1631a0a5e01751fc856f049 F autosetup/pkg-config.tcl 4e635bf39022ff65e0d5434339dd41503ea48fc53822c9c5bde88b02d3d952ba F autosetup/proj.tcl e69b91f814ea510057ce7663845de703c3746d71cff9a0db6b2563ee3e7fd25e -F autosetup/sqlite-config.tcl 02641273a8b03e76e90099acf3879661962ecea09034812cc73d3bec83bb38c6 +F autosetup/sqlite-config.tcl 77773e9bd1dff7ba78a48e38adc8346dab6fe88765b0ee7526537fb121d09d7b F autosetup/system.tcl 51d4be76cd9a9074704b584e5c9cbba616202c8468cf9ba8a4f8294a7ab1dba9 F configure 9a00b21dfd13757bbfb8d89b30660a89ec1f8f3a79402b8f9f9b6fc475c3303a x F contrib/sqlitecon.tcl 210a913ad63f9f991070821e599d600bd913e0ad @@ -2210,8 +2210,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P 8641e2c7c868be67ebb367fe7c8ceeee0e0d96574c164191ce9e340e7a527f49 -R 818a30faa9e290412a92ac5e650b3758 +P 76a4efa9668791f23de8d4db1788708891f5efa01ba73bced6abfc54391c3b28 +R 4667efa7b570cf92b4a6f51968976648 U stephan -Z 9054f5a6c6f9641c08e70f76bffc8fa1 +Z 61416e11f4cbb69393a38e27073f54d5 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 6674ad5ea6..44bddbb0c8 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -76a4efa9668791f23de8d4db1788708891f5efa01ba73bced6abfc54391c3b28 +83e0f3d138abf33751f735169aee752ba1677c5df37c3947f2c8be3ea3629822 From ffe65da5693ccfa002d4fff018f8bb7829243d49 Mon Sep 17 00:00:00 2001 From: stephan Date: Mon, 24 Feb 2025 11:21:32 +0000 Subject: [PATCH 168/194] Further consolidation of auto.def and autoconf/auto.def. Note in configure --help that --disable-largefile is a legacy option which has no effect on the library but may influence the generated sqlite_cfg.h. FossilOrigin-Name: 17fd6836f362c646d6dadb40adc0a8a31e2bfc9416651dde2c156400b3aa06dd --- auto.def | 15 --------------- autoconf/auto.def | 2 -- autosetup/sqlite-config.tcl | 34 +++++++++++++++++++++++++--------- manifest | 16 ++++++++-------- manifest.uuid | 2 +- 5 files changed, 34 insertions(+), 35 deletions(-) diff --git a/auto.def b/auto.def index f868851e3d..020135d6fa 100644 --- a/auto.def +++ b/auto.def @@ -30,21 +30,6 @@ sqlite-check-common-bins ;# must come before [sqlite-handle-wasi-sdk] sqlite-handle-wasi-sdk ;# must run relatively early, as it changes the environment sqlite-check-common-system-deps -# -# Enable large file support (if special flags are necessary) -# -define HAVE_LFS 0 -if {[opt-bool largefile]} { - cc-check-lfs -} - -proj-define-for-opt shared ENABLE_LIB_SHARED "Build shared library?" - -if {![proj-define-for-opt static ENABLE_LIB_STATIC \ - "Build static library?"]} { - proj-warn "Static lib build may be implicitly re-activated by other components, e.g. some test apps." -} - proj-define-for-opt amalgamation USE_AMALGAMATION "Use amalgamation for builds?" proj-define-for-opt gcov USE_GCOV "Use gcov?" diff --git a/autoconf/auto.def b/autoconf/auto.def index 8ba5bb6199..1a79565387 100644 --- a/autoconf/auto.def +++ b/autoconf/auto.def @@ -11,8 +11,6 @@ use sqlite-config sqlite-config-bootstrap autoconf define ENABLE_STATIC_SHELL [opt-bool static-shell] -define ENABLE_LIB_SHARED [opt-bool shared] -define ENABLE_LIB_STATIC [opt-bool static] sqlite-check-common-bins sqlite-check-common-system-deps sqlite-config-finalize diff --git a/autosetup/sqlite-config.tcl b/autosetup/sqlite-config.tcl index a1347660df..d9201518ff 100644 --- a/autosetup/sqlite-config.tcl +++ b/autosetup/sqlite-config.tcl @@ -153,7 +153,7 @@ proc sqlite-config-bootstrap {buildMode} { build-modes { {*} { shared=1 => {Disable build of shared libary} - static=1 => {Disable build of static library (mostly)} + static=1 => {Disable build of static library} } {canonical} { amalgamation=1 => {Disable the amalgamation and instead build all files separately} @@ -165,7 +165,9 @@ proc sqlite-config-bootstrap {buildMode} { {*} { threadsafe=1 => {Disable mutexing} with-tempstore:=no => {Use an in-RAM database for temporary tables: never,no,yes,always} - largefile=1 => {Disable large file support} + largefile=1 + => {This legacy flag has no effect on the library but may influence + the contents of the generated sqlite_cfg.h} # ^^^ It's not clear that this actually does anything, as # HAVE_LFS is not checked anywhere in the .c/.h/.in files. load-extension=1 => {Disable loading of external extensions} @@ -1443,13 +1445,27 @@ proc sqlite-handle-env-quirks {} { # Performs late-stage config steps common to both the canonical and # autoconf bundle builds. proc sqlite-config-finalize {} { -# Pending: move some of the auto.def code into this switch -# switch -exact -- $::sqliteConfig(build-mode) { -# canonical { -# } -# autoconf { -# } -# } + define HAVE_LFS 0 + if {[opt-bool largefile]} { + # + # Insofar as we can determine HAVE_LFS has no effect on the + # library. Perhaps it did back in the early 2000's. The + # --enable/disable-largefile flag is retained because it's + # harmless, but it doesn't do anything useful. + # + cc-check-lfs + } + proj-define-for-opt shared ENABLE_LIB_SHARED "Build shared library?" + + if {![proj-define-for-opt static ENABLE_LIB_STATIC \ + "Build static library?"]} { + if {"canonical" eq $::sqliteConfig(build-mode)} { + proj-indented-notice { + NOTICE: static lib build may be implicitly re-activated by + other components, e.g. some test apps. + } + } + } sqlite-handle-debug sqlite-handle-rpath diff --git a/manifest b/manifest index 418d0d510e..38de687a34 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Move\sthe\sconfigure\soutput\sabout\sthe\sSQLite\sversion\sand\sbuild\sdirs\sup,\sso\sthat\sthey\sappear\sbefore\sany\stests\sfor\sthe\sC\scompiler\sand\ssuch. -D 2025-02-24T10:30:59.511 +C Further\sconsolidation\sof\sauto.def\sand\sautoconf/auto.def.\sNote\sin\sconfigure\s--help\sthat\s--disable-largefile\sis\sa\slegacy\soption\swhich\shas\sno\seffect\son\sthe\slibrary\sbut\smay\sinfluence\sthe\sgenerated\ssqlite_cfg.h. +D 2025-02-24T11:21:32.119 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d @@ -14,13 +14,13 @@ F art/sqlite370.eps aa97a671332b432a54e1d74ff5e8775be34200c2 F art/sqlite370.ico af56c1d00fee7cd4753e8631ed60703ed0fc6e90 F art/sqlite370.jpg d512473dae7e378a67e28ff96a34da7cb331def2 F art/sqlite370.svg 40b7e2fe8aac3add5d56dd86ab8d427a4eca5bcb3fe4f8946cb3794e1821d531 -F auto.def 165e8e8270b8256db1dd065e8a2f3b7af612421e8a23b8fe08b74d7cbbf12043 +F auto.def 97417bef4f6b6f35795f6b4d891ab57f18f367ff8939257fd1e711c9db003148 F autoconf/Makefile.fallback 22fe523eb36dfce31e0f6349f782eb084e86a5620b2b0b4f84a2d6133f53f5ac F autoconf/Makefile.in c9a7007181df2a07d08bd63c6ba395ed38705aa218789726951aabebec32ee27 F autoconf/Makefile.msc 1249e425a24859c7b3f17575275247df9eec3bddc0d1d7e73941f1abdbb95a92 F autoconf/README.first f1d3876e9a7852c22f275a6f06814e64934cecbc0b5b9617d64849094c1fd136 F autoconf/README.txt 7f01dc3915e2d68f329011073662369e62a0938a2c69398807823c57591cb288 -F autoconf/auto.def 9d744a4eb4c8df797580d45c7c0be373f57a66eb26c28d4176fb50f0bddb2c0f +F autoconf/auto.def 9671075172cb4ebcfeceba14084e9921e4105fb43f5c1d73ac97d48b0b4ef023 F autoconf/tea/Makefile.in ba0556fee8da09c066bad85a4457904e46ee2c2eabaa309c0e83a78f2f151a8e F autoconf/tea/README.txt 61e62e519579e4a112791354d6d440f8b51ea6db3b0bab58d59f29df42d2dfe3 F autoconf/tea/aclocal.m4 52c47aac44ce0ddb1f918b6993e8beb8eee88f43 @@ -50,7 +50,7 @@ F autosetup/cc.tcl c0fcc50ca91deff8741e449ddad05bcd08268bc31177e613a6343bbd1fd3e F autosetup/jimsh0.c a57c16e65dcffc9c76e496757cb3f7fb47e01ecbd1631a0a5e01751fc856f049 F autosetup/pkg-config.tcl 4e635bf39022ff65e0d5434339dd41503ea48fc53822c9c5bde88b02d3d952ba F autosetup/proj.tcl e69b91f814ea510057ce7663845de703c3746d71cff9a0db6b2563ee3e7fd25e -F autosetup/sqlite-config.tcl 77773e9bd1dff7ba78a48e38adc8346dab6fe88765b0ee7526537fb121d09d7b +F autosetup/sqlite-config.tcl 7207843e3e4ca80df4f4e65585dbc33d858c52a105f7b649911c2476dc872cd0 F autosetup/system.tcl 51d4be76cd9a9074704b584e5c9cbba616202c8468cf9ba8a4f8294a7ab1dba9 F configure 9a00b21dfd13757bbfb8d89b30660a89ec1f8f3a79402b8f9f9b6fc475c3303a x F contrib/sqlitecon.tcl 210a913ad63f9f991070821e599d600bd913e0ad @@ -2210,8 +2210,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P 76a4efa9668791f23de8d4db1788708891f5efa01ba73bced6abfc54391c3b28 -R 4667efa7b570cf92b4a6f51968976648 +P 83e0f3d138abf33751f735169aee752ba1677c5df37c3947f2c8be3ea3629822 +R 9adef019cb4ebe2274efa08aba0bf1a4 U stephan -Z 61416e11f4cbb69393a38e27073f54d5 +Z c421f79f7ead56e5e7976de7916f8519 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 44bddbb0c8..2448c62e24 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -83e0f3d138abf33751f735169aee752ba1677c5df37c3947f2c8be3ea3629822 +17fd6836f362c646d6dadb40adc0a8a31e2bfc9416651dde2c156400b3aa06dd From d2060072f38a1793ed52a31e99d62a5d051e6db5 Mon Sep 17 00:00:00 2001 From: stephan Date: Mon, 24 Feb 2025 12:19:06 +0000 Subject: [PATCH 169/194] Configure doc tweaks. Move the package version/build dir output so that it does not appear at the start of --help text, but otherwise still appears before the first output from low-level config initialization. FossilOrigin-Name: 826bad10e9ccd6f71e6dad90d41fb7d4a941e459d2e080901345ed8877ad5e38 --- autosetup/sqlite-config.tcl | 28 ++++++++++++++++++---------- manifest | 12 ++++++------ manifest.uuid | 2 +- 3 files changed, 25 insertions(+), 17 deletions(-) diff --git a/autosetup/sqlite-config.tcl b/autosetup/sqlite-config.tcl index d9201518ff..24362e0158 100644 --- a/autosetup/sqlite-config.tcl +++ b/autosetup/sqlite-config.tcl @@ -28,10 +28,6 @@ proc sqlite-setup-package-info {} { msg-result "Source dir = $srcdir" msg-result "Build dir = $::autosetup(builddir)" } -sqlite-setup-package-info - -use cc cc-db cc-shared cc-lib pkg-config -#proj-redefine-cc-for-build; # arguable # # Object for communicating config-time state across various @@ -256,9 +252,10 @@ proc sqlite-config-bootstrap {buildMode} { # build with-wasi-sdk:=/opt/wasi-sdk => {Top-most dir of the wasi-sdk for a WASI build} + with-emsdk:=auto => {Top-most dir of the Emscripten SDK installation. - Default = EMSDK env var.} + Needed only by ext/wasm build. Default=EMSDK env var.} } } @@ -282,8 +279,7 @@ proc sqlite-config-bootstrap {buildMode} { e.g. --soname=9.10 equates to "libsqlite3.so.9.10".} # dll-basename: https://sqlite.org/forum/forumpost/828fdfe904 dll-basename:=auto - => {Specifies the base name of the resulting DLL file, defaulting to a - platform-depending name (libsqlite3 on most Unix-style platforms). + => {Specifies the base name of the resulting DLL file. If not provided, libsqlite3 is usually assumed but on some platforms a platform-dependent default is used. On some platforms this flag gets automatically enabled if it is not provided. Use "default" to @@ -354,6 +350,14 @@ proc sqlite-config-bootstrap {buildMode} { # called from deeper than the global scope. return -code break } + sqlite-setup-package-info + uplevel 1 { + # The odd placement of this block is so that we can emit the + # output from sqlite-setup-package-info after --help is processed + # but before any other info is emitted, e.g. the host/target + # system info and the C compiler check. + use cc cc-db cc-shared cc-lib pkg-config + } sqlite-post-options-init }; # sqlite-config-bootstrap @@ -1319,10 +1323,11 @@ proc sqlite-handle-dll-basename {} { # # Platform notes: # -# - cygwin packages historically install no .dll.a file. +# - cygwin sqlite packages historically install no .dll.a file. # -# - msys2 packages historically install /usr/lib/libsqlite3.dll.a -# despite the DLL being in /usr/bin/msys-sqlite3-0.dll. +# - msys2 and mingw sqlite packages historically install +# /usr/lib/libsqlite3.dll.a despite the DLL being in +# /usr/bin/msys-sqlite3-0.dll. proc sqlite-handle-out-implib {} { define LDFLAGS_OUT_IMPLIB "" define SQLITE_OUT_IMPLIB "" @@ -1331,6 +1336,9 @@ proc sqlite-handle-out-implib {} { set olBaseName [join [opt-val out-implib] ""] if {$olBaseName in {auto ""}} { set olBaseName "libsqlite3" ;# [get-define SQLITE_DLL_BASENAME] + # Based on discussions with mingw/msys users, the import lib + # should always be called libsqlite3.dll.a even on platforms + # which rename libsqlite3.dll to something else. } if {$olBaseName ne "none"} { cc-with {-link 1} { diff --git a/manifest b/manifest index 38de687a34..ed7fb2cd97 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Further\sconsolidation\sof\sauto.def\sand\sautoconf/auto.def.\sNote\sin\sconfigure\s--help\sthat\s--disable-largefile\sis\sa\slegacy\soption\swhich\shas\sno\seffect\son\sthe\slibrary\sbut\smay\sinfluence\sthe\sgenerated\ssqlite_cfg.h. -D 2025-02-24T11:21:32.119 +C Configure\sdoc\stweaks.\sMove\sthe\spackage\sversion/build\sdir\soutput\sso\sthat\sit\sdoes\snot\sappear\sat\sthe\sstart\sof\s--help\stext,\sbut\sotherwise\sstill\sappears\sbefore\sthe\sfirst\soutput\sfrom\slow-level\sconfig\sinitialization. +D 2025-02-24T12:19:06.652 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d @@ -50,7 +50,7 @@ F autosetup/cc.tcl c0fcc50ca91deff8741e449ddad05bcd08268bc31177e613a6343bbd1fd3e F autosetup/jimsh0.c a57c16e65dcffc9c76e496757cb3f7fb47e01ecbd1631a0a5e01751fc856f049 F autosetup/pkg-config.tcl 4e635bf39022ff65e0d5434339dd41503ea48fc53822c9c5bde88b02d3d952ba F autosetup/proj.tcl e69b91f814ea510057ce7663845de703c3746d71cff9a0db6b2563ee3e7fd25e -F autosetup/sqlite-config.tcl 7207843e3e4ca80df4f4e65585dbc33d858c52a105f7b649911c2476dc872cd0 +F autosetup/sqlite-config.tcl 5ea649be4e1111fb7a901fc27334a468545a46397b872a8aaa625b8f6ff46684 F autosetup/system.tcl 51d4be76cd9a9074704b584e5c9cbba616202c8468cf9ba8a4f8294a7ab1dba9 F configure 9a00b21dfd13757bbfb8d89b30660a89ec1f8f3a79402b8f9f9b6fc475c3303a x F contrib/sqlitecon.tcl 210a913ad63f9f991070821e599d600bd913e0ad @@ -2210,8 +2210,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P 83e0f3d138abf33751f735169aee752ba1677c5df37c3947f2c8be3ea3629822 -R 9adef019cb4ebe2274efa08aba0bf1a4 +P 17fd6836f362c646d6dadb40adc0a8a31e2bfc9416651dde2c156400b3aa06dd +R 7df87f1f103b72910ba69cc1b491c805 U stephan -Z c421f79f7ead56e5e7976de7916f8519 +Z 00962c02ea8650e5ddad857abc8c633a # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 2448c62e24..c2382c94d8 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -17fd6836f362c646d6dadb40adc0a8a31e2bfc9416651dde2c156400b3aa06dd +826bad10e9ccd6f71e6dad90d41fb7d4a941e459d2e080901345ed8877ad5e38 From 21b431e6851c5f652932b27cf67c4a541b5ea97a Mon Sep 17 00:00:00 2001 From: drh <> Date: Mon, 24 Feb 2025 12:41:30 +0000 Subject: [PATCH 170/194] Ongoing work to get all the quoting and escaping variations in the CLI working correctly. FossilOrigin-Name: b77aea93e7eff0af408f598727caedcfc4428361b8440fbc1cc54c18f93abb69 --- manifest | 12 +++++------ manifest.uuid | 2 +- src/shell.c.in | 54 ++++++++++++++++++++++++++++++++++++-------------- 3 files changed, 46 insertions(+), 22 deletions(-) diff --git a/manifest b/manifest index 640183e406..f506fa17f2 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Make\scolumn\soutput\smodes\sin\sthe\sCLI\sresponsive\sto\sthe\s--escape\ssetting. -D 2025-02-24T00:40:36.130 +C Ongoing\swork\sto\sget\sall\sthe\squoting\sand\sescaping\svariations\sin\sthe\sCLI\nworking\scorrectly. +D 2025-02-24T12:41:30.706 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d @@ -782,7 +782,7 @@ F src/random.c 606b00941a1d7dd09c381d3279a058d771f406c5213c9932bbd93d5587be4b9c F src/resolve.c 626c24b258b111f75c22107aa5614ad89810df3026f5ca071116d3fe75925c75 F src/rowset.c 8432130e6c344b3401a8874c3cb49fefe6873fec593294de077afea2dce5ec97 F src/select.c a076f7db3a0fcbd9f710d7746cfc07e0b3baadee45eb3136bedc29c598ef8f1c -F src/shell.c.in 93b115083f702bfef5b4cfabc908ff7c56275a8eb43837695940e953cd98b1d6 +F src/shell.c.in 10182a36de8c86c90c59933d9d8a41657c34ecf4b80986d1e4f508c5d39f1cb8 F src/sqlite.h.in 8d4486fb28a90de818ac1e8c6206ea458e7de6bd8e0dfa3d554494f155be8c01 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8 F src/sqlite3ext.h 3f046c04ea3595d6bfda99b781926b17e672fd6d27da2ba6d8d8fc39981dcb54 @@ -2210,8 +2210,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P b5adb52fc0dc1838cb9c66cff422f2b8ec147e546cf909dd3c48731fa1edfe50 -R e22b9c730b45578a252088be598cc957 +P 14ff5557d450475ad959f8c753c0cecb85dfca7346fcacd91da16e4d36e30508 +R 11c66d594c249e2c939f76c526b8b2e2 U drh -Z 0141780f340c58ec2ae1b4be639dc53e +Z 582aa1340d3741b95a01f42fe569eeff # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index fc19a63267..3f039c96a3 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -14ff5557d450475ad959f8c753c0cecb85dfca7346fcacd91da16e4d36e30508 +b77aea93e7eff0af408f598727caedcfc4428361b8440fbc1cc54c18f93abb69 diff --git a/src/shell.c.in b/src/shell.c.in index 401c4bcc05..6b363d1791 100644 --- a/src/shell.c.in +++ b/src/shell.c.in @@ -1892,9 +1892,18 @@ static void output_hex_blob(FILE *out, const void *pBlob, int nBlob){ } /* -** Output the given string as a quoted string using SQL quoting conventions. +** Output the given string as a quoted string using SQL quoting conventions: ** -** See also: output_quoted_escaped_string() +** (1) Single quotes (') within the string are doubled +** (2) The whle string is enclosed in '...' +** (3) Control characters other than \n, \t, and \r\n are escaped +** using \u00XX notation and if such substitutions occur, +** the whole string is enclosed in unistr('...') instead of '...'. +** +** Step (3) is omitted if the control-character escape mode is OFF. +** +** See also: output_quoted_escaped_string() which does the same except +** that it does not make exceptions for \n, \t, and \r\n in step (3). */ static void output_quoted_string(ShellState *p, const char *zInX){ int i; @@ -1913,8 +1922,14 @@ static void output_quoted_string(ShellState *p, const char *zInX){ needUnistr = 1; break; } - if( needDblQuote==0 && needUnistr==0 ){ + if( (needDblQuote==0 && needUnistr==0) + || (needDblQuote==0 && p->eEscMode==SHELL_ESC_OFF) + ){ sqlite3_fprintf(out, "'%s'",z); + }else if( p->eEscMode==SHELL_ESC_OFF ){ + char *zEncoded = sqlite3_mprintf("%Q", z); + sqlite3_fputs(zEncoded, out); + sqlite3_free(zEncoded); }else{ if( needUnistr ){ sqlite3_fputs("unistr('", out); @@ -1936,7 +1951,6 @@ static void output_quoted_string(ShellState *p, const char *zInX){ if( c==0 ) break; if( c=='\'' ){ sqlite3_fputs("''", out); - continue; }else{ sqlite3_fprintf(out, "\\u%04x", c); } @@ -1961,8 +1975,13 @@ static void output_quoted_string(ShellState *p, const char *zInX){ ** escape mechanism. */ static void output_quoted_escaped_string(ShellState *p, const char *z){ - char *zEscaped = sqlite3_mprintf("%#Q", z); + char *zEscaped; sqlite3_fsetmode(out, _O_BINARY); + if( p->eEscMode==SHELL_ESC_OFF ){ + zEscaped = sqlite3_mprintf("%Q", z); + }else{ + zEscaped = sqlite3_mprintf("%#Q", z); + } sqlite3_fputs(zEscaped, p->out); sqlite3_free(zEscaped); setCrlfMode(p); @@ -9857,37 +9876,39 @@ static int do_meta_command(char *zLine, ShellState *p){ const char *zMode = 0; const char *zTabname = 0; int i, n2; - int chng = 0; + int chng = 0; /* 0x01: change to cmopts. 0x02: Any other change */ ColModeOpts cmOpts = ColModeOpts_default; for(i=1; ieEscMode = k; - chng = 1; + chng |= 2; break; } } if( k>=ArraySize(shell_EscModeNames) ){ - sqlite3_fprintf(stderr, "unknown escape mod \"%s\" - choices:", zEsc); + sqlite3_fprintf(stderr, "unknown control character escape mode \"%s\"" + " - choices:", zEsc); for(k=0; kmode]; + if( (chng&1)==0 ) cmOpts = p->cmOpts; } n2 = strlen30(zMode); if( cli_strncmp(zMode,"lines",n2)==0 ){ @@ -13236,6 +13258,7 @@ int SQLITE_CDECL wmain(int argc, wchar_t **wargv){ data.mode = MODE_Csv; memcpy(data.colSeparator,",",2); }else if( cli_strcmp(z,"-escape")==0 && i+1=ArraySize(shell_EscModeNames) ){ - sqlite3_fprintf(stderr, "unknown escape mode \"%s\" - choices:", zEsc); + sqlite3_fprintf(stderr, "unknown control character escape mode \"%s\"" + " - choices:", zEsc); for(k=0; k Date: Mon, 24 Feb 2025 13:27:16 +0000 Subject: [PATCH 171/194] Bug fix and initial test-case infrastructure for control-character escaping in the CLI. FossilOrigin-Name: c809997792602a7299b8ab84d018a03d291695e308ce750fc8b9d7a824edfd6e --- manifest | 13 +++---- manifest.uuid | 2 +- src/shell.c.in | 2 +- test/shellA.test | 89 ++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 98 insertions(+), 8 deletions(-) create mode 100644 test/shellA.test diff --git a/manifest b/manifest index f506fa17f2..cbc31b8ddb 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Ongoing\swork\sto\sget\sall\sthe\squoting\sand\sescaping\svariations\sin\sthe\sCLI\nworking\scorrectly. -D 2025-02-24T12:41:30.706 +C Bug\sfix\sand\sinitial\stest-case\sinfrastructure\sfor\scontrol-character\sescaping\nin\sthe\sCLI. +D 2025-02-24T13:27:16.805 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d @@ -782,7 +782,7 @@ F src/random.c 606b00941a1d7dd09c381d3279a058d771f406c5213c9932bbd93d5587be4b9c F src/resolve.c 626c24b258b111f75c22107aa5614ad89810df3026f5ca071116d3fe75925c75 F src/rowset.c 8432130e6c344b3401a8874c3cb49fefe6873fec593294de077afea2dce5ec97 F src/select.c a076f7db3a0fcbd9f710d7746cfc07e0b3baadee45eb3136bedc29c598ef8f1c -F src/shell.c.in 10182a36de8c86c90c59933d9d8a41657c34ecf4b80986d1e4f508c5d39f1cb8 +F src/shell.c.in b6b9db1a32ac2befb2547d1cc6d35aacffdce20832a9ef19bc2cbd6d9c210365 F src/sqlite.h.in 8d4486fb28a90de818ac1e8c6206ea458e7de6bd8e0dfa3d554494f155be8c01 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8 F src/sqlite3ext.h 3f046c04ea3595d6bfda99b781926b17e672fd6d27da2ba6d8d8fc39981dcb54 @@ -1647,6 +1647,7 @@ F test/shell6.test e3b883b61d4916b6906678a35f9d19054861123ad91b856461e0a456273bd F test/shell7.test 43fd8e511c533bab5232e95c7b4be93b243451709e89582600d4b6e67693d5c3 F test/shell8.test aea51ecbcd4494c746b096aeff51d841d04d5f0dc4b62eb42427f16109b87acd F test/shell9.test 8742a5b390cdcef6369f5aa223e415aa4255a4129ef249b177887dc635a87209 +F test/shellA.test e7ff53be62d79ade789ae1d3108109ece789af43c20e4340fb1a6155c9283b09 F test/shmlock.test 3dbf017d34ab0c60abe6a44e447d3552154bd0c87b41eaf5ceacd408dd13fda5 F test/shortread1.test bb591ef20f0fd9ed26d0d12e80eee6d7ac8897a3 F test/show_speedtest1_rtree.tcl 32e6c5f073d7426148a6936a0408f4b5b169aba5 @@ -2210,8 +2211,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P 14ff5557d450475ad959f8c753c0cecb85dfca7346fcacd91da16e4d36e30508 -R 11c66d594c249e2c939f76c526b8b2e2 +P b77aea93e7eff0af408f598727caedcfc4428361b8440fbc1cc54c18f93abb69 +R 07a37e0204e0b2223ab24d63dd235850 U drh -Z 582aa1340d3741b95a01f42fe569eeff +Z 4fb627b379b6da581b9bfa45e4708891 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 3f039c96a3..88e50fa663 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -b77aea93e7eff0af408f598727caedcfc4428361b8440fbc1cc54c18f93abb69 +c809997792602a7299b8ab84d018a03d291695e308ce750fc8b9d7a824edfd6e diff --git a/src/shell.c.in b/src/shell.c.in index 6b363d1791..ad22156085 100644 --- a/src/shell.c.in +++ b/src/shell.c.in @@ -1976,7 +1976,7 @@ static void output_quoted_string(ShellState *p, const char *zInX){ */ static void output_quoted_escaped_string(ShellState *p, const char *z){ char *zEscaped; - sqlite3_fsetmode(out, _O_BINARY); + sqlite3_fsetmode(p->out, _O_BINARY); if( p->eEscMode==SHELL_ESC_OFF ){ zEscaped = sqlite3_mprintf("%Q", z); }else{ diff --git a/test/shellA.test b/test/shellA.test new file mode 100644 index 0000000000..5a94e7298f --- /dev/null +++ b/test/shellA.test @@ -0,0 +1,89 @@ +# 2025-02-24 +# +# The author disclaims copyright to this source code. In place of +# a legal notice, here is a blessing: +# +# May you do good and not evil. +# May you find forgiveness for yourself and forgive others. +# May you share freely, never taking more than you give. +# +#*********************************************************************** +# +# Test cases for the command-line shell - focusing on .mode and +# especially control-character escaping and the --escape option. +# +# TESTRUNNER: shell +# + +set testdir [file dirname $argv0] +source $testdir/tester.tcl +set CLI [test_cli_invocation] +db close +forcedelete test.db test.db-journal test.db-wal +sqlite3 db test.db + +do_execsql_test shellA-1.0 { + CREATE TABLE t1(a INT, x TEXT); + INSERT INTO t1 VALUES + (1, 'line with '' single quote'), + (2, concat(char(0x1b),'[31mVT-100 codes',char(0x1b),'[0m')), + (3, NULL), + (4, 1234), + (5, 568.25), + (6, unistr('new\u000aline')), + (7, unistr('carriage\u000dreturn')), + (8, 'last line'); +} {} + +# Initial verification that the database created correctly +# and that our calls to the CLI are working. +# +do_test shellA-1.2 { + exec $CLI test.db {.mode box} {SELECT * FROM t1;} +} { +┌───┬──────────────────────────┐ +│ a │ x │ +├───┼──────────────────────────┤ +│ 1 │ line with ' single quote │ +├───┼──────────────────────────┤ +│ 2 │ ␛[31mVT-100 codes␛[0m │ +├───┼──────────────────────────┤ +│ 3 │ │ +├───┼──────────────────────────┤ +│ 4 │ 1234 │ +├───┼──────────────────────────┤ +│ 5 │ 568.25 │ +├───┼──────────────────────────┤ +│ 6 │ new │ +│ │ line │ +├───┼──────────────────────────┤ +│ 7 │ carriage␍return │ +├───┼──────────────────────────┤ +│ 8 │ last line │ +└───┴──────────────────────────┘ +} + +# Default output mode uses symbols for control characters +# +do_test shellA-1.3 { + exec $CLI test.db {SELECT x FROM t1 WHERE a=2;} +} { +␛[31mVT-100 codes␛[0m +} +do_test shellA-1.4 { + exec $CLI test.db --escape ascii {SELECT x FROM t1 WHERE a=2;} +} { +^[[31mVT-100 codes^[[0m +} +do_test shellA-1.5 { + exec $CLI test.db {.mode list --escape symbol} {SELECT x FROM t1 WHERE a=2;} +} { +␛[31mVT-100 codes␛[0m +} +do_test shellA-1.6 { + exec $CLI test.db {.mode list --escape ascii} {SELECT x FROM t1 WHERE a=2;} +} { +^[[31mVT-100 codes^[[0m +} + +finish_test From b6205d4bc346c48b61d2fbba3e2030bc12e74ed5 Mon Sep 17 00:00:00 2001 From: drh <> Date: Mon, 24 Feb 2025 13:51:24 +0000 Subject: [PATCH 172/194] Add the unistr_quote() function that works like quote(), but also escape control characters using unistr() if necessary. FossilOrigin-Name: e99e37b54baf7283588ead4983e613a1e14c58a0b92be5f7b25b4d9d287b5324 --- manifest | 14 +++++++------- manifest.uuid | 2 +- src/func.c | 12 +++++++++--- src/sqliteInt.h | 2 +- 4 files changed, 18 insertions(+), 12 deletions(-) diff --git a/manifest b/manifest index cbc31b8ddb..0766051ecc 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Bug\sfix\sand\sinitial\stest-case\sinfrastructure\sfor\scontrol-character\sescaping\nin\sthe\sCLI. -D 2025-02-24T13:27:16.805 +C Add\sthe\sunistr_quote()\sfunction\sthat\sworks\slike\squote(),\sbut\salso\sescape\ncontrol\scharacters\susing\sunistr()\sif\snecessary. +D 2025-02-24T13:51:24.322 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d @@ -735,7 +735,7 @@ F src/delete.c 03a77ba20e54f0f42ebd8eddf15411ed6bdb06a2c472ac4b6b336521bf7cea42 F src/expr.c 6769d3f0ca9b1792e883e3ff21fdc5ca0033cece65571ebbf9d8b8fe2f47cd27 F src/fault.c 460f3e55994363812d9d60844b2a6de88826e007 F src/fkey.c 928ed2517e8732113d2b9821aa37af639688d752f4ea9ac6e0e393d713eeb76f -F src/func.c ddfb4f3b8d2fbbe46dbe2bb28c9c79fc1defb7855975dfd851f2dd8417cc70be +F src/func.c 9d352aee28d64e0b1e48fd7a4606d6700cce443055c6369f69bfcadbb9bd7adb F src/global.c a19e4b1ca1335f560e9560e590fc13081e21f670643367f99cb9e8f9dc7d615b F src/hash.c 73934a7f7ab1cb110614a9388cb516893b0cf5b7b69e4fd1a0780ac4ce166be7 F src/hash.h 46b92795a95bfefb210f52f0c316e9d7cdbcdd7e7fcfb0d8be796d3a5767cddf @@ -786,7 +786,7 @@ F src/shell.c.in b6b9db1a32ac2befb2547d1cc6d35aacffdce20832a9ef19bc2cbd6d9c21036 F src/sqlite.h.in 8d4486fb28a90de818ac1e8c6206ea458e7de6bd8e0dfa3d554494f155be8c01 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8 F src/sqlite3ext.h 3f046c04ea3595d6bfda99b781926b17e672fd6d27da2ba6d8d8fc39981dcb54 -F src/sqliteInt.h e74f0ea0bc4d3c16afd5004557b264137d6f1d61d2a1ff2a49877b0589945462 +F src/sqliteInt.h 587be8a6047992f44590bc255ea43ba7f2a46fbbf80da77c1eead07b31cf8a42 F src/sqliteLimit.h 6d817c28a8f19af95e6f4921933b7fbbca48a962bce0eb0ec81e8bb3ef38e68b F src/status.c 0e72e4f6be6ccfde2488eb63210297e75f569f3ce9920f6c3d77590ec6ce5ffd F src/table.c 0f141b58a16de7e2fbe81c308379e7279f4c6b50eb08efeec5892794a0ba30d1 @@ -2211,8 +2211,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P b77aea93e7eff0af408f598727caedcfc4428361b8440fbc1cc54c18f93abb69 -R 07a37e0204e0b2223ab24d63dd235850 +P c809997792602a7299b8ab84d018a03d291695e308ce750fc8b9d7a824edfd6e +R 58d2163ff5534cc6844d2cf453051f3d U drh -Z 4fb627b379b6da581b9bfa45e4708891 +Z b0d6064b39fceb84b42166ec949dbfe8 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 88e50fa663..c3f614942c 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -c809997792602a7299b8ab84d018a03d291695e308ce750fc8b9d7a824edfd6e +e99e37b54baf7283588ead4983e613a1e14c58a0b92be5f7b25b4d9d287b5324 diff --git a/src/func.c b/src/func.c index c80ac915a7..124dabe31c 100644 --- a/src/func.c +++ b/src/func.c @@ -1090,7 +1090,7 @@ static const char hexdigits[] = { ** Append to pStr text that is the SQL literal representation of the ** value contained in pValue. */ -void sqlite3QuoteValue(StrAccum *pStr, sqlite3_value *pValue){ +void sqlite3QuoteValue(StrAccum *pStr, sqlite3_value *pValue, int bEscape){ /* As currently implemented, the string must be initially empty. ** we might relax this requirement in the future, but that will ** require enhancements to the implementation. */ @@ -1138,7 +1138,7 @@ void sqlite3QuoteValue(StrAccum *pStr, sqlite3_value *pValue){ } case SQLITE_TEXT: { const unsigned char *zArg = sqlite3_value_text(pValue); - sqlite3_str_appendf(pStr, "%Q", zArg); + sqlite3_str_appendf(pStr, bEscape ? "%#Q" : "%Q", zArg); break; } default: { @@ -1218,6 +1218,7 @@ static void unistrFunc( u32 v; assert( argc==1 ); + UNUSED_PARAMETER( argc ); zIn = (const char*)sqlite3_value_text(argv[0]); if( zIn==0 ) return; nIn = sqlite3_value_bytes(argv[0]); @@ -1284,6 +1285,10 @@ unistr_error: ** as needed. BLOBs are encoded as hexadecimal literals. Strings with ** embedded NUL characters cannot be represented as string literals in SQL ** and hence the returned string literal is truncated prior to the first NUL. +** +** If sqlite3_user_data() is non-zero, then the UNISTR_QUOTE() function is +** implemented instead. The difference is that UNISTR_QUOTE() uses the +** UNISTR() function to escape control characters. */ static void quoteFunc(sqlite3_context *context, int argc, sqlite3_value **argv){ sqlite3_str str; @@ -1291,7 +1296,7 @@ static void quoteFunc(sqlite3_context *context, int argc, sqlite3_value **argv){ assert( argc==1 ); UNUSED_PARAMETER(argc); sqlite3StrAccumInit(&str, db, 0, 0, db->aLimit[SQLITE_LIMIT_LENGTH]); - sqlite3QuoteValue(&str,argv[0]); + sqlite3QuoteValue(&str,argv[0],SQLITE_PTR_TO_INT(sqlite3_user_data(context))); sqlite3_result_text(context, sqlite3StrAccumFinish(&str), str.nChar, SQLITE_DYNAMIC); if( str.accError!=SQLITE_OK ){ @@ -2864,6 +2869,7 @@ void sqlite3RegisterBuiltinFunctions(void){ FUNCTION(sqlite_log, 2, 0, 0, errlogFunc ), FUNCTION(unistr, 1, 0, 0, unistrFunc ), FUNCTION(quote, 1, 0, 0, quoteFunc ), + FUNCTION(unistr_quote, 1, 1, 0, quoteFunc ), VFUNCTION(last_insert_rowid, 0, 0, 0, last_insert_rowid), VFUNCTION(changes, 0, 0, 0, changes ), VFUNCTION(total_changes, 0, 0, 0, total_changes ), diff --git a/src/sqliteInt.h b/src/sqliteInt.h index de3ce7aa29..5e3ec4dade 100644 --- a/src/sqliteInt.h +++ b/src/sqliteInt.h @@ -5142,7 +5142,7 @@ Select *sqlite3SelectDup(sqlite3*,const Select*,int); FuncDef *sqlite3FunctionSearch(int,const char*); void sqlite3InsertBuiltinFuncs(FuncDef*,int); FuncDef *sqlite3FindFunction(sqlite3*,const char*,int,u8,u8); -void sqlite3QuoteValue(StrAccum*,sqlite3_value*); +void sqlite3QuoteValue(StrAccum*,sqlite3_value*,int); void sqlite3RegisterBuiltinFunctions(void); void sqlite3RegisterDateTimeFunctions(void); void sqlite3RegisterJsonFunctions(void); From e4f7af190824bfaeeb81f47fbbed5d9588cd3f8a Mon Sep 17 00:00:00 2001 From: drh <> Date: Mon, 24 Feb 2025 17:50:49 +0000 Subject: [PATCH 173/194] Only use unistr() in columnar formats when strictly needed. Do not use unistr() in insert mode when --escape is off. More test cases. FossilOrigin-Name: e029828de91b10b4c7f4a19bc70c35e4f36fae4ebf32b40553a6ba9f2b3af295 --- manifest | 14 ++-- manifest.uuid | 2 +- src/shell.c.in | 18 ++++- test/shellA.test | 177 ++++++++++++++++++++++++++++++++++++++++++++++- 4 files changed, 199 insertions(+), 12 deletions(-) diff --git a/manifest b/manifest index 0766051ecc..00220db5a2 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Add\sthe\sunistr_quote()\sfunction\sthat\sworks\slike\squote(),\sbut\salso\sescape\ncontrol\scharacters\susing\sunistr()\sif\snecessary. -D 2025-02-24T13:51:24.322 +C Only\suse\sunistr()\sin\scolumnar\sformats\swhen\sstrictly\sneeded.\nDo\snot\suse\sunistr()\sin\sinsert\smode\swhen\s--escape\sis\soff.\nMore\stest\scases. +D 2025-02-24T17:50:49.386 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d @@ -782,7 +782,7 @@ F src/random.c 606b00941a1d7dd09c381d3279a058d771f406c5213c9932bbd93d5587be4b9c F src/resolve.c 626c24b258b111f75c22107aa5614ad89810df3026f5ca071116d3fe75925c75 F src/rowset.c 8432130e6c344b3401a8874c3cb49fefe6873fec593294de077afea2dce5ec97 F src/select.c a076f7db3a0fcbd9f710d7746cfc07e0b3baadee45eb3136bedc29c598ef8f1c -F src/shell.c.in b6b9db1a32ac2befb2547d1cc6d35aacffdce20832a9ef19bc2cbd6d9c210365 +F src/shell.c.in abf1904193f1c7b6b95e2674606bd00f0b28a366b39e02a3e1e21a56ccf338d6 F src/sqlite.h.in 8d4486fb28a90de818ac1e8c6206ea458e7de6bd8e0dfa3d554494f155be8c01 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8 F src/sqlite3ext.h 3f046c04ea3595d6bfda99b781926b17e672fd6d27da2ba6d8d8fc39981dcb54 @@ -1647,7 +1647,7 @@ F test/shell6.test e3b883b61d4916b6906678a35f9d19054861123ad91b856461e0a456273bd F test/shell7.test 43fd8e511c533bab5232e95c7b4be93b243451709e89582600d4b6e67693d5c3 F test/shell8.test aea51ecbcd4494c746b096aeff51d841d04d5f0dc4b62eb42427f16109b87acd F test/shell9.test 8742a5b390cdcef6369f5aa223e415aa4255a4129ef249b177887dc635a87209 -F test/shellA.test e7ff53be62d79ade789ae1d3108109ece789af43c20e4340fb1a6155c9283b09 +F test/shellA.test 78efeadb4191240914e787325dc2edab44c586c4d9d3a44a2a4ab066190e7e63 F test/shmlock.test 3dbf017d34ab0c60abe6a44e447d3552154bd0c87b41eaf5ceacd408dd13fda5 F test/shortread1.test bb591ef20f0fd9ed26d0d12e80eee6d7ac8897a3 F test/show_speedtest1_rtree.tcl 32e6c5f073d7426148a6936a0408f4b5b169aba5 @@ -2211,8 +2211,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P c809997792602a7299b8ab84d018a03d291695e308ce750fc8b9d7a824edfd6e -R 58d2163ff5534cc6844d2cf453051f3d +P e99e37b54baf7283588ead4983e613a1e14c58a0b92be5f7b25b4d9d287b5324 +R 7e1ba0b26b7950463261b2769b28f47d U drh -Z b0d6064b39fceb84b42166ec949dbfe8 +Z 01fb520867e568bd6570d54d3dd4c9c9 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index c3f614942c..468d009ac9 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -e99e37b54baf7283588ead4983e613a1e14c58a0b92be5f7b25b4d9d287b5324 +e029828de91b10b4c7f4a19bc70c35e4f36fae4ebf32b40553a6ba9f2b3af295 diff --git a/src/shell.c.in b/src/shell.c.in index ad22156085..aed50a2ccf 100644 --- a/src/shell.c.in +++ b/src/shell.c.in @@ -4057,6 +4057,16 @@ static char *translateForDisplayAndDup( return (char*)zOut; } +/* Return true if the text string z[] contains characters that need +** unistr() escaping. +*/ +static int needUnistr(const unsigned char *z){ + unsigned char c; + if( z==0 ) return 0; + while( (c = *z)>0x1f || c=='\t' || c=='\n' || (c=='\r' && z[1]=='\n') ){ z++; } + return c!=0; +} + /* Extract the value of the i-th current column for pStmt as an SQL literal ** value. Memory is obtained from sqlite3_malloc64() and must be freed by ** the caller. @@ -4071,7 +4081,8 @@ static char *quoted_column(sqlite3_stmt *pStmt, int i){ return sqlite3_mprintf("%s",sqlite3_column_text(pStmt,i)); } case SQLITE_TEXT: { - return sqlite3_mprintf("%#Q",sqlite3_column_text(pStmt,i)); + const unsigned char *zText = sqlite3_column_text(pStmt,i); + return sqlite3_mprintf(needUnistr(zText)?"%#Q":"%Q",zText); } case SQLITE_BLOB: { int j; @@ -10001,6 +10012,11 @@ static int do_meta_command(char *zLine, ShellState *p){ }else if( cli_strncmp(zMode,"insert",n2)==0 ){ p->mode = MODE_Insert; set_table_name(p, zTabname ? zTabname : "table"); + if( p->eEscMode==SHELL_ESC_OFF ){ + ShellSetFlag(p, SHFLG_Newlines); + }else{ + ShellClearFlag(p, SHFLG_Newlines); + } }else if( cli_strncmp(zMode,"quote",n2)==0 ){ p->mode = MODE_Quote; sqlite3_snprintf(sizeof(p->colSeparator), p->colSeparator, SEP_Comma); diff --git a/test/shellA.test b/test/shellA.test index 5a94e7298f..56228e74cb 100644 --- a/test/shellA.test +++ b/test/shellA.test @@ -63,7 +63,7 @@ do_test shellA-1.2 { └───┴──────────────────────────┘ } -# Default output mode uses symbols for control characters +# ".mode list" # do_test shellA-1.3 { exec $CLI test.db {SELECT x FROM t1 WHERE a=2;} @@ -71,19 +71,190 @@ do_test shellA-1.3 { ␛[31mVT-100 codes␛[0m } do_test shellA-1.4 { + exec $CLI test.db --escape symbol {SELECT x FROM t1 WHERE a=2;} +} { +␛[31mVT-100 codes␛[0m +} +do_test shellA-1.5 { exec $CLI test.db --escape ascii {SELECT x FROM t1 WHERE a=2;} } { ^[[31mVT-100 codes^[[0m } -do_test shellA-1.5 { +do_test shellA-1.6 { exec $CLI test.db {.mode list --escape symbol} {SELECT x FROM t1 WHERE a=2;} } { ␛[31mVT-100 codes␛[0m } -do_test shellA-1.6 { +do_test shellA-1.7 { exec $CLI test.db {.mode list --escape ascii} {SELECT x FROM t1 WHERE a=2;} } { ^[[31mVT-100 codes^[[0m } +do_test shellA-1.8 { + file delete -force out.txt + exec $CLI test.db {.mode list --escape off} {SELECT x FROM t1 WHERE a=7;} \ + >out.txt + set fd [open out.txt rb] + set res [read $fd] + close $fd + string trim $res +} "carriage\rreturn" +do_test shellA-1.9 { + set rc [catch { + exec $CLI test.db {.mode test --escape xyz} + } msg] + lappend rc $msg +} {1 {unknown control character escape mode "xyz" - choices: symbol ascii off}} +do_test shellA-1.10 { + set rc [catch { + exec $CLI --escape abc test.db .q + } msg] + lappend rc $msg +} {1 {unknown control character escape mode "abc" - choices: symbol ascii off}} + +# ".mode quote" +# +do_test shellA-2.1 { + exec $CLI test.db --quote {SELECT a, x FROM t1 WHERE a IN (1,2,6,7,8)} +} { +1,'line with '' single quote' +2,unistr('\u001b[31mVT-100 codes\u001b[0m') +6,'new +line' +7,unistr('carriage\u000dreturn') +8,'last line' +} +do_test shellA-2.2 { + exec $CLI test.db --quote {.mode} +} {current output mode: quote --escape symbol} +do_test shellA-2.3 { + exec $CLI test.db --quote --escape ASCII {.mode} +} {current output mode: quote --escape ascii} +do_test shellA-2.4 { + exec $CLI test.db --quote --escape OFF {.mode} +} {current output mode: quote --escape off} + + +# ".mode line" +# +do_test shellA-3.1 { + exec $CLI test.db --line --escape symbol \ + {SELECT a, x FROM t1 WHERE a IN (1,2,6,7,8)} +} { + a = 1 + x = line with ' single quote + + a = 2 + x = ␛[31mVT-100 codes␛[0m + + a = 6 + x = new +line + + a = 7 + x = carriage␍return + + a = 8 + x = last line +} +do_test shellA-3.2 { + exec $CLI test.db --line --escape ascii \ + {SELECT a, x FROM t1 WHERE a IN (1,2,6,7,8)} +} { + a = 1 + x = line with ' single quote + + a = 2 + x = ^[[31mVT-100 codes^[[0m + + a = 6 + x = new +line + + a = 7 + x = carriage^Mreturn + + a = 8 + x = last line +} + +# ".mode box" +# +do_test shellA-4.1 { + exec $CLI test.db --box --escape ascii \ + {SELECT a, x FROM t1 WHERE a IN (1,2,6,7,8)} +} { +┌───┬──────────────────────────┐ +│ a │ x │ +├───┼──────────────────────────┤ +│ 1 │ line with ' single quote │ +├───┼──────────────────────────┤ +│ 2 │ ^[[31mVT-100 codes^[[0m │ +├───┼──────────────────────────┤ +│ 6 │ new │ +│ │ line │ +├───┼──────────────────────────┤ +│ 7 │ carriage^Mreturn │ +├───┼──────────────────────────┤ +│ 8 │ last line │ +└───┴──────────────────────────┘ +} +do_test shellA-4.2 { + exec $CLI test.db {.mode qbox} {SELECT a, x FROM t1 WHERE a IN (1,2,6,7,8)} +} { +┌───┬───────────────────────────────────────────┐ +│ a │ x │ +├───┼───────────────────────────────────────────┤ +│ 1 │ 'line with '' single quote' │ +├───┼───────────────────────────────────────────┤ +│ 2 │ unistr('\u001b[31mVT-100 codes\u001b[0m') │ +├───┼───────────────────────────────────────────┤ +│ 6 │ 'new │ +│ │ line' │ +├───┼───────────────────────────────────────────┤ +│ 7 │ unistr('carriage\u000dreturn') │ +├───┼───────────────────────────────────────────┤ +│ 8 │ 'last line' │ +└───┴───────────────────────────────────────────┘ +} + +# ".mode insert" +# +do_test shellA-5.1 { + exec $CLI test.db {.mode insert t1 --escape ascii} \ + {SELECT a, x FROM t1 WHERE a IN (1,2,6,7,8)} +} { +INSERT INTO t1 VALUES(1,'line with '' single quote'); +INSERT INTO t1 VALUES(2,unistr('\u001b[31mVT-100 codes\u001b[0m')); +INSERT INTO t1 VALUES(6,unistr('new\u000aline')); +INSERT INTO t1 VALUES(7,unistr('carriage\u000dreturn')); +INSERT INTO t1 VALUES(8,'last line'); +} +do_test shellA-5.2 { + exec $CLI test.db {.mode insert t1 --escape symbol} \ + {SELECT a, x FROM t1 WHERE a IN (1,2,6,7,8)} +} { +INSERT INTO t1 VALUES(1,'line with '' single quote'); +INSERT INTO t1 VALUES(2,unistr('\u001b[31mVT-100 codes\u001b[0m')); +INSERT INTO t1 VALUES(6,unistr('new\u000aline')); +INSERT INTO t1 VALUES(7,unistr('carriage\u000dreturn')); +INSERT INTO t1 VALUES(8,'last line'); +} +do_test shellA-5.3 { + file delete -force out.txt + exec $CLI test.db {.mode insert t1 --escape off} \ + {SELECT a, x FROM t1 WHERE a IN (1,2,6,7,8)} >out.txt + set fd [open out.txt rb] + set res [read $fd] + close $fd + string trim [string map [list \r\n \n] $res] +} " +INSERT INTO t1 VALUES(1,'line with '' single quote'); +INSERT INTO t1 VALUES(2,'\033\13331mVT-100 codes\033\1330m'); +INSERT INTO t1 VALUES(6,'new +line'); +INSERT INTO t1 VALUES(7,'carriage\rreturn'); +INSERT INTO t1 VALUES(8,'last line'); +" finish_test From b16c76408a4000bd2f367eae6fc377ff6b872c37 Mon Sep 17 00:00:00 2001 From: stephan Date: Mon, 24 Feb 2025 18:14:27 +0000 Subject: [PATCH 174/194] configure: in autoconf build if both --disable-shared and --disable-static-shell are used together, ignore the former and emit a notice to that effect. FossilOrigin-Name: b8bf966628c0cbbb6f0bc09a70800ac0b6b7f8c2d2f70c91f4b6e65daae0b192 --- autosetup/sqlite-config.tcl | 22 ++++++++++++++++++---- manifest | 12 ++++++------ manifest.uuid | 2 +- 3 files changed, 25 insertions(+), 11 deletions(-) diff --git a/autosetup/sqlite-config.tcl b/autosetup/sqlite-config.tcl index 24362e0158..a5e16e072e 100644 --- a/autosetup/sqlite-config.tcl +++ b/autosetup/sqlite-config.tcl @@ -1453,6 +1453,10 @@ proc sqlite-handle-env-quirks {} { # Performs late-stage config steps common to both the canonical and # autoconf bundle builds. proc sqlite-config-finalize {} { + set buildMode $::sqliteConfig(build-mode) + set isCanonical [expr {$buildMode eq "canonical"}] + set isAutoconf [expr {$buildMode eq "autoconf"}] + define HAVE_LFS 0 if {[opt-bool largefile]} { # @@ -1463,17 +1467,27 @@ proc sqlite-config-finalize {} { # cc-check-lfs } - proj-define-for-opt shared ENABLE_LIB_SHARED "Build shared library?" - if {![proj-define-for-opt static ENABLE_LIB_STATIC \ - "Build static library?"]} { - if {"canonical" eq $::sqliteConfig(build-mode)} { + if {$isCanonical} { + if {![opt-bool static]} { proj-indented-notice { NOTICE: static lib build may be implicitly re-activated by other components, e.g. some test apps. } } + } else { + proj-assert { $isAutoconf } "Invalid build mode" + define ENABLE_STATIC_SHELL [opt-bool static-shell] + if {![opt-bool shared] && ![opt-bool static-shell]} { + proj-opt-set shared 1 + proj-indented-notice { + NOTICE: ignoring --disable-shared because --disable-static-shell + was specified. + } + } } + proj-define-for-opt shared ENABLE_LIB_SHARED "Build shared library?" + proj-define-for-opt static ENABLE_LIB_STATIC "Build static library?" sqlite-handle-debug sqlite-handle-rpath diff --git a/manifest b/manifest index ed7fb2cd97..816eec85af 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Configure\sdoc\stweaks.\sMove\sthe\spackage\sversion/build\sdir\soutput\sso\sthat\sit\sdoes\snot\sappear\sat\sthe\sstart\sof\s--help\stext,\sbut\sotherwise\sstill\sappears\sbefore\sthe\sfirst\soutput\sfrom\slow-level\sconfig\sinitialization. -D 2025-02-24T12:19:06.652 +C configure:\sin\sautoconf\sbuild\sif\sboth\s--disable-shared\sand\s--disable-static-shell\sare\sused\stogether,\signore\sthe\sformer\sand\semit\sa\snotice\sto\sthat\seffect. +D 2025-02-24T18:14:27.777 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d @@ -50,7 +50,7 @@ F autosetup/cc.tcl c0fcc50ca91deff8741e449ddad05bcd08268bc31177e613a6343bbd1fd3e F autosetup/jimsh0.c a57c16e65dcffc9c76e496757cb3f7fb47e01ecbd1631a0a5e01751fc856f049 F autosetup/pkg-config.tcl 4e635bf39022ff65e0d5434339dd41503ea48fc53822c9c5bde88b02d3d952ba F autosetup/proj.tcl e69b91f814ea510057ce7663845de703c3746d71cff9a0db6b2563ee3e7fd25e -F autosetup/sqlite-config.tcl 5ea649be4e1111fb7a901fc27334a468545a46397b872a8aaa625b8f6ff46684 +F autosetup/sqlite-config.tcl b79b33797095855025a0ca59a99fc496609d42d232a9f6a8b41f5c2cd30741ca F autosetup/system.tcl 51d4be76cd9a9074704b584e5c9cbba616202c8468cf9ba8a4f8294a7ab1dba9 F configure 9a00b21dfd13757bbfb8d89b30660a89ec1f8f3a79402b8f9f9b6fc475c3303a x F contrib/sqlitecon.tcl 210a913ad63f9f991070821e599d600bd913e0ad @@ -2210,8 +2210,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P 17fd6836f362c646d6dadb40adc0a8a31e2bfc9416651dde2c156400b3aa06dd -R 7df87f1f103b72910ba69cc1b491c805 +P 826bad10e9ccd6f71e6dad90d41fb7d4a941e459d2e080901345ed8877ad5e38 +R 8b08d3784be86888ed3b38a1401c222e U stephan -Z 00962c02ea8650e5ddad857abc8c633a +Z 7b1e02b40355217f4e93c52d94d6f0c7 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index c2382c94d8..ee2daf0467 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -826bad10e9ccd6f71e6dad90d41fb7d4a941e459d2e080901345ed8877ad5e38 +b8bf966628c0cbbb6f0bc09a70800ac0b6b7f8c2d2f70c91f4b6e65daae0b192 From 31d54ad0410eb952b211cc52181b410a97fc1ad4 Mon Sep 17 00:00:00 2001 From: stephan Date: Mon, 24 Feb 2025 18:45:30 +0000 Subject: [PATCH 175/194] autoconf/auto.def: remove a define which made superfluous by [b8bf966628c0]. Add a check/status message for whether to statically link the library into the CLI shell. FossilOrigin-Name: df95e908cacc7e8e749701ff49d2ce02a927c58a474dd9a362d5f84cb3d7413f --- autoconf/auto.def | 1 - autosetup/sqlite-config.tcl | 3 ++- manifest | 14 +++++++------- manifest.uuid | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/autoconf/auto.def b/autoconf/auto.def index 1a79565387..7c61a308bb 100644 --- a/autoconf/auto.def +++ b/autoconf/auto.def @@ -10,7 +10,6 @@ # use sqlite-config sqlite-config-bootstrap autoconf -define ENABLE_STATIC_SHELL [opt-bool static-shell] sqlite-check-common-bins sqlite-check-common-system-deps sqlite-config-finalize diff --git a/autosetup/sqlite-config.tcl b/autosetup/sqlite-config.tcl index a5e16e072e..7193625df0 100644 --- a/autosetup/sqlite-config.tcl +++ b/autosetup/sqlite-config.tcl @@ -1477,7 +1477,8 @@ proc sqlite-config-finalize {} { } } else { proj-assert { $isAutoconf } "Invalid build mode" - define ENABLE_STATIC_SHELL [opt-bool static-shell] + proj-define-for-opt static-shell ENABLE_STATIC_SHELL \ + "Link library statically into the CLI shell?" if {![opt-bool shared] && ![opt-bool static-shell]} { proj-opt-set shared 1 proj-indented-notice { diff --git a/manifest b/manifest index 816eec85af..6dfabfa0d3 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C configure:\sin\sautoconf\sbuild\sif\sboth\s--disable-shared\sand\s--disable-static-shell\sare\sused\stogether,\signore\sthe\sformer\sand\semit\sa\snotice\sto\sthat\seffect. -D 2025-02-24T18:14:27.777 +C autoconf/auto.def:\sremove\sa\sdefine\swhich\smade\ssuperfluous\sby\s[b8bf966628c0].\sAdd\sa\scheck/status\smessage\sfor\swhether\sto\sstatically\slink\sthe\slibrary\sinto\sthe\sCLI\sshell. +D 2025-02-24T18:45:30.839 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d @@ -20,7 +20,7 @@ F autoconf/Makefile.in c9a7007181df2a07d08bd63c6ba395ed38705aa218789726951aabebe F autoconf/Makefile.msc 1249e425a24859c7b3f17575275247df9eec3bddc0d1d7e73941f1abdbb95a92 F autoconf/README.first f1d3876e9a7852c22f275a6f06814e64934cecbc0b5b9617d64849094c1fd136 F autoconf/README.txt 7f01dc3915e2d68f329011073662369e62a0938a2c69398807823c57591cb288 -F autoconf/auto.def 9671075172cb4ebcfeceba14084e9921e4105fb43f5c1d73ac97d48b0b4ef023 +F autoconf/auto.def bd6987ccbdb5aa0506c93d59063efb848c2f94ed250f893bc08e92d10b8ecb3b F autoconf/tea/Makefile.in ba0556fee8da09c066bad85a4457904e46ee2c2eabaa309c0e83a78f2f151a8e F autoconf/tea/README.txt 61e62e519579e4a112791354d6d440f8b51ea6db3b0bab58d59f29df42d2dfe3 F autoconf/tea/aclocal.m4 52c47aac44ce0ddb1f918b6993e8beb8eee88f43 @@ -50,7 +50,7 @@ F autosetup/cc.tcl c0fcc50ca91deff8741e449ddad05bcd08268bc31177e613a6343bbd1fd3e F autosetup/jimsh0.c a57c16e65dcffc9c76e496757cb3f7fb47e01ecbd1631a0a5e01751fc856f049 F autosetup/pkg-config.tcl 4e635bf39022ff65e0d5434339dd41503ea48fc53822c9c5bde88b02d3d952ba F autosetup/proj.tcl e69b91f814ea510057ce7663845de703c3746d71cff9a0db6b2563ee3e7fd25e -F autosetup/sqlite-config.tcl b79b33797095855025a0ca59a99fc496609d42d232a9f6a8b41f5c2cd30741ca +F autosetup/sqlite-config.tcl 6634e82cead46c74d728a2b9d1b39b266fce7ba98ab7fd1a43f6de7241ab1fbe F autosetup/system.tcl 51d4be76cd9a9074704b584e5c9cbba616202c8468cf9ba8a4f8294a7ab1dba9 F configure 9a00b21dfd13757bbfb8d89b30660a89ec1f8f3a79402b8f9f9b6fc475c3303a x F contrib/sqlitecon.tcl 210a913ad63f9f991070821e599d600bd913e0ad @@ -2210,8 +2210,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P 826bad10e9ccd6f71e6dad90d41fb7d4a941e459d2e080901345ed8877ad5e38 -R 8b08d3784be86888ed3b38a1401c222e +P b8bf966628c0cbbb6f0bc09a70800ac0b6b7f8c2d2f70c91f4b6e65daae0b192 +R 6798c5140441a1e20c93d3ea0d1b0a61 U stephan -Z 7b1e02b40355217f4e93c52d94d6f0c7 +Z cb088f794df8053d88b2a77b7947a873 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index ee2daf0467..7ebc692504 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -b8bf966628c0cbbb6f0bc09a70800ac0b6b7f8c2d2f70c91f4b6e65daae0b192 +df95e908cacc7e8e749701ff49d2ce02a927c58a474dd9a362d5f84cb3d7413f From 81d44c7e3ecae9f6c9d5f3c2133aa67f5816bc48 Mon Sep 17 00:00:00 2001 From: drh <> Date: Mon, 24 Feb 2025 20:13:29 +0000 Subject: [PATCH 176/194] Use an assert() to fix a harmless (false-positive) scan-build warning in the CLI. FossilOrigin-Name: 4c56cd7392f114e27b43d8fcc79444c3078cd65285ba7dd3338a414e2a9f5392 --- manifest | 12 ++++++------ manifest.uuid | 2 +- src/shell.c.in | 1 + 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/manifest b/manifest index 00220db5a2..d2b2ec87c1 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Only\suse\sunistr()\sin\scolumnar\sformats\swhen\sstrictly\sneeded.\nDo\snot\suse\sunistr()\sin\sinsert\smode\swhen\s--escape\sis\soff.\nMore\stest\scases. -D 2025-02-24T17:50:49.386 +C Use\san\sassert()\sto\sfix\sa\sharmless\s(false-positive)\sscan-build\swarning\nin\sthe\sCLI. +D 2025-02-24T20:13:29.374 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d @@ -782,7 +782,7 @@ F src/random.c 606b00941a1d7dd09c381d3279a058d771f406c5213c9932bbd93d5587be4b9c F src/resolve.c 626c24b258b111f75c22107aa5614ad89810df3026f5ca071116d3fe75925c75 F src/rowset.c 8432130e6c344b3401a8874c3cb49fefe6873fec593294de077afea2dce5ec97 F src/select.c a076f7db3a0fcbd9f710d7746cfc07e0b3baadee45eb3136bedc29c598ef8f1c -F src/shell.c.in abf1904193f1c7b6b95e2674606bd00f0b28a366b39e02a3e1e21a56ccf338d6 +F src/shell.c.in 19cde2832968fff4d26a75b40b3af1ad7744dfeb0023467f4100849e23a81ce0 F src/sqlite.h.in 8d4486fb28a90de818ac1e8c6206ea458e7de6bd8e0dfa3d554494f155be8c01 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8 F src/sqlite3ext.h 3f046c04ea3595d6bfda99b781926b17e672fd6d27da2ba6d8d8fc39981dcb54 @@ -2211,8 +2211,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P e99e37b54baf7283588ead4983e613a1e14c58a0b92be5f7b25b4d9d287b5324 -R 7e1ba0b26b7950463261b2769b28f47d +P e029828de91b10b4c7f4a19bc70c35e4f36fae4ebf32b40553a6ba9f2b3af295 +R 62dc4924d0f345bbea95b0294f27e51b U drh -Z 01fb520867e568bd6570d54d3dd4c9c9 +Z 6b0a25939039131590c6c2268407c4ae # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 468d009ac9..a126bf0304 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -e029828de91b10b4c7f4a19bc70c35e4f36fae4ebf32b40553a6ba9f2b3af295 +4c56cd7392f114e27b43d8fcc79444c3078cd65285ba7dd3338a414e2a9f5392 diff --git a/src/shell.c.in b/src/shell.c.in index aed50a2ccf..40f07332c9 100644 --- a/src/shell.c.in +++ b/src/shell.c.in @@ -4198,6 +4198,7 @@ static void exec_prepared_stmt_columnar( uz = azNextLine[i]; if( uz==0 ) uz = (u8*)zEmpty; }else if( p->cmOpts.bQuote ){ + assert( azQuoted!=0 ); sqlite3_free(azQuoted[i]); azQuoted[i] = quoted_column(pStmt,i); uz = (const unsigned char*)azQuoted[i]; From 51770439ffb74a9470b2acc860f3f95442653bd1 Mon Sep 17 00:00:00 2001 From: stephan Date: Mon, 24 Feb 2025 20:53:50 +0000 Subject: [PATCH 177/194] Slightly simplify auto.def and autoconf/auto.def. FossilOrigin-Name: d84f591b962ea44efb902043444e4e54bc55e5bb32e5108f04df824407c412dd --- auto.def | 60 ++++++++--------- autoconf/auto.def | 13 ++-- autosetup/sqlite-config.tcl | 131 +++++++++++++++++++----------------- manifest | 16 ++--- manifest.uuid | 2 +- 5 files changed, 113 insertions(+), 109 deletions(-) diff --git a/auto.def b/auto.def index 020135d6fa..8ed5996373 100644 --- a/auto.def +++ b/auto.def @@ -14,34 +14,34 @@ # use sqlite-config -sqlite-config-bootstrap canonical -proj-if-opt-truthy dev { - # --enable-dev needs to come early so that the downstream tests - # which check for the following flags use their updated state. - proj-opt-set all 1 - proj-opt-set debug 1 - proj-opt-set amalgamation 0 - define CFLAGS [get-env CFLAGS {-O0 -g}] - # -------------^^^^^^^ intentionally using [get-env] instead of - # [proj-get-env] here because [sqlite-setup-default-cflags] uses - # [proj-get-env] and we want this to supercede that. +sqlite-configure canonical { + proj-if-opt-truthy dev { + # --enable-dev needs to come early so that the downstream tests + # which check for the following flags use their updated state. + proj-opt-set all 1 + proj-opt-set debug 1 + proj-opt-set amalgamation 0 + define CFLAGS [get-env CFLAGS {-O0 -g}] + # -------------^^^^^^^ intentionally using [get-env] instead of + # [proj-get-env] here because [sqlite-setup-default-cflags] uses + # [proj-get-env] and we want this to supercede that. + } + sqlite-check-common-bins ;# must come before [sqlite-handle-wasi-sdk] + sqlite-handle-wasi-sdk ;# must run relatively early, as it changes the environment + sqlite-check-common-system-deps + + proj-define-for-opt amalgamation USE_AMALGAMATION "Use amalgamation for builds?" + + proj-define-for-opt gcov USE_GCOV "Use gcov?" + + proj-define-for-opt test-status TSTRNNR_OPTS \ + "test-runner flags:" {--status} {} + + proj-define-for-opt linemacros AMALGAMATION_LINE_MACROS \ + "Use #line macros in the amalgamation:" + + define LINK_TOOLS_DYNAMICALLY [proj-opt-was-provided dynlink-tools] + + sqlite-handle-tcl + sqlite-handle-emsdk } -sqlite-check-common-bins ;# must come before [sqlite-handle-wasi-sdk] -sqlite-handle-wasi-sdk ;# must run relatively early, as it changes the environment -sqlite-check-common-system-deps - -proj-define-for-opt amalgamation USE_AMALGAMATION "Use amalgamation for builds?" - -proj-define-for-opt gcov USE_GCOV "Use gcov?" - -proj-define-for-opt test-status TSTRNNR_OPTS \ - "test-runner flags:" {--status} {} - -proj-define-for-opt linemacros AMALGAMATION_LINE_MACROS \ - "Use #line macros in the amalgamation:" - -define LINK_TOOLS_DYNAMICALLY [proj-opt-was-provided dynlink-tools] - -sqlite-handle-tcl -sqlite-handle-emsdk -sqlite-config-finalize diff --git a/autoconf/auto.def b/autoconf/auto.def index 7c61a308bb..3ba900d957 100644 --- a/autoconf/auto.def +++ b/autoconf/auto.def @@ -3,13 +3,8 @@ # # This is the main autosetup-compatible configure script for the # "autoconf" bundle of the SQLite project. -# -# This script and all of its dependencies must be kept compatible with -# JimTCL, a copy of which is included in this source tree as -# ./autosetup/jimsh0.c. -# use sqlite-config -sqlite-config-bootstrap autoconf -sqlite-check-common-bins -sqlite-check-common-system-deps -sqlite-config-finalize +sqlite-configure autoconf { + sqlite-check-common-bins + sqlite-check-common-system-deps +} diff --git a/autosetup/sqlite-config.tcl b/autosetup/sqlite-config.tcl index 7193625df0..e6dfb018d2 100644 --- a/autosetup/sqlite-config.tcl +++ b/autosetup/sqlite-config.tcl @@ -64,8 +64,12 @@ set sqliteConfig(is-cross-compiling) [proj-is-cross-compiling] ######################################################################## # Processes all configure --flags for this build $buildMode must be # either "canonical" or "autoconf", and others may be added in the -# future. -proc sqlite-config-bootstrap {buildMode} { +# future. After bootstrapping, $configScript is eval'd in the caller's +# scope, then post-configuration finalization is run. $configScript is +# intended to hold configure code which is specific to the given +# $buildMode, with the caveat that _some_ build-specific code is +# encapsulated in the configuration finalization step. +proc sqlite-configure {buildMode configScript} { set allBuildModes {canonical autoconf} if {$buildMode ni $allBuildModes} { user-error "Invalid build mode: $buildMode. Expecting one of: $allBuildModes" @@ -344,11 +348,12 @@ proc sqlite-config-bootstrap {buildMode} { } } #lappend opts "soname:=duplicateEntry => {x}"; #just testing - if {[catch {options $opts}]} { + if {[catch {options $opts} msg opts]} { # Workaround for # where [options] behaves oddly on _some_ TCL builds when it's # called from deeper than the global scope. - return -code break + dict incr opts -level + return {*}$opts $msg } sqlite-setup-package-info uplevel 1 { @@ -359,7 +364,67 @@ proc sqlite-config-bootstrap {buildMode} { use cc cc-db cc-shared cc-lib pkg-config } sqlite-post-options-init -}; # sqlite-config-bootstrap + uplevel 1 $configScript + sqlite-configure-finalize +}; # sqlite-configure + +######################################################################## +# Performs late-stage config steps common to both the canonical and +# autoconf bundle builds. +proc sqlite-configure-finalize {} { + set buildMode $::sqliteConfig(build-mode) + set isCanonical [expr {$buildMode eq "canonical"}] + set isAutoconf [expr {$buildMode eq "autoconf"}] + + define HAVE_LFS 0 + if {[opt-bool largefile]} { + # + # Insofar as we can determine HAVE_LFS has no effect on the + # library. Perhaps it did back in the early 2000's. The + # --enable/disable-largefile flag is retained because it's + # harmless, but it doesn't do anything useful. It does have + # visible side-effects, though: the generated sqlite_cfg.h may (or + # may not) define HAVE_LFS. + # + cc-check-lfs + } + + if {$isCanonical} { + if {![opt-bool static]} { + proj-indented-notice { + NOTICE: static lib build may be implicitly re-activated by + other components, e.g. some test apps. + } + } + } else { + proj-assert { $isAutoconf } "Invalid build mode" + proj-define-for-opt static-shell ENABLE_STATIC_SHELL \ + "Link library statically into the CLI shell?" + if {![opt-bool shared] && ![opt-bool static-shell]} { + proj-opt-set shared 1 + proj-indented-notice { + NOTICE: ignoring --disable-shared because --disable-static-shell + was specified. + } + } + } + proj-define-for-opt shared ENABLE_LIB_SHARED "Build shared library?" + proj-define-for-opt static ENABLE_LIB_STATIC "Build static library?" + + sqlite-handle-debug + sqlite-handle-rpath + sqlite-handle-soname + sqlite-handle-threadsafe + sqlite-handle-tempstore + sqlite-handle-line-editing + sqlite-handle-load-extension + sqlite-handle-math + sqlite-handle-icu + sqlite-handle-env-quirks + sqlite-process-dot-in-files + sqlite-post-config-validation + sqlite-dump-defines +}; # sqlite-configure-finalize ######################################################################## # Runs some common initialization which must happen immediately after @@ -1449,62 +1514,6 @@ proc sqlite-handle-env-quirks {} { sqlite-handle-mac-cversion } -######################################################################## -# Performs late-stage config steps common to both the canonical and -# autoconf bundle builds. -proc sqlite-config-finalize {} { - set buildMode $::sqliteConfig(build-mode) - set isCanonical [expr {$buildMode eq "canonical"}] - set isAutoconf [expr {$buildMode eq "autoconf"}] - - define HAVE_LFS 0 - if {[opt-bool largefile]} { - # - # Insofar as we can determine HAVE_LFS has no effect on the - # library. Perhaps it did back in the early 2000's. The - # --enable/disable-largefile flag is retained because it's - # harmless, but it doesn't do anything useful. - # - cc-check-lfs - } - - if {$isCanonical} { - if {![opt-bool static]} { - proj-indented-notice { - NOTICE: static lib build may be implicitly re-activated by - other components, e.g. some test apps. - } - } - } else { - proj-assert { $isAutoconf } "Invalid build mode" - proj-define-for-opt static-shell ENABLE_STATIC_SHELL \ - "Link library statically into the CLI shell?" - if {![opt-bool shared] && ![opt-bool static-shell]} { - proj-opt-set shared 1 - proj-indented-notice { - NOTICE: ignoring --disable-shared because --disable-static-shell - was specified. - } - } - } - proj-define-for-opt shared ENABLE_LIB_SHARED "Build shared library?" - proj-define-for-opt static ENABLE_LIB_STATIC "Build static library?" - - sqlite-handle-debug - sqlite-handle-rpath - sqlite-handle-soname - sqlite-handle-threadsafe - sqlite-handle-tempstore - sqlite-handle-line-editing - sqlite-handle-load-extension - sqlite-handle-math - sqlite-handle-icu - sqlite-handle-env-quirks - sqlite-process-dot-in-files - sqlite-post-config-validation - sqlite-dump-defines -} - ######################################################################## # Perform some late-stage work and generate the configure-process # output file(s). diff --git a/manifest b/manifest index 6dfabfa0d3..c0dc733d8c 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C autoconf/auto.def:\sremove\sa\sdefine\swhich\smade\ssuperfluous\sby\s[b8bf966628c0].\sAdd\sa\scheck/status\smessage\sfor\swhether\sto\sstatically\slink\sthe\slibrary\sinto\sthe\sCLI\sshell. -D 2025-02-24T18:45:30.839 +C Slightly\ssimplify\sauto.def\sand\sautoconf/auto.def. +D 2025-02-24T20:53:50.231 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d @@ -14,13 +14,13 @@ F art/sqlite370.eps aa97a671332b432a54e1d74ff5e8775be34200c2 F art/sqlite370.ico af56c1d00fee7cd4753e8631ed60703ed0fc6e90 F art/sqlite370.jpg d512473dae7e378a67e28ff96a34da7cb331def2 F art/sqlite370.svg 40b7e2fe8aac3add5d56dd86ab8d427a4eca5bcb3fe4f8946cb3794e1821d531 -F auto.def 97417bef4f6b6f35795f6b4d891ab57f18f367ff8939257fd1e711c9db003148 +F auto.def a8c935b5c3c0b27c6a8b1b788bb47b06cc0ca3e9e92dc1b87e4b02659ba95ff6 F autoconf/Makefile.fallback 22fe523eb36dfce31e0f6349f782eb084e86a5620b2b0b4f84a2d6133f53f5ac F autoconf/Makefile.in c9a7007181df2a07d08bd63c6ba395ed38705aa218789726951aabebec32ee27 F autoconf/Makefile.msc 1249e425a24859c7b3f17575275247df9eec3bddc0d1d7e73941f1abdbb95a92 F autoconf/README.first f1d3876e9a7852c22f275a6f06814e64934cecbc0b5b9617d64849094c1fd136 F autoconf/README.txt 7f01dc3915e2d68f329011073662369e62a0938a2c69398807823c57591cb288 -F autoconf/auto.def bd6987ccbdb5aa0506c93d59063efb848c2f94ed250f893bc08e92d10b8ecb3b +F autoconf/auto.def 8d81c1d728d8462a9b6c1ca0714013bbb097aee0ae5e79309d7939cead98e295 F autoconf/tea/Makefile.in ba0556fee8da09c066bad85a4457904e46ee2c2eabaa309c0e83a78f2f151a8e F autoconf/tea/README.txt 61e62e519579e4a112791354d6d440f8b51ea6db3b0bab58d59f29df42d2dfe3 F autoconf/tea/aclocal.m4 52c47aac44ce0ddb1f918b6993e8beb8eee88f43 @@ -50,7 +50,7 @@ F autosetup/cc.tcl c0fcc50ca91deff8741e449ddad05bcd08268bc31177e613a6343bbd1fd3e F autosetup/jimsh0.c a57c16e65dcffc9c76e496757cb3f7fb47e01ecbd1631a0a5e01751fc856f049 F autosetup/pkg-config.tcl 4e635bf39022ff65e0d5434339dd41503ea48fc53822c9c5bde88b02d3d952ba F autosetup/proj.tcl e69b91f814ea510057ce7663845de703c3746d71cff9a0db6b2563ee3e7fd25e -F autosetup/sqlite-config.tcl 6634e82cead46c74d728a2b9d1b39b266fce7ba98ab7fd1a43f6de7241ab1fbe +F autosetup/sqlite-config.tcl c9ec1c6f34c3998c9eb0757f6e23a11de4f1e56db64becbdba0aa331e86f2312 F autosetup/system.tcl 51d4be76cd9a9074704b584e5c9cbba616202c8468cf9ba8a4f8294a7ab1dba9 F configure 9a00b21dfd13757bbfb8d89b30660a89ec1f8f3a79402b8f9f9b6fc475c3303a x F contrib/sqlitecon.tcl 210a913ad63f9f991070821e599d600bd913e0ad @@ -2210,8 +2210,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P b8bf966628c0cbbb6f0bc09a70800ac0b6b7f8c2d2f70c91f4b6e65daae0b192 -R 6798c5140441a1e20c93d3ea0d1b0a61 +P df95e908cacc7e8e749701ff49d2ce02a927c58a474dd9a362d5f84cb3d7413f +R f16fff0a6a240e565123a862fb146ced U stephan -Z cb088f794df8053d88b2a77b7947a873 +Z 4f3ee512515a533e1174eb0f39fd3b9a # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 7ebc692504..0975ebce69 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -df95e908cacc7e8e749701ff49d2ce02a927c58a474dd9a362d5f84cb3d7413f +d84f591b962ea44efb902043444e4e54bc55e5bb32e5108f04df824407c412dd From c46fbec350c4a0a71410bd32384e59ac27a799d5 Mon Sep 17 00:00:00 2001 From: drh <> Date: Mon, 24 Feb 2025 23:34:50 +0000 Subject: [PATCH 178/194] Fix the new shellA.test test script so that it works with Valgrind. FossilOrigin-Name: c3949852cee320c2e02123b99c33155c459b10b2ac8e4fe80b1b7624c9ce0817 --- manifest | 12 ++++++------ manifest.uuid | 2 +- test/shellA.test | 45 +++++++++++++++++++++------------------------ 3 files changed, 28 insertions(+), 31 deletions(-) diff --git a/manifest b/manifest index d2b2ec87c1..f2ee7ae10d 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Use\san\sassert()\sto\sfix\sa\sharmless\s(false-positive)\sscan-build\swarning\nin\sthe\sCLI. -D 2025-02-24T20:13:29.374 +C Fix\sthe\snew\sshellA.test\stest\sscript\sso\sthat\sit\sworks\swith\sValgrind. +D 2025-02-24T23:34:50.874 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d @@ -1647,7 +1647,7 @@ F test/shell6.test e3b883b61d4916b6906678a35f9d19054861123ad91b856461e0a456273bd F test/shell7.test 43fd8e511c533bab5232e95c7b4be93b243451709e89582600d4b6e67693d5c3 F test/shell8.test aea51ecbcd4494c746b096aeff51d841d04d5f0dc4b62eb42427f16109b87acd F test/shell9.test 8742a5b390cdcef6369f5aa223e415aa4255a4129ef249b177887dc635a87209 -F test/shellA.test 78efeadb4191240914e787325dc2edab44c586c4d9d3a44a2a4ab066190e7e63 +F test/shellA.test 09a6dd097ffa984ddf1fc0ddd2ae5f1a199cf11f3894b6a16410471c1536efe3 F test/shmlock.test 3dbf017d34ab0c60abe6a44e447d3552154bd0c87b41eaf5ceacd408dd13fda5 F test/shortread1.test bb591ef20f0fd9ed26d0d12e80eee6d7ac8897a3 F test/show_speedtest1_rtree.tcl 32e6c5f073d7426148a6936a0408f4b5b169aba5 @@ -2211,8 +2211,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P e029828de91b10b4c7f4a19bc70c35e4f36fae4ebf32b40553a6ba9f2b3af295 -R 62dc4924d0f345bbea95b0294f27e51b +P 4c56cd7392f114e27b43d8fcc79444c3078cd65285ba7dd3338a414e2a9f5392 +R 13d013de3c78981833017ee209b07ff8 U drh -Z 6b0a25939039131590c6c2268407c4ae +Z 457892f8d9951398e0ae7676d77bfb1c # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index a126bf0304..0d362fcc84 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -4c56cd7392f114e27b43d8fcc79444c3078cd65285ba7dd3338a414e2a9f5392 +c3949852cee320c2e02123b99c33155c459b10b2ac8e4fe80b1b7624c9ce0817 diff --git a/test/shellA.test b/test/shellA.test index 56228e74cb..8e5e04f79d 100644 --- a/test/shellA.test +++ b/test/shellA.test @@ -8,19 +8,16 @@ # May you share freely, never taking more than you give. # #*********************************************************************** +# TESTRUNNER: shell # # Test cases for the command-line shell - focusing on .mode and # especially control-character escaping and the --escape option. # -# TESTRUNNER: shell # set testdir [file dirname $argv0] source $testdir/tester.tcl set CLI [test_cli_invocation] -db close -forcedelete test.db test.db-journal test.db-wal -sqlite3 db test.db do_execsql_test shellA-1.0 { CREATE TABLE t1(a INT, x TEXT); @@ -39,7 +36,7 @@ do_execsql_test shellA-1.0 { # and that our calls to the CLI are working. # do_test shellA-1.2 { - exec $CLI test.db {.mode box} {SELECT * FROM t1;} + exec {*}$CLI test.db {.mode box} {SELECT * FROM t1;} } { ┌───┬──────────────────────────┐ │ a │ x │ @@ -66,33 +63,33 @@ do_test shellA-1.2 { # ".mode list" # do_test shellA-1.3 { - exec $CLI test.db {SELECT x FROM t1 WHERE a=2;} + exec {*}$CLI test.db {SELECT x FROM t1 WHERE a=2;} } { ␛[31mVT-100 codes␛[0m } do_test shellA-1.4 { - exec $CLI test.db --escape symbol {SELECT x FROM t1 WHERE a=2;} + exec {*}$CLI test.db --escape symbol {SELECT x FROM t1 WHERE a=2;} } { ␛[31mVT-100 codes␛[0m } do_test shellA-1.5 { - exec $CLI test.db --escape ascii {SELECT x FROM t1 WHERE a=2;} + exec {*}$CLI test.db --escape ascii {SELECT x FROM t1 WHERE a=2;} } { ^[[31mVT-100 codes^[[0m } do_test shellA-1.6 { - exec $CLI test.db {.mode list --escape symbol} {SELECT x FROM t1 WHERE a=2;} + exec {*}$CLI test.db {.mode list --escape symbol} {SELECT x FROM t1 WHERE a=2;} } { ␛[31mVT-100 codes␛[0m } do_test shellA-1.7 { - exec $CLI test.db {.mode list --escape ascii} {SELECT x FROM t1 WHERE a=2;} + exec {*}$CLI test.db {.mode list --escape ascii} {SELECT x FROM t1 WHERE a=2;} } { ^[[31mVT-100 codes^[[0m } do_test shellA-1.8 { file delete -force out.txt - exec $CLI test.db {.mode list --escape off} {SELECT x FROM t1 WHERE a=7;} \ + exec {*}$CLI test.db {.mode list --escape off} {SELECT x FROM t1 WHERE a=7;} \ >out.txt set fd [open out.txt rb] set res [read $fd] @@ -101,13 +98,13 @@ do_test shellA-1.8 { } "carriage\rreturn" do_test shellA-1.9 { set rc [catch { - exec $CLI test.db {.mode test --escape xyz} + exec {*}$CLI test.db {.mode test --escape xyz} } msg] lappend rc $msg } {1 {unknown control character escape mode "xyz" - choices: symbol ascii off}} do_test shellA-1.10 { set rc [catch { - exec $CLI --escape abc test.db .q + exec {*}$CLI --escape abc test.db .q } msg] lappend rc $msg } {1 {unknown control character escape mode "abc" - choices: symbol ascii off}} @@ -115,7 +112,7 @@ do_test shellA-1.10 { # ".mode quote" # do_test shellA-2.1 { - exec $CLI test.db --quote {SELECT a, x FROM t1 WHERE a IN (1,2,6,7,8)} + exec {*}$CLI test.db --quote {SELECT a, x FROM t1 WHERE a IN (1,2,6,7,8)} } { 1,'line with '' single quote' 2,unistr('\u001b[31mVT-100 codes\u001b[0m') @@ -125,20 +122,20 @@ line' 8,'last line' } do_test shellA-2.2 { - exec $CLI test.db --quote {.mode} + exec {*}$CLI test.db --quote {.mode} } {current output mode: quote --escape symbol} do_test shellA-2.3 { - exec $CLI test.db --quote --escape ASCII {.mode} + exec {*}$CLI test.db --quote --escape ASCII {.mode} } {current output mode: quote --escape ascii} do_test shellA-2.4 { - exec $CLI test.db --quote --escape OFF {.mode} + exec {*}$CLI test.db --quote --escape OFF {.mode} } {current output mode: quote --escape off} # ".mode line" # do_test shellA-3.1 { - exec $CLI test.db --line --escape symbol \ + exec {*}$CLI test.db --line --escape symbol \ {SELECT a, x FROM t1 WHERE a IN (1,2,6,7,8)} } { a = 1 @@ -158,7 +155,7 @@ line x = last line } do_test shellA-3.2 { - exec $CLI test.db --line --escape ascii \ + exec {*}$CLI test.db --line --escape ascii \ {SELECT a, x FROM t1 WHERE a IN (1,2,6,7,8)} } { a = 1 @@ -181,7 +178,7 @@ line # ".mode box" # do_test shellA-4.1 { - exec $CLI test.db --box --escape ascii \ + exec {*}$CLI test.db --box --escape ascii \ {SELECT a, x FROM t1 WHERE a IN (1,2,6,7,8)} } { ┌───┬──────────────────────────┐ @@ -200,7 +197,7 @@ do_test shellA-4.1 { └───┴──────────────────────────┘ } do_test shellA-4.2 { - exec $CLI test.db {.mode qbox} {SELECT a, x FROM t1 WHERE a IN (1,2,6,7,8)} + exec {*}$CLI test.db {.mode qbox} {SELECT a, x FROM t1 WHERE a IN (1,2,6,7,8)} } { ┌───┬───────────────────────────────────────────┐ │ a │ x │ @@ -221,7 +218,7 @@ do_test shellA-4.2 { # ".mode insert" # do_test shellA-5.1 { - exec $CLI test.db {.mode insert t1 --escape ascii} \ + exec {*}$CLI test.db {.mode insert t1 --escape ascii} \ {SELECT a, x FROM t1 WHERE a IN (1,2,6,7,8)} } { INSERT INTO t1 VALUES(1,'line with '' single quote'); @@ -231,7 +228,7 @@ INSERT INTO t1 VALUES(7,unistr('carriage\u000dreturn')); INSERT INTO t1 VALUES(8,'last line'); } do_test shellA-5.2 { - exec $CLI test.db {.mode insert t1 --escape symbol} \ + exec {*}$CLI test.db {.mode insert t1 --escape symbol} \ {SELECT a, x FROM t1 WHERE a IN (1,2,6,7,8)} } { INSERT INTO t1 VALUES(1,'line with '' single quote'); @@ -242,7 +239,7 @@ INSERT INTO t1 VALUES(8,'last line'); } do_test shellA-5.3 { file delete -force out.txt - exec $CLI test.db {.mode insert t1 --escape off} \ + exec {*}$CLI test.db {.mode insert t1 --escape off} \ {SELECT a, x FROM t1 WHERE a IN (1,2,6,7,8)} >out.txt set fd [open out.txt rb] set res [read $fd] From a4cf066d64cde843ee78a546907a1091b320bf98 Mon Sep 17 00:00:00 2001 From: dan Date: Tue, 25 Feb 2025 11:29:04 +0000 Subject: [PATCH 179/194] Remove an assert() added by [e88212b1] that is sometimes false. FossilOrigin-Name: 0f6223b8f6c044db687f78e19f6373d0dda9155445c511a297efa05bac3b16e5 --- manifest | 12 ++++++------ manifest.uuid | 2 +- src/wal.c | 3 --- 3 files changed, 7 insertions(+), 10 deletions(-) diff --git a/manifest b/manifest index 223ce17db6..991f86dae8 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Support\sSQLITE_ENABLE_SETLK_TIMEOUT\son\swindows. -D 2025-02-24T21:27:16.284 +C Remove\san\sassert()\sadded\sby\s[e88212b1]\sthat\sis\ssometimes\sfalse. +D 2025-02-25T11:29:04.914 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d @@ -862,7 +862,7 @@ F src/vdbetrace.c fe0bc29ebd4e02c8bc5c1945f1d2e6be5927ec12c06d89b03ef2a4def34bf8 F src/vdbevtab.c fc46b9cbd759dc013f0b3724549cc0d71379183c667df3a5988f7e2f1bd485f3 F src/vtab.c 828221bdbeaaa6d62126ee6d07fd4ec0d09dcaea846f87ad01944d8b7e548859 F src/vxworks.h d2988f4e5a61a4dfe82c6524dd3d6e4f2ce3cdb9 -F src/wal.c 2c69a5f92270429db72d853691b0640c76c671d5b2465396dadb9d9873e1efce +F src/wal.c a9924069336c4658b2edca78329dfa882625d9994abd3ddb0844f01d367bbd43 F src/wal.h ba252daaa94f889f4b2c17c027e823d9be47ce39da1d3799886bbd51f0490452 F src/walker.c d5006d6b005e4ea7302ad390957a8d41ed83faa177e412f89bc5600a7462a014 F src/where.c 12cca5dfbe96e2589f951c43c0720fc58e52611787c37d85a0d9c10376202e8b @@ -2212,8 +2212,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P 742827f049768c4f69ccdfaadfad339aaad3bc126d3a68b90cfea01d825bf7ce 55324d1c862c42b95251a398c40930d9fa94debb1aec7d3d0ae734d6b17b4a59 -R 2117afef50ba03929efd8c7065744408 +P e88212b10a7829ff42ef51a02863d788c929e54161faf492f9ef2ad90fd7074e +R 208c10d1a99423d6443e5484adf3eb06 U dan -Z f60d38f782589947a9438a2ed64b4320 +Z 8b4b4e6eeb34d8972dfc2e11c0d63f24 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 0b9834aaf6..717b9c03f7 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -e88212b10a7829ff42ef51a02863d788c929e54161faf492f9ef2ad90fd7074e +0f6223b8f6c044db687f78e19f6373d0dda9155445c511a297efa05bac3b16e5 diff --git a/src/wal.c b/src/wal.c index d374d6eb4d..a6287a4081 100644 --- a/src/wal.c +++ b/src/wal.c @@ -3482,9 +3482,6 @@ int sqlite3WalBeginReadTransaction(Wal *pWal, int *pChanged){ ** read-lock. */ void sqlite3WalEndReadTransaction(Wal *pWal){ -#ifndef SQLITE_ENABLE_SETLK_TIMEOUT - assert( pWal->writeLock==0 || pWal->readLock<0 ); -#endif if( pWal->readLock>=0 ){ sqlite3WalEndWriteTransaction(pWal); walUnlockShared(pWal, WAL_READ_LOCK(pWal->readLock)); From a357a90f12e927ec169168cd89e54dc4fa905717 Mon Sep 17 00:00:00 2001 From: drh <> Date: Tue, 25 Feb 2025 11:47:34 +0000 Subject: [PATCH 180/194] Consolidate two different UTF8 encoders into a single subroutine. FossilOrigin-Name: 6208e494858b9d362efc7db4e8aac6f8e93fe51d2e038c94dfa97c55a74688a0 --- manifest | 18 +++++++++--------- manifest.uuid | 2 +- src/func.c | 36 ++++-------------------------------- src/printf.c | 20 +------------------- src/sqliteInt.h | 1 + src/utf.c | 29 +++++++++++++++++++++++++++++ 6 files changed, 45 insertions(+), 61 deletions(-) diff --git a/manifest b/manifest index f2ee7ae10d..3adc2b10de 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Fix\sthe\snew\sshellA.test\stest\sscript\sso\sthat\sit\sworks\swith\sValgrind. -D 2025-02-24T23:34:50.874 +C Consolidate\stwo\sdifferent\sUTF8\sencoders\sinto\sa\ssingle\ssubroutine. +D 2025-02-25T11:47:34.550 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d @@ -735,7 +735,7 @@ F src/delete.c 03a77ba20e54f0f42ebd8eddf15411ed6bdb06a2c472ac4b6b336521bf7cea42 F src/expr.c 6769d3f0ca9b1792e883e3ff21fdc5ca0033cece65571ebbf9d8b8fe2f47cd27 F src/fault.c 460f3e55994363812d9d60844b2a6de88826e007 F src/fkey.c 928ed2517e8732113d2b9821aa37af639688d752f4ea9ac6e0e393d713eeb76f -F src/func.c 9d352aee28d64e0b1e48fd7a4606d6700cce443055c6369f69bfcadbb9bd7adb +F src/func.c dfd3d099d2381f034185457f2181cadc7c86e226578ebf85b158878e294a69c0 F src/global.c a19e4b1ca1335f560e9560e590fc13081e21f670643367f99cb9e8f9dc7d615b F src/hash.c 73934a7f7ab1cb110614a9388cb516893b0cf5b7b69e4fd1a0780ac4ce166be7 F src/hash.h 46b92795a95bfefb210f52f0c316e9d7cdbcdd7e7fcfb0d8be796d3a5767cddf @@ -777,7 +777,7 @@ F src/pcache.h 1497ce1b823cf00094bb0cf3bac37b345937e6f910890c626b16512316d3abf5 F src/pcache1.c 78d4935e510f7bed0fdd1a3f742c0e663b36a795f9dc7411161dc22bdae1245e F src/pragma.c c7ada272232e1182c4536d9637fa7b955a10bc1bd8d5a87d4dc9309dab827791 F src/prepare.c 1832be043fce7d489959aae6f994c452d023914714c4d5457beaed51c0f3d126 -F src/printf.c 743e31d168ad01ecc93a7303c07ef5ac741c4b8342b88e7cda428dbd2b4d9844 +F src/printf.c b6056bd2818523255255af34d370e2665b4895e50476955de797368d92f8f31f F src/random.c 606b00941a1d7dd09c381d3279a058d771f406c5213c9932bbd93d5587be4b9c F src/resolve.c 626c24b258b111f75c22107aa5614ad89810df3026f5ca071116d3fe75925c75 F src/rowset.c 8432130e6c344b3401a8874c3cb49fefe6873fec593294de077afea2dce5ec97 @@ -786,7 +786,7 @@ F src/shell.c.in 19cde2832968fff4d26a75b40b3af1ad7744dfeb0023467f4100849e23a81ce F src/sqlite.h.in 8d4486fb28a90de818ac1e8c6206ea458e7de6bd8e0dfa3d554494f155be8c01 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8 F src/sqlite3ext.h 3f046c04ea3595d6bfda99b781926b17e672fd6d27da2ba6d8d8fc39981dcb54 -F src/sqliteInt.h 587be8a6047992f44590bc255ea43ba7f2a46fbbf80da77c1eead07b31cf8a42 +F src/sqliteInt.h 674ba4569567f1773f0e4b84fa1c766d497da4e43c68aa2647755a5e61b7bacc F src/sqliteLimit.h 6d817c28a8f19af95e6f4921933b7fbbca48a962bce0eb0ec81e8bb3ef38e68b F src/status.c 0e72e4f6be6ccfde2488eb63210297e75f569f3ce9920f6c3d77590ec6ce5ffd F src/table.c 0f141b58a16de7e2fbe81c308379e7279f4c6b50eb08efeec5892794a0ba30d1 @@ -847,7 +847,7 @@ F src/treeview.c d85ce76e6d1498d781957c07cb234da6d77ce0ed2d196480d516f54dabc6227 F src/trigger.c da3c25786870d8bf97cd46b493374c2375d1abaf20a9b0f5f8629a3f2f2ce383 F src/update.c 3e5e7ff66fa19ebe4d1b113d480639a24cc1175adbefabbd1a948a07f28e37cf F src/upsert.c 215328c3f91623c520ec8672c44323553f12caeb4f01b1090ebdca99fdf7b4f1 -F src/utf.c 8b29d9a5956569ea2700f869669b8ef67a9662ee5e724ff77ab3c387e27094ba +F src/utf.c d4d55ca95106a2029ec1cdbd2497a34e69ea1d338f1a9d80ef15ebf4ff01690d F src/util.c 9ff6470dabcf943fd796d2da766c98bd328c8f6fe036a31e5b338e628603f989 F src/vacuum.c b763b6457bd058d2072ef9364832351fd8d11e8abf70cbb349657360f7d55c40 F src/vdbe.c e7567bed441a53c4ceb48d2bdf3d1747677fc296a91e8d2a0fe8facdb9b890ce @@ -2211,8 +2211,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P 4c56cd7392f114e27b43d8fcc79444c3078cd65285ba7dd3338a414e2a9f5392 -R 13d013de3c78981833017ee209b07ff8 +P c3949852cee320c2e02123b99c33155c459b10b2ac8e4fe80b1b7624c9ce0817 +R 783f95f7f826d114483ba4d9a5fea8e7 U drh -Z 457892f8d9951398e0ae7676d77bfb1c +Z 0a01b2d715a4d18665f9611e7764aecb # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 0d362fcc84..52be54b069 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -c3949852cee320c2e02123b99c33155c459b10b2ac8e4fe80b1b7624c9ce0817 +6208e494858b9d362efc7db4e8aac6f8e93fe51d2e038c94dfa97c55a74688a0 diff --git a/src/func.c b/src/func.c index 124dabe31c..d8c8127596 100644 --- a/src/func.c +++ b/src/func.c @@ -1149,34 +1149,6 @@ void sqlite3QuoteValue(StrAccum *pStr, sqlite3_value *pValue, int bEscape){ } } -/* -** Write a single UTF8 character whose value if v into the -** buffer starting at zOut. Return the number of bytes needed -** to encode that character. -*/ -static int appendOneUtf8Char(char *zOut, u32 v){ - if( v<0x00080 ){ - zOut[0] = (u8)(v & 0xff); - return 1; - } - if( v<0x00800 ){ - zOut[0] = 0xc0 + (u8)((v>>6) & 0x1f); - zOut[1] = 0x80 + (u8)(v & 0x3f); - return 2; - } - if( v<0x10000 ){ - zOut[0] = 0xe0 + (u8)((v>>12) & 0x0f); - zOut[1] = 0x80 + (u8)((v>>6) & 0x3f); - zOut[2] = 0x80 + (u8)(v & 0x3f); - return 3; - } - zOut[0] = 0xf0 + (u8)((v>>18) & 0x07); - zOut[1] = 0x80 + (u8)((v>>12) & 0x3f); - zOut[2] = 0x80 + (u8)((v>>6) & 0x3f); - zOut[3] = 0x80 + (u8)(v & 0x3f); - return 4; -} - /* ** Return true if z[] begins with N hexadecimal digits, and write ** a decoding of those digits into *pVal. Or return false if any @@ -1248,19 +1220,19 @@ static void unistrFunc( }else if( sqlite3Isxdigit(zIn[i+1]) ){ if( !isNHex(&zIn[i+1], 4, &v) ) goto unistr_error; i += 5; - j += appendOneUtf8Char(&zOut[j], v); + j += sqlite3AppendOneUtf8Character(&zOut[j], v); }else if( zIn[i+1]=='+' ){ if( !isNHex(&zIn[i+2], 6, &v) ) goto unistr_error; i += 8; - j += appendOneUtf8Char(&zOut[j], v); + j += sqlite3AppendOneUtf8Character(&zOut[j], v); }else if( zIn[i+1]=='u' ){ if( !isNHex(&zIn[i+2], 4, &v) ) goto unistr_error; i += 6; - j += appendOneUtf8Char(&zOut[j], v); + j += sqlite3AppendOneUtf8Character(&zOut[j], v); }else if( zIn[i+1]=='U' ){ if( !isNHex(&zIn[i+2], 8, &v) ) goto unistr_error; i += 10; - j += appendOneUtf8Char(&zOut[j], v); + j += sqlite3AppendOneUtf8Character(&zOut[j], v); }else{ goto unistr_error; } diff --git a/src/printf.c b/src/printf.c index 2b4ccf259d..30c4ec6059 100644 --- a/src/printf.c +++ b/src/printf.c @@ -673,25 +673,7 @@ void sqlite3_str_vappendf( } }else{ unsigned int ch = va_arg(ap,unsigned int); - if( ch<0x00080 ){ - buf[0] = ch & 0xff; - length = 1; - }else if( ch<0x00800 ){ - buf[0] = 0xc0 + (u8)((ch>>6)&0x1f); - buf[1] = 0x80 + (u8)(ch & 0x3f); - length = 2; - }else if( ch<0x10000 ){ - buf[0] = 0xe0 + (u8)((ch>>12)&0x0f); - buf[1] = 0x80 + (u8)((ch>>6) & 0x3f); - buf[2] = 0x80 + (u8)(ch & 0x3f); - length = 3; - }else{ - buf[0] = 0xf0 + (u8)((ch>>18) & 0x07); - buf[1] = 0x80 + (u8)((ch>>12) & 0x3f); - buf[2] = 0x80 + (u8)((ch>>6) & 0x3f); - buf[3] = 0x80 + (u8)(ch & 0x3f); - length = 4; - } + length = sqlite3AppendOneUtf8Character(buf, ch); } if( precision>1 ){ i64 nPrior = 1; diff --git a/src/sqliteInt.h b/src/sqliteInt.h index 5e3ec4dade..a1cfe89206 100644 --- a/src/sqliteInt.h +++ b/src/sqliteInt.h @@ -5143,6 +5143,7 @@ FuncDef *sqlite3FunctionSearch(int,const char*); void sqlite3InsertBuiltinFuncs(FuncDef*,int); FuncDef *sqlite3FindFunction(sqlite3*,const char*,int,u8,u8); void sqlite3QuoteValue(StrAccum*,sqlite3_value*,int); +int sqlite3AppendOneUtf8Character(char*, u32); void sqlite3RegisterBuiltinFunctions(void); void sqlite3RegisterDateTimeFunctions(void); void sqlite3RegisterJsonFunctions(void); diff --git a/src/utf.c b/src/utf.c index c934bb234c..57700bf20d 100644 --- a/src/utf.c +++ b/src/utf.c @@ -105,6 +105,35 @@ static const unsigned char sqlite3Utf8Trans1[] = { } \ } +/* +** Write a single UTF8 character whose value is v into the +** buffer starting at zOut. zOut must be sized to hold at +** least for bytes. Return the number of bytes needed +** to encode the new character. +*/ +int sqlite3AppendOneUtf8Character(char *zOut, u32 v){ + if( v<0x00080 ){ + zOut[0] = (u8)(v & 0xff); + return 1; + } + if( v<0x00800 ){ + zOut[0] = 0xc0 + (u8)((v>>6) & 0x1f); + zOut[1] = 0x80 + (u8)(v & 0x3f); + return 2; + } + if( v<0x10000 ){ + zOut[0] = 0xe0 + (u8)((v>>12) & 0x0f); + zOut[1] = 0x80 + (u8)((v>>6) & 0x3f); + zOut[2] = 0x80 + (u8)(v & 0x3f); + return 3; + } + zOut[0] = 0xf0 + (u8)((v>>18) & 0x07); + zOut[1] = 0x80 + (u8)((v>>12) & 0x3f); + zOut[2] = 0x80 + (u8)((v>>6) & 0x3f); + zOut[3] = 0x80 + (u8)(v & 0x3f); + return 4; +} + /* ** Translate a single UTF-8 character. Return the unicode value. ** From fb8c46510e61a60c44bfe7b72e56dbf133b74eff Mon Sep 17 00:00:00 2001 From: dan Date: Tue, 25 Feb 2025 11:48:57 +0000 Subject: [PATCH 181/194] Avoid running certain tests in walsetlk2.test if SQLITE_ENABLE_SETLK_TIMEOUT is set to 2, not 1. FossilOrigin-Name: 86788c08fa09019f224d5dbd76f06c1d113b04ca5eca5d773719194a8b02da22 --- manifest | 12 ++++++------ manifest.uuid | 2 +- test/walsetlk2.test | 7 +++++++ 3 files changed, 14 insertions(+), 7 deletions(-) diff --git a/manifest b/manifest index 991f86dae8..51e5a84f4d 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Remove\san\sassert()\sadded\sby\s[e88212b1]\sthat\sis\ssometimes\sfalse. -D 2025-02-25T11:29:04.914 +C Avoid\srunning\scertain\stests\sin\swalsetlk2.test\sif\sSQLITE_ENABLE_SETLK_TIMEOUT\sis\sset\sto\s2,\snot\s1. +D 2025-02-25T11:48:57.933 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d @@ -2028,7 +2028,7 @@ F test/walro2.test 33955a6fd874dd9724005e17f77fef89d334b3171454a1256fe4941a96766 F test/walrofault.test c70cb6e308c443867701856cce92ad8288cd99488fa52afab77cca6cfd51af68 F test/walseh1.test bae700eb99519b6d5cd3f893c04759accc5a59c391d4189fe4dd6995a533442b F test/walsetlk.test 9c5b92f9a20252540fedf9ffa6ee3d1b8af08ea4b80d0144d9b88e6c0c1de80d -F test/walsetlk2.test 5ae8662a28c013e8df2ce975f9e3577a7f239aeb4622bb8d4d0ca8e16c0c132e +F test/walsetlk2.test 9097083633cdf55bf1098b694fb8651d0356d38fef28b869481d18029d7ceaf4 F test/walsetlk3.test 1b82bd92dea7e58f498b4399b0b3d26773dd8ac5c74205ce4a23c207cb8e85fe F test/walshared.test 42e3808582504878af237ea02c42ca793e8a0efaa19df7df26ac573370dbc7a3 F test/walslow.test 0c51843836c9dcf40a5ac05aa781bfb977b396ee2c872d92bd48b79d5dd9aa23 @@ -2212,8 +2212,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P e88212b10a7829ff42ef51a02863d788c929e54161faf492f9ef2ad90fd7074e -R 208c10d1a99423d6443e5484adf3eb06 +P 0f6223b8f6c044db687f78e19f6373d0dda9155445c511a297efa05bac3b16e5 +R fb82f4ee6ef5b793d1eb19b781cf961a U dan -Z 8b4b4e6eeb34d8972dfc2e11c0d63f24 +Z 98ff71ee5d4b0fa0c1b172736bd46ff5 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 717b9c03f7..a73df473b2 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -0f6223b8f6c044db687f78e19f6373d0dda9155445c511a297efa05bac3b16e5 +86788c08fa09019f224d5dbd76f06c1d113b04ca5eca5d773719194a8b02da22 diff --git a/test/walsetlk2.test b/test/walsetlk2.test index 7fadc97fbc..92630b3fdf 100644 --- a/test/walsetlk2.test +++ b/test/walsetlk2.test @@ -141,6 +141,8 @@ do_execsql_test 2.5 { INSERT INTO t1 VALUES(9, 10); } +if {$::sqlite_options(setlk_timeout)==1} { + sqlite3_setlk_timeout db 2000 # Launch a non-blocking testfixture process to write-lock the @@ -169,6 +171,9 @@ do_execsql_test 2.7 { SELECT * FROM t1 } {1 2 3 4 5 6 7 8 9 10 11 12 13 14} +} + + #------------------------------------------------------------------------- # Check that if sqlite3_setlk_timeout(-1) is called, blocking locks are # enabled and last for a few seconds at least. Difficult to test that they @@ -176,6 +181,7 @@ do_execsql_test 2.7 { # reset_db +if {$::sqlite_options(setlk_timeout)==1} { do_execsql_test 3.0 { PRAGMA journal_mode = wal; CREATE TABLE t1(a INTEGER PRIMARY KEY, b); @@ -255,6 +261,7 @@ do_catchsql_test 3.4 { INSERT INTO t1 VALUES(13, 'thirteen'); } {0 {}} +} finish_test From 17b620eb6017f3b54b7cc3353289c2149323f522 Mon Sep 17 00:00:00 2001 From: drh <> Date: Tue, 25 Feb 2025 12:11:57 +0000 Subject: [PATCH 182/194] Update the autoconf Makefile for nmake to support SETLK_TIMEOUT. FossilOrigin-Name: 46909fe3348976448d6a0d9e9aacaeaccdf0978c9e9d10742a96842418ab3a08 --- autoconf/Makefile.msc | 10 ++++++++++ manifest | 14 +++++++------- manifest.uuid | 2 +- 3 files changed, 18 insertions(+), 8 deletions(-) diff --git a/autoconf/Makefile.msc b/autoconf/Makefile.msc index 538cc43a4b..d7284af23a 100644 --- a/autoconf/Makefile.msc +++ b/autoconf/Makefile.msc @@ -247,6 +247,12 @@ SESSION = 0 RBU = 0 !ENDIF +# Set this to non-0 to enable support for blocking locks. +# +!IFNDEF SETLK_TIMEOUT +SETLK_TIMEOUT = 0 +!ENDIF + # Set the source code file to be used by executables and libraries when # they need the amalgamation. # @@ -372,6 +378,10 @@ EXT_FEATURE_FLAGS = !ENDIF !ENDIF +!IF $(SETLK_TIMEOUT)!=0 +OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_SETLK_TIMEOUT +!ENDIF + ############################################################################### ############################### END OF OPTIONS ################################ ############################################################################### diff --git a/manifest b/manifest index 51e5a84f4d..28e9b8dee3 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Avoid\srunning\scertain\stests\sin\swalsetlk2.test\sif\sSQLITE_ENABLE_SETLK_TIMEOUT\sis\sset\sto\s2,\snot\s1. -D 2025-02-25T11:48:57.933 +C Update\sthe\sautoconf\sMakefile\sfor\snmake\sto\ssupport\sSETLK_TIMEOUT. +D 2025-02-25T12:11:57.680 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d @@ -17,7 +17,7 @@ F art/sqlite370.svg 40b7e2fe8aac3add5d56dd86ab8d427a4eca5bcb3fe4f8946cb3794e1821 F auto.def eddf6aef976e2c1a56c0accc3244945e0b22ec6799074c40be160e5a9a5662b0 F autoconf/Makefile.fallback 22fe523eb36dfce31e0f6349f782eb084e86a5620b2b0b4f84a2d6133f53f5ac F autoconf/Makefile.in d376f623fa747798e40f7fcb23f9392e4f87610daa8425673ab83a8f33578b65 -F autoconf/Makefile.msc 1249e425a24859c7b3f17575275247df9eec3bddc0d1d7e73941f1abdbb95a92 +F autoconf/Makefile.msc 5bc67d3912444c40c6f96d003e5c90663e51abb83d204a520110b1b2038dcd8b F autoconf/README.first f1d3876e9a7852c22f275a6f06814e64934cecbc0b5b9617d64849094c1fd136 F autoconf/README.txt 7f01dc3915e2d68f329011073662369e62a0938a2c69398807823c57591cb288 F autoconf/auto.def 3a318c4898024b35ed61a4876a42e3dcc313f93bd8486874d1ad498b88643d1a @@ -2212,8 +2212,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P 0f6223b8f6c044db687f78e19f6373d0dda9155445c511a297efa05bac3b16e5 -R fb82f4ee6ef5b793d1eb19b781cf961a -U dan -Z 98ff71ee5d4b0fa0c1b172736bd46ff5 +P 86788c08fa09019f224d5dbd76f06c1d113b04ca5eca5d773719194a8b02da22 +R ea3a74ee4d470bb2405d8144559736d8 +U drh +Z 5df352e631e8a81c77c665aa821d8494 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index a73df473b2..ed50e1ffde 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -86788c08fa09019f224d5dbd76f06c1d113b04ca5eca5d773719194a8b02da22 +46909fe3348976448d6a0d9e9aacaeaccdf0978c9e9d10742a96842418ab3a08 From d4c686ed8fd4f69c26a1ee0c7d65ded6b5fa17c7 Mon Sep 17 00:00:00 2001 From: drh <> Date: Tue, 25 Feb 2025 12:18:27 +0000 Subject: [PATCH 183/194] Small performance improvement for the new %#Q conversion in printf. FossilOrigin-Name: 17e440781e68d7d3ea68c5144e1e08e183f0caef595a6c7ac4ce56489c60f476 --- manifest | 12 ++++++------ manifest.uuid | 2 +- src/printf.c | 30 +++++++++++++++++------------- 3 files changed, 24 insertions(+), 20 deletions(-) diff --git a/manifest b/manifest index 3adc2b10de..a1f57c8112 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Consolidate\stwo\sdifferent\sUTF8\sencoders\sinto\sa\ssingle\ssubroutine. -D 2025-02-25T11:47:34.550 +C Small\sperformance\simprovement\sfor\sthe\snew\s%#Q\sconversion\sin\sprintf. +D 2025-02-25T12:18:27.029 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d @@ -777,7 +777,7 @@ F src/pcache.h 1497ce1b823cf00094bb0cf3bac37b345937e6f910890c626b16512316d3abf5 F src/pcache1.c 78d4935e510f7bed0fdd1a3f742c0e663b36a795f9dc7411161dc22bdae1245e F src/pragma.c c7ada272232e1182c4536d9637fa7b955a10bc1bd8d5a87d4dc9309dab827791 F src/prepare.c 1832be043fce7d489959aae6f994c452d023914714c4d5457beaed51c0f3d126 -F src/printf.c b6056bd2818523255255af34d370e2665b4895e50476955de797368d92f8f31f +F src/printf.c b373a8800e09fb888497b2bc640e455ee8ebc584a60f16368989394d5b895ac0 F src/random.c 606b00941a1d7dd09c381d3279a058d771f406c5213c9932bbd93d5587be4b9c F src/resolve.c 626c24b258b111f75c22107aa5614ad89810df3026f5ca071116d3fe75925c75 F src/rowset.c 8432130e6c344b3401a8874c3cb49fefe6873fec593294de077afea2dce5ec97 @@ -2211,8 +2211,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P c3949852cee320c2e02123b99c33155c459b10b2ac8e4fe80b1b7624c9ce0817 -R 783f95f7f826d114483ba4d9a5fea8e7 +P 6208e494858b9d362efc7db4e8aac6f8e93fe51d2e038c94dfa97c55a74688a0 +R 5e3cbac5c36e856b76f244c18c63cff3 U drh -Z 0a01b2d715a4d18665f9611e7764aecb +Z 71404ee027b8adeecdc3ccec4e60e22e # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 52be54b069..170b88d197 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -6208e494858b9d362efc7db4e8aac6f8e93fe51d2e038c94dfa97c55a74688a0 +17e440781e68d7d3ea68c5144e1e08e183f0caef595a6c7ac4ce56489c60f476 diff --git a/src/printf.c b/src/printf.c index 30c4ec6059..ae9e9010bd 100644 --- a/src/printf.c +++ b/src/printf.c @@ -757,7 +757,7 @@ void sqlite3_str_vappendf( case etESCAPE_Q: /* %Q: Escape ' and enclose in '...' */ case etESCAPE_w: { /* %w: Escape " characters */ i64 i, j, k, n; - int isnull, needQuote = 0; + int needQuote = 0; char ch; char *escarg; char q; @@ -767,18 +767,17 @@ void sqlite3_str_vappendf( }else{ escarg = va_arg(ap,char*); } - isnull = escarg==0; + if( escarg==0 ){ + escarg = (xtype==etESCAPE_Q ? "NULL" : "(NULL)"); + }else if( xtype==etESCAPE_Q ){ + needQuote = 1; + } if( xtype==etESCAPE_w ){ q = '"'; flag_alternateform = 0; }else{ q = '\''; } - if( isnull ){ - escarg = (xtype==etESCAPE_Q ? "NULL" : "(NULL)"); - }else if( xtype==etESCAPE_Q ){ - needQuote = 1; - } /* For %q, %Q, and %w, the precision is the number of bytes (or ** characters if the ! flags is present) to use from the input. ** Because of the extra quoting characters inserted, the number @@ -832,12 +831,12 @@ void sqlite3_str_vappendf( } } k = i; - for(i=0; i Date: Tue, 25 Feb 2025 13:33:43 +0000 Subject: [PATCH 184/194] Fix a test script problem causing errors with Tcl 9. FossilOrigin-Name: dbec2c47d09027f2458036f675c8af3f8f152c0530799582eeac231649eba501 --- manifest | 14 +++++++------- manifest.uuid | 2 +- test/lock_common.tcl | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/manifest b/manifest index 28e9b8dee3..c451680461 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Update\sthe\sautoconf\sMakefile\sfor\snmake\sto\ssupport\sSETLK_TIMEOUT. -D 2025-02-25T12:11:57.680 +C Fix\sa\stest\sscript\sproblem\scausing\serrors\swith\sTcl\s9. +D 2025-02-25T13:33:43.248 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d @@ -1417,7 +1417,7 @@ F test/lock4.test 27143363eda1622f03c133efc8db808fc331afd973486cb571ea71cd717d37 F test/lock5.test 583cae05992af0f66607286917f7d5f8aed3b6053c52df5994efb98f2a8fdbaf F test/lock6.test ad5b387a3a8096afd3c68a55b9535056431b0cf5 F test/lock7.test 49f1eaff1cdc491cc5dee3669f3c671d9f172431 -F test/lock_common.tcl f33b7fbc275be25a6f2863b4cc8af35278e24d127a3f734825477bf223b05ffe +F test/lock_common.tcl f0a1f7b8f3fbb8629dc6231613a02841736f86ef72151429d5ffc12c7f613fb3 F test/lookaside.test 5a828e7256f1ee4da8e1bdaa03373a3ccdb0f1ff98dfa82e9b76cb41a45b1083 F test/main.test e8752d76233b1c8906cd2c98ad920dba868bd63c87d51d8a2ea5e9cba55dd496 F test/make-where7.tcl 05c16b5d4f5d6512881dfec560cb793915932ef9 @@ -2212,8 +2212,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P 86788c08fa09019f224d5dbd76f06c1d113b04ca5eca5d773719194a8b02da22 -R ea3a74ee4d470bb2405d8144559736d8 -U drh -Z 5df352e631e8a81c77c665aa821d8494 +P 46909fe3348976448d6a0d9e9aacaeaccdf0978c9e9d10742a96842418ab3a08 +R 526cf0a0be1bc6e2b85addf701939bc4 +U dan +Z 52df1a59d6f0cdd2cab89227f5c1e86d # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index ed50e1ffde..8f4a3e4879 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -46909fe3348976448d6a0d9e9aacaeaccdf0978c9e9d10742a96842418ab3a08 +dbec2c47d09027f2458036f675c8af3f8f152c0530799582eeac231649eba501 diff --git a/test/lock_common.tcl b/test/lock_common.tcl index 9504a8c046..7c79e4b4c5 100644 --- a/test/lock_common.tcl +++ b/test/lock_common.tcl @@ -145,7 +145,7 @@ proc testfixture_nb_cb {varname chan} { } if { $line == "OVER" } { - global $varname + if {[string range $varname 0 1]!="::"} { global $varname } set $varname [lindex $::tfnb($chan) 1] unset ::tfnb($chan) close $chan From 58bc525e32a23396a584b556dd55a46eba927fd9 Mon Sep 17 00:00:00 2001 From: dan Date: Tue, 25 Feb 2025 15:27:55 +0000 Subject: [PATCH 185/194] Reinstate the assert() removed by [0f6223b8]. Avoid holding a wal-mode write lock after the transaction has been rolled back if an IO error occurs while restarting the wal file. FossilOrigin-Name: 277e150d6ab75de2407f6761aa2359df80a4e1dbce30788df06621dee05b2ef1 --- manifest | 14 +++++++------- manifest.uuid | 2 +- src/pager.c | 9 +++++++++ src/wal.c | 3 +++ 4 files changed, 20 insertions(+), 8 deletions(-) diff --git a/manifest b/manifest index c451680461..f7f2544ed6 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Fix\sa\stest\sscript\sproblem\scausing\serrors\swith\sTcl\s9. -D 2025-02-25T13:33:43.248 +C Reinstate\sthe\sassert()\sremoved\sby\s[0f6223b8].\sAvoid\sholding\sa\swal-mode\swrite\slock\safter\sthe\stransaction\shas\sbeen\srolled\sback\sif\san\sIO\serror\soccurs\swhile\srestarting\sthe\swal\sfile. +D 2025-02-25T15:27:55.533 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d @@ -769,7 +769,7 @@ F src/os_setup.h 6011ad7af5db4e05155f385eb3a9b4470688de6f65d6166b8956e58a3d87210 F src/os_unix.c 1e887f1f926a76a65ebcef79aa6da76e369ad7f899fa211c6ee56ff953c098a2 F src/os_win.c ab9912a2c1cb39a6429b8de919a5b63ad1c7775e511d748391c57bf9ad03bd29 F src/os_win.h 7b073010f1451abe501be30d12f6bc599824944a -F src/pager.c 8d73e7a0ebbecd8bb4996ff285cc055cec56b7e3edb5a4609d0748e0fa39d28a +F src/pager.c 9fbb541b46125dfa8914827575e6bb4d15048caa008073b1709112d495d7983b F src/pager.h 6137149346e6c8a3ddc1eeb40aee46381e9bc8b0fcc6dda8a1efde993c2275b8 F src/parse.y 4e62b0b301673d404b8aff7c9d84ee8636e5ff59f45c90cdce4c8845a1289837 F src/pcache.c 588cc3c5ccaaadde689ed35ce5c5c891a1f7b1f4d1f56f6cf0143b74d8ee6484 @@ -862,7 +862,7 @@ F src/vdbetrace.c fe0bc29ebd4e02c8bc5c1945f1d2e6be5927ec12c06d89b03ef2a4def34bf8 F src/vdbevtab.c fc46b9cbd759dc013f0b3724549cc0d71379183c667df3a5988f7e2f1bd485f3 F src/vtab.c 828221bdbeaaa6d62126ee6d07fd4ec0d09dcaea846f87ad01944d8b7e548859 F src/vxworks.h d2988f4e5a61a4dfe82c6524dd3d6e4f2ce3cdb9 -F src/wal.c a9924069336c4658b2edca78329dfa882625d9994abd3ddb0844f01d367bbd43 +F src/wal.c 2c69a5f92270429db72d853691b0640c76c671d5b2465396dadb9d9873e1efce F src/wal.h ba252daaa94f889f4b2c17c027e823d9be47ce39da1d3799886bbd51f0490452 F src/walker.c d5006d6b005e4ea7302ad390957a8d41ed83faa177e412f89bc5600a7462a014 F src/where.c 12cca5dfbe96e2589f951c43c0720fc58e52611787c37d85a0d9c10376202e8b @@ -2212,8 +2212,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P 46909fe3348976448d6a0d9e9aacaeaccdf0978c9e9d10742a96842418ab3a08 -R 526cf0a0be1bc6e2b85addf701939bc4 +P dbec2c47d09027f2458036f675c8af3f8f152c0530799582eeac231649eba501 +R 2312fa300fbaf4183adcc761394fc806 U dan -Z 52df1a59d6f0cdd2cab89227f5c1e86d +Z a3a3c0f73073583ca8fc9c0889051cbf # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 8f4a3e4879..19e81632af 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -dbec2c47d09027f2458036f675c8af3f8f152c0530799582eeac231649eba501 +277e150d6ab75de2407f6761aa2359df80a4e1dbce30788df06621dee05b2ef1 diff --git a/src/pager.c b/src/pager.c index 5d279001e7..21f3ac5f67 100644 --- a/src/pager.c +++ b/src/pager.c @@ -1846,6 +1846,15 @@ static void pager_unlock(Pager *pPager){ if( pagerUseWal(pPager) ){ assert( !isOpen(pPager->jfd) ); + if( pPager->eState==PAGER_ERROR ){ + /* If an IO error occurs in wal.c while attempting to wrap the wal file, + ** then the Wal object may be holding a write-lock but no read-lock. + ** This call ensures that the write-lock is dropped as well. We cannot + ** have sqlite3WalEndReadTransaction() drop the write-lock, as it once + ** did, because this would break "BEGIN EXCLUSIVE" handling for + ** SQLITE_ENABLE_SETLK_TIMEOUT builds. */ + sqlite3WalEndWriteTransaction(pPager->pWal); + } sqlite3WalEndReadTransaction(pPager->pWal); pPager->eState = PAGER_OPEN; }else if( !pPager->exclusiveMode ){ diff --git a/src/wal.c b/src/wal.c index a6287a4081..d374d6eb4d 100644 --- a/src/wal.c +++ b/src/wal.c @@ -3482,6 +3482,9 @@ int sqlite3WalBeginReadTransaction(Wal *pWal, int *pChanged){ ** read-lock. */ void sqlite3WalEndReadTransaction(Wal *pWal){ +#ifndef SQLITE_ENABLE_SETLK_TIMEOUT + assert( pWal->writeLock==0 || pWal->readLock<0 ); +#endif if( pWal->readLock>=0 ){ sqlite3WalEndWriteTransaction(pWal); walUnlockShared(pWal, WAL_READ_LOCK(pWal->readLock)); From c3d2ec228911bf7215aa514ba3df8483f8e2801c Mon Sep 17 00:00:00 2001 From: stephan Date: Tue, 25 Feb 2025 16:11:25 +0000 Subject: [PATCH 186/194] Restructure [826bad10e9ccd6f71e] as that structure mysteriously breaks the --prefix=... configure flag. FossilOrigin-Name: d284230f68616b78a527d34df777b0220376ba6a00e9e927d4ffb4cbddab900c --- autosetup/sqlite-config.tcl | 10 ++-------- manifest | 15 +++++++-------- manifest.uuid | 2 +- 3 files changed, 10 insertions(+), 17 deletions(-) diff --git a/autosetup/sqlite-config.tcl b/autosetup/sqlite-config.tcl index e6dfb018d2..8cfa7ff68e 100644 --- a/autosetup/sqlite-config.tcl +++ b/autosetup/sqlite-config.tcl @@ -28,6 +28,8 @@ proc sqlite-setup-package-info {} { msg-result "Source dir = $srcdir" msg-result "Build dir = $::autosetup(builddir)" } +sqlite-setup-package-info +use cc cc-db cc-shared cc-lib pkg-config # # Object for communicating config-time state across various @@ -355,14 +357,6 @@ proc sqlite-configure {buildMode configScript} { dict incr opts -level return {*}$opts $msg } - sqlite-setup-package-info - uplevel 1 { - # The odd placement of this block is so that we can emit the - # output from sqlite-setup-package-info after --help is processed - # but before any other info is emitted, e.g. the host/target - # system info and the C compiler check. - use cc cc-db cc-shared cc-lib pkg-config - } sqlite-post-options-init uplevel 1 $configScript sqlite-configure-finalize diff --git a/manifest b/manifest index 4c076a42b3..8c63190f2a 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Enhancements\sto\shelp\savoid\sproblems\sin\sthe\sCLI\swhen\strying\sdisplay\scontent\nthat\scontains\sANSI\sescape\scodes:\s\s(1)\sAdd\sthe\s--escape\sMODE\soption\sto\sthe\sCLI\nwhere\sMODE\sis\sone\sof\s"symbol",\s"ascii",\s"off"\swhere\sthe\sdefault\sis\s"symbol".\n(2)\sAdd\sthe\sunistr()\sSQL\sfunction.\s\s(3)\sAdd\sthe\sunistr_quote()\sSQL\sfunction.\n(4)\sAdd\sthe\s%#Q\sand\s%#q\sconversions\sin\sthe\sbuilt-in\sprintf. -D 2025-02-25T15:57:49.285 +C Restructure\s[826bad10e9ccd6f71e]\sas\sthat\sstructure\smysteriously\sbreaks\sthe\s--prefix=...\sconfigure\sflag. +D 2025-02-25T16:11:25.004 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d @@ -50,7 +50,7 @@ F autosetup/cc.tcl c0fcc50ca91deff8741e449ddad05bcd08268bc31177e613a6343bbd1fd3e F autosetup/jimsh0.c a57c16e65dcffc9c76e496757cb3f7fb47e01ecbd1631a0a5e01751fc856f049 F autosetup/pkg-config.tcl 4e635bf39022ff65e0d5434339dd41503ea48fc53822c9c5bde88b02d3d952ba F autosetup/proj.tcl e69b91f814ea510057ce7663845de703c3746d71cff9a0db6b2563ee3e7fd25e -F autosetup/sqlite-config.tcl c9ec1c6f34c3998c9eb0757f6e23a11de4f1e56db64becbdba0aa331e86f2312 +F autosetup/sqlite-config.tcl f0f65115fc1102b6c07c92b068c880f53609979f42997c875cd26b41ded18ee4 F autosetup/system.tcl 51d4be76cd9a9074704b584e5c9cbba616202c8468cf9ba8a4f8294a7ab1dba9 F configure 9a00b21dfd13757bbfb8d89b30660a89ec1f8f3a79402b8f9f9b6fc475c3303a x F contrib/sqlitecon.tcl 210a913ad63f9f991070821e599d600bd913e0ad @@ -2213,9 +2213,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P 85b56fb0cce4b628f80b26a67b43236ef1557282775739bdbe7cc4d65948d66f 17e440781e68d7d3ea68c5144e1e08e183f0caef595a6c7ac4ce56489c60f476 -R c94972830506b6b395965daf9af442ac -T +closed 17e440781e68d7d3ea68c5144e1e08e183f0caef595a6c7ac4ce56489c60f476 -U drh -Z 631ba5f922f8bda01c5446d2ca5a70ab +P e3e509ae145ee2623ac68ededa59991a97fcd28313e03f67a3890b560c5381b0 +R fd4ebe752142efbb8ac5cd30b48aab12 +U stephan +Z efa68ac0882424e3130ad8b6fbb82f0b # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 3d240e7aee..3bbb70f315 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -e3e509ae145ee2623ac68ededa59991a97fcd28313e03f67a3890b560c5381b0 +d284230f68616b78a527d34df777b0220376ba6a00e9e927d4ffb4cbddab900c From 90454d892494464131f43eae84c90447c1dc2fda Mon Sep 17 00:00:00 2001 From: stephan Date: Tue, 25 Feb 2025 16:39:51 +0000 Subject: [PATCH 187/194] Configure script cosmetics: emit the host/build system info before the directory info. FossilOrigin-Name: 6f0b6d95db17e69ac7e46a39f52770291ac4cfe43eea09add224946a6e11f04e --- autosetup/sqlite-config.tcl | 27 +++++++++++---------------- manifest | 12 ++++++------ manifest.uuid | 2 +- 3 files changed, 18 insertions(+), 23 deletions(-) diff --git a/autosetup/sqlite-config.tcl b/autosetup/sqlite-config.tcl index 8cfa7ff68e..2b52a44e28 100644 --- a/autosetup/sqlite-config.tcl +++ b/autosetup/sqlite-config.tcl @@ -12,24 +12,19 @@ if {[string first " " $autosetup(builddir)] != -1} { may not contain space characters" } +# The mixing of output and 'use' here is largely cosmetic, the intent +# being to put the most-frequently-useful info at the top. use proj -######################################################################## -# Set up PACKAGE_NAME and related defines and emit some useful -# bootstrapping info to the user. -proc sqlite-setup-package-info {} { - set srcdir $::autosetup(srcdir) - set PACKAGE_VERSION [proj-file-content -trim $srcdir/VERSION] - define PACKAGE_NAME "sqlite" - define PACKAGE_URL {https://sqlite.org} - define PACKAGE_VERSION $PACKAGE_VERSION - define PACKAGE_STRING "[get-define PACKAGE_NAME] $PACKAGE_VERSION" - define PACKAGE_BUGREPORT [get-define PACKAGE_URL]/forum - msg-result "Configuring SQLite version $PACKAGE_VERSION" - msg-result "Source dir = $srcdir" - msg-result "Build dir = $::autosetup(builddir)" -} -sqlite-setup-package-info +define PACKAGE_VERSION [proj-file-content -trim $::autosetup(srcdir)/VERSION] +msg-result "Configuring SQLite version [get-define PACKAGE_VERSION]" +use system ; # Will output "Host System" and "Build System" lines +msg-result "Source dir = $::autosetup(srcdir)" +msg-result "Build dir = $::autosetup(builddir)" use cc cc-db cc-shared cc-lib pkg-config +define PACKAGE_NAME "sqlite" +define PACKAGE_URL {https://sqlite.org} +define PACKAGE_BUGREPORT [get-define PACKAGE_URL]/forum +define PACKAGE_STRING "[get-define PACKAGE_NAME] [get-define PACKAGE_VERSION]" # # Object for communicating config-time state across various diff --git a/manifest b/manifest index 8c63190f2a..925e48deab 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Restructure\s[826bad10e9ccd6f71e]\sas\sthat\sstructure\smysteriously\sbreaks\sthe\s--prefix=...\sconfigure\sflag. -D 2025-02-25T16:11:25.004 +C Configure\sscript\scosmetics:\semit\sthe\shost/build\ssystem\sinfo\sbefore\sthe\sdirectory\sinfo. +D 2025-02-25T16:39:51.686 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d @@ -50,7 +50,7 @@ F autosetup/cc.tcl c0fcc50ca91deff8741e449ddad05bcd08268bc31177e613a6343bbd1fd3e F autosetup/jimsh0.c a57c16e65dcffc9c76e496757cb3f7fb47e01ecbd1631a0a5e01751fc856f049 F autosetup/pkg-config.tcl 4e635bf39022ff65e0d5434339dd41503ea48fc53822c9c5bde88b02d3d952ba F autosetup/proj.tcl e69b91f814ea510057ce7663845de703c3746d71cff9a0db6b2563ee3e7fd25e -F autosetup/sqlite-config.tcl f0f65115fc1102b6c07c92b068c880f53609979f42997c875cd26b41ded18ee4 +F autosetup/sqlite-config.tcl 341d530f531c1dd70c3bc4e16905ad0a83cde1a2104d0b5655aa44b13bd37349 F autosetup/system.tcl 51d4be76cd9a9074704b584e5c9cbba616202c8468cf9ba8a4f8294a7ab1dba9 F configure 9a00b21dfd13757bbfb8d89b30660a89ec1f8f3a79402b8f9f9b6fc475c3303a x F contrib/sqlitecon.tcl 210a913ad63f9f991070821e599d600bd913e0ad @@ -2213,8 +2213,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P e3e509ae145ee2623ac68ededa59991a97fcd28313e03f67a3890b560c5381b0 -R fd4ebe752142efbb8ac5cd30b48aab12 +P d284230f68616b78a527d34df777b0220376ba6a00e9e927d4ffb4cbddab900c +R f4aaf63c39bb031c24a4e45f4e062b3e U stephan -Z efa68ac0882424e3130ad8b6fbb82f0b +Z 34d3402ca6007d9c26a6383d8b273884 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 3bbb70f315..3fc69bae0b 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -d284230f68616b78a527d34df777b0220376ba6a00e9e927d4ffb4cbddab900c +6f0b6d95db17e69ac7e46a39f52770291ac4cfe43eea09add224946a6e11f04e From 82769e7d04a7633f05e79777cf87472f3afb8b4e Mon Sep 17 00:00:00 2001 From: drh <> Date: Tue, 25 Feb 2025 18:10:47 +0000 Subject: [PATCH 188/194] Improved help messages for the --escape option in the CLI. FossilOrigin-Name: e6784af6d50f715338ae3218fc8ba1b894883c27d797f0b7fd2625cac17d9cd7 --- manifest | 14 +++++++------- manifest.uuid | 2 +- src/shell.c.in | 5 +++-- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/manifest b/manifest index 925e48deab..13cef0c5a7 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Configure\sscript\scosmetics:\semit\sthe\shost/build\ssystem\sinfo\sbefore\sthe\sdirectory\sinfo. -D 2025-02-25T16:39:51.686 +C Improved\shelp\smessages\sfor\sthe\s--escape\soption\sin\sthe\sCLI. +D 2025-02-25T18:10:47.123 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d @@ -782,7 +782,7 @@ F src/random.c 606b00941a1d7dd09c381d3279a058d771f406c5213c9932bbd93d5587be4b9c F src/resolve.c 626c24b258b111f75c22107aa5614ad89810df3026f5ca071116d3fe75925c75 F src/rowset.c 8432130e6c344b3401a8874c3cb49fefe6873fec593294de077afea2dce5ec97 F src/select.c a076f7db3a0fcbd9f710d7746cfc07e0b3baadee45eb3136bedc29c598ef8f1c -F src/shell.c.in 19cde2832968fff4d26a75b40b3af1ad7744dfeb0023467f4100849e23a81ce0 +F src/shell.c.in 389d7c8cdc1c5322a81ff43df51434dc79a103e1948dad2b5efa3efe5f1a19c9 F src/sqlite.h.in 95c01911006f42019ee4dacd62101740a75fdfaeeca9b1c5fd7a70cfac3bb6f8 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8 F src/sqlite3ext.h 3f046c04ea3595d6bfda99b781926b17e672fd6d27da2ba6d8d8fc39981dcb54 @@ -2213,8 +2213,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P d284230f68616b78a527d34df777b0220376ba6a00e9e927d4ffb4cbddab900c -R f4aaf63c39bb031c24a4e45f4e062b3e -U stephan -Z 34d3402ca6007d9c26a6383d8b273884 +P 6f0b6d95db17e69ac7e46a39f52770291ac4cfe43eea09add224946a6e11f04e +R 7c090b4968aa0e8ac71166a84a710e20 +U drh +Z 697ed46df73faf7261ac7cfa9611a38d # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 3fc69bae0b..f1e0b3d063 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -6f0b6d95db17e69ac7e46a39f52770291ac4cfe43eea09add224946a6e11f04e +e6784af6d50f715338ae3218fc8ba1b894883c27d797f0b7fd2625cac17d9cd7 diff --git a/src/shell.c.in b/src/shell.c.in index 40f07332c9..011c8c9847 100644 --- a/src/shell.c.in +++ b/src/shell.c.in @@ -5130,7 +5130,7 @@ static const char *(azHelp[]) = { #else ".log on|off Turn logging on or off.", #endif - ".mode MODE ?OPTIONS? Set output mode", + ".mode ?MODE? ?OPTIONS? Set output mode", " MODE is one of:", " ascii Columns/rows delimited by 0x1F and 0x1E", " box Tables using unicode box-drawing characters", @@ -5148,6 +5148,7 @@ static const char *(azHelp[]) = { " tabs Tab-separated values", " tcl TCL list elements", " OPTIONS: (for columnar modes or insert mode):", + " --escape T ctrl-char escape; T is one of: symbol, ascii, off", " --wrap N Wrap output lines to no longer than N characters", " --wordwrap B Wrap or not at word boundaries per B (on/off)", " --ww Shorthand for \"--wordwrap 1\"", @@ -12738,7 +12739,7 @@ static const char zOptions[] = " -deserialize open the database using sqlite3_deserialize()\n" #endif " -echo print inputs before execution\n" - " -escape MODE ctrl-char escape mode, one of: symbol, ascii, off\n" + " -escape T ctrl-char escape; T is one of: symbol, ascii, off\n" " -init FILENAME read/process named file\n" " -[no]header turn headers on or off\n" #if defined(SQLITE_ENABLE_MEMSYS3) || defined(SQLITE_ENABLE_MEMSYS5) From 1c03a344004cbb40f702222470e021c18d0177a7 Mon Sep 17 00:00:00 2001 From: drh <> Date: Tue, 25 Feb 2025 20:02:58 +0000 Subject: [PATCH 189/194] Fix harmless "unused parameter" compiler warnings. FossilOrigin-Name: 7a68a3ead8e6c75203641542256bcfa05067bed4bf9035452fbd134534801a08 --- manifest | 12 ++++++------ manifest.uuid | 2 +- src/main.c | 4 ++++ 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/manifest b/manifest index 13cef0c5a7..980e93fc11 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Improved\shelp\smessages\sfor\sthe\s--escape\soption\sin\sthe\sCLI. -D 2025-02-25T18:10:47.123 +C Fix\sharmless\s"unused\sparameter"\scompiler\swarnings. +D 2025-02-25T20:02:58.548 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d @@ -745,7 +745,7 @@ F src/insert.c a5f0366266be993ebf533808f22cb7a788624805b55bc45424ceed3f48c54a16 F src/json.c 5abb5cb782e74451a8882f6b7ee4d5e629246642262660bd1980a5e1b796258d F src/legacy.c d7874bc885906868cd51e6c2156698f2754f02d9eee1bae2d687323c3ca8e5aa F src/loadext.c 7432c944ff197046d67a1207790a1b13eec4548c85a9457eb0896bb3641dfb36 -F src/main.c 9584f789e573f7fb9b5bdc90b35eb16eeea5126419dd3d7166df532f6e121fd8 +F src/main.c 04a1d2725b51bfbff77b735cae12be3cd66f34da0dd3053433b5c9d9fcad84c5 F src/malloc.c 410e570b30c26cc36e3372577df50f7a96ee3eed5b2b161c6b6b48773c650c5e F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645 F src/mem1.c 3bb59158c38e05f6270e761a9f435bf19827a264c13d1631c58b84bdc96d73b2 @@ -2213,8 +2213,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P 6f0b6d95db17e69ac7e46a39f52770291ac4cfe43eea09add224946a6e11f04e -R 7c090b4968aa0e8ac71166a84a710e20 +P e6784af6d50f715338ae3218fc8ba1b894883c27d797f0b7fd2625cac17d9cd7 +R ed1ab79dc08a09ea5f550a35fad2b849 U drh -Z 697ed46df73faf7261ac7cfa9611a38d +Z 22f76806aee91f7d6b86860e87290c49 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index f1e0b3d063..d1df18ecee 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -e6784af6d50f715338ae3218fc8ba1b894883c27d797f0b7fd2625cac17d9cd7 +7a68a3ead8e6c75203641542256bcfa05067bed4bf9035452fbd134534801a08 diff --git a/src/main.c b/src/main.c index 3ed21e423b..513e193dd2 100644 --- a/src/main.c +++ b/src/main.c @@ -1864,6 +1864,10 @@ int sqlite3_setlk_timeout(sqlite3 *db, int ms, int flags){ } } sqlite3BtreeLeaveAll(db); +#endif +#if !defined(SQLITE_ENABLE_API_ARMOR) && !defined(SQLITE_ENABLE_SETLK_TIMEOUT) + UNUSED_PARAMETER(db); + UNUSED_PARAMETER(flags); #endif return SQLITE_OK; } From 846643ebad464fcf6e82818903258b6e47756cbf Mon Sep 17 00:00:00 2001 From: drh <> Date: Tue, 25 Feb 2025 20:10:46 +0000 Subject: [PATCH 190/194] Change the default control-character escape algorithm from "symbol" to "ascii", since the "ascii" algorithm works even on terminals that do not support unicode. FossilOrigin-Name: d35320495eb282601ab4f3b9efc53c7c1d58e890f025317e34c7046a43c8cb53 --- manifest | 14 +++++++------- manifest.uuid | 2 +- src/shell.c.in | 9 +++++---- test/shellA.test | 14 +++++++------- 4 files changed, 20 insertions(+), 19 deletions(-) diff --git a/manifest b/manifest index 980e93fc11..8b0a5802d3 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Fix\sharmless\s"unused\sparameter"\scompiler\swarnings. -D 2025-02-25T20:02:58.548 +C Change\sthe\sdefault\scontrol-character\sescape\salgorithm\sfrom\s"symbol"\sto\n"ascii",\ssince\sthe\s"ascii"\salgorithm\sworks\seven\son\sterminals\sthat\sdo\nnot\ssupport\sunicode. +D 2025-02-25T20:10:46.001 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d @@ -782,7 +782,7 @@ F src/random.c 606b00941a1d7dd09c381d3279a058d771f406c5213c9932bbd93d5587be4b9c F src/resolve.c 626c24b258b111f75c22107aa5614ad89810df3026f5ca071116d3fe75925c75 F src/rowset.c 8432130e6c344b3401a8874c3cb49fefe6873fec593294de077afea2dce5ec97 F src/select.c a076f7db3a0fcbd9f710d7746cfc07e0b3baadee45eb3136bedc29c598ef8f1c -F src/shell.c.in 389d7c8cdc1c5322a81ff43df51434dc79a103e1948dad2b5efa3efe5f1a19c9 +F src/shell.c.in aae17e88132d01fe72bd8fc888a1ae6b5806cc3f16449363bf733249e379f362 F src/sqlite.h.in 95c01911006f42019ee4dacd62101740a75fdfaeeca9b1c5fd7a70cfac3bb6f8 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8 F src/sqlite3ext.h 3f046c04ea3595d6bfda99b781926b17e672fd6d27da2ba6d8d8fc39981dcb54 @@ -1647,7 +1647,7 @@ F test/shell6.test e3b883b61d4916b6906678a35f9d19054861123ad91b856461e0a456273bd F test/shell7.test 43fd8e511c533bab5232e95c7b4be93b243451709e89582600d4b6e67693d5c3 F test/shell8.test aea51ecbcd4494c746b096aeff51d841d04d5f0dc4b62eb42427f16109b87acd F test/shell9.test 8742a5b390cdcef6369f5aa223e415aa4255a4129ef249b177887dc635a87209 -F test/shellA.test 09a6dd097ffa984ddf1fc0ddd2ae5f1a199cf11f3894b6a16410471c1536efe3 +F test/shellA.test 079c05c11947ade4ea8d51053d3abb687ec96a3dce6680d01838519b705190c5 F test/shmlock.test 3dbf017d34ab0c60abe6a44e447d3552154bd0c87b41eaf5ceacd408dd13fda5 F test/shortread1.test bb591ef20f0fd9ed26d0d12e80eee6d7ac8897a3 F test/show_speedtest1_rtree.tcl 32e6c5f073d7426148a6936a0408f4b5b169aba5 @@ -2213,8 +2213,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P e6784af6d50f715338ae3218fc8ba1b894883c27d797f0b7fd2625cac17d9cd7 -R ed1ab79dc08a09ea5f550a35fad2b849 +P 7a68a3ead8e6c75203641542256bcfa05067bed4bf9035452fbd134534801a08 +R 9150601691b6949cdfd27e2d8fc2b2d5 U drh -Z 22f76806aee91f7d6b86860e87290c49 +Z 0c126ce764aac44793da4922fbb2e61b # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index d1df18ecee..46582bcacb 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -7a68a3ead8e6c75203641542256bcfa05067bed4bf9035452fbd134534801a08 +d35320495eb282601ab4f3b9efc53c7c1d58e890f025317e34c7046a43c8cb53 diff --git a/src/shell.c.in b/src/shell.c.in index 011c8c9847..72a5cee40b 100644 --- a/src/shell.c.in +++ b/src/shell.c.in @@ -1547,13 +1547,14 @@ static ShellState shellState; ** top-level SQL statement */ #define SHELL_PROGRESS_ONCE 0x04 /* Cancel the --limit after firing once */ -/* Allowed values for ShellState.eEscMode +/* Allowed values for ShellState.eEscMode. The default value should +** be 0, so to change the default, reorder the names. */ -#define SHELL_ESC_SYMBOL 0 /* Substitute U+2400 graphics */ -#define SHELL_ESC_ASCII 1 /* Substitute ^Y for X where Y=X+0x40 */ +#define SHELL_ESC_ASCII 0 /* Substitute ^Y for X where Y=X+0x40 */ +#define SHELL_ESC_SYMBOL 1 /* Substitute U+2400 graphics */ #define SHELL_ESC_OFF 2 /* Send characters verbatim */ -static const char *shell_EscModeNames[] = { "symbol", "ascii", "off" }; +static const char *shell_EscModeNames[] = { "ascii", "symbol", "off" }; /* ** These are the allowed shellFlgs values diff --git a/test/shellA.test b/test/shellA.test index 8e5e04f79d..1a8161bf38 100644 --- a/test/shellA.test +++ b/test/shellA.test @@ -36,7 +36,7 @@ do_execsql_test shellA-1.0 { # and that our calls to the CLI are working. # do_test shellA-1.2 { - exec {*}$CLI test.db {.mode box} {SELECT * FROM t1;} + exec {*}$CLI test.db {.mode box --escape symbol} {SELECT * FROM t1;} } { ┌───┬──────────────────────────┐ │ a │ x │ @@ -65,7 +65,7 @@ do_test shellA-1.2 { do_test shellA-1.3 { exec {*}$CLI test.db {SELECT x FROM t1 WHERE a=2;} } { -␛[31mVT-100 codes␛[0m +^[[31mVT-100 codes^[[0m } do_test shellA-1.4 { exec {*}$CLI test.db --escape symbol {SELECT x FROM t1 WHERE a=2;} @@ -101,13 +101,13 @@ do_test shellA-1.9 { exec {*}$CLI test.db {.mode test --escape xyz} } msg] lappend rc $msg -} {1 {unknown control character escape mode "xyz" - choices: symbol ascii off}} +} {1 {unknown control character escape mode "xyz" - choices: ascii symbol off}} do_test shellA-1.10 { set rc [catch { exec {*}$CLI --escape abc test.db .q } msg] lappend rc $msg -} {1 {unknown control character escape mode "abc" - choices: symbol ascii off}} +} {1 {unknown control character escape mode "abc" - choices: ascii symbol off}} # ".mode quote" # @@ -123,10 +123,10 @@ line' } do_test shellA-2.2 { exec {*}$CLI test.db --quote {.mode} -} {current output mode: quote --escape symbol} -do_test shellA-2.3 { - exec {*}$CLI test.db --quote --escape ASCII {.mode} } {current output mode: quote --escape ascii} +do_test shellA-2.3 { + exec {*}$CLI test.db --quote --escape SYMBOL {.mode} +} {current output mode: quote --escape symbol} do_test shellA-2.4 { exec {*}$CLI test.db --quote --escape OFF {.mode} } {current output mode: quote --escape off} From b8ec04ee0225d0f430536ac5f2b580a42addba6c Mon Sep 17 00:00:00 2001 From: drh <> Date: Tue, 25 Feb 2025 20:36:46 +0000 Subject: [PATCH 191/194] Fix a test case that was broken when the default --escape type was changed by the previous check-in. FossilOrigin-Name: 5f2531e068b4856db2270518c370b65cbd0c0ab5443d76f1fb1116fe9ad80296 --- manifest | 12 ++++++------ manifest.uuid | 2 +- test/shell1.test | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/manifest b/manifest index 8b0a5802d3..4a5e19a77f 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Change\sthe\sdefault\scontrol-character\sescape\salgorithm\sfrom\s"symbol"\sto\n"ascii",\ssince\sthe\s"ascii"\salgorithm\sworks\seven\son\sterminals\sthat\sdo\nnot\ssupport\sunicode. -D 2025-02-25T20:10:46.001 +C Fix\sa\stest\scase\sthat\swas\sbroken\swhen\sthe\sdefault\s--escape\stype\swas\schanged\nby\sthe\sprevious\scheck-in. +D 2025-02-25T20:36:46.116 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d @@ -1638,7 +1638,7 @@ F test/sharedA.test 64bdd21216dda2c6a3bd3475348ccdc108160f34682c97f2f51c19fc0e21 F test/sharedB.test 1a84863d7a2204e0d42f2e1606577c5e92e4473fa37ea0f5bdf829e4bf8ee707 F test/shared_err.test 32634e404a3317eeb94abc7a099c556a346fdb8fb3858dbe222a4cbb8926a939 F test/sharedlock.test 5ede3c37439067c43b0198f580fd374ebf15d304 -F test/shell1.test 9f5ad2c80002175428eb375f020c4cec3d5053f244e5612ac317080cfb5b52a3 +F test/shell1.test 573942b8d0e444956445993d5a5275c6912bc49b654441eec0b5e1e735f2e5b7 F test/shell2.test 01a01f76ed98088ce598794fbf5b359e148271541a8ddbf79d21cc353cc67a24 F test/shell3.test db1953a8e59d08e9240b7cc5948878e184f7eb2623591587f8fd1f1a5bd536d8 F test/shell4.test 522fdc628c55eff697b061504fb0a9e4e6dfc5d9087a633ab0f3dd11bcc4f807 @@ -2213,8 +2213,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P 7a68a3ead8e6c75203641542256bcfa05067bed4bf9035452fbd134534801a08 -R 9150601691b6949cdfd27e2d8fc2b2d5 +P d35320495eb282601ab4f3b9efc53c7c1d58e890f025317e34c7046a43c8cb53 +R 04c04f142a27d75e025c0ba133fe1798 U drh -Z 0c126ce764aac44793da4922fbb2e61b +Z b55ed85e90ac874ba1b5e9186f139abf # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 46582bcacb..c9d8775481 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -d35320495eb282601ab4f3b9efc53c7c1d58e890f025317e34c7046a43c8cb53 +5f2531e068b4856db2270518c370b65cbd0c0ab5443d76f1fb1116fe9ad80296 diff --git a/test/shell1.test b/test/shell1.test index 3104eda49d..598005a900 100644 --- a/test/shell1.test +++ b/test/shell1.test @@ -452,7 +452,7 @@ do_test shell1-3.12.3 { # tcl TCL list elements do_test shell1-3.13.1 { catchcmd "test.db" ".mode" -} {0 {current output mode: list --escape symbol}} +} {0 {current output mode: list --escape ascii}} do_test shell1-3.13.2 { catchcmd "test.db" ".mode FOO" } {1 {Error: mode should be one of: ascii box column csv html insert json line list markdown qbox quote table tabs tcl}} From 5d60f47001bf64b48abac68ed59621e528144ea4 Mon Sep 17 00:00:00 2001 From: stephan Date: Tue, 25 Feb 2025 20:55:14 +0000 Subject: [PATCH 192/194] Approximately 50 typo fixes, spanning the whole tree, contributed via [forum:006c8fa165083ac3|forum post 006c8fa165083ac3] and individually checked for correctness. Affects only code comments, docs, and a single line of debug output in a test app. FossilOrigin-Name: af928818a030924060ee0762431dae0f16d53a62f4e1132754d052eb9c621ac2 --- autoconf/README.txt | 2 +- autosetup/sqlite-config.tcl | 4 +- doc/lemon.html | 2 +- doc/pager-invariants.txt | 2 +- ext/fts3/fts3.c | 2 +- ext/fts3/fts3Int.h | 2 +- ext/fts3/fts3_hash.c | 2 +- ext/fts3/fts3_snippet.c | 2 +- ext/fts5/fts5_hash.c | 2 +- ext/fts5/fts5_index.c | 2 +- ext/jni/GNUmakefile | 2 +- ext/jni/src/c/sqlite3-jni.c | 4 +- ext/jni/src/org/sqlite/jni/capi/CApi.java | 2 +- .../src/org/sqlite/jni/capi/SQLTester.java | 2 +- ext/lsm1/lsm_file.c | 4 +- ext/lsm1/lsm_log.c | 2 +- ext/misc/fuzzer.c | 2 +- ext/misc/totype.c | 2 +- ext/misc/vfsstat.c | 2 +- ext/misc/vtshim.c | 2 +- ext/rbu/sqlite3rbu.h | 2 +- ext/repair/checkindex.c | 2 +- ext/rtree/geopoly.c | 2 +- ext/rtree/rtree.c | 2 +- ext/session/sqlite3session.c | 2 +- ext/wasm/GNUmakefile | 4 +- ext/wasm/api/sqlite3-api-prologue.js | 2 +- ext/wasm/api/sqlite3-vfs-opfs.c-pp.js | 2 +- ext/wasm/api/sqlite3-wasm.c | 2 +- ext/wasm/common/whwasmutil.js | 2 +- ext/wasm/demo-jsstorage.js | 2 +- ext/wasm/fiddle/fiddle.js | 2 +- ext/wasm/jaccwabyt/jaccwabyt.md | 2 +- main.mk | 6 +- manifest | 96 +++++++++---------- manifest.uuid | 2 +- src/main.c | 4 +- src/os_unix.c | 2 +- src/parse.y | 2 +- src/pragma.c | 2 +- test/json/json-speed-check.sh | 2 +- tool/mksqlite3internalh.tcl | 2 +- tool/run-speed-test.sh | 2 +- tool/speed-check.sh | 2 +- 44 files changed, 98 insertions(+), 98 deletions(-) diff --git a/autoconf/README.txt b/autoconf/README.txt index 646c0a1215..1192a80fb1 100644 --- a/autoconf/README.txt +++ b/autoconf/README.txt @@ -27,7 +27,7 @@ the embedded copy of JimTCL). REASONS TO USE THE CANONICAL BUILD SYSTEM RATHER THAN THIS PACKAGE ================================================================== - * the cononical build system allows you to run tests to verify that + * the canonical build system allows you to run tests to verify that the build worked * the canonical build system supports more compile-time options * the canonical build system works for any arbitrary check-in to diff --git a/autosetup/sqlite-config.tcl b/autosetup/sqlite-config.tcl index 2b52a44e28..c56ef88992 100644 --- a/autosetup/sqlite-config.tcl +++ b/autosetup/sqlite-config.tcl @@ -1238,7 +1238,7 @@ proc sqlite-handle-icu {} { # Handles the --enable-load-extension flag. Returns 1 if the support # is enabled, else 0. If support for that feature is not found, a # fatal error is triggered if --enable-load-extension is explicitly -# provided, else a loud warning is instead emited. If +# provided, else a loud warning is instead emitted. If # --disable-load-extension is used, no check is performed. # # Makes the following environment changes: @@ -1618,7 +1618,7 @@ proc sqlite-handle-wasi-sdk {} { proj-opt-set $opt "" } } - # Remember that we now have a discrepancy beteween + # Remember that we now have a discrepancy between # $::sqliteConfig(is-cross-compiling) and [proj-is-cross-compiling]. set ::sqliteConfig(is-cross-compiling) 1 diff --git a/doc/lemon.html b/doc/lemon.html index 4147d9b31e..24bccce082 100644 --- a/doc/lemon.html +++ b/doc/lemon.html @@ -881,7 +881,7 @@ is allowed between the "%" and the directive name.

    Grammar text in between "%ifdef MACRO" and the next nested "%endif" is ignored unless the "-DMACRO" command-line option is used. Grammar text -betwen "%ifndef MACRO" and the next nested "%endif" is +between "%ifndef MACRO" and the next nested "%endif" is included except when the "-DMACRO" command-line option is used.

    The text in between "%if CONDITIONAL" and its diff --git a/doc/pager-invariants.txt b/doc/pager-invariants.txt index 44444dad54..0fea0a698d 100644 --- a/doc/pager-invariants.txt +++ b/doc/pager-invariants.txt @@ -45,7 +45,7 @@ *** Definition: Two databases (or the same database at two points it time) are said to be "logically equivalent" if they give the same answer to all queries. Note in particular the content of freelist leaf - pages can be changed arbitarily without effecting the logical equivalence + pages can be changed arbitrarily without effecting the logical equivalence of the database. (7) At any time, if any subset, including the empty set and the total set, diff --git a/ext/fts3/fts3.c b/ext/fts3/fts3.c index d5db2a3dd1..4f075363be 100644 --- a/ext/fts3/fts3.c +++ b/ext/fts3/fts3.c @@ -4737,7 +4737,7 @@ static int incrPhraseTokenNext( ** ** * does not contain any deferred tokens. ** -** Advance it to the next matching documnent in the database and populate +** Advance it to the next matching document in the database and populate ** the Fts3Doclist.pList and nList fields. ** ** If there is no "next" entry and no error occurs, then *pbEof is set to diff --git a/ext/fts3/fts3Int.h b/ext/fts3/fts3Int.h index 77e6737af4..28c4ffb1d2 100644 --- a/ext/fts3/fts3Int.h +++ b/ext/fts3/fts3Int.h @@ -358,7 +358,7 @@ struct Fts3Cursor { /* ** The Fts3Cursor.eSearch member is always set to one of the following. -** Actualy, Fts3Cursor.eSearch can be greater than or equal to +** Actually, Fts3Cursor.eSearch can be greater than or equal to ** FTS3_FULLTEXT_SEARCH. If so, then Fts3Cursor.eSearch - 2 is the index ** of the column to be searched. For example, in ** diff --git a/ext/fts3/fts3_hash.c b/ext/fts3/fts3_hash.c index 63e55b3dc9..1918be4cb7 100644 --- a/ext/fts3/fts3_hash.c +++ b/ext/fts3/fts3_hash.c @@ -187,7 +187,7 @@ static void fts3HashInsertElement( } -/* Resize the hash table so that it cantains "new_size" buckets. +/* Resize the hash table so that it contains "new_size" buckets. ** "new_size" must be a power of 2. The hash table might fail ** to resize if sqliteMalloc() fails. ** diff --git a/ext/fts3/fts3_snippet.c b/ext/fts3/fts3_snippet.c index 8a6ab8ea62..9ec7df3802 100644 --- a/ext/fts3/fts3_snippet.c +++ b/ext/fts3/fts3_snippet.c @@ -611,7 +611,7 @@ static int fts3StringAppend( } /* If there is insufficient space allocated at StrBuffer.z, use realloc() - ** to grow the buffer until so that it is big enough to accomadate the + ** to grow the buffer until so that it is big enough to accommodate the ** appended data. */ if( pStr->n+nAppend+1>=pStr->nAlloc ){ diff --git a/ext/fts5/fts5_hash.c b/ext/fts5/fts5_hash.c index 5e0959aa8e..8a9bb3fc92 100644 --- a/ext/fts5/fts5_hash.c +++ b/ext/fts5/fts5_hash.c @@ -20,7 +20,7 @@ typedef struct Fts5HashEntry Fts5HashEntry; /* ** This file contains the implementation of an in-memory hash table used -** to accumuluate "term -> doclist" content before it is flused to a level-0 +** to accumulate "term -> doclist" content before it is flused to a level-0 ** segment. */ diff --git a/ext/fts5/fts5_index.c b/ext/fts5/fts5_index.c index 3ac5008502..93c54ee205 100644 --- a/ext/fts5/fts5_index.c +++ b/ext/fts5/fts5_index.c @@ -8667,7 +8667,7 @@ static void fts5DecodeRowid( #if defined(SQLITE_TEST) || defined(SQLITE_FTS5_DEBUG) static void fts5DebugRowid(int *pRc, Fts5Buffer *pBuf, i64 iKey){ - int iSegid, iHeight, iPgno, bDlidx, bTomb; /* Rowid compenents */ + int iSegid, iHeight, iPgno, bDlidx, bTomb; /* Rowid components */ fts5DecodeRowid(iKey, &bTomb, &iSegid, &bDlidx, &iHeight, &iPgno); if( iSegid==0 ){ diff --git a/ext/jni/GNUmakefile b/ext/jni/GNUmakefile index 26a38dad9a..1c4e9d4e5f 100644 --- a/ext/jni/GNUmakefile +++ b/ext/jni/GNUmakefile @@ -451,7 +451,7 @@ distclean: clean -rm -fr $(dir.bld.c) $(dir.doc) ######################################################################## -# disttribution bundle rules... +# distribution bundle rules... ifeq (,$(filter snapshot,$(MAKECMDGOALS))) dist-name-prefix := sqlite-jni diff --git a/ext/jni/src/c/sqlite3-jni.c b/ext/jni/src/c/sqlite3-jni.c index 5deff19ef1..3bde79998a 100644 --- a/ext/jni/src/c/sqlite3-jni.c +++ b/ext/jni/src/c/sqlite3-jni.c @@ -948,7 +948,7 @@ static JNIEnv * s3jni_env(void){ } /* -** Fetches the S3JniGlobal.envCache row for the given env, allocing a +** Fetches the S3JniGlobal.envCache row for the given env, allocating a ** row if needed. When a row is allocated, its state is initialized ** insofar as possible. Calls (*env)->FatalError() if allocation of an ** entry fails. That's hypothetically possible but "shouldn't happen." @@ -5696,7 +5696,7 @@ JniDeclFtsApi(jint,xCreateFunction)(JniArgsEnvObj, jstring jName, typedef struct S3JniFts5AuxData S3JniFts5AuxData; /* -** TODO: this middle-man struct is no longer necessary. Conider +** TODO: this middle-man struct is no longer necessary. Consider ** removing it and passing around jObj itself instead. */ struct S3JniFts5AuxData { diff --git a/ext/jni/src/org/sqlite/jni/capi/CApi.java b/ext/jni/src/org/sqlite/jni/capi/CApi.java index 3387282378..c495d44eda 100644 --- a/ext/jni/src/org/sqlite/jni/capi/CApi.java +++ b/ext/jni/src/org/sqlite/jni/capi/CApi.java @@ -1076,7 +1076,7 @@ public final class CApi { /**

    Works like in the C API with the exception that it only supports - the following subset of configution flags: + the following subset of configuration flags:

    SQLITE_CONFIG_SINGLETHREAD SQLITE_CONFIG_MULTITHREAD diff --git a/ext/jni/src/org/sqlite/jni/capi/SQLTester.java b/ext/jni/src/org/sqlite/jni/capi/SQLTester.java index c68785e2c3..634f844c24 100644 --- a/ext/jni/src/org/sqlite/jni/capi/SQLTester.java +++ b/ext/jni/src/org/sqlite/jni/capi/SQLTester.java @@ -264,7 +264,7 @@ public class SQLTester { threw = true; outln("🔥EXCEPTION: ",e.getClass().getSimpleName(),": ",e.getMessage()); ++nAbortedScript; - if( keepGoing ) outln("Continuing anyway becaure of the keep-going option."); + if( keepGoing ) outln("Continuing anyway because of the keep-going option."); else if( e.isFatal() ) throw e; }finally{ final long timeEnd = System.currentTimeMillis(); diff --git a/ext/lsm1/lsm_file.c b/ext/lsm1/lsm_file.c index fd78835bbb..9f4144618a 100644 --- a/ext/lsm1/lsm_file.c +++ b/ext/lsm1/lsm_file.c @@ -793,7 +793,7 @@ void lsmFsClose(FileSystem *pFS){ ** ** This function returns a pointer to an object that can be linked into ** the list described above. The returned object now 'owns' the database -** file descriptr, so that when the FileSystem object is destroyed, it +** file descriptor, so that when the FileSystem object is destroyed, it ** will not be closed. ** ** This function may be called at most once in the life-time of a @@ -2293,7 +2293,7 @@ int lsmFsMetaPageGet( ); } #ifndef NDEBUG - /* pPg->aData causes an uninitialized access via a downstreadm write(). + /* pPg->aData causes an uninitialized access via a downstream write(). After discussion on this list, this memory should not, for performance reasons, be memset. However, tracking down "real" misuse is more difficult with this "false" positive, so it is set when NDEBUG. diff --git a/ext/lsm1/lsm_log.c b/ext/lsm1/lsm_log.c index a66e40bccd..3dcef42f70 100644 --- a/ext/lsm1/lsm_log.c +++ b/ext/lsm1/lsm_log.c @@ -758,7 +758,7 @@ void lsmLogTell( } /* -** Seek (rewind) back to the log file offset stored by an ealier call to +** Seek (rewind) back to the log file offset stored by an earlier call to ** lsmLogTell() in *pMark. */ void lsmLogSeek( diff --git a/ext/misc/fuzzer.c b/ext/misc/fuzzer.c index 92b7c0dae0..03d7af06ec 100644 --- a/ext/misc/fuzzer.c +++ b/ext/misc/fuzzer.c @@ -68,7 +68,7 @@ ** AND distance<200; ** ** This first query outputs the string "abcdefg" and all strings that -** can be derived from that string by appling the specified transformations. +** can be derived from that string by applying the specified transformations. ** The strings are output together with their total transformation cost ** (called "distance") and appear in order of increasing cost. No string ** is output more than once. If there are multiple ways to transform the diff --git a/ext/misc/totype.c b/ext/misc/totype.c index 31c497a567..e35f33ae64 100644 --- a/ext/misc/totype.c +++ b/ext/misc/totype.c @@ -346,7 +346,7 @@ totype_atof_calc: /* store the result */ *pResult = result; - /* return true if number and no extra non-whitespace chracters after */ + /* return true if number and no extra non-whitespace characters after */ return z>=zEnd && nDigits>0 && eValid && nonNum==0; } diff --git a/ext/misc/vfsstat.c b/ext/misc/vfsstat.c index ba22115ab8..b45193934f 100644 --- a/ext/misc/vfsstat.c +++ b/ext/misc/vfsstat.c @@ -24,7 +24,7 @@ SQLITE_EXTENSION_INIT1 ** To use this module, first compile it as a loadable extension. See ** https://www.sqlite.org/loadext.html#build for compilations instructions. ** -** After compliing, load this extension, then open database connections to be +** After compiling, load this extension, then open database connections to be ** measured. Query usages status using the vfsstat virtual table: ** ** SELECT * FROM vfsstat; diff --git a/ext/misc/vtshim.c b/ext/misc/vtshim.c index 0709a26a7f..3f7945724c 100644 --- a/ext/misc/vtshim.c +++ b/ext/misc/vtshim.c @@ -425,7 +425,7 @@ static int vtshimRollbackTo(sqlite3_vtab *pBase, int n){ return rc; } -/* The destructor function for a disposible module */ +/* The destructor function for a disposable module */ static void vtshimAuxDestructor(void *pXAux){ vtshim_aux *pAux = (vtshim_aux*)pXAux; assert( pAux->pAllVtab==0 ); diff --git a/ext/rbu/sqlite3rbu.h b/ext/rbu/sqlite3rbu.h index d156b3178a..98b441b699 100644 --- a/ext/rbu/sqlite3rbu.h +++ b/ext/rbu/sqlite3rbu.h @@ -442,7 +442,7 @@ SQLITE_API int sqlite3rbu_savestate(sqlite3rbu *pRbu); ** ** If the RBU update has been completely applied, mark the RBU database ** as fully applied. Otherwise, assuming no error has occurred, save the -** current state of the RBU update appliation to the RBU database. +** current state of the RBU update application to the RBU database. ** ** If an error has already occurred as part of an sqlite3rbu_step() ** or sqlite3rbu_open() call, or if one occurs within this function, an diff --git a/ext/repair/checkindex.c b/ext/repair/checkindex.c index 5f6e646e44..ed30357e5d 100644 --- a/ext/repair/checkindex.c +++ b/ext/repair/checkindex.c @@ -110,7 +110,7 @@ static int cidxConnect( " current_key TEXT," /* SQLite quote() text of key values */ " index_name HIDDEN," /* IN: name of the index being scanned */ " after_key HIDDEN," /* IN: Start scanning after this key */ - " scanner_sql HIDDEN" /* debuggingn info: SQL used for scanner */ + " scanner_sql HIDDEN" /* debugging info: SQL used for scanner */ ")" ); pRet = cidxMalloc(&rc, sizeof(CidxTable)); diff --git a/ext/rtree/geopoly.c b/ext/rtree/geopoly.c index 3e9c2a2713..842d014b72 100644 --- a/ext/rtree/geopoly.c +++ b/ext/rtree/geopoly.c @@ -877,7 +877,7 @@ static void geopolyWithinFunc( sqlite3_free(p2); } -/* Objects used by the overlap algorihm. */ +/* Objects used by the overlap algorithm. */ typedef struct GeoEvent GeoEvent; typedef struct GeoSegment GeoSegment; typedef struct GeoOverlap GeoOverlap; diff --git a/ext/rtree/rtree.c b/ext/rtree/rtree.c index 8ed8978bde..c2e5dad95c 100644 --- a/ext/rtree/rtree.c +++ b/ext/rtree/rtree.c @@ -3871,7 +3871,7 @@ static sqlite3_stmt *rtreeCheckPrepare( /* ** The second and subsequent arguments to this function are a printf() ** style format string and arguments. This function formats the string and -** appends it to the report being accumuated in pCheck. +** appends it to the report being accumulated in pCheck. */ static void rtreeCheckAppendMsg(RtreeCheck *pCheck, const char *zFmt, ...){ va_list ap; diff --git a/ext/session/sqlite3session.c b/ext/session/sqlite3session.c index 1cf1bf4669..b2654315a4 100644 --- a/ext/session/sqlite3session.c +++ b/ext/session/sqlite3session.c @@ -3013,7 +3013,7 @@ static int sessionGenerateChangeset( ){ sqlite3 *db = pSession->db; /* Source database handle */ SessionTable *pTab; /* Used to iterate through attached tables */ - SessionBuffer buf = {0,0,0}; /* Buffer in which to accumlate changeset */ + SessionBuffer buf = {0,0,0}; /* Buffer in which to accumulate changeset */ int rc; /* Return code */ assert( xOutput==0 || (pnChangeset==0 && ppChangeset==0) ); diff --git a/ext/wasm/GNUmakefile b/ext/wasm/GNUmakefile index 42fdb072d3..2d3e735a6e 100644 --- a/ext/wasm/GNUmakefile +++ b/ext/wasm/GNUmakefile @@ -359,7 +359,7 @@ endif # Slight caveat: this uses the version info from the in-tree # sqlite3.c/h, which may diff from a user-provided $(sqlite3.c). The # end result is that the generated JS files may have static version -# info from $(bin.version-info) which differ from their runtime-emited +# info from $(bin.version-info) which differ from their runtime-emitted # version info (e.g. from sqlite3_libversion()). bin.version-info := $(dir.top)/version-info .NOTPARALLEL: $(bin.version-info) @@ -513,7 +513,7 @@ sqlite3-api-build-version.js := $(dir.tmp)/sqlite3-api-build-version.js # sqlite3-api.jses = the list of JS files which make up # $(sqlite3-api.js.in), in the order they need to be assembled. sqlite3-api.jses := $(sqlite3-license-version.js) -# sqlite3-api-prologue.js: initial boostrapping bits: +# sqlite3-api-prologue.js: initial bootstrapping bits: sqlite3-api.jses += $(dir.api)/sqlite3-api-prologue.js # whwhasm.js and jaccwabyt.js: Low-level utils, mostly replacing # Emscripten glue: diff --git a/ext/wasm/api/sqlite3-api-prologue.js b/ext/wasm/api/sqlite3-api-prologue.js index 6b032be84d..973d7e49b0 100644 --- a/ext/wasm/api/sqlite3-api-prologue.js +++ b/ext/wasm/api/sqlite3-api-prologue.js @@ -1453,7 +1453,7 @@ globalThis.sqlite3ApiBootstrap = function sqlite3ApiBootstrap( creates (or overwrites) the given file using those APIs. This is primarily intended for use in Emscripten-based builds where the POSIX APIs are transparently proxied by an in-memory virtual filesystem. - It may behave diffrently in other environments. + It may behave differently in other environments. The first argument must be either a JS string or WASM C-string holding the filename. Note that this routine does _not_ create diff --git a/ext/wasm/api/sqlite3-vfs-opfs.c-pp.js b/ext/wasm/api/sqlite3-vfs-opfs.c-pp.js index 27f1bfae7c..9cacae788c 100644 --- a/ext/wasm/api/sqlite3-vfs-opfs.c-pp.js +++ b/ext/wasm/api/sqlite3-vfs-opfs.c-pp.js @@ -459,7 +459,7 @@ const installOpfsVfs = function callee(options){ Runs the given operation (by name) in the async worker counterpart, waits for its response, and returns the result which the async worker writes to SAB[state.opIds.rc]. The - 2nd and subsequent arguments must be the aruguments for the + 2nd and subsequent arguments must be the arguments for the async op. */ const opRun = (op,...args)=>{ diff --git a/ext/wasm/api/sqlite3-wasm.c b/ext/wasm/api/sqlite3-wasm.c index 461afe0663..4af52a969d 100644 --- a/ext/wasm/api/sqlite3-wasm.c +++ b/ext/wasm/api/sqlite3-wasm.c @@ -980,7 +980,7 @@ const char * sqlite3__wasm_enum_json(void){ #undef _DefGroup /* - ** Emit an array of "StructBinder" struct descripions, which look + ** Emit an array of "StructBinder" struct descriptions, which look ** like: ** ** { diff --git a/ext/wasm/common/whwasmutil.js b/ext/wasm/common/whwasmutil.js index 509d33b371..b113b52ecb 100644 --- a/ext/wasm/common/whwasmutil.js +++ b/ext/wasm/common/whwasmutil.js @@ -798,7 +798,7 @@ globalThis.WhWasmUtilInstaller = function(target){ */ target.peek8 = (...ptr)=>target.peek( (1===ptr.length ? ptr[0] : ptr), 'i8' ); /** - Convience form of poke() intended for setting individual bytes. + Convenience form of poke() intended for setting individual bytes. Its difference from poke() is that it always writes to the i8-sized heap view. */ diff --git a/ext/wasm/demo-jsstorage.js b/ext/wasm/demo-jsstorage.js index cf820e4033..587aa9cc58 100644 --- a/ext/wasm/demo-jsstorage.js +++ b/ext/wasm/demo-jsstorage.js @@ -103,7 +103,7 @@ if(0===db.selectValue('select count(*) from sqlite_master')){ log("DB is empty. Use the init button to populate it."); }else{ - log("DB contains data from a previous session. Use the Clear Ctorage button to delete it."); + log("DB contains data from a previous session. Use the Clear Storage button to delete it."); btnSelect.click(); } }; diff --git a/ext/wasm/fiddle/fiddle.js b/ext/wasm/fiddle/fiddle.js index d28589835c..f0a89f25d6 100644 --- a/ext/wasm/fiddle/fiddle.js +++ b/ext/wasm/fiddle/fiddle.js @@ -112,7 +112,7 @@ /** A proxy for localStorage or sessionStorage or a - page-instance-local proxy, if neither one is availble. + page-instance-local proxy, if neither one is available. Which exact storage implementation is uses is unspecified, and apps must not rely on it. diff --git a/ext/wasm/jaccwabyt/jaccwabyt.md b/ext/wasm/jaccwabyt/jaccwabyt.md index 431741edca..54029e363f 100644 --- a/ext/wasm/jaccwabyt/jaccwabyt.md +++ b/ext/wasm/jaccwabyt/jaccwabyt.md @@ -950,7 +950,7 @@ const char * wasm__ctype_json(void){ assert(LEVEL<5); memset(pos, '}', LEVEL); pos+=LEVEL; lenCheck //////////////////////////////////////////////////////////////////// - // Macros for emiting StructBinders... + // Macros for emitting StructBinders... #define StructBinder__(TYPE) \ n = 0; \ outf("%s{", (structCount++ ? ", " : "")); \ diff --git a/main.mk b/main.mk index 7cbd88bfac..9933fb5430 100644 --- a/main.mk +++ b/main.mk @@ -207,7 +207,7 @@ ENABLE_LIB_STATIC ?= 1 # # 1 if the amalgamation (sqlite3.c/h) should be built/used, otherwise # the library is built from all of its original source files. -# Certaint tools, like sqlite3$(T.exe), require the amalgamation and +# Certain tools, like sqlite3$(T.exe), require the amalgamation and # will ignore this preference. # USE_AMALGAMATION ?= 1 @@ -1989,7 +1989,7 @@ checksymbols: sqlite3.o nm -g --defined-only sqlite3.o | egrep -v $(VALIDIDS); test $$? -ne 0 echo '0 errors out of 1 tests' -# Build the amalgamation-autoconf package. The amalamgation-tarball target builds +# Build the amalgamation-autoconf package. The amalgamation-tarball target builds # a tarball named for the version number. Ex: sqlite-autoconf-3110000.tar.gz. # The snapshot-tarball target builds a tarball named by the SHA3 hash # @@ -2004,7 +2004,7 @@ snapshot-tarball: sqlite3.c sqlite3rc.h sqlite-src.zip: $(TOP)/tool/mksrczip.tcl $(TCLSH_CMD) $(TOP)/tool/mksrczip.tcl -# Build a ZIP archive of the amaglamation +# Build a ZIP archive of the amalgamation # sqlite-amalgamation.zip: $(TOP)/tool/mkamalzip.tcl sqlite3.c sqlite3.h shell.c sqlite3ext.h $(TCLSH_CMD) $(TOP)/tool/mkamalzip.tcl diff --git a/manifest b/manifest index 4a5e19a77f..5e78a70198 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Fix\sa\stest\scase\sthat\swas\sbroken\swhen\sthe\sdefault\s--escape\stype\swas\schanged\nby\sthe\sprevious\scheck-in. -D 2025-02-25T20:36:46.116 +C Approximately\s50\stypo\sfixes,\sspanning\sthe\swhole\stree,\scontributed\svia\s[forum:006c8fa165083ac3|forum\spost\s006c8fa165083ac3]\sand\sindividually\schecked\sfor\scorrectness.\sAffects\sonly\scode\scomments,\sdocs,\sand\sa\ssingle\sline\sof\sdebug\soutput\sin\sa\stest\sapp. +D 2025-02-25T20:55:14.600 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d @@ -19,7 +19,7 @@ F autoconf/Makefile.fallback 22fe523eb36dfce31e0f6349f782eb084e86a5620b2b0b4f84a F autoconf/Makefile.in c9a7007181df2a07d08bd63c6ba395ed38705aa218789726951aabebec32ee27 F autoconf/Makefile.msc 5bc67d3912444c40c6f96d003e5c90663e51abb83d204a520110b1b2038dcd8b F autoconf/README.first f1d3876e9a7852c22f275a6f06814e64934cecbc0b5b9617d64849094c1fd136 -F autoconf/README.txt 7f01dc3915e2d68f329011073662369e62a0938a2c69398807823c57591cb288 +F autoconf/README.txt 1a32296d8bbdd67110c79d224c92c05545a0b5bd0c272950025fe3c7c7b49580 F autoconf/auto.def 8d81c1d728d8462a9b6c1ca0714013bbb097aee0ae5e79309d7939cead98e295 F autoconf/tea/Makefile.in ba0556fee8da09c066bad85a4457904e46ee2c2eabaa309c0e83a78f2f151a8e F autoconf/tea/README.txt 61e62e519579e4a112791354d6d440f8b51ea6db3b0bab58d59f29df42d2dfe3 @@ -50,7 +50,7 @@ F autosetup/cc.tcl c0fcc50ca91deff8741e449ddad05bcd08268bc31177e613a6343bbd1fd3e F autosetup/jimsh0.c a57c16e65dcffc9c76e496757cb3f7fb47e01ecbd1631a0a5e01751fc856f049 F autosetup/pkg-config.tcl 4e635bf39022ff65e0d5434339dd41503ea48fc53822c9c5bde88b02d3d952ba F autosetup/proj.tcl e69b91f814ea510057ce7663845de703c3746d71cff9a0db6b2563ee3e7fd25e -F autosetup/sqlite-config.tcl 341d530f531c1dd70c3bc4e16905ad0a83cde1a2104d0b5655aa44b13bd37349 +F autosetup/sqlite-config.tcl aaa2e014d0490a3a5fbb6b144fb3836ee758d643c5eeb2816ec43e187a20f497 F autosetup/system.tcl 51d4be76cd9a9074704b584e5c9cbba616202c8468cf9ba8a4f8294a7ab1dba9 F configure 9a00b21dfd13757bbfb8d89b30660a89ec1f8f3a79402b8f9f9b6fc475c3303a x F contrib/sqlitecon.tcl 210a913ad63f9f991070821e599d600bd913e0ad @@ -59,8 +59,8 @@ F doc/compile-for-unix.md c9dce1ddd4bf0d25efccc5c63eb047e78c01ce06a6ff29c73e0a8a F doc/compile-for-windows.md 5141661e783c9ca9e3fd30e813345898712f5c311d71316f183db87038fa28a6 F doc/json-enhancements.md e356fc834781f1f1aa22ee300027a270b2c960122468499bf347bb123ce1ea4f F doc/jsonb.md 5fab4b8613aa9153fbeb6259297bd4697988af8b3d23900deba588fa7841456b -F doc/lemon.html 8b266ff711d2ec7f867c3dca37634963f48a630329908cc282beebfa8c708706 -F doc/pager-invariants.txt 27fed9a70ddad2088750c4a2b493b63853da2710 +F doc/lemon.html 7504a6dc9b56dd376a046833ea9cc8b08def93f19bfad6eab9f1a365a4b5f49a +F doc/pager-invariants.txt 83aa3a4724b2d7970cc3f3461f0295c46d4fc19a835a5781cbb35cb52feb0577 F doc/tcl-extension-testing.md 864875c3b672db79e7d42348dd726f9a4fbd852b1d8e5efcf09fe3d1ff6bf2a2 F doc/testrunner.md 15583cf8c7d8a1c3378fd5d4319ca769a14c4d950a5df9b015d01d5be290dc69 F doc/trusted-schema.md 33625008620e879c7bcfbbfa079587612c434fa094d338b08242288d358c3e8a @@ -78,16 +78,16 @@ F ext/fts3/README.content b9078d0843a094d86af0d48dffbff13c906702b4c3558012e67b9c F ext/fts3/README.syntax a19711dc5458c20734b8e485e75fb1981ec2427a F ext/fts3/README.tokenizers b92bdeb8b46503f0dd301d364efc5ef59ef9fa8e2758b8e742f39fa93a2e422d F ext/fts3/README.txt 8c18f41574404623b76917b9da66fcb0ab38328d -F ext/fts3/fts3.c 1da0265e8798f335165d54959459eeb69b6d32f586f85cf8795ab5d3b1292dcb +F ext/fts3/fts3.c 6f0a91f065e03345570267acf2d1d6ef9467fe6c05050220fe5886fb0990c9ff F ext/fts3/fts3.h 3a10a0af180d502cecc50df77b1b22df142817fe -F ext/fts3/fts3Int.h 2fe7c76dfd7d46dff964d17d3f4c53bca2116cf5d6252552ebbc22e38afdf4e0 +F ext/fts3/fts3Int.h adcbaa6d99b7f172e6195db811d0d295ebb96e8f400acd8f1d29b14eada2160b F ext/fts3/fts3_aux.c 7eab82a9cf0830f6551ba3abfdbe73ed39e322a4d3940ee82fbf723674ecd9f3 F ext/fts3/fts3_expr.c ebf7f2adead8cc54bc91deb41cb4a156874003078116f76631d65b87ff47464d -F ext/fts3/fts3_hash.c 8b6e31bfb0844c27dc6092c2620bdb1fca17ed613072db057d96952c6bdb48b7 +F ext/fts3/fts3_hash.c d9dba473741445789330c7513d4f65737c92df23c3212784312931641814672a F ext/fts3/fts3_hash.h 39cf6874dc239d6b4e30479b1975fe5b22a3caaf F ext/fts3/fts3_icu.c 305ce7fb6036484085b5556a9c8e62acdc7763f0f4cdf5fd538212a9f3720116 F ext/fts3/fts3_porter.c e19807ce0ae31c1c6e9898e89ecc93183d7ec224ea101af039722a4f49e5f2b8 -F ext/fts3/fts3_snippet.c 7a3d5e2cefbb1cb51fb9c65458670cc269647ede18e1ffd57b513f9b4ec10c3e +F ext/fts3/fts3_snippet.c ac402ba81ce9503a54238f975d870384f8b9fb3680f6b86eb7a1be44829a1cee F ext/fts3/fts3_term.c 6a96027ad364001432545fe43322b6af04ed28bb5619ec51af1f59d0710d6d69 F ext/fts3/fts3_test.c 7a9cb3d61774134211bf4bfdf1adcb581a1a0377f2d050a121ae7ab44baef0e3 F ext/fts3/fts3_tokenize_vtab.c 7fd9ef364f257b97218b9c331f2378e307375c592f70fd541f714e747d944962 @@ -111,8 +111,8 @@ F ext/fts5/fts5_aux.c 65a0468dd177d6093aa9ae1622e6d86b0136b8d267c62c0ad6493ad1e9 F ext/fts5/fts5_buffer.c 0eec58bff585f1a44ea9147eae5da2447292080ea435957f7488c70673cb6f09 F ext/fts5/fts5_config.c e7d8dd062b44a66cd77e5a0f74f23a2354cd1f3f8575afb967b2773c3384f7f8 F ext/fts5/fts5_expr.c 69b8d976058512c07dfe86e229521b7a871768157bd1607cedf1a5038dfd72c9 -F ext/fts5/fts5_hash.c adda4272be401566a6e0ba1acbe70ee5cb97fce944bc2e04dc707152a0ec91b1 -F ext/fts5/fts5_index.c b7827b32e0e1e1ff7d7cb27c5d0480426a01c8ec4e89fd7e106bb463e2b63dd1 +F ext/fts5/fts5_hash.c d9e8f61b2c2d43b75886538063ba8fa4ab3e52b9b16a4ec729814e407ec6d8aa +F ext/fts5/fts5_index.c d6f62cc0dc523c67f7f9cc136a255fa7ed2d775704bf69798cfa9a5403a30846 F ext/fts5/fts5_main.c b0e95a793f3c649d313c536269403e1a413ee665223adb5f8196edd2bc1146f7 F ext/fts5/fts5_storage.c 1ad05dab4830a4e2eaf2900bb143477f93bc17437093582f36f4b818809e88d8 F ext/fts5/fts5_tcl.c 7fb5a3d3404099075aaa2457307cb459bbc257c0de3dbd52b1e80a5b503e0329 @@ -284,10 +284,10 @@ F ext/intck/intckfault.test cff3f75dff74abb3edfcb13f6aa53f6436746ab64b09fe5e2028 F ext/intck/sqlite3intck.c 0d10df36e2b7b438aa80ecd3f5e584d41b747586b038258fe6b407f66b81e7c5 F ext/intck/sqlite3intck.h 2b40c38e7063ab822c974c0bd4aed97dabb579ccfe2e180a4639bb3bbef0f1c9 F ext/intck/test_intck.c 4f9eaadaedccb9df1d26ba41116a0a8e5b0c5556dc3098c8ff68633adcccdea8 -F ext/jni/GNUmakefile 59eb05f2a363bdfac8d15d66bed624bfe1ff289229184f3861b95f98a19cf4b2 +F ext/jni/GNUmakefile 842f186dc19d6159221e52a230118fa8864f883a428d07325f83f6a35d0b3857 F ext/jni/README.md d899789a9082a07b99bf30b1bbb6204ae57c060efcaa634536fa669323918f42 F ext/jni/jar-dist.make 030aaa4ae71dd86e4ec5e7c1e6cd86f9dfa47c4592c070d2e35157e42498e1fa -F ext/jni/src/c/sqlite3-jni.c c1292e690a20c7787a63e8d8ac6e2dfed49c97282ed056a7cfda5da461f0b7d8 +F ext/jni/src/c/sqlite3-jni.c ec8ffd1b70165f1ef94b2fb024850db6a69016f11c5d06fb8507229f605b4964 F ext/jni/src/c/sqlite3-jni.h 913ab8e8fee432ae40f0e387c8231118d17053714703f5ded18202912a8a3fbf F ext/jni/src/org/sqlite/jni/annotation/Experimental.java 8603498634e41d0f7c70f661f64e05df64376562ea8f126829fd1e0cdd47e82b F ext/jni/src/org/sqlite/jni/annotation/NotNull.java 38e7e58a69b26dc100e458b31dfa3b2a7d67bc36d051325526ef1987d5bc8a24 @@ -298,7 +298,7 @@ F ext/jni/src/org/sqlite/jni/capi/AggregateFunction.java 0b72cdff61533b564d65b63 F ext/jni/src/org/sqlite/jni/capi/AuthorizerCallback.java c045a5b47e02bb5f1af91973814a905f12048c428a3504fbc5266d1c1be3de5a F ext/jni/src/org/sqlite/jni/capi/AutoExtensionCallback.java 74cc4998a73d6563542ecb90804a3c4f4e828cb4bd69e61226d1a51f4646e759 F ext/jni/src/org/sqlite/jni/capi/BusyHandlerCallback.java 7b8e19810c42b0ad21a04b5d8c804b32ee5905d137148703f16a75b612c380ca -F ext/jni/src/org/sqlite/jni/capi/CApi.java 8620c652138b84af795fd65bc200028590f533407c093d4355f9524dc594c004 +F ext/jni/src/org/sqlite/jni/capi/CApi.java 61ed2c834df13d5aa192b9c10f59c1f9906217a6e073d0a69a19d43663f52eb9 F ext/jni/src/org/sqlite/jni/capi/CallbackProxy.java 57e2d275dcebe690b1fc1f3d34eb96879b2d7039bce30b563aee547bf45d8a8b F ext/jni/src/org/sqlite/jni/capi/CollationCallback.java e29bcfc540fdd343e2f5cca4d27235113f2886acb13380686756d5cabdfd065a F ext/jni/src/org/sqlite/jni/capi/CollationNeededCallback.java 5bfa226a8e7a92e804fd52d6e42b4c7b875fa7a94f8e2c330af8cc244a8920ab @@ -313,7 +313,7 @@ F ext/jni/src/org/sqlite/jni/capi/ProgressHandlerCallback.java 01bc0c238eed2d5f9 F ext/jni/src/org/sqlite/jni/capi/ResultCode.java 8141171f1bcf9f46eef303b9d3c5dc2537a25ad1628f3638398d8a60cacefa7f F ext/jni/src/org/sqlite/jni/capi/RollbackHookCallback.java e172210a2080e851ebb694c70e9f0bf89284237795e38710a7f5f1b61e3f6787 F ext/jni/src/org/sqlite/jni/capi/SQLFunction.java 0d1e9afc9ff8a2adb94a155b72385155fa3b8011a5cca0bb3c28468c7131c1a5 -F ext/jni/src/org/sqlite/jni/capi/SQLTester.java 0b25cde8c5fa77f3e7ad92368acf195c5c64fb1c5273b8ee71b2d7ab812aab34 +F ext/jni/src/org/sqlite/jni/capi/SQLTester.java e2e63c92992c412b381e5577319c81e4f6c73b185ba15a85931ff5d5c3eb2600 F ext/jni/src/org/sqlite/jni/capi/ScalarFunction.java 93b9700fca4c68075ccab12fe0fbbc76c91cafc9f368e835b9bd7cd7732c8615 F ext/jni/src/org/sqlite/jni/capi/TableColumnMetadata.java addf120e0e76e5be1ff2260daa7ce305ff9b5fafd64153a7a28e9d8f000a815f F ext/jni/src/org/sqlite/jni/capi/Tester1.java e5fa17301b7266c1cbe4bcce67788e08e45871c7c72c153d515abb37e501de0a @@ -380,8 +380,8 @@ F ext/lsm1/lsm-test/lsmtest_win32.c 0e0a224674c4d3170631c41b026b56c7e1672b151f52 F ext/lsm1/lsm.h 0f6f64ff071471cb87bf98beb8386566f30ea001 F ext/lsm1/lsmInt.h 3bcc280347196e4ed14925b64a07685415238bf41317db0598c8d3f6aaceb9c1 F ext/lsm1/lsm_ckpt.c ad9a8028d401be9e76f20c4d86d49f33f4fc27785577b452ca955094314a72b4 -F ext/lsm1/lsm_file.c 5486f4a63b19e4d7d972ee2482f29ebdf06c29544f31845f713cccb5199f9ad1 -F ext/lsm1/lsm_log.c a8bf334532109bba05b09a504ee45fc393828b0d034ca61ab45e3940709d9a7c +F ext/lsm1/lsm_file.c 4bbc4cb1a558089d884e1e5a17b021d9056ae62add32dd6906d070954c7fe954 +F ext/lsm1/lsm_log.c 9450d193db7a50c96805f10f393ac8b08b2009b6330b7df7ae1e4b442ed219a7 F ext/lsm1/lsm_main.c 87770a9c7e73859fce7620cb79623776ba4b30369086229ad82c3e6eeaf45457 F ext/lsm1/lsm_mem.c 4c51ea9fa285ee6e35301b33491642d071740a0a F ext/lsm1/lsm_mutex.c 378edf0a2b142b4f7640ee982df06d50b98788ea @@ -418,7 +418,7 @@ F ext/misc/eval.c 04bc9aada78c888394204b4ed996ab834b99726fb59603b0ee3ed6e049755d F ext/misc/explain.c 606100185fb90d6a1eade1ed0414d53503c86820d8956a06e3b0a56291894f2b F ext/misc/fileio.c 07cf3109ec6452789e3a989a010234e2a17b599ce82ea29212c948572456abac F ext/misc/fossildelta.c 8c026e086e406e2b69947f1856fa3b848fff5379962276430d10085b8756b05a -F ext/misc/fuzzer.c 8b28acf1a7e95d50e332bdd47e792ff27054ad99d3f9bc2e91273814d4b31a5a +F ext/misc/fuzzer.c 786ff299ba79c46541823f10fd0c8f7119289341aca740fe9cfdb918ae3eb9a8 F ext/misc/ieee754.c 62a90978204d2c956d5036eb89e548e736ca5fac0e965912867ddd7bb833256d F ext/misc/memstat.c 5b284b78be431c1f5fa154b18eade2407e42c65ed32ec9e9fbf195d114778d7d F ext/misc/memtrace.c 7c0d115d2ef716ad0ba632c91e05bd119cb16c1aedf3bec9f06196ead2d5537b @@ -447,16 +447,16 @@ F ext/misc/sqlite3_stdio.h f05eaf5e0258f0573910324a789a9586fc360a57678c57a6d63cf F ext/misc/stmt.c b090086cd6bd6281c21271d38d576eeffe662f0e6b67536352ce32bbaa438321 F ext/misc/stmtrand.c 59cffa5d8e158943ff1ce078956d8e208e8c04e67307e8f249dece2436dcb7fc F ext/misc/templatevtab.c 10f15b165b95423ddef593bc5dcb915ec4eb5e0f1066d585e5435a368b8bc22b -F ext/misc/totype.c 75ed9827d19cc3b434fc2aeb60725d4d46e1534373615612a4d1cfdcc3d60922 +F ext/misc/totype.c ba11aac3c0b52c685bd25aa4e0f80c41c624fb1cc5ab763250e09ddc762bc3a8 F ext/misc/uint.c 053fed3bce2e89583afcd4bf804d75d659879bbcedac74d0fa9ed548839a030b F ext/misc/unionvtab.c 716d385256d5fb4beea31b0efede640807e423e85c9784d21d22f0cce010a785 F ext/misc/urifuncs.c f71360d14fa9e7626b563f1f781c6148109462741c5235ac63ae0f8917b9c751 F ext/misc/uuid.c 5bb2264c1b64d163efa46509544fd7500cb8769cb7c16dd52052da8d961505cf F ext/misc/vfslog.c 3932ab932eeb2601dbc4447cb14d445aaa9fbe43b863ef5f014401c3420afd20 -F ext/misc/vfsstat.c a85df08654743922a19410d7b1e3111de41bb7cd07d20dd16eda4e2b808d269d +F ext/misc/vfsstat.c 20850f7c32c80b34b2095c06e1f7875e3614c5895b80e2969d9d50509ddce211 F ext/misc/vfstrace.c a73386403c350b210dc788a2d23a0f5cc89c49b176109a66af11b5078c116331 F ext/misc/vtablog.c 1100250ce8782db37c833e3a9a5c9a3ecf1af5e15b8325572b82e6e0a138ffb5 -F ext/misc/vtshim.c 1976e6dd68dd0d64508c91a6dfab8e75f8aaf6cd +F ext/misc/vtshim.c e5bce24ab8c532f4fdc600148718fe1802cb6ed57417f1c1032d8961f72b0e8f F ext/misc/wholenumber.c 0fa0c082676b7868bf2fa918e911133f2b349bcdceabd1198bba5f65b4fc0668 F ext/misc/zipfile.c b62147ac4985eaac4e368d529b1f4f43ad6bc9ac13d6805d907fff3afdac64d3 F ext/misc/zorder.c b0ff58fa643afa1d846786d51ea8d5c4b6b35aa0254ab5a82617db92f3adda64 @@ -505,7 +505,7 @@ F ext/rbu/rbuvacuum2.test ae097d04feb041446a74fac94b24bffeb3fdd60e32b848c5611e50 F ext/rbu/rbuvacuum3.test 3ce42695fdf21aaa3499e857d7d4253bc499ad759bcd6c9362042c13cd37d8de F ext/rbu/rbuvacuum4.test ffccd22f67e2d0b380d2889685742159dfe0d19a3880ca3d2d1d69eefaebb205 F ext/rbu/sqlite3rbu.c c07817e89477b8fc286ab6ed87da5bc82fc3490bbbe9e9b22eb2d900e81ee5dc -F ext/rbu/sqlite3rbu.h 9d923eb135c5d04aa6afd7c39ca47b0d1d0707c100e02f19fdde6a494e414304 +F ext/rbu/sqlite3rbu.h 3dff1c238be5804b00dd4d2870cdd3e28719522f63edcd3bdc58fc957de428ea F ext/rbu/test_rbu.c b9727c3394307d058e806c1da0f8bb7b24daf3c6bb94cb10cca88ea4d5c806c0 F ext/recover/dbdata.c 5295f4f922b60d7035b6b9fd5846b13071b9d97ed7fad8496837bb7640d24771 F ext/recover/recover1.test e16d78e94183562abff569967b18b7c77451d7044365516cd0fe14713a284851 @@ -528,7 +528,7 @@ F ext/recover/sqlite3recover.h 011c799f02deb70ab685916f6f538e6bb32c4e0025e79bfd0 F ext/recover/test_recover.c 072260d7452a3b81aba995b2b3269e7ec2aa7f06725544ba4c25b1b0a1dbc61a F ext/repair/README.md 92f5e8aae749a4dae14f02eea8e1bb42d4db2b6ce5e83dbcdd6b1446997e0c15 F ext/repair/checkfreelist.c e21f06995ff4efdc1622dcceaea4dcba2caa83ca2f31a1607b98a8509168a996 -F ext/repair/checkindex.c af5c66463f51462d8a6f796b2c44ef8cfa1116bbdc35a15da07c67a705388bfd +F ext/repair/checkindex.c 7639b4f8928f82c10b950169e60cc45a7f6798df0b299771d17bef025736f657 F ext/repair/sqlite3_checker.c.in 445118c5f7fea958b36fba1b2c464283e60ed4842039ddee3265f1698115ebf7 F ext/repair/sqlite3_checker.tcl a9a2caa9660567257c177a91124d8c0dccdfa341e25c51e6da7f1fd9e601eafa F ext/repair/test/README.md 34b2f542cf5be7bffe479242b33ee3492cea30711e447cc4a1a86cb5915f419e @@ -536,8 +536,8 @@ F ext/repair/test/checkfreelist01.test 3e8aa6aeb4007680c94a8d07b41c339aa635cc782 F ext/repair/test/checkindex01.test b530f141413b587c9eb78ff734de6bb79bc3515c335096108c12c01bddbadcec F ext/repair/test/test.tcl 686d76d888dffd021f64260abf29a55c57b2cedfa7fc69150b42b1d6119aac3c F ext/rtree/README 6315c0d73ebf0ec40dedb5aa0e942bc8b54e3761 -F ext/rtree/geopoly.c 0dd4775e896cee6067979d67aff7c998e75c2c9d9cd8d62a1a790c09cde7adca -F ext/rtree/rtree.c 4c58755830a0902435322bf61b2994ae02951a039daefb31cff9457d3e2aa201 +F ext/rtree/geopoly.c 654b0a76425dfb33d9c47b7de1f3baebf51582d9e4d528fbf31d2df24f7ff4c0 +F ext/rtree/rtree.c 7e7ae59fe244c8bb85f4b784f4e813b7a000986d8c4d7317ee3b6004f5ee94b5 F ext/rtree/rtree.h 4a690463901cb5e6127cf05eb8e642f127012fd5003830dbc974eca5802d9412 F ext/rtree/rtree1.test e0608db762b2aadca0ecb6f97396cf66244490adc3ba88f2a292b27be3e1da3e F ext/rtree/rtree2.test 9d9deddbb16fd0c30c36e6b4fdc3ee3132d765567f0f9432ee71e1303d32603d @@ -615,11 +615,11 @@ F ext/session/sessionrowid.test 85187c2f1b38861a5844868126f69f9ec62223a03449a98a F ext/session/sessionsize.test 8fcf4685993c3dbaa46a24183940ab9f5aa9ed0d23e5fb63bfffbdb56134b795 F ext/session/sessionstat1.test 5e718d5888c0c49bbb33a7a4f816366db85f59f6a4f97544a806421b85dc2dec F ext/session/sessionwor.test 6fd9a2256442cebde5b2284936ae9e0d54bde692d0f5fd009ecef8511f4cf3fc -F ext/session/sqlite3session.c 52a680dbb03c4734748b215d95987fb4d95ab23baaf053a01ac2626610963b58 +F ext/session/sqlite3session.c e694d6a755c2e9c7cacfb4cce79c550d0bbce7d4d62f661a689496df29994057 F ext/session/sqlite3session.h aa5de3ec8ef0e5313e9f65dafd69e8ba292d170f07b57da9200c040068dab061 F ext/session/test_session.c 12e0a2c15fd60f92da4bb29c697c9177ff0c0dbcdc5129a54c47e999f147937a F ext/wasm/EXPORTED_FUNCTIONS.fiddle.in 27450c8b8c70875a260aca55435ec927068b34cef801a96205adb81bdcefc65c -F ext/wasm/GNUmakefile c6a98150911c8f882aa75a9fbf148b124c59b22078799f9f9c6061bfbb128a33 +F ext/wasm/GNUmakefile 717c71a5aabcb6590bed0379ea3d3d83a2cd9034e86ec2aebee2fd90a124b2d6 F ext/wasm/README-dist.txt f01081a850ce38a56706af6b481e3a7878e24e42b314cfcd4b129f0f8427066a F ext/wasm/README.md b89605f65661cf35bf034ff6d43e448cc169b8017fc105d498e33b81218b482c F ext/wasm/SQLTester/GNUmakefile e0794f676d55819951bbfae45cc5e8d7818dc460492dc317ce7f0d2eca15caff @@ -640,15 +640,15 @@ F ext/wasm/api/pre-js.c-pp.js a614a2c82b12c4d96d8e3ba77330329efc53c4d56a8a7e60ad F ext/wasm/api/sqlite3-api-cleanup.js 3ac1786e461ada63033143be8c3b00b26b939540661f3e839515bb92f2e35359 F ext/wasm/api/sqlite3-api-glue.c-pp.js 5c0209e6a28164b4c2c1a34b0bb4aee3b7b1a264988d7e71fac08b8ede5b7ae3 F ext/wasm/api/sqlite3-api-oo1.c-pp.js f3a8e2004c6625d17946c11f2fb32008be78bc5207bf746fc77d59848813225f -F ext/wasm/api/sqlite3-api-prologue.js 9e7d89a2c0d02b8b2052a62757a89f1e7e4dbcc0d9cd3f2dafa896786954dad2 +F ext/wasm/api/sqlite3-api-prologue.js 8b79b89a2cac71c2f751c4a16e41ee9f34745ba005040d0e9ae13b49b3fb9445 F ext/wasm/api/sqlite3-api-worker1.c-pp.js f646a65257973b8c4481f8a6a216370b85644f23e64b126e7ae113570587c0ab F ext/wasm/api/sqlite3-license-version-header.js 0c807a421f0187e778dc1078f10d2994b915123c1223fe752b60afdcd1263f89 F ext/wasm/api/sqlite3-opfs-async-proxy.js 3774befd97cd1a5e2895c8225a894aad946848c6d9b4028acc988b5d123475af F ext/wasm/api/sqlite3-vfs-helper.c-pp.js 3f828cc66758acb40e9c5b4dcfd87fd478a14c8fb7f0630264e6c7fa0e57515d F ext/wasm/api/sqlite3-vfs-opfs-sahpool.c-pp.js ce59229719220d64f491081bb2b423cea61cff171abcc7ac4ffc2f3687d27788 -F ext/wasm/api/sqlite3-vfs-opfs.c-pp.js 9b86ca2d8276cf919fbc9ba2a10e9786033b64f92c2db844d951804dee6c4b4e +F ext/wasm/api/sqlite3-vfs-opfs.c-pp.js 4ab0704ee198de7d1059eccedc7703c931510b588d10af0ee36ea5b3ebbac284 F ext/wasm/api/sqlite3-vtab-helper.c-pp.js e809739d71e8b35dfe1b55d24d91f02d04239e6aef7ca1ea92a15a29e704f616 -F ext/wasm/api/sqlite3-wasm.c 6f9d8529072d072359cd22dc5dfb0572c524684686569cfbd0f9640d7619fc10 +F ext/wasm/api/sqlite3-wasm.c 82b74d419a339a4cdb012ac7b6fa2b8c29c71e738669057fbf03d2a99b7d99cd F ext/wasm/api/sqlite3-worker1-promiser.c-pp.js bc65debfe43b81fc39fb25c40ad0cc1946bd82580fbf644351107b544d6177ee F ext/wasm/api/sqlite3-worker1.c-pp.js 5e8706c2c4af2a57fbcdc02f4e7ef79869971bc21bb8ede777687786ce1c92d5 F ext/wasm/batch-runner-sahpool.html e9a38fdeb36a13eac7b50241dfe7ae066fe3f51f5c0b0151e7baee5fce0d07a7 @@ -659,13 +659,13 @@ F ext/wasm/c-pp.c 6d131069644964223305582a80973477fa8b06b57306781690d7874ebd3a4f F ext/wasm/common/SqliteTestUtil.js 7adaeffef757d8708418dc9190f72df22367b531831775804b31598b44f6aa51 F ext/wasm/common/emscripten.css 11bd104b6c0d597c67d40cc8ecc0a60dae2b965151e3b6a37fa5708bac3acd15 F ext/wasm/common/testing.css e97549bab24126c24e0daabfe2de9bb478fb0a69fdb2ddd0a73a992c091aad6f -F ext/wasm/common/whwasmutil.js c2e459286c1ada789cda6b17761bb1eea6034be572468eed78c049354f1051ba +F ext/wasm/common/whwasmutil.js 4362ca3d32ca6b5436a3820f2e0b9a903b2c52897f62ea7bc42f0d924f830644 F ext/wasm/config.make.in 4bc43443f768a61efd43cf995a5e618f58ac9afc0936706014193537d82c41cb F ext/wasm/demo-123-worker.html a0b58d9caef098a626a1a1db567076fca4245e8d60ba94557ede8684350a81ed F ext/wasm/demo-123.html 8c70a412ce386bd3796534257935eb1e3ea5c581e5d5aea0490b8232e570a508 F ext/wasm/demo-123.js c7b3cca50c55841c381a9ca4f9396e5bbdc6114273d0b10a43e378e32e7be5bf F ext/wasm/demo-jsstorage.html 409c4be4af5f207fb2877160724b91b33ea36a3cd8c204e8da1acb828ffe588e -F ext/wasm/demo-jsstorage.js 44e3ae7ec2483b6c511384c3c290beb6f305c721186bcf5398ca4e00004a06b8 +F ext/wasm/demo-jsstorage.js 42131ddfa18e817d0e39ac63745e9ea31553980a5ebd2222e04d4fac60c19837 F ext/wasm/demo-worker1-promiser.c-pp.html 635cf90685805e21772a5f7a35d1ace80f98a9ef7c42ff04d7a125ddca7e5db8 F ext/wasm/demo-worker1-promiser.c-pp.js af168699d3cab1c27ad2364ebe06cd49db300bdbf404e23b00d5742ed52816ba F ext/wasm/demo-worker1.html 2c178c1890a2beb5a5fecb1453e796d067a4b8d3d2a04d65ca2eb1ab2c68ef5d @@ -674,12 +674,12 @@ F ext/wasm/dist.make 92ef4ffe33022a50f92d602acabad10bd8dd91759f3eb7df27fc6d7d370 F ext/wasm/example_extra_init.c 2347cd69d19d839ef4e5e77b7855103a7fe3ef2af86f2e8c95839afd8b05862f F ext/wasm/fiddle.make c6d7a3d6cc03bb5f21acb295c1233820d0dbf5c6a89b28dc2e093edcc001c45a F ext/wasm/fiddle/fiddle-worker.js 850e66fce39b89d59e161d1abac43a181a4caa89ddeea162765d660277cd84ce -F ext/wasm/fiddle/fiddle.js b444a5646a9aac9f3fc06c53d78af5e1912eb235d69a8e6010723e4eb0e9d4a1 +F ext/wasm/fiddle/fiddle.js 2a2f27b4be2674f501fff61c4a09e44dcf2295731a26b5c28e439f3a573bd269 F ext/wasm/fiddle/index.html c79b1741cbeba78f88af0a84cf5ec7de87a909a6a8d10a369b1f4824c66c2088 F ext/wasm/index-dist.html 56132399702b15d70c474c3f1952541e25cb0922942868f70daf188f024b3730 F ext/wasm/index.html bcaa00eca521b372a6a62c7e7b17a870b0fcdf3e418a5921df1fd61e5344080d F ext/wasm/jaccwabyt/jaccwabyt.js 1264710db3cfbcb6887d95665b7aeba60c1126eaef789ca4cf1a4a17d5bc7f54 -F ext/wasm/jaccwabyt/jaccwabyt.md 59a20df389abcc3606eb4eaea7fb7ba14504beb3e345dbea9b99a0618ba3bec8 +F ext/wasm/jaccwabyt/jaccwabyt.md 77d004a93ab52bcafcf94d7c6646bbe43e4ff39c4f3f228baf80732ee7a1626d F ext/wasm/mkwasmbuilds.c 57ce3c6e30c17078586dde9b5dec946f6a2d08f195067d4b6feefbc0bf1e0a4b F ext/wasm/module-symbols.html dc476b403369b26a1a23773e13b80f41b9a49f0825e81435fe3600a7cfbbe337 F ext/wasm/scratchpad-wasmfs.html a3d7388f3c4b263676b58b526846e9d02dfcb4014ff29d3a5040935286af5b96 @@ -705,7 +705,7 @@ F ext/wasm/tests/opfs/sahpool/sahpool-pausing.js f264925cfc82155de38cecb3d204c36 F ext/wasm/tests/opfs/sahpool/sahpool-worker.js bd25a43fc2ab2d1bafd8f2854ad3943ef673f7c3be03e95ecf1612ff6e8e2a61 F ext/wasm/wasmfs.make 68999f5bd8c489239592d59a420f8c627c99169bbd6fa16a404751f757b9f702 F magic.txt 5ade0bc977aa135e79e3faaea894d5671b26107cc91e70783aa7dc83f22f3ba0 -F main.mk 47722beae213a94638819c60c3c560ab4d61f93dcb760980df4cdb105e383089 +F main.mk 23a320243961c2c3f3fec3b5c2009025b98c28a2f0b34d9ed4a2b36fe29391cc F mptest/config01.test 3c6adcbc50b991866855f1977ff172eb6d901271 F mptest/config02.test 4415dfe36c48785f751e16e32c20b077c28ae504 F mptest/crash01.test 61e61469e257df0850df4293d7d4d6c2af301421 @@ -745,7 +745,7 @@ F src/insert.c a5f0366266be993ebf533808f22cb7a788624805b55bc45424ceed3f48c54a16 F src/json.c 5abb5cb782e74451a8882f6b7ee4d5e629246642262660bd1980a5e1b796258d F src/legacy.c d7874bc885906868cd51e6c2156698f2754f02d9eee1bae2d687323c3ca8e5aa F src/loadext.c 7432c944ff197046d67a1207790a1b13eec4548c85a9457eb0896bb3641dfb36 -F src/main.c 04a1d2725b51bfbff77b735cae12be3cd66f34da0dd3053433b5c9d9fcad84c5 +F src/main.c b3714544b61db632703159ab58fa20e57cdbf63dc3afacc3f81521b95ceaad47 F src/malloc.c 410e570b30c26cc36e3372577df50f7a96ee3eed5b2b161c6b6b48773c650c5e F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645 F src/mem1.c 3bb59158c38e05f6270e761a9f435bf19827a264c13d1631c58b84bdc96d73b2 @@ -766,16 +766,16 @@ F src/os.h 1ff5ae51d339d0e30d8a9d814f4b8f8e448169304d83a7ed9db66a65732f3e63 F src/os_common.h 6c0eb8dd40ef3e12fe585a13e709710267a258e2c8dd1c40b1948a1d14582e06 F src/os_kv.c 4d39e1f1c180b11162c6dc4aa8ad34053873a639bac6baae23272fc03349986a F src/os_setup.h 6011ad7af5db4e05155f385eb3a9b4470688de6f65d6166b8956e58a3d872107 -F src/os_unix.c 1e887f1f926a76a65ebcef79aa6da76e369ad7f899fa211c6ee56ff953c098a2 +F src/os_unix.c 410185df4900817c218c0efdb8064b3481af88cb3f7cea7392f820b6eebc7889 F src/os_win.c ab9912a2c1cb39a6429b8de919a5b63ad1c7775e511d748391c57bf9ad03bd29 F src/os_win.h 7b073010f1451abe501be30d12f6bc599824944a F src/pager.c 9fbb541b46125dfa8914827575e6bb4d15048caa008073b1709112d495d7983b F src/pager.h 6137149346e6c8a3ddc1eeb40aee46381e9bc8b0fcc6dda8a1efde993c2275b8 -F src/parse.y 4e62b0b301673d404b8aff7c9d84ee8636e5ff59f45c90cdce4c8845a1289837 +F src/parse.y 0c044c98d955737360e17117e37bf461b79ff484c7901d02efad09a97a92fafb F src/pcache.c 588cc3c5ccaaadde689ed35ce5c5c891a1f7b1f4d1f56f6cf0143b74d8ee6484 F src/pcache.h 1497ce1b823cf00094bb0cf3bac37b345937e6f910890c626b16512316d3abf5 F src/pcache1.c 78d4935e510f7bed0fdd1a3f742c0e663b36a795f9dc7411161dc22bdae1245e -F src/pragma.c c7ada272232e1182c4536d9637fa7b955a10bc1bd8d5a87d4dc9309dab827791 +F src/pragma.c 30b535d0a66348df844ee36f890617b4cf45e9a22dcbc47ec3ca92909c50aaf1 F src/prepare.c 1832be043fce7d489959aae6f994c452d023914714c4d5457beaed51c0f3d126 F src/printf.c b373a8800e09fb888497b2bc640e455ee8ebc584a60f16368989394d5b895ac0 F src/random.c 606b00941a1d7dd09c381d3279a058d771f406c5213c9932bbd93d5587be4b9c @@ -1382,7 +1382,7 @@ F test/jrnlmode3.test 556b447a05be0e0963f4311e95ab1632b11c9eaa F test/json/README.md de59d5ba0bd2796d797115688630a6405bbf43a2891bad445ac6b9f38b83f236 F test/json/json-generator.tcl dc0dd0f393800c98658fc4c47eaa6af29d4e17527380cd28656fb261bddc8a3f F test/json/json-q1.txt 65f9d1cdcc4cffa9823fb73ed936aae5658700cd001fde448f68bfb91c807307 -F test/json/json-speed-check.sh 912ee03e700a65c827ee0c7b4752c21ec5ef69cf7679d2f482ca817042bead52 x +F test/json/json-speed-check.sh 7d5898808ce7542762318306ae6075a30f5e7ee115c4a409f487e123afe91d88 x F test/json/jsonb-q1.txt 1e180fe6491efab307e318b22879e3a736ac9a96539bbde7911a13ee5b33abc7 F test/json101.test 30db5b055b103ccabc53a29cfe6cda3345d07e171aeb25403dafa04f19e98b19 F test/json102.test 9b2e5ada10845ff84853b3feaae2ce51ce7145ae458f74c6a6cecc6ef6ee3ae1 @@ -2163,7 +2163,7 @@ F tool/mkspeedsql.tcl a1a334d288f7adfe6e996f2e712becf076745c97 F tool/mksqlite3c-noext.tcl 351c55256213154cabb051a3c870ef9f4487de905015141ae50dc7578a901b84 F tool/mksqlite3c.tcl ba13086555b3cb835eba5e47a9250300ab85304d23fd1081abd3f29d8ab71a2b F tool/mksqlite3h.tcl 989948c6a26e188e673d7c2f2f093ea3acd816ad6ac65bab596280075c8f3a45 -F tool/mksqlite3internalh.tcl eb994013e833359137eb53a55acdad0b5ae1049b +F tool/mksqlite3internalh.tcl 46ef6ed6ccd3c36e23051109dd25085d8edef3887635cea25afa81c4adf4d4db F tool/mksrczip.tcl 81efd9974dbb36005383f2cd655520057a2ae5aa85ac2441a80c7c28f803ac52 F tool/mktoolzip.tcl 34b4e92be544f820e2cc26f143f7d5aec511e826ec394cc82969a5dcf7c7a27c F tool/mkvsix.tcl 67b40996a50f985a573278eea32fc5a5eb6110bdf14d33f1d8086e48c69e540a @@ -2175,7 +2175,7 @@ F tool/pagesig.c f98909b4168d9cac11a2de7f031adea0e2f3131faa7515a72807c03ec58eafe F tool/replace.tcl 511c61acfe563dfb58675efb4628bb158a13d48ff8322123ac447e9d25a82d9a F tool/restore_jrnl.tcl 1079ecba47cc82fa82115b81c1f68097ab1f956f357ee8da5fc4b2589af6bd98 F tool/rollback-test.c 9fc98427d1e23e84429d7e6d07d9094fbdec65a5 -F tool/run-speed-test.sh f95d19fd669b68c4c38b6b475242841d47c66076 +F tool/run-speed-test.sh df9686c0991ea7c617b2cb5467d89d34b561f198ab91cb87735e27030ede92e8 F tool/showdb.c 3956d71e5193162609a60e8c9edfcf09274c00cfea2b1d221261427adb2b5cca F tool/showjournal.c 5bad7ae8784a43d2b270d953060423b8bd480818 F tool/showlocks.c 9cc5e66d4ebbf2d194f39db2527ece92077e86ae627ddd233ee48e16e8142564 @@ -2184,7 +2184,7 @@ F tool/showstat4.c 0682ebea7abf4d3657f53c4a243f2e7eab48eab344ed36a94bb75dcd19a5c F tool/showwal.c 11eca547980a066b081f512636151233350ac679f29ecf4ebfce7f4530230b3d F tool/soak1.tcl 8d407956e1a45b485a8e072470a3e629a27037fe F tool/spaceanal.tcl 1f83962090a6b60e1d7bf92495d643e622bef9fe82ea3f2d22350dcbce9a12d0 -F tool/speed-check.sh e566ab3934d7d78631743a984ad3f67c331c911bb18ff5d0a6c616a2afee7f91 +F tool/speed-check.sh 2d9e337449f8eb9f5ab4c1ce7433024e334ea03a68d48aa9caee6229c7cf0774 F tool/speedtest.tcl 06c76698485ccf597b9e7dbb1ac70706eb873355 F tool/speedtest16.c ecb6542862151c3e6509bbc00509b234562ae81e F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff @@ -2213,8 +2213,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P d35320495eb282601ab4f3b9efc53c7c1d58e890f025317e34c7046a43c8cb53 -R 04c04f142a27d75e025c0ba133fe1798 -U drh -Z b55ed85e90ac874ba1b5e9186f139abf +P 5f2531e068b4856db2270518c370b65cbd0c0ab5443d76f1fb1116fe9ad80296 +R 48c5d03c4a39b66794bcbf335c7bec1b +U stephan +Z 7a9eee4ffb6405682a17951b981ccf15 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index c9d8775481..07bb00cc61 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -5f2531e068b4856db2270518c370b65cbd0c0ab5443d76f1fb1116fe9ad80296 +af928818a030924060ee0762431dae0f16d53a62f4e1132754d052eb9c621ac2 diff --git a/src/main.c b/src/main.c index 513e193dd2..4d981d0ce2 100644 --- a/src/main.c +++ b/src/main.c @@ -4203,8 +4203,8 @@ int sqlite3_test_control(int op, ...){ /* sqlite3_test_control(SQLITE_TESTCTRL_FK_NO_ACTION, sqlite3 *db, int b); ** ** If b is true, then activate the SQLITE_FkNoAction setting. If b is - ** false then clearn that setting. If the SQLITE_FkNoAction setting is - ** abled, all foreign key ON DELETE and ON UPDATE actions behave as if + ** false then clear that setting. If the SQLITE_FkNoAction setting is + ** enabled, all foreign key ON DELETE and ON UPDATE actions behave as if ** they were NO ACTION, regardless of how they are defined. ** ** NB: One must usually run "PRAGMA writable_schema=RESET" after diff --git a/src/os_unix.c b/src/os_unix.c index 78512cb061..1146545fea 100644 --- a/src/os_unix.c +++ b/src/os_unix.c @@ -6854,7 +6854,7 @@ static int unixSleep(sqlite3_vfs *NotUsed, int microseconds){ /* Almost all modern unix systems support nanosleep(). But if you are ** compiling for one of the rare exceptions, you can use - ** -DHAVE_NANOSLEEP=0 (perhaps in conjuction with -DHAVE_USLEEP if + ** -DHAVE_NANOSLEEP=0 (perhaps in conjunction with -DHAVE_USLEEP if ** usleep() is available) in order to bypass the use of nanosleep() */ nanosleep(&sp, NULL); diff --git a/src/parse.y b/src/parse.y index 65a15f8c49..e6aff2e0ec 100644 --- a/src/parse.y +++ b/src/parse.y @@ -838,7 +838,7 @@ joinop(X) ::= JOIN_KW(A) nm(B) JOIN. joinop(X) ::= JOIN_KW(A) nm(B) nm(C) JOIN. {X = sqlite3JoinType(pParse,&A,&B,&C);/*X-overwrites-A*/} -// There is a parsing abiguity in an upsert statement that uses a +// There is a parsing ambiguity in an upsert statement that uses a // SELECT on the RHS of a the INSERT: // // INSERT INTO tab SELECT * FROM aaa JOIN bbb ON CONFLICT ... diff --git a/src/pragma.c b/src/pragma.c index f1a922d1ac..2b4d465e71 100644 --- a/src/pragma.c +++ b/src/pragma.c @@ -36,7 +36,7 @@ ** the following macro or to the actual analysis_limit if it is non-zero, ** in order to prevent PRAGMA optimize from running for too long. ** -** The value of 2000 is chosen emperically so that the worst-case run-time +** The value of 2000 is chosen empirically so that the worst-case run-time ** for PRAGMA optimize does not exceed 100 milliseconds against a variety ** of test databases on a RaspberryPI-4 compiled using -Os and without ** -DSQLITE_DEBUG. Of course, your mileage may vary. For the purpose of diff --git a/test/json/json-speed-check.sh b/test/json/json-speed-check.sh index 682a7aeedd..1eabbb3db2 100755 --- a/test/json/json-speed-check.sh +++ b/test/json/json-speed-check.sh @@ -5,7 +5,7 @@ # # sh speed-check.sh trunk # Baseline measurement of trunk # sh speed-check.sh x1 # Measure some experimental change -# fossil xdiff --tk jout-trunk.txt jout-x1.txt # View chanages +# fossil xdiff --tk jout-trunk.txt jout-x1.txt # View changes # # There are multiple output files, all with a base name given by # the first argument: diff --git a/tool/mksqlite3internalh.tcl b/tool/mksqlite3internalh.tcl index 8db593fe75..e1a42ee776 100644 --- a/tool/mksqlite3internalh.tcl +++ b/tool/mksqlite3internalh.tcl @@ -92,7 +92,7 @@ proc section_comment {text} { # Read the source file named $filename and write it into the # sqlite3.c output file. If any #include statements are seen, -# process them approprately. +# process them appropriately. # proc copy_file {filename} { global seen_hdr available_hdr out diff --git a/tool/run-speed-test.sh b/tool/run-speed-test.sh index 0e970ea0f6..9c76465a26 100644 --- a/tool/run-speed-test.sh +++ b/tool/run-speed-test.sh @@ -5,7 +5,7 @@ # # sh run-speed-test.sh trunk # Baseline measurement of trunk # sh run-speed-test.sh x1 # Measure some experimental change -# fossil test-diff --tk cout-trunk.txt cout-x1.txt # View chanages +# fossil test-diff --tk cout-trunk.txt cout-x1.txt # View changes # # There are multiple output files, all with a base name given by # the first argument: diff --git a/tool/speed-check.sh b/tool/speed-check.sh index 8a9e67a38b..fd122a12db 100644 --- a/tool/speed-check.sh +++ b/tool/speed-check.sh @@ -5,7 +5,7 @@ # # sh speed-check.sh trunk # Baseline measurement of trunk # sh speed-check.sh x1 # Measure some experimental change -# fossil xdiff --tk cout-trunk.txt cout-x1.txt # View chanages +# fossil xdiff --tk cout-trunk.txt cout-x1.txt # View changes # # There are multiple output files, all with a base name given by # the first argument: From b5f74ee6373719310b68f9aebfef559ae0a5e0b5 Mon Sep 17 00:00:00 2001 From: drh <> Date: Tue, 25 Feb 2025 21:16:13 +0000 Subject: [PATCH 193/194] Disable some misuse tests that sometimes cause segfaults during "make releasetest". FossilOrigin-Name: 5856251a7e8a69aa181f89533bc2a78812d8b450a407b4b2f73f0c146cd78072 --- manifest | 14 +++++++------- manifest.uuid | 2 +- test/misuse.test | 6 +++++- 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/manifest b/manifest index 5e78a70198..a8df28e8b7 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Approximately\s50\stypo\sfixes,\sspanning\sthe\swhole\stree,\scontributed\svia\s[forum:006c8fa165083ac3|forum\spost\s006c8fa165083ac3]\sand\sindividually\schecked\sfor\scorrectness.\sAffects\sonly\scode\scomments,\sdocs,\sand\sa\ssingle\sline\sof\sdebug\soutput\sin\sa\stest\sapp. -D 2025-02-25T20:55:14.600 +C Disable\ssome\smisuse\stests\sthat\ssometimes\scause\ssegfaults\sduring\n"make\sreleasetest". +D 2025-02-25T21:16:13.778 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d @@ -1468,7 +1468,7 @@ F test/misc5.test 02fcaf4d42405be02ec975e946270a50b0282dac98c78303ade0d1392839d2 F test/misc6.test 953cc693924d88e6117aeba16f46f0bf5abede91 F test/misc7.test d912f3d45c2989191b797504a220ca225d6be80b21acad22ba0d35f4a9ee4579 F test/misc8.test 08d2380bc435486b12161521f225043ac2be26f02471c2c1ea4cac0b1548edbd -F test/misuse.test 9e7f78402005e833af71dcab32d048003869eca5abcaccc985d4f8dc1d86bcc7 +F test/misuse.test 46d42ffdf375833ea5828796e56f84660344f7548659b493059f152f00e66840 F test/mjournal.test 28a08d5cb5fb5b5702a46e19176e45e964e0800d1f894677169e79f34030e152 F test/mmap1.test 18de3fd7b70a777af6004ca2feecfcdd3d0be17fa04058e808baf530c94b1a1d F test/mmap2.test 9d6dd9ddb4ad2379f29cc78f38ce1e63ed418022 @@ -2213,8 +2213,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P 5f2531e068b4856db2270518c370b65cbd0c0ab5443d76f1fb1116fe9ad80296 -R 48c5d03c4a39b66794bcbf335c7bec1b -U stephan -Z 7a9eee4ffb6405682a17951b981ccf15 +P af928818a030924060ee0762431dae0f16d53a62f4e1132754d052eb9c621ac2 +R eeb744512326d8f3b2694527497b4830 +U drh +Z 13c562a7cc57861933a75af1aee43090 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 07bb00cc61..f10f78d9de 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -af928818a030924060ee0762431dae0f16d53a62f4e1132754d052eb9c621ac2 +5856251a7e8a69aa181f89533bc2a78812d8b450a407b4b2f73f0c146cd78072 diff --git a/test/misuse.test b/test/misuse.test index e15cf3357e..2ba61f9eb5 100644 --- a/test/misuse.test +++ b/test/misuse.test @@ -172,7 +172,11 @@ do_test misuse-4.3 { lappend v $msg $r } {0 {} SQLITE_BUSY} -if {[clang_sanitize_address]==0} { +# All of the following tests can potentially (though rarely) +# lead to segfaults, which is unsettling. So they are disabled +# for now__________________________ +# v +if {[clang_sanitize_address]==0 && 0} { do_test misuse-4.4 { # Flush the TCL statement cache here, otherwise the sqlite3_close() will # fail because there are still un-finalized() VDBEs. From d804893762174d23017921ddbf233fa90ae5015f Mon Sep 17 00:00:00 2001 From: stephan Date: Wed, 26 Feb 2025 03:20:26 +0000 Subject: [PATCH 194/194] Fix a bug in mkwasmbuilds.c which caused sqlite3.wasm to get deleted directly after it was built. FossilOrigin-Name: 1a72d1d13e42f69f02861f8ac3058e69b78d4fd2050ca8c53a1ce016b7e0863d --- ext/wasm/mkwasmbuilds.c | 13 +++++++++---- manifest | 14 +++++++------- manifest.uuid | 2 +- 3 files changed, 17 insertions(+), 12 deletions(-) diff --git a/ext/wasm/mkwasmbuilds.c b/ext/wasm/mkwasmbuilds.c index 4910379101..ef0358850b 100644 --- a/ext/wasm/mkwasmbuilds.c +++ b/ext/wasm/mkwasmbuilds.c @@ -138,19 +138,23 @@ static void mk_prologue(void){ /* ** Flags for use with the 3rd argument to mk_pre_post() and ** mk_lib_mode(). +** +** Maintenance reminder: do not combine flags within this enum, +** e.g. LIBMODE_BUNDLER_FRIEND=0x02|LIBMODE_ESM, as that will lead to +** breakage in some of the flag checks. */ enum LibModeFlags { /* Indicates an ESM module build. */ LIBMODE_ESM = 0x01, /* Indicates a "bundler-friendly" build mode. */ - LIBMODE_BUNDLER_FRIENDLY = 0x02 | LIBMODE_ESM, + LIBMODE_BUNDLER_FRIENDLY = 0x02, /* Indicates to _not_ add this build to the 'all' target. */ LIBMODE_DONT_ADD_TO_ALL = 0x04, /* Indicates a node.js-for-node.js build (untested and ** unsupported). */ LIBMODE_NODEJS = 0x08, /* Indicates a wasmfs build (untested and unsupported). */ - LIBMODE_WASMFS = 0x10 | LIBMODE_ESM + LIBMODE_WASMFS = 0x10 }; /* @@ -387,7 +391,8 @@ int main(void){ mk_lib_mode("sqlite3", "esm", LIBMODE_ESM, "$(sqlite3-api.mjs)", "$(sqlite3.mjs)", "-Dtarget=es6-module", 0); - mk_lib_mode("sqlite3", "bundler-friendly", LIBMODE_BUNDLER_FRIENDLY, + mk_lib_mode("sqlite3", "bundler-friendly", + LIBMODE_BUNDLER_FRIENDLY | LIBMODE_ESM, "$(sqlite3-api-bundler-friendly.mjs)", "$(sqlite3-bundler-friendly.mjs)", "$(c-pp.D.sqlite3-esm) -Dtarget=es6-bundler-friendly", 0); @@ -396,7 +401,7 @@ int main(void){ "$(sqlite3-api-node.mjs)", "$(sqlite3-node.mjs)", "$(c-pp.D.sqlite3-bundler-friendly) -Dtarget=node", 0); mk_lib_mode("sqlite3-wasmfs", "esm" , - LIBMODE_WASMFS | LIBMODE_DONT_ADD_TO_ALL, + LIBMODE_WASMFS | LIBMODE_ESM | LIBMODE_DONT_ADD_TO_ALL, /* The sqlite3-wasmfs build is optional and needs to be invoked ** conditionally using info we don't have here. */ "$(sqlite3-api-wasmfs.mjs)", "$(sqlite3-wasmfs.mjs)", diff --git a/manifest b/manifest index a8df28e8b7..a0144787aa 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Disable\ssome\smisuse\stests\sthat\ssometimes\scause\ssegfaults\sduring\n"make\sreleasetest". -D 2025-02-25T21:16:13.778 +C Fix\sa\sbug\sin\smkwasmbuilds.c\swhich\scaused\ssqlite3.wasm\sto\sget\sdeleted\sdirectly\safter\sit\swas\sbuilt. +D 2025-02-26T03:20:26.791 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d @@ -680,7 +680,7 @@ F ext/wasm/index-dist.html 56132399702b15d70c474c3f1952541e25cb0922942868f70daf1 F ext/wasm/index.html bcaa00eca521b372a6a62c7e7b17a870b0fcdf3e418a5921df1fd61e5344080d F ext/wasm/jaccwabyt/jaccwabyt.js 1264710db3cfbcb6887d95665b7aeba60c1126eaef789ca4cf1a4a17d5bc7f54 F ext/wasm/jaccwabyt/jaccwabyt.md 77d004a93ab52bcafcf94d7c6646bbe43e4ff39c4f3f228baf80732ee7a1626d -F ext/wasm/mkwasmbuilds.c 57ce3c6e30c17078586dde9b5dec946f6a2d08f195067d4b6feefbc0bf1e0a4b +F ext/wasm/mkwasmbuilds.c e5c30286c8252fc8cfd398a286a2ae1e46dba9c1bafdfe36966b853432577460 F ext/wasm/module-symbols.html dc476b403369b26a1a23773e13b80f41b9a49f0825e81435fe3600a7cfbbe337 F ext/wasm/scratchpad-wasmfs.html a3d7388f3c4b263676b58b526846e9d02dfcb4014ff29d3a5040935286af5b96 F ext/wasm/scratchpad-wasmfs.mjs 66034b9256b218de59248aad796760a1584c1dd842231505895eff00dbd57c63 @@ -2213,8 +2213,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P af928818a030924060ee0762431dae0f16d53a62f4e1132754d052eb9c621ac2 -R eeb744512326d8f3b2694527497b4830 -U drh -Z 13c562a7cc57861933a75af1aee43090 +P 5856251a7e8a69aa181f89533bc2a78812d8b450a407b4b2f73f0c146cd78072 +R b840bd624d9384d1c2e20ee14054bc6d +U stephan +Z b6a8d00e4e4586215158387bb7650244 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index f10f78d9de..b18861f2f0 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -5856251a7e8a69aa181f89533bc2a78812d8b450a407b4b2f73f0c146cd78072 +1a72d1d13e42f69f02861f8ac3058e69b78d4fd2050ca8c53a1ce016b7e0863d