fix ut

Signed-off-by: Youngwb <[email protected]>
StarRocks · Jan 18, 2025 · fc909b4 · fc909b4
1 parent 2c6c7de
commit fc909b4
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/be/src/formats/parquet/column_converter.cpp b/be/src/formats/parquet/column_converter.cpp
@@ -660,7 +660,7 @@ Status Int96ToDateTimeConverter::convert(const ColumnPtr& src, Column* dst) {
         dst_null_data[i] = src_null_data[i];
         if (!src_null_data[i]) {
             Timestamp timestamp = (static_cast<uint64_t>(src_data[i].hi) << TIMESTAMP_BITS) | (src_data[i].lo / 1000);
-            dst_data[i].set_timestamp(timestamp);
+            dst_data[i].set_timestamp(_utc_to_local(timestamp));
         }
     }
     dst_nullable_column->set_has_null(src_nullable_column->has_null());

diff --git a/be/src/formats/parquet/level_builder.cpp b/be/src/formats/parquet/level_builder.cpp
@@ -357,7 +357,9 @@ Status LevelBuilder::_write_datetime_column_chunk(const LevelBuilderContext& ctx
     DeferOp defer([&] { delete[] values; });
 
     for (size_t i = 0; i < col->size(); i++) {
-        auto timestamp = data_col[i]._timestamp;
+        auto timestamp = use_int96_timestamp_encoding
+                                 ? timestamp::sub<TimeUnit::SECOND>(data_col[i]._timestamp, _offset)
+                                 : data_col[i]._timestamp;
         if constexpr (use_int96_timestamp_encoding) {
             auto date = reinterpret_cast<int32_t*>(values[i].value + 2);
             auto nanosecond = reinterpret_cast<int64_t*>(values[i].value);

diff --git a/be/test/formats/parquet/column_converter_test.cpp b/be/test/formats/parquet/column_converter_test.cpp
@@ -462,7 +462,7 @@ TEST_F(ColumnConverterTest, Int96Test) {
         const std::string col_name = "timestamp_int96";
         {
             const TypeDescriptor col_type = TypeDescriptor::from_logical_type(LogicalType::TYPE_DATETIME);
-            check(file_path, col_type, col_name, "[2023-04-28 16:40:22.618760]", expected_rows);
+            check(file_path, col_type, col_name, "[2023-04-29 00:40:22.618760]", expected_rows);
         }
     }
 }
@@ -476,21 +476,21 @@ TEST_F(ColumnConverterTest, Int96TimeZoneTest) {
         const std::string col_name = "time_with_new_york";
         {
             const TypeDescriptor col_type = TypeDescriptor::from_logical_type(LogicalType::TYPE_DATETIME);
-            check(file_path, col_type, col_name, "[2019-04-16 20:00:00]", expected_rows);
+            check(file_path, col_type, col_name, "[2019-04-17 04:00:00]", expected_rows);
         }
     }
     {
         const std::string col_name = "time_with_shanghai";
         {
             const TypeDescriptor col_type = TypeDescriptor::from_logical_type(LogicalType::TYPE_DATETIME);
-            check(file_path, col_type, col_name, "[2019-04-16 20:00:00]", expected_rows);
+            check(file_path, col_type, col_name, "[2019-04-17 04:00:00]", expected_rows);
         }
     }
     {
         const std::string col_name = "time_without_timezone";
         {
             const TypeDescriptor col_type = TypeDescriptor::from_logical_type(LogicalType::TYPE_DATETIME);
-            check(file_path, col_type, col_name, "[2019-04-16 20:00:00]", expected_rows);
+            check(file_path, col_type, col_name, "[2019-04-17 04:00:00]", expected_rows);
         }
     }
 }