From 3b2677acd1b583dd1dd881e62c6fcc582cdab23e Mon Sep 17 00:00:00 2001 From: Yousong Zhou Date: Wed, 17 Apr 2019 07:15:25 +0000 Subject: [PATCH] =?UTF-8?q?tasks:=20=E6=94=B9=E5=96=84=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E8=AF=AD=E5=8F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 索引简化，obj_id的区分度非常高，且在QueryTasksOfObject()等相关的查询中是确定出现的 - obj_name可认为被obj_id唯一确定 - created_at若出现可假设被MySQL Index Merge优化 - stage的值是可枚举的 - Join taskobjects_tbl时，避免使用子查询查全表 - 使用Union合并两个查询结果 --- pkg/cloudcommon/db/taskman/tasks.go | 84 +++++++++++++++-------------- 1 file changed, 44 insertions(+), 40 deletions(-) diff --git a/pkg/cloudcommon/db/taskman/tasks.go b/pkg/cloudcommon/db/taskman/tasks.go index 179bdb4ffa..cb30f0f16e 100644 --- a/pkg/cloudcommon/db/taskman/tasks.go +++ b/pkg/cloudcommon/db/taskman/tasks.go @@ -65,7 +65,6 @@ var TaskManager *STaskManager func init() { TaskManager = &STaskManager{SResourceBaseManager: db.NewResourceBaseManager(STask{}, "tasks_tbl", "task", "tasks")} - TaskManager.TableSpec().AddIndex(true, "created_at", "stage", "obj_id", "obj_name") } type STask struct { @@ -73,10 +72,10 @@ type STask struct { Id string `width:"36" charset:"ascii" primary:"true" list:"user"` // Column(VARCHAR(36, charset='ascii'), primary_key=True, default=get_uuid) - ObjName string `width:"128" charset:"utf8" nullable:"false" list:"user"` // Column(VARCHAR(128, charset='utf8'), nullable=False) - ObjId string `width:"128" charset:"ascii" nullable:"false" list:"user"` // Column(VARCHAR(ID_LENGTH, charset='ascii'), nullable=False) - TaskName string `width:"64" charset:"ascii" nullable:"false" list:"user"` // Column(VARCHAR(64, charset='ascii'), nullable=False) - UserCred mcclient.TokenCredential `width:"1024" charset:"ascii" nullable:"false" get:"user"` // Column(VARCHAR(1024, charset='ascii'), nullable=False) + ObjName string `width:"128" charset:"utf8" nullable:"false" list:"user"` // Column(VARCHAR(128, charset='utf8'), nullable=False) + ObjId string `width:"128" charset:"ascii" nullable:"false" list:"user" index:"true"` // Column(VARCHAR(ID_LENGTH, charset='ascii'), nullable=False) + TaskName string `width:"64" charset:"ascii" nullable:"false" list:"user"` // Column(VARCHAR(64, charset='ascii'), nullable=False) + UserCred mcclient.TokenCredential `width:"1024" charset:"ascii" nullable:"false" get:"user"` // Column(VARCHAR(1024, charset='ascii'), nullable=False) // OwnerCred string `width:"512" charset:"ascii" nullable:"true"` // Column(VARCHAR(512, charset='ascii'), nullable=True) Params *jsonutils.JSONDict `charset:"ascii" length:"medium" nullable:"false" get:"user"` // Column(MEDIUMTEXT(charset='ascii'), nullable=False) @@ -706,48 +705,53 @@ func (task *STask) GetStartTime() time.Time { } func (manager *STaskManager) QueryTasksOfObject(obj db.IStandaloneModel, since time.Time, isOpen *bool) *sqlchemy.SQuery { - subq1 := manager.Query("id") - subq1 = subq1.Equals("obj_name", obj.Keyword()) - subq1 = subq1.Equals("obj_id", obj.GetId()) - if !since.IsZero() { - subq1 = subq1.GE("created_at", since) - } - if isOpen != nil { - if *isOpen { - subq1 = subq1.Filter(sqlchemy.NOT( - sqlchemy.In(subq1.Field("stage"), []string{"complete", "failed"}), - )) - } else if !*isOpen { - subq1 = subq1.In("stage", []string{"complete", "failed"}) + subq1 := manager.Query() + { + subq1 = subq1.Equals("obj_id", obj.GetId()) + subq1 = subq1.Equals("obj_name", obj.Keyword()) + if !since.IsZero() { + subq1 = subq1.GE("created_at", since) + } + if isOpen != nil { + if *isOpen { + subq1 = subq1.Filter(sqlchemy.NOT( + sqlchemy.In(subq1.Field("stage"), []string{"complete", "failed"}), + )) + } else if !*isOpen { + subq1 = subq1.In("stage", []string{"complete", "failed"}) + } } } - taskObjs := TaskObjectManager.Query().SubQuery() - subq2 := manager.Query("id").Distinct() - subq2 = subq2.Join(taskObjs, sqlchemy.Equals(taskObjs.Field("task_id"), subq2.Field("id"))) - subq2 = subq2.Filter(sqlchemy.Equals(subq2.Field("obj_id"), MULTI_OBJECTS_ID)) - subq2 = subq2.Filter(sqlchemy.Equals(subq2.Field("obj_name"), obj.Keyword())) - subq2 = subq2.Filter(sqlchemy.Equals(taskObjs.Field("obj_id"), obj.GetId())) - if !since.IsZero() { - subq2 = subq2.Filter(sqlchemy.GE(subq2.Field("created_at"), since)) - } - if isOpen != nil { - if *isOpen { - subq2 = subq2.Filter(sqlchemy.NOT( - sqlchemy.In(subq2.Field("stage"), []string{"complete", "failed"}), - )) - } else if !*isOpen { - subq2 = subq2.In("stage", []string{"complete", "failed"}) + subq2 := manager.Query() + { + taskObjs := TaskObjectManager.TableSpec().Instance() + subq2 = subq2.Join(taskObjs, sqlchemy.AND( + sqlchemy.Equals(taskObjs.Field("task_id"), subq2.Field("id")), + sqlchemy.Equals(taskObjs.Field("obj_id"), obj.GetId()), + )) + subq2 = subq2.Filter(sqlchemy.Equals(subq2.Field("obj_id"), MULTI_OBJECTS_ID)) + subq2 = subq2.Filter(sqlchemy.Equals(subq2.Field("obj_name"), obj.Keyword())) + if !since.IsZero() { + subq2 = subq2.Filter(sqlchemy.GE(subq2.Field("created_at"), since)) + } + if isOpen != nil { + if *isOpen { + subq2 = subq2.Filter(sqlchemy.NOT( + sqlchemy.In(subq2.Field("stage"), []string{"complete", "failed"}), + )) + } else if !*isOpen { + subq2 = subq2.In("stage", []string{"complete", "failed"}) + } } } - q := manager.Query() - q = q.Filter(sqlchemy.OR( - sqlchemy.In(q.Field("id"), subq1.SubQuery()), - sqlchemy.In(q.Field("id"), subq2.SubQuery()), - )) - q = q.Desc("created_at") + // subq1 and subq2 do not intersect for the fact that they have + // different condition on tasks_tbl.obj_id field + uq := sqlchemy.Union(subq1, subq2) + uq = uq.Desc("created_at") + q := uq.SubQuery().Query() return q }