Make raw file path factory explicit

Author: Weixin-Xu

src/paimon/core/operation/raw_file_split_read.cpp

@@ -76,16 +76,21 @@ Result<std::unique_ptr<BatchReader>> RawFileSplitRead::CreateReader(
                         dv_factory, data_file_path_factory);
 }
 
+Result<std::unique_ptr<BatchReader>> RawFileSplitRead::CreateReader(
+    const BinaryRow& partition, int32_t bucket,
+    const std::vector<std::shared_ptr<DataFileMeta>>& data_files,
+    DeletionVector::Factory dv_factory) {
+    PAIMON_ASSIGN_OR_RAISE(std::shared_ptr<DataFilePathFactory> data_file_path_factory,
+                           path_factory_->CreateDataFilePathFactory(partition, bucket));
+    return CreateReader(partition, bucket, data_files, dv_factory, data_file_path_factory);
+}
+
 Result<std::unique_ptr<BatchReader>> RawFileSplitRead::CreateReader(
     const BinaryRow& partition, int32_t bucket,
     const std::vector<std::shared_ptr<DataFileMeta>>& data_files,
     DeletionVector::Factory dv_factory,
     std::shared_ptr<DataFilePathFactory> data_file_path_factory) {
     const auto& predicate = context_->GetPredicate();
-    if (!data_file_path_factory) {
-        PAIMON_ASSIGN_OR_RAISE(data_file_path_factory,
-                               path_factory_->CreateDataFilePathFactory(partition, bucket));
-    }
 
     PAIMON_ASSIGN_OR_RAISE(
         std::vector<std::unique_ptr<FileBatchReader>> raw_file_readers,

src/paimon/core/operation/raw_file_split_read.h

@@ -70,8 +70,8 @@ class RawFileSplitRead : public AbstractSplitRead {
 
     Result<std::unique_ptr<BatchReader>> CreateReader(
         const BinaryRow& partition, int32_t bucket,
-        const std::vector<std::shared_ptr<DataFileMeta>>& files, DeletionVector::Factory dv_factory,
-        std::shared_ptr<DataFilePathFactory> data_file_path_factory = nullptr);
+        const std::vector<std::shared_ptr<DataFileMeta>>& files,
+        DeletionVector::Factory dv_factory);
 
     Result<bool> Match(const std::shared_ptr<Split>& split, bool force_keep_delete) const override;
 
@@ -82,6 +82,12 @@ class RawFileSplitRead : public AbstractSplitRead {
         const std::shared_ptr<Predicate>& predicate, DeletionVector::Factory dv_factory,
         const std::optional<std::vector<Range>>& ranges,
         const std::shared_ptr<DataFilePathFactory>& data_file_path_factory) const override;
+
+ private:
+    Result<std::unique_ptr<BatchReader>> CreateReader(
+        const BinaryRow& partition, int32_t bucket,
+        const std::vector<std::shared_ptr<DataFileMeta>>& files, DeletionVector::Factory dv_factory,
+        std::shared_ptr<DataFilePathFactory> data_file_path_factory);
 };
 
 }  // namespace paimon