Skip to content

Commit e43e745

Browse files
authored
Merge branch 'prepare-for-v3.0.0' into async-rowreader-removal
2 parents 4eceb73 + 600d394 commit e43e745

File tree

3 files changed

+59
-43
lines changed

3 files changed

+59
-43
lines changed

doc/v3-migration-guide.md

Lines changed: 59 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,64 @@ module which can be added to your `MODULE.bazel` file as a dependency.
4646

4747
### Bigtable
4848

49+
<details>
50+
<summary>Removed <code>bigtable::RowReader</code> constructors
51+
</summary>
52+
53+
The `bigtable::RowReader` constructors that accept `DataClient` as an argument
54+
have been removed.
55+
56+
Developers that read rows by directly constructing a `RowReader` object should
57+
instead construct a `Table` object and call `Table::ReadRows(...)`.
58+
59+
For example, code that used to look like this:
60+
61+
**Before:**
62+
63+
```cpp
64+
#include "google/cloud/bigtable/data_client.h"
65+
#include "google/cloud/bigtable/row_reader.h"
66+
#include "google/cloud/bigtable/table.h"
67+
68+
// ...
69+
70+
auto client = google::cloud::bigtable::MakeDataClient(
71+
"my-project", "my-instance", creds);
72+
auto reader = google::cloud::bigtable::RowReader(
73+
client, "my-table-id", google::cloud::bigtable::RowSet("r1", "r2"),
74+
google::cloud::bigtable::RowReader::NO_ROWS_LIMIT,
75+
google::cloud::bigtable::Filter::PassAllFilter(),
76+
/*...retry and backoff policies...*/);
77+
78+
for (auto& row : reader) {
79+
if (!row) throw std::move(row).status();
80+
// ...
81+
}
82+
```
83+
84+
Should be changed to this:
85+
86+
**After:**
87+
88+
```cpp
89+
#include "google/cloud/bigtable/table.h"
90+
91+
// ...
92+
93+
namespace cbt = google::cloud::bigtable;
94+
cbt::Table table(cbt::MakeDataConnection(),
95+
cbt::TableResource("my-project", "my-instance", "my-table-id"));
96+
97+
for (auto& row : table.ReadRows(
98+
cbt::RowSet("r1", "r2"),
99+
cbt::Filter::PassAllFilter())) {
100+
if (!row) throw std::move(row).status();
101+
// ...
102+
}
103+
```
104+
105+
</details>
106+
49107
<details>
50108
<summary>Removed <code>bigtable::AsyncRowReader<>::NO_ROWS_LIMIT</code>
51109
</summary>
@@ -60,7 +118,7 @@ auto limit = google::cloud::bigtable::AsyncRowReader<>::NO_ROWS_LIMIT;
60118
// After
61119
auto limit = google::cloud::bigtable::RowReader::NO_ROWS_LIMIT;
62120
```
63-
121+
64122
</details>
65123

66124
### Pubsub

google/cloud/bigtable/row_reader.cc

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -65,32 +65,6 @@ RowReader::RowReader()
6565
: RowReader(
6666
std::make_shared<bigtable_internal::StatusOnlyRowReader>(Status{})) {}
6767

68-
RowReader::RowReader(
69-
std::shared_ptr<DataClient> client, std::string table_name, RowSet row_set,
70-
std::int64_t rows_limit, Filter filter,
71-
std::unique_ptr<RPCRetryPolicy> retry_policy,
72-
std::unique_ptr<RPCBackoffPolicy> backoff_policy,
73-
MetadataUpdatePolicy metadata_update_policy,
74-
std::unique_ptr<internal::ReadRowsParserFactory> parser_factory)
75-
: RowReader(std::make_shared<bigtable_internal::LegacyRowReader>(
76-
std::move(client), std::move(table_name), std::move(row_set),
77-
rows_limit, std::move(filter), std::move(retry_policy),
78-
std::move(backoff_policy), std::move(metadata_update_policy),
79-
std::move(parser_factory))) {}
80-
81-
RowReader::RowReader(
82-
std::shared_ptr<DataClient> client, std::string app_profile_id,
83-
std::string table_name, RowSet row_set, std::int64_t rows_limit,
84-
Filter filter, std::unique_ptr<RPCRetryPolicy> retry_policy,
85-
std::unique_ptr<RPCBackoffPolicy> backoff_policy,
86-
MetadataUpdatePolicy metadata_update_policy,
87-
std::unique_ptr<internal::ReadRowsParserFactory> parser_factory)
88-
: RowReader(std::make_shared<bigtable_internal::LegacyRowReader>(
89-
std::move(client), std::move(app_profile_id), std::move(table_name),
90-
std::move(row_set), rows_limit, std::move(filter),
91-
std::move(retry_policy), std::move(backoff_policy),
92-
std::move(metadata_update_policy), std::move(parser_factory))) {}
93-
9468
std::int64_t constexpr RowReader::NO_ROWS_LIMIT;
9569

9670
// The name must be all lowercase to work with range-for loops.

google/cloud/bigtable/row_reader.h

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -65,22 +65,6 @@ class RowReader {
6565
/// Default constructs an empty RowReader.
6666
RowReader();
6767

68-
GOOGLE_CLOUD_CPP_BIGTABLE_ROW_READER_CTOR_DEPRECATED()
69-
RowReader(std::shared_ptr<DataClient> client, std::string table_name,
70-
RowSet row_set, std::int64_t rows_limit, Filter filter,
71-
std::unique_ptr<RPCRetryPolicy> retry_policy,
72-
std::unique_ptr<RPCBackoffPolicy> backoff_policy,
73-
MetadataUpdatePolicy metadata_update_policy,
74-
std::unique_ptr<internal::ReadRowsParserFactory> parser_factory);
75-
76-
GOOGLE_CLOUD_CPP_BIGTABLE_ROW_READER_CTOR_DEPRECATED()
77-
RowReader(std::shared_ptr<DataClient> client, std::string app_profile_id,
78-
std::string table_name, RowSet row_set, std::int64_t rows_limit,
79-
Filter filter, std::unique_ptr<RPCRetryPolicy> retry_policy,
80-
std::unique_ptr<RPCBackoffPolicy> backoff_policy,
81-
MetadataUpdatePolicy metadata_update_policy,
82-
std::unique_ptr<internal::ReadRowsParserFactory> parser_factory);
83-
8468
// NOLINTNEXTLINE(performance-noexcept-move-constructor)
8569
RowReader(RowReader&&) = default;
8670

0 commit comments

Comments
 (0)