From 80cf891792eec765408317013a267acb2ed4e9f9 Mon Sep 17 00:00:00 2001 From: drh <> Date: Tue, 27 Sep 2022 00:56:45 +0000 Subject: [PATCH 01/18] Enhance defensive mode so that it disallows CREATE TRIGGER statements if the statements within the trigger attempt to write on a shadow table. FossilOrigin-Name: 3283bbd12a60f472ed03cb7c6209a605a3bf9f3d9083371e17840b56e8b3f559 --- manifest | 12 ++++++------ manifest.uuid | 2 +- src/trigger.c | 17 +++++++++++++++++ 3 files changed, 24 insertions(+), 7 deletions(-) diff --git a/manifest b/manifest index d10a20caee..13ee3d046d 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Reduced\sand\simproved\scomments\son\sthe\sconstraintCompatibleWithOuterJoin()\nfunction. -D 2022-09-21T18:21:31.342 +C Enhance\sdefensive\smode\sso\sthat\sit\sdisallows\sCREATE\sTRIGGER\sstatements\sif\sthe\nstatements\swithin\sthe\strigger\sattempt\sto\swrite\son\sa\sshadow\stable. +D 2022-09-27T00:56:45.695 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724 @@ -654,7 +654,7 @@ F src/test_wsd.c 41cadfd9d97fe8e3e4e44f61a4a8ccd6f7ca8fe9 F src/threads.c 4ae07fa022a3dc7c5beb373cf744a85d3c5c6c3c F src/tokenize.c 1305797eab3542a0896b552c6e7669c972c1468e11e92b370533c1f37a37082b F src/treeview.c 07787f67cd297a6d09d04b8d70c06769c60c9c1d9080378f93929c16f8fd3298 -F src/trigger.c 61bea163b1fa3039bc572ed8312461b978e5c527e5301f302b078f4c1ccdec6a +F src/trigger.c bc70c58e713dcfb6cabe5cc0bed71aedb02c3e9e128c6089a78aca945ba4d720 F src/update.c c52a7991bece0453d22c77c08469512ee2f1391c12503fd347d1c939220c5877 F src/upsert.c 8789047a8f0a601ea42fa0256d1ba3190c13746b6ba940fe2d25643a7e991937 F src/utf.c ee39565f0843775cc2c81135751ddd93eceb91a673ea2c57f61c76f288b041a0 @@ -2000,8 +2000,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0 -P 501609eddf2a46d51e8cd56477a22d4df142a166e78fe4322c0db11d1eed6687 -R 5d32b5cf2b23f775eb14de7cc8da03e5 +P 38aaf26e082bd95df6b64df43e1772fe6e20c4eb71307dcd97559cac7f11f8f1 +R 554e340d4f04eab8a3212a443865190e U drh -Z 712cc37fc63bdeb87733f2b1fa708ae7 +Z e5d0f4cdaac4fabbf1ccc0e110546353 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 065a0d4be2..8a5b305259 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -38aaf26e082bd95df6b64df43e1772fe6e20c4eb71307dcd97559cac7f11f8f1 \ No newline at end of file +3283bbd12a60f472ed03cb7c6209a605a3bf9f3d9083371e17840b56e8b3f559 \ No newline at end of file diff --git a/src/trigger.c b/src/trigger.c index 3b7d0d9e88..1c62fc231b 100644 --- a/src/trigger.c +++ b/src/trigger.c @@ -351,6 +351,23 @@ void sqlite3FinishTrigger( Vdbe *v; char *z; + /* If this is a new CREATE TABLE statement, and if shadow tables + ** are read-only, and the trigger makes a change to a shadow table, + ** then raise an error - do not allow the trigger to be created. */ + if( sqlite3ReadOnlyShadowTables(db) ){ + TriggerStep *pStep; + for(pStep=pTrig->step_list; pStep; pStep=pStep->pNext){ + if( pStep->zTarget!=0 + && sqlite3ShadowTableName(db, pStep->zTarget) + ){ + sqlite3ErrorMsg(pParse, + "trigger \"%s\" may not write to shadow table \"%s\"", + pTrig->zName, pStep->zTarget); + goto triggerfinish_cleanup; + } + } + } + /* Make an entry in the sqlite_schema table */ v = sqlite3GetVdbe(pParse); if( v==0 ) goto triggerfinish_cleanup; From 6319a8003ce19525544fdb6a2480e9856136d0f7 Mon Sep 17 00:00:00 2001 From: drh <> Date: Tue, 27 Sep 2022 01:53:05 +0000 Subject: [PATCH 02/18] Make the legacy FTS3 code more robust against integer overflow during memory allocation. FossilOrigin-Name: 5517bc50988b5339c2fd071b29de1b5ca03037b0b635c3b112cf7108fab54d5f --- ext/fts3/fts3.c | 4 +-- ext/fts3/fts3Int.h | 2 +- ext/fts3/fts3_porter.c | 2 +- ext/fts3/fts3_tokenizer1.c | 2 +- ext/fts3/fts3_write.c | 62 ++++++++++++++++++++------------------ manifest | 20 ++++++------ manifest.uuid | 2 +- 7 files changed, 48 insertions(+), 46 deletions(-) diff --git a/ext/fts3/fts3.c b/ext/fts3/fts3.c index 3b73fbba1d..c43eac4914 100644 --- a/ext/fts3/fts3.c +++ b/ext/fts3/fts3.c @@ -2888,7 +2888,7 @@ static int fts3TermSelectMerge( ** ** Similar padding is added in the fts3DoclistOrMerge() function. */ - pTS->aaOutput[0] = sqlite3_malloc(nDoclist + FTS3_VARINT_MAX + 1); + pTS->aaOutput[0] = sqlite3_malloc64((i64)nDoclist + FTS3_VARINT_MAX + 1); pTS->anOutput[0] = nDoclist; if( pTS->aaOutput[0] ){ memcpy(pTS->aaOutput[0], aDoclist, nDoclist); @@ -4745,7 +4745,7 @@ static int fts3EvalIncrPhraseNext( if( bEof==0 ){ int nList = 0; int nByte = a[p->nToken-1].nList; - char *aDoclist = sqlite3_malloc(nByte+FTS3_BUFFER_PADDING); + char *aDoclist = sqlite3_malloc64((i64)nByte+FTS3_BUFFER_PADDING); if( !aDoclist ) return SQLITE_NOMEM; memcpy(aDoclist, a[p->nToken-1].pList, nByte+1); memset(&aDoclist[nByte], 0, FTS3_BUFFER_PADDING); diff --git a/ext/fts3/fts3Int.h b/ext/fts3/fts3Int.h index 0626486edf..e821d6be31 100644 --- a/ext/fts3/fts3Int.h +++ b/ext/fts3/fts3Int.h @@ -558,7 +558,7 @@ struct Fts3MultiSegReader { int nAdvance; /* How many seg-readers to advance */ Fts3SegFilter *pFilter; /* Pointer to filter object */ char *aBuffer; /* Buffer to merge doclists in */ - int nBuffer; /* Allocated size of aBuffer[] in bytes */ + i64 nBuffer; /* Allocated size of aBuffer[] in bytes */ int iColFilter; /* If >=0, filter for this column */ int bRestart; diff --git a/ext/fts3/fts3_porter.c b/ext/fts3/fts3_porter.c index 8fb4c25daa..fbe7913020 100644 --- a/ext/fts3/fts3_porter.c +++ b/ext/fts3/fts3_porter.c @@ -621,7 +621,7 @@ static int porterNext( if( n>c->nAllocated ){ char *pNew; c->nAllocated = n+20; - pNew = sqlite3_realloc(c->zToken, c->nAllocated); + pNew = sqlite3_realloc64(c->zToken, c->nAllocated); if( !pNew ) return SQLITE_NOMEM; c->zToken = pNew; } diff --git a/ext/fts3/fts3_tokenizer1.c b/ext/fts3/fts3_tokenizer1.c index deea06d92b..78e5889da5 100644 --- a/ext/fts3/fts3_tokenizer1.c +++ b/ext/fts3/fts3_tokenizer1.c @@ -185,7 +185,7 @@ static int simpleNext( if( n>c->nTokenAllocated ){ char *pNew; c->nTokenAllocated = n+20; - pNew = sqlite3_realloc(c->pToken, c->nTokenAllocated); + pNew = sqlite3_realloc64(c->pToken, c->nTokenAllocated); if( !pNew ) return SQLITE_NOMEM; c->pToken = pNew; } diff --git a/ext/fts3/fts3_write.c b/ext/fts3/fts3_write.c index f1a4bd6bba..6a727eaf5f 100644 --- a/ext/fts3/fts3_write.c +++ b/ext/fts3/fts3_write.c @@ -649,7 +649,7 @@ static int fts3PendingListAppendVarint( /* Allocate or grow the PendingList as required. */ if( !p ){ - p = sqlite3_malloc(sizeof(*p) + 100); + p = sqlite3_malloc64(sizeof(*p) + 100); if( !p ){ return SQLITE_NOMEM; } @@ -658,14 +658,14 @@ static int fts3PendingListAppendVarint( p->nData = 0; } else if( p->nData+FTS3_VARINT_MAX+1>p->nSpace ){ - int nNew = p->nSpace * 2; - p = sqlite3_realloc(p, sizeof(*p) + nNew); + i64 nNew = p->nSpace * 2; + p = sqlite3_realloc64(p, sizeof(*p) + nNew); if( !p ){ sqlite3_free(*pp); *pp = 0; return SQLITE_NOMEM; } - p->nSpace = nNew; + p->nSpace = (int)nNew; p->aData = (char *)&p[1]; } @@ -1222,7 +1222,7 @@ int sqlite3Fts3ReadBlock( int nByte = sqlite3_blob_bytes(p->pSegments); *pnBlob = nByte; if( paBlob ){ - char *aByte = sqlite3_malloc(nByte + FTS3_NODE_PADDING); + char *aByte = sqlite3_malloc64((i64)nByte + FTS3_NODE_PADDING); if( !aByte ){ rc = SQLITE_NOMEM; }else{ @@ -1339,7 +1339,7 @@ static int fts3SegReaderNext( int nTerm = fts3HashKeysize(pElem); if( (nTerm+1)>pReader->nTermAlloc ){ sqlite3_free(pReader->zTerm); - pReader->zTerm = (char*)sqlite3_malloc((nTerm+1)*2); + pReader->zTerm = (char*)sqlite3_malloc64(((i64)nTerm+1)*2); if( !pReader->zTerm ) return SQLITE_NOMEM; pReader->nTermAlloc = (nTerm+1)*2; } @@ -1347,7 +1347,7 @@ static int fts3SegReaderNext( pReader->zTerm[nTerm] = '\0'; pReader->nTerm = nTerm; - aCopy = (char*)sqlite3_malloc(nCopy); + aCopy = (char*)sqlite3_malloc64(nCopy); if( !aCopy ) return SQLITE_NOMEM; memcpy(aCopy, pList->aData, nCopy); pReader->nNode = pReader->nDoclist = nCopy; @@ -1634,7 +1634,7 @@ int sqlite3Fts3SegReaderNew( nExtra = nRoot + FTS3_NODE_PADDING; } - pReader = (Fts3SegReader *)sqlite3_malloc(sizeof(Fts3SegReader) + nExtra); + pReader = (Fts3SegReader *)sqlite3_malloc64(sizeof(Fts3SegReader) + nExtra); if( !pReader ){ return SQLITE_NOMEM; } @@ -1726,7 +1726,7 @@ int sqlite3Fts3SegReaderPending( if( nElem==nAlloc ){ Fts3HashElem **aElem2; nAlloc += 16; - aElem2 = (Fts3HashElem **)sqlite3_realloc( + aElem2 = (Fts3HashElem **)sqlite3_realloc64( aElem, nAlloc*sizeof(Fts3HashElem *) ); if( !aElem2 ){ @@ -2060,7 +2060,7 @@ static int fts3NodeAddTerm( ** this is not expected to be a serious problem. */ assert( pTree->aData==(char *)&pTree[1] ); - pTree->aData = (char *)sqlite3_malloc(nReq); + pTree->aData = (char *)sqlite3_malloc64(nReq); if( !pTree->aData ){ return SQLITE_NOMEM; } @@ -2078,7 +2078,7 @@ static int fts3NodeAddTerm( if( isCopyTerm ){ if( pTree->nMalloczMalloc, nTerm*2); + char *zNew = sqlite3_realloc64(pTree->zMalloc, (i64)nTerm*2); if( !zNew ){ return SQLITE_NOMEM; } @@ -2104,7 +2104,7 @@ static int fts3NodeAddTerm( ** now. Instead, the term is inserted into the parent of pTree. If pTree ** has no parent, one is created here. */ - pNew = (SegmentNode *)sqlite3_malloc(sizeof(SegmentNode) + p->nNodeSize); + pNew = (SegmentNode *)sqlite3_malloc64(sizeof(SegmentNode) + p->nNodeSize); if( !pNew ){ return SQLITE_NOMEM; } @@ -2242,7 +2242,7 @@ static int fts3SegWriterAdd( ){ int nPrefix; /* Size of term prefix in bytes */ int nSuffix; /* Size of term suffix in bytes */ - int nReq; /* Number of bytes required on leaf page */ + i64 nReq; /* Number of bytes required on leaf page */ int nData; SegmentWriter *pWriter = *ppWriter; @@ -2251,13 +2251,13 @@ static int fts3SegWriterAdd( sqlite3_stmt *pStmt; /* Allocate the SegmentWriter structure */ - pWriter = (SegmentWriter *)sqlite3_malloc(sizeof(SegmentWriter)); + pWriter = (SegmentWriter *)sqlite3_malloc64(sizeof(SegmentWriter)); if( !pWriter ) return SQLITE_NOMEM; memset(pWriter, 0, sizeof(SegmentWriter)); *ppWriter = pWriter; /* Allocate a buffer in which to accumulate data */ - pWriter->aData = (char *)sqlite3_malloc(p->nNodeSize); + pWriter->aData = (char *)sqlite3_malloc64(p->nNodeSize); if( !pWriter->aData ) return SQLITE_NOMEM; pWriter->nSize = p->nNodeSize; @@ -2332,7 +2332,7 @@ static int fts3SegWriterAdd( ** the buffer to make it large enough. */ if( nReq>pWriter->nSize ){ - char *aNew = sqlite3_realloc(pWriter->aData, nReq); + char *aNew = sqlite3_realloc64(pWriter->aData, nReq); if( !aNew ) return SQLITE_NOMEM; pWriter->aData = aNew; pWriter->nSize = nReq; @@ -2357,7 +2357,7 @@ static int fts3SegWriterAdd( */ if( isCopyTerm ){ if( nTerm>pWriter->nMalloc ){ - char *zNew = sqlite3_realloc(pWriter->zMalloc, nTerm*2); + char *zNew = sqlite3_realloc64(pWriter->zMalloc, (i64)nTerm*2); if( !zNew ){ return SQLITE_NOMEM; } @@ -2665,12 +2665,12 @@ static void fts3ColumnFilter( static int fts3MsrBufferData( Fts3MultiSegReader *pMsr, /* Multi-segment-reader handle */ char *pList, - int nList + i64 nList ){ if( nList>pMsr->nBuffer ){ char *pNew; pMsr->nBuffer = nList*2; - pNew = (char *)sqlite3_realloc(pMsr->aBuffer, pMsr->nBuffer); + pNew = (char *)sqlite3_realloc64(pMsr->aBuffer, pMsr->nBuffer); if( !pNew ) return SQLITE_NOMEM; pMsr->aBuffer = pNew; } @@ -2726,7 +2726,7 @@ int sqlite3Fts3MsrIncrNext( fts3SegReaderSort(pMsr->apSegment, nMerge, j, xCmp); if( nList>0 && fts3SegReaderIsPending(apSegment[0]) ){ - rc = fts3MsrBufferData(pMsr, pList, nList+1); + rc = fts3MsrBufferData(pMsr, pList, (i64)nList+1); if( rc!=SQLITE_OK ) return rc; assert( (pMsr->aBuffer[nList] & 0xFE)==0x00 ); pList = pMsr->aBuffer; @@ -2863,11 +2863,11 @@ int sqlite3Fts3MsrIncrRestart(Fts3MultiSegReader *pCsr){ return SQLITE_OK; } -static int fts3GrowSegReaderBuffer(Fts3MultiSegReader *pCsr, int nReq){ +static int fts3GrowSegReaderBuffer(Fts3MultiSegReader *pCsr, i64 nReq){ if( nReq>pCsr->nBuffer ){ char *aNew; pCsr->nBuffer = nReq*2; - aNew = sqlite3_realloc(pCsr->aBuffer, pCsr->nBuffer); + aNew = sqlite3_realloc64(pCsr->aBuffer, pCsr->nBuffer); if( !aNew ){ return SQLITE_NOMEM; } @@ -2958,7 +2958,8 @@ int sqlite3Fts3SegReaderStep( ){ pCsr->nDoclist = apSegment[0]->nDoclist; if( fts3SegReaderIsPending(apSegment[0]) ){ - rc = fts3MsrBufferData(pCsr, apSegment[0]->aDoclist, pCsr->nDoclist); + rc = fts3MsrBufferData(pCsr, apSegment[0]->aDoclist, + (i64)pCsr->nDoclist); pCsr->aDoclist = pCsr->aBuffer; }else{ pCsr->aDoclist = apSegment[0]->aDoclist; @@ -3011,7 +3012,8 @@ int sqlite3Fts3SegReaderStep( nByte = sqlite3Fts3VarintLen(iDelta) + (isRequirePos?nList+1:0); - rc = fts3GrowSegReaderBuffer(pCsr, nByte+nDoclist+FTS3_NODE_PADDING); + rc = fts3GrowSegReaderBuffer(pCsr, + (i64)nByte+nDoclist+FTS3_NODE_PADDING); if( rc ) return rc; if( isFirst ){ @@ -3037,7 +3039,7 @@ int sqlite3Fts3SegReaderStep( fts3SegReaderSort(apSegment, nMerge, j, xCmp); } if( nDoclist>0 ){ - rc = fts3GrowSegReaderBuffer(pCsr, nDoclist+FTS3_NODE_PADDING); + rc = fts3GrowSegReaderBuffer(pCsr, (i64)nDoclist+FTS3_NODE_PADDING); if( rc ) return rc; memset(&pCsr->aBuffer[nDoclist], 0, FTS3_NODE_PADDING); pCsr->aDoclist = pCsr->aBuffer; @@ -3750,7 +3752,7 @@ struct NodeReader { static void blobGrowBuffer(Blob *pBlob, int nMin, int *pRc){ if( *pRc==SQLITE_OK && nMin>pBlob->nAlloc ){ int nAlloc = nMin; - char *a = (char *)sqlite3_realloc(pBlob->a, nAlloc); + char *a = (char *)sqlite3_realloc64(pBlob->a, nAlloc); if( a ){ pBlob->nAlloc = nAlloc; pBlob->a = a; @@ -4547,7 +4549,7 @@ static int fts3RepackSegdirLevel( if( nIdx>=nAlloc ){ int *aNew; nAlloc += 16; - aNew = sqlite3_realloc(aIdx, nAlloc*sizeof(int)); + aNew = sqlite3_realloc64(aIdx, nAlloc*sizeof(int)); if( !aNew ){ rc = SQLITE_NOMEM; break; @@ -4921,7 +4923,7 @@ int sqlite3Fts3Incrmerge(Fts3Table *p, int nMerge, int nMin){ /* Allocate space for the cursor, filter and writer objects */ const int nAlloc = sizeof(*pCsr) + sizeof(*pFilter) + sizeof(*pWriter); - pWriter = (IncrmergeWriter *)sqlite3_malloc(nAlloc); + pWriter = (IncrmergeWriter *)sqlite3_malloc64(nAlloc); if( !pWriter ) return SQLITE_NOMEM; pFilter = (Fts3SegFilter *)&pWriter[1]; pCsr = (Fts3MultiSegReader *)&pFilter[1]; @@ -5557,7 +5559,7 @@ int sqlite3Fts3DeferredTokenList( return SQLITE_OK; } - pRet = (char *)sqlite3_malloc(p->pList->nData); + pRet = (char *)sqlite3_malloc64(p->pList->nData); if( !pRet ) return SQLITE_NOMEM; nSkip = sqlite3Fts3GetVarint(p->pList->aData, &dummy); @@ -5577,7 +5579,7 @@ int sqlite3Fts3DeferToken( int iCol /* Column that token must appear in (or -1) */ ){ Fts3DeferredToken *pDeferred; - pDeferred = sqlite3_malloc(sizeof(*pDeferred)); + pDeferred = sqlite3_malloc64(sizeof(*pDeferred)); if( !pDeferred ){ return SQLITE_NOMEM; } diff --git a/manifest b/manifest index 13ee3d046d..b53f299331 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Enhance\sdefensive\smode\sso\sthat\sit\sdisallows\sCREATE\sTRIGGER\sstatements\sif\sthe\nstatements\swithin\sthe\strigger\sattempt\sto\swrite\son\sa\sshadow\stable. -D 2022-09-27T00:56:45.695 +C Make\sthe\slegacy\sFTS3\scode\smore\srobust\sagainst\sinteger\soverflow\sduring\nmemory\sallocation. +D 2022-09-27T01:53:05.111 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724 @@ -85,25 +85,25 @@ 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 b20bd583991e740c1e14371896f3ab61d7b6c033740646366bbf6667191bc4e2 +F ext/fts3/fts3.c 46c116ee0868fc09520d61a1b747c62343c71c399ba67a3d0395b0be29b1a19f F ext/fts3/fts3.h 3a10a0af180d502cecc50df77b1b22df142817fe -F ext/fts3/fts3Int.h dafdc371f9fbab175744b06cfe019d5f040cdfdbd11fea752f5dc28d45b04c05 +F ext/fts3/fts3Int.h ae2a44b04cddb5fb35cac4ea5f7f819b2894fd258186465777a19f7acfdf84ed F ext/fts3/fts3_aux.c f0dc9bd98582615b7750218899bd0c729879b6bbf94d1be57ca1833ff49afc6f F ext/fts3/fts3_expr.c 903bfb9433109fffb10e910d7066c49cbf8eeae316adc93f0499c4da7dfc932a 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 3565faf04b626cddf85f03825e86056a4562c009 +F ext/fts3/fts3_porter.c e19807ce0ae31c1c6e9898e89ecc93183d7ec224ea101af039722a4f49e5f2b8 F ext/fts3/fts3_snippet.c f9a8149173553113f3c495a503843e30028b5dc3723d0ca798c5ad6142e130e6 F ext/fts3/fts3_term.c f45a1e7c6ef464abb1231245d123dae12266b69e05cc56e14045b76591ae92d1 F ext/fts3/fts3_test.c d8d7b2734f894e8a489987447658e374cdd3a3bc8575c401decf1911cb7c6454 F ext/fts3/fts3_tokenize_vtab.c a95feda3590f3c3e17672fe35b67ea6112471aeea4c07ef7744a6606b66549aa F ext/fts3/fts3_tokenizer.c 6d8fc150c48238955d5182bf661498db0dd473c8a2a80e00c16994a646fa96e7 F ext/fts3/fts3_tokenizer.h 64c6ef6c5272c51ebe60fc607a896e84288fcbc3 -F ext/fts3/fts3_tokenizer1.c 5c98225a53705e5ee34824087478cf477bdb7004 +F ext/fts3/fts3_tokenizer1.c c1de4ae28356ad98ccb8b2e3388a7fdcce7607b5523738c9afb6275dab765154 F ext/fts3/fts3_unicode.c de426ff05c1c2e7bce161cf6b706638419c3a1d9c2667de9cb9dc0458c18e226 F ext/fts3/fts3_unicode2.c 416eb7e1e81142703520d284b768ca2751d40e31fa912cae24ba74860532bf0f -F ext/fts3/fts3_write.c 85279b980f99253c296006503a13f92957ec49b716123083f021acc74545ecfc +F ext/fts3/fts3_write.c 4fb644df0ff840267e47a724286c7a1fa5540273a7ce15756dd5913a101ec302 F ext/fts3/fts3speed.tcl b54caf6a18d38174f1a6e84219950d85e98bb1e9 F ext/fts3/tool/fts3cov.sh c331d006359456cf6f8f953e37f2b9c7d568f3863f00bb5f7eb87fea4ac01b73 F ext/fts3/tool/fts3view.c 413c346399159df81f86c4928b7c4a455caab73bfbc8cd68f950f632e5751674 @@ -2000,8 +2000,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0 -P 38aaf26e082bd95df6b64df43e1772fe6e20c4eb71307dcd97559cac7f11f8f1 -R 554e340d4f04eab8a3212a443865190e +P 3283bbd12a60f472ed03cb7c6209a605a3bf9f3d9083371e17840b56e8b3f559 +R c2acf92513b61a352b2e5251cc26bbac U drh -Z e5d0f4cdaac4fabbf1ccc0e110546353 +Z 2202294fef097d3d8cb84dad0498d44c # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 8a5b305259..69c91054db 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -3283bbd12a60f472ed03cb7c6209a605a3bf9f3d9083371e17840b56e8b3f559 \ No newline at end of file +5517bc50988b5339c2fd071b29de1b5ca03037b0b635c3b112cf7108fab54d5f \ No newline at end of file From 5d48e0cdc5d963776debc4ad70056972b2584f8b Mon Sep 17 00:00:00 2001 From: drh <> Date: Tue, 27 Sep 2022 16:35:06 +0000 Subject: [PATCH 03/18] Provide the SQLITE_MAX_ALLOCATION_SIZE compile-time option for limiting the maximum memory allocation size. FossilOrigin-Name: 584de6a996c78b8e41bdfcd05a8e2a3844664c6b4efedb5883c8b8af388462b5 --- manifest | 12 ++++++------ manifest.uuid | 2 +- src/malloc.c | 28 ++++++++++++++++++++++------ 3 files changed, 29 insertions(+), 13 deletions(-) diff --git a/manifest b/manifest index b53f299331..824eb56c81 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Make\sthe\slegacy\sFTS3\scode\smore\srobust\sagainst\sinteger\soverflow\sduring\nmemory\sallocation. -D 2022-09-27T01:53:05.111 +C Provide\sthe\sSQLITE_MAX_ALLOCATION_SIZE\scompile-time\soption\sfor\slimiting\sthe\nmaximum\smemory\sallocation\ssize. +D 2022-09-27T16:35:06.221 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724 @@ -553,7 +553,7 @@ F src/json.c 7749b98c62f691697c7ee536b570c744c0583cab4a89200fdd0fc2aa8cc8cbd6 F src/legacy.c d7874bc885906868cd51e6c2156698f2754f02d9eee1bae2d687323c3ca8e5aa F src/loadext.c 853385cc7a604157e137585097949252d5d0c731768e16b044608e5c95c3614b F src/main.c 8983b4a316d7e09946dd731913aa41712f02e2b55cb5c6c92126ccfe2473244a -F src/malloc.c b7a3430cbe91d3e8e04fc10c2041b3a19794e63556ad2441a13d8dadd9b2bafc +F src/malloc.c dfddca1e163496c0a10250cedeafaf56dff47673e0f15888fb0925340a8e3f90 F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645 F src/mem1.c c12a42539b1ba105e3707d0e628ad70e611040d8f5e38cf942cee30c867083de F src/mem2.c c8bfc9446fd0798bddd495eb5d9dbafa7d4b7287d8c22d50a83ac9daa26d8a75 @@ -2000,8 +2000,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0 -P 3283bbd12a60f472ed03cb7c6209a605a3bf9f3d9083371e17840b56e8b3f559 -R c2acf92513b61a352b2e5251cc26bbac +P 5517bc50988b5339c2fd071b29de1b5ca03037b0b635c3b112cf7108fab54d5f +R d334d68f4ee6840cbb06511749063d29 U drh -Z 2202294fef097d3d8cb84dad0498d44c +Z 739e270ad16b7bf5c87cbcd809fe00c5 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 69c91054db..a06b3b3074 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -5517bc50988b5339c2fd071b29de1b5ca03037b0b635c3b112cf7108fab54d5f \ No newline at end of file +584de6a996c78b8e41bdfcd05a8e2a3844664c6b4efedb5883c8b8af388462b5 \ No newline at end of file diff --git a/src/malloc.c b/src/malloc.c index 3fcedf8a37..af83743fc0 100644 --- a/src/malloc.c +++ b/src/malloc.c @@ -270,18 +270,34 @@ static void mallocWithAlarm(int n, void **pp){ *pp = p; } +/* +** Maximum size of any single memory allocation. +** +** This is not a limit on the total amount of memory used. This is +** a limit on the size parameter to sqlite3_malloc() and sqlite3_realloc(). +** +** The upper bound is slightly less than 2GiB: 0x7ffffeff == 2,147,483,391 +** This provides a 256-byte safety margin for defense against 32-bit +** signed integer overflow bugs when computing memory allocation sizes. +** Parnoid applications might want to reduce the maximum allocation size +** further for an even larger safety margin. 0x3fffffff or 0x0fffffff +** or even smaller would be reasonable upper bounds on the size of a memory +** allocations for most applications. +*/ +#ifndef SQLITE_MAX_ALLOCATION_SIZE +# define SQLITE_MAX_ALLOCATION_SIZE 2147483391 +#endif +#if SQLITE_MAX_ALLOCATION_SIZE>2147483391 +# error Maximum size for SQLITE_MAX_ALLOCATION_SIZE is 2147483391 +#endif + /* ** Allocate memory. This routine is like sqlite3_malloc() except that it ** assumes the memory subsystem has already been initialized. */ void *sqlite3Malloc(u64 n){ void *p; - if( n==0 || n>=0x7fffff00 ){ - /* A memory allocation of a number of bytes which is near the maximum - ** signed integer value might cause an integer overflow inside of the - ** xMalloc(). Hence we limit the maximum size to 0x7fffff00, giving - ** 255 bytes of overhead. SQLite itself will never use anything near - ** this amount. The only way to reach the limit is with sqlite3_malloc() */ + if( n==0 || n>SQLITE_MAX_ALLOCATION_SIZE ){ p = 0; }else if( sqlite3GlobalConfig.bMemstat ){ sqlite3_mutex_enter(mem0.mutex); From 31474ce57e104640537ebf04a25335441b3442c0 Mon Sep 17 00:00:00 2001 From: drh <> Date: Wed, 28 Sep 2022 19:14:01 +0000 Subject: [PATCH 04/18] Fix misuse of the sqlite3_set_auxdata() interface in the ICU extension. FossilOrigin-Name: f25cf63471cbed1edb27591e57fead62550d4046dbdcb61312288f0f6f24c646 --- ext/icu/icu.c | 5 +++-- manifest | 12 ++++++------ manifest.uuid | 2 +- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/ext/icu/icu.c b/ext/icu/icu.c index 92d7c5438e..e745ab0253 100644 --- a/ext/icu/icu.c +++ b/ext/icu/icu.c @@ -299,8 +299,9 @@ static void icuRegexpFunc(sqlite3_context *p, int nArg, sqlite3_value **apArg){ if( U_SUCCESS(status) ){ sqlite3_set_auxdata(p, 0, pExpr, icuRegexpDelete); - }else{ - assert(!pExpr); + pExpr = sqlite3_get_auxdata(p, 0); + } + if( !pExpr ){ icuFunctionError(p, "uregex_open", status); return; } diff --git a/manifest b/manifest index 824eb56c81..62a60b44d4 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Provide\sthe\sSQLITE_MAX_ALLOCATION_SIZE\scompile-time\soption\sfor\slimiting\sthe\nmaximum\smemory\sallocation\ssize. -D 2022-09-27T16:35:06.221 +C Fix\smisuse\sof\sthe\ssqlite3_set_auxdata()\sinterface\sin\sthe\sICU\sextension. +D 2022-09-28T19:14:01.801 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724 @@ -239,7 +239,7 @@ F ext/fts5/tool/loadfts5.tcl 95b03429ee6b138645703c6ca192c3ac96eaf093 F ext/fts5/tool/mkfts5c.tcl 3eba8e9bee4221ed165f3304b51b2a74a705f4ec5df3d044573a2be539534af8 F ext/fts5/tool/showfts5.tcl d54da0e067306663e2d5d523965ca487698e722c F ext/icu/README.txt 7ab7ced8ae78e3a645b57e78570ff589d4c672b71370f5aa9e1cd7024f400fc9 -F ext/icu/icu.c 91c021c7e3e8bbba286960810fa303295c622e323567b2e6def4ce58e4466e60 +F ext/icu/icu.c c074519b46baa484bb5396c7e01e051034da8884bad1a1cb7f09bbe6be3f0282 F ext/icu/sqliteicu.h fa373836ed5a1ee7478bdf8a1650689294e41d0c89c1daab26e9ae78a32075a8 F ext/lsm1/Makefile a553b728bba6c11201b795188c5708915cc4290f02b7df6ba7e8c4c943fd5cd9 F ext/lsm1/Makefile.msc f8c878b467232226de288da320e1ac71c131f5ec91e08b21f502303347260013 @@ -2000,8 +2000,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0 -P 5517bc50988b5339c2fd071b29de1b5ca03037b0b635c3b112cf7108fab54d5f -R d334d68f4ee6840cbb06511749063d29 +P 584de6a996c78b8e41bdfcd05a8e2a3844664c6b4efedb5883c8b8af388462b5 +R d79b3651cd76ebe372f6bfce59942639 U drh -Z 739e270ad16b7bf5c87cbcd809fe00c5 +Z 79f3fdc2db5301812c92ae8ca64cb084 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index a06b3b3074..7c940e14ae 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -584de6a996c78b8e41bdfcd05a8e2a3844664c6b4efedb5883c8b8af388462b5 \ No newline at end of file +f25cf63471cbed1edb27591e57fead62550d4046dbdcb61312288f0f6f24c646 \ No newline at end of file From cb57716c6537b65faf302461b2cb06b1c5a07a3a Mon Sep 17 00:00:00 2001 From: drh <> Date: Fri, 30 Sep 2022 14:35:18 +0000 Subject: [PATCH 05/18] Improvements to the "demoDelete" method in the demovfs, suggested by [forum:/forumpost/cad18961c2|forum post cad18961c2]. FossilOrigin-Name: d76a301e22e0572262917dfe9557a5051339a65416a473dd2d9989a49975403e --- manifest | 12 ++++++------ manifest.uuid | 2 +- src/test_demovfs.c | 22 ++++++++++++---------- 3 files changed, 19 insertions(+), 17 deletions(-) diff --git a/manifest b/manifest index 62a60b44d4..d586c46b1e 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Fix\smisuse\sof\sthe\ssqlite3_set_auxdata()\sinterface\sin\sthe\sICU\sextension. -D 2022-09-28T19:14:01.801 +C Improvements\sto\sthe\s"demoDelete"\smethod\sin\sthe\sdemovfs,\ssuggested\sby\n[forum:/forumpost/cad18961c2|forum\spost\scad18961c2]. +D 2022-09-30T14:35:18.306 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724 @@ -615,7 +615,7 @@ F src/test_blob.c ae4a0620b478548afb67963095a7417cd06a4ec0a56adb453542203bfdcb31 F src/test_btree.c 8b2dc8b8848cf3a4db93f11578f075e82252a274 F src/test_config.c 8264637b06a3c1f0727c88d1ea32dcf7986b9e7e358a970cae87cdac8a5b2708 F src/test_delete.c e2fe07646dff6300b48d49b2fee2fe192ed389e834dd635e3b3bac0ce0bf9f8f -F src/test_demovfs.c 86142ba864d4297d54c5b2e972e74f3141ae4b30f05b3a95824184ed2d3d7f91 +F src/test_demovfs.c 7b3be8cdf07d00f025309fbb2453cb5f0fd9ed74f40543c7f4353dcac2879aa7 F src/test_devsym.c aff2255ea290d7718da08af30cdf18e470ff7325a5eff63e0057b1496ed66593 F src/test_fs.c ba1e1dc18fd3159fdba0b9c4256f14032159785320dfbd6776eb9973cb75d480 F src/test_func.c 24df3a346c012b1fc9e1001d346db6054deb426db0a7437e92490630e71c9b0a @@ -2000,8 +2000,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0 -P 584de6a996c78b8e41bdfcd05a8e2a3844664c6b4efedb5883c8b8af388462b5 -R d79b3651cd76ebe372f6bfce59942639 +P f25cf63471cbed1edb27591e57fead62550d4046dbdcb61312288f0f6f24c646 +R 1d883d051102da05e54bf9f370b714ba U drh -Z 79f3fdc2db5301812c92ae8ca64cb084 +Z fa066d9d8da6a5ee78227c4b8bbd23f3 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 7c940e14ae..aab65d7179 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -f25cf63471cbed1edb27591e57fead62550d4046dbdcb61312288f0f6f24c646 \ No newline at end of file +d76a301e22e0572262917dfe9557a5051339a65416a473dd2d9989a49975403e \ No newline at end of file diff --git a/src/test_demovfs.c b/src/test_demovfs.c index eaba208732..49f2814464 100644 --- a/src/test_demovfs.c +++ b/src/test_demovfs.c @@ -462,21 +462,23 @@ static int demoDelete(sqlite3_vfs *pVfs, const char *zPath, int dirSync){ if( rc==0 && dirSync ){ int dfd; /* File descriptor open on directory */ int i; /* Iterator variable */ + char *zSlash; char zDir[MAXPATHNAME+1]; /* Name of directory containing file zPath */ /* Figure out the directory name from the path of the file deleted. */ sqlite3_snprintf(MAXPATHNAME, zDir, "%s", zPath); zDir[MAXPATHNAME] = '\0'; - for(i=strlen(zDir); i>1 && zDir[i]!='/'; i++); - zDir[i] = '\0'; - - /* Open a file-descriptor on the directory. Sync. Close. */ - dfd = open(zDir, O_RDONLY, 0); - if( dfd<0 ){ - rc = -1; - }else{ - rc = fsync(dfd); - close(dfd); + zSlash = strrchr(zPath,'/'); + if( zSlash ){ + /* Open a file-descriptor on the directory. Sync. Close. */ + zSlash[0] = 0; + dfd = open(zDir, O_RDONLY, 0); + if( dfd<0 ){ + rc = -1; + }else{ + rc = fsync(dfd); + close(dfd); + } } } return (rc==0 ? SQLITE_OK : SQLITE_IOERR_DELETE); From ad658b2d829b64767c8fc776865237af7f6e45d0 Mon Sep 17 00:00:00 2001 From: dan Date: Fri, 30 Sep 2022 20:15:21 +0000 Subject: [PATCH 06/18] Better handle a case of database corruption where a b-tree page is one of its own ancestor pages. FossilOrigin-Name: a24e46804893a7e6e8f3130abca882f9a3aa3b7b2b82aa39a0a20856172766d5 --- manifest | 14 +++++++------- manifest.uuid | 2 +- src/btree.c | 5 +++++ 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/manifest b/manifest index d586c46b1e..b8f140f6ee 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Improvements\sto\sthe\s"demoDelete"\smethod\sin\sthe\sdemovfs,\ssuggested\sby\n[forum:/forumpost/cad18961c2|forum\spost\scad18961c2]. -D 2022-09-30T14:35:18.306 +C Better\shandle\sa\scase\sof\sdatabase\scorruption\swhere\sa\sb-tree\spage\sis\sone\sof\sits\sown\sancestor\spages. +D 2022-09-30T20:15:21.312 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724 @@ -528,7 +528,7 @@ F src/auth.c f4fa91b6a90bbc8e0d0f738aa284551739c9543a367071f55574681e0f24f8cf F src/backup.c a2891172438e385fdbe97c11c9745676bec54f518d4447090af97189fd8e52d7 F src/bitvec.c 7c849aac407230278445cb069bebc5f89bf2ddd87c5ed9459b070a9175707b3d F src/btmutex.c 6ffb0a22c19e2f9110be0964d0731d2ef1c67b5f7fabfbaeb7b9dabc4b7740ca -F src/btree.c aad3381b25b0aa56838b35f86fbae9fb10ab8670ba130b413e6e3652cb732d74 +F src/btree.c ba16b9cfcf3579f7de3210e0432460db5489ed38e87938fc8b344e8d6c35693f F src/btree.h 74d64b8f28cfa4a894d14d4ed64fa432cd697b98b61708d4351482ae15913e22 F src/btreeInt.h 8ce1332edd89dfd2461d561ac10a0ab5601c8e06200cb5230596c3caaf54482e F src/build.c 898884afd67d953808cb687babc15b66a10213f99fe2ce7db98960e959881f98 @@ -2000,8 +2000,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0 -P f25cf63471cbed1edb27591e57fead62550d4046dbdcb61312288f0f6f24c646 -R 1d883d051102da05e54bf9f370b714ba -U drh -Z fa066d9d8da6a5ee78227c4b8bbd23f3 +P d76a301e22e0572262917dfe9557a5051339a65416a473dd2d9989a49975403e +R e8314eb757cc4ada0bb75e65c98de883 +U dan +Z 158277225d44d067719ed83df0eaf966 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index aab65d7179..49ca832c03 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -d76a301e22e0572262917dfe9557a5051339a65416a473dd2d9989a49975403e \ No newline at end of file +a24e46804893a7e6e8f3130abca882f9a3aa3b7b2b82aa39a0a20856172766d5 \ No newline at end of file diff --git a/src/btree.c b/src/btree.c index a08ed95d14..6dc92a950e 100644 --- a/src/btree.c +++ b/src/btree.c @@ -8774,6 +8774,11 @@ static int balance(BtCursor *pCur){ }else{ break; } + }else if( sqlite3PagerPageRefcount(pPage->pDbPage)>1 ){ + /* The page being written is not a root page, and there is currently + ** more than one reference to it. This only happens if the page is one + ** of its own ancestor pages. Corruption. */ + rc = SQLITE_CORRUPT_BKPT; }else{ MemPage * const pParent = pCur->apPage[iPage-1]; int const iIdx = pCur->aiIdx[iPage-1]; From 0a803bd984e7a24451c1bf33fae5c71eec41e052 Mon Sep 17 00:00:00 2001 From: drh <> Date: Fri, 30 Sep 2022 20:48:22 +0000 Subject: [PATCH 07/18] Add NEVER() to two error-detection tests that were made unreachable by the previous check-in. FossilOrigin-Name: 5166acf3f00404597e77910aee88920ab833af8447766f50bf4f70525606cf95 --- manifest | 14 +++++++------- manifest.uuid | 2 +- src/btree.c | 11 ++--------- 3 files changed, 10 insertions(+), 17 deletions(-) diff --git a/manifest b/manifest index b8f140f6ee..184fbf3db6 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Better\shandle\sa\scase\sof\sdatabase\scorruption\swhere\sa\sb-tree\spage\sis\sone\sof\sits\sown\sancestor\spages. -D 2022-09-30T20:15:21.312 +C Add\sNEVER()\sto\stwo\serror-detection\stests\sthat\swere\smade\sunreachable\sby\nthe\sprevious\scheck-in. +D 2022-09-30T20:48:22.942 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724 @@ -528,7 +528,7 @@ F src/auth.c f4fa91b6a90bbc8e0d0f738aa284551739c9543a367071f55574681e0f24f8cf F src/backup.c a2891172438e385fdbe97c11c9745676bec54f518d4447090af97189fd8e52d7 F src/bitvec.c 7c849aac407230278445cb069bebc5f89bf2ddd87c5ed9459b070a9175707b3d F src/btmutex.c 6ffb0a22c19e2f9110be0964d0731d2ef1c67b5f7fabfbaeb7b9dabc4b7740ca -F src/btree.c ba16b9cfcf3579f7de3210e0432460db5489ed38e87938fc8b344e8d6c35693f +F src/btree.c 9c1aa101325abca2e7f1e5c24eee990cead2183d0b793db1199d4a57b0be6315 F src/btree.h 74d64b8f28cfa4a894d14d4ed64fa432cd697b98b61708d4351482ae15913e22 F src/btreeInt.h 8ce1332edd89dfd2461d561ac10a0ab5601c8e06200cb5230596c3caaf54482e F src/build.c 898884afd67d953808cb687babc15b66a10213f99fe2ce7db98960e959881f98 @@ -2000,8 +2000,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0 -P d76a301e22e0572262917dfe9557a5051339a65416a473dd2d9989a49975403e -R e8314eb757cc4ada0bb75e65c98de883 -U dan -Z 158277225d44d067719ed83df0eaf966 +P a24e46804893a7e6e8f3130abca882f9a3aa3b7b2b82aa39a0a20856172766d5 +R 8bfaaa610b5d0f34ae8d80b099fa1f85 +U drh +Z 2f23c91e3b0fb20186493d1c2a872ed4 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 49ca832c03..76127b97a2 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -a24e46804893a7e6e8f3130abca882f9a3aa3b7b2b82aa39a0a20856172766d5 \ No newline at end of file +5166acf3f00404597e77910aee88920ab833af8447766f50bf4f70525606cf95 \ No newline at end of file diff --git a/src/btree.c b/src/btree.c index 6dc92a950e..e1696b9bfb 100644 --- a/src/btree.c +++ b/src/btree.c @@ -4954,7 +4954,7 @@ static int accessPayload( assert( pPage ); assert( eOp==0 || eOp==1 ); assert( pCur->eState==CURSOR_VALID ); - if( pCur->ix>=pPage->nCell ){ + if( NEVER(pCur->ix>=pPage->nCell) ){ return SQLITE_CORRUPT_PAGE(pPage); } assert( cursorHoldsMutex(pCur) ); @@ -6077,14 +6077,7 @@ static SQLITE_NOINLINE int btreeNext(BtCursor *pCur){ pPage = pCur->pPage; idx = ++pCur->ix; - if( !pPage->isInit || sqlite3FaultSim(412) ){ - /* The only known way for this to happen is for there to be a - ** recursive SQL function that does a DELETE operation as part of a - ** SELECT which deletes content out from under an active cursor - ** in a corrupt database file where the table being DELETE-ed from - ** has pages in common with the table being queried. See TH3 - ** module cov1/btree78.test testcase 220 (2018-06-08) for an - ** example. */ + if( NEVER(!pPage->isInit) || sqlite3FaultSim(412) ){ return SQLITE_CORRUPT_BKPT; } From 2d3261fe86fe44db2e5c7c1b2c2c9a1631f4a6c3 Mon Sep 17 00:00:00 2001 From: drh <> Date: Fri, 30 Sep 2022 20:53:36 +0000 Subject: [PATCH 08/18] Fix a bug in the demoDelete fix from [d76a301e22e05722]. FossilOrigin-Name: 7e761a02530ffbb055a766eb6c995f11fc2adbabb9a52502124f672fdcff0d10 --- manifest | 12 ++++++------ manifest.uuid | 2 +- src/test_demovfs.c | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/manifest b/manifest index 184fbf3db6..6bb1c440b2 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Add\sNEVER()\sto\stwo\serror-detection\stests\sthat\swere\smade\sunreachable\sby\nthe\sprevious\scheck-in. -D 2022-09-30T20:48:22.942 +C Fix\sa\sbug\sin\sthe\sdemoDelete\sfix\sfrom\s[d76a301e22e05722]. +D 2022-09-30T20:53:36.120 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724 @@ -615,7 +615,7 @@ F src/test_blob.c ae4a0620b478548afb67963095a7417cd06a4ec0a56adb453542203bfdcb31 F src/test_btree.c 8b2dc8b8848cf3a4db93f11578f075e82252a274 F src/test_config.c 8264637b06a3c1f0727c88d1ea32dcf7986b9e7e358a970cae87cdac8a5b2708 F src/test_delete.c e2fe07646dff6300b48d49b2fee2fe192ed389e834dd635e3b3bac0ce0bf9f8f -F src/test_demovfs.c 7b3be8cdf07d00f025309fbb2453cb5f0fd9ed74f40543c7f4353dcac2879aa7 +F src/test_demovfs.c 7cc7623d1025d1e92c51da20fd25060759733b7a356a121545a3b7d2faa8a0f1 F src/test_devsym.c aff2255ea290d7718da08af30cdf18e470ff7325a5eff63e0057b1496ed66593 F src/test_fs.c ba1e1dc18fd3159fdba0b9c4256f14032159785320dfbd6776eb9973cb75d480 F src/test_func.c 24df3a346c012b1fc9e1001d346db6054deb426db0a7437e92490630e71c9b0a @@ -2000,8 +2000,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0 -P a24e46804893a7e6e8f3130abca882f9a3aa3b7b2b82aa39a0a20856172766d5 -R 8bfaaa610b5d0f34ae8d80b099fa1f85 +P 5166acf3f00404597e77910aee88920ab833af8447766f50bf4f70525606cf95 +R 6c12ece1941670ef2f49e367d800c0c1 U drh -Z 2f23c91e3b0fb20186493d1c2a872ed4 +Z 385aaa082b1d75a68fdcc7e487d480fa # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 76127b97a2..a127fb8b80 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -5166acf3f00404597e77910aee88920ab833af8447766f50bf4f70525606cf95 \ No newline at end of file +7e761a02530ffbb055a766eb6c995f11fc2adbabb9a52502124f672fdcff0d10 \ No newline at end of file diff --git a/src/test_demovfs.c b/src/test_demovfs.c index 49f2814464..29307675bd 100644 --- a/src/test_demovfs.c +++ b/src/test_demovfs.c @@ -468,7 +468,7 @@ static int demoDelete(sqlite3_vfs *pVfs, const char *zPath, int dirSync){ /* Figure out the directory name from the path of the file deleted. */ sqlite3_snprintf(MAXPATHNAME, zDir, "%s", zPath); zDir[MAXPATHNAME] = '\0'; - zSlash = strrchr(zPath,'/'); + zSlash = strrchr(zDir,'/'); if( zSlash ){ /* Open a file-descriptor on the directory. Sync. Close. */ zSlash[0] = 0; From 1337a2291dae22b42431204f4b8fb06f30b7afbe Mon Sep 17 00:00:00 2001 From: drh <> Date: Fri, 30 Sep 2022 20:59:09 +0000 Subject: [PATCH 09/18] New test cases in fuzzdata8.db FossilOrigin-Name: aa367a3c974041323edb759855f0b83803439ceef2846da2d73eadd80efeaac4 --- manifest | 12 ++++++------ manifest.uuid | 2 +- test/fuzzdata8.db | Bin 3283968 -> 3293184 bytes 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/manifest b/manifest index 6bb1c440b2..cbdfaad8cb 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Fix\sa\sbug\sin\sthe\sdemoDelete\sfix\sfrom\s[d76a301e22e05722]. -D 2022-09-30T20:53:36.120 +C New\stest\scases\sin\sfuzzdata8.db +D 2022-09-30T20:59:09.967 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724 @@ -1112,7 +1112,7 @@ F test/fuzzdata4.db b502c7d5498261715812dd8b3c2005bad08b3a26e6489414bd13926cd3e4 F test/fuzzdata5.db e35f64af17ec48926481cfaf3b3855e436bd40d1cfe2d59a9474cb4b748a52a5 F test/fuzzdata6.db 92a80e4afc172c24f662a10a612d188fb272de4a9bd19e017927c95f737de6d7 F test/fuzzdata7.db 0166b56fd7a6b9636a1d60ef0a060f86ddaecf99400a666bb6e5bbd7199ad1f2 -F test/fuzzdata8.db ca9a97f401b06b0d5376139ec7e1f9e773e13345a9a2d9ccc0032cdbfedea230 +F test/fuzzdata8.db 652953c44494e176b9cbf8e37eb020e69fdd2395114fb1554377be328c08ff0e F test/fuzzer1.test 3d4c4b7e547aba5e5511a2991e3e3d07166cfbb8 F test/fuzzer2.test a85ef814ce071293bce1ad8dffa217cbbaad4c14 F test/fuzzerfault.test f64c4aef4c9e9edf1d6dc0d3f1e65dcc81e67c996403c88d14f09b74807a42bc @@ -2000,8 +2000,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0 -P 5166acf3f00404597e77910aee88920ab833af8447766f50bf4f70525606cf95 -R 6c12ece1941670ef2f49e367d800c0c1 +P 7e761a02530ffbb055a766eb6c995f11fc2adbabb9a52502124f672fdcff0d10 +R 2ed590521c06c3e3aa9ca21e94c7fcbe U drh -Z 385aaa082b1d75a68fdcc7e487d480fa +Z f5898bf6ec0ce9d69f912d0173ce9ebb # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index a127fb8b80..8438e6741c 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -7e761a02530ffbb055a766eb6c995f11fc2adbabb9a52502124f672fdcff0d10 \ No newline at end of file +aa367a3c974041323edb759855f0b83803439ceef2846da2d73eadd80efeaac4 \ No newline at end of file diff --git a/test/fuzzdata8.db b/test/fuzzdata8.db index de7799f945f521444c9788aa2f933692ca84a6ba..7e8649c3266a62e60c94cafbc1a9ac181ac37a87 100644 GIT binary patch delta 9423 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 E0anY1KL7v# delta 7625 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 Date: Fri, 30 Sep 2022 22:40:57 +0000 Subject: [PATCH 10/18] Remove one of the NEVER() macros added by [5166acf3f0040459] because it is reachable after all. FossilOrigin-Name: bd8ae5febbb8d3122f1e2e09b9fcdd6ac20c075ae1cf60bcdbd36080f3736417 --- manifest | 14 +++++++------- manifest.uuid | 2 +- src/btree.c | 2 +- test/fuzzdata8.db | Bin 3293184 -> 3298304 bytes 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/manifest b/manifest index cbdfaad8cb..29aa8d8ae2 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C New\stest\scases\sin\sfuzzdata8.db -D 2022-09-30T20:59:09.967 +C Remove\sone\sof\sthe\sNEVER()\smacros\sadded\sby\s[5166acf3f0040459]\sbecause\sit\nis\sreachable\safter\sall. +D 2022-09-30T22:40:57.814 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724 @@ -528,7 +528,7 @@ F src/auth.c f4fa91b6a90bbc8e0d0f738aa284551739c9543a367071f55574681e0f24f8cf F src/backup.c a2891172438e385fdbe97c11c9745676bec54f518d4447090af97189fd8e52d7 F src/bitvec.c 7c849aac407230278445cb069bebc5f89bf2ddd87c5ed9459b070a9175707b3d F src/btmutex.c 6ffb0a22c19e2f9110be0964d0731d2ef1c67b5f7fabfbaeb7b9dabc4b7740ca -F src/btree.c 9c1aa101325abca2e7f1e5c24eee990cead2183d0b793db1199d4a57b0be6315 +F src/btree.c ef9c126d6dc5dff8ff76abc807dfef5b8aac42144e3be11cbcd9cb6eaecef580 F src/btree.h 74d64b8f28cfa4a894d14d4ed64fa432cd697b98b61708d4351482ae15913e22 F src/btreeInt.h 8ce1332edd89dfd2461d561ac10a0ab5601c8e06200cb5230596c3caaf54482e F src/build.c 898884afd67d953808cb687babc15b66a10213f99fe2ce7db98960e959881f98 @@ -1112,7 +1112,7 @@ F test/fuzzdata4.db b502c7d5498261715812dd8b3c2005bad08b3a26e6489414bd13926cd3e4 F test/fuzzdata5.db e35f64af17ec48926481cfaf3b3855e436bd40d1cfe2d59a9474cb4b748a52a5 F test/fuzzdata6.db 92a80e4afc172c24f662a10a612d188fb272de4a9bd19e017927c95f737de6d7 F test/fuzzdata7.db 0166b56fd7a6b9636a1d60ef0a060f86ddaecf99400a666bb6e5bbd7199ad1f2 -F test/fuzzdata8.db 652953c44494e176b9cbf8e37eb020e69fdd2395114fb1554377be328c08ff0e +F test/fuzzdata8.db 653423800b7671e67caa740e977d80e1360f0d69e9992851f3ea5c4a69a2724a F test/fuzzer1.test 3d4c4b7e547aba5e5511a2991e3e3d07166cfbb8 F test/fuzzer2.test a85ef814ce071293bce1ad8dffa217cbbaad4c14 F test/fuzzerfault.test f64c4aef4c9e9edf1d6dc0d3f1e65dcc81e67c996403c88d14f09b74807a42bc @@ -2000,8 +2000,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0 -P 7e761a02530ffbb055a766eb6c995f11fc2adbabb9a52502124f672fdcff0d10 -R 2ed590521c06c3e3aa9ca21e94c7fcbe +P aa367a3c974041323edb759855f0b83803439ceef2846da2d73eadd80efeaac4 +R a1d3c0131d04144023f8eda3431f858a U drh -Z f5898bf6ec0ce9d69f912d0173ce9ebb +Z 6c2a7fe31c25c65cdf8db45166d1307a # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 8438e6741c..522f0d3435 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -aa367a3c974041323edb759855f0b83803439ceef2846da2d73eadd80efeaac4 \ No newline at end of file +bd8ae5febbb8d3122f1e2e09b9fcdd6ac20c075ae1cf60bcdbd36080f3736417 \ No newline at end of file diff --git a/src/btree.c b/src/btree.c index e1696b9bfb..c54fd2e7c8 100644 --- a/src/btree.c +++ b/src/btree.c @@ -4954,7 +4954,7 @@ static int accessPayload( assert( pPage ); assert( eOp==0 || eOp==1 ); assert( pCur->eState==CURSOR_VALID ); - if( NEVER(pCur->ix>=pPage->nCell) ){ + if( pCur->ix>=pPage->nCell ){ return SQLITE_CORRUPT_PAGE(pPage); } assert( cursorHoldsMutex(pCur) ); diff --git a/test/fuzzdata8.db b/test/fuzzdata8.db index 7e8649c3266a62e60c94cafbc1a9ac181ac37a87..aff7e27340cd560731ada86f167851c766694516 100644 GIT binary patch delta 6621 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 delta 5950 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 Date: Sat, 1 Oct 2022 13:17:53 +0000 Subject: [PATCH 11/18] Replace the Parse.disableVtab field with Parse.prepFlags for increased generality, a small size reduction, and a small performance increase. FossilOrigin-Name: b7da0bcdf70e53ab1ec00a0694e17c7429e23bc6eb3f39b622d06a930aa2f6a3 --- manifest | 18 +++++++++--------- manifest.uuid | 2 +- src/build.c | 4 ++-- src/prepare.c | 2 +- src/sqliteInt.h | 2 +- src/trigger.c | 2 +- 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/manifest b/manifest index 29aa8d8ae2..1bac28833e 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Remove\sone\sof\sthe\sNEVER()\smacros\sadded\sby\s[5166acf3f0040459]\sbecause\sit\nis\sreachable\safter\sall. -D 2022-09-30T22:40:57.814 +C Replace\sthe\sParse.disableVtab\sfield\swith\sParse.prepFlags\sfor\sincreased\ngenerality,\sa\ssmall\ssize\sreduction,\sand\sa\ssmall\sperformance\sincrease. +D 2022-10-01T13:17:53.450 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724 @@ -531,7 +531,7 @@ F src/btmutex.c 6ffb0a22c19e2f9110be0964d0731d2ef1c67b5f7fabfbaeb7b9dabc4b7740ca F src/btree.c ef9c126d6dc5dff8ff76abc807dfef5b8aac42144e3be11cbcd9cb6eaecef580 F src/btree.h 74d64b8f28cfa4a894d14d4ed64fa432cd697b98b61708d4351482ae15913e22 F src/btreeInt.h 8ce1332edd89dfd2461d561ac10a0ab5601c8e06200cb5230596c3caaf54482e -F src/build.c 898884afd67d953808cb687babc15b66a10213f99fe2ce7db98960e959881f98 +F src/build.c 6e3ee380a4f0ff95de4b53bf510f66600cff08e4e04b92e95fae789072563f8f F src/callback.c 4cd7225b26a97f7de5fee5ae10464bed5a78f2adefe19534cc2095b3a8ca484a F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e F src/ctime.c 93e4b5f4faf6d3f688988a116773259a4fbfb4ddac0e9bf9d0ae0429390c2543 @@ -583,7 +583,7 @@ F src/pcache.h 4f87acd914cef5016fae3030343540d75f5b85a1877eed1a2a19b9f284248586 F src/pcache1.c dee95e3cd2b61e6512dc814c5ab76d5eb36f0bfc9441dbb4260fccc0d12bbddc F src/pragma.c 9bf7d8a2a9ad3bc36df3ec0d61817a44c38a1da527d59c26c203047f906e334a F src/pragma.h e690a356c18e98414d2e870ea791c1be1545a714ba623719deb63f7f226d8bb7 -F src/prepare.c 971d5819a4bda88038c2283d71fc0a2974ffc3dd480f9bd941341017abacfd1b +F src/prepare.c 0e61df99f063f12896a89c893fd3f8868e9fb13252c05e3e4e8cea7422094d0a F src/printf.c e99ee9741e79ae3873458146f59644276657340385ade4e76a5f5d1c25793764 F src/random.c 546d6feb15ec69c1aafe9bb351a277cbb498fd5410e646add673acb805714960 F src/resolve.c efea4e5fbecfd6d0a9071b0be0d952620991673391b6ffaaf4c277b0bb674633 @@ -593,7 +593,7 @@ F src/shell.c.in e7e7c2c69ae86c5ee9e8ad66227203d46ff6dce8700a1b1dababff01c71d33d F src/sqlite.h.in b9b7fd73239d94db20332bb6e504688001e5564b655e1318a4427a1caef4b99e F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8 F src/sqlite3ext.h a988810c9b21c0dc36dc7a62735012339dc76fc7ab448fb0792721d30eacb69d -F src/sqliteInt.h 94e7fc2a5f0fa5d1f0af84513fd2d1c70a9f6e772556b9dfef16feee63291eae +F src/sqliteInt.h 7571703e6d11cd0e0283be68e9b6baceefedf10e3bbac5869d12183e031c5254 F src/sqliteLimit.h d7323ffea5208c6af2734574bae933ca8ed2ab728083caa117c9738581a31657 F src/status.c 160c445d7d28c984a0eae38c144f6419311ed3eace59b44ac6dafc20db4af749 F src/table.c 0f141b58a16de7e2fbe81c308379e7279f4c6b50eb08efeec5892794a0ba30d1 @@ -654,7 +654,7 @@ F src/test_wsd.c 41cadfd9d97fe8e3e4e44f61a4a8ccd6f7ca8fe9 F src/threads.c 4ae07fa022a3dc7c5beb373cf744a85d3c5c6c3c F src/tokenize.c 1305797eab3542a0896b552c6e7669c972c1468e11e92b370533c1f37a37082b F src/treeview.c 07787f67cd297a6d09d04b8d70c06769c60c9c1d9080378f93929c16f8fd3298 -F src/trigger.c bc70c58e713dcfb6cabe5cc0bed71aedb02c3e9e128c6089a78aca945ba4d720 +F src/trigger.c 4163ada044af89d51caba1cb713a73165347b2ec05fe84a283737c134d61fcd5 F src/update.c c52a7991bece0453d22c77c08469512ee2f1391c12503fd347d1c939220c5877 F src/upsert.c 8789047a8f0a601ea42fa0256d1ba3190c13746b6ba940fe2d25643a7e991937 F src/utf.c ee39565f0843775cc2c81135751ddd93eceb91a673ea2c57f61c76f288b041a0 @@ -2000,8 +2000,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0 -P aa367a3c974041323edb759855f0b83803439ceef2846da2d73eadd80efeaac4 -R a1d3c0131d04144023f8eda3431f858a +P bd8ae5febbb8d3122f1e2e09b9fcdd6ac20c075ae1cf60bcdbd36080f3736417 +R b431f195d6909dd213769258d329fb1f U drh -Z 6c2a7fe31c25c65cdf8db45166d1307a +Z 5ff8e8c9111016b6f28cef573224105e # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 522f0d3435..ceab8edde4 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -bd8ae5febbb8d3122f1e2e09b9fcdd6ac20c075ae1cf60bcdbd36080f3736417 \ No newline at end of file +b7da0bcdf70e53ab1ec00a0694e17c7429e23bc6eb3f39b622d06a930aa2f6a3 \ No newline at end of file diff --git a/src/build.c b/src/build.c index 094cf7d61b..be6b01eb08 100644 --- a/src/build.c +++ b/src/build.c @@ -453,7 +453,7 @@ Table *sqlite3LocateTable( /* If zName is the not the name of a table in the schema created using ** CREATE, then check to see if it is the name of an virtual table that ** can be an eponymous virtual table. */ - if( pParse->disableVtab==0 && db->init.busy==0 ){ + if( (pParse->prepFlags & SQLITE_PREPARE_NO_VTAB)==0 && db->init.busy==0 ){ Module *pMod = (Module*)sqlite3HashFind(&db->aModule, zName); if( pMod==0 && sqlite3_strnicmp(zName, "pragma_", 7)==0 ){ pMod = sqlite3PragmaVtabRegister(db, zName); @@ -466,7 +466,7 @@ Table *sqlite3LocateTable( #endif if( flags & LOCATE_NOERR ) return 0; pParse->checkSchema = 1; - }else if( IsVirtual(p) && pParse->disableVtab ){ + }else if( IsVirtual(p) && (pParse->prepFlags & SQLITE_PREPARE_NO_VTAB)!=0 ){ p = 0; } diff --git a/src/prepare.c b/src/prepare.c index f66c366b99..cd90bc4bad 100644 --- a/src/prepare.c +++ b/src/prepare.c @@ -705,7 +705,7 @@ static int sqlite3Prepare( sParse.disableLookaside++; DisableLookaside; } - sParse.disableVtab = (prepFlags & SQLITE_PREPARE_NO_VTAB)!=0; + sParse.prepFlags = prepFlags & 0xff; /* Check to verify that it is possible to get a read lock on all ** database schemas. The inability to get a read lock indicates that diff --git a/src/sqliteInt.h b/src/sqliteInt.h index 148ba75949..436e428dcf 100644 --- a/src/sqliteInt.h +++ b/src/sqliteInt.h @@ -3604,7 +3604,7 @@ struct Parse { u8 hasCompound; /* Need to invoke convertCompoundSelectToSubquery() */ u8 okConstFactor; /* OK to factor out constants */ u8 disableLookaside; /* Number of times lookaside has been disabled */ - u8 disableVtab; /* Disable all virtual tables for this parse */ + u8 prepFlags; /* SQLITE_PREPARE_* flags */ u8 withinRJSubrtn; /* Nesting level for RIGHT JOIN body subroutines */ #if defined(SQLITE_DEBUG) || defined(SQLITE_COVERAGE_TEST) u8 earlyCleanup; /* OOM inside sqlite3ParserAddCleanup() */ diff --git a/src/trigger.c b/src/trigger.c index 1c62fc231b..ca64d6145b 100644 --- a/src/trigger.c +++ b/src/trigger.c @@ -1191,7 +1191,7 @@ static TriggerPrg *codeRowTrigger( sSubParse.zAuthContext = pTrigger->zName; sSubParse.eTriggerOp = pTrigger->op; sSubParse.nQueryLoop = pParse->nQueryLoop; - sSubParse.disableVtab = pParse->disableVtab; + sSubParse.prepFlags = pParse->prepFlags; v = sqlite3GetVdbe(&sSubParse); if( v ){ From 7d34b8d6281c942382765f94e860a1e4f7d3a043 Mon Sep 17 00:00:00 2001 From: drh <> Date: Sat, 1 Oct 2022 20:27:29 +0000 Subject: [PATCH 12/18] Performance optimization in sqlite3_prepare() (discovered while working on the stmt-cache branch). FossilOrigin-Name: cd494240cc6184bb028d1f1049086f57c0a71a43d7ed1405fd4205240e1b9e61 --- manifest | 12 ++++++------ manifest.uuid | 2 +- src/prepare.c | 4 +++- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/manifest b/manifest index 1bac28833e..3c60d28601 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Replace\sthe\sParse.disableVtab\sfield\swith\sParse.prepFlags\sfor\sincreased\ngenerality,\sa\ssmall\ssize\sreduction,\sand\sa\ssmall\sperformance\sincrease. -D 2022-10-01T13:17:53.450 +C Performance\soptimization\sin\ssqlite3_prepare()\s(discovered\swhile\sworking\non\sthe\sstmt-cache\sbranch). +D 2022-10-01T20:27:29.944 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724 @@ -583,7 +583,7 @@ F src/pcache.h 4f87acd914cef5016fae3030343540d75f5b85a1877eed1a2a19b9f284248586 F src/pcache1.c dee95e3cd2b61e6512dc814c5ab76d5eb36f0bfc9441dbb4260fccc0d12bbddc F src/pragma.c 9bf7d8a2a9ad3bc36df3ec0d61817a44c38a1da527d59c26c203047f906e334a F src/pragma.h e690a356c18e98414d2e870ea791c1be1545a714ba623719deb63f7f226d8bb7 -F src/prepare.c 0e61df99f063f12896a89c893fd3f8868e9fb13252c05e3e4e8cea7422094d0a +F src/prepare.c 1b02be0441eda4579471fea097f678effcbb77ef0c39ab3f703c837822bcd674 F src/printf.c e99ee9741e79ae3873458146f59644276657340385ade4e76a5f5d1c25793764 F src/random.c 546d6feb15ec69c1aafe9bb351a277cbb498fd5410e646add673acb805714960 F src/resolve.c efea4e5fbecfd6d0a9071b0be0d952620991673391b6ffaaf4c277b0bb674633 @@ -2000,8 +2000,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0 -P bd8ae5febbb8d3122f1e2e09b9fcdd6ac20c075ae1cf60bcdbd36080f3736417 -R b431f195d6909dd213769258d329fb1f +P b7da0bcdf70e53ab1ec00a0694e17c7429e23bc6eb3f39b622d06a930aa2f6a3 +R 68c35546ee03b20dc6a84c9cc1198497 U drh -Z 5ff8e8c9111016b6f28cef573224105e +Z a1645f59fc204ccbfb7697554bfc7188 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index ceab8edde4..5c99b340dd 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -b7da0bcdf70e53ab1ec00a0694e17c7429e23bc6eb3f39b622d06a930aa2f6a3 \ No newline at end of file +cd494240cc6184bb028d1f1049086f57c0a71a43d7ed1405fd4205240e1b9e61 \ No newline at end of file diff --git a/src/prepare.c b/src/prepare.c index cd90bc4bad..1e7a1222ba 100644 --- a/src/prepare.c +++ b/src/prepare.c @@ -746,7 +746,9 @@ static int sqlite3Prepare( } } - sqlite3VtabUnlockList(db); +#ifndef SQLITE_OMIT_VIRTUALTABLE + if( db->pDisconnect ) sqlite3VtabUnlockList(db); +#endif if( nBytes>=0 && (nBytes==0 || zSql[nBytes-1]!=0) ){ char *zSqlCopy; From 65e6522f8f1dc60d8dc1caac3dd92cdf707947a3 Mon Sep 17 00:00:00 2001 From: stephan Date: Sun, 2 Oct 2022 20:13:46 +0000 Subject: [PATCH 13/18] Minor doc typo fix in sqlite.h.in. FossilOrigin-Name: 372802aaa22a830bf498bb0d9561ae02b32e5e191c4d7d771ea152140f6685a1 --- manifest | 14 +++++++------- manifest.uuid | 2 +- src/sqlite.h.in | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/manifest b/manifest index 3c60d28601..50270d8b40 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Performance\soptimization\sin\ssqlite3_prepare()\s(discovered\swhile\sworking\non\sthe\sstmt-cache\sbranch). -D 2022-10-01T20:27:29.944 +C Minor\sdoc\stypo\sfix\sin\ssqlite.h.in. +D 2022-10-02T20:13:46.207 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724 @@ -590,7 +590,7 @@ F src/resolve.c efea4e5fbecfd6d0a9071b0be0d952620991673391b6ffaaf4c277b0bb674633 F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92 F src/select.c bb18acf4eded647fef88d4d543c673874dbebff516fbeba90a85e6c13f2a58cd F src/shell.c.in e7e7c2c69ae86c5ee9e8ad66227203d46ff6dce8700a1b1dababff01c71d33df -F src/sqlite.h.in b9b7fd73239d94db20332bb6e504688001e5564b655e1318a4427a1caef4b99e +F src/sqlite.h.in 3f4695457fcb41ea8a44c6d09fc2a591bbeda44b13bda86618f3ce0071bbca7c F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8 F src/sqlite3ext.h a988810c9b21c0dc36dc7a62735012339dc76fc7ab448fb0792721d30eacb69d F src/sqliteInt.h 7571703e6d11cd0e0283be68e9b6baceefedf10e3bbac5869d12183e031c5254 @@ -2000,8 +2000,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0 -P b7da0bcdf70e53ab1ec00a0694e17c7429e23bc6eb3f39b622d06a930aa2f6a3 -R 68c35546ee03b20dc6a84c9cc1198497 -U drh -Z a1645f59fc204ccbfb7697554bfc7188 +P cd494240cc6184bb028d1f1049086f57c0a71a43d7ed1405fd4205240e1b9e61 +R 63d9c2979689d3960bbd738edf79070f +U stephan +Z 0ea9b225897586b46dcecb74f7edb744 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 5c99b340dd..4b7393393e 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -cd494240cc6184bb028d1f1049086f57c0a71a43d7ed1405fd4205240e1b9e61 \ No newline at end of file +372802aaa22a830bf498bb0d9561ae02b32e5e191c4d7d771ea152140f6685a1 \ No newline at end of file diff --git a/src/sqlite.h.in b/src/sqlite.h.in index d862c4fc00..df61f3c196 100644 --- a/src/sqlite.h.in +++ b/src/sqlite.h.in @@ -5628,7 +5628,7 @@ void sqlite3_value_free(sqlite3_value*); ** ** ^The sqlite3_aggregate_context(C,N) routine returns a NULL pointer ** when first called if N is less than or equal to zero or if a memory -** allocate error occurs. +** allocation error occurs. ** ** ^(The amount of space allocated by sqlite3_aggregate_context(C,N) is ** determined by the N parameter on first successful call. Changing the From 3044e77b4a892adc4f7e8609c460b598d8366c82 Mon Sep 17 00:00:00 2001 From: drh <> Date: Mon, 3 Oct 2022 13:45:03 +0000 Subject: [PATCH 14/18] Add the --vfs option to speedtest1. FossilOrigin-Name: aeb884029ac1c68f0d7361dda0a545cff19ed265b608c1e329a1926397c5c8a3 --- manifest | 14 +++++++------- manifest.uuid | 2 +- test/speedtest1.c | 8 +++++++- 3 files changed, 15 insertions(+), 9 deletions(-) diff --git a/manifest b/manifest index 50270d8b40..36bda4a254 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Minor\sdoc\stypo\sfix\sin\ssqlite.h.in. -D 2022-10-02T20:13:46.207 +C Add\sthe\s--vfs\soption\sto\sspeedtest1. +D 2022-10-03T13:45:03.604 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724 @@ -1480,7 +1480,7 @@ F test/speed3.test 694affeb9100526007436334cf7d08f3d74b85ef F test/speed4.test abc0ad3399dcf9703abed2fff8705e4f8e416715 F test/speed4p.explain 6b5f104ebeb34a038b2f714150f51d01143e59aa F test/speed4p.test 377a0c48e5a92e0b11c1c5ebb1bc9d83a7312c922bc0cb05970ef5d6a96d1f0c -F test/speedtest1.c 8bf7ebac9ac316feed6656951249db531dc380c73fb3e3b22e224ffda96beff6 +F test/speedtest1.c 8a9f6b6f6b5b1a18739b9a2eca8dd3ad131f28946c14eb5ae33fefeeada466b7 F test/spellfix.test 951a6405d49d1a23d6b78027d3877b4a33eeb8221dcab5704b499755bb4f552e F test/spellfix2.test dfc8f519a3fc204cb2dfa8b4f29821ae90f6f8c3 F test/spellfix3.test 0f9efaaa502a0e0a09848028518a6fb096c8ad33 @@ -2000,8 +2000,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0 -P cd494240cc6184bb028d1f1049086f57c0a71a43d7ed1405fd4205240e1b9e61 -R 63d9c2979689d3960bbd738edf79070f -U stephan -Z 0ea9b225897586b46dcecb74f7edb744 +P 372802aaa22a830bf498bb0d9561ae02b32e5e191c4d7d771ea152140f6685a1 +R bb0d587e0921cce1f37f5122ed804b2c +U drh +Z 3f01ed1217459ee72edb7ee3c272f0cd # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 4b7393393e..d991ba1f14 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -372802aaa22a830bf498bb0d9561ae02b32e5e191c4d7d771ea152140f6685a1 \ No newline at end of file +aeb884029ac1c68f0d7361dda0a545cff19ed265b608c1e329a1926397c5c8a3 \ No newline at end of file diff --git a/test/speedtest1.c b/test/speedtest1.c index b115a57e2b..c4ae8bdd5d 100644 --- a/test/speedtest1.c +++ b/test/speedtest1.c @@ -44,6 +44,7 @@ static const char zHelp[] = " --utf16be Set text encoding to UTF-16BE\n" " --utf16le Set text encoding to UTF-16LE\n" " --verify Run additional verification steps.\n" + " --vfs NAME Specify the VFS to use.\n" " --without-rowid Use WITHOUT ROWID where appropriate\n" ; @@ -2184,6 +2185,7 @@ int main(int argc, char **argv){ int doTrace = 0; /* True for --trace */ const char *zEncoding = 0; /* --utf16be or --utf16le */ const char *zDbName = 0; /* Name of the test database */ + const char *zVfs = 0; /* VFS to use. NULL means use the default */ void *pHeap = 0; /* Allocated heap space */ void *pLook = 0; /* Allocated lookaside space */ @@ -2357,6 +2359,9 @@ int main(int argc, char **argv){ }else{ g.zWR = "STRICT"; } + }else if( strcmp(z,"vfs")==0 ){ + if( i>=argc-1 ) fatal_error("missing argument on %s\n", argv[i]); + zVfs = argv[++i]; }else if( strcmp(z, "help")==0 || strcmp(z,"?")==0 ){ printf(zHelp, argv[0]); exit(0); @@ -2395,7 +2400,8 @@ int main(int argc, char **argv){ sqlite3_initialize(); /* Open the database and the input file */ - if( sqlite3_open(memDb ? ":memory:" : zDbName, &g.db) ){ + if( sqlite3_open_v2(memDb ? ":memory:" : zDbName, &g.db, + SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE, zVfs) ){ fatal_error("Cannot open database file: %s\n", zDbName); } #if SQLITE_VERSION_NUMBER>=3006001 From 277c7d3516688b01941a2ca14a9e29c426ded5f3 Mon Sep 17 00:00:00 2001 From: drh <> Date: Mon, 3 Oct 2022 13:56:52 +0000 Subject: [PATCH 15/18] Copy all of the fiddle-opfs changes to speedtest1 into trunk. FossilOrigin-Name: f3d31c9982cab517a3907a28c571225cee614ee78375c70eb2efb9a2b6b4b042 --- manifest | 12 ++--- manifest.uuid | 2 +- test/speedtest1.c | 115 ++++++++++++++++++++++++++++++++++------------ 3 files changed, 93 insertions(+), 36 deletions(-) diff --git a/manifest b/manifest index 36bda4a254..b9cd970f84 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Add\sthe\s--vfs\soption\sto\sspeedtest1. -D 2022-10-03T13:45:03.604 +C Copy\sall\sof\sthe\sfiddle-opfs\schanges\sto\sspeedtest1\sinto\strunk. +D 2022-10-03T13:56:52.781 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724 @@ -1480,7 +1480,7 @@ F test/speed3.test 694affeb9100526007436334cf7d08f3d74b85ef F test/speed4.test abc0ad3399dcf9703abed2fff8705e4f8e416715 F test/speed4p.explain 6b5f104ebeb34a038b2f714150f51d01143e59aa F test/speed4p.test 377a0c48e5a92e0b11c1c5ebb1bc9d83a7312c922bc0cb05970ef5d6a96d1f0c -F test/speedtest1.c 8a9f6b6f6b5b1a18739b9a2eca8dd3ad131f28946c14eb5ae33fefeeada466b7 +F test/speedtest1.c 752fc1cad512f7c94271d3fdb46d6d90c9f6b61d0a4722a28c7028f53952fb1d F test/spellfix.test 951a6405d49d1a23d6b78027d3877b4a33eeb8221dcab5704b499755bb4f552e F test/spellfix2.test dfc8f519a3fc204cb2dfa8b4f29821ae90f6f8c3 F test/spellfix3.test 0f9efaaa502a0e0a09848028518a6fb096c8ad33 @@ -2000,8 +2000,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0 -P 372802aaa22a830bf498bb0d9561ae02b32e5e191c4d7d771ea152140f6685a1 -R bb0d587e0921cce1f37f5122ed804b2c +P aeb884029ac1c68f0d7361dda0a545cff19ed265b608c1e329a1926397c5c8a3 +R 9ef7b22777f981a0530dc8b380258dc2 U drh -Z 3f01ed1217459ee72edb7ee3c272f0cd +Z 4bdd14d37dfc0c4e0295fe6f5fd60fb3 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index d991ba1f14..1ce7bd9cf2 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -aeb884029ac1c68f0d7361dda0a545cff19ed265b608c1e329a1926397c5c8a3 \ No newline at end of file +f3d31c9982cab517a3907a28c571225cee614ee78375c70eb2efb9a2b6b4b042 \ No newline at end of file diff --git a/test/speedtest1.c b/test/speedtest1.c index c4ae8bdd5d..d1efdf13a0 100644 --- a/test/speedtest1.c +++ b/test/speedtest1.c @@ -7,6 +7,7 @@ static const char zHelp[] = "Usage: %s [--options] DATABASE\n" "Options:\n" " --autovacuum Enable AUTOVACUUM mode\n" + " --big-transactions Add BEGIN/END around large tests which normally don't\n" " --cachesize N Set the cache size to N\n" " --checkpoint Run PRAGMA wal_checkpoint after each test case\n" " --exclusive Enable locking_mode=EXCLUSIVE\n" @@ -20,6 +21,7 @@ static const char zHelp[] = " --mmap SZ MMAP the first SZ bytes of the database file\n" " --multithread Set multithreaded mode\n" " --nomemstat Disable memory statistics\n" + " --nomutex Open db with SQLITE_OPEN_NOMUTEX\n" " --nosync Set PRAGMA synchronous=OFF\n" " --notnull Add NOT NULL constraints to table columns\n" " --output FILE Store SQL output in FILE\n" @@ -43,8 +45,8 @@ static const char zHelp[] = " --threads N Use up to N threads for sorting\n" " --utf16be Set text encoding to UTF-16BE\n" " --utf16le Set text encoding to UTF-16LE\n" - " --verify Run additional verification steps.\n" - " --vfs NAME Specify the VFS to use.\n" + " --verify Run additional verification steps\n" + " --vfs NAME Use the given (preinstalled) VFS\n" " --without-rowid Use WITHOUT ROWID where appropriate\n" ; @@ -98,6 +100,7 @@ static struct Global { int nRepeat; /* Repeat selects this many times */ int doCheckpoint; /* Run PRAGMA wal_checkpoint after each trans */ int nReserve; /* Reserve bytes */ + int doBigTransactions; /* Enable transactions on tests 410 and 510 */ const char *zWR; /* Might be WITHOUT ROWID */ const char *zNN; /* Might be NOT NULL */ const char *zPK; /* Might be UNIQUE or PRIMARY KEY */ @@ -373,10 +376,12 @@ int speedtest1_numbername(unsigned int n, char *zOut, int nOut){ #define NAMEWIDTH 60 static const char zDots[] = "......................................................................."; +static int iTestNumber = 0; /* Current test # for begin/end_test(). */ void speedtest1_begin_test(int iTestNum, const char *zTestName, ...){ int n = (int)strlen(zTestName); char *zName; va_list ap; + iTestNumber = iTestNum; va_start(ap, zTestName); zName = sqlite3_vmprintf(zTestName, ap); va_end(ap); @@ -385,6 +390,11 @@ void speedtest1_begin_test(int iTestNum, const char *zTestName, ...){ zName[NAMEWIDTH] = 0; n = NAMEWIDTH; } + if( g.pScript ){ + fprintf(g.pScript,"-- begin test %d %.*s\n", iTestNumber, n, zName) + /* maintenance reminder: ^^^ code in ext/wasm expects %d to be + ** field #4 (as in: cut -d' ' -f4). */; + } if( g.bSqlOnly ){ printf("/* %4d - %s%.*s */\n", iTestNum, zName, NAMEWIDTH-n, zDots); }else{ @@ -405,6 +415,10 @@ void speedtest1_exec(const char*,...); void speedtest1_end_test(void){ sqlite3_int64 iElapseTime = speedtest1_timestamp() - g.iStart; if( g.doCheckpoint ) speedtest1_exec("PRAGMA wal_checkpoint;"); + assert( iTestNumber > 0 ); + if( g.pScript ){ + fprintf(g.pScript,"-- end test %d\n", iTestNumber); + } if( !g.bSqlOnly ){ g.iTotal += iElapseTime; printf("%4d.%03ds\n", (int)(iElapseTime/1000), (int)(iElapseTime%1000)); @@ -413,6 +427,7 @@ void speedtest1_end_test(void){ sqlite3_finalize(g.pStmt); g.pStmt = 0; } + iTestNumber = 0; } /* Report end of testing */ @@ -1106,12 +1121,24 @@ void testset_main(void){ speedtest1_exec("COMMIT"); speedtest1_end_test(); speedtest1_begin_test(410, "%d SELECTS on an IPK", n); + if( g.doBigTransactions ){ + /* Historical note: tests 410 and 510 have historically not used + ** explicit transactions. The --big-transactions flag was added + ** 2022-09-08 to support the WASM/OPFS build, as the run-times + ** approach 1 minute for each of these tests if they're not in an + ** explicit transaction. The run-time effect of --big-transaciions + ** on native builds is negligible. */ + speedtest1_exec("BEGIN"); + } speedtest1_prepare("SELECT b FROM t5 WHERE a=?1; -- %d times",n); for(i=1; i<=n; i++){ x1 = swizzle(i,maxb); sqlite3_bind_int(g.pStmt, 1, (sqlite3_int64)x1); speedtest1_run(); } + if( g.doBigTransactions ){ + speedtest1_exec("COMMIT"); + } speedtest1_end_test(); sz = n = g.szTest*700; @@ -1133,6 +1160,10 @@ void testset_main(void){ speedtest1_exec("COMMIT"); speedtest1_end_test(); speedtest1_begin_test(510, "%d SELECTS on a TEXT PK", n); + if( g.doBigTransactions ){ + /* See notes for test 410. */ + speedtest1_exec("BEGIN"); + } speedtest1_prepare("SELECT b FROM t6 WHERE a=?1; -- %d times",n); for(i=1; i<=n; i++){ x1 = swizzle(i,maxb); @@ -1140,6 +1171,9 @@ void testset_main(void){ sqlite3_bind_text(g.pStmt, 1, zNum, -1, SQLITE_STATIC); speedtest1_run(); } + if( g.doBigTransactions ){ + speedtest1_exec("COMMIT"); + } speedtest1_end_test(); speedtest1_begin_test(520, "%d SELECT DISTINCT", n); speedtest1_exec("SELECT DISTINCT b FROM t5;"); @@ -2163,7 +2197,6 @@ static int xCompileOptions(void *pCtx, int nVal, char **azVal, char **azCol){ printf("-- Compile option: %s\n", azVal[0]); return SQLITE_OK; } - int main(int argc, char **argv){ int doAutovac = 0; /* True for --autovacuum */ int cacheSize = 0; /* Desired cache size. 0 means default */ @@ -2181,11 +2214,13 @@ int main(int argc, char **argv){ int nThread = 0; /* --threads value */ int mmapSize = 0; /* How big of a memory map to use */ 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 */ + 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 */ - const char *zVfs = 0; /* VFS to use. NULL means use the default */ void *pHeap = 0; /* Allocated heap space */ void *pLook = 0; /* Allocated lookaside space */ @@ -2194,10 +2229,19 @@ int main(int argc, char **argv){ int i; /* Loop counter */ int rc; /* API return code */ +#ifdef SQLITE_SPEEDTEST1_WASM + /* Resetting all state is important for the WASM build, which may + ** call main() multiple times. */ + memset(&g, 0, sizeof(g)); + iTestNumber = 0; +#endif #ifdef SQLITE_CKSUMVFS_STATIC sqlite3_register_cksumvfs(0); #endif - + /* + ** Confirms that argc has at least N arguments following argv[i]. */ +#define ARGC_VALUE_CHECK(N) \ + if( i>=argc-(N) ) fatal_error("missing argument on %s\n", argv[i]) /* Display the version of SQLite being tested */ printf("-- Speedtest1 for SQLite %s %.48s\n", sqlite3_libversion(), sqlite3_sourceid()); @@ -2214,10 +2258,11 @@ int main(int argc, char **argv){ do{ z++; }while( z[0]=='-' ); if( strcmp(z,"autovacuum")==0 ){ doAutovac = 1; + }else if( strcmp(z,"big-transactions")==0 ){ + g.doBigTransactions = 1; }else if( strcmp(z,"cachesize")==0 ){ - if( i>=argc-1 ) fatal_error("missing argument on %s\n", argv[i]); - i++; - cacheSize = integerValue(argv[i]); + ARGC_VALUE_CHECK(1); + cacheSize = integerValue(argv[++i]); }else if( strcmp(z,"exclusive")==0 ){ doExclusive = 1; }else if( strcmp(z,"checkpoint")==0 ){ @@ -2226,20 +2271,20 @@ int main(int argc, char **argv){ g.bSqlOnly = 1; g.bExplain = 1; }else if( strcmp(z,"heap")==0 ){ - if( i>=argc-2 ) fatal_error("missing arguments on %s\n", argv[i]); + ARGC_VALUE_CHECK(2); nHeap = integerValue(argv[i+1]); mnHeap = integerValue(argv[i+2]); i += 2; }else if( strcmp(z,"incrvacuum")==0 ){ doIncrvac = 1; }else if( strcmp(z,"journal")==0 ){ - if( i>=argc-1 ) fatal_error("missing argument on %s\n", argv[i]); + ARGC_VALUE_CHECK(1); zJMode = argv[++i]; }else if( strcmp(z,"key")==0 ){ - if( i>=argc-1 ) fatal_error("missing argument on %s\n", argv[i]); + ARGC_VALUE_CHECK(1); zKey = argv[++i]; }else if( strcmp(z,"lookaside")==0 ){ - if( i>=argc-2 ) fatal_error("missing arguments on %s\n", argv[i]); + ARGC_VALUE_CHECK(2); nLook = integerValue(argv[i+1]); szLook = integerValue(argv[i+2]); i += 2; @@ -2253,9 +2298,11 @@ int main(int argc, char **argv){ #endif #if SQLITE_VERSION_NUMBER>=3007017 }else if( strcmp(z, "mmap")==0 ){ - if( i>=argc-1 ) fatal_error("missing argument on %s\n", argv[i]); + ARGC_VALUE_CHECK(1); mmapSize = integerValue(argv[++i]); #endif + }else if( strcmp(z,"nomutex")==0 ){ + openFlags |= SQLITE_OPEN_NOMUTEX; }else if( strcmp(z,"nosync")==0 ){ noSync = 1; }else if( strcmp(z,"notnull")==0 ){ @@ -2265,7 +2312,7 @@ int main(int argc, char **argv){ fatal_error("The --output option is not supported with" " -DSPEEDTEST_OMIT_HASH\n"); #else - if( i>=argc-1 ) fatal_error("missing argument on %s\n", argv[i]); + ARGC_VALUE_CHECK(1); i++; if( strcmp(argv[i],"-")==0 ){ g.hashFile = stdout; @@ -2277,10 +2324,10 @@ int main(int argc, char **argv){ } #endif }else if( strcmp(z,"pagesize")==0 ){ - if( i>=argc-1 ) fatal_error("missing argument on %s\n", argv[i]); + ARGC_VALUE_CHECK(1); pageSize = integerValue(argv[++i]); }else if( strcmp(z,"pcache")==0 ){ - if( i>=argc-2 ) fatal_error("missing arguments on %s\n", argv[i]); + ARGC_VALUE_CHECK(2); nPCache = integerValue(argv[i+1]); szPCache = integerValue(argv[i+2]); doPCache = 1; @@ -2288,9 +2335,8 @@ int main(int argc, char **argv){ }else if( strcmp(z,"primarykey")==0 ){ g.zPK = "PRIMARY KEY"; }else if( strcmp(z,"repeat")==0 ){ - if( i>=argc-1 ) fatal_error("missing arguments on %s\n", argv[i]); - g.nRepeat = integerValue(argv[i+1]); - i += 1; + ARGC_VALUE_CHECK(1); + g.nRepeat = integerValue(argv[++i]); }else if( strcmp(z,"reprepare")==0 ){ g.bReprepare = 1; #if SQLITE_VERSION_NUMBER>=3006000 @@ -2300,7 +2346,7 @@ int main(int argc, char **argv){ sqlite3_config(SQLITE_CONFIG_SINGLETHREAD); #endif }else if( strcmp(z,"script")==0 ){ - if( i>=argc-1 ) fatal_error("missing arguments on %s\n", argv[i]); + ARGC_VALUE_CHECK(1); if( g.pScript ) fclose(g.pScript); g.pScript = fopen(argv[++i], "wb"); if( g.pScript==0 ){ @@ -2311,24 +2357,24 @@ int main(int argc, char **argv){ }else if( strcmp(z,"shrink-memory")==0 ){ g.bMemShrink = 1; }else if( strcmp(z,"size")==0 ){ - if( i>=argc-1 ) fatal_error("missing argument on %s\n", argv[i]); + ARGC_VALUE_CHECK(1); g.szTest = integerValue(argv[++i]); }else if( strcmp(z,"stats")==0 ){ showStats = 1; }else if( strcmp(z,"temp")==0 ){ - if( i>=argc-1 ) fatal_error("missing argument on %s\n", argv[i]); + ARGC_VALUE_CHECK(1); i++; if( argv[i][0]<'0' || argv[i][0]>'9' || argv[i][1]!=0 ){ fatal_error("argument to --temp should be integer between 0 and 9"); } g.eTemp = argv[i][0] - '0'; }else if( strcmp(z,"testset")==0 ){ - if( i>=argc-1 ) fatal_error("missing argument on %s\n", argv[i]); + ARGC_VALUE_CHECK(1); zTSet = argv[++i]; }else if( strcmp(z,"trace")==0 ){ doTrace = 1; }else if( strcmp(z,"threads")==0 ){ - if( i>=argc-1 ) fatal_error("missing argument on %s\n", argv[i]); + ARGC_VALUE_CHECK(1); nThread = integerValue(argv[++i]); }else if( strcmp(z,"utf16le")==0 ){ zEncoding = "utf16le"; @@ -2339,8 +2385,11 @@ int main(int argc, char **argv){ #ifndef SPEEDTEST_OMIT_HASH HashInit(); #endif + }else if( strcmp(z,"vfs")==0 ){ + ARGC_VALUE_CHECK(1); + zVfs = argv[++i]; }else if( strcmp(z,"reserve")==0 ){ - if( i>=argc-1 ) fatal_error("missing argument on %s\n", argv[i]); + ARGC_VALUE_CHECK(1); g.nReserve = atoi(argv[++i]); }else if( strcmp(z,"without-rowid")==0 ){ if( strstr(g.zWR,"WITHOUT")!=0 ){ @@ -2359,9 +2408,6 @@ int main(int argc, char **argv){ }else{ g.zWR = "STRICT"; } - }else if( strcmp(z,"vfs")==0 ){ - if( i>=argc-1 ) fatal_error("missing argument on %s\n", argv[i]); - zVfs = argv[++i]; }else if( strcmp(z, "help")==0 || strcmp(z,"?")==0 ){ printf(zHelp, argv[0]); exit(0); @@ -2376,6 +2422,7 @@ int main(int argc, char **argv){ argv[i], argv[0]); } } +#undef ARGC_VALUE_CHECK if( zDbName!=0 ) unlink(zDbName); #if SQLITE_VERSION_NUMBER>=3006001 if( nHeap>0 ){ @@ -2401,7 +2448,7 @@ int main(int argc, char **argv){ /* Open the database and the input file */ if( sqlite3_open_v2(memDb ? ":memory:" : zDbName, &g.db, - SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE, zVfs) ){ + openFlags, zVfs) ){ fatal_error("Cannot open database file: %s\n", zDbName); } #if SQLITE_VERSION_NUMBER>=3006001 @@ -2586,3 +2633,13 @@ int main(int argc, char **argv){ free( pHeap ); return 0; } + +#ifdef SQLITE_SPEEDTEST1_WASM +/* +** A workaround for some inconsistent behaviour with how +** main() does (or does not) get exported to WASM. +*/ +int wasm_main(int argc, char **argv){ + return main(argc, argv); +} +#endif From 16292a5e52cc4f6b1375bd1dbefe048a10f7e14f Mon Sep 17 00:00:00 2001 From: drh <> Date: Mon, 3 Oct 2022 15:22:59 +0000 Subject: [PATCH 16/18] Adjust the --help output for speedtest1 to clarify that the argument to the --cachesize option is in pages, not bytes. FossilOrigin-Name: d7c2be6bdc3402e5a339d0f7b76d2c25f3a444dcbf54a77c1ccb790d1195a7cf --- manifest | 12 ++++++------ manifest.uuid | 2 +- test/speedtest1.c | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/manifest b/manifest index b9cd970f84..8484e05492 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Copy\sall\sof\sthe\sfiddle-opfs\schanges\sto\sspeedtest1\sinto\strunk. -D 2022-10-03T13:56:52.781 +C Adjust\sthe\s--help\soutput\sfor\sspeedtest1\sto\sclarify\sthat\sthe\sargument\sto\nthe\s--cachesize\soption\sis\sin\spages,\snot\sbytes. +D 2022-10-03T15:22:59.408 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724 @@ -1480,7 +1480,7 @@ F test/speed3.test 694affeb9100526007436334cf7d08f3d74b85ef F test/speed4.test abc0ad3399dcf9703abed2fff8705e4f8e416715 F test/speed4p.explain 6b5f104ebeb34a038b2f714150f51d01143e59aa F test/speed4p.test 377a0c48e5a92e0b11c1c5ebb1bc9d83a7312c922bc0cb05970ef5d6a96d1f0c -F test/speedtest1.c 752fc1cad512f7c94271d3fdb46d6d90c9f6b61d0a4722a28c7028f53952fb1d +F test/speedtest1.c 8677e29942ed0b8b5212e46c05e3debfe48bcaaebde4aa8ddc797cd73b8937d2 F test/spellfix.test 951a6405d49d1a23d6b78027d3877b4a33eeb8221dcab5704b499755bb4f552e F test/spellfix2.test dfc8f519a3fc204cb2dfa8b4f29821ae90f6f8c3 F test/spellfix3.test 0f9efaaa502a0e0a09848028518a6fb096c8ad33 @@ -2000,8 +2000,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0 -P aeb884029ac1c68f0d7361dda0a545cff19ed265b608c1e329a1926397c5c8a3 -R 9ef7b22777f981a0530dc8b380258dc2 +P f3d31c9982cab517a3907a28c571225cee614ee78375c70eb2efb9a2b6b4b042 +R 7f8d304b6a07de2cc69260c5f709e3b7 U drh -Z 4bdd14d37dfc0c4e0295fe6f5fd60fb3 +Z c497b618e9e71dda49eb7a2e8b6f56d4 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 1ce7bd9cf2..3bd31ec276 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -f3d31c9982cab517a3907a28c571225cee614ee78375c70eb2efb9a2b6b4b042 \ No newline at end of file +d7c2be6bdc3402e5a339d0f7b76d2c25f3a444dcbf54a77c1ccb790d1195a7cf \ No newline at end of file diff --git a/test/speedtest1.c b/test/speedtest1.c index d1efdf13a0..27eb5dfd06 100644 --- a/test/speedtest1.c +++ b/test/speedtest1.c @@ -7,8 +7,8 @@ static const char zHelp[] = "Usage: %s [--options] DATABASE\n" "Options:\n" " --autovacuum Enable AUTOVACUUM mode\n" - " --big-transactions Add BEGIN/END around large tests which normally don't\n" - " --cachesize N Set the cache size to N\n" + " --big-transactions Add BEGIN/END around all large tests\n" + " --cachesize N Set PRAGMA cache_size=N. Note: N is pages, not bytes\n" " --checkpoint Run PRAGMA wal_checkpoint after each test case\n" " --exclusive Enable locking_mode=EXCLUSIVE\n" " --explain Like --sqlonly but with added EXPLAIN keywords\n" From a4b2f419382c95cd2f4924d0394f37b3d2f0cfce Mon Sep 17 00:00:00 2001 From: drh <> Date: Tue, 4 Oct 2022 10:35:10 +0000 Subject: [PATCH 17/18] Change the name of the autoconf-generated configuration file from "config.h" to "sqlite_cfg.h" to work around a bug in a dependency checker, reported in [https://twitter.com/josecastillo/status/1577136108097314816|a tweet from Jose Castillo]. FossilOrigin-Name: 897e187cad981126fc5f6ea8e382e937825af10b0c9589b0a23b9fbaa4ca58b8 --- Makefile.in | 8 ++++---- configure | 4 ++-- configure.ac | 2 +- manifest | 24 ++++++++++++------------ manifest.uuid | 2 +- config.h.in => sqlite_cfg.h.in | 25 ++++++++++++++++++------- src/ctime.c | 2 +- src/sqliteInt.h | 2 +- tool/mkctimec.tcl | 2 +- 9 files changed, 41 insertions(+), 30 deletions(-) rename config.h.in => sqlite_cfg.h.in (82%) diff --git a/Makefile.in b/Makefile.in index cc4943f2c4..9be48816ee 100644 --- a/Makefile.in +++ b/Makefile.in @@ -35,7 +35,7 @@ TCC += -I${TOP}/ext/fts3 -I${TOP}/ext/async -I${TOP}/ext/session TCC += -I${TOP}/ext/userauth # Define this for the autoconf-based build, so that the code knows it can -# include the generated config.h +# include the generated sqlite_cfg.h # TCC += -D_HAVE_SQLITE_CONFIG_H -DBUILD_sqlite @@ -377,7 +377,7 @@ SRC += \ opcodes.h \ parse.c \ parse.h \ - config.h \ + sqlite_cfg.h \ shell.c \ sqlite3.h @@ -555,7 +555,7 @@ HDR = \ $(TOP)/src/vdbeInt.h \ $(TOP)/src/vxworks.h \ $(TOP)/src/whereInt.h \ - config.h + sqlite_cfg.h # Header files used by extensions # @@ -1501,7 +1501,7 @@ clean: rm -f threadtest5 distclean: clean - rm -f config.h config.log config.status libtool Makefile sqlite3.pc \ + rm -f sqlite_cfg.h config.log config.status libtool Makefile sqlite3.pc \ $(TESTPROGS) # diff --git a/configure b/configure index e9f135f87e..4a32d5e561 100755 --- a/configure +++ b/configure @@ -11875,7 +11875,7 @@ fi ######### # Output the config header -ac_config_headers="$ac_config_headers config.h" +ac_config_headers="$ac_config_headers sqlite_cfg.h" ######### @@ -12838,7 +12838,7 @@ for ac_config_target in $ac_config_targets do case $ac_config_target in "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;; - "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;; + "sqlite_cfg.h") CONFIG_HEADERS="$CONFIG_HEADERS sqlite_cfg.h" ;; "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; "sqlite3.pc") CONFIG_FILES="$CONFIG_FILES sqlite3.pc" ;; diff --git a/configure.ac b/configure.ac index cc805a00d5..5f905db40c 100644 --- a/configure.ac +++ b/configure.ac @@ -806,7 +806,7 @@ AC_SUBST(AMALGAMATION_LINE_MACROS) ######### # Output the config header -AC_CONFIG_HEADERS(config.h) +AC_CONFIG_HEADERS(sqlite_cfg.h) ######### # Generate the output files. diff --git a/manifest b/manifest index 8484e05492..d690941a1f 100644 --- a/manifest +++ b/manifest @@ -1,9 +1,9 @@ -C Adjust\sthe\s--help\soutput\sfor\sspeedtest1\sto\sclarify\sthat\sthe\sargument\sto\nthe\s--cachesize\soption\sis\sin\spages,\snot\sbytes. -D 2022-10-03T15:22:59.408 +C Change\sthe\sname\sof\sthe\sautoconf-generated\sconfiguration\sfile\sfrom\s"config.h"\nto\s"sqlite_cfg.h"\sto\swork\saround\sa\sbug\sin\sa\sdependency\schecker,\sreported\nin\s[https://twitter.com/josecastillo/status/1577136108097314816|a\stweet\sfrom\sJose\sCastillo]. +D 2022-10-04T10:35:10.544 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724 -F Makefile.in 525bccb89e36a927f9312a231f054a2dc029f6af75901c7fc1a781d51b260323 +F Makefile.in 42efe1354fea12f5c68891939f7c7356353d345aaa7c73d36242499f9cf6e60f F Makefile.linux-gcc f609543700659711fbd230eced1f01353117621dccae7b9fb70daa64236c5241 F Makefile.msc d547a2fdba38a1c6cd1954977d0b0cc017f5f8fbfbc65287bf8d335808938016 F README.md 8b8df9ca852aeac4864eb1e400002633ee6db84065bd01b78c33817f97d31f5e @@ -32,10 +32,9 @@ F autoconf/tea/win/makefile.vc 2c478a9a962e48b2bf9062734e04d7c63c556e21709541917 F autoconf/tea/win/nmakehlp.c b01f822eabbe1ed2b64e70882d97d48402b42d2689a1ea00342d1a1a7eaa19cb F autoconf/tea/win/rules.vc c511f222b80064096b705dbeb97060ee1d6b6d63 F config.guess 883205ddf25b46f10c181818bf42c09da9888884af96f79e1719264345053bd6 -F config.h.in 6376abec766e9a0785178b1823b5a587e9f1ccbc F config.sub c2d0260f17f3e4bc0b6808fccf1b291cb5e9126c14fc5890efc77b9fd0175559 -F configure f959db96f314b3b91b3d658eebbc0a96b9542f1265c4de97e885aedb6bdcead5 x -F configure.ac 3ef6eeff4387585bfcab76b0c3f6e15a0618587bb90245dd5d44e4378141bb35 +F configure b93755fe94b3e9b2015f3c2d6c63928e8899b0a7c54e042deb843498094179da x +F configure.ac 48dc6bfee293eef05910faf085760f2fd79b680aa47b50e8e6a22ca40bb026bb F contrib/sqlitecon.tcl 210a913ad63f9f991070821e599d600bd913e0ad F doc/F2FS.txt c1d4a0ae9711cfe0e1d8b019d154f1c29e0d3abfe820787ba1e9ed7691160fcd F doc/json-enhancements.md e356fc834781f1f1aa22ee300027a270b2c960122468499bf347bb123ce1ea4f @@ -521,6 +520,7 @@ F spec.template 86a4a43b99ebb3e75e6b9a735d5fd293a24e90ca F sqlite.pc.in 42b7bf0d02e08b9e77734a47798d1a55a9e0716b F sqlite3.1 fc7ad8990fc8409983309bb80de8c811a7506786 F sqlite3.pc.in 48fed132e7cb71ab676105d2a4dc77127d8c1f3a +F sqlite_cfg.h.in baf2e409c63d4e7a765e17769b6ff17c5a82bbd9cbf1e284fd2e4cefaff3fcf2 w config.h.in F src/alter.c 0390ca1d69ec3626cfa9f153114b7ab233e6b2bada6a9eb91361ed385fe90deb F src/analyze.c aabdf3769c7fd9954a8ec508eb7041ae174b66f88d12c47199fabbea9a646467 F src/attach.c 4431f82f0247bf3aaf91589acafdff77d1882235c95407b36da1585c765fbbc8 @@ -534,7 +534,7 @@ F src/btreeInt.h 8ce1332edd89dfd2461d561ac10a0ab5601c8e06200cb5230596c3caaf54482 F src/build.c 6e3ee380a4f0ff95de4b53bf510f66600cff08e4e04b92e95fae789072563f8f F src/callback.c 4cd7225b26a97f7de5fee5ae10464bed5a78f2adefe19534cc2095b3a8ca484a F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e -F src/ctime.c 93e4b5f4faf6d3f688988a116773259a4fbfb4ddac0e9bf9d0ae0429390c2543 +F src/ctime.c 428b47a2548c7c2c2f885189b42fdcc178fb03c276a2d58b3008b10da29373d5 F src/date.c 94ce83b4cd848a387680a5f920c9018c16655db778c4d36525af0a0f34679ac5 F src/dbpage.c 5808e91bc27fa3981b028000f8fadfdc10ce9e59a34ce7dc4e035a69be3906ec F src/dbstat.c 861e08690fcb0f2ee1165eff0060ea8d4f3e2ea10f80dab7d32ad70443a6ff2d @@ -593,7 +593,7 @@ F src/shell.c.in e7e7c2c69ae86c5ee9e8ad66227203d46ff6dce8700a1b1dababff01c71d33d F src/sqlite.h.in 3f4695457fcb41ea8a44c6d09fc2a591bbeda44b13bda86618f3ce0071bbca7c F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8 F src/sqlite3ext.h a988810c9b21c0dc36dc7a62735012339dc76fc7ab448fb0792721d30eacb69d -F src/sqliteInt.h 7571703e6d11cd0e0283be68e9b6baceefedf10e3bbac5869d12183e031c5254 +F src/sqliteInt.h 1d27d00dcaafed614d6ed8738d6c41a81acf12fe50fe4c677427b1c56d8a81da F src/sqliteLimit.h d7323ffea5208c6af2734574bae933ca8ed2ab728083caa117c9738581a31657 F src/status.c 160c445d7d28c984a0eae38c144f6419311ed3eace59b44ac6dafc20db4af749 F src/table.c 0f141b58a16de7e2fbe81c308379e7279f4c6b50eb08efeec5892794a0ba30d1 @@ -1926,7 +1926,7 @@ F tool/max-limits.c cbb635fbb37ae4d05f240bfb5b5270bb63c54439 F tool/merge-test.tcl de76b62f2de2a92d4c1ca4f976bce0aea6899e0229e250479b229b2a1914b176 F tool/mkautoconfamal.sh f62353eb6c06ab264da027fd4507d09914433dbdcab9cb011cdc18016f1ab3b8 F tool/mkccode.tcl 86463e68ce9c15d3041610fedd285ce32a5cf7a58fc88b3202b8b76837650dbe x -F tool/mkctimec.tcl 8f472681f6041cf0ec26a1799feda39e55370614a6090d66fa5044f9f52d22c6 x +F tool/mkctimec.tcl 0e309dfc8bb01cd385deeb010df4ca76dee3ab4e8ec0588233b3f152679122e8 x F tool/mkkeywordhash.c 35bfc41adacc4aa6ef6fca7fd0c63e0ec0534b78daf4d0cfdebe398216bbffc3 F tool/mkmsvcmin.tcl 6ecab9fe22c2c8de4d82d4c46797bda3d2deac8e763885f5a38d0c44a895ab33 F tool/mkopcodec.tcl 33d20791e191df43209b77d37f0ff0904620b28465cca6990cf8d60da61a07ef @@ -2000,8 +2000,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0 -P f3d31c9982cab517a3907a28c571225cee614ee78375c70eb2efb9a2b6b4b042 -R 7f8d304b6a07de2cc69260c5f709e3b7 +P d7c2be6bdc3402e5a339d0f7b76d2c25f3a444dcbf54a77c1ccb790d1195a7cf +R 4713eb8f98a8aeab7d0d3163e5e46206 U drh -Z c497b618e9e71dda49eb7a2e8b6f56d4 +Z cc19c5c21171ef2d2de636f9d251ad05 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 3bd31ec276..81b40ebe86 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -d7c2be6bdc3402e5a339d0f7b76d2c25f3a444dcbf54a77c1ccb790d1195a7cf \ No newline at end of file +897e187cad981126fc5f6ea8e382e937825af10b0c9589b0a23b9fbaa4ca58b8 \ No newline at end of file diff --git a/config.h.in b/sqlite_cfg.h.in similarity index 82% rename from config.h.in rename to sqlite_cfg.h.in index f2ba7d4fc4..3adea09936 100644 --- a/config.h.in +++ b/sqlite_cfg.h.in @@ -1,4 +1,4 @@ -/* config.h.in. Generated from configure.ac by autoheader. */ +/* sqlite_cfg.h.in. Generated from configure.ac by autoheader. */ /* Define to 1 if you have the header file. */ #undef HAVE_DLFCN_H @@ -45,16 +45,16 @@ /* Define to 1 if you have the header file. */ #undef HAVE_MEMORY_H -/* Define to 1 if you have the pread() function. */ +/* Define to 1 if you have the `pread' function. */ #undef HAVE_PREAD -/* Define to 1 if you have the pread64() function. */ +/* Define to 1 if you have the `pread64' function. */ #undef HAVE_PREAD64 -/* Define to 1 if you have the pwrite() function. */ +/* Define to 1 if you have the `pwrite' function. */ #undef HAVE_PWRITE -/* Define to 1 if you have the pwrite64() function. */ +/* Define to 1 if you have the `pwrite64' function. */ #undef HAVE_PWRITE64 /* Define to 1 if you have the header file. */ @@ -63,7 +63,7 @@ /* Define to 1 if you have the header file. */ #undef HAVE_STDLIB_H -/* Define to 1 if you have the strchrnul() function */ +/* Define to 1 if you have the `strchrnul' function. */ #undef HAVE_STRCHRNUL /* Define to 1 if you have the header file. */ @@ -99,9 +99,12 @@ /* Define to 1 if you have the `usleep' function. */ #undef HAVE_USLEEP -/* Define to 1 if you have the utime() library function. */ +/* Define to 1 if you have the `utime' function. */ #undef HAVE_UTIME +/* Define to 1 if you have the header file. */ +#undef HAVE_ZLIB_H + /* Define to the sub-directory in which libtool stores uninstalled libraries. */ #undef LT_OBJDIR @@ -118,12 +121,20 @@ /* Define to the one symbol short name of this package. */ #undef PACKAGE_TARNAME +/* Define to the home page for this package. */ +#undef PACKAGE_URL + /* Define to the version of this package. */ #undef PACKAGE_VERSION /* Define to 1 if you have the ANSI C header files. */ #undef STDC_HEADERS +/* Enable large inode numbers on Mac OS X 10.5. */ +#ifndef _DARWIN_USE_64_BIT_INODE +# define _DARWIN_USE_64_BIT_INODE 1 +#endif + /* Number of bits in a file offset, on hosts where this is settable. */ #undef _FILE_OFFSET_BITS diff --git a/src/ctime.c b/src/ctime.c index 7eb43f20a7..eb425e5887 100644 --- a/src/ctime.c +++ b/src/ctime.c @@ -28,7 +28,7 @@ ** autoconf-based build */ #if defined(_HAVE_SQLITE_CONFIG_H) && !defined(SQLITECONFIG_H) -#include "config.h" +#include "sqlite_cfg.h" #define SQLITECONFIG_H 1 #endif diff --git a/src/sqliteInt.h b/src/sqliteInt.h index 436e428dcf..f2741114f6 100644 --- a/src/sqliteInt.h +++ b/src/sqliteInt.h @@ -208,7 +208,7 @@ ** autoconf-based build */ #if defined(_HAVE_SQLITE_CONFIG_H) && !defined(SQLITECONFIG_H) -#include "config.h" +#include "sqlite_cfg.h" #define SQLITECONFIG_H 1 #endif diff --git a/tool/mkctimec.tcl b/tool/mkctimec.tcl index 1120bc1316..73c28d36bc 100755 --- a/tool/mkctimec.tcl +++ b/tool/mkctimec.tcl @@ -43,7 +43,7 @@ set ::headCode " ** autoconf-based build */ #if defined(_HAVE_SQLITE_CONFIG_H) && !defined(SQLITECONFIG_H) -#include \"config.h\" +#include \"sqlite_cfg.h\" #define SQLITECONFIG_H 1 #endif From 2eca06141feae3d241776e59b798b4aa1ce128b6 Mon Sep 17 00:00:00 2001 From: drh <> Date: Tue, 4 Oct 2022 14:50:46 +0000 Subject: [PATCH 18/18] Attempt to clarify the operation of the xLock and xUnlock VFS I/O methods. Assert() statements added to prove that they behave as the documentation says. FossilOrigin-Name: 3efa811251d4510a074231a1e0b667783cc5f90777466b9dcae675cd9892b423 --- manifest | 16 ++++++++-------- manifest.uuid | 2 +- src/os.c | 2 ++ src/sqlite.h.in | 30 ++++++++++++++++++++---------- 4 files changed, 31 insertions(+), 19 deletions(-) diff --git a/manifest b/manifest index d690941a1f..60a41be11a 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Change\sthe\sname\sof\sthe\sautoconf-generated\sconfiguration\sfile\sfrom\s"config.h"\nto\s"sqlite_cfg.h"\sto\swork\saround\sa\sbug\sin\sa\sdependency\schecker,\sreported\nin\s[https://twitter.com/josecastillo/status/1577136108097314816|a\stweet\sfrom\sJose\sCastillo]. -D 2022-10-04T10:35:10.544 +C Attempt\sto\sclarify\sthe\soperation\sof\sthe\sxLock\sand\sxUnlock\sVFS\sI/O\smethods.\nAssert()\sstatements\sadded\sto\sprove\sthat\sthey\sbehave\sas\sthe\sdocumentation\ssays. +D 2022-10-04T14:50:46.626 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724 @@ -520,7 +520,7 @@ F spec.template 86a4a43b99ebb3e75e6b9a735d5fd293a24e90ca F sqlite.pc.in 42b7bf0d02e08b9e77734a47798d1a55a9e0716b F sqlite3.1 fc7ad8990fc8409983309bb80de8c811a7506786 F sqlite3.pc.in 48fed132e7cb71ab676105d2a4dc77127d8c1f3a -F sqlite_cfg.h.in baf2e409c63d4e7a765e17769b6ff17c5a82bbd9cbf1e284fd2e4cefaff3fcf2 w config.h.in +F sqlite_cfg.h.in baf2e409c63d4e7a765e17769b6ff17c5a82bbd9cbf1e284fd2e4cefaff3fcf2 F src/alter.c 0390ca1d69ec3626cfa9f153114b7ab233e6b2bada6a9eb91361ed385fe90deb F src/analyze.c aabdf3769c7fd9954a8ec508eb7041ae174b66f88d12c47199fabbea9a646467 F src/attach.c 4431f82f0247bf3aaf91589acafdff77d1882235c95407b36da1585c765fbbc8 @@ -568,7 +568,7 @@ F src/mutex_noop.c 9d4309c075ba9cc7249e19412d3d62f7f94839c4 F src/mutex_unix.c dd2b3f1cc1863079bc1349ac0fec395a500090c4fe4e11ab775310a49f2f956d F src/mutex_w32.c caa50e1c0258ac4443f52e00fe8aaea73b6d0728bd8856bedfff822cae418541 F src/notify.c 89a97dc854c3aa62ad5f384ef50c5a4a11d70fcc69f86de3e991573421130ed6 -F src/os.c 0eb831ba3575af5277e47f4edd14fdfc90025c67eb25ce5cda634518d308d4e9 +F src/os.c 81c9c1c52eab711e27e33fd51fe5788488d3a02bc1a71439857abbee5d0d2c97 F src/os.h 1ff5ae51d339d0e30d8a9d814f4b8f8e448169304d83a7ed9db66a65732f3e63 F src/os_common.h b2f4707a603e36811d9b1a13278bffd757857b85 F src/os_setup.h 0dbaea40a7d36bf311613d31342e0b99e2536586 @@ -590,7 +590,7 @@ F src/resolve.c efea4e5fbecfd6d0a9071b0be0d952620991673391b6ffaaf4c277b0bb674633 F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92 F src/select.c bb18acf4eded647fef88d4d543c673874dbebff516fbeba90a85e6c13f2a58cd F src/shell.c.in e7e7c2c69ae86c5ee9e8ad66227203d46ff6dce8700a1b1dababff01c71d33df -F src/sqlite.h.in 3f4695457fcb41ea8a44c6d09fc2a591bbeda44b13bda86618f3ce0071bbca7c +F src/sqlite.h.in bcc51bb43c54676dccbad07051c6d463212707f50363d64f1831440749e91ddb F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8 F src/sqlite3ext.h a988810c9b21c0dc36dc7a62735012339dc76fc7ab448fb0792721d30eacb69d F src/sqliteInt.h 1d27d00dcaafed614d6ed8738d6c41a81acf12fe50fe4c677427b1c56d8a81da @@ -2000,8 +2000,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0 -P d7c2be6bdc3402e5a339d0f7b76d2c25f3a444dcbf54a77c1ccb790d1195a7cf -R 4713eb8f98a8aeab7d0d3163e5e46206 +P 897e187cad981126fc5f6ea8e382e937825af10b0c9589b0a23b9fbaa4ca58b8 +R e2ac55c08c3f1d2d33e5a2d4f6cdf937 U drh -Z cc19c5c21171ef2d2de636f9d251ad05 +Z d8fbc7d6453f3413769ceb23c01d9355 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 81b40ebe86..f7cb13b05b 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -897e187cad981126fc5f6ea8e382e937825af10b0c9589b0a23b9fbaa4ca58b8 \ No newline at end of file +3efa811251d4510a074231a1e0b667783cc5f90777466b9dcae675cd9892b423 \ No newline at end of file diff --git a/src/os.c b/src/os.c index 13c9abcab4..e2914e03c0 100644 --- a/src/os.c +++ b/src/os.c @@ -106,9 +106,11 @@ int sqlite3OsFileSize(sqlite3_file *id, i64 *pSize){ } int sqlite3OsLock(sqlite3_file *id, int lockType){ DO_OS_MALLOC_TEST(id); + assert( lockType>=SQLITE_LOCK_SHARED && lockType<=SQLITE_LOCK_EXCLUSIVE ); return id->pMethods->xLock(id, lockType); } int sqlite3OsUnlock(sqlite3_file *id, int lockType){ + assert( lockType==SQLITE_LOCK_NONE || lockType==SQLITE_LOCK_SHARED ); return id->pMethods->xUnlock(id, lockType); } int sqlite3OsCheckReservedLock(sqlite3_file *id, int *pResOut){ diff --git a/src/sqlite.h.in b/src/sqlite.h.in index df61f3c196..03a3e5cc01 100644 --- a/src/sqlite.h.in +++ b/src/sqlite.h.in @@ -670,13 +670,17 @@ int sqlite3_exec( ** ** SQLite uses one of these integer values as the second ** argument to calls it makes to the xLock() and xUnlock() methods -** of an [sqlite3_io_methods] object. +** of an [sqlite3_io_methods] object. These values are ordered from +** lest restrictive to most restrictive. +** +** The argument to xLock() is always SHARED or higher. The argument to +** xUnlock is either SHARED or NONE. */ -#define SQLITE_LOCK_NONE 0 -#define SQLITE_LOCK_SHARED 1 -#define SQLITE_LOCK_RESERVED 2 -#define SQLITE_LOCK_PENDING 3 -#define SQLITE_LOCK_EXCLUSIVE 4 +#define SQLITE_LOCK_NONE 0 /* xUnlock() only */ +#define SQLITE_LOCK_SHARED 1 /* xLock() or xUnlock() */ +#define SQLITE_LOCK_RESERVED 2 /* xLock() only */ +#define SQLITE_LOCK_PENDING 3 /* xLock() only */ +#define SQLITE_LOCK_EXCLUSIVE 4 /* xLock() only */ /* ** CAPI3REF: Synchronization Type Flags @@ -754,7 +758,14 @@ struct sqlite3_file { **
  • [SQLITE_LOCK_PENDING], or **
  • [SQLITE_LOCK_EXCLUSIVE]. ** -** xLock() increases the lock. xUnlock() decreases the lock. +** xLock() upgrades the database file lock. In other words, xLock() moves the +** database file lock in the direction NONE toward EXCLUSIVE. The argument to +** xLock() is always on of SHARED, RESERVED, PENDING, or EXCLUSIVE, never +** SQLITE_LOCK_NONE. If the database file lock is already at or above the +** requested lock, then the call to xLock() is a no-op. +** xUnlock() downgrades the database file lock to either SHARED or NONE. +* If the lock is already at or below the requested lock state, then the call +** to xUnlock() is a no-op. ** The xCheckReservedLock() method checks whether any database connection, ** either in this process or in some other process, is holding a RESERVED, ** PENDING, or EXCLUSIVE lock on the file. It returns true @@ -859,9 +870,8 @@ struct sqlite3_io_methods { ** opcode causes the xFileControl method to write the current state of ** the lock (one of [SQLITE_LOCK_NONE], [SQLITE_LOCK_SHARED], ** [SQLITE_LOCK_RESERVED], [SQLITE_LOCK_PENDING], or [SQLITE_LOCK_EXCLUSIVE]) -** into an integer that the pArg argument points to. This capability -** is used during testing and is only available when the SQLITE_TEST -** compile-time option is used. +** into an integer that the pArg argument points to. +** This capability is only available if SQLite is compiled with [SQLITE_DEBUG]. ** **
  • [[SQLITE_FCNTL_SIZE_HINT]] ** The [SQLITE_FCNTL_SIZE_HINT] opcode is used by SQLite to give the VFS