Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
qq_35024513
milvus
提交
d199e2e0
milvus
项目概览
qq_35024513
/
milvus
与 Fork 源项目一致
Fork自
milvus / milvus
通知
14
Star
0
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,体验更适合开发者的 AI 搜索 >>
未验证
提交
d199e2e0
编写于
12月 07, 2019
作者:
J
Jin Hai
提交者:
GitHub
12月 07, 2019
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #721 from milvus-io/0.6.0
Merge from 0.6.0
上级
fae3220c
2b40ddbb
变更
8
隐藏空白更改
内联
并排
Showing
8 changed file
with
26 addition
and
4 deletion
+26
-4
CHANGELOG.md
CHANGELOG.md
+1
-0
core/CMakeLists.txt
core/CMakeLists.txt
+17
-0
core/src/db/meta/MySQLMetaImpl.cpp
core/src/db/meta/MySQLMetaImpl.cpp
+1
-0
core/src/db/meta/SqliteMetaImpl.cpp
core/src/db/meta/SqliteMetaImpl.cpp
+2
-1
core/src/main.cpp
core/src/main.cpp
+1
-0
core/src/version.h.in
core/src/version.h.in
+2
-1
core/unittest/db/test_meta.cpp
core/unittest/db/test_meta.cpp
+1
-1
core/unittest/db/test_meta_mysql.cpp
core/unittest/db/test_meta_mysql.cpp
+1
-1
未找到文件。
CHANGELOG.md
浏览文件 @
d199e2e0
...
...
@@ -69,6 +69,7 @@ Please mark all change in change log and use the ticket from JIRA.
-
\#
560 - Add version in server config file
-
\#
605 - Print more messages when server start
-
\#
644 - Add a new rpc command to get milvus build version whether cpu or gpu
-
\#
709 - Show last commit id when server start
## Improvement
-
\#
255 - Add ivfsq8 test report detailed version
...
...
core/CMakeLists.txt
浏览文件 @
d199e2e0
...
...
@@ -23,6 +23,7 @@ message(STATUS "Building using CMake version: ${CMAKE_VERSION}")
set
(
CMAKE_MODULE_PATH
${
CMAKE_MODULE_PATH
}
"
${
CMAKE_CURRENT_SOURCE_DIR
}
/cmake"
)
# get build time
MACRO
(
GET_CURRENT_TIME CURRENT_TIME
)
execute_process
(
COMMAND
"date"
+
"%Y-%m-%d %H:%M.%S"
OUTPUT_VARIABLE
${
CURRENT_TIME
}
)
ENDMACRO
(
GET_CURRENT_TIME
)
...
...
@@ -35,6 +36,7 @@ if (NOT DEFINED CMAKE_BUILD_TYPE)
set
(
CMAKE_BUILD_TYPE Release CACHE STRING
"Choose the type of build."
)
endif
()
# get Milvus version via branch name
set
(
GIT_BRANCH_NAME_REGEX
"[0-9]+
\\
.[0-9]+
\\
.[0-9]"
)
MACRO
(
GET_GIT_BRANCH_NAME GIT_BRANCH_NAME
)
...
...
@@ -57,6 +59,21 @@ endif ()
set
(
MILVUS_VERSION
"
${
GIT_BRANCH_NAME
}
"
)
string
(
REGEX MATCH
"
${
GIT_BRANCH_NAME_REGEX
}
"
MILVUS_VERSION
"
${
MILVUS_VERSION
}
"
)
# get last commit id
MACRO
(
GET_LAST_COMMIT_ID LAST_COMMIT_ID
)
execute_process
(
COMMAND sh
"-c"
"git log --decorate | head -n 1 | awk '{print $2}'"
OUTPUT_VARIABLE
${
LAST_COMMIT_ID
}
)
ENDMACRO
(
GET_LAST_COMMIT_ID
)
GET_LAST_COMMIT_ID
(
LAST_COMMIT_ID
)
message
(
STATUS
"LAST_COMMIT_ID =
${
LAST_COMMIT_ID
}
"
)
if
(
NOT LAST_COMMIT_ID STREQUAL
""
)
string
(
REGEX REPLACE
"
\n
"
""
LAST_COMMIT_ID
${
LAST_COMMIT_ID
}
)
endif
()
set
(
LAST_COMMIT_ID
"
${
LAST_COMMIT_ID
}
"
)
# set build type
if
(
CMAKE_BUILD_TYPE STREQUAL
"Release"
)
set
(
BUILD_TYPE
"Release"
)
else
()
...
...
core/src/db/meta/MySQLMetaImpl.cpp
浏览文件 @
d199e2e0
...
...
@@ -1138,6 +1138,7 @@ MySQLMetaImpl::DropTableIndex(const std::string& table_id) {
// set table index type to raw
dropTableIndexQuery
<<
"UPDATE "
<<
META_TABLES
<<
" SET engine_type = "
<<
std
::
to_string
(
DEFAULT_ENGINE_TYPE
)
<<
" ,nlist = "
<<
std
::
to_string
(
DEFAULT_NLIST
)
<<
" WHERE table_id = "
<<
mysqlpp
::
quote
<<
table_id
<<
";"
;
ENGINE_LOG_DEBUG
<<
"MySQLMetaImpl::DropTableIndex: "
<<
dropTableIndexQuery
.
str
();
...
...
core/src/db/meta/SqliteMetaImpl.cpp
浏览文件 @
d199e2e0
...
...
@@ -733,7 +733,8 @@ SqliteMetaImpl::DropTableIndex(const std::string& table_id) {
//set table index type to raw
ConnectorPtr
->
update_all
(
set
(
c
(
&
TableSchema
::
engine_type_
)
=
DEFAULT_ENGINE_TYPE
),
c
(
&
TableSchema
::
engine_type_
)
=
DEFAULT_ENGINE_TYPE
,
c
(
&
TableSchema
::
nlist_
)
=
DEFAULT_NLIST
),
where
(
c
(
&
TableSchema
::
table_id_
)
==
table_id
));
...
...
core/src/main.cpp
浏览文件 @
d199e2e0
...
...
@@ -63,6 +63,7 @@ print_banner() {
#else
std
::
cout
<<
"You are using Milvus CPU edition"
<<
std
::
endl
;
#endif
std
::
cout
<<
"Last commit id: "
<<
LAST_COMMIT_ID
<<
std
::
endl
;
std
::
cout
<<
std
::
endl
;
}
...
...
core/src/version.h.in
浏览文件 @
d199e2e0
...
...
@@ -17,4 +17,5 @@
#cmakedefine MILVUS_VERSION "@MILVUS_VERSION@"
#cmakedefine BUILD_TYPE "@BUILD_TYPE@"
#cmakedefine BUILD_TIME @BUILD_TIME@
\ No newline at end of file
#cmakedefine BUILD_TIME @BUILD_TIME@
#cmakedefine LAST_COMMIT_ID "@LAST_COMMIT_ID@"
core/unittest/db/test_meta.cpp
浏览文件 @
d199e2e0
...
...
@@ -371,7 +371,7 @@ TEST_F(MetaTest, INDEX_TEST) {
status
=
impl_
->
DropTableIndex
(
table_id
);
ASSERT_TRUE
(
status
.
ok
());
status
=
impl_
->
DescribeTableIndex
(
table_id
,
index_out
);
ASSERT_
NE
(
index_out
.
metric_type_
,
index
.
metric_type_
);
ASSERT_
EQ
(
index_out
.
metric_type_
,
index
.
metric_type_
);
ASSERT_NE
(
index_out
.
nlist_
,
index
.
nlist_
);
ASSERT_NE
(
index_out
.
engine_type_
,
index
.
engine_type_
);
...
...
core/unittest/db/test_meta_mysql.cpp
浏览文件 @
d199e2e0
...
...
@@ -385,7 +385,7 @@ TEST_F(MySqlMetaTest, INDEX_TEST) {
status
=
impl_
->
DropTableIndex
(
table_id
);
ASSERT_TRUE
(
status
.
ok
());
status
=
impl_
->
DescribeTableIndex
(
table_id
,
index_out
);
ASSERT_
NE
(
index_out
.
metric_type_
,
index
.
metric_type_
);
ASSERT_
EQ
(
index_out
.
metric_type_
,
index
.
metric_type_
);
ASSERT_NE
(
index_out
.
nlist_
,
index
.
nlist_
);
ASSERT_NE
(
index_out
.
engine_type_
,
index
.
engine_type_
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录