Merge pull request apache#10 from wangtuanjie/wtj

statd.v4

Author: wangtuanjie

go/src/pili.qiniu.com/statd.v4/http/http.go

@@ -64,7 +64,7 @@ func storageHandlerHelp(stg statd.Storage, name string, handler Hanlder) func(w
 
 	return func(w http.ResponseWriter, req *http.Request) {
 		xl := xlog.New(w, req)
-		query, err := storageQueryOf(req)
+		query, err := queryOf(req)
 		if err != nil {
 			httputil.ReplyErr(w, 400, err.Error())
 			return
@@ -76,7 +76,7 @@ func storageHandlerHelp(stg statd.Storage, name string, handler Hanlder) func(w
 	}
 }
 
-func storageQueryOf(req *http.Request) (query statd.Query, err error) {
+func queryOf(req *http.Request) (query statd.Query, err error) {
 
 	var ok bool
 	query.Where = make(map[string]interface{})

go/src/pili.qiniu.com/statd.v4/http/http_test.go

@@ -160,6 +160,29 @@ foo:
 		resp.Body.Close()
 		ast.Equal(200, resp.StatusCode)
 	}
+
+	{
+		// invalid arg cases
+		try := func(query string) {
+			client := http.Client{Transport: stubTransport{123, false}}
+			resp, err := client.Get(srv.URL + "/v4/foo?" + query)
+			ast.NoError(err)
+			resp.Body.Close()
+			ast.Equal(400, resp.StatusCode)
+		}
+
+		tryf := func(f string, a ...interface{}) {
+			try(fmt.Sprintf(f, a...))
+		}
+
+		try("")
+		try("begin=invalid")
+		tryf("begin=%v", start.Unix())
+		tryf("begin=%v&end=invalid", start.Unix())
+		tryf("begin=%v&end=%v", start.Unix(), end.Unix())
+		tryf("begin=%v&end=%v&g=invalid", start.Unix(), end.Unix())
+		tryf("begin=%v&end=%v&g=5min", start.Unix(), end.Unix())
+	}
 }
 
 //-----------------------------------------------------------------------------

go/src/pili.qiniu.com/statd.v4/time.go

@@ -48,6 +48,7 @@ func NextMonth(t time.Time) time.Time {
 // 5. 2006-01-02/00:00
 // 6. 20060102150405
 // 7. 2006-01-02T15:04:05Z07:00 (RFC3339)
+// 8. duration-ago, 如 5h-ago
 func TimeOf(str string) (t time.Time, ok bool) {
 	var err error
 	if strings.HasPrefix(str, "20") {
@@ -65,6 +66,15 @@ func TimeOf(str string) (t time.Time, ok bool) {
 			ok = err == nil
 			return
 		}
+	} else if strings.HasSuffix(str, "-ago") {
+		str = strings.TrimSuffix(str, "-ago")
+		dur, err := time.ParseDuration(str)
+		if err != nil {
+			ok = false
+			return
+		}
+		return time.Now().Add(-dur), true
+
 	} else {
 		var n uint64
 		if n, err = strconv.ParseUint(str, 10, 63); err != nil {

go/src/pili.qiniu.com/statd.v4/time_test.go

@@ -77,14 +77,23 @@ func TestTimeOf(t *testing.T) {
 	}
 
 	for _, c := range cases {
-		t1, ok := TimeOf(fmt.Sprint(c))
+		tt, ok := TimeOf(fmt.Sprint(c))
 		if !ok {
 			t.Fatalf("parse %v failed", c)
 		}
-		if !t1.Equal(now) {
-			t.Fatalf("parse %v, expect = %v actual = %v\n", c, now, t1)
+		if !tt.Equal(now) {
+			t.Fatalf("parse %v, expect = %v actual = %v\n", c, now, tt)
 		}
 	}
+
+	tt, ok := TimeOf("5h-ago")
+	if !ok {
+		t.Fatal("parse 5h-ago failed")
+	}
+	dur := time.Since(tt)
+	if dur.Seconds() < 5*3600 {
+		t.Fatal("parse 5h-ago failed -", dur)
+	}
 }
 
 func TestGetEnd(t *testing.T) {