update handwritten MergeOptions

Author: scotthart

google/cloud/bigtable/benchmarks/benchmark.cc

@@ -32,6 +32,7 @@ namespace google {
 namespace cloud {
 namespace bigtable {
 namespace benchmarks {
+using ::google::cloud::bigtable_internal::MergeOptions;
 using ::google::cloud::internal::GetEnv;
 
 google::cloud::StatusOr<BenchmarkOptions> ParseArgs(
@@ -127,8 +128,7 @@ void Benchmark::DeleteTable() {
 }
 
 Table Benchmark::MakeTable(Options connection_opts) const {
-  auto connection_options =
-      google::cloud::internal::MergeOptions(std::move(connection_opts), opts_);
+  auto connection_options = MergeOptions(std::move(connection_opts), opts_);
   auto table_opts = Options{}.set<AppProfileIdOption>(options_.app_profile_id);
   return Table(MakeDataConnection(std::move(connection_options)),
                TableResource(options_.project_id, options_.instance_id,

google/cloud/bigtable/client.cc

@@ -21,7 +21,7 @@ namespace cloud {
 namespace bigtable {
 GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
 
-using ::google::cloud::internal::MergeOptions;
+using ::google::cloud::bigtable_internal::MergeOptions;
 using ::google::cloud::internal::OptionsSpan;
 
 StatusOr<PreparedQuery> Client::PrepareQuery(InstanceResource const& instance,

google/cloud/bigtable/client.h

@@ -18,6 +18,7 @@
 #include "google/cloud/bigtable/bound_query.h"
 #include "google/cloud/bigtable/data_connection.h"
 #include "google/cloud/bigtable/instance_resource.h"
+#include "google/cloud/bigtable/options.h"
 #include "google/cloud/bigtable/prepared_query.h"
 #include "google/cloud/bigtable/sql_statement.h"
 #include "google/cloud/bigtable/version.h"
@@ -62,8 +63,8 @@ class Client {
    */
   explicit Client(std::shared_ptr<DataConnection> conn, Options opts = {})
       : conn_(std::move(conn)),
-        opts_(google::cloud::internal::MergeOptions(std::move(opts),
-                                                    conn_->options())) {}
+        opts_(bigtable_internal::MergeOptions(std::move(opts),
+                                              conn_->options())) {}
 
   /**
    * Prepares a query for future execution.

google/cloud/bigtable/internal/data_connection_impl.cc

@@ -48,6 +48,8 @@ namespace bigtable_internal {
 GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
 namespace {
 
+using ::google::cloud::bigtable_internal::MergeOptions;
+
 inline std::string const& app_profile_id(Options const& options) {
   return options.get<bigtable::AppProfileIdOption>();
 }
@@ -224,8 +226,7 @@ DataConnectionImpl::DataConnectionImpl(
     : background_(std::move(background)),
       stub_manager_(std::move(stub_manager)),
       limiter_(std::move(limiter)),
-      options_(internal::MergeOptions(std::move(options),
-                                      DataConnection::options())) {
+      options_(MergeOptions(std::move(options), DataConnection::options())) {
 #ifdef GOOGLE_CLOUD_CPP_BIGTABLE_WITH_OTEL_METRICS
   if (options_.get<bigtable::EnableMetricsOption>()) {
     // The client_uid is eventually used in conjunction with other data labels
@@ -264,8 +265,7 @@ DataConnectionImpl::DataConnectionImpl(
       stub_manager_(std::move(stub_manager)),
       operation_context_factory_(std::move(operation_context_factory)),
       limiter_(std::move(limiter)),
-      options_(internal::MergeOptions(std::move(options),
-                                      DataConnection::options())) {}
+      options_(MergeOptions(std::move(options), DataConnection::options())) {}
 
 DataConnectionImpl::DataConnectionImpl(
     std::unique_ptr<BackgroundThreads> background,

google/cloud/bigtable/internal/defaults.cc

@@ -36,9 +36,10 @@ namespace cloud {
 namespace bigtable {
 GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
 namespace internal {
-
 namespace {
 
+using ::google::cloud::bigtable_internal::MergeOptions;
+
 auto constexpr kBackoffScaling = 2.0;
 
 // As learned from experiments, idle gRPC connections enter IDLE state after 4m.
@@ -219,8 +220,7 @@ Options DefaultOptions(Options opts) {
                           ::google::cloud::internal::DefaultTracingOptions())
                       .set<GrpcNumChannelsOption>(DefaultConnectionPoolSize());
 
-  opts = google::cloud::internal::MergeOptions(std::move(opts),
-                                               std::move(defaults));
+  opts = MergeOptions(std::move(opts), std::move(defaults));
 
   if (!emulator) opts = DefaultConnectionRefreshOptions(std::move(opts));
   opts = DefaultChannelArgumentOptions(std::move(opts));

google/cloud/bigtable/table.cc

@@ -22,7 +22,7 @@ namespace cloud {
 namespace bigtable {
 GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
 
-using ::google::cloud::internal::MergeOptions;
+using ::google::cloud::bigtable_internal::MergeOptions;
 using ::google::cloud::internal::OptionsSpan;
 
 namespace {

google/cloud/bigtable/table.h

@@ -194,8 +194,8 @@ class Table {
       : table_(std::move(tr)),
         table_name_(table_.FullName()),
         connection_(std::move(conn)),
-        options_(google::cloud::internal::MergeOptions(
-            std::move(options), connection_->options())) {}
+        options_(bigtable_internal::MergeOptions(std::move(options),
+                                                 connection_->options())) {}
 
   std::string const& table_name() const { return table_name_; }
   std::string const& app_profile_id() const {
@@ -755,7 +755,7 @@ class Table {
     };
 
     google::cloud::internal::OptionsSpan span(
-        google::cloud::internal::MergeOptions(std::move(opts), options_));
+        bigtable_internal::MergeOptions(std::move(opts), options_));
     connection_->AsyncReadRows(table_name_, std::move(on_row_fn),
                                std::move(on_finish_fn), std::move(row_set),
                                rows_limit, std::move(filter));