Skip to content

[refactor](storage) Unify BE and Recycler object clients #66350

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

Open
sollhui wants to merge 6 commits into
base: master
Choose a base branch
from
Open

[refactor](storage) Unify BE and Recycler object clients #66350

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
13f9891
unify BE and Recycler object clients
sollhui Aug 4, 2026
62e1654
Merge branch 'master' into agent/unify-be-recycler-obj-client
sollhui Aug 4, 2026
31e86e7
[fix](storage) fix object client factory compilation
sollhui Aug 5, 2026
5f7c022
[fix](cloud) Address object client review feedback
sollhui Aug 5, 2026
bd095ee
[fix](cloud) Fix Azure object client failures
sollhui Aug 5, 2026
ce0a2e6
[fix](be) Fix S3 file system formatting
sollhui Aug 5, 2026
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 @@ -58,10 +58,10 @@
#include "common/logging.h"
#include "common/metrics/doris_metrics.h"
#include "common/status.h"
#include "cpp/client/obj_storage_client.h"
#include "io/fs/file_system.h"
#include "io/fs/hdfs_file_system.h"
#include "io/fs/local_file_system.h"
#include "io/fs/obj_storage_client.h"
#include "io/fs/path.h"
#include "io/fs/remote_file_system.h"
#include "io/fs/s3_file_system.h"
Expand Down
2 changes: 1 addition & 1 deletion be/src/cloud/cloud_meta_mgr.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,8 @@
#include "common/config.h"
#include "common/logging.h"
#include "common/status.h"
#include "cpp/client/obj_storage_client.h"
#include "cpp/sync_point.h"
#include "io/fs/obj_storage_client.h"
#include "load/stream_load/stream_load_context.h"
#include "runtime/exec_env.h"
#include "storage/olap_common.h"
Expand Down
8 changes: 0 additions & 8 deletions be/src/common/status.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,8 @@

namespace doris {

namespace io {
struct ObjectStorageStatus;
}

class Status;

extern io::ObjectStorageStatus convert_to_obj_response(Status st);

class PStatus;

namespace ErrorCode {
Expand Down Expand Up @@ -577,8 +571,6 @@ class [[nodiscard]] Status {

std::pair<int, std::string> retrieve_error_msg() { return {_code, std::move(_err_msg->_msg)}; }

friend io::ObjectStorageStatus convert_to_obj_response(Status st);

private:
int _code;
struct ErrMsg {
Expand Down
9 changes: 3 additions & 6 deletions be/src/exprs/function/ai/embed.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -431,18 +431,15 @@ class FunctionEmbed : public AIFunction<FunctionEmbed> {

S3ClientConf s3_client_conf;
RETURN_IF_ERROR(init_s3_client_conf_from_json(file_input, s3_client_conf));
auto s3_client = S3ClientFactory::instance().create(s3_client_conf);
if (s3_client == nullptr) {
return Status::InternalError("Failed to create S3 client for EMBED file input");
}
auto s3_client = DORIS_TRY(S3ClientFactory::instance().create(s3_client_conf));

S3URI s3_uri(uri);
RETURN_IF_ERROR(s3_uri.parse());
std::string bucket = s3_uri.get_bucket();
std::string key = s3_uri.get_key();
DORIS_CHECK(!bucket.empty() && !key.empty());
media_url = s3_client->generate_presigned_url({.bucket = bucket, .key = key}, ttl_seconds,
s3_client_conf);
media_url = s3_client->generate_presigned_url({.bucket = bucket, .key = key, .prefix = ""},
ttl_seconds);
return Status::OK();
}
};
Expand Down
3 changes: 0 additions & 3 deletions be/src/io/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,6 @@ set(LIBRARY_OUTPUT_PATH "${BUILD_DIR}/src/io")
set(EXECUTABLE_OUTPUT_PATH "${BUILD_DIR}/src/io")

file(GLOB_RECURSE IO_FILES CONFIGURE_DEPENDS *.cpp)
if(BUILD_AZURE STREQUAL "OFF")
list(REMOVE_ITEM IO_FILES "${CMAKE_CURRENT_SOURCE_DIR}/fs/azure_obj_storage_client.cpp")
endif()

if(ENABLE_TDE)
list(REMOVE_ITEM IO_FILES "${CMAKE_CURRENT_SOURCE_DIR}/fs/encrypted_fs_factory.cpp")
Expand Down
Loading
Loading