fix

ydb-platform · Dec 29, 2023 · 24ae993 · 24ae993
1 parent 7924909
commit 24ae993
Showing 1 changed file with 11 additions and 4 deletions.
diff --git a/ydb/core/kqp/session_actor/kqp_tx.h b/ydb/core/kqp/session_actor/kqp_tx.h
@@ -291,18 +291,22 @@ class TKqpTransactionContext : public NYql::TKikimrTransactionContextBase  {
 
 struct TTxId {
     TULID Id;
+    TString HumanStr;
 
     TTxId()
         : Id(TULID::Min())
     {}
 
     TTxId(const TULID& other)
         : Id(other)
+        , HumanStr(Id.ToString())
     {}
 
     static TTxId FromString(const TString& str) {
         TTxId res;
-        YQL_ENSURE(res.Id.ParseString(str));
+        if (res.Id.ParseString(str)) {
+            res.HumanStr = str;
+        }
         return res;
     }
 
@@ -311,7 +315,7 @@ struct TTxId {
     }
 
     TString GetHumanStr() {
-        return Id.ToString();
+        return HumanStr;
     }
 };
 
@@ -325,13 +329,16 @@ struct THash<NKikimr::NKqp::TTxId> {
 };
 
 namespace NKikimr::NKqp {
-
+    
 class TTransactionsCache {
     size_t MaxActiveSize;
     THashMap<TTxId, TIntrusivePtr<TKqpTransactionContext>, THash<NKikimr::NKqp::TTxId>> Active;
     std::deque<TIntrusivePtr<TKqpTransactionContext>> ToBeAborted;
 
     auto FindOldestTransaction() {
+        if (Active.empty()) {
+            return std::end(Active);
+        }
         auto oldest = std::begin(Active);
         for (auto it = std::next(oldest); it != std::end(Active); ++it) {
             if (oldest->second->LastAccessTime < it->second->LastAccessTime) {
@@ -435,4 +442,4 @@ bool NeedSnapshot(const TKqpTransactionContext& txCtx, const NYql::TKikimrConfig
 
 bool HasOlapTableInTx(const NKqpProto::TKqpPhyQuery& physicalQuery);
 
-}  // namespace NKikimr::NKqp
+}  // namespace NKikimr::NKqp