Skip to content

chore: Upgrade CLP dependency to v0.8.0. #47

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
20001020ycx merged 4 commits into from
Feb 18, 2026
Merged

chore: Upgrade CLP dependency to v0.8.0. #47

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6476f4f
update to clpv0.8.0
20001020ycx Jan 22, 2026
38a1b08
Merge branch 'presto-0.293-clp-connector' of https://github.com/y-sco…
20001020ycx Jan 22, 2026
4d8c2dc
address review comment
20001020ycx Jan 27, 2026
f085481
Merge branch 'presto-0.293-clp-connector' into 2026-01-22-update-clp
20001020ycx Feb 18, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CMake/resolve_dependency_modules/clp.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 2 additions & 3 deletions velox/connectors/clp/search_lib/archive/ClpArchiveCursor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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:
Expand Down
22 changes: 11 additions & 11 deletions velox/connectors/clp/search_lib/ir/ClpIrVectorLoader.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down Expand Up @@ -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;
}
Expand Down