Merge pull request #210 from msaf1980/fix_render_unescape

render: revert unescape

Author: msaf1980

cmd/e2e-test/clickhouse.go

@@ -141,7 +141,7 @@ func (c *Clickhouse) Query(sql string) (string, error) {
 	return string(msg), nil
 }
 
-func (c *Clickhouse) IsUp() bool {
+func (c *Clickhouse) Alive() bool {
 	if len(c.container) == 0 {
 		return false
 	}

cmd/e2e-test/e2etesting.go

@@ -452,12 +452,12 @@ func testGraphiteClickhouse(test *TestSchema, clickhouse *Clickhouse, testDir, r
 		)
 		time.Sleep(500 * time.Millisecond)
 		for i := 200; i < 2000; i += 200 {
-			if clickhouse.IsUp() {
+			if clickhouse.Alive() {
 				break
 			}
 			time.Sleep(time.Duration(i) * time.Millisecond)
 		}
-		if !clickhouse.IsUp() {
+		if !clickhouse.Alive() {
 			logger.Error("starting clickhouse",
 				zap.String("config", test.name),
 				zap.Any("clickhouse version", clickhouse.Version),

cmd/graphite-clickhouse-client/main.go

@@ -58,16 +58,16 @@ func main() {
 	now := time.Now()
 
 	from := datetime.DateParamToEpoch(*fromStr, tz, now, 0)
-	if from == 0 {
+	if from == 0 && len(targets) > 0 {
 		fmt.Printf("invalid from: %s\n", *fromStr)
 		os.Exit(1)
 	}
 	var until int64
-	if *untilStr == "" {
+	if *untilStr == "" && len(targets) > 0 {
 		*untilStr = "now"
 	}
 	until = datetime.DateParamToEpoch(*untilStr, tz, now, 0)
-	if until == 0 {
+	if until == 0 && len(targets) > 0 {
 		fmt.Printf("invalid until: %s\n", *untilStr)
 		os.Exit(1)
 	}

finder/tagged.go

@@ -474,7 +474,10 @@ func tagsParse(path string) (string, []string, error) {
 		return name, nil, fmt.Errorf("incomplete tags in '%s'", path)
 	}
 	tags := strings.Split(args, "&")
-	return name, tags, nil
+	for i := range tags {
+		tags[i] = unescape(tags[i])
+	}
+	return unescape(name), tags, nil
 }
 
 func TaggedDecode(v []byte) []byte {

finder/tagged_test.go

@@ -2,6 +2,7 @@ package finder
 
 import (
 	"fmt"
+	"net/url"
 	"strconv"
 	"testing"
 	"time"
@@ -315,3 +316,41 @@ func TestTaggedFinder_whereFilter(t *testing.T) {
 		})
 	}
 }
+
+func TestTaggedFinder_Abs(t *testing.T) {
+	tests := []struct {
+		name   string
+		v      []byte
+		cached bool
+		want   []byte
+	}{
+		{
+			name:   "cached",
+			v:      []byte("test_metric;colon=:;forward=/;hash=#;host=127.0.0.1;minus=-;percent=%;plus=+;underscore=_"),
+			cached: true,
+			want:   []byte("test_metric;colon=:;forward=/;hash=#;host=127.0.0.1;minus=-;percent=%;plus=+;underscore=_"),
+		},
+		{
+			name: "escaped",
+			v: []byte(url.QueryEscape("instance:cpu_utilization?ratio_avg") +
+				"?" + url.QueryEscape("dc") + "=" + url.QueryEscape("qwe+1") +
+				"&" + url.QueryEscape("fqdn") + "=" + url.QueryEscape("asd&a") +
+				"&" + url.QueryEscape("instance") + "=" + url.QueryEscape("10.33.10.10:9100") +
+				"&" + url.QueryEscape("job") + "=" + url.QueryEscape("node&a")),
+			want: []byte("instance:cpu_utilization?ratio_avg;dc=qwe+1;fqdn=asd&a;instance=10.33.10.10:9100;job=node&a"),
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			var tf *TaggedFinder
+			if tt.cached {
+				tf = NewCachedTags(nil)
+			} else {
+				tf = NewTagged("http:/127.0.0.1:8123", "graphite_tags", true, false, clickhouse.Options{}, nil)
+			}
+			if got := string(tf.Abs(tt.v)); got != string(tt.want) {
+				t.Errorf("TaggedDecode() =\n%q\nwant\n%q", got, string(tt.want))
+			}
+		})
+	}
+}

finder/unescape.go

@@ -0,0 +1,63 @@
+package finder
+
+import "strings"
+
+func ishex(c byte) bool {
+	switch {
+	case '0' <= c && c <= '9':
+		return true
+	case 'a' <= c && c <= 'f':
+		return true
+	case 'A' <= c && c <= 'F':
+		return true
+	}
+	return false
+}
+
+func unhex(c byte) byte {
+	switch {
+	case '0' <= c && c <= '9':
+		return c - '0'
+	case 'a' <= c && c <= 'f':
+		return c - 'a' + 10
+	case 'A' <= c && c <= 'F':
+		return c - 'A' + 10
+	}
+	return 0
+}
+
+func isPercentEscape(s string, i int) bool {
+	return i+2 < len(s) && ishex(s[i+1]) && ishex(s[i+2])
+}
+
+// unescape unescapes a string.
+func unescape(s string) string {
+	first := strings.IndexByte(s, '%')
+	if first == -1 {
+		return s
+	}
+	var t strings.Builder
+	t.Grow(len(s))
+	t.WriteString(s[:first])
+
+LOOP:
+	for i := first; i < len(s); i++ {
+		switch s[i] {
+		case '%':
+			if len(s) < i+3 {
+				t.WriteString(s[i:])
+				break LOOP
+			}
+			if !isPercentEscape(s, i) {
+				t.WriteString(s[i : i+3])
+			} else {
+				t.WriteByte(unhex(s[i+1])<<4 | unhex(s[i+2]))
+			}
+			i += 2
+		default:
+			t.WriteByte(s[i])
+		}
+	}
+
+	return t.String()
+}

tests/one_table/test.toml

@@ -54,6 +54,10 @@ points = [{value = 0.5, time = "rnow-30"}, {value = 1.5, time = "rnow-20"}, {val
 name = "metric2;tag2=value21;tag4=value4"
 points = [{value = 2.0, time = "rnow-30"}, {value = 1.0, time = "rnow-20"}, {value = 0.0, time = "rnow-10"}, {value = 1.0, time = "rnow"}]
 
+[[test.input]]
+name = "test_metric;minus=-;plus=+;percent=%;underscore=_;colon=:;hash=#;forward=/;host=127.0.0.1"
+points = [{value = 2.1, time = "rnow-30"}, {value = 0.1, time = "rnow-20"}, {value = 0.2, time = "rnow-10"}, {value = 1.5, time = "rnow"}]
+
 ######################################
 # Check metrics find
 
@@ -87,6 +91,12 @@ result = [
     "metric1",
 ]
 
+[[test.tags_checks]]
+query = "colon;percent=%"
+result = [
+    ":",
+]
+
 # End - Check tags autocomplete
 ##########################################################################
 # Plain metrics (carbonapi_v3_pb)
@@ -328,6 +338,25 @@ stop = "rnow+10"
 step = 10
 values = [0.0, 1.0]
 
+# End - Tagged metrics (pickle)
+##########################################################################
+# Unescape
+
+[[test.render_checks]]
+formats = [ "protobuf", "carbonapi_v2_pb" ]
+from = "rnow-10"
+until = "rnow+1"
+targets = [ 
+    "seriesByTag('percent=%')",
+]
+
+[[test.render_checks.result]]
+name = "test_metric;colon=:;forward=/;hash=#;host=127.0.0.1;minus=-;percent=%;plus=+;underscore=_"
+start = "rnow-10"
+stop = "rnow+10"
+step = 10
+values = [0.2, 1.5]
+
 # End - Tagged metrics (pickle)
 ##########################################################################
 # Midnight