enable tests & clenup config for mock test

dbms/src/Storages/DeltaMerge/tests/gtest_dm_storage_delta_merge.cpp

@@ -34,13 +34,13 @@
 #include <Storages/StorageDeltaMerge.h>
 #include <Storages/StorageDeltaMergeHelpers.h>
 #include <Storages/Transaction/RegionRangeKeys.h>
+#include <Storages/Transaction/TiDB.h>
 #include <Storages/Transaction/TiKVRange.h>
 #include <Storages/Transaction/TiKVRecordFormat.h>
 #include <TestUtils/FunctionTestUtils.h>
 
 #include <limits>
 
-#include "Storages/Transaction/TiDB.h"
 #include "dm_basic_include.h"
 
 namespace DB

tests/docker/config/tics_dt.toml

@@ -13,25 +13,16 @@
 # limitations under the License.
 
 tmp_path = "/tmp/tiflash/data/tmp"
-display_name = "TiFlash"
-# specify paths used for store data, multiple path should be seperated by comma
 path = "/tmp/tiflash/data/db"
-capacity = "107374182400" 
-# multi-paths example
-# path = "/tmp/tiflash/data/db,/tmp/tiflash1,/tmp/tiflash2"
-# capacity = "0,0,0"
+capacity = "107374182400" # 100GB
 mark_cache_size = 5368709120
 minmax_index_cache_size = 5368709120
 tcp_port = 9000
 http_port = 8123
+
 [logger]
 count = 10
 errorlog = "/tmp/tiflash/log/error.log"
 size = "1000M"
 log = "/tmp/tiflash/log/server.log"
 level = "trace"
-[application]
-runAsDaemon = true
-[raft]
-# specify which storage engine we use. tmt or dt
-storage_engine = "dt"

tests/docker/config/tiflash_dt_async_grpc.toml

@@ -13,71 +13,15 @@
 # limitations under the License.
 
 tmp_path = "/tmp/tiflash/data/tmp"
-display_name = "TiFlash"
 
-## Deprecated storage path setting style. Check [storage] section for new style.
 path = "/tmp/tiflash/data/db"
 capacity = "10737418240"
-## Deprecated storage path setting style of multi-disks. Check [storage] section for new style.
-# path = "/tmp/tiflash/data/db,/tmp/tiflash1,/tmp/tiflash2"
-# capacity = "0"
 
 mark_cache_size = 5368709120
 minmax_index_cache_size = 5368709120
 tcp_port = 9000
 http_port = 8123
 
-## Storage paths settings.
-# [storage]
-## The storage format version in storage engine. Valid values: 1, 2 (experimental).
-## format_version = 1
-
-## If there are multiple SSD disks on the machine,
-## specify the path list on `storage.main.dir` can improve TiFlash performance.
-
-## If there are multiple disks with different IO metrics (e.g. one SSD and some HDDs)
-## on the machine, 
-## set `storage.latest.dir` to store the latest data on SSD (disks with higher IOPS metrics)
-## set `storage.main.dir` to store the main data on HDD (disks with lower IOPS metrics)
-## can improve TiFlash performance.
-
-# [storage.main]
-## The path to store main data.
-# e.g.
-# dir = [ "/data0/tiflash" ] 
-# or
-# dir = [ "/data0/tiflash", "/data1/tiflash" ]
-
-## Store capacity of each path, i.e. max data size allowed.
-## If it is not set, or is set to 0s, the actual disk capacity is used.
-## Note that we don't support human-readable big numbers(like "10GB") yet.
-## Please set in the specified number of bytes.
-# e.g.
-# capacity = [ 10737418240, 10737418240 ]
-
-# [storage.latest]
-## The path(s) to store latest data.
-## If not set, it will be the same with `storage.main.dir`.
-# dir = [ ]
-
-## Store capacity of each path, i.e. max data size allowed.
-## If it is not set, or is set to 0s, the actual disk capacity is used.
-# e.g.
-# capacity = [ 10737418240, 10737418240 ]
-
-# [storage.raft]
-## The path(s) to store Raft data.
-## If not set, it will be the paths in `storage.latest.dir` appended with "/kvstore".
-# dir = [ ]
-
-# [storage.io_rate_limit]
-## The max I/O bandwith. Default value is 0 and I/O rate limit is disabled.
-# max_bytes_per_sec = 268435456
-## max_read_bytes_per_sec and max_write_bytes_per_sec are the same meaning as max_bytes_per_sec,
-## but for disk that read bandwidth and write bandwith are calculated separatly, such as GCP's persistent disks.
-# max_read_bytes_per_sec = 0
-# max_write_bytes_per_sec = 0
-
 [flash]
 tidb_status_addr = "tidb0:10080"
 service_addr = "0.0.0.0:3930"
@@ -100,22 +44,9 @@ size = "1000M"
 log = "/tmp/tiflash/log/server.log"
 level = "trace"
 
-[application]
-runAsDaemon = true
-
 [raft]
 pd_addr = "pd0:2379"
 ignore_databases = "system,default"
-# specify which storage engine we use. tmt or dt 
-storage_engine = "dt"
-# Deprecated Raft data storage path setting style. Check [storage.raft] section for new style.
-# If it is not set, it will be the first path of "path" appended with "/kvstore".
-# kvstore_path = ""
-
-[raft.snapshot]
-# The way to apply snapshot data
-# The value is one of "block" / "file1" / "file2".
-# method = "file1"
 
 [profiles]
 [profiles.default]

tests/docker/config/tiflash_dt_disable_local_tunnel.toml

@@ -13,71 +13,15 @@
 # limitations under the License.
 
 tmp_path = "/tmp/tiflash/data/tmp"
-display_name = "TiFlash"
 
-## Deprecated storage path setting style. Check [storage] section for new style.
 path = "/tmp/tiflash/data/db"
 capacity = "10737418240"
-## Deprecated storage path setting style of multi-disks. Check [storage] section for new style.
-# path = "/tmp/tiflash/data/db,/tmp/tiflash1,/tmp/tiflash2"
-# capacity = "0"
 
 mark_cache_size = 5368709120
 minmax_index_cache_size = 5368709120
 tcp_port = 9000
 http_port = 8123
 
-## Storage paths settings.
-# [storage]
-## The storage format version in storage engine. Valid values: 1, 2 (experimental).
-## format_version = 1
-
-## If there are multiple SSD disks on the machine,
-## specify the path list on `storage.main.dir` can improve TiFlash performance.
-
-## If there are multiple disks with different IO metrics (e.g. one SSD and some HDDs)
-## on the machine, 
-## set `storage.latest.dir` to store the latest data on SSD (disks with higher IOPS metrics)
-## set `storage.main.dir` to store the main data on HDD (disks with lower IOPS metrics)
-## can improve TiFlash performance.
-
-# [storage.main]
-## The path to store main data.
-# e.g.
-# dir = [ "/data0/tiflash" ] 
-# or
-# dir = [ "/data0/tiflash", "/data1/tiflash" ]
-
-## Store capacity of each path, i.e. max data size allowed.
-## If it is not set, or is set to 0s, the actual disk capacity is used.
-## Note that we don't support human-readable big numbers(like "10GB") yet.
-## Please set in the specified number of bytes.
-# e.g.
-# capacity = [ 10737418240, 10737418240 ]
-
-# [storage.latest]
-## The path(s) to store latest data.
-## If not set, it will be the same with `storage.main.dir`.
-# dir = [ ]
-
-## Store capacity of each path, i.e. max data size allowed.
-## If it is not set, or is set to 0s, the actual disk capacity is used.
-# e.g.
-# capacity = [ 10737418240, 10737418240 ]
-
-# [storage.raft]
-## The path(s) to store Raft data.
-## If not set, it will be the paths in `storage.latest.dir` appended with "/kvstore".
-# dir = [ ]
-
-# [storage.io_rate_limit]
-## The max I/O bandwith. Default value is 0 and I/O rate limit is disabled.
-# max_bytes_per_sec = 268435456
-## max_read_bytes_per_sec and max_write_bytes_per_sec are the same meaning as max_bytes_per_sec,
-## but for disk that read bandwidth and write bandwith are calculated separatly, such as GCP's persistent disks.
-# max_read_bytes_per_sec = 0
-# max_write_bytes_per_sec = 0
-
 [flash]
 tidb_status_addr = "tidb0:10080"
 service_addr = "0.0.0.0:3930"
@@ -100,22 +44,9 @@ size = "1000M"
 log = "/tmp/tiflash/log/server.log"
 level = "trace"
 
-[application]
-runAsDaemon = true
-
 [raft]
 pd_addr = "pd0:2379"
 ignore_databases = "system,default"
-# specify which storage engine we use. tmt or dt 
-storage_engine = "dt"
-# Deprecated Raft data storage path setting style. Check [storage.raft] section for new style.
-# If it is not set, it will be the first path of "path" appended with "/kvstore".
-# kvstore_path = ""
-
-[raft.snapshot]
-# The way to apply snapshot data
-# The value is one of "block" / "file1" / "file2".
-# method = "file1"
 
 [profiles]
 [profiles.default]