cleanup: streaming.cc in build files (#14253)

dbolduc · web-flow · commit ec2e0e854d3d · 2024-05-17T01:21:12.000-04:00
diff --git a/bazel/gapic.bzl b/bazel/gapic.bzl
@@ -34,7 +34,7 @@ def cc_gapic_library(name, service_dirs = [], googleapis_deps = []):
         "*.cc",
     ]]
 
-    sources_glob = [d + "internal/*_sources.cc" for d in service_dirs] + [d + "internal/streaming.cc" for d in service_dirs]
+    sources_glob = [d + "internal/*_sources.cc" for d in service_dirs]
 
     native.filegroup(
         name = "srcs",
diff --git a/cmake/GoogleCloudCppLibrary.cmake b/cmake/GoogleCloudCppLibrary.cmake
@@ -189,7 +189,7 @@ function (google_cloud_cpp_add_gapic_library library display_name)
         endif ()
         string(REPLACE "/" "_" ns "${dir}")
         list(APPEND source_globs "${dir}*.h" "${dir}internal/*.h"
-             "${dir}internal/*_sources.cc" "${dir}internal/streaming.cc")
+             "${dir}internal/*_sources.cc")
         list(APPEND mocks_globs "${dir}mocks/*.h")
         list(APPEND DOXYGEN_EXCLUDE_SYMBOLS "${library}_${ns}internal")
         if (IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/${dir}samples")
diff --git a/generator/internal/descriptor_utils.cc b/generator/internal/descriptor_utils.cc
@@ -841,6 +841,9 @@ VarsDictionary CreateServiceVars(
   vars["sources_cc_path"] =
       absl::StrCat(vars["product_path"], "internal/",
                    ServiceNameToFilePath(service_name), "_sources.cc");
+  vars["streaming_cc_path"] =
+      absl::StrCat(vars["product_path"], "internal/",
+                   ServiceNameToFilePath(service_name), "_streaming.cc");
   vars["stub_class_name"] = absl::StrCat(service_name, "Stub");
   vars["stub_cc_path"] =
       absl::StrCat(vars["product_path"], "internal/",
diff --git a/generator/internal/descriptor_utils_test.cc b/generator/internal/descriptor_utils_test.cc
@@ -322,6 +322,8 @@ INSTANTIATE_TEST_SUITE_P(
         std::make_pair("service_name", "FrobberService"),
         std::make_pair("sources_cc_path",
                        "google/cloud/frobber/internal/frobber_sources.cc"),
+        std::make_pair("streaming_cc_path",
+                       "google/cloud/frobber/internal/frobber_streaming.cc"),
         std::make_pair("stub_class_name", "FrobberServiceStub"),
         std::make_pair("stub_cc_path",
                        "google/cloud/frobber/internal/frobber_stub.cc"),
diff --git a/generator/internal/make_generators.cc b/generator/internal/make_generators.cc
@@ -179,6 +179,9 @@ std::vector<std::unique_ptr<GeneratorInterface>> MakeGenerators(
       sources.push_back(service_vars["metadata_cc_path"]);
       sources.push_back(service_vars["stub_cc_path"]);
       sources.push_back(service_vars["tracing_stub_cc_path"]);
+      if (get_flag("omit_streaming_updater")) {
+        sources.push_back(service_vars["streaming_cc_path"]);
+      }
     }
 
     if (generate_rest_transport) {
diff --git a/google/cloud/bigquery/storage/v1/internal/bigquery_read_sources.cc b/google/cloud/bigquery/storage/v1/internal/bigquery_read_sources.cc
@@ -25,6 +25,7 @@
 #include "google/cloud/bigquery/storage/v1/internal/bigquery_read_logging_decorator.cc"
 #include "google/cloud/bigquery/storage/v1/internal/bigquery_read_metadata_decorator.cc"
 #include "google/cloud/bigquery/storage/v1/internal/bigquery_read_option_defaults.cc"
+#include "google/cloud/bigquery/storage/v1/internal/bigquery_read_streaming.cc"
 #include "google/cloud/bigquery/storage/v1/internal/bigquery_read_stub.cc"
 #include "google/cloud/bigquery/storage/v1/internal/bigquery_read_stub_factory.cc"
 #include "google/cloud/bigquery/storage/v1/internal/bigquery_read_tracing_connection.cc"
diff --git a/google/cloud/bigquery/storage/v1/internal/bigquery_read_streaming.cc b/google/cloud/bigquery/storage/v1/internal/bigquery_read_streaming.cc

Original file line number	Diff line number	Diff line change
`@@ -179,6 +179,9 @@ std::vector<std::unique_ptr<GeneratorInterface>> MakeGenerators(`
`179`	`179`	`sources.push_back(service_vars["metadata_cc_path"]);`
`180`	`180`	`sources.push_back(service_vars["stub_cc_path"]);`
`181`	`181`	`sources.push_back(service_vars["tracing_stub_cc_path"]);`
	`182`	`+ if (get_flag("omit_streaming_updater")) {`
	`183`	`+ sources.push_back(service_vars["streaming_cc_path"]);`
	`184`	`+ }`
`182`	`185`	`}`
`183`	`186`
`184`	`187`	`if (generate_rest_transport) {`