You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@doris.apache.org by mo...@apache.org on 2020/12/15 01:30:41 UTC
[incubator-doris] branch master updated: [UT] cleanup storage
engine creation in tablet_mgr_test etc (#5077)
This is an automated email from the ASF dual-hosted git repository.
morningman pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-doris.git
The following commit(s) were added to refs/heads/master by this push:
new 49f26f4 [UT] cleanup storage engine creation in tablet_mgr_test etc (#5077)
49f26f4 is described below
commit 49f26f44134782844abf02171b44c8961a58e4ca
Author: HuangWei <hu...@apache.org>
AuthorDate: Tue Dec 15 09:30:32 2020 +0800
[UT] cleanup storage engine creation in tablet_mgr_test etc (#5077)
Mistakenly use the string '_engine_data_path' as the path, actually the storage engine is not open,
so option/path is needless. Cleanup it to avoid any doubt about the file path management.
---
be/test/olap/olap_snapshot_converter_test.cpp | 4 +---
be/test/olap/rowset/rowset_meta_manager_test.cpp | 4 +---
be/test/olap/tablet_mgr_test.cpp | 10 ++++------
be/test/olap/txn_manager_test.cpp | 9 ++++-----
4 files changed, 10 insertions(+), 17 deletions(-)
diff --git a/be/test/olap/olap_snapshot_converter_test.cpp b/be/test/olap/olap_snapshot_converter_test.cpp
index 1237b2a..222d7db 100644
--- a/be/test/olap/olap_snapshot_converter_test.cpp
+++ b/be/test/olap/olap_snapshot_converter_test.cpp
@@ -55,10 +55,8 @@ public:
config::tablet_map_shard_size = 1;
config::txn_map_shard_size = 1;
config::txn_shard_size = 1;
- std::vector<StorePath> paths;
- paths.emplace_back("_engine_data_path", -1);
EngineOptions options;
- options.store_paths = paths;
+ // won't open engine, options.path is needless
options.backend_uid = UniqueId::gen_uid();
if (k_engine == nullptr) {
k_engine = new StorageEngine(options);
diff --git a/be/test/olap/rowset/rowset_meta_manager_test.cpp b/be/test/olap/rowset/rowset_meta_manager_test.cpp
index 1347af0..db2dd81 100644
--- a/be/test/olap/rowset/rowset_meta_manager_test.cpp
+++ b/be/test/olap/rowset/rowset_meta_manager_test.cpp
@@ -49,10 +49,8 @@ public:
config::tablet_map_shard_size = 1;
config::txn_map_shard_size = 1;
config::txn_shard_size = 1;
- std::vector<StorePath> paths;
- paths.emplace_back("_engine_data_path", -1);
EngineOptions options;
- options.store_paths = paths;
+ // won't open engine, options.path is needless
options.backend_uid = UniqueId::gen_uid();
if (k_engine == nullptr) {
k_engine = new StorageEngine(options);
diff --git a/be/test/olap/tablet_mgr_test.cpp b/be/test/olap/tablet_mgr_test.cpp
index 2847c6f..c74959a 100644
--- a/be/test/olap/tablet_mgr_test.cpp
+++ b/be/test/olap/tablet_mgr_test.cpp
@@ -48,19 +48,17 @@ static StorageEngine* k_engine = nullptr;
class TabletMgrTest : public testing::Test {
public:
virtual void SetUp() {
- config::tablet_map_shard_size = 1;
- config::txn_map_shard_size = 1;
- config::txn_shard_size = 1;
string test_engine_data_path = "./be/test/olap/test_data/converter_test_data/data";
_engine_data_path = "./be/test/olap/test_data/converter_test_data/tmp";
boost::filesystem::remove_all(_engine_data_path);
FileUtils::create_dir(_engine_data_path);
FileUtils::create_dir(_engine_data_path + "/meta");
- std::vector<StorePath> paths;
- paths.emplace_back("_engine_data_path", -1);
+ config::tablet_map_shard_size = 1;
+ config::txn_map_shard_size = 1;
+ config::txn_shard_size = 1;
EngineOptions options;
- options.store_paths = paths;
+ // won't open engine, options.path is needless
options.backend_uid = UniqueId::gen_uid();
if (k_engine == nullptr) {
k_engine = new StorageEngine(options);
diff --git a/be/test/olap/txn_manager_test.cpp b/be/test/olap/txn_manager_test.cpp
index d6a0860..8bf3f77 100644
--- a/be/test/olap/txn_manager_test.cpp
+++ b/be/test/olap/txn_manager_test.cpp
@@ -94,15 +94,14 @@ public:
}
virtual void SetUp() {
+ config::max_runnings_transactions_per_txn_map = 500;
+ _txn_mgr.reset(new TxnManager(64, 1024));
+
config::tablet_map_shard_size = 1;
config::txn_map_shard_size = 1;
config::txn_shard_size = 1;
- config::max_runnings_transactions_per_txn_map = 500;
- _txn_mgr.reset(new TxnManager(64, 1024));
- std::vector<StorePath> paths;
- paths.emplace_back("_engine_data_path", -1);
EngineOptions options;
- options.store_paths = paths;
+ // won't open engine, options.path is needless
options.backend_uid = UniqueId::gen_uid();
if (k_engine == nullptr) {
k_engine = new StorageEngine(options);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For additional commands, e-mail: commits-help@doris.apache.org