RAGFlow is an agent-native database: a Retrieval-Augmented Generation (RAG) engine that grew into context infrastructure.
Go agent-harnessagent-native-databaseagentic-aiagentic-retrievalagentic-searchaiai-agentscontext-enginecontext-engineeringcontext-managementharness-engineeringknowledge-compilationragretrieval-augmented-generationretrieval-harnesssearch-harness
fix(deepdoc): keep highest-indexed table in MarkNoMergeTables page scoping (#20125)
xugangqiangf97c0230502b
diff --git a/internal/deepdoc/parser/pdf/table/table_post.go b/internal/deepdoc/parser/pdf/table/table_post.goindex a65299f8df..78e04cec46 100644--- a/internal/deepdoc/parser/pdf/table/table_post.go+++ b/internal/deepdoc/parser/pdf/table/table_post.go@@ -257,10 +257,15 @@ func MarkNoMergeTables(boxes []pdf.TextBox, tables []pdf.TableItem) {// PageNumber == 0: page numbers are 0-based, so the legitimate first// page carries PageNumber == 0 and must still be scoped to its page.// The original cross-product keeps the highest-indexed table a box- // overlaps as lastTableTI; candidates are ordered by ascending table- // index, so assigning lastTableTI on every match leaves the highest- // index in place — matching the original semantics. seen avoids- // re-testing a table whose positions span several slots on the page.+ // overlaps as lastTableTI. Candidates are not strictly ordered by+ // table index here (page-specific positions on this page precede the+ // page-agnostic noPage positions, which are appended last), so we must+ // not blindly overwrite lastTableTI on every match: a lower-indexed+ // page-agnostic table sitting at the tail would otherwise win over a+ // higher-indexed page-specific table. Keep the maximum index instead,+ // which is order-independent and reproduces the original semantics+ // exactly. seen avoids re-testing a table whose positions span+ // several slots on the page.var cands []pagePositionif !boxes[i].HasPageNumber {cands = all@@ -276,7 +281,9 @@ func MarkNoMergeTables(boxes []pdf.TextBox, tables []pdf.TableItem) {}if boxOverlapsPositionPage(boxes[i], tables[c.tableIdx].Positions[c.posIdx]) {seen[c.tableIdx] = true- lastTableTI = c.tableIdx+ if c.tableIdx > lastTableTI {+ lastTableTI = c.tableIdx+ }}}continuediff --git a/internal/deepdoc/parser/pdf/table/table_replace_opt_test.go b/internal/deepdoc/parser/pdf/table/table_replace_opt_test.goindex 08918b9386..e1fcff0c0f 100644--- a/internal/deepdoc/parser/pdf/table/table_replace_opt_test.go+++ b/internal/deepdoc/parser/pdf/table/table_replace_opt_test.go@@ -42,7 +42,10 @@ func referenceBuildReplacementsAfterMerge(boxes []pdf.TextBox, tables []pdf.Tabl}// referenceMarkNoMergeTables mirrors MarkNoMergeTables with the full cross-// product, so we can assert the indexed version mutates NoMerge identically.+// product, so we can assert the indexed version mutates NoMerge identically. It+// faithfully reproduces the original pre-index semantics: tables are scanned in+// ascending index order and lastTableTI keeps the HIGHEST-indexed matching+// table (there is no early break on the first match).func referenceMarkNoMergeTables(boxes []pdf.TextBox, tables []pdf.TableItem) {var lastTableTI int = -1for i := range boxes {@@ -57,9 +60,6 @@ func referenceMarkNoMergeTables(boxes []pdf.TextBox, tables []pdf.TableItem) {break}}- if matched {- break- }}if !matched {lastTableTI = -1@@ -255,3 +255,48 @@ func TestMarkNoMergeTablesCrossPageSpanningTable(t *testing.T) {t.Errorf("page-6 table must NOT be marked NoMerge: page-6 box did not match it")}}++// TestMarkNoMergeTablesNoPagePrecedence locks the original semantics of+// MarkNoMergeTables: when a single table-layout box overlaps several tables, the+// caption/title that immediately follows must mark the HIGHEST-indexed matching+// table as NoMerge. This must hold even when one of the overlapping tables is+// page-agnostic (its Position carries no PageNumbers) and sits at a LOWER index+// than a page-specific table. The old (page-blind) candidate ordering appended+// the page-agnostic positions last and overwrote lastTableTI on every match, so+// a low-index page-agnostic table could wrongly win and receive the NoMerge mark+// instead of the higher-index page-specific table.+func TestMarkNoMergeTablesNoPagePrecedence(t *testing.T) {+ // Lower-index table, page-agnostic: its position carries no PageNumbers, so+ // it matches any box that overlaps it in X/Y regardless of page.+ noPageTable := pdf.TableItem{Positions: []pdf.Position{+ {Left: 10, Right: 100, Top: 10, Bottom: 50},+ }}+ // Higher-index table, anchored on page 5.+ pageTable := pdf.TableItem{Positions: []pdf.Position{+ {PageNumbers: []int{5}, Left: 10, Right: 100, Top: 10, Bottom: 50},+ }}+ tables := []pdf.TableItem{noPageTable, pageTable} // index 0 = noPage, index 1 = page 5++ // A table-layout box on page 5 overlapping BOTH table positions.+ box := pdf.TextBox{+ PageNumber: 5, HasPageNumber: true,+ X0: 10, X1: 100, Top: 10, Bottom: 50,+ LayoutType: pdf.LayoutTypeTable,+ }+ // A caption following on the same page: it must mark the highest-indexed+ // matching table (index 1, the page-5 table), not the lower-index noPage one.+ caption := pdf.TextBox{+ PageNumber: 5, HasPageNumber: true,+ X0: 10, X1: 100, Top: 60, Bottom: 70,+ LayoutType: pdf.LayoutTypeTitle, Text: "表 1",+ }++ MarkNoMergeTables([]pdf.TextBox{box, caption}, tables)++ if !tables[1].NoMerge {+ t.Errorf("highest-indexed matching table (page 5, index 1) should be marked NoMerge by the following caption")+ }+ if tables[0].NoMerge {+ t.Errorf("lower-index page-agnostic table must NOT win NoMerge over the higher-index page-specific table")+ }+}