Skip to content

Commit 561ce36

Browse files
coryancoryan
committed
Address comments about variable names in review.
1 parent b2bcc13 commit 561ce36

2 files changed

Lines changed: 31 additions & 31 deletions

File tree

‎bigtable/api/upload_taq.cc‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -73,21 +73,21 @@ int main(int argc, char* argv[]) try {
7373
// ... insert a single row in each call, obviously this is not
7474
// very efficient, the upload_taq_batch.cc demo shows how to
7575
// update multiple rows at a time ...
76-
bigtable::MutateRowRequest req;
77-
req.set_table_name(table_name);
78-
req.set_row_key(std::move(kv.first));
79-
auto& set = *req.add_mutations()->mutable_set_cell();
80-
set.set_family_name("taq");
81-
set.set_column_qualifier("message");
82-
set.set_value(std::move(kv.second));
76+
bigtable::MutateRowRequest request;
77+
request.set_table_name(table_name);
78+
request.set_row_key(std::move(kv.first));
79+
auto& set_cell = *request.add_mutations()->mutable_set_cell();
80+
set_cell.set_family_name("taq");
81+
set_cell.set_column_qualifier("message");
82+
set_cell.set_value(std::move(kv.second));
8383
// ... we use the timestamp field as a simple revision count in
8484
// this example, so set it to 0. The actual timestamp of the
8585
// quote is stored in the key ...
86-
set.set_timestamp_micros(0);
86+
set_cell.set_timestamp_micros(0);
8787

88-
bigtable::MutateRowResponse resp;
89-
grpc::ClientContext ctx;
90-
auto status = bt_stub->MutateRow(&ctx, req, &resp);
88+
bigtable::MutateRowResponse response;
89+
grpc::ClientContext client_context;
90+
auto status = bt_stub->MutateRow(&client_context, request, &response);
9191
if (not status.ok()) {
9292
std::cerr << "Error in MutateRow() request: " << status.error_message()
9393
<< " [" << status.error_code() << "] " << status.error_details()

‎bigtable/api/upload_taq_batch.cc‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -81,32 +81,32 @@ int main(int argc, char* argv[]) try {
8181
std::ifstream is(filename);
8282
std::string line;
8383
std::getline(is, line, '\n'); // ... skip the header ...
84-
bigtable::MutateRowsRequest req;
85-
req.set_table_name(table_name);
84+
bigtable::MutateRowsRequest request;
85+
request.set_table_name(table_name);
8686
for (int lineno = 1; lineno != max_lines and not is.eof() and is; ++lineno) {
8787
std::getline(is, line, '\n');
8888
auto kv = parse_taq_line(lineno, line);
8989
// ... add one more entry to the batch request ...
90-
auto& entry = *req.add_entries();
90+
auto& entry = *request.add_entries();
9191
entry.set_row_key(std::move(kv.first));
92-
auto& set = *entry.add_mutations()->mutable_set_cell();
93-
set.set_family_name("taq");
94-
set.set_column_qualifier("message");
95-
set.set_value(std::move(kv.second));
92+
auto& set_cell = *entry.add_mutations()->mutable_set_cell();
93+
set_cell.set_family_name("taq");
94+
set_cell.set_column_qualifier("message");
95+
set_cell.set_value(std::move(kv.second));
9696
// ... we use the timestamp field as a simple revision count in
9797
// this example, so set it to 0. The actual timestamp of the
9898
// quote is stored in the key ...
99-
set.set_timestamp_micros(0);
99+
set_cell.set_timestamp_micros(0);
100100

101-
if (req.entries_size() >= batch_size) {
102-
mutate_with_retries(*bt_stub, req);
101+
if (request.entries_size() >= batch_size) {
102+
mutate_with_retries(*bt_stub, request);
103103
}
104104
if (lineno % report_progress_rate == 0) {
105105
std::cout << lineno << " quotes uploaded so far" << std::endl;
106106
}
107107
}
108108
// ... CS101: the last batch needs to be uploaded too ...
109-
mutate_with_retries(*bt_stub, req);
109+
mutate_with_retries(*bt_stub, request);
110110
std::cout << max_lines << " quotes successfully uploaded" << std::endl;
111111

112112
return 0;
@@ -175,7 +175,7 @@ bool should_retry(int code) {
175175
}
176176

177177
void mutate_with_retries(bigtable::Bigtable::Stub& bt_stub,
178-
bigtable::MutateRowsRequest& req) {
178+
bigtable::MutateRowsRequest& request) {
179179
using namespace std::chrono_literals;
180180
// These should be parameters in a real application, but in a demon we can hardcode all kinds of stuff ...
181181
int const max_retries = 100;
@@ -193,11 +193,11 @@ void mutate_with_retries(bigtable::Bigtable::Stub& bt_stub,
193193

194194
// ... MutateRows() is a streaming RPC call, make the call and read from the stream ...
195195
grpc::ClientContext ctx;
196-
auto stream = bt_stub.MutateRows(&ctx, req);
197-
bigtable::MutateRowsResponse resp;
198-
while (stream->Read(&resp)) {
196+
auto stream = bt_stub.MutateRows(&ctx, request);
197+
bigtable::MutateRowsResponse response;
198+
while (stream->Read(&response)) {
199199
// ... save the partial results to either `tmp` or `os` ...
200-
for (auto const& entry : resp.entries()) {
200+
for (auto const& entry : response.entries()) {
201201
auto& status = entry.status();
202202
if (status.code() == grpc::OK) {
203203
continue;
@@ -210,7 +210,7 @@ void mutate_with_retries(bigtable::Bigtable::Stub& bt_stub,
210210
<< ": " << status.message() << " [" << status.code() << "] "
211211
<< details << "\n";
212212
} else {
213-
tmp.add_entries()->Swap(req.mutable_entries(entry.index()));
213+
tmp.add_entries()->Swap(request.mutable_entries(entry.index()));
214214
}
215215
}
216216
}
@@ -223,12 +223,12 @@ void mutate_with_retries(bigtable::Bigtable::Stub& bt_stub,
223223
if (i > 0) {
224224
std::cout << " done" << std::endl;
225225
}
226-
req.mutable_entries()->Clear();
226+
request.mutable_entries()->Clear();
227227
return;
228228
}
229229
// ... prepare the next request ...
230-
tmp.mutable_table_name()->swap(*req.mutable_table_name());
231-
tmp.Swap(&req);
230+
tmp.mutable_table_name()->swap(*request.mutable_table_name());
231+
tmp.Swap(&request);
232232
backoff = backoff * 2;
233233
if (backoff > maximum_backoff) {
234234
backoff = maximum_backoff;

0 commit comments

Comments
 (0)