Fix crash bug in execute_batch

Author: Jinming-Hu

Microsoft.WindowsAzure.Storage/includes/wascore/protocol.h

@@ -86,7 +86,7 @@ namespace azure { namespace storage { namespace protocol {
     storage_uri generate_table_uri(const cloud_table_client& service_client, const cloud_table& table, const table_query& query, const continuation_token& token);
     web::http::http_request execute_table_operation(const cloud_table& table, table_operation_type operation_type, web::http::uri_builder& uri_builder, const std::chrono::seconds& timeout, operation_context context);
     web::http::http_request execute_operation(const table_operation& operation, table_payload_format payload_format, web::http::uri_builder& uri_builder, const std::chrono::seconds& timeout, operation_context context);
-    web::http::http_request execute_batch_operation(Concurrency::streams::stringstreambuf& response_buffer, const cloud_table& table, const table_batch_operation& batch_operation, table_payload_format payload_format, bool is_query, web::http::uri_builder& uri_builder, const std::chrono::seconds& timeout, operation_context context);
+    web::http::http_request execute_batch_operation(const cloud_table& table, const table_batch_operation& batch_operation, table_payload_format payload_format, bool is_query, web::http::uri_builder& uri_builder, const std::chrono::seconds& timeout, operation_context context);
     web::http::http_request execute_query(table_payload_format payload_format, web::http::uri_builder& uri_builder, const std::chrono::seconds& timeout, operation_context context);
     web::http::http_request get_table_acl(web::http::uri_builder& uri_builder, const std::chrono::seconds& timeout, operation_context context);
     web::http::http_request set_table_acl(web::http::uri_builder& uri_builder, const std::chrono::seconds& timeout, operation_context context);
@@ -229,7 +229,7 @@ namespace azure { namespace storage { namespace protocol {
     public:
         static utility::string_t parse_etag(const web::http::http_response& response);
         static continuation_token parse_continuation_token(const web::http::http_response& response, const request_result& result);
-        static std::vector<table_result> parse_batch_results(const web::http::http_response& response, Concurrency::streams::stringstreambuf& response_buffer, bool is_query, size_t batch_size);
+        static std::vector<table_result> parse_batch_results(const web::http::http_response& response, const concurrency::streams::container_buffer<std::vector<uint8_t>>& response_buffer, bool is_query, size_t batch_size);
         static std::vector<table_entity> parse_query_results(const web::json::value& obj);
     };
 

Microsoft.WindowsAzure.Storage/src/cloud_table.cpp

@@ -192,13 +192,13 @@ namespace azure { namespace storage {
             throw std::invalid_argument(protocol::error_batch_operation_retrieve_mix);
         }
 
-        // TODO: Pre-create a stream for the response to pass to response handler in other functions too so the response doesn't need to be copied
-        Concurrency::streams::stringstreambuf response_buffer;
+        concurrency::streams::container_buffer<std::vector<uint8_t>> response_buffer;
 
         std::shared_ptr<core::storage_command<std::vector<table_result>>> command = std::make_shared<core::storage_command<std::vector<table_result>>>(uri);
-        command->set_build_request(std::bind(protocol::execute_batch_operation, response_buffer, *this, operation, options.payload_format(), is_query, std::placeholders::_1, std::placeholders::_2, std::placeholders::_3));
+        command->set_build_request(std::bind(protocol::execute_batch_operation, *this, operation, options.payload_format(), is_query, std::placeholders::_1, std::placeholders::_2, std::placeholders::_3));
         command->set_authentication_handler(service_client().authentication_handler());
         command->set_location_mode(is_query ? core::command_location_mode::primary_or_secondary : core::command_location_mode::primary_only);
+        command->set_destination_stream(response_buffer.create_ostream());
         command->set_preprocess_response(std::bind(protocol::preprocess_response<std::vector<table_result>>, std::vector<table_result>(), std::placeholders::_1, std::placeholders::_2, std::placeholders::_3));
         command->set_postprocess_response([response_buffer, operations, is_query] (const web::http::http_response& response, const request_result&, const core::ostream_descriptor&, operation_context context) mutable -> pplx::task<std::vector<table_result>>
         {

Microsoft.WindowsAzure.Storage/src/table_request_factory.cpp

@@ -441,16 +441,12 @@ namespace azure { namespace storage { namespace protocol {
         return request;
     }
 
-    web::http::http_request execute_batch_operation(Concurrency::streams::stringstreambuf& response_buffer, const cloud_table& table, const table_batch_operation& batch_operation, table_payload_format payload_format, bool is_query, web::http::uri_builder& uri_builder, const std::chrono::seconds& timeout, operation_context context)
+    web::http::http_request execute_batch_operation(const cloud_table& table, const table_batch_operation& batch_operation, table_payload_format payload_format, bool is_query, web::http::uri_builder& uri_builder, const std::chrono::seconds& timeout, operation_context context)
     {
         utility::string_t batch_boundary_name = core::generate_boundary_name(_XPLATSTR("batch"));
         utility::string_t changeset_boundary_name = core::generate_boundary_name(_XPLATSTR("changeset"));
 
         web::http::http_request request = table_base_request(web::http::methods::POST, uri_builder, timeout, context);
-        // Need to reset the response buffer before each batch operation is executed.
-        response_buffer.collection().resize(0);
-        response_buffer.seekpos(0, std::ios_base::out);
-        request.set_response_stream(Concurrency::streams::ostream(response_buffer));
 
         web::http::http_headers& request_headers = request.headers();
         request_headers.add(web::http::header_names::accept_charset, header_value_charset_utf8);

Microsoft.WindowsAzure.Storage/src/table_response_parsers.cpp

@@ -68,12 +68,14 @@ namespace azure { namespace storage { namespace protocol {
         return token;
     }
 
-    std::vector<table_result> table_response_parsers::parse_batch_results(const web::http::http_response& response, Concurrency::streams::stringstreambuf& response_buffer, bool is_query, size_t batch_size)
+    std::vector<table_result> table_response_parsers::parse_batch_results(const web::http::http_response& response, const concurrency::streams::container_buffer<std::vector<uint8_t>>& response_buffer, bool is_query, size_t batch_size)
     {
         std::vector<table_result> batch_result;
         batch_result.reserve(batch_size);
 
-        std::string& response_body = response_buffer.collection();
+        // TODO: We make a copy of the response here, we may optimize it in the future
+        const std::vector<uint8_t>& response_collection = response_buffer.collection();
+        const std::string response_body(response_collection.begin(), response_collection.end());
 
         // TODO: Make this Casablanca code more robust