Skip to content

Commit a13ceeb

Browse files
committed
use clientid for codebase name
1 parent a2d5c5c commit a13ceeb

File tree

3 files changed

+22
-63
lines changed

3 files changed

+22
-63
lines changed

internal/logic/embedding_task.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,8 @@ func (l *TaskLogic) SubmitTask(req *types.IndexTaskRequest, r *http.Request) (re
9696
l.Logger.Errorf("初始化代码库失败 - RequestId: %s, 错误: %v", req.RequestId, err)
9797
return nil, err
9898
}
99+
codebase.Name = clientId // 更新代码库名称
100+
codebase.Path = clientPath
99101
l.Logger.Infof("初始化代码库成功 - RequestId: %s, CodebaseId: %d", req.RequestId, codebase.ID)
100102

101103
ctx := context.WithValue(l.ctx, tracer.Key, tracer.RequestTraceId(int(codebase.ID)))

internal/logic/query_codebase.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -135,10 +135,9 @@ func (l *QueryCodebaseLogic) verifyCodebasePermission(req *types.CodebaseQueryRe
135135
// 使用 Querier 查询数据库验证clientId与codebase的关联关系
136136
codebase, err := l.svcCtx.Querier.Codebase.WithContext(l.ctx).
137137
Where(l.svcCtx.Querier.Codebase.ClientID.Eq(req.ClientId)).
138-
Where(l.svcCtx.Querier.Codebase.Name.Eq(req.CodebaseName)).
139138
Where(l.svcCtx.Querier.Codebase.ClientPath.Eq(req.CodebasePath)).
140139
First()
141-
140+
142141
if err != nil {
143142
if err == gorm.ErrRecordNotFound {
144143
l.Infof("代码库不存在或无权限访问, clientId: %s, codebaseName: %s, codebasePath: %s",
@@ -169,4 +168,4 @@ func (l *QueryCodebaseLogic) logQuery(req *types.CodebaseQueryRequest, resp *typ
169168
l.Infof("代码库查询成功, clientId: %s, codebaseId: %d, codebaseName: %s, totalRecords: %d",
170169
req.ClientId, resp.CodebaseId, resp.CodebaseName, totalRecords)
171170
}
172-
}
171+
}

internal/store/vector/weaviate_wrapper.go

Lines changed: 18 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -407,7 +407,6 @@ func (r *weaviateWrapper) GetCodebaseRecords(ctx context.Context, codebaseId int
407407
fmt.Printf("[DEBUG] 生成的 tenantName: %s\n", tenantName)
408408

409409
// 添加调试日志:检查 Weaviate 连接状态
410-
fmt.Printf("[DEBUG] 检查 Weaviate 连接状态...\n")
411410
live, err := r.client.Misc().LiveChecker().Do(ctx)
412411
if err != nil {
413412
fmt.Printf("[DEBUG] Weaviate 连接检查失败: %v\n", err)
@@ -426,16 +425,16 @@ func (r *weaviateWrapper) GetCodebaseRecords(ctx context.Context, codebaseId int
426425
{Name: Content},
427426
{Name: MetadataRange},
428427
{Name: MetadataTokenCount},
428+
{Name: MetadataCodebaseId},
429+
{Name: MetadataCodebasePath},
430+
{Name: MetadataCodebaseName},
431+
{Name: MetadataSyncId},
429432
}
430433

431434
// 构建过滤器
432435
codebaseFilter := filters.Where().WithPath([]string{MetadataCodebaseId}).
433436
WithOperator(filters.Equal).WithValueInt(int64(codebaseId))
434437

435-
fmt.Printf("[DEBUG] 构建的过滤器 - codebaseId: %d\n", codebaseId)
436-
fmt.Printf("[DEBUG] 查询类名: %s\n", r.className)
437-
fmt.Printf("[DEBUG] 使用的 tenant: %s\n", tenantName)
438-
439438
// 执行查询,获取所有记录
440439
var allRecords []*types.CodebaseRecord
441440
limit := 1000 // 每批获取1000条记录
@@ -488,41 +487,6 @@ func (r *weaviateWrapper) GetCodebaseRecords(ctx context.Context, codebaseId int
488487
}
489488
}
490489

491-
fmt.Printf("[DEBUG] 查询完成,总记录数: %d\n", len(allRecords))
492-
493-
// 分析查询结果
494-
if len(allRecords) == 0 {
495-
fmt.Printf("[DEBUG] 警告: 查询结果为空,可能的原因:\n")
496-
fmt.Printf("[DEBUG] 1. Weaviate 中没有 codebaseId %d 的数据\n", codebaseId)
497-
fmt.Printf("[DEBUG] 2. Tenant %s 不存在或没有权限访问\n", tenantName)
498-
fmt.Printf("[DEBUG] 3. 过滤器条件过于严格\n")
499-
fmt.Printf("[DEBUG] 4. Weaviate 连接配置有问题\n")
500-
fmt.Printf("[DEBUG] 5. 类名 %s 不正确\n", r.className)
501-
} else {
502-
// 分析文件路径分布
503-
pathAnalysis := make(map[string]int)
504-
for _, record := range allRecords {
505-
pathAnalysis[record.FilePath]++
506-
}
507-
fmt.Printf("[DEBUG] 查询结果分析:\n")
508-
fmt.Printf("[DEBUG] 唯一文件路径数: %d\n", len(pathAnalysis))
509-
fmt.Printf("[DEBUG] 总记录数: %d\n", len(allRecords))
510-
511-
// 显示前几个文件路径作为示例
512-
count := 0
513-
for path := range pathAnalysis {
514-
if count < 5 {
515-
fmt.Printf("[DEBUG] 示例文件路径 %d: %s\n", count+1, path)
516-
count++
517-
} else {
518-
break
519-
}
520-
}
521-
if len(pathAnalysis) > 5 {
522-
fmt.Printf("[DEBUG] ... (还有 %d 个文件路径未显示)\n", len(pathAnalysis)-5)
523-
}
524-
}
525-
526490
return allRecords, nil
527491
}
528492

@@ -595,29 +559,22 @@ func (r *weaviateWrapper) unmarshalCodebaseRecordsResponse(res *models.GraphQLRe
595559

596560
filePath := getStringValue(obj, MetadataFilePath)
597561
record := &types.CodebaseRecord{
598-
Id: getStringValue(additional, "id"),
599-
FilePath: filePath,
600-
Language: getStringValue(obj, MetadataLanguage),
601-
Content: getStringValue(obj, Content),
602-
Range: rangeInfo,
603-
TokenCount: int(getFloatValue(obj, MetadataTokenCount)),
604-
LastUpdated: lastUpdated,
562+
Id: getStringValue(additional, "id"),
563+
FilePath: filePath,
564+
Language: getStringValue(obj, MetadataLanguage),
565+
Content: getStringValue(obj, Content),
566+
Range: rangeInfo,
567+
TokenCount: int(getFloatValue(obj, MetadataTokenCount)),
568+
LastUpdated: lastUpdated,
569+
CodebaseId: int32(getFloatValue(obj, MetadataCodebaseId)),
570+
CodebasePath: getStringValue(obj, MetadataCodebasePath),
571+
CodebaseName: getStringValue(obj, MetadataCodebaseName),
572+
SyncId: int32(getFloatValue(obj, MetadataSyncId)),
605573
}
606574

607575
records = append(records, record)
608576
uniquePaths[filePath]++
609577

610-
if i < 10 { // 只打印前10个记录避免日志过多
611-
fmt.Printf("[DEBUG] 记录 %d: FilePath=%s, Language=%s, ID=%s\n", i+1, filePath, record.Language, record.Id)
612-
}
613-
}
614-
615-
fmt.Printf("[DEBUG] 解析完成,有效记录数: %d\n", len(records))
616-
fmt.Printf("[DEBUG] 唯一文件路径数: %d\n", len(uniquePaths))
617-
for path, count := range uniquePaths {
618-
if count > 1 {
619-
fmt.Printf("[DEBUG] 重复路径: %s (出现 %d 次)\n", path, count)
620-
}
621578
}
622579

623580
return records, nil
@@ -837,6 +794,7 @@ func (r *weaviateWrapper) unmarshalRecordsResponse(res *models.GraphQLResponse)
837794
codebaseId, _ := obj[MetadataCodebaseId].(float64)
838795
codebasePath, _ := obj[MetadataCodebasePath].(string)
839796
codebaseName, _ := obj[MetadataCodebaseName].(string)
797+
840798
syncId, _ := obj[MetadataSyncId].(float64)
841799

842800
record := &types.CodebaseRecord{
@@ -1021,8 +979,8 @@ func (r *weaviateWrapper) InsertCodeChunks(ctx context.Context, docs []*types.Co
1021979
MetadataFilePath: c.FilePath,
1022980
MetadataLanguage: c.Language,
1023981
MetadataCodebaseId: c.CodebaseId,
1024-
MetadataCodebasePath: c.CodebasePath,
1025-
MetadataCodebaseName: c.CodebaseName,
982+
MetadataCodebasePath: options.CodebasePath,
983+
MetadataCodebaseName: options.CodebaseName,
1026984
MetadataSyncId: options.SyncId,
1027985
MetadataRange: c.Range,
1028986
MetadataTokenCount: c.TokenCount,

0 commit comments

Comments
 (0)