tiny clean

tikv · May 16, 2017 · 5b6b0ad · 5b6b0ad
1 parent e230a47
commit 5b6b0ad
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/server/cluster.go b/server/cluster.go
@@ -193,6 +193,9 @@ func (s *Server) GetRaftClusterBootstrapTime() (time.Time, error) {
 	if err != nil {
 		return zeroTime, errors.Trace(err)
 	}
+	if len(data) == 0 {
+		return zeroTime, ErrNotBootstrapped
+	}
 	return parseTimestamp(data)
 }
 

diff --git a/server/tso.go b/server/tso.go
@@ -49,6 +49,9 @@ func (s *Server) loadTimestamp() (time.Time, error) {
 	if err != nil {
 		return zeroTime, errors.Trace(err)
 	}
+	if len(data) == 0 {
+		return zeroTime, nil
+	}
 	return parseTimestamp(data)
 }
 

diff --git a/server/util.go b/server/util.go
@@ -335,9 +335,6 @@ func diffRegionKeyInfo(origin *RegionInfo, other *RegionInfo) string {
 }
 
 func parseTimestamp(data []byte) (time.Time, error) {
-	if len(data) == 0 {
-		return zeroTime, nil
-	}
 	nano, err := bytesToUint64(data)
 	if err != nil {
 		return zeroTime, errors.Trace(err)