remove some useless variables in conf

conf/redis-shake.conf

@@ -19,9 +19,6 @@ system_profile = 9310
 # restful port，查看metric端口, -1表示不启用，如果是`restore`模式，只有设置为-1才会在完成RDB恢复后退出，否则会一直block。
 http_profile = 9320
 
-# runtime.GOMAXPROCS, 0 means use cpu core number: runtime.NumCPU()
-ncpu = 0
-
 # parallel routines number used in RDB file syncing. default is 64.
 # 启动多少个并发线程同步一个RDB文件。
 parallel = 32
@@ -165,31 +162,15 @@ metric = true
 # 是否将metric打印到log中
 metric.print_log = false
 
-# heartbeat
-# send heartbeat to this url
-# used in `sync`.
-# 心跳的url地址，redis-shake将会发送到这个地址
-#heartbeat.url = http://127.0.0.1:8000
-heartbeat.url =
-# interval by seconds
-# 心跳保活周期
-heartbeat.interval = 3
-# external info which will be included in heartbeat data.
-# 在心跳报文中添加额外的信息
-heartbeat.external = test external
-# local network card to get ip address, e.g., "lo", "eth0", "en0"
-# 获取ip的网卡
-heartbeat.network_interface =
-
 # sender information.
 # sender flush buffer size of byte.
 # used in `sync`.
 # 发送缓存的字节长度，超过这个阈值将会强行刷缓存发送
 sender.size = 104857600
 # sender flush buffer size of oplog number.
-# used in `sync`. flush sender buffer when bigger than this threshold. for cluster,
-# the maximum value is 4096.
-# 发送缓存的报文个数，超过这个阈值将会强行刷缓存发送，如果目的端是cluster，这个最大只能是4096。
+# used in `sync`. flush sender buffer when bigger than this threshold.
+# 发送缓存的报文个数，超过这个阈值将会强行刷缓存发送，对于目的端是cluster的情况，这个值
+# 的调大将会占用部分内存。
 sender.count = 4096
 # delay channel size. once one oplog is sent to target redis, the oplog id and timestamp will also
 # stored in this delay queue. this timestamp will be used to calculate the time delay when receiving
@@ -208,13 +189,11 @@ keep_alive = 0
 # number of keys captured each time. default is 100.
 # 每次scan的个数，不配置则默认100.
 scan.key_number = 50
-
 # used in `rump`.
 # we support some special redis types that don't use default `scan` command like alibaba cloud and tencent cloud.
 # 有些版本具有特殊的格式，与普通的scan命令有所不同，我们进行了特殊的适配。目前支持腾讯云的集群版"tencent_cluster"
 # 和阿里云的集群版"aliyun_cluster"。
 scan.special_cloud =
-
 # used in `rump`.
 # we support to fetching data from given file which marks the key list.
 # 有些云版本，既不支持sync/psync，也不支持scan，我们支持从文件中进行读取所有key列表并进行抓取：一行一个key。
@@ -230,6 +209,3 @@ qps = 200000
 # replace hash tag.
 # used in `sync`.
 replace_hash_tag = false
-
-# used in `restore` and `dump`.
-extra = false

src/redis-shake/configure/configure.go

@@ -4,65 +4,65 @@ import "time"
 
 type Configuration struct {
 	// config file variables
-	Id                        string   `config:"id"`
-	LogFile                   string   `config:"log.file"`
-	LogLevel                  string   `config:"log.level"`
-	SystemProfile             int      `config:"system_profile"`
-	HttpProfile               int      `config:"http_profile"`
+	Id                     string   `config:"id"`
+	LogFile                string   `config:"log.file"`
+	LogLevel               string   `config:"log.level"`
+	SystemProfile          int      `config:"system_profile"`
+	HttpProfile            int      `config:"http_profile"`
+	Parallel               int      `config:"parallel"`
+	SourceType             string   `config:"source.type"`
+	SourceAddress          string   `config:"source.address"`
+	SourcePasswordRaw      string   `config:"source.password_raw"`
+	SourcePasswordEncoding string   `config:"source.password_encoding"`
+	SourceAuthType         string   `config:"source.auth_type"`
+	SourceTLSEnable        bool     `config:"source.tls_enable"`
+	SourceRdbInput         []string `config:"source.rdb.input"`
+	SourceRdbParallel      int      `config:"source.rdb.parallel"`
+	SourceRdbSpecialCloud  string   `config:"source.rdb.special_cloud"`
+	TargetAddress          string   `config:"target.address"`
+	TargetPasswordRaw      string   `config:"target.password_raw"`
+	TargetPasswordEncoding string   `config:"target.password_encoding"`
+	TargetDBString         string   `config:"target.db"`
+	TargetAuthType         string   `config:"target.auth_type"`
+	TargetType             string   `config:"target.type"`
+	TargetTLSEnable        bool     `config:"target.tls_enable"`
+	TargetRdbOutput        string   `config:"target.rdb.output"`
+	TargetVersion          string   `config:"target.version"`
+	FakeTime               string   `config:"fake_time"`
+	Rewrite                bool     `config:"rewrite"`
+	FilterDBWhitelist      []string `config:"filter.db.whitelist"`
+	FilterDBBlacklist      []string `config:"filter.db.blacklist"`
+	FilterKeyWhitelist     []string `config:"filter.key.whitelist"`
+	FilterKeyBlacklist     []string `config:"filter.key.blacklist"`
+	FilterSlot             []string `config:"filter.slot"`
+	FilterLua              bool     `config:"filter.lua"`
+	BigKeyThreshold        uint64   `config:"big_key_threshold"`
+	Psync                  bool     `config:"psync"`
+	Metric                 bool     `config:"metric"`
+	MetricPrintLog         bool     `config:"metric.print_log"`
+	SenderSize             uint64   `config:"sender.size"`
+	SenderCount            uint     `config:"sender.count"`
+	SenderDelayChannelSize uint     `config:"sender.delay_channel_size"`
+	KeepAlive              uint     `config:"keep_alive"`
+	PidPath                string   `config:"pid_path"`
+	ScanKeyNumber          uint32   `config:"scan.key_number"`
+	ScanSpecialCloud       string   `config:"scan.special_cloud"`
+	ScanKeyFile            string   `config:"scan.key_file"`
+	Qps                    int      `config:"qps"`
+
+	/*---------------------------------------------------------*/
+	// inner variables
 	NCpu                      int      `config:"ncpu"`
-	Parallel                  int      `config:"parallel"`
-	SourceType                string   `config:"source.type"`
-	SourceAddress             string   `config:"source.address"`
-	SourcePasswordRaw         string   `config:"source.password_raw"`
-	SourcePasswordEncoding    string   `config:"source.password_encoding"`
-	SourceAuthType            string   `config:"source.auth_type"`
-	SourceTLSEnable           bool     `config:"source.tls_enable"`
-	SourceRdbInput            []string `config:"source.rdb.input"`
-	SourceRdbParallel         int      `config:"source.rdb.parallel"`
-	SourceRdbSpecialCloud     string   `config:"source.rdb.special_cloud"`
-	TargetAddress             string   `config:"target.address"`
-	TargetPasswordRaw         string   `config:"target.password_raw"`
-	TargetPasswordEncoding    string   `config:"target.password_encoding"`
-	TargetDBString            string   `config:"target.db"`
-	TargetAuthType            string   `config:"target.auth_type"`
-	TargetType                string   `config:"target.type"`
-	TargetTLSEnable           bool     `config:"target.tls_enable"`
-	TargetRdbOutput           string   `config:"target.rdb.output"`
-	TargetVersion             string   `config:"target.version"`
-	FakeTime                  string   `config:"fake_time"`
-	Rewrite                   bool     `config:"rewrite"`
-	FilterDBWhitelist         []string `config:"filter.db.whitelist"`
-	FilterDBBlacklist         []string `config:"filter.db.blacklist"`
-	FilterKeyWhitelist        []string `config:"filter.key.whitelist"`
-	FilterKeyBlacklist        []string `config:"filter.key.blacklist"`
-	FilterSlot                []string `config:"filter.slot"`
-	FilterLua                 bool     `config:"filter.lua"`
-	BigKeyThreshold           uint64   `config:"big_key_threshold"`
-	Psync                     bool     `config:"psync"`
-	Metric                    bool     `config:"metric"`
-	MetricPrintLog            bool     `config:"metric.print_log"`
 	HeartbeatUrl              string   `config:"heartbeat.url"`
 	HeartbeatInterval         uint     `config:"heartbeat.interval"`
 	HeartbeatExternal         string   `config:"heartbeat.external"`
 	HeartbeatNetworkInterface string   `config:"heartbeat.network_interface"`
-	SenderSize                uint64   `config:"sender.size"`
-	SenderCount               uint     `config:"sender.count"`
-	SenderDelayChannelSize    uint     `config:"sender.delay_channel_size"`
-	KeepAlive                 uint     `config:"keep_alive"`
-	PidPath                   string   `config:"pid_path"`
-	ScanKeyNumber             uint32   `config:"scan.key_number"`
-	ScanSpecialCloud          string   `config:"scan.special_cloud"`
-	ScanKeyFile               string   `config:"scan.key_file"`
-	Qps                       int      `config:"qps"`
-
-	/*---------------------------------------------------------*/
-	// inner variables
-	ReplaceHashTag bool     `config:"replace_hash_tag"`
-	ExtraInfo      bool     `config:"extra"`
-	SockFileName   string   `config:"sock.file_name"`
-	SockFileSize   uint     `config:"sock.file_size"`
-	FilterKey      []string `config:"filter.key"` // compatible with older versions
-	FilterDB       string   `config:"filter.db"`  // compatible with older versions
+	ReplaceHashTag            bool     `config:"replace_hash_tag"`
+	ExtraInfo                 bool     `config:"extra"`
+	SockFileName              string   `config:"sock.file_name"`
+	SockFileSize              uint     `config:"sock.file_size"`
+	FilterKey                 []string `config:"filter.key"` // compatible with older versions
+	FilterDB                  string   `config:"filter.db"`  // compatible with older versions
 
 	/*---------------------------------------------------------*/
 	// generated variables