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

deepseek-ai · Mar 3, 2025 · c69d46e · c69d46e
1 parent 9fd2567
commit c69d46e
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 12 deletions.
diff --git a/src/common/kv/mem/MemTransaction.h b/src/common/kv/mem/MemTransaction.h
@@ -123,9 +123,10 @@ class MemTransaction : public IReadWriteTransaction {
     if (canceled_) {
       co_return makeError(TransactionCode::kCanceled, "Canceled transaction!");
     }
-    if (offset + 10 > key.size()) {
-      co_return makeError(StatusCode::kInvalidArg,
-                          fmt::format("setVersionstampedKey: {} + 10 > key.size {}", offset, key.size()));
+    if (offset + sizeof(kv::Versionstamp) > key.size()) {
+      co_return makeError(
+          StatusCode::kInvalidArg,
+          fmt::format("setVersionstampedKey: {} + sizeof(kv::Versionstamp) > key.size {}", offset, key.size()));
     }
     versionstampedChanges_.push_back(
         mem::MemKV::VersionstampedKV::versionstampedKey(std::string(key), offset, std::string(value)));
@@ -137,9 +138,10 @@ class MemTransaction : public IReadWriteTransaction {
     if (canceled_) {
       co_return makeError(TransactionCode::kCanceled, "Canceled transaction!");
     }
-    if (offset + 10 > value.size()) {
-      co_return makeError(StatusCode::kInvalidArg,
-                          fmt::format("setVersionstampedValue: {} + 10 > value.size {}", offset, value.size()));
+    if (offset + sizeof(kv::Versionstamp) > value.size()) {
+      co_return makeError(
+          StatusCode::kInvalidArg,
+          fmt::format("setVersionstampedValue: {} + sizeof(kv::Versionstamp) > value.size {}", offset, value.size()));
     }
     versionstampedChanges_.push_back(
         mem::MemKV::VersionstampedKV::versionstampedValue(std::string(key), std::string(value), offset));

diff --git a/src/fdb/FDBTransaction.cc b/src/fdb/FDBTransaction.cc
@@ -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) {
-  if (offset + 10 > key.size()) {
-    co_return makeError(StatusCode::kInvalidArg,
-                        fmt::format("setVersionstampedKey: {} + 10 > key.size {}", offset, key.size()));
+  if (offset + sizeof(kv::Versionstamp) > key.size()) {
+    co_return makeError(
+        StatusCode::kInvalidArg,
+        fmt::format("setVersionstampedKey: {} + sizeof(kv::Versionstamp) > key.size {}", offset, key.size()));
   }
   co_return co_await OpWrapper<Op::SetVersionstampedKey>::run([&](Op) -> CoTryTask<void> {
     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) {
-  if (offset + 10 > value.size()) {
-    co_return makeError(StatusCode::kInvalidArg,
-                        fmt::format("setVersionstampedValue: {} + 10 > value.size {}", offset, value.size()));
+  if (offset + sizeof(kv::Versionstamp) > value.size()) {
+    co_return makeError(
+        StatusCode::kInvalidArg,
+        fmt::format("setVersionstampedValue: {} + sizeof(kv::Versionstamp) > value.size {}", offset, value.size()));
   }
   co_return co_await OpWrapper<Op::SetVersionstampedValue>::run([&](Op) -> CoTryTask<void> {
     tr_.atomicOp(key, appendOffset(value, offset), FDB_MUTATION_TYPE_SET_VERSIONSTAMPED_VALUE);