Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
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
7 changes: 5 additions & 2 deletions apps/server/src/__tests__/keys-browser.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ describe("getKeyInfo", () => {
TTL: -1,
MEMORY: 200,
HLEN: 3,
HGETALL: ["field1", "value1", "field2", "value2"],
HSCAN: ["0", ["field1", "value1", "field2", "value2"]],
})

const result = await getKeyInfo(mockClient as any, "myhash")
Expand All @@ -77,7 +77,10 @@ describe("getKeyInfo", () => {
assert.strictEqual(result.ttl, -1)
assert.strictEqual(result.size, 200)
assert.strictEqual(result.collectionSize, 3)
assert.deepStrictEqual(result.elements, ["field1", "value1", "field2", "value2"])
assert.deepStrictEqual(result.elements, [
{ key: "field1", value: "value1" },
{ key: "field2", value: "value2" },
])
})
})

Expand Down
155 changes: 112 additions & 43 deletions apps/server/src/keys-browser.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,84 @@ interface EnrichedKeyInfo {
elements?: any; // this can be array, object, or string depending on the key type.
}

async function getScanKeyInfo(
client: GlideClient | GlideClusterClient,
keyInfo: EnrichedKeyInfo,
commands: { sizeCmd: string; elementsCmd: string[] },
): Promise<EnrichedKeyInfo> {
try {
// eslint-disable-next-line @typescript-eslint/no-explicit-any
const results = new Set<any>()
const isHash = keyInfo.type.toLowerCase() === "hash"
let cursor = "0"

// This Promise.all 1) gets the Key's collection size, and 2) fills the result set with the collection's values.
// The side-effect promise is used result set is filled with a SCAN style command (requiring repeated queries with the cursor).
const [collectionSize] = await Promise.all([
client.customCommand([commands.sizeCmd, keyInfo.name]),
(async () => {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

leave a comment explaining what this promise.all does, how come we have value-promise and a side-effect promise — it's 50+ loc to read to understand without a comment

do {
// eslint-disable-next-line @typescript-eslint/no-explicit-any
const [newCursor, elements] = await client.customCommand([...commands.elementsCmd, cursor]) as [string, any[]]

if (isHash) {
// Hash key types require constructing an object from a flat array.
// i.e. converting [key1, value1...] to [{key: key1, value}]
for (let i = 0; i < elements.length; i += 2){
results.add({ key: elements[i], value: elements[i + 1] })
}
} else {
elements.forEach((element) => results.add(element))
}
cursor = newCursor
} while (cursor !== "0")
})(),
])

return {
...keyInfo,
collectionSize: collectionSize as number,
elements: Array.from(results),
}
} catch (err) {
console.log(`Could not get elements for key ${keyInfo.name}:`, err)
return keyInfo
}
}

async function getFullKeyInfo(
client: GlideClient | GlideClusterClient,
keyInfo: EnrichedKeyInfo,
commands: { sizeCmd: string; elementsCmd: string[] },
): Promise<EnrichedKeyInfo>{
try {
const promises = [client.customCommand(commands.elementsCmd)]

if (commands.sizeCmd) {
promises.push(client.customCommand([commands.sizeCmd, keyInfo.name]))
}

const results = await Promise.all(promises)

if (commands.sizeCmd) {
return {
...keyInfo,
collectionSize: results[1] as number,
elements: results[0],
}
} else {
// in case of string with no collectionSize
return {
...keyInfo,
elements: results[0],
}
}
} catch (err) {
console.log(`Could not get elements for key ${keyInfo.name}:`, err)
return keyInfo
}
}

export async function getKeyInfo(
client: GlideClient | GlideClusterClient,
key: string,
Expand All @@ -42,55 +120,46 @@ export async function getKeyInfo(
}

// Get collection size and elements for each type
try {
const elementCommands: Record<
string,
{ sizeCmd: string; elementsCmd: string[] }
> = {
list: { sizeCmd: "LLEN", elementsCmd: ["LRANGE", key, "0", "-1"] },
set: { sizeCmd: "SCARD", elementsCmd: ["SMEMBERS", key] },
zset: {
sizeCmd: "ZCARD",
elementsCmd: ["ZRANGE", key, "0", "-1", "WITHSCORES"],
},
hash: { sizeCmd: "HLEN", elementsCmd: ["HGETALL", key] },
stream: { sizeCmd: "XLEN", elementsCmd: ["XRANGE", key, "-", "+"] },
string: { sizeCmd: "", elementsCmd: ["GET", key] },
"rejson-rl": { sizeCmd: "", elementsCmd: ["JSON.GET", key] },
}

const commands = elementCommands[keyType.toLowerCase()]
if (commands) {
if (memoryUsage > VALKEY_CLIENT.KEY_VALUE_SIZE_LIMIT) {
if (commands.sizeCmd){
keyInfo.collectionSize = await (client.customCommand([commands.sizeCmd, key])) as number
}
keyInfo.elements = `This key is ${formatBytes(memoryUsage)}, which is larger than the maximum display size of ${formatBytes(VALKEY_CLIENT.KEY_VALUE_SIZE_LIMIT)}.`

return keyInfo
}
const elementCommands: Record<
string,
{ sizeCmd: string; elementsCmd: string[] }
> = {
list: { sizeCmd: "LLEN", elementsCmd: ["LRANGE", key, "0", "-1"] },
zset: {
sizeCmd: "ZCARD",
elementsCmd: ["ZRANGE", key, "0", "-1", "WITHSCORES"],
},
stream: { sizeCmd: "XLEN", elementsCmd: ["XRANGE", key, "-", "+"] },
string: { sizeCmd: "", elementsCmd: ["GET", key] },
"rejson-rl": { sizeCmd: "", elementsCmd: ["JSON.GET", key] },
// Scan
set: { sizeCmd: "SCARD", elementsCmd: ["SSCAN", keyInfo.name] },
hash: { sizeCmd: "HLEN", elementsCmd: ["HSCAN", keyInfo.name] },
}

const promises = []
const commands = elementCommands[keyType.toLowerCase()]
if (!commands) {
console.log(`Could not get commands for key type ${keyType.toLowerCase()}`)
return keyInfo
}

if (commands.sizeCmd) {
promises.push(client.customCommand([commands.sizeCmd, key]))
}
promises.push(client.customCommand(commands.elementsCmd))
if (memoryUsage > VALKEY_CLIENT.KEY_VALUE_SIZE_LIMIT) {
if (commands.sizeCmd){
keyInfo.collectionSize = await (client.customCommand([commands.sizeCmd, key])) as number
}
keyInfo.elements = `This key is ${formatBytes(memoryUsage)}, which is larger than the maximum display size of ${formatBytes(VALKEY_CLIENT.KEY_VALUE_SIZE_LIMIT)}.`

const results = await Promise.all(promises)
return keyInfo
}

if (commands.sizeCmd) {
keyInfo.collectionSize = results[0] as number
keyInfo.elements = results[1]
} else {
keyInfo.elements = results[0] // in case of string
}
}
} catch (err) {
console.error(`Could not get elements for key ${key}:`, err)
switch (keyType.toLowerCase()) {
case "set":
case "hash":
return await getScanKeyInfo(client, keyInfo, commands)
default:
return await getFullKeyInfo(client, keyInfo, commands)
}

return keyInfo
} catch (err) {
console.error("Error getting key", err)
return {
Expand Down
Loading