Skip to content

Commit de47d71

Browse files
antonporodnikovShikaree68
authored andcommitted
-#80 Replace TQueue to std::queue, TPriorityQueue to std::priority_queue (#84)
1 parent 85fb2ac commit de47d71

File tree

15 files changed

+18
-298
lines changed

15 files changed

+18
-298
lines changed

client/ydb_persqueue_core/impl/common.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
#include <client/ydb_persqueue_core/persqueue.h>
44
#include <client/ydb_common_client/impl/client.h>
55

6-
#include <util/generic/queue.h>
76
#include <util/thread/pool.h>
87

98
#include <queue>
@@ -470,7 +469,7 @@ class TSerialExecutor : public IAsyncExecutor, public std::enable_shared_from_th
470469
IAsyncExecutor::TPtr Executor; //!< Wrapped executor that is actually doing the job
471470
bool Busy = false; //!< Set if some closure was scheduled for execution and did not finish yet
472471
std::mutex Mutex;
473-
TQueue<TFunction> ExecutionQueue = {};
472+
std::queue<TFunction> ExecutionQueue = {};
474473

475474
public:
476475
TSerialExecutor(IAsyncExecutor::TPtr executor);

client/ydb_persqueue_core/ut/basic_usage_ut.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
#include <library/cpp/threading/future/future.h>
55
#include <library/cpp/threading/future/async.h>
66

7-
#include <util/generic/queue.h>
87
#include <util/string/join.h>
98
#include <util/system/event.h>
109
#include <util/stream/zlib.h>

client/ydb_persqueue_core/ut/ut_utils/ut_utils.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
#include <client/ydb_persqueue_core/ut/ut_utils/sdk_test_setup.h>
55
#include <client/ydb_persqueue_core/impl/common.h>
66
#include <client/ydb_persqueue_core/impl/write_session.h>
7+
#include <queue>
78

89
using namespace NKikimr;
910
using namespace NKikimr::NPersQueueTests;
@@ -387,7 +388,7 @@ class TYdbPqTestExecutor : public IAsyncExecutor {
387388
TLockFreeQueue<TFunction> TasksQueue;
388389
std::shared_ptr<TLockFreeQueue<ui64>> ExecIdsQueue;
389390
THashMap<ui64, TFunction> Tasks;
390-
TQueue<ui64> ExecIds;
391+
std::queue<ui64> ExecIds;
391392
ui64 CurrentTaskId = 0;
392393
TThread Thread;
393394

client/ydb_topic/impl/executor.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
#include <client/ydb_topic/topic.h>
44
#include <client/ydb_common_client/impl/client.h>
55

6-
#include <util/generic/queue.h>
76
#include <util/thread/pool.h>
87

98

@@ -58,7 +57,7 @@ class TSerialExecutor : public IAsyncExecutor, public std::enable_shared_from_th
5857
IAsyncExecutor::TPtr Executor; //!< Wrapped executor that is actually doing the job
5958
bool Busy = false; //!< Set if some closure was scheduled for execution and did not finish yet
6059
std::mutex Mutex = {};
61-
TQueue<TFunction> ExecutionQueue = {};
60+
std::queue<TFunction> ExecutionQueue = {};
6261

6362
public:
6463
TSerialExecutor(IAsyncExecutor::TPtr executor);

util/CMakeLists.darwin-arm64.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,6 @@ target_joined_source(yutil
9696
${CMAKE_SOURCE_DIR}/util/generic/object_counter.cpp
9797
${CMAKE_SOURCE_DIR}/util/generic/overloaded.cpp
9898
${CMAKE_SOURCE_DIR}/util/generic/ptr.cpp
99-
${CMAKE_SOURCE_DIR}/util/generic/queue.cpp
10099
${CMAKE_SOURCE_DIR}/util/generic/refcount.cpp
101100
${CMAKE_SOURCE_DIR}/util/generic/scope.cpp
102101
${CMAKE_SOURCE_DIR}/util/generic/set.cpp

util/CMakeLists.darwin-x86_64.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,6 @@ target_joined_source(yutil
9595
${CMAKE_SOURCE_DIR}/util/generic/object_counter.cpp
9696
${CMAKE_SOURCE_DIR}/util/generic/overloaded.cpp
9797
${CMAKE_SOURCE_DIR}/util/generic/ptr.cpp
98-
${CMAKE_SOURCE_DIR}/util/generic/queue.cpp
9998
${CMAKE_SOURCE_DIR}/util/generic/refcount.cpp
10099
${CMAKE_SOURCE_DIR}/util/generic/scope.cpp
101100
${CMAKE_SOURCE_DIR}/util/generic/set.cpp

util/CMakeLists.linux-aarch64.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,6 @@ target_joined_source(yutil
9999
${CMAKE_SOURCE_DIR}/util/generic/object_counter.cpp
100100
${CMAKE_SOURCE_DIR}/util/generic/overloaded.cpp
101101
${CMAKE_SOURCE_DIR}/util/generic/ptr.cpp
102-
${CMAKE_SOURCE_DIR}/util/generic/queue.cpp
103102
${CMAKE_SOURCE_DIR}/util/generic/refcount.cpp
104103
${CMAKE_SOURCE_DIR}/util/generic/scope.cpp
105104
${CMAKE_SOURCE_DIR}/util/generic/set.cpp

util/CMakeLists.linux-x86_64.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,6 @@ target_joined_source(yutil
9999
${CMAKE_SOURCE_DIR}/util/generic/object_counter.cpp
100100
${CMAKE_SOURCE_DIR}/util/generic/overloaded.cpp
101101
${CMAKE_SOURCE_DIR}/util/generic/ptr.cpp
102-
${CMAKE_SOURCE_DIR}/util/generic/queue.cpp
103102
${CMAKE_SOURCE_DIR}/util/generic/refcount.cpp
104103
${CMAKE_SOURCE_DIR}/util/generic/scope.cpp
105104
${CMAKE_SOURCE_DIR}/util/generic/set.cpp

util/CMakeLists.windows-x86_64.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,6 @@ target_joined_source(yutil
102102
${CMAKE_SOURCE_DIR}/util/generic/object_counter.cpp
103103
${CMAKE_SOURCE_DIR}/util/generic/overloaded.cpp
104104
${CMAKE_SOURCE_DIR}/util/generic/ptr.cpp
105-
${CMAKE_SOURCE_DIR}/util/generic/queue.cpp
106105
${CMAKE_SOURCE_DIR}/util/generic/refcount.cpp
107106
${CMAKE_SOURCE_DIR}/util/generic/scope.cpp
108107
${CMAKE_SOURCE_DIR}/util/generic/set.cpp

util/generic/fwd.h

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -44,12 +44,6 @@ class TVector;
4444
template <class T, class A = std::allocator<T>>
4545
class TDeque;
4646

47-
template <class T, class S = TDeque<T>>
48-
class TQueue;
49-
50-
template <class T, class S = std::vector<T>, class C = TLess<T>>
51-
class TPriorityQueue;
52-
5347
template <class Key, class T, class HashFcn = THash<Key>, class EqualKey = TEqualTo<Key>, class Alloc = std::allocator<Key>>
5448
class THashMap;
5549

util/generic/queue.cpp

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

util/generic/queue.h

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

util/generic/queue_ut.cpp

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

0 commit comments

Comments
 (0)