Merge branch 'master' into grzkv/context_cancellation_fix_concurrency_improvement

Author: grzkv

app/carbonapi/app.go

@@ -426,7 +426,6 @@ func (app *App) deferredAccessLogging(r *http.Request, accessLogDetails *carbona
 	}
 }
 
-var graphTemplates map[string]png.PictureParams
 var timeBuckets []int64
 var expTimeBuckets []int64
 

app/carbonapi/http_handlers.go

@@ -1130,62 +1130,3 @@ func buildParseErrorString(target, e string, err error) string {
 	}
 	return msg
 }
-
-type treejson struct {
-	AllowChildren int            `json:"allowChildren"`
-	Expandable    int            `json:"expandable"`
-	Leaf          int            `json:"leaf"`
-	ID            string         `json:"id"`
-	Text          string         `json:"text"`
-	Context       map[string]int `json:"context"` // unused
-}
-
-var treejsonContext = make(map[string]int)
-
-func findTreejson(globs dataTypes.Matches) ([]byte, error) {
-	var b bytes.Buffer
-
-	var tree = make([]treejson, 0)
-
-	seen := make(map[string]struct{})
-
-	basepath := globs.Name
-
-	if i := strings.LastIndex(basepath, "."); i != -1 {
-		basepath = basepath[:i+1]
-	} else {
-		basepath = ""
-	}
-
-	for _, g := range globs.Matches {
-
-		name := g.Path
-
-		if i := strings.LastIndex(name, "."); i != -1 {
-			name = name[i+1:]
-		}
-
-		if _, ok := seen[name]; ok {
-			continue
-		}
-		seen[name] = struct{}{}
-
-		t := treejson{
-			ID:      basepath + name,
-			Context: treejsonContext,
-			Text:    name,
-		}
-
-		if g.IsLeaf {
-			t.Leaf = 1
-		} else {
-			t.AllowChildren = 1
-			t.Expandable = 1
-		}
-
-		tree = append(tree, t)
-	}
-
-	err := json.NewEncoder(&b).Encode(tree)
-	return b.Bytes(), err
-}