In vdbesort.c, rename all pointers to sqlite3_file objects "pFd" and use the
name "pFile" only for pointers to SortFile objects. Other comment enhancements. FossilOrigin-Name: 518290a7fc0994f9593c5c3ba5b2610a1b86dae1
This commit is contained in:
drh
parent
966d9f267f
commit
a4c8ca049e
12
manifest
12
manifest
@ -1,5 +1,5 @@
|
||||
C Merge\srecent\strunk\schanges\sinto\sthe\sthreads\sbranch.
|
||||
D 2014-07-28T15:01:37.313
|
||||
C In\svdbesort.c,\srename\sall\spointers\sto\ssqlite3_file\sobjects\s"pFd"\sand\suse\sthe\nname\s"pFile"\sonly\sfor\spointers\sto\sSortFile\sobjects.\s\sOther\scomment\senhancements.
|
||||
D 2014-07-28T17:18:28.406
|
||||
F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
|
||||
F Makefile.in cf57f673d77606ab0f2d9627ca52a9ba1464146a
|
||||
F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
|
||||
@ -291,7 +291,7 @@ F src/vdbeapi.c 24e40422382beb774daab11fe9fe9d37e8a04949
|
||||
F src/vdbeaux.c 3f1d2baa4a8cbdad33cb255a5f4fd1af7a414683
|
||||
F src/vdbeblob.c 9205ce9d3b064d9600f8418a897fc88b5687d9ac
|
||||
F src/vdbemem.c d90a1e8acf8b63dc9d14cbbea12bfec6cec31394
|
||||
F src/vdbesort.c ef998096c8b2a1a85fbd730183a9b62f652e1af3
|
||||
F src/vdbesort.c cbd9f27e3521737ad87149550c6d30994f74df7a
|
||||
F src/vdbetrace.c 6f52bc0c51e144b7efdcfb2a8f771167a8816767
|
||||
F src/vtab.c 21b932841e51ebd7d075e2d0ad1415dce8d2d5fd
|
||||
F src/wal.c 264df50a1b33124130b23180ded2e2c5663c652a
|
||||
@ -1189,7 +1189,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
|
||||
F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
|
||||
F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32
|
||||
F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
|
||||
P 9af50a878f67c1c2a4f1520160cc989650d7196a 5350229b52b18a4961858a30538c5c75e5bd3048
|
||||
R c247ffbe0be6e5ba20860955ecb933f2
|
||||
P 163c247bd8280ab14fe577329c631c8bd884707f
|
||||
R 502fd7906a0bc29e23e7a03a06d6bf2a
|
||||
U drh
|
||||
Z eec00caa889efc5f1f3b6e693b6885aa
|
||||
Z e1002bd8dfbb36530151cc4f8c9e6ac6
|
||||
|
||||
@ -1 +1 @@
|
||||
163c247bd8280ab14fe577329c631c8bd884707f
|
||||
518290a7fc0994f9593c5c3ba5b2610a1b86dae1
|
||||
116
src/vdbesort.c
116
src/vdbesort.c
@ -327,20 +327,24 @@ struct VdbeSorter {
|
||||
/*
|
||||
** An instance of the following object is used to read records out of a
|
||||
** PMA, in sorted order. The next key to be read is cached in nKey/aKey.
|
||||
** pFile==0 at EOF.
|
||||
** aKey might point into aMap or into aBuffer. If neither of those locations
|
||||
** contain a contiguous representation of the key, then aAlloc is allocated
|
||||
** and the key is copied into aAlloc and aKey is made to poitn to aAlloc.
|
||||
**
|
||||
** pFd==0 at EOF.
|
||||
*/
|
||||
struct PmaReader {
|
||||
i64 iReadOff; /* Current read offset */
|
||||
i64 iEof; /* 1 byte past EOF for this PmaReader */
|
||||
int nAlloc; /* Bytes of space at aAlloc */
|
||||
int nKey; /* Number of bytes in key */
|
||||
sqlite3_file *pFile; /* File we are reading from */
|
||||
u8 *aAlloc; /* Allocated space */
|
||||
u8 *aKey; /* Pointer to current key */
|
||||
u8 *aBuffer; /* Current read buffer */
|
||||
int nBuffer; /* Size of read buffer in bytes */
|
||||
u8 *aMap; /* Pointer to mapping of entire file */
|
||||
IncrMerger *pIncr; /* Incremental merger */
|
||||
i64 iReadOff; /* Current read offset */
|
||||
i64 iEof; /* 1 byte past EOF for this PmaReader */
|
||||
int nAlloc; /* Bytes of space at aAlloc */
|
||||
int nKey; /* Number of bytes in key */
|
||||
sqlite3_file *pFd; /* File handle we are reading from */
|
||||
u8 *aAlloc; /* Space for aKey if aBuffer and pMap wont work */
|
||||
u8 *aKey; /* Pointer to current key */
|
||||
u8 *aBuffer; /* Current read buffer */
|
||||
int nBuffer; /* Size of read buffer in bytes */
|
||||
u8 *aMap; /* Pointer to mapping of entire file */
|
||||
IncrMerger *pIncr; /* Incremental merger */
|
||||
};
|
||||
|
||||
/*
|
||||
@ -400,7 +404,7 @@ struct PmaWriter {
|
||||
int iBufStart; /* First byte of buffer to write */
|
||||
int iBufEnd; /* Last byte of buffer to write */
|
||||
i64 iWriteOff; /* Offset of start of buffer in file */
|
||||
sqlite3_file *pFile; /* File to write to */
|
||||
sqlite3_file *pFd; /* File handle to write to */
|
||||
};
|
||||
|
||||
/*
|
||||
@ -454,7 +458,7 @@ static void vdbeIncrFree(IncrMerger *);
|
||||
static void vdbePmaReaderClear(PmaReader *pReadr){
|
||||
sqlite3_free(pReadr->aAlloc);
|
||||
sqlite3_free(pReadr->aBuffer);
|
||||
if( pReadr->aMap ) sqlite3OsUnfetch(pReadr->pFile, 0, pReadr->aMap);
|
||||
if( pReadr->aMap ) sqlite3OsUnfetch(pReadr->pFd, 0, pReadr->aMap);
|
||||
vdbeIncrFree(pReadr->pIncr);
|
||||
memset(pReadr, 0, sizeof(PmaReader));
|
||||
}
|
||||
@ -501,7 +505,7 @@ static int vdbePmaReadBlob(
|
||||
assert( nRead>0 );
|
||||
|
||||
/* Readr data from the file. Return early if an error occurs. */
|
||||
rc = sqlite3OsRead(p->pFile, p->aBuffer, nRead, p->iReadOff);
|
||||
rc = sqlite3OsRead(p->pFd, p->aBuffer, nRead, p->iReadOff);
|
||||
assert( rc!=SQLITE_IOERR_SHORT_READ );
|
||||
if( rc!=SQLITE_OK ) return rc;
|
||||
}
|
||||
@ -619,12 +623,12 @@ static int vdbePmaReaderSeek(
|
||||
assert( pReadr->pIncr==0 || pReadr->pIncr->bEof==0 );
|
||||
|
||||
if( pReadr->aMap ){
|
||||
sqlite3OsUnfetch(pReadr->pFile, 0, pReadr->aMap);
|
||||
sqlite3OsUnfetch(pReadr->pFd, 0, pReadr->aMap);
|
||||
pReadr->aMap = 0;
|
||||
}
|
||||
pReadr->iReadOff = iOff;
|
||||
pReadr->iEof = pFile->iEof;
|
||||
pReadr->pFile = pFile->pFd;
|
||||
pReadr->pFd = pFile->pFd;
|
||||
|
||||
rc = vdbeSorterMapFile(pTask, pFile, &pReadr->aMap);
|
||||
if( rc==SQLITE_OK && pReadr->aMap==0 ){
|
||||
@ -641,7 +645,7 @@ static int vdbePmaReaderSeek(
|
||||
nRead = (int)(pReadr->iEof - pReadr->iReadOff);
|
||||
}
|
||||
rc = sqlite3OsRead(
|
||||
pReadr->pFile, &pReadr->aBuffer[iBuf], nRead, pReadr->iReadOff
|
||||
pReadr->pFd, &pReadr->aBuffer[iBuf], nRead, pReadr->iReadOff
|
||||
);
|
||||
testcase( rc!=SQLITE_OK );
|
||||
}
|
||||
@ -784,9 +788,9 @@ static int vdbeSorterDoCompare(
|
||||
p1 = &pMerger->aReadr[i1];
|
||||
p2 = &pMerger->aReadr[i2];
|
||||
|
||||
if( p1->pFile==0 ){
|
||||
if( p1->pFd==0 ){
|
||||
iRes = i2;
|
||||
}else if( p2->pFile==0 ){
|
||||
}else if( p2->pFd==0 ){
|
||||
iRes = i1;
|
||||
}else{
|
||||
int res;
|
||||
@ -1147,13 +1151,13 @@ void sqlite3VdbeSorterClose(sqlite3 *db, VdbeCursor *pCsr){
|
||||
** Whether or not the file does end up memory mapped of course depends on
|
||||
** the specific VFS implementation.
|
||||
*/
|
||||
static void vdbeSorterExtendFile(sqlite3 *db, sqlite3_file *pFile, i64 nByte){
|
||||
static void vdbeSorterExtendFile(sqlite3 *db, sqlite3_file *pFd, i64 nByte){
|
||||
if( nByte<=(i64)(db->nMaxSorterMmap) ){
|
||||
int rc = sqlite3OsTruncate(pFile, nByte);
|
||||
int rc = sqlite3OsTruncate(pFd, nByte);
|
||||
if( rc==SQLITE_OK ){
|
||||
void *p = 0;
|
||||
sqlite3OsFetch(pFile, 0, (int)nByte, &p);
|
||||
sqlite3OsUnfetch(pFile, 0, p);
|
||||
sqlite3OsFetch(pFd, 0, (int)nByte, &p);
|
||||
sqlite3OsUnfetch(pFd, 0, p);
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -1163,25 +1167,25 @@ static void vdbeSorterExtendFile(sqlite3 *db, sqlite3_file *pFile, i64 nByte){
|
||||
|
||||
/*
|
||||
** Allocate space for a file-handle and open a temporary file. If successful,
|
||||
** set *ppFile to point to the malloc'd file-handle and return SQLITE_OK.
|
||||
** Otherwise, set *ppFile to 0 and return an SQLite error code.
|
||||
** set *ppFd to point to the malloc'd file-handle and return SQLITE_OK.
|
||||
** Otherwise, set *ppFd to 0 and return an SQLite error code.
|
||||
*/
|
||||
static int vdbeSorterOpenTempFile(
|
||||
sqlite3 *db, /* Database handle doing sort */
|
||||
i64 nExtend, /* Attempt to extend file to this size */
|
||||
sqlite3_file **ppFile
|
||||
sqlite3_file **ppFd
|
||||
){
|
||||
int rc;
|
||||
rc = sqlite3OsOpenMalloc(db->pVfs, 0, ppFile,
|
||||
rc = sqlite3OsOpenMalloc(db->pVfs, 0, ppFd,
|
||||
SQLITE_OPEN_TEMP_JOURNAL |
|
||||
SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE |
|
||||
SQLITE_OPEN_EXCLUSIVE | SQLITE_OPEN_DELETEONCLOSE, &rc
|
||||
);
|
||||
if( rc==SQLITE_OK ){
|
||||
i64 max = SQLITE_MAX_MMAP_SIZE;
|
||||
sqlite3OsFileControlHint(*ppFile, SQLITE_FCNTL_MMAP_SIZE, (void*)&max);
|
||||
sqlite3OsFileControlHint(*ppFd, SQLITE_FCNTL_MMAP_SIZE, (void*)&max);
|
||||
if( nExtend>0 ){
|
||||
vdbeSorterExtendFile(db, *ppFile, nExtend);
|
||||
vdbeSorterExtendFile(db, *ppFd, nExtend);
|
||||
}
|
||||
}
|
||||
return rc;
|
||||
@ -1300,10 +1304,10 @@ static int vdbeSorterSort(SortSubtask *pTask, SorterList *pList){
|
||||
** Initialize a PMA-writer object.
|
||||
*/
|
||||
static void vdbePmaWriterInit(
|
||||
sqlite3_file *pFile, /* File to write to */
|
||||
sqlite3_file *pFd, /* File handle to write to */
|
||||
PmaWriter *p, /* Object to populate */
|
||||
int nBuf, /* Buffer size */
|
||||
i64 iStart /* Offset of pFile to begin writing at */
|
||||
i64 iStart /* Offset of pFd to begin writing at */
|
||||
){
|
||||
memset(p, 0, sizeof(PmaWriter));
|
||||
p->aBuffer = (u8*)sqlite3Malloc(nBuf);
|
||||
@ -1313,7 +1317,7 @@ static void vdbePmaWriterInit(
|
||||
p->iBufEnd = p->iBufStart = (iStart % nBuf);
|
||||
p->iWriteOff = iStart - p->iBufStart;
|
||||
p->nBuffer = nBuf;
|
||||
p->pFile = pFile;
|
||||
p->pFd = pFd;
|
||||
}
|
||||
}
|
||||
|
||||
@ -1332,7 +1336,7 @@ static void vdbePmaWriteBlob(PmaWriter *p, u8 *pData, int nData){
|
||||
memcpy(&p->aBuffer[p->iBufEnd], &pData[nData-nRem], nCopy);
|
||||
p->iBufEnd += nCopy;
|
||||
if( p->iBufEnd==p->nBuffer ){
|
||||
p->eFWErr = sqlite3OsWrite(p->pFile,
|
||||
p->eFWErr = sqlite3OsWrite(p->pFd,
|
||||
&p->aBuffer[p->iBufStart], p->iBufEnd - p->iBufStart,
|
||||
p->iWriteOff + p->iBufStart
|
||||
);
|
||||
@ -1357,7 +1361,7 @@ static void vdbePmaWriteBlob(PmaWriter *p, u8 *pData, int nData){
|
||||
static int vdbePmaWriterFinish(PmaWriter *p, i64 *piEof){
|
||||
int rc;
|
||||
if( p->eFWErr==0 && ALWAYS(p->aBuffer) && p->iBufEnd>p->iBufStart ){
|
||||
p->eFWErr = sqlite3OsWrite(p->pFile,
|
||||
p->eFWErr = sqlite3OsWrite(p->pFd,
|
||||
&p->aBuffer[p->iBufStart], p->iBufEnd - p->iBufStart,
|
||||
p->iWriteOff + p->iBufStart
|
||||
);
|
||||
@ -1489,9 +1493,9 @@ static int vdbeMergeEngineStep(
|
||||
for(i=(pMerger->nTree+iPrev)/2; i>0; i=i/2){
|
||||
/* Compare pReadr1 and pReadr2. Store the result in variable iRes. */
|
||||
int iRes;
|
||||
if( pReadr1->pFile==0 ){
|
||||
if( pReadr1->pFd==0 ){
|
||||
iRes = +1;
|
||||
}else if( pReadr2->pFile==0 ){
|
||||
}else if( pReadr2->pFd==0 ){
|
||||
iRes = -1;
|
||||
}else{
|
||||
iRes = vdbeSorterCompare(pTask,
|
||||
@ -1519,12 +1523,12 @@ static int vdbeMergeEngineStep(
|
||||
pReadr2 = &pMerger->aReadr[ pMerger->aTree[i ^ 0x0001] ];
|
||||
pKey2 = pReadr2->aKey;
|
||||
}else{
|
||||
if( pReadr1->pFile ) pKey2 = 0;
|
||||
if( pReadr1->pFd ) pKey2 = 0;
|
||||
pMerger->aTree[i] = (int)(pReadr2 - pMerger->aReadr);
|
||||
pReadr1 = &pMerger->aReadr[ pMerger->aTree[i ^ 0x0001] ];
|
||||
}
|
||||
}
|
||||
*pbEof = (pMerger->aReadr[pMerger->aTree[1]].pFile==0);
|
||||
*pbEof = (pMerger->aReadr[pMerger->aTree[1]].pFd==0);
|
||||
}
|
||||
|
||||
return (rc==SQLITE_OK ? pTask->pUnpacked->errCode : rc);
|
||||
@ -1732,7 +1736,7 @@ static int vdbeIncrPopulate(IncrMerger *pIncr){
|
||||
|
||||
/* Check if the output file is full or if the input has been exhausted.
|
||||
** In either case exit the loop. */
|
||||
if( pReader->pFile==0 ) break;
|
||||
if( pReader->pFd==0 ) break;
|
||||
if( (iEof + nKey + sqlite3VarintLen(nKey))>(iStart + pIncr->mxSz) ) break;
|
||||
|
||||
/* Write the next key to the output. */
|
||||
@ -1826,9 +1830,9 @@ static int vdbeIncrSwap(IncrMerger *pIncr){
|
||||
** pMerger argument before returning.
|
||||
*/
|
||||
static int vdbeIncrNew(
|
||||
SortSubtask *pTask,
|
||||
MergeEngine *pMerger,
|
||||
IncrMerger **ppOut
|
||||
SortSubtask *pTask, /* The thread that will be using the new IncrMerger */
|
||||
MergeEngine *pMerger, /* The MergeEngine that the IncrMerger will control */
|
||||
IncrMerger **ppOut /* Write the new IncrMerger here */
|
||||
){
|
||||
int rc = SQLITE_OK;
|
||||
IncrMerger *pIncr = *ppOut = (IncrMerger*)
|
||||
@ -1861,9 +1865,9 @@ static void vdbeIncrSetThreads(IncrMerger *pIncr){
|
||||
static int vdbePmaReaderIncrInit(PmaReader *pReadr, int eMode);
|
||||
|
||||
/*
|
||||
** Initialize the merger argument passed as the second argument. Once this
|
||||
** function returns, the first key of merged data may be read from the merger
|
||||
** object in the usual fashion.
|
||||
** Initialize the MergeEngine object passed as the second argument. Once this
|
||||
** function returns, the first key of merged data may be read from the
|
||||
** MergeEngine object in the usual fashion.
|
||||
**
|
||||
** If argument eMode is INCRINIT_ROOT, then it is assumed that any IncrMerge
|
||||
** objects attached to the PmaReader objects that the merger reads from have
|
||||
@ -1879,14 +1883,18 @@ static int vdbePmaReaderIncrInit(PmaReader *pReadr, int eMode);
|
||||
** SQLITE_OK is returned if successful, or an SQLite error code otherwise.
|
||||
*/
|
||||
static int vdbeIncrInitMerger(
|
||||
SortSubtask *pTask,
|
||||
MergeEngine *pMerger,
|
||||
SortSubtask *pTask, /* Thread that will run pMerger */
|
||||
MergeEngine *pMerger, /* MergeEngine to initialize */
|
||||
int eMode /* One of the INCRINIT_XXX constants */
|
||||
){
|
||||
int rc = SQLITE_OK; /* Return code */
|
||||
int i; /* For looping over PmaReader objects */
|
||||
int nTree = pMerger->nTree;
|
||||
|
||||
/* Verify that the MergeEngine is assigned to a single thread */
|
||||
assert( pMerger->pTask==0 || pMerger->pTask==pTask );
|
||||
pMerger->pTask = pTask;
|
||||
|
||||
for(i=0; rc==SQLITE_OK && i<nTree; i++){
|
||||
if( eMode==INCRINIT_ROOT ){
|
||||
/* PmaReaders should be normally initialized in order, as if they are
|
||||
@ -1915,21 +1923,21 @@ static int vdbeIncrInitMerger(
|
||||
** to open and/or initialize the temp file related fields of the IncrMerge
|
||||
** object at (pReadr->pIncr).
|
||||
**
|
||||
** If argument eMode is set to INCRINIT_NORMAL, then PmaReader PmaReaders
|
||||
** If argument eMode is set to INCRINIT_NORMAL, then all PmaReaders
|
||||
** in the sub-tree headed by pReadr are also initialized. Data is then loaded
|
||||
** into the buffers belonging to this PmaReader, pReadr, and it is set to
|
||||
** into the buffers belonging to pReadr and it is set to
|
||||
** point to the first key in its range.
|
||||
**
|
||||
** If argument eMode is set to INCRINIT_TASK, then PmaReader is guaranteed
|
||||
** If argument eMode is set to INCRINIT_TASK, then pReadr is guaranteed
|
||||
** to be a multi-threaded PmaReader and this function is being called in a
|
||||
** background thread. In this case all PmaReaders in the sub-tree are
|
||||
** initialized as for INCRINIT_NORMAL and the aFile[1] buffer belonging to
|
||||
** pReadr is populated. However, the PmaReader itself is not set up to point
|
||||
** pReadr is populated. However, pReadr itself is not set up to point
|
||||
** to its first key. A call to vdbePmaReaderNext() is still required to do
|
||||
** that.
|
||||
**
|
||||
** The reason this function does not call vdbePmaReaderNext() immediately
|
||||
** in the INCRINIT_TASK case is that vdbePmaReaderNext() assumes that has
|
||||
** in the INCRINIT_TASK case is that vdbePmaReaderNext() assumes that it has
|
||||
** to block on thread (pTask->thread) before accessing aFile[1]. But, since
|
||||
** this entire function is being run by thread (pTask->thread), that will
|
||||
** lead to the current background thread attempting to join itself.
|
||||
@ -2353,7 +2361,7 @@ int sqlite3VdbeSorterNext(sqlite3 *db, const VdbeCursor *pCsr, int *pbEof){
|
||||
#if SQLITE_MAX_WORKER_THREADS>0
|
||||
if( pSorter->bUseThreads ){
|
||||
rc = vdbePmaReaderNext(pSorter->pReader);
|
||||
*pbEof = (pSorter->pReader->pFile==0);
|
||||
*pbEof = (pSorter->pReader->pFd==0);
|
||||
}else
|
||||
#endif
|
||||
/*if( !pSorter->bUseThreads )*/ {
|
||||
|
||||
Loading…
Reference in New Issue
Block a user