From 39832dd156d542b9d7c3f10dc3a4f57a458d81c9 Mon Sep 17 00:00:00 2001 From: huangwei5 Date: Tue, 4 Aug 2020 10:57:44 +0800 Subject: [PATCH 1/4] fix ut --- be/src/util/arrow/row_batch.h | 2 +- be/test/runtime/load_channel_mgr_test.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/be/src/util/arrow/row_batch.h b/be/src/util/arrow/row_batch.h index 68d03ffcb90108..b1ac280f695886 100644 --- a/be/src/util/arrow/row_batch.h +++ b/be/src/util/arrow/row_batch.h @@ -68,7 +68,7 @@ Status convert_to_arrow_batch( Status convert_to_row_batch( const arrow::RecordBatch& batch, const RowDescriptor& row_desc, - std::shared_ptr tracker, + const std::shared_ptr& tracker, std::shared_ptr* result); Status serialize_record_batch(const arrow::RecordBatch& record_batch, std::string* result); diff --git a/be/test/runtime/load_channel_mgr_test.cpp b/be/test/runtime/load_channel_mgr_test.cpp index 386f44a7931c5c..1c7af66ec68479 100644 --- a/be/test/runtime/load_channel_mgr_test.cpp +++ b/be/test/runtime/load_channel_mgr_test.cpp @@ -45,7 +45,7 @@ OLAPStatus close_status; int64_t wait_lock_time_ns; // mock -DeltaWriter::DeltaWriter(WriteRequest* req, std::shared_ptr mem_tracker, +DeltaWriter::DeltaWriter(WriteRequest* req, const std::shared_ptr& mem_tracker, StorageEngine* storage_engine) : _req(*req) { } @@ -57,7 +57,7 @@ OLAPStatus DeltaWriter::init() { return OLAP_SUCCESS; } -OLAPStatus DeltaWriter::open(WriteRequest* req, std::shared_ptr mem_tracker, DeltaWriter** writer) { +OLAPStatus DeltaWriter::open(WriteRequest* req, const std::shared_ptr& mem_tracker, DeltaWriter** writer) { if (open_status != OLAP_SUCCESS) { return open_status; } From 0326ef6691be9a35702da53150ad1f2a0b2368bd Mon Sep 17 00:00:00 2001 From: huangwei Date: Tue, 4 Aug 2020 16:25:04 +0800 Subject: [PATCH 2/4] [] revert wrong changes in runtime ut cmake --- be/test/runtime/CMakeLists.txt | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/be/test/runtime/CMakeLists.txt b/be/test/runtime/CMakeLists.txt index 258038059247b3..02565adba05fbb 100644 --- a/be/test/runtime/CMakeLists.txt +++ b/be/test/runtime/CMakeLists.txt @@ -27,7 +27,7 @@ ADD_BE_TEST(mem_pool_test) ADD_BE_TEST(free_list_test) ADD_BE_TEST(string_buffer_test) #ADD_BE_TEST(data_stream_test) -ADD_BE_TEST(disk_io_mgr_test) +#ADD_BE_TEST(disk_io_mgr_test) #ADD_BE_TEST(parallel_executor_test) ADD_BE_TEST(datetime_value_test) ADD_BE_TEST(decimal_value_test) @@ -43,9 +43,10 @@ ADD_BE_TEST(fragment_mgr_test) #ADD_BE_TEST(etl_job_mgr_test) # ADD_BE_TEST(tmp_file_mgr_test) +# ADD_BE_TEST(disk_io_mgr_test) ADD_BE_TEST(mem_limit_test) -ADD_BE_TEST(buffered_block_mgr2_test) -ADD_BE_TEST(buffered_tuple_stream2_test) +#ADD_BE_TEST(buffered_block_mgr2_test) +#ADD_BE_TEST(buffered_tuple_stream2_test) ADD_BE_TEST(stream_load_pipe_test) ADD_BE_TEST(load_channel_mgr_test) #ADD_BE_TEST(export_task_mgr_test) From b805f4219e0a71ce12cba8dcbcaae5b84edcffba Mon Sep 17 00:00:00 2001 From: huangwei Date: Tue, 4 Aug 2020 16:27:30 +0800 Subject: [PATCH 3/4] [] fix --- be/test/runtime/CMakeLists.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/be/test/runtime/CMakeLists.txt b/be/test/runtime/CMakeLists.txt index 02565adba05fbb..55ab3ecf1e597c 100644 --- a/be/test/runtime/CMakeLists.txt +++ b/be/test/runtime/CMakeLists.txt @@ -19,7 +19,7 @@ set(EXECUTABLE_OUTPUT_PATH "${BUILD_DIR}/test/runtime") #ADD_BE_TEST(buffered_tuple_stream_test) -# ADD_BE_TEST(sorter_test) +#ADD_BE_TEST(sorter_test) #ADD_BE_TEST(buffer_control_block_test) #ADD_BE_TEST(result_buffer_mgr_test) #ADD_BE_TEST(result_sink_test) @@ -42,9 +42,9 @@ ADD_BE_TEST(fragment_mgr_test) #ADD_BE_TEST(data_spliter_test) #ADD_BE_TEST(etl_job_mgr_test) -# ADD_BE_TEST(tmp_file_mgr_test) -# ADD_BE_TEST(disk_io_mgr_test) -ADD_BE_TEST(mem_limit_test) +#ADD_BE_TEST(tmp_file_mgr_test) +#ADD_BE_TEST(disk_io_mgr_test) +#ADD_BE_TEST(mem_limit_test) #ADD_BE_TEST(buffered_block_mgr2_test) #ADD_BE_TEST(buffered_tuple_stream2_test) ADD_BE_TEST(stream_load_pipe_test) From fd65fabb9d8aa81d33c4c1ae561fb7783216a19a Mon Sep 17 00:00:00 2001 From: huangwei Date: Tue, 4 Aug 2020 16:47:03 +0800 Subject: [PATCH 4/4] [] fix --- be/test/runtime/CMakeLists.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/be/test/runtime/CMakeLists.txt b/be/test/runtime/CMakeLists.txt index 55ab3ecf1e597c..b360534569e026 100644 --- a/be/test/runtime/CMakeLists.txt +++ b/be/test/runtime/CMakeLists.txt @@ -27,7 +27,6 @@ ADD_BE_TEST(mem_pool_test) ADD_BE_TEST(free_list_test) ADD_BE_TEST(string_buffer_test) #ADD_BE_TEST(data_stream_test) -#ADD_BE_TEST(disk_io_mgr_test) #ADD_BE_TEST(parallel_executor_test) ADD_BE_TEST(datetime_value_test) ADD_BE_TEST(decimal_value_test)