Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion google/cloud/bigtable/value.cc
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ std::ostream& StreamHelper(std::ostream& os, // NOLINT(misc-no-recursion)
return os << v.string_value();
case StreamMode::kAggregate:
os << '"';
EscapeQuotes(os, v.string_value());
EscapeQuotes(os, AsString(v.string_value()));
return os << '"';
}
return os; // Unreachable, but quiets warning.
Expand Down
20 changes: 19 additions & 1 deletion google/cloud/bigtable/value_test.cc
Original file line number Diff line number Diff line change
Expand Up @@ -240,11 +240,29 @@ template <typename T,
.string_value()),
typename std::enable_if<
std::is_same<std::remove_cv_t<std::remove_reference_t<U>>,
absl::Cord>::value>::type* = nullptr>
absl::Cord>::value>::type* = nullptr,
typename std::enable_if_t<
!std::is_same<T, std::vector<std::string>>::value, int> = 0>
StatusOr<T> MovedFromString(Value const&) {
return T{""};
}

template <typename T,
typename U = decltype(std::declval<google::bigtable::v2::Value>()
.string_value()),
typename std::enable_if<
std::is_same<std::remove_cv_t<std::remove_reference_t<U>>,
absl::Cord>::value>::type* = nullptr,
typename std::enable_if_t<
std::is_same<T, std::vector<std::string>>::value, int> = 0>
StatusOr<T> MovedFromString(Value const& v) {
auto v2 = v.get<T>();
if (!v2.ok()) {
return v2.status();
}
return T{v2->size(), std::string{""}};
}

// NOTE: This test relies on unspecified behavior about the moved-from state
// of std::string. Specifically, this test relies on the fact that "large"
// strings, when moved-from, end up empty. And we use this fact to verify that
Expand Down