Skip to content

Commit c187e7b

Browse files
committed
fix formatting
1 parent 15d764b commit c187e7b

3 files changed

Lines changed: 10 additions & 12 deletions

File tree

google/cloud/spanner/client.cc

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,7 @@ RowStream Client::Read(std::string table, KeySet keys,
6161
std::move(table), std::move(keys), std::move(columns),
6262
ToReadOptions(internal::CurrentOptions()), absl::nullopt,
6363
false, std::move(directed_read_option),
64-
std::move(order_by),
65-
std::move(lock_hint)});
64+
std::move(order_by), std::move(lock_hint)});
6665
}
6766

6867
RowStream Client::Read(Transaction::SingleUseOptions transaction_options,
@@ -78,7 +77,7 @@ RowStream Client::Read(Transaction::SingleUseOptions transaction_options,
7877
std::move(table), std::move(keys), std::move(columns),
7978
ToReadOptions(internal::CurrentOptions()), absl::nullopt,
8079
false, std::move(directed_read_option),
81-
std::move(order_by),std::move(lock_hint)});
80+
std::move(order_by), std::move(lock_hint)});
8281
}
8382

8483
RowStream Client::Read(Transaction transaction, std::string table, KeySet keys,
@@ -92,7 +91,7 @@ RowStream Client::Read(Transaction transaction, std::string table, KeySet keys,
9291
std::move(columns),
9392
ToReadOptions(internal::CurrentOptions()), absl::nullopt,
9493
false, std::move(directed_read_option),
95-
std::move(order_by),std::move(lock_hint)});
94+
std::move(order_by), std::move(lock_hint)});
9695
}
9796

9897
RowStream Client::Read(ReadPartition const& read_partition, Options opts) {
@@ -102,7 +101,8 @@ RowStream Client::Read(ReadPartition const& read_partition, Options opts) {
102101
auto lock_hint = ExtractOpt<LockHintOption>(opts);
103102
internal::OptionsSpan span(std::move(opts));
104103
return conn_->Read(spanner_internal::MakeReadParams(
105-
read_partition, std::move(directed_read_option), std::move(order_by), std::move(lock_hint)));
104+
read_partition, std::move(directed_read_option), std::move(order_by),
105+
std::move(lock_hint)));
106106
}
107107

108108
StatusOr<std::vector<ReadPartition>> Client::PartitionRead(

google/cloud/spanner/internal/connection_impl_test.cc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4248,6 +4248,7 @@ TEST(ConnectionImplTest, ReadRequestLockHintShared) {
42484248
absl::nullopt,
42494249
false,
42504250
spanner::DirectedReadOption::Type{},
4251+
spanner::OrderBy::kOrderByUnspecified,
42514252
spanner::LockHint::kLockHintShared};
42524253
auto rows1 = conn->Read(read_params);
42534254
for (auto const& row : rows1) {

google/cloud/spanner/read_partition.h

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -175,8 +175,7 @@ struct ReadPartitionInternals {
175175
static spanner::Connection::ReadParams MakeReadParams(
176176
spanner::ReadPartition const& read_partition,
177177
spanner::DirectedReadOption::Type directed_read_option,
178-
spanner::OrderBy order_by,
179-
spanner::LockHint lock_hint) {
178+
spanner::OrderBy order_by, spanner::LockHint lock_hint) {
180179
return spanner::Connection::ReadParams{
181180
MakeTransactionFromIds(
182181
read_partition.SessionId(), read_partition.TransactionId(),
@@ -209,11 +208,9 @@ inline spanner::ReadPartition MakeReadPartition(
209208
inline spanner::Connection::ReadParams MakeReadParams(
210209
spanner::ReadPartition const& read_partition,
211210
spanner::DirectedReadOption::Type directed_read_option,
212-
spanner::OrderBy order_by,
213-
spanner::LockHint lock_hint) {
214-
return ReadPartitionInternals::MakeReadParams(read_partition,
215-
std::move(directed_read_option),
216-
order_by, lock_hint);
211+
spanner::OrderBy order_by, spanner::LockHint lock_hint) {
212+
return ReadPartitionInternals::MakeReadParams(
213+
read_partition, std::move(directed_read_option), order_by, lock_hint);
217214
}
218215

219216
GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END

0 commit comments

Comments
 (0)