Skip to content

Commit 302ebad

Browse files
committed
优化template_id
1 parent 0598ac1 commit 302ebad

11 files changed

Lines changed: 30 additions & 22 deletions

File tree

backend/modules/evaluation/infra/repo/experiment/mysql/convert/expt.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ func (ExptConverter) DO2PO(experiment *entity.Experiment) (*model.Experiment, er
3737
StartAt: experiment.StartAt,
3838
EndAt: experiment.EndAt,
3939
LatestRunID: experiment.LatestRunID,
40+
ExptTemplateID: experiment.ExptTemplateID,
4041
CreditCost: int32(experiment.CreditCost),
4142
SourceType: int32(experiment.SourceType),
4243
SourceID: experiment.SourceID,
@@ -99,5 +100,6 @@ func (ExptConverter) PO2DO(expt *model.Experiment, refs []*model.ExptEvaluatorRe
99100
SourceID: expt.SourceID,
100101
ExptType: entity.ExptType(expt.ExptType),
101102
MaxAliveTime: gptr.Indirect(expt.MaxAliveTime),
103+
ExptTemplateID: expt.ExptTemplateID,
102104
}, nil
103105
}

backend/modules/evaluation/infra/repo/experiment/mysql/expt_template_evaluator_ref.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ func (d *exptTemplateEvaluatorRefDAOImpl) GetByTemplateIDs(ctx context.Context,
4747
return nil, nil
4848
}
4949
q := query.Use(d.db.NewSession(ctx)).ExptTemplateEvaluatorRef
50-
results, err := q.WithContext(ctx).Where(q.TemplateID.In(templateIDs...)).Find()
50+
results, err := q.WithContext(ctx).Where(q.ExptTemplateID.In(templateIDs...)).Find()
5151
if err != nil {
5252
return nil, errorx.Wrapf(err, "get expt_template_evaluator_ref by template_ids fail, template_ids: %v", templateIDs)
5353
}
@@ -56,7 +56,7 @@ func (d *exptTemplateEvaluatorRefDAOImpl) GetByTemplateIDs(ctx context.Context,
5656

5757
func (d *exptTemplateEvaluatorRefDAOImpl) DeleteByTemplateID(ctx context.Context, templateID int64) error {
5858
q := query.Use(d.db.NewSession(ctx)).ExptTemplateEvaluatorRef
59-
_, err := q.WithContext(ctx).Where(q.TemplateID.Eq(templateID)).Delete()
59+
_, err := q.WithContext(ctx).Where(q.ExptTemplateID.Eq(templateID)).Delete()
6060
if err != nil {
6161
return errorx.Wrapf(err, "delete expt_template_evaluator_ref by template_id fail, template_id: %v", templateID)
6262
}

backend/modules/evaluation/infra/repo/experiment/mysql/gorm_gen/model/experiment.gen.go

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

backend/modules/evaluation/infra/repo/experiment/mysql/gorm_gen/model/expt_template_evaluator_ref.gen.go

Lines changed: 8 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

backend/modules/evaluation/infra/repo/experiment/mysql/gorm_gen/query/experiment.gen.go

Lines changed: 5 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

backend/modules/evaluation/infra/repo/experiment/mysql/gorm_gen/query/expt_template_evaluator_ref.gen.go

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

backend/script/gorm_gen/generate.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,6 @@ func generateForEvaluationExpt(db *gorm.DB) {
204204
"expt_insight_analysis_feedback_vote",
205205
"expt_template",
206206
"expt_template_evaluator_ref",
207-
"expt_template_ref",
208207
}
209208

210209
var models []any

release/deployment/docker-compose/bootstrap/mysql-init/init-sql/experiment.sql

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ CREATE TABLE IF NOT EXISTS `experiment`
1919
`latest_run_id` bigint unsigned NOT NULL DEFAULT '0' COMMENT '最后运行id',
2020
`target_id` bigint unsigned NOT NULL DEFAULT '0' COMMENT '评估对象 id',
2121
`eval_set_id` bigint unsigned NOT NULL DEFAULT '0' COMMENT '评测集 id',
22+
`expt_template_id` bigint unsigned NOT NULL DEFAULT '0' COMMENT '实验模板 id',
2223
`credit_cost` int NOT NULL DEFAULT '0' COMMENT '权益消耗模式',
2324
`source_type` int unsigned NOT NULL DEFAULT '1' COMMENT '实验来源类型,评测:1,自动化任务:2...',
2425
`source_id` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '0' COMMENT '实验来源id',
@@ -37,4 +38,4 @@ CREATE TABLE IF NOT EXISTS `experiment`
3738
KEY `idx_source_type_source_id` (`source_type`, `source_id`)
3839
) ENGINE = InnoDB
3940
DEFAULT CHARSET = utf8mb4
40-
COLLATE = utf8mb4_general_ci COMMENT ='experiment';
41+
COLLATE = utf8mb4_general_ci COMMENT ='experiment';

release/deployment/docker-compose/bootstrap/mysql-init/init-sql/expt_template_evaluator_ref.sql

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@ CREATE TABLE IF NOT EXISTS `expt_template_evaluator_ref`
22
(
33
`id` bigint unsigned NOT NULL DEFAULT '0' COMMENT 'id',
44
`space_id` bigint unsigned NOT NULL DEFAULT '0' COMMENT '空间 id',
5-
`template_id` bigint unsigned NOT NULL DEFAULT '0' COMMENT '实验模板 id',
5+
`expt_template_id` bigint unsigned NOT NULL DEFAULT '0' COMMENT '实验模板 id',
66
`evaluator_id` bigint unsigned NOT NULL DEFAULT '0' COMMENT '评估器 id',
77
`evaluator_version_id` bigint unsigned NOT NULL DEFAULT '0' COMMENT '评估器版本 id',
88
`created_at` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
99
`updated_at` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
1010
`deleted_at` timestamp NULL DEFAULT NULL COMMENT '删除时间',
1111
PRIMARY KEY (`id`),
12-
KEY `idx_space_id_template_id` (`space_id`, `template_id`),
12+
KEY `idx_space_id_expt_template_id` (`space_id`, `expt_template_id`),
1313
KEY `idx_space_id_evaluator_id` (`space_id`, `evaluator_id`),
1414
KEY `idx_space_id_evaluator_version_id` (`space_id`, `evaluator_version_id`)
1515
) ENGINE = InnoDB

release/deployment/helm-chart/charts/app/bootstrap/init/mysql/init-sql/experiment.sql

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ CREATE TABLE IF NOT EXISTS `experiment`
1919
`latest_run_id` bigint unsigned NOT NULL DEFAULT '0' COMMENT '最后运行id',
2020
`target_id` bigint unsigned NOT NULL DEFAULT '0' COMMENT '评估对象 id',
2121
`eval_set_id` bigint unsigned NOT NULL DEFAULT '0' COMMENT '评测集 id',
22+
`expt_template_id` bigint unsigned NOT NULL DEFAULT '0' COMMENT '实验模板 id',
2223
`credit_cost` int NOT NULL DEFAULT '0' COMMENT '权益消耗模式',
2324
`source_type` int unsigned NOT NULL DEFAULT '1' COMMENT '实验来源类型,评测:1,自动化任务:2...',
2425
`source_id` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '0' COMMENT '实验来源id',
@@ -37,4 +38,4 @@ CREATE TABLE IF NOT EXISTS `experiment`
3738
KEY `idx_source_type_source_id` (`source_type`, `source_id`)
3839
) ENGINE = InnoDB
3940
DEFAULT CHARSET = utf8mb4
40-
COLLATE = utf8mb4_general_ci COMMENT ='experiment';
41+
COLLATE = utf8mb4_general_ci COMMENT ='experiment';

0 commit comments

Comments
 (0)