refac
This commit is contained in:
1 parent
750604a11d
commit
c7de057a4a
1 file changed
+23
-9
@@ -239,6 +239,11 @@ class YdocManager:
|
|||||||
if self._redis:
|
if self._redis:
|
||||||
redis_key = f'{self._redis_key_prefix}:{document_id}:users'
|
redis_key = f'{self._redis_key_prefix}:{document_id}:users'
|
||||||
await self._redis.sadd(redis_key, user_id)
|
await self._redis.sadd(redis_key, user_id)
|
||||||
|
# Maintain a per-session reverse index so disconnect cleanup
|
||||||
|
# can look up only the documents this session joined, instead
|
||||||
|
# of issuing a cluster-wide SCAN over the entire keyspace.
|
||||||
|
session_key = f'{self._redis_key_prefix}:session:{user_id}:documents'
|
||||||
|
await self._redis.sadd(session_key, document_id)
|
||||||
else:
|
else:
|
||||||
if document_id not in self._users:
|
if document_id not in self._users:
|
||||||
self._users[document_id] = set()
|
self._users[document_id] = set()
|
||||||
@@ -250,22 +255,31 @@ class YdocManager:
|
|||||||
if self._redis:
|
if self._redis:
|
||||||
redis_key = f'{self._redis_key_prefix}:{document_id}:users'
|
redis_key = f'{self._redis_key_prefix}:{document_id}:users'
|
||||||
await self._redis.srem(redis_key, user_id)
|
await self._redis.srem(redis_key, user_id)
|
||||||
|
# Keep the reverse index in sync.
|
||||||
|
session_key = f'{self._redis_key_prefix}:session:{user_id}:documents'
|
||||||
|
await self._redis.srem(session_key, document_id)
|
||||||
else:
|
else:
|
||||||
if document_id in self._users and user_id in self._users[document_id]:
|
if document_id in self._users and user_id in self._users[document_id]:
|
||||||
self._users[document_id].remove(user_id)
|
self._users[document_id].remove(user_id)
|
||||||
|
|
||||||
async def remove_user_from_all_documents(self, user_id: str):
|
async def remove_user_from_all_documents(self, user_id: str):
|
||||||
if self._redis:
|
if self._redis:
|
||||||
keys = []
|
# Use the per-session reverse index instead of a cluster-wide
|
||||||
async for key in self._redis.scan_iter(match=f'{self._redis_key_prefix}:*', count=100):
|
# SCAN. This set contains only the document IDs that this
|
||||||
keys.append(key)
|
# session actually joined, so the cost is proportional to
|
||||||
for key in keys:
|
# the session's footprint — not the total number of documents.
|
||||||
if key.endswith(':users'):
|
session_key = f'{self._redis_key_prefix}:session:{user_id}:documents'
|
||||||
await self._redis.srem(key, user_id)
|
document_ids = await self._redis.smembers(session_key)
|
||||||
|
|
||||||
document_id = key.split(':')[-2]
|
for document_id in document_ids:
|
||||||
if len(await self.get_users(document_id)) == 0:
|
users_key = f'{self._redis_key_prefix}:{document_id}:users'
|
||||||
await self.clear_document(document_id)
|
await self._redis.srem(users_key, user_id)
|
||||||
|
|
||||||
|
if len(await self.get_users(document_id)) == 0:
|
||||||
|
await self.clear_document(document_id)
|
||||||
|
|
||||||
|
# Clean up the reverse index itself.
|
||||||
|
await self._redis.delete(session_key)
|
||||||
|
|
||||||
else:
|
else:
|
||||||
for document_id in list(self._users.keys()):
|
for document_id in list(self._users.keys()):
|
||||||
|
|||||||
Reference in new issue
Block a user