Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 1 addition & 2 deletions be/src/olap/rowset/beta_rowset_writer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -388,8 +388,7 @@ Status BetaRowsetWriter::_load_noncompacted_segment(segment_v2::SegmentSharedPtr
.is_doris_table = true,
.cache_base_path {},
};
auto s = segment_v2::Segment::open(io::global_local_filesystem(), path,
_rowset_meta->tablet_id(), segment_id, rowset_id(),
auto s = segment_v2::Segment::open(fs, path, _rowset_meta->tablet_id(), segment_id, rowset_id(),
_context.tablet_schema, reader_options, &segment);
if (!s.ok()) {
LOG(WARNING) << "failed to open segment. " << path << ":" << s;
Expand Down
2 changes: 1 addition & 1 deletion be/src/util/thrift_rpc_helper.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ using apache::thrift::transport::TSocket;
using apache::thrift::transport::TTransport;
using apache::thrift::transport::TBufferedTransport;

ExecEnv* ThriftRpcHelper::_s_exec_env;
ExecEnv* ThriftRpcHelper::_s_exec_env = nullptr;

void ThriftRpcHelper::setup(ExecEnv* exec_env) {
_s_exec_env = exec_env;
Expand Down
2 changes: 2 additions & 0 deletions be/src/util/thrift_rpc_helper.h
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,8 @@ class ThriftRpcHelper {
static Status rpc(const std::string& ip, const int32_t port,
std::function<void(ClientConnection<T>&)> callback, int timeout_ms);

ExecEnv* get_exec_env() { return _s_exec_env; }

private:
static ExecEnv* _s_exec_env;
};
Expand Down
Loading