fix: update CLP connector for Velox 0.297 API compatibility

Adapt CLP connector to upstream Velox API changes in 0.297:

- ConnectorFactory global registry removed: Replace
  connector::registerConnectorFactory / getConnectorFactory /
  unregisterConnectorFactory calls with direct factory instantiation
  (ClpConnectorFactory factory; factory.newConnector(...))

- New type aliases for connector handles: Update createDataSource and
  ClpDataSource constructor signatures to use ConnectorTableHandlePtr
  (shared_ptr<const ConnectorTableHandle>) and ColumnHandleMap
  (unordered_map<string, shared_ptr<const ColumnHandle>>) instead of
  the non-const shared_ptr variants

- Update dynamic_pointer_cast calls to cast to const types to match
  the new const-qualified pointer types

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

Author: 20001020ycx

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 v0.8.0)
+  GIT_TAG f82e6114160a6addd4727259906bcf621ac9912c)
 
 set(CLP_BUILD_CLP_REGEX_UTILS
     OFF

CMake/resolve_dependency_modules/log_surgeon.cmake

@@ -16,7 +16,7 @@ include_guard(GLOBAL)
 FetchContent_Declare(
   log_surgeon
   GIT_REPOSITORY https://github.com/y-scope/log-surgeon.git
-  GIT_TAG 85d4f2c09c0e55f1fb87cdc8b0f4d13fb1a733e1
+  GIT_TAG 193e1f91eb137bb935a7f44b13cc8dd945a8d742
   OVERRIDE_FIND_PACKAGE)
 
 set(log_surgeon_BUILD_TESTING OFF)

CMake/resolve_dependency_modules/spdlog.cmake

@@ -13,9 +13,9 @@
 # limitations under the License.
 include_guard(GLOBAL)
 
-set(VELOX_SPDLOG_BUILD_VERSION 1.12.0)
+set(VELOX_SPDLOG_BUILD_VERSION 1.15.3)
 set(VELOX_SPDLOG_BUILD_SHA256_CHECKSUM
-    4dccf2d10f410c1e2feaff89966bfc49a1abb29ef6f08246335b110e001e09a9)
+        15a04e69c222eb6c01094b5c7ff8a249b36bb22788d72519646fb85feb267e67)
 set(VELOX_SPDLOG_SOURCE_URL
     "https://github.com/gabime/spdlog/archive/refs/tags/v${VELOX_SPDLOG_BUILD_VERSION}.tar.gz"
 )

CMakeLists.txt

@@ -582,7 +582,7 @@ endif()
 velox_resolve_dependency(glog)
 
 velox_set_source(fmt)
-velox_resolve_dependency(fmt 9.0.0)
+velox_resolve_dependency(fmt 11.2.0)
 
 if(VELOX_ENABLE_COMPRESSION_LZ4)
   find_package(lz4 REQUIRED)
@@ -637,13 +637,13 @@ if(${VELOX_ENABLE_CLP_CONNECTOR})
   velox_set_source(spdlog)
   velox_resolve_dependency(spdlog)
 
+  velox_set_source(ystdlib)
+  velox_resolve_dependency(ystdlib)
+
   # Dependencies that depend on other dependencies
   velox_set_source(log_surgeon)
   velox_resolve_dependency(log_surgeon)
 
-  velox_set_source(ystdlib)
-  velox_resolve_dependency(ystdlib)
-
   set(clp_SOURCE BUNDLED)
   velox_resolve_dependency(clp)
 endif()

velox/connectors/clp/ClpColumnHandle.h

@@ -30,6 +30,10 @@ class ClpColumnHandle : public ColumnHandle {
         originalColumnName_(originalColumnName),
         columnType_(columnType) {}
 
+  const std::string& name() const override {
+    return columnName_;
+  }
+
   const std::string& columnName() const {
     return columnName_;
   }

velox/connectors/clp/ClpConnector.cpp

@@ -14,8 +14,6 @@
  * limitations under the License.
  */
 
-#include "clp_s/TimestampPattern.hpp"
-
 #include "velox/connectors/clp/ClpConnector.h"
 #include "velox/connectors/clp/ClpDataSource.h"
 
@@ -28,10 +26,8 @@ ClpConnector::ClpConnector(
 
 std::unique_ptr<DataSource> ClpConnector::createDataSource(
     const RowTypePtr& outputType,
-    const std::shared_ptr<ConnectorTableHandle>& tableHandle,
-    const std::unordered_map<
-        std::string,
-        std::shared_ptr<connector::ColumnHandle>>& columnHandles,
+    const ConnectorTableHandlePtr& tableHandle,
+    const connector::ColumnHandleMap& columnHandles,
     ConnectorQueryCtx* connectorQueryCtx) {
   return std::make_unique<ClpDataSource>(
       outputType,
@@ -43,20 +39,16 @@ std::unique_ptr<DataSource> ClpConnector::createDataSource(
 
 std::unique_ptr<DataSink> ClpConnector::createDataSink(
     RowTypePtr inputType,
-    std::shared_ptr<ConnectorInsertTableHandle> connectorInsertTableHandle,
+    ConnectorInsertTableHandlePtr connectorInsertTableHandle,
     ConnectorQueryCtx* connectorQueryCtx,
     CommitStrategy commitStrategy) {
   VELOX_NYI("createDataSink for ClpConnector is not implemented!");
 }
 
 ClpConnectorFactory::ClpConnectorFactory()
-    : ConnectorFactory(kClpConnectorName) {
-  clp_s::TimestampPattern::init();
-}
+    : ConnectorFactory(kClpConnectorName) {}
 
 ClpConnectorFactory::ClpConnectorFactory(const char* connectorName)
-    : ConnectorFactory(connectorName) {
-  clp_s::TimestampPattern::init();
-}
+    : ConnectorFactory(connectorName) {}
 
 } // namespace facebook::velox::connector::clp

velox/connectors/clp/ClpConnector.h

@@ -28,7 +28,7 @@ class ClpConnector : public Connector {
       std::shared_ptr<const config::ConfigBase> config);
 
   [[nodiscard]] const std::shared_ptr<const config::ConfigBase>&
-  connectorConfig() const override {
+  connectorConfig() const {
     return config_->config();
   }
 
@@ -38,19 +38,17 @@ class ClpConnector : public Connector {
 
   std::unique_ptr<DataSource> createDataSource(
       const RowTypePtr& outputType,
-      const std::shared_ptr<ConnectorTableHandle>& tableHandle,
-      const std::unordered_map<
-          std::string,
-          std::shared_ptr<connector::ColumnHandle>>& columnHandles,
+      const ConnectorTableHandlePtr& tableHandle,
+      const connector::ColumnHandleMap& columnHandles,
       ConnectorQueryCtx* connectorQueryCtx) override;
 
-  bool supportsSplitPreload() override {
+  bool supportsSplitPreload() const override {
     return false;
   }
 
   std::unique_ptr<DataSink> createDataSink(
       RowTypePtr inputType,
-      std::shared_ptr<ConnectorInsertTableHandle> connectorInsertTableHandle,
+      ConnectorInsertTableHandlePtr connectorInsertTableHandle,
       ConnectorQueryCtx* connectorQueryCtx,
       CommitStrategy commitStrategy) override;
 

velox/connectors/clp/ClpDataSource.cpp

@@ -29,14 +29,13 @@ namespace facebook::velox::connector::clp {
 
 ClpDataSource::ClpDataSource(
     const RowTypePtr& outputType,
-    const std::shared_ptr<connector::ConnectorTableHandle>& tableHandle,
-    const std::unordered_map<
-        std::string,
-        std::shared_ptr<connector::ColumnHandle>>& columnHandles,
+    const ConnectorTableHandlePtr& tableHandle,
+    const connector::ColumnHandleMap& columnHandles,
     velox::memory::MemoryPool* pool,
     std::shared_ptr<const ClpConfig>& clpConfig)
     : pool_(pool), outputType_(outputType) {
-  auto clpTableHandle = std::dynamic_pointer_cast<ClpTableHandle>(tableHandle);
+  auto clpTableHandle =
+      std::dynamic_pointer_cast<const ClpTableHandle>(tableHandle);
   storageType_ = clpConfig->storageType();
   s3AuthProvider_ = clpConfig->s3AuthProvider();
 
@@ -47,7 +46,7 @@ ClpDataSource::ClpDataSource(
         "ColumnHandle not found for output name: {}",
         outputName);
     auto clpColumnHandle =
-        std::dynamic_pointer_cast<ClpColumnHandle>(columnHandle->second);
+        std::dynamic_pointer_cast<const ClpColumnHandle>(columnHandle->second);
     VELOX_CHECK_NOT_NULL(
         clpColumnHandle,
         "ColumnHandle must be an instance of ClpColumnHandle for output name: {}",

velox/connectors/clp/ClpDataSource.h

@@ -34,10 +34,8 @@ class ClpDataSource : public DataSource {
  public:
   ClpDataSource(
       const RowTypePtr& outputType,
-      const std::shared_ptr<connector::ConnectorTableHandle>& tableHandle,
-      const std::unordered_map<
-          std::string,
-          std::shared_ptr<connector::ColumnHandle>>& columnHandles,
+      const ConnectorTableHandlePtr& tableHandle,
+      const connector::ColumnHandleMap& columnHandles,
       velox::memory::MemoryPool* pool,
       std::shared_ptr<const ClpConfig>& clpConfig);
 
@@ -60,7 +58,7 @@ class ClpDataSource : public DataSource {
     return completedRows_;
   }
 
-  std::unordered_map<std::string, RuntimeCounter> runtimeStats() override {
+  std::unordered_map<std::string, RuntimeMetric> getRuntimeStats() override {
     return {};
   }
 

velox/connectors/clp/ClpTableHandle.h

@@ -25,6 +25,10 @@ class ClpTableHandle : public ConnectorTableHandle {
   ClpTableHandle(const std::string& connectorId, const std::string& tableName)
       : ConnectorTableHandle(connectorId), tableName_(tableName) {}
 
+  const std::string& name() const override {
+    return tableName_;
+  }
+
   [[nodiscard]] const std::string& tableName() const {
     return tableName_;
   }