dashboard/app: allow to fetch coverage from multiple managers

Author: tarasmadan

dashboard/app/coverage.go

@@ -137,7 +137,7 @@ func handleHeatmap(c context.Context, w http.ResponseWriter, r *http.Request, f
 		return ErrClientNotFound
 	}
 	ss := r.FormValue(covPageParams[SubsystemName])
-	manager := r.FormValue(covPageParams[ManagerName])
+	fromManagers := r.Form[covPageParams[ManagerName]]
 
 	periodType := r.FormValue(covPageParams[PeriodType])
 	if periodType == "" {
@@ -196,7 +196,7 @@ func handleHeatmap(c context.Context, w http.ResponseWriter, r *http.Request, f
 		&coveragedb.SelectScope{
 			Ns:        hdr.Namespace,
 			Subsystem: ss,
-			Manager:   manager,
+			Managers:  fromManagers,
 			Periods:   periods,
 		},
 		onlyUnique, subsystems, managers,

dashboard/app/static/coverage.js

@@ -40,7 +40,11 @@ function initUpdateForm(){
 function onShowFileContent(url) {
   var curUrlParams = new URLSearchParams(window.location.search);
   url += '&subsystem=' + (curUrlParams.get('subsystem') || "")
-  url += '&manager=' + (curUrlParams.get('manager') || "")
+   // Get all 'manager' parameters.
+  var managerParams = curUrlParams.getAll('manager');
+  managerParams.forEach(function(managerValue) {
+    url += '&manager=' + (managerValue || "");
+  });
   url += '&unique-only=' + (curUrlParams.get('unique-only') || "")
 
   $.get(url, function(response) {

pkg/coveragedb/coveragedb.go

@@ -403,7 +403,7 @@ func MakeCovMap(keys, vals []int64) map[int]int64 {
 type SelectScope struct {
 	Ns        string
 	Subsystem string
-	Manager   string
+	Managers  []string
 	Periods   []TimePeriod
 }
 
@@ -412,7 +412,7 @@ type SelectScope struct {
 func FilesCoverageStream(ctx context.Context, client spannerclient.SpannerClient, ns string, timePeriod TimePeriod,
 ) (<-chan *FileCoverageWithLineInfo, <-chan error) {
 	iter := client.Single().Query(ctx,
-		filesCoverageWithDetailsStmt(ns, "", "", timePeriod, true))
+		filesCoverageWithDetailsStmt(ns, "", nil, timePeriod, true))
 	resCh := make(chan *FileCoverageWithLineInfo)
 	errCh := make(chan error)
 	go func() {
@@ -435,14 +435,14 @@ func FilesCoverageWithDetails(
 	for _, timePeriod := range scope.Periods {
 		needLinesDetails := onlyUnique
 		iterManager := client.Single().Query(ctx,
-			filesCoverageWithDetailsStmt(scope.Ns, scope.Subsystem, scope.Manager, timePeriod, needLinesDetails))
+			filesCoverageWithDetailsStmt(scope.Ns, scope.Subsystem, scope.Managers, timePeriod, needLinesDetails))
 		defer iterManager.Stop()
 
 		var err error
 		var periodRes []*FileCoverageWithDetails
 		if onlyUnique {
 			iterAll := client.Single().Query(ctx,
-				filesCoverageWithDetailsStmt(scope.Ns, scope.Subsystem, "", timePeriod, needLinesDetails))
+				filesCoverageWithDetailsStmt(scope.Ns, scope.Subsystem, nil, timePeriod, needLinesDetails))
 			defer iterAll.Stop()
 			periodRes, err = readCoverageUniq(iterAll, iterManager)
 			if err != nil {
@@ -462,10 +462,10 @@ func FilesCoverageWithDetails(
 	return res, nil
 }
 
-func filesCoverageWithDetailsStmt(ns, subsystem, manager string, timePeriod TimePeriod, withLines bool,
+func filesCoverageWithDetailsStmt(ns, subsystem string, managers []string, timePeriod TimePeriod, withLines bool,
 ) spanner.Statement {
-	if manager == "" {
-		manager = "*"
+	if len(managers) == 0 {
+		managers = append(managers, "*")
 	}
 	selectColumns := "commit, instrumented, covered, files.filepath, subsystems"
 	if withLines {
@@ -479,12 +479,12 @@ from merge_history
   join file_subsystems
     on merge_history.namespace = file_subsystems.namespace and files.filepath = file_subsystems.filepath
 where
-  merge_history.namespace=$1 and dateto=$2 and duration=$3 and manager=$4`,
+  merge_history.namespace=$1 and dateto=$2 and duration=$3 and manager=ANY(SELECT id FROM UNNEST($4) AS id)`,
 		Params: map[string]interface{}{
 			"p1": ns,
 			"p2": timePeriod.DateTo,
 			"p3": timePeriod.Days,
-			"p4": manager,
+			"p4": managers,
 		},
 	}
 	if subsystem != "" {