Skip to content

Commit 6db9498

Browse files
scotthartscotthart
committed
update tests and examples
1 parent 0235fe7 commit 6db9498

16 files changed

Lines changed: 147 additions & 52 deletions

‎google/cloud/bigtable/benchmarks/benchmark.cc‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -130,10 +130,13 @@ void Benchmark::DeleteTable() {
130130
Table Benchmark::MakeTable(Options connection_opts) const {
131131
auto connection_options = MergeOptions(std::move(connection_opts), opts_);
132132
auto table_opts = Options{}.set<AppProfileIdOption>(options_.app_profile_id);
133-
return Table(MakeDataConnection(std::move(connection_options)),
134-
TableResource(options_.project_id, options_.instance_id,
135-
options_.table_id),
136-
std::move(table_opts));
133+
return Table(
134+
MakeDataConnection({InstanceResource(Project(options_.project_id),
135+
options_.instance_id)},
136+
std::move(connection_options)),
137+
TableResource(options_.project_id, options_.instance_id,
138+
options_.table_id),
139+
std::move(table_opts));
137140
}
138141

139142
google::cloud::StatusOr<BenchmarkResult> Benchmark::PopulateTable() {

‎google/cloud/bigtable/benchmarks/embedded_server_test.cc‎

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,9 @@ TEST(EmbeddedServer, TableApply) {
7676
.set<GrpcCredentialOption>(grpc::InsecureChannelCredentials())
7777
.set<EndpointOption>(server->address());
7878

79-
Table table(MakeDataConnection(options),
79+
Table table(MakeDataConnection(
80+
{InstanceResource(Project("fake-project"), "fake-instance")},
81+
std::move(options)),
8082
TableResource("fake-project", "fake-instance", "fake-table"));
8183

8284
SingleRowMutation mutation("row1",
@@ -101,7 +103,9 @@ TEST(EmbeddedServer, TableBulkApply) {
101103
.set<GrpcCredentialOption>(grpc::InsecureChannelCredentials())
102104
.set<EndpointOption>(server->address());
103105

104-
Table table(MakeDataConnection(options),
106+
Table table(MakeDataConnection(
107+
{InstanceResource(Project("fake-project"), "fake-instance")},
108+
std::move(options)),
105109
TableResource("fake-project", "fake-instance", "fake-table"));
106110

107111
BulkMutation bulk;
@@ -128,7 +132,9 @@ TEST(EmbeddedServer, ReadRows1) {
128132
.set<GrpcCredentialOption>(grpc::InsecureChannelCredentials())
129133
.set<EndpointOption>(server->address());
130134

131-
Table table(MakeDataConnection(options),
135+
Table table(MakeDataConnection(
136+
{InstanceResource(Project("fake-project"), "fake-instance")},
137+
std::move(options)),
132138
TableResource("fake-project", "fake-instance", "fake-table"));
133139

134140
EXPECT_EQ(0, server->read_rows_count());
@@ -150,7 +156,9 @@ TEST(EmbeddedServer, ReadRows100) {
150156
.set<GrpcCredentialOption>(grpc::InsecureChannelCredentials())
151157
.set<EndpointOption>(server->address());
152158

153-
Table table(MakeDataConnection(options),
159+
Table table(MakeDataConnection(
160+
{InstanceResource(Project("fake-project"), "fake-instance")},
161+
std::move(options)),
154162
TableResource("fake-project", "fake-instance", "fake-table"));
155163

156164
EXPECT_EQ(0, server->read_rows_count());

‎google/cloud/bigtable/benchmarks/mutation_batcher_throughput_benchmark.cc‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -201,6 +201,8 @@ int main(int argc, char* argv[]) {
201201

202202
auto table = cbt::Table(
203203
cbt::MakeDataConnection(
204+
{cbt::InstanceResource(google::cloud::Project(options->project_id),
205+
options->instance_id)},
204206
Options{}.set<google::cloud::GrpcBackgroundThreadPoolSizeOption>(
205207
options->max_batches)),
206208
cbt::TableResource(options->project_id, options->instance_id, *table_id));

‎google/cloud/bigtable/examples/bigtable_examples_common.cc‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15+
#include "google/cloud/internal/disable_deprecation_warnings.inc"
1516
#include "google/cloud/bigtable/examples/bigtable_examples_common.h"
1617
#include "google/cloud/internal/getenv.h"
1718
#include "absl/strings/str_join.h"
@@ -53,7 +54,9 @@ Commands::value_type MakeCommandEntry(std::string const& name,
5354
throw Usage{std::move(os).str()};
5455
}
5556
google::cloud::bigtable::Table table(
56-
google::cloud::bigtable::MakeDataConnection(),
57+
google::cloud::bigtable::MakeDataConnection(
58+
{google::cloud::bigtable::InstanceResource(
59+
google::cloud::Project(argv[0]), argv[1])}),
5760
google::cloud::bigtable::TableResource(argv[0], argv[1], argv[2]));
5861
argv.erase(argv.begin(), argv.begin() + 3);
5962
function(table, argv);
@@ -118,7 +121,9 @@ Commands::value_type MakeCommandEntry(std::string const& name,
118121
throw Usage{std::move(os).str()};
119122
}
120123
google::cloud::bigtable::Table table(
121-
google::cloud::bigtable::MakeDataConnection(),
124+
google::cloud::bigtable::MakeDataConnection(
125+
{google::cloud::bigtable::InstanceResource(
126+
google::cloud::Project(argv[0]), argv[1])}),
122127
google::cloud::bigtable::TableResource(argv[0], argv[1], argv[2]));
123128
google::cloud::CompletionQueue cq;
124129
std::thread t([&cq] { cq.Run(); });

‎google/cloud/bigtable/examples/bigtable_hello_app_profile.cc‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,8 @@ void HelloWorldAppProfile(std::vector<std::string> const& argv) {
4343
std::string const& profile_id = argv[3];
4444

4545
// Create an object to access the Cloud Bigtable Data API.
46-
auto connection = cbt::MakeDataConnection();
46+
auto connection = cbt::MakeDataConnection(
47+
{cbt::InstanceResource(google::cloud::Project(project_id), instance_id)});
4748

4849
// Use the default profile to write some data.
4950
cbt::Table write(connection,

‎google/cloud/bigtable/examples/bigtable_hello_world.cc‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,8 @@ void BigtableHelloWorld(std::vector<std::string> const& argv) {
5252

5353
//! [connect data]
5454
// Create an object to access the Cloud Bigtable Data API.
55-
cbt::Table table(cbt::MakeDataConnection(),
55+
cbt::Table table(cbt::MakeDataConnection({cbt::InstanceResource(
56+
google::cloud::Project(project_id), instance_id)}),
5657
cbt::TableResource(project_id, instance_id, table_id));
5758
//! [connect data]
5859
//! [connect admin] [END bigtable_hw_connect]

‎google/cloud/bigtable/examples/client_samples.cc‎

Lines changed: 22 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,12 @@ void TableSetEndpoint(std::vector<std::string> const& argv) {
4040
auto options = google::cloud::Options{}.set<google::cloud::EndpointOption>(
4141
"private.googleapis.com");
4242
auto resource = bigtable::TableResource(project_id, instance_id, table_id);
43-
return bigtable::Table(bigtable::MakeDataConnection(options), resource);
43+
return bigtable::Table(
44+
bigtable::MakeDataConnection(
45+
{bigtable::InstanceResource(google::cloud::Project(project_id),
46+
instance_id)},
47+
std::move(options)),
48+
resource);
4449
}
4550
//! [table-set-endpoint]
4651
(argv.at(0), argv.at(1), argv.at(2));
@@ -66,7 +71,10 @@ void SetRetryPolicy(std::vector<std::string> const& argv) {
6671
/*maximum_delay=*/std::chrono::seconds(45),
6772
/*scaling=*/2.0)
6873
.clone());
69-
auto connection = cbt::MakeDataConnection(options);
74+
auto connection = cbt::MakeDataConnection(
75+
{cbt::InstanceResource(google::cloud::Project(project_id),
76+
instance_id)},
77+
std::move(options));
7078

7179
auto const table_name =
7280
cbt::TableResource(project_id, instance_id, table_id);
@@ -111,7 +119,12 @@ void TableWithServiceAccount(std::vector<std::string> const& argv) {
111119
google::cloud::Options{}.set<google::cloud::UnifiedCredentialsOption>(
112120
google::cloud::MakeServiceAccountCredentials(contents));
113121
auto resource = bigtable::TableResource(project_id, instance_id, table_id);
114-
return bigtable::Table(bigtable::MakeDataConnection(options), resource);
122+
return bigtable::Table(
123+
bigtable::MakeDataConnection(
124+
{bigtable::InstanceResource(google::cloud::Project(project_id),
125+
instance_id)},
126+
std::move(options)),
127+
resource);
115128
}
116129
//! [table-with-service-account]
117130
(argv.at(0), argv.at(1), argv.at(2), argv.at(3));
@@ -137,7 +150,12 @@ void TableSetUniverseDomain(std::vector<std::string> const& argv) {
137150

138151
if (!ud_options.ok()) throw std::move(ud_options).status();
139152
auto resource = bigtable::TableResource(project_id, instance_id, table_id);
140-
return bigtable::Table(bigtable::MakeDataConnection(*ud_options), resource);
153+
return bigtable::Table(
154+
bigtable::MakeDataConnection(
155+
{bigtable::InstanceResource(google::cloud::Project(project_id),
156+
instance_id)},
157+
*std::move(ud_options)),
158+
resource);
141159
}
142160
//! [table-set-universe-domain]
143161
(argv.at(0), argv.at(1), argv.at(2));

‎google/cloud/bigtable/examples/data_async_snippets.cc‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -350,7 +350,8 @@ void RunAll(std::vector<std::string> const& argv) {
350350
if (!schema) throw std::move(schema).status();
351351

352352
using ::google::cloud::Options;
353-
cbt::Table table(cbt::MakeDataConnection(),
353+
cbt::Table table(cbt::MakeDataConnection({cbt::InstanceResource(
354+
google::cloud::Project(project_id), instance_id)}),
354355
cbt::TableResource(project_id, instance_id, table_id),
355356
Options{}.set<cbt::IdempotentMutationPolicyOption>(
356357
cbt::AlwaysRetryMutationPolicy().clone()));

‎google/cloud/bigtable/examples/data_filter_snippets.cc‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -579,7 +579,8 @@ void RunAll(std::vector<std::string> const& argv) {
579579
table_id, std::move(t));
580580
if (!schema) throw std::move(schema).status();
581581

582-
cbt::Table table(cbt::MakeDataConnection(),
582+
cbt::Table table(cbt::MakeDataConnection({cbt::InstanceResource(
583+
google::cloud::Project(project_id), instance_id)}),
583584
cbt::TableResource(project_id, instance_id, table_id));
584585

585586
std::cout << "\nPreparing data for multiple examples" << std::endl;

‎google/cloud/bigtable/examples/data_snippets.cc‎

Lines changed: 29 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,8 @@ void ApplyRelaxedIdempotency(google::cloud::bigtable::Table const& table,
6060
namespace cbt = ::google::cloud::bigtable;
6161
[](std::string const& project_id, std::string const& instance_id,
6262
std::string const& table_id, std::string const& row_key) {
63-
cbt::Table table(cbt::MakeDataConnection(),
63+
cbt::Table table(cbt::MakeDataConnection({cbt::InstanceResource(
64+
google::cloud::Project(project_id), instance_id)}),
6465
cbt::TableResource(project_id, instance_id, table_id),
6566
Options{}.set<cbt::IdempotentMutationPolicyOption>(
6667
cbt::AlwaysRetryMutationPolicy().clone()));
@@ -83,7 +84,8 @@ void ApplyCustomRetry(google::cloud::bigtable::Table const& table,
8384
namespace cbt = ::google::cloud::bigtable;
8485
[](std::string const& project_id, std::string const& instance_id,
8586
std::string const& table_id, std::string const& row_key) {
86-
cbt::Table table(cbt::MakeDataConnection(),
87+
cbt::Table table(cbt::MakeDataConnection({cbt::InstanceResource(
88+
google::cloud::Project(project_id), instance_id)}),
8789
cbt::TableResource(project_id, instance_id, table_id),
8890
Options{}.set<cbt::DataRetryPolicyOption>(
8991
cbt::DataLimitedErrorCountRetryPolicy(7).clone()));
@@ -348,7 +350,10 @@ void MutateDeleteColumns(std::vector<std::string> const& argv) {
348350
}
349351
//! [connect data]
350352
google::cloud::bigtable::Table table(
351-
google::cloud::bigtable::MakeDataConnection(),
353+
google::cloud::bigtable::MakeDataConnection({
354+
google::cloud::bigtable::InstanceResource(
355+
google::cloud::Project(project_id), instance_id),
356+
}),
352357
google::cloud::bigtable::TableResource(project_id, instance_id,
353358
table_id));
354359
//! [connect data]
@@ -408,7 +413,10 @@ void MutateDeleteRowsCommand(std::vector<std::string> const& argv) {
408413
auto const table_id = *it++;
409414
std::vector<std::string> rows(it, argv.cend());
410415
google::cloud::bigtable::Table table(
411-
google::cloud::bigtable::MakeDataConnection(),
416+
google::cloud::bigtable::MakeDataConnection({
417+
google::cloud::bigtable::InstanceResource(
418+
google::cloud::Project(project_id), instance_id),
419+
}),
412420
google::cloud::bigtable::TableResource(project_id, instance_id,
413421
table_id));
414422
MutateDeleteRows(table, std::move(rows));
@@ -477,7 +485,10 @@ void MutateInsertUpdateRowsCommand(std::vector<std::string> const& argv) {
477485
auto const table_id = *it++;
478486
std::vector<std::string> rows(it, argv.cend());
479487
google::cloud::bigtable::Table table(
480-
google::cloud::bigtable::MakeDataConnection(),
488+
google::cloud::bigtable::MakeDataConnection({
489+
google::cloud::bigtable::InstanceResource(
490+
google::cloud::Project(project_id), instance_id),
491+
}),
481492
google::cloud::bigtable::TableResource(project_id, instance_id,
482493
table_id));
483494
MutateInsertUpdateRows(table, std::move(rows));
@@ -708,8 +719,11 @@ void ConfigureConnectionPoolSize(std::vector<std::string> const& argv) {
708719
std::string const& table_id) {
709720
auto constexpr kPoolSize = 10;
710721
auto options = gc::Options{}.set<gc::GrpcNumChannelsOption>(kPoolSize);
711-
cbt::Table table(cbt::MakeDataConnection(options),
712-
cbt::TableResource(project_id, instance_id, table_id));
722+
cbt::Table table(
723+
cbt::MakeDataConnection(
724+
{cbt::InstanceResource(gc::Project(project_id), instance_id)},
725+
std::move(options)),
726+
cbt::TableResource(project_id, instance_id, table_id));
713727
std::cout << "Connected with channel pool size of " << kPoolSize << "\n";
714728
}
715729
// [END bigtable_configure_connection_pool]
@@ -732,7 +746,8 @@ void RunMutateExamples(
732746
if (!schema) throw std::move(schema).status();
733747

734748
using ::google::cloud::Options;
735-
cbt::Table table(cbt::MakeDataConnection(),
749+
cbt::Table table(cbt::MakeDataConnection({cbt::InstanceResource(
750+
google::cloud::Project(project_id), instance_id)}),
736751
cbt::TableResource(project_id, instance_id, table_id),
737752
Options{}.set<cbt::IdempotentMutationPolicyOption>(
738753
cbt::AlwaysRetryMutationPolicy().clone()));
@@ -763,7 +778,8 @@ void RunWriteExamples(
763778
if (!schema) throw std::move(schema).status();
764779

765780
using ::google::cloud::Options;
766-
cbt::Table table(cbt::MakeDataConnection(),
781+
cbt::Table table(cbt::MakeDataConnection({cbt::InstanceResource(
782+
google::cloud::Project(project_id), instance_id)}),
767783
cbt::TableResource(project_id, instance_id, table_id),
768784
Options{}.set<cbt::IdempotentMutationPolicyOption>(
769785
cbt::AlwaysRetryMutationPolicy().clone()));
@@ -829,7 +845,8 @@ void RunDataExamples(
829845
if (!schema) throw std::move(schema).status();
830846

831847
using ::google::cloud::Options;
832-
cbt::Table table(cbt::MakeDataConnection(),
848+
cbt::Table table(cbt::MakeDataConnection({cbt::InstanceResource(
849+
google::cloud::Project(project_id), instance_id)}),
833850
cbt::TableResource(project_id, instance_id, table_id),
834851
Options{}.set<cbt::IdempotentMutationPolicyOption>(
835852
cbt::AlwaysRetryMutationPolicy().clone()));
@@ -914,7 +931,8 @@ void RunDataExamples(
914931
ReadModifyWrite(table, {"read-modify-write"});
915932

916933
if (!google::cloud::bigtable::examples::UsingEmulator()) {
917-
auto client = cbt::Client(cbt::MakeDataConnection());
934+
auto client = cbt::Client(cbt::MakeDataConnection({cbt::InstanceResource(
935+
google::cloud::Project(project_id), instance_id)}));
918936
std::cout << "Running PrepareAndExecuteQuery() example" << std::endl;
919937
PrepareAndExecuteQuery(client, {project_id, instance_id, table_id});
920938
}

0 commit comments

Comments
 (0)