Fix cmake scripts.

Author: gibber9809

components/core/CMakeLists.txt

@@ -402,12 +402,6 @@ set(SOURCE_FILES_clp_s_unitTest
     src/clp_s/SchemaWriter.hpp
     src/clp_s/search/AddTimestampConditions.cpp
     src/clp_s/search/AddTimestampConditions.hpp
-    src/clp_s/search/clp_search/EncodedVariableInterpreter.cpp
-    src/clp_s/search/clp_search/EncodedVariableInterpreter.hpp
-    src/clp_s/search/clp_search/Grep.cpp
-    src/clp_s/search/clp_search/Grep.hpp
-    src/clp_s/search/clp_search/Query.cpp
-    src/clp_s/search/clp_search/Query.hpp
     src/clp_s/search/EvaluateRangeIndexFilters.cpp
     src/clp_s/search/EvaluateRangeIndexFilters.hpp
     src/clp_s/search/EvaluateTimestampIndex.cpp
@@ -429,10 +423,6 @@ set(SOURCE_FILES_clp_s_unitTest
     src/clp_s/TimestampEntry.hpp
     src/clp_s/Utils.cpp
     src/clp_s/Utils.hpp
-    src/clp_s/VariableDecoder.cpp
-    src/clp_s/VariableDecoder.hpp
-    src/clp_s/VariableEncoder.cpp
-    src/clp_s/VariableEncoder.hpp
     src/clp_s/ZstdCompressor.cpp
     src/clp_s/ZstdCompressor.hpp
     src/clp_s/ZstdDecompressor.cpp

components/core/cmake/Options/options.cmake

@@ -312,6 +312,7 @@ endfunction()
 function(set_clp_s_search_dependencies)
     set_clp_need_flags(
         CLP_NEED_ABSL
+        CLP_NEED_LOG_SURGEON
         CLP_NEED_SIMDJSON
         CLP_NEED_SPDLOG
     )

components/core/src/clp_s/CMakeLists.txt

@@ -68,8 +68,8 @@ set(
         ../clp/ir/parsing.cpp
         ../clp/ir/parsing.hpp
         ../clp/ir/parsing.inc
-        ../clp/ir/LogSurgeonReader.cpp
-        ../clp/ir/LogSurgeonReader.hpp    
+        ../clp/LogSurgeonReader.cpp
+        ../clp/LogSurgeonReader.hpp    
         ../clp/NetworkReader.cpp
         ../clp/NetworkReader.hpp
         ../clp/networking/socket_utils.cpp
@@ -92,8 +92,8 @@ set(
         ../clp/StringReader.hpp
         ../clp/Thread.cpp
         ../clp/Thread.hpp
-        ../clp/TraceableException.hpp
         ../clp/time_types.hpp
+        ../clp/TraceableException.hpp
         ../clp/type_utils.hpp
         ../clp/utf8_utils.cpp
         ../clp/utf8_utils.hpp
@@ -245,8 +245,6 @@ set(
         TraceableException.hpp
         Utils.cpp
         Utils.hpp
-        VariableEncoder.cpp
-        VariableEncoder.hpp
 )
 
 if(CLP_BUILD_CLP_S_ARCHIVEWRITER)
@@ -308,8 +306,6 @@ set(
         TraceableException.hpp
         Utils.cpp
         Utils.hpp
-        VariableDecoder.cpp
-        VariableDecoder.hpp
 )
 
 if(CLP_BUILD_CLP_S_ARCHIVEREADER)

components/core/src/clp_s/indexer/CMakeLists.txt

@@ -13,12 +13,36 @@ set(
         ../../clp/CurlStringList.hpp
         ../../clp/database_utils.cpp
         ../../clp/database_utils.hpp
+        ../../clp/Defs.h
+        ../../clp/EncodedVariableInterpreter.cpp
+        ../../clp/EncodedVariableInterpreter.hpp 
+        ../../clp/ErrorCode.hpp
+        ../../clp/ffi/encoding_methods.cpp
+        ../../clp/ffi/encoding_methods.hpp
+        ../../clp/ffi/encoding_methods.inc
+        ../../clp/ffi/ir_stream/byteswap.hpp
+        ../../clp/ffi/ir_stream/decoding_methods.cpp
+        ../../clp/ffi/ir_stream/decoding_methods.hpp
+        ../../clp/ffi/ir_stream/decoding_methods.inc
+        ../../clp/ffi/ir_stream/protocol_constants.hpp
+        ../../clp/ffi/ir_stream/utils.cpp
+        ../../clp/ffi/ir_stream/utils.hpp
+        ../../clp/ffi/SchemaTree.cpp
+        ../../clp/ffi/SchemaTree.hpp
         ../../clp/FileReader.cpp
         ../../clp/FileReader.hpp
         ../../clp/GlobalMetadataDBConfig.cpp
         ../../clp/GlobalMetadataDBConfig.hpp
         ../../clp/hash_utils.cpp
         ../../clp/hash_utils.hpp
+        ../../clp/ir/LogEvent.hpp
+        ../../clp/ir/types.hpp
+        ../../clp/ir/constants.hpp
+        ../../clp/ir/EncodedTextAst.cpp
+        ../../clp/ir/EncodedTextAst.hpp
+        ../../clp/ir/parsing.cpp
+        ../../clp/ir/parsing.hpp
+        ../../clp/ir/parsing.inc
         ../../clp/MySQLDB.cpp
         ../../clp/MySQLDB.hpp
         ../../clp/MySQLParamBindings.cpp
@@ -27,10 +51,15 @@ set(
         ../../clp/MySQLPreparedStatement.hpp
         ../../clp/NetworkReader.cpp
         ../../clp/NetworkReader.hpp
+        ../../clp/Query.cpp
+        ../../clp/Query.hpp
         ../../clp/ReaderInterface.cpp
         ../../clp/ReaderInterface.hpp
         ../../clp/Thread.cpp
         ../../clp/Thread.hpp
+        ../../clp/time_types.hpp
+        ../../clp/TraceableException.hpp
+        ../../clp/type_utils.hpp
         ../archive_constants.hpp
         ../ArchiveReader.cpp
         ../ArchiveReader.hpp
@@ -65,8 +94,6 @@ set(
         ../TimestampPattern.hpp
         ../Utils.cpp
         ../Utils.hpp
-        ../VariableDecoder.cpp
-        ../VariableDecoder.hpp
         ../ZstdCompressor.cpp
         ../ZstdCompressor.hpp
         ../ZstdDecompressor.cpp

components/core/src/clp_s/search/CMakeLists.txt

@@ -9,16 +9,8 @@ set(
         ../DictionaryEntry.hpp
         ../DictionaryWriter.cpp
         ../DictionaryWriter.hpp
-        ../VariableEncoder.cpp
-        ../VariableEncoder.hpp
         AddTimestampConditions.cpp
         AddTimestampConditions.hpp
-        clp_search/EncodedVariableInterpreter.cpp
-        clp_search/EncodedVariableInterpreter.hpp
-        clp_search/Grep.cpp
-        clp_search/Grep.hpp
-        clp_search/Query.cpp
-        clp_search/Query.hpp
         EvaluateRangeIndexFilters.cpp
         EvaluateRangeIndexFilters.hpp
         EvaluateTimestampIndex.cpp
@@ -48,6 +40,7 @@ if(CLP_BUILD_CLP_S_SEARCH)
                 absl::flat_hash_map
                 clp_s::archive_reader
                 clp_s::search::ast
+                log_surgeon::log_surgeon
                 simdjson::simdjson
                 PRIVATE
                 clp::string_utils