frostdb: Simplify queries to be more compact

Author: brancz

frostdb/frostdb.go

@@ -70,33 +70,15 @@ func (f *FrostDB) Query() error {
 }
 
 func (f *FrostQuerier) LabelValues(name string, matchers ...*labels.Matcher) ([]string, storage.Warnings, error) {
-	exprs := []logicalplan.Expr{}
-	// Build a filter from matchers
-	for _, matcher := range matchers {
-		switch matcher.Type {
-		case labels.MatchEqual:
-			exprs = append(exprs, logicalplan.Col("labels."+matcher.Name).Eq(logicalplan.Literal(matcher.Value)))
-		case labels.MatchNotEqual:
-			exprs = append(exprs, logicalplan.Col("labels."+matcher.Name).NotEq(logicalplan.Literal(matcher.Value)))
-		case labels.MatchRegexp:
-			exprs = append(exprs, logicalplan.Col("labels."+matcher.Name).RegexMatch(matcher.Value))
-		case labels.MatchNotRegexp:
-			exprs = append(exprs, logicalplan.Col("labels."+matcher.Name).RegexNotMatch(matcher.Value))
-		}
-	}
-
 	engine := query.NewEngine(
 		memory.NewGoAllocator(),
 		f.db.TableProvider(),
 	)
 
-	bld := engine.ScanTable("metrics")
-	if len(exprs) != 0 {
-		bld.Filter(logicalplan.And(exprs...))
-	}
-
 	sets := map[uint64]*series{}
-	err := bld.Distinct(logicalplan.Col("labels."+name)).
+	err := engine.ScanTable("metrics").
+		Filter(promMatchersToFrostDBExprs(matchers)).
+		Distinct(logicalplan.Col("labels."+name)).
 		Execute(context.Background(), func(ar arrow.Record) error {
 			defer ar.Release()
 			parseRecordIntoSeriesSet(ar, sets)
@@ -117,9 +99,8 @@ func (f *FrostQuerier) LabelValues(name string, matchers ...*labels.Matcher) ([]
 	return names, nil, nil
 }
 
-func (f *FrostQuerier) LabelNames(matchers ...*labels.Matcher) ([]string, storage.Warnings, error) {
+func promMatchersToFrostDBExprs(matchers []*labels.Matcher) logicalplan.Expr {
 	exprs := []logicalplan.Expr{}
-	// Build a filter from matchers
 	for _, matcher := range matchers {
 		switch matcher.Type {
 		case labels.MatchEqual:
@@ -132,25 +113,26 @@ func (f *FrostQuerier) LabelNames(matchers ...*labels.Matcher) ([]string, storag
 			exprs = append(exprs, logicalplan.Col("labels."+matcher.Name).RegexNotMatch(matcher.Value))
 		}
 	}
+	return logicalplan.And(exprs...)
+}
 
+func (f *FrostQuerier) LabelNames(matchers ...*labels.Matcher) ([]string, storage.Warnings, error) {
 	engine := query.NewEngine(
 		memory.NewGoAllocator(),
 		f.db.TableProvider(),
 	)
 
-	bld := engine.ScanSchema("metrics")
-	if len(exprs) != 0 {
-		bld.Filter(logicalplan.And(exprs...))
-	}
-
 	sets := map[string]struct{}{}
-	err := bld.Project(logicalplan.DynCol("labels")).Execute(context.Background(), func(ar arrow.Record) error {
-		defer ar.Release()
-		for i := 0; i < int(ar.NumCols()); i++ {
-			sets[ar.ColumnName(i)] = struct{}{}
-		}
-		return nil
-	})
+	err := engine.ScanSchema("metrics").
+		Distinct(logicalplan.Col("labels")).
+		Filter(promMatchersToFrostDBExprs(matchers)).
+		Execute(context.Background(), func(ar arrow.Record) error {
+			defer ar.Release()
+			for i := 0; i < int(ar.NumCols()); i++ {
+				sets[ar.ColumnName(i)] = struct{}{}
+			}
+			return nil
+		})
 	if err != nil {
 		return nil, nil, fmt.Errorf(" failed to perform labels query: %v", err)
 	}
@@ -166,33 +148,20 @@ func (f *FrostQuerier) LabelNames(matchers ...*labels.Matcher) ([]string, storag
 func (f *FrostQuerier) Close() error { return nil }
 
 func (f *FrostQuerier) Select(sortSeries bool, hints *storage.SelectHints, matchers ...*labels.Matcher) storage.SeriesSet {
-
-	exprs := []logicalplan.Expr{
-		logicalplan.Col("timestamp").GT(logicalplan.Literal(hints.Start)),
-		logicalplan.Col("timestamp").LT(logicalplan.Literal(hints.End)),
-	}
-	// Build a filter from matchers
-	for _, matcher := range matchers {
-		switch matcher.Type {
-		case labels.MatchEqual:
-			exprs = append(exprs, logicalplan.Col("labels."+matcher.Name).Eq(logicalplan.Literal(matcher.Value)))
-		case labels.MatchNotEqual:
-			exprs = append(exprs, logicalplan.Col("labels."+matcher.Name).NotEq(logicalplan.Literal(matcher.Value)))
-		case labels.MatchRegexp:
-			exprs = append(exprs, logicalplan.Col("labels."+matcher.Name).RegexMatch(matcher.Value))
-		case labels.MatchNotRegexp:
-			exprs = append(exprs, logicalplan.Col("labels."+matcher.Name).RegexNotMatch(matcher.Value))
-		}
-	}
-
 	engine := query.NewEngine(
 		memory.NewGoAllocator(),
 		f.db.TableProvider(),
 	)
 
 	sets := map[uint64]*series{}
 	err := engine.ScanTable("metrics").
-		Filter(logicalplan.And(exprs...)).
+		Filter(logicalplan.And(
+			logicalplan.And(
+				logicalplan.Col("timestamp").GT(logicalplan.Literal(hints.Start)),
+				logicalplan.Col("timestamp").LT(logicalplan.Literal(hints.End)),
+			),
+			promMatchersToFrostDBExprs(matchers),
+		)).
 		Project(
 			logicalplan.DynCol("labels"),
 			logicalplan.Col("timestamp"),

go.mod

@@ -39,7 +39,7 @@ require (
 	github.com/oklog/run v1.1.0
 	github.com/oklog/ulid v1.3.1
 	github.com/pkg/errors v0.9.1
-	github.com/polarsignals/frostdb v0.0.0-20220715180255-c1e327da7c95
+	github.com/polarsignals/frostdb v0.0.0-20220719135628-f77c95f65cf0
 	github.com/prometheus/alertmanager v0.24.0
 	github.com/prometheus/client_golang v1.12.2
 	github.com/prometheus/client_model v0.2.0

go.sum

@@ -826,6 +826,8 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/polarsignals/frostdb v0.0.0-20220715180255-c1e327da7c95 h1:3k4P+NJO+aQ2ts5xZndcxILfWKNOIDxwURFkQnFCajY=
 github.com/polarsignals/frostdb v0.0.0-20220715180255-c1e327da7c95/go.mod h1:kpDBAMwctIMm6K3mq5SIwPG8F06cIKpaREKC5coFHmo=
+github.com/polarsignals/frostdb v0.0.0-20220719135628-f77c95f65cf0 h1:QojL/1GYJ8ZMiISYkkszAUr+LHqvA1C4yDme4ZxauCo=
+github.com/polarsignals/frostdb v0.0.0-20220719135628-f77c95f65cf0/go.mod h1:owFfTjGuDhCbOBn/0qpGOvPSMTc3NtrbMN557Rw9DP8=
 github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI=
 github.com/posener/complete v1.2.3/go.mod h1:WZIdtGGp+qx0sLrYKtIRAruyNpv6hFCicSgv7Sy7s/s=
 github.com/prashantv/gostub v1.1.0 h1:BTyx3RfQjRHnUWaGF9oQos79AlQ5k8WNktv7VGvVH4g=