From 3ba4de0d277fea4cc1992a30aa919774089d60fa Mon Sep 17 00:00:00 2001 From: camby <104178625@qq.com> Date: Wed, 16 Mar 2022 11:38:35 +0800 Subject: [PATCH] [fix](ut) fix some UT compile or run failed cases (#8489) --- be/src/exprs/bitmap_function.cpp | 15 +++++++++++---- be/src/olap/tablet_schema.h | 2 +- be/test/olap/delta_writer_test.cpp | 6 +++--- be/test/util/arrow/arrow_row_batch_test.cpp | 1 + 4 files changed, 16 insertions(+), 8 deletions(-) diff --git a/be/src/exprs/bitmap_function.cpp b/be/src/exprs/bitmap_function.cpp index 7e405f3f6a..ed9c7b2825 100644 --- a/be/src/exprs/bitmap_function.cpp +++ b/be/src/exprs/bitmap_function.cpp @@ -156,9 +156,16 @@ void read_from(const char** src, StringValue* result) { } // namespace detail static StringVal serialize(FunctionContext* ctx, BitmapValue* value) { - StringVal result(ctx, value->getSizeInBytes()); - value->write((char*)result.ptr); - return result; + if (!value) { + BitmapValue empty_bitmap; + StringVal result(ctx, empty_bitmap.getSizeInBytes()); + empty_bitmap.write((char*)result.ptr); + return result; + } else { + StringVal result(ctx, value->getSizeInBytes()); + value->write((char*)result.ptr); + return result; + } } // Calculate the intersection of two or more bitmaps @@ -1248,4 +1255,4 @@ template StringVal BitmapFunctions::orthogonal_bitmap_intersect_count_serialize< FunctionContext* ctx, const StringVal& src); template StringVal BitmapFunctions::orthogonal_bitmap_intersect_count_serialize( FunctionContext* ctx, const StringVal& src); -} // namespace doris \ No newline at end of file +} // namespace doris diff --git a/be/src/olap/tablet_schema.h b/be/src/olap/tablet_schema.h index f7cd3ca04a..f9bd519cc1 100644 --- a/be/src/olap/tablet_schema.h +++ b/be/src/olap/tablet_schema.h @@ -144,7 +144,7 @@ public: inline bool has_sequence_col() const { return _sequence_col_idx != -1; } inline int32_t sequence_col_idx() const { return _sequence_col_idx; } vectorized::Block create_block(const std::vector& return_columns, - const std::unordered_set* tablet_columns_need_convert_null) const; + const std::unordered_set* tablet_columns_need_convert_null = nullptr) const; private: // Only for unit test diff --git a/be/test/olap/delta_writer_test.cpp b/be/test/olap/delta_writer_test.cpp index bb3d740b8a..f35a612506 100644 --- a/be/test/olap/delta_writer_test.cpp +++ b/be/test/olap/delta_writer_test.cpp @@ -367,7 +367,7 @@ TEST_F(TestDeltaWriter, open) { load_id.set_hi(0); load_id.set_lo(0); WriteRequest write_req = {10003, 270068375, WriteType::LOAD, 20001, - 30001, load_id, false, tuple_desc}; + 30001, load_id, tuple_desc}; DeltaWriter* delta_writer = nullptr; DeltaWriter::open(&write_req, k_mem_tracker, &delta_writer); ASSERT_NE(delta_writer, nullptr); @@ -401,7 +401,7 @@ TEST_F(TestDeltaWriter, write) { load_id.set_hi(0); load_id.set_lo(0); WriteRequest write_req = {10004, 270068376, WriteType::LOAD, 20002, 30002, load_id, - false, tuple_desc, &(tuple_desc->slots())}; + tuple_desc, &(tuple_desc->slots())}; DeltaWriter* delta_writer = nullptr; DeltaWriter::open(&write_req, k_mem_tracker, &delta_writer); ASSERT_NE(delta_writer, nullptr); @@ -527,7 +527,7 @@ TEST_F(TestDeltaWriter, sequence_col) { load_id.set_hi(0); load_id.set_lo(0); WriteRequest write_req = {10005, 270068377, WriteType::LOAD, 20003, 30003, load_id, - false, tuple_desc, &(tuple_desc->slots())}; + tuple_desc, &(tuple_desc->slots())}; DeltaWriter* delta_writer = nullptr; DeltaWriter::open(&write_req, k_mem_tracker, &delta_writer); ASSERT_NE(delta_writer, nullptr); diff --git a/be/test/util/arrow/arrow_row_batch_test.cpp b/be/test/util/arrow/arrow_row_batch_test.cpp index c629249389..9dc96d3de0 100644 --- a/be/test/util/arrow/arrow_row_batch_test.cpp +++ b/be/test/util/arrow/arrow_row_batch_test.cpp @@ -28,6 +28,7 @@ #include #include #include +#include #include #include "common/object_pool.h"