Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Remove a faulty assert() from vdbesort.c. |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | threads |
| Files: | files | file ages | folders |
| SHA1: |
d95d68aa1d14b750888d50068380cc10 |
| User & Date: | dan 2014-05-02 16:03:57 |
Context
|
2014-05-02
| ||
| 17:12 | Fix some broken asserts in btree.c and vdbeaux.c that may fail following an OOM error. check-in: e15f4706 user: dan tags: threads | |
| 16:03 | Remove a faulty assert() from vdbesort.c. check-in: d95d68aa user: dan tags: threads | |
|
2014-04-24
| ||
| 12:28 | Improvements to comments. Store some extra information in SqliteThread that is useful for debugging. check-in: 9fb5e212 user: drh tags: threads | |
Changes
Changes to src/vdbesort.c.
1896 1897 1898 1899 1900 1901 1902 1903 1904 1905 1906 1907 1908 1909 1910 |
static int vdbePmaReaderIncrInit(PmaReader *pIter, int eMode){
int rc = SQLITE_OK;
IncrMerger *pIncr = pIter->pIncr;
if( pIncr ){
SortSubtask *pTask = pIncr->pTask;
sqlite3 *db = pTask->pSorter->db;
assert( eMode==INCRINIT_NORMAL || pIncr->bUseThread==1 );
rc = vdbeIncrInitMerger(pTask, pIncr->pMerger, eMode);
/* Set up the required files for pIncr. A multi-theaded IncrMerge object
** requires two temp files to itself, whereas a single-threaded object
** only requires a region of pTask->file2. */
if( rc==SQLITE_OK ){
int mxSz = pIncr->mxSz;
|
< |
1896 1897 1898 1899 1900 1901 1902 1903 1904 1905 1906 1907 1908 1909 |
static int vdbePmaReaderIncrInit(PmaReader *pIter, int eMode){
int rc = SQLITE_OK;
IncrMerger *pIncr = pIter->pIncr;
if( pIncr ){
SortSubtask *pTask = pIncr->pTask;
sqlite3 *db = pTask->pSorter->db;
rc = vdbeIncrInitMerger(pTask, pIncr->pMerger, eMode);
/* Set up the required files for pIncr. A multi-theaded IncrMerge object
** requires two temp files to itself, whereas a single-threaded object
** only requires a region of pTask->file2. */
if( rc==SQLITE_OK ){
int mxSz = pIncr->mxSz;
|