[Bug] Fix UT bug after making MemTracker shared (apache#4243)

after making MemTracker shared(apache#4135), some code haven't been fixed, and add some useless ut back to build. Fixed in this pr.
924060929 · Aug 4, 2020 · bfb8c65 · bfb8c65
1 parent 3f31866
commit bfb8c65
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git 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<MemTracker> tracker,
+    const std::shared_ptr<MemTracker>& tracker,
     std::shared_ptr<RowBatch>* result);
 
 Status serialize_record_batch(const arrow::RecordBatch& record_batch, std::string* result);

diff --git a/be/test/runtime/CMakeLists.txt b/be/test/runtime/CMakeLists.txt
@@ -19,15 +19,14 @@
 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)
 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)
@@ -42,10 +41,11 @@ 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(mem_limit_test)
-ADD_BE_TEST(buffered_block_mgr2_test)
-ADD_BE_TEST(buffered_tuple_stream2_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)
 ADD_BE_TEST(load_channel_mgr_test)
 #ADD_BE_TEST(export_task_mgr_test)

diff --git 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<MemTracker> mem_tracker,
+DeltaWriter::DeltaWriter(WriteRequest* req, const std::shared_ptr<MemTracker>& 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<MemTracker> mem_tracker, DeltaWriter** writer) {
+OLAPStatus DeltaWriter::open(WriteRequest* req, const std::shared_ptr<MemTracker>& mem_tracker, DeltaWriter** writer) {
     if (open_status != OLAP_SUCCESS) {
         return open_status;
     }