Merge pull request #17 from EmbarkStudios/do/om-query-tickets-limit

fix: move query ticket limit to grpc server side

Author: odouglas-es

api/query.proto

@@ -58,6 +58,8 @@ option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_swagger) = {
 message QueryTicketsRequest {
   // The Pool representing the set of Filters to be queried.
   Pool pool = 1;
+  // The max number of tickets to stream back
+  int32 limit = 2;
 }
 
 message QueryTicketsResponse {

api/query.swagger.json

@@ -362,6 +362,11 @@
         "pool": {
           "$ref": "#/definitions/openmatchPool",
           "description": "The Pool representing the set of Filters to be queried."
+        },
+        "limit": {
+          "type": "integer",
+          "format": "int32",
+          "title": "The max number of tickets to stream back"
         }
       }
     },

internal/app/frontend/frontend_service.go

@@ -289,10 +289,10 @@ func doWatchAssignments(ctx context.Context, id string, sender func(*pb.Assignme
 	callback := func(assignment *pb.Assignment) error {
 		select {
 		case <-ctx.Done():
-			return status.Errorf(codes.Aborted, ctx.Err().Error())
+			return status.Error(codes.Aborted, ctx.Err().Error())
 		default:
 			if ctx.Err() != nil {
-				return status.Errorf(codes.Aborted, ctx.Err().Error())
+				return status.Error(codes.Aborted, ctx.Err().Error())
 			}
 
 			if (currAssignment == nil && assignment != nil) || !proto.Equal(currAssignment, assignment) {
@@ -303,7 +303,7 @@ func doWatchAssignments(ctx context.Context, id string, sender func(*pb.Assignme
 
 				err := sender(currAssignment)
 				if err != nil {
-					return status.Errorf(codes.Aborted, err.Error())
+					return status.Error(codes.Aborted, err.Error())
 				}
 			}
 			return nil
@@ -396,7 +396,7 @@ func (s *frontendService) GetBackfillTickets(ctx context.Context, req *pb.GetBac
 
 	err := m.Lock(ctx)
 	if err != nil {
-		return nil, status.Errorf(codes.Unavailable, err.Error())
+		return nil, status.Error(codes.Unavailable, err.Error())
 	}
 	defer func() {
 		if _, err = m.Unlock(context.Background()); err != nil {

internal/app/query/query_service.go

@@ -53,6 +53,7 @@ func (s *queryService) QueryTickets(req *pb.QueryTicketsRequest, responseServer
 		return err
 	}
 
+	limit := int(req.GetLimit())
 	var results []*pb.Ticket
 	err = s.tc.request(ctx, func(value interface{}) {
 		tickets, ok := value.(map[string]*pb.Ticket)
@@ -64,6 +65,9 @@ func (s *queryService) QueryTickets(req *pb.QueryTicketsRequest, responseServer
 		for _, ticket := range tickets {
 			if pf.In(ticket) {
 				results = append(results, ticket)
+				if limit > 0 && len(results) >= limit {
+					break
+				}
 			}
 		}
 	})