diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2017-06-09 12:21:22 +0200 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2017-06-09 12:21:22 +0200 |
commit | 4c4ef972ce362bd544aa3b4f6420849d22d48678 (patch) | |
tree | 757859065ff49d65f803a9466483921e8800f8b0 | |
parent | b88e40f90c0e985a60e1172a4dd74bca43035e57 (diff) |
Use consistent naming and the magic -1 at the magic place.
-rw-r--r-- | searchlib/src/vespa/searchlib/docstore/randreaders.cpp | 10 | ||||
-rw-r--r-- | searchlib/src/vespa/searchlib/docstore/randreaders.h | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/searchlib/src/vespa/searchlib/docstore/randreaders.cpp b/searchlib/src/vespa/searchlib/docstore/randreaders.cpp index ed7505d8226..aaefe333d55 100644 --- a/searchlib/src/vespa/searchlib/docstore/randreaders.cpp +++ b/searchlib/src/vespa/searchlib/docstore/randreaders.cpp @@ -105,10 +105,10 @@ MMapRandReadDynamic::MMapRandReadDynamic(const vespalib::string &fileName, int m } void -MMapRandReadDynamic::remap(size_t end) +MMapRandReadDynamic::remap(size_t sz) { vespalib::LockGuard guard(_lock); - if ((end > 0) && _holder.hasValue() && contains(*_holder.get(), end)) { + if ((sz > 0) && _holder.hasValue() && contains(*_holder.get(), sz)) { return; } std::unique_ptr<FastOS_File> file(new FastOS_File(_fileName.c_str())); @@ -126,7 +126,7 @@ FileRandRead::FSP MMapRandReadDynamic::read(size_t offset, vespalib::DataBuffer & buffer, size_t sz) { FSP file(_holder.get()); - size_t end = offset + sz - 1; + size_t end = offset + sz; const char * data(static_cast<const char *>(file->MemoryMapPtr(offset))); while ((data == nullptr) || !contains(*file, end)) { // Must check that both start and end of file is mapped in. @@ -139,8 +139,8 @@ MMapRandReadDynamic::read(size_t offset, vespalib::DataBuffer & buffer, size_t s } bool -MMapRandReadDynamic::contains(FastOS_FileInterface & file, size_t offset) { - return (file.MemoryMapPtr(offset-1) != nullptr); +MMapRandReadDynamic::contains(const FastOS_FileInterface & file, size_t sz) { + return (sz == 0) || (file.MemoryMapPtr(sz - 1) != nullptr); } diff --git a/searchlib/src/vespa/searchlib/docstore/randreaders.h b/searchlib/src/vespa/searchlib/docstore/randreaders.h index 331a7fa231c..fc4635339f3 100644 --- a/searchlib/src/vespa/searchlib/docstore/randreaders.h +++ b/searchlib/src/vespa/searchlib/docstore/randreaders.h @@ -41,7 +41,7 @@ public: FSP read(size_t offset, vespalib::DataBuffer & buffer, size_t sz) override; int64_t getSize() override; private: - static bool contains(const FastOS_FileInterface & file, size_t end); + static bool contains(const FastOS_FileInterface & file, size_t sz); void remap(size_t end); vespalib::string _fileName; vespalib::PtrHolder<FastOS_FileInterface> _holder; |