DragonX/dragonx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Squashed 'src/leveldb/' changes from 7924331..7d41e6f

Browse Source 
7d41e6f Merge upstream LevelDB 1.18
803d692 Release 1.18

git-subtree-dir: src/leveldb
git-subtree-split: 7d41e6f89ff04ce9e6a742932924796f69c6e23d
This commit is contained in:
Pieter Wuille
2014-10-16 12:23:50 -07:00
parent 938b689846
commit 4b0e2d75d7
40 changed files with 602 additions and 282 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
helpers/memenv/memenv.cc
View File

@@ -55,14 +55,15 @@ class FileState {
}
const uint64_t available = size_ - offset;
if (n > available) {
n = available;
n = static_cast<size_t>(available);
}
if (n == 0) {
*result = Slice();
return Status::OK();
}
size_t block = offset / kBlockSize;
assert(offset / kBlockSize <= SIZE_MAX);
size_t block = static_cast<size_t>(offset / kBlockSize);
size_t block_offset = offset % kBlockSize;
if (n <= kBlockSize - block_offset) {
@@ -167,7 +168,7 @@ class SequentialFileImpl : public SequentialFile {
if (pos_ > file_->Size()) {
return Status::IOError("pos_ > file_->Size()");
}
const size_t available = file_->Size() - pos_;
const uint64_t available = file_->Size() - pos_;
if (n > available) {
n = available;
}
@@ -177,7 +178,7 @@ class SequentialFileImpl : public SequentialFile {
private:
FileState* file_;
size_t pos_;
uint64_t pos_;
};
class RandomAccessFileImpl : public RandomAccessFile {