Add new tests for testing new key hash calculation according to DDS-X…

…Types 1.3 (#5091) * Refs #21385. Uncommented key type for dynamic tests Signed-off-by: Ricardo González Moreno <[email protected]> Signed-off-by: eduponz <[email protected]> * Refs #21385. Regenerate code. Signed-off-by: Ricardo González Moreno <[email protected]> Signed-off-by: eduponz <[email protected]> * Refs #21385. Add tests for keys Signed-off-by: Ricardo González Moreno <[email protected]> Signed-off-by: eduponz <[email protected]> * Refs #21385: Regenerate types Signed-off-by: eduponz <[email protected]> * Refs #21385. Fix test expectations. Signed-off-by: Miguel Company <[email protected]> * Refs #21385. Always check certain consistency rules. Signed-off-by: Miguel Company <[email protected]> * Refs #21385: Define constant RTPS_KEY_HASH_SIZE 16 Signed-off-by: Mario Dominguez <[email protected]> * Refs #21385: Edit check_serialization_deserialization() key hash compare conditions. Let compare n bytes only Signed-off-by: Mario Dominguez <[email protected]> * Refs #21385: Fix DDSTypesTest_KeyedLongDoubleStruct test Signed-off-by: Mario Dominguez <[email protected]> --------- Signed-off-by: Ricardo González Moreno <[email protected]> Signed-off-by: eduponz <[email protected]> Signed-off-by: Miguel Company <[email protected]> Signed-off-by: Mario Dominguez <[email protected]> Co-authored-by: eduponz <[email protected]> Co-authored-by: Miguel Company <[email protected]> Co-authored-by: Mario Dominguez <[email protected]>
eProsima · Aug 2, 2024 · 5a75fc4 · 5a75fc4
1 parent ebb0f0b
commit 5a75fc4
Show file tree

Hide file tree

Showing 146 changed files with 10,487 additions and 1,112 deletions.
diff --git a/examples/cpp/configuration/ConfigurationCdrAux.ipp b/examples/cpp/configuration/ConfigurationCdrAux.ipp
@@ -121,8 +121,15 @@ void serialize_key(
         eprosima::fastcdr::Cdr& scdr,
         const Configuration& data)
 {
+
     static_cast<void>(scdr);
     static_cast<void>(data);
+                        scdr << data.index();
+
+                        scdr << data.message();
+
+                        scdr << data.data();
+
 }
 
 

diff --git a/examples/cpp/configuration/ConfigurationPubSubTypes.cxx b/examples/cpp/configuration/ConfigurationPubSubTypes.cxx
@@ -184,7 +184,8 @@ bool ConfigurationPubSubType::compute_key(
             Configuration_max_key_cdr_typesize);
 
     // Object that serializes the data.
-    eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::BIG_ENDIANNESS, eprosima::fastcdr::CdrVersion::XCDRv1);
+    eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::BIG_ENDIANNESS, eprosima::fastcdr::CdrVersion::XCDRv2);
+    ser.set_encoding_flag(eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2);
     eprosima::fastcdr::serialize_key(ser, *p_type);
     if (force_md5 || Configuration_max_key_cdr_typesize > 16)
     {

diff --git a/examples/cpp/content_filter/HelloWorldCdrAux.ipp b/examples/cpp/content_filter/HelloWorldCdrAux.ipp
@@ -113,8 +113,13 @@ void serialize_key(
         eprosima::fastcdr::Cdr& scdr,
         const HelloWorld& data)
 {
+
     static_cast<void>(scdr);
     static_cast<void>(data);
+                        scdr << data.index();
+
+                        scdr << data.message();
+
 }
 
 

diff --git a/examples/cpp/content_filter/HelloWorldPubSubTypes.cxx b/examples/cpp/content_filter/HelloWorldPubSubTypes.cxx
@@ -184,7 +184,8 @@ bool HelloWorldPubSubType::compute_key(
             HelloWorld_max_key_cdr_typesize);
 
     // Object that serializes the data.
-    eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::BIG_ENDIANNESS, eprosima::fastcdr::CdrVersion::XCDRv1);
+    eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::BIG_ENDIANNESS, eprosima::fastcdr::CdrVersion::XCDRv2);
+    ser.set_encoding_flag(eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2);
     eprosima::fastcdr::serialize_key(ser, *p_type);
     if (force_md5 || HelloWorld_max_key_cdr_typesize > 16)
     {

diff --git a/examples/cpp/custom_payload_pool/HelloWorldCdrAux.ipp b/examples/cpp/custom_payload_pool/HelloWorldCdrAux.ipp
@@ -113,8 +113,13 @@ void serialize_key(
         eprosima::fastcdr::Cdr& scdr,
         const HelloWorld& data)
 {
+
     static_cast<void>(scdr);
     static_cast<void>(data);
+                        scdr << data.index();
+
+                        scdr << data.message();
+
 }
 
 

diff --git a/examples/cpp/custom_payload_pool/HelloWorldPubSubTypes.cxx b/examples/cpp/custom_payload_pool/HelloWorldPubSubTypes.cxx
@@ -184,7 +184,8 @@ bool HelloWorldPubSubType::compute_key(
             HelloWorld_max_key_cdr_typesize);
 
     // Object that serializes the data.
-    eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::BIG_ENDIANNESS, eprosima::fastcdr::CdrVersion::XCDRv1);
+    eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::BIG_ENDIANNESS, eprosima::fastcdr::CdrVersion::XCDRv2);
+    ser.set_encoding_flag(eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2);
     eprosima::fastcdr::serialize_key(ser, *p_type);
     if (force_md5 || HelloWorld_max_key_cdr_typesize > 16)
     {

diff --git a/examples/cpp/delivery_mechanisms/DeliveryMechanismsCdrAux.ipp b/examples/cpp/delivery_mechanisms/DeliveryMechanismsCdrAux.ipp
@@ -113,8 +113,13 @@ void serialize_key(
         eprosima::fastcdr::Cdr& scdr,
         const DeliveryMechanisms& data)
 {
+
     static_cast<void>(scdr);
     static_cast<void>(data);
+                        scdr << data.index();
+
+                        scdr << data.message();
+
 }
 
 

diff --git a/examples/cpp/delivery_mechanisms/DeliveryMechanismsPubSubTypes.cxx b/examples/cpp/delivery_mechanisms/DeliveryMechanismsPubSubTypes.cxx
@@ -184,7 +184,8 @@ bool DeliveryMechanismsPubSubType::compute_key(
             DeliveryMechanisms_max_key_cdr_typesize);
 
     // Object that serializes the data.
-    eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::BIG_ENDIANNESS, eprosima::fastcdr::CdrVersion::XCDRv1);
+    eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::BIG_ENDIANNESS, eprosima::fastcdr::CdrVersion::XCDRv2);
+    ser.set_encoding_flag(eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2);
     eprosima::fastcdr::serialize_key(ser, *p_type);
     if (force_md5 || DeliveryMechanisms_max_key_cdr_typesize > 16)
     {

diff --git a/examples/cpp/discovery_server/HelloWorldCdrAux.ipp b/examples/cpp/discovery_server/HelloWorldCdrAux.ipp
@@ -113,8 +113,13 @@ void serialize_key(
         eprosima::fastcdr::Cdr& scdr,
         const HelloWorld& data)
 {
+
     static_cast<void>(scdr);
     static_cast<void>(data);
+                        scdr << data.index();
+
+                        scdr << data.message();
+
 }
 
 

diff --git a/examples/cpp/discovery_server/HelloWorldPubSubTypes.cxx b/examples/cpp/discovery_server/HelloWorldPubSubTypes.cxx
@@ -184,7 +184,8 @@ bool HelloWorldPubSubType::compute_key(
             HelloWorld_max_key_cdr_typesize);
 
     // Object that serializes the data.
-    eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::BIG_ENDIANNESS, eprosima::fastcdr::CdrVersion::XCDRv1);
+    eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::BIG_ENDIANNESS, eprosima::fastcdr::CdrVersion::XCDRv2);
+    ser.set_encoding_flag(eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2);
     eprosima::fastcdr::serialize_key(ser, *p_type);
     if (force_md5 || HelloWorld_max_key_cdr_typesize > 16)
     {

diff --git a/examples/cpp/flow_control/FlowControlCdrAux.ipp b/examples/cpp/flow_control/FlowControlCdrAux.ipp
@@ -113,8 +113,13 @@ void serialize_key(
         eprosima::fastcdr::Cdr& scdr,
         const FlowControl& data)
 {
+
     static_cast<void>(scdr);
     static_cast<void>(data);
+                        scdr << data.index();
+
+                        scdr << data.message();
+
 }
 
 

diff --git a/examples/cpp/flow_control/FlowControlPubSubTypes.cxx b/examples/cpp/flow_control/FlowControlPubSubTypes.cxx
@@ -184,7 +184,8 @@ bool FlowControlPubSubType::compute_key(
             FlowControl_max_key_cdr_typesize);
 
     // Object that serializes the data.
-    eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::BIG_ENDIANNESS, eprosima::fastcdr::CdrVersion::XCDRv1);
+    eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::BIG_ENDIANNESS, eprosima::fastcdr::CdrVersion::XCDRv2);
+    ser.set_encoding_flag(eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2);
     eprosima::fastcdr::serialize_key(ser, *p_type);
     if (force_md5 || FlowControl_max_key_cdr_typesize > 16)
     {

diff --git a/examples/cpp/hello_world/HelloWorldCdrAux.ipp b/examples/cpp/hello_world/HelloWorldCdrAux.ipp
@@ -113,8 +113,13 @@ void serialize_key(
         eprosima::fastcdr::Cdr& scdr,
         const HelloWorld& data)
 {
+
     static_cast<void>(scdr);
     static_cast<void>(data);
+                        scdr << data.index();
+
+                        scdr << data.message();
+
 }
 
 

diff --git a/examples/cpp/hello_world/HelloWorldPubSubTypes.cxx b/examples/cpp/hello_world/HelloWorldPubSubTypes.cxx
@@ -184,7 +184,8 @@ bool HelloWorldPubSubType::compute_key(
             HelloWorld_max_key_cdr_typesize);
 
     // Object that serializes the data.
-    eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::BIG_ENDIANNESS, eprosima::fastcdr::CdrVersion::XCDRv1);
+    eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::BIG_ENDIANNESS, eprosima::fastcdr::CdrVersion::XCDRv2);
+    ser.set_encoding_flag(eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2);
     eprosima::fastcdr::serialize_key(ser, *p_type);
     if (force_md5 || HelloWorld_max_key_cdr_typesize > 16)
     {

diff --git a/examples/cpp/request_reply/types/CalculatorCdrAux.ipp b/examples/cpp/request_reply/types/CalculatorCdrAux.ipp
@@ -129,9 +129,10 @@ void serialize_key(
         eprosima::fastcdr::Cdr& scdr,
         const CalculatorRequestType& data)
 {
+
     static_cast<void>(scdr);
     static_cast<void>(data);
-                            scdr << data.client_id();
+                        scdr << data.client_id();
 
 
 
@@ -218,9 +219,10 @@ void serialize_key(
         eprosima::fastcdr::Cdr& scdr,
         const CalculatorReplyType& data)
 {
+
     static_cast<void>(scdr);
     static_cast<void>(data);
-                            scdr << data.client_id();
+                        scdr << data.client_id();
 
 
 }

diff --git a/examples/cpp/request_reply/types/CalculatorPubSubTypes.cxx b/examples/cpp/request_reply/types/CalculatorPubSubTypes.cxx
@@ -184,7 +184,8 @@ bool CalculatorRequestTypePubSubType::compute_key(
             CalculatorRequestType_max_key_cdr_typesize);
 
     // Object that serializes the data.
-    eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::BIG_ENDIANNESS, eprosima::fastcdr::CdrVersion::XCDRv1);
+    eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::BIG_ENDIANNESS, eprosima::fastcdr::CdrVersion::XCDRv2);
+    ser.set_encoding_flag(eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2);
     eprosima::fastcdr::serialize_key(ser, *p_type);
     if (force_md5 || CalculatorRequestType_max_key_cdr_typesize > 16)
     {
@@ -364,7 +365,8 @@ bool CalculatorReplyTypePubSubType::compute_key(
             CalculatorReplyType_max_key_cdr_typesize);
 
     // Object that serializes the data.
-    eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::BIG_ENDIANNESS, eprosima::fastcdr::CdrVersion::XCDRv1);
+    eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::BIG_ENDIANNESS, eprosima::fastcdr::CdrVersion::XCDRv2);
+    ser.set_encoding_flag(eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2);
     eprosima::fastcdr::serialize_key(ser, *p_type);
     if (force_md5 || CalculatorReplyType_max_key_cdr_typesize > 16)
     {

diff --git a/examples/cpp/security/HelloWorldCdrAux.ipp b/examples/cpp/security/HelloWorldCdrAux.ipp
@@ -113,8 +113,13 @@ void serialize_key(
         eprosima::fastcdr::Cdr& scdr,
         const HelloWorld& data)
 {
+
     static_cast<void>(scdr);
     static_cast<void>(data);
+                        scdr << data.index();
+
+                        scdr << data.message();
+
 }
 
 

diff --git a/examples/cpp/security/HelloWorldPubSubTypes.cxx b/examples/cpp/security/HelloWorldPubSubTypes.cxx
@@ -184,7 +184,8 @@ bool HelloWorldPubSubType::compute_key(
             HelloWorld_max_key_cdr_typesize);
 
     // Object that serializes the data.
-    eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::BIG_ENDIANNESS, eprosima::fastcdr::CdrVersion::XCDRv1);
+    eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::BIG_ENDIANNESS, eprosima::fastcdr::CdrVersion::XCDRv2);
+    ser.set_encoding_flag(eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2);
     eprosima::fastcdr::serialize_key(ser, *p_type);
     if (force_md5 || HelloWorld_max_key_cdr_typesize > 16)
     {

diff --git a/examples/cpp/static_edp_discovery/HelloWorldCdrAux.ipp b/examples/cpp/static_edp_discovery/HelloWorldCdrAux.ipp
@@ -113,8 +113,13 @@ void serialize_key(
         eprosima::fastcdr::Cdr& scdr,
         const HelloWorld& data)
 {
+
     static_cast<void>(scdr);
     static_cast<void>(data);
+                        scdr << data.index();
+
+                        scdr << data.message();
+
 }
 
 

diff --git a/examples/cpp/static_edp_discovery/HelloWorldPubSubTypes.cxx b/examples/cpp/static_edp_discovery/HelloWorldPubSubTypes.cxx
@@ -184,7 +184,8 @@ bool HelloWorldPubSubType::compute_key(
             HelloWorld_max_key_cdr_typesize);
 
     // Object that serializes the data.
-    eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::BIG_ENDIANNESS, eprosima::fastcdr::CdrVersion::XCDRv1);
+    eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::BIG_ENDIANNESS, eprosima::fastcdr::CdrVersion::XCDRv2);
+    ser.set_encoding_flag(eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2);
     eprosima::fastcdr::serialize_key(ser, *p_type);
     if (force_md5 || HelloWorld_max_key_cdr_typesize > 16)
     {

diff --git a/examples/cpp/topic_instances/ShapeTypeCdrAux.ipp b/examples/cpp/topic_instances/ShapeTypeCdrAux.ipp
@@ -129,9 +129,10 @@ void serialize_key(
         eprosima::fastcdr::Cdr& scdr,
         const ShapeType& data)
 {
+
     static_cast<void>(scdr);
     static_cast<void>(data);
-                            scdr << data.color();
+                        scdr << data.color();
 
 
 

diff --git a/examples/cpp/topic_instances/ShapeTypePubSubTypes.cxx b/examples/cpp/topic_instances/ShapeTypePubSubTypes.cxx
@@ -184,7 +184,8 @@ bool ShapeTypePubSubType::compute_key(
             ShapeType_max_key_cdr_typesize);
 
     // Object that serializes the data.
-    eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::BIG_ENDIANNESS, eprosima::fastcdr::CdrVersion::XCDRv1);
+    eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::BIG_ENDIANNESS, eprosima::fastcdr::CdrVersion::XCDRv2);
+    ser.set_encoding_flag(eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2);
     eprosima::fastcdr::serialize_key(ser, *p_type);
     if (force_md5 || ShapeType_max_key_cdr_typesize > 16)
     {

diff --git a/include/fastdds/rtps/common/InstanceHandle.hpp b/include/fastdds/rtps/common/InstanceHandle.hpp
@@ -29,7 +29,9 @@ namespace eprosima {
 namespace fastdds {
 namespace rtps {
 
-using KeyHash_t = std::array<octet, 16>;
+constexpr const uint8_t RTPS_KEY_HASH_SIZE = 16;
+
+using KeyHash_t = std::array<octet, RTPS_KEY_HASH_SIZE>;
 
 struct FASTDDS_EXPORTED_API InstanceHandleValue_t
 {

diff --git a/src/cpp/fastdds/builtin/type_lookup_service/detail/TypeLookupTypesCdrAux.ipp b/src/cpp/fastdds/builtin/type_lookup_service/detail/TypeLookupTypesCdrAux.ipp
@@ -115,6 +115,8 @@ void serialize_key(
 
     static_cast<void>(scdr);
     static_cast<void>(data);
+                        scdr << data.type_ids();
+
 }
 
 
@@ -207,6 +209,10 @@ void serialize_key(
 
     static_cast<void>(scdr);
     static_cast<void>(data);
+                        scdr << data.types();
+
+                        scdr << data.complete_to_minimal();
+
 }
 
 
@@ -414,6 +420,10 @@ void serialize_key(
 
     static_cast<void>(scdr);
     static_cast<void>(data);
+                        scdr << data.continuation_point();
+
+                        scdr << data.type_ids();
+
 }
 
 
@@ -506,6 +516,10 @@ void serialize_key(
 
     static_cast<void>(scdr);
     static_cast<void>(data);
+                        scdr << data.continuation_point();
+
+                        scdr << data.dependent_typeids();
+
 }
 
 
@@ -846,9 +860,18 @@ void serialize_key(
         const eprosima::fastdds::dds::builtin::TypeLookup_Request& data)
 {
     using namespace eprosima::fastdds::dds::builtin;
+            extern void serialize_key(
+                    Cdr& scdr,
+                    const eprosima::fastdds::dds::rpc::RequestHeader& data);
+
+
 
     static_cast<void>(scdr);
     static_cast<void>(data);
+                        serialize_key(scdr, data.header());
+
+                        scdr << data.data();
+
 }
 
 
@@ -1074,9 +1097,18 @@ void serialize_key(
         const eprosima::fastdds::dds::builtin::TypeLookup_Reply& data)
 {
     using namespace eprosima::fastdds::dds::builtin;
+            extern void serialize_key(
+                    Cdr& scdr,
+                    const eprosima::fastdds::dds::rpc::ReplyHeader& data);
+
+
 
     static_cast<void>(scdr);
     static_cast<void>(data);
+                        serialize_key(scdr, data.header());
+
+                        scdr << data.return_value();
+
 }