Search: Return counts for values within an folder/repository (#97534)

pkg/storage/unified/sql/data/resource_stats.sql

@@ -5,10 +5,13 @@ SELECT
   COUNT(*),
   MAX({{ .Ident "resource_version" }})
 FROM {{ .Ident "resource" }}
-{{ if .Namespace }}
 WHERE 1 = 1
+{{ if .Namespace }}
   AND {{ .Ident "namespace" }} = {{ .Arg .Namespace }}
 {{ end}}
+{{ if .Folder }}
+  AND {{ .Ident "folder" }} = {{ .Arg .Folder }}
+{{ end}}
 GROUP BY 
   {{ .Ident "namespace" }},
   {{ .Ident "group"     }},

pkg/storage/unified/sql/queries.go

@@ -75,11 +75,15 @@ func (r sqlResourceRequest) Validate() error {
 type sqlStatsRequest struct {
 	sqltemplate.SQLTemplate
 	Namespace string
+	Folder    string
 	MinCount  int
 }
 
 func (r sqlStatsRequest) Validate() error {
-	return nil // TODO
+	if r.Folder != "" && r.Namespace == "" {
+		return fmt.Errorf("folder constraint requires a namespace")
+	}
+	return nil
 }
 
 type historyPollResponse struct {

pkg/storage/unified/sql/queries_test.go

@@ -236,6 +236,15 @@ func TestUnifiedStorageQueries(t *testing.T) {
 						MinCount:    10, // Not yet used in query (only response filter)
 					},
 				},
+				{
+					Name: "query-folder",
+					Data: &sqlStatsRequest{
+						SQLTemplate: mocks.NewTestingSQLTemplate(),
+						Namespace:   "default",
+						Folder:      "folder",
+						MinCount:    10, // Not yet used in query (only response filter)
+					},
+				},
 			},
 		}})
 }

pkg/storage/unified/sql/search.go

@@ -0,0 +1,83 @@
+package sql
+
+import (
+	"context"
+	"net/http"
+
+	"github.com/grafana/grafana/pkg/storage/unified/resource"
+	"github.com/grafana/grafana/pkg/storage/unified/sql/db"
+	"github.com/grafana/grafana/pkg/storage/unified/sql/dbutil"
+	"github.com/grafana/grafana/pkg/storage/unified/sql/sqltemplate"
+)
+
+// Support using SQL as fallback when the indexer is not running
+var _ resource.ResourceIndexServer = &backend{}
+
+// GetStats implements resource.ResourceIndexServer.
+// This will use the SQL index to count values
+func (b *backend) GetStats(ctx context.Context, req *resource.ResourceStatsRequest) (*resource.ResourceStatsResponse, error) {
+	ctx, span := b.tracer.Start(ctx, tracePrefix+".GetStats")
+	defer span.End()
+
+	sreq := &sqlStatsRequest{
+		SQLTemplate: sqltemplate.New(b.dialect),
+		Namespace:   req.Namespace,
+		Folder:      req.Folder,
+	}
+
+	rsp := &resource.ResourceStatsResponse{}
+	err := b.db.WithTx(ctx, ReadCommittedRO, func(ctx context.Context, tx db.Tx) error {
+		rows, err := dbutil.QueryRows(ctx, tx, sqlResourceStats, sreq)
+		if err != nil {
+			return err
+		}
+		for rows.Next() {
+			row := resource.ResourceStats{}
+			err = rows.Scan(&row.Namespace, &row.Group, &row.Resource, &row.Count, &row.ResourceVersion)
+			if err != nil {
+				return err
+			}
+
+			rsp.Stats = append(rsp.Stats, &resource.ResourceStatsResponse_Stats{
+				Group:    row.Group,
+				Resource: row.Resource,
+				Count:    row.Count,
+			})
+		}
+		return err
+	})
+	if err != nil {
+		rsp.Error = resource.AsErrorResult(err)
+	}
+	return rsp, nil
+}
+
+// History implements resource.ResourceIndexServer.
+func (b *backend) History(context.Context, *resource.HistoryRequest) (*resource.HistoryResponse, error) {
+	return &resource.HistoryResponse{
+		Error: &resource.ErrorResult{
+			Code:    http.StatusNotImplemented,
+			Message: "SQL backend does not implement History",
+		},
+	}, nil
+}
+
+// Origin implements resource.ResourceIndexServer.
+func (b *backend) Origin(context.Context, *resource.OriginRequest) (*resource.OriginResponse, error) {
+	return &resource.OriginResponse{
+		Error: &resource.ErrorResult{
+			Code:    http.StatusNotImplemented,
+			Message: "SQL backend does not implement Origin",
+		},
+	}, nil
+}
+
+// Search implements resource.ResourceIndexServer.
+func (b *backend) Search(context.Context, *resource.ResourceSearchRequest) (*resource.ResourceSearchResponse, error) {
+	return &resource.ResourceSearchResponse{
+		Error: &resource.ErrorResult{
+			Code:    http.StatusNotImplemented,
+			Message: "SQL backend does not implement Search",
+		},
+	}, nil
+}

pkg/storage/unified/sql/testdata/mysql--resource_stats-query-folder.sql

@@ -0,0 +1,15 @@
+SELECT
+  `namespace`,
+  `group`,
+  `resource`,
+  COUNT(*),
+  MAX(`resource_version`)
+FROM `resource`
+WHERE 1 = 1
+  AND `namespace` = 'default'
+  AND `folder` = 'folder'
+GROUP BY 
+  `namespace`,
+  `group`,
+  `resource`
+;

pkg/storage/unified/sql/testdata/mysql--resource_stats-query.sql

@@ -5,6 +5,7 @@ SELECT
   COUNT(*),
   MAX(`resource_version`)
 FROM `resource`
+WHERE 1 = 1
 GROUP BY 
   `namespace`,
   `group`,

pkg/storage/unified/sql/testdata/postgres--resource_stats-query-folder.sql

@@ -0,0 +1,15 @@
+SELECT
+  "namespace",
+  "group",
+  "resource",
+  COUNT(*),
+  MAX("resource_version")
+FROM "resource"
+WHERE 1 = 1
+  AND "namespace" = 'default'
+  AND "folder" = 'folder'
+GROUP BY 
+  "namespace",
+  "group",
+  "resource"
+;

pkg/storage/unified/sql/testdata/postgres--resource_stats-query.sql

@@ -5,6 +5,7 @@ SELECT
   COUNT(*),
   MAX("resource_version")
 FROM "resource"
+WHERE 1 = 1
 GROUP BY 
   "namespace",
   "group",

pkg/storage/unified/sql/testdata/sqlite--resource_stats-query-folder.sql

@@ -0,0 +1,15 @@
+SELECT
+  "namespace",
+  "group",
+  "resource",
+  COUNT(*),
+  MAX("resource_version")
+FROM "resource"
+WHERE 1 = 1
+  AND "namespace" = 'default'
+  AND "folder" = 'folder'
+GROUP BY 
+  "namespace",
+  "group",
+  "resource"
+;

pkg/storage/unified/sql/testdata/sqlite--resource_stats-query.sql

@@ -5,6 +5,7 @@ SELECT
   COUNT(*),
   MAX("resource_version")
 FROM "resource"
+WHERE 1 = 1
 GROUP BY 
   "namespace",
   "group",