Skip to content

[Bug] fix after making MemTracker shared #4243

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
morningman merged 4 commits into from
Aug 4, 2020
Merged

[Bug] fix after making MemTracker shared #4243

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
39832dd
fix ut
Aug 4, 2020
0326ef6
[] revert wrong changes in runtime ut cmake
vagetablechicken Aug 4, 2020
b805f42
[] fix
vagetablechicken Aug 4, 2020
fd65fab
[] fix
vagetablechicken Aug 4, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion be/src/util/arrow/row_batch.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
12 changes: 6 additions & 6 deletions be/test/runtime/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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)
Copy link
Contributor

@EmmyMiao87 EmmyMiao87 Aug 4, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why comment these three unit tests ?

Copy link
Contributor Author

@vagetablechicken vagetablechicken Aug 4, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it's a mistake uncomment of pr 4135

#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)
Expand Down
4 changes: 2 additions & 2 deletions be/test/runtime/load_channel_mgr_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
}
Expand All @@ -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;
}
Expand Down