#13920, #13959

Author: zhztheplayer

java/velox4j/src/main/cpp/main/velox4j/connector/ExternalStream.cpp

@@ -102,10 +102,10 @@ connector::ConnectorTableHandlePtr ExternalStreamTableHandle::create(
 }
 
 ExternalStreamDataSource::ExternalStreamDataSource(
-    const std::shared_ptr<connector::ConnectorTableHandle>& tableHandle)
+    const facebook::velox::connector::ConnectorTableHandlePtr& tableHandle)
     : DataSource() {
   tableHandle_ =
-      std::dynamic_pointer_cast<ExternalStreamTableHandle>(tableHandle);
+      std::dynamic_pointer_cast<const ExternalStreamTableHandle>(tableHandle);
 }
 
 void ExternalStreamDataSource::addSplit(
@@ -183,10 +183,8 @@ ExternalStreamConnector::ExternalStreamConnector(
 std::unique_ptr<connector::DataSource>
 ExternalStreamConnector::createDataSource(
     const RowTypePtr& outputType,
-    const std::shared_ptr<connector::ConnectorTableHandle>& tableHandle,
-    const std::unordered_map<
-        std::string,
-        std::shared_ptr<connector::ColumnHandle>>& columnHandles,
+    const connector::ConnectorTableHandlePtr& tableHandle,
+    const connector::ColumnHandleMap& columnHandles,
     connector::ConnectorQueryCtx* connectorQueryCtx) {
   VELOX_CHECK(
       columnHandles.empty(),

java/velox4j/src/main/cpp/main/velox4j/connector/ExternalStream.h

@@ -119,8 +119,7 @@ class ExternalStreamTableHandle
 class ExternalStreamDataSource : public facebook::velox::connector::DataSource {
  public:
   explicit ExternalStreamDataSource(
-      const std::shared_ptr<facebook::velox::connector::ConnectorTableHandle>&
-          tableHandle);
+      const facebook::velox::connector::ConnectorTableHandlePtr& tableHandle);
 
   void addSplit(std::shared_ptr<facebook::velox::connector::ConnectorSplit>
                     split) override;
@@ -155,7 +154,7 @@ class ExternalStreamDataSource : public facebook::velox::connector::DataSource {
   void cancel() override;
 
  private:
-  std::shared_ptr<ExternalStreamTableHandle> tableHandle_;
+  std::shared_ptr<const ExternalStreamTableHandle> tableHandle_;
   std::queue<std::shared_ptr<ExternalStream>> streams_{};
   std::shared_ptr<ExternalStream> current_{nullptr};
 };
@@ -169,19 +168,14 @@ class ExternalStreamConnector : public facebook::velox::connector::Connector {
 
   std::unique_ptr<facebook::velox::connector::DataSource> createDataSource(
       const facebook::velox::RowTypePtr& outputType,
-      const std::shared_ptr<facebook::velox::connector::ConnectorTableHandle>&
-          tableHandle,
-      const std::unordered_map<
-          std::string,
-          std::shared_ptr<facebook::velox::connector::ColumnHandle>>&
-          columnHandles,
+      const facebook::velox::connector::ConnectorTableHandlePtr&,
+      const facebook::velox::connector::ColumnHandleMap& columnHandles,
       facebook::velox::connector::ConnectorQueryCtx* connectorQueryCtx)
       override;
 
   std::unique_ptr<facebook::velox::connector::DataSink> createDataSink(
       facebook::velox::RowTypePtr inputType,
-      std::shared_ptr<facebook::velox::connector::ConnectorInsertTableHandle>
-          connectorInsertTableHandle,
+      const facebook::velox::connector::ConnectorInsertTableHandlePtr,
       facebook::velox::connector::ConnectorQueryCtx* connectorQueryCtx,
       facebook::velox::connector::CommitStrategy commitStrategy) override {
     VELOX_NYI();