Skip to content

Commit 554b9fc

Browse files
LomzovatLomzovat
authored
TDeque to std::deque (#133)
1 parent 2cd413c commit 554b9fc

File tree

26 files changed

+27
-390
lines changed

26 files changed

+27
-390
lines changed

‎client/ydb_coordination/coordination.cpp

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
#include <ydb/public/api/grpc/ydb_coordination_v1.grpc.pb.h>
99
#include <client/ydb_common_client/impl/client.h>
1010

11-
#include <util/generic/deque.h>
1211
#include <util/random/entropy.h>
1312

1413
namespace NYdb {
@@ -309,7 +308,7 @@ class TSessionContext : public TThrRefBase {
309308
TIntrusivePtr<TSemaphoreOp> LastSentOp;
310309
TIntrusivePtr<TSemaphoreOp> LastAckedOp;
311310
THashMap<ui64, TIntrusivePtr<TSemaphoreOp>> WaitingOps;
312-
TDeque<TIntrusivePtr<TSemaphoreOp>> OpQueue;
311+
std::deque<TIntrusivePtr<TSemaphoreOp>> OpQueue;
313312
bool Restoring = false;
314313

315314
bool IsEmpty() const {
@@ -874,9 +873,9 @@ class TSessionContext : public TThrRefBase {
874873
bool notifyExpired = false;
875874
TPromise<TSessionResult> sessionPromise;
876875
TResultPromise<void> reconnectPromise;
877-
TDeque<TResultPromise<bool>> abortedSemaphoreOps;
878-
TDeque<TResultPromise<bool>> failedSemaphoreOps;
879-
TDeque<THolder<TSimpleOp>> failedSimpleOps;
876+
std::deque<TResultPromise<bool>> abortedSemaphoreOps;
877+
std::deque<TResultPromise<bool>> failedSemaphoreOps;
878+
std::deque<THolder<TSimpleOp>> failedSimpleOps;
880879
TResultPromise<void> closePromise;
881880

882881
{
@@ -1010,7 +1009,7 @@ class TSessionContext : public TThrRefBase {
10101009
sessionPromise.SetValue(TSessionResult(status));
10111010
}
10121011

1013-
if (abortedSemaphoreOps) {
1012+
if (!abortedSemaphoreOps.empty()) {
10141013
auto aborted = MakeStatus(EStatus::ABORTED,
10151014
"Operation superseded by another request, true result has been lost");
10161015
for (auto& promise : abortedSemaphoreOps) {
@@ -1765,7 +1764,7 @@ class TSessionContext : public TThrRefBase {
17651764

17661765
THashMap<std::string, TSemaphoreState> Semaphores;
17671766
THashMap<ui64, TSemaphoreState*> SemaphoreByReqId;
1768-
TDeque<THolder<TSimpleOp>> PendingRequests;
1767+
std::deque<THolder<TSimpleOp>> PendingRequests;
17691768
THashMap<ui64, THolder<TSimpleOp>> SentRequests;
17701769
TResultPromise<void> ReconnectPromise;
17711770

‎client/ydb_persqueue_core/ut/ut_utils/ut_utils.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ struct TYDBClientEventLoop : public ::NPersQueue::IClientEventLoop {
109109
std::optional<TContinuationToken> continueToken;
110110
NThreading::TFuture<void> waitEventFuture = writer->WaitEvent();
111111
THashMap<ui64, NThreading::TPromise<::NPersQueue::TWriteResult>> ackPromiseBySequenceNumber;
112-
TDeque<NThreading::TPromise<::NPersQueue::TWriteResult>> ackPromiseQueue;
112+
std::deque<NThreading::TPromise<::NPersQueue::TWriteResult>> ackPromiseQueue;
113113
while (!MustStop) {
114114
if (!continueToken) {
115115
Log << TLOG_INFO << "Wait for writer event";

‎library/cpp/blockcodecs/core/codecs.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
#include <util/system/unaligned_mem.h>
1212
#include <util/generic/hash.h>
1313
#include <util/generic/cast.h>
14-
#include <util/generic/deque.h>
1514
#include <util/generic/buffer.h>
1615
#include <util/generic/singleton.h>
1716
#include <util/generic/algorithm.h>
@@ -58,7 +57,7 @@ namespace {
5857
Registry[Tmp.back()] = Registry[to];
5958
}
6059

61-
TDeque<std::string> Tmp;
60+
std::deque<std::string> Tmp;
6261
TNullCodec Null;
6362
std::vector<TCodecPtr> Codecs;
6463
typedef THashMap<std::string_view, ICodec*> TRegistry;

‎library/cpp/coroutine/engine/stack/stack_storage.h

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
#include "stack.h"
44

55
#include <util/datetime/base.h>
6-
#include <util/generic/deque.h>
76

87

98
class TCont;
@@ -30,8 +29,8 @@ namespace NCoro::NStack {
3029
void ReleaseMemory(char* alignedStackMemory, size_t pagesToKeep) noexcept;
3130

3231
private:
33-
TDeque<void*> Released_; //!< stacks memory with released RSS memory
34-
TDeque<void*> Full_; //!< stacks memory with RSS memory
32+
std::deque<void*> Released_; //!< stacks memory with released RSS memory
33+
std::deque<void*> Full_; //!< stacks memory with RSS memory
3534
size_t StackSize_ = 0;
3635
size_t RssPagesToKeep_ = 0;
3736
const size_t ReleaseRate_ = 1;

‎library/cpp/dbg_output/dumpers.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ struct TDumper<std::array<T, N>>: public TSeqDumper {
108108
};
109109

110110
template <class T, class A>
111-
struct TDumper<TDeque<T, A>>: public TSeqDumper {
111+
struct TDumper<std::deque<T, A>>: public TSeqDumper {
112112
};
113113

114114
template <class T, class A>

‎library/cpp/dbg_output/engine.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
#include <string>
66
#include <utility>
7+
#include <deque>
78

89
template <class T>
910
struct TDumper {

‎library/cpp/http/io/compression.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
#include "stream.h"
44

5-
#include <util/generic/deque.h>
65
#include <util/generic/hash.h>
76

87
#include <span>
@@ -46,7 +45,7 @@ class TCompressionCodecFactory {
4645
TEncoderConstructor Encoder;
4746
};
4847

49-
TDeque<std::string> Strings_;
48+
std::deque<std::string> Strings_;
5049
THashMap<std::string_view, TCodec> Codecs_;
5150
std::vector<std::string_view> BestCodecs_;
5251
};

‎library/cpp/http/io/headers.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44

55
#include <string>
66
#include <string_view>
7-
#include <util/generic/deque.h>
87

98
#include <util/string/cast.h>
109

@@ -53,7 +52,7 @@ class THttpInputHeader {
5352

5453
/// Контейнер для хранения HTTP-заголовков
5554
class THttpHeaders {
56-
using THeaders = TDeque<THttpInputHeader>;
55+
using THeaders = std::deque<THttpInputHeader>;
5756

5857
public:
5958
using TConstIterator = THeaders::const_iterator;

‎library/cpp/json/json_prettifier.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
#include "json_prettifier.h"
22

3-
#include <util/generic/deque.h>
43
#include <util/generic/algorithm.h>
54
#include <util/memory/pool.h>
65
#include <util/stream/str.h>

‎library/cpp/json/writer/json_value.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44

55
#include <util/generic/hash.h>
66

7-
#include <util/generic/deque.h>
87
#include <util/generic/utility.h>
98
#include <util/generic/yexception.h>
109

@@ -35,7 +34,7 @@ namespace NJson {
3534

3635
public:
3736
typedef THashMap<std::string, TJsonValue> TMapType;
38-
typedef TDeque<TJsonValue> TArray;
37+
typedef std::deque<TJsonValue> TArray;
3938

4039
TJsonValue() noexcept = default;
4140
TJsonValue(EJsonValueType type);

‎library/cpp/openssl/io/stream.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
#include "stream.h"
22

3-
#include <util/generic/deque.h>
43
#include <util/generic/singleton.h>
54
#include <util/generic/yexception.h>
65

‎library/cpp/resource/registry.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55

66
#include <util/system/yassert.h>
77
#include <util/generic/hash.h>
8-
#include <util/generic/deque.h>
98
#include <util/generic/singleton.h>
109
#include <util/string/escape.h>
1110

@@ -102,7 +101,7 @@ namespace {
102101
return D_.at(idx).first;
103102
}
104103

105-
typedef TDeque<TDescriptor> TDescriptors;
104+
typedef std::deque<TDescriptor> TDescriptors;
106105
TDescriptors D_;
107106
};
108107
}

‎tools/enum_parser/enum_serialization_runtime/serialized_enum_ut.cpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
#include <library/cpp/testing/unittest/registar.h>
44

5-
#include <util/generic/deque.h>
65
#include <util/generic/typelist.h>
76
#include <util/generic/vector.h>
87

@@ -74,8 +73,8 @@ Y_UNIT_TEST_SUITE(TestSerializedEnum) {
7473
const std::vector<ETestEnum> typedValues = {ETestEnum::One, ETestEnum::Two, ETestEnum::Three, ETestEnum::Zero, ETestEnum::Zero, ETestEnum::Zero, ETestEnum::Eleven, ETestEnum::Zero, ETestEnum::Zero, ETestEnum::Zero, ETestEnum::Zero, ETestEnum::Zero, ETestEnum::Two};
7574
UNIT_ASSERT_EQUAL(typedValues, view.Materialize());
7675

77-
const TDeque<ETestEnum> typedValuesDeque{typedValues.begin(), typedValues.end()};
78-
UNIT_ASSERT_EQUAL(typedValuesDeque, view.Materialize<TDeque>());
76+
const std::deque<ETestEnum> typedValuesDeque{typedValues.begin(), typedValues.end()};
77+
UNIT_ASSERT_EQUAL(typedValuesDeque, view.Materialize<std::deque>());
7978
}
8079

8180
Y_UNIT_TEST(MappedDictView) {

‎util/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@ target_joined_source(yutil
5555
${CMAKE_SOURCE_DIR}/util/generic/bt_exception.cpp
5656
${CMAKE_SOURCE_DIR}/util/generic/buffer.cpp
5757
${CMAKE_SOURCE_DIR}/util/generic/cast.cpp
58-
${CMAKE_SOURCE_DIR}/util/generic/deque.cpp
5958
${CMAKE_SOURCE_DIR}/util/generic/explicit_type.cpp
6059
${CMAKE_SOURCE_DIR}/util/generic/fastqueue.cpp
6160
${CMAKE_SOURCE_DIR}/util/generic/flags.cpp

‎util/generic/deque.cpp

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎util/generic/deque.h

Lines changed: 0 additions & 25 deletions
This file was deleted.

‎util/generic/deque.pxd

Lines changed: 0 additions & 9 deletions
This file was deleted.

0 commit comments

Comments
 (0)