From 49521ce11778aca2f5b61b924e68a881a4ab75b2 Mon Sep 17 00:00:00 2001 From: kirkrodrigues <2454684+kirkrodrigues@users.noreply.github.com> Date: Fri, 10 Nov 2023 01:39:44 -0500 Subject: [PATCH] Update to the latest clp submodule commit. (#39) --- CMakeLists.txt | 11 +++++++---- .../Java_EightByteClpWildcardQueryEncoder.cpp | 9 +++++---- src/main/cpp/libclp_ffi_java/Java_MessageDecoder.cpp | 3 ++- src/main/cpp/libclp_ffi_java/common.hpp | 2 +- .../cpp/libclp_ffi_java/{common.tpp => common.inc} | 6 +++--- src/main/cpp/libclp_ffi_java/ir_stream/common.hpp | 2 +- .../ir_stream/{common.tpp => common.inc} | 6 +++--- src/main/cpp/submodules/clp | 2 +- 8 files changed, 23 insertions(+), 18 deletions(-) rename src/main/cpp/libclp_ffi_java/{common.tpp => common.inc} (98%) rename src/main/cpp/libclp_ffi_java/ir_stream/{common.tpp => common.inc} (97%) diff --git a/CMakeLists.txt b/CMakeLists.txt index d11d758..7bdff51 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -26,10 +26,10 @@ add_library(clp-ffi-java SHARED src/main/cpp/libclp_ffi_java/ClpIrOutputStreamState.hpp src/main/cpp/libclp_ffi_java/common.cpp src/main/cpp/libclp_ffi_java/common.hpp - src/main/cpp/libclp_ffi_java/common.tpp + src/main/cpp/libclp_ffi_java/common.inc src/main/cpp/libclp_ffi_java/GeneralException.hpp src/main/cpp/libclp_ffi_java/ir_stream/common.hpp - src/main/cpp/libclp_ffi_java/ir_stream/common.tpp + src/main/cpp/libclp_ffi_java/ir_stream/common.inc src/main/cpp/libclp_ffi_java/Java_AbstractClpIrOutputStream.cpp src/main/cpp/libclp_ffi_java/Java_AbstractClpWildcardQueryEncoder.cpp src/main/cpp/libclp_ffi_java/Java_EightByteClpIrOutputStream.cpp @@ -45,7 +45,7 @@ add_library(clp-ffi-java SHARED src/main/cpp/libclp_ffi_java/static_init.hpp src/main/cpp/submodules/clp/components/core/src/ffi/encoding_methods.cpp src/main/cpp/submodules/clp/components/core/src/ffi/encoding_methods.hpp - src/main/cpp/submodules/clp/components/core/src/ffi/encoding_methods.tpp + src/main/cpp/submodules/clp/components/core/src/ffi/encoding_methods.inc src/main/cpp/submodules/clp/components/core/src/ffi/ir_stream/encoding_methods.cpp src/main/cpp/submodules/clp/components/core/src/ffi/ir_stream/encoding_methods.hpp src/main/cpp/submodules/clp/components/core/src/ffi/ir_stream/protocol_constants.hpp @@ -63,9 +63,11 @@ add_library(clp-ffi-java SHARED src/main/cpp/submodules/clp/components/core/src/ffi/search/Subquery.hpp src/main/cpp/submodules/clp/components/core/src/ffi/search/WildcardToken.cpp src/main/cpp/submodules/clp/components/core/src/ffi/search/WildcardToken.hpp + src/main/cpp/submodules/clp/components/core/src/ir/parsing.cpp + src/main/cpp/submodules/clp/components/core/src/ir/parsing.hpp src/main/cpp/submodules/clp/components/core/src/string_utils.cpp src/main/cpp/submodules/clp/components/core/src/string_utils.hpp - src/main/cpp/submodules/clp/components/core/src/string_utils.tpp + src/main/cpp/submodules/clp/components/core/src/string_utils.inc target/include/com_yscope_clp_compressorfrontend_MessageDecoder.h target/include/com_yscope_clp_compressorfrontend_MessageEncoder.h target/include/com_yscope_clp_irstream_AbstractClpIrOutputStream.h @@ -76,6 +78,7 @@ target_compile_features(clp-ffi-java PRIVATE cxx_std_17 ) target_include_directories(clp-ffi-java PRIVATE + ${CMAKE_SOURCE_DIR}/src/main/cpp/submodules/clp/components/core/submodules ${JNI_INCLUDE_DIRS} target/include ) diff --git a/src/main/cpp/libclp_ffi_java/Java_EightByteClpWildcardQueryEncoder.cpp b/src/main/cpp/libclp_ffi_java/Java_EightByteClpWildcardQueryEncoder.cpp index 08e5a3f..6f9d89e 100644 --- a/src/main/cpp/libclp_ffi_java/Java_EightByteClpWildcardQueryEncoder.cpp +++ b/src/main/cpp/libclp_ffi_java/Java_EightByteClpWildcardQueryEncoder.cpp @@ -12,6 +12,7 @@ #include "../submodules/clp/components/core/src/ffi/search/query_methods.hpp" #include "../submodules/clp/components/core/src/ffi/search/QueryMethodFailed.hpp" #include "../submodules/clp/components/core/src/ffi/search/WildcardToken.hpp" +#include "../submodules/clp/components/core/src/ir/parsing.hpp" #include "../submodules/clp/components/core/src/string_utils.hpp" #include "../submodules/clp/components/core/src/type_utils.hpp" #include "common.hpp" @@ -127,7 +128,7 @@ static jobjectArray encode_native ( for (const auto& query_var : query_vars) { auto success = std::visit(overloaded{ [&] (const EightByteExactVariableToken& var) { - if (ffi::VariablePlaceholder::Dictionary == var.get_placeholder()) { + if (ir::VariablePlaceholder::Dictionary == var.get_placeholder()) { // These static casts are safe since the original query // length is a jsize dict_var_bounds.push_back( @@ -144,17 +145,17 @@ static jobjectArray encode_native ( case ffi::search::TokenType::IntegerVariable: wildcard_var_placeholders.push_back( enum_to_underlying_type( - ffi::VariablePlaceholder::Integer)); + ir::VariablePlaceholder::Integer)); break; case ffi::search::TokenType::FloatVariable: wildcard_var_placeholders.push_back( enum_to_underlying_type( - ffi::VariablePlaceholder::Float)); + ir::VariablePlaceholder::Float)); break; case ffi::search::TokenType::DictionaryVariable: wildcard_var_placeholders.push_back( enum_to_underlying_type( - ffi::VariablePlaceholder::Dictionary)); + ir::VariablePlaceholder::Dictionary)); break; default: // This should never happen diff --git a/src/main/cpp/libclp_ffi_java/Java_MessageDecoder.cpp b/src/main/cpp/libclp_ffi_java/Java_MessageDecoder.cpp index fb39c48..c52a334 100644 --- a/src/main/cpp/libclp_ffi_java/Java_MessageDecoder.cpp +++ b/src/main/cpp/libclp_ffi_java/Java_MessageDecoder.cpp @@ -9,6 +9,7 @@ // Project headers #include "../submodules/clp/components/core/src/ffi/encoding_methods.hpp" +#include "../submodules/clp/components/core/src/ir/parsing.hpp" #include "../submodules/clp/components/core/src/string_utils.hpp" #include "../submodules/clp/components/core/src/type_utils.hpp" #include "common.hpp" @@ -16,9 +17,9 @@ using ffi::decode_message; using ffi::eight_byte_encoded_variable_t; -using ffi::VariablePlaceholder; using ffi::wildcard_match_encoded_vars; using ffi::wildcard_query_matches_any_encoded_var; +using ir::VariablePlaceholder; using libclp_ffi_java::cJSizeMax; using libclp_ffi_java::get_java_primitive_array_elements; using libclp_ffi_java::JavaExceptionOccurred; diff --git a/src/main/cpp/libclp_ffi_java/common.hpp b/src/main/cpp/libclp_ffi_java/common.hpp index 74cd7db..2c968d5 100644 --- a/src/main/cpp/libclp_ffi_java/common.hpp +++ b/src/main/cpp/libclp_ffi_java/common.hpp @@ -86,6 +86,6 @@ namespace libclp_ffi_java { ); } -#include "common.tpp" +#include "common.inc" #endif // LIBCLP_FFI_JAVA_COMMON_HPP diff --git a/src/main/cpp/libclp_ffi_java/common.tpp b/src/main/cpp/libclp_ffi_java/common.inc similarity index 98% rename from src/main/cpp/libclp_ffi_java/common.tpp rename to src/main/cpp/libclp_ffi_java/common.inc index e486b3b..31d7405 100644 --- a/src/main/cpp/libclp_ffi_java/common.tpp +++ b/src/main/cpp/libclp_ffi_java/common.inc @@ -1,5 +1,5 @@ -#ifndef LIBCLP_FFI_JAVA_COMMON_TPP -#define LIBCLP_FFI_JAVA_COMMON_TPP +#ifndef LIBCLP_FFI_JAVA_COMMON_INC +#define LIBCLP_FFI_JAVA_COMMON_INC // C++ standard libraries #include @@ -170,4 +170,4 @@ namespace libclp_ffi_java { } } -#endif // LIBCLP_FFI_JAVA_COMMON_TPP +#endif // LIBCLP_FFI_JAVA_COMMON_INC diff --git a/src/main/cpp/libclp_ffi_java/ir_stream/common.hpp b/src/main/cpp/libclp_ffi_java/ir_stream/common.hpp index ca3b73a..59398ad 100644 --- a/src/main/cpp/libclp_ffi_java/ir_stream/common.hpp +++ b/src/main/cpp/libclp_ffi_java/ir_stream/common.hpp @@ -60,6 +60,6 @@ namespace libclp_ffi_java::ir_stream { jint message_length); } -#include "common.tpp" +#include "common.inc" #endif //LIBCLP_FFI_JAVA_IR_STREAM_COMMON_HPP diff --git a/src/main/cpp/libclp_ffi_java/ir_stream/common.tpp b/src/main/cpp/libclp_ffi_java/ir_stream/common.inc similarity index 97% rename from src/main/cpp/libclp_ffi_java/ir_stream/common.tpp rename to src/main/cpp/libclp_ffi_java/ir_stream/common.inc index a36083a..8ccc8f5 100644 --- a/src/main/cpp/libclp_ffi_java/ir_stream/common.tpp +++ b/src/main/cpp/libclp_ffi_java/ir_stream/common.inc @@ -1,5 +1,5 @@ -#ifndef LIBCLP_FFI_JAVA_IR_STREAM_COMMON_TPP -#define LIBCLP_FFI_JAVA_IR_STREAM_COMMON_TPP +#ifndef LIBCLP_FFI_JAVA_IR_STREAM_COMMON_INC +#define LIBCLP_FFI_JAVA_IR_STREAM_COMMON_INC // C++ standard libraries #include @@ -125,4 +125,4 @@ namespace libclp_ffi_java::ir_stream { } } -#endif //LIBCLP_FFI_JAVA_IR_STREAM_COMMON_TPP +#endif //LIBCLP_FFI_JAVA_IR_STREAM_COMMON_INC diff --git a/src/main/cpp/submodules/clp b/src/main/cpp/submodules/clp index 28b19fe..2b884bd 160000 --- a/src/main/cpp/submodules/clp +++ b/src/main/cpp/submodules/clp @@ -1 +1 @@ -Subproject commit 28b19fefd4c61a2c5fd8955be7c3d47f226070d9 +Subproject commit 2b884bd6327c90f64cb31b1bdf98c0bcdcbb9f59