Make Tuple::pack return a Standalone<StringRef> (#7764)

This makes it less error-prone and more like other similar functions like BinaryWriter::toValue Closes #7748
apple · Aug 2, 2022 · 5dbb6f1 · 5dbb6f1
1 parent 48e46cb
commit 5dbb6f1
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/bindings/flow/Tuple.h b/bindings/flow/Tuple.h
@@ -63,7 +63,9 @@ struct Tuple {
 	Tuple& appendNull();
 	Tuple& appendVersionstamp(Versionstamp const&);
 
-	StringRef pack() const { return StringRef(data.begin(), data.size()); }
+	Standalone<StringRef> pack() const {
+		return Standalone<StringRef>(StringRef(data.begin(), data.size()), data.arena());
+	}
 
 	template <typename T>
 	Tuple& operator<<(T const& t) {

diff --git a/fdbclient/include/fdbclient/Tuple.h b/fdbclient/include/fdbclient/Tuple.h
@@ -56,7 +56,9 @@ struct Tuple {
 	Tuple& appendNull();
 	Tuple& append(Versionstamp const&);
 
-	StringRef pack() const { return StringRef(data.begin(), data.size()); }
+	Standalone<StringRef> pack() const {
+		return Standalone<StringRef>(StringRef(data.begin(), data.size()), data.arena());
+	}
 
 	template <typename T>
 	Tuple& operator<<(T const& t) {