Skip to content

Commit dbb8091

Browse files
rlyerlymeta-codesync[bot]
authored andcommitted
Remove BlockCache::writeToBuffer
Summary: - Fix lint in RegionManager - Remove Region::writeToBuffer(). Previous diffs removed the intermediate copy, this was only used in tests. Reviewed By: AlnisM Differential Revision: D108615063 fbshipit-source-id: 11ee8570c25b4a8a88f9e2680a6ec2b4e5e74a89
1 parent aa2fa61 commit dbb8091

4 files changed

Lines changed: 6 additions & 16 deletions

File tree

cachelib/navy/block_cache/Region.cpp

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -182,14 +182,6 @@ RelAddress Region::allocateLocked(uint32_t size) {
182182
return RelAddress{regionId_, offset};
183183
}
184184

185-
void Region::writeToBuffer(uint32_t offset, BufferView buf) {
186-
std::lock_guard l{lock_};
187-
XDCHECK_NE(buffer_, nullptr);
188-
auto size = buf.size();
189-
XDCHECK_LE(offset + size, buffer_->size());
190-
memcpy(buffer_->data() + offset, buf.data(), size);
191-
}
192-
193185
void Region::readFromBuffer(uint32_t fromOffset,
194186
MutableBufferView outBuf) const {
195187
std::lock_guard l{lock_};

cachelib/navy/block_cache/Region.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -142,9 +142,6 @@ class Region {
142142
return 0;
143143
}
144144

145-
// Writes buf to attached buffer at offset 'offset'.
146-
void writeToBuffer(uint32_t offset, BufferView buf);
147-
148145
// Reads from attached buffer from 'fromOffset' into 'outBuf'.
149146
void readFromBuffer(uint32_t fromOffset, MutableBufferView outBuf) const;
150147

cachelib/navy/block_cache/RegionManager.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@ RegionManager::getCleanRegion(RegionId& rid, bool addWaiter) {
228228
return {OpenStatus::Retry, nullptr};
229229
}
230230

231-
auto status = OpenStatus::Retry;
231+
OpenStatus status;
232232
std::unique_ptr<CondWaiter> waiter;
233233
uint32_t newSched = 0;
234234
{

cachelib/navy/block_cache/tests/RegionTest.cpp

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -73,12 +73,13 @@ TEST(Region, BufferAttachDetach) {
7373
Region r{RegionId(0), 1024};
7474
r.attachBuffer(std::move(b));
7575
EXPECT_TRUE(r.hasBuffer());
76-
Buffer writeBuf(1024);
77-
memset(writeBuf.data(), 'A', 1024);
76+
auto [desc, _, writeView] = r.openAndAllocate(1024);
77+
memset(writeView.data(), 'A', 1024);
78+
r.close(std::move(desc));
7879
Buffer readBuf(1024);
79-
r.writeToBuffer(0, writeBuf.view());
8080
r.readFromBuffer(0, readBuf.mutableView());
81-
EXPECT_TRUE(writeBuf.view() == readBuf.view());
81+
const std::vector<char> expected(1024, 'A');
82+
EXPECT_EQ(std::memcmp(expected.data(), readBuf.data(), 1024), 0);
8283
b = r.detachBuffer();
8384
EXPECT_FALSE(r.hasBuffer());
8485
}

0 commit comments

Comments
 (0)