diff --git a/apps/redis-api/src/routes/api/cache.ts b/apps/redis-api/src/routes/api/cache.ts index 72214eab9..0ea5f0fc6 100644 --- a/apps/redis-api/src/routes/api/cache.ts +++ b/apps/redis-api/src/routes/api/cache.ts @@ -11,7 +11,7 @@ const MIN_LENGTH = 1; const QUERY_TYPE = t.Object({ key: t.String({ minLength: MIN_LENGTH }) }); const DELETEMULTIPLE_BODY_TYPE = t.Object({ - keys: t.Array(t.String({ minLength: MIN_LENGTH })), + keys: t.Array(t.String()), fuzzy: t.Optional(t.Boolean({ default: false })), }); @@ -76,7 +76,10 @@ export const cacheRoutes = new Elysia({ prefix: "/cache" }) .delete( "/multiple", async ({ body: { keys, fuzzy = false } }) => { - const validatedKeys = keys.map(validateKey); + const validatedKeys = keys.filter((x) => !!x).map(validateKey); + if (validatedKeys.length === 0) { + return { deletedKeys: 0 }; + } cacheRouteLogger.debug( `DELETE /multiple keys=${validatedKeys.join(",")} ${fuzzy ? "(fuzzy)" : ""}`, diff --git a/apps/redis-api/src/services/redis/queueDelete.ts b/apps/redis-api/src/services/redis/queueDelete.ts index 4a021f192..8214c3dbc 100644 --- a/apps/redis-api/src/services/redis/queueDelete.ts +++ b/apps/redis-api/src/services/redis/queueDelete.ts @@ -86,8 +86,8 @@ export async function queueDeleteMultiple({ async function deleteWithPatterns(patterns: string[]) { let cursor = "0"; const SCAN_SIZE = env.DELETE_BATCH_SIZE; - let totalDeleteCount = 0; - + let matchedKeys: string[] = []; + let totalKeys = 0; do { const [newCursor, keys] = await redis.scan( cursor, @@ -101,19 +101,29 @@ async function deleteWithPatterns(patterns: string[]) { if (!keys.length) continue; - const matchedKeys = keys.filter((key) => - patterns.some((pattern) => matchKey(key, pattern)), - ); + totalKeys += keys.length; - if (!matchedKeys.length) continue; - - const deleted = await redis.unlink(...matchedKeys); - totalDeleteCount += deleted; + matchedKeys = [ + ...matchedKeys, + ...keys.filter((key) => + patterns.some((pattern) => matchKey(key, pattern)), + ), + ]; await timeout(100); } while (cursor !== "0"); - return totalDeleteCount; + let deleted = 0; + if (matchedKeys.length > 0) { + deleted = await redis.unlink(...matchedKeys); + } + + deleteQueueLogger.info( + `Scanned ${totalKeys} keys, matched ${matchedKeys.length}, deleted ${deleted} keys.`, + { totalKeys, matchedKeys: matchedKeys.length, deleted }, + ); + + return deleted; } function matchKey(key: string, pattern: string): boolean {