kbobyrev updated this revision to Diff 300528.
kbobyrev added a comment.
Rebase on top of master, use proto2 syntax.
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D89851/new/
https://reviews.llvm.org/D89851
Files:
clang-tools-extra/clangd/index/remote/Client.cpp
clang-tools-extra/clangd/index/remote/Index.proto
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
@@ -109,7 +109,7 @@
++Sent;
});
LookupReply LastMessage;
- LastMessage.set_final_result(true);
+ LastMessage.mutable_result()->set_has_more(true);
Reply->Write(LastMessage);
SPAN_ATTACH(Tracer, "Sent", Sent);
SPAN_ATTACH(Tracer, "Failed to send", FailedToSend);
@@ -142,7 +142,7 @@
++Sent;
});
FuzzyFindReply LastMessage;
- LastMessage.set_final_result(HasMore);
+ LastMessage.mutable_result()->set_has_more(HasMore);
Reply->Write(LastMessage);
SPAN_ATTACH(Tracer, "Sent", Sent);
SPAN_ATTACH(Tracer, "Failed to send", FailedToSend);
@@ -173,7 +173,7 @@
++Sent;
});
RefsReply LastMessage;
- LastMessage.set_final_result(HasMore);
+ LastMessage.mutable_result()->set_has_more(HasMore);
Reply->Write(LastMessage);
SPAN_ATTACH(Tracer, "Sent", Sent);
SPAN_ATTACH(Tracer, "Failed to send", FailedToSend);
@@ -207,7 +207,7 @@
++Sent;
});
RelationsReply LastMessage;
- LastMessage.set_final_result(true);
+ LastMessage.mutable_result()->set_has_more(true);
Reply->Write(LastMessage);
SPAN_ATTACH(Tracer, "Sent", Sent);
SPAN_ATTACH(Tracer, "Failed to send", FailedToSend);
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
@@ -12,12 +12,14 @@
message LookupRequest { repeated string ids = 1; }
+message FinalResult { optional bool has_more = 1; }
+
// The response is a stream of symbol messages and the terminating message
// indicating the end of stream.
message LookupReply {
oneof kind {
Symbol stream_result = 1;
- bool final_result = 2;
+ FinalResult result = 2;
}
}
@@ -36,7 +38,7 @@
message FuzzyFindReply {
oneof kind {
Symbol stream_result = 1;
- bool final_result = 2; // HasMore
+ FinalResult result = 2;
}
}
@@ -51,7 +53,7 @@
message RefsReply {
oneof kind {
Ref stream_result = 1;
- bool final_result = 2; // HasMore
+ FinalResult result = 2;
}
}
@@ -116,7 +118,7 @@
message RelationsReply {
oneof kind {
Relation stream_result = 1;
- bool final_result = 2; // HasMore
+ FinalResult result = 2;
}
}
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
@@ -52,7 +52,7 @@
unsigned FailedToParse = 0;
while (Reader->Read(&Reply)) {
if (!Reply.has_stream_result()) {
- FinalResult = Reply.final_result();
+ FinalResult = Reply.result().has_more();
continue;
}
auto Response = ProtobufMarshaller->fromProtobuf(Reply.stream_result());
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
@@ -109,7 +109,7 @@
++Sent;
});
LookupReply LastMessage;
- LastMessage.set_final_result(true);
+ LastMessage.mutable_result()->set_has_more(true);
Reply->Write(LastMessage);
SPAN_ATTACH(Tracer, "Sent", Sent);
SPAN_ATTACH(Tracer, "Failed to send", FailedToSend);
@@ -142,7 +142,7 @@
++Sent;
});
FuzzyFindReply LastMessage;
- LastMessage.set_final_result(HasMore);
+ LastMessage.mutable_result()->set_has_more(HasMore);
Reply->Write(LastMessage);
SPAN_ATTACH(Tracer, "Sent", Sent);
SPAN_ATTACH(Tracer, "Failed to send", FailedToSend);
@@ -173,7 +173,7 @@
++Sent;
});
RefsReply LastMessage;
- LastMessage.set_final_result(HasMore);
+ LastMessage.mutable_result()->set_has_more(HasMore);
Reply->Write(LastMessage);
SPAN_ATTACH(Tracer, "Sent", Sent);
SPAN_ATTACH(Tracer, "Failed to send", FailedToSend);
@@ -207,7 +207,7 @@
++Sent;
});
RelationsReply LastMessage;
- LastMessage.set_final_result(true);
+ LastMessage.mutable_result()->set_has_more(true);
Reply->Write(LastMessage);
SPAN_ATTACH(Tracer, "Sent", Sent);
SPAN_ATTACH(Tracer, "Failed to send", FailedToSend);
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
@@ -12,12 +12,14 @@
message LookupRequest { repeated string ids = 1; }
+message FinalResult { optional bool has_more = 1; }
+
// The response is a stream of symbol messages and the terminating message
// indicating the end of stream.
message LookupReply {
oneof kind {
Symbol stream_result = 1;
- bool final_result = 2;
+ FinalResult result = 2;
}
}
@@ -36,7 +38,7 @@
message FuzzyFindReply {
oneof kind {
Symbol stream_result = 1;
- bool final_result = 2; // HasMore
+ FinalResult result = 2;
}
}
@@ -51,7 +53,7 @@
message RefsReply {
oneof kind {
Ref stream_result = 1;
- bool final_result = 2; // HasMore
+ FinalResult result = 2;
}
}
@@ -116,7 +118,7 @@
message RelationsReply {
oneof kind {
Relation stream_result = 1;
- bool final_result = 2; // HasMore
+ FinalResult result = 2;
}
}
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
@@ -52,7 +52,7 @@
unsigned FailedToParse = 0;
while (Reader->Read(&Reply)) {
if (!Reply.has_stream_result()) {
- FinalResult = Reply.final_result();
+ FinalResult = Reply.result().has_more();
continue;
}
auto Response = ProtobufMarshaller->fromProtobuf(Reply.stream_result());
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
