Merge

Author: LinZhihao-723

components/core/CMakeLists.txt

@@ -7,6 +7,8 @@ if (NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
     set(CMAKE_BUILD_TYPE "${default_build_type}" CACHE STRING "Choose the type of build." FORCE)
 endif()
 
+set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
+
 # Set general compressor
 set(GENERAL_COMPRESSOR "zstd" CACHE STRING "The general-purpose compressor used as the 2nd-stage compressor")
 set_property(CACHE GENERAL_COMPRESSOR PROPERTY STRINGS passthrough zstd)

components/core/src/EncodedVariableInterpreter.cpp

@@ -319,6 +319,8 @@ bool EncodedVariableInterpreter::decode_variables_into_message (const LogTypeDic
                 var_dict_id = decode_var_dict_id(encoded_vars[i]);
                 decompressed_msg += var_dict.get_value(var_dict_id);
                 break;
+            case ir::VariablePlaceholder::Escape:
+                break;
             default:
                 SPDLOG_ERROR(
                     "EncodedVariableInterpreter: Logtype '{}' contains "

components/core/src/LogTypeDictionaryEntry.cpp

@@ -46,18 +46,25 @@ void LogTypeDictionaryEntry::add_float_var () {
     add_float_var(m_value);
 }
 
+void LogTypeDictionaryEntry::add_escape_var() {
+    m_var_positions.push_back(m_value.length());
+    add_escape_var(m_value);
+}
+
 bool LogTypeDictionaryEntry::parse_next_var (const string& msg, size_t& var_begin_pos, size_t& var_end_pos, string& var) {
     auto last_var_end_pos = var_end_pos;
     if (ir::get_bounds_of_next_var(msg, var_begin_pos, var_end_pos)) {
         // Append to log type: from end of last variable to start of current variable
-        add_constant(msg, last_var_end_pos, var_begin_pos - last_var_end_pos);
+        auto constant = std::string_view(msg).substr(last_var_end_pos, var_begin_pos - last_var_end_pos);
+        ir::escape_and_append_constant_to_logtype(constant, m_value);
 
         var.assign(msg, var_begin_pos, var_end_pos - var_begin_pos);
         return true;
     }
     if (last_var_end_pos < msg.length()) {
         // Append to log type: from end of last variable to end
-        add_constant(msg, last_var_end_pos, msg.length() - last_var_end_pos);
+        auto constant = std::string_view(msg).substr(last_var_end_pos, msg.length() - last_var_end_pos);
+        ir::escape_and_append_constant_to_logtype(constant, m_value);
     }
 
     return false;
@@ -71,10 +78,8 @@ void LogTypeDictionaryEntry::clear () {
 void LogTypeDictionaryEntry::write_to_file (streaming_compression::Compressor& compressor) const {
     compressor.write_numeric_value(m_id);
 
-    string escaped_value;
-    get_value_with_unfounded_variables_escaped(escaped_value);
-    compressor.write_numeric_value<uint64_t>(escaped_value.length());
-    compressor.write_string(escaped_value);
+    compressor.write_numeric_value<uint64_t>(m_value.length());
+    compressor.write_string(m_value);
 }
 
 ErrorCode LogTypeDictionaryEntry::try_read_from_file (streaming_compression::Decompressor& decompressor) {
@@ -109,6 +114,9 @@ ErrorCode LogTypeDictionaryEntry::try_read_from_file (streaming_compression::Dec
             is_escaped = false;
         } else if (ir::cVariablePlaceholderEscapeCharacter == c) {
             is_escaped = true;
+            add_constant(constant, 0, constant.length());
+            constant.clear();
+            add_escape_var();
         } else {
             if (enum_to_underlying_type(ir::VariablePlaceholder::Integer) == c) {
                 add_constant(constant, 0, constant.length());

components/core/src/LogTypeDictionaryEntry.hpp

@@ -63,6 +63,13 @@ class LogTypeDictionaryEntry : public DictionaryEntry<logtype_dictionary_id_t> {
     static void add_float_var (std::string& logtype) {
         logtype += enum_to_underlying_type(ir::VariablePlaceholder::Float);
     }
+    /**
+     * Adds an escape variable placeholder to the given logtype
+     * @param logtype
+     */
+    static void add_escape_var (std::string& logtype) {
+        logtype += enum_to_underlying_type(ir::VariablePlaceholder::Escape);
+    }
 
     size_t get_num_vars () const { return m_var_positions.size(); }
     /**
@@ -98,6 +105,10 @@ class LogTypeDictionaryEntry : public DictionaryEntry<logtype_dictionary_id_t> {
      * Adds a dictionary variable placeholder
      */
     void add_dictionary_var ();
+    /**
+     * Adds an escape variable placeholder
+     */
+    void add_escape_var ();
 
     /**
      * Parses next variable from a message, constructing the constant part of the message's logtype as well

components/core/src/ir/parsing.hpp

@@ -17,6 +17,7 @@ enum class VariablePlaceholder : char {
     Integer = 0x11,
     Dictionary = 0x12,
     Float = 0x13,
+    Escape = 0x5c,
 };
 
 constexpr char cVariablePlaceholderEscapeCharacter = '\\';