Skip to content

Commit

Permalink
build: Update to the latest clp submodule commit. (#85)
Browse files Browse the repository at this point in the history
  • Loading branch information
LinZhihao-723 authored Nov 9, 2024
1 parent 9bb25ec commit 81ecf85
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 8 deletions.
2 changes: 1 addition & 1 deletion src/clp
Submodule clp updated 55 files
+5 −4 .github/workflows/clp-core-build-macos.yaml
+2 −2 .github/workflows/clp-core-build.yaml
+3 −3 Taskfile.yml
+1 −1 components/core/CMakeLists.txt
+57 −5 components/core/src/clp/CurlDownloadHandler.cpp
+9 −1 components/core/src/clp/CurlDownloadHandler.hpp
+13 −3 components/core/src/clp/NetworkReader.cpp
+18 −3 components/core/src/clp/NetworkReader.hpp
+6 −9 components/core/src/clp/ffi/ir_stream/Deserializer.hpp
+1 −1 components/core/src/clp/ffi/ir_stream/Serializer.cpp
+28 −17 components/core/src/clp/ffi/ir_stream/decoding_methods.cpp
+18 −13 components/core/src/clp/ffi/ir_stream/decoding_methods.hpp
+2 −1 components/core/src/clp/ffi/ir_stream/encoding_methods.cpp
+5 −2 components/core/src/clp/ffi/ir_stream/protocol_constants.hpp
+1 −1 components/core/src/clp/ir/LogEventDeserializer.cpp
+87 −37 components/core/src/clp_s/ArchiveReader.cpp
+23 −5 components/core/src/clp_s/ArchiveReader.hpp
+100 −12 components/core/src/clp_s/ArchiveWriter.cpp
+29 −0 components/core/src/clp_s/ArchiveWriter.hpp
+2 −0 components/core/src/clp_s/CMakeLists.txt
+19 −25 components/core/src/clp_s/ColumnWriter.cpp
+26 −16 components/core/src/clp_s/ColumnWriter.hpp
+5 −0 components/core/src/clp_s/CommandLineArguments.cpp
+3 −0 components/core/src/clp_s/CommandLineArguments.hpp
+1 −0 components/core/src/clp_s/JsonParser.cpp
+1 −0 components/core/src/clp_s/JsonParser.hpp
+117 −0 components/core/src/clp_s/PackedStreamReader.cpp
+97 −0 components/core/src/clp_s/PackedStreamReader.hpp
+7 −11 components/core/src/clp_s/SchemaReader.cpp
+10 −8 components/core/src/clp_s/SchemaReader.hpp
+9 −12 components/core/src/clp_s/SchemaWriter.cpp
+6 −7 components/core/src/clp_s/SchemaWriter.hpp
+1 −0 components/core/src/clp_s/clp-s.cpp
+1 −1 components/core/src/clp_s/search/Output.cpp
+58 −0 components/core/tests/test-NetworkReader.cpp
+61 −15 components/core/tests/test-ir_encoding_methods.cpp
+1 −1 components/core/tools/scripts/lib_install/centos-stream-9/install-packages-from-source.sh
+0 −0 components/core/tools/scripts/lib_install/macos/install-all.sh
+1 −1 components/core/tools/scripts/lib_install/ubuntu-focal/install-packages-from-source.sh
+1 −1 components/core/tools/scripts/lib_install/ubuntu-jammy/install-packages-from-source.sh
+1,968 −1,921 components/log-viewer-webui/client/package-lock.json
+2 −2 components/log-viewer-webui/client/package.json
+1 −1 components/log-viewer-webui/client/src/App.jsx
+1 −1 components/log-viewer-webui/client/src/typings/LOCAL_STORAGE_KEY.js
+1 −1 components/log-viewer-webui/client/src/ui/QueryStatus.jsx
+1,961 −926 components/log-viewer-webui/server/package-lock.json
+2 −2 components/log-viewer-webui/server/src/DbManager.js
+1 −1 components/log-viewer-webui/yscope-log-viewer
+397 −343 components/webui/package-lock.json
+1 −1 components/webui/package.json
+2 −2 deps-tasks.yml
+2 −2 docs/src/dev-guide/components-core/index.md
+2 −2 docs/src/dev-guide/components-core/macos-deps-install.md
+1 −1 requirements.txt
+1 −1 tools/yscope-dev-utils
13 changes: 6 additions & 7 deletions src/clp_ffi_py/ir/native/deserialization_methods.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -262,16 +262,15 @@ auto deserialize_preamble(PyObject* Py_UNUSED(self), PyObject* py_deserializer_b
static_cast<char const*>(clp::ffi::ir_stream::cProtocol::Metadata::VersionKey)
)};
auto const error_code{clp::ffi::ir_stream::validate_protocol_version(version)};
if (IRProtocolErrorCode::IRProtocolErrorCode_Supported != error_code) {
if (IRProtocolErrorCode::BackwardCompatible != error_code) {
switch (error_code) {
case IRProtocolErrorCode::IRProtocolErrorCode_Invalid:
PyErr_Format(PyExc_RuntimeError, "Invalid version number: %s", version.c_str());
break;
case IRProtocolErrorCode::IRProtocolErrorCode_Too_New:
case IRProtocolErrorCode::Supported:
// This represents a key-value pair IR stream, which is not supported by these
// old deserialization methods.
PyErr_Format(PyExc_RuntimeError, "Version too new: %s", version.c_str());
break;
case IRProtocolErrorCode::IRProtocolErrorCode_Too_Old:
PyErr_Format(PyExc_RuntimeError, "Version too old: %s", version.c_str());
case IRProtocolErrorCode::Unsupported:
PyErr_Format(PyExc_RuntimeError, "Version unsupported: %s", version.c_str());
break;
default:
PyErr_Format(
Expand Down

0 comments on commit 81ecf85

Please sign in to comment.