This is an automated email from the ASF dual-hosted git repository.
morningman pushed a commit to branch dev-1.0.1
in repository https://gitbox.apache.org/repos/asf/incubator-doris.git
commit ece8785bf2a309170be052b2833c64da73bf918e
Author: camby <104178...@qq.com>
AuthorDate: Wed Mar 16 11:38:35 2022 +0800
[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 7e405f3..ed9c7b2 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<StringValue>(
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 f7cd3ca..f9bd519 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<uint32_t>& return_columns,
- const std::unordered_set<uint32_t>*
tablet_columns_need_convert_null) const;
+ const std::unordered_set<uint32_t>*
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 bb3d740..f35a612 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 c629249..9dc96d3 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 <arrow/json/api.h>
#include <arrow/json/test_common.h>
#include <arrow/pretty_print.h>
+#include <arrow/record_batch.h>
#include <arrow/result.h>
#include "common/object_pool.h"
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
