NuKVM/xen-orchestra
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat(xo-server): save JSON records in Redis (#7113)

Browse Source 
Better support of non-string properties without having to handle them one by one.

To avoid breaking compatibility with older versions, this should not be merged after reading JSON records has been supported for at least a month.
This commit is contained in:
Julien Fontanet 2023-12-18 14:26:51 +01:00 committed by GitHub
parent ac391f6a0f
commit 32afd5c463
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
packages/xo-server/src/collection/redis.mjs
View File

@ -147,10 +147,13 @@ export default class Redis extends Collection {
model = this._serialize(model) ?? model
// Generate a new identifier if necessary.
if (model.id === undefined) {
model.id = generateUuid()
let { id } = model
if (id === undefined) {
id = generateUuid()
} else {
// identifier is not stored as value in the database, it's already part of the key
delete model.id
}
const { id } = model
const newEntry = await redis.sAdd(prefix + '_ids', id)
@ -172,16 +175,7 @@ export default class Redis extends Collection {
}
const key = `${prefix}:${id}`
const props = {}
for (const name of Object.keys(model)) {
if (name !== 'id') {
const value = model[name]
if (value !== undefined) {
props[name] = String(value)
}
}
}
const promises = [redis.del(key), redis.hSet(key, props)]
const promises = [redis.del(key), redis.set(key, JSON.stringify(model))]
// Update indexes.
forEach(indexes, index => {
@ -206,12 +200,13 @@ export default class Redis extends Collection {
let model
try {
model = await redis.hGetAll(key)
model = await redis.get(key).then(JSON.parse)
} catch (error) {
if (!error.message.startsWith('WRONGTYPE')) {
throw error
}
model = await redis.get(key).then(JSON.parse)
model = await redis.hGetAll(key)
}
return model