diff --git a/be/src/olap/rowset/beta_rowset_writer.cpp b/be/src/olap/rowset/beta_rowset_writer.cpp index 3d15a2293fa450..0eea64eb0ee88c 100644 --- a/be/src/olap/rowset/beta_rowset_writer.cpp +++ b/be/src/olap/rowset/beta_rowset_writer.cpp @@ -377,8 +377,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; diff --git a/be/src/util/thrift_rpc_helper.cpp b/be/src/util/thrift_rpc_helper.cpp index c8c0c417b2ab05..09d5bbefbf4c46 100644 --- a/be/src/util/thrift_rpc_helper.cpp +++ b/be/src/util/thrift_rpc_helper.cpp @@ -53,7 +53,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; diff --git a/be/src/util/thrift_rpc_helper.h b/be/src/util/thrift_rpc_helper.h index 3b2bfb45517a02..a0a73ad483bc86 100644 --- a/be/src/util/thrift_rpc_helper.h +++ b/be/src/util/thrift_rpc_helper.h @@ -47,6 +47,8 @@ class ThriftRpcHelper { static Status rpc(const std::string& ip, const int32_t port, std::function&)> callback, int timeout_ms); + ExecEnv* get_exec_env() { return _s_exec_env; } + private: static ExecEnv* _s_exec_env; };