Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
2dot5
ClickHouse
提交
36eb2c30
C
ClickHouse
项目概览
2dot5
/
ClickHouse
通知
3
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
C
ClickHouse
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
36eb2c30
编写于
6月 25, 2020
作者:
A
alesapin
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Simplify code around locks
上级
d5847d29
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
15 addition
and
20 deletion
+15
-20
src/Storages/RabbitMQ/RabbitMQHandler.cpp
src/Storages/RabbitMQ/RabbitMQHandler.cpp
+6
-12
src/Storages/RabbitMQ/RabbitMQHandler.h
src/Storages/RabbitMQ/RabbitMQHandler.h
+1
-1
src/Storages/RabbitMQ/ReadBufferFromRabbitMQConsumer.cpp
src/Storages/RabbitMQ/ReadBufferFromRabbitMQConsumer.cpp
+5
-5
src/Storages/RabbitMQ/ReadBufferFromRabbitMQConsumer.h
src/Storages/RabbitMQ/ReadBufferFromRabbitMQConsumer.h
+2
-2
tests/integration/test_storage_rabbitmq/test.py
tests/integration/test_storage_rabbitmq/test.py
+1
-0
未找到文件。
src/Storages/RabbitMQ/RabbitMQHandler.cpp
浏览文件 @
36eb2c30
...
...
@@ -39,14 +39,11 @@ void RabbitMQHandler::startConsumerLoop(std::atomic<bool> & loop_started)
/* The object of this class is shared between concurrent consumers (who share the same connection == share the same
* event loop and handler). But the loop should not be attempted to start if it is already running.
*/
if
(
mutex_before_event_loop
.
try_lock_for
(
std
::
chrono
::
milliseconds
(
Lock_timeout
)))
{
loop_started
.
store
(
true
);
stop_scheduled
=
false
;
std
::
lock_guard
lock
(
mutex_before_event_loop
);
loop_started
.
store
(
true
);
stop_scheduled
=
false
;
uv_run
(
loop
,
UV_RUN_NOWAIT
);
mutex_before_event_loop
.
unlock
();
}
uv_run
(
loop
,
UV_RUN_NOWAIT
);
}
...
...
@@ -58,11 +55,8 @@ void RabbitMQHandler::startProducerLoop()
void
RabbitMQHandler
::
stop
()
{
if
(
mutex_before_loop_stop
.
try_lock
())
{
uv_stop
(
loop
);
mutex_before_loop_stop
.
unlock
();
}
std
::
lock_guard
lock
(
mutex_before_loop_stop
);
uv_stop
(
loop
);
}
...
...
src/Storages/RabbitMQ/RabbitMQHandler.h
浏览文件 @
36eb2c30
...
...
@@ -31,7 +31,7 @@ private:
timeval
tv
;
std
::
atomic
<
bool
>
stop_scheduled
=
false
;
std
::
timed_
mutex
mutex_before_event_loop
;
std
::
mutex
mutex_before_event_loop
;
std
::
mutex
mutex_before_loop_stop
;
};
...
...
src/Storages/RabbitMQ/ReadBufferFromRabbitMQConsumer.cpp
浏览文件 @
36eb2c30
...
...
@@ -46,7 +46,7 @@ ReadBufferFromRabbitMQConsumer::ReadBufferFromRabbitMQConsumer(
const
std
::
atomic
<
bool
>
&
stopped_
)
:
ReadBuffer
(
nullptr
,
0
)
,
consumer_channel
(
std
::
move
(
consumer_channel_
))
,
event
H
andler
(
eventHandler_
)
,
event
_h
andler
(
eventHandler_
)
,
exchange_name
(
exchange_name_
)
,
routing_keys
(
routing_keys_
)
,
channel_id
(
channel_id_
)
...
...
@@ -372,7 +372,7 @@ void ReadBufferFromRabbitMQConsumer::subscribe(const String & queue_name)
* executing all callbacks on the connection (not only its own), then there should be some point to unblock.
* loop_started == 1 if current consumer is started the loop and not another.
*/
if
(
!
loop_started
.
load
()
&&
!
event
H
andler
.
checkStopIsScheduled
())
if
(
!
loop_started
.
load
()
&&
!
event
_h
andler
.
checkStopIsScheduled
())
{
stopEventLoopWithTimeout
();
}
...
...
@@ -415,19 +415,19 @@ void ReadBufferFromRabbitMQConsumer::checkSubscription()
void
ReadBufferFromRabbitMQConsumer
::
stopEventLoop
()
{
event
H
andler
.
stop
();
event
_h
andler
.
stop
();
}
void
ReadBufferFromRabbitMQConsumer
::
stopEventLoopWithTimeout
()
{
event
H
andler
.
stopWithTimeout
();
event
_h
andler
.
stopWithTimeout
();
}
void
ReadBufferFromRabbitMQConsumer
::
startEventLoop
(
std
::
atomic
<
bool
>
&
loop_started
)
{
event
H
andler
.
startConsumerLoop
(
loop_started
);
event
_h
andler
.
startConsumerLoop
(
loop_started
);
}
...
...
src/Storages/RabbitMQ/ReadBufferFromRabbitMQConsumer.h
浏览文件 @
36eb2c30
...
...
@@ -23,7 +23,7 @@ class ReadBufferFromRabbitMQConsumer : public ReadBuffer
public:
ReadBufferFromRabbitMQConsumer
(
ChannelPtr
consumer_channel_
,
RabbitMQHandler
&
event
H
andler_
,
RabbitMQHandler
&
event
_h
andler_
,
const
String
&
exchange_name_
,
const
Names
&
routing_keys_
,
const
size_t
channel_id_
,
...
...
@@ -46,7 +46,7 @@ private:
using
Messages
=
std
::
vector
<
String
>
;
ChannelPtr
consumer_channel
;
RabbitMQHandler
&
event
H
andler
;
RabbitMQHandler
&
event
_h
andler
;
const
String
&
exchange_name
;
const
Names
&
routing_keys
;
...
...
tests/integration/test_storage_rabbitmq/test.py
浏览文件 @
36eb2c30
...
...
@@ -485,6 +485,7 @@ def test_rabbitmq_big_message(rabbitmq_cluster):
while
True
:
result
=
instance
.
query
(
'SELECT count() FROM test.view'
)
print
(
"Result"
,
result
,
"Expected"
,
batch_messages
*
rabbitmq_messages
)
if
int
(
result
)
==
batch_messages
*
rabbitmq_messages
:
break
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录