Refs 12758. Different removal policy on ReaderHistory and DataReaderH…

…istory.

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>

include/fastdds/rtps/history/ReaderHistory.h

@@ -163,15 +163,7 @@ class ReaderHistory : public History
      */
     RTPS_DllAPI virtual void writer_unmatched(
             const GUID_t& writer_guid,
-            const SequenceNumber_t& last_notified_seq)
-    {
-        remove_changes_with_pred(
-            [writer_guid, last_notified_seq](CacheChange_t* ch)
-            {
-                return (writer_guid == ch->writerGUID) &&
-                (last_notified_seq < ch->sequenceNumber);
-            });
-    }
+            const SequenceNumber_t& last_notified_seq);
 
 protected:
 

src/cpp/fastdds/subscriber/history/DataReaderHistory.cpp

@@ -380,6 +380,17 @@ bool DataReaderHistory::find_key(
     return false;
 }
 
+void DataReaderHistory::writer_unmatched(
+        const GUID_t& writer_guid,
+        const SequenceNumber_t& last_notified_seq)
+{
+    remove_changes_with_pred(
+        [&writer_guid, &last_notified_seq](CacheChange_t* ch)
+        {
+            return (writer_guid == ch->writerGUID) && (last_notified_seq < ch->sequenceNumber);
+        });
+}
+
 bool DataReaderHistory::remove_change_sub(
         CacheChange_t* change)
 {

src/cpp/fastdds/subscriber/history/DataReaderHistory.hpp

@@ -36,6 +36,7 @@
 #include <fastdds/rtps/common/CacheChange.h>
 #include <fastdds/rtps/common/Guid.h>
 #include <fastdds/rtps/common/InstanceHandle.h>
+#include <fastdds/rtps/common/SequenceNumber.h>
 #include <fastdds/rtps/history/ReaderHistory.h>
 #include <fastdds/rtps/resources/ResourceManagement.h>
 
@@ -60,6 +61,7 @@ class DataReaderHistory : public eprosima::fastrtps::rtps::ReaderHistory
     using InstanceHandle_t = eprosima::fastrtps::rtps::InstanceHandle_t;
     using CacheChange_t = eprosima::fastrtps::rtps::CacheChange_t;
     using GUID_t = eprosima::fastrtps::rtps::GUID_t;
+    using SequenceNumber_t = eprosima::fastrtps::rtps::SequenceNumber_t;
 
     using instance_info = std::pair<InstanceHandle_t, DataReaderInstance*>;
 
@@ -153,6 +155,19 @@ class DataReaderHistory : public eprosima::fastrtps::rtps::ReaderHistory
             CacheChange_t* change,
             DataReaderInstance::ChangeCollection::iterator& it);
 
+    /**
+     * Called when a writer is unmatched from the reader holding this history.
+     *
+     * This method will remove all the changes on the history that came from the writer being unmatched and which have
+     * not yet been notified to the user.
+     *
+     * @param writer_guid        GUID of the writer being unmatched.
+     * @param last_notified_seq  Last sequence number from the specified writer that was notified to the user.
+     */
+    void writer_unmatched(
+            const GUID_t& writer_guid,
+            const SequenceNumber_t& last_notified_seq) override;
+
     /**
      * @brief A method to set the next deadline for the given instance
      * @param handle The handle to the instance

src/cpp/rtps/history/ReaderHistory.cpp

@@ -158,6 +158,18 @@ History::iterator ReaderHistory::remove_change_nts(
     return ret_val;
 }
 
+void ReaderHistory::writer_unmatched(
+        const GUID_t& writer_guid,
+        const SequenceNumber_t& last_notified_seq)
+{
+    static_cast<void>(last_notified_seq);
+    remove_changes_with_pred(
+        [&writer_guid](CacheChange_t* ch)
+        {
+            return writer_guid == ch->writerGUID;
+        });
+}
+
 bool ReaderHistory::remove_changes_with_guid(
         const GUID_t& a_guid)
 {

test/mock/rtps/ReaderHistory/fastdds/rtps/history/ReaderHistory.h

@@ -141,6 +141,12 @@ class ReaderHistory
 
 protected:
 
+    template<typename Pred>
+    inline void remove_changes_with_pred(
+            Pred pred)
+    {
+    }
+
     RTPSReader* mp_reader;
     RecursiveTimedMutex* mp_mutex;
     std::vector<CacheChange_t*> m_changes;