Add clear method to TimestampDictionaryWriter

Author: gibber9809

components/core/src/clp_s/ArchiveWriter.cpp

@@ -40,8 +40,6 @@ void ArchiveWriter::open(ArchiveWriterOption const& option) {
     std::string array_dict_path = m_archive_path + constants::cArchiveArrayDictFile;
     m_array_dict = std::make_shared<LogTypeDictionaryWriter>();
     m_array_dict->open(array_dict_path, m_compression_level, UINT64_MAX);
-
-    m_timestamp_dict = std::make_shared<TimestampDictionaryWriter>();
 }
 
 void ArchiveWriter::close() {
@@ -90,6 +88,7 @@ void ArchiveWriter::close() {
     m_id_to_schema_writer.clear();
     m_schema_tree.clear();
     m_schema_map.clear();
+    m_timestamp_dict.clear();
     m_encoded_message_size = 0UL;
     m_uncompressed_size = 0UL;
     m_compressed_size = 0UL;
@@ -101,7 +100,7 @@ size_t ArchiveWriter::write_timestamp_dict() {
     ZstdCompressor timestamp_dict_compressor;
     timestamp_dict_file_writer.open(timestamp_dict_path, FileWriter::OpenMode::CreateForWriting);
     timestamp_dict_compressor.open(timestamp_dict_file_writer, m_compression_level);
-    m_timestamp_dict->write(timestamp_dict_compressor);
+    m_timestamp_dict.write(timestamp_dict_compressor);
     timestamp_dict_compressor.close();
     auto compressed_size = timestamp_dict_file_writer.get_pos();
     timestamp_dict_file_writer.close();
@@ -152,7 +151,7 @@ void ArchiveWriter::write_archive_metadata(
 
     // Write timestamp dictionary
     compressor.write_numeric_value(ArchiveMetadataPacketType::TimestampDictionary);
-    m_timestamp_dict->write(compressor);
+    m_timestamp_dict.write(compressor);
 
     compressor.close();
 }
@@ -388,8 +387,8 @@ void ArchiveWriter::update_metadata_db() {
     metadata.increment_static_compressed_size(m_compressed_size);
     metadata.increment_static_uncompressed_size(m_uncompressed_size);
     metadata.expand_time_range(
-            m_timestamp_dict->get_begin_timestamp(),
-            m_timestamp_dict->get_end_timestamp()
+            m_timestamp_dict.get_begin_timestamp(),
+            m_timestamp_dict.get_end_timestamp()
     );
 
     m_metadata_db->add_archive(m_id, metadata);

components/core/src/clp_s/ArchiveWriter.hpp

@@ -121,7 +121,7 @@ class ArchiveWriter {
             std::string const& timestamp,
             uint64_t& pattern_id
     ) {
-        return m_timestamp_dict->ingest_entry(key, node_id, timestamp, pattern_id);
+        return m_timestamp_dict.ingest_entry(key, node_id, timestamp, pattern_id);
     }
 
     /**
@@ -131,11 +131,11 @@ class ArchiveWriter {
      * @param timestamp
      */
     void ingest_timestamp_entry(std::string const& key, int32_t node_id, double timestamp) {
-        m_timestamp_dict->ingest_entry(key, node_id, timestamp);
+        m_timestamp_dict.ingest_entry(key, node_id, timestamp);
     }
 
     void ingest_timestamp_entry(std::string const& key, int32_t node_id, int64_t timestamp) {
-        m_timestamp_dict->ingest_entry(key, node_id, timestamp);
+        m_timestamp_dict.ingest_entry(key, node_id, timestamp);
     }
 
     /**
@@ -229,7 +229,7 @@ class ArchiveWriter {
     std::shared_ptr<VariableDictionaryWriter> m_var_dict;
     std::shared_ptr<LogTypeDictionaryWriter> m_log_dict;
     std::shared_ptr<LogTypeDictionaryWriter> m_array_dict;  // log type dictionary for arrays
-    std::shared_ptr<TimestampDictionaryWriter> m_timestamp_dict;
+    TimestampDictionaryWriter m_timestamp_dict;
     std::shared_ptr<clp::GlobalMySQLMetadataDB> m_metadata_db;
     int m_compression_level{};
     bool m_print_archive_stats{};

components/core/src/clp_s/TimestampDictionaryWriter.cpp

@@ -149,4 +149,11 @@ epochtime_t TimestampDictionaryWriter::get_end_timestamp() const {
 
     return it->second.get_end_timestamp();
 }
+
+void TimestampDictionaryWriter::clear() {
+    m_next_id = 0;
+    m_pattern_to_id.clear();
+    m_column_key_to_range.clear();
+    m_column_id_to_range.clear();
+}
 }  // namespace clp_s

components/core/src/clp_s/TimestampDictionaryWriter.hpp

@@ -1,6 +1,7 @@
 #ifndef CLP_S_TIMESTAMPDICTIONARYWRITER_HPP
 #define CLP_S_TIMESTAMPDICTIONARYWRITER_HPP
 
+#include <map>
 #include <string>
 #include <unordered_map>
 #include <utility>
@@ -77,6 +78,11 @@ class TimestampDictionaryWriter {
      */
     epochtime_t get_end_timestamp() const;
 
+    /**
+     * Clears and resets all internal state.
+     */
+    void clear();
+
 private:
     /**
      * Merges timestamp ranges with the same key name but different node ids.