diff options
author | ilnurkh <ilnurkh@yandex-team.com> | 2023-10-11 11:37:11 +0300 |
---|---|---|
committer | ilnurkh <ilnurkh@yandex-team.com> | 2023-10-11 12:38:46 +0300 |
commit | 15c8576b07a44515322e3819b8936146cd72651e (patch) | |
tree | e2ff70c0b674c710535cddbbde81cff645681d1f | |
parent | 373945556deb62b705de085fa701a0f0e44acd25 (diff) | |
download | ydb-15c8576b07a44515322e3819b8936146cd72651e.tar.gz |
Y_VERIFY->Y_ABORT_UNLESS tail2
https://clubs.at.yandex-team.ru/arcadia/29404
-rw-r--r-- | library/cpp/actors/prof/tag.h | 2 | ||||
-rw-r--r-- | library/cpp/logger/global/rty_formater.cpp | 2 | ||||
-rw-r--r-- | ydb/core/blobstorage/vdisk/hullop/blobstorage_hull.cpp | 2 | ||||
-rw-r--r-- | ydb/core/keyvalue/keyvalue_state.cpp | 2 | ||||
-rw-r--r-- | ydb/core/persqueue/pq_impl.cpp | 2 | ||||
-rw-r--r-- | ydb/core/tablet_flat/flat_executor_txloglogic.cpp | 2 | ||||
-rw-r--r-- | ydb/core/tx/schemeshard/ut_topic_splitmerge/ut_topic_splitmerge.cpp | 2 | ||||
-rw-r--r-- | ydb/core/util/concurrent_rw_hash_ut.cpp | 2 |
8 files changed, 8 insertions, 8 deletions
diff --git a/library/cpp/actors/prof/tag.h b/library/cpp/actors/prof/tag.h index 8549b34e35..1624d9d1e0 100644 --- a/library/cpp/actors/prof/tag.h +++ b/library/cpp/actors/prof/tag.h @@ -13,7 +13,7 @@ namespace NProfiling { ui32 MakeTag(const char* s); - // Make only unique tags. Y_VERIFY inside. + // Make only unique tags. Y_ABORT_UNLESS inside. ui32 MakeTags(const TVector<const char*>& ss); const char* GetTag(ui32 tag); diff --git a/library/cpp/logger/global/rty_formater.cpp b/library/cpp/logger/global/rty_formater.cpp index 66657e7162..f5035650c7 100644 --- a/library/cpp/logger/global/rty_formater.cpp +++ b/library/cpp/logger/global/rty_formater.cpp @@ -22,7 +22,7 @@ namespace { pos += strftime(pos, end - pos, "%Y-%m-%d %H:%M:%S.", &tm); pos += sprintf(pos, "%03" PRIu32, instant.MilliSecondsOfSecond()); pos += strftime(pos, end - pos, " %z", &tm); - Y_ABORT_UNLESS(LocalTimeSBufferSize - 1 == pos - begin); // together with Y_VERIFY above this also implies pos<=end + Y_ABORT_UNLESS(LocalTimeSBufferSize - 1 == pos - begin); // together with Y_ABORT_UNLESS above this also implies pos<=end return (pos - begin); } } diff --git a/ydb/core/blobstorage/vdisk/hullop/blobstorage_hull.cpp b/ydb/core/blobstorage/vdisk/hullop/blobstorage_hull.cpp index 8f1c537a3c..2223ac79aa 100644 --- a/ydb/core/blobstorage/vdisk/hullop/blobstorage_hull.cpp +++ b/ydb/core/blobstorage/vdisk/hullop/blobstorage_hull.cpp @@ -347,7 +347,7 @@ namespace NKikimr { // ensure that keys are coming in strictly ascending order if (IsFromSameSequence(newKey, it)) { // check that existing key is really greater that the new one -- this is internal consistency check - // so we can do it in Y_VERIFY + // so we can do it in Y_ABORT_UNLESS const TKeyBarrier& key = it.GetCurKey(); Y_ABORT_UNLESS(std::make_tuple(key.Gen, key.GenCounter) > std::make_tuple(newKey.Gen, newKey.GenCounter) && key.TabletId == newKey.TabletId && key.Channel == newKey.Channel && key.Hard == newKey.Hard); diff --git a/ydb/core/keyvalue/keyvalue_state.cpp b/ydb/core/keyvalue/keyvalue_state.cpp index c0f3fcc0b5..8fa8a56d1c 100644 --- a/ydb/core/keyvalue/keyvalue_state.cpp +++ b/ydb/core/keyvalue/keyvalue_state.cpp @@ -16,7 +16,7 @@ #include <util/string/escape.h> #include <util/charset/utf8.h> -// Set to 1 in order for tablet to reboot instead of failing a Y_VERIFY on database damage +// Set to 1 in order for tablet to reboot instead of failing a Y_ABORT_UNLESS on database damage #define KIKIMR_KEYVALUE_ALLOW_DAMAGE 0 namespace NKikimr { diff --git a/ydb/core/persqueue/pq_impl.cpp b/ydb/core/persqueue/pq_impl.cpp index 8b34b53535..2b7d5788fc 100644 --- a/ydb/core/persqueue/pq_impl.cpp +++ b/ydb/core/persqueue/pq_impl.cpp @@ -2484,7 +2484,7 @@ void TPersQueue::HandleDataTransaction(TAutoPtr<TEvPersQueue::TEvProposeTransact if (txBody.GetImmediate()) { // - // FIXME(abcdef): вместо Y_VERIFY отправлять TEvProposeTransactionResult с кодом ошибки + // FIXME(abcdef): вместо Y_ABORT_UNLESS отправлять TEvProposeTransactionResult с кодом ошибки // Y_ABORT_UNLESS(txBody.OperationsSize() > 0); diff --git a/ydb/core/tablet_flat/flat_executor_txloglogic.cpp b/ydb/core/tablet_flat/flat_executor_txloglogic.cpp index 8cc1dd0e14..308d2a22cb 100644 --- a/ydb/core/tablet_flat/flat_executor_txloglogic.cpp +++ b/ydb/core/tablet_flat/flat_executor_txloglogic.cpp @@ -170,7 +170,7 @@ TLogicRedo::TCommitRWTransactionResult TLogicRedo::CommitRWTransaction( } /* Sometimes clang drops the last emplace_back above if move was used - before for data field. This hacky Y_VERIFY prevents this and check + before for data field. This hacky Y_ABORT_UNLESS prevents this and check that emplace always happens. */ diff --git a/ydb/core/tx/schemeshard/ut_topic_splitmerge/ut_topic_splitmerge.cpp b/ydb/core/tx/schemeshard/ut_topic_splitmerge/ut_topic_splitmerge.cpp index c5e00ec440..8687ea3864 100644 --- a/ydb/core/tx/schemeshard/ut_topic_splitmerge/ut_topic_splitmerge.cpp +++ b/ydb/core/tx/schemeshard/ut_topic_splitmerge/ut_topic_splitmerge.cpp @@ -372,7 +372,7 @@ Y_UNIT_TEST_SUITE(TSchemeShardTopicSplitMergeTest) { ValidatePartitionChildren(partition3, {}); ValidatePartitionChildren(partition4, {}); - // Reboot for check Y_VERIFY + // Reboot for check Y_ABORT_UNLESS RebootTablet(runtime, TTestTxConfig::SchemeShard, runtime.AllocateEdgeActor()); } // Y_UNIT_TEST(SplitWithManyPartition) diff --git a/ydb/core/util/concurrent_rw_hash_ut.cpp b/ydb/core/util/concurrent_rw_hash_ut.cpp index 35d175a544..6d286adc7f 100644 --- a/ydb/core/util/concurrent_rw_hash_ut.cpp +++ b/ydb/core/util/concurrent_rw_hash_ut.cpp @@ -14,7 +14,7 @@ TEST(TConcurrentRWHashTest, TEmptyGetTest) { EXPECT_FALSE(h.Get("key", res)); EXPECT_EQ(res, 100); - // Can't check h.Get("key") here because it has Y_VERIFY inside o_O + // Can't check h.Get("key") here because it has Y_ABORT_UNLESS inside o_O } TEST(TConcurrentRWHashTest, TInsertTest) { |