Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions backend/modules/evaluation/domain/service/expt_manage_impl.go
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ import (
)

func NewExptManager(
// tupleSvc IExptTupleService,
exptResultService ExptResultService,
exptRepo repo.IExperimentRepo,
exptRunLogRepo repo.IExptRunLogRepo,
Expand Down Expand Up @@ -561,10 +560,12 @@ func (e *ExptMangerImpl) CreateExpt(ctx context.Context, req *entity.CreateExptP
EvalSet: tuple.EvalSet,
}

if req.CreateEvalTargetParam != nil {
if !req.CreateEvalTargetParam.IsNull() {
do.TargetType = gptr.Indirect(req.CreateEvalTargetParam.EvalTargetType)
do.TargetID = versionedTargetID.TargetID
do.TargetVersionID = versionedTargetID.VersionID
if versionedTargetID != nil {
do.TargetID = versionedTargetID.TargetID
do.TargetVersionID = versionedTargetID.VersionID
}
if do.EvalConf != nil && do.EvalConf.ConnectorConf.TargetConf != nil {
do.EvalConf.ConnectorConf.TargetConf.TargetVersionID = do.TargetVersionID
}
Expand Down
16 changes: 12 additions & 4 deletions backend/modules/evaluation/domain/service/expt_result_impl.go
Original file line number Diff line number Diff line change
Expand Up @@ -873,21 +873,29 @@ func (b *PayloadBuilder) BuildItemResults(ctx context.Context) ([]*entity.ItemRe
wg.Wait()
close(resultCh)

var exptResultBuildersWithResult []*ExptResultBuilder // 任务结果
var errors []error
var (
errors []error
exptIDToResultBuilder = make(map[int64]*ExptResultBuilder)
)
for exptResultBuilder := range resultCh {
if exptResultBuilder.Err != nil {
errors = append(errors, fmt.Errorf("ExptID %d: %v", exptResultBuilder.ExptID, exptResultBuilder.Err))
} else {
exptResultBuildersWithResult = append(exptResultBuildersWithResult, exptResultBuilder)
exptIDToResultBuilder[exptResultBuilder.ExptID] = exptResultBuilder
}
}
if len(errors) > 0 {
logs.CtxError(ctx, "build expt result fail, errors:%v", errors)
return nil, fmt.Errorf("build expt result fail, errors:%v", errors)
}

b.ExptResultBuilders = exptResultBuildersWithResult
resultedBuilders := make([]*ExptResultBuilder, 0, len(exptIDToResultBuilder))
for _, exptID := range b.ExptIDs {
if got := exptIDToResultBuilder[exptID]; got != nil {
resultedBuilders = append(resultedBuilders, exptIDToResultBuilder[exptID])
}
}
b.ExptResultBuilders = resultedBuilders
Comment on lines +892 to +898
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[P2] Potential loss of duplicate entries when ordering builders by ExptIDs. Using a map keyed by ExptID collapses duplicates if b.ExptIDs contains repeated IDs. The previous slice-based approach preserved duplicates; the new logic will drop them silently. If duplicates are possible at input (client/aggregation bugs do happen), this changes behavior and may produce fewer experiment results than expected. Consider preserving duplicates by ordering the existing slice stably according to b.ExptIDs instead of re-building from a map:

rank := make(map[int64]int)
for i, id := range b.ExptIDs { rank[id] = i }
sort.SliceStable(exptResultBuilders, func(i, j int) bool { return rank[exptResultBuilders[i].ExptID] < rank[exptResultBuilders[j].ExptID] })


// 填充数据
err := b.fillItemResults(ctx)
Expand Down
Loading