Refactor exception handling in MemgraphStorage label methods

This commit is contained in:
yangdx 2025-11-14 11:01:26 +08:00
parent 423e4e927a
commit 8283c86bce

View file

@ -1050,12 +1050,12 @@ class MemgraphStorage(BaseGraphStorage):
"Memgraph driver is not initialized. Call 'await initialize()' first." "Memgraph driver is not initialized. Call 'await initialize()' first."
) )
result = None
try:
workspace_label = self._get_workspace_label() workspace_label = self._get_workspace_label()
async with self._driver.session( async with self._driver.session(
database=self._DATABASE, default_access_mode="READ" database=self._DATABASE, default_access_mode="READ"
) as session: ) as session:
result = None
try:
query = f""" query = f"""
MATCH (n:`{workspace_label}`) MATCH (n:`{workspace_label}`)
WHERE n.entity_id IS NOT NULL WHERE n.entity_id IS NOT NULL
@ -1076,9 +1076,7 @@ class MemgraphStorage(BaseGraphStorage):
) )
return labels return labels
except Exception as e: except Exception as e:
logger.error( logger.error(f"[{self.workspace}] Error getting popular labels: {str(e)}")
f"[{self.workspace}] Error getting popular labels: {str(e)}"
)
if result is not None: if result is not None:
await result.consume() await result.consume()
return [] return []
@ -1103,12 +1101,12 @@ class MemgraphStorage(BaseGraphStorage):
if not query_lower: if not query_lower:
return [] return []
result = None
try:
workspace_label = self._get_workspace_label() workspace_label = self._get_workspace_label()
async with self._driver.session( async with self._driver.session(
database=self._DATABASE, default_access_mode="READ" database=self._DATABASE, default_access_mode="READ"
) as session: ) as session:
result = None
try:
cypher_query = f""" cypher_query = f"""
MATCH (n:`{workspace_label}`) MATCH (n:`{workspace_label}`)
WHERE n.entity_id IS NOT NULL WHERE n.entity_id IS NOT NULL