Skip to content

[fix](be) resolves some unused-raii and used-after-moved issues #29285

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
yiguolei merged 4 commits into from
Dec 30, 2023
Merged

[fix](be) resolves some unused-raii and used-after-moved issues #29285

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
7b47a13
[fix](config) unused raii
py023 Dec 27, 2023
48db20e
fix(use-after-move) simple string moved
py023 Dec 28, 2023
6bde018
fix(used-after-moved): insignificant pointer reused
py023 Dec 29, 2023
d52b7b4
fix(used-after-moved): remove seldomly used tracelog
py023 Dec 29, 2023
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/agent/task_worker_pool.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -590,7 +590,7 @@ ReportWorker::ReportWorker(std::string name, const TMasterInfo& master_info, int
};

auto st = Thread::create("ReportWorker", _name, report_loop, &_thread);
CHECK(st.ok()) << name << ": " << st;
CHECK(st.ok()) << _name << ": " << st;
}

ReportWorker::~ReportWorker() {
Expand Down
1 change: 0 additions & 1 deletion be/src/http/action/config_action.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,6 @@ void ConfigAction::handle_update_config(HttpRequest* req) {
std::string status(s.ok() ? "OK" : "BAD");
rapidjson::Value result;
result.SetObject();
rapidjson::Value(key.c_str(), key.size(), results.GetAllocator());
Copy link
Copy Markdown
Contributor

@amorynan amorynan Dec 30, 2023

Choose a reason for hiding this comment

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

is here no problems before ?

Copy link
Copy Markdown
Contributor Author

@py023 py023 Dec 30, 2023

Choose a reason for hiding this comment

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

No, IIUC it just creates an useless JSON value and drops it immediately.

result.AddMember("config_name",
rapidjson::Value(key.c_str(), key.size(), results.GetAllocator()),
results.GetAllocator());
Expand Down
5 changes: 1 addition & 4 deletions be/src/io/fs/s3_file_system.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ S3FileSystem::S3FileSystem(S3Conf&& s3_conf, std::string&& id)
}
}
_executor = Aws::MakeShared<Aws::Utils::Threading::PooledThreadExecutor>(
id.c_str(), config::s3_transfer_executor_pool_size);
_id.c_str(), config::s3_transfer_executor_pool_size);
}

S3FileSystem::~S3FileSystem() = default;
Expand Down Expand Up @@ -211,9 +211,6 @@ Status S3FileSystem::delete_directory_impl(const Path& dir) {
return Status::IOError("fail to delete object: {}",
error_msg(e.GetKey(), e.GetMessage()));
}
VLOG_TRACE << "delete " << objects.size()
<< " s3 objects, endpoint: " << _s3_conf.endpoint
<< ", bucket: " << _s3_conf.bucket << ", prefix: " << _s3_conf.prefix;
}
is_trucated = result.GetIsTruncated();
request.SetContinuationToken(result.GetNextContinuationToken());
Expand Down
4 changes: 2 additions & 2 deletions be/src/vec/columns/column_array.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,11 +95,11 @@ ColumnArray::ColumnArray(MutableColumnPtr&& nested_column, MutableColumnPtr&& of
LOG(FATAL) << "offsets_column must be a ColumnUInt64";
}

if (!offsets_concrete->empty() && nested_column) {
if (!offsets_concrete->empty() && data) {
auto last_offset = offsets_concrete->get_data().back();

/// This will also prevent possible overflow in offset.
if (nested_column->size() != last_offset) {
if (data->size() != last_offset) {
LOG(FATAL) << "offsets_column has data inconsistent with nested_column";
}
}
Expand Down
2 changes: 1 addition & 1 deletion be/src/vec/columns/column_map.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ ColumnMap::ColumnMap(MutableColumnPtr&& keys, MutableColumnPtr&& values, Mutable
LOG(FATAL) << "offsets_column must be a ColumnUInt64";
}

if (!offsets_concrete->empty() && keys && values) {
if (!offsets_concrete->empty() && keys_column && values_column) {
auto last_offset = offsets_concrete->get_data().back();

/// This will also prevent possible overflow in offset.
Expand Down