Sync route tree to httprouter latest code (#2368)

* update tree Signed-off-by: Bo-Yi Wu <[email protected]> * update Signed-off-by: Bo-Yi Wu <[email protected]> * update Signed-off-by: Bo-Yi Wu <[email protected]> * update countParams Signed-off-by: Bo-Yi Wu <[email protected]> * fix testing Signed-off-by: Bo-Yi Wu <[email protected]> * update Signed-off-by: Bo-Yi Wu <[email protected]> * update Signed-off-by: Bo-Yi Wu <[email protected]> * udpate Signed-off-by: Bo-Yi Wu <[email protected]> * fix testing Signed-off-by: Bo-Yi Wu <[email protected]> * refactor gin context Signed-off-by: Bo-Yi Wu <[email protected]> * add fullPath Signed-off-by: Bo-Yi Wu <[email protected]> * chore: refactor * remove unused code Signed-off-by: Bo-Yi Wu <[email protected]> * remove varsCount Signed-off-by: Bo-Yi Wu <[email protected]> * refactor Signed-off-by: Bo-Yi Wu <[email protected]>
gin-gonic · May 10, 2020 · d17270d · d17270d
1 parent 6f3d96c
commit d17270d
Show file tree

Hide file tree

Showing 4 changed files with 393 additions and 282 deletions.
diff --git a/context.go b/context.go
@@ -54,6 +54,7 @@ type Context struct {
 	fullPath string
 
 	engine *Engine
+	params *Params
 
 	// This mutex protect Keys map
 	mu sync.RWMutex
@@ -95,6 +96,7 @@ func (c *Context) reset() {
 	c.Accepted = nil
 	c.queryCache = nil
 	c.formCache = nil
+	*c.params = (*c.params)[0:0]
 }
 
 // Copy returns a copy of the current context that can be safely used outside the request's scope.

diff --git a/gin.go b/gin.go
@@ -113,6 +113,7 @@ type Engine struct {
 	noMethod         HandlersChain
 	pool             sync.Pool
 	trees            methodTrees
+	maxParams        uint16
 }
 
 var _ IRouter = &Engine{}
@@ -163,7 +164,8 @@ func Default() *Engine {
 }
 
 func (engine *Engine) allocateContext() *Context {
-	return &Context{engine: engine}
+	v := make(Params, 0, engine.maxParams)
+	return &Context{engine: engine, params: &v}
 }
 
 // Delims sets template left and right delims and returns a Engine instance.
@@ -256,13 +258,19 @@ func (engine *Engine) addRoute(method, path string, handlers HandlersChain) {
 	assert1(len(handlers) > 0, "there must be at least one handler")
 
 	debugPrintRoute(method, path, handlers)
+
 	root := engine.trees.get(method)
 	if root == nil {
 		root = new(node)
 		root.fullPath = "/"
 		engine.trees = append(engine.trees, methodTree{method: method, root: root})
 	}
 	root.addRoute(path, handlers)
+
+	// Update maxParams
+	if paramsCount := countParams(path); paramsCount > engine.maxParams {
+		engine.maxParams = paramsCount
+	}
 }
 
 // Routes returns a slice of registered routes, including some useful information, such as:
@@ -402,10 +410,12 @@ func (engine *Engine) handleHTTPRequest(c *Context) {
 		}
 		root := t[i].root
 		// Find route in tree
-		value := root.getValue(rPath, c.Params, unescape)
+		value := root.getValue(rPath, c.params, unescape)
+		if value.params != nil {
+			c.Params = *value.params
+		}
 		if value.handlers != nil {
 			c.handlers = value.handlers
-			c.Params = value.params
 			c.fullPath = value.fullPath
 			c.Next()
 			c.writermem.WriteHeaderNow()