Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
milvus
milvus
提交
543ec4a2
M
milvus
项目概览
milvus
/
milvus
12 个月 前同步成功
通知
261
Star
22476
Fork
2472
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
M
milvus
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
543ec4a2
编写于
4月 05, 2022
作者:
C
Cai Yudong
提交者:
GitHub
4月 05, 2022
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Rename log to milvus_log (#16383)
Signed-off-by:
N
yudong.cai
<
yudong.cai@zilliz.com
>
上级
73231808
变更
10
隐藏空白更改
内联
并排
Showing
10 changed file
with
12 addition
and
38 deletion
+12
-38
internal/core/src/common/CMakeLists.txt
internal/core/src/common/CMakeLists.txt
+1
-1
internal/core/src/config/CMakeLists.txt
internal/core/src/config/CMakeLists.txt
+2
-3
internal/core/src/exceptions/CMakeLists.txt
internal/core/src/exceptions/CMakeLists.txt
+2
-1
internal/core/src/exceptions/EasyAssert.cpp
internal/core/src/exceptions/EasyAssert.cpp
+0
-9
internal/core/src/exceptions/EasyAssert.h
internal/core/src/exceptions/EasyAssert.h
+0
-3
internal/core/src/log/CMakeLists.txt
internal/core/src/log/CMakeLists.txt
+3
-3
internal/core/src/utils/Types.cpp
internal/core/src/utils/Types.cpp
+0
-12
internal/core/src/utils/Types.h
internal/core/src/utils/Types.h
+0
-2
internal/core/unittest/CMakeLists.txt
internal/core/unittest/CMakeLists.txt
+2
-2
internal/core/unittest/bench/CMakeLists.txt
internal/core/unittest/bench/CMakeLists.txt
+2
-2
未找到文件。
internal/core/src/common/CMakeLists.txt
浏览文件 @
543ec4a2
...
...
@@ -20,6 +20,6 @@ add_library(milvus_common SHARED
${
COMMON_SRC
}
)
target_link_libraries
(
milvus_common milvus_utils milvus_config log knowhere milvus_proto yaml-cpp
)
target_link_libraries
(
milvus_common milvus_utils milvus_config
milvus_
log knowhere milvus_proto yaml-cpp
)
install
(
TARGETS milvus_common DESTINATION lib
)
internal/core/src/config/CMakeLists.txt
浏览文件 @
543ec4a2
...
...
@@ -18,9 +18,8 @@ set(CONFIG_SRC
ConfigKnowhere.cpp
)
add_library
(
milvus_config
${
CONFIG_SRC
}
)
add_library
(
milvus_config STATIC
${
CONFIG_SRC
}
)
target_link_libraries
(
milvus_config
knowhere
milvus_proto
...
...
internal/core/src/exceptions/CMakeLists.txt
浏览文件 @
543ec4a2
...
...
@@ -18,5 +18,6 @@ set(exceptions_files
EasyAssert.cpp
)
add_library
(
milvus_exceptions
${
exceptions_files
}
)
add_library
(
milvus_exceptions STATIC
${
exceptions_files
}
)
target_link_libraries
(
milvus_exceptions PRIVATE milvus_proto
)
internal/core/src/exceptions/EasyAssert.cpp
浏览文件 @
543ec4a2
...
...
@@ -54,13 +54,4 @@ EasyAssertInfo(bool value,
}
}
[[
noreturn
]]
void
ThrowWithTrace
(
const
std
::
exception
&
exception
)
{
if
(
typeid
(
exception
)
==
typeid
(
SegcoreError
))
{
throw
exception
;
}
auto
err_msg
=
exception
.
what
()
+
std
::
string
(
"
\n
"
)
+
EasyStackTrace
();
throw
SegcoreError
(
ErrorCodeEnum
::
UnexpectedError
,
err_msg
);
}
}
// namespace milvus::impl
internal/core/src/exceptions/EasyAssert.h
浏览文件 @
543ec4a2
...
...
@@ -35,9 +35,6 @@ EasyAssertInfo(bool value,
std
::
string_view
extra_info
,
ErrorCodeEnum
error_code
=
ErrorCodeEnum
::
UnexpectedError
);
[[
noreturn
]]
void
ThrowWithTrace
(
const
std
::
exception
&
exception
);
}
// namespace impl
class
SegcoreError
:
public
std
::
runtime_error
{
...
...
internal/core/src/log/CMakeLists.txt
浏览文件 @
543ec4a2
...
...
@@ -16,6 +16,6 @@ set(LOG_FILES ${MILVUS_ENGINE_SRC}/log/Log.cpp
${
MILVUS_THIRDPARTY_SRC
}
/easyloggingpp/easylogging++.h
)
add_library
(
log STATIC
${
LOG_FILES
}
)
set_target_properties
(
log PROPERTIES RULE_LAUNCH_COMPILE
""
)
set_target_properties
(
log PROPERTIES RULE_LAUNCH_LINK
""
)
add_library
(
milvus_
log STATIC
${
LOG_FILES
}
)
set_target_properties
(
milvus_
log PROPERTIES RULE_LAUNCH_COMPILE
""
)
set_target_properties
(
milvus_
log PROPERTIES RULE_LAUNCH_LINK
""
)
internal/core/src/utils/Types.cpp
已删除
100644 → 0
浏览文件 @
73231808
// Copyright (C) 2019-2020 Zilliz. All rights reserved.
//
// Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance
// with the License. You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software distributed under the License
// is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
// or implied. See the License for the specific language governing permissions and limitations under the License
#include "Types.h"
internal/core/src/utils/Types.h
浏览文件 @
543ec4a2
...
...
@@ -11,8 +11,6 @@
#pragma once
// #include <faiss/Index.h>
#include <cstdint>
#include <map>
#include <memory>
...
...
internal/core/unittest/CMakeLists.txt
浏览文件 @
543ec4a2
...
...
@@ -62,7 +62,7 @@ if (LINUX)
milvus_segcore
milvus_indexbuilder
milvus_index
log
milvus_
log
pthread
)
install
(
TARGETS index_builder_test DESTINATION unittest
)
...
...
@@ -93,7 +93,7 @@ target_link_libraries(all_tests
milvus_segcore
milvus_indexbuilder
milvus_index
log
milvus_
log
pthread
)
...
...
internal/core/unittest/bench/CMakeLists.txt
浏览文件 @
543ec4a2
...
...
@@ -24,7 +24,7 @@ set(indexbuilder_bench_srcs
add_executable
(
all_bench
${
bench_srcs
}
)
target_link_libraries
(
all_bench
milvus_segcore
log
milvus_
log
pthread
)
...
...
@@ -35,7 +35,7 @@ target_link_libraries(indexbuilder_bench
milvus_segcore
milvus_indexbuilder
milvus_index
log
milvus_
log
pthread
knowhere
milvus_utils
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录