Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Remove a broken assert from lsm_sorted.c. |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | embedded-btree |
| Files: | files | file ages | folders |
| SHA1: |
50e87e23bb8e0c0afd3fceb3d855dd36 |
| User & Date: | dan 2012-06-27 16:10:09 |
Context
|
2012-06-27
| ||
| 16:34 | Merge embedded-btree branch with trunk. check-in: 5eed33bc57 user: dan tags: trunk | |
| 16:10 | Remove a broken assert from lsm_sorted.c. Leaf check-in: 50e87e23bb user: dan tags: embedded-btree | |
| 16:02 | Testing finds no cases where separator runs are faster than embedded btrees. So discard the separator runs related code. check-in: afcbe561ff user: dan tags: embedded-btree | |
Changes
Changes to src/lsm_sorted.c.
3331 3332 3333 3334 3335 3336 3337 3338 3339 3340 3341 3342 3343 3344 3345 |
rc = mergeWorkerWrite(pMW, eType, pKey, nKey, pCsr, iPtr, &iSPtr);
}
}
/* Advance the cursor to the next input record (assuming one exists). */
assert( lsmMCursorValid(pMW->pCsr) );
if( rc==LSM_OK ) rc = lsmMCursorNext(pMW->pCsr);
assert( pMW->pPage==0 );
/* If the cursor is at EOF, the merge is finished. Release all page
** references currently held by the merge worker and inform the
** FileSystem object that no further pages will be appended to either
** the main or separators array.
*/
if( rc==LSM_OK && !lsmMCursorValid(pMW->pCsr) ){
|
< |
3331 3332 3333 3334 3335 3336 3337 3338 3339 3340 3341 3342 3343 3344 |
rc = mergeWorkerWrite(pMW, eType, pKey, nKey, pCsr, iPtr, &iSPtr);
}
}
/* Advance the cursor to the next input record (assuming one exists). */
assert( lsmMCursorValid(pMW->pCsr) );
if( rc==LSM_OK ) rc = lsmMCursorNext(pMW->pCsr);
/* If the cursor is at EOF, the merge is finished. Release all page
** references currently held by the merge worker and inform the
** FileSystem object that no further pages will be appended to either
** the main or separators array.
*/
if( rc==LSM_OK && !lsmMCursorValid(pMW->pCsr) ){
|