remove tilde from name values when indexing tags

Author: replay

Gopkg.lock

@@ -111,7 +111,7 @@ unused-packages = true
 
 [[constraint]]
   name = "github.com/raintank/schema"
-  revision = "5611429bd204bf26a3de166316cf3cad0de377c9"
+  revision = "4338db1233d0ebaa44a7523061c8f37e65d2868c"
 
 [[constraint]]
   name = "github.com/rs/cors"

Gopkg.toml

@@ -478,7 +478,7 @@ func (m *UnpartitionedMemoryIdx) indexTags(def *schema.MetricDefinition) {
 		tagValue := tagSplits[1]
 		tags.addTagId(tagName, tagValue, def.Id)
 	}
-	tags.addTagId("name", def.Name, def.Id)
+	tags.addTagId("name", def.NameSanitizedAsTagValue(), def.Id)
 
 	m.defByTagSet.add(def)
 }
@@ -504,7 +504,7 @@ func (m *UnpartitionedMemoryIdx) deindexTags(tags TagIndex, def *schema.MetricDe
 		tags.delTagId(tagName, tagValue, def.Id)
 	}
 
-	tags.delTagId("name", def.Name, def.Id)
+	tags.delTagId("name", def.NameSanitizedAsTagValue(), def.Id)
 
 	m.defByTagSet.del(def)
 
@@ -890,7 +890,7 @@ func (m *UnpartitionedMemoryIdx) FindTagValues(orgId uint32, tag, prefix string,
 
 			// special case if the tag to complete values for is "name"
 			if tag == "name" {
-				valueMap[def.Name] = struct{}{}
+				valueMap[schema.SanitizeNameAsTagValue(def.Name)] = struct{}{}
 			} else {
 				for _, t := range def.Tags {
 					if !strings.HasPrefix(t, prefix) {
@@ -1275,7 +1275,7 @@ func (m *UnpartitionedMemoryIdx) DeleteTagged(orgId uint32, paths []string) ([]i
 			continue
 		}
 		expressions := elements[1:]
-		expressions = append(expressions, "name="+elements[0])
+		expressions = append(expressions, "name="+schema.SanitizeNameAsTagValue(elements[0]))
 
 		q, err := NewTagQuery(expressions, 0)
 		if err != nil {

idx/memory/memory.go

@@ -571,7 +571,7 @@ func (q *TagQuery) testByMatch(def *idx.Archive, exprs []kvRe, not bool) bool {
 EXPRS:
 	for _, e := range exprs {
 		if e.key == "name" {
-			if e.value == nil || e.value.MatchString(def.Name) {
+			if e.value == nil || e.value.MatchString(schema.SanitizeNameAsTagValue(def.Name)) {
 				if not {
 					return false
 				} else {
@@ -696,7 +696,7 @@ func (q *TagQuery) testByFrom(def *idx.Archive) bool {
 func (q *TagQuery) testByPrefix(def *idx.Archive, exprs []kv) bool {
 EXPRS:
 	for _, e := range exprs {
-		if e.key == "name" && strings.HasPrefix(def.Name, e.value) {
+		if e.key == "name" && strings.HasPrefix(schema.SanitizeNameAsTagValue(def.Name), e.value) {
 			continue EXPRS
 		}