chore: temp update redis calls

Author: odouglas-es

api/frontend.swagger.json

@@ -424,46 +424,6 @@
         ]
       }
     },
-    "/v1/frontendservice/tickets/expired": {
-      "get": {
-        "summary": "GetExpiredTickets returns the ticket Ids corresponding to tickets outside the valid window",
-        "operationId": "FrontendService_GetExpiredTickets",
-        "responses": {
-          "200": {
-            "description": "A successful response.",
-            "schema": {
-              "$ref": "#/definitions/openmatchGetExpiredTicketsResponse"
-            }
-          },
-          "404": {
-            "description": "Returned when the resource does not exist.",
-            "schema": {
-              "type": "string",
-              "format": "string"
-            }
-          },
-          "default": {
-            "description": "An unexpected error response.",
-            "schema": {
-              "$ref": "#/definitions/rpcStatus"
-            }
-          }
-        },
-        "parameters": [
-          {
-            "name": "limit",
-            "description": "The limit on how many ticket Ids to return",
-            "in": "query",
-            "required": false,
-            "type": "integer",
-            "format": "int32"
-          }
-        ],
-        "tags": [
-          "FrontendService"
-        ]
-      }
-    },
     "/v1/frontendservice/tickets/{ticket_id}": {
       "get": {
         "summary": "GetTicket get the Ticket associated with the specified TicketId.",
@@ -711,18 +671,6 @@
         }
       }
     },
-    "openmatchGetExpiredTicketsResponse": {
-      "type": "object",
-      "properties": {
-        "ticket_ids": {
-          "type": "array",
-          "items": {
-            "type": "string"
-          },
-          "description": "Expired TicketIds of generated Tickets to be deleted."
-        }
-      }
-    },
     "openmatchGetIndexedTicketCountResponse": {
       "type": "object",
       "properties": {

api/query.proto

@@ -89,6 +89,15 @@ message QueryBackfillsResponse {
   repeated Backfill backfills = 1;
 }
 
+message QueryExpiredTicketsRequest {
+  int32 limit = 1;
+}
+
+message QueryExpiredTicketsResponse {
+  // Tickets that meet all the filtering criteria requested by the pool.
+  repeated Ticket tickets = 1;
+}
+
 // The QueryService service implements helper APIs for Match Function to query Tickets from state storage.
 service QueryService {
   // QueryTickets gets a list of Tickets that match all Filters of the input Pool.
@@ -122,4 +131,13 @@ service QueryService {
       body: "*"
     };
   }
+
+
+  // QueryExpiredTickets get the expired tickets limited by the specified number
+  rpc QueryExpiredTickets(QueryExpiredTicketsRequest) returns (stream QueryExpiredTicketsResponse) {
+    option (google.api.http) = {
+      post: "/v1/queryservice/tickets:expired"
+      body: "*"
+    };
+  }
 }

api/query.swagger.json

@@ -128,6 +128,55 @@
         ]
       }
     },
+    "/v1/queryservice/tickets:expired": {
+      "post": {
+        "summary": "QueryExpiredTickets get the expired tickets limited by the specified number",
+        "operationId": "QueryService_QueryExpiredTickets",
+        "responses": {
+          "200": {
+            "description": "A successful response.(streaming responses)",
+            "schema": {
+              "type": "object",
+              "properties": {
+                "result": {
+                  "$ref": "#/definitions/openmatchQueryExpiredTicketsResponse"
+                },
+                "error": {
+                  "$ref": "#/definitions/rpcStatus"
+                }
+              },
+              "title": "Stream result of openmatchQueryExpiredTicketsResponse"
+            }
+          },
+          "404": {
+            "description": "Returned when the resource does not exist.",
+            "schema": {
+              "type": "string",
+              "format": "string"
+            }
+          },
+          "default": {
+            "description": "An unexpected error response.",
+            "schema": {
+              "$ref": "#/definitions/rpcStatus"
+            }
+          }
+        },
+        "parameters": [
+          {
+            "name": "body",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/openmatchQueryExpiredTicketsRequest"
+            }
+          }
+        ],
+        "tags": [
+          "QueryService"
+        ]
+      }
+    },
     "/v1/queryservice/tickets:query": {
       "post": {
         "summary": "QueryTickets gets a list of Tickets that match all Filters of the input Pool.\n  - If the Pool contains no Filters, QueryTickets will return all Tickets in the state storage.\nQueryTickets pages the Tickets by `queryPageSize` and stream back responses.\n  - queryPageSize is default to 1000 if not set, and has a minimum of 10 and maximum of 10000.",
@@ -335,6 +384,28 @@
       },
       "description": "BETA FEATURE WARNING:  This Request messages are not finalized and \nstill subject to possible change or removal."
     },
+    "openmatchQueryExpiredTicketsRequest": {
+      "type": "object",
+      "properties": {
+        "limit": {
+          "type": "integer",
+          "format": "int32"
+        }
+      }
+    },
+    "openmatchQueryExpiredTicketsResponse": {
+      "type": "object",
+      "properties": {
+        "tickets": {
+          "type": "array",
+          "items": {
+            "type": "object",
+            "$ref": "#/definitions/openmatchTicket"
+          },
+          "description": "Tickets that meet all the filtering criteria requested by the pool."
+        }
+      }
+    },
     "openmatchQueryTicketIdsRequest": {
       "type": "object",
       "properties": {

internal/app/query/query_service.go

@@ -191,6 +191,34 @@ func (s *queryService) QueryBackfills(req *pb.QueryBackfillsRequest, responseSer
 	return nil
 }
 
+// QueryExpiredTickets get the expired tickets limited by the specified number
+func (s *queryService) QueryExpiredTickets(req *pb.QueryExpiredTicketsRequest, responseServer pb.QueryService_QueryExpiredTicketsServer) error {
+	ctx := responseServer.Context()
+	limit := int(req.GetLimit())
+
+	tickets, err := s.bc.store.GetExpiredTickets(ctx, limit)
+	if err != nil {
+		return err
+	}
+
+	pSize := getPageSize(s.cfg)
+	for start := 0; start < len(tickets); start += pSize {
+		end := start + pSize
+		if end > len(tickets) {
+			end = len(tickets)
+		}
+
+		err := responseServer.Send(&pb.QueryExpiredTicketsResponse{
+			Tickets: tickets[start:end],
+		})
+		if err != nil {
+			return err
+		}
+	}
+
+	return nil
+}
+
 func getPageSize(cfg config.View) int {
 	const (
 		name = "queryPageSize"

internal/statestore/instrumented.go

@@ -217,25 +217,11 @@ func (is *instrumentedService) GetIndexedTicketCount(ctx context.Context) (int,
 	return is.s.GetIndexedTicketCount(ctx)
 }
 
-// CleanupTickets removes expired tickets
-func (is *instrumentedService) CleanupTickets(ctx context.Context) error {
-	_, span := trace.StartSpan(context.Background(), "statestore/instrumented.CleanupTickets")
+// GetExpiredTickets gets all ticket IDs which are expired
+func (is *instrumentedService) GetExpiredTickets(ctx context.Context, limit int) ([]*pb.Ticket, error) {
+	ctx, span := trace.StartSpan(ctx, "statestore/instrumented.GetExpiredTickets")
 	defer span.End()
-	return is.s.CleanupTickets(ctx)
-}
-
-// DeleteTicketCompletely performs a set of operations to remove the ticket and all related entries.
-func (is *instrumentedService) DeleteTicketCompletely(ctx context.Context, id string) error {
-	_, span := trace.StartSpan(context.Background(), "statestore/instrumented.DeleteTicketCompletely")
-	defer span.End()
-	return is.s.DeleteTicketCompletely(ctx, id)
-}
-
-// GetExpiredTicketIDs gets all ticket IDs which are expired
-func (is *instrumentedService) GetExpiredTicketIDs(ctx context.Context, limit int) ([]string, error) {
-	ctx, span := trace.StartSpan(ctx, "statestore/instrumented.GetExpiredTicketIDs")
-	defer span.End()
-	return is.s.GetExpiredTicketIDs(ctx, 0)
+	return is.s.GetExpiredTickets(ctx, limit)
 }
 
 // GetIndexedIDSetWithTTL returns the ids of all tickets currently indexed but within a given TTL.

internal/statestore/public.go

@@ -128,14 +128,8 @@ type Service interface {
 	// GetIndexedTicketCount returns the current count of indexed tickets
 	GetIndexedTicketCount(ctx context.Context) (int, error)
 
-	//CleanupTickets removes expired tickets
-	CleanupTickets(ctx context.Context) error
-
-	// DeleteTicketCompletely performs a set of operations to remove the ticket and all related entries.
-	DeleteTicketCompletely(ctx context.Context, id string) error
-
-	// GetExpiredTicketIDs gets all ticket IDs which are expired
-	GetExpiredTicketIDs(ctx context.Context, limit int) ([]string, error)
+	// GetExpiredTickets gets all tickets which are expired
+	GetExpiredTickets(ctx context.Context, limit int) ([]*pb.Ticket, error)
 
 	// GetIndexedIDSetWithTTL returns the ids of all tickets currently indexed but within a given TTL.
 	GetIndexedIDSetWithTTL(ctx context.Context, limit int) (map[string]struct{}, error)