From bbd67c04993aad79d854769959ea0d4c314ee931 Mon Sep 17 00:00:00 2001
From: Yang Gao <yangg@google.com>
Date: Fri, 20 Feb 2015 13:04:52 -0800
Subject: [PATCH] clean up some internal path and names
---
examples/pubsub/pubsub.proto | 9 ++-------
src/compiler/ruby_generator_map-inl.h | 4 ++--
src/node/interop/empty.proto | 6 ------
test/cpp/interop/empty.proto | 6 ------
4 files changed, 4 insertions(+), 21 deletions(-)
diff --git a/examples/pubsub/pubsub.proto b/examples/pubsub/pubsub.proto
index ac89693320..9443ae3aa3 100644
--- a/examples/pubsub/pubsub.proto
+++ b/examples/pubsub/pubsub.proto
@@ -157,9 +157,7 @@ package tech.pubsub;
//
// Consuming messages via push:
//
-// TODO(eschapira): Add HTTP push example.
-//
-// The port 'machinename:8888' must be bound to a stubby server that implements
+// The port 'machinename:8888' must be bound to a server that implements
// the PushEndpointService with the following method:
//
// int HandlePubsubEvent(PubsubEvent event) {
@@ -252,8 +250,6 @@ service PublisherService {
// Adds a message to the topic. Returns NOT_FOUND if the topic does not
// exist.
- // (-- For different error code values returned via Stubby, see
- // util/task/codes.proto. --)
rpc Publish(PublishRequest) returns (proto2.Empty) {
}
@@ -292,7 +288,6 @@ message PubsubMessage {
// Optional list of labels for this message. Keys in this collection must
// be unique.
- //(-- TODO(eschapira): Define how key namespace may be scoped to the topic.--)
repeated tech.label.Label label = 2;
// ID of this message assigned by the server at publication time. Guaranteed
@@ -467,7 +462,7 @@ message Subscription {
// If <code>query</code> is non-empty, only messages on the subscriber's
// topic whose labels match the query will be returned. Otherwise all
// messages on the topic will be returned.
- // (-- The query syntax is described in tech/label/proto/label_query.proto --)
+ // (-- The query syntax is described in label_query.proto --)
optional string query = 3;
// The subscriber may specify requirements for truncating unacknowledged
diff --git a/src/compiler/ruby_generator_map-inl.h b/src/compiler/ruby_generator_map-inl.h
index 345e4c1370..523f57b0c8 100644
--- a/src/compiler/ruby_generator_map-inl.h
+++ b/src/compiler/ruby_generator_map-inl.h
@@ -51,8 +51,8 @@ namespace grpc_ruby_generator {
inline std::map<std::string, std::string> ListToDict(
const initializer_list<std::string> &values) {
if (values.size() % 2 != 0) {
- // MOE: insert std::cerr << "Not every 'key' has a value in `values`."
- // << std::endl;
+ std::cerr << "Not every 'key' has a value in `values`."
+ << std::endl;
}
std::map<std::string, std::string> value_map;
auto value_iter = values.begin();
diff --git a/src/node/interop/empty.proto b/src/node/interop/empty.proto
index f66a108c19..4295a0a960 100644
--- a/src/node/interop/empty.proto
+++ b/src/node/interop/empty.proto
@@ -40,10 +40,4 @@ package grpc.testing;
// rpc Bar (grpc.testing.Empty) returns (grpc.testing.Empty) { };
// };
//
-// MOE:begin_strip
-// The difference between this one and net/rpc/empty-message.proto is that
-// 1) The generated message here is in proto2 C++ API.
-// 2) The proto2.Empty has minimum dependencies
-// (no message_set or net/rpc dependencies)
-// MOE:end_strip
message Empty {}
diff --git a/test/cpp/interop/empty.proto b/test/cpp/interop/empty.proto
index f66a108c19..4295a0a960 100644
--- a/test/cpp/interop/empty.proto
+++ b/test/cpp/interop/empty.proto
@@ -40,10 +40,4 @@ package grpc.testing;
// rpc Bar (grpc.testing.Empty) returns (grpc.testing.Empty) { };
// };
//
-// MOE:begin_strip
-// The difference between this one and net/rpc/empty-message.proto is that
-// 1) The generated message here is in proto2 C++ API.
-// 2) The proto2.Empty has minimum dependencies
-// (no message_set or net/rpc dependencies)
-// MOE:end_strip
message Empty {}
--
GitLab