From e1b158574ee515e4e81a6db7bb57e306e8cbdfa8 Mon Sep 17 00:00:00 2001
From: Dmitry Vyukov <dvyukov@google.com>
Date: Thu, 24 Oct 2019 19:07:17 +0200
Subject: datastore/app: switch more bug queries to paged queries

Update #1448
---
 dashboard/app/api.go | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

(limited to 'dashboard/app/api.go')

diff --git a/dashboard/app/api.go b/dashboard/app/api.go
index b488bb545..1baf0af0a 100644
--- a/dashboard/app/api.go
+++ b/dashboard/app/api.go
@@ -177,13 +177,12 @@ func apiBuilderPoll(c context.Context, ns string, r *http.Request, payload []byt
 	if err := json.Unmarshal(payload, req); err != nil {
 		return nil, fmt.Errorf("failed to unmarshal request: %v", err)
 	}
-	var bugs []*Bug
-	_, err := db.NewQuery("Bug").
-		Filter("Namespace=", ns).
-		Filter("Status<", BugStatusFixed).
-		GetAll(c, &bugs)
+	bugs, err := loadAllBugs(c, func(query *db.Query) *db.Query {
+		return query.Filter("Namespace=", ns).
+			Filter("Status<", BugStatusFixed)
+	})
 	if err != nil {
-		return nil, fmt.Errorf("failed to query bugs: %v", err)
+		return nil, err
 	}
 	m := make(map[string]bool)
 loop:
@@ -521,13 +520,12 @@ func addCommitsToBugs(c context.Context, ns, manager string, titles []string, fi
 
 func addCommitsToBugsInStatus(c context.Context, status int, ns, manager string, managers []string,
 	presentCommits map[string]bool, bugFixedBy map[string][]string) error {
-	var bugs []*Bug
-	_, err := db.NewQuery("Bug").
-		Filter("Namespace=", ns).
-		Filter("Status=", status).
-		GetAll(c, &bugs)
+	bugs, err := loadAllBugs(c, func(query *db.Query) *db.Query {
+		return query.Filter("Namespace=", ns).
+			Filter("Status=", status)
+	})
 	if err != nil {
-		return fmt.Errorf("failed to query bugs: %v", err)
+		return err
 	}
 	for _, bug := range bugs {
 		var fixCommits []string
-- 
cgit mrf-deployment