Merge branch 'main' into fix_ut

Author: lxy-9602

src/paimon/core/global_index/global_index_scan_impl.h

@@ -47,13 +47,13 @@ class GlobalIndexScanImpl : public GlobalIndexScan {
         return snapshot_;
     }
 
- private:
-    Status Scan();
-
     Result<std::optional<std::shared_ptr<GlobalIndexResult>>> ParallelScan(
         const std::vector<Range>& ranges, const std::shared_ptr<Predicate>& predicate,
         const std::shared_ptr<Executor>& executor);
 
+ private:
+    Status Scan();
+
  private:
     bool initialized_ = false;
     std::shared_ptr<MemoryPool> pool_;

src/paimon/format/orc/complex_predicate_test.cpp

@@ -15,11 +15,9 @@
  */
 
 #include <cstdint>
-#include <iostream>
 #include <map>
 #include <memory>
 #include <optional>
-#include <ostream>
 #include <string>
 #include <utility>
 #include <vector>
@@ -51,7 +49,6 @@
 #include "paimon/status.h"
 #include "paimon/testing/utils/read_result_collector.h"
 #include "paimon/testing/utils/testharness.h"
-#include "paimon/testing/utils/timezone_guard.h"
 #include "paimon/utils/roaring_bitmap32.h"
 
 namespace paimon {
@@ -133,7 +130,7 @@ TEST_F(ComplexPredicateTest, TestSimple) {
         arrow_vendored::date::current_zone()->name() == "PRC") {
         // refer: https://github.com/eggert/tz/blob/main/asia#L653
         // When using the Asia/Shanghai timezone, timestamps prior to 1901 have an additional offset
-        // of 5 minutes and 45 seconds
+        // of 5 minutes and 43 seconds
         expected_array = std::dynamic_pointer_cast<arrow::StructArray>(
             arrow::ipc::internal::json::ArrayFromJSON(arrow::struct_({fields}), R"([
             [10, 1, 1234,  "2033-05-18 03:33:20.0",         "123456789987654321.45678"],

src/paimon/format/orc/orc_file_batch_reader_test.cpp

@@ -504,7 +504,7 @@ TEST_P(OrcFileBatchReaderTest, TestComplexType) {
         arrow_vendored::date::current_zone()->name() == "PRC") {
         // refer: https://github.com/eggert/tz/blob/main/asia#L653
         // When using the Asia/Shanghai timezone, timestamps prior to 1901 have an additional offset
-        // of 5 minutes and 45 seconds
+        // of 5 minutes and 43 seconds
         array_status = arrow::ipc::internal::json::ChunkedArrayFromJSON(arrow_data_type, {R"([
         [10, 1, 1234,  "2033-05-18 03:33:20.0",         "123456789987654321.45678", "add"],
         [10, 1, 19909, "2033-05-18 03:33:20.000001001", "12.30000", "cat"],