1

Alchemy-item: (ID = 988) Add fileNameGenerator to the constructor of IcebergInsertTableHandle commit 1/1 - a5f7e46

Author: Zouxxyy

velox/connectors/hive/iceberg/IcebergDataSink.cpp

@@ -79,20 +79,7 @@ folly::dynamic extractPartitionValue<TypeKind::TIMESTAMP>(
   return timestamp.toMicros();
 }
 
-class IcebergFileNameGenerator : public FileNameGenerator {
- public:
-  IcebergFileNameGenerator() {}
-
-  std::pair<std::string, std::string> gen(
-      std::optional<uint32_t> bucketId,
-      const std::shared_ptr<const HiveInsertTableHandle> insertTableHandle,
-      const ConnectorQueryCtx& connectorQueryCtx,
-      bool commitRequired) const override;
-
-  folly::dynamic serialize() const override;
-
-  std::string toString() const override;
-};
+} // namespace
 
 std::pair<std::string, std::string> IcebergFileNameGenerator::gen(
     std::optional<uint32_t> bucketId,
@@ -117,8 +104,6 @@ std::string IcebergFileNameGenerator::toString() const {
   return "IcebergFileNameGenerator";
 }
 
-} // namespace
-
 IcebergInsertTableHandle::IcebergInsertTableHandle(
     std::vector<IcebergColumnHandlePtr> inputColumns,
     LocationHandlePtr locationHandle,
@@ -127,7 +112,8 @@ IcebergInsertTableHandle::IcebergInsertTableHandle(
     dwio::common::FileFormat tableStorageFormat,
     const std::vector<IcebergSortingColumn>& sortedBy,
     std::optional<common::CompressionKind> compressionKind,
-    const std::unordered_map<std::string, std::string>& serdeParameters)
+    const std::unordered_map<std::string, std::string>& serdeParameters,
+    std::shared_ptr<const FileNameGenerator> fileNameGenerator)
     : HiveInsertTableHandle(
           std::vector<std::shared_ptr<const HiveColumnHandle>>(
               inputColumns.begin(),
@@ -139,7 +125,7 @@ IcebergInsertTableHandle::IcebergInsertTableHandle(
           serdeParameters,
           nullptr,
           false,
-          std::make_shared<const IcebergFileNameGenerator>()),
+          std::move(fileNameGenerator)),
       partitionSpec_(std::move(partitionSpec)),
       columnTransforms_(
           parsePartitionTransformSpecs(partitionSpec_->fields, pool)),

velox/connectors/hive/iceberg/IcebergDataSink.h

@@ -41,6 +41,21 @@ class IcebergSortingColumn : public ISerializable {
   const core::SortOrder sortOrder_;
 };
 
+class IcebergFileNameGenerator : public FileNameGenerator {
+public:
+  IcebergFileNameGenerator() {}
+
+  std::pair<std::string, std::string> gen(
+      std::optional<uint32_t> bucketId,
+      const std::shared_ptr<const HiveInsertTableHandle> insertTableHandle,
+      const ConnectorQueryCtx& connectorQueryCtx,
+      bool commitRequired) const override;
+
+  folly::dynamic serialize() const override;
+
+  std::string toString() const override;
+};
+
 // Represents a request for Iceberg write.
 class IcebergInsertTableHandle final : public HiveInsertTableHandle {
  public:
@@ -60,6 +75,8 @@ class IcebergInsertTableHandle final : public HiveInsertTableHandle {
   /// @param compressionKind Optional compression to apply to data files.
   /// @param serdeParameters Additional serialization/deserialization parameters
   /// for the file format.
+  /// @param fileNameGenerator File name generator for generating unique file
+  /// names for data files. If nullptr, will use IcebergFileNameGenerator.
   IcebergInsertTableHandle(
       std::vector<IcebergColumnHandlePtr> inputColumns,
       LocationHandlePtr locationHandle,
@@ -69,7 +86,9 @@ class IcebergInsertTableHandle final : public HiveInsertTableHandle {
           dwio::common::FileFormat::PARQUET,
       const std::vector<IcebergSortingColumn>& sortedBy = {},
       std::optional<common::CompressionKind> compressionKind = {},
-      const std::unordered_map<std::string, std::string>& serdeParameters = {});
+      const std::unordered_map<std::string, std::string>& serdeParameters = {},
+      std::shared_ptr<const FileNameGenerator> fileNameGenerator =
+          std::make_shared<const IcebergFileNameGenerator>());
 
   std::shared_ptr<const IcebergPartitionSpec> partitionSpec() const {
     return partitionSpec_;