components/core/src/clp_s/ArchiveWriter.cpp (1)

118-120: Consider extracting cleanup logic into a separate method.

The cleanup of timestamp-related member variables is correct, but could be extracted into a dedicated method like reset_timestamp_state() to improve maintainability and reusability.

 void ArchiveWriter::close() {
     // ... existing code ...
-    m_authoritative_timestamp.clear();
-    m_matched_timestamp_prefix_length = 0ULL;
-    m_matched_timestamp_prefix_node_id = constants::cRootNodeId;
+    reset_timestamp_state();
 }
+
+void ArchiveWriter::reset_timestamp_state() {
+    m_authoritative_timestamp.clear();
+    m_matched_timestamp_prefix_length = 0ULL;
+    m_matched_timestamp_prefix_node_id = constants::cRootNodeId;
+}

components/core/src/clp_s/JsonParser.hpp (3)

124-139: Documentation needs update for new parameter.

The documentation is missing the @param matches_timestamp entry and the return value description could be more specific about returning a node ID.

Add the following to the documentation:

     * @param parent_node_id ID of the parent of the IR node
+    * @param matches_timestamp Whether the node matches the timestamp column
     * @return The ID of the node added to the archive's Schema Tree

---

142-153: Documentation could be clearer about return value components.

The return value description could be more specific about the components of the returned pair.

Suggest updating the return description to:

-    * @return The ID of the corresponding node in the archive's schema tree and a flag indicating
-    * whether the field should be treated as a timestamp.
+    * @return A pair containing:
+    *         - first: The ID of the corresponding node in the archive's schema tree
+    *         - second: A flag indicating whether the field should be treated as a timestamp

---

216-217: Consider adding member variable documentation.

The member variable m_ir_node_to_archive_node_id_mapping lacks documentation explaining its purpose and the meaning of its components.

Add documentation above the member variable:

    /**
     * Maps IR node ID and type to archive node ID and timestamp flag.
     * The key is a pair of (IR node ID, node type).
     * The value is a pair of (archive node ID, is timestamp flag).
     */
    absl::flat_hash_map<std::pair<uint32_t, NodeType>, std::pair<int32_t, bool>>
            m_ir_node_to_archive_node_id_mapping;

components/core/src/clp_s/ArchiveWriter.hpp (4)

28-28: Consider clarifying the usage of multiple timestamps.

Storing multiple strings in authoritative_timestamp is perfectly valid. However, if only a single authoritative timestamp is typically required, you may wish to document whether multiple entries are supported or expected.

---

100-119: Validate prefix matching logic and handle mismatches carefully.

The incremental matching approach is logical. However, consider ensuring that m_matched_timestamp_prefix_length is reset or handled explicitly if a mismatch occurs. Additionally, you could use m_authoritative_timestamp.empty() instead of m_authoritative_timestamp.size() > 0 for clarity.

---

121-136: Mark the method as const and simplify the difference check.

The implementation looks correct. You can declare matches_timestamp(...) as a const method since it does not modify member variables. Also, consider storing the difference (m_authoritative_timestamp.size() - m_matched_timestamp_prefix_length) in a local variable for readability.

---

273-275: Add explanatory comments for new fields.

These new member variables support authoritative timestamp tracking. Adding doxygen or inline comments describing their purpose and usage would improve maintainability.

components/core/src/clp_s/JsonParser.cpp (1)

634-647: Adjust numeric timestamps if applicable
The logic correctly converts string-based node types to DateString whenever matches_timestamp is true. If numeric timestamps are intended to be stored in a specialized type (e.g., Integer vs. DateInteger), consider extending this function’s logic.

Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro

components/core/src/clp_s/ArchiveWriter.cpp (2)

240-259: Refactor the node addition logic for better readability and maintainability.

The timestamp matching logic in add_node could be simplified and made more maintainable:

1. Use !m_authoritative_timestamp.empty() instead of size comparison
2. Consider restructuring with early returns to reduce nesting
3. Add comments explaining the timestamp matching algorithm

 int32_t ArchiveWriter::add_node(int parent_node_id, NodeType type, std::string_view key) {
     auto const node_id{m_schema_tree.add_node(parent_node_id, type, key)};
-    if (m_matched_timestamp_prefix_node_id == parent_node_id
-        && m_authoritative_timestamp.size() > 0)
+    // Skip timestamp matching if no authoritative timestamp is set
+    if (m_authoritative_timestamp.empty()) {
+        return node_id;
+    }
+
+    // Only process nodes that extend the current matched prefix
+    if (m_matched_timestamp_prefix_node_id != parent_node_id) {
+        return node_id;
+    }
+
+    // Match root object node
+    if (constants::cRootNodeId == parent_node_id && NodeType::Object == type) {
+        m_matched_timestamp_prefix_node_id = node_id;
+        return node_id;
+    }
+
+    // Match intermediate object nodes in the timestamp path
+    if (m_authoritative_timestamp.size() - m_matched_timestamp_prefix_length > 1
+        && NodeType::Object == type
+        && m_authoritative_timestamp.at(m_matched_timestamp_prefix_length) == key)
     {
-        if (constants::cRootNodeId == parent_node_id) {
-            if (NodeType::Object == type) {
-                m_matched_timestamp_prefix_node_id = node_id;
-            }
-        } else if (m_authoritative_timestamp.size() - m_matched_timestamp_prefix_length > 1) {
-            if (NodeType::Object == type
-                && m_authoritative_timestamp.at(m_matched_timestamp_prefix_length) == key)
-            {
-                m_matched_timestamp_prefix_length += 1;
-                m_matched_timestamp_prefix_node_id = node_id;
-            }
-        }
+        m_matched_timestamp_prefix_length += 1;
+        m_matched_timestamp_prefix_node_id = node_id;
     }
     return node_id;

---

261-270: Add validation and documentation for timestamp matching logic.

The matches_timestamp method could benefit from:

1. Input validation for parent_node_id
2. Documentation explaining the timestamp matching algorithm
3. Early return for empty authoritative timestamp

+/**
+ * Checks if the given key at the specified parent node matches the last component
+ * of the authoritative timestamp path.
+ *
+ * @param parent_node_id The ID of the parent node to check
+ * @param key The key to match against the last component
+ * @return true if the key matches the last component of the authoritative timestamp
+ */
 bool ArchiveWriter::matches_timestamp(int parent_node_id, std::string_view key) {
+    if (m_authoritative_timestamp.empty()) {
+        return false;
+    }
+
     if (m_matched_timestamp_prefix_node_id == parent_node_id) {
         if (1 == (m_authoritative_timestamp.size() - m_matched_timestamp_prefix_length)
             && m_authoritative_timestamp.back() == key)

Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro