Use Y_DEBUG_ABORT macros (#3684)

39 files changed, 54 insertions, 54 deletions

diff --git a/ydb/core/blob_depot/assimilator.cpp b/ydb/core/blob_depot/assimilator.cpp
index 5acd790f67..a85de4f9f7 100644
--- a/ydb/core/blob_depot/assimilator.cpp
+++ b/ydb/core/blob_depot/assimilator.cpp
@@ -121,7 +121,7 @@ namespace NKikimr::NBlobDepot {
             cFunc(TEvents::TSystem::Poison, PassAway);
 
             default:
-                Y_DEBUG_ABORT_UNLESS(false, "unexpected event Type# %08" PRIx32, type);
+                Y_DEBUG_ABORT("unexpected event Type# %08" PRIx32, type);
                 STLOG(PRI_CRIT, BLOB_DEPOT, BDT00, "unexpected event", (Id, Self->GetLogId()), (Type, type));
                 break;
         }
diff --git a/ydb/core/blob_depot/data_decommit.cpp b/ydb/core/blob_depot/data_decommit.cpp
index c3b3099064..f4a5d2a60b 100644
--- a/ydb/core/blob_depot/data_decommit.cpp
+++ b/ydb/core/blob_depot/data_decommit.cpp
@@ -373,7 +373,7 @@ namespace NKikimr::NBlobDepot {
                 cFunc(TEvPrivate::EvTxComplete, HandleTxComplete);
 
                 default:
-                    Y_DEBUG_ABORT_UNLESS(false, "unexpected event Type# %08" PRIx32, type);
+                    Y_DEBUG_ABORT("unexpected event Type# %08" PRIx32, type);
                     STLOG(PRI_CRIT, BLOB_DEPOT, BDT90, "unexpected event", (Id, Self->GetLogId()), (Type, type));
                     break;
             }
diff --git a/ydb/core/blob_depot/data_resolve.cpp b/ydb/core/blob_depot/data_resolve.cpp
index ccaadfcfe4..0f743eda5c 100644
--- a/ydb/core/blob_depot/data_resolve.cpp
+++ b/ydb/core/blob_depot/data_resolve.cpp
@@ -132,7 +132,7 @@ namespace NKikimr::NBlobDepot {
                         break;
 
                     case NKikimrBlobDepot::TEvResolve::TItem::KEYDESIGNATOR_NOT_SET:
-                        Y_DEBUG_ABORT_UNLESS(false, "incorrect query field");
+                        Y_DEBUG_ABORT("incorrect query field");
                         break;
                 }
                 if (status) {
diff --git a/ydb/core/blobstorage/backpressure/queue_backpressure_client.cpp b/ydb/core/blobstorage/backpressure/queue_backpressure_client.cpp
index f60b2d78a0..f361d6a807 100644
--- a/ydb/core/blobstorage/backpressure/queue_backpressure_client.cpp
+++ b/ydb/core/blobstorage/backpressure/queue_backpressure_client.cpp
@@ -395,7 +395,7 @@ private:
         } catch (const TExFatal& ex) {
             const TString msg = TStringBuilder() << "fatal error: " << ex.what();
             QLOG_CRIT_S("BSQ38", msg);
-            Y_DEBUG_ABORT_UNLESS(false, "%s %s", LogPrefix.data(), msg.data());
+            Y_DEBUG_ABORT("%s %s", LogPrefix.data(), msg.data());
             ResetConnection(ctx, NKikimrProto::ERROR, msg, TDuration::Zero());
             return;
         }
diff --git a/ydb/core/blobstorage/dsproxy/dsproxy_put.cpp b/ydb/core/blobstorage/dsproxy/dsproxy_put.cpp
index cd9d2fcf67..a03fc5f86f 100644
--- a/ydb/core/blobstorage/dsproxy/dsproxy_put.cpp
+++ b/ydb/core/blobstorage/dsproxy/dsproxy_put.cpp
@@ -743,7 +743,7 @@ public:
             hFunc(TKikimrEvents::TEvWakeup, Handle);
 
             default:
-                Y_DEBUG_ABORT_UNLESS(false, "unexpected event Type# 0x%08" PRIx32, type);
+                Y_DEBUG_ABORT("unexpected event Type# 0x%08" PRIx32, type);
         }
         if (!Done) {
             IssueStatusForExpiredDisks();
diff --git a/ydb/core/blobstorage/nodewarden/distconf.h b/ydb/core/blobstorage/nodewarden/distconf.h
index 674564231b..b46035ce54 100644
--- a/ydb/core/blobstorage/nodewarden/distconf.h
+++ b/ydb/core/blobstorage/nodewarden/distconf.h
@@ -515,7 +515,7 @@ namespace NKikimr::NStorage {
             const TNodeWardenConfig& nwConfig, bool allowUnformatted) {
         auto makeError = [&](TString error) -> bool {
             STLOG(PRI_CRIT, BS_NODE, NWDC41, "configuration incorrect", (Error, error));
-            Y_DEBUG_ABORT_UNLESS(false, "%s", error.c_str());
+            Y_DEBUG_ABORT("%s", error.c_str());
             return false;
         };
         if (!config.HasBlobStorageConfig()) { // no storage config at all -- however, this is quite strange
diff --git a/ydb/core/blobstorage/pdisk/blobstorage_pdisk_blockdevice_async.cpp b/ydb/core/blobstorage/pdisk/blobstorage_pdisk_blockdevice_async.cpp
index fc9fafbd85..b6abf3f1e3 100644
--- a/ydb/core/blobstorage/pdisk/blobstorage_pdisk_blockdevice_async.cpp
+++ b/ydb/core/blobstorage/pdisk/blobstorage_pdisk_blockdevice_async.cpp
@@ -393,7 +393,7 @@ class TRealBlockDevice : public IBlockDevice {
                     Y_ABORT_UNLESS(WaitingNoops[completionAction->OperationIdx % MaxWaitingNoops] == nullptr);
                     WaitingNoops[completionAction->OperationIdx % MaxWaitingNoops] = completionAction;
                 } else {
-                    Y_DEBUG_ABORT_UNLESS(false, "Threre must not be writes of size 0 in TRealBlockDevice");
+                    Y_DEBUG_ABORT("Threre must not be writes of size 0 in TRealBlockDevice");
                 }
             } else {
                 if ((ui64)op->GetOffset() != EndOffset) {
diff --git a/ydb/core/blobstorage/vdisk/hulldb/fresh/fresh_segment_impl.h b/ydb/core/blobstorage/vdisk/hulldb/fresh/fresh_segment_impl.h
index cad40c3cc5..5ad931e0b0 100644
--- a/ydb/core/blobstorage/vdisk/hulldb/fresh/fresh_segment_impl.h
+++ b/ydb/core/blobstorage/vdisk/hulldb/fresh/fresh_segment_impl.h
@@ -689,7 +689,7 @@ namespace NKikimr {
                 std::vector<std::pair<TKey, TMemRec>>& Recs;
 
                 void AddFromSegment(const TMemRec&, const TDiskPart*, const TKey&, ui64) {
-                    Y_DEBUG_ABORT_UNLESS(false, "should not be called");
+                    Y_DEBUG_ABORT("should not be called");
                 }
 
                 void AddFromFresh(const TMemRec& memRec, const TRope* /*data*/, const TKey& key, ui64 /*lsn*/) {
diff --git a/ydb/core/blobstorage/vdisk/repl/blobstorage_replproxy.cpp b/ydb/core/blobstorage/vdisk/repl/blobstorage_replproxy.cpp
index 48810cd969..b37ce712e0 100644
--- a/ydb/core/blobstorage/vdisk/repl/blobstorage_replproxy.cpp
+++ b/ydb/core/blobstorage/vdisk/repl/blobstorage_replproxy.cpp
@@ -396,7 +396,7 @@ namespace NKikimr {
                                     " VDISK CAN NOT REPLICATE A BLOB BECAUSE HAS FOUND INCONSISTENCY IN BLOB SIZE",
                                     id.ToString().data(), buffer.size());
                                 STLOG(PRI_CRIT, BS_REPL, BSVR26, message, (BlobId, id), (BufferSize, buffer.size()));
-                                Y_DEBUG_ABORT_UNLESS(false, "%s", message.data());
+                                Y_DEBUG_ABORT("%s", message.data());
 
                                 // count this blob as erroneous one
                                 portion.DataPortion.AddError(id, NKikimrProto::ERROR);
diff --git a/ydb/core/blobstorage/vdisk/skeleton/blobstorage_skeletonfront.cpp b/ydb/core/blobstorage/vdisk/skeleton/blobstorage_skeletonfront.cpp
index 69761b12aa..49e439a054 100644
--- a/ydb/core/blobstorage/vdisk/skeleton/blobstorage_skeletonfront.cpp
+++ b/ydb/core/blobstorage/vdisk/skeleton/blobstorage_skeletonfront.cpp
@@ -1449,7 +1449,7 @@ namespace NKikimr {
                         LOG_CRIT_S(ctx, NKikimrServices::BS_SKELETON, VCtx->VDiskLogPrefix
                             << "VDiskId mismatch expected# " << SelfVDiskId << " provided# " << vdiskId
                             << " Marker# BSVSF05");
-                        Y_DEBUG_ABORT_UNLESS(false, "VDiskId mismatch");
+                        Y_DEBUG_ABORT("VDiskId mismatch");
                         return Reply(ev, ctx, NKikimrProto::ERROR, "VDiskId mismatch", TAppData::TimeProvider->Now());
                     }
                     if (vdiskId != SelfVDiskId) {
@@ -1982,7 +1982,7 @@ namespace NKikimr {
                     LOG_CRIT_S(ctx, NKikimrServices::BS_SKELETON, VCtx->VDiskLogPrefix
                         << "VDiskId mismatch expected# " << SelfVDiskId << " provided# " << vdiskId
                         << " Type# " << TypeName<TEventType>() << " Marker# BSVSF06");
-                    Y_DEBUG_ABORT_UNLESS(false, "VDiskId mismatch");
+                    Y_DEBUG_ABORT("VDiskId mismatch");
                     return Reply(ev, ctx, NKikimrProto::ERROR, "VDiskId mismatch", TAppData::TimeProvider->Now());
                 } else if (!vdiskId.SameDisk(SelfVDiskId)) {
                     return Reply(ev, ctx, NKikimrProto::RACE, "group generation mismatch", TAppData::TimeProvider->Now());
@@ -2089,7 +2089,7 @@ namespace NKikimr {
                 HFuncStatus(TEvBlobStorage::TEvVGetBlock, status, errorReason, now, wstatus);
                 HFuncStatus(TEvBlobStorage::TEvVCollectGarbage, status, errorReason, now, wstatus);
                 HFuncStatus(TEvBlobStorage::TEvVGetBarrier, status, errorReason, now, wstatus);
-                default: Y_DEBUG_ABORT_UNLESS(false, "Unsupported message %d", ev->GetTypeRewrite());
+                default: Y_DEBUG_ABORT("Unsupported message %d", ev->GetTypeRewrite());
             }
         }
 
diff --git a/ydb/core/engine/minikql/minikql_engine_host.cpp b/ydb/core/engine/minikql/minikql_engine_host.cpp
index b958824982..00eee7d23e 100644
--- a/ydb/core/engine/minikql/minikql_engine_host.cpp
+++ b/ydb/core/engine/minikql/minikql_engine_host.cpp
@@ -1090,7 +1090,7 @@ NUdf::TUnboxedValue GetCellValue(const TCell& cell, NScheme::TTypeInfo type) {
         return NYql::NCommon::PgValueFromNativeBinary(cell.AsBuf(), NPg::PgTypeIdFromTypeDesc(type.GetTypeDesc()));
     }
 
-    Y_DEBUG_ABORT_UNLESS(false, "Unsupported type: %" PRIu16, type.GetTypeId());
+    Y_DEBUG_ABORT("Unsupported type: %" PRIu16, type.GetTypeId());
     return MakeString(NUdf::TStringRef(cell.Data(), cell.Size()));
 }
 
diff --git a/ydb/core/grpc_services/rpc_export_base.h b/ydb/core/grpc_services/rpc_export_base.h
index 93e2baae85..22c20d3ad8 100644
--- a/ydb/core/grpc_services/rpc_export_base.h
+++ b/ydb/core/grpc_services/rpc_export_base.h
@@ -24,7 +24,7 @@ struct TExportConv {
             NOperationId::AddOptionalValue(operationId, "kind", "s3");
             break;
         default:
-            Y_DEBUG_ABORT_UNLESS(false, "Unknown export kind");
+            Y_DEBUG_ABORT("Unknown export kind");
             break;
         }
 
@@ -54,7 +54,7 @@ struct TExportConv {
             Fill<ExportToS3Metadata, ExportToS3Result>(operation, exprt, exprt.GetExportToS3Settings());
             break;
         default:
-            Y_DEBUG_ABORT_UNLESS(false, "Unknown export kind");
+            Y_DEBUG_ABORT("Unknown export kind");
             break;
         }
 
diff --git a/ydb/core/grpc_services/rpc_import_base.h b/ydb/core/grpc_services/rpc_import_base.h
index aad6e26df5..c3cf56f1be 100644
--- a/ydb/core/grpc_services/rpc_import_base.h
+++ b/ydb/core/grpc_services/rpc_import_base.h
@@ -21,7 +21,7 @@ struct TImportConv {
             NOperationId::AddOptionalValue(operationId, "kind", "s3");
             break;
         default:
-            Y_DEBUG_ABORT_UNLESS(false, "Unknown import kind");
+            Y_DEBUG_ABORT("Unknown import kind");
             break;
         }
 
@@ -48,7 +48,7 @@ struct TImportConv {
             Fill<ImportFromS3Metadata, ImportFromS3Result>(operation, import, import.GetImportFromS3Settings());
             break;
         default:
-            Y_DEBUG_ABORT_UNLESS(false, "Unknown import kind");
+            Y_DEBUG_ABORT("Unknown import kind");
             break;
         }
 
diff --git a/ydb/core/grpc_streaming/grpc_streaming.h b/ydb/core/grpc_streaming/grpc_streaming.h
index 6beb16ce0c..c6d6fd57e3 100644
--- a/ydb/core/grpc_streaming/grpc_streaming.h
+++ b/ydb/core/grpc_streaming/grpc_streaming.h
@@ -339,7 +339,7 @@ private:
             ReadInProgress = MakeHolder<typename IContext::TEvReadFinished>();
             Stream.Read(&ReadInProgress->Record, OnReadDoneTag.Prepare());
         } else {
-            Y_DEBUG_ABORT_UNLESS(false, "Multiple outstanding reads are unsafe in grpc streaming");
+            Y_DEBUG_ABORT("Multiple outstanding reads are unsafe in grpc streaming");
         }
 
         return true;
@@ -380,7 +380,7 @@ private:
             }
         } else {
             // We need to perform another read (likely unsafe)
-            Y_DEBUG_ABORT_UNLESS(false, "Multiple outstanding reads are unsafe in grpc streaming");
+            Y_DEBUG_ABORT("Multiple outstanding reads are unsafe in grpc streaming");
             ReadInProgress = MakeHolder<typename IContext::TEvReadFinished>();
             Stream.Read(&ReadInProgress->Record, OnReadDoneTag.Prepare());
         }
diff --git a/ydb/core/mind/bscontroller/select_groups.cpp b/ydb/core/mind/bscontroller/select_groups.cpp
index 90f1cca7e6..0c84c1f5c0 100644
--- a/ydb/core/mind/bscontroller/select_groups.cpp
+++ b/ydb/core/mind/bscontroller/select_groups.cpp
@@ -32,7 +32,7 @@ public:
         out.SetNewStyleQuerySupported(true);
 
         if (!record.GetReturnAllMatchingGroups()) {
-            Y_DEBUG_ABORT_UNLESS(false, "obsolete command");
+            Y_DEBUG_ABORT("obsolete command");
             out.SetStatus(NKikimrProto::ERROR);
         } else {
             TVector<const TGroupInfo*> groups;
diff --git a/ydb/core/mind/bscontroller/virtual_group.cpp b/ydb/core/mind/bscontroller/virtual_group.cpp
index bbd644f707..ef4c759de2 100644
--- a/ydb/core/mind/bscontroller/virtual_group.cpp
+++ b/ydb/core/mind/bscontroller/virtual_group.cpp
@@ -801,7 +801,7 @@ namespace NKikimr::NBsController {
                 hFunc(TEvBlobDepot::TEvApplyConfigResult, Handle);
 
                 default:
-                    Y_DEBUG_ABORT_UNLESS(false, "unexpected event Type# %08" PRIx32, type);
+                    Y_DEBUG_ABORT("unexpected event Type# %08" PRIx32, type);
             }
         }
 
diff --git a/ydb/core/persqueue/pq_impl.cpp b/ydb/core/persqueue/pq_impl.cpp
index 39af30f730..a597c71042 100644
--- a/ydb/core/persqueue/pq_impl.cpp
+++ b/ydb/core/persqueue/pq_impl.cpp
@@ -2124,7 +2124,7 @@ void TPersQueue::HandleWriteRequest(const ui64 responseCookie, const TActorId& p
             }
             Y_ABORT_UNLESS(partNo == totalParts);
         } else if (cmd.GetHeartbeat().GetData().size() > mSize) {
-            Y_DEBUG_ABORT_UNLESS(false, "This should never happen");
+            Y_DEBUG_ABORT("This should never happen");
             ReplyError(ctx, responseCookie, NPersQueue::NErrorCode::BAD_REQUEST, TStringBuilder()
                 << "Too big heartbeat message, must be at most " << mSize << ", but got " << cmd.GetHeartbeat().GetData().size());
             return;
diff --git a/ydb/core/persqueue/transaction.cpp b/ydb/core/persqueue/transaction.cpp
index 5361d12b61..6c431f3f37 100644
--- a/ydb/core/persqueue/transaction.cpp
+++ b/ydb/core/persqueue/transaction.cpp
@@ -238,7 +238,7 @@ void TDistributedTransaction::OnReadSet(const NKikimrTx::TEvReadSet& event,
 
         ++ReadSetCount;
     } else {
-        Y_DEBUG_ABORT_UNLESS(false, "unknown sender tablet %" PRIu64, event.GetTabletProducer());
+        Y_DEBUG_ABORT("unknown sender tablet %" PRIu64, event.GetTabletProducer());
     }
 }
 
diff --git a/ydb/core/quoter/kesus_quoter_proxy.cpp b/ydb/core/quoter/kesus_quoter_proxy.cpp
index 74618652e3..f3a73e9c6a 100644
--- a/ydb/core/quoter/kesus_quoter_proxy.cpp
+++ b/ydb/core/quoter/kesus_quoter_proxy.cpp
@@ -1105,7 +1105,7 @@ public:
                     << ev->GetTypeRewrite()
                     << " event: "
                     << ev->ToString());
-                Y_DEBUG_ABORT_UNLESS(false, "Unknown event");
+                Y_DEBUG_ABORT("Unknown event");
                 break;
         }
 
diff --git a/ydb/core/scheme/scheme_tablecell.h b/ydb/core/scheme/scheme_tablecell.h
index 88e1c17a78..425a950c6a 100644
--- a/ydb/core/scheme/scheme_tablecell.h
+++ b/ydb/core/scheme/scheme_tablecell.h
@@ -263,7 +263,7 @@ inline int CompareTypedCells(const TCell& a, const TCell& b, NScheme::TTypeInfoO
     }
 
     default:
-        Y_DEBUG_ABORT_UNLESS(false, "Unknown type");
+        Y_DEBUG_ABORT("Unknown type");
     };
 
     return 0;
@@ -362,7 +362,7 @@ inline ui64 GetValueHash(NScheme::TTypeInfo info, const TCell& cell) {
         return NPg::PgNativeBinaryHash(cell.Data(), cell.Size(), typeDesc);
     }
 
-    Y_DEBUG_ABORT_UNLESS(false, "Type not supported for user columns: %d", typeId);
+    Y_DEBUG_ABORT("Type not supported for user columns: %d", typeId);
     return 0;
 }
 
diff --git a/ydb/core/tablet_flat/flat_page_btree_index.h b/ydb/core/tablet_flat/flat_page_btree_index.h
index 8b674e8972..e6b27ef06f 100644
--- a/ydb/core/tablet_flat/flat_page_btree_index.h
+++ b/ydb/core/tablet_flat/flat_page_btree_index.h
@@ -340,7 +340,7 @@ namespace NKikimr::NTable::NPage {
         {
             const TRecIdx childrenCount = GetChildrenCount();
             if (on && on >= childrenCount) {
-                Y_DEBUG_ABORT_UNLESS(false, "Should point to some child");
+                Y_DEBUG_ABORT("Should point to some child");
                 on = { };
             }
 
diff --git a/ydb/core/tablet_flat/flat_part_index_iter_bree_index.h b/ydb/core/tablet_flat/flat_part_index_iter_bree_index.h
index 1f137804b4..998a9efe4c 100644
--- a/ydb/core/tablet_flat/flat_part_index_iter_bree_index.h
+++ b/ydb/core/tablet_flat/flat_part_index_iter_bree_index.h
@@ -131,7 +131,7 @@ public:
 
     EReady SeekLast() override {
         if (Y_UNLIKELY(GetEndRowId() == 0)) {
-            Y_DEBUG_ABORT_UNLESS(false, "TPart can't be empty");
+            Y_DEBUG_ABORT("TPart can't be empty");
             return Exhaust();
         }
         return Seek(GetEndRowId() - 1);
diff --git a/ydb/core/tablet_flat/flat_stat_part.h b/ydb/core/tablet_flat/flat_stat_part.h
index 266482ce14..bf4dc37b62 100644
--- a/ydb/core/tablet_flat/flat_stat_part.h
+++ b/ydb/core/tablet_flat/flat_stat_part.h
@@ -95,7 +95,7 @@ public:
         LastRowId = Groups[0]->GetRowId();
         auto ready = Groups[0]->Next();
         if (ready == EReady::Page) {
-            Y_DEBUG_ABORT_UNLESS(false, "Shouldn't really happen");
+            Y_DEBUG_ABORT("Shouldn't really happen");
             return ready;
         }
 
@@ -110,7 +110,7 @@ public:
             while (Groups[groupIndex]->IsValid() && Groups[groupIndex]->GetRowId() < nextRowId) {
                 // eagerly include all data up to the next row id
                 if (Groups[groupIndex]->Next() == EReady::Page) {
-                    Y_DEBUG_ABORT_UNLESS(false, "Shouldn't really happen");
+                    Y_DEBUG_ABORT("Shouldn't really happen");
                     ready = EReady::Page;
                     break;
                 }
@@ -125,7 +125,7 @@ public:
             while (HistoricGroups[0]->IsValid() && (!HistoricGroups[0]->GetKeyCellsCount() || HistoricGroups[0]->GetKeyCell(0).AsValue<TRowId>() < nextRowId)) {
                 // eagerly include all history up to the next row id
                 if (HistoricGroups[0]->Next() == EReady::Page) {
-                    Y_DEBUG_ABORT_UNLESS(false, "Shouldn't really happen");
+                    Y_DEBUG_ABORT("Shouldn't really happen");
                     ready = EReady::Page;
                     break;
                 }
@@ -138,7 +138,7 @@ public:
                 while (HistoricGroups[groupIndex]->IsValid() && HistoricGroups[groupIndex]->GetRowId() < nextHistoryRowId) {
                     // eagerly include all data up to the next row id
                     if (HistoricGroups[groupIndex]->Next() == EReady::Page) {
-                        Y_DEBUG_ABORT_UNLESS(false, "Shouldn't really happen");
+                        Y_DEBUG_ABORT("Shouldn't really happen");
                         ready = EReady::Page;
                         break;
                     }
diff --git a/ydb/core/tablet_flat/tablet_flat_executed.cpp b/ydb/core/tablet_flat/tablet_flat_executed.cpp
index de09bd2f6b..d13d0a15f9 100644
--- a/ydb/core/tablet_flat/tablet_flat_executed.cpp
+++ b/ydb/core/tablet_flat/tablet_flat_executed.cpp
@@ -162,7 +162,7 @@ void TTabletExecutedFlat::SignalTabletActive(const TActorContext &ctx) {
 
 void TTabletExecutedFlat::Enqueue(STFUNC_SIG) {
     Y_UNUSED(ev);
-    Y_DEBUG_ABORT_UNLESS(false, "Unhandled StateInit event 0x%08" PRIx32, ev->GetTypeRewrite());
+    Y_DEBUG_ABORT("Unhandled StateInit event 0x%08" PRIx32, ev->GetTypeRewrite());
 }
 
 void TTabletExecutedFlat::ActivateExecutor(const TActorContext &ctx) {
diff --git a/ydb/core/tablet_flat/tablet_flat_executed.h b/ydb/core/tablet_flat/tablet_flat_executed.h
index e1a61e4039..3c7eefee3c 100644
--- a/ydb/core/tablet_flat/tablet_flat_executed.h
+++ b/ydb/core/tablet_flat/tablet_flat_executed.h
@@ -132,7 +132,7 @@ private:
             HANDLERS                                                                                \
             default:                                                                                \
                 if (!TTabletExecutedFlat::HandleDefaultEvents(ev, SelfId()))                             \
-                    Y_DEBUG_ABORT_UNLESS(false, "%s: unexpected event type: %" PRIx32 " event: %s",       \
+                    Y_DEBUG_ABORT("%s: unexpected event type: %" PRIx32 " event: %s",       \
                                    __func__, ev->GetTypeRewrite(),                                  \
                                    ev->ToString().data());                                          \
         }                                                                                           \
diff --git a/ydb/core/tx/datashard/alter_cdc_stream_unit.cpp b/ydb/core/tx/datashard/alter_cdc_stream_unit.cpp
index 26aa1f47b4..2212979801 100644
--- a/ydb/core/tx/datashard/alter_cdc_stream_unit.cpp
+++ b/ydb/core/tx/datashard/alter_cdc_stream_unit.cpp
@@ -55,7 +55,7 @@ public:
                 const TSnapshotKey key(pathId, snapshot.GetStep(), snapshot.GetTxId());
                 DataShard.GetSnapshotManager().RemoveSnapshot(txc.DB, key);
             } else {
-                Y_DEBUG_ABORT_UNLESS(false, "Absent snapshot");
+                Y_DEBUG_ABORT("Absent snapshot");
             }
 
             if (const auto heartbeatInterval = TDuration::MilliSeconds(streamDesc.GetResolvedTimestampsIntervalMs())) {
diff --git a/ydb/core/tx/datashard/datashard_schema_snapshots.cpp b/ydb/core/tx/datashard/datashard_schema_snapshots.cpp
index 77cad7bf4d..7b603ac4ec 100644
--- a/ydb/core/tx/datashard/datashard_schema_snapshots.cpp
+++ b/ydb/core/tx/datashard/datashard_schema_snapshots.cpp
@@ -133,7 +133,7 @@ bool TSchemaSnapshotManager::ReleaseReference(const TSchemaSnapshotKey& key) {
     auto refIt = References.find(key);
 
     if (refIt == References.end() || refIt->second <= 0) {
-        Y_DEBUG_ABORT_UNLESS(false, "ReleaseReference underflow, check acquire/release pairs");
+        Y_DEBUG_ABORT("ReleaseReference underflow, check acquire/release pairs");
         return false;
     }
 
@@ -145,7 +145,7 @@ bool TSchemaSnapshotManager::ReleaseReference(const TSchemaSnapshotKey& key) {
 
     auto it = Snapshots.find(key);
     if (it == Snapshots.end()) {
-        Y_DEBUG_ABORT_UNLESS(false, "ReleaseReference on an already removed snapshot");
+        Y_DEBUG_ABORT("ReleaseReference on an already removed snapshot");
         return false;
     }
 
diff --git a/ydb/core/tx/datashard/datashard_snapshots.cpp b/ydb/core/tx/datashard/datashard_snapshots.cpp
index 3cefffcb08..3bc1ec777f 100644
--- a/ydb/core/tx/datashard/datashard_snapshots.cpp
+++ b/ydb/core/tx/datashard/datashard_snapshots.cpp
@@ -519,7 +519,7 @@ bool TSnapshotManager::ReleaseReference(const TSnapshotKey& key, NTable::TDataba
     auto refIt = References.find(key);
 
     if (Y_UNLIKELY(refIt == References.end() || refIt->second <= 0)) {
-        Y_DEBUG_ABORT_UNLESS(false, "ReleaseReference underflow, check acquire/release pairs");
+        Y_DEBUG_ABORT("ReleaseReference underflow, check acquire/release pairs");
         return false;
     }
 
@@ -532,7 +532,7 @@ bool TSnapshotManager::ReleaseReference(const TSnapshotKey& key, NTable::TDataba
 
     auto it = Snapshots.find(key);
     if (it == Snapshots.end()) {
-        Y_DEBUG_ABORT_UNLESS(false, "ReleaseReference on an already deleted snapshot");
+        Y_DEBUG_ABORT("ReleaseReference on an already deleted snapshot");
         return false;
     }
 
diff --git a/ydb/core/tx/datashard/datashard_switch_mvcc_state.cpp b/ydb/core/tx/datashard/datashard_switch_mvcc_state.cpp
index 9bd42ebe7f..54713a14a9 100644
--- a/ydb/core/tx/datashard/datashard_switch_mvcc_state.cpp
+++ b/ydb/core/tx/datashard/datashard_switch_mvcc_state.cpp
@@ -30,7 +30,7 @@ void TDataShard::CheckMvccStateChangeCanStart(const TActorContext& ctx) {
                 case TShardState::Unknown:
                     // We cannot start checking before shard initialization
 
-                    Y_DEBUG_ABORT_UNLESS(false, "Unexpected shard state State:%d", State);
+                    Y_DEBUG_ABORT("Unexpected shard state State:%d", State);
                     [[fallthrough]];
 
                 case TShardState::Readonly:
diff --git a/ydb/core/tx/datashard/read_table_scan_unit.cpp b/ydb/core/tx/datashard/read_table_scan_unit.cpp
index 936698e70d..43bd0c6927 100644
--- a/ydb/core/tx/datashard/read_table_scan_unit.cpp
+++ b/ydb/core/tx/datashard/read_table_scan_unit.cpp
@@ -210,7 +210,7 @@ void TReadTableScanUnit::ProcessEvent(TAutoPtr<NActors::IEventHandle> &ev,
         LOG_ERROR_S(ctx, NKikimrServices::TX_DATASHARD,
                     "TReadTableScanUnit::ProcessEvent unhandled event type: " << ev->GetTypeRewrite()
                     << " event: " << ev->ToString());
-        Y_DEBUG_ABORT_UNLESS(false, "unexpected event %" PRIu64, (ui64)ev->GetTypeRewrite());
+        Y_DEBUG_ABORT("unexpected event %" PRIu64, (ui64)ev->GetTypeRewrite());
     }
 }
 
diff --git a/ydb/core/tx/datashard/wait_for_stream_clearance_unit.cpp b/ydb/core/tx/datashard/wait_for_stream_clearance_unit.cpp
index 63f529105e..4cf47e8a32 100644
--- a/ydb/core/tx/datashard/wait_for_stream_clearance_unit.cpp
+++ b/ydb/core/tx/datashard/wait_for_stream_clearance_unit.cpp
@@ -126,7 +126,7 @@ void TWaitForStreamClearanceUnit::ProcessEvent(TAutoPtr<NActors::IEventHandle> &
         LOG_ERROR_S(ctx, NKikimrServices::TX_DATASHARD,
                     "TWaitForStreamClearanceUnit::ProcessEvent unhandled event type: " << ev->GetTypeRewrite()
                     << " event: " << ev->ToString());
-        Y_DEBUG_ABORT_UNLESS(false, "unexpected event %" PRIu64, (ui64)ev->GetTypeRewrite());
+        Y_DEBUG_ABORT("unexpected event %" PRIu64, (ui64)ev->GetTypeRewrite());
     }
 }
 
diff --git a/ydb/core/tx/scheme_board/cache.cpp b/ydb/core/tx/scheme_board/cache.cpp
index 325369c623..4986468a8d 100644
--- a/ydb/core/tx/scheme_board/cache.cpp
+++ b/ydb/core/tx/scheme_board/cache.cpp
@@ -1527,7 +1527,7 @@ class TSchemeCache: public TMonitorableActor<TSchemeCache> {
                 FillInfo(Kind, ViewInfo, std::move(*pathDesc.MutableViewDescription()));
                 break;
             case NKikimrSchemeOp::EPathTypeInvalid:
-                Y_DEBUG_ABORT_UNLESS(false, "Invalid path type");
+                Y_DEBUG_ABORT("Invalid path type");
                 break;
             }
 
@@ -1598,7 +1598,7 @@ class TSchemeCache: public TMonitorableActor<TSchemeCache> {
                         break;
                     case NKikimrSchemeOp::EPathTypeTableIndex:
                     case NKikimrSchemeOp::EPathTypeInvalid:
-                        Y_DEBUG_ABORT_UNLESS(false, "Invalid path type");
+                        Y_DEBUG_ABORT("Invalid path type");
                         break;
                     }
                 }
diff --git a/ydb/core/tx/scheme_board/load_test.cpp b/ydb/core/tx/scheme_board/load_test.cpp
index 68e0599594..b494af6107 100644
--- a/ydb/core/tx/scheme_board/load_test.cpp
+++ b/ydb/core/tx/scheme_board/load_test.cpp
@@ -251,7 +251,7 @@ class TLoadProducer: public TActorBootstrapped<TLoadProducer> {
             break;
 
         default:
-            Y_DEBUG_ABORT_UNLESS(false, "Unknown wakeup tag");
+            Y_DEBUG_ABORT("Unknown wakeup tag");
             break;
         }
     }
diff --git a/ydb/core/tx/schemeshard/schemeshard__conditional_erase.cpp b/ydb/core/tx/schemeshard/schemeshard__conditional_erase.cpp
index 14e70249c6..fcc81239d8 100644
--- a/ydb/core/tx/schemeshard/schemeshard__conditional_erase.cpp
+++ b/ydb/core/tx/schemeshard/schemeshard__conditional_erase.cpp
@@ -186,14 +186,14 @@ struct TSchemeShard::TTxRunConditionalErase: public TSchemeShard::TRwTxBase {
 
             auto [tableInfo, shardIdx] = ResolveInfo(Self, tabletId);
             if (!tableInfo || shardIdx == InvalidShardIdx) {
-                Y_DEBUG_ABORT_UNLESS(false, "Unreachable");
+                Y_DEBUG_ABORT("Unreachable");
                 continue;
             }
 
             auto& inFlight = tableInfo->GetInFlightCondErase();
             auto it = inFlight.find(shardIdx);
             if (it == inFlight.end()) {
-                Y_DEBUG_ABORT_UNLESS(false, "Unreachable");
+                Y_DEBUG_ABORT("Unreachable");
                 continue;
             }
 
diff --git a/ydb/core/tx/schemeshard/schemeshard_export__create.cpp b/ydb/core/tx/schemeshard/schemeshard_export__create.cpp
index cc630e8d20..64d5791797 100644
--- a/ydb/core/tx/schemeshard/schemeshard_export__create.cpp
+++ b/ydb/core/tx/schemeshard/schemeshard_export__create.cpp
@@ -129,7 +129,7 @@ struct TSchemeShard::TExport::TTxCreate: public TSchemeShard::TXxport::TTxBase {
             break;
 
         default:
-            Y_DEBUG_ABORT_UNLESS(false, "Unknown export kind");
+            Y_DEBUG_ABORT("Unknown export kind");
         }
 
         Y_ABORT_UNLESS(exportInfo != nullptr);
diff --git a/ydb/core/tx/schemeshard/schemeshard_import__create.cpp b/ydb/core/tx/schemeshard/schemeshard_import__create.cpp
index 1f4336fac2..e3b51335e4 100644
--- a/ydb/core/tx/schemeshard/schemeshard_import__create.cpp
+++ b/ydb/core/tx/schemeshard/schemeshard_import__create.cpp
@@ -115,7 +115,7 @@ struct TSchemeShard::TImport::TTxCreate: public TSchemeShard::TXxport::TTxBase {
             break;
 
         default:
-            Y_DEBUG_ABORT_UNLESS(false, "Unknown import kind");
+            Y_DEBUG_ABORT("Unknown import kind");
         }
 
         Y_ABORT_UNLESS(importInfo != nullptr);
diff --git a/ydb/core/tx/tx_proxy/schemereq.cpp b/ydb/core/tx/tx_proxy/schemereq.cpp
index a531de22d2..a2f4ae3db8 100644
--- a/ydb/core/tx/tx_proxy/schemereq.cpp
+++ b/ydb/core/tx/tx_proxy/schemereq.cpp
@@ -886,7 +886,7 @@ struct TBaseSchemeReq: public TActorBootstrapped<TDerived> {
 
         LOG_ERROR_S(ctx, NKikimrServices::TX_PROXY, "Unexpected response from scheme cache"
             << ": " << navigate->ToString(*AppData()->TypeRegistry));
-        Y_DEBUG_ABORT_UNLESS(false, "Unreachable");
+        Y_DEBUG_ABORT("Unreachable");
 
         TxProxyMon->ResolveKeySetFail->Inc();
         ReportStatus(TEvTxUserProxy::TEvProposeTransactionStatus::EStatus::ResolveError, ctx);
diff --git a/ydb/core/util/activeactors.h b/ydb/core/util/activeactors.h
index 04ce4d1000..1cf771377e 100644
--- a/ydb/core/util/activeactors.h
+++ b/ydb/core/util/activeactors.h
@@ -76,7 +76,7 @@ namespace NActors {
             counter.Value += value;
             if (counter.Value >= CounterLimit && !std::exchange(counter.Warning, true)) {
                 LOG_CRIT_S(ctx, service, "Activity " << key << " reached active actors limit");
-                Y_DEBUG_ABORT_UNLESS(false, "Activity %s reached active actors limit", key.c_str());
+                Y_DEBUG_ABORT("Activity %s reached active actors limit", key.c_str());
             }
         }
     };
diff --git a/ydb/core/util/cache_cache.h b/ydb/core/util/cache_cache.h
index f9a4333c5e..7e31377200 100644
--- a/ydb/core/util/cache_cache.h
+++ b/ydb/core/util/cache_cache.h
@@ -123,7 +123,7 @@ public:
             WarmList.PushFront(xitem);
             break;
         default:
-            Y_DEBUG_ABORT_UNLESS(false, "unknown/broken cache generation");
+            Y_DEBUG_ABORT("unknown/broken cache generation");
             break;
         }
 
@@ -153,7 +153,7 @@ public:
                 *Config.ReportedWarm = WarmWeight;
             break;
         default:
-            Y_DEBUG_ABORT_UNLESS(false, "unknown cache generaton");
+            Y_DEBUG_ABORT("unknown cache generaton");
         }
     }
 
@@ -182,7 +182,7 @@ public:
                 *Config.ReportedWarm = WarmWeight;
             break;
         default:
-            Y_DEBUG_ABORT_UNLESS(false, "unknown cache generaton");
+            Y_DEBUG_ABORT("unknown cache generaton");
         }
     }