Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
Prev Previous commit
Next Next commit
Address reviewer's comments
  • Loading branch information
20001020ycx committed May 20, 2026
commit c85362ffbdceec081178d93b33c7ed978ea23a88
5 changes: 2 additions & 3 deletions velox-connector/.gitignore
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
build/
_build/
build*/
cmake-build-*/
dist/
*.o
*.so
*.a
*.a
2 changes: 1 addition & 1 deletion velox-connector/src/connector/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ target_include_directories(presto_clp_connector

target_link_libraries(presto_clp_connector
PUBLIC
clp_search
clp_connector_search
PRIVATE
clp_s::search
)
10 changes: 5 additions & 5 deletions velox-connector/src/connector/search_lib/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
add_subdirectory(archive)
add_subdirectory(ir)

add_library(clp_search STATIC
add_library(clp_connector_search STATIC
BaseClpCursor.cpp
ClpS3AuthProviderBase.cpp
ClpPackageS3AuthProvider.cpp
)
Comment thread
coderabbitai[bot] marked this conversation as resolved.
Resolved

target_include_directories(clp_search
target_include_directories(clp_connector_search
PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}/../..
${PRESTO_ROOT}
${PRESTO_ROOT}/velox
)

target_link_libraries(clp_search
target_link_libraries(clp_connector_search
PUBLIC
clp_search_archive
clp_search_ir
clp_connector_search_archive
clp_connector_search_ir
PRIVATE
clp_s::search::kql
clp_s::search::ast
Expand Down
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
add_library(clp_search_archive STATIC
add_library(clp_connector_search_archive STATIC
ClpArchiveCursor.cpp
ClpArchiveVectorLoader.cpp
ClpArchiveJsonStringVectorLoader.cpp
ClpQueryRunner.cpp
)

target_include_directories(clp_search_archive
target_include_directories(clp_connector_search_archive
PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}/../../..
${PRESTO_ROOT}
${PRESTO_ROOT}/velox
)

target_link_libraries(clp_search_archive
target_link_libraries(clp_connector_search_archive
PRIVATE
clp_s::archive_reader
clp_s::clp_dependencies
Expand Down
6 changes: 3 additions & 3 deletions velox-connector/src/connector/search_lib/ir/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
add_library(clp_search_ir STATIC
add_library(clp_connector_search_ir STATIC
ClpIrCursor.cpp
ClpIrVectorLoader.cpp
ClpIrJsonStringVectorLoader.cpp
)

target_include_directories(clp_search_ir
target_include_directories(clp_connector_search_ir
PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}/../../..
${PRESTO_ROOT}
${PRESTO_ROOT}/velox
)

target_link_libraries(clp_search_ir
target_link_libraries(clp_connector_search_ir
PRIVATE
clp_s::archive_reader
clp_s::clp_dependencies
Expand Down
2 changes: 1 addition & 1 deletion velox-connector/src/protocol/ClpConnectorProtocol.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -162,4 +162,4 @@ void ClpConnectorProtocol::deserialize(
proto = handle;
}

} // namespace facebook::presto::protocol::clp
} // namespace facebook::presto::protocol::clp
44 changes: 22 additions & 22 deletions velox-connector/src/protocol/ClpConnectorProtocol.h
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,11 @@ namespace facebook::presto::protocol::clp {
class ClpConnectorProtocol : public ConnectorProtocol {
public:
// --- ConnectorTableHandle ---
void to_json(json& j, const std::shared_ptr<ConnectorTableHandle>& p)
void to_json(json& j, const std::shared_ptr<ConnectorTableHandle>& proto)
const override {
VELOX_NYI("to_json not implemented");
}
void from_json(const json& j, std::shared_ptr<ConnectorTableHandle>& p)
void from_json(const json& j, std::shared_ptr<ConnectorTableHandle>& proto)
const override {
VELOX_NYI("from_json not implemented");
}
Expand All @@ -43,12 +43,12 @@ namespace facebook::presto::protocol::clp {
// --- ConnectorTableLayoutHandle ---
void to_json(
json& j,
const std::shared_ptr<ConnectorTableLayoutHandle>& p) const override {
const std::shared_ptr<ConnectorTableLayoutHandle>& proto) const override {
VELOX_NYI("to_json not implemented");
}
void from_json(
const json& j,
std::shared_ptr<ConnectorTableLayoutHandle>& p) const override {
std::shared_ptr<ConnectorTableLayoutHandle>& proto) const override {
VELOX_NYI("from_json not implemented");
}
void serialize(
Expand All @@ -61,11 +61,11 @@ namespace facebook::presto::protocol::clp {
std::shared_ptr<ConnectorTableLayoutHandle>& proto) const override;

// --- ColumnHandle ---
void to_json(json& j, const std::shared_ptr<ColumnHandle>& p)
void to_json(json& j, const std::shared_ptr<ColumnHandle>& proto)
const override {
VELOX_NYI("to_json not implemented");
}
void from_json(const json& j, std::shared_ptr<ColumnHandle>& p)
void from_json(const json& j, std::shared_ptr<ColumnHandle>& proto)
const override {
VELOX_NYI("from_json not implemented");
}
Expand All @@ -79,11 +79,11 @@ namespace facebook::presto::protocol::clp {
std::shared_ptr<ColumnHandle>& proto) const override;

// --- ConnectorInsertTableHandle ---
void to_json(json& j, const std::shared_ptr<ConnectorInsertTableHandle>& p)
void to_json(json& j, const std::shared_ptr<ConnectorInsertTableHandle>& proto)
const override {
VELOX_NYI("ConnectorInsertTableHandle not implemented");
}
void from_json(const json& j, std::shared_ptr<ConnectorInsertTableHandle>& p)
void from_json(const json& j, std::shared_ptr<ConnectorInsertTableHandle>& proto)
const override {
VELOX_NYI("ConnectorInsertTableHandle not implemented");
}
Expand All @@ -101,23 +101,23 @@ namespace facebook::presto::protocol::clp {
// --- ConnectorDistributedProcedureHandle ---
void to_json(
json& j,
const std::shared_ptr<ConnectorDistributedProcedureHandle>& p)
const std::shared_ptr<ConnectorDistributedProcedureHandle>& proto)
const override {
VELOX_NYI("ConnectorDistributedProcedureHandle not implemented");
}
void from_json(
const json& j,
std::shared_ptr<ConnectorDistributedProcedureHandle>& p)
std::shared_ptr<ConnectorDistributedProcedureHandle>& proto)
const override {
VELOX_NYI("ConnectorDistributedProcedureHandle not implemented");
}

// --- ConnectorOutputTableHandle ---
void to_json(json& j, const std::shared_ptr<ConnectorOutputTableHandle>& p)
void to_json(json& j, const std::shared_ptr<ConnectorOutputTableHandle>& proto)
const override {
VELOX_NYI("ConnectorOutputTableHandle not implemented");
}
void from_json(const json& j, std::shared_ptr<ConnectorOutputTableHandle>& p)
void from_json(const json& j, std::shared_ptr<ConnectorOutputTableHandle>& proto)
const override {
VELOX_NYI("ConnectorOutputTableHandle not implemented");
}
Expand All @@ -133,11 +133,11 @@ namespace facebook::presto::protocol::clp {
}

// --- ConnectorSplit ---
void to_json(json& j, const std::shared_ptr<ConnectorSplit>& p)
void to_json(json& j, const std::shared_ptr<ConnectorSplit>& proto)
const override {
VELOX_NYI("to_json not implemented");
}
void from_json(const json& j, std::shared_ptr<ConnectorSplit>& p)
void from_json(const json& j, std::shared_ptr<ConnectorSplit>& proto)
const override {
VELOX_NYI("from_json not implemented");
}
Expand All @@ -151,13 +151,13 @@ namespace facebook::presto::protocol::clp {
std::shared_ptr<ConnectorSplit>& proto) const override;

// --- ConnectorPartitioningHandle ---
void to_json(json& j, const std::shared_ptr<ConnectorPartitioningHandle>& p)
void to_json(json& j, const std::shared_ptr<ConnectorPartitioningHandle>& proto)
const override {
VELOX_NYI("ConnectorPartitioningHandle not implemented");
}
void from_json(
const json& j,
std::shared_ptr<ConnectorPartitioningHandle>& p) const override {
std::shared_ptr<ConnectorPartitioningHandle>& proto) const override {
VELOX_NYI("ConnectorPartitioningHandle not implemented");
}
void serialize(
Expand All @@ -172,11 +172,11 @@ namespace facebook::presto::protocol::clp {
}

// --- ConnectorTransactionHandle ---
void to_json(json& j, const std::shared_ptr<ConnectorTransactionHandle>& p)
void to_json(json& j, const std::shared_ptr<ConnectorTransactionHandle>& proto)
const override {
VELOX_NYI("to_json not implemented");
}
void from_json(const json& j, std::shared_ptr<ConnectorTransactionHandle>& p)
void from_json(const json& j, std::shared_ptr<ConnectorTransactionHandle>& proto)
const override {
VELOX_NYI("from_json not implemented");
}
Expand All @@ -190,11 +190,11 @@ namespace facebook::presto::protocol::clp {
std::shared_ptr<ConnectorTransactionHandle>& proto) const override;

// --- ConnectorDeleteTableHandle ---
void to_json(json& j, const std::shared_ptr<ConnectorDeleteTableHandle>& p)
void to_json(json& j, const std::shared_ptr<ConnectorDeleteTableHandle>& proto)
const override {
VELOX_NYI("ConnectorDeleteTableHandle not implemented");
}
void from_json(const json& j, std::shared_ptr<ConnectorDeleteTableHandle>& p)
void from_json(const json& j, std::shared_ptr<ConnectorDeleteTableHandle>& proto)
const override {
VELOX_NYI("ConnectorDeleteTableHandle not implemented");
}
Expand All @@ -210,11 +210,11 @@ namespace facebook::presto::protocol::clp {
}

// --- ConnectorIndexHandle ---
void to_json(json& j, const std::shared_ptr<ConnectorIndexHandle>& p)
void to_json(json& j, const std::shared_ptr<ConnectorIndexHandle>& proto)
const override {
VELOX_NYI("ConnectorIndexHandle not implemented");
}
void from_json(const json& j, std::shared_ptr<ConnectorIndexHandle>& p)
void from_json(const json& j, std::shared_ptr<ConnectorIndexHandle>& proto)
const override {
VELOX_NYI("ConnectorIndexHandle not implemented");
}
Expand Down
2 changes: 1 addition & 1 deletion velox-connector/src/protocol/PrestoProtocolClp.h
Original file line number Diff line number Diff line change
Expand Up @@ -60,4 +60,4 @@ struct ClpTableLayoutHandle : public ConnectorTableLayoutHandle {
ClpTableLayoutHandle() noexcept { _type = "clp"; }
};

} // namespace facebook::presto::protocol::clp
} // namespace facebook::presto::protocol::clp