Make Row::message a std::span<const std::byte>

Author: asfernandes

src/fb-cpp/Row.h

@@ -39,6 +39,7 @@
 #include <cstddef>
 #include <cstdint>
 #include <optional>
+#include <span>
 #include <stdexcept>
 #include <string>
 #include <vector>
@@ -69,9 +70,9 @@ namespace fbcpp
 		///
 		/// @param client Client used to build conversion helpers.
 		/// @param descriptors Column descriptors.
-		/// @param message Pointer to the raw row data.
+		/// @param message Span over the raw row data.
 		///
-		Row(Client& client, const std::vector<Descriptor>& descriptors, const std::byte* message)
+		Row(Client& client, const std::vector<Descriptor>& descriptors, std::span<const std::byte> message)
 			: message{message},
 			  descriptors{&descriptors},
 			  client{&client},
@@ -1016,7 +1017,7 @@ namespace fbcpp
 		}
 
 	private:
-		const std::byte* message = nullptr;
+		std::span<const std::byte> message;
 		const std::vector<Descriptor>* descriptors = nullptr;
 		Client* client = nullptr;
 		impl::StatusWrapper statusWrapper;

src/fb-cpp/RowSet.h

@@ -129,8 +129,7 @@ namespace fbcpp
 		Row getRow(unsigned index)
 		{
 			assert(index < count);
-			const auto* data = buffer.data() + static_cast<std::size_t>(index) * messageLength;
-			return Row{*client, descriptors, data};
+			return Row{*client, descriptors, getRawRow(index)};
 		}
 
 		///

src/fb-cpp/Statement.cpp

@@ -178,7 +178,7 @@ Statement::Statement(
 	outMetadata.reset(statementHandle->getOutputMetadata(&statusWrapper));
 	processMetadata(outMetadata, outDescriptors, outMessage);
 
-	outRow = std::make_unique<Row>(attachment.getClient(), outDescriptors, outMessage.data());
+	outRow = std::make_unique<Row>(attachment.getClient(), outDescriptors, std::span{outMessage});
 }
 
 void Statement::free()

src/fb-cpp/Statement.h

@@ -287,7 +287,7 @@ namespace fbcpp
 			  outMetadata{std::move(o.outMetadata)},
 			  outDescriptors{std::move(o.outDescriptors)},
 			  outMessage{std::move(o.outMessage)},
-			  outRow{std::make_unique<Row>(attachment->getClient(), outDescriptors, outMessage.data())},
+			  outRow{std::make_unique<Row>(attachment->getClient(), outDescriptors, std::span{outMessage})},
 			  type{o.type},
 			  cursorFlags{o.cursorFlags}
 		{
@@ -316,7 +316,7 @@ namespace fbcpp
 				outMetadata = std::move(o.outMetadata);
 				outDescriptors = std::move(o.outDescriptors);
 				outMessage = std::move(o.outMessage);
-				outRow = std::make_unique<Row>(attachment->getClient(), outDescriptors, outMessage.data());
+				outRow = std::make_unique<Row>(attachment->getClient(), outDescriptors, std::span{outMessage});
 				type = o.type;
 				cursorFlags = o.cursorFlags;