Merge fbdd8b5 into ce3201c

ydb-platform · Sep 10, 2024 · 13bab15 · 13bab15
2 parents ce3201c + fbdd8b5
commit 13bab15
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/ydb/core/tablet/private/aggregated_counters.h b/ydb/core/tablet/private/aggregated_counters.h
@@ -140,7 +140,7 @@ class TAggregatedHistogramCounters {
     TVector<TCountersByTabletIdMap> CountersByTabletId; // each index is map from tablet to counter value
 };
 
-class TAggregatedLabeledCounters {
+class TAggregatedLabeledCounters : public TThrRefBase {
 public:
     //
     TAggregatedLabeledCounters(ui32 count, const ui8* aggrFunc, const char * const * names, const ui8* types, const TString& groupNames);

diff --git a/ydb/core/tablet/private/labeled_db_counters.cpp b/ydb/core/tablet/private/labeled_db_counters.cpp
@@ -31,7 +31,7 @@ void TPQCounters::Apply(ui64 tabletId, const NKikimr::TTabletLabeledCountersBase
         }
     }
 
-    auto& el = LabeledCountersByGroup.InsertIfAbsent(group, new TAggregatedLabeledCounters(
+    auto el = LabeledCountersByGroup.InsertIfAbsent(group, new TAggregatedLabeledCounters(
         labeledCounters->GetCounters().Size(), labeledCounters->GetAggrFuncs(),
         labeledCounters->GetNames(), labeledCounters->GetTypes(), groupNames));
 

diff --git a/ydb/core/tablet/private/labeled_db_counters.h b/ydb/core/tablet/private/labeled_db_counters.h
@@ -13,7 +13,7 @@ namespace NKikimr::NPrivate {
 
 class TPQCounters : public ILabeledCounters {
 protected:
-    TConcurrentRWHashMap<TString, TAutoPtr<TAggregatedLabeledCounters>, 256> LabeledCountersByGroup;
+    TConcurrentRWHashMap<TString, TIntrusivePtr<TAggregatedLabeledCounters>, 256> LabeledCountersByGroup;
     NMonitoring::TDynamicCounterPtr Group;
 
 public:

diff --git a/ydb/core/util/concurrent_rw_hash.h b/ydb/core/util/concurrent_rw_hash.h
@@ -63,15 +63,15 @@ class TConcurrentRWHashMap {
         return false;
     }
 
-    V& InsertIfAbsent(const K& key, const V& value) {
+    V InsertIfAbsent(const K& key, const V& value) {
         TBucket& bucket = GetBucketForKey(key);
         TWriteGuard guard(bucket.RWLock);
 
         return bucket.Map.insert(std::make_pair(key, value)).first->second;
     }
 
     template <typename Callable>
-    V& InsertIfAbsentWithInit(const K& key, Callable initFunc) {
+    V InsertIfAbsentWithInit(const K& key, Callable initFunc) {
         TBucket& bucket = GetBucketForKey(key);
         TWriteGuard guard(bucket.RWLock);