From 6476f4f5263aee7b315f5b7893a76d8d14dd5c97 Mon Sep 17 00:00:00 2001
From: ChenXing Yang <20001020ycx@gmail.com>
Date: Thu, 22 Jan 2026 14:00:31 -0800
Subject: [PATCH 1/2] update to clpv0.8.0

---
 CMake/resolve_dependency_modules/clp.cmake    |  2 +-
 .../search_lib/archive/ClpArchiveCursor.cpp   |  4 ++--
 .../clp/search_lib/ir/ClpIrVectorLoader.cpp   | 22 +++++++++----------
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/CMake/resolve_dependency_modules/clp.cmake b/CMake/resolve_dependency_modules/clp.cmake
index e94317115db..72e5e65b9f4 100644
--- a/CMake/resolve_dependency_modules/clp.cmake
+++ b/CMake/resolve_dependency_modules/clp.cmake
@@ -16,7 +16,7 @@ include_guard(GLOBAL)
 FetchContent_Declare(
   clp
   GIT_REPOSITORY https://github.com/y-scope/clp.git
-  GIT_TAG 9e991ab49681faff0aea259a37b489c3f416e06e)
+  GIT_TAG v0.8.0)
 
 set(CLP_BUILD_CLP_REGEX_UTILS
     OFF
diff --git a/velox/connectors/clp/search_lib/archive/ClpArchiveCursor.cpp b/velox/connectors/clp/search_lib/archive/ClpArchiveCursor.cpp
index 88c4f0b40c7..fbd5365050d 100644
--- a/velox/connectors/clp/search_lib/archive/ClpArchiveCursor.cpp
+++ b/velox/connectors/clp/search_lib/archive/ClpArchiveCursor.cpp
@@ -173,7 +173,7 @@ ErrorCode ClpArchiveCursor::loadSplit() {
         case ColumnType::String:
           columnDescriptor->set_matching_types(
               LiteralType::ClpStringT | LiteralType::VarStringT |
-              LiteralType::EpochDateT);
+              LiteralType::TimestampT);
           break;
         case ColumnType::Integer:
           columnDescriptor->set_matching_types(LiteralType::IntegerT);
@@ -189,7 +189,7 @@ ErrorCode ClpArchiveCursor::loadSplit() {
           break;
         case ColumnType::Timestamp:
           columnDescriptor->set_matching_types(
-              LiteralType::EpochDateT | LiteralType::IntegerT |
+              LiteralType::TimestampT | LiteralType::IntegerT |
               LiteralType::FloatT);
           break;
         default:
diff --git a/velox/connectors/clp/search_lib/ir/ClpIrVectorLoader.cpp b/velox/connectors/clp/search_lib/ir/ClpIrVectorLoader.cpp
index f4320021964..1da3fb387eb 100644
--- a/velox/connectors/clp/search_lib/ir/ClpIrVectorLoader.cpp
+++ b/velox/connectors/clp/search_lib/ir/ClpIrVectorLoader.cpp
@@ -55,18 +55,18 @@ void ClpIrVectorLoader::loadInternal(
         if (value->is<std::string>()) {
           auto stringValue = value->get_immutable_view<std::string>();
           stringVector->set(vectorIndex, StringView(stringValue));
-        } else if (value->is<::clp::ir::EightByteEncodedTextAst>()) {
+        } else if (value->is<::clp::ffi::EightByteEncodedTextAst>()) {
           auto decodeResult =
-              value->get_immutable_view<::clp::ir::EightByteEncodedTextAst>()
-                  .decode_and_unparse();
+              value->get_immutable_view<::clp::ffi::EightByteEncodedTextAst>()
+                  .to_string();
           if (!decodeResult.has_value()) {
             continue;
           }
           stringVector->set(vectorIndex, StringView(decodeResult.value()));
-        } else if (value->is<::clp::ir::FourByteEncodedTextAst>()) {
+        } else if (value->is<::clp::ffi::FourByteEncodedTextAst>()) {
           auto decodeResult =
-              value->get_immutable_view<::clp::ir::FourByteEncodedTextAst>()
-                  .decode_and_unparse();
+              value->get_immutable_view<::clp::ffi::FourByteEncodedTextAst>()
+                  .to_string();
           if (!decodeResult.has_value()) {
             continue;
           }
@@ -117,18 +117,18 @@ void ClpIrVectorLoader::loadInternal(
       case ColumnType::Array: {
         auto arrayVector = std::dynamic_pointer_cast<ArrayVector>(vector);
         std::string jsonString;
-        if (value->is<::clp::ir::EightByteEncodedTextAst>()) {
+        if (value->is<::clp::ffi::EightByteEncodedTextAst>()) {
           auto decodeResult =
-              value->get_immutable_view<::clp::ir::EightByteEncodedTextAst>()
-                  .decode_and_unparse();
+              value->get_immutable_view<::clp::ffi::EightByteEncodedTextAst>()
+                  .to_string();
           if (!decodeResult.has_value()) {
             continue;
           }
           jsonString = std::move(decodeResult.value());
         } else {
           auto decodeResult =
-              value->get_immutable_view<::clp::ir::FourByteEncodedTextAst>()
-                  .decode_and_unparse();
+              value->get_immutable_view<::clp::ffi::FourByteEncodedTextAst>()
+                  .to_string();
           if (!decodeResult.has_value()) {
             continue;
           }

From 4d8c2dcb595c06382b567a19bf192277bea039a9 Mon Sep 17 00:00:00 2001
From: ChenXing Yang <20001020ycx@gmail.com>
Date: Tue, 27 Jan 2026 10:53:09 -0800
Subject: [PATCH 2/2] address review comment

---
 velox/connectors/clp/search_lib/archive/ClpArchiveCursor.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/velox/connectors/clp/search_lib/archive/ClpArchiveCursor.cpp b/velox/connectors/clp/search_lib/archive/ClpArchiveCursor.cpp
index fbd5365050d..4953c585f37 100644
--- a/velox/connectors/clp/search_lib/archive/ClpArchiveCursor.cpp
+++ b/velox/connectors/clp/search_lib/archive/ClpArchiveCursor.cpp
@@ -172,8 +172,7 @@ ErrorCode ClpArchiveCursor::loadSplit() {
       switch (column.type) {
         case ColumnType::String:
           columnDescriptor->set_matching_types(
-              LiteralType::ClpStringT | LiteralType::VarStringT |
-              LiteralType::TimestampT);
+              LiteralType::ClpStringT | LiteralType::VarStringT);
           break;
         case ColumnType::Integer:
           columnDescriptor->set_matching_types(LiteralType::IntegerT);