proxy: rename Request.Start to UnixNano to avoid misunderstanding

spinlock · spinlock · commit 39e5e7229c08 · 2017-03-05T18:49:01.000+08:00
diff --git a/pkg/proxy/request.go b/pkg/proxy/request.go
@@ -13,15 +13,16 @@ import (
 
 type Request struct {
 	Multi []*redis.Resp
-	Start int64
 	Batch *sync.WaitGroup
 	Group *sync.WaitGroup
 
+	Broken *atomic2.Bool
+
 	OpStr string
 	OpFlag
 
 	Database int32
-	Broken   *atomic2.Bool
+	UnixNano int64
 
 	*redis.Resp
 	Err error
@@ -37,20 +38,20 @@ func (r *Request) MakeSubRequest(n int) []Request {
 	var sub = make([]Request, n)
 	for i := range sub {
 		x := &sub[i]
-		x.Start = r.Start
 		x.Batch = r.Batch
 		x.OpStr = r.OpStr
 		x.OpFlag = r.OpFlag
-		x.Database = r.Database
 		x.Broken = r.Broken
+		x.Database = r.Database
+		x.UnixNano = r.UnixNano
 	}
 	return sub
 }
 
 const GOLDEN_RATIO_PRIME_32 = 0x9e370001
 
 func (r *Request) Seed16() uint {
-	h32 := uint32(r.Start) + uint32(uintptr(unsafe.Pointer(r)))
+	h32 := uint32(r.UnixNano) + uint32(uintptr(unsafe.Pointer(r)))
 	h32 *= GOLDEN_RATIO_PRIME_32
 	return uint(h32 >> 16)
 }
diff --git a/pkg/proxy/session.go b/pkg/proxy/session.go
@@ -166,9 +166,9 @@ func (s *Session) loopReader(tasks chan<- *Request, d *Router) (err error) {
 
 		r := &Request{}
 		r.Multi = multi
-		r.Start = start.UnixNano()
 		r.Batch = &sync.WaitGroup{}
 		r.Database = s.database
+		r.UnixNano = start.UnixNano()
 
 		if len(tasks) == cap(tasks) {
 			return ErrTooManyPipelinedRequests
@@ -635,7 +635,7 @@ func (s *Session) getOpStats(opstr string) *opStats {
 func (s *Session) incrOpStats(r *Request, t redis.RespType) {
 	e := s.getOpStats(r.OpStr)
 	e.calls.Incr()
-	e.nsecs.Add(time.Now().UnixNano() - r.Start)
+	e.nsecs.Add(time.Now().UnixNano() - r.UnixNano)
 	switch t {
 	case redis.TypeError:
 		e.redis.errors.Incr()
