Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Fix an edge case in vdbesort.c. |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | sorter-coalesce-writes |
| Files: | files | file ages | folders |
| SHA1: |
4ba266fc534f390267180eca8d68b8d5 |
| User & Date: | dan 2012-07-23 20:10:35 |
Context
|
2012-07-26
| ||
| 09:21 | Update some comments in vdbesort.c. (check-in: f4b3fded user: dan tags: sorter-coalesce-writes) | |
|
2012-07-23
| ||
| 20:10 | Fix an edge case in vdbesort.c. (check-in: 4ba266fc user: dan tags: sorter-coalesce-writes) | |
| 19:25 | Modify the code in vdbesort.c so that most reads and writes to temporary files are aligned page-sized blocks. (check-in: 55e47ef3 user: dan tags: sorter-coalesce-writes) | |
Changes
Changes to src/vdbesort.c.
317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 |
pIter->aBuffer = (u8 *)sqlite3DbMallocRaw(db, nBuf);
if( !pIter->aBuffer ){
rc = SQLITE_NOMEM;
}else{
int iBuf;
iBuf = pIter->iReadOff % nBuf;
if( iBuf ){
rc = sqlite3OsRead(
pSorter->pTemp1, &pIter->aBuffer[iBuf], nBuf-iBuf, iStart
);
assert( rc!=SQLITE_IOERR_SHORT_READ );
}
if( rc==SQLITE_OK ){
u64 nByte; /* Size of PMA in bytes */
pIter->iEof = iStart + pIter->nBuffer;
rc = vdbeSorterIterVarint(db, pIter, &nByte);
pIter->iEof = pIter->iReadOff + nByte;
*pnByte += nByte;
}
}
if( rc==SQLITE_OK ){
|
| > > > > | | |
317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 |
pIter->aBuffer = (u8 *)sqlite3DbMallocRaw(db, nBuf);
if( !pIter->aBuffer ){
rc = SQLITE_NOMEM;
}else{
int iBuf;
iBuf = iStart % nBuf;
if( iBuf ){
int nRead = nBuf - iBuf;
if( (iStart + nRead) > pSorter->iWriteOff ){
nRead = pSorter->iWriteOff - iStart;
}
rc = sqlite3OsRead(
pSorter->pTemp1, &pIter->aBuffer[iBuf], nRead, iStart
);
assert( rc!=SQLITE_IOERR_SHORT_READ );
}
if( rc==SQLITE_OK ){
u64 nByte; /* Size of PMA in bytes */
pIter->iEof = pSorter->iWriteOff;
rc = vdbeSorterIterVarint(db, pIter, &nByte);
pIter->iEof = pIter->iReadOff + nByte;
*pnByte += nByte;
}
}
if( rc==SQLITE_OK ){
|