mirror of
https://github.com/infiniflow/ragflow.git
synced 2026-08-04 23:00:30 +08:00
## Summary
This PR refactors the Go knowledge-compilation ingestion pipeline
(`internal/ingestion/knowledge_compile` +
`internal/ingestion/component/knowledge_compiler`) with three related
changes:
- **Token-budget batching for LLM merge decisions.**
`LLMMergeDecider.DecideBatch` previously stuffed every `(existing,
candidate)` pair into a single LLM call, risking `max_token` overflow.
It now splits pairs into token-bounded sub-batches (budget =
`llmMaxTokens * 0.85`) via `tokenizer.NumTokensFromString`, runs them
concurrently while preserving the global pair index, and never
reindexes.
- **Process-level global compile pool.** Introduces a single vCPU-sized
goroutine pool (`pool.go`, env `KC_COMPILE_CONCURRENCY`) dedicated to
*all* knowledge-compilation stages. KNN search loop, `DecideBatch`
sub-batches, `WriteMerged`/`DeleteMerged` internals, and the
component-level (structure/mindmap) per-call pools are all unified into
it via an injected submitter. No more per-job short-lived goroutines in
`runCompilerJobs` (futures are collected then awaited on the caller).
Fan-out stays bounded by the pool worker count; these stages are
docengine-bounded / LLM-bounded, not CPU-bounded.
- **DocEngine-only deletion.** `Consumer.processBatch` deletion no
longer loads the deleted docs' products into memory. Two sequential
DocEngine calls replace the old in-memory surgery:
- `DeleteDocLevelForDocs` — one `DeleteChunks` over `doc_id IN
deletedDocIDs` (merged rows carry `doc_id == kb`, so only per-doc
products match).
- `StripMergedSources` — one `Search` of `kc_merged=1` rows filtered by
`source_doc_ids IN deletedDocIDs` (intersection pushed down to the
engine), `UpdateChunks` the source array of survivors, and
`DeleteChunks` the rows whose array became empty.
## Changes
- `internal/ingestion/knowledge_compile/pool.go` (new): global
`compilerPool` +
`runCompilerJobs`/`SubmitCompilerJob`/`SubmitCompilerJobs`.
- `internal/ingestion/knowledge_compile/consumer.go`: deletion rewritten
to the two DocEngine calls;
`mergedBase`/`toDelete`/`stripDeletedSources` removed.
- `internal/ingestion/knowledge_compile/writer.go`:
`DeleteDocLevelForDocs` + `StripMergedSources` replace
`DeleteMergedForDoc`/`DeleteMerged`.
- `internal/ingestion/knowledge_compile/reader.go`: drop
`LoadMergedBySourceDoc` + `containsString` (keep `LoadDocProducts` for
the completion branch).
- `internal/ingestion/knowledge_compile/dedup.go`: `NewLLMDeduper` takes
`llmMaxTokens`; wires `SetMaxBatchTokens`/`SetSubmitter`.
- `internal/ingestion/knowledge_compiler/{structure,merge}.go`,
`mindmap/mindmap.go`, `pool_wiring.go`: token-budget split + submitter
injection.
- Tests: `structure_test.go` (token-budget split), `dedup_test.go`,
`consumer_test.go` (tombstone + DocEngine deletion assertions) updated.
## Validation
`bash build.sh --test -race ./internal/ingestion/knowledge_compile/...
./internal/ingestion/component/knowledge_compiler/...` passes (unit
tier, no external services).
🤖 Generated with [CodeBuddy](https://www.codebuddy.ai)
---------
Co-authored-by: yuzhichang <yuzhichang@infiniflow.ai>
252 lines
8.5 KiB
Go
252 lines
8.5 KiB
Go
//
|
|
// Copyright 2026 The InfiniFlow Authors. All Rights Reserved.
|
|
//
|
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
// you may not use this file except in compliance with the License.
|
|
// You may obtain a copy of the License at
|
|
//
|
|
// http://www.apache.org/licenses/LICENSE-2.0
|
|
//
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
// See the License for the specific language governing permissions and
|
|
// limitations under the License.
|
|
|
|
package knowledge_compile
|
|
|
|
import (
|
|
"context"
|
|
"sync"
|
|
"testing"
|
|
"time"
|
|
|
|
kccommon "ragflow/internal/ingestion/component/knowledge_compiler/common"
|
|
)
|
|
|
|
// fakeReader returns a fixed per-document product set, keyed by docID.
|
|
type fakeReader struct {
|
|
mu sync.Mutex
|
|
products []kccommon.Product
|
|
calls int
|
|
}
|
|
|
|
func (r *fakeReader) LoadDocProducts(_ context.Context, _, _, docID string) ([]kccommon.Product, error) {
|
|
r.mu.Lock()
|
|
defer r.mu.Unlock()
|
|
r.calls++
|
|
var out []kccommon.Product
|
|
for _, p := range r.products {
|
|
if p.DocID == docID {
|
|
out = append(out, p)
|
|
}
|
|
}
|
|
return out, nil
|
|
}
|
|
|
|
func (r *fakeReader) SearchSimilar(_ context.Context, _, _ string, _ kccommon.Variant, _ []float64, _ int, _ float64) (kccommon.Product, float64, error) {
|
|
return kccommon.Product{}, 0, nil
|
|
}
|
|
|
|
// fakeWriter captures written merged products.
|
|
type fakeWriter struct {
|
|
mu sync.Mutex
|
|
written [][]kccommon.Product
|
|
deletedDocLevel []string
|
|
strippedSources []string
|
|
}
|
|
|
|
func (w *fakeWriter) WriteMerged(_ context.Context, _, _ string, products []kccommon.Product) error {
|
|
if len(products) == 0 {
|
|
return nil
|
|
}
|
|
w.mu.Lock()
|
|
defer w.mu.Unlock()
|
|
cp := make([]kccommon.Product, len(products))
|
|
copy(cp, products)
|
|
w.written = append(w.written, cp)
|
|
return nil
|
|
}
|
|
|
|
func (w *fakeWriter) DeleteDocLevelForDocs(_ context.Context, _, _ string, docIDs []string) error {
|
|
w.mu.Lock()
|
|
defer w.mu.Unlock()
|
|
w.deletedDocLevel = append(w.deletedDocLevel, docIDs...)
|
|
return nil
|
|
}
|
|
|
|
func (w *fakeWriter) StripMergedSources(_ context.Context, _, _ string, docIDs []string) error {
|
|
w.mu.Lock()
|
|
defer w.mu.Unlock()
|
|
w.strippedSources = append(w.strippedSources, docIDs...)
|
|
return nil
|
|
}
|
|
|
|
func sampleProducts() []kccommon.Product {
|
|
return []kccommon.Product{
|
|
{ID: "p1", DocID: "d1", TenantID: "t1", Variant: kccommon.Variant("structure"),
|
|
Content: `{"name":"X"}`, Meta: map[string]any{"name": "X", "kind": "entity"}},
|
|
{ID: "p2", DocID: "d1", TenantID: "t1", Variant: kccommon.Variant("structure"),
|
|
Content: `{"name":"Y"}`, Meta: map[string]any{"name": "Y", "kind": "entity"}},
|
|
}
|
|
}
|
|
|
|
func newTestConsumer(sch *FakeScheduler, r *fakeReader, w *fakeWriter, factory DeduperFactory) *Consumer {
|
|
return NewConsumer(sch,
|
|
WithReader(r),
|
|
WithWriter(w),
|
|
WithDeduperFactory(factory),
|
|
)
|
|
}
|
|
|
|
func TestConsumerCompletedWritesMerged(t *testing.T) {
|
|
sch := NewFakeScheduler()
|
|
r := &fakeReader{products: sampleProducts()}
|
|
w := &fakeWriter{}
|
|
c := newTestConsumer(sch, r, w, func(string) (Deduper, error) { return NewNoopDeduper(), nil })
|
|
|
|
if err := sch.Publish(context.Background(), "t1", "kb1", "d1", string(EventTypeCompleted), 1); err != nil {
|
|
t.Fatalf("append: %v", err)
|
|
}
|
|
c.tryClaimAndProcess(context.Background())
|
|
|
|
w.mu.Lock()
|
|
defer w.mu.Unlock()
|
|
if len(w.written) != 1 {
|
|
t.Fatalf("expected 1 WriteMerged call, got %d", len(w.written))
|
|
}
|
|
if len(w.written[0]) != 2 {
|
|
t.Fatalf("expected 2 merged products, got %d", len(w.written[0]))
|
|
}
|
|
// After ack, the claim row must be cleared (no live lease left behind).
|
|
if _, ok, _ := sch.TryClaim(context.Background()); ok {
|
|
t.Fatalf("expected no claimable row after ack")
|
|
}
|
|
}
|
|
|
|
func TestConsumerTombstoneSkipsCompletedBeforeDeleted(t *testing.T) {
|
|
sch := NewFakeScheduler()
|
|
r := &fakeReader{products: sampleProducts()}
|
|
w := &fakeWriter{}
|
|
c := newTestConsumer(sch, r, w, func(string) (Deduper, error) { return NewNoopDeduper(), nil })
|
|
|
|
// completed (seq 1) before deleted (seq 2): the completion is the stale
|
|
// original, so it must be skipped and d1's per-doc products orphaned.
|
|
if err := sch.Publish(context.Background(), "t1", "kb1", "d1", string(EventTypeCompleted), 1); err != nil {
|
|
t.Fatalf("append completed: %v", err)
|
|
}
|
|
if err := sch.Publish(context.Background(), "t1", "kb1", "d1", string(EventTypeDeleted), 2); err != nil {
|
|
t.Fatalf("append deleted: %v", err)
|
|
}
|
|
c.tryClaimAndProcess(context.Background())
|
|
|
|
w.mu.Lock()
|
|
defer w.mu.Unlock()
|
|
// No merged write (completed skipped). The deletion is handled entirely on
|
|
// the DocEngine: d1's per-doc products are dropped in one call and d1 is
|
|
// stripped from every dataset-level product in one call. No products are
|
|
// loaded into memory.
|
|
if len(w.written) != 0 {
|
|
t.Fatalf("expected no merged write, got %d", len(w.written))
|
|
}
|
|
if len(w.deletedDocLevel) != 1 || w.deletedDocLevel[0] != "d1" {
|
|
t.Fatalf("expected DeleteDocLevelForDocs([d1]), got %v", w.deletedDocLevel)
|
|
}
|
|
if len(w.strippedSources) != 1 || w.strippedSources[0] != "d1" {
|
|
t.Fatalf("expected StripMergedSources([d1]), got %v", w.strippedSources)
|
|
}
|
|
}
|
|
|
|
func TestConsumerReingestAfterDeletionWins(t *testing.T) {
|
|
sch := NewFakeScheduler()
|
|
r := &fakeReader{products: sampleProducts()}
|
|
w := &fakeWriter{}
|
|
c := newTestConsumer(sch, r, w, func(string) (Deduper, error) { return NewNoopDeduper(), nil })
|
|
|
|
// deleted (seq 1) then completed (seq 2): the completion has the higher
|
|
// sequence, so it wins — the doc is re-ingested, NOT deleted. The deletion
|
|
// must not drop its per-doc products, and the completion must be merged.
|
|
if err := sch.Publish(context.Background(), "t1", "kb1", "d1", string(EventTypeDeleted), 1); err != nil {
|
|
t.Fatalf("append deleted: %v", err)
|
|
}
|
|
if err := sch.Publish(context.Background(), "t1", "kb1", "d1", string(EventTypeCompleted), 2); err != nil {
|
|
t.Fatalf("append completed: %v", err)
|
|
}
|
|
c.tryClaimAndProcess(context.Background())
|
|
|
|
w.mu.Lock()
|
|
defer w.mu.Unlock()
|
|
// No deletion calls: the higher-seq completion overrides the deletion.
|
|
if len(w.deletedDocLevel) != 0 {
|
|
t.Fatalf("expected no DeleteDocLevelForDocs, got %v", w.deletedDocLevel)
|
|
}
|
|
if len(w.strippedSources) != 0 {
|
|
t.Fatalf("expected no StripMergedSources, got %v", w.strippedSources)
|
|
}
|
|
// The completion is merged into the dataset-level products.
|
|
if len(w.written) != 1 {
|
|
t.Fatalf("expected 1 WriteMerged call, got %d", len(w.written))
|
|
}
|
|
if len(w.written[0]) != 2 {
|
|
t.Fatalf("expected 2 merged products, got %d", len(w.written[0]))
|
|
}
|
|
}
|
|
|
|
func TestSchedulerClaimClosedBatch(t *testing.T) {
|
|
sch := NewFakeScheduler()
|
|
for i := 0; i < 40; i++ {
|
|
docID := "d" + string(rune('a'+i%26)) + string(rune('0'+i/26))
|
|
if err := sch.Publish(context.Background(), "t1", "kb1", docID, string(EventTypeCompleted), uint64(i)); err != nil {
|
|
t.Fatalf("append: %v", err)
|
|
}
|
|
}
|
|
// First claim returns the bounded prefix (default batch=32), not all 40.
|
|
cr1, ok, err := sch.Claim(context.Background(), "kb1")
|
|
if err != nil || !ok {
|
|
t.Fatalf("claim1: ok=%v err=%v", ok, err)
|
|
}
|
|
if len(cr1.Entries) != 32 {
|
|
t.Fatalf("expected 32 entries in first claim, got %d", len(cr1.Entries))
|
|
}
|
|
// A second claim by the same holder (still live lease) must not re-claim
|
|
// the same dataset until the first batch is acked.
|
|
_, ok2, _ := sch.Claim(context.Background(), "kb1")
|
|
if ok2 {
|
|
t.Fatalf("second claim should have lost the race (live lease)")
|
|
}
|
|
// Ack the first batch, then the remaining 8 become claimable.
|
|
if _, err := sch.Ack(context.Background(), "kb1", cr1.Token, cr1.Entries); err != nil {
|
|
t.Fatalf("ack: %v", err)
|
|
}
|
|
cr3, ok3, err := sch.Claim(context.Background(), "kb1")
|
|
if err != nil || !ok3 {
|
|
t.Fatalf("claim3: ok=%v err=%v", ok3, err)
|
|
}
|
|
if len(cr3.Entries) != 8 {
|
|
t.Fatalf("expected 8 remaining entries, got %d", len(cr3.Entries))
|
|
}
|
|
}
|
|
|
|
func TestSchedulerReclaimExpired(t *testing.T) {
|
|
sch := NewFakeScheduler()
|
|
if err := sch.Publish(context.Background(), "t1", "kb1", "d1", string(EventTypeCompleted), 1); err != nil {
|
|
t.Fatalf("append: %v", err)
|
|
}
|
|
_, ok, err := sch.Claim(context.Background(), "kb1")
|
|
if err != nil || !ok {
|
|
t.Fatalf("claim: ok=%v err=%v", ok, err)
|
|
}
|
|
// Simulate a crash: the inflight is never acked and the lease has expired.
|
|
past := time.Now().Add(-time.Hour)
|
|
sch.rows["kb1"].expires = &past
|
|
// TryClaim reclaims the expired lease back into backlog and immediately
|
|
// claims it again.
|
|
cr2, ok2, err := sch.TryClaim(context.Background())
|
|
if err != nil || !ok2 {
|
|
t.Fatalf("reclaim claim: ok=%v err=%v", ok2, err)
|
|
}
|
|
if len(cr2.Entries) != 1 {
|
|
t.Fatalf("expected 1 entry after reclaim, got %d", len(cr2.Entries))
|
|
}
|
|
}
|