Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
BaiXuePrincess
milvus
提交
7f24723e
milvus
项目概览
BaiXuePrincess
/
milvus
与 Fork 源项目一致
从无法访问的项目Fork
通知
7
Star
4
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
milvus
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
7f24723e
编写于
6月 26, 2019
作者:
Z
zhiru
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix mysql scoped connection concurrency issue
Former-commit-id: ecb3cf07b5f49f2f87e3972a126452ec2950caf8
上级
511a71f4
变更
6
展开全部
显示空白变更内容
内联
并排
Showing
6 changed file
with
480 addition
and
408 deletion
+480
-408
cpp/cmake/ThirdPartyPackages.cmake
cpp/cmake/ThirdPartyPackages.cmake
+10
-10
cpp/conf/server_config.yaml
cpp/conf/server_config.yaml
+1
-1
cpp/src/CMakeLists.txt
cpp/src/CMakeLists.txt
+4
-1
cpp/src/db/MySQLConnectionPool.h
cpp/src/db/MySQLConnectionPool.h
+7
-0
cpp/src/db/MySQLMetaImpl.cpp
cpp/src/db/MySQLMetaImpl.cpp
+457
-395
cpp/thirdparty/versions.txt
cpp/thirdparty/versions.txt
+1
-1
未找到文件。
cpp/cmake/ThirdPartyPackages.cmake
浏览文件 @
7f24723e
...
...
@@ -271,7 +271,7 @@ endif()
if
(
DEFINED ENV{MILVUS_MYSQLPP_URL}
)
set
(
MYSQLPP_SOURCE_URL
"$ENV{MILVUS_MYSQLPP_URL}"
)
else
()
set
(
MYSQLPP_SOURCE_URL
"https://
github.com/youny626/mysqlpp.git
"
)
set
(
MYSQLPP_SOURCE_URL
"https://
tangentsoft.com/mysqlpp/releases/mysql++-
${
MYSQLPP_VERSION
}
.tar.gz
"
)
endif
()
if
(
DEFINED ENV{MILVUS_OPENBLAS_URL}
)
...
...
@@ -1095,18 +1095,18 @@ macro(build_mysqlpp)
"LDFLAGS=-pthread"
)
externalproject_add
(
mysqlpp_ep
# URL
# ${MYSQLPP_SOURCE_URL}
GIT_REPOSITORY
URL
${
MYSQLPP_SOURCE_URL
}
GIT_TAG
${
MYSQLPP_VERSION
}
GIT_SHALLOW
TRUE
# GIT_REPOSITORY
# ${MYSQLPP_SOURCE_URL}
# GIT_TAG
# ${MYSQLPP_VERSION}
# GIT_SHALLOW
# TRUE
${
EP_LOG_OPTIONS
}
CONFIGURE_COMMAND
"./bootstrap"
COMMAND
#
"./bootstrap"
#
COMMAND
"./configure"
${
MYSQLPP_CONFIGURE_ARGS
}
BUILD_COMMAND
...
...
cpp/conf/server_config.yaml
浏览文件 @
7f24723e
...
...
@@ -10,7 +10,7 @@ db_config:
db_path
:
/tmp/milvus
#URI format: dialect://username:password@host:port/database
#All parts except dialect are optional, but you MUST include the delimiters
db_backend_url
:
sqlite://:@:/
db_backend_url
:
mysql://root:1234@:/test
index_building_threshold
:
1024
#build index file when raw data file size larger than this value, unit: MB
metric_config
:
...
...
cpp/src/CMakeLists.txt
浏览文件 @
7f24723e
...
...
@@ -183,7 +183,10 @@ endif ()
install
(
TARGETS milvus_server DESTINATION bin
)
install
(
FILES
${
CMAKE_BINARY_DIR
}
/mysqlpp_ep-prefix/src/mysqlpp_ep/lib/
${
CMAKE_SHARED_LIBRARY_PREFIX
}
mysqlpp
${
CMAKE_SHARED_LIBRARY_SUFFIX
}
install
(
FILES
${
CMAKE_BINARY_DIR
}
/mysqlpp_ep-prefix/src/mysqlpp_ep/lib/
${
CMAKE_SHARED_LIBRARY_PREFIX
}
mysqlpp
${
CMAKE_SHARED_LIBRARY_SUFFIX
}
${
CMAKE_BINARY_DIR
}
/mysqlpp_ep-prefix/src/mysqlpp_ep/lib/
${
CMAKE_SHARED_LIBRARY_PREFIX
}
mysqlpp
${
CMAKE_SHARED_LIBRARY_SUFFIX
}
.3
${
CMAKE_BINARY_DIR
}
/mysqlpp_ep-prefix/src/mysqlpp_ep/lib/
${
CMAKE_SHARED_LIBRARY_PREFIX
}
mysqlpp
${
CMAKE_SHARED_LIBRARY_SUFFIX
}
.3.2.4
DESTINATION bin
)
#need to copy libmysqlpp.so
add_subdirectory
(
sdk
)
cpp/src/db/MySQLConnectionPool.h
浏览文件 @
7f24723e
...
...
@@ -3,6 +3,8 @@
#include <string>
#include <unistd.h>
#include "Log.h"
class
MySQLConnectionPool
:
public
mysqlpp
::
ConnectionPool
{
public:
...
...
@@ -43,6 +45,7 @@ public:
sleep
(
1
);
}
ENGINE_LOG_DEBUG
<<
"conns_in_use_ in grab: "
<<
conns_in_use_
<<
std
::
endl
;
++
conns_in_use_
;
return
mysqlpp
::
ConnectionPool
::
grab
();
}
...
...
@@ -50,7 +53,11 @@ public:
// Other half of in-use conn count limit
void
release
(
const
mysqlpp
::
Connection
*
pc
)
override
{
mysqlpp
::
ConnectionPool
::
release
(
pc
);
ENGINE_LOG_DEBUG
<<
"conns_in_use_ in release: "
<<
conns_in_use_
<<
std
::
endl
;
--
conns_in_use_
;
if
(
conns_in_use_
<
0
)
{
ENGINE_LOG_DEBUG
<<
"conns_in_use_ in release < 0: "
<<
conns_in_use_
<<
std
::
endl
;
}
}
void
set_max_idle_time
(
int
max_idle
)
{
...
...
cpp/src/db/MySQLMetaImpl.cpp
浏览文件 @
7f24723e
此差异已折叠。
点击以展开。
cpp/thirdparty/versions.txt
浏览文件 @
7f24723e
...
...
@@ -7,7 +7,7 @@ GTEST_VERSION=1.8.1
JSONCONS_VERSION=0.126.0
LAPACK_VERSION=v3.8.0
LZ4_VERSION=v1.9.1
MYSQLPP_VERSION=
zilliz
MYSQLPP_VERSION=
3.2.4
OPENBLAS_VERSION=v0.3.6
PROMETHEUS_VERSION=v0.7.0
ROCKSDB_VERSION=v6.0.2
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录