Revert "feat: Add iceberg partition specification (facebookincubator#15423)"

This reverts commit 600524b.

Author: PingLiuPing

velox/connectors/hive/iceberg/CMakeLists.txt

@@ -15,9 +15,8 @@
 velox_add_library(
   velox_hive_iceberg_splitreader
   IcebergDataSink.cpp
-  IcebergSplit.cpp
   IcebergSplitReader.cpp
-  PartitionSpec.cpp
+  IcebergSplit.cpp
   PositionalDeleteFileReader.cpp
 )
 

velox/connectors/hive/iceberg/IcebergDataSink.cpp

@@ -23,7 +23,6 @@ IcebergInsertTableHandle::IcebergInsertTableHandle(
     std::vector<HiveColumnHandlePtr> inputColumns,
     LocationHandlePtr locationHandle,
     dwio::common::FileFormat tableStorageFormat,
-    IcebergPartitionSpecPtr partitionSpec,
     std::optional<common::CompressionKind> compressionKind,
     const std::unordered_map<std::string, std::string>& serdeParameters)
     : HiveInsertTableHandle(
@@ -35,8 +34,7 @@ IcebergInsertTableHandle::IcebergInsertTableHandle(
           serdeParameters,
           nullptr,
           false,
-          std::make_shared<const HiveInsertFileNameGenerator>()),
-      partitionSpec_(std::move(partitionSpec)) {
+          std::make_shared<const HiveInsertFileNameGenerator>()) {
   VELOX_USER_CHECK(
       !inputColumns_.empty(),
       "Input columns cannot be empty for Iceberg tables.");
@@ -63,10 +61,6 @@ std::vector<std::string> IcebergDataSink::commitMessage() const {
   std::vector<std::string> commitTasks;
   commitTasks.reserve(writerInfo_.size());
 
-  auto icebergInsertTableHandle =
-      std::dynamic_pointer_cast<const IcebergInsertTableHandle>(
-          insertTableHandle_);
-
   for (auto i = 0; i < writerInfo_.size(); ++i) {
     const auto& info = writerInfo_.at(i);
     VELOX_CHECK_NOT_NULL(info);
@@ -81,7 +75,7 @@ std::vector<std::string> IcebergDataSink::commitMessage() const {
       ("fileSizeInBytes", ioStats_.at(i)->rawBytesWritten())
       ("metrics",
         folly::dynamic::object("recordCount", info->numWrittenRows))
-      ("partitionSpecJson", icebergInsertTableHandle->partitionSpec()->specId)
+      ("partitionSpecJson", 0)
       ("fileFormat", "PARQUET")
       ("content", "DATA");
     // clang-format on

velox/connectors/hive/iceberg/IcebergDataSink.h

@@ -17,7 +17,6 @@
 #pragma once
 
 #include "velox/connectors/hive/HiveDataSink.h"
-#include "velox/connectors/hive/iceberg/PartitionSpec.h"
 
 namespace facebook::velox::connector::hive::iceberg {
 
@@ -33,45 +32,15 @@ class IcebergInsertTableHandle final : public HiveInsertTableHandle {
   /// @param locationHandle Contains the target location information including:
   /// - Base directory path where data files will be written.
   /// - File naming scheme and temporary directory paths.
-  /// @param tableStorageFormat File format to use for writing data files.
-  /// @param partitionSpec Optional partition specification defining how to
-  /// partition the data. If nullptr, the table is unpartitioned and all data
-  /// is written to a single directory.
   /// @param compressionKind Optional compression to apply to data files.
   /// @param serdeParameters Additional serialization/deserialization parameters
   /// for the file format.
   IcebergInsertTableHandle(
       std::vector<HiveColumnHandlePtr> inputColumns,
       LocationHandlePtr locationHandle,
       dwio::common::FileFormat tableStorageFormat,
-      IcebergPartitionSpecPtr partitionSpec,
       std::optional<common::CompressionKind> compressionKind = {},
       const std::unordered_map<std::string, std::string>& serdeParameters = {});
-
-#ifdef VELOX_ENABLE_BACKWARD_COMPATIBILITY
-  IcebergInsertTableHandle(
-      std::vector<HiveColumnHandlePtr> inputColumns,
-      LocationHandlePtr locationHandle,
-      dwio::common::FileFormat tableStorageFormat,
-      std::optional<common::CompressionKind> compressionKind = {},
-      const std::unordered_map<std::string, std::string>& serdeParameters = {})
-      : IcebergInsertTableHandle(
-            inputColumns,
-            locationHandle,
-            tableStorageFormat,
-            nullptr,
-            compressionKind,
-            serdeParameters) {}
-#endif
-
-  /// Returns the Iceberg partition specification that defines how the table
-  /// is partitioned.
-  const IcebergPartitionSpecPtr& partitionSpec() const {
-    return partitionSpec_;
-  }
-
- private:
-  const IcebergPartitionSpecPtr partitionSpec_;
 };
 
 using IcebergInsertTableHandlePtr =