Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Fix a problem in USE_LOG=0 mode. |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA1: |
07a6f43d5886f3da5989926f3479aefb |
| User & Date: | dan 2013-02-20 19:36:54 |
Context
|
2013-02-20
| ||
| 21:31 | Fix the query flattener to avoid an assert in TH4. check-in: 88e0227355 user: drh tags: trunk | |
| 19:36 | Fix a problem in USE_LOG=0 mode. check-in: 07a6f43d58 user: dan tags: trunk | |
| 18:41 | Remove the zeroblob interfaces. check-in: f63a20c194 user: drh tags: trunk | |
Changes
Changes to src/lsm_ckpt.c.
42 43 44 45 46 47 48 49 50 51 52 53 54 55 .... 1119 1120 1121 1122 1123 1124 1125 1126 1127 1128 1129 1130 1131 1132 1133 .... 1179 1180 1181 1182 1183 1184 1185 1186 1187 1188 1189 1190 1191 1192 1193 1194 1195 |
** Log pointer: ** ** 1. The log offset MSW. ** 2. The log offset LSW. ** 3. Log checksum 0. ** 4. Log checksum 1. ** ** See ckptExportLog() and ckptImportLog(). ** ** Append points: ** ** 8 integers (4 * 64-bit page numbers). See ckptExportAppendlist(). ** ** For each level in the database, a level record. Formatted as follows: ................................................................................ if( nCkpt<(LSM_META_PAGE_SIZE/sizeof(u32)) ){ u32 *aCopy = lsmMallocRc(pDb->pEnv, sizeof(u32) * nCkpt, &rc); if( aCopy ){ memcpy(aCopy, aData, nCkpt*sizeof(u32)); ckptChangeEndianness(aCopy, nCkpt); if( ckptChecksumOk(aCopy) ){ if( piId ) *piId = lsmCheckpointId(aCopy, 0); if( piLog ) *piLog = lsmCheckpointLogOffset(aCopy); if( pnWrite ) *pnWrite = aCopy[CKPT_HDR_NWRITE]; } lsmFree(pDb->pEnv, aCopy); } } lsmFsMetaPageRelease(pPg); } ................................................................................ int lsmCheckpointBlksz(u32 *aCkpt){ return (int)aCkpt[CKPT_HDR_BLKSZ]; } void lsmCheckpointLogoffset( u32 *aCkpt, DbLog *pLog ){ u32 iOffMSB = aCkpt[CKPT_HDR_LO_MSW]; u32 iOffLSB = aCkpt[CKPT_HDR_LO_LSW]; pLog->aRegion[2].iStart = (((i64)iOffMSB) << 32) + ((i64)iOffLSB); pLog->cksum0 = aCkpt[CKPT_HDR_LO_CKSUM1]; pLog->cksum1 = aCkpt[CKPT_HDR_LO_CKSUM2]; pLog->iSnapshotId = lsmCheckpointId(aCkpt, 0); } void lsmCheckpointZeroLogoffset(lsm_db *pDb){ u32 nCkpt; |
> > > > > > | | | < |
42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 .... 1125 1126 1127 1128 1129 1130 1131 1132 1133 1134 1135 1136 1137 1138 1139 .... 1185 1186 1187 1188 1189 1190 1191 1192 1193 1194 1195 1196 1197 1198 1199 1200 |
** Log pointer: ** ** 1. The log offset MSW. ** 2. The log offset LSW. ** 3. Log checksum 0. ** 4. Log checksum 1. ** ** Note that the "log offset" is not the literal byte offset. Instead, ** it is the byte offset multiplied by 2, with least significant bit ** toggled each time the log pointer value is changed. This is to make ** sure that this field changes each time the log pointer is updated, ** even if the log file itself is disabled. See lsmTreeMakeOld(). ** ** See ckptExportLog() and ckptImportLog(). ** ** Append points: ** ** 8 integers (4 * 64-bit page numbers). See ckptExportAppendlist(). ** ** For each level in the database, a level record. Formatted as follows: ................................................................................ if( nCkpt<(LSM_META_PAGE_SIZE/sizeof(u32)) ){ u32 *aCopy = lsmMallocRc(pDb->pEnv, sizeof(u32) * nCkpt, &rc); if( aCopy ){ memcpy(aCopy, aData, nCkpt*sizeof(u32)); ckptChangeEndianness(aCopy, nCkpt); if( ckptChecksumOk(aCopy) ){ if( piId ) *piId = lsmCheckpointId(aCopy, 0); if( piLog ) *piLog = (lsmCheckpointLogOffset(aCopy) >> 1); if( pnWrite ) *pnWrite = aCopy[CKPT_HDR_NWRITE]; } lsmFree(pDb->pEnv, aCopy); } } lsmFsMetaPageRelease(pPg); } ................................................................................ int lsmCheckpointBlksz(u32 *aCkpt){ return (int)aCkpt[CKPT_HDR_BLKSZ]; } void lsmCheckpointLogoffset( u32 *aCkpt, DbLog *pLog ){ pLog->aRegion[2].iStart = (lsmCheckpointLogOffset(aCkpt) >> 1); pLog->cksum0 = aCkpt[CKPT_HDR_LO_CKSUM1]; pLog->cksum1 = aCkpt[CKPT_HDR_LO_CKSUM2]; pLog->iSnapshotId = lsmCheckpointId(aCkpt, 0); } void lsmCheckpointZeroLogoffset(lsm_db *pDb){ u32 nCkpt; |
Changes to src/lsm_tree.c.
1043 1044 1045 1046 1047 1048 1049 1050 1051 1052 1053 1054 1055 1056 1057 1058 |
}
}
return rc;
}
void lsmTreeMakeOld(lsm_db *pDb){
if( pDb->treehdr.iOldShmid==0 ){
pDb->treehdr.iOldLog = pDb->treehdr.log.aRegion[2].iEnd;
pDb->treehdr.oldcksum0 = pDb->treehdr.log.cksum0;
pDb->treehdr.oldcksum1 = pDb->treehdr.log.cksum1;
pDb->treehdr.iOldShmid = pDb->treehdr.iNextShmid-1;
memcpy(&pDb->treehdr.oldroot, &pDb->treehdr.root, sizeof(TreeRoot));
pDb->treehdr.root.iTransId = 1;
pDb->treehdr.root.iRoot = 0;
|
> > > > > > > > > | > > |
1043 1044 1045 1046 1047 1048 1049 1050 1051 1052 1053 1054 1055 1056 1057 1058 1059 1060 1061 1062 1063 1064 1065 1066 1067 1068 1069 |
}
}
return rc;
}
void lsmTreeMakeOld(lsm_db *pDb){
/* A write transaction must be open. Otherwise the code below that
** assumes (pDb->pClient->iLogOff) is current may malfunction.
**
** Update: currently this assert fails due to lsm_flush(), which does
** not set nTransOpen.
*/
assert( /* pDb->nTransOpen>0 && */ pDb->iReader>=0 );
if( pDb->treehdr.iOldShmid==0 ){
pDb->treehdr.iOldLog = (pDb->treehdr.log.aRegion[2].iEnd << 1);
pDb->treehdr.iOldLog |= (~(pDb->pClient->iLogOff) & (i64)0x0001);
pDb->treehdr.oldcksum0 = pDb->treehdr.log.cksum0;
pDb->treehdr.oldcksum1 = pDb->treehdr.log.cksum1;
pDb->treehdr.iOldShmid = pDb->treehdr.iNextShmid-1;
memcpy(&pDb->treehdr.oldroot, &pDb->treehdr.root, sizeof(TreeRoot));
pDb->treehdr.root.iTransId = 1;
pDb->treehdr.root.iRoot = 0;
|