Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
milvus
milvus
提交
80db8aaf
M
milvus
项目概览
milvus
/
milvus
11 个月 前同步成功
通知
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,发现更多精彩内容 >>
提交
80db8aaf
编写于
5月 28, 2019
作者:
Y
yu yunfeng
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix compile error
Former-commit-id: 07f4dd06011ef519e29744dcd5b8ac9e407b2505
上级
4d838579
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
31 addition
and
19 deletion
+31
-19
cpp/CMakeLists.txt
cpp/CMakeLists.txt
+2
-3
cpp/conf/server_config.yaml
cpp/conf/server_config.yaml
+8
-0
cpp/src/CMakeLists.txt
cpp/src/CMakeLists.txt
+12
-5
cpp/unittest/CMakeLists.txt
cpp/unittest/CMakeLists.txt
+2
-1
cpp/unittest/db/db_tests.cpp
cpp/unittest/db/db_tests.cpp
+0
-6
cpp/unittest/metrics/CMakeLists.txt
cpp/unittest/metrics/CMakeLists.txt
+7
-4
未找到文件。
cpp/CMakeLists.txt
浏览文件 @
80db8aaf
...
...
@@ -73,14 +73,13 @@ link_directories(${VECWISE_THIRD_PARTY_BUILD}/lib64)
# WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/third_party)
add_subdirectory
(
src
)
#add_subdirectory(test_client)
#add_subdirectory(unittest)
#add_subdirectory(unittest)
add_subdirectory
(
unittest
)
if
(
BUILD_UNIT_TEST
)
add_subdirectory
(
${
CMAKE_CURRENT_SOURCE_DIR
}
/unittest
)
endif
(
BUILD_UNIT_TEST
)
add_custom_target
(
Clean-All COMMAND
${
CMAKE_BUILD_TOOL
}
clean
)
#install
...
...
cpp/conf/server_config.yaml
浏览文件 @
80db8aaf
...
...
@@ -11,6 +11,14 @@ db_config:
db_flush_interval
:
5
#unit: second
idmapper_max_open_file
:
128
metric_config
:
is_startup
:
true
# true is on, false is off
collector
:
prometheus
# prometheus, now we only have prometheus
prometheus_config
:
collect_type
:
pull
# pull means prometheus pull the message from megasearch, push means megasearch push metric to push gateway
push_gateway_ip_address
:
127.0.0.1
push_gateway_port
:
9091
license_config
:
license_path
:
"
/tmp/system.license"
...
...
cpp/src/CMakeLists.txt
浏览文件 @
80db8aaf
...
...
@@ -13,6 +13,11 @@ aux_source_directory(db db_files)
aux_source_directory
(
wrapper wrapper_files
)
#aux_source_directory(metrics metrics_files)
set
(
metrics_files
metrics/Metrics.cpp
metrics/MetricBase.h
)
set
(
license_check_files
license/LicenseLibrary.cpp
...
...
@@ -22,7 +27,7 @@ set(license_check_files
set
(
license_generator_files
license/LicenseGenerator.cpp
license/LicenseLibrary.cpp
../unittest/metrics/counter_test.cpp ../unittest/metrics/metrics_test.cpp
)
)
set
(
service_files
thrift/gen-cpp/MegasearchService.cpp
...
...
@@ -35,8 +40,8 @@ set(vecwise_engine_files
${
cache_files
}
${
db_files
}
${
wrapper_files
}
metrics/Metrics.cpp
#
${metrics_files}
#
metrics/Metrics.cpp
${
metrics_files
}
)
set
(
get_sys_info_files
...
...
@@ -97,6 +102,8 @@ endif ()
cuda_add_library
(
vecwise_engine STATIC
${
vecwise_engine_files
}
)
target_link_libraries
(
vecwise_engine
${
engine_libs
}
)
add_library
(
metrics STATIC
${
metrics_files
}
)
if
(
ENABLE_LICENSE STREQUAL
"ON"
)
add_library
(
vecwise_license STATIC
${
license_check_files
}
)
target_link_libraries
(
vecwise_license
${
license_libs
}
)
...
...
@@ -108,7 +115,7 @@ endif ()
# libprometheus-cpp-core.a
# )
#add_library(
metrics STATIC ${metrics_files} metrics/MetricBase.h
)
#add_library(
vecwise_engine STATIC ${metrics_files}
)
#target_link_libraries(metrics ${metrics_lib})
add_executable
(
vecwise_server
...
...
@@ -116,7 +123,7 @@ add_executable(vecwise_server
${
server_files
}
${
utils_files
}
${
service_files
}
#
${metrics_files}
${
metrics_files
}
${
VECWISE_THIRD_PARTY_BUILD
}
/include/easylogging++.cc
)
...
...
cpp/unittest/CMakeLists.txt
浏览文件 @
80db8aaf
...
...
@@ -15,7 +15,8 @@ set(unittest_libs
yaml-cpp
gtest_main
gmock_main
pthread
)
pthread
metrics
)
add_subdirectory
(
server
)
add_subdirectory
(
db
)
...
...
cpp/unittest/db/db_tests.cpp
浏览文件 @
80db8aaf
...
...
@@ -9,12 +9,8 @@
#include "utils.h"
#include "db/DB.h"
<<<<<<<
HEAD
#include "metrics/Metrics.h"
=======
#include "db/DBImpl.h"
#include "db/MetaConsts.h"
>>>>>>>
main
/
branch
-
1.2
using
namespace
zilliz
::
vecwise
;
...
...
@@ -113,8 +109,6 @@ TEST_F(DBTest2, ARHIVE_DISK_CHECK) {
TEST_F
(
DBTest
,
DB_TEST
)
{
server
::
Metrics
::
GetInstance
().
Init
();
server
::
Metrics
::
GetInstance
().
exposer_ptr
()
->
RegisterCollectable
(
server
::
Metrics
::
GetInstance
().
registry_ptr
());
static
const
std
::
string
group_name
=
"test_group"
;
static
const
int
group_dim
=
256
;
...
...
cpp/unittest/metrics/CMakeLists.txt
浏览文件 @
80db8aaf
...
...
@@ -16,18 +16,21 @@ aux_source_directory(../../src/db db_srcs)
aux_source_directory
(
../../src/config config_files
)
aux_source_directory
(
../../src/cache cache_srcs
)
aux_source_directory
(
../../src/wrapper wrapper_src
)
#aux_source_directory(../../src/metrics metrics_files)
include_directories
(
/usr/include
)
include_directories
(
../../third_party/build/include
)
link_directories
(
../../third_party/build/lib
)
include_directories
(
/usr/local/cuda/include
)
link_directories
(
"/usr/local/cuda/lib64"
)
include_directories
(
../db/utils.h
)
#include_directories(../db/utils.h)
include_directories
(
../../src/metrics
)
set
(
require_files
../../src/metrics/Metrics.cpp
# ../../src/cache/CacheMgr.cpp
# ../../src/metrics/PrometheusMetrics.cpp
../../src/server/ServerConfig.cpp
../../src/utils/CommonUtil.cpp
...
...
@@ -39,7 +42,6 @@ set(count_test_src
# ${unittest_srcs}
# ${config_files}
# ${require_files}
metrics_test.cpp
${
unittest_srcs
}
${
config_files
}
${
cache_srcs
}
...
...
@@ -48,7 +50,8 @@ set(count_test_src
${
require_files
}
metrics_test.cpp
../db/utils.cpp
../../src/metrics/Metrics.cpp
)
../../src/metrics/Metrics.h
)
add_executable
(
metrics_test
${
count_test_src
}
${
require_files
}
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录