1. rename varialbes in ClpQueryRunner

2. use consistent type for numRows in ClpQueryRunner
3. remove spdlog version in CMakeLists.txt and change find_package to resolve_dependency for curl
4. fix readerIndex type in ClpDataSource
5. add SMALLINT in ClpDataSource

Author: wraymo

CMakeLists.txt

@@ -494,15 +494,16 @@ if(${VELOX_ENABLE_CLP_CONNECTOR})
   velox_resolve_dependency(clp)
 
   set(spdlog_SOURCE BUNDLED)
-  velox_resolve_dependency(spdlog 1.12.0)
+  velox_resolve_dependency(spdlog)
 
   velox_set_source(msgpack-cxx)
   velox_resolve_dependency(msgpack-cxx)
 
   velox_set_source(absl)
   velox_resolve_dependency(absl)
 
-  find_package(CURL 7.68.0 REQUIRED)
+  set(curl_SOURCE BUNDLED)
+  velox_resolve_dependency(curl)
   find_package(ANTLR REQUIRED)
 endif()
 

velox/connectors/clp/CMakeLists.txt

@@ -21,8 +21,8 @@ velox_add_library(
   ClpDataSource.cpp
   ClpTableHandle.cpp)
 
-velox_link_libraries(velox_clp_connector PRIVATE clp-s-search velox_connector
-                                                 simdjson::simdjson)
+velox_link_libraries(velox_clp_connector
+                     PRIVATE clp-s-search simdjson::simdjson velox_connector)
 
 target_compile_features(velox_clp_connector PRIVATE cxx_std_20)
 

velox/connectors/clp/ClpDataSource.cpp

@@ -79,6 +79,7 @@ void ClpDataSource::addFieldsRecursively(
         break;
       case TypeKind::INTEGER:
       case TypeKind::BIGINT:
+      case TypeKind::SMALLINT:
       case TypeKind::TINYINT:
         clpColumnType = search_lib::ColumnType::Integer;
         break;
@@ -160,7 +161,7 @@ std::optional<RowVectorPtr> ClpDataSource::next(
     return nullptr;
   }
   completedRows_ += rowsScanned;
-  uint64_t readerIndex = 0;
+  size_t readerIndex = 0;
   const auto& projectedColumns = cursor_->getProjectedColumns();
   if (projectedColumns.size() != fields_.size()) {
     VELOX_USER_FAIL(

velox/connectors/clp/search_lib/ClpQueryRunner.cpp

@@ -38,12 +38,12 @@ void ClpQueryRunner::init(
       continue;
     }
 
-    // Try to find a matching column in m_column_map
+    // Try to find a matching column in columnMap
     bool foundReader = false;
-    for (const auto node_id : nodeIds) {
-      auto column_it = columnMap.find(node_id);
-      if (column_it != columnMap.end()) {
-        projectedColumns_.push_back(column_it->second);
+    for (const auto nodeId : nodeIds) {
+      auto columnIt = columnMap.find(nodeId);
+      if (columnIt != columnMap.end()) {
+        projectedColumns_.push_back(columnIt->second);
         foundReader = true;
         break;
       }
@@ -60,7 +60,7 @@ void ClpQueryRunner::init(
 }
 
 uint64_t ClpQueryRunner::fetchNext(
-    size_t numRows,
+    uint64_t numRows,
     const std::shared_ptr<std::vector<uint64_t>>& filteredRowIndices) {
   size_t rowsfiltered = 0;
   size_t rowsScanned = 0;