Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions api/query.proto
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
5 changes: 5 additions & 0 deletions api/query.swagger.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
},
Expand Down
8 changes: 4 additions & 4 deletions internal/app/frontend/frontend_service.go
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand All @@ -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
Expand Down Expand Up @@ -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 {
Expand Down
5 changes: 5 additions & 0 deletions internal/app/query/query_service.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -65,6 +66,10 @@ func (s *queryService) QueryTickets(req *pb.QueryTicketsRequest, responseServer
if pf.In(ticket) {
results = append(results, ticket)
}

if limit > 0 && len(results) >= limit {
break
}
}
})
if err != nil {
Expand Down
2 changes: 1 addition & 1 deletion internal/ipb/messages.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion internal/ipb/synchronizer.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions internal/ipb/synchronizer_grpc.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 6 additions & 6 deletions pkg/pb/backend_grpc.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion pkg/pb/evaluator.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions pkg/pb/evaluator_grpc.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion pkg/pb/extensions.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion pkg/pb/frontend.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

30 changes: 15 additions & 15 deletions pkg/pb/frontend_grpc.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion pkg/pb/matchfunction.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions pkg/pb/matchfunction_grpc.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion pkg/pb/messages.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

18 changes: 14 additions & 4 deletions pkg/pb/query.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading