aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Rutkovsky <alexvru@ydb.tech>2024-11-08 22:05:11 +0300
committerGitHub <noreply@github.com>2024-11-08 19:05:11 +0000
commit3c5b82ea9f599fcafd21b2cab7fbf4403fc3856c (patch)
tree3d9aee7f1d5c97ee3178fb0afaf904ff75570142
parent30b722c88f38e483c21dc542bc5c01c88c3953ef (diff)
downloadydb-3c5b82ea9f599fcafd21b2cab7fbf4403fc3856c.tar.gz
Remove obsolete map from backpressure queue client (#11429)
-rw-r--r--ydb/core/blobstorage/backpressure/defs.h1
-rw-r--r--ydb/core/blobstorage/backpressure/queue.cpp1
-rw-r--r--ydb/core/blobstorage/backpressure/queue.h15
3 files changed, 1 insertions, 16 deletions
diff --git a/ydb/core/blobstorage/backpressure/defs.h b/ydb/core/blobstorage/backpressure/defs.h
index c9d1aabc6de..02b8df32018 100644
--- a/ydb/core/blobstorage/backpressure/defs.h
+++ b/ydb/core/blobstorage/backpressure/defs.h
@@ -17,6 +17,5 @@
#include <ydb/library/actors/core/actor_bootstrapped.h>
#include <ydb/library/actors/core/mailbox.h>
#include <ydb/library/actors/core/mon.h>
-#include <library/cpp/containers/intrusive_rb_tree/rb_tree.h>
#include <ydb/library/actors/wilson/wilson_span.h>
#include <google/protobuf/message.h>
diff --git a/ydb/core/blobstorage/backpressure/queue.cpp b/ydb/core/blobstorage/backpressure/queue.cpp
index da7433ff8cc..c0f872daf56 100644
--- a/ydb/core/blobstorage/backpressure/queue.cpp
+++ b/ydb/core/blobstorage/backpressure/queue.cpp
@@ -339,7 +339,6 @@ TBlobStorageQueue::TItemList::iterator TBlobStorageQueue::EraseItem(TItemList& q
TItemList::iterator nextIter = std::next(it);
if (Queues.Unused.size() < MaxUnusedItems) {
Queues.Unused.splice(Queues.Unused.end(), queue, it);
- it->TSenderNode::UnLink();
it->Event.Discard();
} else {
queue.erase(it);
diff --git a/ydb/core/blobstorage/backpressure/queue.h b/ydb/core/blobstorage/backpressure/queue.h
index b0acd538375..2bab3eb8b3a 100644
--- a/ydb/core/blobstorage/backpressure/queue.h
+++ b/ydb/core/blobstorage/backpressure/queue.h
@@ -31,16 +31,7 @@ class TBlobStorageQueue {
}
};
- template<typename TDerived>
- struct TSenderNode : public TRbTreeItem<TSenderNode<TDerived>, TCompare<TActorId>> {
- const TActorId& GetKey() const {
- return static_cast<const TDerived&>(*this).Event.GetSender();
- }
- };
-
- struct TItem
- : public TSenderNode<TItem>
- {
+ struct TItem {
EItemQueue Queue;
TCostModel::TMessageCostEssence CostEssence;
NWilson::TSpan Span;
@@ -103,10 +94,7 @@ class TBlobStorageQueue {
{}
};
- using TSenderMap = TRbTree<TSenderNode<TItem>, TCompare<TActorId>>;
-
TQueues Queues;
- TSenderMap SenderToItems;
THashMap<std::pair<ui64, ui64>, TItemList::iterator> InFlightLookup;
ui64 WindowSize;
@@ -233,7 +221,6 @@ public:
newIt->Iterator = newIt;
SetItemQueue(*newIt, EItemQueue::Waiting);
- SenderToItems.Insert(&*newIt);
// count item
++*QueueItemsPut;