zlei6/ragflow
1
0
Fork 0
mirror of https://github.com/infiniflow/ragflow.git synced 2026-08-25 09:32:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: stop three recurring errors on doc delete (#17685) (#17686)

Browse Source 
Follow-up to #17526 ("Refactor: merge dataset scope graph"), which introduced two code paths that touch Infinity columns the deployed schema does not declare. This PR makes the runtime robust against the old schema while also adding the new column to the new schema so freshly created tables are correct.
This commit is contained in:
S
2026-08-16 06:55:51 +05:30
committed by GitHub
parent 554fb1133a
commit c6ba54bc72
14 changed files with 1140 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
api/db/services/doc_metadata_service.py
View File

@@ -484,7 +484,13 @@ class DocMetadataService:
# Index exists - check if document exists
try:
doc_exists = settings.docStoreConn.get(doc_id, index_name, [kb_id])
# Doc-meta tables are per-tenant, not per-kb; ``kb_id`` is
# unused by ES/OB and the Infinity connector special-cases
# ``ragflow_doc_meta_`` to ignore it as well. Pass ``[]``
# so the Infinity connector doesn't try to build a
# non-existent ``ragflow_doc_meta_<tenant>_<kb>`` table
# name. See also: ``_get_doc_meta_index_name`` above.
doc_exists = settings.docStoreConn.get(doc_id, index_name, [])
if doc_exists:
# Document exists - replace meta_fields entirely.
# Using update with a `doc` body would deep-merge the meta_fields
@@ -555,10 +561,15 @@ class DocMetadataService:
# Try to get the metadata to confirm it exists before deleting
# This is more efficient than attempting delete on non-existent records
try:
# Doc-meta tables are per-tenant, not per-kb, so there is no
# kb suffix to query by. Pass an empty list — the Infinity
# connector (and OB) special-cases ``ragflow_doc_meta_``
# indexes and queries the table directly; ES relies on the
# empty-``kb_id`` filter it already injects below.
existing_metadata = settings.docStoreConn.get(
doc_id,
index_name,
[""], # Empty list for metadata tables
[],
)
logging.debug(f"[METADATA DELETE] Get result: {existing_metadata is not None}")
if not existing_metadata:
@@ -698,13 +709,13 @@ class DocMetadataService:
return {}
# Extract fields
doc_obj = doc
tenant_id = doc.knowledgebase.tenant_id
kb_id = doc_obj.kb_id
index_name = cls._get_doc_meta_index_name(tenant_id)
# Try to get metadata from ES/Infinity
metadata_doc = settings.docStoreConn.get(doc_id, index_name, [kb_id])
# Try to get metadata from ES/Infinity. Doc-meta tables are
# per-tenant, not per-kb; pass ``[]`` to avoid the Infinity
# connector building a non-existent ``<tenant>_<kb>`` table name.
metadata_doc = settings.docStoreConn.get(doc_id, index_name, [])
if metadata_doc:
# Extract and unflatten metadata