Fix TEvPatch interface and remove unnecessary patching-related output…

… in KV tablet (#1693)
ydb-platform · Feb 8, 2024 · 0ffd6c5 · 0ffd6c5
1 parent 7f54b71
commit 0ffd6c5
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/ydb/core/base/blobstorage.h b/ydb/core/base/blobstorage.h
@@ -1449,8 +1449,8 @@ struct TEvBlobStorage {
                 REQUEST_VALGRIND_CHECK_MEM_IS_DEFINED(diffs[idx].Buffer.Data(), diffs[idx].Buffer.size());
 
                 if (idx) {
-                    Y_VERIFY_S(diffs[idx - 1].Offset + diffs[idx].Buffer.Size() <= diffs[idx].Offset,
-                            "EvPatch invalid: Diffs mustn't be re-covered,"
+                    Y_VERIFY_S(diffs[idx - 1].Offset + diffs[idx - 1].Buffer.Size() <= diffs[idx].Offset,
+                            "EvPatch invalid: Diffs must not overlap,"
                             << " [" << idx - 1 << "].Offset# " << diffs[idx - 1].Offset
                             << " [" << idx - 1 << "].Size# " << diffs[idx - 1].Buffer.Size()
                             << " [" << idx << "].Offset# " << diffs[idx].Offset

diff --git a/ydb/core/keyvalue/keyvalue_storage_request.cpp b/ydb/core/keyvalue/keyvalue_storage_request.cpp
@@ -168,8 +168,6 @@ class TKeyValueStorageRequest : public TActorBootstrapped<TKeyValueStorageReques
 
         NKikimrProto::EReplyStatus status = ev->Get()->Status;
         if (status != NKikimrProto::OK) {
-            Cerr << "Patch Not OK response!\n" << NKikimrProto::EReplyStatus_Name(status) << Endl;
-            Cerr << ev->Get()->ErrorReason << Endl;
             TInstant now = TAppData::TimeProvider->Now();
 
             TStringStream str;
@@ -192,7 +190,6 @@ class TKeyValueStorageRequest : public TActorBootstrapped<TKeyValueStorageReques
             return;
         }
 
-        Cerr << "Patch OK response!\n";
         ui64 cookie = ev->Cookie;
         ui64 patchIdx = cookie;
         if (patchIdx >= IntermediateResults->Patches.size() && patchIdx >= IntermediateResults->Commands.size()) {