cleanup

remove dead code and add comments

Author: replay

expr/tagquery/expression.go

@@ -371,21 +371,6 @@ func ExpressionsAreEqual(expr1, expr2 Expression) bool {
 // MetricDefinitionFilter takes a metric name together with its tags and returns a FilterDecision
 type MetricDefinitionFilter func(name string, tags []string) FilterDecision
 
-type MetricDefinitionFilters []MetricDefinitionFilter
-
-func (m MetricDefinitionFilters) Filter(name string, tags []string) FilterDecision {
-	for i := range m {
-		decision := m[i](name, tags)
-		if decision == Fail {
-			return Fail
-		} else if decision == Pass {
-			return Pass
-		}
-	}
-
-	return None
-}
-
 type FilterDecision uint8
 
 const (

expr/tagquery/query.go

@@ -79,8 +79,12 @@ func NewQuery(expressions Expressions, from int64) (Query, error) {
 	return q, nil
 }
 
-func (q *Query) GetMetricDefinitionFilters() (MetricDefinitionFilters, []FilterDecision) {
-	var filters MetricDefinitionFilters
+// GetMetricDefinitionFilters returns all the metric definition filters associated with this
+// query, together with their according default decision
+// The returned filters get generated from the query expressions, excluding the one which has
+// been dedicated to be the initial expression (marked via the .startWith index)
+func (q *Query) GetMetricDefinitionFilters() ([]MetricDefinitionFilter, []FilterDecision) {
+	var filters []MetricDefinitionFilter
 	var defaultDecisions []FilterDecision
 	for i := range q.Expressions {
 		// the one we start with does not need to be added to the filters,

idx/memory/tag_query.go

@@ -21,7 +21,7 @@ type TagQueryContext struct {
 	wg sync.WaitGroup
 
 	query            tagquery.Query
-	filters          tagquery.MetricDefinitionFilters
+	filters          []tagquery.MetricDefinitionFilter
 	defaultDecisions []tagquery.FilterDecision
 
 	index TagIndex                     // the tag index, hierarchy of tags & values, set by Run()/RunGetTags()