Rename ColumnHandle to ConnectorColumnHandle

To match with ConnectorTableHandle and ConnectorInsertTableHandle

Author: yingsu00

velox/connectors/Connector.cpp

@@ -152,13 +152,13 @@ CommitStrategy stringToCommitStrategy(const std::string& strategy) {
   }
 }
 
-folly::dynamic ColumnHandle::serializeBase(std::string_view name) {
+folly::dynamic ConnectorColumnHandle::serializeBase(std::string_view name) {
   folly::dynamic obj = folly::dynamic::object;
   obj["name"] = name;
   return obj;
 }
 
-folly::dynamic ColumnHandle::serialize() const {
+folly::dynamic ConnectorColumnHandle::serialize() const {
   return serializeBase("ColumnHandle");
 }
 

velox/connectors/Connector.h

@@ -88,9 +88,9 @@ struct ConnectorSplit : public ISerializable {
   }
 };
 
-class ColumnHandle : public ISerializable {
+class ConnectorColumnHandle : public ISerializable {
  public:
-  virtual ~ColumnHandle() = default;
+  virtual ~ConnectorColumnHandle() = default;
 
   virtual const std::string& name() const {
     VELOX_UNSUPPORTED();
@@ -102,7 +102,7 @@ class ColumnHandle : public ISerializable {
   static folly::dynamic serializeBase(std::string_view name);
 };
 
-using ColumnHandlePtr = std::shared_ptr<const ColumnHandle>;
+using ConnectorColumnHandlePtr = std::shared_ptr<const ConnectorColumnHandle>;
 
 class ConnectorTableHandle : public ISerializable {
  public:
@@ -555,7 +555,7 @@ class Connector {
       const std::shared_ptr<ConnectorTableHandle>& tableHandle,
       const std::unordered_map<
           std::string,
-          std::shared_ptr<connector::ColumnHandle>>& columnHandles,
+          std::shared_ptr<connector::ConnectorColumnHandle>>& columnHandles,
       ConnectorQueryCtx* connectorQueryCtx) = 0;
 
   /// Returns true if addSplit of DataSource can use 'dataSource' from
@@ -616,7 +616,7 @@ class Connector {
       const std::shared_ptr<ConnectorTableHandle>& tableHandle,
       const std::unordered_map<
           std::string,
-          std::shared_ptr<connector::ColumnHandle>>& columnHandles,
+          std::shared_ptr<connector::ConnectorColumnHandle>>& columnHandles,
       ConnectorQueryCtx* connectorQueryCtx) {
     VELOX_UNSUPPORTED(
         "Connector {} does not support index source", connectorId());

velox/connectors/fuzzer/FuzzerConnector.h

@@ -113,7 +113,7 @@ class FuzzerConnector final : public Connector {
       const std::shared_ptr<ConnectorTableHandle>& tableHandle,
       const std::unordered_map<
           std::string,
-          std::shared_ptr<connector::ColumnHandle>>& /*columnHandles*/,
+          std::shared_ptr<connector::ConnectorColumnHandle>>& /*columnHandles*/,
       ConnectorQueryCtx* connectorQueryCtx) override final {
     return std::make_unique<FuzzerDataSource>(
         outputType, tableHandle, connectorQueryCtx->memoryPool());

velox/connectors/hive/HiveConnector.cpp

@@ -75,7 +75,7 @@ std::unique_ptr<DataSource> HiveConnector::createDataSource(
     const std::shared_ptr<ConnectorTableHandle>& tableHandle,
     const std::unordered_map<
         std::string,
-        std::shared_ptr<connector::ColumnHandle>>& columnHandles,
+        std::shared_ptr<connector::ConnectorColumnHandle>>& columnHandles,
     ConnectorQueryCtx* connectorQueryCtx) {
   return std::make_unique<HiveDataSource>(
       outputType,

velox/connectors/hive/HiveConnector.h

@@ -53,7 +53,7 @@ class HiveConnector : public Connector {
       const std::shared_ptr<ConnectorTableHandle>& tableHandle,
       const std::unordered_map<
           std::string,
-          std::shared_ptr<connector::ColumnHandle>>& columnHandles,
+          std::shared_ptr<connector::ConnectorColumnHandle>>& columnHandles,
       ConnectorQueryCtx* connectorQueryCtx) override;
 
   bool supportsSplitPreload() override {

velox/connectors/hive/HiveDataSource.cpp

@@ -61,7 +61,7 @@ HiveDataSource::HiveDataSource(
     const std::shared_ptr<connector::ConnectorTableHandle>& tableHandle,
     const std::unordered_map<
         std::string,
-        std::shared_ptr<connector::ColumnHandle>>& columnHandles,
+        std::shared_ptr<connector::ConnectorColumnHandle>>& columnHandles,
     FileHandleFactory* fileHandleFactory,
     folly::Executor* executor,
     const ConnectorQueryCtx* connectorQueryCtx,

velox/connectors/hive/HiveDataSource.h

@@ -40,7 +40,7 @@ class HiveDataSource : public DataSource {
       const std::shared_ptr<connector::ConnectorTableHandle>& tableHandle,
       const std::unordered_map<
           std::string,
-          std::shared_ptr<connector::ColumnHandle>>& columnHandles,
+          std::shared_ptr<connector::ConnectorColumnHandle>>& columnHandles,
       FileHandleFactory* fileHandleFactory,
       folly::Executor* executor,
       const ConnectorQueryCtx* connectorQueryCtx,

velox/connectors/hive/TableHandle.cpp

@@ -53,7 +53,7 @@ HiveColumnHandle::ColumnType HiveColumnHandle::columnTypeFromName(
 }
 
 folly::dynamic HiveColumnHandle::serialize() const {
-  folly::dynamic obj = ColumnHandle::serializeBase("HiveColumnHandle");
+  folly::dynamic obj = ConnectorColumnHandle::serializeBase("HiveColumnHandle");
   obj["hiveColumnHandleName"] = name_;
   obj["columnType"] = columnTypeName(columnType_);
   obj["dataType"] = dataType_->serialize();
@@ -81,7 +81,7 @@ std::string HiveColumnHandle::toString() const {
   return out.str();
 }
 
-ColumnHandlePtr HiveColumnHandle::create(const folly::dynamic& obj) {
+ConnectorColumnHandlePtr HiveColumnHandle::create(const folly::dynamic& obj) {
   auto name = obj["hiveColumnHandleName"].asString();
   auto columnType = columnTypeFromName(obj["columnType"].asString());
   auto dataType = ISerializable::deserialize<Type>(obj["dataType"]);

velox/connectors/hive/TableHandle.h

@@ -23,7 +23,7 @@
 
 namespace facebook::velox::connector::hive {
 
-class HiveColumnHandle : public ColumnHandle {
+class HiveColumnHandle : public ConnectorColumnHandle {
  public:
   enum class ColumnType {
     kPartitionKey,
@@ -114,7 +114,7 @@ class HiveColumnHandle : public ColumnHandle {
 
   folly::dynamic serialize() const override;
 
-  static ColumnHandlePtr create(const folly::dynamic& obj);
+  static ConnectorColumnHandlePtr create(const folly::dynamic& obj);
 
   static std::string columnTypeName(HiveColumnHandle::ColumnType columnType);
 

velox/connectors/hive/iceberg/tests/IcebergReadTest.cpp

@@ -721,7 +721,9 @@ TEST_F(HiveIcebergTest, testPartitionedRead) {
     splits.insert(splits.end(), icebergSplits.begin(), icebergSplits.end());
   }
 
-  std::unordered_map<std::string, std::shared_ptr<connector::ColumnHandle>>
+  std::unordered_map<
+      std::string,
+      std::shared_ptr<connector::ConnectorColumnHandle>>
       assignments;
   assignments.insert(
       {"c0",