move Tikv conf to Titan struct

xiaojunhong · Jan 10, 2019 · 1aa1d59 · 1aa1d59
1 parent bed519a
commit 1aa1d59
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 21 deletions.
diff --git a/bin/titan/main.go b/bin/titan/main.go
@@ -45,7 +45,7 @@ func main() {
 		os.Exit(1)
 	}
 	if pdAddrs != "" {
-		config.Server.Tikv.PdAddrs = pdAddrs
+		config.Tikv.PdAddrs = pdAddrs
 	}
 
 	if err := ConfigureZap(config.Logger.Name, config.Logger.Path, config.Logger.Level,
@@ -60,7 +60,7 @@ func main() {
 		os.Exit(1)
 	}
 
-	store, err := db.Open(&config.Server.Tikv)
+	store, err := db.Open(&config.Tikv)
 	if err != nil {
 		zap.L().Fatal("open db failed", zap.Error(err))
 		os.Exit(1)

diff --git a/command/hashes.go b/command/hashes.go
@@ -258,11 +258,13 @@ func HMSet(ctx *Context, txn *db.Transaction) (OnCommit, error) {
 		return nil, errors.New("ERR wrong number of arguments for HMSET")
 	}
 
-	// filter repeate fields
+	// When there are multiple groups of the same field/val,
+	// take the last valid fields/val pair and save it in mapping
 	for i := 0; i < len(kvs)-1; i += 2 {
 		mapping[kvs[i]] = []byte(kvs[i+1])
 	}
 
+	// Iterate mapping to get the field and value after de-duplication
 	for field, val := range mapping {
 		fields = append(fields, []byte(field))
 		values = append(values, val)

diff --git a/conf/config.go b/conf/config.go
@@ -6,6 +6,7 @@ import "time"
 type Titan struct {
 	Server      Server     `cfg:"server"`
 	Status      Status     `cfg:"status"`
+	Tikv        Tikv       `cfg:"tikv"`
 	TikvLog     TikvLogger `cfg:"tikv-logger"`
 	Logger      Logger     `cfg:"logger"`
 	PIDFileName string     `cfg:"pid-filename; titan.pid; ; the file name to record connd PID"`
@@ -21,7 +22,6 @@ type Hash struct {
 
 //Server config is the config of titan server
 type Server struct {
-	Tikv          Tikv   `cfg:"tikv"`
 	Auth          string `cfg:"auth;;;client connetion auth"`
 	Listen        string `cfg:"listen; 0.0.0.0:7369; netaddr; address to listen"`
 	MaxConnection int64  `cfg:"max-connection;1000;numeric;client connection count"`

diff --git a/conf/titan.toml b/conf/titan.toml
@@ -21,16 +21,26 @@ auth = ""
 #default:     1000
 #max-connection = 1000
 
-[server.tikv]
+
+[status]
+
+#type:        string
+#rules:       nonempty
+#description: listen address of http server
+#default:     0.0.0.0:7345
+#listen = "0.0.0.0:7345"
+
+
+[tikv]
 
 #type:        string
 #description: pd address in tidb
 #required
 pd-addrs = ""
 
-[server.tikv.db]
+[tikv.db]
 
-[server.tikv.db.hash]
+[tikv.db.hash]
 
 #type:        int64
 #rules:       numeric
@@ -39,7 +49,7 @@ pd-addrs = ""
 #meta-slot = 0
 
 
-[server.tikv.zt]
+[tikv.zt]
 
 #type:        int
 #rules:       numeric
@@ -65,15 +75,6 @@ pd-addrs = ""
 #interval = "1s"
 
 
-[status]
-
-#type:        string
-#rules:       nonempty
-#description: listen address of http server
-#default:     0.0.0.0:7345
-#listen = "0.0.0.0:7345"
-
-
 [tikv-logger]
 
 #type:        string

diff --git a/tools/integration/titan.go b/tools/integration/titan.go
@@ -19,9 +19,9 @@ var (
 		Listen:        ServerAddr,
 		MaxConnection: 10000,
 		Auth:          "",
-		Tikv: conf.Tikv{
-			PdAddrs: "mocktikv://",
-		},
+	}
+	tikvConf = conf.Tikv{
+		PdAddrs: "mocktikv://",
 	}
 
 	//ServerAddr default server addr
@@ -41,7 +41,7 @@ func SetAuth(auth string) {
 func Start() {
 	zap.ReplaceGlobals(zap.NewNop())
 	var err error
-	store, err := db.Open(&cfg.Tikv)
+	store, err := db.Open(&tikvConf)
 	if err != nil {
 		log.Fatalln(err)
 	}