Merge branch 'master' into double_free

Author: huangminghuang

src/mfast/coder/encoder/fast_encoder.cpp

@@ -189,7 +189,7 @@ void fast_encoder_impl::visit(message_cref cref, bool force_reset) {
 
   if (need_encode_template_id) {
     active_message_id_ = template_id;
-    strm_.encode(active_message_id_, false, false);
+    strm_.encode(template_id, false, false);
   }
 
   aggregate_cref message(cref.field_storage(0), instruction);

src/mfast/instructions/field_instruction.h

@@ -165,7 +165,8 @@ class MFAST_EXPORT field_instruction {
   virtual void update_invariant() {
     nullable_flag_ = optional_flag_ && (operator_id_ != operator_constant);
     has_pmap_bit_ = operator_id_ > operator_delta ||
-                    ((operator_id_ == operator_constant) && optional_flag_);
+                    ((operator_id_ == operator_constant) && optional_flag_)||
+                    (field_type_ == field_type_group && optional_flag_);
   }
 
   // uint16_t field_index_;
@@ -208,7 +209,8 @@ inline field_instruction::field_instruction(operator_enum_t operator_id,
       optional_flag_(optional),
       nullable_flag_(optional && (operator_id != operator_constant)),
       has_pmap_bit_(operator_id > operator_delta ||
-                    ((operator_id == operator_constant) && optional)),
+                    ((operator_id == operator_constant) && optional) ||
+                    (field_type == field_type_group && optional)),
       has_initial_value_(false), field_type_(field_type),
       previous_value_shared_(false), id_(id), name_(name), ns_(ns),
       tag_(std::move(tag)) {}

src/mfast/instructions/template_instruction.h

@@ -22,6 +22,7 @@ class MFAST_EXPORT template_instruction : public group_field_instruction {
                                 cpp_ns, tag),
         template_ns_(template_ns), reset_(reset) {
     field_type_ = field_type_template;
+    segment_pmap_size_++;   // Add one to the template id bit
   }
 
   const char *template_ns() const { return template_ns_; }

tests/CMakeLists.txt

@@ -19,6 +19,7 @@ FASTTYPEGEN_TARGET(simple_types7 simple7.xml)
 FASTTYPEGEN_TARGET(simple_types8 simple8.xml)
 FASTTYPEGEN_TARGET(simple_types9 simple9.xml)
 FASTTYPEGEN_TARGET(simple_types10 simple10.xml)
+FASTTYPEGEN_TARGET(simple_types11 simple11.xml)
 
 
 FASTTYPEGEN_TARGET(test_types1 test1.xml test2.xml)
@@ -35,6 +36,7 @@ add_executable (mfast_test
                 fast_ostream_test.cpp
                 decoder_operator_test.cpp
                 encoder_operator_test.cpp
+                encoder_test.cpp
                 field_comparator_test.cpp
                 coder_test.cpp
                 value_storage_test.cpp
@@ -53,6 +55,7 @@ add_executable (mfast_test
                 ${FASTTYPEGEN_simple_types8_OUTPUTS}
                 ${FASTTYPEGEN_simple_types9_OUTPUTS}
                 ${FASTTYPEGEN_simple_types10_OUTPUTS}
+                ${FASTTYPEGEN_simple_types11_OUTPUTS}
                 fast_type_gen_test.cpp
                 dictionary_builder_test.cpp
                 json_test.cpp
@@ -62,6 +65,7 @@ add_executable (mfast_test
                 simple_coder_test.cpp
                 scp_reset_test.cpp
                 template_repo_base.cpp
+                message_pmap_test.cpp
             )
 
 target_link_libraries (mfast_test

tests/encoder_test.cpp

@@ -0,0 +1,29 @@
+#include "catch.hpp"
+#include <mfast.h>
+#include <mfast/coder/fast_encoder.h>
+#include <cstring>
+#include <stdexcept>
+
+#include "simple11.h"
+#include "byte_stream.h"
+
+TEST_CASE("test simple encoder","[test_encoder]")
+{
+    mfast::fast_encoder encoder_;
+    encoder_.include({simple11::description()});
+
+    const int buffer_size = 128;
+    char buffer[buffer_size];
+
+    simple11::Test_1 msg;
+    simple11::Test_1_mref msg_ref = msg.mref();
+
+    msg_ref.set_field1().as(1);
+    msg_ref.set_field2().as(2);
+    msg_ref.set_field3().as(3);
+
+    std::size_t encoded_size = encoder_.encode(msg_ref, buffer, buffer_size);
+
+    byte_stream result("\xF8\x81\x81\x82\x83");
+    CHECK(result == byte_stream(buffer, encoded_size));
+}

tests/message_pmap_test.cpp

@@ -0,0 +1,29 @@
+#include "catch.hpp"
+#include <mfast.h>
+
+#include "simple1.h"
+#include "simple2.h"
+
+TEST_CASE("test message pmap message number of bits of a field message content","[message_pmap_number_bits_field]")
+{
+    simple1::Test msg;
+    simple1::Test_mref msg_ref = msg.mref();
+
+    msg_ref.set_field1().as(1);
+    msg_ref.set_field2().as(2);
+    msg_ref.set_field3().as(3);
+
+    CHECK(msg.instruction()->segment_pmap_size() == 4);
+}
+
+TEST_CASE("test message pmap message number of bits of a field and group message content","[message_pmap_number_bits_group]")
+{
+    simple2::Test msg;
+    simple2::Test_mref msg_ref = msg.mref();
+
+    msg_ref.set_field1().as(1);
+    msg_ref.set_group1().set_field2().as(2);
+    msg_ref.set_group1().set_field3().as(3);
+
+    CHECK(msg.instruction()->segment_pmap_size() == 3);
+}

tests/simple11.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" ?>
+<templates xmlns="http://www.fixprotocol.org/ns/template-definition"
+    templateNs="http://www.fixprotocol.org/ns/templates/sample"
+    ns="http://www.fixprotocol.org/ns/fix">
+  <template name="Test_1" id="1">
+    <uInt32 name="field1" id="11"><copy/></uInt32>
+    <uInt32 name="field2" id="12"><copy/></uInt32>
+    <uInt32 name="field3" id="13"><copy/></uInt32>
+  </template>
+  <template name="Test_2" id="2">
+    <uInt32 name="field4" id="21"><copy/></uInt32>
+    <uInt32 name="field5" id="22"><copy/></uInt32>
+    <uInt32 name="field6" id="23"><copy/></uInt32>
+  </template>  
+</templates>