Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
2dot5
ClickHouse
提交
d26f0458
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,发现更多精彩内容 >>
提交
d26f0458
编写于
1月 14, 2017
作者:
A
Alexey Milovidov
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Addition to prev. revision [#CLICKHOUSE-2716].
上级
a86a86aa
变更
3
显示空白变更内容
内联
并排
Showing
3 changed file
with
47 addition
and
38 deletion
+47
-38
libs/libmysqlxx/CMakeLists.txt
libs/libmysqlxx/CMakeLists.txt
+3
-0
libs/libmysqlxx/include/mysqlxx/Pool.h
libs/libmysqlxx/include/mysqlxx/Pool.h
+3
-37
libs/libmysqlxx/src/Pool.cpp
libs/libmysqlxx/src/Pool.cpp
+41
-1
未找到文件。
libs/libmysqlxx/CMakeLists.txt
浏览文件 @
d26f0458
add_library
(
mysqlxx
src/Connection.cpp
src/Exception.cpp
src/Query.cpp
src/ResultBase.cpp
src/StoreQueryResult.cpp
src/UseQueryResult.cpp
src/Row.cpp
src/Value.cpp
src/Pool.cpp
src/PoolWithFailover.cpp
include/mysqlxx/Connection.h
...
...
libs/libmysqlxx/include/mysqlxx/Pool.h
浏览文件 @
d26f0458
...
...
@@ -172,10 +172,8 @@ public:
unsigned
default_connections_
=
MYSQLXX_POOL_DEFAULT_START_CONNECTIONS
,
unsigned
max_connections_
=
MYSQLXX_POOL_DEFAULT_MAX_CONNECTIONS
,
const
char
*
parent_config_name_
=
nullptr
)
:
Pool
{
Poco
::
Util
::
Application
::
instance
().
config
(),
config_name
,
default_connections_
,
max_connections_
,
parent_config_name_
}
:
Pool
{
Poco
::
Util
::
Application
::
instance
().
config
(),
config_name
,
default_connections_
,
max_connections_
,
parent_config_name_
}
{}
/**
...
...
@@ -186,39 +184,7 @@ public:
Pool
(
const
Poco
::
Util
::
AbstractConfiguration
&
cfg
,
const
std
::
string
&
config_name
,
unsigned
default_connections_
=
MYSQLXX_POOL_DEFAULT_START_CONNECTIONS
,
unsigned
max_connections_
=
MYSQLXX_POOL_DEFAULT_MAX_CONNECTIONS
,
const
char
*
parent_config_name_
=
nullptr
)
:
default_connections
(
default_connections_
),
max_connections
(
max_connections_
)
{
server
=
cfg
.
getString
(
config_name
+
".host"
);
if
(
parent_config_name_
)
{
const
std
::
string
parent_config_name
(
parent_config_name_
);
db
=
cfg
.
getString
(
config_name
+
".db"
,
cfg
.
getString
(
parent_config_name
+
".db"
,
""
));
user
=
cfg
.
has
(
config_name
+
".user"
)
?
cfg
.
getString
(
config_name
+
".user"
)
:
cfg
.
getString
(
parent_config_name
+
".user"
);
password
=
cfg
.
has
(
config_name
+
".password"
)
?
cfg
.
getString
(
config_name
+
".password"
)
:
cfg
.
getString
(
parent_config_name
+
".password"
);
port
=
cfg
.
has
(
config_name
+
".port"
)
?
cfg
.
getInt
(
config_name
+
".port"
)
:
cfg
.
getInt
(
parent_config_name
+
".port"
);
}
else
{
db
=
cfg
.
getString
(
config_name
+
".db"
,
""
);
user
=
cfg
.
getString
(
config_name
+
".user"
);
password
=
cfg
.
getString
(
config_name
+
".password"
);
port
=
cfg
.
getInt
(
config_name
+
".port"
);
}
connect_timeout
=
cfg
.
getInt
(
config_name
+
".connect_timeout"
,
cfg
.
getInt
(
"mysql_connect_timeout"
,
MYSQLXX_DEFAULT_TIMEOUT
));
rw_timeout
=
cfg
.
getInt
(
config_name
+
".rw_timeout"
,
cfg
.
getInt
(
"mysql_rw_timeout"
,
MYSQLXX_DEFAULT_RW_TIMEOUT
));
}
const
char
*
parent_config_name_
=
nullptr
);
/**
* @param db_ Имя БД
...
...
libs/libmysqlxx/src/Pool.cpp
浏览文件 @
d26f0458
...
...
@@ -23,6 +23,46 @@ void Pool::Entry::decrementRefCount()
}
Pool
::
Pool
(
const
Poco
::
Util
::
AbstractConfiguration
&
cfg
,
const
std
::
string
&
config_name
,
unsigned
default_connections_
,
unsigned
max_connections_
,
const
char
*
parent_config_name_
)
:
default_connections
(
default_connections_
),
max_connections
(
max_connections_
)
{
server
=
cfg
.
getString
(
config_name
+
".host"
);
if
(
parent_config_name_
)
{
const
std
::
string
parent_config_name
(
parent_config_name_
);
db
=
cfg
.
getString
(
config_name
+
".db"
,
cfg
.
getString
(
parent_config_name
+
".db"
,
""
));
user
=
cfg
.
has
(
config_name
+
".user"
)
?
cfg
.
getString
(
config_name
+
".user"
)
:
cfg
.
getString
(
parent_config_name
+
".user"
);
password
=
cfg
.
has
(
config_name
+
".password"
)
?
cfg
.
getString
(
config_name
+
".password"
)
:
cfg
.
getString
(
parent_config_name
+
".password"
);
port
=
cfg
.
has
(
config_name
+
".port"
)
?
cfg
.
getInt
(
config_name
+
".port"
)
:
cfg
.
getInt
(
parent_config_name
+
".port"
);
}
else
{
db
=
cfg
.
getString
(
config_name
+
".db"
,
""
);
user
=
cfg
.
getString
(
config_name
+
".user"
);
password
=
cfg
.
getString
(
config_name
+
".password"
);
port
=
cfg
.
getInt
(
config_name
+
".port"
);
}
connect_timeout
=
cfg
.
getInt
(
config_name
+
".connect_timeout"
,
cfg
.
getInt
(
"mysql_connect_timeout"
,
MYSQLXX_DEFAULT_TIMEOUT
));
rw_timeout
=
cfg
.
getInt
(
config_name
+
".rw_timeout"
,
cfg
.
getInt
(
"mysql_rw_timeout"
,
MYSQLXX_DEFAULT_RW_TIMEOUT
));
}
Pool
::~
Pool
()
{
Poco
::
ScopedLock
<
Poco
::
FastMutex
>
locker
(
lock
);
...
...
@@ -102,7 +142,7 @@ void Pool::initialize()
}
Connection
*
Pool
::
allocConnection
(
bool
dont_throw_if_failed_first_time
)
Pool
::
Connection
*
Pool
::
allocConnection
(
bool
dont_throw_if_failed_first_time
)
{
Poco
::
Util
::
Application
&
app
=
Poco
::
Util
::
Application
::
instance
();
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录