DeepSeek/3FS
1
0
Fork 0
mirror of https://github.com/deepseek-ai/3FS synced 2025-06-11 09:04:06 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

replace magic number 10 with sizeof(kv::Versionstamp) (#47)

Browse Source
This commit is contained in:
demons 2025-03-03 10:33:17 +08:00 committed by GitHub
parent 9fd2567cb8
commit c69d46e791
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/common/kv/mem/MemTransaction.h
View File

@ -123,9 +123,10 @@ class MemTransaction : public IReadWriteTransaction {
if (canceled_) { if (canceled_) {
co_return makeError(TransactionCode::kCanceled, "Canceled transaction!"); co_return makeError(TransactionCode::kCanceled, "Canceled transaction!");
} }
if (offset + 10 > key.size()) { if (offset + sizeof(kv::Versionstamp) > key.size()) {
co_return makeError(StatusCode::kInvalidArg, co_return makeError(
fmt::format("setVersionstampedKey: {} + 10 > key.size {}", offset, key.size())); StatusCode::kInvalidArg,
fmt::format("setVersionstampedKey: {} + sizeof(kv::Versionstamp) > key.size {}", offset, key.size()));
} }
versionstampedChanges_.push_back( versionstampedChanges_.push_back(
mem::MemKV::VersionstampedKV::versionstampedKey(std::string(key), offset, std::string(value))); mem::MemKV::VersionstampedKV::versionstampedKey(std::string(key), offset, std::string(value)));
@ -137,9 +138,10 @@ class MemTransaction : public IReadWriteTransaction {
if (canceled_) { if (canceled_) {
co_return makeError(TransactionCode::kCanceled, "Canceled transaction!"); co_return makeError(TransactionCode::kCanceled, "Canceled transaction!");
} }
if (offset + 10 > value.size()) { if (offset + sizeof(kv::Versionstamp) > value.size()) {
co_return makeError(StatusCode::kInvalidArg, co_return makeError(
fmt::format("setVersionstampedValue: {} + 10 > value.size {}", offset, value.size())); StatusCode::kInvalidArg,
fmt::format("setVersionstampedValue: {} + sizeof(kv::Versionstamp) > value.size {}", offset, value.size()));
} }
versionstampedChanges_.push_back( versionstampedChanges_.push_back(
mem::MemKV::VersionstampedKV::versionstampedValue(std::string(key), std::string(value), offset)); mem::MemKV::VersionstampedKV::versionstampedValue(std::string(key), std::string(value), offset));

14
src/fdb/FDBTransaction.cc
View File

@ -331,9 +331,10 @@ CoTryTask<void> FDBTransaction::set(std::string_view key, std::string_view value
} }
CoTryTask<void> FDBTransaction::setVersionstampedKey(std::string_view key, uint32_t offset, std::string_view value) { CoTryTask<void> FDBTransaction::setVersionstampedKey(std::string_view key, uint32_t offset, std::string_view value) {
if (offset + 10 > key.size()) { if (offset + sizeof(kv::Versionstamp) > key.size()) {
co_return makeError(StatusCode::kInvalidArg, co_return makeError(
fmt::format("setVersionstampedKey: {} + 10 > key.size {}", offset, key.size())); StatusCode::kInvalidArg,
fmt::format("setVersionstampedKey: {} + sizeof(kv::Versionstamp) > key.size {}", offset, key.size()));
} }
co_return co_await OpWrapper<Op::SetVersionstampedKey>::run([&](Op) -> CoTryTask<void> { co_return co_await OpWrapper<Op::SetVersionstampedKey>::run([&](Op) -> CoTryTask<void> {
tr_.atomicOp(appendOffset(key, offset), value, FDB_MUTATION_TYPE_SET_VERSIONSTAMPED_KEY); tr_.atomicOp(appendOffset(key, offset), value, FDB_MUTATION_TYPE_SET_VERSIONSTAMPED_KEY);
@ -342,9 +343,10 @@ CoTryTask<void> FDBTransaction::setVersionstampedKey(std::string_view key, uint3
} }
CoTryTask<void> FDBTransaction::setVersionstampedValue(std::string_view key, std::string_view value, uint32_t offset) { CoTryTask<void> FDBTransaction::setVersionstampedValue(std::string_view key, std::string_view value, uint32_t offset) {
if (offset + 10 > value.size()) { if (offset + sizeof(kv::Versionstamp) > value.size()) {
co_return makeError(StatusCode::kInvalidArg, co_return makeError(
fmt::format("setVersionstampedValue: {} + 10 > value.size {}", offset, value.size())); StatusCode::kInvalidArg,
fmt::format("setVersionstampedValue: {} + sizeof(kv::Versionstamp) > value.size {}", offset, value.size()));
} }
co_return co_await OpWrapper<Op::SetVersionstampedValue>::run([&](Op) -> CoTryTask<void> { co_return co_await OpWrapper<Op::SetVersionstampedValue>::run([&](Op) -> CoTryTask<void> {
tr_.atomicOp(key, appendOffset(value, offset), FDB_MUTATION_TYPE_SET_VERSIONSTAMPED_VALUE); tr_.atomicOp(key, appendOffset(value, offset), FDB_MUTATION_TYPE_SET_VERSIONSTAMPED_VALUE);