database/doris
2
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

[chore](gutil) remove some gutil macros and solve some macro conflict with brpc (#13954)

Browse Source 
Co-authored-by: yiguolei <yiguolei@gmail.com>
This commit is contained in:
yiguolei
2022-11-07 13:39:52 +08:00
committed by GitHub
parent e8d2fb6778
commit 32fea672b0
19 changed files with 36 additions and 256 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
be/src/agent/agent_server.cpp
View File

@ -36,7 +36,7 @@ using std::vector;
namespace doris {
AgentServer::AgentServer(ExecEnv* exec_env, const TMasterInfo& master_info)
: _exec_env(exec_env), _master_info(master_info), _topic_subscriber(new TopicSubscriber()) {
: _master_info(master_info), _topic_subscriber(new TopicSubscriber()) {
for (auto& path : exec_env->store_paths()) {
try {
string dpp_download_path_str = path.path + "/" + DPP_PREFIX;
@ -54,12 +54,12 @@ AgentServer::AgentServer(ExecEnv* exec_env, const TMasterInfo& master_info)
#ifndef BE_TEST
#define CREATE_AND_START_POOL(type, pool_name) \
pool_name.reset(new TaskWorkerPool(TaskWorkerPool::TaskWorkerType::type, _exec_env, \
pool_name.reset(new TaskWorkerPool(TaskWorkerPool::TaskWorkerType::type, exec_env, \
master_info, TaskWorkerPool::ThreadModel::MULTI_THREADS)); \
pool_name->start();
#define CREATE_AND_START_THREAD(type, pool_name) \
pool_name.reset(new TaskWorkerPool(TaskWorkerPool::TaskWorkerType::type, _exec_env, \
pool_name.reset(new TaskWorkerPool(TaskWorkerPool::TaskWorkerType::type, exec_env, \
master_info, TaskWorkerPool::ThreadModel::SINGLE_THREAD)); \
pool_name->start();
#else