添加时间监控

Author: j2go

README.md

@@ -10,5 +10,10 @@
 - v0.2.0 完成 PostHandler, PutHandler, DeleteHandler
 - v0.3.0 支持权限认证，可管理到表和字段的权限
 
+# v0.1
+|功能|格式|示例|
+|---|---|---|
+|[x] 查询数组|"key[]":{}，后面是JSONObject，key可省略。 | {"User[]":{"User":{}}}，查询一个User数组。这里key和Table名都是User，User会被提取出来，即 {"User":{"id", ...}} 会被转化为 {"id", ...}，如果要进一步提取User中的id，可以把User[]改为User-id[] | 
+
 
 

core/context.go

@@ -70,15 +70,22 @@ func (o *SQLParseObject) parseListQuery(fieldMap map[string]interface{}) error {
 		case "page":
 			o.page = int(value.(float64))
 			logger.Debugf("parseListQuery table:%s, page: %d", o.table, o.page)
-		case "size":
+		case "count":
 			o.limit = int(value.(float64))
 			logger.Debugf("parseListQuery table:%s, size: %d", o.table, o.limit)
 		default:
-			if err := o.parseObject(field, value.(map[string]interface{})); err != nil {
-				return err
+			if _, ok := AllTable[field]; ok {
+				if err := o.parseObject(field, value.(map[string]interface{})); err != nil {
+					return err
+				}
+			} else {
+				logger.Warnf("请求数据拼写有误? key: %s", field)
 			}
 		}
 	}
+	if len(o.table) == 0 {
+		return fmt.Errorf("请求列表数据处理失败，未发现可用表名 %v", fieldMap)
+	}
 	o.withPage = o.page > 0 && o.limit > 0
 	return nil
 }

db/sqlparser.go

@@ -8,6 +8,7 @@ import (
 	"io/ioutil"
 	"net/http"
 	"strings"
+	"time"
 )
 
 func GetHandler(w http.ResponseWriter, r *http.Request) {
@@ -44,27 +45,38 @@ type SQLParseContext struct {
 	resp          map[string]interface{}
 	waitKeys      map[string]bool
 	completedKeys map[string]bool
+	time          map[string]int64
 	end           bool
 }
 
 func NewSQLParseContext(bodyMap map[string]interface{}) *SQLParseContext {
 	logger.Debugf("NewSQLParseContext %v", bodyMap)
-	return &SQLParseContext{req: bodyMap, resp: make(map[string]interface{}), waitKeys: make(map[string]bool), completedKeys: make(map[string]bool)}
+	return &SQLParseContext{
+		req:           bodyMap,
+		resp:          make(map[string]interface{}),
+		waitKeys:      make(map[string]bool),
+		completedKeys: make(map[string]bool),
+		time:          make(map[string]int64),
+	}
 }
 
 func (c *SQLParseContext) getResponse() map[string]interface{} {
-	for key, _ := range c.req {
+	startTime := time.Now().Nanosecond()
+	for key := range c.req {
 		if !c.completedKeys[key] {
 			c.parseResponse(key)
 			if c.end {
 				return c.resp
 			}
 		}
 	}
+	c.resp["time"] = fmt.Sprintf("%dms|%v", (time.Now().Nanosecond()-startTime)/1000000, c.time)
 	return c.resp
 }
 
 func (c *SQLParseContext) parseResponse(key string) {
+	startTime := time.Now().UnixNano()
+
 	c.waitKeys[key] = true
 	logger.Debugf("开始解析 %s", key)
 	if c.req[key] == nil {
@@ -97,9 +109,10 @@ func (c *SQLParseContext) parseResponse(key string) {
 		}
 	}
 	c.waitKeys[key] = false
-	//log.Println("get:query table: ", key, ", fields: ", fields)
+	c.time[key] = time.Now().UnixNano() - startTime
 }
 
+// 查询已知结果
 func (c *SQLParseContext) queryResp(queryString string) interface{} {
 	var paths []string
 	qs := strings.TrimSpace(queryString)
@@ -134,5 +147,5 @@ func (c *SQLParseContext) End(code int, msg string) {
 	c.resp["code"] = code
 	c.resp["msg"] = msg
 	c.end = true
-	logger.Debugf("发生错误，终止请求，code: %d, msg: %s", code, msg)
+	logger.Errorf("发生错误，终止处理, code: %d, msg: %s", code, msg)
 }

handler/getHandler.go

@@ -42,12 +42,24 @@ func Infof(format string, v ...interface{}) {
 	}
 	log.Printf("Info "+format, v...)
 }
+
 func Warn(msg string) {
 	if WARN < level {
 		return
 	}
 	log.Println("Warn", msg)
 }
+
+func Warnf(format string, v ...interface{}) {
+	if WARN < level {
+		return
+	}
+	log.Printf("Warn "+format, v...)
+}
+
 func Error(msg string) {
 	log.Println("Error", msg)
 }
+func Errorf(format string, v ...interface{}) {
+	log.Printf("Error "+format, v...)
+}