fix

Author: zjw1111

src/paimon/core/mergetree/external_sort_buffer.cpp

@@ -167,8 +167,8 @@ Result<int64_t> ExternalSortBuffer::SpillToDisk(
     PAIMON_ASSIGN_OR_RAISE(
         std::unique_ptr<SpillWriter> spill_writer,
         SpillWriter::Create(options_.GetFileSystem(), write_schema_, spill_channel_enumerator_,
-                            spill_channel_manager_, pool_, spill_compress_options.compress,
-                            spill_compress_options.zstd_level));
+                            spill_channel_manager_, spill_compress_options.compress,
+                            spill_compress_options.zstd_level, pool_));
     auto cleanup_guard = ScopeGuard([&]() {
         [[maybe_unused]] auto status =
             spill_channel_manager_->DeleteChannel(spill_writer->GetChannelId());

src/paimon/core/mergetree/spill_reader_writer_test.cpp

@@ -64,8 +64,8 @@ class SpillReaderWriterTest : public ::testing::TestWithParam<std::string> {
 
     Result<std::unique_ptr<SpillWriter>> CreateSpillWriter() const {
         return SpillWriter::Create(file_system_, write_schema_, channel_enumerator_,
-                                   spill_channel_manager_, pool_, GetParam(),
-                                   /*compression_level=*/1);
+                                   spill_channel_manager_, GetParam(), /*compression_level=*/1,
+                                   pool_);
     }
 
     FileIOChannel::ID WriteSpillFile(

src/paimon/core/mergetree/spill_writer.cpp

@@ -29,8 +29,8 @@ SpillWriter::SpillWriter(const std::shared_ptr<FileSystem>& fs,
                          const std::shared_ptr<arrow::Schema>& schema,
                          const std::shared_ptr<FileIOChannel::Enumerator>& channel_enumerator,
                          const std::shared_ptr<SpillChannelManager>& spill_channel_manager,
-                         const std::shared_ptr<MemoryPool>& pool, const std::string& compression,
-                         int32_t compression_level)
+                         const std::string& compression, int32_t compression_level,
+                         const std::shared_ptr<MemoryPool>& pool)
     : fs_(fs),
       schema_(schema),
       channel_enumerator_(channel_enumerator),
@@ -43,11 +43,11 @@ Result<std::unique_ptr<SpillWriter>> SpillWriter::Create(
     const std::shared_ptr<FileSystem>& fs, const std::shared_ptr<arrow::Schema>& schema,
     const std::shared_ptr<FileIOChannel::Enumerator>& channel_enumerator,
     const std::shared_ptr<SpillChannelManager>& spill_channel_manager,
-    const std::shared_ptr<MemoryPool>& pool, const std::string& compression,
-    int32_t compression_level) {
+    const std::string& compression, int32_t compression_level,
+    const std::shared_ptr<MemoryPool>& pool) {
     std::unique_ptr<SpillWriter> writer(new SpillWriter(fs, schema, channel_enumerator,
-                                                        spill_channel_manager, pool, compression,
-                                                        compression_level));
+                                                        spill_channel_manager, compression,
+                                                        compression_level, pool));
     PAIMON_RETURN_NOT_OK(writer->Open());
     return writer;
 }

src/paimon/core/mergetree/spill_writer.h

@@ -42,8 +42,8 @@ class SpillWriter {
         const std::shared_ptr<FileSystem>& fs, const std::shared_ptr<arrow::Schema>& schema,
         const std::shared_ptr<FileIOChannel::Enumerator>& channel_enumerator,
         const std::shared_ptr<SpillChannelManager>& spill_channel_manager,
-        const std::shared_ptr<MemoryPool>& pool, const std::string& compression,
-        int32_t compression_level);
+        const std::string& compression, int32_t compression_level,
+        const std::shared_ptr<MemoryPool>& pool);
 
     SpillWriter(const SpillWriter&) = delete;
     SpillWriter& operator=(const SpillWriter&) = delete;
@@ -57,8 +57,8 @@ class SpillWriter {
     SpillWriter(const std::shared_ptr<FileSystem>& fs, const std::shared_ptr<arrow::Schema>& schema,
                 const std::shared_ptr<FileIOChannel::Enumerator>& channel_enumerator,
                 const std::shared_ptr<SpillChannelManager>& spill_channel_manager,
-                const std::shared_ptr<MemoryPool>& pool, const std::string& compression,
-                int32_t compression_level);
+                const std::string& compression, int32_t compression_level,
+                const std::shared_ptr<MemoryPool>& pool);
 
     Status Open();