wbtiger
/
foundationdb
mirror of https://github.com/apple/foundationdb.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Compilation error fix.

This commit is contained in:
negoyal 2020-04-14 18:21:43 -07:00
parent 7a9bcf8222
commit 9034964864
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
fdbserver/StorageCache.actor.cpp
View File

@ -524,8 +524,10 @@ GetKeyValuesReply readRange(StorageCacheData* data, Version version, KeyRangeRef
StorageCacheData::VersionedData::ViewAtVersion view = data->data().at(version); StorageCacheData::VersionedData::ViewAtVersion view = data->data().at(version);
StorageCacheData::VersionedData::iterator vCurrent = view.end(); StorageCacheData::VersionedData::iterator vCurrent = view.end();
KeyRef readBegin; KeyRef readBegin;
KeyRef readEnd;
KeyRef rangeBegin = range.begin; KeyRef rangeBegin = range.begin;
KeyRef rangeEnd = range.end; KeyRef rangeEnd = range.end;
int accumulatedBytes = 0;
//printf("\nSCReadRange\n"); //printf("\nSCReadRange\n");
// if (limit >= 0) we are reading forward, else backward // if (limit >= 0) we are reading forward, else backward
@ -544,7 +546,7 @@ GetKeyValuesReply readRange(StorageCacheData* data, Version version, KeyRangeRef
--b; --b;
ASSERT(!b || b.key() < readBegin); ASSERT(!b || b.key() < readBegin);
} }
int accumulatedBytes = 0; accumulatedBytes = 0;
while (vCurrent && vCurrent.key() < rangeEnd && limit > 0 && accumulatedBytes < *pLimitBytes) { while (vCurrent && vCurrent.key() < rangeEnd && limit > 0 && accumulatedBytes < *pLimitBytes) {
if (!vCurrent->isClearTo()) { if (!vCurrent->isClearTo()) {
result.data.push_back_deep(result.arena, KeyValueRef(vCurrent.key(), vCurrent->getValue())); result.data.push_back_deep(result.arena, KeyValueRef(vCurrent.key(), vCurrent->getValue()));
@ -569,7 +571,7 @@ GetKeyValuesReply readRange(StorageCacheData* data, Version version, KeyRangeRef
--b; --b;
ASSERT(!b || b.key() >= readEnd); ASSERT(!b || b.key() >= readEnd);
} }
int accumulatedBytes = 0; accumulatedBytes = 0;
while (vCurrent && vCurrent.key() >= rangeEnd && limit > 0 && accumulatedBytes < *pLimitBytes) { while (vCurrent && vCurrent.key() >= rangeEnd && limit > 0 && accumulatedBytes < *pLimitBytes) {
if (!vCurrent->isClearTo()) { if (!vCurrent->isClearTo()) {
result.data.push_back_deep(result.arena, KeyValueRef(vCurrent.key(), vCurrent->getValue())); result.data.push_back_deep(result.arena, KeyValueRef(vCurrent.key(), vCurrent->getValue()));