Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
Comment: | Fix a bug in lsm queries on levels undergoing incremental an merge that contain range-delete markers. |
---|---|
Downloads: | Tarball | ZIP archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA3-256: |
b2c2487928becbea5a932895d153709c |
User & Date: | dan 2017-07-03 20:19:28.955 |
Context
2017-07-03
| ||
21:09 | Fix compiler warnings in LSM1, especially in the test logic. (check-in: 9bd3be92b8 user: drh tags: trunk) | |
20:19 | Fix a bug in lsm queries on levels undergoing incremental an merge that contain range-delete markers. (check-in: b2c2487928 user: dan tags: trunk) | |
17:37 | Attempt to improve documentation on sqlite3_column_ and sqlite3_value_ interfaces. (check-in: 9111ac69bf user: drh tags: trunk) | |
Changes
Changes to ext/lsm1/lsm_sorted.c.
︙ | ︙ | |||
1948 1949 1950 1951 1952 1953 1954 | /* If the segment-pointer has settled on a key that is smaller than ** the splitkey, invalidate the segment-pointer. */ if( pPtr->pPg ){ res = sortedKeyCompare(pCsr->pDb->xCmp, rtTopic(pPtr->eType), pPtr->pKey, pPtr->nKey, pLvl->iSplitTopic, pLvl->pSplitKey, pLvl->nSplitKey ); | > > > > > > > > | > > | 1948 1949 1950 1951 1952 1953 1954 1955 1956 1957 1958 1959 1960 1961 1962 1963 1964 1965 1966 1967 1968 1969 1970 1971 1972 | /* If the segment-pointer has settled on a key that is smaller than ** the splitkey, invalidate the segment-pointer. */ if( pPtr->pPg ){ res = sortedKeyCompare(pCsr->pDb->xCmp, rtTopic(pPtr->eType), pPtr->pKey, pPtr->nKey, pLvl->iSplitTopic, pLvl->pSplitKey, pLvl->nSplitKey ); if( res<0 ){ if( pPtr->eType & LSM_START_DELETE ){ pPtr->eType &= ~LSM_INSERT; pPtr->pKey = pLvl->pSplitKey; pPtr->nKey = pLvl->nSplitKey; pPtr->pVal = 0; pPtr->nVal = 0; }else{ segmentPtrReset(pPtr, LSM_SEGMENTPTR_FREE_THRESHOLD); } } } if( aPtr[i].pKey ) bHit = 1; } if( rc==LSM_OK && eSeek==LSM_SEEK_LE && bHit==0 ){ rc = segmentPtrEnd(pCsr, &aPtr[0], 1); |
︙ | ︙ |