This is an automated email from the ASF dual-hosted git repository.
yiguolei pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/master by this push:
new 7623b5cc317 [cleanup](move-memtable) remove namespace `stream_load`
(#27441)
7623b5cc317 is described below
commit 7623b5cc3177290e9630b060e1442e6590817709
Author: Kaijie Chen <[email protected]>
AuthorDate: Sat Dec 30 20:08:23 2023 +0800
[cleanup](move-memtable) remove namespace `stream_load` (#27441)
---
be/src/runtime/exec_env.h | 10 +++-------
be/src/runtime/exec_env_init.cpp | 2 +-
be/src/vec/sink/load_stream_stub_pool.cpp | 3 ---
be/src/vec/sink/load_stream_stub_pool.h | 3 ---
be/src/vec/sink/writer/vtablet_writer_v2.cpp | 3 +--
be/src/vec/sink/writer/vtablet_writer_v2.h | 10 +++-------
be/test/vec/exec/load_stream_stub_pool_test.cpp | 3 ---
7 files changed, 8 insertions(+), 26 deletions(-)
diff --git a/be/src/runtime/exec_env.h b/be/src/runtime/exec_env.h
index c97ff55a206..ddbb90b45a9 100644
--- a/be/src/runtime/exec_env.h
+++ b/be/src/runtime/exec_env.h
@@ -51,9 +51,6 @@ struct RuntimeFilterTimerQueue;
namespace taskgroup {
class TaskGroupManager;
}
-namespace stream_load {
-class LoadStreamStubPool;
-} // namespace stream_load
namespace io {
class S3FileBufferPool;
class FileCacheFactory;
@@ -81,6 +78,7 @@ class ResultQueueMgr;
class TMasterInfo;
class LoadChannelMgr;
class LoadStreamMgr;
+class LoadStreamStubPool;
class StreamLoadExecutor;
class RoutineLoadTaskExecutor;
class SmallFileMgr;
@@ -238,9 +236,7 @@ public:
}
#endif
- stream_load::LoadStreamStubPool* load_stream_stub_pool() {
- return _load_stream_stub_pool.get();
- }
+ LoadStreamStubPool* load_stream_stub_pool() { return
_load_stream_stub_pool.get(); }
vectorized::DeltaWriterV2Pool* delta_writer_v2_pool() { return
_delta_writer_v2_pool.get(); }
@@ -352,7 +348,7 @@ private:
// To save meta info of external file, such as parquet footer.
FileMetaCache* _file_meta_cache = nullptr;
std::unique_ptr<MemTableMemoryLimiter> _memtable_memory_limiter;
- std::unique_ptr<stream_load::LoadStreamStubPool> _load_stream_stub_pool;
+ std::unique_ptr<LoadStreamStubPool> _load_stream_stub_pool;
std::unique_ptr<vectorized::DeltaWriterV2Pool> _delta_writer_v2_pool;
std::shared_ptr<WalManager> _wal_manager;
diff --git a/be/src/runtime/exec_env_init.cpp b/be/src/runtime/exec_env_init.cpp
index e612cb816b3..508ea7c7921 100644
--- a/be/src/runtime/exec_env_init.cpp
+++ b/be/src/runtime/exec_env_init.cpp
@@ -217,7 +217,7 @@ Status ExecEnv::_init(const std::vector<StorePath>&
store_paths,
_block_spill_mgr = new BlockSpillManager(store_paths);
_group_commit_mgr = new GroupCommitMgr(this);
_memtable_memory_limiter = std::make_unique<MemTableMemoryLimiter>();
- _load_stream_stub_pool =
std::make_unique<stream_load::LoadStreamStubPool>();
+ _load_stream_stub_pool = std::make_unique<LoadStreamStubPool>();
_delta_writer_v2_pool = std::make_unique<vectorized::DeltaWriterV2Pool>();
_wal_manager = WalManager::create_shared(this,
config::group_commit_wal_path);
diff --git a/be/src/vec/sink/load_stream_stub_pool.cpp
b/be/src/vec/sink/load_stream_stub_pool.cpp
index f7eeb96bb04..c867756d8fb 100644
--- a/be/src/vec/sink/load_stream_stub_pool.cpp
+++ b/be/src/vec/sink/load_stream_stub_pool.cpp
@@ -23,8 +23,6 @@
namespace doris {
class TExpr;
-namespace stream_load {
-
LoadStreams::LoadStreams(UniqueId load_id, int64_t dst_id, int num_use,
LoadStreamStubPool* pool)
: _load_id(load_id), _dst_id(dst_id), _use_cnt(num_use), _pool(pool) {}
@@ -87,5 +85,4 @@ void LoadStreamStubPool::erase(UniqueId load_id, int64_t
dst_id) {
_template_stubs.erase(load_id);
}
-} // namespace stream_load
} // namespace doris
diff --git a/be/src/vec/sink/load_stream_stub_pool.h
b/be/src/vec/sink/load_stream_stub_pool.h
index 0eb14fc9351..e41083825be 100644
--- a/be/src/vec/sink/load_stream_stub_pool.h
+++ b/be/src/vec/sink/load_stream_stub_pool.h
@@ -68,8 +68,6 @@ namespace doris {
class LoadStreamStub;
-namespace stream_load {
-
class LoadStreamStubPool;
using Streams = std::vector<std::shared_ptr<LoadStreamStub>>;
@@ -118,5 +116,4 @@ private:
std::unordered_map<std::pair<UniqueId, int64_t>,
std::shared_ptr<LoadStreams>> _pool;
};
-} // namespace stream_load
} // namespace doris
\ No newline at end of file
diff --git a/be/src/vec/sink/writer/vtablet_writer_v2.cpp
b/be/src/vec/sink/writer/vtablet_writer_v2.cpp
index 8ded964950b..126dd4a1be0 100644
--- a/be/src/vec/sink/writer/vtablet_writer_v2.cpp
+++ b/be/src/vec/sink/writer/vtablet_writer_v2.cpp
@@ -268,8 +268,7 @@ Status VTabletWriterV2::_open_streams(int64_t src_id) {
return Status::OK();
}
-Status VTabletWriterV2::_open_streams_to_backend(int64_t dst_id,
-
::doris::stream_load::LoadStreams& streams) {
+Status VTabletWriterV2::_open_streams_to_backend(int64_t dst_id, LoadStreams&
streams) {
const auto* node_info = _nodes_info->find_node(dst_id);
DBUG_EXECUTE_IF("VTabletWriterV2._open_streams_to_backend.node_info_null",
{ node_info = nullptr; });
diff --git a/be/src/vec/sink/writer/vtablet_writer_v2.h
b/be/src/vec/sink/writer/vtablet_writer_v2.h
index fa21071da83..37558974197 100644
--- a/be/src/vec/sink/writer/vtablet_writer_v2.h
+++ b/be/src/vec/sink/writer/vtablet_writer_v2.h
@@ -69,6 +69,7 @@
namespace doris {
class DeltaWriterV2;
class LoadStreamStub;
+class LoadStreams;
class ObjectPool;
class RowDescriptor;
class RuntimeState;
@@ -77,10 +78,6 @@ class TExpr;
class TabletSchema;
class TupleDescriptor;
-namespace stream_load {
-class LoadStreams;
-}
-
namespace vectorized {
class OlapTableBlockConvertor;
@@ -126,7 +123,7 @@ private:
Status _open_streams(int64_t src_id);
- Status _open_streams_to_backend(int64_t dst_id,
::doris::stream_load::LoadStreams& streams);
+ Status _open_streams_to_backend(int64_t dst_id, LoadStreams& streams);
Status _incremental_open_streams(const std::vector<TOlapTablePartition>&
partitions);
@@ -219,8 +216,7 @@ private:
std::unordered_map<int64_t, std::unordered_map<int64_t, PTabletID>>
_tablets_for_node;
std::unordered_map<int64_t, std::vector<PTabletID>> _indexes_from_node;
- std::unordered_map<int64_t,
std::shared_ptr<::doris::stream_load::LoadStreams>>
- _streams_for_node;
+ std::unordered_map<int64_t, std::shared_ptr<LoadStreams>>
_streams_for_node;
size_t _stream_index = 0;
std::shared_ptr<DeltaWriterV2Map> _delta_writer_for_tablet;
diff --git a/be/test/vec/exec/load_stream_stub_pool_test.cpp
b/be/test/vec/exec/load_stream_stub_pool_test.cpp
index 73f09508896..24da3bb6999 100644
--- a/be/test/vec/exec/load_stream_stub_pool_test.cpp
+++ b/be/test/vec/exec/load_stream_stub_pool_test.cpp
@@ -22,8 +22,6 @@
namespace doris {
-namespace stream_load {
-
class LoadStreamStubPoolTest : public testing::Test {
public:
LoadStreamStubPoolTest() = default;
@@ -50,5 +48,4 @@ TEST_F(LoadStreamStubPoolTest, test) {
EXPECT_EQ(0, pool.templates_size());
}
-} // namespace stream_load
} // namespace doris
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
