sammccall created this revision. sammccall added a reviewer: kbobyrev. Herald added subscribers: cfe-commits, usaxena95, kadircet, arphaman, mgorny. Herald added a project: clang. sammccall requested review of this revision.
This allows it to have a separate namespace (grpc versioned service) without putting versioning info on all of the other protos (before we need it). Repository: rG LLVM Github Monorepo https://reviews.llvm.org/D90031 Files: clang-tools-extra/clangd/index/remote/CMakeLists.txt clang-tools-extra/clangd/index/remote/Client.cpp clang-tools-extra/clangd/index/remote/Index.proto clang-tools-extra/clangd/index/remote/Service.proto clang-tools-extra/clangd/index/remote/marshalling/CMakeLists.txt clang-tools-extra/clangd/index/remote/server/CMakeLists.txt clang-tools-extra/clangd/index/remote/server/Server.cpp
Index: clang-tools-extra/clangd/index/remote/server/Server.cpp =================================================================== --- clang-tools-extra/clangd/index/remote/server/Server.cpp +++ clang-tools-extra/clangd/index/remote/server/Server.cpp @@ -7,6 +7,7 @@ //===----------------------------------------------------------------------===// #include "Index.pb.h" +#include "Service.grpc.pb.h" #include "index/Index.h" #include "index/Serialization.h" #include "index/Symbol.h" Index: clang-tools-extra/clangd/index/remote/server/CMakeLists.txt =================================================================== --- clang-tools-extra/clangd/index/remote/server/CMakeLists.txt +++ clang-tools-extra/clangd/index/remote/server/CMakeLists.txt @@ -5,7 +5,8 @@ Server.cpp DEPENDS - RemoteIndexProtos + RemoteIndexProto + RemoteIndexServiceProto ) target_link_libraries(clangd-index-server @@ -13,7 +14,8 @@ clangDaemon clangdSupport - RemoteIndexProtos + RemoteIndexProto + RemoteIndexServiceProto clangdRemoteMarshalling grpc++ Index: clang-tools-extra/clangd/index/remote/marshalling/CMakeLists.txt =================================================================== --- clang-tools-extra/clangd/index/remote/marshalling/CMakeLists.txt +++ clang-tools-extra/clangd/index/remote/marshalling/CMakeLists.txt @@ -2,12 +2,12 @@ Marshalling.cpp LINK_LIBS - RemoteIndexProtos + RemoteIndexProto protobuf clangDaemon clangdSupport DEPENDS - RemoteIndexProtos + RemoteIndexProto ) Index: clang-tools-extra/clangd/index/remote/Service.proto =================================================================== --- /dev/null +++ clang-tools-extra/clangd/index/remote/Service.proto @@ -0,0 +1,26 @@ +//===--- Service.proto - Remote index service definition ------------------===// +// +// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. +// See https://llvm.org/LICENSE.txt for license information. +// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception +// +//===----------------------------------------------------------------------===// + +syntax = "proto3"; + +package clang.clangd.remote; + +import "Index.proto"; + +// Semantics of SymbolIndex match clangd::SymbolIndex with all required +// structures corresponding to their clangd::* counterparts. +service SymbolIndex { + rpc Lookup(LookupRequest) returns (stream LookupReply) {} + + rpc FuzzyFind(FuzzyFindRequest) returns (stream FuzzyFindReply) {} + + rpc Refs(RefsRequest) returns (stream RefsReply) {} + + rpc Relations(RelationsRequest) returns (stream RelationsReply) {} +} + Index: clang-tools-extra/clangd/index/remote/Index.proto =================================================================== --- clang-tools-extra/clangd/index/remote/Index.proto +++ clang-tools-extra/clangd/index/remote/Index.proto @@ -10,18 +10,6 @@ package clang.clangd.remote; -// Semantics of SymbolIndex match clangd::SymbolIndex with all required -// structures corresponding to their clangd::* counterparts. -service SymbolIndex { - rpc Lookup(LookupRequest) returns (stream LookupReply) {} - - rpc FuzzyFind(FuzzyFindRequest) returns (stream FuzzyFindReply) {} - - rpc Refs(RefsRequest) returns (stream RefsReply) {} - - rpc Relations(RelationsRequest) returns (stream RelationsReply) {} -} - message LookupRequest { repeated string ids = 1; } // The response is a stream of symbol messages and the terminating message Index: clang-tools-extra/clangd/index/remote/Client.cpp =================================================================== --- clang-tools-extra/clangd/index/remote/Client.cpp +++ clang-tools-extra/clangd/index/remote/Client.cpp @@ -9,7 +9,7 @@ #include <grpc++/grpc++.h> #include "Client.h" -#include "Index.grpc.pb.h" +#include "Service.grpc.pb.h" #include "index/Index.h" #include "index/Serialization.h" #include "marshalling/Marshalling.h" Index: clang-tools-extra/clangd/index/remote/CMakeLists.txt =================================================================== --- clang-tools-extra/clangd/index/remote/CMakeLists.txt +++ clang-tools-extra/clangd/index/remote/CMakeLists.txt @@ -1,5 +1,6 @@ if (CLANGD_ENABLE_REMOTE) - generate_protos(RemoteIndexProtos "Index.proto" GRPC) + generate_protos(RemoteIndexServiceProto "Service.proto" GRPC) + generate_protos(RemoteIndexProto "Index.proto") include_directories(${CMAKE_CURRENT_BINARY_DIR}) include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../) @@ -12,7 +13,8 @@ Client.cpp LINK_LIBS - RemoteIndexProtos + RemoteIndexProto + RemoteIndexServiceProto clangdRemoteMarshalling protobuf @@ -21,7 +23,8 @@ clangdSupport DEPENDS - RemoteIndexProtos + RemoteIndexProto + RemoteIndexServiceProto ) add_subdirectory(marshalling)
_______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
