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..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::EpochDateT); + LiteralType::ClpStringT | LiteralType::VarStringT); break; case ColumnType::Integer: columnDescriptor->set_matching_types(LiteralType::IntegerT); @@ -189,7 +188,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()) { auto stringValue = value->get_immutable_view(); 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(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; }