Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
BaiXuePrincess
milvus
提交
82e011d1
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,发现更多精彩内容 >>
未验证
提交
82e011d1
编写于
11月 28, 2019
作者:
Y
Yukikaze-CZR
提交者:
GitHub
11月 28, 2019
浏览文件
操作
浏览文件
下载
差异文件
Merge branch '0.6.0' into 0.6.0
上级
035feec8
c7ab705c
变更
4
显示空白变更内容
内联
并排
Showing
4 changed file
with
40 addition
and
36 deletion
+40
-36
CHANGELOG.md
CHANGELOG.md
+1
-0
ci/jenkins/Jenkinsfile
ci/jenkins/Jenkinsfile
+2
-3
ci/jenkins/internalJenkinsfile.groovy
ci/jenkins/internalJenkinsfile.groovy
+2
-3
core/src/db/meta/MySQLMetaImpl.cpp
core/src/db/meta/MySQLMetaImpl.cpp
+35
-30
未找到文件。
CHANGELOG.md
浏览文件 @
82e011d1
...
...
@@ -34,6 +34,7 @@ Please mark all change in change log and use the ticket from JIRA.
-
\#
543 - client raise exception in shards when search results is empty
-
\#
545 - Avoid dead circle of build index thread when error occurs
-
\#
552 - Server down during building index_type: IVF_PQ using GPU-edition
-
\#
561 - Milvus server should report exception/error message or terminate on mysql metadata backend error
## Feature
-
\#
12 - Pure CPU version for Milvus
...
...
ci/jenkins/Jenkinsfile
浏览文件 @
82e011d1
...
...
@@ -27,9 +27,8 @@ pipeline {
environment
{
PROJECT_NAME
=
"milvus"
LOWER_BUILD_TYPE
=
params
.
BUILD_TYPE
.
toLowerCase
()
SEMVER
=
"${BRANCH_NAME}"
JOBNAMES
=
env
.
JOB_NAME
.
split
(
'/'
)
PIPELINE_NAME
=
"${JOBNAMES[0]}"
SEMVER
=
"${BRANCH_NAME.contains('/') ? BRANCH_NAME.substring(BRANCH_NAME.lastIndexOf('/') + 1) : '${BRANCH_NAME}'}"
PIPELINE_NAME
=
"${env.JOB_NAME.contains('/') ? env.JOB_NAME.getAt(0..(env.JOB_NAME.indexOf('/') - 1)) : '${env.JOB_NAME}'}"
}
stages
{
...
...
ci/jenkins/internalJenkinsfile.groovy
浏览文件 @
82e011d1
...
...
@@ -18,9 +18,8 @@ pipeline {
environment
{
PROJECT_NAME
=
"milvus"
LOWER_BUILD_TYPE
=
params
.
BUILD_TYPE
.
toLowerCase
()
SEMVER
=
"${BRANCH_NAME}"
JOBNAMES
=
env
.
JOB_NAME
.
split
(
'/'
)
PIPELINE_NAME
=
"${JOBNAMES[0]}"
SEMVER
=
"${BRANCH_NAME.contains('/') ? BRANCH_NAME.substring(BRANCH_NAME.lastIndexOf('/') + 1) : '${BRANCH_NAME}'}"
PIPELINE_NAME
=
"${env.JOB_NAME.contains('/') ? env.JOB_NAME.getAt(0..(env.JOB_NAME.indexOf('/') - 1)) : '${env.JOB_NAME}'}"
}
stages
{
...
...
core/src/db/meta/MySQLMetaImpl.cpp
浏览文件 @
82e011d1
...
...
@@ -290,45 +290,50 @@ MySQLMetaImpl::Initialize() {
// step 4: validate to avoid open old version schema
ValidateMetaSchema
();
// step 5: create meta tables
try
{
// step 5: clean shadow files
if
(
mode_
!=
DBOptions
::
MODE
::
CLUSTER_READONLY
)
{
CleanUpShadowFiles
();
}
{
// step 6: try connect mysql server
mysqlpp
::
ScopedConnection
connectionPtr
(
*
mysql_connection_pool_
,
safe_grab_
);
if
(
connectionPtr
==
nullptr
)
{
return
Status
(
DB_ERROR
,
"Failed to connect to meta server(mysql)"
);
std
::
string
msg
=
"Failed to connect MySQL meta server: "
+
uri
;
ENGINE_LOG_ERROR
<<
msg
;
throw
Exception
(
DB_INVALID_META_URI
,
msg
);
}
if
(
!
connectionPtr
->
thread_aware
())
{
ENGINE_LOG_ERROR
<<
"MySQL++ wasn't built with thread awareness! Can't run without it."
;
return
Status
(
DB_ERROR
,
"MySQL++ wasn't built with thread awareness! Can't run without it."
);
std
::
string
msg
=
"Failed to initialize MySQL meta backend: MySQL client component wasn't built with thread awareness"
;
ENGINE_LOG_ERROR
<<
msg
;
throw
Exception
(
DB_INVALID_META_URI
,
msg
);
}
// step 7: create meta table Tables
mysqlpp
::
Query
InitializeQuery
=
connectionPtr
->
query
();
InitializeQuery
<<
"CREATE TABLE IF NOT EXISTS "
<<
TABLES_SCHEMA
.
name
()
<<
" ("
<<
TABLES_SCHEMA
.
ToString
()
+
");"
;
InitializeQuery
<<
"CREATE TABLE IF NOT EXISTS "
<<
TABLES_SCHEMA
.
name
()
<<
" ("
<<
TABLES_SCHEMA
.
ToString
()
+
");"
;
ENGINE_LOG_DEBUG
<<
"MySQLMetaImpl::Initialize: "
<<
InitializeQuery
.
str
();
if
(
!
InitializeQuery
.
exec
())
{
return
HandleException
(
"Initialization Error"
,
InitializeQuery
.
error
());
std
::
string
msg
=
"Failed to create meta table 'Tables' in MySQL"
;
ENGINE_LOG_ERROR
<<
msg
;
throw
Exception
(
DB_META_TRANSACTION_FAILED
,
msg
);
}
// step 8: create meta table TableFiles
InitializeQuery
<<
"CREATE TABLE IF NOT EXISTS "
<<
TABLEFILES_SCHEMA
.
name
()
<<
" ("
<<
TABLEFILES_SCHEMA
.
ToString
()
+
");"
;
ENGINE_LOG_DEBUG
<<
"MySQLMetaImpl::Initialize: "
<<
InitializeQuery
.
str
();
if
(
!
InitializeQuery
.
exec
())
{
return
HandleException
(
"Initialization Error"
,
InitializeQuery
.
error
());
}
}
// Scoped Connection
}
catch
(
std
::
exception
&
e
)
{
return
HandleException
(
"GENERAL ERROR DURING INITIALIZATION"
,
e
.
what
());
std
::
string
msg
=
"Failed to create meta table 'TableFiles' in MySQL"
;
ENGINE_LOG_ERROR
<<
msg
;
throw
Exception
(
DB_META_TRANSACTION_FAILED
,
msg
);
}
return
Status
::
OK
();
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录