Merge aab980d into c95c8b3

distributedio · Jan 10, 2019 · ba2996c · ba2996c
2 parents c95c8b3 + aab980d
commit ba2996c
Show file tree

Hide file tree

Showing 18 changed files with 2,373 additions and 158 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/error.go b/command/error.go
@@ -43,6 +43,9 @@ var (
 	// ErrInteger value is not an integer or out of range
 	ErrInteger = errors.New("ERR value is not an integer or out of range")
 
+	// ErrFloat value is not a valid float
+	ErrFloat = errors.New("ERR value is not a valid float")
+
 	// ErrBitInteger bit is not an integer or out of range
 	ErrBitInteger = errors.New("ERR bit is not an integer or out of range")