impl(v3): revert #15912 (#15913)

Author: scotthart

generator/generator_config.proto

@@ -167,12 +167,6 @@ message ServiceConfiguration {
   // RPCs. If set to false (the default), a no-op resumption function will be
   // generated.
   bool omit_streaming_updater = 29;
-
-  // In rare cases, specifically bigtable::WaitForConsistency, the
-  // CompletionQueue from the BackgroundThreads owned by the Connection is
-  // needed elsewhere. This emits a protected accessor and friend function for
-  // that purpose.
-  bool emit_completion_queue_accessor = 30;
 }
 
 message DiscoveryDocumentDefinedProduct {

generator/generator_config.textproto

@@ -588,7 +588,6 @@ service {
     {rpc_name: "BigtableTableAdmin.CheckConsistency", idempotency: IDEMPOTENT}
   ]
   omit_repo_metadata: true
-  emit_completion_queue_accessor: true
 }
 
 # Billing

generator/internal/connection_generator.cc

@@ -57,8 +57,6 @@ Status ConnectionGenerator::GenerateHeader() {
       {vars("idempotency_policy_header_path"), vars("retry_traits_header_path"),
        HasLongrunningMethod() ? "google/cloud/no_await_tag.h" : "",
        IsExperimental() ? "google/cloud/experimental_tag.h" : "",
-       HasEmitCompletionQueueAccessor() ? "google/cloud/completion_queue.h"
-                                        : "",
        "google/cloud/backoff_policy.h",
        HasLongrunningMethod() || HasAsyncMethod() ? "google/cloud/future.h"
                                                   : "",
@@ -93,21 +91,7 @@ Status ConnectionGenerator::GenerateHeader() {
     }
   }
 
-  Status result;
-  if (HasEmitCompletionQueueAccessor()) {
-    result = HeaderOpenNamespaces();
-    if (!result.ok()) return result;
-    HeaderPrint(R"""(class $connection_class_name$;)""");
-    HeaderCloseNamespaces();
-
-    result = HeaderOpenNamespaces(NamespaceType::kInternal);
-    if (!result.ok()) return result;
-    HeaderPrint(
-        R"""(StatusOr<CompletionQueue> completion_queue($product_namespace$::$connection_class_name$ const& conn);)""");
-    HeaderCloseNamespaces();
-  }
-
-  result = HeaderOpenNamespaces();
+  auto result = HeaderOpenNamespaces();
   if (!result.ok()) return result;
 
   HeaderPrint(R"""(
@@ -331,13 +315,6 @@ class $connection_class_name$ {
         __FILE__, __LINE__);
   }
 
-  if (HasEmitCompletionQueueAccessor()) {
-    HeaderPrint(R"""( protected:
-  friend StatusOr<CompletionQueue> $product_internal_namespace$::completion_queue(
-      $connection_class_name$ const& conn);
-  virtual StatusOr<CompletionQueue> completion_queue() const;
-)""");
-  }
   // close abstract interface Connection base class
   HeaderPrint("};\n");
 
@@ -513,15 +490,6 @@ future<StatusOr<$response_type$>>
         __FILE__, __LINE__);
   }
 
-  if (HasEmitCompletionQueueAccessor()) {
-    CcPrint(
-        R"""(
-StatusOr<CompletionQueue> $connection_class_name$::completion_queue() const {
-  return Status(StatusCode::kUnimplemented, "not implemented");
-}
-)""");
-  }
-
   if (HasGenerateGrpcTransport()) {
     EmitFactoryFunctionDefinition(EndpointLocationStyle());
   }

generator/internal/connection_impl_generator.cc

@@ -133,13 +133,6 @@ class $connection_class_name$Impl
           std::make_shared<google::cloud::internal::InvocationIdGenerator>();)""");
   }
 
-  if (HasEmitCompletionQueueAccessor()) {
-    HeaderPrint(
-        R"""(
-  StatusOr<CompletionQueue> completion_queue() const override;
-)""");
-  }
-
   // This closes the *ConnectionImpl class definition.
   HeaderPrint("\n};\n");
 
@@ -215,15 +208,6 @@ std::unique_ptr<PollingPolicy> polling_policy(Options const& options) {
 } // namespace
 )""");
 
-  if (HasEmitCompletionQueueAccessor()) {
-    CcPrint(R"""(
-StatusOr<CompletionQueue> completion_queue(
-    $product_namespace$::$connection_class_name$ const& conn) {
-  return conn.completion_queue();
-}
-)""");
-  }
-
   // streaming updater functions
   if (!OmitStreamingUpdater(vars())) {
     for (auto const& method : methods()) {
@@ -258,14 +242,6 @@ void $service_name$$method_name$StreamingUpdater(
     CcPrintMethod(method, __FILE__, __LINE__, AsyncMethodDefinition(method));
   }
 
-  if (HasEmitCompletionQueueAccessor()) {
-    CcPrint(R"""(
-StatusOr<CompletionQueue> $connection_class_name$Impl::completion_queue() const {
-  return background_->cq();
-}
-)""");
-  }
-
   CcCloseNamespaces();
   return {};
 }

generator/internal/service_code_generator.cc

@@ -511,11 +511,6 @@ bool ServiceCodeGenerator::IsDeprecated() const {
   return service_descriptor_->options().deprecated();
 }
 
-bool ServiceCodeGenerator::HasEmitCompletionQueueAccessor() const {
-  return vars().find("emit_completion_queue_accessor") != vars().end() &&
-         vars().at("emit_completion_queue_accessor") == "true";
-}
-
 }  // namespace generator_internal
 }  // namespace cloud
 }  // namespace google

generator/internal/service_code_generator.h

@@ -246,8 +246,6 @@ class ServiceCodeGenerator : public GeneratorInterface {
    */
   bool IsDeprecated() const;
 
-  bool HasEmitCompletionQueueAccessor() const;
-
  private:
   void SetMethods();
 

generator/standalone_main.cc

@@ -296,11 +296,6 @@ std::vector<std::future<google::cloud::Status>> GenerateCodeFromProtos(
     if (service.omit_streaming_updater()) {
       args.emplace_back("--cpp_codegen_opt=omit_streaming_updater=true");
     }
-    if (service.emit_completion_queue_accessor()) {
-      args.emplace_back(
-          "--cpp_codegen_opt=emit_completion_queue_accessor=true");
-    }
-
     if (service.generate_round_robin_decorator()) {
       args.emplace_back(
           "--cpp_codegen_opt=generate_round_robin_decorator=true");

google/cloud/bigtable/admin/bigtable_table_admin_connection.cc

@@ -382,11 +382,6 @@ BigtableTableAdminConnection::AsyncCheckConsistency(
       Status(StatusCode::kUnimplemented, "not implemented"));
 }
 
-StatusOr<CompletionQueue> BigtableTableAdminConnection::completion_queue()
-    const {
-  return Status(StatusCode::kUnimplemented, "not implemented");
-}
-
 std::shared_ptr<BigtableTableAdminConnection> MakeBigtableTableAdminConnection(
     Options options) {
   internal::CheckExpectedOptions<CommonOptionList, GrpcOptionList,

google/cloud/bigtable/admin/bigtable_table_admin_connection.h

@@ -22,7 +22,6 @@
 #include "google/cloud/bigtable/admin/bigtable_table_admin_connection_idempotency_policy.h"
 #include "google/cloud/bigtable/admin/internal/bigtable_table_admin_retry_traits.h"
 #include "google/cloud/backoff_policy.h"
-#include "google/cloud/completion_queue.h"
 #include "google/cloud/future.h"
 #include "google/cloud/internal/retry_policy_impl.h"
 #include "google/cloud/no_await_tag.h"
@@ -35,27 +34,6 @@
 #include "google/longrunning/operations.grpc.pb.h"
 #include <memory>
 
-namespace google {
-namespace cloud {
-namespace bigtable_admin {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-class BigtableTableAdminConnection;
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace bigtable_admin
-}  // namespace cloud
-}  // namespace google
-
-namespace google {
-namespace cloud {
-namespace bigtable_admin_internal {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-StatusOr<CompletionQueue> completion_queue(
-    bigtable_admin::BigtableTableAdminConnection const& conn);
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace bigtable_admin_internal
-}  // namespace cloud
-}  // namespace google
-
 namespace google {
 namespace cloud {
 namespace bigtable_admin {
@@ -381,11 +359,6 @@ class BigtableTableAdminConnection {
       StatusOr<google::bigtable::admin::v2::CheckConsistencyResponse>>
   AsyncCheckConsistency(
       google::bigtable::admin::v2::CheckConsistencyRequest const& request);
-
- protected:
-  friend StatusOr<CompletionQueue> bigtable_admin_internal::completion_queue(
-      BigtableTableAdminConnection const& conn);
-  virtual StatusOr<CompletionQueue> completion_queue() const;
 };
 
 /**

google/cloud/bigtable/admin/internal/bigtable_table_admin_connection_impl.cc

@@ -60,11 +60,6 @@ std::unique_ptr<PollingPolicy> polling_policy(Options const& options) {
 
 }  // namespace
 
-StatusOr<CompletionQueue> completion_queue(
-    bigtable_admin::BigtableTableAdminConnection const& conn) {
-  return conn.completion_queue();
-}
-
 BigtableTableAdminConnectionImpl::BigtableTableAdminConnectionImpl(
     std::unique_ptr<google::cloud::BackgroundThreads> background,
     std::shared_ptr<bigtable_admin_internal::BigtableTableAdminStub> stub,
@@ -1298,11 +1293,6 @@ BigtableTableAdminConnectionImpl::AsyncCheckConsistency(
       std::move(current), std::move(request_copy), __func__);
 }
 
-StatusOr<CompletionQueue> BigtableTableAdminConnectionImpl::completion_queue()
-    const {
-  return background_->cq();
-}
-
 GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace bigtable_admin_internal
 }  // namespace cloud