From 346a44fb8065bca458427462d43995fd078b3e9d Mon Sep 17 00:00:00 2001 From: ChunelFeng Date: Fri, 26 Apr 2024 23:20:53 +0800 Subject: [PATCH] [proto] change proto file, make sure compile ok --- .gitignore | 4 +--- CMakeLists.txt | 4 ++-- proto/element.proto | 2 -- proto/pipeline.proto | 2 -- 4 files changed, 3 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index 44b89c88..7d795323 100644 --- a/.gitignore +++ b/.gitignore @@ -2,9 +2,7 @@ .DS_Store /src/cmake-build-debug/ /src/cmake-build-release/ -/cmake-build-debug/ -/cmake-build-release/ -/cmake-build-debug-coverage/ +/cmake-build-*/ /build/ /.xmake/ /CGraph.srctrlbm diff --git a/CMakeLists.txt b/CMakeLists.txt index 9c183d94..1920fbed 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -37,12 +37,12 @@ add_subdirectory(./example) # 功能测试相关内容 if(CGRAPH_BUILD_FUNCTIONAL_TESTS) - message("-- [CGraph] build functional tests") + message(STATUS "[CGraph] build functional tests") add_subdirectory(./test/Functional) endif(CGRAPH_BUILD_FUNCTIONAL_TESTS) # 性能测试相关内容 if(CGRAPH_BUILD_PERFORMANCE_TESTS) - message("-- [CGraph] build performance tests") + message(STATUS "[CGraph] build performance tests") add_subdirectory(./test/Performance) endif(CGRAPH_BUILD_PERFORMANCE_TESTS) diff --git a/proto/element.proto b/proto/element.proto index fde32c75..8cebcdbf 100644 --- a/proto/element.proto +++ b/proto/element.proto @@ -4,7 +4,6 @@ syntax = "proto3"; package CGraphPB; import "aspect.proto"; -import "param.proto"; enum TimeoutStrategy { TIMEOUT_STRATEGY_AS_ERROR = 0; @@ -21,7 +20,6 @@ message Element { int32 timeout = 5; TimeoutStrategy timeout_strategy = 6; bool is_group = 7; - map params = 101; repeated CGraphPB.Aspect aspects = 102; repeated Element depends = 201; // 依赖的元素 repeated Element components = 202; // 组成的元素,在 is_group=false 的时候为空 diff --git a/proto/pipeline.proto b/proto/pipeline.proto index 9a14bf17..e7d68586 100644 --- a/proto/pipeline.proto +++ b/proto/pipeline.proto @@ -6,12 +6,10 @@ package CGraphPB; import "element.proto"; import "daemon.proto"; import "event.proto"; -import "param.proto"; message Pipeline { repeated CGraphPB.Element elements = 1; repeated CGraphPB.Daemon daemons = 2; repeated CGraphPB.Event events = 3; - map params = 4; }