Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Fix an assert() in the merge-sort logic to account for I/O errors. |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA1: | c1daa809a17a97610e51f9babd90f369 |
| User & Date: | drh 2011-08-15 15:37:15 |
Context
|
2011-08-15
| ||
| 19:44 | Updated comments on the multiplexor extension. No changes to code. check-in: 0f42ef69 user: drh tags: trunk | |
| 15:37 | Fix an assert() in the merge-sort logic to account for I/O errors. check-in: c1daa809 user: drh tags: trunk | |
| 15:27 | New makefile target "sqlite3-debug.c" builds an amalgamation that include appropriate "#line" macros relating the code back to the original source files. check-in: 26f2da24 user: drh tags: trunk | |
Changes
Changes to src/vdbesort.c.
537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 |
i64 nByte = 0; /* Total bytes in all opened PMAs */
/* Initialize the iterators. */
for(i=0; rc==SQLITE_OK && i<SORTER_MAX_MERGE_COUNT; i++){
VdbeSorterIter *pIter = &pSorter->aIter[i];
rc = vdbeSorterIterInit(db, pSorter, pSorter->iReadOff, pIter, &nByte);
pSorter->iReadOff = pIter->iEof;
assert( pSorter->iReadOff<=pSorter->iWriteOff );
if( pSorter->iReadOff>=pSorter->iWriteOff ) break;
}
/* Initialize the aTree[] array. */
for(i=pSorter->nTree-1; rc==SQLITE_OK && i>0; i--){
rc = vdbeSorterDoCompare(pCsr, i);
}
|
| |
537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 |
i64 nByte = 0; /* Total bytes in all opened PMAs */
/* Initialize the iterators. */
for(i=0; rc==SQLITE_OK && i<SORTER_MAX_MERGE_COUNT; i++){
VdbeSorterIter *pIter = &pSorter->aIter[i];
rc = vdbeSorterIterInit(db, pSorter, pSorter->iReadOff, pIter, &nByte);
pSorter->iReadOff = pIter->iEof;
assert( pSorter->iReadOff<=pSorter->iWriteOff || rc!=SQLITE_OK );
if( pSorter->iReadOff>=pSorter->iWriteOff ) break;
}
/* Initialize the aTree[] array. */
for(i=pSorter->nTree-1; rc==SQLITE_OK && i>0; i--){
rc = vdbeSorterDoCompare(pCsr, i);
}
|